August 2018 - Wine-devel - list.winehq.org

[PATCH] kernel32: Don't clear WINEDEBUG in the debugger process if +winedbg is set.
by Zebediah Figura 16 Aug '18

16 Aug '18

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- This provides a way to debug winedbg.exe itself, which is otherwise practically impossible. Inspired by bug 45369. dlls/kernel32/except.c | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/dlls/kernel32/except.c b/dlls/kernel32/except.c index bff8ce2..98f0d9f 100644 --- a/dlls/kernel32/except.c +++ b/dlls/kernel32/except.c @@ -54,6 +54,7 @@ #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(seh); +WINE_DECLARE_DEBUG_CHANNEL(winedbg); static PTOP_LEVEL_EXCEPTION_FILTER top_filter; @@ -289,15 +290,18 @@ static BOOL start_debugger(PEXCEPTION_POINTERS epointers, HANDLE hEvent) /* make WINEDEBUG empty in the environment */ env = GetEnvironmentStringsA(); - for (p = env; *p; p += strlen(p) + 1) + if (!TRACE_ON(winedbg)) { - if (!memcmp( p, "WINEDEBUG=", sizeof("WINEDEBUG=")-1 )) + for (p = env; *p; p += strlen(p) + 1) { - char *next = p + strlen(p); - char *end = next + 1; - while (*end) end += strlen(end) + 1; - memmove( p + sizeof("WINEDEBUG=") - 1, next, end + 1 - next ); - break; + if (!memcmp( p, "WINEDEBUG=", sizeof("WINEDEBUG=")-1 )) + { + char *next = p + strlen(p); + char *end = next + 1; + while (*end) end += strlen(end) + 1; + memmove( p + sizeof("WINEDEBUG=") - 1, next, end + 1 - next ); + break; + } } } -- 2.7.4

1 0

[PATCH] odbccp32: Handle NULL parameter in SQLWritePrivateProfileStringW
by Alistair Leslie-Hughes 16 Aug '18

