wine-commits December 2013

wine-commits@winehq.org

3 participants
462 discussions

Ken Thomases : winemac: Allow programmatic changes of the window frame even if a window is disabled (prevented from resizing).
by Alexandre Julliard 30 Dec '13

30 Dec '13

Module: wine Branch: master Commit: 0137b07973d86d288265a25a1f55956c6b0cbe3f URL: http://source.winehq.org/git/wine.git/?a=commit;h=0137b07973d86d288265a25a1… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sun Dec 29 21:33:36 2013 -0600 winemac: Allow programmatic changes of the window frame even if a window is disabled (prevented from resizing). --- dlls/winemac.drv/cocoa_window.m | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index c8c1e90..f051934 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -1231,6 +1231,16 @@ static inline NSUInteger adjusted_modifiers_for_option_behavior(NSUInteger modif BOOL equalSizes = NSEqualSizes(frame.size, oldFrame.size); BOOL needEnableScreenUpdates = FALSE; + if (disabled) + { + // Allow the following calls to -setFrame:display: to work even + // if they would violate the content size constraints. This + // shouldn't be necessary since the content size constraints are + // documented to not constrain that method, but it seems to be. + [self setContentMinSize:NSZeroSize]; + [self setContentMaxSize:NSMakeSize(FLT_MAX, FLT_MAX)]; + } + if (equalSizes && [[self childWindows] count]) { // If we change the window frame such that the origin moves @@ -1249,6 +1259,11 @@ static inline NSUInteger adjusted_modifiers_for_option_behavior(NSUInteger modif } [self setFrame:frame display:YES]; + if (disabled) + { + [self setContentMinSize:contentRect.size]; + [self setContentMaxSize:contentRect.size]; + } if (needEnableScreenUpdates) NSEnableScreenUpdates();

1 0

Ken Thomases : winemac: Prevent disabled windows from being moved.
by Alexandre Julliard 30 Dec '13

30 Dec '13

Module: wine Branch: master Commit: 8876751e9356f0852eb3bd397c22dee3f1b6611b URL: http://source.winehq.org/git/wine.git/?a=commit;h=8876751e9356f0852eb3bd397… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sun Dec 29 21:33:30 2013 -0600 winemac: Prevent disabled windows from being moved. This won't be enforced if AllowImmovableWindows=n is set in the registry. --- dlls/winemac.drv/cocoa_window.m | 3 +++ dlls/winemac.drv/macdrv_cocoa.h | 1 + dlls/winemac.drv/macdrv_main.c | 4 ++++ 3 files changed, 8 insertions(+), 0 deletions(-) diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index bb2da55..c8c1e90 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -642,6 +642,9 @@ static inline NSUInteger adjusted_modifiers_for_option_behavior(NSUInteger modif [self setContentMaxSize:savedContentMaxSize]; [self setContentMinSize:savedContentMinSize]; } + + if (allow_immovable_windows) + [self setMovable:!disabled]; } - (void) adjustFullScreenBehavior:(NSWindowCollectionBehavior)behavior diff --git a/dlls/winemac.drv/macdrv_cocoa.h b/dlls/winemac.drv/macdrv_cocoa.h index 5073db8..743757e 100644 --- a/dlls/winemac.drv/macdrv_cocoa.h +++ b/dlls/winemac.drv/macdrv_cocoa.h @@ -146,6 +146,7 @@ extern int topmost_float_inactive DECLSPEC_HIDDEN; extern int capture_displays_for_fullscreen DECLSPEC_HIDDEN; extern int left_option_is_alt DECLSPEC_HIDDEN; extern int right_option_is_alt DECLSPEC_HIDDEN; +extern int allow_immovable_windows DECLSPEC_HIDDEN; extern int macdrv_start_cocoa_app(unsigned long long tickcount) DECLSPEC_HIDDEN; extern void macdrv_window_rejected_focus(const struct macdrv_event *event) DECLSPEC_HIDDEN; diff --git a/dlls/winemac.drv/macdrv_main.c b/dlls/winemac.drv/macdrv_main.c index 2c3ec23..1aab785 100644 --- a/dlls/winemac.drv/macdrv_main.c +++ b/dlls/winemac.drv/macdrv_main.c @@ -54,6 +54,7 @@ int left_option_is_alt = 0; int right_option_is_alt = 0; BOOL allow_software_rendering = FALSE; BOOL disable_window_decorations = FALSE; +int allow_immovable_windows = TRUE; HMODULE macdrv_module = 0; @@ -171,6 +172,9 @@ static void setup_options(void) if (!get_config_key(hkey, appkey, "Decorated", buffer, sizeof(buffer))) disable_window_decorations = !IS_OPTION_TRUE(buffer[0]); + if (!get_config_key(hkey, appkey, "AllowImmovableWindows", buffer, sizeof(buffer))) + allow_immovable_windows = IS_OPTION_TRUE(buffer[0]); + if (appkey) RegCloseKey(appkey); if (hkey) RegCloseKey(hkey); }

