wine-commits June 2020

wine-commits@winehq.org

1 participants
947 discussions

Zebediah Figura : strmbase: Release the allocator in IPin::Disconnect() (Valgrind).
by Alexandre Julliard 09 Jun '20

09 Jun '20

Module: wine Branch: master Commit: 05f319a39477ff675f14cd9ed6765ce3a5900e11 URL: https://source.winehq.org/git/wine.git/?a=commit;h=05f319a39477ff675f14cd9e… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Jun 8 18:59:41 2020 -0500 strmbase: Release the allocator in IPin::Disconnect() (Valgrind). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/videorenderer.c | 2 +- dlls/quartz/tests/vmr9.c | 2 +- dlls/strmbase/pin.c | 13 +++++++++++++ 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/dlls/quartz/tests/videorenderer.c b/dlls/quartz/tests/videorenderer.c index 7330859466..d603ea46ed 100644 --- a/dlls/quartz/tests/videorenderer.c +++ b/dlls/quartz/tests/videorenderer.c @@ -1443,7 +1443,7 @@ static void test_connect_pin(void) ok(hr == VFW_E_NOT_CONNECTED, "Got hr %#x.\n", hr); ref = IMemAllocator_Release(allocator); - todo_wine ok(!ref, "Got outstanding refcount %d.\n", ref); + ok(!ref, "Got outstanding refcount %d.\n", ref); IMemInputPin_Release(input); IPin_Release(pin); ref = IFilterGraph2_Release(graph); diff --git a/dlls/quartz/tests/vmr9.c b/dlls/quartz/tests/vmr9.c index 7dd6dbe1dd..14b6539a6b 100644 --- a/dlls/quartz/tests/vmr9.c +++ b/dlls/quartz/tests/vmr9.c @@ -3072,7 +3072,7 @@ static void test_renderless_formats(void) ok(hr == S_OK, "Test %u: Got hr %#x.\n", i, hr); hr = IMemInputPin_GetAllocator(input, &allocator); - todo_wine_if (i == 0) ok(hr == S_OK, "Test %u: Got hr %#x.\n", i, hr); + todo_wine ok(hr == S_OK, "Test %u: Got hr %#x.\n", i, hr); if (hr != S_OK) { test_allocator(input); diff --git a/dlls/strmbase/pin.c b/dlls/strmbase/pin.c index f08c6d0186..e5017c2ff9 100644 --- a/dlls/strmbase/pin.c +++ b/dlls/strmbase/pin.c @@ -594,6 +594,13 @@ static HRESULT WINAPI source_Disconnect(IPin *iface) IMemInputPin_Release(This->pMemInputPin); This->pMemInputPin = NULL; } + + if (This->pAllocator) + { + IMemAllocator_Release(This->pAllocator); + This->pAllocator = NULL; + } + if (This->pin.peer) { IPin_Release(This->pin.peer); @@ -930,6 +937,12 @@ static HRESULT WINAPI sink_Disconnect(IPin *iface) if (pin->pFuncsTable->sink_disconnect) pin->pFuncsTable->sink_disconnect(pin); + if (pin->pAllocator) + { + IMemAllocator_Release(pin->pAllocator); + pin->pAllocator = NULL; + } + IPin_Release(pin->pin.peer); pin->pin.peer = NULL; FreeMediaType(&pin->pin.mt);

1 0

Brendan Shanks : kernel32/tests: Add RegisterWaitForSingleObject() WT_EXECUTEINWAITTHREAD tests.
by Alexandre Julliard 09 Jun '20

09 Jun '20

