Ros-diffs

ros-diffs@reactos.org

81390 discussions

[cfinck] 37174: Merge r37097, r37173
by cfinck＠svn.reactos.org 03 Nov '08

03 Nov '08

Author: cfinck Date: Mon Nov 3 13:05:14 2008 New Revision: 37174 URL: http://svn.reactos.org/svn/reactos?rev=37174&view=rev Log: Merge r37097, r37173 Modified: branches/ros-branch-0_3_7/reactos/base/shell/explorer/res/shutdown.ico branches/ros-branch-0_3_7/reactos/dll/win32/netcfgx/inetcfgcomp_iface.c Modified: branches/ros-branch-0_3_7/reactos/base/shell/explorer/res/shutdown.ico URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_7/reactos/base/s… ============================================================================== Binary files - no diff available. Modified: branches/ros-branch-0_3_7/reactos/dll/win32/netcfgx/inetcfgcomp_iface.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_7/reactos/dll/wi… ============================================================================== --- branches/ros-branch-0_3_7/reactos/dll/win32/netcfgx/inetcfgcomp_iface.c [iso-8859-1] (original) +++ branches/ros-branch-0_3_7/reactos/dll/win32/netcfgx/inetcfgcomp_iface.c [iso-8859-1] Mon Nov 3 13:05:14 2008 @@ -442,9 +442,10 @@ hr = CreateNotificationObject(This,iface, pUnk); if (FAILED(hr)) return hr; - if (dwFlags == NCRP_QUERY_PROPERTY_UI) - return S_OK; - } + } + + if (dwFlags == NCRP_QUERY_PROPERTY_UI) + return S_OK; dwDefPages = 0; Pages = 0;

1 0

[janderwald] 37173: - Dont display NCRP_QUERY_PROPERTY_UI when the notification object has already been created
by janderwald＠svn.reactos.org 03 Nov '08

03 Nov '08

Author: janderwald Date: Mon Nov 3 12:42:56 2008 New Revision: 37173 URL: http://svn.reactos.org/svn/reactos?rev=37173&view=rev Log: - Dont display NCRP_QUERY_PROPERTY_UI when the notification object has already been created Modified: trunk/reactos/dll/win32/netcfgx/inetcfgcomp_iface.c Modified: trunk/reactos/dll/win32/netcfgx/inetcfgcomp_iface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/inetcfgc… ============================================================================== --- trunk/reactos/dll/win32/netcfgx/inetcfgcomp_iface.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netcfgx/inetcfgcomp_iface.c [iso-8859-1] Mon Nov 3 12:42:56 2008 @@ -442,9 +442,10 @@ hr = CreateNotificationObject(This,iface, pUnk); if (FAILED(hr)) return hr; - if (dwFlags == NCRP_QUERY_PROPERTY_UI) - return S_OK; - } + } + + if (dwFlags == NCRP_QUERY_PROPERTY_UI) + return S_OK; dwDefPages = 0; Pages = 0;

1 0

[cfinck] 37172: Merge in r37155
by cfinck＠svn.reactos.org 03 Nov '08

03 Nov '08

Author: cfinck Date: Mon Nov 3 11:45:54 2008 New Revision: 37172 URL: http://svn.reactos.org/svn/reactos?rev=37172&view=rev Log: Merge in r37155 Modified: branches/ros-branch-0_3_7/reactos/base/shell/cmd/batch.c Modified: branches/ros-branch-0_3_7/reactos/base/shell/cmd/batch.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_7/reactos/base/s… ============================================================================== --- branches/ros-branch-0_3_7/reactos/base/shell/cmd/batch.c [iso-8859-1] (original) +++ branches/ros-branch-0_3_7/reactos/base/shell/cmd/batch.c [iso-8859-1] Mon Nov 3 11:45:54 2008 @@ -427,7 +427,7 @@ return textline; } - if (!FileGetString (bc->hBatchFile, textline, sizeof (textline) / sizeof (textline[0]))) + if (!FileGetString (bc->hBatchFile, textline, sizeof (textline) / sizeof (textline[0]) - 1)) { TRACE ("ReadBatchLine(): Reached EOF!\n"); /* End of file.... */ @@ -439,6 +439,9 @@ continue; } TRACE ("ReadBatchLine(): textline: \'%s\'\n", debugstr_aw(textline)); + + if (textline[_tcslen(textline) - 1] != _T('\n')) + _tcscat(textline, _T("\n")); first = textline;

1 0

[cwittich] 37171: ExFreePool -> ExFreePoolWithTag Status != STATUS_SUCCESS -> !NT_SUCCESS(Status)
by cwittich＠svn.reactos.org 03 Nov '08

03 Nov '08

Author: cwittich Date: Mon Nov 3 10:22:44 2008 New Revision: 37171 URL: http://svn.reactos.org/svn/reactos?rev=37171&view=rev Log: ExFreePool -> ExFreePoolWithTag Status != STATUS_SUCCESS -> !NT_SUCCESS(Status) Modified: trunk/reactos/subsystems/win32/win32k/eng/event.c trunk/reactos/subsystems/win32/win32k/eng/float.c trunk/reactos/subsystems/win32/win32k/eng/semaphor.c trunk/reactos/subsystems/win32/win32k/ntuser/callback.c Modified: trunk/reactos/subsystems/win32/win32k/eng/event.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/eng/event.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/eng/event.c [iso-8859-1] Mon Nov 3 10:22:44 2008 @@ -30,7 +30,7 @@ STDCALL EngDeleteEvent ( IN PEVENT Event) { - ExFreePool(Event); + ExFreePoolWithTag(Event, TAG_DFSM); return TRUE; } @@ -79,7 +79,7 @@ EngUnmapEvent ( IN PEVENT Event ) { ObDereferenceObject((PVOID)Event); - ExFreePool(Event); + ExFreePoolWithTag(Event, TAG_DFSM); return TRUE; } @@ -97,7 +97,7 @@ KernelMode, FALSE, TimeOut); - if (Status != STATUS_SUCCESS) + if (!NT_SUCCESS(Status)) { return FALSE; } Modified: trunk/reactos/subsystems/win32/win32k/eng/float.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/eng/float.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/eng/float.c [iso-8859-1] Mon Nov 3 10:22:44 2008 @@ -41,7 +41,7 @@ { NTSTATUS Status; Status = KeRestoreFloatingPointState((PKFLOATING_SAVE)Buffer); - if (Status != STATUS_SUCCESS) + if (!NT_SUCCESS(Status)) { return FALSE; } Modified: trunk/reactos/subsystems/win32/win32k/eng/semaphor.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/eng/semaphor.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/eng/semaphor.c [iso-8859-1] Mon Nov 3 10:22:44 2008 @@ -81,7 +81,7 @@ ExDeleteResourceLite((PERESOURCE)hsem); - ExFreePool ( (PVOID)hsem ); + ExFreePoolWithTag( (PVOID)hsem, TAG_GSEM); } /* Modified: trunk/reactos/subsystems/win32/win32k/ntuser/callback.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/callback.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/callback.c [iso-8859-1] Mon Nov 3 10:22:44 2008 @@ -86,7 +86,7 @@ RemoveEntryList(&Mem->ListEntry); /* free memory */ - ExFreePool(Mem); + ExFreePoolWithTag(Mem, TAG_CALLBACK); } VOID FASTCALL

1 0

[cwittich] 37170: some translations: GreatLordish -> English
by cwittich＠svn.reactos.org 03 Nov '08

03 Nov '08

