wine-commits July 2018

wine-commits@winehq.org

2 participants
405 discussions

Michael Stefaniuc : wmic: Use the ARRAY_SIZE() macro.
by Alexandre Julliard 13 Jul '18

13 Jul '18

Module: wine Branch: master Commit: cd82a649aa002125eb8d06b198a516fc9b785234 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cd82a649aa002125eb8d06b1… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Fri Jul 13 19:01:29 2018 +0200 wmic: Use the ARRAY_SIZE() macro. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/wmic/main.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/programs/wmic/main.c b/programs/wmic/main.c index ddd2aec..f4a5bc7 100644 --- a/programs/wmic/main.c +++ b/programs/wmic/main.c @@ -82,7 +82,7 @@ static const WCHAR *find_class( const WCHAR *alias ) { unsigned int i; - for (i = 0; i < sizeof(alias_map)/sizeof(alias_map[0]); i++) + for (i = 0; i < ARRAY_SIZE(alias_map); i++) { if (!strcmpiW( alias, alias_map[i].alias )) return alias_map[i].class; } @@ -158,7 +158,7 @@ static int output_message( int msg ) static const WCHAR fmtW[] = {'%','s',0}; WCHAR buffer[8192]; - LoadStringW( GetModuleHandleW(NULL), msg, buffer, sizeof(buffer)/sizeof(WCHAR) ); + LoadStringW( GetModuleHandleW(NULL), msg, buffer, ARRAY_SIZE(buffer)); return output_string( fmtW, buffer ); } @@ -193,7 +193,7 @@ static int query_prop( const WCHAR *class, const WCHAR *propname ) hr = IWbemLocator_ConnectServer( locator, path, NULL, NULL, NULL, 0, NULL, NULL, &services ); if (hr != S_OK) goto done; - len = strlenW( class ) + sizeof(select_allW) / sizeof(select_allW[0]); + len = strlenW( class ) + ARRAY_SIZE(select_allW); if (!(query = SysAllocStringLen( NULL, len ))) goto done; strcpyW( query, select_allW ); strcatW( query, class );

1 0

Michael Stefaniuc : dxerr8: Use the ARRAY_SIZE() macro.
by Alexandre Julliard 13 Jul '18

13 Jul '18

