November 2011 - Wine-Commits

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

Nov. 22, 2011

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: Fix "l" numeric constants in winbase.h.
by Alexandre Julliard Nov. 22, 2011

Nov. 22, 2011

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

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

Nov. 22, 2011

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

Frédéric Delanoy : comctl32: Avoid hardcoding array lengths.
by Alexandre Julliard Nov. 22, 2011

Nov. 22, 2011

Module: wine Branch: master Commit: 954e6eba7e2c4df401e3c1de4bb23216314c349c URL: http://source.winehq.org/git/wine.git/?a=commit;h=954e6eba7e2c4df401e3c1de4… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Mon Nov 21 19:19:46 2011 +0100 comctl32: Avoid hardcoding array lengths. --- dlls/comctl32/ipaddress.c | 2 +- dlls/comdlg32/printdlg.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/ipaddress.c b/dlls/comctl32/ipaddress.c index e51ae08..97b6a0f 100644 --- a/dlls/comctl32/ipaddress.c +++ b/dlls/comctl32/ipaddress.c @@ -339,7 +339,7 @@ static BOOL IPADDRESS_SetRange (IPADDRESS_INFO *infoPtr, int index, WORD range) static void IPADDRESS_ClearAddress (const IPADDRESS_INFO *infoPtr) { - WCHAR nil[1] = { 0 }; + static const WCHAR nil[] = { 0 }; int i; TRACE("\n"); diff --git a/dlls/comdlg32/printdlg.c b/dlls/comdlg32/printdlg.c index ee4dab2..aea5224 100644 --- a/dlls/comdlg32/printdlg.c +++ b/dlls/comdlg32/printdlg.c @@ -2433,7 +2433,7 @@ static WCHAR get_decimal_sep(void) if(!sep) { - WCHAR buf[2] = {'.',0}; + WCHAR buf[] = {'.', 0}; GetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_SDECIMAL, buf, sizeof(buf) / sizeof(buf[0])); sep = buf[0]; }

1 0

Henri Verbeet : wined3d: Recognize the SM4 ushr opcode.
by Alexandre Julliard Nov. 22, 2011

Nov. 22, 2011

Module: wine Branch: master Commit: d695dd3af4502a1e91284b606b97e157f0c75321 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d695dd3af4502a1e91284b606… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Nov 21 18:48:38 2011 +0100 wined3d: Recognize the SM4 ushr opcode. --- dlls/wined3d/arb_program_shader.c | 1 + dlls/wined3d/glsl_shader.c | 1 + dlls/wined3d/shader.c | 1 + dlls/wined3d/shader_sm4.c | 2 ++ dlls/wined3d/wined3d_private.h | 1 + 5 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 5739733..03b525f 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -5128,6 +5128,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL /* WINED3DSIH_TEXREG2GB */ pshader_hw_texreg2gb, /* WINED3DSIH_TEXREG2RGB */ pshader_hw_texreg2rgb, /* WINED3DSIH_UDIV */ NULL, + /* WINED3DSIH_USHR */ NULL, /* WINED3DSIH_UTOF */ NULL, }; diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 8e1724c..b1c9b61 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -5083,6 +5083,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_TEXREG2GB */ shader_glsl_texreg2gb, /* WINED3DSIH_TEXREG2RGB */ shader_glsl_texreg2rgb, /* WINED3DSIH_UDIV */ NULL, + /* WINED3DSIH_USHR */ NULL, /* WINED3DSIH_UTOF */ NULL, }; diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 998b431..5f2448c 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -139,6 +139,7 @@ static const char * const shader_opcode_names[] = /* WINED3DSIH_TEXREG2GB */ "texreg2gb", /* WINED3DSIH_TEXREG2RGB */ "texreg2rgb", /* WINED3DSIH_UDIV */ "udiv", + /* WINED3DSIH_USHR */ "ushr", /* WINED3DSIH_UTOF */ "utof", }; diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index b78f03b..5c675c2 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -95,6 +95,7 @@ enum wined3d_sm4_opcode WINED3D_SM4_OP_SQRT = 0x4b, WINED3D_SM4_OP_SINCOS = 0x4d, WINED3D_SM4_OP_UDIV = 0x4e, + WINED3D_SM4_OP_USHR = 0x55, WINED3D_SM4_OP_UTOF = 0x56, }; @@ -182,6 +183,7 @@ static const struct wined3d_sm4_opcode_info opcode_table[] = {WINED3D_SM4_OP_SQRT, WINED3DSIH_SQRT, 1, 1}, {WINED3D_SM4_OP_SINCOS, WINED3DSIH_SINCOS, 2, 1}, {WINED3D_SM4_OP_UDIV, WINED3DSIH_UDIV, 2, 2}, + {WINED3D_SM4_OP_USHR, WINED3DSIH_USHR, 1, 2}, {WINED3D_SM4_OP_UTOF, WINED3DSIH_UTOF, 1, 1}, }; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 7e77347..72ffe73 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -512,6 +512,7 @@ enum WINED3D_SHADER_INSTRUCTION_HANDLER WINED3DSIH_TEXREG2GB, WINED3DSIH_TEXREG2RGB, WINED3DSIH_UDIV, + WINED3DSIH_USHR, WINED3DSIH_UTOF, WINED3DSIH_TABLE_SIZE };

