August 2016 - Wine-commits - list.winehq.org

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

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: Use a helper to validate stream pointers.
by Alexandre Julliard 29 Aug '16

29 Aug '16

Module: wine Branch: master Commit: 37f159e1cb26c3f3a666f76f76c1f8809538bbe3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=37f159e1cb26c3f3a666f76f7… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Sun Aug 28 04:07:30 2016 -0300 msacm32: Use a helper to validate stream pointers. 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 | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/dlls/msacm32/stream.c b/dlls/msacm32/stream.c index 4b4976f..6e81151 100644 --- a/dlls/msacm32/stream.c +++ b/dlls/msacm32/stream.c @@ -50,6 +50,15 @@ static PWINE_ACMSTREAM ACM_GetStream(HACMSTREAM has) return (PWINE_ACMSTREAM)has; } +static BOOL ACM_ValidatePointers(PACMDRVSTREAMHEADER padsh) +{ + /* check that pointers have not been modified */ + return !(padsh->pbPreparedSrc != padsh->pbSrc || + padsh->cbPreparedSrcLength < padsh->cbSrcLength || + padsh->pbPreparedDst != padsh->pbDst || + padsh->cbPreparedDstLength < padsh->cbDstLength); +} + /*********************************************************************** * acmStreamClose (MSACM32.@) */ @@ -108,13 +117,9 @@ MMRESULT WINAPI acmStreamConvert(HACMSTREAM has, PACMSTREAMHEADER pash, */ padsh = (PACMDRVSTREAMHEADER)pash; - /* check that pointers have not been modified */ - if (padsh->pbPreparedSrc != padsh->pbSrc || - padsh->cbPreparedSrcLength < padsh->cbSrcLength || - padsh->pbPreparedDst != padsh->pbDst || - padsh->cbPreparedDstLength < padsh->cbDstLength) { + if (!ACM_ValidatePointers(padsh)) { WARN("invalid parameter\n"); - return MMSYSERR_INVALPARAM; + return MMSYSERR_INVALPARAM; } padsh->fdwConvert = fdwConvert; @@ -467,13 +472,9 @@ MMRESULT WINAPI acmStreamUnprepareHeader(HACMSTREAM has, PACMSTREAMHEADER pash, */ padsh = (PACMDRVSTREAMHEADER)pash; - /* check that pointers have not been modified */ - if (padsh->pbPreparedSrc != padsh->pbSrc || - padsh->cbPreparedSrcLength < padsh->cbSrcLength || - padsh->pbPreparedDst != padsh->pbDst || - padsh->cbPreparedDstLength < padsh->cbDstLength) { + if (!ACM_ValidatePointers(padsh)) { WARN("invalid parameter\n"); - return MMSYSERR_INVALPARAM; + return MMSYSERR_INVALPARAM; } padsh->fdwConvert = fdwUnprepare;

1 0

Hugh McMaster : regedit: Process registry input from stdin.
by Alexandre Julliard 29 Aug '16

29 Aug '16

Module: wine Branch: master Commit: d8fd4bde382f7bba9d876dab6275e9706b7e3c5e URL: http://source.winehq.org/git/wine.git/?a=commit;h=d8fd4bde382f7bba9d876dab6… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Aug 29 12:06:08 2016 +0000 regedit: Process registry input from stdin. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/regedit.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/programs/regedit/regedit.c b/programs/regedit/regedit.c index c0a1eab..7b2ddaef 100644 --- a/programs/regedit/regedit.c +++ b/programs/regedit/regedit.c @@ -93,6 +93,7 @@ static void PerformRegAction(REGEDIT_ACTION action, WCHAR **argv, int *i) case ACTION_ADD: { WCHAR *filename = argv[*i]; WCHAR hyphen[] = {'-',0}; + WCHAR *realname = NULL; FILE *reg_file; if (!strcmpW(filename, hyphen)) @@ -100,7 +101,6 @@ static void PerformRegAction(REGEDIT_ACTION action, WCHAR **argv, int *i) else { int size; - WCHAR *realname = NULL; WCHAR rb_mode[] = {'r','b',0}; size = SearchPathW(NULL, filename, NULL, 0, NULL, NULL); @@ -124,12 +124,12 @@ static void PerformRegAction(REGEDIT_ACTION action, WCHAR **argv, int *i) HeapFree(GetProcessHeap(), 0, realname); return; } - import_registry_file(reg_file); - if (realname) - { - HeapFree(GetProcessHeap(),0,realname); - fclose(reg_file); - } + } + import_registry_file(reg_file); + if (realname) + { + HeapFree(GetProcessHeap(), 0, realname); + fclose(reg_file); } break; }

1 0

Sebastian Lackner : shell32: Remove some unused static inline functions.
by Alexandre Julliard 29 Aug '16

29 Aug '16

Module: wine Branch: master Commit: af468590f7d312d759e14dc704395f27cf58e769 URL: http://source.winehq.org/git/wine.git/?a=commit;h=af468590f7d312d759e14dc70… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Mon Aug 29 14:06:57 2016 +0200 shell32: Remove some unused static inline functions. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shell32_main.h | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/dlls/shell32/shell32_main.h b/dlls/shell32/shell32_main.h index 0178e10..4b8c7cb 100644 --- a/dlls/shell32/shell32_main.h +++ b/dlls/shell32/shell32_main.h @@ -161,24 +161,6 @@ static inline BOOL SHELL_OsIsUnicode(void) SHFree(*ptr); \ *ptr = NULL; \ }; -static inline void __SHCloneStrA(char ** target,const char * source) -{ - *target = SHAlloc(strlen(source)+1); - strcpy(*target, source); -} - -static inline void __SHCloneStrWtoA(char ** target, const WCHAR * source) -{ - int len = WideCharToMultiByte(CP_ACP, 0, source, -1, NULL, 0, NULL, NULL); - *target = SHAlloc(len); - WideCharToMultiByte(CP_ACP, 0, source, -1, *target, len, NULL, NULL); -} - -static inline void __SHCloneStrW(WCHAR ** target, const WCHAR * source) -{ - *target = SHAlloc( (lstrlenW(source)+1) * sizeof(WCHAR) ); - lstrcpyW(*target, source); -} static inline WCHAR * __SHCloneStrAtoW(WCHAR ** target, const char * source) {

1 0

Sebastian Lackner : shell32: Remove __SHFreeAndNil macro.
by Alexandre Julliard 29 Aug '16

29 Aug '16

Module: wine Branch: master Commit: d3cb5c24a5ebbc7dcfb181a56f0f55cf3d1a1c30 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d3cb5c24a5ebbc7dcfb181a56… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Mon Aug 29 14:07:22 2016 +0200 shell32: Remove __SHFreeAndNil macro. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shell32_main.h | 6 ------ dlls/shell32/shfldr_fs.c | 10 ++++++++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/shell32/shell32_main.h b/dlls/shell32/shell32_main.h index 4b8c7cb..8cd1318 100644 --- a/dlls/shell32/shell32_main.h +++ b/dlls/shell32/shell32_main.h @@ -156,12 +156,6 @@ static inline BOOL SHELL_OsIsUnicode(void) return !(GetVersion() & 0x80000000); } -#define __SHFreeAndNil(ptr) \ - {\ - SHFree(*ptr); \ - *ptr = NULL; \ - }; - static inline WCHAR * __SHCloneStrAtoW(WCHAR ** target, const char * source) { int len = MultiByteToWideChar(CP_ACP, 0, source, -1, NULL, 0); diff --git a/dlls/shell32/shfldr_fs.c b/dlls/shell32/shfldr_fs.c index d8bcb4c..2f49eb2 100644 --- a/dlls/shell32/shfldr_fs.c +++ b/dlls/shell32/shfldr_fs.c @@ -1482,9 +1482,15 @@ IFSFldr_PersistFolder3_InitializeEx (IPersistFolder3 * iface, pdump (ppfti->pidlTargetFolder); if (This->pidlRoot) - __SHFreeAndNil (&This->pidlRoot); /* free the old */ + { + SHFree(This->pidlRoot); + This->pidlRoot = NULL; + } if (This->sPathTarget) - __SHFreeAndNil (&This->sPathTarget); + { + SHFree(This->sPathTarget); + This->sPathTarget = NULL; + } /* * Root path and pidl

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

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

Nikolay Sivov : winegstreamer: Remove some casts that are not needed.
by Alexandre Julliard 29 Aug '16

29 Aug '16

Module: wine Branch: master Commit: 6dc6f7fe4d1b7f7b40500bb6055e9cc53d76dde8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6dc6f7fe4d1b7f7b40500bb60… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Aug 25 23:16:09 2016 +0300 winegstreamer: Remove some casts that are not needed. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 67 +++++++++++++++++++++---------------------- 1 file changed, 33 insertions(+), 34 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index f257202..5db99c8 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -788,7 +788,7 @@ static void init_new_decoded_pad(GstElement *bin, GstPad *pad, GSTImpl *This) TRACE("%p %p %p\n", This, bin, pad); piOutput.dir = PINDIR_OUTPUT; - piOutput.pFilter = (IBaseFilter *)This; + piOutput.pFilter = &This->filter.IBaseFilter_iface; name = gst_pad_get_name(pad); MultiByteToWideChar(CP_UNIXCP, 0, name, -1, piOutput.achName, sizeof(piOutput.achName) / sizeof(piOutput.achName[0]) - 1); TRACE("Name: %s\n", name); @@ -1193,20 +1193,20 @@ static inline GSTOutPin *impl_from_IMediaSeeking( IMediaSeeking *iface ) static IPin* WINAPI GST_GetPin(BaseFilter *iface, int pos) { GSTImpl *This = (GSTImpl *)iface; + IPin *pin; + TRACE("%p: Asking for pos %x\n", This, pos); if (pos > This->cStreams || pos < 0) return NULL; + if (!pos) - { - IPin_AddRef((IPin*)&This->pInputPin); - return (IPin*)&This->pInputPin; - } + pin = &This->pInputPin.pin.IPin_iface; else - { - IPin_AddRef((IPin*)This->ppPins[pos - 1]); - return (IPin*)This->ppPins[pos - 1]; - } + pin = &This->ppPins[pos - 1]->pin.pin.IPin_iface; + + IPin_AddRef(pin); + return pin; } static LONG WINAPI GST_GetPinCount(BaseFilter *iface) @@ -1238,13 +1238,13 @@ IUnknown * CALLBACK Gstreamer_Splitter_create(IUnknown *pUnkOuter, HRESULT *phr) mark_wine_thread(); This = CoTaskMemAlloc(sizeof(*This)); - obj = (IUnknown*)This; if (!This) { *phr = E_OUTOFMEMORY; return NULL; } + obj = (IUnknown*)&This->filter.IBaseFilter_iface; BaseFilter_Init(&This->filter, &GST_Vtbl, &CLSID_Gstreamer_Splitter, (DWORD_PTR)(__FILE__ ": GSTImpl.csFilter"), &BaseFuncTable); This->cStreams = 0; @@ -1255,7 +1255,7 @@ IUnknown * CALLBACK Gstreamer_Splitter_create(IUnknown *pUnkOuter, HRESULT *phr) piInput = &This->pInputPin.pin.pinInfo; piInput->dir = PINDIR_INPUT; - piInput->pFilter = (IBaseFilter *)This; + piInput->pFilter = &This->filter.IBaseFilter_iface; lstrcpynW(piInput->achName, wcsInputPinName, sizeof(piInput->achName) / sizeof(piInput->achName[0])); This->pInputPin.pin.IPin_iface.lpVtbl = &GST_InputPin_Vtbl; This->pInputPin.pin.refCount = 1; @@ -1285,17 +1285,17 @@ static void GST_Destroy(GSTImpl *This) hr = IPin_Disconnect(connected); assert(hr == S_OK); IPin_Release(connected); - hr = IPin_Disconnect((IPin *)&This->pInputPin); + hr = IPin_Disconnect(&This->pInputPin.pin.IPin_iface); assert(hr == S_OK); } - pinref = IPin_Release((IPin *)&This->pInputPin); + pinref = IPin_Release(&This->pInputPin.pin.IPin_iface); if (pinref) { /* Valgrind could find this, if I kill it here */ ERR("pinref should be null, is %u, destroying anyway\n", pinref); assert((LONG)pinref > 0); while (pinref) - pinref = IPin_Release((IPin *)&This->pInputPin); + pinref = IPin_Release(&This->pInputPin.pin.IPin_iface); } if (This->bus) { gst_bus_set_sync_handler(This->bus, NULL, NULL, NULL); @@ -1313,14 +1313,13 @@ static HRESULT WINAPI GST_QueryInterface(IBaseFilter *iface, REFIID riid, LPVOID *ppv = NULL; - if (IsEqualIID(riid, &IID_IUnknown)) - *ppv = This; - else if (IsEqualIID(riid, &IID_IPersist)) - *ppv = This; - else if (IsEqualIID(riid, &IID_IMediaFilter)) - *ppv = This; - else if (IsEqualIID(riid, &IID_IBaseFilter)) - *ppv = This; + if (IsEqualIID(riid, &IID_IUnknown) || + IsEqualIID(riid, &IID_IPersist) || + IsEqualIID(riid, &IID_IMediaFilter) || + IsEqualIID(riid, &IID_IBaseFilter)) + { + *ppv = &This->filter.IBaseFilter_iface; + } if (*ppv) { IUnknown_AddRef((IUnknown *)(*ppv)); @@ -1426,7 +1425,7 @@ static HRESULT WINAPI GST_Run(IBaseFilter *iface, REFERENCE_TIME tStart) This->filter.rtStreamStart = tStart; for (i = 0; i < This->cStreams; i++) { - hr = BaseOutputPinImpl_Active((BaseOutputPin *)This->ppPins[i]); + hr = BaseOutputPinImpl_Active(&This->ppPins[i]->pin); if (SUCCEEDED(hr)) { hr_any = hr; } @@ -1518,19 +1517,19 @@ static HRESULT WINAPI GST_ChangeRate(IMediaSeeking *iface) static HRESULT WINAPI GST_Seeking_QueryInterface(IMediaSeeking *iface, REFIID riid, void **ppv) { GSTOutPin *This = impl_from_IMediaSeeking(iface); - return IUnknown_QueryInterface((IUnknown *)This, riid, ppv); + return IPin_QueryInterface(&This->pin.pin.IPin_iface, riid, ppv); } static ULONG WINAPI GST_Seeking_AddRef(IMediaSeeking *iface) { GSTOutPin *This = impl_from_IMediaSeeking(iface); - return IUnknown_AddRef((IUnknown *)This); + return IPin_AddRef(&This->pin.pin.IPin_iface); } static ULONG WINAPI GST_Seeking_Release(IMediaSeeking *iface) { GSTOutPin *This = impl_from_IMediaSeeking(iface); - return IUnknown_Release((IUnknown *)This); + return IPin_Release(&This->pin.pin.IPin_iface); } static HRESULT WINAPI GST_Seeking_GetCurrentPosition(IMediaSeeking *iface, REFERENCE_TIME *pos) @@ -1650,25 +1649,25 @@ static const IMediaSeekingVtbl GST_Seeking_Vtbl = static inline GSTOutPin *impl_from_IQualityControl( IQualityControl *iface ) { - return (GSTOutPin*)CONTAINING_RECORD(iface, GSTOutPin, IQualityControl_iface); + return CONTAINING_RECORD(iface, GSTOutPin, IQualityControl_iface); } static HRESULT WINAPI GST_QualityControl_QueryInterface(IQualityControl *iface, REFIID riid, void **ppv) { GSTOutPin *pin = impl_from_IQualityControl(iface); - return IPin_QueryInterface((IPin*)pin, riid, ppv); + return IPin_QueryInterface(&pin->pin.pin.IPin_iface, riid, ppv); } static ULONG WINAPI GST_QualityControl_AddRef(IQualityControl *iface) { GSTOutPin *pin = impl_from_IQualityControl(iface); - return IPin_AddRef((IPin*)pin); + return IPin_AddRef(&pin->pin.pin.IPin_iface); } static ULONG WINAPI GST_QualityControl_Release(IQualityControl *iface) { GSTOutPin *pin = impl_from_IQualityControl(iface); - return IPin_Release((IPin*)pin); + return IPin_Release(&pin->pin.pin.IPin_iface); } static HRESULT WINAPI GST_QualityControl_Notify(IQualityControl *iface, IBaseFilter *sender, Quality qm) @@ -1889,13 +1888,13 @@ static HRESULT GST_AddPin(GSTImpl *This, const PIN_INFO *piOutput, const AM_MEDI memset((char*)pin + sizeof(pin->pin), 0, sizeof(GSTOutPin) - sizeof(pin->pin)); pin->pmt = CoTaskMemAlloc(sizeof(AM_MEDIA_TYPE)); CopyMediaType(pin->pmt, amt); - pin->pin.pin.pinInfo.pFilter = (LPVOID)This; + pin->pin.pin.pinInfo.pFilter = &This->filter.IBaseFilter_iface; pin->caps_event = CreateEventW(NULL, 0, 0, NULL); pin->segment = gst_segment_new(); This->cStreams++; pin->IQualityControl_iface.lpVtbl = &GSTOutPin_QualityControl_Vtbl; SourceSeeking_Init(&pin->seek, &GST_Seeking_Vtbl, GST_ChangeStop, GST_ChangeCurrent, GST_ChangeRate, &This->filter.csFilter); - BaseFilterImpl_IncrementPinVersion((BaseFilter*)This); + BaseFilterImpl_IncrementPinVersion(&This->filter); } else ERR("Failed with error %x\n", hr); return hr; @@ -1921,14 +1920,14 @@ static HRESULT GST_RemoveOutputPins(GSTImpl *This) for (i = 0; i < This->cStreams; i++) { hr = BaseOutputPinImpl_BreakConnect(&ppOldPins[i]->pin); TRACE("Disconnect: %08x\n", hr); - IPin_Release((IPin*)ppOldPins[i]); + IPin_Release(&ppOldPins[i]->pin.pin.IPin_iface); } This->cStreams = 0; This->ppPins = NULL; gst_element_set_bus(This->container, NULL); gst_object_unref(This->container); This->container = NULL; - BaseFilterImpl_IncrementPinVersion((BaseFilter*)This); + BaseFilterImpl_IncrementPinVersion(&This->filter); CoTaskMemFree(ppOldPins); return S_OK; }

1 0

Andrew Eikum : mmdevapi/tests: Fix failure on Vista.
by Alexandre Julliard 29 Aug '16

29 Aug '16

Module: wine Branch: master Commit: 25dbca10dcf6a67628f336dbd959ecfd1181e9e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=25dbca10dcf6a67628f336dbd… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri Aug 26 11:44:27 2016 -0500 mmdevapi/tests: Fix failure on Vista. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mmdevapi/tests/propstore.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/mmdevapi/tests/propstore.c b/dlls/mmdevapi/tests/propstore.c index 6447113..02340ba 100644 --- a/dlls/mmdevapi/tests/propstore.c +++ b/dlls/mmdevapi/tests/propstore.c @@ -118,7 +118,8 @@ static void test_getat(IPropertyStore *store) if (IsEqualPropertyKey(pkey, DEVPKEY_Device_DeviceDesc)) found_desc = TRUE; } - ok(found_name, "DEVPKEY_Device_FriendlyName not found\n"); + ok(found_name || + broken(!found_name) /* vista */, "DEVPKEY_Device_FriendlyName not found\n"); ok(found_desc, "DEVPKEY_Device_DeviceDesc not found\n"); }

1 0