wine-commits June 2017

wine-commits@winehq.org

2 participants
595 discussions

Hugh McMaster : regedit: Use the correct mask flags with LVM_GETNEXTITEM.
by Alexandre Julliard 16 Jun '17

16 Jun '17

Module: wine Branch: master Commit: 7f76cf6c26012bc6ad9488e96b08133f86f148c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f76cf6c26012bc6ad9488e96… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Fri Jun 16 13:06:50 2017 +0000 regedit: Use the correct mask flags with LVM_GETNEXTITEM. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/framewnd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/regedit/framewnd.c b/programs/regedit/framewnd.c index 0503dc8..539be96 100644 --- a/programs/regedit/framewnd.c +++ b/programs/regedit/framewnd.c @@ -187,7 +187,7 @@ static void UpdateMenuItems(HMENU hMenu) { selection = (HTREEITEM)SendMessageW(hwndTV, TVM_GETNEXTITEM, TVGN_CARET, 0); keyName = GetItemPath(hwndTV, selection, &hRootKey); index = SendMessageW(g_pChildWnd->hListWnd, LVM_GETNEXTITEM, -1, - MAKELPARAM(LVIS_FOCUSED | LVIS_SELECTED, 0)); + MAKELPARAM(LVNI_FOCUSED | LVNI_SELECTED, 0)); update_expand_or_collapse_item(hwndTV, selection, hMenu); update_modify_items(hMenu, index);

1 0

Hugh McMaster : regedit: Allow the deletion of registry keys beginning with a lowercase 'H'.
by Alexandre Julliard 16 Jun '17

16 Jun '17

Module: wine Branch: master Commit: 1f08ee245366958147789ec2ae0c7d80d03ac9b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f08ee245366958147789ec2a… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Fri Jun 16 13:06:41 2017 +0000 regedit: Allow the deletion of registry keys beginning with a lowercase 'H'. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/regproc.c | 2 +- programs/regedit/tests/regedit.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c index 2ce77c4..e08ffa6 100644 --- a/programs/regedit/regproc.c +++ b/programs/regedit/regproc.c @@ -624,7 +624,7 @@ static WCHAR *delete_key_state(struct parser *parser, WCHAR *pos) { WCHAR *p = pos; - if (*p == 'H') + if (*p == 'H' || *p == 'h') delete_registry_key(p); set_state(parser, LINE_START); diff --git a/programs/regedit/tests/regedit.c b/programs/regedit/tests/regedit.c index 49e2396..ec488bf 100644 --- a/programs/regedit/tests/regedit.c +++ b/programs/regedit/tests/regedit.c @@ -1238,13 +1238,13 @@ static void test_key_creation_and_deletion(void) "[-HKEY_current_USER\\" KEY_BASE "\\sUBKEY3A]\n\n" "[-hKeY_cUrReNt_UsEr\\" KEY_BASE "\\sUbKeY3B]\n\n"); verify_key_nonexist(hkey, "Subkey3a"); - todo_wine verify_key_nonexist(hkey, "Subkey3b"); + verify_key_nonexist(hkey, "Subkey3b"); lr = RegCloseKey(hkey); ok(lr == ERROR_SUCCESS, "RegCloseKey failed: got %d, expected 0\n", lr); lr = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE); - todo_wine ok(lr == ERROR_SUCCESS, "RegDeleteKeyA failed: got %d, expected 0\n", lr); + ok(lr == ERROR_SUCCESS, "RegDeleteKeyA failed: got %d, expected 0\n", lr); } static void test_value_deletion(void) @@ -1296,7 +1296,7 @@ static void test_value_deletion(void) ok(lr == ERROR_SUCCESS, "RegCloseKey failed: got %d, expected 0\n", lr); lr = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE); - todo_wine ok(lr == ERROR_SUCCESS, "RegDeleteKeyA failed: got %d, expected 0\n", lr); + ok(lr == ERROR_SUCCESS, "RegDeleteKeyA failed: got %d, expected 0\n", lr); } START_TEST(regedit)

1 0

Hugh McMaster : regedit: Use a case insensitive comparison when parsing registry classes from registry file versions 4 and 5.
by Alexandre Julliard 16 Jun '17

16 Jun '17

