July 2011 - Wine-commits - list.winehq.org

Mariusz Pluciński : shell32: Fix FOLDERID_Document definition.
by Alexandre Julliard 19 Jul '11

19 Jul '11

Module: wine Branch: master Commit: ea990a3f43d8591da12a8c0daf44ae486a6d98df URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea990a3f43d8591da12a8c0da… Author: Mariusz Pluciński <vshader(a)gmail.com> Date: Tue Jul 19 16:19:39 2011 +0200 shell32: Fix FOLDERID_Document definition. --- dlls/shell32/shellpath.c | 4 ++-- dlls/shell32/tests/shellpath.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/shell32/shellpath.c b/dlls/shell32/shellpath.c index 13d50e0..4bd3de2 100644 --- a/dlls/shell32/shellpath.c +++ b/dlls/shell32/shellpath.c @@ -872,7 +872,7 @@ static const CSIDL_DATA CSIDL_Data[] = NULL }, { /* 0x05 - CSIDL_PERSONAL */ - &GUID_NULL, + &FOLDERID_Documents, CSIDL_Type_User, PersonalW, MAKEINTRESOURCEW(IDS_PERSONAL) @@ -1256,7 +1256,7 @@ static const CSIDL_DATA CSIDL_Data[] = NULL }, { /* 0x45 */ - &FOLDERID_Documents, + &GUID_NULL, CSIDL_Type_User, NULL, MAKEINTRESOURCEW(IDS_DOCUMENTS) diff --git a/dlls/shell32/tests/shellpath.c b/dlls/shell32/tests/shellpath.c index c722596..4ea280b 100644 --- a/dlls/shell32/tests/shellpath.c +++ b/dlls/shell32/tests/shellpath.c @@ -920,7 +920,7 @@ static const struct knownFolderDef known_folders[] = { KNOWN_FOLDER(FOLDERID_Cookies, CSIDL_COOKIES, "Cookies"), KNOWN_FOLDER(FOLDERID_Desktop, CSIDL_DESKTOP, "Desktop"), KNOWN_FOLDER(FOLDERID_DeviceMetadataStore, NO_CSIDL, "DeviceMetadataStore"), - KNOWN_FOLDER(FOLDERID_Documents, CSIDL_MYDOCUMENTS | CSIDL_TODO_WINE, "Personal"), + KNOWN_FOLDER(FOLDERID_Documents, CSIDL_MYDOCUMENTS, "Personal"), KNOWN_FOLDER(FOLDERID_DocumentsLibrary, NO_CSIDL, "DocumentsLibrary"), KNOWN_FOLDER(FOLDERID_Downloads, NO_CSIDL, "Downloads"), KNOWN_FOLDER(FOLDERID_Favorites, CSIDL_FAVORITES, "Favorites"),

1 0

Grazvydas Ignotas : ntdll/tests: Test NtQueryDirectoryFile with RestartScan set to FALSE.
by Alexandre Julliard 19 Jul '11

19 Jul '11

Module: wine Branch: master Commit: 5ae558bac71ccd9dca3c0b86a825493b834aae3d URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ae558bac71ccd9dca3c0b86a… Author: Grazvydas Ignotas <notasas(a)gmail.com> Date: Sun Jul 17 02:48:15 2011 +0300 ntdll/tests: Test NtQueryDirectoryFile with RestartScan set to FALSE. --- dlls/ntdll/tests/directory.c | 26 ++++++++++++++++++-------- 1 files changed, 18 insertions(+), 8 deletions(-) diff --git a/dlls/ntdll/tests/directory.c b/dlls/ntdll/tests/directory.c index be8dd13..56840b5 100644 --- a/dlls/ntdll/tests/directory.c +++ b/dlls/ntdll/tests/directory.c @@ -63,6 +63,8 @@ static struct testfile_s { { 1, FILE_ATTRIBUTE_HIDDEN, "h.tmp", NULL, "hidden" }, { 1, FILE_ATTRIBUTE_SYSTEM, "s.tmp", NULL, "system" }, { 0, FILE_ATTRIBUTE_DIRECTORY, "d.tmp", NULL, "directory" }, + { 0, FILE_ATTRIBUTE_DIRECTORY, ".", NULL, ". directory" }, + { 0, FILE_ATTRIBUTE_DIRECTORY, "..", NULL, ".. directory" }, { 0, 0, NULL } }; static const int max_test_dir_size = 20; /* size of above plus some for .. etc */ @@ -80,8 +82,10 @@ static void set_up_attribute_test(const char *testdirA) char buf[MAX_PATH]; pRtlMultiByteToUnicodeN(testfiles[i].nameW, sizeof(testfiles[i].nameW), NULL, testfiles[i].name, strlen(testfiles[i].name)+1); - sprintf(buf, "%s\\%s", testdirA, testfiles[i].name); testfiles[i].nfound = 0; + if (strcmp(testfiles[i].name, ".") == 0 || strcmp(testfiles[i].name, "..") == 0) + continue; + sprintf(buf, "%s\\%s", testdirA, testfiles[i].name); if (testfiles[i].attr & FILE_ATTRIBUTE_DIRECTORY) { ret = CreateDirectoryA(buf, NULL); ok(ret, "couldn't create dir '%s', error %d\n", buf, GetLastError()); @@ -104,6 +108,8 @@ static void tear_down_attribute_test(const char *testdirA) for (i=0; testfiles[i].name; i++) { int ret; char buf[MAX_PATH]; + if (strcmp(testfiles[i].name, ".") == 0 || strcmp(testfiles[i].name, "..") == 0) + continue; sprintf(buf, "%s\\%s", testdirA, testfiles[i].name); if (testfiles[i].attr & FILE_ATTRIBUTE_DIRECTORY) { ret = RemoveDirectory(buf); @@ -128,9 +134,6 @@ static void tally_test_file(FILE_BOTH_DIRECTORY_INFORMATION *dir_info) WCHAR *nameW = dir_info->FileName; int namelen = dir_info->FileNameLength / sizeof(WCHAR); - if (nameW[0] == '.') - return; - for (i=0; testfiles[i].name; i++) { int len = strlen(testfiles[i].name); if (namelen != len || memcmp(nameW, testfiles[i].nameW, len*sizeof(WCHAR))) @@ -187,7 +190,7 @@ static void test_NtQueryDirectoryFile(void) } pNtQueryDirectoryFile( dirh, NULL, NULL, NULL, &io, data, sizeof(data), - FileBothDirectoryInformation, FALSE, NULL, TRUE ); + FileBothDirectoryInformation, FALSE, NULL, FALSE ); ok (U(io).Status == STATUS_SUCCESS, "filed to query directory; status %x\n", U(io).Status); data_len = io.Information; ok (data_len >= sizeof(FILE_BOTH_DIRECTORY_INFORMATION), "not enough data in directory\n"); @@ -216,9 +219,16 @@ static void test_NtQueryDirectoryFile(void) } ok(numfiles < max_test_dir_size, "too many loops\n"); - for (i=0; testfiles[i].name; i++) - ok(testfiles[i].nfound == 1, "Wrong number %d of %s files found\n", - testfiles[i].nfound, testfiles[i].description); + for (i=0; testfiles[i].name; i++) { + if (strcmp(testfiles[i].name, ".") == 0 || strcmp(testfiles[i].name, "..") == 0) { + todo_wine + ok(testfiles[i].nfound == 1, "Wrong number %d of %s files found\n", + testfiles[i].nfound, testfiles[i].description); + } else { + ok(testfiles[i].nfound == 1, "Wrong number %d of %s files found\n", + testfiles[i].nfound, testfiles[i].description); + } + } pNtClose(dirh); done:

1 0

Frédéric Delanoy : cmd/tests: Add tests for NUL handling.
by Alexandre Julliard 19 Jul '11

19 Jul '11

Module: wine Branch: master Commit: 5d22f3aa145795af0137f580959671c046f3d37a URL: http://source.winehq.org/git/wine.git/?a=commit;h=5d22f3aa145795af0137f5809… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Jul 19 09:49:24 2011 +0200 cmd/tests: Add tests for NUL handling. --- programs/cmd/tests/test_builtins.cmd | 31 ++++++++++++++++++++++++++++++ programs/cmd/tests/test_builtins.cmd.exp | 6 +++++ 2 files changed, 37 insertions(+), 0 deletions(-) diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index 764697b..195afca 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -104,6 +104,37 @@ type foobaz echo *** del foobaz +echo ------------ Testing NUL ------------ +md foobar && cd foobar +rem NUL file (non) creation + case insensitivity +rem Note: "if exist" does not work with NUL, so to check for file existence we use a kludgy workaround +echo > bar +echo foo > NUL +dir /b /a-d +echo foo > nul +dir /b /a-d +echo foo > NuL +dir /b /a-d +del bar +rem NUL not special everywhere +call :setError 123 +echo NUL> foo +if not exist foo (echo foo should have been created) else ( + type foo + del foo +) +rem Empty file creation +copy nul foo > nul +if exist foo ( + echo foo created + del foo + type foo +) else ( + echo *** +) +cd .. +rd foobar + echo ------------ Testing if/else -------------- echo if/else should work with blocks if 0 == 0 ( diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index 07a503ec..67f25a4 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -99,6 +99,12 @@ bar *** bar *** +------------ Testing NUL ------------ +bar +bar +bar +NUL +(a)todo_wine@foo created ------------ Testing if/else -------------- if/else should work with blocks if seems to work

1 0

Michael Stefaniuc : shell32: Use FAILED instead of !SUCCEEDED.
by Alexandre Julliard 19 Jul '11

19 Jul '11

Module: wine Branch: master Commit: 5ab5042183d7461fb64ba6c4c4b8d9a2b2a4536e URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ab5042183d7461fb64ba6c4c… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jul 19 15:06:09 2011 +0200 shell32: Use FAILED instead of !SUCCEEDED. --- dlls/shell32/shellpath.c | 4 ++-- dlls/shell32/tests/brsfolder.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/shell32/shellpath.c b/dlls/shell32/shellpath.c index 4b14739..4407056 100644 --- a/dlls/shell32/shellpath.c +++ b/dlls/shell32/shellpath.c @@ -3423,10 +3423,10 @@ static HRESULT get_known_folder_path( { /* get parent's known folder path (recursive) */ hr = get_known_folder_registry_path(NULL, parentGuid, &parentRegistryPath); - if(!SUCCEEDED(hr)) return hr; + if(FAILED(hr)) return hr; hr = get_known_folder_path(parentGuid, parentRegistryPath, &parentPath); - if(!SUCCEEDED(hr)) { + if(FAILED(hr)) { HeapFree(GetProcessHeap(), 0, parentRegistryPath); return hr; } diff --git a/dlls/shell32/tests/brsfolder.c b/dlls/shell32/tests/brsfolder.c index 4dea03e..7b87967 100644 --- a/dlls/shell32/tests/brsfolder.c +++ b/dlls/shell32/tests/brsfolder.c @@ -204,7 +204,7 @@ static void test_click_make_new_folder_button(void) test_folder_pathW, MAX_PATH); hr = SHGetDesktopFolder(&test_folder_object); ok (SUCCEEDED(hr), "SHGetDesktopFolder failed with hr 0x%08x\n", hr); - if (!SUCCEEDED(hr)) { + if (FAILED(hr)) { skip("SHGetDesktopFolder failed - skipping\n"); return; } @@ -331,7 +331,7 @@ static void test_selection(void) hr = SHGetDesktopFolder(&desktop_object); ok (SUCCEEDED(hr), "SHGetDesktopFolder failed with hr 0x%08x\n", hr); - if (!SUCCEEDED(hr)) { + if (FAILED(hr)) { skip("SHGetDesktopFolder failed - skipping\n"); return; }

1 0

Alexandre Julliard : wineps: Remove unneeded GetTransform prototype.
by Alexandre Julliard 19 Jul '11

19 Jul '11

Module: wine Branch: master Commit: 49cb530ee38210fd6851e187b91eed8a6d7c4a59 URL: http://source.winehq.org/git/wine.git/?a=commit;h=49cb530ee38210fd6851e187b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 19 14:53:31 2011 +0200 wineps: Remove unneeded GetTransform prototype. --- dlls/wineps.drv/download.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/wineps.drv/download.c b/dlls/wineps.drv/download.c index c3ea79f..a09f97a 100644 --- a/dlls/wineps.drv/download.c +++ b/dlls/wineps.drv/download.c @@ -34,8 +34,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(psdrv); -BOOL WINAPI GetTransform( HDC hdc, DWORD which, XFORM *xform ); - #define MS_MAKE_TAG( _x1, _x2, _x3, _x4 ) \ ( ( (DWORD)_x4 << 24 ) | \ ( (DWORD)_x3 << 16 ) | \

1 0

Michael Stefaniuc : ddrawex/tests: Use FAILED instead of !SUCCEEDED.
by Alexandre Julliard 19 Jul '11

19 Jul '11

Module: wine Branch: master Commit: 04f57b9b0c8b29290d7ef2d136884f38c265123f URL: http://source.winehq.org/git/wine.git/?a=commit;h=04f57b9b0c8b29290d7ef2d13… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jul 19 15:07:16 2011 +0200 ddrawex/tests: Use FAILED instead of !SUCCEEDED. --- dlls/ddrawex/tests/surface.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ddrawex/tests/surface.c b/dlls/ddrawex/tests/surface.c index 4dcae02..099c6d2 100644 --- a/dlls/ddrawex/tests/surface.c +++ b/dlls/ddrawex/tests/surface.c @@ -422,13 +422,13 @@ START_TEST(surface) hr = pDllGetClassObject(&CLSID_DirectDrawFactory, &IID_IClassFactory, (void **) &classfactory); ok(hr == S_OK, "Failed to create a IClassFactory\n"); - if (!SUCCEEDED(hr)) { + if (FAILED(hr)) { skip("Failed to get DirectDrawFactory\n"); return; } hr = IClassFactory_CreateInstance(classfactory, NULL, &IID_IDirectDrawFactory, (void **) &factory); ok(hr == S_OK, "Failed to create a IDirectDrawFactory\n"); - if (!SUCCEEDED(hr)) { + if (FAILED(hr)) { IClassFactory_Release(classfactory); skip("Failed to get a DirectDrawFactory\n"); return;

1 0

Michael Stefaniuc : explorer: Use FAILED instead of !SUCCEEDED.
by Alexandre Julliard 19 Jul '11

19 Jul '11

Module: wine Branch: master Commit: 8ec442f510d223909d8719ae903d738aa0a0d439 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ec442f510d223909d8719ae9… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jul 19 15:09:12 2011 +0200 explorer: Use FAILED instead of !SUCCEEDED. --- programs/explorer/explorer.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/explorer/explorer.c b/programs/explorer/explorer.c index 5c9cad2..1b3fa90 100644 --- a/programs/explorer/explorer.c +++ b/programs/explorer/explorer.c @@ -326,7 +326,7 @@ static void make_explorer_window(IShellFolder* startFolder) } hres = CoCreateInstance(&CLSID_ExplorerBrowser,NULL,CLSCTX_INPROC_SERVER, &IID_IExplorerBrowser,(LPVOID*)&info->browser); - if(!SUCCEEDED(hres)) + if(FAILED(hres)) { WINE_ERR("Could not obtain an instance of IExplorerBrowser\n"); HeapFree(GetProcessHeap(),0,info); @@ -739,7 +739,7 @@ int WINAPI wWinMain(HINSTANCE hinstance, explorer_hInstance = hinstance; parse_command_line(cmdline,&parameters); hres = OleInitialize(NULL); - if(!SUCCEEDED(hres)) + if(FAILED(hres)) { WINE_ERR("Could not initialize COM\n"); ExitProcess(EXIT_FAILURE);

1 0

Michael Stefaniuc : comctl32/tests: Don't cast NULL to an int.
by Alexandre Julliard 19 Jul '11

19 Jul '11

Module: wine Branch: master Commit: 11e780ea07f370957cd1f5595a2d39842701948f URL: http://source.winehq.org/git/wine.git/?a=commit;h=11e780ea07f370957cd1f5595… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jul 19 15:25:35 2011 +0200 comctl32/tests: Don't cast NULL to an int. --- dlls/comctl32/tests/propsheet.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/tests/propsheet.c b/dlls/comctl32/tests/propsheet.c index c6e3e9f..f6b4c7d 100644 --- a/dlls/comctl32/tests/propsheet.c +++ b/dlls/comctl32/tests/propsheet.c @@ -650,7 +650,7 @@ static LRESULT CALLBACK sheet_callback_messages_proc (HWND hwnd, UINT msg, WPARA static int CALLBACK sheet_callback_messages(HWND hwnd, UINT msg, LPARAM lParam) { - save_message(hwnd, msg, (WPARAM)NULL, lParam, RECEIVER_SHEET_CALLBACK); + save_message(hwnd, msg, 0, lParam, RECEIVER_SHEET_CALLBACK); switch (msg) {

1 0

Michael Stefaniuc : vbscript: Don't bother with a FIXME in DllCanUnloadNow( ).
by Alexandre Julliard 19 Jul '11

19 Jul '11

Module: wine Branch: master Commit: d15b567ca54a468e56f3473a50c16e617a6c6c3e URL: http://source.winehq.org/git/wine.git/?a=commit;h=d15b567ca54a468e56f3473a5… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jul 19 15:31:15 2011 +0200 vbscript: Don't bother with a FIXME in DllCanUnloadNow(). --- dlls/vbscript/vbscript_main.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/vbscript/vbscript_main.c b/dlls/vbscript/vbscript_main.c index 53f2841..3389bf4 100644 --- a/dlls/vbscript/vbscript_main.c +++ b/dlls/vbscript/vbscript_main.c @@ -125,7 +125,6 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) */ HRESULT WINAPI DllCanUnloadNow(void) { - FIXME("()\n"); return S_FALSE; }

1 0

Jacek Caban : mshtml: Implement nsIURI::SetUserPass on top of IUri.
by Alexandre Julliard 19 Jul '11

19 Jul '11

Module: wine Branch: master Commit: 0289530f073f0ca9150d4c6b2d152903abf0dbb0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0289530f073f0ca9150d4c6b2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jul 19 16:01:44 2011 +0200 mshtml: Implement nsIURI::SetUserPass on top of IUri. --- dlls/mshtml/nsio.c | 62 +++++++++++++++++++++++++++++++++++++++++++++------ 1 files changed, 54 insertions(+), 8 deletions(-) diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index 875abe9..e9f7092 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -1747,28 +1747,74 @@ static nsresult NSAPI nsURI_SetScheme(nsIURL *iface, const nsACString *aScheme) static nsresult NSAPI nsURI_GetUserPass(nsIURL *iface, nsACString *aUserPass) { nsWineURI *This = impl_from_nsIURL(iface); + BSTR user, pass; + HRESULT hres; TRACE("(%p)->(%p)\n", This, aUserPass); - if(This->nsuri) - return nsIURI_GetUserPass(This->nsuri, aUserPass); + if(!ensure_uri(This)) + return NS_ERROR_UNEXPECTED; + + hres = IUri_GetUserName(This->uri, &user); + if(FAILED(hres)) + return NS_ERROR_FAILURE; + + hres = IUri_GetPassword(This->uri, &pass); + if(FAILED(hres)) { + SysFreeString(user); + return NS_ERROR_FAILURE; + } + + if(*user || *pass) { + FIXME("Construct user:pass string\n"); + }else { + nsACString_SetData(aUserPass, ""); + } - return get_uri_string(This, Uri_PROPERTY_USER_INFO, aUserPass); + SysFreeString(user); + SysFreeString(pass); + return NS_OK; } static nsresult NSAPI nsURI_SetUserPass(nsIURL *iface, const nsACString *aUserPass) { nsWineURI *This = impl_from_nsIURL(iface); + WCHAR *user = NULL, *pass = NULL, *buf = NULL; + const char *user_pass; + HRESULT hres; TRACE("(%p)->(%s)\n", This, debugstr_nsacstr(aUserPass)); - if(This->nsuri) { - invalidate_uri(This); - return nsIURI_SetUserPass(This->nsuri, aUserPass); + if(!ensure_uri_builder(This)) + return NS_ERROR_UNEXPECTED; + + nsACString_GetData(aUserPass, &user_pass); + if(*user_pass) { + WCHAR *ptr; + + buf = heap_strdupAtoW(user_pass); + if(!buf) + return NS_ERROR_OUT_OF_MEMORY; + + ptr = strchrW(buf, ':'); + if(!ptr) { + user = buf; + }else if(ptr != buf) { + *ptr++ = 0; + user = buf; + if(*ptr) + pass = ptr; + }else { + pass = buf+1; + } } - FIXME("default action not implemented\n"); - return NS_ERROR_NOT_IMPLEMENTED; + hres = IUriBuilder_SetUserName(This->uri_builder, user); + if(SUCCEEDED(hres)) + hres = IUriBuilder_SetPassword(This->uri_builder, pass); + + heap_free(buf); + return SUCCEEDED(hres) ? NS_OK : NS_ERROR_FAILURE; } static nsresult NSAPI nsURI_GetUsername(nsIURL *iface, nsACString *aUsername)

1 0