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

Alexander Nicolaysen Sørnes : Fix adding downloadurls to versions that only have queued urls
by Alexander Nicolaysen Sørnes June 30, 2009

June 30, 2009

Module: appdb Branch: master Commit: 0473f7bfc3f31eb3a58ab6fadbeae31af6988c62 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=0473f7bfc3f31eb3a58ab6fa… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Tue Jun 30 20:51:14 2009 +0200 Fix adding downloadurls to versions that only have queued urls --- include/downloadurl.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/downloadurl.php b/include/downloadurl.php index 4b0498d..ca903bb 100644 --- a/include/downloadurl.php +++ b/include/downloadurl.php @@ -169,7 +169,7 @@ class downloadurl return FALSE; if(!($hResult = query_parameters("SELECT COUNT(*) as num FROM appData - WHERE TYPE = '?' AND versionId = '?'", + WHERE TYPE = '?' AND versionId = '?' AND state = 'accepted'", "downloadurl", $aValues["iVersionId"]))) return FALSE;

1 0

Andrew Nguyen : reg: Fix behavior when specifying the help flag.
by Alexandre Julliard June 30, 2009

June 30, 2009

Module: wine Branch: master Commit: a3dbe3cce1e45b66d98531434b5ce8c2df6dd4e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a3dbe3cce1e45b66d98531434… Author: Andrew Nguyen <arethusa26(a)gmail.com> Date: Sat Jun 27 17:45:26 2009 -0500 reg: Fix behavior when specifying the help flag. --- programs/reg/reg.c | 26 +++++++++++++++++++++----- 1 files changed, 21 insertions(+), 5 deletions(-) diff --git a/programs/reg/reg.c b/programs/reg/reg.c index fcb0969..aa9d440 100644 --- a/programs/reg/reg.c +++ b/programs/reg/reg.c @@ -357,11 +357,12 @@ int wmain(int argc, WCHAR *argvW[]) static const WCHAR slashVW[] = {'/','v',0}; static const WCHAR slashVAW[] = {'/','v','a',0}; static const WCHAR slashVEW[] = {'/','v','e',0}; + static const WCHAR slashHelpW[] = {'/','?',0}; - if (argc < 2) + if (argc < 2 || !lstrcmpW(argvW[1], slashHelpW)) { reg_message(STRING_USAGE); - return 1; + return 0; } if (!lstrcmpiW(argvW[1], addW)) @@ -371,9 +372,14 @@ int wmain(int argc, WCHAR *argvW[]) if (argc < 3) { - reg_message(STRING_ADD_USAGE); + reg_message(STRING_INVALID_CMDLINE); return 1; } + else if (argc == 3 && !lstrcmpW(argvW[2], slashHelpW)) + { + reg_message(STRING_ADD_USAGE); + return 0; + } key_name = argvW[2]; for (i = 1; i < argc; i++) @@ -401,9 +407,14 @@ int wmain(int argc, WCHAR *argvW[]) if (argc < 3) { - reg_message(STRING_DELETE_USAGE); + reg_message(STRING_INVALID_CMDLINE); return 1; } + else if (argc == 3 && !lstrcmpW(argvW[2], slashHelpW)) + { + reg_message(STRING_DELETE_USAGE); + return 0; + } key_name = argvW[2]; for (i = 1; i < argc; i++) @@ -426,9 +437,14 @@ int wmain(int argc, WCHAR *argvW[]) if (argc < 3) { - reg_message(STRING_QUERY_USAGE); + reg_message(STRING_INVALID_CMDLINE); return 1; } + else if (argc == 3 && !lstrcmpW(argvW[2], slashHelpW)) + { + reg_message(STRING_QUERY_USAGE); + return 0; + } key_name = argvW[2]; for (i = 1; i < argc; i++)

1 0

Andrew Nguyen : reg: Report an error when an unknown operation is specified .
by Alexandre Julliard June 30, 2009

June 30, 2009

Module: wine Branch: master Commit: 24c6f5cc35df0ca194bfe425d2d2a0148584a2ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=24c6f5cc35df0ca194bfe425d… Author: Andrew Nguyen <arethusa26(a)gmail.com> Date: Sat Jun 27 17:38:30 2009 -0500 reg: Report an error when an unknown operation is specified. --- programs/reg/reg.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/programs/reg/reg.c b/programs/reg/reg.c index 823b4d9..fcb0969 100644 --- a/programs/reg/reg.c +++ b/programs/reg/reg.c @@ -442,6 +442,9 @@ int wmain(int argc, WCHAR *argvW[]) } return reg_query(key_name, value_name, value_empty, subkey); } - - return 0; + else + { + reg_message(STRING_INVALID_CMDLINE); + return 1; + } }

