wine-commits April 2020

wine-commits@winehq.org

2 participants
1016 discussions

Alexandre Julliard : Wine release 5.7
by Alexandre Julliard 24 Apr '20

24 Apr '20

Module: website Branch: master Commit: 7e9449dafc68f4fc52b5bbfea008c7306bc6932c URL: https://source.winehq.org/git/website.git/?a=commit;h=7e9449dafc68f4fc52b5b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 24 22:12:18 2020 +0200 Wine release 5.7 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2020042401.xml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/news/en/2020042401.xml b/news/en/2020042401.xml new file mode 100644 index 00000000..977d085a --- /dev/null +++ b/news/en/2020042401.xml @@ -0,0 +1,18 @@ +<news> +<date>April 24, 2020</date> +<title>Wine 5.7 Released</title> +<body> + The Wine development release 5.7 is now available. + <a href="{$root}/announce/5.7">What's new</a> in this release: +<ul> + <li>Wine Mono engine updated to 5.0.0, with upstream WPF support.</li> + <li>More progress on the WineD3D Vulkan backend.</li> + <li>Beginnings of a USB device driver.</li> + <li>Support for building with Clang in MSVC mode.</li> + <li>Builtin modules no longer depend on libwine.</li> + <li>Support for configuring Windows version from the command line.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="//dl.winehq.org/wine/source/5.x/wine-5.7.tar.xz">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Alexandre Julliard : Release 5.7.
by Alexandre Julliard 24 Apr '20

24 Apr '20

Module: wine Branch: master Commit: c44e0cf60ad1a967d80fafb427974332b35a0071 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c44e0cf60ad1a967d80fafb4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 24 22:09:10 2020 +0200 Release 5.7. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 1107 +++++++++++++++++++++++++++++-------------------------------- VERSION | 2 +- configure | 18 +- 3 files changed, 543 insertions(+), 584 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c44e0cf60ad1a967d80f…

1 0

Tag wine-5.7 : Alexandre Julliard : Release 5.7
by Alexandre Julliard 24 Apr '20

24 Apr '20

Module: wine Branch: refs/tags/wine-5.7 Tag: d3018ee7923df716264c66330d432d7380c0ecbc URL: https://source.winehq.org/git/wine.git/?a=tag;h=d3018ee7923df716264c66330d4… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 24 22:09:10 2020 +0200 Release 5.7

1 0

Jacek Caban : msvcrt: Use __ASM_BLOCK_BEGIN and __ASM_BLOCK_END macros.
by Alexandre Julliard 24 Apr '20

24 Apr '20

