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

Jacek Caban : unknwn.idl: Don't use inline wrappers for IUnknown calls.
by Alexandre Julliard 28 Aug '12

28 Aug '12

Module: wine Branch: master Commit: 9d1bec6077bbf25b6551e759f661332d974935e2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d1bec6077bbf25b6551e759f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Aug 28 11:15:12 2012 +0200 unknwn.idl: Don't use inline wrappers for IUnknown calls. --- include/unknwn.idl | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/include/unknwn.idl b/include/unknwn.idl index 9071973..d6799f4 100644 --- a/include/unknwn.idl +++ b/include/unknwn.idl @@ -20,7 +20,10 @@ import "wtypes.idl"; #endif -/* Interfaces */ +cpp_quote("#ifdef WIDL_C_INLINE_WRAPPERS") +cpp_quote("#define SAVE_WIDL_C_INLINE_WRAPPERS") +cpp_quote("#undef WIDL_C_INLINE_WRAPPERS") +cpp_quote("#endif") [ local, @@ -39,6 +42,10 @@ interface IUnknown ULONG Release(); } +cpp_quote("#ifdef SAVE_WIDL_C_INLINE_WRAPPERS") +cpp_quote("#define WIDL_C_INLINE_WRAPPERS") +cpp_quote("#endif") + [ object, uuid(00000001-0000-0000-C000-000000000046),

1 0

Jacek Caban : Always define WIDL_C_INLINE_WRAPPERS.
by Alexandre Julliard 28 Aug '12

28 Aug '12

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 28 Aug '12

28 Aug '12

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

Piotr Caban : msvcp80: Fixed basic_string::rbegin and basic_string:: rend implementation.
by Alexandre Julliard 28 Aug '12

28 Aug '12

Module: wine Branch: master Commit: f9ff5fe3e6ebfa95cb814a587a4bb5a3c103e00b URL: http://source.winehq.org/git/wine.git/?a=commit;h=f9ff5fe3e6ebfa95cb814a587… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Aug 28 12:13:34 2012 +0200 msvcp80: Fixed basic_string::rbegin and basic_string::rend implementation. --- dlls/msvcp80/Makefile.in | 3 + dlls/msvcp80/msvcp80.c | 135 +++++++++++++++++++++++++++++++++++++++++++++ dlls/msvcp80/msvcp80.spec | 48 ++++++++-------- 3 files changed, 162 insertions(+), 24 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f9ff5fe3e6ebfa95cb814…

1 0

Julian Rüger : po: Update German translation.
by Alexandre Julliard 28 Aug '12

28 Aug '12

Module: wine Branch: master Commit: f41d3bf40d700ccc494911fe0db1e239e2817fe8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f41d3bf40d700ccc494911fe0… Author: Julian Rüger <jr98(a)gmx.net> Date: Tue Aug 28 11:58:35 2012 +0200 po: Update German translation. --- po/de.po | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/po/de.po b/po/de.po index 85d1056..d225ef0 100644 --- a/po/de.po +++ b/po/de.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2012-08-15 20:07+0200\n" +"PO-Revision-Date: 2012-08-27 01:14+0200\n" "Last-Translator: Julian Rüger\n" "Language-Team: none\n" "Language: German\n" @@ -3454,8 +3454,8 @@ msgid "" "After disabling or enabling a device, the connected joysticks won't be " "updated here until you restart this applet." msgstr "" -"Nach dem deaktivieren oder aktivieren eines Gerätes, wird der verbundene " -"Controller hier bis zum Neustart des Applets nicht mehr aktualisiert." +"Nach dem De-/Aktivieren eines Gerätes wird die Liste der verbundenen " +"Controller bis zum Neustart dieses Applets nicht mehr aktualisiert." #: joy.rc:47 msgid "Test Joystick"

1 0

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

28 Aug '12

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

Rico Schüller : d3dx9: Improve set_matrix_array().
by Alexandre Julliard 28 Aug '12

28 Aug '12

