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

Michael Stefaniuc : winmm: Build language resource files separately.
by Alexandre Julliard July 3, 2009

July 3, 2009

Module: wine Branch: master Commit: 0b16b40148f03318281a8b5ac67a5b4953b25e56 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0b16b40148f03318281a8b5ac… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Jul 3 01:38:04 2009 +0200 winmm: Build language resource files separately. Do not include them from an other rc file. --- dlls/winmm/Makefile.in | 21 ++++++++++++++++++++- dlls/winmm/winmm_Cs.rc | 3 +++ dlls/winmm/winmm_Da.rc | 3 +++ dlls/winmm/winmm_De.rc | 3 +++ dlls/winmm/winmm_En.rc | 3 +++ dlls/winmm/winmm_Es.rc | 3 +++ dlls/winmm/winmm_Fr.rc | 3 +++ dlls/winmm/winmm_It.rc | 3 +++ dlls/winmm/winmm_Ja.rc | 5 +++-- dlls/winmm/winmm_Ko.rc | 3 +++ dlls/winmm/winmm_Lt.rc | 5 +++-- dlls/winmm/winmm_Nl.rc | 3 +++ dlls/winmm/winmm_No.rc | 3 +++ dlls/winmm/winmm_Pl.rc | 3 +++ dlls/winmm/winmm_Pt.rc | 3 +++ dlls/winmm/winmm_Ru.rc | 3 +++ dlls/winmm/winmm_Si.rc | 5 +++-- dlls/winmm/winmm_Sk.rc | 3 +++ dlls/winmm/winmm_Tr.rc | 3 +++ dlls/winmm/winmm_res.rc | 24 ------------------------ 20 files changed, 74 insertions(+), 31 deletions(-) diff --git a/dlls/winmm/Makefile.in b/dlls/winmm/Makefile.in index a8ebc62..64c7b5b 100644 --- a/dlls/winmm/Makefile.in +++ b/dlls/winmm/Makefile.in @@ -24,7 +24,26 @@ C_SRCS16 = \ SPEC_SRCS16 = \ mmsystem.spec -RC_SRCS = winmm_res.rc +RC_SRCS = \ + winmm_Cs.rc \ + winmm_Da.rc \ + winmm_De.rc \ + winmm_En.rc \ + winmm_Es.rc \ + winmm_Fr.rc \ + winmm_It.rc \ + winmm_Ja.rc \ + winmm_Ko.rc \ + winmm_Lt.rc \ + winmm_Nl.rc \ + winmm_No.rc \ + winmm_Pl.rc \ + winmm_Pt.rc \ + winmm_Ru.rc \ + winmm_Si.rc \ + winmm_Sk.rc \ + winmm_Tr.rc \ + winmm_res.rc @MAKE_DLL_RULES@ diff --git a/dlls/winmm/winmm_Cs.rc b/dlls/winmm/winmm_Cs.rc index aa4cd63..36604d4 100644 --- a/dlls/winmm/winmm_Cs.rc +++ b/dlls/winmm/winmm_Cs.rc @@ -19,6 +19,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "windef.h" +#include "mmddk.h" + /* Czech strings in CP1250 */ STRINGTABLE LANGUAGE LANG_CZECH, SUBLANG_NEUTRAL diff --git a/dlls/winmm/winmm_Da.rc b/dlls/winmm/winmm_Da.rc index feeb9de..7f55353 100644 --- a/dlls/winmm/winmm_Da.rc +++ b/dlls/winmm/winmm_Da.rc @@ -16,6 +16,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "windef.h" +#include "mmddk.h" + STRINGTABLE LANGUAGE LANG_DANISH, SUBLANG_DEFAULT BEGIN diff --git a/dlls/winmm/winmm_De.rc b/dlls/winmm/winmm_De.rc index 4b16e17..1ba3cae 100644 --- a/dlls/winmm/winmm_De.rc +++ b/dlls/winmm/winmm_De.rc @@ -16,6 +16,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "windef.h" +#include "mmddk.h" + STRINGTABLE LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL BEGIN diff --git a/dlls/winmm/winmm_En.rc b/dlls/winmm/winmm_En.rc index dd3e56c..1a945d8 100644 --- a/dlls/winmm/winmm_En.rc +++ b/dlls/winmm/winmm_En.rc @@ -16,6 +16,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "windef.h" +#include "mmddk.h" + STRINGTABLE LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT BEGIN diff --git a/dlls/winmm/winmm_Es.rc b/dlls/winmm/winmm_Es.rc index 5d22f7b..8713075 100644 --- a/dlls/winmm/winmm_Es.rc +++ b/dlls/winmm/winmm_Es.rc @@ -17,6 +17,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "windef.h" +#include "mmddk.h" + STRINGTABLE LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL BEGIN diff --git a/dlls/winmm/winmm_Fr.rc b/dlls/winmm/winmm_Fr.rc index de66778..665988e 100644 --- a/dlls/winmm/winmm_Fr.rc +++ b/dlls/winmm/winmm_Fr.rc @@ -19,6 +19,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "windef.h" +#include "mmddk.h" + LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL STRINGTABLE diff --git a/dlls/winmm/winmm_It.rc b/dlls/winmm/winmm_It.rc index 91d5818..f4c2fa0 100644 --- a/dlls/winmm/winmm_It.rc +++ b/dlls/winmm/winmm_It.rc @@ -17,6 +17,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "windef.h" +#include "mmddk.h" + STRINGTABLE LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL BEGIN diff --git a/dlls/winmm/winmm_Ja.rc b/dlls/winmm/winmm_Ja.rc index 1805ac8..b8f1c53 100644 --- a/dlls/winmm/winmm_Ja.rc +++ b/dlls/winmm/winmm_Ja.rc @@ -16,6 +16,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "windef.h" +#include "mmddk.h" + /* UTF-8 */ #pragma code_page(65001) @@ -127,5 +130,3 @@ MCIERR_SEQ_PORTUNSPECIFIED, "システムに現在のMIDIポートが指定さ MCIERR_SEQ_TIMER, "全てのマルチメディアタイマは他のアプリケーションによって使用されています。タイマを使用しているアプリケーションを一つ終了してからやり直して下さい。" END - -#pragma code_page(default) diff --git a/dlls/winmm/winmm_Ko.rc b/dlls/winmm/winmm_Ko.rc index 1d5c074..bf7c8a5 100644 --- a/dlls/winmm/winmm_Ko.rc +++ b/dlls/winmm/winmm_Ko.rc @@ -17,6 +17,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "windef.h" +#include "mmddk.h" + STRINGTABLE LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT BEGIN diff --git a/dlls/winmm/winmm_Lt.rc b/dlls/winmm/winmm_Lt.rc index 4988036..6cb9981 100644 --- a/dlls/winmm/winmm_Lt.rc +++ b/dlls/winmm/winmm_Lt.rc @@ -16,6 +16,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "windef.h" +#include "mmddk.h" + /* UTF-8 */ #pragma code_page(65001) @@ -129,5 +132,3 @@ MCIERR_SEQ_PORTUNSPECIFIED, "Sistemoje nėra nurodytas dabartinis MIDI prie MCIERR_SEQ_TIMER, "Visi įvairialypės terpės laikmačiai yra naudojami kitų programų. Išeikite iš vienos tokios programos ir mėginkite vėl." END - -#pragma code_page(default) diff --git a/dlls/winmm/winmm_Nl.rc b/dlls/winmm/winmm_Nl.rc index 15f1535..ef8a7ad 100644 --- a/dlls/winmm/winmm_Nl.rc +++ b/dlls/winmm/winmm_Nl.rc @@ -16,6 +16,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "windef.h" +#include "mmddk.h" + STRINGTABLE LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL BEGIN diff --git a/dlls/winmm/winmm_No.rc b/dlls/winmm/winmm_No.rc index e2cbc30..511e4b3 100644 --- a/dlls/winmm/winmm_No.rc +++ b/dlls/winmm/winmm_No.rc @@ -16,6 +16,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "windef.h" +#include "mmddk.h" + STRINGTABLE LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL BEGIN diff --git a/dlls/winmm/winmm_Pl.rc b/dlls/winmm/winmm_Pl.rc index c57c48b..5abf3f5 100644 --- a/dlls/winmm/winmm_Pl.rc +++ b/dlls/winmm/winmm_Pl.rc @@ -16,6 +16,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "windef.h" +#include "mmddk.h" + STRINGTABLE LANGUAGE LANG_POLISH, SUBLANG_NEUTRAL BEGIN diff --git a/dlls/winmm/winmm_Pt.rc b/dlls/winmm/winmm_Pt.rc index 2da48d8..52adb07 100644 --- a/dlls/winmm/winmm_Pt.rc +++ b/dlls/winmm/winmm_Pt.rc @@ -18,6 +18,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "windef.h" +#include "mmddk.h" + STRINGTABLE LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN BEGIN diff --git a/dlls/winmm/winmm_Ru.rc b/dlls/winmm/winmm_Ru.rc index 9824cc5..3392260 100644 --- a/dlls/winmm/winmm_Ru.rc +++ b/dlls/winmm/winmm_Ru.rc @@ -16,6 +16,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "windef.h" +#include "mmddk.h" + STRINGTABLE LANGUAGE LANG_RUSSIAN, SUBLANG_NEUTRAL BEGIN diff --git a/dlls/winmm/winmm_Si.rc b/dlls/winmm/winmm_Si.rc index 04e6e1b..918e7f1 100644 --- a/dlls/winmm/winmm_Si.rc +++ b/dlls/winmm/winmm_Si.rc @@ -16,6 +16,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "windef.h" +#include "mmddk.h" + #pragma code_page(65001) STRINGTABLE LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT @@ -126,5 +129,3 @@ MCIERR_SEQ_PORTUNSPECIFIED, "Zahtevana MIDI vrata niso nameščena." MCIERR_SEQ_TIMER, "Vsi većpredstavnostni števci so zasedeni. Zaprite enega od večpredstavnostih programov in poskusite znova." END - -#pragma code_page(default) diff --git a/dlls/winmm/winmm_Sk.rc b/dlls/winmm/winmm_Sk.rc index 80030c2..d9345ec 100644 --- a/dlls/winmm/winmm_Sk.rc +++ b/dlls/winmm/winmm_Sk.rc @@ -16,6 +16,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "windef.h" +#include "mmddk.h" + STRINGTABLE LANGUAGE LANG_SLOVAK, SUBLANG_NEUTRAL BEGIN diff --git a/dlls/winmm/winmm_Tr.rc b/dlls/winmm/winmm_Tr.rc index 36d5693..6c8a73e 100644 --- a/dlls/winmm/winmm_Tr.rc +++ b/dlls/winmm/winmm_Tr.rc @@ -18,6 +18,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "windef.h" +#include "mmddk.h" + STRINGTABLE LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT BEGIN diff --git a/dlls/winmm/winmm_res.rc b/dlls/winmm/winmm_res.rc index 676c185..808220d 100644 --- a/dlls/winmm/winmm_res.rc +++ b/dlls/winmm/winmm_res.rc @@ -23,31 +23,7 @@ */ #include "windef.h" -#include "winbase.h" #include "mmddk.h" -#include "winnls.h" - -/* Add your language specific defines here */ -#include "winmm_Cs.rc" -#include "winmm_Da.rc" -#include "winmm_De.rc" -#include "winmm_En.rc" -#include "winmm_Es.rc" -#include "winmm_Fr.rc" -#include "winmm_It.rc" -#include "winmm_Ko.rc" -#include "winmm_Lt.rc" -#include "winmm_Ja.rc" -#include "winmm_Nl.rc" -#include "winmm_No.rc" -#include "winmm_Pl.rc" -#include "winmm_Pt.rc" -#include "winmm_Ru.rc" -#include "winmm_Si.rc" -#include "winmm_Sk.rc" -#include "winmm_Tr.rc" - -/* do not add NLS specific stuff below that line */ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL

1 0

Michael Stefaniuc : wininet: Build language resource files separately.
by Alexandre Julliard July 3, 2009

July 3, 2009

Module: wine Branch: master Commit: d66c0921086f454be4343f32108bc8f94294981e URL: http://source.winehq.org/git/wine.git/?a=commit;h=d66c0921086f454be4343f321… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Jul 3 01:38:15 2009 +0200 wininet: Build language resource files separately. Do not include them from an other rc file. --- dlls/wininet/Makefile.in | 28 +++++++++++++++++- dlls/wininet/resource.h | 3 ++ dlls/wininet/rsrc.rc | 67 -------------------------------------------- dlls/wininet/wininet_Bg.rc | 2 + dlls/wininet/wininet_Cs.rc | 2 + dlls/wininet/wininet_Da.rc | 2 + dlls/wininet/wininet_De.rc | 2 + dlls/wininet/wininet_En.rc | 2 + dlls/wininet/wininet_Eo.rc | 2 + dlls/wininet/wininet_Es.rc | 2 + dlls/wininet/wininet_Fi.rc | 2 + dlls/wininet/wininet_Fr.rc | 2 + dlls/wininet/wininet_Hu.rc | 2 + dlls/wininet/wininet_It.rc | 2 + dlls/wininet/wininet_Ja.rc | 4 +- dlls/wininet/wininet_Ko.rc | 2 + dlls/wininet/wininet_Lt.rc | 4 +- dlls/wininet/wininet_Nl.rc | 2 + dlls/wininet/wininet_No.rc | 2 + dlls/wininet/wininet_Pl.rc | 2 + dlls/wininet/wininet_Pt.rc | 2 + dlls/wininet/wininet_Ro.rc | 4 +- dlls/wininet/wininet_Ru.rc | 2 + dlls/wininet/wininet_Si.rc | 4 +- dlls/wininet/wininet_Sv.rc | 2 + dlls/wininet/wininet_Tr.rc | 2 + dlls/wininet/wininet_Uk.rc | 2 + dlls/wininet/wininet_Zh.rc | 4 +- 28 files changed, 79 insertions(+), 79 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d66c0921086f454be4343…

1 0

Michael Stefaniuc : progman: Build language resource files separately.
by Alexandre Julliard July 3, 2009

July 3, 2009

Module: wine Branch: master Commit: b4b74945848aff46ef9903f518aab625da4260e2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b4b74945848aff46ef9903f51… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Jul 3 01:36:09 2009 +0200 progman: Build language resource files separately. Do not include them from an other rc file. --- programs/progman/Cs.rc | 2 + programs/progman/Da.rc | 2 + programs/progman/De.rc | 2 + programs/progman/En.rc | 2 + programs/progman/Es.rc | 2 + programs/progman/Fr.rc | 2 + programs/progman/Hu.rc | 2 + programs/progman/It.rc | 2 + programs/progman/Ko.rc | 2 + programs/progman/Lt.rc | 4 +- programs/progman/Makefile.in | 22 ++++++++++++++++++++- programs/progman/Nl.rc | 2 + programs/progman/No.rc | 2 + programs/progman/Pl.rc | 2 + programs/progman/Pt.rc | 2 + programs/progman/Ru.rc | 2 + programs/progman/Si.rc | 4 +- programs/progman/Sv.rc | 2 + programs/progman/Tr.rc | 2 + programs/progman/Zh.rc | 4 +- programs/progman/accel.rc | 3 ++ programs/progman/progman.h | 3 +- programs/progman/rsrc.rc | 43 ------------------------------------------ 23 files changed, 64 insertions(+), 51 deletions(-) diff --git a/programs/progman/Cs.rc b/programs/progman/Cs.rc index 07838b0..06139b9 100644 --- a/programs/progman/Cs.rc +++ b/programs/progman/Cs.rc @@ -21,6 +21,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "progman.h" + /* Czech strings in CP1250 */ /* Menu */ diff --git a/programs/progman/Da.rc b/programs/progman/Da.rc index b99c5f5..7e1438d 100644 --- a/programs/progman/Da.rc +++ b/programs/progman/Da.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "progman.h" + LANGUAGE LANG_DANISH, SUBLANG_DEFAULT /* Menu */ diff --git a/programs/progman/De.rc b/programs/progman/De.rc index c94328c..b72118f 100644 --- a/programs/progman/De.rc +++ b/programs/progman/De.rc @@ -20,6 +20,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "progman.h" + /* Menu */ MAIN_MENU MENU LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL diff --git a/programs/progman/En.rc b/programs/progman/En.rc index 201deca..bd6aaaa 100644 --- a/programs/progman/En.rc +++ b/programs/progman/En.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "progman.h" + /* Menu */ MAIN_MENU MENU LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT diff --git a/programs/progman/Es.rc b/programs/progman/Es.rc index 391a5e5..2888354 100644 --- a/programs/progman/Es.rc +++ b/programs/progman/Es.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "progman.h" + LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL /* Menu */ diff --git a/programs/progman/Fr.rc b/programs/progman/Fr.rc index 39b3461..80ff466 100644 --- a/programs/progman/Fr.rc +++ b/programs/progman/Fr.rc @@ -21,6 +21,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "progman.h" + LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL /* Menu */ diff --git a/programs/progman/Hu.rc b/programs/progman/Hu.rc index 678d68d..9d53fb3 100644 --- a/programs/progman/Hu.rc +++ b/programs/progman/Hu.rc @@ -20,6 +20,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "progman.h" + /* Menu */ MAIN_MENU MENU LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT diff --git a/programs/progman/It.rc b/programs/progman/It.rc index 0c280f5..9e3437d 100644 --- a/programs/progman/It.rc +++ b/programs/progman/It.rc @@ -20,6 +20,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "progman.h" + /* Menu */ MAIN_MENU MENU LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL diff --git a/programs/progman/Ko.rc b/programs/progman/Ko.rc index 6c749f2..5c2cdd1 100644 --- a/programs/progman/Ko.rc +++ b/programs/progman/Ko.rc @@ -20,6 +20,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "progman.h" + /* Menu */ MAIN_MENU MENU LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT diff --git a/programs/progman/Lt.rc b/programs/progman/Lt.rc index ac55054..d484c55 100644 --- a/programs/progman/Lt.rc +++ b/programs/progman/Lt.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "progman.h" + /* Menu */ /* UTF-8 */ @@ -240,5 +242,3 @@ GARANTIJŲ; net be numanomų PERKAMUMO ar TINKAMUMO KONKREČIAI \ UŽDUOČIAI garantijų. Išsamią informaciją rasite GNU laisvojoje \ bendrojoje viešojoje licencijoje." } - -#pragma code_page(default) diff --git a/programs/progman/Makefile.in b/programs/progman/Makefile.in index 9ed7859..921f9a8 100644 --- a/programs/progman/Makefile.in +++ b/programs/progman/Makefile.in @@ -14,7 +14,27 @@ C_SRCS = \ program.c \ string.c -RC_SRCS = rsrc.rc +RC_SRCS = \ + Cs.rc \ + Da.rc \ + De.rc \ + En.rc \ + Es.rc \ + Fr.rc \ + Hu.rc \ + It.rc \ + Ko.rc \ + Lt.rc \ + Nl.rc \ + No.rc \ + Pl.rc \ + Pt.rc \ + Ru.rc \ + Si.rc \ + Sv.rc \ + Tr.rc \ + Zh.rc \ + accel.rc @MAKE_PROG_RULES@ diff --git a/programs/progman/Nl.rc b/programs/progman/Nl.rc index 7b8c8d0..b2ca361 100644 --- a/programs/progman/Nl.rc +++ b/programs/progman/Nl.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "progman.h" + /* Menu */ MAIN_MENU MENU LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL diff --git a/programs/progman/No.rc b/programs/progman/No.rc index 1af4170..618e985 100644 --- a/programs/progman/No.rc +++ b/programs/progman/No.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "progman.h" + /* Menu */ MAIN_MENU MENU LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL diff --git a/programs/progman/Pl.rc b/programs/progman/Pl.rc index 626618c..351930c 100644 --- a/programs/progman/Pl.rc +++ b/programs/progman/Pl.rc @@ -20,6 +20,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "progman.h" + /* Menu */ LANGUAGE LANG_POLISH, SUBLANG_DEFAULT diff --git a/programs/progman/Pt.rc b/programs/progman/Pt.rc index 227b767..98e4b86 100644 --- a/programs/progman/Pt.rc +++ b/programs/progman/Pt.rc @@ -21,6 +21,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "progman.h" + LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN /* Menu */ diff --git a/programs/progman/Ru.rc b/programs/progman/Ru.rc index 90d6302..7d6121b 100644 --- a/programs/progman/Ru.rc +++ b/programs/progman/Ru.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "progman.h" + /* Menu */ MAIN_MENU MENU LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT diff --git a/programs/progman/Si.rc b/programs/progman/Si.rc index 1d394fd..1744705 100644 --- a/programs/progman/Si.rc +++ b/programs/progman/Si.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "progman.h" + #pragma code_page(65001) /* Menu */ @@ -244,5 +246,3 @@ 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." } - -#pragma code_page(default) diff --git a/programs/progman/Sv.rc b/programs/progman/Sv.rc index be43497..0d23948 100644 --- a/programs/progman/Sv.rc +++ b/programs/progman/Sv.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "progman.h" + /* Menu */ MAIN_MENU MENU LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL diff --git a/programs/progman/Tr.rc b/programs/progman/Tr.rc index a296331..6407acd 100644 --- a/programs/progman/Tr.rc +++ b/programs/progman/Tr.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "progman.h" + /* Menu */ MAIN_MENU MENU LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT diff --git a/programs/progman/Zh.rc b/programs/progman/Zh.rc index d42a3f2..d78ac76 100644 --- a/programs/progman/Zh.rc +++ b/programs/progman/Zh.rc @@ -20,6 +20,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "progman.h" + /* Chinese text is encoded in UTF-8 */ #pragma code_page(65001) @@ -410,5 +412,3 @@ IDS_LIBRARIES_DLL, "動態連接庫 (*.dll)" IDS_SYMBOL_FILES, "圖標檔案" IDS_SYMBOLS_ICO, "圖標 (*.ico)" } - -#pragma code_page(default) diff --git a/programs/progman/accel.rc b/programs/progman/accel.rc index c86c0f3..44edae5 100644 --- a/programs/progman/accel.rc +++ b/programs/progman/accel.rc @@ -16,6 +16,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include <winuser.h> +#include "progman.h" + ACCEL ACCELERATORS { VK_RETURN, PM_EXECUTE, VIRTKEY, ALT diff --git a/programs/progman/progman.h b/programs/progman/progman.h index 5f7504b..aa22c6d 100644 --- a/programs/progman/progman.h +++ b/programs/progman/progman.h @@ -26,7 +26,8 @@ #define MAX_PATHNAME_LEN 1024 #define MAX_LANGUAGE_NUMBER (PM_LAST_LANGUAGE - PM_FIRST_LANGUAGE) -#include "windows.h" +#include <windows.h> +#include <windef.h> /* Fallback icon */ #define DEFAULTICON OIC_WINLOGO diff --git a/programs/progman/rsrc.rc b/programs/progman/rsrc.rc deleted file mode 100644 index 167c201..0000000 --- a/programs/progman/rsrc.rc +++ /dev/null @@ -1,43 +0,0 @@ -/* - * Copyright 1996 Ulrich Schmid - * - * 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 - */ - -#include <windef.h> -#include <winuser.h> - -#include "progman.h" -#include "accel.rc" - -#include "Cs.rc" -#include "Da.rc" -#include "De.rc" -#include "En.rc" -#include "Es.rc" -#include "Fr.rc" -#include "Hu.rc" -#include "It.rc" -#include "Ko.rc" -#include "Lt.rc" -#include "Nl.rc" -#include "No.rc" -#include "Pl.rc" -#include "Pt.rc" -#include "Ru.rc" -#include "Si.rc" -#include "Sv.rc" -#include "Tr.rc" -#include "Zh.rc"

1 0

Michael Stefaniuc : winspool.drv: Build language resource files separately.
by Alexandre Julliard July 3, 2009

July 3, 2009

Module: wine Branch: master Commit: 9d9eccc378a89c0b5a7779489a7a723f83d093c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d9eccc378a89c0b5a7779489… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Jul 3 01:38:43 2009 +0200 winspool.drv: Build language resource files separately. Do not include them from an other rc file. --- dlls/winspool.drv/Bg.rc | 2 ++ dlls/winspool.drv/Da.rc | 2 ++ dlls/winspool.drv/De.rc | 2 ++ dlls/winspool.drv/En.rc | 2 ++ dlls/winspool.drv/Eo.rc | 2 ++ dlls/winspool.drv/Es.rc | 2 ++ dlls/winspool.drv/Fi.rc | 2 ++ dlls/winspool.drv/Fr.rc | 2 ++ dlls/winspool.drv/It.rc | 2 ++ dlls/winspool.drv/Ko.rc | 2 ++ dlls/winspool.drv/Lt.rc | 4 ++-- dlls/winspool.drv/Makefile.in | 23 ++++++++++++++++++++++- dlls/winspool.drv/Nl.rc | 2 ++ dlls/winspool.drv/No.rc | 2 ++ dlls/winspool.drv/Pl.rc | 2 ++ dlls/winspool.drv/Pt.rc | 2 ++ dlls/winspool.drv/Ru.rc | 2 ++ dlls/winspool.drv/Si.rc | 4 ++-- dlls/winspool.drv/Sv.rc | 2 ++ dlls/winspool.drv/Tr.rc | 2 ++ dlls/winspool.drv/Zh.rc | 4 ++-- dlls/winspool.drv/winspool.rc | 25 ------------------------- dlls/winspool.drv/wspool.h | 3 +++ 23 files changed, 65 insertions(+), 32 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9d9eccc378a89c0b5a777…

