Ros-diffs May 2008

ros-diffs@reactos.org

25 participants
586 discussions

[gbrunmar] 33347: * Fixed an error in IDirect3DDevice9::GetDisplayMode() spotted by Steven Edwards * Renamed an internal D3D9 struct variable * Re-implemented IDirect3DDevice9::GetAvailableTextureMem(), hopefully more correct this time around
by gbrunmar＠svn.reactos.org 07 May '08

07 May '08

Author: gbrunmar Date: Wed May 7 13:00:50 2008 New Revision: 33347 URL: http://svn.reactos.org/svn/reactos?rev=33347&view=rev Log: * Fixed an error in IDirect3DDevice9::GetDisplayMode() spotted by Steven Edwards * Renamed an internal D3D9 struct variable * Re-implemented IDirect3DDevice9::GetAvailableTextureMem(), hopefully more correct this time around Modified: trunk/reactos/dll/directx/d3d9/d3d9_caps.c trunk/reactos/dll/directx/d3d9/d3d9_device.c trunk/reactos/dll/directx/d3d9/d3d9_private.h Modified: trunk/reactos/dll/directx/d3d9/d3d9_caps.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/d3d9_caps… ============================================================================== --- trunk/reactos/dll/directx/d3d9/d3d9_caps.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/d3d9/d3d9_caps.c [iso-8859-1] Wed May 7 13:00:50 2008 @@ -90,8 +90,8 @@ return; } - pUnknown6BC->hDD = OsThunkDdCreateDirectDrawObject(hDC); - if (0 == pUnknown6BC->hDD) + pUnknown6BC->hDirectDrawLocal = OsThunkDdCreateDirectDrawObject(hDC); + if (0 == pUnknown6BC->hDirectDrawLocal) { HeapFree(GetProcessHeap(), 0, pUnknown6BC); return; @@ -116,7 +116,7 @@ static void ReleaseInternalDeviceData(LPD3D9_DEVICEDATA pDeviceData) { - OsThunkDdDeleteDirectDrawObject(pDeviceData->pUnknown6BC->hDD); + OsThunkDdDeleteDirectDrawObject(pDeviceData->pUnknown6BC->hDirectDrawLocal); HeapFree(GetProcessHeap(), 0, pDeviceData->pUnknown6BC); pDeviceData->pUnknown6BC = NULL; @@ -302,7 +302,7 @@ BOOL bDisplayModeWasChanged; /* Try the real way first */ - if (TRUE == OsThunkDdReenableDirectDrawObject(pUnknown->hDD, &bDisplayModeWasChanged)) + if (TRUE == OsThunkDdReenableDirectDrawObject(pUnknown->hDirectDrawLocal, &bDisplayModeWasChanged)) return TRUE; /* Ref types and software types can always be reenabled after a mode switch */ @@ -384,7 +384,7 @@ bRet = OsThunkDdQueryDirectDrawObject( - pUnknown6BC->hDD, + pUnknown6BC->hDirectDrawLocal, &HalInfo, CallBackFlags, &D3dCallbacks, @@ -407,7 +407,7 @@ puD3dTextureFormats != NULL) { bRet = OsThunkDdQueryDirectDrawObject( - pUnknown6BC->hDD, + pUnknown6BC->hDirectDrawLocal, &HalInfo, CallBackFlags, &D3dCallbacks, @@ -447,7 +447,7 @@ DxVersion.dwDXVersion = dwDXVersion; PrepareDriverInfoData(&DrvInfo, &DxVersion, sizeof(DxVersion)); - OsThunkDdGetDriverInfo((HANDLE)pUnknown6BC->hDD, &DrvInfo); + OsThunkDdGetDriverInfo(pUnknown6BC->hDirectDrawLocal, &DrvInfo); } @@ -455,7 +455,7 @@ { ResetGetDriverInfo2Data(&DdiVersion.gdi2, D3DGDI2_TYPE_GETDDIVERSION, sizeof(DD_GETDDIVERSIONDATA)); PrepareDriverInfoData(&DrvInfo, &DdiVersion, sizeof(DdiVersion)); - bRet = OsThunkDdGetDriverInfo((HANDLE)pUnknown6BC->hDD, &DrvInfo); + bRet = OsThunkDdGetDriverInfo(pUnknown6BC->hDirectDrawLocal, &DrvInfo); if (DdiVersion.dwDDIVersion != DX9_DDI_VERSION) { @@ -492,7 +492,7 @@ ResetGetDriverInfo2Data((DD_GETDRIVERINFO2DATA*)&DriverCaps8, D3DGDI2_TYPE_GETD3DCAPS8, sizeof(D3DCAPS8)); PrepareDriverInfoData(&DrvInfo, &DriverCaps8, sizeof(D3DCAPS8)); - if (FALSE == OsThunkDdGetDriverInfo((HANDLE)pUnknown6BC->hDD, &DrvInfo) || + if (FALSE == OsThunkDdGetDriverInfo(pUnknown6BC->hDirectDrawLocal, &DrvInfo) || S_OK != DrvInfo.ddRVal || DrvInfo.dwActualSize != sizeof(D3DCAPS8)) { @@ -515,7 +515,7 @@ ResetGetDriverInfo2Data((DD_GETDRIVERINFO2DATA*)&DriverCaps9, D3DGDI2_TYPE_GETD3DCAPS9, sizeof(D3DCAPS9)); PrepareDriverInfoData(&DrvInfo, &DriverCaps9, sizeof(D3DCAPS9)); - if (FALSE == OsThunkDdGetDriverInfo((HANDLE)pUnknown6BC->hDD, &DrvInfo) || + if (FALSE == OsThunkDdGetDriverInfo(pUnknown6BC->hDirectDrawLocal, &DrvInfo) || S_OK != DrvInfo.ddRVal || DrvInfo.dwActualSize != sizeof(D3DCAPS9)) { @@ -536,7 +536,7 @@ FormatCountData.dwFormatCount = UINT_MAX; FormatCountData.dwReserved = dwDXVersion; - if (TRUE == OsThunkDdGetDriverInfo((HANDLE)pUnknown6BC->hDD, &DrvInfo)) + if (TRUE == OsThunkDdGetDriverInfo(pUnknown6BC->hDirectDrawLocal, &DrvInfo)) { if (DrvInfo.ddRVal != S_OK) { @@ -570,7 +570,7 @@ PrepareDriverInfoData(&DrvInfo, &FormatData, sizeof(DD_GETFORMATDATA)); FormatData.dwFormatIndex = FormatIndex; - if (TRUE == OsThunkDdGetDriverInfo((HANDLE)pUnknown6BC->hDD, &DrvInfo)) + if (TRUE == OsThunkDdGetDriverInfo(pUnknown6BC->hDirectDrawLocal, &DrvInfo)) { if (DrvInfo.ddRVal != S_OK) { @@ -612,7 +612,7 @@ ExModeCountData.dwModeCount = UINT_MAX; ExModeCountData.dwReserved = dwDXVersion; - if (TRUE == OsThunkDdGetDriverInfo((HANDLE)pUnknown6BC->hDD, &DrvInfo)) + if (TRUE == OsThunkDdGetDriverInfo(pUnknown6BC->hDirectDrawLocal, &DrvInfo)) { if (DrvInfo.ddRVal == S_OK) { @@ -649,7 +649,7 @@ ExModeData.dwModeIndex = ModeIndex; ExModeData.mode.Width = UINT_MAX; - if (TRUE == OsThunkDdGetDriverInfo((HANDLE)pUnknown6BC->hDD, &DrvInfo)) + if (TRUE == OsThunkDdGetDriverInfo(pUnknown6BC->hDirectDrawLocal, &DrvInfo)) { if (DrvInfo.ddRVal != S_OK) { @@ -680,7 +680,7 @@ PrepareDriverInfoData(&DrvInfo, &AdapterGroupData, sizeof(DD_GETADAPTERGROUPDATA)); AdapterGroupData.ulUniqueAdapterGroupId = UINT_MAX; - if (TRUE == OsThunkDdGetDriverInfo((HANDLE)pUnknown6BC->hDD, &DrvInfo)) + if (TRUE == OsThunkDdGetDriverInfo(pUnknown6BC->hDirectDrawLocal, &DrvInfo)) { if (DrvInfo.ddRVal != S_OK) { @@ -708,7 +708,7 @@ PrepareDriverInfoData(&DrvInfo, &D3dQueryCountData, sizeof(DD_GETD3DQUERYCOUNTDATA)); D3dQueryCountData.dwNumQueries = UINT_MAX; - if (TRUE == OsThunkDdGetDriverInfo((HANDLE)pUnknown6BC->hDD, &DrvInfo)) + if (TRUE == OsThunkDdGetDriverInfo(pUnknown6BC->hDirectDrawLocal, &DrvInfo)) { if (DrvInfo.ddRVal != S_OK) { @@ -742,7 +742,7 @@ PrepareDriverInfoData(&DrvInfo, &D3dQueryData, sizeof(DD_GETD3DQUERYDATA)); D3dQueryData.dwQueryIndex = QueryIndex; - if (TRUE == OsThunkDdGetDriverInfo((HANDLE)pUnknown6BC->hDD, &DrvInfo)) + if (TRUE == OsThunkDdGetDriverInfo(pUnknown6BC->hDirectDrawLocal, &DrvInfo)) { if (DrvInfo.ddRVal != S_OK) { @@ -773,7 +773,7 @@ DrvInfo.guidInfo = GUID_D3DExtendedCaps; DrvInfo.dwExpectedSize = sizeof(D3DHAL_D3DEXTENDEDCAPS); DrvInfo.lpvData = pD3dExtendedCaps; - bRet = OsThunkDdGetDriverInfo((HANDLE)pUnknown6BC->hDD, &DrvInfo); + bRet = OsThunkDdGetDriverInfo(pUnknown6BC->hDirectDrawLocal, &DrvInfo); if (TRUE != bRet || DrvInfo.ddRVal != S_OK) { @@ -790,7 +790,7 @@ DrvInfo.guidInfo = GUID_ZPixelFormats; DrvInfo.dwExpectedSize = FormatCountData.dwFormatCount * sizeof(DDPIXELFORMAT); DrvInfo.lpvData = pZPixelFormats; - bRet = OsThunkDdGetDriverInfo((HANDLE)pUnknown6BC->hDD, &DrvInfo); + bRet = OsThunkDdGetDriverInfo(pUnknown6BC->hDirectDrawLocal, &DrvInfo); if (TRUE != bRet || DrvInfo.ddRVal != S_OK) { Modified: trunk/reactos/dll/directx/d3d9/d3d9_device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/d3d9_devi… ============================================================================== --- trunk/reactos/dll/directx/d3d9/d3d9_device.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/d3d9/d3d9_device.c [iso-8859-1] Wed May 7 13:00:50 2008 @@ -88,22 +88,19 @@ static UINT WINAPI IDirect3DDevice9Impl_GetAvailableTextureMem(LPDIRECT3DDEVICE9 iface) { UINT AvailableTextureMemory = 0; - DDHAL_GETAVAILDRIVERMEMORYDATA ddGetAvailDriverMemoryData; + D3D9_GETAVAILDRIVERMEMORYDATA d3d9GetAvailDriverMemoryData; LPDIRECT3DDEVICE9_INT This = impl_from_IDirect3DDevice9(iface); LOCK_D3DDEVICE9(); - memset(&ddGetAvailDriverMemoryData, 0, sizeof(ddGetAvailDriverMemoryData)); - ddGetAvailDriverMemoryData.lpDD = (LPDDRAWI_DIRECTDRAW_GBL)&This->DeviceData[0].pUnknown6BC->hDD; - ddGetAvailDriverMemoryData.ddRVal = DDERR_GENERIC; - - if (DDHAL_DRIVER_HANDLED == (*This->DeviceData[0].D3D9Callbacks.DdGetAvailDriverMemory)(&ddGetAvailDriverMemoryData)) + memset(&d3d9GetAvailDriverMemoryData, 0, sizeof(d3d9GetAvailDriverMemoryData)); + d3d9GetAvailDriverMemoryData.pUnknown6BC = This->DeviceData[0].pUnknown6BC; + d3d9GetAvailDriverMemoryData.dwMemoryType = D3D9_GETAVAILDRIVERMEMORY_TYPE_ALL; + + if (TRUE == (*This->DeviceData[0].D3D9Callbacks.DdGetAvailDriverMemory)(&d3d9GetAvailDriverMemoryData)) { - if (DD_OK == ddGetAvailDriverMemoryData.ddRVal) - { - /* Round it up to the nearest MB */ - AvailableTextureMemory = (ddGetAvailDriverMemoryData.dwFree + 0x80000) & 0xFFF00000; - } + /* Round it up to the nearest MB */ + AvailableTextureMemory = (d3d9GetAvailDriverMemoryData.dwFree + 0x80000) & 0xFFF00000; } UNLOCK_D3DDEVICE9(); @@ -226,7 +223,7 @@ return D3DERR_INVALIDCALL; } - if (IsBadWritePtr(pMode, sizeof(D3DDISPLAYMODE*))) + if (IsBadWritePtr(pMode, sizeof(D3DDISPLAYMODE))) { DPRINT1("Invalid pMode parameter specified"); UNLOCK_D3DDEVICE9(); Modified: trunk/reactos/dll/directx/d3d9/d3d9_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/d3d9_priv… ============================================================================== --- trunk/reactos/dll/directx/d3d9/d3d9_private.h [iso-8859-1] (original) +++ trunk/reactos/dll/directx/d3d9/d3d9_private.h [iso-8859-1] Wed May 7 13:00:50 2008 @@ -10,16 +10,31 @@ #include <windows.h> #include <ddraw.h> -#include <ddrawi.h> #define D3D9_INT_MAX_NUM_ADAPTERS 12 #define D3D9_INT_D3DCAPS8_VALID 1 #define D3D9_INT_D3DCAPS9_VALID 2 +typedef enum _D3D9_GETAVAILDRIVERMEMORY_TYPE +{ + D3D9_GETAVAILDRIVERMEMORY_TYPE_ALL = 0, + D3D9_GETAVAILDRIVERMEMORY_TYPE_LOCAL = 4, + D3D9_GETAVAILDRIVERMEMORY_TYPE_NONLOCAL = 5, +} D3D9_GETAVAILDRIVERMEMORY_TYPE; + +typedef struct _D3D9_GETAVAILDRIVERMEMORYDATA +{ +/* 0x0000 */ struct _D3D9Unknown6BC_* pUnknown6BC; +/* 0x0004 */ D3D9_GETAVAILDRIVERMEMORY_TYPE dwMemoryType; +/* 0x0008 */ DWORD dwTextureType; +/* 0x000c */ DWORD dwFree; +} D3D9_GETAVAILDRIVERMEMORYDATA, FAR* LPD3D9_GETAVAILDRIVERMEMORYDATA; +typedef BOOL (WINAPI FAR* LPD3D9_GETAVAILDRIVERMEMORY)(LPD3D9_GETAVAILDRIVERMEMORYDATA); + typedef struct _D3D9Unknown6BC_ { -/* 0x0000 */ HANDLE hDD; +/* 0x0000 */ HANDLE hDirectDrawLocal; /* 0x0004 */ LPDWORD pUnknown0004; /* 0x0008 */ DWORD dwUnknown0008; /* 0x000c */ CHAR szDeviceName[CCHDEVICENAME]; @@ -108,7 +123,7 @@ /* 0x0044 */ DWORD DdFlip; /* 0x0048 */ DWORD DdGetBltStatus; /* 0x004c */ DWORD DdGetFlipStatus; -/* 0x0050 */ LPDDHAL_GETAVAILDRIVERMEMORY DdGetAvailDriverMemory; +/* 0x0050 */ LPD3D9_GETAVAILDRIVERMEMORY DdGetAvailDriverMemory; /* 0x0054 */ DWORD unknown0115; /* 0x0058 */ DWORD DdSetMode; /* 0x005c */ DWORD DdSetExclusiveMode;

