Ros-diffs

ros-diffs@reactos.org

81390 discussions

[jimtabor] 33015: Add new examples for retrieving DC origin.
by jimtabor＠svn.reactos.org 18 Apr '08

18 Apr '08

Author: jimtabor Date: Thu Apr 17 21:23:38 2008 New Revision: 33015 URL: http://svn.reactos.org/svn/reactos?rev=33015&view=rev Log: Add new examples for retrieving DC origin. Modified: trunk/reactos/subsystems/win32/win32k/include/dc.h trunk/reactos/subsystems/win32/win32k/objects/dc.c Modified: trunk/reactos/subsystems/win32/win32k/include/dc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/dc.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/dc.h [iso-8859-1] Thu Apr 17 21:23:38 2008 @@ -97,7 +97,7 @@ HDC hNext; HDC hPrev; RECTL erclClip; - POINTL ptlSaveFillOrig; + POINTL ptlDCOrig; RECTL erclWindow; RECTL erclBounds; RECTL erclBoundsApp; Modified: trunk/reactos/subsystems/win32/win32k/objects/dc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dc.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dc.c [iso-8859-1] Thu Apr 17 21:23:38 2008 @@ -1116,8 +1116,8 @@ LONG FASTCALL IntCalcFillOrigin(PDC pdc) { - pdc->ptlFillOrigin.x = pdc->DcLevel.ptlBrushOrigin.x + pdc->ptlSaveFillOrig.x; - pdc->ptlFillOrigin.y = pdc->DcLevel.ptlBrushOrigin.y + pdc->ptlSaveFillOrig.y; + pdc->ptlFillOrigin.x = pdc->DcLevel.ptlBrushOrigin.x + pdc->ptlDCOrig.x; + pdc->ptlFillOrigin.y = pdc->DcLevel.ptlBrushOrigin.y + pdc->ptlDCOrig.y; return pdc->ptlFillOrigin.y; } @@ -1131,14 +1131,37 @@ pdc = DC_LockDc(hDC); if (!pdc) return; - pdc->ptlSaveFillOrig.x = Left; - pdc->ptlSaveFillOrig.y = Top; + pdc->ptlDCOrig.x = Left; + pdc->ptlDCOrig.y = Top; IntCalcFillOrigin(pdc); if (prc) pdc->erclWindow = *prc; DC_UnlockDc(pdc); +} + + +BOOL FASTCALL +IntGdiGetDCOrg(PDC pDc, PPOINTL ppt) +{ + *ppt = pDc->ptlDCOrig; + return TRUE; +} + +BOOL STDCALL +GdiGetDCOrgEx(HDC hDC, PPOINTL ppt, PRECTL prc) +{ + PDC pdc; + + pdc = DC_LockDc(hDC); + if (!pdc) return FALSE; + + *prc = pdc->erclWindow; + *ppt = pdc->ptlDCOrig; + + DC_UnlockDc(pdc); + return TRUE; } BOOL FASTCALL

1 0

[greatlrd] 33014: fixed pipe working again from cmd more investigate are need it to figout who to really solv bat and pipe and gui apps issue so none regress and working fine in all case. rember gui apps can resive pipe from cmd or send to cmd
by greatlrd＠svn.reactos.org 18 Apr '08

18 Apr '08

Author: greatlrd Date: Thu Apr 17 19:56:01 2008 New Revision: 33014 URL: http://svn.reactos.org/svn/reactos?rev=33014&view=rev Log: fixed pipe working again from cmd more investigate are need it to figout who to really solv bat and pipe and gui apps issue so none regress and working fine in all case. rember gui apps can resive pipe from cmd or send to cmd Modified: trunk/reactos/base/shell/cmd/cmd.c Modified: trunk/reactos/base/shell/cmd/cmd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/cmd.c?rev=3… ============================================================================== --- trunk/reactos/base/shell/cmd/cmd.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/cmd.c [iso-8859-1] Thu Apr 17 19:56:01 2008 @@ -810,18 +810,9 @@ FILE_ATTRIBUTE_NORMAL, NULL); if (hFile == INVALID_HANDLE_VALUE) { - if (bc) - { - /* will fail for windows gui apps */ - num = 0; - bc->hBatchFile = INVALID_HANDLE_VALUE; - } - else - { - LoadString(CMD_ModuleHandle, STRING_CMD_ERROR1, szMsg, RC_STRING_MAX_SIZE); - ConErrPrintf(szMsg, in); - return; - } + LoadString(CMD_ModuleHandle, STRING_CMD_ERROR1, szMsg, RC_STRING_MAX_SIZE); + ConErrPrintf(szMsg, in); + return; } if (!SetStdHandle (STD_INPUT_HANDLE, hFile)) @@ -900,7 +891,7 @@ /* Now set up the end conditions... */ /* redirect STDOUT */ - if ((bc) && (bc->hBatchFile != INVALID_HANDLE_VALUE) && (out[0])) + if (out[0]) { /* Final output to here */ HANDLE hFile; @@ -967,7 +958,7 @@ } /* redirect STDERR */ - if ((bc) && (bc->hBatchFile != INVALID_HANDLE_VALUE) && (err[0])) + if (err[0]) { /* Final output to here */ HANDLE hFile; @@ -1173,23 +1164,15 @@ if (position) { position += 2; - if (_tcschr(position, _T(',')) != NULL) + Token = _tcstok(position, _T(",")); + while ((Token != NULL) && (i < 2)) { - Token = _tcstok(position, _T(",")); - while ((Token != NULL) && (i < 2)) - { - StringPart[i] = _ttoi(Token); - i++; - Token = _tcstok (NULL, _T(",")); - } - if (i > 0) - { - if (StringPart[1] < 0) - StringPart[1] = _tcslen(ret + StringPart[0]) + StringPart[1]; - _tcsncpy(ReturnValue, ret + StringPart[0], StringPart[1]); - _tcscpy(ret, ReturnValue); - } + StringPart[i] = _ttoi(Token); + i++; + Token = _tcstok (NULL, _T(",")); } + _tcsncpy(ReturnValue, ret + StringPart[0], StringPart[1]); + _tcscpy(ret, ReturnValue); return ret; } else

1 0

[dreimer] 33013: Bug 3180, 3182 Korean Updates by Seungju Kim (admin@manateeshome.com) Polish Updates by Olaf Siejka Bug 3184 Spanish Updates by Javier Remacha (remialdo@gmail.com)
by dreimer＠svn.reactos.org 17 Apr '08

17 Apr '08

Author: dreimer Date: Thu Apr 17 18:36:00 2008 New Revision: 33013 URL: http://svn.reactos.org/svn/reactos?rev=33013&view=rev Log: Bug 3180, 3182 Korean Updates by Seungju Kim (admin(a)manateeshome.com) Polish Updates by Olaf Siejka Bug 3184 Spanish Updates by Javier Remacha (remialdo(a)gmail.com) Added: trunk/reactos/base/applications/dxdiag/lang/pl-PL.rc (with props) trunk/reactos/base/applications/mscutils/servman/lang/ko-KO.rc (with props) trunk/reactos/base/shell/explorer/explorer-ko.rc (with props) Modified: trunk/reactos/base/applications/dxdiag/rsrc.rc trunk/reactos/base/applications/mscutils/servman/rsrc.rc trunk/reactos/base/applications/regedit/lang/pl-PL.rc trunk/reactos/base/applications/screensavers/logon/logon.rc trunk/reactos/base/applications/sndvol32/lang/es-ES.rc trunk/reactos/base/shell/explorer/explorer_intres.rc trunk/reactos/dll/cpl/desk/lang/es-ES.rc trunk/reactos/dll/cpl/input/lang/es-ES.rc trunk/reactos/dll/cpl/intl/lang/es-ES.rc trunk/reactos/dll/cpl/joy/lang/es-ES.rc trunk/reactos/dll/cpl/main/lang/es-ES.rc trunk/reactos/dll/cpl/main/lang/pl-PL.rc trunk/reactos/dll/cpl/mmsys/lang/es-ES.rc trunk/reactos/dll/cpl/ncpa/lang/es-ES.rc trunk/reactos/dll/cpl/powercfg/lang/es-ES.rc trunk/reactos/dll/cpl/sysdm/lang/es-ES.rc trunk/reactos/dll/cpl/timedate/lang/es-ES.rc trunk/reactos/dll/win32/setupapi/lang/es-ES.rc trunk/reactos/dll/win32/setupapi/lang/pl-PL.rc trunk/reactos/dll/win32/shell32/lang/es-ES.rc trunk/reactos/dll/win32/shell32/lang/pl-PL.rc trunk/reactos/dll/win32/shellext/deskadp/lang/es-ES.rc trunk/reactos/dll/win32/shellext/deskmon/lang/es-ES.rc trunk/reactos/dll/win32/syssetup/lang/es-ES.rc [This mail would be too long, it was shortened to contain the URLs only.] Added: trunk/reactos/base/applications/dxdiag/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/l… Modified: trunk/reactos/base/applications/dxdiag/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/r… Added: trunk/reactos/base/applications/mscutils/servman/lang/ko-KO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/servman/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/regedit/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… Modified: trunk/reactos/base/applications/screensavers/logon/logon.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/screensa… Modified: trunk/reactos/base/applications/sndvol32/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndvol32… Added: trunk/reactos/base/shell/explorer/explorer-ko.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/explor… Modified: trunk/reactos/base/shell/explorer/explorer_intres.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/explor… Modified: trunk/reactos/dll/cpl/desk/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/es-ES.rc… Modified: trunk/reactos/dll/cpl/input/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/lang/es-ES.r… Modified: trunk/reactos/dll/cpl/intl/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/lang/es-ES.rc… Modified: trunk/reactos/dll/cpl/joy/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/joy/lang/es-ES.rc?… Modified: trunk/reactos/dll/cpl/main/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/lang/es-ES.rc… Modified: trunk/reactos/dll/cpl/main/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/lang/pl-PL.rc… Modified: trunk/reactos/dll/cpl/mmsys/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/lang/es-ES.r… Modified: trunk/reactos/dll/cpl/ncpa/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/ncpa/lang/es-ES.rc… Modified: trunk/reactos/dll/cpl/powercfg/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/powercfg/lang/es-E… Modified: trunk/reactos/dll/cpl/sysdm/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/es-ES.r… Modified: trunk/reactos/dll/cpl/timedate/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/timedate/lang/es-E… Modified: trunk/reactos/dll/win32/setupapi/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/lang/es… Modified: trunk/reactos/dll/win32/setupapi/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/lang/pl… Modified: trunk/reactos/dll/win32/shell32/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/es-… Modified: trunk/reactos/dll/win32/shell32/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/pl-… Modified: trunk/reactos/dll/win32/shellext/deskadp/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shellext/deskadp… Modified: trunk/reactos/dll/win32/shellext/deskmon/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shellext/deskmon… Modified: trunk/reactos/dll/win32/syssetup/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/es…

