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

Frédéric Delanoy : winspool.drv: Convert French resources to UTF-8.
by Alexandre Julliard 09 Jul '09

09 Jul '09

Module: wine Branch: master Commit: c308622546e7cc86e9ed75a0fe6fa50399f3cf53 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c308622546e7cc86e9ed75a0f… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu Jul 9 14:52:53 2009 +0200 winspool.drv: Convert French resources to UTF-8. --- dlls/winspool.drv/Fr.rc | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/winspool.drv/Fr.rc b/dlls/winspool.drv/Fr.rc index 12bf359..40d9c23 100644 --- a/dlls/winspool.drv/Fr.rc +++ b/dlls/winspool.drv/Fr.rc @@ -20,6 +20,9 @@ #include "wspool.h" +/* UTF-8 */ +#pragma code_page(65001) + LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL FILENAME_DIALOG DIALOG LOADONCALL MOVEABLE DISCARDABLE 6, 18, 245, 47 @@ -27,7 +30,7 @@ STYLE DS_CONTEXTHELP | DS_MODALFRAME | DS_SETFONT | DS_SETFOREGROUND | WS_POPUPW CAPTION "Imprimer dans un fichier" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "&Fichier de sortie�:", -1, 7, 13, 194, 13, WS_VISIBLE + LTEXT "&Fichier de sortie :", -1, 7, 13, 194, 13, WS_VISIBLE EDITTEXT EDITBOX, 6, 28, 174, 12, WS_VISIBLE | ES_AUTOHSCROLL DEFPUSHBUTTON "OK", IDOK, 199, 10, 40, 14, WS_VISIBLE PUSHBUTTON "Annuler", IDCANCEL, 199, 27, 40, 14, WS_VISIBLE @@ -36,6 +39,6 @@ END STRINGTABLE DISCARDABLE { IDS_CAPTION "Port local" - IDS_FILE_EXISTS "Le fichier de sortie existe d�j�. Cliquez sur OK pour l'�craser." - IDS_CANNOT_OPEN "Impossible de cr�er le fichier de sortie." + IDS_FILE_EXISTS "Le fichier de sortie existe déjà. Cliquez sur OK pour l'écraser." + IDS_CANNOT_OPEN "Impossible de créer le fichier de sortie." }

1 0

Frédéric Delanoy : mshtml: Convert French resources to UTF-8.
by Alexandre Julliard 09 Jul '09

09 Jul '09

