wine-commits August 2016

wine-commits@winehq.org

2 participants
777 discussions

Bruno Jesus : msacm32: Handle invalid source length in acmStreamPrepareHeader.
by Alexandre Julliard 29 Aug '16

29 Aug '16

Module: wine Branch: master Commit: d4fd43c97117c9135f5b032e2cc8c899b4b91de5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d4fd43c97117c9135f5b032e2… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Sun Aug 28 04:07:29 2016 -0300 msacm32: Handle invalid source length in acmStreamPrepareHeader. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msacm32/stream.c | 5 +++++ dlls/msacm32/tests/msacm.c | 12 ++++++++---- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/dlls/msacm32/stream.c b/dlls/msacm32/stream.c index b380b46..4b4976f 100644 --- a/dlls/msacm32/stream.c +++ b/dlls/msacm32/stream.c @@ -312,6 +312,11 @@ MMRESULT WINAPI acmStreamPrepareHeader(HACMSTREAM has, PACMSTREAMHEADER pash, WARN("invalid use of reserved parameter\n"); return MMSYSERR_INVALFLAG; } + if (pash->cbSrcLength < was->drvInst.pwfxSrc->nBlockAlign) { + WARN("source smaller than block align (%d < %d)\n", + pash->cbSrcLength, was->drvInst.pwfxSrc->nBlockAlign); + return pash->cbSrcLength ? ACMERR_NOTPOSSIBLE : MMSYSERR_INVALPARAM; + } /* Note: the ACMSTREAMHEADER and ACMDRVSTREAMHEADER structs are of same * size. some fields are private to msacm internals, and are exposed diff --git a/dlls/msacm32/tests/msacm.c b/dlls/msacm32/tests/msacm.c index 06e530b..5ec4717 100644 --- a/dlls/msacm32/tests/msacm.c +++ b/dlls/msacm32/tests/msacm.c @@ -591,14 +591,19 @@ static void test_prepareheader(void) hdr.cbDstLength = sizeof(pcm); mr = acmStreamPrepareHeader(has, &hdr, 0); -todo_wine ok(mr == MMSYSERR_INVALPARAM, "expected 0x0b, got 0x%x\n", mr); hdr.cbSrcLength = src->wfx.nBlockAlign - 1; /* less than block align */ mr = acmStreamPrepareHeader(has, &hdr, 0); -todo_wine ok(mr == ACMERR_NOTPOSSIBLE, "expected 0x200, got 0x%x\n", mr); + hdr.cbSrcLength = src->wfx.nBlockAlign + 1; /* more than block align */ + mr = acmStreamPrepareHeader(has, &hdr, 0); + ok(mr == MMSYSERR_NOERROR, "prepare failed: 0x%x\n", mr); + + mr = acmStreamUnprepareHeader(has, &hdr, 0); + ok(mr == MMSYSERR_NOERROR, "unprepare failed: 0x%x\n", mr); + hdr.cbSrcLength = src->wfx.nBlockAlign; mr = acmStreamPrepareHeader(has, &hdr, 1); /* invalid use of reserved parameter */ ok(mr == MMSYSERR_INVALFLAG, "expected 0x0a, got 0x%x\n", mr); @@ -674,7 +679,6 @@ todo_wine hdr.pbDst = pcm; hdr.cbDstLength = -4; mr = acmStreamPrepareHeader(has, &hdr, 0); -todo_wine { ok(mr == ACMERR_NOTPOSSIBLE, "expected 0x200, got 0x%x\n", mr); ok(hdr.fdwStatus == 0, "expected 0, got 0x%x\n", hdr.fdwStatus); @@ -687,7 +691,7 @@ todo_wine { mr = acmStreamUnprepareHeader(has, &hdr, 0); ok(mr == ACMERR_UNPREPARED, "expected 0x202, got 0x%x\n", mr); -} + /* Less output space than required */ memset(&hdr, 0, sizeof(hdr)); hdr.cbStruct = sizeof(hdr);

1 0

Bruno Jesus : msacm32: Handle invalid use of reserved parameter in acmStreamPrepareHeader.
by Alexandre Julliard 29 Aug '16

29 Aug '16

Module: wine Branch: master Commit: 61eda97fd583ee9794fe535626189247dea23549 URL: http://source.winehq.org/git/wine.git/?a=commit;h=61eda97fd583ee9794fe53562… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Sun Aug 28 04:07:28 2016 -0300 msacm32: Handle invalid use of reserved parameter in acmStreamPrepareHeader. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msacm32/stream.c | 10 ++++++---- dlls/msacm32/tests/msacm.c | 1 - 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/dlls/msacm32/stream.c b/dlls/msacm32/stream.c index bdfc3cc..b380b46 100644 --- a/dlls/msacm32/stream.c +++ b/dlls/msacm32/stream.c @@ -302,14 +302,16 @@ MMRESULT WINAPI acmStreamPrepareHeader(HACMSTREAM has, PACMSTREAMHEADER pash, if ((was = ACM_GetStream(has)) == NULL) { WARN("invalid handle\n"); - return MMSYSERR_INVALHANDLE; + return MMSYSERR_INVALHANDLE; } if (!pash || pash->cbStruct < sizeof(ACMSTREAMHEADER)) { WARN("invalid parameter\n"); - return MMSYSERR_INVALPARAM; + return MMSYSERR_INVALPARAM; + } + if (fdwPrepare) { + WARN("invalid use of reserved parameter\n"); + return MMSYSERR_INVALFLAG; } - if (fdwPrepare) - ret = MMSYSERR_INVALFLAG; /* Note: the ACMSTREAMHEADER and ACMDRVSTREAMHEADER structs are of same * size. some fields are private to msacm internals, and are exposed diff --git a/dlls/msacm32/tests/msacm.c b/dlls/msacm32/tests/msacm.c index 812a1bb..06e530b 100644 --- a/dlls/msacm32/tests/msacm.c +++ b/dlls/msacm32/tests/msacm.c @@ -601,7 +601,6 @@ todo_wine hdr.cbSrcLength = src->wfx.nBlockAlign; mr = acmStreamPrepareHeader(has, &hdr, 1); /* invalid use of reserved parameter */ -todo_wine ok(mr == MMSYSERR_INVALFLAG, "expected 0x0a, got 0x%x\n", mr); mr = acmStreamPrepareHeader(has, &hdr, 0);

1 0

Nikolay Sivov : oleaut32: Added proxy/stub for BindType.
by Alexandre Julliard 29 Aug '16

29 Aug '16

Module: wine Branch: master Commit: 2bc66dc073f920add93fa75b6c0c85226604e91b URL: http://source.winehq.org/git/wine.git/?a=commit;h=2bc66dc073f920add93fa75b6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Aug 29 15:38:56 2016 +0300 oleaut32: Added proxy/stub for BindType. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/usrmarshal.c | 36 +++++++++++++++++++++++++++--------- 1 file changed, 27 insertions(+), 9 deletions(-) diff --git a/dlls/oleaut32/usrmarshal.c b/dlls/oleaut32/usrmarshal.c index 61c8cc2..da524c8 100644 --- a/dlls/oleaut32/usrmarshal.c +++ b/dlls/oleaut32/usrmarshal.c @@ -1515,23 +1515,41 @@ HRESULT __RPC_STUB ITypeComp_Bind_Stub( HRESULT CALLBACK ITypeComp_BindType_Proxy( ITypeComp* This, - LPOLESTR szName, + LPOLESTR name, ULONG lHashVal, - ITypeInfo** ppTInfo, - ITypeComp** ppTComp) + ITypeInfo **ti, + ITypeComp **typecomp) { - FIXME("not implemented\n"); - return E_FAIL; + HRESULT hr; + + TRACE("(%p, %s, %#x, %p, %p)\n", This, debugstr_w(name), lHashVal, ti, typecomp); + + hr = ITypeComp_RemoteBindType_Proxy(This, name, lHashVal, ti); + if (hr == S_OK) + ITypeInfo_GetTypeComp(*ti, typecomp); + else if (typecomp) + *typecomp = NULL; + + return hr; } HRESULT __RPC_STUB ITypeComp_BindType_Stub( ITypeComp* This, - LPOLESTR szName, + LPOLESTR name, ULONG lHashVal, - ITypeInfo** ppTInfo) + ITypeInfo **ti) { - FIXME("not implemented\n"); - return E_FAIL; + ITypeComp *typecomp = NULL; + HRESULT hr; + + TRACE("(%p, %s, %#x, %p)\n", This, debugstr_w(name), lHashVal, ti); + + hr = ITypeComp_BindType(This, name, lHashVal, ti, &typecomp); + + if (typecomp) + ITypeComp_Release(typecomp); + + return hr; } /* ITypeInfo */

1 0

Józef Kucia : dxgi: Release target output when releasing swapchain.
by Alexandre Julliard 29 Aug '16

29 Aug '16

Module: wine Branch: master Commit: a1b075258594d1924c1591c89ad7ce86965fbd02 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a1b075258594d1924c1591c89… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Sun Aug 28 22:30:54 2016 +0200 dxgi: Release target output when releasing swapchain. It should never happen because applications are required to call SetFullscreenState() to exit fullscreen mode before releasing the swapchain. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxgi/swapchain.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index a759885..2b61327 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -78,6 +78,11 @@ static ULONG STDMETHODCALLTYPE dxgi_swapchain_Release(IDXGISwapChain *iface) if (!refcount) { IWineDXGIDevice *device = swapchain->device; + if (swapchain->target) + { + WARN("Releasing fullscreen swapchain.\n"); + IDXGIOutput_Release(swapchain->target); + } if (swapchain->factory) IDXGIFactory_Release(swapchain->factory); wined3d_mutex_lock();

1 0

Józef Kucia : dxgi: Update swapchain fullscreen state when state change is successful.
by Alexandre Julliard 29 Aug '16

29 Aug '16

Module: wine Branch: master Commit: 7c5f60f2d8bf71a357f3823a55efea116ef055f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c5f60f2d8bf71a357f3823a5… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Sun Aug 28 22:30:53 2016 +0200 dxgi: Update swapchain fullscreen state when state change is successful. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxgi/swapchain.c | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index 7b02b3e..a759885 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -229,17 +229,24 @@ static HRESULT STDMETHODCALLTYPE DECLSPEC_HOTPATCH dxgi_swapchain_SetFullscreenS } } - swapchain->fullscreen = fullscreen; - if (swapchain->target) - IDXGIOutput_Release(swapchain->target); - swapchain->target = target; - wined3d_mutex_lock(); wined3d_swapchain_get_desc(swapchain->wined3d_swapchain, &swapchain_desc); swapchain_desc.windowed = !fullscreen; hr = wined3d_swapchain_set_fullscreen(swapchain->wined3d_swapchain, &swapchain_desc, NULL); wined3d_mutex_unlock(); + if (SUCCEEDED(hr)) + { + swapchain->fullscreen = fullscreen; + if (swapchain->target) + IDXGIOutput_Release(swapchain->target); + swapchain->target = target; + } + else + { + IDXGIOutput_Release(target); + } + return hr; }

