January 2009 - Wine-Commits

Paul Vriens : advapi32/tests: Fix two test failures on Vista and W2K8.
by Alexandre Julliard Jan. 6, 2009

Jan. 6, 2009

Module: wine Branch: master Commit: cd31fd393eae2f20e86374d18318ef5e3a2bf3cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd31fd393eae2f20e86374d18… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Mon Jan 5 17:51:46 2009 +0100 advapi32/tests: Fix two test failures on Vista and W2K8. --- dlls/advapi32/tests/cred.c | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/advapi32/tests/cred.c b/dlls/advapi32/tests/cred.c index e23f872..58103c6 100644 --- a/dlls/advapi32/tests/cred.c +++ b/dlls/advapi32/tests/cred.c @@ -180,16 +180,20 @@ static void test_CredReadDomainCredentialsA(void) SetLastError(0xdeadbeef); ret = pCredReadDomainCredentialsA(&info, 0, &count, &creds); - ok(!ret && GetLastError() == ERROR_NOT_FOUND, - "CredReadDomainCredentialsA should have failed with ERROR_NOT_FOUND instead of %d\n", + ok(!ret, "CredReadDomainCredentialsA should have failed\n"); + ok(GetLastError() == ERROR_NOT_FOUND || + GetLastError() == ERROR_INVALID_PARAMETER, /* Vista, W2K8 */ + "Expected ERROR_NOT_FOUND or ERROR_INVALID_PARAMETER instead of %d\n", GetLastError()); info.DnsServerName = NULL; SetLastError(0xdeadbeef); ret = pCredReadDomainCredentialsA(&info, 0, &count, &creds); - ok(!ret && GetLastError() == ERROR_NOT_FOUND, - "CredReadDomainCredentialsA should have failed with ERROR_NOT_FOUND instead of %d\n", + ok(!ret, "CredReadDomainCredentialsA should have failed\n"); + ok(GetLastError() == ERROR_NOT_FOUND || + GetLastError() == ERROR_INVALID_PARAMETER, /* Vista, W2K8 */ + "Expected ERROR_NOT_FOUND or ERROR_INVALID_PARAMETER instead of %d\n", GetLastError()); }

1 0

Jacek Caban : mshtml: Added IDispatchEx support to HTMLLocation object.
by Alexandre Julliard Jan. 6, 2009

Jan. 6, 2009

Module: wine Branch: master Commit: a2ac4d2323fca27d9dd555f8ee46469f7dcf93cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=a2ac4d2323fca27d9dd555f8e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jan 5 18:17:36 2009 +0100 mshtml: Added IDispatchEx support to HTMLLocation object. --- dlls/mshtml/dispex.c | 1 + dlls/mshtml/htmllocation.c | 19 ++++++++++++++++--- dlls/mshtml/mshtml_private.h | 2 ++ dlls/mshtml/tests/dom.c | 1 + 4 files changed, 20 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/dispex.c b/dlls/mshtml/dispex.c index 526fdea..a3a9595 100644 --- a/dlls/mshtml/dispex.c +++ b/dlls/mshtml/dispex.c @@ -106,6 +106,7 @@ static REFIID tid_ids[] = { &IID_IHTMLGenericElement, &IID_IHTMLImgElement, &IID_IHTMLInputElement, + &IID_IHTMLLocation, &IID_IHTMLOptionElement, &IID_IHTMLSelectElement, &IID_IHTMLStyle, diff --git a/dlls/mshtml/htmllocation.c b/dlls/mshtml/htmllocation.c index 0881023..5f0d7fb 100644 --- a/dlls/mshtml/htmllocation.c +++ b/dlls/mshtml/htmllocation.c @@ -43,12 +43,11 @@ static HRESULT WINAPI HTMLLocation_QueryInterface(IHTMLLocation *iface, REFIID r if(IsEqualGUID(&IID_IUnknown, riid)) { TRACE("(%p)->(IID_IUnknown %p)\n", This, ppv); *ppv = HTMLLOCATION(This); - }else if(IsEqualGUID(&IID_IDispatch, riid)) { - TRACE("(%p)->(IID_IDispatch %p)\n", This, ppv); - *ppv = HTMLLOCATION(This); }else if(IsEqualGUID(&IID_IHTMLLocation, riid)) { TRACE("(%p)->(IID_IHTMLLocation %p)\n", This, ppv); *ppv = HTMLLOCATION(This); + }else if(dispex_query_interface(&This->dispex, riid, ppv)) { + return *ppv ? S_OK : E_NOINTERFACE; } if(*ppv) { @@ -293,6 +292,18 @@ static const IHTMLLocationVtbl HTMLLocationVtbl = { HTMLLocation_toString }; +static const tid_t HTMLLocation_iface_tids[] = { + IHTMLLocation_tid, + 0 +}; +static dispex_static_data_t HTMLLocation_dispex = { + NULL, + IHTMLLocation_tid, + NULL, + HTMLLocation_iface_tids +}; + + HTMLLocation *HTMLLocation_Create(HTMLDocument *doc) { HTMLLocation *ret = heap_alloc(sizeof(*ret)); @@ -301,5 +312,7 @@ HTMLLocation *HTMLLocation_Create(HTMLDocument *doc) ret->ref = 1; ret->doc = doc; + init_dispex(&ret->dispex, (IUnknown*)HTMLLOCATION(ret), &HTMLLocation_dispex); + return ret; } diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 58f662a..a7e364e 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -102,6 +102,7 @@ typedef enum { IHTMLGenericElement_tid, IHTMLImgElement_tid, IHTMLInputElement_tid, + IHTMLLocation_tid, IHTMLOptionElement_tid, IHTMLSelectElement_tid, IHTMLStyle_tid, @@ -199,6 +200,7 @@ struct ConnectionPoint { }; typedef struct { + DispatchEx dispex; const IHTMLLocationVtbl *lpHTMLLocationVtbl; LONG ref; diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index ee2a5ca..be54998 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -2207,6 +2207,7 @@ static void test_location(IHTMLDocument2 *doc) IHTMLLocation_Release(location2); test_ifaces((IUnknown*)location, location_iids); + test_disp((IUnknown*)location, &IID_IHTMLLocation); ref = IHTMLLocation_Release(location); ok(!ref, "location chould be destroyed here\n");

1 0

Gerald Pfeifer : Sync documentation/README.de.
by Alexandre Julliard Jan. 6, 2009

Jan. 6, 2009

Module: wine Branch: master Commit: 85079112641d2ee144741c643ea2c5c880608619 URL: http://source.winehq.org/git/wine.git/?a=commit;h=85079112641d2ee144741c643… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Mon Jan 5 13:35:42 2009 +0100 Sync documentation/README.de. --- documentation/README.de | 16 ++++------------ 1 files changed, 4 insertions(+), 12 deletions(-) diff --git a/documentation/README.de b/documentation/README.de index 6ee1b14..ee07af0 100644 --- a/documentation/README.de +++ b/documentation/README.de @@ -32,9 +32,10 @@ Um Wine kompilieren und ausf folgenden Betriebssysteme: Linux version 2.0.36 oder neuer - FreeBSD 4.x oder FreeBSD 5-CURRENT oder neuer - Solaris x86 2.5 oder neuer + FreeBSD 6.3 oder neuer + Solaris x86 9 oder neuer NetBSD-current + Mac OS X 10.4 oder neuer Da Wine Thread-Support auf Kernelebene ben�tigt, werden nur die oben aufgef�hrten Betriebssysteme unterst�tzt. @@ -74,20 +75,11 @@ Unterst Grunds�tzliche Voraussetzungen: Sie m�ssen die Include-Dateien f�r X11-Entwicklung installiert haben - (Debian nennt diese xlib6g-dev, RedHat XFree86-devel). - -Vorausgesetzte Build-Tools: - Auf x86-Systemen wird der gcc >= 2.7.2 ben�tigt. - Versionen vor 2.7.2.3 k�nnen Probleme damit haben, wenn bestimmte Dateien - mit Optimierungen kompiliert werden, oft im Zusammenhang mit Problemen mit - der Verwaltung von Header-Dateien. pgcc arbeitet derzeit nicht mit Wine. - Die Ursache dieses Problems ist unbekannt. + (Debian nennt diese xlib6g-dev, Red Hat XFree86-devel). Nat�rlich ben�tigen Sie auch "make" (h�chstwahrscheinlich GNU make). Des Weiteren ben�tigen Sie flex in der Version 2.5 oder h�her und bison. - Wenn Sie RedHat oder Debian benutzen, installieren Sie bitte die flex- - und bison-Pakete. Optionale Support-Bibliotheken: Der ./configure Aufruf zeigt am Ende optionale Bibliotheken an,

1 0

Alexandre Julliard : setupapi/tests: Added some tests for SetupEnumInfSectionsA/W.
by Alexandre Julliard Jan. 6, 2009

Jan. 6, 2009

Module: wine Branch: master Commit: 2e20bd496095ae8b146b4965d4b73081a7ebc818 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e20bd496095ae8b146b4965d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 5 20:27:06 2009 +0100 setupapi/tests: Added some tests for SetupEnumInfSectionsA/W. --- dlls/setupapi/tests/parser.c | 51 +++++++++++++++++++++++++++++++++++++++++- 1 files changed, 50 insertions(+), 1 deletions(-) diff --git a/dlls/setupapi/tests/parser.c b/dlls/setupapi/tests/parser.c index 8869ca1..ddfd0f2 100644 --- a/dlls/setupapi/tests/parser.c +++ b/dlls/setupapi/tests/parser.c @@ -33,12 +33,14 @@ /* function pointers */ static HMODULE hSetupAPI; static LPCWSTR (WINAPI *pSetupGetField)(PINFCONTEXT,DWORD); +static BOOL (WINAPI *pSetupEnumInfSectionsA)( HINF hinf, UINT index, PSTR buffer, DWORD size, UINT *need ); static void init_function_pointers(void) { hSetupAPI = GetModuleHandleA("setupapi.dll"); - pSetupGetField = (void *)GetProcAddress(hSetupAPI, "pSetupGetField"); + pSetupGetField = (void *)GetProcAddress(hSetupAPI, "pSetupGetField"); + pSetupEnumInfSectionsA = (void *)GetProcAddress(hSetupAPI, "SetupEnumInfSectionsA" ); } static const char tmpfilename[] = ".\\tmp.inf"; @@ -246,6 +248,52 @@ static void test_section_names(void) } } +static void test_enum_sections(void) +{ + static const char *contents = STD_HEADER "[s1]\nfoo=bar\n[s2]\nbar=foo\n[s3]\n[strings]\na=b\n"; + + BOOL ret; + DWORD len; + HINF hinf; + UINT err, index; + char buffer[256]; + + if (!pSetupEnumInfSectionsA) + { + win_skip( "SetupEnumInfSectionsA not available\n" ); + return; + } + + hinf = test_file_contents( contents, &err ); + ok( hinf != NULL, "Expected valid INF file\n" ); + + for (index = 0; ; index++) + { + SetLastError( 0xdeadbeef ); + ret = pSetupEnumInfSectionsA( hinf, index, NULL, 0, &len ); + err = GetLastError(); + if (!ret && GetLastError() == ERROR_NO_MORE_ITEMS) break; + ok( ret, "SetupEnumInfSectionsA failed\n" ); + ok( len == 3 || len == 8, "wrong len %u\n", len ); + + SetLastError( 0xdeadbeef ); + ret = pSetupEnumInfSectionsA( hinf, index, NULL, sizeof(buffer), &len ); + err = GetLastError(); + ok( !ret, "SetupEnumInfSectionsA succeeded\n" ); + ok( err == ERROR_INVALID_USER_BUFFER, "wrong error %u\n", err ); + ok( len == 3 || len == 8, "wrong len %u\n", len ); + + SetLastError( 0xdeadbeef ); + ret = pSetupEnumInfSectionsA( hinf, index, buffer, sizeof(buffer), &len ); + ok( ret, "SetupEnumInfSectionsA failed err %u\n", GetLastError() ); + ok( len == 3 || len == 8, "wrong len %u\n", len ); + ok( !lstrcmpi( buffer, "version" ) || !lstrcmpi( buffer, "s1" ) || + !lstrcmpi( buffer, "s2" ) || !lstrcmpi( buffer, "s3" ) || !lstrcmpi( buffer, "strings" ), + "bad section '%s'\n", buffer ); + } + SetupCloseInfFile( hinf ); +} + /* Test various key and value names */ @@ -672,6 +720,7 @@ START_TEST(parser) init_function_pointers(); test_invalid_files(); test_section_names(); + test_enum_sections(); test_key_names(); test_close_inf_file(); test_pSetupGetField();

1 0

Alexandre Julliard : setupapi: Implemented SetupEnumInfSectionsA/W.
by Alexandre Julliard Jan. 6, 2009

Jan. 6, 2009

Module: wine Branch: master Commit: b45cfc123eb6c341376edb9ef1d8f63be78255a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b45cfc123eb6c341376edb9ef… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 5 20:26:50 2009 +0100 setupapi: Implemented SetupEnumInfSectionsA/W. --- dlls/setupapi/parser.c | 69 +++++++++++++++++++++++++++++++++++++++++++ dlls/setupapi/setupapi.spec | 2 + include/setupapi.h | 4 +- 3 files changed, 73 insertions(+), 2 deletions(-) diff --git a/dlls/setupapi/parser.c b/dlls/setupapi/parser.c index 656fb78..00d3373 100644 --- a/dlls/setupapi/parser.c +++ b/dlls/setupapi/parser.c @@ -1245,6 +1245,75 @@ void WINAPI SetupCloseInfFile( HINF hinf ) /*********************************************************************** + * SetupEnumInfSectionsA (SETUPAPI.@) + */ +BOOL WINAPI SetupEnumInfSectionsA( HINF hinf, UINT index, PSTR buffer, DWORD size, DWORD *need ) +{ + struct inf_file *file = hinf; + + for (file = hinf; file; file = file->next) + { + if (index < file->nb_sections) + { + DWORD len = WideCharToMultiByte( CP_ACP, 0, file->sections[index]->name, -1, + NULL, 0, NULL, NULL ); + if (*need) *need = len; + if (!buffer) + { + if (!size) return TRUE; + SetLastError( ERROR_INVALID_USER_BUFFER ); + return FALSE; + } + if (len > size) + { + SetLastError( ERROR_INSUFFICIENT_BUFFER ); + return FALSE; + } + WideCharToMultiByte( CP_ACP, 0, file->sections[index]->name, -1, buffer, size, NULL, NULL ); + return TRUE; + } + index -= file->nb_sections; + } + SetLastError( ERROR_NO_MORE_ITEMS ); + return FALSE; +} + + +/*********************************************************************** + * SetupEnumInfSectionsW (SETUPAPI.@) + */ +BOOL WINAPI SetupEnumInfSectionsW( HINF hinf, UINT index, PWSTR buffer, DWORD size, DWORD *need ) +{ + struct inf_file *file = hinf; + + for (file = hinf; file; file = file->next) + { + if (index < file->nb_sections) + { + DWORD len = strlenW( file->sections[index]->name ) + 1; + if (*need) *need = len; + if (!buffer) + { + if (!size) return TRUE; + SetLastError( ERROR_INVALID_USER_BUFFER ); + return FALSE; + } + if (len > size) + { + SetLastError( ERROR_INSUFFICIENT_BUFFER ); + return FALSE; + } + memcpy( buffer, file->sections[index]->name, len * sizeof(WCHAR) ); + return TRUE; + } + index -= file->nb_sections; + } + SetLastError( ERROR_NO_MORE_ITEMS ); + return FALSE; +} + + +/*********************************************************************** * SetupGetLineCountA (SETUPAPI.@) */ LONG WINAPI SetupGetLineCountA( HINF hinf, PCSTR name ) diff --git a/dlls/setupapi/setupapi.spec b/dlls/setupapi/setupapi.spec index 2996803..03435bc 100644 --- a/dlls/setupapi/setupapi.spec +++ b/dlls/setupapi/setupapi.spec @@ -389,6 +389,8 @@ @ stub SetupDiUnremoveDevice @ stub SetupDuplicateDiskSpaceListA @ stub SetupDuplicateDiskSpaceListW +@ stdcall SetupEnumInfSectionsA(long long ptr long ptr) +@ stdcall SetupEnumInfSectionsW(long long ptr long ptr) @ stdcall SetupFindFirstLineA(long str str ptr) @ stdcall SetupFindFirstLineW(long wstr wstr ptr) @ stdcall SetupFindNextLine(ptr ptr) diff --git a/include/setupapi.h b/include/setupapi.h index 0e9cbbb..820c5c4 100644 --- a/include/setupapi.h +++ b/include/setupapi.h @@ -1633,8 +1633,8 @@ BOOL WINAPI SetupDiUnremoveDevice(HDEVINFO, PSP_DEVINFO_DATA); HDSKSPC WINAPI SetupDuplicateDiskSpaceListA(HDSKSPC, PVOID, DWORD, UINT); HDSKSPC WINAPI SetupDuplicateDiskSpaceListW(HDSKSPC, PVOID, DWORD, UINT); #define SetupDuplicateDiskSpaceList WINELIB_NAME_AW(SetupDuplicateDiskSpaceList) -BOOL WINAPI SetupEnumInfSectionsA(HINF, UINT, PSTR, SIZE, UINT *); -BOOL WINAPI SetupEnumInfSectionsW(HINF, UINT, PWSTR, SIZE, UINT *); +BOOL WINAPI SetupEnumInfSectionsA(HINF, UINT, PSTR, DWORD, DWORD *); +BOOL WINAPI SetupEnumInfSectionsW(HINF, UINT, PWSTR, DWORD, DWORD *); #define SetupEnumInfSections WINELIB_NAME_AW(SetupEnumInfSections) BOOL WINAPI SetupFindFirstLineA( HINF hinf, PCSTR section, PCSTR key, INFCONTEXT *context ); BOOL WINAPI SetupFindFirstLineW( HINF hinf, PCWSTR section, PCWSTR key, INFCONTEXT *context );

1 0

Alexandre Julliard : updspapi: Added an updspapi implementation that forwards to setupapi.
by Alexandre Julliard Jan. 6, 2009

Jan. 6, 2009

Module: wine Branch: master Commit: d7fd308f41cb7d6ea8c5a6e464c6693ba56b9a12 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d7fd308f41cb7d6ea8c5a6e46… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 5 20:28:06 2009 +0100 updspapi: Added an updspapi implementation that forwards to setupapi. --- configure | 9 +++++ configure.ac | 1 + dlls/updspapi/Makefile.in | 10 ++++++ dlls/updspapi/updspapi.spec | 70 +++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 90 insertions(+), 0 deletions(-) diff --git a/configure b/configure index 2a83b45..6426882 100755 --- a/configure +++ b/configure @@ -26247,6 +26247,14 @@ dlls/unicows/Makefile: dlls/unicows/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/unicows/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ + dlls/updspapi/Makefile" +test "x$enable_updspapi" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + updspapi" +ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS +dlls/updspapi/Makefile: dlls/updspapi/Makefile.in dlls/Makedll.rules" +ac_config_files="$ac_config_files dlls/updspapi/Makefile" + +ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/url/Makefile" test "x$enable_url" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ url" @@ -28251,6 +28259,7 @@ do "dlls/tapi32/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/tapi32/Makefile" ;; "dlls/twain_32/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/twain_32/Makefile" ;; "dlls/unicows/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/unicows/Makefile" ;; + "dlls/updspapi/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/updspapi/Makefile" ;; "dlls/url/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/url/Makefile" ;; "dlls/urlmon/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/urlmon/Makefile" ;; "dlls/urlmon/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/urlmon/tests/Makefile" ;; diff --git a/configure.ac b/configure.ac index 8d45409..aaeff42 100644 --- a/configure.ac +++ b/configure.ac @@ -2055,6 +2055,7 @@ WINE_CONFIG_MAKEFILE([dlls/sxs/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DI WINE_CONFIG_MAKEFILE([dlls/tapi32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/twain_32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/unicows/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/updspapi/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/url/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/urlmon/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/urlmon/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS],[enable_tests]) diff --git a/dlls/updspapi/Makefile.in b/dlls/updspapi/Makefile.in new file mode 100644 index 0000000..8917f49 --- /dev/null +++ b/dlls/updspapi/Makefile.in @@ -0,0 +1,10 @@ +TOPSRCDIR = @top_srcdir@ +TOPOBJDIR = ../.. +SRCDIR = @srcdir@ +VPATH = @srcdir@ +MODULE = updspapi.dll +IMPORTS = setupapi kernel32 + +(a)MAKE_DLL_RULES@ + +(a)DEPENDENCIES@ # everything below this line is overwritten by make depend diff --git a/dlls/updspapi/updspapi.spec b/dlls/updspapi/updspapi.spec new file mode 100644 index 0000000..eb47bc4 --- /dev/null +++ b/dlls/updspapi/updspapi.spec @@ -0,0 +1,70 @@ +@ stdcall UpdSpCloseFileQueue(ptr) setupapi.SetupCloseFileQueue +@ stdcall UpdSpCloseInfFile(long) setupapi.SetupCloseInfFile +@ stdcall UpdSpCommitFileQueueA(long long ptr ptr) setupapi.SetupCommitFileQueueA +@ stdcall UpdSpCommitFileQueueW(long long ptr ptr) setupapi.SetupCommitFileQueueW +@ stdcall UpdSpCopyErrorA(long str str str str str long long str long ptr) setupapi.SetupCopyErrorA +@ stdcall UpdSpCopyErrorW(long wstr wstr wstr wstr wstr long long wstr long ptr) setupapi.SetupCopyErrorW +@ stdcall UpdSpDecompressOrCopyFileA(str str ptr) setupapi.SetupDecompressOrCopyFileA +@ stdcall UpdSpDecompressOrCopyFileW(wstr wstr ptr) setupapi.SetupDecompressOrCopyFileW +@ stdcall UpdSpDefaultQueueCallbackA(ptr long long long) setupapi.SetupDefaultQueueCallbackA +@ stdcall UpdSpDefaultQueueCallbackW(ptr long long long) setupapi.SetupDefaultQueueCallbackW +@ stdcall UpdSpDeleteErrorA(long str str long long) setupapi.SetupDeleteErrorA +@ stdcall UpdSpDeleteErrorW(long wstr wstr long long) setupapi.SetupDeleteErrorW +@ stdcall UpdSpEnumInfSectionsA(long long ptr long ptr) setupapi.SetupEnumInfSectionsA +@ stdcall UpdSpEnumInfSectionsW(long long ptr long ptr) setupapi.SetupEnumInfSectionsW +@ stdcall UpdSpFindFirstLineA(long str str ptr) setupapi.SetupFindFirstLineA +@ stdcall UpdSpFindFirstLineW(long wstr wstr ptr) setupapi.SetupFindFirstLineW +@ stdcall UpdSpFindNextLine(ptr ptr) setupapi.SetupFindNextLine +@ stdcall UpdSpFindNextMatchLineA(ptr str ptr) setupapi.SetupFindNextMatchLineA +@ stdcall UpdSpFindNextMatchLineW(ptr wstr ptr) setupapi.SetupFindNextMatchLineW +@ stdcall UpdSpGetBinaryField(ptr long ptr long ptr) setupapi.SetupGetBinaryField +@ stdcall UpdSpGetFieldCount(ptr) setupapi.SetupGetFieldCount +@ stdcall UpdSpGetIntField(ptr long ptr) setupapi.SetupGetIntField +@ stdcall UpdSpGetLineByIndexA(long str long ptr) setupapi.SetupGetLineByIndexA +@ stdcall UpdSpGetLineByIndexW(long wstr long ptr) setupapi.SetupGetLineByIndexW +@ stdcall UpdSpGetLineCountA(long str) setupapi.SetupGetLineCountA +@ stdcall UpdSpGetLineCountW(long wstr) setupapi.SetupGetLineCountW +@ stdcall UpdSpGetLineTextA(ptr long str str ptr long ptr) setupapi.SetupGetLineTextA +@ stdcall UpdSpGetLineTextW(ptr long wstr wstr ptr long ptr) setupapi.SetupGetLineTextW +@ stdcall UpdSpGetMultiSzFieldA(ptr long ptr long ptr) setupapi.SetupGetMultiSzFieldA +@ stdcall UpdSpGetMultiSzFieldW(ptr long ptr long ptr) setupapi.SetupGetMultiSzFieldW +@ stdcall UpdSpGetSourceFileLocationA(ptr ptr str ptr ptr long ptr) setupapi.SetupGetSourceFileLocationA +@ stdcall UpdSpGetSourceFileLocationW(ptr ptr wstr ptr ptr long ptr) setupapi.SetupGetSourceFileLocationW +@ stdcall UpdSpGetSourceInfoA(ptr long long ptr long ptr) setupapi.SetupGetSourceInfoA +@ stdcall UpdSpGetSourceInfoW(ptr long long ptr long ptr) setupapi.SetupGetSourceInfoW +@ stdcall UpdSpGetStringFieldA(ptr long ptr long ptr) setupapi.SetupGetStringFieldA +@ stdcall UpdSpGetStringFieldW(ptr long ptr long ptr) setupapi.SetupGetStringFieldW +@ stdcall UpdSpGetTargetPathA(ptr ptr str ptr long ptr) setupapi.SetupGetTargetPathA +@ stdcall UpdSpGetTargetPathW(ptr ptr wstr ptr long ptr) setupapi.SetupGetTargetPathW +@ stdcall UpdSpInitDefaultQueueCallback(long) setupapi.SetupInitDefaultQueueCallback +@ stdcall UpdSpInitDefaultQueueCallbackEx(long long long long ptr) setupapi.SetupInitDefaultQueueCallbackEx +@ stdcall UpdSpInstallFilesFromInfSectionA(long long long str str long) setupapi.SetupInstallFilesFromInfSectionA +@ stdcall UpdSpInstallFilesFromInfSectionW(long long long wstr wstr long) setupapi.SetupInstallFilesFromInfSectionW +@ stdcall UpdSpInstallFromInfSectionA(long long str long long str long ptr ptr long ptr) setupapi.SetupInstallFromInfSectionA +@ stdcall UpdSpInstallFromInfSectionW(long long wstr long long wstr long ptr ptr long ptr) setupapi.SetupInstallFromInfSectionW +@ stdcall UpdSpIterateCabinetA(str long ptr ptr) setupapi.SetupIterateCabinetA +@ stdcall UpdSpIterateCabinetW(wstr long ptr ptr) setupapi.SetupIterateCabinetW +@ stdcall UpdSpOpenAppendInfFileA(str long ptr) setupapi.SetupOpenAppendInfFileA +@ stdcall UpdSpOpenAppendInfFileW(wstr long ptr) setupapi.SetupOpenAppendInfFileW +@ stdcall UpdSpOpenFileQueue() setupapi.SetupOpenFileQueue +@ stdcall UpdSpOpenInfFileA(str str long ptr) setupapi.SetupOpenInfFileA +@ stdcall UpdSpOpenInfFileW(wstr wstr long ptr) setupapi.SetupOpenInfFileW +@ stdcall UpdSpPromptForDiskA(ptr str str str str str long ptr long ptr) setupapi.SetupPromptForDiskA +@ stdcall UpdSpPromptForDiskW(ptr wstr wstr wstr wstr wstr long ptr long ptr) setupapi.SetupPromptForDiskW +@ stdcall UpdSpQueueCopyA(long str str str str str str str long) setupapi.SetupQueueCopyA +@ stdcall UpdSpQueueCopySectionA(long str long long str long) setupapi.SetupQueueCopySectionA +@ stdcall UpdSpQueueCopySectionW(long wstr long long wstr long) setupapi.SetupQueueCopySectionW +@ stdcall UpdSpQueueCopyW(long wstr wstr wstr wstr wstr wstr wstr long) setupapi.SetupQueueCopyW +@ stdcall UpdSpQueueDeleteA(long str str) setupapi.SetupQueueDeleteA +@ stdcall UpdSpQueueDeleteSectionA(long long long str) setupapi.SetupQueueDeleteSectionA +@ stdcall UpdSpQueueDeleteSectionW(long long long wstr) setupapi.SetupQueueDeleteSectionW +@ stdcall UpdSpQueueDeleteW(long wstr wstr) setupapi.SetupQueueDeleteW +@ stdcall UpdSpScanFileQueueA(long long long ptr ptr ptr) setupapi.SetupScanFileQueueA +@ stdcall UpdSpScanFileQueueW(long long long ptr ptr ptr) setupapi.SetupScanFileQueueW +@ stdcall UpdSpSetDirectoryIdA(long long str) setupapi.SetupSetDirectoryIdA +@ stdcall UpdSpSetDirectoryIdW(long long wstr) setupapi.SetupSetDirectoryIdW +@ stub UpdSpSetDynamicStringA +@ stub UpdSpSetDynamicStringExA +@ stub UpdSpSetDynamicStringExW +@ stub UpdSpSetDynamicStringW +@ stdcall UpdSpTermDefaultQueueCallback(ptr) setupapi.SetupTermDefaultQueueCallback

1 0

Ge van Geldorp : mscms/tests: Pass correct device name to AssociateColorProfileWithDevice().
by Alexandre Julliard Jan. 5, 2009

Jan. 5, 2009

Module: wine Branch: master Commit: 1f62d854969773d5c0883bcfeb49c5ed1940264e URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f62d854969773d5c0883bcfe… Author: Ge van Geldorp <ge(a)gse.nl> Date: Sun Jan 4 16:23:47 2009 +0100 mscms/tests: Pass correct device name to AssociateColorProfileWithDevice(). --- dlls/mscms/tests/profile.c | 136 ++++++++++++++++++++++++++----------------- 1 files changed, 82 insertions(+), 54 deletions(-) diff --git a/dlls/mscms/tests/profile.c b/dlls/mscms/tests/profile.c index 56d7732..e33280a 100644 --- a/dlls/mscms/tests/profile.c +++ b/dlls/mscms/tests/profile.c @@ -31,6 +31,7 @@ #include "wine/test.h" HMODULE hmscms; +HMODULE huser32; static BOOL (WINAPI *pAssociateColorProfileWithDeviceA)(PCSTR,PCSTR,PCSTR); static BOOL (WINAPI *pCloseColorProfile)(HPROFILE); @@ -58,6 +59,8 @@ static BOOL (WINAPI *pSetStandardColorSpaceProfileW)(PCWSTR,DWORD,PWSTR); static BOOL (WINAPI *pUninstallColorProfileA)(PCSTR,PCSTR,BOOL); static BOOL (WINAPI *pUninstallColorProfileW)(PCWSTR,PCWSTR,BOOL); +static BOOL (WINAPI *pEnumDisplayDevicesA)(LPCSTR,DWORD,PDISPLAY_DEVICE,DWORD); + #define GETFUNCPTR(func) p##func = (void *)GetProcAddress( hmscms, #func ); \ if (!p##func) return FALSE; @@ -89,6 +92,8 @@ static BOOL init_function_ptrs( void ) GETFUNCPTR( UninstallColorProfileA ) GETFUNCPTR( UninstallColorProfileW ) + pEnumDisplayDevicesA = (void *)GetProcAddress( huser32, "EnumDisplayDevicesA" ); + return TRUE; } @@ -1367,63 +1372,77 @@ static void test_AssociateColorProfileWithDeviceA(void) BOOL ret; char profile[MAX_PATH], basename[MAX_PATH]; DWORD error, size = sizeof(profile); + DISPLAY_DEVICE display; + BOOL res; + DISPLAY_DEVICE monitor; - if (testprofile) + if (testprofile && pEnumDisplayDevicesA) { - SetLastError(0xdeadbeef); - ret = pAssociateColorProfileWithDeviceA( "machine", testprofile, NULL ); - error = GetLastError(); - ok( !ret, "AssociateColorProfileWithDevice() succeeded\n" ); - ok( error == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %u\n", error ); - - SetLastError(0xdeadbeef); - ret = pAssociateColorProfileWithDeviceA( "machine", NULL, "DISPLAY" ); - error = GetLastError(); - ok( !ret, "AssociateColorProfileWithDevice() succeeded\n" ); - ok( error == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %u\n", error ); - - SetLastError(0xdeadbeef); - ret = pAssociateColorProfileWithDeviceA( "machine", testprofile, "DISPLAY" ); - error = GetLastError(); - ok( !ret, "AssociateColorProfileWithDevice() succeeded\n" ); - ok( error == ERROR_NOT_SUPPORTED, "expected ERROR_NOT_SUPPORTED, got %u\n", error ); + display.cb = sizeof( DISPLAY_DEVICE ); + res = pEnumDisplayDevicesA( NULL, 0, &display, 0 ); + ok( res, "Can't get display info\n" ); - ret = pInstallColorProfileA( NULL, testprofile ); - ok( ret, "InstallColorProfileA() failed (%u)\n", GetLastError() ); - - ret = pGetColorDirectoryA( NULL, profile, &size ); - ok( ret, "GetColorDirectoryA() failed (%d)\n", GetLastError() ); - - MSCMS_basenameA( testprofile, basename ); - lstrcatA( profile, "\\" ); - lstrcatA( profile, basename ); - - ret = pAssociateColorProfileWithDeviceA( NULL, profile, "DISPLAY" ); - ok( ret, "AssociateColorProfileWithDevice() failed (%u)\n", GetLastError() ); - - SetLastError(0xdeadbeef); - ret = pDisassociateColorProfileFromDeviceA( "machine", profile, NULL ); - error = GetLastError(); - ok( !ret, "DisassociateColorProfileFromDeviceA() succeeded\n" ); - ok( error == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %u\n", error ); - - SetLastError(0xdeadbeef); - ret = pDisassociateColorProfileFromDeviceA( "machine", NULL, "DISPLAY" ); - error = GetLastError(); - ok( !ret, "DisassociateColorProfileFromDeviceA() succeeded\n" ); - ok( error == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %u\n", error ); - - SetLastError(0xdeadbeef); - ret = pDisassociateColorProfileFromDeviceA( "machine", profile, "DISPLAY" ); - error = GetLastError(); - ok( !ret, "DisassociateColorProfileFromDeviceA() succeeded\n" ); - ok( error == ERROR_NOT_SUPPORTED, "expected ERROR_NOT_SUPPORTED, got %u\n", error ); - - ret = pDisassociateColorProfileFromDeviceA( NULL, profile, "DISPLAY" ); - ok( ret, "DisassociateColorProfileFromDeviceA() failed (%u)\n", GetLastError() ); - - ret = pUninstallColorProfileA( NULL, profile, TRUE ); - ok( ret, "UninstallColorProfileA() failed (%d)\n", GetLastError() ); + monitor.cb = sizeof( DISPLAY_DEVICE ); + res = pEnumDisplayDevicesA( display.DeviceName, 0, &monitor, 0 ); + if (res) + { + SetLastError(0xdeadbeef); + ret = pAssociateColorProfileWithDeviceA( "machine", testprofile, NULL ); + error = GetLastError(); + ok( !ret, "AssociateColorProfileWithDevice() succeeded\n" ); + ok( error == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %u\n", error ); + + SetLastError(0xdeadbeef); + ret = pAssociateColorProfileWithDeviceA( "machine", NULL, monitor.DeviceID ); + error = GetLastError(); + ok( !ret, "AssociateColorProfileWithDevice() succeeded\n" ); + ok( error == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %u\n", error ); + + SetLastError(0xdeadbeef); + ret = pAssociateColorProfileWithDeviceA( "machine", testprofile, monitor.DeviceID ); + error = GetLastError(); + ok( !ret, "AssociateColorProfileWithDevice() succeeded\n" ); + ok( error == ERROR_NOT_SUPPORTED, "expected ERROR_NOT_SUPPORTED, got %u\n", error ); + + ret = pInstallColorProfileA( NULL, testprofile ); + ok( ret, "InstallColorProfileA() failed (%u)\n", GetLastError() ); + + ret = pGetColorDirectoryA( NULL, profile, &size ); + ok( ret, "GetColorDirectoryA() failed (%d)\n", GetLastError() ); + + MSCMS_basenameA( testprofile, basename ); + lstrcatA( profile, "\\" ); + lstrcatA( profile, basename ); + + ret = pAssociateColorProfileWithDeviceA( NULL, profile, monitor.DeviceID ); + ok( ret, "AssociateColorProfileWithDevice() failed (%u)\n", GetLastError() ); + + SetLastError(0xdeadbeef); + ret = pDisassociateColorProfileFromDeviceA( "machine", profile, NULL ); + error = GetLastError(); + ok( !ret, "DisassociateColorProfileFromDeviceA() succeeded\n" ); + ok( error == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %u\n", error ); + + SetLastError(0xdeadbeef); + ret = pDisassociateColorProfileFromDeviceA( "machine", NULL, monitor.DeviceID ); + error = GetLastError(); + ok( !ret, "DisassociateColorProfileFromDeviceA() succeeded\n" ); + ok( error == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %u\n", error ); + + SetLastError(0xdeadbeef); + ret = pDisassociateColorProfileFromDeviceA( "machine", profile, monitor.DeviceID ); + error = GetLastError(); + ok( !ret, "DisassociateColorProfileFromDeviceA() succeeded\n" ); + ok( error == ERROR_NOT_SUPPORTED, "expected ERROR_NOT_SUPPORTED, got %u\n", error ); + + ret = pDisassociateColorProfileFromDeviceA( NULL, profile, monitor.DeviceID ); + ok( ret, "DisassociateColorProfileFromDeviceA() failed (%u)\n", GetLastError() ); + + ret = pUninstallColorProfileA( NULL, profile, TRUE ); + ok( ret, "UninstallColorProfileA() failed (%d)\n", GetLastError() ); + } + else + skip("Unable to obtain monitor name\n"); } } @@ -1441,8 +1460,16 @@ START_TEST(profile) hmscms = LoadLibraryA( "mscms.dll" ); if (!hmscms) return; + huser32 = LoadLibraryA( "user32.dll" ); + if (!huser32) + { + FreeLibrary( hmscms ); + return; + } + if (!init_function_ptrs()) { + FreeLibrary( huser32 ); FreeLibrary( hmscms ); return; } @@ -1537,5 +1564,6 @@ START_TEST(profile) if (testprofile) DeleteFileA( testprofile ); + FreeLibrary( huser32 ); FreeLibrary( hmscms ); }

1 0

Ge van Geldorp : wininet/tests: INTERNET_STATUS_CLOSING_CONNECTION and ... _CONNECTION_CLOSED callbacks can appear after ..._REQUEST_COMPLETE.
by Alexandre Julliard Jan. 5, 2009

Jan. 5, 2009

Module: wine Branch: master Commit: e7e4894f2a33a2e90de03fbe9dcf6f99a4ab43d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e7e4894f2a33a2e90de03fbe9… Author: Ge van Geldorp <ge(a)gse.nl> Date: Mon Jan 5 01:00:09 2009 +0100 wininet/tests: INTERNET_STATUS_CLOSING_CONNECTION and ..._CONNECTION_CLOSED callbacks can appear after ..._REQUEST_COMPLETE. --- dlls/wininet/tests/http.c | 9 ++------- 1 files changed, 2 insertions(+), 7 deletions(-) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index de81651..89995bf 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -363,8 +363,6 @@ static void InternetReadFile_test(int flags) CHECK_NOTIFIED2(INTERNET_STATUS_REQUEST_SENT, 2); CHECK_NOTIFIED2(INTERNET_STATUS_RECEIVING_RESPONSE, 2); CHECK_NOTIFIED2(INTERNET_STATUS_RESPONSE_RECEIVED, 2); - todo_wine CHECK_NOTIFIED2(INTERNET_STATUS_CLOSING_CONNECTION, 2); - todo_wine CHECK_NOTIFIED2(INTERNET_STATUS_CONNECTION_CLOSED, 2); CHECK_NOTIFIED(INTERNET_STATUS_REDIRECT); if (flags & INTERNET_FLAG_ASYNC) CHECK_NOTIFIED(INTERNET_STATUS_REQUEST_COMPLETE); @@ -411,8 +409,6 @@ static void InternetReadFile_test(int flags) length = 100; trace("Entering Query loop\n"); - SET_EXPECT(INTERNET_STATUS_CLOSING_CONNECTION); - SET_EXPECT(INTERNET_STATUS_CONNECTION_CLOSED); while (TRUE) { if (flags & INTERNET_FLAG_ASYNC) @@ -450,9 +446,8 @@ static void InternetReadFile_test(int flags) if (length == 0) break; } - /* WinXP does not send, but Win98 does */ - CLEAR_NOTIFIED(INTERNET_STATUS_CLOSING_CONNECTION); - CLEAR_NOTIFIED(INTERNET_STATUS_CONNECTION_CLOSED); + todo_wine CHECK_NOTIFIED2(INTERNET_STATUS_CLOSING_CONNECTION, 2); + todo_wine CHECK_NOTIFIED2(INTERNET_STATUS_CONNECTION_CLOSED, 2); abort: trace("aborting\n"); SET_EXPECT2(INTERNET_STATUS_HANDLE_CLOSING, (hor != 0x0) + (hic != 0x0));

1 0

Hans Leidekker : setupapi: Add stubs for pSetupInstallCatalog and pSetupVerifyCatalogFile.
by Alexandre Julliard Jan. 5, 2009

Jan. 5, 2009

Module: wine Branch: master Commit: b5113654237df651f7c90d24973de5cfbd757a07 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b5113654237df651f7c90d249… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Jan 5 16:00:42 2009 +0100 setupapi: Add stubs for pSetupInstallCatalog and pSetupVerifyCatalogFile. --- dlls/setupapi/misc.c | 9 +++++++++ dlls/setupapi/setupapi.spec | 2 ++ 2 files changed, 11 insertions(+), 0 deletions(-) diff --git a/dlls/setupapi/misc.c b/dlls/setupapi/misc.c index 44a0349..6c0f68a 100644 --- a/dlls/setupapi/misc.c +++ b/dlls/setupapi/misc.c @@ -1122,6 +1122,15 @@ DWORD WINAPI InstallCatalog( LPCSTR catalog, LPCSTR basename, LPSTR fullname ) return 0; } +/*********************************************************************** + * pSetupInstallCatalog (SETUPAPI.@) + */ +DWORD WINAPI pSetupInstallCatalog( LPCWSTR catalog, LPCWSTR basename, LPWSTR fullname ) +{ + FIXME("%s, %s, %p\n", debugstr_w(catalog), debugstr_w(basename), fullname); + return 0; +} + static UINT detect_compression_type( LPCWSTR file ) { DWORD size; diff --git a/dlls/setupapi/setupapi.spec b/dlls/setupapi/setupapi.spec index cd3c856..2996803 100644 --- a/dlls/setupapi/setupapi.spec +++ b/dlls/setupapi/setupapi.spec @@ -554,6 +554,7 @@ @ stub pSetupGetVersionDatum @ stub pSetupGuidFromString @ stub pSetupIsGuidNull +@ stdcall pSetupInstallCatalog(wstr wstr ptr) @ stdcall pSetupIsUserAdmin() IsUserAdmin @ stub pSetupMakeSurePathExists @ stdcall pSetupSetGlobalFlags(long) @@ -571,4 +572,5 @@ @ stdcall pSetupStringTableLookUpString(ptr wstr long) StringTableLookUpString @ stdcall pSetupStringTableLookUpStringEx(ptr wstr long ptr ptr) StringTableLookUpStringEx @ stdcall pSetupStringTableSetExtraData(ptr long ptr long) StringTableSetExtraData +@ stub pSetupVerifyCatalogFile @ stub pSetupVerifyQueuedCatalogs

1 0

Hans Leidekker : winhttp: Set last error for invalid URLs passed to WinHttpCrackUrl.
by Alexandre Julliard Jan. 5, 2009

Jan. 5, 2009

Module: wine Branch: master Commit: c5fa3ec216d8040198d755de5282111ccdb3a5f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c5fa3ec216d8040198d755de5… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Jan 5 16:00:02 2009 +0100 winhttp: Set last error for invalid URLs passed to WinHttpCrackUrl. --- dlls/winhttp/tests/url.c | 13 +++++++++++++ dlls/winhttp/url.c | 16 +++++++++++----- 2 files changed, 24 insertions(+), 5 deletions(-) diff --git a/dlls/winhttp/tests/url.c b/dlls/winhttp/tests/url.c index 2765a67..14b20c1 100644 --- a/dlls/winhttp/tests/url.c +++ b/dlls/winhttp/tests/url.c @@ -557,6 +557,19 @@ static void WinHttpCrackUrl_test( void ) ok( ret, "WinHttpCrackUrl failed\n" ); ok( uc.nPort == 443, "unexpected port: %u\n", uc.nPort ); + reset_url_components( &uc ); + SetLastError( 0xdeadbeef ); + ret = WinHttpCrackUrl( empty, 0, 0, &uc ); + error = GetLastError(); + ok( !ret, "WinHttpCrackUrl succeeded\n" ); + ok( error == ERROR_WINHTTP_UNRECOGNIZED_SCHEME, "got %u, expected ERROR_WINHTTP_UNRECOGNIZED_SCHEME\n", error ); + + reset_url_components( &uc ); + SetLastError( 0xdeadbeef ); + ret = WinHttpCrackUrl( http, 0, 0, &uc ); + error = GetLastError(); + ok( !ret, "WinHttpCrackUrl succeeded\n" ); + ok( error == ERROR_WINHTTP_UNRECOGNIZED_SCHEME, "got %u, expected ERROR_WINHTTP_UNRECOGNIZED_SCHEME\n", error ); } START_TEST(url) diff --git a/dlls/winhttp/url.c b/dlls/winhttp/url.c index 9ed04cf..711987a 100644 --- a/dlls/winhttp/url.c +++ b/dlls/winhttp/url.c @@ -82,7 +82,7 @@ BOOL WINAPI WinHttpCrackUrl( LPCWSTR url, DWORD len, DWORD flags, LPURL_COMPONEN if (flags & ICU_ESCAPE) FIXME("flag ICU_ESCAPE not supported\n"); - if (!url || !url[0] || !uc || uc->dwStructSize != sizeof(URL_COMPONENTS)) + if (!url || !uc || uc->dwStructSize != sizeof(URL_COMPONENTS)) { set_last_error( ERROR_INVALID_PARAMETER ); return FALSE; @@ -114,12 +114,18 @@ BOOL WINAPI WinHttpCrackUrl( LPCWSTR url, DWORD len, DWORD flags, LPURL_COMPONEN } HeapFree( GetProcessHeap(), 0, url_tmp ); } - if (!(p = strchrW( url, ':' ))) return FALSE; - + if (!(p = strchrW( url, ':' ))) + { + set_last_error( ERROR_WINHTTP_UNRECOGNIZED_SCHEME ); + return FALSE; + } if (p - url == 4 && !strncmpiW( url, scheme_http, 4 )) uc->nScheme = INTERNET_SCHEME_HTTP; else if (p - url == 5 && !strncmpiW( url, scheme_https, 5 )) uc->nScheme = INTERNET_SCHEME_HTTPS; - else goto exit; - + else + { + set_last_error( ERROR_WINHTTP_UNRECOGNIZED_SCHEME ); + goto exit; + } if (!(set_component( &uc->lpszScheme, &uc->dwSchemeLength, (WCHAR *)url, p - url, flags ))) goto exit; p++; /* skip ':' */

1 0