June 2006 - Wine-Commits - list.winehq.org

Juan Lang : crypt32: Simplify CRL creation.
by Alexandre Julliard June 20, 2006

June 20, 2006

Module: wine Branch: refs/heads/master Commit: 13e006a715376f76241471f7af4599642c47b3bf URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=13e006a715376f76241471f… Author: Juan Lang <juan_lang(a)yahoo.com> Date: Mon Jun 19 14:11:37 2006 -0700 crypt32: Simplify CRL creation. Decoding already handles signed and unsigned CRLs, so don't duplicate that in CertCreateCRLContext. --- dlls/crypt32/crl.c | 25 +++---------------------- 1 files changed, 3 insertions(+), 22 deletions(-) diff --git a/dlls/crypt32/crl.c b/dlls/crypt32/crl.c index dd2918c..08bb139 100644 --- a/dlls/crypt32/crl.c +++ b/dlls/crypt32/crl.c @@ -32,7 +32,6 @@ PCCRL_CONTEXT WINAPI CertCreateCRLContex { PCRL_CONTEXT crl = NULL; BOOL ret; - PCERT_SIGNED_CONTENT_INFO signedCrl = NULL; PCRL_INFO crlInfo = NULL; DWORD size = 0; @@ -44,27 +43,9 @@ PCCRL_CONTEXT WINAPI CertCreateCRLContex SetLastError(E_INVALIDARG); return NULL; } - /* First try to decode it as a signed crl. */ - ret = CryptDecodeObjectEx(dwCertEncodingType, X509_CERT, pbCrlEncoded, - cbCrlEncoded, CRYPT_DECODE_ALLOC_FLAG, NULL, (BYTE *)&signedCrl, &size); - if (ret) - { - size = 0; - ret = CryptDecodeObjectEx(dwCertEncodingType, - X509_CERT_CRL_TO_BE_SIGNED, signedCrl->ToBeSigned.pbData, - signedCrl->ToBeSigned.cbData, CRYPT_DECODE_ALLOC_FLAG, NULL, - (BYTE *)&crlInfo, &size); - LocalFree(signedCrl); - } - /* Failing that, try it as an unsigned crl */ - if (!ret) - { - size = 0; - ret = CryptDecodeObjectEx(dwCertEncodingType, - X509_CERT_CRL_TO_BE_SIGNED, pbCrlEncoded, cbCrlEncoded, - CRYPT_DECODE_ALLOC_FLAG | CRYPT_DECODE_NOCOPY_FLAG, NULL, - (BYTE *)&crlInfo, &size); - } + ret = CryptDecodeObjectEx(dwCertEncodingType, X509_CERT_CRL_TO_BE_SIGNED, + pbCrlEncoded, cbCrlEncoded, CRYPT_DECODE_ALLOC_FLAG, NULL, + (BYTE *)&crlInfo, &size); if (ret) { BYTE *data = NULL;

1 0

Mikołaj Zalewski : shell32: Update the Polish translation.
by Alexandre Julliard June 20, 2006

June 20, 2006

