July 2018 - Wine-Devel - list.winehq.org

[PATCH 1/4] psapi/tests: Link statically to psapi.
by Zebediah Figura July 5, 2018

July 5, 2018

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/psapi/tests/Makefile.in | 2 +- dlls/psapi/tests/psapi_main.c | 220 ++++++++++++++++-------------------------- 2 files changed, 83 insertions(+), 139 deletions(-) diff --git a/dlls/psapi/tests/Makefile.in b/dlls/psapi/tests/Makefile.in index 980ed0a..d085953 100644 --- a/dlls/psapi/tests/Makefile.in +++ b/dlls/psapi/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = psapi.dll -IMPORTS = user32 +IMPORTS = psapi user32 C_SRCS = \ psapi_main.c diff --git a/dlls/psapi/tests/psapi_main.c b/dlls/psapi/tests/psapi_main.c index 0c25668..aba05274 100644 --- a/dlls/psapi/tests/psapi_main.c +++ b/dlls/psapi/tests/psapi_main.c @@ -34,33 +34,10 @@ #include "winternl.h" #include "winnls.h" #include "winuser.h" +#define PSAPI_VERSION 1 #include "psapi.h" #include "wine/test.h" -#define PSAPI_GET_PROC(func) \ - p ## func = (void*)GetProcAddress(hpsapi, #func); \ - if(!p ## func) { \ - ok(0, "GetProcAddress(%s) failed\n", #func); \ - FreeLibrary(hpsapi); \ - return FALSE; \ - } - -static BOOL (WINAPI *pEmptyWorkingSet)(HANDLE); -static BOOL (WINAPI *pEnumProcesses)(DWORD*, DWORD, DWORD*); -static BOOL (WINAPI *pEnumProcessModules)(HANDLE, HMODULE*, DWORD, LPDWORD); -static DWORD (WINAPI *pGetModuleBaseNameA)(HANDLE, HMODULE, LPSTR, DWORD); -static DWORD (WINAPI *pGetModuleFileNameExA)(HANDLE, HMODULE, LPSTR, DWORD); -static DWORD (WINAPI *pGetModuleFileNameExW)(HANDLE, HMODULE, LPWSTR, DWORD); -static BOOL (WINAPI *pGetModuleInformation)(HANDLE, HMODULE, LPMODULEINFO, DWORD); -static DWORD (WINAPI *pGetMappedFileNameA)(HANDLE, LPVOID, LPSTR, DWORD); -static DWORD (WINAPI *pGetMappedFileNameW)(HANDLE, LPVOID, LPWSTR, DWORD); -static BOOL (WINAPI *pGetPerformanceInfo)(PPERFORMANCE_INFORMATION, DWORD); -static DWORD (WINAPI *pGetProcessImageFileNameA)(HANDLE, LPSTR, DWORD); -static DWORD (WINAPI *pGetProcessImageFileNameW)(HANDLE, LPWSTR, DWORD); -static BOOL (WINAPI *pGetProcessMemoryInfo)(HANDLE, PPROCESS_MEMORY_COUNTERS, DWORD); -static BOOL (WINAPI *pGetWsChanges)(HANDLE, PPSAPI_WS_WATCH_INFORMATION, DWORD); -static BOOL (WINAPI *pInitializeProcessForWsWatch)(HANDLE); -static BOOL (WINAPI *pQueryWorkingSet)(HANDLE, PVOID, DWORD); static NTSTATUS (WINAPI *pNtQuerySystemInformation)(SYSTEM_INFORMATION_CLASS, PVOID, ULONG, PULONG); static NTSTATUS (WINAPI *pNtQueryVirtualMemory)(HANDLE, LPCVOID, ULONG, PVOID, SIZE_T, SIZE_T *); static BOOL (WINAPI *pIsWow64Process)(HANDLE, BOOL *); @@ -69,28 +46,8 @@ static BOOL (WINAPI *pWow64RevertWow64FsRedirection)(void *); static BOOL wow64; -static BOOL InitFunctionPtrs(HMODULE hpsapi) +static BOOL init_func_ptrs(void) { - PSAPI_GET_PROC(EmptyWorkingSet); - PSAPI_GET_PROC(EnumProcessModules); - PSAPI_GET_PROC(EnumProcesses); - PSAPI_GET_PROC(GetModuleBaseNameA); - PSAPI_GET_PROC(GetModuleFileNameExA); - PSAPI_GET_PROC(GetModuleFileNameExW); - PSAPI_GET_PROC(GetModuleInformation); - PSAPI_GET_PROC(GetMappedFileNameA); - PSAPI_GET_PROC(GetMappedFileNameW); - PSAPI_GET_PROC(GetProcessMemoryInfo); - PSAPI_GET_PROC(GetWsChanges); - PSAPI_GET_PROC(InitializeProcessForWsWatch); - PSAPI_GET_PROC(QueryWorkingSet); - /* GetProcessImageFileName is not exported on NT4 */ - pGetPerformanceInfo = - (void *)GetProcAddress(hpsapi, "GetPerformanceInfo"); - pGetProcessImageFileNameA = - (void *)GetProcAddress(hpsapi, "GetProcessImageFileNameA"); - pGetProcessImageFileNameW = - (void *)GetProcAddress(hpsapi, "GetProcessImageFileNameW"); pNtQuerySystemInformation = (void *)GetProcAddress(GetModuleHandleA("ntdll.dll"), "NtQuerySystemInformation"); pNtQueryVirtualMemory = (void *)GetProcAddress(GetModuleHandleA("ntdll.dll"), "NtQueryVirtualMemory"); pIsWow64Process = (void *)GetProcAddress(GetModuleHandleA("kernel32.dll"), "IsWow64Process"); @@ -107,12 +64,12 @@ static void test_EnumProcesses(void) DWORD pid, ret, cbUsed = 0xdeadbeef; SetLastError(0xdeadbeef); - ret = pEnumProcesses(NULL, 0, &cbUsed); + ret = EnumProcesses(NULL, 0, &cbUsed); ok(ret == 1, "failed with %d\n", GetLastError()); ok(cbUsed == 0, "cbUsed=%d\n", cbUsed); SetLastError(0xdeadbeef); - ret = pEnumProcesses(&pid, 4, &cbUsed); + ret = EnumProcesses(&pid, 4, &cbUsed); ok(ret == 1, "failed with %d\n", GetLastError()); ok(cbUsed == 4, "cbUsed=%d\n", cbUsed); } @@ -127,39 +84,39 @@ static void test_EnumProcessModules(void) DWORD ret, cbNeeded = 0xdeadbeef; SetLastError(0xdeadbeef); - pEnumProcessModules(NULL, NULL, 0, &cbNeeded); + EnumProcessModules(NULL, NULL, 0, &cbNeeded); ok(GetLastError() == ERROR_INVALID_HANDLE, "expected error=ERROR_INVALID_HANDLE but got %d\n", GetLastError()); SetLastError(0xdeadbeef); - pEnumProcessModules(hpQI, NULL, 0, &cbNeeded); + EnumProcessModules(hpQI, NULL, 0, &cbNeeded); ok(GetLastError() == ERROR_ACCESS_DENIED, "expected error=ERROR_ACCESS_DENIED but got %d\n", GetLastError()); SetLastError(0xdeadbeef); hMod = (void *)0xdeadbeef; - ret = pEnumProcessModules(hpQI, &hMod, sizeof(HMODULE), NULL); + ret = EnumProcessModules(hpQI, &hMod, sizeof(HMODULE), NULL); ok(!ret, "succeeded\n"); ok(GetLastError() == ERROR_ACCESS_DENIED, "expected error=ERROR_ACCESS_DENIED but got %d\n", GetLastError()); SetLastError(0xdeadbeef); hMod = (void *)0xdeadbeef; - ret = pEnumProcessModules(hpQV, &hMod, sizeof(HMODULE), NULL); + ret = EnumProcessModules(hpQV, &hMod, sizeof(HMODULE), NULL); ok(!ret, "succeeded\n"); ok(GetLastError() == ERROR_NOACCESS, "expected error=ERROR_NOACCESS but got %d\n", GetLastError()); ok(hMod == GetModuleHandleA(NULL), "hMod=%p GetModuleHandleA(NULL)=%p\n", hMod, GetModuleHandleA(NULL)); SetLastError(0xdeadbeef); - ret = pEnumProcessModules(hpQV, NULL, 0, &cbNeeded); + ret = EnumProcessModules(hpQV, NULL, 0, &cbNeeded); ok(ret == 1, "failed with %d\n", GetLastError()); SetLastError(0xdeadbeef); - ret = pEnumProcessModules(hpQV, NULL, sizeof(HMODULE), &cbNeeded); + ret = EnumProcessModules(hpQV, NULL, sizeof(HMODULE), &cbNeeded); ok(!ret, "succeeded\n"); ok(GetLastError() == ERROR_NOACCESS, "expected error=ERROR_NOACCESS but got %d\n", GetLastError()); SetLastError(0xdeadbeef); hMod = (void *)0xdeadbeef; - ret = pEnumProcessModules(hpQV, &hMod, sizeof(HMODULE), &cbNeeded); + ret = EnumProcessModules(hpQV, &hMod, sizeof(HMODULE), &cbNeeded); ok(ret == 1, "got %d, failed with %d\n", ret, GetLastError()); ok(hMod == GetModuleHandleA(NULL), "hMod=%p GetModuleHandleA(NULL)=%p\n", hMod, GetModuleHandleA(NULL)); @@ -173,7 +130,7 @@ static void test_EnumProcessModules(void) SetLastError(0xdeadbeef); hMod = NULL; - ret = pEnumProcessModules(pi.hProcess, &hMod, sizeof(HMODULE), &cbNeeded); + ret = EnumProcessModules(pi.hProcess, &hMod, sizeof(HMODULE), &cbNeeded); ok(ret == 1, "got %d, error %u\n", ret, GetLastError()); ok(!!hMod, "expected non-NULL module\n"); ok(cbNeeded % sizeof(hMod) == 0, "got %u\n", cbNeeded); @@ -194,21 +151,21 @@ static void test_EnumProcessModules(void) SetLastError(0xdeadbeef); hMod = NULL; - ret = pEnumProcessModules(pi.hProcess, &hMod, sizeof(HMODULE), &cbNeeded); + ret = EnumProcessModules(pi.hProcess, &hMod, sizeof(HMODULE), &cbNeeded); ok(ret == 1, "got %d, error %u\n", ret, GetLastError()); ok(!!hMod, "expected non-NULL module\n"); ok(cbNeeded % sizeof(hMod) == 0, "got %u\n", cbNeeded); - ret = pGetModuleBaseNameA(pi.hProcess, hMod, name, sizeof(name)); + ret = GetModuleBaseNameA(pi.hProcess, hMod, name, sizeof(name)); ok(ret, "got error %u\n", GetLastError()); ok(!strcmp(name, "notepad.exe"), "got %s\n", name); - ret = pGetModuleFileNameExA(pi.hProcess, hMod, name, sizeof(name)); + ret = GetModuleFileNameExA(pi.hProcess, hMod, name, sizeof(name)); ok(ret, "got error %u\n", GetLastError()); todo_wine ok(!strcmp(name, buffer), "got %s\n", name); - ret = pGetModuleInformation(pi.hProcess, hMod, &info, sizeof(info)); + ret = GetModuleInformation(pi.hProcess, hMod, &info, sizeof(info)); ok(ret, "got error %u\n", GetLastError()); ok(info.lpBaseOfDll == hMod, "expected %p, got %p\n", hMod, info.lpBaseOfDll); ok(info.SizeOfImage, "image size was 0\n"); @@ -227,7 +184,7 @@ todo_wine ok(!ret, "wait timed out\n"); SetLastError(0xdeadbeef); - ret = pEnumProcessModules(pi.hProcess, &hMod, sizeof(HMODULE), &cbNeeded); + ret = EnumProcessModules(pi.hProcess, &hMod, sizeof(HMODULE), &cbNeeded); ok(!ret, "got %d\n", ret); todo_wine ok(GetLastError() == ERROR_PARTIAL_COPY, "got error %u\n", GetLastError()); @@ -243,23 +200,23 @@ static void test_GetModuleInformation(void) DWORD ret; SetLastError(0xdeadbeef); - pGetModuleInformation(NULL, hMod, &info, sizeof(info)); + GetModuleInformation(NULL, hMod, &info, sizeof(info)); ok(GetLastError() == ERROR_INVALID_HANDLE, "expected error=ERROR_INVALID_HANDLE but got %d\n", GetLastError()); SetLastError(0xdeadbeef); - pGetModuleInformation(hpQI, hMod, &info, sizeof(info)); + GetModuleInformation(hpQI, hMod, &info, sizeof(info)); ok(GetLastError() == ERROR_ACCESS_DENIED, "expected error=ERROR_ACCESS_DENIED but got %d\n", GetLastError()); SetLastError(0xdeadbeef); - pGetModuleInformation(hpQV, hBad, &info, sizeof(info)); + GetModuleInformation(hpQV, hBad, &info, sizeof(info)); ok(GetLastError() == ERROR_INVALID_HANDLE, "expected error=ERROR_INVALID_HANDLE but got %d\n", GetLastError()); SetLastError(0xdeadbeef); - pGetModuleInformation(hpQV, hMod, &info, sizeof(info)-1); + GetModuleInformation(hpQV, hMod, &info, sizeof(info)-1); ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "expected error=ERROR_INSUFFICIENT_BUFFER but got %d\n", GetLastError()); SetLastError(0xdeadbeef); - ret = pGetModuleInformation(hpQV, hMod, &info, sizeof(info)); + ret = GetModuleInformation(hpQV, hMod, &info, sizeof(info)); ok(ret == 1, "failed with %d\n", GetLastError()); ok(info.lpBaseOfDll == hMod, "lpBaseOfDll=%p hMod=%p\n", info.lpBaseOfDll, hMod); } @@ -277,12 +234,12 @@ static void test_GetPerformanceInfo(void) BOOL ret; SetLastError(0xdeadbeef); - ret = pGetPerformanceInfo(&info, sizeof(info)-1); + ret = GetPerformanceInfo(&info, sizeof(info)-1); ok(!ret, "GetPerformanceInfo unexpectedly succeeded\n"); ok(GetLastError() == ERROR_BAD_LENGTH, "expected error=ERROR_BAD_LENGTH but got %d\n", GetLastError()); SetLastError(0xdeadbeef); - ret = pGetPerformanceInfo(&info, sizeof(info)); + ret = GetPerformanceInfo(&info, sizeof(info)); ok(ret, "GetPerformanceInfo failed with %d\n", GetLastError()); ok(info.cb == sizeof(PERFORMANCE_INFORMATION), "got %d\n", info.cb); @@ -384,22 +341,22 @@ static void test_GetProcessMemoryInfo(void) DWORD ret; SetLastError(0xdeadbeef); - ret = pGetProcessMemoryInfo(NULL, &pmc, sizeof(pmc)); + ret = GetProcessMemoryInfo(NULL, &pmc, sizeof(pmc)); ok(!ret, "GetProcessMemoryInfo should fail\n"); ok(GetLastError() == ERROR_INVALID_HANDLE, "expected error=ERROR_INVALID_HANDLE but got %d\n", GetLastError()); SetLastError(0xdeadbeef); - ret = pGetProcessMemoryInfo(hpSR, &pmc, sizeof(pmc)); + ret = GetProcessMemoryInfo(hpSR, &pmc, sizeof(pmc)); ok(!ret, "GetProcessMemoryInfo should fail\n"); ok(GetLastError() == ERROR_ACCESS_DENIED, "expected error=ERROR_ACCESS_DENIED but got %d\n", GetLastError()); SetLastError(0xdeadbeef); - ret = pGetProcessMemoryInfo(hpQI, &pmc, sizeof(pmc)-1); + ret = GetProcessMemoryInfo(hpQI, &pmc, sizeof(pmc)-1); ok(!ret, "GetProcessMemoryInfo should fail\n"); ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "expected error=ERROR_INSUFFICIENT_BUFFER but got %d\n", GetLastError()); SetLastError(0xdeadbeef); - ret = pGetProcessMemoryInfo(hpQI, &pmc, sizeof(pmc)); + ret = GetProcessMemoryInfo(hpQI, &pmc, sizeof(pmc)); ok(ret == 1, "failed with %d\n", GetLastError()); } @@ -452,19 +409,19 @@ static void test_GetMappedFileName(void) HANDLE hfile, hmap; SetLastError(0xdeadbeef); - ret = pGetMappedFileNameA(NULL, hMod, szMapPath, sizeof(szMapPath)); + ret = GetMappedFileNameA(NULL, hMod, szMapPath, sizeof(szMapPath)); ok(!ret, "GetMappedFileName should fail\n"); todo_wine ok(GetLastError() == ERROR_INVALID_HANDLE, "expected error=ERROR_INVALID_HANDLE but got %d\n", GetLastError()); SetLastError(0xdeadbeef); - ret = pGetMappedFileNameA(hpSR, hMod, szMapPath, sizeof(szMapPath)); + ret = GetMappedFileNameA(hpSR, hMod, szMapPath, sizeof(szMapPath)); ok(!ret, "GetMappedFileName should fail\n"); todo_wine ok(GetLastError() == ERROR_ACCESS_DENIED, "expected error=ERROR_ACCESS_DENIED but got %d\n", GetLastError()); SetLastError( 0xdeadbeef ); - ret = pGetMappedFileNameA(hpQI, hMod, szMapPath, sizeof(szMapPath)); + ret = GetMappedFileNameA(hpQI, hMod, szMapPath, sizeof(szMapPath)); todo_wine ok( ret || broken(GetLastError() == ERROR_UNEXP_NET_ERR), /* win2k */ "GetMappedFileNameA failed with error %u\n", GetLastError() ); @@ -510,26 +467,26 @@ todo_wine ok(base != NULL, "MapViewOfFile error %d\n", GetLastError()); SetLastError(0xdeadbeef); - ret = pGetMappedFileNameA(GetCurrentProcess(), base, map_name, 0); + ret = GetMappedFileNameA(GetCurrentProcess(), base, map_name, 0); ok(!ret, "GetMappedFileName should fail\n"); todo_wine ok(GetLastError() == ERROR_INVALID_PARAMETER || GetLastError() == ERROR_INSUFFICIENT_BUFFER, "wrong error %d\n", GetLastError()); SetLastError(0xdeadbeef); - ret = pGetMappedFileNameA(GetCurrentProcess(), base, 0, sizeof(map_name)); + ret = GetMappedFileNameA(GetCurrentProcess(), base, 0, sizeof(map_name)); ok(!ret, "GetMappedFileName should fail\n"); todo_wine ok(GetLastError() == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); SetLastError(0xdeadbeef); - ret = pGetMappedFileNameA(GetCurrentProcess(), base, map_name, 1); + ret = GetMappedFileNameA(GetCurrentProcess(), base, map_name, 1); todo_wine ok(ret == 1, "GetMappedFileName error %d\n", GetLastError()); ok(!map_name[0] || broken(map_name[0] == device_name[0]) /* before win2k */, "expected 0, got %c\n", map_name[0]); SetLastError(0xdeadbeef); - ret = pGetMappedFileNameA(GetCurrentProcess(), base, map_name, sizeof(map_name)); + ret = GetMappedFileNameA(GetCurrentProcess(), base, map_name, sizeof(map_name)); todo_wine { ok(ret, "GetMappedFileName error %d\n", GetLastError()); ok(ret > strlen(device_name), "map_name should be longer than device_name\n"); @@ -537,7 +494,7 @@ todo_wine { } SetLastError(0xdeadbeef); - ret = pGetMappedFileNameW(GetCurrentProcess(), base, map_nameW, ARRAY_SIZE(map_nameW)); + ret = GetMappedFileNameW(GetCurrentProcess(), base, map_nameW, ARRAY_SIZE(map_nameW)); todo_wine { ok(ret, "GetMappedFileNameW error %d\n", GetLastError()); ok(ret > strlen(device_name), "map_name should be longer than device_name\n"); @@ -550,7 +507,7 @@ todo_wine { } SetLastError(0xdeadbeef); - ret = pGetMappedFileNameA(GetCurrentProcess(), base + 0x2000, map_name, sizeof(map_name)); + ret = GetMappedFileNameA(GetCurrentProcess(), base + 0x2000, map_name, sizeof(map_name)); todo_wine { ok(ret, "GetMappedFileName error %d\n", GetLastError()); ok(ret > strlen(device_name), "map_name should be longer than device_name\n"); @@ -558,19 +515,19 @@ todo_wine { } SetLastError(0xdeadbeef); - ret = pGetMappedFileNameA(GetCurrentProcess(), base + 0x4000, map_name, sizeof(map_name)); + ret = GetMappedFileNameA(GetCurrentProcess(), base + 0x4000, map_name, sizeof(map_name)); ok(!ret, "GetMappedFileName should fail\n"); todo_wine ok(GetLastError() == ERROR_UNEXP_NET_ERR, "expected ERROR_UNEXP_NET_ERR, got %d\n", GetLastError()); SetLastError(0xdeadbeef); - ret = pGetMappedFileNameA(GetCurrentProcess(), NULL, map_name, sizeof(map_name)); + ret = GetMappedFileNameA(GetCurrentProcess(), NULL, map_name, sizeof(map_name)); ok(!ret, "GetMappedFileName should fail\n"); todo_wine ok(GetLastError() == ERROR_UNEXP_NET_ERR, "expected ERROR_UNEXP_NET_ERR, got %d\n", GetLastError()); SetLastError(0xdeadbeef); - ret = pGetMappedFileNameA(0, base, map_name, sizeof(map_name)); + ret = GetMappedFileNameA(0, base, map_name, sizeof(map_name)); ok(!ret, "GetMappedFileName should fail\n"); todo_wine ok(GetLastError() == ERROR_INVALID_HANDLE, "expected ERROR_INVALID_HANDLE, got %d\n", GetLastError()); @@ -589,7 +546,7 @@ todo_wine ok(base != NULL, "MapViewOfFile error %d\n", GetLastError()); SetLastError(0xdeadbeef); - ret = pGetMappedFileNameA(GetCurrentProcess(), base, map_name, sizeof(map_name)); + ret = GetMappedFileNameA(GetCurrentProcess(), base, map_name, sizeof(map_name)); ok(!ret, "GetMappedFileName should fail\n"); todo_wine ok(GetLastError() == ERROR_FILE_INVALID, "expected ERROR_FILE_INVALID, got %d\n", GetLastError()); @@ -605,12 +562,9 @@ static void test_GetProcessImageFileName(void) WCHAR szImgPathW[MAX_PATH]; DWORD ret, ret1; - if(pGetProcessImageFileNameA == NULL) - return; - /* This function is available on WinXP+ only */ SetLastError(0xdeadbeef); - if(!pGetProcessImageFileNameA(hpQI, szImgPath, sizeof(szImgPath))) + if(!GetProcessImageFileNameA(hpQI, szImgPath, sizeof(szImgPath))) { if(GetLastError() == ERROR_INVALID_FUNCTION) { win_skip("GetProcessImageFileName not implemented\n"); @@ -624,19 +578,19 @@ static void test_GetProcessImageFileName(void) } SetLastError(0xdeadbeef); - pGetProcessImageFileNameA(NULL, szImgPath, sizeof(szImgPath)); + GetProcessImageFileNameA(NULL, szImgPath, sizeof(szImgPath)); ok(GetLastError() == ERROR_INVALID_HANDLE, "expected error=ERROR_INVALID_HANDLE but got %d\n", GetLastError()); SetLastError(0xdeadbeef); - pGetProcessImageFileNameA(hpSR, szImgPath, sizeof(szImgPath)); + GetProcessImageFileNameA(hpSR, szImgPath, sizeof(szImgPath)); ok(GetLastError() == ERROR_ACCESS_DENIED, "expected error=ERROR_ACCESS_DENIED but got %d\n", GetLastError()); SetLastError(0xdeadbeef); - pGetProcessImageFileNameA(hpQI, szImgPath, 0); + GetProcessImageFileNameA(hpQI, szImgPath, 0); ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "expected error=ERROR_INSUFFICIENT_BUFFER but got %d\n", GetLastError()); - ret = pGetProcessImageFileNameA(hpQI, szImgPath, sizeof(szImgPath)); - ret1 = pGetMappedFileNameA(hpQV, hMod, szMapPath, sizeof(szMapPath)); + ret = GetProcessImageFileNameA(hpQI, szImgPath, sizeof(szImgPath)); + ret1 = GetMappedFileNameA(hpQV, hMod, szMapPath, sizeof(szMapPath)); if(ret && ret1) { /* Windows returns 2*strlen-1 */ @@ -645,32 +599,32 @@ static void test_GetProcessImageFileName(void) } SetLastError(0xdeadbeef); - pGetProcessImageFileNameW(NULL, szImgPathW, ARRAY_SIZE(szImgPathW)); + GetProcessImageFileNameW(NULL, szImgPathW, ARRAY_SIZE(szImgPathW)); ok(GetLastError() == ERROR_INVALID_HANDLE, "expected error=ERROR_INVALID_HANDLE but got %d\n", GetLastError()); /* no information about correct buffer size returned: */ SetLastError(0xdeadbeef); - pGetProcessImageFileNameW(hpQI, szImgPathW, 0); + GetProcessImageFileNameW(hpQI, szImgPathW, 0); ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "expected error=ERROR_INSUFFICIENT_BUFFER but got %d\n", GetLastError()); SetLastError(0xdeadbeef); - pGetProcessImageFileNameW(hpQI, NULL, 0); + GetProcessImageFileNameW(hpQI, NULL, 0); ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "expected error=ERROR_INSUFFICIENT_BUFFER but got %d\n", GetLastError()); /* correct call */ memset(szImgPathW, 0xff, sizeof(szImgPathW)); - ret = pGetProcessImageFileNameW(hpQI, szImgPathW, ARRAY_SIZE(szImgPathW)); + ret = GetProcessImageFileNameW(hpQI, szImgPathW, ARRAY_SIZE(szImgPathW)); ok(ret > 0, "GetProcessImageFileNameW should have succeeded.\n"); ok(szImgPathW[0] == '\\', "GetProcessImageFileNameW should have returned an NT path.\n"); ok(lstrlenW(szImgPathW) == ret, "Expected length to be %d, got %d\n", ret, lstrlenW(szImgPathW)); /* boundary values of 'size' */ SetLastError(0xdeadbeef); - pGetProcessImageFileNameW(hpQI, szImgPathW, ret); + GetProcessImageFileNameW(hpQI, szImgPathW, ret); ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "expected error=ERROR_INSUFFICIENT_BUFFER but got %d\n", GetLastError()); memset(szImgPathW, 0xff, sizeof(szImgPathW)); - ret = pGetProcessImageFileNameW(hpQI, szImgPathW, ret + 1); + ret = GetProcessImageFileNameW(hpQI, szImgPathW, ret + 1); ok(ret > 0, "GetProcessImageFileNameW should have succeeded.\n"); ok(szImgPathW[0] == '\\', "GetProcessImageFileNameW should have returned an NT path.\n"); ok(lstrlenW(szImgPathW) == ret, "Expected length to be %d, got %d\n", ret, lstrlenW(szImgPathW)); @@ -684,21 +638,21 @@ static void test_GetModuleFileNameEx(void) DWORD ret; SetLastError(0xdeadbeef); - ret = pGetModuleFileNameExA(NULL, hMod, szModExPath, sizeof(szModExPath)); + ret = GetModuleFileNameExA(NULL, hMod, szModExPath, sizeof(szModExPath)); ok( !ret, "GetModuleFileNameExA succeeded\n" ); ok(GetLastError() == ERROR_INVALID_HANDLE, "expected error=ERROR_INVALID_HANDLE but got %d\n", GetLastError()); SetLastError(0xdeadbeef); - ret = pGetModuleFileNameExA(hpQI, hMod, szModExPath, sizeof(szModExPath)); + ret = GetModuleFileNameExA(hpQI, hMod, szModExPath, sizeof(szModExPath)); ok( !ret, "GetModuleFileNameExA succeeded\n" ); ok(GetLastError() == ERROR_ACCESS_DENIED, "expected error=ERROR_ACCESS_DENIED but got %d\n", GetLastError()); SetLastError(0xdeadbeef); - ret = pGetModuleFileNameExA(hpQV, hBad, szModExPath, sizeof(szModExPath)); + ret = GetModuleFileNameExA(hpQV, hBad, szModExPath, sizeof(szModExPath)); ok( !ret, "GetModuleFileNameExA succeeded\n" ); ok(GetLastError() == ERROR_INVALID_HANDLE, "expected error=ERROR_INVALID_HANDLE but got %d\n", GetLastError()); - ret = pGetModuleFileNameExA(hpQV, NULL, szModExPath, sizeof(szModExPath)); + ret = GetModuleFileNameExA(hpQV, NULL, szModExPath, sizeof(szModExPath)); if(!ret) return; ok(ret == strlen(szModExPath), "szModExPath=\"%s\" ret=%d\n", szModExPath, ret); @@ -708,7 +662,7 @@ static void test_GetModuleFileNameEx(void) SetLastError(0xdeadbeef); memset( szModExPath, 0xcc, sizeof(szModExPath) ); - ret = pGetModuleFileNameExA(hpQV, NULL, szModExPath, 4 ); + ret = GetModuleFileNameExA(hpQV, NULL, szModExPath, 4 ); ok( ret == 4 || ret == strlen(szModExPath), "wrong length %u\n", ret ); ok( broken(szModExPath[3]) /*w2kpro*/ || strlen(szModExPath) == 3, "szModExPath=\"%s\" ret=%d\n", szModExPath, ret ); @@ -717,14 +671,14 @@ static void test_GetModuleFileNameEx(void) if (0) /* crashes on Windows 10 */ { SetLastError(0xdeadbeef); - ret = pGetModuleFileNameExA(hpQV, NULL, szModExPath, 0 ); + ret = GetModuleFileNameExA(hpQV, NULL, szModExPath, 0 ); ok( ret == 0, "wrong length %u\n", ret ); ok(GetLastError() == ERROR_INVALID_PARAMETER, "got error %d\n", GetLastError()); } SetLastError(0xdeadbeef); memset( buffer, 0xcc, sizeof(buffer) ); - ret = pGetModuleFileNameExW(hpQV, NULL, buffer, 4 ); + ret = GetModuleFileNameExW(hpQV, NULL, buffer, 4 ); ok( ret == 4 || ret == lstrlenW(buffer), "wrong length %u\n", ret ); ok( broken(buffer[3]) /*w2kpro*/ || lstrlenW(buffer) == 3, "buffer=%s ret=%d\n", wine_dbgstr_w(buffer), ret ); @@ -734,7 +688,7 @@ static void test_GetModuleFileNameEx(void) { SetLastError(0xdeadbeef); buffer[0] = 0xcc; - ret = pGetModuleFileNameExW(hpQV, NULL, buffer, 0 ); + ret = GetModuleFileNameExW(hpQV, NULL, buffer, 0 ); ok( ret == 0, "wrong length %u\n", ret ); ok(GetLastError() == 0xdeadbeef, "got error %d\n", GetLastError()); ok( buffer[0] == 0xcc, "buffer modified %s\n", wine_dbgstr_w(buffer) ); @@ -748,18 +702,18 @@ static void test_GetModuleBaseName(void) DWORD ret; SetLastError(0xdeadbeef); - pGetModuleBaseNameA(NULL, hMod, szModBaseName, sizeof(szModBaseName)); + GetModuleBaseNameA(NULL, hMod, szModBaseName, sizeof(szModBaseName)); ok(GetLastError() == ERROR_INVALID_HANDLE, "expected error=ERROR_INVALID_HANDLE but got %d\n", GetLastError()); SetLastError(0xdeadbeef); - pGetModuleBaseNameA(hpQI, hMod, szModBaseName, sizeof(szModBaseName)); + GetModuleBaseNameA(hpQI, hMod, szModBaseName, sizeof(szModBaseName)); ok(GetLastError() == ERROR_ACCESS_DENIED, "expected error=ERROR_ACCESS_DENIED but got %d\n", GetLastError()); SetLastError(0xdeadbeef); - pGetModuleBaseNameA(hpQV, hBad, szModBaseName, sizeof(szModBaseName)); + GetModuleBaseNameA(hpQV, hBad, szModBaseName, sizeof(szModBaseName)); ok(GetLastError() == ERROR_INVALID_HANDLE, "expected error=ERROR_INVALID_HANDLE but got %d\n", GetLastError()); - ret = pGetModuleBaseNameA(hpQV, NULL, szModBaseName, sizeof(szModBaseName)); + ret = GetModuleBaseNameA(hpQV, NULL, szModBaseName, sizeof(szModBaseName)); if(!ret) return; ok(ret == strlen(szModBaseName), "szModBaseName=\"%s\" ret=%d\n", szModBaseName, ret); @@ -777,19 +731,19 @@ static void test_ws_functions(void) BOOL ret; SetLastError(0xdeadbeef); - pEmptyWorkingSet(NULL); + EmptyWorkingSet(NULL); todo_wine ok(GetLastError() == ERROR_INVALID_HANDLE, "expected error=ERROR_INVALID_HANDLE but got %d\n", GetLastError()); SetLastError(0xdeadbeef); - pEmptyWorkingSet(hpSR); + EmptyWorkingSet(hpSR); todo_wine ok(GetLastError() == ERROR_ACCESS_DENIED, "expected error=ERROR_ACCESS_DENIED but got %d\n", GetLastError()); SetLastError(0xdeadbeef); - ret = pEmptyWorkingSet(hpAA); + ret = EmptyWorkingSet(hpAA); ok(ret == 1, "failed with %d\n", GetLastError()); SetLastError( 0xdeadbeef ); - ret = pInitializeProcessForWsWatch( NULL ); + ret = InitializeProcessForWsWatch( NULL ); todo_wine ok( !ret, "InitializeProcessForWsWatch succeeded\n" ); if (!ret) { @@ -801,7 +755,7 @@ static void test_ws_functions(void) ok( GetLastError() == ERROR_INVALID_HANDLE, "wrong error %u\n", GetLastError() ); } SetLastError(0xdeadbeef); - ret = pInitializeProcessForWsWatch(hpAA); + ret = InitializeProcessForWsWatch(hpAA); ok(ret == 1, "failed with %d\n", GetLastError()); addr = VirtualAlloc(NULL, 1, MEM_COMMIT, PAGE_READWRITE); @@ -816,7 +770,7 @@ static void test_ws_functions(void) } SetLastError(0xdeadbeef); - ret = pQueryWorkingSet(hpQI, pages, 4096 * sizeof(ULONG_PTR)); + ret = QueryWorkingSet(hpQI, pages, 4096 * sizeof(ULONG_PTR)); todo_wine ok(ret == 1, "failed with %d\n", GetLastError()); if(ret == 1) { @@ -832,7 +786,7 @@ static void test_ws_functions(void) test_gwsc: SetLastError(0xdeadbeef); - ret = pGetWsChanges(hpQI, wswi, sizeof(wswi)); + ret = GetWsChanges(hpQI, wswi, sizeof(wswi)); todo_wine ok(ret == 1, "failed with %d\n", GetLastError()); if(ret == 1) { @@ -852,20 +806,12 @@ free_page: START_TEST(psapi_main) { - HMODULE hpsapi = LoadLibraryA("psapi.dll"); + DWORD pid = GetCurrentProcessId(); - if(!hpsapi) - { - win_skip("Could not load psapi.dll\n"); - return; - } + init_func_ptrs(); - if(InitFunctionPtrs(hpsapi)) - { - DWORD pid = GetCurrentProcessId(); - - if (pIsWow64Process) - IsWow64Process(GetCurrentProcess(), &wow64); + if (pIsWow64Process) + IsWow64Process(GetCurrentProcess(), &wow64); hpSR = OpenProcess(STANDARD_RIGHTS_REQUIRED, FALSE, pid); hpQI = OpenProcess(PROCESS_QUERY_INFORMATION, FALSE, pid); @@ -886,12 +832,10 @@ START_TEST(psapi_main) test_GetModuleBaseName(); test_ws_functions(); } - CloseHandle(hpSR); - CloseHandle(hpQI); - CloseHandle(hpVR); - CloseHandle(hpQV); - CloseHandle(hpAA); - } - - FreeLibrary(hpsapi); + + CloseHandle(hpSR); + CloseHandle(hpQI); + CloseHandle(hpVR); + CloseHandle(hpQV); + CloseHandle(hpAA); } -- 2.7.4

