- Wine-Commits - list.winehq.org

Alexandre Julliard : ntdll: Call the flush instruction cache callback on ARM64EC.
by Alexandre Julliard July 10, 2024

July 10, 2024

Module: wine Branch: master Commit: 8ff25221ea72843b91d1b52a1dad140770b26263 URL: https://gitlab.winehq.org/wine/wine/-/commit/8ff25221ea72843b91d1b52a1dad14… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 10 10:24:54 2024 +0200 ntdll: Call the flush instruction cache callback on ARM64EC. --- dlls/ntdll/signal_arm64ec.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/ntdll/signal_arm64ec.c b/dlls/ntdll/signal_arm64ec.c index 98817351f45..bcd903a3381 100644 --- a/dlls/ntdll/signal_arm64ec.c +++ b/dlls/ntdll/signal_arm64ec.c @@ -40,6 +40,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(seh); WINE_DECLARE_DEBUG_CHANNEL(relay); /* xtajit64.dll functions */ +static void (WINAPI *pBTCpu64FlushInstructionCache)(const void*,SIZE_T); static BOOLEAN (WINAPI *pBTCpu64IsProcessorFeaturePresent)(UINT); static NTSTATUS (WINAPI *pProcessInit)(void); static NTSTATUS (WINAPI *pThreadInit)(void); @@ -142,6 +143,7 @@ NTSTATUS arm64ec_process_init( HMODULE module ) __os_arm64x_dispatch_ret = RtlFindExportedRoutineByName( module, "RetToEntryThunk" ); #define GET_PTR(name) p ## name = RtlFindExportedRoutineByName( module, #name ) + GET_PTR( BTCpu64FlushInstructionCache ); GET_PTR( BTCpu64IsProcessorFeaturePresent ); GET_PTR( ProcessInit ); GET_PTR( ThreadInit ); @@ -483,6 +485,8 @@ NTSTATUS SYSCALL_API NtFlushInstructionCache( HANDLE process, const void *addr, { if (!RtlIsCurrentProcess( process )) send_cross_process_notification( process, CrossProcessFlushCache, addr, size, 0 ); + else if (pBTCpu64FlushInstructionCache) + pBTCpu64FlushInstructionCache( addr, size ); } return status; }

1 0

Alexandre Julliard : ntdll: Call the processor information callback on ARM64EC.
by Alexandre Julliard July 10, 2024

July 10, 2024

