September 2007 - Wine-commits

Mikolaj Zalewski : ntdll: Add RtlAddAuditAccessAceEx.
by Alexandre Julliard 25 Sep '07

25 Sep '07

Module: wine Branch: master Commit: 04e688a26d9f7c93748edb4eac650fd03c6d2381 URL: http://source.winehq.org/git/wine.git/?a=commit;h=04e688a26d9f7c93748edb4ea… Author: Mikolaj Zalewski <mikolajz(a)google.com> Date: Mon Sep 24 17:20:36 2007 -0700 ntdll: Add RtlAddAuditAccessAceEx. --- dlls/ntdll/ntdll.spec | 4 ++-- dlls/ntdll/sec.c | 21 +++++++++++++++++---- include/winternl.h | 1 + 3 files changed, 20 insertions(+), 6 deletions(-) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 07abf1c..1c4a39d 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -402,8 +402,8 @@ @ stub RtlAddActionToRXact @ stdcall RtlAddAtomToAtomTable(ptr wstr ptr) @ stub RtlAddAttributeActionToRXact -@ stdcall RtlAddAuditAccessAce(ptr long long ptr long long) -# @ stub RtlAddAuditAccessAceEx +@ stdcall RtlAddAuditAccessAce(ptr long long ptr long long) +@ stdcall RtlAddAuditAccessAceEx(ptr long long long ptr long long) # @ stub RtlAddAuditAccessObjectAce # @ stub RtlAddCompoundAce # @ stub RtlAddRange diff --git a/dlls/ntdll/sec.c b/dlls/ntdll/sec.c index af89b72..0eaa9fe 100644 --- a/dlls/ntdll/sec.c +++ b/dlls/ntdll/sec.c @@ -1213,17 +1213,16 @@ NTSTATUS WINAPI RtlAddAccessDeniedAceEx( /************************************************************************** * RtlAddAuditAccessAce [NTDLL.@] */ -NTSTATUS WINAPI RtlAddAuditAccessAce( +NTSTATUS WINAPI RtlAddAuditAccessAceEx( IN OUT PACL pAcl, IN DWORD dwAceRevision, + IN DWORD dwAceFlags, IN DWORD dwAccessMask, IN PSID pSid, IN BOOL bAuditSuccess, IN BOOL bAuditFailure) { - DWORD dwAceFlags = 0; - - TRACE("(%p,%d,%d,%p,%u,%u)\n",pAcl,dwAceRevision,dwAccessMask, + TRACE("(%p,%d,0x%08x,0x%08x,%p,%u,%u)\n",pAcl,dwAceRevision,dwAceFlags,dwAccessMask, pSid,bAuditSuccess,bAuditFailure); if (bAuditSuccess) @@ -1235,6 +1234,20 @@ NTSTATUS WINAPI RtlAddAuditAccessAce( return add_access_ace(pAcl, dwAceRevision, dwAceFlags, dwAccessMask, pSid, SYSTEM_AUDIT_ACE_TYPE); } + +/************************************************************************** + * RtlAddAuditAccessAce [NTDLL.@] + */ +NTSTATUS WINAPI RtlAddAuditAccessAce( + IN OUT PACL pAcl, + IN DWORD dwAceRevision, + IN DWORD dwAccessMask, + IN PSID pSid, + IN BOOL bAuditSuccess, + IN BOOL bAuditFailure) +{ + return RtlAddAuditAccessAceEx(pAcl, dwAceRevision, 0, dwAccessMask, pSid, bAuditSuccess, bAuditFailure); +} /****************************************************************************** * RtlValidAcl [NTDLL.@] diff --git a/include/winternl.h b/include/winternl.h index 541eb58..88c36b1 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -1987,6 +1987,7 @@ NTSTATUS WINAPI RtlAddAccessDeniedAce(PACL,DWORD,DWORD,PSID); NTSTATUS WINAPI RtlAddAccessDeniedAceEx(PACL,DWORD,DWORD,DWORD,PSID); NTSTATUS WINAPI RtlAddAtomToAtomTable(RTL_ATOM_TABLE,const WCHAR*,RTL_ATOM*); NTSTATUS WINAPI RtlAddAuditAccessAce(PACL,DWORD,DWORD,PSID,BOOL,BOOL); +NTSTATUS WINAPI RtlAddAuditAccessAceEx(PACL,DWORD,DWORD,DWORD,PSID,BOOL,BOOL); void WINAPI RtlAddRefActivationContext(HANDLE); PVOID WINAPI RtlAddVectoredExceptionHandler(ULONG,PVECTORED_EXCEPTION_HANDLER); NTSTATUS WINAPI RtlAdjustPrivilege(ULONG,BOOLEAN,BOOLEAN,PBOOLEAN);

1 0

Mikolaj Zalewski : advapi32: Add AddAuditAccessAceEx.
by Alexandre Julliard 25 Sep '07

25 Sep '07

Module: wine Branch: master Commit: 57ca9ae92deeefe010426c8cc72a3fb48140caeb URL: http://source.winehq.org/git/wine.git/?a=commit;h=57ca9ae92deeefe010426c8cc… Author: Mikolaj Zalewski <mikolajz(a)google.com> Date: Mon Sep 24 17:30:30 2007 -0700 advapi32: Add AddAuditAccessAceEx. --- dlls/advapi32/advapi32.spec | 2 +- dlls/advapi32/security.c | 16 ++++++++++++++++ include/winbase.h | 1 + 3 files changed, 18 insertions(+), 1 deletions(-) diff --git a/dlls/advapi32/advapi32.spec b/dlls/advapi32/advapi32.spec index 20f333d..3078574 100644 --- a/dlls/advapi32/advapi32.spec +++ b/dlls/advapi32/advapi32.spec @@ -22,7 +22,7 @@ # @ stub AddAccessDeniedObjectAce @ stdcall AddAce(ptr long long ptr long) @ stdcall AddAuditAccessAce(ptr long long ptr long long) -# @ stub AddAuditAccessAceEx +@ stdcall AddAuditAccessAceEx(ptr long long long ptr long long) # @ stub AddAuditAccessObjectAce # @ stub AddUsersToEncryptedFile @ stdcall AdjustTokenGroups(long long ptr long ptr ptr) diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index 5e43203..5889213 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -2283,6 +2283,22 @@ BOOL WINAPI AddAuditAccessAce( } /****************************************************************************** + * AddAuditAccessAce [ADVAPI32.@] + */ +BOOL WINAPI AddAuditAccessAceEx( + IN OUT PACL pAcl, + IN DWORD dwAceRevision, + IN DWORD dwAceFlags, + IN DWORD dwAccessMask, + IN PSID pSid, + IN BOOL bAuditSuccess, + IN BOOL bAuditFailure) +{ + return set_ntstatus( RtlAddAuditAccessAceEx(pAcl, dwAceRevision, dwAceFlags, dwAccessMask, pSid, + bAuditSuccess, bAuditFailure) ); +} + +/****************************************************************************** * LookupAccountNameA [ADVAPI32.@] */ BOOL WINAPI diff --git a/include/winbase.h b/include/winbase.h index af6a38c..2ad4314 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -1243,6 +1243,7 @@ ATOM WINAPI AddAtomA(LPCSTR); ATOM WINAPI AddAtomW(LPCWSTR); #define AddAtom WINELIB_NAME_AW(AddAtom) BOOL WINAPI AddAuditAccessAce(PACL,DWORD,DWORD,PSID,BOOL,BOOL); +BOOL WINAPI AddAuditAccessAceEx(PACL,DWORD,DWORD,DWORD,PSID,BOOL,BOOL); VOID WINAPI AddRefActCtx(HANDLE); PVOID WINAPI AddVectoredExceptionHandler(ULONG,PVECTORED_EXCEPTION_HANDLER); BOOL WINAPI AdjustTokenGroups(HANDLE,BOOL,PTOKEN_GROUPS,DWORD,PTOKEN_GROUPS,PDWORD);

1 0

Mikolaj Zalewski : advapi32: Make ConvertStringSidToSid not to ignore the first subauthority.
by Alexandre Julliard 25 Sep '07

25 Sep '07

Module: wine Branch: master Commit: ff3ab48081e1e0ee5d195db74f190cac98dfcc5c URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff3ab48081e1e0ee5d195db74… Author: Mikolaj Zalewski <mikolajz(a)google.com> Date: Mon Sep 24 19:04:11 2007 -0700 advapi32: Make ConvertStringSidToSid not to ignore the first subauthority. --- dlls/advapi32/security.c | 4 ++-- dlls/advapi32/tests/security.c | 8 ++++++++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index 5889213..89e3d90 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -3900,12 +3900,12 @@ static BOOL ParseStringSidToSid(LPCWSTR StringSid, PSID pSid, LPDWORD cBytes) while (*StringSid) { + pisid->SubAuthority[i++] = atoiW(StringSid); + while (*StringSid && *StringSid != '-') StringSid++; if (*StringSid == '-') StringSid++; - - pisid->SubAuthority[i++] = atoiW(StringSid); } if (i != pisid->SubAuthorityCount) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 86c4c50..9e356ac 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -148,6 +148,7 @@ static void test_sid(void) const char noSubAuthStr[] = "S-1-5"; unsigned int i; PSID psid = NULL; + SID *pisid; BOOL r; LPSTR str = NULL; @@ -185,6 +186,13 @@ static void test_sid(void) "expected GetLastError() is ERROR_INVALID_SID, got %d\n", GetLastError() ); + ok(pConvertStringSidToSidA("S-1-5-21-93476-23408-4576", &psid), "ConvertStringSidToSidA failed\n"); + pisid = (SID *)psid; + ok(pisid->SubAuthorityCount == 4, "Invalid sub authority count - expected 4, got %d\n", pisid->SubAuthorityCount); + ok(pisid->SubAuthority[0] == 21, "Invalid subauthority 0 - expceted 21, got %d\n", pisid->SubAuthority[0]); + ok(pisid->SubAuthority[3] == 4576, "Invalid subauthority 0 - expceted 4576, got %d\n", pisid->SubAuthority[3]); + LocalFree(str); + for( i = 0; i < sizeof(refs) / sizeof(refs[0]); i++ ) { PISID pisid;

1 0

Alexandre Julliard : gdi32: Don' t hold the GDI lock while calling the driver mapping functions.
by Alexandre Julliard 25 Sep '07

25 Sep '07

Module: wine Branch: master Commit: a5a0d3c23b658bfb7f74891aa6e1833b420236e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a5a0d3c23b658bfb7f74891aa… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 24 18:16:15 2007 +0200 gdi32: Don't hold the GDI lock while calling the driver mapping functions. --- dlls/gdi32/mapping.c | 52 +++++++++++++++++++++++++------------------------- 1 files changed, 26 insertions(+), 26 deletions(-) diff --git a/dlls/gdi32/mapping.c b/dlls/gdi32/mapping.c index eccd8c9..234f695 100644 --- a/dlls/gdi32/mapping.c +++ b/dlls/gdi32/mapping.c @@ -62,7 +62,7 @@ static void MAPPING_FixIsotropic( DC * dc ) */ BOOL16 WINAPI DPtoLP16( HDC16 hdc, LPPOINT16 points, INT16 count ) { - DC * dc = DC_GetDCPtr( HDC_32(hdc) ); + DC * dc = get_dc_ptr( HDC_32(hdc) ); if (!dc) return FALSE; while (count--) @@ -71,7 +71,7 @@ BOOL16 WINAPI DPtoLP16( HDC16 hdc, LPPOINT16 points, INT16 count ) points->y = MulDiv( points->y - dc->vportOrgY, dc->wndExtY, dc->vportExtY ) + dc->wndOrgY; points++; } - DC_ReleaseDCPtr( dc ); + release_dc_ptr( dc ); return TRUE; } @@ -81,7 +81,7 @@ BOOL16 WINAPI DPtoLP16( HDC16 hdc, LPPOINT16 points, INT16 count ) */ BOOL WINAPI DPtoLP( HDC hdc, LPPOINT points, INT count ) { - DC * dc = DC_GetDCPtr( hdc ); + DC * dc = get_dc_ptr( hdc ); if (!dc) return FALSE; if (dc->vport2WorldValid) @@ -99,7 +99,7 @@ BOOL WINAPI DPtoLP( HDC hdc, LPPOINT points, INT count ) points++; } } - DC_ReleaseDCPtr( dc ); + release_dc_ptr( dc ); return (count < 0); } @@ -109,7 +109,7 @@ BOOL WINAPI DPtoLP( HDC hdc, LPPOINT points, INT count ) */ BOOL16 WINAPI LPtoDP16( HDC16 hdc, LPPOINT16 points, INT16 count ) { - DC * dc = DC_GetDCPtr( HDC_32(hdc) ); + DC * dc = get_dc_ptr( HDC_32(hdc) ); if (!dc) return FALSE; while (count--) @@ -118,7 +118,7 @@ BOOL16 WINAPI LPtoDP16( HDC16 hdc, LPPOINT16 points, INT16 count ) points->y = MulDiv( points->y - dc->wndOrgY, dc->vportExtY, dc->wndExtY ) + dc->vportOrgY; points++; } - DC_ReleaseDCPtr( dc ); + release_dc_ptr( dc ); return TRUE; } @@ -128,7 +128,7 @@ BOOL16 WINAPI LPtoDP16( HDC16 hdc, LPPOINT16 points, INT16 count ) */ BOOL WINAPI LPtoDP( HDC hdc, LPPOINT points, INT count ) { - DC * dc = DC_GetDCPtr( hdc ); + DC * dc = get_dc_ptr( hdc ); if (!dc) return FALSE; while (count--) @@ -143,7 +143,7 @@ BOOL WINAPI LPtoDP( HDC hdc, LPPOINT points, INT count ) dc->xformWorld2Vport.eDy + 0.5 ); points++; } - DC_ReleaseDCPtr( dc ); + release_dc_ptr( dc ); return TRUE; } @@ -156,7 +156,7 @@ INT WINAPI SetMapMode( HDC hdc, INT mode ) INT ret; INT horzSize, vertSize, horzRes, vertRes; - DC * dc = DC_GetDCPtr( hdc ); + DC * dc = get_dc_ptr( hdc ); if (!dc) return 0; if (dc->funcs->pSetMapMode) { @@ -226,7 +226,7 @@ INT WINAPI SetMapMode( HDC hdc, INT mode ) dc->MapMode = mode; DC_UpdateXforms( dc ); done: - DC_ReleaseDCPtr( dc ); + release_dc_ptr( dc ); return ret; } @@ -237,7 +237,7 @@ INT WINAPI SetMapMode( HDC hdc, INT mode ) BOOL WINAPI SetViewportExtEx( HDC hdc, INT x, INT y, LPSIZE size ) { INT ret = TRUE; - DC * dc = DC_GetDCPtr( hdc ); + DC * dc = get_dc_ptr( hdc ); if (!dc) return FALSE; if (dc->funcs->pSetViewportExt) { @@ -265,7 +265,7 @@ BOOL WINAPI SetViewportExtEx( HDC hdc, INT x, INT y, LPSIZE size ) if (dc->MapMode == MM_ISOTROPIC) MAPPING_FixIsotropic( dc ); DC_UpdateXforms( dc ); done: - DC_ReleaseDCPtr( dc ); + release_dc_ptr( dc ); return ret; } @@ -276,7 +276,7 @@ BOOL WINAPI SetViewportExtEx( HDC hdc, INT x, INT y, LPSIZE size ) BOOL WINAPI SetViewportOrgEx( HDC hdc, INT x, INT y, LPPOINT pt ) { INT ret = TRUE; - DC * dc = DC_GetDCPtr( hdc ); + DC * dc = get_dc_ptr( hdc ); if (!dc) return FALSE; if (dc->funcs->pSetViewportOrg) { @@ -297,7 +297,7 @@ BOOL WINAPI SetViewportOrgEx( HDC hdc, INT x, INT y, LPPOINT pt ) DC_UpdateXforms( dc ); done: - DC_ReleaseDCPtr( dc ); + release_dc_ptr( dc ); return ret; } @@ -308,7 +308,7 @@ BOOL WINAPI SetViewportOrgEx( HDC hdc, INT x, INT y, LPPOINT pt ) BOOL WINAPI SetWindowExtEx( HDC hdc, INT x, INT y, LPSIZE size ) { INT ret = TRUE; - DC * dc = DC_GetDCPtr( hdc ); + DC * dc = get_dc_ptr( hdc ); if (!dc) return FALSE; if (dc->funcs->pSetWindowExt) { @@ -339,7 +339,7 @@ BOOL WINAPI SetWindowExtEx( HDC hdc, INT x, INT y, LPSIZE size ) if (dc->MapMode == MM_ISOTROPIC) MAPPING_FixIsotropic( dc ); DC_UpdateXforms( dc ); done: - DC_ReleaseDCPtr( dc ); + release_dc_ptr( dc ); return ret; } @@ -350,7 +350,7 @@ BOOL WINAPI SetWindowExtEx( HDC hdc, INT x, INT y, LPSIZE size ) BOOL WINAPI SetWindowOrgEx( HDC hdc, INT x, INT y, LPPOINT pt ) { INT ret = TRUE; - DC * dc = DC_GetDCPtr( hdc ); + DC * dc = get_dc_ptr( hdc ); if (!dc) return FALSE; if (dc->funcs->pSetWindowOrg) { @@ -370,7 +370,7 @@ BOOL WINAPI SetWindowOrgEx( HDC hdc, INT x, INT y, LPPOINT pt ) dc->wndOrgY = y; DC_UpdateXforms( dc ); done: - DC_ReleaseDCPtr( dc ); + release_dc_ptr( dc ); return ret; } @@ -381,7 +381,7 @@ BOOL WINAPI SetWindowOrgEx( HDC hdc, INT x, INT y, LPPOINT pt ) BOOL WINAPI OffsetViewportOrgEx( HDC hdc, INT x, INT y, LPPOINT pt) { INT ret = TRUE; - DC * dc = DC_GetDCPtr( hdc ); + DC * dc = get_dc_ptr( hdc ); if (!dc) return FALSE; if (dc->funcs->pOffsetViewportOrg) { @@ -401,7 +401,7 @@ BOOL WINAPI OffsetViewportOrgEx( HDC hdc, INT x, INT y, LPPOINT pt) dc->vportOrgY += y; DC_UpdateXforms( dc ); done: - DC_ReleaseDCPtr( dc ); + release_dc_ptr( dc ); return ret; } @@ -412,7 +412,7 @@ BOOL WINAPI OffsetViewportOrgEx( HDC hdc, INT x, INT y, LPPOINT pt) BOOL WINAPI OffsetWindowOrgEx( HDC hdc, INT x, INT y, LPPOINT pt ) { INT ret = TRUE; - DC * dc = DC_GetDCPtr( hdc ); + DC * dc = get_dc_ptr( hdc ); if (!dc) return FALSE; if (dc->funcs->pOffsetWindowOrg) { @@ -432,7 +432,7 @@ BOOL WINAPI OffsetWindowOrgEx( HDC hdc, INT x, INT y, LPPOINT pt ) dc->wndOrgY += y; DC_UpdateXforms( dc ); done: - DC_ReleaseDCPtr( dc ); + release_dc_ptr( dc ); return ret; } @@ -444,7 +444,7 @@ BOOL WINAPI ScaleViewportExtEx( HDC hdc, INT xNum, INT xDenom, INT yNum, INT yDenom, LPSIZE size ) { INT ret = TRUE; - DC * dc = DC_GetDCPtr( hdc ); + DC * dc = get_dc_ptr( hdc ); if (!dc) return FALSE; if (dc->funcs->pScaleViewportExt) { @@ -474,7 +474,7 @@ BOOL WINAPI ScaleViewportExtEx( HDC hdc, INT xNum, INT xDenom, if (dc->MapMode == MM_ISOTROPIC) MAPPING_FixIsotropic( dc ); DC_UpdateXforms( dc ); done: - DC_ReleaseDCPtr( dc ); + release_dc_ptr( dc ); return ret; } @@ -486,7 +486,7 @@ BOOL WINAPI ScaleWindowExtEx( HDC hdc, INT xNum, INT xDenom, INT yNum, INT yDenom, LPSIZE size ) { INT ret = TRUE; - DC * dc = DC_GetDCPtr( hdc ); + DC * dc = get_dc_ptr( hdc ); if (!dc) return FALSE; if (dc->funcs->pScaleWindowExt) { @@ -516,6 +516,6 @@ BOOL WINAPI ScaleWindowExtEx( HDC hdc, INT xNum, INT xDenom, if (dc->MapMode == MM_ISOTROPIC) MAPPING_FixIsotropic( dc ); DC_UpdateXforms( dc ); done: - DC_ReleaseDCPtr( dc ); + release_dc_ptr( dc ); return ret; }

1 0

Alexandre Julliard : gdi32: Don' t hold the GDI lock while calling the driver path functions.
by Alexandre Julliard 25 Sep '07

25 Sep '07

Module: wine Branch: master Commit: 0c4f81eefca57261aee954a4ce06fba8abb947b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c4f81eefca57261aee954a4c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 24 18:16:29 2007 +0200 gdi32: Don't hold the GDI lock while calling the driver path functions. --- dlls/gdi32/path.c | 48 ++++++++++++++++++++++++------------------------ 1 files changed, 24 insertions(+), 24 deletions(-) diff --git a/dlls/gdi32/path.c b/dlls/gdi32/path.c index b887a86..683bdba 100644 --- a/dlls/gdi32/path.c +++ b/dlls/gdi32/path.c @@ -129,7 +129,7 @@ static inline void INTERNAL_LPTODP_FLOAT(DC *dc, FLOAT_POINT *point) BOOL WINAPI BeginPath(HDC hdc) { BOOL ret = TRUE; - DC *dc = DC_GetDCPtr( hdc ); + DC *dc = get_dc_ptr( hdc ); if(!dc) return FALSE; @@ -148,7 +148,7 @@ BOOL WINAPI BeginPath(HDC hdc) dc->path.state=PATH_Open; } } - DC_ReleaseDCPtr( dc ); + release_dc_ptr( dc ); return ret; } @@ -159,7 +159,7 @@ BOOL WINAPI BeginPath(HDC hdc) BOOL WINAPI EndPath(HDC hdc) { BOOL ret = TRUE; - DC *dc = DC_GetDCPtr( hdc ); + DC *dc = get_dc_ptr( hdc ); if(!dc) return FALSE; @@ -176,7 +176,7 @@ BOOL WINAPI EndPath(HDC hdc) /* Set flag to indicate that path is finished */ else dc->path.state=PATH_Closed; } - DC_ReleaseDCPtr( dc ); + release_dc_ptr( dc ); return ret; } @@ -198,7 +198,7 @@ BOOL WINAPI EndPath(HDC hdc) BOOL WINAPI AbortPath( HDC hdc ) { BOOL ret = TRUE; - DC *dc = DC_GetDCPtr( hdc ); + DC *dc = get_dc_ptr( hdc ); if(!dc) return FALSE; @@ -206,7 +206,7 @@ BOOL WINAPI AbortPath( HDC hdc ) ret = dc->funcs->pAbortPath(dc->physDev); else /* Remove all entries from the path */ PATH_EmptyPath( &dc->path ); - DC_ReleaseDCPtr( dc ); + release_dc_ptr( dc ); return ret; } @@ -219,7 +219,7 @@ BOOL WINAPI AbortPath( HDC hdc ) BOOL WINAPI CloseFigure(HDC hdc) { BOOL ret = TRUE; - DC *dc = DC_GetDCPtr( hdc ); + DC *dc = get_dc_ptr( hdc ); if(!dc) return FALSE; @@ -245,7 +245,7 @@ BOOL WINAPI CloseFigure(HDC hdc) } } } - DC_ReleaseDCPtr( dc ); + release_dc_ptr( dc ); return ret; } @@ -258,7 +258,7 @@ INT WINAPI GetPath(HDC hdc, LPPOINT pPoints, LPBYTE pTypes, { INT ret = -1; GdiPath *pPath; - DC *dc = DC_GetDCPtr( hdc ); + DC *dc = get_dc_ptr( hdc ); if(!dc) return -1; @@ -293,7 +293,7 @@ INT WINAPI GetPath(HDC hdc, LPPOINT pPoints, LPBYTE pTypes, else ret = pPath->numEntriesUsed; } done: - DC_ReleaseDCPtr( dc ); + release_dc_ptr( dc ); return ret; } @@ -311,7 +311,7 @@ HRGN WINAPI PathToRegion(HDC hdc) { GdiPath *pPath; HRGN hrgnRval = 0; - DC *dc = DC_GetDCPtr( hdc ); + DC *dc = get_dc_ptr( hdc ); /* Get pointer to path */ if(!dc) return 0; @@ -328,7 +328,7 @@ HRGN WINAPI PathToRegion(HDC hdc) else hrgnRval=0; } - DC_ReleaseDCPtr( dc ); + release_dc_ptr( dc ); return hrgnRval; } @@ -414,7 +414,7 @@ static BOOL PATH_FillPath(DC *dc, GdiPath *pPath) */ BOOL WINAPI FillPath(HDC hdc) { - DC *dc = DC_GetDCPtr( hdc ); + DC *dc = get_dc_ptr( hdc ); BOOL bRet = FALSE; if(!dc) return FALSE; @@ -431,7 +431,7 @@ BOOL WINAPI FillPath(HDC hdc) PATH_EmptyPath(&dc->path); } } - DC_ReleaseDCPtr( dc ); + release_dc_ptr( dc ); return bRet; } @@ -446,7 +446,7 @@ BOOL WINAPI SelectClipPath(HDC hdc, INT iMode) GdiPath *pPath; HRGN hrgnPath; BOOL success = FALSE; - DC *dc = DC_GetDCPtr( hdc ); + DC *dc = get_dc_ptr( hdc ); if(!dc) return FALSE; @@ -471,7 +471,7 @@ BOOL WINAPI SelectClipPath(HDC hdc, INT iMode) /* FIXME: Should this function delete the path even if it failed? */ } } - DC_ReleaseDCPtr( dc ); + release_dc_ptr( dc ); return success; } @@ -1698,7 +1698,7 @@ static void PATH_NormalizePoint(FLOAT_POINT corners[], BOOL WINAPI FlattenPath(HDC hdc) { BOOL ret = FALSE; - DC *dc = DC_GetDCPtr( hdc ); + DC *dc = get_dc_ptr( hdc ); if(!dc) return FALSE; @@ -1709,7 +1709,7 @@ BOOL WINAPI FlattenPath(HDC hdc) if(pPath->state != PATH_Closed) ret = PATH_FlattenPath(pPath); } - DC_ReleaseDCPtr( dc ); + release_dc_ptr( dc ); return ret; } @@ -2191,7 +2191,7 @@ static BOOL PATH_WidenPath(DC *dc) */ BOOL WINAPI StrokeAndFillPath(HDC hdc) { - DC *dc = DC_GetDCPtr( hdc ); + DC *dc = get_dc_ptr( hdc ); BOOL bRet = FALSE; if(!dc) return FALSE; @@ -2204,7 +2204,7 @@ BOOL WINAPI StrokeAndFillPath(HDC hdc) if(bRet) bRet = PATH_StrokePath(dc, &dc->path); if(bRet) PATH_EmptyPath(&dc->path); } - DC_ReleaseDCPtr( dc ); + release_dc_ptr( dc ); return bRet; } @@ -2216,7 +2216,7 @@ BOOL WINAPI StrokeAndFillPath(HDC hdc) */ BOOL WINAPI StrokePath(HDC hdc) { - DC *dc = DC_GetDCPtr( hdc ); + DC *dc = get_dc_ptr( hdc ); GdiPath *pPath; BOOL bRet = FALSE; @@ -2231,7 +2231,7 @@ BOOL WINAPI StrokePath(HDC hdc) bRet = PATH_StrokePath(dc, pPath); PATH_EmptyPath(pPath); } - DC_ReleaseDCPtr( dc ); + release_dc_ptr( dc ); return bRet; } @@ -2243,7 +2243,7 @@ BOOL WINAPI StrokePath(HDC hdc) */ BOOL WINAPI WidenPath(HDC hdc) { - DC *dc = DC_GetDCPtr( hdc ); + DC *dc = get_dc_ptr( hdc ); BOOL ret = FALSE; if(!dc) return FALSE; @@ -2252,6 +2252,6 @@ BOOL WINAPI WidenPath(HDC hdc) ret = dc->funcs->pWidenPath(dc->physDev); else ret = PATH_WidenPath(dc); - DC_ReleaseDCPtr( dc ); + release_dc_ptr( dc ); return ret; }

1 0

Alexandre Julliard : gdi32: Don' t hold the GDI lock while calling the driver painting functions.
by Alexandre Julliard 25 Sep '07

25 Sep '07

Module: wine Branch: master Commit: 5557fac1c3cbcee29742f6eb2474ffdda1d46bbc URL: http://source.winehq.org/git/wine.git/?a=commit;h=5557fac1c3cbcee29742f6eb2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 24 18:16:48 2007 +0200 gdi32: Don't hold the GDI lock while calling the driver painting functions. --- dlls/gdi32/painting.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/gdi32/painting.c b/dlls/gdi32/painting.c index 1b8d6aa..72d8183 100644 --- a/dlls/gdi32/painting.c +++ b/dlls/gdi32/painting.c @@ -67,7 +67,7 @@ BOOL WINAPI LineTo( HDC hdc, INT x, INT y ) BOOL WINAPI MoveToEx( HDC hdc, INT x, INT y, LPPOINT pt ) { BOOL ret = TRUE; - DC * dc = DC_GetDCPtr( hdc ); + DC * dc = get_dc_ptr( hdc ); if(!dc) return FALSE; @@ -80,7 +80,7 @@ BOOL WINAPI MoveToEx( HDC hdc, INT x, INT y, LPPOINT pt ) if(PATH_IsPathOpen(dc->path)) ret = PATH_MoveTo(dc); else if (dc->funcs->pMoveTo) ret = dc->funcs->pMoveTo(dc->physDev,x,y); - DC_ReleaseDCPtr( dc ); + release_dc_ptr( dc ); return ret; } @@ -335,7 +335,7 @@ COLORREF WINAPI GetPixel( HDC hdc, INT x, INT y ) INT WINAPI ChoosePixelFormat( HDC hdc, const PIXELFORMATDESCRIPTOR* ppfd ) { INT ret = 0; - DC * dc = DC_GetDCPtr( hdc ); + DC * dc = get_dc_ptr( hdc ); TRACE("(%p,%p)\n",hdc,ppfd); @@ -344,7 +344,7 @@ INT WINAPI ChoosePixelFormat( HDC hdc, const PIXELFORMATDESCRIPTOR* ppfd ) if (!dc->funcs->pChoosePixelFormat) FIXME(" :stub\n"); else ret = dc->funcs->pChoosePixelFormat(dc->physDev,ppfd); - DC_ReleaseDCPtr( dc ); + release_dc_ptr( dc ); return ret; } @@ -427,7 +427,7 @@ INT WINAPI DescribePixelFormat( HDC hdc, INT iPixelFormat, UINT nBytes, LPPIXELFORMATDESCRIPTOR ppfd ) { INT ret = 0; - DC * dc = DC_GetDCPtr( hdc ); + DC * dc = get_dc_ptr( hdc ); TRACE("(%p,%d,%d,%p): stub\n",hdc,iPixelFormat,nBytes,ppfd); @@ -442,7 +442,7 @@ INT WINAPI DescribePixelFormat( HDC hdc, INT iPixelFormat, UINT nBytes, } else ret = dc->funcs->pDescribePixelFormat(dc->physDev,iPixelFormat,nBytes,ppfd); - DC_ReleaseDCPtr( dc ); + release_dc_ptr( dc ); return ret; }

1 0

Alexandre Julliard : gdi32: Don' t hold the GDI lock while calling the driver OpenGL functions.
by Alexandre Julliard 25 Sep '07

25 Sep '07

Module: wine Branch: master Commit: 2e2df3faf3d51878067bee4168ffc6248d783afc URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e2df3faf3d51878067bee416… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 24 18:17:21 2007 +0200 gdi32: Don't hold the GDI lock while calling the driver OpenGL functions. --- dlls/gdi32/opengl.c | 26 +++++++++++++------------- 1 files changed, 13 insertions(+), 13 deletions(-) diff --git a/dlls/gdi32/opengl.c b/dlls/gdi32/opengl.c index 164f279..aebf17a 100644 --- a/dlls/gdi32/opengl.c +++ b/dlls/gdi32/opengl.c @@ -47,7 +47,7 @@ typedef struct opengl_context /* We route all wgl functions from opengl32.dll through gdi32.dll to * the display driver. Various wgl calls have a hDC as one of their parameters. - * Using DC_GetDCPtr we get access to the functions exported by the driver. + * Using get_dc_ptr we get access to the functions exported by the driver. * Some functions don't receive a hDC. This function creates a global hdc and * if there's already a global hdc, it returns it. */ @@ -94,13 +94,13 @@ BOOL WINAPI wglDeleteContext(HGLRC hglrc) return FALSE; /* Retrieve the HDC associated with the context to access the display driver */ - dc = DC_GetDCPtr(ctx->hdc); + dc = get_dc_ptr(ctx->hdc); if (!dc) return FALSE; if (!dc->funcs->pwglDeleteContext) FIXME(" :stub\n"); else ret = dc->funcs->pwglDeleteContext(hglrc); - DC_ReleaseDCPtr( dc ); + release_dc_ptr( dc ); return ret; } @@ -139,7 +139,7 @@ static HDC WINAPI wglGetPbufferDCARB(void *pbuffer) /* Create a device context to associate with the pbuffer */ HDC hdc = CreateDCA("DISPLAY", NULL, NULL, NULL); - DC *dc = DC_GetDCPtr(hdc); + DC *dc = get_dc_ptr(hdc); TRACE("(%p)\n", pbuffer); @@ -152,8 +152,8 @@ static HDC WINAPI wglGetPbufferDCARB(void *pbuffer) else ret = dc->funcs->pwglGetPbufferDCARB(dc->physDev, pbuffer); TRACE("(%p), hdc=%p\n", pbuffer, ret); - - DC_ReleaseDCPtr( dc ); + + release_dc_ptr( dc ); return ret; } @@ -227,15 +227,15 @@ BOOL WINAPI wglShareLists(HGLRC hglrc1, HGLRC hglrc2) TRACE("hglrc1: (%p); hglrc: (%p)\n", hglrc1, hglrc2); if(ctx == NULL) return FALSE; - + /* Retrieve the HDC associated with the context to access the display driver */ - dc = DC_GetDCPtr(ctx->hdc); + dc = get_dc_ptr(ctx->hdc); if (!dc) return FALSE; if (!dc->funcs->pwglShareLists) FIXME(" :stub\n"); else ret = dc->funcs->pwglShareLists(hglrc1, hglrc2); - DC_ReleaseDCPtr( dc ); + release_dc_ptr( dc ); return ret; } @@ -245,7 +245,7 @@ BOOL WINAPI wglShareLists(HGLRC hglrc1, HGLRC hglrc2) BOOL WINAPI wglUseFontBitmapsA(HDC hdc, DWORD first, DWORD count, DWORD listBase) { BOOL ret = FALSE; - DC * dc = DC_GetDCPtr( hdc ); + DC * dc = get_dc_ptr( hdc ); TRACE("(%p, %d, %d, %d)\n", hdc, first, count, listBase); @@ -254,7 +254,7 @@ BOOL WINAPI wglUseFontBitmapsA(HDC hdc, DWORD first, DWORD count, DWORD listBase if (!dc->funcs->pwglUseFontBitmapsA) FIXME(" :stub\n"); else ret = dc->funcs->pwglUseFontBitmapsA(dc->physDev, first, count, listBase); - DC_ReleaseDCPtr( dc ); + release_dc_ptr( dc ); return ret; } @@ -264,7 +264,7 @@ BOOL WINAPI wglUseFontBitmapsA(HDC hdc, DWORD first, DWORD count, DWORD listBase BOOL WINAPI wglUseFontBitmapsW(HDC hdc, DWORD first, DWORD count, DWORD listBase) { BOOL ret = FALSE; - DC * dc = DC_GetDCPtr( hdc ); + DC * dc = get_dc_ptr( hdc ); TRACE("(%p, %d, %d, %d)\n", hdc, first, count, listBase); @@ -273,7 +273,7 @@ BOOL WINAPI wglUseFontBitmapsW(HDC hdc, DWORD first, DWORD count, DWORD listBase if (!dc->funcs->pwglUseFontBitmapsW) FIXME(" :stub\n"); else ret = dc->funcs->pwglUseFontBitmapsW(dc->physDev, first, count, listBase); - DC_ReleaseDCPtr( dc ); + release_dc_ptr( dc ); return ret; }

1 0

Alexandre Julliard : gdi32: Don' t hold the GDI lock while calling the driver clipping functions.
by Alexandre Julliard 25 Sep '07

25 Sep '07

Module: wine Branch: master Commit: b12a782e5f59edde48c2a3a67b0c77c9c295717a URL: http://source.winehq.org/git/wine.git/?a=commit;h=b12a782e5f59edde48c2a3a67… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 24 18:19:14 2007 +0200 gdi32: Don't hold the GDI lock while calling the driver clipping functions. --- dlls/gdi32/clipping.c | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/gdi32/clipping.c b/dlls/gdi32/clipping.c index 8b019c6..2c53dfb 100644 --- a/dlls/gdi32/clipping.c +++ b/dlls/gdi32/clipping.c @@ -172,7 +172,7 @@ INT16 WINAPI SelectVisRgn16( HDC16 hdc16, HRGN16 hrgn ) DC * dc; if (!hrgn) return ERROR; - if (!(dc = DC_GetDCPtr( hdc ))) return ERROR; + if (!(dc = get_dc_ptr( hdc ))) return ERROR; TRACE("%p %04x\n", hdc, hrgn ); @@ -180,7 +180,7 @@ INT16 WINAPI SelectVisRgn16( HDC16 hdc16, HRGN16 hrgn ) retval = CombineRgn( dc->hVisRgn, HRGN_32(hrgn), 0, RGN_COPY ); CLIPPING_UpdateGCRegion( dc ); - DC_ReleaseDCPtr( dc ); + release_dc_ptr( dc ); return retval; } @@ -478,14 +478,14 @@ INT WINAPI GetClipRgn( HDC hdc, HRGN hRgn ) { INT ret = -1; DC * dc; - if (hRgn && (dc = DC_GetDCPtr( hdc ))) + if (hRgn && (dc = get_dc_ptr( hdc ))) { if( dc->hClipRgn ) { if( CombineRgn(hRgn, dc->hClipRgn, 0, RGN_COPY) != ERROR ) ret = 1; } else ret = 0; - DC_ReleaseDCPtr( dc ); + release_dc_ptr( dc ); } return ret; } @@ -497,13 +497,13 @@ INT WINAPI GetClipRgn( HDC hdc, HRGN hRgn ) INT WINAPI GetMetaRgn( HDC hdc, HRGN hRgn ) { INT ret = 0; - DC * dc = DC_GetDCPtr( hdc ); + DC * dc = get_dc_ptr( hdc ); if (dc) { if (dc->hMetaRgn && CombineRgn( hRgn, dc->hMetaRgn, 0, RGN_COPY ) != ERROR) ret = 1; - DC_ReleaseDCPtr( dc ); + release_dc_ptr( dc ); } return ret; } @@ -544,7 +544,7 @@ INT16 WINAPI RestoreVisRgn16( HDC16 hdc16 ) { struct saved_visrgn *saved; HDC hdc = HDC_32( hdc16 ); - DC *dc = DC_GetDCPtr( hdc ); + DC *dc = get_dc_ptr( hdc ); INT16 ret = ERROR; if (!dc) return ERROR; @@ -559,7 +559,7 @@ INT16 WINAPI RestoreVisRgn16( HDC16 hdc16 ) HeapFree( GetProcessHeap(), 0, saved ); CLIPPING_UpdateGCRegion( dc ); done: - DC_ReleaseDCPtr( dc ); + release_dc_ptr( dc ); return ret; } @@ -628,7 +628,7 @@ INT WINAPI SetMetaRgn( HDC hdc ) { INT ret; RECT dummy; - DC *dc = DC_GetDCPtr( hdc ); + DC *dc = get_dc_ptr( hdc ); if (!dc) return ERROR; @@ -651,6 +651,6 @@ INT WINAPI SetMetaRgn( HDC hdc ) /* Note: no need to call CLIPPING_UpdateGCRegion, the overall clip region hasn't changed */ ret = GetRgnBox( dc->hMetaRgn, &dummy ); - DC_ReleaseDCPtr( dc ); + release_dc_ptr( dc ); return ret; }

1 0

Alexandre Julliard : gdi32: Don' t hold the GDI lock while calling the driver printer functions.
by Alexandre Julliard 25 Sep '07

25 Sep '07

Module: wine Branch: master Commit: 58c6bab9c95c939774be59f9bc0b18b263deea8c URL: http://source.winehq.org/git/wine.git/?a=commit;h=58c6bab9c95c939774be59f9b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 24 18:23:42 2007 +0200 gdi32: Don't hold the GDI lock while calling the driver printer functions. --- dlls/gdi32/driver.c | 20 ++++++++---------- dlls/gdi32/printdrv.c | 50 +++++++++++++++++++++--------------------------- 2 files changed, 31 insertions(+), 39 deletions(-) diff --git a/dlls/gdi32/driver.c b/dlls/gdi32/driver.c index 465adc1..8dc14fe 100644 --- a/dlls/gdi32/driver.c +++ b/dlls/gdi32/driver.c @@ -497,7 +497,6 @@ INT WINAPI GDI_CallExtDeviceMode16( HWND hwnd, HDC hdc; DC *dc; INT ret = -1; - INT (*pExtDeviceMode)(LPSTR,HWND,LPDEVMODEA,LPSTR,LPSTR,LPDEVMODEA,LPSTR,DWORD); TRACE("(%p, %p, %s, %s, %p, %s, %d)\n", hwnd, lpdmOutput, lpszDevice, lpszPort, lpdmInput, lpszProfile, fwMode ); @@ -511,13 +510,12 @@ INT WINAPI GDI_CallExtDeviceMode16( HWND hwnd, if (!(hdc = CreateICA( buf, lpszDevice, lpszPort, NULL ))) return -1; - if ((dc = DC_GetDCPtr( hdc ))) + if ((dc = get_dc_ptr( hdc ))) { - pExtDeviceMode = dc->funcs->pExtDeviceMode; - DC_ReleaseDCPtr( dc ); - if (pExtDeviceMode) - ret = pExtDeviceMode(buf, hwnd, lpdmOutput, lpszDevice, lpszPort, - lpdmInput, lpszProfile, fwMode); + if (dc->funcs->pExtDeviceMode) + ret = dc->funcs->pExtDeviceMode( buf, hwnd, lpdmOutput, lpszDevice, lpszPort, + lpdmInput, lpszProfile, fwMode ); + release_dc_ptr( dc ); } DeleteDC( hdc ); return ret; @@ -566,12 +564,12 @@ DWORD WINAPI GDI_CallDeviceCapabilities16( LPCSTR lpszDevice, LPCSTR lpszPort, if (!(hdc = CreateICA( buf, lpszDevice, lpszPort, NULL ))) return -1; - if ((dc = DC_GetDCPtr( hdc ))) + if ((dc = get_dc_ptr( hdc ))) { if (dc->funcs->pDeviceCapabilities) ret = dc->funcs->pDeviceCapabilities( buf, lpszDevice, lpszPort, fwCapability, lpszOutput, lpdm ); - DC_ReleaseDCPtr( dc ); + release_dc_ptr( dc ); } DeleteDC( hdc ); return ret; @@ -695,12 +693,12 @@ INT WINAPI ExtEscape( HDC hdc, INT nEscape, INT cbInput, LPCSTR lpszInData, INT cbOutput, LPSTR lpszOutData ) { INT ret = 0; - DC * dc = DC_GetDCPtr( hdc ); + DC * dc = get_dc_ptr( hdc ); if (dc) { if (dc->funcs->pExtEscape) ret = dc->funcs->pExtEscape( dc->physDev, nEscape, cbInput, lpszInData, cbOutput, lpszOutData ); - DC_ReleaseDCPtr( dc ); + release_dc_ptr( dc ); } return ret; } diff --git a/dlls/gdi32/printdrv.c b/dlls/gdi32/printdrv.c index 9444536..bdd754f 100644 --- a/dlls/gdi32/printdrv.c +++ b/dlls/gdi32/printdrv.c @@ -71,7 +71,7 @@ static const char Printers[] = "System\\CurrentControlSet\\Control\\Pri INT WINAPI StartDocW(HDC hdc, const DOCINFOW* doc) { INT ret = 0; - DC *dc = DC_GetDCPtr( hdc ); + DC *dc = get_dc_ptr( hdc ); TRACE("DocName = %s Output = %s Datatype = %s\n", debugstr_w(doc->lpszDocName), debugstr_w(doc->lpszOutput), @@ -80,7 +80,7 @@ INT WINAPI StartDocW(HDC hdc, const DOCINFOW* doc) if(!dc) return SP_ERROR; if (dc->funcs->pStartDoc) ret = dc->funcs->pStartDoc( dc->physDev, doc ); - DC_ReleaseDCPtr( dc ); + release_dc_ptr( dc ); return ret; } @@ -136,11 +136,11 @@ INT WINAPI StartDocA(HDC hdc, const DOCINFOA* doc) INT WINAPI EndDoc(HDC hdc) { INT ret = 0; - DC *dc = DC_GetDCPtr( hdc ); + DC *dc = get_dc_ptr( hdc ); if(!dc) return SP_ERROR; if (dc->funcs->pEndDoc) ret = dc->funcs->pEndDoc( dc->physDev ); - DC_ReleaseDCPtr( dc ); + release_dc_ptr( dc ); return ret; } @@ -152,14 +152,14 @@ INT WINAPI EndDoc(HDC hdc) INT WINAPI StartPage(HDC hdc) { INT ret = 1; - DC *dc = DC_GetDCPtr( hdc ); + DC *dc = get_dc_ptr( hdc ); if(!dc) return SP_ERROR; if(dc->funcs->pStartPage) ret = dc->funcs->pStartPage( dc->physDev ); else FIXME("stub\n"); - DC_ReleaseDCPtr( dc ); + release_dc_ptr( dc ); return ret; } @@ -170,19 +170,17 @@ INT WINAPI StartPage(HDC hdc) */ INT WINAPI EndPage(HDC hdc) { - ABORTPROC abort_proc; INT ret = 0; - DC *dc = DC_GetDCPtr( hdc ); + DC *dc = get_dc_ptr( hdc ); if(!dc) return SP_ERROR; if (dc->funcs->pEndPage) ret = dc->funcs->pEndPage( dc->physDev ); - abort_proc = dc->pAbortProc; - DC_ReleaseDCPtr( dc ); - if (abort_proc && !abort_proc( hdc, 0 )) + if (dc->pAbortProc && !dc->pAbortProc( hdc, 0 )) { EndDoc( hdc ); ret = 0; } + release_dc_ptr( dc ); return ret; } @@ -193,11 +191,11 @@ INT WINAPI EndPage(HDC hdc) INT WINAPI AbortDoc(HDC hdc) { INT ret = 0; - DC *dc = DC_GetDCPtr( hdc ); + DC *dc = get_dc_ptr( hdc ); if(!dc) return SP_ERROR; if (dc->funcs->pAbortDoc) ret = dc->funcs->pAbortDoc( dc->physDev ); - DC_ReleaseDCPtr( dc ); + release_dc_ptr( dc ); return ret; } @@ -214,19 +212,14 @@ BOOL16 WINAPI QueryAbort16(HDC16 hdc16, INT16 reserved) { BOOL ret = TRUE; HDC hdc = HDC_32( hdc16 ); - DC *dc = DC_GetDCPtr( hdc ); - ABORTPROC abproc; + DC *dc = get_dc_ptr( hdc ); if(!dc) { ERR("Invalid hdc %p\n", hdc); return FALSE; } - - abproc = dc->pAbortProc; - DC_ReleaseDCPtr( dc ); - - if (abproc) - ret = abproc(hdc, 0); + if (dc->pAbortProc) ret = dc->pAbortProc(hdc, 0); + release_dc_ptr( dc ); return ret; } @@ -237,11 +230,11 @@ BOOL16 WINAPI QueryAbort16(HDC16 hdc16, INT16 reserved) static BOOL CALLBACK call_abort_proc16( HDC hdc, INT code ) { ABORTPROC16 proc16; - DC *dc = DC_GetDCPtr( hdc ); + DC *dc = get_dc_ptr( hdc ); if (!dc) return FALSE; proc16 = dc->pAbortProc16; - DC_ReleaseDCPtr( dc ); + release_dc_ptr( dc ); if (proc16) { WORD args[2]; @@ -262,12 +255,13 @@ static BOOL CALLBACK call_abort_proc16( HDC hdc, INT code ) INT16 WINAPI SetAbortProc16(HDC16 hdc16, ABORTPROC16 abrtprc) { HDC hdc = HDC_32( hdc16 ); - DC *dc = DC_GetDCPtr( hdc ); + DC *dc = get_dc_ptr( hdc ); if (!dc) return FALSE; dc->pAbortProc16 = abrtprc; - DC_ReleaseDCPtr( dc ); - return SetAbortProc( hdc, call_abort_proc16 ); + dc->pAbortProc = call_abort_proc16; + release_dc_ptr( dc ); + return TRUE; } /********************************************************************** @@ -276,11 +270,11 @@ INT16 WINAPI SetAbortProc16(HDC16 hdc16, ABORTPROC16 abrtprc) */ INT WINAPI SetAbortProc(HDC hdc, ABORTPROC abrtprc) { - DC *dc = DC_GetDCPtr( hdc ); + DC *dc = get_dc_ptr( hdc ); if (!dc) return FALSE; dc->pAbortProc = abrtprc; - DC_ReleaseDCPtr( dc ); + release_dc_ptr( dc ); return TRUE; }

1 0

Chris Morgan : We can't use $aArray += $oObject to add a single object to an array, switch to $aArray[] = $oObject instead
by Chris Morgan 25 Sep '07

25 Sep '07

Module: appdb Branch: master Commit: f378e0b4b5c1b2d222aca1f2fa37805f6ebfaafd URL: http://source.winehq.org/git/appdb.git/?a=commit;h=f378e0b4b5c1b2d222aca1f2… Author: Chris Morgan <cmorgan(a)alum.wpi.edu> Date: Mon Sep 24 22:25:49 2007 -0400 We can't use $aArray += $oObject to add a single object to an array, switch to $aArray[] = $oObject instead --- include/distribution.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/distribution.php b/include/distribution.php index 52c08a9..a51cdef 100644 --- a/include/distribution.php +++ b/include/distribution.php @@ -224,7 +224,7 @@ class distribution { $hResult = query_parameters($sQuery, $this->iDistributionId); while($oRow = mysql_fetch_object($hResult)) - $aTests += new testData(null, $oRow); + $aTests[] = new testData(null, $oRow); return $aTests; }

1 0