Ros-diffs October 2011

ros-diffs@reactos.org

18 participants
369 discussions

[tkreuzer] 54080: [ntdll_apitests] Fix rbuild build

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Tue Oct 11 16:09:34 2011 New Revision: 54080 URL: http://svn.reactos.org/svn/reactos?rev=54080&view=rev Log: [ntdll_apitests] Fix rbuild build Modified: trunk/rostests/apitests/ntdll/ntdll_apitest.rbuild Modified: trunk/rostests/apitests/ntdll/ntdll_apitest.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ntdll/ntdll_apit… ============================================================================== --- trunk/rostests/apitests/ntdll/ntdll_apitest.rbuild [iso-8859-1] (original) +++ trunk/rostests/apitests/ntdll/ntdll_apitest.rbuild [iso-8859-1] Tue Oct 11 16:09:34 2011 @@ -5,6 +5,7 @@ allowwarnings="true"> <include base="ntdll_apitest">.</include> <library>wine</library> + <library>advapi32</library> <library>ntdll</library> <library>pseh</library> <file>testlist.c</file> @@ -12,6 +13,7 @@ <file>NtFreeVirtualMemory.c</file> <file>RtlInitializeBitMap.c</file> <file>ZwContinue.c</file> + <file>SystemInfo.c</file> <if property="ARCH" value="i386"> <directory name="i386"> <file>ZwContinue.S</file>

12 years, 11 months

