Ros-diffs April 2008

ros-diffs@reactos.org

21 participants
395 discussions

[cfinck] 33055: Reinsert the <group> tag to stay XML compatible. XML forbids to have more than one root element in a file.
by cfinck＠svn.reactos.org 20 Apr '08

20 Apr '08

Author: cfinck Date: Sun Apr 20 07:29:19 2008 New Revision: 33055 URL: http://svn.reactos.org/svn/reactos?rev=33055&view=rev Log: Reinsert the <group> tag to stay XML compatible. XML forbids to have more than one root element in a file. Modified: trunk/rosapps/fraginator/fraginator.rbuild Modified: trunk/rosapps/fraginator/fraginator.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/fraginator/fraginator.rbui… ============================================================================== --- trunk/rosapps/fraginator/fraginator.rbuild [iso-8859-1] (original) +++ trunk/rosapps/fraginator/fraginator.rbuild [iso-8859-1] Sun Apr 20 07:29:19 2008 @@ -1,5 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../tools/rbuild/project.dtd"> +<group> <module name="frag" type="win32gui" installbase="system32" installname="frag.exe" unicode="yes"> <include base="frag">.</include> <define name="WINVER">0x0501</define> @@ -28,3 +29,4 @@ <file>Defragment.cpp</file> <file>DriveVolume.cpp</file> </module> +</group>

1 0

[greatlrd] 33054: add two hack so dxg.sys continue works for now. it does not longer crash at DdDeleteDirectDrawObject for it never been call longer to dxg.sys until I figout why take DxEngLockShareSem and DxEngUnLockShareSem offline need more invigaste how it is done in windows. take DxGdiDdGetScanLine offline for now so it does not crash dxg.sys
by greatlrd＠svn.reactos.org 20 Apr '08

20 Apr '08

Author: greatlrd Date: Sun Apr 20 06:50:43 2008 New Revision: 33054 URL: http://svn.reactos.org/svn/reactos?rev=33054&view=rev Log: add two hack so dxg.sys continue works for now. it does not longer crash at DdDeleteDirectDrawObject for it never been call longer to dxg.sys until I figout why take DxEngLockShareSem and DxEngUnLockShareSem offline need more invigaste how it is done in windows. take DxGdiDdGetScanLine offline for now so it does not crash dxg.sys Modified: trunk/reactos/subsystems/win32/win32k/ntddraw/dd.c trunk/reactos/subsystems/win32/win32k/ntddraw/ddraw.c trunk/reactos/subsystems/win32/win32k/ntddraw/dxeng.c Modified: trunk/reactos/subsystems/win32/win32k/ntddraw/dd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntddraw/dd.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntddraw/dd.c [iso-8859-1] Sun Apr 20 06:50:43 2008 @@ -95,7 +95,10 @@ } DPRINT1("Calling on dxg.sys pfnDdGetScanLine"); - return pfnDdGetScanLine(hDirectDrawLocal,puGetScanLineData); + DPRINT1("FIXME it crash when it trying call on pfnDdGetScanLine\n"); + /* FIXME it crash when it trying call on pfnDdGetScanLine */ + // return pfnDdGetScanLine(hDirectDrawLocal,puGetScanLineData); + return 0; } Modified: trunk/reactos/subsystems/win32/win32k/ntddraw/ddraw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntddraw/ddraw.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntddraw/ddraw.c [iso-8859-1] Sun Apr 20 06:50:43 2008 @@ -336,8 +336,12 @@ DPRINT1("Warning: hDirectDrawLocal is NULL\n"); return DDHAL_DRIVER_HANDLED; } + DPRINT1("hDirectDrawLocal = %lx \n",hDirectDrawLocal); DPRINT1("Calling dxg.sys pfnDdDeleteDirectDrawObject\n"); - return pfnDdDeleteDirectDrawObject(hDirectDrawLocal); + DPRINT1("FIXME delete of the HANDLE\n"); + /* FIXME it crash inside or after it return from DxEngLockShareSem */ + // return pfnDdDeleteDirectDrawObject(hDirectDrawLocal); + return DDHAL_DRIVER_HANDLED; } /************************************************************************/ @@ -360,7 +364,7 @@ } /************************************************************************/ -/* NtGdiDdDeleteSurfaceObject */ +/* NtGdiDdQueryDirectDrawObject */ /************************************************************************/ BOOL STDCALL 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 Apr 20 06:50:43 2008 @@ -180,13 +180,13 @@ { BOOLEAN retVal = 0; DPRINT1("ReactX Calling : DxEngLockShareSem\n"); - +#if 0 if (ExIsResourceAcquiredExclusiveLite(&ghsemShareDevLock) == FALSE) { KeEnterCriticalRegion(); retVal = ExAcquireResourceExclusiveLite(&ghsemShareDevLock, TRUE); } - +#endif return retVal; } @@ -208,11 +208,14 @@ DxEngUnlockShareSem() { DPRINT1("ReactX Calling : DxEngUnlockShareSem\n"); + +#if 0 if (ExIsResourceAcquiredExclusiveLite(&ghsemShareDevLock) == TRUE) { ExReleaseResourceLite(&ghsemShareDevLock); KeLeaveCriticalRegion(); } +#endif return TRUE; }

1 0

[dchapyshev] 33053: - Add application for keyboard layouts switching (not finished)
by dchapyshev＠svn.reactos.org 20 Apr '08

20 Apr '08

