Ros-diffs October 2011

ros-diffs@reactos.org

18 participants
369 discussions

[dgorbachev] 54130: [UNIATA] Nathan Lineback <~lineback~AT~toastytech~DOT~com~>: - Apply the Linux fix to UniATA. Bug #6500.

by dgorbachev＠svn.reactos.org

Author: dgorbachev Date: Fri Oct 14 05:33:49 2011 New Revision: 54130 URL: http://svn.reactos.org/svn/reactos?rev=54130&view=rev Log: [UNIATA] Nathan Lineback <~lineback~AT~toastytech~DOT~com~>: - Apply the Linux fix to UniATA. Bug #6500. Modified: trunk/reactos/drivers/storage/ide/uniata/id_init.cpp Modified: trunk/reactos/drivers/storage/ide/uniata/id_init.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… ============================================================================== --- trunk/reactos/drivers/storage/ide/uniata/id_init.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/ide/uniata/id_init.cpp [iso-8859-1] Fri Oct 14 05:33:49 2011 @@ -854,6 +854,32 @@ ULONG IoSize = 0; ULONG BaseMemAddress = 0; + + /* + * vt6420/1 has problems talking to some drives. The following + * is based on the fix from Joseph Chan <JosephChan(a)via.com.tw>. + * + * When host issues HOLD, device may send up to 20DW of data + * before acknowledging it with HOLDA and the host should be + * able to buffer them in FIFO. Unfortunately, some WD drives + * send upto 40DW before acknowledging HOLD and, in the + * default configuration, this ends up overflowing vt6421's + * FIFO, making the controller abort the transaction with + * R_ERR. + * + * Rx52[2] is the internal 128DW FIFO Flow control watermark + * adjusting mechanism enable bit and the default value 0 + * means host will issue HOLD to device when the left FIFO + * size goes below 32DW. Setting it to 1 makes the watermark + * 64DW. + * + * http://www.reactos.org/bugzilla/show_bug.cgi?id=6500 + */ + + if(DeviceID == 0x3149 || DeviceID == 0x3249) { //vt6420 or vt6421 + KdPrint2((PRINT_PREFIX "VIA 642x FIFO\n")); + ChangePciConfig1(0x52, a | (1 << 2)); + } switch(DeviceID) { case 0x3149: // VIA 6420

12 years, 11 months

[jimtabor] 54129: - Fix timers.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Fri Oct 14 02:44:48 2011 New Revision: 54129 URL: http://svn.reactos.org/svn/reactos?rev=54129&view=rev Log: - Fix timers. Modified: trunk/reactos/subsystems/win32/csrss/win32csr/dllmain.c Modified: trunk/reactos/subsystems/win32/csrss/win32csr/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/dllmain.c [iso-8859-1] Fri Oct 14 02:44:48 2011 @@ -216,7 +216,7 @@ InitializeListHead(&DosDeviceHistory); /* Start Keyboard, Mouse and Raw Input Threads */ - for (i = 0; i < 2; ++i) + for (i = 0; i < 3; ++i) { Status = RtlCreateUserThread(NtCurrentProcess(), NULL, TRUE, 0, 0, 0, (PTHREAD_START_ROUTINE)CreateSystemThreads, (PVOID)i, &ServerThread, &ClientId); if (NT_SUCCESS(Status))

12 years, 11 months

[rharabien] 54128: [WIN32K/CSRSS] - Remove outdated comments - Make Raw Input Thread CSRSS thread too Thanks to Smiley and ThFabba for investigating TEB issue

by rharabien＠svn.reactos.org