[tkreuzer] 54079: [ntdll_apitests] Add tests for NtQuery/SetSystemInformation

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Tue Oct 11 15:29:25 2011 New Revision: 54079 URL: http://svn.reactos.org/svn/reactos?rev=54079&view=rev Log: [ntdll_apitests] Add tests for NtQuery/SetSystemInformation Added: trunk/rostests/apitests/ntdll/SystemInfo.c (with props) Modified: trunk/rostests/apitests/ntdll/CMakeLists.txt trunk/rostests/apitests/ntdll/testlist.c Modified: trunk/rostests/apitests/ntdll/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ntdll/CMakeLists… ============================================================================== --- trunk/rostests/apitests/ntdll/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/apitests/ntdll/CMakeLists.txt [iso-8859-1] Tue Oct 11 15:29:25 2011 @@ -4,6 +4,7 @@ list(APPEND SOURCE NtFreeVirtualMemory.c RtlInitializeBitMap.c + SystemInfo.c ZwContinue.c testlist.c) @@ -14,5 +15,5 @@ add_executable(ntdll_apitest ${SOURCE}) target_link_libraries(ntdll_apitest wine) set_module_type(ntdll_apitest win32cui) -add_importlibs(ntdll_apitest msvcrt kernel32 ntdll) +add_importlibs(ntdll_apitest msvcrt advapi32 kernel32 ntdll) add_cd_file(TARGET ntdll_apitest DESTINATION reactos/bin FOR all) Added: trunk/rostests/apitests/ntdll/SystemInfo.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ntdll/SystemInfo… ============================================================================== --- trunk/rostests/apitests/ntdll/SystemInfo.c (added) +++ trunk/rostests/apitests/ntdll/SystemInfo.c [iso-8859-1] Tue Oct 11 15:29:25 2011 @@ -1,0 +1,126 @@ +/* + * PROJECT: ReactOS api tests + * LICENSE: GPL - See COPYING in the top level directory + * PURPOSE: Test for NtQuery/SetSystemInformation + * PROGRAMMERS: Timo Kreuzer + */ + +#define WIN32_NO_STATUS +#include <stdio.h> +#include <wine/test.h> +#include <ndk/ntndk.h> + +#define ok_long(x, y) \ + ok(x == y, "got %ld, expected %ld\n", (long)x, (long)y); + +#define ok_ntstatus(status, expected) \ + ok(status == expected, "got 0x%lx, expected 0x%lx\n", status, expected); +// ok(status == expected, "expected: " ##expected## ", got 0x%lx\n", status) + +void +GetPrivilege() +{ + HANDLE hToken; + TOKEN_PRIVILEGES tkp; + + OpenProcessToken(GetCurrentProcess(), + TOKEN_ADJUST_PRIVILEGES | TOKEN_QUERY, + &hToken); + + LookupPrivilegeValue(NULL, SE_SYSTEMTIME_NAME, &tkp.Privileges[0].Luid); + + tkp.PrivilegeCount = 1; + tkp.Privileges[0].Attributes = SE_PRIVILEGE_ENABLED; + + AdjustTokenPrivileges(hToken, FALSE, &tkp, 0, NULL, 0); +} + + +void +Test_TimeAdjustment(void) +{ + SYSTEM_QUERY_TIME_ADJUST_INFORMATION TimeInfoOrg, GetTimeInfo; + SYSTEM_SET_TIME_ADJUST_INFORMATION SetTimeInfo; + NTSTATUS Status; + ULONG ReturnLength; + + GetPrivilege(); + + SetTimeInfo.TimeAdjustment = 0; + SetTimeInfo.Enable = 0; + + /* Query original values */ + Status = NtQuerySystemInformation(SystemTimeAdjustmentInformation, + &TimeInfoOrg, + sizeof(TimeInfoOrg), + &ReturnLength); + + /* Test without privilege */ + Status = NtSetSystemInformation(SystemTimeAdjustmentInformation, + &SetTimeInfo, + sizeof(SetTimeInfo)); + ok_ntstatus(Status, STATUS_PRIVILEGE_NOT_HELD); + + /* Get the required privilege */ + GetPrivilege(); + + /* Test wrong length */ + Status = NtSetSystemInformation(SystemTimeAdjustmentInformation, + &SetTimeInfo, + sizeof(SetTimeInfo) + 1); + ok_ntstatus(Status, STATUS_INFO_LENGTH_MISMATCH); + + /* Test both members 0 */ + Status = NtSetSystemInformation(SystemTimeAdjustmentInformation, + &SetTimeInfo, + sizeof(SetTimeInfo)); + ok_ntstatus(Status, STATUS_INVALID_PARAMETER_2); + + /* Set huge value */ + SetTimeInfo.TimeAdjustment = -1; + SetTimeInfo.Enable = 0; + Status = NtSetSystemInformation(SystemTimeAdjustmentInformation, + &SetTimeInfo, + sizeof(SetTimeInfo)); + ok_ntstatus(Status, STATUS_SUCCESS); + + /* Query the result */ + Status = NtQuerySystemInformation(SystemTimeAdjustmentInformation, + &GetTimeInfo, + sizeof(GetTimeInfo), + &ReturnLength); + ok_ntstatus(Status, STATUS_SUCCESS); + ok_long(GetTimeInfo.TimeAdjustment, -1); + ok_long(GetTimeInfo.Enable, 0); + + /* set Enable to 1 */ + SetTimeInfo.TimeAdjustment = -1; + SetTimeInfo.Enable = 1; + Status = NtSetSystemInformation(SystemTimeAdjustmentInformation, + &SetTimeInfo, + sizeof(SetTimeInfo)); + ok_ntstatus(Status, STATUS_SUCCESS); + + /* Query the result */ + Status = NtQuerySystemInformation(SystemTimeAdjustmentInformation, + &GetTimeInfo, + sizeof(GetTimeInfo), + &ReturnLength); + ok_ntstatus(Status, STATUS_SUCCESS); + ok_long(GetTimeInfo.TimeAdjustment, GetTimeInfo.TimeIncrement); + ok_long(GetTimeInfo.Enable, 1); + + /* Restore original values */ + SetTimeInfo.TimeAdjustment = TimeInfoOrg.TimeAdjustment; + SetTimeInfo.Enable = TimeInfoOrg.Enable;; + Status = NtSetSystemInformation(SystemTimeAdjustmentInformation, + &SetTimeInfo, + sizeof(SetTimeInfo)); + ok_ntstatus(Status, STATUS_SUCCESS); + +} + +START_TEST(NtSystemInformation) +{ + Test_TimeAdjustment(); +} Propchange: trunk/rostests/apitests/ntdll/SystemInfo.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rostests/apitests/ntdll/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ntdll/testlist.c… ============================================================================== --- trunk/rostests/apitests/ntdll/testlist.c [iso-8859-1] (original) +++ trunk/rostests/apitests/ntdll/testlist.c [iso-8859-1] Tue Oct 11 15:29:25 2011 @@ -8,12 +8,14 @@ extern void func_RtlInitializeBitMap(void); extern void func_ZwContinue(void); extern void func_NtFreeVirtualMemory(void); +extern void func_NtSystemInformation(void); const struct test winetest_testlist[] = { { "RtlInitializeBitMap", func_RtlInitializeBitMap }, { "ZwContinue", func_ZwContinue }, { "NtFreeVirtualMemory", func_NtFreeVirtualMemory }, + { "NtSystemInformation", func_NtSystemInformation }, { 0, 0 } };