Module: wine Branch: master Commit: a4dde8151b3a07dbdad600fd5d6798b86867b768 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a4dde8151b3a07dbdad600fd5… Author: Rico Schüller <kgbricola(a)web.de> Date: Tue Aug 28 13:42:55 2012 +0200 d3dx9: Improve set_matrix_array(). --- dlls/d3dx9_36/shader.c | 64 ++++++++++++++++++----------------------------- 1 files changed, 25 insertions(+), 39 deletions(-) diff --git a/dlls/d3dx9_36/shader.c b/dlls/d3dx9_36/shader.c index 1295f08..832ba40 100644 --- a/dlls/d3dx9_36/shader.c +++ b/dlls/d3dx9_36/shader.c @@ -1158,84 +1158,70 @@ static HRESULT set_matrix_array(ID3DXConstantTable *iface, IDirect3DDevice9 *dev UINT count, D3DXPARAMETER_CLASS class, D3DXPARAMETER_TYPE type, UINT rows, UINT columns) { struct ID3DXConstantTableImpl *This = impl_from_ID3DXConstantTable(iface); - D3DXCONSTANT_DESC desc; - HRESULT hr; - UINT registers_per_matrix; - UINT i, desc_count = 1; - UINT num_rows, num_columns; - UINT row_offset, column_offset; + struct ctab_constant *c = get_valid_constant(This, constant); + D3DXCONSTANT_DESC *desc; + UINT registers_per_matrix, num_rows, num_columns, i; + UINT row_offset = 1, column_offset = 1; const DWORD *data_ptr; FLOAT matrix[16] = {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f}; - hr = ID3DXConstantTable_GetConstantDesc(iface, constant, &desc, &desc_count); - if (FAILED(hr)) + if (!c) { - TRACE("ID3DXConstantTable_GetConstantDesc failed: %08x\n", hr); + WARN("Invalid argument specified\n"); return D3DERR_INVALIDCALL; } + desc = &c->desc; - if (desc.Class == D3DXPC_MATRIX_ROWS || desc.Class == D3DXPC_MATRIX_COLUMNS) + if (desc->Class == D3DXPC_MATRIX_ROWS + || desc->Class == D3DXPC_MATRIX_COLUMNS + || desc->Class == D3DXPC_SCALAR) { - if (desc.Class == class) - { - column_offset = 1; - row_offset = 4; - } - else - { - column_offset = 4; - row_offset = 1; - } + if (desc->Class == class) row_offset = 4; + else column_offset = 4; if (class == D3DXPC_MATRIX_ROWS) { - num_rows = min(desc.Rows, rows); - num_columns = min(desc.Columns, columns); + num_rows = min(desc->Rows, rows); + num_columns = min(desc->Columns, columns); } else { - num_rows = min(desc.Columns, columns); - num_columns = min(desc.Rows, rows); + num_rows = min(desc->Columns, columns); + num_columns = min(desc->Rows, rows); } - registers_per_matrix = (desc.Class == D3DXPC_MATRIX_ROWS) ? desc.Rows : desc.Columns; - } - else if (desc.Class == D3DXPC_SCALAR) - { - column_offset = 1; - row_offset = 1; - num_rows = min(desc.Rows, rows); - num_columns = min(desc.Columns, columns); - registers_per_matrix = 1; + registers_per_matrix = (desc->Class == D3DXPC_MATRIX_COLUMNS) ? desc->Columns : desc->Rows; } else { - FIXME("Unhandled variable class %s\n", debug_d3dxparameter_class(desc.Class)); + FIXME("Unhandled variable class %s\n", debug_d3dxparameter_class(desc->Class)); return D3D_OK; } - switch (desc.RegisterSet) + switch (desc->RegisterSet) { case D3DXRS_FLOAT4: data_ptr = data; for (i = 0; i < count; i++) { - if (registers_per_matrix * (i + 1) > desc.RegisterCount) + HRESULT hr; + + if (registers_per_matrix * (i + 1) > desc->RegisterCount) break; - hr = set_float_matrix(matrix, &desc, row_offset, column_offset, num_rows, num_columns, data_ptr, type, columns); + hr = set_float_matrix(matrix, desc, row_offset, column_offset, num_rows, num_columns, data_ptr, type, columns); if (FAILED(hr)) return hr; - set_float_shader_constant(This, device, desc.RegisterIndex + i * registers_per_matrix, matrix, registers_per_matrix); + set_float_shader_constant(This, device, desc->RegisterIndex + i * registers_per_matrix, matrix, registers_per_matrix); data_ptr += rows * columns; } break; default: - FIXME("Unhandled register set %s\n", debug_d3dxparameter_registerset(desc.RegisterSet)); + FIXME("Unhandled register set %s\n", debug_d3dxparameter_registerset(desc->RegisterSet)); return E_NOTIMPL; }

1 0

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

28 Aug '12

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 28 Aug '12

28 Aug '12

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

Vincent Povirk : ole32: Implement StgConvertPropertyToVariant.
by Alexandre Julliard 28 Aug '12

28 Aug '12

Module: wine Branch: master Commit: 58c2462c36b199bc36b3c4cf5546a228450e3653 URL: http://source.winehq.org/git/wine.git/?a=commit;h=58c2462c36b199bc36b3c4cf5… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Aug 27 17:01:24 2012 -0500 ole32: Implement StgConvertPropertyToVariant. --- dlls/ole32/ole32.spec | 1 + dlls/ole32/stg_prop.c | 78 +++++++++++++++++++++++++++++++++------ dlls/ole32/tests/propvariant.c | 12 ++++--- 3 files changed, 74 insertions(+), 17 deletions(-) diff --git a/dlls/ole32/ole32.spec b/dlls/ole32/ole32.spec index 5fcf841..a27adfb 100644 --- a/dlls/ole32/ole32.spec +++ b/dlls/ole32/ole32.spec @@ -253,6 +253,7 @@ @ stdcall SetConvertStg(ptr long) @ stub SetDocumentBitStg @ stdcall SetErrorInfo(long ptr) +@ stdcall StgConvertPropertyToVariant(ptr long ptr ptr) @ stdcall StgCreateDocfile(wstr long long ptr) @ stdcall StgCreateDocfileOnILockBytes(ptr long long ptr) @ stdcall StgCreatePropSetStg(ptr long ptr) diff --git a/dlls/ole32/stg_prop.c b/dlls/ole32/stg_prop.c index 9e3df45..103f145 100644 --- a/dlls/ole32/stg_prop.c +++ b/dlls/ole32/stg_prop.c @@ -36,6 +36,9 @@ * PropertyStorage_ReadFromStream */ +#include "config.h" +#include "wine/port.h" + #include <assert.h> #include <stdarg.h> #include <stdio.h> @@ -1030,11 +1033,22 @@ static HRESULT PropertyStorage_ReadDictionary(PropertyStorage_impl *This, return hr; } +#ifdef __i386__ +#define __thiscall __stdcall +#else +#define __thiscall __cdecl +#endif + +static __thiscall void* Allocate_CoTaskMemAlloc(void *userdata, ULONG size) +{ + return CoTaskMemAlloc(size); +} + /* FIXME: there isn't any checking whether the read property extends past the * end of the buffer. */ -static HRESULT PropertyStorage_ReadProperty(PropertyStorage_impl *This, - PROPVARIANT *prop, const BYTE *data) +static HRESULT PropertyStorage_ReadProperty(PROPVARIANT *prop, const BYTE *data, + UINT codepage, void* (__thiscall *allocate)(void *userdata, ULONG size), void *allocate_data) { HRESULT hr = S_OK; @@ -1078,21 +1092,21 @@ static HRESULT PropertyStorage_ReadProperty(PropertyStorage_impl *This, DWORD count; StorageUtl_ReadDWord(data, 0, &count); - if (This->codePage == CP_UNICODE && count / 2) + if (codepage == CP_UNICODE && count / 2) { WARN("Unicode string has odd number of bytes\n"); hr = STG_E_INVALIDHEADER; } else { - prop->u.pszVal = CoTaskMemAlloc(count); + prop->u.pszVal = allocate(allocate_data, count); if (prop->u.pszVal) { memcpy(prop->u.pszVal, data + sizeof(DWORD), count); - /* This is stored in the code page specified in This->codePage. + /* This is stored in the code page specified in codepage. * Don't convert it, the caller will just store it as-is. */ - if (This->codePage == CP_UNICODE) + if (codepage == CP_UNICODE) { /* Make sure it's NULL-terminated */ prop->u.pszVal[count / sizeof(WCHAR) - 1] = '\0'; @@ -1117,7 +1131,7 @@ static HRESULT PropertyStorage_ReadProperty(PropertyStorage_impl *This, StorageUtl_ReadDWord(data, 0, &count); prop->u.blob.cbSize = count; - prop->u.blob.pBlobData = CoTaskMemAlloc(count); + prop->u.blob.pBlobData = allocate(allocate_data, count); if (prop->u.blob.pBlobData) { memcpy(prop->u.blob.pBlobData, data + sizeof(DWORD), count); @@ -1132,7 +1146,7 @@ static HRESULT PropertyStorage_ReadProperty(PropertyStorage_impl *This, DWORD count; StorageUtl_ReadDWord(data, 0, &count); - prop->u.pwszVal = CoTaskMemAlloc(count * sizeof(WCHAR)); + prop->u.pwszVal = allocate(allocate_data, count * sizeof(WCHAR)); if (prop->u.pwszVal) { memcpy(prop->u.pwszVal, data + sizeof(DWORD), @@ -1159,10 +1173,10 @@ static HRESULT PropertyStorage_ReadProperty(PropertyStorage_impl *This, if (len > 8) { len -= 8; - prop->u.pclipdata = CoTaskMemAlloc(sizeof (CLIPDATA)); + prop->u.pclipdata = allocate(allocate_data, sizeof (CLIPDATA)); prop->u.pclipdata->cbSize = len; prop->u.pclipdata->ulClipFmt = tag; - prop->u.pclipdata->pClipData = CoTaskMemAlloc(len - sizeof(prop->u.pclipdata->ulClipFmt)); + prop->u.pclipdata->pClipData = allocate(allocate_data, len - sizeof(prop->u.pclipdata->ulClipFmt)); memcpy(prop->u.pclipdata->pClipData, data+8, len - sizeof(prop->u.pclipdata->ulClipFmt)); } else @@ -1399,8 +1413,9 @@ static HRESULT PropertyStorage_ReadFromStream(PropertyStorage_impl *This) PROPVARIANT prop; PropVariantInit(&prop); - if (SUCCEEDED(PropertyStorage_ReadProperty(This, &prop, - buf + idOffset->dwOffset - sizeof(PROPERTYSECTIONHEADER)))) + if (SUCCEEDED(PropertyStorage_ReadProperty(&prop, + buf + idOffset->dwOffset - sizeof(PROPERTYSECTIONHEADER), + This->codePage, Allocate_CoTaskMemAlloc, NULL))) { TRACE("Read property with ID 0x%08x, type %d\n", idOffset->propid, prop.vt); @@ -2673,3 +2688,42 @@ HRESULT WINAPI PropStgNameToFmtId(const LPOLESTR str, FMTID *rfmtid) end: return hr; } + +#ifdef __i386__ /* thiscall functions are i386-specific */ + +#define DEFINE_STDCALL_WRAPPER(num,func,args) \ + __ASM_STDCALL_FUNC(func, args, \ + "popl %eax\n\t" \ + "popl %ecx\n\t" \ + "pushl %eax\n\t" \ + "movl (%ecx), %eax\n\t" \ + "jmp *(4*(" #num "))(%eax)" ) + +DEFINE_STDCALL_WRAPPER(0,Allocate_PMemoryAllocator,8) +extern void* __thiscall Allocate_PMemoryAllocator(void *this, ULONG cbSize); + +#else + +static void* __thiscall Allocate_PMemoryAllocator(void *this, ULONG cbSize) +{ + void* (__thiscall *fn)(void*,ULONG) = **(void***)this; + return fn(this, cbSize); +} + +#endif + +BOOLEAN WINAPI StgConvertPropertyToVariant(const SERIALIZEDPROPERTYVALUE* prop, + USHORT CodePage, PROPVARIANT* pvar, void* pma) +{ + HRESULT hr; + + hr = PropertyStorage_ReadProperty(pvar, (const BYTE*)prop, CodePage, Allocate_PMemoryAllocator, pma); + + if (FAILED(hr)) + { + FIXME("should raise C++ exception on failure\n"); + PropVariantInit(pvar); + } + + return 0; +} diff --git a/dlls/ole32/tests/propvariant.c b/dlls/ole32/tests/propvariant.c index 29fa2f0..ec1dfd7 100644 --- a/dlls/ole32/tests/propvariant.c +++ b/dlls/ole32/tests/propvariant.c @@ -365,7 +365,7 @@ static void test_propertytovariant(void) if (!pStgConvertPropertyToVariant) { - todo_wine win_skip("StgConvertPropertyToVariant not available\n"); + win_skip("StgConvertPropertyToVariant not available\n"); return; } @@ -395,16 +395,18 @@ static void test_propertytovariant(void) 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"); + todo_wine ok(propvar.vt == VT_BSTR, "unexpected vt %x\n", propvar.vt); + if (propvar.vt == VT_BSTR) + 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"); + todo_wine ok(propvar.vt == VT_BSTR, "unexpected vt %x\n", propvar.vt); + if (propvar.vt == VT_BSTR) + ok(!lstrcmpW(U(propvar).bstrVal, test_string), "unexpected string value\n"); PropVariantClear(&propvar); }

1 0