Ros-diffs

ros-diffs@reactos.org

81390 discussions

[fireball] 33290: - Revert 33274, except the change in GetDisplayNumberFromDeviceName(), where a zero-length string should be actually accepted. - As for other changes in 33274: removed accidentally committed DPRINT1s by Magnus, removed unneeded DisplayNumber zero-init, because it's always initialized by a call to GetDisplayNumberFromDeviceName().
by fireball＠svn.reactos.org 05 May '08

05 May '08

Author: fireball Date: Mon May 5 03:28:41 2008 New Revision: 33290 URL: http://svn.reactos.org/svn/reactos?rev=33290&view=rev Log: - Revert 33274, except the change in GetDisplayNumberFromDeviceName(), where a zero-length string should be actually accepted. - As for other changes in 33274: removed accidentally committed DPRINT1s by Magnus, removed unneeded DisplayNumber zero-init, because it's always initialized by a call to GetDisplayNumberFromDeviceName(). Modified: trunk/reactos/subsystems/win32/win32k/objects/dc.c 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] Mon May 5 03:28:41 2008 @@ -2741,17 +2741,10 @@ if (DisplayNumber == NULL) return STATUS_INVALID_PARAMETER_2; - DPRINT1("GetDisplayNumberFromDeviceName Pass 1 seh \n"); - - if ((pDeviceName != NULL) && (pDeviceName->Length != 0)) - { - if (pDeviceName->Length <= DisplayString.Length) - { - DPRINT1("GetDisplayNumberFromDeviceName FAIL pDeviceName : %wZ \n",pDeviceName); - DPRINT1("GetDisplayNumberFromDeviceName FAIL pDeviceName->Length : %d \n",pDeviceName->Length); - return STATUS_OBJECT_NAME_INVALID; - } - } + /* Check if DeviceName is valid */ + if (pDeviceName && + pDeviceName->Length > 0 && pDeviceName->Length <= DisplayString.Length) + return STATUS_OBJECT_NAME_INVALID; if (pDeviceName == NULL || pDeviceName->Length == 0) { @@ -2790,7 +2783,7 @@ Number = Number * 10 + Char - L'0'; else if (Char != L'\0') return STATUS_OBJECT_NAME_INVALID; - } + } *DisplayNumber = Number - 1; } @@ -2816,15 +2809,13 @@ static UNICODE_STRING CachedDeviceName; PDEVMODEW CachedMode = NULL; DEVMODEW DevMode; - ULONG DisplayNumber = 0; + ULONG DisplayNumber; if (!NT_SUCCESS(GetDisplayNumberFromDeviceName(pDeviceName, &DisplayNumber))) { SetLastWin32Error(STATUS_NO_SUCH_DEVICE); return FALSE; } - - DPRINT1("IntEnumDisplaySettings Pass 1 seh \n"); DPRINT("DevMode->dmSize = %d\n", pDevMode->dmSize); DPRINT("DevMode->dmExtraSize = %d\n", pDevMode->dmDriverExtra); @@ -2836,17 +2827,13 @@ return FALSE; } - DPRINT1("IntEnumDisplaySettings Pass 2 seh \n"); - if (iModeNum == ENUM_CURRENT_SETTINGS) { - DPRINT1("IntEnumDisplaySettings ENUM_CURRENT_SETTINGS \n"); CachedMode = &PrimarySurface.DMW; ASSERT(CachedMode->dmSize > 0); } else if (iModeNum == ENUM_REGISTRY_SETTINGS) { - DPRINT1("IntEnumDisplaySettings ENUM_REGISTRY_SETTINGS \n"); RtlZeroMemory(&DevMode, sizeof (DevMode)); DevMode.dmSize = sizeof (DevMode); DevMode.dmDriverExtra = 0; @@ -2860,13 +2847,9 @@ /* FIXME: Maybe look for the matching devmode supplied by the * driver so we can provide driver private/extra data? */ - - DPRINT1("IntEnumDisplaySettings Pass 3 seh \n"); } else { - DPRINT1("IntEnumDisplaySettings NO FLAGs \n"); - BOOL IsCachedDevice = (CachedDevModes != NULL); if (CachedDevModes && @@ -2883,8 +2866,6 @@ LPWSTR CurrentName; DRVENABLEDATA DrvEnableData; - DPRINT1("IntEnumDisplaySettings iModeNum \n"); - /* Free resources from last driver cache */ if (IsCachedDevice == FALSE && CachedDeviceName.Buffer != NULL) { @@ -2899,15 +2880,11 @@ return FALSE; } - DPRINT1("IntEnumDisplaySettings Pass 4 seh \n"); - if (!IntPrepareDriverIfNeeded()) { DPRINT1("IntPrepareDriverIfNeeded failed\n"); return FALSE; } - - DPRINT1("IntEnumDisplaySettings Pass 5 seh \n"); /* * DriverFileNames may be a list of drivers in REG_SZ_MULTI format, @@ -2989,9 +2966,6 @@ SetLastWin32Error(STATUS_NO_MEMORY); return FALSE; } - - DPRINT1("IntEnumDisplaySettings Pass 6 seh \n"); - if (CachedDevModes != NULL) { RtlCopyMemory(NewBuffer, CachedDevModes, SizeUsed); @@ -3030,19 +3004,12 @@ } /* return cached info */ - - - DPRINT1("IntEnumDisplaySettings return cached info \n"); - CachedMode = CachedDevModes; if (CachedMode >= CachedDevModesEnd) { SetLastWin32Error(STATUS_NO_MORE_ENTRIES); return FALSE; } - - DPRINT1("IntEnumDisplaySettings Pass 7 seh \n"); - while (iModeNum-- > 0 && CachedMode < CachedDevModesEnd) { assert(CachedMode->dmSize > 0); @@ -3053,13 +3020,9 @@ SetLastWin32Error(STATUS_NO_MORE_ENTRIES); return FALSE; } - - DPRINT1("IntEnumDisplaySettings Pass 8 seh \n"); } ASSERT(CachedMode != NULL); - - DPRINT1("IntEnumDisplaySettings Pass 9 seh \n"); RtlCopyMemory(pDevMode, CachedMode, min(pDevMode->dmSize, CachedMode->dmSize)); RtlZeroMemory(pDevMode + pDevMode->dmSize, pDevMode->dmDriverExtra);