12 years, 11 months

[akhaldi] 54078: [NDIS] * Fix NdisMWanIndicateReceiveComplete params.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Tue Oct 11 14:36:41 2011 New Revision: 54078 URL: http://svn.reactos.org/svn/reactos?rev=54078&view=rev Log: [NDIS] * Fix NdisMWanIndicateReceiveComplete params. Modified: trunk/reactos/drivers/network/ndis/ndis.spec trunk/reactos/drivers/network/ndis/ndis/50stubs.c trunk/reactos/include/ddk/ndis.h Modified: trunk/reactos/drivers/network/ndis/ndis.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis.… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis.spec [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis.spec [iso-8859-1] Tue Oct 11 14:36:41 2011 @@ -223,7 +223,7 @@ @ stdcall NdisMTransferDataComplete(ptr ptr long long) @ stdcall NdisMUnmapIoSpace(ptr ptr long) @ stdcall NdisMWanIndicateReceive(ptr ptr ptr ptr long) - @ stdcall NdisMWanIndicateReceiveComplete(ptr) + @ stdcall NdisMWanIndicateReceiveComplete(ptr ptr) @ stdcall NdisMWanSendComplete(ptr ptr long) @ stdcall NdisMWriteLogData(ptr ptr long) @ stdcall NdisOpenAdapter(ptr ptr ptr ptr ptr long ptr ptr ptr long ptr) Modified: trunk/reactos/drivers/network/ndis/ndis/50stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/50stubs.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/50stubs.c [iso-8859-1] Tue Oct 11 14:36:41 2011 @@ -243,7 +243,8 @@ VOID EXPORT NdisMWanIndicateReceiveComplete( - IN NDIS_HANDLE MiniportAdapterHandle) + IN NDIS_HANDLE MiniportAdapterHandle, + IN NDIS_HANDLE NdisLinkContext) { UNIMPLEMENTED } Modified: trunk/reactos/include/ddk/ndis.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ndis.h?rev=540… ============================================================================== --- trunk/reactos/include/ddk/ndis.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/ndis.h [iso-8859-1] Tue Oct 11 14:36:41 2011 @@ -4416,7 +4416,8 @@ VOID NTAPI NdisMWanIndicateReceiveComplete( - IN NDIS_HANDLE MiniportAdapterHandle); + IN NDIS_HANDLE MiniportAdapterHandle, + IN NDIS_HANDLE NdisLinkContext); NDISAPI VOID

12 years, 11 months