1 0

Michael Stefaniuc : wldap32: Build language resource files separately.
by Alexandre Julliard June 30, 2009

June 30, 2009

Module: wine Branch: master Commit: d0df28b90962dc21d8b4f8171a48808f2d676121 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d0df28b90962dc21d8b4f8171… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jun 30 13:15:04 2009 +0200 wldap32: Build language resource files separately. Instead of including them from an other rc file. --- dlls/wldap32/Makefile.in | 16 +++++++++++++++- dlls/wldap32/wldap32.rc | 38 -------------------------------------- dlls/wldap32/wldap32_Da.rc | 2 ++ dlls/wldap32/wldap32_De.rc | 2 ++ dlls/wldap32/wldap32_En.rc | 2 ++ dlls/wldap32/wldap32_Es.rc | 2 ++ dlls/wldap32/wldap32_Fr.rc | 2 ++ dlls/wldap32/wldap32_Ko.rc | 2 ++ dlls/wldap32/wldap32_Lt.rc | 4 ++-- dlls/wldap32/wldap32_Nl.rc | 2 ++ dlls/wldap32/wldap32_No.rc | 2 ++ dlls/wldap32/wldap32_Pl.rc | 2 ++ dlls/wldap32/wldap32_Pt.rc | 2 ++ dlls/wldap32/wldap32_Ru.rc | 2 ++ dlls/wldap32/wldap32_Sv.rc | 2 ++ dlls/wldap32/wldap32_Tr.rc | 2 ++ 16 files changed, 43 insertions(+), 41 deletions(-) diff --git a/dlls/wldap32/Makefile.in b/dlls/wldap32/Makefile.in index b7126b3..5b1776e 100644 --- a/dlls/wldap32/Makefile.in +++ b/dlls/wldap32/Makefile.in @@ -29,7 +29,21 @@ C_SRCS = \ search.c \ value.c -RC_SRCS = wldap32.rc +RC_SRCS = \ + wldap32_Da.rc \ + wldap32_De.rc \ + wldap32_En.rc \ + wldap32_Es.rc \ + wldap32_Fr.rc \ + wldap32_Ko.rc \ + wldap32_Lt.rc \ + wldap32_Nl.rc \ + wldap32_No.rc \ + wldap32_Pl.rc \ + wldap32_Pt.rc \ + wldap32_Ru.rc \ + wldap32_Sv.rc \ + wldap32_Tr.rc @MAKE_DLL_RULES@ diff --git a/dlls/wldap32/wldap32.rc b/dlls/wldap32/wldap32.rc deleted file mode 100644 index b27d8cd..0000000 --- a/dlls/wldap32/wldap32.rc +++ /dev/null @@ -1,38 +0,0 @@ -/* - * Top level resource file for WLDAP32 - * - * Copyright 2005 Hans Leidekker - * - * 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 "winbase.h" -#include "winuser.h" - -#include "wldap32_Da.rc" -#include "wldap32_De.rc" -#include "wldap32_En.rc" -#include "wldap32_Es.rc" -#include "wldap32_Fr.rc" -#include "wldap32_Ko.rc" -#include "wldap32_Lt.rc" -#include "wldap32_Nl.rc" -#include "wldap32_No.rc" -#include "wldap32_Pl.rc" -#include "wldap32_Pt.rc" -#include "wldap32_Ru.rc" -#include "wldap32_Sv.rc" -#include "wldap32_Tr.rc" diff --git a/dlls/wldap32/wldap32_Da.rc b/dlls/wldap32/wldap32_Da.rc index 2a48498..286a8e4 100644 --- a/dlls/wldap32/wldap32_Da.rc +++ b/dlls/wldap32/wldap32_Da.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "windef.h" + LANGUAGE LANG_DANISH, SUBLANG_DEFAULT STRINGTABLE DISCARDABLE diff --git a/dlls/wldap32/wldap32_De.rc b/dlls/wldap32/wldap32_De.rc index 86d0263..0ceba9e 100644 --- a/dlls/wldap32/wldap32_De.rc +++ b/dlls/wldap32/wldap32_De.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "windef.h" + LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL STRINGTABLE DISCARDABLE diff --git a/dlls/wldap32/wldap32_En.rc b/dlls/wldap32/wldap32_En.rc index 4d21364..1c2ca0f 100644 --- a/dlls/wldap32/wldap32_En.rc +++ b/dlls/wldap32/wldap32_En.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "windef.h" + LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT STRINGTABLE DISCARDABLE diff --git a/dlls/wldap32/wldap32_Es.rc b/dlls/wldap32/wldap32_Es.rc index d0935b1..959dd11 100644 --- a/dlls/wldap32/wldap32_Es.rc +++ b/dlls/wldap32/wldap32_Es.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "windef.h" + LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL STRINGTABLE DISCARDABLE diff --git a/dlls/wldap32/wldap32_Fr.rc b/dlls/wldap32/wldap32_Fr.rc index 3906b70..7b62613 100644 --- a/dlls/wldap32/wldap32_Fr.rc +++ b/dlls/wldap32/wldap32_Fr.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "windef.h" + LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL STRINGTABLE DISCARDABLE diff --git a/dlls/wldap32/wldap32_Ko.rc b/dlls/wldap32/wldap32_Ko.rc index a5f0137..9b9c9ce 100644 --- a/dlls/wldap32/wldap32_Ko.rc +++ b/dlls/wldap32/wldap32_Ko.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "windef.h" + LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT STRINGTABLE DISCARDABLE diff --git a/dlls/wldap32/wldap32_Lt.rc b/dlls/wldap32/wldap32_Lt.rc index f4b39ae..41a8f59 100644 --- a/dlls/wldap32/wldap32_Lt.rc +++ b/dlls/wldap32/wldap32_Lt.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "windef.h" + /* UTF-8 */ #pragma code_page(65001) @@ -124,5 +126,3 @@ STRINGTABLE DISCARDABLE 96 "Aptiktas ciklas apdorojant perdavimus" 97 "Viršyta perdavimo šuolių riba" } - -#pragma code_page(default) diff --git a/dlls/wldap32/wldap32_Nl.rc b/dlls/wldap32/wldap32_Nl.rc index 3146f17..58ac2ef 100644 --- a/dlls/wldap32/wldap32_Nl.rc +++ b/dlls/wldap32/wldap32_Nl.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "windef.h" + LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL STRINGTABLE DISCARDABLE diff --git a/dlls/wldap32/wldap32_No.rc b/dlls/wldap32/wldap32_No.rc index de0a593..dc174f7 100644 --- a/dlls/wldap32/wldap32_No.rc +++ b/dlls/wldap32/wldap32_No.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "windef.h" + LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL STRINGTABLE DISCARDABLE diff --git a/dlls/wldap32/wldap32_Pl.rc b/dlls/wldap32/wldap32_Pl.rc index 2e80b88..41d0e31 100644 --- a/dlls/wldap32/wldap32_Pl.rc +++ b/dlls/wldap32/wldap32_Pl.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "windef.h" + LANGUAGE LANG_POLISH, SUBLANG_DEFAULT STRINGTABLE DISCARDABLE diff --git a/dlls/wldap32/wldap32_Pt.rc b/dlls/wldap32/wldap32_Pt.rc index 172234c..386c7a5 100644 --- a/dlls/wldap32/wldap32_Pt.rc +++ b/dlls/wldap32/wldap32_Pt.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "windef.h" + LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL STRINGTABLE DISCARDABLE diff --git a/dlls/wldap32/wldap32_Ru.rc b/dlls/wldap32/wldap32_Ru.rc index 7e6a560..48ff24f 100644 --- a/dlls/wldap32/wldap32_Ru.rc +++ b/dlls/wldap32/wldap32_Ru.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "windef.h" + LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT STRINGTABLE DISCARDABLE diff --git a/dlls/wldap32/wldap32_Sv.rc b/dlls/wldap32/wldap32_Sv.rc index 6913740..f308ade 100644 --- a/dlls/wldap32/wldap32_Sv.rc +++ b/dlls/wldap32/wldap32_Sv.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "windef.h" + LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL STRINGTABLE DISCARDABLE diff --git a/dlls/wldap32/wldap32_Tr.rc b/dlls/wldap32/wldap32_Tr.rc index 3f089e7..7f49abc 100644 --- a/dlls/wldap32/wldap32_Tr.rc +++ b/dlls/wldap32/wldap32_Tr.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "windef.h" + LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT STRINGTABLE DISCARDABLE