Module: wine Branch: master Commit: 145a2403efabbcc9f49c6436279ea90b86bd2921 URL: https://gitlab.winehq.org/wine/wine/-/commit/145a2403efabbcc9f49c6436279ea9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 10 10:23:50 2024 +0200 ntdll: Call the processor information callback on ARM64EC. --- dlls/ntdll/signal_arm64ec.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/signal_arm64ec.c b/dlls/ntdll/signal_arm64ec.c index b48255678de..3abfd3a0f8a 100644 --- a/dlls/ntdll/signal_arm64ec.c +++ b/dlls/ntdll/signal_arm64ec.c @@ -42,6 +42,7 @@ WINE_DECLARE_DEBUG_CHANNEL(relay); /* xtajit64.dll functions */ static NTSTATUS (WINAPI *pProcessInit)(void); static NTSTATUS (WINAPI *pThreadInit)(void); +static void (WINAPI *pUpdateProcessorInformation)(SYSTEM_CPU_INFORMATION*); static inline CHPE_V2_CPU_AREA_INFO *get_arm64ec_cpu_area(void) { @@ -140,6 +141,7 @@ NTSTATUS arm64ec_process_init( HMODULE module ) #define GET_PTR(name) p ## name = RtlFindExportedRoutineByName( module, #name ) GET_PTR( ProcessInit ); GET_PTR( ThreadInit ); + GET_PTR( UpdateProcessorInformation ); #undef GET_PTR if (pProcessInit) status = pProcessInit(); @@ -332,7 +334,7 @@ DEFINE_SYSCALL(NtQuerySemaphore, (HANDLE handle, SEMAPHORE_INFORMATION_CLASS cla DEFINE_SYSCALL(NtQuerySymbolicLinkObject, (HANDLE handle, UNICODE_STRING *target, ULONG *length)) DEFINE_SYSCALL(NtQuerySystemEnvironmentValue, (UNICODE_STRING *name, WCHAR *buffer, ULONG length, ULONG *retlen)) DEFINE_SYSCALL(NtQuerySystemEnvironmentValueEx, (UNICODE_STRING *name, GUID *vendor, void *buffer, ULONG *retlen, ULONG *attrib)) -DEFINE_SYSCALL(NtQuerySystemInformation, (SYSTEM_INFORMATION_CLASS class, void *info, ULONG size, ULONG *ret_size)) +DEFINE_WRAPPED_SYSCALL(NtQuerySystemInformation, (SYSTEM_INFORMATION_CLASS class, void *info, ULONG size, ULONG *ret_size)) DEFINE_SYSCALL(NtQuerySystemInformationEx, (SYSTEM_INFORMATION_CLASS class, void *query, ULONG query_len, void *info, ULONG size, ULONG *ret_size)) DEFINE_SYSCALL(NtQuerySystemTime, (LARGE_INTEGER *time)) DEFINE_SYSCALL(NtQueryTimer, (HANDLE handle, TIMER_INFORMATION_CLASS class, void *info, ULONG len, ULONG *ret_len)) @@ -513,6 +515,13 @@ NTSTATUS SYSCALL_API NtProtectVirtualMemory( HANDLE process, PVOID *addr_ptr, SI if (!is_current) send_cross_process_notification( process, CrossProcessPostVirtualProtect, *addr_ptr, *size_ptr, 2, new_prot, status ); +} + +NTSTATUS SYSCALL_API NtQuerySystemInformation( SYSTEM_INFORMATION_CLASS class, void *info, ULONG size, ULONG *ret_size ) +{ + NTSTATUS status = syscall_NtQuerySystemInformation( class, info, size, ret_size ); + + if (!status && class == SystemCpuInformation && pUpdateProcessorInformation) pUpdateProcessorInformation( info ); return status; } @@ -1274,7 +1283,7 @@ void WINAPI RtlUnwindEx( PVOID end_frame, PVOID target_ip, EXCEPTION_RECORD *rec NTSTATUS WINAPI RtlGetNativeSystemInformation( SYSTEM_INFORMATION_CLASS class, void *info, ULONG size, ULONG *ret_size ) { - return NtQuerySystemInformation( class, info, size, ret_size ); + return syscall_NtQuerySystemInformation( class, info, size, ret_size ); }

1 0

Alexandre Julliard : ntdll: Call the memory allocation callbacks on ARM64EC.
by Alexandre Julliard July 10, 2024

July 10, 2024

