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

James Hawkins : msi: Set the source path for uncompressed files when loading the file.
by Alexandre Julliard June 11, 2008

June 11, 2008

Module: wine Branch: master Commit: d3cc801da113571be945e485e0d1bc1fa7be4931 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d3cc801da113571be945e485e… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Tue Jun 10 17:35:10 2008 -0500 msi: Set the source path for uncompressed files when loading the file. --- dlls/msi/action.c | 19 +++++++++++++++++++ dlls/msi/files.c | 28 +++------------------------- 2 files changed, 22 insertions(+), 25 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 4b20d74..f319427 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -1464,6 +1464,25 @@ static UINT load_file(MSIRECORD *row, LPVOID param) file->IsCompressed = package->WordCount & MSIWORDCOUNT_COMPRESSED; } + if (!file->IsCompressed) + { + LPWSTR p, path; + + p = resolve_folder(package, file->Component->Directory, + TRUE, FALSE, TRUE, NULL); + path = build_directory_name(2, p, file->ShortName); + + if (file->LongName && + GetFileAttributesW(path) == INVALID_FILE_ATTRIBUTES) + { + msi_free(path); + path = build_directory_name(2, p, file->LongName); + } + + file->SourcePath = path; + msi_free(p); + } + load_file_hash(package, file); TRACE("File Loaded (%s)\n",debugstr_w(file->File)); diff --git a/dlls/msi/files.c b/dlls/msi/files.c index ae7f3f0..64869b1 100644 --- a/dlls/msi/files.c +++ b/dlls/msi/files.c @@ -459,26 +459,6 @@ done: return ret; } -static VOID set_file_source(MSIPACKAGE* package, MSIFILE* file, LPCWSTR path) -{ - if (!file->IsCompressed) - { - LPWSTR p, path; - p = resolve_folder(package, file->Component->Directory, TRUE, FALSE, TRUE, NULL); - path = build_directory_name(2, p, file->ShortName); - if (file->LongName && - INVALID_FILE_ATTRIBUTES == GetFileAttributesW( path )) - { - msi_free(path); - path = build_directory_name(2, p, file->LongName); - } - file->SourcePath = path; - msi_free(p); - } - else - file->SourcePath = build_directory_name(2, path, file->File); -} - void msi_free_media_info( MSIMEDIAINFO *mi ) { msi_free( mi->disk_prompt ); @@ -847,13 +827,11 @@ UINT ACTION_InstallFiles(MSIPACKAGE *package) } } - set_file_source(package, file, mi->source); - - TRACE("file paths %s to %s\n",debugstr_w(file->SourcePath), - debugstr_w(file->TargetPath)); - if (!file->IsCompressed) { + TRACE("file paths %s to %s\n", debugstr_w(file->SourcePath), + debugstr_w(file->TargetPath)); + msi_file_update_ui(package, file, szInstallFiles); rc = copy_install_file(file); if (rc != ERROR_SUCCESS)

1 0

Zac Brown : dsound/tests: Improve test for IDirectSound8_CreateSoundBuffer.
by Alexandre Julliard June 11, 2008

June 11, 2008

Module: wine Branch: master Commit: e4ff8a0c0a346bd636709d8e286a08b6c8005144 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e4ff8a0c0a346bd636709d8e2… Author: Zac Brown <zac(a)zacbrown.org> Date: Tue Jun 10 13:08:33 2008 -0700 dsound/tests: Improve test for IDirectSound8_CreateSoundBuffer. --- dlls/dsound/tests/dsound8.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/dsound/tests/dsound8.c b/dlls/dsound/tests/dsound8.c index e08767e..024dbc1 100644 --- a/dlls/dsound/tests/dsound8.c +++ b/dlls/dsound/tests/dsound8.c @@ -432,7 +432,10 @@ static HRESULT test_primary8(LPGUID lpGuid) "DSERR_INVALIDPARAM, returned: rc=%s,dsbo=%p\n", DXGetErrorString8(rc),primary); - /* DSOUND: Error: Invalid buffer description pointer */ + ZeroMemory(&bufdesc, sizeof(bufdesc)); + bufdesc.dwSize = sizeof(DSBUFFERDESC); + + /* DSOUND: Error: Invalid dsound buffer interface pointer */ rc=IDirectSound8_CreateSoundBuffer(dso,&bufdesc,0,NULL); ok(rc==DSERR_INVALIDPARAM && primary==0, "IDirectSound8_CreateSoundBuffer() should have failed: rc=%s,"

1 0

James Hawkins : msi: Load folders first.
by Alexandre Julliard June 11, 2008

June 11, 2008

Module: wine Branch: master Commit: dbbd5ca73604755326393af6a53209e8c91fdd62 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dbbd5ca73604755326393af6a… Author: James Hawkins <truiken(a)gmail.com> Date: Tue Jun 10 17:33:29 2008 -0500 msi: Load folders first. --- dlls/msi/action.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index ee9a13b..4b20d74 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -1601,10 +1601,10 @@ static UINT ACTION_CostInitialize(MSIPACKAGE *package) MSI_SetPropertyW(package, szCosting, szZero); MSI_SetPropertyW(package, cszRootDrive, c_colon); + load_all_folders( package ); load_all_components( package ); load_all_features( package ); load_all_files( package ); - load_all_folders( package ); return ERROR_SUCCESS; }