1 0

Ken Thomases : winemac: Move some state-based feature adjustment into the -adjustFeaturesForState method .
by Alexandre Julliard 30 Dec '13

30 Dec '13

Module: wine Branch: master Commit: 5f7b30aee28e70463311ed7f24fe8a58f600cbcb URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f7b30aee28e70463311ed7f2… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sun Dec 29 21:33:20 2013 -0600 winemac: Move some state-based feature adjustment into the -adjustFeaturesForState method. --- dlls/winemac.drv/cocoa_window.m | 24 ++++++++++++------------ 1 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index 06647d9..bb2da55 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -630,6 +630,18 @@ static inline NSUInteger adjusted_modifiers_for_option_behavior(NSUInteger modif if ([self collectionBehavior] & NSWindowCollectionBehaviorFullScreenPrimary) [[self standardWindowButton:NSWindowFullScreenButton] setEnabled:!self.disabled]; } + + if (disabled) + { + NSSize size = [self contentRectForFrameRect:[self frame]].size; + [self setContentMinSize:size]; + [self setContentMaxSize:size]; + } + else + { + [self setContentMaxSize:savedContentMaxSize]; + [self setContentMinSize:savedContentMinSize]; + } } - (void) adjustFullScreenBehavior:(NSWindowCollectionBehavior)behavior @@ -1275,18 +1287,6 @@ static inline NSUInteger adjusted_modifiers_for_option_behavior(NSUInteger modif { disabled = newValue; [self adjustFeaturesForState]; - - if (disabled) - { - NSSize size = [self contentRectForFrameRect:[self frame]].size; - [self setContentMinSize:size]; - [self setContentMaxSize:size]; - } - else - { - [self setContentMaxSize:savedContentMaxSize]; - [self setContentMinSize:savedContentMinSize]; - } } }

1 0

Ken Thomases : winemac: Extract some duplicated code to a new perform_window_command() function.
by Alexandre Julliard 30 Dec '13

30 Dec '13