Author: cwittich Date: Mon Nov 3 08:39:03 2008 New Revision: 37170 URL: http://svn.reactos.org/svn/reactos?rev=37170&view=rev Log: some translations: GreatLordish -> English Modified: trunk/reactos/subsystems/win32/win32k/ntddraw/d3d.c trunk/reactos/subsystems/win32/win32k/ntddraw/dd.c trunk/reactos/subsystems/win32/win32k/ntddraw/ddraw.c trunk/reactos/subsystems/win32/win32k/ntddraw/dvp.c trunk/reactos/subsystems/win32/win32k/ntddraw/mocomp.c Modified: trunk/reactos/subsystems/win32/win32k/ntddraw/d3d.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntddraw/d3d.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntddraw/d3d.c [iso-8859-1] Mon Nov 3 08:39:03 2008 @@ -123,11 +123,11 @@ if (pfnD3dContextCreate == NULL) { - DPRINT1("Warring no pfnD3dContextCreate"); + DPRINT1("Warning: no pfnD3dContextCreate"); return FALSE; } - DPRINT1("Calling on dxg.sys D3dContextCreate"); + DPRINT1("Calling dxg.sys D3dContextCreate"); return pfnD3dContextCreate(hDirectDrawLocal, hSurfColor, hSurfZ, pdcci); } @@ -158,11 +158,11 @@ if ( pfnD3dContextDestroy == NULL) { - DPRINT1("Warring no pfnD3dContextDestroy"); - return DDHAL_DRIVER_NOTHANDLED; - } - - DPRINT1("Calling on dxg.sys D3dContextDestroy"); + DPRINT1("Warning: no pfnD3dContextDestroy"); + return DDHAL_DRIVER_NOTHANDLED; + } + + DPRINT1("Calling dxg.sys D3dContextDestroy"); return pfnD3dContextDestroy(pContextDestroyData); } @@ -196,11 +196,11 @@ if (pfnD3dContextDestroyAll == NULL) { - DPRINT1("Warring no pfnD3dContextDestroyAll"); - return DDHAL_DRIVER_NOTHANDLED; - } - - DPRINT1("Calling on dxg.sys D3dContextDestroyAll"); + DPRINT1("Warning: no pfnD3dContextDestroyAll"); + return DDHAL_DRIVER_NOTHANDLED; + } + + DPRINT1("Calling dxg.sys D3dContextDestroyAll"); return pfnD3dContextDestroyAll(pdcad); } @@ -271,11 +271,11 @@ if (pfnDdCreateD3DBuffer == NULL) { - DPRINT1("Warring no pfnDdCreateD3DBuffer"); - return DDHAL_DRIVER_NOTHANDLED; - } - - DPRINT1("Calling on dxg.sys DdCreateD3DBuffer"); + DPRINT1("Warning no pfnDdCreateD3DBuffer"); + return DDHAL_DRIVER_NOTHANDLED; + } + + DPRINT1("Calling dxg.sys DdCreateD3DBuffer"); return pfnDdCreateD3DBuffer(hDirectDraw, hSurface, puSurfaceDescription, puSurfaceGlobalData, puSurfaceLocalData, puSurfaceMoreData, @@ -293,11 +293,11 @@ if (pfnDdDestroyD3DBuffer == NULL) { - DPRINT1("Warring no pfnDdDestroyD3DBuffer"); - return DDHAL_DRIVER_NOTHANDLED; - } - - DPRINT1("Calling on dxg.sys pfnDdDestroyD3DBuffer"); + DPRINT1("Warning no pfnDdDestroyD3DBuffer"); + return DDHAL_DRIVER_NOTHANDLED; + } + + DPRINT1("Calling dxg.sys pfnDdDestroyD3DBuffer"); return pfnDdDestroyD3DBuffer(hSurface); } @@ -318,11 +318,11 @@ if (pfnD3dDrawPrimitives2 == NULL) { - DPRINT1("Warring no pfnD3dDrawPrimitives2"); - return DDHAL_DRIVER_NOTHANDLED; - } - - DPRINT1("Calling on dxg.sys D3dDrawPrimitives2"); + DPRINT1("Warning: no pfnD3dDrawPrimitives2"); + return DDHAL_DRIVER_NOTHANDLED; + } + + DPRINT1("Calling dxg.sys D3dDrawPrimitives2"); return pfnD3dDrawPrimitives2(hCmdBuf,hVBuf,pded,pfpVidMemCmd,pdwSizeCmd,pfpVidMemVtx,pdwSizeVtx); } @@ -339,11 +339,11 @@ if (pfnDdLockD3D == NULL) { - DPRINT1("Warring no pfnDdLockD3D"); - return DDHAL_DRIVER_NOTHANDLED; - } - - DPRINT1("Calling on dxg.sys pfnDdLockD3D"); + DPRINT1("Warning: no pfnDdLockD3D"); + return DDHAL_DRIVER_NOTHANDLED; + } + + DPRINT1("Calling dxg.sys pfnDdLockD3D"); return pfnDdLockD3D(hSurface, puLockData); } @@ -358,11 +358,11 @@ if (pfnD3dValidateTextureStageState == NULL) { - DPRINT1("Warring no pfnD3dValidateTextureStageState"); - return DDHAL_DRIVER_NOTHANDLED; - } - - DPRINT1("Calling on dxg.sys D3dValidateTextureStageState"); + DPRINT1("Warning: no pfnD3dValidateTextureStageState"); + return DDHAL_DRIVER_NOTHANDLED; + } + + DPRINT1("Calling dxg.sys D3dValidateTextureStageState"); return pfnD3dValidateTextureStageState(pData); } @@ -378,11 +378,11 @@ if (pfnDdUnlockD3D == NULL) { - DPRINT1("Warring no pfnDdUnlockD3D"); - return DDHAL_DRIVER_NOTHANDLED; - } - - DPRINT1("Calling on dxg.sys pfnDdUnlockD3D"); + DPRINT1("Warning: no pfnDdUnlockD3D"); + return DDHAL_DRIVER_NOTHANDLED; + } + + DPRINT1("Calling dxg.sys pfnDdUnlockD3D"); return pfnDdUnlockD3D(hSurface, puUnlockData); } Modified: trunk/reactos/subsystems/win32/win32k/ntddraw/dd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntddraw/dd.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntddraw/dd.c [iso-8859-1] Mon Nov 3 08:39:03 2008 @@ -29,11 +29,11 @@ if (pfnDdCreateSurface == NULL) { - DPRINT1("Warring no pfnDdCreateSurface\n"); + DPRINT1("Warning: no pfnDdCreateSurface\n"); return DDHAL_DRIVER_NOTHANDLED; } - DPRINT1("Calling on dxg.sys pfnDdCreateSurface\n"); + DPRINT1("Calling dxg.sys pfnDdCreateSurface\n"); return pfnDdCreateSurface(hDirectDrawLocal,hSurface,puSurfaceDescription,puSurfaceGlobalData, puSurfaceLocalData,puSurfaceMoreData,puCreateSurfaceData,puhSurface); } @@ -50,11 +50,11 @@ if (pfnDdWaitForVerticalBlank == NULL) { - DPRINT1("Warring no pfnDdWaitForVerticalBlank\n"); + DPRINT1("Warning: no pfnDdWaitForVerticalBlank\n"); return DDHAL_DRIVER_NOTHANDLED; } - DPRINT1("Calling on dxg.sys pfnDdWaitForVerticalBlank\n"); + DPRINT1("Calling dxg.sys pfnDdWaitForVerticalBlank\n"); return pfnDdWaitForVerticalBlank(hDirectDraw, puWaitForVerticalBlankData); } @@ -70,11 +70,11 @@ if (pfnDdCanCreateSurface == NULL) { - DPRINT1("Warring no pfnDdCanCreateSurface\n"); + DPRINT1("Warning: no pfnDdCanCreateSurface\n"); return DDHAL_DRIVER_NOTHANDLED; } - DPRINT1("Calling on dxg.sys DdCanCreateSurface\n"); + DPRINT1("Calling dxg.sys DdCanCreateSurface\n"); return pfnDdCanCreateSurface(hDirectDrawLocal,puCanCreateSurfaceData); } @@ -91,11 +91,11 @@ if (pfnDdGetScanLine == NULL) { - DPRINT1("Warring no pfnDdGetScanLine\n"); + DPRINT1("Warning: no pfnDdGetScanLine\n"); return DDHAL_DRIVER_NOTHANDLED; } - DPRINT1("Calling on dxg.sys pfnDdGetScanLine\n"); + DPRINT1("Calling dxg.sys pfnDdGetScanLine\n"); return pfnDdGetScanLine(hDirectDrawLocal,puGetScanLineData); } @@ -119,11 +119,11 @@ if (pfnDdCreateSurfaceEx == NULL) { - DPRINT1("Warring no pfnDdCreateSurfaceEx\n"); + DPRINT1("Warning: no pfnDdCreateSurfaceEx\n"); return DDHAL_DRIVER_NOTHANDLED; } - DPRINT1("Calling on dxg.sys pfnDdCreateSurfaceEx\n"); + DPRINT1("Calling dxg.sys pfnDdCreateSurfaceEx\n"); return pfnDdCreateSurfaceEx(hDirectDraw,hSurface,dwSurfaceHandle); } Modified: trunk/reactos/subsystems/win32/win32k/ntddraw/ddraw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntddraw/ddraw.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntddraw/ddraw.c [iso-8859-1] Mon Nov 3 08:39:03 2008 @@ -94,7 +94,7 @@ } else { - DPRINT1(" The dxg.sys and graphic card driver interface is enable \n "); + DPRINT1(" The dxg.sys and graphic card driver interface is enabled \n "); success = TRUE; } } Modified: trunk/reactos/subsystems/win32/win32k/ntddraw/dvp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntddraw/dvp.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntddraw/dvp.c [iso-8859-1] Mon Nov 3 08:39:03 2008 @@ -24,11 +24,11 @@ if (pfnDvpCanCreateVideoPort == NULL) { - DPRINT1("Warring no pfnDvpCanCreateVideoPort"); - return DDHAL_DRIVER_NOTHANDLED; - } - - DPRINT1("Calling on dxg.sys pfnDvpCanCreateVideoPort"); + DPRINT1("Warning: no pfnDvpCanCreateVideoPort"); + return DDHAL_DRIVER_NOTHANDLED; + } + + DPRINT1("Calling dxg.sys pfnDvpCanCreateVideoPort"); return pfnDvpCanCreateVideoPort(hDirectDraw, puCanCreateVPortData); } @@ -44,11 +44,11 @@ if (pfnDvpColorControl == NULL) { - DPRINT1("Warring no pfnDvpColorControl"); - return DDHAL_DRIVER_NOTHANDLED; - } - - DPRINT1("Calling on dxg.sys pfnDvpColorControl"); + DPRINT1("Warning: no pfnDvpColorControl"); + return DDHAL_DRIVER_NOTHANDLED; + } + + DPRINT1("Calling dxg.sys pfnDvpColorControl"); return pfnDvpColorControl(hVideoPort, puVPortColorData); } @@ -64,11 +64,11 @@ if (pfnDvpCreateVideoPort == NULL) { - DPRINT1("Warring no pfnDvpCreateVideoPort"); - return DDHAL_DRIVER_NOTHANDLED; - } - - DPRINT1("Calling on dxg.sys pfnDvpCreateVideoPort"); + DPRINT1("Warning: no pfnDvpCreateVideoPort"); + return DDHAL_DRIVER_NOTHANDLED; + } + + DPRINT1("Calling dxg.sys pfnDvpCreateVideoPort"); return pfnDvpCreateVideoPort(hDirectDraw, puCreateVPortData); } @@ -84,11 +84,11 @@ if (pfnDvpDestroyVideoPort == NULL) { - DPRINT1("Warring no pfnDvpDestroyVideoPort"); - return DDHAL_DRIVER_NOTHANDLED; - } - - DPRINT1("Calling on dxg.sys pfnDvpDestroyVideoPort"); + DPRINT1("Warning: no pfnDvpDestroyVideoPort"); + return DDHAL_DRIVER_NOTHANDLED; + } + + DPRINT1("Calling dxg.sys pfnDvpDestroyVideoPort"); return pfnDvpDestroyVideoPort(hVideoPort, puDestroyVPortData); } @@ -106,11 +106,11 @@ if (pfnDvpFlipVideoPort == NULL) { - DPRINT1("Warring no pfnDvpFlipVideoPort"); - return DDHAL_DRIVER_NOTHANDLED; - } - - DPRINT1("Calling on dxg.sys pfnDvpFlipVideoPort"); + DPRINT1("Warning: no pfnDvpFlipVideoPort"); + return DDHAL_DRIVER_NOTHANDLED; + } + + DPRINT1("Calling dxg.sys pfnDvpFlipVideoPort"); return pfnDvpFlipVideoPort(hVideoPort, hDDSurfaceCurrent, hDDSurfaceTarget, puFlipVPortData); } @@ -127,11 +127,11 @@ if (pfnDvpGetVideoPortBandwidth == NULL) { - DPRINT1("Warring no pfnDvpGetVideoPortBandwidth"); - return DDHAL_DRIVER_NOTHANDLED; - } - - DPRINT1("Calling on dxg.sys pfnDvpGetVideoPortBandwidth"); + DPRINT1("Warning: no pfnDvpGetVideoPortBandwidth"); + return DDHAL_DRIVER_NOTHANDLED; + } + + DPRINT1("Calling dxg.sys pfnDvpGetVideoPortBandwidth"); return pfnDvpGetVideoPortBandwidth(hVideoPort, puGetVPortBandwidthData); } @@ -148,11 +148,11 @@ if (pfnDvpGetVideoPortFlipStatus == NULL) { - DPRINT1("Warring no pfnDvpGetVideoPortFlipStatus"); - return DDHAL_DRIVER_NOTHANDLED; - } - - DPRINT1("Calling on dxg.sys pfnDvpGetVideoPortFlipStatus"); + DPRINT1("Warning: no pfnDvpGetVideoPortFlipStatus"); + return DDHAL_DRIVER_NOTHANDLED; + } + + DPRINT1("Calling dxg.sys pfnDvpGetVideoPortFlipStatus"); return pfnDvpGetVideoPortFlipStatus(hDirectDraw, puGetVPortFlipStatusData); } @@ -169,11 +169,11 @@ if (pfnDvpGetVideoPortInputFormats == NULL) { - DPRINT1("Warring no pfnDvpGetVideoPortInputFormats"); - return DDHAL_DRIVER_NOTHANDLED; - } - - DPRINT1("Calling on dxg.sys pfnDvpGetVideoPortInputFormats"); + DPRINT1("Warning: no pfnDvpGetVideoPortInputFormats"); + return DDHAL_DRIVER_NOTHANDLED; + } + + DPRINT1("Calling dxg.sys pfnDvpGetVideoPortInputFormats"); return pfnDvpGetVideoPortInputFormats(hVideoPort, puGetVPortInputFormatData); } @@ -190,11 +190,11 @@ if (pfnDvpGetVideoPortLine == NULL) { - DPRINT1("Warring no pfnDvpGetVideoPortLine"); - return DDHAL_DRIVER_NOTHANDLED; - } - - DPRINT1("Calling on dxg.sys pfnDvpGetVideoPortLine"); + DPRINT1("Warning: no pfnDvpGetVideoPortLine"); + return DDHAL_DRIVER_NOTHANDLED; + } + + DPRINT1("Calling dxg.sys pfnDvpGetVideoPortLine"); return pfnDvpGetVideoPortLine(hVideoPort, puGetVPortLineData); } @@ -211,11 +211,11 @@ if (pfnDvpGetVideoPortOutputFormats == NULL) { - DPRINT1("Warring no pfnDvpGetVideoPortOutputFormats"); - return DDHAL_DRIVER_NOTHANDLED; - } - - DPRINT1("Calling on dxg.sys pfnDvpGetVideoPortOutputFormats"); + DPRINT1("Warning: no pfnDvpGetVideoPortOutputFormats"); + return DDHAL_DRIVER_NOTHANDLED; + } + + DPRINT1("Calling dxg.sys pfnDvpGetVideoPortOutputFormats"); return pfnDvpGetVideoPortOutputFormats(hVideoPort, puGetVPortOutputFormatData); } @@ -233,11 +233,11 @@ if (pfnDvpGetVideoPortConnectInfo == NULL) { - DPRINT1("Warring no pfnDvpGetVideoPortConnectInfo"); - return DDHAL_DRIVER_NOTHANDLED; - } - - DPRINT1("Calling on dxg.sys pfnDvpGetVideoPortConnectInfo"); + DPRINT1("Warning: no pfnDvpGetVideoPortConnectInfo"); + return DDHAL_DRIVER_NOTHANDLED; + } + + DPRINT1("Calling dxg.sys pfnDvpGetVideoPortConnectInfo"); return pfnDvpGetVideoPortConnectInfo(hDirectDraw, puGetVPortConnectData); } @@ -254,11 +254,11 @@ if (pfnDvpGetVideoSignalStatus == NULL) { - DPRINT1("Warring no pfnDvpGetVideoSignalStatus"); - return DDHAL_DRIVER_NOTHANDLED; - } - - DPRINT1("Calling on dxg.sys pfnDvpGetVideoSignalStatus"); + DPRINT1("Warning: no pfnDvpGetVideoSignalStatus"); + return DDHAL_DRIVER_NOTHANDLED; + } + + DPRINT1("Calling dxg.sys pfnDvpGetVideoSignalStatus"); return pfnDvpGetVideoSignalStatus(hVideoPort, puGetVPortSignalData); } @@ -278,11 +278,11 @@ if (pfnDvpUpdateVideoPort == NULL) { - DPRINT1("Warring no pfnDvpUpdateVideoPort"); - return DDHAL_DRIVER_NOTHANDLED; - } - - DPRINT1("Calling on dxg.sys pfnDvpUpdateVideoPort"); + DPRINT1("Warning: no pfnDvpUpdateVideoPort"); + return DDHAL_DRIVER_NOTHANDLED; + } + + DPRINT1("Calling dxg.sys pfnDvpUpdateVideoPort"); return pfnDvpUpdateVideoPort(hVideoPort, phSurfaceVideo, phSurfaceVbi, puUpdateVPortData); } @@ -300,11 +300,11 @@ if (pfnDvpWaitForVideoPortSync == NULL) { - DPRINT1("Warring no pfnDvpWaitForVideoPortSync"); - return DDHAL_DRIVER_NOTHANDLED; - } - - DPRINT1("Calling on dxg.sys pfnDvpWaitForVideoPortSync"); + DPRINT1("Warning: no pfnDvpWaitForVideoPortSync"); + return DDHAL_DRIVER_NOTHANDLED; + } + + DPRINT1("Calling dxg.sys pfnDvpWaitForVideoPortSync"); return pfnDvpWaitForVideoPortSync(hVideoPort, puWaitForVPortSyncData); } @@ -322,11 +322,11 @@ if (pfnDvpAcquireNotification == NULL) { - DPRINT1("Warring no pfnDvpAcquireNotification"); - return DDHAL_DRIVER_NOTHANDLED; - } - - DPRINT1("Calling on dxg.sys pfnDvpAcquireNotification"); + DPRINT1("Warning: no pfnDvpAcquireNotification"); + return DDHAL_DRIVER_NOTHANDLED; + } + + DPRINT1("Calling dxg.sys pfnDvpAcquireNotification"); return pfnDvpAcquireNotification(hVideoPort, hEvent, pNotify); } @@ -343,11 +343,11 @@ if (pfnDvpReleaseNotification == NULL) { - DPRINT1("Warring no pfnDvpReleaseNotification"); - return DDHAL_DRIVER_NOTHANDLED; - } - - DPRINT1("Calling on dxg.sys pfnDvpReleaseNotification"); + DPRINT1("Warning: no pfnDvpReleaseNotification"); + return DDHAL_DRIVER_NOTHANDLED; + } + + DPRINT1("Calling dxg.sys pfnDvpReleaseNotification"); return pfnDvpReleaseNotification(hVideoPort, hEvent); } @@ -365,11 +365,11 @@ if (pfnDvpGetVideoPortField == NULL) { - DPRINT1("Warring no pfnDvpGetVideoPortField"); - return DDHAL_DRIVER_NOTHANDLED; - } - - DPRINT1("Calling on dxg.sys pfnDvpGetVideoPortField"); + DPRINT1("Warning: no pfnDvpGetVideoPortField"); + return DDHAL_DRIVER_NOTHANDLED; + } + + DPRINT1("Calling dxg.sys pfnDvpGetVideoPortField"); return pfnDvpGetVideoPortField(hVideoPort, puGetVPortFieldData); } Modified: trunk/reactos/subsystems/win32/win32k/ntddraw/mocomp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntddraw/mocomp.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntddraw/mocomp.c [iso-8859-1] Mon Nov 3 08:39:03 2008 @@ -24,11 +24,11 @@ if (pfnDdBeginMoCompFrame == NULL) { - DPRINT1("Warring no pfnDdBeginMoCompFrame"); - return DDHAL_DRIVER_NOTHANDLED; - } - - DPRINT1("Calling on dxg.sys DdBeginMoCompFrame"); + DPRINT1("Warning: no pfnDdBeginMoCompFrame"); + return DDHAL_DRIVER_NOTHANDLED; + } + + DPRINT1("Calling dxg.sys DdBeginMoCompFrame"); return pfnDdBeginMoCompFrame(hMoComp,puBeginFrameData); } @@ -43,11 +43,11 @@ if (pfnDdCreateMoComp == NULL) { - DPRINT1("Warring no pfnDdCreateMoComp"); - return DDHAL_DRIVER_NOTHANDLED; - } - - DPRINT1("Calling on dxg.sys DdCreateMoComp"); + DPRINT1("Warning: no pfnDdCreateMoComp"); + return DDHAL_DRIVER_NOTHANDLED; + } + + DPRINT1("Calling dxg.sys DdCreateMoComp"); return pfnDdCreateMoComp(hDirectDraw, puCreateMoCompData); } @@ -63,11 +63,11 @@ if (pfnDxDdDestroyMoComp == NULL) { - DPRINT1("Warring no pfnDxDdDestroyMoComp"); - return DDHAL_DRIVER_NOTHANDLED; - } - - DPRINT1("Calling on dxg.sys DxDdDestroyMoComp"); + DPRINT1("Warning: no pfnDxDdDestroyMoComp"); + return DDHAL_DRIVER_NOTHANDLED; + } + + DPRINT1("Calling dxg.sys DxDdDestroyMoComp"); return pfnDxDdDestroyMoComp(hMoComp, puBeginFrameData); } @@ -83,11 +83,11 @@ if (pfnDdEndMoCompFrame == NULL) { - DPRINT1("Warring no pfnDdEndMoCompFrame"); - return DDHAL_DRIVER_NOTHANDLED; - } - - DPRINT1("Calling on dxg.sys pfnDdEndMoCompFrame"); + DPRINT1("Warning: no pfnDdEndMoCompFrame"); + return DDHAL_DRIVER_NOTHANDLED; + } + + DPRINT1("Calling dxg.sys pfnDdEndMoCompFrame"); return pfnDdEndMoCompFrame(hMoComp, puEndFrameData); } @@ -103,11 +103,11 @@ if (pfnDdGetInternalMoCompInfo == NULL) { - DPRINT1("Warring no pfnDdGetInternalMoCompInfo"); - return DDHAL_DRIVER_NOTHANDLED; - } - - DPRINT1("Calling on dxg.sys pfnDdGetInternalMoCompInfo"); + DPRINT1("Warning: no pfnDdGetInternalMoCompInfo"); + return DDHAL_DRIVER_NOTHANDLED; + } + + DPRINT1("Calling dxg.sys pfnDdGetInternalMoCompInfo"); return pfnDdGetInternalMoCompInfo(hDirectDraw, puGetInternalData); } @@ -124,11 +124,11 @@ if (pfnDdGetMoCompBuffInfo == NULL) { - DPRINT1("Warring no pfnDdGetMoCompBuffInfo"); - return DDHAL_DRIVER_NOTHANDLED; - } - - DPRINT1("Calling on dxg.sys pfnDdGetMoCompBuffInfo"); + DPRINT1("Warning: no pfnDdGetMoCompBuffInfo"); + return DDHAL_DRIVER_NOTHANDLED; + } + + DPRINT1("Calling dxg.sys pfnDdGetMoCompBuffInfo"); return pfnDdGetMoCompBuffInfo(hDirectDraw, puGetBuffData); } @@ -144,11 +144,11 @@ if (pfnDdGetMoCompFormats == NULL) { - DPRINT1("Warring no pfnDdGetMoCompFormats"); - return DDHAL_DRIVER_NOTHANDLED; - } - - DPRINT1("Calling on dxg.sys pfnDdGetMoCompFormats"); + DPRINT1("Warning: no pfnDdGetMoCompFormats"); + return DDHAL_DRIVER_NOTHANDLED; + } + + DPRINT1("Calling dxg.sys pfnDdGetMoCompFormats"); return pfnDdGetMoCompFormats(hDirectDraw, puGetMoCompFormatsData); } @@ -165,11 +165,11 @@ if (pfnDdGetMoCompGuids == NULL) { - DPRINT1("Warring no pfnDdGetMoCompGuids"); - return DDHAL_DRIVER_NOTHANDLED; - } - - DPRINT1("Calling on dxg.sys pfnDdGetMoCompGuids"); + DPRINT1("Warning: no pfnDdGetMoCompGuids"); + return DDHAL_DRIVER_NOTHANDLED; + } + + DPRINT1("Calling dxg.sys pfnDdGetMoCompGuids"); return pfnDdGetMoCompGuids(hDirectDraw, puGetMoCompGuidsData); } @@ -187,11 +187,11 @@ if (pfnDdQueryMoCompStatus == NULL) { - DPRINT1("Warring no pfnDdQueryMoCompStatus"); - return DDHAL_DRIVER_NOTHANDLED; - } - - DPRINT1("Calling on dxg.sys pfnDdQueryMoCompStatus"); + DPRINT1("Warning: no pfnDdQueryMoCompStatus"); + return DDHAL_DRIVER_NOTHANDLED; + } + + DPRINT1("Calling dxg.sys pfnDdQueryMoCompStatus"); return pfnDdQueryMoCompStatus(hMoComp, puQueryMoCompStatusData); } @@ -208,11 +208,11 @@ if (pfnDdRenderMoComp == NULL) { - DPRINT1("Warring no pfnDdRenderMoComp"); - return DDHAL_DRIVER_NOTHANDLED; - } - - DPRINT1("Calling on dxg.sys pfnDdRenderMoComp"); + DPRINT1("Warning: no pfnDdRenderMoComp"); + return DDHAL_DRIVER_NOTHANDLED; + } + + DPRINT1("Calling dxg.sys pfnDdRenderMoComp"); return pfnDdRenderMoComp(hMoComp, puRenderMoCompData); }

