wine-commits September 2023

wine-commits@winehq.org

1 participants
920 discussions

Gabriel Ivăncescu : mshtml: Expose an EventTarget interface on the outer window for events' target dispatch.
by Alexandre Julliard 07 Sep '23

07 Sep '23

Module: wine Branch: master Commit: 32ce98e94d9bcfbb06fca31a5bd6de44b11a626b URL: https://gitlab.winehq.org/wine/wine/-/commit/32ce98e94d9bcfbb06fca31a5bd6de… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Thu Sep 7 16:07:00 2023 +0300 mshtml: Expose an EventTarget interface on the outer window for events' target dispatch. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmlevent.c | 35 +++++++++++-- dlls/mshtml/htmlevent.h | 1 + dlls/mshtml/htmlwindow.c | 116 ++++++++++++++++++++++++++++++++++++++++++- dlls/mshtml/mshtml_private.h | 1 + dlls/mshtml/tests/events.c | 18 +++++++ dlls/mshtml/tests/script.c | 18 +++++++ 6 files changed, 182 insertions(+), 7 deletions(-)

1 0

Alexandre Julliard : winebuild: Add SEH information to relay entry points on ARM64.
by Alexandre Julliard 07 Sep '23

07 Sep '23

Module: wine Branch: master Commit: 04a74bdb507e289926f2d33a8c67e116070aa60f URL: https://gitlab.winehq.org/wine/wine/-/commit/04a74bdb507e289926f2d33a8c67e1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 7 17:12:55 2023 +0200 winebuild: Add SEH information to relay entry points on ARM64. --- dlls/ntdll/relay.c | 8 ++++---- tools/winebuild/spec32.c | 39 ++++++++++++++++++++------------------- 2 files changed, 24 insertions(+), 23 deletions(-) diff --git a/dlls/ntdll/relay.c b/dlls/ntdll/relay.c index afa4085fb33..adc8267ae1f 100644 --- a/dlls/ntdll/relay.c +++ b/dlls/ntdll/relay.c @@ -646,10 +646,11 @@ DECLSPEC_HIDDEN void WINAPI relay_trace_exit( struct relay_descr *descr, unsigne extern LONGLONG CDECL call_entry_point( void *func, int nb_args, const INT_PTR *args ); __ASM_GLOBAL_FUNC( call_entry_point, "stp x29, x30, [SP,#-16]!\n\t" - "stp x19, x20, [SP,#-16]!\n\t" + __ASM_SEH(".seh_save_fplr_x 16\n\t") "mov x29, SP\n\t" - "mov x19, x2\n\t" - "ldp x8, x9, [x19, #-32]\n\t" + __ASM_SEH(".seh_set_fp\n\t") + __ASM_SEH(".seh_endprologue\n\t") + "ldr x8, [x2, #-32]\n\t" "mov x9, x0\n\t" "cbz w1, 2f\n\t" "mov w10, w1\n\t" @@ -682,7 +683,6 @@ __ASM_GLOBAL_FUNC( call_entry_point, "cbnz w12, 1b\n\t" "2: blr x9\n\t" "mov SP, x29\n\t" - "ldp x19, x20, [SP], #16\n\t" "ldp x29, x30, [SP], #16\n\t" "ret\n" ) diff --git a/tools/winebuild/spec32.c b/tools/winebuild/spec32.c index 6e4131bd910..874c81d0ddc 100644 --- a/tools/winebuild/spec32.c +++ b/tools/winebuild/spec32.c @@ -329,28 +329,30 @@ static void output_relay_debug( DLLSPEC *spec ) } case CPU_ARM64: + { + int stack_size = 16 * ((min(odp->u.func.nb_args, 8) + 1) / 2); + output( "\t.align %d\n", get_alignment(4) ); output( "__wine_spec_relay_entry_point_%d:\n", i ); - output_cfi( ".cfi_startproc" ); - switch (odp->u.func.nb_args) + output_cfi( ".seh_proc __wine_spec_relay_entry_point_%d", i ); + output( "\tstp x29, x30, [sp, #-%u]!\n", stack_size + 16 ); + output_cfi( ".seh_save_fplr_x %u", stack_size + 16 ); + output( "\tmov x29, sp\n" ); + output_cfi( ".seh_set_fp" ); + output_cfi( ".seh_endprologue" ); + switch (stack_size) { - default: - case 8: - case 7: output( "\tstp x6, x7, [SP,#-16]!\n" ); + case 64: output( "\tstp x6, x7, [sp, #64]\n" ); /* fall through */ - case 6: - case 5: output( "\tstp x4, x5, [SP,#-16]!\n" ); + case 48: output( "\tstp x4, x5, [sp, #48]\n" ); /* fall through */ - case 4: - case 3: output( "\tstp x2, x3, [SP,#-16]!\n" ); + case 32: output( "\tstp x2, x3, [sp, #32]\n" ); /* fall through */ - case 2: - case 1: output( "\tstp x0, x1, [SP,#-16]!\n" ); + case 16: output( "\tstp x0, x1, [sp, #16]\n" ); /* fall through */ - case 0: break; + default: break; } - output( "\tmov x2, SP\n"); - output( "\tstp x29, x30, [SP,#-16]!\n" ); + output( "\tadd x2, sp, #16\n"); output( "\tstp x8, x9, [SP,#-16]!\n" ); output( "\tmov w1, #%u\n", odp->u.func.args_str_offset << 16 ); if (i - spec->base) output( "\tadd w1, w1, #%u\n", i - spec->base ); @@ -358,13 +360,12 @@ static void output_relay_debug( DLLSPEC *spec ) output( "\tadd x0, x0, #%s\n", arm64_pageoff(".L__wine_spec_relay_descr") ); output( "\tldr x3, [x0, #8]\n"); output( "\tblr x3\n"); - output( "\tadd SP, SP, #16\n" ); - output( "\tldp x29, x30, [SP], #16\n" ); - if (odp->u.func.nb_args) - output( "\tadd SP, SP, #%u\n", 8 * ((min(odp->u.func.nb_args, 8) + 1) & ~1) ); + output( "\tmov sp, x29\n" ); + output( "\tldp x29, x30, [sp], #%u\n", stack_size + 16 ); output( "\tret\n"); - output_cfi( ".cfi_endproc" ); + output_cfi( ".seh_endproc" ); break; + } case CPU_x86_64: output( "\t.align %d\n", get_alignment(4) );