Module: wine Branch: master Commit: 5787ddbb02d1d4d1bce01c066a58eae7593ceb0f URL: https://gitlab.winehq.org/wine/wine/-/commit/5787ddbb02d1d4d1bce01c066a58ea… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 10 10:29:32 2024 +0200 ntdll: Call the memory allocation callbacks on ARM64EC. --- dlls/ntdll/signal_arm64ec.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/dlls/ntdll/signal_arm64ec.c b/dlls/ntdll/signal_arm64ec.c index bcd903a3381..839bf3a1572 100644 --- a/dlls/ntdll/signal_arm64ec.c +++ b/dlls/ntdll/signal_arm64ec.c @@ -42,6 +42,9 @@ WINE_DECLARE_DEBUG_CHANNEL(relay); /* xtajit64.dll functions */ static void (WINAPI *pBTCpu64FlushInstructionCache)(const void*,SIZE_T); static BOOLEAN (WINAPI *pBTCpu64IsProcessorFeaturePresent)(UINT); +static void (WINAPI *pNotifyMemoryAlloc)(void*,SIZE_T,ULONG,ULONG,BOOL,NTSTATUS); +static void (WINAPI *pNotifyMemoryFree)(void*,SIZE_T,ULONG,BOOL,NTSTATUS); +static void (WINAPI *pNotifyMemoryProtect)(void*,SIZE_T,ULONG,BOOL,NTSTATUS); static NTSTATUS (WINAPI *pProcessInit)(void); static NTSTATUS (WINAPI *pThreadInit)(void); static void (WINAPI *pUpdateProcessorInformation)(SYSTEM_CPU_INFORMATION*); @@ -145,6 +148,9 @@ NTSTATUS arm64ec_process_init( HMODULE module ) #define GET_PTR(name) p ## name = RtlFindExportedRoutineByName( module, #name ) GET_PTR( BTCpu64FlushInstructionCache ); GET_PTR( BTCpu64IsProcessorFeaturePresent ); + GET_PTR( NotifyMemoryAlloc ); + GET_PTR( NotifyMemoryFree ); + GET_PTR( NotifyMemoryProtect ); GET_PTR( ProcessInit ); GET_PTR( ThreadInit ); GET_PTR( UpdateProcessorInformation ); @@ -443,11 +449,14 @@ NTSTATUS SYSCALL_API NtAllocateVirtualMemory( HANDLE process, PVOID *ret, ULONG_ if (!is_current) send_cross_process_notification( process, CrossProcessPreVirtualAlloc, *ret, *size_ptr, 3, type, protect, 0 ); + else if (pNotifyMemoryAlloc) pNotifyMemoryAlloc( *ret, *size_ptr, type, protect, FALSE, 0 ); status = syscall_NtAllocateVirtualMemory( process, ret, zero_bits, size_ptr, type, protect ); if (!is_current) send_cross_process_notification( process, CrossProcessPostVirtualAlloc, *ret, *size_ptr, 3, type, protect, status ); + else if (pNotifyMemoryAlloc) pNotifyMemoryAlloc( *ret, *size_ptr, type, protect, TRUE, status ); + return status; } @@ -461,11 +470,14 @@ NTSTATUS SYSCALL_API NtAllocateVirtualMemoryEx( HANDLE process, PVOID *ret, SIZE if (!is_current) send_cross_process_notification( process, CrossProcessPreVirtualAlloc, *ret, *size_ptr, 3, type, protect, 0 ); + else if (pNotifyMemoryAlloc) pNotifyMemoryAlloc( *ret, *size_ptr, type, protect, FALSE, 0 ); status = syscall_NtAllocateVirtualMemoryEx( process, ret, size_ptr, type, protect, parameters, count ); if (!is_current) send_cross_process_notification( process, CrossProcessPostVirtualAlloc, *ret, *size_ptr, 3, type, protect, status ); + else if (pNotifyMemoryAlloc) pNotifyMemoryAlloc( *ret, *size_ptr, type, protect, TRUE, status ); + return status; } @@ -498,11 +510,14 @@ NTSTATUS SYSCALL_API NtFreeVirtualMemory( HANDLE process, PVOID *addr_ptr, SIZE_ if (!is_current) send_cross_process_notification( process, CrossProcessPreVirtualFree, *addr_ptr, *size_ptr, 2, type, 0 ); + else if (pNotifyMemoryFree) pNotifyMemoryFree( *addr_ptr, *size_ptr, type, FALSE, 0 ); status = syscall_NtFreeVirtualMemory( process, addr_ptr, size_ptr, type ); if (!is_current) send_cross_process_notification( process, CrossProcessPostVirtualFree, *addr_ptr, *size_ptr, 2, type, status ); + else if (pNotifyMemoryFree) pNotifyMemoryFree( *addr_ptr, *size_ptr, type, TRUE, status ); + return status; } @@ -523,11 +538,15 @@ NTSTATUS SYSCALL_API NtProtectVirtualMemory( HANDLE process, PVOID *addr_ptr, SI if (!is_current) send_cross_process_notification( process, CrossProcessPreVirtualProtect, *addr_ptr, *size_ptr, 2, new_prot, 0 ); + else if (pNotifyMemoryProtect) pNotifyMemoryProtect( *addr_ptr, *size_ptr, new_prot, FALSE, 0 ); status = syscall_NtProtectVirtualMemory( process, addr_ptr, size_ptr, new_prot, old_prot ); if (!is_current) send_cross_process_notification( process, CrossProcessPostVirtualProtect, *addr_ptr, *size_ptr, 2, new_prot, status ); + else if (pNotifyMemoryProtect) pNotifyMemoryProtect( *addr_ptr, *size_ptr, new_prot, TRUE, status ); + + return status; } NTSTATUS SYSCALL_API NtQuerySystemInformation( SYSTEM_INFORMATION_CLASS class, void *info, ULONG size, ULONG *ret_size )

1 0

Alexandre Julliard : ntdll: Load the processor features from the emulator on ARM64EC.
by Alexandre Julliard July 10, 2024

July 10, 2024