Module: wine Branch: master Commit: f535341d2ba9c18cdacb561a38152d3215af305f URL: http://source.winehq.org/git/wine.git/?a=commit;h=f535341d2ba9c18cdacb561a3… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Fri Jun 16 13:06:31 2017 +0000 regedit: Use a case insensitive comparison when parsing registry classes from registry file versions 4 and 5. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/regproc.c | 2 +- programs/regedit/tests/regedit.c | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c index 416938d..2ce77c4 100644 --- a/programs/regedit/regproc.c +++ b/programs/regedit/regproc.c @@ -392,7 +392,7 @@ static HKEY parse_key_name(WCHAR *key_name, WCHAR **key_path) for (i = 0; i < ARRAY_SIZE(reg_class_keys); i++) { int len = lstrlenW(reg_class_namesW[i]); - if (!strncmpW(key_name, reg_class_namesW[i], len) && + if (!strncmpiW(key_name, reg_class_namesW[i], len) && (key_name[len] == 0 || key_name[len] == '\\')) { return reg_class_keys[i]; diff --git a/programs/regedit/tests/regedit.c b/programs/regedit/tests/regedit.c index 254073b..49e2396 100644 --- a/programs/regedit/tests/regedit.c +++ b/programs/regedit/tests/regedit.c @@ -1231,20 +1231,20 @@ static void test_key_creation_and_deletion(void) exec_import_str("REGEDIT4\n\n" "[hkey_CURRENT_user\\" KEY_BASE "\\Subkey3a]\n\n" "[HkEy_CuRrEnT_uSeR\\" KEY_BASE "\\SuBkEy3b]\n\n"); - todo_wine verify_key_exist(hkey, "Subkey3a"); - todo_wine verify_key_exist(hkey, "Subkey3b"); + verify_key_exist(hkey, "Subkey3a"); + verify_key_exist(hkey, "Subkey3b"); exec_import_str("REGEDIT4\n\n" "[-HKEY_current_USER\\" KEY_BASE "\\sUBKEY3A]\n\n" "[-hKeY_cUrReNt_UsEr\\" KEY_BASE "\\sUbKeY3B]\n\n"); verify_key_nonexist(hkey, "Subkey3a"); - verify_key_nonexist(hkey, "Subkey3b"); + todo_wine verify_key_nonexist(hkey, "Subkey3b"); lr = RegCloseKey(hkey); ok(lr == ERROR_SUCCESS, "RegCloseKey failed: got %d, expected 0\n", lr); lr = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE); - ok(lr == ERROR_SUCCESS, "RegDeleteKeyA failed: got %d, expected 0\n", lr); + todo_wine ok(lr == ERROR_SUCCESS, "RegDeleteKeyA failed: got %d, expected 0\n", lr); } static void test_value_deletion(void) @@ -1296,7 +1296,7 @@ static void test_value_deletion(void) ok(lr == ERROR_SUCCESS, "RegCloseKey failed: got %d, expected 0\n", lr); lr = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE); - ok(lr == ERROR_SUCCESS, "RegDeleteKeyA failed: got %d, expected 0\n", lr); + todo_wine ok(lr == ERROR_SUCCESS, "RegDeleteKeyA failed: got %d, expected 0\n", lr); } START_TEST(regedit)

1 0

Hugh McMaster : regedit: Free the memory used by the REG_DWORD and hex data types after saving the registry value.
by Alexandre Julliard 16 Jun '17

16 Jun '17

Module: wine Branch: master Commit: 8504a1563de17f7c93023cf317a7bccde7718d17 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8504a1563de17f7c93023cf31… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Fri Jun 16 13:06:23 2017 +0000 regedit: Free the memory used by the REG_DWORD and hex data types after saving the registry value. We use a BOOL to handle all hex types, including those that are undefined (e.g.0x100). Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/regproc.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c index f7e8d2a..416938d 100644 --- a/programs/regedit/regproc.c +++ b/programs/regedit/regproc.c @@ -163,6 +163,7 @@ struct parser DWORD data_type; /* data type */ void *data; /* value data */ DWORD data_size; /* size of the data (in bytes) */ + BOOL hex_type; /* parsing a hex data type */ enum parser_state state; /* current parser state */ }; @@ -322,6 +323,7 @@ static BOOL parse_data_type(struct parser *parser, WCHAR **line) return FALSE; parser->data_type = val; + parser->hex_type = TRUE; *line = end + 2; } return TRUE; @@ -826,6 +828,13 @@ static WCHAR *set_value_state(struct parser *parser, WCHAR *pos) RegSetValueExW(parser->hkey, parser->value_name, 0, parser->data_type, parser->data, parser->data_size); + if (parser->data_type == REG_DWORD || parser->hex_type) + { + HeapFree(GetProcessHeap(), 0, parser->data); + parser->data = NULL; + parser->hex_type = FALSE; + } + if (parser->reg_version == REG_VERSION_31) set_state(parser, PARSE_WIN31_LINE); else @@ -1463,6 +1472,7 @@ BOOL import_registry_file(FILE *reg_file) parser.data_type = 0; parser.data = NULL; parser.data_size = 0; + parser.hex_type = FALSE; parser.state = HEADER; pos = parser.two_wchars;

