Ros-diffs

ros-diffs@reactos.org

81390 discussions

[sginsberg] 69531: [NTOS] Global pages may not have been enabled when KeFlushCurrentTb is first called, so don't enable them in there.
by sginsberg＠svn.reactos.org 14 Oct '15

14 Oct '15

Author: sginsberg Date: Wed Oct 14 20:42:18 2015 New Revision: 69531 URL: http://svn.reactos.org/svn/reactos?rev=69531&view=rev Log: [NTOS] Global pages may not have been enabled when KeFlushCurrentTb is first called, so don't enable them in there. Modified: trunk/reactos/ntoskrnl/ke/i386/cpu.c Modified: trunk/reactos/ntoskrnl/ke/i386/cpu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/cpu.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/cpu.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/cpu.c [iso-8859-1] Wed Oct 14 20:42:18 2015 @@ -891,15 +891,15 @@ { ULONG Cr4; - /* Disable PGE */ - Cr4 = __readcr4() & ~CR4_PGE; - __writecr4(Cr4); + /* Disable PGE (Note: may not have been enabled yet) */ + Cr4 = __readcr4(); + __writecr4(Cr4 & ~CR4_PGE); /* Flush everything */ __writecr3(__readcr3()); /* Re-enable PGE */ - __writecr4(Cr4 | CR4_PGE); + __writecr4(Cr4); } else {

1 0

[fireball] 69530: [ARWINSS] - Move the patch file to the right place. Patch size increased to 19Kb.
by fireball＠svn.reactos.org 14 Oct '15

14 Oct '15

