August 2011 - Wine-Commits - list.winehq.org

Francois Gouget : po: A few French translation fixes.
by Alexandre Julliard Aug. 23, 2011

Aug. 23, 2011

Module: wine Branch: master Commit: 52d067e3e384cfd1a8c5007760dd0f6f5ea8e569 URL: http://source.winehq.org/git/wine.git/?a=commit;h=52d067e3e384cfd1a8c500776… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Aug 23 14:19:32 2011 +0200 po: A few French translation fixes. --- po/fr.po | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/po/fr.po b/po/fr.po index fa666f9..83f2547 100644 --- a/po/fr.po +++ b/po/fr.po @@ -8746,7 +8746,7 @@ msgstr "%s %s %s Ressources ouvertes : %lu\n" #: net.rc:45 msgid "OK" -msgstr "" +msgstr "OK" #: net.rc:46 msgid "Paused" @@ -8754,15 +8754,15 @@ msgstr "En pause" #: net.rc:47 msgid "Disconnected" -msgstr "Déconnecté\n" +msgstr "Déconnecté" #: net.rc:48 msgid "A network error occurred" -msgstr "Une erreur réseau s'est produite." +msgstr "Une erreur réseau s'est produite" #: net.rc:49 msgid "Connection is being made" -msgstr "Connexion en cours\n" +msgstr "Connexion en cours" #: net.rc:50 msgid "Reconnecting" @@ -9059,11 +9059,11 @@ msgstr "OleView" #: oleview.rc:98 msgid "ITypeLib viewer" -msgstr "Visionneur d'ITypeLib" +msgstr "Visionneuse d'ITypeLib" #: oleview.rc:96 msgid "OleView - OLE/COM Object Viewer" -msgstr "OleView - Visionneur d'objets OLE/COM" +msgstr "OleView - Visionneuse d'objets OLE/COM" #: oleview.rc:97 msgid "version 1.0" @@ -9114,7 +9114,7 @@ msgstr "" #: oleview.rc:112 msgid "Display the viewer for the selected item" -msgstr "Afficher le visionneur pour l'élément sélectionné" +msgstr "Afficher la visionneuse pour l'élément sélectionné" #: oleview.rc:117 msgid "Toggle between expert and novice display mode"

1 0

Hans Leidekker : msi/tests: Clean up local packages.
by Alexandre Julliard Aug. 23, 2011

Aug. 23, 2011