Module: wine Branch: master Commit: 0a2380f98213906da8483ed594404ec3c753c276 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a2380f98213906da8483ed59… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu Jul 9 14:57:45 2009 +0200 mshtml: Convert French resources to UTF-8. --- dlls/mshtml/Fr.rc | 15 +++++++++------ 1 files changed, 9 insertions(+), 6 deletions(-) diff --git a/dlls/mshtml/Fr.rc b/dlls/mshtml/Fr.rc index 4d45d51..c7671d4 100644 --- a/dlls/mshtml/Fr.rc +++ b/dlls/mshtml/Fr.rc @@ -21,13 +21,16 @@ #include "resource.h" +/* UTF-8 */ +#pragma code_page(65001) + LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL STRINGTABLE DISCARDABLE { - IDS_HTMLDISABLED "Le rendu HTML est actuellement d�sactiv�." + IDS_HTMLDISABLED "Le rendu HTML est actuellement désactivé." IDS_HTMLDOCUMENT "Document HTML" - IDS_DOWNLOADING "T�l�chargement..." + IDS_DOWNLOADING "Téléchargement..." IDS_INSTALLING "Installation..." } @@ -36,9 +39,9 @@ STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMEN CAPTION "Programme d'installation de Gecko pour Wine" FONT 8, "MS Shell Dlg" { - LTEXT "Cette application essaie d'afficher une page HTML. Wine requiert la pr�sence du moteur de rendu Gecko de Mozilla " \ + LTEXT "Cette application essaie d'afficher une page HTML. Wine requiert la présence du moteur de rendu Gecko de Mozilla " \ "pour afficher cette page. Cliquez sur Installer si vous souhaitez que Wine " \ - "t�l�charge et installe automatiquement Gecko.", ID_DWL_STATUS, 10, 10, 240, 40, SS_LEFT + "télécharge et installe automatiquement Gecko.", ID_DWL_STATUS, 10, 10, 240, 40, SS_LEFT CONTROL "Progression", ID_DWL_PROGRESS, PROGRESS_CLASSA, WS_BORDER|PBS_SMOOTH, 10, 50, 240, 12 DEFPUSHBUTTON "&Installer", ID_DWL_INSTALL, 200, 70, 50, 15, WS_GROUP | WS_TABSTOP PUSHBUTTON "&Annuler", IDCANCEL, 140, 70, 50, 15, WS_GROUP | WS_TABSTOP @@ -50,9 +53,9 @@ CAPTION "Hyperlien" FONT 8, "MS Shell Dlg" { GROUPBOX "Informations sur l'hyperlien", -1, 5, 5, 190, 55 - LTEXT "&Type�:", -1, 10, 22, 20, 10 + LTEXT "&Type :", -1, 10, 22, 20, 10 COMBOBOX IDC_TYPE, 35, 20, 45, 100, WS_TABSTOP | WS_GROUP | WS_VSCROLL | CBS_DROPDOWNLIST | CBS_HASSTRINGS - LTEXT "&URL�:", -1, 10, 42, 20, 10 + LTEXT "&URL :", -1, 10, 42, 20, 10 EDITTEXT IDC_URL, 35, 40, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP PUSHBUTTON "OK", IDOK, 200, 10, 45, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP PUSHBUTTON "Annuler", IDCANCEL, 200, 28, 45, 14, WS_GROUP | WS_TABSTOP

1 0

Alexandre Julliard : ws2_32: Check buffers before recvmsg() to trigger write watches.
by Alexandre Julliard 09 Jul '09

09 Jul '09

Module: wine Branch: master Commit: 48656f5596beecd956be60661d5a8e6eab24e09b URL: http://source.winehq.org/git/wine.git/?a=commit;h=48656f5596beecd956be60661… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 9 15:21:30 2009 +0200 ws2_32: Check buffers before recvmsg() to trigger write watches. --- dlls/ws2_32/socket.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 5516260..464e890 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -4409,6 +4409,12 @@ INT WINAPI WSARecvFrom( SOCKET s, LPWSABUF lpBuffers, DWORD dwBufferCount, wsa->first_iovec = 0; for (i = 0; i < dwBufferCount; i++) { + /* check buffer first to trigger write watches */ + if (IsBadWritePtr( lpBuffers[i].buf, lpBuffers[i].len )) + { + err = WSAEFAULT; + goto error; + } wsa->iovec[i].iov_base = lpBuffers[i].buf; wsa->iovec[i].iov_len = lpBuffers[i].len; }

1 0

Stefan Dösinger : wined3d: Update Nvidia driver versions.
by Alexandre Julliard 09 Jul '09

09 Jul '09