Author: dchapyshev Date: Sun Apr 20 05:41:34 2008 New Revision: 33053 URL: http://svn.reactos.org/svn/reactos?rev=33053&view=rev Log: - Add application for keyboard layouts switching (not finished) Added: trunk/reactos/base/applications/kbswitch/ trunk/reactos/base/applications/kbswitch/kbswitch.c (with props) trunk/reactos/base/applications/kbswitch/kbswitch.h (with props) trunk/reactos/base/applications/kbswitch/kbswitch.rbuild (with props) trunk/reactos/base/applications/kbswitch/kbswitch.rc (with props) trunk/reactos/base/applications/kbswitch/res/ trunk/reactos/base/applications/kbswitch/res/kbswitch.ico (with props) trunk/reactos/base/applications/kbswitch/resource.h (with props) Modified: trunk/reactos/base/applications/applications.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 [iso-8859-1] (original) +++ trunk/reactos/base/applications/applications.rbuild [iso-8859-1] Sun Apr 20 05:41:34 2008 @@ -24,6 +24,9 @@ </directory> <directory name="hh"> <xi:include href="hh/hh.rbuild" /> + </directory> + <directory name="kbswitch"> + <xi:include href="kbswitch/kbswitch.rbuild" /> </directory> <directory name="logoff"> <xi:include href="logoff/logoff.rbuild" /> Added: 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 (added) +++ trunk/reactos/base/applications/kbswitch/kbswitch.c [iso-8859-1] Sun Apr 20 05:41:34 2008 @@ -1,0 +1,187 @@ +#include <kbswitch.h> + +#define WM_NOTIFYICONMSG (WM_USER + 248) +#define BUFSIZE 256 + +HINSTANCE hInst; +HWND hwnd; + +static VOID +AddTrayIcon(HWND hwnd, HICON hIcon) +{ + NOTIFYICONDATA tnid; + + tnid.cbSize = sizeof(NOTIFYICONDATA); + tnid.hWnd = hwnd; + tnid.uID = 1; + tnid.uFlags = NIF_ICON | NIF_MESSAGE; + tnid.uCallbackMessage = WM_NOTIFYICONMSG; + tnid.hIcon = hIcon; + + Shell_NotifyIcon(NIM_ADD, &tnid); + + if (hIcon) DestroyIcon(hIcon); +} + +static VOID +DelTrayIcon(HWND hwnd) +{ + NOTIFYICONDATA tnid; + + tnid.cbSize = sizeof(NOTIFYICONDATA); + tnid.hWnd = hwnd; + tnid.uID = 1; + + Shell_NotifyIcon(NIM_DELETE, &tnid); +} + +static BOOL +GetLayoutName(LPCTSTR lcid, LPTSTR name) +{ + HKEY hKey; + DWORD dwBufLen; + TCHAR szBuf[BUFSIZE]; + + _stprintf(szBuf, _T("SYSTEM\\CurrentControlSet\\Control\\Keyboard Layouts\\%s"),lcid); + + if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, (LPCTSTR)szBuf, 0, KEY_QUERY_VALUE, &hKey) == ERROR_SUCCESS) + { + dwBufLen = BUFSIZE; + if (RegQueryValueEx(hKey,_T("Layout Text"),NULL,NULL,(LPBYTE)name,&dwBufLen) == ERROR_SUCCESS) + { + RegCloseKey(hKey); + return TRUE; + } + } + + return FALSE; +} + +static VOID +ActivateLayout(INT LayoutID) +{ + TCHAR szLayoutID[MAX_PATH], szNewLayout[MAX_PATH]; + HKEY hKey; + DWORD dwBufLen; + + _stprintf(szLayoutID, _T("%d"), LayoutID); + + if (RegOpenKeyEx(HKEY_CURRENT_USER, _T("Keyboard Layout\\Preload"), 0, KEY_QUERY_VALUE, &hKey) == ERROR_SUCCESS) + { + dwBufLen = MAX_PATH; + if (RegQueryValueEx(hKey, szLayoutID, NULL, NULL, (LPBYTE)szNewLayout, &dwBufLen) == ERROR_SUCCESS) + { + MessageBox(0, szNewLayout, _T(""), MB_OK); + RegCloseKey(hKey); + } + } +} + +static VOID +ShowPopupMenu(HWND hwnd, POINT pt) +{ + HMENU hMenu; + HKEY hKey; + DWORD dwIndex = 0, dwSize, dwType; + LONG Ret; + TCHAR szBuf[MAX_PATH], szPreload[MAX_PATH], szName[MAX_PATH]; + + hMenu = CreatePopupMenu(); + + if (RegOpenKeyEx(HKEY_CURRENT_USER, _T("Keyboard Layout\\Preload"), + 0, KEY_QUERY_VALUE, &hKey) == ERROR_SUCCESS) + { + dwSize = MAX_PATH; + Ret = RegEnumValue(hKey, dwIndex, szBuf, &dwSize, NULL, &dwType, NULL, NULL); + if (Ret == ERROR_SUCCESS) + { + while (Ret == ERROR_SUCCESS) + { + dwSize = MAX_PATH; + RegQueryValueEx(hKey, szBuf, NULL, NULL, (LPBYTE)szPreload, &dwSize); + + GetLayoutName(szPreload, szName); + AppendMenu(hMenu, MF_STRING, _ttoi(szBuf), szName); + + dwIndex++; + + dwSize = MAX_PATH; + Ret = RegEnumValue(hKey, dwIndex, szBuf, &dwSize, NULL, &dwType, NULL, NULL); + } + } + } + + TrackPopupMenu(hMenu, 0, pt.x, pt.y, 0, hwnd, NULL); + DestroyMenu(hMenu); + RegCloseKey(hKey); +} + +LRESULT CALLBACK +WndProc(HWND hwnd, UINT Message, WPARAM wParam, LPARAM lParam) +{ + POINT pt; + + switch (Message) + { + case WM_CREATE: + AddTrayIcon(hwnd, LoadIcon(hInst, MAKEINTRESOURCE(IDI_MAIN))); + break; + + case WM_NOTIFYICONMSG: + switch (lParam) + { + case WM_LBUTTONDBLCLK: + case WM_LBUTTONDOWN: + case WM_RBUTTONDOWN: + { + GetCursorPos(&pt); + ShowPopupMenu(hwnd, pt); + } + break; + } + break; + + case WM_COMMAND: + ActivateLayout(LOWORD(wParam)); + break; + + case WM_DESTROY: + DelTrayIcon(hwnd); + PostQuitMessage(0); + break; + } + + return DefWindowProc(hwnd, Message, wParam, lParam); +} + +INT WINAPI +wWinMain(HINSTANCE hInstance, HINSTANCE hPrevInst, LPTSTR lpCmdLine, INT nCmdShow) +{ + WNDCLASS WndClass = {0}; + MSG msg; + + hInst = hInstance; + + WndClass.style = 0; + WndClass.lpfnWndProc = (WNDPROC)WndProc; + WndClass.cbClsExtra = 0; + WndClass.cbWndExtra = 0; + WndClass.hInstance = hInstance; + WndClass.hIcon = NULL; + WndClass.hCursor = NULL; + WndClass.hbrBackground = NULL; + WndClass.lpszMenuName = NULL; + WndClass.lpszClassName = L"kbswitch"; + + if (!RegisterClass(&WndClass)) return 0; + + hwnd = CreateWindow(L"kbswitch", L"kbswitch", 0, 0, 0, 1, 1, HWND_DESKTOP, NULL, hInstance, NULL); + + while(GetMessage(&msg,NULL,0,0)) + { + TranslateMessage(&msg); + DispatchMessage(&msg); + } + + return 0; +} Propchange: trunk/reactos/base/applications/kbswitch/kbswitch.c ------------------------------------------------------------------------------ svn:eol-style = native Added: 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 (added) +++ trunk/reactos/base/applications/kbswitch/kbswitch.h [iso-8859-1] Sun Apr 20 05:41:34 2008 @@ -1,0 +1,6 @@ +#include <windows.h> +#include <tchar.h> +#include <stdio.h> +#include <stdlib.h> + +#include "resource.h" Propchange: trunk/reactos/base/applications/kbswitch/kbswitch.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/applications/kbswitch/kbswitch.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/kbswitch… ============================================================================== --- trunk/reactos/base/applications/kbswitch/kbswitch.rbuild (added) +++ trunk/reactos/base/applications/kbswitch/kbswitch.rbuild [iso-8859-1] Sun Apr 20 05:41:34 2008 @@ -1,0 +1,20 @@ +<?xml version="1.0"?> +<group xmlns:xi="http://www.w3.org/2001/XInclude"> + <module name="kbswitch" type="win32gui" installbase="system32" installname="kbswitch.exe" unicode="yes"> + <include base="kbswitch">.</include> + <define name="_WIN32_IE">0x600</define> + <define name="WINVER">0x500</define> + <define name="_WIN32_WINNT">0x501</define> + <library>kernel32</library> + <library>advapi32</library> + <library>ntdll</library> + <library>user32</library> + <library>gdi32</library> + <library>shell32</library> + <library>comctl32</library> + <library>msimg32</library> + <library>shlwapi</library> + <file>kbswitch.c</file> + <file>kbswitch.rc</file> + </module> +</group> Propchange: trunk/reactos/base/applications/kbswitch/kbswitch.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/applications/kbswitch/kbswitch.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/kbswitch… ============================================================================== --- trunk/reactos/base/applications/kbswitch/kbswitch.rc (added) +++ trunk/reactos/base/applications/kbswitch/kbswitch.rc [iso-8859-1] Sun Apr 20 05:41:34 2008 @@ -1,0 +1,6 @@ +#include "resource.h" +#include <windows.h> + +LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL + +IDI_MAIN ICON "res/kbswitch.ico" Propchange: trunk/reactos/base/applications/kbswitch/kbswitch.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/applications/kbswitch/res/kbswitch.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/kbswitch… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/base/applications/kbswitch/res/kbswitch.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/base/applications/kbswitch/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/kbswitch… ============================================================================== --- trunk/reactos/base/applications/kbswitch/resource.h (added) +++ trunk/reactos/base/applications/kbswitch/resource.h [iso-8859-1] Sun Apr 20 05:41:34 2008 @@ -1,0 +1,2 @@ +/* Icons */ +#define IDI_MAIN 100 Propchange: trunk/reactos/base/applications/kbswitch/resource.h ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[ekohl] 33052: Don't terminate a cpp_quote statement with a semicolon. New versions of WIDL will emit an error.
by ekohl＠svn.reactos.org 20 Apr '08