1 0

Alexandre Julliard : gdi32: Return the region directly from PATH_PathToRegion.
by Alexandre Julliard Nov. 22, 2011

Nov. 22, 2011

Module: wine Branch: master Commit: ac1643caecd9a3cb7130b8df7db26ab885c46294 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac1643caecd9a3cb7130b8df7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 22 11:31:27 2011 +0100 gdi32: Return the region directly from PATH_PathToRegion. --- dlls/gdi32/path.c | 32 ++++++++------------------------ 1 files changed, 8 insertions(+), 24 deletions(-) diff --git a/dlls/gdi32/path.c b/dlls/gdi32/path.c index 5c7e302..cb45f29 100644 --- a/dlls/gdi32/path.c +++ b/dlls/gdi32/path.c @@ -379,13 +379,9 @@ static BOOL PATH_FlattenPath(GdiPath *pPath) /* PATH_PathToRegion * * Creates a region from the specified path using the specified polygon - * filling mode. The path is left unchanged. A handle to the region that - * was created is stored in *pHrgn. If successful, TRUE is returned; if an - * error occurs, SetLastError is called with the appropriate value and - * FALSE is returned. + * filling mode. The path is left unchanged. */ -static BOOL PATH_PathToRegion(GdiPath *pPath, INT nPolyFillMode, - HRGN *pHrgn) +static HRGN PATH_PathToRegion(GdiPath *pPath, INT nPolyFillMode) { int numStrokes, iStroke, i; INT *pNumPointsInStroke; @@ -407,7 +403,7 @@ static BOOL PATH_PathToRegion(GdiPath *pPath, INT nPolyFillMode, if(!pNumPointsInStroke) { SetLastError(ERROR_NOT_ENOUGH_MEMORY); - return FALSE; + return 0; } /* Second pass: remember number of points in each polygon */ @@ -428,18 +424,8 @@ static BOOL PATH_PathToRegion(GdiPath *pPath, INT nPolyFillMode, hrgn=CreatePolyPolygonRgn(pPath->pPoints, pNumPointsInStroke, numStrokes, nPolyFillMode); - /* Free memory for number-of-points-in-stroke array */ HeapFree( GetProcessHeap(), 0, pNumPointsInStroke ); - - if(hrgn==NULL) - { - SetLastError(ERROR_NOT_ENOUGH_MEMORY); - return FALSE; - } - - /* Success! */ - *pHrgn=hrgn; - return TRUE; + return hrgn; } /* PATH_ScaleNormalizedPoint @@ -689,10 +675,8 @@ HRGN WINAPI PathToRegion(HDC hdc) else { /* FIXME: Should we empty the path even if conversion failed? */ - if(PATH_PathToRegion(pPath, GetPolyFillMode(hdc), &hrgnRval)) - PATH_EmptyPath(pPath); - else - hrgnRval=0; + hrgnRval = PATH_PathToRegion(pPath, GetPolyFillMode(hdc)); + if (hrgnRval) PATH_EmptyPath(pPath); } release_dc_ptr( dc ); return hrgnRval; @@ -707,7 +691,7 @@ static BOOL PATH_FillPath( HDC hdc, GdiPath *pPath ) HRGN hrgn; /* Construct a region from the path and fill it */ - if(PATH_PathToRegion(pPath, GetPolyFillMode(hdc), &hrgn)) + if ((hrgn = PATH_PathToRegion(pPath, GetPolyFillMode(hdc)))) { /* Since PaintRgn interprets the region as being in logical coordinates * but the points we store for the path are already in device @@ -2164,7 +2148,7 @@ BOOL nulldrv_SelectClipPath( PHYSDEV dev, INT mode ) SetLastError( ERROR_CAN_NOT_COMPLETE ); return FALSE; } - if (!PATH_PathToRegion( &dc->path, GetPolyFillMode(dev->hdc), &hrgn )) return FALSE; + if (!(hrgn = PATH_PathToRegion( &dc->path, GetPolyFillMode(dev->hdc)))) return FALSE; ret = ExtSelectClipRgn( dev->hdc, hrgn, mode ) != ERROR; if (ret) PATH_EmptyPath( &dc->path ); /* FIXME: Should this function delete the path even if it failed? */

1 0

Alexandre Julliard : gdi32: Add helper functions for allocating and freeing paths.
by Alexandre Julliard Nov. 22, 2011

Nov. 22, 2011

Module: wine Branch: master Commit: 7698b636e740a171ce1da2f7eed16a0cdacd02ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=7698b636e740a171ce1da2f7e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 22 11:21:33 2011 +0100 gdi32: Add helper functions for allocating and freeing paths. --- dlls/gdi32/gdi_private.h | 2 +- dlls/gdi32/path.c | 58 ++++++++++++++++++++++++++++++---------------- 2 files changed, 39 insertions(+), 21 deletions(-) diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 2bce47c..0868e14 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -84,7 +84,7 @@ typedef enum tagGdiPathState PATH_Closed } GdiPathState; -typedef struct tagGdiPath +typedef struct gdi_path { GdiPathState state; POINT *pPoints; diff --git a/dlls/gdi32/path.c b/dlls/gdi32/path.c index 6cf92df..5c7e302 100644 --- a/dlls/gdi32/path.c +++ b/dlls/gdi32/path.c @@ -100,6 +100,36 @@ static inline void pop_path_driver( DC *dc ) HeapFree( GetProcessHeap(), 0, dev ); } +static void free_gdi_path( struct gdi_path *path ) +{ + HeapFree( GetProcessHeap(), 0, path->pPoints ); + HeapFree( GetProcessHeap(), 0, path->pFlags ); + HeapFree( GetProcessHeap(), 0, path ); +} + +static struct gdi_path *alloc_gdi_path(void) +{ + struct gdi_path *path = HeapAlloc( GetProcessHeap(), 0, sizeof(*path) ); + + if (!path) + { + SetLastError( ERROR_NOT_ENOUGH_MEMORY ); + return NULL; + } + path->pPoints = HeapAlloc( GetProcessHeap(), 0, NUM_ENTRIES_INITIAL * sizeof(*path->pPoints) ); + path->pFlags = HeapAlloc( GetProcessHeap(), 0, NUM_ENTRIES_INITIAL * sizeof(*path->pFlags) ); + if (!path->pPoints || !path->pFlags) + { + free_gdi_path( path ); + SetLastError( ERROR_NOT_ENOUGH_MEMORY ); + return NULL; + } + path->state = PATH_Open; + path->numEntriesUsed = 0; + path->numEntriesAllocated = NUM_ENTRIES_INITIAL; + path->newStroke = TRUE; + return path; +} /* Performs a world-to-viewport transformation on the specified point (which * is in floating point format). @@ -1808,9 +1838,7 @@ static BOOL PATH_WidenPath(DC *dc) else pStrokes = HeapReAlloc(GetProcessHeap(), 0, pStrokes, numStrokes * sizeof(GdiPath*)); if(!pStrokes) return FALSE; - pStrokes[numStrokes - 1] = HeapAlloc(GetProcessHeap(), 0, sizeof(GdiPath)); - PATH_InitGdiPath(pStrokes[numStrokes - 1]); - pStrokes[numStrokes - 1]->state = PATH_Open; + pStrokes[numStrokes - 1] = alloc_gdi_path(); /* fall through */ case PT_LINETO: case (PT_LINETO | PT_CLOSEFIGURE): @@ -1828,17 +1856,11 @@ static BOOL PATH_WidenPath(DC *dc) } } - pNewPath = HeapAlloc(GetProcessHeap(), 0, sizeof(GdiPath)); - PATH_InitGdiPath(pNewPath); - pNewPath->state = PATH_Open; + pNewPath = alloc_gdi_path(); for(i = 0; i < numStrokes; i++) { - pUpPath = HeapAlloc(GetProcessHeap(), 0, sizeof(GdiPath)); - PATH_InitGdiPath(pUpPath); - pUpPath->state = PATH_Open; - pDownPath = HeapAlloc(GetProcessHeap(), 0, sizeof(GdiPath)); - PATH_InitGdiPath(pDownPath); - pDownPath->state = PATH_Open; + pUpPath = alloc_gdi_path(); + pDownPath = alloc_gdi_path(); for(j = 0; j < pStrokes[i]->numEntriesUsed; j++) { /* Beginning or end of the path if not closed */ @@ -2022,20 +2044,16 @@ static BOOL PATH_WidenPath(DC *dc) PATH_AddEntry(pNewPath, &pt, ( (j == 0 && (pStrokes[i]->pFlags[pStrokes[i]->numEntriesUsed - 1] & PT_CLOSEFIGURE)) ? PT_MOVETO : PT_LINETO)); } - PATH_DestroyGdiPath(pStrokes[i]); - HeapFree(GetProcessHeap(), 0, pStrokes[i]); - PATH_DestroyGdiPath(pUpPath); - HeapFree(GetProcessHeap(), 0, pUpPath); - PATH_DestroyGdiPath(pDownPath); - HeapFree(GetProcessHeap(), 0, pDownPath); + free_gdi_path( pStrokes[i] ); + free_gdi_path( pUpPath ); + free_gdi_path( pDownPath ); } HeapFree(GetProcessHeap(), 0, pStrokes); pNewPath->state = PATH_Closed; if (!(ret = PATH_AssignGdiPath(pPath, pNewPath))) ERR("Assign path failed\n"); - PATH_DestroyGdiPath(pNewPath); - HeapFree(GetProcessHeap(), 0, pNewPath); + free_gdi_path( pNewPath ); return ret; }