Module: wine Branch: master Commit: 2d1396af32f8897c11dec2771b9a912b5348dfda URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d1396af32f8897c11dec2771… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sun Dec 29 21:33:14 2013 -0600 winemac: Extract some duplicated code to a new perform_window_command() function. This also changes to posting rather than sending WM_SYSCOMMAND/SC_MINIMIZE. --- dlls/winemac.drv/event.c | 2 +- dlls/winemac.drv/window.c | 127 +++++++++++++++++++++------------------------ 2 files changed, 61 insertions(+), 68 deletions(-) diff --git a/dlls/winemac.drv/event.c b/dlls/winemac.drv/event.c index 13f55f5..7caff22 100644 --- a/dlls/winemac.drv/event.c +++ b/dlls/winemac.drv/event.c @@ -104,7 +104,6 @@ static macdrv_event_mask get_event_mask(DWORD mask) event_mask |= event_mask_for_type(IM_SET_TEXT); event_mask |= event_mask_for_type(STATUS_ITEM_MOUSE_BUTTON); event_mask |= event_mask_for_type(STATUS_ITEM_MOUSE_MOVE); - event_mask |= event_mask_for_type(WINDOW_CLOSE_REQUESTED); event_mask |= event_mask_for_type(WINDOW_DID_UNMINIMIZE); event_mask |= event_mask_for_type(WINDOW_FRAME_CHANGED); event_mask |= event_mask_for_type(WINDOW_GOT_FOCUS); @@ -116,6 +115,7 @@ static macdrv_event_mask get_event_mask(DWORD mask) event_mask |= event_mask_for_type(QUERY_EVENT); event_mask |= event_mask_for_type(RELEASE_CAPTURE); event_mask |= event_mask_for_type(WINDOW_BROUGHT_FORWARD); + event_mask |= event_mask_for_type(WINDOW_CLOSE_REQUESTED); event_mask |= event_mask_for_type(WINDOW_DRAG_BEGIN); event_mask |= event_mask_for_type(WINDOW_DRAG_END); event_mask |= event_mask_for_type(WINDOW_MINIMIZE_REQUESTED); diff --git a/dlls/winemac.drv/window.c b/dlls/winemac.drv/window.c index 91a1d4d..715d5a3 100644 --- a/dlls/winemac.drv/window.c +++ b/dlls/winemac.drv/window.c @@ -1164,6 +1164,50 @@ static LRESULT move_window(HWND hwnd, WPARAM wparam) } +/*********************************************************************** + * perform_window_command + */ +static void perform_window_command(HWND hwnd, DWORD style_any, DWORD style_none, WORD command, WORD hittest) +{ + DWORD style; + + TRACE("win %p style_any 0x%08x style_none 0x%08x command 0x%04x hittest 0x%04x\n", + hwnd, style_any, style_none, command, hittest); + + style = GetWindowLongW(hwnd, GWL_STYLE); + if ((style_any && !(style & style_any)) || (style & (WS_DISABLED | style_none))) + { + TRACE("not changing win %p style 0x%08x\n", hwnd, style); + return; + } + + if (GetActiveWindow() != hwnd) + { + LRESULT ma = SendMessageW(hwnd, WM_MOUSEACTIVATE, (WPARAM)GetAncestor(hwnd, GA_ROOT), + MAKELPARAM(hittest, WM_NCLBUTTONDOWN)); + switch (ma) + { + case MA_NOACTIVATEANDEAT: + case MA_ACTIVATEANDEAT: + TRACE("not changing win %p mouse-activate result %ld\n", hwnd, ma); + return; + case MA_NOACTIVATE: + break; + case MA_ACTIVATE: + case 0: + SetActiveWindow(hwnd); + break; + default: + WARN("unknown WM_MOUSEACTIVATE code %ld\n", ma); + break; + } + } + + TRACE("changing win %p\n", hwnd); + PostMessageW(hwnd, WM_SYSCOMMAND, command, 0); +} + + /********************************************************************** * CreateDesktopWindow (MACDRV.@) */ @@ -1850,45 +1894,26 @@ done: */ void macdrv_window_close_requested(HWND hwnd) { - /* Ignore the delete window request if the window has been disabled. This - * is to disallow applications from being closed while in a modal state. - */ - if (IsWindowEnabled(hwnd)) + HMENU sysmenu; + + if (GetClassLongW(hwnd, GCL_STYLE) & CS_NOCLOSE) { - HMENU hSysMenu; + TRACE("not closing win %p class style CS_NOCLOSE\n", hwnd); + return; + } - if (GetClassLongW(hwnd, GCL_STYLE) & CS_NOCLOSE) return; - hSysMenu = GetSystemMenu(hwnd, FALSE); - if (hSysMenu) - { - UINT state = GetMenuState(hSysMenu, SC_CLOSE, MF_BYCOMMAND); - if (state == 0xFFFFFFFF || (state & (MF_DISABLED | MF_GRAYED))) - return; - } - if (GetActiveWindow() != hwnd) + sysmenu = GetSystemMenu(hwnd, FALSE); + if (sysmenu) + { + UINT state = GetMenuState(sysmenu, SC_CLOSE, MF_BYCOMMAND); + if (state == 0xFFFFFFFF || (state & (MF_DISABLED | MF_GRAYED))) { - LRESULT ma = SendMessageW(hwnd, WM_MOUSEACTIVATE, - (WPARAM)GetAncestor(hwnd, GA_ROOT), - MAKELPARAM(HTCLOSE, WM_NCLBUTTONDOWN)); - switch(ma) - { - case MA_NOACTIVATEANDEAT: - case MA_ACTIVATEANDEAT: - return; - case MA_NOACTIVATE: - break; - case MA_ACTIVATE: - case 0: - SetActiveWindow(hwnd); - break; - default: - WARN("unknown WM_MOUSEACTIVATE code %d\n", (int) ma); - break; - } + TRACE("not closing win %p menu state 0x%08x\n", hwnd, state); + return; } - - PostMessageW(hwnd, WM_SYSCOMMAND, SC_CLOSE, 0); } + + perform_window_command(hwnd, 0, 0, SC_CLOSE, HTCLOSE); } @@ -2036,39 +2061,7 @@ void macdrv_app_deactivated(void) */ void macdrv_window_minimize_requested(HWND hwnd) { - DWORD style; - - style = GetWindowLongW(hwnd, GWL_STYLE); - if (!(style & WS_MINIMIZEBOX) || (style & (WS_DISABLED | WS_MINIMIZE))) - { - TRACE("not minimizing win %p style 0x%08x\n", hwnd, style); - return; - } - - if (GetActiveWindow() != hwnd) - { - LRESULT ma = SendMessageW(hwnd, WM_MOUSEACTIVATE, (WPARAM)GetAncestor(hwnd, GA_ROOT), - MAKELPARAM(HTMINBUTTON, WM_NCLBUTTONDOWN)); - switch (ma) - { - case MA_NOACTIVATEANDEAT: - case MA_ACTIVATEANDEAT: - TRACE("not minimizing win %p mouse-activate result %ld\n", hwnd, ma); - return; - case MA_NOACTIVATE: - break; - case MA_ACTIVATE: - case 0: - SetActiveWindow(hwnd); - break; - default: - WARN("unknown WM_MOUSEACTIVATE code %ld\n", ma); - break; - } - } - - TRACE("minimizing win %p\n", hwnd); - SendMessageW(hwnd, WM_SYSCOMMAND, SC_MINIMIZE, 0); + perform_window_command(hwnd, WS_MINIMIZEBOX, WS_MINIMIZE, SC_MINIMIZE, HTMINBUTTON); }