Author: fireball Date: Wed Oct 14 20:29:45 2015 New Revision: 69530 URL: http://svn.reactos.org/svn/reactos?rev=69530&view=rev Log: [ARWINSS] - Move the patch file to the right place. Patch size increased to 19Kb. Removed: branches/arwinss/arwinss/trunk.patch Modified: branches/arwinss/trunk.diff Removed: branches/arwinss/arwinss/trunk.patch URL: http://svn.reactos.org/svn/reactos/branches/arwinss/arwinss/trunk.patch?rev… ============================================================================== --- branches/arwinss/arwinss/trunk.patch [iso-8859-1] (original) +++ branches/arwinss/arwinss/trunk.patch (removed) @@ -1,655 +0,0 @@ -Index: base/system/smss/smsubsys.c -=================================================================== ---- base/system/smss/smsubsys.c (revision 69519) -+++ base/system/smss/smsubsys.c (working copy) -@@ -10,7 +10,7 @@ - - #include "smss.h" - --#define NDEBUG -+//#define NDEBUG - #include <debug.h> - - /* GLOBALS ********************************************************************/ -Index: base/system/winlogon/winlogon.c -=================================================================== ---- base/system/winlogon/winlogon.c (revision 69519) -+++ base/system/winlogon/winlogon.c (working copy) -@@ -397,7 +397,7 @@ - HandleShutdown(WLSession, WLX_SAS_ACTION_SHUTDOWN_REBOOT); - ExitProcess(1); - } -- -+ERR("WL Desktop: %x\n", WLSession->WinlogonDesktop); - DisplayStatusMessage(WLSession, WLSession->WinlogonDesktop, IDS_REACTOSISSTARTINGUP); - - #if 0 -Index: cmake/baseaddress.cmake -=================================================================== ---- cmake/baseaddress.cmake (revision 69519) -+++ cmake/baseaddress.cmake (working copy) -@@ -2,7 +2,7 @@ - set(baseaddress_kernel32 0x7c770000) - set(baseaddress_msvcrt 0x7c6c0000) - set(baseaddress_advapi32 0x7c610000) --set(baseaddress_gdi32 0x7c570000) -+set(baseaddress_gdi32 0x7c580000) - set(baseaddress_user32 0x7c3d0000) - set(baseaddress_dhcpcsvc 0x7c380000) - set(baseaddress_dnsapi 0x7c330000) -Index: cmake/config.cmake -=================================================================== ---- cmake/config.cmake (revision 69519) -+++ cmake/config.cmake (working copy) -@@ -58,6 +58,9 @@ - "Whether to compile support for ELF files. - Do not enable unless you know what you're doing.") - -+set(_ARWINSS_ TRUE CACHE BOOL -+"Whether to build and use Wine-based Win32 subsystem.") -+ - set(NSWPAT FALSE CACHE BOOL - "Whether to build apps/libs with features covered by software patents. - If you live in a country where software patents are valid/apply, don't -Index: CMakeLists.txt -=================================================================== ---- CMakeLists.txt (revision 69519) -+++ CMakeLists.txt (working copy) -@@ -166,6 +166,10 @@ - add_definitions(-D_WINKD_=1) - endif() - -+ if(_ARWINSS_) -+ add_definitions(-D_ARWINSS_=1) -+ endif() -+ - if(CMAKE_VERSION MATCHES "ReactOS") - set(PCH 1 CACHE BOOL "Whether to use precompiled headers") - else() -@@ -279,6 +283,9 @@ - add_subdirectory(subsystems) - add_subdirectory(tools/wpp) - add_subdirectory(win32ss) -+ if (_ARWINSS_) -+ add_subdirectory(arwinss) -+ endif() - - # Create the registry hives - create_registry_hives() -Index: dll/win32/kernel32/client/dllmain.c -=================================================================== ---- dll/win32/kernel32/client/dllmain.c (revision 69519) -+++ dll/win32/kernel32/client/dllmain.c (working copy) -@@ -131,7 +131,7 @@ - SessionId, - WIN_OBJ_DIR); - } -- -+DPRINT1("About to connect to CSR!\n"); - /* Connect to the Base Server */ - Status = CsrClientConnectToServer(SessionDir, - BASESRV_SERVERDLL_INDEX, -Index: dll/win32/msgina/gui.c -=================================================================== ---- dll/win32/msgina/gui.c (revision 69519) -+++ dll/win32/msgina/gui.c (working copy) -@@ -73,6 +73,7 @@ - - /* When SetThreadDesktop is called the system closes the desktop handle when needed - so we have to create a new handle because this handle may still be in use by winlogon */ -+#ifndef _ARWINSS_ - if (!DuplicateHandle ( GetCurrentProcess(), - msg->hDesktop, - GetCurrentProcess(), -@@ -85,6 +86,9 @@ - HeapFree(GetProcessHeap(), 0, lpParam); - return FALSE; - } -+#else -+ hDesk = msg->hDesktop; -+#endif - - if(!SetThreadDesktop(hDesk)) - { -Index: include/asm/syscalls.inc -=================================================================== ---- include/asm/syscalls.inc (revision 69519) -+++ include/asm/syscalls.inc (working copy) -@@ -1,4 +1,4 @@ -- -+ - #ifdef _M_ARM - - #include <ksarm.h> -@@ -52,103 +52,105 @@ - - SyscallId = 0 - --#ifdef _M_IX86 --#define KUSER_SHARED_SYSCALL HEX(7ffe0300) --#define KGDT_R0_CODE 8 --MACRO(STUBCODE_U, Name, SyscallId, ArgCount) -- StackBytes = 4 * ArgCount -- FPO 0, 0, 0, 0, 0, FRAME_FPO -- mov eax, SyscallId -+#ifdef _M_IX86 -+#define KUSER_SHARED_SYSCALL HEX(7ffe0300) -+#define KGDT_R0_CODE 8 -+MACRO(STUBCODE_U, Name, SyscallId, ArgCount) -+ StackBytes = 4 * ArgCount -+ FPO 0, 0, 0, 0, 0, FRAME_FPO -+ mov eax, SyscallId - mov edx, KUSER_SHARED_SYSCALL - call dword ptr [edx] -- ret StackBytes --ENDM --MACRO(STUBCODE_K, Name, SyscallId, ArgCount) -- StackBytes = 4 * &ArgCount -- FPO 0, 0, 0, 0, 0, FRAME_FPO -- mov eax, SyscallId -- lea edx, [esp + 4] -- pushfd -- push KGDT_R0_CODE -- call _KiSystemService -- ret StackBytes --ENDM --#elif defined(_M_AMD64) --MACRO(STUBCODE_U, Name, SyscallId, ArgCount) -- .ENDPROLOG -- mov eax, SyscallId -- mov r10, rcx -- syscall -- ret --ENDM --MACRO(STUBCODE_K, Name, SyscallId, ArgCount) -- .ENDPROLOG -- EXTERN Nt&Name:PROC -- lea rax, Nt&Name[rip] -- mov r10, ArgCount * 8 -- jmp KiZwSystemService --ENDM --#elif defined(_M_PPC) --MACRO(STUBCODE_U, Name, SyscallId, ArgCount) -- stwu 1,-16(1) -- mflr 0 -- stw 0,0(1) -- li 0, SyscallId -- sc -- lwz 0,0(1) -- mtlr 0 -- addi 1,1,16 -- blr --ENDM --#define STUBCODE_K STUBCODE_U --#elif defined(_M_MIPS) --MACRO(STUBCODE_U, Name, SyscallId, ArgCount) -- li $8, KUSER_SHARED_SYSCALL -- lw $8,0($8) -- j $8 -- nop --ENDM --MACRO(STUBCODE_K, Name, SyscallId, ArgCount) -- j KiSystemService -- nop --ENDM --#else --#error unsupported architecture --#endif -+ ret StackBytes -+ENDM -+MACRO(STUBCODE_K, Name, SyscallId, ArgCount) -+ StackBytes = 4 * &ArgCount -+ FPO 0, 0, 0, 0, 0, FRAME_FPO -+ mov eax, SyscallId -+ lea edx, [esp + 4] -+ pushfd -+ push KGDT_R0_CODE -+ call _KiSystemService -+ ret StackBytes -+ENDM -+#elif defined(_M_AMD64) -+MACRO(STUBCODE_U, Name, SyscallId, ArgCount) -+ .ENDPROLOG -+ mov eax, SyscallId -+ mov r10, rcx -+ syscall -+ ret -+ENDM -+MACRO(STUBCODE_K, Name, SyscallId, ArgCount) -+ .ENDPROLOG -+ EXTERN Nt&Name:PROC -+ lea rax, Nt&Name[rip] -+ mov r10, ArgCount * 8 -+ jmp KiZwSystemService -+ENDM -+#elif defined(_M_PPC) -+MACRO(STUBCODE_U, Name, SyscallId, ArgCount) -+ stwu 1,-16(1) -+ mflr 0 -+ stw 0,0(1) -+ li 0, SyscallId -+ sc -+ lwz 0,0(1) -+ mtlr 0 -+ addi 1,1,16 -+ blr -+ENDM -+#define STUBCODE_K STUBCODE_U -+#elif defined(_M_MIPS) -+MACRO(STUBCODE_U, Name, SyscallId, ArgCount) -+ li $8, KUSER_SHARED_SYSCALL -+ lw $8,0($8) -+ j $8 -+ nop -+ENDM -+MACRO(STUBCODE_K, Name, SyscallId, ArgCount) -+ j KiSystemService -+ nop -+ENDM -+#else -+#error unsupported architecture -+#endif -+ -+#ifdef _M_IX86 -+MACRO(MAKE_LABEL, Name, StackBytes) -+ PUBLIC _&Name&@&StackBytes -+ _&Name&@&StackBytes: -+ENDM -+MACRO(START_PROC, Name, StackBytes) -+ PUBLIC _&Name&@&StackBytes -+ .PROC _&Name&@&StackBytes -+ENDM -+#else -+MACRO(MAKE_LABEL, Name, StackBytes) -+ PUBLIC &Name -+ &Name: -+ENDM -+MACRO(START_PROC, Name, StackBytes) -+ PUBLIC &Name -+ .PROC &Name -+ENDM -+#endif -+ -+MACRO(STUB_U, Name, ArgCount) -+ MAKE_LABEL Zw&Name, %ArgCount * 4 -+ MAKE_LABEL Name, %ArgCount * 4 -+ START_PROC Nt&Name, %ArgCount * 4 -+ STUBCODE_U Name, SyscallId, %ArgCount -+ .ENDP -+ SyscallId = SyscallId + 1 -+ENDM -+ -+MACRO(STUB_K, Name, ArgCount) -+ MAKE_LABEL Name, %ArgCount * 4 -+ START_PROC Zw&Name, %ArgCount * 4 -+ STUBCODE_K Name, SyscallId, %ArgCount -+ .ENDP -+ SyscallId = SyscallId + 1 -+ENDM - --#ifdef _M_IX86 --MACRO(MAKE_LABEL, Name, StackBytes) -- PUBLIC _&Name&@&StackBytes -- _&Name&@&StackBytes: --ENDM --MACRO(START_PROC, Name, StackBytes) -- PUBLIC _&Name&@&StackBytes -- .PROC _&Name&@&StackBytes --ENDM --#else --MACRO(MAKE_LABEL, Name, StackBytes) -- PUBLIC &Name -- &Name: --ENDM --MACRO(START_PROC, Name, StackBytes) -- PUBLIC &Name -- .PROC &Name --ENDM - #endif -- --MACRO(STUB_U, Name, ArgCount) -- MAKE_LABEL Zw&Name, %ArgCount * 4 -- START_PROC Nt&Name, %ArgCount * 4 -- STUBCODE_U Name, SyscallId, %ArgCount -- .ENDP -- SyscallId = SyscallId + 1 --ENDM -- --MACRO(STUB_K, Name, ArgCount) -- START_PROC Zw&Name, %ArgCount * 4 -- STUBCODE_K Name, SyscallId, %ArgCount -- .ENDP -- SyscallId = SyscallId + 1 --ENDM -- --#endif -Index: include/psdk/winddi.h -=================================================================== ---- include/psdk/winddi.h (revision 69519) -+++ include/psdk/winddi.h (working copy) -@@ -2911,7 +2911,7 @@ - _In_ ULONG cjSize, - _Out_bytecap_(cjSize) FONTINFO *pfi); - --#if (NTDDI_VERSION <= NTDDI_WINXP) -+#if 0//(NTDDI_VERSION <= NTDDI_WINXP) - /* Obsolete in Windows 2000 and later */ - GAMMA_TABLES* - APIENTRY -Index: include/reactos/wine/config.h -=================================================================== ---- include/reactos/wine/config.h (revision 69519) -+++ include/reactos/wine/config.h (working copy) -@@ -1,3 +1,5 @@ -+#include "reactos/buildno.h" -+ - #define __WINE_CONFIG_H - - /* Define to a function attribute for Microsoft hotpatch assembly prefix. */ -Index: lib/3rdparty/CMakeLists.txt -=================================================================== ---- lib/3rdparty/CMakeLists.txt (revision 69519) -+++ lib/3rdparty/CMakeLists.txt (working copy) -@@ -2,7 +2,9 @@ - add_subdirectory(adns) - add_subdirectory(bzip2) - add_subdirectory(cardlib) -+if (NOT _ARWINSS_) - add_subdirectory(freetype) -+endif () - add_subdirectory(fullfat) - add_subdirectory(libmpg123) - add_subdirectory(libsamplerate) -Index: subsystems/win32/csrsrv/init.c -=================================================================== ---- subsystems/win32/csrsrv/init.c (revision 69519) -+++ subsystems/win32/csrsrv/init.c (working copy) -@@ -20,7 +20,7 @@ - /* DATA ***********************************************************************/ - - // Debug Flag --ULONG CsrDebug = 0; // 0xFFFFFFFF; -+ULONG CsrDebug = 0xFFFFFFFF; - - HANDLE CsrHeap = NULL; - HANDLE CsrObjectDirectory = NULL; -Index: win32ss/CMakeLists.txt -=================================================================== ---- win32ss/CMakeLists.txt (revision 69519) -+++ win32ss/CMakeLists.txt (working copy) -@@ -10,7 +10,10 @@ - PROJECT(WIN32SS) - - add_subdirectory(drivers) -+add_subdirectory(user/winsrv) - -+if (NOT _ARWINSS_) -+ - if(USE_DIBLIB) - add_subdirectory(gdi/diblib) - endif() -@@ -18,7 +21,6 @@ - add_subdirectory(gdi/gdi32) - add_subdirectory(reactx) - add_subdirectory(user/user32) --add_subdirectory(user/winsrv) - - spec2def(win32k.sys win32k.spec ADD_IMPORTLIB) - -@@ -243,3 +245,4 @@ - add_asm_files(win32ksys_asm sys-stubs.S) - add_library(win32ksys ${win32ksys_asm}) - set_target_properties(win32ksys PROPERTIES LINKER_LANGUAGE "C") -+endif() # _ARWINSS_ -\ No newline at end of file -Index: win32ss/drivers/CMakeLists.txt -=================================================================== ---- win32ss/drivers/CMakeLists.txt (revision 69519) -+++ win32ss/drivers/CMakeLists.txt (working copy) -@@ -1,6 +1,8 @@ - - add_subdirectory(displays) -+if (NOT _ARWINSS_) - add_subdirectory(font) -+endif () - add_subdirectory(miniport) - add_subdirectory(videoprt) - add_subdirectory(watchdog) -Index: win32ss/include/ntgdihdl.h -=================================================================== ---- win32ss/include/ntgdihdl.h (revision 69519) -+++ win32ss/include/ntgdihdl.h (working copy) -@@ -260,6 +260,7 @@ - DWORD dwCFCount; - } GDI_SHARED_HANDLE_TABLE, *PGDI_SHARED_HANDLE_TABLE; - -+#ifndef _ARWINSS_ - typedef struct _RGN_ATTR - { - ULONG AttrFlags; -@@ -347,6 +348,19 @@ - RGN_ATTR VisRectRegion; - } DC_ATTR, *PDC_ATTR; - -+#else -+ -+typedef struct _DC_ATTR -+{ -+ HDC hdc; -+ HDC hKernelDC; -+ RECT dc_rect; /* DC rectangle relative to drawable */ -+ HRGN region; /* Device region (visible region & clip region) */ -+ int cache_index; /* cache of a currently selected font */ -+} DC_ATTR, *PDC_ATTR; -+ -+#endif -+ - typedef struct _BRUSH_ATTR /* Used with pen too. */ - { - FLONG AttrFlags; -Index: win32ss/user/winsrv/consrv/conoutput.c -=================================================================== ---- win32ss/user/winsrv/consrv/conoutput.c (revision 69519) -+++ win32ss/user/winsrv/consrv/conoutput.c (working copy) -@@ -99,9 +99,13 @@ - * Indeed, the palette handle comes from a console app - * calling ourselves, running in CSRSS. - */ -+#ifndef _ARWINSS_ - NtUserConsoleControl(ConsoleMakePalettePublic, - &SetPaletteRequest->PaletteHandle, - sizeof(SetPaletteRequest->PaletteHandle)); -+#else -+ UNIMPLEMENTED; -+#endif - - Status = ConDrvSetConsolePalette(Buffer->Header.Console, - Buffer, -Index: win32ss/user/winsrv/consrv/frontends/gui/conwnd.c -=================================================================== ---- win32ss/user/winsrv/consrv/frontends/gui/conwnd.c (revision 69519) -+++ win32ss/user/winsrv/consrv/frontends/gui/conwnd.c (working copy) -@@ -159,7 +159,11 @@ - } - else - { -+#ifndef _ARWINSS_ - NtUserConsoleControl(GuiConsoleWndClassAtom, &WndClassAtom, sizeof(ATOM)); -+#else -+ UNIMPLEMENTED; -+#endif - } - - return (WndClassAtom != 0); -Index: win32ss/user/winsrv/consrv/frontends/gui/guiterm.c -=================================================================== ---- win32ss/user/winsrv/consrv/frontends/gui/guiterm.c (revision 69519) -+++ win32ss/user/winsrv/consrv/frontends/gui/guiterm.c (working copy) -@@ -160,9 +160,14 @@ - /* Assign this console input thread to this desktop */ - DesktopConsoleThreadInfo.DesktopHandle = GuiInitInfo->Desktop; // Duplicated desktop handle - DesktopConsoleThreadInfo.ThreadId = InputThreadId; -+#ifndef _ARWINSS_ - Status = NtUserConsoleControl(ConsoleCtrlDesktopConsoleThread, - &DesktopConsoleThreadInfo, - sizeof(DesktopConsoleThreadInfo)); -+#else -+ UNIMPLEMENTED; -+ Status = STATUS_UNSUCCESSFUL; -+#endif - if (!NT_SUCCESS(Status)) goto Quit; - - /* Connect this CSR thread to the USER subsystem */ -@@ -295,13 +300,17 @@ - - Quit: - DPRINT("CONSRV: Quit the Input Thread 0x%p, Status = 0x%08lx\n", InputThreadId, Status); -- -+ - /* Remove this console input thread from this desktop */ - // DesktopConsoleThreadInfo.DesktopHandle; - DesktopConsoleThreadInfo.ThreadId = 0; -+#ifndef _ARWINSS_ - NtUserConsoleControl(ConsoleCtrlDesktopConsoleThread, - &DesktopConsoleThreadInfo, - sizeof(DesktopConsoleThreadInfo)); -+#else -+ UNIMPLEMENTED -+#endif - - /* Close the duplicated desktop handle */ - CloseDesktop(DesktopConsoleThreadInfo.DesktopHandle); // NtUserCloseDesktop -@@ -358,11 +367,16 @@ - { - RtlInitUnicodeString(&DesktopPath, L"Default"); - } -- -+#ifndef _ARWINSS_ - hDesk = NtUserResolveDesktop(ConsoleLeaderProcessHandle, - &DesktopPath, - 0, - &hWinSta); -+#else -+ UNIMPLEMENTED -+ hDesk = NULL; -+#endif -+ - DPRINT("NtUserResolveDesktop(DesktopPath = '%wZ') returned hDesk = 0x%p; hWinSta = 0x%p\n", - &DesktopPath, hDesk, hWinSta); - -Index: win32ss/user/winsrv/usersrv/init.c -=================================================================== ---- win32ss/user/winsrv/usersrv/init.c (revision 69519) -+++ win32ss/user/winsrv/usersrv/init.c (working copy) -@@ -101,7 +101,20 @@ - NTAPI - CreateSystemThreads(PVOID pParam) - { -+#ifndef _ARWINSS_ - NtUserCallOneParam((DWORD)pParam, ONEPARAM_ROUTINE_CREATESYSTEMTHREADS); -+#else -+ DWORD WaitRes; -+ HANDLE hDummyEvent; -+ -+ hDummyEvent = CreateEventW(0, FALSE, FALSE, L""); -+ -+ while (TRUE) -+ { -+ WaitRes = WaitForSingleObject(hDummyEvent, INFINITE); -+ } -+ DPRINT1("WaitRes: 0x%x\n", WaitRes); -+#endif - DPRINT1("This thread should not terminate!\n"); - return 0; - } -@@ -173,6 +186,7 @@ - CsrApiPort = CsrQueryApiPort(); - - /* Inform win32k about the API port */ -+#ifndef _ARWINSS_ - Status = NtUserSetInformationThread(NtCurrentThread(), - UserThreadCsrApiPort, - &CsrApiPort, -@@ -181,6 +195,9 @@ - { - return Status; - } -+#else -+ UNIMPLEMENTED -+#endif - } - - /* Check connection info validity */ -@@ -199,9 +216,14 @@ - - /* Pass the request to win32k */ - ConnectInfo->dwDispatchCount = 0; // gDispatchTableValues; -+#ifndef _ARWINSS_ - Status = NtUserProcessConnect(CsrProcess->ProcessHandle, - ConnectInfo, - *ConnectionInfoLength); -+#else -+ Status = STATUS_SUCCESS; -+ UNIMPLEMENTED -+#endif - - return Status; - } -@@ -254,7 +276,11 @@ - } - - /* Set the process creation notify routine for BASE */ -+#ifndef _ARWINSS_ - BaseSetProcessCreateNotify(NtUserNotifyProcessCreate); -+#else -+ UNIMPLEMENTED -+#endif - - /* Initialize the kernel mode subsystem */ - Status = NtUserInitialize(USER_VERSION, -Index: win32ss/user/winsrv/usersrv/shutdown.c -=================================================================== ---- win32ss/user/winsrv/usersrv/shutdown.c (revision 69519) -+++ win32ss/user/winsrv/usersrv/shutdown.c (working copy) -@@ -381,7 +381,12 @@ - static BOOLEAN - IsConsoleMode(VOID) - { -+#ifndef _ARWINSS_ - return (BOOLEAN)NtUserCallNoParam(NOPARAM_ROUTINE_ISCONSOLEMODE); -+#else -+ UNIMPLEMENTED -+ return FALSE; -+#endif - } - - -@@ -678,9 +683,14 @@ - while (TRUE) - { - /* Notify Win32k and potentially Winlogon of the shutdown */ -+#ifndef _ARWINSS_ - Status = NtUserSetInformationThread(CsrThread->ThreadHandle, - UserThreadInitiateShutdown, - &Flags, sizeof(Flags)); -+#else -+ Status = STATUS_SUCCESS; -+ UNIMPLEMENTED -+#endif - DPRINT1("Win32k says: %lx\n", Status); - switch (Status) - { -@@ -736,9 +746,13 @@ - // FIXME: If Status == STATUS_CANCELLED, call RecordShutdownReason - - /* Tell Win32k and potentially Winlogon that we're done */ -+#ifndef _ARWINSS_ - NtUserSetInformationThread(CsrThread->ThreadHandle, - UserThreadEndShutdown, - &Status, sizeof(Status)); -+#else -+ UNIMPLEMENTED -+#endif - - DPRINT1("SrvExitWindowsEx returned 0x%08x\n", Status); - Modified: branches/arwinss/trunk.diff URL: http://svn.reactos.org/svn/reactos/branches/arwinss/trunk.diff?rev=69530&r1… ============================================================================== --- branches/arwinss/trunk.diff [iso-8859-1] (original) +++ branches/arwinss/trunk.diff [iso-8859-1] Wed Oct 14 20:29:45 2015 @@ -1,297 +1,655 @@ -Index: base/shell/explorer/desktop/desktop.cpp -=================================================================== ---- base/shell/explorer/desktop/desktop.cpp (revision 62758) -+++ base/shell/explorer/desktop/desktop.cpp (working copy) -@@ -326,8 +326,8 @@ - HWND DesktopWindow::Create() - { - static IconWindowClass wcDesktop(TEXT("Progman"), IDI_REACTOS, CS_DBLCLKS); -- /* (disabled because of small ugly temporary artefacts when hiding start menu) -- wcDesktop.hbrBackground = (HBRUSH)(COLOR_BACKGROUND+1); */ -+ /* (disabled because of small ugly temporary artefacts when hiding start menu) */ -+ wcDesktop.hbrBackground = (HBRUSH)(COLOR_BACKGROUND+1); - - int width = GetSystemMetrics(SM_CXSCREEN); - int height = GetSystemMetrics(SM_CYSCREEN); +Index: base/system/smss/smsubsys.c +=================================================================== +--- base/system/smss/smsubsys.c (revision 69519) ++++ base/system/smss/smsubsys.c (working copy) +@@ -10,7 +10,7 @@ + + #include "smss.h" + +-#define NDEBUG ++//#define NDEBUG + #include <debug.h> + + /* GLOBALS ********************************************************************/ +Index: base/system/winlogon/winlogon.c +=================================================================== +--- base/system/winlogon/winlogon.c (revision 69519) ++++ base/system/winlogon/winlogon.c (working copy) +@@ -397,7 +397,7 @@ + HandleShutdown(WLSession, WLX_SAS_ACTION_SHUTDOWN_REBOOT); + ExitProcess(1); + } +- ++ERR("WL Desktop: %x\n", WLSession->WinlogonDesktop); + DisplayStatusMessage(WLSession, WLSession->WinlogonDesktop, IDS_REACTOSISSTARTINGUP); + + #if 0 Index: cmake/baseaddress.cmake =================================================================== ---- cmake/baseaddress.cmake (revision 62758) +--- cmake/baseaddress.cmake (revision 69519) +++ cmake/baseaddress.cmake (working copy) -@@ -1,7 +1,7 @@ - set(baseaddress_ntdll 0x7c920000) # should be above 0x7c920000 - set(baseaddress_kernel32 0x77d80000) - set(baseaddress_msvcrt 0x77cd0000) --set(baseaddress_advapi32 0x77c20000) -+set(baseaddress_advapi32 0x77c70000) - set(baseaddress_gdi32 0x77bb0000) - set(baseaddress_user32 0x77a20000) - set(baseaddress_dhcpcsvc 0x779d0000) -@@ -272,6 +272,7 @@ - set(baseaddress_wbemprox 0x70c70000) - set(baseaddress_windowscodecs 0x70b60000) - set(baseaddress_windowscodecsext 0x70b30000) -+set(baseaddress_freetypd 0x709b0000) - set(baseaddress_wined3d 0x70960000) - set(baseaddress_winfax 0x70930000) - set(baseaddress_wing32 0x70900000) +@@ -2,7 +2,7 @@ + set(baseaddress_kernel32 0x7c770000) + set(baseaddress_msvcrt 0x7c6c0000) + set(baseaddress_advapi32 0x7c610000) +-set(baseaddress_gdi32 0x7c570000) ++set(baseaddress_gdi32 0x7c580000) + set(baseaddress_user32 0x7c3d0000) + set(baseaddress_dhcpcsvc 0x7c380000) + set(baseaddress_dnsapi 0x7c330000) Index: cmake/config.cmake =================================================================== ---- cmake/config.cmake (revision 62758) +--- cmake/config.cmake (revision 69519) +++ cmake/config.cmake (working copy) @@ -58,6 +58,9 @@ - "Whether to compile support for ELF files. - Do not enable unless you know what you're doing.") - -+set(_ARWINSS_ TRUE CACHE BOOL -+"Whether to build and use Wine-based Win32 subsystem.") -+ - set(NSWPAT FALSE CACHE BOOL - "Whether to build apps/libs with features covered by software patents. - If you live in a country where software patents are valid/apply, don't + "Whether to compile support for ELF files. + Do not enable unless you know what you're doing.") + ++set(_ARWINSS_ TRUE CACHE BOOL ++"Whether to build and use Wine-based Win32 subsystem.") ++ + set(NSWPAT FALSE CACHE BOOL + "Whether to build apps/libs with features covered by software patents. + If you live in a country where software patents are valid/apply, don't Index: CMakeLists.txt =================================================================== ---- CMakeLists.txt (revision 62758) +--- CMakeLists.txt (revision 69519) +++ CMakeLists.txt (working copy) -@@ -134,6 +134,10 @@ - add_definitions(-D_WINKD_=1) - endif() - -+ if(_ARWINSS_) -+ add_definitions(-D_ARWINSS_=1) -+ endif() -+ - if((NOT DEFINED PCH) AND (CMAKE_VERSION STREQUAL "2.8.12.1-ReactOS") AND (NOT CMAKE_C_COMPILER_ID STREQUAL "Clang")) - set(PCH 1) - else() -@@ -236,6 +240,9 @@ - add_subdirectory(subsystems) - add_subdirectory(tools/wpp) - add_subdirectory(win32ss) -+ if (_ARWINSS_) -+ add_subdirectory(arwinss) -+ endif() - - # Create {bootcd, livecd, bootcdregtest}.lst - create_iso_lists() +@@ -166,6 +166,10 @@ + add_definitions(-D_WINKD_=1) + endif() + ++ if(_ARWINSS_) ++ add_definitions(-D_ARWINSS_=1) ++ endif() ++ + if(CMAKE_VERSION MATCHES "ReactOS") + set(PCH 1 CACHE BOOL "Whether to use precompiled headers") + else() +@@ -279,6 +283,9 @@ + add_subdirectory(subsystems) + add_subdirectory(tools/wpp) + add_subdirectory(win32ss) ++ if (_ARWINSS_) ++ add_subdirectory(arwinss) ++ endif() + + # Create the registry hives + create_registry_hives() +Index: dll/win32/kernel32/client/dllmain.c +=================================================================== +--- dll/win32/kernel32/client/dllmain.c (revision 69519) ++++ dll/win32/kernel32/client/dllmain.c (working copy) +@@ -131,7 +131,7 @@ + SessionId, + WIN_OBJ_DIR); + } +- ++DPRINT1("About to connect to CSR!\n"); + /* Connect to the Base Server */ + Status = CsrClientConnectToServer(SessionDir, + BASESRV_SERVERDLL_INDEX, +Index: dll/win32/msgina/gui.c +=================================================================== +--- dll/win32/msgina/gui.c (revision 69519) ++++ dll/win32/msgina/gui.c (working copy) +@@ -73,6 +73,7 @@ + + /* When SetThreadDesktop is called the system closes the desktop handle when needed + so we have to create a new handle because this handle may still be in use by winlogon */ ++#ifndef _ARWINSS_ + if (!DuplicateHandle ( GetCurrentProcess(), + msg->hDesktop, + GetCurrentProcess(), +@@ -85,6 +86,9 @@ + HeapFree(GetProcessHeap(), 0, lpParam); + return FALSE; + } ++#else ++ hDesk = msg->hDesktop; ++#endif + + if(!SetThreadDesktop(hDesk)) + { Index: include/asm/syscalls.inc =================================================================== ---- include/asm/syscalls.inc (revision 62758) +--- include/asm/syscalls.inc (revision 69519) +++ include/asm/syscalls.inc (working copy) -@@ -95,6 +95,7 @@ - - MACRO(STUB_U, Name, ArgCount) - MAKE_LABEL Zw&Name, %ArgCount * 4 +@@ -1,4 +1,4 @@ +- ++ + #ifdef _M_ARM + + #include <ksarm.h> +@@ -52,103 +52,105 @@ + + SyscallId = 0 + +-#ifdef _M_IX86 +-#define KUSER_SHARED_SYSCALL HEX(7ffe0300) +-#define KGDT_R0_CODE 8 +-MACRO(STUBCODE_U, Name, SyscallId, ArgCount) +- StackBytes = 4 * ArgCount +- FPO 0, 0, 0, 0, 0, FRAME_FPO +- mov eax, SyscallId ++#ifdef _M_IX86 ++#define KUSER_SHARED_SYSCALL HEX(7ffe0300) ++#define KGDT_R0_CODE 8 ++MACRO(STUBCODE_U, Name, SyscallId, ArgCount) ++ StackBytes = 4 * ArgCount ++ FPO 0, 0, 0, 0, 0, FRAME_FPO ++ mov eax, SyscallId + mov edx, KUSER_SHARED_SYSCALL + call dword ptr [edx] +- ret StackBytes +-ENDM +-MACRO(STUBCODE_K, Name, SyscallId, ArgCount) +- StackBytes = 4 * &ArgCount +- FPO 0, 0, 0, 0, 0, FRAME_FPO +- mov eax, SyscallId +- lea edx, [esp + 4] +- pushfd +- push KGDT_R0_CODE +- call _KiSystemService +- ret StackBytes +-ENDM +-#elif defined(_M_AMD64) +-MACRO(STUBCODE_U, Name, SyscallId, ArgCount) +- .ENDPROLOG +- mov eax, SyscallId +- mov r10, rcx +- syscall +- ret +-ENDM +-MACRO(STUBCODE_K, Name, SyscallId, ArgCount) +- .ENDPROLOG +- EXTERN Nt&Name:PROC +- lea rax, Nt&Name[rip] +- mov r10, ArgCount * 8 +- jmp KiZwSystemService +-ENDM +-#elif defined(_M_PPC) +-MACRO(STUBCODE_U, Name, SyscallId, ArgCount) +- stwu 1,-16(1) +- mflr 0 +- stw 0,0(1) +- li 0, SyscallId +- sc +- lwz 0,0(1) +- mtlr 0 +- addi 1,1,16 +- blr +-ENDM +-#define STUBCODE_K STUBCODE_U +-#elif defined(_M_MIPS) +-MACRO(STUBCODE_U, Name, SyscallId, ArgCount) +- li $8, KUSER_SHARED_SYSCALL +- lw $8,0($8) +- j $8 +- nop +-ENDM +-MACRO(STUBCODE_K, Name, SyscallId, ArgCount) +- j KiSystemService +- nop +-ENDM +-#else +-#error unsupported architecture +-#endif ++ ret StackBytes ++ENDM ++MACRO(STUBCODE_K, Name, SyscallId, ArgCount) ++ StackBytes = 4 * &ArgCount ++ FPO 0, 0, 0, 0, 0, FRAME_FPO ++ mov eax, SyscallId ++ lea edx, [esp + 4] ++ pushfd ++ push KGDT_R0_CODE ++ call _KiSystemService ++ ret StackBytes ++ENDM ++#elif defined(_M_AMD64) ++MACRO(STUBCODE_U, Name, SyscallId, ArgCount) ++ .ENDPROLOG ++ mov eax, SyscallId ++ mov r10, rcx ++ syscall ++ ret ++ENDM ++MACRO(STUBCODE_K, Name, SyscallId, ArgCount) ++ .ENDPROLOG ++ EXTERN Nt&Name:PROC ++ lea rax, Nt&Name[rip] ++ mov r10, ArgCount * 8 ++ jmp KiZwSystemService ++ENDM ++#elif defined(_M_PPC) ++MACRO(STUBCODE_U, Name, SyscallId, ArgCount) ++ stwu 1,-16(1) ++ mflr 0 ++ stw 0,0(1) ++ li 0, SyscallId ++ sc ++ lwz 0,0(1) ++ mtlr 0 ++ addi 1,1,16 ++ blr ++ENDM ++#define STUBCODE_K STUBCODE_U ++#elif defined(_M_MIPS) ++MACRO(STUBCODE_U, Name, SyscallId, ArgCount) ++ li $8, KUSER_SHARED_SYSCALL ++ lw $8,0($8) ++ j $8 ++ nop ++ENDM ++MACRO(STUBCODE_K, Name, SyscallId, ArgCount) ++ j KiSystemService ++ nop ++ENDM ++#else ++#error unsupported architecture ++#endif ++ ++#ifdef _M_IX86 ++MACRO(MAKE_LABEL, Name, StackBytes) ++ PUBLIC _&Name&@&StackBytes ++ _&Name&@&StackBytes: ++ENDM ++MACRO(START_PROC, Name, StackBytes) ++ PUBLIC _&Name&@&StackBytes ++ .PROC _&Name&@&StackBytes ++ENDM ++#else ++MACRO(MAKE_LABEL, Name, StackBytes) ++ PUBLIC &Name ++ &Name: ++ENDM ++MACRO(START_PROC, Name, StackBytes) ++ PUBLIC &Name ++ .PROC &Name ++ENDM ++#endif ++ ++MACRO(STUB_U, Name, ArgCount) ++ MAKE_LABEL Zw&Name, %ArgCount * 4 + MAKE_LABEL Name, %ArgCount * 4 - START_PROC Nt&Name, %ArgCount * 4 - STUBCODE_U Name, SyscallId, %ArgCount - .ENDP -@@ -102,6 +103,7 @@ - ENDM - - MACRO(STUB_K, Name, ArgCount) ++ START_PROC Nt&Name, %ArgCount * 4 ++ STUBCODE_U Name, SyscallId, %ArgCount ++ .ENDP ++ SyscallId = SyscallId + 1 ++ENDM ++ ++MACRO(STUB_K, Name, ArgCount) + MAKE_LABEL Name, %ArgCount * 4 - START_PROC Zw&Name, %ArgCount * 4 - STUBCODE_K Name, SyscallId, %ArgCount - .ENDP ++ START_PROC Zw&Name, %ArgCount * 4 ++ STUBCODE_K Name, SyscallId, %ArgCount ++ .ENDP ++ SyscallId = SyscallId + 1 ++ENDM + +-#ifdef _M_IX86 +-MACRO(MAKE_LABEL, Name, StackBytes) +- PUBLIC _&Name&@&StackBytes +- _&Name&@&StackBytes: +-ENDM +-MACRO(START_PROC, Name, StackBytes) +- PUBLIC _&Name&@&StackBytes +- .PROC _&Name&@&StackBytes +-ENDM +-#else +-MACRO(MAKE_LABEL, Name, StackBytes) +- PUBLIC &Name +- &Name: +-ENDM +-MACRO(START_PROC, Name, StackBytes) +- PUBLIC &Name +- .PROC &Name +-ENDM + #endif +- +-MACRO(STUB_U, Name, ArgCount) +- MAKE_LABEL Zw&Name, %ArgCount * 4 +- START_PROC Nt&Name, %ArgCount * 4 +- STUBCODE_U Name, SyscallId, %ArgCount +- .ENDP +- SyscallId = SyscallId + 1 +-ENDM +- +-MACRO(STUB_K, Name, ArgCount) +- START_PROC Zw&Name, %ArgCount * 4 +- STUBCODE_K Name, SyscallId, %ArgCount +- .ENDP +- SyscallId = SyscallId + 1 +-ENDM +- +-#endif Index: include/psdk/winddi.h =================================================================== ---- include/psdk/winddi.h (revision 62758) +--- include/psdk/winddi.h (revision 69519) +++ include/psdk/winddi.h (working copy) -@@ -2683,7 +2683,7 @@ - _In_ ULONG cjSize, - _Out_bytecap_(cjSize) FONTINFO *pfi); - --#if (NTDDI_VERSION <= NTDDI_WINXP) -+#if 0//(NTDDI_VERSION <= NTDDI_WINXP) - GAMMA_TABLES* - APIENTRY - FONTOBJ_pGetGammaTables( +@@ -2911,7 +2911,7 @@ + _In_ ULONG cjSize, + _Out_bytecap_(cjSize) FONTINFO *pfi); + +-#if (NTDDI_VERSION <= NTDDI_WINXP) ++#if 0//(NTDDI_VERSION <= NTDDI_WINXP) + /* Obsolete in Windows 2000 and later */ + GAMMA_TABLES* + APIENTRY Index: include/reactos/wine/config.h =================================================================== ---- include/reactos/wine/config.h (revision 62758) +--- include/reactos/wine/config.h (revision 69519) +++ include/reactos/wine/config.h (working copy) @@ -1,3 +1,5 @@ -+#include "reactos/buildno.h" -+ - #define __WINE_CONFIG_H - - /* Define to a function attribute for Microsoft hotpatch assembly prefix. */ ++#include "reactos/buildno.h" ++ + #define __WINE_CONFIG_H + + /* Define to a function attribute for Microsoft hotpatch assembly prefix. */ Index: lib/3rdparty/CMakeLists.txt =================================================================== ---- lib/3rdparty/CMakeLists.txt (revision 62758) +--- lib/3rdparty/CMakeLists.txt (revision 69519) +++ lib/3rdparty/CMakeLists.txt (working copy) @@ -2,7 +2,9 @@ - add_subdirectory(adns) - add_subdirectory(bzip2) - add_subdirectory(cardlib) -+if (NOT _ARWINSS_) - add_subdirectory(freetype) -+endif () - add_subdirectory(fullfat) - add_subdirectory(libmpg123) - add_subdirectory(libsamplerate) + add_subdirectory(adns) + add_subdirectory(bzip2) + add_subdirectory(cardlib) ++if (NOT _ARWINSS_) + add_subdirectory(freetype) ++endif () + add_subdirectory(fullfat) + add_subdirectory(libmpg123) + add_subdirectory(libsamplerate) Index: subsystems/win32/csrsrv/init.c =================================================================== ---- subsystems/win32/csrsrv/init.c (revision 62758) +--- subsystems/win32/csrsrv/init.c (revision 69519) +++ subsystems/win32/csrsrv/init.c (working copy) @@ -20,7 +20,7 @@ - /* DATA ***********************************************************************/ - - // Debug Flag --ULONG CsrDebug = 0; // 0xFFFFFFFF; -+ULONG CsrDebug = 0xFFFFFFFF; - - HANDLE CsrHeap = NULL; - HANDLE CsrObjectDirectory = NULL; + /* DATA ***********************************************************************/ + + // Debug Flag +-ULONG CsrDebug = 0; // 0xFFFFFFFF; ++ULONG CsrDebug = 0xFFFFFFFF; + + HANDLE CsrHeap = NULL; + HANDLE CsrObjectDirectory = NULL; Index: win32ss/CMakeLists.txt =================================================================== ---- win32ss/CMakeLists.txt (revision 62758) +--- win32ss/CMakeLists.txt (revision 69519) +++ win32ss/CMakeLists.txt (working copy) -@@ -6,7 +6,10 @@ - PROJECT(WIN32SS) - - add_subdirectory(drivers) -+add_subdirectory(user/winsrv) - -+if (NOT _ARWINSS_) -+ - if(USE_DIBLIB) - add_subdirectory(gdi/diblib) - endif() +@@ -10,7 +10,10 @@ + PROJECT(WIN32SS) + + add_subdirectory(drivers) ++add_subdirectory(user/winsrv) + ++if (NOT _ARWINSS_) ++ + if(USE_DIBLIB) + add_subdirectory(gdi/diblib) + endif() @@ -18,7 +21,6 @@ - add_subdirectory(gdi/gdi32) - add_subdirectory(reactx) - add_subdirectory(user/user32) --add_subdirectory(user/winsrv) - - spec2def(win32k.sys win32k.spec ADD_IMPORTLIB) - + add_subdirectory(gdi/gdi32) + add_subdirectory(reactx) + add_subdirectory(user/user32) +-add_subdirectory(user/winsrv) + + spec2def(win32k.sys win32k.spec ADD_IMPORTLIB) + @@ -243,3 +245,4 @@ - add_asm_files(win32ksys_asm sys-stubs.S) - add_library(win32ksys ${win32ksys_asm}) - set_target_properties(win32ksys PROPERTIES LINKER_LANGUAGE "C") + add_asm_files(win32ksys_asm sys-stubs.S) + add_library(win32ksys ${win32ksys_asm}) + set_target_properties(win32ksys PROPERTIES LINKER_LANGUAGE "C") +endif() # _ARWINSS_ \ No newline at end of file Index: win32ss/drivers/CMakeLists.txt =================================================================== ---- win32ss/drivers/CMakeLists.txt (revision 62758) +--- win32ss/drivers/CMakeLists.txt (revision 69519) +++ win32ss/drivers/CMakeLists.txt (working copy) @@ -1,6 +1,8 @@ - - add_subdirectory(displays) -+if (NOT _ARWINSS_) - add_subdirectory(font) -+endif () - add_subdirectory(miniport) - add_subdirectory(videoprt) - add_subdirectory(watchdog) + + add_subdirectory(displays) ++if (NOT _ARWINSS_) + add_subdirectory(font) ++endif () + add_subdirectory(miniport) + add_subdirectory(videoprt) + add_subdirectory(watchdog) Index: win32ss/include/ntgdihdl.h =================================================================== ---- win32ss/include/ntgdihdl.h (revision 62758) +--- win32ss/include/ntgdihdl.h (revision 69519) +++ win32ss/include/ntgdihdl.h (working copy) -@@ -270,6 +270,7 @@ - DWORD dwCFCount; - } GDI_SHARED_HANDLE_TABLE, *PGDI_SHARED_HANDLE_TABLE; - -+#ifndef _ARWINSS_ - typedef struct _RGN_ATTR - { - ULONG AttrFlags; -@@ -357,6 +358,19 @@ - RGN_ATTR VisRectRegion; - } DC_ATTR, *PDC_ATTR; - -+#else -+ -+typedef struct _DC_ATTR -+{ -+ HDC hdc; -+ HDC hKernelDC; -+ RECT dc_rect; /* DC rectangle relative to drawable */ -+ HRGN region; /* Device region (visible region & clip region) */ -+ int cache_index; /* cache of a currently selected font */ -+} DC_ATTR, *PDC_ATTR; -+ -+#endif -+ - typedef struct _BRUSH_ATTR /* Used with pen too. */ - { - FLONG AttrFlags; +@@ -260,6 +260,7 @@ + DWORD dwCFCount; + } GDI_SHARED_HANDLE_TABLE, *PGDI_SHARED_HANDLE_TABLE; + ++#ifndef _ARWINSS_ + typedef struct _RGN_ATTR + { + ULONG AttrFlags; +@@ -347,6 +348,19 @@ + RGN_ATTR VisRectRegion; + } DC_ATTR, *PDC_ATTR; + ++#else ++ ++typedef struct _DC_ATTR ++{ ++ HDC hdc; ++ HDC hKernelDC; ++ RECT dc_rect; /* DC rectangle relative to drawable */ ++ HRGN region; /* Device region (visible region & clip region) */ ++ int cache_index; /* cache of a currently selected font */ ++} DC_ATTR, *PDC_ATTR; ++ ++#endif ++ + typedef struct _BRUSH_ATTR /* Used with pen too. */ + { + FLONG AttrFlags; Index: win32ss/user/winsrv/consrv/conoutput.c =================================================================== ---- win32ss/user/winsrv/consrv/conoutput.c (revision 62758) +--- win32ss/user/winsrv/consrv/conoutput.c (revision 69519) +++ win32ss/user/winsrv/consrv/conoutput.c (working copy) -@@ -77,9 +77,13 @@ - * Indeed, the palette handle comes from a console app - * calling ourselves, running in CSRSS. - */ -+#ifndef _ARWINSS_ - NtUserConsoleControl(ConsoleMakePalettePublic, - &SetPaletteRequest->PaletteHandle, - sizeof(SetPaletteRequest->PaletteHandle)); -+#else -+ UNIMPLEMENTED; -+#endif - - Status = ConDrvSetConsolePalette(Buffer->Header.Console, - Buffer, +@@ -99,9 +99,13 @@ + * Indeed, the palette handle comes from a console app + * calling ourselves, running in CSRSS. + */ ++#ifndef _ARWINSS_ + NtUserConsoleControl(ConsoleMakePalettePublic, + &SetPaletteRequest->PaletteHandle, + sizeof(SetPaletteRequest->PaletteHandle)); ++#else ++ UNIMPLEMENTED; ++#endif + + Status = ConDrvSetConsolePalette(Buffer->Header.Console, + Buffer, Index: win32ss/user/winsrv/consrv/frontends/gui/conwnd.c =================================================================== ---- win32ss/user/winsrv/consrv/frontends/gui/conwnd.c (revision 62758) +--- win32ss/user/winsrv/consrv/frontends/gui/conwnd.c (revision 69519) +++ win32ss/user/winsrv/consrv/frontends/gui/conwnd.c (working copy) -@@ -161,7 +161,11 @@ - } - else - { -+#ifndef _ARWINSS_ - NtUserConsoleControl(GuiConsoleWndClassAtom, &WndClassAtom, sizeof(ATOM)); -+#else -+ UNIMPLEMENTED; -+#endif - } - - return (WndClassAtom != 0); +@@ -159,7 +159,11 @@ + } + else + { ++#ifndef _ARWINSS_ + NtUserConsoleControl(GuiConsoleWndClassAtom, &WndClassAtom, sizeof(ATOM)); ++#else ++ UNIMPLEMENTED; ++#endif + } + + return (WndClassAtom != 0); +Index: win32ss/user/winsrv/consrv/frontends/gui/guiterm.c +=================================================================== +--- win32ss/user/winsrv/consrv/frontends/gui/guiterm.c (revision 69519) ++++ win32ss/user/winsrv/consrv/frontends/gui/guiterm.c (working copy) +@@ -160,9 +160,14 @@ + /* Assign this console input thread to this desktop */ + DesktopConsoleThreadInfo.DesktopHandle = GuiInitInfo->Desktop; // Duplicated desktop handle + DesktopConsoleThreadInfo.ThreadId = InputThreadId; ++#ifndef _ARWINSS_ + Status = NtUserConsoleControl(ConsoleCtrlDesktopConsoleThread, + &DesktopConsoleThreadInfo, + sizeof(DesktopConsoleThreadInfo)); ++#else ++ UNIMPLEMENTED; ++ Status = STATUS_UNSUCCESSFUL; ++#endif + if (!NT_SUCCESS(Status)) goto Quit; + + /* Connect this CSR thread to the USER subsystem */ +@@ -295,13 +300,17 @@ + + Quit: + DPRINT("CONSRV: Quit the Input Thread 0x%p, Status = 0x%08lx\n", InputThreadId, Status); +- ++ + /* Remove this console input thread from this desktop */ + // DesktopConsoleThreadInfo.DesktopHandle; + DesktopConsoleThreadInfo.ThreadId = 0; ++#ifndef _ARWINSS_ + NtUserConsoleControl(ConsoleCtrlDesktopConsoleThread, + &DesktopConsoleThreadInfo, + sizeof(DesktopConsoleThreadInfo)); ++#else ++ UNIMPLEMENTED ++#endif + + /* Close the duplicated desktop handle */ + CloseDesktop(DesktopConsoleThreadInfo.DesktopHandle); // NtUserCloseDesktop +@@ -358,11 +367,16 @@ + { + RtlInitUnicodeString(&DesktopPath, L"Default"); + } +- ++#ifndef _ARWINSS_ + hDesk = NtUserResolveDesktop(ConsoleLeaderProcessHandle, + &DesktopPath, + 0, + &hWinSta); ++#else ++ UNIMPLEMENTED ++ hDesk = NULL; ++#endif ++ + DPRINT("NtUserResolveDesktop(DesktopPath = '%wZ') returned hDesk = 0x%p; hWinSta = 0x%p\n", + &DesktopPath, hDesk, hWinSta); + Index: win32ss/user/winsrv/usersrv/init.c =================================================================== ---- win32ss/user/winsrv/usersrv/init.c (revision 62758) +--- win32ss/user/winsrv/usersrv/init.c (revision 69519) +++ win32ss/user/winsrv/usersrv/init.c (working copy) -@@ -95,7 +95,9 @@ - WINAPI - PrivateCsrssManualGuiCheck(LONG Check) - { -+#ifndef _ARWINSS_ - NtUserCallOneParam(Check, ONEPARAM_ROUTINE_CSRSS_GUICHECK); -+#endif - } - - ULONG -@@ -102,7 +104,13 @@ - NTAPI - CreateSystemThreads(PVOID pParam) - { -+#ifndef _ARWINSS_ - NtUserCallOneParam((DWORD)pParam, ONEPARAM_ROUTINE_CREATESYSTEMTHREADS); -+#else -+ while (TRUE) -+ { -+ } -+#endif - DPRINT1("This thread should not terminate!\n"); - return 0; - } +@@ -101,7 +101,20 @@ + NTAPI + CreateSystemThreads(PVOID pParam) + { ++#ifndef _ARWINSS_ + NtUserCallOneParam((DWORD)pParam, ONEPARAM_ROUTINE_CREATESYSTEMTHREADS); ++#else ++ DWORD WaitRes; ++ HANDLE hDummyEvent; ++ ++ hDummyEvent = CreateEventW(0, FALSE, FALSE, L""); ++ ++ while (TRUE) ++ { ++ WaitRes = WaitForSingleObject(hDummyEvent, INFINITE); ++ } ++ DPRINT1("WaitRes: 0x%x\n", WaitRes); ++#endif + DPRINT1("This thread should not terminate!\n"); + return 0; + } +@@ -173,6 +186,7 @@ + CsrApiPort = CsrQueryApiPort(); + + /* Inform win32k about the API port */ ++#ifndef _ARWINSS_ + Status = NtUserSetInformationThread(NtCurrentThread(), + UserThreadCsrApiPort, + &CsrApiPort, +@@ -181,6 +195,9 @@ + { + return Status; + } ++#else ++ UNIMPLEMENTED ++#endif + } + + /* Check connection info validity */ +@@ -199,9 +216,14 @@ + + /* Pass the request to win32k */ + ConnectInfo->dwDispatchCount = 0; // gDispatchTableValues; ++#ifndef _ARWINSS_ + Status = NtUserProcessConnect(CsrProcess->ProcessHandle, + ConnectInfo, + *ConnectionInfoLength); ++#else ++ Status = STATUS_SUCCESS; ++ UNIMPLEMENTED ++#endif + + return Status; + } +@@ -254,7 +276,11 @@ + } + + /* Set the process creation notify routine for BASE */ ++#ifndef _ARWINSS_ + BaseSetProcessCreateNotify(NtUserNotifyProcessCreate); ++#else ++ UNIMPLEMENTED ++#endif + + /* Initialize the kernel mode subsystem */ + Status = NtUserInitialize(USER_VERSION, Index: win32ss/user/winsrv/usersrv/shutdown.c =================================================================== ---- win32ss/user/winsrv/usersrv/shutdown.c (revision 62758) +--- win32ss/user/winsrv/usersrv/shutdown.c (revision 69519) +++ win32ss/user/winsrv/usersrv/shutdown.c (working copy) -@@ -901,7 +901,11 @@ - NTSTATUS Status; - - /* FIXME Inside 2000 says we should impersonate the caller here */ -+#ifndef _ARWINSS_ - Status = NtUserCallTwoParam(UserProcessId, Flags, TWOPARAM_ROUTINE_EXITREACTOS); -+#else -+ Status = 0; -+#endif - - /* If the message isn't handled, the return value is 0, so 0 doesn't indicate - success. Success is indicated by a 1 return value, if anything besides 0 +@@ -381,7 +381,12 @@ + static BOOLEAN + IsConsoleMode(VOID) + { ++#ifndef _ARWINSS_ + return (BOOLEAN)NtUserCallNoParam(NOPARAM_ROUTINE_ISCONSOLEMODE); ++#else ++ UNIMPLEMENTED ++ return FALSE; ++#endif + } + + +@@ -678,9 +683,14 @@ + while (TRUE) + { + /* Notify Win32k and potentially Winlogon of the shutdown */ ++#ifndef _ARWINSS_ + Status = NtUserSetInformationThread(CsrThread->ThreadHandle, + UserThreadInitiateShutdown, + &Flags, sizeof(Flags)); ++#else ++ Status = STATUS_SUCCESS; ++ UNIMPLEMENTED ++#endif + DPRINT1("Win32k says: %lx\n", Status); + switch (Status) + { +@@ -736,9 +746,13 @@ + // FIXME: If Status == STATUS_CANCELLED, call RecordShutdownReason + + /* Tell Win32k and potentially Winlogon that we're done */ ++#ifndef _ARWINSS_ + NtUserSetInformationThread(CsrThread->ThreadHandle, + UserThreadEndShutdown, + &Status, sizeof(Status)); ++#else ++ UNIMPLEMENTED ++#endif + + DPRINT1("SrvExitWindowsEx returned 0x%08x\n", Status); +

