January 2009 - Wine-commits

Alasdair Sinclair : msi/tests: Fix missing void in empty parameter list.
by Alexandre Julliard 29 Jan '09

29 Jan '09

Module: wine Branch: master Commit: 0bd6da81c51db52d0e9b23fecbe50403a939b507 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0bd6da81c51db52d0e9b23fec… Author: Alasdair Sinclair <alasdairs(a)dsl.pipex.com> Date: Wed Jan 28 21:34:35 2009 +0000 msi/tests: Fix missing void in empty parameter list. --- dlls/msi/tests/db.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msi/tests/db.c b/dlls/msi/tests/db.c index d04823e..cb58de0 100644 --- a/dlls/msi/tests/db.c +++ b/dlls/msi/tests/db.c @@ -5153,7 +5153,7 @@ static void test_viewmodify_delete_temporary(void) DeleteFileA(msifile); } -static void test_deleterow() +static void test_deleterow(void) { MSIHANDLE hdb, hview, hrec; const char *query;

1 0

Paul Vriens : kernel32/tests: Fix some test failures on Win9x and WinME ( GetPrivateProfileString).
by Alexandre Julliard 29 Jan '09

29 Jan '09

Module: wine Branch: master Commit: 407f0d9f5609903d5929a78bbd8368dd26ea5e19 URL: http://source.winehq.org/git/wine.git/?a=commit;h=407f0d9f5609903d5929a78bb… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Wed Jan 28 21:54:41 2009 +0100 kernel32/tests: Fix some test failures on Win9x and WinME (GetPrivateProfileString). --- dlls/kernel32/tests/profile.c | 16 ++++++++++++---- 1 files changed, 12 insertions(+), 4 deletions(-) diff --git a/dlls/kernel32/tests/profile.c b/dlls/kernel32/tests/profile.c index 303b2d2..154d6cf 100644 --- a/dlls/kernel32/tests/profile.c +++ b/dlls/kernel32/tests/profile.c @@ -509,7 +509,9 @@ static void test_GetPrivateProfileString(const char *content, const char *descri ret = GetPrivateProfileStringA(emptystr, "name1", NULL, buf, MAX_PATH, filename); ok(ret == 0, "Expected 0, got %d\n", ret); - ok(!lstrcmpA(buf, ""), "Expected \"\", got \"%s\"\n", buf); + ok(!lstrcmpA(buf, "") || + broken(!lstrcmpA(buf, "kumquat")), /* Win9x, WinME */ + "Expected \"\", got \"%s\"\n", buf); ok(emptystr_ok(emptystr), "AppName modified\n"); /* lpAppName is empty, lpDefault is empty */ @@ -576,7 +578,9 @@ static void test_GetPrivateProfileString(const char *content, const char *descri ret = GetPrivateProfileStringA("section1", emptystr, NULL, buf, MAX_PATH, filename); ok(ret == 0, "Expected 0, got %d\n", ret); - ok(!lstrcmpA(buf, ""), "Expected \"\", got \"%s\"\n", buf); + ok(!lstrcmpA(buf, "") || + broken(!lstrcmpA(buf, "kumquat")), /* Win9x, WinME */ + "Expected \"\", got \"%s\"\n", buf); ok(emptystr_ok(emptystr), "KeyName modified\n"); /* lpKeyName is empty, lpDefault is empty */ @@ -608,8 +612,12 @@ static void test_GetPrivateProfileString(const char *content, const char *descri lstrcpyA(buf, "kumquat"); ret = GetPrivateProfileStringA("section1", "name1", "default", buf, MAX_PATH, NULL); - ok(ret == 7, "Expected 7, got %d\n", ret); - ok(!lstrcmpA(buf, "default"), "Expected \"default\", got \"%s\"\n", buf); + ok(ret == 7 || + broken(ret == 0), /* Win9x, WinME */ + "Expected 7, got %d\n", ret); + ok(!lstrcmpA(buf, "default") || + broken(!lstrcmpA(buf, "kumquat")), /* Win9x, WinME */ + "Expected \"default\", got \"%s\"\n", buf); /* lpFileName is empty */ lstrcpyA(buf, "kumquat");

1 0

Alasdair Sinclair : mshtml/tests: Fix missing void in empty parameter list.
by Alexandre Julliard 29 Jan '09

29 Jan '09

Module: wine Branch: master Commit: 9de1f80999b1e5b17099847dfa15c598e12a68b4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9de1f80999b1e5b17099847df… Author: Alasdair Sinclair <alasdairs(a)dsl.pipex.com> Date: Wed Jan 28 21:34:18 2009 +0000 mshtml/tests: Fix missing void in empty parameter list. --- dlls/mshtml/tests/dom.c | 2 +- dlls/mshtml/tests/script.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 88eddc5..3694680 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -4162,7 +4162,7 @@ static void gecko_installer_workaround(BOOL disable) /* Check if Internet Explorer is configured to run in "Enhanced Security Configuration" (aka hardened mode) */ /* Note: this code is duplicated in dlls/mshtml/tests/dom.c, dlls/mshtml/tests/script.c and dlls/urlmon/tests/misc.c */ -static BOOL is_ie_hardened() +static BOOL is_ie_hardened(void) { HKEY zone_map; DWORD ie_harden, type, size; diff --git a/dlls/mshtml/tests/script.c b/dlls/mshtml/tests/script.c index 30be52c..6178cdf 100644 --- a/dlls/mshtml/tests/script.c +++ b/dlls/mshtml/tests/script.c @@ -1139,7 +1139,7 @@ static void gecko_installer_workaround(BOOL disable) /* Check if Internet Explorer is configured to run in "Enhanced Security Configuration" (aka hardened mode) */ /* Note: this code is duplicated in dlls/mshtml/tests/dom.c, dlls/mshtml/tests/script.c and dlls/urlmon/tests/misc.c */ -static BOOL is_ie_hardened() +static BOOL is_ie_hardened(void) { HKEY zone_map; DWORD ie_harden, type, size;

1 0

Paul Vriens : kernel32/tests: Fix some test failures on several platforms.
by Alexandre Julliard 29 Jan '09

29 Jan '09

Module: wine Branch: master Commit: 7099cdebd51d1d6a52d32b3db1a8cace4f067b36 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7099cdebd51d1d6a52d32b3db… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Wed Jan 28 20:51:56 2009 +0100 kernel32/tests: Fix some test failures on several platforms. --- dlls/kernel32/tests/profile.c | 17 ++++++++++++----- 1 files changed, 12 insertions(+), 5 deletions(-) diff --git a/dlls/kernel32/tests/profile.c b/dlls/kernel32/tests/profile.c index 59f9c2b..fba8c5d 100644 --- a/dlls/kernel32/tests/profile.c +++ b/dlls/kernel32/tests/profile.c @@ -223,10 +223,15 @@ static void test_profile_sections_names(void) /* Test with exactly fitting buffer */ memset(buf, 0xc, sizeof(buf)); ret = GetPrivateProfileSectionNamesA( buf, 28, testfile3 ); - ok( ret == 26, "expected return size 26, got %d\n", ret ); + ok( ret == 26 || + broken(ret == 28), /* Win9x, WinME */ + "expected return size 26, got %d\n", ret ); todo_wine - ok( buf[ret+1] == 0 && buf[ret] == 0, "returned buffer not terminated with double-null\n" ); - + ok( (buf[ret+1] == 0 && buf[ret] == 0) || /* W2K3 and higher */ + broken(buf[ret+1] == 0xc && buf[ret] == 0) || /* NT4, W2K, WinXP */ + broken(buf[ret-1] == 0 && buf[ret-2] == 0), /* Win9x, WinME */ + "returned buffer not terminated with double-null\n" ); + /* Test with a buffer too small */ memset(buf, 0xc, sizeof(buf)); ret = GetPrivateProfileSectionNamesA( buf, 27, testfile3 ); @@ -258,8 +263,10 @@ static void test_profile_sections_names(void) memset(bufW, 0xcc, sizeof(bufW)); ret = GetPrivateProfileSectionNamesW( bufW, 28, testfile3W ); ok( ret == 26, "expected return size 26, got %d\n", ret ); - ok( bufW[ret+1] == 0 && bufW[ret] == 0, "returned buffer not terminated with double-null\n" ); - + ok( (bufW[ret+1] == 0 && bufW[ret] == 0) || /* W2K3 and higher */ + broken(bufW[ret+1] == 0xcccc && bufW[ret] == 0), /* NT4, W2K, WinXP */ + "returned buffer not terminated with double-null\n" ); + /* Test with a buffer too small */ memset(bufW, 0xcc, sizeof(bufW)); ret = GetPrivateProfileSectionNamesW( bufW, 27, testfile3W );

1 0

Paul Vriens : kernel32/tests: Fix some test failures on Win9x and WinME ( GetPrivateProfileSectionNames).
by Alexandre Julliard 29 Jan '09

29 Jan '09

Module: wine Branch: master Commit: 48f035bd4c2dbf2a53760b9f51795b1a2133e669 URL: http://source.winehq.org/git/wine.git/?a=commit;h=48f035bd4c2dbf2a53760b9f5… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Wed Jan 28 21:17:08 2009 +0100 kernel32/tests: Fix some test failures on Win9x and WinME (GetPrivateProfileSectionNames). --- dlls/kernel32/tests/profile.c | 22 ++++++++++++++++------ 1 files changed, 16 insertions(+), 6 deletions(-) diff --git a/dlls/kernel32/tests/profile.c b/dlls/kernel32/tests/profile.c index fba8c5d..303b2d2 100644 --- a/dlls/kernel32/tests/profile.c +++ b/dlls/kernel32/tests/profile.c @@ -217,9 +217,13 @@ static void test_profile_sections_names(void) /* Test with sufficiently large buffer */ memset(buf, 0xc, sizeof(buf)); ret = GetPrivateProfileSectionNamesA( buf, 29, testfile3 ); - ok( ret == 27, "expected return size 27, got %d\n", ret ); - ok( buf[ret-1] == 0 && buf[ret] == 0, "returned buffer not terminated with double-null\n" ); - + ok( ret == 27 || + broken(ret == 28), /* Win9x, WinME */ + "expected return size 27, got %d\n", ret ); + ok( (buf[ret-1] == 0 && buf[ret] == 0) || + broken(buf[ret-1] == 0 && buf[ret-2] == 0), /* Win9x, WinME */ + "returned buffer not terminated with double-null\n" ); + /* Test with exactly fitting buffer */ memset(buf, 0xc, sizeof(buf)); ret = GetPrivateProfileSectionNamesA( buf, 28, testfile3 ); @@ -236,13 +240,19 @@ static void test_profile_sections_names(void) memset(buf, 0xc, sizeof(buf)); ret = GetPrivateProfileSectionNamesA( buf, 27, testfile3 ); ok( ret == 25, "expected return size 25, got %d\n", ret ); + /* Win9x and WinME only fills the buffer with complete section names (double-null terminated) */ + count = strlen("section1") + sizeof(CHAR) + strlen("section2"); todo_wine - ok( buf[ret+1] == 0 && buf[ret] == 0, "returned buffer not terminated with double-null\n" ); - + ok( (buf[ret+1] == 0 && buf[ret] == 0) || + broken(buf[count] == 0 && buf[count+1] == 0), /* Win9x, WinME */ + "returned buffer not terminated with double-null\n" ); + /* Tests on nonexistent file */ memset(buf, 0xc, sizeof(buf)); ret = GetPrivateProfileSectionNamesA( buf, 10, ".\\not_here.ini" ); - ok( ret == 0, "expected return size 0, got %d\n", ret ); + ok( ret == 0 || + broken(ret == 1), /* Win9x, WinME */ + "expected return size 0, got %d\n", ret ); ok( buf[0] == 0, "returned buffer not terminated with null\n" ); ok( buf[1] != 0, "returned buffer terminated with double-null\n" );

1 0

Anders Jonsson : cmdlgtst: Add Swedish translation.
by Alexandre Julliard 29 Jan '09

29 Jan '09

Module: wine Branch: master Commit: e958d4f99efbd5b9420b64f99f9321918932e015 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e958d4f99efbd5b9420b64f99… Author: Anders Jonsson <anders.jonsson(a)norsjonet.se> Date: Wed Jan 28 19:18:36 2009 +0100 cmdlgtst: Add Swedish translation. --- programs/cmdlgtst/Sv.rc | 295 +++++++++++++++++++++++++++++++++++++++++++ programs/cmdlgtst/cmdlgr.rc | 1 + 2 files changed, 296 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e958d4f99efbd5b9420b6…

1 0

Anders Jonsson : comdlg32: Update Swedish translation.
by Alexandre Julliard 29 Jan '09

29 Jan '09

Module: wine Branch: master Commit: 100df7378d419edfd1b7eb0ddd4f9895fc8905ce URL: http://source.winehq.org/git/wine.git/?a=commit;h=100df7378d419edfd1b7eb0dd… Author: Anders Jonsson <anders.jonsson(a)norsjonet.se> Date: Wed Jan 28 19:04:51 2009 +0100 comdlg32: Update Swedish translation. --- dlls/comdlg32/cdlg_Sv.rc | 95 ++++++++++++++++++++++++++++++++------------- 1 files changed, 67 insertions(+), 28 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=100df7378d419edfd1b7e…

1 0

Gerald Pfeifer : iphlpapi: #define RTF_LLINFO if not in system headers.
by Alexandre Julliard 29 Jan '09

29 Jan '09

Module: wine Branch: master Commit: ee1d767fd80ef8e506bb2639341508d85497c895 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee1d767fd80ef8e506bb26393… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Wed Jan 28 11:40:42 2009 +0100 iphlpapi: #define RTF_LLINFO if not in system headers. --- dlls/iphlpapi/ipstats.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/iphlpapi/ipstats.c b/dlls/iphlpapi/ipstats.c index 6d3c413..75d4611 100644 --- a/dlls/iphlpapi/ipstats.c +++ b/dlls/iphlpapi/ipstats.c @@ -142,6 +142,10 @@ #define RTF_MULTICAST 0 /* Not available on NetBSD/OpenBSD */ #endif +#ifndef RTF_LLINFO +#define RTF_LLINFO 0 /* Not available on FreeBSD 8 and above */ +#endif + WINE_DEFAULT_DEBUG_CHANNEL(iphlpapi); DWORD getInterfaceStatsByName(const char *name, PMIB_IFROW entry)

1 0

Aric Stewart : setupapi: Implement pSetupInstallCatalog.
by Alexandre Julliard 29 Jan '09

29 Jan '09

Module: wine Branch: master Commit: 7392162ed1611e552fc6e40ab36cfd2d75c030c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7392162ed1611e552fc6e40ab… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Jan 28 09:21:46 2009 -0600 setupapi: Implement pSetupInstallCatalog. --- dlls/setupapi/misc.c | 23 +++++++++++++++++++++-- 1 files changed, 21 insertions(+), 2 deletions(-) diff --git a/dlls/setupapi/misc.c b/dlls/setupapi/misc.c index 6c0f68a..63320e6 100644 --- a/dlls/setupapi/misc.c +++ b/dlls/setupapi/misc.c @@ -1127,8 +1127,27 @@ DWORD WINAPI InstallCatalog( LPCSTR catalog, LPCSTR basename, LPSTR fullname ) */ DWORD WINAPI pSetupInstallCatalog( LPCWSTR catalog, LPCWSTR basename, LPWSTR fullname ) { - FIXME("%s, %s, %p\n", debugstr_w(catalog), debugstr_w(basename), fullname); - return 0; + HCATADMIN admin; + HCATINFO cat; + + TRACE ("%s, %s, %p\n", debugstr_w(catalog), debugstr_w(basename), fullname); + + if (!CryptCATAdminAcquireContext(&admin,NULL,0)) + return GetLastError(); + + if (!(cat = CryptCATAdminAddCatalog( admin, (PWSTR)catalog, (PWSTR)basename, 0 ))) + { + DWORD rc = GetLastError(); + CryptCATAdminReleaseContext(admin, 0); + return rc; + } + CryptCATAdminReleaseCatalogContext(admin, cat, 0); + CryptCATAdminReleaseContext(admin,0); + + if (fullname) + FIXME("not returning full installed catalog path\n"); + + return NO_ERROR; } static UINT detect_compression_type( LPCWSTR file )

1 0

Aric Stewart : shell32: In ParseDisplayName make use of shdocvw if the display name is not a drive but has a :.
by Alexandre Julliard 29 Jan '09

29 Jan '09

Module: wine Branch: master Commit: c6ba4eed013358a84bd72c25c6a0b572041cad97 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c6ba4eed013358a84bd72c25c… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Jan 28 10:32:38 2009 -0600 shell32: In ParseDisplayName make use of shdocvw if the display name is not a drive but has a :. --- dlls/shell32/Makefile.in | 2 +- dlls/shell32/shfldr_desktop.c | 8 ++++++++ dlls/shell32/tests/shlfolder.c | 26 ++++++++++++++++++++++++++ 3 files changed, 35 insertions(+), 1 deletions(-) diff --git a/dlls/shell32/Makefile.in b/dlls/shell32/Makefile.in index 8a3ee40..4fe4300 100644 --- a/dlls/shell32/Makefile.in +++ b/dlls/shell32/Makefile.in @@ -6,7 +6,7 @@ VPATH = @srcdir@ MODULE = shell32.dll IMPORTLIB = shell32 IMPORTS = uuid shlwapi comctl32 user32 gdi32 advapi32 kernel32 ntdll -DELAYIMPORTS = ole32 oleaut32 +DELAYIMPORTS = ole32 oleaut32 shdocvw C_SRCS = \ appbar.c \ diff --git a/dlls/shell32/shfldr_desktop.c b/dlls/shell32/shfldr_desktop.c index aeb6e4b..c9b7412 100644 --- a/dlls/shell32/shfldr_desktop.c +++ b/dlls/shell32/shfldr_desktop.c @@ -55,6 +55,10 @@ WINE_DEFAULT_DEBUG_CHANNEL (shell); +/* Undocumented functions from shdocvw */ +extern HRESULT WINAPI IEParseDisplayNameWithBCW(DWORD codepage, LPCWSTR lpszDisplayName, LPBC pbc, LPITEMIDLIST *ppidl); + + /*********************************************************************** * Desktopfolder implementation */ @@ -181,6 +185,10 @@ static HRESULT WINAPI ISF_Desktop_fnParseDisplayName (IShellFolder2 * iface, *ppidl = pidlTemp; return S_OK; } + else if (strchrW(lpszDisplayName,':')) + { + return IEParseDisplayNameWithBCW(CP_ACP,lpszDisplayName,pbc,ppidl); + } else { /* it's a filesystem path on the desktop. Let a FSFolder parse it */ diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index cc32a00..9d563e0 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -82,6 +82,8 @@ static void test_ParseDisplayName(void) IShellFolder *IDesktopFolder; static const char *cNonExistDir1A = "c:\\nonexist_subdir"; static const char *cNonExistDir2A = "c:\\\\nonexist_subdir"; + static const char *cInetTestA = "http:\\yyy"; + static const char *cInetTest2A = "xx:yyy"; DWORD res; WCHAR cTestDirW [MAX_PATH] = {0}; ITEMIDLIST *newPIDL; @@ -90,6 +92,30 @@ static void test_ParseDisplayName(void) hr = SHGetDesktopFolder(&IDesktopFolder); if(hr != S_OK) return; + MultiByteToWideChar(CP_ACP, 0, cInetTestA, -1, cTestDirW, MAX_PATH); + hr = IShellFolder_ParseDisplayName(IDesktopFolder, + NULL, NULL, cTestDirW, NULL, &newPIDL, 0); + todo_wine ok((SUCCEEDED(hr) || broken(hr == E_FAIL) /* NT4 */), + "ParseDisplayName returned %08x, expected SUCCESS or E_FAIL \n", hr); + if (SUCCEEDED(hr)) + { + ok(pILFindLastID(newPIDL)->mkid.abID[0] == 0x61, "Last pidl should be of type " + "PT_IESPECIAL1, but is: %02x\n", pILFindLastID(newPIDL)->mkid.abID[0]); + IMalloc_Free(ppM, newPIDL); + } + + MultiByteToWideChar(CP_ACP, 0, cInetTest2A, -1, cTestDirW, MAX_PATH); + hr = IShellFolder_ParseDisplayName(IDesktopFolder, + NULL, NULL, cTestDirW, NULL, &newPIDL, 0); + todo_wine ok((SUCCEEDED(hr) || broken(hr == E_FAIL) /* NT4 */), + "ParseDisplayName returned %08x, expected SUCCESS or E_FAIL \n", hr); + if (SUCCEEDED(hr)) + { + ok(pILFindLastID(newPIDL)->mkid.abID[0] == 0x61, "Last pidl should be of type " + "PT_IESPECIAL1, but is: %02x\n", pILFindLastID(newPIDL)->mkid.abID[0]); + IMalloc_Free(ppM, newPIDL); + } + res = GetFileAttributesA(cNonExistDir1A); if(res != INVALID_FILE_ATTRIBUTES) return;

1 0