1 0

Alexandre Julliard : winegcc: Don't disable unwind tables for PE targets.
by Alexandre Julliard 07 Sep '23

07 Sep '23

Module: wine Branch: master Commit: 425bd55b02e375b9ac8f79b254ce3ca5c9e72719 URL: https://gitlab.winehq.org/wine/wine/-/commit/425bd55b02e375b9ac8f79b254ce3c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 7 16:02:12 2023 +0200 winegcc: Don't disable unwind tables for PE targets. --- tools/winegcc/winegcc.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index 34f8a1e4e87..968e472227e 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -832,8 +832,6 @@ static struct strarray get_winebuild_args(struct options *opts) for (i = 0; i < opts->prefix.count; i++) strarray_add( &spec_args, strmake( "-B%s", opts->prefix.str[i] )); strarray_addall( &spec_args, opts->winebuild_args ); - if (opts->unwind_tables) strarray_add( &spec_args, "-fasynchronous-unwind-tables" ); - else strarray_add( &spec_args, "-fno-asynchronous-unwind-tables" ); return spec_args; } @@ -961,6 +959,7 @@ static const char *build_spec_obj( struct options *opts, const char *spec_file, { if (opts->pic) strarray_add(&spec_args, "-fPIC"); if (opts->use_msvcrt) strarray_add(&spec_args, "-mno-cygwin"); + if (opts->unwind_tables) strarray_add( &spec_args, "-fasynchronous-unwind-tables" ); } strarray_add(&spec_args, opts->shared ? "--dll" : "--exe"); if (opts->fake_module)