1 0

[fireball] 33289: - Fix a few DxEng APIs without proper calling convention (spotted by Stefan).
by fireball＠svn.reactos.org 05 May '08

05 May '08

Author: fireball Date: Mon May 5 02:59:00 2008 New Revision: 33289 URL: http://svn.reactos.org/svn/reactos?rev=33289&view=rev Log: - Fix a few DxEng APIs without proper calling convention (spotted by Stefan). Modified: trunk/reactos/subsystems/win32/win32k/ntddraw/dxeng.c Modified: trunk/reactos/subsystems/win32/win32k/ntddraw/dxeng.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntddraw/dxeng.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntddraw/dxeng.c [iso-8859-1] Mon May 5 02:59:00 2008 @@ -74,6 +74,7 @@ * *--*/ ULONG +APIENTRY DxEngDispUniq() { DPRINT1("ReactX Calling : DxEngDispUniq\n"); @@ -510,6 +511,7 @@ * *--*/ BOOLEAN +APIENTRY DxEngIncDispUniq() { DPRINT1("ReactX Calling : DxEngIncDispUniq \n"); @@ -619,8 +621,10 @@ /* DxEngRedrawDesktop */ /************************************************************************/ -/* Notes : it always return TRUE, and it update whole the screen (redaw current desktop) */ -BOOLEAN +/* Notes : it always returns TRUE, and it updates whole screen + (redraws current desktop) */ +BOOLEAN +APIENTRY DxEngRedrawDesktop() { /* FIXME add redraw code */ @@ -632,8 +636,9 @@ /************************************************************************/ /* DxEngVisRgnUniq */ /************************************************************************/ -/* Notes : return the VisRgnUniq counter for win32k */ +/* Notes : returns the VisRgnUniq counter for win32k */ ULONG +APIENTRY DxEngVisRgnUniq() { DPRINT1("ReactX Calling : DxEngVisRgnUniq \n");

1 0

[jimtabor] 33288: Implement IntGdiReferencePdev and part of IntGdiUnreferencePdev.
by jimtabor＠svn.reactos.org 05 May '08

05 May '08

Author: jimtabor Date: Sun May 4 20:34:17 2008 New Revision: 33288 URL: http://svn.reactos.org/svn/reactos?rev=33288&view=rev Log: Implement IntGdiReferencePdev and part of IntGdiUnreferencePdev. Modified: trunk/reactos/subsystems/win32/win32k/objects/dc.c 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] Sun May 4 20:34:17 2008 @@ -2699,16 +2699,27 @@ return &PrimarySurface; } +HSEMAPHORE hsemDriverMgmt = NULL; // Hax, should be in dllmain.c and global. + VOID FASTCALL IntGdiReferencePdev(PGDIDEVICE pPDev) { + if(!hsemDriverMgmt) hsemDriverMgmt = EngCreateSemaphore(); // Hax, should be in dllmain.c + EngAcquireSemaphore(hsemDriverMgmt); pPDev->cPdevRefs++; + EngReleaseSemaphore(hsemDriverMgmt); } VOID FASTCALL IntGdiUnreferencePdev(PGDIDEVICE pPDev, DWORD CleanUpType) { + EngAcquireSemaphore(hsemDriverMgmt); pPDev->cPdevRefs--; + if (!pPDev->cPdevRefs) + { + // Handle the destruction of pPDev or GDIDEVICE or PDEVOBJ or PDEV etc. + } + EngReleaseSemaphore(hsemDriverMgmt); }

1 0

[mpiulachs] 33287: -Move shellext folder to a more appropriate location. shell extensions are COM objects which extends the abilities of MS Windows explorer and not regular Win32 Dlls as they don't export APIs (part 2/2)
by mpiulachs＠svn.reactos.org 04 May '08

04 May '08