1 0

Michael Karcher : xcopy: Add German translation.
by Alexandre Julliard June 11, 2008

June 11, 2008

Module: wine Branch: master Commit: 95f3b948000254db4554e5980cf0fc4308f86bd9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=95f3b948000254db4554e5980… Author: Michael Karcher <karcher(a)physik.fu-berlin.de> Date: Tue Jun 10 19:20:16 2008 +0200 xcopy: Add German translation. --- programs/xcopy/De.rc | 79 ++++++++++++++++++++++++++++++++++++++++++++++++ programs/xcopy/rsrc.rc | 1 + 2 files changed, 80 insertions(+), 0 deletions(-) diff --git a/programs/xcopy/De.rc b/programs/xcopy/De.rc new file mode 100644 index 0000000..020577d --- /dev/null +++ b/programs/xcopy/De.rc @@ -0,0 +1,79 @@ +/* + * XCOPY - Wine-compatible xcopy program + * German language support + * + * Copyright (C) 2007 J. Edmeades + * Copyright (C) 2008 M. Karcher + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + + +LANGUAGE LANG_GERMAN, SUBLANG_DEFAULT + +STRINGTABLE +{ + STRING_INVPARMS, "Falsche Parameteranzahl - xcopy /? zeigt Hilfe an\n" + STRING_INVPARM, "Unbekannter Parameter '%s' - Use xcopy /? for help\n" + STRING_PAUSE, "Eingabetaste bet�tigen, um mit dem Kopieren zu beginnen\n" + STRING_SIMCOPY, "%d Datei(en) w�rden kopiert\n" + STRING_COPY, "%d Datei(en) kopiert\n" + STRING_QISDIR, "Ist '%s' eine Datei oder ein Verzeichnis\n" \ + "am Zielsort?\n" \ + "(D - Datei, V - Verzeichnis)\n" + STRING_SRCPROMPT,"%s? (Ja|Nein)\n" + STRING_OVERWRITE,"%s �berschreiben? (Ja|Nein|Alle)\n" + STRING_COPYFAIL, "Kopieren von '%s' nach '%s' fehlgeschlagen. Fehlernummer: %d\n" + STRING_OPENFAIL, "Fehler beim �ffnen von '%s'\n" + STRING_READFAIL, "Fehler beim Lesen von '%s'\n" + STRING_YES_CHAR, "J" + STRING_NO_CHAR, "N" + STRING_ALL_CHAR, "A" + STRING_FILE_CHAR,"D" + STRING_DIR_CHAR, "V" + + STRING_HELP, +"XCOPY - Kopiert Dateien oder Verzeichnisse an einen Zielort\n\ +\n\ +Syntax:\n\ +XCOPY Quelle [Ziel] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U] \n\ +\t [/R] [/H] [/C] [/P] [/A] [/M] [/E] [/D] [/Y] [/-Y]\n\ +\n\ +Mit:\n\ +\n\ +[/I] Behandle Ziel als Verzeichnisnamen, wenn es nicht existiert und\n\ +\tmehrere Dateien kopiert werden.\n\ +[/S] Kopiere Verzeichnisse und Unterverzeichnisse\n\ +[/E] Kopiere Verzeichnisse und Unterverzeichnisse, auch leere\n\ +[/Q] Zeige die Dateinamen beim Kopieren nicht an\n\ +[/F] Zeige vollst�ndige Dateinamen von Quelle und Ziel an\n\ +[/L] Simulation: Zeige die Namen der Datein, die kopiert w�rden\n\ +[/W] Wartet vor Beginn des Kopierens auf Best�tigung\n\ +[/T] Erzeuge eine leere Verzeichnisstruktur, ohne Dateien zu kopieren\n\ +[/Y] Keine Nachfrage vor dem �berschreiben von Dateien\n\ +[/-Y] Nachrage vor dem �berschreiben von Dateien\n\ +[/P] Fragt f�r jede Quelldatei, ob sie kopiert werden soll\n\ +[/N] Kopiert die Dateien unter ihrem Kurznamen\n\ +[/U] Kopiert nur Dateien, die am Ziel bereits existieren\n\ +[/R] �berschreibt schreibgesch�tzte Dateien\n\ +[/H] Kopiere auch versteckte und Systemdateien\n\ +[/C] Nach Fehlern den Kopiervorgang fortsetzen\n\ +[/A] Nur Dateien mit Archivbit kopieren\n\ +[/M] Nur Dateien mit Archivbit kopieren, danach Archivbit l�schen\n\ +[/D | /D:m-d-y] Kopiere neue Dateien und Dateien, die neuer als das\n\ +\t\tangegebene Datum sind. Wird kein Datum angegegebn, werden nur\n\ +\t\tQuelldateien kopiert, die neuer sind als die Zieldatei\n\n" + +} diff --git a/programs/xcopy/rsrc.rc b/programs/xcopy/rsrc.rc index 3bb61e7..9547668 100644 --- a/programs/xcopy/rsrc.rc +++ b/programs/xcopy/rsrc.rc @@ -23,6 +23,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL #include "Da.rc" +#include "De.rc" #include "En.rc" #include "Fr.rc" #include "Ko.rc"

1 0

Francois Gouget : advapi32/tests: Make sure Wine implements all tested APIs .
by Alexandre Julliard June 11, 2008

June 11, 2008

Module: wine Branch: master Commit: 85605ab54681b91549ce25d88a40b10a14cbfb1b URL: http://source.winehq.org/git/wine.git/?a=commit;h=85605ab54681b91549ce25d88… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Jun 10 18:30:15 2008 +0200 advapi32/tests: Make sure Wine implements all tested APIs. --- dlls/advapi32/tests/registry.c | 16 ++++++++++------ 1 files changed, 10 insertions(+), 6 deletions(-) diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c index c2ffad6..8602766 100644 --- a/dlls/advapi32/tests/registry.c +++ b/dlls/advapi32/tests/registry.c @@ -263,7 +263,11 @@ static void test_hkey_main_Value_W(LPCWSTR name, LPCWSTR string, ret = RegQueryValueExW(hkey_main, name, NULL, &type, NULL, &cbData); GLE = GetLastError(); ok(ret == ERROR_SUCCESS, "RegQueryValueExW failed: %d, GLE=%d\n", ret, GLE); - if(GLE == ERROR_CALL_NOT_IMPLEMENTED) return; + if(GLE == ERROR_CALL_NOT_IMPLEMENTED) + { + win_skip("RegQueryValueExW() is not implemented\n"); + return; + } ok(type == REG_SZ, "RegQueryValueExW returned type %d\n", type); ok(cbData == full_byte_len, @@ -556,7 +560,7 @@ static void test_enum_value(void) res = RegSetValueExW( test_key, testW, 0, REG_SZ, (const BYTE *)foobarW, 7*sizeof(WCHAR) ); if (res==0 && GetLastError()==ERROR_CALL_NOT_IMPLEMENTED) { - skip("RegSetValueExW is not implemented\n"); + win_skip("RegSetValueExW is not implemented\n"); goto cleanup; } ok( res == 0, "RegSetValueExW failed error %d\n", res ); @@ -675,7 +679,7 @@ static void test_get_value(void) if(!pRegGetValueA) { - skip("RegGetValue not available on this platform\n"); + win_skip("RegGetValue not available on this platform\n"); return; } @@ -1124,7 +1128,7 @@ static void test_regconnectregistry( void) schnd = OpenSCManagerA( compName, NULL, GENERIC_READ); if (GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) { - skip("OpenSCManagerA is not implemented\n"); + win_skip("OpenSCManagerA is not implemented\n"); return; } @@ -1218,7 +1222,7 @@ static void test_reg_query_value(void) ret = RegQueryValueW(subkey, NULL, valW, &size); if (GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) { - skip("RegQueryValueW is not implemented\n"); + win_skip("RegQueryValueW is not implemented\n"); goto cleanup; } ok(ret == ERROR_MORE_DATA, "Expected ERROR_MORE_DATA, got %d\n", ret); @@ -1266,7 +1270,7 @@ static void test_reg_delete_tree(void) LONG size, ret; if(!pRegDeleteTreeA) { - skip("Skipping RegDeleteTreeA tests, function not present\n"); + win_skip("Skipping RegDeleteTreeA tests, function not present\n"); return; }

1 0

Paul Vriens : msi/tests: Cleanup registry after test.
by Alexandre Julliard June 11, 2008

June 11, 2008

Module: wine Branch: master Commit: ad2c9211bc91985da8fd59819a134d460ded13ae URL: http://source.winehq.org/git/wine.git/?a=commit;h=ad2c9211bc91985da8fd59819… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Tue Jun 10 13:44:45 2008 +0200 msi/tests: Cleanup registry after test. --- dlls/msi/tests/install.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index 4dba0c6..334e248 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -4304,6 +4304,9 @@ static void test_writeregistryvalues(void) DeleteFile(msifile); DeleteFile("msitest\\augustus"); RemoveDirectory("msitest"); + + RegDeleteKeyA(HKEY_LOCAL_MACHINE, "SOFTWARE\\Wine\\msitest"); + RegDeleteKeyA(HKEY_LOCAL_MACHINE, "SOFTWARE\\Wine"); } static void test_sourcefolder(void)

1 0

Francois Gouget : tests: Add a win_skip() function to allow for missing Windows functionality that must be present in Wine .
by Alexandre Julliard June 11, 2008

June 11, 2008

Module: wine Branch: master Commit: e767a2c04de8228d329c0524009ef5dd01431cda URL: http://source.winehq.org/git/wine.git/?a=commit;h=e767a2c04de8228d329c05240… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Jun 10 18:29:46 2008 +0200 tests: Add a win_skip() function to allow for missing Windows functionality that must be present in Wine. --- include/wine/test.h | 64 ++++++++++++++++++++++++++++++++++++-------------- 1 files changed, 46 insertions(+), 18 deletions(-) diff --git a/include/wine/test.h b/include/wine/test.h index f7a0065..f3de956 100644 --- a/include/wine/test.h +++ b/include/wine/test.h @@ -69,28 +69,34 @@ extern void winetest_wait_child_process( HANDLE process ); #endif extern int broken( int condition ); +extern int winetest_vok( int condition, const char *msg, va_list ap ); +extern void winetest_vskip( const char *msg, va_list ap ); #ifdef __GNUC__ extern int winetest_ok( int condition, const char *msg, ... ) __attribute__((format (printf,2,3) )); extern void winetest_skip( const char *msg, ... ) __attribute__((format (printf,1,2))); +extern void winetest_win_skip( const char *msg, ... ) __attribute__((format (printf,1,2))); extern void winetest_trace( const char *msg, ... ) __attribute__((format (printf,1,2))); #else /* __GNUC__ */ extern int winetest_ok( int condition, const char *msg, ... ); extern void winetest_skip( const char *msg, ... ); +extern void winetest_win_skip( const char *msg, ... ); extern void winetest_trace( const char *msg, ... ); #endif /* __GNUC__ */ -#define ok_(file, line) (winetest_set_location(file, line), 0) ? 0 : winetest_ok -#define skip_(file, line) (winetest_set_location(file, line), 0) ? (void)0 : winetest_skip -#define trace_(file, line) (winetest_set_location(file, line), 0) ? (void)0 : winetest_trace +#define ok_(file, line) (winetest_set_location(file, line), 0) ? 0 : winetest_ok +#define skip_(file, line) (winetest_set_location(file, line), 0) ? (void)0 : winetest_skip +#define win_skip_(file, line) (winetest_set_location(file, line), 0) ? (void)0 : winetest_win_skip +#define trace_(file, line) (winetest_set_location(file, line), 0) ? (void)0 : winetest_trace -#define ok ok_(__FILE__, __LINE__) -#define skip skip_(__FILE__, __LINE__) -#define trace trace_(__FILE__, __LINE__) +#define ok ok_(__FILE__, __LINE__) +#define skip skip_(__FILE__, __LINE__) +#define win_skip win_skip_(__FILE__, __LINE__) +#define trace trace_(__FILE__, __LINE__) #define todo(platform) for (winetest_start_todo(platform); \ winetest_loop_todo(); \ @@ -241,9 +247,8 @@ int broken( int condition ) * Return: * 0 if condition does not have the expected value, 1 otherwise */ -int winetest_ok( int condition, const char *msg, ... ) +int winetest_vok( int condition, const char *msg, va_list args ) { - va_list valist; tls_data* data=get_tls_data(); if (data->todo_level) @@ -254,10 +259,8 @@ int winetest_ok( int condition, const char *msg, ... ) data->current_file, data->current_line ); if (msg[0]) { - va_start(valist, msg); fprintf(stdout,": "); - vfprintf(stdout, msg, valist); - va_end(valist); + vfprintf(stdout, msg, args); } InterlockedIncrement(&todo_failures); return 0; @@ -272,10 +275,8 @@ int winetest_ok( int condition, const char *msg, ... ) data->current_file, data->current_line ); if (msg[0]) { - va_start(valist, msg); fprintf( stdout,": "); - vfprintf(stdout, msg, valist); - va_end(valist); + vfprintf(stdout, msg, args); } InterlockedIncrement(&failures); return 0; @@ -291,6 +292,17 @@ int winetest_ok( int condition, const char *msg, ... ) return 1; } +int winetest_ok( int condition, const char *msg, ... ) +{ + va_list valist; + int rc; + + va_start(valist, msg); + rc=winetest_vok(condition, msg, valist); + va_end(valist); + return rc; +} + void winetest_trace( const char *msg, ... ) { va_list valist; @@ -305,16 +317,32 @@ void winetest_trace( const char *msg, ... ) } } -void winetest_skip( const char *msg, ... ) +void winetest_vskip( const char *msg, va_list args ) { - va_list valist; tls_data* data=get_tls_data(); fprintf( stdout, "%s:%d: Tests skipped: ", data->current_file, data->current_line ); + vfprintf(stdout, msg, args); + skipped++; +} + +void winetest_skip( const char *msg, ... ) +{ + va_list valist; va_start(valist, msg); - vfprintf(stdout, msg, valist); + winetest_vskip(msg, valist); + va_end(valist); +} + +void winetest_win_skip( const char *msg, ... ) +{ + va_list valist; + va_start(valist, msg); + if (strcmp(winetest_platform, "windows") == 0) + winetest_vskip(msg, valist); + else + winetest_vok(0, msg, valist); va_end(valist); - skipped++; } void winetest_start_todo( const char* platform )