Module: wine Branch: master Commit: 3f8ac955de59da9f81a17ccf9d20c7402d6b1773 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3f8ac955de59da9f81a17ccf… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Apr 24 20:10:47 2020 +0200 msvcrt: Use __ASM_BLOCK_BEGIN and __ASM_BLOCK_END macros. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/cpp.c | 8 ++------ dlls/msvcrt/scheduler.c | 8 ++------ 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/dlls/msvcrt/cpp.c b/dlls/msvcrt/cpp.c index 404aa1146e..500549c31e 100644 --- a/dlls/msvcrt/cpp.c +++ b/dlls/msvcrt/cpp.c @@ -991,9 +991,7 @@ void __thiscall MSVCRT_improper_scheduler_detach_dtor( #endif /* _MSVCR_VER >= 100 */ -#ifndef __GNUC__ -void __asm_dummy_vtables(void) { -#endif +__ASM_BLOCK_BEGIN(vtables) __ASM_VTABLE(type_info, VTABLE_ADD_FUNC(MSVCRT_type_info_vector_dtor)); @@ -1041,9 +1039,7 @@ __ASM_VTABLE(improper_scheduler_detach, VTABLE_ADD_FUNC(MSVCRT_what_exception)); #endif -#ifndef __GNUC__ -} -#endif +__ASM_BLOCK_END DEFINE_RTTI_DATA0( type_info, 0, ".?AVtype_info@@" ) #if _MSVCR_VER >= 80 diff --git a/dlls/msvcrt/scheduler.c b/dlls/msvcrt/scheduler.c index 08a3242e6b..68003e03f6 100644 --- a/dlls/msvcrt/scheduler.c +++ b/dlls/msvcrt/scheduler.c @@ -1094,9 +1094,7 @@ DEFINE_RTTI_DATA1(SchedulerBase, 0, &Scheduler_rtti_base_descriptor, ".?AVSchedu DEFINE_RTTI_DATA2(ThreadScheduler, 0, &SchedulerBase_rtti_base_descriptor, &Scheduler_rtti_base_descriptor, ".?AVThreadScheduler@details@Concurrency@@") -#ifndef __GNUC__ -void __asm_dummy_vtables(void) { -#endif +__ASM_BLOCK_BEGIN(scheduler_vtables) __ASM_VTABLE(ExternalContextBase, VTABLE_ADD_FUNC(ExternalContextBase_GetId) VTABLE_ADD_FUNC(ExternalContextBase_GetVirtualProcessorId) @@ -1125,9 +1123,7 @@ void __asm_dummy_vtables(void) { VTABLE_ADD_FUNC(ThreadScheduler_IsAvailableLocation) #endif ); -#ifndef __GNUC__ -} -#endif +__ASM_BLOCK_END void msvcrt_init_scheduler(void *base) {

1 0

Jacek Caban : msvcp90: Use __ASM_BLOCK_BEGIN and __ASM_BLOCK_END macros.
by Alexandre Julliard 24 Apr '20

24 Apr '20

Module: wine Branch: master Commit: ddd4a7c3fb4f3ecd32927d69023aec59ef11c495 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ddd4a7c3fb4f3ecd32927d69… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Apr 24 20:10:36 2020 +0200 msvcp90: Use __ASM_BLOCK_BEGIN and __ASM_BLOCK_END macros. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp90/exception.c | 8 ++------ dlls/msvcp90/ios.c | 8 ++------ dlls/msvcp90/locale.c | 8 ++------ dlls/msvcp90/misc.c | 8 ++------ 4 files changed, 8 insertions(+), 24 deletions(-) diff --git a/dlls/msvcp90/exception.c b/dlls/msvcp90/exception.c index e75b8cc729..15a6548b21 100644 --- a/dlls/msvcp90/exception.c +++ b/dlls/msvcp90/exception.c @@ -1021,9 +1021,7 @@ void __cdecl __ExceptionPtrDestroy(exception_ptr *ep) #define EXCEPTION_VTABLE(name,funcs) __ASM_VTABLE(name,funcs VTABLE_ADD_FUNC(MSVCP_exception__Doraise)) #endif -#ifndef __GNUC__ -void __asm_dummy_vtables(void) { -#endif +__ASM_BLOCK_BEGIN(exception_vtables) __ASM_VTABLE(type_info, VTABLE_ADD_FUNC(MSVCP_type_info_vector_dtor)); EXCEPTION_VTABLE(exception, @@ -1066,9 +1064,7 @@ void __asm_dummy_vtables(void) { EXCEPTION_VTABLE(range_error, VTABLE_ADD_FUNC(MSVCP_runtime_error_vector_dtor) VTABLE_ADD_FUNC(MSVCP_runtime_error_what)); -#ifndef __GNUC__ -} -#endif +__ASM_BLOCK_END /* Internal: throws selected exception */ void throw_exception(exception_type et, const char *str) diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c index 8513965dd7..32dce89fd4 100644 --- a/dlls/msvcp90/ios.c +++ b/dlls/msvcp90/ios.c @@ -756,9 +756,7 @@ DEFINE_RTTI_DATA8(strstream, sizeof(strstream), &ios_base_rtti_base_descriptor, &iosb_rtti_base_descriptor, "?AVstrstream@std@@") -#ifndef __GNUC__ -void __asm_dummy_vtables(void) { -#endif +__ASM_BLOCK_BEGIN(ios_vtables) __ASM_VTABLE(iosb, VTABLE_ADD_FUNC(iosb_vector_dtor)); __ASM_VTABLE(ios_base, @@ -1181,9 +1179,7 @@ void __asm_dummy_vtables(void) { VTABLE_ADD_FUNC(basic_ios__Add_vtordisp2) #endif ); -#ifndef __GNUC__ -} -#endif +__ASM_BLOCK_END /* ?setp@?$basic_streambuf@DU?$char_traits@D@std@@@std@@IAEXPAD00@Z */ /* ?setp@?$basic_streambuf@DU?$char_traits@D@std@@@std@@IEAAXPEAD00@Z */ diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index 9293e0c9ac..dec87c0a4e 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -12737,9 +12737,7 @@ DEFINE_RTTI_DATA1(time_base, 0, &locale_facet_rtti_base_descriptor, ".?AUtime_ba DEFINE_RTTI_DATA2(time_get_char, 0, &time_base_rtti_base_descriptor, &locale_facet_rtti_base_descriptor, ".?AV?$time_get@DV?$istreambuf_iterator@DU?$char_traits@D@std@@@std@@@std@@") DEFINE_RTTI_DATA2(time_get_wchar, 0, &time_base_rtti_base_descriptor, &locale_facet_rtti_base_descriptor, ".?AV?$time_get@_WV?$istreambuf_iterator@_WU?$char_traits@_W@std@@@std@@@std@@") -#ifndef __GNUC__ -void __asm_dummy_vtables(void) { -#endif +__ASM_BLOCK_BEGIN(locale_vtables) __ASM_VTABLE(_Facet_base, VTABLE_ADD_FUNC(locale_facet_vector_dtor) VTABLE_ADD_FUNC(locale_facet__Incref) @@ -13104,9 +13102,7 @@ void __asm_dummy_vtables(void) { VTABLE_ADD_FUNC(time_get_wchar_do_get) #endif ); -#ifndef __GNUC__ -} -#endif +__ASM_BLOCK_END void init_locale(void *base) { diff --git a/dlls/msvcp90/misc.c b/dlls/msvcp90/misc.c index 810a0bfbc0..acb13af51c 100644 --- a/dlls/msvcp90/misc.c +++ b/dlls/msvcp90/misc.c @@ -2391,9 +2391,7 @@ void __thiscall _Concurrent_vector_base_v4__Internal_swap( } #endif -#ifndef __GNUC__ -void __asm_dummy_vtables(void) { -#endif +__ASM_BLOCK_BEGIN(vtables) #if _MSVCP_VER == 100 __ASM_VTABLE(iostream_category, VTABLE_ADD_FUNC(custom_category_vector_dtor) @@ -2434,9 +2432,7 @@ void __asm_dummy_vtables(void) { __ASM_VTABLE(_Pad, VTABLE_ADD_FUNC(_Pad__Go)); #endif -#ifndef __GNUC__ -} -#endif +__ASM_BLOCK_END /********************************************************************* * __crtInitializeCriticalSectionEx (MSVCP140.@)

1 0

Jacek Caban : msvcp60: Use __ASM_BLOCK_BEGIN and __ASM_BLOCK_END macros.
by Alexandre Julliard 24 Apr '20

24 Apr '20

Module: wine Branch: master Commit: 281c58bc43e783050b8b8b2d8500150965a7b867 URL: https://source.winehq.org/git/wine.git/?a=commit;h=281c58bc43e783050b8b8b2d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Apr 24 20:10:23 2020 +0200 msvcp60: Use __ASM_BLOCK_BEGIN and __ASM_BLOCK_END macros. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp60/ios.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/dlls/msvcp60/ios.c b/dlls/msvcp60/ios.c index ed1be5b693..7e62f60574 100644 --- a/dlls/msvcp60/ios.c +++ b/dlls/msvcp60/ios.c @@ -675,9 +675,7 @@ DEFINE_RTTI_DATA8(strstream, sizeof(strstream), &ios_base_rtti_base_descriptor, &iosb_rtti_base_descriptor, "?AVstrstream@std@@") -#ifndef __GNUC__ -void __asm_dummy_vtables(void) { -#endif +__ASM_BLOCK_BEGIN(ios_vtables) __ASM_VTABLE(iosb, VTABLE_ADD_FUNC(iosb_vector_dtor)); __ASM_VTABLE(ios_base, @@ -940,9 +938,7 @@ void __asm_dummy_vtables(void) { VTABLE_ADD_FUNC(ostrstream_vector_dtor)); __ASM_VTABLE(strstream, VTABLE_ADD_FUNC(strstream_vector_dtor)); -#ifndef __GNUC__ -} -#endif +__ASM_BLOCK_END /* ?setp@?$basic_streambuf@DU?$char_traits@D@std@@@std@@IAEXPAD00@Z */ /* ?setp@?$basic_streambuf@DU?$char_traits@D@std@@@std@@IEAAXPEAD00@Z */

1 0

Jacek Caban : msvcirt: Use __ASM_BLOCK_BEGIN and __ASM_BLOCK_END macros.
by Alexandre Julliard 24 Apr '20

24 Apr '20

Module: wine Branch: master Commit: fff313f1832cd81b37c718b81697ad68e74d7170 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fff313f1832cd81b37c718b8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Apr 24 20:10:16 2020 +0200 msvcirt: Use __ASM_BLOCK_BEGIN and __ASM_BLOCK_END macros. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcirt/msvcirt.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/dlls/msvcirt/msvcirt.c b/dlls/msvcirt/msvcirt.c index 797b0b1b56..360d34653f 100644 --- a/dlls/msvcirt/msvcirt.c +++ b/dlls/msvcirt/msvcirt.c @@ -199,9 +199,7 @@ extern const vtable_ptr MSVCP_strstream_vtable; /* ??_7stdiostream@@6B@ */ extern const vtable_ptr MSVCP_stdiostream_vtable; -#ifndef __GNUC__ -void __asm_dummy_vtables(void) { -#endif +__ASM_BLOCK_BEGIN(vtables) __ASM_VTABLE(streambuf, VTABLE_ADD_FUNC(streambuf_vector_dtor) VTABLE_ADD_FUNC(streambuf_sync) @@ -270,9 +268,7 @@ void __asm_dummy_vtables(void) { VTABLE_ADD_FUNC(iostream_vector_dtor)); __ASM_VTABLE(stdiostream, VTABLE_ADD_FUNC(iostream_vector_dtor)); -#ifndef __GNUC__ -} -#endif +__ASM_BLOCK_END #define ALIGNED_SIZE(size, alignment) (((size)+((alignment)-1))/(alignment)*(alignment)) #define VBTABLE_ENTRY(class, offset, vbase) ALIGNED_SIZE(sizeof(class), TYPE_ALIGNMENT(vbase))-offset

1 0

Jacek Caban : wine/asm.h: Introduce __ASM_BLOCK_BEGIN and __ASM_BLOCK_END macros.
by Alexandre Julliard 24 Apr '20

24 Apr '20

Module: wine Branch: master Commit: 541048868d44512fbd074cbfb7dea28c620ba7d4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=541048868d44512fbd074cbf… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Apr 24 20:10:07 2020 +0200 wine/asm.h: Introduce __ASM_BLOCK_BEGIN and __ASM_BLOCK_END macros. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/asm.h | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/include/wine/asm.h b/include/wine/asm.h index a036744674..2a4f06cb92 100644 --- a/include/wine/asm.h +++ b/include/wine/asm.h @@ -55,16 +55,20 @@ # define __ASM_FUNC_TYPE(name) ".type " name ",@function" #endif -#ifdef __GNUC__ -# define __ASM_DEFINE_FUNC(name,code) \ - asm(".text\n\t.align 4\n\t.globl " name "\n\t" __ASM_FUNC_TYPE(name) __ASM_SEH("\n\t.seh_proc " name) "\n" name ":\n\t" \ - __ASM_CFI(".cfi_startproc\n\t") code __ASM_CFI("\n\t.cfi_endproc") __ASM_SEH("\n\t.seh_endproc") ); +#if !defined(__GNUC__) && !defined(__clang__) +# define __ASM_BLOCK_BEGIN(name) void __asm_dummy_##name(void) { +# define __ASM_BLOCK_END } #else -# define __ASM_DEFINE_FUNC(name,code) void __asm_dummy_##__LINE__(void) { \ - asm(".text\n\t.align 4\n\t.globl " name "\n\t" __ASM_FUNC_TYPE(name) __ASM_SEH("\n\t.seh_proc " name) "\n" name ":\n\t" \ - __ASM_CFI(".cfi_startproc\n\t") code __ASM_CFI("\n\t.cfi_endproc") __ASM_SEH("\n\t.seh_endproc") ); } +# define __ASM_BLOCK_BEGIN(name) +# define __ASM_BLOCK_END #endif +#define __ASM_DEFINE_FUNC(name,code) \ + __ASM_BLOCK_BEGIN(__LINE__) \ + asm(".text\n\t.align 4\n\t.globl " name "\n\t" __ASM_FUNC_TYPE(name) __ASM_SEH("\n\t.seh_proc " name) "\n" name ":\n\t" \ + __ASM_CFI(".cfi_startproc\n\t") code __ASM_CFI("\n\t.cfi_endproc") __ASM_SEH("\n\t.seh_endproc") ); \ + __ASM_BLOCK_END + #define __ASM_GLOBAL_FUNC(name,code) __ASM_DEFINE_FUNC(__ASM_NAME(#name),code) #define __ASM_STDCALL_FUNC(name,args,code) __ASM_DEFINE_FUNC(__ASM_STDCALL(#name,args),code)

1 0

Zebediah Figura : wineusb.sys: Correctly implement device removal.
by Alexandre Julliard 24 Apr '20

24 Apr '20

Module: wine Branch: master Commit: 23081e8ebdf57757aa8c149fede66d19f05e94bd URL: https://source.winehq.org/git/wine.git/?a=commit;h=23081e8ebdf57757aa8c149f… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Apr 24 11:44:01 2020 -0500 wineusb.sys: Correctly implement device removal. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineusb.sys/wineusb.c | 39 +++++++++++++++++++++++++++++++++++---- 1 file changed, 35 insertions(+), 4 deletions(-) diff --git a/dlls/wineusb.sys/wineusb.c b/dlls/wineusb.sys/wineusb.c index 55bd84ea30..d79112b479 100644 --- a/dlls/wineusb.sys/wineusb.c +++ b/dlls/wineusb.sys/wineusb.c @@ -69,6 +69,7 @@ static struct list device_list = LIST_INIT(device_list); struct usb_device { struct list entry; + BOOL removed; DEVICE_OBJECT *device_obj; @@ -126,6 +127,7 @@ static void add_usb_device(libusb_device *libusb_device) EnterCriticalSection(&wineusb_cs); list_add_tail(&device_list, &device->entry); + device->removed = FALSE; LeaveCriticalSection(&wineusb_cs); IoInvalidateDeviceRelations(bus_pdo, BusRelations); @@ -142,15 +144,14 @@ static void remove_usb_device(libusb_device *libusb_device) { if (device->libusb_device == libusb_device) { - libusb_unref_device(device->libusb_device); - libusb_close(device->handle); list_remove(&device->entry); - IoInvalidateDeviceRelations(bus_pdo, BusRelations); - IoDeleteDevice(device->device_obj); + device->removed = TRUE; break; } } LeaveCriticalSection(&wineusb_cs); + + IoInvalidateDeviceRelations(bus_pdo, BusRelations); } static BOOL thread_shutdown; @@ -378,8 +379,38 @@ static NTSTATUS pdo_pnp(DEVICE_OBJECT *device_obj, IRP *irp) case IRP_MN_START_DEVICE: case IRP_MN_QUERY_CAPABILITIES: + case IRP_MN_SURPRISE_REMOVAL: + ret = STATUS_SUCCESS; + break; + + case IRP_MN_REMOVE_DEVICE: + { + LIST_ENTRY *entry; + + EnterCriticalSection(&wineusb_cs); + while ((entry = RemoveHeadList(&device->irp_list)) != &device->irp_list) + { + irp = CONTAINING_RECORD(entry, IRP, Tail.Overlay.ListEntry); + irp->IoStatus.Status = STATUS_CANCELLED; + irp->IoStatus.Information = 0; + IoCompleteRequest(irp, IO_NO_INCREMENT); + } + LeaveCriticalSection(&wineusb_cs); + + if (device->removed) + { + libusb_unref_device(device->libusb_device); + libusb_close(device->handle); + + irp->IoStatus.Status = STATUS_SUCCESS; + IoCompleteRequest(irp, IO_NO_INCREMENT); + IoDeleteDevice(device->device_obj); + return STATUS_SUCCESS; + } + ret = STATUS_SUCCESS; break; + } default: FIXME("Unhandled minor function %#x.\n", stack->MinorFunction);

1 0

Damjan Jovanovic : mshtml: Support implicit RT_FILE resource type in res protocol.
by Alexandre Julliard 24 Apr '20

24 Apr '20

Module: wine Branch: master Commit: 3e8bca0eb4f3f2c9b3bbf9fc634242512f8759b1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3e8bca0eb4f3f2c9b3bbf9fc… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Fri Apr 24 18:37:44 2020 +0200 mshtml: Support implicit RT_FILE resource type in res protocol. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47999 Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/protocol.c | 13 +++++++++---- dlls/mshtml/tests/protocol.c | 32 ++++++++++++++++++++++++++++++++ dlls/mshtml/tests/rsrc.rc | 3 +++ 3 files changed, 44 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/protocol.c b/dlls/mshtml/protocol.c index 8677030c35..a311d648f2 100644 --- a/dlls/mshtml/protocol.c +++ b/dlls/mshtml/protocol.c @@ -539,7 +539,7 @@ static HRESULT WINAPI ResProtocol_Start(IInternetProtocol *iface, LPCWSTR szUrl, DWORD grfPI, HANDLE_PTR dwReserved) { InternetProtocol *This = impl_from_IInternetProtocol(iface); - WCHAR *url_dll, *url_file, *url, *mime, *res_type = (LPWSTR)RT_HTML, *ptr; + WCHAR *url_dll, *url_file, *url, *mime, *res_type, *alt_res_type = NULL, *ptr; DWORD grfBINDF = 0, len; BINDINFO bindinfo; HMODULE hdll; @@ -593,7 +593,8 @@ static HRESULT WINAPI ResProtocol_Start(IInternetProtocol *iface, LPCWSTR szUrl, res_type = MAKEINTRESOURCEW(res_type_id); }else { url_file = res_type; - res_type = (LPWSTR)RT_HTML; + res_type = MAKEINTRESOURCEW(RT_HTML); + alt_res_type = MAKEINTRESOURCEW(2110 /* RT_FILE */); } /* Ignore query and hash parts. */ @@ -613,12 +614,16 @@ static HRESULT WINAPI ResProtocol_Start(IInternetProtocol *iface, LPCWSTR szUrl, TRACE("trying to find resource type %s, name %s\n", debugstr_w(res_type), debugstr_w(url_file)); src = FindResourceW(hdll, url_file, res_type); + if(!src && alt_res_type) + src = FindResourceW(hdll, url_file, alt_res_type); if(!src) { LPWSTR endpoint = NULL; DWORD file_id = wcstol(url_file, &endpoint, 10); - if(endpoint == url_file+lstrlenW(url_file)) + if(!*endpoint) { src = FindResourceW(hdll, MAKEINTRESOURCEW(file_id), res_type); - + if(!src && alt_res_type) + src = FindResourceW(hdll, MAKEINTRESOURCEW(file_id), alt_res_type); + } if(!src) { WARN("Could not find resource\n"); IInternetProtocolSink_ReportResult(pOIProtSink, diff --git a/dlls/mshtml/tests/protocol.c b/dlls/mshtml/tests/protocol.c index 75063f5ecf..600ec72e16 100644 --- a/dlls/mshtml/tests/protocol.c +++ b/dlls/mshtml/tests/protocol.c @@ -262,6 +262,30 @@ static void protocol_start(IInternetProtocol *protocol, const WCHAR *url) CHECK_CALLED(ReportResult); } +static void test_res_url_fail(const WCHAR *url_suffix) +{ + WCHAR url[INTERNET_MAX_URL_LENGTH]; + IInternetProtocol *protocol; + HRESULT hres; + + wcscpy(url, res_url_base); + wcscat(url, url_suffix); + + hres = CoCreateInstance(&CLSID_ResProtocol, NULL, CLSCTX_INPROC_SERVER, &IID_IInternetProtocol, (void**)&protocol); + ok(hres == S_OK, "Could not create ResProtocol instance: %08x\n", hres); + + SET_EXPECT(GetBindInfo); + SET_EXPECT(ReportResult); + expect_hr_win32err = TRUE; + hres = IInternetProtocol_Start(protocol, url, &protocol_sink, &bind_info, 0, 0); + ok(HRESULT_FACILITY(hres) == FACILITY_WIN32, + "%s: expected win32 error, got: %08x\n", debugstr_w(url_suffix), hres); + CHECK_CALLED(GetBindInfo); + CHECK_CALLED(ReportResult); + + IInternetProtocol_Release(protocol); +} + static void test_res_url(const char *url_suffix) { WCHAR url[INTERNET_MAX_URL_LENGTH]; @@ -604,6 +628,14 @@ static void test_res_protocol(void) test_res_url("/23/123"); test_res_url("/jstest.html"); + test_res_url("/jstest-rtfile.html"); + test_res_url("/#2110/jstest-rtfile.html"); + test_res_url("/2110/jstest-rtfile.html"); + + test_res_url_fail(L"/doesntexist/jstest-rtfile.html"); + test_res_url_fail(L"/2/jstest-rtfile.html"); + test_res_url_fail(L"/23/jstest-rtfile.html"); /* no fallback from explicit RT_HTML */ + test_res_url("/Test/res.html"); test_res_url("/test/dir/dir2/res.html"); diff --git a/dlls/mshtml/tests/rsrc.rc b/dlls/mshtml/tests/rsrc.rc index 05bc836ac6..12e95b7456 100644 --- a/dlls/mshtml/tests/rsrc.rc +++ b/dlls/mshtml/tests/rsrc.rc @@ -28,6 +28,9 @@ asyncscriptload.js HTML "asyncscriptload.js" /* @makedep: jstest.html */ jstest.html HTML "jstest.html" +/* @makedep: jstest.html */ +jstest-rtfile.html 2110 "jstest.html" + /* @makedep: vbtest.html */ vbtest.html HTML "vbtest.html"

1 0

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 April 2020