20 Apr '08

Author: ekohl Date: Sun Apr 20 05:10:18 2008 New Revision: 33052 URL: http://svn.reactos.org/svn/reactos?rev=33052&view=rev Log: Don't terminate a cpp_quote statement with a semicolon. New versions of WIDL will emit an error. Modified: trunk/reactos/dll/win32/atl/atliface.idl trunk/reactos/include/reactos/idl/eventlogrpc.idl trunk/reactos/include/reactos/idl/pnp.idl trunk/reactos/include/reactos/idl/svcctl.idl Modified: trunk/reactos/dll/win32/atl/atliface.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/atl/atliface.idl… ============================================================================== --- trunk/reactos/dll/win32/atl/atliface.idl [iso-8859-1] (original) +++ trunk/reactos/dll/win32/atl/atliface.idl [iso-8859-1] Sun Apr 20 05:10:18 2008 @@ -74,6 +74,6 @@ cpp_quote("HRESULT WINAPI AtlAxCreateControlEx(LPCOLESTR,HWND,IStream*,IUnknown**,IUnknown**,REFIID,IUnknown*);") cpp_quote("BOOL WINAPI AtlAxWinInit(void);") -cpp_quote("HWND WINAPI AtlAxCreateDialogW(HINSTANCE,LPCWSTR,HWND,DLGPROC,LPARAM);"); -cpp_quote("HWND WINAPI AtlAxCreateDialogA(HINSTANCE,LPCSTR,HWND,DLGPROC,LPARAM);"); -cpp_quote("#define AtlAxCreateDialog WINELIB_NAME_AW(AtlAxCreateDialog"); +cpp_quote("HWND WINAPI AtlAxCreateDialogW(HINSTANCE,LPCWSTR,HWND,DLGPROC,LPARAM);") +cpp_quote("HWND WINAPI AtlAxCreateDialogA(HINSTANCE,LPCSTR,HWND,DLGPROC,LPARAM);") +cpp_quote("#define AtlAxCreateDialog WINELIB_NAME_AW(AtlAxCreateDialog") Modified: trunk/reactos/include/reactos/idl/eventlogrpc.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/idl/eventl… ============================================================================== --- trunk/reactos/include/reactos/idl/eventlogrpc.idl [iso-8859-1] (original) +++ trunk/reactos/include/reactos/idl/eventlogrpc.idl [iso-8859-1] Sun Apr 20 05:10:18 2008 @@ -64,7 +64,7 @@ #else #define LOGHANDLE unsigned int #define PLOGHANDLE unsigned int* - cpp_quote("typedef unsigned int LOGHANDLE, *PLOGHANDLE;"); + cpp_quote("typedef unsigned int LOGHANDLE, *PLOGHANDLE;") #endif /* Function 0x00 */ Modified: trunk/reactos/include/reactos/idl/pnp.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/idl/pnp.id… ============================================================================== --- trunk/reactos/include/reactos/idl/pnp.idl [iso-8859-1] (original) +++ trunk/reactos/include/reactos/idl/pnp.idl [iso-8859-1] Sun Apr 20 05:10:18 2008 @@ -294,9 +294,9 @@ [in] PNP_RPC_STRING_LEN ulLength); /* Function 8 */ - cpp_quote("#define PNP_GET_PARENT_DEVICE_INSTANCE 0x1"); - cpp_quote("#define PNP_GET_CHILD_DEVICE_INSTANCE 0x2"); - cpp_quote("#define PNP_GET_SIBLING_DEVICE_INSTANCE 0x3"); + cpp_quote("#define PNP_GET_PARENT_DEVICE_INSTANCE 0x1") + cpp_quote("#define PNP_GET_CHILD_DEVICE_INSTANCE 0x2") + cpp_quote("#define PNP_GET_SIBLING_DEVICE_INSTANCE 0x3") DWORD PNP_GetRelatedDeviceInstance( [in] handle_t hBinding, [in] DWORD ulRelationship, @@ -306,8 +306,8 @@ [in] DWORD ulFlags); /* Function 9 */ - cpp_quote("#define PNP_ENUMERATOR_SUBKEYS 0x1"); - cpp_quote("#define PNP_CLASS_SUBKEYS 0x2"); + cpp_quote("#define PNP_ENUMERATOR_SUBKEYS 0x1") + cpp_quote("#define PNP_CLASS_SUBKEYS 0x2") DWORD PNP_EnumerateSubKeys( [in] handle_t hBinding, [in] DWORD ulBranch, @@ -557,8 +557,8 @@ [in] handle_t hBinding); /* Function 40 */ - cpp_quote("#define PNP_GET_HWPROFFLAGS 0x1"); - cpp_quote("#define PNP_SET_HWPROFFLAGS 0x2"); + cpp_quote("#define PNP_GET_HWPROFFLAGS 0x1") + cpp_quote("#define PNP_SET_HWPROFFLAGS 0x2") DWORD PNP_HwProfFlags( [in] handle_t hBinding, [in] DWORD ulAction, Modified: trunk/reactos/include/reactos/idl/svcctl.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/idl/svcctl… ============================================================================== --- trunk/reactos/include/reactos/idl/svcctl.idl [iso-8859-1] (original) +++ trunk/reactos/include/reactos/idl/svcctl.idl [iso-8859-1] Sun Apr 20 05:10:18 2008 @@ -239,7 +239,7 @@ [size_is(cElements)] SC_RPC_NOTIFY_PARAMS NotifyParamsArray[]; } SC_RPC_NOTIFY_PARAMS_LIST, *PSC_RPC_NOTIFY_PARAMS_LIST; -cpp_quote("#if 0"); +cpp_quote("#if 0") #if 0 typedef @@ -297,7 +297,9 @@ uuid(367abb81-9844-35f1-ad32-98f038001003), version(2.0), pointer_default(unique), - explicit_handle + #ifndef __midl + ,explicit_handle + #endif ] interface svcctl {

1 0

[fireball] 33051: - Frag fully builds. - Unfrag fails to link (both are still excluded from the build process).
by fireball＠svn.reactos.org 20 Apr '08