Module: wine Branch: master Commit: fabfc5da78d27087abb75b21c544d78fdbdeb841 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fabfc5da78d27087abb75b21c… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Aug 23 14:42:38 2011 +0200 msi/tests: Clean up local packages. --- dlls/msi/tests/automation.c | 7 ++++++- dlls/msi/tests/install.c | 30 ++++++++++++++++++++++++------ 2 files changed, 30 insertions(+), 7 deletions(-) diff --git a/dlls/msi/tests/automation.c b/dlls/msi/tests/automation.c index fff068f..3bbc037 100644 --- a/dlls/msi/tests/automation.c +++ b/dlls/msi/tests/automation.c @@ -47,6 +47,7 @@ static const WCHAR szUpgradeCode[] = { '{','C','E','0','6','7','E','8','D','-',' static const WCHAR szProductInfoException[] = { 'P','r','o','d','u','c','t','I','n','f','o',',','P','r','o','d','u','c','t',',','A','t','t','r','i','b','u','t','e',0 }; static const WCHAR WINE_INSTALLPROPERTY_PACKAGENAMEW[] = {'P','a','c','k','a','g','e','N','a','m','e',0}; static const WCHAR WINE_INSTALLPROPERTY_PRODUCTNAMEW[] = {'P','r','o','d','u','c','t','N','a','m','e',0}; +static const WCHAR WINE_INSTALLPROPERTY_LOCALPACKAGEW[] = {'L','o','c','a','l','P','a','c','k','a','g','e',0}; static FILETIME systemtime; static CHAR CURR_DIR[MAX_PATH]; static EXCEPINFO excepinfo; @@ -2485,6 +2486,10 @@ static void test_Installer_InstallProduct(void) IDispatch_Release(pStringList); } + hr = Installer_ProductInfo(szProductCode, WINE_INSTALLPROPERTY_LOCALPACKAGEW, szString); + ok(hr == S_OK, "Installer_ProductInfo failed, hresult 0x%08x\n", hr); + DeleteFileW( szString ); + /* Check & clean up installed files & registry keys */ ok(delete_pf("msitest\\cabout\\new\\five.txt", TRUE), "File not installed\n"); ok(delete_pf("msitest\\cabout\\new", FALSE), "File not installed\n"); @@ -2563,7 +2568,7 @@ static void test_Installer_InstallProduct(void) RegCloseKey(hkey); - /* Delete installation files we installed */ + /* Delete installation files we created */ delete_test_files(); } diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index a870353..3417d9a 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -4754,7 +4754,7 @@ static void test_MsiConfigureProductEx(void) LONG res; DWORD type, size; HKEY props, source; - CHAR keypath[MAX_PATH * 2], localpack[MAX_PATH]; + CHAR keypath[MAX_PATH * 2], localpackage[MAX_PATH], packagename[MAX_PATH]; REGSAM access = KEY_ALL_ACCESS; if (is_process_limited()) @@ -4886,7 +4886,7 @@ static void test_MsiConfigureProductEx(void) DeleteFileA(msifile); - /* local msifile is removed */ + /* msifile is removed */ r = MsiConfigureProductExA("{7DF88A48-996F-4EC8-A022-BF956F9B2CBB}", INSTALLLEVEL_DEFAULT, INSTALLSTATE_ABSENT, "PROPVAR=42"); @@ -4915,6 +4915,12 @@ static void test_MsiConfigureProductEx(void) res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, keypath, 0, access, &props); ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + type = REG_SZ; + size = MAX_PATH; + res = RegQueryValueExA(props, "LocalPackage", NULL, &type, + (LPBYTE)localpackage, &size); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + res = RegSetValueExA(props, "LocalPackage", 0, REG_SZ, (const BYTE *)"C:\\idontexist.msi", 18); ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); @@ -4933,7 +4939,7 @@ static void test_MsiConfigureProductEx(void) RegCloseKey(props); create_database(msifile, mcp_tables, sizeof(mcp_tables) / sizeof(msi_table)); - /* LastUsedSource (local msi package) can be used as a last resort */ + /* LastUsedSource can be used as a last resort */ r = MsiConfigureProductExA("{7DF88A48-996F-4EC8-A022-BF956F9B2CBB}", INSTALLLEVEL_DEFAULT, INSTALLSTATE_ABSENT, "PROPVAR=42"); @@ -4942,6 +4948,7 @@ static void test_MsiConfigureProductEx(void) ok(!delete_pf("msitest\\helium", TRUE), "File not removed\n"); ok(!delete_pf("msitest\\lithium", TRUE), "File not removed\n"); ok(!delete_pf("msitest", FALSE), "Directory not removed\n"); + DeleteFileA( localpackage ); /* install the product, machine */ r = MsiInstallProductA(msifile, "ALLUSERS=1 INSTALLLEVEL=10 PROPVAR=42"); @@ -4958,6 +4965,12 @@ static void test_MsiConfigureProductEx(void) res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, keypath, 0, access, &props); ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + type = REG_SZ; + size = MAX_PATH; + res = RegQueryValueExA(props, "LocalPackage", NULL, &type, + (LPBYTE)localpackage, &size); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + res = RegSetValueExA(props, "LocalPackage", 0, REG_SZ, (const BYTE *)"C:\\idontexist.msi", 18); ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); @@ -4971,7 +4984,7 @@ static void test_MsiConfigureProductEx(void) type = REG_SZ; size = MAX_PATH; res = RegQueryValueExA(source, "PackageName", NULL, &type, - (LPBYTE)localpack, &size); + (LPBYTE)packagename, &size); ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); res = RegSetValueExA(source, "PackageName", 0, REG_SZ, @@ -4989,9 +5002,14 @@ static void test_MsiConfigureProductEx(void) ok(pf_exists("msitest\\lithium"), "File not installed\n"); ok(pf_exists("msitest"), "File not installed\n"); - /* restore the SourceList */ + /* restore PackageName */ res = RegSetValueExA(source, "PackageName", 0, REG_SZ, - (const BYTE *)localpack, lstrlenA(localpack) + 1); + (const BYTE *)packagename, lstrlenA(packagename) + 1); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + + /* restore LocalPackage */ + res = RegSetValueExA(props, "LocalPackage", 0, REG_SZ, + (const BYTE *)localpackage, lstrlenA(localpackage) + 1); ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); /* finally remove the product */

1 0

Hans Leidekker : msi: Don't create a temporary copy of the package.
by Alexandre Julliard Aug. 23, 2011

Aug. 23, 2011

Module: wine Branch: master Commit: 621b0405c90ef57429f869529106ee28dc32812d URL: http://source.winehq.org/git/wine.git/?a=commit;h=621b0405c90ef57429f869529… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Aug 23 14:41:43 2011 +0200 msi: Don't create a temporary copy of the package. There's no need for it now that we open the package in transacted mode. --- dlls/msi/action.c | 30 +------ dlls/msi/msi.c | 2 +- dlls/msi/msipriv.h | 5 +- dlls/msi/package.c | 230 ++++++++++++++++++++++++++++++++-------------------- dlls/msi/patch.c | 2 +- 5 files changed, 151 insertions(+), 118 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=621b0405c90ef57429f86…

1 0

Hans Leidekker : msi: Print a warning instead of a fixme if we fail to open the database.
by Alexandre Julliard Aug. 23, 2011

Aug. 23, 2011

Module: wine Branch: master Commit: 0f67869d8402150ab9a555b4d705e137faf52483 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f67869d8402150ab9a555b4d… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Aug 23 14:41:27 2011 +0200 msi: Print a warning instead of a fixme if we fail to open the database. --- dlls/msi/database.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msi/database.c b/dlls/msi/database.c index a3e61d9..3813f30 100644 --- a/dlls/msi/database.c +++ b/dlls/msi/database.c @@ -373,7 +373,7 @@ UINT MSI_OpenDatabaseW(LPCWSTR szDBPath, LPCWSTR szPersist, MSIDATABASE **pdb) if( FAILED( r ) || !stg ) { - FIXME("open failed r = %08x for %s\n", r, debugstr_w(szDBPath)); + WARN("open failed r = %08x for %s\n", r, debugstr_w(szDBPath)); return ERROR_FUNCTION_FAILED; }

1 0

Huw Davies : gdi32: Add an exception handler to catch bad pointers passed by an application.
by Alexandre Julliard Aug. 23, 2011

Aug. 23, 2011

Module: wine Branch: master Commit: 75e2e9cf3fd127774259931259355c29643a7bfa URL: http://source.winehq.org/git/wine.git/?a=commit;h=75e2e9cf3fd12777425993125… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Aug 23 11:49:53 2011 +0100 gdi32: Add an exception handler to catch bad pointers passed by an application. --- dlls/gdi32/dibdrv/dc.c | 12 +++++++++++- 1 files changed, 11 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/dibdrv/dc.c b/dlls/gdi32/dibdrv/dc.c index 962c7da..234f827 100644 --- a/dlls/gdi32/dibdrv/dc.c +++ b/dlls/gdi32/dibdrv/dc.c @@ -23,6 +23,7 @@ #include "gdi_private.h" #include "dibdrv.h" +#include "wine/exception.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(dib); @@ -272,7 +273,16 @@ DWORD convert_bitmapinfo( const BITMAPINFO *src_info, void *src_bits, struct bit if ( !init_dib_info_from_bitmapinfo( &dst_dib, dst_info, dst_bits, 0 ) ) return ERROR_BAD_FORMAT; - ret = dst_dib.funcs->convert_to( &dst_dib, &src_dib, &src->visrect ); + __TRY + { + ret = dst_dib.funcs->convert_to( &dst_dib, &src_dib, &src->visrect ); + } + __EXCEPT_PAGE_FAULT + { + WARN( "invalid bits pointer %p\n", src_bits ); + ret = FALSE; + } + __ENDTRY /* We shared the color tables, so there's no need to free the dib_infos here */ if(!ret) return ERROR_BAD_FORMAT;

1 0

Hans Leidekker : msi/tests: Use a package code that is different from the product code.
by Alexandre Julliard Aug. 23, 2011

Aug. 23, 2011

Module: wine Branch: master Commit: 763e2f3edc814504e3af841d87de08ad135824a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=763e2f3edc814504e3af841d8… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Aug 23 14:41:14 2011 +0200 msi/tests: Use a package code that is different from the product code. --- dlls/msi/tests/patch.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msi/tests/patch.c b/dlls/msi/tests/patch.c index 4c6db56..89d5bd0 100644 --- a/dlls/msi/tests/patch.c +++ b/dlls/msi/tests/patch.c @@ -286,7 +286,7 @@ static void set_suminfo( const char *filename ) r = MsiSummaryInfoSetProperty( hsi, 7, VT_LPSTR, 0, NULL, ";1033" ); ok( r == ERROR_SUCCESS, "failed to set summary info %u\n", r ); - r = MsiSummaryInfoSetProperty( hsi, 9, VT_LPSTR, 0, NULL, "{913B8D18-FBB6-4CAC-A239-C74C11E3FA74}" ); + r = MsiSummaryInfoSetProperty( hsi, 9, VT_LPSTR, 0, NULL, "{E528DDD6-4801-4BEC-BBB6-C5EE0FD097E9}" ); ok( r == ERROR_SUCCESS, "failed to set summary info %u\n", r ); r = MsiSummaryInfoSetProperty( hsi, 14, VT_I4, 100, NULL, NULL );

1 0

Huw Davies : gdi32: Remove an unneeded level of indentation.
by Alexandre Julliard Aug. 23, 2011

Aug. 23, 2011

Module: wine Branch: master Commit: 597edc503f75946a71c2d38cd3711cb33986374f URL: http://source.winehq.org/git/wine.git/?a=commit;h=597edc503f75946a71c2d38cd… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Aug 23 11:49:52 2011 +0100 gdi32: Remove an unneeded level of indentation. --- dlls/gdi32/dib.c | 14 ++++++-------- 1 files changed, 6 insertions(+), 8 deletions(-) diff --git a/dlls/gdi32/dib.c b/dlls/gdi32/dib.c index add3a70..65e9e1b 100644 --- a/dlls/gdi32/dib.c +++ b/dlls/gdi32/dib.c @@ -614,14 +614,12 @@ INT WINAPI SetDIBits( HDC hdc, HBITMAP hbitmap, UINT startscan, if (ptr) { err = convert_bitmapinfo( src_info, src_bits.ptr, &src, dst_info, ptr ); - { - if (src_bits.free) src_bits.free( &src_bits ); - src_bits.ptr = ptr; - src_bits.is_copy = TRUE; - src_bits.free = free_heap_bits; - if (!err) - err = funcs->pPutImage( NULL, hbitmap, clip, dst_info, &src_bits, &src, &dst, 0 ); - } + if (src_bits.free) src_bits.free( &src_bits ); + src_bits.ptr = ptr; + src_bits.is_copy = TRUE; + src_bits.free = free_heap_bits; + if (!err) + err = funcs->pPutImage( NULL, hbitmap, clip, dst_info, &src_bits, &src, &dst, 0 ); } else err = ERROR_OUTOFMEMORY; }

1 0

Piotr Caban : msvcp: Sync spec files.
by Alexandre Julliard Aug. 23, 2011

Aug. 23, 2011

Module: wine Branch: master Commit: ac37efd37b3a5610bf1f456e8e34c82ea59e28c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac37efd37b3a5610bf1f456e8… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Aug 23 11:51:09 2011 +0200 msvcp: Sync spec files. --- dlls/msvcp100/msvcp100.spec | 184 +++++++++++++++++----------------- dlls/msvcp60/msvcp60.spec | 176 +++++++++++++++++----------------- dlls/msvcp70/msvcp70.spec | 198 +++++++++++++++++++------------------- dlls/msvcp71/msvcp71.spec | 206 ++++++++++++++++++++-------------------- dlls/msvcp80/msvcp80.spec | 226 +++++++++++++++++++++--------------------- 5 files changed, 495 insertions(+), 495 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ac37efd37b3a5610bf1f4…

1 0

Huw Davies : gdi32: Add a copy_rect helper function.
by Alexandre Julliard Aug. 23, 2011

Aug. 23, 2011

Module: wine Branch: master Commit: 95f1abc8d87e462c90ba6d5e66a986eff71fe0ca URL: http://source.winehq.org/git/wine.git/?a=commit;h=95f1abc8d87e462c90ba6d5e6… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Aug 23 11:16:31 2011 +0100 gdi32: Add a copy_rect helper function. --- dlls/gdi32/dibdrv/bitblt.c | 51 ++++++++++++++++++++++++++----------------- 1 files changed, 31 insertions(+), 20 deletions(-) diff --git a/dlls/gdi32/dibdrv/bitblt.c b/dlls/gdi32/dibdrv/bitblt.c index 9e6c74f..3e4de88 100644 --- a/dlls/gdi32/dibdrv/bitblt.c +++ b/dlls/gdi32/dibdrv/bitblt.c @@ -27,6 +27,35 @@ WINE_DEFAULT_DEBUG_CHANNEL(dib); +static DWORD copy_rect( dib_info *dst, const RECT *dst_rect, const dib_info *src, const RECT *src_rect, + HRGN clip, INT rop2 ) +{ + POINT origin; + RECT clipped_rect; + const WINEREGION *clip_data; + int i; + + origin.x = src_rect->left; + origin.y = src_rect->top; + + if (clip == NULL) dst->funcs->copy_rect( dst, dst_rect, src, &origin, rop2 ); + else + { + clip_data = get_wine_region( clip ); + for (i = 0; i < clip_data->numRects; i++) + { + if (intersect_rect( &clipped_rect, dst_rect, clip_data->rects + i )) + { + origin.x = src_rect->left + clipped_rect.left - dst_rect->left; + origin.y = src_rect->top + clipped_rect.top - dst_rect->top; + dst->funcs->copy_rect( dst, &clipped_rect, src, &origin, rop2 ); + } + } + release_wine_region( clip ); + } + return ERROR_SUCCESS; +} + static void set_color_info( const dib_info *dib, BITMAPINFO *info ) { DWORD *masks = (DWORD *)info->bmiColors; @@ -182,8 +211,7 @@ DWORD dibdrv_PutImage( PHYSDEV dev, HBITMAP hbitmap, HRGN clip, BITMAPINFO *info dib_info src_dib; HRGN saved_clip = NULL; dibdrv_physdev *pdev = NULL; - const WINEREGION *clip_data; - int i, rop2; + int rop2; TRACE( "%p %p %p\n", dev, hbitmap, info ); @@ -244,24 +272,7 @@ DWORD dibdrv_PutImage( PHYSDEV dev, HBITMAP hbitmap, HRGN clip, BITMAPINFO *info rop2 = ((rop >> 16) & 0xf) + 1; - if (clip == NULL) dib->funcs->copy_rect( dib, &dst->visrect, &src_dib, &origin, rop2 ); - else - { - clip_data = get_wine_region( clip ); - for (i = 0; i < clip_data->numRects; i++) - { - RECT clipped_rect; - - if (intersect_rect( &clipped_rect, &dst->visrect, clip_data->rects + i )) - { - origin.x = src->visrect.left + clipped_rect.left - dst->visrect.left; - origin.y = src->visrect.top + clipped_rect.top - dst->visrect.top; - dib->funcs->copy_rect( dib, &clipped_rect, &src_dib, &origin, rop2 ); - } - } - release_wine_region( clip ); - } - ret = ERROR_SUCCESS; + ret = copy_rect( dib, &dst->visrect, &src_dib, &src->visrect, clip, rop2 ); if (saved_clip) restore_clipping_region( pdev, saved_clip );

1 0

Piotr Caban : msvcp90: Added basic_streambuf<char> class stub.
by Alexandre Julliard Aug. 23, 2011

Aug. 23, 2011

Module: wine Branch: master Commit: 3496823434a3051ca5fd3bf8909579e3a50eafc2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3496823434a3051ca5fd3bf89… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Aug 23 11:50:56 2011 +0200 msvcp90: Added basic_streambuf<char> class stub. --- dlls/msvcp90/ios.c | 611 ++++++++++++++++++++++++++++++++++++++++++++- dlls/msvcp90/misc.c | 4 - dlls/msvcp90/msvcp90.h | 7 + dlls/msvcp90/msvcp90.spec | 226 +++++++++--------- 4 files changed, 727 insertions(+), 121 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3496823434a3051ca5fd3…

1 0