1 0

Alexandre Julliard : winemenubuilder: Use spawnvp() instead of system() to launch the xdg update scripts.
by Alexandre Julliard June 30, 2009

June 30, 2009

Module: wine Branch: master Commit: afe626fb9972d612fd84a8a76eae6ef12f503465 URL: http://source.winehq.org/git/wine.git/?a=commit;h=afe626fb9972d612fd84a8a76… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 30 14:27:35 2009 +0200 winemenubuilder: Use spawnvp() instead of system() to launch the xdg update scripts. --- programs/winemenubuilder/winemenubuilder.c | 31 ++++++++------------------- 1 files changed, 9 insertions(+), 22 deletions(-) diff --git a/programs/winemenubuilder/winemenubuilder.c b/programs/winemenubuilder/winemenubuilder.c index 27a9e5e..200cd0f 100644 --- a/programs/winemenubuilder/winemenubuilder.c +++ b/programs/winemenubuilder/winemenubuilder.c @@ -2525,29 +2525,16 @@ static void RefreshFileTypeAssociations(void) hasChanged |= cleanup_associations(); if (hasChanged) { - char *command = heap_printf("update-mime-database %s", mime_dir); - if (command) - { - system(command); - HeapFree(GetProcessHeap(), 0, command); - } - else - { - WINE_ERR("out of memory\n"); - goto end; - } + const char *argv[3]; - command = heap_printf("update-desktop-database %s/applications", xdg_data_dir); - if (command) - { - system(command); - HeapFree(GetProcessHeap(), 0, command); - } - else - { - WINE_ERR("out of memory\n"); - goto end; - } + argv[0] = "update-mime-database"; + argv[1] = mime_dir; + argv[2] = NULL; + spawnvp( _P_NOWAIT, argv[0], argv ); + + argv[0] = "update-desktop-database"; + argv[1] = applications_dir; + spawnvp( _P_NOWAIT, argv[0], argv ); } end:

