January 2014 - Wine-commits

Tag wine-1.7.10 : Alexandre Julliard : Release 1.7.10
by Alexandre Julliard 03 Jan '14

03 Jan '14

Module: wine Branch: refs/tags/wine-1.7.10 Tag: f7c303054dc10e2ea318f331308a0f5d7943d3df URL: http://source.winehq.org/git/wine.git/?a=tag;h=f7c303054dc10e2ea318f331308a… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 3 20:00:47 2014 +0100 Release 1.7.10

1 0

Piotr Caban : msvcp80: Fix ostreambuf_iterator<char> structure definition.
by Alexandre Julliard 03 Jan '14

03 Jan '14

Module: wine Branch: master Commit: 2a8a1452acdeb0eb671ac4526ea10485307ffc31 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a8a1452acdeb0eb671ac4526… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Jan 3 14:08:19 2014 +0100 msvcp80: Fix ostreambuf_iterator<char> structure definition. --- dlls/msvcp90/ios.c | 88 ++++++++++++++++++------ dlls/msvcp90/locale.c | 172 ++++++++++++++++++++++++++++++++++++++++++++++++ dlls/msvcp90/msvcp90.h | 6 ++ 3 files changed, 244 insertions(+), 22 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2a8a1452acdeb0eb671ac…

1 0

Hans Leidekker : msi: Always derive the SourceDir property from the database path.
by Alexandre Julliard 03 Jan '14

03 Jan '14

Module: wine Branch: master Commit: 41d2b53c5b6d9815f73610aad1ff6bb5e2c5cbbb URL: http://source.winehq.org/git/wine.git/?a=commit;h=41d2b53c5b6d9815f73610aad… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jan 3 15:00:33 2014 +0100 msi: Always derive the SourceDir property from the database path. --- dlls/msi/action.c | 42 +++++++++++------------------------------- 1 files changed, 11 insertions(+), 31 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 2a0bf87..aab8c0f 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -424,41 +424,21 @@ static BOOL ui_sequence_exists( MSIPACKAGE *package ) UINT msi_set_sourcedir_props(MSIPACKAGE *package, BOOL replace) { - LPWSTR source, check; + WCHAR *source, *check, *p, *db; + DWORD len; - if (msi_get_property_int( package->db, szInstalled, 0 )) - { - HKEY hkey; + if (!(db = msi_dup_property( package->db, szOriginalDatabase ))) + return ERROR_OUTOFMEMORY; - MSIREG_OpenInstallProps( package->ProductCode, package->Context, NULL, &hkey, FALSE ); - source = msi_reg_get_val_str( hkey, INSTALLPROPERTY_INSTALLSOURCEW ); - RegCloseKey( hkey ); - } - else + if (!(p = strrchrW( db, '\\' )) && !(p = strrchrW( db, '/' ))) { - LPWSTR p, db; - DWORD len; - - db = msi_dup_property( package->db, szOriginalDatabase ); - if (!db) - return ERROR_OUTOFMEMORY; - - p = strrchrW( db, '\\' ); - if (!p) - { - p = strrchrW( db, '/' ); - if (!p) - { - msi_free(db); - return ERROR_SUCCESS; - } - } - - len = p - db + 2; - source = msi_alloc( len * sizeof(WCHAR) ); - lstrcpynW( source, db, len ); - msi_free( db ); + msi_free(db); + return ERROR_SUCCESS; } + len = p - db + 2; + source = msi_alloc( len * sizeof(WCHAR) ); + lstrcpynW( source, db, len ); + msi_free( db ); check = msi_dup_property( package->db, szSourceDir ); if (!check || replace)

1 0

Hans Leidekker : msi: Fall back to the global temporary directory when the TempFolder property resolves to a non-existing directory .
by Alexandre Julliard 03 Jan '14

03 Jan '14

