Ros-diffs March 2007

ros-diffs@reactos.org

20 participants
287 discussions

[tretiakov] 26039: Forget to enter critical region

by tretiakov＠svn.reactos.org

Author: tretiakov Date: Thu Mar 8 22:45:32 2007 New Revision: 26039 URL: http://svn.reactos.org/svn/reactos?rev=26039&view=rev Log: Forget to enter critical region Modified: trunk/reactos/subsystems/win32/win32k/ntuser/ntuser.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/ntuser.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/ntuser.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/ntuser.c Thu Mar 8 22:45:32 2007 @@ -82,15 +82,18 @@ VOID FASTCALL UserEnterShared(VOID) { + KeEnterCriticalRegion(); ExAcquireResourceSharedLite(&UserLock, TRUE); } VOID FASTCALL UserEnterExclusive(VOID) { + KeEnterCriticalRegion(); ExAcquireResourceExclusiveLite(&UserLock, TRUE); } VOID FASTCALL UserLeave(VOID) { ExReleaseResourceLite(&UserLock); + KeLeaveCriticalRegion(); }

17 years, 6 months

[tretiakov] 26038: Fix build: - Add missing function protype. - Move IntSetupClipboard to winsta.c

by tretiakov＠svn.reactos.org

Author: tretiakov Date: Thu Mar 8 22:44:36 2007 New Revision: 26038 URL: http://svn.reactos.org/svn/reactos?rev=26038&view=rev Log: Fix build: - Add missing function protype. - Move IntSetupClipboard to winsta.c Modified: trunk/reactos/subsystems/win32/win32k/include/clipboard.h trunk/reactos/subsystems/win32/win32k/ntuser/clipboard.c trunk/reactos/subsystems/win32/win32k/ntuser/winsta.c Modified: trunk/reactos/subsystems/win32/win32k/include/clipboard.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/clipboard.h (original) +++ trunk/reactos/subsystems/win32/win32k/include/clipboard.h Thu Mar 8 22:44:36 2007 @@ -40,6 +40,9 @@ } CLIPBOARDSYSTEM, *PCLIPBOARDSYSTEM; +VOID FASTCALL +IntClipboardFreeWindow(PWINDOW_OBJECT window); + /* UINT FASTCALL IntEnumClipboardFormats(UINT format); Modified: trunk/reactos/subsystems/win32/win32k/ntuser/clipboard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/clipboard.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/clipboard.c Thu Mar 8 22:44:36 2007 @@ -1202,17 +1202,6 @@ return sn; } -BOOL FASTCALL -IntSetupClipboard(PWINSTATION_OBJECT WinStaObj) -{ - WinStaObj->Clipboard = ExAllocatePool(PagedPool, sizeof(CLIPBOARDSYSTEM)); - if (WinStaObj->Clipboard) - { - RtlZeroMemory(WinStaObj->Clipboard, sizeof(CLIPBOARDSYSTEM)); - return TRUE; - } - return FALSE; -} /**************** VISTA FUNCTIONS******************/ Modified: trunk/reactos/subsystems/win32/win32k/ntuser/winsta.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/winsta.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/winsta.c Thu Mar 8 22:44:36 2007 @@ -55,6 +55,7 @@ WINSTA_READATTRIBUTES | WINSTA_READSCREEN | WINSTA_WRITEATTRIBUTES }; + NTSTATUS FASTCALL InitWindowStationImpl(VOID) { @@ -90,6 +91,18 @@ CleanupWindowStationImpl(VOID) { return STATUS_SUCCESS; +} + +BOOL FASTCALL +IntSetupClipboard(PWINSTATION_OBJECT WinStaObj) +{ + WinStaObj->Clipboard = ExAllocatePool(PagedPool, sizeof(CLIPBOARDSYSTEM)); + if (WinStaObj->Clipboard) + { + RtlZeroMemory(WinStaObj->Clipboard, sizeof(CLIPBOARDSYSTEM)); + return TRUE; + } + return FALSE; } /* OBJECT CALLBACKS **********************************************************/

17 years, 6 months

[fireball] 26037: Dear ladies and gentlemen, we're approaching a release, please tighten your seat belts and enjoy the process.

by fireball＠svn.reactos.org

Author: fireball Date: Thu Mar 8 22:30:21 2007 New Revision: 26037 URL: http://svn.reactos.org/svn/reactos?rev=26037&view=rev Log: Dear ladies and gentlemen, we're approaching a release, please tighten your seat belts and enjoy the process. Modified: branches/ros-branch-0_3_1/reactos/include/reactos/version.h Modified: branches/ros-branch-0_3_1/reactos/include/reactos/version.h URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/includ… ============================================================================== --- branches/ros-branch-0_3_1/reactos/include/reactos/version.h (original) +++ branches/ros-branch-0_3_1/reactos/include/reactos/version.h Thu Mar 8 22:30:21 2007 @@ -22,7 +22,7 @@ #define KERNEL_VERSION_PATCH_LEVEL 1 /* KERNEL_VERSION_BUILD_TYPE is L"SVN", L"RC1", L"RC2" or L"RELEASE" */ -#define KERNEL_VERSION_BUILD_TYPE L"SVN" +#define KERNEL_VERSION_BUILD_TYPE L"RELEASE" #endif