1 0

[dchapyshev] 33346: - Small fix modifier_bits structure
by dchapyshev＠svn.reactos.org 07 May '08

07 May '08

Author: dchapyshev Date: Wed May 7 12:22:47 2008 New Revision: 33346 URL: http://svn.reactos.org/svn/reactos?rev=33346&view=rev Log: - Small fix modifier_bits structure Modified: trunk/reactos/dll/keyboard/kbdal/kbdal.c trunk/reactos/dll/keyboard/kbdic/kbdic.c trunk/reactos/dll/keyboard/kbdru1/kbdru1.c trunk/reactos/dll/keyboard/kbdusa/kbdusa.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] Wed May 7 12:22:47 2008 @@ -165,8 +165,8 @@ ROSDATA MODIFIERS modifier_bits = { modifier_keys, - 3, - { 0, 1, 2, 3, 0, 0, 0xC0 } /* Modifier bit order, NONE, SHIFT, CTRL, ALT, MENU, SHIFT + MENU, CTRL + MENU */ + 6, + { 0, 1, 3, 4, SHFT_INVALID, SHFT_INVALID, 2 } }; #define NOCAPS 0 Modified: trunk/reactos/dll/keyboard/kbdic/kbdic.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdic/kbdic.c… ============================================================================== --- trunk/reactos/dll/keyboard/kbdic/kbdic.c [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdic/kbdic.c [iso-8859-1] Wed May 7 12:22:47 2008 @@ -165,8 +165,8 @@ ROSDATA MODIFIERS modifier_bits = { modifier_keys, - 3, - { 0, 1, 2, 3, 0, 0, 0xC0 } /* Modifier bit order, NONE, SHIFT, CTRL, ALT, MENU, SHIFT + MENU, CTRL + MENU */ + 6, + { 0, 1, 3, 4, SHFT_INVALID, SHFT_INVALID, 2 } }; #define NOCAPS 0 Modified: trunk/reactos/dll/keyboard/kbdru1/kbdru1.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdru1/kbdru1… ============================================================================== --- trunk/reactos/dll/keyboard/kbdru1/kbdru1.c [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdru1/kbdru1.c [iso-8859-1] Wed May 7 12:22:47 2008 @@ -166,7 +166,7 @@ ROSDATA MODIFIERS modifier_bits = { modifier_keys, 3, - { 0, 1, 2, 3, 0, 0, 0xC0 } /* Modifier bit order, NONE, SHIFT, CTRL, ALT, MENU, SHIFT + MENU, CTRL + MENU */ + { 0, 1, 2, 3 } }; #define NOCAPS 0 Modified: trunk/reactos/dll/keyboard/kbdusa/kbdusa.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdusa/kbdusa… ============================================================================== --- trunk/reactos/dll/keyboard/kbdusa/kbdusa.c [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdusa/kbdusa.c [iso-8859-1] Wed May 7 12:22:47 2008 @@ -166,7 +166,7 @@ ROSDATA MODIFIERS modifier_bits = { modifier_keys, 3, - { 0, 1, 2, 3, 0, 0, 0xC0 } /* Modifier bit order, NONE, SHIFT, CTRL, ALT, MENU, SHIFT + MENU, CTRL + MENU */ + { 0, 1, 2, 3 } }; #define NOCAPS 0

