- wine-devel - winehq.org

[PATCH 4/5] wined3d: Share common code between wined3d_adapter_init() and wined3d_adapter_no3d_init().
by Henri Verbeet 16 Aug '18

16 Aug '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/directx.c | 48 +++++++++++++++++++++--------------------------- 1 file changed, 21 insertions(+), 27 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 8f9449f4d17..be03a1d01d1 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -6601,7 +6601,7 @@ static DWORD get_max_gl_version(const struct wined3d_gl_info *gl_info, DWORD fla return wined3d_settings.max_gl_version; } -static BOOL wined3d_adapter_init(struct wined3d_adapter *adapter, UINT ordinal, DWORD wined3d_creation_flags) +static BOOL wined3d_adapter_opengl_init(struct wined3d_adapter *adapter, DWORD wined3d_creation_flags) { static const DWORD supported_gl_versions[] = { @@ -6611,13 +6611,10 @@ static BOOL wined3d_adapter_init(struct wined3d_adapter *adapter, UINT ordinal, }; struct wined3d_gl_info *gl_info = &adapter->gl_info; struct wined3d_caps_gl_ctx caps_gl_ctx = {0}; - unsigned int i; - DISPLAY_DEVICEW display_device; DWORD max_gl_version; + unsigned int i; - TRACE("adapter %p, ordinal %u.\n", adapter, ordinal); - - adapter->ordinal = ordinal; + TRACE("adapter %p, wined3d_creation_flags %#x.\n", adapter, wined3d_creation_flags); /* Dynamically load all GL core functions */ #ifdef USE_WIN32_OPENGL @@ -6716,11 +6713,6 @@ static BOOL wined3d_adapter_init(struct wined3d_adapter *adapter, UINT ordinal, adapter->vram_bytes_used = 0; TRACE("Emulating 0x%s bytes of video ram.\n", wine_dbgstr_longlong(adapter->vram_bytes)); - display_device.cb = sizeof(display_device); - EnumDisplayDevicesW(NULL, ordinal, &display_device, 0); - TRACE("DeviceName: %s\n", debugstr_w(display_device.DeviceName)); - strcpyW(adapter->DeviceName, display_device.DeviceName); - wined3d_caps_gl_ctx_destroy(&caps_gl_ctx); wined3d_adapter_init_ffp_attrib_ops(adapter); @@ -6728,12 +6720,9 @@ static BOOL wined3d_adapter_init(struct wined3d_adapter *adapter, UINT ordinal, return TRUE; } -static BOOL wined3d_adapter_no3d_init(struct wined3d_adapter *adapter, UINT ordinal) +static BOOL wined3d_adapter_no3d_init(struct wined3d_adapter *adapter) { - DISPLAY_DEVICEW display_device; - - memset(adapter, 0, sizeof(*adapter)); - adapter->ordinal = ordinal; + TRACE("adapter %p.\n", adapter); adapter->driver_info.name = "Display"; adapter->driver_info.description = "WineD3D DirectDraw Emulation"; @@ -6749,12 +6738,23 @@ static BOOL wined3d_adapter_no3d_init(struct wined3d_adapter *adapter, UINT ordi adapter->fragment_pipe = &none_fragment_pipe; adapter->shader_backend = &none_shader_backend; + return TRUE; +} + +static BOOL wined3d_adapter_init(struct wined3d_adapter *adapter, unsigned int ordinal, DWORD wined3d_creation_flags) +{ + DISPLAY_DEVICEW display_device; + + adapter->ordinal = ordinal; + display_device.cb = sizeof(display_device); EnumDisplayDevicesW(NULL, ordinal, &display_device, 0); - TRACE("DeviceName: %s\n", debugstr_w(display_device.DeviceName)); + TRACE("Display device: %s\n", debugstr_w(display_device.DeviceName)); strcpyW(adapter->DeviceName, display_device.DeviceName); - return TRUE; + if (wined3d_creation_flags & WINED3D_NO3D) + return wined3d_adapter_no3d_init(adapter); + return wined3d_adapter_opengl_init(adapter, wined3d_creation_flags); } static void STDMETHODCALLTYPE wined3d_null_wined3d_object_destroyed(void *parent) {} @@ -6766,20 +6766,14 @@ const struct wined3d_parent_ops wined3d_null_parent_ops = HRESULT wined3d_init(struct wined3d *wined3d, DWORD flags) { - BOOL ret; - wined3d->ref = 1; wined3d->flags = flags; - TRACE("Initializing adapters.\n"); + TRACE("Initialising adapters.\n"); - if (flags & WINED3D_NO3D) - ret = wined3d_adapter_no3d_init(&wined3d->adapters[0], 0); - else - ret = wined3d_adapter_init(&wined3d->adapters[0], 0, flags); - if (!ret) + if (!wined3d_adapter_init(&wined3d->adapters[0], 0, flags)) { - WARN("Failed to initialize adapter.\n"); + WARN("Failed to initialise adapter.\n"); return E_FAIL; } wined3d->adapter_count = 1; -- 2.11.0

1 0

[PATCH 3/5] wined3d: Rename wined3d_adapter_init_nogl() to wined3d_adapter_no3d_init().
by Henri Verbeet 16 Aug '18

16 Aug '18

Matching WINED3D_NO3D. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/directx.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 7d9a5e99eef..8f9449f4d17 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -6728,7 +6728,7 @@ static BOOL wined3d_adapter_init(struct wined3d_adapter *adapter, UINT ordinal, return TRUE; } -static BOOL wined3d_adapter_init_nogl(struct wined3d_adapter *adapter, UINT ordinal) +static BOOL wined3d_adapter_no3d_init(struct wined3d_adapter *adapter, UINT ordinal) { DISPLAY_DEVICEW display_device; @@ -6774,7 +6774,7 @@ HRESULT wined3d_init(struct wined3d *wined3d, DWORD flags) TRACE("Initializing adapters.\n"); if (flags & WINED3D_NO3D) - ret = wined3d_adapter_init_nogl(&wined3d->adapters[0], 0); + ret = wined3d_adapter_no3d_init(&wined3d->adapters[0], 0); else ret = wined3d_adapter_init(&wined3d->adapters[0], 0, flags); if (!ret) -- 2.11.0

1 0

[PATCH 2/5] wined3d: Trace command stream opcodes.
by Henri Verbeet 16 Aug '18

16 Aug '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/cs.c | 61 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 61 insertions(+) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 3f1ca8ce658..d6bc7399ca5 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -443,6 +443,65 @@ struct wined3d_cs_stop enum wined3d_cs_op opcode; }; +static const char *debug_cs_op(enum wined3d_cs_op op) +{ + switch (op) + { +#define WINED3D_TO_STR(type) case type: return #type + WINED3D_TO_STR(WINED3D_CS_OP_NOP); + WINED3D_TO_STR(WINED3D_CS_OP_PRESENT); + WINED3D_TO_STR(WINED3D_CS_OP_CLEAR); + WINED3D_TO_STR(WINED3D_CS_OP_DISPATCH); + WINED3D_TO_STR(WINED3D_CS_OP_DRAW); + WINED3D_TO_STR(WINED3D_CS_OP_FLUSH); + WINED3D_TO_STR(WINED3D_CS_OP_SET_PREDICATION); + WINED3D_TO_STR(WINED3D_CS_OP_SET_VIEWPORTS); + WINED3D_TO_STR(WINED3D_CS_OP_SET_SCISSOR_RECTS); + WINED3D_TO_STR(WINED3D_CS_OP_SET_RENDERTARGET_VIEW); + WINED3D_TO_STR(WINED3D_CS_OP_SET_DEPTH_STENCIL_VIEW); + WINED3D_TO_STR(WINED3D_CS_OP_SET_VERTEX_DECLARATION); + WINED3D_TO_STR(WINED3D_CS_OP_SET_STREAM_SOURCE); + WINED3D_TO_STR(WINED3D_CS_OP_SET_STREAM_SOURCE_FREQ); + WINED3D_TO_STR(WINED3D_CS_OP_SET_STREAM_OUTPUT); + WINED3D_TO_STR(WINED3D_CS_OP_SET_INDEX_BUFFER); + WINED3D_TO_STR(WINED3D_CS_OP_SET_CONSTANT_BUFFER); + WINED3D_TO_STR(WINED3D_CS_OP_SET_TEXTURE); + WINED3D_TO_STR(WINED3D_CS_OP_SET_SHADER_RESOURCE_VIEW); + WINED3D_TO_STR(WINED3D_CS_OP_SET_UNORDERED_ACCESS_VIEW); + WINED3D_TO_STR(WINED3D_CS_OP_SET_SAMPLER); + WINED3D_TO_STR(WINED3D_CS_OP_SET_SHADER); + WINED3D_TO_STR(WINED3D_CS_OP_SET_BLEND_STATE); + WINED3D_TO_STR(WINED3D_CS_OP_SET_RASTERIZER_STATE); + WINED3D_TO_STR(WINED3D_CS_OP_SET_RENDER_STATE); + WINED3D_TO_STR(WINED3D_CS_OP_SET_TEXTURE_STATE); + WINED3D_TO_STR(WINED3D_CS_OP_SET_SAMPLER_STATE); + WINED3D_TO_STR(WINED3D_CS_OP_SET_TRANSFORM); + WINED3D_TO_STR(WINED3D_CS_OP_SET_CLIP_PLANE); + WINED3D_TO_STR(WINED3D_CS_OP_SET_COLOR_KEY); + WINED3D_TO_STR(WINED3D_CS_OP_SET_MATERIAL); + WINED3D_TO_STR(WINED3D_CS_OP_SET_LIGHT); + WINED3D_TO_STR(WINED3D_CS_OP_SET_LIGHT_ENABLE); + WINED3D_TO_STR(WINED3D_CS_OP_PUSH_CONSTANTS); + WINED3D_TO_STR(WINED3D_CS_OP_RESET_STATE); + WINED3D_TO_STR(WINED3D_CS_OP_CALLBACK); + WINED3D_TO_STR(WINED3D_CS_OP_QUERY_ISSUE); + WINED3D_TO_STR(WINED3D_CS_OP_PRELOAD_RESOURCE); + WINED3D_TO_STR(WINED3D_CS_OP_UNLOAD_RESOURCE); + WINED3D_TO_STR(WINED3D_CS_OP_MAP); + WINED3D_TO_STR(WINED3D_CS_OP_UNMAP); + WINED3D_TO_STR(WINED3D_CS_OP_BLT_SUB_RESOURCE); + WINED3D_TO_STR(WINED3D_CS_OP_UPDATE_SUB_RESOURCE); + WINED3D_TO_STR(WINED3D_CS_OP_ADD_DIRTY_TEXTURE_REGION); + WINED3D_TO_STR(WINED3D_CS_OP_CLEAR_UNORDERED_ACCESS_VIEW); + WINED3D_TO_STR(WINED3D_CS_OP_COPY_UAV_COUNTER); + WINED3D_TO_STR(WINED3D_CS_OP_GENERATE_MIPMAPS); + WINED3D_TO_STR(WINED3D_CS_OP_STOP); +#undef WINED3D_TO_STR + default: + return wine_dbg_sprintf("UNKNOWN_OP(%#x)", op); + } +} + static void wined3d_cs_exec_nop(struct wined3d_cs *cs, const void *data) { } @@ -2711,6 +2770,7 @@ static DWORD WINAPI wined3d_cs_run(void *ctx) { opcode = *(const enum wined3d_cs_op *)packet->data; + TRACE("Executing %s.\n", debug_cs_op(opcode)); if (opcode >= WINED3D_CS_OP_STOP) { if (opcode > WINED3D_CS_OP_STOP) @@ -2719,6 +2779,7 @@ static DWORD WINAPI wined3d_cs_run(void *ctx) } wined3d_cs_op_handlers[opcode](cs, packet->data); + TRACE("%s executed.\n", debug_cs_op(opcode)); } tail += FIELD_OFFSET(struct wined3d_cs_packet, data[packet->size]); -- 2.11.0

1 0

[PATCH 1/5] wined3d: Rename build_dxtn_alpha_table() to build_bc3_alpha_table().
by Henri Verbeet 16 Aug '18

16 Aug '18

Since it's specific to BC3, as pointed out by Matteo. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/utils.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 491d888ad4c..800cdc4d2a5 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -391,7 +391,7 @@ static void build_dxtn_colour_table(WORD colour0, WORD colour1, } } -static void build_dxtn_alpha_table(BYTE alpha0, BYTE alpha1, BYTE alpha_table[8]) +static void build_bc3_alpha_table(BYTE alpha0, BYTE alpha1, BYTE alpha_table[8]) { unsigned int i; @@ -449,7 +449,7 @@ static void decompress_dxtn_block(const BYTE *src, BYTE *dst, unsigned int width alpha_bits = s[0]; if (format_id == WINED3DFMT_BC3_UNORM) { - build_dxtn_alpha_table(alpha_bits & 0xff, (alpha_bits >> 8) & 0xff, alpha_table); + build_bc3_alpha_table(alpha_bits & 0xff, (alpha_bits >> 8) & 0xff, alpha_table); alpha_bits >>= 16; } -- 2.11.0

1 0

[PATCH 1/2] include: Add missing notification codes.
by Zhiyi Zhang 16 Aug '18

16 Aug '18

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- include/commctrl.h | 4 ++++ include/richedit.h | 3 +++ 2 files changed, 7 insertions(+) diff --git a/include/commctrl.h b/include/commctrl.h index b9e3ae6c8c..c01d7c2e5a 100644 --- a/include/commctrl.h +++ b/include/commctrl.h @@ -1034,6 +1034,7 @@ static const WCHAR WC_BUTTONW[] = { 'B','u','t','t','o','n',0 }; #define BCN_HOTITEMCHANGE (BCN_FIRST + 1) #define BCN_DROPDOWN (BCN_FIRST + 2) +#define NM_GETCUSTOMSPLITRECT (BCN_FIRST + 3) #define BCM_FIRST 0x1600 #define BCM_GETIDEALSIZE (BCM_FIRST + 1) @@ -1796,6 +1797,7 @@ static const WCHAR TOOLTIPS_CLASSW[] = { 't','o','o','l','t','i','p','s','_', #define TTN_GETDISPINFO WINELIB_NAME_AW(TTN_GETDISPINFO) #define TTN_SHOW (TTN_FIRST-1) #define TTN_POP (TTN_FIRST-2) +#define TTN_LINKCLICK (TTN_FIRST-3) #define TTN_NEEDTEXT TTN_GETDISPINFO #define TTN_NEEDTEXTA TTN_GETDISPINFOA @@ -2289,6 +2291,7 @@ static const WCHAR WC_PAGESCROLLERW[] = { 'S','y','s','P','a','g','e','r',0 }; #define PGN_LAST (0U-950U) #define PGN_SCROLL (PGN_FIRST-1) #define PGN_CALCSIZE (PGN_FIRST-2) +#define PGN_HOTITEMCHANGE (PGN_FIRST-3) #include <pshpack1.h> @@ -4723,6 +4726,7 @@ static const WCHAR MONTHCAL_CLASSW[] = { 'S','y','s', /* Notifications */ +#define MCN_VIEWCHANGE MCN_FIRST #define MCN_SELCHANGE (MCN_FIRST + 1) #define MCN_GETDAYSTATE (MCN_FIRST + 3) #define MCN_SELECT (MCN_FIRST + 4) diff --git a/include/richedit.h b/include/richedit.h index 63221e2d9e..c2248436ac 100644 --- a/include/richedit.h +++ b/include/richedit.h @@ -205,6 +205,9 @@ static const WCHAR RICHEDIT_CLASS20W[] = { 'R','i','c','h','E','d','i','t','2',' #define EN_LOWFIRTF 0x070f #define EN_ALIGNLTR 0x0710 #define EN_ALIGNRTL 0x0711 +#define EN_CLIPFORMAT 0x0712 +#define EN_STARTCOMPOSITION 0x0713 +#define EN_ENDCOMPOSITION 0x0714 typedef DWORD (CALLBACK * EDITSTREAMCALLBACK)( DWORD_PTR, LPBYTE, LONG, LONG * ); -- 2.18.0

1 0

[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

[PATCH] kernel32: Implement stub for SetProcessMitigationPolicy
by Fabian Maurer 15 Aug '18

15 Aug '18

This is needed by x64 chromium sandbox for >= win8. Not doing anything but returning true is enough to make it work, though security won't be perfect. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45643 Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- ...api-ms-win-core-processthreads-l1-1-1.spec | 2 +- ...api-ms-win-core-processthreads-l1-1-2.spec | 2 +- dlls/kernel32/kernel32.spec | 1 + dlls/kernel32/process.c | 10 ++++++++++ dlls/kernelbase/kernelbase.spec | 2 +- include/winnt.h | 19 +++++++++++++++++++ 6 files changed, 33 insertions(+), 3 deletions(-) diff --git a/dlls/api-ms-win-core-processthreads-l1-1-1/api-ms-win-core-processthreads-l1-1-1.spec b/dlls/api-ms-win-core-processthreads-l1-1-1/api-ms-win-core-processthreads-l1-1-1.spec index ebbe55fe68..616fa63909 100644 --- a/dlls/api-ms-win-core-processthreads-l1-1-1/api-ms-win-core-processthreads-l1-1-1.spec +++ b/dlls/api-ms-win-core-processthreads-l1-1-1/api-ms-win-core-processthreads-l1-1-1.spec @@ -44,7 +44,7 @@ @ stdcall ResumeThread(long) kernel32.ResumeThread @ stdcall SetPriorityClass(long long) kernel32.SetPriorityClass @ stdcall SetProcessAffinityUpdateMode(long long) kernel32.SetProcessAffinityUpdateMode -@ stub SetProcessMitigationPolicy +@ stdcall SetProcessMitigationPolicy(long ptr long) kernel32.SetProcessMitigationPolicy @ stdcall SetProcessShutdownParameters(long long) kernel32.SetProcessShutdownParameters @ stdcall SetThreadContext(long ptr) kernel32.SetThreadContext @ stdcall SetThreadIdealProcessorEx(long ptr ptr) kernel32.SetThreadIdealProcessorEx diff --git a/dlls/api-ms-win-core-processthreads-l1-1-2/api-ms-win-core-processthreads-l1-1-2.spec b/dlls/api-ms-win-core-processthreads-l1-1-2/api-ms-win-core-processthreads-l1-1-2.spec index db94c2e5e7..8de6c5b66c 100644 --- a/dlls/api-ms-win-core-processthreads-l1-1-2/api-ms-win-core-processthreads-l1-1-2.spec +++ b/dlls/api-ms-win-core-processthreads-l1-1-2/api-ms-win-core-processthreads-l1-1-2.spec @@ -49,7 +49,7 @@ @ stdcall ResumeThread(long) kernel32.ResumeThread @ stdcall SetPriorityClass(long long) kernel32.SetPriorityClass @ stdcall SetProcessAffinityUpdateMode(long long) kernel32.SetProcessAffinityUpdateMode -@ stub SetProcessMitigationPolicy +@ stdcall SetProcessMitigationPolicy(long ptr long) kernel32.SetProcessMitigationPolicy @ stdcall SetProcessPriorityBoost(long long) kernel32.SetProcessPriorityBoost @ stdcall SetProcessShutdownParameters(long long) kernel32.SetProcessShutdownParameters @ stdcall SetThreadContext(long ptr) kernel32.SetThreadContext diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 9844a744d7..2d5b6df8dd 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -1427,6 +1427,7 @@ @ stdcall SetProcessAffinityMask(long long) @ stdcall SetProcessAffinityUpdateMode(long long) @ stdcall SetProcessDEPPolicy(long) +@ stdcall SetProcessMitigationPolicy(long ptr long) # @ stub SetProcessPreferredUILanguages @ stdcall SetProcessPriorityBoost(long long) @ stdcall SetProcessShutdownParameters(long long) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 42dd7cbbc0..a6a067b3cb 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -4536,3 +4536,13 @@ BOOL WINAPI BaseFlushAppcompatCache(void) SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; } + +/********************************************************************** + * SetProcessMitigationPolicy (KERNEL32.@) + */ +BOOL WINAPI SetProcessMitigationPolicy(PROCESS_MITIGATION_POLICY migitation_policy, void *buffer, SIZE_T length) +{ + FIXME("(%d, %p, %lu): stub\n", migitation_policy, buffer, length); + + return TRUE; +} diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index c4a75bc169..885c8eca10 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -1456,7 +1456,7 @@ # @ stub SetProcessDefaultCpuSets # @ stub SetProcessGroupAffinity # @ stub SetProcessInformation -# @ stub SetProcessMitigationPolicy +@ stdcall SetProcessMitigationPolicy(long ptr long) kernel32.SetProcessMitigationPolicy # @ stub SetProcessPreferredUILanguages @ stdcall SetProcessPriorityBoost(long long) kernel32.SetProcessPriorityBoost @ stdcall SetProcessShutdownParameters(long long) kernel32.SetProcessShutdownParameters diff --git a/include/winnt.h b/include/winnt.h index 719cf8496f..efa41b698d 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -6288,6 +6288,25 @@ typedef enum _RTL_UMS_SCHEDULER_REASON typedef void (CALLBACK *PRTL_UMS_SCHEDULER_ENTRY_POINT)(RTL_UMS_SCHEDULER_REASON,ULONG_PTR,PVOID); +typedef enum _PROCESS_MITIGATION_POLICY { + ProcessDEPPolicy, + ProcessASLRPolicy, + ProcessDynamicCodePolicy, + ProcessStrictHandleCheckPolicy, + ProcessSystemCallDisablePolicy, + ProcessMitigationOptionsMask, + ProcessExtensionPointDisablePolicy, + ProcessControlFlowGuardPolicy, + ProcessSignaturePolicy, + ProcessFontDisablePolicy, + ProcessImageLoadPolicy, + ProcessSystemCallFilterPolicy, + ProcessPayloadRestrictionPolicy, + ProcessChildProcessPolicy, + ProcessSideChannelIsolationPolicy, + MaxProcessMitigationPolicy +} PROCESS_MITIGATION_POLICY, *PPROCESS_MITIGATION_POLICY; + #ifdef __cplusplus } #endif -- 2.18.0

2 6

[PATCH] netstat: Use the ARRAY_SIZE() macro
by Michael Stefaniuc 15 Aug '18

15 Aug '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/netstat/netstat.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/netstat/netstat.c b/programs/netstat/netstat.c index 8fe5900093..afa211d855 100644 --- a/programs/netstat/netstat.c +++ b/programs/netstat/netstat.c @@ -144,7 +144,7 @@ static WCHAR *NETSTAT_load_message(UINT id) { static WCHAR msg[2048]; static const WCHAR failedW[] = {'F','a','i','l','e','d','!','\0'}; - if (!LoadStringW(GetModuleHandleW(NULL), id, msg, sizeof(msg)/sizeof(WCHAR))) { + if (!LoadStringW(GetModuleHandleW(NULL), id, msg, ARRAY_SIZE(msg))) { WINE_FIXME("LoadString failed with %d\n", GetLastError()); strcpyW(msg, failedW); } -- 2.14.4

2 1

[PATCH] dinput: Fix mac build
by Andrew Eikum 15 Aug '18

15 Aug '18

Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- dlls/dinput/joystick_osx.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/dinput/joystick_osx.c b/dlls/dinput/joystick_osx.c index 282b6c2790..2b2aade813 100644 --- a/dlls/dinput/joystick_osx.c +++ b/dlls/dinput/joystick_osx.c @@ -988,16 +988,19 @@ static HRESULT joydev_enum_deviceW(DWORD dwDevType, DWORD dwFlags, LPDIDEVICEINS { char name[MAX_PATH]; char friendly[32]; + IOHIDDeviceRef device; TRACE("dwDevType %u dwFlags 0x%08x version 0x%04x id %d\n", dwDevType, dwFlags, version, id); if (id >= find_joystick_devices()) return E_FAIL; + device = get_device_ref(id); + if ((dwDevType == 0) || ((dwDevType == DIDEVTYPE_JOYSTICK) && (version > 0x0300 && version < 0x0800)) || (((dwDevType == DI8DEVCLASS_GAMECTRL) || (dwDevType == DI8DEVTYPE_JOYSTICK)) && (version >= 0x0800))) { + if (dwFlags & DIEDFL_FORCEFEEDBACK) { - IOHIDDeviceRef device = get_device_ref(id); if(!device) return S_FALSE; if(get_ff(device, NULL) != S_OK) -- 2.18.0

1 0

[PATCH 1/5] kernel32: Don't clear WINEDEBUG in the debugger process.
by Zebediah Figura 15 Aug '18

15 Aug '18

While this does avoid usually undesired debug output, it also makes debugging winedbg.exe practically impossible. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/kernel32/except.c | 19 ++----------------- 1 file changed, 2 insertions(+), 17 deletions(-) diff --git a/dlls/kernel32/except.c b/dlls/kernel32/except.c index bff8ce2..03fb46d 100644 --- a/dlls/kernel32/except.c +++ b/dlls/kernel32/except.c @@ -173,7 +173,7 @@ static BOOL start_debugger(PEXCEPTION_POINTERS epointers, HANDLE hEvent) { OBJECT_ATTRIBUTES attr; UNICODE_STRING nameW; - char *cmdline, *env, *p; + char *cmdline; HANDLE hDbgConf; DWORD bAuto = TRUE; PROCESS_INFORMATION info; @@ -287,27 +287,12 @@ 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 (!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; - } - } - TRACE("Starting debugger %s\n", debugstr_a(cmdline)); memset(&startup, 0, sizeof(startup)); startup.cb = sizeof(startup); startup.dwFlags = STARTF_USESHOWWINDOW; startup.wShowWindow = SW_SHOWNORMAL; - ret = CreateProcessA(NULL, cmdline, NULL, NULL, TRUE, 0, env, NULL, &startup, &info); - FreeEnvironmentStringsA( env ); + ret = CreateProcessA(NULL, cmdline, NULL, NULL, TRUE, 0, NULL, NULL, &startup, &info); if (ret) { -- 2.7.4

3 8

Re: [PATCH] msvcp120: Add tests for _Concurrent_vector_Internal_compact.
by Piotr Caban 15 Aug '18

15 Aug '18

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com>

1 0

[PATCH] msvcp120: Add tests for _Concurrent_vector_Internal_compact.
by Hua Meng 15 Aug '18

15 Aug '18

Signed-off-by: Hua meng <161220092(a)smail.nju.edu.cn> --- dlls/msvcp120/tests/msvcp120.c | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/dlls/msvcp120/tests/msvcp120.c b/dlls/msvcp120/tests/msvcp120.c index d7b82a3aae..77515cb27c 100644 --- a/dlls/msvcp120/tests/msvcp120.c +++ b/dlls/msvcp120/tests/msvcp120.c @@ -3095,6 +3095,29 @@ static void test_vector_base_v4(void) } for(; i<ARRAY_SIZE(b.blocks); i++) ok(!b.blocks[i], "b.blocks[%d] != NULL\n", i); + SET_EXPECT(concurrent_vector_int_alloc); + call_func4(p_vector_base_v4__Internal_reserve, + &v2, 17, sizeof(int), 32); + CHECK_CALLED(concurrent_vector_int_alloc); + data = call_func5(p_vector_base_v4__Internal_compact, + &v2, sizeof(int), &b, concurrent_vector_int_destroy, + concurrent_vector_int_copy); + ok(v2.first_block == 4, "v2.first_block got %ld expected 4\n", (long)v2.first_block); + ok(v2.early_size == 9, "v2.early_size got %ld expected 9\n", (long)v2.early_size); + ok(b.first_block == 4, "b.first_block got %ld expected 2\n", (long)b.first_block); + ok(v2.segment != v2.storage, "v2.segment got %p expected %p\n", v2.segment, v2.storage); + for(i = 4; i < 32; i++) + ok(v2.segment[i] == 0, "v2.segment[%d] got %p\n", + i, v2.segment[i]); + for(i=0; i<4; i++) + ok(!b.blocks[i], "b.blocks[%d] != NULL\n", i); + for(; i < 5; i++) { + ok(b.blocks[i] != NULL, "b.blocks[%d] got NULL\n", i); + free(b.blocks[i]); + vector_alloc_count--; + } + for(; i<ARRAY_SIZE(b.blocks); i++) + ok(!b.blocks[i], "b.blocks[%d] != NULL\n", i); SET_EXPECT(concurrent_vector_int_destroy); size = (size_t)call_func2(p_vector_base_v4__Internal_clear, &v2, concurrent_vector_int_destroy); -- 2.11.0

1 0

[PATCH 5/5 v2] msvcp90: Add time_get<char>::do_get_monthname implementation.
by Piotr Caban 15 Aug '18

15 Aug '18

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- v2: - removed "return NULL;" line left from stub dlls/msvcp90/locale.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-)

1 0

[PATCH] msvcrt: Use the ARRAY_SIZE() macro
by Michael Stefaniuc 15 Aug '18

15 Aug '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msvcrt/console.c | 2 +- dlls/msvcrt/ctype.c | 2 +- dlls/msvcrt/errno.c | 2 +- dlls/msvcrt/except.c | 3 +-- dlls/msvcrt/exit.c | 3 +-- dlls/msvcrt/file.c | 20 ++++++++++---------- dlls/msvcrt/locale.c | 12 ++++++------ dlls/msvcrt/printf.h | 4 ++-- dlls/msvcrt/process.c | 2 +- dlls/msvcrt/scheduler.c | 8 ++++---- dlls/msvcrt/wcs.c | 2 +- 11 files changed, 29 insertions(+), 31 deletions(-) diff --git a/dlls/msvcrt/console.c b/dlls/msvcrt/console.c index 75e95ebcfc..3a2301ef18 100644 --- a/dlls/msvcrt/console.c +++ b/dlls/msvcrt/console.c @@ -124,7 +124,7 @@ static BOOL handle_enhanced_keys(INPUT_RECORD *ir, unsigned char *ch1, unsigned { int i; - for (i = 0; i < sizeof(enh_map) / sizeof(enh_map[0]); i++) + for (i = 0; i < ARRAY_SIZE(enh_map); i++) { if (ir->Event.KeyEvent.wVirtualScanCode == enh_map[i].vk) { diff --git a/dlls/msvcrt/ctype.c b/dlls/msvcrt/ctype.c index 2c39a56686..758411a7a4 100644 --- a/dlls/msvcrt/ctype.c +++ b/dlls/msvcrt/ctype.c @@ -493,7 +493,7 @@ unsigned short __cdecl wctype(const char *property) }; unsigned int i; - for(i=0; i<sizeof(properties)/sizeof(properties[0]); i++) + for(i=0; i<ARRAY_SIZE(properties); i++) if(!strcmp(property, properties[i].name)) return properties[i].mask; diff --git a/dlls/msvcrt/errno.c b/dlls/msvcrt/errno.c index c5fbae21a8..a80ac61f11 100644 --- a/dlls/msvcrt/errno.c +++ b/dlls/msvcrt/errno.c @@ -123,7 +123,7 @@ char *MSVCRT__sys_errlist[] = str_generic_error }; -unsigned int MSVCRT__sys_nerr = sizeof(MSVCRT__sys_errlist)/sizeof(MSVCRT__sys_errlist[0]) - 1; +unsigned int MSVCRT__sys_nerr = ARRAY_SIZE(MSVCRT__sys_errlist) - 1; static MSVCRT_invalid_parameter_handler invalid_parameter_handler = NULL; diff --git a/dlls/msvcrt/except.c b/dlls/msvcrt/except.c index 8fccd8ed5d..da0ac9219e 100644 --- a/dlls/msvcrt/except.c +++ b/dlls/msvcrt/except.c @@ -136,8 +136,7 @@ static LONG msvcrt_exception_filter(struct _EXCEPTION_POINTERS *except) int float_signal = MSVCRT__FPE_INVALID; sighandlers[MSVCRT_SIGFPE] = MSVCRT_SIG_DFL; - for (i = 0; i < sizeof(float_exception_map) / - sizeof(float_exception_map[0]); i++) + for (i = 0; i < ARRAY_SIZE(float_exception_map); i++) { if (float_exception_map[i].status == except->ExceptionRecord->ExceptionCode) diff --git a/dlls/msvcrt/exit.c b/dlls/msvcrt/exit.c index b84c50adbc..51bc6f07e1 100644 --- a/dlls/msvcrt/exit.c +++ b/dlls/msvcrt/exit.c @@ -209,8 +209,7 @@ static void DoMessageBoxW(const MSVCRT_wchar_t *lead, const MSVCRT_wchar_t *mess MSVCRT_wchar_t text[2048]; INT ret; - MSVCRT__snwprintf(text, sizeof(text)/sizeof(text[0]), message_format, - lead, MSVCRT__wpgmptr, message); + MSVCRT__snwprintf(text, ARRAY_SIZE(text), message_format, lead, MSVCRT__wpgmptr, message); msgbox.cbSize = sizeof(msgbox); msgbox.hwndOwner = GetActiveWindow(); diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 2c05f25c6a..224e6eae0c 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -1223,7 +1223,7 @@ void msvcrt_free_io(void) MSVCRT__flushall(); MSVCRT__fcloseall(); - for(i=0; i<sizeof(MSVCRT___pioinfo)/sizeof(MSVCRT___pioinfo[0]); i++) + for(i=0; i<ARRAY_SIZE(MSVCRT___pioinfo); i++) { if(!MSVCRT___pioinfo[i]) continue; @@ -1246,7 +1246,7 @@ void msvcrt_free_io(void) } } - for(i=0; i<sizeof(MSVCRT_fstream)/sizeof(MSVCRT_fstream[0]); i++) + for(i=0; i<ARRAY_SIZE(MSVCRT_fstream); i++) MSVCRT_free(MSVCRT_fstream[i]); } @@ -1606,29 +1606,29 @@ static int msvcrt_get_flags(const MSVCRT_wchar_t* mode, int *open_flags, int* st mode++; while(*mode == ' ') mode++; - if(!MSVCRT_CHECK_PMT(!strncmpW(ccs, mode, sizeof(ccs)/sizeof(ccs[0])))) + if(!MSVCRT_CHECK_PMT(!strncmpW(ccs, mode, ARRAY_SIZE(ccs)))) return -1; - mode += sizeof(ccs)/sizeof(ccs[0]); + mode += ARRAY_SIZE(ccs); while(*mode == ' ') mode++; if(!MSVCRT_CHECK_PMT(*mode == '=')) return -1; mode++; while(*mode == ' ') mode++; - if(!strncmpiW(utf8, mode, sizeof(utf8)/sizeof(utf8[0]))) + if(!strncmpiW(utf8, mode, ARRAY_SIZE(utf8))) { *open_flags |= MSVCRT__O_U8TEXT; - mode += sizeof(utf8)/sizeof(utf8[0]); + mode += ARRAY_SIZE(utf8); } - else if(!strncmpiW(utf16le, mode, sizeof(utf16le)/sizeof(utf16le[0]))) + else if(!strncmpiW(utf16le, mode, ARRAY_SIZE(utf16le))) { *open_flags |= MSVCRT__O_U16TEXT; - mode += sizeof(utf16le)/sizeof(utf16le[0]); + mode += ARRAY_SIZE(utf16le); } - else if(!strncmpiW(unicode, mode, sizeof(unicode)/sizeof(unicode[0]))) + else if(!strncmpiW(unicode, mode, ARRAY_SIZE(unicode))) { *open_flags |= MSVCRT__O_WTEXT; - mode += sizeof(unicode)/sizeof(unicode[0]); + mode += ARRAY_SIZE(unicode); } else { diff --git a/dlls/msvcrt/locale.c b/dlls/msvcrt/locale.c index 8c9bece774..1e56395dbb 100644 --- a/dlls/msvcrt/locale.c +++ b/dlls/msvcrt/locale.c @@ -94,7 +94,7 @@ static const char * const _country_synonyms[] = static void remap_synonym(char *name) { unsigned int i; - for (i = 0; i < sizeof(_country_synonyms)/sizeof(char*); i += 2 ) + for (i = 0; i < ARRAY_SIZE(_country_synonyms); i += 2) { if (!strcasecmp(_country_synonyms[i],name)) { @@ -595,7 +595,7 @@ void* CDECL _Gettnames(void) TRACE("\n"); - for(i=0; i<sizeof(cur->str.str)/sizeof(cur->str.str[0]); i++) + for(i=0; i<ARRAY_SIZE(cur->str.str); i++) size += strlen(cur->str.str[i])+1; ret = MSVCRT_malloc(size); @@ -604,7 +604,7 @@ void* CDECL _Gettnames(void) memcpy(ret, cur, size); size = 0; - for(i=0; i<sizeof(cur->str.str)/sizeof(cur->str.str[0]); i++) { + for(i=0; i<ARRAY_SIZE(cur->str.str); i++) { ret->str.str[i] = &ret->data[size]; size += strlen(&ret->data[size])+1; } @@ -1605,7 +1605,7 @@ static MSVCRT_pthreadlocinfo create_locinfo(int category, size = sizeof(MSVCRT___lc_time_data); lcid_tmp = lcid[MSVCRT_LC_TIME] ? lcid[MSVCRT_LC_TIME] : MAKELCID(LANG_ENGLISH, SORT_DEFAULT); - for(i=0; i<sizeof(time_data)/sizeof(time_data[0]); i++) { + for(i=0; i<ARRAY_SIZE(time_data); i++) { if(time_data[i]==LOCALE_SSHORTDATE && !lcid[MSVCRT_LC_TIME]) { size += sizeof(cloc_short_date) + sizeof(cloc_short_dateW); }else if(time_data[i]==LOCALE_SLONGDATE && !lcid[MSVCRT_LC_TIME]) { @@ -1637,7 +1637,7 @@ static MSVCRT_pthreadlocinfo create_locinfo(int category, } ret = 0; - for(i=0; i<sizeof(time_data)/sizeof(time_data[0]); i++) { + for(i=0; i<ARRAY_SIZE(time_data); i++) { locinfo->lc_time_curr->str.str[i] = &locinfo->lc_time_curr->data[ret]; if(time_data[i]==LOCALE_SSHORTDATE && !lcid[MSVCRT_LC_TIME]) { memcpy(&locinfo->lc_time_curr->data[ret], cloc_short_date, sizeof(cloc_short_date)); @@ -1653,7 +1653,7 @@ static MSVCRT_pthreadlocinfo create_locinfo(int category, &locinfo->lc_time_curr->data[ret], size-ret); } } - for(i=0; i<sizeof(time_data)/sizeof(time_data[0]); i++) { + for(i=0; i<ARRAY_SIZE(time_data); i++) { locinfo->lc_time_curr->wstr.wstr[i] = (MSVCRT_wchar_t*)&locinfo->lc_time_curr->data[ret]; if(time_data[i]==LOCALE_SSHORTDATE && !lcid[MSVCRT_LC_TIME]) { memcpy(&locinfo->lc_time_curr->data[ret], cloc_short_dateW, sizeof(cloc_short_dateW)); diff --git a/dlls/msvcrt/printf.h b/dlls/msvcrt/printf.h index ee8120e149..077dafa550 100644 --- a/dlls/msvcrt/printf.h +++ b/dlls/msvcrt/printf.h @@ -518,7 +518,7 @@ int FUNC_NAME(pf_printf)(FUNC_NAME(puts_clbk) pf_puts, void *puts_ctx, const API flags.PadZero = '0'; i = flags.Precision; flags.Precision = 2*sizeof(void*); - FUNC_NAME(pf_integer_conv)(buf, sizeof(buf)/sizeof(APICHAR), &flags, + FUNC_NAME(pf_integer_conv)(buf, ARRAY_SIZE(buf), &flags, (ULONG_PTR)pf_args(args_ctx, pos, VT_PTR, valist).get_ptr); flags.PadZero = 0; flags.Precision = i; @@ -549,7 +549,7 @@ int FUNC_NAME(pf_printf)(FUNC_NAME(puts_clbk) pf_puts, void *puts_ctx, const API flags.Precision = flags.FieldLength - 2; max_len = (flags.FieldLength>flags.Precision ? flags.FieldLength : flags.Precision) + 10; - if(max_len > sizeof(buf)/sizeof(APICHAR)) + if(max_len > ARRAY_SIZE(buf)) tmp = HeapAlloc(GetProcessHeap(), 0, max_len); if(!tmp) return -1; diff --git a/dlls/msvcrt/process.c b/dlls/msvcrt/process.c index fac3bd4d20..9a192e7e9b 100644 --- a/dlls/msvcrt/process.c +++ b/dlls/msvcrt/process.c @@ -345,7 +345,7 @@ static MSVCRT_wchar_t *msvcrt_get_comspec(void) MSVCRT_wchar_t *ret; unsigned int len; - if (!(len = GetEnvironmentVariableW(comspec, NULL, 0))) len = sizeof(cmd)/sizeof(MSVCRT_wchar_t); + if (!(len = GetEnvironmentVariableW(comspec, NULL, 0))) len = ARRAY_SIZE(cmd); if ((ret = HeapAlloc(GetProcessHeap(), 0, len * sizeof(MSVCRT_wchar_t)))) { if (!GetEnvironmentVariableW(comspec, ret, len)) strcpyW(ret, cmd); diff --git a/dlls/msvcrt/scheduler.c b/dlls/msvcrt/scheduler.c index c6c0fa7e38..55ab1c549e 100644 --- a/dlls/msvcrt/scheduler.c +++ b/dlls/msvcrt/scheduler.c @@ -344,7 +344,7 @@ static void ExternalContextBase_dtor(ExternalContextBase *this) int i; /* TODO: move the allocator cache to scheduler so it can be reused */ - for(i=0; i<sizeof(this->allocator_cache)/sizeof(this->allocator_cache[0]); i++) { + for(i=0; i<ARRAY_SIZE(this->allocator_cache); i++) { for(cur = this->allocator_cache[i]; cur; cur=next) { next = cur->free.next; MSVCRT_operator_delete(cur); @@ -413,10 +413,10 @@ void * CDECL Concurrency_Alloc(MSVCRT_size_t size) int i; C_ASSERT(sizeof(union allocator_cache_entry) <= 1 << 4); - for(i=0; i<sizeof(context->allocator_cache)/sizeof(context->allocator_cache[0]); i++) + for(i=0; i<ARRAY_SIZE(context->allocator_cache); i++) if (1 << (i+4) >= size) break; - if(i==sizeof(context->allocator_cache)/sizeof(context->allocator_cache[0])) { + if(i==ARRAY_SIZE(context->allocator_cache)) { p = MSVCRT_operator_new(size); p->alloc.bucket = -1; }else if (context->allocator_cache[i]) { @@ -446,7 +446,7 @@ void CDECL Concurrency_Free(void* mem) if (context->context.vtable != &MSVCRT_ExternalContextBase_vtable) { MSVCRT_operator_delete(p); }else { - if(bucket >= 0 && bucket < sizeof(context->allocator_cache)/sizeof(context->allocator_cache[0]) && + if(bucket >= 0 && bucket < ARRAY_SIZE(context->allocator_cache) && (!context->allocator_cache[bucket] || context->allocator_cache[bucket]->free.depth < 20)) { p->free.next = context->allocator_cache[bucket]; p->free.depth = p->free.next ? p->free.next->free.depth+1 : 0; diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index 098e0d5ba8..ed73fc6163 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -2109,7 +2109,7 @@ static int wctoint(WCHAR c, int base) 0xd66, 0xe50, 0xed0, 0xf20, 0x1040, 0x17e0, 0x1810, 0xff10 }; int i; - for (i = 0; i < sizeof(zeros)/sizeof(zeros[0]) && c >= zeros[i]; ++i) { + for (i = 0; i < ARRAY_SIZE(zeros) && c >= zeros[i]; ++i) { if (zeros[i] <= c && c <= zeros[i] + 9) { v = c - zeros[i]; break; -- 2.14.4

2 1

[PATCH 5/5] msvcp90: Add time_get<char>::do_get_monthname implementation.
by Piotr Caban 15 Aug '18

15 Aug '18

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcp90/locale.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-)

1 0

[PATCH 4/5] msvcp90: Add time_get<char>::do_get_weekday implementation.
by Piotr Caban 15 Aug '18

15 Aug '18

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcp90/locale.c | 59 +++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 57 insertions(+), 2 deletions(-)

1 0

[PATCH 3/5] msvcp90: Add time_get<char>::do_get_year implementation.
by Piotr Caban 15 Aug '18

15 Aug '18

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcp90/locale.c | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-)

1 0

[PATCH 2/5] msvcp90: Add time_get<char>::do_get_time implementation.
by Piotr Caban 15 Aug '18

15 Aug '18

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcp90/locale.c | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-)

1 0

[PATCH 1/5] msvcp90: Add time_get<char>::_Getint implementation.
by Piotr Caban 15 Aug '18

15 Aug '18

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcp110/msvcp110.spec | 4 +- dlls/msvcp120/msvcp120.spec | 4 +- dlls/msvcp120_app/msvcp120_app.spec | 4 +- dlls/msvcp90/locale.c | 57 +++++++++++++++-- dlls/msvcp90/msvcp90.spec | 12 ++-- dlls/msvcp90/tests/ios.c | 123 ++++++++++++++++++++++++++++++++++++ 6 files changed, 188 insertions(+), 16 deletions(-)

1 0

[PATCH 3/3] msvcp140/tests: Test _Last_write_time and _Set_last_write_time.
by Piotr Caban 15 Aug '18

15 Aug '18

From: Stefan Dösinger <stefan(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcp110/tests/msvcp110.c | 35 ++++++++++++-- dlls/msvcp120/tests/msvcp120.c | 9 ++++ dlls/msvcp140/tests/msvcp140.c | 101 +++++++++++++++++++++++++++++++++++++++++ 3 files changed, 141 insertions(+), 4 deletions(-)

1 0

[PATCH 2/3] msvcp140: Add _Last_write_time implementation.
by Piotr Caban 15 Aug '18

15 Aug '18

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcp140/msvcp140.spec | 4 ++-- dlls/msvcp90/ios.c | 38 +++++++++++++++++++++++++++----------- 2 files changed, 29 insertions(+), 13 deletions(-)

1 0

[PATCH 1/3] msvcp110: Add _Last_write_time(wchar_t) implementation.
by Piotr Caban 15 Aug '18

15 Aug '18

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcp110/msvcp110.spec | 8 ++-- dlls/msvcp120/msvcp120.spec | 8 ++-- dlls/msvcp120_app/msvcp120_app.spec | 8 ++-- dlls/msvcp90/ios.c | 78 ++++++++++++++++++++++++++++++------- 4 files changed, 75 insertions(+), 27 deletions(-)

1 0

[PATCH 5/5] d3d11/tests: Run the tests in parallel.
by Henri Verbeet 15 Aug '18

15 Aug '18

It's hard enough for a single CPU core to keep a modern GPU busy in the optimal case, but with typical batch sizes of 4 vertices and trivial shaders, our tests are extremely CPU bound. With 8+-core CPU's being generally available, there's a lot to be gained. Generally speaking, not all tests can be run in parallel; tests that touch global state, like e.g. the display mode, can't. Fortunately, none of the d3d11 tests currently do that. Unfortunately, this currently doesn't help quite as much on Wine as it does on Windows. The big wined3d lock prevents a lot of parallelism, even though the tests use separate Direct3D devices. In the specific case of these tests, simply disabling the lock is safe, and shows how much could be gained by simply pushing the lock down a layer to the device. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d3d11/tests/d3d11.c | 369 ++++++++++++++++++++++++++++++----------------- 1 file changed, 234 insertions(+), 135 deletions(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 5e324b18ba6..2d62342fa98 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -37,6 +37,21 @@ #define SWAPCHAIN_FLAG_SHADER_INPUT 0x1 +static unsigned int use_adapter_idx; +static BOOL use_warp_adapter; +static BOOL use_mt = TRUE; + +static struct test_entry +{ + union + { + void (*test)(void); + void (*test_fl)(D3D_FEATURE_LEVEL fl); + } u; + D3D_FEATURE_LEVEL fl; +} *mt_tests; +size_t mt_tests_size, mt_test_count; + struct format_support { DXGI_FORMAT format; @@ -95,6 +110,89 @@ struct swapchain_desc DWORD flags; }; +static void queue_test_entry(const struct test_entry *t) +{ + if (mt_test_count >= mt_tests_size) + { + mt_tests_size = max(16, mt_tests_size * 2); + mt_tests = heap_realloc(mt_tests, mt_tests_size * sizeof(*t)); + } + mt_tests[mt_test_count++] = *t; +} + +static void queue_test_fl(void (*test)(const D3D_FEATURE_LEVEL fl), D3D_FEATURE_LEVEL fl) +{ + struct test_entry t; + + t.u.test_fl = test; + t.fl = fl; + queue_test_entry(&t); +} + +static void queue_test(void (*test)(void)) +{ + struct test_entry t; + + t.u.test = test; + t.fl = 0; + queue_test_entry(&t); +} + +static void run_mt_test(const struct test_entry *t) +{ + if (t->fl) + t->u.test_fl(t->fl); + else + t->u.test(); +} + +static DWORD WINAPI thread_func(void *ctx) +{ + LONG *i = ctx, j; + + while (*i < mt_test_count) + { + j = *i; + if (InterlockedCompareExchange(i, j + 1, j) == j) + run_mt_test(&mt_tests[j]); + } + + return 0; +} + +static void run_queued_tests(void) +{ + unsigned int thread_count, i; + HANDLE *threads; + SYSTEM_INFO si; + LONG test_idx; + + if (!use_mt) + { + for (i = 0; i < mt_test_count; ++i) + { + run_mt_test(&mt_tests[i]); + } + + return; + } + + GetSystemInfo(&si); + thread_count = si.dwNumberOfProcessors; + threads = heap_calloc(thread_count, sizeof(*threads)); + for (i = 0, test_idx = 0; i < thread_count; ++i) + { + threads[i] = CreateThread(NULL, 0, thread_func, &test_idx, 0, NULL); + ok(!!threads[i], "Failed to create thread %u.\n", i); + } + WaitForMultipleObjects(thread_count, threads, TRUE, INFINITE); + for (i = 0; i < thread_count; ++i) + { + CloseHandle(threads[i]); + } + heap_free(threads); +} + static void set_box(D3D11_BOX *box, UINT left, UINT top, UINT front, UINT right, UINT bottom, UINT back) { box->left = left; @@ -1139,9 +1237,6 @@ static void check_texture_uvec4_(unsigned int line, ID3D11Texture2D *texture, check_texture_sub_resource_uvec4_(line, texture, sub_resource_idx, NULL, expected_value); } -static BOOL use_warp_adapter; -static unsigned int use_adapter_idx; - static IDXGIAdapter *create_adapter(void) { IDXGIFactory4 *factory4; @@ -17297,7 +17392,7 @@ static void test_fl9_draw(const D3D_FEATURE_LEVEL feature_level) release_test_context(&test_context); } -static void run_for_each_feature_level_in_range(D3D_FEATURE_LEVEL begin, +static void queue_for_each_feature_level_in_range(D3D_FEATURE_LEVEL begin, D3D_FEATURE_LEVEL end, void (*test_func)(const D3D_FEATURE_LEVEL fl)) { static const D3D_FEATURE_LEVEL feature_levels[] = @@ -17316,19 +17411,19 @@ static void run_for_each_feature_level_in_range(D3D_FEATURE_LEVEL begin, for (i = 0; i < ARRAY_SIZE(feature_levels); ++i) { if (begin <= feature_levels[i] && feature_levels[i] <= end) - test_func(feature_levels[i]); + queue_test_fl(test_func, feature_levels[i]); } } -static void run_for_each_feature_level(void (*test_func)(const D3D_FEATURE_LEVEL fl)) +static void queue_for_each_feature_level(void (*test_func)(const D3D_FEATURE_LEVEL fl)) { - run_for_each_feature_level_in_range(D3D_FEATURE_LEVEL_9_1, + queue_for_each_feature_level_in_range(D3D_FEATURE_LEVEL_9_1, D3D_FEATURE_LEVEL_11_1, test_func); } -static void run_for_each_9_x_feature_level(void (*test_func)(const D3D_FEATURE_LEVEL fl)) +static void queue_for_each_9_x_feature_level(void (*test_func)(const D3D_FEATURE_LEVEL fl)) { - run_for_each_feature_level_in_range(D3D_FEATURE_LEVEL_9_1, + queue_for_each_feature_level_in_range(D3D_FEATURE_LEVEL_9_1, D3D_FEATURE_LEVEL_9_3, test_func); } @@ -27730,135 +27825,139 @@ START_TEST(d3d11) use_warp_adapter = TRUE; else if (!strcmp(argv[i], "--adapter") && i + 1 < argc) use_adapter_idx = atoi(argv[++i]); + else if (!strcmp(argv[i], "--single")) + use_mt = FALSE; } print_adapter_info(); - test_create_device(); - run_for_each_feature_level(test_device_interfaces); - test_get_immediate_context(); - test_create_texture1d(); - test_texture1d_interfaces(); - test_create_texture2d(); - test_texture2d_interfaces(); - test_create_texture3d(); - test_texture3d_interfaces(); - test_create_buffer(); - test_create_depthstencil_view(); - test_depthstencil_view_interfaces(); - test_create_rendertarget_view(); - test_create_shader_resource_view(); - run_for_each_feature_level(test_create_shader); - test_create_sampler_state(); - test_create_blend_state(); - test_create_depthstencil_state(); - test_create_rasterizer_state(); - test_create_query(); - test_occlusion_query(); - test_pipeline_statistics_query(); - test_timestamp_query(); - test_device_removed_reason(); - test_private_data(); - run_for_each_feature_level(test_state_refcounting); - test_device_context_state(); - test_blend(); - test_texture1d(); - test_texture(); - test_cube_maps(); - test_depth_stencil_sampling(); - test_sample_c_lz(); - test_multiple_render_targets(); - test_render_target_views(); - test_layered_rendering(); - test_scissor(); - test_clear_state(); - test_il_append_aligned(); - test_instance_id(); - test_fragment_coords(); - test_update_subresource(); - test_copy_subresource_region(); - test_resource_map(); - run_for_each_feature_level(test_resource_access); - test_check_multisample_quality_levels(); - run_for_each_feature_level(test_swapchain_formats); - test_swapchain_views(); - test_swapchain_flip(); - test_clear_render_target_view_1d(); - test_clear_render_target_view_2d(); - test_clear_render_target_view_3d(); - test_clear_depth_stencil_view(); - test_clear_buffer_unordered_access_view(); - test_initial_depth_stencil_state(); - test_draw_depth_only(); - test_draw_uav_only(); - test_cb_relative_addressing(); - test_vs_input_relative_addressing(); - test_getdc(); - test_shader_stage_input_output_matching(); - test_shader_interstage_interface(); - test_sm4_if_instruction(); - test_sm4_breakc_instruction(); - test_sm4_continuec_instruction(); - test_sm4_discard_instruction(); - test_sm5_swapc_instruction(); - test_create_input_layout(); - test_input_assembler(); - test_null_sampler(); - test_check_feature_support(); - test_create_unordered_access_view(); - test_immediate_constant_buffer(); - test_fp_specials(); - test_uint_shader_instructions(); - test_index_buffer_offset(); - test_face_culling(); - test_line_antialiasing_blending(); - run_for_each_feature_level(test_required_format_support); - run_for_each_9_x_feature_level(test_fl9_draw); - test_ddy(); - test_shader_input_registers_limits(); - test_unbind_shader_resource_view(); - test_stencil_separate(); - test_uav_load(); - test_cs_uav_store(); - test_uav_store_immediate_constant(); - test_ps_cs_uav_binding(); - test_atomic_instructions(); - test_sm4_ret_instruction(); - test_primitive_restart(); - test_resinfo_instruction(); - test_sm5_bufinfo_instruction(); - test_sampleinfo_instruction(); - test_render_target_device_mismatch(); - test_buffer_srv(); - run_for_each_feature_level_in_range(D3D_FEATURE_LEVEL_10_0, D3D_FEATURE_LEVEL_11_0, + queue_test(test_create_device); + queue_for_each_feature_level(test_device_interfaces); + queue_test(test_get_immediate_context); + queue_test(test_create_texture1d); + queue_test(test_texture1d_interfaces); + queue_test(test_create_texture2d); + queue_test(test_texture2d_interfaces); + queue_test(test_create_texture3d); + queue_test(test_texture3d_interfaces); + queue_test(test_create_buffer); + queue_test(test_create_depthstencil_view); + queue_test(test_depthstencil_view_interfaces); + queue_test(test_create_rendertarget_view); + queue_test(test_create_shader_resource_view); + queue_for_each_feature_level(test_create_shader); + queue_test(test_create_sampler_state); + queue_test(test_create_blend_state); + queue_test(test_create_depthstencil_state); + queue_test(test_create_rasterizer_state); + queue_test(test_create_query); + queue_test(test_occlusion_query); + queue_test(test_pipeline_statistics_query); + queue_test(test_timestamp_query); + queue_test(test_device_removed_reason); + queue_test(test_private_data); + queue_for_each_feature_level(test_state_refcounting); + queue_test(test_device_context_state); + queue_test(test_blend); + queue_test(test_texture1d); + queue_test(test_texture); + queue_test(test_cube_maps); + queue_test(test_depth_stencil_sampling); + queue_test(test_sample_c_lz); + queue_test(test_multiple_render_targets); + queue_test(test_render_target_views); + queue_test(test_layered_rendering); + queue_test(test_scissor); + queue_test(test_clear_state); + queue_test(test_il_append_aligned); + queue_test(test_instance_id); + queue_test(test_fragment_coords); + queue_test(test_update_subresource); + queue_test(test_copy_subresource_region); + queue_test(test_resource_map); + queue_for_each_feature_level(test_resource_access); + queue_test(test_check_multisample_quality_levels); + queue_for_each_feature_level(test_swapchain_formats); + queue_test(test_swapchain_views); + queue_test(test_swapchain_flip); + queue_test(test_clear_render_target_view_1d); + queue_test(test_clear_render_target_view_2d); + queue_test(test_clear_render_target_view_3d); + queue_test(test_clear_depth_stencil_view); + queue_test(test_clear_buffer_unordered_access_view); + queue_test(test_initial_depth_stencil_state); + queue_test(test_draw_depth_only); + queue_test(test_draw_uav_only); + queue_test(test_cb_relative_addressing); + queue_test(test_vs_input_relative_addressing); + queue_test(test_getdc); + queue_test(test_shader_stage_input_output_matching); + queue_test(test_shader_interstage_interface); + queue_test(test_sm4_if_instruction); + queue_test(test_sm4_breakc_instruction); + queue_test(test_sm4_continuec_instruction); + queue_test(test_sm4_discard_instruction); + queue_test(test_sm5_swapc_instruction); + queue_test(test_create_input_layout); + queue_test(test_input_assembler); + queue_test(test_null_sampler); + queue_test(test_check_feature_support); + queue_test(test_create_unordered_access_view); + queue_test(test_immediate_constant_buffer); + queue_test(test_fp_specials); + queue_test(test_uint_shader_instructions); + queue_test(test_index_buffer_offset); + queue_test(test_face_culling); + queue_test(test_line_antialiasing_blending); + queue_for_each_feature_level(test_required_format_support); + queue_for_each_9_x_feature_level(test_fl9_draw); + queue_test(test_ddy); + queue_test(test_shader_input_registers_limits); + queue_test(test_unbind_shader_resource_view); + queue_test(test_stencil_separate); + queue_test(test_uav_load); + queue_test(test_cs_uav_store); + queue_test(test_uav_store_immediate_constant); + queue_test(test_ps_cs_uav_binding); + queue_test(test_atomic_instructions); + queue_test(test_sm4_ret_instruction); + queue_test(test_primitive_restart); + queue_test(test_resinfo_instruction); + queue_test(test_sm5_bufinfo_instruction); + queue_test(test_sampleinfo_instruction); + queue_test(test_render_target_device_mismatch); + queue_test(test_buffer_srv); + queue_for_each_feature_level_in_range(D3D_FEATURE_LEVEL_10_0, D3D_FEATURE_LEVEL_11_0, test_unaligned_raw_buffer_access); - test_uav_counters(); - test_dispatch_indirect(); - test_compute_shader_registers(); - test_tgsm(); - test_geometry_shader(); - test_quad_tessellation(); - test_stream_output(); - test_fl10_stream_output_desc(); - test_stream_output_resume(); - test_stream_output_components(); - test_stream_output_vs(); - test_gather(); - test_gather_c(); - test_depth_bias(); - test_fractional_viewports(); - run_for_each_feature_level_in_range(D3D_FEATURE_LEVEL_10_0, D3D_FEATURE_LEVEL_11_0, test_negative_viewports); - test_early_depth_stencil(); - test_conservative_depth_output(); - test_format_compatibility(); - test_clip_distance(); - test_combined_clip_and_cull_distances(); - test_generate_mips(); - test_alpha_to_coverage(); - test_unbound_multisample_texture(); - test_multiple_viewports(); - test_multisample_resolve(); - test_sample_shading(); - test_sample_mask(); - test_depth_clip(); + queue_test(test_uav_counters); + queue_test(test_dispatch_indirect); + queue_test(test_compute_shader_registers); + queue_test(test_tgsm); + queue_test(test_geometry_shader); + queue_test(test_quad_tessellation); + queue_test(test_stream_output); + queue_test(test_fl10_stream_output_desc); + queue_test(test_stream_output_resume); + queue_test(test_stream_output_components); + queue_test(test_stream_output_vs); + queue_test(test_gather); + queue_test(test_gather_c); + queue_test(test_depth_bias); + queue_test(test_fractional_viewports); + queue_for_each_feature_level_in_range(D3D_FEATURE_LEVEL_10_0, D3D_FEATURE_LEVEL_11_0, test_negative_viewports); + queue_test(test_early_depth_stencil); + queue_test(test_conservative_depth_output); + queue_test(test_format_compatibility); + queue_test(test_clip_distance); + queue_test(test_combined_clip_and_cull_distances); + queue_test(test_generate_mips); + queue_test(test_alpha_to_coverage); + queue_test(test_unbound_multisample_texture); + queue_test(test_multiple_viewports); + queue_test(test_multisample_resolve); + queue_test(test_sample_shading); + queue_test(test_sample_mask); + queue_test(test_depth_clip); + + run_queued_tests(); } -- 2.11.0

1 0

[PATCH 4/5] wined3d: Pass a wined3d_string_buffer to shader_glsl_get_register_name().
by Henri Verbeet 15 Aug '18

15 Aug '18

Instead of hoping that 150 characters is plenty. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/glsl_shader.c | 219 ++++++++++++++++++++++++++------------------- 1 file changed, 128 insertions(+), 91 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 7bc465bb951..1a1fe54bda6 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -2844,22 +2844,22 @@ static void shader_glsl_gen_modifier(enum wined3d_shader_src_modifier src_modifi } } -static void shader_glsl_fixup_scalar_register_variable(char *register_name, +static void shader_glsl_fixup_scalar_register_variable(struct wined3d_string_buffer *register_name, const char *glsl_variable, const struct wined3d_gl_info *gl_info) { /* The ARB_shading_language_420pack extension allows swizzle operations on * scalars. */ if (gl_info->supported[ARB_SHADING_LANGUAGE_420PACK]) - sprintf(register_name, "%s", glsl_variable); + string_buffer_sprintf(register_name, "%s", glsl_variable); else - sprintf(register_name, "ivec2(%s, 0)", glsl_variable); + string_buffer_sprintf(register_name, "ivec2(%s, 0)", glsl_variable); } /** Writes the GLSL variable name that corresponds to the register that the * DX opcode parameter is trying to access */ static void shader_glsl_get_register_name(const struct wined3d_shader_register *reg, - enum wined3d_data_type data_type, char *register_name, BOOL *is_swizzled, - const struct wined3d_shader_context *ctx) + enum wined3d_data_type data_type, struct wined3d_string_buffer *register_name, + BOOL *is_swizzled, const struct wined3d_shader_context *ctx) { /* oPos, oFog and oPts in D3D */ static const char * const hwrastout_reg_names[] = {"vs_out[10]", "vs_out[11].x", "vs_out[11].y"}; @@ -2884,7 +2884,7 @@ static void shader_glsl_get_register_name(const struct wined3d_shader_register * switch (reg->type) { case WINED3DSPR_TEMP: - sprintf(register_name, "R%u", reg->idx[0].offset); + string_buffer_sprintf(register_name, "R%u", reg->idx[0].offset); break; case WINED3DSPR_INPUT: @@ -2899,12 +2899,12 @@ static void shader_glsl_get_register_name(const struct wined3d_shader_register * *is_swizzled = TRUE; if (reg->idx[0].rel_addr) { - sprintf(register_name, "%s_in[%s + %u]", + string_buffer_sprintf(register_name, "%s_in[%s + %u]", prefix, rel_param0.param_str, reg->idx[0].offset); } else { - sprintf(register_name, "%s_in%u", prefix, reg->idx[0].offset); + string_buffer_sprintf(register_name, "%s_in%u", prefix, reg->idx[0].offset); } break; } @@ -2916,19 +2916,19 @@ static void shader_glsl_get_register_name(const struct wined3d_shader_register * if (reg->idx[0].rel_addr) { if (reg->idx[1].rel_addr) - sprintf(register_name, "shader_in[%s + %u].reg[%s + %u]", + string_buffer_sprintf(register_name, "shader_in[%s + %u].reg[%s + %u]", rel_param0.param_str, reg->idx[0].offset, rel_param1.param_str, reg->idx[1].offset); else - sprintf(register_name, "shader_in[%s + %u].reg[%u]", + string_buffer_sprintf(register_name, "shader_in[%s + %u].reg[%u]", rel_param0.param_str, reg->idx[0].offset, reg->idx[1].offset); } else if (reg->idx[1].rel_addr) - sprintf(register_name, "shader_in[%u].reg[%s + %u]", reg->idx[0].offset, + string_buffer_sprintf(register_name, "shader_in[%u].reg[%s + %u]", reg->idx[0].offset, rel_param1.param_str, reg->idx[1].offset); else - sprintf(register_name, "shader_in[%u].reg[%u]", + string_buffer_sprintf(register_name, "shader_in[%u].reg[%u]", reg->idx[0].offset, reg->idx[1].offset); break; } @@ -2948,14 +2948,14 @@ static void shader_glsl_get_register_name(const struct wined3d_shader_register * if (needs_legacy_glsl_syntax(gl_info) && shader->u.ps.declared_in_count > in_count) { - sprintf(register_name, + string_buffer_sprintf(register_name, "((%s + %u) > %u ? (%s + %u) > %u ? gl_SecondaryColor : gl_Color : %s_in[%s + %u])", rel_param0.param_str, idx, in_count - 1, rel_param0.param_str, idx, in_count, prefix, rel_param0.param_str, idx); } else { - sprintf(register_name, "%s_in[%s + %u]", prefix, rel_param0.param_str, idx); + string_buffer_sprintf(register_name, "%s_in[%s + %u]", prefix, rel_param0.param_str, idx); } } else @@ -2963,29 +2963,33 @@ static void shader_glsl_get_register_name(const struct wined3d_shader_register * if (needs_legacy_glsl_syntax(gl_info) && shader->u.ps.declared_in_count > in_count) { - sprintf(register_name, "((%s) > %u ? (%s) > %u ? gl_SecondaryColor : gl_Color : %s_in[%s])", + string_buffer_sprintf(register_name, + "((%s) > %u ? (%s) > %u ? gl_SecondaryColor : gl_Color : %s_in[%s])", rel_param0.param_str, in_count - 1, rel_param0.param_str, in_count, prefix, rel_param0.param_str); } else { - sprintf(register_name, "%s_in[%s]", prefix, rel_param0.param_str); + string_buffer_sprintf(register_name, "%s_in[%s]", prefix, rel_param0.param_str); } } } else { - if (idx == in_count) sprintf(register_name, "gl_Color"); - else if (idx == in_count + 1) sprintf(register_name, "gl_SecondaryColor"); - else sprintf(register_name, "%s_in[%u]", prefix, idx); + if (idx == in_count) + string_buffer_sprintf(register_name, "gl_Color"); + else if (idx == in_count + 1) + string_buffer_sprintf(register_name, "gl_SecondaryColor"); + else + string_buffer_sprintf(register_name, "%s_in[%u]", prefix, idx); } } else { if (!reg->idx[0].offset) - strcpy(register_name, "ffp_varying_diffuse"); + string_buffer_sprintf(register_name, "ffp_varying_diffuse"); else - strcpy(register_name, "ffp_varying_specular"); + string_buffer_sprintf(register_name, "ffp_varying_specular"); break; } break; @@ -2996,46 +3000,48 @@ static void shader_glsl_get_register_name(const struct wined3d_shader_register * if (reg->idx[0].rel_addr) { if (wined3d_settings.check_float_constants) - sprintf(register_name, "(%s + %u >= 0 && %s + %u < %u ? %s_c[%s + %u] : vec4(0.0))", + string_buffer_sprintf(register_name, + "(%s + %u >= 0 && %s + %u < %u ? %s_c[%s + %u] : vec4(0.0))", rel_param0.param_str, reg->idx[0].offset, rel_param0.param_str, reg->idx[0].offset, shader->limits->constant_float, prefix, rel_param0.param_str, reg->idx[0].offset); else if (reg->idx[0].offset) - sprintf(register_name, "%s_c[%s + %u]", prefix, rel_param0.param_str, reg->idx[0].offset); + string_buffer_sprintf(register_name, "%s_c[%s + %u]", + prefix, rel_param0.param_str, reg->idx[0].offset); else - sprintf(register_name, "%s_c[%s]", prefix, rel_param0.param_str); + string_buffer_sprintf(register_name, "%s_c[%s]", prefix, rel_param0.param_str); } else { if (shader_constant_is_local(shader, reg->idx[0].offset)) - sprintf(register_name, "%s_lc%u", prefix, reg->idx[0].offset); + string_buffer_sprintf(register_name, "%s_lc%u", prefix, reg->idx[0].offset); else - sprintf(register_name, "%s_c[%u]", prefix, reg->idx[0].offset); + string_buffer_sprintf(register_name, "%s_c[%u]", prefix, reg->idx[0].offset); } } break; case WINED3DSPR_CONSTINT: - sprintf(register_name, "%s_i[%u]", prefix, reg->idx[0].offset); + string_buffer_sprintf(register_name, "%s_i[%u]", prefix, reg->idx[0].offset); break; case WINED3DSPR_CONSTBOOL: - sprintf(register_name, "%s_b[%u]", prefix, reg->idx[0].offset); + string_buffer_sprintf(register_name, "%s_b[%u]", prefix, reg->idx[0].offset); break; case WINED3DSPR_TEXTURE: /* case WINED3DSPR_ADDR: */ if (version->type == WINED3D_SHADER_TYPE_PIXEL) - sprintf(register_name, "T%u", reg->idx[0].offset); + string_buffer_sprintf(register_name, "T%u", reg->idx[0].offset); else - sprintf(register_name, "A%u", reg->idx[0].offset); + string_buffer_sprintf(register_name, "A%u", reg->idx[0].offset); break; case WINED3DSPR_LOOP: - sprintf(register_name, "aL%u", ctx->state->current_loop_reg - 1); + string_buffer_sprintf(register_name, "aL%u", ctx->state->current_loop_reg - 1); break; case WINED3DSPR_SAMPLER: - sprintf(register_name, "%s_sampler%u", prefix, reg->idx[0].offset); + string_buffer_sprintf(register_name, "%s_sampler%u", prefix, reg->idx[0].offset); break; case WINED3DSPR_COLOROUT: @@ -3043,51 +3049,51 @@ static void shader_glsl_get_register_name(const struct wined3d_shader_register * WARN("Write to render target %u, only %d supported.\n", reg->idx[0].offset, gl_info->limits.buffers); - sprintf(register_name, "%s[%u]", get_fragment_output(gl_info), reg->idx[0].offset); + string_buffer_sprintf(register_name, "%s[%u]", get_fragment_output(gl_info), reg->idx[0].offset); break; case WINED3DSPR_RASTOUT: - sprintf(register_name, "%s", hwrastout_reg_names[reg->idx[0].offset]); + string_buffer_sprintf(register_name, "%s", hwrastout_reg_names[reg->idx[0].offset]); break; case WINED3DSPR_DEPTHOUT: case WINED3DSPR_DEPTHOUTGE: case WINED3DSPR_DEPTHOUTLE: - sprintf(register_name, "gl_FragDepth"); + string_buffer_sprintf(register_name, "gl_FragDepth"); break; case WINED3DSPR_ATTROUT: if (!reg->idx[0].offset) - sprintf(register_name, "%s_out[8]", prefix); + string_buffer_sprintf(register_name, "%s_out[8]", prefix); else - sprintf(register_name, "%s_out[9]", prefix); + string_buffer_sprintf(register_name, "%s_out[9]", prefix); break; case WINED3DSPR_TEXCRDOUT: /* Vertex shaders >= 3.0: WINED3DSPR_OUTPUT */ if (reg->idx[0].rel_addr) - sprintf(register_name, "%s_out[%s + %u]", + string_buffer_sprintf(register_name, "%s_out[%s + %u]", prefix, rel_param0.param_str, reg->idx[0].offset); else - sprintf(register_name, "%s_out[%u]", prefix, reg->idx[0].offset); + string_buffer_sprintf(register_name, "%s_out[%u]", prefix, reg->idx[0].offset); break; case WINED3DSPR_MISCTYPE: if (!reg->idx[0].offset) { /* vPos */ - sprintf(register_name, "vpos"); + string_buffer_sprintf(register_name, "vpos"); } else if (reg->idx[0].offset == 1) { /* Note that gl_FrontFacing is a bool, while vFace is * a float for which the sign determines front/back */ - sprintf(register_name, "(gl_FrontFacing ? 1.0 : -1.0)"); + string_buffer_sprintf(register_name, "(gl_FrontFacing ? 1.0 : -1.0)"); } else { FIXME("Unhandled misctype register %u.\n", reg->idx[0].offset); - sprintf(register_name, "unrecognized_register"); + string_buffer_sprintf(register_name, "unrecognized_register"); } break; @@ -3101,20 +3107,25 @@ static void shader_glsl_get_register_name(const struct wined3d_shader_register * case WINED3D_DATA_SNORM: case WINED3D_DATA_FLOAT: if (gl_info->supported[ARB_SHADER_BIT_ENCODING]) - sprintf(register_name, "uintBitsToFloat(%#xu)", reg->u.immconst_data[0]); + { + string_buffer_sprintf(register_name, "uintBitsToFloat(%#xu)", reg->u.immconst_data[0]); + } else - wined3d_ftoa(*(const float *)reg->u.immconst_data, register_name); + { + wined3d_ftoa(*(const float *)reg->u.immconst_data, imm_str[0]); + string_buffer_sprintf(register_name, "%s", imm_str[0]); + } break; case WINED3D_DATA_INT: - sprintf(register_name, "%#x", reg->u.immconst_data[0]); + string_buffer_sprintf(register_name, "%#x", reg->u.immconst_data[0]); break; case WINED3D_DATA_RESOURCE: case WINED3D_DATA_SAMPLER: case WINED3D_DATA_UINT: - sprintf(register_name, "%#xu", reg->u.immconst_data[0]); + string_buffer_sprintf(register_name, "%#xu", reg->u.immconst_data[0]); break; default: - sprintf(register_name, "<unhandled data type %#x>", data_type); + string_buffer_sprintf(register_name, "<unhandled data type %#x>", data_type); break; } break; @@ -3127,7 +3138,7 @@ static void shader_glsl_get_register_name(const struct wined3d_shader_register * case WINED3D_DATA_FLOAT: if (gl_info->supported[ARB_SHADER_BIT_ENCODING]) { - sprintf(register_name, "uintBitsToFloat(uvec4(%#xu, %#xu, %#xu, %#xu))", + string_buffer_sprintf(register_name, "uintBitsToFloat(uvec4(%#xu, %#xu, %#xu, %#xu))", reg->u.immconst_data[0], reg->u.immconst_data[1], reg->u.immconst_data[2], reg->u.immconst_data[3]); } @@ -3137,61 +3148,63 @@ static void shader_glsl_get_register_name(const struct wined3d_shader_register * wined3d_ftoa(*(const float *)&reg->u.immconst_data[1], imm_str[1]); wined3d_ftoa(*(const float *)&reg->u.immconst_data[2], imm_str[2]); wined3d_ftoa(*(const float *)&reg->u.immconst_data[3], imm_str[3]); - sprintf(register_name, "vec4(%s, %s, %s, %s)", + string_buffer_sprintf(register_name, "vec4(%s, %s, %s, %s)", imm_str[0], imm_str[1], imm_str[2], imm_str[3]); } break; case WINED3D_DATA_INT: - sprintf(register_name, "ivec4(%#x, %#x, %#x, %#x)", + string_buffer_sprintf(register_name, "ivec4(%#x, %#x, %#x, %#x)", reg->u.immconst_data[0], reg->u.immconst_data[1], reg->u.immconst_data[2], reg->u.immconst_data[3]); break; case WINED3D_DATA_RESOURCE: case WINED3D_DATA_SAMPLER: case WINED3D_DATA_UINT: - sprintf(register_name, "uvec4(%#xu, %#xu, %#xu, %#xu)", + string_buffer_sprintf(register_name, "uvec4(%#xu, %#xu, %#xu, %#xu)", reg->u.immconst_data[0], reg->u.immconst_data[1], reg->u.immconst_data[2], reg->u.immconst_data[3]); break; default: - sprintf(register_name, "<unhandled data type %#x>", data_type); + string_buffer_sprintf(register_name, "<unhandled data type %#x>", data_type); break; } break; default: FIXME("Unhandled immconst type %#x\n", reg->immconst_type); - sprintf(register_name, "<unhandled_immconst_type %#x>", reg->immconst_type); + string_buffer_sprintf(register_name, "<unhandled_immconst_type %#x>", reg->immconst_type); } break; case WINED3DSPR_CONSTBUFFER: if (reg->idx[1].rel_addr) - sprintf(register_name, "%s_cb%u[%s + %u]", + string_buffer_sprintf(register_name, "%s_cb%u[%s + %u]", prefix, reg->idx[0].offset, rel_param1.param_str, reg->idx[1].offset); else - sprintf(register_name, "%s_cb%u[%u]", prefix, reg->idx[0].offset, reg->idx[1].offset); + string_buffer_sprintf(register_name, "%s_cb%u[%u]", prefix, reg->idx[0].offset, reg->idx[1].offset); break; case WINED3DSPR_IMMCONSTBUFFER: if (reg->idx[0].rel_addr) - sprintf(register_name, "%s_icb[%s + %u]", prefix, rel_param0.param_str, reg->idx[0].offset); + string_buffer_sprintf(register_name, "%s_icb[%s + %u]", + prefix, rel_param0.param_str, reg->idx[0].offset); else - sprintf(register_name, "%s_icb[%u]", prefix, reg->idx[0].offset); + string_buffer_sprintf(register_name, "%s_icb[%u]", prefix, reg->idx[0].offset); break; case WINED3DSPR_PRIMID: if (version->type == WINED3D_SHADER_TYPE_GEOMETRY) - sprintf(register_name, "gl_PrimitiveIDIn"); + string_buffer_sprintf(register_name, "gl_PrimitiveIDIn"); else - sprintf(register_name, "gl_PrimitiveID"); + string_buffer_sprintf(register_name, "gl_PrimitiveID"); break; case WINED3DSPR_IDXTEMP: if (reg->idx[1].rel_addr) - sprintf(register_name, "X%u[%s + %u]", reg->idx[0].offset, rel_param1.param_str, reg->idx[1].offset); + string_buffer_sprintf(register_name, "X%u[%s + %u]", + reg->idx[0].offset, rel_param1.param_str, reg->idx[1].offset); else - sprintf(register_name, "X%u[%u]", reg->idx[0].offset, reg->idx[1].offset); + string_buffer_sprintf(register_name, "X%u[%u]", reg->idx[0].offset, reg->idx[1].offset); break; case WINED3DSPR_LOCALTHREADINDEX: @@ -3206,15 +3219,15 @@ static void shader_glsl_get_register_name(const struct wined3d_shader_register * break; case WINED3DSPR_THREADID: - sprintf(register_name, "ivec3(gl_GlobalInvocationID)"); + string_buffer_sprintf(register_name, "ivec3(gl_GlobalInvocationID)"); break; case WINED3DSPR_THREADGROUPID: - sprintf(register_name, "ivec3(gl_WorkGroupID)"); + string_buffer_sprintf(register_name, "ivec3(gl_WorkGroupID)"); break; case WINED3DSPR_LOCALTHREADID: - sprintf(register_name, "ivec3(gl_LocalInvocationID)"); + string_buffer_sprintf(register_name, "ivec3(gl_LocalInvocationID)"); break; case WINED3DSPR_FORKINSTID: @@ -3224,48 +3237,48 @@ static void shader_glsl_get_register_name(const struct wined3d_shader_register * break; case WINED3DSPR_TESSCOORD: - sprintf(register_name, "gl_TessCoord"); + string_buffer_sprintf(register_name, "gl_TessCoord"); break; case WINED3DSPR_OUTCONTROLPOINT: if (reg->idx[0].rel_addr) { if (reg->idx[1].rel_addr) - sprintf(register_name, "shader_out[%s + %u].reg[%s + %u]", + string_buffer_sprintf(register_name, "shader_out[%s + %u].reg[%s + %u]", rel_param0.param_str, reg->idx[0].offset, rel_param1.param_str, reg->idx[1].offset); else - sprintf(register_name, "shader_out[%s + %u].reg[%u]", + string_buffer_sprintf(register_name, "shader_out[%s + %u].reg[%u]", rel_param0.param_str, reg->idx[0].offset, reg->idx[1].offset); } else if (reg->idx[1].rel_addr) { - sprintf(register_name, "shader_out[%u].reg[%s + %u]", + string_buffer_sprintf(register_name, "shader_out[%u].reg[%s + %u]", reg->idx[0].offset, rel_param1.param_str, reg->idx[1].offset); } else { - sprintf(register_name, "shader_out[%u].reg[%u]", + string_buffer_sprintf(register_name, "shader_out[%u].reg[%u]", reg->idx[0].offset, reg->idx[1].offset); } break; case WINED3DSPR_PATCHCONST: if (version->type == WINED3D_SHADER_TYPE_HULL) - sprintf(register_name, "hs_out[%u]", reg->idx[0].offset); + string_buffer_sprintf(register_name, "hs_out[%u]", reg->idx[0].offset); else - sprintf(register_name, "vpc[%u]", reg->idx[0].offset); + string_buffer_sprintf(register_name, "vpc[%u]", reg->idx[0].offset); break; case WINED3DSPR_SAMPLEMASK: - sprintf(register_name, "sample_mask"); + string_buffer_sprintf(register_name, "sample_mask"); break; default: FIXME("Unhandled register type %#x.\n", reg->type); - sprintf(register_name, "unrecognized_register"); + string_buffer_sprintf(register_name, "unrecognised_register"); break; } } @@ -3394,12 +3407,11 @@ static void shader_glsl_add_src_param_ext(const struct wined3d_shader_context *c { struct shader_glsl_ctx_priv *priv = ctx->backend_data; struct wined3d_string_buffer *param_str = string_buffer_get(priv->string_buffers); + struct wined3d_string_buffer *reg_name = string_buffer_get(priv->string_buffers); enum wined3d_data_type param_data_type; BOOL is_color = FALSE; char swizzle_str[6]; - char reg_name[150]; - reg_name[0] = '\0'; glsl_src->param_str[0] = '\0'; swizzle_str[0] = '\0'; @@ -3427,9 +3439,10 @@ static void shader_glsl_add_src_param_ext(const struct wined3d_shader_context *c break; } - shader_glsl_sprintf_cast(param_str, reg_name, data_type, param_data_type); + shader_glsl_sprintf_cast(param_str, reg_name->buffer, data_type, param_data_type); shader_glsl_gen_modifier(wined3d_src->modifiers, param_str->buffer, swizzle_str, glsl_src->param_str); + string_buffer_release(priv->string_buffers, reg_name); string_buffer_release(priv->string_buffers, param_str); } @@ -3445,11 +3458,19 @@ static void shader_glsl_add_src_param(const struct wined3d_shader_instruction *i static DWORD shader_glsl_add_dst_param(const struct wined3d_shader_instruction *ins, const struct wined3d_shader_dst_param *wined3d_dst, struct glsl_dst_param *glsl_dst) { + struct shader_glsl_ctx_priv *priv = ins->ctx->backend_data; + struct wined3d_string_buffer *reg_name; + size_t len; + glsl_dst->mask_str[0] = '\0'; - glsl_dst->reg_name[0] = '\0'; - shader_glsl_get_register_name(&wined3d_dst->reg, wined3d_dst->reg.data_type, - glsl_dst->reg_name, NULL, ins->ctx); + reg_name = string_buffer_get(priv->string_buffers); + shader_glsl_get_register_name(&wined3d_dst->reg, wined3d_dst->reg.data_type, reg_name, NULL, ins->ctx); + len = min(reg_name->content_size, ARRAY_SIZE(glsl_dst->reg_name) - 1); + memcpy(glsl_dst->reg_name, reg_name->buffer, len); + glsl_dst->reg_name[len] = '\0'; + string_buffer_release(priv->string_buffers, reg_name); + return shader_glsl_get_write_mask(wined3d_dst, glsl_dst->mask_str); } @@ -3738,10 +3759,13 @@ static void shader_glsl_color_correction_ext(struct wined3d_string_buffer *buffe static void shader_glsl_color_correction(const struct wined3d_shader_instruction *ins, struct color_fixup_desc fixup) { - char reg_name[256]; + struct shader_glsl_ctx_priv *priv = ins->ctx->backend_data; + struct wined3d_string_buffer *reg_name; + reg_name = string_buffer_get(priv->string_buffers); shader_glsl_get_register_name(&ins->dst[0].reg, ins->dst[0].reg.data_type, reg_name, NULL, ins->ctx); - shader_glsl_color_correction_ext(ins->ctx->buffer, reg_name, ins->dst[0].write_mask, fixup); + shader_glsl_color_correction_ext(ins->ctx->buffer, reg_name->buffer, ins->dst[0].write_mask, fixup); + string_buffer_release(priv->string_buffers, reg_name); } static void PRINTF_ATTR(9, 10) shader_glsl_gen_sample_code(const struct wined3d_shader_instruction *ins, @@ -4995,16 +5019,15 @@ static void shader_glsl_sgn(const struct wined3d_shader_instruction *ins) static void shader_glsl_loop(const struct wined3d_shader_instruction *ins) { struct wined3d_shader_parser_state *state = ins->ctx->state; + struct shader_glsl_ctx_priv *priv = ins->ctx->backend_data; struct wined3d_string_buffer *buffer = ins->ctx->buffer; const struct wined3d_shader *shader = ins->ctx->shader; const struct wined3d_shader_lconst *constant; + struct wined3d_string_buffer *reg_name; const DWORD *control_values = NULL; - char reg_name[150]; if (ins->ctx->reg_maps->shader_version.major < 4) { - shader_glsl_get_register_name(&ins->src[1].reg, ins->src[1].reg.data_type, reg_name, NULL, ins->ctx); - /* Try to hardcode the loop control parameters if possible. Direct3D 9 * class hardware doesn't support real varying indexing, but Microsoft * designed this feature for Shader model 2.x+. If the loop control is @@ -5053,10 +5076,16 @@ static void shader_glsl_loop(const struct wined3d_shader_instruction *ins) } else { + reg_name = string_buffer_get(priv->string_buffers); + shader_glsl_get_register_name(&ins->src[1].reg, ins->src[1].reg.data_type, reg_name, NULL, ins->ctx); + shader_addline(buffer, "for (tmpInt%u = 0, aL%u = %s.y; tmpInt%u < %s.x; tmpInt%u++, aL%u += %s.z)\n{\n", - state->current_loop_depth, state->current_loop_reg, reg_name, - state->current_loop_depth, reg_name, - state->current_loop_depth, state->current_loop_reg, reg_name); + state->current_loop_depth, state->current_loop_reg, reg_name->buffer, + state->current_loop_depth, reg_name->buffer, + state->current_loop_depth, state->current_loop_reg, reg_name->buffer); + + string_buffer_release(priv->string_buffers, reg_name); + } ++state->current_loop_reg; @@ -6742,32 +6771,40 @@ static void shader_glsl_bem(const struct wined3d_shader_instruction *ins) * Sample 2D texture at dst using the alpha & red (wx) components of src as texture coordinates */ static void shader_glsl_texreg2ar(const struct wined3d_shader_instruction *ins) { + struct shader_glsl_ctx_priv *priv = ins->ctx->backend_data; DWORD sampler_idx = ins->dst[0].reg.idx[0].offset; struct glsl_sample_function sample_function; - char reg_name[150]; + struct wined3d_string_buffer *reg_name; + reg_name = string_buffer_get(priv->string_buffers); shader_glsl_get_register_name(&ins->src[0].reg, ins->src[0].reg.data_type, reg_name, NULL, ins->ctx); shader_glsl_get_sample_function(ins->ctx, sampler_idx, sampler_idx, 0, &sample_function); shader_glsl_gen_sample_code(ins, sampler_idx, &sample_function, WINED3DSP_NOSWIZZLE, NULL, NULL, NULL, NULL, - "%s.wx", reg_name); + "%s.wx", reg_name->buffer); shader_glsl_release_sample_function(ins->ctx, &sample_function); + + string_buffer_release(priv->string_buffers, reg_name); } /** Process the WINED3DSIO_TEXREG2GB instruction in GLSL * Sample 2D texture at dst using the green & blue (yz) components of src as texture coordinates */ static void shader_glsl_texreg2gb(const struct wined3d_shader_instruction *ins) { + struct shader_glsl_ctx_priv *priv = ins->ctx->backend_data; DWORD sampler_idx = ins->dst[0].reg.idx[0].offset; struct glsl_sample_function sample_function; - char reg_name[150]; + struct wined3d_string_buffer *reg_name; + reg_name = string_buffer_get(priv->string_buffers); shader_glsl_get_register_name(&ins->src[0].reg, ins->src[0].reg.data_type, reg_name, NULL, ins->ctx); shader_glsl_get_sample_function(ins->ctx, sampler_idx, sampler_idx, 0, &sample_function); shader_glsl_gen_sample_code(ins, sampler_idx, &sample_function, WINED3DSP_NOSWIZZLE, NULL, NULL, NULL, NULL, - "%s.yz", reg_name); + "%s.yz", reg_name->buffer); shader_glsl_release_sample_function(ins->ctx, &sample_function); + + string_buffer_release(priv->string_buffers, reg_name); } /** Process the WINED3DSIO_TEXREG2RGB instruction in GLSL -- 2.11.0

1 0

[PATCH 3/5] wined3d: Get rid of the "reg_name" field in struct glsl_src_param.
by Henri Verbeet 15 Aug '18

15 Aug '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/glsl_shader.c | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 8bb82c89c95..7bc465bb951 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -93,7 +93,6 @@ struct glsl_dst_param struct glsl_src_param { - char reg_name[150]; char param_str[200]; }; @@ -3394,16 +3393,17 @@ static void shader_glsl_add_src_param_ext(const struct wined3d_shader_context *c enum wined3d_data_type data_type) { struct shader_glsl_ctx_priv *priv = ctx->backend_data; - struct wined3d_string_buffer *reg_name = string_buffer_get(priv->string_buffers); + struct wined3d_string_buffer *param_str = string_buffer_get(priv->string_buffers); enum wined3d_data_type param_data_type; BOOL is_color = FALSE; char swizzle_str[6]; + char reg_name[150]; - glsl_src->reg_name[0] = '\0'; + reg_name[0] = '\0'; glsl_src->param_str[0] = '\0'; swizzle_str[0] = '\0'; - shader_glsl_get_register_name(&wined3d_src->reg, data_type, glsl_src->reg_name, &is_color, ctx); + shader_glsl_get_register_name(&wined3d_src->reg, data_type, reg_name, &is_color, ctx); shader_glsl_get_swizzle(wined3d_src, is_color, mask, swizzle_str); switch (wined3d_src->reg.type) @@ -3427,10 +3427,10 @@ static void shader_glsl_add_src_param_ext(const struct wined3d_shader_context *c break; } - shader_glsl_sprintf_cast(reg_name, glsl_src->reg_name, data_type, param_data_type); - shader_glsl_gen_modifier(wined3d_src->modifiers, reg_name->buffer, swizzle_str, glsl_src->param_str); + shader_glsl_sprintf_cast(param_str, reg_name, data_type, param_data_type); + shader_glsl_gen_modifier(wined3d_src->modifiers, param_str->buffer, swizzle_str, glsl_src->param_str); - string_buffer_release(priv->string_buffers, reg_name); + string_buffer_release(priv->string_buffers, param_str); } static void shader_glsl_add_src_param(const struct wined3d_shader_instruction *ins, @@ -4998,12 +4998,12 @@ static void shader_glsl_loop(const struct wined3d_shader_instruction *ins) struct wined3d_string_buffer *buffer = ins->ctx->buffer; const struct wined3d_shader *shader = ins->ctx->shader; const struct wined3d_shader_lconst *constant; - struct glsl_src_param src1_param; const DWORD *control_values = NULL; + char reg_name[150]; if (ins->ctx->reg_maps->shader_version.major < 4) { - shader_glsl_add_src_param(ins, &ins->src[1], WINED3DSP_WRITEMASK_ALL, &src1_param); + shader_glsl_get_register_name(&ins->src[1].reg, ins->src[1].reg.data_type, reg_name, NULL, ins->ctx); /* Try to hardcode the loop control parameters if possible. Direct3D 9 * class hardware doesn't support real varying indexing, but Microsoft @@ -5054,9 +5054,9 @@ static void shader_glsl_loop(const struct wined3d_shader_instruction *ins) else { shader_addline(buffer, "for (tmpInt%u = 0, aL%u = %s.y; tmpInt%u < %s.x; tmpInt%u++, aL%u += %s.z)\n{\n", - state->current_loop_depth, state->current_loop_reg, - src1_param.reg_name, state->current_loop_depth, src1_param.reg_name, - state->current_loop_depth, state->current_loop_reg, src1_param.reg_name); + state->current_loop_depth, state->current_loop_reg, reg_name, + state->current_loop_depth, reg_name, + state->current_loop_depth, state->current_loop_reg, reg_name); } ++state->current_loop_reg; @@ -6744,13 +6744,13 @@ static void shader_glsl_texreg2ar(const struct wined3d_shader_instruction *ins) { DWORD sampler_idx = ins->dst[0].reg.idx[0].offset; struct glsl_sample_function sample_function; - struct glsl_src_param src0_param; + char reg_name[150]; - shader_glsl_add_src_param(ins, &ins->src[0], WINED3DSP_WRITEMASK_ALL, &src0_param); + shader_glsl_get_register_name(&ins->src[0].reg, ins->src[0].reg.data_type, reg_name, NULL, ins->ctx); shader_glsl_get_sample_function(ins->ctx, sampler_idx, sampler_idx, 0, &sample_function); shader_glsl_gen_sample_code(ins, sampler_idx, &sample_function, WINED3DSP_NOSWIZZLE, NULL, NULL, NULL, NULL, - "%s.wx", src0_param.reg_name); + "%s.wx", reg_name); shader_glsl_release_sample_function(ins->ctx, &sample_function); } @@ -6760,13 +6760,13 @@ static void shader_glsl_texreg2gb(const struct wined3d_shader_instruction *ins) { DWORD sampler_idx = ins->dst[0].reg.idx[0].offset; struct glsl_sample_function sample_function; - struct glsl_src_param src0_param; + char reg_name[150]; - shader_glsl_add_src_param(ins, &ins->src[0], WINED3DSP_WRITEMASK_ALL, &src0_param); + shader_glsl_get_register_name(&ins->src[0].reg, ins->src[0].reg.data_type, reg_name, NULL, ins->ctx); shader_glsl_get_sample_function(ins->ctx, sampler_idx, sampler_idx, 0, &sample_function); shader_glsl_gen_sample_code(ins, sampler_idx, &sample_function, WINED3DSP_NOSWIZZLE, NULL, NULL, NULL, NULL, - "%s.yz", src0_param.reg_name); + "%s.yz", reg_name); shader_glsl_release_sample_function(ins->ctx, &sample_function); } -- 2.11.0

1 0

[PATCH 2/5] wined3d: Make the "is_color" parameter to shader_glsl_get_register_name() optional.
by Henri Verbeet 15 Aug '18

15 Aug '18

Not all callers care. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/glsl_shader.c | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 8aa3f2df250..8bb82c89c95 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -2859,7 +2859,7 @@ static void shader_glsl_fixup_scalar_register_variable(char *register_name, /** Writes the GLSL variable name that corresponds to the register that the * DX opcode parameter is trying to access */ static void shader_glsl_get_register_name(const struct wined3d_shader_register *reg, - enum wined3d_data_type data_type, char *register_name, BOOL *is_color, + enum wined3d_data_type data_type, char *register_name, BOOL *is_swizzled, const struct wined3d_shader_context *ctx) { /* oPos, oFog and oPts in D3D */ @@ -2879,7 +2879,8 @@ static void shader_glsl_get_register_name(const struct wined3d_shader_register * if (reg->idx[1].offset != ~0u && reg->idx[1].rel_addr) shader_glsl_add_src_param_ext(ctx, reg->idx[1].rel_addr, WINED3DSP_WRITEMASK_0, &rel_param1, reg->idx[1].rel_addr->reg.data_type); - *is_color = FALSE; + if (is_swizzled) + *is_swizzled = FALSE; switch (reg->type) { @@ -2895,8 +2896,8 @@ static void shader_glsl_get_register_name(const struct wined3d_shader_register * if (reg->idx[0].rel_addr) FIXME("VS3 input registers relative addressing.\n"); - if (priv->cur_vs_args->swizzle_map & (1u << reg->idx[0].offset)) - *is_color = TRUE; + if (is_swizzled && priv->cur_vs_args->swizzle_map & (1u << reg->idx[0].offset)) + *is_swizzled = TRUE; if (reg->idx[0].rel_addr) { sprintf(register_name, "%s_in[%s + %u]", @@ -3444,13 +3445,11 @@ static void shader_glsl_add_src_param(const struct wined3d_shader_instruction *i static DWORD shader_glsl_add_dst_param(const struct wined3d_shader_instruction *ins, const struct wined3d_shader_dst_param *wined3d_dst, struct glsl_dst_param *glsl_dst) { - BOOL is_color = FALSE; - glsl_dst->mask_str[0] = '\0'; glsl_dst->reg_name[0] = '\0'; shader_glsl_get_register_name(&wined3d_dst->reg, wined3d_dst->reg.data_type, - glsl_dst->reg_name, &is_color, ins->ctx); + glsl_dst->reg_name, NULL, ins->ctx); return shader_glsl_get_write_mask(wined3d_dst, glsl_dst->mask_str); } @@ -3740,9 +3739,8 @@ static void shader_glsl_color_correction_ext(struct wined3d_string_buffer *buffe static void shader_glsl_color_correction(const struct wined3d_shader_instruction *ins, struct color_fixup_desc fixup) { char reg_name[256]; - BOOL is_color; - shader_glsl_get_register_name(&ins->dst[0].reg, ins->dst[0].reg.data_type, reg_name, &is_color, ins->ctx); + shader_glsl_get_register_name(&ins->dst[0].reg, ins->dst[0].reg.data_type, reg_name, NULL, ins->ctx); shader_glsl_color_correction_ext(ins->ctx->buffer, reg_name, ins->dst[0].write_mask, fixup); } -- 2.11.0

1 0

[PATCH 1/5] wined3d: Pass a wined3d_shader_context structure to shader_glsl_get_register_name().
by Henri Verbeet 15 Aug '18

15 Aug '18

Instead of a wined3d_shader_instruction structure. It only uses the instruction to get at the context, so just pass the context directly. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/glsl_shader.c | 45 ++++++++++++++++++++++++--------------------- 1 file changed, 24 insertions(+), 21 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index d38ba2bcf06..8aa3f2df250 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -2771,8 +2771,9 @@ static void shader_generate_glsl_declarations(const struct wined3d_context *cont } /* Prototypes */ -static void shader_glsl_add_src_param(const struct wined3d_shader_instruction *ins, - const struct wined3d_shader_src_param *wined3d_src, DWORD mask, struct glsl_src_param *glsl_src); +static void shader_glsl_add_src_param_ext(const struct wined3d_shader_context *ctx, + const struct wined3d_shader_src_param *wined3d_src, DWORD mask, struct glsl_src_param *glsl_src, + enum wined3d_data_type data_type); /** Used for opcode modifiers - They multiply the result by the specified amount */ static const char * const shift_glsl_tab[] = { @@ -2859,23 +2860,25 @@ static void shader_glsl_fixup_scalar_register_variable(char *register_name, * DX opcode parameter is trying to access */ static void shader_glsl_get_register_name(const struct wined3d_shader_register *reg, enum wined3d_data_type data_type, char *register_name, BOOL *is_color, - const struct wined3d_shader_instruction *ins) + const struct wined3d_shader_context *ctx) { /* oPos, oFog and oPts in D3D */ static const char * const hwrastout_reg_names[] = {"vs_out[10]", "vs_out[11].x", "vs_out[11].y"}; - const struct wined3d_shader *shader = ins->ctx->shader; - const struct wined3d_shader_reg_maps *reg_maps = ins->ctx->reg_maps; + const struct wined3d_shader *shader = ctx->shader; + const struct wined3d_shader_reg_maps *reg_maps = ctx->reg_maps; const struct wined3d_shader_version *version = &reg_maps->shader_version; - const struct wined3d_gl_info *gl_info = ins->ctx->gl_info; + const struct wined3d_gl_info *gl_info = ctx->gl_info; const char *prefix = shader_glsl_get_prefix(version->type); struct glsl_src_param rel_param0, rel_param1; char imm_str[4][17]; - if (reg->idx[0].offset != ~0U && reg->idx[0].rel_addr) - shader_glsl_add_src_param(ins, reg->idx[0].rel_addr, WINED3DSP_WRITEMASK_0, &rel_param0); - if (reg->idx[1].offset != ~0U && reg->idx[1].rel_addr) - shader_glsl_add_src_param(ins, reg->idx[1].rel_addr, WINED3DSP_WRITEMASK_0, &rel_param1); + if (reg->idx[0].offset != ~0u && reg->idx[0].rel_addr) + shader_glsl_add_src_param_ext(ctx, reg->idx[0].rel_addr, WINED3DSP_WRITEMASK_0, + &rel_param0, reg->idx[0].rel_addr->reg.data_type); + if (reg->idx[1].offset != ~0u && reg->idx[1].rel_addr) + shader_glsl_add_src_param_ext(ctx, reg->idx[1].rel_addr, WINED3DSP_WRITEMASK_0, + &rel_param1, reg->idx[1].rel_addr->reg.data_type); *is_color = FALSE; switch (reg->type) @@ -2888,7 +2891,7 @@ static void shader_glsl_get_register_name(const struct wined3d_shader_register * case WINED3DSPR_INCONTROLPOINT: if (version->type == WINED3D_SHADER_TYPE_VERTEX) { - struct shader_glsl_ctx_priv *priv = ins->ctx->backend_data; + struct shader_glsl_ctx_priv *priv = ctx->backend_data; if (reg->idx[0].rel_addr) FIXME("VS3 input registers relative addressing.\n"); @@ -3028,7 +3031,7 @@ static void shader_glsl_get_register_name(const struct wined3d_shader_register * break; case WINED3DSPR_LOOP: - sprintf(register_name, "aL%u", ins->ctx->state->current_loop_reg - 1); + sprintf(register_name, "aL%u", ctx->state->current_loop_reg - 1); break; case WINED3DSPR_SAMPLER: @@ -3385,11 +3388,11 @@ static void shader_glsl_sprintf_cast(struct wined3d_string_buffer *dst_param, co /* From a given parameter token, generate the corresponding GLSL string. * Also, return the actual register name and swizzle in case the * caller needs this information as well. */ -static void shader_glsl_add_src_param_ext(const struct wined3d_shader_instruction *ins, +static void shader_glsl_add_src_param_ext(const struct wined3d_shader_context *ctx, const struct wined3d_shader_src_param *wined3d_src, DWORD mask, struct glsl_src_param *glsl_src, enum wined3d_data_type data_type) { - struct shader_glsl_ctx_priv *priv = ins->ctx->backend_data; + struct shader_glsl_ctx_priv *priv = ctx->backend_data; struct wined3d_string_buffer *reg_name = string_buffer_get(priv->string_buffers); enum wined3d_data_type param_data_type; BOOL is_color = FALSE; @@ -3399,7 +3402,7 @@ static void shader_glsl_add_src_param_ext(const struct wined3d_shader_instructio glsl_src->param_str[0] = '\0'; swizzle_str[0] = '\0'; - shader_glsl_get_register_name(&wined3d_src->reg, data_type, glsl_src->reg_name, &is_color, ins); + shader_glsl_get_register_name(&wined3d_src->reg, data_type, glsl_src->reg_name, &is_color, ctx); shader_glsl_get_swizzle(wined3d_src, is_color, mask, swizzle_str); switch (wined3d_src->reg.type) @@ -3432,7 +3435,7 @@ static void shader_glsl_add_src_param_ext(const struct wined3d_shader_instructio static void shader_glsl_add_src_param(const struct wined3d_shader_instruction *ins, const struct wined3d_shader_src_param *wined3d_src, DWORD mask, struct glsl_src_param *glsl_src) { - shader_glsl_add_src_param_ext(ins, wined3d_src, mask, glsl_src, wined3d_src->reg.data_type); + shader_glsl_add_src_param_ext(ins->ctx, wined3d_src, mask, glsl_src, wined3d_src->reg.data_type); } /* From a given parameter token, generate the corresponding GLSL string. @@ -3447,7 +3450,7 @@ static DWORD shader_glsl_add_dst_param(const struct wined3d_shader_instruction * glsl_dst->reg_name[0] = '\0'; shader_glsl_get_register_name(&wined3d_dst->reg, wined3d_dst->reg.data_type, - glsl_dst->reg_name, &is_color, ins); + glsl_dst->reg_name, &is_color, ins->ctx); return shader_glsl_get_write_mask(wined3d_dst, glsl_dst->mask_str); } @@ -3739,7 +3742,7 @@ static void shader_glsl_color_correction(const struct wined3d_shader_instruction char reg_name[256]; BOOL is_color; - shader_glsl_get_register_name(&ins->dst[0].reg, ins->dst[0].reg.data_type, reg_name, &is_color, ins); + shader_glsl_get_register_name(&ins->dst[0].reg, ins->dst[0].reg.data_type, reg_name, &is_color, ins->ctx); shader_glsl_color_correction_ext(ins->ctx->buffer, reg_name, ins->dst[0].write_mask, fixup); } @@ -5627,11 +5630,11 @@ static void shader_glsl_atomic(const struct wined3d_shader_instruction *ins) shader_addline(buffer, "%s(%s_%s%u, %s, ", op, shader_glsl_get_prefix(version->type), resource, resource_idx, address->buffer); - shader_glsl_add_src_param_ext(ins, &ins->src[1], WINED3DSP_WRITEMASK_0, &data, data_type); + shader_glsl_add_src_param_ext(ins->ctx, &ins->src[1], WINED3DSP_WRITEMASK_0, &data, data_type); shader_addline(buffer, "%s", data.param_str); if (ins->src_count >= 3) { - shader_glsl_add_src_param_ext(ins, &ins->src[2], WINED3DSP_WRITEMASK_0, &data2, data_type); + shader_glsl_add_src_param_ext(ins->ctx, &ins->src[2], WINED3DSP_WRITEMASK_0, &data2, data_type); shader_addline(buffer, ", %s", data2.param_str); } @@ -5803,7 +5806,7 @@ static void shader_glsl_store_uav(const struct wined3d_shader_instruction *ins) coord_mask = (1u << resource_type_info[resource_type].coord_size) - 1; shader_glsl_add_src_param(ins, &ins->src[0], coord_mask, &image_coord_param); - shader_glsl_add_src_param_ext(ins, &ins->src[1], WINED3DSP_WRITEMASK_ALL, &image_data_param, data_type); + shader_glsl_add_src_param_ext(ins->ctx, &ins->src[1], WINED3DSP_WRITEMASK_ALL, &image_data_param, data_type); shader_addline(ins->ctx->buffer, "imageStore(%s_image%u, %s, %s);\n", shader_glsl_get_prefix(version->type), uav_idx, image_coord_param.param_str, image_data_param.param_str); -- 2.11.0

1 0

[PATCH 6/6] d3d11/tests: Add test for CopySubresourceRegion() with 3D textures.
by Józef Kucia 15 Aug '18

15 Aug '18

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/d3d11/tests/d3d11.c | 216 +++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 209 insertions(+), 7 deletions(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 5e324b18ba66..22b4f25da277 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -11471,7 +11471,7 @@ static void test_update_subresource(void) { color = get_readback_color(&rb, 80 + j * 160, 60 + i * 120, 0); ok(compare_color(color, expected_colors[j + i * 4], 1), - "Got unexpected color 0x%08x at (%u, %u), expected 0x%08x.\n", + "Got color 0x%08x at (%u, %u), expected 0x%08x.\n", color, j, i, expected_colors[j + i * 4]); } } @@ -11487,7 +11487,7 @@ static void test_update_subresource(void) { color = get_readback_color(&rb, 80 + j * 160, 60 + i * 120, 0); ok(compare_color(color, bitmap_data[j + i * 4], 1), - "Got unexpected color 0x%08x at (%u, %u), expected 0x%08x.\n", + "Got color 0x%08x at (%u, %u), expected 0x%08x.\n", color, j, i, bitmap_data[j + i * 4]); } } @@ -11510,8 +11510,8 @@ static void test_copy_subresource_region(void) ID3D11SamplerState *sampler_state; ID3D11ShaderResourceView *ps_srv; D3D11_SAMPLER_DESC sampler_desc; - ID3D11DeviceContext *context; ID3D11DeviceContext1 *context1; + ID3D11DeviceContext *context; struct vec4 float_colors[16]; struct resource_readback rb; ID3D11PixelShader *ps; @@ -11678,7 +11678,7 @@ static void test_copy_subresource_region(void) { color = get_readback_color(&rb, 80 + j * 160, 60 + i * 120, 0); ok(compare_color(color, expected_colors[j + i * 4], 1), - "Got unexpected color 0x%08x at (%u, %u), expected 0x%08x.\n", + "Got color 0x%08x at (%u, %u), expected 0x%08x.\n", color, j, i, expected_colors[j + i * 4]); } } @@ -11694,7 +11694,7 @@ static void test_copy_subresource_region(void) { color = get_readback_color(&rb, 80 + j * 160, 60 + i * 120, 0); ok(compare_color(color, bitmap_data[j + i * 4], 1), - "Got unexpected color 0x%08x at (%u, %u), expected 0x%08x.\n", + "Got color 0x%08x at (%u, %u), expected 0x%08x.\n", color, j, i, bitmap_data[j + i * 4]); } } @@ -11726,7 +11726,7 @@ static void test_copy_subresource_region(void) { color = get_readback_color(&rb, 80 + j * 160, 60 + i * 120, 0); ok(compare_color(color, bitmap_data[j + i * 4], 1), - "Got unexpected color 0x%08x at (%u, %u), expected 0x%08x.\n", + "Got color 0x%08x at (%u, %u), expected 0x%08x.\n", color, j, i, bitmap_data[j + i * 4]); } } @@ -11801,7 +11801,7 @@ static void test_copy_subresource_region(void) { color = get_readback_color(&rb, 80 + j * 160, 60 + i * 120, 0); ok(compare_color(color, bitmap_data[j + i * 4], 1), - "Got unexpected color 0x%08x at (%u, %u), expected 0x%08x.\n", + "Got color 0x%08x at (%u, %u), expected 0x%08x.\n", color, j, i, bitmap_data[j + i * 4]); } } @@ -11813,6 +11813,207 @@ static void test_copy_subresource_region(void) release_test_context(&test_context); } +static void test_copy_subresource_region_3d(void) +{ + ID3D11ShaderResourceView *dst_srv, *src_srv; + ID3D11Texture3D *dst_texture, *src_texture; + D3D11_SUBRESOURCE_DATA resource_data[4]; + struct d3d11_test_context test_context; + D3D11_TEXTURE2D_DESC texture2d_desc; + D3D11_TEXTURE3D_DESC texture3d_desc; + ID3D11SamplerState *sampler_state; + D3D11_SAMPLER_DESC sampler_desc; + ID3D11DeviceContext *context; + struct resource_readback rb; + ID3D11Texture2D *texture2d; + ID3D11PixelShader *ps; + ID3D11Device *device; + unsigned int i, j; + DWORD data[4][16]; + D3D11_BOX box; + DWORD color; + HRESULT hr; + + static const DWORD ps_code[] = + { +#if 0 + Texture3D t; + SamplerState s; + + float4 main(float4 position : SV_POSITION) : SV_Target + { + return t.Sample(s, position / float3(640, 480, 1)); + } +#endif + 0x43425844, 0xfcc5a5be, 0x3061a059, 0xe848b9d9, 0x6ed0f8cc, 0x00000001, 0x00000140, 0x00000003, + 0x0000002c, 0x00000060, 0x00000094, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, + 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x0000070f, 0x505f5653, 0x5449534f, 0x004e4f49, + 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, + 0x00000000, 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x58454853, 0x000000a4, 0x00000050, + 0x00000029, 0x0100086a, 0x0300005a, 0x00106000, 0x00000000, 0x04002858, 0x00107000, 0x00000000, + 0x00005555, 0x04002064, 0x00101072, 0x00000000, 0x00000001, 0x03000065, 0x001020f2, 0x00000000, + 0x02000068, 0x00000001, 0x0a000038, 0x00100072, 0x00000000, 0x00101246, 0x00000000, 0x00004002, + 0x3acccccd, 0x3b088889, 0x3f800000, 0x00000000, 0x8b000045, 0x80000142, 0x00155543, 0x001020f2, + 0x00000000, 0x00100246, 0x00000000, 0x00107e46, 0x00000000, 0x00106000, 0x00000000, 0x0100003e, + }; + static const DWORD bitmap_data[] = + { + 0xff0000ff, 0xff00ffff, 0xff00ff00, 0xffffff00, + 0xffff0000, 0xffff00ff, 0xff000000, 0xff7f7f7f, + 0xffffffff, 0xffffffff, 0xffffffff, 0xff000000, + 0xffffffff, 0xff000000, 0xff000000, 0xff000000, + }; + + if (!init_test_context(&test_context, NULL)) + return; + device = test_context.device; + context = test_context.immediate_context; + + texture3d_desc.Width = 4; + texture3d_desc.Height = 4; + texture3d_desc.Depth = 4; + texture3d_desc.MipLevels = 1; + texture3d_desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; + texture3d_desc.Usage = D3D11_USAGE_DEFAULT; + texture3d_desc.BindFlags = D3D11_BIND_SHADER_RESOURCE; + texture3d_desc.CPUAccessFlags = 0; + texture3d_desc.MiscFlags = 0; + + hr = ID3D11Device_CreateTexture3D(device, &texture3d_desc, NULL, &src_texture); + ok(hr == S_OK, "Failed to create 3d texture, hr %#x.\n", hr); + hr = ID3D11Device_CreateTexture3D(device, &texture3d_desc, NULL, &dst_texture); + ok(hr == S_OK, "Failed to create 3d texture, hr %#x.\n", hr); + + texture2d_desc.Width = 4; + texture2d_desc.Height = 4; + texture2d_desc.MipLevels = 1; + texture2d_desc.ArraySize = 4; + texture2d_desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; + texture2d_desc.SampleDesc.Count = 1; + texture2d_desc.SampleDesc.Quality = 0; + texture2d_desc.Usage = D3D11_USAGE_IMMUTABLE; + texture2d_desc.BindFlags = D3D11_BIND_SHADER_RESOURCE; + texture2d_desc.CPUAccessFlags = 0; + texture2d_desc.MiscFlags = 0; + + for (i = 0; i < ARRAY_SIZE(*data); ++i) + { + data[0][i] = 0xff0000ff; + data[1][i] = bitmap_data[i]; + data[2][i] = 0xff00ff00; + data[3][i] = 0xffff00ff; + } + + for (i = 0; i < ARRAY_SIZE(resource_data); ++i) + { + resource_data[i].pSysMem = data[i]; + resource_data[i].SysMemPitch = texture2d_desc.Width * sizeof(data[0][0]); + resource_data[i].SysMemSlicePitch = 0; + } + + hr = ID3D11Device_CreateTexture2D(device, &texture2d_desc, resource_data, &texture2d); + ok(hr == S_OK, "Failed to create 2d texture, hr %#x.\n", hr); + + hr = ID3D11Device_CreateShaderResourceView(device, (ID3D11Resource *)src_texture, NULL, &src_srv); + ok(hr == S_OK, "Failed to create shader resource view, hr %#x.\n", hr); + hr = ID3D11Device_CreateShaderResourceView(device, (ID3D11Resource *)dst_texture, NULL, &dst_srv); + ok(hr == S_OK, "Failed to create shader resource view, hr %#x.\n", hr); + + sampler_desc.Filter = D3D11_FILTER_MIN_MAG_MIP_POINT; + sampler_desc.AddressU = D3D11_TEXTURE_ADDRESS_CLAMP; + sampler_desc.AddressV = D3D11_TEXTURE_ADDRESS_CLAMP; + sampler_desc.AddressW = D3D11_TEXTURE_ADDRESS_CLAMP; + sampler_desc.MipLODBias = 0.0f; + sampler_desc.MaxAnisotropy = 0; + sampler_desc.ComparisonFunc = D3D11_COMPARISON_NEVER; + sampler_desc.BorderColor[0] = 0.0f; + sampler_desc.BorderColor[1] = 0.0f; + sampler_desc.BorderColor[2] = 0.0f; + sampler_desc.BorderColor[3] = 0.0f; + sampler_desc.MinLOD = 0.0f; + sampler_desc.MaxLOD = 0.0f; + + hr = ID3D11Device_CreateSamplerState(device, &sampler_desc, &sampler_state); + ok(SUCCEEDED(hr), "Failed to create sampler state, hr %#x.\n", hr); + + hr = ID3D11Device_CreatePixelShader(device, ps_code, sizeof(ps_code), NULL, &ps); + ok(hr == S_OK, "Failed to create pixel shader, hr %#x.\n", hr); + + ID3D11DeviceContext_PSSetShaderResources(context, 0, 1, &src_srv); + ID3D11DeviceContext_PSSetSamplers(context, 0, 1, &sampler_state); + ID3D11DeviceContext_PSSetShader(context, ps, NULL, 0); + + set_box(&box, 0, 0, 0, 4, 4, 1); + for (i = 0; i < ARRAY_SIZE(resource_data); ++i) + { + ID3D11DeviceContext_CopySubresourceRegion(context, (ID3D11Resource *)src_texture, 0, + 0, 0, i, (ID3D11Resource *)texture2d, i, &box); + } + draw_quad(&test_context); + check_texture_color(test_context.backbuffer, 0xff0000ff, 1); + draw_quad_z(&test_context, 0.25f); + get_texture_readback(test_context.backbuffer, 0, &rb); + for (i = 0; i < 4; ++i) + { + for (j = 0; j < 4; ++j) + { + color = get_readback_color(&rb, 80 + j * 160, 60 + i * 120, 0); + ok(compare_color(color, bitmap_data[j + i * 4], 1), + "Got color 0x%08x at (%u, %u), expected 0x%08x.\n", + color, j, i, bitmap_data[j + i * 4]); + } + } + release_resource_readback(&rb); + draw_quad_z(&test_context, 0.5f); + check_texture_color(test_context.backbuffer, 0xff00ff00, 1); + draw_quad_z(&test_context, 1.0f); + check_texture_color(test_context.backbuffer, 0xffff00ff, 1); + + ID3D11DeviceContext_PSSetShaderResources(context, 0, 1, &dst_srv); + + set_box(&box, 0, 0, 0, 4, 4, 2); + ID3D11DeviceContext_CopySubresourceRegion(context, (ID3D11Resource *)dst_texture, 0, + 0, 0, 2, (ID3D11Resource *)src_texture, 0, &box); + set_box(&box, 0, 0, 2, 4, 4, 4); + ID3D11DeviceContext_CopySubresourceRegion(context, (ID3D11Resource *)dst_texture, 0, + 0, 0, 0, (ID3D11Resource *)src_texture, 0, &box); + + set_box(&box, 0, 0, 0, 4, 4, 1); + for (i = 0; i < ARRAY_SIZE(resource_data); ++i) + { + ID3D11DeviceContext_CopySubresourceRegion(context, (ID3D11Resource *)src_texture, 0, + 0, 0, i, (ID3D11Resource *)texture2d, i, &box); + } + draw_quad(&test_context); + check_texture_color(test_context.backbuffer, 0xff00ff00, 1); + draw_quad_z(&test_context, 0.25f); + check_texture_color(test_context.backbuffer, 0xffff00ff, 1); + draw_quad_z(&test_context, 0.5f); + check_texture_color(test_context.backbuffer, 0xff0000ff, 1); + draw_quad_z(&test_context, 1.0f); + get_texture_readback(test_context.backbuffer, 0, &rb); + for (i = 0; i < 4; ++i) + { + for (j = 0; j < 4; ++j) + { + color = get_readback_color(&rb, 80 + j * 160, 60 + i * 120, 0); + ok(compare_color(color, bitmap_data[j + i * 4], 1), + "Got color 0x%08x at (%u, %u), expected 0x%08x.\n", + color, j, i, bitmap_data[j + i * 4]); + } + } + release_resource_readback(&rb); + + ID3D11PixelShader_Release(ps); + ID3D11SamplerState_Release(sampler_state); + ID3D11ShaderResourceView_Release(dst_srv); + ID3D11ShaderResourceView_Release(src_srv); + ID3D11Texture2D_Release(texture2d); + ID3D11Texture3D_Release(dst_texture); + ID3D11Texture3D_Release(src_texture); + release_test_context(&test_context); +} + static void test_resource_map(void) { D3D11_MAPPED_SUBRESOURCE mapped_subresource; @@ -27777,6 +27978,7 @@ START_TEST(d3d11) test_fragment_coords(); test_update_subresource(); test_copy_subresource_region(); + test_copy_subresource_region_3d(); test_resource_map(); run_for_each_feature_level(test_resource_access); test_check_multisample_quality_levels(); -- 2.16.4

2 2

[PATCH 1/4] user32/tests: Add some ListBox tests for anchor index.
by Nikolay Sivov 15 Aug '18

15 Aug '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/user32/tests/listbox.c | 111 ++++++++++++++++++++++++++++++++++++ 1 file changed, 111 insertions(+) diff --git a/dlls/user32/tests/listbox.c b/dlls/user32/tests/listbox.c index c6edc76ea2..ee5211c341 100644 --- a/dlls/user32/tests/listbox.c +++ b/dlls/user32/tests/listbox.c @@ -475,19 +475,129 @@ static void test_LB_SETCURSEL(void) SendMessageA(hLB, LB_SETITEMHEIGHT, 0, 32); + ret = SendMessageA(hLB, LB_GETANCHORINDEX, 0, 0); + ok(ret == -1, "Unexpected anchor index %d.\n", ret); + ret = SendMessageA(hLB, LB_SETCURSEL, 2, 0); ok(ret == 2, "LB_SETCURSEL returned %d instead of 2\n", ret); ret = GetScrollPos(hLB, SB_VERT); ok(ret == 0, "expected vscroll 0, got %d\n", ret); + ret = SendMessageA(hLB, LB_GETANCHORINDEX, 0, 0); + ok(ret == -1, "Unexpected anchor index %d.\n", ret); + ret = SendMessageA(hLB, LB_SETCURSEL, 3, 0); ok(ret == 3, "LB_SETCURSEL returned %d instead of 3\n", ret); ret = GetScrollPos(hLB, SB_VERT); ok(ret == 1, "expected vscroll 1, got %d\n", ret); + ret = SendMessageA(hLB, LB_GETANCHORINDEX, 0, 0); + ok(ret == -1, "Unexpected anchor index %d.\n", ret); + + DestroyWindow(hLB); + + hLB = create_listbox(0, 0); + ok(hLB != NULL, "Failed to create ListBox window.\n"); + + ret = SendMessageA(hLB, LB_SETCURSEL, 1, 0); + ok(ret == 1, "Unexpected return value %d.\n", ret); + + ret = SendMessageA(hLB, LB_GETANCHORINDEX, 0, 0); + ok(ret == -1, "Unexpected anchor index %d.\n", ret); + + DestroyWindow(hLB); + + /* LBS_EXTENDEDSEL */ + hLB = create_listbox(LBS_EXTENDEDSEL, 0); + ok(hLB != NULL, "Failed to create ListBox window.\n"); + + ret = SendMessageA(hLB, LB_GETANCHORINDEX, 0, 0); + ok(ret == -1, "Unexpected anchor index %d.\n", ret); + + ret = SendMessageA(hLB, LB_SETCURSEL, 2, 0); + ok(ret == -1, "Unexpected return value %d.\n", ret); + + ret = SendMessageA(hLB, LB_GETANCHORINDEX, 0, 0); + ok(ret == -1, "Unexpected anchor index %d.\n", ret); + + DestroyWindow(hLB); + + /* LBS_MULTIPLESEL */ + hLB = create_listbox(LBS_MULTIPLESEL, 0); + ok(hLB != NULL, "Failed to create ListBox window.\n"); + + ret = SendMessageA(hLB, LB_GETANCHORINDEX, 0, 0); + ok(ret == -1, "Unexpected anchor index %d.\n", ret); + + ret = SendMessageA(hLB, LB_SETCURSEL, 2, 0); + ok(ret == -1, "Unexpected return value %d.\n", ret); + + ret = SendMessageA(hLB, LB_GETANCHORINDEX, 0, 0); + ok(ret == -1, "Unexpected anchor index %d.\n", ret); + DestroyWindow(hLB); } +static void test_LB_SETSEL(void) +{ + HWND list; + int ret; + + /* LBS_EXTENDEDSEL */ + list = create_listbox(LBS_EXTENDEDSEL, 0); + ok(list != NULL, "Failed to create ListBox window.\n"); + + ret = SendMessageA(list, LB_GETANCHORINDEX, 0, 0); + ok(ret == -1, "Unexpected anchor index %d.\n", ret); + + ret = SendMessageA(list, LB_SETSEL, TRUE, 0); + ok(ret == 0, "Unexpected return value %d.\n", ret); + ret = SendMessageA(list, LB_GETANCHORINDEX, 0, 0); +todo_wine + ok(ret == 0, "Unexpected anchor index %d.\n", ret); + + ret = SendMessageA(list, LB_SETSEL, TRUE, 1); + ok(ret == 0, "Unexpected return value %d.\n", ret); + ret = SendMessageA(list, LB_GETANCHORINDEX, 0, 0); +todo_wine + ok(ret == 1, "Unexpected anchor index %d.\n", ret); + + ret = SendMessageA(list, LB_SETSEL, FALSE, 1); + ok(ret == 0, "Unexpected return value %d.\n", ret); + ret = SendMessageA(list, LB_GETANCHORINDEX, 0, 0); +todo_wine + ok(ret == 1, "Unexpected anchor index %d.\n", ret); + + DestroyWindow(list); + + /* LBS_MULTIPLESEL */ + list = create_listbox(LBS_MULTIPLESEL, 0); + ok(list != NULL, "Failed to create ListBox window.\n"); + + ret = SendMessageA(list, LB_GETANCHORINDEX, 0, 0); + ok(ret == -1, "Unexpected anchor index %d.\n", ret); + + ret = SendMessageA(list, LB_SETSEL, TRUE, 0); + ok(ret == 0, "Unexpected return value %d.\n", ret); + ret = SendMessageA(list, LB_GETANCHORINDEX, 0, 0); +todo_wine + ok(ret == 0, "Unexpected anchor index %d.\n", ret); + + ret = SendMessageA(list, LB_SETSEL, TRUE, 1); + ok(ret == 0, "Unexpected return value %d.\n", ret); + ret = SendMessageA(list, LB_GETANCHORINDEX, 0, 0); +todo_wine + ok(ret == 1, "Unexpected anchor index %d.\n", ret); + + ret = SendMessageA(list, LB_SETSEL, FALSE, 1); + ok(ret == 0, "Unexpected return value %d.\n", ret); + ret = SendMessageA(list, LB_GETANCHORINDEX, 0, 0); +todo_wine + ok(ret == 1, "Unexpected anchor index %d.\n", ret); + + DestroyWindow(list); +} + static void test_listbox_height(void) { HWND hList; @@ -1960,4 +2070,5 @@ START_TEST(listbox) test_missing_lbuttonup(); test_extents(); test_WM_MEASUREITEM(); + test_LB_SETSEL(); } -- 2.18.0

2 8

[PATCH] dinput/tests: Use GetModuleHandleA() instead of LoadLibraryA() (Coverity).
by Józef Kucia 15 Aug '18

15 Aug '18

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/dinput/tests/keyboard.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dinput/tests/keyboard.c b/dlls/dinput/tests/keyboard.c index 59411cbfa577..554268099863 100644 --- a/dlls/dinput/tests/keyboard.c +++ b/dlls/dinput/tests/keyboard.c @@ -448,7 +448,7 @@ static void keyboard_tests(DWORD version) START_TEST(keyboard) { - pDirectInputCreateA = (void *)GetProcAddress(LoadLibraryA("dinput.dll"), "DirectInputCreateA"); + pDirectInputCreateA = (void *)GetProcAddress(GetModuleHandleA("dinput.dll"), "DirectInputCreateA"); CoInitialize(NULL); -- 2.16.4

1 0

[PATCH] winex11: Add simple fps counter for Vulkan.
by Józef Kucia 15 Aug '18

15 Aug '18

The fps counter is implemented in winex11 because winevulkan thunks can be bypassed. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/winex11.drv/vulkan.c | 29 ++++++++++++++++++++++++++++- 1 file changed, 28 insertions(+), 1 deletion(-) diff --git a/dlls/winex11.drv/vulkan.c b/dlls/winex11.drv/vulkan.c index 5de855715f36..063281d3d542 100644 --- a/dlls/winex11.drv/vulkan.c +++ b/dlls/winex11.drv/vulkan.c @@ -41,6 +41,7 @@ #include "wine/vulkan_driver.h" WINE_DEFAULT_DEBUG_CHANNEL(vulkan); +WINE_DECLARE_DEBUG_CHANNEL(fps); #ifdef SONAME_LIBVULKAN @@ -513,8 +514,34 @@ static VkResult X11DRV_vkGetSwapchainImagesKHR(VkDevice device, static VkResult X11DRV_vkQueuePresentKHR(VkQueue queue, const VkPresentInfoKHR *present_info) { + VkResult res; + TRACE("%p, %p\n", queue, present_info); - return pvkQueuePresentKHR(queue, present_info); + + res = pvkQueuePresentKHR(queue, present_info); + + if (TRACE_ON(fps)) + { + static unsigned long frames, frames_total; + static long prev_time, start_time; + DWORD time; + + time = GetTickCount(); + frames++; + frames_total++; + if (time - prev_time > 1500) + { + TRACE_(fps)("%p @ approx %.2ffps, total %.2ffps\n", + queue, 1000.0 * frames / (time - prev_time), + 1000.0 * frames_total / (time - start_time)); + prev_time = time; + frames = 0; + if (!start_time) + start_time = time; + } + } + + return res; } static const struct vulkan_funcs vulkan_funcs = -- 2.16.4

1 0

[PATCH] powrprof: Added PowerEnumerate stub
by Alistair Leslie-Hughes 15 Aug '18

15 Aug '18

Wine-bug: https://bugs.winehq.org/show_bug.cgi?id=45603 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/powrprof/powrprof.c | 8 ++++++++ dlls/powrprof/powrprof.spec | 1 + include/powrprof.h | 31 +++++++++++++++++++++++++++++++ 3 files changed, 40 insertions(+) diff --git a/dlls/powrprof/powrprof.c b/dlls/powrprof/powrprof.c index 685b66356f..1597d96f58 100644 --- a/dlls/powrprof/powrprof.c +++ b/dlls/powrprof/powrprof.c @@ -321,6 +321,14 @@ POWER_PLATFORM_ROLE WINAPI PowerDeterminePlatformRole(void) return PlatformRoleDesktop; } +DWORD WINAPI PowerEnumerate(HKEY key, const GUID *scheme, const GUID *subgroup, POWER_DATA_ACCESSOR flags, + ULONG index, UCHAR *buffer, DWORD *buffer_size) +{ + FIXME("(%p,%s,%s,%d,%d,%p,%p) stub!\n", key, debugstr_guid(scheme), debugstr_guid(subgroup), + flags, index, buffer, buffer_size); + return ERROR_CALL_NOT_IMPLEMENTED; +} + BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) { switch(fdwReason) { diff --git a/dlls/powrprof/powrprof.spec b/dlls/powrprof/powrprof.spec index c90fafc353..a9e337a0e4 100644 --- a/dlls/powrprof/powrprof.spec +++ b/dlls/powrprof/powrprof.spec @@ -11,6 +11,7 @@ @ stdcall IsPwrShutdownAllowed () @ stdcall IsPwrSuspendAllowed () @ stdcall PowerDeterminePlatformRole () +@ stdcall PowerEnumerate(long ptr ptr long long ptr ptr) @ stdcall PowerGetActiveScheme (ptr ptr) @ stdcall PowerSetActiveScheme (ptr ptr) @ stdcall PowerReadDCValue (ptr ptr ptr ptr ptr ptr ptr) diff --git a/include/powrprof.h b/include/powrprof.h index 239044ea10..318188e465 100644 --- a/include/powrprof.h +++ b/include/powrprof.h @@ -109,6 +109,36 @@ typedef struct _POWER_POLICY { } POWER_POLICY, *PPOWER_POLICY; +typedef enum _POWER_DATA_ACCESSOR { + ACCESS_AC_POWER_SETTING_INDEX, + ACCESS_DC_POWER_SETTING_INDEX, + ACCESS_FRIENDLY_NAME, + ACCESS_DESCRIPTION, + ACCESS_POSSIBLE_POWER_SETTING, + ACCESS_POSSIBLE_POWER_SETTING_FRIENDLY_NAME, + ACCESS_POSSIBLE_POWER_SETTING_DESCRIPTION, + ACCESS_DEFAULT_AC_POWER_SETTING, + ACCESS_DEFAULT_DC_POWER_SETTING, + ACCESS_POSSIBLE_VALUE_MIN, + ACCESS_POSSIBLE_VALUE_MAX, + ACCESS_POSSIBLE_VALUE_INCREMENT, + ACCESS_POSSIBLE_VALUE_UNITS, + ACCESS_ICON_RESOURCE, + ACCESS_DEFAULT_SECURITY_DESCRIPTOR, + ACCESS_ATTRIBUTES, + ACCESS_SCHEME, + ACCESS_SUBGROUP, + ACCESS_INDIVIDUAL_SETTING, + ACCESS_ACTIVE_SCHEME, + ACCESS_CREATE_SCHEME, + ACCESS_AC_POWER_SETTING_MAX, + ACCESS_DC_POWER_SETTING_MAX, + ACCESS_AC_POWER_SETTING_MIN, + ACCESS_DC_POWER_SETTING_MIN, + ACCESS_PROFILE, + ACCESS_OVERLAY_SCHEME, + ACCESS_ACTIVE_OVERLAY_SCHEME, +} POWER_DATA_ACCESSOR, *PPOWER_DATA_ACCESSOR; #ifdef __cplusplus extern "C" { @@ -128,6 +158,7 @@ BOOLEAN WINAPI IsAdminOverrideActive(PADMINISTRATOR_POWER_POLICY); BOOLEAN WINAPI IsPwrHibernateAllowed(VOID); BOOLEAN WINAPI IsPwrShutdownAllowed(VOID); BOOLEAN WINAPI IsPwrSuspendAllowed(VOID); +DWORD WINAPI PowerEnumerate(HKEY, const GUID *, const GUID *, POWER_DATA_ACCESSOR, ULONG, UCHAR *, DWORD *); BOOLEAN WINAPI ReadGlobalPwrPolicy(PGLOBAL_POWER_POLICY); BOOLEAN WINAPI ReadProcessorPwrScheme(UINT, PMACHINE_PROCESSOR_POWER_POLICY); BOOLEAN WINAPI ReadPwrScheme(UINT, PPOWER_POLICY); -- 2.18.0

1 0

[PATCH 0/4] Shell32 icons
by Alex Henrie 15 Aug '18

15 Aug '18

If I understand correctly, the proper way to fix bug 30185 is to provide the first 138 shell32 icons. That's a big job, but I think I can get it done if I work on it a little at a time. Alex Henrie (4): shell32: Rename IDI_SHELL_DOCUMENT to IDI_SHELL_FILE shell32: Add document icon shell32: Add window icon shell32: Add 512k and 314k floppy drive icons dlls/shell32/Makefile.in | 3 +- dlls/shell32/iconcache.c | 12 +- dlls/shell32/shell32.rc | 15 + dlls/shell32/shresdef.h | 4 +- dlls/shell32/window.ico | Bin 0 -> 30799 bytes dlls/shell32/window.svg | 598 +++++++++++++++++++++++++++++++++++++++ 6 files changed, 624 insertions(+), 8 deletions(-) create mode 100644 dlls/shell32/window.ico create mode 100644 dlls/shell32/window.svg -- 2.18.0

1 4

[PATCH] winex11.drv: improve ChangeDisplaySettingsEx failed mode message
by Rob Walker 14 Aug '18

14 Aug '18

The failed mode error message dumps all the mode fields, that were being tested. Change this output so that only the mode fields explicitly being matched against are displayed. Make the failed message use formatting consist with the trace message, earlier in this function. Signed-off-by: Rob Walker <bob.mt.wya(a)gmail.com> --- dlls/winex11.drv/settings.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/dlls/winex11.drv/settings.c b/dlls/winex11.drv/settings.c index afa26cf543..953413390e 100644 --- a/dlls/winex11.drv/settings.c +++ b/dlls/winex11.drv/settings.c @@ -345,6 +345,7 @@ LONG CDECL X11DRV_ChangeDisplaySettingsEx( LPCWSTR devname, LPDEVMODEW devmode, DWORD i, dwBpp = 0; DEVMODEW dm; BOOL def_mode = TRUE; + char bbp_buffer[16] = "", freq_buffer[16] = ""; TRACE("(%s,%p,%p,0x%08x,%p)\n",debugstr_w(devname),devmode,hwnd,flags,lpvoid); TRACE("flags=%s\n",_CDS_flags(flags)); @@ -422,9 +423,13 @@ LONG CDECL X11DRV_ChangeDisplaySettingsEx( LPCWSTR devname, LPDEVMODEW devmode, return DISP_CHANGE_SUCCESSFUL; } - /* no valid modes found */ - ERR("No matching mode found %ux%ux%u @%u! (%s)\n", - devmode->dmPelsWidth, devmode->dmPelsHeight, - devmode->dmBitsPerPel, devmode->dmDisplayFrequency, handler_name); + /* no valid modes found, only print the fields we were trying to matching against */ + if (devmode->dmFields & DM_BITSPERPEL) + snprintf(bbp_buffer, ARRAY_SIZE(bbp_buffer), "bbp=%d ", devmode->dmBitsPerPel); + if ((devmode->dmFields & DM_DISPLAYFREQUENCY) && (devmode->dmDisplayFrequency != 0)) + snprintf(freq_buffer, ARRAY_SIZE(freq_buffer), "freq=%d ", devmode->dmDisplayFrequency); + ERR("No matching mode found: width=%d height=%d %s%s(%s)\n", + devmode->dmPelsWidth, devmode->dmPelsHeight, bbp_buffer, freq_buffer, handler_name); + return DISP_CHANGE_BADMODE; } -- 2.18.0

1 0

[PATCH] shdocvw: Use the ARRAY_SIZE() macro
by Michael Stefaniuc 14 Aug '18

14 Aug '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/shdocvw/shdocvw_main.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/shdocvw/shdocvw_main.c b/dlls/shdocvw/shdocvw_main.c index 52c622c609..2657dfa5a5 100644 --- a/dlls/shdocvw/shdocvw_main.c +++ b/dlls/shdocvw/shdocvw_main.c @@ -386,7 +386,7 @@ DWORD WINAPI ParseURLFromOutsideSourceW(LPCWSTR url, LPWSTR out, LPDWORD plen, L plen ? *plen : 0, unknown ? *unknown : 0); if (!PathIsURLW(ptr)) { - len = sizeof(buffer_in) / sizeof(buffer_in[0]); + len = ARRAY_SIZE(buffer_in); buffer_in[0] = 0; hr = UrlApplySchemeW(ptr, buffer_in, &len, URL_APPLY_GUESSSCHEME | URL_APPLY_DEFAULT); TRACE("got 0x%x with %s\n", hr, debugstr_w(buffer_in)); @@ -400,7 +400,7 @@ DWORD WINAPI ParseURLFromOutsideSourceW(LPCWSTR url, LPWSTR out, LPDWORD plen, L } } - len = sizeof(buffer_out) / sizeof(buffer_out[0]); + len = ARRAY_SIZE(buffer_out); buffer_out[0] = '\0'; hr = UrlCanonicalizeW(ptr, buffer_out, &len, URL_ESCAPE_SPACES_ONLY); needed = lstrlenW(buffer_out)+1; @@ -442,7 +442,7 @@ DWORD WINAPI ParseURLFromOutsideSourceA(LPCSTR url, LPSTR out, LPDWORD plen, LPD MultiByteToWideChar(CP_ACP, 0, url, -1, urlW, len); } - len = sizeof(buffer) / sizeof(buffer[0]); + len = ARRAY_SIZE(buffer); ParseURLFromOutsideSourceW(urlW, buffer, &len, unknown); HeapFree(GetProcessHeap(), 0, urlW); -- 2.14.4

2 1

[PATCH] urlmon: Use the ARRAY_SIZE() macro
by Michael Stefaniuc 14 Aug '18

14 Aug '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/urlmon/urlmon_main.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/urlmon/urlmon_main.c b/dlls/urlmon/urlmon_main.c index 5968a6ce55..06f0698efa 100644 --- a/dlls/urlmon/urlmon_main.c +++ b/dlls/urlmon/urlmon_main.c @@ -409,7 +409,7 @@ static void init_session(void) { unsigned int i; - for(i=0; i < sizeof(object_creation)/sizeof(object_creation[0]); i++) { + for(i = 0; i < ARRAY_SIZE(object_creation); i++) { if(object_creation[i].protocol) register_namespace(object_creation[i].cf, object_creation[i].clsid, object_creation[i].protocol, TRUE); @@ -438,10 +438,10 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) { unsigned int i; HRESULT hr; - + TRACE("(%s,%s,%p)\n", debugstr_guid(rclsid), debugstr_guid(riid), ppv); - - for (i=0; i < sizeof(object_creation)/sizeof(object_creation[0]); i++) + + for (i = 0; i < ARRAY_SIZE(object_creation); i++) { if (IsEqualGUID(object_creation[i].clsid, rclsid)) return IClassFactory_QueryInterface(object_creation[i].cf, riid, ppv); -- 2.14.4

2 1

RE: [PATCH] imm32: Use the ARRAY_SIZE() macro
by Aric Stewart 14 Aug '18

14 Aug '18

Signed-off-by: Aric Stewart <aric(a)codeweavers.com>

1 0

[PATCH 2/2] oleaut32: Extend value range before getting absolute value in VarBstrFromI4.
by Daniel Lehman 14 Aug '18

14 Aug '18

1 0

[PATCH 1/2] oleaut32/tests: Add test for VarBstrFromI4.
by Daniel Lehman 14 Aug '18

14 Aug '18

1 0

[PATCH v3] quartz: Rewrite add_data with CoTaskMemRealloc and error handling
by Alex Henrie 14 Aug '18

14 Aug '18

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/quartz/filtermapper.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/quartz/filtermapper.c b/dlls/quartz/filtermapper.c index 0d26198637..0a41c7144a 100644 --- a/dlls/quartz/filtermapper.c +++ b/dlls/quartz/filtermapper.c @@ -145,11 +145,11 @@ static int add_data(struct Vector * v, const BYTE * pData, int size) int index = v->current; if (v->current + size > v->capacity) { - LPBYTE pOldData = v->pData; - v->capacity = (v->capacity + size) * 2; - v->pData = CoTaskMemAlloc(v->capacity); - memcpy(v->pData, pOldData, v->current); - CoTaskMemFree(pOldData); + int new_capacity = (v->capacity + size) * 2; + BYTE *new_data = CoTaskMemRealloc(v->pData, new_capacity); + if (!new_data) return -1; + v->capacity = new_capacity; + v->pData = new_data; } memcpy(v->pData + v->current, pData, size); v->current += size; -- 2.18.0

1 0

[PATCH v2] quartz: Don't call memcpy with src=0 in FM2_WriteFilterData (Coverity)
by Alex Henrie 14 Aug '18

14 Aug '18

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- Passing NULL to memcpy causes a segfault in newer versions of GCC, see https://www.imperialviolet.org/2016/06/26/nonnull.html v2: Fixed email address --- dlls/quartz/filtermapper.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/quartz/filtermapper.c b/dlls/quartz/filtermapper.c index 0d26198637..7a5b5aee72 100644 --- a/dlls/quartz/filtermapper.c +++ b/dlls/quartz/filtermapper.c @@ -148,8 +148,11 @@ static int add_data(struct Vector * v, const BYTE * pData, int size) LPBYTE pOldData = v->pData; v->capacity = (v->capacity + size) * 2; v->pData = CoTaskMemAlloc(v->capacity); - memcpy(v->pData, pOldData, v->current); - CoTaskMemFree(pOldData); + if (pOldData) + { + memcpy(v->pData, pOldData, v->current); + CoTaskMemFree(pOldData); + } } memcpy(v->pData + v->current, pData, size); v->current += size; -- 2.18.0

2 2

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-devel