Author: rharabien Date: Thu Oct 13 22:38:58 2011 New Revision: 54128 URL: http://svn.reactos.org/svn/reactos?rev=54128&view=rev Log: [WIN32K/CSRSS] - Remove outdated comments - Make Raw Input Thread CSRSS thread too Thanks to Smiley and ThFabba for investigating TEB issue Modified: trunk/reactos/subsystems/win32/csrss/win32csr/dllmain.c trunk/reactos/subsystems/win32/win32k/ntuser/input.c Modified: trunk/reactos/subsystems/win32/csrss/win32csr/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/dllmain.c [iso-8859-1] Thu Oct 13 22:38:58 2011 @@ -196,6 +196,7 @@ HANDLE ServerThread; CLIENT_ID ClientId; NTSTATUS Status; + UINT i; CsrExports = *Exports; Win32CsrApiHeap = CsrssApiHeap; @@ -214,23 +215,18 @@ RtlInitializeCriticalSection(&Win32CsrDefineDosDeviceCritSec); InitializeListHead(&DosDeviceHistory); - Status = RtlCreateUserThread(NtCurrentProcess(), NULL, TRUE, 0, 0, 0, (PTHREAD_START_ROUTINE)CreateSystemThreads, (PVOID)0, &ServerThread, &ClientId); - if (NT_SUCCESS(Status)) - { - NtResumeThread(ServerThread, NULL); - NtClose(ServerThread); - } - else - DPRINT1("Cannot start keyboard thread!\n"); - - Status = RtlCreateUserThread(NtCurrentProcess(), NULL, TRUE, 0, 0, 0, (PTHREAD_START_ROUTINE)CreateSystemThreads, (PVOID)1, &ServerThread, &ClientId); - if (NT_SUCCESS(Status)) - { - NtResumeThread(ServerThread, NULL); - NtClose(ServerThread); - } - else - DPRINT1("Cannot start mouse thread!\n"); + /* Start Keyboard, Mouse and Raw Input Threads */ + for (i = 0; i < 2; ++i) + { + Status = RtlCreateUserThread(NtCurrentProcess(), NULL, TRUE, 0, 0, 0, (PTHREAD_START_ROUTINE)CreateSystemThreads, (PVOID)i, &ServerThread, &ClientId); + if (NT_SUCCESS(Status)) + { + NtResumeThread(ServerThread, NULL); + NtClose(ServerThread); + } + else + DPRINT1("Cannot start system thread: %u!\n", i); + } return TRUE; } Modified: trunk/reactos/subsystems/win32/win32k/ntuser/input.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/input.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/input.c [iso-8859-1] Thu Oct 13 22:38:58 2011 @@ -24,8 +24,6 @@ static DWORD LastInputTick = 0; static HANDLE MouseDeviceHandle; -static HANDLE RawInputThreadHandle; -static CLIENT_ID RawInputThreadId; static KEVENT InputThreadsStart; static BOOLEAN InputThreadsRunning = FALSE; @@ -216,14 +214,6 @@ FILE_SYNCHRONOUS_IO_ALERT); } while (!NT_SUCCESS(Status)); - /* Need to setup basic win32k for this thread to process WH_MOUSE_LL messages. */ - /*Status = Win32kInitWin32Thread(PsGetCurrentThread()); - if (!NT_SUCCESS(Status)) - { - ERR("Win32K: Failed making mouse thread a win32 thread.\n"); - return; //(Status); - }*/ - ptiMouse = PsGetCurrentThreadWin32Thread(); ptiMouse->TIF_flags |= TIF_SYSTEMTHREAD; TRACE("Mouse Thread 0x%x \n", ptiMouse); @@ -330,22 +320,6 @@ UserInitKeyboard(ghKeyboardDevice); - /* Not sure if converting this thread to a win32 thread is such - a great idea. Since we're posting keyboard messages to the focus - window message queue, we'll be (indirectly) doing sendmessage - stuff from this thread (for WH_KEYBOARD_LL processing), which - means we need our own message queue. If keyboard messages were - instead queued to the system message queue, the thread removing - the message from the system message queue would be responsible - for WH_KEYBOARD_LL processing and we wouldn't need this thread - to be a win32 thread. */ - /*Status = Win32kInitWin32Thread(PsGetCurrentThread()); - if (!NT_SUCCESS(Status)) - { - ERR("Win32K: Failed making keyboard thread a win32 thread.\n"); - return; //(Status); - }*/ - ptiKeyboard = PsGetCurrentThreadWin32Thread(); ptiKeyboard->TIF_flags |= TIF_SYSTEMTHREAD; TRACE("Keyboard Thread 0x%x \n", ptiKeyboard); @@ -447,17 +421,8 @@ Status = KeWaitForSingleObject(&Event, Executive, KernelMode, FALSE, &DueTime); } while (!NT_SUCCESS(Status)); - Objects[0] = &InputThreadsStart; Objects[1] = MasterTimer; - - // This thread requires win32k! - Status = Win32kInitWin32Thread(PsGetCurrentThread()); - if (!NT_SUCCESS(Status)) - { - ERR("Win32K: Failed making Raw Input thread a win32 thread.\n"); - return; //(Status); - } ptiRawInput = PsGetCurrentThreadWin32Thread(); ptiRawInput->TIF_flags |= TIF_SYSTEMTHREAD; @@ -501,6 +466,7 @@ { case 0: KeyboardThreadMain(NULL); break; case 1: MouseThreadMain(NULL); break; + case 2: RawInputThreadMain(NULL); break; default: ERR("Wrong type: %x\n", Type); } @@ -514,8 +480,6 @@ NTAPI InitInputImpl(VOID) { - NTSTATUS Status; - KeInitializeEvent(&InputThreadsStart, NotificationEvent, FALSE); MasterTimer = ExAllocatePoolWithTag(NonPagedPool, sizeof(KTIMER), USERTAG_SYSTEM); @@ -531,18 +495,6 @@ if(!UserInitDefaultKeyboardLayout()) { ERR("Failed to initialize default keyboard layout!\n"); - } - - Status = PsCreateSystemThread(&RawInputThreadHandle, - THREAD_ALL_ACCESS, - NULL, - NULL, - &RawInputThreadId, - RawInputThreadMain, - NULL); - if (!NT_SUCCESS(Status)) - { - ERR("Win32K: Failed to create raw thread.\n"); } InputThreadsRunning = TRUE;

12 years, 11 months

[rharabien] 54127: [CSRSS] - Remove DbgBreakPoint

by rharabien＠svn.reactos.org

