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

Nikolay Sivov : oledb32: Support provider-specific properties in GetDataSource().
by Alexandre Julliard 10 Jun '15

10 Jun '15

Module: wine Branch: master Commit: 795845ff3d1247f0d81628c0ce7d7e46ebc08b87 URL: http://source.winehq.org/git/wine.git/?a=commit;h=795845ff3d1247f0d81628c0c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jun 10 10:41:28 2015 +0300 oledb32: Support provider-specific properties in GetDataSource(). --- dlls/oledb32/datainit.c | 259 +++++++++++++++++++++++++++++------------- dlls/oledb32/tests/database.c | 2 - 2 files changed, 181 insertions(+), 80 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=795845ff3d1247f0d8162…

1 0

Huw Davies : shlwapi/tests: Fix failing tests on Vista and Win 2008.
by Alexandre Julliard 10 Jun '15

10 Jun '15

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

Huw Davies : wshom/tests: Use RegQueryValueEx so that the tests run on Win 2k and XP.
by Alexandre Julliard 10 Jun '15

10 Jun '15

Module: wine Branch: master Commit: 714abcb7cdd8cab7d9383bded5b5426e55d98791 URL: http://source.winehq.org/git/wine.git/?a=commit;h=714abcb7cdd8cab7d9383bded… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Jun 10 15:14:21 2015 +0100 wshom/tests: Use RegQueryValueEx so that the tests run on Win 2k and XP. --- dlls/wshom.ocx/tests/wshom.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/wshom.ocx/tests/wshom.c b/dlls/wshom.ocx/tests/wshom.c index 46ffc58..a3d398e 100644 --- a/dlls/wshom.ocx/tests/wshom.c +++ b/dlls/wshom.ocx/tests/wshom.c @@ -223,7 +223,8 @@ if (0) /* crashes on native */ SysFreeString(str); hr = IWshShell3_put_CurrentDirectory(sh3, NULL); - ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + ok(hr == E_INVALIDARG || + broken(hr == HRESULT_FROM_WIN32(ERROR_NOACCESS)), "got 0x%08x\n", hr); str = SysAllocString(emptyW); hr = IWshShell3_put_CurrentDirectory(sh3, str); @@ -490,7 +491,7 @@ static void test_registry(void) ok(hr == S_OK, "got 0x%08x\n", hr); type = REG_NONE; - ret = RegGetValueA(root, NULL, "regsz", RRF_RT_ANY, &type, NULL, NULL); + ret = RegQueryValueExA(root, "regsz", 0, &type, NULL, NULL); ok(ret == ERROR_SUCCESS, "got %d\n", ret); ok(type == REG_SZ, "got %d\n", type); @@ -503,7 +504,7 @@ static void test_registry(void) VariantClear(&value); type = REG_NONE; - ret = RegGetValueA(root, NULL, "regsz", RRF_RT_ANY, &type, NULL, NULL); + ret = RegQueryValueExA(root, "regsz", 0, &type, NULL, NULL); ok(ret == ERROR_SUCCESS, "got %d\n", ret); ok(type == REG_SZ, "got %d\n", type); @@ -516,7 +517,7 @@ static void test_registry(void) VariantClear(&value); type = REG_NONE; - ret = RegGetValueA(root, NULL, "regsz", RRF_RT_ANY, &type, NULL, NULL); + ret = RegQueryValueExA(root, "regsz", 0, &type, NULL, NULL); ok(ret == ERROR_SUCCESS, "got %d\n", ret); ok(type == REG_SZ, "got %d\n", type);

1 0

Jacek Caban : kernel32: Treat empty locale name as LOCALE_INVARIANT.
by Alexandre Julliard 10 Jun '15

10 Jun '15