Module: wine Branch: refs/heads/master Commit: cc6eb8dfe176e3eef430c7307b91ce9d3eb95da0 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=cc6eb8dfe176e3eef430c73… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Mon Jun 19 23:22:38 2006 +0200 shell32: Update the Polish translation. --- dlls/shell32/shell32_Pl.rc | 81 ++++++++++++++++++++++++++------------------ 1 files changed, 48 insertions(+), 33 deletions(-) diff --git a/dlls/shell32/shell32_Pl.rc b/dlls/shell32/shell32_Pl.rc index 64dc30b..33830d9 100644 --- a/dlls/shell32/shell32_Pl.rc +++ b/dlls/shell32/shell32_Pl.rc @@ -132,30 +132,33 @@ FONT 8, "MS Shell Dlg" PUSHBUTTON "&Przegl�daj...", 12288, 170, 63, 50, 14, WS_TABSTOP } -/* - special folders -*/ STRINGTABLE DISCARDABLE { + /* columns in the shellview */ + IDS_SHV_COLUMN1 "Plik" + IDS_SHV_COLUMN2 "Wielko��" + IDS_SHV_COLUMN3 "Typ" + IDS_SHV_COLUMN4 "Modyfikacja" + IDS_SHV_COLUMN5 "Atrybuty" + IDS_SHV_COLUMN6 "Wielko��" + IDS_SHV_COLUMN7 "Dost�pna wielko��" + IDS_SHV_COLUMN8 "Nazwa" + IDS_SHV_COLUMN9 "Komentarz" + IDS_SHV_COLUMN10 "W�a�ciciel" + IDS_SHV_COLUMN11 "Grupa" + + /* special folders */ IDS_DESKTOP "Pulpit" IDS_MYCOMPUTER "M�j komputer" -} -/* - context menus -*/ -STRINGTABLE DISCARDABLE -{ + /* context menus */ IDS_VIEW_LARGE "&Du�e Ikony" IDS_VIEW_SMALL "&Ma�e Ikony" IDS_VIEW_LIST "&Lista" IDS_VIEW_DETAILS "&Szczeg�y" IDS_SELECT "Zaznacz" IDS_OPEN "Otw�rz" -} -STRINGTABLE DISCARDABLE -{ IDS_CREATEFOLDER_DENIED "Nie mog� utworzy� nowego katalogu: Brak dost�pu." IDS_CREATEFOLDER_CAPTION "B��d przy tworzeniu nowego katalogu." IDS_DELETEITEM_CAPTION "Potwierd� usuni�cia pliku" @@ -164,27 +167,39 @@ STRINGTABLE DISCARDABLE IDS_DELETEMULTIPLE_TEXT "Czy jeste� pewien, �e chcesz usun�� te %1 pliki?" IDS_OVERWRITEFILE_TEXT "Zast�pi� plik %1?" IDS_OVERWRITEFILE_CAPTION "Potwierd� zast�pienie pliku" -} -/* columns in the shellview */ -STRINGTABLE -BEGIN - IDS_SHV_COLUMN1 "Plik" - IDS_SHV_COLUMN2 "Wielko��" - IDS_SHV_COLUMN3 "Typ" - IDS_SHV_COLUMN4 "Modyfikacja" - IDS_SHV_COLUMN5 "Atrybuty" - IDS_SHV_COLUMN6 "Wielko��" - IDS_SHV_COLUMN7 "Dost�pna wielko��" - IDS_SHV_COLUMN8 "Nazwa" - IDS_SHV_COLUMN9 "Komentarz" -END + /* message box strings */ + IDS_RESTART_TITLE "Uruchom ponownie" + IDS_RESTART_PROMPT "Czy chcesz zasymulowa� zrestartowanie Windowsa?" + IDS_SHUTDOWN_TITLE "Wy��cz" + IDS_SHUTDOWN_PROMPT "Czy chcesz wy��czy� sesj� Wine'a?" -/* message box strings */ -STRINGTABLE DISCARDABLE -{ - IDS_RESTART_TITLE "Uruchom ponownie" - IDS_RESTART_PROMPT "Czy chcesz zasymulowa� zrestartowanie Windowsa?" - IDS_SHUTDOWN_TITLE "Wy��cz" - IDS_SHUTDOWN_PROMPT "Czy chcesz wy��czy� sesj� Wine'a?" + /* shell folder path default values */ + IDS_PROGRAMS "Menu Start\\Programy" + IDS_PERSONAL "Moje dokumenty" + IDS_FAVORITES "Ulubione" + IDS_STARTUP "Menu Start\\Programy\\AutoStart" + IDS_RECENT "Recent" + IDS_SENDTO "SendTo" + IDS_STARTMENU "Menu Start" + IDS_MYMUSIC "Moja muzyka" + IDS_MYVIDEO "Moje wideo" + IDS_DESKTOPDIRECTORY "Pulpit" + IDS_NETHOOD "NetHood" + IDS_TEMPLATES "Szablony" + IDS_APPDATA "Dane aplikacji" + IDS_PRINTHOOD "PrintHood" + IDS_LOCAL_APPDATA "Ustawienia lokalne\\Dane aplikacji" + IDS_INTERNET_CACHE "Ustawienia lokalne\\Temporary Internet Files" + IDS_COOKIES "Cookies" + IDS_HISTORY "Ustawienia Lokalne\\Historia" + IDS_PROGRAM_FILES "Program Files" + IDS_MYPICTURES "Moje obrazy" + IDS_PROGRAM_FILES_COMMON "Program Files\\Common Files" + IDS_COMMON_DOCUMENTS "Dokumenty" + IDS_ADMINTOOLS "Menu Start\\Programy\\Narz�dzia administracyjne" + IDS_COMMON_MUSIC "Documenty\\Moja muzyka" + IDS_COMMON_PICTURES "Documenty\\Moje obrazy" + IDS_COMMON_VIDEO "Documenty\\Moje wideo" + IDS_CDBURN_AREA "Ustawienia lokalne\Dane aplikacji\\Microsoft\\Nagrywanie dysk�w CD" }

1 0

Juan Lang : crypt32: Simplify certificate creation.
by Alexandre Julliard June 20, 2006

June 20, 2006

Module: wine Branch: refs/heads/master Commit: 661aecc761e119d0e7a58511408367662045247c URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=661aecc761e119d0e7a5851… Author: Juan Lang <juan_lang(a)yahoo.com> Date: Mon Jun 19 14:10:29 2006 -0700 crypt32: Simplify certificate creation. Decoding already handles signed and unsigned certs, so don't duplicate that in CertCreateCertificateContext. --- dlls/crypt32/cert.c | 24 +++--------------------- 1 files changed, 3 insertions(+), 21 deletions(-) diff --git a/dlls/crypt32/cert.c b/dlls/crypt32/cert.c index 3893bdb..2bcc4f7 100644 --- a/dlls/crypt32/cert.c +++ b/dlls/crypt32/cert.c @@ -73,33 +73,15 @@ PCCERT_CONTEXT WINAPI CertCreateCertific { PCERT_CONTEXT cert = NULL; BOOL ret; - PCERT_SIGNED_CONTENT_INFO signedCert = NULL; PCERT_INFO certInfo = NULL; DWORD size = 0; TRACE("(%08lx, %p, %ld)\n", dwCertEncodingType, pbCertEncoded, cbCertEncoded); - /* First try to decode it as a signed cert. */ - ret = CryptDecodeObjectEx(dwCertEncodingType, X509_CERT, pbCertEncoded, - cbCertEncoded, CRYPT_DECODE_ALLOC_FLAG, NULL, (BYTE *)&signedCert, &size); - if (ret) - { - size = 0; - ret = CryptDecodeObjectEx(dwCertEncodingType, X509_CERT_TO_BE_SIGNED, - signedCert->ToBeSigned.pbData, signedCert->ToBeSigned.cbData, - CRYPT_DECODE_ALLOC_FLAG, NULL, (BYTE *)&certInfo, &size); - LocalFree(signedCert); - } - /* Failing that, try it as an unsigned cert */ - if (!ret) - { - size = 0; - ret = CryptDecodeObjectEx(dwCertEncodingType, X509_CERT_TO_BE_SIGNED, - pbCertEncoded, cbCertEncoded, - CRYPT_DECODE_ALLOC_FLAG | CRYPT_DECODE_NOCOPY_FLAG, NULL, - (BYTE *)&certInfo, &size); - } + ret = CryptDecodeObjectEx(dwCertEncodingType, X509_CERT_TO_BE_SIGNED, + pbCertEncoded, cbCertEncoded, CRYPT_DECODE_ALLOC_FLAG, NULL, + (BYTE *)&certInfo, &size); if (ret) { BYTE *data = NULL;

