August 2012 - Wine-Commits - list.winehq.org

Jacek Caban : windowscodecs/tests: Use proper helpers for iface calls.
by Alexandre Julliard Aug. 28, 2012

Aug. 28, 2012

Module: wine Branch: master Commit: cbf155afe12a80327686c314225db772ba75ff8f URL: http://source.winehq.org/git/wine.git/?a=commit;h=cbf155afe12a80327686c3142… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Aug 28 11:10:35 2012 +0200 windowscodecs/tests: Use proper helpers for iface calls. --- dlls/windowscodecs/tests/metadata.c | 2 +- dlls/windowscodecs/tests/stream.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/windowscodecs/tests/metadata.c b/dlls/windowscodecs/tests/metadata.c index d3b2869..acd9255 100644 --- a/dlls/windowscodecs/tests/metadata.c +++ b/dlls/windowscodecs/tests/metadata.c @@ -939,7 +939,7 @@ static void test_metadata_png(void) IWICBitmapDecoder_Release(decoder); - IWICStream_Release(stream); + IStream_Release(stream); } START_TEST(metadata) diff --git a/dlls/windowscodecs/tests/stream.c b/dlls/windowscodecs/tests/stream.c index a3295e6..5f311b8 100644 --- a/dlls/windowscodecs/tests/stream.c +++ b/dlls/windowscodecs/tests/stream.c @@ -379,7 +379,7 @@ static void test_StreamOnMemory(void) IWICStream_Release(pStream); - IWICStream_Release(pFactory); + IWICImagingFactory_Release(pFactory); CoUninitialize(); } @@ -641,7 +641,7 @@ static void test_StreamOnStreamRange(void) hr = IWICStream_CopyTo(pSubStream, CopyStream, uNewPos, NULL, NULL); ok(hr == E_NOTIMPL, "CopyTo returned %#x, expected %#x\n", hr, E_NOTIMPL); - IWICStream_Release(CopyStream); + IStream_Release(CopyStream); /* Commit */ @@ -733,7 +733,7 @@ static void test_StreamOnStreamRange(void) IWICStream_Release(pSubStream); IWICStream_Release(pStream); - IWICStream_Release(pFactory); + IWICImagingFactory_Release(pFactory); CoUninitialize(); }

1 0

Lucas Zawacki : dinput8/tests: Test load actions when there' s no pre-stored ones.
by Alexandre Julliard Aug. 28, 2012

Aug. 28, 2012

Module: wine Branch: master Commit: 851d38c4eff4f1e3499835db2fbc438675bb2eca URL: http://source.winehq.org/git/wine.git/?a=commit;h=851d38c4eff4f1e3499835db2… Author: Lucas Zawacki <lfzawacki(a)gmail.com> Date: Tue Aug 28 02:23:02 2012 -0300 dinput8/tests: Test load actions when there's no pre-stored ones. --- dlls/dinput8/tests/device.c | 23 +++++++++++++++++++++++ 1 files changed, 23 insertions(+), 0 deletions(-) diff --git a/dlls/dinput8/tests/device.c b/dlls/dinput8/tests/device.c index 76f9120..2140388 100644 --- a/dlls/dinput8/tests/device.c +++ b/dlls/dinput8/tests/device.c @@ -351,6 +351,8 @@ static void test_save_settings(void) IDirectInputDevice8A *pKey; static const GUID mapping_guid = { 0xcafecafe, 0x2, 0x3, { 0x4, 0x5, 0x6, 0x7, 0x8, 0x9, 0xa, 0xb } }; + static const GUID other_guid = { 0xcafe, 0xcafe, 0x3, { 0x4, 0x5, 0x6, 0x7, 0x8, 0x9, 0xa, 0xb } }; + static DIACTION actions[] = { { 0, DIKEYBOARD_A , 0, { "Blam" } }, { 1, DIKEYBOARD_B , 0, { "Kapow"} } @@ -433,6 +435,27 @@ static void test_save_settings(void) "Mapped incorrectly expected: 0x%08x got: 0x%08x\n", results[1], af.rgoAction[1].dwObjID); ok (IsEqualGUID(&GUID_SysKeyboard, &af.rgoAction[1].guidInstance), "Action should be mapped to keyboard\n"); + /* Test that a different action map with no pre-stored settings, in spite of the flags, + does not try to load mappings and instead applies the default mapping */ + af.guidActionMap = other_guid; + + af.rgoAction[0].dwObjID = 0; + af.rgoAction[1].dwObjID = 0; + memset(&af.rgoAction[0].guidInstance, 0, sizeof(GUID)); + memset(&af.rgoAction[1].guidInstance, 0, sizeof(GUID)); + + hr = IDirectInputDevice8_BuildActionMap(pKey, &af, NULL, 0); + ok (SUCCEEDED(hr), "BuildActionMap failed hr=%08x\n", hr); + + todo_wine ok (results[0] == af.rgoAction[0].dwObjID, + "Mapped incorrectly expected: 0x%08x got: 0x%08x\n", results[0], af.rgoAction[0].dwObjID); + todo_wine ok (IsEqualGUID(&GUID_SysKeyboard, &af.rgoAction[0].guidInstance), "Action should be mapped to keyboard\n"); + + todo_wine ok (results[1] == af.rgoAction[1].dwObjID, + "Mapped incorrectly expected: 0x%08x got: 0x%08x\n", results[1], af.rgoAction[1].dwObjID); + todo_wine ok (IsEqualGUID(&GUID_SysKeyboard, &af.rgoAction[1].guidInstance), "Action should be mapped to keyboard\n"); + + af.guidActionMap = mapping_guid; /* Hard case. Customized mapping, save, ask for previous map and read it back */ af.rgoAction[0].dwObjID = other_results[0]; af.rgoAction[0].dwHow = DIAH_USERCONFIG;