[jimtabor] 54077: - Fix applications that depend on KF_DLGMODE flag. - Added the Alt-Tab intercept for win32k.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Tue Oct 11 03:48:47 2011 New Revision: 54077 URL: http://svn.reactos.org/svn/reactos?rev=54077&view=rev Log: - Fix applications that depend on KF_DLGMODE flag. - Added the Alt-Tab intercept for win32k. Modified: trunk/reactos/subsystems/win32/win32k/include/input.h trunk/reactos/subsystems/win32/win32k/ntuser/keyboard.c Modified: trunk/reactos/subsystems/win32/win32k/include/input.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/input.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/input.h [iso-8859-1] Tue Oct 11 03:48:47 2011 @@ -33,11 +33,13 @@ /* Scan Codes */ #define SC_KEY_UP 0x8000 /* lParam bits */ -#define LP_EXT_BIT (1<<24) +#define LP_EXT_BIT (KF_EXTENDED<<16) #define LP_DO_NOT_CARE_BIT (1<<25) // for GetKeyNameText -#define LP_CONTEXT_BIT (1<<29) -#define LP_PREV_STATE_BIT (1<<30) -#define LP_TRANSITION_BIT (1<<31) +#define LP_DLGMODE (KF_DLGMODE<<16) +#define LP_MENUMODE (KF_MENUMODE<<16) +#define LP_CONTEXT_BIT (KF_ALTDOWN<<16) +#define LP_PREV_STATE_BIT (KF_REPEAT<<16) +#define LP_TRANSITION_BIT (KF_UP<<16) INIT_FUNCTION NTSTATUS NTAPI InitInputImpl(VOID); Modified: trunk/reactos/subsystems/win32/win32k/ntuser/keyboard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/keyboard.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/keyboard.c [iso-8859-1] Tue Oct 11 03:48:47 2011 @@ -790,6 +790,12 @@ Msg.lParam |= LP_TRANSITION_BIT; } + /* FIXME: set KF_DLGMODE and KF_MENUMODE when needed */ + if ( pFocusQueue && pFocusQueue->QF_flags & QF_DIALOGACTIVE ) + Msg.lParam |= LP_DLGMODE; + if ( pFocusQueue && pFocusQueue->MenuOwner )//pFocusQueue->MenuState ) // MenuState needs a start flag... + Msg.lParam |= LP_MENUMODE; + /* Init wParam and cursor position */ Msg.wParam = wVk; // Note: it's simplified by msg queue Msg.pt = gpsi->ptCursor; @@ -832,6 +838,14 @@ /* Support VK_*MENU keys */ if (!bIsDown && wSimpleVk == VK_MENU && !IS_KEY_DOWN(gafAsyncKeyState, VK_CONTROL)) co_IntKeyboardSendAltKeyMsg(); + } + + /* Alt-Tab/Esc Check. Use FocusQueue or RIT Queue */ + if (!(pKbdInput->dwFlags & KEYEVENTF_KEYUP) && + HIWORD(Msg.lParam) & KF_ALTDOWN && + ( Msg.wParam == VK_ESCAPE || Msg.wParam == VK_TAB ) ) + { + TRACE("Alt-Tab/Esc Pressed wParam %x\n",Msg.wParam); } /* If we have a focus queue, post a keyboard message */

12 years, 11 months

[tkreuzer] 54076: [EXPLORER] Implement support for hotkeys for run, show desktop and logoff currently it also causes the startmenu to open, like with win-E, but this is a different bug See issue #1...

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Mon Oct 10 22:12:39 2011 New Revision: 54076 URL: http://svn.reactos.org/svn/reactos?rev=54076&view=rev Log: [EXPLORER] Implement support for hotkeys for run, show desktop and logoff currently it also causes the startmenu to open, like with win-E, but this is a different bug See issue #1512 for more details. Modified: trunk/reactos/base/shell/explorer/taskbar/desktopbar.cpp trunk/reactos/base/shell/explorer/taskbar/desktopbar.h trunk/reactos/base/shell/explorer/taskbar/startmenu.cpp trunk/reactos/base/shell/explorer/taskbar/startmenu.h Modified: trunk/reactos/base/shell/explorer/taskbar/desktopbar.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/taskba… ============================================================================== --- trunk/reactos/base/shell/explorer/taskbar/desktopbar.cpp [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/taskbar/desktopbar.cpp [iso-8859-1] Mon Oct 10 22:12:39 2011 @@ -245,7 +245,10 @@ void DesktopBar::RegisterHotkeys() { // register hotkey WIN+E opening explorer - RegisterHotKey(_hwnd, 0, MOD_WIN, 'E'); + RegisterHotKey(_hwnd, IDHK_EXPLORER, MOD_WIN, 'E'); + RegisterHotKey(_hwnd, IDHK_RUN, MOD_WIN, 'R'); + RegisterHotKey(_hwnd, IDHK_DESKTOP, MOD_WIN, 'D'); + RegisterHotKey(_hwnd, IDHK_LOGOFF, MOD_WIN, 'L'); ///@todo register all common hotkeys } @@ -253,8 +256,21 @@ void DesktopBar::ProcessHotKey(int id_hotkey) { switch(id_hotkey) { - case 0: explorer_show_frame(SW_SHOWNORMAL); - break; + case IDHK_EXPLORER: + explorer_show_frame(SW_SHOWNORMAL); + break; + + case IDHK_RUN: + _startMenuRoot->Command(IDC_LAUNCH, 0); + break; + + case IDHK_LOGOFF: + _startMenuRoot->Command(IDC_LOGOFF, 0); + break; + + case IDHK_DESKTOP: + g_Globals._desktops.ToggleMinimize(); + break; ///@todo implement all common hotkeys } Modified: trunk/reactos/base/shell/explorer/taskbar/desktopbar.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/taskba… ============================================================================== --- trunk/reactos/base/shell/explorer/taskbar/desktopbar.h [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/taskbar/desktopbar.h [iso-8859-1] Mon Oct 10 22:12:39 2011 @@ -63,6 +63,11 @@ #define IDC_FIRST_MENU 0x3000 +// hotkeys +#define IDHK_EXPLORER 0 +#define IDHK_RUN 1 +#define IDHK_DESKTOP 2 +#define IDHK_LOGOFF 3 /// desktop bar window, also known as "system tray" struct DesktopBar : public Modified: trunk/reactos/base/shell/explorer/taskbar/startmenu.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/taskba… ============================================================================== --- trunk/reactos/base/shell/explorer/taskbar/startmenu.cpp [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/taskbar/startmenu.cpp [iso-8859-1] Mon Oct 10 22:12:39 2011 @@ -1692,6 +1692,10 @@ } } +int StartMenuRoot::Command(int id, int code) +{ + return super::Command(id, code); +} LRESULT StartMenuRoot::Init(LPCREATESTRUCT pcs) { @@ -2111,10 +2115,10 @@ MessageBox(0, TEXT("SHFindComputer() not yet implemented in SHELL32"), ResString(IDS_TITLE), MB_OK); } -struct RunDialogThread : public Thread -{ - int Run(); -}; +struct RunDialogThread : public Thread +{ + int Run(); +}; int RunDialogThread::Run() { Modified: trunk/reactos/base/shell/explorer/taskbar/startmenu.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/taskba… ============================================================================== --- trunk/reactos/base/shell/explorer/taskbar/startmenu.h [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/taskbar/startmenu.h [iso-8859-1] Mon Oct 10 22:12:39 2011 @@ -369,6 +369,7 @@ static HWND Create(HWND hwndDesktopBar, int icon_size); void TrackStartmenu(); + int Command(int id, int code); HWND _hwndStartButton;

