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

Henri Verbeet : wined3d: Don' t accept NULL as a valid result from glGetString().
by Alexandre Julliard 03 Jul '09

03 Jul '09

Module: wine Branch: master Commit: 17688365ed8a2f191e2a9f234bb43d053c64a1f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=17688365ed8a2f191e2a9f234… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jul 3 09:39:22 2009 +0200 wined3d: Don't accept NULL as a valid result from glGetString(). --- dlls/wined3d/directx.c | 759 ++++++++++++++++++++++++++---------------------- 1 files changed, 411 insertions(+), 348 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=17688365ed8a2f191e2a9…

1 0

Nikolay Sivov : comctl32/listview: Remove parent creation test. It' s unrelated to ListView.
by Alexandre Julliard 03 Jul '09

03 Jul '09

Module: wine Branch: master Commit: ab527a6e0f3633332d74f28459f6e8c64f602b0e URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab527a6e0f3633332d74f2845… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Fri Jul 3 12:36:24 2009 +0400 comctl32/listview: Remove parent creation test. It's unrelated to ListView. --- dlls/comctl32/tests/listview.c | 27 --------------------------- 1 files changed, 0 insertions(+), 27 deletions(-) diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index d5bcbf5..d959deb 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -89,31 +89,6 @@ static HWND subclass_editbox(HWND hwndListview); static struct msg_sequence *sequences[NUM_MSG_SEQUENCES]; -static const struct message create_parent_wnd_seq[] = { - { WM_GETMINMAXINFO, sent }, - { WM_NCCREATE, sent }, - { WM_NCCALCSIZE, sent|wparam, 0 }, - { WM_CREATE, sent }, - { WM_SHOWWINDOW, sent|wparam, 1 }, - { WM_WINDOWPOSCHANGING, sent|wparam, 0 }, - { WM_QUERYNEWPALETTE, sent|optional }, - { WM_WINDOWPOSCHANGING, sent|wparam, 0 }, - { WM_WINDOWPOSCHANGED, sent|optional }, - { WM_NCCALCSIZE, sent|wparam|optional, 1 }, - { WM_ACTIVATEAPP, sent|wparam, 1 }, - { WM_NCACTIVATE, sent|wparam, 1 }, - { WM_ACTIVATE, sent|wparam, 1 }, - { WM_IME_SETCONTEXT, sent|wparam|defwinproc|optional, 1 }, - { WM_IME_NOTIFY, sent|defwinproc|optional }, - { WM_SETFOCUS, sent|wparam|defwinproc, 0 }, - /* Win9x adds SWP_NOZORDER below */ - { WM_WINDOWPOSCHANGED, sent, /*|wparam, SWP_SHOWWINDOW|SWP_NOSIZE|SWP_NOMOVE|SWP_NOCLIENTSIZE|SWP_NOCLIENTMOVE*/ }, - { WM_NCCALCSIZE, sent|wparam|optional, 1 }, - { WM_SIZE, sent }, - { WM_MOVE, sent }, - { 0 } -}; - static const struct message create_ownerdrawfixed_parent_seq[] = { { WM_NOTIFYFORMAT, sent }, { WM_QUERYUISTATE, sent|optional }, /* Win2K and higher */ @@ -3707,9 +3682,7 @@ START_TEST(listview) init_msg_sequences(sequences, NUM_MSG_SEQUENCES); - flush_sequences(sequences, NUM_MSG_SEQUENCES); hwndparent = create_parent_window(FALSE); - ok_sequence(sequences, PARENT_SEQ_INDEX, create_parent_wnd_seq, "create parent window", TRUE); flush_sequences(sequences, NUM_MSG_SEQUENCES); g_is_below_5 = is_below_comctl_5();

1 0

Alexandre Julliard : widl: Skip the existing correlation descriptor on unencapsulated unions when generating a different one .
by Alexandre Julliard 03 Jul '09

03 Jul '09

