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

Francois Gouget : wmc: Remove a stray reference to wrc in the man page.
by Alexandre Julliard 23 Aug '11

23 Aug '11

Module: wine Branch: master Commit: 97ef93ac33b078274d32933f3281ad80c41af567 URL: http://source.winehq.org/git/wine.git/?a=commit;h=97ef93ac33b078274d32933f3… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Aug 23 14:26:36 2011 +0200 wmc: Remove a stray reference to wrc in the man page. --- tools/wmc/wmc.man.in | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/wmc/wmc.man.in b/tools/wmc/wmc.man.in index 74542a5..a135145 100644 --- a/tools/wmc/wmc.man.in +++ b/tools/wmc/wmc.man.in @@ -1,7 +1,7 @@ .\" -*- nroff -*- .TH WMC 1 "October 2005" "@PACKAGE_STRING@" "Wine Developers Manual" .SH NAME -wrc \- Wine Message Compiler +wmc \- Wine Message Compiler .SH SYNOPSIS .BI "wmc " "[options] " "[inputfile]" .SH DESCRIPTION

1 0

Francois Gouget : po: A few French translation fixes.
by Alexandre Julliard 23 Aug '11

23 Aug '11

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

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

23 Aug '11

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 23 Aug '11

23 Aug '11

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

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

23 Aug '11

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

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

23 Aug '11

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

Bernhard Loos : kernel32: CreateFile uses an nonalertable io mode.
by Alexandre Julliard 23 Aug '11

23 Aug '11

Module: wine Branch: master Commit: c19d166529008dcc48ab4f713febff4a9922c810 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c19d166529008dcc48ab4f713… Author: Bernhard Loos <bernhardloos(a)googlemail.com> Date: Tue Aug 23 11:33:51 2011 +0200 kernel32: CreateFile uses an nonalertable io mode. --- dlls/kernel32/file.c | 2 +- dlls/kernel32/tests/file.c | 18 ++++++++++++++++++ 2 files changed, 19 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/file.c b/dlls/kernel32/file.c index 79cfc97..194960b 100644 --- a/dlls/kernel32/file.c +++ b/dlls/kernel32/file.c @@ -1361,7 +1361,7 @@ HANDLE WINAPI CreateFileW( LPCWSTR filename, DWORD access, DWORD sharing, if (attributes & FILE_FLAG_NO_BUFFERING) options |= FILE_NO_INTERMEDIATE_BUFFERING; if (!(attributes & FILE_FLAG_OVERLAPPED)) - options |= FILE_SYNCHRONOUS_IO_ALERT; + options |= FILE_SYNCHRONOUS_IO_NONALERT; if (attributes & FILE_FLAG_RANDOM_ACCESS) options |= FILE_RANDOM_ACCESS; attributes &= FILE_ATTRIBUTE_VALID_FLAGS; diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index 59803c6..df2ab37 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -38,6 +38,7 @@ static BOOL (WINAPI *pReplaceFileA)(LPCSTR, LPCSTR, LPCSTR, DWORD, LPVOID, LPVOI static BOOL (WINAPI *pReplaceFileW)(LPCWSTR, LPCWSTR, LPCWSTR, DWORD, LPVOID, LPVOID); static UINT (WINAPI *pGetSystemWindowsDirectoryA)(LPSTR, UINT); static BOOL (WINAPI *pGetVolumeNameForVolumeMountPointA)(LPCSTR, LPSTR, DWORD); +static DWORD WINAPI (*pQueueUserAPC)(PAPCFUNC pfnAPC, HANDLE hThread, ULONG_PTR dwData); /* keep filename and filenameW the same */ static const char filename[] = "testfile.xxx"; @@ -71,6 +72,7 @@ static void InitFunctionPointers(void) pReplaceFileW=(void*)GetProcAddress(hkernel32, "ReplaceFileW"); pGetSystemWindowsDirectoryA=(void*)GetProcAddress(hkernel32, "GetSystemWindowsDirectoryA"); pGetVolumeNameForVolumeMountPointA = (void *) GetProcAddress(hkernel32, "GetVolumeNameForVolumeMountPointA"); + pQueueUserAPC = (void *) GetProcAddress(hkernel32, "QueueUserAPC"); } static void test__hread( void ) @@ -2362,6 +2364,12 @@ static void test_async_file_errors(void) HeapFree(GetProcessHeap(), 0, lpBuffer); } +static BOOL user_apc_ran; +static void CALLBACK user_apc(ULONG_PTR param) +{ + user_apc_ran = TRUE; +} + static void test_read_write(void) { DWORD bytes, ret, old_prot; @@ -2382,6 +2390,12 @@ static void test_read_write(void) CREATE_ALWAYS, FILE_FLAG_RANDOM_ACCESS, 0); ok(hFile != INVALID_HANDLE_VALUE, "CreateFileA: error %d\n", GetLastError()); + user_apc_ran = FALSE; + if (pQueueUserAPC) { + trace("Queueing an user APC\n"); /* verify the file is non alerable */ + ok(pQueueUserAPC(&user_apc, GetCurrentThread(), 0), "QueueUserAPC failed: %d\n", GetLastError()); + } + SetLastError(12345678); bytes = 12345678; ret = WriteFile(hFile, NULL, 0, &bytes, NULL); @@ -2418,6 +2432,10 @@ static void test_read_write(void) "ret = %d, error %d\n", ret, GetLastError()); ok(!bytes, "bytes = %d\n", bytes); + ok(user_apc_ran == FALSE, "UserAPC ran, file using alertable io mode\n"); + if (pQueueUserAPC) + SleepEx(0, TRUE); /* get rid of apc */ + /* test passing protected memory as buffer */ mem = VirtualAlloc( NULL, 0x4000, MEM_COMMIT, PAGE_READWRITE );

1 0

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

23 Aug '11

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

Piotr Caban : msvcp: Sync spec files.
by Alexandre Julliard 23 Aug '11

23 Aug '11

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: Move the dib driver' s GetImage and PutImage to a new source file.
by Alexandre Julliard 23 Aug '11

23 Aug '11

Module: wine Branch: master Commit: ff307d573acd7d6472844925a8ed740d485d3aa5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff307d573acd7d6472844925a… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Aug 23 11:16:30 2011 +0100 gdi32: Move the dib driver's GetImage and PutImage to a new source file. --- dlls/gdi32/Makefile.in | 1 + dlls/gdi32/dibdrv/bitblt.c | 280 ++++++++++++++++++++++++++++++++++++++++++++ dlls/gdi32/dibdrv/dc.c | 261 +---------------------------------------- dlls/gdi32/dibdrv/dibdrv.h | 12 ++ 4 files changed, 297 insertions(+), 257 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ff307d573acd7d6472844…

1 0