1 0

[gschneider] 37169: - Several ExFreePool -> ExFreePoolWithTag changes (local allocations) - Tested for ~2 weeks now, no BAD_POOL_CALLER's so far
by gschneider＠svn.reactos.org 03 Nov '08

03 Nov '08

Author: gschneider Date: Mon Nov 3 07:26:03 2008 New Revision: 37169 URL: http://svn.reactos.org/svn/reactos?rev=37169&view=rev Log: - Several ExFreePool -> ExFreePoolWithTag changes (local allocations) - Tested for ~2 weeks now, no BAD_POOL_CALLER's so far Modified: trunk/reactos/subsystems/win32/win32k/eng/event.c trunk/reactos/subsystems/win32/win32k/eng/semaphor.c trunk/reactos/subsystems/win32/win32k/ntuser/accelerator.c trunk/reactos/subsystems/win32/win32k/ntuser/caret.c trunk/reactos/subsystems/win32/win32k/ntuser/winsta.c trunk/reactos/subsystems/win32/win32k/objects/bitblt.c trunk/reactos/subsystems/win32/win32k/objects/coord.c trunk/reactos/subsystems/win32/win32k/objects/pen.c Modified: trunk/reactos/subsystems/win32/win32k/eng/event.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/eng/event.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/eng/event.c [iso-8859-1] Mon Nov 3 07:26:03 2008 @@ -56,7 +56,7 @@ NULL); if (!NT_SUCCESS(Status)) { - ExFreePool(Event); + ExFreePoolWithTag(Event, TAG_DFSM); return NULL; } else Modified: trunk/reactos/subsystems/win32/win32k/eng/semaphor.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/eng/semaphor.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/eng/semaphor.c [iso-8859-1] Mon Nov 3 07:26:03 2008 @@ -16,7 +16,7 @@ return NULL; if ( !NT_SUCCESS(ExInitializeResourceLite ( psem )) ) { - ExFreePool ( psem ); + ExFreePoolWithTag ( psem, TAG_GSEM ); return NULL; } return (HSEMAPHORE)psem; Modified: trunk/reactos/subsystems/win32/win32k/ntuser/accelerator.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/accelerator.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/accelerator.c [iso-8859-1] Mon Nov 3 07:26:03 2008 @@ -371,7 +371,7 @@ Status = MmCopyFromCaller(Accel->Table, Entries, EntriesCount * sizeof(ACCEL)); if (!NT_SUCCESS(Status)) { - ExFreePool(Accel->Table); + ExFreePoolWithTag(Accel->Table, TAG_ACCEL); UserDereferenceObject(Accel); UserDeleteObject(hAccel, otAccel); SetLastNtError(Status); Modified: trunk/reactos/subsystems/win32/win32k/ntuser/caret.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/caret.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/caret.c [iso-8859-1] Mon Nov 3 07:26:03 2008 @@ -123,7 +123,7 @@ if(!NT_SUCCESS(Status) || (KeyValuePartialInfo->Type != REG_SZ)) { NtClose(KeyHandle); - ExFreePool(KeyValuePartialInfo); + ExFreePoolWithTag(KeyValuePartialInfo, TAG_STRING); return 0; } @@ -137,7 +137,7 @@ Val = 0; } - ExFreePool(KeyValuePartialInfo); + ExFreePoolWithTag(KeyValuePartialInfo, TAG_STRING); NtClose(KeyHandle); return (UINT)Val; Modified: trunk/reactos/subsystems/win32/win32k/ntuser/winsta.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/winsta.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/winsta.c [iso-8859-1] Mon Nov 3 07:26:03 2008 @@ -1259,7 +1259,7 @@ FALSE, &Context, NULL)) { /* Something went wrong, maybe someone added a directory entry? Just give up. */ - ExFreePool(Buffer); + ExFreePoolWithTag(Buffer, TAG_WINSTA); ObDereferenceObject(DirectoryHandle); return NT_SUCCESS(Status) ? STATUS_INTERNAL_ERROR : Status; } @@ -1287,7 +1287,7 @@ { if (Buffer != InitialBuffer) { - ExFreePool(Buffer); + ExFreePoolWithTag(Buffer, TAG_WINSTA); } return STATUS_BUFFER_TOO_SMALL; } @@ -1300,7 +1300,7 @@ { if (Buffer != InitialBuffer) { - ExFreePool(Buffer); + ExFreePoolWithTag(Buffer, TAG_WINSTA); } return STATUS_BUFFER_TOO_SMALL; } Modified: trunk/reactos/subsystems/win32/win32k/objects/bitblt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/bitblt.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/bitblt.c [iso-8859-1] Mon Nov 3 07:26:03 2008 @@ -1143,7 +1143,7 @@ if (!NT_SUCCESS(Status)) { - ExFreePool(rb); + ExFreePoolWithTag(rb, TAG_PATBLT); SetLastNtError(Status); return FALSE; } @@ -1152,7 +1152,7 @@ Ret = IntGdiPolyPatBlt(hDC, dwRop, rb, cRects, Mode); if (cRects > 0) - ExFreePool(rb); + ExFreePoolWithTag(rb, TAG_PATBLT); return Ret; } Modified: trunk/reactos/subsystems/win32/win32k/objects/coord.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/coord.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/coord.c [iso-8859-1] Mon Nov 3 07:26:03 2008 @@ -285,7 +285,7 @@ if(!NT_SUCCESS(Status)) { DC_UnlockDc(dc); - ExFreePool(Points); + ExFreePoolWithTag(Points, TAG_COORD); SetLastNtError(Status); return FALSE; } @@ -302,7 +302,7 @@ default: { DC_UnlockDc(dc); - ExFreePool(Points); + ExFreePoolWithTag(Points, TAG_COORD); SetLastWin32Error(ERROR_INVALID_PARAMETER); return FALSE; } @@ -324,7 +324,7 @@ if(!NT_SUCCESS(Status)) { DC_UnlockDc(dc); - ExFreePool(Points); + ExFreePoolWithTag(Points, TAG_COORD); SetLastNtError(Status); return FALSE; } @@ -332,7 +332,7 @@ // If we are getting called that means User XForms is a mess! // DC_UnlockDc(dc); - ExFreePool(Points); + ExFreePoolWithTag(Points, TAG_COORD); return TRUE; } Modified: trunk/reactos/subsystems/win32/win32k/objects/pen.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/pen.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/pen.c [iso-8859-1] Mon Nov 3 07:26:03 2008 @@ -323,7 +323,7 @@ if(!NT_SUCCESS(Status)) { SetLastNtError(Status); - ExFreePool(pSafeStyle); + ExFreePoolWithTag(pSafeStyle, TAG_PENSTYLES); return 0; } } @@ -341,7 +341,7 @@ hBrush); if (!hPen && pSafeStyle) { - ExFreePool(pSafeStyle); + ExFreePoolWithTag(pSafeStyle, TAG_PENSTYLES); } return hPen; }

