November 2011 - Wine-Commits

Alexandre Julliard : browseui: Convert dialogs to po files.
by Alexandre Julliard Nov. 22, 2011

Nov. 22, 2011

Module: wine Branch: master Commit: cdaf3c0017929824fc1bd04001dffd263298cab8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cdaf3c0017929824fc1bd0400… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 22 14:12:22 2011 +0100 browseui: Convert dialogs to po files. --- dlls/browseui/Makefile.in | 26 +-------------------- dlls/browseui/browseui.rc | 13 ++++++++++ dlls/browseui/rsrc_Da.rc | 35 ----------------------------- dlls/browseui/rsrc_De.rc | 37 ------------------------------ dlls/browseui/rsrc_En.rc | 34 ---------------------------- dlls/browseui/rsrc_Es.rc | 34 ---------------------------- dlls/browseui/rsrc_Fr.rc | 34 ---------------------------- dlls/browseui/rsrc_He.rc | 38 ------------------------------- dlls/browseui/rsrc_Hu.rc | 37 ------------------------------ dlls/browseui/rsrc_It.rc | 37 ------------------------------ dlls/browseui/rsrc_Ja.rc | 37 ------------------------------ dlls/browseui/rsrc_Ko.rc | 37 ------------------------------ dlls/browseui/rsrc_Lt.rc | 37 ------------------------------ dlls/browseui/rsrc_Nl.rc | 34 ---------------------------- dlls/browseui/rsrc_No.rc | 36 ------------------------------ dlls/browseui/rsrc_Pl.rc | 34 ---------------------------- dlls/browseui/rsrc_Pt.rc | 35 ----------------------------- dlls/browseui/rsrc_Ro.rc | 37 ------------------------------ dlls/browseui/rsrc_Ru.rc | 37 ------------------------------ dlls/browseui/rsrc_Si.rc | 36 ------------------------------ dlls/browseui/rsrc_Sr.rc | 53 -------------------------------------------- dlls/browseui/rsrc_Sv.rc | 36 ------------------------------ dlls/browseui/rsrc_Uk.rc | 38 ------------------------------- dlls/browseui/rsrc_Zh.rc | 54 --------------------------------------------- po/ar.po | 20 ++++++++-------- po/bg.po | 20 ++++++++-------- po/ca.po | 20 ++++++++-------- po/cs.po | 20 ++++++++-------- po/da.po | 20 ++++++++-------- po/de.po | 20 ++++++++-------- po/el.po | 20 ++++++++-------- po/en.po | 20 ++++++++-------- po/en_US.po | 20 ++++++++-------- po/eo.po | 20 ++++++++-------- po/es.po | 20 ++++++++-------- po/fa.po | 20 ++++++++-------- po/fi.po | 20 ++++++++-------- po/fr.po | 20 ++++++++-------- po/he.po | 20 ++++++++-------- po/hi.po | 20 ++++++++-------- po/hu.po | 20 ++++++++-------- po/it.po | 20 ++++++++-------- po/ja.po | 20 ++++++++-------- po/ko.po | 20 ++++++++-------- po/lt.po | 20 ++++++++-------- po/ml.po | 20 ++++++++-------- po/nb_NO.po | 20 ++++++++-------- po/nl.po | 20 ++++++++-------- po/or.po | 20 ++++++++-------- po/pa.po | 20 ++++++++-------- po/pl.po | 20 ++++++++-------- po/pt_BR.po | 20 ++++++++-------- po/pt_PT.po | 20 ++++++++-------- po/rm.po | 20 ++++++++-------- po/ro.po | 20 ++++++++-------- po/ru.po | 20 ++++++++-------- po/sk.po | 20 ++++++++-------- po/sl.po | 20 ++++++++-------- po/sr_RS(a)cyrillic.po | 20 ++++++++-------- po/sr_RS(a)latin.po | 20 ++++++++-------- po/sv.po | 20 ++++++++-------- po/te.po | 20 ++++++++-------- po/th.po | 20 ++++++++-------- po/tr.po | 20 ++++++++-------- po/uk.po | 20 ++++++++-------- po/wa.po | 20 ++++++++-------- po/wine.pot | 20 ++++++++-------- po/zh_CN.po | 20 ++++++++-------- po/zh_TW.po | 20 ++++++++-------- 69 files changed, 464 insertions(+), 1302 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=cdaf3c0017929824fc1bd…