1 0

[greatlrd] 33012: optimze more redirect call and start kill the bad macro DXG_GET_INDEX_FUNCTION that is instable the dx hal for graphic interface started being bit more stable.
by greatlrd＠svn.reactos.org 17 Apr '08

17 Apr '08

Author: greatlrd Date: Thu Apr 17 17:25:38 2008 New Revision: 33012 URL: http://svn.reactos.org/svn/reactos?rev=33012&view=rev Log: optimze more redirect call and start kill the bad macro DXG_GET_INDEX_FUNCTION that is instable the dx hal for graphic interface started being bit more stable. Modified: trunk/reactos/subsystems/win32/win32k/ntddraw/d3d.c trunk/reactos/subsystems/win32/win32k/ntddraw/dd.c trunk/reactos/subsystems/win32/win32k/ntddraw/ddsurf.c trunk/reactos/subsystems/win32/win32k/ntddraw/dvp.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] Thu Apr 17 17:25:38 2008 @@ -289,11 +289,8 @@ STDCALL NtGdiDdDestroyD3DBuffer(HANDLE hSurface) { - PGD_DXDDDESTROYD3DBUFFER pfnDdDestroyD3DBuffer = NULL; - INT i; - - DXG_GET_INDEX_FUNCTION(DXG_INDEX_DxDdDestroyD3DBuffer, pfnDdDestroyD3DBuffer); - + PGD_DXDDDESTROYD3DBUFFER pfnDdDestroyD3DBuffer = (PGD_DXDDDESTROYD3DBUFFER)gpDxFuncs[DXG_INDEX_DxDdDestroyD3DBuffer].pfn; + if (pfnDdDestroyD3DBuffer == NULL) { DPRINT1("Warring no pfnDdDestroyD3DBuffer"); @@ -317,11 +314,8 @@ FLATPTR *pfpVidMemVtx, DWORD *pdwSizeVtx) { - PGD_D3DDRAWPRIMITIVES2 pfnD3dDrawPrimitives2 = NULL; - INT i; - - DXG_GET_INDEX_FUNCTION(DXG_INDEX_DxD3dDrawPrimitives2, pfnD3dDrawPrimitives2); - + PGD_D3DDRAWPRIMITIVES2 pfnD3dDrawPrimitives2 = (PGD_D3DDRAWPRIMITIVES2)gpDxFuncs[DXG_INDEX_DxD3dDrawPrimitives2].pfn; + if (pfnD3dDrawPrimitives2 == NULL) { DPRINT1("Warring no pfnD3dDrawPrimitives2"); @@ -341,11 +335,8 @@ NtGdiDdLockD3D(HANDLE hSurface, PDD_LOCKDATA puLockData) { - PGD_DXDDLOCKD3D pfnDdLockD3D = NULL; - INT i; - - DXG_GET_INDEX_FUNCTION(DXG_INDEX_DxDdLockD3D, pfnDdLockD3D); - + PGD_DXDDLOCKD3D pfnDdLockD3D = (PGD_DXDDLOCKD3D)gpDxFuncs[DXG_INDEX_DxDdLockD3D].pfn; + if (pfnDdLockD3D == NULL) { DPRINT1("Warring no pfnDdLockD3D"); @@ -363,11 +354,8 @@ STDCALL NtGdiD3dValidateTextureStageState(LPD3DNTHAL_VALIDATETEXTURESTAGESTATEDATA pData) { - PGD_D3DVALIDATETEXTURESTAGESTATE pfnD3dValidateTextureStageState = NULL; - INT i; - - DXG_GET_INDEX_FUNCTION(DXG_INDEX_DxD3dValidateTextureStageState, pfnD3dValidateTextureStageState); - + PGD_D3DVALIDATETEXTURESTAGESTATE pfnD3dValidateTextureStageState = (PGD_D3DVALIDATETEXTURESTAGESTATE)gpDxFuncs[DXG_INDEX_DxD3dValidateTextureStageState].pfn; + if (pfnD3dValidateTextureStageState == NULL) { DPRINT1("Warring no pfnD3dValidateTextureStageState"); @@ -386,11 +374,8 @@ NtGdiDdUnlockD3D(HANDLE hSurface, PDD_UNLOCKDATA puUnlockData) { - PGD_DXDDUNLOCKD3D pfnDdUnlockD3D = NULL; - INT i; - - DXG_GET_INDEX_FUNCTION(DXG_INDEX_DxDdUnlockD3D, pfnDdUnlockD3D); - + PGD_DXDDUNLOCKD3D pfnDdUnlockD3D = (PGD_DXDDUNLOCKD3D)gpDxFuncs[DXG_INDEX_DxDdUnlockD3D].pfn; + if (pfnDdUnlockD3D == NULL) { DPRINT1("Warring no pfnDdUnlockD3D"); 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] Thu Apr 17 17:25:38 2008 @@ -25,11 +25,8 @@ PDD_CREATESURFACEDATA puCreateSurfaceData, HANDLE *puhSurface) { - PGD_DDCREATESURFACE pfnDdCreateSurface = NULL; - INT i; - - DXG_GET_INDEX_FUNCTION(DXG_INDEX_DxDdCreateSurface, pfnDdCreateSurface); - + PGD_DDCREATESURFACE pfnDdCreateSurface = (PGD_DDCREATESURFACE)gpDxFuncs[DXG_INDEX_DxDdCreateSurface].pfn; + if (pfnDdCreateSurface == NULL) { DPRINT1("Warring no pfnDdCreateSurface"); @@ -49,11 +46,8 @@ NtGdiDdWaitForVerticalBlank(HANDLE hDirectDraw, PDD_WAITFORVERTICALBLANKDATA puWaitForVerticalBlankData) { - PGD_DXDDWAITFORVERTICALBLANK pfnDdWaitForVerticalBlank = NULL; - INT i; - - DXG_GET_INDEX_FUNCTION(DXG_INDEX_DxDdWaitForVerticalBlank, pfnDdWaitForVerticalBlank); - + PGD_DXDDWAITFORVERTICALBLANK pfnDdWaitForVerticalBlank = (PGD_DXDDWAITFORVERTICALBLANK)gpDxFuncs[DXG_INDEX_DxDdWaitForVerticalBlank].pfn; + if (pfnDdWaitForVerticalBlank == NULL) { DPRINT1("Warring no pfnDdWaitForVerticalBlank"); @@ -72,11 +66,8 @@ NtGdiDdCanCreateSurface(HANDLE hDirectDrawLocal, PDD_CANCREATESURFACEDATA puCanCreateSurfaceData) { - PGD_DDCANCREATESURFACE pfnDdCanCreateSurface = NULL; - INT i; - - DXG_GET_INDEX_FUNCTION(DXG_INDEX_DxDdCanCreateSurface, pfnDdCanCreateSurface); - + PGD_DDCANCREATESURFACE pfnDdCanCreateSurface = (PGD_DDCANCREATESURFACE)gpDxFuncs[DXG_INDEX_DxDdCanCreateSurface].pfn; + if (pfnDdCanCreateSurface == NULL) { DPRINT1("Warring no pfnDdCanCreateSurface"); @@ -95,11 +86,8 @@ NtGdiDdGetScanLine(HANDLE hDirectDrawLocal, PDD_GETSCANLINEDATA puGetScanLineData) { - PGD_DXDDGETSCANLINE pfnDdGetScanLine = NULL; - INT i; - - DXG_GET_INDEX_FUNCTION(DXG_INDEX_DxDdGetScanLine, pfnDdGetScanLine); - + PGD_DXDDGETSCANLINE pfnDdGetScanLine = (PGD_DXDDGETSCANLINE)gpDxFuncs[DXG_INDEX_DxDdGetScanLine].pfn; + if (pfnDdGetScanLine == NULL) { DPRINT1("Warring no pfnDdGetScanLine"); @@ -125,11 +113,8 @@ HANDLE hSurface, DWORD dwSurfaceHandle) { - PGD_DXDDCREATESURFACEEX pfnDdCreateSurfaceEx = NULL; - INT i; - - DXG_GET_INDEX_FUNCTION(DXG_INDEX_DxDdCreateSurfaceEx, pfnDdCreateSurfaceEx); - + PGD_DXDDCREATESURFACEEX pfnDdCreateSurfaceEx = (PGD_DXDDCREATESURFACEEX)gpDxFuncs[DXG_INDEX_DxDdCreateSurfaceEx].pfn; + if (pfnDdCreateSurfaceEx == NULL) { DPRINT1("Warring no pfnDdCreateSurfaceEx"); Modified: trunk/reactos/subsystems/win32/win32k/ntddraw/ddsurf.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntddraw/ddsurf.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntddraw/ddsurf.c [iso-8859-1] Thu Apr 17 17:25:38 2008 @@ -18,11 +18,8 @@ STDCALL NtGdiDdDestroySurface(HANDLE hSurface, BOOL bRealDestroy) { - PGD_DXDDDESTROYSURFACE pfnDdDestroySurface = NULL; - INT i; - - DXG_GET_INDEX_FUNCTION(DXG_INDEX_DxDdDestroySurface, pfnDdDestroySurface); - + PGD_DXDDDESTROYSURFACE pfnDdDestroySurface = (PGD_DXDDDESTROYSURFACE)gpDxFuncs[DXG_INDEX_DxDdDestroySurface].pfn; + if (pfnDdDestroySurface == NULL) { DPRINT1("Warring no pfnDdDestroySurface"); @@ -44,11 +41,8 @@ HANDLE hSurfaceTargetLeft, PDD_FLIPDATA puFlipData) { - PGD_DXDDFLIP pfnDdDdFlip = NULL; - INT i; - - DXG_GET_INDEX_FUNCTION(DXG_INDEX_DxDdFlip, pfnDdDdFlip); - + PGD_DXDDFLIP pfnDdDdFlip = (PGD_DXDDFLIP)gpDxFuncs[DXG_INDEX_DxDdFlip].pfn; + if (pfnDdDdFlip == NULL) { DPRINT1("Warring no pfnDdDdFlip"); @@ -68,11 +62,8 @@ PDD_LOCKDATA puLockData, HDC hdcClip) { - PGD_DXDDLOCK pfnDdLock = NULL; - INT i; - - DXG_GET_INDEX_FUNCTION(DXG_INDEX_DxDdLock, pfnDdLock); - + PGD_DXDDLOCK pfnDdLock = (PGD_DXDDLOCK)gpDxFuncs[DXG_INDEX_DxDdLock].pfn; + if (pfnDdLock == NULL) { DPRINT1("Warring no pfnDdLock"); @@ -91,11 +82,8 @@ NtGdiDdUnlock(HANDLE hSurface, PDD_UNLOCKDATA puUnlockData) { - PGD_DXDDUNLOCK pfnDdUnlock = NULL; - INT i; - - DXG_GET_INDEX_FUNCTION(DXG_INDEX_DxDdUnlock, pfnDdUnlock); - + PGD_DXDDUNLOCK pfnDdUnlock = (PGD_DXDDUNLOCK)gpDxFuncs[DXG_INDEX_DxDdUnlock].pfn; + if (pfnDdUnlock == NULL) { DPRINT1("Warring no pfnDdUnlock"); @@ -115,11 +103,8 @@ HANDLE hSurfaceSrc, PDD_BLTDATA puBltData) { - PGD_DDBLT pfnDdBlt = NULL; - INT i; - - DXG_GET_INDEX_FUNCTION(DXG_INDEX_DxDdBlt, pfnDdBlt); - + PGD_DDBLT pfnDdBlt = (PGD_DDBLT)gpDxFuncs[DXG_INDEX_DxDdBlt].pfn; + if (pfnDdBlt == NULL) { DPRINT1("Warring no pfnDdBlt"); @@ -138,11 +123,8 @@ NtGdiDdSetColorKey(HANDLE hSurface, PDD_SETCOLORKEYDATA puSetColorKeyData) { - PGD_DXDDSETCOLORKEY pfnDdSetColorKey = NULL; - INT i; - - DXG_GET_INDEX_FUNCTION(DXG_INDEX_DxDdSetColorKey, pfnDdSetColorKey); - + PGD_DXDDSETCOLORKEY pfnDdSetColorKey = (PGD_DXDDSETCOLORKEY)gpDxFuncs[DXG_INDEX_DxDdSetColorKey].pfn; + if (pfnDdSetColorKey == NULL) { DPRINT1("Warring no pfnDdSetColorKey"); @@ -164,11 +146,8 @@ HANDLE hSurfaceAttached, PDD_ADDATTACHEDSURFACEDATA puAddAttachedSurfaceData) { - PGD_DDADDATTACHEDSURFACE pfnDdAddAttachedSurface = NULL; - INT i; - - DXG_GET_INDEX_FUNCTION(DXG_INDEX_DxDdAddAttachedSurface, pfnDdAddAttachedSurface); - + PGD_DDADDATTACHEDSURFACE pfnDdAddAttachedSurface = (PGD_DDADDATTACHEDSURFACE)gpDxFuncs[DXG_INDEX_DxDdAddAttachedSurface].pfn; + if (pfnDdAddAttachedSurface == NULL) { DPRINT1("Warring no pfnDdAddAttachedSurface"); @@ -187,11 +166,8 @@ NtGdiDdGetBltStatus(HANDLE hSurface, PDD_GETBLTSTATUSDATA puGetBltStatusData) { - PGD_DXDDGETBLTSTATUS pfnDdGetBltStatus = NULL; - INT i; - - DXG_GET_INDEX_FUNCTION(DXG_INDEX_DxDdGetBltStatus, pfnDdGetBltStatus); - + PGD_DXDDGETBLTSTATUS pfnDdGetBltStatus = (PGD_DXDDGETBLTSTATUS)gpDxFuncs[DXG_INDEX_DxDdGetBltStatus].pfn; + if (pfnDdGetBltStatus == NULL) { DPRINT1("Warring no pfnDdGetBltStatus"); @@ -210,11 +186,8 @@ NtGdiDdGetFlipStatus(HANDLE hSurface, PDD_GETFLIPSTATUSDATA puGetFlipStatusData) { - PGD_DXDDGETFLIPSTATUS pfnDdGetFlipStatus = NULL; - INT i; - - DXG_GET_INDEX_FUNCTION(DXG_INDEX_DxDdGetFlipStatus, pfnDdGetFlipStatus); - + PGD_DXDDGETFLIPSTATUS pfnDdGetFlipStatus = (PGD_DXDDGETFLIPSTATUS)gpDxFuncs[DXG_INDEX_DxDdGetFlipStatus].pfn; + if (pfnDdGetFlipStatus == NULL) { DPRINT1("Warring no pfnDdGetFlipStatus"); @@ -234,11 +207,8 @@ HANDLE hSurfaceSource, PDD_UPDATEOVERLAYDATA puUpdateOverlayData) { - PGD_DXDDUPDATEOVERLAY pfnDdUpdateOverlay = NULL; - INT i; - - DXG_GET_INDEX_FUNCTION(DXG_INDEX_DxDdUpdateOverlay, pfnDdUpdateOverlay); - + PGD_DXDDUPDATEOVERLAY pfnDdUpdateOverlay = (PGD_DXDDUPDATEOVERLAY)gpDxFuncs[DXG_INDEX_DxDdUpdateOverlay].pfn; + if (pfnDdUpdateOverlay == NULL) { DPRINT1("Warring no pfnDdUpdateOverlay"); @@ -259,11 +229,8 @@ HANDLE hSurfaceDestination, PDD_SETOVERLAYPOSITIONDATA puSetOverlayPositionData) { - PGD_DXDDSETOVERLAYPOSITION pfnDdSetOverlayPosition = NULL; - INT i; - - DXG_GET_INDEX_FUNCTION(DXG_INDEX_DxDdSetOverlayPosition, pfnDdSetOverlayPosition); - + PGD_DXDDSETOVERLAYPOSITION pfnDdSetOverlayPosition = (PGD_DXDDSETOVERLAYPOSITION)gpDxFuncs[DXG_INDEX_DxDdSetOverlayPosition].pfn; + if (pfnDdSetOverlayPosition == NULL) { DPRINT1("Warring no pfnDdSetOverlayPosition"); @@ -289,11 +256,8 @@ HANDLE hSurfaceSrc, PDD_BLTDATA puBltData) { - PGD_DDALPHABLT pfnDdAlphaBlt = NULL; - INT i; - - DXG_GET_INDEX_FUNCTION(DXG_INDEX_DxDdAlphaBlt, pfnDdAlphaBlt); - + PGD_DDALPHABLT pfnDdAlphaBlt = (PGD_DDALPHABLT)gpDxFuncs[DXG_INDEX_DxDdAlphaBlt].pfn; + if (pfnDdAlphaBlt == NULL) { DPRINT1("Warring no pfnDdAlphaBlt"); @@ -313,11 +277,8 @@ HANDLE hSurfaceTo ) { - PGD_DDATTACHSURFACE pfnDdAttachSurface = NULL; - INT i; - - DXG_GET_INDEX_FUNCTION(DXG_INDEX_DxDdAttachSurface, pfnDdAttachSurface); - + PGD_DDATTACHSURFACE pfnDdAttachSurface = (PGD_DDATTACHSURFACE)gpDxFuncs[DXG_INDEX_DxDdAttachSurface].pfn; + if (pfnDdAttachSurface == NULL) { DPRINT1("Warring no pfnDdAttachSurface"); @@ -340,11 +301,7 @@ NtGdiDdUnattachSurface(HANDLE hSurface, HANDLE hSurfaceAttached) { - PGD_DXDDUNATTACHSURFACE pfnDdUnattachSurface = NULL; - INT i; - - DXG_GET_INDEX_FUNCTION(DXG_INDEX_DxDdUnattachSurface, pfnDdUnattachSurface); - + PGD_DXDDUNATTACHSURFACE pfnDdUnattachSurface = (PGD_DXDDUNATTACHSURFACE)gpDxFuncs[DXG_INDEX_DxDdUnattachSurface].pfn; if (pfnDdUnattachSurface == NULL) { DPRINT1("Warring no pfnDdUnattachSurface"); 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] Thu Apr 17 17:25:38 2008 @@ -21,11 +21,8 @@ NtGdiDvpCanCreateVideoPort(HANDLE hDirectDraw, PDD_CANCREATEVPORTDATA puCanCreateVPortData) { - PGD_DVPCANCREATEVIDEOPORT pfnDvpCanCreateVideoPort = NULL; - INT i; - - DXG_GET_INDEX_FUNCTION(DXG_INDEX_DxDvpCanCreateVideoPort, pfnDvpCanCreateVideoPort); - + PGD_DVPCANCREATEVIDEOPORT pfnDvpCanCreateVideoPort = (PGD_DVPCANCREATEVIDEOPORT)gpDxFuncs[DXG_INDEX_DxDvpCanCreateVideoPort].pfn; + if (pfnDvpCanCreateVideoPort == NULL) { DPRINT1("Warring no pfnDvpCanCreateVideoPort"); @@ -44,11 +41,8 @@ NtGdiDvpColorControl(HANDLE hVideoPort, PDD_VPORTCOLORDATA puVPortColorData) { - PGD_DVPCOLORCONTROL pfnDvpColorControl = NULL; - INT i; - - DXG_GET_INDEX_FUNCTION(DXG_INDEX_DxDvpColorControl, pfnDvpColorControl); - + PGD_DVPCOLORCONTROL pfnDvpColorControl = (PGD_DVPCOLORCONTROL)gpDxFuncs[DXG_INDEX_DxDvpColorControl].pfn; + if (pfnDvpColorControl == NULL) { DPRINT1("Warring no pfnDvpColorControl"); @@ -67,11 +61,8 @@ NtGdiDvpCreateVideoPort(HANDLE hDirectDraw, PDD_CREATEVPORTDATA puCreateVPortData) { - PGD_DVPCREATEVIDEOPORT pfnDvpCreateVideoPort = NULL; - INT i; - - DXG_GET_INDEX_FUNCTION(DXG_INDEX_DxDvpCreateVideoPort, pfnDvpCreateVideoPort); - + PGD_DVPCREATEVIDEOPORT pfnDvpCreateVideoPort = (PGD_DVPCREATEVIDEOPORT)gpDxFuncs[DXG_INDEX_DxDvpCreateVideoPort].pfn; + if (pfnDvpCreateVideoPort == NULL) { DPRINT1("Warring no pfnDvpCreateVideoPort"); @@ -90,11 +81,8 @@ NtGdiDvpDestroyVideoPort(HANDLE hVideoPort, PDD_DESTROYVPORTDATA puDestroyVPortData) { - PGD_DVPDESTROYVIDEOPORT pfnDvpDestroyVideoPort = NULL; - INT i; - - DXG_GET_INDEX_FUNCTION(DXG_INDEX_DxDvpDestroyVideoPort, pfnDvpDestroyVideoPort); - + PGD_DVPDESTROYVIDEOPORT pfnDvpDestroyVideoPort = (PGD_DVPDESTROYVIDEOPORT)gpDxFuncs[DXG_INDEX_DxDvpDestroyVideoPort].pfn; + if (pfnDvpDestroyVideoPort == NULL) { DPRINT1("Warring no pfnDvpDestroyVideoPort");

