Ros-diffs January 2006

ros-diffs@reactos.org

23 participants
586 discussions

[turner] 20723: Fix build.
by turner＠svn.reactos.org 08 Jan '06

08 Jan '06

Fix build. Modified: trunk/reactos/subsys/system/msconfig/startuppage.c _____ Modified: trunk/reactos/subsys/system/msconfig/startuppage.c --- trunk/reactos/subsys/system/msconfig/startuppage.c 2006-01-08 19:31:26 UTC (rev 20722) +++ trunk/reactos/subsys/system/msconfig/startuppage.c 2006-01-08 19:33:06 UTC (rev 20723) @@ -99,10 +99,10 @@ switch (PtrToLong(hRootKey)) { - case HKEY_LOCAL_MACHINE: + case PtrToLong(HKEY_LOCAL_MACHINE): _tcscpy(Path, _T("HKLM\\\0")); break; - case HKEY_CURRENT_USER: + case PtrToLong(HKEY_CURRENT_USER): _tcscpy(Path, _T("HKCU\\\0")); break; default:

1 0

[gedmurphy] 20722: A very rough implementation of the control buttons. (I'll work on my image skills ; ) )
by gedmurphy＠svn.reactos.org 08 Jan '06

08 Jan '06

A very rough implementation of the control buttons. (I'll work on my image skills ;) ) Modified: trunk/reactos/subsys/system/servman/En.rc Added: trunk/reactos/subsys/system/servman/res/buttons.bmp _____ Modified: trunk/reactos/subsys/system/servman/En.rc --- trunk/reactos/subsys/system/servman/En.rc 2006-01-08 19:17:14 UTC (rev 20721) +++ trunk/reactos/subsys/system/servman/En.rc 2006-01-08 19:31:26 UTC (rev 20722) @@ -67,7 +67,7 @@ CONTROL "",IDC_START_PARAM,"Static",0x50001000,70,199,176,11 END -IDB_BUTTONS BITMAP "buttons.bmp" +IDB_BUTTONS BITMAP "res/buttons.bmp" STRINGTABLE DISCARDABLE BEGIN _____ Added: trunk/reactos/subsys/system/servman/res/buttons.bmp (Binary files differ) Property changes on: trunk/reactos/subsys/system/servman/res/buttons.bmp ___________________________________________________________________ Name: svn:mime-type + application/octet-stream

1 0

[ion] 20721: Fix win32k build
by ion＠svn.reactos.org 08 Jan '06

08 Jan '06

Fix win32k build Modified: trunk/reactos/subsys/win32k/ntuser/ssec.c Modified: trunk/reactos/subsys/win32k/objects/text.c Modified: trunk/reactos/subsys/win32k/w32k.h _____ Modified: trunk/reactos/subsys/win32k/ntuser/ssec.c --- trunk/reactos/subsys/win32k/ntuser/ssec.c 2006-01-08 19:15:31 UTC (rev 20720) +++ trunk/reactos/subsys/win32k/ntuser/ssec.c 2006-01-08 19:17:14 UTC (rev 20721) @@ -205,7 +205,7 @@ /* now allocate a real section */ SectionSize.QuadPart = Size; - Status = MmCreateSection(&FreeSharedSection->SectionObject, + Status = MmCreateSection((PVOID)&FreeSharedSection->SectionObject, SECTION_ALL_ACCESS, NULL, &SectionSize, _____ Modified: trunk/reactos/subsys/win32k/objects/text.c --- trunk/reactos/subsys/win32k/objects/text.c 2006-01-08 19:15:31 UTC (rev 20720) +++ trunk/reactos/subsys/win32k/objects/text.c 2006-01-08 19:17:14 UTC (rev 20721) @@ -281,7 +281,7 @@ return 0; } - Status = MmCreateSection(&SectionObject, SECTION_ALL_ACCESS, + Status = MmCreateSection((PVOID)&SectionObject, SECTION_ALL_ACCESS, NULL, NULL, PAGE_READONLY, 0, FileHandle, NULL); if (!NT_SUCCESS(Status)) _____ Modified: trunk/reactos/subsys/win32k/w32k.h --- trunk/reactos/subsys/win32k/w32k.h 2006-01-08 19:15:31 UTC (rev 20720) +++ trunk/reactos/subsys/win32k/w32k.h 2006-01-08 19:17:14 UTC (rev 20721) @@ -51,5 +51,9 @@ #include <win32k/ntgdibad.h> #include <ntgdi.h> +/* For access to SECTION_OBJECT. FIXME: Once compatible with NT, use NDK! */ +#include <internal/mm.h> + /* Internal Win32K Header */ #include "include/win32k.h" +

1 0

[cwittich] 20720: fix building with MSVC
by cwittich＠svn.reactos.org 08 Jan '06

08 Jan '06

fix building with MSVC fixed some warnings Modified: trunk/reactos/subsys/system/notepad/License_En.c Modified: trunk/reactos/subsys/system/notepad/main.c Modified: trunk/reactos/subsys/system/notepad/notepad.h _____ Modified: trunk/reactos/subsys/system/notepad/License_En.c --- trunk/reactos/subsys/system/notepad/License_En.c 2006-01-08 19:07:16 UTC (rev 20719) +++ trunk/reactos/subsys/system/notepad/License_En.c 2006-01-08 19:15:31 UTC (rev 20720) @@ -1,5 +1,4 @@ -#include <windows.h> -#include "license.h" +#include <notepad.h> static const CHAR LicenseCaption_En[] = "LICENSE"; static const CHAR License_En[] = _____ Modified: trunk/reactos/subsys/system/notepad/main.c --- trunk/reactos/subsys/system/notepad/main.c 2006-01-08 19:07:16 UTC (rev 20719) +++ trunk/reactos/subsys/system/notepad/main.c 2006-01-08 19:15:31 UTC (rev 20720) @@ -37,7 +37,7 @@ { lstrcpy(Globals.szFileName, szFileName); Globals.szFileTitle[0] = 0; - GetFileTitle(szFileName, Globals.szFileTitle, sizeof(Globals.szFileTitle)); + GetFileTitle(szFileName, Globals.szFileTitle, wcslen(Globals.szFileTitle)); } /*********************************************************************** _____ Modified: trunk/reactos/subsys/system/notepad/notepad.h --- trunk/reactos/subsys/system/notepad/notepad.h 2006-01-08 19:07:16 UTC (rev 20719) +++ trunk/reactos/subsys/system/notepad/notepad.h 2006-01-08 19:15:31 UTC (rev 20720) @@ -1,8 +1,6 @@ #define UNICODE #define _UNICODE -#define _CRT_SECURE_NO_DEPRECATE - #include <assert.h> #include <stdio.h> #include <windows.h>

1 0

[cwittich] 20719: fixed some bugs
by cwittich＠svn.reactos.org 08 Jan '06

08 Jan '06

fixed some bugs use PCH when building with MSVC Modified: trunk/reactos/subsys/system/msconfig/msconfig.xml Modified: trunk/reactos/subsys/system/msconfig/srvpage.c Modified: trunk/reactos/subsys/system/msconfig/startuppage.c Modified: trunk/reactos/subsys/system/msconfig/toolspage.c _____ Modified: trunk/reactos/subsys/system/msconfig/msconfig.xml --- trunk/reactos/subsys/system/msconfig/msconfig.xml 2006-01-08 18:55:24 UTC (rev 20718) +++ trunk/reactos/subsys/system/msconfig/msconfig.xml 2006-01-08 19:07:16 UTC (rev 20719) @@ -22,4 +22,5 @@ <file>msconfig.c</file> </compilationunit> <file>msconfig.rc</file> + <pch>precomp.h</pch> </module> _____ Modified: trunk/reactos/subsys/system/msconfig/srvpage.c --- trunk/reactos/subsys/system/msconfig/srvpage.c 2006-01-08 18:55:24 UTC (rev 20718) +++ trunk/reactos/subsys/system/msconfig/srvpage.c 2006-01-08 19:07:16 UTC (rev 20719) @@ -19,7 +19,7 @@ hServicesListCtrl = GetDlgItem(hDlg, IDC_SERVICES_LIST); hServicesDialog = hDlg; - dwStyle = SendMessage(hServicesListCtrl, LVM_GETEXTENDEDLISTVIEWSTYLE, 0, 0); + dwStyle = (DWORD) SendMessage(hServicesListCtrl, LVM_GETEXTENDEDLISTVIEWSTYLE, 0, 0); dwStyle = dwStyle | LVS_EX_FULLROWSELECT | LVS_EX_CHECKBOXES; SendMessage(hServicesListCtrl, LVM_SETEXTENDEDLISTVIEWSTYLE, 0, dwStyle); @@ -93,7 +93,7 @@ { /* reserve memory for service info array */ pServiceStatus = (ENUM_SERVICE_STATUS_PROCESS *) HeapAlloc(GetProcessHeap(), 0, BytesNeeded); - if (pServiceStatus == NULL) + if (!pServiceStatus) return; /* fill array with service info */ @@ -111,6 +111,8 @@ if (NumServices) { + if (!pServiceStatus) + return; for (Index = 0; Index < NumServices; Index++) { memset(&item, 0, sizeof(LV_ITEM)); _____ Modified: trunk/reactos/subsys/system/msconfig/startuppage.c --- trunk/reactos/subsys/system/msconfig/startuppage.c 2006-01-08 18:55:24 UTC (rev 20718) +++ trunk/reactos/subsys/system/msconfig/startuppage.c 2006-01-08 19:07:16 UTC (rev 20719) @@ -19,7 +19,7 @@ hStartupListCtrl = GetDlgItem(hDlg, IDC_STARTUP_LIST); hStartupDialog = hDlg; - dwStyle = SendMessage(hStartupListCtrl, LVM_GETEXTENDEDLISTVIEWSTYLE, 0, 0); + dwStyle = (DWORD) SendMessage(hStartupListCtrl, LVM_GETEXTENDEDLISTVIEWSTYLE, 0, 0); dwStyle = dwStyle | LVS_EX_FULLROWSELECT | LVS_EX_CHECKBOXES; SendMessage(hStartupListCtrl, LVM_SETEXTENDEDLISTVIEWSTYLE, 0, dwStyle); @@ -62,7 +62,7 @@ HKEY hKey; DWORD Index, dwValues, retVal, dwType; DWORD dwValueLength, dwDataLength = MAX_VALUE_NAME; - TCHAR Data[MAX_VALUE_NAME]; + TCHAR* Data; TCHAR lpValueName[MAX_KEY_LENGTH]; TCHAR Path[MAX_KEY_LENGTH + 5]; LV_ITEM item; @@ -73,8 +73,11 @@ { for (Index = 0, retVal = ERROR_SUCCESS; Index < dwValues; Index++) { - dwValueLength = MAX_VALUE_NAME; + dwValueLength = MAX_KEY_LENGTH; dwDataLength = MAX_VALUE_NAME; + Data = (TCHAR*) HeapAlloc(GetProcessHeap(), 0, MAX_VALUE_NAME); + if (Data == NULL) + break; retVal = RegEnumValue(hKey, Index, lpValueName, &dwValueLength, NULL, &dwType, (LPBYTE)Data, &dwDataLength); if (retVal == ERROR_SUCCESS) { @@ -88,21 +91,29 @@ if (dwType == REG_SZ) { - GetLongPathName(Data, Data, sizeof(Data)); + GetLongPathName(Data, Data, (DWORD) _tcsclen(Data)); item.pszText = Data; item.iSubItem = 1; SendMessage(hStartupListCtrl, LVM_SETITEMTEXT, item.iItem, (LPARAM) &item); } - if (hRootKey == HKEY_LOCAL_MACHINE) - _tcscpy(Path, _T("HKLM\\")); - if (hRootKey == HKEY_CURRENT_USER) - _tcscpy(Path, _T("HKCU\\")); + switch (PtrToLong(hRootKey)) + { + case HKEY_LOCAL_MACHINE: + _tcscpy(Path, _T("HKLM\\\0")); + break; + case HKEY_CURRENT_USER: + _tcscpy(Path, _T("HKCU\\\0")); + break; + default: + _tcscpy(Path, _T("\0")); + } _tcscat(Path, KeyName); item.pszText = Path; item.iSubItem = 2; SendMessage(hStartupListCtrl, LVM_SETITEMTEXT, item.iItem, (LPARAM) &item); + HeapFree(GetProcessHeap(), 0, Data); } } } _____ Modified: trunk/reactos/subsys/system/msconfig/toolspage.c --- trunk/reactos/subsys/system/msconfig/toolspage.c 2006-01-08 18:55:24 UTC (rev 20718) +++ trunk/reactos/subsys/system/msconfig/toolspage.c 2006-01-08 19:07:16 UTC (rev 20719) @@ -55,7 +55,7 @@ hToolsListCtrl = GetDlgItem(hDlg, IDC_TOOLS_LIST); hToolsDialog = hDlg; - dwStyle = SendMessage(hToolsListCtrl, LVM_GETEXTENDEDLISTVIEWSTYLE, 0, 0); + dwStyle = (DWORD) SendMessage(hToolsListCtrl, LVM_GETEXTENDEDLISTVIEWSTYLE, 0, 0); dwStyle = dwStyle | LVS_EX_FULLROWSELECT; SendMessage(hToolsListCtrl, LVM_SETEXTENDEDLISTVIEWSTYLE, 0, dwStyle);

1 0

[ion] 20718: Fix umpnpmgr build
by ion＠svn.reactos.org 08 Jan '06

08 Jan '06

Fix umpnpmgr build Modified: trunk/reactos/services/umpnpmgr/umpnpmgr.c _____ Modified: trunk/reactos/services/umpnpmgr/umpnpmgr.c --- trunk/reactos/services/umpnpmgr/umpnpmgr.c 2006-01-08 18:50:54 UTC (rev 20717) +++ trunk/reactos/services/umpnpmgr/umpnpmgr.c 2006-01-08 18:55:24 UTC (rev 20718) @@ -29,6 +29,8 @@ #define WIN32_NO_STATUS #include <windows.h> #include <cmtypes.h> +#include <cmfuncs.h> +#include <rtlfuncs.h> #include <umpnpmgr/sysguid.h> #include <wdmguid.h> #include <cfgmgr32.h>

1 0

[gedmurphy] 20717: - fix toolbar position, deleted a line accidentally.
by gedmurphy＠svn.reactos.org 08 Jan '06

08 Jan '06

- fix toolbar position, deleted a line accidentally. - Fix the formatting a bit while we're at it - Comment out German language whilst it's still in development Modified: trunk/reactos/subsys/system/servman/about.c Modified: trunk/reactos/subsys/system/servman/servman.c Modified: trunk/reactos/subsys/system/servman/servman.rc _____ Modified: trunk/reactos/subsys/system/servman/about.c --- trunk/reactos/subsys/system/servman/about.c 2006-01-08 18:43:46 UTC (rev 20716) +++ trunk/reactos/subsys/system/servman/about.c 2006-01-08 18:50:54 UTC (rev 20717) @@ -7,6 +7,8 @@ * */ +//ShellAbout(hwnd, _T("test"), _T("test2"), MAKEINTRESOURCE(IDI_SM_ICON)); + #include "servman.h" extern HINSTANCE hInstance; _____ Modified: trunk/reactos/subsys/system/servman/servman.c --- trunk/reactos/subsys/system/servman/servman.c 2006-01-08 18:43:46 UTC (rev 20716) +++ trunk/reactos/subsys/system/servman/servman.c 2006-01-08 18:50:54 UTC (rev 20717) @@ -20,28 +20,28 @@ LRESULT CALLBACK WndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) { - switch(msg) - { - case WM_CREATE: - { - //HFONT hfDefault; + switch(msg) + { + case WM_CREATE: + { + //HFONT hfDefault; - HWND hTool; - TBADDBITMAP tbab; + HWND hTool; + TBADDBITMAP tbab; INT iImageOffset; - INT statwidths[] = {110, -1}; - TCHAR szTemp[256]; + INT statwidths[] = {110, -1}; + TCHAR szTemp[256]; RECT rcClient; LVCOLUMN lvc = { 0 }; /* Toolbar buttons */ - TBBUTTON tbb [NUM_BUTTONS] = + TBBUTTON tbb [NUM_BUTTONS] = { // iBitmap, idCommand, fsState, fsStyle, bReserved[2], dwData, iString {STD_PROPERTIES, ID_PROP, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0}, /* properties */ {STD_FILENEW, ID_REFRESH, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0}, /* */ {STD_FILENEW, ID_EXPORT, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0}, /* */ - /* Note: First item for a seperator is its width in pixels */ + /* Note: First item for a seperator is its width in pixels */ {5, 0, TBSTATE_ENABLED, BTNS_SEP, {0}, 0, 0}, /* separator */ {TBICON_START, ID_START, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0 }, /* start */ @@ -53,7 +53,7 @@ /* ======================== Create Toolbar ============================== */ /* Create Toolbar */ - hTool = CreateWindowEx(0, + hTool = CreateWindowEx(0, TOOLBARCLASSNAME, NULL, WS_CHILD | WS_VISIBLE | TBSTYLE_FLAT | TBSTYLE_TOOLTIPS, @@ -62,35 +62,35 @@ (HMENU)IDC_TOOLBAR, hInstance, NULL); - if(hTool == NULL) - MessageBox(hwnd, _T("Could not create tool bar."), _T("Error"), MB_OK | MB_ICONERROR); + if(hTool == NULL) + MessageBox(hwnd, _T("Could not create tool bar."), _T("Error"), MB_OK | MB_ICONERROR); /* Send the TB_BUTTONSTRUCTSIZE message, which is required for backward compatibility */ - SendMessage(hTool, TB_BUTTONSTRUCTSIZE, sizeof(TBBUTTON), 0); + SendMessage(hTool, TB_BUTTONSTRUCTSIZE, sizeof(TBBUTTON), 0); - /* Add standard image list */ - tbab.hInst = HINST_COMMCTRL; - tbab.nID = IDB_STD_SMALL_COLOR; - SendMessage(hTool, TB_ADDBITMAP, 0, (LPARAM) &tbab); + /* Add standard image list */ + tbab.hInst = HINST_COMMCTRL; + tbab.nID = IDB_STD_SMALL_COLOR; + SendMessage(hTool, TB_ADDBITMAP, 0, (LPARAM) &tbab); - /* Add custom images */ - tbab.hInst = hInstance; - tbab.nID = IDB_BUTTONS; - iImageOffset = (INT)SendMessage(hTool, TB_ADDBITMAP, 4, (LPARAM)&tbab); - tbb[4].iBitmap += iImageOffset; /* start */ - tbb[5].iBitmap += iImageOffset; /* stop */ - tbb[6].iBitmap += iImageOffset; /* pause */ - tbb[7].iBitmap += iImageOffset; /* restart */ + /* Add custom images */ + tbab.hInst = hInstance; + tbab.nID = IDB_BUTTONS; + iImageOffset = (INT)SendMessage(hTool, TB_ADDBITMAP, 4, (LPARAM)&tbab); + tbb[4].iBitmap += iImageOffset; /* start */ + tbb[5].iBitmap += iImageOffset; /* stop */ + tbb[6].iBitmap += iImageOffset; /* pause */ + tbb[7].iBitmap += iImageOffset; /* restart */ - /* Add buttons to toolbar */ - SendMessage(hTool, TB_ADDBUTTONS, NUM_BUTTONS, (LPARAM) &tbb); + /* Add buttons to toolbar */ + SendMessage(hTool, TB_ADDBUTTONS, NUM_BUTTONS, (LPARAM) &tbb); - /* Send a WM_SIZE message to layout controls */ - GetClientRect(hwnd, &rcClient); - SendMessage(hwnd, WM_SIZE, SIZE_RESTORED, MAKELONG(rcClient.right, rcClient.bottom)); + /* Send a WM_SIZE message to layout controls */ + GetClientRect(hwnd, &rcClient); + SendMessage(hwnd, WM_SIZE, SIZE_RESTORED, MAKELONG(rcClient.right, rcClient.bottom)); - /* Show toolbar */ - ShowWindow(hTool, SW_SHOWNORMAL); + /* Show toolbar */ + ShowWindow(hTool, SW_SHOWNORMAL); @@ -151,7 +151,7 @@ /* ======================== Create Status Bar ============================== */ - hStatus = CreateWindowEx(0, + hStatus = CreateWindowEx(0, STATUSCLASSNAME, NULL, WS_CHILD | WS_VISIBLE | SBARS_SIZEGRIP, @@ -161,63 +161,64 @@ hInstance, NULL); if(hStatus == NULL) - MessageBox(hwnd, _T("Could not create status bar."), + MessageBox(hwnd, _T("Could not create status bar."), _T("Error!"), MB_OK | MB_ICONERROR); - SendMessage(hStatus, SB_SETPARTS, sizeof(statwidths)/sizeof(int), (LPARAM)statwidths); + SendMessage(hStatus, SB_SETPARTS, sizeof(statwidths)/sizeof(int), (LPARAM)statwidths); - /* populate the list view with all services */ - if (! RefreshServiceList() ) + /* populate the list view with all services */ + if (! RefreshServiceList() ) GetError(); - } - break; - case WM_SIZE: - { - RECT rcTool; - int iToolHeight; + } + break; + case WM_SIZE: + { + RECT rcTool; + int iToolHeight; - RECT rcStatus; - int iStatusHeight; + RECT rcStatus; + int iStatusHeight; - int lvHeight; - RECT rcClient; + int lvHeight; + RECT rcClient; - /* Size toolbar and get height */ - SendMessage(hTool, TB_AUTOSIZE, 0, 0); + /* Size toolbar and get height */ + hTool = GetDlgItem(hwnd, IDC_TOOLBAR); + SendMessage(hTool, TB_AUTOSIZE, 0, 0); - GetWindowRect(hTool, &rcTool); - iToolHeight = rcTool.bottom - rcTool.top; + GetWindowRect(hTool, &rcTool); + iToolHeight = rcTool.bottom - rcTool.top; - /* Size status bar and get height */ - hStatus = GetDlgItem(hwnd, IDC_STATUSBAR); - SendMessage(hStatus, WM_SIZE, 0, 0); + /* Size status bar and get height */ + hStatus = GetDlgItem(hwnd, IDC_STATUSBAR); + SendMessage(hStatus, WM_SIZE, 0, 0); - GetWindowRect(hStatus, &rcStatus); - iStatusHeight = rcStatus.bottom - rcStatus.top; + GetWindowRect(hStatus, &rcStatus); + iStatusHeight = rcStatus.bottom - rcStatus.top; - /* Calculate remaining height and size list view */ - GetClientRect(hwnd, &rcClient); + /* Calculate remaining height and size list view */ + GetClientRect(hwnd, &rcClient); - lvHeight = rcClient.bottom - iToolHeight - iStatusHeight; + lvHeight = rcClient.bottom - iToolHeight - iStatusHeight; - hListView = GetDlgItem(hwnd, IDC_SERVLIST); - SetWindowPos(hListView, NULL, 0, iToolHeight, rcClient.right, lvHeight, SWP_NOZORDER); - } - break; + hListView = GetDlgItem(hwnd, IDC_SERVLIST); + SetWindowPos(hListView, NULL, 0, iToolHeight, rcClient.right, lvHeight, SWP_NOZORDER); + } + break; - case WM_NOTIFY: + case WM_NOTIFY: { LPNMITEMACTIVATE item; switch (((LPNMHDR) lParam)->code) { - case NM_DBLCLK: - item = (LPNMITEMACTIVATE) lParam; - PropSheets(hwnd); + case NM_DBLCLK: + item = (LPNMITEMACTIVATE) lParam; + PropSheets(hwnd); - break; + break; case TTN_GETDISPINFO: { @@ -270,25 +271,25 @@ } break; - case WM_CLOSE: + case WM_CLOSE: /* free the service array */ FreeMemory(); - DestroyWindow(hwnd); - break; + DestroyWindow(hwnd); + break; - case WM_DESTROY: - PostQuitMessage(0); - break; + case WM_DESTROY: + PostQuitMessage(0); + break; - case WM_COMMAND: - switch(LOWORD(wParam)) - { - case ID_FILE_EXIT: - PostMessage(hwnd, WM_CLOSE, 0, 0); - break; + case WM_COMMAND: + switch(LOWORD(wParam)) + { + case ID_FILE_EXIT: + PostMessage(hwnd, WM_CLOSE, 0, 0); + break; - case ID_START: - break; + case ID_START: + break; case ID_STOP: break; @@ -322,66 +323,66 @@ case ID_EXPORT: break; - } - break; + } + break; - default: - return DefWindowProc(hwnd, msg, wParam, lParam); - } - return 0; + default: + return DefWindowProc(hwnd, msg, wParam, lParam); + } + return 0; } //#pragma warning(disable : 4100) int WINAPI WinMain(HINSTANCE hThisInstance, HINSTANCE hPrevInstance, - LPSTR lpCmdLine, int nCmdShow) + LPSTR lpCmdLine, int nCmdShow) { - WNDCLASSEX wc; - MSG Msg; - BOOL bRet; + WNDCLASSEX wc; + MSG Msg; + BOOL bRet; - hInstance = hThisInstance; + hInstance = hThisInstance; - InitCommonControls(); + InitCommonControls(); - wc.cbSize = sizeof(WNDCLASSEX); - wc.style = 0; - wc.lpfnWndProc = WndProc; - wc.cbClsExtra = 0; - wc.cbWndExtra = 0; - wc.hInstance = hInstance; - wc.hIcon = LoadIcon(hInstance, MAKEINTRESOURCE(IDI_SM_ICON)); - wc.hCursor = LoadCursor(NULL, IDC_ARROW); - wc.hbrBackground = (HBRUSH)(COLOR_BTNFACE + 1); - wc.lpszMenuName = MAKEINTRESOURCE(IDR_MAINMENU); - wc.lpszClassName = ClassName; - wc.hIconSm = (HICON)LoadImage(hInstance, + wc.cbSize = sizeof(WNDCLASSEX); + wc.style = 0; + wc.lpfnWndProc = WndProc; + wc.cbClsExtra = 0; + wc.cbWndExtra = 0; + wc.hInstance = hInstance; + wc.hIcon = LoadIcon(hInstance, MAKEINTRESOURCE(IDI_SM_ICON)); + wc.hCursor = LoadCursor(NULL, IDC_ARROW); + wc.hbrBackground = (HBRUSH)(COLOR_BTNFACE + 1); + wc.lpszMenuName = MAKEINTRESOURCE(IDR_MAINMENU); + wc.lpszClassName = ClassName; + wc.hIconSm = (HICON)LoadImage(hInstance, MAKEINTRESOURCE(IDI_SM_ICON), IMAGE_ICON, 16, 16, 0); - if(!RegisterClassEx(&wc)) - { - MessageBox(NULL, _T("Window Registration Failed!"), _T("Error!"), - MB_ICONEXCLAMATION | MB_OK); - return 0; - } + if(!RegisterClassEx(&wc)) + { + MessageBox(NULL, _T("Window Registration Failed!"), _T("Error!"), + MB_ICONEXCLAMATION | MB_OK); + return 0; + } - hMainWnd = CreateWindowEx( - 0, - ClassName, - _T("ReactOS Service Manager"), - WS_OVERLAPPEDWINDOW | WS_CLIPCHILDREN, - CW_USEDEFAULT, CW_USEDEFAULT, 700, 500, - NULL, NULL, hInstance, NULL); + hMainWnd = CreateWindowEx( + 0, + ClassName, + _T("ReactOS Service Manager"), + WS_OVERLAPPEDWINDOW | WS_CLIPCHILDREN, + CW_USEDEFAULT, CW_USEDEFAULT, 700, 500, + NULL, NULL, hInstance, NULL); - if(hMainWnd == NULL) - { - MessageBox(NULL, _T("Window Creation Failed!"), _T("Error!"), - MB_ICONEXCLAMATION | MB_OK); - return 0; - } + if(hMainWnd == NULL) + { + MessageBox(NULL, _T("Window Creation Failed!"), _T("Error!"), + MB_ICONEXCLAMATION | MB_OK); + return 0; + } - ShowWindow(hMainWnd, nCmdShow); - UpdateWindow(hMainWnd); + ShowWindow(hMainWnd, nCmdShow); + UpdateWindow(hMainWnd); while( (bRet = GetMessage( &Msg, NULL, 0, 0 )) != 0) { @@ -395,7 +396,7 @@ DispatchMessage(&Msg); } } - return Msg.wParam; + return Msg.wParam; } _____ Modified: trunk/reactos/subsys/system/servman/servman.rc --- trunk/reactos/subsys/system/servman/servman.rc 2006-01-08 18:43:46 UTC (rev 20716) +++ trunk/reactos/subsys/system/servman/servman.rc 2006-01-08 18:50:54 UTC (rev 20717) @@ -13,5 +13,5 @@ IDI_SM_ICON ICON "res/system.ico" #include "En.rc" -#include "De.rc" +//#include "De.rc" /* I don't want to have to keep altering 2 files whilst developing */

1 0

[mflyer] 20716: These should have been committed a long time ago
by mflyer＠svn.reactos.org 08 Jan '06

08 Jan '06

These should have been committed a long time ago Modified: trunk/reactos/subsys/system/regedit/res/computer.ico Modified: trunk/reactos/subsys/system/regedit/res/folder.ico Modified: trunk/reactos/subsys/system/regedit/res/folderopen.ico _____ Modified: trunk/reactos/subsys/system/regedit/res/computer.ico (Binary files differ) _____ Modified: trunk/reactos/subsys/system/regedit/res/folder.ico (Binary files differ) _____ Modified: trunk/reactos/subsys/system/regedit/res/folderopen.ico (Binary files differ)

1 0

[greatlrd] 20715: patch from bradon fixing special key for other language's that English example Swedish keyboard layout. we can type now backslash again. it did regress in rev 19906
by greatlrd＠svn.reactos.org 08 Jan '06

08 Jan '06

patch from bradon fixing special key for other language's that English example Swedish keyboard layout. we can type now backslash again. it did regress in rev 19906 Modified: trunk/reactos/subsys/system/cmd/cmdinput.c _____ Modified: trunk/reactos/subsys/system/cmd/cmdinput.c --- trunk/reactos/subsys/system/cmd/cmdinput.c 2006-01-08 17:58:59 UTC (rev 20714) +++ trunk/reactos/subsys/system/cmd/cmdinput.c 2006-01-08 18:22:46 UTC (rev 20715) @@ -140,6 +140,7 @@ BOOL bContinue=FALSE;/*is TRUE the second case will not be executed*/ BOOL bReturn = FALSE; TCHAR szPath[MAX_PATH]; + BOOL bCharInput; /* get screen size */ GetScreenSize (&maxx, &maxy); @@ -215,6 +216,7 @@ // continue; + bCharInput = FALSE; switch (ir.Event.KeyEvent.wVirtualKeyCode) { @@ -511,15 +513,17 @@ } break; + default: + /* This input is just a normal char */ + bCharInput = TRUE; + } #ifdef _UNICODE ch = ir.Event.KeyEvent.uChar.UnicodeChar; - if ((ch >= 32 && ch <= 255) && (charcount != (maxlen - 2)) && - !(ir.Event.KeyEvent.dwControlKeyState & (RIGHT_CTRL_PRESSED|LEFT_CTRL_PRESSED))) + if ((ch >= 32 && (charcount != (maxlen - 2)) && bCharInput) #else ch = ir.Event.KeyEvent.uChar.AsciiChar; - if ((UCHAR)ch >= 32 && (charcount != (maxlen - 2)) && - !(ir.Event.KeyEvent.dwControlKeyState & (RIGHT_CTRL_PRESSED|LEFT_CTRL_PRESSED))) + if ((UCHAR)ch >= 32 && (charcount != (maxlen - 2)) && bCharInput) #endif /* _UNICODE */ { /* insert character into string... */

1 0

[gedmurphy] 20714: - rearrange code ready for custom tool bar bitmaps (untested)
by gedmurphy＠svn.reactos.org 08 Jan '06

08 Jan '06

- rearrange code ready for custom tool bar bitmaps (untested) Modified: trunk/reactos/subsys/system/servman/De.rc Modified: trunk/reactos/subsys/system/servman/En.rc Modified: trunk/reactos/subsys/system/servman/resource.h Modified: trunk/reactos/subsys/system/servman/servman.c Modified: trunk/reactos/subsys/system/servman/servman.h _____ Modified: trunk/reactos/subsys/system/servman/De.rc --- trunk/reactos/subsys/system/servman/De.rc 2006-01-08 15:22:56 UTC (rev 20713) +++ trunk/reactos/subsys/system/servman/De.rc 2006-01-08 17:58:59 UTC (rev 20714) @@ -68,6 +68,8 @@ CONTROL "",IDC_START_PARAM,"Static",0x50001000,70,199,176,11 END +IDB_BUTTONS BITMAP "buttons.bmp" + STRINGTABLE DISCARDABLE BEGIN IDS_FIRSTCOLUMN "Name" @@ -91,7 +93,6 @@ STRINGTABLE DISCARDABLE BEGIN IDS_SERVICES_NUM_SERVICES "Dienste: %d" - IDB_START "res/start.bmp" IDS_LICENSE "This program 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.\r\n\r\nThis 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.\r\n\r\nYou 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." /*"This program is free software; you can redistribute it " "and/or modify it under the terms of the GNU Lesser General " _____ Modified: trunk/reactos/subsys/system/servman/En.rc --- trunk/reactos/subsys/system/servman/En.rc 2006-01-08 15:22:56 UTC (rev 20713) +++ trunk/reactos/subsys/system/servman/En.rc 2006-01-08 17:58:59 UTC (rev 20714) @@ -67,6 +67,8 @@ CONTROL "",IDC_START_PARAM,"Static",0x50001000,70,199,176,11 END +IDB_BUTTONS BITMAP "buttons.bmp" + STRINGTABLE DISCARDABLE BEGIN IDS_FIRSTCOLUMN "Name" @@ -90,7 +92,7 @@ STRINGTABLE DISCARDABLE BEGIN IDS_SERVICES_NUM_SERVICES "Num Services: %d" - IDB_START "res/start.bmp" + IDS_LICENSE "This program 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.\r\n\r\nThis 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.\r\n\r\nYou 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." /*"This program is free software; you can redistribute it " "and/or modify it under the terms of the GNU Lesser General " _____ Modified: trunk/reactos/subsys/system/servman/resource.h --- trunk/reactos/subsys/system/servman/resource.h 2006-01-08 15:22:56 UTC (rev 20713) +++ trunk/reactos/subsys/system/servman/resource.h 2006-01-08 17:58:59 UTC (rev 20714) @@ -48,12 +48,14 @@ #define IDS_SERVICES_DIS 5006 #define IDS_SERVICES_NUM_SERVICES 5010 -#define IDB_START 50 -#define IDI_SM_ICON 51 +#define IDI_SM_ICON 50 +#define IDB_BUTTONS 51 +#define TBICON_START 2 +#define TBICON_STOP 3 +#define TBICON_PAUSE 0 +#define TBICON_RESTART 1 - - #define IDS_PROP_SHEET 10000 #define IDD_DLG_GENERAL 10001 #define IDC_SERV_NAME 10041 _____ Modified: trunk/reactos/subsys/system/servman/servman.c --- trunk/reactos/subsys/system/servman/servman.c 2006-01-08 15:22:56 UTC (rev 20713) +++ trunk/reactos/subsys/system/servman/servman.c 2006-01-08 17:58:59 UTC (rev 20714) @@ -15,6 +15,7 @@ HWND hMainWnd; HWND hListView; HWND hStatus; +HWND hTool; LRESULT CALLBACK WndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) @@ -26,17 +27,75 @@ //HFONT hfDefault; HWND hTool; - TBBUTTON tbb[7]; TBADDBITMAP tbab; + INT iImageOffset; + INT statwidths[] = {110, -1}; + TCHAR szTemp[256]; + RECT rcClient; + LVCOLUMN lvc = { 0 }; - int statwidths[] = {110, -1}; + /* Toolbar buttons */ + TBBUTTON tbb [NUM_BUTTONS] = + { // iBitmap, idCommand, fsState, fsStyle, bReserved[2], dwData, iString + {STD_PROPERTIES, ID_PROP, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0}, /* properties */ + {STD_FILENEW, ID_REFRESH, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0}, /* */ + {STD_FILENEW, ID_EXPORT, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0}, /* */ - TCHAR szTemp[256]; + /* Note: First item for a seperator is its width in pixels */ + {5, 0, TBSTATE_ENABLED, BTNS_SEP, {0}, 0, 0}, /* separator */ - /* Create List View */ - LVCOLUMN lvc = { 0 }; - //LVITEM lv = { 0 }; + {TBICON_START, ID_START, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0 }, /* start */ + {TBICON_STOP, ID_STOP, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0 }, /* stop */ + {TBICON_PAUSE, ID_PAUSE, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0 }, /* pause */ + {TBICON_RESTART, ID_RESTART, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0 }, /* restart */ + }; +/* ======================== Create Toolbar ============================== */ + + /* Create Toolbar */ + hTool = CreateWindowEx(0, + TOOLBARCLASSNAME, + NULL, + WS_CHILD | WS_VISIBLE | TBSTYLE_FLAT | TBSTYLE_TOOLTIPS, + 0, 0, 0, 0, + hwnd, + (HMENU)IDC_TOOLBAR, + hInstance, + NULL); + if(hTool == NULL) + MessageBox(hwnd, _T("Could not create tool bar."), _T("Error"), MB_OK | MB_ICONERROR); + + /* Send the TB_BUTTONSTRUCTSIZE message, which is required for backward compatibility */ + SendMessage(hTool, TB_BUTTONSTRUCTSIZE, sizeof(TBBUTTON), 0); + + /* Add standard image list */ + tbab.hInst = HINST_COMMCTRL; + tbab.nID = IDB_STD_SMALL_COLOR; + SendMessage(hTool, TB_ADDBITMAP, 0, (LPARAM) &tbab); + + /* Add custom images */ + tbab.hInst = hInstance; + tbab.nID = IDB_BUTTONS; + iImageOffset = (INT)SendMessage(hTool, TB_ADDBITMAP, 4, (LPARAM)&tbab); + tbb[4].iBitmap += iImageOffset; /* start */ + tbb[5].iBitmap += iImageOffset; /* stop */ + tbb[6].iBitmap += iImageOffset; /* pause */ + tbb[7].iBitmap += iImageOffset; /* restart */ + + /* Add buttons to toolbar */ + SendMessage(hTool, TB_ADDBUTTONS, NUM_BUTTONS, (LPARAM) &tbb); + + /* Send a WM_SIZE message to layout controls */ + GetClientRect(hwnd, &rcClient); + SendMessage(hwnd, WM_SIZE, SIZE_RESTORED, MAKELONG(rcClient.right, rcClient.bottom)); + + /* Show toolbar */ + ShowWindow(hTool, SW_SHOWNORMAL); + + + +/* ======================== Create List View ============================== */ + hListView = CreateWindow(WC_LISTVIEW, NULL, WS_CHILD | WS_VISIBLE | LVS_REPORT | WS_BORDER | @@ -46,7 +105,11 @@ (HMENU) IDC_SERVLIST, hInstance, NULL); + if (hListView == NULL) + MessageBox(hwnd, _T("Could not create List View."), _T("Error"), MB_OK | MB_ICONERROR); + + ListView_SetExtendedListViewStyle(hListView, LVS_EX_FULLROWSELECT | /*LVS_EX_GRIDLINES |*/ LVS_EX_HEADERDRAGDROP); @@ -84,60 +147,10 @@ lvc.pszText = szTemp; ListView_InsertColumn(hListView, 4, &lvc); - /* Create Toolbar */ - hTool = CreateWindowEx(0, - TOOLBARCLASSNAME, - NULL, - WS_CHILD | WS_VISIBLE | TBSTYLE_FLAT | TBSTYLE_TOOLTIPS, - 0, 0, 0, 0, - hwnd, - (HMENU)IDC_TOOLBAR, - hInstance, - NULL); - if(hTool == NULL) - MessageBox(hwnd, _T("Could not create tool bar."), _T("Error"), MB_OK | MB_ICONERROR); - // Send the TB_BUTTONSTRUCTSIZE message, which is required for - // backward compatibility. - SendMessage(hTool, TB_BUTTONSTRUCTSIZE, (WPARAM)sizeof(TBBUTTON), 0); - tbab.hInst = HINST_COMMCTRL; - tbab.nID = IDB_STD_SMALL_COLOR; - SendMessage(hTool, TB_ADDBITMAP, 0, (LPARAM)&tbab); +/* ======================== Create Status Bar ============================== */ - ZeroMemory(tbb, sizeof(tbb)); - tbb[0].iBitmap = STD_PROPERTIES; - tbb[0].fsState = TBSTATE_ENABLED; - tbb[0].fsStyle = TBSTYLE_BUTTON; - tbb[0].idCommand = ID_PROP; - tbb[1].iBitmap = STD_FILENEW; - tbb[1].fsState = TBSTATE_ENABLED; - tbb[1].fsStyle = TBSTYLE_BUTTON; - tbb[1].idCommand = ID_REFRESH; - tbb[2].iBitmap = STD_FILENEW; - tbb[2].fsState = TBSTATE_ENABLED; - tbb[2].fsStyle = TBSTYLE_BUTTON; - tbb[2].idCommand = ID_EXPORT; - /* seperator */ - tbb[3].iBitmap = STD_FILENEW; - tbb[3].fsState = TBSTATE_ENABLED; - tbb[3].fsStyle = TBSTYLE_BUTTON; - tbb[3].idCommand = ID_START; - tbb[4].iBitmap = STD_FILENEW; - tbb[4].fsState = TBSTATE_ENABLED; - tbb[4].fsStyle = TBSTYLE_BUTTON; - tbb[4].idCommand = ID_STOP; - tbb[5].iBitmap = STD_FILENEW; - tbb[5].fsState = TBSTATE_ENABLED; - tbb[5].fsStyle = TBSTYLE_BUTTON; - tbb[5].idCommand = ID_PAUSE; - tbb[6].iBitmap = STD_FILENEW; - tbb[6].fsState = TBSTATE_ENABLED; - tbb[6].fsStyle = TBSTYLE_BUTTON; - tbb[6].idCommand = ID_RESTART; - SendMessage(hTool, TB_ADDBUTTONS, sizeof(tbb)/sizeof(TBBUTTON), (LPARAM)&tbb); - - /* Create Status bar */ hStatus = CreateWindowEx(0, STATUSCLASSNAME, NULL, @@ -156,24 +169,21 @@ /* populate the list view with all services */ if (! RefreshServiceList() ) GetError(); + } break; case WM_SIZE: { - HWND hTool; RECT rcTool; int iToolHeight; - //HWND hStatus; RECT rcStatus; int iStatusHeight; - //HWND hListView; int lvHeight; RECT rcClient; /* Size toolbar and get height */ - hTool = GetDlgItem(hwnd, IDC_TOOLBAR); SendMessage(hTool, TB_AUTOSIZE, 0, 0); GetWindowRect(hTool, &rcTool); @@ -265,9 +275,11 @@ FreeMemory(); DestroyWindow(hwnd); break; + case WM_DESTROY: PostQuitMessage(0); break; + case WM_COMMAND: switch(LOWORD(wParam)) { @@ -301,7 +313,7 @@ break; case ID_HELP_ABOUT: - DialogBox(GetModuleHandle(NULL), + DialogBox(hInstance, MAKEINTRESOURCE(IDD_ABOUTBOX), hwnd, AboutDialogProc); @@ -312,6 +324,7 @@ } break; + default: return DefWindowProc(hwnd, msg, wParam, lParam); } @@ -319,7 +332,7 @@ } - +//#pragma warning(disable : 4100) int WINAPI WinMain(HINSTANCE hThisInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine, int nCmdShow) { _____ Modified: trunk/reactos/subsys/system/servman/servman.h --- trunk/reactos/subsys/system/servman/servman.h 2006-01-08 15:22:56 UTC (rev 20713) +++ trunk/reactos/subsys/system/servman/servman.h 2006-01-08 17:58:59 UTC (rev 20714) @@ -9,6 +9,7 @@ #include "resource.h" #define MAX_KEY_LENGTH 256 +#define NUM_BUTTONS 8 BOOL RefreshServiceList(VOID);

1 0

← Newer
1
...
34
35
36
37
38
39
40
...
59
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs January 2006