1 0

Alexandre Julliard : ntdll: Large heap blocks don't need to be 64k aligned.
by Alexandre Julliard June 30, 2009

June 30, 2009

Module: wine Branch: master Commit: c03991be68d1cf2d3a4b2410d3445d84e240777b URL: http://source.winehq.org/git/wine.git/?a=commit;h=c03991be68d1cf2d3a4b2410d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 30 14:06:55 2009 +0200 ntdll: Large heap blocks don't need to be 64k aligned. --- dlls/ntdll/heap.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c index 5466a54..06490ba 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -647,7 +647,7 @@ static void *allocate_large_block( HEAP *heap, DWORD flags, SIZE_T size ) LPVOID address = NULL; if (block_size < size) return NULL; /* overflow */ - if (NtAllocateVirtualMemory( NtCurrentProcess(), &address, 0, + if (NtAllocateVirtualMemory( NtCurrentProcess(), &address, 5, &block_size, MEM_COMMIT, get_protection_type( flags ) )) { WARN("Could not allocate block for %08lx bytes\n", size );

1 0

Michael Stefaniuc : wineconsole: Build language resource files separately.
by Alexandre Julliard June 30, 2009

June 30, 2009

Module: wine Branch: master Commit: a138f4b85d230002f317ccf03b188ea065fdf7f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a138f4b85d230002f317ccf03… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jun 30 13:15:33 2009 +0200 wineconsole: Build language resource files separately. Instead of including them from an other rc file. --- programs/wineconsole/Makefile.in | 20 +++++++++++++- programs/wineconsole/wineconsole_Cs.rc | 2 + programs/wineconsole/wineconsole_De.rc | 2 + programs/wineconsole/wineconsole_En.rc | 2 + programs/wineconsole/wineconsole_Eo.rc | 2 + programs/wineconsole/wineconsole_Es.rc | 2 + programs/wineconsole/wineconsole_Fr.rc | 2 + programs/wineconsole/wineconsole_Hu.rc | 2 + programs/wineconsole/wineconsole_It.rc | 2 + programs/wineconsole/wineconsole_Ko.rc | 2 + programs/wineconsole/wineconsole_Nl.rc | 2 + programs/wineconsole/wineconsole_No.rc | 2 + programs/wineconsole/wineconsole_Pl.rc | 2 + programs/wineconsole/wineconsole_Pt.rc | 2 + programs/wineconsole/wineconsole_Ru.rc | 2 + programs/wineconsole/wineconsole_Si.rc | 4 +- programs/wineconsole/wineconsole_Sv.rc | 2 + programs/wineconsole/wineconsole_Tr.rc | 2 + programs/wineconsole/wineconsole_Zh.rc | 4 +- programs/wineconsole/wineconsole_res.h | 4 +++ programs/wineconsole/wineconsole_res.rc | 44 ------------------------------- 21 files changed, 59 insertions(+), 49 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a138f4b85d230002f317c…