Module: wine Branch: master Commit: fcb924c1441f573fc6eabb2afcb44716de373e1c URL: http://source.winehq.org/git/wine.git/?a=commit;h=fcb924c1441f573fc6eabb2af… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jan 3 15:01:00 2014 +0100 msi: Fall back to the global temporary directory when the TempFolder property resolves to a non-existing directory. --- dlls/msi/custom.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msi/custom.c b/dlls/msi/custom.c index eadb355..63bec19 100644 --- a/dlls/msi/custom.c +++ b/dlls/msi/custom.c @@ -215,8 +215,8 @@ static MSIBINARY *create_temp_binary( MSIPACKAGE *package, LPCWSTR source, BOOL DWORD sz = MAX_PATH, write; UINT r; - if (msi_get_property(package->db, szTempFolder, fmt, &sz) != ERROR_SUCCESS) - GetTempPathW(MAX_PATH, fmt); + if (msi_get_property(package->db, szTempFolder, fmt, &sz) != ERROR_SUCCESS || + GetFileAttributesW(fmt) == INVALID_FILE_ATTRIBUTES) GetTempPathW(MAX_PATH, fmt); if (!GetTempFileNameW( fmt, szMsi, 0, tmpfile )) {

1 0

Hans Leidekker : msi: Remove the unused CurrentlyScripting field from MSISCRIPT.
by Alexandre Julliard 03 Jan '14

03 Jan '14

Module: wine Branch: master Commit: 48908c130c97128a78c37d2bf87ae2b2d1daa8a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=48908c130c97128a78c37d2bf… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jan 3 15:01:23 2014 +0100 msi: Remove the unused CurrentlyScripting field from MSISCRIPT. --- dlls/msi/action.c | 7 ------- dlls/msi/msipriv.h | 1 - 2 files changed, 0 insertions(+), 8 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index aab8c0f..73aae35 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -3178,8 +3178,6 @@ static UINT ACTION_RemoveRegistryValues( MSIPACKAGE *package ) static UINT ACTION_InstallInitialize(MSIPACKAGE *package) { - package->script->CurrentlyScripting = TRUE; - return ERROR_SUCCESS; } @@ -5291,9 +5289,6 @@ static UINT ACTION_InstallFinalize(MSIPACKAGE *package) UINT rc; WCHAR *remove; - /* turn off scheduling */ - package->script->CurrentlyScripting= FALSE; - /* first do the same as an InstallExecute */ rc = ACTION_InstallExecute(package); if (rc != ERROR_SUCCESS) @@ -7820,8 +7815,6 @@ UINT MSI_InstallPackage( MSIPACKAGE *package, LPCWSTR szPackagePath, else rc = ACTION_ProcessExecSequence(package, FALSE); - package->script->CurrentlyScripting = FALSE; - /* process the ending type action */ if (rc == ERROR_SUCCESS) ACTION_PerformActionSequence(package, -1); diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index c597fe6..3780d48 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -686,7 +686,6 @@ typedef struct tagMSISCRIPT LPWSTR *Actions[SCRIPT_MAX]; UINT ActionCount[SCRIPT_MAX]; BOOL ExecuteSequenceRun; - BOOL CurrentlyScripting; UINT InWhatSequence; LPWSTR *UniqueActions; UINT UniqueActionsCount;

1 0

Hans Leidekker : mscms: Print a fixme when compiled without support for liblcms2.
by Alexandre Julliard 03 Jan '14

03 Jan '14

Module: wine Branch: master Commit: 190878d92df7eaaf3720df7edebaae4b6ac807b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=190878d92df7eaaf3720df7ed… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jan 3 15:01:57 2014 +0100 mscms: Print a fixme when compiled without support for liblcms2. --- dlls/mscms/mscms_main.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/mscms/mscms_main.c b/dlls/mscms/mscms_main.c index 3f8dae5..4653cc7 100644 --- a/dlls/mscms/mscms_main.c +++ b/dlls/mscms/mscms_main.c @@ -53,6 +53,8 @@ BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved ) DisableThreadLibraryCalls( hinst ); #ifdef HAVE_LCMS2 cmsSetLogErrorHandler( lcms_error_handler ); +#else + FIXME( "Wine was built without support for liblcms2, expect problems\n" ); #endif break; case DLL_PROCESS_DETACH:

1 0

Alexandre Julliard : version: Load the resource that corresponds to the current language first.
by Alexandre Julliard 03 Jan '14

03 Jan '14