1 0

[dchapyshev] 33345: - Adding shortcuts to kbswitch - Move regedit shortcut to "System Tools"
by dchapyshev＠svn.reactos.org 07 May '08

07 May '08

Author: dchapyshev Date: Wed May 7 11:45:30 2008 New Revision: 33345 URL: http://svn.reactos.org/svn/reactos?rev=33345&view=rev Log: - Adding shortcuts to kbswitch - Move regedit shortcut to "System Tools" Modified: trunk/reactos/dll/win32/syssetup/install.c trunk/reactos/dll/win32/syssetup/lang/bg-BG.rc trunk/reactos/dll/win32/syssetup/lang/cs-CZ.rc trunk/reactos/dll/win32/syssetup/lang/de-DE.rc trunk/reactos/dll/win32/syssetup/lang/el-GR.rc trunk/reactos/dll/win32/syssetup/lang/en-US.rc trunk/reactos/dll/win32/syssetup/lang/es-ES.rc trunk/reactos/dll/win32/syssetup/lang/fr-FR.rc trunk/reactos/dll/win32/syssetup/lang/hu-HU.rc trunk/reactos/dll/win32/syssetup/lang/id-ID.rc trunk/reactos/dll/win32/syssetup/lang/it-IT.rc trunk/reactos/dll/win32/syssetup/lang/ja-JP.rc trunk/reactos/dll/win32/syssetup/lang/nb-NO.rc trunk/reactos/dll/win32/syssetup/lang/nl-NL.rc trunk/reactos/dll/win32/syssetup/lang/pl-PL.rc trunk/reactos/dll/win32/syssetup/lang/ru-RU.rc trunk/reactos/dll/win32/syssetup/lang/sk-SK.rc trunk/reactos/dll/win32/syssetup/lang/uk-UA.rc trunk/reactos/dll/win32/syssetup/lang/zh-CN.rc trunk/reactos/dll/win32/syssetup/resource.h Modified: trunk/reactos/dll/win32/syssetup/install.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/install… ============================================================================== --- trunk/reactos/dll/win32/syssetup/install.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/install.c [iso-8859-1] Wed May 7 11:45:30 2008 @@ -741,6 +741,7 @@ /* Create desktop shortcuts */ CreateShortcut(CSIDL_DESKTOP, NULL, IDS_SHORT_CMD, _T("%SystemRoot%\\system32\\cmd.exe"), IDS_CMT_CMD, FALSE); + CreateShortcut(CSIDL_DESKTOP, NULL, IDS_SHORT_KBSWITCH, _T("%SystemRoot%\\system32\\kbswitch.exe"), IDS_CMT_KBSWITCH, FALSE); /* Create program startmenu shortcuts */ CreateShortcut(CSIDL_PROGRAMS, NULL, IDS_SHORT_EXPLORER, _T("%SystemRoot%\\explorer.exe"), IDS_CMT_EXPLORER, FALSE); @@ -756,7 +757,6 @@ CreateShortcut(CSIDL_PROGRAMS, szFolder, IDS_SHORT_CALC, _T("%SystemRoot%\\system32\\calc.exe"), IDS_CMT_CALC, FALSE); CreateShortcut(CSIDL_PROGRAMS, szFolder, IDS_SHORT_CMD, _T("%SystemRoot%\\system32\\cmd.exe"), IDS_CMT_CMD, FALSE); CreateShortcut(CSIDL_PROGRAMS, szFolder, IDS_SHORT_NOTEPAD, _T("%SystemRoot%\\system32\\notepad.exe"), IDS_CMT_NOTEPAD, FALSE); - CreateShortcut(CSIDL_PROGRAMS, szFolder, IDS_SHORT_REGEDIT, _T("%SystemRoot%\\regedit.exe"), IDS_CMT_REGEDIT, FALSE); CreateShortcut(CSIDL_PROGRAMS, szFolder, IDS_SHORT_WORDPAD, _T("%SystemRoot%\\system32\\wordpad.exe"), IDS_CMT_WORDPAD, FALSE); CreateShortcut(CSIDL_PROGRAMS, szFolder, IDS_SHORT_SNAP, _T("%SystemRoot%\\system32\\screenshot.exe"), IDS_CMT_SCREENSHOT, TRUE); CreateShortcut(CSIDL_PROGRAMS, szFolder, IDS_SHORT_RDESKTOP, _T("%SystemRoot%\\system32\\mstsc.exe"), IDS_CMT_RDESKTOP, FALSE); @@ -766,6 +766,8 @@ if (CreateShortcutFolder(CSIDL_PROGRAMS, IDS_SYS_TOOLS, szFolder, sizeof(szFolder)/sizeof(szFolder[0]))) { CreateShortcut(CSIDL_PROGRAMS, szFolder, IDS_SHORT_CHARMAP, _T("%SystemRoot%\\system32\\charmap.exe"), IDS_CMT_CHARMAP, FALSE); + CreateShortcut(CSIDL_PROGRAMS, szFolder, IDS_SHORT_KBSWITCH, _T("%SystemRoot%\\system32\\kbswitch.exe"), IDS_CMT_KBSWITCH, FALSE); + CreateShortcut(CSIDL_PROGRAMS, szFolder, IDS_SHORT_REGEDIT, _T("%SystemRoot%\\regedit.exe"), IDS_CMT_REGEDIT, FALSE); } /* Creacte Accessibility subfolder and fill if the exe is available */ Modified: trunk/reactos/dll/win32/syssetup/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/bg… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/bg-BG.rc [iso-8859-1] Wed May 7 11:45:30 2008 @@ -224,6 +224,7 @@ BEGIN IDS_SYS_TOOLS "Ñèòåìíè ñðåäñòâà" IDS_CMT_CHARMAP "Çíàêîâà òàáëèöà" + IDS_CMT_KBSWITCH "Keyboard Layout Switcher" END STRINGTABLE @@ -262,6 +263,7 @@ IDS_SHORT_CHARMAP "Çíàêîâà òàáëèöà.lnk" IDS_SHORT_MAGNIFY "Ëóïà.lnk" IDS_SHORT_RDESKTOP "Äàëå÷íà ðàáîòíà ïëîù.lnk" + IDS_SHORT_KBSWITCH "Keyboard Layout Switcher.lnk" END Modified: trunk/reactos/dll/win32/syssetup/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/cs… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/cs-CZ.rc [iso-8859-1] Wed May 7 11:45:30 2008 @@ -218,6 +218,7 @@ BEGIN IDS_SYS_TOOLS "System Tools" IDS_CMT_CHARMAP "CharMap" + IDS_CMT_KBSWITCH "Keyboard Layout Switcher" END @@ -257,6 +258,7 @@ IDS_SHORT_CHARMAP "CharMap.lnk" IDS_SHORT_MAGNIFY "Magnify.lnk" IDS_SHORT_RDESKTOP "Remote Desktop.lnk" + IDS_SHORT_KBSWITCH "Keyboard Layout Switcher.lnk" END STRINGTABLE Modified: trunk/reactos/dll/win32/syssetup/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/de… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/de-DE.rc [iso-8859-1] Wed May 7 11:45:30 2008 @@ -219,6 +219,7 @@ BEGIN IDS_SYS_TOOLS "Systemprogramme" IDS_CMT_CHARMAP "Zeichentabelle" + IDS_CMT_KBSWITCH "Keyboard Layout Switcher" END @@ -258,6 +259,7 @@ IDS_SHORT_CHARMAP "Zeichentabelle.lnk" IDS_SHORT_MAGNIFY "Bildschirmlupe.lnk" IDS_SHORT_RDESKTOP "Remote Desktop.lnk" + IDS_SHORT_KBSWITCH "Keyboard Layout Switcher.lnk" END STRINGTABLE Modified: trunk/reactos/dll/win32/syssetup/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/el… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/el-GR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/el-GR.rc [iso-8859-1] Wed May 7 11:45:30 2008 @@ -220,6 +220,7 @@ BEGIN IDS_SYS_TOOLS "Åñãáëåßá ÓõóôÞìáôïò" IDS_CMT_CHARMAP "Ðßíáêáò ×áñáêôÞñùí" + IDS_CMT_KBSWITCH "Keyboard Layout Switcher" END @@ -259,6 +260,7 @@ IDS_SHORT_CHARMAP "Ðßíáêáò ×áñáêôÞñùí.lnk" IDS_SHORT_MAGNIFY "Ìåãåèõíôéêüò öáêüò.lnk" IDS_SHORT_RDESKTOP "Óýíäåóç áðïìáêñõóìÝíçò åðéöÜíåéáò åñãáóßáò.lnk" + IDS_SHORT_KBSWITCH "Keyboard Layout Switcher.lnk" END STRINGTABLE Modified: trunk/reactos/dll/win32/syssetup/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/en… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/en-US.rc [iso-8859-1] Wed May 7 11:45:30 2008 @@ -220,6 +220,7 @@ BEGIN IDS_SYS_TOOLS "System Tools" IDS_CMT_CHARMAP "Character Map" + IDS_CMT_KBSWITCH "Keyboard Layout Switcher" END STRINGTABLE @@ -258,6 +259,7 @@ IDS_SHORT_CHARMAP "Character Map.lnk" IDS_SHORT_MAGNIFY "Magnify.lnk" IDS_SHORT_RDESKTOP "Remote Desktop.lnk" + IDS_SHORT_KBSWITCH "Keyboard Layout Switcher.lnk" END STRINGTABLE Modified: trunk/reactos/dll/win32/syssetup/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/es… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/es-ES.rc [iso-8859-1] Wed May 7 11:45:30 2008 @@ -228,6 +228,7 @@ BEGIN IDS_SYS_TOOLS "Herramientas del sistema" IDS_CMT_CHARMAP "Mapa de caracteres" + IDS_CMT_KBSWITCH "Keyboard Layout Switcher" END @@ -267,6 +268,7 @@ IDS_SHORT_CHARMAP "Mapa de caracteres.lnk" IDS_SHORT_MAGNIFY "Magnify.lnk" IDS_SHORT_RDESKTOP "Escritorio Remoto.lnk" + IDS_SHORT_KBSWITCH "Keyboard Layout Switcher.lnk" END STRINGTABLE Modified: trunk/reactos/dll/win32/syssetup/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/fr… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/fr-FR.rc [iso-8859-1] Wed May 7 11:45:30 2008 @@ -220,6 +220,7 @@ BEGIN IDS_SYS_TOOLS "Outils système" IDS_CMT_CHARMAP "Table des Caractères" + IDS_CMT_KBSWITCH "Keyboard Layout Switcher" END STRINGTABLE @@ -258,6 +259,7 @@ IDS_SHORT_CHARMAP "Table des Caractères.lnk" IDS_SHORT_MAGNIFY "Loupe.lnk" IDS_SHORT_RDESKTOP "Bureau Distant.lnk" + IDS_SHORT_KBSWITCH "Keyboard Layout Switcher.lnk" END STRINGTABLE Modified: trunk/reactos/dll/win32/syssetup/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/hu… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/hu-HU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/hu-HU.rc [iso-8859-1] Wed May 7 11:45:30 2008 @@ -232,6 +232,7 @@ BEGIN IDS_SYS_TOOLS "System Tools" IDS_CMT_CHARMAP "CharMap" + IDS_CMT_KBSWITCH "Keyboard Layout Switcher" END @@ -271,6 +272,7 @@ IDS_SHORT_CHARMAP "CharMap.lnk" IDS_SHORT_MAGNIFY "Magnify.lnk" IDS_SHORT_RDESKTOP "Remote Desktop.lnk" + IDS_SHORT_KBSWITCH "Keyboard Layout Switcher.lnk" END STRINGTABLE Modified: trunk/reactos/dll/win32/syssetup/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/id… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/id-ID.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/id-ID.rc [iso-8859-1] Wed May 7 11:45:30 2008 @@ -218,6 +218,7 @@ BEGIN IDS_SYS_TOOLS "System Tools" IDS_CMT_CHARMAP "CharMap" + IDS_CMT_KBSWITCH "Keyboard Layout Switcher" END STRINGTABLE @@ -256,6 +257,7 @@ IDS_SHORT_CHARMAP "CharMap.lnk" IDS_SHORT_MAGNIFY "Magnify.lnk" IDS_SHORT_RDESKTOP "Remote Desktop.lnk" + IDS_SHORT_KBSWITCH "Keyboard Layout Switcher.lnk" END STRINGTABLE Modified: trunk/reactos/dll/win32/syssetup/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/it… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/it-IT.rc [iso-8859-1] Wed May 7 11:45:30 2008 @@ -211,6 +211,7 @@ BEGIN IDS_SYS_TOOLS "Strumenti di sistema" IDS_CMT_CHARMAP "Mappa dei caratteri" + IDS_CMT_KBSWITCH "Keyboard Layout Switcher" END STRINGTABLE @@ -249,6 +250,7 @@ IDS_SHORT_CHARMAP "CharMap.lnk" IDS_SHORT_MAGNIFY "Magnify.lnk" IDS_SHORT_RDESKTOP "Remote Desktop.lnk" + IDS_SHORT_KBSWITCH "Keyboard Layout Switcher.lnk" END STRINGTABLE Modified: trunk/reactos/dll/win32/syssetup/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/ja… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/ja-JP.rc [iso-8859-1] Wed May 7 11:45:30 2008 @@ -220,6 +220,7 @@ BEGIN IDS_SYS_TOOLS "System Tools" IDS_CMT_CHARMAP "CharMap" + IDS_CMT_KBSWITCH "Keyboard Layout Switcher" END STRINGTABLE @@ -258,6 +259,7 @@ IDS_SHORT_CHARMAP "CharMap.lnk" IDS_SHORT_MAGNIFY "Magnify.lnk" IDS_SHORT_RDESKTOP "Remote Desktop.lnk" + IDS_SHORT_KBSWITCH "Keyboard Layout Switcher.lnk" END STRINGTABLE Modified: trunk/reactos/dll/win32/syssetup/lang/nb-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/nb… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/nb-NO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/nb-NO.rc [iso-8859-1] Wed May 7 11:45:30 2008 @@ -223,6 +223,7 @@ BEGIN IDS_SYS_TOOLS "System Tools" IDS_CMT_CHARMAP "CharMap" + IDS_CMT_KBSWITCH "Keyboard Layout Switcher" END STRINGTABLE @@ -261,6 +262,7 @@ IDS_SHORT_CHARMAP "CharMap.lnk" IDS_SHORT_MAGNIFY "Magnify.lnk" IDS_SHORT_RDESKTOP "Remote Desktop.lnk" + IDS_SHORT_KBSWITCH "Keyboard Layout Switcher.lnk" END STRINGTABLE Modified: trunk/reactos/dll/win32/syssetup/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/nl… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/nl-NL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/nl-NL.rc [iso-8859-1] Wed May 7 11:45:30 2008 @@ -220,6 +220,7 @@ BEGIN IDS_SYS_TOOLS "System Tools" IDS_CMT_CHARMAP "CharMap" + IDS_CMT_KBSWITCH "Keyboard Layout Switcher" END STRINGTABLE @@ -258,6 +259,7 @@ IDS_SHORT_CHARMAP "CharMap.lnk" IDS_SHORT_MAGNIFY "Magnify.lnk" IDS_SHORT_RDESKTOP "Remote Desktop.lnk" + IDS_SHORT_KBSWITCH "Keyboard Layout Switcher.lnk" END STRINGTABLE Modified: trunk/reactos/dll/win32/syssetup/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/pl… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/pl-PL.rc [iso-8859-1] Wed May 7 11:45:30 2008 @@ -226,6 +226,13 @@ STRINGTABLE BEGIN + IDS_SYS_TOOLS "System Tools" + IDS_CMT_CHARMAP "Character Map" + IDS_CMT_KBSWITCH "Keyboard Layout Switcher" +END + +STRINGTABLE +BEGIN IDS_GAMES "Gry" IDS_CMT_SOLITAIRE "Pasjans" IDS_CMT_WINEMINE "Saper" @@ -260,6 +267,7 @@ IDS_SHORT_WINEMINE "Saper.lnk" IDS_SHORT_MAGNIFY "Lupa.lnk" IDS_SHORT_RDESKTOP "Dostêp zdalny.lnk" + IDS_SHORT_KBSWITCH "Keyboard Layout Switcher.lnk" END STRINGTABLE Modified: trunk/reactos/dll/win32/syssetup/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/ru… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/ru-RU.rc [iso-8859-1] Wed May 7 11:45:30 2008 @@ -202,6 +202,7 @@ BEGIN IDS_SYS_TOOLS "Ñëóæåáíûå" IDS_CMT_CHARMAP "Òàáëèöà ñèìâîëîâ" + IDS_CMT_KBSWITCH "Ïåðåêëþ÷àòåëü ðàñêëàäêè êëàâèàòóðû" END @@ -241,6 +242,7 @@ IDS_SHORT_CHARMAP "Òàáëèöà ñèìâîëîâ.lnk" IDS_SHORT_MAGNIFY "Ýêðàííàÿ ëóïà.lnk" IDS_SHORT_RDESKTOP "Óäàëåííûé ðàáî÷èé ñòîë.lnk" + IDS_SHORT_KBSWITCH "Ïåðåêëþ÷àòåëü ðàñêëàäêè êëàâèàòóðû.lnk" END STRINGTABLE Modified: trunk/reactos/dll/win32/syssetup/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/sk… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/sk-SK.rc [iso-8859-1] Wed May 7 11:45:30 2008 @@ -204,6 +204,7 @@ BEGIN IDS_SYS_TOOLS "Systémové nástroje" IDS_CMT_CHARMAP "Mapa znakov" + IDS_CMT_KBSWITCH "Keyboard Layout Switcher" END @@ -243,6 +244,7 @@ IDS_SHORT_CHARMAP "Mapa znakov.lnk" IDS_SHORT_MAGNIFY "Lupa.lnk" IDS_SHORT_RDESKTOP "Vzdialená pracovná plocha.lnk" + IDS_SHORT_KBSWITCH "Keyboard Layout Switcher.lnk" END STRINGTABLE Modified: trunk/reactos/dll/win32/syssetup/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/uk… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/uk-UA.rc [iso-8859-1] Wed May 7 11:45:30 2008 @@ -209,6 +209,7 @@ BEGIN IDS_SYS_TOOLS "Ñëóæáîâ³" IDS_CMT_CHARMAP "Òàáëèöÿ ñèìâîë³â" + IDS_CMT_KBSWITCH "Keyboard Layout Switcher" END @@ -248,6 +249,7 @@ IDS_SHORT_CHARMAP "CharMap.lnk" IDS_SHORT_MAGNIFY "Magnify.lnk" IDS_SHORT_RDESKTOP "Remote Desktop.lnk" + IDS_SHORT_KBSWITCH "Keyboard Layout Switcher.lnk" END STRINGTABLE Modified: trunk/reactos/dll/win32/syssetup/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/zh… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/zh-CN.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/zh-CN.rc [iso-8859-1] Wed May 7 11:45:30 2008 @@ -208,6 +208,7 @@ BEGIN IDS_SYS_TOOLS "System Tools" IDS_CMT_CHARMAP "CharMap" + IDS_CMT_KBSWITCH "Keyboard Layout Switcher" END @@ -246,6 +247,7 @@ IDS_SHORT_CHARMAP "CharMap.lnk" IDS_SHORT_MAGNIFY "Magnify.lnk" IDS_SHORT_RDESKTOP "Remote Desktop.lnk" + IDS_SHORT_KBSWITCH "Keyboard Layout Switcher.lnk" END STRINGTABLE Modified: trunk/reactos/dll/win32/syssetup/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/resourc… ============================================================================== --- trunk/reactos/dll/win32/syssetup/resource.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/resource.h [iso-8859-1] Wed May 7 11:45:30 2008 @@ -107,6 +107,7 @@ #define IDS_CMT_CHARMAP 3224 #define IDS_CMT_MAGNIFY 3225 #define IDS_CMT_RDESKTOP 3226 +#define IDS_CMT_KBSWITCH 3227 #define IDS_REACTOS_SETUP 3300 #define IDS_UNKNOWN_ERROR 3301 @@ -133,6 +134,7 @@ #define IDS_SHORT_CHARMAP 3413 #define IDS_SHORT_MAGNIFY 3414 #define IDS_SHORT_RDESKTOP 3415 +#define IDS_SHORT_KBSWITCH 3416 #define IDS_WZD_NAME 3450 #define IDS_WZD_SETCOMPUTERNAME 3451