Author: mpiulachs Date: Sun May 4 18:47:15 2008 New Revision: 33287 URL: http://svn.reactos.org/svn/reactos?rev=33287&view=rev Log: -Move shellext folder to a more appropriate location. shell extensions are COM objects which extends the abilities of MS Windows explorer and not regular Win32 Dlls as they don't export APIs (part 2/2) Modified: trunk/reactos/boot/bootdata/packages/reactos.dff Modified: trunk/reactos/boot/bootdata/packages/reactos.dff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/packages/rea… ============================================================================== --- trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] Sun May 4 18:47:15 2008 @@ -321,10 +321,12 @@ dll\win32\wshirda\wshirda.dll 1 dll\win32\wsock32\wsock32.dll 1 dll\win32\wtsapi32\wtsapi32.dll 1 -dll\win32\shellext\deskadp\deskadp.dll 1 -dll\win32\shellext\deskmon\deskmon.dll 1 dll\win32\winmm\midimap\midimap.dll 1 dll\win32\winmm\wavemap\msacm32.drv 1 optional + +; Shell Extensions +dll\shellext\deskadp\deskadp.dll 1 +dll\shellext\deskmon\deskmon.dll 1 ; Drivers drivers\base\bootvid\bootvid.dll 1

1 0

[mpiulachs] 33286: -Move shellext folder to a more appropriate location. shell extensions are COM objects which extends the abilities of MS Windows explorer and not regular Win32 Dlls as they don't export APIs (part 1/2)
by mpiulachs＠svn.reactos.org 04 May '08

04 May '08

Author: mpiulachs Date: Sun May 4 18:46:26 2008 New Revision: 33286 URL: http://svn.reactos.org/svn/reactos?rev=33286&view=rev Log: -Move shellext folder to a more appropriate location. shell extensions are COM objects which extends the abilities of MS Windows explorer and not regular Win32 Dlls as they don't export APIs (part 1/2) Added: trunk/reactos/dll/shellext/ - copied from r33280, trunk/reactos/dll/win32/shellext/ Removed: trunk/reactos/dll/win32/shellext/ Modified: trunk/reactos/dll/dll.rbuild trunk/reactos/dll/win32/win32.rbuild Modified: trunk/reactos/dll/dll.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/dll.rbuild?rev=33286&r… ============================================================================== --- trunk/reactos/dll/dll.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/dll.rbuild [iso-8859-1] Sun May 4 18:46:26 2008 @@ -16,6 +16,9 @@ <directory name="ntdll"> <xi:include href="ntdll/ntdll.rbuild" /> </directory> +<directory name="shellext"> + <xi:include href="shellext/shellext.rbuild" /> +</directory> <directory name="win32"> <xi:include href="win32/win32.rbuild" /> </directory> Modified: trunk/reactos/dll/win32/win32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/win32.rbuild?rev… ============================================================================== --- trunk/reactos/dll/win32/win32.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/win32.rbuild [iso-8859-1] Sun May 4 18:46:26 2008 @@ -277,9 +277,6 @@ <directory name="shell32"> <xi:include href="shell32/shell32.rbuild" /> </directory> -<directory name="shellext"> - <xi:include href="shellext/shellext.rbuild" /> -</directory> <directory name="shfolder"> <xi:include href="shfolder/shfolder.rbuild" /> </directory>

1 0

[mpiulachs] 33285: -replace the non defined ${MP} property by a constant boolean value for now. ${MP} was removed long time ago
by mpiulachs＠svn.reactos.org 04 May '08

04 May '08

Author: mpiulachs Date: Sun May 4 18:32:43 2008 New Revision: 33285 URL: http://svn.reactos.org/svn/reactos?rev=33285&view=rev Log: -replace the non defined ${MP} property by a constant boolean value for now. ${MP} was removed long time ago Modified: trunk/reactos/hal/hal/hal.rbuild Modified: trunk/reactos/hal/hal/hal.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/hal/hal.rbuild?rev=332… ============================================================================== --- trunk/reactos/hal/hal/hal.rbuild [iso-8859-1] (original) +++ trunk/reactos/hal/hal/hal.rbuild [iso-8859-1] Sun May 4 18:32:43 2008 @@ -11,9 +11,9 @@ <file>hal.rc</file> </module> <if property="ARCH" value="i386"> - <module ifnot="${MP}" name="halupalias" type="alias" installbase="system32" installname="hal.dll" aliasof="halup"> + <module ifnot="false" name="halupalias" type="alias" installbase="system32" installname="hal.dll" aliasof="halup"> </module> - <module if="${MP}" name="halmpalias" type="alias" installbase="system32" installname="hal.dll" aliasof="halmp"> + <module if="false" name="halmpalias" type="alias" installbase="system32" installname="hal.dll" aliasof="halmp"> </module> </if> <if property="ARCH" value="powerpc">

1 0

[jimtabor] 33284: Impement DxEngSetDCState, DxEngIsHdevLockedByCurrentThread and DxEngUn & ReferenceHdev.
by jimtabor＠svn.reactos.org 04 May '08

04 May '08