17 years, 6 months

[gedmurphy] 26036: ReactOS 0.3.1 start menu logo.

by gedmurphy＠svn.reactos.org

Author: gedmurphy Date: Thu Mar 8 22:18:21 2007 New Revision: 26036 URL: http://svn.reactos.org/svn/reactos?rev=26036&view=rev Log: ReactOS 0.3.1 start menu logo. Modified: branches/ros-branch-0_3_1/reactos/base/shell/explorer/res/logov.bmp Modified: branches/ros-branch-0_3_1/reactos/base/shell/explorer/res/logov.bmp URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/base/s… ============================================================================== Binary files - no diff available.

17 years, 6 months

[greatlrd] 26035: fixing minior bugs in DdQueryDirectDrawObject some data was not fill in

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Thu Mar 8 22:18:06 2007 New Revision: 26035 URL: http://svn.reactos.org/svn/reactos?rev=26035&view=rev Log: fixing minior bugs in DdQueryDirectDrawObject some data was not fill in Modified: trunk/reactos/dll/win32/gdi32/misc/gdientry.c Modified: trunk/reactos/dll/win32/gdi32/misc/gdientry.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/misc/gdien… ============================================================================== --- trunk/reactos/dll/win32/gdi32/misc/gdientry.c (original) +++ trunk/reactos/dll/win32/gdi32/misc/gdientry.c Thu Mar 8 22:18:06 2007 @@ -412,7 +412,7 @@ ghDirectDraw = NtGdiDdCreateDirectDrawObject(hdc); /* Delete our DC */ - NtGdiDeleteObjectApp(hdc); + NtGdiDeleteObjectApp(hdc); } } @@ -465,17 +465,8 @@ D3DNTHAL_GLOBALDRIVERDATA D3dDriverData; DD_D3DBUFCALLBACKS D3dBufferCallbacks; DWORD CallbackFlags[3]; - DWORD dwNumHeaps=0, FourCCs; + DWORD dwNumHeaps=0, FourCCs=0; DWORD Flags; - - /* Check if we got a list pointer */ - if (pvmList) - { - /* Allocate memory for it */ - VidMemList = LocalAlloc(LMEM_ZEROINIT, - sizeof(VIDEOMEMORY) * - pHalInfo->vmiData.dwNumHeaps); - } /* Clear the structures */ RtlZeroMemory(&HalInfo, sizeof(DD_HALINFO)); @@ -483,7 +474,16 @@ RtlZeroMemory(&D3dDriverData, sizeof(D3DNTHAL_GLOBALDRIVERDATA)); RtlZeroMemory(&D3dBufferCallbacks, sizeof(DD_D3DBUFCALLBACKS)); - //* Do the query */ + /* Check if we got a list pointer */ + if (pvmList) + { + /* Allocate memory for it */ + VidMemList = LocalAlloc(LMEM_ZEROINIT, + sizeof(VIDEOMEMORY) * + pHalInfo->vmiData.dwNumHeaps); + } + + /* Do the query */ if (!NtGdiDdQueryDirectDrawObject(GetDdHandle(pDirectDrawGlobal->hDD), &HalInfo, CallbackFlags, @@ -531,7 +531,11 @@ pHalInfo->vmiData.dwDisplayHeight = HalInfo.vmiData.dwDisplayHeight; pHalInfo->vmiData.lDisplayPitch = HalInfo.vmiData.lDisplayPitch; pHalInfo->vmiData.fpPrimary = 0; - pHalInfo->vmiData.ddpfDisplay = HalInfo.vmiData.ddpfDisplay; + + RtlCopyMemory( &pHalInfo->vmiData.ddpfDisplay, + &HalInfo.vmiData.ddpfDisplay, + sizeof(DDPIXELFORMAT)); + pHalInfo->vmiData.dwOffscreenAlign = HalInfo.vmiData.dwOffscreenAlign; pHalInfo->vmiData.dwOverlayAlign = HalInfo.vmiData.dwOverlayAlign; pHalInfo->vmiData.dwTextureAlign = HalInfo.vmiData.dwTextureAlign; @@ -539,11 +543,15 @@ pHalInfo->vmiData.dwAlphaAlign = HalInfo.vmiData.dwAlphaAlign; pHalInfo->vmiData.dwNumHeaps = dwNumHeaps; pHalInfo->vmiData.pvmList = pvmList; - // pHalInfo->ddCaps = HalInfo.ddCaps; - // pHalInfo->ddCaps.dwNumFourCCCodes = FourCCs; + + RtlCopyMemory( &pHalInfo->ddCaps, &HalInfo.ddCaps,sizeof(DDCORECAPS )); + + pHalInfo->ddCaps.dwNumFourCCCodes = FourCCs; pHalInfo->lpdwFourCC = pdwFourCC; pHalInfo->ddCaps.dwRops[6] = 0x1000; - pHalInfo->dwFlags = HalInfo.dwFlags | DDHALINFO_GETDRIVERINFOSET; + + /* FIXME implement DdGetDriverInfo */ + // pHalInfo->dwFlags = HalInfo.dwFlags | DDHALINFO_GETDRIVERINFOSET; // pHalInfo->GetDriverInfo = DdGetDriverInfo; /* Now check if we got any DD callbacks */ @@ -557,8 +565,8 @@ /* Write the header */ pDDCallbacks->dwSize = sizeof(DDHAL_DDCALLBACKS); - pDDCallbacks->dwFlags = Flags; - + pDDCallbacks->dwFlags = Flags; + /* Now write the pointers, if applicable */ if (Flags & DDHAL_CB32_CREATESURFACE) { @@ -586,13 +594,12 @@ /* Set the flags for this one */ Flags = CallbackFlags[1]; - /* Write the header, note that some functions are always exposed */ pDDSurfaceCallbacks->dwSize = sizeof(DDHAL_DDSURFACECALLBACKS); - - pDDSurfaceCallbacks->dwFlags = Flags; - /* + + pDDSurfaceCallbacks->dwFlags = Flags; + /* pDDSurfaceCallBacks->dwFlags = (DDHAL_SURFCB32_LOCK | DDHAL_SURFCB32_UNLOCK | DDHAL_SURFCB32_SETCOLORKEY | @@ -652,7 +659,7 @@ /* Check for D3D Callbacks */ if (pD3dCallbacks) - { + { /* Zero the struct */ RtlZeroMemory(pD3dCallbacks, sizeof(D3DHAL_CALLBACKS)); @@ -665,9 +672,9 @@ /* Now check for each callback */ if (D3dCallbacks.ContextCreate) { - /* FIXME + /* FIXME pD3dCallbacks->ContextCreate = D3dContextCreate; - */ + */ } if (D3dCallbacks.ContextDestroy) { @@ -675,9 +682,9 @@ } if (D3dCallbacks.ContextDestroyAll) { - /* FIXME + /* FIXME pD3dCallbacks->ContextDestroyAll = (LPD3DHAL_CONTEXTDESTROYALLCB) NtGdiD3dContextDestroyAll; - */ + */ } } }