20 Apr '08

Author: fireball Date: Sun Apr 20 04:23:29 2008 New Revision: 33051 URL: http://svn.reactos.org/svn/reactos?rev=33051&view=rev Log: - Frag fully builds. - Unfrag fails to link (both are still excluded from the build process). Modified: trunk/rosapps/fraginator/Fraginator.cpp trunk/rosapps/fraginator/Fraginator.h trunk/rosapps/fraginator/Unfrag.h trunk/rosapps/fraginator/fraginator.rbuild Modified: trunk/rosapps/fraginator/Fraginator.cpp URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/fraginator/Fraginator.cpp?… ============================================================================== --- trunk/rosapps/fraginator/Fraginator.cpp [iso-8859-1] (original) +++ trunk/rosapps/fraginator/Fraginator.cpp [iso-8859-1] Sun Apr 20 04:23:29 2008 @@ -20,7 +20,10 @@ Defragment *Defrag = NULL; INT WINAPI -wWinMain (HINSTANCE HInstance, HINSTANCE HPrevInstance, LPCWSTR CmdLine, INT ShowCmd) +wWinMain(HINSTANCE HInstance, + HINSTANCE hPrev, + LPWSTR Cmd, + int iCmd) { INITCOMMONCONTROLSEX InitControls; Modified: trunk/rosapps/fraginator/Fraginator.h URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/fraginator/Fraginator.h?re… ============================================================================== --- trunk/rosapps/fraginator/Fraginator.h [iso-8859-1] (original) +++ trunk/rosapps/fraginator/Fraginator.h [iso-8859-1] Sun Apr 20 04:23:29 2008 @@ -13,13 +13,13 @@ #include <commctrl.h> -int WINAPI WinMain (HINSTANCE HInstance, HINSTANCE HPrevInstance, LPSTR CmdLine, int ShowCmd); +//int WINAPI WinMain (HINSTANCE HInstance, HINSTANCE HPrevInstance, LPSTR CmdLine, int ShowCmd); Defragment *StartDefragBox (wstring Drive, DefragType Method); extern HINSTANCE GlobalHInstance; extern Defragment *Defrag; -extern INT PASCAL wWinMain (HINSTANCE HInstance, HINSTANCE HPrevInstance, LPCWSTR CmdLine, INT ShowCmd); +//extern INT PASCAL wWinMain (HINSTANCE HInstance, HINSTANCE HPrevInstance, LPCWSTR CmdLine, INT ShowCmd); #endif // FRAGINATOR_H Modified: trunk/rosapps/fraginator/Unfrag.h URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/fraginator/Unfrag.h?rev=33… ============================================================================== --- trunk/rosapps/fraginator/Unfrag.h [iso-8859-1] (original) +++ trunk/rosapps/fraginator/Unfrag.h [iso-8859-1] Sun Apr 20 04:23:29 2008 @@ -28,10 +28,10 @@ #endif #endif +#include <stdio.h> +#include <stdlib.h> #include <windows.h> #include <string> -#include <stdio.h> -#include <stdlib.h> //#include <initguid.h> #include <winioctl.h> Modified: trunk/rosapps/fraginator/fraginator.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/fraginator/fraginator.rbui… ============================================================================== --- trunk/rosapps/fraginator/fraginator.rbuild [iso-8859-1] (original) +++ trunk/rosapps/fraginator/fraginator.rbuild [iso-8859-1] Sun Apr 20 04:23:29 2008 @@ -1,8 +1,7 @@ <?xml version="1.0"?> -<group xmlns:xi="http://www.w3.org/2001/XInclude"> +<!DOCTYPE module SYSTEM "../tools/rbuild/project.dtd"> <module name="frag" type="win32gui" installbase="system32" installname="frag.exe" unicode="yes"> <include base="frag">.</include> - <define name="__USE_W32API" /> <define name="WINVER">0x0501</define> <define name="_WIN32_IE">0x0600</define> <library>kernel32</library> @@ -20,7 +19,6 @@ <module name="unfrag" type="win32cui" installbase="system32" installname="unfrag.exe" unicode="yes"> <include base="unfrag">.</include> - <define name="__USE_W32API" /> <define name="WINVER">0x0501</define> <define name="_WIN32_IE">0x0600</define> <library>kernel32</library> @@ -30,4 +28,3 @@ <file>Defragment.cpp</file> <file>DriveVolume.cpp</file> </module> -</group>

1 0

[janderwald] 33050: - avoid using BringWindowToTop as it creates display problems - build a custom function GetRegValue to allow dxdiag be used on older Windows versions - try to fix potential buffer overflows
by janderwald＠svn.reactos.org 20 Apr '08

20 Apr '08