1 0

[gschneider] 37168: StretchBlt: - Enable unsupported bit depth dprint (4bpp) - Respect the destination offset instead of always starting the blt at 0, 0 (8/16bpp) - Adapt routine from 8/16/32bpp, tested to be approx 15-25% faster than the old one (24bpp)
by gschneider＠svn.reactos.org 03 Nov '08

03 Nov '08

Author: gschneider Date: Mon Nov 3 06:40:24 2008 New Revision: 37168 URL: http://svn.reactos.org/svn/reactos?rev=37168&view=rev Log: StretchBlt: - Enable unsupported bit depth dprint (4bpp) - Respect the destination offset instead of always starting the blt at 0,0 (8/16bpp) - Adapt routine from 8/16/32bpp, tested to be approx 15-25% faster than the old one (24bpp) Modified: trunk/reactos/subsystems/win32/win32k/dib/dib16bpp.c trunk/reactos/subsystems/win32/win32k/dib/dib24bpp.c trunk/reactos/subsystems/win32/win32k/dib/dib4bpp.c trunk/reactos/subsystems/win32/win32k/dib/dib8bpp.c Modified: trunk/reactos/subsystems/win32/win32k/dib/dib16bpp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/di… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/dib/dib16bpp.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/dib/dib16bpp.c [iso-8859-1] Mon Nov 3 06:40:24 2008 @@ -788,12 +788,12 @@ /* FIXME : MaskOrigin, BrushOrigin, ClipRegion, Mode ? */ /* This is a reference implementation, it hasn't been optimized for speed */ - for (DesY=0; DesY<DesSizeY; DesY++) + for (DesY=DestRect->top; DesY<DestRect->bottom; DesY++) { sx = SourceRect->left; sx_dec = 0; - for (DesX=0; DesX<DesSizeX; DesX++) + for (DesX=DestRect->left; DesX<DestRect->right; DesX++) { color = XLATEOBJ_iXlate(ColorTranslation, DIB_1BPP_GetPixel(SourceSurf, sx, sy)); @@ -823,12 +823,12 @@ /* FIXME : MaskOrigin, BrushOrigin, ClipRegion, Mode ? */ /* This is a reference implementation, it hasn't been optimized for speed */ - for (DesY=0; DesY<DesSizeY; DesY++) + for (DesY=DestRect->top; DesY<DestRect->bottom; DesY++) { sx = SourceRect->left; sx_dec = 0; - for (DesX=0; DesX<DesSizeX; DesX++) + for (DesX=DestRect->left; DesX<DestRect->right; DesX++) { color = XLATEOBJ_iXlate(ColorTranslation, DIB_4BPP_GetPixel(SourceSurf, sx, sy)); @@ -858,12 +858,12 @@ /* FIXME : MaskOrigin, BrushOrigin, ClipRegion, Mode ? */ /* This is a reference implementation, it hasn't been optimized for speed */ - for (DesY=0; DesY<DesSizeY; DesY++) + for (DesY=DestRect->top; DesY<DestRect->bottom; DesY++) { sx = SourceRect->left; sx_dec = 0; - for (DesX=0; DesX<DesSizeX; DesX++) + for (DesX=DestRect->left; DesX<DestRect->right; DesX++) { color = XLATEOBJ_iXlate(ColorTranslation, DIB_8BPP_GetPixel(SourceSurf, sx, sy)); @@ -894,12 +894,12 @@ /* FIXME : MaskOrigin, BrushOrigin, ClipRegion, Mode ? */ /* This is a reference implementation, it hasn't been optimized for speed */ - for (DesY=0; DesY<DesSizeY; DesY++) + for (DesY=DestRect->top; DesY<DestRect->bottom; DesY++) { sx = SourceRect->left; sx_dec = 0; - for (DesX=0; DesX<DesSizeX; DesX++) + for (DesX=DestRect->left; DesX<DestRect->right; DesX++) { color = XLATEOBJ_iXlate(ColorTranslation, DIB_24BPP_GetPixel(SourceSurf, sx, sy)); @@ -929,12 +929,12 @@ /* FIXME : MaskOrigin, BrushOrigin, ClipRegion, Mode ? */ /* This is a reference implementation, it hasn't been optimized for speed */ - for (DesY=0; DesY<DesSizeY; DesY++) + for (DesY=DestRect->top; DesY<DestRect->bottom; DesY++) { sx = SourceRect->left; sx_dec = 0; - for (DesX=0; DesX<DesSizeX; DesX++) + for (DesX=DestRect->left; DesX<DestRect->right; DesX++) { color = XLATEOBJ_iXlate(ColorTranslation, DIB_32BPP_GetPixel(SourceSurf, sx, sy)); Modified: trunk/reactos/subsystems/win32/win32k/dib/dib24bpp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/di… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/dib/dib24bpp.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/dib/dib24bpp.c [iso-8859-1] Mon Nov 3 06:40:24 2008 @@ -414,20 +414,50 @@ LONG SrcSizeX; LONG DesSizeY; LONG DesSizeX; - LONG sx; - LONG sy; + LONG sx = 0; + LONG sy = 0; LONG DesX; LONG DesY; - LONG color; + + LONG SrcZoomXHight; + LONG SrcZoomXLow; + LONG SrcZoomYHight; + LONG SrcZoomYLow; + + LONG sy_dec = 0; + LONG sy_max; + + LONG sx_dec = 0; + LONG sx_max; + ULONG color; DPRINT("DIB_24BPP_StretchBlt: Source BPP: %u, srcRect: (%d,%d)-(%d,%d), dstRect: (%d,%d)-(%d,%d)\n", BitsPerFormat(SourceSurf->iBitmapFormat), SourceRect->left, SourceRect->top, SourceRect->right, SourceRect->bottom, DestRect->left, DestRect->top, DestRect->right, DestRect->bottom); - SrcSizeY = SourceRect->bottom - SourceRect->top; - SrcSizeX = SourceRect->right - SourceRect->left; - - DesSizeY = DestRect->bottom - DestRect->top; - DesSizeX = DestRect->right - DestRect->left; + + /* Calc the Zoom height of Source */ + SrcSizeY = SourceRect->bottom - SourceRect->top; + + /* Calc the Zoom Width of Source */ + SrcSizeX = SourceRect->right - SourceRect->left; + + /* Calc the Zoom height of Destinations */ + DesSizeY = DestRect->bottom - DestRect->top; + + /* Calc the Zoom width of Destinations */ + DesSizeX = DestRect->right - DestRect->left; + + /* Calc the zoom factor of source height */ + SrcZoomYHight = SrcSizeY / DesSizeY; + SrcZoomYLow = SrcSizeY - (SrcZoomYHight * DesSizeY); + + /* Calc the zoom factor of source width */ + SrcZoomXHight = SrcSizeX / DesSizeX; + SrcZoomXLow = SrcSizeX - (SrcZoomXHight * DesSizeX); + + sx_max = DesSizeX; + sy_max = DesSizeY; + sy = SourceRect->top; switch(SourceSurf->iBitmapFormat) { @@ -437,20 +467,31 @@ for (DesY=DestRect->top; DesY<DestRect->bottom; DesY++) { - sy = (((DesY - DestRect->top) * SrcSizeY) / DesSizeY) + SourceRect->top; + sx = SourceRect->left; + sx_dec = 0; for (DesX=DestRect->left; DesX<DestRect->right; DesX++) { - sx = (((DesX - DestRect->left) * SrcSizeX) / DesSizeX) + SourceRect->left; - - if(DIB_1BPP_GetPixel(SourceSurf, sx, sy) == 0) - { - DIB_24BPP_PutPixel(DestSurf, DesX, DesY, XLATEOBJ_iXlate(ColorTranslation, 0)); - } - else - { - DIB_24BPP_PutPixel(DestSurf, DesX, DesY, XLATEOBJ_iXlate(ColorTranslation, 1)); - } + color = XLATEOBJ_iXlate(ColorTranslation, + DIB_1BPP_GetPixel(SourceSurf, sx, sy)); + + DIB_24BPP_PutPixel(DestSurf, DesX, DesY, color); + + sx += SrcZoomXHight; + sx_dec += SrcZoomXLow; + if (sx_dec >= sx_max) + { + sx++; + sx_dec -= sx_max; + } + } + + sy += SrcZoomYHight; + sy_dec += SrcZoomYLow; + if (sy_dec >= sy_max) + { + sy++; + sy_dec -= sy_max; } } @@ -462,13 +503,31 @@ for (DesY=DestRect->top; DesY<DestRect->bottom; DesY++) { - sy = (((DesY - DestRect->top) * SrcSizeY) / DesSizeY) + SourceRect->top; + sx = SourceRect->left; + sx_dec = 0; for (DesX=DestRect->left; DesX<DestRect->right; DesX++) { - sx = (((DesX - DestRect->left) * SrcSizeX) / DesSizeX) + SourceRect->left; - color = DIB_4BPP_GetPixel(SourceSurf, sx, sy); - DIB_24BPP_PutPixel(DestSurf, DesX, DesY, XLATEOBJ_iXlate(ColorTranslation, color)); + color = XLATEOBJ_iXlate(ColorTranslation, + DIB_4BPP_GetPixel(SourceSurf, sx, sy)); + + DIB_24BPP_PutPixel(DestSurf, DesX, DesY, color); + + sx += SrcZoomXHight; + sx_dec += SrcZoomXLow; + if (sx_dec >= sx_max) + { + sx++; + sx_dec -= sx_max; + } + } + + sy += SrcZoomYHight; + sy_dec += SrcZoomYLow; + if (sy_dec >= sy_max) + { + sy++; + sy_dec -= sy_max; } } break; @@ -479,13 +538,31 @@ for (DesY=DestRect->top; DesY<DestRect->bottom; DesY++) { - sy = (((DesY - DestRect->top) * SrcSizeY) / DesSizeY) + SourceRect->top; + sx = SourceRect->left; + sx_dec = 0; for (DesX=DestRect->left; DesX<DestRect->right; DesX++) { - sx = (((DesX - DestRect->left) * SrcSizeX) / DesSizeX) + SourceRect->left; - color = DIB_8BPP_GetPixel(SourceSurf, sx, sy); - DIB_24BPP_PutPixel(DestSurf, DesX, DesY, XLATEOBJ_iXlate(ColorTranslation, color)); + color = XLATEOBJ_iXlate(ColorTranslation, + DIB_8BPP_GetPixel(SourceSurf, sx, sy)); + + DIB_24BPP_PutPixel(DestSurf, DesX, DesY, color); + + sx += SrcZoomXHight; + sx_dec += SrcZoomXLow; + if (sx_dec >= sx_max) + { + sx++; + sx_dec -= sx_max; + } + } + + sy += SrcZoomYHight; + sy_dec += SrcZoomYLow; + if (sy_dec >= sy_max) + { + sy++; + sy_dec -= sy_max; } } break; @@ -496,13 +573,31 @@ for (DesY=DestRect->top; DesY<DestRect->bottom; DesY++) { - sy = (((DesY - DestRect->top) * SrcSizeY) / DesSizeY) + SourceRect->top; + sx = SourceRect->left; + sx_dec = 0; for (DesX=DestRect->left; DesX<DestRect->right; DesX++) { - sx = (((DesX - DestRect->left) * SrcSizeX) / DesSizeX) + SourceRect->left; - color = DIB_16BPP_GetPixel(SourceSurf, sx, sy); - DIB_24BPP_PutPixel(DestSurf, DesX, DesY, XLATEOBJ_iXlate(ColorTranslation, color)); + color = XLATEOBJ_iXlate(ColorTranslation, + DIB_16BPP_GetPixel(SourceSurf, sx, sy)); + + DIB_24BPP_PutPixel(DestSurf, DesX, DesY, color); + + sx += SrcZoomXHight; + sx_dec += SrcZoomXLow; + if (sx_dec >= sx_max) + { + sx++; + sx_dec -= sx_max; + } + } + + sy += SrcZoomYHight; + sy_dec += SrcZoomYLow; + if (sy_dec >= sy_max) + { + sy++; + sy_dec -= sy_max; } } break; @@ -513,13 +608,31 @@ for (DesY=DestRect->top; DesY<DestRect->bottom; DesY++) { - sy = (((DesY - DestRect->top) * SrcSizeY) / DesSizeY) + SourceRect->top; + sx = SourceRect->left; + sx_dec = 0; for (DesX=DestRect->left; DesX<DestRect->right; DesX++) { - sx = (((DesX - DestRect->left) * SrcSizeX) / DesSizeX) + SourceRect->left; - color = DIB_24BPP_GetPixel(SourceSurf, sx, sy); - DIB_24BPP_PutPixel(DestSurf, DesX, DesY, XLATEOBJ_iXlate(ColorTranslation, color)); + color = XLATEOBJ_iXlate(ColorTranslation, + DIB_24BPP_GetPixel(SourceSurf, sx, sy)); + + DIB_24BPP_PutPixel(DestSurf, DesX, DesY, color); + + sx += SrcZoomXHight; + sx_dec += SrcZoomXLow; + if (sx_dec >= sx_max) + { + sx++; + sx_dec -= sx_max; + } + } + + sy += SrcZoomYHight; + sy_dec += SrcZoomYLow; + if (sy_dec >= sy_max) + { + sy++; + sy_dec -= sy_max; } } break; @@ -530,13 +643,31 @@ for (DesY=DestRect->top; DesY<DestRect->bottom; DesY++) { - sy = (((DesY - DestRect->top) * SrcSizeY) / DesSizeY) + SourceRect->top; + sx = SourceRect->left; + sx_dec = 0; for (DesX=DestRect->left; DesX<DestRect->right; DesX++) { - sx = (((DesX - DestRect->left) * SrcSizeX) / DesSizeX) + SourceRect->left; - color = DIB_32BPP_GetPixel(SourceSurf, sx, sy); - DIB_24BPP_PutPixel(DestSurf, DesX, DesY, XLATEOBJ_iXlate(ColorTranslation, color)); + color = XLATEOBJ_iXlate(ColorTranslation, + DIB_32BPP_GetPixel(SourceSurf, sx, sy)); + + DIB_24BPP_PutPixel(DestSurf, DesX, DesY, color); + + sx += SrcZoomXHight; + sx_dec += SrcZoomXLow; + if (sx_dec >= sx_max) + { + sx++; + sx_dec -= sx_max; + } + } + + sy += SrcZoomYHight; + sy_dec += SrcZoomYLow; + if (sy_dec >= sy_max) + { + sy++; + sy_dec -= sy_max; } } break; Modified: trunk/reactos/subsystems/win32/win32k/dib/dib4bpp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/di… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/dib/dib4bpp.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/dib/dib4bpp.c [iso-8859-1] Mon Nov 3 06:40:24 2008 @@ -510,7 +510,7 @@ break; default: - //DPRINT1("DIB_4BPP_StretchBlt: Unhandled Source BPP: %u\n", BitsPerFormat(SourceSurf->iBitmapFormat)); + DPRINT1("DIB_4BPP_StretchBlt: Unhandled Source BPP: %u\n", BitsPerFormat(SourceSurf->iBitmapFormat)); return FALSE; } Modified: trunk/reactos/subsystems/win32/win32k/dib/dib8bpp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/di… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/dib/dib8bpp.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/dib/dib8bpp.c [iso-8859-1] Mon Nov 3 06:40:24 2008 @@ -522,11 +522,11 @@ case BMF_1BPP: /* FIXME : MaskOrigin, BrushOrigin, ClipRegion, Mode ? */ /* This is a reference implementation, it hasn't been optimized for speed */ - for (DesY=0; DesY<DesSizeY; DesY++) + for (DesY=DestRect->top; DesY<DestRect->bottom; DesY++) { sx = SourceRect->left; sx_dec = 0; - for (DesX=0; DesX<DesSizeX; DesX++) + for (DesX=DestRect->left; DesX<DestRect->right; DesX++) { color = XLATEOBJ_iXlate(ColorTranslation, DIB_1BPP_GetPixel(SourceSurf, sx, sy)); @@ -555,11 +555,11 @@ case BMF_4BPP: /* FIXME : MaskOrigin, BrushOrigin, ClipRegion, Mode ? */ /* This is a reference implementation, it hasn't been optimized for speed */ - for (DesY=0; DesY<DesSizeY; DesY++) + for (DesY=DestRect->top; DesY<DestRect->bottom; DesY++) { sx = SourceRect->left; sx_dec = 0; - for (DesX=0; DesX<DesSizeX; DesX++) + for (DesX=DestRect->left; DesX<DestRect->right; DesX++) { color = XLATEOBJ_iXlate(ColorTranslation, DIB_4BPP_GetPixel(SourceSurf, sx, sy)); @@ -593,11 +593,11 @@ case BMF_16BPP: /* FIXME : MaskOrigin, BrushOrigin, ClipRegion, Mode ? */ /* This is a reference implementation, it hasn't been optimized for speed */ - for (DesY=0; DesY<DesSizeY; DesY++) + for (DesY=DestRect->top; DesY<DestRect->bottom; DesY++) { sx = SourceRect->left; sx_dec = 0; - for (DesX=0; DesX<DesSizeX; DesX++) + for (DesX=DestRect->left; DesX<DestRect->right; DesX++) { color = XLATEOBJ_iXlate(ColorTranslation, DIB_16BPP_GetPixel(SourceSurf, sx, sy)); @@ -624,11 +624,11 @@ break; case BMF_24BPP: - for (DesY=0; DesY<DesSizeY; DesY++) + for (DesY=DestRect->top; DesY<DestRect->bottom; DesY++) { sx = SourceRect->left; sx_dec = 0; - for (DesX=0; DesX<DesSizeX; DesX++) + for (DesX=DestRect->left; DesX<DestRect->right; DesX++) { color = XLATEOBJ_iXlate(ColorTranslation, DIB_24BPP_GetPixel(SourceSurf, sx, sy)); @@ -657,11 +657,11 @@ case BMF_32BPP: /* FIXME : MaskOrigin, BrushOrigin, ClipRegion, Mode ? */ /* This is a reference implementation, it hasn't been optimized for speed */ - for (DesY=0; DesY<DesSizeY; DesY++) + for (DesY=DestRect->top; DesY<DestRect->bottom; DesY++) { sx = SourceRect->left; sx_dec = 0; - for (DesX=0; DesX<DesSizeX; DesX++) + for (DesX=DestRect->left; DesX<DestRect->right; DesX++) { color = XLATEOBJ_iXlate(ColorTranslation, DIB_32BPP_GetPixel(SourceSurf, sx, sy));