1 0

Alexandre Julliard : sane: Convert dialogs to po files.
by Alexandre Julliard Nov. 22, 2011

Nov. 22, 2011

1 0

Hans Leidekker : msi: Perform a case insensitive match on the volume label.
by Alexandre Julliard Nov. 22, 2011

Nov. 22, 2011

Module: wine Branch: master Commit: 3ad3a184d5cbb92dd6fb94c82a27dda23e4cd3c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ad3a184d5cbb92dd6fb94c82… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Nov 22 10:30:23 2011 +0100 msi: Perform a case insensitive match on the volume label. --- dlls/msi/media.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msi/media.c b/dlls/msi/media.c index c879af1..9162c3b 100644 --- a/dlls/msi/media.c +++ b/dlls/msi/media.c @@ -68,7 +68,7 @@ static BOOL source_matches_volume(MSIMEDIAINFO *mi, LPCWSTR source_root) return FALSE; } - return !strcmpW( mi->volume_label, volume_name ); + return !strcmpiW( mi->volume_label, volume_name ); } static UINT msi_change_media(MSIPACKAGE *package, MSIMEDIAINFO *mi)

1 0

Alexandre Julliard : gdi32: Store a pointer to the path in the DC and make the path structure opaque.
by Alexandre Julliard Nov. 22, 2011

Nov. 22, 2011

Module: wine Branch: master Commit: a214a3c3dadc58502c59888d1dc3c7cfecf11709 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a214a3c3dadc58502c59888d1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 27 11:52:12 2011 +0200 gdi32: Store a pointer to the path in the DC and make the path structure opaque. --- dlls/gdi32/dc.c | 4 +- dlls/gdi32/gdi_private.h | 26 +----- dlls/gdi32/path.c | 237 +++++++++++++++++++++++----------------------- 3 files changed, 121 insertions(+), 146 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a214a3c3dadc58502c598…

1 0

Alexandre Julliard : gphoto2: Convert dialogs to po files.
by Alexandre Julliard Nov. 22, 2011

Nov. 22, 2011