Module: wine Branch: master Commit: 4c28872037d42b728682c27b549d08f5ba42f857 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4c28872037d42b728682c27b… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Fri Jul 13 19:01:22 2018 +0200 dxerr8: Use the ARRAY_SIZE() macro. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxerr8/dxerr8.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/dxerr8/dxerr8.c b/dlls/dxerr8/dxerr8.c index e42ee00..1d22296 100644 --- a/dlls/dxerr8/dxerr8.c +++ b/dlls/dxerr8/dxerr8.c @@ -51,7 +51,7 @@ const char * WINAPI DXGetErrorString8A(HRESULT hr) { unsigned int i, j, k = 0; - for (i = sizeof(info)/sizeof(info[0]); i != 0; i /= 2) { + for (i = ARRAY_SIZE(info); i != 0; i /= 2) { j = k + (i / 2); if (hr == info[j].hr) return info[j].resultA; @@ -69,7 +69,7 @@ const WCHAR * WINAPI DXGetErrorString8W(HRESULT hr) static const WCHAR unknown[] = { 'U', 'n', 'k', 'n', 'o', 'w', 'n', 0 }; unsigned int i, j, k = 0; - for (i = sizeof(info)/sizeof(info[0]); i != 0; i /= 2) { + for (i = ARRAY_SIZE(info); i != 0; i /= 2) { j = k + (i / 2); if (hr == info[j].hr) return info[j].resultW; @@ -86,7 +86,7 @@ const char * WINAPI DXGetErrorDescription8A(HRESULT hr) { unsigned int i, j, k = 0; - for (i = sizeof(info)/sizeof(info[0]); i != 0; i /= 2) { + for (i = ARRAY_SIZE(info); i != 0; i /= 2) { j = k + (i / 2); if (hr == info[j].hr) return info[j].descriptionA; @@ -104,7 +104,7 @@ const WCHAR * WINAPI DXGetErrorDescription8W(HRESULT hr) static const WCHAR na[] = { 'n', '/', 'a', 0 }; unsigned int i, j, k = 0; - for (i = sizeof(info)/sizeof(info[0]); i != 0; i /= 2) { + for (i = ARRAY_SIZE(info); i != 0; i /= 2) { j = k + (i / 2); if (hr == info[j].hr) return info[j].descriptionW;

1 0

Michael Stefaniuc : winefile: Use the ARRAY_SIZE() macro.
by Alexandre Julliard 13 Jul '18

13 Jul '18

Module: wine Branch: master Commit: 1066283874887a055df4491e229f538004972225 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1066283874887a055df4491e… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Fri Jul 13 19:01:28 2018 +0200 winefile: Use the ARRAY_SIZE() macro. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winefile/winefile.c | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/programs/winefile/winefile.c b/programs/winefile/winefile.c index 044a399..23be450 100644 --- a/programs/winefile/winefile.c +++ b/programs/winefile/winefile.c @@ -193,7 +193,7 @@ static LPWSTR load_string(LPWSTR buffer, DWORD size, UINT id) return buffer; } -#define RS(b, i) load_string(b, sizeof(b)/sizeof(b[0]), i) +#define RS(b, i) load_string(b, ARRAY_SIZE(b), i) /* display error message for the specified WIN32 error code */ @@ -1243,9 +1243,9 @@ static Entry* read_tree(Root* root, LPCWSTR path, LPITEMIDLIST pidl, LPWSTR drv, root->drive_type = DRIVE_UNKNOWN; drv[0] = '\\'; drv[1] = '\0'; - load_string(root->volname, sizeof(root->volname)/sizeof(root->volname[0]), IDS_DESKTOP); + load_string(root->volname, ARRAY_SIZE(root->volname), IDS_DESKTOP); root->fs_flags = 0; - load_string(root->fs, sizeof(root->fs)/sizeof(root->fs[0]), IDS_SHELL); + load_string(root->fs, ARRAY_SIZE(root->fs), IDS_SHELL); return read_tree_shell(root, pidl, sortOrder, hwnd); } @@ -1257,9 +1257,9 @@ static Entry* read_tree(Root* root, LPCWSTR path, LPITEMIDLIST pidl, LPWSTR drv, root->drive_type = GetDriveTypeW(path); lstrcatW(drv, sSlash); - load_string(root->volname, sizeof(root->volname)/sizeof(root->volname[0]), IDS_ROOT_FS); + load_string(root->volname, ARRAY_SIZE(root->volname), IDS_ROOT_FS); root->fs_flags = 0; - load_string(root->fs, sizeof(root->fs)/sizeof(root->fs[0]), IDS_UNIXFS); + load_string(root->fs, ARRAY_SIZE(root->fs), IDS_UNIXFS); lstrcpyW(root->path, sSlash); @@ -1347,7 +1347,7 @@ static ChildWnd* alloc_child_window(LPCWSTR path, LPITEMIDLIST pidl, HWND hwnd) entry = read_tree(root, dir_path, pidl, drv, child->sortOrder, hwnd); if (root->entry.etype == ET_SHELL) - load_string(root->entry.data.cFileName, sizeof(root->entry.data.cFileName)/sizeof(root->entry.data.cFileName[0]), IDS_DESKTOP); + load_string(root->entry.data.cFileName, ARRAY_SIZE(root->entry.data.cFileName), IDS_DESKTOP); else wsprintfW(root->entry.data.cFileName, sTitleFmt, drv, root->fs); @@ -2649,12 +2649,12 @@ static void set_space_status(void) if (GetDiskFreeSpaceExW(NULL, &ulFreeBytesToCaller, &ulTotalBytes, &ulFreeBytes)) { DWORD_PTR args[2]; - args[0] = (DWORD_PTR)StrFormatByteSizeW(ulFreeBytesToCaller.QuadPart, b1, sizeof(b1)/sizeof(*b1)); - args[1] = (DWORD_PTR)StrFormatByteSizeW(ulTotalBytes.QuadPart, b2, sizeof(b2)/sizeof(*b2)); + args[0] = (DWORD_PTR)StrFormatByteSizeW(ulFreeBytesToCaller.QuadPart, b1, ARRAY_SIZE(b1)); + args[1] = (DWORD_PTR)StrFormatByteSizeW(ulTotalBytes.QuadPart, b2, ARRAY_SIZE(b2)); FormatMessageW(FORMAT_MESSAGE_FROM_STRING|FORMAT_MESSAGE_ARGUMENT_ARRAY, - RS(fmt,IDS_FREE_SPACE_FMT), 0, 0, buffer, - sizeof(buffer)/sizeof(*buffer), (__ms_va_list*)args); + RS(fmt,IDS_FREE_SPACE_FMT), 0, 0, buffer, ARRAY_SIZE(buffer), + (__ms_va_list*)args); } else lstrcpyW(buffer, sQMarks); @@ -3430,7 +3430,7 @@ static void create_drive_bar(void) drivebarBtn.iString++; #endif /* insert shell namespace button */ - load_string(b1, sizeof(b1)/sizeof(b1[0]), IDS_SHELL); + load_string(b1, ARRAY_SIZE(b1), IDS_SHELL); b1[lstrlenW(b1)+1] = '\0'; SendMessageW(Globals.hdrivebar, TB_ADDSTRINGW, 0, (LPARAM)b1); @@ -4198,15 +4198,15 @@ static void InitInstance(HINSTANCE hinstance) /* load column strings */ col = 1; - load_string(g_pos_names[col++], sizeof(g_pos_names[col])/sizeof(g_pos_names[col][0]), IDS_COL_NAME); - load_string(g_pos_names[col++], sizeof(g_pos_names[col])/sizeof(g_pos_names[col][0]), IDS_COL_SIZE); - load_string(g_pos_names[col++], sizeof(g_pos_names[col])/sizeof(g_pos_names[col][0]), IDS_COL_CDATE); - load_string(g_pos_names[col++], sizeof(g_pos_names[col])/sizeof(g_pos_names[col][0]), IDS_COL_ADATE); - load_string(g_pos_names[col++], sizeof(g_pos_names[col])/sizeof(g_pos_names[col][0]), IDS_COL_MDATE); - load_string(g_pos_names[col++], sizeof(g_pos_names[col])/sizeof(g_pos_names[col][0]), IDS_COL_IDX); - load_string(g_pos_names[col++], sizeof(g_pos_names[col])/sizeof(g_pos_names[col][0]), IDS_COL_LINKS); - load_string(g_pos_names[col++], sizeof(g_pos_names[col])/sizeof(g_pos_names[col][0]), IDS_COL_ATTR); - load_string(g_pos_names[col++], sizeof(g_pos_names[col])/sizeof(g_pos_names[col][0]), IDS_COL_SEC); + load_string(g_pos_names[col++], ARRAY_SIZE(g_pos_names[col]), IDS_COL_NAME); + load_string(g_pos_names[col++], ARRAY_SIZE(g_pos_names[col]), IDS_COL_SIZE); + load_string(g_pos_names[col++], ARRAY_SIZE(g_pos_names[col]), IDS_COL_CDATE); + load_string(g_pos_names[col++], ARRAY_SIZE(g_pos_names[col]), IDS_COL_ADATE); + load_string(g_pos_names[col++], ARRAY_SIZE(g_pos_names[col]), IDS_COL_MDATE); + load_string(g_pos_names[col++], ARRAY_SIZE(g_pos_names[col]), IDS_COL_IDX); + load_string(g_pos_names[col++], ARRAY_SIZE(g_pos_names[col]), IDS_COL_LINKS); + load_string(g_pos_names[col++], ARRAY_SIZE(g_pos_names[col]), IDS_COL_ATTR); + load_string(g_pos_names[col++], ARRAY_SIZE(g_pos_names[col]), IDS_COL_SEC); } @@ -4263,7 +4263,7 @@ static BOOL show_frame(HWND hwndParent, int cmdshow, LPCWSTR path) Globals.htoolbar = CreateToolbarEx(Globals.hMainWnd, WS_CHILD|WS_VISIBLE, IDW_TOOLBAR, 2, Globals.hInstance, IDB_TOOLBAR, toolbarBtns, - sizeof(toolbarBtns)/sizeof(TBBUTTON), 16, 15, 16, 15, sizeof(TBBUTTON)); + ARRAY_SIZE(toolbarBtns), 16, 15, 16, 15, sizeof(TBBUTTON)); CheckMenuItem(Globals.hMenuOptions, ID_VIEW_TOOL_BAR, MF_BYCOMMAND|MF_CHECKED); }

1 0

Michael Stefaniuc : wscript: Use the ARRAY_SIZE() macro.
by Alexandre Julliard 13 Jul '18

13 Jul '18

Module: wine Branch: master Commit: f140ad6e05c650f7234d2d72e8dd7e7cc8ec62a9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f140ad6e05c650f7234d2d72… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Fri Jul 13 19:01:27 2018 +0200 wscript: Use the ARRAY_SIZE() macro. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/wscript/host.c | 6 +++--- programs/wscript/main.c | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/programs/wscript/host.c b/programs/wscript/host.c index fb95c0c..fb1c86f 100644 --- a/programs/wscript/host.c +++ b/programs/wscript/host.c @@ -84,7 +84,7 @@ static void print_string(const WCHAR *string) ret = WriteConsoleW(GetStdHandle(STD_OUTPUT_HANDLE), string, len, &count, NULL); if(ret) { static const WCHAR crnlW[] = {'\r','\n'}; - WriteConsoleW(GetStdHandle(STD_OUTPUT_HANDLE), crnlW, sizeof(crnlW)/sizeof(*crnlW), &count, NULL); + WriteConsoleW(GetStdHandle(STD_OUTPUT_HANDLE), crnlW, ARRAY_SIZE(crnlW), &count, NULL); return; } @@ -183,7 +183,7 @@ static HRESULT WINAPI Host_get_FullName(IHost *iface, BSTR *out_Path) WINE_TRACE("(%p)\n", out_Path); - if(GetModuleFileNameW(NULL, fullPath, sizeof(fullPath)/sizeof(WCHAR)) == 0) + if(GetModuleFileNameW(NULL, fullPath, ARRAY_SIZE(fullPath)) == 0) return E_FAIL; if(!(*out_Path = SysAllocString(fullPath))) return E_OUTOFMEMORY; @@ -198,7 +198,7 @@ static HRESULT WINAPI Host_get_Path(IHost *iface, BSTR *out_Path) WINE_TRACE("(%p)\n", out_Path); - if(GetModuleFileNameW(NULL, path, sizeof(path)/sizeof(WCHAR)) == 0) + if(GetModuleFileNameW(NULL, path, ARRAY_SIZE(path)) == 0) return E_FAIL; pos = strrchrW(path, '\\'); howMany = pos - path; diff --git a/programs/wscript/main.c b/programs/wscript/main.c index 3537f9d..1cbb9e7 100644 --- a/programs/wscript/main.c +++ b/programs/wscript/main.c @@ -253,7 +253,7 @@ static BOOL get_engine_clsid(const WCHAR *ext, CLSID *clsid) if(res != ERROR_SUCCESS) return FALSE; - size = sizeof(fileid)/sizeof(WCHAR); + size = ARRAY_SIZE(fileid); res = RegQueryValueW(hkey, NULL, fileid, &size); RegCloseKey(hkey); if(res != ERROR_SUCCESS) @@ -266,7 +266,7 @@ static BOOL get_engine_clsid(const WCHAR *ext, CLSID *clsid) if(res != ERROR_SUCCESS) return FALSE; - size = sizeof(progid)/sizeof(WCHAR); + size = ARRAY_SIZE(progid); res = RegQueryValueW(hkey, NULL, progid, &size); RegCloseKey(hkey); if(res != ERROR_SUCCESS) @@ -446,8 +446,8 @@ int WINAPI wWinMain(HINSTANCE hInst, HINSTANCE hPrevInst, LPWSTR cmdline, int cm WINE_FIXME("No file name specified\n"); return 1; } - res = GetFullPathNameW(filename, sizeof(scriptFullName)/sizeof(WCHAR), scriptFullName, &filepart); - if(!res || res > sizeof(scriptFullName)/sizeof(WCHAR)) + res = GetFullPathNameW(filename, ARRAY_SIZE(scriptFullName), scriptFullName, &filepart); + if(!res || res > ARRAY_SIZE(scriptFullName)) return 1; ext = strrchrW(filepart, '.');

1 0

Michael Stefaniuc : winemine: Use the ARRAY_SIZE() macro.
by Alexandre Julliard 13 Jul '18

13 Jul '18

Module: wine Branch: master Commit: a9933cc2d160c8de4f145463bdce035768940913 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a9933cc2d160c8de4f145463… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Fri Jul 13 19:01:24 2018 +0200 winemine: Use the ARRAY_SIZE() macro. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winemine/dialog.c | 9 ++++----- programs/winemine/main.c | 10 +++++----- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/programs/winemine/dialog.c b/programs/winemine/dialog.c index c182e91..4741241 100644 --- a/programs/winemine/dialog.c +++ b/programs/winemine/dialog.c @@ -69,9 +69,8 @@ INT_PTR CALLBACK CongratsDlgProc( HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lP case WM_COMMAND: switch( LOWORD( wParam ) ) { case IDOK: - GetDlgItemTextW( hDlg, IDC_EDITNAME, - p_board->best_name[p_board->difficulty], - sizeof( p_board->best_name[p_board->difficulty] ) / sizeof(WCHAR) ); + GetDlgItemTextW( hDlg, IDC_EDITNAME, p_board->best_name[p_board->difficulty], + ARRAY_SIZE(p_board->best_name[p_board->difficulty] )); EndDialog( hDlg, 0 ); return TRUE; @@ -107,8 +106,8 @@ INT_PTR CALLBACK TimesDlgProc( HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lPara case WM_COMMAND: switch( LOWORD( wParam ) ) { case IDC_RESET: - LoadStringW( NULL, IDC_CONFIRMTITLE, confirm_title, sizeof(confirm_title)/sizeof(WCHAR) ); - LoadStringW( NULL, IDC_CONFIRMTEXT, confirm_text, sizeof(confirm_text)/sizeof(WCHAR) ); + LoadStringW( NULL, IDC_CONFIRMTITLE, confirm_title, ARRAY_SIZE(confirm_title)); + LoadStringW( NULL, IDC_CONFIRMTEXT, confirm_text, ARRAY_SIZE(confirm_text)); confirm_msgbox_result = MessageBoxW( hDlg, confirm_text, confirm_title, MB_OKCANCEL | MB_DEFBUTTON2 | MB_ICONWARNING ); if( confirm_msgbox_result != IDOK ) break; diff --git a/programs/winemine/main.c b/programs/winemine/main.c index 5bec84c..255d217 100644 --- a/programs/winemine/main.c +++ b/programs/winemine/main.c @@ -112,7 +112,7 @@ static void LoadBoard( BOARD *p_board ) size = sizeof( data ); if( RegQueryValueExW( hkey, key_name, NULL, &type, (LPBYTE) data, &size ) == ERROR_SUCCESS ) - lstrcpynW( p_board->best_name[i], data, sizeof(p_board->best_name[i])/sizeof(WCHAR) ); + lstrcpynW( p_board->best_name[i], data, ARRAY_SIZE(p_board->best_name[i])); else LoadStringW( p_board->hInst, IDS_NOBODY, p_board->best_name[i], MAX_PLAYER_NAME_SIZE+1 ); } @@ -179,7 +179,7 @@ void SaveBoard( BOARD *p_board ) for( i = 0; i < 3; i++ ) { wsprintfW( key_name, nameW, i+1 ); - lstrcpynW( data, p_board->best_name[i], sizeof(data)/sizeof(WCHAR) ); + lstrcpynW( data, p_board->best_name[i], ARRAY_SIZE(data)); RegSetValueExW( hkey, key_name, 0, REG_SZ, (LPBYTE) data, (lstrlenW(data)+1) * sizeof(WCHAR) ); } @@ -1003,8 +1003,8 @@ static LRESULT WINAPI MainProc( HWND hWnd, UINT msg, WPARAM wParam, LPARAM lPara case IDM_ABOUT: { WCHAR appname[256], other[256]; - LoadStringW( board.hInst, IDS_APPNAME, appname, sizeof(appname)/sizeof(WCHAR) ); - LoadStringW( board.hInst, IDS_ABOUT, other, sizeof(other)/sizeof(WCHAR) ); + LoadStringW( board.hInst, IDS_APPNAME, appname, ARRAY_SIZE(appname)); + LoadStringW( board.hInst, IDS_ABOUT, other, ARRAY_SIZE(other)); ShellAboutW( hWnd, appname, other, LoadImageW(board.hInst, MAKEINTRESOURCEW(IDI_WINEMINE), IMAGE_ICON, 48, 48, LR_SHARED)); return 0; @@ -1025,7 +1025,7 @@ int WINAPI wWinMain( HINSTANCE hInst, HINSTANCE hPrevInst, LPWSTR cmdline, int c HACCEL haccel; WCHAR appname[20]; - LoadStringW( hInst, IDS_APPNAME, appname, sizeof(appname)/sizeof(WCHAR)); + LoadStringW( hInst, IDS_APPNAME, appname, ARRAY_SIZE(appname)); wc.cbSize = sizeof(wc); wc.style = 0;

1 0

Michael Stefaniuc : xcopy: Use the ARRAY_SIZE() macro.
by Alexandre Julliard 13 Jul '18

13 Jul '18

Module: wine Branch: master Commit: c99d5f31527bdb665ef332a8058c4125ac2d05e1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c99d5f31527bdb665ef332a8… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Fri Jul 13 19:01:26 2018 +0200 xcopy: Use the ARRAY_SIZE() macro. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/xcopy/xcopy.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/programs/xcopy/xcopy.c b/programs/xcopy/xcopy.c index cdf0bdf..616c7d2 100644 --- a/programs/xcopy/xcopy.c +++ b/programs/xcopy/xcopy.c @@ -84,7 +84,7 @@ static WCHAR *XCOPY_LoadMessage(UINT id) { static WCHAR msg[MAXSTRING]; const WCHAR failedMsg[] = {'F', 'a', 'i', 'l', 'e', 'd', '!', 0}; - if (!LoadStringW(GetModuleHandleW(NULL), id, msg, sizeof(msg)/sizeof(WCHAR))) { + if (!LoadStringW(GetModuleHandleW(NULL), id, msg, ARRAY_SIZE(msg))) { WINE_FIXME("LoadString failed with %d\n", GetLastError()); lstrcpyW(msg, failedMsg); } @@ -269,7 +269,7 @@ static BOOL XCOPY_ProcessExcludeFile(WCHAR* filename, WCHAR* endOfName) { } /* Process line by line */ - while (fgetws(buffer, sizeof(buffer)/sizeof(WCHAR), inFile) != NULL) { + while (fgetws(buffer, ARRAY_SIZE(buffer), inFile) != NULL) { EXCLUDELIST *thisEntry; int length = lstrlenW(buffer); @@ -840,9 +840,9 @@ static int XCOPY_ParseCommandLine(WCHAR *suppliedsource, /* Debug info: */ FileTimeToSystemTime (&dateRange, &st); GetDateFormatW(0, DATE_SHORTDATE, &st, NULL, datestring, - sizeof(datestring)/sizeof(WCHAR)); + ARRAY_SIZE(datestring)); GetTimeFormatW(0, TIME_NOSECONDS, &st, - NULL, timestring, sizeof(timestring)/sizeof(WCHAR)); + NULL, timestring, ARRAY_SIZE(timestring)); WINE_TRACE("Date being used is: %s %s\n", wine_dbgstr_w(datestring), wine_dbgstr_w(timestring)); @@ -987,7 +987,7 @@ static int XCOPY_ProcessSourceParm(WCHAR *suppliedsource, WCHAR *stem, lstrcpyW(spec, suppliedsource+2); } else { WCHAR curdir[MAXSTRING]; - GetCurrentDirectoryW(sizeof(curdir)/sizeof(WCHAR), curdir); + GetCurrentDirectoryW(ARRAY_SIZE(curdir), curdir); stem[0] = curdir[0]; stem[1] = curdir[1]; stem[2] = 0x00;

1 0

Michael Stefaniuc : wineconsole: Use the ARRAY_SIZE() macro.
by Alexandre Julliard 13 Jul '18

13 Jul '18

Module: wine Branch: master Commit: 8969cf98cf3801df31428342394ac4ba4eee6854 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8969cf98cf3801df31428342… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Fri Jul 13 19:01:25 2018 +0200 wineconsole: Use the ARRAY_SIZE() macro. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/wineconsole/curses.c | 2 +- programs/wineconsole/dialog.c | 23 +++++++++-------------- programs/wineconsole/user.c | 18 +++++++++--------- programs/wineconsole/wineconsole.c | 2 +- 4 files changed, 20 insertions(+), 25 deletions(-) diff --git a/programs/wineconsole/curses.c b/programs/wineconsole/curses.c index 7413c8f..6c35554 100644 --- a/programs/wineconsole/curses.c +++ b/programs/wineconsole/curses.c @@ -340,7 +340,7 @@ static void WCCURSES_SetTitle(const struct inner_data* data) { WCHAR wbuf[256]; - if (WINECON_GetConsoleTitle(data->hConIn, wbuf, sizeof(wbuf)/sizeof(WCHAR))) + if (WINECON_GetConsoleTitle(data->hConIn, wbuf, ARRAY_SIZE(wbuf))) { char buffer[256]; diff --git a/programs/wineconsole/dialog.c b/programs/wineconsole/dialog.c index 9a14184..8988125 100644 --- a/programs/wineconsole/dialog.c +++ b/programs/wineconsole/dialog.c @@ -208,12 +208,10 @@ static LRESULT WINAPI WCUSER_FontPreviewProc(HWND hWnd, UINT msg, WPARAM wParam, FillRect(ps.hdc, &ps.rcPaint, CreateSolidBrush(bkcolor)); SetBkColor(ps.hdc, bkcolor); SetTextColor(ps.hdc, get_color(di, IDC_FNT_COLOR_FG)); - len = LoadStringW(GetModuleHandleW(NULL), IDS_FNT_PREVIEW, - buf, sizeof(buf) / sizeof(buf[0])); + len = LoadStringW(GetModuleHandleW(NULL), IDS_FNT_PREVIEW, buf, ARRAY_SIZE(buf)); if (len) TextOutW(ps.hdc, 0, 0, buf, len); - TextOutW(ps.hdc, 0, di->font[size_idx].height, ascii, - sizeof(ascii)/sizeof(ascii[0]) - 1); + TextOutW(ps.hdc, 0, di->font[size_idx].height, ascii, ARRAY_SIZE(ascii) - 1); SelectObject(ps.hdc, hOldFont); } EndPaint(hWnd, &ps); @@ -366,7 +364,7 @@ static int CALLBACK font_enum_size(const LOGFONTW* lf, const TEXTMETRICW* tm, static const int sizes[] = {8,9,10,11,12,14,16,18,20,22,24,26,28,36,48,72}; int i; - di->nFont = sizeof(sizes) / sizeof(sizes[0]); + di->nFont = ARRAY_SIZE(sizes); di->font = HeapAlloc(GetProcessHeap(), 0, di->nFont * sizeof(di->font[0])); for (i = 0; i < di->nFont; i++) { @@ -459,11 +457,11 @@ static BOOL select_font(struct dialog_info* di) SendDlgItemMessageW(di->hDlg, IDC_FNT_PREVIEW, WM_SETFONT, (WPARAM)hFont, TRUE); if (hOldFont) DeleteObject(hOldFont); - LoadStringW(GetModuleHandleW(NULL), IDS_FNT_DISPLAY, fmt, sizeof(fmt) / sizeof(fmt[0])); + LoadStringW(GetModuleHandleW(NULL), IDS_FNT_DISPLAY, fmt, ARRAY_SIZE(fmt)); args[0] = config.cell_width; args[1] = config.cell_height; FormatMessageW(FORMAT_MESSAGE_FROM_STRING|FORMAT_MESSAGE_ARGUMENT_ARRAY, - fmt, 0, 0, buf, sizeof(buf)/sizeof(*buf), (__ms_va_list*)args); + fmt, 0, 0, buf, ARRAY_SIZE(buf), (__ms_va_list*)args); SendDlgItemMessageW(di->hDlg, IDC_FNT_FONT_INFO, WM_SETTEXT, 0, (LPARAM)buf); @@ -687,10 +685,8 @@ static INT_PTR WINAPI WCUSER_ConfigDlgProc(HWND hDlg, UINT msg, WPARAM wParam, L WCHAR cap[256]; WCHAR txt[256]; - LoadStringW(GetModuleHandleW(NULL), IDS_DLG_TIT_ERROR, - cap, sizeof(cap) / sizeof(cap[0])); - LoadStringW(GetModuleHandleW(NULL), IDS_DLG_ERR_SBWINSIZE, - txt, sizeof(txt) / sizeof(cap[0])); + LoadStringW(GetModuleHandleW(NULL), IDS_DLG_TIT_ERROR, cap, ARRAY_SIZE(cap)); + LoadStringW(GetModuleHandleW(NULL), IDS_DLG_ERR_SBWINSIZE, txt, ARRAY_SIZE(txt)); MessageBoxW(hDlg, txt, cap, MB_OK); SetWindowLongPtrW(hDlg, DWLP_MSGRESULT, PSNRET_INVALID); @@ -831,9 +827,8 @@ BOOL WCUSER_GetProperties(struct inner_data* data, BOOL current) memset(&psHead, 0, sizeof(psHead)); psHead.dwSize = sizeof(psHead); - if (!LoadStringW(GetModuleHandleW(NULL), - (current) ? IDS_DLG_TIT_CURRENT : IDS_DLG_TIT_DEFAULT, - buff, sizeof(buff) / sizeof(buff[0]))) + if (!LoadStringW(GetModuleHandleW(NULL), (current) ? IDS_DLG_TIT_CURRENT : IDS_DLG_TIT_DEFAULT, + buff, ARRAY_SIZE(buff))) { buff[0] = 'S'; buff[1] = 'e'; diff --git a/programs/wineconsole/user.c b/programs/wineconsole/user.c index 03d0ea1..0b29157 100644 --- a/programs/wineconsole/user.c +++ b/programs/wineconsole/user.c @@ -823,25 +823,25 @@ static BOOL WCUSER_FillMenu(HMENU hMenu, BOOL sep) hSubMenu = CreateMenu(); if (!hSubMenu) return FALSE; - LoadStringW(hInstance, IDS_MARK, buff, sizeof(buff) / sizeof(buff[0])); + LoadStringW(hInstance, IDS_MARK, buff, ARRAY_SIZE(buff)); InsertMenuW(hSubMenu, -1, MF_BYPOSITION|MF_STRING, IDS_MARK, buff); - LoadStringW(hInstance, IDS_COPY, buff, sizeof(buff) / sizeof(buff[0])); + LoadStringW(hInstance, IDS_COPY, buff, ARRAY_SIZE(buff)); InsertMenuW(hSubMenu, -1, MF_BYPOSITION|MF_STRING, IDS_COPY, buff); - LoadStringW(hInstance, IDS_PASTE, buff, sizeof(buff) / sizeof(buff[0])); + LoadStringW(hInstance, IDS_PASTE, buff, ARRAY_SIZE(buff)); InsertMenuW(hSubMenu, -1, MF_BYPOSITION|MF_STRING, IDS_PASTE, buff); - LoadStringW(hInstance, IDS_SELECTALL, buff, sizeof(buff) / sizeof(buff[0])); + LoadStringW(hInstance, IDS_SELECTALL, buff, ARRAY_SIZE(buff)); InsertMenuW(hSubMenu, -1, MF_BYPOSITION|MF_STRING, IDS_SELECTALL, buff); - LoadStringW(hInstance, IDS_SCROLL, buff, sizeof(buff) / sizeof(buff[0])); + LoadStringW(hInstance, IDS_SCROLL, buff, ARRAY_SIZE(buff)); InsertMenuW(hSubMenu, -1, MF_BYPOSITION|MF_STRING, IDS_SCROLL, buff); - LoadStringW(hInstance, IDS_SEARCH, buff, sizeof(buff) / sizeof(buff[0])); + LoadStringW(hInstance, IDS_SEARCH, buff, ARRAY_SIZE(buff)); InsertMenuW(hSubMenu, -1, MF_BYPOSITION|MF_STRING, IDS_SEARCH, buff); if (sep) InsertMenuW(hMenu, -1, MF_BYPOSITION|MF_SEPARATOR, 0, NULL); - LoadStringW(hInstance, IDS_EDIT, buff, sizeof(buff) / sizeof(buff[0])); + LoadStringW(hInstance, IDS_EDIT, buff, ARRAY_SIZE(buff)); InsertMenuW(hMenu, -1, MF_BYPOSITION|MF_STRING|MF_POPUP, (UINT_PTR)hSubMenu, buff); - LoadStringW(hInstance, IDS_DEFAULT, buff, sizeof(buff) / sizeof(buff[0])); + LoadStringW(hInstance, IDS_DEFAULT, buff, ARRAY_SIZE(buff)); InsertMenuW(hMenu, -1, MF_BYPOSITION|MF_STRING, IDS_DEFAULT, buff); - LoadStringW(hInstance, IDS_PROPERTIES, buff, sizeof(buff) / sizeof(buff[0])); + LoadStringW(hInstance, IDS_PROPERTIES, buff, ARRAY_SIZE(buff)); InsertMenuW(hMenu, -1, MF_BYPOSITION|MF_STRING, IDS_PROPERTIES, buff); return TRUE; diff --git a/programs/wineconsole/wineconsole.c b/programs/wineconsole/wineconsole.c index 9e3afb1..439099c 100644 --- a/programs/wineconsole/wineconsole.c +++ b/programs/wineconsole/wineconsole.c @@ -45,7 +45,7 @@ static void printf_res(UINT uResId, ...) va_list args; va_start(args, uResId); - LoadStringW(GetModuleHandleW(NULL), uResId, buffer, sizeof(buffer)/sizeof(buffer[0])); + LoadStringW(GetModuleHandleW(NULL), uResId, buffer, ARRAY_SIZE(buffer)); WideCharToMultiByte(CP_UNIXCP, 0, buffer, -1, ansi, sizeof(ansi), NULL, NULL); vprintf(ansi, args); va_end(args);

1 0

Michael Stefaniuc : dxerr9: Use the ARRAY_SIZE() macro.
by Alexandre Julliard 13 Jul '18

13 Jul '18

Module: wine Branch: master Commit: d7fb7dfb46ca663a010de589a5ec2f0d96b2f4af URL: https://source.winehq.org/git/wine.git/?a=commit;h=d7fb7dfb46ca663a010de589… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Fri Jul 13 19:01:23 2018 +0200 dxerr9: Use the ARRAY_SIZE() macro. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxerr9/dxerr9.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/dxerr9/dxerr9.c b/dlls/dxerr9/dxerr9.c index c65f48e..e5b1861 100644 --- a/dlls/dxerr9/dxerr9.c +++ b/dlls/dxerr9/dxerr9.c @@ -55,7 +55,7 @@ const char * WINAPI DXGetErrorString9A(HRESULT hr) { unsigned int i, j, k = 0; - for (i = sizeof(info)/sizeof(info[0]); i != 0; i /= 2) { + for (i = ARRAY_SIZE(info); i != 0; i /= 2) { j = k + (i / 2); if (hr == info[j].hr) return info[j].resultA; @@ -73,7 +73,7 @@ const WCHAR * WINAPI DXGetErrorString9W(HRESULT hr) static const WCHAR unknown[] = { 'U', 'n', 'k', 'n', 'o', 'w', 'n', 0 }; unsigned int i, j, k = 0; - for (i = sizeof(info)/sizeof(info[0]); i != 0; i /= 2) { + for (i = ARRAY_SIZE(info); i != 0; i /= 2) { j = k + (i / 2); if (hr == info[j].hr) return info[j].resultW; @@ -90,7 +90,7 @@ const char * WINAPI DXGetErrorDescription9A(HRESULT hr) { unsigned int i, j, k = 0; - for (i = sizeof(info)/sizeof(info[0]); i != 0; i /= 2) { + for (i = ARRAY_SIZE(info); i != 0; i /= 2) { j = k + (i / 2); if (hr == info[j].hr) return info[j].descriptionA; @@ -108,7 +108,7 @@ const WCHAR * WINAPI DXGetErrorDescription9W(HRESULT hr) static const WCHAR na[] = { 'n', '/', 'a', 0 }; unsigned int i, j, k = 0; - for (i = sizeof(info)/sizeof(info[0]); i != 0; i /= 2) { + for (i = ARRAY_SIZE(info); i != 0; i /= 2) { j = k + (i / 2); if (hr == info[j].hr) return info[j].descriptionW;

1 0

Alexandre Julliard : user32: Remove FIXMEs from physical<-> logical mapping functions.
by Alexandre Julliard 13 Jul '18

13 Jul '18

Module: wine Branch: master Commit: ae7acbfe4b84937010c4feb45c3c1e8cb2073bcc URL: https://source.winehq.org/git/wine.git/?a=commit;h=ae7acbfe4b84937010c4feb4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 13 17:37:56 2018 +0200 user32: Remove FIXMEs from physical<->logical mapping functions. Also group them with the other DPI functions. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/input.c | 20 -------------------- dlls/user32/sysparams.c | 34 ++++++++++++++++++++++++++++++++++ dlls/user32/winpos.c | 24 ------------------------ 3 files changed, 34 insertions(+), 44 deletions(-) diff --git a/dlls/user32/input.c b/dlls/user32/input.c index 19d1ec9..c621769 100644 --- a/dlls/user32/input.c +++ b/dlls/user32/input.c @@ -285,16 +285,6 @@ BOOL WINAPI GetCursorInfo( PCURSORINFO pci ) /*********************************************************************** - * GetPhysicalCursorPos (USER32.@) -*/ - -BOOL WINAPI GetPhysicalCursorPos(POINT *point) -{ - FIXME("(%p) semi-stub: forwarding to GetCursorPos\n", point); - return GetCursorPos(point); -} - -/*********************************************************************** * SetCursorPos (USER32.@) */ BOOL WINAPI DECLSPEC_HOTPATCH SetCursorPos( INT x, INT y ) @@ -320,16 +310,6 @@ BOOL WINAPI DECLSPEC_HOTPATCH SetCursorPos( INT x, INT y ) return ret; } -/*********************************************************************** - * SetPhysicalCursorPos (USER32.@) -*/ - -BOOL WINAPI SetPhysicalCursorPos(INT x, INT y) -{ - FIXME("(%u %u) semi-stub: forwarding to SetCursorPos\n", x, y); - return SetCursorPos(x, y); -} - /********************************************************************** * SetCapture (USER32.@) */ diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index 95387cd..6a22f95 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -3437,3 +3437,37 @@ BOOL WINAPI GetDisplayAutoRotationPreferences( ORIENTATION_PREFERENCE *orientati *orientation = ORIENTATION_PREFERENCE_NONE; return TRUE; } + +/* physical<->logical mapping functions from win8 that are nops in later versions */ + +/*********************************************************************** + * GetPhysicalCursorPos (USER32.@) + */ +BOOL WINAPI GetPhysicalCursorPos( POINT *point ) +{ + return GetCursorPos( point ); +} + +/*********************************************************************** + * SetPhysicalCursorPos (USER32.@) + */ +BOOL WINAPI SetPhysicalCursorPos( INT x, INT y ) +{ + return SetCursorPos( x, y ); +} + +/*********************************************************************** + * LogicalToPhysicalPoint (USER32.@) + */ +BOOL WINAPI LogicalToPhysicalPoint( HWND hwnd, POINT *point ) +{ + return TRUE; +} + +/*********************************************************************** + * PhysicalToLogicalPoint (USER32.@) + */ +BOOL WINAPI PhysicalToLogicalPoint( HWND hwnd, POINT *point ) +{ + return TRUE; +} diff --git a/dlls/user32/winpos.c b/dlls/user32/winpos.c index 56a5393..dc2816a 100644 --- a/dlls/user32/winpos.c +++ b/dlls/user32/winpos.c @@ -2999,27 +2999,3 @@ void WINPOS_SysCommandSizeMove( HWND hwnd, WPARAM wParam ) else WINPOS_ShowIconTitle( hwnd, TRUE ); } } - -/*********************************************************************** - * LogicalToPhysicalPoint (USER32.@) - */ -BOOL WINAPI LogicalToPhysicalPoint(HWND hwnd, POINT *point) -{ - static int once; - - if (!once++) - FIXME("(%p %p) stub\n", hwnd, point); - return TRUE; -} - -/*********************************************************************** - * PhysicalToLogicalPoint (USER32.@) - */ -BOOL WINAPI PhysicalToLogicalPoint(HWND hwnd, POINT *point) -{ - static int once; - - if (!once++) - FIXME("(%p %p) stub\n", hwnd, point); - return TRUE; -}

1 0

Piotr Caban : ucrtbase: Don't fail if path ends with '\' character in stat functions family.
by Alexandre Julliard 13 Jul '18

13 Jul '18

Module: wine Branch: master Commit: c5cb5e24a30d98aa329e87c3c9e709b16cf43233 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c5cb5e24a30d98aa329e87c3… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Jul 13 16:49:34 2018 +0200 ucrtbase: Don't fail if path ends with '\' character in stat functions family. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45292 Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/file.c | 22 ++++++++++++++++++---- dlls/ucrtbase/tests/misc.c | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 64 insertions(+), 4 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 6b295cf..1c7b5a4 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -2980,13 +2980,20 @@ int CDECL MSVCRT_stat64(const char* path, struct MSVCRT__stat64 * buf) while (plen && path[plen-1]==' ') plen--; - if (plen && (plen<2 || path[plen-2]!=':') && - (path[plen-1]==':' || path[plen-1]=='\\' || path[plen-1]=='/')) + if (plen==2 && path[1]==':') { *MSVCRT__errno() = MSVCRT_ENOENT; return -1; } +#if _MSVCR_VER<140 + if (plen>=2 && path[plen-2]!=':' && (path[plen-1]=='\\' || path[plen-1]=='/')) + { + *MSVCRT__errno() = MSVCRT_ENOENT; + return -1; + } +#endif + if (!GetFileAttributesExA(path, GetFileExInfoStandard, &hfi)) { TRACE("failed (%d)\n",GetLastError()); @@ -3128,13 +3135,20 @@ int CDECL MSVCRT__wstat64(const MSVCRT_wchar_t* path, struct MSVCRT__stat64 * bu while (plen && path[plen-1]==' ') plen--; - if(plen && (plen<2 || path[plen-2]!=':') && - (path[plen-1]==':' || path[plen-1]=='\\' || path[plen-1]=='/')) + if (plen==2 && path[1]==':') { *MSVCRT__errno() = MSVCRT_ENOENT; return -1; } +#if _MSVCR_VER<140 + if (plen>=2 && path[plen-2]!=':' && (path[plen-1]=='\\' || path[plen-1]=='/')) + { + *MSVCRT__errno() = MSVCRT_ENOENT; + return -1; + } +#endif + if (!GetFileAttributesExW(path, GetFileExInfoStandard, &hfi)) { TRACE("failed (%d)\n",GetLastError()); diff --git a/dlls/ucrtbase/tests/misc.c b/dlls/ucrtbase/tests/misc.c index 555dc2d..2a9648a 100644 --- a/dlls/ucrtbase/tests/misc.c +++ b/dlls/ucrtbase/tests/misc.c @@ -27,6 +27,7 @@ #include <share.h> #include <fcntl.h> #include <time.h> +#include <direct.h> #include <windef.h> #include <winbase.h> @@ -129,6 +130,7 @@ static void (CDECL *p_exit)(int); static int (CDECL *p__crt_atexit)(void (CDECL*)(void)); static int (__cdecl *p_crt_at_quick_exit)(void (__cdecl *func)(void)); static void (__cdecl *p_quick_exit)(int exitcode); +static int (__cdecl *p__stat32)(const char*, struct _stat32 *buf); static void test__initialize_onexit_table(void) { @@ -437,6 +439,7 @@ static BOOL init(void) p_exit = (void*)GetProcAddress(module, "exit"); p_crt_at_quick_exit = (void*)GetProcAddress(module, "_crt_at_quick_exit"); p_quick_exit = (void*)GetProcAddress(module, "quick_exit"); + p__stat32 = (void*)GetProcAddress(module, "_stat32"); return TRUE; } @@ -931,6 +934,48 @@ static void test_quick_exit(const char *argv0) CloseHandle(quick_exit_event); } +static void test__stat32(void) +{ + static const char test_file[] = "\\stat_file.tst"; + static const char test_dir[] = "\\stat_dir.tst"; + + char path[2*MAX_PATH]; + struct _stat32 buf; + int fd, ret; + DWORD len; + + len = GetTempPathA(MAX_PATH, path); + ok(len, "GetTempPathA failed\n"); + + ret = p__stat32("c:", &buf); + ok(ret == -1, "_stat32('c:') returned %d\n", ret); + ret = p__stat32("c:\\", &buf); + ok(!ret, "_stat32('c:\\') returned %d\n", ret); + + memcpy(path+len, test_file, sizeof(test_file)); + if((fd = open(path, O_WRONLY | O_CREAT | O_BINARY, _S_IREAD |_S_IWRITE)) >= 0) + { + ret = p__stat32(path, &buf); + ok(!ret, "_stat32('%s') returned %d\n", path, ret); + strcat(path, "\\"); + ret = p__stat32(path, &buf); + todo_wine ok(ret, "_stat32('%s') returned %d\n", path, ret); + close(fd); + remove(path); + } + + memcpy(path+len, test_dir, sizeof(test_dir)); + if(!mkdir(path)) + { + ret = p__stat32(path, &buf); + ok(!ret, "_stat32('%s') returned %d\n", path, ret); + strcat(path, "\\"); + ret = p__stat32(path, &buf); + ok(!ret, "_stat32('%s') returned %d\n", path, ret); + rmdir(path); + } +} + START_TEST(misc) { int arg_c; @@ -964,4 +1009,5 @@ START_TEST(misc) test_asctime(); test_exit(arg_v[0]); test_quick_exit(arg_v[0]); + test__stat32(); }

1 0

← Newer
1
...
13
14
15
16
17
18
19
...
41
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits July 2018