1 0

[dchapyshev] 37167: - Move IsWow64Process to proc.c - Implement FatalAppExitW (based on Wine)
by dchapyshev＠svn.reactos.org 03 Nov '08

03 Nov '08

Author: dchapyshev Date: Mon Nov 3 06:27:39 2008 New Revision: 37167 URL: http://svn.reactos.org/svn/reactos?rev=37167&view=rev Log: - Move IsWow64Process to proc.c - Implement FatalAppExitW (based on Wine) Modified: trunk/reactos/dll/win32/kernel32/misc/stubs.c trunk/reactos/dll/win32/kernel32/process/proc.c Modified: trunk/reactos/dll/win32/kernel32/misc/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/st… ============================================================================== --- trunk/reactos/dll/win32/kernel32/misc/stubs.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/misc/stubs.c [iso-8859-1] Mon Nov 3 06:27:39 2008 @@ -529,35 +529,6 @@ { STUB; return 0; -} - -/* - * @implemented - */ -BOOL -STDCALL -IsWow64Process( - HANDLE hProcess, - PBOOL Wow64Process - ) -{ - ULONG pbi; - NTSTATUS Status; - - Status = NtQueryInformationProcess(hProcess, - ProcessWow64Information, - &pbi, - sizeof(pbi), - NULL); - - if (Status != STATUS_SUCCESS) - { - SetLastError(RtlNtStatusToDosError(Status)); - return FALSE; - } - - *Wow64Process = (pbi != 0); - return TRUE; } /* Modified: trunk/reactos/dll/win32/kernel32/process/proc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/process… ============================================================================== --- trunk/reactos/dll/win32/kernel32/process/proc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/process/proc.c [iso-8859-1] Mon Nov 3 06:27:39 2008 @@ -16,6 +16,8 @@ #define NDEBUG #include <debug.h> + +typedef INT (WINAPI *MessageBoxW_Proc) (HWND, LPCWSTR, LPCWSTR, UINT); /* GLOBALS *******************************************************************/ @@ -617,8 +619,8 @@ * @unimplemented */ VOID STDCALL -FatalAppExitA (UINT uAction, - LPCSTR lpMessageText) +FatalAppExitA(UINT uAction, + LPCSTR lpMessageText) { UNICODE_STRING MessageTextU; ANSI_STRING MessageText; @@ -640,9 +642,24 @@ */ VOID STDCALL FatalAppExitW(UINT uAction, - LPCWSTR lpMessageText) -{ - return; + LPCWSTR lpMessageText) +{ + static const WCHAR szUser32[] = L"user32.dll\0"; + + HMODULE hModule = GetModuleHandleW(szUser32); + MessageBoxW_Proc pMessageBoxW = NULL; + + DPRINT1("AppExit\n"); + + if (hModule) + pMessageBoxW = (MessageBoxW_Proc) GetProcAddress(hModule, "MessageBoxW"); + + if (pMessageBoxW) + pMessageBoxW(0, lpMessageText, NULL, MB_SYSTEMMODAL | MB_OK); + else + DPRINT1("%s\n", lpMessageText); + + ExitProcess(0); } @@ -895,4 +912,34 @@ return FALSE; } + +/* + * @implemented + */ +BOOL +STDCALL +IsWow64Process( + HANDLE hProcess, + PBOOL Wow64Process + ) +{ + ULONG pbi; + NTSTATUS Status; + + Status = NtQueryInformationProcess(hProcess, + ProcessWow64Information, + &pbi, + sizeof(pbi), + NULL); + + if (!NT_SUCCESS(Status)) + { + SetLastError(RtlNtStatusToDosError(Status)); + return FALSE; + } + + *Wow64Process = (pbi != 0); + return TRUE; +} + /* EOF */

