May 2021 - Wine-commits - list.winehq.org

Hugh McMaster : reg/tests: Add data tests for the 'copy' command.
by Alexandre Julliard 13 May '21

13 May '21

Module: wine Branch: master Commit: bb609c6acbf53b822825e3077fe0996a85d5026d URL: https://source.winehq.org/git/wine.git/?a=commit;h=bb609c6acbf53b822825e307… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Thu May 13 22:36:56 2021 +1000 reg/tests: Add data tests for the 'copy' command. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/copy.c | 136 ++++++++++++++++++++++++++++++++++++++++++ programs/reg/tests/export.c | 30 +++++----- programs/reg/tests/reg_test.h | 7 +++ 3 files changed, 158 insertions(+), 15 deletions(-) diff --git a/programs/reg/tests/copy.c b/programs/reg/tests/copy.c index 0d245dae4da..7126b00d50e 100644 --- a/programs/reg/tests/copy.c +++ b/programs/reg/tests/copy.c @@ -122,6 +122,140 @@ static void test_command_syntax(void) ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); } +static void test_copy_empty_key(void) +{ + DWORD r; + + delete_tree(HKEY_CURRENT_USER, COPY_SRC); + verify_key_nonexist(HKEY_CURRENT_USER, COPY_SRC); + + delete_tree(HKEY_CURRENT_USER, KEY_BASE); + verify_key_nonexist(HKEY_CURRENT_USER, KEY_BASE); + + add_key(HKEY_CURRENT_USER, COPY_SRC, NULL); + + + run_reg_exe("reg copy HKCU\\" COPY_SRC " HKCU\\" KEY_BASE " /f", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_key(HKEY_CURRENT_USER, KEY_BASE); + + run_reg_exe("reg export HKCU\\" KEY_BASE " file.reg", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine ok(compare_export("file.reg", empty_key_test, 0), "compare_export() failed\n"); + + todo_wine delete_key(HKEY_CURRENT_USER, KEY_BASE); + + + run_reg_exe("reg copy HKCU\\" COPY_SRC "\\ HKCU\\" KEY_BASE " /f", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_key(HKEY_CURRENT_USER, KEY_BASE); + + run_reg_exe("reg export HKCU\\" KEY_BASE " file.reg", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine ok(compare_export("file.reg", empty_key_test, 0), "compare_export() failed\n"); + + todo_wine delete_key(HKEY_CURRENT_USER, KEY_BASE); + + + run_reg_exe("reg copy HKCU\\" COPY_SRC " HKCU\\" KEY_BASE "\\ /f", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_key(HKEY_CURRENT_USER, KEY_BASE); + + run_reg_exe("reg export HKCU\\" KEY_BASE " file.reg", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine ok(compare_export("file.reg", empty_key_test, 0), "compare_export() failed\n"); + + todo_wine delete_key(HKEY_CURRENT_USER, KEY_BASE); + + + run_reg_exe("reg copy HKCU\\" COPY_SRC "\\ HKCU\\" KEY_BASE "\\ /f", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_key(HKEY_CURRENT_USER, KEY_BASE); + + run_reg_exe("reg export HKCU\\" KEY_BASE " file.reg", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine ok(compare_export("file.reg", empty_key_test, 0), "compare_export() failed\n"); + + + run_reg_exe("reg copy HKCU\\" COPY_SRC " HKCU\\" KEY_BASE " /s /f", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_key(HKEY_CURRENT_USER, KEY_BASE); + + run_reg_exe("reg export HKCU\\" KEY_BASE " file.reg", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine ok(compare_export("file.reg", empty_key_test, 0), "compare_export() failed\n"); +} + +static void test_copy_simple_data(void) +{ + HKEY hkey; + DWORD r, dword; + + delete_tree(HKEY_CURRENT_USER, COPY_SRC); + verify_key_nonexist(HKEY_CURRENT_USER, COPY_SRC); + + delete_tree(HKEY_CURRENT_USER, KEY_BASE); + verify_key_nonexist(HKEY_CURRENT_USER, KEY_BASE); + + add_key(HKEY_CURRENT_USER, COPY_SRC, &hkey); + + dword = 0x100; + add_value(hkey, "DWORD", REG_DWORD, &dword, sizeof(dword)); + add_value(hkey, "String", REG_SZ, "Your text here...", 18); + close_key(hkey); + + + run_reg_exe("reg copy HKCU\\" COPY_SRC " HKCU\\" KEY_BASE " /f", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_key(HKEY_CURRENT_USER, KEY_BASE); + + run_reg_exe("reg export HKCU\\" KEY_BASE " file.reg /y", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine ok(compare_export("file.reg", simple_data_test, 0), "compare_export() failed\n"); + + todo_wine delete_key(HKEY_CURRENT_USER, KEY_BASE); + + + run_reg_exe("reg copy HKCU\\" COPY_SRC "\\ HKCU\\" KEY_BASE " /f", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_key(HKEY_CURRENT_USER, KEY_BASE); + + run_reg_exe("reg export HKCU\\" KEY_BASE " file.reg /y", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine ok(compare_export("file.reg", simple_data_test, 0), "compare_export() failed\n"); + + todo_wine delete_key(HKEY_CURRENT_USER, KEY_BASE); + + + run_reg_exe("reg copy HKCU\\" COPY_SRC " HKCU\\" KEY_BASE "\\ /f", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_key(HKEY_CURRENT_USER, KEY_BASE); + + run_reg_exe("reg export HKCU\\" KEY_BASE " file.reg /y", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine ok(compare_export("file.reg", simple_data_test, 0), "compare_export() failed\n"); + + todo_wine delete_key(HKEY_CURRENT_USER, KEY_BASE); + + + run_reg_exe("reg copy HKCU\\" COPY_SRC "\\ HKCU\\" KEY_BASE "\\ /f", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_key(HKEY_CURRENT_USER, KEY_BASE); + + run_reg_exe("reg export HKCU\\" KEY_BASE " file.reg /y", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine ok(compare_export("file.reg", simple_data_test, 0), "compare_export() failed\n"); + + + run_reg_exe("reg copy HKCU\\" COPY_SRC " HKCU\\" KEY_BASE " /s /f", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_key(HKEY_CURRENT_USER, KEY_BASE); + + run_reg_exe("reg export HKCU\\" KEY_BASE " file.reg /y", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine ok(compare_export("file.reg", simple_data_test, 0), "compare_export() failed\n"); +} + START_TEST(copy) { DWORD r; @@ -132,4 +266,6 @@ START_TEST(copy) } test_command_syntax(); + test_copy_empty_key(); + test_copy_simple_data(); } diff --git a/programs/reg/tests/export.c b/programs/reg/tests/export.c index daf42f66e3e..27d70b6a663 100644 --- a/programs/reg/tests/export.c +++ b/programs/reg/tests/export.c @@ -18,9 +18,8 @@ #include "reg_test.h" -#define compare_export(f,e,todo) compare_export_(__FILE__,__LINE__,f,e,todo) -static BOOL compare_export_(const char *file, unsigned line, const char *filename, - const char *expected, DWORD todo) +BOOL compare_export_(const char *file, unsigned line, const char *filename, + const char *expected, DWORD todo) { FILE *fp; long file_size; @@ -64,6 +63,17 @@ error: return FALSE; } +const char *empty_key_test = + "\xef\xbb\xbfWindows Registry Editor Version 5.00\r\n\r\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\r\n\r\n"; + +const char *simple_data_test = + "\xef\xbb\xbfWindows Registry Editor Version 5.00\r\n\r\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\r\n" + "\"DWORD\"=dword:00000100\r\n" + "\"String\"=\"Your text here...\"\r\n\r\n"; + + /* Unit tests */ static void test_export(void) @@ -73,16 +83,6 @@ static void test_export(void) HKEY hkey, subkey; BYTE hex[4], buffer[8]; - const char *empty_key_test = - "\xef\xbb\xbfWindows Registry Editor Version 5.00\r\n\r\n" - "[HKEY_CURRENT_USER\\" KEY_BASE "]\r\n\r\n"; - - const char *simple_test = - "\xef\xbb\xbfWindows Registry Editor Version 5.00\r\n\r\n" - "[HKEY_CURRENT_USER\\" KEY_BASE "]\r\n" - "\"DWORD\"=dword:00000100\r\n" - "\"String\"=\"Your text here...\"\r\n\r\n"; - const char *complex_test = "\xef\xbb\xbfWindows Registry Editor Version 5.00\r\n\r\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\r\n" @@ -243,12 +243,12 @@ static void test_export(void) run_reg_exe("reg export HKEY_CURRENT_USER\\" KEY_BASE " file.reg /y", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - ok(compare_export("file.reg", simple_test, 0), "compare_export() failed\n"); + ok(compare_export("file.reg", simple_data_test, 0), "compare_export() failed\n"); /* Test whether a .reg file extension is required when exporting */ run_reg_exe("reg export HKEY_CURRENT_USER\\" KEY_BASE " foo /y", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - ok(compare_export("foo", simple_test, 0), "compare_export() failed\n"); + ok(compare_export("foo", simple_data_test, 0), "compare_export() failed\n"); /* Test registry export with a complex data structure */ add_key(hkey, "Subkey1", &subkey); diff --git a/programs/reg/tests/reg_test.h b/programs/reg/tests/reg_test.h index 6718e91096f..3f4677a7a69 100644 --- a/programs/reg/tests/reg_test.h +++ b/programs/reg/tests/reg_test.h @@ -74,6 +74,13 @@ void add_value_(const char *file, unsigned line, HKEY hkey, const char *name, #define delete_value(k,n) delete_value_(__FILE__,__LINE__,k,n) void delete_value_(const char *file, unsigned line, const HKEY hkey, const char *name); +/* export.c */ +#define compare_export(f,e,todo) compare_export_(__FILE__,__LINE__,f,e,todo) +BOOL compare_export_(const char *file, unsigned line, const char *filename, + const char *expected, DWORD todo); +extern const char *empty_key_test; +extern const char *simple_data_test; + /* import.c */ #define test_import_str(c,r) import_reg(__FILE__,__LINE__,c,FALSE,r) #define test_import_wstr(c,r) import_reg(__FILE__,__LINE__,c,TRUE,r)