Module: wine Branch: master Commit: 4fb289dc84343705c22e2232a703755f553c2091 URL: https://gitlab.winehq.org/wine/wine/-/commit/4fb289dc84343705c22e2232a70375… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 10 10:24:11 2024 +0200 ntdll: Load the processor features from the emulator on ARM64EC. --- dlls/ntdll/signal_arm64ec.c | 34 ++++++++++++++++++++++++++++++++-- 1 file changed, 32 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/signal_arm64ec.c b/dlls/ntdll/signal_arm64ec.c index 3abfd3a0f8a..98817351f45 100644 --- a/dlls/ntdll/signal_arm64ec.c +++ b/dlls/ntdll/signal_arm64ec.c @@ -40,10 +40,13 @@ WINE_DEFAULT_DEBUG_CHANNEL(seh); WINE_DECLARE_DEBUG_CHANNEL(relay); /* xtajit64.dll functions */ +static BOOLEAN (WINAPI *pBTCpu64IsProcessorFeaturePresent)(UINT); static NTSTATUS (WINAPI *pProcessInit)(void); static NTSTATUS (WINAPI *pThreadInit)(void); static void (WINAPI *pUpdateProcessorInformation)(SYSTEM_CPU_INFORMATION*); +static BOOLEAN emulated_processor_features[PROCESSOR_FEATURE_MAX]; + static inline CHPE_V2_CPU_AREA_INFO *get_arm64ec_cpu_area(void) { return NtCurrentTeb()->ChpeV2CpuAreaInfo; @@ -139,13 +142,19 @@ NTSTATUS arm64ec_process_init( HMODULE module ) __os_arm64x_dispatch_ret = RtlFindExportedRoutineByName( module, "RetToEntryThunk" ); #define GET_PTR(name) p ## name = RtlFindExportedRoutineByName( module, #name ) + GET_PTR( BTCpu64IsProcessorFeaturePresent ); GET_PTR( ProcessInit ); GET_PTR( ThreadInit ); GET_PTR( UpdateProcessorInformation ); #undef GET_PTR if (pProcessInit) status = pProcessInit(); - if (!status) status = create_cross_process_work_list( info ); + if (!status) + { + for (unsigned int i = 0; i < PROCESSOR_FEATURE_MAX; i++) + emulated_processor_features[i] = pBTCpu64IsProcessorFeaturePresent( i ); + status = create_cross_process_work_list( info ); + } if (!status) status = arm64ec_thread_init(); return status; } @@ -1292,7 +1301,28 @@ NTSTATUS WINAPI RtlGetNativeSystemInformation( SYSTEM_INFORMATION_CLASS class, */ BOOLEAN WINAPI RtlIsProcessorFeaturePresent( UINT feature ) { - return feature < PROCESSOR_FEATURE_MAX && user_shared_data->ProcessorFeatures[feature]; + static const ULONGLONG arm64_features = + (1ull << PF_COMPARE_EXCHANGE_DOUBLE) | + (1ull << PF_NX_ENABLED) | + (1ull << PF_ARM_VFP_32_REGISTERS_AVAILABLE) | + (1ull << PF_ARM_NEON_INSTRUCTIONS_AVAILABLE) | + (1ull << PF_SECOND_LEVEL_ADDRESS_TRANSLATION) | + (1ull << PF_FASTFAIL_AVAILABLE) | + (1ull << PF_ARM_DIVIDE_INSTRUCTION_AVAILABLE) | + (1ull << PF_ARM_64BIT_LOADSTORE_ATOMIC) | + (1ull << PF_ARM_EXTERNAL_CACHE_AVAILABLE) | + (1ull << PF_ARM_FMAC_INSTRUCTIONS_AVAILABLE) | + (1ull << PF_ARM_V8_INSTRUCTIONS_AVAILABLE) | + (1ull << PF_ARM_V8_CRYPTO_INSTRUCTIONS_AVAILABLE) | + (1ull << PF_ARM_V8_CRC32_INSTRUCTIONS_AVAILABLE) | + (1ull << PF_ARM_V81_ATOMIC_INSTRUCTIONS_AVAILABLE) | + (1ull << PF_ARM_V82_DP_INSTRUCTIONS_AVAILABLE) | + (1ull << PF_ARM_V83_JSCVT_INSTRUCTIONS_AVAILABLE) | + (1ull << PF_ARM_V83_LRCPC_INSTRUCTIONS_AVAILABLE); + + if (feature >= PROCESSOR_FEATURE_MAX) return FALSE; + if (arm64_features & (1ull << feature)) return user_shared_data->ProcessorFeatures[feature]; + return emulated_processor_features[feature]; }