1 0

appdb/. appsubmit.php
by WineHQ June 19, 2006

June 19, 2006

ChangeSet ID: 25854 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2006/06/19 23:05:55 Modified files: . : appsubmit.php Log message: "EA Durbin" <ead1234(a)hotmail.com> class testResult() doesn't exist, include/testResults.php is the name but the class is testData. Correct spelling of testData(). Patch: http://cvs.winehq.org/patch.py?id=25854 Old revision New revision Changes Path 1.40 1.41 +2 -2 appdb/appsubmit.php Index: appdb/appsubmit.php diff -u -p appdb/appsubmit.php:1.40 appdb/appsubmit.php:1.41 --- appdb/appsubmit.php:1.40 20 Jun 2006 4: 5:55 -0000 +++ appdb/appsubmit.php 20 Jun 2006 4: 5:55 -0000 @@ -128,11 +128,11 @@ if ($aClean['sub']) if($hResult) { $oRow = mysql_fetch_object($hResult); - $oTest = new testdata($oRow->testingId); + $oTest = new testData($oRow->testingId); } else { - $oTest = new testResult(); + $oTest = new testData(); } //process according to sub flag

1 0

appdb/. preferences.php
by WineHQ June 19, 2006

June 19, 2006

ChangeSet ID: 25853 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2006/06/19 16:28:45 Modified files: . : preferences.php Log message: Chris Morgan <cmorgan(a)alum.wpi.edu> Clean all preferences, fixes setting preferences Patch: http://cvs.winehq.org/patch.py?id=25853 Old revision New revision Changes Path 1.20 1.21 +20 -9 appdb/preferences.php Index: appdb/preferences.php diff -u -p appdb/preferences.php:1.20 appdb/preferences.php:1.21 --- appdb/preferences.php:1.20 19 Jun 2006 21:28:45 -0000 +++ appdb/preferences.php 19 Jun 2006 21:28:45 -0000 @@ -21,6 +21,15 @@ $aClean['ext_realname'] = makeSafe($REQU $aClean['CVSrelease'] = makeSafe($REQUEST['CVSrelease']); $aClean['ext_hasadmin'] = makeSafe($POST['ext_hasadmin']); +/* filter all of the preferences */ +while(list($key, $value) = each($_REQUEST)) +{ + if(ereg("^pref_(.+)$", $key, $arr)) + $aClean[$key] = makeSafe($value); +} + + + if(!$_SESSION['current']->isLoggedIn()) { @@ -47,11 +56,11 @@ function build_prefs_list() global $oUser; $result = query_appdb("SELECT * FROM prefs_list ORDER BY id"); while($result && $r = mysql_fetch_object($result)) - { + { //skip admin options //TODO: add a field to prefs_list to flag the user level for the pref if(!$_SESSION['current']->hasPriv("admin")) - { + { if($r->name == "query:mode") continue; if($r->name == "sidebar") @@ -64,12 +73,12 @@ function build_prefs_list() continue; if($r->name == "debug") continue; - } + } $input = html_select("pref_$r->name", explode('|', $r->value_list), $oUser->getpref($r->name, $r->def_value)); echo html_tr(array("  $r->description", $input)); - } + } } function show_user_fields() @@ -94,11 +103,13 @@ function show_user_fields() if($_POST) { while(list($key, $value) = each($aClean)) - { - if(!ereg("^pref_(.+)$", $key, $arr)) - continue; - $oUser->setPref($arr[1], $value); - } + { + /* if a parameter lacks 'pref_' at its head it isn't a */ + /* preference so skip over processing it */ + if(!ereg("^pref_(.+)$", $key, $arr)) + continue; + $oUser->setPref($arr[1], $value); + } if ($aClean['ext_password'] == $aClean['ext_password2']) {

1 0

Saulius Krasuckas : lz32: test LZOpenFileW.
by Alexandre Julliard June 19, 2006

June 19, 2006