Author: rharabien Date: Thu Oct 13 22:26:00 2011 New Revision: 54127 URL: http://svn.reactos.org/svn/reactos?rev=54127&view=rev Log: [CSRSS] - Remove DbgBreakPoint Modified: trunk/reactos/subsystems/win32/csrss/win32csr/dllmain.c Modified: trunk/reactos/subsystems/win32/csrss/win32csr/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/dllmain.c [iso-8859-1] Thu Oct 13 22:26:00 2011 @@ -184,7 +184,6 @@ { NtUserCallOneParam((DWORD_PTR)pParam, ONEPARAM_ROUTINE_CREATESYSTEMTHREADS); DPRINT1("This thread should not terminate!\n"); - DbgBreakPoint(); return 0; } @@ -194,6 +193,10 @@ PCSRSS_EXPORTED_FUNCS Exports, HANDLE CsrssApiHeap) { + HANDLE ServerThread; + CLIENT_ID ClientId; + NTSTATUS Status; + CsrExports = *Exports; Win32CsrApiHeap = CsrssApiHeap; @@ -211,32 +214,24 @@ RtlInitializeCriticalSection(&Win32CsrDefineDosDeviceCritSec); InitializeListHead(&DosDeviceHistory); - { - HANDLE ServerThread; - CLIENT_ID ClientId; - NTSTATUS Status; - - Status = RtlCreateUserThread(NtCurrentProcess(), NULL, TRUE, 0, 0, 0, (PTHREAD_START_ROUTINE)CreateSystemThreads, (PVOID)0, &ServerThread, &ClientId); - if (NT_SUCCESS(Status)) - { - NtResumeThread(ServerThread, NULL); - NtClose(ServerThread); - } - else - DPRINT1("Cannot start keyboard thread!\n"); - - Status = RtlCreateUserThread(NtCurrentProcess(), NULL, TRUE, 0, 0, 0, (PTHREAD_START_ROUTINE)CreateSystemThreads, (PVOID)1, &ServerThread, &ClientId); - if (NT_SUCCESS(Status)) - { - NtResumeThread(ServerThread, NULL); - NtClose(ServerThread); - } - else - DPRINT1("Cannot start mouse thread!\n"); - - DbgBreakPoint(); - } - + Status = RtlCreateUserThread(NtCurrentProcess(), NULL, TRUE, 0, 0, 0, (PTHREAD_START_ROUTINE)CreateSystemThreads, (PVOID)0, &ServerThread, &ClientId); + if (NT_SUCCESS(Status)) + { + NtResumeThread(ServerThread, NULL); + NtClose(ServerThread); + } + else + DPRINT1("Cannot start keyboard thread!\n"); + + Status = RtlCreateUserThread(NtCurrentProcess(), NULL, TRUE, 0, 0, 0, (PTHREAD_START_ROUTINE)CreateSystemThreads, (PVOID)1, &ServerThread, &ClientId); + if (NT_SUCCESS(Status)) + { + NtResumeThread(ServerThread, NULL); + NtClose(ServerThread); + } + else + DPRINT1("Cannot start mouse thread!\n"); + return TRUE; }

12 years, 11 months

[rharabien] 54126: [WIN32K] - Added Print Screen support in previous comit accidentally... - Fix build and warning about global object being removed

by rharabien＠svn.reactos.org

Author: rharabien Date: Thu Oct 13 22:24:02 2011 New Revision: 54126 URL: http://svn.reactos.org/svn/reactos?rev=54126&view=rev Log: [WIN32K] - Added Print Screen support in previous comit accidentally... - Fix build and warning about global object being removed Modified: trunk/reactos/subsystems/win32/win32k/include/input.h trunk/reactos/subsystems/win32/win32k/ntuser/clipboard.c Modified: trunk/reactos/subsystems/win32/win32k/include/input.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/input.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/input.h [iso-8859-1] Thu Oct 13 22:24:02 2011 @@ -46,6 +46,8 @@ BOOL FASTCALL IntMouseInput(MOUSEINPUT *mi, BOOL Injected); BOOL UserInitDefaultKeyboardLayout(VOID); PKBL UserHklToKbl(HKL hKl); +VOID NTAPI KeyboardThreadMain(PVOID StartContext); +DWORD NTAPI CreateSystemThreads(UINT Type); BOOL FASTCALL UserAttachThreadInput(PTHREADINFO,PTHREADINFO,BOOL); VOID FASTCALL DoTheScreenSaver(VOID); #define ThreadHasInputAccess(W32Thread) (TRUE) Modified: trunk/reactos/subsystems/win32/win32k/ntuser/clipboard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/clipboard.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/clipboard.c [iso-8859-1] Thu Oct 13 22:24:02 2011 @@ -62,6 +62,7 @@ else if (pElement->fmt == CF_BITMAP || pElement->fmt == CF_PALETTE || pElement->fmt == CF_DSPBITMAP) { + GreSetObjectOwner(pElement->hData, GDI_OBJ_HMGR_POWNED); GreDeleteObject(pElement->hData); } }

12 years, 11 months

[rharabien] 54125: [WIN32K/CSRSS] - Spawn keyboard and mouse input threads in csrss user-mode process so they are valid Win32 threads and have TEB

by rharabien＠svn.reactos.org