Module: wine Branch: master Commit: 7ac949a10169cd26b2e62c081a1a49f9f5c67300 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7ac949a10169cd26b2e62c08… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Mon Jun 8 15:09:08 2020 -0700 kernel32/tests: Add RegisterWaitForSingleObject() WT_EXECUTEINWAITTHREAD tests. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47843 Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/thread.c | 67 +++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 66 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/thread.c b/dlls/kernel32/tests/thread.c index ebc42ca072..b91d279e32 100644 --- a/dlls/kernel32/tests/thread.c +++ b/dlls/kernel32/tests/thread.c @@ -1334,12 +1334,33 @@ static void CALLBACK timeout_function(PVOID p, BOOLEAN TimerOrWaitFired) ok(TimerOrWaitFired, "wait should have timed out\n"); } +struct waitthread_test_param +{ + HANDLE trigger_event; + HANDLE wait_event; + HANDLE complete_event; +}; + +static void CALLBACK waitthread_test_function(PVOID p, BOOLEAN TimerOrWaitFired) +{ + struct waitthread_test_param *param = p; + DWORD ret; + + SetEvent(param->trigger_event); + ret = WaitForSingleObject(param->wait_event, 100); + todo_wine + ok(ret == WAIT_TIMEOUT, "wait should have timed out\n"); + SetEvent(param->complete_event); +} + static void test_RegisterWaitForSingleObject(void) { BOOL ret; - HANDLE wait_handle; + HANDLE wait_handle, wait_handle2; HANDLE handle; HANDLE complete_event; + HANDLE waitthread_trigger_event, waitthread_wait_event; + struct waitthread_test_param param; if (!pRegisterWaitForSingleObject || !pUnregisterWait) { @@ -1390,6 +1411,50 @@ static void test_RegisterWaitForSingleObject(void) ok(GetLastError() == ERROR_INVALID_HANDLE, "Expected ERROR_INVALID_HANDLE, got %d\n", GetLastError()); + /* test WT_EXECUTEINWAITTHREAD */ + + SetEvent(handle); + ret = pRegisterWaitForSingleObject(&wait_handle, handle, signaled_function, complete_event, INFINITE, WT_EXECUTEONLYONCE | WT_EXECUTEINWAITTHREAD); + ok(ret, "RegisterWaitForSingleObject failed with error %d\n", GetLastError()); + + WaitForSingleObject(complete_event, INFINITE); + /* give worker thread chance to complete */ + Sleep(100); + + ret = pUnregisterWait(wait_handle); + ok(ret, "UnregisterWait failed with error %d\n", GetLastError()); + + /* test multiple waits with WT_EXECUTEINWAITTHREAD. + * Windows puts multiple waits on the same wait thread, and using WT_EXECUTEINWAITTHREAD causes the callbacks to run serially. + */ + + SetEvent(handle); + waitthread_trigger_event = CreateEventW(NULL, FALSE, FALSE, NULL); + waitthread_wait_event = CreateEventW(NULL, FALSE, FALSE, NULL); + + param.trigger_event = waitthread_trigger_event; + param.wait_event = waitthread_wait_event; + param.complete_event = complete_event; + + ret = pRegisterWaitForSingleObject(&wait_handle2, waitthread_trigger_event, signaled_function, waitthread_wait_event, + INFINITE, WT_EXECUTEONLYONCE | WT_EXECUTEINWAITTHREAD); + ok(ret, "RegisterWaitForSingleObject failed with error %d\n", GetLastError()); + + ret = pRegisterWaitForSingleObject(&wait_handle, handle, waitthread_test_function, &param, INFINITE, WT_EXECUTEONLYONCE | WT_EXECUTEINWAITTHREAD); + ok(ret, "RegisterWaitForSingleObject failed with error %d\n", GetLastError()); + + WaitForSingleObject(complete_event, INFINITE); + /* give worker thread chance to complete */ + Sleep(100); + + ret = pUnregisterWait(wait_handle); + ok(ret, "UnregisterWait failed with error %d\n", GetLastError()); + + ret = pUnregisterWait(wait_handle2); + ok(ret, "UnregisterWait failed with error %d\n", GetLastError()); + + CloseHandle(waitthread_wait_event); + CloseHandle(waitthread_trigger_event); CloseHandle(complete_event); CloseHandle(handle); }

1 0

Brendan Shanks : kernel32/tests: Fix handle leak.
by Alexandre Julliard 09 Jun '20

09 Jun '20

Module: wine Branch: master Commit: 08abbf091b613cfa2e68683380e19cc125c5a368 URL: https://source.winehq.org/git/wine.git/?a=commit;h=08abbf091b613cfa2e686833… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Mon Jun 8 15:09:07 2020 -0700 kernel32/tests: Fix handle leak. Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/thread.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/kernel32/tests/thread.c b/dlls/kernel32/tests/thread.c index a9869863b4..ebc42ca072 100644 --- a/dlls/kernel32/tests/thread.c +++ b/dlls/kernel32/tests/thread.c @@ -1389,6 +1389,9 @@ static void test_RegisterWaitForSingleObject(void) ok(!ret, "Expected UnregisterWait to fail\n"); ok(GetLastError() == ERROR_INVALID_HANDLE, "Expected ERROR_INVALID_HANDLE, got %d\n", GetLastError()); + + CloseHandle(complete_event); + CloseHandle(handle); } static DWORD LS_main;

1 0

Zhipeng Zhao : ole32: Deal with WM_RENDERFORMAT if the clipboard is empty.
by Alexandre Julliard 09 Jun '20

09 Jun '20

Module: wine Branch: master Commit: 065b56e4e1c0c67862345496cfb1a1df53f8ee95 URL: https://source.winehq.org/git/wine.git/?a=commit;h=065b56e4e1c0c67862345496… Author: Zhipeng Zhao <zhaozhipeng(a)uniontech.com> Date: Tue Jun 9 09:18:39 2020 +0100 ole32: Deal with WM_RENDERFORMAT if the clipboard is empty. Signed-off-by: Zhipeng Zhao <zhaozhipeng(a)uniontech.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/clipboard.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/ole32/clipboard.c b/dlls/ole32/clipboard.c index 9df37750a3..cb6770c05b 100644 --- a/dlls/ole32/clipboard.c +++ b/dlls/ole32/clipboard.c @@ -2066,6 +2066,8 @@ static LRESULT CALLBACK clipbrd_wndproc(HWND hwnd, UINT message, WPARAM wparam, ole_priv_data_entry *entry; TRACE("(): WM_RENDERFORMAT(cfFormat=%x)\n", cf); + + if (!clipbrd || !clipbrd->cached_enum) break; entry = find_format_in_list(clipbrd->cached_enum->entries, clipbrd->cached_enum->count, cf); if(entry)

1 0

Anton Baskanov : winegstreamer: Commit allocator before pausing the stream.
by Alexandre Julliard 09 Jun '20

09 Jun '20

Module: wine Branch: master Commit: a18bc50f2f38b9ab771b4e6ef11ccede4f0814cd URL: https://source.winehq.org/git/wine.git/?a=commit;h=a18bc50f2f38b9ab771b4e6e… Author: Anton Baskanov <baskanov(a)gmail.com> Date: Tue Jun 9 01:00:55 2020 +0700 winegstreamer: Commit allocator before pausing the stream. Signed-off-by: Anton Baskanov <baskanov(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 299a7ddf56..7c38e421f9 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -1391,6 +1391,15 @@ static HRESULT gstdemux_init_stream(struct strmbase_filter *iface) if (!filter->container) return VFW_E_NOT_CONNECTED; + for (i = 0; i < filter->source_count; ++i) + { + if (SUCCEEDED(pin_hr = BaseOutputPinImpl_Active(&filter->sources[i]->pin))) + hr = pin_hr; + } + + if (FAILED(hr)) + return hr; + if (filter->no_more_pads_event) ResetEvent(filter->no_more_pads_event); @@ -1422,11 +1431,6 @@ static HRESULT gstdemux_init_stream(struct strmbase_filter *iface) stop_type, seeking->llStop * 100)); } - for (i = 0; i < filter->source_count; ++i) - { - if (SUCCEEDED(pin_hr = BaseOutputPinImpl_Active(&filter->sources[i]->pin))) - hr = pin_hr; - } return hr; }

1 0

Zebediah Figura : evr: Free type libraries on process detach (Valgrind).
by Alexandre Julliard 08 Jun '20

08 Jun '20

Module: wine Branch: master Commit: 17529582402ebe27ef975fc7dcb8353f4f95e629 URL: https://source.winehq.org/git/wine.git/?a=commit;h=17529582402ebe27ef975fc7… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Jun 7 17:23:32 2020 -0500 evr: Free type libraries on process detach (Valgrind). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/evr.c | 1 - dlls/evr/evr_private.h | 1 + dlls/evr/main.c | 19 +++++++++---------- 3 files changed, 10 insertions(+), 11 deletions(-) diff --git a/dlls/evr/evr.c b/dlls/evr/evr.c index 911075de33..001839026b 100644 --- a/dlls/evr/evr.c +++ b/dlls/evr/evr.c @@ -24,7 +24,6 @@ #include "evr_private.h" #include "d3d9.h" -#include "wine/strmbase.h" #include "initguid.h" #include "dxva2api.h" diff --git a/dlls/evr/evr_private.h b/dlls/evr/evr_private.h index 65dcbb7a9b..ad47bd28b7 100644 --- a/dlls/evr/evr_private.h +++ b/dlls/evr/evr_private.h @@ -21,6 +21,7 @@ #include "dshow.h" #include "evr.h" +#include "wine/strmbase.h" HRESULT evr_filter_create(IUnknown *outer_unk, void **ppv) DECLSPEC_HIDDEN; diff --git a/dlls/evr/main.c b/dlls/evr/main.c index 000ed7c55b..921e63535f 100644 --- a/dlls/evr/main.c +++ b/dlls/evr/main.c @@ -36,18 +36,17 @@ static HINSTANCE instance_evr; BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID reserved) { - TRACE("(%p, %d, %p)\n", instance, reason, reserved); - - switch (reason) + if (reason == DLL_WINE_PREATTACH) + return FALSE; /* prefer native version */ + else if (reason == DLL_PROCESS_ATTACH) { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ - case DLL_PROCESS_ATTACH: - instance_evr = instance; - DisableThreadLibraryCalls(instance); - break; + instance_evr = instance; + DisableThreadLibraryCalls(instance); + } + else if (reason == DLL_PROCESS_DETACH && !reserved) + { + strmbase_release_typelibs(); } - return TRUE; }

1 0

Zebediah Figura : qasf: Free type libraries on process detach (Valgrind).
by Alexandre Julliard 08 Jun '20

08 Jun '20

Module: wine Branch: master Commit: b6c96cf763b2994b9b71d8a53988749d7dea1914 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b6c96cf763b2994b9b71d8a5… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Jun 7 17:23:31 2020 -0500 qasf: Free type libraries on process detach (Valgrind). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qasf/qasf_main.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/qasf/qasf_main.c b/dlls/qasf/qasf_main.c index 2e65b693fa..ac671d3919 100644 --- a/dlls/qasf/qasf_main.c +++ b/dlls/qasf/qasf_main.c @@ -108,6 +108,10 @@ BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, void *reserved) DisableThreadLibraryCalls(instance); qasf_instance = instance; } + else if (reason == DLL_PROCESS_DETACH && !reserved) + { + strmbase_release_typelibs(); + } return TRUE; }