Author: jimtabor Date: Sun May 4 18:17:10 2008 New Revision: 33284 URL: http://svn.reactos.org/svn/reactos?rev=33284&view=rev Log: Impement DxEngSetDCState, DxEngIsHdevLockedByCurrentThread and DxEngUn & ReferenceHdev. Modified: trunk/reactos/include/reactos/drivers/directx/dxeng.h trunk/reactos/subsystems/win32/win32k/include/dc.h trunk/reactos/subsystems/win32/win32k/ntddraw/dxeng.c trunk/reactos/subsystems/win32/win32k/objects/dc.c Modified: trunk/reactos/include/reactos/drivers/directx/dxeng.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/drivers/di… ============================================================================== --- trunk/reactos/include/reactos/drivers/directx/dxeng.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/drivers/directx/dxeng.h [iso-8859-1] Sun May 4 18:17:10 2008 @@ -81,7 +81,7 @@ BOOLEAN STDCALL DxEngLockHdev(HDEV hdev); BOOLEAN STDCALL DxEngUnlockHdev(HDEV hdev); DWORD_PTR STDCALL DxEngGetDCState(HDC hDC, DWORD type); -DWORD STDCALL DxEngReferenceHdev(HDEV hdev); +BOOLEAN STDCALL DxEngReferenceHdev(HDEV hdev); BOOLEAN STDCALL DxEngLockShareSem(); BOOLEAN STDCALL DxEngUnlockShareSem(); DWORD STDCALL DxEngScreenAccessCheck(); @@ -99,14 +99,14 @@ HDC STDCALL DxEngCreateMemoryDC(HDEV hDev); -DWORD STDCALL DxEngIsHdevLockedByCurrentThread(DWORD x1); -DWORD STDCALL DxEngUnreferenceHdev(DWORD x1); +BOOLEAN STDCALL DxEngIsHdevLockedByCurrentThread(HDEV hDev); +BOOLEAN STDCALL DxEngUnreferenceHdev(HDEV hDev); DWORD STDCALL DxEngSpTearDownSprites(DWORD x1, DWORD x2, DWORD x3); DWORD STDCALL DxEngSpUnTearDownSprites(DWORD x1, DWORD x2, DWORD x3); DWORD STDCALL DxEngSpSpritesVisible(DWORD x1); HDC STDCALL DxEngGetDesktopDC(ULONG DcType, BOOL EmptyDC, BOOL ValidatehWnd); BOOLEAN STDCALL DxEngDeleteDC(HDC hdc, BOOL Force); -DWORD STDCALL DxEngSetDCState(DWORD x1, DWORD x2, DWORD x3); +BOOLEAN STDCALL DxEngSetDCState(HDC hDC, DWORD SetType, DWORD Set); DWORD STDCALL DxEngSelectBitmap(DWORD x1, DWORD x2); DWORD STDCALL DxEngSetBitmapOwner(DWORD x1, DWORD x2); DWORD STDCALL DxEngDeleteSurface(DWORD x1); 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] Sun May 4 18:17:10 2008 @@ -261,5 +261,7 @@ UINT STDCALL IntGdiGetTextAlign(HDC hDC); COLORREF STDCALL IntGdiGetTextColor(HDC hDC); INT STDCALL IntGdiSetStretchBltMode(HDC hDC, INT stretchBltMode); +VOID FASTCALL IntGdiReferencePdev(PGDIDEVICE pPDev); +VOID FASTCALL IntGdiUnreferencePdev(PGDIDEVICE pPDev, DWORD CleanUpType); #endif /* not __WIN32K_DC_H */ Modified: trunk/reactos/subsystems/win32/win32k/ntddraw/dxeng.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntddraw/dxeng.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntddraw/dxeng.c [iso-8859-1] Sun May 4 18:17:10 2008 @@ -592,12 +592,11 @@ /************************************************************************/ /* DxEngReferenceHdev */ /************************************************************************/ -DWORD +BOOLEAN STDCALL DxEngReferenceHdev(HDEV hDev) { - UNIMPLEMENTED; - + IntGdiReferencePdev((PGDIDEVICE) hDev);; /* ALWAYS return true */ return TRUE; } @@ -680,24 +679,24 @@ /************************************************************************/ /* DxEngIsHdevLockedByCurrentThread */ /************************************************************************/ -DWORD -STDCALL -DxEngIsHdevLockedByCurrentThread(DWORD x1) -{ - UNIMPLEMENTED; - return FALSE; +BOOLEAN +STDCALL +DxEngIsHdevLockedByCurrentThread(HDEV hDev) +{ // base on EngIsSemaphoreOwnedByCurrentThread w/o the Ex call. + PERESOURCE pSem = ((PGDIDEVICE)hDev)->hsemDevLock; + return pSem->OwnerEntry.OwnerThread == (ERESOURCE_THREAD)PsGetCurrentThread(); } /************************************************************************/ /* DxEngUnreferenceHdev */ /************************************************************************/ -DWORD -STDCALL -DxEngUnreferenceHdev(DWORD x1) -{ - UNIMPLEMENTED; - return FALSE; +BOOLEAN +STDCALL +DxEngUnreferenceHdev(HDEV hDev) +{ + IntGdiUnreferencePdev((PGDIDEVICE) hDev, 0); + return TRUE; // Always true. } /************************************************************************/ @@ -757,10 +756,27 @@ /************************************************************************/ /* DxEngSetDCState */ /************************************************************************/ -DWORD STDCALL DxEngSetDCState(DWORD x1, DWORD x2, DWORD x3) -{ - UNIMPLEMENTED; - return FALSE; +BOOLEAN +STDCALL +DxEngSetDCState(HDC hDC, DWORD SetType, DWORD Set) +{ + BOOLEAN Ret = FALSE; + PDC pDC = DC_LockDc(hDC); + + if (pDC) + { + if (SetType == 1) + { + if ( Set ) + pDC->DC_Flags |= DC_FLAG_FULLSCREEN; + else + pDC->DC_Flags &= ~DC_FLAG_FULLSCREEN; + Ret = TRUE; + } + DC_UnlockDc(pDC); + return Ret; // Everything else returns FALSE. + } + return Ret; } /************************************************************************/ 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] Sun May 4 18:17:10 2008 @@ -2699,6 +2699,19 @@ return &PrimarySurface; } +VOID FASTCALL +IntGdiReferencePdev(PGDIDEVICE pPDev) +{ + pPDev->cPdevRefs++; +} + +VOID FASTCALL +IntGdiUnreferencePdev(PGDIDEVICE pPDev, DWORD CleanUpType) +{ + pPDev->cPdevRefs--; +} + + #define SIZEOF_DEVMODEW_300 188 #define SIZEOF_DEVMODEW_400 212 #define SIZEOF_DEVMODEW_500 220