1 0

[fireball] 69529: [ARWINSS] - Add latest version of patch to trunk. It contains all the ugly hacks and whatever is needed to make Arwinss "work" in trunk.
by fireball＠svn.reactos.org 14 Oct '15

14 Oct '15

Author: fireball Date: Wed Oct 14 19:46:24 2015 New Revision: 69529 URL: http://svn.reactos.org/svn/reactos?rev=69529&view=rev Log: [ARWINSS] - Add latest version of patch to trunk. It contains all the ugly hacks and whatever is needed to make Arwinss "work" in trunk. Added: branches/arwinss/arwinss/trunk.patch (with props) Added: branches/arwinss/arwinss/trunk.patch URL: http://svn.reactos.org/svn/reactos/branches/arwinss/arwinss/trunk.patch?rev… ============================================================================== --- branches/arwinss/arwinss/trunk.patch (added) +++ branches/arwinss/arwinss/trunk.patch [iso-8859-1] Wed Oct 14 19:46:24 2015 @@ -0,0 +1,655 @@ +Index: base/system/smss/smsubsys.c +=================================================================== +--- base/system/smss/smsubsys.c (revision 69519) ++++ base/system/smss/smsubsys.c (working copy) +@@ -10,7 +10,7 @@ + + #include "smss.h" + +-#define NDEBUG ++//#define NDEBUG + #include <debug.h> + + /* GLOBALS ********************************************************************/ +Index: base/system/winlogon/winlogon.c +=================================================================== +--- base/system/winlogon/winlogon.c (revision 69519) ++++ base/system/winlogon/winlogon.c (working copy) +@@ -397,7 +397,7 @@ + HandleShutdown(WLSession, WLX_SAS_ACTION_SHUTDOWN_REBOOT); + ExitProcess(1); + } +- ++ERR("WL Desktop: %x\n", WLSession->WinlogonDesktop); + DisplayStatusMessage(WLSession, WLSession->WinlogonDesktop, IDS_REACTOSISSTARTINGUP); + + #if 0 +Index: cmake/baseaddress.cmake +=================================================================== +--- cmake/baseaddress.cmake (revision 69519) ++++ cmake/baseaddress.cmake (working copy) +@@ -2,7 +2,7 @@ + set(baseaddress_kernel32 0x7c770000) + set(baseaddress_msvcrt 0x7c6c0000) + set(baseaddress_advapi32 0x7c610000) +-set(baseaddress_gdi32 0x7c570000) ++set(baseaddress_gdi32 0x7c580000) + set(baseaddress_user32 0x7c3d0000) + set(baseaddress_dhcpcsvc 0x7c380000) + set(baseaddress_dnsapi 0x7c330000) +Index: cmake/config.cmake +=================================================================== +--- cmake/config.cmake (revision 69519) ++++ cmake/config.cmake (working copy) +@@ -58,6 +58,9 @@ + "Whether to compile support for ELF files. + Do not enable unless you know what you're doing.") + ++set(_ARWINSS_ TRUE CACHE BOOL ++"Whether to build and use Wine-based Win32 subsystem.") ++ + set(NSWPAT FALSE CACHE BOOL + "Whether to build apps/libs with features covered by software patents. + If you live in a country where software patents are valid/apply, don't +Index: CMakeLists.txt +=================================================================== +--- CMakeLists.txt (revision 69519) ++++ CMakeLists.txt (working copy) +@@ -166,6 +166,10 @@ + add_definitions(-D_WINKD_=1) + endif() + ++ if(_ARWINSS_) ++ add_definitions(-D_ARWINSS_=1) ++ endif() ++ + if(CMAKE_VERSION MATCHES "ReactOS") + set(PCH 1 CACHE BOOL "Whether to use precompiled headers") + else() +@@ -279,6 +283,9 @@ + add_subdirectory(subsystems) + add_subdirectory(tools/wpp) + add_subdirectory(win32ss) ++ if (_ARWINSS_) ++ add_subdirectory(arwinss) ++ endif() + + # Create the registry hives + create_registry_hives() +Index: dll/win32/kernel32/client/dllmain.c +=================================================================== +--- dll/win32/kernel32/client/dllmain.c (revision 69519) ++++ dll/win32/kernel32/client/dllmain.c (working copy) +@@ -131,7 +131,7 @@ + SessionId, + WIN_OBJ_DIR); + } +- ++DPRINT1("About to connect to CSR!\n"); + /* Connect to the Base Server */ + Status = CsrClientConnectToServer(SessionDir, + BASESRV_SERVERDLL_INDEX, +Index: dll/win32/msgina/gui.c +=================================================================== +--- dll/win32/msgina/gui.c (revision 69519) ++++ dll/win32/msgina/gui.c (working copy) +@@ -73,6 +73,7 @@ + + /* When SetThreadDesktop is called the system closes the desktop handle when needed + so we have to create a new handle because this handle may still be in use by winlogon */ ++#ifndef _ARWINSS_ + if (!DuplicateHandle ( GetCurrentProcess(), + msg->hDesktop, + GetCurrentProcess(), +@@ -85,6 +86,9 @@ + HeapFree(GetProcessHeap(), 0, lpParam); + return FALSE; + } ++#else ++ hDesk = msg->hDesktop; ++#endif + + if(!SetThreadDesktop(hDesk)) + { +Index: include/asm/syscalls.inc +=================================================================== +--- include/asm/syscalls.inc (revision 69519) ++++ include/asm/syscalls.inc (working copy) +@@ -1,4 +1,4 @@ +- ++ + #ifdef _M_ARM + + #include <ksarm.h> +@@ -52,103 +52,105 @@ + + SyscallId = 0 + +-#ifdef _M_IX86 +-#define KUSER_SHARED_SYSCALL HEX(7ffe0300) +-#define KGDT_R0_CODE 8 +-MACRO(STUBCODE_U, Name, SyscallId, ArgCount) +- StackBytes = 4 * ArgCount +- FPO 0, 0, 0, 0, 0, FRAME_FPO +- mov eax, SyscallId ++#ifdef _M_IX86 ++#define KUSER_SHARED_SYSCALL HEX(7ffe0300) ++#define KGDT_R0_CODE 8 ++MACRO(STUBCODE_U, Name, SyscallId, ArgCount) ++ StackBytes = 4 * ArgCount ++ FPO 0, 0, 0, 0, 0, FRAME_FPO ++ mov eax, SyscallId + mov edx, KUSER_SHARED_SYSCALL + call dword ptr [edx] +- ret StackBytes +-ENDM +-MACRO(STUBCODE_K, Name, SyscallId, ArgCount) +- StackBytes = 4 * &ArgCount +- FPO 0, 0, 0, 0, 0, FRAME_FPO +- mov eax, SyscallId +- lea edx, [esp + 4] +- pushfd +- push KGDT_R0_CODE +- call _KiSystemService +- ret StackBytes +-ENDM +-#elif defined(_M_AMD64) +-MACRO(STUBCODE_U, Name, SyscallId, ArgCount) +- .ENDPROLOG +- mov eax, SyscallId +- mov r10, rcx +- syscall +- ret +-ENDM +-MACRO(STUBCODE_K, Name, SyscallId, ArgCount) +- .ENDPROLOG +- EXTERN Nt&Name:PROC +- lea rax, Nt&Name[rip] +- mov r10, ArgCount * 8 +- jmp KiZwSystemService +-ENDM +-#elif defined(_M_PPC) +-MACRO(STUBCODE_U, Name, SyscallId, ArgCount) +- stwu 1,-16(1) +- mflr 0 +- stw 0,0(1) +- li 0, SyscallId +- sc +- lwz 0,0(1) +- mtlr 0 +- addi 1,1,16 +- blr +-ENDM +-#define STUBCODE_K STUBCODE_U +-#elif defined(_M_MIPS) +-MACRO(STUBCODE_U, Name, SyscallId, ArgCount) +- li $8, KUSER_SHARED_SYSCALL +- lw $8,0($8) +- j $8 +- nop +-ENDM +-MACRO(STUBCODE_K, Name, SyscallId, ArgCount) +- j KiSystemService +- nop +-ENDM +-#else +-#error unsupported architecture +-#endif ++ ret StackBytes ++ENDM ++MACRO(STUBCODE_K, Name, SyscallId, ArgCount) ++ StackBytes = 4 * &ArgCount ++ FPO 0, 0, 0, 0, 0, FRAME_FPO ++ mov eax, SyscallId ++ lea edx, [esp + 4] ++ pushfd ++ push KGDT_R0_CODE ++ call _KiSystemService ++ ret StackBytes ++ENDM ++#elif defined(_M_AMD64) ++MACRO(STUBCODE_U, Name, SyscallId, ArgCount) ++ .ENDPROLOG ++ mov eax, SyscallId ++ mov r10, rcx ++ syscall ++ ret ++ENDM ++MACRO(STUBCODE_K, Name, SyscallId, ArgCount) ++ .ENDPROLOG ++ EXTERN Nt&Name:PROC ++ lea rax, Nt&Name[rip] ++ mov r10, ArgCount * 8 ++ jmp KiZwSystemService ++ENDM ++#elif defined(_M_PPC) ++MACRO(STUBCODE_U, Name, SyscallId, ArgCount) ++ stwu 1,-16(1) ++ mflr 0 ++ stw 0,0(1) ++ li 0, SyscallId ++ sc ++ lwz 0,0(1) ++ mtlr 0 ++ addi 1,1,16 ++ blr ++ENDM ++#define STUBCODE_K STUBCODE_U ++#elif defined(_M_MIPS) ++MACRO(STUBCODE_U, Name, SyscallId, ArgCount) ++ li $8, KUSER_SHARED_SYSCALL ++ lw $8,0($8) ++ j $8 ++ nop ++ENDM ++MACRO(STUBCODE_K, Name, SyscallId, ArgCount) ++ j KiSystemService ++ nop ++ENDM ++#else ++#error unsupported architecture ++#endif ++ ++#ifdef _M_IX86 ++MACRO(MAKE_LABEL, Name, StackBytes) ++ PUBLIC _&Name&@&StackBytes ++ _&Name&@&StackBytes: ++ENDM ++MACRO(START_PROC, Name, StackBytes) ++ PUBLIC _&Name&@&StackBytes ++ .PROC _&Name&@&StackBytes ++ENDM ++#else ++MACRO(MAKE_LABEL, Name, StackBytes) ++ PUBLIC &Name ++ &Name: ++ENDM ++MACRO(START_PROC, Name, StackBytes) ++ PUBLIC &Name ++ .PROC &Name ++ENDM ++#endif ++ ++MACRO(STUB_U, Name, ArgCount) ++ MAKE_LABEL Zw&Name, %ArgCount * 4 ++ MAKE_LABEL Name, %ArgCount * 4 ++ START_PROC Nt&Name, %ArgCount * 4 ++ STUBCODE_U Name, SyscallId, %ArgCount ++ .ENDP ++ SyscallId = SyscallId + 1 ++ENDM ++ ++MACRO(STUB_K, Name, ArgCount) ++ MAKE_LABEL Name, %ArgCount * 4 ++ START_PROC Zw&Name, %ArgCount * 4 ++ STUBCODE_K Name, SyscallId, %ArgCount ++ .ENDP ++ SyscallId = SyscallId + 1 ++ENDM + +-#ifdef _M_IX86 +-MACRO(MAKE_LABEL, Name, StackBytes) +- PUBLIC _&Name&@&StackBytes +- _&Name&@&StackBytes: +-ENDM +-MACRO(START_PROC, Name, StackBytes) +- PUBLIC _&Name&@&StackBytes +- .PROC _&Name&@&StackBytes +-ENDM +-#else +-MACRO(MAKE_LABEL, Name, StackBytes) +- PUBLIC &Name +- &Name: +-ENDM +-MACRO(START_PROC, Name, StackBytes) +- PUBLIC &Name +- .PROC &Name +-ENDM + #endif +- +-MACRO(STUB_U, Name, ArgCount) +- MAKE_LABEL Zw&Name, %ArgCount * 4 +- START_PROC Nt&Name, %ArgCount * 4 +- STUBCODE_U Name, SyscallId, %ArgCount +- .ENDP +- SyscallId = SyscallId + 1 +-ENDM +- +-MACRO(STUB_K, Name, ArgCount) +- START_PROC Zw&Name, %ArgCount * 4 +- STUBCODE_K Name, SyscallId, %ArgCount +- .ENDP +- SyscallId = SyscallId + 1 +-ENDM +- +-#endif +Index: include/psdk/winddi.h +=================================================================== +--- include/psdk/winddi.h (revision 69519) ++++ include/psdk/winddi.h (working copy) +@@ -2911,7 +2911,7 @@ + _In_ ULONG cjSize, + _Out_bytecap_(cjSize) FONTINFO *pfi); + +-#if (NTDDI_VERSION <= NTDDI_WINXP) ++#if 0//(NTDDI_VERSION <= NTDDI_WINXP) + /* Obsolete in Windows 2000 and later */ + GAMMA_TABLES* + APIENTRY +Index: include/reactos/wine/config.h +=================================================================== +--- include/reactos/wine/config.h (revision 69519) ++++ include/reactos/wine/config.h (working copy) +@@ -1,3 +1,5 @@ ++#include "reactos/buildno.h" ++ + #define __WINE_CONFIG_H + + /* Define to a function attribute for Microsoft hotpatch assembly prefix. */ +Index: lib/3rdparty/CMakeLists.txt +=================================================================== +--- lib/3rdparty/CMakeLists.txt (revision 69519) ++++ lib/3rdparty/CMakeLists.txt (working copy) +@@ -2,7 +2,9 @@ + add_subdirectory(adns) + add_subdirectory(bzip2) + add_subdirectory(cardlib) ++if (NOT _ARWINSS_) + add_subdirectory(freetype) ++endif () + add_subdirectory(fullfat) + add_subdirectory(libmpg123) + add_subdirectory(libsamplerate) +Index: subsystems/win32/csrsrv/init.c +=================================================================== +--- subsystems/win32/csrsrv/init.c (revision 69519) ++++ subsystems/win32/csrsrv/init.c (working copy) +@@ -20,7 +20,7 @@ + /* DATA ***********************************************************************/ + + // Debug Flag +-ULONG CsrDebug = 0; // 0xFFFFFFFF; ++ULONG CsrDebug = 0xFFFFFFFF; + + HANDLE CsrHeap = NULL; + HANDLE CsrObjectDirectory = NULL; +Index: win32ss/CMakeLists.txt +=================================================================== +--- win32ss/CMakeLists.txt (revision 69519) ++++ win32ss/CMakeLists.txt (working copy) +@@ -10,7 +10,10 @@ + PROJECT(WIN32SS) + + add_subdirectory(drivers) ++add_subdirectory(user/winsrv) + ++if (NOT _ARWINSS_) ++ + if(USE_DIBLIB) + add_subdirectory(gdi/diblib) + endif() +@@ -18,7 +21,6 @@ + add_subdirectory(gdi/gdi32) + add_subdirectory(reactx) + add_subdirectory(user/user32) +-add_subdirectory(user/winsrv) + + spec2def(win32k.sys win32k.spec ADD_IMPORTLIB) + +@@ -243,3 +245,4 @@ + add_asm_files(win32ksys_asm sys-stubs.S) + add_library(win32ksys ${win32ksys_asm}) + set_target_properties(win32ksys PROPERTIES LINKER_LANGUAGE "C") ++endif() # _ARWINSS_ +\ No newline at end of file +Index: win32ss/drivers/CMakeLists.txt +=================================================================== +--- win32ss/drivers/CMakeLists.txt (revision 69519) ++++ win32ss/drivers/CMakeLists.txt (working copy) +@@ -1,6 +1,8 @@ + + add_subdirectory(displays) ++if (NOT _ARWINSS_) + add_subdirectory(font) ++endif () + add_subdirectory(miniport) + add_subdirectory(videoprt) + add_subdirectory(watchdog) +Index: win32ss/include/ntgdihdl.h +=================================================================== +--- win32ss/include/ntgdihdl.h (revision 69519) ++++ win32ss/include/ntgdihdl.h (working copy) +@@ -260,6 +260,7 @@ + DWORD dwCFCount; + } GDI_SHARED_HANDLE_TABLE, *PGDI_SHARED_HANDLE_TABLE; + ++#ifndef _ARWINSS_ + typedef struct _RGN_ATTR + { + ULONG AttrFlags; +@@ -347,6 +348,19 @@ + RGN_ATTR VisRectRegion; + } DC_ATTR, *PDC_ATTR; + ++#else ++ ++typedef struct _DC_ATTR ++{ ++ HDC hdc; ++ HDC hKernelDC; ++ RECT dc_rect; /* DC rectangle relative to drawable */ ++ HRGN region; /* Device region (visible region & clip region) */ ++ int cache_index; /* cache of a currently selected font */ ++} DC_ATTR, *PDC_ATTR; ++ ++#endif ++ + typedef struct _BRUSH_ATTR /* Used with pen too. */ + { + FLONG AttrFlags; +Index: win32ss/user/winsrv/consrv/conoutput.c +=================================================================== +--- win32ss/user/winsrv/consrv/conoutput.c (revision 69519) ++++ win32ss/user/winsrv/consrv/conoutput.c (working copy) +@@ -99,9 +99,13 @@ + * Indeed, the palette handle comes from a console app + * calling ourselves, running in CSRSS. + */ ++#ifndef _ARWINSS_ + NtUserConsoleControl(ConsoleMakePalettePublic, + &SetPaletteRequest->PaletteHandle, + sizeof(SetPaletteRequest->PaletteHandle)); ++#else ++ UNIMPLEMENTED; ++#endif + + Status = ConDrvSetConsolePalette(Buffer->Header.Console, + Buffer, +Index: win32ss/user/winsrv/consrv/frontends/gui/conwnd.c +=================================================================== +--- win32ss/user/winsrv/consrv/frontends/gui/conwnd.c (revision 69519) ++++ win32ss/user/winsrv/consrv/frontends/gui/conwnd.c (working copy) +@@ -159,7 +159,11 @@ + } + else + { ++#ifndef _ARWINSS_ + NtUserConsoleControl(GuiConsoleWndClassAtom, &WndClassAtom, sizeof(ATOM)); ++#else ++ UNIMPLEMENTED; ++#endif + } + + return (WndClassAtom != 0); +Index: win32ss/user/winsrv/consrv/frontends/gui/guiterm.c +=================================================================== +--- win32ss/user/winsrv/consrv/frontends/gui/guiterm.c (revision 69519) ++++ win32ss/user/winsrv/consrv/frontends/gui/guiterm.c (working copy) +@@ -160,9 +160,14 @@ + /* Assign this console input thread to this desktop */ + DesktopConsoleThreadInfo.DesktopHandle = GuiInitInfo->Desktop; // Duplicated desktop handle + DesktopConsoleThreadInfo.ThreadId = InputThreadId; ++#ifndef _ARWINSS_ + Status = NtUserConsoleControl(ConsoleCtrlDesktopConsoleThread, + &DesktopConsoleThreadInfo, + sizeof(DesktopConsoleThreadInfo)); ++#else ++ UNIMPLEMENTED; ++ Status = STATUS_UNSUCCESSFUL; ++#endif + if (!NT_SUCCESS(Status)) goto Quit; + + /* Connect this CSR thread to the USER subsystem */ +@@ -295,13 +300,17 @@ + + Quit: + DPRINT("CONSRV: Quit the Input Thread 0x%p, Status = 0x%08lx\n", InputThreadId, Status); +- ++ + /* Remove this console input thread from this desktop */ + // DesktopConsoleThreadInfo.DesktopHandle; + DesktopConsoleThreadInfo.ThreadId = 0; ++#ifndef _ARWINSS_ + NtUserConsoleControl(ConsoleCtrlDesktopConsoleThread, + &DesktopConsoleThreadInfo, + sizeof(DesktopConsoleThreadInfo)); ++#else ++ UNIMPLEMENTED ++#endif + + /* Close the duplicated desktop handle */ + CloseDesktop(DesktopConsoleThreadInfo.DesktopHandle); // NtUserCloseDesktop +@@ -358,11 +367,16 @@ + { + RtlInitUnicodeString(&DesktopPath, L"Default"); + } +- ++#ifndef _ARWINSS_ + hDesk = NtUserResolveDesktop(ConsoleLeaderProcessHandle, + &DesktopPath, + 0, + &hWinSta); ++#else ++ UNIMPLEMENTED ++ hDesk = NULL; ++#endif ++ + DPRINT("NtUserResolveDesktop(DesktopPath = '%wZ') returned hDesk = 0x%p; hWinSta = 0x%p\n", + &DesktopPath, hDesk, hWinSta); + +Index: win32ss/user/winsrv/usersrv/init.c +=================================================================== +--- win32ss/user/winsrv/usersrv/init.c (revision 69519) ++++ win32ss/user/winsrv/usersrv/init.c (working copy) +@@ -101,7 +101,20 @@ + NTAPI + CreateSystemThreads(PVOID pParam) + { ++#ifndef _ARWINSS_ + NtUserCallOneParam((DWORD)pParam, ONEPARAM_ROUTINE_CREATESYSTEMTHREADS); ++#else ++ DWORD WaitRes; ++ HANDLE hDummyEvent; ++ ++ hDummyEvent = CreateEventW(0, FALSE, FALSE, L""); ++ ++ while (TRUE) ++ { ++ WaitRes = WaitForSingleObject(hDummyEvent, INFINITE); ++ } ++ DPRINT1("WaitRes: 0x%x\n", WaitRes); ++#endif + DPRINT1("This thread should not terminate!\n"); + return 0; + } +@@ -173,6 +186,7 @@ + CsrApiPort = CsrQueryApiPort(); + + /* Inform win32k about the API port */ ++#ifndef _ARWINSS_ + Status = NtUserSetInformationThread(NtCurrentThread(), + UserThreadCsrApiPort, + &CsrApiPort, +@@ -181,6 +195,9 @@ + { + return Status; + } ++#else ++ UNIMPLEMENTED ++#endif + } + + /* Check connection info validity */ +@@ -199,9 +216,14 @@ + + /* Pass the request to win32k */ + ConnectInfo->dwDispatchCount = 0; // gDispatchTableValues; ++#ifndef _ARWINSS_ + Status = NtUserProcessConnect(CsrProcess->ProcessHandle, + ConnectInfo, + *ConnectionInfoLength); ++#else ++ Status = STATUS_SUCCESS; ++ UNIMPLEMENTED ++#endif + + return Status; + } +@@ -254,7 +276,11 @@ + } + + /* Set the process creation notify routine for BASE */ ++#ifndef _ARWINSS_ + BaseSetProcessCreateNotify(NtUserNotifyProcessCreate); ++#else ++ UNIMPLEMENTED ++#endif + + /* Initialize the kernel mode subsystem */ + Status = NtUserInitialize(USER_VERSION, +Index: win32ss/user/winsrv/usersrv/shutdown.c +=================================================================== +--- win32ss/user/winsrv/usersrv/shutdown.c (revision 69519) ++++ win32ss/user/winsrv/usersrv/shutdown.c (working copy) +@@ -381,7 +381,12 @@ + static BOOLEAN + IsConsoleMode(VOID) + { ++#ifndef _ARWINSS_ + return (BOOLEAN)NtUserCallNoParam(NOPARAM_ROUTINE_ISCONSOLEMODE); ++#else ++ UNIMPLEMENTED ++ return FALSE; ++#endif + } + + +@@ -678,9 +683,14 @@ + while (TRUE) + { + /* Notify Win32k and potentially Winlogon of the shutdown */ ++#ifndef _ARWINSS_ + Status = NtUserSetInformationThread(CsrThread->ThreadHandle, + UserThreadInitiateShutdown, + &Flags, sizeof(Flags)); ++#else ++ Status = STATUS_SUCCESS; ++ UNIMPLEMENTED ++#endif + DPRINT1("Win32k says: %lx\n", Status); + switch (Status) + { +@@ -736,9 +746,13 @@ + // FIXME: If Status == STATUS_CANCELLED, call RecordShutdownReason + + /* Tell Win32k and potentially Winlogon that we're done */ ++#ifndef _ARWINSS_ + NtUserSetInformationThread(CsrThread->ThreadHandle, + UserThreadEndShutdown, + &Status, sizeof(Status)); ++#else ++ UNIMPLEMENTED ++#endif + + DPRINT1("SrvExitWindowsEx returned 0x%08x\n", Status); + Propchange: branches/arwinss/arwinss/trunk.patch ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[sginsberg] 69528: [NTOS] Add super-complicated handling of global pages to KeFlushCurrentTb (pretty much the same code which has been in HalpFlushTLB for the past ~6 years). This should be all tha...
by sginsberg＠svn.reactos.org 14 Oct '15