1 0

[greatlrd] 33011: Fix so lest you can run now win32kdxtest one time with ms dxg.sys, and second time the win32kdxtest runs the whole win32k.sys or dxg.sys create nice blue screen.
by greatlrd＠svn.reactos.org 17 Apr '08

17 Apr '08

Author: greatlrd Date: Thu Apr 17 17:03:34 2008 New Revision: 33011 URL: http://svn.reactos.org/svn/reactos?rev=33011&view=rev Log: Fix so lest you can run now win32kdxtest one time with ms dxg.sys, and second time the win32kdxtest runs the whole win32k.sys or dxg.sys create nice blue screen. Modified: trunk/reactos/subsystems/win32/win32k/ntddraw/ddraw.c 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] Thu Apr 17 17:03:34 2008 @@ -103,7 +103,7 @@ for (t=0;t<=DXG_INDEX_DxDdIoctl;t++) { gpDxFuncs[lstDrvFN[t].iFunc].iFunc =lstDrvFN[t].iFunc; - gpDxFuncs[lstDrvFN[t].iFunc].pfn =lstDrvFN[t].pfn; + gpDxFuncs[lstDrvFN[t].iFunc].pfn =lstDrvFN[t].pfn; } DPRINT1("DirectX interface is activated\n"); } @@ -126,11 +126,10 @@ STDCALL NtGdiDdCreateDirectDrawObject(HDC hdc) { - PGD_DDCREATEDIRECTDRAWOBJECT pfnDdCreateDirectDrawObject = NULL; + PGD_DDCREATEDIRECTDRAWOBJECT pfnDdCreateDirectDrawObject = (PGD_DDCREATEDIRECTDRAWOBJECT)gpDxFuncs[DXG_INDEX_DxDdCreateDirectDrawObject].pfn; NTSTATUS Status; PEPROCESS Proc = NULL; - INT i=0; - + if (hdc == NULL) { DPRINT1("Warning : hdc is NULL\n"); @@ -145,10 +144,7 @@ DPRINT1("Warning : Failed to create the directx interface\n"); return 0; } - - /* This is in correct place */ - DXG_GET_INDEX_FUNCTION(DXG_INDEX_DxDdCreateDirectDrawObject, pfnDdCreateDirectDrawObject); - + if (pfnDdCreateDirectDrawObject == NULL) { DPRINT1("Warning: no pfnDdCreateDirectDrawObject\n"); @@ -220,10 +216,7 @@ STDCALL NtGdiDdGetDriverState(PDD_GETDRIVERSTATEDATA pdata) { - PGD_DDGETDRIVERSTATE pfnDdGetDriverState = NULL; - INT i; - - DXG_GET_INDEX_FUNCTION(DXG_INDEX_DxDdGetDriverState, pfnDdGetDriverState); + PGD_DDGETDRIVERSTATE pfnDdGetDriverState = (PGD_DDGETDRIVERSTATE)gpDxFuncs[DXG_INDEX_DxDdGetDriverState].pfn; if (pfnDdGetDriverState == NULL) { @@ -243,11 +236,8 @@ NtGdiDdColorControl(HANDLE hSurface, PDD_COLORCONTROLDATA puColorControlData) { - PGD_DDCOLORCONTROL pfnDdColorControl = NULL; - INT i; - - DXG_GET_INDEX_FUNCTION(DXG_INDEX_DxDdColorControl, pfnDdColorControl); - + PGD_DDCOLORCONTROL pfnDdColorControl = (PGD_DDCOLORCONTROL)gpDxFuncs[DXG_INDEX_DxDdColorControl].pfn; + if (pfnDdColorControl == NULL) { DPRINT1("Warning: no pfnDdColorControl\n"); @@ -271,11 +261,8 @@ BOOL bComplete ) { - PGD_DXDDCREATESURFACEOBJECT pfnDdCreateSurfaceObject = NULL; - INT i; - - DXG_GET_INDEX_FUNCTION(DXG_INDEX_DxDdCreateSurfaceObject, pfnDdCreateSurfaceObject); - + PGD_DXDDCREATESURFACEOBJECT pfnDdCreateSurfaceObject = (PGD_DXDDCREATESURFACEOBJECT)gpDxFuncs[DXG_INDEX_DxDdCreateSurfaceObject].pfn; + if (pfnDdCreateSurfaceObject == NULL) { DPRINT1("Warning: no pfnDdCreateSurfaceObject\n"); @@ -293,10 +280,7 @@ STDCALL NtGdiDdDeleteDirectDrawObject(HANDLE hDirectDrawLocal) { - PGD_DXDDDELETEDIRECTDRAWOBJECT pfnDdDeleteDirectDrawObject = NULL; - INT i; - - DXG_GET_INDEX_FUNCTION(DXG_INDEX_DxDdDeleteDirectDrawObject, pfnDdDeleteDirectDrawObject); + PGD_DXDDDELETEDIRECTDRAWOBJECT pfnDdDeleteDirectDrawObject = (PGD_DXDDDELETEDIRECTDRAWOBJECT)gpDxFuncs[DXG_INDEX_DxDdDeleteDirectDrawObject].pfn; if (pfnDdDeleteDirectDrawObject == NULL) { @@ -315,10 +299,7 @@ STDCALL NtGdiDdDeleteSurfaceObject(HANDLE hSurface) { - PGD_DXDDDELETESURFACEOBJECT pfnDdDeleteSurfaceObject = NULL; - INT i; - - DXG_GET_INDEX_FUNCTION(DXG_INDEX_DxDdDeleteSurfaceObject, pfnDdDeleteSurfaceObject); + PGD_DXDDDELETESURFACEOBJECT pfnDdDeleteSurfaceObject = (PGD_DXDDDELETESURFACEOBJECT)gpDxFuncs[DXG_INDEX_DxDdDeleteSurfaceObject].pfn; if (pfnDdDeleteSurfaceObject == NULL) { @@ -347,11 +328,8 @@ DWORD *puNumFourCC, DWORD *puFourCC) { - PGD_DXDDQUERYDIRECTDRAWOBJECT pfnDdQueryDirectDrawObject = NULL; - INT i; - - DXG_GET_INDEX_FUNCTION(DXG_INDEX_DxDdQueryDirectDrawObject, pfnDdQueryDirectDrawObject); - + PGD_DXDDQUERYDIRECTDRAWOBJECT pfnDdQueryDirectDrawObject = (PGD_DXDDQUERYDIRECTDRAWOBJECT)gpDxFuncs[DXG_INDEX_DxDdQueryDirectDrawObject].pfn; + if (pfnDdQueryDirectDrawObject == NULL) { DPRINT1("Warning: no pfnDdQueryDirectDrawObject\n"); @@ -372,11 +350,8 @@ NtGdiDdReenableDirectDrawObject(HANDLE hDirectDrawLocal, BOOL *pubNewMode) { - PGD_DXDDREENABLEDIRECTDRAWOBJECT pfnDdReenableDirectDrawObject = NULL; - INT i; - - DXG_GET_INDEX_FUNCTION(DXG_INDEX_DxDdReenableDirectDrawObject, pfnDdReenableDirectDrawObject); - + PGD_DXDDREENABLEDIRECTDRAWOBJECT pfnDdReenableDirectDrawObject = (PGD_DXDDREENABLEDIRECTDRAWOBJECT)gpDxFuncs[DXG_INDEX_DxDdReenableDirectDrawObject].pfn; + if (pfnDdReenableDirectDrawObject == NULL) { DPRINT1("Warning: no pfnDdReenableDirectDrawObject\n"); @@ -397,11 +372,8 @@ PDD_GETDRIVERINFODATA puGetDriverInfoData) { - PGD_DXDDGETDRIVERINFO pfnDdGetDriverInfo = NULL; - INT i; - - DXG_GET_INDEX_FUNCTION(DXG_INDEX_DxDdGetDriverInfo, pfnDdGetDriverInfo); - + PGD_DXDDGETDRIVERINFO pfnDdGetDriverInfo = (PGD_DXDDGETDRIVERINFO)gpDxFuncs[DXG_INDEX_DxDdGetDriverInfo].pfn; + if (pfnDdGetDriverInfo == NULL) { DPRINT1("Warning: no pfnDdGetDriverInfo\n"); @@ -421,11 +393,8 @@ NtGdiDdGetAvailDriverMemory(HANDLE hDirectDrawLocal, PDD_GETAVAILDRIVERMEMORYDATA puGetAvailDriverMemoryData) { - PGD_DXDDGETAVAILDRIVERMEMORY pfnDdGetAvailDriverMemory = NULL; - INT i; - - DXG_GET_INDEX_FUNCTION(DXG_INDEX_DxDdGetAvailDriverMemory, pfnDdGetAvailDriverMemory); - + PGD_DXDDGETAVAILDRIVERMEMORY pfnDdGetAvailDriverMemory = (PGD_DXDDGETAVAILDRIVERMEMORY)gpDxFuncs[DXG_INDEX_DxDdGetAvailDriverMemory].pfn; + if (pfnDdGetAvailDriverMemory == NULL) { DPRINT1("Warning: no pfnDdGetAvailDriverMemory\n"); @@ -446,11 +415,8 @@ NtGdiDdSetExclusiveMode(HANDLE hDirectDraw, PDD_SETEXCLUSIVEMODEDATA puSetExclusiveModeData) { - PGD_DXDDSETEXCLUSIVEMODE pfnDdSetExclusiveMode = NULL; - INT i; - - DXG_GET_INDEX_FUNCTION(DXG_INDEX_DxDdSetExclusiveMode, pfnDdSetExclusiveMode); - + PGD_DXDDSETEXCLUSIVEMODE pfnDdSetExclusiveMode = (PGD_DXDDSETEXCLUSIVEMODE)gpDxFuncs[DXG_INDEX_DxDdSetExclusiveMode].pfn; + if (pfnDdSetExclusiveMode == NULL) { DPRINT1("Warning: no pfnDdSetExclusiveMode\n"); @@ -471,11 +437,8 @@ NtGdiDdFlipToGDISurface(HANDLE hDirectDraw, PDD_FLIPTOGDISURFACEDATA puFlipToGDISurfaceData) { - PGD_DXDDFLIPTOGDISURFACE pfnDdFlipToGDISurface = NULL; - INT i; - - DXG_GET_INDEX_FUNCTION(DXG_INDEX_DxDdFlipToGDISurface, pfnDdFlipToGDISurface); - + PGD_DXDDFLIPTOGDISURFACE pfnDdFlipToGDISurface = (PGD_DXDDFLIPTOGDISURFACE)gpDxFuncs[DXG_INDEX_DxDdFlipToGDISurface].pfn; + if (pfnDdFlipToGDISurface == NULL) { DPRINT1("Warning: no pfnDdFlipToGDISurface\n"); @@ -495,11 +458,8 @@ NtGdiDdGetDC(HANDLE hSurface, PALETTEENTRY *puColorTable) { - PGD_DDGETDC pfnDdGetDC = NULL; - INT i; - - DXG_GET_INDEX_FUNCTION(DXG_INDEX_DxDdGetDC, pfnDdGetDC); - + PGD_DDGETDC pfnDdGetDC = (PGD_DDGETDC)gpDxFuncs[DXG_INDEX_DxDdGetDC].pfn; + if (pfnDdGetDC == NULL) { DPRINT1("Warning: no pfnDdGetDC\n"); @@ -518,13 +478,9 @@ NtGdiDdGetDxHandle(HANDLE hDirectDraw, HANDLE hSurface, BOOL bRelease) -{ +{ + PGD_DDGETDXHANDLE pfnDdGetDxHandle = (PGD_DDGETDXHANDLE)gpDxFuncs[DXG_INDEX_DxDdGetDxHandle].pfn; - PGD_DDGETDXHANDLE pfnDdGetDxHandle = NULL; - INT i; - - DXG_GET_INDEX_FUNCTION(DXG_INDEX_DxDdGetDxHandle, pfnDdGetDxHandle); - if (pfnDdGetDxHandle == NULL) { DPRINT1("Warning: no pfnDdGetDxHandle\n"); @@ -543,11 +499,8 @@ STDCALL NtGdiDdReleaseDC(HANDLE hSurface) { - PGD_DDRELEASEDC pfnDdReleaseDC = NULL; - INT i; - - DXG_GET_INDEX_FUNCTION(DXG_INDEX_DxDdReleaseDC, pfnDdReleaseDC); - + PGD_DDRELEASEDC pfnDdReleaseDC = (PGD_DDRELEASEDC)gpDxFuncs[DXG_INDEX_DxDdReleaseDC].pfn; + if (pfnDdReleaseDC == NULL) { DPRINT1("Warning: no pfnDdReleaseDC\n"); @@ -567,11 +520,8 @@ HWND hwnd) { - PGD_DDRESTVISRGN pfnDdResetVisrgn = NULL; - INT i; - - DXG_GET_INDEX_FUNCTION(DXG_INDEX_DxDdResetVisrgn, pfnDdResetVisrgn); - + PGD_DDRESTVISRGN pfnDdResetVisrgn = (PGD_DDRESTVISRGN)gpDxFuncs[DXG_INDEX_DxDdResetVisrgn].pfn; + if (pfnDdResetVisrgn == NULL) { DPRINT1("Warning: no pfnDdResetVisrgn\n"); @@ -591,11 +541,8 @@ HDC hdc, LPVOID lpGammaRamp) { - PGD_DDSETGAMMARAMP pfnDdSetGammaRamp = NULL; - INT i; - - DXG_GET_INDEX_FUNCTION(DXG_INDEX_DxDdSetGammaRamp, pfnDdSetGammaRamp); - + PGD_DDSETGAMMARAMP pfnDdSetGammaRamp = (PGD_DDSETGAMMARAMP)gpDxFuncs[DXG_INDEX_DxDdSetGammaRamp].pfn; + if (pfnDdSetGammaRamp == NULL) { DPRINT1("Warning: no pfnDdSetGammaRamp\n");