1 0

[mpiulachs] 33344: - code refactoring - made more and more easily extensible: * commands automatically loaded from plugins dlls * declarative and automatic command parameter parsing * common code moved to base classes - other fixes
by mpiulachs＠svn.reactos.org 07 May '08

07 May '08

Author: mpiulachs Date: Wed May 7 09:59:28 2008 New Revision: 33344 URL: http://svn.reactos.org/svn/reactos?rev=33344&view=rev Log: - code refactoring - made more and more easily extensible: * commands automatically loaded from plugins dlls * declarative and automatic command parameter parsing * common code moved to base classes - other fixes Added: trunk/irc/TechBot/TechBot.Console/ConsoleTechBotService.cs (with props) trunk/irc/TechBot/TechBot.Library/Attributes/ trunk/irc/TechBot/TechBot.Library/Attributes/CommandAttribute.cs (with props) trunk/irc/TechBot/TechBot.Library/Attributes/CommandParameterAliasAttribute.cs (with props) trunk/irc/TechBot/TechBot.Library/Attributes/CommandParameterAttribute.cs (with props) trunk/irc/TechBot/TechBot.Library/Collections/ trunk/irc/TechBot/TechBot.Library/Collections/CommandBuilderCollection.cs (with props) trunk/irc/TechBot/TechBot.Library/Commands/ApiCommand.cs (contents, props changed) - copied, changed from r31130, trunk/irc/TechBot/TechBot.Library/ApiCommand.cs trunk/irc/TechBot/TechBot.Library/Commands/Base/Command.cs - copied, changed from r31130, trunk/irc/TechBot/TechBot.Library/Command.cs trunk/irc/TechBot/TechBot.Library/Commands/Base/XmlLookupCommand.cs (with props) trunk/irc/TechBot/TechBot.Library/Commands/BugCommand.cs (contents, props changed) - copied, changed from r31130, trunk/irc/TechBot/TechBot.Library/BugCommand.cs trunk/irc/TechBot/TechBot.Library/Commands/ErrorCommand.cs (contents, props changed) - copied, changed from r31130, trunk/irc/TechBot/TechBot.Library/ErrorCommand.cs trunk/irc/TechBot/TechBot.Library/Commands/HelpCommand.cs (contents, props changed) - copied, changed from r31130, trunk/irc/TechBot/TechBot.Library/HelpCommand.cs trunk/irc/TechBot/TechBot.Library/Commands/HresultCommand.cs (contents, props changed) - copied, changed from r31130, trunk/irc/TechBot/TechBot.Library/HresultCommand.cs trunk/irc/TechBot/TechBot.Library/Commands/NtStatusCommand.cs (contents, props changed) - copied, changed from r31130, trunk/irc/TechBot/TechBot.Library/NtStatusCommand.cs trunk/irc/TechBot/TechBot.Library/Commands/ReactOSBugUrl.cs - copied, changed from r31130, trunk/irc/TechBot/TechBot.Library/ReactOSBugUrl.cs trunk/irc/TechBot/TechBot.Library/Commands/SambaBugUrl.cs - copied, changed from r31130, trunk/irc/TechBot/TechBot.Library/SambaBugUrl.cs trunk/irc/TechBot/TechBot.Library/Commands/SvnCommand.cs (contents, props changed) - copied, changed from r31130, trunk/irc/TechBot/TechBot.Library/SvnCommand.cs trunk/irc/TechBot/TechBot.Library/Commands/WineBugUrl.cs - copied, changed from r31130, trunk/irc/TechBot/TechBot.Library/WineBugUrl.cs trunk/irc/TechBot/TechBot.Library/Commands/WinerrorCommand.cs (contents, props changed) - copied, changed from r31130, trunk/irc/TechBot/TechBot.Library/WinerrorCommand.cs trunk/irc/TechBot/TechBot.Library/Commands/WmCommand.cs (contents, props changed) - copied, changed from r31130, trunk/irc/TechBot/TechBot.Library/WmCommand.cs trunk/irc/TechBot/TechBot.Library/Factory/ trunk/irc/TechBot/TechBot.Library/Factory/CommandBuilder.cs (with props) trunk/irc/TechBot/TechBot.Library/Factory/CommandFactory.cs (with props) trunk/irc/TechBot/TechBot.Library/ParametersParser.cs (with props) trunk/irc/TechBot/TechBot.Library/TechBotIrcService.cs (contents, props changed) - copied, changed from r31130, trunk/irc/TechBot/TechBot.Library/IrcService.cs trunk/irc/TechBot/TechBot/ProjectInstaller.cs (with props) Removed: trunk/irc/TechBot/Default.build trunk/irc/TechBot/TechBot.Library/ApiCommand.cs trunk/irc/TechBot/TechBot.Library/BugCommand.cs trunk/irc/TechBot/TechBot.Library/Command.cs trunk/irc/TechBot/TechBot.Library/ErrorCommand.cs trunk/irc/TechBot/TechBot.Library/HelpCommand.cs trunk/irc/TechBot/TechBot.Library/HresultCommand.cs trunk/irc/TechBot/TechBot.Library/IrcService.cs trunk/irc/TechBot/TechBot.Library/NtStatusCommand.cs trunk/irc/TechBot/TechBot.Library/ReactOSBugUrl.cs trunk/irc/TechBot/TechBot.Library/SambaBugUrl.cs trunk/irc/TechBot/TechBot.Library/SvnCommand.cs trunk/irc/TechBot/TechBot.Library/WineBugUrl.cs trunk/irc/TechBot/TechBot.Library/WinerrorCommand.cs trunk/irc/TechBot/TechBot.Library/WmCommand.cs trunk/irc/TechBot/TechBot.cmbx Modified: trunk/irc/TechBot/TechBot.Console/Main.cs trunk/irc/TechBot/TechBot.Console/TechBot.Console.csproj trunk/irc/TechBot/TechBot.Library/Commands/Base/XmlCommand.cs trunk/irc/TechBot/TechBot.Library/MessageContext.cs trunk/irc/TechBot/TechBot.Library/ServiceOutput.cs trunk/irc/TechBot/TechBot.Library/TechBot.Library.csproj trunk/irc/TechBot/TechBot.Library/TechBotService.cs trunk/irc/TechBot/TechBot/ServiceThread.cs trunk/irc/TechBot/TechBot/TechBot.csproj trunk/irc/TechBot/TechBot/TechBotService.cs [This mail would be too long, it was shortened to contain the URLs only.] Removed: trunk/irc/TechBot/Default.build URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/Default.build?rev=3334… Added: trunk/irc/TechBot/TechBot.Console/ConsoleTechBotService.cs URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/TechBot.Console/Consol… Modified: trunk/irc/TechBot/TechBot.Console/Main.cs URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/TechBot.Console/Main.c… Modified: trunk/irc/TechBot/TechBot.Console/TechBot.Console.csproj URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/TechBot.Console/TechBo… Removed: trunk/irc/TechBot/TechBot.Library/ApiCommand.cs URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/TechBot.Library/ApiCom… Added: trunk/irc/TechBot/TechBot.Library/Attributes/CommandAttribute.cs URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/TechBot.Library/Attrib… Added: trunk/irc/TechBot/TechBot.Library/Attributes/CommandParameterAliasAttribute.cs URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/TechBot.Library/Attrib… Added: trunk/irc/TechBot/TechBot.Library/Attributes/CommandParameterAttribute.cs URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/TechBot.Library/Attrib… Removed: trunk/irc/TechBot/TechBot.Library/BugCommand.cs URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/TechBot.Library/BugCom… Added: trunk/irc/TechBot/TechBot.Library/Collections/CommandBuilderCollection.cs URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/TechBot.Library/Collec… Removed: trunk/irc/TechBot/TechBot.Library/Command.cs URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/TechBot.Library/Comman… Copied: trunk/irc/TechBot/TechBot.Library/Commands/ApiCommand.cs (from r31130, trunk/irc/TechBot/TechBot.Library/ApiCommand.cs) URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/TechBot.Library/Comman… Copied: trunk/irc/TechBot/TechBot.Library/Commands/Base/Command.cs (from r31130, trunk/irc/TechBot/TechBot.Library/Command.cs) URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/TechBot.Library/Comman… Modified: trunk/irc/TechBot/TechBot.Library/Commands/Base/XmlCommand.cs URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/TechBot.Library/Comman… Added: trunk/irc/TechBot/TechBot.Library/Commands/Base/XmlLookupCommand.cs URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/TechBot.Library/Comman… Copied: trunk/irc/TechBot/TechBot.Library/Commands/BugCommand.cs (from r31130, trunk/irc/TechBot/TechBot.Library/BugCommand.cs) URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/TechBot.Library/Comman… Copied: trunk/irc/TechBot/TechBot.Library/Commands/ErrorCommand.cs (from r31130, trunk/irc/TechBot/TechBot.Library/ErrorCommand.cs) URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/TechBot.Library/Comman… Copied: trunk/irc/TechBot/TechBot.Library/Commands/HelpCommand.cs (from r31130, trunk/irc/TechBot/TechBot.Library/HelpCommand.cs) URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/TechBot.Library/Comman… Copied: trunk/irc/TechBot/TechBot.Library/Commands/HresultCommand.cs (from r31130, trunk/irc/TechBot/TechBot.Library/HresultCommand.cs) URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/TechBot.Library/Comman… Copied: trunk/irc/TechBot/TechBot.Library/Commands/NtStatusCommand.cs (from r31130, trunk/irc/TechBot/TechBot.Library/NtStatusCommand.cs) URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/TechBot.Library/Comman… Copied: trunk/irc/TechBot/TechBot.Library/Commands/ReactOSBugUrl.cs (from r31130, trunk/irc/TechBot/TechBot.Library/ReactOSBugUrl.cs) URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/TechBot.Library/Comman… Copied: trunk/irc/TechBot/TechBot.Library/Commands/SambaBugUrl.cs (from r31130, trunk/irc/TechBot/TechBot.Library/SambaBugUrl.cs) URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/TechBot.Library/Comman… Copied: trunk/irc/TechBot/TechBot.Library/Commands/SvnCommand.cs (from r31130, trunk/irc/TechBot/TechBot.Library/SvnCommand.cs) URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/TechBot.Library/Comman… Copied: trunk/irc/TechBot/TechBot.Library/Commands/WineBugUrl.cs (from r31130, trunk/irc/TechBot/TechBot.Library/WineBugUrl.cs) URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/TechBot.Library/Comman… Copied: trunk/irc/TechBot/TechBot.Library/Commands/WinerrorCommand.cs (from r31130, trunk/irc/TechBot/TechBot.Library/WinerrorCommand.cs) URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/TechBot.Library/Comman… Copied: trunk/irc/TechBot/TechBot.Library/Commands/WmCommand.cs (from r31130, trunk/irc/TechBot/TechBot.Library/WmCommand.cs) URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/TechBot.Library/Comman… Removed: trunk/irc/TechBot/TechBot.Library/ErrorCommand.cs URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/TechBot.Library/ErrorC… Added: trunk/irc/TechBot/TechBot.Library/Factory/CommandBuilder.cs URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/TechBot.Library/Factor… Added: trunk/irc/TechBot/TechBot.Library/Factory/CommandFactory.cs URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/TechBot.Library/Factor… Removed: trunk/irc/TechBot/TechBot.Library/HelpCommand.cs URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/TechBot.Library/HelpCo… Removed: trunk/irc/TechBot/TechBot.Library/HresultCommand.cs URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/TechBot.Library/Hresul… Removed: trunk/irc/TechBot/TechBot.Library/IrcService.cs URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/TechBot.Library/IrcSer… Modified: trunk/irc/TechBot/TechBot.Library/MessageContext.cs URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/TechBot.Library/Messag… Removed: trunk/irc/TechBot/TechBot.Library/NtStatusCommand.cs URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/TechBot.Library/NtStat… Added: trunk/irc/TechBot/TechBot.Library/ParametersParser.cs URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/TechBot.Library/Parame… Removed: trunk/irc/TechBot/TechBot.Library/ReactOSBugUrl.cs URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/TechBot.Library/ReactO… Removed: trunk/irc/TechBot/TechBot.Library/SambaBugUrl.cs URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/TechBot.Library/SambaB… Modified: trunk/irc/TechBot/TechBot.Library/ServiceOutput.cs URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/TechBot.Library/Servic… Removed: trunk/irc/TechBot/TechBot.Library/SvnCommand.cs URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/TechBot.Library/SvnCom… Modified: trunk/irc/TechBot/TechBot.Library/TechBot.Library.csproj URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/TechBot.Library/TechBo… Copied: trunk/irc/TechBot/TechBot.Library/TechBotIrcService.cs (from r31130, trunk/irc/TechBot/TechBot.Library/IrcService.cs) URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/TechBot.Library/TechBo… Modified: trunk/irc/TechBot/TechBot.Library/TechBotService.cs URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/TechBot.Library/TechBo… Removed: trunk/irc/TechBot/TechBot.Library/WineBugUrl.cs URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/TechBot.Library/WineBu… Removed: trunk/irc/TechBot/TechBot.Library/WinerrorCommand.cs URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/TechBot.Library/Winerr… Removed: trunk/irc/TechBot/TechBot.Library/WmCommand.cs URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/TechBot.Library/WmComm… Removed: trunk/irc/TechBot/TechBot.cmbx URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/TechBot.cmbx?rev=33343… Added: trunk/irc/TechBot/TechBot/ProjectInstaller.cs URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/TechBot/ProjectInstall… Modified: trunk/irc/TechBot/TechBot/ServiceThread.cs URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/TechBot/ServiceThread.… Modified: trunk/irc/TechBot/TechBot/TechBot.csproj URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/TechBot/TechBot.csproj… Modified: trunk/irc/TechBot/TechBot/TechBotService.cs URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/TechBot/TechBotService…