Author: janderwald Date: Sun Apr 20 03:48:55 2008 New Revision: 33050 URL: http://svn.reactos.org/svn/reactos?rev=33050&view=rev Log: - avoid using BringWindowToTop as it creates display problems - build a custom function GetRegValue to allow dxdiag be used on older Windows versions - try to fix potential buffer overflows Modified: trunk/reactos/base/applications/dxdiag/dxdiag.c trunk/reactos/base/applications/dxdiag/precomp.h trunk/reactos/base/applications/dxdiag/system.c Modified: trunk/reactos/base/applications/dxdiag/dxdiag.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/d… ============================================================================== --- trunk/reactos/base/applications/dxdiag/dxdiag.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/dxdiag/dxdiag.c [iso-8859-1] Sun Apr 20 03:48:55 2008 @@ -66,9 +66,6 @@ else ShowWindow(pContext->hDialogs[Index], SW_HIDE); } - - /* make sure its displayed */ - BringWindowToTop(pContext->hDialogs[CurSel]); } @@ -190,7 +187,7 @@ UNREFERENCED_PARAMETER(nCmdShow); InitControls.dwSize = sizeof(INITCOMMONCONTROLSEX); - InitControls.dwICC = ICC_TAB_CLASSES | ICC_LISTVIEW_CLASSES; + InitControls.dwICC = ICC_TAB_CLASSES | ICC_LISTVIEW_CLASSES | ICC_STANDARD_CLASSES; InitCommonControlsEx(&InitControls); hInst = hInstance; Modified: trunk/reactos/base/applications/dxdiag/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/p… ============================================================================== --- trunk/reactos/base/applications/dxdiag/precomp.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/dxdiag/precomp.h [iso-8859-1] Sun Apr 20 03:48:55 2008 @@ -4,7 +4,6 @@ #include <stdio.h> #include <windows.h> #include <commctrl.h> - #include "resource.h" typedef struct @@ -27,6 +26,7 @@ INT_PTR CALLBACK InputPageWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam); INT_PTR CALLBACK NetworkPageWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam); INT_PTR CALLBACK HelpPageWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam); +BOOL GetRegValue(HKEY hBaseKey, LPWSTR SubKey, LPWSTR ValueName, DWORD Type, LPWSTR Result, DWORD Size); #endif Modified: trunk/reactos/base/applications/dxdiag/system.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/s… ============================================================================== --- trunk/reactos/base/applications/dxdiag/system.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/dxdiag/system.c [iso-8859-1] Sun Apr 20 03:48:55 2008 @@ -9,14 +9,40 @@ #include "precomp.h" +BOOL +GetRegValue(HKEY hBaseKey, LPWSTR SubKey, LPWSTR ValueName, DWORD Type, LPWSTR Result, DWORD Size) +{ + HKEY hKey; + LONG res; + DWORD dwType; + DWORD dwSize; + + + if (RegOpenKeyExW(hBaseKey, SubKey, 0, KEY_QUERY_VALUE, &hKey) != ERROR_SUCCESS) + return FALSE; + + dwSize = Size; + res = RegQueryValueExW(hKey, ValueName, NULL, &dwType, (LPBYTE)Result, &dwSize); + RegCloseKey(hKey); + + if (dwType != Type) + return FALSE; + + if (res != ERROR_SUCCESS) + return FALSE; + + Result[(Size / sizeof(WCHAR))-1] = L'\0'; + return TRUE; +} + + static BOOL GetDirectXVersion(WCHAR * szBuffer) { WCHAR szVer[20]; - DWORD dwVer = sizeof(szVer); - - if (RegGetValueW(HKEY_LOCAL_MACHINE, L"SOFTWARE\\Microsoft\\DirectX", L"Version", RRF_RT_REG_SZ, NULL, szVer, &dwVer) != ERROR_SUCCESS) + + if (!GetRegValue(HKEY_LOCAL_MACHINE, L"SOFTWARE\\Microsoft\\DirectX", L"Version", REG_SZ, szVer, sizeof(szVer))) return FALSE; if(!wcscmp(szVer, L"4.02.0095")) @@ -218,8 +244,7 @@ /* set system manufacturer */ szTime[0] = L'\0'; - Length = sizeof(szTime) / sizeof(WCHAR); - if (RegGetValueW(HKEY_LOCAL_MACHINE, L"Hardware\\Description\\System\\BIOS", L"SystemManufacturer", RRF_RT_REG_SZ, NULL, szTime, &Length) == ERROR_SUCCESS) + if (GetRegValue(HKEY_LOCAL_MACHINE, L"Hardware\\Description\\System\\BIOS", L"SystemManufacturer", REG_SZ, szTime, sizeof(szTime))) { szTime[199] = L'\0'; SendDlgItemMessageW(hwndDlg, IDC_STATIC_MANU, WM_SETTEXT, 0, (LPARAM)szTime); @@ -227,37 +252,36 @@ /* set motherboard model */ szTime[0] = L'\0'; - Length = sizeof(szTime) / sizeof(WCHAR); - if (RegGetValueW(HKEY_LOCAL_MACHINE, L"Hardware\\Description\\System\\BIOS", L"SystemProductName", RRF_RT_REG_SZ, NULL, szTime, &Length) == ERROR_SUCCESS) - { - szTime[199] = L'\0'; + if (GetRegValue(HKEY_LOCAL_MACHINE, L"Hardware\\Description\\System\\BIOS", L"SystemProductName", REG_SZ, szTime, sizeof(szTime))) + { SendDlgItemMessageW(hwndDlg, IDC_STATIC_MODEL, WM_SETTEXT, 0, (LPARAM)szTime); } /* set bios model */ szTime[0] = L'\0'; - Length = sizeof(szTime) / sizeof(WCHAR); - if (RegGetValueW(HKEY_LOCAL_MACHINE, L"Hardware\\Description\\System\\BIOS", L"BIOSVendor", RRF_RT_REG_SZ, NULL, szTime, &Length) == ERROR_SUCCESS) + if (GetRegValue(HKEY_LOCAL_MACHINE, L"Hardware\\Description\\System\\BIOS", L"BIOSVendor", REG_SZ, szTime, sizeof(szTime))) { DWORD Index; - DWORD StrLength = (sizeof(szTime) / sizeof(WCHAR)) - (Length/sizeof(WCHAR)); - - Index = (Length/sizeof(WCHAR)); - szTime[Index-1] = L' '; - - if (RegGetValueW(HKEY_LOCAL_MACHINE, L"Hardware\\Description\\System\\BIOS", L"BIOSReleaseDate", RRF_RT_REG_SZ, NULL, &szTime[Index], &StrLength) == ERROR_SUCCESS) - { - StrLength = (StrLength/sizeof(WCHAR)); - } - szTime[Index+StrLength] = L' '; - wcscpy(&szTime[Index+StrLength], L"Ver: "); //FIXME NON-NLS - szTime[199] = L'\0'; - SendDlgItemMessageW(hwndDlg, IDC_STATIC_BIOS, WM_SETTEXT, 0, (LPARAM)szTime); - //FIXME retrieve BiosMajorRelease, BiosMinorRelease + DWORD StrLength = (sizeof(szTime) / sizeof(WCHAR)); + + Index = wcslen(szTime); + StrLength -= Index; + + if (GetRegValue(HKEY_LOCAL_MACHINE, L"Hardware\\Description\\System\\BIOS", L"BIOSReleaseDate", REG_SZ, &szTime[Index], StrLength)) + { + if (Index + StrLength > (sizeof(szTime)/sizeof(WCHAR))- 15) + { + //FIXME retrieve BiosMajorRelease, BiosMinorRelease + //StrLength = wcslen(&szTime[Index]); + //szTime[Index+StrLength] = L' '; + //wcscpy(&szTime[Index+StrLength], L"Ver: "); //FIXME NON-NLS + //szTime[(sizeof(szTime)/sizeof(WCHAR))-1] = L'\0'; + } + SendDlgItemMessageW(hwndDlg, IDC_STATIC_BIOS, WM_SETTEXT, 0, (LPARAM)szTime); + } } /* set processor string */ - Length = sizeof(szDesc); - if (RegGetValueW(HKEY_LOCAL_MACHINE, L"Hardware\\Description\\System\\CentralProcessor\\0", L"ProcessorNameString", RRF_RT_REG_SZ, NULL, szDesc, &Length) == ERROR_SUCCESS) + if (GetRegValue(HKEY_LOCAL_MACHINE, L"Hardware\\Description\\System\\CentralProcessor\\0", L"ProcessorNameString", REG_SZ, szDesc, sizeof(szDesc))) { /* FIXME retrieve current speed */ szFormat[0] = L'\0';

1 0

[dchapyshev] 33049: - Fix formatting
by dchapyshev＠svn.reactos.org 20 Apr '08

20 Apr '08

