Ros-diffs

ros-diffs@reactos.org

81390 discussions

[tkreuzer] 42490: NtUserGetIconInfo: Move lockingunlocking out of SEH, as this is a bad idea. Get rid of RETURN(). Add a comment.
by tkreuzer＠svn.reactos.org 08 Aug '09

08 Aug '09

Author: tkreuzer Date: Sat Aug 8 04:47:32 2009 New Revision: 42490 URL: http://svn.reactos.org/svn/reactos?rev=42490&view=rev Log: NtUserGetIconInfo: Move lockingunlocking out of SEH, as this is a bad idea. Get rid of RETURN(). Add a comment. Modified: trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c [iso-8859-1] Sat Aug 8 04:47:32 2009 @@ -434,6 +434,7 @@ /* Copy bitmaps and size info */ if (Indirect) { + // FIXME: WTF? CurIcon->IconInfo.hbmMask = BITMAP_CopyBitmap(CurIcon->IconInfo.hbmMask); CurIcon->IconInfo.hbmColor = BITMAP_CopyBitmap(CurIcon->IconInfo.hbmColor); } @@ -496,10 +497,9 @@ { ICONINFO ii; PCURICON_OBJECT CurIcon; - PWINSTATION_OBJECT WinSta; NTSTATUS Status = STATUS_SUCCESS; BOOL Ret = FALSE; - DECLARE_RETURN(BOOL); + DWORD colorBpp = 0; DPRINT("Enter NtUserGetIconInfo\n"); UserEnterExclusive(); @@ -507,19 +507,12 @@ if (!IconInfo) { SetLastWin32Error(ERROR_INVALID_PARAMETER); - RETURN(FALSE); - } - - WinSta = IntGetWinStaObj(); - if (WinSta == NULL) - { - RETURN(FALSE); + goto leave; } if (!(CurIcon = UserGetCurIconObject(hCurIcon))) { - ObDereferenceObject(WinSta); - RETURN(FALSE); + goto leave; } RtlCopyMemory(&ii, &CurIcon->IconInfo, sizeof(ICONINFO)); @@ -528,6 +521,18 @@ ii.hbmMask = BITMAP_CopyBitmap(CurIcon->IconInfo.hbmMask); ii.hbmColor = BITMAP_CopyBitmap(CurIcon->IconInfo.hbmColor); + if (pbpp) + { + PSURFACE psurfBmp; + + psurfBmp = SURFACE_LockSurface(CurIcon->IconInfo.hbmColor); + if (psurfBmp) + { + colorBpp = BitsPerFormat(psurfBmp->SurfObj.iBitmapFormat); + SURFACE_UnlockSurface(psurfBmp); + } + } + /* Copy fields */ _SEH2_TRY { @@ -536,21 +541,9 @@ if (pbpp) { - PSURFACE psurfBmp; - int colorBpp = 0; - ProbeForWrite(pbpp, sizeof(DWORD), 1); - - psurfBmp = SURFACE_LockSurface(CurIcon->IconInfo.hbmColor); - if (psurfBmp) - { - colorBpp = BitsPerFormat(psurfBmp->SurfObj.iBitmapFormat); - SURFACE_UnlockSurface(psurfBmp); - } - - RtlCopyMemory(pbpp, &colorBpp, sizeof(DWORD)); - } - + *pbpp = colorBpp; + } } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { @@ -564,13 +557,12 @@ SetLastNtError(Status); UserDereferenceObject(CurIcon); - ObDereferenceObject(WinSta); - RETURN(Ret); - -CLEANUP: - DPRINT("Leave NtUserGetIconInfo, ret=%i\n",_ret_); + +leave: + DPRINT("Leave NtUserGetIconInfo, ret=%i\n", Ret); UserLeave(); - END_CLEANUP; + + return Ret; }

1 0

[tkreuzer] 42489: [win32k] - Use DIB_GetDIBWidthBytes and BitsPerFormat instead of switch - Add SPS_CHANGE flag when calling IntEngSetPointerShape - Fixes VMWare Driver mouse pointer regression
by tkreuzer＠svn.reactos.org 08 Aug '09

08 Aug '09