2 6

Re: Alexandre Julliard : server: Don' t clip update regions to the desktop window.
by Ken Thomases July 5, 2018

July 5, 2018

On Jul 5, 2018, at 3:25 PM, Alexandre Julliard <julliard(a)winehq.org> wrote: > > Module: wine > Branch: master > Commit: 8cfac3b218669edcef8b92ea8370b0579eb23ea9 > URL: https://source.winehq.org/git/wine.git/?a=commit;h=8cfac3b218669edcef8b92ea… > > Author: Alexandre Julliard <julliard(a)winehq.org> > Date: Thu Jul 5 12:48:13 2018 +0200 > > server: Don't clip update regions to the desktop window. > > Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> > > --- > > dlls/user32/tests/msg.c | 4 ++-- > server/window.c | 23 ++++++++--------------- > 2 files changed, 10 insertions(+), 17 deletions(-) > > diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c > index 0cfafe4..cb918fa 100644 > --- a/dlls/user32/tests/msg.c > +++ b/dlls/user32/tests/msg.c > @@ -4760,7 +4760,7 @@ static void test_showwindow(void) > flush_sequence(); > ShowWindow(hwnd, SW_SHOWMAXIMIZED); > ok_sequence(WmShowMaxPopupResizedSeq_todo, > - "ShowWindow(SW_SHOWMAXIMIZED):invisible maximized and resized popup TODO", TRUE); > + "ShowWindow(SW_SHOWMAXIMIZED):invisible maximized and resized popup TODO", FALSE); Should the name of the test sequence and the context string both have "_todo"/" TODO" removed? (Although "WmShowMaxPopupResizedSeq" is already used for a difference sequence.) -Ken