Module: wine Branch: master Commit: c0e5c8f4819f3a1cbcd41074da14b987a53947d6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0e5c8f4819f3a1cbcd41074d… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Jul 7 17:24:34 2009 +0200 wined3d: Update Nvidia driver versions. --- dlls/wined3d/directx.c | 50 ++++++++++++++++++++++++------------------------ 1 files changed, 25 insertions(+), 25 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index c7ac0fa..1f5a750 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -800,31 +800,31 @@ static const struct driver_version_information driver_version_table[] = {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE, "NVIDIA GeForce 256", 7, 1, 8, 6 }, {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE2_MX, "NVIDIA GeForce2 MX/MX 400", 9, 6, 4, 3 }, {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE2, "NVIDIA GeForce2 GTS/GeForce2 Pro", 7, 1, 8, 6 }, - {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE3, "NVIDIA GeForce3", 9, 6, 4, 3 }, - {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE4_MX, "NVIDIA GeForce4 MX 460", 9, 6, 4, 3 }, - {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE4_TI4200, "NVIDIA GeForce4 Ti 4200", 9, 6, 4, 3 }, - {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCEFX_5200, "NVIDIA GeForce FX 5200", 7, 15, 11, 7341 }, - {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCEFX_5600, "NVIDIA GeForce FX 5600", 7, 15, 11, 7341 }, - {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCEFX_5800, "NVIDIA GeForce FX 5800", 7, 15, 11, 7341 }, - {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_6200, "NVIDIA GeForce 6200", 7, 15, 11, 8044 }, - {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_6600GT, "NVIDIA GeForce 6600 GT", 7, 15, 11, 8044 }, - {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_6800, "NVIDIA GeForce 6800", 7, 15, 11, 8044 }, - {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_7300, "NVIDIA GeForce Go 7300", 7, 15, 11, 8044 }, - {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_7400, "NVIDIA GeForce Go 7400", 7, 15, 11, 8044 }, - {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_7600, "NVIDIA GeForce 7600 GT", 7, 15, 11, 8044 }, - {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_7800GT, "NVIDIA GeForce 7800 GT", 7, 15, 11, 8044 }, - {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_8300GS, "NVIDIA GeForce 8300 GS", 7, 15, 11, 8044 }, - {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_8600GT, "NVIDIA GeForce 8600 GT", 7, 15, 11, 8044 }, - {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_8600MGT, "NVIDIA GeForce 8600M GT", 7, 15, 11, 8044 }, - {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_8800GTS, "NVIDIA GeForce 8800 GTS", 7, 15, 11, 8044 }, - {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_9200, "NVIDIA GeForce 9200", 7, 15, 11, 8044 }, - {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_9400GT, "NVIDIA GeForce 9400 GT", 7, 15, 11, 8044 }, - {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_9500GT, "NVIDIA GeForce 9500 GT", 7, 15, 11, 8044 }, - {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_9600GT, "NVIDIA GeForce 9600 GT", 7, 15, 11, 8044 }, - {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_9800GT, "NVIDIA GeForce 9800 GT", 7, 15, 11, 8044 }, - {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX260, "NVIDIA GeForce GTX 260", 7, 15, 11, 8044 }, - {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX275, "NVIDIA GeForce GTX 275", 7, 15, 11, 8044 }, - {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX280, "NVIDIA GeForce GTX 280", 7, 15, 11, 8044 }, + {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE3, "NVIDIA GeForce3", 9, 6, 10, 9371 }, + {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE4_MX, "NVIDIA GeForce4 MX 460", 9, 6, 10, 9371 }, + {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE4_TI4200, "NVIDIA GeForce4 Ti 4200", 9, 6, 10, 9371 }, + {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCEFX_5200, "NVIDIA GeForce FX 5200", 7, 15, 11, 7516 }, + {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCEFX_5600, "NVIDIA GeForce FX 5600", 7, 15, 11, 7516 }, + {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCEFX_5800, "NVIDIA GeForce FX 5800", 7, 15, 11, 7516 }, + {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_6200, "NVIDIA GeForce 6200", 7, 15, 11, 8618 }, + {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_6600GT, "NVIDIA GeForce 6600 GT", 7, 15, 11, 8618 }, + {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_6800, "NVIDIA GeForce 6800", 7, 15, 11, 8618 }, + {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_7300, "NVIDIA GeForce Go 7300", 7, 15, 11, 8585 }, + {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_7400, "NVIDIA GeForce Go 7400", 7, 15, 11, 8585 }, + {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_7600, "NVIDIA GeForce 7600 GT", 7, 15, 11, 8618 }, + {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_7800GT, "NVIDIA GeForce 7800 GT", 7, 15, 11, 8618 }, + {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_8300GS, "NVIDIA GeForce 8300 GS", 7, 15, 11, 8618 }, + {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_8600GT, "NVIDIA GeForce 8600 GT", 7, 15, 11, 8618 }, + {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_8600MGT, "NVIDIA GeForce 8600M GT", 7, 15, 11, 8585 }, + {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_8800GTS, "NVIDIA GeForce 8800 GTS", 7, 15, 11, 8618 }, + {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_9200, "NVIDIA GeForce 9200", 7, 15, 11, 8618 }, + {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_9400GT, "NVIDIA GeForce 9400 GT", 7, 15, 11, 8618 }, + {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_9500GT, "NVIDIA GeForce 9500 GT", 7, 15, 11, 8618 }, + {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_9600GT, "NVIDIA GeForce 9600 GT", 7, 15, 11, 8618 }, + {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_9800GT, "NVIDIA GeForce 9800 GT", 7, 15, 11, 8618 }, + {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX260, "NVIDIA GeForce GTX 260", 7, 15, 11, 8618 }, + {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX275, "NVIDIA GeForce GTX 275", 7, 15, 11, 8618 }, + {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX280, "NVIDIA GeForce GTX 280", 7, 15, 11, 8618 }, /* ATI cards. The driver versions are somewhat similar, but not quite the same. Let's hardcode. */ {VENDOR_ATI, CARD_ATI_RADEON_9500, "ATI Radeon 9500", 6, 14, 10, 6764 },

1 0

Alexandre Julliard : configure: Apply makedep flags when doing automatic dependencies.
by Alexandre Julliard 09 Jul '09

09 Jul '09

Module: wine Branch: master Commit: 21872b3d57441b743fa53397272929fbb0573d20 URL: http://source.winehq.org/git/wine.git/?a=commit;h=21872b3d57441b743fa533972… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 9 12:53:49 2009 +0200 configure: Apply makedep flags when doing automatic dependencies. --- configure | 2 +- configure.ac | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configure b/configure index 9e59d11..aa0ade1 100755 --- a/configure +++ b/configure @@ -24588,7 +24588,7 @@ DEPENDENCIES="### Dependencies: .BEGIN: Makefile .MAKEFILEDEPS: Makefile: dummy - -\$(MAKEDEP) -C\$(SRCDIR) -S\$(TOPSRCDIR) -T\$(TOPOBJDIR) \$(EXTRAINCL) \$(DEPEND_SRCS) + -\$(MAKEDEP) \$(MAKEDEPFLAGS) -C\$(SRCDIR) -S\$(TOPSRCDIR) -T\$(TOPOBJDIR) \$(EXTRAINCL) \$(DEPEND_SRCS) \$(OBJS) \$(C_SRCS16:.c=.o): \$(IDL_GEN_HEADERS) \$(IDL_GEN_C_SRCS:.c=.o): \$(IDL_GEN_C_SRCS) diff --git a/configure.ac b/configure.ac index 23cf7fe..e07de2b 100644 --- a/configure.ac +++ b/configure.ac @@ -1978,7 +1978,7 @@ AC_SUBST(DEPENDENCIES,["### Dependencies: .BEGIN: Makefile .MAKEFILEDEPS: Makefile: dummy - -\$(MAKEDEP) -C\$(SRCDIR) -S\$(TOPSRCDIR) -T\$(TOPOBJDIR) \$(EXTRAINCL) \$(DEPEND_SRCS) + -\$(MAKEDEP) \$(MAKEDEPFLAGS) -C\$(SRCDIR) -S\$(TOPSRCDIR) -T\$(TOPOBJDIR) \$(EXTRAINCL) \$(DEPEND_SRCS) \$(OBJS) \$(C_SRCS16:.c=.o): \$(IDL_GEN_HEADERS) \$(IDL_GEN_C_SRCS:.c=.o): \$(IDL_GEN_C_SRCS)