1 0

[greatlrd] 33283: remove more of no working macro DXG_GET_INDEX_FUNCTION
by greatlrd＠svn.reactos.org 04 May '08

04 May '08

Author: greatlrd Date: Sun May 4 16:30:15 2008 New Revision: 33283 URL: http://svn.reactos.org/svn/reactos?rev=33283&view=rev Log: remove more of no working macro DXG_GET_INDEX_FUNCTION Modified: trunk/reactos/subsystems/win32/win32k/ntddraw/dvp.c trunk/reactos/subsystems/win32/win32k/ntddraw/eng.c 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] Sun May 4 16:30:15 2008 @@ -103,10 +103,7 @@ HANDLE hDDSurfaceTarget, PDD_FLIPVPORTDATA puFlipVPortData) { - PGD_DVPFLIPVIDEOPORT pfnDvpFlipVideoPort = NULL; - INT i; - - DXG_GET_INDEX_FUNCTION(DXG_INDEX_DxDvpFlipVideoPort, pfnDvpFlipVideoPort); + PGD_DVPFLIPVIDEOPORT pfnDvpFlipVideoPort = (PGD_DVPFLIPVIDEOPORT)gpDxFuncs[DXG_INDEX_DxDvpFlipVideoPort].pfn; if (pfnDvpFlipVideoPort == NULL) { @@ -127,10 +124,7 @@ NtGdiDvpGetVideoPortBandwidth(HANDLE hVideoPort, PDD_GETVPORTBANDWIDTHDATA puGetVPortBandwidthData) { - PGD_DVPGETVIDEOPORTBANDWITH pfnDvpGetVideoPortBandwidth = NULL; - INT i; - - DXG_GET_INDEX_FUNCTION(DXG_INDEX_DxDvpGetVideoPortBandwidth, pfnDvpGetVideoPortBandwidth); + PGD_DVPGETVIDEOPORTBANDWITH pfnDvpGetVideoPortBandwidth = (PGD_DVPGETVIDEOPORTBANDWITH)gpDxFuncs[DXG_INDEX_DxDvpGetVideoPortBandwidth].pfn; if (pfnDvpGetVideoPortBandwidth == NULL) { @@ -151,10 +145,7 @@ NtGdiDvpGetVideoPortFlipStatus(HANDLE hDirectDraw, PDD_GETVPORTFLIPSTATUSDATA puGetVPortFlipStatusData) { - PGD_DXDVPGETVIDEOPORTFLIPSTATUS pfnDvpGetVideoPortFlipStatus = NULL; - INT i; - - DXG_GET_INDEX_FUNCTION(DXG_INDEX_DxDvpGetVideoPortFlipStatus, pfnDvpGetVideoPortFlipStatus); + PGD_DXDVPGETVIDEOPORTFLIPSTATUS pfnDvpGetVideoPortFlipStatus = (PGD_DXDVPGETVIDEOPORTFLIPSTATUS)gpDxFuncs[DXG_INDEX_DxDvpGetVideoPortFlipStatus].pfn; if (pfnDvpGetVideoPortFlipStatus == NULL) { @@ -175,10 +166,7 @@ NtGdiDvpGetVideoPortInputFormats(HANDLE hVideoPort, PDD_GETVPORTINPUTFORMATDATA puGetVPortInputFormatData) { - PGD_DXDVPGETVIDEOPORTINPUTFORMATS pfnDvpGetVideoPortInputFormats = NULL; - INT i; - - DXG_GET_INDEX_FUNCTION(DXG_INDEX_DxDvpGetVideoPortInputFormats, pfnDvpGetVideoPortInputFormats); + PGD_DXDVPGETVIDEOPORTINPUTFORMATS pfnDvpGetVideoPortInputFormats = (PGD_DXDVPGETVIDEOPORTINPUTFORMATS)gpDxFuncs[DXG_INDEX_DxDvpGetVideoPortInputFormats].pfn; if (pfnDvpGetVideoPortInputFormats == NULL) { Modified: trunk/reactos/subsystems/win32/win32k/ntddraw/eng.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntddraw/eng.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntddraw/eng.c [iso-8859-1] Sun May 4 16:30:15 2008 @@ -25,10 +25,7 @@ LPSURFACEALIGNMENT lpAlignment, LPLONG lpNewPitch) { - PGD_HEAPVIDMEMALLOCALIGNED pfnHeapVidMemAllocAligned = NULL; - INT i; - - DXG_GET_INDEX_FUNCTION(DXG_INDEX_DxDdHeapVidMemAllocAligned, pfnHeapVidMemAllocAligned); + PGD_HEAPVIDMEMALLOCALIGNED pfnHeapVidMemAllocAligned = (PGD_HEAPVIDMEMALLOCALIGNED)gpDxFuncs[DXG_INDEX_DxDdHeapVidMemAllocAligned].pfn; if (pfnHeapVidMemAllocAligned == NULL) { @@ -48,10 +45,7 @@ VidMemFree(LPVMEMHEAP pvmh, FLATPTR ptr) { - PGD_VIDMEMFREE pfnVidMemFree = NULL; - INT i; - - DXG_GET_INDEX_FUNCTION(DXG_INDEX_DxDdHeapVidMemFree, pfnVidMemFree); + PGD_VIDMEMFREE pfnVidMemFree = (PGD_VIDMEMFREE)gpDxFuncs[DXG_INDEX_DxDdHeapVidMemFree].pfn; if (pfnVidMemFree == NULL) { @@ -73,10 +67,7 @@ SIZE_T cj, ULONG tag) { - PGD_ENGALLOCPRIVATEUSERMEM pfnEngAllocPrivateUserMem = NULL; - INT i; - - DXG_GET_INDEX_FUNCTION(DXG_INDEX_DxDdAllocPrivateUserMem, pfnEngAllocPrivateUserMem); + PGD_ENGALLOCPRIVATEUSERMEM pfnEngAllocPrivateUserMem = (PGD_ENGALLOCPRIVATEUSERMEM)gpDxFuncs[DXG_INDEX_DxDdAllocPrivateUserMem].pfn; if (pfnEngAllocPrivateUserMem == NULL) { @@ -96,10 +87,7 @@ EngFreePrivateUserMem(PDD_SURFACE_LOCAL psl, PVOID pv) { - PGD_ENGFREEPRIVATEUSERMEM pfnEngFreePrivateUserMem = NULL; - INT i; - - DXG_GET_INDEX_FUNCTION(DXG_INDEX_DxDdFreePrivateUserMem, pfnEngFreePrivateUserMem); + PGD_ENGFREEPRIVATEUSERMEM pfnEngFreePrivateUserMem = (PGD_ENGFREEPRIVATEUSERMEM)gpDxFuncs[DXG_INDEX_DxDdFreePrivateUserMem].pfn; if (pfnEngFreePrivateUserMem == NULL) {