1 0

[tkreuzer] 33343: UserCreateHeap: use SIZE_T for parameter, also use SIZE_T for MmMapViewOfSection
by tkreuzer＠svn.reactos.org 07 May '08

07 May '08

Author: tkreuzer Date: Wed May 7 09:39:31 2008 New Revision: 33343 URL: http://svn.reactos.org/svn/reactos?rev=33343&view=rev Log: UserCreateHeap: use SIZE_T for parameter, also use SIZE_T for MmMapViewOfSection Modified: trunk/reactos/subsystems/win32/win32k/misc/usrheap.c trunk/reactos/subsystems/win32/win32k/w32k.h Modified: trunk/reactos/subsystems/win32/win32k/misc/usrheap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/mi… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/misc/usrheap.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/misc/usrheap.c [iso-8859-1] Wed May 7 09:39:31 2008 @@ -55,7 +55,7 @@ } else { - ULONG ViewSize = 0; + SIZE_T ViewSize = 0; LARGE_INTEGER Offset; extern PSECTION_OBJECT GlobalUserHeapSection; @@ -163,7 +163,7 @@ HANDLE UserCreateHeap(OUT PSECTION_OBJECT *SectionObject, IN OUT PVOID *SystemBase, - IN ULONG HeapSize) + IN SIZE_T HeapSize) { LARGE_INTEGER SizeHeap; HANDLE hHeap = NULL; Modified: trunk/reactos/subsystems/win32/win32k/w32k.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/w3… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/w32k.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/w32k.h [iso-8859-1] Wed May 7 09:39:31 2008 @@ -74,7 +74,7 @@ HANDLE UserCreateHeap(OUT PSECTION_OBJECT *SectionObject, IN OUT PVOID *SystemBase, - IN ULONG HeapSize); + IN SIZE_T HeapSize); static __inline PVOID UserHeapAlloc(SIZE_T Bytes)