2 1

[PATCH v5] winemac.drv: Wake up the display on user input.
by Ken Thomases July 5, 2018

July 5, 2018

From: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Ken Thomases <ken(a)codeweavers.com> --- v5: include IOPMLib.h to fix build, call UpdateSystemActivity() to also reset screen saver --- dlls/winemac.drv/window.c | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/dlls/winemac.drv/window.c b/dlls/winemac.drv/window.c index e49a445..6558824 100644 --- a/dlls/winemac.drv/window.c +++ b/dlls/winemac.drv/window.c @@ -23,6 +23,13 @@ #include "config.h" +#include <IOKit/pwr_mgt/IOPMLib.h> +#define GetCurrentThread Mac_GetCurrentThread +#define LoadResource Mac_LoadResource +#include <CoreServices/CoreServices.h> +#undef GetCurrentThread +#undef LoadResource + #include "macdrv.h" #include "winuser.h" #include "wine/unicode.h" @@ -1551,13 +1558,44 @@ BOOL CDECL macdrv_CreateDesktopWindow(HWND hwnd) } +static WNDPROC desktop_orig_wndproc; + +#define WM_WINE_NOTIFY_ACTIVITY WM_USER + +static LRESULT CALLBACK desktop_wndproc_wrapper( HWND hwnd, UINT msg, WPARAM wp, LPARAM lp ) +{ + switch (msg) + { + case WM_WINE_NOTIFY_ACTIVITY: + { + /* This wakes from display sleep, but doesn't affect the screen saver. */ + static IOPMAssertionID assertion; + IOPMAssertionDeclareUserActivity(CFSTR("Wine user input"), kIOPMUserActiveLocal, &assertion); + + /* This prevents the screen saver, but doesn't wake from display sleep. */ + /* It's deprecated, but there's no better alternative. */ +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wdeprecated-declarations" + UpdateSystemActivity(UsrActivity); +#pragma clang diagnostic pop + break; + } + } + return desktop_orig_wndproc( hwnd, msg, wp, lp ); +} + /********************************************************************** * CreateWindow (MACDRV.@) */ BOOL CDECL macdrv_CreateWindow(HWND hwnd) { if (hwnd == GetDesktopWindow()) + { + desktop_orig_wndproc = (WNDPROC)SetWindowLongPtrW( GetDesktopWindow(), + GWLP_WNDPROC, (LONG_PTR)desktop_wndproc_wrapper ); + macdrv_init_clipboard(); + } return TRUE; } -- 2.10.2

1 0

[PATCH] krnl386.exe16: Avoid ARRAY_SIZE-like macros
by Michael Stefaniuc July 5, 2018

July 5, 2018

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/krnl386.exe16/error.c | 6 ++---- dlls/krnl386.exe16/int21.c | 8 +++----- dlls/krnl386.exe16/vxd.c | 4 +--- 3 files changed, 6 insertions(+), 12 deletions(-) diff --git a/dlls/krnl386.exe16/error.c b/dlls/krnl386.exe16/error.c index dc02d2132e..5508d7c0e8 100644 --- a/dlls/krnl386.exe16/error.c +++ b/dlls/krnl386.exe16/error.c @@ -193,8 +193,6 @@ static const struct { }; #undef ErrorString -#define ErrorStringCount (sizeof(ErrorStrings) / sizeof(ErrorStrings[0])) -#define ParamErrorStringCount (sizeof(ParamErrorStrings) / sizeof(ParamErrorStrings[0])) /*********************************************************************** * GetErrorString (internal) @@ -204,7 +202,7 @@ static const char *GetErrorString(UINT16 uErr) static char buffer[80]; unsigned int n; - for (n = 0; n < ErrorStringCount; n++) { + for (n = 0; n < ARRAY_SIZE(ErrorStrings); n++) { if (uErr == ErrorStrings[n].constant) return ErrorStrings[n].name; } @@ -229,7 +227,7 @@ static const char *GetParamErrorString(UINT16 uErr) { { unsigned int n; - for (n = 0; n < ParamErrorStringCount; n++) { + for (n = 0; n < ARRAY_SIZE(ParamErrorStrings); n++) { if (uErr == ParamErrorStrings[n].constant) { strcat(buffer, ParamErrorStrings[n].name); return buffer; diff --git a/dlls/krnl386.exe16/int21.c b/dlls/krnl386.exe16/int21.c index 3a08749d41..f32b1a767c 100644 --- a/dlls/krnl386.exe16/int21.c +++ b/dlls/krnl386.exe16/int21.c @@ -282,8 +282,6 @@ static struct magic_device magic_devices[] = { {'h','p','s','c','a','n',0}, NULL, { { 0, 0 } }, INT21_IoctlHPScanHandler }, }; -#define NB_MAGIC_DEVICES (sizeof(magic_devices)/sizeof(magic_devices[0])) - /* Many calls translate a drive argument like this: drive number (00h = default, 01h = A:, etc) @@ -856,13 +854,13 @@ static HANDLE INT21_OpenMagicDevice( LPCWSTR name, DWORD access ) if ((p = strrchrW( name, '/' ))) name = p + 1; if ((p = strrchrW( name, '\\' ))) name = p + 1; - for (i = 0; i < NB_MAGIC_DEVICES; i++) + for (i = 0; i < ARRAY_SIZE(magic_devices); i++) { int len = strlenW( magic_devices[i].name ); if (!strncmpiW( magic_devices[i].name, name, len ) && (!name[len] || name[len] == '.' || name[len] == ':')) break; } - if (i == NB_MAGIC_DEVICES) return 0; + if (i == ARRAY_SIZE(magic_devices)) return 0; if (!magic_devices[i].handle) /* need to open it */ { @@ -2639,7 +2637,7 @@ static void INT21_Ioctl_Char( CONTEXT *context ) } } else { UINT i; - for (i = 0; i < NB_MAGIC_DEVICES; i++) + for (i = 0; i < ARRAY_SIZE(magic_devices); i++) { if (!magic_devices[i].handle) continue; if (magic_devices[i].index.QuadPart == info.IndexNumber.QuadPart) diff --git a/dlls/krnl386.exe16/vxd.c b/dlls/krnl386.exe16/vxd.c index 7be5f63b5e..dc14600f5d 100644 --- a/dlls/krnl386.exe16/vxd.c +++ b/dlls/krnl386.exe16/vxd.c @@ -80,8 +80,6 @@ static struct vxdcall_service vxd_services[] = { {'v','w','i','n','3','2','.','v','x','d',0}, 0x002a, NULL, NULL } }; -#define NB_VXD_SERVICES (sizeof(vxd_services)/sizeof(vxd_services[0])) - #define W32S_APP2WINE(addr) ((addr)? (DWORD)(addr) + W32S_offset : 0) #define W32S_WINE2APP(addr) ((addr)? (DWORD)(addr) - W32S_offset : 0) @@ -293,7 +291,7 @@ void WINAPI DECLSPEC_HIDDEN __regs_VxDCall( CONTEXT *context ) DWORD service = stack32_pop( context ); RtlEnterCriticalSection( &vxd_section ); - for (i = 0; i < NB_VXD_SERVICES; i++) + for (i = 0; i < ARRAY_SIZE(vxd_services); i++) { if (HIWORD(service) != vxd_services[i].service) continue; if (!vxd_services[i].module) /* need to load it */ -- 2.14.4

1 0

[PATCH] glu32: Avoid an ARRAY_SIZE-like macro
by Michael Stefaniuc July 5, 2018

July 5, 2018

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/glu32/glu.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/glu32/glu.c b/dlls/glu32/glu.c index 973e4484e7..8f0a360ff9 100644 --- a/dlls/glu32/glu.c +++ b/dlls/glu32/glu.c @@ -91,7 +91,6 @@ static const struct { GLuint err; const char *str; } errors[] = { GLU_NURBS_ERROR36, "null control point reference" }, { GLU_NURBS_ERROR37, "duplicate point on piecewise linear trimming curve" }, }; -#define NB_ERRORS (sizeof(errors) / sizeof(errors[0])) typedef void (*_GLUfuncptr)(void); @@ -148,7 +147,7 @@ const GLubyte * WINAPI wine_gluErrorString( GLenum errCode ) { unsigned int i; - for (i = 0; i < NB_ERRORS; i++) + for (i = 0; i < ARRAY_SIZE(errors); i++) if (errors[i].err == errCode) return (const GLubyte *)errors[i].str; return NULL; @@ -159,10 +158,10 @@ const GLubyte * WINAPI wine_gluErrorString( GLenum errCode ) */ const WCHAR * WINAPI wine_gluErrorUnicodeStringEXT( GLenum errCode ) { - static WCHAR errorsW[NB_ERRORS][64]; + static WCHAR errorsW[ARRAY_SIZE(errors)][64]; unsigned int i, j; - for (i = 0; i < NB_ERRORS; i++) + for (i = 0; i < ARRAY_SIZE(errors); i++) { if (errors[i].err != errCode) continue; if (!errorsW[i][0]) /* errors use only ASCII, do a simple mapping */ -- 2.14.4

1 0

[PATCH] serialui: Replace a macro with ARRAY_SIZE
by Michael Stefaniuc July 5, 2018

July 5, 2018

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/serialui/confdlg.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/dlls/serialui/confdlg.c b/dlls/serialui/confdlg.c index da14472e3e..7797c238fc 100644 --- a/dlls/serialui/confdlg.c +++ b/dlls/serialui/confdlg.c @@ -112,36 +112,34 @@ typedef struct tagPARAM2STR } PARAM2STR, *LPPARAM2STR; typedef const PARAM2STR *LPCPARAM2STR; -#define SERIALUI_TABLESIZE(x) ((sizeof (x))/(sizeof (x[0]))) - static PARAM2STRDATA SERIALUI_Baud2StrData[]={ {110, "110"}, {300, "300"}, {600, "600"}, {1200, "1200"}, {2400, "2400"}, {4800, "4800"}, {9600, "9600"}, {14400, "14400"}, {19200, "19200"}, {38400L, "38400"}, {56000L, "56000"}, {57600L, "57600"}, {115200L, "115200"}, {128000L, "128000"}, {256000L, "256000"} }; -static PARAM2STR SERIALUI_Baud2Str={ SERIALUI_TABLESIZE(SERIALUI_Baud2StrData),SERIALUI_Baud2StrData }; +static PARAM2STR SERIALUI_Baud2Str={ ARRAY_SIZE(SERIALUI_Baud2StrData), SERIALUI_Baud2StrData }; static PARAM2STRDATA SERIALUI_Parity2StrData[]={ {NOPARITY,"None"}, {ODDPARITY,"Odd"}, {EVENPARITY,"Even"}, {MARKPARITY,"Mark"}, {SPACEPARITY,"Space"} }; -static PARAM2STR SERIALUI_Parity2Str={ SERIALUI_TABLESIZE(SERIALUI_Parity2StrData),SERIALUI_Parity2StrData }; +static PARAM2STR SERIALUI_Parity2Str={ ARRAY_SIZE(SERIALUI_Parity2StrData), SERIALUI_Parity2StrData }; static PARAM2STRDATA SERIALUI_Stop2StrData[]={ {ONESTOPBIT,"1"}, {ONE5STOPBITS,"1.5"}, {TWOSTOPBITS,"2"} }; -static PARAM2STR SERIALUI_Stop2Str={ SERIALUI_TABLESIZE(SERIALUI_Stop2StrData),SERIALUI_Stop2StrData }; +static PARAM2STR SERIALUI_Stop2Str={ ARRAY_SIZE(SERIALUI_Stop2StrData), SERIALUI_Stop2StrData }; static PARAM2STRDATA SERIALUI_Data2StrData[]={ {5,"5"}, {6,"6"}, {7,"7"}, {8, "8"}, {16,"16"} }; -static PARAM2STR SERIALUI_Data2Str={ SERIALUI_TABLESIZE(SERIALUI_Data2StrData),SERIALUI_Data2StrData }; +static PARAM2STR SERIALUI_Data2Str={ ARRAY_SIZE(SERIALUI_Data2StrData), SERIALUI_Data2StrData }; static PARAM2STRDATA SERIALUI_Flow2StrData[]={ {0,"None"}, {1,"Hardware (RTS/CTS)"}, {2,"Software (XON/XOFF)"} }; -static PARAM2STR SERIALUI_Flow2Str={ SERIALUI_TABLESIZE(SERIALUI_Flow2StrData),SERIALUI_Flow2StrData }; +static PARAM2STR SERIALUI_Flow2Str={ ARRAY_SIZE(SERIALUI_Flow2StrData), SERIALUI_Flow2StrData }; /* * Add all the fields to a combo box and highlight the current value -- 2.14.4

1 0

[PATCH] dssenh/test: Replace a macro with ARRAY_SIZE
by Michael Stefaniuc July 5, 2018

July 5, 2018

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dssenh/tests/dssenh.c | 32 +++++++++++++++----------------- 1 file changed, 15 insertions(+), 17 deletions(-) diff --git a/dlls/dssenh/tests/dssenh.c b/dlls/dssenh/tests/dssenh.c index ccb7dcdd6d..b62f592f5f 100644 --- a/dlls/dssenh/tests/dssenh.c +++ b/dlls/dssenh/tests/dssenh.c @@ -341,8 +341,6 @@ static void test_keylength_array(HCRYPTPROV hProv,const struct keylength_test *t } } -#define TESTLEN(x) (sizeof(x) / sizeof((x)[0])) - static void test_keylength(void) { HCRYPTPROV hProv = 0; @@ -359,7 +357,7 @@ static void test_keylength(void) ok(result, "Expected no errors.\n"); /* perform keylength tests */ - test_keylength_array(hProv, baseDSS_keylength, TESTLEN(baseDSS_keylength)); + test_keylength_array(hProv, baseDSS_keylength, ARRAY_SIZE(baseDSS_keylength)); result = CryptReleaseContext(hProv, 0); ok(result, "Expected release of CSP provider.\n"); @@ -370,7 +368,7 @@ static void test_keylength(void) ok(result, "Expected no errors.\n"); /* perform keylength tests */ - test_keylength_array(hProv, dssDH_keylength, TESTLEN(dssDH_keylength)); + test_keylength_array(hProv, dssDH_keylength, ARRAY_SIZE(dssDH_keylength)); result = CryptReleaseContext(hProv, 0); ok(result, "Expected release of CSP provider.\n"); @@ -387,7 +385,7 @@ static void test_keylength(void) ok(result, "Expected no errors.\n"); /* perform keylength tests */ - test_keylength_array(hProv, dssENH_keylength, TESTLEN(dssENH_keylength)); + test_keylength_array(hProv, dssENH_keylength, ARRAY_SIZE(dssENH_keylength)); result = CryptReleaseContext(hProv, 0); ok(result, "Expected release of CSP provider.\n"); @@ -398,7 +396,7 @@ static void test_keylength(void) ok(result, "Expected no errors.\n"); /* perform keylength tests */ - test_keylength_array(hProv, dssENH_keylength, TESTLEN(dssENH_keylength)); + test_keylength_array(hProv, dssENH_keylength, ARRAY_SIZE(dssENH_keylength)); result = CryptReleaseContext(hProv, 0); ok(result, "Expected release of CSP provider.\n"); @@ -982,7 +980,7 @@ static void test_verify_signature(void) } ok(result, "Failed to acquire CSP.\n"); - test_signhash_array(hProv, dssSign_data, TESTLEN(dssSign_data)); + test_signhash_array(hProv, dssSign_data, ARRAY_SIZE(dssSign_data)); result = CryptReleaseContext(hProv, 0); ok(result, "Failed to release CSP provider.\n"); @@ -991,7 +989,7 @@ static void test_verify_signature(void) result = CryptAcquireContextA(&hProv, NULL, MS_DEF_DSS_DH_PROV_A, PROV_DSS_DH, 0); ok(result, "Failed to acquire CSP.\n"); - test_signhash_array(hProv, dssSign_data, TESTLEN(dssSign_data)); + test_signhash_array(hProv, dssSign_data, ARRAY_SIZE(dssSign_data)); result = CryptReleaseContext(hProv, 0); ok(result, "Failed to release CSP provider.\n"); @@ -1007,7 +1005,7 @@ static void test_verify_signature(void) } ok(result, "Failed to acquire CSP.\n"); - test_signhash_array(hProv, dssSign_data, TESTLEN(dssSign_data)); + test_signhash_array(hProv, dssSign_data, ARRAY_SIZE(dssSign_data)); result = CryptReleaseContext(hProv, 0); ok(result, "Failed to release CSP provider.\n"); @@ -1016,7 +1014,7 @@ static void test_verify_signature(void) result = CryptAcquireContextA(&hProv, NULL, MS_DEF_DH_SCHANNEL_PROV_A, PROV_DH_SCHANNEL, 0); ok(result, "Failed to acquire CSP.\n"); - test_signhash_array(hProv, dssSign_data, TESTLEN(dssSign_data)); + test_signhash_array(hProv, dssSign_data, ARRAY_SIZE(dssSign_data)); result = CryptReleaseContext(hProv, 0); ok(result, "Failed to release CSP provider.\n"); @@ -1376,7 +1374,7 @@ static void test_key_exchange(void) } ok(result, "Failed to acquire CSP.\n"); - test_keyExchange_baseDSS(hProv, baseDSSkey_data, TESTLEN(baseDSSkey_data)); + test_keyExchange_baseDSS(hProv, baseDSSkey_data, ARRAY_SIZE(baseDSSkey_data)); result = CryptReleaseContext(hProv, 0); ok(result, "Failed to release CSP provider.\n"); @@ -1386,7 +1384,7 @@ static void test_key_exchange(void) CRYPT_VERIFYCONTEXT); ok(result, "Failed to acquire CSP.\n"); - test_keyExchange_dssDH(hProv, dssDHkey_data, TESTLEN(dssDHkey_data)); + test_keyExchange_dssDH(hProv, dssDHkey_data, ARRAY_SIZE(dssDHkey_data)); result = CryptReleaseContext(hProv, 0); ok(result, "Failed to release CSP provider.\n"); @@ -1401,7 +1399,7 @@ static void test_key_exchange(void) } ok(result, "Failed to acquire CSP.\n"); - test_keyExchange_dssDH(hProv, dssDHkey_data, TESTLEN(dssDHkey_data)); + test_keyExchange_dssDH(hProv, dssDHkey_data, ARRAY_SIZE(dssDHkey_data)); result = CryptReleaseContext(hProv, 0); ok(result, "Failed to release CSP provider.\n"); @@ -1411,7 +1409,7 @@ static void test_key_exchange(void) CRYPT_VERIFYCONTEXT); ok(result, "Failed to acquire CSP.\n"); - test_keyExchange_dssDH(hProv, dssDHkey_data, TESTLEN(dssDHkey_data)); + test_keyExchange_dssDH(hProv, dssDHkey_data, ARRAY_SIZE(dssDHkey_data)); result = CryptReleaseContext(hProv, 0); ok(result, "Failed to release CSP provider.\n"); @@ -1421,9 +1419,9 @@ START_TEST(dssenh) { test_acquire_context(); test_keylength(); - test_hash(hash_data, TESTLEN(hash_data)); - test_data_encryption(encrypt_data, TESTLEN(encrypt_data)); - test_cipher_modes(ciphermode_data, TESTLEN(ciphermode_data)); + test_hash(hash_data, ARRAY_SIZE(hash_data)); + test_data_encryption(encrypt_data, ARRAY_SIZE(encrypt_data)); + test_cipher_modes(ciphermode_data, ARRAY_SIZE(ciphermode_data)); test_verify_signature(); test_key_exchange(); } -- 2.14.4

1 0

[PATCH] iphlpapi: Avoid ARRAY_SIZE-like macros
by Michael Stefaniuc July 5, 2018

July 5, 2018

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/iphlpapi/ipstats.c | 23 ++++++++--------------- 1 file changed, 8 insertions(+), 15 deletions(-) diff --git a/dlls/iphlpapi/ipstats.c b/dlls/iphlpapi/ipstats.c index 863edd397d..8f6720ea52 100644 --- a/dlls/iphlpapi/ipstats.c +++ b/dlls/iphlpapi/ipstats.c @@ -349,14 +349,12 @@ DWORD getInterfaceStatsByName(const char *name, PMIB_IFROW entry) #elif defined(HAVE_SYS_SYSCTL_H) && defined(NET_RT_IFLIST) { int mib[] = {CTL_NET, PF_ROUTE, 0, AF_INET, NET_RT_IFLIST, if_nametoindex(name)}; -#define MIB_LEN (sizeof(mib) / sizeof(mib[0])) - size_t needed; char *buf = NULL, *end; struct if_msghdr *ifm; struct if_data ifdata; - if(sysctl(mib, MIB_LEN, NULL, &needed, NULL, 0) == -1) + if(sysctl(mib, ARRAY_SIZE(mib), NULL, &needed, NULL, 0) == -1) { ERR ("failed to get size of iflist\n"); goto done; @@ -367,7 +365,7 @@ DWORD getInterfaceStatsByName(const char *name, PMIB_IFROW entry) ret = ERROR_OUTOFMEMORY; goto done; } - if(sysctl(mib, MIB_LEN, buf, &needed, NULL, 0) == -1) + if(sysctl(mib, ARRAY_SIZE(mib), buf, &needed, NULL, 0) == -1) { ERR ("failed to get iflist\n"); goto done; @@ -514,12 +512,11 @@ DWORD WINAPI GetIcmpStatistics(PMIB_ICMP stats) #elif defined(HAVE_SYS_SYSCTL_H) && defined(ICMPCTL_STATS) && (defined(HAVE_STRUCT_ICMPSTAT_ICPS_INHIST) || defined(HAVE_STRUCT_ICMPSTAT_ICPS_OUTHIST)) { int mib[] = {CTL_NET, PF_INET, IPPROTO_ICMP, ICMPCTL_STATS}; -#define MIB_LEN (sizeof(mib) / sizeof(mib[0])) struct icmpstat icmp_stat; size_t needed = sizeof(icmp_stat); int i; - if(sysctl(mib, MIB_LEN, &icmp_stat, &needed, NULL, 0) != -1) + if(sysctl(mib, ARRAY_SIZE(mib), &icmp_stat, &needed, NULL, 0) != -1) { #ifdef HAVE_STRUCT_ICMPSTAT_ICPS_INHIST /*in stats */ @@ -922,7 +919,6 @@ DWORD WINAPI GetIpStatisticsEx(PMIB_IPSTATS stats, DWORD family) #elif defined(HAVE_SYS_SYSCTL_H) && defined(IPCTL_STATS) && (defined(HAVE_STRUCT_IPSTAT_IPS_TOTAL) || defined(HAVE_STRUCT_IP_STATS_IPS_TOTAL)) { int mib[] = {CTL_NET, PF_INET, IPPROTO_IP, IPCTL_STATS}; -#define MIB_LEN (sizeof(mib) / sizeof(mib[0])) int ip_ttl, ip_forwarding; #if defined(HAVE_STRUCT_IPSTAT_IPS_TOTAL) struct ipstat ip_stat; @@ -932,7 +928,7 @@ DWORD WINAPI GetIpStatisticsEx(PMIB_IPSTATS stats, DWORD family) size_t needed; needed = sizeof(ip_stat); - if(sysctl(mib, MIB_LEN, &ip_stat, &needed, NULL, 0) == -1) + if(sysctl(mib, ARRAY_SIZE(mib), &ip_stat, &needed, NULL, 0) == -1) { ERR ("failed to get ipstat\n"); return ERROR_NOT_SUPPORTED; @@ -1103,7 +1099,6 @@ DWORD WINAPI GetTcpStatisticsEx(PMIB_TCPSTATS stats, DWORD family) #define TCPTV_REXMTMAX 128 #endif int mib[] = {CTL_NET, PF_INET, IPPROTO_TCP, TCPCTL_STATS}; -#define MIB_LEN (sizeof(mib) / sizeof(mib[0])) #define hz 1000 #if defined(HAVE_STRUCT_TCPSTAT_TCPS_CONNATTEMPT) struct tcpstat tcp_stat; @@ -1112,7 +1107,7 @@ DWORD WINAPI GetTcpStatisticsEx(PMIB_TCPSTATS stats, DWORD family) #endif size_t needed = sizeof(tcp_stat); - if(sysctl(mib, MIB_LEN, &tcp_stat, &needed, NULL, 0) != -1) + if(sysctl(mib, ARRAY_SIZE(mib), &tcp_stat, &needed, NULL, 0) != -1) { stats->u.RtoAlgorithm = MIB_TCP_RTO_VANJ; stats->dwRtoMin = TCPTV_MIN; @@ -1286,12 +1281,11 @@ DWORD WINAPI GetUdpStatisticsEx(PMIB_UDPSTATS stats, DWORD family) #elif defined(HAVE_SYS_SYSCTL_H) && defined(UDPCTL_STATS) && defined(HAVE_STRUCT_UDPSTAT_UDPS_IPACKETS) { int mib[] = {CTL_NET, PF_INET, IPPROTO_UDP, UDPCTL_STATS}; -#define MIB_LEN (sizeof(mib) / sizeof(mib[0])) struct udpstat udp_stat; MIB_UDPTABLE *udp_table; size_t needed = sizeof(udp_stat); - if(sysctl(mib, MIB_LEN, &udp_stat, &needed, NULL, 0) != -1) + if(sysctl(mib, ARRAY_SIZE(mib), &udp_stat, &needed, NULL, 0) != -1) { stats->dwInDatagrams = udp_stat.udps_ipackets; stats->dwOutDatagrams = udp_stat.udps_opackets; @@ -1742,14 +1736,13 @@ DWORD WINAPI AllocateAndGetIpNetTableFromStack(PMIB_IPNETTABLE *ppIpNetTable, BO #elif defined(HAVE_SYS_SYSCTL_H) && defined(NET_RT_DUMP) { int mib[] = {CTL_NET, PF_ROUTE, 0, AF_INET, NET_RT_FLAGS, RTF_LLINFO}; -#define MIB_LEN (sizeof(mib) / sizeof(mib[0])) size_t needed; char *buf = NULL, *lim, *next; struct rt_msghdr *rtm; struct sockaddr_inarp *sinarp; struct sockaddr_dl *sdl; - if (sysctl (mib, MIB_LEN, NULL, &needed, NULL, 0) == -1) + if (sysctl (mib, ARRAY_SIZE(mib), NULL, &needed, NULL, 0) == -1) { ERR ("failed to get arp table\n"); ret = ERROR_NOT_SUPPORTED; @@ -1763,7 +1756,7 @@ DWORD WINAPI AllocateAndGetIpNetTableFromStack(PMIB_IPNETTABLE *ppIpNetTable, BO goto done; } - if (sysctl (mib, MIB_LEN, buf, &needed, NULL, 0) == -1) + if (sysctl (mib, ARRAY_SIZE(mib), buf, &needed, NULL, 0) == -1) { ret = ERROR_NOT_SUPPORTED; goto done; -- 2.14.4

1 0

[PATCH] dinput: Avoid ARRAY_SIZE-like macros
by Michael Stefaniuc July 5, 2018

