April 2020 - Wine-commits - list.winehq.org

Nikolay Sivov : comctl32/listview: Only apply horizontal offset when setting header position.
by Alexandre Julliard 24 Apr '20

24 Apr '20

Module: wine Branch: master Commit: d92906249fd4abd75d5d2ee2fba966855fac2e4c URL: https://source.winehq.org/git/wine.git/?a=commit;h=d92906249fd4abd75d5d2ee2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Apr 24 11:43:39 2020 +0300 comctl32/listview: Only apply horizontal offset when setting header position. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/listview.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 2dd25908db..f1f09d201e 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -11086,7 +11086,6 @@ static void LISTVIEW_UpdateSize(LISTVIEW_INFO *infoPtr) rect = infoPtr->rcList; rect.left += origin.x; - rect.top += origin.y; hl.prc = &rect; hl.pwpos = &wp;

1 0

Nikolay Sivov : dwrite: Use unsigned types for single-bit fields.
by Alexandre Julliard 24 Apr '20

24 Apr '20

Module: wine Branch: master Commit: 73a6470d866df837b4fee13bb4644a03956940f2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=73a6470d866df837b4fee13b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Apr 24 11:56:57 2020 +0300 dwrite: Use unsigned types for single-bit fields. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/font.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index bd969a8fa6..ee52c3e321 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -100,8 +100,8 @@ struct dwrite_font_data LOGFONTW lf; /* used to mark font as tested when scanning for simulation candidate */ - BOOL bold_sim_tested : 1; - BOOL oblique_sim_tested : 1; + unsigned int bold_sim_tested : 1; + unsigned int oblique_sim_tested : 1; }; struct dwrite_fontfamily_data @@ -114,9 +114,9 @@ struct dwrite_fontfamily_data size_t size; size_t count; - BOOL has_normal_face : 1; - BOOL has_oblique_face : 1; - BOOL has_italic_face : 1; + unsigned int has_normal_face : 1; + unsigned int has_oblique_face : 1; + unsigned int has_italic_face : 1; }; struct dwrite_fontcollection

1 0

Nikolay Sivov : mf: Handle null marker context for sample grabber stream.
by Alexandre Julliard 24 Apr '20

24 Apr '20