1 0

[tkreuzer] 33342: remove unimplemented IntDrawCaret from caret.h
by tkreuzer＠svn.reactos.org 07 May '08

07 May '08

Author: tkreuzer Date: Wed May 7 09:14:52 2008 New Revision: 33342 URL: http://svn.reactos.org/svn/reactos?rev=33342&view=rev Log: remove unimplemented IntDrawCaret from caret.h Modified: trunk/reactos/subsystems/win32/win32k/include/caret.h Modified: trunk/reactos/subsystems/win32/win32k/include/caret.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/caret.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/caret.h [iso-8859-1] Wed May 7 09:14:52 2008 @@ -18,9 +18,6 @@ BOOL FASTCALL IntSwitchCaretShowing(PVOID Info); -VOID FASTCALL -IntDrawCaret(HWND hWnd); - BOOL FASTCALL co_UserShowCaret(PWINDOW_OBJECT WindowObject); BOOL FASTCALL co_UserHideCaret(PWINDOW_OBJECT WindowObject);

1 0

[tkreuzer] 33341: (Nt)UserGetWindowDC returns a HDC, not a DWORD
by tkreuzer＠svn.reactos.org 07 May '08

07 May '08

Author: tkreuzer Date: Wed May 7 09:11:01 2008 New Revision: 33341 URL: http://svn.reactos.org/svn/reactos?rev=33341&view=rev Log: (Nt)UserGetWindowDC returns a HDC, not a DWORD Modified: trunk/reactos/include/reactos/win32k/ntuser.h trunk/reactos/subsystems/win32/win32k/include/userfuncs.h trunk/reactos/subsystems/win32/win32k/ntuser/windc.c trunk/reactos/subsystems/win32/win32k/objects/color.c trunk/reactos/subsystems/win32/win32k/objects/dc.c trunk/reactos/subsystems/win32/win32k/objects/print.c Modified: trunk/reactos/include/reactos/win32k/ntuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntu… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntuser.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/win32k/ntuser.h [iso-8859-1] Wed May 7 09:11:01 2008 @@ -1485,7 +1485,7 @@ HRGN hRgn, BOOL bErase); -DWORD +HDC NTAPI NtUserGetWindowDC( HWND hWnd); Modified: trunk/reactos/subsystems/win32/win32k/include/userfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/userfuncs.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/userfuncs.h [iso-8859-1] Wed May 7 09:11:01 2008 @@ -67,7 +67,7 @@ HDC FASTCALL UserGetDCEx(PWINDOW_OBJECT Window OPTIONAL, HANDLE ClipRegion, ULONG Flags); -DWORD FASTCALL +HDC FASTCALL UserGetWindowDC(PWINDOW_OBJECT Wnd); Modified: trunk/reactos/subsystems/win32/win32k/ntuser/windc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/windc.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/windc.c [iso-8859-1] Wed May 7 09:11:01 2008 @@ -837,10 +837,10 @@ return nRet; } -DWORD FASTCALL +HDC FASTCALL UserGetWindowDC(PWINDOW_OBJECT Wnd) { - return (DWORD)UserGetDCEx(Wnd, 0, DCX_USESTYLE | DCX_WINDOW); + return UserGetDCEx(Wnd, 0, DCX_USESTYLE | DCX_WINDOW); } HDC STDCALL @@ -877,10 +877,10 @@ * Status * @implemented */ -DWORD STDCALL +HDC STDCALL NtUserGetWindowDC(HWND hWnd) { - return (DWORD)NtUserGetDCEx(hWnd, 0, DCX_USESTYLE | DCX_WINDOW); + return NtUserGetDCEx(hWnd, 0, DCX_USESTYLE | DCX_WINDOW); } HDC STDCALL Modified: trunk/reactos/subsystems/win32/win32k/objects/color.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/color.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/color.c [iso-8859-1] Wed May 7 09:11:01 2008 @@ -118,7 +118,7 @@ /* Immediately apply the new palette if current window uses it */ Wnd = UserGetDesktopWindow(); - hDC = (HDC)UserGetWindowDC(Wnd); + hDC = UserGetWindowDC(Wnd); dc = DC_LockDc(hDC); if (NULL != dc) { Modified: trunk/reactos/subsystems/win32/win32k/objects/dc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dc.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dc.c [iso-8859-1] Wed May 7 09:11:01 2008 @@ -2796,7 +2796,7 @@ PDC pDC; DesktopObject = UserGetDesktopWindow(); - DesktopHDC = (HDC)UserGetWindowDC(DesktopObject); + DesktopHDC = UserGetWindowDC(DesktopObject); pDC = DC_LockDc(DesktopHDC); *DisplayNumber = ((GDIDEVICE *)pDC->pPDev)->DisplayNumber; @@ -3320,7 +3320,7 @@ return FALSE; } - hDC = (HDC)UserGetWindowDC(Wnd); + hDC = UserGetWindowDC(Wnd); DC = DC_LockDc(hDC); if (NULL == DC) Modified: trunk/reactos/subsystems/win32/win32k/objects/print.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/print.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/print.c [iso-8859-1] Wed May 7 09:11:01 2008 @@ -164,7 +164,7 @@ if (hDC == 0) { - hDC = (HDC)UserGetWindowDC(NULL); + hDC = UserGetWindowDC(NULL); } pDC = DC_LockDc(hDC);