1 0

Ken Thomases : winemac: Don' t check the state of the SC_MINIMIZE item of the window menu when asked to minimize .
by Alexandre Julliard 30 Dec '13

30 Dec '13

Module: wine Branch: master Commit: 2c6ad1829d4fe77278dc6f8cc2f496a59fb62849 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c6ad1829d4fe77278dc6f8cc… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sun Dec 29 21:33:07 2013 -0600 winemac: Don't check the state of the SC_MINIMIZE item of the window menu when asked to minimize. The window menu items are not updated as the window state changes; they only update when the menu is shown. So the item state is not a reliable indicator of whether minimization is allowed. --- dlls/winemac.drv/window.c | 12 ------------ 1 files changed, 0 insertions(+), 12 deletions(-) diff --git a/dlls/winemac.drv/window.c b/dlls/winemac.drv/window.c index a4e730d..91a1d4d 100644 --- a/dlls/winemac.drv/window.c +++ b/dlls/winemac.drv/window.c @@ -2037,7 +2037,6 @@ void macdrv_app_deactivated(void) void macdrv_window_minimize_requested(HWND hwnd) { DWORD style; - HMENU hSysMenu; style = GetWindowLongW(hwnd, GWL_STYLE); if (!(style & WS_MINIMIZEBOX) || (style & (WS_DISABLED | WS_MINIMIZE))) @@ -2046,17 +2045,6 @@ void macdrv_window_minimize_requested(HWND hwnd) return; } - hSysMenu = GetSystemMenu(hwnd, FALSE); - if (hSysMenu) - { - UINT state = GetMenuState(hSysMenu, SC_MINIMIZE, MF_BYCOMMAND); - if (state == 0xFFFFFFFF || (state & (MF_DISABLED | MF_GRAYED))) - { - TRACE("not minimizing win %p menu state 0x%08x\n", hwnd, state); - return; - } - } - if (GetActiveWindow() != hwnd) { LRESULT ma = SendMessageW(hwnd, WM_MOUSEACTIVATE, (WPARAM)GetAncestor(hwnd, GA_ROOT),

1 0

Nikolay Sivov : ntdll: Fix return value when failed to locate resource.
by Alexandre Julliard 30 Dec '13

30 Dec '13