17 years, 6 months

[fireball] 26034: Remove clipboard merge leftover. YES encoded, yes.

by fireball＠svn.reactos.org

Author: fireball Date: Thu Mar 8 22:11:09 2007 New Revision: 26034 URL: http://svn.reactos.org/svn/reactos?rev=26034&view=rev Log: Remove clipboard merge leftover. YES encoded, yes. Modified: trunk/reactos/dll/win32/shell32/shfldr_fs.c Modified: trunk/reactos/dll/win32/shell32/shfldr_fs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shfldr_f… ============================================================================== --- trunk/reactos/dll/win32/shell32/shfldr_fs.c (original) +++ trunk/reactos/dll/win32/shell32/shfldr_fs.c Thu Mar 8 22:11:09 2007 @@ -1250,7 +1250,6 @@ PathAddBackslashA (szDstPath); _ILSimpleGetText (apidl[i], szDstPath + strlen (szDstPath), MAX_PATH); - _ILSimpleGetText (apidl[i], szDstPath + strlen (szDstPath), MAX_PATH); DPRINT1 ("copy %s to %s\n", szSrcPath, szDstPath); if (fileMoving)

17 years, 6 months

[ion] 26033: - Tree cleanups proposed on the mailing list. Move all non-Core OS modules to rosapps. Tests were already moved by Fireball to rostests.

by ion＠svn.reactos.org

Author: ion Date: Thu Mar 8 22:00:15 2007 New Revision: 26033 URL: http://svn.reactos.org/svn/reactos?rev=26033&view=rev Log: - Tree cleanups proposed on the mailing list. Move all non-Core OS modules to rosapps. Tests were already moved by Fireball to rostests. Added: trunk/rosapps/avtest/ - copied from r26030, trunk/reactos/drivers/multimedia/avtest/ trunk/rosapps/downloader/ - copied from r26030, trunk/reactos/base/applications/downloader/ trunk/rosapps/ext2/ - copied from r26030, trunk/reactos/drivers/filesystems/ext2/ trunk/rosapps/gettype/ - copied from r26030, trunk/reactos/base/applications/gettype/ trunk/rosapps/green/ - copied from r26030, trunk/reactos/drivers/base/green/ trunk/rosapps/imagesoft/ - copied from r26030, trunk/reactos/base/applications/imagesoft/ trunk/rosapps/net/dhcpd/ - copied from r26030, trunk/reactos/base/services/dhcpd/ trunk/rosapps/net/tditest/ - copied from r26030, trunk/reactos/drivers/network/tditest/ trunk/rosapps/ramdrv/ - copied from r26030, trunk/reactos/drivers/base/ramdrv/ trunk/rosapps/ramdrv/minix/ - copied from r26030, trunk/reactos/drivers/filesystems/minix/ trunk/rosapps/roshttpd/ - copied from r26030, trunk/reactos/base/applications/network/roshttpd/ trunk/rosapps/screenshot/ - copied from r26030, trunk/reactos/base/applications/screenshot/ trunk/rosapps/sysutils/utils/ - copied from r26030, trunk/reactos/base/applications/utils/ trunk/rosapps/templates/template/ - copied from r26030, trunk/reactos/drivers/filesystems/template/ trunk/rosapps/winefile/ - copied from r26030, trunk/reactos/base/applications/winefile/ trunk/rosapps/winver/ - copied from r26030, trunk/reactos/base/applications/winver/