Module: wine Branch: master Commit: 479857cb1a5d2ced6505503e38308fa32ba4d1b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=479857cb1a5d2ced6505503e3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 22 13:51:09 2011 +0100 gphoto2: Convert dialogs to po files. --- configure | 2 +- configure.ac | 2 +- dlls/gphoto2.ds/Makefile.in | 25 +------ dlls/gphoto2.ds/{gphoto2_En.rc => gphoto2.rc} | 27 +++---- dlls/gphoto2.ds/gphoto2_Da.rc | 58 -------------- dlls/gphoto2.ds/gphoto2_De.rc | 58 -------------- dlls/gphoto2.ds/gphoto2_Es.rc | 59 -------------- dlls/gphoto2.ds/gphoto2_Fr.rc | 60 -------------- dlls/gphoto2.ds/gphoto2_He.rc | 62 --------------- dlls/gphoto2.ds/gphoto2_Hu.rc | 59 -------------- dlls/gphoto2.ds/gphoto2_It.rc | 58 -------------- dlls/gphoto2.ds/gphoto2_Ja.rc | 60 -------------- dlls/gphoto2.ds/gphoto2_Ko.rc | 59 -------------- dlls/gphoto2.ds/gphoto2_Lt.rc | 59 -------------- dlls/gphoto2.ds/gphoto2_Nl.rc | 56 ------------- dlls/gphoto2.ds/gphoto2_No.rc | 56 ------------- dlls/gphoto2.ds/gphoto2_Pl.rc | 57 -------------- dlls/gphoto2.ds/gphoto2_Pt.rc | 104 ------------------------- dlls/gphoto2.ds/gphoto2_Ro.rc | 57 -------------- dlls/gphoto2.ds/gphoto2_Ru.rc | 56 ------------- dlls/gphoto2.ds/gphoto2_Si.rc | 57 -------------- dlls/gphoto2.ds/gphoto2_Sr.rc | 88 --------------------- dlls/gphoto2.ds/gphoto2_Sv.rc | 56 ------------- dlls/gphoto2.ds/gphoto2_Uk.rc | 60 -------------- dlls/gphoto2.ds/gphoto2_Zh.rc | 94 ---------------------- po/ar.po | 42 ++++++++++ po/bg.po | 43 ++++++++++ po/ca.po | 44 +++++++++++ po/cs.po | 43 ++++++++++ po/da.po | 40 ++++++++++ po/de.po | 40 ++++++++++ po/el.po | 41 ++++++++++ po/en.po | 40 ++++++++++ po/en_US.po | 40 ++++++++++ po/eo.po | 47 +++++++++++ po/es.po | 40 ++++++++++ po/fa.po | 42 ++++++++++ po/fi.po | 43 ++++++++++ po/fr.po | 40 ++++++++++ po/he.po | 40 ++++++++++ po/hi.po | 41 ++++++++++ po/hu.po | 40 ++++++++++ po/it.po | 40 ++++++++++ po/ja.po | 40 ++++++++++ po/ko.po | 40 ++++++++++ po/lt.po | 40 ++++++++++ po/ml.po | 41 ++++++++++ po/nb_NO.po | 40 ++++++++++ po/nl.po | 40 ++++++++++ po/or.po | 41 ++++++++++ po/pa.po | 41 ++++++++++ po/pl.po | 40 ++++++++++ po/pt_BR.po | 40 ++++++++++ po/pt_PT.po | 40 ++++++++++ po/rm.po | 42 ++++++++++ po/ro.po | 40 ++++++++++ po/ru.po | 40 ++++++++++ po/sk.po | 42 ++++++++++ po/sl.po | 40 ++++++++++ po/sr_RS(a)cyrillic.po | 40 ++++++++++ po/sr_RS(a)latin.po | 40 ++++++++++ po/sv.po | 40 ++++++++++ po/te.po | 41 ++++++++++ po/th.po | 42 ++++++++++ po/tr.po | 42 ++++++++++ po/uk.po | 40 ++++++++++ po/wa.po | 42 ++++++++++ po/wine.pot | 40 ++++++++++ po/zh_CN.po | 40 ++++++++++ po/zh_TW.po | 40 ++++++++++ 70 files changed, 1856 insertions(+), 1373 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=479857cb1a5d2ced65055…

1 0

Alexandre Julliard : gdi32: Return a new path from PATH_WidenPath instead of replacing the DC path.
by Alexandre Julliard Nov. 22, 2011

Nov. 22, 2011