1 0

Alexandre Julliard : server: Implement Add/RemoveClipboardFormatListener.
by Alexandre Julliard 29 Aug '16

29 Aug '16

Module: wine Branch: master Commit: 35537b1d4549129067a7591337aa52784e36e168 URL: http://source.winehq.org/git/wine.git/?a=commit;h=35537b1d4549129067a759133… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Aug 29 20:55:52 2016 +0900 server: Implement Add/RemoveClipboardFormatListener. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/clipboard.c | 22 ++++++++-- dlls/user32/tests/clipboard.c | 16 +++---- include/wine/server_protocol.h | 32 +++++++++++++- include/winuser.h | 2 + server/clipboard.c | 95 +++++++++++++++++++++++++++++++++++++++++- server/protocol.def | 12 ++++++ server/request.h | 8 ++++ server/trace.c | 16 +++++++ 8 files changed, 189 insertions(+), 14 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=35537b1d4549129067a75…

1 0

Alexandre Julliard : server: Add some validation of clipboard window handles.
by Alexandre Julliard 29 Aug '16

29 Aug '16

Module: wine Branch: master Commit: 19d16a7cb1af82f0515afb10033d56d8ec7856d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=19d16a7cb1af82f0515afb100… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Aug 29 20:33:22 2016 +0900 server: Add some validation of clipboard window handles. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/clipboard.c | 2 +- dlls/user32/tests/clipboard.c | 49 ++++++++++++++++++++++++++++++++++++++++++- server/clipboard.c | 27 +++++++++++++++++++----- server/trace.c | 1 + 4 files changed, 72 insertions(+), 7 deletions(-) diff --git a/dlls/user32/clipboard.c b/dlls/user32/clipboard.c index 6d62dfd..fb10d27 100644 --- a/dlls/user32/clipboard.c +++ b/dlls/user32/clipboard.c @@ -147,7 +147,7 @@ BOOL WINAPI OpenClipboard( HWND hwnd ) SERVER_START_REQ( open_clipboard ) { req->window = wine_server_user_handle( hwnd ); - if ((ret = !wine_server_call( req ))) + if ((ret = !wine_server_call_err( req ))) { if (!reply->owner) bCBHasChanged = FALSE; } diff --git a/dlls/user32/tests/clipboard.c b/dlls/user32/tests/clipboard.c index f01af3d..b9b926d 100644 --- a/dlls/user32/tests/clipboard.c +++ b/dlls/user32/tests/clipboard.c @@ -26,6 +26,7 @@ #include "winuser.h" static BOOL (WINAPI *pAddClipboardFormatListener)(HWND hwnd); +static BOOL (WINAPI *pRemoveClipboardFormatListener)(HWND hwnd); static DWORD (WINAPI *pGetClipboardSequenceNumber)(void); static const BOOL is_win64 = sizeof(void *) > sizeof(int); @@ -565,7 +566,7 @@ static LRESULT CALLBACK clipboard_wnd_proc(HWND hwnd, UINT msg, WPARAM wp, LPARA static DWORD WINAPI clipboard_thread(void *param) { - HWND win = param; + HWND ret, win = param; BOOL r; HANDLE handle; UINT count, formats, old_seq = 0, seq; @@ -577,10 +578,36 @@ static DWORD WINAPI clipboard_thread(void *param) next_wnd = SetClipboardViewer(win); ok(GetLastError() == 0xdeadbeef, "GetLastError = %d\n", GetLastError()); LeaveCriticalSection(&clipboard_cs); + + SetLastError( 0xdeadbeef ); + ret = SetClipboardViewer( (HWND)0xdead ); + ok( !ret, "SetClipboardViewer succeeded\n" ); + ok( GetLastError() == ERROR_INVALID_WINDOW_HANDLE, "wrong error %u\n", GetLastError() ); + SetLastError( 0xdeadbeef ); + r = ChangeClipboardChain( win, (HWND)0xdead ); + ok( !r, "ChangeClipboardChain succeeded\n" ); + ok( GetLastError() == ERROR_INVALID_WINDOW_HANDLE, "wrong error %u\n", GetLastError() ); + SetLastError( 0xdeadbeef ); + r = ChangeClipboardChain( (HWND)0xdead, next_wnd ); + ok( !r, "ChangeClipboardChain succeeded\n" ); + ok( GetLastError() == ERROR_INVALID_WINDOW_HANDLE, "wrong error %u\n", GetLastError() ); + if (pAddClipboardFormatListener) { r = pAddClipboardFormatListener(win); ok( r, "AddClipboardFormatListener failed err %d\n", GetLastError()); + SetLastError( 0xdeadbeef ); + r = pAddClipboardFormatListener( win ); + todo_wine ok( !r, "AddClipboardFormatListener succeeded\n" ); + todo_wine ok( GetLastError() == ERROR_INVALID_PARAMETER, "wrong error %u\n", GetLastError() ); + SetLastError( 0xdeadbeef ); + r = pAddClipboardFormatListener( (HWND)0xdead ); + todo_wine ok( !r, "AddClipboardFormatListener succeeded\n" ); + todo_wine ok( GetLastError() == ERROR_INVALID_WINDOW_HANDLE, "wrong error %u\n", GetLastError() ); + r = pAddClipboardFormatListener( GetDesktopWindow() ); + ok( r, "AddClipboardFormatListener failed err %d\n", GetLastError()); + r = pRemoveClipboardFormatListener( GetDesktopWindow() ); + ok( r, "RemoveClipboardFormatListener failed err %d\n", GetLastError()); } if (pGetClipboardSequenceNumber) @@ -593,6 +620,11 @@ static DWORD WINAPI clipboard_thread(void *param) count = SendMessageA( win, WM_USER+2, 0, 0 ); ok( !count, "WM_CLIPBOARDUPDATE received\n" ); + SetLastError( 0xdeadbeef ); + r = OpenClipboard( (HWND)0xdead ); + ok( !r, "OpenClipboard succeeded\n" ); + ok( GetLastError() == ERROR_INVALID_WINDOW_HANDLE, "wrong error %u\n", GetLastError() ); + r = OpenClipboard(win); ok(r, "OpenClipboard failed: %d\n", GetLastError()); @@ -887,6 +919,20 @@ static DWORD WINAPI clipboard_thread(void *param) r = PostMessageA(win, WM_USER, 0, 0); ok(r, "PostMessage failed: %d\n", GetLastError()); + + if (pRemoveClipboardFormatListener) + { + r = pRemoveClipboardFormatListener(win); + ok( r, "RemoveClipboardFormatListener failed err %d\n", GetLastError()); + SetLastError( 0xdeadbeef ); + r = pRemoveClipboardFormatListener(win); + todo_wine ok( !r, "RemoveClipboardFormatListener succeeded\n" ); + todo_wine ok( GetLastError() == ERROR_INVALID_PARAMETER, "wrong error %u\n", GetLastError() ); + SetLastError( 0xdeadbeef ); + r = pRemoveClipboardFormatListener( (HWND)0xdead ); + todo_wine ok( !r, "RemoveClipboardFormatListener succeeded\n" ); + todo_wine ok( GetLastError() == ERROR_INVALID_WINDOW_HANDLE, "wrong error %u\n", GetLastError() ); + } return 0; } @@ -1238,6 +1284,7 @@ START_TEST(clipboard) argv0 = argv[0]; pAddClipboardFormatListener = (void *)GetProcAddress( mod, "AddClipboardFormatListener" ); + pRemoveClipboardFormatListener = (void *)GetProcAddress( mod, "RemoveClipboardFormatListener" ); pGetClipboardSequenceNumber = (void *)GetProcAddress( mod, "GetClipboardSequenceNumber" ); if (argc == 4 && !strcmp( argv[2], "set_clipboard_data" )) diff --git a/server/clipboard.c b/server/clipboard.c index 98df230..a1535b6 100644 --- a/server/clipboard.c +++ b/server/clipboard.c @@ -185,14 +185,18 @@ static int get_seqno( struct clipboard *clipboard ) DECL_HANDLER(open_clipboard) { struct clipboard *clipboard = get_process_clipboard(); - user_handle_t win; + user_handle_t win = req->window; if (!clipboard) return; - win = get_user_full_handle( req->window ); + if (win && !get_user_object_handle( &win, USER_WINDOW )) + { + set_win32_error( ERROR_INVALID_WINDOW_HANDLE ); + return; + } if (clipboard->open_thread && clipboard->open_win != win) { - set_error( STATUS_WAS_LOCKED ); + set_error( STATUS_INVALID_LOCK_SEQUENCE ); return; } clipboard->open_win = win; @@ -286,14 +290,27 @@ DECL_HANDLER(get_clipboard_info) DECL_HANDLER(set_clipboard_viewer) { struct clipboard *clipboard = get_process_clipboard(); + user_handle_t viewer = req->viewer; + user_handle_t previous = req->previous; if (!clipboard) return; + if (viewer && !get_user_object_handle( &viewer, USER_WINDOW )) + { + set_win32_error( ERROR_INVALID_WINDOW_HANDLE ); + return; + } + if (previous && !get_user_object_handle( &previous, USER_WINDOW )) + { + set_win32_error( ERROR_INVALID_WINDOW_HANDLE ); + return; + } + reply->old_viewer = clipboard->viewer; reply->owner = clipboard->owner_win; - if (!req->previous || clipboard->viewer == get_user_full_handle( req->previous )) - clipboard->viewer = get_user_full_handle( req->viewer ); + if (!previous || clipboard->viewer == previous) + clipboard->viewer = viewer; else set_error( STATUS_PENDING ); /* need to send message instead */ } diff --git a/server/trace.c b/server/trace.c index 6c9518e..0e8a9e8 100644 --- a/server/trace.c +++ b/server/trace.c @@ -5307,6 +5307,7 @@ static const struct { "INVALID_IMAGE_NOT_MZ", STATUS_INVALID_IMAGE_NOT_MZ }, { "INVALID_IMAGE_PROTECT", STATUS_INVALID_IMAGE_PROTECT }, { "INVALID_IMAGE_WIN_64", STATUS_INVALID_IMAGE_WIN_64 }, + { "INVALID_LOCK_SEQUENCE", STATUS_INVALID_LOCK_SEQUENCE }, { "INVALID_PARAMETER", STATUS_INVALID_PARAMETER }, { "INVALID_SECURITY_DESCR", STATUS_INVALID_SECURITY_DESCR }, { "IO_TIMEOUT", STATUS_IO_TIMEOUT },

1 0

Sebastian Lackner : winedevice: Avoid memory leak when driver cannot be unloaded.
by Alexandre Julliard 29 Aug '16

29 Aug '16

Module: wine Branch: master Commit: 09f9986ea1270ae43c9ff606592caf8c111259c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=09f9986ea1270ae43c9ff6065… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Mon Aug 29 13:50:34 2016 +0200 winedevice: Avoid memory leak when driver cannot be unloaded. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winedevice/device.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/programs/winedevice/device.c b/programs/winedevice/device.c index e1a38a4..5011e4f 100644 --- a/programs/winedevice/device.c +++ b/programs/winedevice/device.c @@ -478,7 +478,13 @@ static NTSTATUS create_driver( const WCHAR *driver_name ) static void wine_drivers_rb_destroy( struct wine_rb_entry *entry, void *context ) { - unload_driver( entry, TRUE ); + if (unload_driver( entry, TRUE ) != STATUS_SUCCESS) + { + struct wine_driver *driver = WINE_RB_ENTRY_VALUE( entry, struct wine_driver, entry ); + ObDereferenceObject( driver->driver_obj ); + CloseServiceHandle( (void *)driver->handle ); + HeapFree( GetProcessHeap(), 0, driver ); + } } static void WINAPI async_shutdown_drivers( PTP_CALLBACK_INSTANCE instance, void *context )

1 0

Austin English : apphelp: Add SdbGetAppPatchDir stub.
by Alexandre Julliard 29 Aug '16

29 Aug '16

Module: wine Branch: master Commit: 48091559b50c28b2a9fd9a6cbc390363d38d24b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=48091559b50c28b2a9fd9a6cb… Author: Austin English <austinenglish(a)gmail.com> Date: Sun Jun 26 21:10:08 2016 -0500 apphelp: Add SdbGetAppPatchDir stub. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/apphelp/apphelp.c | 6 ++++++ dlls/apphelp/apphelp.spec | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/apphelp/apphelp.c b/dlls/apphelp/apphelp.c index 64dcd87..0ff74aa 100644 --- a/dlls/apphelp/apphelp.c +++ b/dlls/apphelp/apphelp.c @@ -111,3 +111,9 @@ void WINAPI SdbCloseDatabase(PDB pdb) { FIXME("stub: %p\n", pdb); } + +void WINAPI SdbGetAppPatchDir(HSDB hsdb, WCHAR *path, DWORD size) +{ + FIXME("stub: %p %p %d\n", hsdb, path, size); + if (size && path) *path = 0; +} diff --git a/dlls/apphelp/apphelp.spec b/dlls/apphelp/apphelp.spec index a658e5c..2b0e0c6 100644 --- a/dlls/apphelp/apphelp.spec +++ b/dlls/apphelp/apphelp.spec @@ -49,7 +49,7 @@ @ stub SdbFreeFileInfo @ stub SdbFreeFlagInfo @ stub SdbGetAppCompatDataSize -@ stub SdbGetAppPatchDir +@ stdcall SdbGetAppPatchDir(long ptr long) @ stub SdbGetBinaryTagData @ stub SdbGetDatabaseID @ stub SdbGetDatabaseInformation

1 0

Henri Verbeet : d3d8: Use wined3d_resource_unmap() in d3d8_indexbuffer_Unlock().
by Alexandre Julliard 29 Aug '16

29 Aug '16

Module: wine Branch: master Commit: 743a47d3c4f5a809fc5de9f72a4a93d663e3171a URL: http://source.winehq.org/git/wine.git/?a=commit;h=743a47d3c4f5a809fc5de9f72… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Aug 29 10:49:05 2016 +0200 d3d8: Use wined3d_resource_unmap() in d3d8_indexbuffer_Unlock(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/buffer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3d8/buffer.c b/dlls/d3d8/buffer.c index 2404506..8116c1b 100644 --- a/dlls/d3d8/buffer.c +++ b/dlls/d3d8/buffer.c @@ -490,7 +490,7 @@ static HRESULT WINAPI d3d8_indexbuffer_Unlock(IDirect3DIndexBuffer8 *iface) TRACE("iface %p.\n", iface); wined3d_mutex_lock(); - wined3d_buffer_unmap(buffer->wined3d_buffer); + wined3d_resource_unmap(wined3d_buffer_get_resource(buffer->wined3d_buffer), 0); wined3d_mutex_unlock(); return D3D_OK;

1 0

← Newer
1
2
3
4
5
6
7
8
9
...
78
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 August 2016