17 years, 6 months

[ion] 26032: - Tree cleanups proposed on the mailing list. Move all non-Core OS modules to rosapps. Tests were already moved by Fireball to rostests.

by ion＠svn.reactos.org

Author: ion Date: Thu Mar 8 21:59:45 2007 New Revision: 26032 URL: http://svn.reactos.org/svn/reactos?rev=26032&view=rev Log: - Tree cleanups proposed on the mailing list. Move all non-Core OS modules to rosapps. Tests were already moved by Fireball to rostests. Removed: trunk/reactos/base/applications/devmgr/ trunk/reactos/base/applications/downloader/ trunk/reactos/base/applications/getfirefox/ trunk/reactos/base/applications/gettype/ trunk/reactos/base/applications/ibrowser/ trunk/reactos/base/applications/imagesoft/ trunk/reactos/base/applications/network/roshttpd/ trunk/reactos/base/applications/reporterror/ trunk/reactos/base/applications/screenshot/ trunk/reactos/base/applications/sm/ trunk/reactos/base/applications/utils/ trunk/reactos/base/applications/winefile/ trunk/reactos/base/services/dhcpd/ trunk/reactos/drivers/base/debugout/ trunk/reactos/drivers/base/green/ trunk/reactos/drivers/base/ramdrv/ trunk/reactos/drivers/base/test/ trunk/reactos/drivers/filesystems/ext2/ trunk/reactos/drivers/filesystems/minix/ trunk/reactos/drivers/filesystems/template/ trunk/reactos/drivers/multimedia/avtest/ trunk/reactos/drivers/network/tditest/ Modified: trunk/reactos/base/applications/applications.rbuild trunk/reactos/base/applications/network/network.rbuild trunk/reactos/drivers/base/directory.rbuild Modified: trunk/reactos/base/applications/applications.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/applicat… ============================================================================== --- trunk/reactos/base/applications/applications.rbuild (original) +++ trunk/reactos/base/applications/applications.rbuild Thu Mar 8 21:59:45 2007 @@ -13,29 +13,14 @@ <directory name="cmdutils"> <xi:include href="cmdutils/cmdutils.rbuild" /> </directory> -<directory name="devmgr"> - <xi:include href="devmgr/devmgr.rbuild" /> -</directory> -<directory name="downloader"> - <xi:include href="downloader/downloader.rbuild" /> +<directory name="control"> + <xi:include href="control/control.rbuild" /> </directory> <directory name="games"> <xi:include href="games/games.rbuild" /> </directory> -<directory name="getfirefox"> - <xi:include href="getfirefox/getfirefox.rbuild" /> -</directory> -<directory name="gettype"> - <xi:include href="gettype/gettype.rbuild" /> -</directory> <directory name="hostname"> <xi:include href="hostname/hostname.rbuild" /> -</directory> -<directory name="ibrowser"> - <xi:include href="ibrowser/ibrowser.rbuild" /> -</directory> -<directory name="imagesoft"> - <xi:include href="imagesoft/imagesoft.rbuild" /> </directory> <directory name="msconfig"> <xi:include href="msconfig/msconfig.rbuild" /> @@ -52,20 +37,11 @@ <directory name="regedit"> <xi:include href="regedit/regedit.rbuild" /> </directory> -<directory name="reporterror"> - <xi:include href="reporterror/reporterror.rbuild" /> -</directory> <directory name="sc"> <xi:include href="sc/sc.rbuild" /> </directory> -<directory name="sm"> - <xi:include href="sm/sm.rbuild" /> -</directory> <directory name="screensavers"> <xi:include href="screensavers/screensavers.rbuild" /> -</directory> -<directory name="screenshot"> - <xi:include href="screenshot/screenshot.rbuild" /> </directory> <directory name="shutdown"> <xi:include href="shutdown/shutdown.rbuild" /> @@ -76,17 +52,8 @@ <directory name="taskmgr"> <xi:include href="taskmgr/taskmgr.rbuild" /> </directory> -<directory name="winefile"> - <xi:include href="winefile/winefile.rbuild" /> -</directory> <directory name="wordpad"> <xi:include href="wordpad/wordpad.rbuild" /> -</directory> -<directory name="control"> - <xi:include href="control/control.rbuild" /> -</directory> -<directory name="utils"> - <xi:include href="utils/utils.rbuild" /> </directory> <directory name="winver"> <xi:include href="winver/winver.rbuild" /> Modified: trunk/reactos/base/applications/network/network.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/network.rbuild (original) +++ trunk/reactos/base/applications/network/network.rbuild Thu Mar 8 21:59:45 2007 @@ -25,9 +25,6 @@ <directory name="route"> <xi:include href="route/route.rbuild" /> </directory> -<directory name="roshttpd"> - <xi:include href="roshttpd/roshttpd.rbuild" /> -</directory> <directory name="telnet"> <xi:include href="telnet/telnet.rbuild" /> </directory> Modified: trunk/reactos/drivers/base/directory.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/directory.rbu… ============================================================================== --- trunk/reactos/drivers/base/directory.rbuild (original) +++ trunk/reactos/drivers/base/directory.rbuild Thu Mar 8 21:59:45 2007 @@ -3,9 +3,6 @@ </directory> <directory name="blue"> <xi:include href="blue/blue.rbuild" /> -</directory> -<directory name="green"> - <xi:include href="green/green.rbuild" /> </directory> <directory name="bootvid"> <xi:include href="bootvid/bootvid.rbuild" /> @@ -13,18 +10,12 @@ <directory name="kdcom"> <xi:include href="kdcom/kdcom.rbuild" /> </directory> -<directory name="debugout"> - <xi:include href="debugout/debugout.rbuild" /> -</directory> <directory name="null"> <xi:include href="null/null.rbuild" /> </directory> <directory name="parallel"> <xi:include href="parallel/parallel.rbuild" /> </directory> -<directory name="ramdrv"> - <xi:include href="ramdrv/ramdrv.rbuild" /> -</directory> <directory name="serial"> <xi:include href="serial/serial.rbuild" /> </directory>