1 0

Hugh McMaster : regedit: Export hex data types without warning about unsupported data types.
by Alexandre Julliard 16 Jun '17

16 Jun '17

Module: wine Branch: master Commit: a1924ae2da1d86000f61eefed5e59150a74468ab URL: http://source.winehq.org/git/wine.git/?a=commit;h=a1924ae2da1d86000f61eefed… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Fri Jun 16 13:06:11 2017 +0000 regedit: Export hex data types without warning about unsupported data types. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/regproc.c | 49 ++-------------------------------------------- 1 file changed, 2 insertions(+), 47 deletions(-) diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c index e977c1a..f7e8d2a 100644 --- a/programs/regedit/regproc.c +++ b/programs/regedit/regproc.c @@ -400,46 +400,6 @@ static HKEY parse_key_name(WCHAR *key_name, WCHAR **key_path) return 0; } -/* Registry data types */ -static const WCHAR type_none[] = {'R','E','G','_','N','O','N','E',0}; -static const WCHAR type_sz[] = {'R','E','G','_','S','Z',0}; -static const WCHAR type_expand_sz[] = {'R','E','G','_','E','X','P','A','N','D','_','S','Z',0}; -static const WCHAR type_binary[] = {'R','E','G','_','B','I','N','A','R','Y',0}; -static const WCHAR type_dword[] = {'R','E','G','_','D','W','O','R','D',0}; -static const WCHAR type_dword_le[] = {'R','E','G','_','D','W','O','R','D','_','L','I','T','T','L','E','_','E','N','D','I','A','N',0}; -static const WCHAR type_dword_be[] = {'R','E','G','_','D','W','O','R','D','_','B','I','G','_','E','N','D','I','A','N',0}; -static const WCHAR type_multi_sz[] = {'R','E','G','_','M','U','L','T','I','_','S','Z',0}; - -static const struct -{ - DWORD type; - const WCHAR *name; -} -type_rels[] = -{ - {REG_NONE, type_none}, - {REG_SZ, type_sz}, - {REG_EXPAND_SZ, type_expand_sz}, - {REG_BINARY, type_binary}, - {REG_DWORD, type_dword}, - {REG_DWORD_LITTLE_ENDIAN, type_dword_le}, - {REG_DWORD_BIG_ENDIAN, type_dword_be}, - {REG_MULTI_SZ, type_multi_sz}, -}; - -static const WCHAR *reg_type_to_wchar(DWORD type) -{ - int i, array_size = ARRAY_SIZE(type_rels); - - for (i = 0; i < array_size; i++) - { - if (type == type_rels[i].type) - return type_rels[i].name; - } - return NULL; -} - - static void close_key(struct parser *parser) { if (parser->hkey) @@ -1308,16 +1268,11 @@ static void export_hkey(FILE *file, HKEY key, break; } - default: - { - output_message(STRING_UNSUPPORTED_TYPE, reg_type_to_wchar(value_type), *reg_key_name_buf); - output_message(STRING_EXPORT_AS_BINARY, *val_name_buf); - } - /* falls through */ + case REG_NONE: case REG_EXPAND_SZ: case REG_MULTI_SZ: - /* falls through */ case REG_BINARY: + default: REGPROC_export_binary(line_buf, line_buf_size, &line_len, value_type, *val_buf, val_size1, unicode); } REGPROC_write_line(file, *line_buf, unicode);

1 0

Hugh McMaster : regedit: Remove an unused #define.
by Alexandre Julliard 16 Jun '17

16 Jun '17

Module: wine Branch: master Commit: 300df08e703be914384b95b6adfcfba5ad2a466d URL: http://source.winehq.org/git/wine.git/?a=commit;h=300df08e703be914384b95b6a… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Fri Jun 16 13:06:01 2017 +0000 regedit: Remove an unused #define. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/regproc.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c index 50564c8..e977c1a 100644 --- a/programs/regedit/regproc.c +++ b/programs/regedit/regproc.c @@ -277,8 +277,6 @@ static BYTE *convert_hex_csv_to_hex(WCHAR *str, DWORD *size) return data; } -#define REG_UNKNOWN_TYPE 99 - /****************************************************************************** * Parses the data type of the registry value being imported and modifies * the input parameter to skip the string representation of the data type.

1 0

Julian Rüger : po: Update German translation.
by Alexandre Julliard 16 Jun '17

16 Jun '17

Module: wine Branch: master Commit: 2159e65d7038d7dc87a55570f72515dc7b89d986 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2159e65d7038d7dc87a55570f… Author: Julian Rüger <jr98(a)gmx.net> Date: Fri Jun 16 13:50:38 2017 +0200 po: Update German translation. Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/de.po | 59 +++++++++++++++-------------------------------------------- 1 file changed, 15 insertions(+), 44 deletions(-) diff --git a/po/de.po b/po/de.po index f9dc0dc..ef36881 100644 --- a/po/de.po +++ b/po/de.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: 2017-03-06 16:05+0100\n" +"PO-Revision-Date: 2017-06-16 13:49+0200\n" "Last-Translator: Julian Rüger\n" "Language-Team: German\n" "Language: de\n" @@ -3708,7 +3708,7 @@ msgstr "Array-Objekt erwartet" #: ../../include/wine/wine_common_ver.rc:129 msgid "Wine kernel DLL" -msgstr "" +msgstr "Wine-Kernel-DLL" #: ../../include/wine/wine_common_ver.rc:134 winemac.rc:32 wineboot.rc:42 msgid "Wine" @@ -11839,17 +11839,12 @@ msgid "&About Registry Editor" msgstr "&Über den Registrierungs-Editor" #: regedit.rc:89 regedit.rc:96 regedit.rc:230 -#, fuzzy -#| msgctxt "object state" -#| msgid "expanded" msgid "Expand" -msgstr "ausgeklappt" +msgstr "Erweitern" #: regedit.rc:134 regedit.rc:233 -#, fuzzy -#| msgid "Modify Binary Data..." msgid "Modify &Binary Data..." -msgstr "Binäre Daten ändern..." +msgstr "&Binäre Daten ändern..." #: regedit.rc:267 msgid "Export registry" @@ -11948,14 +11943,11 @@ msgid "Contains commands for accessing frequently used keys" msgstr "Befehle zum Zugriff auf häufig benutzte Schlüssel" #: regedit.rc:163 -#, fuzzy -#| msgid "" -#| "Contains commands for displaying help and information about registry " -#| "editor" msgid "" "Contains commands for displaying Help and information about Registry Editor" msgstr "" -"Befehle zum Anzeigen der Hilfe oder von Informationen über das Programm" +"Befehle zum Anzeigen der Hilfe oder von Informationen über den " +"Registrierungs-Editor" #: regedit.rc:164 msgid "Contains commands for creating new keys or values" @@ -12153,10 +12145,8 @@ msgid "regedit: Unrecognized escape sequence [\\%1!c!]\n" msgstr "regedit: Unbekannte Escape-Sequenz [\\%1!c!]\n" #: regedit.rc:420 -#, fuzzy -#| msgid "regedit: Unsupported registry data type [%1]\n" msgid "regedit: Unsupported registry data type [0x%1!x!]\n" -msgstr "regedit: Nicht unterstützter Registrierungsdatentyp [%1]\n" +msgstr "regedit: Nicht unterstützter Registrierungsdatentyp [0x%1!x!]\n" #: regedit.rc:421 msgid "regedit: Unexpected end of line in '%1'.\n" @@ -12200,14 +12190,10 @@ msgid "regedit: Unable to delete the registry class '%1'.\n" msgstr "regedit: Die Registrierungsklasse '%1' konnte nicht gelöscht werden.\n" #: regedit.rc:431 -#, fuzzy -#| msgid "regedit: The line '%1' was not recognized.\n" msgid "regedit: The line contains invalid syntax.\n" -msgstr "regedit: Zeile '%1' wurde nicht erkannt.\n" +msgstr "regedit: Die Zeile enthält ungültige Syntax.\n" #: regedit.rc:187 -#, fuzzy -#| msgid "Quits the registry editor" msgid "Quits the Registry Editor" msgstr "Beendet den Registrierungs-Editor" @@ -12224,10 +12210,8 @@ msgid "Shows or hides the status bar" msgstr "Blendet die Statusleiste ein oder aus" #: regedit.rc:191 -#, fuzzy -#| msgid "Change position of split between two panes" msgid "Changes the position of the split between two panes" -msgstr "Ändert die Position das Fensterteilers" +msgstr "Ändert die Position des Fensterteilers" #: regedit.rc:192 msgid "Refreshes the window" @@ -12270,10 +12254,8 @@ msgid "Adds a new binary value" msgstr "Fügt einen neuen Binärwert hinzu" #: regedit.rc:174 -#, fuzzy -#| msgid "Adds a new binary value" msgid "Adds a new 32-bit value" -msgstr "Fügt einen neuen Binärwert hinzu" +msgstr "Fügt einen neuen 32-Bit-Wert hinzu" #: regedit.rc:177 msgid "Imports a text file into the registry" @@ -12288,10 +12270,8 @@ msgid "Prints all or part of the registry" msgstr "Druckt Teile oder die gesamte Registry aus" #: regedit.rc:181 -#, fuzzy -#| msgid "Registry Editor" msgid "Opens Registry Editor Help" -msgstr "Registrierungs-Editor" +msgstr "Hilfe zum Registrierungs-Editor öffnen" #: regedit.rc:182 msgid "Displays program information, version number and copyright" @@ -12334,26 +12314,20 @@ msgid "Unable to query the registry key '%1'." msgstr "Der Schlüssel '%1' konnte nicht abgefragt werden." #: regedit.rc:170 -#, fuzzy -#| msgid "Modifies the value's data" msgid "Modifies the value's data in binary form" -msgstr "Ändert die Daten eines Wertes" +msgstr "Ändert die Daten eines Wertes in Binärform" #: regedit.rc:175 msgid "Adds a new multi-string value" msgstr "Fügt eine neue mehrteilige Zeichenfolge hinzu" #: regedit.rc:198 -#, fuzzy -#| msgid "Exports selected branch of the registry to a text file" msgid "Exports the selected branch of the registry to a text file" msgstr "Exportiert den ausgewählten Zweig der Registrierung in eine Textdatei" #: regedit.rc:176 -#, fuzzy -#| msgid "Adds a new string value" msgid "Adds a new expandable string value" -msgstr "Fügt eine neue Zeichenfolge hinzu" +msgstr "Fügt eine neue erweiterbare Zeichenfolge hinzu" #: regedit.rc:212 msgid "Confirm Key Delete" @@ -12368,14 +12342,11 @@ msgstr "" #: regedit.rc:199 msgid "Expands or collapses the selected node" -msgstr "" +msgstr "Erweitert oder reduziert den ausgewählten Knoten" #: regedit.rc:231 -#, fuzzy -#| msgctxt "object state" -#| msgid "collapsed" msgid "Collapse" -msgstr "eingeklappt" +msgstr "Reduzieren" #: regsvr32.rc:32 msgid ""

1 0

Marcin Mikołajczak : po: Updated Polish translation.
by Alexandre Julliard 16 Jun '17

16 Jun '17

Module: wine Branch: master Commit: 1e643a5203081e9f7387f598f6bad5eadabaea60 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e643a5203081e9f7387f598f… Author: Marcin Mikołajczak <me(a)m4sk.in> Date: Thu Jun 15 22:42:21 2017 +0200 po: Updated Polish translation. Signed-off-by: Marcin Mikołajczak <me(a)m4sk.in> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/pl.po | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/po/pl.po b/po/pl.po index 7a71c24..6ca4cba 100644 --- a/po/pl.po +++ b/po/pl.po @@ -8,7 +8,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: 2017-06-03 20:40+0200\n" +"PO-Revision-Date: 2017-06-15 22:41+0200\n" "Last-Translator: Marcin Mikołajczak <me(a)m4sk.in>\n" "Language-Team: Polish <kde-i18n-doc(a)kde.org>\n" "Language: pl\n" @@ -6821,7 +6821,7 @@ msgstr "ścieżka %s nie została odnaleziona" #: msi.rc:32 msgid "insert disk %s" -msgstr "włóż dysk '%s'" +msgstr "włóż dysk %s" #: msi.rc:33 msgid "" @@ -6887,7 +6887,7 @@ msgstr "" #: msi.rc:60 msgid "enter which folder contains %s" -msgstr "podaj, który katalog zawiera '%s'" +msgstr "wprowadź folder zawierający %s" #: msi.rc:61 msgid "install source for feature missing" @@ -6903,7 +6903,7 @@ msgstr "funkcja z:" #: msi.rc:64 msgid "choose which folder contains %s" -msgstr "wybierz, który katalog zawiera '%s'" +msgstr "wybierz folder zawierający '%s'" #: msrle32.rc:31 msgid "Wine MS-RLE video codec" @@ -8624,7 +8624,7 @@ msgstr "Pokaż wszystko" #: winemac.rc:37 msgid "Quit %@" -msgstr " Zakończ %@" +msgstr "Zakończ %@" #: winemac.rc:38 msgid "Quit" @@ -11720,11 +11720,11 @@ msgstr "Wyszukiwanie zakończone. Liczba pasujących wyrażeń: %1!d!\n" #: reg.rc:61 msgid "reg: Invalid syntax. " -msgstr "reg: Nieprawidłowa składnia." +msgstr "reg: Nieprawidłowa składnia. " #: reg.rc:62 msgid "reg: Invalid option [%1]. " -msgstr "reg: Nieprawidłowa opcja [%1]." +msgstr "reg: Nieprawidłowa opcja [%1]. " #: reg.rc:63 msgid "Type \"REG /?\" for help.\n" @@ -11811,10 +11811,8 @@ msgid "Expand" msgstr "Rozwiń" #: regedit.rc:134 regedit.rc:233 -#, fuzzy -#| msgid "Modify Binary Data..." msgid "Modify &Binary Data..." -msgstr "Zmień dane binarne..." +msgstr "Zmień dane &binarne..." #: regedit.rc:267 msgid "Export registry" @@ -12311,7 +12309,7 @@ msgstr "" #: regedit.rc:199 msgid "Expands or collapses the selected node" -msgstr "" +msgstr "Rozwija lub zwija zaznaczony węzeł" #: regedit.rc:231 msgid "Collapse" @@ -13535,7 +13533,7 @@ msgstr "" #: winecfg.rc:236 msgid "A&dd..." -msgstr "&Dodaj" +msgstr "&Dodaj…" #: winecfg.rc:238 msgid "Aut&odetect"

1 0

Alexandre Julliard : ws2_32: Use socklen_t where appropriate.
by Alexandre Julliard 16 Jun '17

16 Jun '17

Module: wine Branch: master Commit: 92b2172038ed23830a399d18b7523dc37fda1e92 URL: http://source.winehq.org/git/wine.git/?a=commit;h=92b2172038ed23830a399d18b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 16 13:52:38 2017 +0200 ws2_32: Use socklen_t where appropriate. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 7a768ac..f212ec2 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -3053,7 +3053,7 @@ static BOOL WINAPI WS2_TransmitFile( SOCKET s, HANDLE h, DWORD file_bytes, DWORD DWORD flags ) { union generic_unix_sockaddr uaddr; - unsigned int uaddrlen = sizeof(uaddr); + socklen_t uaddrlen = sizeof(uaddr); struct ws2_transmitfile_async *wsa; NTSTATUS status; int fd; @@ -7720,8 +7720,8 @@ static int WS2_recv_base( SOCKET s, LPWSABUF lpBuffers, DWORD dwBufferCount, { /* It's invalid to receive OOB data from an OOBINLINED socket * as OOB data is turned into normal data. */ - i = sizeof(n); - if (!getsockopt(fd, SOL_SOCKET, SO_OOBINLINE, (char*) &n, &i) && n) + socklen_t len = sizeof(n); + if (!getsockopt(fd, SOL_SOCKET, SO_OOBINLINE, (char*) &n, &len) && n) { err = WSAEINVAL; goto error;

1 0

Alexandre Julliard : include: Make socklen_t a define to avoid conflicting typedefs.
by Alexandre Julliard 16 Jun '17

16 Jun '17

Module: wine Branch: master Commit: dfcf4910e53503196a771946e332196d3c3eb1af URL: http://source.winehq.org/git/wine.git/?a=commit;h=dfcf4910e53503196a771946e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 16 13:46:22 2017 +0200 include: Make socklen_t a define to avoid conflicting typedefs. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/ws2tcpip.h | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/include/ws2tcpip.h b/include/ws2tcpip.h index 934c727..337383b 100644 --- a/include/ws2tcpip.h +++ b/include/ws2tcpip.h @@ -54,7 +54,11 @@ typedef struct WS(addrinfoW) struct WS(addrinfoW)* ai_next; } ADDRINFOW, *PADDRINFOW; -typedef int WS(socklen_t); +#ifdef USE_WS_PREFIX +typedef int WS_socklen_t; +#else +#define socklen_t int /* avoid conflicts with the system's socklen_t typedef */ +#endif typedef ADDRINFOA ADDRINFO, *LPADDRINFO;

1 0

← Newer
1
...
23
24
25
26
27
28
29
...
60
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits June 2017