12 years, 11 months

[akhaldi] 54075: [SHELL32] * Improve the registration. By Johannes Anderwald.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Mon Oct 10 18:17:25 2011 New Revision: 54075 URL: http://svn.reactos.org/svn/reactos?rev=54075&view=rev Log: [SHELL32] * Improve the registration. By Johannes Anderwald. Modified: trunk/reactos/dll/win32/shell32/regsvr.c trunk/reactos/dll/win32/shell32/shell32_main.cpp trunk/reactos/dll/win32/shell32/shell32_main.h Modified: trunk/reactos/dll/win32/shell32/regsvr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/regsvr.c… ============================================================================== --- trunk/reactos/dll/win32/shell32/regsvr.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/regsvr.c [iso-8859-1] Mon Oct 10 18:17:25 2011 @@ -816,10 +816,7 @@ { NULL } }; -/*********************************************************************** - * DllRegisterServer (SHELL32.@) - */ -HRESULT WINAPI DllRegisterServer(void) +HRESULT WINAPI DoRegisterServer(void) { HRESULT hr; @@ -835,10 +832,7 @@ return hr; } -/*********************************************************************** - * DllUnregisterServer (SHELL32.@) - */ -HRESULT WINAPI DllUnregisterServer(void) +HRESULT WINAPI DoUnregisterServer(void) { HRESULT hr; Modified: trunk/reactos/dll/win32/shell32/shell32_main.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32_… ============================================================================== --- trunk/reactos/dll/win32/shell32/shell32_main.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shell32_main.cpp [iso-8859-1] Mon Oct 10 18:17:25 2011 @@ -1445,13 +1445,20 @@ TRACE("-- pointer to class factory: %p\n", *ppv); return hResult; } -#if 0 + /*********************************************************************** * DllRegisterServer (BROWSEUI.@) */ STDAPI DllRegisterServer() { - return gModule.DllRegisterServer(FALSE); + HRESULT hr; + + hr = gModule.DllRegisterServer(FALSE); + if (FAILED(hr)) + return hr; + + // extra registration stuff for the IShellFolder + return DoRegisterServer(); } /*********************************************************************** @@ -1459,9 +1466,16 @@ */ STDAPI DllUnregisterServer() { - return gModule.DllUnregisterServer(FALSE); -} -#endif + HRESULT hr; + + hr = gModule.DllUnregisterServer(FALSE); + if (FAILED(hr)) + return hr; + + // extra stuff which is performed for IShellFolder + return DoUnregisterServer(); +} + /************************************************************************* * DllInstall [SHELL32.@] * Modified: trunk/reactos/dll/win32/shell32/shell32_main.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32_… ============================================================================== --- trunk/reactos/dll/win32/shell32/shell32_main.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shell32_main.h [iso-8859-1] Mon Oct 10 18:17:25 2011 @@ -217,4 +217,9 @@ BOOL SH_ShowRecycleBinProperties(WCHAR sDrive); BOOL SH_ShowPropertiesDialog(LPWSTR lpf, LPCITEMIDLIST pidlFolder, LPCITEMIDLIST * apidl); BOOL SH_ShowFolderProperties(LPWSTR pwszFolder, LPCITEMIDLIST pidlFolder, LPCITEMIDLIST * apidl); + + +EXTERN_C HRESULT WINAPI DoRegisterServer(void); +EXTERN_C HRESULT WINAPI DoUnregisterServer(void); + #endif