14 Oct '15

Author: sginsberg Date: Wed Oct 14 19:33:35 2015 New Revision: 69528 URL: http://svn.reactos.org/svn/reactos?rev=69528&view=rev Log: [NTOS] Add super-complicated handling of global pages to KeFlushCurrentTb (pretty much the same code which has been in HalpFlushTLB for the past ~6 years). This should be all that is required to make this feature work (everything else being in place already), and *seems* to work fine but is disabled under a switch until tested thoroughly. Global pages, an important optimization that allows for not flushing the whole x86 TLB every time CR3 is changed (typically on context switch to a new process, or during process attach/detach), relies on us doing extra work whenever we do alter a global page. This is likely where any bugs will have to be flushed out! Fixup Ki386EnableGlobalPage while we are at it -- disable/restore interrupts properly, and verify PGE-bit isn't set (nothing should have touched it before this routine, which is responsible for initializing it, so we shouldn't have to disable it). Fix, but disable, the CPU-sync spin as well as there should be no particular reason to do this for PGE-enabling during initialization (no other processor will be messing with PTEs at this stage, as compared to a call to KeFlushEntireTb). Everyone, repeat after me: Global pages are awesome! Modified: trunk/reactos/ntoskrnl/include/ntoskrnl.h trunk/reactos/ntoskrnl/ke/i386/cpu.c trunk/reactos/ntoskrnl/ke/i386/patpge.c trunk/reactos/ntoskrnl/mm/ARM3/i386/init.c Modified: trunk/reactos/ntoskrnl/include/ntoskrnl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/ntoskrnl.… ============================================================================== --- trunk/reactos/ntoskrnl/include/ntoskrnl.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/ntoskrnl.h [iso-8859-1] Wed Oct 14 19:33:35 2015 @@ -98,6 +98,14 @@ #define ASSERT NT_ASSERT #endif + +// +// Switch for enabling global page support +// + +//#define _GLOBAL_PAGES_ARE_AWESOME_ + + /* Internal Headers */ #include "internal/ntoskrnl.h" #include "config.h" Modified: trunk/reactos/ntoskrnl/ke/i386/cpu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/cpu.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/cpu.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/cpu.c [iso-8859-1] Wed Oct 14 19:33:35 2015 @@ -878,8 +878,37 @@ NTAPI KeFlushCurrentTb(VOID) { + +#if !defined(_GLOBAL_PAGES_ARE_AWESOME_) + /* Flush the TLB by resetting CR3 */ __writecr3(__readcr3()); + +#else + + /* Check if global pages are enabled */ + if (KeFeatureBits & KF_GLOBAL_PAGE) + { + ULONG Cr4; + + /* Disable PGE */ + Cr4 = __readcr4() & ~CR4_PGE; + __writecr4(Cr4); + + /* Flush everything */ + __writecr3(__readcr3()); + + /* Re-enable PGE */ + __writecr4(Cr4 | CR4_PGE); + } + else + { + /* No global pages, resetting CR3 is enough */ + __writecr3(__readcr3()); + } + +#endif + } VOID Modified: trunk/reactos/ntoskrnl/ke/i386/patpge.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/patpge.c?… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/patpge.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/patpge.c [iso-8859-1] Wed Oct 14 19:33:35 2015 @@ -17,40 +17,41 @@ /* FUNCTIONS *****************************************************************/ +INIT_SECTION ULONG_PTR NTAPI -INIT_FUNCTION Ki386EnableGlobalPage(IN ULONG_PTR Context) { - PLONG Count = (PLONG)Context; - ULONG Cr4, Cr3; + //PLONG Count; +#if defined(_GLOBAL_PAGES_ARE_AWESOME_) + ULONG Cr4; +#endif + BOOLEAN Enable; /* Disable interrupts */ - _disable(); - - /* Decrease CPU Count and loop until it's reached 0 */ - do {InterlockedDecrement(Count);} while (!*Count); - - /* Now check if this is the Boot CPU */ - if (!KeGetPcr()->Number) - { - /* It is.FIXME: Patch KeFlushCurrentTb */ - } - - /* Now get CR4 and make sure PGE is masked out */ + Enable = KeDisableInterrupts(); + + /* Spin until other processors are ready */ + //Count = (PLONG)Context; + //InterlockedDecrement(Count); + //while (*Count) YieldProcessor(); + +#if defined(_GLOBAL_PAGES_ARE_AWESOME_) + + /* Get CR4 and ensure global pages are disabled */ Cr4 = __readcr4(); - __writecr4(Cr4 & ~CR4_PGE); - - /* Flush the TLB */ - Cr3 = __readcr3(); - __writecr3(Cr3); + ASSERT(!(Cr4 & CR4_PGE)); + + /* Reset CR3 to flush the TLB */ + __writecr3(__readcr3()); /* Now enable PGE */ - DPRINT("Global page support detected but not yet taken advantage of\n"); - //__writecr4(Cr4 | CR4_PGE); - - /* Restore interrupts */ - _enable(); + __writecr4(Cr4 | CR4_PGE); + +#endif + + /* Restore interrupts and return */ + KeRestoreInterrupts(Enable); return 0; } Modified: trunk/reactos/ntoskrnl/mm/ARM3/i386/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/i386/init… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/i386/init.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/i386/init.c [iso-8859-1] Wed Oct 14 19:33:35 2015 @@ -249,15 +249,18 @@ PMMPFN Pfn1; ULONG Flags; +#if defined(_GLOBAL_PAGES_ARE_AWESOME_) + /* Check for global bit */ -#if 0 if (KeFeatureBits & KF_GLOBAL_PAGE) { /* Set it on the template PTE and PDE */ ValidKernelPte.u.Hard.Global = TRUE; ValidKernelPde.u.Hard.Global = TRUE; } + #endif + /* Now templates are ready */ TempPte = ValidKernelPte; TempPde = ValidKernelPde;