1 0

Lucas Zawacki : dinput: BuildActionMap should not fail if mapping has no pre-stored settings.
by Alexandre Julliard Aug. 28, 2012

Aug. 28, 2012

Module: wine Branch: master Commit: d5e9cedaf5c598cf4411ffecb4fff7678f3832ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=d5e9cedaf5c598cf4411ffecb… Author: Lucas Zawacki <lfzawacki(a)gmail.com> Date: Tue Aug 28 02:23:03 2012 -0300 dinput: BuildActionMap should not fail if mapping has no pre-stored settings. --- dlls/dinput/device.c | 7 ++++--- dlls/dinput8/tests/device.c | 8 ++++---- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c index 098efb7..b3875a8 100644 --- a/dlls/dinput/device.c +++ b/dlls/dinput/device.c @@ -674,7 +674,7 @@ static BOOL load_mapping_settings(IDirectInputDeviceImpl *This, LPDIACTIONFORMAT HKEY hkey; WCHAR *guid_str; DIDEVICEINSTANCEW didev; - int i; + int i, mapped = 0; didev.dwSize = sizeof(didev); IDirectInputDevice8_GetDeviceInfo(&This->IDirectInputDevice8W_iface, &didev); @@ -703,14 +703,15 @@ static BOOL load_mapping_settings(IDirectInputDeviceImpl *This, LPDIACTIONFORMAT { lpdiaf->rgoAction[i].dwObjID = id; lpdiaf->rgoAction[i].guidInstance = didev.guidInstance; - lpdiaf->rgoAction[i].dwHow = DIAH_USERCONFIG; + lpdiaf->rgoAction[i].dwHow = DIAH_DEFAULT; + mapped += 1; } } RegCloseKey(hkey); CoTaskMemFree(guid_str); - return TRUE; + return mapped > 0; } HRESULT _build_action_map(LPDIRECTINPUTDEVICE8W iface, LPDIACTIONFORMATW lpdiaf, LPCWSTR lpszUserName, DWORD dwFlags, DWORD devMask, LPCDIDATAFORMAT df) diff --git a/dlls/dinput8/tests/device.c b/dlls/dinput8/tests/device.c index 2140388..c211594 100644 --- a/dlls/dinput8/tests/device.c +++ b/dlls/dinput8/tests/device.c @@ -447,13 +447,13 @@ static void test_save_settings(void) hr = IDirectInputDevice8_BuildActionMap(pKey, &af, NULL, 0); ok (SUCCEEDED(hr), "BuildActionMap failed hr=%08x\n", hr); - todo_wine ok (results[0] == af.rgoAction[0].dwObjID, + ok (results[0] == af.rgoAction[0].dwObjID, "Mapped incorrectly expected: 0x%08x got: 0x%08x\n", results[0], af.rgoAction[0].dwObjID); - todo_wine ok (IsEqualGUID(&GUID_SysKeyboard, &af.rgoAction[0].guidInstance), "Action should be mapped to keyboard\n"); + ok (IsEqualGUID(&GUID_SysKeyboard, &af.rgoAction[0].guidInstance), "Action should be mapped to keyboard\n"); - todo_wine ok (results[1] == af.rgoAction[1].dwObjID, + ok (results[1] == af.rgoAction[1].dwObjID, "Mapped incorrectly expected: 0x%08x got: 0x%08x\n", results[1], af.rgoAction[1].dwObjID); - todo_wine ok (IsEqualGUID(&GUID_SysKeyboard, &af.rgoAction[1].guidInstance), "Action should be mapped to keyboard\n"); + ok (IsEqualGUID(&GUID_SysKeyboard, &af.rgoAction[1].guidInstance), "Action should be mapped to keyboard\n"); af.guidActionMap = mapping_guid; /* Hard case. Customized mapping, save, ask for previous map and read it back */

1 0

Jacek Caban : Always define WIDL_C_INLINE_WRAPPERS.
by Alexandre Julliard Aug. 28, 2012

Aug. 28, 2012

Module: wine Branch: master Commit: e679471885594331d47f0ab710bd3c4f9208f3ae URL: http://source.winehq.org/git/wine.git/?a=commit;h=e679471885594331d47f0ab71… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Aug 28 11:15:29 2012 +0200 Always define WIDL_C_INLINE_WRAPPERS. --- Maketest.rules.in | 2 +- dlls/fusion/Makefile.in | 1 - dlls/fusion/tests/Makefile.in | 1 - dlls/mshtml/Makefile.in | 2 +- dlls/msi/Makefile.in | 1 - dlls/msxml3/Makefile.in | 1 - dlls/msxml3/tests/Makefile.in | 1 - dlls/sxs/Makefile.in | 1 - dlls/sxs/tests/Makefile.in | 1 - dlls/windowscodecs/Makefile.in | 2 +- dlls/winhttp/Makefile.in | 1 - include/unknwn.idl | 4 ++++ 12 files changed, 7 insertions(+), 11 deletions(-) diff --git a/Maketest.rules.in b/Maketest.rules.in index 4833f5a..828c375 100644 --- a/Maketest.rules.in +++ b/Maketest.rules.in @@ -10,7 +10,7 @@ # DLLFLAGS = @DLLFLAGS@ -DEFS = -DWINE_STRICT_PROTOTYPES -DWINE_NO_NAMELESS_EXTENSION $(EXTRADEFS) +DEFS = -DWINE_STRICT_PROTOTYPES -DWINE_NO_NAMELESS_EXTENSION -DWIDL_C_INLINE_WRAPPERS $(EXTRADEFS) MODULE = $(TESTDLL:%.dll=%)_test.exe TESTRESULTS = $(C_SRCS:.c=.ok) diff --git a/dlls/fusion/Makefile.in b/dlls/fusion/Makefile.in index 2fe6492..63b1b73 100644 --- a/dlls/fusion/Makefile.in +++ b/dlls/fusion/Makefile.in @@ -1,6 +1,5 @@ MODULE = fusion.dll IMPORTS = advapi32 dbghelp shlwapi version user32 -EXTRADEFS = -DWIDL_C_INLINE_WRAPPERS C_SRCS = \ asmcache.c \ diff --git a/dlls/fusion/tests/Makefile.in b/dlls/fusion/tests/Makefile.in index ac360bb..0542f0d 100644 --- a/dlls/fusion/tests/Makefile.in +++ b/dlls/fusion/tests/Makefile.in @@ -1,6 +1,5 @@ TESTDLL = fusion.dll IMPORTS = user32 -EXTRADEFS = -DWIDL_C_INLINE_WRAPPERS C_SRCS = \ asmcache.c \ diff --git a/dlls/mshtml/Makefile.in b/dlls/mshtml/Makefile.in index 53cd2e9..26311af 100644 --- a/dlls/mshtml/Makefile.in +++ b/dlls/mshtml/Makefile.in @@ -1,7 +1,7 @@ MODULE = mshtml.dll IMPORTLIB = mshtml IMPORTS = strmiids uuid urlmon shlwapi shell32 ole32 oleaut32 user32 gdi32 advapi32 -EXTRADEFS = -DCOM_NO_WINDOWS_H -DWIDL_C_INLINE_WRAPPERS +EXTRADEFS = -DCOM_NO_WINDOWS_H DELAYIMPORTS = wininet C_SRCS = \ diff --git a/dlls/msi/Makefile.in b/dlls/msi/Makefile.in index 9ea0861..140b5f1 100644 --- a/dlls/msi/Makefile.in +++ b/dlls/msi/Makefile.in @@ -2,7 +2,6 @@ MODULE = msi.dll IMPORTLIB = msi IMPORTS = uuid urlmon wininet comctl32 shell32 shlwapi cabinet oleaut32 ole32 version user32 gdi32 advapi32 DELAYIMPORTS = odbccp32 wintrust crypt32 imagehlp -EXTRADEFS = -DWIDL_C_INLINE_WRAPPERS C_SRCS = \ action.c \ diff --git a/dlls/msxml3/Makefile.in b/dlls/msxml3/Makefile.in index fcf78b5..acd571f 100644 --- a/dlls/msxml3/Makefile.in +++ b/dlls/msxml3/Makefile.in @@ -1,7 +1,6 @@ EXTRADEFS = -DCOM_NO_WINDOWS_H MODULE = msxml3.dll IMPORTS = uuid urlmon shlwapi oleaut32 ole32 user32 advapi32 -EXTRADEFS = -DWIDL_C_INLINE_WRAPPERS EXTRALIBS = @XML2LIBS@ EXTRAINCL = @XML2INCL@ @XSLTINCL@ diff --git a/dlls/msxml3/tests/Makefile.in b/dlls/msxml3/tests/Makefile.in index 1762e1f..a2765a7 100644 --- a/dlls/msxml3/tests/Makefile.in +++ b/dlls/msxml3/tests/Makefile.in @@ -1,6 +1,5 @@ TESTDLL = msxml3.dll IMPORTS = oleaut32 ole32 user32 -EXTRADEFS = -DWIDL_C_INLINE_WRAPPERS C_SRCS = \ domdoc.c \ diff --git a/dlls/sxs/Makefile.in b/dlls/sxs/Makefile.in index a107928..d6d6f2b 100644 --- a/dlls/sxs/Makefile.in +++ b/dlls/sxs/Makefile.in @@ -1,7 +1,6 @@ MODULE = sxs.dll IMPORTS = oleaut32 ole32 IMPORTLIB = sxs -EXTRADEFS = -DWIDL_C_INLINE_WRAPPERS C_SRCS = \ cache.c \ diff --git a/dlls/sxs/tests/Makefile.in b/dlls/sxs/tests/Makefile.in index 69305ae..2f8be9c 100644 --- a/dlls/sxs/tests/Makefile.in +++ b/dlls/sxs/tests/Makefile.in @@ -1,6 +1,5 @@ TESTDLL = sxs.dll IMPORTS = sxs -EXTRADEFS = -DWIDL_C_INLINE_WRAPPERS C_SRCS = \ cache.c \ diff --git a/dlls/windowscodecs/Makefile.in b/dlls/windowscodecs/Makefile.in index b462249..65cd913 100644 --- a/dlls/windowscodecs/Makefile.in +++ b/dlls/windowscodecs/Makefile.in @@ -2,7 +2,7 @@ MODULE = windowscodecs.dll IMPORTLIB = windowscodecs IMPORTS = uuid ole32 oleaut32 shlwapi advapi32 rpcrt4 EXTRAINCL = @PNGINCL@ -EXTRADEFS = -DENTRY_PREFIX=WIC_ -DPROXY_DELEGATION -DWINE_REGISTER_DLL -DWIDL_C_INLINE_WRAPPERS +EXTRADEFS = -DENTRY_PREFIX=WIC_ -DPROXY_DELEGATION -DWINE_REGISTER_DLL EXTRALIBS = @APPLICATIONSERVICESLIB@ C_SRCS = \ diff --git a/dlls/winhttp/Makefile.in b/dlls/winhttp/Makefile.in index 130971e..53b5b97 100644 --- a/dlls/winhttp/Makefile.in +++ b/dlls/winhttp/Makefile.in @@ -3,7 +3,6 @@ IMPORTLIB = winhttp IMPORTS = uuid user32 advapi32 DELAYIMPORTS = oleaut32 ole32 crypt32 EXTRALIBS = @SOCKETLIBS@ -EXTRADEFS = -DWIDL_C_INLINE_WRAPPERS C_SRCS = \ cookie.c \ diff --git a/include/unknwn.idl b/include/unknwn.idl index d6799f4..78a2d9d 100644 --- a/include/unknwn.idl +++ b/include/unknwn.idl @@ -20,6 +20,10 @@ import "wtypes.idl"; #endif +cpp_quote("#ifdef __WINESRC__") +cpp_quote("#define WIDL_C_INLINE_WRAPPERS") +cpp_quote("#endif") + cpp_quote("#ifdef WIDL_C_INLINE_WRAPPERS") cpp_quote("#define SAVE_WIDL_C_INLINE_WRAPPERS") cpp_quote("#undef WIDL_C_INLINE_WRAPPERS")

1 0

Piotr Caban : msvcp80: Forward basic_string::erase functions to msvcp90.
by Alexandre Julliard Aug. 28, 2012

Aug. 28, 2012

Module: wine Branch: master Commit: 27d0551b908f09a1c6b708de042687ce22ef89a8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=27d0551b908f09a1c6b708de0… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Aug 28 12:12:46 2012 +0200 msvcp80: Forward basic_string::erase functions to msvcp90. --- dlls/msvcp80/msvcp80.spec | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/msvcp80/msvcp80.spec b/dlls/msvcp80/msvcp80.spec index a174651..e99c552 100644 --- a/dlls/msvcp80/msvcp80.spec +++ b/dlls/msvcp80/msvcp80.spec @@ -3744,16 +3744,16 @@ @ cdecl -arch=win64 ?erase@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEAA?AV?$_String_iterator(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@2(a)V32@@Z(ptr ptr ptr) msvcp90.?erase@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEAA?AV?$_String_iterator(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@2(a)V?$_String_const_iterator(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@2@@Z @ thiscall -arch=win32 ?erase@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAEAAV12(a)II@Z(ptr long long) msvcp90.?erase@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAEAAV12(a)II@Z @ cdecl -arch=win64 ?erase@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEAAAEAV12(a)_K0@Z(ptr long long) msvcp90.?erase@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEAAAEAV12(a)_K0@Z -@ stub -arch=win32 ?erase@?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@QAE?AV?$_String_iterator(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@2(a)V32@0(a)Z -@ stub -arch=win64 ?erase@?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@QEAA?AV?$_String_iterator(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@2(a)V32@0(a)Z -@ stub -arch=win32 ?erase@?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@QAE?AV?$_String_iterator(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@2(a)V32@@Z -@ stub -arch=win64 ?erase@?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@QEAA?AV?$_String_iterator(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@2(a)V32@@Z +@ thiscall -arch=win32 ?erase@?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@QAE?AV?$_String_iterator(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@2(a)V32@0(a)Z(ptr ptr ptr ptr ptr ptr) msvcp90.?erase@?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@QAE?AV?$_String_iterator(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@2(a)V?$_String_const_iterator(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@2(a)0@Z +@ cdecl -arch=win64 ?erase@?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@QEAA?AV?$_String_iterator(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@2(a)V32@0(a)Z(ptr ptr ptr ptr) msvcp90.?erase@?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@QEAA?AV?$_String_iterator(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@2(a)V?$_String_const_iterator(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@2(a)0@Z +@ thiscall -arch=win32 ?erase@?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@QAE?AV?$_String_iterator(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@2(a)V32@@Z(ptr ptr ptr ptr) msvcp90.?erase@?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@QAE?AV?$_String_iterator(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@2(a)V?$_String_const_iterator(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@2@@Z +@ cdecl -arch=win64 ?erase@?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@QEAA?AV?$_String_iterator(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@2(a)V32@@Z(ptr ptr ptr) msvcp90.?erase@?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@QEAA?AV?$_String_iterator(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@2(a)V?$_String_const_iterator(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@2@@Z @ thiscall -arch=win32 ?erase@?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@QAEAAV12(a)II@Z(ptr long long) msvcp90.?erase@?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@QAEAAV12(a)II@Z @ cdecl -arch=win64 ?erase@?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@QEAAAEAV12(a)_K0@Z(ptr long long) msvcp90.?erase@?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@QEAAAEAV12(a)_K0@Z -@ stub -arch=win32 ?erase@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QAE?AV?$_String_iterator(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@2(a)V32@0(a)Z -@ stub -arch=win64 ?erase@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEAA?AV?$_String_iterator(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@2(a)V32@0(a)Z -@ stub -arch=win32 ?erase@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QAE?AV?$_String_iterator(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@2(a)V32@@Z -@ stub -arch=win64 ?erase@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEAA?AV?$_String_iterator(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@2(a)V32@@Z +@ thiscall -arch=win32 ?erase@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QAE?AV?$_String_iterator(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@2(a)V32@0(a)Z(ptr ptr ptr ptr ptr ptr) msvcp90.?erase@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QAE?AV?$_String_iterator(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@2(a)V?$_String_const_iterator(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@2(a)0@Z +@ cdecl -arch=win64 ?erase@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEAA?AV?$_String_iterator(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@2(a)V32@0(a)Z(ptr ptr ptr ptr) msvcp90.?erase@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEAA?AV?$_String_iterator(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@2(a)V?$_String_const_iterator(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@2(a)0@Z +@ thiscall -arch=win32 ?erase@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QAE?AV?$_String_iterator(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@2(a)V32@@Z(ptr ptr ptr ptr) msvcp90.?erase@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QAE?AV?$_String_iterator(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@2(a)V?$_String_const_iterator(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@2@@Z +@ cdecl -arch=win64 ?erase@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEAA?AV?$_String_iterator(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@2(a)V32@@Z(ptr ptr ptr) msvcp90.?erase@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEAA?AV?$_String_iterator(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@2(a)V?$_String_const_iterator(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@2@@Z @ thiscall -arch=win32 ?erase@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QAEAAV12(a)II@Z(ptr long long) msvcp90.?erase@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QAEAAV12(a)II@Z @ cdecl -arch=win64 ?erase@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEAAAEAV12(a)_K0@Z(ptr long long) msvcp90.?erase@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEAAAEAV12(a)_K0@Z @ thiscall -arch=win32 ?exceptions(a)ios_base@std@@QAEXH(a)Z(ptr long) msvcp90.?exceptions(a)ios_base@std@@QAEXH(a)Z

1 0

Rico Schüller : d3dx9: Add some traces to D3DXLoadSurfaceFromMemory().
by Alexandre Julliard Aug. 28, 2012

Aug. 28, 2012

Module: wine Branch: master Commit: 97ef9f9322cdccb6bd11871faed0d28d1ec8d57d URL: http://source.winehq.org/git/wine.git/?a=commit;h=97ef9f9322cdccb6bd11871fa… Author: Rico Schüller <kgbricola(a)web.de> Date: Tue Aug 28 17:04:53 2012 +0200 d3dx9: Add some traces to D3DXLoadSurfaceFromMemory(). --- dlls/d3dx9_36/surface.c | 40 ++++++++++++++++++++++++---------------- 1 files changed, 24 insertions(+), 16 deletions(-) diff --git a/dlls/d3dx9_36/surface.c b/dlls/d3dx9_36/surface.c index 56e6b8e..34696e6 100644 --- a/dlls/d3dx9_36/surface.c +++ b/dlls/d3dx9_36/surface.c @@ -1482,11 +1482,17 @@ HRESULT WINAPI D3DXLoadSurfaceFromMemory(IDirect3DSurface9 *dst_surface, src_pitch, src_palette, wine_dbgstr_rect(src_rect), filter, color_key); if (!dst_surface || !src_memory || !src_rect) + { + WARN("Invalid argument specified.\n"); return D3DERR_INVALIDCALL; + } if (src_format == D3DFMT_UNKNOWN || src_rect->left >= src_rect->right || src_rect->top >= src_rect->bottom) + { + WARN("Invalid src_format or src_rect.\n"); return E_FAIL; + } if (filter == D3DX_DEFAULT) filter = D3DX_FILTER_TRIANGLE | D3DX_FILTER_DITHER; @@ -1503,12 +1509,13 @@ HRESULT WINAPI D3DXLoadSurfaceFromMemory(IDirect3DSurface9 *dst_surface, } else { - if (dst_rect->left > dst_rect->right || dst_rect->right > surfdesc.Width) - return D3DERR_INVALIDCALL; - if (dst_rect->top > dst_rect->bottom || dst_rect->bottom > surfdesc.Height) - return D3DERR_INVALIDCALL; - if (dst_rect->left < 0 || dst_rect->top < 0) + if (dst_rect->left > dst_rect->right || dst_rect->right > surfdesc.Width + || dst_rect->top > dst_rect->bottom || dst_rect->bottom > surfdesc.Height + || dst_rect->left < 0 || dst_rect->top < 0) + { + WARN("Invalid dst_rect specified.\n"); return D3DERR_INVALIDCALL; + } dst_size.width = dst_rect->right - dst_rect->left; dst_size.height = dst_rect->bottom - dst_rect->top; if (!dst_size.width || !dst_size.height) @@ -1517,12 +1524,12 @@ HRESULT WINAPI D3DXLoadSurfaceFromMemory(IDirect3DSurface9 *dst_surface, dst_size.depth = 1; srcformatdesc = get_format_info(src_format); - if (srcformatdesc->type == FORMAT_UNKNOWN) - return E_NOTIMPL; - destformatdesc = get_format_info(surfdesc.Format); - if (destformatdesc->type == FORMAT_UNKNOWN) + if (srcformatdesc->type == FORMAT_UNKNOWN || destformatdesc->type == FORMAT_UNKNOWN) + { + FIXME("Unsupported pixel format conversion %#x -> %#x\n", src_format, surfdesc.Format); return E_NOTIMPL; + } if (src_format == surfdesc.Format && dst_size.width == src_size.width @@ -1564,14 +1571,13 @@ HRESULT WINAPI D3DXLoadSurfaceFromMemory(IDirect3DSurface9 *dst_surface, } else /* Stretching or format conversion. */ { - if (srcformatdesc->bytes_per_pixel > 4) - return E_NOTIMPL; - if (destformatdesc->bytes_per_pixel > 4) - return E_NOTIMPL; - if (srcformatdesc->block_height != 1 || srcformatdesc->block_width != 1) - return E_NOTIMPL; - if (destformatdesc->block_height != 1 || destformatdesc->block_width != 1) + if (srcformatdesc->bytes_per_pixel > 4 || destformatdesc->bytes_per_pixel > 4 + || srcformatdesc->block_height != 1 || srcformatdesc->block_width != 1 + || destformatdesc->block_height != 1 || destformatdesc->block_width != 1) + { + FIXME("Format conversion missing %#x -> %#x\n", src_format, surfdesc.Format); return E_NOTIMPL; + } if (FAILED(hr = IDirect3DSurface9_LockRect(dst_surface, &lockrect, dst_rect, 0))) return D3DXERR_INVALIDDATA; @@ -1853,6 +1859,8 @@ HRESULT WINAPI D3DXSaveSurfaceToFileInMemory(ID3DXBuffer **dst_buffer, D3DXIMAGE || src_format_desc->block_height != 1 || src_format_desc->block_width != 1 || dst_format_desc->block_height != 1 || dst_format_desc->block_width != 1) { + FIXME("Format conversion missing %#x -> %#x\n", + src_surface_desc.Format, d3d_pixel_format); hr = E_NOTIMPL; goto cleanup; }

1 0

Jacek Caban : Fixed remaining wrong iface call helpers.
by Alexandre Julliard Aug. 28, 2012

Aug. 28, 2012

Module: wine Branch: master Commit: 434b696c460b0d80ecac5fe41379b4def6245c43 URL: http://source.winehq.org/git/wine.git/?a=commit;h=434b696c460b0d80ecac5fe41… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Aug 28 11:10:56 2012 +0200 Fixed remaining wrong iface call helpers. --- dlls/d3dx9_36/surface.c | 4 ++-- dlls/dxgi/device.c | 2 +- dlls/explorerframe/tests/nstc.c | 2 +- dlls/mshtml/tests/script.c | 4 +++- dlls/wbemprox/tests/services.c | 2 +- 5 files changed, 8 insertions(+), 6 deletions(-) diff --git a/dlls/d3dx9_36/surface.c b/dlls/d3dx9_36/surface.c index 1cf77b0..56e6b8e 100644 --- a/dlls/d3dx9_36/surface.c +++ b/dlls/d3dx9_36/surface.c @@ -622,7 +622,7 @@ HRESULT WINAPI D3DXGetImageInfoFromFileInMemory(LPCVOID data, UINT datasize, D3D IWICImagingFactory_CreateStream(factory, &stream); IWICStream_InitializeFromMemory(stream, (BYTE*)data, datasize); hr = IWICImagingFactory_CreateDecoderFromStream(factory, (IStream*)stream, NULL, 0, &decoder); - IStream_Release(stream); + IWICStream_Release(stream); IWICImagingFactory_Release(factory); } @@ -912,7 +912,7 @@ HRESULT WINAPI D3DXLoadSurfaceFromFileInMemory(IDirect3DSurface9 *pDestSurface, hr = IWICImagingFactory_CreateDecoderFromStream(factory, (IStream*)stream, NULL, 0, &decoder); - IStream_Release(stream); + IWICStream_Release(stream); IWICImagingFactory_Release(factory); if (FAILED(hr)) diff --git a/dlls/dxgi/device.c b/dlls/dxgi/device.c index 79a757b..7bbc5e0 100644 --- a/dlls/dxgi/device.c +++ b/dlls/dxgi/device.c @@ -122,7 +122,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_device_GetParent(IWineDXGIDevice *iface, R TRACE("iface %p, riid %s, parent %p.\n", iface, debugstr_guid(riid), parent); - hr = IDXGIDevice_GetAdapter(iface, &adapter); + hr = IWineDXGIDevice_GetAdapter(iface, &adapter); if (FAILED(hr)) { ERR("Failed to get adapter, hr %#x.\n", hr); diff --git a/dlls/explorerframe/tests/nstc.c b/dlls/explorerframe/tests/nstc.c index 59654ac..6287078 100644 --- a/dlls/explorerframe/tests/nstc.c +++ b/dlls/explorerframe/tests/nstc.c @@ -754,7 +754,7 @@ static void verify_root_order_(INameSpaceTreeControl *pnstc, IShellItem **roots, IShellItem_Release(psi); } } - IShellItem_Release(psia); + IShellItemArray_Release(psia); } } #define verify_root_order(pnstc, psi_a) \ diff --git a/dlls/mshtml/tests/script.c b/dlls/mshtml/tests/script.c index dcad5f7..b5bd91b 100644 --- a/dlls/mshtml/tests/script.c +++ b/dlls/mshtml/tests/script.c @@ -50,12 +50,14 @@ const GUID GUID_CUSTOM_CONFIRMOBJECTSAFETY = #define CTXARG_T DWORDLONG #define IActiveScriptParseVtbl IActiveScriptParse64Vtbl #define IActiveScriptParseProcedure2Vtbl IActiveScriptParseProcedure2_64Vtbl +#define IActiveScriptSiteDebug_Release IActiveScriptSiteDebug64_Release #else #define CTXARG_T DWORD #define IActiveScriptParseVtbl IActiveScriptParse32Vtbl #define IActiveScriptParseProcedure2Vtbl IActiveScriptParseProcedure2_32Vtbl +#define IActiveScriptSiteDebug_Release IActiveScriptSiteDebug32_Release #endif @@ -2366,7 +2368,7 @@ static HRESULT WINAPI ActiveScript_SetScriptSite(IActiveScript *iface, IActiveSc hres = IActiveScriptSite_QueryInterface(pass, &IID_IActiveScriptSiteDebug, (void**)&debug); ok(hres == S_OK, "Could not get IActiveScriptSiteDebug interface: %08x\n", hres); if(SUCCEEDED(hres)) - IActiveScriptSiteDebug32_Release(debug); + IActiveScriptSiteDebug_Release(debug); hres = IActiveScriptSite_QueryInterface(pass, &IID_ICanHandleException, (void**)&canexpection); ok(hres == E_NOINTERFACE, "Could not get IID_ICanHandleException interface: %08x\n", hres); diff --git a/dlls/wbemprox/tests/services.c b/dlls/wbemprox/tests/services.c index ff798a3..5d659b1 100644 --- a/dlls/wbemprox/tests/services.c +++ b/dlls/wbemprox/tests/services.c @@ -77,7 +77,7 @@ static void test_IClientSecurity(void) refs = IWbemServices_Release( services ); todo_wine ok( refs == 1, "unexpected refcount %u\n", refs ); - refs = IWbemServices_Release( security ); + refs = IClientSecurity_Release( security ); todo_wine ok( refs == 0, "unexpected refcount %u\n", refs ); IWbemLocator_Release( locator );

1 0

Francois Gouget : msvcp100: Make some locale and string functions static.
by Alexandre Julliard Aug. 28, 2012

Aug. 28, 2012

Module: wine Branch: master Commit: d2fc8007d2356af4c8ee32b4ed24adadcf8fb1be URL: http://source.winehq.org/git/wine.git/?a=commit;h=d2fc8007d2356af4c8ee32b4e… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Aug 28 00:40:39 2012 +0200 msvcp100: Make some locale and string functions static. --- dlls/msvcp100/locale.c | 14 +++++++------- dlls/msvcp100/string.c | 38 +++++++++++++++++++------------------- 2 files changed, 26 insertions(+), 26 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d2fc8007d2356af4c8ee3…

1 0

Vincent Povirk : propsys: Fix memory leak in IPropertyStore::SetValue.
by Alexandre Julliard Aug. 28, 2012

Aug. 28, 2012

Module: wine Branch: master Commit: 0537454eae75efafd60964ad499af40227188a39 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0537454eae75efafd60964ad4… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Aug 27 11:39:24 2012 -0500 propsys: Fix memory leak in IPropertyStore::SetValue. --- dlls/propsys/propstore.c | 16 ++++++++++++++-- 1 files changed, 14 insertions(+), 2 deletions(-) diff --git a/dlls/propsys/propstore.c b/dlls/propsys/propstore.c index e438ce3..6d4c99a 100644 --- a/dlls/propsys/propstore.c +++ b/dlls/propsys/propstore.c @@ -303,6 +303,7 @@ static HRESULT WINAPI PropertyStore_SetValue(IPropertyStoreCache *iface, PropertyStore *This = impl_from_IPropertyStoreCache(iface); propstore_value *value; HRESULT hr; + PROPVARIANT temp; TRACE("%p,%p,%p\n", iface, key, propvar); @@ -311,7 +312,13 @@ static HRESULT WINAPI PropertyStore_SetValue(IPropertyStoreCache *iface, hr = PropertyStore_LookupValue(This, key, 1, &value); if (SUCCEEDED(hr)) - hr = PropVariantCopy(&value->propvar, propvar); + hr = PropVariantCopy(&temp, propvar); + + if (SUCCEEDED(hr)) + { + PropVariantClear(&value->propvar); + value->propvar = temp; + } LeaveCriticalSection(&This->lock); @@ -405,6 +412,7 @@ static HRESULT WINAPI PropertyStore_SetValueAndState(IPropertyStoreCache *iface, PropertyStore *This = impl_from_IPropertyStoreCache(iface); propstore_value *value; HRESULT hr; + PROPVARIANT temp; TRACE("%p,%p,%p,%d\n", iface, key, ppropvar, state); @@ -413,10 +421,14 @@ static HRESULT WINAPI PropertyStore_SetValueAndState(IPropertyStoreCache *iface, hr = PropertyStore_LookupValue(This, key, 1, &value); if (SUCCEEDED(hr)) - hr = PropVariantCopy(&value->propvar, ppropvar); + hr = PropVariantCopy(&temp, ppropvar); if (SUCCEEDED(hr)) + { + PropVariantClear(&value->propvar); + value->propvar = temp; value->state = state; + } LeaveCriticalSection(&This->lock);

1 0

Vincent Povirk : ole32: Add tests for StgConvertPropertyToVariant.
by Alexandre Julliard Aug. 28, 2012

Aug. 28, 2012

Module: wine Branch: master Commit: ae722c45ad3e670f8a0d82facd0e03381e8cab04 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae722c45ad3e670f8a0d82fac… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Aug 27 15:50:56 2012 -0500 ole32: Add tests for StgConvertPropertyToVariant. --- dlls/ole32/tests/propvariant.c | 164 ++++++++++++++++++++++++++++++++++++++++ include/propidl.idl | 4 + 2 files changed, 168 insertions(+), 0 deletions(-) diff --git a/dlls/ole32/tests/propvariant.c b/dlls/ole32/tests/propvariant.c index 50adfe7..29fa2f0 100644 --- a/dlls/ole32/tests/propvariant.c +++ b/dlls/ole32/tests/propvariant.c @@ -245,8 +245,172 @@ static void test_copy(void) memset(&propvarSrc, 0, sizeof(propvarSrc)); } +struct _PMemoryAllocator_vtable { + void *Allocate; /* virtual void* Allocate(ULONG cbSize); */ + void *Free; /* virtual void Free(void *pv); */ +}; + +typedef struct _PMemoryAllocator { + struct _PMemoryAllocator_vtable *vt; +} PMemoryAllocator; + +#ifdef __i386__ +#define __thiscall __stdcall +#else +#define __thiscall __cdecl +#endif + +static void * __thiscall PMemoryAllocator_Allocate(PMemoryAllocator *_this, ULONG cbSize) +{ + return CoTaskMemAlloc(cbSize); +} + +static void __thiscall PMemoryAllocator_Free(PMemoryAllocator *_this, void *pv) +{ + CoTaskMemFree(pv); +} + +#ifdef __i386__ + +#include "pshpack1.h" +typedef struct +{ + BYTE pop_eax; /* popl %eax */ + BYTE push_ecx; /* pushl %ecx */ + BYTE push_eax; /* pushl %eax */ + BYTE jmp_func; /* jmp $func */ + DWORD func; +} THISCALL_TO_STDCALL_THUNK; +#include "poppack.h" + +static THISCALL_TO_STDCALL_THUNK *wrapperCodeMem = NULL; + +static void fill_thunk(THISCALL_TO_STDCALL_THUNK *thunk, void *fn) +{ + thunk->pop_eax = 0x58; + thunk->push_ecx = 0x51; + thunk->push_eax = 0x50; + thunk->jmp_func = 0xe9; + thunk->func = (char*)fn - (char*)(&thunk->func + 1); +} + +static void setup_vtable(struct _PMemoryAllocator_vtable *vtable) +{ + wrapperCodeMem = VirtualAlloc(NULL, 2 * sizeof(*wrapperCodeMem), + MEM_COMMIT, PAGE_EXECUTE_READWRITE); + + fill_thunk(&wrapperCodeMem[0], PMemoryAllocator_Allocate); + fill_thunk(&wrapperCodeMem[1], PMemoryAllocator_Free); + + vtable->Allocate = &wrapperCodeMem[0]; + vtable->Free = &wrapperCodeMem[1]; +} + +#else + +static void setup_vtable(struct _PMemoryAllocator_vtable *vtable) +{ + vtable->Allocate = PMemoryAllocator_Allocate; + vtable->Free = PMemoryAllocator_Free; +} + +#endif + +static const char serialized_empty[] = { + 0,0, /* VT_EMPTY */ + 0,0, /* padding */ +}; + +static const char serialized_null[] = { + 1,0, /* VT_NULL */ + 0,0, /* padding */ +}; + +static const char serialized_i4[] = { + 3,0, /* VT_I4 */ + 0,0, /* padding */ + 0xef,0xcd,0xab,0xfe +}; + +static const char serialized_bstr_wc[] = { + 8,0, /* VT_BSTR */ + 0,0, /* padding */ + 10,0,0,0, /* size */ + 't',0,'e',0, + 's',0,'t',0, + 0,0,0,0 +}; + +static const char serialized_bstr_mb[] = { + 8,0, /* VT_BSTR */ + 0,0, /* padding */ + 5,0,0,0, /* size */ + 't','e','s','t', + 0,0,0,0 +}; + +static void test_propertytovariant(void) +{ + HANDLE hole32; + BOOLEAN (__stdcall *pStgConvertPropertyToVariant)(const SERIALIZEDPROPERTYVALUE*,USHORT,PROPVARIANT*,PMemoryAllocator*); + PROPVARIANT propvar; + PMemoryAllocator allocator; + struct _PMemoryAllocator_vtable vtable; + BOOLEAN ret; + static const WCHAR test_string[] = {'t','e','s','t',0}; + + hole32 = GetModuleHandleA("ole32"); + + pStgConvertPropertyToVariant = (void*)GetProcAddress(hole32, "StgConvertPropertyToVariant"); + + if (!pStgConvertPropertyToVariant) + { + todo_wine win_skip("StgConvertPropertyToVariant not available\n"); + return; + } + + setup_vtable(&vtable); + allocator.vt = &vtable; + + ret = pStgConvertPropertyToVariant((SERIALIZEDPROPERTYVALUE*)serialized_empty, + CP_WINUNICODE, &propvar, &allocator); + + ok(ret == 0, "StgConvertPropertyToVariant returned %i\n", ret); + ok(propvar.vt == VT_EMPTY, "unexpected vt %x\n", propvar.vt); + + ret = pStgConvertPropertyToVariant((SERIALIZEDPROPERTYVALUE*)serialized_null, + CP_WINUNICODE, &propvar, &allocator); + + ok(ret == 0, "StgConvertPropertyToVariant returned %i\n", ret); + ok(propvar.vt == VT_NULL, "unexpected vt %x\n", propvar.vt); + + ret = pStgConvertPropertyToVariant((SERIALIZEDPROPERTYVALUE*)serialized_i4, + CP_WINUNICODE, &propvar, &allocator); + + ok(ret == 0, "StgConvertPropertyToVariant returned %i\n", ret); + ok(propvar.vt == VT_I4, "unexpected vt %x\n", propvar.vt); + ok(U(propvar).lVal == 0xfeabcdef, "unexpected lVal %x\n", U(propvar).lVal); + + ret = pStgConvertPropertyToVariant((SERIALIZEDPROPERTYVALUE*)serialized_bstr_wc, + CP_WINUNICODE, &propvar, &allocator); + + ok(ret == 0, "StgConvertPropertyToVariant returned %i\n", ret); + ok(propvar.vt == VT_BSTR, "unexpected vt %x\n", propvar.vt); + ok(!lstrcmpW(U(propvar).bstrVal, test_string), "unexpected string value\n"); + PropVariantClear(&propvar); + + ret = pStgConvertPropertyToVariant((SERIALIZEDPROPERTYVALUE*)serialized_bstr_mb, + CP_UTF8, &propvar, &allocator); + + ok(ret == 0, "StgConvertPropertyToVariant returned %i\n", ret); + ok(propvar.vt == VT_BSTR, "unexpected vt %x\n", propvar.vt); + ok(!lstrcmpW(U(propvar).bstrVal, test_string), "unexpected string value\n"); + PropVariantClear(&propvar); +} + START_TEST(propvariant) { test_validtypes(); test_copy(); + test_propertytovariant(); } diff --git a/include/propidl.idl b/include/propidl.idl index 3fc7515..fbe80d8 100644 --- a/include/propidl.idl +++ b/include/propidl.idl @@ -431,6 +431,10 @@ interface IEnumSTATPROPSETSTG : IUnknown [out] IEnumSTATPROPSETSTG **ppenum); } +typedef struct SERIALIZEDPROPERTYVALUE { + DWORD dwType; + BYTE rgb[1]; +} SERIALIZEDPROPERTYVALUE; cpp_quote("HRESULT WINAPI FreePropVariantArray(ULONG,PROPVARIANT*);") cpp_quote("HRESULT WINAPI PropVariantClear(PROPVARIANT*);")

1 0