1 0

[mpiulachs] 33282: - simple but colorful new GDI screensaver
by mpiulachs＠svn.reactos.org 04 May '08

04 May '08

Author: mpiulachs Date: Sun May 4 16:10:36 2008 New Revision: 33282 URL: http://svn.reactos.org/svn/reactos?rev=33282&view=rev Log: - simple but colorful new GDI screensaver Added: trunk/rosapps/applications/screensavers/circles/ trunk/rosapps/applications/screensavers/circles/circles.c (with props) trunk/rosapps/applications/screensavers/circles/circles.rbuild (with props) trunk/rosapps/applications/screensavers/circles/circles.rc (with props) trunk/rosapps/applications/screensavers/circles/circles.spec (with props) trunk/rosapps/applications/screensavers/circles/lang/ trunk/rosapps/applications/screensavers/circles/lang/en-US.rc (with props) trunk/rosapps/applications/screensavers/circles/resource.h (with props) Modified: trunk/rosapps/applications/screensavers/screensavers.rbuild Added: trunk/rosapps/applications/screensavers/circles/circles.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== --- trunk/rosapps/applications/screensavers/circles/circles.c (added) +++ trunk/rosapps/applications/screensavers/circles/circles.c [iso-8859-1] Sun May 4 16:10:36 2008 @@ -1,0 +1,120 @@ +/* + * Copyright 2008 Marc Piulachs (marc.piulachs(a)codexchange.net) + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + */ + +#include <windows.h> +#include <scrnsave.h> +#include <tchar.h> +#include "resource.h" + +#define RANDOM_COLOR (rand () % 256) + +#define APPNAME _T("Circles") +#define APP_TIMER 1 +#define APP_TIMER_INTERVAL 100 +#define MAX_CIRCLES 50 + +int circlesCount; +int width, x, y; + +LRESULT WINAPI ScreenSaverProc (HWND hwnd, UINT iMsg, WPARAM wparam, + LPARAM lparam) +{ + HDC hdc; + RECT rect; + HBRUSH hbrush, hbrushOld; + + switch (iMsg) + { + case WM_CREATE: + { + SetTimer ( + hwnd, + APP_TIMER, + APP_TIMER_INTERVAL, + NULL); + } + break; + case WM_DESTROY: + { + KillTimer (hwnd, APP_TIMER); + PostQuitMessage (0); + return 0; + } + break; + case WM_TIMER: + { + hdc = GetDC (hwnd); + GetClientRect (hwnd, &rect); + hbrush = CreateSolidBrush (RGB (RANDOM_COLOR, RANDOM_COLOR, RANDOM_COLOR)); + hbrushOld = SelectObject (hdc, hbrush); + + x = rand () % rect.right; + y = rand () % rect.bottom; + + /* the circle will be 10% of total screen */ + width = rect.right / 10; + if (rect.bottom / 10 < width) + width = rect.bottom / 10; + + /* Draw circle on screen */ + Ellipse ( + hdc, + x, + y, + x + width, + y + width); + + //Track the number of painted circles on scren + circlesCount++; + if (circlesCount == MAX_CIRCLES) + { + InvalidateRect (hwnd, NULL, TRUE); + circlesCount = 0; + } + + SelectObject (hdc, hbrushOld); + DeleteObject (hbrush); + ReleaseDC (hwnd, hdc); + + return 0; + } + } + + return DefScreenSaverProc (hwnd, iMsg, wparam, lparam); +} + + +BOOL WINAPI ScreenSaverConfigureDialog(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) +{ + return FALSE; +} + +// This function is only called one time before opening the configuration dialog. +// Use it to show a message that no configuration is necesssary and return FALSE to indicate that no configuration dialog shall be opened. +BOOL WINAPI RegisterDialogClasses(HANDLE hInst) +{ + TCHAR szMessage[256]; + TCHAR szTitle[25]; + + LoadString(hInst, IDS_TEXT, szMessage, sizeof(szMessage) / sizeof(TCHAR)); + LoadString(hInst, IDS_DESCRIPTION, szTitle, sizeof(szTitle) / sizeof(TCHAR)); + + MessageBox(NULL, szMessage, szTitle, MB_OK | MB_ICONEXCLAMATION); + + return FALSE; +} Propchange: trunk/rosapps/applications/screensavers/circles/circles.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rosapps/applications/screensavers/circles/circles.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== --- trunk/rosapps/applications/screensavers/circles/circles.rbuild (added) +++ trunk/rosapps/applications/screensavers/circles/circles.rbuild [iso-8859-1] Sun May 4 16:10:36 2008 @@ -1,0 +1,16 @@ +<?xml version="1.0"?> +<!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd"> +<module name="circles" type="win32scr" installbase="system32" unicode="true"> + <importlibrary definition="circles.spec.def" /> + <include base="circles">.</include> + <library>scrnsave</library> + <library>kernel32</library> + <library>user32</library> + <library>gdi32</library> + + <metadata description = "Simple Circles GDI screensaver" /> + + <file>circles.c</file> + <file>circles.rc</file> + <file>circles.spec</file> +</module> Propchange: trunk/rosapps/applications/screensavers/circles/circles.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rosapps/applications/screensavers/circles/circles.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== --- trunk/rosapps/applications/screensavers/circles/circles.rc (added) +++ trunk/rosapps/applications/screensavers/circles/circles.rc [iso-8859-1] Sun May 4 16:10:36 2008 @@ -1,0 +1,14 @@ +#include <windows.h> +#include <scrnsave.h> +#include "resource.h" + +LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL + +#define REACTOS_VERSION_DLL +#define REACTOS_STR_FILE_DESCRIPTION "Circles ScreenSaver\0" +#define REACTOS_STR_INTERNAL_NAME "circles\0" +#define REACTOS_STR_ORIGINAL_FILENAME "circles.scr\0" + +#include <reactos/version.rc> + +#include "lang/en-US.rc" Propchange: trunk/rosapps/applications/screensavers/circles/circles.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rosapps/applications/screensavers/circles/circles.spec URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== --- trunk/rosapps/applications/screensavers/circles/circles.spec (added) +++ trunk/rosapps/applications/screensavers/circles/circles.spec [iso-8859-1] Sun May 4 16:10:36 2008 @@ -1,0 +1,2 @@ +@ stdcall ScreenSaverProc(ptr long ptr ptr) +@ stdcall ScreenSaverConfigureDialog(ptr long ptr ptr) Propchange: trunk/rosapps/applications/screensavers/circles/circles.spec ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rosapps/applications/screensavers/circles/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== --- trunk/rosapps/applications/screensavers/circles/lang/en-US.rc (added) +++ trunk/rosapps/applications/screensavers/circles/lang/en-US.rc [iso-8859-1] Sun May 4 16:10:36 2008 @@ -1,0 +1,7 @@ +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US + +STRINGTABLE DISCARDABLE +BEGIN + IDS_DESCRIPTION "Circles" + IDS_TEXT "No options need to be set." +END Propchange: trunk/rosapps/applications/screensavers/circles/lang/en-US.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rosapps/applications/screensavers/circles/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== --- trunk/rosapps/applications/screensavers/circles/resource.h (added) +++ trunk/rosapps/applications/screensavers/circles/resource.h [iso-8859-1] Sun May 4 16:10:36 2008 @@ -1,0 +1,3 @@ +#define IDS_TEXT 3 +#define IDB_WORKSTATION 0x100 +#define IDB_SERVER 0x200 Propchange: trunk/rosapps/applications/screensavers/circles/resource.h ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rosapps/applications/screensavers/screensavers.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== --- trunk/rosapps/applications/screensavers/screensavers.rbuild [iso-8859-1] (original) +++ trunk/rosapps/applications/screensavers/screensavers.rbuild [iso-8859-1] Sun May 4 16:10:36 2008 @@ -1,6 +1,9 @@ <?xml version="1.0"?> <!DOCTYPE group SYSTEM "../../../tools/rbuild/project.dtd"> <group xmlns:xi="http://www.w3.org/2001/XInclude"> + <directory name="circles"> + <xi:include href="circles/circles.rbuild" /> + </directory> <directory name="cylfrac"> <xi:include href="cylfrac/cylfrac.rbuild" /> </directory>