Module: wine Branch: master Commit: 09176c3aa020bac945e529829c0e809f70b5d6d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=09176c3aa020bac945e529829… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jun 9 23:18:47 2015 +0200 kernel32: Treat empty locale name as LOCALE_INVARIANT. --- dlls/kernel32/locale.c | 7 +++++++ dlls/kernel32/tests/locale.c | 6 ++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index bf4ace5..eaf1183 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -453,6 +453,13 @@ static void parse_locale_name( const WCHAR *str, struct locale_name *name ) name->win_name[0] = 0; lstrcpynW( name->lang, str, sizeof(name->lang)/sizeof(WCHAR) ); + if (!*name->lang) + { + name->lcid = LOCALE_INVARIANT; + name->matches = 4; + return; + } + if (!(p = strpbrkW( name->lang, sepW ))) { if (!strcmpW( name->lang, posixW ) || !strcmpW( name->lang, cW )) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index 9920dfc..061e331 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -2418,9 +2418,9 @@ static void test_LocaleNameToLCID(void) buffer[0] = 0; SetLastError(0xdeadbeef); lcid = pLocaleNameToLCID(LOCALE_NAME_INVARIANT, 0); - todo_wine ok(lcid == 0x7F, "Expected lcid = 0x7F, got %08x, error %d\n", lcid, GetLastError()); + ok(lcid == 0x7F, "Expected lcid = 0x7F, got %08x, error %d\n", lcid, GetLastError()); ret = pLCIDToLocaleName(lcid, buffer, LOCALE_NAME_MAX_LENGTH, 0); - ok(ret > 0, "Expected ret > 0, got %d, error %d\n", ret, GetLastError()); + todo_wine ok(ret > 0, "Expected ret > 0, got %d, error %d\n", ret, GetLastError()); trace("%08x, %s\n", lcid, wine_dbgstr_w(buffer)); /* bad name */ @@ -4091,6 +4091,8 @@ static void test_IsValidLocaleName(void) ok(!ret, "IsValidLocaleName should have failed\n"); ret = pIsValidLocaleName(zzzzW); ok(!ret, "IsValidLocaleName should have failed\n"); + ret = pIsValidLocaleName(LOCALE_NAME_INVARIANT); + ok(ret, "IsValidLocaleName failed\n"); } static void test_CompareStringOrdinal(void)

1 0

Alexandre Julliard : kernel32: Avoid resolving imports against the advapi32 forwards.
by Alexandre Julliard 10 Jun '15

10 Jun '15

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

Nikolay Sivov : dwrite: Fix problems with outline conversion and reporting.
by Alexandre Julliard 10 Jun '15

10 Jun '15

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

Michael Stefaniuc : dswave/tests: Check for the private interface in DirectSoundWave.
by Alexandre Julliard 10 Jun '15

10 Jun '15

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

Michael Stefaniuc : dswave: COM cleanup for the IUnknown interface of DirectSoundWave.
by Alexandre Julliard 10 Jun '15

10 Jun '15