Module: wine Branch: master Commit: fc7681a8ceae63a2d5c66a157e30338ed8a8f92a URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc7681a8ceae63a2d5c66a157… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 3 11:44:10 2009 +0200 widl: Skip the existing correlation descriptor on unencapsulated unions when generating a different one. --- tools/widl/typegen.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index b60a53c..861dada 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -1521,8 +1521,11 @@ static void write_descriptors(FILE *file, type_t *type, unsigned int *tfsoff) type_t *ft = f->type; if (type_get_type(ft) == TYPE_UNION && is_attr(f->attrs, ATTR_SWITCHIS)) { + short reloff; unsigned int absoff = ft->typestring_offset; - short reloff = absoff - (*tfsoff + 6); + if (is_attr(ft->attrs, ATTR_SWITCHTYPE)) + absoff += 8; /* we already have a corr descr, skip it */ + reloff = absoff - (*tfsoff + 6); print_file(file, 0, "/* %d */\n", *tfsoff); print_file(file, 2, "0x%x,\t/* FC_NON_ENCAPSULATED_UNION */\n", RPC_FC_NON_ENCAPSULATED_UNION); print_file(file, 2, "0x%x,\t/* FIXME: always FC_LONG */\n", RPC_FC_LONG); @@ -2509,6 +2512,7 @@ static unsigned int write_union_tfs(FILE *file, type_t *type, unsigned int *tfso *tfsoff += write_conf_or_var_desc(file, NULL, *tfsoff, st, &dummy_expr ); print_file(file, 2, "NdrFcShort(0x2),\t/* Offset= 2 (%u) */\n", *tfsoff + 2); *tfsoff += 2; + print_file(file, 0, "/* %u */\n", *tfsoff); } print_file(file, 2, "NdrFcShort(0x%hx),\t/* %d */\n", size, size);

1 0

Alexandre Julliard : widl: Struct alignment should be the largest alignment of all the struct members .
by Alexandre Julliard 03 Jul '09

03 Jul '09

Module: wine Branch: master Commit: 064775c9a0acfa0e302008c863af158b914ed7d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=064775c9a0acfa0e302008c86… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 3 12:02:07 2009 +0200 widl: Struct alignment should be the largest alignment of all the struct members. --- tools/widl/typegen.c | 17 +++++------------ 1 files changed, 5 insertions(+), 12 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 861dada..5abf575 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -1083,7 +1083,6 @@ static unsigned int write_conf_or_var_desc(FILE *file, const type_t *structure, static unsigned int fields_memsize(const var_list_t *fields, unsigned int *align) { - int have_align = FALSE; unsigned int size = 0; const var_t *v; @@ -1092,11 +1091,7 @@ static unsigned int fields_memsize(const var_list_t *fields, unsigned int *align { unsigned int falign = 0; unsigned int fsize = type_memsize(v->type, &falign); - if (!have_align) - { - *align = falign; - have_align = TRUE; - } + if (*align < falign) *align = falign; size = ROUND_SIZE(size, falign); size += fsize; } @@ -1128,7 +1123,7 @@ static unsigned int union_memsize(const var_list_t *fields, unsigned int *pmaxa) int get_padding(const var_list_t *fields) { unsigned short offset = 0; - int salign = -1; + unsigned int salign = 1; const var_t *f; if (!fields) @@ -1139,8 +1134,7 @@ int get_padding(const var_list_t *fields) type_t *ft = f->type; unsigned int align = 0; unsigned int size = type_memsize(ft, &align); - if (salign == -1) - salign = align; + if (align > salign) salign = align; offset = ROUND_SIZE(offset, align); offset += size; } @@ -2202,7 +2196,7 @@ static void write_struct_members(FILE *file, const type_t *type, { const var_t *field; unsigned short offset = 0; - int salign = -1; + unsigned int salign = 1; int padding; var_list_t *fields = type_struct_get_fields(type); @@ -2213,8 +2207,7 @@ static void write_struct_members(FILE *file, const type_t *type, { unsigned int align = 0; unsigned int size = type_memsize(ft, &align); - if (salign == -1) - salign = align; + if (salign < align) salign = align; if ((align - 1) & offset) { unsigned char fc = 0;

1 0

Alexandre Julliard : widl: Take into account structure field alignment when computing offsets.
by Alexandre Julliard 03 Jul '09

03 Jul '09

Module: wine Branch: master Commit: f6d2b49145e16cacc694f08b5b4442358c7c6718 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f6d2b49145e16cacc694f08b5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 3 12:02:30 2009 +0200 widl: Take into account structure field alignment when computing offsets. --- tools/widl/typegen.c | 22 +++++++++++++++------- 1 files changed, 15 insertions(+), 7 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 5abf575..9b39c63 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -59,6 +59,7 @@ struct expr_eval_routine const expr_t *expr; }; +static unsigned int field_memsize(const type_t *type, unsigned int *offset); static unsigned int fields_memsize(const var_list_t *fields, unsigned int *align); static unsigned int write_struct_tfs(FILE *file, type_t *type, const char *name, unsigned int *tfsoff); static int write_embedded_types(FILE *file, const attr_list_t *attrs, type_t *type, @@ -978,14 +979,13 @@ static unsigned int write_conf_or_var_desc(FILE *file, const type_t *structure, if (fields) LIST_FOR_EACH_ENTRY( var, fields, const var_t, entry ) { - unsigned int align = 0; - /* FIXME: take alignment into account */ + unsigned int size = field_memsize( var->type, &offset ); if (var->name && !strcmp(var->name, subexpr->u.sval)) { correlation_variable = var->type; break; } - offset += type_memsize(var->type, &align); + offset += size; } if (!correlation_variable) error("write_conf_or_var_desc: couldn't find variable %s in structure\n", @@ -1081,6 +1081,16 @@ static unsigned int write_conf_or_var_desc(FILE *file, const type_t *structure, return 4; } +/* return size and start offset of a data field based on current offset */ +static unsigned int field_memsize(const type_t *type, unsigned int *offset) +{ + unsigned int align = 0; + unsigned int size = type_memsize( type, &align ); + + *offset = ROUND_SIZE( *offset, align ); + return size; +} + static unsigned int fields_memsize(const var_list_t *fields, unsigned int *align) { unsigned int size = 0; @@ -1511,8 +1521,8 @@ static void write_descriptors(FILE *file, type_t *type, unsigned int *tfsoff) if (fs) LIST_FOR_EACH_ENTRY(f, fs, var_t, entry) { - unsigned int align = 0; type_t *ft = f->type; + unsigned int size = field_memsize( ft, &offset ); if (type_get_type(ft) == TYPE_UNION && is_attr(f->attrs, ATTR_SWITCHIS)) { short reloff; @@ -1529,9 +1539,7 @@ static void write_descriptors(FILE *file, type_t *type, unsigned int *tfsoff) reloff, reloff, absoff); *tfsoff += 8; } - - /* FIXME: take alignment into account */ - offset += type_memsize(ft, &align); + offset += size; } }

1 0

Alexandre Julliard : widl: An ENUM16 is 32-bit wide in memory.
by Alexandre Julliard 03 Jul '09

03 Jul '09

Module: wine Branch: master Commit: d375d25d653f01a7f7e9fc37e885d2e6cb1fe482 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d375d25d653f01a7f7e9fc37e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 3 12:06:31 2009 +0200 widl: An ENUM16 is 32-bit wide in memory. --- tools/widl/typegen.c | 5 +---- 1 files changed, 1 insertions(+), 4 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 9b39c63..3a5e2e5 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -1194,14 +1194,11 @@ unsigned int type_memsize(const type_t *t, unsigned int *align) case TYPE_ENUM: switch (get_enum_fc(t)) { + case RPC_FC_ENUM16: case RPC_FC_ENUM32: size = 4; if (size > *align) *align = size; break; - case RPC_FC_ENUM16: - size = 2; - if (size > *align) *align = size; - break; default: error("type_memsize: Unknown enum type\n"); size = 0;

1 0

Hans Leidekker : fusion/tests: Initialize a variable.
by Alexandre Julliard 03 Jul '09

03 Jul '09

Module: wine Branch: master Commit: 9ae618f98c6f34befadc10c938164bcf7f9e6736 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ae618f98c6f34befadc10c93… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jul 3 11:30:48 2009 +0200 fusion/tests: Initialize a variable. --- dlls/fusion/tests/asmname.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/fusion/tests/asmname.c b/dlls/fusion/tests/asmname.c index 442f00f..864ded5 100644 --- a/dlls/fusion/tests/asmname.c +++ b/dlls/fusion/tests/asmname.c @@ -726,6 +726,7 @@ static void test_CreateAssemblyNameObject(void) ok(name != NULL, "Expected non-NULL name\n"); size = MAX_PATH; + str[0] = '\0'; hr = IAssemblyName_GetDisplayName(name, str, &size, ASM_DISPLAYF_FULL); ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); todo_wine

1 0

Michael Stefaniuc : winmm: Build language resource files separately.
by Alexandre Julliard 03 Jul '09

03 Jul '09

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 : progman: Build language resource files separately.
by Alexandre Julliard 03 Jul '09

03 Jul '09

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 03 Jul '09

03 Jul '09

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