1 0

Alfred Agrell : include: Fix typos in IID_IMimeWebDocument and IID_IMimeMessageCallback.
by Alexandre Julliard July 10, 2024

July 10, 2024

Module: wine Branch: master Commit: dc4a83f0a57f7851bad3a65c1f9293856b316fa3 URL: https://gitlab.winehq.org/wine/wine/-/commit/dc4a83f0a57f7851bad3a65c1f9293… Author: Alfred Agrell <floating(a)muncher.se> Date: Sun May 5 01:35:54 2024 +0200 include: Fix typos in IID_IMimeWebDocument and IID_IMimeMessageCallback. --- include/mimeole.idl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/mimeole.idl b/include/mimeole.idl index 32e04e00c19..85ced81d405 100644 --- a/include/mimeole.idl +++ b/include/mimeole.idl @@ -939,7 +939,7 @@ cpp_quote("#endif") } [ - uuid(ee519f11-851a-11d0-8252-00c04fd85ab4), + uuid(ee519f11-851a-11d0-825c-00c04fd85ab4), object ] interface IMimeWebDocument : IUnknown @@ -1340,7 +1340,7 @@ cpp_quote("#endif") } [ - uuid(761aa741-7bda-11d1-8aa9-00c04fb951f3), + uuid(761aa641-7bda-11d1-8aa9-00c04fb951f3), object ] interface IMimeMessageCallback : IUnknown

1 0

Alfred Agrell : include: Fix typos in IID_IPropertyEnumType2 and CLSID_PropertySystem.
by Alexandre Julliard July 10, 2024

July 10, 2024

Module: wine Branch: master Commit: 66e6b61705a66459ed3a9e0cf9457d8b180e4564 URL: https://gitlab.winehq.org/wine/wine/-/commit/66e6b61705a66459ed3a9e0cf9457d… Author: Alfred Agrell <floating(a)muncher.se> Date: Sun May 5 01:35:54 2024 +0200 include: Fix typos in IID_IPropertyEnumType2 and CLSID_PropertySystem. --- include/propsys.idl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/propsys.idl b/include/propsys.idl index 4df73640f5e..9dc93caf15d 100644 --- a/include/propsys.idl +++ b/include/propsys.idl @@ -278,7 +278,7 @@ interface IPropertyEnumType : IUnknown } [ - uuid(9b6e051c-5ddd-4321-9070-fe2acb55e974), + uuid(9b6e051c-5ddd-4321-9070-fe2acb55e794), object, pointer_default(unique) ] @@ -828,7 +828,7 @@ library PropSysObjects { interface IPropertyStore; } - [uuid(b8967f86-58ae-4f96-9fb2-5d7904798f4b)] coclass PropertySystem + [uuid(b8967f85-58ae-4f46-9fb2-5d7904798f4b)] coclass PropertySystem { interface IPropertySystem; }

1 0

Biswapriyo Nath : include: Fix typo with XINPUT_DEVSUBTYPE_FLIGHT_STICK name in xinput.h.
by Alexandre Julliard July 10, 2024

July 10, 2024

Module: wine Branch: master Commit: 1503800a8213bdf5dbae0310a81d33983ae6c6ba URL: https://gitlab.winehq.org/wine/wine/-/commit/1503800a8213bdf5dbae0310a81d33… Author: Biswapriyo Nath <nathbappai(a)gmail.com> Date: Wed Jul 10 05:03:22 2024 +0000 include: Fix typo with XINPUT_DEVSUBTYPE_FLIGHT_STICK name in xinput.h. --- include/xinput.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/xinput.h b/include/xinput.h index c1e1ab3d39c..c2e771b9f6b 100644 --- a/include/xinput.h +++ b/include/xinput.h @@ -114,7 +114,7 @@ #define XINPUT_DEVSUBTYPE_GAMEPAD 0x01 #define XINPUT_DEVSUBTYPE_WHEEL 0x02 #define XINPUT_DEVSUBTYPE_ARCADE_STICK 0x03 -#define XINPUT_DEVSUBTYPE_FLIGHT_SICK 0x04 +#define XINPUT_DEVSUBTYPE_FLIGHT_STICK 0x04 #define XINPUT_DEVSUBTYPE_DANCE_PAD 0x05 #define XINPUT_DEVSUBTYPE_GUITAR 0x06 #define XINPUT_DEVSUBTYPE_GUITAR_ALTERNATE 0x07