Module: wine Branch: master Commit: 5843a1a00207e25959d35d3f94e2cfe89d2d6af2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5843a1a00207e25959d35d3f9… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Jun 10 01:00:28 2015 +0200 dswave: COM cleanup for the IUnknown interface of DirectSoundWave. Also lock/unlock the module only on creation/destruction of the object. --- dlls/dswave/dswave.c | 129 ++++++++++++++++++++++++------------------- dlls/dswave/dswave_private.h | 21 ------- 2 files changed, 71 insertions(+), 79 deletions(-) diff --git a/dlls/dswave/dswave.c b/dlls/dswave/dswave.c index 2c1746f..ad83ca0 100644 --- a/dlls/dswave/dswave.c +++ b/dlls/dswave/dswave.c @@ -26,86 +26,95 @@ WINE_DECLARE_DEBUG_CHANNEL(dmfile); as some sort of bridge between object and loader? */ static const GUID IID_IDirectMusicWavePRIVATE = {0x69e934e4,0x97f1,0x4f1d,{0x88,0xe8,0xf2,0xac,0x88,0x67,0x13,0x27}}; -static ULONG WINAPI IDirectMusicWaveImpl_IUnknown_AddRef (LPUNKNOWN iface); -static ULONG WINAPI IDirectMusicWaveImpl_IDirectMusicObject_AddRef (LPDIRECTMUSICOBJECT iface); -static ULONG WINAPI IDirectMusicWaveImpl_IPersistStream_AddRef (LPPERSISTSTREAM iface); - /***************************************************************************** * IDirectMusicWaveImpl implementation */ +typedef struct IDirectMusicWaveImpl { + IUnknown IUnknown_iface; + const IDirectMusicObjectVtbl *ObjectVtbl; + const IPersistStreamVtbl *PersistStreamVtbl; + LONG ref; + LPDMUS_OBJECTDESC pDesc; +} IDirectMusicWaveImpl; + /* IDirectMusicWaveImpl IUnknown part: */ -static HRESULT WINAPI IDirectMusicWaveImpl_IUnknown_QueryInterface (LPUNKNOWN iface, REFIID riid, LPVOID *ppobj) { - ICOM_THIS_MULTI(IDirectMusicWaveImpl, UnknownVtbl, iface); - - TRACE("(%p, %s, %p)\n", This, debugstr_dmguid(riid), ppobj); - - if (IsEqualIID (riid, &IID_IUnknown)) { - *ppobj = &This->UnknownVtbl; - IDirectMusicWaveImpl_IUnknown_AddRef ((LPUNKNOWN)&This->UnknownVtbl); - return S_OK; - } else if (IsEqualIID (riid, &IID_IDirectMusicObject)) { - *ppobj = &This->ObjectVtbl; - IDirectMusicWaveImpl_IDirectMusicObject_AddRef ((LPDIRECTMUSICOBJECT)&This->ObjectVtbl); - return S_OK; - } else if (IsEqualIID (riid, &IID_IPersistStream)) { - *ppobj = &This->PersistStreamVtbl; - IDirectMusicWaveImpl_IPersistStream_AddRef ((LPPERSISTSTREAM)&This->PersistStreamVtbl); - return S_OK; - } else if (IsEqualIID (riid, &IID_IDirectMusicWavePRIVATE)) { - WARN(": requested private interface, expect crash\n"); - return E_NOINTERFACE; - } - - WARN("(%p, %s, %p): not found\n", This, debugstr_dmguid(riid), ppobj); - return E_NOINTERFACE; +static inline IDirectMusicWaveImpl *impl_from_IUnknown(IUnknown *iface) +{ + return CONTAINING_RECORD(iface, IDirectMusicWaveImpl, IUnknown_iface); } -static ULONG WINAPI IDirectMusicWaveImpl_IUnknown_AddRef (LPUNKNOWN iface) { - ICOM_THIS_MULTI(IDirectMusicWaveImpl, UnknownVtbl, iface); - ULONG refCount = InterlockedIncrement(&This->ref); +static HRESULT WINAPI IUnknownImpl_QueryInterface(IUnknown *iface, REFIID riid, void **ret_iface) +{ + IDirectMusicWaveImpl *This = impl_from_IUnknown(iface); + + TRACE("(%p, %s, %p)\n", This, debugstr_dmguid(riid), ret_iface); + + *ret_iface = NULL; + + if (IsEqualIID(riid, &IID_IUnknown)) + *ret_iface = iface; + else if (IsEqualIID(riid, &IID_IDirectMusicObject)) + *ret_iface = &This->ObjectVtbl; + else if (IsEqualIID(riid, &IID_IPersistStream)) + *ret_iface = &This->PersistStreamVtbl; + else if (IsEqualIID(riid, &IID_IDirectMusicWavePRIVATE)) { + FIXME("(%p, %s, %p): Unsupported private interface\n", This, debugstr_guid(riid), ret_iface); + return E_NOINTERFACE; + } else { + WARN("(%p, %s, %p): not found\n", This, debugstr_dmguid(riid), ret_iface); + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown*)*ret_iface); + return S_OK; +} - TRACE("(%p)->(ref before=%u)\n", This, refCount - 1); +static ULONG WINAPI IUnknownImpl_AddRef(IUnknown *iface) +{ + IDirectMusicWaveImpl *This = impl_from_IUnknown(iface); + LONG ref = InterlockedIncrement(&This->ref); - DSWAVE_LockModule(); + TRACE("(%p) ref=%d\n", This, ref); - return refCount; + return ref; } -static ULONG WINAPI IDirectMusicWaveImpl_IUnknown_Release (LPUNKNOWN iface) { - ICOM_THIS_MULTI(IDirectMusicWaveImpl, UnknownVtbl, iface); - ULONG refCount = InterlockedDecrement(&This->ref); +static ULONG WINAPI IUnknownImpl_Release(IUnknown *iface) +{ + IDirectMusicWaveImpl *This = impl_from_IUnknown(iface); + LONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p)->(ref before=%u)\n", This, refCount + 1); + TRACE("(%p) ref=%d\n", This, ref); - if (!refCount) { - HeapFree(GetProcessHeap(), 0, This); - } + if (!ref) { + HeapFree(GetProcessHeap(), 0, This->pDesc); + HeapFree(GetProcessHeap(), 0, This); + DSWAVE_UnlockModule(); + } - DSWAVE_UnlockModule(); - - return refCount; + return ref; } -static const IUnknownVtbl DirectMusicWave_Unknown_Vtbl = { - IDirectMusicWaveImpl_IUnknown_QueryInterface, - IDirectMusicWaveImpl_IUnknown_AddRef, - IDirectMusicWaveImpl_IUnknown_Release +static const IUnknownVtbl unknown_vtbl = { + IUnknownImpl_QueryInterface, + IUnknownImpl_AddRef, + IUnknownImpl_Release }; /* IDirectMusicWaveImpl IDirectMusicObject part: */ static HRESULT WINAPI IDirectMusicWaveImpl_IDirectMusicObject_QueryInterface (LPDIRECTMUSICOBJECT iface, REFIID riid, LPVOID *ppobj) { ICOM_THIS_MULTI(IDirectMusicWaveImpl, ObjectVtbl, iface); - return IDirectMusicWaveImpl_IUnknown_QueryInterface ((LPUNKNOWN)&This->UnknownVtbl, riid, ppobj); + return IUnknown_QueryInterface(&This->IUnknown_iface, riid, ppobj); } static ULONG WINAPI IDirectMusicWaveImpl_IDirectMusicObject_AddRef (LPDIRECTMUSICOBJECT iface) { ICOM_THIS_MULTI(IDirectMusicWaveImpl, ObjectVtbl, iface); - return IDirectMusicWaveImpl_IUnknown_AddRef ((LPUNKNOWN)&This->UnknownVtbl); + return IUnknown_AddRef(&This->IUnknown_iface); } static ULONG WINAPI IDirectMusicWaveImpl_IDirectMusicObject_Release (LPDIRECTMUSICOBJECT iface) { ICOM_THIS_MULTI(IDirectMusicWaveImpl, ObjectVtbl, iface); - return IDirectMusicWaveImpl_IUnknown_Release ((LPUNKNOWN)&This->UnknownVtbl); + return IUnknown_Release(&This->IUnknown_iface); } static HRESULT WINAPI IDirectMusicWaveImpl_IDirectMusicObject_GetDescriptor (LPDIRECTMUSICOBJECT iface, LPDMUS_OBJECTDESC pDesc) { @@ -309,17 +318,17 @@ static const IDirectMusicObjectVtbl DirectMusicWave_Object_Vtbl = { /* IDirectMusicWaveImpl IPersistStream part: */ static HRESULT WINAPI IDirectMusicWaveImpl_IPersistStream_QueryInterface (LPPERSISTSTREAM iface, REFIID riid, LPVOID *ppobj) { ICOM_THIS_MULTI(IDirectMusicWaveImpl, PersistStreamVtbl, iface); - return IDirectMusicWaveImpl_IUnknown_QueryInterface ((LPUNKNOWN)&This->UnknownVtbl, riid, ppobj); + return IUnknown_QueryInterface(&This->IUnknown_iface, riid, ppobj); } static ULONG WINAPI IDirectMusicWaveImpl_IPersistStream_AddRef (LPPERSISTSTREAM iface) { ICOM_THIS_MULTI(IDirectMusicWaveImpl, PersistStreamVtbl, iface); - return IDirectMusicWaveImpl_IUnknown_AddRef ((LPUNKNOWN)&This->UnknownVtbl); + return IUnknown_AddRef(&This->IUnknown_iface); } static ULONG WINAPI IDirectMusicWaveImpl_IPersistStream_Release (LPPERSISTSTREAM iface) { ICOM_THIS_MULTI(IDirectMusicWaveImpl, PersistStreamVtbl, iface); - return IDirectMusicWaveImpl_IUnknown_Release ((LPUNKNOWN)&This->UnknownVtbl); + return IUnknown_Release(&This->IUnknown_iface); } static HRESULT WINAPI IDirectMusicWaveImpl_IPersistStream_GetClassID (LPPERSISTSTREAM iface, CLSID* pClassID) { @@ -501,20 +510,24 @@ static const IPersistStreamVtbl DirectMusicWave_PersistStream_Vtbl = { HRESULT WINAPI create_dswave(REFIID lpcGUID, void **ppobj) { IDirectMusicWaveImpl* obj; - + HRESULT hr; + obj = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectMusicWaveImpl)); if (NULL == obj) { *ppobj = NULL; return E_OUTOFMEMORY; } - obj->UnknownVtbl = &DirectMusicWave_Unknown_Vtbl; + obj->IUnknown_iface.lpVtbl = &unknown_vtbl; obj->ObjectVtbl = &DirectMusicWave_Object_Vtbl; obj->PersistStreamVtbl = &DirectMusicWave_PersistStream_Vtbl; obj->pDesc = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(DMUS_OBJECTDESC)); DM_STRUCT_INIT(obj->pDesc); obj->pDesc->dwValidData |= DMUS_OBJ_CLASS; obj->pDesc->guidClass = CLSID_DirectMusicSegment; /* shown by tests */ - obj->ref = 0; /* will be inited by QueryInterface */ + obj->ref = 1; - return IDirectMusicWaveImpl_IUnknown_QueryInterface ((LPUNKNOWN)&obj->UnknownVtbl, lpcGUID, ppobj); + DSWAVE_LockModule(); + hr = IUnknown_QueryInterface(&obj->IUnknown_iface, lpcGUID, ppobj); + IUnknown_Release(&obj->IUnknown_iface); + return hr; } diff --git a/dlls/dswave/dswave_private.h b/dlls/dswave/dswave_private.h index 3b6850a..febdcfc 100644 --- a/dlls/dswave/dswave_private.h +++ b/dlls/dswave/dswave_private.h @@ -41,31 +41,10 @@ #include "dmusics.h" /***************************************************************************** - * Interfaces - */ -typedef struct IDirectMusicWaveImpl IDirectMusicWaveImpl; - -/***************************************************************************** * ClassFactory */ extern HRESULT WINAPI create_dswave(REFIID lpcGUID, void **ret_iface) DECLSPEC_HIDDEN; - -/***************************************************************************** - * IDirectMusicWaveImpl implementation structure - */ -struct IDirectMusicWaveImpl { - /* IUnknown fields */ - const IUnknownVtbl *UnknownVtbl; - const IDirectMusicObjectVtbl *ObjectVtbl; - const IPersistStreamVtbl *PersistStreamVtbl; - LONG ref; - - /* IDirectMusicWaveImpl fields */ - LPDMUS_OBJECTDESC pDesc; - -}; - /********************************************************************** * Dll lifetime tracking declaration for dswave.dll */

1 0

Michael Stefaniuc : dswave: Use the generic DirectMusicObject implementation for DSWave.
by Alexandre Julliard 10 Jun '15

10 Jun '15

Module: wine Branch: master Commit: 834a92cc8be784453e37958e2608ef91480db196 URL: http://source.winehq.org/git/wine.git/?a=commit;h=834a92cc8be784453e37958e2… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Jun 10 01:04:56 2015 +0200 dswave: Use the generic DirectMusicObject implementation for DSWave. --- dlls/dswave/Makefile.in | 1 + dlls/dswave/dmobject.c | 185 +++++++++++++++++++++++++++++++++++++++++++ dlls/dswave/dmobject.h | 55 +++++++++++++ dlls/dswave/dswave.c | 151 ++++++++--------------------------- dlls/dswave/dswave_private.h | 9 --- dlls/dswave/tests/dswave.c | 6 +- 6 files changed, 277 insertions(+), 130 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=834a92cc8be784453e379…

1 0

Michael Stefaniuc : dswave: Get rid of the extra pointer to a DMUS_OBJECTDESC.
by Alexandre Julliard 10 Jun '15

10 Jun '15

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