November 2011 - Wine-commits

Frédéric Delanoy : krnl386.exe16: Avoid hardcoding array lengths.
by Alexandre Julliard 22 Nov '11

22 Nov '11

Module: wine Branch: master Commit: ebf4ae03b5bcaf44a64dbb11415791bf1b738769 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ebf4ae03b5bcaf44a64dbb114… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Mon Nov 21 19:19:48 2011 +0100 krnl386.exe16: Avoid hardcoding array lengths. --- dlls/krnl386.exe16/int21.c | 6 +++--- dlls/krnl386.exe16/int25.c | 2 +- dlls/krnl386.exe16/int26.c | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/krnl386.exe16/int21.c b/dlls/krnl386.exe16/int21.c index 2ec6345..f8e235a 100644 --- a/dlls/krnl386.exe16/int21.c +++ b/dlls/krnl386.exe16/int21.c @@ -336,7 +336,7 @@ static BYTE INT21_MapDrive( BYTE drive ) { if (drive) { - WCHAR drivespec[3] = {'A', ':', 0}; + WCHAR drivespec[] = {'A', ':', 0}; UINT drivetype; drivespec[0] += drive - 1; @@ -359,7 +359,7 @@ static BYTE INT21_MapDrive( BYTE drive ) */ static void INT21_SetCurrentDrive( BYTE drive ) { - WCHAR drivespec[3] = {'A', ':', 0}; + WCHAR drivespec[] = {'A', ':', 0}; drivespec[0] += drive; @@ -2451,7 +2451,7 @@ static void INT21_Ioctl_Block( CONTEXT *context ) { BYTE *dataptr; BYTE drive = INT21_MapDrive( BL_reg(context) ); - WCHAR drivespec[4] = {'A', ':', '\\', 0}; + WCHAR drivespec[] = {'A', ':', '\\', 0}; UINT drivetype; drivespec[0] += drive; diff --git a/dlls/krnl386.exe16/int25.c b/dlls/krnl386.exe16/int25.c index 5aa0b55..0513c8f 100644 --- a/dlls/krnl386.exe16/int25.c +++ b/dlls/krnl386.exe16/int25.c @@ -82,7 +82,7 @@ BOOL DOSVM_RawRead(BYTE drive, DWORD begin, DWORD nr_sect, BYTE *dataptr, BOOL f */ void WINAPI DOSVM_Int25Handler( CONTEXT *context ) { - WCHAR drivespec[4] = {'A', ':', '\\', 0}; + WCHAR drivespec[] = {'A', ':', '\\', 0}; BYTE *dataptr = CTX_SEG_OFF_TO_LIN( context, context->SegDs, context->Ebx ); DWORD begin; DWORD length; diff --git a/dlls/krnl386.exe16/int26.c b/dlls/krnl386.exe16/int26.c index e475c8d..bb3d90b 100644 --- a/dlls/krnl386.exe16/int26.c +++ b/dlls/krnl386.exe16/int26.c @@ -71,7 +71,7 @@ BOOL DOSVM_RawWrite(BYTE drive, DWORD begin, DWORD nr_sect, BYTE *dataptr, BOOL */ void WINAPI DOSVM_Int26Handler( CONTEXT *context ) { - WCHAR drivespec[4] = {'A', ':', '\\', 0}; + WCHAR drivespec[] = {'A', ':', '\\', 0}; BYTE *dataptr = CTX_SEG_OFF_TO_LIN( context, context->SegDs, context->Ebx ); DWORD begin; DWORD length;

1 0

Frédéric Delanoy : mountmgr.sys: Avoid hardcoding array lengths.
by Alexandre Julliard 22 Nov '11

22 Nov '11

Module: wine Branch: master Commit: 98535806080ada54f15092d1a836bb204952418d URL: http://source.winehq.org/git/wine.git/?a=commit;h=98535806080ada54f15092d1a… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Mon Nov 21 19:19:49 2011 +0100 mountmgr.sys: Avoid hardcoding array lengths. --- dlls/mountmgr.sys/device.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mountmgr.sys/device.c b/dlls/mountmgr.sys/device.c index 3f393e7..2d4116c 100644 --- a/dlls/mountmgr.sys/device.c +++ b/dlls/mountmgr.sys/device.c @@ -773,7 +773,7 @@ found: if (!RegCreateKeyW( HKEY_LOCAL_MACHINE, drives_keyW, &hkey )) { const WCHAR *type_name = drive_types[type]; - WCHAR name[3] = {'a',':',0}; + WCHAR name[] = {'a',':',0}; name[0] += drive->drive; if (!type_name[0] && type == DEVICE_HARDDISK) type_name = drive_types[DEVICE_FLOPPY]; @@ -826,7 +826,7 @@ NTSTATUS remove_dos_device( int letter, const char *udi ) /* clear the registry key too */ if (!RegOpenKeyW( HKEY_LOCAL_MACHINE, drives_keyW, &hkey )) { - WCHAR name[3] = {'a',':',0}; + WCHAR name[] = {'a',':',0}; name[0] += drive->drive; RegDeleteValueW( hkey, name ); RegCloseKey( hkey );

1 0

André Hentschel : po: Update German translation.
by Alexandre Julliard 22 Nov '11

22 Nov '11

Module: wine Branch: master Commit: dd55f15b56437868b43254638ab3491f440877fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=dd55f15b56437868b43254638… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Nov 21 20:15:48 2011 +0100 po: Update German translation. --- po/de.po | 128 +++++++++++++++++++++++++++----------------------------------- 1 files changed, 56 insertions(+), 72 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=dd55f15b56437868b4325…

1 0

Frédéric Delanoy : po: Update French translation.
by Alexandre Julliard 22 Nov '11

22 Nov '11

Module: wine Branch: master Commit: 8f0b823f1d32b234d646afd229c872dbef6bc4b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f0b823f1d32b234d646afd22… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Mon Nov 21 23:34:13 2011 +0100 po: Update French translation. --- po/fr.po | 54 ++++++++++++++++++++---------------------------------- 1 files changed, 20 insertions(+), 34 deletions(-) diff --git a/po/fr.po b/po/fr.po index 0f9df2f..0331f9e 100644 --- a/po/fr.po +++ b/po/fr.po @@ -334,13 +334,12 @@ msgid "Unreadable Entry" msgstr "Entrée illisible" #: comdlg32.rc:68 -#, fuzzy msgid "" "This value does not lie within the page range.\n" "Please enter a value between %1!d! and %2!d!." msgstr "" -"Cette valeur n'est pas dans l'étendue de pages\n" -"Veuillez indiquer une valeur entre %d et %d." +"Cette valeur n'est pas dans l'intervalle de pages.\n" +"Veuillez indiquer une valeur entre %1!d! et %2!d!." #: comdlg32.rc:70 msgid "The 'from' entry cannot exceed the 'to' entry." @@ -400,9 +399,8 @@ msgstr "" "devez installer une imprimante. Veuillez en installer une et réessayez." #: comdlg32.rc:151 -#, fuzzy msgid "Select a font size between %1!d! and %2!d! points." -msgstr "Sélectionnez une taille de police entre %d et %d points." +msgstr "Sélectionnez une taille de police entre %1!d! et %2!d! points." #: comdlg32.rc:152 ieframe.rc:32 msgid "&Save" @@ -1586,9 +1584,8 @@ msgid "Public key" msgstr "Clé publique" #: cryptui.rc:58 -#, fuzzy msgid "%1 (%2!d! bits)" -msgstr "%s (%d bits)" +msgstr "%1 (%2!d! bits)" #: cryptui.rc:59 msgid "SHA1 hash" @@ -2041,9 +2038,8 @@ msgid "Regional Setting" msgstr "Paramètres régionaux" #: dxdiagn.rc:26 -#, fuzzy msgid "%1!u!MB used, %2!u!MB available" -msgstr "%u MB utilisés, %u MB disponibles" +msgstr "%1!u! MB utilisés, %2!u! MB disponibles" #: gdi32.rc:25 msgid "Western" @@ -6114,9 +6110,8 @@ msgid "us" msgstr "µs" #: setupapi.rc:28 -#, fuzzy msgid "The file '%1' on %2 is needed" -msgstr "Le fichier « %s » sur %s est requis" +msgstr "Le fichier « %1 » sur %2 est requis" #: setupapi.rc:29 ipconfig.rc:31 msgid "Unknown" @@ -8850,9 +8845,8 @@ msgstr "" "invalides\n" #: ipconfig.rc:29 -#, fuzzy msgid "%1 adapter %2\n" -msgstr "Adaptateur %s %s\n" +msgstr "Adaptateur %1 %2\n" #: ipconfig.rc:30 msgid "Ethernet" @@ -9594,9 +9588,8 @@ msgid "bytes" msgstr "octets" #: oleview.rc:148 -#, fuzzy msgid "LoadTypeLib( %1 ) failed ($%2!x!)" -msgstr "Échec de LoadTypeLib( %s ) ($%x)" +msgstr "Échec de LoadTypeLib( %1 ) ($%2!x!)" #: oleview.rc:149 msgid "Inherited Interfaces" @@ -10371,52 +10364,45 @@ msgid "Error: One of options /im or /pid must be specified.\n" msgstr "Erreur : une des options /im ou /pid doit être spécifiée.\n" #: taskkill.rc:31 -#, fuzzy msgid "Error: Option %1 expects a command line parameter.\n" -msgstr "Erreur : l'option %s requiert un paramètre de ligne de commande.\n" +msgstr "Erreur : l'option %1 requiert un paramètre de ligne de commande.\n" #: taskkill.rc:32 msgid "Error: Options /im and /pid are mutually exclusive.\n" msgstr "Erreur : les options /im et /pid sont incompatibles.\n" #: taskkill.rc:33 -#, fuzzy msgid "Close message sent to top-level windows of process with PID %1!u!.\n" msgstr "" -"Message de fermeture envoyé aux fenêtres supérieures du processus de PID " -"%u.\n" +"Message de fermeture envoyé aux fenêtres supérieures du processus de PID %1!" +"u!.\n" #: taskkill.rc:34 -#, fuzzy msgid "" "Close message sent to top-level windows of process \"%1\" with PID %2!u!.\n" msgstr "" -"Message de fermeture envoyé aux fenêtres supérieures du processus « %s » de " -"PID %u.\n" +"Message de fermeture envoyé aux fenêtres supérieures du processus « %1 » de " +"PID %2!u!.\n" #: taskkill.rc:35 -#, fuzzy msgid "Process with PID %1!u! was forcibly terminated.\n" -msgstr "Le processus de PID %u a été terminé brutalement.\n" +msgstr "Le processus de PID %1!u! a été terminé brutalement.\n" #: taskkill.rc:36 -#, fuzzy msgid "Process \"%1\" with PID %2!u! was forcibly terminated.\n" -msgstr "Le processus « %s » de PID %u a été terminé brutalement.\n" +msgstr "Le processus « %1 » de PID %2!u! a été terminé brutalement.\n" #: taskkill.rc:37 -#, fuzzy msgid "Error: Could not find process \"%1\".\n" -msgstr "Erreur : processus « %s » introuvable.\n" +msgstr "Erreur : processus « %1 » introuvable.\n" #: taskkill.rc:38 msgid "Error: Unable to enumerate the process list.\n" msgstr "Erreur : impossible d'énumérer la liste de processus.\n" #: taskkill.rc:39 -#, fuzzy msgid "Error: Unable to terminate process \"%1\".\n" -msgstr "Erreur : impossible de terminer le processus « %s ».\n" +msgstr "Erreur : impossible de terminer le processus « %1 ».\n" #: taskkill.rc:40 msgid "Error: Process self-termination is not permitted.\n" @@ -12429,17 +12415,17 @@ msgstr "%1 libres sur %2" #: winefile.rc:121 msgctxt "unit kilobyte" msgid "kB" -msgstr "" +msgstr "kB" #: winefile.rc:122 msgctxt "unit megabyte" msgid "MB" -msgstr "" +msgstr "MB" #: winefile.rc:123 msgctxt "unit gigabyte" msgid "GB" -msgstr "" +msgstr "GB" #: winemine.rc:34 msgid "&Game"

1 0

Michael Stefaniuc : include: Make "long" numeric constants LP64/ LLP64 proof (mapi*.h).
by Alexandre Julliard 22 Nov '11

22 Nov '11

Module: wine Branch: master Commit: e1a65b3a8b34551d7121139b903bf992a737abdd URL: http://source.winehq.org/git/wine.git/?a=commit;h=e1a65b3a8b34551d7121139b9… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Nov 22 00:53:28 2011 +0100 include: Make "long" numeric constants LP64/LLP64 proof (mapi*.h). --- include/mapi.h | 2 +- include/mapicode.h | 2 +- include/mapidefs.h | 36 ++++++++++++++++++------------------ 3 files changed, 20 insertions(+), 20 deletions(-) diff --git a/include/mapi.h b/include/mapi.h index 7d19734..548e130 100644 --- a/include/mapi.h +++ b/include/mapi.h @@ -84,7 +84,7 @@ typedef struct /* Error codes */ #ifndef SUCCESS_SUCCESS -#define SUCCESS_SUCCESS 0L +#define SUCCESS_SUCCESS 0 #endif #define MAPI_USER_ABORT 1 diff --git a/include/mapicode.h b/include/mapicode.h index 31e6830..b5bf686 100644 --- a/include/mapicode.h +++ b/include/mapicode.h @@ -30,7 +30,7 @@ #define MAKE_MAPI_S(e) (MAKE_MAPI_SCODE(0,FACILITY_ITF,(e))) #ifndef SUCCESS_SUCCESS -#define SUCCESS_SUCCESS 0L +#define SUCCESS_SUCCESS __MSABI_LONG(0) #endif /* Errors */ diff --git a/include/mapidefs.h b/include/mapidefs.h index f06c61f..cd6d8b0 100644 --- a/include/mapidefs.h +++ b/include/mapidefs.h @@ -446,12 +446,12 @@ typedef struct _SPropProblemArray } SPropProblemArray, *LPSPropProblemArray; /* FPropContainsProp flags */ -#define FL_FULLSTRING 0x00000ul /* Exact string match */ -#define FL_SUBSTRING 0x00001ul /* Substring match */ -#define FL_PREFIX 0x00002ul /* Prefix match */ -#define FL_IGNORECASE 0x10000ul /* Case insensitive */ -#define FL_IGNORENONSPACE 0x20000ul /* Ignore non spacing characters */ -#define FL_LOOSE 0x40000ul /* Try very hard to match */ +#define FL_FULLSTRING ((ULONG)0x00000) /* Exact string match */ +#define FL_SUBSTRING ((ULONG)0x00001) /* Substring match */ +#define FL_PREFIX ((ULONG)0x00002) /* Prefix match */ +#define FL_IGNORECASE ((ULONG)0x10000) /* Case insensitive */ +#define FL_IGNORENONSPACE ((ULONG)0x20000) /* Ignore non spacing characters */ +#define FL_LOOSE ((ULONG)0x40000) /* Try very hard to match */ /* Table types returned by IMAPITable_GetStatus() */ @@ -649,18 +649,18 @@ typedef struct _MAPINAMEID } MAPINAMEID, *LPMAPINAMEID; /* Desired notification types (bitflags) */ -#define fnevCriticalError 0x00000001UL -#define fnevNewMail 0x00000002UL -#define fnevObjectCreated 0x00000004UL -#define fnevObjectDeleted 0x00000008UL -#define fnevObjectModified 0x00000010UL -#define fnevObjectMoved 0x00000020UL -#define fnevObjectCopied 0x00000040UL -#define fnevSearchComplete 0x00000080UL -#define fnevTableModified 0x00000100UL -#define fnevStatusObjectModified 0x00000200UL -#define fnevReservedForMapi 0x40000000UL -#define fnevExtended 0x80000000UL +#define fnevCriticalError ((ULONG)0x00000001) +#define fnevNewMail ((ULONG)0x00000002) +#define fnevObjectCreated ((ULONG)0x00000004) +#define fnevObjectDeleted ((ULONG)0x00000008) +#define fnevObjectModified ((ULONG)0x00000010) +#define fnevObjectMoved ((ULONG)0x00000020) +#define fnevObjectCopied ((ULONG)0x00000040) +#define fnevSearchComplete ((ULONG)0x00000080) +#define fnevTableModified ((ULONG)0x00000100) +#define fnevStatusObjectModified ((ULONG)0x00000200) +#define fnevReservedForMapi ((ULONG)0x40000000) +#define fnevExtended ((ULONG)0x80000000) /* Type of notification event */ #define TABLE_CHANGED 1U

1 0

Michael Stefaniuc : include: Fix "l" numeric constants in winbase.h.
by Alexandre Julliard 22 Nov '11

22 Nov '11

Module: wine Branch: master Commit: 07c60df9ae41e464db95e085fd26ddc00abeeb66 URL: http://source.winehq.org/git/wine.git/?a=commit;h=07c60df9ae41e464db95e085f… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Nov 22 00:55:18 2011 +0100 include: Fix "l" numeric constants in winbase.h. --- include/winbase.h | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/include/winbase.h b/include/winbase.h index c84c1f1..6ec9230 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -698,15 +698,15 @@ typedef struct _TIME_ZONE_INFORMATION{ /* File creation flags */ -#define FILE_FLAG_WRITE_THROUGH 0x80000000UL -#define FILE_FLAG_OVERLAPPED 0x40000000L -#define FILE_FLAG_NO_BUFFERING 0x20000000L -#define FILE_FLAG_RANDOM_ACCESS 0x10000000L -#define FILE_FLAG_SEQUENTIAL_SCAN 0x08000000L -#define FILE_FLAG_DELETE_ON_CLOSE 0x04000000L -#define FILE_FLAG_BACKUP_SEMANTICS 0x02000000L -#define FILE_FLAG_POSIX_SEMANTICS 0x01000000L -#define FILE_FLAG_OPEN_REPARSE_POINT 0x00200000L +#define FILE_FLAG_WRITE_THROUGH 0x80000000 +#define FILE_FLAG_OVERLAPPED 0x40000000 +#define FILE_FLAG_NO_BUFFERING 0x20000000 +#define FILE_FLAG_RANDOM_ACCESS 0x10000000 +#define FILE_FLAG_SEQUENTIAL_SCAN 0x08000000 +#define FILE_FLAG_DELETE_ON_CLOSE 0x04000000 +#define FILE_FLAG_BACKUP_SEMANTICS 0x02000000 +#define FILE_FLAG_POSIX_SEMANTICS 0x01000000 +#define FILE_FLAG_OPEN_REPARSE_POINT 0x00200000 #define CREATE_NEW 1 #define CREATE_ALWAYS 2 #define OPEN_EXISTING 3 @@ -1671,7 +1671,7 @@ WINBASEAPI DWORD WINAPI GetFileSize(HANDLE,LPDWORD); WINBASEAPI BOOL WINAPI GetFileSizeEx(HANDLE,PLARGE_INTEGER); WINBASEAPI BOOL WINAPI GetFileTime(HANDLE,LPFILETIME,LPFILETIME,LPFILETIME); WINBASEAPI DWORD WINAPI GetFileType(HANDLE); -#define GetFreeSpace(w) (0x100000L) +#define GetFreeSpace(w) (__MSABI_LONG(0x100000)) WINBASEAPI DWORD WINAPI GetFullPathNameA(LPCSTR,DWORD,LPSTR,LPSTR*); WINBASEAPI DWORD WINAPI GetFullPathNameW(LPCWSTR,DWORD,LPWSTR,LPWSTR*); #define GetFullPathName WINELIB_NAME_AW(GetFullPathName)

1 0

Michael Stefaniuc : include: Make "long" numeric constants LP64/ LLP64 proof (ddeml.h).
by Alexandre Julliard 22 Nov '11

22 Nov '11

Module: wine Branch: master Commit: 1836ca36761e066473bf9a02d0bf8a8c5fd8e095 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1836ca36761e066473bf9a02d… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Nov 22 00:57:13 2011 +0100 include: Make "long" numeric constants LP64/LLP64 proof (ddeml.h). --- include/ddeml.h | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/include/ddeml.h b/include/ddeml.h index 6ec016f..de92376 100644 --- a/include/ddeml.h +++ b/include/ddeml.h @@ -120,22 +120,22 @@ extern "C" { #define CBF_SKIP_DISCONNECTS 0x00200000 #define CBF_SKIP_ALLNOTIFICATIONS 0x003c0000 -#define CBR_BLOCK ((HDDEDATA)~0UL) +#define CBR_BLOCK ((HDDEDATA)-1) /* * Application command flags */ -#define APPCMD_CLIENTONLY 0x00000010L -#define APPCMD_FILTERINITS 0x00000020L -#define APPCMD_MASK 0x00000FF0L +#define APPCMD_CLIENTONLY __MSABI_LONG(0x00000010) +#define APPCMD_FILTERINITS __MSABI_LONG(0x00000020) +#define APPCMD_MASK __MSABI_LONG(0x00000FF0) /* * Application classification flags */ -#define APPCLASS_STANDARD 0x00000000L -#define APPCLASS_MONITOR 0x00000001L -#define APPCLASS_MASK 0x0000000FL +#define APPCLASS_STANDARD __MSABI_LONG(0x00000000) +#define APPCLASS_MONITOR __MSABI_LONG(0x00000001) +#define APPCLASS_MASK __MSABI_LONG(0x0000000F) /* * Callback filter flags for use with MONITOR apps - 0 implies no monitor

1 0

Michael Stefaniuc : include: Make some more "long" numeric constants LP64/ LLP64 proof.
by Alexandre Julliard 22 Nov '11

22 Nov '11

Module: wine Branch: master Commit: ad0f8b6b66307520f8128e6931f697d5185f44ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=ad0f8b6b66307520f8128e693… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Nov 22 00:59:59 2011 +0100 include: Make some more "long" numeric constants LP64/LLP64 proof. --- include/commdlg.h | 46 +++++++++++++++++++++++----------------------- include/ddraw.h | 12 ++++++------ include/dxerr8.h | 2 +- include/dxerr9.h | 2 +- include/dxfile.h | 10 +++++----- include/fci.h | 2 +- include/fdi.h | 2 +- include/mciavi.h | 18 +++++++++--------- include/msi.h | 12 ++++++------ include/ntddstor.h | 6 +++--- include/ntsecapi.h | 34 +++++++++++++++++----------------- include/ole2.h | 16 ++++++++-------- include/olectl.h | 2 +- include/shlobj.h | 18 +++++++++--------- include/t2embapi.h | 4 ++-- include/wincrypt.h | 4 ++-- 16 files changed, 95 insertions(+), 95 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ad0f8b6b66307520f8128…

1 0

Dmitry Timoshkov : kernel32: Add a test to see how a page protection changes after write.
by Alexandre Julliard 22 Nov '11

22 Nov '11

Module: wine Branch: master Commit: 30882eb08e875599a76af5f6b4d7b81019622190 URL: http://source.winehq.org/git/wine.git/?a=commit;h=30882eb08e875599a76af5f6b… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Nov 22 18:02:26 2011 +0800 kernel32: Add a test to see how a page protection changes after write. --- dlls/kernel32/tests/virtual.c | 27 ++++++++++++++++++++++++++- 1 files changed, 26 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/tests/virtual.c b/dlls/kernel32/tests/virtual.c index aefa9d0..45832fe 100644 --- a/dlls/kernel32/tests/virtual.c +++ b/dlls/kernel32/tests/virtual.c @@ -1523,6 +1523,21 @@ static void test_VirtualProtect(void) VirtualFree(base, 0, MEM_FREE); } +static BOOL is_mem_writable(DWORD prot) +{ + switch (prot & 0xff) + { + case PAGE_READWRITE: + case PAGE_WRITECOPY: + case PAGE_EXECUTE_READWRITE: + case PAGE_EXECUTE_WRITECOPY: + return TRUE; + + default: + return FALSE; + } +} + static void test_VirtualAlloc_protection(void) { static const struct test_data @@ -1575,7 +1590,7 @@ static void test_VirtualAlloc_protection(void) for (i = 0; i < sizeof(td)/sizeof(td[0]); i++) { SetLastError(0xdeadbeef); - base = VirtualAlloc(0, si.dwPageSize, MEM_RESERVE | MEM_COMMIT, td[i].prot); + base = VirtualAlloc(0, si.dwPageSize, MEM_COMMIT, td[i].prot); if (td[i].success) { @@ -1592,6 +1607,16 @@ static void test_VirtualAlloc_protection(void) ok(info.State == MEM_COMMIT, "%d: %#x != MEM_COMMIT\n", i, info.State); ok(info.Type == MEM_PRIVATE, "%d: %#x != MEM_PRIVATE\n", i, info.Type); + if (is_mem_writable(info.Protect)) + { + base[0] = 0xfe; + + SetLastError(0xdeadbeef); + ret = VirtualQuery(base, &info, sizeof(info)); + ok(ret, "VirtualQuery failed %d\n", GetLastError()); + ok(info.Protect == td[i].prot, "%d: got %#x != expected %#x\n", i, info.Protect, td[i].prot); + } + VirtualFree(base, 0, MEM_FREE); } else

1 0

Dmitry Timoshkov : kernel32: Add a test to show that Windows changes the WRITECOPY to WRITE protection on an image section write .
by Alexandre Julliard 22 Nov '11

22 Nov '11

Module: wine Branch: master Commit: bed1e5c8f5813904b858269d5bfe02c76c56f39b URL: http://source.winehq.org/git/wine.git/?a=commit;h=bed1e5c8f5813904b858269d5… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Nov 22 18:02:38 2011 +0800 kernel32: Add a test to show that Windows changes the WRITECOPY to WRITE protection on an image section write. --- dlls/kernel32/tests/loader.c | 83 +++++++++++++++++++++++++++++------------- 1 files changed, 57 insertions(+), 26 deletions(-) diff --git a/dlls/kernel32/tests/loader.c b/dlls/kernel32/tests/loader.c index 4d420ea..8f88907 100644 --- a/dlls/kernel32/tests/loader.c +++ b/dlls/kernel32/tests/loader.c @@ -553,39 +553,54 @@ static void test_ImportDescriptors(void) } } +static BOOL is_mem_writable(DWORD prot) +{ + switch (prot & 0xff) + { + case PAGE_READWRITE: + case PAGE_WRITECOPY: + case PAGE_EXECUTE_READWRITE: + case PAGE_EXECUTE_WRITECOPY: + return TRUE; + + default: + return FALSE; + } +} + static void test_section_access(void) { static const struct test_data { - DWORD scn_file_access, scn_page_access; + DWORD scn_file_access, scn_page_access, scn_page_access_after_write; } td[] = { - { 0, PAGE_NOACCESS }, - { IMAGE_SCN_MEM_READ, PAGE_READONLY }, - { IMAGE_SCN_MEM_WRITE, PAGE_WRITECOPY }, - { IMAGE_SCN_MEM_EXECUTE, PAGE_EXECUTE }, - { IMAGE_SCN_MEM_READ | IMAGE_SCN_MEM_WRITE, PAGE_WRITECOPY }, + { 0, PAGE_NOACCESS, 0 }, + { IMAGE_SCN_MEM_READ, PAGE_READONLY, 0 }, + { IMAGE_SCN_MEM_WRITE, PAGE_WRITECOPY, PAGE_READWRITE }, + { IMAGE_SCN_MEM_EXECUTE, PAGE_EXECUTE, 0 }, + { IMAGE_SCN_MEM_READ | IMAGE_SCN_MEM_WRITE, PAGE_WRITECOPY, PAGE_READWRITE }, { IMAGE_SCN_MEM_READ | IMAGE_SCN_MEM_EXECUTE, PAGE_EXECUTE_READ }, - { IMAGE_SCN_MEM_WRITE | IMAGE_SCN_MEM_EXECUTE, PAGE_EXECUTE_WRITECOPY }, - { IMAGE_SCN_MEM_READ | IMAGE_SCN_MEM_WRITE | IMAGE_SCN_MEM_EXECUTE, PAGE_EXECUTE_WRITECOPY }, - - { IMAGE_SCN_CNT_INITIALIZED_DATA, PAGE_NOACCESS }, - { IMAGE_SCN_CNT_INITIALIZED_DATA | IMAGE_SCN_MEM_READ, PAGE_READONLY }, - { IMAGE_SCN_CNT_INITIALIZED_DATA | IMAGE_SCN_MEM_WRITE, PAGE_WRITECOPY }, - { IMAGE_SCN_CNT_INITIALIZED_DATA | IMAGE_SCN_MEM_EXECUTE, PAGE_EXECUTE }, - { IMAGE_SCN_CNT_INITIALIZED_DATA | IMAGE_SCN_MEM_READ | IMAGE_SCN_MEM_WRITE, PAGE_WRITECOPY }, - { IMAGE_SCN_CNT_INITIALIZED_DATA | IMAGE_SCN_MEM_READ | IMAGE_SCN_MEM_EXECUTE, PAGE_EXECUTE_READ }, - { IMAGE_SCN_CNT_INITIALIZED_DATA | IMAGE_SCN_MEM_WRITE | IMAGE_SCN_MEM_EXECUTE, PAGE_EXECUTE_WRITECOPY }, - { IMAGE_SCN_CNT_INITIALIZED_DATA | IMAGE_SCN_MEM_READ | IMAGE_SCN_MEM_WRITE | IMAGE_SCN_MEM_EXECUTE, PAGE_EXECUTE_WRITECOPY }, - - { IMAGE_SCN_CNT_UNINITIALIZED_DATA, PAGE_NOACCESS }, - { IMAGE_SCN_CNT_UNINITIALIZED_DATA | IMAGE_SCN_MEM_READ, PAGE_READONLY }, - { IMAGE_SCN_CNT_UNINITIALIZED_DATA | IMAGE_SCN_MEM_WRITE, PAGE_WRITECOPY }, - { IMAGE_SCN_CNT_UNINITIALIZED_DATA | IMAGE_SCN_MEM_EXECUTE, PAGE_EXECUTE }, - { IMAGE_SCN_CNT_UNINITIALIZED_DATA | IMAGE_SCN_MEM_READ | IMAGE_SCN_MEM_WRITE, PAGE_WRITECOPY }, - { IMAGE_SCN_CNT_UNINITIALIZED_DATA | IMAGE_SCN_MEM_READ | IMAGE_SCN_MEM_EXECUTE, PAGE_EXECUTE_READ }, - { IMAGE_SCN_CNT_UNINITIALIZED_DATA | IMAGE_SCN_MEM_WRITE | IMAGE_SCN_MEM_EXECUTE, PAGE_EXECUTE_WRITECOPY }, - { IMAGE_SCN_CNT_UNINITIALIZED_DATA | IMAGE_SCN_MEM_READ | IMAGE_SCN_MEM_WRITE | IMAGE_SCN_MEM_EXECUTE, PAGE_EXECUTE_WRITECOPY } + { IMAGE_SCN_MEM_WRITE | IMAGE_SCN_MEM_EXECUTE, PAGE_EXECUTE_WRITECOPY, PAGE_EXECUTE_READWRITE }, + { IMAGE_SCN_MEM_READ | IMAGE_SCN_MEM_WRITE | IMAGE_SCN_MEM_EXECUTE, PAGE_EXECUTE_WRITECOPY, PAGE_EXECUTE_READWRITE }, + + { IMAGE_SCN_CNT_INITIALIZED_DATA, PAGE_NOACCESS, 0 }, + { IMAGE_SCN_CNT_INITIALIZED_DATA | IMAGE_SCN_MEM_READ, PAGE_READONLY, 0 }, + { IMAGE_SCN_CNT_INITIALIZED_DATA | IMAGE_SCN_MEM_WRITE, PAGE_WRITECOPY, PAGE_READWRITE }, + { IMAGE_SCN_CNT_INITIALIZED_DATA | IMAGE_SCN_MEM_EXECUTE, PAGE_EXECUTE, 0 }, + { IMAGE_SCN_CNT_INITIALIZED_DATA | IMAGE_SCN_MEM_READ | IMAGE_SCN_MEM_WRITE, PAGE_WRITECOPY, PAGE_READWRITE }, + { IMAGE_SCN_CNT_INITIALIZED_DATA | IMAGE_SCN_MEM_READ | IMAGE_SCN_MEM_EXECUTE, PAGE_EXECUTE_READ, 0 }, + { IMAGE_SCN_CNT_INITIALIZED_DATA | IMAGE_SCN_MEM_WRITE | IMAGE_SCN_MEM_EXECUTE, PAGE_EXECUTE_WRITECOPY, PAGE_EXECUTE_READWRITE }, + { IMAGE_SCN_CNT_INITIALIZED_DATA | IMAGE_SCN_MEM_READ | IMAGE_SCN_MEM_WRITE | IMAGE_SCN_MEM_EXECUTE, PAGE_EXECUTE_WRITECOPY, PAGE_EXECUTE_READWRITE }, + + { IMAGE_SCN_CNT_UNINITIALIZED_DATA, PAGE_NOACCESS, 0 }, + { IMAGE_SCN_CNT_UNINITIALIZED_DATA | IMAGE_SCN_MEM_READ, PAGE_READONLY, 0 }, + { IMAGE_SCN_CNT_UNINITIALIZED_DATA | IMAGE_SCN_MEM_WRITE, PAGE_WRITECOPY, PAGE_READWRITE }, + { IMAGE_SCN_CNT_UNINITIALIZED_DATA | IMAGE_SCN_MEM_EXECUTE, PAGE_EXECUTE, 0 }, + { IMAGE_SCN_CNT_UNINITIALIZED_DATA | IMAGE_SCN_MEM_READ | IMAGE_SCN_MEM_WRITE, PAGE_WRITECOPY, PAGE_READWRITE }, + { IMAGE_SCN_CNT_UNINITIALIZED_DATA | IMAGE_SCN_MEM_READ | IMAGE_SCN_MEM_EXECUTE, PAGE_EXECUTE_READ, 0 }, + { IMAGE_SCN_CNT_UNINITIALIZED_DATA | IMAGE_SCN_MEM_WRITE | IMAGE_SCN_MEM_EXECUTE, PAGE_EXECUTE_WRITECOPY, PAGE_EXECUTE_READWRITE }, + { IMAGE_SCN_CNT_UNINITIALIZED_DATA | IMAGE_SCN_MEM_READ | IMAGE_SCN_MEM_WRITE | IMAGE_SCN_MEM_EXECUTE, PAGE_EXECUTE_WRITECOPY, PAGE_EXECUTE_READWRITE } }; static const char filler[0x1000]; static const char section_data[0x10] = "section data"; @@ -664,6 +679,7 @@ static void test_section_access(void) hlib = LoadLibrary(dll_name); ok(hlib != 0, "LoadLibrary error %d\n", GetLastError()); + SetLastError(0xdeadbeef); size = VirtualQuery((char *)hlib + section.VirtualAddress, &info, sizeof(info)); ok(size == sizeof(info), "%d: VirtualQuery error %d\n", i, GetLastError()); @@ -682,6 +698,21 @@ static void test_section_access(void) if (info.Protect != PAGE_NOACCESS) ok(!memcmp((const char *)info.BaseAddress, section_data, section.SizeOfRawData), "wrong section data\n"); + /* Windows changes the WRITECOPY to WRITE protection on an image section write (for a changed page only) */ + if (is_mem_writable(info.Protect)) + { + char *p = info.BaseAddress; + *p = 0xfe; + SetLastError(0xdeadbeef); + size = VirtualQuery((char *)hlib + section.VirtualAddress, &info, sizeof(info)); + ok(size == sizeof(info), "%d: VirtualQuery error %d\n", i, GetLastError()); + /* FIXME: remove the condition below once Wine is fixed */ + if (info.Protect == PAGE_WRITECOPY || info.Protect == PAGE_EXECUTE_WRITECOPY) + todo_wine ok(info.Protect == td[i].scn_page_access_after_write, "%d: got %#x != expected %#x\n", i, info.Protect, td[i].scn_page_access_after_write); + else + ok(info.Protect == td[i].scn_page_access_after_write, "%d: got %#x != expected %#x\n", i, info.Protect, td[i].scn_page_access_after_write); + } + SetLastError(0xdeadbeef); ret = FreeLibrary(hlib); ok(ret, "FreeLibrary error %d\n", GetLastError());

1 0