1 0

Hans Leidekker : winhttp: Implement WinHttpQueryOption(WINHTTP_OPTION_URL).
by Alexandre Julliard July 10, 2024

July 10, 2024

Module: wine Branch: master Commit: 74ce6fc4ab3792b7867c2daad9f9c9f5902601aa URL: https://gitlab.winehq.org/wine/wine/-/commit/74ce6fc4ab3792b7867c2daad9f9c9… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Jul 9 11:54:14 2024 +0200 winhttp: Implement WinHttpQueryOption(WINHTTP_OPTION_URL). --- dlls/winhttp/session.c | 38 ++++++++++++++++++++++++++++++++++++++ dlls/winhttp/tests/winhttp.c | 38 ++++++++++++++++++++++++++++++++++++-- 2 files changed, 74 insertions(+), 2 deletions(-) diff --git a/dlls/winhttp/session.c b/dlls/winhttp/session.c index a473451b9a6..d579d72583e 100644 --- a/dlls/winhttp/session.c +++ b/dlls/winhttp/session.c @@ -739,6 +739,33 @@ static BOOL copy_sockaddr( const struct sockaddr *addr, SOCKADDR_STORAGE *addr_s } } +static WCHAR *build_url( struct request *request ) +{ + URL_COMPONENTS uc; + DWORD len = 0; + WCHAR *ret; + + memset( &uc, 0, sizeof(uc) ); + uc.dwStructSize = sizeof(uc); + uc.nScheme = (request->hdr.flags & WINHTTP_FLAG_SECURE) ? INTERNET_SCHEME_HTTPS : INTERNET_SCHEME_HTTP; + uc.lpszHostName = request->connect->hostname; + uc.dwHostNameLength = wcslen( uc.lpszHostName ); + uc.nPort = request->connect->hostport; + uc.lpszUserName = request->connect->username; + uc.dwUserNameLength = request->connect->username ? wcslen( request->connect->username ) : 0; + uc.lpszPassword = request->connect->password; + uc.dwPasswordLength = request->connect->password ? wcslen( request->connect->password ) : 0; + uc.lpszUrlPath = request->path; + uc.dwUrlPathLength = wcslen( uc.lpszUrlPath ); + + WinHttpCreateUrl( &uc, 0, NULL, &len ); + if (GetLastError() != ERROR_INSUFFICIENT_BUFFER || !(ret = malloc( len * sizeof(WCHAR) ))) return NULL; + + if (WinHttpCreateUrl( &uc, 0, ret, &len )) return ret; + free( ret ); + return NULL; +} + static BOOL request_query_option( struct object_header *hdr, DWORD option, void *buffer, DWORD *buflen ) { struct request *request = (struct request *)hdr; @@ -916,6 +943,17 @@ static BOOL request_query_option( struct object_header *hdr, DWORD option, void *buflen = sizeof(DWORD); return TRUE; + case WINHTTP_OPTION_URL: + { + WCHAR *url; + BOOL ret; + + if (!(url = build_url( request ))) return FALSE; + ret = return_string_option( buffer, url, buflen ); + free( url ); + return ret; + } + default: FIXME( "unimplemented option %lu\n", option ); SetLastError( ERROR_INVALID_PARAMETER ); diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index 03b1c067fb5..a1f8c15e356 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -3304,6 +3304,7 @@ static void test_redirect(int port) HINTERNET ses, con, req; char buf[128]; DWORD size, len, count, status; + WCHAR url[128], expected[128]; BOOL ret; ses = WinHttpOpen(L"winetest", WINHTTP_ACCESS_TYPE_NO_PROXY, NULL, NULL, 0); @@ -3315,12 +3316,32 @@ static void test_redirect(int port) req = WinHttpOpenRequest(con, L"POST", L"/redirect", NULL, NULL, NULL, 0); ok(req != NULL, "failed to open a request %lu\n", GetLastError()); + url[0] = 0; + size = sizeof(url); + ret = WinHttpQueryOption(req, WINHTTP_OPTION_URL, url, &size); + ok(ret, "got %lu\n", GetLastError()); + swprintf(expected, ARRAY_SIZE(expected), L"http://localhost:%u/redirect", port); + ok(!wcscmp(url, expected), "expected %s got %s\n", wine_dbgstr_w(expected), wine_dbgstr_w(url)); + ret = WinHttpSendRequest(req, NULL, 0, (void *)"data", sizeof("data"), sizeof("data"), 0); ok(ret, "failed to send request %lu\n", GetLastError()); + url[0] = 0; + size = sizeof(url); + ret = WinHttpQueryOption(req, WINHTTP_OPTION_URL, url, &size); + ok(ret, "got %lu\n", GetLastError()); + ok(!wcscmp(url, expected), "expected %s got %s\n", wine_dbgstr_w(expected), wine_dbgstr_w(url)); + ret = WinHttpReceiveResponse(req, NULL); ok(ret, "failed to receive response %lu\n", GetLastError()); + url[0] = 0; + size = sizeof(url); + ret = WinHttpQueryOption(req, WINHTTP_OPTION_URL, url, &size); + ok(ret, "got %lu\n", GetLastError()); + swprintf(expected, ARRAY_SIZE(expected), L"http://localhost:%u/temporary", port); + ok(!wcscmp(url, expected), "expected %s got %s\n", wine_dbgstr_w(expected), wine_dbgstr_w(url)); + status = 0xdeadbeef; size = sizeof(status); ret = WinHttpQueryHeaders(req, WINHTTP_QUERY_STATUS_CODE | WINHTTP_QUERY_FLAG_NUMBER, @@ -5685,7 +5706,8 @@ done: static void test_max_http_automatic_redirects (void) { HINTERNET session, request, connection; - DWORD max_redirects, err; + DWORD max_redirects, err, size; + WCHAR url[128]; BOOL ret; session = WinHttpOpen(L"winetest", WINHTTP_ACCESS_TYPE_DEFAULT_PROXY, @@ -5719,11 +5741,23 @@ static void test_max_http_automatic_redirects (void) } ok(ret == TRUE, "WinHttpSendRequest failed: %lu\n", GetLastError()); + url[0] = 0; + size = sizeof(url); + ret = WinHttpQueryOption(request, WINHTTP_OPTION_URL, url, &size); + ok(ret, "got %lu\n", GetLastError()); + ok(!wcscmp(url, L"http://test.winehq.org/tests/redirecttest.php?max=3"), "got %s\n", wine_dbgstr_w(url)); + SetLastError(0xdeadbeef); ret = WinHttpReceiveResponse(request, NULL); ok(!ret, "WinHttpReceiveResponse succeeded, expected failure\n"); ok(GetLastError() == ERROR_WINHTTP_REDIRECT_FAILED, "Expected ERROR_WINHTTP_REDIRECT_FAILED, got %lu\n", GetLastError()); + url[0] = 0; + size = sizeof(url); + ret = WinHttpQueryOption(request, WINHTTP_OPTION_URL, url, &size); + ok(ret, "got %lu\n", GetLastError()); + ok(!wcscmp(url, L"http://test.winehq.org/tests/redirecttest.php?id=2&max=3"), "got %s\n", wine_dbgstr_w(url)); + done: ret = WinHttpCloseHandle(request); ok(ret == TRUE, "WinHttpCloseHandle failed on closing request, got %d.\n", ret); @@ -6132,9 +6166,9 @@ START_TEST (winhttp) test_WinHttpGetIEProxyConfigForCurrentUser(); test_chunked_read(); test_max_http_automatic_redirects(); + si.event = CreateEventW(NULL, 0, 0, NULL); si.port = 7532; - thread = CreateThread(NULL, 0, server_thread, &si, 0, NULL); ok(thread != NULL, "failed to create thread %lu\n", GetLastError());