16 Aug '18

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/odbccp32/odbccp32.c | 6 +++++- dlls/odbccp32/tests/misc.c | 3 +++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/odbccp32/odbccp32.c b/dlls/odbccp32/odbccp32.c index 4ad51df..be68e6a 100644 --- a/dlls/odbccp32/odbccp32.c +++ b/dlls/odbccp32/odbccp32.c @@ -1600,6 +1600,7 @@ BOOL WINAPI SQLWriteFileDSN(LPCSTR lpszFileName, LPCSTR lpszAppName, BOOL WINAPI SQLWritePrivateProfileStringW(LPCWSTR lpszSection, LPCWSTR lpszEntry, LPCWSTR lpszString, LPCWSTR lpszFilename) { + static const WCHAR empty[] = {0}; LONG ret; HKEY hkey; @@ -1623,7 +1624,10 @@ BOOL WINAPI SQLWritePrivateProfileStringW(LPCWSTR lpszSection, LPCWSTR lpszEntry if ((ret = RegCreateKeyW(hkeyfilename, lpszSection, &hkey_section)) == ERROR_SUCCESS) { - ret = RegSetValueExW(hkey_section, lpszEntry, 0, REG_SZ, (BYTE*)lpszString, (lstrlenW(lpszString)+1)*sizeof(WCHAR)); + if(lpszString) + ret = RegSetValueExW(hkey_section, lpszEntry, 0, REG_SZ, (BYTE*)lpszString, (lstrlenW(lpszString)+1)*sizeof(WCHAR)); + else + ret = RegSetValueExW(hkey_section, lpszEntry, 0, REG_SZ, (BYTE*)empty, sizeof(empty)); RegCloseKey(hkey_section); } diff --git a/dlls/odbccp32/tests/misc.c b/dlls/odbccp32/tests/misc.c index 8a16a9e..be3873ac 100644 --- a/dlls/odbccp32/tests/misc.c +++ b/dlls/odbccp32/tests/misc.c @@ -171,6 +171,9 @@ static void test_SQLWritePrivateProfileString(void) { HKEY hkey; + ret = SQLWritePrivateProfileString("wineodbc", "testing" , NULL, "odbc.ini"); + ok(ret, "SQLWritePrivateProfileString failed\n"); + reg_ret = RegOpenKeyExW(HKEY_CURRENT_USER, odbc_key, 0, KEY_READ, &hkey); ok(reg_ret == ERROR_SUCCESS, "RegOpenKeyExW failed\n"); if(reg_ret == ERROR_SUCCESS) -- 1.9.1

1 0

[PATCH] odbccp32: Correcly lookup driver in load_config_driver
by Alistair Leslie-Hughes 16 Aug '18

16 Aug '18

RegGetValueW doesn't return ERROR_MORE_DATA when the buffer parameter is NULL, unlike other Reg functions. This also passes the correct parameter(reg_driver) on the second call to RegGetValueW. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/odbccp32/odbccp32.c | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/dlls/odbccp32/odbccp32.c b/dlls/odbccp32/odbccp32.c index be68e6a..64f366a 100644 --- a/dlls/odbccp32/odbccp32.c +++ b/dlls/odbccp32/odbccp32.c @@ -235,19 +235,25 @@ static HMODULE load_config_driver(const WCHAR *driver) if ((ret = RegOpenKeyW(hkey, driver, &hkeydriver)) == ERROR_SUCCESS) { ret = RegGetValueW(hkeydriver, NULL, reg_driver, RRF_RT_REG_SZ, &type, NULL, &size); - if(ret == ERROR_MORE_DATA) + if(ret != ERROR_SUCCESS || type != REG_SZ) { - filename = HeapAlloc(GetProcessHeap(), 0, size); - if(!filename) - { - RegCloseKey(hkeydriver); - RegCloseKey(hkey); - push_error(ODBC_ERROR_OUT_OF_MEM, odbc_error_out_of_mem); + RegCloseKey(hkeydriver); + RegCloseKey(hkey); + push_error(ODBC_ERROR_INVALID_DSN, odbc_error_invalid_dsn); - return NULL; - } - ret = RegGetValueW(hkeydriver, NULL, driver, RRF_RT_REG_SZ, &type, filename, &size); + return NULL; + } + + filename = HeapAlloc(GetProcessHeap(), 0, size); + if(!filename) + { + RegCloseKey(hkeydriver); + RegCloseKey(hkey); + push_error(ODBC_ERROR_OUT_OF_MEM, odbc_error_out_of_mem); + + return NULL; } + ret = RegGetValueW(hkeydriver, NULL, reg_driver, RRF_RT_REG_SZ, &type, filename, &size); RegCloseKey(hkeydriver); } -- 1.9.1

1 0

[PATCH] dpnet: Implement IDirectPlay8Address GetURLW/A.
by Alistair Leslie-Hughes 16 Aug '18

16 Aug '18

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/dpnet/Makefile.in | 2 +- dlls/dpnet/address.c | 96 +++++++++++++++++++++++++--- dlls/dpnet/tests/address.c | 155 +++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 242 insertions(+), 11 deletions(-) diff --git a/dlls/dpnet/Makefile.in b/dlls/dpnet/Makefile.in index 541e104..b2af545 100644 --- a/dlls/dpnet/Makefile.in +++ b/dlls/dpnet/Makefile.in @@ -1,6 +1,6 @@ MODULE = dpnet.dll IMPORTLIB = dpnet -IMPORTS = dxguid uuid ole32 advapi32 ws2_32 +IMPORTS = dxguid uuid ole32 advapi32 ws2_32 user32 C_SRCS = \ address.c \ diff --git a/dlls/dpnet/address.c b/dlls/dpnet/address.c index 4d55caa..173ad87 100644 --- a/dlls/dpnet/address.c +++ b/dlls/dpnet/address.c @@ -258,20 +258,96 @@ static HRESULT WINAPI IDirectPlay8AddressImpl_Clear(IDirectPlay8Address *iface) return DPN_OK; } -static HRESULT WINAPI IDirectPlay8AddressImpl_GetURLW(IDirectPlay8Address *iface, WCHAR *pwszURL, - DWORD *pdwNumChars) +static HRESULT WINAPI IDirectPlay8AddressImpl_GetURLW(IDirectPlay8Address *iface, WCHAR *url, DWORD *length) { - IDirectPlay8AddressImpl *This = impl_from_IDirectPlay8Address(iface); - TRACE("(%p): stub\n", This); - return DPN_OK; + IDirectPlay8AddressImpl *This = impl_from_IDirectPlay8Address(iface); + HRESULT hr = DPNERR_BUFFERTOOSMALL; + int i; + WCHAR buffer[1024] = {0}; + const static WCHAR comma[] = {';',0}; + const static WCHAR format_stringW[] = {'%', 's','=','%','s',0}; + const static WCHAR format_stringA[] = {'%', 's','=','%','S',0}; + const static WCHAR format_dword[] = {'%', 's','=','%','d',0}; + static const WCHAR format_guid[] = { '%', 's','=','%', '%','7','B', + '%','0','8','X','-','%','0','4','X','-','%','0','4','X','-','%','0','2', + 'X','%','0','2','X','-', + '%','0','2','X','%','0','2','X','%','0','2','X','%','0','2','X','%','0', + '2','X','%','0','2','X','%','%','7','D',0}; + + TRACE("(%p, %p, %p)\n", This, url, length); + + if(!length || (!url && *length != 0)) + return DPNERR_INVALIDPOINTER; + + for(i=0; i < This->comp_count; i++) + { + int position = strlenW(buffer); + struct component *entry = This->components[i]; + + if(position) + lstrcatW(&buffer[position++], comma); + + switch(entry->type) + { + case DPNA_DATATYPE_GUID: + sprintfW( &buffer[position], format_guid, entry->name, entry->data.guid.Data1, entry->data.guid.Data2, entry->data.guid.Data3, + entry->data.guid.Data4[0], entry->data.guid.Data4[1], entry->data.guid.Data4[2], entry->data.guid.Data4[3], + entry->data.guid.Data4[4], entry->data.guid.Data4[5], entry->data.guid.Data4[6], entry->data.guid.Data4[7] ); + break; + case DPNA_DATATYPE_STRING: + wsprintfW(&buffer[position], format_stringW, entry->name, entry->data.string); + break; + case DPNA_DATATYPE_DWORD: + wsprintfW(&buffer[position], format_dword, entry->name, entry->data.value); + break; + case DPNA_DATATYPE_STRING_ANSI: + wsprintfW(&buffer[position], format_stringA, entry->name, entry->data.ansi); + break; + case DPNA_DATATYPE_BINARY: + break; + default: + FIXME("Unsupported type %d\n", entry->type); + } + } + + if(url && *length >= lstrlenW(buffer) + lstrlenW(DPNA_HEADER) + 1) + { + lstrcpyW(url, DPNA_HEADER); + lstrcatW(url, buffer); + hr = DPN_OK; + } + + *length = lstrlenW(buffer) + lstrlenW(DPNA_HEADER) + 1; + + return hr; } -static HRESULT WINAPI IDirectPlay8AddressImpl_GetURLA(IDirectPlay8Address *iface, CHAR *pszURL, - DWORD *pdwNumChars) +static HRESULT WINAPI IDirectPlay8AddressImpl_GetURLA(IDirectPlay8Address *iface, char *url, DWORD *length) { - IDirectPlay8AddressImpl *This = impl_from_IDirectPlay8Address(iface); - TRACE("(%p): stub\n", This); - return DPN_OK; + IDirectPlay8AddressImpl *This = impl_from_IDirectPlay8Address(iface); + HRESULT hr; + WCHAR *buffer = NULL; + + TRACE("(%p, %p %p)\n", This, url, length); + + if(!length || (!url && *length != 0)) + return DPNERR_INVALIDPOINTER; + + if(url && *length) + { + url[0] = '\0'; + buffer = heap_alloc(*length * sizeof(WCHAR)); + } + + hr = IDirectPlay8Address_GetURLW(iface, buffer, length); + if(hr == DPN_OK) + { + DWORD size; + size = WideCharToMultiByte(CP_ACP, 0, buffer, -1, NULL, 0, NULL, NULL); + WideCharToMultiByte(CP_ACP, 0, buffer, -1, url, size, NULL, NULL); + } + heap_free(buffer); + return hr; } static HRESULT WINAPI IDirectPlay8AddressImpl_GetSP(IDirectPlay8Address *iface, GUID *pguidSP) diff --git a/dlls/dpnet/tests/address.c b/dlls/dpnet/tests/address.c index a1dcdef..526f41f 100644 --- a/dlls/dpnet/tests/address.c +++ b/dlls/dpnet/tests/address.c @@ -305,6 +305,159 @@ static void address_setsp(void) } } +static void address_urlW(void) +{ + HRESULT hr; + IDirectPlay8Address *localaddr = NULL; + static const WCHAR urlW1[] = {'x','-','d','i','r','e','c','t','p','l','a','y',':','/','p','r','o','v','i','d','e','r', + '=','%','7','B','E','B','F','E','7','B','A','0','-','6','2','8','D','-','1','1','D','2', + '-','A','E','0','F','-','0','0','6','0','9','7','B','0','1','4','1','1','%','7','D',0 }; + static const WCHAR urlW2[] = {'x','-','d','i','r','e','c','t','p','l','a','y',':','/','p','r','o','v','i','d','e','r', + '=','%','7','B','E','B','F','E','7','B','A','0','-','6','2','8','D','-','1','1','D','2', + '-','A','E','0','F','-','0','0','6','0','9','7','B','0','1','4','1','1','%','7','D', + ';','p','o','r','t','=','4','3','2','1',0 }; + static const WCHAR urlW3[] = {'x','-','d','i','r','e','c','t','p','l','a','y',':','/','p','r','o','v','i','d','e','r', + '=','%','7','B','E','B','F','E','7','B','A','0','-','6','2','8','D','-','1','1','D','2', + '-','A','E','0','F','-','0','0','6','0','9','7','B','0','1','4','1','1','%','7','D', + ';','p','o','r','t','=','4','3','2','1',';','h','o','s','t','n','a','m','e','=','l', + 'o','c','a','l','h','o','s','t', 0 }; + + hr = CoCreateInstance( &CLSID_DirectPlay8Address, NULL, CLSCTX_ALL, &IID_IDirectPlay8Address, (LPVOID*)&localaddr); + ok(hr == S_OK, "Failed to create IDirectPlay8Address object\n"); + if(SUCCEEDED(hr)) + { + WCHAR *buffer = NULL; + DWORD bufflen = 0, bufflen2; + DWORD port = 4321; + + hr = IDirectPlay8Address_SetSP(localaddr, &CLSID_DP8SP_TCPIP); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDirectPlay8Address_GetURLW(localaddr, buffer, NULL); + ok(hr == DPNERR_INVALIDPOINTER, "got 0x%08x\n", hr); + + bufflen = 10; + hr = IDirectPlay8Address_GetURLW(localaddr, NULL, &bufflen); + ok(hr == DPNERR_INVALIDPOINTER, "got 0x%08x\n", hr); + + bufflen = 0; + hr = IDirectPlay8Address_GetURLW(localaddr, NULL, &bufflen); + ok(bufflen == 66, "got %d\n", bufflen); + ok(hr == DPNERR_BUFFERTOOSMALL, "got 0x%08x\n", hr); + buffer = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, bufflen * sizeof(WCHAR)); + + hr = IDirectPlay8Address_GetURLW(localaddr, buffer, &bufflen); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(!lstrcmpW(urlW1, buffer), "got %s\n", wine_dbgstr_w(buffer)); + HeapFree(GetProcessHeap(), 0, buffer); + + hr = IDirectPlay8Address_AddComponent(localaddr, DPNA_KEY_PORT, &port, sizeof(DWORD), DPNA_DATATYPE_DWORD); + ok(hr == S_OK, "got 0x%08x\n", hr); + + bufflen = 0; + hr = IDirectPlay8Address_GetURLW(localaddr, NULL, &bufflen); + ok(hr == DPNERR_BUFFERTOOSMALL, "got 0x%08x\n", hr); + buffer = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, bufflen * sizeof(WCHAR)); + + bufflen2 = bufflen/2; + hr = IDirectPlay8Address_GetURLW(localaddr, buffer, &bufflen2); + ok(hr == DPNERR_BUFFERTOOSMALL, "got 0x%08x\n", hr); + ok(!lstrlenW(buffer), "wrong length\n"); + + hr = IDirectPlay8Address_GetURLW(localaddr, buffer, &bufflen); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(!lstrcmpW(urlW2, buffer), "got %s\n", wine_dbgstr_w(buffer)); + HeapFree(GetProcessHeap(), 0, buffer); + + hr = IDirectPlay8Address_AddComponent(localaddr, DPNA_KEY_HOSTNAME, &localhost, sizeof(localhost), DPNA_DATATYPE_STRING); + ok(hr == S_OK, "got 0x%08x\n", hr); + + bufflen = 0; + hr = IDirectPlay8Address_GetURLW(localaddr, NULL, &bufflen); + ok(hr == DPNERR_BUFFERTOOSMALL, "got 0x%08x\n", hr); + buffer = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, bufflen * sizeof(WCHAR)); + + hr = IDirectPlay8Address_GetURLW(localaddr, buffer, &bufflen); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(!lstrcmpW(urlW3, buffer), "got %s\n", wine_dbgstr_w(buffer)); + HeapFree(GetProcessHeap(), 0, buffer); + + IDirectPlay8Address_Release(localaddr); + } +} + +static void address_urlA(void) +{ + HRESULT hr; + IDirectPlay8Address *localaddr = NULL; + static const char urlA1[] = "x-directplay:/provider=%7BEBFE7BA0-628D-11D2-AE0F-006097B01411%7D"; + static const char urlA2[] = "x-directplay:/provider=%7BEBFE7BA0-628D-11D2-AE0F-006097B01411%7D;port=4321"; + static const char urlA3[] = "x-directplay:/provider=%7BEBFE7BA0-628D-11D2-AE0F-006097B01411%7D;port=4321;hostname=localhost"; + static const char localhostA[] = "localhost"; + + hr = CoCreateInstance( &CLSID_DirectPlay8Address, NULL, CLSCTX_ALL, &IID_IDirectPlay8Address, (LPVOID*)&localaddr); + ok(hr == S_OK, "Failed to create IDirectPlay8Address object\n"); + if(SUCCEEDED(hr)) + { + char *buffer = NULL; + DWORD bufflen = 0, bufflen2; + DWORD port = 4321; + + hr = IDirectPlay8Address_SetSP(localaddr, &CLSID_DP8SP_TCPIP); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDirectPlay8Address_GetURLA(localaddr, buffer, NULL); + ok(hr == DPNERR_INVALIDPOINTER, "got 0x%08x\n", hr); + + bufflen = 10; + hr = IDirectPlay8Address_GetURLA(localaddr, NULL, &bufflen); + ok(hr == DPNERR_INVALIDPOINTER, "got 0x%08x\n", hr); + + bufflen = 0; + hr = IDirectPlay8Address_GetURLA(localaddr, NULL, &bufflen); + ok(hr == DPNERR_BUFFERTOOSMALL, "got 0x%08x\n", hr); + buffer = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, bufflen); + + bufflen2 = bufflen/2; + hr = IDirectPlay8Address_GetURLA(localaddr, buffer, &bufflen2); + ok(hr == DPNERR_BUFFERTOOSMALL, "got 0x%08x\n", hr); + ok(!strlen(buffer), "wrong length\n"); + + hr = IDirectPlay8Address_GetURLA(localaddr, buffer, &bufflen); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(!lstrcmpA(urlA1, buffer), "got %s\n", buffer); + HeapFree(GetProcessHeap(), 0, buffer); + + hr = IDirectPlay8Address_AddComponent(localaddr, DPNA_KEY_PORT, &port, sizeof(DWORD), DPNA_DATATYPE_DWORD); + ok(hr == S_OK, "got 0x%08x\n", hr); + + bufflen = 0; + hr = IDirectPlay8Address_GetURLA(localaddr, NULL, &bufflen); + ok(hr == DPNERR_BUFFERTOOSMALL, "got 0x%08x\n", hr); + buffer = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, bufflen); + + hr = IDirectPlay8Address_GetURLA(localaddr, buffer, &bufflen); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(!lstrcmpA(urlA2, buffer), "got %s\n", buffer); + HeapFree(GetProcessHeap(), 0, buffer); + + hr = IDirectPlay8Address_AddComponent(localaddr, DPNA_KEY_HOSTNAME, &localhostA, sizeof(localhostA), DPNA_DATATYPE_STRING_ANSI); + ok(hr == S_OK, "got 0x%08x\n", hr); + + bufflen = 0; + hr = IDirectPlay8Address_GetURLA(localaddr, NULL, &bufflen); + ok(hr == DPNERR_BUFFERTOOSMALL, "got 0x%08x\n", hr); + buffer = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, bufflen); + + hr = IDirectPlay8Address_GetURLA(localaddr, buffer, &bufflen); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(!lstrcmpA(urlA3, buffer), "got %s\n", buffer); + HeapFree(GetProcessHeap(), 0, buffer); + + IDirectPlay8Address_Release(localaddr); + } +} + static void address_duplicate(void) { HRESULT hr; @@ -382,6 +535,8 @@ START_TEST(address) address_addcomponents(); address_setsp(); address_duplicate(); + address_urlW(); + address_urlA(); CoUninitialize(); } -- 1.9.1

1 0

[PATCH] winemac.drv: Use the ARRAY_SIZE() macro
by Michael Stefaniuc 16 Aug '18

16 Aug '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- Not compile tested so if somebody with a Mac could check it that would be much appreciated. dlls/winemac.drv/clipboard.c | 12 ++++---- dlls/winemac.drv/display.c | 8 ++--- dlls/winemac.drv/gdi.c | 3 +- dlls/winemac.drv/keyboard.c | 70 ++++++++++++++++++++---------------------- dlls/winemac.drv/macdrv_main.c | 4 +-- dlls/winemac.drv/mouse.c | 10 +++--- dlls/winemac.drv/opengl.c | 30 +++++++++--------- dlls/winemac.drv/systray.c | 2 +- dlls/winemac.drv/window.c | 2 +- 9 files changed, 69 insertions(+), 72 deletions(-) diff --git a/dlls/winemac.drv/clipboard.c b/dlls/winemac.drv/clipboard.c index ac0dc3101a..cf5d56b1f1 100644 --- a/dlls/winemac.drv/clipboard.c +++ b/dlls/winemac.drv/clipboard.c @@ -280,7 +280,7 @@ static WINE_CLIPFORMAT *insert_clipboard_format(UINT id, CFStringRef type) { WCHAR buffer[256]; - if (!GetClipboardFormatNameW(format->format_id, buffer, sizeof(buffer) / sizeof(buffer[0]))) + if (!GetClipboardFormatNameW(format->format_id, buffer, ARRAY_SIZE(buffer))) { WARN("failed to get name for format %s; error 0x%08x\n", debugstr_format(format->format_id), GetLastError()); HeapFree(GetProcessHeap(), 0, format); @@ -347,7 +347,7 @@ static void register_builtin_formats(void) WINE_CLIPFORMAT *format; /* Register built-in formats */ - for (i = 0; i < sizeof(builtin_format_ids)/sizeof(builtin_format_ids[0]); i++) + for (i = 0; i < ARRAY_SIZE(builtin_format_ids); i++) { if (!(format = HeapAlloc(GetProcessHeap(), 0, sizeof(*format)))) break; format->format_id = builtin_format_ids[i].id; @@ -360,7 +360,7 @@ static void register_builtin_formats(void) } /* Register known mappings between Windows formats and Mac types */ - for (i = 0; i < sizeof(builtin_format_names)/sizeof(builtin_format_names[0]); i++) + for (i = 0; i < ARRAY_SIZE(builtin_format_names); i++) { if (!(format = HeapAlloc(GetProcessHeap(), 0, sizeof(*format)))) break; format->format_id = RegisterClipboardFormatW(builtin_format_names[i].name); @@ -1841,12 +1841,12 @@ static LRESULT CALLBACK clipboard_wndproc(HWND hwnd, UINT msg, WPARAM wp, LPARAM static BOOL wait_clipboard_mutex(void) { static const WCHAR prefix[] = {'_','_','w','i','n','e','_','c','l','i','p','b','o','a','r','d','_'}; - WCHAR buffer[MAX_PATH + sizeof(prefix) / sizeof(WCHAR)]; + WCHAR buffer[MAX_PATH + ARRAY_SIZE(prefix)]; HANDLE mutex; memcpy(buffer, prefix, sizeof(prefix)); if (!GetUserObjectInformationW(GetProcessWindowStation(), UOI_NAME, - buffer + sizeof(prefix) / sizeof(WCHAR), + buffer + ARRAY_SIZE(prefix), sizeof(buffer) - sizeof(prefix), NULL)) { ERR("failed to get winstation name\n"); @@ -1873,7 +1873,7 @@ static BOOL CALLBACK init_pipe_name(INIT_ONCE* once, void* param, void** context memcpy(clipboard_pipe_name, prefix, sizeof(prefix)); if (!GetUserObjectInformationW(GetProcessWindowStation(), UOI_NAME, - clipboard_pipe_name + sizeof(prefix) / sizeof(WCHAR), + clipboard_pipe_name + ARRAY_SIZE(prefix), sizeof(clipboard_pipe_name) - sizeof(prefix), NULL)) { ERR("failed to get winstation name\n"); diff --git a/dlls/winemac.drv/display.c b/dlls/winemac.drv/display.c index 49892ca3ef..00ad7738bb 100644 --- a/dlls/winemac.drv/display.c +++ b/dlls/winemac.drv/display.c @@ -519,7 +519,7 @@ static CFDictionaryRef create_mode_dict(CGDisplayModeRef display_mode, BOOL is_o CFSTR("pixel_encoding"), CFSTR("refresh_rate"), }; - const void* values[sizeof(keys) / sizeof(keys[0])] = { + const void* values[ARRAY_SIZE(keys)] = { cf_io_flags, cf_width, cf_height, @@ -527,7 +527,7 @@ static CFDictionaryRef create_mode_dict(CGDisplayModeRef display_mode, BOOL is_o cf_refresh, }; - ret = CFDictionaryCreate(NULL, (const void**)keys, (const void**)values, sizeof(keys) / sizeof(keys[0]), + ret = CFDictionaryCreate(NULL, (const void**)keys, (const void**)values, ARRAY_SIZE(keys), &kCFCopyStringDictionaryKeyCallBacks, &kCFTypeDictionaryValueCallBacks); } @@ -1182,7 +1182,7 @@ BOOL macdrv_GetDeviceGammaRamp(PHYSDEV dev, LPVOID ramp) struct macdrv_display *displays; int num_displays; uint32_t mac_entries; - int win_entries = sizeof(r->red) / sizeof(r->red[0]); + int win_entries = ARRAY_SIZE(r->red); CGGammaValue *red, *green, *blue; CGError err; int win_entry; @@ -1316,7 +1316,7 @@ BOOL macdrv_SetDeviceGammaRamp(PHYSDEV dev, LPVOID ramp) DDGAMMARAMP *r = ramp; struct macdrv_display *displays; int num_displays; - int win_entries = sizeof(r->red) / sizeof(r->red[0]); + int win_entries = ARRAY_SIZE(r->red); CGGammaValue *red, *green, *blue; int i; CGError err = kCGErrorFailure; diff --git a/dlls/winemac.drv/gdi.c b/dlls/winemac.drv/gdi.c index 77da2334ee..79dc3488cc 100644 --- a/dlls/winemac.drv/gdi.c +++ b/dlls/winemac.drv/gdi.c @@ -72,8 +72,7 @@ static void compute_desktop_rect(void) uint32_t count, i; desktop_rect = CGRectNull; - if (CGGetActiveDisplayList(sizeof(displayIDs)/sizeof(displayIDs[0]), - displayIDs, &count) != kCGErrorSuccess || + if (CGGetActiveDisplayList(ARRAY_SIZE(displayIDs), displayIDs, &count) != kCGErrorSuccess || !count) { displayIDs[0] = CGMainDisplayID(); diff --git a/dlls/winemac.drv/keyboard.c b/dlls/winemac.drv/keyboard.c index 3e0ebbf6ec..aa47b95ed0 100644 --- a/dlls/winemac.drv/keyboard.c +++ b/dlls/winemac.drv/keyboard.c @@ -456,7 +456,7 @@ static DWORD get_lcid(CFStringRef lang) WCHAR str[10]; range.location = 0; - range.length = min(CFStringGetLength(lang), sizeof(str) / sizeof(str[0]) - 1); + range.length = min(CFStringGetLength(lang), ARRAY_SIZE(str) - 1); CFStringGetCharacters(lang, range, str); str[range.length] = 0; return LocaleNameToLCID(str, 0); @@ -593,7 +593,7 @@ void macdrv_compute_keyboard_layout(struct macdrv_thread_data *thread_data) optionKey >> 8, (shiftKey | optionKey) >> 8, }; - UniChar map[128][sizeof(modifier_combos) / sizeof(modifier_combos[0])][4 + 1]; + UniChar map[128][ARRAY_SIZE(modifier_combos)][4 + 1]; int combo; BYTE vkey_used[256]; int ignore_diacritics; @@ -673,7 +673,7 @@ void macdrv_compute_keyboard_layout(struct macdrv_thread_data *thread_data) memset(thread_data->keyc2vkey, 0, sizeof(thread_data->keyc2vkey)); memset(vkey_used, 0, sizeof(vkey_used)); - for (keyc = 0; keyc < sizeof(default_map) / sizeof(default_map[0]); keyc++) + for (keyc = 0; keyc < ARRAY_SIZE(default_map); keyc++) { thread_data->keyc2scan[keyc] = default_map[keyc].scan; if (default_map[keyc].fixed) @@ -708,14 +708,14 @@ void macdrv_compute_keyboard_layout(struct macdrv_thread_data *thread_data) /* Using the keyboard layout, build a map of key code + modifiers -> characters. */ memset(map, 0, sizeof(map)); - for (keyc = 0; keyc < sizeof(map) / sizeof(map[0]); keyc++) + for (keyc = 0; keyc < ARRAY_SIZE(map); keyc++) { if (!thread_data->keyc2scan[keyc]) continue; /* not a known Mac key code */ if (thread_data->keyc2vkey[keyc]) continue; /* assigned a fixed vkey */ TRACE("keyc 0x%04x: ", keyc); - for (combo = 0; combo < sizeof(modifier_combos) / sizeof(modifier_combos[0]); combo++) + for (combo = 0; combo < ARRAY_SIZE(modifier_combos); combo++) { UInt32 deadKeyState; UniCharCount len; @@ -724,8 +724,7 @@ void macdrv_compute_keyboard_layout(struct macdrv_thread_data *thread_data) deadKeyState = 0; status = UCKeyTranslate(uchr, keyc, kUCKeyActionDown, modifier_combos[combo], thread_data->keyboard_type, kUCKeyTranslateNoDeadKeysMask, - &deadKeyState, sizeof(map[keyc][combo])/sizeof(map[keyc][combo][0]) - 1, - &len, map[keyc][combo]); + &deadKeyState, ARRAY_SIZE(map[keyc][combo]) - 1, &len, map[keyc][combo]); if (status != noErr) map[keyc][combo][0] = 0; @@ -741,14 +740,14 @@ void macdrv_compute_keyboard_layout(struct macdrv_thread_data *thread_data) second pass, accept matches with diacritical marks. */ for (ignore_diacritics = 0; ignore_diacritics <= 1; ignore_diacritics++) { - for (combo = 0; combo < sizeof(modifier_combos) / sizeof(modifier_combos[0]); combo++) + for (combo = 0; combo < ARRAY_SIZE(modifier_combos); combo++) { for (vkey = 'A'; vkey <= 'Z'; vkey++) { if (vkey_used[vkey]) continue; - for (keyc = 0; keyc < sizeof(map) / sizeof(map[0]); keyc++) + for (keyc = 0; keyc < ARRAY_SIZE(map); keyc++) { if (thread_data->keyc2vkey[keyc] || !map[keyc][combo][0]) continue; @@ -767,14 +766,14 @@ void macdrv_compute_keyboard_layout(struct macdrv_thread_data *thread_data) } /* Next try to match key codes to the vkeys for the digits 0 through 9. */ - for (combo = 0; combo < sizeof(modifier_combos) / sizeof(modifier_combos[0]); combo++) + for (combo = 0; combo < ARRAY_SIZE(modifier_combos); combo++) { for (vkey = '0'; vkey <= '9'; vkey++) { if (vkey_used[vkey]) continue; - for (keyc = 0; keyc < sizeof(map) / sizeof(map[0]); keyc++) + for (keyc = 0; keyc < ARRAY_SIZE(map); keyc++) { if (thread_data->keyc2vkey[keyc] || !map[keyc][combo][0]) continue; @@ -793,16 +792,16 @@ void macdrv_compute_keyboard_layout(struct macdrv_thread_data *thread_data) /* Now try to match key codes for certain common punctuation characters to the most common OEM vkeys (e.g. '.' to VK_OEM_PERIOD). */ - for (i = 0; i < sizeof(symbol_vkeys) / sizeof(symbol_vkeys[0]); i++) + for (i = 0; i < ARRAY_SIZE(symbol_vkeys); i++) { vkey = symbol_vkeys[i].vkey; if (vkey_used[vkey]) continue; - for (combo = 0; combo < sizeof(modifier_combos) / sizeof(modifier_combos[0]); combo++) + for (combo = 0; combo < ARRAY_SIZE(modifier_combos); combo++) { - for (keyc = 0; keyc < sizeof(map) / sizeof(map[0]); keyc++) + for (keyc = 0; keyc < ARRAY_SIZE(map); keyc++) { if (!thread_data->keyc2scan[keyc]) continue; /* not a known Mac key code */ if (thread_data->keyc2vkey[keyc] || !map[keyc][combo][0]) @@ -825,7 +824,7 @@ void macdrv_compute_keyboard_layout(struct macdrv_thread_data *thread_data) /* For those key codes still without a vkey, try to use the default vkey from the default map, if it's still available. */ - for (keyc = 0; keyc < sizeof(default_map) / sizeof(default_map[0]); keyc++) + for (keyc = 0; keyc < ARRAY_SIZE(default_map); keyc++) { DWORD vkey = default_map[keyc].vkey; @@ -844,7 +843,7 @@ void macdrv_compute_keyboard_layout(struct macdrv_thread_data *thread_data) map, but whose normal letter vkey wasn't available, try to find a different letter. */ vkey = 'A'; - for (keyc = 0; keyc < sizeof(default_map) / sizeof(default_map[0]); keyc++) + for (keyc = 0; keyc < ARRAY_SIZE(default_map); keyc++) { if (default_map[keyc].vkey < 'A' || 'Z' < default_map[keyc].vkey) continue; /* not a letter in ANSI layout */ @@ -864,7 +863,7 @@ void macdrv_compute_keyboard_layout(struct macdrv_thread_data *thread_data) /* Same thing but with the digits. */ vkey = '0'; - for (keyc = 0; keyc < sizeof(default_map) / sizeof(default_map[0]); keyc++) + for (keyc = 0; keyc < ARRAY_SIZE(default_map); keyc++) { if (default_map[keyc].vkey < '0' || '9' < default_map[keyc].vkey) continue; /* not a digit in ANSI layout */ @@ -885,7 +884,7 @@ void macdrv_compute_keyboard_layout(struct macdrv_thread_data *thread_data) /* Last chance. Assign any available vkey. */ vkey_range = 0; vkey = vkey_ranges[vkey_range].first; - for (keyc = 0; keyc < sizeof(default_map) / sizeof(default_map[0]); keyc++) + for (keyc = 0; keyc < ARRAY_SIZE(default_map); keyc++) { if (!thread_data->keyc2scan[keyc]) continue; /* not a known Mac key code */ if (thread_data->keyc2vkey[keyc]) continue; /* already assigned */ @@ -1012,7 +1011,7 @@ void macdrv_key_event(HWND hwnd, const macdrv_event *event) thread_data->last_modifiers = event->key.modifiers; - if (event->key.keycode < sizeof(thread_data->keyc2vkey)/sizeof(thread_data->keyc2vkey[0])) + if (event->key.keycode < ARRAY_SIZE(thread_data->keyc2vkey)) { vkey = thread_data->keyc2vkey[event->key.keycode]; scan = thread_data->keyc2scan[event->key.keycode]; @@ -1072,7 +1071,7 @@ void macdrv_hotkey_press(const macdrv_event *event) event->hotkey_press.vkey, event->hotkey_press.mod_flags, event->hotkey_press.keycode, event->hotkey_press.time_ms); - if (event->hotkey_press.keycode < sizeof(thread_data->keyc2vkey) / sizeof(thread_data->keyc2vkey[0])) + if (event->hotkey_press.keycode < ARRAY_SIZE(thread_data->keyc2vkey)) { WORD scan = thread_data->keyc2scan[event->hotkey_press.keycode]; BYTE keystate[256]; @@ -1144,10 +1143,10 @@ void macdrv_process_text_input(UINT vkey, UINT scan, UINT repeat, const BYTE *ke flags &= ~(NX_COMMANDMASK | NX_DEVICELCMDKEYMASK | NX_DEVICERCMDKEYMASK); /* Find the Mac keycode corresponding to the scan code */ - for (keyc = 0; keyc < sizeof(thread_data->keyc2vkey)/sizeof(thread_data->keyc2vkey[0]); keyc++) + for (keyc = 0; keyc < ARRAY_SIZE(thread_data->keyc2vkey); keyc++) if (thread_data->keyc2vkey[keyc] == vkey) break; - if (keyc >= sizeof(thread_data->keyc2vkey)/sizeof(thread_data->keyc2vkey[0])) + if (keyc >= ARRAY_SIZE(thread_data->keyc2vkey)) return; TRACE("flags 0x%08x keyc 0x%04x\n", flags, keyc); @@ -1223,7 +1222,7 @@ INT CDECL macdrv_GetKeyNameText(LONG lparam, LPWSTR buffer, INT size) int scan, keyc; scan = (lparam >> 16) & 0x1FF; - for (keyc = 0; keyc < sizeof(thread_data->keyc2scan)/sizeof(thread_data->keyc2scan[0]); keyc++) + for (keyc = 0; keyc < ARRAY_SIZE(thread_data->keyc2scan); keyc++) { if (thread_data->keyc2scan[keyc] == scan) { @@ -1264,7 +1263,7 @@ INT CDECL macdrv_GetKeyNameText(LONG lparam, LPWSTR buffer, INT size) if (scan & 0x100) vkey |= 0x100; - for (i = 0; i < sizeof(vkey_names) / sizeof(vkey_names[0]); i++) + for (i = 0; i < ARRAY_SIZE(vkey_names); i++) { if (vkey_names[i].vkey == vkey) { @@ -1382,7 +1381,7 @@ UINT CDECL macdrv_MapVirtualKeyEx(UINT wCode, UINT wMapType, HKL hkl) } /* vkey -> keycode -> scan */ - for (keyc = 0; keyc < sizeof(thread_data->keyc2vkey)/sizeof(thread_data->keyc2vkey[0]); keyc++) + for (keyc = 0; keyc < ARRAY_SIZE(thread_data->keyc2vkey); keyc++) { if (thread_data->keyc2vkey[keyc] == wCode) { @@ -1395,7 +1394,7 @@ UINT CDECL macdrv_MapVirtualKeyEx(UINT wCode, UINT wMapType, HKL hkl) case MAPVK_VSC_TO_VK: /* scan-code to vkey-code */ case MAPVK_VSC_TO_VK_EX: /* scan -> keycode -> vkey */ - for (keyc = 0; keyc < sizeof(thread_data->keyc2vkey)/sizeof(thread_data->keyc2vkey[0]); keyc++) + for (keyc = 0; keyc < ARRAY_SIZE(thread_data->keyc2vkey); keyc++) if ((thread_data->keyc2scan[keyc] & 0xFF) == (wCode & 0xFF)) { ret = thread_data->keyc2vkey[keyc]; @@ -1445,10 +1444,10 @@ UINT CDECL macdrv_MapVirtualKeyEx(UINT wCode, UINT wMapType, HKL hkl) uchr = (const UCKeyboardLayout*)CFDataGetBytePtr(thread_data->keyboard_layout_uchr); /* Find the Mac keycode corresponding to the vkey */ - for (keyc = 0; keyc < sizeof(thread_data->keyc2vkey)/sizeof(thread_data->keyc2vkey[0]); keyc++) + for (keyc = 0; keyc < ARRAY_SIZE(thread_data->keyc2vkey); keyc++) if (thread_data->keyc2vkey[keyc] == wCode) break; - if (keyc >= sizeof(thread_data->keyc2vkey)/sizeof(thread_data->keyc2vkey[0])) + if (keyc >= ARRAY_SIZE(thread_data->keyc2vkey)) { WARN("Unknown virtual key %X\n", wCode); break; @@ -1458,15 +1457,14 @@ UINT CDECL macdrv_MapVirtualKeyEx(UINT wCode, UINT wMapType, HKL hkl) deadKeyState = 0; status = UCKeyTranslate(uchr, keyc, kUCKeyActionDown, 0, - thread_data->keyboard_type, 0, &deadKeyState, - sizeof(s)/sizeof(s[0]), &len, s); + thread_data->keyboard_type, 0, &deadKeyState, ARRAY_SIZE(s), &len, s); if (status == noErr && !len && deadKeyState) { deadKey = TRUE; deadKeyState = 0; status = UCKeyTranslate(uchr, keyc, kUCKeyActionDown, 0, thread_data->keyboard_type, kUCKeyTranslateNoDeadKeysMask, - &deadKeyState, sizeof(s)/sizeof(s[0]), &len, s); + &deadKeyState, ARRAY_SIZE(s), &len, s); } if (status == noErr && len) @@ -1496,10 +1494,10 @@ BOOL CDECL macdrv_RegisterHotKey(HWND hwnd, UINT mod_flags, UINT vkey) TRACE_(key)("hwnd %p mod_flags 0x%04x vkey 0x%04x\n", hwnd, mod_flags, vkey); /* Find the Mac keycode corresponding to the vkey */ - for (keyc = 0; keyc < sizeof(thread_data->keyc2vkey) / sizeof(thread_data->keyc2vkey[0]); keyc++) + for (keyc = 0; keyc < ARRAY_SIZE(thread_data->keyc2vkey); keyc++) if (thread_data->keyc2vkey[keyc] == vkey) break; - if (keyc >= sizeof(thread_data->keyc2vkey) / sizeof(thread_data->keyc2vkey[0])) + if (keyc >= ARRAY_SIZE(thread_data->keyc2vkey)) { WARN_(key)("ignoring unknown virtual key 0x%04x\n", vkey); return TRUE; @@ -1641,10 +1639,10 @@ INT CDECL macdrv_ToUnicodeEx(UINT virtKey, UINT scanCode, const BYTE *lpKeyState modifierKeyState |= (optionKey >> 8); /* Find the Mac keycode corresponding to the vkey */ - for (keyc = 0; keyc < sizeof(thread_data->keyc2vkey)/sizeof(thread_data->keyc2vkey[0]); keyc++) + for (keyc = 0; keyc < ARRAY_SIZE(thread_data->keyc2vkey); keyc++) if (thread_data->keyc2vkey[keyc] == virtKey) break; - if (keyc >= sizeof(thread_data->keyc2vkey)/sizeof(thread_data->keyc2vkey[0])) + if (keyc >= ARRAY_SIZE(thread_data->keyc2vkey)) { WARN_(key)("Unknown virtual key 0x%04x\n", virtKey); goto done; @@ -1780,7 +1778,7 @@ SHORT CDECL macdrv_VkKeyScanEx(WCHAR wChar, HKL hkl) modifierKeyState |= (cmdKey >> 8); } - for (keyc = 0; keyc < sizeof(thread_data->keyc2vkey) / sizeof(thread_data->keyc2vkey[0]); keyc++) + for (keyc = 0; keyc < ARRAY_SIZE(thread_data->keyc2vkey); keyc++) { UInt32 deadKeyState = 0; UniChar uchar; diff --git a/dlls/winemac.drv/macdrv_main.c b/dlls/winemac.drv/macdrv_main.c index 4bd74112b5..7abeea9db8 100644 --- a/dlls/winemac.drv/macdrv_main.c +++ b/dlls/winemac.drv/macdrv_main.c @@ -90,7 +90,7 @@ const char* debugstr_cf(CFTypeRef t) if (!ret) { UniChar buf[200]; - int len = min(CFStringGetLength(s), sizeof(buf)/sizeof(buf[0])); + int len = min(CFStringGetLength(s), ARRAY_SIZE(buf)); CFStringGetCharacters(s, CFRangeMake(0, len), buf); ret = debugstr_wn(buf, len); } @@ -242,7 +242,7 @@ static void load_strings(HINSTANCE instance) return; } - for (i = 0; i < sizeof(ids) / sizeof(ids[0]); i++) + for (i = 0; i < ARRAY_SIZE(ids); i++) { LPCWSTR str; int len = LoadStringW(instance, ids[i], (LPWSTR)&str, 0); diff --git a/dlls/winemac.drv/mouse.c b/dlls/winemac.drv/mouse.c index 91c5b8895b..a6369c6168 100644 --- a/dlls/winemac.drv/mouse.c +++ b/dlls/winemac.drv/mouse.c @@ -225,7 +225,7 @@ CFStringRef copy_system_cursor_name(ICONINFOEXW *info) } /* Make sure it's one of the appropriate NSCursor class methods. */ - for (i = 0; i < sizeof(cocoa_cursor_names) / sizeof(cocoa_cursor_names[0]); i++) + for (i = 0; i < ARRAY_SIZE(cocoa_cursor_names); i++) if (CFEqual(cursor_name, cocoa_cursor_names[i])) goto done; @@ -238,9 +238,9 @@ CFStringRef copy_system_cursor_name(ICONINFOEXW *info) if (info->szResName[0]) goto done; /* only integer resources are supported here */ if (!(module = GetModuleHandleW(info->szModName))) goto done; - for (i = 0; i < sizeof(module_cursors)/sizeof(module_cursors[0]); i++) + for (i = 0; i < ARRAY_SIZE(module_cursors); i++) if (GetModuleHandleW(module_cursors[i].name) == module) break; - if (i == sizeof(module_cursors)/sizeof(module_cursors[0])) goto done; + if (i == ARRAY_SIZE(module_cursors)) goto done; cursors = module_cursors[i].cursors; for (i = 0; cursors[i].id; i++) @@ -276,7 +276,7 @@ CFArrayRef create_monochrome_cursor(HDC hdc, const ICONINFOEXW *icon, int width, CGPoint hot_spot; CFDictionaryRef hot_spot_dict; const CFStringRef keys[] = { CFSTR("image"), CFSTR("hotSpot") }; - CFTypeRef values[sizeof(keys) / sizeof(keys[0])]; + CFTypeRef values[ARRAY_SIZE(keys)]; CFDictionaryRef frame; CFArrayRef frames; @@ -444,7 +444,7 @@ CFArrayRef create_monochrome_cursor(HDC hdc, const ICONINFOEXW *icon, int width, values[0] = cgmasked; values[1] = hot_spot_dict; - frame = CFDictionaryCreate(NULL, (const void**)keys, values, sizeof(keys) / sizeof(keys[0]), + frame = CFDictionaryCreate(NULL, (const void**)keys, values, ARRAY_SIZE(keys), &kCFCopyStringDictionaryKeyCallBacks, &kCFTypeDictionaryValueCallBacks); CFRelease(hot_spot_dict); diff --git a/dlls/winemac.drv/opengl.c b/dlls/winemac.drv/opengl.c index f11727fe8a..d83a4cea57 100644 --- a/dlls/winemac.drv/opengl.c +++ b/dlls/winemac.drv/opengl.c @@ -328,7 +328,7 @@ static const char* debugstr_attrib(int attrib, int value) const char *attrib_name = NULL; const char *value_name = NULL; - for (i = 0; i < sizeof(attrib_names) / sizeof(attrib_names[0]); i++) + for (i = 0; i < ARRAY_SIZE(attrib_names); i++) { if (attrib_names[i].attrib == attrib) { @@ -386,7 +386,7 @@ static CGOpenGLDisplayMask active_displays_mask(void) uint32_t count, i; CGOpenGLDisplayMask mask; - err = CGGetActiveDisplayList(sizeof(displays) / sizeof(displays[0]), displays, &count); + err = CGGetActiveDisplayList(ARRAY_SIZE(displays), displays, &count); if (err != kCGErrorSuccess) { displays[0] = CGMainDisplayID(); @@ -473,7 +473,7 @@ static void dump_renderer(const renderer_properties* renderer) TRACE(" Double buffer: %s\n", (renderer->buffer_modes & kCGLDoubleBufferBit) ? "YES" : "NO"); TRACE("Color buffer modes:\n"); - for (i = 0; i < sizeof(color_modes)/sizeof(color_modes[0]); i++) + for (i = 0; i < ARRAY_SIZE(color_modes); i++) { if (renderer->color_modes & color_modes[i].mode) { @@ -485,7 +485,7 @@ static void dump_renderer(const renderer_properties* renderer) } TRACE("Accumulation buffer sizes: { "); - for (i = 0; i < sizeof(color_modes)/sizeof(color_modes[0]); i++) + for (i = 0; i < ARRAY_SIZE(color_modes); i++) { if (renderer->accum_modes & color_modes[i].mode) TRACE("%d, ", color_modes[i].color_bits); @@ -493,7 +493,7 @@ static void dump_renderer(const renderer_properties* renderer) TRACE("}\n"); TRACE("Depth buffer sizes: { "); - for (i = 0; i < sizeof(depth_stencil_modes)/sizeof(depth_stencil_modes[0]); i++) + for (i = 0; i < ARRAY_SIZE(depth_stencil_modes); i++) { if (renderer->depth_modes & depth_stencil_modes[i].mode) TRACE("%d, ", depth_stencil_modes[i].bits); @@ -501,7 +501,7 @@ static void dump_renderer(const renderer_properties* renderer) TRACE("}\n"); TRACE("Stencil buffer sizes: { "); - for (i = 0; i < sizeof(depth_stencil_modes)/sizeof(depth_stencil_modes[0]); i++) + for (i = 0; i < ARRAY_SIZE(depth_stencil_modes); i++) { if (renderer->stencil_modes & depth_stencil_modes[i].mode) TRACE("%d, ", depth_stencil_modes[i].bits); @@ -565,7 +565,7 @@ static unsigned int best_color_mode(GLint modes, GLint color_size, GLint alpha_s int best = -1; int i; - for (i = 0; i < sizeof(color_modes)/sizeof(color_modes[0]); i++) + for (i = 0; i < ARRAY_SIZE(color_modes); i++) { if ((modes & color_modes[i].mode) && color_modes[i].color_bits >= color_size && @@ -593,7 +593,7 @@ static unsigned int best_color_mode(GLint modes, GLint color_size, GLint alpha_s if (best < 0) { /* Couldn't find a match. Return first one that renderer supports. */ - for (i = 0; i < sizeof(color_modes)/sizeof(color_modes[0]); i++) + for (i = 0; i < ARRAY_SIZE(color_modes); i++) { if (modes & color_modes[i].mode) return i; @@ -609,7 +609,7 @@ static unsigned int best_accum_mode(GLint modes, GLint accum_size) int best = -1; int i; - for (i = 0; i < sizeof(color_modes)/sizeof(color_modes[0]); i++) + for (i = 0; i < ARRAY_SIZE(color_modes); i++) { if ((modes & color_modes[i].mode) && color_modes[i].color_bits >= accum_size) { @@ -633,7 +633,7 @@ static unsigned int best_accum_mode(GLint modes, GLint accum_size) if (best < 0) { /* Couldn't find a match. Return last one that renderer supports. */ - for (i = sizeof(color_modes)/sizeof(color_modes[0]) - 1; i >= 0; i--) + for (i = ARRAY_SIZE(color_modes) - 1; i >= 0; i--) { if (modes & color_modes[i].mode) return i; @@ -701,7 +701,7 @@ static void enum_renderer_pixel_formats(renderer_properties renderer, CFMutableA request.aux_buffers = aux; n_stack[++n_stack_idx] = n; - for (color_mode = 0; color_mode < sizeof(color_modes)/sizeof(color_modes[0]); color_mode++) + for (color_mode = 0; color_mode < ARRAY_SIZE(color_modes); color_mode++) { unsigned int depth_mode; @@ -719,7 +719,7 @@ static void enum_renderer_pixel_formats(renderer_properties renderer, CFMutableA request.color_mode = color_mode; n_stack[++n_stack_idx] = n; - for (depth_mode = 0; depth_mode < sizeof(depth_stencil_modes)/sizeof(depth_stencil_modes[0]); depth_mode++) + for (depth_mode = 0; depth_mode < ARRAY_SIZE(depth_stencil_modes); depth_mode++) { unsigned int stencil_mode; @@ -733,7 +733,7 @@ static void enum_renderer_pixel_formats(renderer_properties renderer, CFMutableA request.depth_bits = depth_stencil_modes[depth_mode].bits; n_stack[++n_stack_idx] = n; - for (stencil_mode = 0; stencil_mode < sizeof(depth_stencil_modes)/sizeof(depth_stencil_modes[0]); stencil_mode++) + for (stencil_mode = 0; stencil_mode < ARRAY_SIZE(depth_stencil_modes); stencil_mode++) { unsigned int stereo; @@ -767,7 +767,7 @@ static void enum_renderer_pixel_formats(renderer_properties renderer, CFMutableA /* Starts at -1 for a 0 accum size */ n_stack[++n_stack_idx] = n; - for (accum_mode = -1; accum_mode < (int)(sizeof(color_modes)/sizeof(color_modes[0])); accum_mode++) + for (accum_mode = -1; accum_mode < (int) ARRAY_SIZE(color_modes); accum_mode++) { unsigned int target_pass; @@ -4265,7 +4265,7 @@ static BOOL init_opengl(void) return FALSE; } - for (i = 0; i < sizeof(opengl_func_names)/sizeof(opengl_func_names[0]); i++) + for (i = 0; i < ARRAY_SIZE(opengl_func_names); i++) { if (!(((void **)&opengl_funcs.gl)[i] = wine_dlsym(opengl_handle, opengl_func_names[i], NULL, 0))) { diff --git a/dlls/winemac.drv/systray.c b/dlls/winemac.drv/systray.c index 9351d7796f..a2c32b238f 100644 --- a/dlls/winemac.drv/systray.c +++ b/dlls/winemac.drv/systray.c @@ -147,7 +147,7 @@ static BOOL modify_icon(struct tray_icon *icon, NOTIFYICONDATAW *nid) } if (nid->uFlags & NIF_TIP) { - lstrcpynW(icon->tiptext, nid->szTip, sizeof(icon->tiptext)/sizeof(WCHAR)); + lstrcpynW(icon->tiptext, nid->szTip, ARRAY_SIZE(icon->tiptext)); if (icon->status_item) update_tooltip = TRUE; } diff --git a/dlls/winemac.drv/window.c b/dlls/winemac.drv/window.c index 6558824bd3..b7a09634ee 100644 --- a/dlls/winemac.drv/window.c +++ b/dlls/winemac.drv/window.c @@ -710,7 +710,7 @@ static void create_cocoa_window(struct macdrv_win_data *data) set_cocoa_window_properties(data); /* set the window text */ - if (!InternalGetWindowText(data->hwnd, text, sizeof(text)/sizeof(WCHAR))) text[0] = 0; + if (!InternalGetWindowText(data->hwnd, text, ARRAY_SIZE(text))) text[0] = 0; macdrv_set_cocoa_window_title(data->cocoa_window, text, strlenW(text)); /* set the window region */ -- 2.14.4

2 1

[PATCH 5/5] msvcrt: Don't read past end of string in _strnicoll/_wcsnicoll.
by Daniel Lehman 15 Aug '18

15 Aug '18

1 0

[PATCH 4/5] msvcrt/tests: Add tests for _strnicoll/_wcsnicoll.
by Daniel Lehman 15 Aug '18

15 Aug '18

1 0

[PATCH 1/5] kernel32/tests: Add some CompareStringA/W tests.
by Daniel Lehman 15 Aug '18

15 Aug '18

1 0

[PATCH] winebus.sys: Do not report HID report read errors unconditionally
by Kai Krakow 15 Aug '18

15 Aug '18

Device reports may come in faster than our consumers could possibly read them, this is especially true for multi-axis events: When you move a stick across its range, it will always generate at least two events, one for the x axis, and one for the y axis. This is not really an error situation, so let's report this situation only once at most. If we already know the multi-event situation, let's skip logging this completely: We won't loose any information anyway because the report contains a complete device state and only axis positions were updated. Thus, this commit adds a parameter to process_hid_report() to let it know if we are currently processing reports that are known to be sent multiple times in sequence (with updated reports). Also, if our consumers are slow to respond, then report the issue only once and not per each occurrence during the duration of one consumer read cycle. Finally, this is not really an error, it's a warning at most, thus degrade the error message to a warning to not pollute peoples consoles and logs with unimportant stuff. Especially during gaming I was seeing screens over screens full of only this single log message. This commit fixes it. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=43125 CC: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Kai Krakow <kai(a)kaishome.de> --- dlls/winebus.sys/bus.h | 2 +- dlls/winebus.sys/bus_iohid.c | 2 +- dlls/winebus.sys/bus_sdl.c | 12 ++++++------ dlls/winebus.sys/bus_udev.c | 4 ++-- dlls/winebus.sys/main.c | 18 +++++++++++++++--- 5 files changed, 25 insertions(+), 13 deletions(-) diff --git a/dlls/winebus.sys/bus.h b/dlls/winebus.sys/bus.h index bf93c04259..1e2989e5c5 100644 --- a/dlls/winebus.sys/bus.h +++ b/dlls/winebus.sys/bus.h @@ -45,7 +45,7 @@ DEVICE_OBJECT *bus_create_hid_device(DRIVER_OBJECT *driver, const WCHAR *busidW, DEVICE_OBJECT *bus_find_hid_device(const platform_vtbl *vtbl, void *platform_dev) DECLSPEC_HIDDEN; void bus_remove_hid_device(DEVICE_OBJECT *device) DECLSPEC_HIDDEN; NTSTATUS WINAPI hid_internal_dispatch(DEVICE_OBJECT *device, IRP *irp) DECLSPEC_HIDDEN; -void process_hid_report(DEVICE_OBJECT *device, BYTE *report, DWORD length) DECLSPEC_HIDDEN; +void process_hid_report(DEVICE_OBJECT *device, BYTE *report, DWORD length, BOOL warn_multi_events) DECLSPEC_HIDDEN; DEVICE_OBJECT* bus_enumerate_hid_devices(const platform_vtbl *vtbl, enum_func function, void* context) DECLSPEC_HIDDEN; /* General Bus Functions */ diff --git a/dlls/winebus.sys/bus_iohid.c b/dlls/winebus.sys/bus_iohid.c index 501a40d26e..74e5d82c9f 100644 --- a/dlls/winebus.sys/bus_iohid.c +++ b/dlls/winebus.sys/bus_iohid.c @@ -135,7 +135,7 @@ static void handle_IOHIDDeviceIOHIDReportCallback(void *context, uint32_t reportID, uint8_t *report, CFIndex report_length) { DEVICE_OBJECT *device = (DEVICE_OBJECT*)context; - process_hid_report(device, report, report_length); + process_hid_report(device, report, report_length, TRUE); } static int compare_platform_device(DEVICE_OBJECT *device, void *platform_dev) diff --git a/dlls/winebus.sys/bus_sdl.c b/dlls/winebus.sys/bus_sdl.c index 159727f6bc..99a206cb34 100644 --- a/dlls/winebus.sys/bus_sdl.c +++ b/dlls/winebus.sys/bus_sdl.c @@ -683,7 +683,7 @@ static BOOL set_report_from_event(SDL_Event *event) set_button_value(ie->button, ie->state, private->report_buffer); - process_hid_report(device, private->report_buffer, private->buffer_length); + process_hid_report(device, private->report_buffer, private->buffer_length, TRUE); break; } case SDL_JOYAXISMOTION: @@ -693,7 +693,7 @@ static BOOL set_report_from_event(SDL_Event *event) if (ie->axis < 6) { set_axis_value(private, ie->axis, ie->value); - process_hid_report(device, private->report_buffer, private->buffer_length); + process_hid_report(device, private->report_buffer, private->buffer_length, FALSE); } break; } @@ -702,7 +702,7 @@ static BOOL set_report_from_event(SDL_Event *event) SDL_JoyBallEvent *ie = &event->jball; set_ball_value(private, ie->ball, ie->xrel, ie->yrel); - process_hid_report(device, private->report_buffer, private->buffer_length); + process_hid_report(device, private->report_buffer, private->buffer_length, FALSE); break; } case SDL_JOYHATMOTION: @@ -710,7 +710,7 @@ static BOOL set_report_from_event(SDL_Event *event) SDL_JoyHatEvent *ie = &event->jhat; set_hat_value(private, ie->hat, ie->value); - process_hid_report(device, private->report_buffer, private->buffer_length); + process_hid_report(device, private->report_buffer, private->buffer_length, TRUE); break; } default: @@ -765,7 +765,7 @@ static BOOL set_mapped_report_from_event(SDL_Event *event) if (usage >= 0) { set_button_value(usage, ie->state, private->report_buffer); - process_hid_report(device, private->report_buffer, private->buffer_length); + process_hid_report(device, private->report_buffer, private->buffer_length, TRUE); } break; } @@ -774,7 +774,7 @@ static BOOL set_mapped_report_from_event(SDL_Event *event) SDL_ControllerAxisEvent *ie = &event->caxis; set_axis_value(private, ie->axis, ie->value); - process_hid_report(device, private->report_buffer, private->buffer_length); + process_hid_report(device, private->report_buffer, private->buffer_length, FALSE); break; } default: diff --git a/dlls/winebus.sys/bus_udev.c b/dlls/winebus.sys/bus_udev.c index d34e18c71c..47b9758ac2 100644 --- a/dlls/winebus.sys/bus_udev.c +++ b/dlls/winebus.sys/bus_udev.c @@ -768,7 +768,7 @@ static DWORD CALLBACK device_report_thread(void *args) else if (size == 0) TRACE_(hid_report)("Failed to read report\n"); else - process_hid_report(device, report_buffer, size); + process_hid_report(device, report_buffer, size, TRUE); } return 0; } @@ -979,7 +979,7 @@ static DWORD CALLBACK lnxev_device_report_thread(void *args) else if (size == 0) TRACE_(hid_report)("Failed to read report\n"); else if (set_report_from_event(private, &ie)) - process_hid_report(device, private->current_report_buffer, private->buffer_length); + process_hid_report(device, private->current_report_buffer, private->buffer_length, TRUE); } return 0; } diff --git a/dlls/winebus.sys/main.c b/dlls/winebus.sys/main.c index 2f3c05aa96..624ddd5f8d 100644 --- a/dlls/winebus.sys/main.c +++ b/dlls/winebus.sys/main.c @@ -614,11 +614,12 @@ NTSTATUS WINAPI hid_internal_dispatch(DEVICE_OBJECT *device, IRP *irp) return status; } -void process_hid_report(DEVICE_OBJECT *device, BYTE *report, DWORD length) +void process_hid_report(DEVICE_OBJECT *device, BYTE *report, DWORD length, BOOL warn_multi_events) { struct device_extension *ext = (struct device_extension*)device->DeviceExtension; IRP *irp; LIST_ENTRY *entry; + static int overwrite_reported; if (!length || !report) return; @@ -641,8 +642,18 @@ void process_hid_report(DEVICE_OBJECT *device, BYTE *report, DWORD length) ext->buffer_size = length; } - if (!ext->last_report_read) - ERR_(hid_report)("Device reports coming in too fast, last report not read yet!\n"); + /* + * Device reports may come in faster than our consumers could possibly + * read them, this is especially true for multi-axis events: When you move + * a stick across its range, it will always generate at least two events, + * one for the x axis, and one for the y axis. This is not really an error + * situation, so let's report this situation only once at most. If we + * already know the multi-event situation, let's skip logging this + * completely: We won't loose any information anyway because the report + * contains a complete device state and only axis positions were updated. + */ + if (warn_multi_events && !ext->last_report_read && !overwrite_reported++) + WARN_(hid_report)("Device reports coming in too fast, last report not read yet!\n"); memcpy(ext->last_report, report, length); ext->last_report_size = length; @@ -659,6 +670,7 @@ void process_hid_report(DEVICE_OBJECT *device, BYTE *report, DWORD length) irp->UserBuffer, &irp->IoStatus.Information); ext->last_report_read = TRUE; IoCompleteRequest(irp, IO_NO_INCREMENT); + overwrite_reported = 0; } LeaveCriticalSection(&ext->report_cs); } -- 2.16.4

3 7

[PATCH v2] winebus.sys: Do not report HID report read errors unconditionally
by Kai Krakow 15 Aug '18

15 Aug '18

Device reports may come in faster than our consumers could possibly read them, this is especially true for multi-axis events: When you move a stick across its range, it will always generate at least two events, one for the x axis, and one for the y axis. This is not really an error situation, so let's just discard the error message. We cannot completely get rid of `last_report_read`, tho, as it is used to track delivery of the report in different places and if true, try to deliver the report to queued readers. v2: Do not add complexity and just discard the message as suggested by Alexandre Julliard and approved by Aric Stewart. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=43125 CC: Aric Stewart <aric(a)codeweavers.com> CC: Alexandre Julliard <julliard(a)winehq.org> Signed-off-by: Kai Krakow <kai(a)kaishome.de> --- dlls/winebus.sys/main.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/dlls/winebus.sys/main.c b/dlls/winebus.sys/main.c index deb2c86d96..ce68e4af86 100644 --- a/dlls/winebus.sys/main.c +++ b/dlls/winebus.sys/main.c @@ -641,9 +641,6 @@ void process_hid_report(DEVICE_OBJECT *device, BYTE *report, DWORD length) ext->buffer_size = length; } - if (!ext->last_report_read) - ERR_(hid_report)("Device reports coming in too fast, last report not read yet!\n"); - memcpy(ext->last_report, report, length); ext->last_report_size = length; ext->last_report_read = FALSE; -- 2.16.4

2 1