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

Frédéric Delanoy : cmd: Fix some comments.
by Alexandre Julliard July 27, 2011

July 27, 2011

Module: wine Branch: master Commit: 8b73720d4e587c4b4e08d624b2dfd632ce6d3b01 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b73720d4e587c4b4e08d624b… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed Jul 27 02:21:01 2011 +0200 cmd: Fix some comments. --- programs/cmd/wcmd.h | 2 +- programs/cmd/wcmdmain.c | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/programs/cmd/wcmd.h b/programs/cmd/wcmd.h index 1bf0485..939e404 100644 --- a/programs/cmd/wcmd.h +++ b/programs/cmd/wcmd.h @@ -151,7 +151,7 @@ typedef struct _DIRECTORY_STACK /* * Serial nos of builtin commands. These constants must be in step with - * the list of strings defined in WCMD.C, and WCMD_EXIT *must* always be + * the list of strings defined in wcmd.rc, and WCMD_EXIT *must* always be * the last one. * * Yes it *would* be nice to use an enumeration here, but the Resource diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index bd572d2..f3fa129 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -903,8 +903,8 @@ static void init_msvcrt_io_block(STARTUPINFOW* st) if (st_p.cbReserved2 && st_p.lpReserved2) { /* Override the entries for fd 0,1,2 if we happened - * to change those std handles (this depends on the way wcmd sets - * it's new input & output handles) + * to change those std handles (this depends on the way cmd sets + * its new input & output handles) */ size_t sz = max(sizeof(unsigned) + (sizeof(char) + sizeof(HANDLE)) * 3, st_p.cbReserved2); BYTE* ptr = HeapAlloc(GetProcessHeap(), 0, sz); @@ -1661,7 +1661,7 @@ static void WCMD_addCommand(WCHAR *command, int *commandLen, /*************************************************************************** * WCMD_IsEndQuote * - * Checks if the quote pointet to is the end-quote. + * Checks if the quote pointed to is the end-quote. * * Quotes end if: * @@ -1716,7 +1716,7 @@ static BOOL WCMD_IsEndQuote(WCHAR *quote, int quoteIndex) * * Either uses supplied input or * Reads a file from the handle, and then... - * Parse the text buffer, spliting into separate commands + * Parse the text buffer, splitting into separate commands * - unquoted && strings split 2 commands but the 2nd is flagged as * following an && * - ( as the first character just ups the bracket depth @@ -2422,7 +2422,7 @@ int wmain (int argc, WCHAR *argvW[]) } if (opt_c) { - /* If we do a "wcmd /c command", we don't want to allocate a new + /* If we do a "cmd /c command", we don't want to allocate a new * console since the command returns immediately. Rather, we use * the currently allocated input and output handles. This allows * us to pipe to and read from the command interpreter.

1 0

Frédéric Delanoy : dxdiag: Remove dead increment (Clang).
by Alexandre Julliard July 27, 2011

July 27, 2011

Module: wine Branch: master Commit: ffc35d027d558a670a203954d7b50009f1b2d61d URL: http://source.winehq.org/git/wine.git/?a=commit;h=ffc35d027d558a670a203954d… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed Jul 27 02:53:31 2011 +0200 dxdiag: Remove dead increment (Clang). --- programs/dxdiag/output.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/programs/dxdiag/output.c b/programs/dxdiag/output.c index 3fea90b..8470f50 100644 --- a/programs/dxdiag/output.c +++ b/programs/dxdiag/output.c @@ -91,7 +91,6 @@ static BOOL output_text_header(HANDLE hFile, const char *caption) ptr += len; memcpy(ptr, crlf, sizeof(crlf)); - ptr += sizeof(crlf); return WriteFile(hFile, output_buffer, total_len, NULL, NULL); }

1 0

Austin English : wininet/tests: Remove win9x hacks.
by Alexandre Julliard July 27, 2011

July 27, 2011

Module: wine Branch: master Commit: c13f29357a89be9d5df1eed274a4b0a18b7af384 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c13f29357a89be9d5df1eed27… Author: Austin English <austinenglish(a)gmail.com> Date: Tue Jul 26 19:19:14 2011 -0700 wininet/tests: Remove win9x hacks. --- dlls/wininet/tests/internet.c | 14 ++------------ 1 files changed, 2 insertions(+), 12 deletions(-) diff --git a/dlls/wininet/tests/internet.c b/dlls/wininet/tests/internet.c index 0b5f6ea..3b801f3 100644 --- a/dlls/wininet/tests/internet.c +++ b/dlls/wininet/tests/internet.c @@ -41,16 +41,6 @@ static BOOL (WINAPI *pIsDomainLegalCookieDomainW)(LPCWSTR, LPCWSTR); static DWORD (WINAPI *pPrivacyGetZonePreferenceW)(DWORD, DWORD, LPDWORD, LPWSTR, LPDWORD); static DWORD (WINAPI *pPrivacySetZonePreferenceW)(DWORD, DWORD, DWORD, LPCWSTR); -/* Win9x and WinMe don't have lstrcmpW */ -static int strcmp_ww(const WCHAR *str1, const WCHAR *str2) -{ - DWORD len1 = lstrlenW(str1); - DWORD len2 = lstrlenW(str2); - - if (len1 != len2) return 1; - return memcmp(str1, str2, len1 * sizeof(WCHAR)); -} - /* ############################### */ static void test_InternetCanonicalizeUrlA(void) @@ -497,7 +487,7 @@ static void test_null(void) ok( sz == 1 + lstrlenW(buffer) || sz == lstrlenW(buffer), "sz wrong %d\n", sz); /* before XP SP2, buffer is "server; server" */ - ok( !strcmp_ww(szExpect, buffer) || !strcmp_ww(szServer, buffer), "cookie data wrong\n"); + ok( !lstrcmpW(szExpect, buffer) || !lstrcmpW(szServer, buffer), "cookie data wrong\n"); sz = sizeof(buffer); r = InternetQueryOptionA(NULL, INTERNET_OPTION_CONNECTED_STATE, buffer, &sz); @@ -995,7 +985,7 @@ static void test_Option_PerConnectionOption(void) ret = InternetQueryOptionW(NULL, INTERNET_OPTION_PER_CONNECTION_OPTION, &list, &size); ok(ret == TRUE, "InternetQueryOption should've succeeded\n"); - ok(!strcmp_ww(list.pOptions[0].Value.pszValue, proxy_srvW), + ok(!lstrcmpW(list.pOptions[0].Value.pszValue, proxy_srvW), "Retrieved proxy server should've been %s, was: %s\n", wine_dbgstr_w(proxy_srvW), wine_dbgstr_w(list.pOptions[0].Value.pszValue)); ok(list.pOptions[1].Value.dwValue == PROXY_TYPE_PROXY,

1 0

Hans Leidekker : msi: Clean up the database queries.
by Alexandre Julliard July 27, 2011

July 27, 2011

Module: wine Branch: master Commit: e1c2e8828f835e2b38169d5e2448590324da8fb3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e1c2e8828f835e2b38169d5e2… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jul 27 10:53:26 2011 +0200 msi: Clean up the database queries. --- dlls/msi/action.c | 558 +++++++++++++++++++++----------------------------- dlls/msi/alter.c | 6 +- dlls/msi/appsearch.c | 12 +- dlls/msi/classes.c | 133 +++++-------- dlls/msi/custom.c | 16 +- dlls/msi/database.c | 9 +- dlls/msi/dialog.c | 76 +++---- dlls/msi/files.c | 38 ++-- dlls/msi/font.c | 24 +-- dlls/msi/install.c | 8 +- dlls/msi/msipriv.h | 2 +- dlls/msi/package.c | 102 ++++----- dlls/msi/patch.c | 12 +- dlls/msi/table.c | 17 +- dlls/msi/upgrade.c | 12 +- 15 files changed, 432 insertions(+), 593 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e1c2e8828f835e2b38169…

1 0

Hans Leidekker : msi: Make the column and table name parameters of get_column_info const.
by Alexandre Julliard July 27, 2011

July 27, 2011

Module: wine Branch: master Commit: d1b20585003748b5b7f3fc80a1c56f59cbce0e91 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d1b20585003748b5b7f3fc80a… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jul 27 10:53:10 2011 +0200 msi: Make the column and table name parameters of get_column_info const. --- dlls/msi/alter.c | 5 ++--- dlls/msi/create.c | 5 ++--- dlls/msi/delete.c | 5 ++--- dlls/msi/distinct.c | 5 ++--- dlls/msi/insert.c | 28 ++++++---------------------- dlls/msi/join.c | 6 ++---- dlls/msi/msipriv.h | 7 ++++--- dlls/msi/msiquery.c | 14 +++----------- dlls/msi/select.c | 9 +++------ dlls/msi/storages.c | 39 +++++++-------------------------------- dlls/msi/streams.c | 37 ++++++------------------------------- dlls/msi/table.c | 9 ++++----- dlls/msi/update.c | 5 ++--- dlls/msi/where.c | 5 ++--- 14 files changed, 47 insertions(+), 132 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d1b20585003748b5b7f3f…

1 0

Hans Leidekker : msi: Always check the return value of MSI_IterateRecords.
by Alexandre Julliard July 27, 2011

July 27, 2011

Module: wine Branch: master Commit: fe404d1d88568803e2332b4899e01cd99b2d66a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fe404d1d88568803e2332b489… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jul 27 10:53:44 2011 +0200 msi: Always check the return value of MSI_IterateRecords. --- dlls/msi/action.c | 123 +++++++++++++++++++++++++++++++--------------------- dlls/msi/classes.c | 92 +++++++++++++++++++++++++++----------- dlls/msi/files.c | 4 +- dlls/msi/font.c | 8 ++-- 4 files changed, 146 insertions(+), 81 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=fe404d1d88568803e2332…

1 0

Frédéric Delanoy : po: Update French translation.
by Alexandre Julliard July 27, 2011

July 27, 2011

Module: wine Branch: master Commit: 1bc0737dc191a76d8b3a925907fc5bedd4cc9d40 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1bc0737dc191a76d8b3a92590… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Jul 26 20:41:32 2011 +0200 po: Update French translation. --- po/fr.po | 18 ++++++++++++++++-- 1 files changed, 16 insertions(+), 2 deletions(-) diff --git a/po/fr.po b/po/fr.po index cb0c481..220c1e4 100644 --- a/po/fr.po +++ b/po/fr.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2011-07-14 22:15+0100\n" +"PO-Revision-Date: 2011-07-26 20:25+0100\n" "Last-Translator: Frédéric Delanoy <frederic.delanoy(a)gmail.com>\n" "Language-Team: none\n" "Language: French\n" @@ -8270,6 +8270,8 @@ msgid "" "ENDLOCAL ends localization of environment changes in a batch file\n" "which were introduced by a preceding SETLOCAL.\n" msgstr "" +"ENDLOCAL met fin aux modifications locales de l'environnement dans\n" +"un fichier batch, introduites à la suite d'un SETLOCAL préalable.\n" #: cmd.rc:218 msgid "" @@ -8280,6 +8282,15 @@ msgid "" "file, whichever comes first), at which point the previous environment\n" "settings are restored.\n" msgstr "" +"SETLOCAL entame les modifications locales à l'environnement dans un\n" +"fichier batch.\n" +"\n" +"Les modifications apportées à l'environnement après un SETLOCAL sont " +"locales\n" +"au fichier batch, et sont préservées jusqu'au prochain ENDLOCAL (ou à " +"défaut\n" +"jusqu'à la fin du fichier), après quoi les réglages antérieurs de\n" +"l'environnement sont restaurés.\n" #: cmd.rc:221 msgid "" @@ -8321,7 +8332,6 @@ msgstr "" "au système d'exploitation ou au shell où vous avez invoqué cmd.\n" #: cmd.rc:267 -#, fuzzy msgid "" "CMD built-in commands are:\n" "ATTRIB\t\tShow or change DOS file attributes\n" @@ -8369,6 +8379,8 @@ msgstr "" "DEL (ERASE)\tEfface un fichier ou un groupe de fichiers\n" "DIR\t\tListe le contenu d'un répertoire\n" "ECHO\t\tAffiche du texte sur la console\n" +"ENDLOCAL\tMet fin aux modifications locales de l'environnement dans un\n" +"\t\tfichier batch\n" "HELP\t\tAffiche de brefs détails sur l'utilisation d'une commande\n" "MD (MKDIR)\tCrée un répertoire\n" "MORE\t\tAffiche du texte par pages\n" @@ -8381,6 +8393,8 @@ msgstr "" "REN (RENAME)\tRenomme un fichier\n" "RD (RMDIR)\tEfface un répertoire\n" "SET\t\tRègle ou affiche les variables d'environnement\n" +"SETLOCAL\tEntame les modifications locales à l'environnement dans un\n" +"\t\tfichier batch\n" "TIME\t\tRègle ou affiche l'heure système courante\n" "TITLE\t\tRègle le titre de la fenêtre pour la session CMD\n" "TYPE\t\tAffiche le contenu d'un fichier texte\n"

1 0

Austin English : hlink: Remove win9x hacks.
by Alexandre Julliard July 27, 2011

July 27, 2011

Module: wine Branch: master Commit: 5c1febe68ec1562ce45c4939543587d3ba1aba3c URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c1febe68ec1562ce45c49395… Author: Austin English <austinenglish(a)gmail.com> Date: Tue Jul 26 12:23:55 2011 -0700 hlink: Remove win9x hacks. --- dlls/hlink/tests/browse_ctx.c | 12 +----------- 1 files changed, 1 insertions(+), 11 deletions(-) diff --git a/dlls/hlink/tests/browse_ctx.c b/dlls/hlink/tests/browse_ctx.c index 78df8fa..e9293d1 100644 --- a/dlls/hlink/tests/browse_ctx.c +++ b/dlls/hlink/tests/browse_ctx.c @@ -24,16 +24,6 @@ #include "wine/test.h" -/* Win9x and WinMe don't have lstrcmpW */ -static int strcmp_ww(const WCHAR *str1, const WCHAR *str2) -{ - DWORD len1 = lstrlenW(str1); - DWORD len2 = lstrlenW(str2); - - if (len1 != len2) return 1; - return memcmp(str1, str2, len1 * sizeof(WCHAR)); -} - static void test_SetInitialHlink(void) { IHlinkBrowseContext *bc; @@ -68,7 +58,7 @@ static void test_SetInitialHlink(void) hres = IMoniker_GetDisplayName(found_moniker, bindctx, NULL, &found_name); ok(hres == S_OK, "GetDisplayName failed: 0x%08x\n", hres); - ok(!strcmp_ww(found_name, exp_name), "Found display name should have been %s, was: %s\n", wine_dbgstr_w(exp_name), wine_dbgstr_w(found_name)); + ok(!lstrcmpW(found_name, exp_name), "Found display name should have been %s, was: %s\n", wine_dbgstr_w(exp_name), wine_dbgstr_w(found_name)); CoTaskMemFree(exp_name); CoTaskMemFree(found_name);

1 0

Hans Leidekker : msi: Store table and column names in the string table.
by Alexandre Julliard July 27, 2011

July 27, 2011

Module: wine Branch: master Commit: d38ace6d4cf31d409f64e2ce930fbfe1f4c9a2a8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d38ace6d4cf31d409f64e2ce9… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jul 27 10:52:48 2011 +0200 msi: Store table and column names in the string table. --- dlls/msi/table.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/msi/table.c b/dlls/msi/table.c index aec257f..5bc1e3d 100644 --- a/dlls/msi/table.c +++ b/dlls/msi/table.c @@ -728,6 +728,7 @@ static UINT get_tablecolumns( MSIDATABASE *db, LPCWSTR szTableName, MSICOLUMNINF UINT msi_create_table( MSIDATABASE *db, LPCWSTR name, column_info *col_info, MSICONDITION persistent, MSITABLE **table_ret) { + enum StringPersistence string_persistence = (persistent) ? StringPersistent : StringNonPersistent; UINT r, nField; MSIVIEW *tv = NULL; MSIRECORD *rec = NULL; @@ -767,9 +768,12 @@ UINT msi_create_table( MSIDATABASE *db, LPCWSTR name, column_info *col_info, for( i = 0, col = col_info; col; i++, col = col->next ) { - table->colinfo[ i ].tablename = strdupW( col->table ); + UINT table_id = msi_addstringW( db->strings, col->table, -1, 1, string_persistence ); + UINT col_id = msi_addstringW( db->strings, col->column, -1, 1, string_persistence ); + + table->colinfo[ i ].tablename = msi_string_lookup_id( db->strings, table_id ); table->colinfo[ i ].number = i + 1; - table->colinfo[ i ].colname = strdupW( col->column ); + table->colinfo[ i ].colname = msi_string_lookup_id( db->strings, col_id ); table->colinfo[ i ].type = col->type; table->colinfo[ i ].offset = 0; table->colinfo[ i ].ref_count = 0;

1 0

Austin English : comctl32/tests: Remove win9x hacks.
by Alexandre Julliard July 27, 2011

July 27, 2011

Module: wine Branch: master Commit: fbb0e180511176e1c21b05c4e651e966f693afe3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fbb0e180511176e1c21b05c4e… Author: Austin English <austinenglish(a)gmail.com> Date: Tue Jul 26 12:31:07 2011 -0700 comctl32/tests: Remove win9x hacks. --- dlls/comctl32/tests/listview.c | 16 ++++------------ 1 files changed, 4 insertions(+), 12 deletions(-) diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 850c717..765992e 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -1323,8 +1323,7 @@ static void test_columns(void) /* Check its width */ rc = SendMessageA(hwnd, LVM_GETCOLUMNWIDTH, 0, 0); - ok(rc == 10 || broken(rc == 0) /* win9x */, - "Inserting column with no mask failed to set width to 10 with %d\n", rc); + ok(rc == 10, "Inserting column with no mask failed to set width to 10 with %d\n", rc); DestroyWindow(hwnd); @@ -3919,7 +3918,7 @@ static void test_notifyformat(void) r = SendMessage(hwnd, LVM_GETUNICODEFORMAT, 0, 0); expect(0, r); r = SendMessage(header, HDM_GETUNICODEFORMAT, 0, 0); - ok( r == 1 || broken(r == 0), /* win9x */ "Expected 1, got %d\n", r ); + ok( r == 1, "Expected 1, got %d\n", r ); r = SendMessage(hwnd, WM_NOTIFYFORMAT, 0, NF_QUERY); ok(r != 0, "Expected valid format\n"); @@ -3929,7 +3928,7 @@ static void test_notifyformat(void) r = SendMessage(hwnd, LVM_GETUNICODEFORMAT, 0, 0); expect(1, r); r = SendMessage(header, HDM_GETUNICODEFORMAT, 0, 0); - ok( r == 1 || broken(r == 0), /* win9x */ "Expected 1, got %d\n", r ); + ok( r == 1, "Expected 1, got %d\n", r ); notifyFormat = NFR_ANSI; r = SendMessage(hwnd, WM_NOTIFYFORMAT, 0, NF_REQUERY); @@ -3937,17 +3936,10 @@ static void test_notifyformat(void) r = SendMessage(hwnd, LVM_GETUNICODEFORMAT, 0, 0); expect(0, r); r = SendMessage(header, HDM_GETUNICODEFORMAT, 0, 0); - ok( r == 1 || broken(r == 0), /* win9x */ "Expected 1, got %d\n", r ); + ok( r == 1, "Expected 1, got %d\n", r ); DestroyWindow(hwnd); - /* try different unicode window combination and defaults */ - if (!GetModuleHandleW(NULL)) - { - win_skip("Additional notify format tests are incompatible with Win9x\n"); - return; - } - hwndparentW = create_parent_window(TRUE); ok(IsWindow(hwndparentW), "Unicode parent creation failed\n"); if (!IsWindow(hwndparentW)) return;

1 0