1 0

[fireball] 33340: - Fix uninitialized Callback var usage, spotted by Stefan Ginsberg. Probably fixes bug 3214. See issue #3214 for more details.
by fireball＠svn.reactos.org 07 May '08

07 May '08

Author: fireball Date: Wed May 7 05:06:07 2008 New Revision: 33340 URL: http://svn.reactos.org/svn/reactos?rev=33340&view=rev Log: - Fix uninitialized Callback var usage, spotted by Stefan Ginsberg. Probably fixes bug 3214. See issue #3214 for more details. Modified: trunk/reactos/ntoskrnl/lpc/send.c Modified: trunk/reactos/ntoskrnl/lpc/send.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/lpc/send.c?rev=33… ============================================================================== --- trunk/reactos/ntoskrnl/lpc/send.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/lpc/send.c [iso-8859-1] Wed May 7 05:06:07 2008 @@ -180,7 +180,7 @@ NTSTATUS Status = STATUS_SUCCESS; PLPCP_MESSAGE Message; PETHREAD Thread = PsGetCurrentThread(); - BOOLEAN Callback; + BOOLEAN Callback = FALSE; PKSEMAPHORE Semaphore; ULONG MessageType; PAGED_CODE();

1 0

[fireball] 33339: - Assign statements in ASSERTs is a bad idea. Fix that.
by fireball＠svn.reactos.org 07 May '08