1 0

Alfred Agrell : include: Fix typo in CLSID_WICXMPMetadataReader.
by Alexandre Julliard July 10, 2024

July 10, 2024

Module: wine Branch: master Commit: 8b9ad51b358314c305c5169735684616c6d2bb2b URL: https://gitlab.winehq.org/wine/wine/-/commit/8b9ad51b358314c305c51697356846… Author: Alfred Agrell <floating(a)muncher.se> Date: Sun May 5 01:35:54 2024 +0200 include: Fix typo in CLSID_WICXMPMetadataReader. --- include/wincodecsdk.idl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/wincodecsdk.idl b/include/wincodecsdk.idl index 4fb23716c27..8692eea3067 100644 --- a/include/wincodecsdk.idl +++ b/include/wincodecsdk.idl @@ -103,7 +103,7 @@ cpp_quote("DEFINE_GUID(CLSID_WICIfdMetadataReader, 0x8f914656,0x9d0a,0x4eb2,0x90 cpp_quote("DEFINE_GUID(CLSID_WICIfdMetadataWriter, 0xb1ebfc28,0xc9bd,0x47a2,0x8d,0x33,0xb9,0x48,0x76,0x97,0x77,0xa7);") cpp_quote("DEFINE_GUID(CLSID_WICExifMetadataReader, 0xd9403860,0x297f,0x4a49,0xbf,0x9b,0x77,0x89,0x81,0x50,0xa4,0x42);") cpp_quote("DEFINE_GUID(CLSID_WICExifMetadataWriter, 0xc9a14cda,0xc339,0x460b,0x90,0x78,0xd4,0xde,0xbc,0xfa,0xbe,0x91);") -cpp_quote("DEFINE_GUID(CLSID_WICXMPMetadataReader, 0x72b624bf,0xae11,0x4948,0xa6,0x5c,0x35,0x1e,0xb0,0x82,0x94,0x19);") +cpp_quote("DEFINE_GUID(CLSID_WICXMPMetadataReader, 0x72b624df,0xae11,0x4948,0xa6,0x5c,0x35,0x1e,0xb0,0x82,0x94,0x19);") cpp_quote("DEFINE_GUID(CLSID_WICXMPMetadataWriter, 0x1765e14e,0x1bd4,0x462e,0xb6,0xb1,0x59,0x0b,0xf1,0x26,0x2a,0xc6);") cpp_quote("DEFINE_GUID(CLSID_WICXMPAltMetadataReader, 0xaa94dcc2,0xb8b0,0x4898,0xb8,0x35,0x00,0x0a,0xab,0xd7,0x43,0x93);") cpp_quote("DEFINE_GUID(CLSID_WICXMPAltMetadataWriter, 0x076c2a6c,0xf78f,0x4c46,0xa7,0x23,0x35,0x83,0xe7,0x08,0x76,0xea);")