1 0

Dmitry Timoshkov : kernel32: Add a test for main module image section protections.
by Alexandre Julliard Nov. 22, 2011

Nov. 22, 2011

Module: wine Branch: master Commit: ed95814ed8b6252c0f122755d04c8fab4a8d3939 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed95814ed8b6252c0f122755d… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Nov 22 18:02:51 2011 +0800 kernel32: Add a test for main module image section protections. --- dlls/kernel32/tests/loader.c | 47 +++++++++++++++++++++++++++++++++++++++++- 1 files changed, 46 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/tests/loader.c b/dlls/kernel32/tests/loader.c index 8f88907..3bc7540 100644 --- a/dlls/kernel32/tests/loader.c +++ b/dlls/kernel32/tests/loader.c @@ -604,6 +604,7 @@ static void test_section_access(void) }; static const char filler[0x1000]; static const char section_data[0x10] = "section data"; + char buf[256]; int i; DWORD dummy, file_align; HANDLE hfile; @@ -613,7 +614,9 @@ static void test_section_access(void) char dll_name[MAX_PATH]; SIZE_T size; MEMORY_BASIC_INFORMATION info; - BOOL ret; + STARTUPINFO sti; + PROCESS_INFORMATION pi; + DWORD ret; GetSystemInfo(&si); trace("system page size %#x\n", si.dwPageSize); @@ -642,6 +645,9 @@ static void test_section_access(void) nt_header.FileHeader.NumberOfSections = 1; nt_header.FileHeader.SizeOfOptionalHeader = sizeof(IMAGE_OPTIONAL_HEADER); + /* don't set IMAGE_FILE_DLL to show that it doesn't change anything for a DLL or a process image */ + nt_header.FileHeader.Characteristics = IMAGE_FILE_EXECUTABLE_IMAGE; + nt_header.OptionalHeader.SectionAlignment = si.dwPageSize; nt_header.OptionalHeader.FileAlignment = 0x200; nt_header.OptionalHeader.SizeOfImage = sizeof(dos_header) + sizeof(nt_header) + sizeof(IMAGE_SECTION_HEADER) + si.dwPageSize; @@ -717,6 +723,45 @@ static void test_section_access(void) ret = FreeLibrary(hlib); ok(ret, "FreeLibrary error %d\n", GetLastError()); + memset(&sti, 0, sizeof(sti)); + sti.cb = sizeof(sti); + SetLastError(0xdeadbeef); + ret = CreateProcess(dll_name, NULL, NULL, NULL, FALSE, CREATE_SUSPENDED, NULL, NULL, &sti, &pi); + ok(ret, "CreateProcess() error %d\n", GetLastError()); + + SetLastError(0xdeadbeef); + size = VirtualQueryEx(pi.hProcess, (char *)hlib + section.VirtualAddress, &info, sizeof(info)); + ok(size == sizeof(info), + "%d: VirtualQuery error %d\n", i, GetLastError()); + ok(info.BaseAddress == (char *)hlib + section.VirtualAddress, "%d: got %p != expected %p\n", i, info.BaseAddress, (char *)hlib + section.VirtualAddress); + ok(info.RegionSize == si.dwPageSize, "%d: got %#lx != expected %#x\n", i, info.RegionSize, si.dwPageSize); + /* FIXME: remove the condition below once Wine is fixed */ + if ((td[i].scn_file_access & IMAGE_SCN_MEM_WRITE) && + (td[i].scn_file_access & IMAGE_SCN_CNT_UNINITIALIZED_DATA)) + todo_wine ok(info.Protect == td[i].scn_page_access, "%d: got %#x != expected %#x\n", i, info.Protect, td[i].scn_page_access); + else + ok(info.Protect == td[i].scn_page_access, "%d: got %#x != expected %#x\n", i, info.Protect, td[i].scn_page_access); + ok(info.AllocationBase == hlib, "%d: %p != %p\n", i, info.AllocationBase, hlib); + ok(info.AllocationProtect == PAGE_EXECUTE_WRITECOPY, "%d: %#x != PAGE_EXECUTE_WRITECOPY\n", i, info.AllocationProtect); + ok(info.State == MEM_COMMIT, "%d: %#x != MEM_COMMIT\n", i, info.State); + ok(info.Type == SEC_IMAGE, "%d: %#x != SEC_IMAGE\n", i, info.Type); + if (info.Protect != PAGE_NOACCESS) + { + SetLastError(0xdeadbeef); + ret = ReadProcessMemory(pi.hProcess, info.BaseAddress, buf, section.SizeOfRawData, NULL); + ok(ret, "ReadProcessMemory() error %d\n", GetLastError()); + ok(!memcmp(buf, section_data, section.SizeOfRawData), "wrong section data\n"); + } + + SetLastError(0xdeadbeef); + ret = TerminateProcess(pi.hProcess, 0); + ok(ret, "TerminateProcess() error %d\n", GetLastError()); + ret = WaitForSingleObject(pi.hProcess, 3000); + ok(ret == WAIT_OBJECT_0, "WaitForSingleObject failed: %x\n", ret); + + CloseHandle(pi.hThread); + CloseHandle(pi.hProcess); + SetLastError(0xdeadbeef); ret = DeleteFile(dll_name); ok(ret, "DeleteFile error %d\n", GetLastError());

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 Nov. 22, 2011

Nov. 22, 2011

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

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

Nov. 22, 2011

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