Author: rharabien Date: Thu Oct 13 22:22:49 2011 New Revision: 54125 URL: http://svn.reactos.org/svn/reactos?rev=54125&view=rev Log: [WIN32K/CSRSS] - Spawn keyboard and mouse input threads in csrss user-mode process so they are valid Win32 threads and have TEB Modified: trunk/reactos/subsystems/win32/csrss/win32csr/dllmain.c trunk/reactos/subsystems/win32/win32k/ntuser/input.c trunk/reactos/subsystems/win32/win32k/ntuser/keyboard.c trunk/reactos/subsystems/win32/win32k/ntuser/simplecall.c Modified: trunk/reactos/subsystems/win32/csrss/win32csr/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/dllmain.c [iso-8859-1] Thu Oct 13 22:22:49 2011 @@ -178,6 +178,16 @@ NtUserCallOneParam(Check, ONEPARAM_ROUTINE_CSRSS_GUICHECK); } +DWORD +WINAPI +CreateSystemThreads(PVOID pParam) +{ + NtUserCallOneParam((DWORD_PTR)pParam, ONEPARAM_ROUTINE_CREATESYSTEMTHREADS); + DPRINT1("This thread should not terminate!\n"); + DbgBreakPoint(); + return 0; +} + BOOL WINAPI Win32CsrInitialization(PCSRSS_API_DEFINITION *ApiDefinitions, PCSRPLUGIN_SERVER_PROCS ServerProcs, @@ -200,6 +210,33 @@ RtlInitializeCriticalSection(&Win32CsrDefineDosDeviceCritSec); InitializeListHead(&DosDeviceHistory); + + { + HANDLE ServerThread; + CLIENT_ID ClientId; + NTSTATUS Status; + + Status = RtlCreateUserThread(NtCurrentProcess(), NULL, TRUE, 0, 0, 0, (PTHREAD_START_ROUTINE)CreateSystemThreads, (PVOID)0, &ServerThread, &ClientId); + if (NT_SUCCESS(Status)) + { + NtResumeThread(ServerThread, NULL); + NtClose(ServerThread); + } + else + DPRINT1("Cannot start keyboard thread!\n"); + + Status = RtlCreateUserThread(NtCurrentProcess(), NULL, TRUE, 0, 0, 0, (PTHREAD_START_ROUTINE)CreateSystemThreads, (PVOID)1, &ServerThread, &ClientId); + if (NT_SUCCESS(Status)) + { + NtResumeThread(ServerThread, NULL); + NtClose(ServerThread); + } + else + DPRINT1("Cannot start mouse thread!\n"); + + DbgBreakPoint(); + } + return TRUE; } Modified: trunk/reactos/subsystems/win32/win32k/ntuser/input.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/input.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/input.c [iso-8859-1] Thu Oct 13 22:22:49 2011 @@ -24,10 +24,6 @@ static DWORD LastInputTick = 0; static HANDLE MouseDeviceHandle; -static HANDLE MouseThreadHandle; -static CLIENT_ID MouseThreadId; -static HANDLE KeyboardThreadHandle; -static CLIENT_ID KeyboardThreadId; static HANDLE RawInputThreadHandle; static CLIENT_ID RawInputThreadId; static KEVENT InputThreadsStart; @@ -212,7 +208,7 @@ DueTime.QuadPart = (LONGLONG)(-10000000); KeInitializeEvent(&Event, NotificationEvent, FALSE); Status = KeWaitForSingleObject(&Event, Executive, KernelMode, FALSE, &DueTime); - Status = NtOpenFile(&MouseDeviceHandle, + Status = ZwOpenFile(&MouseDeviceHandle, FILE_ALL_ACCESS, &MouseObjectAttributes, &Iosb, @@ -221,12 +217,12 @@ } while (!NT_SUCCESS(Status)); /* Need to setup basic win32k for this thread to process WH_MOUSE_LL messages. */ - Status = Win32kInitWin32Thread(PsGetCurrentThread()); + /*Status = Win32kInitWin32Thread(PsGetCurrentThread()); if (!NT_SUCCESS(Status)) { ERR("Win32K: Failed making mouse thread a win32 thread.\n"); return; //(Status); - } + }*/ ptiMouse = PsGetCurrentThreadWin32Thread(); ptiMouse->TIF_flags |= TIF_SYSTEMTHREAD; @@ -249,7 +245,7 @@ TRACE("Mouse Input Thread Starting...\n"); /*FIXME: Does mouse attributes need to be used for anything */ - Status = NtDeviceIoControlFile(MouseDeviceHandle, + Status = ZwDeviceIoControlFile(MouseDeviceHandle, NULL, NULL, NULL, @@ -268,7 +264,7 @@ while(InputThreadsRunning) { MOUSE_INPUT_DATA MouseInput; - Status = NtReadFile(MouseDeviceHandle, + Status = ZwReadFile(MouseDeviceHandle, NULL, NULL, NULL, @@ -304,7 +300,7 @@ } } -static VOID APIENTRY +VOID NTAPI KeyboardThreadMain(PVOID StartContext) { UNICODE_STRING KeyboardDeviceName = RTL_CONSTANT_STRING(L"\\Device\\KeyboardClass0"); @@ -321,11 +317,11 @@ { LARGE_INTEGER DueTime; KEVENT Event; - DueTime.QuadPart = (LONGLONG)(-10000000); + DueTime.QuadPart = (LONGLONG)(-100000000); KeInitializeEvent(&Event, NotificationEvent, FALSE); Status = KeWaitForSingleObject(&Event, Executive, KernelMode, FALSE, &DueTime); - Status = NtOpenFile(&ghKeyboardDevice, - FILE_ALL_ACCESS, + Status = ZwOpenFile(&ghKeyboardDevice, + FILE_READ_ACCESS,//FILE_ALL_ACCESS, &KeyboardObjectAttributes, &Iosb, 0, @@ -343,12 +339,12 @@ the message from the system message queue would be responsible for WH_KEYBOARD_LL processing and we wouldn't need this thread to be a win32 thread. */ - Status = Win32kInitWin32Thread(PsGetCurrentThread()); + /*Status = Win32kInitWin32Thread(PsGetCurrentThread()); if (!NT_SUCCESS(Status)) { ERR("Win32K: Failed making keyboard thread a win32 thread.\n"); return; //(Status); - } + }*/ ptiKeyboard = PsGetCurrentThreadWin32Thread(); ptiKeyboard->TIF_flags |= TIF_SYSTEMTHREAD; @@ -379,7 +375,7 @@ TRACE("KeyInput @ %08x\n", &KeyInput); - Status = NtReadFile (ghKeyboardDevice, + Status = ZwReadFile (ghKeyboardDevice, NULL, NULL, NULL, @@ -479,7 +475,7 @@ // for(;;) { - TRACE( "Raw Input Thread Waiting for start event\n" ); + TRACE("Raw Input Thread Waiting for start event\n"); Status = KeWaitForMultipleObjects( 2, Objects, @@ -489,11 +485,28 @@ TRUE, NULL, NULL); - TRACE( "Raw Input Thread Starting...\n" ); + TRACE("Raw Input Thread Starting...\n"); ProcessTimers(); } ERR("Raw Input Thread Exit!\n"); +} + +DWORD NTAPI +CreateSystemThreads(UINT Type) +{ + UserLeave(); + + switch (Type) + { + case 0: KeyboardThreadMain(NULL); break; + case 1: MouseThreadMain(NULL); break; + default: ERR("Wrong type: %x\n", Type); + } + + UserEnterShared(); + + return 0; } INIT_FUNCTION @@ -532,30 +545,6 @@ ERR("Win32K: Failed to create raw thread.\n"); } - Status = PsCreateSystemThread(&KeyboardThreadHandle, - THREAD_ALL_ACCESS, - NULL, - NULL, - &KeyboardThreadId, - KeyboardThreadMain, - NULL); - if (!NT_SUCCESS(Status)) - { - ERR("Win32K: Failed to create keyboard thread.\n"); - } - - Status = PsCreateSystemThread(&MouseThreadHandle, - THREAD_ALL_ACCESS, - NULL, - NULL, - &MouseThreadId, - MouseThreadMain, - NULL); - if (!NT_SUCCESS(Status)) - { - ERR("Win32K: Failed to create mouse thread.\n"); - } - InputThreadsRunning = TRUE; KeSetEvent(&InputThreadsStart, IO_NO_INCREMENT, FALSE); @@ -588,7 +577,7 @@ * e.g. services running in the service window station cannot block input */ if(!ThreadHasInputAccess(pti) || - !IntIsActiveDesktop(pti->rpdesk)) + !IntIsActiveDesktop(pti->rpdesk)) { EngSetLastError(ERROR_ACCESS_DENIED); return FALSE; Modified: trunk/reactos/subsystems/win32/win32k/ntuser/keyboard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/keyboard.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/keyboard.c [iso-8859-1] Thu Oct 13 22:22:49 2011 @@ -672,6 +672,83 @@ } /* + * SnapWindow + * + * Saves snapshot of specified window or whole screen in the clipboard + */ +static VOID +SnapWindow(HWND hWnd) +{ + HBITMAP hbm = NULL, hbmOld; + HDC hdc = NULL, hdcMem; + SETCLIPBDATA scd; + INT cx, cy; + PWND pWnd = NULL; + + TRACE("SnapWindow(%p)\n", hWnd); + + /* If no windows is given, make snapshot of desktop window */ + if (!hWnd) + hWnd = IntGetDesktopWindow(); + + pWnd = UserGetWindowObject(hWnd); + if (!pWnd) + { + ERR("Invalid window\n"); + goto cleanup; + } + + hdc = UserGetDCEx(pWnd, NULL, DCX_USESTYLE | DCX_WINDOW); + if (!hdc) + { + ERR("UserGetDCEx failed!\n"); + goto cleanup; + } + + cx = pWnd->rcWindow.right - pWnd->rcWindow.left; + cy = pWnd->rcWindow.bottom - pWnd->rcWindow.top; + + hbm = NtGdiCreateCompatibleBitmap(hdc, cx, cy); + if (!hbm) + { + ERR("NtGdiCreateCompatibleBitmap failed!\n"); + goto cleanup; + } + + hdcMem = NtGdiCreateCompatibleDC(hdc); + if (!hdcMem) + { + ERR("NtGdiCreateCompatibleDC failed!\n"); + goto cleanup; + } + + hbmOld = NtGdiSelectBitmap(hdcMem, hbm); + NtGdiBitBlt(hdcMem, 0, 0, cx, cy, hdc, 0, 0, SRCCOPY, 0, 0); + NtGdiSelectBitmap(hdcMem, hbmOld); + IntGdiDeleteDC(hdcMem, FALSE); + + /* Save snapshot in clipboard */ + if (UserOpenClipboard(NULL)) + { + UserEmptyClipboard(); + scd.fIncSerialNumber = TRUE; + scd.fGlobalHandle = FALSE; + if (UserSetClipboardData(CF_BITMAP, hbm, &scd)) + { + /* Bitmap is managed by system now */ + hbm = NULL; + } + UserCloseClipboard(); + } + +cleanup: + if (hbm) + GreDeleteObject(hbm); + if (hdc) + UserReleaseDC(hWnd, hdc, FALSE); +} + +/* * UserSendKeyboardInput * * Process keyboard input from input devices and SendInput API @@ -765,7 +842,18 @@ /* If we have a focus queue, post a keyboard message */ pFocusQueue = IntGetFocusMessageQueue(); - if (pFocusQueue && bPostMsg) + if (bIsDown && wVk == VK_SNAPSHOT) + { + if (pFocusQueue && + IS_KEY_DOWN(gafAsyncKeyState, VK_MENU) && + !IS_KEY_DOWN(gafAsyncKeyState, VK_CONTROL)) + { + SnapWindow(pFocusQueue->FocusWindow); + } + else + SnapWindow(NULL); + } + else if (pFocusQueue && bPostMsg) { /* Init message */ Msg.hwnd = pFocusQueue->FocusWindow; Modified: trunk/reactos/subsystems/win32/win32k/ntuser/simplecall.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/simplecall.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/simplecall.c [iso-8859-1] Thu Oct 13 22:22:49 2011 @@ -378,6 +378,8 @@ case ONEPARAM_ROUTINE_MESSAGEBEEP: RETURN ( UserPostMessage(hwndSAS, WM_LOGONNOTIFY, LN_MESSAGE_BEEP, Param) ); /* TODO: Implement sound sentry */ + case ONEPARAM_ROUTINE_CREATESYSTEMTHREADS: + RETURN(CreateSystemThreads(Param)); } ERR("Calling invalid routine number 0x%x in NtUserCallOneParam(), Param=0x%x\n", Routine, Param);