Module: wine Branch: refs/heads/master Commit: 38a85261cbe4045fe883df13375477b39d54debc URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=38a85261cbe4045fe883df1… Author: Saulius Krasuckas <saulius.krasuckas(a)ieee.org> Date: Mon Jun 19 23:21:38 2006 +0300 lz32: test LZOpenFileW. --- dlls/lz32/tests/lzexpand_main.c | 95 +++++++++++++++++++++++++++++++++++++++ 1 files changed, 95 insertions(+), 0 deletions(-) diff --git a/dlls/lz32/tests/lzexpand_main.c b/dlls/lz32/tests/lzexpand_main.c index b0aaaa1..73a1f41 100644 --- a/dlls/lz32/tests/lzexpand_main.c +++ b/dlls/lz32/tests/lzexpand_main.c @@ -31,6 +31,9 @@ static char filename_[] = "testfile.xx_" static char filename[] = "testfile.xxx"; static char filename2[] = "testfile.yyy"; +static WCHAR filename_W[] = {'t','e','s','t','f','i','l','e','.','x','x','_',0}; +static WCHAR filenameW[] = {'t','e','s','t','f','i','l','e','.','x','x','x',0}; + /* This is the hex string representation of the file created by compressing a simple text file with the contents "This is a test file." @@ -221,10 +224,102 @@ static void test_LZCopy(void) ok(ret, "DeleteFileA: error %ld\n", GetLastError()); } +static void test_LZOpenFileW(void) +{ + OFSTRUCT test; + DWORD retval; + INT file; + char expected[MAX_PATH]; + char filled_0xA5[OFS_MAXPATHNAME]; + static WCHAR badfilenameW[] = {'b','a','d','f','i','l','e','n','a','m','e','.','x','t','n',0}; + + SetLastError(0xfaceabee); + /* Check for nonexistent file. */ + file = LZOpenFileW(badfilenameW, &test, OF_READ); + if(GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) + { + trace("LZOpenFileW call not implemented, skipping rest of the test\n"); + return; + } + ok(file == LZERROR_BADINHANDLE, + "LZOpenFileW succeeded on nonexistent file\n"); + LZClose(file); + + /* Create an empty file. */ + file = LZOpenFileW(filename_W, &test, OF_CREATE); + ok(file >= 0, "LZOpenFile failed on creation\n"); + LZClose(file); + retval = GetFileAttributesW(filename_W); + ok(retval != INVALID_FILE_ATTRIBUTES, "GetFileAttributes: error %ld\n", + GetLastError()); + + /* Check various opening options. */ + file = LZOpenFileW(filename_W, &test, OF_READ); + ok(file >= 0, "LZOpenFileW failed on read\n"); + LZClose(file); + file = LZOpenFileW(filename_W, &test, OF_WRITE); + ok(file >= 0, "LZOpenFileW failed on write\n"); + LZClose(file); + file = LZOpenFileW(filename_W, &test, OF_READWRITE); + ok(file >= 0, "LZOpenFileW failed on read/write\n"); + LZClose(file); + file = LZOpenFileW(filename_W, &test, OF_EXIST); + ok(file >= 0, "LZOpenFileW failed on read/write\n"); + LZClose(file); + + /* If the file "foo.xxx" does not exist, LZOpenFileW should then + check for the file "foo.xx_" and open that -- at least on some + operating systems. Doesn't seem to on my copy of Win98. + */ + retval = GetCurrentDirectoryA(MAX_PATH, expected); + ok(retval > 0, "GetCurrentDirectoryW returned %ld, GLE=0x%lx\n", + retval, GetLastError()); + lstrcatA(expected, "\\"); + /* We probably should use WideCharToMultiByte() on filenameW here: */ + lstrcatA(expected, filename); + /* Compressed file name ends with underscore. */ + retval = lstrlenA(expected); + expected[retval-1] = '_'; + memset(&filled_0xA5, 0xA5, OFS_MAXPATHNAME); + memset(&test, 0xA5, sizeof(test)); + + /* Try to open compressed file. */ + file = LZOpenFileW(filenameW, &test, OF_EXIST); + if(file != LZERROR_BADINHANDLE) { + ok(test.cBytes == sizeof(OFSTRUCT), + "LZOpenFileW set test.cBytes to %d\n", test.cBytes); + ok(test.nErrCode == 0, "LZOpenFileW set test.nErrCode to %d\n", + test.nErrCode); + ok(lstrcmpA(test.szPathName, expected) == 0, + "LZOpenFileW returned '%s', but was expected to return '%s'\n", + test.szPathName, expected); + LZClose(file); + } else { + ok(test.cBytes == 0xA5, + "LZOpenFileW set test.cBytes to %d\n", test.cBytes); + ok(test.nErrCode == ERROR_FILE_NOT_FOUND, + "LZOpenFileW set test.nErrCode to %d\n", test.nErrCode); + ok(strncmp(test.szPathName, filled_0xA5, OFS_MAXPATHNAME) == 0, + "LZOpenFileW returned '%s', but was expected to return '%s'\n", + test.szPathName, filled_0xA5); + } + + /* Delete the file then make sure it doesn't exist anymore. */ + file = LZOpenFileW(filename_W, &test, OF_DELETE); + ok(file >= 0, "LZOpenFileA failed on delete\n"); + LZClose(file); + + retval = GetFileAttributesW(filename_W); + ok(retval == INVALID_FILE_ATTRIBUTES, + "GetFileAttributesA succeeded on deleted file\n"); +} + + START_TEST(lzexpand_main) { buf = malloc(uncompressed_data_size * 2); test_LZOpenFileA(); + test_LZOpenFileW(); test_LZRead(); test_LZCopy(); free(buf);

1 0

Saulius Krasuckas : lz32: LZOpenFileA sets last error sometimes.
by Alexandre Julliard June 19, 2006

June 19, 2006

Module: wine Branch: refs/heads/master Commit: 6d024b28b9de29563cc3bedf2d65d8b88ad4c0a9 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=6d024b28b9de29563cc3bed… Author: Saulius Krasuckas <saulius.krasuckas(a)ieee.org> Date: Mon Jun 19 23:21:28 2006 +0300 lz32: LZOpenFileA sets last error sometimes. --- dlls/lz32/tests/lzexpand_main.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/lz32/tests/lzexpand_main.c b/dlls/lz32/tests/lzexpand_main.c index 4e5fd73..b0aaaa1 100644 --- a/dlls/lz32/tests/lzexpand_main.c +++ b/dlls/lz32/tests/lzexpand_main.c @@ -60,10 +60,13 @@ static void test_LZOpenFileA(void) char expected[MAX_PATH]; char filled_0xA5[OFS_MAXPATHNAME]; + SetLastError(0xfaceabee); /* Check for nonexistent file. */ file = LZOpenFileA("badfilename_", &test, OF_READ); ok(file == LZERROR_BADINHANDLE, "LZOpenFileA succeeded on nonexistent file\n"); + ok(GetLastError() == ERROR_FILE_NOT_FOUND, + "GetLastError() returns %ld\n", GetLastError()); LZClose(file); /* Create an empty file. */ @@ -102,7 +105,6 @@ static void test_LZOpenFileA(void) expected[retval-1] = '_'; memset(&filled_0xA5, 0xA5, OFS_MAXPATHNAME); memset(&test, 0xA5, sizeof(test)); - SetLastError(0xfaceabee); /* Try to open compressed file. */ file = LZOpenFileA(filename, &test, OF_EXIST);

1 0

Saulius Krasuckas : lz32: Rename function aliases to real (ASCII) function names.
by Alexandre Julliard June 19, 2006

June 19, 2006

Module: wine Branch: refs/heads/master Commit: bd2df081bd5b0679bccd7b6aec31febdec6a47c6 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=bd2df081bd5b0679bccd7b6… Author: Saulius Krasuckas <saulius.krasuckas(a)ieee.org> Date: Mon Jun 19 23:21:20 2006 +0300 lz32: Rename function aliases to real (ASCII) function names. --- dlls/lz32/tests/lzexpand_main.c | 120 +++++++++++++++++++-------------------- 1 files changed, 59 insertions(+), 61 deletions(-) diff --git a/dlls/lz32/tests/lzexpand_main.c b/dlls/lz32/tests/lzexpand_main.c index 07058c9..4e5fd73 100644 --- a/dlls/lz32/tests/lzexpand_main.c +++ b/dlls/lz32/tests/lzexpand_main.c @@ -52,7 +52,7 @@ static const DWORD uncompressed_data_siz static char *buf; -static void test_lzopenfile(void) +static void test_LZOpenFileA(void) { OFSTRUCT test; DWORD retval; @@ -60,41 +60,40 @@ static void test_lzopenfile(void) char expected[MAX_PATH]; char filled_0xA5[OFS_MAXPATHNAME]; - /* Check for nonexistent file. */ - file = LZOpenFile("badfilename_", &test, OF_READ); + file = LZOpenFileA("badfilename_", &test, OF_READ); ok(file == LZERROR_BADINHANDLE, - "LZOpenFile succeeded on nonexistent file\n"); + "LZOpenFileA succeeded on nonexistent file\n"); LZClose(file); /* Create an empty file. */ - file = LZOpenFile(filename_, &test, OF_CREATE); - ok(file >= 0, "LZOpenFile failed on creation\n"); + file = LZOpenFileA(filename_, &test, OF_CREATE); + ok(file >= 0, "LZOpenFileA failed on creation\n"); LZClose(file); - retval = GetFileAttributes(filename_); - ok(retval != INVALID_FILE_ATTRIBUTES, "GetFileAttributes: error %ld\n", + retval = GetFileAttributesA(filename_); + ok(retval != INVALID_FILE_ATTRIBUTES, "GetFileAttributesA: error %ld\n", GetLastError()); /* Check various opening options. */ - file = LZOpenFile(filename_, &test, OF_READ); - ok(file >= 0, "LZOpenFile failed on read\n"); + file = LZOpenFileA(filename_, &test, OF_READ); + ok(file >= 0, "LZOpenFileA failed on read\n"); LZClose(file); - file = LZOpenFile(filename_, &test, OF_WRITE); - ok(file >= 0, "LZOpenFile failed on write\n"); + file = LZOpenFileA(filename_, &test, OF_WRITE); + ok(file >= 0, "LZOpenFileA failed on write\n"); LZClose(file); - file = LZOpenFile(filename_, &test, OF_READWRITE); - ok(file >= 0, "LZOpenFile failed on read/write\n"); + file = LZOpenFileA(filename_, &test, OF_READWRITE); + ok(file >= 0, "LZOpenFileA failed on read/write\n"); LZClose(file); - file = LZOpenFile(filename_, &test, OF_EXIST); - ok(file >= 0, "LZOpenFile failed on read/write\n"); + file = LZOpenFileA(filename_, &test, OF_EXIST); + ok(file >= 0, "LZOpenFileA failed on read/write\n"); LZClose(file); - /* If the file "foo.xxx" does not exist, LZOpenFile should then + /* If the file "foo.xxx" does not exist, LZOpenFileA should then check for the file "foo.xx_" and open that -- at least on some operating systems. Doesn't seem to on my copy of Win98. */ - retval = GetCurrentDirectory(MAX_PATH, expected); - ok(retval > 0, "GetCurrentDirectory returned %ld, GLE=0x%lx\n", + retval = GetCurrentDirectoryA(MAX_PATH, expected); + ok(retval > 0, "GetCurrentDirectoryA returned %ld, GLE=0x%lx\n", retval, GetLastError()); lstrcatA(expected, "\\"); lstrcatA(expected, filename); @@ -106,38 +105,37 @@ static void test_lzopenfile(void) SetLastError(0xfaceabee); /* Try to open compressed file. */ - file = LZOpenFile(filename, &test, OF_EXIST); - if(file != LZERROR_BADINHANDLE) { /* NT */ - ok(test.cBytes == sizeof(OFSTRUCT), - "LZOpenFile set test.cBytes to %d\n", test.cBytes); - ok(test.nErrCode == 0, - "LZOpenFile set test.nErrCode to %d\n", test.nErrCode); - ok(lstrcmpA(test.szPathName, expected) == 0, - "LZOpenFile returned '%s', but was expected to return '%s'\n", + file = LZOpenFileA(filename, &test, OF_EXIST); + if(file != LZERROR_BADINHANDLE) { + ok(test.cBytes == sizeof(OFSTRUCT), + "LZOpenFileA set test.cBytes to %d\n", test.cBytes); + ok(test.nErrCode == 0, "LZOpenFileA set test.nErrCode to %d\n", + test.nErrCode); + ok(lstrcmpA(test.szPathName, expected) == 0, + "LZOpenFileA returned '%s', but was expected to return '%s'\n", test.szPathName, expected); LZClose(file); - } else { /* 9x */ - ok(test.cBytes == 0xA5, - "LZOpenFile set test.cBytes to %d\n", test.cBytes); - ok(test.nErrCode == ERROR_FILE_NOT_FOUND, - "LZOpenFile set test.nErrCode to %d\n", test.nErrCode); - ok(strncmp(test.szPathName, filled_0xA5, OFS_MAXPATHNAME) == 0, - "LZOpenFile returned '%s', but was expected to return '%s'\n", + } else { + ok(test.cBytes == 0xA5, + "LZOpenFileA set test.cBytes to %d\n", test.cBytes); + ok(test.nErrCode == ERROR_FILE_NOT_FOUND, + "LZOpenFileA set test.nErrCode to %d\n", test.nErrCode); + ok(strncmp(test.szPathName, filled_0xA5, OFS_MAXPATHNAME) == 0, + "LZOpenFileA returned '%s', but was expected to return '%s'\n", test.szPathName, filled_0xA5); } /* Delete the file then make sure it doesn't exist anymore. */ - file = LZOpenFile(filename_, &test, OF_DELETE); - ok(file >= 0, "LZOpenFile failed on delete\n"); + file = LZOpenFileA(filename_, &test, OF_DELETE); + ok(file >= 0, "LZOpenFileA failed on delete\n"); LZClose(file); - retval = GetFileAttributes(filename_); + retval = GetFileAttributesA(filename_); ok(retval == INVALID_FILE_ATTRIBUTES, - "GetFileAttributes succeeded on deleted file\n"); - + "GetFileAttributesA succeeded on deleted file\n"); } -static void test_lzread(void) +static void test_LZRead(void) { HANDLE file; DWORD ret; @@ -146,15 +144,15 @@ static void test_lzread(void) BOOL retok; /* Create the compressed file. */ - file = CreateFile(filename_, GENERIC_WRITE, 0, NULL, CREATE_NEW, 0, 0); + file = CreateFileA(filename_, GENERIC_WRITE, 0, NULL, CREATE_NEW, 0, 0); ok(file != INVALID_HANDLE_VALUE, "Could not create test file\n"); retok = WriteFile(file, compressed_file, compressed_file_size, &ret, 0); ok( retok, "WriteFile: error %ld\n", GetLastError()); ok(ret == compressed_file_size, "Wrote wrong number of bytes with WriteFile?\n"); CloseHandle(file); - cfile = LZOpenFile(filename_, &test, OF_READ); - ok(cfile > 0, "LZOpenFile failed\n"); + cfile = LZOpenFileA(filename_, &test, OF_READ); + ok(cfile > 0, "LZOpenFileA failed\n"); ret = LZRead(cfile, buf, uncompressed_data_size); ok(ret == uncompressed_data_size, "Read wrong number of bytes\n"); @@ -171,11 +169,11 @@ static void test_lzread(void) LZClose(cfile); - ret = DeleteFile(filename_); - ok(ret, "DeleteFile: error %ld\n", GetLastError()); + ret = DeleteFileA(filename_); + ok(ret, "DeleteFileA: error %ld\n", GetLastError()); } -static void test_lzcopy(void) +static void test_LZCopy(void) { HANDLE file; DWORD ret; @@ -184,18 +182,18 @@ static void test_lzcopy(void) BOOL retok; /* Create the compressed file. */ - file = CreateFile(filename_, GENERIC_WRITE, 0, NULL, CREATE_NEW, 0, 0); + file = CreateFileA(filename_, GENERIC_WRITE, 0, NULL, CREATE_NEW, 0, 0); ok(file != INVALID_HANDLE_VALUE, - "CreateFile: error %ld\n", GetLastError()); + "CreateFileA: error %ld\n", GetLastError()); retok = WriteFile(file, compressed_file, compressed_file_size, &ret, 0); ok( retok, "WriteFile error %ld\n", GetLastError()); ok(ret == compressed_file_size, "Wrote wrong number of bytes\n"); CloseHandle(file); - source = LZOpenFile(filename_, &stest, OF_READ); - ok(source >= 0, "LZOpenFile failed on compressed file\n"); - dest = LZOpenFile(filename2, &dtest, OF_CREATE); - ok(dest >= 0, "LZOpenFile failed on creating new file %d\n", dest); + source = LZOpenFileA(filename_, &stest, OF_READ); + ok(source >= 0, "LZOpenFileA failed on compressed file\n"); + dest = LZOpenFileA(filename2, &dtest, OF_CREATE); + ok(dest >= 0, "LZOpenFileA failed on creating new file %d\n", dest); ret = LZCopy(source, dest); ok(ret > 0, "LZCopy error\n"); @@ -203,10 +201,10 @@ static void test_lzcopy(void) LZClose(source); LZClose(dest); - file = CreateFile(filename2, GENERIC_READ, 0, NULL, OPEN_EXISTING, + file = CreateFileA(filename2, GENERIC_READ, 0, NULL, OPEN_EXISTING, 0, 0); ok(file != INVALID_HANDLE_VALUE, - "CreateFile: error %ld\n", GetLastError()); + "CreateFileA: error %ld\n", GetLastError()); retok = ReadFile(file, buf, uncompressed_data_size*2, &ret, 0); ok( retok && ret == uncompressed_data_size, "ReadFile: error %ld\n", GetLastError()); @@ -215,17 +213,17 @@ static void test_lzcopy(void) "buffer contents mismatch\n"); CloseHandle(file); - ret = DeleteFile(filename_); - ok(ret, "DeleteFile: error %ld\n", GetLastError()); - ret = DeleteFile(filename2); - ok(ret, "DeleteFile: error %ld\n", GetLastError()); + ret = DeleteFileA(filename_); + ok(ret, "DeleteFileA: error %ld\n", GetLastError()); + ret = DeleteFileA(filename2); + ok(ret, "DeleteFileA: error %ld\n", GetLastError()); } START_TEST(lzexpand_main) { buf = malloc(uncompressed_data_size * 2); - test_lzopenfile(); - test_lzread(); - test_lzcopy(); + test_LZOpenFileA(); + test_LZRead(); + test_LZCopy(); free(buf); }

1 0

Robert Shearman : shell32: Convert ISF_Desktop_fnGetDisplayNameOf to Unicode.
by Alexandre Julliard June 19, 2006

June 19, 2006

Module: wine Branch: refs/heads/master Commit: 6c4c4e351515ef370289ea149fff4a3b85a70981 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=6c4c4e351515ef370289ea1… Author: Robert Shearman <rob(a)codeweavers.com> Date: Mon Jun 19 20:27:13 2006 +0100 shell32: Convert ISF_Desktop_fnGetDisplayNameOf to Unicode. --- dlls/shell32/shfldr_desktop.c | 64 ++++++++++++++++------------------------- 1 files changed, 25 insertions(+), 39 deletions(-) diff --git a/dlls/shell32/shfldr_desktop.c b/dlls/shell32/shfldr_desktop.c index 29b76a4..3d717d9 100644 --- a/dlls/shell32/shfldr_desktop.c +++ b/dlls/shell32/shfldr_desktop.c @@ -570,33 +570,13 @@ static HRESULT WINAPI ISF_Desktop_fnGetD if (!strRet) return E_INVALIDARG; - strRet->uType = STRRET_CSTR; if (_ILIsDesktop (pidl)) { if ((GET_SHGDN_RELATION (dwFlags) == SHGDN_NORMAL) && (GET_SHGDN_FOR (dwFlags) & SHGDN_FORPARSING)) - { - BOOL defCharUsed; - - WideCharToMultiByte( CP_ACP, 0, This->sPathTarget, -1, - strRet->u.cStr, MAX_PATH, NULL, &defCharUsed ); - if (defCharUsed) - { - strRet->u.pOleStr = SHAlloc((lstrlenW(This->sPathTarget)+1) * - sizeof(WCHAR)); - if (!strRet->u.pOleStr) - hr = E_OUTOFMEMORY; - else - { - strcpyW(strRet->u.pOleStr, This->sPathTarget); - strRet->uType = STRRET_WSTR; - } - } - } + strcpyW(wszPath, This->sPathTarget); else - { - HCR_GetClassNameA(&CLSID_ShellDesktop, strRet->u.cStr, MAX_PATH); - } + HCR_GetClassNameW(&CLSID_ShellDesktop, wszPath, MAX_PATH); } else if (_ILIsPidlSimple (pidl)) { @@ -646,7 +626,6 @@ static HRESULT WINAPI ISF_Desktop_fnGetD if ((GET_SHGDN_RELATION (dwFlags) == SHGDN_NORMAL) && bWantsForParsing) { - WCHAR wszPath[MAX_PATH]; /* * we need the filesystem path to the destination folder. * Only the folder itself can know it @@ -654,24 +633,19 @@ static HRESULT WINAPI ISF_Desktop_fnGetD hr = SHELL32_GetDisplayNameOfChild (iface, pidl, dwFlags, wszPath, MAX_PATH); - if (SUCCEEDED(hr)) - { - if (!WideCharToMultiByte(CP_ACP, 0, wszPath, -1, strRet->u.cStr, MAX_PATH, - NULL, NULL)) - wszPath[0] = '\0'; - } } else { /* parsing name like ::{...} */ - lstrcpyA (strRet->u.cStr, "::"); - SHELL32_GUIDToStringA (clsid, &strRet->u.cStr[2]); + wszPath[0] = ':'; + wszPath[1] = ':'; + SHELL32_GUIDToStringW (clsid, &wszPath[2]); } } else { /* user friendly name */ - HCR_GetClassNameA (clsid, strRet->u.cStr, MAX_PATH); + HCR_GetClassNameW (clsid, wszPath, MAX_PATH); } } else @@ -691,9 +665,6 @@ static HRESULT WINAPI ISF_Desktop_fnGetD if (!_ILIsFolder(pidl)) SHELL_FS_ProcessDisplayFilename(wszPath, dwFlags); - - WideCharToMultiByte(CP_ACP, 0, wszPath, -1, strRet->u.cStr, MAX_PATH, - NULL, NULL); } } else @@ -701,11 +672,26 @@ static HRESULT WINAPI ISF_Desktop_fnGetD /* a complex pidl, let the subfolder do the work */ hr = SHELL32_GetDisplayNameOfChild (iface, pidl, dwFlags, wszPath, MAX_PATH); - if (SUCCEEDED(hr)) + } + + if (SUCCEEDED(hr)) + { + BOOL defCharUsed; + strRet->uType = STRRET_CSTR; + if (!WideCharToMultiByte(CP_ACP, 0, wszPath, -1, strRet->u.cStr, MAX_PATH, + NULL, &defCharUsed)) + strRet->u.cStr[0] = '\0'; + if (defCharUsed) { - if (!WideCharToMultiByte(CP_ACP, 0, wszPath, -1, strRet->u.cStr, MAX_PATH, - NULL, NULL)) - wszPath[0] = '\0'; + strRet->u.pOleStr = SHAlloc((lstrlenW(This->sPathTarget)+1) * + sizeof(WCHAR)); + if (!strRet->u.pOleStr) + hr = E_OUTOFMEMORY; + else + { + strcpyW(strRet->u.pOleStr, This->sPathTarget); + strRet->uType = STRRET_WSTR; + } } }

1 0

Robert Shearman : shell32: Convert ISF_MyComputer_fnGetDisplayNameOf to Unicode.
by Alexandre Julliard June 19, 2006

June 19, 2006

Module: wine Branch: refs/heads/master Commit: db8169b8284bc7ffb27e159ba67f837117a8c745 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=db8169b8284bc7ffb27e159… Author: Robert Shearman <rob(a)codeweavers.com> Date: Mon Jun 19 20:27:05 2006 +0100 shell32: Convert ISF_MyComputer_fnGetDisplayNameOf to Unicode. --- dlls/shell32/shfldr_mycomp.c | 68 ++++++++++++++++++++---------------------- 1 files changed, 32 insertions(+), 36 deletions(-) diff --git a/dlls/shell32/shfldr_mycomp.c b/dlls/shell32/shfldr_mycomp.c index fcdec00..c9a5c07 100644 --- a/dlls/shell32/shfldr_mycomp.c +++ b/dlls/shell32/shfldr_mycomp.c @@ -555,7 +555,7 @@ static HRESULT WINAPI ISF_MyComputer_fnG { IGenericSFImpl *This = (IGenericSFImpl *)iface; - char szPath[MAX_PATH]; + WCHAR wszPath[MAX_PATH]; HRESULT hr = S_OK; TRACE ("(%p)->(pidl=%p,0x%08lx,%p)\n", This, pidl, dwFlags, strRet); @@ -564,13 +564,14 @@ static HRESULT WINAPI ISF_MyComputer_fnG if (!strRet) return E_INVALIDARG; - szPath[0] = 0x00; + wszPath[0] = 0; if (!pidl->mkid.cb) { /* parsing name like ::{...} */ - lstrcpyA (szPath, "::"); - SHELL32_GUIDToStringA(&CLSID_MyComputer, &szPath[2]); + wszPath[0] = ':'; + wszPath[1] = ':'; + SHELL32_GUIDToStringW(&CLSID_MyComputer, &wszPath[2]); } else if (_ILIsPidlSimple(pidl)) { @@ -617,62 +618,63 @@ static HRESULT WINAPI ISF_MyComputer_fnG if ((GET_SHGDN_RELATION (dwFlags) == SHGDN_NORMAL) && bWantsForParsing) { - WCHAR wszPath[MAX_PATH]; /* * We need the filesystem path to the destination folder * Only the folder itself can know it */ hr = SHELL32_GetDisplayNameOfChild (iface, pidl, dwFlags, wszPath, MAX_PATH); - if (SUCCEEDED(hr)) - { - if (!WideCharToMultiByte(CP_ACP, 0, wszPath, -1, szPath, MAX_PATH, - NULL, NULL)) - wszPath[0] = '\0'; - } } else { - LPSTR p; + LPWSTR p = wszPath; /* parsing name like ::{...} */ - p = lstrcpyA(szPath, "::") + 2; - p += SHELL32_GUIDToStringA(&CLSID_MyComputer, p); - - lstrcatA(p, "\\::"); + p[0] = ':'; + p[1] = ':'; + p += 2; + p += SHELL32_GUIDToStringW(&CLSID_MyComputer, p); + + /* \:: */ + p[0] = '\\'; + p[1] = ':'; + p[2] = ':'; p += 3; - SHELL32_GUIDToStringA(clsid, p); + SHELL32_GUIDToStringW(clsid, p); } } else { /* user friendly name */ - HCR_GetClassNameA (clsid, szPath, MAX_PATH); + HCR_GetClassNameW (clsid, wszPath, MAX_PATH); } } else { /* append my own path */ - _ILSimpleGetText (pidl, szPath, MAX_PATH); + _ILSimpleGetTextW (pidl, wszPath, MAX_PATH); } } else if (_ILIsDrive(pidl)) { - _ILSimpleGetText (pidl, szPath, MAX_PATH); /* append my own path */ + _ILSimpleGetTextW (pidl, wszPath, MAX_PATH); /* append my own path */ /* long view "lw_name (C:)" */ if (!(dwFlags & SHGDN_FORPARSING)) { DWORD dwVolumeSerialNumber, dwMaximumComponetLength, dwFileSystemFlags; - char szDrive[18] = ""; + WCHAR wszDrive[18] = {0}; + static const WCHAR wszOpenBracket[] = {' ','(',0}; + static const WCHAR wszCloseBracket[] = {')',0}; - GetVolumeInformationA (szPath, szDrive, sizeof (szDrive) - 6, + GetVolumeInformationW (wszPath, wszDrive, + sizeof(wszDrive)/sizeof(wszDrive[0]) - 6, &dwVolumeSerialNumber, &dwMaximumComponetLength, &dwFileSystemFlags, NULL, 0); - strcat (szDrive, " ("); - strncat (szDrive, szPath, 2); - strcat (szDrive, ")"); - strcpy (szPath, szDrive); + strcatW (wszDrive, wszOpenBracket); + lstrcpynW (wszDrive + strlenW(wszDrive), wszPath, 3); + strcatW (wszDrive, wszCloseBracket); + strcpyW (wszPath, wszDrive); } } else @@ -684,25 +686,19 @@ static HRESULT WINAPI ISF_MyComputer_fnG } else { - WCHAR wszPath[MAX_PATH]; /* Complex pidl. Let the child folder do the work */ - strRet->uType = STRRET_CSTR; hr = SHELL32_GetDisplayNameOfChild(iface, pidl, dwFlags, wszPath, MAX_PATH); - if (SUCCEEDED(hr)) - { - if (!WideCharToMultiByte(CP_ACP, 0, wszPath, -1, szPath, MAX_PATH, - NULL, NULL)) - wszPath[0] = '\0'; - } } if (SUCCEEDED (hr)) { strRet->uType = STRRET_CSTR; - lstrcpynA (strRet->u.cStr, szPath, MAX_PATH); + if (!WideCharToMultiByte(CP_ACP, 0, wszPath, -1, strRet->u.cStr, MAX_PATH, + NULL, NULL)) + strRet->u.cStr[0] = '\0'; } - TRACE ("-- (%p)->(%s)\n", This, szPath); + TRACE ("-- (%p)->(%s)\n", This, debugstr_w(wszPath)); return hr; }

1 0