1 0

Hans Leidekker : ws2_32: Add support for hints in GetAddrInfoExW.
by Alexandre Julliard 13 May '21

13 May '21

Module: wine Branch: master Commit: e7af1f92a3f419019e05258db31d64717a12ee8a URL: https://source.winehq.org/git/wine.git/?a=commit;h=e7af1f92a3f419019e05258d… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu May 13 15:39:51 2021 +0200 ws2_32: Add support for hints in GetAddrInfoExW. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/protocol.c | 18 +++++++++++++----- dlls/ws2_32/tests/protocol.c | 24 +++++++++++++++++++++++- 2 files changed, 36 insertions(+), 6 deletions(-) diff --git a/dlls/ws2_32/protocol.c b/dlls/ws2_32/protocol.c index 64af105f0b9..15616fdaf34 100644 --- a/dlls/ws2_32/protocol.c +++ b/dlls/ws2_32/protocol.c @@ -568,6 +568,7 @@ struct getaddrinfo_args ADDRINFOEXW **result; char *nodename; char *servname; + struct WS_addrinfo *hints; }; static void WINAPI getaddrinfo_callback(TP_CALLBACK_INSTANCE *instance, void *context) @@ -579,7 +580,7 @@ static void WINAPI getaddrinfo_callback(TP_CALLBACK_INSTANCE *instance, void *co struct WS_addrinfo *res; int ret; - ret = WS_getaddrinfo( args->nodename, args->servname, NULL, &res ); + ret = WS_getaddrinfo( args->nodename, args->servname, args->hints, &res ); if (res) { *args->result = addrinfo_list_AtoW(res); @@ -660,12 +661,21 @@ static int WS_getaddrinfoW( const WCHAR *nodename, const WCHAR *servname, goto end; } - if (!(args = HeapAlloc( GetProcessHeap(), 0, sizeof(*args) ))) goto end; + if (!(args = HeapAlloc( GetProcessHeap(), 0, sizeof(*args) + sizeof(*args->hints) ))) goto end; args->overlapped = overlapped; args->completion_routine = completion_routine; args->result = res; args->nodename = nodenameA; args->servname = servnameA; + if (hints) + { + args->hints = (struct WS_addrinfo *)(args + 1); + args->hints->ai_flags = hints->ai_flags; + args->hints->ai_family = hints->ai_family; + args->hints->ai_socktype = hints->ai_socktype; + args->hints->ai_protocol = hints->ai_protocol; + } + else args->hints = NULL; overlapped->Internal = WSAEINPROGRESS; if (!TrySubmitThreadpoolCallback( getaddrinfo_callback, args, NULL )) @@ -714,14 +724,12 @@ int WINAPI GetAddrInfoExW( const WCHAR *name, const WCHAR *servname, DWORD names FIXME( "Unsupported namespace %u\n", namespace ); if (namespace_id) FIXME( "Unsupported namespace_id %s\n", debugstr_guid(namespace_id) ); - if (hints) - FIXME( "Unsupported hints\n" ); if (timeout) FIXME( "Unsupported timeout\n" ); if (handle) FIXME( "Unsupported cancel handle\n" ); - ret = WS_getaddrinfoW( name, servname, NULL, result, overlapped, completion_routine ); + ret = WS_getaddrinfoW( name, servname, (struct WS_addrinfo *)hints, result, overlapped, completion_routine ); if (ret) return ret; if (handle) *handle = (HANDLE)0xdeadbeef; return 0; diff --git a/dlls/ws2_32/tests/protocol.c b/dlls/ws2_32/tests/protocol.c index 8937e84d63f..27ef6ff92aa 100644 --- a/dlls/ws2_32/tests/protocol.c +++ b/dlls/ws2_32/tests/protocol.c @@ -1599,7 +1599,7 @@ static void test_GetAddrInfoExW(void) static const WCHAR localhost[] = {'l','o','c','a','l','h','o','s','t',0}; static const WCHAR winehq[] = {'t','e','s','t','.','w','i','n','e','h','q','.','o','r','g',0}; static const WCHAR nxdomain[] = {'n','x','d','o','m','a','i','n','.','w','i','n','e','h','q','.','o','r','g',0}; - ADDRINFOEXW *result; + ADDRINFOEXW *result, hints; OVERLAPPED overlapped; HANDLE event; int ret; @@ -1666,6 +1666,28 @@ static void test_GetAddrInfoExW(void) ok(!result->ai_provider, "ai_provider = %s\n", wine_dbgstr_guid(result->ai_provider)); pFreeAddrInfoExW(result); + /* hints */ + result = (void *)0xdeadbeef; + memset(&overlapped, 0xcc, sizeof(overlapped)); + ResetEvent(event); + overlapped.hEvent = event; + WSASetLastError(0xdeadbeef); + memset(&hints, 0, sizeof(hints)); + hints.ai_flags = AI_ALL | AI_V4MAPPED; + hints.ai_family = AF_INET6; + hints.ai_socktype = SOCK_DGRAM; + hints.ai_protocol = IPPROTO_UDP; + ret = pGetAddrInfoExW(winehq, NULL, NS_ALL, NULL, &hints, &result, NULL, &overlapped, NULL, NULL); + ok(ret == ERROR_IO_PENDING, "GetAddrInfoExW failed with %d\n", WSAGetLastError()); + ok(WSAGetLastError() == ERROR_IO_PENDING, "expected 11001, got %d\n", WSAGetLastError()); + ret = overlapped.Internal; + ok(ret == WSAEINPROGRESS || ret == ERROR_SUCCESS, "overlapped.Internal = %u\n", ret); + ok(WaitForSingleObject(event, 1000) == WAIT_OBJECT_0, "wait failed\n"); + ret = pGetAddrInfoExOverlappedResult(&overlapped); + ok(!ret, "overlapped result is %d\n", ret); + ok(result != NULL, "result == NULL\n"); + pFreeAddrInfoExW(result); + result = (void *)0xdeadbeef; memset(&overlapped, 0xcc, sizeof(overlapped)); ResetEvent(event);

1 0

Francois Gouget : winetest/build-patterns: Add a failed test units pattern.
by Alexandre Julliard 13 May '21

13 May '21

Module: tools Branch: master Commit: 3bba845369f9f50fc2ea491f97c127ffeb56e05c URL: https://source.winehq.org/git/tools.git/?a=commit;h=3bba845369f9f50fc2ea491… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu May 13 12:24:06 2021 +0200 winetest/build-patterns: Add a failed test units pattern. This pattern shows the number of failed test units for each test configuration. This allows detecting when results get worse after a VM update, or when a test configuration gets worse results than its peers. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/build-patterns | 121 +++++++++++++++++++++++++++++++++--------------- 1 file changed, 83 insertions(+), 38 deletions(-) Diff: https://source.winehq.org/git/tools.git/?a=commitdiff;h=3bba845369f9f50fc2e…

1 0

Zebediah Figura : wined3d: Pass a wined3d_device_context to wined3d_cs_emit_set_sampler_state().
by Alexandre Julliard 12 May '21

12 May '21

Module: wine Branch: master Commit: 29e1fcdac7a826e67a24488c52f722ee0bd232f8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=29e1fcdac7a826e67a24488c… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed May 12 11:10:02 2021 -0500 wined3d: Pass a wined3d_device_context to wined3d_cs_emit_set_sampler_state(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/cs.c | 8 ++++---- dlls/wined3d/device.c | 4 ++-- dlls/wined3d/texture.c | 2 +- dlls/wined3d/wined3d_private.h | 4 ++-- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index a39ed1dbaf4..e94d1a19dc2 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -1809,18 +1809,18 @@ static void wined3d_cs_exec_set_sampler_state(struct wined3d_cs *cs, const void device_invalidate_state(cs->c.device, STATE_SAMPLER(op->sampler_idx)); } -void wined3d_cs_emit_set_sampler_state(struct wined3d_cs *cs, UINT sampler_idx, - enum wined3d_sampler_state state, DWORD value) +void wined3d_device_context_emit_set_sampler_state(struct wined3d_device_context *context, unsigned int sampler_idx, + enum wined3d_sampler_state state, unsigned int value) { struct wined3d_cs_set_sampler_state *op; - op = wined3d_device_context_require_space(&cs->c, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); + op = wined3d_device_context_require_space(context, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); op->opcode = WINED3D_CS_OP_SET_SAMPLER_STATE; op->sampler_idx = sampler_idx; op->state = state; op->value = value; - wined3d_device_context_submit(&cs->c, WINED3D_CS_QUEUE_DEFAULT); + wined3d_device_context_submit(context, WINED3D_CS_QUEUE_DEFAULT); } static void wined3d_cs_exec_set_transform(struct wined3d_cs *cs, const void *data) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 128dd330f89..e62da01171c 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1707,7 +1707,7 @@ static void wined3d_device_set_sampler_state(struct wined3d_device *device, } device->cs->c.state->sampler_states[sampler_idx][state] = value; - wined3d_cs_emit_set_sampler_state(device->cs, sampler_idx, state, value); + wined3d_device_context_emit_set_sampler_state(&device->cs->c, sampler_idx, state, value); } void CDECL wined3d_device_set_scissor_rects(struct wined3d_device *device, unsigned int rect_count, @@ -1818,7 +1818,7 @@ void CDECL wined3d_device_set_state(struct wined3d_device *device, struct wined3 wined3d_device_context_emit_set_texture(context, i, state->textures[i]); for (j = 0; j < WINED3D_HIGHEST_SAMPLER_STATE + 1; ++j) { - wined3d_cs_emit_set_sampler_state(device->cs, i, j, state->sampler_states[i][j]); + wined3d_device_context_emit_set_sampler_state(context, i, j, state->sampler_states[i][j]); } } diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 638d0288e60..39e6e2a68b7 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -1741,7 +1741,7 @@ DWORD CDECL wined3d_texture_set_lod(struct wined3d_texture *texture, DWORD lod) wined3d_texture_gl(texture)->texture_rgb.base_level = ~0u; wined3d_texture_gl(texture)->texture_srgb.base_level = ~0u; if (resource->bind_count) - wined3d_cs_emit_set_sampler_state(device->cs, texture->sampler, WINED3D_SAMP_MAX_MIP_LEVEL, + wined3d_device_context_emit_set_sampler_state(&device->cs->c, texture->sampler, WINED3D_SAMP_MAX_MIP_LEVEL, device->cs->c.state->sampler_states[texture->sampler][WINED3D_SAMP_MAX_MIP_LEVEL]); } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 4740bb8799d..c752be692fc 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4755,8 +4755,6 @@ void wined3d_cs_emit_set_light_enable(struct wined3d_cs *cs, unsigned int idx, B void wined3d_cs_emit_set_material(struct wined3d_cs *cs, const struct wined3d_material *material) DECLSPEC_HIDDEN; void wined3d_cs_emit_set_render_state(struct wined3d_cs *cs, enum wined3d_render_state state, DWORD value) DECLSPEC_HIDDEN; -void wined3d_cs_emit_set_sampler_state(struct wined3d_cs *cs, UINT sampler_idx, - enum wined3d_sampler_state state, DWORD value) DECLSPEC_HIDDEN; void wined3d_cs_emit_set_stream_source_freq(struct wined3d_cs *cs, UINT stream_idx, UINT frequency, UINT flags) DECLSPEC_HIDDEN; void wined3d_cs_emit_set_transform(struct wined3d_cs *cs, enum wined3d_transform_state state, @@ -4813,6 +4811,8 @@ void wined3d_device_context_emit_set_rendertarget_view(struct wined3d_device_con struct wined3d_rendertarget_view *view) DECLSPEC_HIDDEN; void wined3d_device_context_emit_set_sampler(struct wined3d_device_context *context, enum wined3d_shader_type type, unsigned int sampler_idx, struct wined3d_sampler *sampler) DECLSPEC_HIDDEN; +void wined3d_device_context_emit_set_sampler_state(struct wined3d_device_context *context, unsigned int sampler_idx, + enum wined3d_sampler_state state, unsigned int value) DECLSPEC_HIDDEN; void wined3d_device_context_emit_set_scissor_rects(struct wined3d_device_context *context, unsigned int rect_count, const RECT *rects) DECLSPEC_HIDDEN; void wined3d_device_context_emit_set_shader(struct wined3d_device_context *context, enum wined3d_shader_type type,

1 0

Alistair Leslie-Hughes : include: Add IXMLHTTPRequest2/3 interfaces.
by Alexandre Julliard 12 May '21

12 May '21

Module: wine Branch: master Commit: 0a50674c6aabb0368811ece4078a2bb69d7ea1bb URL: https://source.winehq.org/git/wine.git/?a=commit;h=0a50674c6aabb0368811ece4… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri May 7 18:40:50 2021 +1000 include: Add IXMLHTTPRequest2/3 interfaces. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/msxml6.idl | 102 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 102 insertions(+) diff --git a/include/msxml6.idl b/include/msxml6.idl index 5bfb21d04ae..4948de39f1f 100644 --- a/include/msxml6.idl +++ b/include/msxml6.idl @@ -52,6 +52,8 @@ interface IXMLDOMEntity; interface IXMLDOMEntityReference; interface IXMLDOMParseError; interface IXMLDOMParseErrorCollection; +interface IXMLHTTPRequest2Callback; +interface IXMLHTTPRequest3Callback; interface IXTLRuntime; interface IXSLTemplate; interface IXSLProcessor; @@ -254,6 +256,35 @@ typedef enum _SCHEMATYPEVARIETY } SCHEMATYPEVARIETY; cpp_quote("#endif /* __msxml_som_enums__ */") +typedef [v1_enum] enum _XHR_PROPERTY +{ + XHR_PROP_NO_CRED_PROMPT, + XHR_PROP_NO_AUTH, + XHR_PROP_TIMEOUT, + XHR_PROP_NO_DEFAULT_HEADERS, + XHR_PROP_REPORT_REDIRECT_STATUS, + XHR_PROP_NO_CACHE, + XHR_PROP_EXTENDED_ERROR, + XHR_PROP_QUERY_STRING_UTF8, + XHR_PROP_IGNORE_CERT_ERRORS, +} XHR_PROPERTY; + +typedef struct tagXHR_COOKIE +{ + [ref, string] WCHAR *pwszUrl; + [ref, string] WCHAR *pwszName; + [unique, string] WCHAR *pwszValue; + [unique, string] WCHAR *pwszP3PPolicy; + FILETIME ftExpires; + DWORD dwFlags; +} XHR_COOKIE; + +typedef struct tagXHR_CERT +{ + DWORD cbCert; + [ref, size_is(cbCert)] BYTE *pbCert; +} XHR_CERT; + [ local, object, @@ -1309,6 +1340,66 @@ interface IServerXMLHTTPRequest : IXMLHTTPRequest [in] VARIANT value); } +[ + object, + uuid(e5d37dc0-552a-4d52-9cc0-a14d546fbd04), +] +interface IXMLHTTPRequest2 : IUnknown +{ + HRESULT Open([in, string, ref] const WCHAR *method, [in, string, ref] const WCHAR *url, + [in] IXMLHTTPRequest2Callback *callback, + [in, string, unique] const WCHAR *username, [in, string, unique] const WCHAR *password, + [in, string, unique] const WCHAR *proxyuser, [in, string, unique] const WCHAR *proxypassword); + + HRESULT Send([in, unique] ISequentialStream *body, [in] ULONGLONG length); + HRESULT Abort(); + HRESULT SetCookie([in, ref] const XHR_COOKIE *cookie, [out] DWORD *state); + HRESULT SetCustomResponseStream([in] ISequentialStream *stream); + HRESULT SetProperty([in] XHR_PROPERTY property, [in] ULONGLONG value); + HRESULT SetRequestHeader([in, string, ref] const WCHAR *header, [in, string, unique] const WCHAR *value); + HRESULT GetAllResponseHeaders([out, string] WCHAR **headers); + HRESULT GetCookie( [in, ref, string] const WCHAR *url, [in, unique, string] const WCHAR *name, + [in] DWORD flags, [out] ULONG *cookies_cnt, [out, size_is(,*cookies_cnt)] XHR_COOKIE **cookies); + HRESULT GetResponseHeader([in, string, ref] const WCHAR *header, [out, string] WCHAR **value); +}; + +[ + object, + uuid(a1c9feee-0617-4f23-9d58-8961ea43567c) +] +interface IXMLHTTPRequest3 : IXMLHTTPRequest2 +{ + HRESULT SetClientCertificate([in] DWORD count, [in, unique, size_is(count)] const BYTE *hashes, + [in, string, unique] const WCHAR *pin); +}; + +[ + object, + uuid(a44a9299-e321-40de-8866-341b41669162), + pointer_default(ref) +] +interface IXMLHTTPRequest2Callback : IUnknown +{ + HRESULT OnRedirect([in] IXMLHTTPRequest2 *xhr, [in, string] const WCHAR *url); + HRESULT OnHeadersAvailable([in] IXMLHTTPRequest2 *xhr, [in] DWORD status, [in, string] const WCHAR *msg); + HRESULT OnDataAvailable([in] IXMLHTTPRequest2 *xhr, [in] ISequentialStream *stream); + HRESULT OnResponseReceived([in] IXMLHTTPRequest2 *xhr, [in] ISequentialStream *stream); + HRESULT OnError([in] IXMLHTTPRequest2 *xhr, [in] HRESULT error); +}; + +[ + object, + uuid(b9e57830-8c6c-4a6f-9c13-47772bb047bb) +] +interface IXMLHTTPRequest3Callback : IXMLHTTPRequest2Callback +{ + HRESULT OnServerCertificateReceived([in] IXMLHTTPRequest3 *xhr, [in] DWORD errors, + [in] DWORD count, [in, unique, size_is(count)] const XHR_CERT *certificates); + + HRESULT OnClientCertificateRequested([in] IXMLHTTPRequest3 *xhr, + [in] DWORD count, [in, string, unique, size_is(count)] const WCHAR **list); +}; + [ object, dual, @@ -1607,6 +1698,17 @@ interface ISAXDeclHandler : IUnknown [in] int nSystemId); } +[ + helpstring("Free Threaded XML HTTP Request class 6.0"), + progid("Msxml2.FreeThreadedXMLHTTP60.6.0"), + threading(both), + uuid(88d96a09-f192-11d4-a65f-0040963251e5) +] +coclass FreeThreadedXMLHTTP60 +{ + [default] interface IXMLHTTPRequest2; +} + [ object, local,

1 0

Hugh McMaster : reg: Update an error message.
by Alexandre Julliard 12 May '21

12 May '21

1 0

Hugh McMaster : reg/tests: Add further syntax tests for the 'copy' command.
by Alexandre Julliard 12 May '21

12 May '21

Module: wine Branch: master Commit: c0619c092962d1c14725ac6cdc84b8e80ecb09bc URL: https://source.winehq.org/git/wine.git/?a=commit;h=c0619c092962d1c14725ac6c… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Wed May 12 22:30:45 2021 +1000 reg/tests: Add further syntax tests for the 'copy' command. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/copy.c | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/programs/reg/tests/copy.c b/programs/reg/tests/copy.c index 31223a3d314..0d245dae4da 100644 --- a/programs/reg/tests/copy.c +++ b/programs/reg/tests/copy.c @@ -88,11 +88,38 @@ static void test_command_syntax(void) run_reg_exe("reg copy HKCU\\" COPY_SRC " HKCU\\" COPY_SRC, &r); ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + run_reg_exe("reg copy HKCU\\" COPY_SRC "\\ HKCU\\" COPY_SRC, &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + + run_reg_exe("reg copy HKCU\\" COPY_SRC " HKCU\\" COPY_SRC "\\", &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + + run_reg_exe("reg copy HKCU\\" COPY_SRC "\\ HKCU\\" COPY_SRC "\\", &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + run_reg_exe("reg copy HKCU\\" COPY_SRC " HKCU\\" COPY_SRC " /f", &r); ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + run_reg_exe("reg copy HKCU\\" COPY_SRC "\\ HKCU\\" COPY_SRC " /f", &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + + run_reg_exe("reg copy HKCU\\" COPY_SRC " HKCU\\" COPY_SRC "\\ /f", &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + + run_reg_exe("reg copy HKCU\\" COPY_SRC "\\ HKCU\\" COPY_SRC "\\ /f", &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + run_reg_exe("reg copy HKCU\\" COPY_SRC " HKCU\\" COPY_SRC " /s /f", &r); ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + + run_reg_exe("reg copy HKCU\\" COPY_SRC "\\ HKCU\\" COPY_SRC " /s /f", &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + + run_reg_exe("reg copy HKCU\\" COPY_SRC " HKCU\\" COPY_SRC "\\ /s /f", &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + + run_reg_exe("reg copy HKCU\\" COPY_SRC "\\ HKCU\\" COPY_SRC "\\ /s /f", &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); } START_TEST(copy)

1 0

Nikolay Sivov : mfplat: Use CRT allocation functions.
by Alexandre Julliard 12 May '21

12 May '21

Module: wine Branch: master Commit: 0b6affbeeb948011b9e1aec365293ba416da95d5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0b6affbeeb948011b9e1aec3… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed May 12 16:09:03 2021 +0300 mfplat: Use CRT allocation functions. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/buffer.c | 37 ++++---- dlls/mfplat/main.c | 210 +++++++++++++++++++------------------------ dlls/mfplat/mediatype.c | 37 ++++---- dlls/mfplat/mfplat_private.h | 3 +- dlls/mfplat/sample.c | 28 +++--- 5 files changed, 136 insertions(+), 179 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=0b6affbeeb948011b9e1…

1 0

Jacek Caban : winepulse: Move synchronization functions to unix lib.
by Alexandre Julliard 12 May '21

12 May '21

Module: wine Branch: master Commit: d3673fcb034348b708a5d8b8c65a746faaeec19d URL: https://source.winehq.org/git/wine.git/?a=commit;h=d3673fcb034348b708a5d8b8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue May 11 18:29:38 2021 +0200 winepulse: Move synchronization functions to unix lib. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winepulse.drv/Makefile.in | 3 +- dlls/winepulse.drv/mmdevdrv.c | 199 ++++++++++++++++++++--------------------- dlls/winepulse.drv/pulse.c | 83 +++++++++++++++++ dlls/winepulse.drv/unixlib.h | 25 ++++++ 4 files changed, 207 insertions(+), 103 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d3673fcb034348b708a5…

1 0

Jacek Caban : winepulse: Move pulse_test_connect to unix lib.
by Alexandre Julliard 12 May '21

12 May '21

Module: wine Branch: master Commit: e264ec9c718eb66038221f8b533fc099927ed966 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e264ec9c718eb66038221f8b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue May 11 18:30:00 2021 +0200 winepulse: Move pulse_test_connect to unix lib. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winepulse.drv/mmdevdrv.c | 327 ++++---------------------------------- dlls/winepulse.drv/pulse.c | 353 ++++++++++++++++++++++++++++++++++++++++++ dlls/winepulse.drv/unixlib.h | 12 ++ 3 files changed, 391 insertions(+), 301 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=e264ec9c718eb6603822…

1 0