17 years, 6 months

[weiden] 26031: Add the very beginnings of a mmc.exe implementation (not yet included in the build)

by weiden＠svn.reactos.org

Author: weiden Date: Thu Mar 8 20:44:10 2007 New Revision: 26031 URL: http://svn.reactos.org/svn/reactos?rev=26031&view=rev Log: Add the very beginnings of a mmc.exe implementation (not yet included in the build) Added: trunk/reactos/base/applications/mmc/ (with props) trunk/reactos/base/applications/mmc/console.c (with props) trunk/reactos/base/applications/mmc/lang/ trunk/reactos/base/applications/mmc/lang/en-US.rc (with props) trunk/reactos/base/applications/mmc/manifest.xml (with props) trunk/reactos/base/applications/mmc/misc.c (with props) trunk/reactos/base/applications/mmc/mmc.c (with props) trunk/reactos/base/applications/mmc/mmc.rbuild (with props) trunk/reactos/base/applications/mmc/mmc.rc (with props) trunk/reactos/base/applications/mmc/precomp.h (with props) trunk/reactos/base/applications/mmc/resource.h (with props) trunk/reactos/base/applications/mmc/resources/ trunk/reactos/base/applications/mmc/resources/mmc.ico (with props) Propchange: trunk/reactos/base/applications/mmc/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Thu Mar 8 20:44:10 2007 @@ -1,0 +1,9 @@ +*.o +*.a +*.d +*.exe +*.coff +*.sym +*.map +GNUmakefile +*.vcproj Added: trunk/reactos/base/applications/mmc/console.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mmc/cons… ============================================================================== --- trunk/reactos/base/applications/mmc/console.c (added) +++ trunk/reactos/base/applications/mmc/console.c Thu Mar 8 20:44:10 2007 @@ -1,0 +1,311 @@ +/* + * ReactOS Management Console + * Copyright (C) 2006 - 2007 Thomas Weidenmueller + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library 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 + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#include "precomp.h" + +static const TCHAR szMMCMainFrame[] = TEXT("MMCMainFrame"); +static const TCHAR szMMCChildFrm[] = TEXT("MMCChildFrm"); + +static LONG MainFrameWndCount = 0; +static ULONG NewConsoleCount = 0; + +static LPTSTR +CreateNewConsoleTitle(VOID) +{ + LPTSTR lpTitle; + + if (LoadAndFormatString(hAppInstance, + IDS_CONSOLETITLE, + &lpTitle, + ++NewConsoleCount) == 0) + { + lpTitle = NULL; + } + + return lpTitle; +} + +typedef struct _CONSOLE_MAINFRAME_WND +{ + HWND hwnd; + LPCTSTR lpConsoleTitle; + HMENU hMenuConsoleRoot; + union + { + DWORD Flags; + struct + { + DWORD AppAuthorMode : 1; + }; + }; +} CONSOLE_MAINFRAME_WND, *PCONSOLE_MAINFRAME_WND; + +static LRESULT CALLBACK +ConsoleMainFrameWndProc(IN HWND hwnd, + IN UINT uMsg, + IN WPARAM wParam, + IN LPARAM lParam) +{ + PCONSOLE_MAINFRAME_WND Info; + LRESULT Ret = FALSE; + + Info = (PCONSOLE_MAINFRAME_WND)GetWindowLongPtr(hwnd, + 0); + + if (Info != NULL || uMsg == WM_NCCREATE) + { + switch (uMsg) + { + case WM_COMMAND: + { + switch (LOWORD(wParam)) + { + case ID_FILE_EXIT: + PostMessage(hwnd, + WM_CLOSE, + 0, + 0); + break; + } + break; + } + + case WM_NCCREATE: + { + MainFrameWndCount++; + + Info = HeapAlloc(hAppHeap, + 0, + sizeof(*Info)); + if (Info != NULL) + { + ZeroMemory(Info, + sizeof(*Info)); + + Info->hwnd = hwnd; + + SetWindowLongPtr(hwnd, + 0, + (LONG_PTR)Info); + + Info->hMenuConsoleRoot = LoadMenu(hAppInstance, + MAKEINTRESOURCE(IDM_CONSOLEROOT)); + Ret = TRUE; + } + break; + } + + case WM_CREATE: + { + LPCTSTR lpFileName = (LPCTSTR)(((LPCREATESTRUCT)lParam)->lpCreateParams); + + if (lpFileName != NULL) + { + /* FIXME */ + } + else + { + Info->AppAuthorMode = TRUE; + Info->lpConsoleTitle = CreateNewConsoleTitle(); + } + + SetWindowText(Info->hwnd, + Info->lpConsoleTitle); + break; + } + + case WM_NCDESTROY: + SetMenu(Info->hwnd, + NULL); + + if (Info->hMenuConsoleRoot != NULL) + { + DestroyMenu(Info->hMenuConsoleRoot); + Info->hMenuConsoleRoot = NULL; + } + + HeapFree(hAppHeap, + 0, + Info); + + if (--MainFrameWndCount == 0) + PostQuitMessage(0); + break; + + + case WM_CLOSE: + DestroyWindow(hwnd); + break; + + default: + goto HandleDefaultMsg; + } + } + else + { +HandleDefaultMsg: + Ret = DefWindowProc(hwnd, + uMsg, + wParam, + lParam); + } + + return Ret; +} + +typedef struct _CONSOLE_CHILDFRM_WND +{ + HWND hwnd; + PCONSOLE_MAINFRAME_WND MainFrame; +} CONSOLE_CHILDFRM_WND, *PCONSOLE_CHILDFRM_WND; + +static LRESULT CALLBACK +ConsoleChildFrmProc(IN HWND hwnd, + IN UINT uMsg, + IN WPARAM wParam, + IN LPARAM lParam) +{ + PCONSOLE_CHILDFRM_WND Info; + LRESULT Ret = FALSE; + + Info = (PCONSOLE_CHILDFRM_WND)GetWindowLongPtr(hwnd, + 0); + + if (Info != NULL || uMsg == WM_NCCREATE) + { + switch (uMsg) + { + case WM_NCCREATE: + Info = HeapAlloc(hAppHeap, + 0, + sizeof(*Info)); + if (Info != NULL) + { + ZeroMemory(Info, + sizeof(*Info)); + + Info->hwnd = hwnd; + + SetWindowLongPtr(hwnd, + 0, + (LONG_PTR)Info); + + Ret = TRUE; + } + break; + + + case WM_NCDESTROY: + HeapFree(hAppHeap, + 0, + Info); + break; + + default: + goto HandleDefaultMsg; + } + } + else + { +HandleDefaultMsg: + Ret = DefWindowProc(hwnd, + uMsg, + wParam, + lParam); + } + + return Ret; + +} + +BOOL +RegisterMMCWndClasses(VOID) +{ + WNDCLASS wc; + BOOL Ret; + + /* Register the MMCMainFrame window class */ + wc.style = 0; + wc.lpfnWndProc = ConsoleMainFrameWndProc; + wc.cbClsExtra = 0; + wc.cbWndExtra = sizeof(PCONSOLE_MAINFRAME_WND); + wc.hInstance = hAppInstance; + wc.hIcon = LoadIcon(hAppInstance, + MAKEINTRESOURCE(IDI_MAINAPP)); + wc.hCursor = LoadCursor(NULL, + MAKEINTRESOURCE(IDC_ARROW)); + wc.hbrBackground = (HBRUSH)(COLOR_BTNFACE + 1); + wc.lpszMenuName = NULL; + wc.lpszClassName = szMMCMainFrame; + + Ret = (RegisterClass(&wc) != (ATOM)0); + if (Ret) + { + /* Register the MMCChildFrm window class */ + wc.lpfnWndProc = ConsoleChildFrmProc; + wc.cbWndExtra = sizeof(PCONSOLE_CHILDFRM_WND); + wc.lpszClassName = szMMCChildFrm; + + Ret = (RegisterClass(&wc) != (ATOM)0); + if (!Ret) + { + UnregisterClass(szMMCMainFrame, + hAppInstance); + } + } + + return Ret; +} + +VOID +UnregisterMMCWndClasses(VOID) +{ + UnregisterClass(szMMCChildFrm, + hAppInstance); + UnregisterClass(szMMCMainFrame, + hAppInstance); +} + +HWND +CreateConsoleWindow(IN LPCTSTR lpFileName OPTIONAL) +{ + HWND hWndConsole; + LONG_PTR FileName = (LONG_PTR)lpFileName; + + hWndConsole = CreateWindowEx(WS_EX_WINDOWEDGE, + szMMCMainFrame, + NULL, + WS_OVERLAPPEDWINDOW | WS_CLIPSIBLINGS, + CW_USEDEFAULT, + CW_USEDEFAULT, + CW_USEDEFAULT, + CW_USEDEFAULT, + NULL, + NULL, + hAppInstance, + (PVOID)FileName); + + if (hWndConsole != NULL) + { + ShowWindow(hWndConsole, + SW_SHOWDEFAULT); + } + + return hWndConsole; +} Propchange: trunk/reactos/base/applications/mmc/console.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/applications/mmc/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mmc/lang… ============================================================================== --- trunk/reactos/base/applications/mmc/lang/en-US.rc (added) +++ trunk/reactos/base/applications/mmc/lang/en-US.rc Thu Mar 8 20:44:10 2007 @@ -1,0 +1,21 @@ +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US + +IDM_CONSOLEROOT MENU DISCARDABLE +BEGIN + POPUP "&File" + BEGIN + MENUITEM SEPARATOR + MENUITEM "E&xit\tAlt+F4", ID_FILE_EXIT + END + + POPUP "&Help" + BEGIN + MENUITEM "&About ReactOS Management Console...", ID_HELP_ABOUT + END +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_APPTITLE "ReactOS Management Console" + IDS_CONSOLETITLE "Console%1!u!" +END Propchange: trunk/reactos/base/applications/mmc/lang/en-US.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/applications/mmc/manifest.xml URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mmc/mani… ============================================================================== --- trunk/reactos/base/applications/mmc/manifest.xml (added) +++ trunk/reactos/base/applications/mmc/manifest.xml Thu Mar 8 20:44:10 2007 @@ -1,0 +1,24 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> + <assemblyIdentity + version="1.0.0.0" + processorArchitecture="X86" + name="ReactOS.System.Management.Console" + type="win32" + /> + <description>ReactOS System Management Console</description> + <dependency> + <dependentAssembly> + <assemblyIdentity + type="win32" + name="Microsoft.Windows.Common-Controls" + version="6.0.0.0" + processorArchitecture="X86" + publicKeyToken="6595b64144ccf1df" + language="*" + /> + </dependentAssembly> + </dependency> +</assembly> + + Propchange: trunk/reactos/base/applications/mmc/manifest.xml ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/applications/mmc/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mmc/misc… ============================================================================== --- trunk/reactos/base/applications/mmc/misc.c (added) +++ trunk/reactos/base/applications/mmc/misc.c Thu Mar 8 20:44:10 2007 @@ -1,0 +1,115 @@ +/* + * ReactOS Management Console + * Copyright (C) 2006 - 2007 Thomas Weidenmueller + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library 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 + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#include "precomp.h" + +INT +LengthOfStrResource(IN HINSTANCE hInst, + IN UINT uID) +{ + HRSRC hrSrc; + HGLOBAL hRes; + LPWSTR lpName, lpStr; + + if (hInst == NULL) + { + return -1; + } + + /* There are always blocks of 16 strings */ + lpName = (LPWSTR)MAKEINTRESOURCE((uID >> 4) + 1); + + /* Find the string table block */ + if ((hrSrc = FindResourceW(hInst, lpName, (LPWSTR)RT_STRING)) && + (hRes = LoadResource(hInst, hrSrc)) && + (lpStr = LockResource(hRes))) + { + UINT x; + + /* Find the string we're looking for */ + uID &= 0xF; /* position in the block, same as % 16 */ + for (x = 0; x < uID; x++) + { + lpStr += (*lpStr) + 1; + } + + /* Found the string */ + return (int)(*lpStr); + } + return -1; +} + + +static INT +AllocAndLoadString(OUT LPTSTR *lpTarget, + IN HINSTANCE hInst, + IN UINT uID) +{ + INT ln; + + ln = LengthOfStrResource(hInst, + uID); + if (ln++ > 0) + { + (*lpTarget) = (LPWSTR)LocalAlloc(LMEM_FIXED, + ln * sizeof(TCHAR)); + if ((*lpTarget) != NULL) + { + INT Ret; + if (!(Ret = LoadString(hInst, uID, *lpTarget, ln))) + { + LocalFree((HLOCAL)(*lpTarget)); + } + return Ret; + } + } + return 0; +} + +DWORD +LoadAndFormatString(IN HINSTANCE hInstance, + IN UINT uID, + OUT LPTSTR *lpTarget, + ...) +{ + DWORD Ret = 0; + LPWSTR lpFormat; + va_list lArgs; + + if (AllocAndLoadString(&lpFormat, + hInstance, + uID) != 0) + { + va_start(lArgs, lpTarget); + /* let's use FormatMessage to format it because it has the ability to allocate + memory automatically */ + Ret = FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_STRING, + lpFormat, + 0, + 0, + (LPTSTR)lpTarget, + 0, + &lArgs); + va_end(lArgs); + + LocalFree((HLOCAL)lpFormat); + } + + return Ret; +} Propchange: trunk/reactos/base/applications/mmc/misc.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/applications/mmc/mmc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mmc/mmc.… ============================================================================== --- trunk/reactos/base/applications/mmc/mmc.c (added) +++ trunk/reactos/base/applications/mmc/mmc.c Thu Mar 8 20:44:10 2007 @@ -1,0 +1,65 @@ +/* + * ReactOS Management Console + * Copyright (C) 2006 - 2007 Thomas Weidenmueller + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library 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 + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#include "precomp.h" + +HINSTANCE hAppInstance; +HANDLE hAppHeap; + +int +_tmain(IN int argc, + IN const TCHAR *argv[]) +{ + HWND hMainConsole; + MSG Msg; + BOOL bRet; + + hAppInstance = GetModuleHandle(NULL); + hAppHeap = GetProcessHeap(); + + InitCommonControls(); + + if (!RegisterMMCWndClasses()) + { + /* FIXME - Display error */ + return 1; + } + + hMainConsole = CreateConsoleWindow(argc > 1 ? argv[1] : NULL); + if (hMainConsole != NULL) + { + for (;;) + { + bRet = GetMessage(&Msg, + NULL, + 0, + 0); + if (bRet != 0 && bRet != -1) + { + TranslateMessage(&Msg); + DispatchMessage(&Msg); + } + else if (bRet == 0) + break; + } + } + + UnregisterMMCWndClasses(); + return 0; +} Propchange: trunk/reactos/base/applications/mmc/mmc.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/applications/mmc/mmc.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mmc/mmc.… ============================================================================== --- trunk/reactos/base/applications/mmc/mmc.rbuild (added) +++ trunk/reactos/base/applications/mmc/mmc.rbuild Thu Mar 8 20:44:10 2007 @@ -1,0 +1,21 @@ +<?xml version="1.0"?> +<rbuild xmlns:xi="http://www.w3.org/2001/XInclude"> + <module name="mmcclient" type="win32gui" installbase="system32" installname="mmc.exe" unicode="yes"> + <include base="mmcclient">.</include> + <define name="__USE_W32API" /> + <define name="_WIN32_IE">0x0600</define> + <define name="_WIN32_WINNT">0x0501</define> + <library>kernel32</library> + <library>user32</library> + <library>gdi32</library> + <library>comdlg32</library> + <library>advapi32</library> + <library>shell32</library> + <library>comctl32</library> + <file>console.c</file> + <file>misc.c</file> + <file>mmc.c</file> + <file>mmc.rc</file> + <pch>precomp.h</pch> + </module> +</rbuild> Propchange: trunk/reactos/base/applications/mmc/mmc.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/applications/mmc/mmc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mmc/mmc.… ============================================================================== --- trunk/reactos/base/applications/mmc/mmc.rc (added) +++ trunk/reactos/base/applications/mmc/mmc.rc Thu Mar 8 20:44:10 2007 @@ -1,0 +1,17 @@ +/* $Id: sndvol32.rc 23239 2006-07-23 09:59:30Z janderwald $ */ + +#include <windows.h> +#include "resource.h" + +#define REACTOS_STR_FILE_DESCRIPTION "ReactOS Management Console\0" +#define REACTOS_STR_INTERNAL_NAME "mmc\0" +#define REACTOS_STR_ORIGINAL_FILENAME "mmc.exe\0" +#include <reactos/version.rc> + +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US + +1 24 DISCARDABLE "manifest.xml" + +IDI_MAINAPP ICON DISCARDABLE resources/mmc.ico + +#include "lang/en-US.rc" Propchange: trunk/reactos/base/applications/mmc/mmc.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/applications/mmc/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mmc/prec… ============================================================================== --- trunk/reactos/base/applications/mmc/precomp.h (added) +++ trunk/reactos/base/applications/mmc/precomp.h Thu Mar 8 20:44:10 2007 @@ -1,0 +1,38 @@ +#ifndef __PRECOMP_H +#define __PRECOMP_H + +#include <windows.h> +#include <commctrl.h> +#include <shellapi.h> +#include <tchar.h> +#include "resource.h" + +/* console.c */ + +BOOL +RegisterMMCWndClasses(VOID); + +VOID +UnregisterMMCWndClasses(VOID); + +HWND +CreateConsoleWindow(IN LPCTSTR lpFileName OPTIONAL); + +/* misc.c */ + +INT +LengthOfStrResource(IN HINSTANCE hInst, + IN UINT uID); + +DWORD +LoadAndFormatString(IN HINSTANCE hInstance, + IN UINT uID, + OUT LPTSTR *lpTarget, + ...); + +/* mmc.c */ + +extern HINSTANCE hAppInstance; +extern HANDLE hAppHeap; + +#endif /* __PRECOMP_H */ Propchange: trunk/reactos/base/applications/mmc/precomp.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/applications/mmc/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mmc/reso… ============================================================================== --- trunk/reactos/base/applications/mmc/resource.h (added) +++ trunk/reactos/base/applications/mmc/resource.h Thu Mar 8 20:44:10 2007 @@ -1,0 +1,14 @@ +#ifndef __RESOURCE_H +#define __RESOURCE_H + +#define IDS_APPTITLE 101 +#define IDS_CONSOLETITLE 102 + +#define IDI_MAINAPP 101 + +#define IDM_CONSOLEROOT 101 + +#define ID_FILE_EXIT 1001 +#define ID_HELP_ABOUT 9001 + +#endif /* __RESOURCE_H */ Propchange: trunk/reactos/base/applications/mmc/resource.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/applications/mmc/resources/mmc.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mmc/reso… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/base/applications/mmc/resources/mmc.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream

17 years, 6 months

[tretiakov] 26030: The branch is merged now

by tretiakov＠svn.reactos.org

Author: tretiakov Date: Thu Mar 8 16:36:51 2007 New Revision: 26030 URL: http://svn.reactos.org/svn/reactos?rev=26030&view=rev Log: The branch is merged now Removed: branches/clipboard/

17 years, 6 months

← Newer
1
...
16
17
18
19
20
21
22
...
29
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs March 2007