1 0

Alexandre Julliard : ntdll: Go back to growing the heap in smaller increments once we start running out of address space .
by Alexandre Julliard June 30, 2009

June 30, 2009

Module: wine Branch: master Commit: 5f2300644179869556439dcf4d988285d01cfd20 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f2300644179869556439dcf4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 30 14:07:18 2009 +0200 ntdll: Go back to growing the heap in smaller increments once we start running out of address space. --- dlls/ntdll/heap.c | 17 ++++++++++++----- 1 files changed, 12 insertions(+), 5 deletions(-) diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c index 06490ba..23c0ca2 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -927,11 +927,18 @@ static ARENA_FREE *HEAP_FindFreeBlock( HEAP *heap, SIZE_T size, total_size = size + ROUND_SIZE(sizeof(SUBHEAP)) + sizeof(ARENA_INUSE) + sizeof(ARENA_FREE); if (total_size < size) return NULL; /* overflow */ - if (!(subheap = HEAP_CreateSubHeap( heap, NULL, heap->flags, total_size, - max( heap->grow_size, total_size ) ))) - return NULL; - - if (heap->grow_size < 128 * 1024 * 1024) heap->grow_size *= 2; + if ((subheap = HEAP_CreateSubHeap( heap, NULL, heap->flags, total_size, + max( heap->grow_size, total_size ) ))) + { + if (heap->grow_size < 128 * 1024 * 1024) heap->grow_size *= 2; + } + else while (!subheap) /* shrink the grow size again if we are running out of space */ + { + if (heap->grow_size <= total_size || heap->grow_size <= 4 * 1024 * 1024) return NULL; + heap->grow_size /= 2; + subheap = HEAP_CreateSubHeap( heap, NULL, heap->flags, total_size, + max( heap->grow_size, total_size ) ); + } TRACE("created new sub-heap %p of %08lx bytes for heap %p\n", subheap, subheap->size, heap );

1 0

Michael Stefaniuc : cryptdlg: Build language resource files separately.
by Alexandre Julliard June 30, 2009

June 30, 2009

Module: wine Branch: master Commit: c0039ecd859f2262a71ed524ff9e6d8546d9a858 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0039ecd859f2262a71ed524f… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jun 30 13:16:05 2009 +0200 cryptdlg: Build language resource files separately. Instead of including them from an other rc file. --- dlls/cryptdlg/Makefile.in | 9 ++++++++- dlls/cryptdlg/cryptdlg.rc | 31 ------------------------------- dlls/cryptdlg/cryptdlg_De.rc | 2 ++ dlls/cryptdlg/cryptdlg_En.rc | 2 ++ dlls/cryptdlg/cryptdlg_Fr.rc | 2 ++ dlls/cryptdlg/cryptdlg_Ko.rc | 2 ++ dlls/cryptdlg/cryptdlg_Lt.rc | 4 ++-- dlls/cryptdlg/cryptdlg_Nl.rc | 2 ++ dlls/cryptdlg/cryptdlg_Ro.rc | 4 ++-- dlls/cryptdlg/cryptres.h | 2 ++ 10 files changed, 24 insertions(+), 36 deletions(-) diff --git a/dlls/cryptdlg/Makefile.in b/dlls/cryptdlg/Makefile.in index dd5a815..311e805 100644 --- a/dlls/cryptdlg/Makefile.in +++ b/dlls/cryptdlg/Makefile.in @@ -8,7 +8,14 @@ IMPORTS = cryptui crypt32 wintrust user32 advapi32 kernel32 C_SRCS = \ main.c -RC_SRCS = cryptdlg.rc +RC_SRCS = \ + cryptdlg_De.rc \ + cryptdlg_En.rc \ + cryptdlg_Fr.rc \ + cryptdlg_Ko.rc \ + cryptdlg_Lt.rc \ + cryptdlg_Nl.rc \ + cryptdlg_Ro.rc @MAKE_DLL_RULES@ diff --git a/dlls/cryptdlg/cryptdlg.rc b/dlls/cryptdlg/cryptdlg.rc deleted file mode 100644 index ac5ce11..0000000 --- a/dlls/cryptdlg/cryptdlg.rc +++ /dev/null @@ -1,31 +0,0 @@ -/* - * cryptdlg dll resources - * - * Copyright 2008 Juan Lang - * - * 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 "winbase.h" -#include "winuser.h" -#include "cryptres.h" - -#include "cryptdlg_De.rc" -#include "cryptdlg_En.rc" -#include "cryptdlg_Fr.rc" -#include "cryptdlg_Ko.rc" -#include "cryptdlg_Lt.rc" -#include "cryptdlg_Nl.rc" -#include "cryptdlg_Ro.rc" diff --git a/dlls/cryptdlg/cryptdlg_De.rc b/dlls/cryptdlg/cryptdlg_De.rc index 647171d..d3181ef 100644 --- a/dlls/cryptdlg/cryptdlg_De.rc +++ b/dlls/cryptdlg/cryptdlg_De.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "cryptres.h" + LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL STRINGTABLE DISCARDABLE diff --git a/dlls/cryptdlg/cryptdlg_En.rc b/dlls/cryptdlg/cryptdlg_En.rc index 99126c4..3ab5f94 100644 --- a/dlls/cryptdlg/cryptdlg_En.rc +++ b/dlls/cryptdlg/cryptdlg_En.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "cryptres.h" + LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT STRINGTABLE DISCARDABLE diff --git a/dlls/cryptdlg/cryptdlg_Fr.rc b/dlls/cryptdlg/cryptdlg_Fr.rc index 23de9eb..f71be3a 100644 --- a/dlls/cryptdlg/cryptdlg_Fr.rc +++ b/dlls/cryptdlg/cryptdlg_Fr.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "cryptres.h" + LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL STRINGTABLE DISCARDABLE diff --git a/dlls/cryptdlg/cryptdlg_Ko.rc b/dlls/cryptdlg/cryptdlg_Ko.rc index 3778a57..548a74d 100644 --- a/dlls/cryptdlg/cryptdlg_Ko.rc +++ b/dlls/cryptdlg/cryptdlg_Ko.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "cryptres.h" + LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT STRINGTABLE DISCARDABLE diff --git a/dlls/cryptdlg/cryptdlg_Lt.rc b/dlls/cryptdlg/cryptdlg_Lt.rc index d239dbc..a967494 100644 --- a/dlls/cryptdlg/cryptdlg_Lt.rc +++ b/dlls/cryptdlg/cryptdlg_Lt.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "cryptres.h" + /* UTF-8 */ #pragma code_page(65001) @@ -37,5 +39,3 @@ STRINGTABLE DISCARDABLE IDS_NOTICE_NUM "Pranešimo numeris=" IDS_NOTICE_TEXT "Pranešimo tekstas=" } - -#pragma code_page(default) diff --git a/dlls/cryptdlg/cryptdlg_Nl.rc b/dlls/cryptdlg/cryptdlg_Nl.rc index 27b0935..3e8aca0 100644 --- a/dlls/cryptdlg/cryptdlg_Nl.rc +++ b/dlls/cryptdlg/cryptdlg_Nl.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "cryptres.h" + LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL STRINGTABLE DISCARDABLE diff --git a/dlls/cryptdlg/cryptdlg_Ro.rc b/dlls/cryptdlg/cryptdlg_Ro.rc index 998ce7f..17b60e0 100644 --- a/dlls/cryptdlg/cryptdlg_Ro.rc +++ b/dlls/cryptdlg/cryptdlg_Ro.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "cryptres.h" + /* UTF-8 */ #pragma code_page(65001) @@ -37,5 +39,3 @@ STRINGTABLE DISCARDABLE IDS_NOTICE_NUM "Numărul notiței=" IDS_NOTICE_TEXT "Textul notiței=" } - -#pragma code_page(default) diff --git a/dlls/cryptdlg/cryptres.h b/dlls/cryptdlg/cryptres.h index b64459a..4d3c2d2 100644 --- a/dlls/cryptdlg/cryptres.h +++ b/dlls/cryptdlg/cryptres.h @@ -18,6 +18,8 @@ #ifndef __CRYPTRES_H__ #define __CRYPTRES_H__ +#include <windef.h> + #define IDS_CERT_POLICY 100 #define IDS_POLICY_ID 101 #define IDS_POLICY_QUALIFIER_INFO 102

1 0

Michael Stefaniuc : msrle32: Build language resource files separately.
by Alexandre Julliard June 30, 2009

June 30, 2009

Module: wine Branch: master Commit: e74505d844e82f0b08c8ca602bff480b1ebdc1d2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e74505d844e82f0b08c8ca602… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jun 30 13:13:57 2009 +0200 msrle32: Build language resource files separately. Instead of including them from an other rc file. --- dlls/msrle32/Makefile.in | 23 ++++++++++++++++++- dlls/msrle32/msrle_Bg.rc | 2 + dlls/msrle32/msrle_Cs.rc | 2 + dlls/msrle32/msrle_Da.rc | 2 + dlls/msrle32/msrle_De.rc | 2 + dlls/msrle32/msrle_En.rc | 2 + dlls/msrle32/msrle_Es.rc | 2 + dlls/msrle32/msrle_Fr.rc | 2 + dlls/msrle32/msrle_Hu.rc | 2 + dlls/msrle32/msrle_It.rc | 2 + dlls/msrle32/msrle_Ja.rc | 4 +- dlls/msrle32/msrle_Ko.rc | 2 + dlls/msrle32/msrle_Lt.rc | 4 +- dlls/msrle32/msrle_Nl.rc | 2 + dlls/msrle32/msrle_No.rc | 2 + dlls/msrle32/msrle_Pl.rc | 2 + dlls/msrle32/msrle_Pt.rc | 2 + dlls/msrle32/msrle_Ro.rc | 4 +- dlls/msrle32/msrle_Ru.rc | 2 + dlls/msrle32/msrle_Si.rc | 4 +- dlls/msrle32/msrle_Sv.rc | 2 + dlls/msrle32/msrle_Tr.rc | 2 + dlls/msrle32/rsrc.rc | 54 ---------------------------------------------- 23 files changed, 64 insertions(+), 63 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e74505d844e82f0b08c8c…

1 0