1 0

[gedmurphy] 33010: In light of both the intermittent techbot, and the fact that not everyone is always sat in IRC, I've converted the .net assembly towards a Win32 app and added a GUI to make use of it. It's not finished but it's certainly usable in it's current state if anyone wants to build and run it.
by gedmurphy＠svn.reactos.org 17 Apr '08

17 Apr '08

Author: gedmurphy Date: Thu Apr 17 16:10:16 2008 New Revision: 33010 URL: http://svn.reactos.org/svn/reactos?rev=33010&view=rev Log: In light of both the intermittent techbot, and the fact that not everyone is always sat in IRC, I've converted the .net assembly towards a Win32 app and added a GUI to make use of it. It's not finished but it's certainly usable in it's current state if anyone wants to build and run it. Added: trunk/tools/Message Translator/ trunk/tools/Message Translator/GUI/ trunk/tools/Message Translator/GUI/App.config (with props) trunk/tools/Message Translator/GUI/GUI.csproj (with props) trunk/tools/Message Translator/GUI/MainForm.Designer.cs (with props) trunk/tools/Message Translator/GUI/MainForm.cs (with props) trunk/tools/Message Translator/GUI/MainForm.resx (with props) trunk/tools/Message Translator/GUI/Program.cs (with props) trunk/tools/Message Translator/GUI/Properties/ trunk/tools/Message Translator/GUI/Properties/AssemblyInfo.cs (with props) trunk/tools/Message Translator/GUI/Properties/Resources.Designer.cs (with props) trunk/tools/Message Translator/GUI/Properties/Resources.resx (with props) trunk/tools/Message Translator/GUI/Properties/Settings.Designer.cs (with props) trunk/tools/Message Translator/GUI/Properties/Settings.settings (with props) trunk/tools/Message Translator/GUI/Resources/ trunk/tools/Message Translator/GUI/Resources/hresult.xml (with props) trunk/tools/Message Translator/GUI/Resources/icon.ico (with props) trunk/tools/Message Translator/GUI/Resources/ntstatus.xml (with props) trunk/tools/Message Translator/GUI/Resources/winerror.xml (with props) trunk/tools/Message Translator/GUI/Resources/wm.xml (with props) trunk/tools/Message Translator/GUI/icon.ico (with props) trunk/tools/Message Translator/Msg Translator.sln (with props) trunk/tools/Message Translator/MsgTrans.Library/ trunk/tools/Message Translator/MsgTrans.Library/AppSenseBugUrl.cs (with props) trunk/tools/Message Translator/MsgTrans.Library/BugCommand.cs (with props) trunk/tools/Message Translator/MsgTrans.Library/Command.cs (with props) trunk/tools/Message Translator/MsgTrans.Library/ErrorCommand.cs (with props) trunk/tools/Message Translator/MsgTrans.Library/HresultCommand.cs (with props) trunk/tools/Message Translator/MsgTrans.Library/MessageContext.cs (with props) trunk/tools/Message Translator/MsgTrans.Library/MsgOutput.cs (with props) trunk/tools/Message Translator/MsgTrans.Library/MsgTrans.Library.csproj (with props) trunk/tools/Message Translator/MsgTrans.Library/MsgTrans.cs (with props) trunk/tools/Message Translator/MsgTrans.Library/NtStatusCommand.cs (with props) trunk/tools/Message Translator/MsgTrans.Library/NumberParser.cs (with props) trunk/tools/Message Translator/MsgTrans.Library/Properties/ trunk/tools/Message Translator/MsgTrans.Library/Properties/AssemblyInfo.cs (with props) trunk/tools/Message Translator/MsgTrans.Library/WinerrorCommand.cs (with props) trunk/tools/Message Translator/MsgTrans.Library/WmCommand.cs (with props) trunk/tools/Message Translator/MsgTrans.Library/XmlCommand.cs (with props) [This mail would be too long, it was shortened to contain the URLs only.] Added: trunk/tools/Message Translator/GUI/App.config URL: http://svn.reactos.org/svn/reactos/trunk/tools/Message%20Translator/GUI/App… Added: trunk/tools/Message Translator/GUI/GUI.csproj URL: http://svn.reactos.org/svn/reactos/trunk/tools/Message%20Translator/GUI/GUI… Added: trunk/tools/Message Translator/GUI/MainForm.Designer.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/Message%20Translator/GUI/Mai… Added: trunk/tools/Message Translator/GUI/MainForm.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/Message%20Translator/GUI/Mai… Added: trunk/tools/Message Translator/GUI/MainForm.resx URL: http://svn.reactos.org/svn/reactos/trunk/tools/Message%20Translator/GUI/Mai… Added: trunk/tools/Message Translator/GUI/Program.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/Message%20Translator/GUI/Pro… Added: trunk/tools/Message Translator/GUI/Properties/AssemblyInfo.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/Message%20Translator/GUI/Pro… Added: trunk/tools/Message Translator/GUI/Properties/Resources.Designer.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/Message%20Translator/GUI/Pro… Added: trunk/tools/Message Translator/GUI/Properties/Resources.resx URL: http://svn.reactos.org/svn/reactos/trunk/tools/Message%20Translator/GUI/Pro… Added: trunk/tools/Message Translator/GUI/Properties/Settings.Designer.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/Message%20Translator/GUI/Pro… Added: trunk/tools/Message Translator/GUI/Properties/Settings.settings URL: http://svn.reactos.org/svn/reactos/trunk/tools/Message%20Translator/GUI/Pro… Added: trunk/tools/Message Translator/GUI/Resources/hresult.xml URL: http://svn.reactos.org/svn/reactos/trunk/tools/Message%20Translator/GUI/Res… Added: trunk/tools/Message Translator/GUI/Resources/icon.ico URL: http://svn.reactos.org/svn/reactos/trunk/tools/Message%20Translator/GUI/Res… Added: trunk/tools/Message Translator/GUI/Resources/ntstatus.xml URL: http://svn.reactos.org/svn/reactos/trunk/tools/Message%20Translator/GUI/Res… Added: trunk/tools/Message Translator/GUI/Resources/winerror.xml URL: http://svn.reactos.org/svn/reactos/trunk/tools/Message%20Translator/GUI/Res… Added: trunk/tools/Message Translator/GUI/Resources/wm.xml URL: http://svn.reactos.org/svn/reactos/trunk/tools/Message%20Translator/GUI/Res… Added: trunk/tools/Message Translator/GUI/icon.ico URL: http://svn.reactos.org/svn/reactos/trunk/tools/Message%20Translator/GUI/ico… Added: trunk/tools/Message Translator/Msg Translator.sln URL: http://svn.reactos.org/svn/reactos/trunk/tools/Message%20Translator/Msg%20T… Added: trunk/tools/Message Translator/MsgTrans.Library/AppSenseBugUrl.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/Message%20Translator/MsgTran… Added: trunk/tools/Message Translator/MsgTrans.Library/BugCommand.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/Message%20Translator/MsgTran… Added: trunk/tools/Message Translator/MsgTrans.Library/Command.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/Message%20Translator/MsgTran… Added: trunk/tools/Message Translator/MsgTrans.Library/ErrorCommand.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/Message%20Translator/MsgTran… Added: trunk/tools/Message Translator/MsgTrans.Library/HresultCommand.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/Message%20Translator/MsgTran… Added: trunk/tools/Message Translator/MsgTrans.Library/MessageContext.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/Message%20Translator/MsgTran… Added: trunk/tools/Message Translator/MsgTrans.Library/MsgOutput.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/Message%20Translator/MsgTran… Added: trunk/tools/Message Translator/MsgTrans.Library/MsgTrans.Library.csproj URL: http://svn.reactos.org/svn/reactos/trunk/tools/Message%20Translator/MsgTran… Added: trunk/tools/Message Translator/MsgTrans.Library/MsgTrans.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/Message%20Translator/MsgTran… Added: trunk/tools/Message Translator/MsgTrans.Library/NtStatusCommand.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/Message%20Translator/MsgTran… Added: trunk/tools/Message Translator/MsgTrans.Library/NumberParser.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/Message%20Translator/MsgTran… Added: trunk/tools/Message Translator/MsgTrans.Library/Properties/AssemblyInfo.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/Message%20Translator/MsgTran… Added: trunk/tools/Message Translator/MsgTrans.Library/WinerrorCommand.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/Message%20Translator/MsgTran… Added: trunk/tools/Message Translator/MsgTrans.Library/WmCommand.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/Message%20Translator/MsgTran… Added: trunk/tools/Message Translator/MsgTrans.Library/XmlCommand.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/Message%20Translator/MsgTran…