July 5, 2018

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dinput/data_formats.c | 12 +++++------- dlls/dinput/dinput_main.c | 13 ++++++------- 2 files changed, 11 insertions(+), 14 deletions(-) diff --git a/dlls/dinput/data_formats.c b/dlls/dinput/data_formats.c index 5fac7b7a08..9c9f00f8f6 100644 --- a/dlls/dinput/data_formats.c +++ b/dlls/dinput/data_formats.c @@ -25,8 +25,6 @@ #include "windef.h" #include "dinput.h" -#define numObjects(x) (sizeof(x) / sizeof(x[0])) - static const DIOBJECTDATAFORMAT dfDIJoystick[] = { { &GUID_XAxis,DIJOFS_X,DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,0}, { &GUID_YAxis,DIJOFS_Y,DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,0}, @@ -79,7 +77,7 @@ const DIDATAFORMAT c_dfDIJoystick = { sizeof(DIOBJECTDATAFORMAT), DIDF_ABSAXIS, sizeof(DIJOYSTATE), - numObjects(dfDIJoystick), + ARRAY_SIZE(dfDIJoystick), (LPDIOBJECTDATAFORMAT)dfDIJoystick }; @@ -255,7 +253,7 @@ const DIDATAFORMAT c_dfDIJoystick2 = { sizeof(DIOBJECTDATAFORMAT), DIDF_ABSAXIS, sizeof(DIJOYSTATE2), - numObjects(dfDIJoystick2), + ARRAY_SIZE(dfDIJoystick2), (LPDIOBJECTDATAFORMAT)dfDIJoystick2 }; @@ -274,7 +272,7 @@ const DIDATAFORMAT c_dfDIMouse = { sizeof(DIOBJECTDATAFORMAT), DIDF_RELAXIS, sizeof(DIMOUSESTATE), - numObjects(dfDIMouse), + ARRAY_SIZE(dfDIMouse), (LPDIOBJECTDATAFORMAT)dfDIMouse }; @@ -297,7 +295,7 @@ const DIDATAFORMAT c_dfDIMouse2 = { sizeof(DIOBJECTDATAFORMAT), DIDF_RELAXIS, sizeof(DIMOUSESTATE2), - numObjects(dfDIMouse2), + ARRAY_SIZE(dfDIMouse2), (LPDIOBJECTDATAFORMAT)dfDIMouse2 }; @@ -565,6 +563,6 @@ const DIDATAFORMAT c_dfDIKeyboard = { sizeof(DIOBJECTDATAFORMAT), DIDF_RELAXIS, 256, - numObjects(dfDIKeyboard), + ARRAY_SIZE(dfDIKeyboard), (LPDIOBJECTDATAFORMAT)dfDIKeyboard }; diff --git a/dlls/dinput/dinput_main.c b/dlls/dinput/dinput_main.c index a59217472c..e4538a09dc 100644 --- a/dlls/dinput/dinput_main.c +++ b/dlls/dinput/dinput_main.c @@ -92,7 +92,6 @@ static const struct dinput_device *dinput_devices[] = &joystick_linux_device, &joystick_osx_device }; -#define NB_DINPUT_DEVICES (sizeof(dinput_devices)/sizeof(dinput_devices[0])) static HINSTANCE DINPUT_instance = NULL; @@ -409,7 +408,7 @@ static HRESULT WINAPI IDirectInputAImpl_EnumDevices( if (!This->initialized) return DIERR_NOTINITIALIZED; - for (i = 0; i < NB_DINPUT_DEVICES; i++) { + for (i = 0; i < ARRAY_SIZE(dinput_devices); i++) { if (!dinput_devices[i]->enum_deviceA) continue; for (j = 0, r = S_OK; SUCCEEDED(r); j++) { devInstance.dwSize = sizeof(devInstance); @@ -449,7 +448,7 @@ static HRESULT WINAPI IDirectInputWImpl_EnumDevices( if (!This->initialized) return DIERR_NOTINITIALIZED; - for (i = 0; i < NB_DINPUT_DEVICES; i++) { + for (i = 0; i < ARRAY_SIZE(dinput_devices); i++) { if (!dinput_devices[i]->enum_deviceW) continue; for (j = 0, r = S_OK; SUCCEEDED(r); j++) { devInstance.dwSize = sizeof(devInstance); @@ -750,7 +749,7 @@ static HRESULT create_device(IDirectInputImpl *This, REFGUID rguid, REFIID riid, return DIERR_NOTINITIALIZED; /* Loop on all the devices to see if anyone matches the given GUID */ - for (i = 0; i < NB_DINPUT_DEVICES; i++) + for (i = 0; i < ARRAY_SIZE(dinput_devices); i++) { HRESULT ret; @@ -1006,7 +1005,7 @@ static HRESULT WINAPI IDirectInput8AImpl_EnumDevicesBySemantics( } /* Enumerate all the joysticks */ - for (i = 0; i < NB_DINPUT_DEVICES; i++) + for (i = 0; i < ARRAY_SIZE(dinput_devices); i++) { HRESULT enumSuccess; @@ -1107,7 +1106,7 @@ static HRESULT WINAPI IDirectInput8WImpl_EnumDevicesBySemantics( didevi.dwSize = sizeof(didevi); /* Enumerate all the joysticks */ - for (i = 0; i < NB_DINPUT_DEVICES; i++) + for (i = 0; i < ARRAY_SIZE(dinput_devices); i++) { HRESULT enumSuccess; @@ -1330,7 +1329,7 @@ static HRESULT WINAPI JoyConfig8Impl_GetConfig(IDirectInputJoyConfig8 *iface, UI #undef X /* Enumerate all joysticks in order */ - for (i = 0; i < NB_DINPUT_DEVICES; i++) + for (i = 0; i < ARRAY_SIZE(dinput_devices); i++) { if (!dinput_devices[i]->enum_deviceA) continue; -- 2.14.4

1 0

[PATCH] wininet: Use the more common ARRAY_SIZE spelling
by Michael Stefaniuc July 5, 2018

July 5, 2018

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wininet/http.c | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index b91dbdf175..c699c5bac0 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -145,8 +145,6 @@ static const WCHAR emptyW[] = {0}; #define COLLECT_TIME 60000 -#define ARRAYSIZE(array) (sizeof(array)/sizeof((array)[0])) - struct HttpAuthInfo { LPWSTR scheme; @@ -810,12 +808,12 @@ static inline BOOL is_basic_auth_value( LPCWSTR pszAuthValue, LPWSTR *pszRealm ) static const WCHAR szBasic[] = {'B','a','s','i','c'}; /* Note: not nul-terminated */ static const WCHAR szRealm[] = {'r','e','a','l','m'}; /* Note: not nul-terminated */ BOOL is_basic; - is_basic = !strncmpiW(pszAuthValue, szBasic, ARRAYSIZE(szBasic)) && - ((pszAuthValue[ARRAYSIZE(szBasic)] == ' ') || !pszAuthValue[ARRAYSIZE(szBasic)]); + is_basic = !strncmpiW(pszAuthValue, szBasic, ARRAY_SIZE(szBasic)) && + ((pszAuthValue[ARRAY_SIZE(szBasic)] == ' ') || !pszAuthValue[ARRAY_SIZE(szBasic)]); if (is_basic && pszRealm) { LPCWSTR token; - LPCWSTR ptr = &pszAuthValue[ARRAYSIZE(szBasic)]; + LPCWSTR ptr = &pszAuthValue[ARRAY_SIZE(szBasic)]; LPCWSTR realm; ptr++; *pszRealm=NULL; @@ -825,8 +823,8 @@ static inline BOOL is_basic_auth_value( LPCWSTR pszAuthValue, LPWSTR *pszRealm ) realm = ptr; while (*realm == ' ') realm++; - if(!strncmpiW(realm, szRealm, ARRAYSIZE(szRealm)) && - (realm[ARRAYSIZE(szRealm)] == ' ' || realm[ARRAYSIZE(szRealm)] == '=')) + if(!strncmpiW(realm, szRealm, ARRAY_SIZE(szRealm)) && + (realm[ARRAY_SIZE(szRealm)] == ' ' || realm[ARRAY_SIZE(szRealm)] == '=')) { token++; while (*token == ' ') @@ -1566,9 +1564,9 @@ static UINT HTTP_DecodeBase64( LPCWSTR base64, LPSTR bin ) { signed char in[4]; - if (base64[0] >= ARRAYSIZE(HTTP_Base64Dec) || + if (base64[0] >= ARRAY_SIZE(HTTP_Base64Dec) || ((in[0] = HTTP_Base64Dec[base64[0]]) == -1) || - base64[1] >= ARRAYSIZE(HTTP_Base64Dec) || + base64[1] >= ARRAY_SIZE(HTTP_Base64Dec) || ((in[1] = HTTP_Base64Dec[base64[1]]) == -1)) { WARN("invalid base64: %s\n", debugstr_w(base64)); @@ -1580,7 +1578,7 @@ static UINT HTTP_DecodeBase64( LPCWSTR base64, LPSTR bin ) if ((base64[2] == '=') && (base64[3] == '=')) break; - if (base64[2] > ARRAYSIZE(HTTP_Base64Dec) || + if (base64[2] > ARRAY_SIZE(HTTP_Base64Dec) || ((in[2] = HTTP_Base64Dec[base64[2]]) == -1)) { WARN("invalid base64: %s\n", debugstr_w(&base64[2])); @@ -1592,7 +1590,7 @@ static UINT HTTP_DecodeBase64( LPCWSTR base64, LPSTR bin ) if (base64[3] == '=') break; - if (base64[3] > ARRAYSIZE(HTTP_Base64Dec) || + if (base64[3] > ARRAY_SIZE(HTTP_Base64Dec) || ((in[3] = HTTP_Base64Dec[base64[3]]) == -1)) { WARN("invalid base64: %s\n", debugstr_w(&base64[3])); -- 2.14.4

1 0