1 0

Alfred Agrell : include: Fix typo in MEDIASUBTYPE_P408.
by Alexandre Julliard July 10, 2024

July 10, 2024

Module: wine Branch: master Commit: 23a0ffc51878ad5522be5c92d2893287eb45fc5c URL: https://gitlab.winehq.org/wine/wine/-/commit/23a0ffc51878ad5522be5c92d28932… Author: Alfred Agrell <floating(a)muncher.se> Date: Sun May 5 01:35:54 2024 +0200 include: Fix typo in MEDIASUBTYPE_P408. --- include/uuids.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/uuids.h b/include/uuids.h index 2ae1ed21139..321dd16d6bf 100644 --- a/include/uuids.h +++ b/include/uuids.h @@ -344,7 +344,7 @@ OUR_GUID_ENTRY(MEDIASUBTYPE_P016, 0x36313050, 0x0000, 0x0010, OUR_GUID_ENTRY(MEDIASUBTYPE_P208, 0x38303250, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71) OUR_GUID_ENTRY(MEDIASUBTYPE_P210, 0x30313250, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71) OUR_GUID_ENTRY(MEDIASUBTYPE_P216, 0x36313250, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71) -OUR_GUID_ENTRY(MEDIASUBTYPE_P408, 0x38304250, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71) +OUR_GUID_ENTRY(MEDIASUBTYPE_P408, 0x38303450, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71) OUR_GUID_ENTRY(MEDIASUBTYPE_PCM, 0x00000001, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71) OUR_GUID_ENTRY(MEDIASUBTYPE_PCMAudio_Obsolete, 0xe436eb8a, 0x524f, 0x11ce, 0x9f, 0x53, 0x00, 0x20, 0xaf, 0x0b, 0xa7, 0x70) OUR_GUID_ENTRY(MEDIASUBTYPE_Plum, 0x6d756c50, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71)

1 0