12 years, 11 months

[gadamopoulos] 54124: [win32k] - Fix and simplify retrieving the current process window station. All processes that enter win32k have a window station (including csrss)

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Thu Oct 13 22:16:58 2011 New Revision: 54124 URL: http://svn.reactos.org/svn/reactos?rev=54124&view=rev Log: [win32k] - Fix and simplify retrieving the current process window station. All processes that enter win32k have a window station (including csrss) Modified: trunk/reactos/subsystems/win32/win32k/ntuser/winsta.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/winsta.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/winsta.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/winsta.c [iso-8859-1] Thu Oct 13 22:16:58 2011 @@ -242,7 +242,7 @@ if (WindowStation == NULL) { - // ERR("Invalid window station handle\n"); + WARN("Invalid window station handle\n"); EngSetLastError(ERROR_INVALID_HANDLE); return STATUS_INVALID_HANDLE; } @@ -802,34 +802,11 @@ HWINSTA FASTCALL UserGetProcessWindowStation(VOID) { - NTSTATUS Status; - PTHREADINFO pti; - HWINSTA WinSta; - - if(PsGetCurrentProcess() != CsrProcess) - { - return PsGetCurrentProcess()->Win32WindowStation; - } - else - { - ERR("Should use ObFindHandleForObject\n"); - pti = PsGetCurrentThreadWin32Thread(); - Status = ObOpenObjectByPointer(pti->rpdesk->rpwinstaParent, - 0, - NULL, - WINSTA_ALL_ACCESS, - ExWindowStationObjectType, - UserMode, - (PHANDLE) &WinSta); - if (! NT_SUCCESS(Status)) - { - SetLastNtError(Status); - ERR("Unable to open handle for CSRSSs winsta, status 0x%08x\n", - Status); - return NULL; - } - return WinSta; - } + PPROCESSINFO ppi = PsGetCurrentProcessWin32Process(); + + //ASSERT(ppi->hwinsta); + + return ppi->hwinsta; } @@ -856,36 +833,19 @@ PWINSTATION_OBJECT FASTCALL IntGetWinStaObj(VOID) { - PWINSTATION_OBJECT WinStaObj; - PTHREADINFO Win32Thread; - PEPROCESS CurrentProcess; - - /* - * just a temporary hack, this will be gone soon - */ - - Win32Thread = PsGetCurrentThreadWin32Thread(); - if(Win32Thread != NULL && Win32Thread->rpdesk != NULL) - { - WinStaObj = Win32Thread->rpdesk->rpwinstaParent; - ObReferenceObjectByPointer(WinStaObj, KernelMode, ExWindowStationObjectType, 0); - } - else if((CurrentProcess = PsGetCurrentProcess()) != CsrProcess) - { - NTSTATUS Status = IntValidateWindowStationHandle(CurrentProcess->Win32WindowStation, + PWINSTATION_OBJECT WinStaObj; + NTSTATUS Status; + + Status = IntValidateWindowStationHandle( + UserGetProcessWindowStation(), KernelMode, 0, &WinStaObj); - if(!NT_SUCCESS(Status)) - { - SetLastNtError(Status); - return NULL; - } - } - else - { - WinStaObj = NULL; - } + if(!NT_SUCCESS(Status)) + { + SetLastNtError(Status); + return NULL; + } return WinStaObj; }