Author: dchapyshev Date: Sun Apr 20 02:57:28 2008 New Revision: 33049 URL: http://svn.reactos.org/svn/reactos?rev=33049&view=rev Log: - Fix formatting Modified: trunk/reactos/dll/cpl/input/add.c trunk/reactos/dll/cpl/input/settings.c Modified: trunk/reactos/dll/cpl/input/add.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/add.c?rev=33… ============================================================================== --- trunk/reactos/dll/cpl/input/add.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/input/add.c [iso-8859-1] Sun Apr 20 02:57:28 2008 @@ -39,34 +39,34 @@ static VOID AddNewLayout(HWND hwndDlg) { - TCHAR NewLayout[3]; - INT iLayout; - HKEY hKey; - DWORD cValues; - PTSTR pts; - - iLayout = SendMessage(hLayoutList, CB_GETCURSEL, 0, 0); - if (iLayout == CB_ERR) return; - - if (RegOpenKey(HKEY_CURRENT_USER, _T("Keyboard Layout\\Preload"), &hKey) == ERROR_SUCCESS) - { - if (RegQueryInfoKey(hKey, NULL, NULL, NULL, NULL, NULL, NULL, &cValues, NULL, NULL, NULL, NULL) == ERROR_SUCCESS) - { - _stprintf(NewLayout, _T("%d"), cValues + 1); - - pts = (PTSTR) SendMessage(hLayoutList, CB_GETITEMDATA, iLayout, 0); - - if (RegSetValueEx(hKey, - NewLayout, - 0, - REG_SZ, - (LPBYTE)pts, - (DWORD)(_tcslen(pts)*sizeof(PTSTR))) == ERROR_SUCCESS) - { - UpdateLayoutsList(); - } - } - } + TCHAR NewLayout[3]; + INT iLayout; + HKEY hKey; + DWORD cValues; + PTSTR pts; + + iLayout = SendMessage(hLayoutList, CB_GETCURSEL, 0, 0); + if (iLayout == CB_ERR) return; + + if (RegOpenKey(HKEY_CURRENT_USER, _T("Keyboard Layout\\Preload"), &hKey) == ERROR_SUCCESS) + { + if (RegQueryInfoKey(hKey, NULL, NULL, NULL, NULL, NULL, NULL, &cValues, NULL, NULL, NULL, NULL) == ERROR_SUCCESS) + { + _stprintf(NewLayout, _T("%d"), cValues + 1); + + pts = (PTSTR) SendMessage(hLayoutList, CB_GETITEMDATA, iLayout, 0); + + if (RegSetValueEx(hKey, + NewLayout, + 0, + REG_SZ, + (LPBYTE)pts, + (DWORD)(_tcslen(pts)*sizeof(PTSTR))) == ERROR_SUCCESS) + { + UpdateLayoutsList(); + } + } + } } VOID Modified: trunk/reactos/dll/cpl/input/settings.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/settings.c?r… ============================================================================== --- trunk/reactos/dll/cpl/input/settings.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/input/settings.c [iso-8859-1] Sun Apr 20 02:57:28 2008 @@ -167,20 +167,20 @@ VOID UpdateLayoutsList(VOID) { - (VOID) ListView_DeleteAllItems(GetDlgItem(MainDlgWnd, IDC_KEYLAYOUT_LIST)); - InitLangList(MainDlgWnd); + (VOID) ListView_DeleteAllItems(GetDlgItem(MainDlgWnd, IDC_KEYLAYOUT_LIST)); + InitLangList(MainDlgWnd); } static VOID DeleteLayout(VOID) { - INT iIndex; - - iIndex = (INT) SendMessage(GetDlgItem(MainDlgWnd, IDC_KEYLAYOUT_LIST), LVM_GETNEXTITEM, -1, LVNI_FOCUSED); - if (iIndex != -1) - { - MessageBox(0, _T("Not implemented!"), NULL, MB_OK); - } + INT iIndex; + + iIndex = (INT) SendMessage(GetDlgItem(MainDlgWnd, IDC_KEYLAYOUT_LIST), LVM_GETNEXTITEM, -1, LVNI_FOCUSED); + if (iIndex != -1) + { + MessageBox(0, _T("Not implemented!"), NULL, MB_OK); + } } /* Property page dialog callback */ @@ -193,10 +193,10 @@ { case WM_INITDIALOG: { - MainDlgWnd = hwndDlg; - AddListColumn(hwndDlg); - (VOID) ListView_SetExtendedListViewStyle(GetDlgItem(MainDlgWnd, IDC_KEYLAYOUT_LIST), - LVS_EX_FULLROWSELECT); + MainDlgWnd = hwndDlg; + AddListColumn(hwndDlg); + (VOID) ListView_SetExtendedListViewStyle(GetDlgItem(MainDlgWnd, IDC_KEYLAYOUT_LIST), + LVS_EX_FULLROWSELECT); InitLangList(hwndDlg); EnableWindow(GetDlgItem(hwndDlg, IDC_PROP_BUTTON),FALSE); EnableWindow(GetDlgItem(hwndDlg, IDC_SET_DEFAULT),FALSE); @@ -213,9 +213,9 @@ case WM_COMMAND: switch (LOWORD(wParam)) { - case IDC_REMOVE_BUTTON: - DeleteLayout(); - break; + case IDC_REMOVE_BUTTON: + DeleteLayout(); + break; case IDC_KEY_SET_BTN: DialogBox(hApplet,

1 0

[dchapyshev] 33048: - Implement "Add keyboard layout" dialog - Other small changes
by dchapyshev＠svn.reactos.org 20 Apr '08

20 Apr '08