1 0

Dmitry Timoshkov : comctl32: Use iswalnum() to filter alpha numeric characters from unicode messages.
by Alexandre Julliard 07 Sep '23

07 Sep '23

Module: wine Branch: master Commit: a5563e259c11f23236c1b93d9ff0ecfa1aa4dba7 URL: https://gitlab.winehq.org/wine/wine/-/commit/a5563e259c11f23236c1b93d9ff0ec… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Aug 15 20:59:29 2023 +0300 comctl32: Use iswalnum() to filter alpha numeric characters from unicode messages. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/comctl32/treeview.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c index c4e8d926941..c531ad75370 100644 --- a/dlls/comctl32/treeview.c +++ b/dlls/comctl32/treeview.c @@ -4664,7 +4664,7 @@ static INT TREEVIEW_ProcessLetterKeys(TREEVIEW_INFO *infoPtr, WPARAM charCode, L if (!charCode || !keyData) return 0; /* only allow the valid WM_CHARs through */ - if (!isalnum(charCode) && + if (!iswalnum(charCode) && charCode != '.' && charCode != '`' && charCode != '!' && charCode != '@' && charCode != '#' && charCode != '$' && charCode != '%' && charCode != '^' && charCode != '&' &&

1 0

Hans Leidekker : wsdapi/tests: Call GetAdaptersAddresses() in a loop.
by Alexandre Julliard 07 Sep '23

07 Sep '23