1 0

[fireball] 69527: [ARWINSS] - Fix win32k build.
by fireball＠svn.reactos.org 14 Oct '15

14 Oct '15

Author: fireball Date: Wed Oct 14 19:14:56 2015 New Revision: 69527 URL: http://svn.reactos.org/svn/reactos?rev=69527&view=rev Log: [ARWINSS] - Fix win32k build. Modified: branches/arwinss/arwinss/server/CMakeLists.txt branches/arwinss/arwinss/server/dib/dib1bpp.c branches/arwinss/arwinss/server/dib/dib8bpp.c branches/arwinss/arwinss/server/eng/device.c branches/arwinss/arwinss/server/eng/engblt.c branches/arwinss/arwinss/server/eng/engpal.c branches/arwinss/arwinss/server/gre/bitblt.c branches/arwinss/arwinss/server/gre/drawing.c branches/arwinss/arwinss/server/gre/font.c branches/arwinss/arwinss/server/gre/lineto.c branches/arwinss/arwinss/server/gre/rect.c branches/arwinss/arwinss/server/include/win32k.h branches/arwinss/arwinss/server/main/keyboard.c branches/arwinss/arwinss/server/wine/timeout.c Modified: branches/arwinss/arwinss/server/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/arwinss/arwinss/server/CMakeLis… ============================================================================== --- branches/arwinss/arwinss/server/CMakeLists.txt [iso-8859-1] (original) +++ branches/arwinss/arwinss/server/CMakeLists.txt [iso-8859-1] Wed Oct 14 19:14:56 2015 @@ -3,7 +3,7 @@ include_directories( . include - ${REACTOS_SOURCE_DIR}/win32ss + ${REACTOS_SOURCE_DIR}/win32ss/include ${REACTOS_SOURCE_DIR}/ntoskrnl/include ${REACTOS_SOURCE_DIR}/lib/3rdparty/freetype/include ${REACTOS_SOURCE_DIR}/include/reactos/subsys Modified: branches/arwinss/arwinss/server/dib/dib1bpp.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/arwinss/server/dib/dib1… ============================================================================== --- branches/arwinss/arwinss/server/dib/dib1bpp.c [iso-8859-1] (original) +++ branches/arwinss/arwinss/server/dib/dib1bpp.c [iso-8859-1] Wed Oct 14 19:14:56 2015 @@ -82,7 +82,7 @@ int dy2; // dest y end int sy1; // src y start - int dx; + //int dx; int shift; BYTE srcmask, dstmask, xormask; @@ -139,12 +139,12 @@ pd = d; ps = s; srcmask = 0xff; - dx = dwx; /* dest x for this pass */ + //dx = dwx; /* dest x for this pass */ if ( dwx < dl ) { int diff = dl-dwx; srcmask &= (1<<(8-diff))-1; - dx = dl; + //dx = dl; } if ( dwx+7 > dr ) { Modified: branches/arwinss/arwinss/server/dib/dib8bpp.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/arwinss/server/dib/dib8… ============================================================================== --- branches/arwinss/arwinss/server/dib/dib8bpp.c [iso-8859-1] (original) +++ branches/arwinss/arwinss/server/dib/dib8bpp.c [iso-8859-1] Wed Oct 14 19:14:56 2015 @@ -263,7 +263,7 @@ RECTL* DestRect, RECTL *SourceRect, XLATEOBJ *ColorTranslation, ULONG iTransColor) { - ULONG RoundedRight, X, Y, SourceX = 0, SourceY = 0, Source, wd, Dest; + ULONG RoundedRight, X, Y, SourceX = 0, SourceY = 0, Source/*, wd*/, Dest; ULONG *DestBits; LONG DstHeight; @@ -279,7 +279,7 @@ RoundedRight = DestRect->right - ((DestRect->right - DestRect->left) & 0x3); DestBits = (ULONG*)((PBYTE)DestSurf->pvScan0 + DestRect->left + (DestRect->top * DestSurf->lDelta)); - wd = DestSurf->lDelta - (DestRect->right - DestRect->left); + //wd = DestSurf->lDelta - (DestRect->right - DestRect->left); for(Y = DestRect->top; Y < DestRect->bottom; Y++) { Modified: branches/arwinss/arwinss/server/eng/device.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/arwinss/server/eng/devi… ============================================================================== --- branches/arwinss/arwinss/server/eng/device.c [iso-8859-1] (original) +++ branches/arwinss/arwinss/server/eng/device.c [iso-8859-1] Wed Oct 14 19:14:56 2015 @@ -736,6 +736,8 @@ if ((dwflags & CDS_SET_PRIMARY) == CDS_SET_PRIMARY) SetPrimary = TRUE; dwflags &= ~(CDS_RESET | CDS_SET_PRIMARY); + + DPRINT1("Global: %d, SetPrimary: %d\n", Global, SetPrimary); if (Reset && NoReset) return DISP_CHANGE_BADFLAGS; Modified: branches/arwinss/arwinss/server/eng/engblt.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/arwinss/server/eng/engb… ============================================================================== --- branches/arwinss/arwinss/server/eng/engblt.c [iso-8859-1] (original) +++ branches/arwinss/arwinss/server/eng/engblt.c [iso-8859-1] Wed Oct 14 19:14:56 2015 @@ -315,7 +315,7 @@ { BOOLEAN ret; COLORADJUSTMENT ca; - POINT MaskOrigin; + //POINT MaskOrigin; SURFACE *psurfDest; SURFACE *psurfSource = NULL; RECTL InputClippedRect; @@ -380,10 +380,10 @@ OutputRect = InputClippedRect; } - if (pMaskOrigin != NULL) + /*if (pMaskOrigin != NULL) { MaskOrigin.x = pMaskOrigin->x; MaskOrigin.y = pMaskOrigin->y; - } + }*/ /* No success yet */ ret = FALSE; @@ -711,11 +711,11 @@ POINTL Pt; ULONG Direction; BOOL UsesSource; - BOOL UsesPattern; + //BOOL UsesPattern; POINTL AdjustedBrushOrigin; UsesSource = ROP4_USES_SOURCE(rop4); - UsesPattern = ROP4_USES_PATTERN(rop4); + //UsesPattern = ROP4_USES_PATTERN(rop4); if (R4_NOOP == rop4) { /* Copy destination onto itself: nop */ Modified: branches/arwinss/arwinss/server/eng/engpal.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/arwinss/server/eng/engp… ============================================================================== --- branches/arwinss/arwinss/server/eng/engpal.c [iso-8859-1] (original) +++ branches/arwinss/arwinss/server/eng/engpal.c [iso-8859-1] Wed Oct 14 19:14:56 2015 @@ -460,7 +460,7 @@ int realized = 0; PDC dc; HPALETTE systemPalette; - USHORT sysMode, palMode; + //USHORT sysMode, palMode; dc = DC_LockDc(hDC); if (!dc) return 0; @@ -502,8 +502,8 @@ #endif // need to pass this to IntEngCreateXlate with palettes unlocked - sysMode = sysGDI->Mode; - palMode = palGDI->Mode; + //sysMode = sysGDI->Mode; + //palMode = palGDI->Mode; PALETTE_UnlockPalette(sysGDI); PALETTE_UnlockPalette(palGDI); Modified: branches/arwinss/arwinss/server/gre/bitblt.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/arwinss/server/gre/bitb… ============================================================================== --- branches/arwinss/arwinss/server/gre/bitblt.c [iso-8859-1] (original) +++ branches/arwinss/arwinss/server/gre/bitblt.c [iso-8859-1] Wed Oct 14 19:14:56 2015 @@ -1087,7 +1087,7 @@ EXLATEOBJ exlo; PPALETTE pDDBPalette, pDIBPalette; HPALETTE DDBPalette, DIBPalette = NULL; - ULONG DDBPaletteType, DIBPaletteType; + ULONG /*DDBPaletteType,*/ DIBPaletteType; if (!Bits) return 0; @@ -1145,7 +1145,7 @@ goto Exit; } - DDBPaletteType = pDDBPalette->Mode; + //DDBPaletteType = pDDBPalette->Mode; DIBPalette = BuildDIBPalette(bmi, (PINT)&DIBPaletteType); if (!DIBPalette) Modified: branches/arwinss/arwinss/server/gre/drawing.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/arwinss/server/gre/draw… ============================================================================== --- branches/arwinss/arwinss/server/gre/drawing.c [iso-8859-1] (original) +++ branches/arwinss/arwinss/server/gre/drawing.c [iso-8859-1] Wed Oct 14 19:14:56 2015 @@ -1264,10 +1264,10 @@ { int Start = ceil(StartArc); int End = ceil(EndArc); - BOOL Chord = (arctype == GdiTypeChord), ret; + BOOL Chord = (arctype == GdiTypeChord); // Sort out alignment here. - ret = app_fill_arc(dc, rect( XLeft, YLeft, Width, Height), + app_fill_arc(dc, rect( XLeft, YLeft, Width, Height), -End, //(dc->dclevel.flPath & DCPATH_CLOCKWISE) ? -End : -Start, -Start, //(dc->dclevel.flPath & DCPATH_CLOCKWISE) ? -Start : -End, dc->dclevel.pbrFill, BrushOrigin, Chord); Modified: branches/arwinss/arwinss/server/gre/font.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/arwinss/server/gre/font… ============================================================================== --- branches/arwinss/arwinss/server/gre/font.c [iso-8859-1] (original) +++ branches/arwinss/arwinss/server/gre/font.c [iso-8859-1] Wed Oct 14 19:14:56 2015 @@ -318,6 +318,8 @@ /* Release the surface and delete the bitmap */ GreDeleteObject(charBitmap); + + UNREFERENCED_LOCAL_VARIABLE(bRet); } static void SmoothGlyphColor(PDC physDev, INT x, INT y, @@ -456,6 +458,8 @@ /* Release the surface and delete the bitmap */ GreDeleteObject(charBitmap); + + UNREFERENCED_LOCAL_VARIABLE(bRet); } /* PUBLIC FUNCTIONS **********************************************************/ Modified: branches/arwinss/arwinss/server/gre/lineto.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/arwinss/server/gre/line… ============================================================================== --- branches/arwinss/arwinss/server/gre/lineto.c [iso-8859-1] (original) +++ branches/arwinss/arwinss/server/gre/lineto.c [iso-8859-1] Wed Oct 14 19:14:56 2015 @@ -103,7 +103,6 @@ const POINT *ptPoints, INT count) { - BOOLEAN bRet; POINT ptLine[2]; RECTL DestRect; MIX Mix; @@ -125,7 +124,7 @@ DestRect.right = max(ptLine[0].x, ptLine[1].x); DestRect.bottom = max(ptLine[0].y, ptLine[1].y); - bRet = GreLineTo(&pDC->dclevel.pSurface->SurfObj, + GreLineTo(&pDC->dclevel.pSurface->SurfObj, pDC->CombinedClip, &pDC->eboLine.BrushObject, ptLine[0].x, Modified: branches/arwinss/arwinss/server/gre/rect.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/arwinss/server/gre/rect… ============================================================================== --- branches/arwinss/arwinss/server/gre/rect.c [iso-8859-1] (original) +++ branches/arwinss/arwinss/server/gre/rect.c [iso-8859-1] Wed Oct 14 19:14:56 2015 @@ -57,6 +57,7 @@ &BrushOrigin, ROP3_TO_ROP4(PATCOPY), TRUE); + UNREFERENCED_LOCAL_VARIABLE(bRet); } } @@ -102,7 +103,6 @@ INT count, PRECTL DestRect) { - BOOLEAN bRet; MIX Mix; INT i; POINTL BrushOrigin; @@ -131,7 +131,7 @@ Mix = ROP2_TO_MIX(R2_COPYPEN);/*pdcattr->jROP2*/ for (i=0; i<count-1; i++) { - bRet = GreLineTo(&pDC->dclevel.pSurface->SurfObj, + GreLineTo(&pDC->dclevel.pSurface->SurfObj, pDC->CombinedClip, &pDC->eboLine.BrushObject, ptPoints[i].x, Modified: branches/arwinss/arwinss/server/include/win32k.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/arwinss/server/include/… ============================================================================== --- branches/arwinss/arwinss/server/include/win32k.h [iso-8859-1] (original) +++ branches/arwinss/arwinss/server/include/win32k.h [iso-8859-1] Wed Oct 14 19:14:56 2015 @@ -45,11 +45,11 @@ #include <pseh/pseh2.h> /* Public Win32K Headers */ -#include <include/callback.h> -#include <include/ntusrtyp.h> -#include <include/ntuser.h> -#include <include/ntgdityp.h> -#include <include/ntgdihdl.h> +#include <ntusrtyp.h> +#include <ntuser.h> +#include <callback.h> +#include <ntgdityp.h> +#include <ntgdihdl.h> #include <ntgdi.h> /* Internal Win32K Header */ Modified: branches/arwinss/arwinss/server/main/keyboard.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/arwinss/server/main/key… ============================================================================== --- branches/arwinss/arwinss/server/main/keyboard.c [iso-8859-1] (original) +++ branches/arwinss/arwinss/server/main/keyboard.c [iso-8859-1] Wed Oct 14 19:14:56 2015 @@ -591,6 +591,8 @@ // ret = 0; //} + UNREFERENCED_LOCAL_VARIABLE(KeyNames); + cleanup: //UserLeave(); return ret; Modified: branches/arwinss/arwinss/server/wine/timeout.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/arwinss/server/wine/tim… ============================================================================== --- branches/arwinss/arwinss/server/wine/timeout.c [iso-8859-1] (original) +++ branches/arwinss/arwinss/server/wine/timeout.c [iso-8859-1] Wed Oct 14 19:14:56 2015 @@ -212,7 +212,7 @@ ProcessTimers(); UserLeave(); } - DPRINT1("Timer thread exit!\n"); + DPRINT1("Timer thread exit! Status 0x%08X\n", Status); } VOID