1 0

[greatlrd] 33009: Fix frist issue with ms dxg.sys check if hdc is null or not.
by greatlrd＠svn.reactos.org 17 Apr '08

17 Apr '08

Author: greatlrd Date: Thu Apr 17 16:08:39 2008 New Revision: 33009 URL: http://svn.reactos.org/svn/reactos?rev=33009&view=rev Log: Fix frist issue with ms dxg.sys check if hdc is null or not. Modified: trunk/reactos/subsystems/win32/win32k/ntddraw/ddraw.c 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] Thu Apr 17 16:08:39 2008 @@ -130,6 +130,12 @@ NTSTATUS Status; PEPROCESS Proc = NULL; INT i=0; + + if (hdc == NULL) + { + DPRINT1("Warning : hdc is NULL\n"); + return 0; + } /* FIXME get the process data */ /* FIXME this code should be add where the driver being load */

1 0

[greatlrd] 33008: change to using the globla version header for reactx (reactos/reactx.h)
by greatlrd＠svn.reactos.org 17 Apr '08

17 Apr '08

Author: greatlrd Date: Thu Apr 17 14:15:43 2008 New Revision: 33008 URL: http://svn.reactos.org/svn/reactos?rev=33008&view=rev Log: change to using the globla version header for reactx (reactos/reactx.h) Modified: trunk/reactos/dll/directx/d3d8/d3d8.rc trunk/reactos/dll/directx/d3d8thk/d3d8thk.rc trunk/reactos/dll/directx/d3d9/d3d9.rc trunk/reactos/dll/directx/ddraw/ddraw.rc trunk/reactos/dll/directx/ksproxy/ksproxy.rc trunk/reactos/dll/directx/msdmo/msdmo.rc trunk/reactos/dll/directx/qedit/qedit.rc trunk/reactos/dll/directx/quartz/quartz.rc Modified: trunk/reactos/dll/directx/d3d8/d3d8.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d8/d3d8.rc?r… ============================================================================== --- trunk/reactos/dll/directx/d3d8/d3d8.rc [iso-8859-1] (original) +++ trunk/reactos/dll/directx/d3d8/d3d8.rc [iso-8859-1] Thu Apr 17 14:15:43 2008 @@ -5,9 +5,6 @@ #define REACTOS_STR_INTERNAL_NAME "d3d8\0" #define REACTOS_STR_ORIGINAL_FILENAME "d3d8.dll\0" -#define REACTOS_FILEVERSION 5,3,0,900 -#define REACTOS_STR_FILE_VERSION "5.3.0.900" -#define REACTOS_PRODUCTVERSION 5,3,0,900 -#define REACTOS_STR_PRODUCT_VERSION "5.3" +#include <reactos/reactx.h> #include <reactos/version.rc> Modified: trunk/reactos/dll/directx/d3d8thk/d3d8thk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d8thk/d3d8th… ============================================================================== --- trunk/reactos/dll/directx/d3d8thk/d3d8thk.rc [iso-8859-1] (original) +++ trunk/reactos/dll/directx/d3d8thk/d3d8thk.rc [iso-8859-1] Thu Apr 17 14:15:43 2008 @@ -3,9 +3,6 @@ #define REACTOS_STR_INTERNAL_NAME "d3d8thk\0" #define REACTOS_STR_ORIGINAL_FILENAME "d3d8thk.dll\0" -#define REACTOS_FILEVERSION 5,3,0,900 -#define REACTOS_STR_FILE_VERSION "5.3.0.900" -#define REACTOS_PRODUCTVERSION 5,3,0,900 -#define REACTOS_STR_PRODUCT_VERSION "5.3" +#include <reactos/reactx.h> #include <reactos/version.rc> Modified: trunk/reactos/dll/directx/d3d9/d3d9.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/d3d9.rc?r… ============================================================================== --- trunk/reactos/dll/directx/d3d9/d3d9.rc [iso-8859-1] (original) +++ trunk/reactos/dll/directx/d3d9/d3d9.rc [iso-8859-1] Thu Apr 17 14:15:43 2008 @@ -5,9 +5,6 @@ #define REACTOS_STR_INTERNAL_NAME "d3d9\0" #define REACTOS_STR_ORIGINAL_FILENAME "d3d9.dll\0" -#define REACTOS_FILEVERSION 5,3,0,900 -#define REACTOS_STR_FILE_VERSION "5.3.0.900" -#define REACTOS_PRODUCTVERSION 5,3,0,900 -#define REACTOS_STR_PRODUCT_VERSION "5.3" +#include <reactos/reactx.h> #include <reactos/version.rc> Modified: trunk/reactos/dll/directx/ddraw/ddraw.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/ddraw.rc… ============================================================================== --- trunk/reactos/dll/directx/ddraw/ddraw.rc [iso-8859-1] (original) +++ trunk/reactos/dll/directx/ddraw/ddraw.rc [iso-8859-1] Thu Apr 17 14:15:43 2008 @@ -7,10 +7,7 @@ #define REACTOS_STR_INTERNAL_NAME "ddraw\0" #define REACTOS_STR_ORIGINAL_FILENAME "ddraw.dll\0" -#define REACTOS_FILEVERSION 5,3,2600,2180 -#define REACTOS_STR_FILE_VERSION "5.3.2600.2180" -#define REACTOS_PRODUCTVERSION 5,3,2600,2180 -#define REACTOS_STR_PRODUCT_VERSION "5.3.2600.2180" +#include <reactos/reactx.h> #include <reactos/version.rc> Modified: trunk/reactos/dll/directx/ksproxy/ksproxy.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ksproxy/ksprox… ============================================================================== --- trunk/reactos/dll/directx/ksproxy/ksproxy.rc [iso-8859-1] (original) +++ trunk/reactos/dll/directx/ksproxy/ksproxy.rc [iso-8859-1] Thu Apr 17 14:15:43 2008 @@ -4,9 +4,6 @@ #define REACTOS_STR_INTERNAL_NAME "ksproxy\0" #define REACTOS_STR_ORIGINAL_FILENAME "ksproxy.ax\0" -#define REACTOS_FILEVERSION 5,3,0,900 -#define REACTOS_STR_FILE_VERSION "5.3.0.900" -#define REACTOS_PRODUCTVERSION 5,3,0,900 -#define REACTOS_STR_PRODUCT_VERSION "5.3" +#include <reactos/reactx.h> #include <reactos/version.rc> Modified: trunk/reactos/dll/directx/msdmo/msdmo.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/msdmo/msdmo.rc… ============================================================================== --- trunk/reactos/dll/directx/msdmo/msdmo.rc [iso-8859-1] (original) +++ trunk/reactos/dll/directx/msdmo/msdmo.rc [iso-8859-1] Thu Apr 17 14:15:43 2008 @@ -4,9 +4,6 @@ #define REACTOS_STR_INTERNAL_NAME "msdmo\0" #define REACTOS_STR_ORIGINAL_FILENAME "msdmo.dll\0" -#define REACTOS_FILEVERSION 5,3,0,900 -#define REACTOS_STR_FILE_VERSION "5.3.0.900" -#define REACTOS_PRODUCTVERSION 5,3,0,900 -#define REACTOS_STR_PRODUCT_VERSION "5.3" +#include <reactos/reactx.h> #include <reactos/version.rc> Modified: trunk/reactos/dll/directx/qedit/qedit.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/qedit/qedit.rc… ============================================================================== --- trunk/reactos/dll/directx/qedit/qedit.rc [iso-8859-1] (original) +++ trunk/reactos/dll/directx/qedit/qedit.rc [iso-8859-1] Thu Apr 17 14:15:43 2008 @@ -4,9 +4,6 @@ #define REACTOS_STR_INTERNAL_NAME "qedit\0" #define REACTOS_STR_ORIGINAL_FILENAME "qedit.dll\0" -#define REACTOS_FILEVERSION 5,3,0,900 -#define REACTOS_STR_FILE_VERSION "5.3.0.900" -#define REACTOS_PRODUCTVERSION 5,3,0,900 -#define REACTOS_STR_PRODUCT_VERSION "5.3" +#include <reactos/reactx.h> #include <reactos/version.rc> Modified: trunk/reactos/dll/directx/quartz/quartz.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/quartz/quartz.… ============================================================================== --- trunk/reactos/dll/directx/quartz/quartz.rc [iso-8859-1] (original) +++ trunk/reactos/dll/directx/quartz/quartz.rc [iso-8859-1] Thu Apr 17 14:15:43 2008 @@ -4,9 +4,6 @@ #define REACTOS_STR_INTERNAL_NAME "quartz\0" #define REACTOS_STR_ORIGINAL_FILENAME "quartz.dll\0" -#define REACTOS_FILEVERSION 5,3,0,900 -#define REACTOS_STR_FILE_VERSION "5.3.0.900" -#define REACTOS_PRODUCTVERSION 5,3,0,900 -#define REACTOS_STR_PRODUCT_VERSION "5.3" +#include <reactos/reactx.h> #include <reactos/version.rc>

