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 30 Jun '09

30 Jun '09

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 30 Jun '09

30 Jun '09

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

Alexandre Julliard : ntdll: Large heap blocks don't need to be 64k aligned.
by Alexandre Julliard 30 Jun '09

30 Jun '09

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

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

30 Jun '09

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

Alexandre Julliard : winemenubuilder: Use spawnvp() instead of system() to launch the xdg update scripts.
by Alexandre Julliard 30 Jun '09

30 Jun '09

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

Michael Stefaniuc : wldap32: Build language resource files separately.
by Alexandre Julliard 30 Jun '09

30 Jun '09

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

Michael Stefaniuc : wineconsole: Build language resource files separately.
by Alexandre Julliard 30 Jun '09

30 Jun '09

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

Andrew Nguyen : reg: Report an error when an unknown operation is specified .
by Alexandre Julliard 30 Jun '09

30 Jun '09

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

Hans Leidekker : msi: Support opening transform databases.
by Alexandre Julliard 30 Jun '09

30 Jun '09

Module: wine Branch: master Commit: 60b7604aa18089fcec5b336a06901f7f4cef80f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=60b7604aa18089fcec5b336a0… Author: Hans Leidekker <hans(a)meelstraat.net> Date: Tue Jun 30 13:20:38 2009 +0200 msi: Support opening transform databases. --- dlls/msi/database.c | 8 ++------ dlls/msi/msipriv.h | 4 ++++ dlls/msi/msiquery.c | 2 -- dlls/msi/tests/install.c | 20 ++++---------------- 4 files changed, 10 insertions(+), 24 deletions(-) diff --git a/dlls/msi/database.c b/dlls/msi/database.c index bc9319e..4c21876 100644 --- a/dlls/msi/database.c +++ b/dlls/msi/database.c @@ -41,11 +41,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(msi); -DEFINE_GUID( CLSID_MsiDatabase, 0x000c1084, 0x0000, 0x0000, - 0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x46); -DEFINE_GUID( CLSID_MsiPatch, 0x000c1086, 0x0000, 0x0000, - 0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x46); - /* * .MSI file format * @@ -163,7 +158,8 @@ UINT MSI_OpenDatabaseW(LPCWSTR szDBPath, LPCWSTR szPersist, MSIDATABASE **pdb) } if ( !IsEqualGUID( &stat.clsid, &CLSID_MsiDatabase ) && - !IsEqualGUID( &stat.clsid, &CLSID_MsiPatch ) ) + !IsEqualGUID( &stat.clsid, &CLSID_MsiPatch ) && + !IsEqualGUID( &stat.clsid, &CLSID_MsiTransform ) ) { ERR("storage GUID is not a MSI database GUID %s\n", debugstr_guid(&stat.clsid) ); diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index 8c4bd3a..b61d7b6 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -605,6 +605,10 @@ DEFINE_GUID(CLSID_IMsiServerMessage, 0x000C101D,0x0000,0x0000,0xC0,0x00,0x00,0x0 DEFINE_GUID(CLSID_IWineMsiRemoteCustomAction,0xBA26E6FA,0x4F27,0x4f56,0x95,0x3A,0x3F,0x90,0x27,0x20,0x18,0xAA); DEFINE_GUID(CLSID_IWineMsiRemotePackage,0x902b3592,0x9d08,0x4dfd,0xa5,0x93,0xd0,0x7c,0x52,0x54,0x64,0x21); +DEFINE_GUID(CLSID_MsiTransform, 0x000c1082,0x0000,0x0000,0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x46); +DEFINE_GUID(CLSID_MsiDatabase, 0x000c1084,0x0000,0x0000,0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x46); +DEFINE_GUID(CLSID_MsiPatch, 0x000c1086,0x0000,0x0000,0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x46); + /* handle unicode/ascii output in the Msi* API functions */ typedef struct { BOOL unicode; diff --git a/dlls/msi/msiquery.c b/dlls/msi/msiquery.c index 43c7b4d..5a46f9b 100644 --- a/dlls/msi/msiquery.c +++ b/dlls/msi/msiquery.c @@ -716,8 +716,6 @@ MSIHANDLE WINAPI MsiGetLastErrorRecord( void ) return 0; } -DEFINE_GUID( CLSID_MsiTransform, 0x000c1082, 0x0000, 0x0000, 0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x46); - UINT MSI_DatabaseApplyTransformW( MSIDATABASE *db, LPCWSTR szTransformFile, int iErrorCond ) { diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index 4912f8c..e6c22fb 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -4386,31 +4386,19 @@ static void set_transform_summary_info(void) /* build summary info */ r = MsiGetSummaryInformation(0, mstfile, 3, &suminfo); - todo_wine - { - ok(r == ERROR_SUCCESS , "Failed to open summaryinfo\n"); - } + ok(r == ERROR_SUCCESS , "Failed to open summaryinfo\n"); r = MsiSummaryInfoSetProperty(suminfo, PID_TITLE, VT_LPSTR, 0, NULL, "MSITEST"); - todo_wine - { - ok(r == ERROR_SUCCESS, "Failed to set summary info\n"); - } + ok(r == ERROR_SUCCESS, "Failed to set summary info\n"); r = MsiSummaryInfoSetProperty(suminfo, PID_REVNUMBER, VT_LPSTR, 0, NULL, "{7DF88A48-996F-4EC8-A022-BF956F9B2CBB}1.1.1;" "{7DF88A48-996F-4EC8-A022-BF956F9B2CBB}1.1.1;" "{4C0EAA15-0264-4E5A-8758-609EF142B92D}"); - todo_wine - { - ok(r == ERROR_SUCCESS , "Failed to set summary info\n"); - } + ok(r == ERROR_SUCCESS , "Failed to set summary info\n"); r = MsiSummaryInfoSetProperty(suminfo, PID_PAGECOUNT, VT_I4, 100, NULL, NULL); - todo_wine - { - ok(r == ERROR_SUCCESS, "Failed to set summary info\n"); - } + ok(r == ERROR_SUCCESS, "Failed to set summary info\n"); r = MsiSummaryInfoPersist(suminfo); todo_wine

1 0

Michael Stefaniuc : mpr: Build language resource files separately.
by Alexandre Julliard 30 Jun '09

30 Jun '09

Module: wine Branch: master Commit: 90d5a4b693338319500d175b7d58f0dfd9dd3b04 URL: http://source.winehq.org/git/wine.git/?a=commit;h=90d5a4b693338319500d175b7… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jun 30 13:13:16 2009 +0200 mpr: Build language resource files separately. Instead of including them from an other rc file. --- dlls/mpr/Makefile.in | 26 +++++++++++++++++++++++++- dlls/mpr/mpr.rc | 49 ------------------------------------------------- dlls/mpr/mpr_Bg.rc | 2 ++ dlls/mpr/mpr_Cs.rc | 2 ++ dlls/mpr/mpr_Da.rc | 2 ++ dlls/mpr/mpr_De.rc | 2 ++ dlls/mpr/mpr_En.rc | 2 ++ dlls/mpr/mpr_Eo.rc | 2 ++ dlls/mpr/mpr_Es.rc | 2 ++ dlls/mpr/mpr_Fr.rc | 2 ++ dlls/mpr/mpr_Hu.rc | 2 ++ dlls/mpr/mpr_It.rc | 2 ++ dlls/mpr/mpr_Ja.rc | 4 ++-- dlls/mpr/mpr_Ko.rc | 2 ++ dlls/mpr/mpr_Lt.rc | 4 ++-- dlls/mpr/mpr_Nl.rc | 2 ++ dlls/mpr/mpr_No.rc | 2 ++ dlls/mpr/mpr_Pl.rc | 2 ++ dlls/mpr/mpr_Pt.rc | 2 ++ dlls/mpr/mpr_Ro.rc | 4 ++-- dlls/mpr/mpr_Ru.rc | 2 ++ dlls/mpr/mpr_Si.rc | 4 ++-- dlls/mpr/mpr_Sv.rc | 2 ++ dlls/mpr/mpr_Tr.rc | 2 ++ dlls/mpr/mpr_Zh.rc | 4 ++-- dlls/mpr/mprres.h | 3 +++ 26 files changed, 74 insertions(+), 60 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=90d5a4b693338319500d1…

1 0