November 2010 - Wine-commits

Alexandre Julliard : Release 1.3.8.
by Alexandre Julliard 26 Nov '10

26 Nov '10

Module: wine Branch: master Commit: b51f8d48128ff0876341e4f31b4d4e1f31f9dad4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b51f8d48128ff0876341e4f31… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 26 20:06:11 2010 +0100 Release 1.3.8. --- ANNOUNCE | 1072 ++++++++++++++++++++++++++----------------------------------- VERSION | 2 +- configure | 18 +- 3 files changed, 463 insertions(+), 629 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b51f8d48128ff0876341e…

1 0

Tag wine-1.3.8 : Alexandre Julliard : Release 1.3.8
by Alexandre Julliard 26 Nov '10

26 Nov '10

Module: wine Branch: refs/tags/wine-1.3.8 Tag: 8e909dfd1335996a189918ed259f026a9a8171a4 URL: http://source.winehq.org/git/wine.git/?a=tag;h=8e909dfd1335996a189918ed259f… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 26 20:06:11 2010 +0100 Release 1.3.8

1 0

Hans Leidekker : msi: Fix the Create/ RemoveFolders actions to actually create and remove empty folders.
by Alexandre Julliard 26 Nov '10

26 Nov '10

Module: wine Branch: master Commit: 1f96b882e9232a19717ca2d9cc266b7d114b2599 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f96b882e9232a19717ca2d9c… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Nov 26 14:03:31 2010 +0100 msi: Fix the Create/RemoveFolders actions to actually create and remove empty folders. --- dlls/msi/action.c | 14 ++-- dlls/msi/tests/action.c | 212 +++++++++++++++++------------------------------ 2 files changed, 81 insertions(+), 145 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1f96b882e9232a19717ca…

1 0

Hans Leidekker : msi: Trace errors from LoadLibraryShim.
by Alexandre Julliard 26 Nov '10

26 Nov '10

Module: wine Branch: master Commit: 967f73eaef84c796940b59eafaef2c028cd0420f URL: http://source.winehq.org/git/wine.git/?a=commit;h=967f73eaef84c796940b59eaf… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Nov 26 14:03:48 2010 +0100 msi: Trace errors from LoadLibraryShim. --- dlls/msi/assembly.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/msi/assembly.c b/dlls/msi/assembly.c index ae23383..b1a7ee0 100644 --- a/dlls/msi/assembly.c +++ b/dlls/msi/assembly.c @@ -38,6 +38,7 @@ static BOOL init_function_pointers( void ) { static const WCHAR szFusion[] = {'f','u','s','i','o','n','.','d','l','l',0}; HMODULE hfusion, hmscoree, hsxs; + HRESULT hr; if (pCreateAssemblyCacheNet) return TRUE; @@ -52,9 +53,10 @@ static BOOL init_function_pointers( void ) FreeLibrary( hmscoree ); return FALSE; } - if (FAILED( pLoadLibraryShim( szFusion, NULL, NULL, &hfusion ))) + hr = pLoadLibraryShim( szFusion, NULL, NULL, &hfusion ); + if (FAILED( hr )) { - WARN("fusion.dll not available\n"); + WARN("fusion.dll not available 0x%08x\n", hr); FreeLibrary( hmscoree ); return FALSE; }

1 0

Hans Leidekker : msi: Always initialize the dialog font list. Convert it to a standard Wine list.
by Alexandre Julliard 26 Nov '10

26 Nov '10