Module: wine Branch: master Commit: a12b5fe084510fab7f5b0e3a6665160becb59511 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a12b5fe084510fab7f5b0e3a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Apr 24 17:47:03 2020 +0300 mf: Handle null marker context for sample grabber stream. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/samplegrabber.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/mf/samplegrabber.c b/dlls/mf/samplegrabber.c index 21f89c0ad0..2167b5001e 100644 --- a/dlls/mf/samplegrabber.c +++ b/dlls/mf/samplegrabber.c @@ -446,7 +446,7 @@ static HRESULT stream_place_marker(struct sample_grabber *grabber, MFSTREAMSINK_ const PROPVARIANT *context_value) { struct scheduled_item *item; - HRESULT hr; + HRESULT hr = S_OK; if (list_empty(&grabber->items)) { @@ -460,7 +460,9 @@ static HRESULT stream_place_marker(struct sample_grabber *grabber, MFSTREAMSINK_ item->type = ITEM_TYPE_MARKER; item->u.marker.type = marker_type; list_init(&item->entry); - hr = PropVariantCopy(&item->u.marker.context, context_value); + PropVariantInit(&item->u.marker.context); + if (context_value) + hr = PropVariantCopy(&item->u.marker.context, context_value); if (SUCCEEDED(hr)) list_add_tail(&grabber->items, &item->entry); else

1 0

Nikolay Sivov : mf: Make sure to request another sample for sample grabber after current timed sample.
by Alexandre Julliard 24 Apr '20

24 Apr '20

Module: wine Branch: master Commit: 7948b2519250f7b6eb732ff2fa1d9526cc28696e URL: https://source.winehq.org/git/wine.git/?a=commit;h=7948b2519250f7b6eb732ff2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Apr 24 17:47:04 2020 +0300 mf: Make sure to request another sample for sample grabber after current timed sample. Based on patch by Derek Lesho. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/samplegrabber.c | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/dlls/mf/samplegrabber.c b/dlls/mf/samplegrabber.c index 2167b5001e..7d9fa78732 100644 --- a/dlls/mf/samplegrabber.c +++ b/dlls/mf/samplegrabber.c @@ -739,14 +739,22 @@ static HRESULT WINAPI sample_grabber_stream_timer_callback_Invoke(IMFAsyncCallba if (FAILED(hr = sample_grabber_report_sample(grabber, item->u.sample, &sample_delivered))) WARN("Failed to report a sample, hr %#x.\n", hr); stream_release_pending_item(item); - item = stream_get_next_item(grabber); - if (item && item->type == ITEM_TYPE_SAMPLE) + + /* Schedule next sample, skipping markers. */ + LIST_FOR_EACH_ENTRY(item, &grabber->items, struct scheduled_item, entry) { - if (FAILED(hr = stream_schedule_sample(grabber, item))) - WARN("Failed to schedule a sample, hr %#x.\n", hr); - sample_grabber_stream_request_sample(grabber); - item = NULL; + if (item->type == ITEM_TYPE_SAMPLE) + { + if (FAILED(hr = stream_schedule_sample(grabber, item))) + WARN("Failed to schedule a sample, hr %#x.\n", hr); + break; + } } + + if (sample_delivered) + sample_grabber_stream_request_sample(grabber); + + item = NULL; break; case ITEM_TYPE_MARKER: sample_grabber_stream_report_marker(grabber, &item->u.marker.context, S_OK);

1 0

Damjan Jovanovic : mshtml: Fix handling res protocol resource type ids without leading '#'.
by Alexandre Julliard 24 Apr '20

24 Apr '20

Module: wine Branch: master Commit: f9da9675f001ab5731212e8bd2b9d17c19adb16c URL: https://source.winehq.org/git/wine.git/?a=commit;h=f9da9675f001ab5731212e8b… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Fri Apr 24 18:37:27 2020 +0200 mshtml: Fix handling res protocol resource type ids without leading '#'. 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 | 5 +++++ dlls/mshtml/tests/protocol.c | 7 +++++++ 2 files changed, 12 insertions(+) diff --git a/dlls/mshtml/protocol.c b/dlls/mshtml/protocol.c index 0f06896c49..8677030c35 100644 --- a/dlls/mshtml/protocol.c +++ b/dlls/mshtml/protocol.c @@ -585,7 +585,12 @@ static HRESULT WINAPI ResProtocol_Start(IInternetProtocol *iface, LPCWSTR szUrl, *res_type++ = 0; if ((url_file = wcschr(res_type, '/'))) { + DWORD res_type_id; + WCHAR *endpoint; *url_file++ = 0; + res_type_id = wcstol(res_type, &endpoint, 10); + if(!*endpoint) + res_type = MAKEINTRESOURCEW(res_type_id); }else { url_file = res_type; res_type = (LPWSTR)RT_HTML; diff --git a/dlls/mshtml/tests/protocol.c b/dlls/mshtml/tests/protocol.c index ba767d21c6..75063f5ecf 100644 --- a/dlls/mshtml/tests/protocol.c +++ b/dlls/mshtml/tests/protocol.c @@ -596,6 +596,13 @@ static void test_res_protocol(void) IUnknown_Release(unk); + test_res_url("/blank.html"); + test_res_url("/123"); + test_res_url("/#23/blank.html"); + test_res_url("/#23/123"); + test_res_url("/23/blank.html"); + test_res_url("/23/123"); + test_res_url("/jstest.html"); test_res_url("/Test/res.html"); test_res_url("/test/dir/dir2/res.html");

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

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

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

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 : 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(a)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(a)DU?$char_traits(a)D@std@@@std@@IAEXPAD00(a)Z */ /* ?setp@?$basic_streambuf(a)DU?$char_traits(a)D@std@@@std@@IEAAXPEAD00(a)Z */

1 0