1 0

[mpiulachs] 33281: - Add language name tooltip to kbswitch systray icon
by mpiulachs＠svn.reactos.org 04 May '08

04 May '08

Author: mpiulachs Date: Sun May 4 15:58:15 2008 New Revision: 33281 URL: http://svn.reactos.org/svn/reactos?rev=33281&view=rev Log: - Add language name tooltip to kbswitch systray icon Modified: trunk/reactos/base/applications/kbswitch/kbswitch.c trunk/reactos/base/applications/kbswitch/kbswitch.h Modified: trunk/reactos/base/applications/kbswitch/kbswitch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/kbswitch… ============================================================================== --- trunk/reactos/base/applications/kbswitch/kbswitch.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/kbswitch/kbswitch.c [iso-8859-1] Sun May 4 15:58:15 2008 @@ -15,6 +15,9 @@ static BOOL GetLayoutID(LPTSTR szLayoutNum, LPTSTR szLCID); + +static BOOL +GetLayoutName(LPTSTR szLayoutNum, LPTSTR szName); HINSTANCE hInst; HANDLE hProcessHeap; @@ -95,15 +98,19 @@ { NOTIFYICONDATA tnid; TCHAR szLCID[CCH_LAYOUT_ID + 1]; + TCHAR szName[MAX_PATH]; GetLayoutID(_T("1"), szLCID); + GetLayoutName(_T("1"), szName); tnid.cbSize = sizeof(NOTIFYICONDATA); tnid.hWnd = hwnd; tnid.uID = 1; - tnid.uFlags = NIF_ICON | NIF_MESSAGE; + tnid.uFlags = NIF_ICON | NIF_MESSAGE | NIF_TIP; tnid.uCallbackMessage = WM_NOTIFYICONMSG; tnid.hIcon = CreateTrayIcon(szLCID); + + lstrcpyn(tnid.szTip, szName, sizeof(tnid.szTip)); Shell_NotifyIcon(NIM_ADD, &tnid); } @@ -121,16 +128,18 @@ } static VOID -UpdateTrayIcon(HWND hwnd, LPTSTR szLCID) +UpdateTrayIcon(HWND hwnd, LPTSTR szLCID, LPTSTR szName) { NOTIFYICONDATA tnid; tnid.cbSize = sizeof(NOTIFYICONDATA); tnid.hWnd = hwnd; tnid.uID = 1; - tnid.uFlags = NIF_ICON | NIF_MESSAGE; + tnid.uFlags = NIF_ICON | NIF_MESSAGE |NIF_TIP; tnid.uCallbackMessage = WM_NOTIFYICONMSG; tnid.hIcon = CreateTrayIcon(szLCID); + + lstrcpyn(tnid.szTip, szName, sizeof(tnid.szTip)); Shell_NotifyIcon(NIM_MODIFY, &tnid); } @@ -259,13 +268,15 @@ HKL hKl; TCHAR szLayoutNum[CCH_ULONG_DEC + 1]; TCHAR szLCID[CCH_LAYOUT_ID + 1]; + TCHAR szName[MAX_PATH]; _ultot(uLayoutNum, szLayoutNum, 10); GetLayoutID(szLayoutNum, szLCID); + GetLayoutName(szLayoutNum, szName); CreateTrayIcon(szLCID); // Switch to the new keyboard layout - UpdateTrayIcon(hwnd, szLCID); + UpdateTrayIcon(hwnd, szLCID, szName); hKl = LoadKeyboardLayout(szLCID, KLF_ACTIVATE); SystemParametersInfo(SPI_SETDEFAULTINPUTLANG, 0, &hKl, SPIF_SENDWININICHANGE); EnumWindows(EnumWindowsProc, (LPARAM) hKl); @@ -411,6 +422,15 @@ } break; + case WM_SETTINGCHANGE: + { + if (wParam == SPI_SETDEFAULTINPUTLANG) + { + //FIXME: Should detect default language changes by CPL applet or by other tools and update UI + } + } + break; + case WM_DESTROY: DestroyMenu(hLeftPopupMenu); DestroyMenu(hRightPopupMenu); Modified: trunk/reactos/base/applications/kbswitch/kbswitch.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/kbswitch… ============================================================================== --- trunk/reactos/base/applications/kbswitch/kbswitch.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/kbswitch/kbswitch.h [iso-8859-1] Sun May 4 15:58:15 2008 @@ -1,6 +1,7 @@ #include <stdio.h> #include <stdlib.h> #include <windows.h> +#include <winuser.h> #include <tchar.h> #include "resource.h"

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