Module: wine Branch: master Commit: 074069b8854214e19667e0a9875b638ac5a1084c URL: https://gitlab.winehq.org/wine/wine/-/commit/074069b8854214e19667e0a9875b63… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Sep 5 11:09:25 2023 +0200 wsdapi/tests: Call GetAdaptersAddresses() in a loop. --- dlls/wsdapi/tests/discovery.c | 56 +++++++++++++++++++------------------------ 1 file changed, 25 insertions(+), 31 deletions(-) diff --git a/dlls/wsdapi/tests/discovery.c b/dlls/wsdapi/tests/discovery.c index cbf30b0456e..065b190ec35 100644 --- a/dlls/wsdapi/tests/discovery.c +++ b/dlls/wsdapi/tests/discovery.c @@ -331,26 +331,34 @@ cleanup_addresses: freeaddrinfo(interfaceAddr); } +static IP_ADAPTER_ADDRESSES *get_adapters( ULONG family ) +{ + ULONG err, size = 4096; + IP_ADAPTER_ADDRESSES *tmp, *ret; + + if (!(ret = malloc( size ))) return NULL; + err = GetAdaptersAddresses( family, 0, NULL, ret, &size ); + while (err == ERROR_BUFFER_OVERFLOW) + { + if (!(tmp = realloc( ret, size ))) break; + ret = tmp; + err = GetAdaptersAddresses( family, 0, NULL, ret, &size ); + } + if (err == ERROR_SUCCESS) return ret; + free( ret ); + return NULL; +} + static BOOL start_listening_on_all_addresses(messageStorage *msgStorage, ULONG family) { - IP_ADAPTER_ADDRESSES *adapterAddresses = NULL, *adapterAddress; - ULONG bufferSize = 0; + IP_ADAPTER_ADDRESSES *adapterAddresses, *adapterAddress; LPSOCKADDR sockaddr; DWORD addressLength; char address[64]; BOOL ret = FALSE; - ULONG retVal; - - retVal = GetAdaptersAddresses(family, 0, NULL, NULL, &bufferSize); /* family should be AF_INET or AF_INET6 */ - if (retVal != ERROR_BUFFER_OVERFLOW) goto cleanup; - - /* Get size of buffer for adapters */ - adapterAddresses = malloc(bufferSize); - if (adapterAddresses == NULL) goto cleanup; - /* Get list of adapters */ - retVal = GetAdaptersAddresses(family, 0, NULL, adapterAddresses, &bufferSize); - if (retVal != ERROR_SUCCESS) goto cleanup; + adapterAddresses = get_adapters(family); /* family should be AF_INET or AF_INET6 */ + if (!adapterAddresses) return FALSE; for (adapterAddress = adapterAddresses; adapterAddress != NULL; adapterAddress = adapterAddress->Next) { @@ -378,14 +386,11 @@ cleanup: static BOOL send_udp_multicast_of_type(const char *data, int length, ULONG family) { - IP_ADAPTER_ADDRESSES *adapter_addresses = NULL, *adapter_addr; + IP_ADAPTER_ADDRESSES *adapter_addresses, *adapter_addr; static const struct in6_addr i_addr_zero; struct addrinfo *multi_address; - ULONG bufferSize = 0; LPSOCKADDR sockaddr; - BOOL ret = FALSE; const char ttl = 8; - ULONG retval; SOCKET s; /* Resolve the multicast address */ @@ -397,16 +402,8 @@ static BOOL send_udp_multicast_of_type(const char *data, int length, ULONG famil if (multi_address == NULL) return FALSE; - /* Get size of buffer for adapters */ - retval = GetAdaptersAddresses(family, 0, NULL, NULL, &bufferSize); - if (retval != ERROR_BUFFER_OVERFLOW) goto cleanup; - - adapter_addresses = malloc(bufferSize); - if (adapter_addresses == NULL) goto cleanup; - - /* Get list of adapters */ - retval = GetAdaptersAddresses(family, 0, NULL, adapter_addresses, &bufferSize); - if (retval != ERROR_SUCCESS) goto cleanup; + adapter_addresses = get_adapters(family); + if (!adapter_addresses) return FALSE; for (adapter_addr = adapter_addresses; adapter_addr != NULL; adapter_addr = adapter_addr->Next) { @@ -433,12 +430,9 @@ static BOOL send_udp_multicast_of_type(const char *data, int length, ULONG famil closesocket(s); } - ret = TRUE; - -cleanup: freeaddrinfo(multi_address); free(adapter_addresses); - return ret; + return TRUE; } typedef struct IWSDiscoveryPublisherNotifyImpl {

1 0

Hans Leidekker : wsdapi/tests: Use CRT allocation functions.
by Alexandre Julliard 07 Sep '23

07 Sep '23

Module: wine Branch: master Commit: 1b83a376737bfc24b8eacdf1a6bc9f032655af51 URL: https://gitlab.winehq.org/wine/wine/-/commit/1b83a376737bfc24b8eacdf1a6bc9f… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Sep 5 10:59:17 2023 +0200 wsdapi/tests: Use CRT allocation functions. --- dlls/wsdapi/tests/discovery.c | 73 +++++++++++++++++++++---------------------- dlls/wsdapi/tests/xml.c | 4 +-- 2 files changed, 38 insertions(+), 39 deletions(-)

1 0

Hans Leidekker : wsdapi: Call GetAdaptersAddresses() in a loop.
by Alexandre Julliard 07 Sep '23

07 Sep '23