Module: wine Branch: master Commit: 2a7cdcf3c56c1708f6e1b6de1ac47cf6cc3c7963 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a7cdcf3c56c1708f6e1b6de1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 3 17:25:18 2014 +0100 version: Load the resource that corresponds to the current language first. --- dlls/version/version.c | 42 +++++++++++++++++++++++++++++++++++++++++- 1 files changed, 41 insertions(+), 1 deletions(-) diff --git a/dlls/version/version.c b/dlls/version/version.c index c2e9c9d..a2f1801 100644 --- a/dlls/version/version.c +++ b/dlls/version/version.c @@ -109,6 +109,46 @@ static const IMAGE_RESOURCE_DIRECTORY *find_entry_default( const IMAGE_RESOURCE_ } +/********************************************************************** + * push_language + * + * push a language in the list of languages to try + */ +static inline int push_language( WORD *list, int pos, WORD lang ) +{ + int i; + for (i = 0; i < pos; i++) if (list[i] == lang) return pos; + list[pos++] = lang; + return pos; +} + + +/********************************************************************** + * find_entry_language + */ +static const IMAGE_RESOURCE_DIRECTORY *find_entry_language( const IMAGE_RESOURCE_DIRECTORY *dir, + const void *root ) +{ + const IMAGE_RESOURCE_DIRECTORY *ret; + WORD list[9]; + int i, pos = 0; + + /* cf. LdrFindResource_U */ + pos = push_language( list, pos, MAKELANGID( LANG_NEUTRAL, SUBLANG_NEUTRAL ) ); + pos = push_language( list, pos, LANGIDFROMLCID( NtCurrentTeb()->CurrentLocale ) ); + pos = push_language( list, pos, GetUserDefaultLangID() ); + pos = push_language( list, pos, MAKELANGID( PRIMARYLANGID(GetUserDefaultLangID()), SUBLANG_NEUTRAL )); + pos = push_language( list, pos, MAKELANGID( PRIMARYLANGID(GetUserDefaultLangID()), SUBLANG_DEFAULT )); + pos = push_language( list, pos, GetSystemDefaultLangID() ); + pos = push_language( list, pos, MAKELANGID( PRIMARYLANGID(GetSystemDefaultLangID()), SUBLANG_NEUTRAL )); + pos = push_language( list, pos, MAKELANGID( PRIMARYLANGID(GetSystemDefaultLangID()), SUBLANG_DEFAULT )); + pos = push_language( list, pos, MAKELANGID( LANG_ENGLISH, SUBLANG_DEFAULT ) ); + + for (i = 0; i < pos; i++) if ((ret = find_entry_by_id( dir, list[i], root ))) return ret; + return find_entry_default( dir, root ); +} + + /*********************************************************************** * read_xx_header [internal] */ @@ -316,7 +356,7 @@ static BOOL find_pe_resource( HFILE lzfd, DWORD *resLen, DWORD *resOff ) TRACE("No resid entry found\n" ); goto done; } - resPtr = find_entry_default( resPtr, resDir ); + resPtr = find_entry_language( resPtr, resDir ); if ( !resPtr ) { TRACE("No default language entry found\n" );

1 0

Frédéric Delanoy : ddraw/tests: Use BOOL type where appropriate.
by Alexandre Julliard 03 Jan '14

03 Jan '14

Module: wine Branch: master Commit: 6151371de37f46e6ed13ead13682f555b1825a01 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6151371de37f46e6ed13ead13… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri Jan 3 02:03:29 2014 +0100 ddraw/tests: Use BOOL type where appropriate. --- dlls/ddraw/tests/d3d.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/ddraw/tests/d3d.c b/dlls/ddraw/tests/d3d.c index effe743..25da038 100644 --- a/dlls/ddraw/tests/d3d.c +++ b/dlls/ddraw/tests/d3d.c @@ -3193,11 +3193,11 @@ static void FindDevice(void) static const struct { const GUID *guid; - int todo; + BOOL todo; } deviceGUIDs[] = { - {&IID_IDirect3DRampDevice, 1}, - {&IID_IDirect3DRGBDevice}, + {&IID_IDirect3DRampDevice, TRUE}, + {&IID_IDirect3DRGBDevice, FALSE}, }; static const GUID *nonexistent_deviceGUIDs[] = {&IID_IDirect3DMMXDevice,

1 0

Frédéric Delanoy : comctl32/tests: Use BOOL type where appropriate.
by Alexandre Julliard 03 Jan '14

03 Jan '14

Module: wine Branch: master Commit: 29b2db009cba7b639ba35238bd3f67e52d76a0ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=29b2db009cba7b639ba35238b… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri Jan 3 02:03:28 2014 +0100 comctl32/tests: Use BOOL type where appropriate. --- dlls/comctl32/tests/header.c | 2 +- dlls/comctl32/tests/monthcal.c | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/comctl32/tests/header.c b/dlls/comctl32/tests/header.c index 85437d0..7fb73b1 100644 --- a/dlls/comctl32/tests/header.c +++ b/dlls/comctl32/tests/header.c @@ -1690,7 +1690,7 @@ static BOOL init(void) /* maximum 8 items allowed */ static void check_orderarray(HWND hwnd, DWORD start, DWORD set, DWORD expected, - int todo, int line) + BOOL todo, int line) { int count, i; INT order[8]; diff --git a/dlls/comctl32/tests/monthcal.c b/dlls/comctl32/tests/monthcal.c index 604fb99..145d20f 100644 --- a/dlls/comctl32/tests/monthcal.c +++ b/dlls/comctl32/tests/monthcal.c @@ -961,18 +961,18 @@ static void test_hittest(void) typedef struct hittest_test { UINT ht; - int todo; + BOOL todo; } hittest_test_t; static const hittest_test_t title_hits[] = { /* Start is the same everywhere */ - { MCHT_TITLE, 0 }, - { MCHT_TITLEBTNPREV, 0 }, + { MCHT_TITLE, FALSE }, + { MCHT_TITLEBTNPREV, FALSE }, /* The middle piece is only tested for presence of items */ /* End is the same everywhere */ - { MCHT_TITLEBTNNEXT, 0 }, - { MCHT_TITLE, 0 }, - { MCHT_NOWHERE, 1 } + { MCHT_TITLEBTNNEXT, FALSE }, + { MCHT_TITLE, FALSE }, + { MCHT_NOWHERE, TRUE } }; MCHITTESTINFO mchit;

1 0

Martin Storsjo : ntdll: Improve handling of THUMB_MOV32 relocations.
by Alexandre Julliard 03 Jan '14

03 Jan '14

Module: wine Branch: master Commit: 48ae8f307007117f68ef1d40e5f3e4816e9e1802 URL: http://source.winehq.org/git/wine.git/?a=commit;h=48ae8f307007117f68ef1d40e… Author: Martin Storsjo <martin(a)martin.st> Date: Thu Jan 2 23:24:57 2014 +0200 ntdll: Improve handling of THUMB_MOV32 relocations. --- dlls/ntdll/loader.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index e0907e7..e25ba1f 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -2230,19 +2230,19 @@ IMAGE_BASE_RELOCATION * WINAPI LdrProcessRelocationBlock( void *page, UINT count DWORD inst = *(INT_PTR *)((char *)page + offset); DWORD imm16 = ((inst << 1) & 0x0800) + ((inst << 12) & 0xf000) + ((inst >> 20) & 0x0700) + ((inst >> 16) & 0x00ff); + DWORD hi_delta; if ((inst & 0x8000fbf0) != 0x0000f240) ERR("wrong Thumb2 instruction %08x, expected MOVW\n", inst); imm16 += LOWORD(delta); - if (imm16 > 0xffff) - ERR("resulting immediate value won't fit: %08x\n", imm16); + hi_delta = HIWORD(delta) + HIWORD(imm16); *(INT_PTR *)((char *)page + offset) = (inst & 0x8f00fbf0) + ((imm16 >> 1) & 0x0400) + ((imm16 >> 12) & 0x000f) + ((imm16 << 20) & 0x70000000) + ((imm16 << 16) & 0xff0000); - if (delta > 0xffff) + if (hi_delta != 0) { inst = *(INT_PTR *)((char *)page + offset + 4); imm16 = ((inst << 1) & 0x0800) + ((inst << 12) & 0xf000) + @@ -2251,7 +2251,7 @@ IMAGE_BASE_RELOCATION * WINAPI LdrProcessRelocationBlock( void *page, UINT count if ((inst & 0x8000fbf0) != 0x0000f2c0) ERR("wrong Thumb2 instruction %08x, expected MOVT\n", inst); - imm16 += HIWORD(delta); + imm16 += hi_delta; if (imm16 > 0xffff) ERR("resulting immediate value won't fit: %08x\n", imm16); *(INT_PTR *)((char *)page + offset + 4) = (inst & 0x8f00fbf0) +

1 0