1 0

[fireball] 69526: [ARWINSS] - Fix winent.drv compiling.
by fireball＠svn.reactos.org 14 Oct '15

14 Oct '15

Author: fireball Date: Wed Oct 14 12:04:19 2015 New Revision: 69526 URL: http://svn.reactos.org/svn/reactos?rev=69526&view=rev Log: [ARWINSS] - Fix winent.drv compiling. Modified: branches/arwinss/arwinss/client/winent.drv/clipboard.c branches/arwinss/arwinss/client/winent.drv/dib.c branches/arwinss/arwinss/client/winent.drv/mouse.c branches/arwinss/arwinss/client/winent.drv/window.c Modified: branches/arwinss/arwinss/client/winent.drv/clipboard.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/arwinss/client/winent.d… ============================================================================== --- branches/arwinss/arwinss/client/winent.drv/clipboard.c [iso-8859-1] (original) +++ branches/arwinss/arwinss/client/winent.drv/clipboard.c [iso-8859-1] Wed Oct 14 12:04:19 2015 @@ -269,14 +269,13 @@ void NTDRV_InitClipboard(void) { UINT i; - WINE_CLIPFORMAT *format; /* Register known mapping between window formats and X properties */ for (i = 0; i < sizeof(PropertyFormatMap)/sizeof(PropertyFormatMap[0]); i++) NTDRV_CLIPBOARD_InsertClipboardFormat(PropertyFormatMap[i].lpszFormat); /* Set up a conversion function from "HTML Format" to "text/html" */ - format = NTDRV_CLIPBOARD_InsertClipboardFormat(wszHTMLFormat); + (VOID)NTDRV_CLIPBOARD_InsertClipboardFormat(wszHTMLFormat); } #if 0 Modified: branches/arwinss/arwinss/client/winent.drv/dib.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/arwinss/client/winent.d… ============================================================================== --- branches/arwinss/arwinss/client/winent.drv/dib.c [iso-8859-1] (original) +++ branches/arwinss/arwinss/client/winent.drv/dib.c [iso-8859-1] Wed Oct 14 12:04:19 2015 @@ -136,7 +136,7 @@ INT CDECL RosDrv_SetDIBits( PDC_ATTR pdcattr, HBITMAP hbitmap, UINT startscan, UINT lines, LPCVOID bits, const BITMAPINFO *info, UINT coloruse ) { - LONG height, width, tmpheight; + LONG height, width; WORD infoBpp, compression; PVOID safeBits = NULL; INT result, bitsSize; @@ -146,7 +146,6 @@ &infoBpp, &compression ) == -1) return 0; - tmpheight = height; if (height < 0) height = -height; if (!lines || (startscan >= height)) return 0; Modified: branches/arwinss/arwinss/client/winent.drv/mouse.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/arwinss/client/winent.d… ============================================================================== --- branches/arwinss/arwinss/client/winent.drv/mouse.c [iso-8859-1] (original) +++ branches/arwinss/arwinss/client/winent.drv/mouse.c [iso-8859-1] Wed Oct 14 12:04:19 2015 @@ -117,6 +117,8 @@ cursor = (reply->count >= 0) ? wine_server_ptr_handle(reply->cursor) : 0; } SERVER_END_REQ; + + TRACE("cursor: 0x%x\n", cursor); } /*********************************************************************** Modified: branches/arwinss/arwinss/client/winent.drv/window.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/arwinss/client/winent.d… ============================================================================== --- branches/arwinss/arwinss/client/winent.drv/window.c [iso-8859-1] (original) +++ branches/arwinss/arwinss/client/winent.drv/window.c [iso-8859-1] Wed Oct 14 12:04:19 2015 @@ -317,7 +317,7 @@ { //DWORD style = GetWindowLongW( data->hwnd, GWL_STYLE ); LONG width, height; - LONG x, y; + //LONG x, y; SwmPosChanged(data->whole_window, &data->whole_rect, old_whole_rect, NULL, swp_flags); @@ -331,12 +331,12 @@ //GrResizeWindow(data->whole_window, width, height); /* only the size is allowed to change for the desktop window */ - if (data->whole_window != root_window) + /*if (data->whole_window != root_window) { x = data->whole_rect.left; y = data->whole_rect.top; - //GrMoveWindow(data->whole_window, x, y); - } + GrMoveWindow(data->whole_window, x, y); + }*/ if (!(swp_flags & SWP_NOZORDER) || (swp_flags & SWP_SHOWWINDOW)) { @@ -375,7 +375,7 @@ const RECT *old_whole_rect ) { LONG width, height; - BOOL resize = FALSE; + //BOOL resize = FALSE; RECT old = *old_client_rect; RECT new = data->client_rect; @@ -388,13 +388,13 @@ { if ((width = new.right - new.left) <= 0) width = 1; else if (width > 65535) width = 65535; - resize = TRUE; + //resize = TRUE; } if (old.bottom - old.top != new.bottom - new.top) { if ((height = new.bottom - new.top) <= 0) height = 1; else if (height > 65535) height = 65535; - resize = TRUE; + //resize = TRUE; } TRACE( "setting client win %lx pos %d,%d,%dx%d\n",