Author: tkreuzer Date: Sat Aug 8 04:42:41 2009 New Revision: 42489 URL: http://svn.reactos.org/svn/reactos?rev=42489&view=rev Log: [win32k] - Use DIB_GetDIBWidthBytes and BitsPerFormat instead of switch - Add SPS_CHANGE flag when calling IntEngSetPointerShape - Fixes VMWare Driver mouse pointer regression Modified: trunk/reactos/subsystems/win32/win32k/eng/mouse.c Modified: trunk/reactos/subsystems/win32/win32k/eng/mouse.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/eng/mouse.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/eng/mouse.c [iso-8859-1] Sat Aug 8 04:42:41 2009 @@ -382,30 +382,8 @@ pgp->HotSpot.y = yHot; /* Calculate lDelta for our surfaces. */ - switch (pso->iBitmapFormat) - { - case BMF_1BPP: - lDelta = pgp->Size.cx >> 3; - break; - case BMF_4BPP: - lDelta = pgp->Size.cx >> 1; - break; - case BMF_8BPP: - lDelta = pgp->Size.cx; - break; - case BMF_16BPP: - lDelta = pgp->Size.cx << 1; - break; - case BMF_24BPP: - lDelta = pgp->Size.cx * 3; - break; - case BMF_32BPP: - lDelta = pgp->Size.cx << 2; - break; - default: - lDelta = 0; - break; - } + lDelta = DIB_GetDIBWidthBytes(pgp->Size.cx, + BitsPerFormat(pso->iBitmapFormat)); rcl.left = 0; rcl.top = 0; @@ -690,7 +668,7 @@ x, y, &pdc->ppdev->Pointer.Exclude, - fl); + fl | SPS_CHANGE); /* Cleanup */ if (hbmColor)

1 0

[tkreuzer] 42488: Comment out rpcrt4 winetest, as it breaks testcd.
by tkreuzer＠svn.reactos.org 08 Aug '09

08 Aug '09

Author: tkreuzer Date: Sat Aug 8 03:35:06 2009 New Revision: 42488 URL: http://svn.reactos.org/svn/reactos?rev=42488&view=rev Log: Comment out rpcrt4 winetest, as it breaks testcd. Modified: trunk/rostests/winetests/directory.rbuild Modified: trunk/rostests/winetests/directory.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/directory.rbuil… ============================================================================== --- trunk/rostests/winetests/directory.rbuild [iso-8859-1] (original) +++ trunk/rostests/winetests/directory.rbuild [iso-8859-1] Sat Aug 8 03:35:06 2009 @@ -167,7 +167,7 @@ <xi:include href="riched32/riched32.rbuild" /> </directory> <directory name="rpcrt4"> - <xi:include href="rpcrt4/rpcrt4.rbuild" /> +  </directory> <directory name="rsabase"> <xi:include href="rsabase/rsabase.rbuild" />

1 0

[tkreuzer] 42487: Update the fill brush, in NtGdiFillPath.
by tkreuzer＠svn.reactos.org 08 Aug '09

08 Aug '09

Author: tkreuzer Date: Sat Aug 8 02:50:42 2009 New Revision: 42487 URL: http://svn.reactos.org/svn/reactos?rev=42487&view=rev Log: Update the fill brush, in NtGdiFillPath. Modified: trunk/reactos/subsystems/win32/win32k/objects/path.c Modified: trunk/reactos/subsystems/win32/win32k/objects/path.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/path.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/path.c [iso-8859-1] Sat Aug 8 02:50:42 2009 @@ -2298,6 +2298,9 @@ if (pdcattr->ulDirty_ & (DIRTY_LINE | DC_PEN_DIRTY)) DC_vUpdateLineBrush(dc); + if (pdcattr->ulDirty_ & (DIRTY_FILL | DC_BRUSH_DIRTY)) + DC_vUpdateFillBrush(dc); + ret = PATH_FillPath( dc, pPath ); if ( ret ) {

1 0

[sginsberg] 42486: - Don't use dllexport for dxapi -- we have a .spec
by sginsberg＠svn.reactos.org 07 Aug '09

07 Aug '09