1 0

[pschweitzer] 37166: Fast mutex are allocated with non paged memory. Spotted by Alex
by pschweitzer＠svn.reactos.org 03 Nov '08

03 Nov '08

Author: pschweitzer Date: Mon Nov 3 06:25:10 2008 New Revision: 37166 URL: http://svn.reactos.org/svn/reactos?rev=37166&view=rev Log: Fast mutex are allocated with non paged memory. Spotted by Alex Modified: branches/pierre-fsd/ntoskrnl/fsrtl/largemcb.c Modified: branches/pierre-fsd/ntoskrnl/fsrtl/largemcb.c URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/ntoskrnl/fsrtl/large… ============================================================================== --- branches/pierre-fsd/ntoskrnl/fsrtl/largemcb.c [iso-8859-1] (original) +++ branches/pierre-fsd/ntoskrnl/fsrtl/largemcb.c [iso-8859-1] Mon Nov 3 06:25:10 2008 @@ -16,7 +16,7 @@ /* GLOBALS *******************************************************************/ PAGED_LOOKASIDE_LIST FsRtlFirstMappingLookasideList; -PAGED_LOOKASIDE_LIST FsRtlFastMutexLookasideList; +NPAGED_LOOKASIDE_LIST FsRtlFastMutexLookasideList; /* PUBLIC FUNCTIONS **********************************************************/ @@ -129,7 +129,7 @@ FsRtlInitializeLargeMcb(IN PLARGE_MCB Mcb, IN POOL_TYPE PoolType) { - Mcb->FastMutex = ExAllocateFromPagedLookasideList(&FsRtlFastMutexLookasideList); + Mcb->FastMutex = ExAllocateFromNPagedLookasideList(&FsRtlFastMutexLookasideList); ExInitializeFastMutex(Mcb->FastMutex); FsRtlInitializeBaseMcb(&(Mcb->BaseMcb), PoolType); @@ -152,13 +152,13 @@ 0); /* FIXME: Should be 4 */ /* Initialize the list for the fast mutex */ - ExInitializePagedLookasideList(&FsRtlFastMutexLookasideList, - NULL, - NULL, - POOL_RAISE_IF_ALLOCATION_FAILURE, - sizeof(FAST_MUTEX), - IFS_POOL_TAG, - 0); /* FIXME: Should be 32 */ + ExInitializeNPagedLookasideList(&FsRtlFastMutexLookasideList, + NULL, + NULL, + POOL_RAISE_IF_ALLOCATION_FAILURE, + sizeof(FAST_MUTEX), + IFS_POOL_TAG, + 0); /* FIXME: Should be 32 */ } /* @@ -453,8 +453,8 @@ { if (Mcb->FastMutex) { - ExFreeToPagedLookasideList(&FsRtlFastMutexLookasideList, - Mcb->FastMutex); + ExFreeToNPagedLookasideList(&FsRtlFastMutexLookasideList, + Mcb->FastMutex); FsRtlUninitializeBaseMcb(&(Mcb->BaseMcb)); } }