1 0

[fireball] 69525: [ARWINSS] - Use Wine's winternl.h instead of PSDK's one (same to what was done to gdi32) - Introduce a csr_shared.h which defines structs used for CSR communication. - Slightly fi...
by fireball＠svn.reactos.org 14 Oct '15

14 Oct '15

Author: fireball Date: Wed Oct 14 11:56:49 2015 New Revision: 69525 URL: http://svn.reactos.org/svn/reactos?rev=69525&view=rev Log: [ARWINSS] - Use Wine's winternl.h instead of PSDK's one (same to what was done to gdi32) - Introduce a csr_shared.h which defines structs used for CSR communication. - Slightly fix user32/csr.c ExitWindowsEx code. Added: branches/arwinss/arwinss/include/csr_shared.h (with props) Modified: branches/arwinss/arwinss/client/user32/caret.c branches/arwinss/arwinss/client/user32/combo.c branches/arwinss/arwinss/client/user32/csr.c branches/arwinss/arwinss/client/user32/hook.c branches/arwinss/arwinss/client/user32/input.c branches/arwinss/arwinss/client/user32/menu.c branches/arwinss/arwinss/client/user32/message.c branches/arwinss/arwinss/client/user32/misc.c branches/arwinss/arwinss/client/user32/msgbox.c branches/arwinss/arwinss/client/user32/painting.c branches/arwinss/arwinss/client/user32/property.c branches/arwinss/arwinss/client/user32/resource.c branches/arwinss/arwinss/client/user32/user_private.h branches/arwinss/arwinss/client/user32/win.c branches/arwinss/arwinss/client/user32/winpos.c branches/arwinss/arwinss/client/user32/winstation.c Modified: branches/arwinss/arwinss/client/user32/caret.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/arwinss/client/user32/c… ============================================================================== --- branches/arwinss/arwinss/client/user32/caret.c [iso-8859-1] (original) +++ branches/arwinss/arwinss/client/user32/caret.c [iso-8859-1] Wed Oct 14 11:56:49 2015 @@ -30,7 +30,7 @@ #include "winbase.h" #include "wingdi.h" #include "winuser.h" -#include "winternl.h" +#include "wine/winternl.h" #include "wine/server.h" #include "wine/debug.h" Modified: branches/arwinss/arwinss/client/user32/combo.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/arwinss/client/user32/c… ============================================================================== --- branches/arwinss/arwinss/client/user32/combo.c [iso-8859-1] (original) +++ branches/arwinss/arwinss/client/user32/combo.c [iso-8859-1] Wed Oct 14 11:56:49 2015 @@ -45,7 +45,7 @@ #include "user_private.h" #include "win.h" #include "controls.h" -#include "winternl.h" +#include "wine/winternl.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(combo); Modified: branches/arwinss/arwinss/client/user32/csr.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/arwinss/client/user32/c… ============================================================================== --- branches/arwinss/arwinss/client/user32/csr.c [iso-8859-1] (original) +++ branches/arwinss/arwinss/client/user32/csr.c [iso-8859-1] Wed Oct 14 11:56:49 2015 @@ -28,6 +28,7 @@ /* CSRSS Headers */ #include <subsys/csr/csr.h> +#include <csr_shared.h> #include <subsys/win/winmsg.h> #include "wine/debug.h" @@ -44,9 +45,10 @@ { NTSTATUS Status; USER_API_MESSAGE ApiMessage; + PUSER_EXIT_REACTOS ExitReactOSRequest = &ApiMessage.Data.ExitReactOSRequest; - ApiMessage.Data.ExitReactosRequest.Flags = uFlags; - ApiMessage.Data.ExitReactosRequest.Reserved = dwReserved; + ExitReactOSRequest->Flags = uFlags; + //ExitReactOSRequest->Reserved = dwReserved; Status = CsrClientCallServer((PCSR_API_MESSAGE)&ApiMessage, NULL, @@ -55,6 +57,7 @@ if (!NT_SUCCESS(Status)) { SetLastError(RtlNtStatusToDosError(Status)); + ExitReactOSRequest->Success = FALSE; return FALSE; } Modified: branches/arwinss/arwinss/client/user32/hook.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/arwinss/client/user32/h… ============================================================================== --- branches/arwinss/arwinss/client/user32/hook.c [iso-8859-1] (original) +++ branches/arwinss/arwinss/client/user32/hook.c [iso-8859-1] Wed Oct 14 11:56:49 2015 @@ -78,7 +78,7 @@ #include "wine/server.h" #include "wine/unicode.h" #include "wine/debug.h" -#include "winternl.h" +#include "wine/winternl.h" WINE_DEFAULT_DEBUG_CHANNEL(hook); WINE_DECLARE_DEBUG_CHANNEL(relay); Modified: branches/arwinss/arwinss/client/user32/input.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/arwinss/client/user32/i… ============================================================================== --- branches/arwinss/arwinss/client/user32/input.c [iso-8859-1] (original) +++ branches/arwinss/arwinss/client/user32/input.c [iso-8859-1] Wed Oct 14 11:56:49 2015 @@ -39,7 +39,7 @@ #include "wingdi.h" #include "winuser.h" #include "winnls.h" -#include "winternl.h" +#include "wine/winternl.h" #include "winerror.h" #include "win.h" #include "user_private.h" Modified: branches/arwinss/arwinss/client/user32/menu.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/arwinss/client/user32/m… ============================================================================== --- branches/arwinss/arwinss/client/user32/menu.c [iso-8859-1] (original) +++ branches/arwinss/arwinss/client/user32/menu.c [iso-8859-1] Wed Oct 14 11:56:49 2015 @@ -51,7 +51,7 @@ #include "winbase.h" #include "wingdi.h" #include "winnls.h" -#include "winternl.h" +#include "wine/winternl.h" #include "wine/server.h" #include "wine/unicode.h" #include "wine/exception.h" Modified: branches/arwinss/arwinss/client/user32/message.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/arwinss/client/user32/m… ============================================================================== --- branches/arwinss/arwinss/client/user32/message.c [iso-8859-1] (original) +++ branches/arwinss/arwinss/client/user32/message.c [iso-8859-1] Wed Oct 14 11:56:49 2015 @@ -38,7 +38,7 @@ #include "imm.h" #include "ddk/imm.h" #include "wine/unicode.h" -#include "winternl.h" +#include "wine/winternl.h" #include "wine/server.h" #include "user_private.h" #include "win.h" Modified: branches/arwinss/arwinss/client/user32/misc.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/arwinss/client/user32/m… ============================================================================== --- branches/arwinss/arwinss/client/user32/misc.c [iso-8859-1] (original) +++ branches/arwinss/arwinss/client/user32/misc.c [iso-8859-1] Wed Oct 14 11:56:49 2015 @@ -28,7 +28,7 @@ #include "wingdi.h" #include "winuser.h" #include "winnls.h" -#include "winternl.h" +#include "wine/winternl.h" #include "user_private.h" #include "wine/unicode.h" Modified: branches/arwinss/arwinss/client/user32/msgbox.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/arwinss/client/user32/m… ============================================================================== --- branches/arwinss/arwinss/client/user32/msgbox.c [iso-8859-1] (original) +++ branches/arwinss/arwinss/client/user32/msgbox.c [iso-8859-1] Wed Oct 14 11:56:49 2015 @@ -25,7 +25,7 @@ #include "windef.h" #include "winbase.h" #include "wingdi.h" -#include "winternl.h" +#include "wine/winternl.h" #include "dlgs.h" #include "user_private.h" #include "wine/debug.h" Modified: branches/arwinss/arwinss/client/user32/painting.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/arwinss/client/user32/p… ============================================================================== --- branches/arwinss/arwinss/client/user32/painting.c [iso-8859-1] (original) +++ branches/arwinss/arwinss/client/user32/painting.c [iso-8859-1] Wed Oct 14 11:56:49 2015 @@ -32,7 +32,7 @@ #include "winbase.h" #include "wingdi.h" #include "winuser.h" -#include "winternl.h" +#include "wine/winternl.h" #include "wine/server.h" #include "win.h" #include "user_private.h" Modified: branches/arwinss/arwinss/client/user32/property.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/arwinss/client/user32/p… ============================================================================== --- branches/arwinss/arwinss/client/user32/property.c [iso-8859-1] (original) +++ branches/arwinss/arwinss/client/user32/property.c [iso-8859-1] Wed Oct 14 11:56:49 2015 @@ -28,7 +28,7 @@ #include "winbase.h" #include "winuser.h" #include "wine/unicode.h" -#include "winternl.h" +#include "wine/winternl.h" #include "user_private.h" #include "wine/server.h" Modified: branches/arwinss/arwinss/client/user32/resource.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/arwinss/client/user32/r… ============================================================================== --- branches/arwinss/arwinss/client/user32/resource.c [iso-8859-1] (original) +++ branches/arwinss/arwinss/client/user32/resource.c [iso-8859-1] Wed Oct 14 11:56:49 2015 @@ -24,7 +24,7 @@ #include "windef.h" #include "winbase.h" #include "winerror.h" -#include "winternl.h" +#include "wine/winternl.h" #include "winnls.h" #include "wine/debug.h" #include "user_private.h" Modified: branches/arwinss/arwinss/client/user32/user_private.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/arwinss/client/user32/u… ============================================================================== --- branches/arwinss/arwinss/client/user32/user_private.h [iso-8859-1] (original) +++ branches/arwinss/arwinss/client/user32/user_private.h [iso-8859-1] Wed Oct 14 11:56:49 2015 @@ -28,7 +28,7 @@ #include "winuser.h" #include "winreg.h" #include <windowsx.h> -#include "winternl.h" +#include "wine/winternl.h" #define GET_WORD(ptr) (*(const WORD *)(ptr)) #define GET_DWORD(ptr) (*(const DWORD *)(ptr)) Modified: branches/arwinss/arwinss/client/user32/win.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/arwinss/client/user32/w… ============================================================================== --- branches/arwinss/arwinss/client/user32/win.c [iso-8859-1] (original) +++ branches/arwinss/arwinss/client/user32/win.c [iso-8859-1] Wed Oct 14 11:56:49 2015 @@ -28,7 +28,7 @@ #include "windef.h" #include "winbase.h" #include "winver.h" -#include "winternl.h" +#include "wine/winternl.h" #include "wine/server.h" #include "wine/unicode.h" #include "win.h" Modified: branches/arwinss/arwinss/client/user32/winpos.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/arwinss/client/user32/w… ============================================================================== --- branches/arwinss/arwinss/client/user32/winpos.c [iso-8859-1] (original) +++ branches/arwinss/arwinss/client/user32/winpos.c [iso-8859-1] Wed Oct 14 11:56:49 2015 @@ -30,7 +30,7 @@ #include "winbase.h" #include "wingdi.h" #include "winerror.h" -#include "winternl.h" +#include "wine/winternl.h" #include "wine/server.h" #include "controls.h" #include "user_private.h" Modified: branches/arwinss/arwinss/client/user32/winstation.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/arwinss/client/user32/w… ============================================================================== --- branches/arwinss/arwinss/client/user32/winstation.c [iso-8859-1] (original) +++ branches/arwinss/arwinss/client/user32/winstation.c [iso-8859-1] Wed Oct 14 11:56:49 2015 @@ -28,7 +28,7 @@ #include "winerror.h" #include "wingdi.h" #include "winuser.h" -#include "winternl.h" +#include "wine/winternl.h" #include "wine/server.h" #include "wine/unicode.h" #include "wine/debug.h" Added: branches/arwinss/arwinss/include/csr_shared.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/arwinss/include/csr_sha… ============================================================================== --- branches/arwinss/arwinss/include/csr_shared.h (added) +++ branches/arwinss/arwinss/include/csr_shared.h [iso-8859-1] Wed Oct 14 11:56:49 2015 @@ -0,0 +1,72 @@ +#pragma once + +/* FNID's for NtUserSetWindowFNID, NtUserMessageCall */ +#define FNID_FIRST 0x029A +#define FNID_SCROLLBAR 0x029A +#define FNID_ICONTITLE 0x029B +#define FNID_MENU 0x029C +#define FNID_DESKTOP 0x029D +#define FNID_DEFWINDOWPROC 0x029E +#define FNID_MESSAGEWND 0x029F +#define FNID_SWITCH 0x02A0 +#define FNID_BUTTON 0x02A1 +#define FNID_COMBOBOX 0x02A2 +#define FNID_COMBOLBOX 0x02A3 +#define FNID_DIALOG 0x02A4 +#define FNID_EDIT 0x02A5 +#define FNID_LISTBOX 0x02A6 +#define FNID_MDICLIENT 0x02A7 +#define FNID_STATIC 0x02A8 +#define FNID_IME 0x02A9 +#define FNID_GHOST 0x02AA +#define FNID_CALLWNDPROC 0x02AB +#define FNID_CALLWNDPROCRET 0x02AC +#define FNID_HKINLPCWPEXSTRUCT 0x02AD +#define FNID_HKINLPCWPRETEXSTRUCT 0x02AE +#define FNID_MB_DLGPROC 0x02AF +#define FNID_MDIACTIVATEDLGPROC 0x02B0 +#define FNID_SENDMESSAGE 0x02B1 +#define FNID_SENDMESSAGEFF 0x02B2 +/* Kernel has option to use TimeOut or normal msg send, based on type of msg. */ +#define FNID_SENDMESSAGEWTOOPTION 0x02B3 +#define FNID_SENDMESSAGECALLPROC 0x02B4 +#define FNID_BROADCASTSYSTEMMESSAGE 0x02B5 +#define FNID_TOOLTIPS 0x02B6 +#define FNID_SENDNOTIFYMESSAGE 0x02B7 +#define FNID_SENDMESSAGECALLBACK 0x02B8 +#define FNID_LAST 0x02B9 + +typedef struct _WNDMSG +{ + DWORD maxMsgs; + PINT abMsgs; +} WNDMSG, *PWNDMSG; + +typedef PVOID PSERVERINFO; + +typedef struct _SHAREDINFO +{ + PSERVERINFO psi; /* global Server Info */ + PVOID aheList; /* Handle Entry List */ + PVOID pDispInfo; /* global PDISPLAYINFO pointer */ + ULONG_PTR ulSharedDelta; /* Heap delta */ + WNDMSG awmControl[FNID_LAST - FNID_FIRST]; + WNDMSG DefWindowMsgs; + WNDMSG DefWindowSpecMsgs; +} SHAREDINFO, *PSHAREDINFO; + +/* See also the USERSRV_API_CONNECTINFO #define in include/reactos/subsys/win/winmsg.h */ +typedef struct _USERCONNECT +{ + ULONG ulVersion; + ULONG ulCurrentVersion; + DWORD dwDispatchCount; + SHAREDINFO siClient; +} USERCONNECT, *PUSERCONNECT; + +/* WinNT 5.0 compatible user32 / win32k */ +#define USER_VERSION MAKELONG(0x0000, 0x0005) + +#if defined(_M_IX86) +C_ASSERT(sizeof(USERCONNECT) == 0x124); +#endif Propchange: branches/arwinss/arwinss/include/csr_shared.h ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[fireball] 69524: [ARWINSS] - Use proper winternl.h header from Wine. - metafile.c: No need to save font from the DC as it's not necessary to restore it (see recent Wine src code). - freetype.c: Co...
by fireball＠svn.reactos.org 14 Oct '15