12 years, 11 months

[gadamopoulos] 54074: [win32k] - revert last commit as these headers are really broken

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Mon Oct 10 16:11:49 2011 New Revision: 54074 URL: http://svn.reactos.org/svn/reactos?rev=54074&view=rev Log: [win32k] - revert last commit as these headers are really broken Modified: trunk/reactos/subsystems/win32/win32k/include/input.h trunk/reactos/subsystems/win32/win32k/include/intddraw.h trunk/reactos/subsystems/win32/win32k/pch.h Modified: trunk/reactos/subsystems/win32/win32k/include/input.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/input.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/input.h [iso-8859-1] Mon Oct 10 16:11:49 2011 @@ -1,4 +1,6 @@ #pragma once + +#include <ndk/kbd.h> typedef struct _KBL { Modified: trunk/reactos/subsystems/win32/win32k/include/intddraw.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/intddraw.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/intddraw.h [iso-8859-1] Mon Oct 10 16:11:49 2011 @@ -1,4 +1,10 @@ #pragma once + +#include <ddrawint.h> +#include <ddkernel.h> +#include <reactos/drivers/directx/directxint.h> +#include <reactos/drivers/directx/dxg.h> +#include <reactos/drivers/directx/dxeng.h> /* From ddraw.c */ BOOL intEnableReactXDriver(HDC); Modified: trunk/reactos/subsystems/win32/win32k/pch.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/pc… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/pch.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/pch.h [iso-8859-1] Mon Oct 10 16:11:49 2011 @@ -21,7 +21,6 @@ #include <ntifs.h> #include <tvout.h> #include <ndk/exfuncs.h> -#include <ndk/kbd.h> #include <ndk/kdfuncs.h> #include <ndk/kefuncs.h> #include <ndk/lpcfuncs.h> @@ -83,13 +82,6 @@ /* Undocumented user definitions */ #include <undocuser.h> -/* DirectX headers */ -#include <ddrawint.h> -#include <ddkernel.h> -#include <reactos/drivers/directx/directxint.h> -#include <reactos/drivers/directx/dxg.h> -#include <reactos/drivers/directx/dxeng.h> - /* Freetype headers*/ #include <ft2build.h> #include FT_FREETYPE_H

12 years, 11 months

[gadamopoulos] 54073: [win32k] - move some includes to pch.h

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Mon Oct 10 15:48:37 2011 New Revision: 54073 URL: http://svn.reactos.org/svn/reactos?rev=54073&view=rev Log: [win32k] - move some includes to pch.h Modified: trunk/reactos/subsystems/win32/win32k/include/input.h trunk/reactos/subsystems/win32/win32k/include/intddraw.h trunk/reactos/subsystems/win32/win32k/pch.h Modified: trunk/reactos/subsystems/win32/win32k/include/input.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/input.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/input.h [iso-8859-1] Mon Oct 10 15:48:37 2011 @@ -1,6 +1,4 @@ #pragma once - -#include <ndk/kbd.h> typedef struct _KBL { Modified: trunk/reactos/subsystems/win32/win32k/include/intddraw.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/intddraw.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/intddraw.h [iso-8859-1] Mon Oct 10 15:48:37 2011 @@ -1,10 +1,4 @@ #pragma once - -#include <ddrawint.h> -#include <ddkernel.h> -#include <reactos/drivers/directx/directxint.h> -#include <reactos/drivers/directx/dxg.h> -#include <reactos/drivers/directx/dxeng.h> /* From ddraw.c */ BOOL intEnableReactXDriver(HDC); Modified: trunk/reactos/subsystems/win32/win32k/pch.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/pc… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/pch.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/pch.h [iso-8859-1] Mon Oct 10 15:48:37 2011 @@ -21,6 +21,7 @@ #include <ntifs.h> #include <tvout.h> #include <ndk/exfuncs.h> +#include <ndk/kbd.h> #include <ndk/kdfuncs.h> #include <ndk/kefuncs.h> #include <ndk/lpcfuncs.h> @@ -82,6 +83,13 @@ /* Undocumented user definitions */ #include <undocuser.h> +/* DirectX headers */ +#include <ddrawint.h> +#include <ddkernel.h> +#include <reactos/drivers/directx/directxint.h> +#include <reactos/drivers/directx/dxg.h> +#include <reactos/drivers/directx/dxeng.h> + /* Freetype headers*/ #include <ft2build.h> #include FT_FREETYPE_H