1 0

[gedmurphy] 33007: - Fix IDT and GDT limits to values advised by Alex. - Problem noticed by Henning Schild
by gedmurphy＠svn.reactos.org 17 Apr '08

17 Apr '08

Author: gedmurphy Date: Thu Apr 17 14:08:26 2008 New Revision: 33007 URL: http://svn.reactos.org/svn/reactos?rev=33007&view=rev Log: - Fix IDT and GDT limits to values advised by Alex. - Problem noticed by Henning Schild Modified: trunk/reactos/ntoskrnl/ke/i386/cpu.c trunk/reactos/ntoskrnl/ke/i386/trap.s Modified: trunk/reactos/ntoskrnl/ke/i386/cpu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/cpu.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/cpu.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/cpu.c [iso-8859-1] Thu Apr 17 14:08:26 2008 @@ -47,7 +47,7 @@ }; /* GDT Descriptor */ -KDESCRIPTOR KiGdtDescriptor = {0, sizeof(KiBootGdt), (ULONG)KiBootGdt}; +KDESCRIPTOR KiGdtDescriptor = {0, sizeof(KiBootGdt) - 1, (ULONG)KiBootGdt}; /* CPU Features and Flags */ ULONG KeI386CpuType; Modified: trunk/reactos/ntoskrnl/ke/i386/trap.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/trap.s?re… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/trap.s [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/trap.s [iso-8859-1] Thu Apr 17 14:08:26 2008 @@ -81,7 +81,7 @@ .globl _KiIdtDescriptor _KiIdtDescriptor: .short 0 - .short 0x800 + .short 0x7FF .long _KiIdt .globl _KiUnexpectedEntrySize