Module: wine Branch: master Commit: aa4ebeb57c66c8a98cf50c9ce7f7e47cf88d1271 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aa4ebeb57c66c8a98cf50c9ce… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Dec 30 00:25:38 2013 +0400 ntdll: Fix return value when failed to locate resource. --- dlls/kernel32/tests/actctx.c | 1 - dlls/ntdll/actctx.c | 2 +- 2 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/actctx.c b/dlls/kernel32/tests/actctx.c index 9894568..ab655c0 100644 --- a/dlls/kernel32/tests/actctx.c +++ b/dlls/kernel32/tests/actctx.c @@ -2146,7 +2146,6 @@ todo_wine SetLastError(0xdeadbeef); handle = pCreateActCtxA(&actctx); ok(handle == INVALID_HANDLE_VALUE, "got handle %p\n", handle); -todo_wine ok(GetLastError() == ERROR_RESOURCE_TYPE_NOT_FOUND, "got error %d\n", GetLastError()); } diff --git a/dlls/ntdll/actctx.c b/dlls/ntdll/actctx.c index 68dd7ec..962a4e5 100644 --- a/dlls/ntdll/actctx.c +++ b/dlls/ntdll/actctx.c @@ -2633,7 +2633,7 @@ static NTSTATUS get_manifest_in_associated_manifest( struct actctx_loader* acl, status = get_manifest_in_manifest_file( acl, ai, nameW.Buffer, directory, FALSE, file ); NtClose( file ); } - else status = STATUS_RESOURCE_DATA_NOT_FOUND; + else status = STATUS_RESOURCE_TYPE_NOT_FOUND; RtlFreeUnicodeString( &nameW ); return status; }

1 0

Nikolay Sivov : ntdll: Open source file only when needed during context creation.
by Alexandre Julliard 30 Dec '13

30 Dec '13

Module: wine Branch: master Commit: 031c02726236efaa6470026a2f2687d618b82ff5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=031c02726236efaa6470026a2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Dec 30 00:25:18 2013 +0400 ntdll: Open source file only when needed during context creation. --- dlls/kernel32/tests/actctx.c | 33 ++++++++++++++++++++++++++++++--- dlls/ntdll/actctx.c | 6 ++++-- 2 files changed, 34 insertions(+), 5 deletions(-) diff --git a/dlls/kernel32/tests/actctx.c b/dlls/kernel32/tests/actctx.c index 19bab72..9894568 100644 --- a/dlls/kernel32/tests/actctx.c +++ b/dlls/kernel32/tests/actctx.c @@ -2113,14 +2113,41 @@ static void test_CreateActCtx(void) actctx.lpAssemblyDirectory = dir; actctx.lpSource = path; + SetLastError(0xdeadbeef); handle = pCreateActCtxA(&actctx); -todo_wine - ok(handle == INVALID_HANDLE_VALUE && GetLastError() == ERROR_SXS_CANT_GEN_ACTCTX, - "got handle %p, supposed to fail\n", handle); +todo_wine { + ok(handle == INVALID_HANDLE_VALUE, "got handle %p\n", handle); + ok(GetLastError() == ERROR_SXS_CANT_GEN_ACTCTX, "got error %d\n", GetLastError()); +} if (handle != INVALID_HANDLE_VALUE) pReleaseActCtx(handle); delete_manifest_file("main.manifest"); delete_manifest_file("testdep1.manifest"); + + /* ACTCTX_FLAG_HMODULE_VALID but hModule is not set */ + memset(&actctx, 0, sizeof(ACTCTXA)); + actctx.cbSize = sizeof(ACTCTXA); + actctx.dwFlags = ACTCTX_FLAG_HMODULE_VALID; + SetLastError(0xdeadbeef); + handle = pCreateActCtxA(&actctx); + ok(handle == INVALID_HANDLE_VALUE, "got handle %p\n", handle); +todo_wine + ok(GetLastError() == ERROR_SXS_CANT_GEN_ACTCTX || broken(GetLastError() == ERROR_NOT_ENOUGH_MEMORY) /* XP, win2k3 */, + "got error %d\n", GetLastError()); + + /* create from HMODULE - resource doesn't exist, lpSource is set */ + memset(&actctx, 0, sizeof(ACTCTXA)); + actctx.cbSize = sizeof(ACTCTXA); + actctx.dwFlags = ACTCTX_FLAG_RESOURCE_NAME_VALID | ACTCTX_FLAG_HMODULE_VALID; + actctx.lpSource = "dummyfile.dll"; + actctx.lpResourceName = MAKEINTRESOURCEA(20); + actctx.hModule = GetModuleHandleA(NULL); + + SetLastError(0xdeadbeef); + handle = pCreateActCtxA(&actctx); + ok(handle == INVALID_HANDLE_VALUE, "got handle %p\n", handle); +todo_wine + ok(GetLastError() == ERROR_RESOURCE_TYPE_NOT_FOUND, "got error %d\n", GetLastError()); } static BOOL init_funcs(void) diff --git a/dlls/ntdll/actctx.c b/dlls/ntdll/actctx.c index bf6e47b..68dd7ec 100644 --- a/dlls/ntdll/actctx.c +++ b/dlls/ntdll/actctx.c @@ -4519,7 +4519,10 @@ NTSTATUS WINAPI RtlCreateActivationContext( HANDLE *handle, const void *ptr ) } nameW.Buffer = NULL; - if (pActCtx->lpSource) + + /* open file only if it's going to be used */ + if (pActCtx->lpSource && !((pActCtx->dwFlags & ACTCTX_FLAG_RESOURCE_NAME_VALID) && + (pActCtx->dwFlags & ACTCTX_FLAG_HMODULE_VALID))) { if (!RtlDosPathNameToNtPathName_U(pActCtx->lpSource, &nameW, NULL, NULL)) { @@ -4550,7 +4553,6 @@ NTSTATUS WINAPI RtlCreateActivationContext( HANDLE *handle, const void *ptr ) status = get_manifest_in_module( &acl, NULL, NULL, directory, FALSE, pActCtx->hModule, pActCtx->lpResourceName, lang ); if (status && status != STATUS_SXS_CANT_GEN_ACTCTX) - /* FIXME: what to do if pActCtx->lpSource is set */ status = get_manifest_in_associated_manifest( &acl, NULL, NULL, directory, pActCtx->hModule, pActCtx->lpResourceName ); }

1 0

Michael Stefaniuc : dmusic/tests: Add some COM tests for IDirectMusic/ IDirectMusicCollection.
by Alexandre Julliard 30 Dec '13

30 Dec '13

Module: wine Branch: master Commit: 0c4b3514a548e1f0b87834ce97b30b6b3929bafb URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c4b3514a548e1f0b87834ce9… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Dec 29 22:38:06 2013 +0100 dmusic/tests: Add some COM tests for IDirectMusic/IDirectMusicCollection. --- dlls/dmusic/tests/dmusic.c | 95 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 95 insertions(+), 0 deletions(-) diff --git a/dlls/dmusic/tests/dmusic.c b/dlls/dmusic/tests/dmusic.c index 9cc9023..c425840 100644 --- a/dlls/dmusic/tests/dmusic.c +++ b/dlls/dmusic/tests/dmusic.c @@ -222,6 +222,99 @@ static void test_dmbuffer(void) IDirectMusic_Release(dmusic); } +static void test_COM(void) +{ + IDirectMusic8 *dm8 = (IDirectMusic8*)0xdeadbeef; + IDirectMusic *dm; + IUnknown *unk; + ULONG refcount; + HRESULT hr; + + /* COM aggregation */ + hr = CoCreateInstance(&CLSID_DirectMusic, (IUnknown*)&dm8, CLSCTX_INPROC_SERVER, &IID_IUnknown, + (void**)&dm8); + ok(hr == CLASS_E_NOAGGREGATION, + "DirectMusic8 create failed: %08x, expected CLASS_E_NOAGGREGATION\n", hr); + ok(!dm8, "dm8 = %p\n", dm8); + + /* Invalid RIID */ + hr = CoCreateInstance(&CLSID_DirectMusic, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusicObject, + (void**)&dm8); + ok(hr == E_NOINTERFACE, "DirectMusic8 create failed: %08x, expected E_NOINTERFACE\n", hr); + + /* Same refcount for DirectMusic and DirectMusic8 */ + hr = CoCreateInstance(&CLSID_DirectMusic, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusic8, + (void**)&dm8); + ok(hr == S_OK, "DirectMusic8 create failed: %08x, expected S_OK\n", hr); + refcount = IDirectMusic8_AddRef(dm8); + ok(refcount == 2, "refcount == %u, expected 2\n", refcount); + + hr = IDirectMusic8_QueryInterface(dm8, &IID_IDirectMusic, (void**)&dm); + ok(hr == S_OK, "QueryInterface for IID_IDirectMusic failed: %08x\n", hr); + refcount = IDirectMusic_AddRef(dm); + ok(refcount == 4, "refcount == %u, expected 4\n", refcount); + refcount = IDirectMusic_Release(dm); + + hr = IDirectMusic8_QueryInterface(dm8, &IID_IUnknown, (void**)&unk); + ok(hr == S_OK, "QueryInterface for IID_IUnknown failed: %08x\n", hr); + refcount = IUnknown_AddRef(unk); + ok(refcount == 5, "refcount == %u, expected 5\n", refcount); + refcount = IUnknown_Release(unk); + + ok(refcount == 4, "refcount == %u, expected 4\n", refcount); + while (IDirectMusic8_Release(dm8)); +} + +static void test_COM_dmcoll(void) +{ + IDirectMusicCollection *dmc = (IDirectMusicCollection*)0xdeadbeef; + IDirectMusicObject *dmo; + IPersistStream *ps; + IUnknown *unk; + ULONG refcount; + HRESULT hr; + + /* COM aggregation */ + hr = CoCreateInstance(&CLSID_DirectMusicCollection, (IUnknown*)&dmc, CLSCTX_INPROC_SERVER, + &IID_IUnknown, (void**)&dmc); + ok(hr == CLASS_E_NOAGGREGATION, + "DirectMusicCollection create failed: %08x, expected CLASS_E_NOAGGREGATION\n", hr); + ok(!dmc, "dmc = %p\n", dmc); + + /* Invalid RIID */ + hr = CoCreateInstance(&CLSID_DirectMusicCollection, NULL, CLSCTX_INPROC_SERVER, + &IID_IClassFactory, (void**)&dmc); + ok(hr == E_NOINTERFACE, "DirectMusicCollection create failed: %08x, expected E_NOINTERFACE\n", hr); + + /* Same refcount for all DirectMusicCollection interfaces */ + hr = CoCreateInstance(&CLSID_DirectMusicCollection, NULL, CLSCTX_INPROC_SERVER, + &IID_IDirectMusicCollection, (void**)&dmc); + ok(hr == S_OK, "DirectMusicCollection create failed: %08x, expected S_OK\n", hr); + refcount = IDirectMusicCollection_AddRef(dmc); + ok(refcount == 2, "refcount == %u, expected 2\n", refcount); + + hr = IDirectMusicCollection_QueryInterface(dmc, &IID_IDirectMusicObject, (void**)&dmo); + ok(hr == S_OK, "QueryInterface for IID_IDirectMusicObject failed: %08x\n", hr); + refcount = IDirectMusicObject_AddRef(dmo); + ok(refcount == 4, "refcount == %u, expected 4\n", refcount); + refcount = IDirectMusicObject_Release(dmo); + + hr = IDirectMusicCollection_QueryInterface(dmc, &IID_IPersistStream, (void**)&ps); + ok(hr == S_OK, "QueryInterface for IID_IPersistStream failed: %08x\n", hr); + refcount = IPersistStream_AddRef(ps); + ok(refcount == 5, "refcount == %u, expected 5\n", refcount); + refcount = IPersistStream_Release(ps); + + hr = IDirectMusicCollection_QueryInterface(dmc, &IID_IUnknown, (void**)&unk); + ok(hr == S_OK, "QueryInterface for IID_IUnknown failed: %08x\n", hr); + refcount = IUnknown_AddRef(unk); + ok(refcount == 6, "refcount == %u, expected 6\n", refcount); + refcount = IUnknown_Release(unk); + + ok(refcount == 5, "refcount == %u, expected 5\n", refcount); + while (IDirectMusicCollection_Release(dmc)); +} + static BOOL missing_dmusic(void) { IDirectMusic8 *dm; @@ -241,6 +334,8 @@ START_TEST(dmusic) CoUninitialize(); return; } + test_COM(); + test_COM_dmcoll(); test_dmusic(); test_dmbuffer();

1 0

Michael Stefaniuc : dmusic/tests: Centralize the skip().
by Alexandre Julliard 30 Dec '13

30 Dec '13

Module: wine Branch: master Commit: 645ca7504ee60fe029bb4df7e749deb23975d5a8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=645ca7504ee60fe029bb4df7e… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Dec 29 22:36:28 2013 +0100 dmusic/tests: Centralize the skip(). --- dlls/dmusic/tests/dmusic.c | 27 +++++++++++++++++---------- 1 files changed, 17 insertions(+), 10 deletions(-) diff --git a/dlls/dmusic/tests/dmusic.c b/dlls/dmusic/tests/dmusic.c index 3174685..9cc9023 100644 --- a/dlls/dmusic/tests/dmusic.c +++ b/dlls/dmusic/tests/dmusic.c @@ -62,11 +62,7 @@ static void test_dmusic(void) IReferenceClock *clock = NULL; hr = CoCreateInstance(&CLSID_DirectMusic, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusic, (LPVOID*)&dmusic); - if (hr != S_OK) - { - skip("Cannot create DirectMusic object (%x)\n", hr); - return; - } + ok(hr == S_OK, "Cannot create DirectMusic object (%x)\n", hr); hr = IDirectMusic_GetMasterClock(dmusic, &guid_clock, &clock); ok(hr == S_OK, "IDirectMusic_GetMasterClock returned: %x\n", hr); @@ -149,11 +145,7 @@ static void test_dmbuffer(void) LPBYTE data; hr = CoCreateInstance(&CLSID_DirectMusic, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusic, (LPVOID*)&dmusic); - if (hr != S_OK) - { - skip("Cannot create DirectMusic object (%x)\n", hr); - return; - } + ok(hr == S_OK, "Cannot create DirectMusic object (%x)\n", hr); desc.dwSize = sizeof(DMUS_BUFFERDESC); desc.dwFlags = 0; @@ -230,10 +222,25 @@ static void test_dmbuffer(void) IDirectMusic_Release(dmusic); } +static BOOL missing_dmusic(void) +{ + IDirectMusic8 *dm; + HRESULT hr = CoCreateInstance(&CLSID_DirectMusic, (IUnknown*)&dm, CLSCTX_INPROC_SERVER, + &IID_IUnknown, (void**)&dm); + + return (hr == REGDB_E_CLASSNOTREG || hr == CLASS_E_CLASSNOTAVAILABLE); +} + START_TEST(dmusic) { CoInitializeEx(NULL, COINIT_MULTITHREADED); + if (missing_dmusic()) + { + skip("DirectMusic not available\n"); + CoUninitialize(); + return; + } test_dmusic(); test_dmbuffer();

1 0

Michael Stefaniuc : dmusic: These COM classes don't support COM aggregation .
by Alexandre Julliard 30 Dec '13

30 Dec '13

Module: wine Branch: master Commit: 5f5c21e55d3277964214c7b4d0227817246d78c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f5c21e55d3277964214c7b4d… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sat Dec 28 23:34:11 2013 +0100 dmusic: These COM classes don't support COM aggregation. --- dlls/dmusic/collection.c | 13 ++++++++----- dlls/dmusic/dmusic.c | 2 ++ 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/dlls/dmusic/collection.c b/dlls/dmusic/collection.c index e30f89d..f98bc19 100644 --- a/dlls/dmusic/collection.c +++ b/dlls/dmusic/collection.c @@ -814,12 +814,15 @@ static const IPersistStreamVtbl DirectMusicCollection_PersistStream_Vtbl = { HRESULT WINAPI DMUSIC_CreateDirectMusicCollectionImpl(LPCGUID lpcGUID, LPVOID* ppobj, LPUNKNOWN pUnkOuter) { IDirectMusicCollectionImpl* obj; - + + *ppobj = NULL; + if (pUnkOuter) + return CLASS_E_NOAGGREGATION; + obj = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectMusicCollectionImpl)); - if (NULL == obj) { - *ppobj = NULL; - return E_OUTOFMEMORY; - } + if (!obj) + return E_OUTOFMEMORY; + obj->IDirectMusicCollection_iface.lpVtbl = &DirectMusicCollection_Collection_Vtbl; obj->IDirectMusicObject_iface.lpVtbl = &DirectMusicCollection_Object_Vtbl; obj->IPersistStream_iface.lpVtbl = &DirectMusicCollection_PersistStream_Vtbl; diff --git a/dlls/dmusic/dmusic.c b/dlls/dmusic/dmusic.c index 0c2584f..6c837f7 100644 --- a/dlls/dmusic/dmusic.c +++ b/dlls/dmusic/dmusic.c @@ -408,6 +408,8 @@ HRESULT WINAPI DMUSIC_CreateDirectMusicImpl(LPCGUID riid, LPVOID* ret_iface, LPU TRACE("(%p,%p,%p)\n", riid, ret_iface, unkouter); *ret_iface = NULL; + if (unkouter) + return CLASS_E_NOAGGREGATION; dmusic = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectMusic8Impl)); if (!dmusic)

1 0

← Newer
1
2
3
4
5
6
7
8
9
...
47
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 December 2013