Module: wine Branch: master Commit: 4b5db7a9ac7b4f0d9c2aa49f813b17cf5bac7122 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b5db7a9ac7b4f0d9c2aa49f8… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Nov 26 14:04:03 2010 +0100 msi: Always initialize the dialog font list. Convert it to a standard Wine list. Avoids accessing uninitialized memory when the TextStyle table is absent. --- dlls/msi/dialog.c | 23 ++++++++++++----------- 1 files changed, 12 insertions(+), 11 deletions(-) diff --git a/dlls/msi/dialog.c b/dlls/msi/dialog.c index 35ab30a..b833070 100644 --- a/dlls/msi/dialog.c +++ b/dlls/msi/dialog.c @@ -73,7 +73,7 @@ struct msi_control_tag typedef struct msi_font_tag { - struct msi_font_tag *next; + struct list entry; HFONT hfont; COLORREF color; WCHAR name[1]; @@ -90,7 +90,7 @@ struct msi_dialog_tag SIZE size; HWND hwnd; LPWSTR default_font; - msi_font *font_list; + struct list fonts; struct list controls; HWND hWndFocus; LPWSTR control_default; @@ -310,8 +310,7 @@ static UINT msi_dialog_add_font( MSIRECORD *rec, LPVOID param ) name = MSI_RecordGetString( rec, 1 ); font = msi_alloc( sizeof *font + strlenW( name )*sizeof (WCHAR) ); strcpyW( font->name, name ); - font->next = dialog->font_list; - dialog->font_list = font; + list_add_head( &dialog->fonts, &font->entry ); font->color = MSI_RecordGetInteger( rec, 4 ); @@ -346,9 +345,9 @@ static UINT msi_dialog_add_font( MSIRECORD *rec, LPVOID param ) static msi_font *msi_dialog_find_font( msi_dialog *dialog, LPCWSTR name ) { - msi_font *font; + msi_font *font = NULL; - for( font = dialog->font_list; font; font = font->next ) + LIST_FOR_EACH_ENTRY( font, &dialog->fonts, msi_font, entry ) if( !strcmpW( font->name, name ) ) /* FIXME: case sensitive? */ break; @@ -3853,6 +3852,7 @@ msi_dialog *msi_dialog_create( MSIPACKAGE* package, dialog->event_handler = event_handler; dialog->finished = 0; list_init( &dialog->controls ); + list_init( &dialog->fonts ); /* verify that the dialog exists */ rec = msi_get_dialog_record( dialog ); @@ -3969,6 +3969,8 @@ void msi_dialog_do_preview( msi_dialog *dialog ) void msi_dialog_destroy( msi_dialog *dialog ) { + msi_font *font, *next; + if( uiThreadId != GetCurrentThreadId() ) { SendMessageW( hMsiHiddenWindow, WM_MSI_DIALOG_DESTROY, 0, (LPARAM) dialog ); @@ -3995,12 +3997,11 @@ void msi_dialog_destroy( msi_dialog *dialog ) } /* destroy the list of fonts */ - while( dialog->font_list ) + LIST_FOR_EACH_ENTRY_SAFE( font, next, &dialog->fonts, msi_font, entry ) { - msi_font *t = dialog->font_list; - dialog->font_list = t->next; - DeleteObject( t->hfont ); - msi_free( t ); + list_remove( &font->entry ); + DeleteObject( font->hfont ); + msi_free( font ); } msi_free( dialog->default_font );

1 0

Hans Leidekker : msi/tests: Fix the scope of todo_wine in the tests for MsiApplyMultiplePatches.
by Alexandre Julliard 26 Nov '10

26 Nov '10

Module: wine Branch: master Commit: e609bb04530fa404c1f7b31fc1aa36a71ac7ccd5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e609bb04530fa404c1f7b31fc… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Nov 26 14:04:28 2010 +0100 msi/tests: Fix the scope of todo_wine in the tests for MsiApplyMultiplePatches. These tests succeed on Wine if you run them from a volume for which GetDriveType returns something other than DRIVE_FIXED, e.g. a ramdisk. --- dlls/msi/tests/package.c | 52 ++++++++++++++------------------------------- 1 files changed, 16 insertions(+), 36 deletions(-) diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index 7e236e4..1f1d8d2 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -12794,51 +12794,31 @@ static void test_MsiApplyMultiplePatches(void) ok(r == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %u\n", r); r = pMsiApplyMultiplePatchesA(";", NULL, NULL); - todo_wine - { - if (type == DRIVE_FIXED) - ok(r == ERROR_PATH_NOT_FOUND, - "Expected ERROR_PATH_NOT_FOUND, got %u\n", r); - else - ok(r == ERROR_INVALID_NAME, - "Expected ERROR_INVALID_NAME, got %u\n", r); - } + if (type == DRIVE_FIXED) + todo_wine ok(r == ERROR_PATH_NOT_FOUND, "Expected ERROR_PATH_NOT_FOUND, got %u\n", r); + else + ok(r == ERROR_INVALID_NAME, "Expected ERROR_INVALID_NAME, got %u\n", r); r = pMsiApplyMultiplePatchesA(" ;", NULL, NULL); - todo_wine - { - if (type == DRIVE_FIXED) - ok(r == ERROR_PATCH_PACKAGE_OPEN_FAILED, - "Expected ERROR_PATCH_PACKAGE_OPEN_FAILED, got %u\n", r); - else - ok(r == ERROR_INVALID_NAME, - "Expected ERROR_INVALID_NAME, got %u\n", r); - } + if (type == DRIVE_FIXED) + todo_wine ok(r == ERROR_PATCH_PACKAGE_OPEN_FAILED, "Expected ERROR_PATCH_PACKAGE_OPEN_FAILED, got %u\n", r); + else + ok(r == ERROR_INVALID_NAME, "Expected ERROR_INVALID_NAME, got %u\n", r); r = pMsiApplyMultiplePatchesA(";;", NULL, NULL); - todo_wine - { - if (type == DRIVE_FIXED) - ok(r == ERROR_PATH_NOT_FOUND, - "Expected ERROR_PATH_NOT_FOUND, got %u\n", r); - else - ok(r == ERROR_INVALID_NAME, - "Expected ERROR_INVALID_NAME, got %u\n", r); - } + if (type == DRIVE_FIXED) + todo_wine ok(r == ERROR_PATH_NOT_FOUND, "Expected ERROR_PATH_NOT_FOUND, got %u\n", r); + else + ok(r == ERROR_INVALID_NAME, "Expected ERROR_INVALID_NAME, got %u\n", r); r = pMsiApplyMultiplePatchesA("nosuchpatchpackage;", NULL, NULL); todo_wine ok(r == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %u\n", r); r = pMsiApplyMultiplePatchesA(";nosuchpatchpackage", NULL, NULL); - todo_wine - { - if (type == DRIVE_FIXED) - ok(r == ERROR_PATH_NOT_FOUND, - "Expected ERROR_PATH_NOT_FOUND, got %u\n", r); - else - ok(r == ERROR_INVALID_NAME, - "Expected ERROR_INVALID_NAME, got %u\n", r); - } + if (type == DRIVE_FIXED) + todo_wine ok(r == ERROR_PATH_NOT_FOUND, "Expected ERROR_PATH_NOT_FOUND, got %u\n", r); + else + ok(r == ERROR_INVALID_NAME, "Expected ERROR_INVALID_NAME, got %u\n", r); r = pMsiApplyMultiplePatchesA("nosuchpatchpackage;nosuchpatchpackage", NULL, NULL); todo_wine ok(r == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %u\n", r);

1 0

Francois Gouget : configure: Load wine lower in memory on FreeBSD to leave more space for mmap() and malloc().
by Alexandre Julliard 26 Nov '10

26 Nov '10

Module: wine Branch: master Commit: 5f694ddf4c211c1c167a15541c2654175ce42a62 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f694ddf4c211c1c167a15541… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Nov 26 16:18:32 2010 +0100 configure: Load wine lower in memory on FreeBSD to leave more space for mmap() and malloc(). If not provided an explicit address, FreeBSD won't mmap any memory below the executable. In particularly this means any memory below that is unavailable to dlopen() and malloc(). This fixes the bug where large WineLib binaries, in particular winetest, failed to load because there was not enough space left for them and the native libraries they linked to. The drawback is that we can no longer load very large Windows executables (between about 1.5 and 2 GB). --- configure | 6 +++++- configure.ac | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/configure b/configure index 52d384f..d531667 100755 --- a/configure +++ b/configure @@ -6897,7 +6897,11 @@ eval ac_res=\$$as_ac_var { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 $as_echo "$ac_res" >&6; } if test `eval 'as_val=${'$as_ac_var'};$as_echo "$as_val"'` = yes; then : - LDEXECFLAGS="$LDEXECFLAGS -Wl,--section-start,.interp=0x7bf00400" + case $host_os in + freebsd*) LDEXECFLAGS="$LDEXECFLAGS -Wl,--section-start,.interp=0x60000400" ;; + *) LDEXECFLAGS="$LDEXECFLAGS -Wl,--section-start,.interp=0x7bf00400" ;; + esac + fi # Extract the first word of "prelink", so it can be a program name with args. set dummy prelink; ac_word=$2 diff --git a/configure.ac b/configure.ac index c72e51b..de1ba7d 100644 --- a/configure.ac +++ b/configure.ac @@ -792,7 +792,11 @@ case $host_os in case $host_cpu in *i[[3456789]]86* | x86_64) WINE_TRY_CFLAGS([-Wl,--section-start,.interp=0x7bf00400], - [LDEXECFLAGS="$LDEXECFLAGS -Wl,--section-start,.interp=0x7bf00400"]) + [case $host_os in + freebsd*) LDEXECFLAGS="$LDEXECFLAGS -Wl,--section-start,.interp=0x60000400" ;; + *) LDEXECFLAGS="$LDEXECFLAGS -Wl,--section-start,.interp=0x7bf00400" ;; + esac + ]) AC_PATH_PROG(PRELINK, prelink, false, [/sbin /usr/sbin $PATH]) if test "x$PRELINK" = xfalse then

1 0

Alexandre Julliard : include/msvcrt: Define more CPU control word flags.
by Alexandre Julliard 26 Nov '10

26 Nov '10

Module: wine Branch: master Commit: 1ae23af85b5e68c74652faddfd33dcfa0cfb9cc4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ae23af85b5e68c74652faddf… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 26 14:51:46 2010 +0100 include/msvcrt: Define more CPU control word flags. --- dlls/msvcrt/msvcrt.h | 11 +++++++++++ dlls/msvcrt/tests/headers.c | 12 ++++++++++-- include/msvcrt/float.h | 18 ++++++++++-------- 3 files changed, 31 insertions(+), 10 deletions(-) diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index b14a326..4ca3e3e 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -653,6 +653,12 @@ struct MSVCRT__stat64 { #define MSVCRT__FPCLASS_PN 0x0100 /* Positive Normal */ #define MSVCRT__FPCLASS_PINF 0x0200 /* Positive Infinity */ +#define MSVCRT__MCW_EM 0x0008001f +#define MSVCRT__MCW_IC 0x00040000 +#define MSVCRT__MCW_RC 0x00000300 +#define MSVCRT__MCW_PC 0x00030000 +#define MSVCRT__MCW_DN 0x03000000 + #define MSVCRT__EM_INVALID 0x00000010 #define MSVCRT__EM_DENORMAL 0x00080000 #define MSVCRT__EM_ZERODIVIDE 0x00000008 @@ -668,6 +674,11 @@ struct MSVCRT__stat64 { #define MSVCRT__PC_24 0x00020000 #define MSVCRT__PC_53 0x00010000 #define MSVCRT__PC_64 0x00000000 +#define MSVCRT__DN_SAVE 0x00000000 +#define MSVCRT__DN_FLUSH 0x01000000 +#define MSVCRT__DN_FLUSH_OPERANDS_SAVE_RESULTS 0x02000000 +#define MSVCRT__DN_SAVE_OPERANDS_FLUSH_RESULTS 0x03000000 +#define MSVCRT__EM_AMBIGUOUS 0x80000000 #define MSVCRT_CLOCKS_PER_SEC 1000 diff --git a/dlls/msvcrt/tests/headers.c b/dlls/msvcrt/tests/headers.c index c39948d..ef6e37d 100644 --- a/dlls/msvcrt/tests/headers.c +++ b/dlls/msvcrt/tests/headers.c @@ -425,7 +425,11 @@ static void test_defines(void) CHECK_DEF(_FPE_STACKOVERFLOW); CHECK_DEF(_FPE_STACKUNDERFLOW); CHECK_DEF(_FPE_EXPLICITGEN); -#ifdef __i386__ + CHECK_DEF(_MCW_EM); + CHECK_DEF(_MCW_IC); + CHECK_DEF(_MCW_RC); + CHECK_DEF(_MCW_PC); + CHECK_DEF(_MCW_DN); CHECK_DEF(_EM_INVALID); CHECK_DEF(_EM_DENORMAL); CHECK_DEF(_EM_ZERODIVIDE); @@ -441,7 +445,11 @@ static void test_defines(void) CHECK_DEF(_PC_24); CHECK_DEF(_PC_53); CHECK_DEF(_PC_64); -#endif + CHECK_DEF(_DN_SAVE); + CHECK_DEF(_DN_FLUSH); + CHECK_DEF(_DN_FLUSH_OPERANDS_SAVE_RESULTS); + CHECK_DEF(_DN_SAVE_OPERANDS_FLUSH_RESULTS); + CHECK_DEF(_EM_AMBIGUOUS); } #endif /* __WINE_USE_MSVCRT */ diff --git a/include/msvcrt/float.h b/include/msvcrt/float.h index 7d8f8ae..270e175 100644 --- a/include/msvcrt/float.h +++ b/include/msvcrt/float.h @@ -60,14 +60,12 @@ extern "C" { #define LDBL_RADIX _LDBL_RADIX #define LDBL_ROUNDS _LDBL_ROUNDS -/* _controlfp masks and bitflags - x86 only so far */ -#ifdef __i386__ - /* Control word masks for unMask */ -#define _MCW_EM 0x0008001F /* Error masks */ -#define _MCW_IC 0x00040000 /* Infinity */ -#define _MCW_RC 0x00000300 /* Rounding */ -#define _MCW_PC 0x00030000 /* Precision */ +#define _MCW_EM 0x0008001f +#define _MCW_IC 0x00040000 +#define _MCW_RC 0x00000300 +#define _MCW_PC 0x00030000 +#define _MCW_DN 0x03000000 /* Control word values for unNew (use with related unMask above) */ #define _EM_INVALID 0x00000010 @@ -85,7 +83,11 @@ extern "C" { #define _PC_24 0x00020000 #define _PC_53 0x00010000 #define _PC_64 0x00000000 -#endif +#define _DN_SAVE 0x00000000 +#define _DN_FLUSH 0x01000000 +#define _DN_FLUSH_OPERANDS_SAVE_RESULTS 0x02000000 +#define _DN_SAVE_OPERANDS_FLUSH_RESULTS 0x03000000 +#define _EM_AMBIGUOUS 0x80000000 /* _statusfp bit flags */ #define _SW_INEXACT 0x00000001 /* inexact (precision) */

1 0

Alexandre Julliard : msvcrt: Add parameter checking in _controlfp_s.
by Alexandre Julliard 26 Nov '10

26 Nov '10

Module: wine Branch: master Commit: 4dba956ea696592ac446b4c0042f935bf608cabf URL: http://source.winehq.org/git/wine.git/?a=commit;h=4dba956ea696592ac446b4c00… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 26 14:57:24 2010 +0100 msvcrt: Add parameter checking in _controlfp_s. --- dlls/msvcrt/math.c | 26 ++++++++------------------ 1 files changed, 8 insertions(+), 18 deletions(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 4a3f65e..b6423e9 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -909,12 +909,7 @@ unsigned int CDECL _control87(unsigned int newval, unsigned int mask) */ unsigned int CDECL _controlfp(unsigned int newval, unsigned int mask) { -#ifdef __i386__ return _control87( newval, mask & ~MSVCRT__EM_DENORMAL ); -#else - FIXME(":Not Implemented!\n"); - return 0; -#endif } /********************************************************************* @@ -922,21 +917,16 @@ unsigned int CDECL _controlfp(unsigned int newval, unsigned int mask) */ int CDECL _controlfp_s(unsigned int *cur, unsigned int newval, unsigned int mask) { -#ifdef __i386__ - unsigned int flags; - - FIXME("(%p %u %u) semi-stub\n", cur, newval, mask); - - flags = _control87( newval, mask & ~MSVCRT__EM_DENORMAL ); + static const unsigned int all_flags = (MSVCRT__MCW_EM | MSVCRT__MCW_IC | MSVCRT__MCW_RC | + MSVCRT__MCW_PC | MSVCRT__MCW_DN); - if(cur) - *cur = flags; - - return 0; -#else - FIXME(":Not Implemented!\n"); + if (!MSVCRT_CHECK_PMT(cur != NULL) || !MSVCRT_CHECK_PMT( !(mask & ~all_flags) )) + { + *MSVCRT__errno() = MSVCRT_EINVAL; + return MSVCRT_EINVAL; + } + *cur = _controlfp( newval, mask ); return 0; -#endif } /*********************************************************************

1 0

Hans Leidekker : gdi32/tests: Fix a test failure on systems configured to use a color profile.
by Alexandre Julliard 26 Nov '10

26 Nov '10

Module: wine Branch: master Commit: 24ce163a8bc75cd5725434858bb0561dfce5779e URL: http://source.winehq.org/git/wine.git/?a=commit;h=24ce163a8bc75cd5725434858… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Nov 26 14:03:01 2010 +0100 gdi32/tests: Fix a test failure on systems configured to use a color profile. --- dlls/gdi32/tests/icm.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/tests/icm.c b/dlls/gdi32/tests/icm.c index 16bec76..a1c4f97 100644 --- a/dlls/gdi32/tests/icm.c +++ b/dlls/gdi32/tests/icm.c @@ -217,7 +217,7 @@ static void test_EnumICMProfilesW( HDC dc ) ok(ret == -1 || broken(ret == 0) /* win9x, nt4 */, "expected -1, got %d\n", ret); ret = EnumICMProfilesW( dc, enum_profiles_callbackW, 0 ); - ok(ret == -1 || broken(ret == 0) /* win9x, nt4 */, "expected -1, got %d\n", ret); + ok(ret == -1 || ret == 1 || broken(ret == 0) /* win9x, nt4 */, "expected -1, got %d\n", ret); } static void test_SetICMProfileA( HDC dc )

1 0