1 0

Zebediah Figura : qedit: Free type libraries on process detach (Valgrind).
by Alexandre Julliard 08 Jun '20

08 Jun '20

Module: wine Branch: master Commit: 0e6fc4d81cceb46af52e0b83122ce5f6dd1b6961 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0e6fc4d81cceb46af52e0b83… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Jun 7 17:23:30 2020 -0500 qedit: Free type libraries on process detach (Valgrind). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qedit/main.c | 21 ++++++++++++--------- dlls/qedit/mediadet.c | 1 - dlls/qedit/qedit_private.h | 1 + dlls/qedit/samplegrabber.c | 1 - 4 files changed, 13 insertions(+), 11 deletions(-) diff --git a/dlls/qedit/main.c b/dlls/qedit/main.c index f4d1bbb061..a4a4f5ec38 100644 --- a/dlls/qedit/main.c +++ b/dlls/qedit/main.c @@ -23,15 +23,18 @@ WINE_DEFAULT_DEBUG_CHANNEL(qedit); -static HINSTANCE instance; +static HINSTANCE qedit_instance; -BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) +BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, void *reserved) { - switch(fdwReason) { - case DLL_PROCESS_ATTACH: - instance = hInstDLL; - DisableThreadLibraryCalls(hInstDLL); - break; + if (reason == DLL_PROCESS_ATTACH) + { + qedit_instance = instance; + DisableThreadLibraryCalls(instance); + } + else if (reason == DLL_PROCESS_DETACH && !reserved) + { + strmbase_release_typelibs(); } return TRUE; } @@ -243,7 +246,7 @@ HRESULT WINAPI DllRegisterServer(void) IFilterMapper2 *mapper; HRESULT hr; - if (FAILED(hr = __wine_register_resources( instance ))) + if (FAILED(hr = __wine_register_resources(qedit_instance))) return hr; if (FAILED(hr = CoCreateInstance(&CLSID_FilterMapper2, NULL, CLSCTX_INPROC_SERVER, @@ -267,7 +270,7 @@ HRESULT WINAPI DllUnregisterServer(void) IFilterMapper2 *mapper; HRESULT hr; - if (FAILED(hr = __wine_unregister_resources( instance ))) + if (FAILED(hr = __wine_unregister_resources(qedit_instance))) return hr; if (FAILED(hr = CoCreateInstance(&CLSID_FilterMapper2, NULL, CLSCTX_INPROC_SERVER, diff --git a/dlls/qedit/mediadet.c b/dlls/qedit/mediadet.c index d32679b6bb..e1defaa9a6 100644 --- a/dlls/qedit/mediadet.c +++ b/dlls/qedit/mediadet.c @@ -28,7 +28,6 @@ #include "ole2.h" #include "qedit_private.h" -#include "wine/strmbase.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(qedit); diff --git a/dlls/qedit/qedit_private.h b/dlls/qedit/qedit_private.h index 7011c9f70d..0c0655084d 100644 --- a/dlls/qedit/qedit_private.h +++ b/dlls/qedit/qedit_private.h @@ -32,6 +32,7 @@ #include "winuser.h" #include "dshow.h" #include "qedit.h" +#include "wine/strmbase.h" HRESULT timeline_create(IUnknown *outer, IUnknown **out) DECLSPEC_HIDDEN; HRESULT media_detector_create(IUnknown *outer, IUnknown **out) DECLSPEC_HIDDEN; diff --git a/dlls/qedit/samplegrabber.c b/dlls/qedit/samplegrabber.c index bd8480df48..1619111f95 100644 --- a/dlls/qedit/samplegrabber.c +++ b/dlls/qedit/samplegrabber.c @@ -29,7 +29,6 @@ #include "qedit_private.h" #include "wine/debug.h" -#include "wine/strmbase.h" WINE_DEFAULT_DEBUG_CHANNEL(qedit);

1 0

Zebediah Figura : quartz: Free type libraries on process detach (Valgrind).
by Alexandre Julliard 08 Jun '20

08 Jun '20

Module: wine Branch: master Commit: 4beda167575f24eaed7da4ee3cbbc92f6bea6339 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4beda167575f24eaed7da4ee… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Jun 7 17:23:29 2020 -0500 quartz: Free type libraries on process detach (Valgrind). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/main.c | 5 ++++- dlls/strmbase/dispatch.c | 13 +++++++++++++ include/wine/strmbase.h | 1 + 3 files changed, 18 insertions(+), 1 deletion(-) diff --git a/dlls/quartz/main.c b/dlls/quartz/main.c index 4acb4f1a79..303cc30a93 100644 --- a/dlls/quartz/main.c +++ b/dlls/quartz/main.c @@ -31,8 +31,11 @@ LONG object_locks = 0; BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, void *reserved) { - if (reason == DLL_PROCESS_DETACH) + if (reason == DLL_PROCESS_DETACH && !reserved) + { video_window_unregister_class(); + strmbase_release_typelibs(); + } return QUARTZ_DllMain(instance, reason, reserved); } diff --git a/dlls/strmbase/dispatch.c b/dlls/strmbase/dispatch.c index 25573fa1a2..de817f20c0 100644 --- a/dlls/strmbase/dispatch.c +++ b/dlls/strmbase/dispatch.c @@ -68,3 +68,16 @@ HRESULT strmbase_get_typeinfo(enum strmbase_type_id tid, ITypeInfo **ret) ITypeInfo_AddRef(*ret = control_typeinfo[tid]); return S_OK; } + +void strmbase_release_typelibs(void) +{ + unsigned int i; + + for (i = 0; i < ARRAY_SIZE(control_typeinfo); ++i) + { + if (control_typeinfo[i]) + ITypeInfo_Release(control_typeinfo[i]); + } + if (control_typelib) + ITypeLib_Release(control_typelib); +} diff --git a/include/wine/strmbase.h b/include/wine/strmbase.h index 6789957e50..02a5469de1 100644 --- a/include/wine/strmbase.h +++ b/include/wine/strmbase.h @@ -252,6 +252,7 @@ enum strmbase_type_id }; HRESULT strmbase_get_typeinfo(enum strmbase_type_id tid, ITypeInfo **typeinfo); +void strmbase_release_typelibs(void); struct strmbase_passthrough {

1 0

Vijay Kiran Kamuju : include: Add wownt16.h.
by Alexandre Julliard 08 Jun '20

08 Jun '20

Module: wine Branch: master Commit: 9e87c6826eb5c0fe43e52e5a0631fe7a09c6c55b URL: https://source.winehq.org/git/wine.git/?a=commit;h=9e87c6826eb5c0fe43e52e5a… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Sun Jun 7 23:03:22 2020 +0200 include: Add wownt16.h. Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/krnl386.exe16/thunk.c | 5 +---- include/Makefile.in | 1 + include/wownt16.h | 27 +++++++++++++++++++++++++++ 3 files changed, 29 insertions(+), 4 deletions(-) diff --git a/dlls/krnl386.exe16/thunk.c b/dlls/krnl386.exe16/thunk.c index 78925f594b..e913a08f88 100644 --- a/dlls/krnl386.exe16/thunk.c +++ b/dlls/krnl386.exe16/thunk.c @@ -29,6 +29,7 @@ #include "winbase.h" #include "winerror.h" #include "winternl.h" +#include "wownt16.h" #include "wownt32.h" #include "wine/winbase16.h" @@ -2402,10 +2403,6 @@ DWORD WINAPI FreeLibrary32W16( DWORD hLibModule ) return (DWORD)retv; } - -#define CPEX_DEST_STDCALL 0x00000000 -#define CPEX_DEST_CDECL 0x80000000 - /********************************************************************** * WOW_CallProc32W */ diff --git a/include/Makefile.in b/include/Makefile.in index a4563920f6..9f70e72b4c 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -781,6 +781,7 @@ SOURCES = \ wmsdk.h \ wmsdkidl.idl \ wnaspi32.h \ + wownt16.h \ wownt32.h \ wpcapi.idl \ ws2def.h \ diff --git a/include/wownt16.h b/include/wownt16.h new file mode 100644 index 0000000000..d477623127 --- /dev/null +++ b/include/wownt16.h @@ -0,0 +1,27 @@ +/* + * WOW16 Generic Thunk API + * + * Copyright (C) 2020 Vijay Kiran Kamuju + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef _WOWNT16_H_ +#define _WOWNT16_H_ + +#define CPEX_DEST_STDCALL 0x00000000 +#define CPEX_DEST_CDECL 0x80000000 + +#endif /* _WOWNT16_H_ */

1 0

← Newer
1
...
58
59
60
61
62
63
64
...
95
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 June 2020