12 years, 11 months

[cgutman] 54123: [BOOTDATA] - Enable usbdrv.sys in 1st stage setup and the system hive - USB keyboards and mice work now (file bugs if you have problems)

by cgutman＠svn.reactos.org

Author: cgutman Date: Thu Oct 13 22:16:52 2011 New Revision: 54123 URL: http://svn.reactos.org/svn/reactos?rev=54123&view=rev Log: [BOOTDATA] - Enable usbdrv.sys in 1st stage setup and the system hive - USB keyboards and mice work now (file bugs if you have problems) Modified: trunk/reactos/boot/bootdata/hivesys_amd64.inf trunk/reactos/boot/bootdata/hivesys_i386.inf trunk/reactos/boot/bootdata/txtsetup.sif Modified: trunk/reactos/boot/bootdata/hivesys_amd64.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesys_amd6… ============================================================================== --- trunk/reactos/boot/bootdata/hivesys_amd64.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesys_amd64.inf [iso-8859-1] Thu Oct 13 22:16:52 2011 @@ -1415,11 +1415,11 @@ HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\Vga\Device0","DefaultSettings.YResolution",0x00010001,480 ; USB uhci/ehci driver -;HKLM,"SYSTEM\CurrentControlSet\Services\usbdriver","ErrorControl",0x00010001,0x00000000 -;HKLM,"SYSTEM\CurrentControlSet\Services\usbdriver","Group",0x00000000,"Base" -;HKLM,"SYSTEM\CurrentControlSet\Services\usbdriver","ImagePath",0x00020000,"system32\drivers\usbdriver.sys" -;HKLM,"SYSTEM\CurrentControlSet\Services\usbdriver","Start",0x00010001,0x00000001 -;HKLM,"SYSTEM\CurrentControlSet\Services\usbdriver","Type",0x00010001,0x00000001 +;HKLM,"SYSTEM\CurrentControlSet\Services\usbdrv","ErrorControl",0x00010001,0x00000000 +;HKLM,"SYSTEM\CurrentControlSet\Services\usbdrv","Group",0x00000000,"Base" +;HKLM,"SYSTEM\CurrentControlSet\Services\usbdrv","ImagePath",0x00020000,"system32\drivers\usbdrv.sys" +;HKLM,"SYSTEM\CurrentControlSet\Services\usbdrv","Start",0x00010001,0x00000001 +;HKLM,"SYSTEM\CurrentControlSet\Services\usbdrv","Type",0x00010001,0x00000001 ; USB storage driver ;HKLM,"SYSTEM\CurrentControlSet\Services\usbstor","ErrorControl",0x00010001,0x00000000 Modified: trunk/reactos/boot/bootdata/hivesys_i386.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesys_i386… ============================================================================== --- trunk/reactos/boot/bootdata/hivesys_i386.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesys_i386.inf [iso-8859-1] Thu Oct 13 22:16:52 2011 @@ -1730,11 +1730,11 @@ HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\Vga\Device0","DefaultSettings.YResolution",0x00010001,480 ; USB uhci/ehci driver -;HKLM,"SYSTEM\CurrentControlSet\Services\usbdriver","ErrorControl",0x00010001,0x00000000 -;HKLM,"SYSTEM\CurrentControlSet\Services\usbdriver","Group",0x00000000,"Base" -;HKLM,"SYSTEM\CurrentControlSet\Services\usbdriver","ImagePath",0x00020000,"system32\drivers\usbdriver.sys" -;HKLM,"SYSTEM\CurrentControlSet\Services\usbdriver","Start",0x00010001,0x00000001 -;HKLM,"SYSTEM\CurrentControlSet\Services\usbdriver","Type",0x00010001,0x00000001 +HKLM,"SYSTEM\CurrentControlSet\Services\usbdrv","ErrorControl",0x00010001,0x00000000 +HKLM,"SYSTEM\CurrentControlSet\Services\usbdrv","Group",0x00000000,"Base" +HKLM,"SYSTEM\CurrentControlSet\Services\usbdrv","ImagePath",0x00020000,"system32\drivers\usbdrv.sys" +HKLM,"SYSTEM\CurrentControlSet\Services\usbdrv","Start",0x00010001,0x00000001 +HKLM,"SYSTEM\CurrentControlSet\Services\usbdrv","Type",0x00010001,0x00000001 ; USB storage driver ;HKLM,"SYSTEM\CurrentControlSet\Services\usbstor","ErrorControl",0x00010001,0x00000000 Modified: trunk/reactos/boot/bootdata/txtsetup.sif URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/txtsetup.sif… ============================================================================== --- trunk/reactos/boot/bootdata/txtsetup.sif [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/txtsetup.sif [iso-8859-1] Thu Oct 13 22:16:52 2011 @@ -32,6 +32,7 @@ disk.sys=,,,,,,x,,,,,,4 floppy.sys=,,,,,,x,,,,,,4 i8042prt.sys=,,,,,,x,,,,,,4 +usbdrv.sys=,,,,,,x,,,,,,4 kbdclass.sys=,,,,,,x,,,,,,4 l_intl.nls=,,,,,,,,,,,,2 ntfs.sys=,,,,,,,,,,,,4

12 years, 11 months

[cgutman] 54122: [USBDRV] - Rename usbdriver to usbdrv (Freeloader can't load files that aren't 8.3 - needs looking into) - Include usbdrv in build

by cgutman＠svn.reactos.org

Author: cgutman Date: Thu Oct 13 22:07:31 2011 New Revision: 54122 URL: http://svn.reactos.org/svn/reactos?rev=54122&view=rev Log: [USBDRV] - Rename usbdriver to usbdrv (Freeloader can't load files that aren't 8.3 - needs looking into) - Include usbdrv in build Added: trunk/reactos/drivers/usb/nt4compat/usbdrv/ - copied from r54114, trunk/reactos/drivers/usb/nt4compat/usbdriver/ trunk/reactos/drivers/usb/nt4compat/usbdrv/usbdrv.rbuild - copied, changed from r54114, trunk/reactos/drivers/usb/nt4compat/usbdriver/usbdriver.rbuild Removed: trunk/reactos/drivers/usb/nt4compat/usbdriver/ trunk/reactos/drivers/usb/nt4compat/usbdrv/usbdriver.rbuild Modified: trunk/reactos/drivers/usb/CMakeLists.txt trunk/reactos/drivers/usb/directory.rbuild trunk/reactos/drivers/usb/nt4compat/CMakeLists.txt trunk/reactos/drivers/usb/nt4compat/directory.rbuild trunk/reactos/drivers/usb/nt4compat/usbdrv/CMakeLists.txt Modified: trunk/reactos/drivers/usb/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/CMakeLists.txt… ============================================================================== --- trunk/reactos/drivers/usb/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/CMakeLists.txt [iso-8859-1] Thu Oct 13 22:07:31 2011 @@ -1,5 +1,5 @@ -#add_subdirectory(nt4compat) +add_subdirectory(nt4compat) add_subdirectory(usbd) #add_subdirectory(usbehci) The USB branch has usbehci_new #add_subdirectory(usbhub) Compiles, just skipped in trunk Modified: trunk/reactos/drivers/usb/directory.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/directory.rbui… ============================================================================== --- trunk/reactos/drivers/usb/directory.rbuild [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/directory.rbuild [iso-8859-1] Thu Oct 13 22:07:31 2011 @@ -1,9 +1,9 @@ <?xml version="1.0"?> <!DOCTYPE group SYSTEM "../../tools/rbuild/project.dtd"> <group xmlns:xi="http://www.w3.org/2001/XInclude"> -  + </directory> <directory name="usbd"> <xi:include href="usbd/usbd.rbuild" /> </directory> Modified: trunk/reactos/drivers/usb/nt4compat/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/nt4compat/CMak… ============================================================================== --- trunk/reactos/drivers/usb/nt4compat/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/nt4compat/CMakeLists.txt [iso-8859-1] Thu Oct 13 22:07:31 2011 @@ -1,2 +1,2 @@ -add_subdirectory(usbdriver) +add_subdirectory(usbdrv) Modified: trunk/reactos/drivers/usb/nt4compat/directory.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/nt4compat/dire… ============================================================================== --- trunk/reactos/drivers/usb/nt4compat/directory.rbuild [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/nt4compat/directory.rbuild [iso-8859-1] Thu Oct 13 22:07:31 2011 @@ -1,7 +1,7 @@ <?xml version="1.0"?> <!DOCTYPE group SYSTEM "../../../tools/rbuild/project.dtd"> <group xmlns:xi="http://www.w3.org/2001/XInclude"> - <directory name="usbdriver"> - <xi:include href="usbdriver/usbdriver.rbuild" /> + <directory name="usbdrv"> + <xi:include href="usbdrv/usbdrv.rbuild" /> </directory> </group> Modified: trunk/reactos/drivers/usb/nt4compat/usbdrv/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/nt4compat/usbd… ============================================================================== --- trunk/reactos/drivers/usb/nt4compat/usbdrv/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/nt4compat/usbdrv/CMakeLists.txt [iso-8859-1] Thu Oct 13 22:07:31 2011 @@ -25,11 +25,11 @@ keyboard.c usbdriver.rc) -add_library(usbdriver SHARED ${SOURCE}) +add_library(usbdrv SHARED ${SOURCE}) -set_module_type(usbdriver kernelmodedriver) -add_importlibs(usbdriver ntoskrnl hal) +set_module_type(usbdrv kernelmodedriver) +add_importlibs(usbdrv ntoskrnl hal) -add_pch(usbdriver usbdriver.h) +add_pch(usbdrv usbdriver.h) -add_cd_file(TARGET usbdriver DESTINATION reactos/system32/drivers FOR all) +add_cd_file(TARGET usbdrv DESTINATION reactos/system32/drivers NO_CAB FOR all) Removed: trunk/reactos/drivers/usb/nt4compat/usbdrv/usbdriver.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/nt4compat/usbd… ============================================================================== --- trunk/reactos/drivers/usb/nt4compat/usbdrv/usbdriver.rbuild [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/nt4compat/usbdrv/usbdriver.rbuild (removed) @@ -1,30 +1,0 @@ -<?xml version="1.0"?> -<!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd"> -<module name="usbdriver" type="kernelmodedriver" installbase="system32/drivers" installname="usbdriver.sys"> - <define name="INCLUDE_EHCI" /> - <define name="_MULTI_UHCI" /> - <define name="_MULTI_EHCI" /> - <define name="_X86" /> - <include base="usbdriver">.</include> - <library>ntoskrnl</library> - <library>hal</library> - <file>ehci.c</file> - <file>ohci.c</file> - <file>uhci.c</file> - <file>roothub.c</file> - <file>hub.c</file> - <file>td.c</file> - <file>usb.c</file> - <file>umss.c</file> - <file>bulkonly.c</file> - <file>cbi.c</file> - <file>devmgr.c</file> - <file>dmgrdisp.c</file> - <file>compdrv.c</file> - <file>etd.c</file> - <file>gendrv.c</file> - <file>mouse.c</file> - <file>keyboard.c</file> - <file>usbdriver.rc</file> - <pch>usbdriver.h</pch> -</module> Copied: trunk/reactos/drivers/usb/nt4compat/usbdrv/usbdrv.rbuild (from r54114, trunk/reactos/drivers/usb/nt4compat/usbdriver/usbdriver.rbuild) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/nt4compat/usbd… ============================================================================== --- trunk/reactos/drivers/usb/nt4compat/usbdriver/usbdriver.rbuild [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/nt4compat/usbdrv/usbdrv.rbuild [iso-8859-1] Thu Oct 13 22:07:31 2011 @@ -1,11 +1,12 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd"> -<module name="usbdriver" type="kernelmodedriver" installbase="system32/drivers" installname="usbdriver.sys"> +<module name="usbdrv" type="kernelmodedriver" installbase="system32/drivers" installname="usbdrv.sys"> + <bootstrap installbase="$(CDOUTPUT)/system32/drivers" /> <define name="INCLUDE_EHCI" /> <define name="_MULTI_UHCI" /> <define name="_MULTI_EHCI" /> <define name="_X86" /> - <include base="usbdriver">.</include> + <include base="usbdrv">.</include> <library>ntoskrnl</library> <library>hal</library> <file>ehci.c</file>

12 years, 11 months

[akhaldi] 54121: [RTL] * Fix unix build.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Thu Oct 13 21:48:10 2011 New Revision: 54121 URL: http://svn.reactos.org/svn/reactos?rev=54121&view=rev Log: [RTL] * Fix unix build. Modified: trunk/reactos/lib/rtl/CMakeLists.txt Modified: trunk/reactos/lib/rtl/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/CMakeLists.txt?rev… ============================================================================== --- trunk/reactos/lib/rtl/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/CMakeLists.txt [iso-8859-1] Thu Oct 13 21:48:10 2011 @@ -70,7 +70,7 @@ i386/except.c i386/interlck.S i386/rtlmem.s - i386/rtlswap.s + i386/rtlswap.S i386/res_asm.s i386/thread.c) elseif(ARCH MATCHES amd64)

12 years, 11 months

← Newer
1
...
13
14
15
16
17
18
19
...
37
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs October 2011