07 May '08

Author: fireball Date: Wed May 7 04:46:37 2008 New Revision: 33339 URL: http://svn.reactos.org/svn/reactos?rev=33339&view=rev Log: - Assign statements in ASSERTs is a bad idea. Fix that. Modified: trunk/reactos/ntoskrnl/ex/resource.c Modified: trunk/reactos/ntoskrnl/ex/resource.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/resource.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ex/resource.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/resource.c [iso-8859-1] Wed May 7 04:46:37 2008 @@ -1896,7 +1896,7 @@ Resource->NumberOfSharedWaiters = 0; /* Release lock and let someone else have it */ - ASSERT(Resource->ActiveCount = 1); + ASSERT(Resource->ActiveCount == 1); ExReleaseResourceLock(Resource, &LockHandle); KeReleaseSemaphore(Resource->SharedWaiters, 0, Count, FALSE); return; @@ -1910,7 +1910,7 @@ Resource->NumberOfExclusiveWaiters--; /* Release the lock and give it away */ - ASSERT(Resource->ActiveCount = 1); + ASSERT(Resource->ActiveCount == 1); ExReleaseResourceLock(Resource, &LockHandle); KeSetEventBoostPriority(Resource->ExclusiveWaiters, (PKTHREAD*)&Resource->OwnerEntry.OwnerThread); @@ -2003,7 +2003,7 @@ Resource->NumberOfExclusiveWaiters--; /* Release the lock and give it away */ - ASSERT(Resource->ActiveCount = 1); + ASSERT(Resource->ActiveCount == 1); ExReleaseResourceLock(Resource, &LockHandle); KeSetEventBoostPriority(Resource->ExclusiveWaiters, (PKTHREAD*)&Resource->OwnerEntry.OwnerThread);

1 0

[gbrunmar] 33326: Implemented IDirect3DDevice9::GetDisplayMode()
by gbrunmar＠svn.reactos.org 07 May '08

07 May '08

Author: gbrunmar Date: Tue May 6 11:15:33 2008 New Revision: 33326 URL: http://svn.reactos.org/svn/reactos?rev=33326&view=rev Log: Implemented IDirect3DDevice9::GetDisplayMode() Modified: trunk/reactos/dll/directx/d3d9/d3d9_device.c Modified: trunk/reactos/dll/directx/d3d9/d3d9_device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/d3d9_devi… ============================================================================== --- trunk/reactos/dll/directx/d3d9/d3d9_device.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/d3d9/d3d9_device.c [iso-8859-1] Tue May 6 11:15:33 2008 @@ -192,10 +192,53 @@ return D3D_OK; } +/*++ +* @name IDirect3DDevice9::GetDisplayMode +* @implemented +* +* The function IDirect3DDevice9Impl_GetDisplayMode fills the pMode argument with the +* display mode for the specified swap chain. +* +* @param LPDIRECT3D iface +* Pointer to the IDirect3D9 object returned from Direct3DCreate9() +* +* @param UINT iSwapChain +* Swap chain index to get object for. +* The maximum value for this is the value returned by IDirect3DDevice9::GetNumberOfSwapChains() - 1. +* +* @param D3DDISPLAYMODE* pMode +* Pointer to a D3DDISPLAYMODE structure to be filled with the current swap chain's display mode information. +* +* @return HRESULT +* If the method successfully fills the pMode structure, the return value is D3D_OK. +* If iSwapChain is out of range or pMode is a bad pointer, the return value will be D3DERR_INVALIDCALL. +* +*/ static HRESULT WINAPI IDirect3DDevice9Impl_GetDisplayMode(LPDIRECT3DDEVICE9 iface, UINT iSwapChain, D3DDISPLAYMODE* pMode) { - UNIMPLEMENTED - + LPDIRECT3DDEVICE9_INT This = impl_from_IDirect3DDevice9(iface); + LOCK_D3DDEVICE9(); + + if (iSwapChain >= IDirect3DDevice9_GetNumberOfSwapChains(iface)) + { + DPRINT1("Invalid iSwapChain parameter specified"); + UNLOCK_D3DDEVICE9(); + return D3DERR_INVALIDCALL; + } + + if (IsBadWritePtr(pMode, sizeof(D3DDISPLAYMODE*))) + { + DPRINT1("Invalid pMode parameter specified"); + UNLOCK_D3DDEVICE9(); + return D3DERR_INVALIDCALL; + } + + pMode->Width = This->DeviceData[iSwapChain].DriverCaps.dwDisplayWidth; + pMode->Height = This->DeviceData[iSwapChain].DriverCaps.dwDisplayHeight; + pMode->Format = This->DeviceData[iSwapChain].DriverCaps.RawDisplayFormat; + pMode->RefreshRate = This->DeviceData[iSwapChain].DriverCaps.dwRefreshRate; + + UNLOCK_D3DDEVICE9(); return D3D_OK; }

2 1

← Newer
1
...
42
43
44
45
46
47
48
...
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 May 2008