Module: wine Branch: master Commit: ddc9860a4295b9c1502b696a4e58dc2b928dece3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ddc9860a4295b9c1502b696a4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 22 11:44:31 2011 +0100 gdi32: Return a new path from PATH_WidenPath instead of replacing the DC path. --- dlls/gdi32/path.c | 31 +++++++++++++++---------------- 1 files changed, 15 insertions(+), 16 deletions(-) diff --git a/dlls/gdi32/path.c b/dlls/gdi32/path.c index 35069e1..a8c9c89 100644 --- a/dlls/gdi32/path.c +++ b/dlls/gdi32/path.c @@ -1755,19 +1755,17 @@ static BOOL PATH_StrokePath( HDC hdc, GdiPath *pPath ) #define round(x) ((int)((x)>0?(x)+0.5:(x)-0.5)) -static BOOL PATH_WidenPath(DC *dc) +static struct gdi_path *PATH_WidenPath(DC *dc) { INT i, j, numStrokes, penWidth, penWidthIn, penWidthOut, size, penStyle; - BOOL ret = FALSE; - struct gdi_path *flat_path; - GdiPath *pNewPath, **pStrokes = NULL, *pUpPath, *pDownPath; + struct gdi_path *flat_path, *pNewPath, **pStrokes = NULL, *pUpPath, *pDownPath; EXTLOGPEN *elp; DWORD obj_type, joint, endcap, penType; size = GetObjectW( dc->hPen, 0, NULL ); if (!size) { SetLastError(ERROR_CAN_NOT_COMPLETE); - return FALSE; + return NULL; } elp = HeapAlloc( GetProcessHeap(), 0, size ); @@ -1783,7 +1781,7 @@ static BOOL PATH_WidenPath(DC *dc) else { SetLastError(ERROR_CAN_NOT_COMPLETE); HeapFree( GetProcessHeap(), 0, elp ); - return FALSE; + return NULL; } penWidth = elp->elpWidth; @@ -1796,10 +1794,10 @@ static BOOL PATH_WidenPath(DC *dc) /* The function cannot apply to cosmetic pens */ if(obj_type == OBJ_EXTPEN && penType == PS_COSMETIC) { SetLastError(ERROR_CAN_NOT_COMPLETE); - return FALSE; + return NULL; } - if (!(flat_path = PATH_FlattenPath( &dc->path ))) return FALSE; + if (!(flat_path = PATH_FlattenPath( &dc->path ))) return NULL; penWidthIn = penWidth / 2; penWidthOut = penWidth / 2; @@ -1816,7 +1814,7 @@ static BOOL PATH_WidenPath(DC *dc) i == 0 ? "as first point" : "after PT_CLOSEFIGURE", flat_path->pFlags[i]); free_gdi_path( flat_path ); - return FALSE; + return NULL; } switch(flat_path->pFlags[i]) { case PT_MOVETO: @@ -1829,7 +1827,7 @@ static BOOL PATH_WidenPath(DC *dc) pStrokes = HeapAlloc(GetProcessHeap(), 0, sizeof(GdiPath*)); else pStrokes = HeapReAlloc(GetProcessHeap(), 0, pStrokes, numStrokes * sizeof(GdiPath*)); - if(!pStrokes) return FALSE; + if(!pStrokes) return NULL; pStrokes[numStrokes - 1] = alloc_gdi_path(); /* fall through */ case PT_LINETO: @@ -1844,7 +1842,7 @@ static BOOL PATH_WidenPath(DC *dc) break; default: ERR("Got path flag %c\n", flat_path->pFlags[i]); - return FALSE; + return NULL; } } @@ -2044,10 +2042,7 @@ static BOOL PATH_WidenPath(DC *dc) free_gdi_path( flat_path ); pNewPath->state = PATH_Closed; - if (!(ret = PATH_AssignGdiPath(&dc->path, pNewPath))) - ERR("Assign path failed\n"); - free_gdi_path( pNewPath ); - return ret; + return pNewPath; } @@ -2228,13 +2223,17 @@ BOOL nulldrv_FlattenPath( PHYSDEV dev ) BOOL nulldrv_WidenPath( PHYSDEV dev ) { DC *dc = get_nulldrv_dc( dev ); + struct gdi_path *path; if (dc->path.state != PATH_Closed) { SetLastError( ERROR_CAN_NOT_COMPLETE ); return FALSE; } - return PATH_WidenPath( dc ); + if (!(path = PATH_WidenPath( dc ))) return FALSE; + PATH_AssignGdiPath( &dc->path, path ); + free_gdi_path( path ); + return TRUE; } const struct gdi_dc_funcs path_driver =

1 0

Alexandre Julliard : gdi32: Use reallocs when growing a path instead of doing it by hand.
by Alexandre Julliard Nov. 22, 2011

Nov. 22, 2011

Module: wine Branch: master Commit: 26b1bfa52b982a943c1f4549209e7ee6c4f22419 URL: http://source.winehq.org/git/wine.git/?a=commit;h=26b1bfa52b982a943c1f45492… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 22 11:22:36 2011 +0100 gdi32: Use reallocs when growing a path instead of doing it by hand. --- dlls/gdi32/path.c | 58 ++++++++++++---------------------------------------- 1 files changed, 14 insertions(+), 44 deletions(-) diff --git a/dlls/gdi32/path.c b/dlls/gdi32/path.c index dfe15ed..6cf92df 100644 --- a/dlls/gdi32/path.c +++ b/dlls/gdi32/path.c @@ -74,8 +74,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(gdi); */ #define NUM_ENTRIES_INITIAL 16 /* Initial size of points / flags arrays */ -#define GROW_FACTOR_NUMER 2 /* Numerator of grow factor for the array */ -#define GROW_FACTOR_DENOM 1 /* Denominator of grow factor */ /* A floating point version of the POINT structure */ typedef struct tagFLOAT_POINT @@ -144,59 +142,31 @@ static void PATH_EmptyPath(GdiPath *pPath) * been allocated; allocates larger arrays and copies the existing entries * to those arrays, if necessary. Returns TRUE if successful, else FALSE. */ -static BOOL PATH_ReserveEntries(GdiPath *pPath, INT numEntries) +static BOOL PATH_ReserveEntries(GdiPath *pPath, INT count) { - INT numEntriesToAllocate; POINT *pPointsNew; BYTE *pFlagsNew; - assert(numEntries>=0); + assert(count>=0); /* Do we have to allocate more memory? */ - if(numEntries > pPath->numEntriesAllocated) + if(count > pPath->numEntriesAllocated) { /* Find number of entries to allocate. We let the size of the array * grow exponentially, since that will guarantee linear time * complexity. */ - if(pPath->numEntriesAllocated) - { - numEntriesToAllocate=pPath->numEntriesAllocated; - while(numEntriesToAllocate<numEntries) - numEntriesToAllocate=numEntriesToAllocate*GROW_FACTOR_NUMER/ - GROW_FACTOR_DENOM; - } - else - numEntriesToAllocate=numEntries; + count = max( pPath->numEntriesAllocated * 2, count ); - /* Allocate new arrays */ - pPointsNew=HeapAlloc( GetProcessHeap(), 0, numEntriesToAllocate * sizeof(POINT) ); - if(!pPointsNew) - return FALSE; - pFlagsNew=HeapAlloc( GetProcessHeap(), 0, numEntriesToAllocate * sizeof(BYTE) ); - if(!pFlagsNew) - { - HeapFree( GetProcessHeap(), 0, pPointsNew ); - return FALSE; - } - - /* Copy old arrays to new arrays and discard old arrays */ - if(pPath->pPoints) - { - assert(pPath->pFlags); + pPointsNew = HeapReAlloc( GetProcessHeap(), 0, pPath->pPoints, count * sizeof(POINT) ); + if (!pPointsNew) return FALSE; + pPath->pPoints = pPointsNew; - memcpy(pPointsNew, pPath->pPoints, - sizeof(POINT)*pPath->numEntriesUsed); - memcpy(pFlagsNew, pPath->pFlags, - sizeof(BYTE)*pPath->numEntriesUsed); + pFlagsNew = HeapReAlloc( GetProcessHeap(), 0, pPath->pFlags, count * sizeof(BYTE) ); + if (!pFlagsNew) return FALSE; + pPath->pFlags = pFlagsNew; - HeapFree( GetProcessHeap(), 0, pPath->pPoints ); - HeapFree( GetProcessHeap(), 0, pPath->pFlags ); - } - pPath->pPoints=pPointsNew; - pPath->pFlags=pFlagsNew; - pPath->numEntriesAllocated=numEntriesToAllocate; + pPath->numEntriesAllocated = count; } - return TRUE; }

1 0

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

Nov. 22, 2011

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

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

Nov. 22, 2011

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

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

Nov. 22, 2011

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