Author: dchapyshev Date: Sun Apr 20 02:34:59 2008 New Revision: 33048 URL: http://svn.reactos.org/svn/reactos?rev=33048&view=rev Log: - Implement "Add keyboard layout" dialog - Other small changes Modified: trunk/reactos/dll/cpl/input/add.c trunk/reactos/dll/cpl/input/input.c trunk/reactos/dll/cpl/input/input.h trunk/reactos/dll/cpl/input/inputlangprop.c trunk/reactos/dll/cpl/input/keysettings.c trunk/reactos/dll/cpl/input/settings.c Modified: trunk/reactos/dll/cpl/input/add.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/add.c?rev=33… ============================================================================== --- trunk/reactos/dll/cpl/input/add.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/input/add.c [iso-8859-1] Sun Apr 20 02:34:59 2008 @@ -4,6 +4,7 @@ * FILE: dll/win32/input/add.c * PURPOSE: input.dll * PROGRAMMER: Dmitry Chapyshev (dmitry(a)reactos.org) + * Colin Finck * UPDATE HISTORY: * 06-09-2007 Created */ @@ -38,73 +39,77 @@ static VOID AddNewLayout(HWND hwndDlg) { - TCHAR Lang[MAX_PATH], LangID[MAX_PATH], LayoutID[MAX_PATH]; - INT iLang, iLayout; - LCID Lcid; - - iLang = SendMessage(hLangList, CB_GETCURSEL, 0, 0); - iLayout = SendMessage(hLayoutList, CB_GETCURSEL, 0, 0); - - if ((iLang == CB_ERR) || (iLayout == CB_ERR)) return; - - Lcid = (LCID) SendMessage(hLangList, CB_GETITEMDATA, iLang, 0); - GetLocaleInfo(MAKELCID(Lcid, SORT_DEFAULT), LOCALE_ILANGUAGE, (WORD*)Lang, sizeof(Lang)); - _stprintf(LangID, _T("0000%s"), Lang); - - _tcscpy(LayoutID, (LPTSTR)SendMessage(hLayoutList, CB_GETITEMDATA, iLayout, 0)); - - if (_tcscmp(LangID, LayoutID) == 0) - { - MessageBox(0, L"", L"", MB_OK); - HKEY hKey; - - if (RegOpenKeyEx(HKEY_CURRENT_USER, _T("Keyboard Layout\\Preload"), 0, KEY_WRITE, &hKey)) - { - - } - } + TCHAR NewLayout[3]; + INT iLayout; + HKEY hKey; + DWORD cValues; + PTSTR pts; + + iLayout = SendMessage(hLayoutList, CB_GETCURSEL, 0, 0); + if (iLayout == CB_ERR) return; + + if (RegOpenKey(HKEY_CURRENT_USER, _T("Keyboard Layout\\Preload"), &hKey) == ERROR_SUCCESS) + { + if (RegQueryInfoKey(hKey, NULL, NULL, NULL, NULL, NULL, NULL, &cValues, NULL, NULL, NULL, NULL) == ERROR_SUCCESS) + { + _stprintf(NewLayout, _T("%d"), cValues + 1); + + pts = (PTSTR) SendMessage(hLayoutList, CB_GETITEMDATA, iLayout, 0); + + if (RegSetValueEx(hKey, + NewLayout, + 0, + REG_SZ, + (LPBYTE)pts, + (DWORD)(_tcslen(pts)*sizeof(PTSTR))) == ERROR_SUCCESS) + { + UpdateLayoutsList(); + } + } + } } VOID CreateKeyboardLayoutList(VOID) { HKEY hKey, hSubKey; - TCHAR szBuf[MAX_PATH], KeyName[MAX_PATH]; + PTSTR pstrBuf; + TCHAR szBuf[CCH_LAYOUT_ID + 1], KeyName[MAX_PATH]; LONG Ret; DWORD dwIndex = 0; if (RegOpenKey(HKEY_LOCAL_MACHINE, _T("System\\CurrentControlSet\\Control\\Keyboard Layouts"), &hKey) == ERROR_SUCCESS) { Ret = RegEnumKey(hKey, dwIndex, szBuf, sizeof(szBuf) / sizeof(TCHAR)); - if (Ret == ERROR_SUCCESS) - { - while (Ret == ERROR_SUCCESS) + + while (Ret == ERROR_SUCCESS) + { + _stprintf(KeyName, _T("System\\CurrentControlSet\\Control\\Keyboard Layouts\\%s"), szBuf); + + if (RegOpenKey(HKEY_LOCAL_MACHINE, KeyName, &hSubKey) == ERROR_SUCCESS) { - _stprintf(KeyName, _T("System\\CurrentControlSet\\Control\\Keyboard Layouts\\%s"), szBuf); - if (RegOpenKey(HKEY_LOCAL_MACHINE, KeyName, &hSubKey) == ERROR_SUCCESS) - { - DWORD Length = MAX_PATH; - - if (RegQueryValueEx(hSubKey, _T("Layout Text"), NULL, NULL, (LPBYTE)KeyName, &Length) == ERROR_SUCCESS) + DWORD Length = MAX_PATH; + + if (RegQueryValueEx(hSubKey, _T("Layout Text"), NULL, NULL, (LPBYTE)KeyName, &Length) == ERROR_SUCCESS) + { + INT iIndex = (INT) SendMessage(hLayoutList, CB_ADDSTRING, 0, (LPARAM)KeyName); + + pstrBuf = (PTSTR)HeapAlloc(hProcessHeap, 0, (CCH_LAYOUT_ID + 1) * sizeof(TCHAR)); + _tcscpy(pstrBuf, szBuf); + SendMessage(hLayoutList, CB_SETITEMDATA, iIndex, (LPARAM)pstrBuf); + + // FIXME! + if (_tcscmp(szBuf, _T("00000409")) == 0) { - UINT iIndex; - iIndex = (UINT) SendMessage(hLayoutList, CB_ADDSTRING, 0, (LPARAM)KeyName); - - SendMessage(hLayoutList, CB_SETITEMDATA, iIndex, (LPARAM)szBuf); - - // FIXME! - if (_tcscmp(szBuf, _T("00000409")) == 0) - { - SendMessage(hLayoutList, CB_SELECTSTRING, (WPARAM) -1, (LPARAM)KeyName); - } - - dwIndex++; - Ret = RegEnumKey(hKey, dwIndex, szBuf, sizeof(szBuf) / sizeof(TCHAR)); + SendMessage(hLayoutList, CB_SETCURSEL, (WPARAM)iIndex, (LPARAM)0); } - } - - RegCloseKey(hSubKey); + + dwIndex++; + Ret = RegEnumKey(hKey, dwIndex, szBuf, sizeof(szBuf) / sizeof(TCHAR)); + } } + + RegCloseKey(hSubKey); } } @@ -180,11 +185,19 @@ case IDCANCEL: { EndDialog(hDlg, LOWORD(wParam)); - return TRUE; } } } break; + + case WM_DESTROY: + { + INT iCount; + + for(iCount = SendMessage(hLayoutList, CB_GETCOUNT, 0, 0); --iCount >= 0;) + HeapFree(hProcessHeap, 0, (LPVOID)SendMessage(hLayoutList, CB_GETITEMDATA, iCount, 0)); + } + break; } return FALSE; Modified: trunk/reactos/dll/cpl/input/input.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/input.c?rev=… ============================================================================== --- trunk/reactos/dll/cpl/input/input.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/input/input.c [iso-8859-1] Sun Apr 20 02:34:59 2008 @@ -1,27 +1,10 @@ -/* - * ReactOS - * Copyright (C) 2007 ReactOS Team - * - * 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., 675 Mass Ave, Cambridge, MA 02139, USA. - */ /* * * PROJECT: input.dll * FILE: dll/win32/input/input.c * PURPOSE: input.dll * PROGRAMMER: Dmitry Chapyshev (lentind(a)yandex.ru) + * Colin Finck * UPDATE HISTORY: * 06-09-2007 Created */ @@ -33,6 +16,7 @@ LONG CALLBACK SystemApplet(VOID); HINSTANCE hApplet = 0; +HANDLE hProcessHeap; /* Applets */ APPLET Applets[NUM_APPLETS] = @@ -127,6 +111,7 @@ case DLL_PROCESS_ATTACH: case DLL_THREAD_ATTACH: hApplet = hinstDLL; + hProcessHeap = GetProcessHeap(); break; } Modified: trunk/reactos/dll/cpl/input/input.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/input.h?rev=… ============================================================================== --- trunk/reactos/dll/cpl/input/input.h [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/input/input.h [iso-8859-1] Sun Apr 20 02:34:59 2008 @@ -22,6 +22,10 @@ } APPLET, *PAPPLET; extern HINSTANCE hApplet; +extern HANDLE hProcessHeap; + +// Character Count of a layout ID like "00000409" +#define CCH_LAYOUT_ID 8 /* input.c */ VOID @@ -32,6 +36,8 @@ SettingPageProc(HWND hwndDlg,UINT uMsg,WPARAM wParam,LPARAM lParam); BOOL GetLayoutName(LPCTSTR lcid, LPTSTR name); +VOID +UpdateLayoutsList(VOID); /* keysettings.c */ INT_PTR CALLBACK Modified: trunk/reactos/dll/cpl/input/inputlangprop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/inputlangpro… ============================================================================== --- trunk/reactos/dll/cpl/input/inputlangprop.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/input/inputlangprop.c [iso-8859-1] Sun Apr 20 02:34:59 2008 @@ -1,27 +1,10 @@ -/* - * ReactOS - * Copyright (C) 2007 ReactOS Team - * - * 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., 675 Mass Ave, Cambridge, MA 02139, USA. - */ /* * * PROJECT: input.dll * FILE: dll/win32/input/inputlangprop.c * PURPOSE: input.dll * PROGRAMMER: Dmitry Chapyshev (lentind(a)yandex.ru) + * Colin Finck * UPDATE HISTORY: * 06-09-2007 Created */ Modified: trunk/reactos/dll/cpl/input/keysettings.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/keysettings.… ============================================================================== --- trunk/reactos/dll/cpl/input/keysettings.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/input/keysettings.c [iso-8859-1] Sun Apr 20 02:34:59 2008 @@ -1,27 +1,10 @@ -/* - * ReactOS - * Copyright (C) 2007 ReactOS Team - * - * 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., 675 Mass Ave, Cambridge, MA 02139, USA. - */ /* * * PROJECT: input.dll * FILE: dll/win32/input/keysettings.c * PURPOSE: input.dll * PROGRAMMER: Dmitry Chapyshev (lentind(a)yandex.ru) + * Colin Finck * UPDATE HISTORY: * 06-09-2007 Created */ Modified: trunk/reactos/dll/cpl/input/settings.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/settings.c?r… ============================================================================== --- trunk/reactos/dll/cpl/input/settings.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/input/settings.c [iso-8859-1] Sun Apr 20 02:34:59 2008 @@ -4,6 +4,7 @@ * FILE: dll/win32/input/settings.c * PURPOSE: input.dll * PROGRAMMER: Dmitry Chapyshev (dmitry(a)reactos.org) + * Colin Finck * UPDATE HISTORY: * 06-09-2007 Created */ @@ -12,6 +13,8 @@ #include "input.h" #define BUFSIZE 256 + +static HWND MainDlgWnd; typedef struct { @@ -81,13 +84,11 @@ HKEY hKey, hSubKey; TCHAR szBuf[MAX_PATH], szPreload[MAX_PATH], szSub[MAX_PATH]; LAYOUT_ITEM lItem; - AddListColumn(hWnd); LONG Ret; DWORD dwIndex = 0, dwType, dwSize; LV_ITEM item; HWND hList = GetDlgItem(hWnd, IDC_KEYLAYOUT_LIST); - - (VOID) ListView_SetExtendedListViewStyle(hList, LVS_EX_FULLROWSELECT); + INT i; if (RegOpenKeyEx(HKEY_CURRENT_USER, _T("Keyboard Layout\\Preload"), 0, KEY_QUERY_VALUE, &hKey) == ERROR_SUCCESS) @@ -142,7 +143,7 @@ item.pszText = lItem.IndName; item.lParam = (LPARAM)&lItem; item.iItem = (INT) dwIndex; - INT i = ListView_InsertItem(hList, &item); + i = ListView_InsertItem(hList, &item); ListView_SetItemText(hList, i, 1, lItem.LangName); ListView_SetItemText(hList, i, 2, lItem.LayoutName); @@ -163,6 +164,25 @@ return TRUE; } +VOID +UpdateLayoutsList(VOID) +{ + (VOID) ListView_DeleteAllItems(GetDlgItem(MainDlgWnd, IDC_KEYLAYOUT_LIST)); + InitLangList(MainDlgWnd); +} + +static VOID +DeleteLayout(VOID) +{ + INT iIndex; + + iIndex = (INT) SendMessage(GetDlgItem(MainDlgWnd, IDC_KEYLAYOUT_LIST), LVM_GETNEXTITEM, -1, LVNI_FOCUSED); + if (iIndex != -1) + { + MessageBox(0, _T("Not implemented!"), NULL, MB_OK); + } +} + /* Property page dialog callback */ INT_PTR CALLBACK SettingPageProc(HWND hwndDlg,UINT uMsg,WPARAM wParam,LPARAM lParam) @@ -173,6 +193,10 @@ { case WM_INITDIALOG: { + MainDlgWnd = hwndDlg; + AddListColumn(hwndDlg); + (VOID) ListView_SetExtendedListViewStyle(GetDlgItem(MainDlgWnd, IDC_KEYLAYOUT_LIST), + LVS_EX_FULLROWSELECT); InitLangList(hwndDlg); EnableWindow(GetDlgItem(hwndDlg, IDC_PROP_BUTTON),FALSE); EnableWindow(GetDlgItem(hwndDlg, IDC_SET_DEFAULT),FALSE); @@ -189,6 +213,10 @@ case WM_COMMAND: switch (LOWORD(wParam)) { + case IDC_REMOVE_BUTTON: + DeleteLayout(); + break; + case IDC_KEY_SET_BTN: DialogBox(hApplet, MAKEINTRESOURCE(IDD_KEYSETTINGS),