Author: sginsberg Date: Fri Aug 7 23:53:26 2009 New Revision: 42486 URL: http://svn.reactos.org/svn/reactos?rev=42486&view=rev Log: - Don't use dllexport for dxapi -- we have a .spec Modified: trunk/reactos/drivers/directx/dxapi/main.c trunk/reactos/include/ddk/ddkmapi.h Modified: trunk/reactos/drivers/directx/dxapi/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/directx/dxapi/main… ============================================================================== --- trunk/reactos/drivers/directx/dxapi/main.c [iso-8859-1] (original) +++ trunk/reactos/drivers/directx/dxapi/main.c [iso-8859-1] Fri Aug 7 23:53:26 2009 @@ -45,8 +45,8 @@ * none * *--*/ -DXAPI -ULONG PASCAL +ULONG +PASCAL DxApiGetVersion() { /* MSDN say this always return Direct Sound version 4.02 */ @@ -98,8 +98,8 @@ * *--*/ -DXAPI -DWORD PASCAL +DWORD +PASCAL DxApi(IN DWORD dwFunctionNum, IN LPVOID lpvInBuffer, IN DWORD cbInBuffer, Modified: trunk/reactos/include/ddk/ddkmapi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ddkmapi.h?rev=… ============================================================================== --- trunk/reactos/include/ddk/ddkmapi.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/ddkmapi.h [iso-8859-1] Fri Aug 7 23:53:26 2009 @@ -23,7 +23,7 @@ #if defined(_DXAPI_) - #define DXAPI DECLSPEC_EXPORT + #define DXAPI #else #define DXAPI DECLSPEC_IMPORT #endif

1 0

[sginsberg] 42485: - Use APIENTRY compatible -- wdmaud now builds
by sginsberg＠svn.reactos.org 07 Aug '09

07 Aug '09

Author: sginsberg Date: Fri Aug 7 23:27:45 2009 New Revision: 42485 URL: http://svn.reactos.org/svn/reactos?rev=42485&view=rev Log: - Use APIENTRY compatible -- wdmaud now builds Modified: trunk/reactos/dll/win32/wdmaud.drv/wdmaud.c Modified: trunk/reactos/dll/win32/wdmaud.drv/wdmaud.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wdmaud.drv/wdmau… ============================================================================== --- trunk/reactos/dll/win32/wdmaud.drv/wdmaud.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wdmaud.drv/wdmaud.c [iso-8859-1] Fri Aug 7 23:27:45 2009 @@ -484,7 +484,8 @@ -APIENTRY LONG +LONG +APIENTRY DriverProc( DWORD DriverId, HANDLE DriverHandle,

1 0

[sginsberg] 42484: - Don't assume _MSC_VER means PSDK in regedit -- add a note so this isn't forgotten.
by sginsberg＠svn.reactos.org 07 Aug '09

07 Aug '09

Author: sginsberg Date: Fri Aug 7 23:15:17 2009 New Revision: 42484 URL: http://svn.reactos.org/svn/reactos?rev=42484&view=rev Log: - Don't assume _MSC_VER means PSDK in regedit -- add a note so this isn't forgotten. Modified: trunk/reactos/base/applications/regedit/security.c Modified: trunk/reactos/base/applications/regedit/security.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/security.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/security.c [iso-8859-1] Fri Aug 7 23:15:17 2009 @@ -30,7 +30,11 @@ #endif /* FIXME: already defined in aclui.h - causing problems when compiling with MSVC/PSDK*/ -#ifndef _MSC_VER +#ifdef _MSC_VER +#pragma message ("INVESTIGATE ME") +#endif + +#if 1 //#ifndef _MSC_VER DEFINE_GUID(IID_IEffectivePermission, 0x3853dc76, 0x9f35, 0x407c, 0x0088, 0xa1,0xd1,0x93,0x44,0x36,0x5f,0xbc); DEFINE_GUID(IID_ISecurityObjectTypeInfo, 0xfc3066eb, 0x79ef, 0x444b, 0x0091, 0x11,0xd1,0x8a,0x75,0xeb,0xf2,0xfa); #endif

1 0

[sginsberg] 42483: - Make rapps MSVC-friendly
by sginsberg＠svn.reactos.org 07 Aug '09

07 Aug '09