14 Oct '15

Author: fireball Date: Wed Oct 14 11:27:08 2015 New Revision: 69524 URL: http://svn.reactos.org/svn/reactos?rev=69524&view=rev Log: [ARWINSS] - Use proper winternl.h header from Wine. - metafile.c: No need to save font from the DC as it's not necessary to restore it (see recent Wine src code). - freetype.c: Comment out unused variable. Modified: branches/arwinss/arwinss/client/gdi32/dc.c branches/arwinss/arwinss/client/gdi32/freetype.c branches/arwinss/arwinss/client/gdi32/gdiobj.c branches/arwinss/arwinss/client/gdi32/metafile.c branches/arwinss/arwinss/client/gdi32/opengl.c Modified: branches/arwinss/arwinss/client/gdi32/dc.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/arwinss/client/gdi32/dc… ============================================================================== --- branches/arwinss/arwinss/client/gdi32/dc.c [iso-8859-1] (original) +++ branches/arwinss/arwinss/client/gdi32/dc.c [iso-8859-1] Wed Oct 14 11:27:08 2015 @@ -28,7 +28,7 @@ #include "winbase.h" #include "wingdi.h" #include "winreg.h" -#include "winternl.h" +#include "wine/winternl.h" #include "winerror.h" #include "gdi_private.h" #include "wine/unicode.h" Modified: branches/arwinss/arwinss/client/gdi32/freetype.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/arwinss/client/gdi32/fr… ============================================================================== --- branches/arwinss/arwinss/client/gdi32/freetype.c [iso-8859-1] (original) +++ branches/arwinss/arwinss/client/gdi32/freetype.c [iso-8859-1] Wed Oct 14 11:27:08 2015 @@ -1653,7 +1653,7 @@ { HANDLE hkey; BOOL ret = FALSE; - DWORD type, max_val, max_data, val_len, data_len, index; + DWORD /*type,*/max_val, max_data, val_len, data_len, index; WCHAR *value, *data; WCHAR *entry, *next; SYSTEM_LINKS *font_link, *system_font_link; @@ -1729,7 +1729,7 @@ } /* Copy type and data length */ - type = info->Type; + //type = info->Type; data_len = info->DataLength; Modified: branches/arwinss/arwinss/client/gdi32/gdiobj.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/arwinss/client/gdi32/gd… ============================================================================== --- branches/arwinss/arwinss/client/gdi32/gdiobj.c [iso-8859-1] (original) +++ branches/arwinss/arwinss/client/gdi32/gdiobj.c [iso-8859-1] Wed Oct 14 11:27:08 2015 @@ -31,7 +31,7 @@ #include "winreg.h" #include "winnls.h" #include "winerror.h" -#include "winternl.h" +#include "wine/winternl.h" #include "gdi_private.h" #include "wine/debug.h" Modified: branches/arwinss/arwinss/client/gdi32/metafile.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/arwinss/client/gdi32/me… ============================================================================== --- branches/arwinss/arwinss/client/gdi32/metafile.c [iso-8859-1] (original) +++ branches/arwinss/arwinss/client/gdi32/metafile.c [iso-8859-1] Wed Oct 14 11:27:08 2015 @@ -56,7 +56,7 @@ #include "wingdi.h" #include "winreg.h" #include "winnls.h" -#include "winternl.h" +#include "wine/winternl.h" #include "gdi_private.h" #include "wine/debug.h" @@ -394,7 +394,6 @@ WORD i; HPEN hPen; HBRUSH hBrush; - HFONT hFont; HPALETTE hPal; HRGN hRgn; BOOL loaded = FALSE; @@ -409,7 +408,6 @@ /* save DC */ hPen = GetCurrentObject(hdc, OBJ_PEN); hBrush = GetCurrentObject(hdc, OBJ_BRUSH); - hFont = GetCurrentObject(hdc, OBJ_FONT); hPal = GetCurrentObject(hdc, OBJ_PAL); hRgn = CreateRectRgn(0, 0, 0, 0); Modified: branches/arwinss/arwinss/client/gdi32/opengl.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/arwinss/client/gdi32/op… ============================================================================== --- branches/arwinss/arwinss/client/gdi32/opengl.c [iso-8859-1] (original) +++ branches/arwinss/arwinss/client/gdi32/opengl.c [iso-8859-1] Wed Oct 14 11:27:08 2015 @@ -31,7 +31,7 @@ #include "winbase.h" #include "wingdi.h" #include "winerror.h" -#include "winternl.h" +#include "wine/winternl.h" #include "winnt.h" #include "gdi_private.h" #include "wine/debug.h"

1 0

[tfaber] 69523: [TCPIP] - Add missing OBJ_KERNEL_HANDLE and close handles accordingly CORE-10207
by tfaber＠svn.reactos.org 14 Oct '15

14 Oct '15

Author: tfaber Date: Wed Oct 14 09:26:56 2015 New Revision: 69523 URL: http://svn.reactos.org/svn/reactos?rev=69523&view=rev Log: [TCPIP] - Add missing OBJ_KERNEL_HANDLE and close handles accordingly CORE-10207 Modified: trunk/reactos/drivers/network/tcpip/datalink/lan.c Modified: trunk/reactos/drivers/network/tcpip/datalink/lan.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/data… ============================================================================== --- trunk/reactos/drivers/network/tcpip/datalink/lan.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/tcpip/datalink/lan.c [iso-8859-1] Wed Oct 14 09:26:56 2015 @@ -594,7 +594,7 @@ InitializeObjectAttributes(&ObjectAttributes, &TcpipRegistryPath, - OBJ_CASE_INSENSITIVE, + OBJ_CASE_INSENSITIVE | OBJ_KERNEL_HANDLE, 0, NULL); @@ -1074,7 +1074,7 @@ OBJECT_ATTRIBUTES Attributes; NTSTATUS Status; - InitializeObjectAttributes(&Attributes, RegistryPath, OBJ_CASE_INSENSITIVE, 0, 0); + InitializeObjectAttributes(&Attributes, RegistryPath, OBJ_CASE_INSENSITIVE | OBJ_KERNEL_HANDLE, 0, 0); Status = ZwOpenKey(RegHandle, KEY_ALL_ACCESS, &Attributes); return Status; } @@ -1198,8 +1198,8 @@ RtlFreeUnicodeString( &RootDevice ); RtlFreeUnicodeString( &LinkageKeyName ); RtlFreeUnicodeString( &DescKeyName ); - if( LinkageKey ) NtClose( LinkageKey ); - if( DescKey ) NtClose( DescKey ); + if( LinkageKey ) ZwClose( LinkageKey ); + if( DescKey ) ZwClose( DescKey ); TI_DbgPrint(DEBUG_DATALINK,("Returning %x\n", Status)); @@ -1242,7 +1242,7 @@ Kbio = ExAllocatePool( NonPagedPool, KbioLength ); if( !Kbio ) { TI_DbgPrint(DEBUG_DATALINK,("Failed to allocate memory\n")); - NtClose( EnumKey ); + ZwClose( EnumKey ); return STATUS_NO_MEMORY; } @@ -1251,7 +1251,7 @@ if( !NT_SUCCESS(Status) ) { TI_DbgPrint(DEBUG_DATALINK,("Couldn't enum key child %d\n", i)); - NtClose( EnumKey ); + ZwClose( EnumKey ); ExFreePool( Kbio ); return Status; } @@ -1265,14 +1265,14 @@ Status = CheckForDeviceDesc ( &EnumKeyName, &TargetKeyName, Name, DeviceDesc ); if( NT_SUCCESS(Status) ) { - NtClose( EnumKey ); + ZwClose( EnumKey ); ExFreePool( Kbio ); return Status; } else Status = STATUS_SUCCESS; } } - NtClose( EnumKey ); + ZwClose( EnumKey ); ExFreePool( Kbio ); return STATUS_UNSUCCESSFUL; }

1 0

[tfaber] 69522: [NDIS] - Add missing OBJ_KERNEL_HANDLE CORE-10207
by tfaber＠svn.reactos.org 14 Oct '15

14 Oct '15

Author: tfaber Date: Wed Oct 14 08:32:00 2015 New Revision: 69522 URL: http://svn.reactos.org/svn/reactos?rev=69522&view=rev Log: [NDIS] - Add missing OBJ_KERNEL_HANDLE CORE-10207 Modified: trunk/reactos/drivers/network/ndis/ndis/config.c trunk/reactos/drivers/network/ndis/ndis/protocol.c Modified: trunk/reactos/drivers/network/ndis/ndis/config.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/config.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/config.c [iso-8859-1] Wed Oct 14 08:32:00 2015 @@ -291,7 +291,7 @@ RtlCopyUnicodeString(&KeyNameU, ProtocolSection); RtlAppendUnicodeToString(&KeyNameU, PARAMETERS_KEY); - InitializeObjectAttributes(&KeyAttributes, &KeyNameU, OBJ_CASE_INSENSITIVE, NULL, NULL); + InitializeObjectAttributes(&KeyAttributes, &KeyNameU, OBJ_CASE_INSENSITIVE | OBJ_KERNEL_HANDLE, NULL, NULL); *Status = ZwOpenKey(&KeyHandle, KEY_ALL_ACCESS, &KeyAttributes); @@ -908,7 +908,7 @@ wcsncpy(KeyName->Buffer, KeyInformation->Name, KeyName->MaximumLength/sizeof(WCHAR)); KeyName->Length = (USHORT)min(KeyInformation->NameLength, KeyName->MaximumLength); - InitializeObjectAttributes(&KeyAttributes, KeyName, OBJ_CASE_INSENSITIVE, ConfigurationHandle, NULL); + InitializeObjectAttributes(&KeyAttributes, KeyName, OBJ_CASE_INSENSITIVE | OBJ_KERNEL_HANDLE, ConfigurationHandle, NULL); *Status = ZwOpenKey(&RegKeyHandle, KEY_ALL_ACCESS, &KeyAttributes); @@ -971,7 +971,7 @@ *KeyHandle = NULL; - InitializeObjectAttributes(&KeyAttributes, KeyName, OBJ_CASE_INSENSITIVE, ConfigurationHandle, 0); + InitializeObjectAttributes(&KeyAttributes, KeyName, OBJ_CASE_INSENSITIVE | OBJ_KERNEL_HANDLE, ConfigurationHandle, 0); *Status = ZwOpenKey(&RegKeyHandle, KEY_ALL_ACCESS, &KeyAttributes); if(*Status != STATUS_SUCCESS) Modified: trunk/reactos/drivers/network/ndis/ndis/protocol.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/protocol.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/protocol.c [iso-8859-1] Wed Oct 14 08:32:00 2015 @@ -933,7 +933,7 @@ RtlInitUnicodeString(&RegistryPath, RegistryPathStr); NDIS_DbgPrint(MAX_TRACE, ("Opening configuration key: %wZ\n", &RegistryPath)); - InitializeObjectAttributes(&ObjectAttributes, &RegistryPath, OBJ_CASE_INSENSITIVE, NULL, NULL); + InitializeObjectAttributes(&ObjectAttributes, &RegistryPath, OBJ_CASE_INSENSITIVE | OBJ_KERNEL_HANDLE, NULL, NULL); NtStatus = ZwOpenKey(&DriverKeyHandle, KEY_READ, &ObjectAttributes); ExFreePool(RegistryPathStr);

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs