May 2017 - Wine-Commits - list.winehq.org

Józef Kucia : wined3d: Add support for patch constant signatures.
by Alexandre Julliard May 12, 2017

May 12, 2017

Module: wine Branch: master Commit: 487d2e027979dc1e5f1b3cad7edb96782514d064 URL: http://source.winehq.org/git/wine.git/?a=commit;h=487d2e027979dc1e5f1b3cad7… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri May 12 15:09:17 2017 +0200 wined3d: Add support for patch constant signatures. 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/d3d11/d3d11_private.h | 1 + dlls/d3d11/inputlayout.c | 2 +- dlls/d3d11/shader.c | 49 ++++++++++++++++++++++--------------- dlls/d3d8/shader.c | 2 ++ dlls/d3d9/shader.c | 2 ++ dlls/wined3d/shader.c | 55 ++++++++++++++++++++++++++---------------- dlls/wined3d/wined3d_private.h | 1 + include/wine/wined3d.h | 1 + 8 files changed, 71 insertions(+), 42 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=487d2e027979dc1e5f1b3…

1 0

Dmitry Timoshkov : include: Fix the GUID_WICPixelFormat32bppCMYK definition.
by Alexandre Julliard May 12, 2017

May 12, 2017

Module: wine Branch: master Commit: c78c84596f573b2a516382baeb7d8f078eac30e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c78c84596f573b2a516382bae… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed May 10 18:20:00 2017 +0200 include: Fix the GUID_WICPixelFormat32bppCMYK definition. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wincodec.idl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/wincodec.idl b/include/wincodec.idl index 406fe6b..962a6fd 100644 --- a/include/wincodec.idl +++ b/include/wincodec.idl @@ -213,7 +213,7 @@ cpp_quote("DEFINE_GUID(GUID_WICPixelFormat48bppRGB, 0x6fddc324,0x4e03,0x4bfe,0xb cpp_quote("DEFINE_GUID(GUID_WICPixelFormat64bppRGBA, 0x6fddc324,0x4e03,0x4bfe,0xb1,0x85,0x3d,0x77,0x76,0x8d,0xc9,0x16);") cpp_quote("DEFINE_GUID(GUID_WICPixelFormat64bppPRGBA, 0x6fddc324,0x4e03,0x4bfe,0xb1,0x85,0x3d,0x77,0x76,0x8d,0xc9,0x17);") -cpp_quote("DEFINE_GUID(GUID_WICPixelFormat32bppCMYK, 0x6fddc324,0x4e03,0x4fbe,0xb1,0x85,0x3d,0x77,0x76,0x8d,0xc9,0x1c);") +cpp_quote("DEFINE_GUID(GUID_WICPixelFormat32bppCMYK, 0x6fddc324,0x4e03,0x4bfe,0xb1,0x85,0x3d,0x77,0x76,0x8d,0xc9,0x1c);") typedef struct WICRect { INT X;

1 0

Józef Kucia : mscoree: Fix compilation on systems that don't support nameless unions.
by Alexandre Julliard May 12, 2017

May 12, 2017

Module: wine Branch: master Commit: c1d4d82e15a5f28ef7f9457c7a4b9fcd528b091e URL: http://source.winehq.org/git/wine.git/?a=commit;h=c1d4d82e15a5f28ef7f9457c7… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed May 10 16:25:52 2017 +0200 mscoree: Fix compilation on systems that don't support nameless unions. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mscoree/assembly.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/mscoree/assembly.c b/dlls/mscoree/assembly.c index 4af6f28..b653556 100644 --- a/dlls/mscoree/assembly.c +++ b/dlls/mscoree/assembly.c @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define NONAMELESSUNION + #include <stdarg.h> #include <stdio.h> @@ -319,7 +321,7 @@ HRESULT assembly_get_native_entrypoint(ASSEMBLY *assembly, NativeEntryPointFunc { if (assembly->corhdr->Flags & COMIMAGE_FLAGS_NATIVE_ENTRYPOINT) { - *func = assembly_rva_to_va(assembly, assembly->corhdr->EntryPointRVA); + *func = assembly_rva_to_va(assembly, assembly->corhdr->u.EntryPointRVA); return S_OK; } else

1 0

Alistair Leslie-Hughes : wmvcore/tests: Add more interface tests.
by Alexandre Julliard May 11, 2017

May 11, 2017

Module: wine Branch: master Commit: b77688102a84e1c7b7278340c46f53db3e1cda00 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b77688102a84e1c7b7278340c… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed May 10 21:51:44 2017 -0600 wmvcore/tests: Add more interface tests. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wmvcore/tests/wmvcore.c | 72 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 72 insertions(+) diff --git a/dlls/wmvcore/tests/wmvcore.c b/dlls/wmvcore/tests/wmvcore.c index ef77aff..4ceef77 100644 --- a/dlls/wmvcore/tests/wmvcore.c +++ b/dlls/wmvcore/tests/wmvcore.c @@ -66,6 +66,19 @@ static void test_wmreader_interfaces(void) IWMHeaderInfo2 *header2; IWMHeaderInfo3 *header3; IWMProfile *profile; + IWMProfile2 *profile2; + IWMProfile3 *profile3; + IWMPacketSize *packet; + IWMPacketSize2 *packet2; + IWMReaderAccelerator *accel; + IWMReaderTimecode *timecode; + IWMReaderNetworkConfig *netconfig; + IWMReaderNetworkConfig2 *netconfig2; + IWMReaderStreamClock *clock; + IWMReaderTypeNegotiation *negotiation; + IWMDRMReader *drmreader; + IWMDRMReader2 *drmreader2; + IWMDRMReader3 *drmreader3; hr = WMCreateReader( NULL, 0, &reader ); ok(hr == S_OK, "WMCreateReader failed 0x%08x\n", hr); @@ -93,18 +106,77 @@ static void test_wmreader_interfaces(void) hr = IWMReader_QueryInterface(reader, &IID_IWMProfile, (void **)&profile); todo_wine ok(hr == S_OK, "Failed 0x%08x\n", hr); + hr = IWMReader_QueryInterface(reader, &IID_IWMProfile2, (void **)&profile2); + todo_wine ok(hr == S_OK, "Failed 0x%08x\n", hr); + + hr = IWMReader_QueryInterface(reader, &IID_IWMProfile3, (void **)&profile3); + todo_wine ok(hr == S_OK, "Failed 0x%08x\n", hr); + + hr = IWMReader_QueryInterface(reader, &IID_IWMPacketSize, (void **)&packet); + todo_wine ok(hr == S_OK, "Failed 0x%08x\n", hr); + + hr = IWMReader_QueryInterface(reader, &IID_IWMPacketSize2, (void **)&packet2); + todo_wine ok(hr == S_OK, "Failed 0x%08x\n", hr); + + hr = IWMReader_QueryInterface(reader, &IID_IWMReaderAccelerator, (void **)&accel); + todo_wine ok(hr == S_OK, "Failed 0x%08x\n", hr); + + hr = IWMReader_QueryInterface(reader, &IID_IWMReaderTimecode, (void **)&timecode); + todo_wine ok(hr == S_OK, "Failed 0x%08x\n", hr); + + hr = IWMReader_QueryInterface(reader, &IID_IWMReaderNetworkConfig, (void **)&netconfig); + todo_wine ok(hr == S_OK, "Failed 0x%08x\n", hr); + + hr = IWMReader_QueryInterface(reader, &IID_IWMReaderNetworkConfig2, (void **)&netconfig2); + todo_wine ok(hr == S_OK, "Failed 0x%08x\n", hr); + + hr = IWMReader_QueryInterface(reader, &IID_IWMReaderStreamClock, (void **)&clock); + todo_wine ok(hr == S_OK, "Failed 0x%08x\n", hr); + + hr = IWMReader_QueryInterface(reader, &IID_IWMReaderTypeNegotiation, (void **)&negotiation); + todo_wine ok(hr == S_OK, "Failed 0x%08x\n", hr); + + hr = IWMReader_QueryInterface(reader, &IID_IWMDRMReader, (void **)&drmreader); + ok(hr == E_NOINTERFACE, "Failed 0x%08x\n", hr); + + hr = IWMReader_QueryInterface(reader, &IID_IWMDRMReader2, (void **)&drmreader2); + ok(hr == E_NOINTERFACE, "Failed 0x%08x\n", hr); + + hr = IWMReader_QueryInterface(reader, &IID_IWMDRMReader3, (void **)&drmreader3); + ok(hr == E_NOINTERFACE, "Failed 0x%08x\n", hr); + + if(packet) + IWMPacketSize_Release(packet); + if(packet2) + IWMPacketSize2_Release(packet2); if(advanced) IWMReaderAdvanced_Release(advanced); if(advanced2) IWMReaderAdvanced2_Release(advanced2); if(profile) IWMProfile_Release(profile); + if(profile2) + IWMProfile2_Release(profile2); + if(profile3) + IWMProfile3_Release(profile3); if(header) IWMHeaderInfo_Release(header); if(header2) IWMHeaderInfo2_Release(header2); if(header3) IWMHeaderInfo3_Release(header3); + if(accel) + IWMReaderAccelerator_Release(accel); + if(timecode) + IWMReaderTimecode_Release(timecode); + if(netconfig) + IWMReaderNetworkConfig_Release(netconfig); + if(netconfig2) + IWMReaderNetworkConfig2_Release(netconfig2); + if(clock) + IWMReaderStreamClock_Release(clock); + if(negotiation) + IWMReaderTypeNegotiation_Release(negotiation); IWMReader_Release(reader); }

1 0

Alistair Leslie-Hughes : include/wmsdkidl.idl: Add more interfaces.
by Alexandre Julliard May 11, 2017

May 11, 2017

Module: wine Branch: master Commit: 3dd254fd6ee7597cca5de0268d0f4a1b1ebfe2d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3dd254fd6ee7597cca5de0268… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed May 10 21:51:43 2017 -0600 include/wmsdkidl.idl: Add more interfaces. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wmsdkidl.idl | 399 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 399 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3dd254fd6ee7597cca5de…

1 0

Stefan Dösinger : winemac.drv: Implement systray version 1-4 notifications.
by Alexandre Julliard May 11, 2017

May 11, 2017

Module: wine Branch: master Commit: 7003ec34c9578bf90f9198b3d8dc64ec65d2b249 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7003ec34c9578bf90f9198b3d… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu May 11 13:34:59 2017 -0500 winemac.drv: Implement systray version 1-4 notifications. Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/cocoa_status_item.m | 11 +++++++ dlls/winemac.drv/macdrv_cocoa.h | 4 +++ dlls/winemac.drv/systray.c | 60 ++++++++++++++++++++++++++---------- 3 files changed, 58 insertions(+), 17 deletions(-) diff --git a/dlls/winemac.drv/cocoa_status_item.m b/dlls/winemac.drv/cocoa_status_item.m index c38dc51..23d7805 100644 --- a/dlls/winemac.drv/cocoa_status_item.m +++ b/dlls/winemac.drv/cocoa_status_item.m @@ -110,12 +110,17 @@ { macdrv_event* event; NSUInteger typeMask = NSEventMaskFromType([nsevent type]); + CGPoint point = CGEventGetLocation([nsevent CGEvent]); + + point = cgpoint_win_from_mac(point); event = macdrv_create_event(STATUS_ITEM_MOUSE_BUTTON, nil); event->status_item_mouse_button.item = (macdrv_status_item)self; event->status_item_mouse_button.button = [nsevent buttonNumber]; event->status_item_mouse_button.down = (typeMask & (NSLeftMouseDownMask | NSRightMouseDownMask | NSOtherMouseDownMask)) != 0; event->status_item_mouse_button.count = [nsevent clickCount]; + event->status_item_mouse_button.x = floor(point.x); + event->status_item_mouse_button.y = floor(point.y); [queue postEvent:event]; macdrv_release_event(event); } @@ -164,8 +169,14 @@ - (void) mouseMoved:(NSEvent*)nsevent { macdrv_event* event; + CGPoint point = CGEventGetLocation([nsevent CGEvent]); + + point = cgpoint_win_from_mac(point); + event = macdrv_create_event(STATUS_ITEM_MOUSE_MOVE, nil); event->status_item_mouse_move.item = (macdrv_status_item)self; + event->status_item_mouse_move.x = floor(point.x); + event->status_item_mouse_move.y = floor(point.y); [queue postEvent:event]; macdrv_release_event(event); } diff --git a/dlls/winemac.drv/macdrv_cocoa.h b/dlls/winemac.drv/macdrv_cocoa.h index 3ffeb01..c4d3a53 100644 --- a/dlls/winemac.drv/macdrv_cocoa.h +++ b/dlls/winemac.drv/macdrv_cocoa.h @@ -371,9 +371,13 @@ typedef struct macdrv_event { int button; int down; int count; + int x; + int y; } status_item_mouse_button; struct { macdrv_status_item item; + int x; + int y; } status_item_mouse_move; struct { int no_activate; diff --git a/dlls/winemac.drv/systray.c b/dlls/winemac.drv/systray.c index 16d2e6c..9351d77 100644 --- a/dlls/winemac.drv/systray.c +++ b/dlls/winemac.drv/systray.c @@ -46,6 +46,7 @@ struct tray_icon WCHAR tiptext[128]; /* tooltip text */ DWORD state; /* state flags */ macdrv_status_item status_item; + UINT version; }; static struct list icon_list = LIST_INIT(icon_list); @@ -263,6 +264,13 @@ int CDECL wine_notify_icon(DWORD msg, NOTIFYICONDATAW *data) case 0xdead: /* Wine extension: owner window has died */ cleanup_icons(data->hWnd); break; + case NIM_SETVERSION: + if ((icon = get_icon(data->hWnd, data->uID))) + { + icon->version = data->uVersion; + ret = TRUE; + } + break; default: FIXME("unhandled tray message: %u\n", msg); break; @@ -270,6 +278,27 @@ int CDECL wine_notify_icon(DWORD msg, NOTIFYICONDATAW *data) return ret; } +static BOOL notify_owner(struct tray_icon *icon, UINT msg, int x, int y) +{ + WPARAM wp = icon->id; + LPARAM lp = msg; + + if (icon->version >= NOTIFY_VERSION_4) + { + wp = MAKEWPARAM(x, y); + lp = MAKELPARAM(msg, icon->id); + } + + TRACE("posting msg 0x%04x to hwnd %p id 0x%x\n", msg, icon->owner, icon->id); + if (!PostMessageW(icon->owner, icon->callback_message, wp, lp) && + (GetLastError() == ERROR_INVALID_WINDOW_HANDLE)) + { + WARN("window %p was destroyed, removing icon 0x%x\n", icon->owner, icon->id); + delete_icon(icon); + return FALSE; + } + return TRUE; +} /*********************************************************************** * macdrv_status_item_mouse_button @@ -280,9 +309,10 @@ void macdrv_status_item_mouse_button(const macdrv_event *event) { struct tray_icon *icon; - TRACE("item %p button %d down %d count %d\n", event->status_item_mouse_button.item, + TRACE("item %p button %d down %d count %d pos %d,%d\n", event->status_item_mouse_button.item, event->status_item_mouse_button.button, event->status_item_mouse_button.down, - event->status_item_mouse_button.count); + event->status_item_mouse_button.count, event->status_item_mouse_button.x, + event->status_item_mouse_button.y); LIST_FOR_EACH_ENTRY(icon, &icon_list, struct tray_icon, entry) { @@ -313,13 +343,15 @@ void macdrv_status_item_mouse_button(const macdrv_event *event) return; } - TRACE("posting msg 0x%04x to hwnd %p id 0x%x\n", msg, icon->owner, icon->id); - if (!PostMessageW(icon->owner, icon->callback_message, icon->id, msg) && - GetLastError() == ERROR_INVALID_WINDOW_HANDLE) - { - WARN("window %p was destroyed, removing icon 0x%x\n", icon->owner, icon->id); - delete_icon(icon); + if (!notify_owner(icon, msg, event->status_item_mouse_button.x, event->status_item_mouse_button.y)) return; + + if (icon->version) + { + if (msg == WM_LBUTTONUP) + notify_owner(icon, NIN_SELECT, event->status_item_mouse_button.x, event->status_item_mouse_button.y); + else if (msg == WM_RBUTTONUP) + notify_owner(icon, WM_CONTEXTMENU, event->status_item_mouse_button.x, event->status_item_mouse_button.y); } break; @@ -337,20 +369,14 @@ void macdrv_status_item_mouse_move(const macdrv_event *event) { struct tray_icon *icon; - TRACE("item %p\n", event->status_item_mouse_move.item); + TRACE("item %p pos %d,%d\n", event->status_item_mouse_move.item, + event->status_item_mouse_move.x, event->status_item_mouse_move.y); LIST_FOR_EACH_ENTRY(icon, &icon_list, struct tray_icon, entry) { if (icon->status_item == event->status_item_mouse_move.item) { - if (!PostMessageW(icon->owner, icon->callback_message, icon->id, WM_MOUSEMOVE) && - GetLastError() == ERROR_INVALID_WINDOW_HANDLE) - { - WARN("window %p was destroyed, removing icon 0x%x\n", icon->owner, icon->id); - delete_icon(icon); - return; - } - + notify_owner(icon, WM_MOUSEMOVE, event->status_item_mouse_move.x, event->status_item_mouse_move.y); break; } }

1 0

Jacek Caban : kernel32/tests: Use shorter timeout for wait that we expect to time out.
by Alexandre Julliard May 11, 2017

May 11, 2017

Module: wine Branch: master Commit: 0be75640f512892eb241905f883f1f17a9094c53 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0be75640f512892eb241905f8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu May 11 13:49:01 2017 +0200 kernel32/tests: Use shorter timeout for wait that we expect to time out. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/pipe.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/pipe.c b/dlls/kernel32/tests/pipe.c index 0546e96..77450e3 100644 --- a/dlls/kernel32/tests/pipe.c +++ b/dlls/kernel32/tests/pipe.c @@ -213,7 +213,7 @@ static void test_CreateNamedPipe(int pipemode) hFile = CreateFileA(PIPENAME, GENERIC_READ | GENERIC_WRITE, 0, NULL, OPEN_EXISTING, 0, 0); ok(hFile != INVALID_HANDLE_VALUE, "CreateFile failed (%d)\n", GetLastError()); - ok(!WaitNamedPipeA(PIPENAME, 1000), "WaitNamedPipe succeeded\n"); + ok(!WaitNamedPipeA(PIPENAME, 100), "WaitNamedPipe succeeded\n"); ok(GetLastError() == ERROR_SEM_TIMEOUT, "wrong error %u\n", GetLastError());

1 0

Nikolay Sivov : comdlg32: Use existing symbol for Help button id.
by Alexandre Julliard May 11, 2017

May 11, 2017

Module: wine Branch: master Commit: 3c33ebd662c7b05d3a4be68a11dbe063baa229e2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c33ebd662c7b05d3a4be68a1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu May 11 12:13:05 2017 +0300 comdlg32: Use existing symbol for Help button id. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comdlg32/colordlg.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/comdlg32/colordlg.c b/dlls/comdlg32/colordlg.c index 5e67499..bead9ba 100644 --- a/dlls/comdlg32/colordlg.c +++ b/dlls/comdlg32/colordlg.c @@ -865,7 +865,7 @@ static LRESULT CC_WMInitDialog( HWND hDlg, WPARAM wParam, LPARAM lParam ) SetPropW( hDlg, szColourDialogProp, lpp ); if (!(lpp->lpcc->Flags & CC_SHOWHELP)) - ShowWindow( GetDlgItem(hDlg,0x40e), SW_HIDE); + ShowWindow(GetDlgItem(hDlg, pshHelp), SW_HIDE); lpp->msetrgb = RegisterWindowMessageA(SETRGBSTRINGA); #if 0 @@ -1041,7 +1041,7 @@ static LRESULT CC_WMCommand(CCPRIV *lpp, WPARAM wParam, LPARAM lParam, WORD noti CC_PaintTriangle(lpp); break; - case 0x40e: /* Help! */ /* The Beatles, 1965 ;-) */ + case pshHelp: /* Help! */ /* The Beatles, 1965 ;-) */ i = RegisterWindowMessageA(HELPMSGSTRINGA); if (lpp->lpcc->hwndOwner) SendMessageA(lpp->lpcc->hwndOwner, i, 0, (LPARAM)lpp->lpcc);

1 0

Michael Stefaniuc : dmime: Forward Init() to InitAudio().
by Alexandre Julliard May 11, 2017

May 11, 2017

Module: wine Branch: master Commit: 01c6b4fe640b475da96bcf2517d30f2c287bd9db URL: http://source.winehq.org/git/wine.git/?a=commit;h=01c6b4fe640b475da96bcf251… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu May 11 11:05:50 2017 +0200 dmime: Forward Init() to InitAudio(). Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmime/performance.c | 39 ++++----------------------------------- 1 file changed, 4 insertions(+), 35 deletions(-) diff --git a/dlls/dmime/performance.c b/dlls/dmime/performance.c index bbfc04f..2b9c984 100644 --- a/dlls/dmime/performance.c +++ b/dlls/dmime/performance.c @@ -247,43 +247,12 @@ static ULONG WINAPI IDirectMusicPerformance8Impl_Release(IDirectMusicPerformance /* IDirectMusicPerformanceImpl IDirectMusicPerformance Interface part: */ static HRESULT WINAPI IDirectMusicPerformance8Impl_Init(IDirectMusicPerformance8 *iface, - IDirectMusic **ppDirectMusic, IDirectSound *pDirectSound, HWND hWnd) + IDirectMusic **dmusic, IDirectSound *dsound, HWND hwnd) { - IDirectMusicPerformance8Impl *This = impl_from_IDirectMusicPerformance8(iface); - - FIXME("(iface = %p, dmusic = %p, dsound = %p, hwnd = %p)\n", This, ppDirectMusic, pDirectSound, hWnd); - if (This->dmusic) - return DMUS_E_ALREADY_INITED; - - if (NULL != pDirectSound) { - This->dsound = pDirectSound; - IDirectSound_AddRef(This->dsound); - } else { - DirectSoundCreate8(NULL, (IDirectSound8 **) &This->dsound, NULL); - if (!This->dsound) return DSERR_NODRIVER; + TRACE("(%p, %p, %p, %p)\n", iface, dmusic, dsound, hwnd); - if (!hWnd) - hWnd = GetForegroundWindow(); - IDirectSound_SetCooperativeLevel(This->dsound, hWnd, DSSCL_PRIORITY); - } - - if (NULL != ppDirectMusic && NULL != *ppDirectMusic) { - /* app creates its own dmusic object and gives it to performance */ - This->dmusic = (IDirectMusic8 *)*ppDirectMusic; - IDirectMusic8_AddRef(This->dmusic); - } else { - HRESULT hr; - /* App enables the performance to initialize itself and needs a pointer to object */ - hr = CoCreateInstance(&CLSID_DirectMusic, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusic8, (void **)&This->dmusic); - if (FAILED(hr)) - return hr; - if (ppDirectMusic) { - *ppDirectMusic = (IDirectMusic *)This->dmusic; - IDirectMusic8_AddRef((LPDIRECTMUSIC8)*ppDirectMusic); - } - } - - return S_OK; + return IDirectMusicPerformance8_InitAudio(iface, dmusic, dsound ? &dsound : NULL, hwnd, 0, 0, + 0, NULL); } static HRESULT WINAPI IDirectMusicPerformance8Impl_PlaySegment(IDirectMusicPerformance8 *iface,

1 0

Michael Stefaniuc : dmime: Do not use Init() from InitAudio().
by Alexandre Julliard May 11, 2017

May 11, 2017

Module: wine Branch: master Commit: 26011d2d3e3c0d616ef8c738c7941bffcb919396 URL: http://source.winehq.org/git/wine.git/?a=commit;h=26011d2d3e3c0d616ef8c738c… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu May 11 11:05:48 2017 +0200 dmime: Do not use Init() from InitAudio(). Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmime/performance.c | 25 +++++++++++++++++-------- 1 file changed, 17 insertions(+), 8 deletions(-) diff --git a/dlls/dmime/performance.c b/dlls/dmime/performance.c index 292ae80..2bd34d5 100644 --- a/dlls/dmime/performance.c +++ b/dlls/dmime/performance.c @@ -892,17 +892,30 @@ static HRESULT WINAPI IDirectMusicPerformance8Impl_RhythmToTime(IDirectMusicPerf /* IDirectMusicPerformance8 Interface part follow: */ static HRESULT WINAPI IDirectMusicPerformance8Impl_InitAudio(IDirectMusicPerformance8 *iface, - IDirectMusic **ppDirectMusic, IDirectSound **dsound, HWND hwnd, + IDirectMusic **dmusic, IDirectSound **dsound, HWND hwnd, DWORD dwDefaultPathType, DWORD dwPChannelCount, DWORD dwFlags, DMUS_AUDIOPARAMS* pParams) { IDirectMusicPerformance8Impl *This = impl_from_IDirectMusicPerformance8(iface); HRESULT hr = S_OK; - TRACE("(%p, %p, %p, %p, %x, %u, %x, %p)\n", This, ppDirectMusic, dsound, hwnd, dwDefaultPathType, dwPChannelCount, dwFlags, pParams); + TRACE("(%p, %p, %p, %p, %x, %u, %x, %p)\n", This, dmusic, dsound, hwnd, dwDefaultPathType, + dwPChannelCount, dwFlags, pParams); if (This->dmusic) return DMUS_E_ALREADY_INITED; + if (!dmusic || !*dmusic) { + hr = CoCreateInstance(&CLSID_DirectMusic, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusic8, + (void **)&This->dmusic); + if (FAILED(hr)) + return hr; + if (dmusic) + *dmusic = (IDirectMusic *)This->dmusic; + } else + This->dmusic = (IDirectMusic8 *)*dmusic; + if (dmusic) + IDirectMusic8_AddRef(This->dmusic); + if (!dsound || !*dsound) { hr = DirectSoundCreate8(NULL, (IDirectSound8 **)&This->dsound, NULL); if (FAILED(hr)) @@ -913,12 +926,8 @@ static HRESULT WINAPI IDirectMusicPerformance8Impl_InitAudio(IDirectMusicPerform *dsound = This->dsound; } else This->dsound = *dsound; - - IDirectMusicPerformance8_Init(iface, ppDirectMusic, This->dsound, hwnd); - - /* Init increases the ref count of the dsound object. Decrement it if the app doesn't want a pointer to the object. */ - if (!dsound) - IDirectSound_Release(This->dsound); + if (dsound) + IDirectSound_AddRef(This->dsound); /* as seen in msdn we need params init before audio path creation */ if (NULL != pParams) {

1 0