1 0

Alexandre Julliard : winebuild: Dump resource data as dwords to reduce the output file size.
by Alexandre Julliard 09 Jul '09

09 Jul '09

Module: wine Branch: master Commit: f0ea22ba87ac15374c254b9d6195fd4aecda3b35 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f0ea22ba87ac15374c254b9d6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 9 12:54:16 2009 +0200 winebuild: Dump resource data as dwords to reduce the output file size. --- tools/winebuild/res32.c | 24 +++++++++++++++++++++++- 1 files changed, 23 insertions(+), 1 deletions(-) diff --git a/tools/winebuild/res32.c b/tools/winebuild/res32.c index 946523d..d03d16f 100644 --- a/tools/winebuild/res32.c +++ b/tools/winebuild/res32.c @@ -218,6 +218,28 @@ static void put_string( const struct string_id *str ) } } +static void dump_res_data( const struct resource *res ) +{ + unsigned int i = 0; + unsigned int size = (res->data_size + 3) & ~3; + + if (!size) return; + + file_pos = res->data; + file_end = (const unsigned char *)res->data + size; + + output( "\t.long " ); + while (size > 4) + { + if ((i++ % 16) == 15) output( "0x%08x\n\t.long ", get_dword() ); + else output( "0x%08x,", get_dword() ); + size -= 4; + } + output( "0x%08x\n", get_dword() ); + size -= 4; + assert( file_pos == file_end ); +} + /* check the file header */ /* all values must be zero except header size */ static int check_header(void) @@ -515,7 +537,7 @@ void output_resources( DLLSPEC *spec ) { output( "\n\t.align %d\n", get_alignment(get_ptr_size()) ); output( ".L__wine_spec_res_%d:\n", i ); - dump_bytes( res->data, (res->data_size + 3) & ~3 ); + dump_res_data( res ); } output( ".L__wine_spec_resources_end:\n" ); output( "\t.byte 0\n" );

1 0

Alexandre Julliard : winetest: Create a separate resource file with the SHA1 build id.
by Alexandre Julliard 09 Jul '09

09 Jul '09