1 0

Vladimir Pankratov : shdoclc: Update Russian translation.
by Alexandre Julliard June 11, 2008

June 11, 2008

Module: wine Branch: master Commit: 08e38e8648e98f3a51af790669ee0ee1eb622e12 URL: http://source.winehq.org/git/wine.git/?a=commit;h=08e38e8648e98f3a51af79066… Author: Vladimir Pankratov <scriptkid(a)mail.ru> Date: Tue Jun 10 14:52:41 2008 +0500 shdoclc: Update Russian translation. --- dlls/shdoclc/Ru.rc | 140 ++++++++++++++++++++++++++-------------------------- 1 files changed, 70 insertions(+), 70 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=08e38e8648e98f3a51af7…

1 0

Francois Gouget : winecfg: Update the Portuguese and Brazillian translations, based on a patch by Americo Jose Melo.
by Alexandre Julliard June 10, 2008

June 10, 2008

Module: wine Branch: master Commit: c959867510703a100106f292cd26cb8f489236bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=c959867510703a100106f292c… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Jun 10 18:39:27 2008 +0200 winecfg: Update the Portuguese and Brazillian translations, based on a patch by Americo Jose Melo. --- programs/winecfg/Pt.rc | 333 +++++++++++++++++++++++++++++++++++++++++------- 1 files changed, 288 insertions(+), 45 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c959867510703a100106f…