12 years, 11 months

[khornicek] 54072: [CDFS] Fix a buffer overrun that was corrupting the FCB. See issue #4086 for more details.

by khornicek＠svn.reactos.org

Author: khornicek Date: Mon Oct 10 13:37:19 2011 New Revision: 54072 URL: http://svn.reactos.org/svn/reactos?rev=54072&view=rev Log: [CDFS] Fix a buffer overrun that was corrupting the FCB. See issue #4086 for more details. Modified: trunk/reactos/drivers/filesystems/cdfs/dirctl.c Modified: trunk/reactos/drivers/filesystems/cdfs/dirctl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/cdfs/d… ============================================================================== --- trunk/reactos/drivers/filesystems/cdfs/dirctl.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/cdfs/dirctl.c [iso-8859-1] Mon Oct 10 13:37:19 2011 @@ -325,7 +325,8 @@ DPRINT("PathName '%S' ObjectName '%S'\n", Fcb->PathName, Fcb->ObjectName); memcpy(&Fcb->Entry, Record, sizeof(DIR_RECORD)); - wcsncpy(Fcb->ObjectName, name, MAX_PATH); + wcsncpy(Fcb->ObjectName, name, min(wcslen(name) + 1, + MAX_PATH - wcslen(Fcb->PathName) + wcslen(Fcb->ObjectName))); /* Copy short name */ Fcb->ShortNameU.Length = ShortName.Length;

12 years, 11 months

[tfaber] 54071: [KERNEL32] - Properly copy image name in TH32CreateSnapshotSectionInitialize. Fixes truncated file names in kernel32:toolhelp test

by tfaber＠svn.reactos.org

Author: tfaber Date: Mon Oct 10 12:14:12 2011 New Revision: 54071 URL: http://svn.reactos.org/svn/reactos?rev=54071&view=rev Log: [KERNEL32] - Properly copy image name in TH32CreateSnapshotSectionInitialize. Fixes truncated file names in kernel32:toolhelp test Modified: trunk/reactos/dll/win32/kernel32/client/toolhelp.c Modified: trunk/reactos/dll/win32/kernel32/client/toolhelp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/toolhelp.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/toolhelp.c [iso-8859-1] Mon Oct 10 12:14:12 2011 @@ -409,9 +409,12 @@ ProcessListEntry->dwFlags = 0; /* no longer used */ if(ProcessInfo->ImageName.Buffer != NULL) { - lstrcpynW(ProcessListEntry->szExeFile, - ProcessInfo->ImageName.Buffer, - min(ProcessInfo->ImageName.Length / sizeof(WCHAR), sizeof(ProcessListEntry->szExeFile) / sizeof(ProcessListEntry->szExeFile[0]))); + ULONG ExeFileLength = min(ProcessInfo->ImageName.Length, + sizeof(ProcessListEntry->szExeFile) - sizeof(WCHAR)); + RtlCopyMemory(ProcessListEntry->szExeFile, + ProcessInfo->ImageName.Buffer, + ExeFileLength); + ProcessListEntry->szExeFile[ExeFileLength / sizeof(WCHAR)] = UNICODE_NULL; } else {

12 years, 11 months

← Newer
1
...
18
19
20
21
22
23
24
...
37
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs October 2011