1 0

[dchapyshev] 37165: - Implement IsWow64Process (based on Wine)
by dchapyshev＠svn.reactos.org 03 Nov '08

03 Nov '08

Author: dchapyshev Date: Mon Nov 3 05:46:02 2008 New Revision: 37165 URL: http://svn.reactos.org/svn/reactos?rev=37165&view=rev Log: - Implement IsWow64Process (based on Wine) Modified: trunk/reactos/dll/win32/kernel32/misc/stubs.c Modified: trunk/reactos/dll/win32/kernel32/misc/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/st… ============================================================================== --- trunk/reactos/dll/win32/kernel32/misc/stubs.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/misc/stubs.c [iso-8859-1] Mon Nov 3 05:46:02 2008 @@ -532,7 +532,7 @@ } /* - * @unimplemented + * @implemented */ BOOL STDCALL @@ -541,8 +541,22 @@ PBOOL Wow64Process ) { - STUB; - *Wow64Process = FALSE; + ULONG pbi; + NTSTATUS Status; + + Status = NtQueryInformationProcess(hProcess, + ProcessWow64Information, + &pbi, + sizeof(pbi), + NULL); + + if (Status != STATUS_SUCCESS) + { + SetLastError(RtlNtStatusToDosError(Status)); + return FALSE; + } + + *Wow64Process = (pbi != 0); return TRUE; }

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