Author: sginsberg Date: Fri Aug 7 23:10:16 2009 New Revision: 42483 URL: http://svn.reactos.org/svn/reactos?rev=42483&view=rev Log: - Make rapps MSVC-friendly Modified: trunk/reactos/base/applications/rapps/parser.c trunk/reactos/base/applications/rapps/winmain.c Modified: trunk/reactos/base/applications/rapps/parser.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/pa… ============================================================================== --- trunk/reactos/base/applications/rapps/parser.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/parser.c [iso-8859-1] Fri Aug 7 23:10:16 2009 @@ -544,6 +544,7 @@ HANDLE hFile = INVALID_HANDLE_VALUE; int i, j; ITEMS *tempProfile; + static const WCHAR wszSeparator[] = L"\\rapps\\"; if (!CurProfile) for (i = 0; i < N_CACHED_ITEMS; i++) @@ -558,7 +559,6 @@ GetCurrentDirectoryW(MAX_PATH, szDir); - static const WCHAR wszSeparator[] = L"\\rapps\\"; wcscpy(buffer, szDir); wcscat(buffer, wszSeparator); wcscat(buffer, filename); Modified: trunk/reactos/base/applications/rapps/winmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/wi… ============================================================================== --- trunk/reactos/base/applications/rapps/winmain.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/winmain.c [iso-8859-1] Fri Aug 7 23:10:16 2009 @@ -15,8 +15,8 @@ INT SelectedEnumType = ENUM_ALL_COMPONENTS; +BOOL CALLBACK -BOOL EnumInstalledAppProc(INT ItemIndex, LPWSTR lpName, LPWSTR lpKeyName, LPARAM lParam) { WCHAR szText[MAX_PATH]; @@ -49,8 +49,8 @@ } } +BOOL CALLBACK -BOOL EnumAvailableAppProc(APPLICATION_INFO Info) { PAPPLICATION_INFO ItemInfo;

1 0

[cwittich] 42482: sync rpcrt4 winetest with wine 1.1.26
by cwittich＠svn.reactos.org 07 Aug '09

07 Aug '09

Author: cwittich Date: Fri Aug 7 23:02:55 2009 New Revision: 42482 URL: http://svn.reactos.org/svn/reactos?rev=42482&view=rev Log: sync rpcrt4 winetest with wine 1.1.26 Added: trunk/rostests/winetests/rpcrt4/rpc_protseq.c (with props) Modified: trunk/rostests/winetests/rpcrt4/cstub.c trunk/rostests/winetests/rpcrt4/generated.c trunk/rostests/winetests/rpcrt4/ndr_marshall.c trunk/rostests/winetests/rpcrt4/rpc.c trunk/rostests/winetests/rpcrt4/rpc_async.c trunk/rostests/winetests/rpcrt4/rpcrt4.rbuild trunk/rostests/winetests/rpcrt4/server.c trunk/rostests/winetests/rpcrt4/server.idl [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/rostests/winetests/rpcrt4/cstub.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/rpcrt4/cstub.c?… Modified: trunk/rostests/winetests/rpcrt4/generated.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/rpcrt4/generate… Modified: trunk/rostests/winetests/rpcrt4/ndr_marshall.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/rpcrt4/ndr_mars… Modified: trunk/rostests/winetests/rpcrt4/rpc.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/rpcrt4/rpc.c?re… Modified: trunk/rostests/winetests/rpcrt4/rpc_async.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/rpcrt4/rpc_asyn… Added: trunk/rostests/winetests/rpcrt4/rpc_protseq.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/rpcrt4/rpc_prot… Modified: trunk/rostests/winetests/rpcrt4/rpcrt4.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/rpcrt4/rpcrt4.r… Modified: trunk/rostests/winetests/rpcrt4/server.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/rpcrt4/server.c… Modified: trunk/rostests/winetests/rpcrt4/server.idl URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/rpcrt4/server.i…

1 0

[cwittich] 42481: APIENTRY LONG --> LONG APIENTRY
by cwittich＠svn.reactos.org 07 Aug '09

07 Aug '09

Author: cwittich Date: Fri Aug 7 22:17:55 2009 New Revision: 42481 URL: http://svn.reactos.org/svn/reactos?rev=42481&view=rev Log: APIENTRY LONG --> LONG APIENTRY Modified: trunk/reactos/dll/win32/sndblst/sndblst.c Modified: trunk/reactos/dll/win32/sndblst/sndblst.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/sndblst/sndblst.… ============================================================================== --- trunk/reactos/dll/win32/sndblst/sndblst.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/sndblst/sndblst.c [iso-8859-1] Fri Aug 7 22:17:55 2009 @@ -137,7 +137,7 @@ return TRUE; } -APIENTRY LONG +LONG APIENTRY DriverProc( DWORD DriverId, HANDLE DriverHandle,

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs