June 2015 - Wine-Commits - list.winehq.org

Alexandre Julliard : user32/tests: Add tests for SetClipboardData from a different thread.
by Alexandre Julliard June 10, 2015

June 10, 2015

Module: wine Branch: master Commit: cce57e9e3ee7b9caa29c5f7697d540759be3c20f URL: http://source.winehq.org/git/wine.git/?a=commit;h=cce57e9e3ee7b9caa29c5f769… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 10 18:37:34 2015 +0900 user32/tests: Add tests for SetClipboardData from a different thread. --- dlls/user32/tests/clipboard.c | 132 +++++++++++++++++++++++++++++++++++------- 1 file changed, 112 insertions(+), 20 deletions(-) diff --git a/dlls/user32/tests/clipboard.c b/dlls/user32/tests/clipboard.c index b9add86..be6c9bf 100644 --- a/dlls/user32/tests/clipboard.c +++ b/dlls/user32/tests/clipboard.c @@ -27,26 +27,84 @@ static BOOL (WINAPI *pAddClipboardFormatListener)(HWND hwnd); static DWORD (WINAPI *pGetClipboardSequenceNumber)(void); +static int thread_from_line; + static DWORD WINAPI open_clipboard_thread(LPVOID arg) { HWND hWnd = arg; - ok(OpenClipboard(hWnd), "OpenClipboard failed\n"); + ok(OpenClipboard(hWnd), "%u: OpenClipboard failed\n", thread_from_line); return 0; } static DWORD WINAPI empty_clipboard_thread(LPVOID arg) { SetLastError( 0xdeadbeef ); - ok(!EmptyClipboard(), "EmptyClipboard succeeded\n" ); - ok( GetLastError() == ERROR_CLIPBOARD_NOT_OPEN, "wrong error %u\n", GetLastError()); + ok(!EmptyClipboard(), "%u: EmptyClipboard succeeded\n", thread_from_line ); + ok( GetLastError() == ERROR_CLIPBOARD_NOT_OPEN, "%u: wrong error %u\n", + thread_from_line, GetLastError()); return 0; } -static void test_ClipboardOwner(void) +static DWORD WINAPI open_and_empty_clipboard_thread(LPVOID arg) +{ + HWND hWnd = arg; + ok(OpenClipboard(hWnd), "%u: OpenClipboard failed\n", thread_from_line); + ok(EmptyClipboard(), "%u: EmptyClipboard failed\n", thread_from_line ); + return 0; +} + +static DWORD WINAPI set_clipboard_data_thread(LPVOID arg) +{ + HWND hwnd = arg; + HANDLE ret; + + SetLastError( 0xdeadbeef ); + if (GetClipboardOwner() == hwnd) + { + SetClipboardData( CF_WAVE, 0 ); + todo_wine ok( IsClipboardFormatAvailable( CF_WAVE ), "%u: SetClipboardData failed\n", thread_from_line ); + ret = SetClipboardData( CF_WAVE, GlobalAlloc( GMEM_DDESHARE | GMEM_ZEROINIT, 100 )); + ok( ret != 0, "%u: SetClipboardData failed err %u\n", thread_from_line, GetLastError() ); + } + else + { + SetClipboardData( CF_WAVE, 0 ); + todo_wine ok( GetLastError() == ERROR_CLIPBOARD_NOT_OPEN, "%u: wrong error %u\n", + thread_from_line, GetLastError()); + ok( !IsClipboardFormatAvailable( CF_WAVE ), "%u: SetClipboardData succeeded\n", thread_from_line ); + ret = SetClipboardData( CF_WAVE, GlobalAlloc( GMEM_DDESHARE | GMEM_ZEROINIT, 100 )); + todo_wine ok( !ret, "%u: SetClipboardData succeeded\n", thread_from_line ); + todo_wine ok( GetLastError() == ERROR_CLIPBOARD_NOT_OPEN, "%u: wrong error %u\n", + thread_from_line, GetLastError()); + } + return 0; +} + +static void run_thread( LPTHREAD_START_ROUTINE func, void *arg, int line ) { + DWORD ret; HANDLE thread; + + thread_from_line = line; + thread = CreateThread(NULL, 0, func, arg, 0, NULL); + ok(thread != NULL, "%u: CreateThread failed with error %d\n", line, GetLastError()); + for (;;) + { + ret = MsgWaitForMultipleObjectsEx( 1, &thread, 1000, QS_ALLINPUT, 0 ); + if (ret == WAIT_OBJECT_0 + 1) + { + MSG msg; + while (PeekMessageW( &msg, 0, 0, 0, PM_REMOVE )) DispatchMessageW( &msg ); + } + else break; + } + ok(ret == WAIT_OBJECT_0, "%u: expected WAIT_OBJECT_0, got %u\n", line, ret); + CloseHandle(thread); +} + +static void test_ClipboardOwner(void) +{ HWND hWnd1, hWnd2; - DWORD dwret; BOOL ret; SetLastError(0xdeadbeef); @@ -76,16 +134,9 @@ static void test_ClipboardOwner(void) ok( ret, "CloseClipboard error %d\n", GetLastError()); ok(OpenClipboard(hWnd1), "OpenClipboard failed\n"); - thread = CreateThread(NULL, 0, open_clipboard_thread, hWnd1, 0, NULL); - ok(thread != NULL, "CreateThread failed with error %d\n", GetLastError()); - dwret = WaitForSingleObject(thread, 1000); - ok(dwret == WAIT_OBJECT_0, "expected WAIT_OBJECT_0, got %u\n", dwret); - CloseHandle(thread); - thread = CreateThread(NULL, 0, empty_clipboard_thread, 0, 0, NULL); - ok(thread != NULL, "CreateThread failed with error %d\n", GetLastError()); - dwret = WaitForSingleObject(thread, 1000); - ok(dwret == WAIT_OBJECT_0, "expected WAIT_OBJECT_0, got %u\n", dwret); - CloseHandle(thread); + run_thread( open_clipboard_thread, hWnd1, __LINE__ ); + run_thread( empty_clipboard_thread, 0, __LINE__ ); + run_thread( set_clipboard_data_thread, hWnd1, __LINE__ ); ok(!CloseClipboard(), "CloseClipboard should fail if clipboard wasn't open\n"); ok(OpenClipboard(hWnd1), "OpenClipboard failed\n"); @@ -99,6 +150,8 @@ static void test_ClipboardOwner(void) ret = EmptyClipboard(); ok( ret, "EmptyClipboard error %d\n", GetLastError()); ok(GetClipboardOwner() == hWnd1, "clipboard should be owned by %p, not by %p\n", hWnd1, GetClipboardOwner()); + run_thread( empty_clipboard_thread, 0, __LINE__ ); + run_thread( set_clipboard_data_thread, hWnd1, __LINE__ ); SetLastError(0xdeadbeef); ret = OpenClipboard(hWnd2); @@ -109,12 +162,54 @@ static void test_ClipboardOwner(void) ok( ret, "CloseClipboard error %d\n", GetLastError()); ok(GetClipboardOwner() == hWnd1, "clipboard should still be owned\n"); + /* any window will do, even from a different process */ + ret = OpenClipboard( GetDesktopWindow() ); + ok( ret, "OpenClipboard error %d\n", GetLastError()); + ret = EmptyClipboard(); + ok( ret, "EmptyClipboard error %d\n", GetLastError()); + ok( GetClipboardOwner() == GetDesktopWindow(), "wrong owner %p/%p\n", + GetClipboardOwner(), GetDesktopWindow() ); + run_thread( set_clipboard_data_thread, GetDesktopWindow(), __LINE__ ); + ret = CloseClipboard(); + ok( ret, "CloseClipboard error %d\n", GetLastError()); + + ret = OpenClipboard( hWnd1 ); + ok( ret, "OpenClipboard error %d\n", GetLastError()); + ret = EmptyClipboard(); + ok( ret, "EmptyClipboard error %d\n", GetLastError()); + ok( GetClipboardOwner() == hWnd1, "wrong owner %p/%p\n", GetClipboardOwner(), hWnd1 ); + ret = CloseClipboard(); + ok( ret, "CloseClipboard error %d\n", GetLastError()); + ret = DestroyWindow(hWnd1); ok( ret, "DestroyWindow error %d\n", GetLastError()); ret = DestroyWindow(hWnd2); ok( ret, "DestroyWindow error %d\n", GetLastError()); SetLastError(0xdeadbeef); ok(!GetClipboardOwner() && GetLastError() == 0xdeadbeef, "clipboard should not be owned\n"); + + ret = OpenClipboard( 0 ); + ok( ret, "OpenClipboard error %d\n", GetLastError()); + run_thread( set_clipboard_data_thread, 0, __LINE__ ); + ret = CloseClipboard(); + ok( ret, "CloseClipboard error %d\n", GetLastError()); + + run_thread( open_and_empty_clipboard_thread, 0, __LINE__ ); + + ret = OpenClipboard( 0 ); + ok( ret, "OpenClipboard error %d\n", GetLastError()); + run_thread( set_clipboard_data_thread, 0, __LINE__ ); + ret = EmptyClipboard(); + ok( ret, "EmptyClipboard error %d\n", GetLastError()); + ret = CloseClipboard(); + ok( ret, "CloseClipboard error %d\n", GetLastError()); + + SetLastError( 0xdeadbeef ); + todo_wine ok( !SetClipboardData( CF_WAVE, GlobalAlloc( GMEM_DDESHARE | GMEM_ZEROINIT, 100 )), + "SetClipboardData succeeded\n" ); + todo_wine ok( GetLastError() == ERROR_CLIPBOARD_NOT_OPEN, "wrong error %u\n", GetLastError() ); + todo_wine ok( !IsClipboardFormatAvailable( CF_WAVE ), "SetClipboardData succeeded\n" ); + } static void test_RegisterClipboardFormatA(void) @@ -290,12 +385,9 @@ static void test_synthesized(void) ok(data != NULL, "couldn't get data, cf %08x\n", cf); cf = EnumClipboardFormats(cf); - ok(cf == CF_UNICODETEXT || - broken(cf == CF_METAFILEPICT), /* win9x and winME has no CF_UNICODETEXT */ - "cf %08x\n", cf); + ok(cf == CF_UNICODETEXT, "cf %08x\n", cf); - if(cf == CF_UNICODETEXT) - cf = EnumClipboardFormats(cf); + cf = EnumClipboardFormats(cf); ok(cf == CF_METAFILEPICT, "cf %08x\n", cf); data = GetClipboardData(cf); todo_wine ok(data != NULL, "couldn't get data, cf %08x\n", cf);

1 0

Huw Davies : shlwapi/tests: Fix failing tests on Vista and Win 2008.
by Alexandre Julliard June 10, 2015

June 10, 2015

Module: wine Branch: master Commit: 9327e476d4c7721dd01317d22b0479c8da0c0de5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9327e476d4c7721dd01317d22… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Jun 10 13:10:50 2015 +0100 shlwapi/tests: Fix failing tests on Vista and Win 2008. SHMapHandle fails with a variety of errors on these platforms. --- dlls/shlwapi/tests/ordinal.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/shlwapi/tests/ordinal.c b/dlls/shlwapi/tests/ordinal.c index 9225219..17edf65 100644 --- a/dlls/shlwapi/tests/ordinal.c +++ b/dlls/shlwapi/tests/ordinal.c @@ -548,10 +548,10 @@ static void test_alloc_shared_remote(DWORD procid, HANDLE hmem) hmem2 = pSHMapHandle(hmem, procid, GetCurrentProcessId(), 0, 0); /* It seems like Windows Vista/2008 uses a different internal implementation - * for shared memory, and calling SHMapHandle fails with ERROR_INVALID_HANDLE. */ - ok(hmem2 != NULL || broken(hmem2 == NULL && GetLastError() == ERROR_INVALID_HANDLE), + * for shared memory, and calling SHMapHandle fails. */ + ok(hmem2 != NULL || broken(hmem2 == NULL), "SHMapHandle failed: %u\n", GetLastError()); - if (hmem2 == NULL && GetLastError() == ERROR_INVALID_HANDLE) + if (hmem2 == NULL) { win_skip("Subprocess failed to map shared memory, skipping test\n"); return;

1 0

Joachim Priesner : ieframe: shellbrowser: Strip 'file://' from file URLs in BEFORENAVIGATE2 callbacks.
by Alexandre Julliard June 10, 2015

June 10, 2015

Module: wine Branch: master Commit: ba2274c8bae67e9510ab24ca1caa6576874c8c6d URL: http://source.winehq.org/git/wine.git/?a=commit;h=ba2274c8bae67e9510ab24ca1… Author: Joachim Priesner <joachim.priesner(a)web.de> Date: Tue Jun 9 16:42:42 2015 +0200 ieframe: shellbrowser: Strip 'file://' from file URLs in BEFORENAVIGATE2 callbacks. This is a straightforward port of commit 8eb70459a18f6d8a80c9570875e2c664e6afbb56 which does the same thing for the matching method in navigate.c. --- dlls/ieframe/shellbrowser.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/ieframe/shellbrowser.c b/dlls/ieframe/shellbrowser.c index 4d5a818..8145536 100644 --- a/dlls/ieframe/shellbrowser.c +++ b/dlls/ieframe/shellbrowser.c @@ -23,6 +23,7 @@ #include "ieframe.h" #include "exdispid.h" +#include "shlwapi.h" #include "wine/debug.h" @@ -656,6 +657,8 @@ static HRESULT WINAPI DocObjectService_FireBeforeNavigate2( DISPPARAMS dp = {params, NULL, 7, 0}; VARIANT_BOOL cancel = VARIANT_FALSE; SAFEARRAY *post_data; + WCHAR file_path[MAX_PATH]; + DWORD file_path_len = sizeof(file_path) / sizeof(*file_path); TRACE("%p %p %s %x %s %p %d %s %d %p\n", This, pDispatch, debugstr_w(lpszUrl), dwFlags, debugstr_w(lpszFrameName), pPostData, cbPostData, @@ -703,7 +706,10 @@ static HRESULT WINAPI DocObjectService_FireBeforeNavigate2( V_VT(params+5) = (VT_BYREF|VT_VARIANT); V_VARIANTREF(params+5) = &var_url; V_VT(&var_url) = VT_BSTR; - V_BSTR(&var_url) = SysAllocString(lpszUrl); + if(PathCreateFromUrlW(lpszUrl, file_path, &file_path_len, 0) == S_OK) + V_BSTR(&var_url) = SysAllocString(file_path); + else + V_BSTR(&var_url) = SysAllocString(lpszUrl); V_VT(params+6) = (VT_DISPATCH); V_DISPATCH(params+6) = (IDispatch*)This->doc_host->wb;

1 0

Zebediah Figura : include: Add WNODE flags to wmistr.h.
by Alexandre Julliard June 10, 2015

June 10, 2015

Module: wine Branch: master Commit: be47a6f59db4a25dbad152e0d84e3053009b3a03 URL: http://source.winehq.org/git/wine.git/?a=commit;h=be47a6f59db4a25dbad152e0d… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Jun 7 22:54:53 2015 -0500 include: Add WNODE flags to wmistr.h. --- include/wmistr.h | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/include/wmistr.h b/include/wmistr.h index 5a806b6..0962fc3 100644 --- a/include/wmistr.h +++ b/include/wmistr.h @@ -19,6 +19,24 @@ #ifndef _WMISTR_ #define _WMISTR_ +#define WNODE_FLAG_ALL_DATA 0x00000001 +#define WNODE_FLAG_SINGLE_INSTANCE 0x00000002 +#define WNODE_FLAG_SINGLE_ITEM 0x00000004 +#define WNODE_FLAG_EVENT_ITEM 0x00000008 +#define WNODE_FLAG_FIXED_INSTANCE_SIZE 0x00000010 +#define WNODE_FLAG_TOO_SMALL 0x00000020 +#define WNODE_FLAG_INSTANCES_SAME 0x00000040 +#define WNODE_FLAG_STATIC_INSTANCE_NAMES 0x00000080 +#define WNODE_FLAG_USE_TIMESTAMP 0x00000200 +#define WNODE_FLAG_EVENT_REFERENCE 0x00002000 +#define WNODE_FLAG_METHOD_ITEM 0x00008000 +#define WNODE_FLAG_PDO_INSTANCE_NAMES 0x00010000 +#define WNODE_FLAG_TRACED_GUID 0x00020000 +#define WNODE_FLAG_LOG_WNODE 0x00040000 +#define WNODE_FLAG_USE_GUID_PTR 0x00080000 +#define WNODE_FLAG_USE_MOF_PTR 0x00100000 +#define WNODE_FLAG_SEVERITY_MASK 0xFF000000 + typedef enum { WMI_GET_ALL_DATA = 0,

1 0

Daniel Lehman : msvcp110: Add wide-char days and months to _LocInfo.
by Alexandre Julliard June 10, 2015

June 10, 2015

Module: wine Branch: master Commit: 79118f3543c1ba0920c970acaa79c06bc34322ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=79118f3543c1ba0920c970aca… Author: Daniel Lehman <dlehman(a)esri.com> Date: Mon Jun 8 14:17:39 2015 -0700 msvcp110: Add wide-char days and months to _LocInfo. --- dlls/msvcp110/msvcp110.spec | 12 ++--- dlls/msvcp120/msvcp120.spec | 12 ++--- dlls/msvcp120_app/msvcp120_app.spec | 12 ++--- dlls/msvcp90/locale.c | 92 +++++++++++++++++++++++++++++++++++++ dlls/msvcp90/msvcp90.h | 5 ++ 5 files changed, 115 insertions(+), 18 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=79118f3543c1ba0920c97…

1 0

Daniel Lehman : msvcp110: Add _Yarn<wchar_t> implementaton.
by Alexandre Julliard June 10, 2015

June 10, 2015

Module: wine Branch: master Commit: 5ac70b2c23e456467c17ba38427d76897282066d URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ac70b2c23e456467c17ba384… Author: Daniel Lehman <dlehman(a)esri.com> Date: Fri Jun 5 15:08:21 2015 -0700 msvcp110: Add _Yarn<wchar_t> implementaton. --- dlls/msvcp110/msvcp110.spec | 36 +++++++++--------- dlls/msvcp120/msvcp120.spec | 36 +++++++++--------- dlls/msvcp120_app/msvcp120_app.spec | 36 +++++++++--------- dlls/msvcp90/msvcp90.h | 6 +++ dlls/msvcp90/string.c | 73 +++++++++++++++++++++++++++++++++++++ 5 files changed, 133 insertions(+), 54 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5ac70b2c23e456467c17b…

1 0

Michael Stefaniuc : dswave: Get rid of the extra pointer to a DMUS_OBJECTDESC.
by Alexandre Julliard June 10, 2015

June 10, 2015

Module: wine Branch: master Commit: 7370bed7146affdfe1a39d04b2008e9ac951f532 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7370bed7146affdfe1a39d04b… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Jun 10 01:06:30 2015 +0200 dswave: Get rid of the extra pointer to a DMUS_OBJECTDESC. --- dlls/dswave/dswave.c | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/dlls/dswave/dswave.c b/dlls/dswave/dswave.c index f1ddf73..b93908d 100644 --- a/dlls/dswave/dswave.c +++ b/dlls/dswave/dswave.c @@ -34,7 +34,6 @@ typedef struct IDirectMusicWaveImpl { IUnknown IUnknown_iface; struct dmobject dmobj; LONG ref; - LPDMUS_OBJECTDESC pDesc; } IDirectMusicWaveImpl; /* IDirectMusicWaveImpl IUnknown part: */ @@ -275,8 +274,8 @@ static HRESULT WINAPI IPersistStreamImpl_Load(IPersistStream *iface, IStream *pS FIXME("(%p, %p): loading not implemented yet (only descriptor is loaded)\n", This, pStm); /* FIXME: should this be determined from stream? */ - This->pDesc->dwValidData |= DMUS_OBJ_CLASS; - This->pDesc->guidClass = CLSID_DirectMusicSegment; + This->dmobj.desc.dwValidData |= DMUS_OBJ_CLASS; + This->dmobj.desc.guidClass = CLSID_DirectMusicSegment; IStream_Read (pStm, &Chunk, sizeof(FOURCC)+sizeof(DWORD), NULL); TRACE_(dmfile)(": %s chunk (size = 0x%04x)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize); @@ -295,20 +294,20 @@ static HRESULT WINAPI IPersistStreamImpl_Load(IPersistStream *iface, IStream *pS switch (Chunk.fccID) { case DMUS_FOURCC_GUID_CHUNK: { TRACE_(dmfile)(": GUID chunk\n"); - This->pDesc->dwValidData |= DMUS_OBJ_OBJECT; - IStream_Read (pStm, &This->pDesc->guidObject, Chunk.dwSize, NULL); + This->dmobj.desc.dwValidData |= DMUS_OBJ_OBJECT; + IStream_Read (pStm, &This->dmobj.desc.guidObject, Chunk.dwSize, NULL); break; } case DMUS_FOURCC_VERSION_CHUNK: { TRACE_(dmfile)(": version chunk\n"); - This->pDesc->dwValidData |= DMUS_OBJ_VERSION; - IStream_Read (pStm, &This->pDesc->vVersion, Chunk.dwSize, NULL); + This->dmobj.desc.dwValidData |= DMUS_OBJ_VERSION; + IStream_Read (pStm, &This->dmobj.desc.vVersion, Chunk.dwSize, NULL); break; } case DMUS_FOURCC_CATEGORY_CHUNK: { TRACE_(dmfile)(": category chunk\n"); - This->pDesc->dwValidData |= DMUS_OBJ_CATEGORY; - IStream_Read (pStm, This->pDesc->wszCategory, Chunk.dwSize, NULL); + This->dmobj.desc.dwValidData |= DMUS_OBJ_CATEGORY; + IStream_Read (pStm, This->dmobj.desc.wszCategory, Chunk.dwSize, NULL); break; } case FOURCC_LIST: { @@ -330,8 +329,8 @@ static HRESULT WINAPI IPersistStreamImpl_Load(IPersistStream *iface, IStream *pS case mmioFOURCC('I','N','A','M'): case DMUS_FOURCC_UNAM_CHUNK: { TRACE_(dmfile)(": name chunk\n"); - This->pDesc->dwValidData |= DMUS_OBJ_NAME; - IStream_Read (pStm, This->pDesc->wszName, Chunk.dwSize, NULL); + This->dmobj.desc.dwValidData |= DMUS_OBJ_NAME; + IStream_Read (pStm, This->dmobj.desc.wszName, Chunk.dwSize, NULL); break; } case mmioFOURCC('I','A','R','T'): @@ -439,7 +438,6 @@ HRESULT WINAPI create_dswave(REFIID lpcGUID, void **ppobj) dmobject_init(&obj->dmobj, &CLSID_DirectSoundWave, &obj->IUnknown_iface); obj->dmobj.IDirectMusicObject_iface.lpVtbl = &dmobject_vtbl; obj->dmobj.IPersistStream_iface.lpVtbl = &persiststream_vtbl; - obj->pDesc = &obj->dmobj.desc; DSWAVE_LockModule(); hr = IUnknown_QueryInterface(&obj->IUnknown_iface, lpcGUID, ppobj);

1 0

Michael Stefaniuc : dswave/tests: Check for the private interface in DirectSoundWave.
by Alexandre Julliard June 10, 2015

June 10, 2015

Module: wine Branch: master Commit: 770f7de1f4533324f270bd797641da642583cf21 URL: http://source.winehq.org/git/wine.git/?a=commit;h=770f7de1f4533324f270bd797… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Jun 10 00:59:32 2015 +0200 dswave/tests: Check for the private interface in DirectSoundWave. --- dlls/dswave/tests/dswave.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/dlls/dswave/tests/dswave.c b/dlls/dswave/tests/dswave.c index 634513e..c2fc08f 100644 --- a/dlls/dswave/tests/dswave.c +++ b/dlls/dswave/tests/dswave.c @@ -24,6 +24,9 @@ #include <wine/test.h> #include <dmusici.h> +DEFINE_GUID(IID_IDirectMusicWavePRIVATE, 0x69e934e4, 0x97f1, 0x4f1d, 0x88, 0xe8, 0xf2, 0xac, 0x88, + 0x67, 0x13, 0x27); + static BOOL missing_dswave(void) { IDirectMusicObject *dmo; @@ -77,6 +80,14 @@ static void test_COM(void) ok(refcount == 5, "refcount == %u, expected 5\n", refcount); refcount = IUnknown_Release(unk); + hr = IDirectMusicObject_QueryInterface(dmo, &IID_IDirectMusicWavePRIVATE, (void**)&unk); + todo_wine ok(hr == S_OK, "QueryInterface for IID_IDirectMusicWavePRIVATE failed: %08x\n", hr); + if (hr == S_OK) { + refcount = IUnknown_AddRef(unk); + ok(refcount == 6, "refcount == %u, expected 6\n", refcount); + refcount = IUnknown_Release(unk); + } + /* Interfaces that native does not support */ hr = IDirectMusicObject_QueryInterface(dmo, &IID_IDirectMusicSegment, (void**)&unk); ok(hr == E_NOINTERFACE, "QueryInterface for IID_IDirectMusicSegment failed: %08x\n", hr);

1 0

Nikolay Sivov : dwrite: Fix problems with outline conversion and reporting.
by Alexandre Julliard June 10, 2015

June 10, 2015

Module: wine Branch: master Commit: eca362bd76a4877008e6304ac80b03229360c962 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eca362bd76a4877008e6304ac… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jun 10 00:13:34 2015 +0300 dwrite: Fix problems with outline conversion and reporting. --- dlls/dwrite/font.c | 2 +- dlls/dwrite/freetype.c | 201 ++++++++++++++++++++++++++--------------------- dlls/dwrite/tests/font.c | 4 +- 3 files changed, 114 insertions(+), 93 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=eca362bd76a4877008e63…

1 0

Alexandre Julliard : kernel32: Avoid resolving imports against the advapi32 forwards.
by Alexandre Julliard June 10, 2015

June 10, 2015

Module: wine Branch: master Commit: 3494fb7f72e994c6f309e525ea3d01edf9efae1a URL: http://source.winehq.org/git/wine.git/?a=commit;h=3494fb7f72e994c6f309e525e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 10 15:03:35 2015 +0900 kernel32: Avoid resolving imports against the advapi32 forwards. --- dlls/dwrite/Makefile.in | 2 +- dlls/joy.cpl/Makefile.in | 2 +- dlls/kernel32/kernel32.spec | 74 ++++++++++++++++++++++---------------------- dlls/shdocvw/Makefile.in | 2 +- dlls/wineoss.drv/Makefile.in | 2 +- 5 files changed, 41 insertions(+), 41 deletions(-) diff --git a/dlls/dwrite/Makefile.in b/dlls/dwrite/Makefile.in index ded14db..3092a02 100644 --- a/dlls/dwrite/Makefile.in +++ b/dlls/dwrite/Makefile.in @@ -1,6 +1,6 @@ MODULE = dwrite.dll IMPORTLIB = dwrite -IMPORTS = user32 gdi32 +IMPORTS = user32 gdi32 advapi32 EXTRAINCL = $(FREETYPE_CFLAGS) C_SRCS = \ diff --git a/dlls/joy.cpl/Makefile.in b/dlls/joy.cpl/Makefile.in index d1419e2..df3e3d4 100644 --- a/dlls/joy.cpl/Makefile.in +++ b/dlls/joy.cpl/Makefile.in @@ -1,5 +1,5 @@ MODULE = joy.cpl -IMPORTS = dxguid dinput dinput8 ole32 comctl32 user32 +IMPORTS = dxguid dinput dinput8 ole32 comctl32 user32 advapi32 C_SRCS = \ main.c diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index d5e95c1..a0c8123 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -1195,48 +1195,48 @@ @ stdcall ReadFileScatter(long ptr long ptr ptr) @ stdcall ReadProcessMemory(long ptr ptr long ptr) # @ stub ReadThreadProfilingData -@ stdcall RegCloseKey(long) advapi32.RegCloseKey -@ stdcall RegCreateKeyExA(long str long ptr long long ptr ptr ptr) advapi32.RegCreateKeyExA -@ stdcall RegCreateKeyExW(long wstr long ptr long long ptr ptr ptr) advapi32.RegCreateKeyExW -@ stdcall RegDeleteKeyExA(long str long long) advapi32.RegDeleteKeyExA -@ stdcall RegDeleteKeyExW(long wstr long long) advapi32.RegDeleteKeyExW -@ stdcall RegDeleteTreeA(long str) advapi32.RegDeleteTreeA -@ stdcall RegDeleteTreeW(long wstr) advapi32.RegDeleteTreeW -@ stdcall RegDeleteValueA(long str) advapi32.RegDeleteValueA -@ stdcall RegDeleteValueW(long wstr) advapi32.RegDeleteValueW +@ stdcall -private RegCloseKey(long) advapi32.RegCloseKey +@ stdcall -private RegCreateKeyExA(long str long ptr long long ptr ptr ptr) advapi32.RegCreateKeyExA +@ stdcall -private RegCreateKeyExW(long wstr long ptr long long ptr ptr ptr) advapi32.RegCreateKeyExW +@ stdcall -private RegDeleteKeyExA(long str long long) advapi32.RegDeleteKeyExA +@ stdcall -private RegDeleteKeyExW(long wstr long long) advapi32.RegDeleteKeyExW +@ stdcall -private RegDeleteTreeA(long str) advapi32.RegDeleteTreeA +@ stdcall -private RegDeleteTreeW(long wstr) advapi32.RegDeleteTreeW +@ stdcall -private RegDeleteValueA(long str) advapi32.RegDeleteValueA +@ stdcall -private RegDeleteValueW(long wstr) advapi32.RegDeleteValueW # stub RegDisablePredefinedCacheEx -@ stdcall RegEnumKeyExA(long long ptr ptr ptr ptr ptr ptr) advapi32.RegEnumKeyExA -@ stdcall RegEnumKeyExW(long long ptr ptr ptr ptr ptr ptr) advapi32.RegEnumKeyExW -@ stdcall RegEnumValueA(long long ptr ptr ptr ptr ptr ptr) advapi32.RegEnumValueA -@ stdcall RegEnumValueW(long long ptr ptr ptr ptr ptr ptr) advapi32.RegEnumValueW -@ stdcall RegFlushKey(long) advapi32.RegFlushKey -@ stdcall RegGetKeySecurity(long long ptr ptr) advapi32.RegGetKeySecurity -@ stdcall RegGetValueA(long str str long ptr ptr ptr) advapi32.RegGetValueA -@ stdcall RegGetValueW(long wstr wstr long ptr ptr ptr) advapi32.RegGetValueW +@ stdcall -private RegEnumKeyExA(long long ptr ptr ptr ptr ptr ptr) advapi32.RegEnumKeyExA +@ stdcall -private RegEnumKeyExW(long long ptr ptr ptr ptr ptr ptr) advapi32.RegEnumKeyExW +@ stdcall -private RegEnumValueA(long long ptr ptr ptr ptr ptr ptr) advapi32.RegEnumValueA +@ stdcall -private RegEnumValueW(long long ptr ptr ptr ptr ptr ptr) advapi32.RegEnumValueW +@ stdcall -private RegFlushKey(long) advapi32.RegFlushKey +@ stdcall -private RegGetKeySecurity(long long ptr ptr) advapi32.RegGetKeySecurity +@ stdcall -private RegGetValueA(long str str long ptr ptr ptr) advapi32.RegGetValueA +@ stdcall -private RegGetValueW(long wstr wstr long ptr ptr ptr) advapi32.RegGetValueW # stub RegKrnGetGlobalState # stub RegKrnInitialize -@ stdcall RegLoadKeyA(long str str) advapi32.RegLoadKeyA -@ stdcall RegLoadKeyW(long wstr wstr) advapi32.RegLoadKeyW -@ stdcall RegLoadMUIStringA(long str str long ptr long str) advapi32.RegLoadMUIStringA -@ stdcall RegLoadMUIStringW(long wstr wstr long ptr long wstr) advapi32.RegLoadMUIStringW -@ stdcall RegNotifyChangeKeyValue(long long long long long) advapi32.RegNotifyChangeKeyValue -@ stdcall RegOpenCurrentUser(long ptr) advapi32.RegOpenCurrentUser -@ stdcall RegOpenKeyExA(long str long long ptr) advapi32.RegOpenKeyExA -@ stdcall RegOpenKeyExW(long wstr long long ptr) advapi32.RegOpenKeyExW -@ stdcall RegOpenUserClassesRoot(ptr long long ptr) advapi32.RegOpenUserClassesRoot -@ stdcall RegQueryInfoKeyA(long ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr) advapi32.RegQueryInfoKeyA -@ stdcall RegQueryInfoKeyW(long ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr) advapi32.RegQueryInfoKeyW -@ stdcall RegQueryValueExA(long str ptr ptr ptr ptr) advapi32.RegQueryValueExA -@ stdcall RegQueryValueExW(long wstr ptr ptr ptr ptr) advapi32.RegQueryValueExW -@ stdcall RegRestoreKeyA(long str long) advapi32.RegRestoreKeyA -@ stdcall RegRestoreKeyW(long wstr long) advapi32.RegRestoreKeyW +@ stdcall -private RegLoadKeyA(long str str) advapi32.RegLoadKeyA +@ stdcall -private RegLoadKeyW(long wstr wstr) advapi32.RegLoadKeyW +@ stdcall -private RegLoadMUIStringA(long str str long ptr long str) advapi32.RegLoadMUIStringA +@ stdcall -private RegLoadMUIStringW(long wstr wstr long ptr long wstr) advapi32.RegLoadMUIStringW +@ stdcall -private RegNotifyChangeKeyValue(long long long long long) advapi32.RegNotifyChangeKeyValue +@ stdcall -private RegOpenCurrentUser(long ptr) advapi32.RegOpenCurrentUser +@ stdcall -private RegOpenKeyExA(long str long long ptr) advapi32.RegOpenKeyExA +@ stdcall -private RegOpenKeyExW(long wstr long long ptr) advapi32.RegOpenKeyExW +@ stdcall -private RegOpenUserClassesRoot(ptr long long ptr) advapi32.RegOpenUserClassesRoot +@ stdcall -private RegQueryInfoKeyA(long ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr) advapi32.RegQueryInfoKeyA +@ stdcall -private RegQueryInfoKeyW(long ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr) advapi32.RegQueryInfoKeyW +@ stdcall -private RegQueryValueExA(long str ptr ptr ptr ptr) advapi32.RegQueryValueExA +@ stdcall -private RegQueryValueExW(long wstr ptr ptr ptr ptr) advapi32.RegQueryValueExW +@ stdcall -private RegRestoreKeyA(long str long) advapi32.RegRestoreKeyA +@ stdcall -private RegRestoreKeyW(long wstr long) advapi32.RegRestoreKeyW # stub RegSaveKeyExA # stub RegSaveKeyExW -@ stdcall RegSetKeySecurity(long long ptr) advapi32.RegSetKeySecurity -@ stdcall RegSetValueExA(long str long long ptr long) advapi32.RegSetValueExA -@ stdcall RegSetValueExW(long wstr long long ptr long) advapi32.RegSetValueExW -@ stdcall RegUnLoadKeyA(long str) advapi32.RegUnLoadKeyA -@ stdcall RegUnLoadKeyW(long wstr) advapi32.RegUnLoadKeyW +@ stdcall -private RegSetKeySecurity(long long ptr) advapi32.RegSetKeySecurity +@ stdcall -private RegSetValueExA(long str long long ptr long) advapi32.RegSetValueExA +@ stdcall -private RegSetValueExW(long wstr long long ptr long) advapi32.RegSetValueExW +@ stdcall -private RegUnLoadKeyA(long str) advapi32.RegUnLoadKeyA +@ stdcall -private RegUnLoadKeyW(long wstr) advapi32.RegUnLoadKeyW @ stdcall RegisterApplicationRecoveryCallback(ptr ptr long long) @ stdcall RegisterApplicationRestart(wstr long) @ stub RegisterConsoleIME diff --git a/dlls/shdocvw/Makefile.in b/dlls/shdocvw/Makefile.in index 87dab21..30b0a1a 100644 --- a/dlls/shdocvw/Makefile.in +++ b/dlls/shdocvw/Makefile.in @@ -1,7 +1,7 @@ EXTRADEFS = -D_SHDOCVW_ MODULE = shdocvw.dll IMPORTLIB = shdocvw -IMPORTS = uuid shlwapi +IMPORTS = uuid shlwapi advapi32 DELAYIMPORTS = version ole32 oleaut32 ieframe C_SRCS = \ diff --git a/dlls/wineoss.drv/Makefile.in b/dlls/wineoss.drv/Makefile.in index cf5da76..d129f13 100644 --- a/dlls/wineoss.drv/Makefile.in +++ b/dlls/wineoss.drv/Makefile.in @@ -1,5 +1,5 @@ MODULE = wineoss.drv -IMPORTS = uuid ole32 user32 +IMPORTS = uuid ole32 user32 advapi32 DELAYIMPORTS = winmm EXTRAINCL = $(OSS4_CFLAGS)

1 0