From 3c0a3d05cced4f7c754006101472d9233b066f11 Mon Sep 17 00:00:00 2001 From: Kenji Mouri Date: Tue, 26 Apr 2022 22:55:40 +0800 Subject: [PATCH] feat(fsdrv) fix issues for win32 backends (#3284) --- src/extra/libs/fsdrv/lv_fs_stdio.c | 10 +++++----- src/extra/libs/fsdrv/lv_fs_win32.c | 8 ++++---- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/extra/libs/fsdrv/lv_fs_stdio.c b/src/extra/libs/fsdrv/lv_fs_stdio.c index b97de826c..c2de6880e 100644 --- a/src/extra/libs/fsdrv/lv_fs_stdio.c +++ b/src/extra/libs/fsdrv/lv_fs_stdio.c @@ -219,14 +219,14 @@ static void * fs_dir_open(lv_fs_drv_t * drv, const char * path) return handle; #else handle->dir_p = INVALID_HANDLE_VALUE; - WIN32_FIND_DATA fdata; + WIN32_FIND_DATAA fdata; /*Make the path relative to the current directory (the projects root folder)*/ char buf[MAX_PATH_LEN]; lv_snprintf(buf, sizeof(buf), LV_FS_STDIO_PATH "%s\\*", path); strcpy(handle->next_fn, ""); - handle->dir_p = FindFirstFile(buf, &fdata); + handle->dir_p = FindFirstFileA(buf, &fdata); do { if(strcmp(fdata.cFileName, ".") == 0 || strcmp(fdata.cFileName, "..") == 0) { continue; @@ -278,9 +278,9 @@ static lv_fs_res_t fs_dir_read(lv_fs_drv_t * drv, void * dir_p, char * fn) strcpy(fn, handle->next_fn); strcpy(handle->next_fn, ""); - WIN32_FIND_DATA fdata; + WIN32_FIND_DATAA fdata; - if(FindNextFile(handle->dir_p, &fdata) == false) return LV_FS_RES_OK; + if(FindNextFileA(handle->dir_p, &fdata) == false) return LV_FS_RES_OK; do { if(strcmp(fdata.cFileName, ".") == 0 || strcmp(fdata.cFileName, "..") == 0) { continue; @@ -294,7 +294,7 @@ static lv_fs_res_t fs_dir_read(lv_fs_drv_t * drv, void * dir_p, char * fn) } break; } - } while(FindNextFile(handle->dir_p, &fdata)); + } while(FindNextFileA(handle->dir_p, &fdata)); #endif return LV_FS_RES_OK; diff --git a/src/extra/libs/fsdrv/lv_fs_win32.c b/src/extra/libs/fsdrv/lv_fs_win32.c index 7cfd9ae62..8e0050485 100644 --- a/src/extra/libs/fsdrv/lv_fs_win32.c +++ b/src/extra/libs/fsdrv/lv_fs_win32.c @@ -1,4 +1,4 @@ -/** +/** * @file lv_fs_win32.c * */ @@ -362,7 +362,7 @@ static void * fs_dir_open(lv_fs_drv_t * drv, const char * path) dir_handle_t * handle = (dir_handle_t *)lv_mem_alloc(sizeof(dir_handle_t)); handle->dir_p = INVALID_HANDLE_VALUE; handle->next_error = LV_FS_RES_OK; - WIN32_FIND_DATA fdata; + WIN32_FIND_DATAA fdata; /*Make the path relative to the current directory (the projects root folder)*/ char buf[MAX_PATH_LEN]; @@ -373,7 +373,7 @@ static void * fs_dir_open(lv_fs_drv_t * drv, const char * path) #endif strcpy(handle->next_fn, ""); - handle->dir_p = FindFirstFile(buf, &fdata); + handle->dir_p = FindFirstFileA(buf, &fdata); do { if(is_dots_name(fdata.cFileName)) { continue; @@ -416,7 +416,7 @@ static lv_fs_res_t fs_dir_read(lv_fs_drv_t * drv, void * dir_p, char * fn) lv_fs_res_t current_error = handle->next_error; strcpy(handle->next_fn, ""); - WIN32_FIND_DATA fdata; + WIN32_FIND_DATAA fdata; while(FindNextFileA(handle->dir_p, &fdata)) { if(is_dots_name(fdata.cFileName)) {