1 0

Francois Gouget : Replace SUBLANG_ENGLISH_US with SUBLANG_DEFAULT.
by Alexandre Julliard June 10, 2008

June 10, 2008

Module: wine Branch: master Commit: 9b81d86a6d661aaca6e6c74104cd9b8fd32386eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b81d86a6d661aaca6e6c7410… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Jun 10 18:34:06 2008 +0200 Replace SUBLANG_ENGLISH_US with SUBLANG_DEFAULT. --- dlls/comdlg32/cdlg_En.rc | 2 +- dlls/credui/credui_En.rc | 2 +- dlls/hhctrl.ocx/En.rc | 2 +- programs/oleview/En.rc | 2 +- programs/start/En.rc | 2 +- programs/taskmgr/En.rc | 2 +- programs/uninstaller/En.rc | 2 +- programs/wineboot/wineboot_En.rc | 2 +- programs/winecfg/En.rc | 2 +- programs/winefile/En.rc | 2 +- programs/winemine/En.rc | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/comdlg32/cdlg_En.rc b/dlls/comdlg32/cdlg_En.rc index 761a746..bf5d743 100644 --- a/dlls/comdlg32/cdlg_En.rc +++ b/dlls/comdlg32/cdlg_En.rc @@ -20,7 +20,7 @@ * WARNING: DO NOT CHANGE THE SIZE OF THE STANDARD DIALOG TEMPLATES. */ -LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US +LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT OPEN_FILE DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 275, 134 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU diff --git a/dlls/credui/credui_En.rc b/dlls/credui/credui_En.rc index 02f6f35..5733c3f 100644 --- a/dlls/credui/credui_En.rc +++ b/dlls/credui/credui_En.rc @@ -18,7 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US +LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT IDD_CREDDIALOG DIALOG DISCARDABLE 0, 0, 213, 149 STYLE DS_MODALFRAME | DS_NOIDLEMSG | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU diff --git a/dlls/hhctrl.ocx/En.rc b/dlls/hhctrl.ocx/En.rc index e55162a..83917f6 100644 --- a/dlls/hhctrl.ocx/En.rc +++ b/dlls/hhctrl.ocx/En.rc @@ -19,7 +19,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US +LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT STRINGTABLE BEGIN diff --git a/programs/oleview/En.rc b/programs/oleview/En.rc index 34f6c33..1ac45ab 100644 --- a/programs/oleview/En.rc +++ b/programs/oleview/En.rc @@ -19,7 +19,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US +LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT IDM_MENU MENU { diff --git a/programs/start/En.rc b/programs/start/En.rc index 0d0db2e..f44ba11 100644 --- a/programs/start/En.rc +++ b/programs/start/En.rc @@ -19,7 +19,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US +LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT STRINGTABLE DISCARDABLE LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT { diff --git a/programs/taskmgr/En.rc b/programs/taskmgr/En.rc index 988b4d0..4d1c3dc 100644 --- a/programs/taskmgr/En.rc +++ b/programs/taskmgr/En.rc @@ -19,7 +19,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US +LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT /* Menu diff --git a/programs/uninstaller/En.rc b/programs/uninstaller/En.rc index 1e811ce..6d24fbb 100644 --- a/programs/uninstaller/En.rc +++ b/programs/uninstaller/En.rc @@ -18,7 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US +LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT IDD_UNINSTALLER DIALOG DISCARDABLE 0, 0, 330, 160 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU diff --git a/programs/wineboot/wineboot_En.rc b/programs/wineboot/wineboot_En.rc index 7a3fa2a..8e06aec 100644 --- a/programs/wineboot/wineboot_En.rc +++ b/programs/wineboot/wineboot_En.rc @@ -19,7 +19,7 @@ * */ -LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US +LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT IDD_ENDTASK DIALOG DISCARDABLE 0, 0, 186, 71 STYLE DS_MODALFRAME | DS_NOIDLEMSG | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU diff --git a/programs/winecfg/En.rc b/programs/winecfg/En.rc index 50a1c4c..afcb47f 100644 --- a/programs/winecfg/En.rc +++ b/programs/winecfg/En.rc @@ -22,7 +22,7 @@ * */ -LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US +LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT IDR_WINECFG MENU DISCARDABLE BEGIN diff --git a/programs/winefile/En.rc b/programs/winefile/En.rc index ae059d2..dc0ef28 100644 --- a/programs/winefile/En.rc +++ b/programs/winefile/En.rc @@ -21,7 +21,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US +LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT /* Menu */ diff --git a/programs/winemine/En.rc b/programs/winemine/En.rc index 86aaa9c..6be0477 100644 --- a/programs/winemine/En.rc +++ b/programs/winemine/En.rc @@ -20,7 +20,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US +LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT STRINGTABLE { IDS_APPNAME, "WineMine"

1 0