March 2008 - Wine-Commits - list.winehq.org

James Hawkins : msi: Fix a typo.
by Alexandre Julliard March 25, 2008

March 25, 2008

Module: wine Branch: master Commit: ddfefc036f3dc734bd0df5f705bc67ba1904c0a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ddfefc036f3dc734bd0df5f70… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Mon Mar 24 16:16:58 2008 -0500 msi: Fix a typo. --- dlls/msi/action.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 1be4598..982c9f0 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -4771,7 +4771,7 @@ static UINT ITERATE_StopService(MSIRECORD *rec, LPVOID param) stop_service_dependents(scm, service); - if (!ControlService(service, SERVICE_STOP, &status)) + if (!ControlService(service, SERVICE_CONTROL_STOP, &status)) WARN("Failed to stop service (%s): %d\n", debugstr_w(name), GetLastError()); done:

1 0

Michael Stefaniuc : gdiplus: Remove break after return (Smatch).
by Alexandre Julliard March 25, 2008

March 25, 2008

Module: wine Branch: master Commit: 51c9d050cfea30ebca961ca0c6d0e7617e9092a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=51c9d050cfea30ebca961ca0c… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Mar 24 21:55:35 2008 +0100 gdiplus: Remove break after return (Smatch). --- dlls/gdiplus/image.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 2e5ef56..b1ec2c7 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -1089,7 +1089,6 @@ GpStatus WINGDIPAPI GdipCreateBitmapFromHBITMAP(HBITMAP hbm, HPALETTE hpal, GpBi default: FIXME("don't know how to handle %d bpp\n", bm.bmBitsPixel); return InvalidParameter; - break; } retval = GdipCreateBitmapFromScan0(bm.bmWidth, bm.bmHeight, bm.bmWidthBytes,

1 0

Jacek Caban : mshtml: Added script engine loading test.
by Alexandre Julliard March 25, 2008

March 25, 2008

Module: wine Branch: master Commit: d23309c040dc0e5e9da5983e67a6f91f8de08143 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d23309c040dc0e5e9da5983e6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 25 02:11:25 2008 +0100 mshtml: Added script engine loading test. --- dlls/mshtml/tests/Makefile.in | 3 +- dlls/mshtml/tests/script.c | 533 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 535 insertions(+), 1 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d23309c040dc0e5e9da59…

1 0

Jacek Caban : mshtml: Added script engine loading implementation.
by Alexandre Julliard March 25, 2008

March 25, 2008

Module: wine Branch: master Commit: 1b5bce0d4c7e53ef0a151d2d916f99063c135d73 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b5bce0d4c7e53ef0a151d2d9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 25 02:10:47 2008 +0100 mshtml: Added script engine loading implementation. --- dlls/mshtml/Makefile.in | 1 + dlls/mshtml/htmldoc.c | 2 + dlls/mshtml/mshtml_private.h | 5 + dlls/mshtml/nsevents.c | 30 ++++ dlls/mshtml/script.c | 311 ++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 349 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1b5bce0d4c7e53ef0a151…

1 0

Jacek Caban : jscript: Added tests.
by Alexandre Julliard March 25, 2008

March 25, 2008

Module: wine Branch: master Commit: 63ebe0191e3881956b5bbd8308ef2b117f40533f URL: http://source.winehq.org/git/wine.git/?a=commit;h=63ebe0191e3881956b5bbd830… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 24 21:53:14 2008 +0100 jscript: Added tests. --- .gitignore | 4 ++ Makefile.in | 2 + configure | 3 ++ configure.ac | 1 + dlls/Makefile.in | 1 + dlls/jscript/tests/Makefile.in | 13 ++++++++ dlls/jscript/tests/jscript.c | 62 ++++++++++++++++++++++++++++++++++++++++ programs/winetest/Makefile.in | 3 ++ programs/winetest/winetest.rc | 1 + 9 files changed, 90 insertions(+), 0 deletions(-) diff --git a/.gitignore b/.gitignore index a11719f..f6088d3 100644 --- a/.gitignore +++ b/.gitignore @@ -163,6 +163,9 @@ dlls/iphlpapi/tests/testlist.c dlls/itss/tests/*.ok dlls/itss/tests/itss_crosstest.exe dlls/itss/tests/testlist.c +dlls/jscript/tests/*.ok +dlls/jscript/tests/jscript_crosstest.exe +dlls/jscript/tests/testlist.c dlls/kernel32/libkernel32.def dlls/kernel32/nls/winerr_deu.mc.rc dlls/kernel32/nls/winerr_enu.mc.rc @@ -629,6 +632,7 @@ programs/winetest/inetcomm_test.exe programs/winetest/infosoft_test.exe programs/winetest/iphlpapi_test.exe programs/winetest/itss_test.exe +programs/winetest/jscript_test.exe programs/winetest/kernel32_test.exe programs/winetest/localspl_test.exe programs/winetest/localui_test.exe diff --git a/Makefile.in b/Makefile.in index 6366e9f..9364ba2 100644 --- a/Makefile.in +++ b/Makefile.in @@ -300,6 +300,7 @@ ALL_MAKEFILES = \ dlls/itss/Makefile \ dlls/itss/tests/Makefile \ dlls/jscript/Makefile \ + dlls/jscript/tests/Makefile \ dlls/kernel32/Makefile \ dlls/kernel32/tests/Makefile \ dlls/localspl/Makefile \ @@ -722,6 +723,7 @@ dlls/itircl/Makefile: dlls/itircl/Makefile.in dlls/Makedll.rules dlls/itss/Makefile: dlls/itss/Makefile.in dlls/Makedll.rules dlls/itss/tests/Makefile: dlls/itss/tests/Makefile.in dlls/Maketest.rules dlls/jscript/Makefile: dlls/jscript/Makefile.in dlls/Makedll.rules +dlls/jscript/tests/Makefile: dlls/jscript/tests/Makefile.in dlls/Maketest.rules dlls/kernel32/Makefile: dlls/kernel32/Makefile.in dlls/Makedll.rules dlls/kernel32/tests/Makefile: dlls/kernel32/tests/Makefile.in dlls/Maketest.rules dlls/localspl/Makefile: dlls/localspl/Makefile.in dlls/Makedll.rules diff --git a/configure b/configure index 4ddce93..97e2a78 100755 --- a/configure +++ b/configure @@ -21548,6 +21548,8 @@ ac_config_files="$ac_config_files dlls/itss/tests/Makefile" ac_config_files="$ac_config_files dlls/jscript/Makefile" +ac_config_files="$ac_config_files dlls/jscript/tests/Makefile" + ac_config_files="$ac_config_files dlls/kernel32/Makefile" ac_config_files="$ac_config_files dlls/kernel32/tests/Makefile" @@ -22794,6 +22796,7 @@ do "dlls/itss/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/itss/Makefile" ;; "dlls/itss/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/itss/tests/Makefile" ;; "dlls/jscript/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/jscript/Makefile" ;; + "dlls/jscript/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/jscript/tests/Makefile" ;; "dlls/kernel32/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/kernel32/Makefile" ;; "dlls/kernel32/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/kernel32/tests/Makefile" ;; "dlls/localspl/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/localspl/Makefile" ;; diff --git a/configure.ac b/configure.ac index 1ecf47c..1cfeedc 100644 --- a/configure.ac +++ b/configure.ac @@ -1803,6 +1803,7 @@ AC_CONFIG_FILES([dlls/itircl/Makefile]) AC_CONFIG_FILES([dlls/itss/Makefile]) AC_CONFIG_FILES([dlls/itss/tests/Makefile]) AC_CONFIG_FILES([dlls/jscript/Makefile]) +AC_CONFIG_FILES([dlls/jscript/tests/Makefile]) AC_CONFIG_FILES([dlls/kernel32/Makefile]) AC_CONFIG_FILES([dlls/kernel32/tests/Makefile]) AC_CONFIG_FILES([dlls/localspl/Makefile]) diff --git a/dlls/Makefile.in b/dlls/Makefile.in index 669d514..68c6be4 100644 --- a/dlls/Makefile.in +++ b/dlls/Makefile.in @@ -311,6 +311,7 @@ TESTSUBDIRS = \ infosoft/tests \ iphlpapi/tests \ itss/tests \ + jscript/tests \ kernel32/tests \ localspl/tests \ localui/tests \ diff --git a/dlls/jscript/tests/Makefile.in b/dlls/jscript/tests/Makefile.in new file mode 100644 index 0000000..2201a4a --- /dev/null +++ b/dlls/jscript/tests/Makefile.in @@ -0,0 +1,13 @@ +TOPSRCDIR = @top_srcdir@ +TOPOBJDIR = ../../.. +SRCDIR = @srcdir@ +VPATH = @srcdir@ +TESTDLL = jscript.dll +IMPORTS = ole32 kernel32 + +CTESTS = \ + jscript.c + +(a)MAKE_TEST_RULES@ + +(a)DEPENDENCIES@ # everything below this line is overwritten by make depend diff --git a/dlls/jscript/tests/jscript.c b/dlls/jscript/tests/jscript.c new file mode 100644 index 0000000..a811ef2 --- /dev/null +++ b/dlls/jscript/tests/jscript.c @@ -0,0 +1,62 @@ +/* + * Copyright 2008 Jacek Caban for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define COBJMACROS + +#include <initguid.h> + +#include <ole2.h> +#include <activscp.h> + +#include "wine/test.h" + +static const CLSID CLSID_JScript = + {0xf414c260,0x6ac0,0x11cf,{0xb6,0xd1,0x00,0xaa,0x00,0xbb,0xbb,0x58}}; + +static void test_jscript(void) +{ + IActiveScriptParse *parse; + IActiveScript *script; + IUnknown *unk; + HRESULT hres; + + hres = CoCreateInstance(&CLSID_JScript, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, + &IID_IUnknown, (void**)&unk); + ok(hres == S_OK, "CoCreateInstance failed: %08x\n", hres); + if(FAILED(hres)) + return; + + hres = IUnknown_QueryInterface(unk, &IID_IActiveScript, (void**)&script); + ok(hres == S_OK, "Could not get IActiveScript: %08x\n", hres); + + hres = IUnknown_QueryInterface(unk, &IID_IActiveScriptParse, (void**)&parse); + ok(hres == S_OK, "Could not get IActiveScriptParse: %08x\n", hres); + + IActiveScriptParse_Release(parse); + IActiveScript_Release(script); + IUnknown_Release(unk); +} + +START_TEST(jscript) +{ + CoInitialize(NULL); + + test_jscript(); + + CoUninitialize(); +} diff --git a/programs/winetest/Makefile.in b/programs/winetest/Makefile.in index b2102ce..4552284 100644 --- a/programs/winetest/Makefile.in +++ b/programs/winetest/Makefile.in @@ -48,6 +48,7 @@ TESTBINS = \ infosoft_test.exe \ iphlpapi_test.exe \ itss_test.exe \ + jscript_test.exe \ kernel32_test.exe \ localspl_test.exe \ localui_test.exe \ @@ -155,6 +156,8 @@ iphlpapi_test.exe: $(DLLDIR)/iphlpapi/tests/iphlpapi_test.exe$(DLLEXT) cp $(DLLDIR)/iphlpapi/tests/iphlpapi_test.exe$(DLLEXT) $@ && $(STRIP) $@ itss_test.exe: $(DLLDIR)/itss/tests/itss_test.exe$(DLLEXT) cp $(DLLDIR)/itss/tests/itss_test.exe$(DLLEXT) $@ && $(STRIP) $@ +jscript_test.exe: $(DLLDIR)/jscript/tests/jscript_test.exe$(DLLEXT) + cp $(DLLDIR)/jscript/tests/jscript_test.exe$(DLLEXT) $@ && $(STRIP) $@ kernel32_test.exe: $(DLLDIR)/kernel32/tests/kernel32_test.exe$(DLLEXT) cp $(DLLDIR)/kernel32/tests/kernel32_test.exe$(DLLEXT) $@ && $(STRIP) $@ localspl_test.exe: $(DLLDIR)/localspl/tests/localspl_test.exe$(DLLEXT) diff --git a/programs/winetest/winetest.rc b/programs/winetest/winetest.rc index 950981e..2a70931 100644 --- a/programs/winetest/winetest.rc +++ b/programs/winetest/winetest.rc @@ -106,6 +106,7 @@ inetcomm_test.exe TESTRES "inetcomm_test.exe" infosoft_test.exe TESTRES "infosoft_test.exe" iphlpapi_test.exe TESTRES "iphlpapi_test.exe" itss_test.exe TESTRES "itss_test.exe" +jscript_test.exe TESTRES "jscript_test.exe" kernel32_test.exe TESTRES "kernel32_test.exe" localspl_test.exe TESTRES "localspl_test.exe" localui_test.exe TESTRES "localui_test.exe"

1 0

Jacek Caban : jscript: Added DllCanUnloadNow implementation.
by Alexandre Julliard March 25, 2008

March 25, 2008

Module: wine Branch: master Commit: 8d4aa7decf3c6b7cba9697a09dc3cc44dd71ae05 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d4aa7decf3c6b7cba9697a09… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 24 21:53:34 2008 +0100 jscript: Added DllCanUnloadNow implementation. --- dlls/jscript/jscript.c | 6 +++++- dlls/jscript/jscript.h | 12 ++++++++++++ dlls/jscript/jscript_main.c | 13 +++++++++++-- 3 files changed, 28 insertions(+), 3 deletions(-) diff --git a/dlls/jscript/jscript.c b/dlls/jscript/jscript.c index 79b55c8..7d7385a 100644 --- a/dlls/jscript/jscript.c +++ b/dlls/jscript/jscript.c @@ -97,8 +97,10 @@ static ULONG WINAPI JScript_Release(IActiveScript *iface) TRACE("(%p) ref=%d\n", iface, ref); - if(!ref) + if(!ref) { heap_free(This); + unlock_module(); + } return ref; } @@ -427,6 +429,8 @@ HRESULT WINAPI JScriptFactory_CreateInstance(IClassFactory *iface, IUnknown *pUn TRACE("(%p %s %p)\n", pUnkOuter, debugstr_guid(riid), ppv); + lock_module(); + ret = heap_alloc(sizeof(*ret)); ret->lpIActiveScriptVtbl = &JScriptVtbl; diff --git a/dlls/jscript/jscript.h b/dlls/jscript/jscript.h index 6a7ec76..afdd0c7 100644 --- a/dlls/jscript/jscript.h +++ b/dlls/jscript/jscript.h @@ -28,6 +28,18 @@ HRESULT WINAPI JScriptFactory_CreateInstance(IClassFactory*,IUnknown*,REFIID,void**); +extern LONG module_ref; + +static inline void lock_module(void) +{ + InterlockedIncrement(&module_ref); +} + +static inline void unlock_module(void) +{ + InterlockedDecrement(&module_ref); +} + static inline void *heap_alloc(size_t len) { return HeapAlloc(GetProcessHeap(), 0, len); diff --git a/dlls/jscript/jscript_main.c b/dlls/jscript/jscript_main.c index f4c4bf1..92999fb 100644 --- a/dlls/jscript/jscript_main.c +++ b/dlls/jscript/jscript_main.c @@ -30,6 +30,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(jscript); +LONG module_ref = 0; + static const CLSID CLSID_JScript = {0xf414c260,0x6ac0,0x11cf,{0xb6,0xd1,0x00,0xaa,0x00,0xbb,0xbb,0x58}}; static const CLSID CLSID_JScriptAuthor = @@ -75,6 +77,12 @@ static ULONG WINAPI ClassFactory_Release(IClassFactory *iface) static HRESULT WINAPI ClassFactory_LockServer(IClassFactory *iface, BOOL fLock) { TRACE("(%p)->(%x)\n", iface, fLock); + + if(fLock) + lock_module(); + else + unlock_module(); + return S_OK; } @@ -127,8 +135,9 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) */ HRESULT WINAPI DllCanUnloadNow(void) { - FIXME("()\n"); - return S_FALSE; + TRACE("() ref=%d\n", module_ref); + + return module_ref ? S_FALSE : S_OK; } /***********************************************************************

1 0

Hans Leidekker : wininet: Avoid a crash with traces on.
by Alexandre Julliard March 25, 2008

March 25, 2008

Module: wine Branch: master Commit: 26b38dc50336edb1d251f130323a037857eaac1b URL: http://source.winehq.org/git/wine.git/?a=commit;h=26b38dc50336edb1d251f1303… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Mon Mar 24 21:32:36 2008 +0100 wininet: Avoid a crash with traces on. --- dlls/wininet/ftp.c | 4 +--- dlls/wininet/tests/ftp.c | 1 - 2 files changed, 1 insertions(+), 4 deletions(-) diff --git a/dlls/wininet/ftp.c b/dlls/wininet/ftp.c index 76ddbfd..4077de3 100644 --- a/dlls/wininet/ftp.c +++ b/dlls/wininet/ftp.c @@ -937,7 +937,7 @@ BOOL WINAPI FtpGetCurrentDirectoryW(HINTERNET hFtpSession, LPWSTR lpszCurrentDir LPWININETAPPINFOW hIC = NULL; BOOL r = FALSE; - TRACE("len(%d)\n", *lpdwCurrentDirectory); + TRACE("%p %p %p\n", hFtpSession, lpszCurrentDirectory, lpdwCurrentDirectory); lpwfs = (LPWININETFTPSESSIONW) WININET_GetObject( hFtpSession ); if (NULL == lpwfs) @@ -1015,8 +1015,6 @@ static BOOL FTP_FtpGetCurrentDirectoryW(LPWININETFTPSESSIONW lpwfs, LPWSTR lpszC LPWININETAPPINFOW hIC = NULL; DWORD bSuccess = FALSE; - TRACE("len(%d)\n", *lpdwCurrentDirectory); - /* Clear any error information */ INTERNET_SetLastError(0); diff --git a/dlls/wininet/tests/ftp.c b/dlls/wininet/tests/ftp.c index 9832fce..992bce9 100644 --- a/dlls/wininet/tests/ftp.c +++ b/dlls/wininet/tests/ftp.c @@ -26,7 +26,6 @@ * Add W-function tests. * Add missing function tests: * FtpFindFirstFile - * FtpGetCurrentDirectory * FtpGetFileSize * FtpSetCurrentDirectory */

1 0

Hans Leidekker : wininet: Correct spec file entry for InternetCanonicalizeUrl{A, W}.
by Alexandre Julliard March 25, 2008

March 25, 2008

Module: wine Branch: master Commit: af4c428a9af7eada1fa1aac4ab426a30ae36f517 URL: http://source.winehq.org/git/wine.git/?a=commit;h=af4c428a9af7eada1fa1aac4a… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Mon Mar 24 21:32:16 2008 +0100 wininet: Correct spec file entry for InternetCanonicalizeUrl{A, W}. --- dlls/wininet/wininet.spec | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wininet/wininet.spec b/dlls/wininet/wininet.spec index 19e6551..dfbc38c 100644 --- a/dlls/wininet/wininet.spec +++ b/dlls/wininet/wininet.spec @@ -116,8 +116,8 @@ @ stdcall InternetAutodial(long ptr) @ stub InternetAutodialCallback @ stdcall InternetAutodialHangup(long) -@ stdcall InternetCanonicalizeUrlA(str str ptr long) -@ stdcall InternetCanonicalizeUrlW(wstr wstr ptr long) +@ stdcall InternetCanonicalizeUrlA(str ptr ptr long) +@ stdcall InternetCanonicalizeUrlW(wstr ptr ptr long) @ stdcall InternetCheckConnectionA(ptr long long) @ stdcall InternetCheckConnectionW(ptr long long) @ stdcall InternetClearAllPerSiteCookieDecisions()

1 0

Hans Leidekker : wininet: Don' t strip Accept-Encoding headers from version 1.1 requests.
by Alexandre Julliard March 25, 2008

March 25, 2008

Module: wine Branch: master Commit: 3a57711bb84187a13249e107604cfa23c721d851 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a57711bb84187a13249e1076… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Mon Mar 24 21:31:53 2008 +0100 wininet: Don't strip Accept-Encoding headers from version 1.1 requests. --- dlls/wininet/http.c | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index d02217a..2d16924 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -63,6 +63,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(wininet); +static const WCHAR g_szHttp1_0[] = {'H','T','T','P','/','1','.','0',0}; static const WCHAR g_szHttp1_1[] = {'H','T','T','P','/','1','.','1',0}; static const WCHAR g_szReferer[] = {'R','e','f','e','r','e','r',0}; static const WCHAR g_szAccept[] = {'A','c','c','e','p','t',0}; @@ -3997,13 +3998,11 @@ static BOOL HTTP_DeleteCustomHeader(LPWININETHTTPREQW lpwhr, DWORD index) */ static BOOL HTTP_VerifyValidHeader(LPWININETHTTPREQW lpwhr, LPCWSTR field) { - BOOL rc = TRUE; - /* Accept-Encoding is stripped from HTTP/1.0 requests. It is invalid */ - if (strcmpiW(field,szAccept_Encoding)==0) + if (!strcmpW(lpwhr->lpszVersion, g_szHttp1_0) && !strcmpiW(field, szAccept_Encoding)) return FALSE; - return rc; + return TRUE; } /***********************************************************************

1 0

Reece Dunn : shlwapi: Added SHCreateStreamOnFileEx tests.
by Alexandre Julliard March 25, 2008

March 25, 2008

Module: wine Branch: master Commit: 404a51b4557731cfee7953ca8df004306fd55ce2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=404a51b4557731cfee7953ca8… Author: Reece Dunn <msclrhd(a)googlemail.com> Date: Mon Mar 24 10:11:28 2008 +0000 shlwapi: Added SHCreateStreamOnFileEx tests. --- dlls/shlwapi/tests/istream.c | 151 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 151 insertions(+), 0 deletions(-) diff --git a/dlls/shlwapi/tests/istream.c b/dlls/shlwapi/tests/istream.c index 21d7c76..59384fc 100644 --- a/dlls/shlwapi/tests/istream.c +++ b/dlls/shlwapi/tests/istream.c @@ -33,6 +33,7 @@ static HMODULE hShlwapi; static HRESULT (WINAPI *pSHCreateStreamOnFileA)(LPCSTR file, DWORD mode, IStream **stream); static HRESULT (WINAPI *pSHCreateStreamOnFileW)(LPCWSTR file, DWORD mode, IStream **stream); +static HRESULT (WINAPI *pSHCreateStreamOnFileEx)(LPCWSTR file, DWORD mode, DWORD attributes, BOOL create, IStream *template, IStream **stream); static void test_SHCreateStreamOnFileA(DWORD mode) @@ -204,12 +205,142 @@ static void test_SHCreateStreamOnFileW(DWORD mode) } +static void test_SHCreateStreamOnFileEx(DWORD mode, DWORD stgm) +{ + IStream * stream; + IStream * template = NULL; + HRESULT ret; + ULONG refcount; + static const WCHAR test_file[] = { 'c', ':', '\\', 't', 'e', 's', 't', '.', 't', 'x', 't' }; + + printf("SHCreateStreamOnFileEx: testing mode %d, STGM flags %08x\n", mode, stgm); + + /* invalid arguments */ + + stream = NULL; + ret = (*pSHCreateStreamOnFileEx)(NULL, mode, 0, FALSE, NULL, &stream); + ok(ret == HRESULT_FROM_WIN32(ERROR_PATH_NOT_FOUND) || /* XP */ + ret == E_INVALIDARG /* Vista */, + "SHCreateStreamOnFileEx: expected HRESULT_FROM_WIN32(ERROR_PATH_NOT_FOUND) or E_INVALIDARG, got 0x%08x\n", ret); + ok(stream == NULL, "SHCreateStreamOnFileEx: expected a NULL IStream object, got %p\n", stream); + + stream = NULL; + ret = (*pSHCreateStreamOnFileEx)(test_file, mode, 0, FALSE, template, &stream); + todo_wine + ok(ret == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), "SHCreateStreamOnFileEx: expected HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), got 0x%08x\n", ret); + ok(stream == NULL, "SHCreateStreamOnFileEx: expected a NULL IStream object, got %p\n", stream); + +#if 0 /* This test crashes on WinXP SP2 */ + ret = (*pSHCreateStreamOnFileEx)(test_file, mode, 0, FALSE, NULL, NULL); + ok(ret == E_INVALIDARG, "SHCreateStreamOnFileEx: expected E_INVALIDARG, got 0x%08x\n", ret); +#endif + + /* file does not exist */ + + stream = NULL; + ret = (*pSHCreateStreamOnFileEx)(test_file, mode | STGM_FAILIFTHERE | stgm, 0, FALSE, NULL, &stream); + todo_wine + ok(ret == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), "SHCreateStreamOnFileEx: expected HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), got 0x%08x\n", ret); + ok(stream == NULL, "SHCreateStreamOnFileEx: expected a NULL IStream object, got %p\n", stream); + + stream = NULL; + ret = (*pSHCreateStreamOnFileEx)(test_file, mode | STGM_FAILIFTHERE | stgm, 0, TRUE, NULL, &stream); + todo_wine + ok(ret == S_OK, "SHCreateStreamOnFileEx: expected S_OK, got 0x%08x\n", ret); + todo_wine + ok(stream != NULL, "SHCreateStreamOnFileEx: expected a valid IStream object, got NULL\n"); + + if (stream) { + refcount = IStream_Release(stream); + ok(refcount == 0, "SHCreateStreamOnFileEx: expected 0, got %d\n", refcount); + + ok(DeleteFileW(test_file), "SHCreateStreamOnFileEx: could not delete the test file, got error %d\n", GetLastError()); + } + + stream = NULL; + ret = (*pSHCreateStreamOnFileEx)(test_file, mode | STGM_CREATE | stgm, 0, FALSE, NULL, &stream); + todo_wine + ok(ret == S_OK, "SHCreateStreamOnFileEx: expected S_OK, got 0x%08x\n", ret); + todo_wine + ok(stream != NULL, "SHCreateStreamOnFileEx: expected a valid IStream object, got NULL\n"); + + if (stream) { + refcount = IStream_Release(stream); + ok(refcount == 0, "SHCreateStreamOnFileEx: expected 0, got %d\n", refcount); + + ok(DeleteFileW(test_file), "SHCreateStreamOnFileEx: could not delete the test file, got error %d\n", GetLastError()); + } + + stream = NULL; + ret = (*pSHCreateStreamOnFileEx)(test_file, mode | STGM_CREATE | stgm, 0, TRUE, NULL, &stream); + todo_wine + ok(ret == S_OK, "SHCreateStreamOnFileEx: expected S_OK, got 0x%08x\n", ret); + todo_wine + ok(stream != NULL, "SHCreateStreamOnFileEx: expected a valid IStream object, got NULL\n"); + + if (stream) { + refcount = IStream_Release(stream); + ok(refcount == 0, "SHCreateStreamOnFileEx: expected 0, got %d\n", refcount); + } + + /* NOTE: don't delete the file, as it will be used for the file exists tests. */ + + /* file exists */ + + stream = NULL; + ret = (*pSHCreateStreamOnFileEx)(test_file, mode | STGM_FAILIFTHERE | stgm, 0, FALSE, NULL, &stream); + todo_wine + ok(ret == S_OK, "SHCreateStreamOnFileEx: expected S_OK, got 0x%08x\n", ret); + todo_wine + ok(stream != NULL, "SHCreateStreamOnFileEx: expected a valid IStream object, got NULL\n"); + + if (stream) { + refcount = IStream_Release(stream); + ok(refcount == 0, "SHCreateStreamOnFileEx: expected 0, got %d\n", refcount); + } + + stream = NULL; + ret = (*pSHCreateStreamOnFileEx)(test_file, mode | STGM_FAILIFTHERE | stgm, 0, TRUE, NULL, &stream); + todo_wine + ok(ret == HRESULT_FROM_WIN32(ERROR_FILE_EXISTS), "SHCreateStreamOnFileEx: expected HRESULT_FROM_WIN32(ERROR_FILE_EXISTS), got 0x%08x\n", ret); + ok(stream == NULL, "SHCreateStreamOnFileEx: expected a NULL IStream object, got %p\n", stream); + + stream = NULL; + ret = (*pSHCreateStreamOnFileEx)(test_file, mode | STGM_CREATE | stgm, 0, FALSE, NULL, &stream); + todo_wine + ok(ret == S_OK, "SHCreateStreamOnFileEx: expected S_OK, got 0x%08x\n", ret); + todo_wine + ok(stream != NULL, "SHCreateStreamOnFileEx: expected a valid IStream object, got NULL\n"); + + if (stream) { + refcount = IStream_Release(stream); + ok(refcount == 0, "SHCreateStreamOnFileEx: expected 0, got %d\n", refcount); + } + + stream = NULL; + ret = (*pSHCreateStreamOnFileEx)(test_file, mode | STGM_CREATE | stgm, 0, TRUE, NULL, &stream); + todo_wine + ok(ret == S_OK, "SHCreateStreamOnFileEx: expected S_OK, got 0x%08x\n", ret); + todo_wine + ok(stream != NULL, "SHCreateStreamOnFileEx: expected a valid IStream object, got NULL\n"); + + if (stream) { + refcount = IStream_Release(stream); + ok(refcount == 0, "SHCreateStreamOnFileEx: expected 0, got %d\n", refcount); + } + + todo_wine + ok(DeleteFileW(test_file), "SHCreateStreamOnFileEx: could not delete the test file, got error %d\n", GetLastError()); +} + + START_TEST(istream) { hShlwapi = GetModuleHandleA("shlwapi.dll"); pSHCreateStreamOnFileA = (void*)GetProcAddress(hShlwapi, "SHCreateStreamOnFileA"); pSHCreateStreamOnFileW = (void*)GetProcAddress(hShlwapi, "SHCreateStreamOnFileW"); + pSHCreateStreamOnFileEx = (void*)GetProcAddress(hShlwapi, "SHCreateStreamOnFileEx"); if (!pSHCreateStreamOnFileA) printf("SHCreateStreamOnFileA not found... skipping tests.\n"); @@ -226,4 +357,24 @@ START_TEST(istream) test_SHCreateStreamOnFileW(STGM_WRITE); test_SHCreateStreamOnFileW(STGM_READWRITE); } + + if (!pSHCreateStreamOnFileEx) + printf("SHCreateStreamOnFileEx not found... skipping tests.\n"); + else { + test_SHCreateStreamOnFileEx(STGM_READ, 0); + test_SHCreateStreamOnFileEx(STGM_WRITE, 0); + test_SHCreateStreamOnFileEx(STGM_READWRITE, 0); + + test_SHCreateStreamOnFileEx(STGM_READ, STGM_CONVERT); + test_SHCreateStreamOnFileEx(STGM_WRITE, STGM_CONVERT); + test_SHCreateStreamOnFileEx(STGM_READWRITE, STGM_CONVERT); + + test_SHCreateStreamOnFileEx(STGM_READ, STGM_DELETEONRELEASE); + test_SHCreateStreamOnFileEx(STGM_WRITE, STGM_DELETEONRELEASE); + test_SHCreateStreamOnFileEx(STGM_READWRITE, STGM_DELETEONRELEASE); + + test_SHCreateStreamOnFileEx(STGM_READ, STGM_CONVERT | STGM_DELETEONRELEASE); + test_SHCreateStreamOnFileEx(STGM_WRITE, STGM_CONVERT | STGM_DELETEONRELEASE); + test_SHCreateStreamOnFileEx(STGM_READWRITE, STGM_CONVERT | STGM_DELETEONRELEASE); + } }

1 0