wine-commits July 2009

wine-commits@winehq.org

4 participants
1067 discussions

Tobias Jakobi : wined3d: Add ps_arb_max_local_constants.
by Alexandre Julliard 02 Jul '09

02 Jul '09

Module: wine Branch: master Commit: 2d532a1597f3fc2830a3c627ea6451f4680919c0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d532a1597f3fc2830a3c627e… Author: Tobias Jakobi <liquid.acid(a)gmx.net> Date: Wed Jul 1 18:36:45 2009 +0200 wined3d: Add ps_arb_max_local_constants. --- dlls/wined3d/directx.c | 4 ++++ dlls/wined3d/wined3d_gl.h | 1 + 2 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 523528f..4d16957 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -719,6 +719,7 @@ static BOOL IWineD3DImpl_FillGLCaps(WineD3D_GL_Info *gl_info) { gl_info->ps_glsl_constantsF = 0; gl_info->vs_arb_constantsF = 0; gl_info->ps_arb_constantsF = 0; + gl_info->ps_arb_max_local_constants = 0; /* Retrieve opengl defaults */ glGetIntegerv(GL_MAX_CLIP_PLANES, &gl_max); @@ -931,6 +932,9 @@ static BOOL IWineD3DImpl_FillGLCaps(WineD3D_GL_Info *gl_info) { GL_EXTCALL(glGetProgramivARB(GL_FRAGMENT_PROGRAM_ARB, GL_MAX_PROGRAM_ENV_PARAMETERS_ARB, &gl_max)); gl_info->ps_arb_constantsF = gl_max; TRACE_(d3d_caps)("Max ARB_FRAGMENT_PROGRAM float constants: %d\n", gl_info->ps_arb_constantsF); + GL_EXTCALL(glGetProgramivARB(GL_FRAGMENT_PROGRAM_ARB, GL_MAX_PROGRAM_LOCAL_PARAMETERS_ARB, &gl_max)); + gl_info->ps_arb_max_local_constants = gl_max; + TRACE_(d3d_caps)("Max ARB_FRAGMENT_PROGRAM local float constants: %d\n", gl_info->ps_arb_max_local_constants); GL_EXTCALL(glGetProgramivARB(GL_FRAGMENT_PROGRAM_ARB, GL_MAX_PROGRAM_NATIVE_TEMPORARIES_ARB, &gl_max)); gl_info->ps_arb_max_temps = gl_max; TRACE_(d3d_caps)("Max ARB_FRAGMENT_PROGRAM native temporaries: %d\n", gl_info->ps_arb_max_temps); diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index da35319..0c5cae5 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -3988,6 +3988,7 @@ typedef struct _WineD3D_GL_Info { unsigned vs_arb_max_instructions; unsigned vs_arb_max_temps; unsigned ps_arb_constantsF; + unsigned ps_arb_max_local_constants; unsigned ps_arb_max_instructions; unsigned ps_arb_max_temps; unsigned vs_glsl_constantsF;

1 0

Michael Stefaniuc : shell32: Build language resource files separately.
by Alexandre Julliard 02 Jul '09

02 Jul '09

Module: wine Branch: master Commit: ee8c98c05cadf8d8fabb77e40ba3dabf1f69feb2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee8c98c05cadf8d8fabb77e40… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jul 2 00:28:19 2009 +0200 shell32: Build language resource files separately. Do not include them from an other rc file. --- dlls/shell32/Makefile.in | 32 +++++++++++++++++++++++++++++- dlls/shell32/shell32_Bg.rc | 2 + dlls/shell32/shell32_Ca.rc | 2 + dlls/shell32/shell32_Cs.rc | 2 + dlls/shell32/shell32_Da.rc | 2 + dlls/shell32/shell32_De.rc | 2 + dlls/shell32/shell32_En.rc | 2 + dlls/shell32/shell32_Eo.rc | 2 + dlls/shell32/shell32_Es.rc | 2 + dlls/shell32/shell32_Fi.rc | 2 + dlls/shell32/shell32_Fr.rc | 4 +- dlls/shell32/shell32_Hu.rc | 2 + dlls/shell32/shell32_It.rc | 2 + dlls/shell32/shell32_Ja.rc | 4 +- dlls/shell32/shell32_Ko.rc | 2 + dlls/shell32/shell32_Lt.rc | 4 +- dlls/shell32/shell32_Nl.rc | 2 + dlls/shell32/shell32_No.rc | 2 + dlls/shell32/shell32_Pl.rc | 2 + dlls/shell32/shell32_Pt.rc | 2 + dlls/shell32/shell32_Ro.rc | 4 +- dlls/shell32/shell32_Ru.rc | 2 + dlls/shell32/shell32_Si.rc | 5 +-- dlls/shell32/shell32_Sk.rc | 2 + dlls/shell32/shell32_Sv.rc | 2 + dlls/shell32/shell32_Tr.rc | 2 + dlls/shell32/shell32_Uk.rc | 2 + dlls/shell32/shell32_Wa.rc | 2 + dlls/shell32/shell32_Zh.rc | 4 +- dlls/shell32/shres.rc | 46 -------------------------------------------- dlls/shell32/shresdef.h | 7 ++++++ 31 files changed, 94 insertions(+), 60 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ee8c98c05cadf8d8fabb7…

1 0

Michael Stefaniuc : shlwapi: Build language resource files separately.
by Alexandre Julliard 02 Jul '09

02 Jul '09

Module: wine Branch: master Commit: 5b9a7edaaf5cab7e85a99d19ba3f055f31652c64 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b9a7edaaf5cab7e85a99d19b… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jul 2 00:34:14 2009 +0200 shlwapi: Build language resource files separately. Do not include them from an other rc file. --- dlls/shlwapi/Makefile.in | 26 +++++++++++++++++++++- dlls/shlwapi/resource.h | 3 ++ dlls/shlwapi/shlwapi.rc | 51 -------------------------------------------- dlls/shlwapi/shlwapi_Da.rc | 2 + dlls/shlwapi/shlwapi_De.rc | 2 + dlls/shlwapi/shlwapi_En.rc | 2 + dlls/shlwapi/shlwapi_Eo.rc | 2 + dlls/shlwapi/shlwapi_Es.rc | 2 + dlls/shlwapi/shlwapi_Fi.rc | 2 + dlls/shlwapi/shlwapi_Fr.rc | 2 + dlls/shlwapi/shlwapi_Hu.rc | 2 + dlls/shlwapi/shlwapi_It.rc | 2 + dlls/shlwapi/shlwapi_Ja.rc | 4 +- dlls/shlwapi/shlwapi_Ko.rc | 2 + dlls/shlwapi/shlwapi_Lt.rc | 4 +- dlls/shlwapi/shlwapi_Nl.rc | 2 + dlls/shlwapi/shlwapi_No.rc | 2 + dlls/shlwapi/shlwapi_Pl.rc | 2 + dlls/shlwapi/shlwapi_Pt.rc | 2 + dlls/shlwapi/shlwapi_Ro.rc | 4 +- dlls/shlwapi/shlwapi_Ru.rc | 2 + dlls/shlwapi/shlwapi_Si.rc | 4 +- dlls/shlwapi/shlwapi_Sk.rc | 2 + dlls/shlwapi/shlwapi_Sv.rc | 2 + dlls/shlwapi/shlwapi_Tr.rc | 2 + dlls/shlwapi/shlwapi_Uk.rc | 2 + dlls/shlwapi/shlwapi_Zh.rc | 4 +- 27 files changed, 76 insertions(+), 62 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5b9a7edaaf5cab7e85a99…

1 0

Michael Stefaniuc : comctl32: Build language resource files separately.
by Alexandre Julliard 02 Jul '09

02 Jul '09

Module: wine Branch: master Commit: 4796550808bb96eba43fc63d748c7d00e119861c URL: http://source.winehq.org/git/wine.git/?a=commit;h=4796550808bb96eba43fc63d7… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jul 2 00:33:18 2009 +0200 comctl32: Build language resource files separately. Do not include them from an other rc file. --- dlls/comctl32/Makefile.in | 29 ++++++++++++++++++++++++++++- dlls/comctl32/comctl_Bg.rc | 2 ++ dlls/comctl32/comctl_Cs.rc | 2 ++ dlls/comctl32/comctl_De.rc | 2 ++ dlls/comctl32/comctl_El.rc | 2 ++ dlls/comctl32/comctl_En.rc | 2 ++ dlls/comctl32/comctl_Eo.rc | 2 ++ dlls/comctl32/comctl_Es.rc | 2 ++ dlls/comctl32/comctl_Fr.rc | 2 ++ dlls/comctl32/comctl_Hu.rc | 2 ++ dlls/comctl32/comctl_It.rc | 2 ++ dlls/comctl32/comctl_Ja.rc | 4 ++-- dlls/comctl32/comctl_Ko.rc | 2 ++ dlls/comctl32/comctl_Lt.rc | 4 ++-- dlls/comctl32/comctl_Nl.rc | 2 ++ dlls/comctl32/comctl_No.rc | 2 ++ dlls/comctl32/comctl_Pl.rc | 2 ++ dlls/comctl32/comctl_Pt.rc | 2 ++ dlls/comctl32/comctl_Ro.rc | 4 ++-- dlls/comctl32/comctl_Ru.rc | 2 ++ dlls/comctl32/comctl_Si.rc | 4 ++-- dlls/comctl32/comctl_Sk.rc | 2 ++ dlls/comctl32/comctl_Sv.rc | 2 ++ dlls/comctl32/comctl_Th.rc | 2 ++ dlls/comctl32/comctl_Tr.rc | 2 ++ dlls/comctl32/comctl_Uk.rc | 2 ++ dlls/comctl32/comctl_Zh.rc | 4 ++-- dlls/comctl32/rsrc.rc | 40 ---------------------------------------- 28 files changed, 80 insertions(+), 51 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4796550808bb96eba43fc…

1 0

Michael Stefaniuc : notepad: Build language resource files separately.
by Alexandre Julliard 02 Jul '09

02 Jul '09

Module: wine Branch: master Commit: 8e2f63684bdfc59c835bfe9e071ae7633aa9dba9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e2f63684bdfc59c835bfe9e0… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jul 2 00:29:04 2009 +0200 notepad: Build language resource files separately. Do not include them from an other rc file. --- programs/notepad/Bg.rc | 2 ++ programs/notepad/Cs.rc | 2 ++ programs/notepad/Da.rc | 2 ++ programs/notepad/De.rc | 2 ++ programs/notepad/En.rc | 2 ++ programs/notepad/Eo.rc | 2 ++ programs/notepad/Es.rc | 2 ++ programs/notepad/Fi.rc | 2 ++ programs/notepad/Fr.rc | 2 ++ programs/notepad/Hu.rc | 2 ++ programs/notepad/It.rc | 2 ++ programs/notepad/Ja.rc | 4 ++-- programs/notepad/Ko.rc | 2 ++ programs/notepad/Lt.rc | 3 ++- programs/notepad/Makefile.in | 29 ++++++++++++++++++++++++++++- programs/notepad/Nl.rc | 2 ++ programs/notepad/No.rc | 2 ++ programs/notepad/Pl.rc | 2 ++ programs/notepad/Pt.rc | 2 ++ programs/notepad/Ro.rc | 4 ++-- programs/notepad/Ru.rc | 2 ++ programs/notepad/Si.rc | 4 ++-- programs/notepad/Sv.rc | 2 ++ programs/notepad/Th.rc | 2 ++ programs/notepad/Tr.rc | 2 ++ programs/notepad/Wa.rc | 2 ++ programs/notepad/Zh.rc | 4 ++-- programs/notepad/notepad_res.h | 3 +++ programs/notepad/rsrc.rc | 33 --------------------------------- 29 files changed, 83 insertions(+), 43 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8e2f63684bdfc59c835bf…

1 0

Michael Stefaniuc : winhlp32: Build language resource files separately.
by Alexandre Julliard 02 Jul '09

02 Jul '09

Module: wine Branch: master Commit: 99e179445c28d66eef37dea2317680bec7f42da2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=99e179445c28d66eef37dea23… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jul 2 00:31:44 2009 +0200 winhlp32: Build language resource files separately. Do not include them from an other rc file. --- programs/winhlp32/Bg.rc | 2 ++ programs/winhlp32/Cs.rc | 2 ++ programs/winhlp32/Da.rc | 2 ++ programs/winhlp32/De.rc | 2 ++ programs/winhlp32/En.rc | 2 ++ programs/winhlp32/Eo.rc | 2 ++ programs/winhlp32/Es.rc | 2 ++ programs/winhlp32/Fi.rc | 2 ++ programs/winhlp32/Fr.rc | 2 ++ programs/winhlp32/Hu.rc | 2 ++ programs/winhlp32/It.rc | 2 ++ programs/winhlp32/Ja.rc | 4 ++-- programs/winhlp32/Ko.rc | 2 ++ programs/winhlp32/Lt.rc | 4 ++-- programs/winhlp32/Makefile.in | 29 ++++++++++++++++++++++++++++- programs/winhlp32/Nl.rc | 2 ++ programs/winhlp32/No.rc | 2 ++ programs/winhlp32/Pl.rc | 2 ++ programs/winhlp32/Pt.rc | 2 ++ programs/winhlp32/Rm.rc | 2 ++ programs/winhlp32/Ru.rc | 2 ++ programs/winhlp32/Si.rc | 4 ++-- programs/winhlp32/Sk.rc | 2 ++ programs/winhlp32/Sv.rc | 2 ++ programs/winhlp32/Tr.rc | 2 ++ programs/winhlp32/Wa.rc | 2 ++ programs/winhlp32/Zh.rc | 4 ++-- programs/winhlp32/rsrc.rc | 31 ------------------------------- programs/winhlp32/winhelp_res.h | 3 +++ 29 files changed, 83 insertions(+), 40 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=99e179445c28d66eef37d…

1 0

Michael Stefaniuc : oledlg: Build language resource files separately.
by Alexandre Julliard 02 Jul '09

02 Jul '09

Module: wine Branch: master Commit: 2d170ae85092d1a4a6b6f284a23cfbbbf3d2edbb URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d170ae85092d1a4a6b6f284a… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jul 2 00:34:01 2009 +0200 oledlg: Build language resource files separately. Do not include them from an other rc file. --- dlls/oledlg/Makefile.in | 22 +++++++++++++++++- dlls/oledlg/oledlg_Cs.rc | 2 + dlls/oledlg/oledlg_Da.rc | 2 + dlls/oledlg/oledlg_De.rc | 2 + dlls/oledlg/oledlg_En.rc | 2 + dlls/oledlg/oledlg_Es.rc | 2 + dlls/oledlg/oledlg_Fr.rc | 1 + dlls/oledlg/oledlg_Hu.rc | 2 + dlls/oledlg/oledlg_It.rc | 2 + dlls/oledlg/oledlg_Ja.rc | 4 +- dlls/oledlg/oledlg_Ko.rc | 2 + dlls/oledlg/oledlg_Lt.rc | 4 +- dlls/oledlg/oledlg_Nl.rc | 2 + dlls/oledlg/oledlg_No.rc | 2 + dlls/oledlg/oledlg_Pl.rc | 2 + dlls/oledlg/oledlg_Pt.rc | 2 + dlls/oledlg/oledlg_Ru.rc | 2 + dlls/oledlg/oledlg_Si.rc | 4 +- dlls/oledlg/oledlg_Sv.rc | 2 + dlls/oledlg/oledlg_Tr.rc | 2 + dlls/oledlg/oledlg_Zh.rc | 4 +- dlls/oledlg/resource.h | 2 + dlls/oledlg/rsrc.rc | 55 ---------------------------------------------- 23 files changed, 62 insertions(+), 64 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2d170ae85092d1a4a6b6f…

1 0

Michael Stefaniuc : credui: Build language resource files separately.
by Alexandre Julliard 02 Jul '09

02 Jul '09

Module: wine Branch: master Commit: 6b6ff6afa4eae2df37b349c9244bc4abc60988e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6b6ff6afa4eae2df37b349c92… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jul 2 00:33:27 2009 +0200 credui: Build language resource files separately. Do not include them from an other rc file. --- dlls/credui/Makefile.in | 19 ++++++++++++++++++- dlls/credui/credui.rc | 21 --------------------- dlls/credui/credui_Da.rc | 2 ++ dlls/credui/credui_De.rc | 2 ++ dlls/credui/credui_En.rc | 2 ++ dlls/credui/credui_Es.rc | 5 +++-- dlls/credui/credui_Fr.rc | 5 +++-- dlls/credui/credui_Ko.rc | 2 ++ dlls/credui/credui_Lt.rc | 4 ++-- dlls/credui/credui_Nl.rc | 2 ++ dlls/credui/credui_No.rc | 2 ++ dlls/credui/credui_Pl.rc | 2 ++ dlls/credui/credui_Pt.rc | 2 ++ dlls/credui/credui_Ro.rc | 4 ++-- dlls/credui/credui_Ru.rc | 2 ++ dlls/credui/credui_Si.rc | 4 ++-- dlls/credui/credui_Sv.rc | 2 ++ dlls/credui/credui_Zh.rc | 4 ++-- dlls/credui/credui_resources.h | 3 +++ 19 files changed, 55 insertions(+), 34 deletions(-) diff --git a/dlls/credui/Makefile.in b/dlls/credui/Makefile.in index c9d574f..f29278c 100644 --- a/dlls/credui/Makefile.in +++ b/dlls/credui/Makefile.in @@ -9,7 +9,24 @@ IMPORTS = comctl32 user32 advapi32 kernel32 C_SRCS = \ credui_main.c -RC_SRCS = credui.rc +RC_SRCS = \ + credui.rc \ + credui_Da.rc \ + credui_De.rc \ + credui_En.rc \ + credui_Es.rc \ + credui_Fr.rc \ + credui_Ko.rc \ + credui_Lt.rc \ + credui_Nl.rc \ + credui_No.rc \ + credui_Pl.rc \ + credui_Pt.rc \ + credui_Ro.rc \ + credui_Ru.rc \ + credui_Si.rc \ + credui_Sv.rc \ + credui_Zh.rc @MAKE_DLL_RULES@ diff --git a/dlls/credui/credui.rc b/dlls/credui/credui.rc index f66a942..0f16f00 100644 --- a/dlls/credui/credui.rc +++ b/dlls/credui/credui.rc @@ -18,28 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "winnls.h" #include "credui_resources.h" /* @makedep: banner.bmp */ IDB_BANNER BITMAP LOADONCALL DISCARDABLE banner.bmp - -#include "credui_Da.rc" -#include "credui_De.rc" -#include "credui_En.rc" -#include "credui_Es.rc" -#include "credui_Fr.rc" -#include "credui_Ko.rc" -#include "credui_Lt.rc" -#include "credui_Nl.rc" -#include "credui_No.rc" -#include "credui_Pl.rc" -#include "credui_Pt.rc" -#include "credui_Ro.rc" -#include "credui_Ru.rc" -#include "credui_Si.rc" -#include "credui_Sv.rc" -#include "credui_Zh.rc" diff --git a/dlls/credui/credui_Da.rc b/dlls/credui/credui_Da.rc index d5e7608..26ef991 100644 --- a/dlls/credui/credui_Da.rc +++ b/dlls/credui/credui_Da.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "credui_resources.h" + LANGUAGE LANG_DANISH, SUBLANG_DEFAULT IDD_CREDDIALOG DIALOG DISCARDABLE 0, 0, 213, 149 diff --git a/dlls/credui/credui_De.rc b/dlls/credui/credui_De.rc index 7c197d6..9e72698 100644 --- a/dlls/credui/credui_De.rc +++ b/dlls/credui/credui_De.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "credui_resources.h" + LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL IDD_CREDDIALOG DIALOG DISCARDABLE 0, 0, 213, 149 diff --git a/dlls/credui/credui_En.rc b/dlls/credui/credui_En.rc index 8e475bb..feb4afc 100644 --- a/dlls/credui/credui_En.rc +++ b/dlls/credui/credui_En.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "credui_resources.h" + LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT IDD_CREDDIALOG DIALOG DISCARDABLE 0, 0, 213, 149 diff --git a/dlls/credui/credui_Es.rc b/dlls/credui/credui_Es.rc index 0a48b3f..8f71d5f 100644 --- a/dlls/credui/credui_Es.rc +++ b/dlls/credui/credui_Es.rc @@ -18,6 +18,9 @@ * 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 "credui_resources.h" + #pragma code_page(65001) LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL @@ -50,5 +53,3 @@ STRINGTABLE DISCARDABLE IDS_CAPSLOCKONTITLE "Bloq Mayus está activado" IDS_CAPSLOCKON "El Bloq Mayus activado puede hacer que entre su contraseña incorrectamente.\n\nPulse la tecla Bloq Mayus de su teclado para desactivar Bloq Mayus antes\n de introducir su contraseña." } - -#pragma code_page(default) diff --git a/dlls/credui/credui_Fr.rc b/dlls/credui/credui_Fr.rc index fb7cd12..387a86d 100644 --- a/dlls/credui/credui_Fr.rc +++ b/dlls/credui/credui_Fr.rc @@ -17,6 +17,9 @@ * 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 "credui_resources.h" + #pragma code_page(65001) LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL @@ -49,5 +52,3 @@ STRINGTABLE DISCARDABLE IDS_CAPSLOCKONTITLE "VERR.MAJ est activé" IDS_CAPSLOCKON "Le verrouillage majuscule étant activé, cela pourrait provoquer une erreur lors de la saisie de votre mot de passe.\n\nAppuyez sur la touche VERR.MAJ de votre clavier afin de désactiver le verrouilage majuscule avant\nde saisir votre mot de passe." } - -#pragma code_page(default) diff --git a/dlls/credui/credui_Ko.rc b/dlls/credui/credui_Ko.rc index 62bd135..ab1f1ec 100644 --- a/dlls/credui/credui_Ko.rc +++ b/dlls/credui/credui_Ko.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "credui_resources.h" + LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT IDD_CREDDIALOG DIALOG DISCARDABLE 0, 0, 213, 149 diff --git a/dlls/credui/credui_Lt.rc b/dlls/credui/credui_Lt.rc index 9ad3e4b..4eb6eba 100644 --- a/dlls/credui/credui_Lt.rc +++ b/dlls/credui/credui_Lt.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "credui_resources.h" + /* UTF-8 */ #pragma code_page(65001) @@ -51,5 +53,3 @@ STRINGTABLE DISCARDABLE IDS_CAPSLOCKONTITLE "Didžiųjų raidžių būsena įjungta" IDS_CAPSLOCKON "Kai įjungta didžiųjų raidžių būsena, savo slaptažodį galite įvesti neteisingai.\n\nPaspauskite didžiųjų raidžių klaviatūros klavišą didžiųjų raidžių būsenai išjungti\nprieš rinkdami savo slaptažodį." } - -#pragma code_page(default) diff --git a/dlls/credui/credui_Nl.rc b/dlls/credui/credui_Nl.rc index ed5c41e..575496c 100644 --- a/dlls/credui/credui_Nl.rc +++ b/dlls/credui/credui_Nl.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "credui_resources.h" + LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL IDD_CREDDIALOG DIALOG DISCARDABLE 0, 0, 213, 149 diff --git a/dlls/credui/credui_No.rc b/dlls/credui/credui_No.rc index cc09cd8..c47fec1 100644 --- a/dlls/credui/credui_No.rc +++ b/dlls/credui/credui_No.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "credui_resources.h" + LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL IDD_CREDDIALOG DIALOG DISCARDABLE 0, 0, 213, 149 diff --git a/dlls/credui/credui_Pl.rc b/dlls/credui/credui_Pl.rc index 902ced6..e2fab5c 100644 --- a/dlls/credui/credui_Pl.rc +++ b/dlls/credui/credui_Pl.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "credui_resources.h" + LANGUAGE LANG_POLISH, SUBLANG_DEFAULT IDD_CREDDIALOG DIALOG DISCARDABLE 0, 0, 213, 149 diff --git a/dlls/credui/credui_Pt.rc b/dlls/credui/credui_Pt.rc index 930fb43..2283e43 100644 --- a/dlls/credui/credui_Pt.rc +++ b/dlls/credui/credui_Pt.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "credui_resources.h" + LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL IDD_CREDDIALOG DIALOG DISCARDABLE 0, 0, 213, 149 diff --git a/dlls/credui/credui_Ro.rc b/dlls/credui/credui_Ro.rc index 3d3367e..29e9899 100644 --- a/dlls/credui/credui_Ro.rc +++ b/dlls/credui/credui_Ro.rc @@ -17,6 +17,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "credui_resources.h" + LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL #pragma code_page(65001) @@ -49,5 +51,3 @@ STRINGTABLE DISCARDABLE IDS_CAPSLOCKONTITLE "Tasta Caps Lock este activată" IDS_CAPSLOCKON "Cu tasta Caps Lock activată este foarte probabil că veți introduce parola greșit.\n\nInainte de a introduce parola apăsați tasta Caps Lock pentru a dezactiva scrierea cu majuscule." } - -#pragma code_page(default) diff --git a/dlls/credui/credui_Ru.rc b/dlls/credui/credui_Ru.rc index fce2c5f..a990525 100644 --- a/dlls/credui/credui_Ru.rc +++ b/dlls/credui/credui_Ru.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "credui_resources.h" + LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT IDD_CREDDIALOG DIALOG DISCARDABLE 0, 0, 213, 149 diff --git a/dlls/credui/credui_Si.rc b/dlls/credui/credui_Si.rc index d2152ad..34915e6 100644 --- a/dlls/credui/credui_Si.rc +++ b/dlls/credui/credui_Si.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "credui_resources.h" + #pragma code_page(65001) LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT @@ -50,5 +52,3 @@ STRINGTABLE DISCARDABLE IDS_CAPSLOCKONTITLE "Caps Lock je vključen" IDS_CAPSLOCKON "Vključen Caps Lock je lahko vzrok nepravilnega vnosa gesla.\n\nPritisnite tipko Caps Lock, s čimer ga izklopite\nin ponovno vnesite geslo." } - -#pragma code_page(default) diff --git a/dlls/credui/credui_Sv.rc b/dlls/credui/credui_Sv.rc index 453b7a3..a43c216 100644 --- a/dlls/credui/credui_Sv.rc +++ b/dlls/credui/credui_Sv.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "credui_resources.h" + LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL IDD_CREDDIALOG DIALOG DISCARDABLE 0, 0, 213, 149 diff --git a/dlls/credui/credui_Zh.rc b/dlls/credui/credui_Zh.rc index 99294c7..041aecd 100644 --- a/dlls/credui/credui_Zh.rc +++ b/dlls/credui/credui_Zh.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "credui_resources.h" + /* Chinese text is encoded in UTF-8 */ #pragma code_page(65001) @@ -82,5 +84,3 @@ STRINGTABLE DISCARDABLE IDS_CAPSLOCKONTITLE "大寫鎖定開著" IDS_CAPSLOCKON "開著大寫鎖定可能導致你輸入錯誤的密碼." } - -#pragma code_page(default) diff --git a/dlls/credui/credui_resources.h b/dlls/credui/credui_resources.h index e5bd8ee..0a6ab72 100644 --- a/dlls/credui/credui_resources.h +++ b/dlls/credui/credui_resources.h @@ -16,6 +16,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include <windef.h> +#include <winuser.h> + #define IDD_CREDDIALOG 100 #define IDC_USERNAME 101 #define IDC_PASSWORD 102

1 0

Michael Stefaniuc : view: Build language resource files separately.
by Alexandre Julliard 02 Jul '09

02 Jul '09

Module: wine Branch: master Commit: c135e063c431aafdeb5a6f57ddf0d12341b3c74e URL: http://source.winehq.org/git/wine.git/?a=commit;h=c135e063c431aafdeb5a6f57d… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jul 2 00:30:31 2009 +0200 view: Build language resource files separately. Do not include them from an other rc file. --- programs/view/Cs.rc | 2 + programs/view/Da.rc | 2 + programs/view/De.rc | 2 + programs/view/En.rc | 2 + programs/view/Eo.rc | 2 + programs/view/Es.rc | 2 + programs/view/Fr.rc | 2 + programs/view/It.rc | 2 + programs/view/Ja.rc | 4 +- programs/view/Ko.rc | 2 + programs/view/Lt.rc | 4 +- programs/view/Makefile.in | 23 ++++++++++++++++++++- programs/view/Nl.rc | 2 + programs/view/No.rc | 2 + programs/view/Pl.rc | 2 + programs/view/Pt.rc | 2 + programs/view/Ro.rc | 4 +- programs/view/Ru.rc | 2 + programs/view/Si.rc | 4 +- programs/view/Sv.rc | 2 + programs/view/Tr.rc | 2 + programs/view/Zh.rc | 4 +- programs/view/resource.h | 2 + programs/view/viewrc.rc | 49 --------------------------------------------- 24 files changed, 66 insertions(+), 60 deletions(-) diff --git a/programs/view/Cs.rc b/programs/view/Cs.rc index ca34121..58ee9ca 100644 --- a/programs/view/Cs.rc +++ b/programs/view/Cs.rc @@ -22,6 +22,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_CZECH, SUBLANG_DEFAULT /* Czech strings in CP1250 */ diff --git a/programs/view/Da.rc b/programs/view/Da.rc index 91fd214..8996cf8 100644 --- a/programs/view/Da.rc +++ b/programs/view/Da.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_DANISH, SUBLANG_DEFAULT /* diff --git a/programs/view/De.rc b/programs/view/De.rc index 5e7cf31..b77fc82 100644 --- a/programs/view/De.rc +++ b/programs/view/De.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL /* diff --git a/programs/view/En.rc b/programs/view/En.rc index 042f303..b201290 100644 --- a/programs/view/En.rc +++ b/programs/view/En.rc @@ -20,6 +20,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT /* diff --git a/programs/view/Eo.rc b/programs/view/Eo.rc index bcdeba7..bc61a8d 100644 --- a/programs/view/Eo.rc +++ b/programs/view/Eo.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_ESPERANTO, SUBLANG_DEFAULT /* diff --git a/programs/view/Es.rc b/programs/view/Es.rc index f1b897d..e0f53f3 100644 --- a/programs/view/Es.rc +++ b/programs/view/Es.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL /* diff --git a/programs/view/Fr.rc b/programs/view/Fr.rc index b2ab0a4..786a63d 100644 --- a/programs/view/Fr.rc +++ b/programs/view/Fr.rc @@ -21,6 +21,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL /* diff --git a/programs/view/It.rc b/programs/view/It.rc index 37747ce..0839c44 100644 --- a/programs/view/It.rc +++ b/programs/view/It.rc @@ -21,6 +21,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL /* diff --git a/programs/view/Ja.rc b/programs/view/Ja.rc index 46c8e11..0b69216 100644 --- a/programs/view/Ja.rc +++ b/programs/view/Ja.rc @@ -20,6 +20,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + /* UTF-8 */ #pragma code_page(65001) @@ -72,5 +74,3 @@ STRINGTABLE DISCARDABLE BEGIN IDS_DESCRIPTION "標準メタファイルビュアー" END - -#pragma code_page(default) diff --git a/programs/view/Ko.rc b/programs/view/Ko.rc index 5df207b..3451626 100644 --- a/programs/view/Ko.rc +++ b/programs/view/Ko.rc @@ -21,6 +21,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT /* diff --git a/programs/view/Lt.rc b/programs/view/Lt.rc index cbce3bb..fdcf731 100644 --- a/programs/view/Lt.rc +++ b/programs/view/Lt.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + /* UTF-8 */ #pragma code_page(65001) @@ -71,5 +73,3 @@ STRINGTABLE DISCARDABLE BEGIN IDS_DESCRIPTION "Įprastinė metafailų žiūryklė" END - -#pragma code_page(default) diff --git a/programs/view/Makefile.in b/programs/view/Makefile.in index 134a2b4..ff34532 100644 --- a/programs/view/Makefile.in +++ b/programs/view/Makefile.in @@ -11,7 +11,28 @@ C_SRCS = \ view.c \ winmain.c -RC_SRCS = viewrc.rc +RC_SRCS = \ + Cs.rc \ + Da.rc \ + De.rc \ + En.rc \ + Eo.rc \ + Es.rc \ + Fr.rc \ + It.rc \ + Ja.rc \ + Ko.rc \ + Lt.rc \ + Nl.rc \ + No.rc \ + Pl.rc \ + Pt.rc \ + Ro.rc \ + Ru.rc \ + Si.rc \ + Sv.rc \ + Tr.rc \ + Zh.rc @MAKE_PROG_RULES@ diff --git a/programs/view/Nl.rc b/programs/view/Nl.rc index 34a9d4f..623506b 100644 --- a/programs/view/Nl.rc +++ b/programs/view/Nl.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL /* diff --git a/programs/view/No.rc b/programs/view/No.rc index e728966..4a18853 100644 --- a/programs/view/No.rc +++ b/programs/view/No.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL /* diff --git a/programs/view/Pl.rc b/programs/view/Pl.rc index 3f3e937..28828d8 100644 --- a/programs/view/Pl.rc +++ b/programs/view/Pl.rc @@ -20,6 +20,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_POLISH, SUBLANG_DEFAULT /* diff --git a/programs/view/Pt.rc b/programs/view/Pt.rc index 47aab01..3003080 100644 --- a/programs/view/Pt.rc +++ b/programs/view/Pt.rc @@ -20,6 +20,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + /* * * Menu diff --git a/programs/view/Ro.rc b/programs/view/Ro.rc index b03fe31..8c05f06 100644 --- a/programs/view/Ro.rc +++ b/programs/view/Ro.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL #pragma code_page(65001) @@ -69,5 +71,3 @@ STRINGTABLE DISCARDABLE BEGIN IDS_DESCRIPTION "Vizualizator de fișiere metafile normale" END - -#pragma code_page(default) diff --git a/programs/view/Ru.rc b/programs/view/Ru.rc index cbdc28e..9d4d39e 100644 --- a/programs/view/Ru.rc +++ b/programs/view/Ru.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT /* diff --git a/programs/view/Si.rc b/programs/view/Si.rc index 8cb4988..8e6a0f2 100644 --- a/programs/view/Si.rc +++ b/programs/view/Si.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + #pragma code_page(65001) LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT @@ -70,5 +72,3 @@ STRINGTABLE DISCARDABLE BEGIN IDS_DESCRIPTION "Program za ogled Metafile slik" END - -#pragma code_page(default) diff --git a/programs/view/Sv.rc b/programs/view/Sv.rc index b1bb50d..2f7eea3 100644 --- a/programs/view/Sv.rc +++ b/programs/view/Sv.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL /* diff --git a/programs/view/Tr.rc b/programs/view/Tr.rc index 38ed849..3e6ea6f 100644 --- a/programs/view/Tr.rc +++ b/programs/view/Tr.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT /* diff --git a/programs/view/Zh.rc b/programs/view/Zh.rc index 84bd638..05067f8 100644 --- a/programs/view/Zh.rc +++ b/programs/view/Zh.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + /* Chinese text is encoded in UTF-8 */ #pragma code_page(65001) @@ -120,5 +122,3 @@ STRINGTABLE DISCARDABLE BEGIN IDS_DESCRIPTION "普通 Metafile 閱讀器" END - -#pragma code_page(default) diff --git a/programs/view/resource.h b/programs/view/resource.h index 619da49..7932687 100644 --- a/programs/view/resource.h +++ b/programs/view/resource.h @@ -16,6 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include <windef.h> + #define IDS_DESCRIPTION 2 #define IDI_APPICON 101 #define IDM_EXIT 1000 diff --git a/programs/view/viewrc.rc b/programs/view/viewrc.rc deleted file mode 100644 index 6217cf6..0000000 --- a/programs/view/viewrc.rc +++ /dev/null @@ -1,49 +0,0 @@ -/* - * Copyright 1998 Douglas Ridgway - * - * 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 "resource.h" - -#include "Cs.rc" -#include "Da.rc" -#include "De.rc" -#include "En.rc" -#include "Eo.rc" -#include "Es.rc" -#include "Fr.rc" -#include "It.rc" -#include "Ja.rc" -#include "Ko.rc" -#include "Lt.rc" -#include "Nl.rc" -#include "No.rc" -#include "Pl.rc" -#include "Pt.rc" -#include "Ro.rc" -#include "Ru.rc" -#include "Si.rc" -#include "Sv.rc" -#include "Tr.rc" -#include "Zh.rc" - -/* - * Icon - */ - -/*IDI_APPICON ICON DISCARDABLE "view.ico"*/

1 0

Michael Stefaniuc : msvfw32: Build language resource files separately.
by Alexandre Julliard 02 Jul '09

02 Jul '09

Module: wine Branch: master Commit: 4149385b93385d5b8167ec69463890b7aef2550f URL: http://source.winehq.org/git/wine.git/?a=commit;h=4149385b93385d5b8167ec694… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jul 2 00:27:22 2009 +0200 msvfw32: Build language resource files separately. Do not include them from an other rc file. --- dlls/msvfw32/Makefile.in | 19 ++++++++++++++++++- dlls/msvfw32/msvfw32_Da.rc | 2 ++ dlls/msvfw32/msvfw32_De.rc | 2 ++ dlls/msvfw32/msvfw32_En.rc | 2 ++ dlls/msvfw32/msvfw32_Es.rc | 2 ++ dlls/msvfw32/msvfw32_Fr.rc | 2 ++ dlls/msvfw32/msvfw32_Hu.rc | 2 ++ dlls/msvfw32/msvfw32_Ko.rc | 2 ++ dlls/msvfw32/msvfw32_Lt.rc | 4 ++-- dlls/msvfw32/msvfw32_Nl.rc | 2 ++ dlls/msvfw32/msvfw32_No.rc | 2 ++ dlls/msvfw32/msvfw32_Pl.rc | 2 ++ dlls/msvfw32/msvfw32_Pt.rc | 2 ++ dlls/msvfw32/msvfw32_Ru.rc | 2 ++ dlls/msvfw32/msvfw32_Si.rc | 4 ++-- dlls/msvfw32/msvfw32_Sv.rc | 2 ++ dlls/msvfw32/msvfw32_Tr.rc | 2 ++ dlls/msvfw32/msvfw32_Zh.rc | 4 ++-- dlls/msvfw32/msvideo_private.h | 3 +++ dlls/msvfw32/rsrc.rc | 39 --------------------------------------- 20 files changed, 55 insertions(+), 46 deletions(-) diff --git a/dlls/msvfw32/Makefile.in b/dlls/msvfw32/Makefile.in index 8347fe8..4eb3b10 100644 --- a/dlls/msvfw32/Makefile.in +++ b/dlls/msvfw32/Makefile.in @@ -11,7 +11,24 @@ C_SRCS = \ msvideo_main.c \ drawdib.c -RC_SRCS = rsrc.rc +RC_SRCS = \ + msvfw32_Da.rc \ + msvfw32_De.rc \ + msvfw32_En.rc \ + msvfw32_Es.rc \ + msvfw32_Fr.rc \ + msvfw32_Hu.rc \ + msvfw32_Ko.rc \ + msvfw32_Lt.rc \ + msvfw32_Nl.rc \ + msvfw32_No.rc \ + msvfw32_Pl.rc \ + msvfw32_Pt.rc \ + msvfw32_Ru.rc \ + msvfw32_Si.rc \ + msvfw32_Sv.rc \ + msvfw32_Tr.rc \ + msvfw32_Zh.rc @MAKE_DLL_RULES@ diff --git a/dlls/msvfw32/msvfw32_Da.rc b/dlls/msvfw32/msvfw32_Da.rc index 32b5489..20d60e2 100644 --- a/dlls/msvfw32/msvfw32_Da.rc +++ b/dlls/msvfw32/msvfw32_Da.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "msvideo_private.h" + LANGUAGE LANG_DANISH, SUBLANG_DEFAULT ICM_CHOOSE_COMPRESSOR DIALOG DISCARDABLE 36, 24, 187, 95 diff --git a/dlls/msvfw32/msvfw32_De.rc b/dlls/msvfw32/msvfw32_De.rc index 29b5f4b..ff822dd 100644 --- a/dlls/msvfw32/msvfw32_De.rc +++ b/dlls/msvfw32/msvfw32_De.rc @@ -17,6 +17,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "msvideo_private.h" + LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL ICM_CHOOSE_COMPRESSOR DIALOG DISCARDABLE 36, 24, 187, 95 diff --git a/dlls/msvfw32/msvfw32_En.rc b/dlls/msvfw32/msvfw32_En.rc index 1a563dd..f3ee735 100644 --- a/dlls/msvfw32/msvfw32_En.rc +++ b/dlls/msvfw32/msvfw32_En.rc @@ -16,6 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "msvideo_private.h" + LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT ICM_CHOOSE_COMPRESSOR DIALOG DISCARDABLE 36, 24, 187, 95 diff --git a/dlls/msvfw32/msvfw32_Es.rc b/dlls/msvfw32/msvfw32_Es.rc index aa4d3f0..2745361 100644 --- a/dlls/msvfw32/msvfw32_Es.rc +++ b/dlls/msvfw32/msvfw32_Es.rc @@ -17,6 +17,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "msvideo_private.h" + LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL ICM_CHOOSE_COMPRESSOR DIALOG DISCARDABLE 36, 24, 187, 95 diff --git a/dlls/msvfw32/msvfw32_Fr.rc b/dlls/msvfw32/msvfw32_Fr.rc index 9318ee4..cd2c056 100644 --- a/dlls/msvfw32/msvfw32_Fr.rc +++ b/dlls/msvfw32/msvfw32_Fr.rc @@ -16,6 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "msvideo_private.h" + LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL ICM_CHOOSE_COMPRESSOR DIALOG DISCARDABLE 36, 24, 187, 95 diff --git a/dlls/msvfw32/msvfw32_Hu.rc b/dlls/msvfw32/msvfw32_Hu.rc index aa0eefc..e77b67f 100644 --- a/dlls/msvfw32/msvfw32_Hu.rc +++ b/dlls/msvfw32/msvfw32_Hu.rc @@ -16,6 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "msvideo_private.h" + LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT ICM_CHOOSE_COMPRESSOR DIALOG DISCARDABLE 36, 24, 187, 95 diff --git a/dlls/msvfw32/msvfw32_Ko.rc b/dlls/msvfw32/msvfw32_Ko.rc index 4d6527e..72e999d 100644 --- a/dlls/msvfw32/msvfw32_Ko.rc +++ b/dlls/msvfw32/msvfw32_Ko.rc @@ -17,6 +17,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "msvideo_private.h" + LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT ICM_CHOOSE_COMPRESSOR DIALOG DISCARDABLE 36, 24, 187, 95 diff --git a/dlls/msvfw32/msvfw32_Lt.rc b/dlls/msvfw32/msvfw32_Lt.rc index 21b9902..c7432d3 100644 --- a/dlls/msvfw32/msvfw32_Lt.rc +++ b/dlls/msvfw32/msvfw32_Lt.rc @@ -16,6 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "msvideo_private.h" + /* UTF-8 */ #pragma code_page(65001) @@ -52,5 +54,3 @@ STRINGTABLE DISCARDABLE { IDS_FULLFRAMES "Pilni kadrai (neglaudinti)" } - -#pragma code_page(default) diff --git a/dlls/msvfw32/msvfw32_Nl.rc b/dlls/msvfw32/msvfw32_Nl.rc index e1236f7..d82f860 100644 --- a/dlls/msvfw32/msvfw32_Nl.rc +++ b/dlls/msvfw32/msvfw32_Nl.rc @@ -16,6 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "msvideo_private.h" + LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL ICM_CHOOSE_COMPRESSOR DIALOG DISCARDABLE 36, 24, 187, 95 diff --git a/dlls/msvfw32/msvfw32_No.rc b/dlls/msvfw32/msvfw32_No.rc index 41a24e3..eb07aed 100644 --- a/dlls/msvfw32/msvfw32_No.rc +++ b/dlls/msvfw32/msvfw32_No.rc @@ -16,6 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "msvideo_private.h" + LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL ICM_CHOOSE_COMPRESSOR DIALOG DISCARDABLE 36, 24, 187, 95 diff --git a/dlls/msvfw32/msvfw32_Pl.rc b/dlls/msvfw32/msvfw32_Pl.rc index 53ee33c..cb5a9eb 100644 --- a/dlls/msvfw32/msvfw32_Pl.rc +++ b/dlls/msvfw32/msvfw32_Pl.rc @@ -17,6 +17,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "msvideo_private.h" + LANGUAGE LANG_POLISH, SUBLANG_DEFAULT ICM_CHOOSE_COMPRESSOR DIALOG DISCARDABLE 36, 24, 207, 95 diff --git a/dlls/msvfw32/msvfw32_Pt.rc b/dlls/msvfw32/msvfw32_Pt.rc index 0640870..efd3119 100644 --- a/dlls/msvfw32/msvfw32_Pt.rc +++ b/dlls/msvfw32/msvfw32_Pt.rc @@ -16,6 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "msvideo_private.h" + LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL ICM_CHOOSE_COMPRESSOR DIALOG DISCARDABLE 36, 24, 187, 95 diff --git a/dlls/msvfw32/msvfw32_Ru.rc b/dlls/msvfw32/msvfw32_Ru.rc index 96c8a81..5b42d19 100644 --- a/dlls/msvfw32/msvfw32_Ru.rc +++ b/dlls/msvfw32/msvfw32_Ru.rc @@ -16,6 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "msvideo_private.h" + LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT ICM_CHOOSE_COMPRESSOR DIALOG DISCARDABLE 36, 24, 187, 95 diff --git a/dlls/msvfw32/msvfw32_Si.rc b/dlls/msvfw32/msvfw32_Si.rc index 05d1ba5..93fb175 100644 --- a/dlls/msvfw32/msvfw32_Si.rc +++ b/dlls/msvfw32/msvfw32_Si.rc @@ -16,6 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "msvideo_private.h" + #pragma code_page(65001) LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT @@ -51,5 +53,3 @@ STRINGTABLE DISCARDABLE { IDS_FULLFRAMES "Polne slike (nestisnjeno)" } - -#pragma code_page(default) diff --git a/dlls/msvfw32/msvfw32_Sv.rc b/dlls/msvfw32/msvfw32_Sv.rc index 68f5167..2461fce 100644 --- a/dlls/msvfw32/msvfw32_Sv.rc +++ b/dlls/msvfw32/msvfw32_Sv.rc @@ -16,6 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "msvideo_private.h" + LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL ICM_CHOOSE_COMPRESSOR DIALOG DISCARDABLE 36, 24, 187, 95 diff --git a/dlls/msvfw32/msvfw32_Tr.rc b/dlls/msvfw32/msvfw32_Tr.rc index b9da7c2..0963509 100644 --- a/dlls/msvfw32/msvfw32_Tr.rc +++ b/dlls/msvfw32/msvfw32_Tr.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "msvideo_private.h" + LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT ICM_CHOOSE_COMPRESSOR DIALOG DISCARDABLE 36, 24, 187, 95 diff --git a/dlls/msvfw32/msvfw32_Zh.rc b/dlls/msvfw32/msvfw32_Zh.rc index 334fd69..3ff0fc0 100644 --- a/dlls/msvfw32/msvfw32_Zh.rc +++ b/dlls/msvfw32/msvfw32_Zh.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "msvideo_private.h" + /* Chinese text is encoded in UTF-8 */ #pragma code_page(65001) @@ -88,5 +90,3 @@ STRINGTABLE DISCARDABLE { IDS_FULLFRAMES "全幀(未壓縮)" } - -#pragma code_page(default) diff --git a/dlls/msvfw32/msvideo_private.h b/dlls/msvfw32/msvideo_private.h index d6b2d19..ea0566b 100644 --- a/dlls/msvfw32/msvideo_private.h +++ b/dlls/msvfw32/msvideo_private.h @@ -19,6 +19,9 @@ #ifndef __WINE_MSVIDEO_PRIVATE_H #define __WINE_MSVIDEO_PRIVATE_H +#include <windef.h> +#include <winuser.h> + #define ICM_CHOOSE_COMPRESSOR 1 #define IDC_COMP_LIST 880 #define IDS_FULLFRAMES 901 diff --git a/dlls/msvfw32/rsrc.rc b/dlls/msvfw32/rsrc.rc deleted file mode 100644 index a24ab3c..0000000 --- a/dlls/msvfw32/rsrc.rc +++ /dev/null @@ -1,39 +0,0 @@ -/* - * Copyright 2005 Dmitry Timoshkov - * - * 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 "msvideo_private.h" - -#include "msvfw32_Da.rc" -#include "msvfw32_De.rc" -#include "msvfw32_En.rc" -#include "msvfw32_Es.rc" -#include "msvfw32_Fr.rc" -#include "msvfw32_Hu.rc" -#include "msvfw32_Ko.rc" -#include "msvfw32_Lt.rc" -#include "msvfw32_Nl.rc" -#include "msvfw32_No.rc" -#include "msvfw32_Pl.rc" -#include "msvfw32_Pt.rc" -#include "msvfw32_Ru.rc" -#include "msvfw32_Si.rc" -#include "msvfw32_Sv.rc" -#include "msvfw32_Tr.rc" -#include "msvfw32_Zh.rc"

1 0

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 July 2009