1 0

[dchapyshev] 33047: - Fix typo
by dchapyshev＠svn.reactos.org 20 Apr '08

20 Apr '08

Author: dchapyshev Date: Sun Apr 20 02:32:38 2008 New Revision: 33047 URL: http://svn.reactos.org/svn/reactos?rev=33047&view=rev Log: - Fix typo Modified: trunk/reactos/dll/keyboard/kbdal/kbdal.c Modified: trunk/reactos/dll/keyboard/kbdal/kbdal.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdal/kbdal.c… ============================================================================== --- trunk/reactos/dll/keyboard/kbdal/kbdal.c [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdal/kbdal.c [iso-8859-1] Sun Apr 20 02:32:38 2008 @@ -1,5 +1,5 @@ /* - * ReactOS Russian Albanian Keyboard layout + * ReactOS Albanian Keyboard layout * Copyright (C) 2008 ReactOS * Author: Dmitry Chapyshev * License: LGPL, see: LGPL.txt

1 0

[greatlrd] 33046: sorry did commit a file that should not be commit, it is my local changes for testing dx.
by greatlrd＠svn.reactos.org 20 Apr '08

20 Apr '08

Author: greatlrd Date: Sun Apr 20 02:22:36 2008 New Revision: 33046 URL: http://svn.reactos.org/svn/reactos?rev=33046&view=rev Log: sorry did commit a file that should not be commit, it is my local changes for testing dx. 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 Apr 20 02:22:36 2008 @@ -125,8 +125,7 @@ dll\directx\dplayx\dplayx.dll 1 dll\directx\dsound\dsound.dll 1 dll\directx\dxdiagn\dxdiagn.dll 1 -windows\ddraw.dll 1 -windows\dciman32.dll 1 +dll\directx\ddraw\ddraw.dll 1 dll\directx\d3d8thk\d3d8thk.dll 1 dll\directx\devenum\devenum.dll 1 dll\directx\ksproxy\ksproxy.ax 1 @@ -308,9 +307,9 @@ drivers\bus\isapnp\isapnp.sys 2 -windows\dxapi.sys 2 -windows\dxg.sys 2 -windows\dxgthk.sys 2 +drivers\directx\dxapi\dxapi.sys 2 +drivers\directx\dxg\dxg.sys 2 +drivers\directx\dxgthk\dxgthk.sys 2 drivers\filesystems\fs_rec\fs_rec.sys 2 drivers\filesystems\msfs\msfs.sys 2 @@ -606,17 +605,6 @@ modules\rostests\winetests\uxtheme\uxtheme_winetest.exe 7 optional modules\rostests\winetests\version\version_winetest.exe 7 optional modules\rostests\winetests\wininet\wininet_winetest.exe 7 optional - -modules\rostests\dxtest\ddraw_test\ddraw_test.exe 7 optional -modules\rostests\dxtest\win32kdxtest\win32kdxtest.exe 7 optional - -modules\rostests\apitests\gdi32api\gdi32api.exe 7 optional - -modules\rostests\apitests\user32api\user32api.exe 7 optional -modules\rostests\apitests\w32knapi\w32knapi.exe 7 optional -modules\rostests\apitests\w32kdll\w32kdll_ros\w32kdll.dll 7 optional - - modules\wallpaper\lake.bmp 4 optional ; Native libraries

1 0

← Newer
1
...
12
13
14
15
16
17
18
...
40
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 April 2008