Module: wine Branch: master Commit: ae1afb82d2db69fe35d6060278a28ca2f98b8cc3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae1afb82d2db69fe35d606027… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 9 12:54:39 2009 +0200 winetest: Create a separate resource file with the SHA1 build id. --- .gitignore | 1 + programs/winetest/Makefile.in | 7 ++++--- programs/winetest/winetest.rc | 7 ------- tools/make_makefiles | 1 + 4 files changed, 6 insertions(+), 10 deletions(-) diff --git a/.gitignore b/.gitignore index 5303e1c..cc746dd 100644 --- a/.gitignore +++ b/.gitignore @@ -198,6 +198,7 @@ programs/winedbg/debug.yy.c programs/winedbg/winedbg.man programs/winetest/*_test.exe programs/winetest/*_test.rc +programs/winetest/build.rc programs/winhlp32/macro.lex.yy.c server/wineserver server/wineserver-installed diff --git a/programs/winetest/Makefile.in b/programs/winetest/Makefile.in index 90cd983..9e43465 100644 --- a/programs/winetest/Makefile.in +++ b/programs/winetest/Makefile.in @@ -7,8 +7,6 @@ APPMODE = -mconsole IMPORTS = uuid comctl32 version user32 gdi32 advapi32 wsock32 kernel32 DELAYIMPORTS = ole32 -EXTRARCFLAGS = -DBUILD_SHA1=\"`GIT_DIR=$(TOPSRCDIR)/.git git rev-parse HEAD 2>/dev/null`\" - C_SRCS = \ gui.c \ main.c \ @@ -23,7 +21,7 @@ SVG_SRCS = winetest.svg ALL_TEST_DIRS = @ALL_TEST_DIRS@ TESTBINS = $(ALL_TEST_DIRS:%/tests=%_test.exe) -TESTRCS = $(TESTBINS:.exe=.rc) +TESTRCS = build.rc $(TESTBINS:.exe=.rc) EXTRA_OBJS = $(TESTRCS:.rc=.res) @MAKE_PROG_RULES@ @@ -33,6 +31,9 @@ EXTRA_OBJS = $(TESTRCS:.rc=.res) clean:: $(RM) winetest-dist.exe $(TESTBINS) $(TESTRCS) +build.rc: dummy + build="STRINGTABLE { 1 \"`GIT_DIR=$(TOPSRCDIR)/.git git rev-parse HEAD 2>/dev/null`\" }" && (echo $$build | cmp -s - $@) || echo $$build >$@ || ($(RM) $@ && exit 1) + # Rules for building distributable executable .PHONY: dist diff --git a/programs/winetest/winetest.rc b/programs/winetest/winetest.rc index 8056a25..52c3430 100644 --- a/programs/winetest/winetest.rc +++ b/programs/winetest/winetest.rc @@ -24,13 +24,6 @@ #include "resource.h" -#ifdef BUILD_SHA1 -STRINGTABLE -BEGIN - IDS_BUILD_ID BUILD_SHA1 -END -#endif - IDD_TAG DIALOG 0, 0, 150, 65 STYLE WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "No tag supplied" diff --git a/tools/make_makefiles b/tools/make_makefiles index b1766a7..f23706c 100755 --- a/tools/make_makefiles +++ b/tools/make_makefiles @@ -76,6 +76,7 @@ my @ignores = ( "include/stamp-h", "programs/winetest/*_test.exe", "programs/winetest/*_test.rc", + "programs/winetest/build.rc", ); # Source files and their resulting target to ignore

1 0

Francois Gouget : winapi/c_parser: Badly indenting a closing brace should be a warning, not an error.
by Alexandre Julliard 09 Jul '09

09 Jul '09

Module: wine Branch: master Commit: 8c1bf48fbf9908b7937a8d0430a2ad758045a803 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c1bf48fbf9908b7937a8d043… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Jul 9 12:26:30 2009 +0200 winapi/c_parser: Badly indenting a closing brace should be a warning, not an error. --- tools/winapi/c_parser.pm | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/winapi/c_parser.pm b/tools/winapi/c_parser.pm index 3a00039..d39d093 100644 --- a/tools/winapi/c_parser.pm +++ b/tools/winapi/c_parser.pm @@ -971,7 +971,7 @@ sub parse_c_file($$$$) $declaration_line = $line; $declaration_column = $column; } elsif($column == 1 && !$extern_c) { - $self->_parse_c_error("", $line, $column, "file", "inner } ends on column 1"); + $self->_parse_c_warning("", $line, $column, "file", "inner } ends on column 1"); } } elsif(s/^;//) { $declaration .= $&;

1 0

Francois Gouget : winapi/c_parser: Remove special cases for DEFINE_SHLGUID( ) and ICOM_DEFINE().
by Alexandre Julliard 09 Jul '09

09 Jul '09

Module: wine Branch: master Commit: 8890282ac09f43e305afec069ef0c30ea36ef256 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8890282ac09f43e305afec069… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Jul 9 12:26:39 2009 +0200 winapi/c_parser: Remove special cases for DEFINE_SHLGUID() and ICOM_DEFINE(). These macros don't exist anymore. --- tools/winapi/c_parser.pm | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-) diff --git a/tools/winapi/c_parser.pm b/tools/winapi/c_parser.pm index d39d093..e927fb9 100644 --- a/tools/winapi/c_parser.pm +++ b/tools/winapi/c_parser.pm @@ -796,12 +796,8 @@ sub parse_c_file($$$$) next; } - } elsif ($declaration =~ s/^(?:DEFINE_SHLGUID)\s*$.*?$//s) { - $self->_update_c_position($&, \$declaration_line, \$declaration_column); } elsif ($declaration =~ s/^(?:DECL_WINELIB_TYPE_AW|DECLARE_HANDLE(?:16)?|TYPE_MARSHAL)$\s*(\w+)\s*$\s*//s) { $self->_update_c_position($&, \$declaration_line, \$declaration_column); - } elsif ($declaration =~ s/^ICOM_DEFINE$\s*(\w+)\s*,\s*(\w+)\s*$\s*//s) { - $self->_update_c_position($&, \$declaration_line, \$declaration_column); } } else { my $blank_lines = 0;

1 0

Frédéric Delanoy : msacm32: Fix French translation & UI display.
by Alexandre Julliard 09 Jul '09

09 Jul '09

Module: wine Branch: master Commit: b1f24b4061264eaa50b27e74a2d4810ed1726a23 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b1f24b4061264eaa50b27e74a… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu Jul 9 12:02:14 2009 +0200 msacm32: Fix French translation & UI display. --- dlls/msacm32/msacm_Fr.rc | 19 +++++++++++-------- 1 files changed, 11 insertions(+), 8 deletions(-) diff --git a/dlls/msacm32/msacm_Fr.rc b/dlls/msacm32/msacm_Fr.rc index 5960fff..9341e6c 100644 --- a/dlls/msacm32/msacm_Fr.rc +++ b/dlls/msacm32/msacm_Fr.rc @@ -2,7 +2,7 @@ * French resource file for MS ACM * * Copyright 2000 Eric Pouech - * Copyright 2003 Vincent B�ron + * Copyright 2003 Vincent Béron * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -21,25 +21,28 @@ #include "wineacm.h" +/* UTF-8 */ +#pragma code_page(65001) + LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL -DLG_ACMFORMATCHOOSE_ID DIALOG DISCARDABLE 10, 20, 225, 100 +DLG_ACMFORMATCHOOSE_ID DIALOG DISCARDABLE 10, 20, 250, 100 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "S�lection du son" +CAPTION "Sélection du son" FONT 8, "MS Shell Dlg" BEGIN LTEXT "&Nom :", -1, 5, 5, 115, 8, NOT WS_GROUP - COMBOBOX IDD_ACMFORMATCHOOSE_CMB_CUSTOM, 5, 15, 115, 60, + COMBOBOX IDD_ACMFORMATCHOOSE_CMB_CUSTOM, 5, 15, 115, 15, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "&Enregistrer sous...", IDD_ACMFORMATCHOOSE_BTN_SETNAME, 125, 14, 45, 14 - PUSHBUTTON "&Retirer", IDD_ACMFORMATCHOOSE_BTN_DELNAME, 175, 14, 45, 14 + PUSHBUTTON "&Enregistrer sous...", IDD_ACMFORMATCHOOSE_BTN_SETNAME, 125, 14, 70, 14 + PUSHBUTTON "&Supprimer", IDD_ACMFORMATCHOOSE_BTN_DELNAME, 199, 14, 45, 14 LTEXT "&Format :", -1, 5, 41, 44, 8, NOT WS_GROUP - COMBOBOX IDD_ACMFORMATCHOOSE_CMB_FORMATTAG, 50, 39, 170, 60, + COMBOBOX IDD_ACMFORMATCHOOSE_CMB_FORMATTAG, 48, 39, 197, 15, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP LTEXT "&Attributs :", -1, 5, 59, 44, 8, NOT WS_GROUP @@ -49,7 +52,7 @@ BEGIN CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS #else - COMBOBOX IDD_ACMFORMATCHOOSE_CMB_FORMAT, 50, 57, 170, 60, + COMBOBOX IDD_ACMFORMATCHOOSE_CMB_FORMAT, 48, 57, 197, 60, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP #endif DEFPUSHBUTTON "OK", IDOK, 48, 80, 40, 14

1 0