1 0

[greatlrd] 33006: merge ksuser.dll from reactx branch to trunk not all api are implemented. reactx.h header are now in use here
by greatlrd＠svn.reactos.org 17 Apr '08

17 Apr '08

Author: greatlrd Date: Thu Apr 17 13:01:51 2008 New Revision: 33006 URL: http://svn.reactos.org/svn/reactos?rev=33006&view=rev Log: merge ksuser.dll from reactx branch to trunk not all api are implemented. reactx.h header are now in use here Added: trunk/reactos/dll/directx/ksuser/ksuser.h (with props) Modified: trunk/reactos/dll/directx/ksuser/ksuser.c trunk/reactos/dll/directx/ksuser/ksuser.def trunk/reactos/dll/directx/ksuser/ksuser.rbuild trunk/reactos/dll/directx/ksuser/ksuser.rc Modified: trunk/reactos/dll/directx/ksuser/ksuser.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ksuser/ksuser.… ============================================================================== --- trunk/reactos/dll/directx/ksuser/ksuser.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/ksuser/ksuser.c [iso-8859-1] Thu Apr 17 13:01:51 2008 @@ -1,7 +1,7 @@ /* - * KSUSER.DLL - ReactOS User CSA Library - * - * Copyright 2008 Dmitry Chapyshev + * KSUSER.DLL - ReactOS + * + * Copyright 2008 Magnus Olsen and Dmitry Chapyshev * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -18,46 +18,210 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <windows.h> -#include <stdio.h> -#include <wchar.h> -#include <tchar.h> -#include <ks.h> - -KSDDKAPI NTSTATUS NTAPI -KsCreateAllocator( - HANDLE ConnectionHandle, - PKSALLOCATOR_FRAMING AllocatorFraming, - PHANDLE AllocatorHandle) -{ - return STATUS_SUCCESS; -} - -KSDDKAPI NTSTATUS NTAPI -KsCreateClock( - HANDLE ConnectionHandle, - PKSCLOCK_CREATE ClockCreate, - PHANDLE ClockHandle) -{ - return STATUS_SUCCESS; -} - -KSDDKAPI NTSTATUS NTAPI -KsCreatePin( - HANDLE FilterHandle, - PKSPIN_CONNECT Connect, - ACCESS_MASK DesiredAccess, - PHANDLE ConnectionHandle) -{ - return STATUS_SUCCESS; -} - -KSDDKAPI NTSTATUS NTAPI -KsCreateTopologyNode( - HANDLE ParentHandle, - PKSNODE_CREATE NodeCreate, - ACCESS_MASK DesiredAccess, - PHANDLE NodeHandle) -{ - return STATUS_SUCCESS; -} + +#include "ksuser.h" + +NTSTATUS NTAPI KsiCreateObjectType( HANDLE hHandle, PVOID guidstr, PVOID Buffer, ULONG BufferSize, ACCESS_MASK DesiredAccess, PHANDLE phHandle); + +NTSTATUS +NTAPI +KsiCreateObjectType( HANDLE hHandle, + PVOID IID, + PVOID Buffer, + ULONG BufferSize, + ACCESS_MASK DesiredAccess, + PHANDLE phHandle) +{ + UNIMPLEMENTED + return 0; +} + +/*++ +* @name KsCreateAllocator +* @implemented +* The function KsCreateAllocator creates a handle to an allocator for the given sink connection handle +* +* @param HANDLE ConnectionHandle +* Handle to the sink connection on which to create the allocator +* +* @param PKSALLOCATOR_FRAMING AllocatorFraming +* the input param we using to alloc our framing +* +* @param PHANDLE AllocatorHandle +* Our new handle that we have alloc +* +* @return +* Return NTSTATUS error code or sussess code. +* +* @remarks. +* none +* +*--*/ +KSDDKAPI +NTSTATUS +NTAPI +KsCreateAllocator(HANDLE ConnectionHandle, + PKSALLOCATOR_FRAMING AllocatorFraming, + PHANDLE AllocatorHandle) + +{ + return KsiCreateObjectType( ConnectionHandle, + KSSTRING_Allocator, + (PVOID) AllocatorFraming, + sizeof(KSALLOCATOR_FRAMING), + GENERIC_READ, + AllocatorHandle); +} + +/*++ +* @name KsCreateClock +* @implemented +* +* The function KsCreateClock creates handle to clock instance +* +* @param HANDLE ConnectionHandle +* Handle to use to create the clock +* +* @param PKSCLOCK_CREATE ClockCreate +* paramenter to use to create the clock +* +* @param PHANDLE ClockHandle +* The new handle +* +* @return +* Return NTSTATUS error code or sussess code. +* +* @remarks. +* none +* +*--*/ +KSDDKAPI +NTSTATUS +NTAPI +KsCreateClock(HANDLE ConnectionHandle, + PKSCLOCK_CREATE ClockCreate, + PHANDLE ClockHandle) +{ + return KsiCreateObjectType( ConnectionHandle, + KSSTRING_Clock, + (PVOID) ClockCreate, + sizeof(KSCLOCK_CREATE), + GENERIC_READ, + ClockHandle); +} + +/*++ +* @name KsCreatePin +* @implemented +* +* The function KsCreatePin passes a connection request to device and create pin instance +* +* @param HANDLE FilterHandle +* handle of the filter initiating the create request +* +* @param PKSPIN_CONNECT Connect +* Pointer to a KSPIN_CONNECT structure that contains parameters for the requested connection. +* This should be followed in memory by a KSDATAFORMAT data structure, describing the data format +* requested for the connection. + +* @param ACCESS_MASK DesiredAccess +* Desrided access +* +* @param PHANDLE ConnectionHandle +* connection handle passed +* +* @return +* Return NTSTATUS error code or sussess code. +* +* @remarks. +* The flag in PKSDATAFORMAT is not really document, +* to find it u need api mointor allot api and figout +* how it works, only flag I have found is the +* KSDATAFORMAT_ATTRIBUTES flag, it doing a Align +* of LONLONG size, it also round up it. +* +*--*/ + +KSDDKAPI +NTSTATUS +NTAPI +KsCreatePin(HANDLE FilterHandle, + PKSPIN_CONNECT Connect, + ACCESS_MASK DesiredAccess, + PHANDLE ConnectionHandle) +{ + ULONG BufferSize = sizeof(KSPIN_CONNECT); + PKSDATAFORMAT DataFormat = ((PKSDATAFORMAT) ( ((ULONG)Connect) + ((ULONG)sizeof(KSPIN_CONNECT)) ) ); + + if (DataFormat->Flags & KSDATAFORMAT_ATTRIBUTES) + { + BufferSize += (ROUND_UP(DataFormat->FormatSize,sizeof(LONGLONG)) + DataFormat->FormatSize); + } + + return KsiCreateObjectType(FilterHandle, + KSSTRING_Pin, + Connect, + BufferSize, + DesiredAccess, + ConnectionHandle); + +} + +/*++ +* @name KsCreateTopologyNode +* @implemented +* +* The function KsCreateTopologyNode creates a handle to a topology node instance +* +* @param HANDLE ParentHandle +* Handle to parent when want to use when we created the node on +* +* +* @param PKSNODE_CREATE NodeCreate +* topology node parameters to use when it is create +* +* @param ACCESS_MASK DesiredAccess +* Desrided access +* +* @param PHANDLE NodeHandle +* Location for the topology node handle +* +* @return +* Return NTSTATUS error code or sussess code. +* +* @remarks. +* none +* +*--*/ +KSDDKAPI +NTSTATUS +NTAPI +KsCreateTopologyNode(HANDLE ParentHandle, + PKSNODE_CREATE NodeCreate, + IN ACCESS_MASK DesiredAccess, + OUT PHANDLE NodeHandle) +{ + return KsiCreateObjectType( ParentHandle, + KSSTRING_TopologyNode, + (PVOID) NodeCreate, + sizeof(KSNODE_CREATE), + DesiredAccess, + NodeHandle); +} + + +BOOL +APIENTRY +DllMain(HANDLE hModule, DWORD ulreason, LPVOID lpReserved) +{ + switch (ulreason) + { + case DLL_PROCESS_ATTACH: + case DLL_THREAD_ATTACH: + case DLL_THREAD_DETACH: + case DLL_PROCESS_DETACH: + break; + } + + return TRUE; +} Modified: trunk/reactos/dll/directx/ksuser/ksuser.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ksuser/ksuser.… ============================================================================== --- trunk/reactos/dll/directx/ksuser/ksuser.def [iso-8859-1] (original) +++ trunk/reactos/dll/directx/ksuser/ksuser.def [iso-8859-1] Thu Apr 17 13:01:51 2008 @@ -1,7 +1,6 @@ LIBRARY ksuser.dll EXPORTS -KsCreateAllocator -KsCreateClock -KsCreatePin -KsCreateTopologyNode -; EOF + KsCreateAllocator@12 + KsCreateClock@12 + KsCreatePin@16 + KsCreateTopologyNode@16 Added: trunk/reactos/dll/directx/ksuser/ksuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ksuser/ksuser.… ============================================================================== --- trunk/reactos/dll/directx/ksuser/ksuser.h (added) +++ trunk/reactos/dll/directx/ksuser/ksuser.h [iso-8859-1] Thu Apr 17 13:01:51 2008 @@ -1,0 +1,15 @@ + + + +#define _KSDDK_ +#include <windows.h> +#include <reactos/helper.h> + + + +#include <ks.h> +#include <debug.h> + + + + Propchange: trunk/reactos/dll/directx/ksuser/ksuser.h ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/directx/ksuser/ksuser.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ksuser/ksuser.… ============================================================================== --- trunk/reactos/dll/directx/ksuser/ksuser.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/directx/ksuser/ksuser.rbuild [iso-8859-1] Thu Apr 17 13:01:51 2008 @@ -1,15 +1,13 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> -<group> <module name="ksuser" type="win32dll" baseaddress="${BASEADDRESS_KSUSER}" installbase="system32" installname="ksuser.dll" allowwarnings="true"> <importlibrary definition="ksuser.def" /> <include base="ksuser">.</include> <define name="WINVER">0x600</define> <define name="_WIN32_WINNT">0x600</define> - <library>advapi32</library> + <library>advapi32</library> <library>kernel32</library> <library>ntdll</library> <file>ksuser.c</file> <file>ksuser.rc</file> </module> -</group> Modified: trunk/reactos/dll/directx/ksuser/ksuser.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ksuser/ksuser.… ============================================================================== --- trunk/reactos/dll/directx/ksuser/ksuser.rc [iso-8859-1] (original) +++ trunk/reactos/dll/directx/ksuser/ksuser.rc [iso-8859-1] Thu Apr 17 13:01:51 2008 @@ -1,12 +1,10 @@ + #define REACTOS_VERSION_DLL -#define REACTOS_STR_FILE_DESCRIPTION "ReactOS User CSA Library\0" -#define REACTOS_STR_INTERNAL_NAME "ksuser\0" +#define REACTOS_STR_FILE_DESCRIPTION "User CSA Library\0" +#define REACTOS_STR_INTERNAL_NAME "ksuser.dll\0" #define REACTOS_STR_ORIGINAL_FILENAME "ksuser.dll\0" -#define REACTOS_FILEVERSION 5,3,0,900 -#define REACTOS_STR_FILE_VERSION "5.3.0.900" -#define REACTOS_PRODUCTVERSION 5,3,0,900 -#define REACTOS_STR_PRODUCT_VERSION "5.3" +#include <reactos/reactx.h> #include <reactos/version.rc>

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