Module: wine Branch: master Commit: 986732a5bafa661ef8746a13b3ac84f7a2ddd000 URL: https://gitlab.winehq.org/wine/wine/-/commit/986732a5bafa661ef8746a13b3ac84… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Sep 5 10:42:25 2023 +0200 wsdapi: Call GetAdaptersAddresses() in a loop. --- dlls/wsdapi/network.c | 89 ++++++++++++++++----------------------------------- 1 file changed, 27 insertions(+), 62 deletions(-) diff --git a/dlls/wsdapi/network.c b/dlls/wsdapi/network.c index a17aa8daa79..97573c57919 100644 --- a/dlls/wsdapi/network.c +++ b/dlls/wsdapi/network.c @@ -97,44 +97,37 @@ static DWORD WINAPI sending_thread(LPVOID lpParam) return 0; } +static IP_ADAPTER_ADDRESSES *get_adapters(ULONG family) +{ + ULONG err, size = 4096; + IP_ADAPTER_ADDRESSES *tmp, *ret; + + if (!(ret = malloc( size ))) return NULL; + err = GetAdaptersAddresses( family, 0, NULL, ret, &size ); + while (err == ERROR_BUFFER_OVERFLOW) + { + if (!(tmp = realloc( ret, size ))) break; + ret = tmp; + err = GetAdaptersAddresses( family, 0, NULL, ret, &size ); + } + if (err == ERROR_SUCCESS) return ret; + free( ret ); + return NULL; +} + static BOOL send_udp_multicast_of_type(char *data, int length, int max_initial_delay, ULONG family) { - IP_ADAPTER_ADDRESSES *adapter_addresses = NULL, *adapter_addr; + IP_ADAPTER_ADDRESSES *adapter_addresses, *adapter_addr; static const struct in6_addr i_addr_zero; sending_thread_params *send_params; - ULONG bufferSize = 0; LPSOCKADDR sockaddr; - BOOL ret = FALSE; HANDLE thread_handle; const char ttl = 8; - ULONG retval; SOCKET s; - /* Get size of buffer for adapters */ - retval = GetAdaptersAddresses(family, 0, NULL, NULL, &bufferSize); - - if (retval != ERROR_BUFFER_OVERFLOW) - { - WARN("GetAdaptorsAddresses failed with error %08lx\n", retval); - goto cleanup; - } - - adapter_addresses = malloc(bufferSize); - - if (adapter_addresses == NULL) - { - WARN("Out of memory allocating space for adapter information\n"); - goto cleanup; - } - - /* Get list of adapters */ - retval = GetAdaptersAddresses(family, 0, NULL, adapter_addresses, &bufferSize); - - if (retval != ERROR_SUCCESS) - { - WARN("GetAdaptorsAddresses failed with error %08lx\n", retval); - goto cleanup; - } + adapter_addresses = get_adapters(family); + if (!adapter_addresses) + return FALSE; for (adapter_addr = adapter_addresses; adapter_addr != NULL; adapter_addr = adapter_addr->Next) { @@ -211,12 +204,8 @@ static BOOL send_udp_multicast_of_type(char *data, int length, int max_initial_d CloseHandle(thread_handle); } - ret = TRUE; - -cleanup: free(adapter_addresses); - - return ret; + return TRUE; } BOOL send_udp_multicast(IWSDiscoveryPublisherImpl *impl, char *data, int length, int max_initial_delay) @@ -504,36 +493,12 @@ cleanup: static BOOL start_listening_on_all_addresses(IWSDiscoveryPublisherImpl *impl, ULONG family) { - IP_ADAPTER_ADDRESSES *adapter_addresses = NULL, *adapter_address; + IP_ADAPTER_ADDRESSES *adapter_addresses, *adapter_address; int valid_listeners = 0; - ULONG bufferSize = 0; - ULONG ret; - - ret = GetAdaptersAddresses(family, 0, NULL, NULL, &bufferSize); /* family should be AF_INET or AF_INET6 */ - if (ret != ERROR_BUFFER_OVERFLOW) - { - WARN("GetAdaptorsAddresses failed with error %08lx\n", ret); + adapter_addresses = get_adapters(family); /* family should be AF_INET or AF_INET6 */ + if (!adapter_addresses) return FALSE; - } - - /* Get size of buffer for adapters */ - adapter_addresses = malloc(bufferSize); - - if (adapter_addresses == NULL) - { - WARN("Out of memory allocating space for adapter information\n"); - return FALSE; - } - - /* Get list of adapters */ - ret = GetAdaptersAddresses(family, 0, NULL, adapter_addresses, &bufferSize); - - if (ret != ERROR_SUCCESS) - { - WARN("GetAdaptorsAddresses failed with error %08lx\n", ret); - goto cleanup; - } for (adapter_address = adapter_addresses; adapter_address != NULL; adapter_address = adapter_address->Next) { @@ -554,7 +519,7 @@ static BOOL start_listening_on_all_addresses(IWSDiscoveryPublisherImpl *impl, UL cleanup: free(adapter_addresses); - return (ret == ERROR_SUCCESS) && (valid_listeners > 0); + return valid_listeners > 0; } HRESULT send_udp_unicast(char *data, int length, IWSDUdpAddress *remote_addr, int max_initial_delay)

1 0

Hans Leidekker : wsdapi: Use CRT allocation functions.
by Alexandre Julliard 07 Sep '23

07 Sep '23

Module: wine Branch: master Commit: 22c293bda65233aa56456eb7ec3bceb7853136d2 URL: https://gitlab.winehq.org/wine/wine/-/commit/22c293bda65233aa56456eb7ec3bce… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Sep 5 10:37:04 2023 +0200 wsdapi: Use CRT allocation functions. --- dlls/wsdapi/address.c | 4 ++-- dlls/wsdapi/discovery.c | 19 +++++++++---------- dlls/wsdapi/memory.c | 4 ++-- dlls/wsdapi/msgparams.c | 4 ++-- dlls/wsdapi/network.c | 31 +++++++++++++++---------------- dlls/wsdapi/soap.c | 23 +++++++++++------------ 6 files changed, 41 insertions(+), 44 deletions(-)

1 0

Yuxuan Shui : urlmon: Fix NULL dereference in BindProtocol_UnlockRequest.
by Alexandre Julliard 07 Sep '23

07 Sep '23

Module: wine Branch: master Commit: 1e8393f976d11bf831fa35466f805b73b63a06c1 URL: https://gitlab.winehq.org/wine/wine/-/commit/1e8393f976d11bf831fa35466f805b… Author: Yuxuan Shui <yshui(a)codeweavers.com> Date: Tue Sep 5 17:29:50 2023 +0100 urlmon: Fix NULL dereference in BindProtocol_UnlockRequest. --- dlls/urlmon/bindprot.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/urlmon/bindprot.c b/dlls/urlmon/bindprot.c index b09acdd5c3a..ec52ac5e999 100644 --- a/dlls/urlmon/bindprot.c +++ b/dlls/urlmon/bindprot.c @@ -815,7 +815,9 @@ static HRESULT WINAPI ProtocolHandler_UnlockRequest(IInternetProtocol *iface) TRACE("(%p)\n", This); - return IInternetProtocol_UnlockRequest(This->protocol); + if (This->protocol) + return IInternetProtocol_UnlockRequest(This->protocol); + return S_OK; } static const IInternetProtocolVtbl InternetProtocolHandlerVtbl = {

1 0

Yuxuan Shui : urlmon: Test http protocol through CreateBinding.
by Alexandre Julliard 07 Sep '23

07 Sep '23

Module: wine Branch: master Commit: ac58b5fefd5bb6e4affb9a1b914a9761aa1bbb3d URL: https://gitlab.winehq.org/wine/wine/-/commit/ac58b5fefd5bb6e4affb9a1b914a97… Author: Yuxuan Shui <yshui(a)codeweavers.com> Date: Tue Sep 5 17:05:25 2023 +0100 urlmon: Test http protocol through CreateBinding. --- dlls/urlmon/tests/protocol.c | 42 ++++++++++++++++++++++++++++++++++++------ 1 file changed, 36 insertions(+), 6 deletions(-) diff --git a/dlls/urlmon/tests/protocol.c b/dlls/urlmon/tests/protocol.c index 550f38659c6..e2db124f21e 100644 --- a/dlls/urlmon/tests/protocol.c +++ b/dlls/urlmon/tests/protocol.c @@ -34,6 +34,8 @@ static HRESULT (WINAPI *pCoInternetGetSession)(DWORD, IInternetSession **, DWORD static HRESULT (WINAPI *pReleaseBindInfo)(BINDINFO*); static HRESULT (WINAPI *pCreateUri)(LPCWSTR, DWORD, DWORD_PTR, IUri**); +#define CHARS_IN_GUID 39 + #define DEFINE_EXPECT(func) \ static BOOL expect_ ## func = FALSE, called_ ## func = FALSE @@ -143,6 +145,9 @@ static const WCHAR winehq_ipW[] = {'2','0','9','.','4','6','.','2','5','.','1',' static const WCHAR emptyW[] = {0}; static const WCHAR pjpegW[] = {'i','m','a','g','e','/','p','j','p','e','g',0}; static const WCHAR gifW[] = {'i','m','a','g','e','/','g','i','f',0}; +static const WCHAR null_guid[] = {'{','0','0','0','0','0','0','0','0','-','0','0','0','0','-', + '0','0','0','0','-','0','0','0','0','-','0','0','0','0','0','0','0','0','0','0','0','0','}',0}; +static WCHAR protocol_clsid[CHARS_IN_GUID]; static HRESULT expect_hrResult; static LPCWSTR file_name, http_url, expect_wsz; @@ -359,7 +364,7 @@ static HRESULT WINAPI HttpNegotiate_GetRootSecurityId(IHttpNegotiate2 *iface, BYTE *pbSecurityId, DWORD *pcbSecurityId, DWORD_PTR dwReserved) { static const BYTE sec_id[] = {'h','t','t','p',':','t','e','s','t',1,0,0,0}; - + CHECK_EXPECT(GetRootSecurityId); ok(!dwReserved, "dwReserved=%Id, expected 0\n", dwReserved); @@ -822,8 +827,6 @@ static const char *status_names[] = static HRESULT WINAPI ProtocolSink_ReportProgress(IInternetProtocolSink *iface, ULONG ulStatusCode, LPCWSTR szStatusText) { - static const WCHAR null_guid[] = {'{','0','0','0','0','0','0','0','0','-','0','0','0','0','-', - '0','0','0','0','-','0','0','0','0','-','0','0','0','0','0','0','0','0','0','0','0','0','}',0}; static const WCHAR text_plain[] = {'t','e','x','t','/','p','l','a','i','n',0}; if (winetest_debug > 1) @@ -913,7 +916,7 @@ static HRESULT WINAPI ProtocolSink_ReportProgress(IInternetProtocolSink *iface, case BINDSTATUS_PROTOCOLCLASSID: CHECK_EXPECT(ReportProgress_PROTOCOLCLASSID); ok(szStatusText != NULL, "szStatusText == NULL\n"); - ok(!lstrcmpW(szStatusText, null_guid), "unexpected classid %s\n", wine_dbgstr_w(szStatusText)); + ok(!lstrcmpW(szStatusText, protocol_clsid), "unexpected classid %s\n", wine_dbgstr_w(szStatusText)); break; case BINDSTATUS_COOKIE_SENT: CHECK_EXPECT2(ReportProgress_COOKIE_SENT); @@ -2710,6 +2713,7 @@ static IClassFactory mimefilter_cf = { &MimeFilterCFVtbl }; #define TEST_FROMCACHE 0x4000 #define TEST_DISABLEAUTOREDIRECT 0x8000 #define TEST_RESULTFROMLOCK 0x10000 +#define TEST_USEBINDING 0x20000 static void register_filter(BOOL do_register) { @@ -2770,6 +2774,7 @@ static void init_test(int prot, DWORD flags) file_with_hash = FALSE; security_problem = FALSE; reuse_protocol_thread = FALSE; + memcpy(protocol_clsid, null_guid, sizeof(null_guid)); bindinfo_options = 0; if(flags & TEST_DISABLEAUTOREDIRECT) @@ -3357,6 +3362,7 @@ static void test_http_protocol_url(LPCWSTR url, int prot, DWORD flags, DWORD tym { IInternetProtocolInfo *protocol_info; IClassFactory *factory; + IInternetSession *session; IUnknown *unk; HRESULT hres; @@ -3383,8 +3389,13 @@ static void test_http_protocol_url(LPCWSTR url, int prot, DWORD flags, DWORD tym if(FAILED(hres)) return; - hres = IClassFactory_CreateInstance(factory, NULL, &IID_IInternetProtocol, - (void**)&async_protocol); + if (flags & TEST_USEBINDING) { + hres = pCoInternetGetSession(0, &session, 0); + ok(hres == S_OK, "CoInternetGetSession failed: %08lx\n", hres); + hres = IInternetSession_CreateBinding(session, NULL, url, NULL, NULL, &async_protocol, 0); + } else + hres = IClassFactory_CreateInstance(factory, NULL, &IID_IInternetProtocol, + (void**)&async_protocol); ok(hres == S_OK, "Could not get IInternetProtocol: %08lx\n", hres); if(SUCCEEDED(hres)) { BYTE buf[3600]; @@ -3393,6 +3404,14 @@ static void test_http_protocol_url(LPCWSTR url, int prot, DWORD flags, DWORD tym test_priority(async_protocol); + if (flags & TEST_USEBINDING) { + SET_EXPECT(QueryService_InternetProtocol); + SET_EXPECT(ReportProgress_PROTOCOLCLASSID); + StringFromGUID2(&CLSID_HttpProtocol, protocol_clsid, ARRAY_SIZE(protocol_clsid)); + if (flags & TEST_DISABLEAUTOREDIRECT) + SET_EXPECT(QueryService_IBindCallbackRedirect); + } + SET_EXPECT(ReportProgress_COOKIE_SENT); if(http_is_first) { SET_EXPECT(ReportProgress_FINDINGRESOURCE); @@ -3422,6 +3441,13 @@ static void test_http_protocol_url(LPCWSTR url, int prot, DWORD flags, DWORD tym return; } + if (flags & TEST_USEBINDING) { + todo_wine CHECK_NOT_CALLED(QueryService_InternetProtocol); + todo_wine CHECK_NOT_CALLED(ReportProgress_PROTOCOLCLASSID); + if (flags & TEST_DISABLEAUTOREDIRECT) + CHECK_CALLED(QueryService_IBindCallbackRedirect); + } + if(!direct_read && !bind_from_cache) SET_EXPECT(ReportResult); @@ -3589,6 +3615,10 @@ static void test_http_protocol(void) bindf = BINDF_ASYNCHRONOUS | BINDF_ASYNCSTORAGE | BINDF_PULLDATA | BINDF_FROMURLMON | BINDF_NOWRITECACHE; test_http_protocol_url(empty_url, HTTP_TEST, TEST_EMPTY, TYMED_NULL); + trace("Testing http protocol (redirected, binding)...\n"); + bindf = BINDF_ASYNCHRONOUS | BINDF_ASYNCSTORAGE | BINDF_PULLDATA | BINDF_FROMURLMON | BINDF_NOWRITECACHE; + test_http_protocol_url(redirect_url, HTTP_TEST, TEST_REDIRECT|TEST_USEBINDING, TYMED_NULL); + /* This is a bit ugly. We unconditionally disable this test on Wine. This won't work until we have * support for reading from cache via HTTP layer in wininet. Until then, Wine will fail badly, affecting * other, unrelated, tests. Working around it is not worth the trouble, we may simply make sure those

1 0

← Newer
1
...
74
75
76
77
78
79
80
...
92
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits September 2023