1 0

Henri Verbeet : wined3d: Use a proper structure for storing initial GL context information.
by Alexandre Julliard July 3, 2009

July 3, 2009

Module: wine Branch: master Commit: 4cacf2e08ff40bfd114e269825d96f3aadbb0462 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4cacf2e08ff40bfd114e26982… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jul 3 09:39:18 2009 +0200 wined3d: Use a proper structure for storing initial GL context information. --- dlls/wined3d/directx.c | 109 +++++++++++++++++++++--------------------------- 1 files changed, 47 insertions(+), 62 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 87f6e89..513fbfe 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -197,9 +197,12 @@ glMultiTexCoordFunc multi_texcoord_funcs[WINED3D_FFP_EMIT_COUNT]; * function query some info from GL. */ -static BOOL wined3d_fake_gl_context_available = FALSE; -static HDC wined3d_fake_gl_context_hdc = NULL; -static HWND wined3d_fake_gl_context_hwnd = NULL; +struct wined3d_fake_gl_ctx +{ + HDC dc; + HWND wnd; + HGLRC gl_ctx; +}; static CRITICAL_SECTION wined3d_fake_gl_context_cs; static CRITICAL_SECTION_DEBUG wined3d_fake_gl_context_cs_debug = @@ -211,41 +214,27 @@ static CRITICAL_SECTION_DEBUG wined3d_fake_gl_context_cs_debug = }; static CRITICAL_SECTION wined3d_fake_gl_context_cs = { &wined3d_fake_gl_context_cs_debug, -1, 0, 0, 0, 0 }; -static void WineD3D_ReleaseFakeGLContext(void) { - HGLRC glCtx; - +static void WineD3D_ReleaseFakeGLContext(struct wined3d_fake_gl_ctx *ctx) +{ EnterCriticalSection(&wined3d_fake_gl_context_cs); - if(!wined3d_fake_gl_context_available) { - TRACE_(d3d_caps)("context not available\n"); - LeaveCriticalSection(&wined3d_fake_gl_context_cs); - return; - } + TRACE_(d3d_caps)("Destroying fake GL context.\n"); - glCtx = pwglGetCurrentContext(); - if (glCtx) + if (!pwglMakeCurrent(NULL, NULL)) { - TRACE_(d3d_caps)("destroying fake GL context\n"); - if (!pwglMakeCurrent(NULL, NULL)) - { - ERR("Failed to disable fake GL context.\n"); - } - pwglDeleteContext(glCtx); + ERR_(d3d_caps)("Failed to disable fake GL context.\n"); } - if (wined3d_fake_gl_context_hdc) - ReleaseDC(wined3d_fake_gl_context_hwnd, wined3d_fake_gl_context_hdc); - wined3d_fake_gl_context_hdc = NULL; /* Make sure we don't think that it is still around */ - if (wined3d_fake_gl_context_hwnd) - DestroyWindow(wined3d_fake_gl_context_hwnd); - wined3d_fake_gl_context_hwnd = NULL; - wined3d_fake_gl_context_available = FALSE; + + pwglDeleteContext(ctx->gl_ctx); + ReleaseDC(ctx->wnd, ctx->dc); + DestroyWindow(ctx->wnd); LeaveCriticalSection(&wined3d_fake_gl_context_cs); } -static BOOL WineD3D_CreateFakeGLContext(void) { +static BOOL WineD3D_CreateFakeGLContext(struct wined3d_fake_gl_ctx *ctx) +{ PIXELFORMATDESCRIPTOR pfd; - HGLRC glCtx = NULL; int iPixelFormat; EnterCriticalSection(&wined3d_fake_gl_context_cs); @@ -253,18 +242,18 @@ static BOOL WineD3D_CreateFakeGLContext(void) { TRACE("getting context...\n"); /* We need a fake window as a hdc retrieved using GetDC(0) can't be used for much GL purposes. */ - wined3d_fake_gl_context_hwnd = CreateWindowA(WINED3D_OPENGL_WINDOW_CLASS_NAME, "WineD3D fake window", + ctx->wnd = CreateWindowA(WINED3D_OPENGL_WINDOW_CLASS_NAME, "WineD3D fake window", WS_OVERLAPPEDWINDOW, 10, 10, 10, 10, NULL, NULL, NULL, NULL); - if (!wined3d_fake_gl_context_hwnd) + if (!ctx->wnd) { - ERR("HWND creation failed!\n"); + ERR_(d3d_caps)("Failed to create a window.\n"); goto fail; } - wined3d_fake_gl_context_hdc = GetDC(wined3d_fake_gl_context_hwnd); - if (!wined3d_fake_gl_context_hdc) + ctx->dc = GetDC(ctx->wnd); + if (!ctx->dc) { - ERR("GetDC failed!\n"); + ERR_(d3d_caps)("Failed to get a DC.\n"); goto fail; } @@ -277,43 +266,43 @@ static BOOL WineD3D_CreateFakeGLContext(void) { pfd.cColorBits = 32; pfd.iLayerType = PFD_MAIN_PLANE; - iPixelFormat = ChoosePixelFormat(wined3d_fake_gl_context_hdc, &pfd); + iPixelFormat = ChoosePixelFormat(ctx->dc, &pfd); if (!iPixelFormat) { /* If this happens something is very wrong as ChoosePixelFormat barely fails. */ - ERR("Can't find a suitable iPixelFormat.\n"); + ERR_(d3d_caps)("Can't find a suitable iPixelFormat.\n"); goto fail; } - DescribePixelFormat(wined3d_fake_gl_context_hdc, iPixelFormat, sizeof(pfd), &pfd); - SetPixelFormat(wined3d_fake_gl_context_hdc, iPixelFormat, &pfd); + DescribePixelFormat(ctx->dc, iPixelFormat, sizeof(pfd), &pfd); + SetPixelFormat(ctx->dc, iPixelFormat, &pfd); /* Create a GL context. */ - glCtx = pwglCreateContext(wined3d_fake_gl_context_hdc); - if (!glCtx) + ctx->gl_ctx = pwglCreateContext(ctx->dc); + if (!ctx->gl_ctx) { WARN_(d3d_caps)("Error creating default context for capabilities initialization.\n"); goto fail; } /* Make it the current GL context. */ - if (!pwglMakeCurrent(wined3d_fake_gl_context_hdc, glCtx)) + if (!pwglMakeCurrent(ctx->dc, ctx->gl_ctx)) { ERR_(d3d_caps)("Failed to make fake GL context current.\n"); goto fail; } context_set_last_device(NULL); - wined3d_fake_gl_context_available = TRUE; LeaveCriticalSection(&wined3d_fake_gl_context_cs); return TRUE; - fail: - if(wined3d_fake_gl_context_hdc) - ReleaseDC(wined3d_fake_gl_context_hwnd, wined3d_fake_gl_context_hdc); - wined3d_fake_gl_context_hdc = NULL; - if(wined3d_fake_gl_context_hwnd) - DestroyWindow(wined3d_fake_gl_context_hwnd); - wined3d_fake_gl_context_hwnd = NULL; - if(glCtx) pwglDeleteContext(glCtx); + +fail: + if (ctx->gl_ctx) pwglDeleteContext(ctx->gl_ctx); + ctx->gl_ctx = NULL; + if (ctx->dc) ReleaseDC(ctx->wnd, ctx->dc); + ctx->dc = NULL; + if (ctx->wnd) DestroyWindow(ctx->wnd); + ctx->wnd = NULL; + LeaveCriticalSection(&wined3d_fake_gl_context_cs); return FALSE; } @@ -4518,6 +4507,7 @@ BOOL InitAdapters(IWineD3DImpl *This) { struct WineD3DAdapter *adapter = &This->adapters[0]; const WineD3D_GL_Info *gl_info = &adapter->gl_info; + struct wined3d_fake_gl_ctx fake_gl_ctx = {0}; int iPixelFormat; int res; int i; @@ -4530,31 +4520,26 @@ BOOL InitAdapters(IWineD3DImpl *This) adapter->monitorPoint.x = -1; adapter->monitorPoint.y = -1; - if (!WineD3D_CreateFakeGLContext()) { + if (!WineD3D_CreateFakeGLContext(&fake_gl_ctx)) + { ERR("Failed to get a gl context for default adapter\n"); - WineD3D_ReleaseFakeGLContext(); goto nogl_adapter; } ret = IWineD3DImpl_FillGLCaps(&adapter->gl_info); if(!ret) { ERR("Failed to initialize gl caps for default adapter\n"); - WineD3D_ReleaseFakeGLContext(); + WineD3D_ReleaseFakeGLContext(&fake_gl_ctx); goto nogl_adapter; } ret = initPixelFormats(&adapter->gl_info); if(!ret) { ERR("Failed to init gl formats\n"); - WineD3D_ReleaseFakeGLContext(); + WineD3D_ReleaseFakeGLContext(&fake_gl_ctx); goto nogl_adapter; } - hdc = pwglGetCurrentDC(); - if(!hdc) { - ERR("Failed to get gl HDC\n"); - WineD3D_ReleaseFakeGLContext(); - goto nogl_adapter; - } + hdc = fake_gl_ctx.dc; adapter->driver = "Display"; adapter->description = "Direct3D HAL"; @@ -4691,7 +4676,7 @@ BOOL InitAdapters(IWineD3DImpl *This) { ERR("Disabling Direct3D because no hardware accelerated pixel formats have been found!\n"); - WineD3D_ReleaseFakeGLContext(); + WineD3D_ReleaseFakeGLContext(&fake_gl_ctx); HeapFree(GetProcessHeap(), 0, adapter->cfgs); goto nogl_adapter; } @@ -4719,7 +4704,7 @@ BOOL InitAdapters(IWineD3DImpl *This) fixup_extensions(&adapter->gl_info); add_gl_compat_wrappers(&adapter->gl_info); - WineD3D_ReleaseFakeGLContext(); + WineD3D_ReleaseFakeGLContext(&fake_gl_ctx); select_shader_mode(&adapter->gl_info, WINED3DDEVTYPE_HAL, &ps_selected_mode, &vs_selected_mode); select_shader_max_constants(ps_selected_mode, vs_selected_mode, &adapter->gl_info);

1 0

Henri Verbeet : d3d9/tests: Add a small test for having multiple device active at the same time.
by Alexandre Julliard July 3, 2009

July 3, 2009

Module: wine Branch: master Commit: 17c0e991065033eec1e14f5e985e418a555bc81e URL: http://source.winehq.org/git/wine.git/?a=commit;h=17c0e991065033eec1e14f5e9… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jul 3 09:39:20 2009 +0200 d3d9/tests: Add a small test for having multiple device active at the same time. This is essentially the situation that caused problems with reusing the initial GL context. --- dlls/d3d9/tests/device.c | 65 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 65 insertions(+), 0 deletions(-) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 279c065..66f53b9 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -2312,6 +2312,70 @@ err_out: return; } +static void test_multi_device(void) +{ + IDirect3DDevice9 *device1 = NULL, *device2 = NULL; + D3DPRESENT_PARAMETERS present_parameters; + HWND hwnd1 = NULL, hwnd2 = NULL; + IDirect3D9 *d3d9; + ULONG refcount; + HRESULT hr; + + d3d9 = pDirect3DCreate9(D3D_SDK_VERSION); + ok(d3d9 != NULL, "Failed to create a d3d9 object.\n"); + if (!d3d9) goto fail; + + hwnd1 = CreateWindow("static", "d3d9_test", WS_OVERLAPPEDWINDOW, 100, 100, 160, 160, NULL, NULL, NULL, NULL); + ok(hwnd1 != NULL, "Failed to create a window.\n"); + if (!hwnd1) goto fail; + + memset(&present_parameters, 0, sizeof(present_parameters)); + present_parameters.Windowed = TRUE; + present_parameters.hDeviceWindow = hwnd1; + present_parameters.SwapEffect = D3DSWAPEFFECT_DISCARD; + + hr = IDirect3D9_CreateDevice(d3d9, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, hwnd1, + D3DCREATE_SOFTWARE_VERTEXPROCESSING, &present_parameters, &device1); + ok(SUCCEEDED(hr), "Failed to create a device, hr %#x\n", hr); + IDirect3D9_Release(d3d9); + d3d9 = NULL; + if (FAILED(hr)) goto fail; + + d3d9 = pDirect3DCreate9(D3D_SDK_VERSION); + ok(d3d9 != NULL, "Failed to create a d3d9 object.\n"); + if (!d3d9) goto fail; + + hwnd2 = CreateWindow("static", "d3d9_test", WS_OVERLAPPEDWINDOW, 100, 100, 160, 160, NULL, NULL, NULL, NULL); + ok(hwnd2 != NULL, "Failed to create a window.\n"); + if (!hwnd2) goto fail; + + memset(&present_parameters, 0, sizeof(present_parameters)); + present_parameters.Windowed = TRUE; + present_parameters.hDeviceWindow = hwnd2; + present_parameters.SwapEffect = D3DSWAPEFFECT_DISCARD; + + hr = IDirect3D9_CreateDevice(d3d9, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, hwnd2, + D3DCREATE_SOFTWARE_VERTEXPROCESSING, &present_parameters, &device2); + ok(SUCCEEDED(hr), "Failed to create a device, hr %#x\n", hr); + IDirect3D9_Release(d3d9); + d3d9 = NULL; + if (FAILED(hr)) goto fail; + +fail: + if (d3d9) IDirect3D9_Release(d3d9); + if (device1) + { + refcount = IDirect3DDevice9_Release(device1); + ok(!refcount, "Device has %u references left.\n", refcount); + } + if (device2) + { + refcount = IDirect3DDevice9_Release(device2); + ok(!refcount, "Device has %u references left.\n", refcount); + } + if (hwnd1) DestroyWindow(hwnd1); + if (hwnd2) DestroyWindow(hwnd2); +} START_TEST(device) { @@ -2334,6 +2398,7 @@ START_TEST(device) } IDirect3D9_Release(d3d9); + test_multi_device(); test_display_formats(); test_display_modes(); test_swapchain();

1 0

Michael Stefaniuc : wineps.drv: Build language resource files separately.
by Alexandre Julliard July 3, 2009

July 3, 2009

Module: wine Branch: master Commit: 47fc16fb5461960164260053abb0b9c2f39aa0c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=47fc16fb5461960164260053a… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Jul 3 01:40:09 2009 +0200 wineps.drv: Build language resource files separately. Do not include them from an other rc file. --- dlls/wineps.drv/Makefile.in | 25 ++++++++++++++++++- dlls/wineps.drv/psdlg.h | 3 ++ dlls/wineps.drv/rsrc.rc | 57 ------------------------------------------- dlls/wineps.drv/wps_Bg.rc | 2 + dlls/wineps.drv/wps_Cs.rc | 2 + dlls/wineps.drv/wps_Da.rc | 2 + dlls/wineps.drv/wps_De.rc | 2 + dlls/wineps.drv/wps_En.rc | 2 + dlls/wineps.drv/wps_Es.rc | 2 + dlls/wineps.drv/wps_Fr.rc | 2 + dlls/wineps.drv/wps_Hu.rc | 2 + dlls/wineps.drv/wps_It.rc | 2 + dlls/wineps.drv/wps_Ja.rc | 4 +- dlls/wineps.drv/wps_Ko.rc | 2 + dlls/wineps.drv/wps_Lt.rc | 3 +- dlls/wineps.drv/wps_Nl.rc | 2 + dlls/wineps.drv/wps_No.rc | 2 + dlls/wineps.drv/wps_Pl.rc | 2 + dlls/wineps.drv/wps_Pt.rc | 2 + dlls/wineps.drv/wps_Ro.rc | 4 +- dlls/wineps.drv/wps_Ru.rc | 2 + dlls/wineps.drv/wps_Si.rc | 2 + dlls/wineps.drv/wps_Sk.rc | 2 + dlls/wineps.drv/wps_Sv.rc | 2 + dlls/wineps.drv/wps_Tr.rc | 2 + dlls/wineps.drv/wps_Zh.rc | 4 +- 26 files changed, 73 insertions(+), 65 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=47fc16fb5461960164260…

1 0

Michael Stefaniuc : shdocvw: Import the version.rc into the main rc file.
by Alexandre Julliard July 3, 2009

July 3, 2009

Module: wine Branch: master Commit: 83eb00cad38402a10c7a82b7492a6a36fb81fe16 URL: http://source.winehq.org/git/wine.git/?a=commit;h=83eb00cad38402a10c7a82b74… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Jul 3 01:41:45 2009 +0200 shdocvw: Import the version.rc into the main rc file. There is no need for a separate file. --- dlls/shdocvw/shdocvw.rc | 10 +++++++++- dlls/shdocvw/version.rc | 27 --------------------------- 2 files changed, 9 insertions(+), 28 deletions(-) diff --git a/dlls/shdocvw/shdocvw.rc b/dlls/shdocvw/shdocvw.rc index 47718c1..bb4809b 100644 --- a/dlls/shdocvw/shdocvw.rc +++ b/dlls/shdocvw/shdocvw.rc @@ -16,7 +16,15 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "version.rc" +#define WINE_OLESELFREGISTER +#define WINE_FILEDESCRIPTION_STR "Wine core dll" +#define WINE_FILENAME_STR "shdocvw.dll" +#define WINE_FILEVERSION 6,0,2900,2180 +#define WINE_FILEVERSION_STR "6.0.2900.2180" +#define WINE_PRODUCTVERSION 6,0,2900,2180 +#define WINE_PRODUCTVERSION_STR "6.0.2900.2180" + +#include "wine/wine_common_ver.rc" LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL diff --git a/dlls/shdocvw/version.rc b/dlls/shdocvw/version.rc deleted file mode 100644 index 103b77c..0000000 --- a/dlls/shdocvw/version.rc +++ /dev/null @@ -1,27 +0,0 @@ -/* - * Copyright 2003 Francois Gouget (for CodeWeavers) - * - * 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 - */ - -#define WINE_OLESELFREGISTER -#define WINE_FILEDESCRIPTION_STR "Wine core dll" -#define WINE_FILENAME_STR "shdocvw.dll" -#define WINE_FILEVERSION 6,0,2900,2180 -#define WINE_FILEVERSION_STR "6.0.2900.2180" -#define WINE_PRODUCTVERSION 6,0,2900,2180 -#define WINE_PRODUCTVERSION_STR "6.0.2900.2180" - -#include "wine/wine_common_ver.rc"

1 0

Jacek Caban : urlmon: Added IBindStatusCallbackEx tests ( also fixes some IE8 failures).
by Alexandre Julliard July 3, 2009

July 3, 2009

Module: wine Branch: master Commit: 288eefc7f181a34fa93a750abba9638ea7e84903 URL: http://source.winehq.org/git/wine.git/?a=commit;h=288eefc7f181a34fa93a750ab… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jul 2 23:21:08 2009 +0200 urlmon: Added IBindStatusCallbackEx tests (also fixes some IE8 failures). --- dlls/urlmon/tests/url.c | 144 +++++++++++++++++++++++++++++++++++++---------- 1 files changed, 114 insertions(+), 30 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=288eefc7f181a34fa93a7…

1 0

Michael Stefaniuc : comdlg32: Build language resource files separately.
by Alexandre Julliard July 3, 2009

July 3, 2009

Module: wine Branch: master Commit: a15c263237d68707b6f0a2ae5791b5d32a58e650 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a15c263237d68707b6f0a2ae5… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Jul 3 01:38:23 2009 +0200 comdlg32: Build language resource files separately. Do not include them from an other rc file. --- dlls/comdlg32/Makefile.in | 33 +++++++++++++++++++- dlls/comdlg32/cdlg_Bg.rc | 3 ++ dlls/comdlg32/cdlg_Ca.rc | 3 ++ dlls/comdlg32/cdlg_Cs.rc | 3 ++ dlls/comdlg32/cdlg_Da.rc | 3 ++ dlls/comdlg32/cdlg_De.rc | 3 ++ dlls/comdlg32/cdlg_El.rc | 3 ++ dlls/comdlg32/cdlg_En.rc | 3 ++ dlls/comdlg32/cdlg_Eo.rc | 3 ++ dlls/comdlg32/cdlg_Es.rc | 3 ++ dlls/comdlg32/cdlg_Fi.rc | 3 ++ dlls/comdlg32/cdlg_Fr.rc | 3 ++ dlls/comdlg32/cdlg_Hu.rc | 3 ++ dlls/comdlg32/cdlg_It.rc | 3 ++ dlls/comdlg32/cdlg_Ja.rc | 5 ++- dlls/comdlg32/cdlg_Ko.rc | 3 ++ dlls/comdlg32/cdlg_Lt.rc | 4 ++- dlls/comdlg32/cdlg_Nl.rc | 3 ++ dlls/comdlg32/cdlg_No.rc | 3 ++ dlls/comdlg32/cdlg_Pl.rc | 3 ++ dlls/comdlg32/cdlg_Pt.rc | 3 ++ dlls/comdlg32/cdlg_Ro.rc | 5 ++- dlls/comdlg32/cdlg_Ru.rc | 3 ++ dlls/comdlg32/cdlg_Si.rc | 5 ++- dlls/comdlg32/cdlg_Sk.rc | 3 ++ dlls/comdlg32/cdlg_Sv.rc | 3 ++ dlls/comdlg32/cdlg_Th.rc | 3 ++ dlls/comdlg32/cdlg_Tr.rc | 3 ++ dlls/comdlg32/cdlg_Uk.rc | 3 ++ dlls/comdlg32/cdlg_Wa.rc | 3 ++ dlls/comdlg32/cdlg_Zh.rc | 5 ++- dlls/comdlg32/cdlg_xx.rc | 4 +-- dlls/comdlg32/rsrc.rc | 73 --------------------------------------------- 33 files changed, 123 insertions(+), 86 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a15c263237d68707b6f0a…

1 0