Ros-diffs

ros-diffs@reactos.org

81390 discussions

[gdalsnes] 14255: readd incorrectly removed access mapping
by gdalsnes＠svn.reactos.com 21 Mar '05

21 Mar '05

readd incorrectly removed access mapping Modified: trunk/reactos/ntoskrnl/io/create.c _____ Modified: trunk/reactos/ntoskrnl/io/create.c --- trunk/reactos/ntoskrnl/io/create.c 2005-03-21 17:11:48 UTC (rev 14254) +++ trunk/reactos/ntoskrnl/io/create.c 2005-03-21 17:13:55 UTC (rev 14255) @@ -448,6 +448,9 @@ return Status; } + RtlMapGenericMask(&DesiredAccess, + BODY_TO_HEADER(FileObject)->ObjectType->Mapping); + Status = ObInsertObject ((PVOID)FileObject, NULL, DesiredAccess,

1 0

[gdalsnes] 14254: CopyAcceleratorTableA: dont access lpAccelDst it its NULL (w3seek)
by gdalsnes＠svn.reactos.com 21 Mar '05

21 Mar '05

CopyAcceleratorTableA: dont access lpAccelDst it its NULL (w3seek) Modified: trunk/reactos/lib/user32/windows/accel.c _____ Modified: trunk/reactos/lib/user32/windows/accel.c --- trunk/reactos/lib/user32/windows/accel.c 2005-03-21 17:09:06 UTC (rev 14253) +++ trunk/reactos/lib/user32/windows/accel.c 2005-03-21 17:11:48 UTC (rev 14254) @@ -285,38 +285,34 @@ } -/* - * @implemented - */ int WINAPI CopyAcceleratorTableA ( HACCEL hAccelSrc, - LPACCEL lpAccelDst, + LPACCEL lpAccelDst, /* can be NULL */ int cAccelEntries ) { - int i; - - cAccelEntries = CopyAcceleratorTableW(hAccelSrc, lpAccelDst, cAccelEntries); + int i; - if(cAccelEntries == 0) return 0; + cAccelEntries = CopyAcceleratorTableW(hAccelSrc, lpAccelDst, cAccelEntries); + + if (lpAccelDst == NULL) return cAccelEntries; - for(i = 0; i < cAccelEntries; ++ i) - if(!(lpAccelDst[i].fVirt & FVIRTKEY)) - { - NTSTATUS nErrCode = RtlUnicodeToMultiByteN - ( - (PCHAR)&lpAccelDst[i].key, - sizeof(lpAccelDst[i].key), - NULL, - (PWCHAR)&lpAccelDst[i].key, - sizeof(lpAccelDst[i].key) - ); - - if(!NT_SUCCESS(nErrCode)) lpAccelDst[i].key = 0; - } - - return cAccelEntries; + for(i = 0; i < cAccelEntries; ++ i) + if(!(lpAccelDst[i].fVirt & FVIRTKEY)) + { + NTSTATUS nErrCode = RtlUnicodeToMultiByteN( + (PCHAR)&lpAccelDst[i].key, + sizeof(lpAccelDst[i].key), + NULL, + (PWCHAR)&lpAccelDst[i].key, + sizeof(lpAccelDst[i].key) + ); + + if(!NT_SUCCESS(nErrCode)) lpAccelDst[i].key = 0; + } + + return cAccelEntries; }

1 0

[blight] 14253: Use a work item only for calling KdSystemDebugControl with code 10 (which is Tab + K, or "Enter Kernel Debugger") because sometimes when the system crashes work items do not work anymore. Thanks to Filip for pointing out the problem.
by blight＠svn.reactos.com 21 Mar '05

21 Mar '05

Use a work item only for calling KdSystemDebugControl with code 10 (which is Tab + K, or "Enter Kernel Debugger") because sometimes when the system crashes work items do not work anymore. Thanks to Filip for pointing out the problem. Modified: trunk/reactos/drivers/input/keyboard/keyboard.c _____ Modified: trunk/reactos/drivers/input/keyboard/keyboard.c --- trunk/reactos/drivers/input/keyboard/keyboard.c 2005-03-21 12:41:54 UTC (rev 14252) +++ trunk/reactos/drivers/input/keyboard/keyboard.c 2005-03-21 17:09:06 UTC (rev 14253) @@ -441,7 +441,7 @@ if (SystemArgument1 == NULL && DoSystemDebug != -1) { - if (KbdWorkItem != NULL) + if (KbdWorkItem != NULL && DoSystemDebug == 10) /* 10 is Tab + K (enter kernel debugger) */ { IoQueueWorkItem(KbdWorkItem, (PIO_WORKITEM_ROUTINE)KbdWorkItemRoutine, DelayedWorkQueue, NULL); }

1 0

[hpoussin] 14252: Based on work by Saveliy Tretiakov (saveliyt@mail.ru)
by hpoussin＠svn.reactos.com 21 Mar '05

21 Mar '05

Based on work by Saveliy Tretiakov (saveliyt(a)mail.ru) Implement IOCTL_SERIAL_GET_PROPERTIES Modified: trunk/reactos/drivers/dd/serial/devctrl.c _____ Modified: trunk/reactos/drivers/dd/serial/devctrl.c --- trunk/reactos/drivers/dd/serial/devctrl.c 2005-03-21 10:32:15 UTC (rev 14251) +++ trunk/reactos/drivers/dd/serial/devctrl.c 2005-03-21 12:41:54 UTC (rev 14252) @@ -178,6 +178,41 @@ return TRUE; } +NTSTATUS +SerialGetCommProp( + OUT PSERIAL_COMMPROP pCommProp, + IN PSERIAL_DEVICE_EXTENSION DeviceExtension) +{ + RtlZeroMemory(pCommProp, sizeof(SERIAL_COMMPROP)); + + pCommProp->PacketLength = sizeof(SERIAL_COMMPROP); + pCommProp->PacketVersion = 2; + pCommProp->ServiceMask = SERIAL_SP_SERIALCOMM; + pCommProp->MaxTxQueue = pCommProp->CurrentTxQueue = DeviceExtension->OutputBuffer.Length - 1; + pCommProp->MaxRxQueue = pCommProp->CurrentRxQueue = DeviceExtension->InputBuffer.Length - 1; + pCommProp->MaxBaud = SERIAL_BAUD_115200; + pCommProp->ProvSubType = 1; // PST_RS232; + /* FIXME: ProvCapabilities may be related to Uart type */ + pCommProp->ProvCapabilities = SERIAL_PCF_DTRDSR | SERIAL_PCF_INTTIMEOUTS | SERIAL_PCF_PARITY_CHECK + | SERIAL_PCF_RTSCTS | SERIAL_PCF_SETXCHAR | SERIAL_PCF_SPECIALCHARS | SERIAL_PCF_TOTALTIMEOUTS + | SERIAL_PCF_XONXOFF; + /* FIXME: SettableParams may be related to Uart type */ + pCommProp->SettableParams = SERIAL_SP_BAUD | SERIAL_SP_DATABITS | SERIAL_SP_HANDSHAKING + | SERIAL_SP_PARITY | SERIAL_SP_PARITY_CHECK | SERIAL_SP_STOPBITS; + /* FIXME: SettableBaud may be related to Uart type */ + pCommProp->SettableBaud = SERIAL_BAUD_075 | SERIAL_BAUD_110 | SERIAL_BAUD_134_5 + | SERIAL_BAUD_150 | SERIAL_BAUD_300 | SERIAL_BAUD_600 | SERIAL_BAUD_1200 + | SERIAL_BAUD_1800 | SERIAL_BAUD_2400 | SERIAL_BAUD_4800 | SERIAL_BAUD_7200 + | SERIAL_BAUD_9600 | SERIAL_BAUD_14400 | SERIAL_BAUD_19200 | SERIAL_BAUD_38400 + | SERIAL_BAUD_56K | SERIAL_BAUD_57600 | SERIAL_BAUD_115200 | SERIAL_BAUD_128K + | SERIAL_BAUD_USER; + pCommProp->SettableData = SERIAL_DATABITS_5 | SERIAL_DATABITS_6 | SERIAL_DATABITS_7 | SERIAL_DATABITS_8; + pCommProp->SettableStopParity = SERIAL_STOPBITS_10 | SERIAL_STOPBITS_15 | SERIAL_STOPBITS_20 + | SERIAL_PARITY_NONE | SERIAL_PARITY_ODD | SERIAL_PARITY_EVEN | SERIAL_PARITY_MARK | SERIAL_PARITY_SPACE; + + return STATUS_SUCCESS; +} + NTSTATUS STDCALL SerialDeviceControl( IN PDEVICE_OBJECT DeviceObject, @@ -349,9 +384,22 @@ } case IOCTL_SERIAL_GET_PROPERTIES: { - /* FIXME */ - DPRINT1("Serial: IOCTL_SERIAL_GET_PROPERTIES not implemented.\n"); - Status = STATUS_NOT_IMPLEMENTED; + DPRINT("Serial: IOCTL_SERIAL_GET_PROPERTIES\n"); + if (LengthOut < sizeof(SERIAL_COMMPROP)) + { + DPRINT("Serial: return STATUS_BUFFER_TOO_SMALL\n"); + Status = STATUS_BUFFER_TOO_SMALL; + } + else if (Buffer == NULL) + { + DPRINT("Serial: return STATUS_INVALID_PARAMETER\n"); + Status = STATUS_INVALID_PARAMETER; + } + else + { + Status = SerialGetCommProp((PSERIAL_COMMPROP)Buffer, DeviceExtension); + Information = sizeof(SERIAL_COMMPROP); + } break; } case IOCTL_SERIAL_GET_STATS:

1 0

[hpoussin] 14251: - Implement GetCommProperties (Saveliy Tretiakov <saveliyt@mail.ru>)
by hpoussin＠svn.reactos.com 21 Mar '05

21 Mar '05

- Implement GetCommProperties (Saveliy Tretiakov <saveliyt(a)mail.ru>) - Remove a test in GetCommState that shouldn't exist Modified: trunk/reactos/lib/kernel32/misc/comm.c _____ Modified: trunk/reactos/lib/kernel32/misc/comm.c --- trunk/reactos/lib/kernel32/misc/comm.c 2005-03-21 08:43:01 UTC (rev 14250) +++ trunk/reactos/lib/kernel32/misc/comm.c 2005-03-21 10:32:15 UTC (rev 14251) @@ -946,14 +946,15 @@ /* - * @unimplemented + * @implemented */ BOOL STDCALL GetCommProperties(HANDLE hFile, LPCOMMPROP lpCommProp) { - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; + DWORD dwBytesReturned; + return DeviceIoControl(hFile, IOCTL_SERIAL_GET_PROPERTIES, 0, 0, + lpCommProp, sizeof(COMMPROP), &dwBytesReturned, 0); } @@ -982,14 +983,15 @@ DPRINT("ERROR: GetCommState() - NULL DCB pointer\n"); return FALSE; } - if (lpDCB->DCBlength != sizeof(DCB)) { - DPRINT("ERROR: GetCommState() - Invalid DCB size\n"); - return FALSE; - } -// DPRINT(" GetCommState() CALLING DeviceIoControl\n"); -// result = DeviceIoControl(hFile, IOCTL_SERIAL_GET_COMMSTATUS, NULL, 0, NULL, 0, &dwBytesReturned, NULL); -// DPRINT(" GetCommState() DeviceIoControl returned %d\n", result); + lpDCB->DCBlength = sizeof(DCB); + + /* FIXME: need to fill following fields (1 bit): + * fBinary: binary mode, no EOF check + * fParity: enable parity checking + * fOutX : XON/XOFF out flow control + * fInX : XON/XOFF in flow control + */ result = DeviceIoControl(hFile, IOCTL_SERIAL_GET_BAUD_RATE, NULL, 0, &BaudRate, sizeof(BaudRate),&dwBytesReturned, NULL);

1 0

[navaraf] 14250: Fix a typo in write_function_stubs.
by navaraf＠svn.reactos.com 21 Mar '05

21 Mar '05

Fix a typo in write_function_stubs. Modified: trunk/reactos/tools/widl/ChangeLog Modified: trunk/reactos/tools/widl/client.c _____ Modified: trunk/reactos/tools/widl/ChangeLog --- trunk/reactos/tools/widl/ChangeLog 2005-03-21 08:32:22 UTC (rev 14249) +++ trunk/reactos/tools/widl/ChangeLog 2005-03-21 08:43:01 UTC (rev 14250) @@ -1,5 +1,11 @@ ChangeLog +2005-03-21 navaraf + + tools/widl/client.c + +Fix a typo in write_function_stubs. + 2005-03-20 navaraf tools/widl/client.c _____ Modified: trunk/reactos/tools/widl/client.c --- trunk/reactos/tools/widl/client.c 2005-03-21 08:32:22 UTC (rev 14249) +++ trunk/reactos/tools/widl/client.c 2005-03-21 08:43:01 UTC (rev 14250) @@ -817,7 +817,7 @@ print_client("(PMIDL_STUB_MESSAGE)&_StubMsg,\n"); print_client("_StubMsg.BufferLength,\n"); if (implicit_handle || explicit_handle) - print_client("%_Handle);\n"); + print_client("_Handle);\n"); else print_client("%s__MIDL_AutoBindHandle);\n", iface->name); indent--;

1 0

[navaraf] 14249: Specify correct access rights in NtOpenProcess when sending control events.
by navaraf＠svn.reactos.com 21 Mar '05

21 Mar '05

Specify correct access rights in NtOpenProcess when sending control events. Modified: trunk/reactos/subsys/csrss/win32csr/conio.c _____ Modified: trunk/reactos/subsys/csrss/win32csr/conio.c --- trunk/reactos/subsys/csrss/win32csr/conio.c 2005-03-21 01:59:21 UTC (rev 14248) +++ trunk/reactos/subsys/csrss/win32csr/conio.c 2005-03-21 08:32:22 UTC (rev 14249) @@ -94,7 +94,8 @@ /* using OpenProcess is not optimal due to HANDLE vs. DWORD PIDs... */ Status = NtOpenProcess(&Process, - PROCESS_DUP_HANDLE, + PROCESS_DUP_HANDLE | PROCESS_VM_OPERATION | + PROCESS_VM_WRITE | PROCESS_CREATE_THREAD, &ObjectAttributes, &ClientId); if (!NT_SUCCESS(Status)) @@ -110,7 +111,7 @@ (PVOID) Event, 0, NULL); if (NULL == Thread) { - DPRINT1("Failed thread creation\n"); + DPRINT1("Failed thread creation (Error: 0x%x)\n", GetLastError()); CloseHandle(Process); return; }

1 0

[navaraf] 14248: Correctly draw the titlebar as active or inactive during the processing of WM_NCACTIVATE message.
by navaraf＠svn.reactos.com 21 Mar '05

21 Mar '05

Correctly draw the titlebar as active or inactive during the processing of WM_NCACTIVATE message. Modified: trunk/reactos/lib/user32/windows/defwnd.c Modified: trunk/reactos/lib/user32/windows/nonclient.c Modified: trunk/reactos/lib/user32/windows/window.c _____ Modified: trunk/reactos/lib/user32/windows/defwnd.c --- trunk/reactos/lib/user32/windows/defwnd.c 2005-03-21 01:34:02 UTC (rev 14247) +++ trunk/reactos/lib/user32/windows/defwnd.c 2005-03-21 01:59:21 UTC (rev 14248) @@ -31,7 +31,7 @@ #define WM_QUERYDROPOBJECT 0x022B #endif -LRESULT DefWndNCPaint(HWND hWnd, HRGN hRgn); +LRESULT DefWndNCPaint(HWND hWnd, HRGN hRgn, BOOL Active); LRESULT DefWndNCCalcSize(HWND hWnd, BOOL CalcSizeStruct, RECT *Rect); LRESULT DefWndNCActivate(HWND hWnd, WPARAM wParam); LRESULT DefWndNCHitTest(HWND hWnd, POINT Point); @@ -949,7 +949,7 @@ { case WM_NCPAINT: { - return DefWndNCPaint(hWnd, (HRGN)wParam); + return DefWndNCPaint(hWnd, (HRGN)wParam, -1); } case WM_NCCALCSIZE: @@ -1472,7 +1472,7 @@ if ((GetWindowLongW(hWnd, GWL_STYLE) & WS_CAPTION) == WS_CAPTION) { - DefWndNCPaint(hWnd, (HRGN)1); + DefWndNCPaint(hWnd, (HRGN)1, -1); } return TRUE; } @@ -1532,7 +1532,7 @@ if ((GetWindowLongW(hWnd, GWL_STYLE) & WS_CAPTION) == WS_CAPTION) { - DefWndNCPaint(hWnd, (HRGN)1); + DefWndNCPaint(hWnd, (HRGN)1, -1); } return (1); } _____ Modified: trunk/reactos/lib/user32/windows/nonclient.c --- trunk/reactos/lib/user32/windows/nonclient.c 2005-03-21 01:34:02 UTC (rev 14247) +++ trunk/reactos/lib/user32/windows/nonclient.c 2005-03-21 01:59:21 UTC (rev 14248) @@ -288,10 +288,9 @@ * - Correct drawing of size-box */ LRESULT -DefWndNCPaint(HWND hWnd, HRGN hRgn) +DefWndNCPaint(HWND hWnd, HRGN hRgn, BOOL Active) { HDC hDC; - BOOL Active; DWORD Style, ExStyle; HWND Parent; RECT ClientRect, WindowRect, CurrentRect, TempRect; @@ -309,16 +308,19 @@ Parent = GetParent(hWnd); ExStyle = GetWindowLongW(hWnd, GWL_EXSTYLE); - if (ExStyle & WS_EX_MDICHILD) + if (Active == -1) { - Active = IsChild(GetForegroundWindow(), hWnd); - if (Active) - Active = (hWnd == (HWND)SendMessageW(Parent, WM_MDIGETACTIVE, 0, 0)); + if (ExStyle & WS_EX_MDICHILD) + { + Active = IsChild(GetForegroundWindow(), hWnd); + if (Active) + Active = (hWnd == (HWND)SendMessageW(Parent, WM_MDIGETACTIVE, 0, 0)); + } + else + { + Active = (GetForegroundWindow() == hWnd); + } } - else - { - Active = (GetForegroundWindow() == hWnd); - } GetWindowRect(hWnd, &WindowRect); GetClientRect(hWnd, &ClientRect); @@ -660,7 +662,7 @@ LRESULT DefWndNCActivate(HWND hWnd, WPARAM wParam) { - DefWndNCPaint(hWnd, (HRGN)1); + DefWndNCPaint(hWnd, (HRGN)1, wParam); return TRUE; } _____ Modified: trunk/reactos/lib/user32/windows/window.c --- trunk/reactos/lib/user32/windows/window.c 2005-03-21 01:34:02 UTC (rev 14247) +++ trunk/reactos/lib/user32/windows/window.c 2005-03-21 01:59:21 UTC (rev 14248) @@ -22,7 +22,7 @@ BOOL ControlsInitialized = FALSE; -LRESULT DefWndNCPaint(HWND hWnd, HRGN hRgn); +LRESULT DefWndNCPaint(HWND hWnd, HRGN hRgn, BOOL Active); /* FUNCTIONS *****************************************************************/ @@ -1236,7 +1236,7 @@ if ((GetWindowLongW(hWnd, GWL_STYLE) & WS_CAPTION) == WS_CAPTION) { - DefWndNCPaint(hWnd, (HRGN)1); + DefWndNCPaint(hWnd, (HRGN)1, -1); } return TRUE; } @@ -1270,7 +1270,7 @@ if ((GetWindowLongW(hWnd, GWL_STYLE) & WS_CAPTION) == WS_CAPTION) { - DefWndNCPaint(hWnd, (HRGN)1); + DefWndNCPaint(hWnd, (HRGN)1, -1); } return TRUE; }

1 0

[navaraf] 14247: - Cleanup DefWndDoButton function.
by navaraf＠svn.reactos.com 21 Mar '05

21 Mar '05

- Cleanup DefWndDoButton function. - Fix some loops where GetMessage was inadvertently used. Modified: trunk/reactos/lib/user32/windows/defwnd.c Modified: trunk/reactos/lib/user32/windows/nonclient.c _____ Modified: trunk/reactos/lib/user32/windows/defwnd.c --- trunk/reactos/lib/user32/windows/defwnd.c 2005-03-21 00:55:16 UTC (rev 14246) +++ trunk/reactos/lib/user32/windows/defwnd.c 2005-03-21 01:34:02 UTC (rev 14247) @@ -317,7 +317,8 @@ { while(!hittest) { - GetMessageW(&msg, NULL, 0, 0); + if (GetMessageW(&msg, NULL, 0, 0) <= 0) + break; switch(msg.message) { case WM_MOUSEMOVE: @@ -572,7 +573,8 @@ { int dx = 0, dy = 0; - GetMessageW(&msg, 0, 0, 0); + if (GetMessageW(&msg, 0, 0, 0) <= 0) + break; /* Exit on button-up, Return, or Esc */ if ((msg.message == WM_LBUTTONUP) || _____ Modified: trunk/reactos/lib/user32/windows/nonclient.c --- trunk/reactos/lib/user32/windows/nonclient.c 2005-03-21 00:55:16 UTC (rev 14246) +++ trunk/reactos/lib/user32/windows/nonclient.c 2005-03-21 01:34:02 UTC (rev 14247) @@ -882,79 +882,75 @@ VOID DefWndDoButton(HWND hWnd, WPARAM wParam) { - MSG Msg; - BOOL InBtn, HasBtn = FALSE; - ULONG Btn, Style; - WPARAM SCMsg, CurBtn = wParam, OrigBtn = wParam; - HDC WindowDC = NULL; + MSG Msg; + HDC WindowDC; + BOOL Pressed = TRUE, OldState; + WPARAM SCMsg; + ULONG ButtonType, Style; - Style = GetWindowLongW(hWnd, GWL_STYLE); - switch(wParam) - { - case HTCLOSE: - Btn = DFCS_CAPTIONCLOSE; - SCMsg = SC_CLOSE; - HasBtn = (Style & WS_SYSMENU); - break; - case HTMINBUTTON: - Btn = DFCS_CAPTIONMIN; - SCMsg = ((Style & WS_MINIMIZE) ? SC_RESTORE : SC_MINIMIZE); - HasBtn = (Style & WS_MINIMIZEBOX); - break; - case HTMAXBUTTON: - Btn = DFCS_CAPTIONMAX; - SCMsg = ((Style & WS_MAXIMIZE) ? SC_RESTORE : SC_MAXIMIZE); - HasBtn = (Style & WS_MAXIMIZEBOX); - break; - default: - return; - } + Style = GetWindowLongW(hWnd, GWL_STYLE); + switch (wParam) + { + case HTCLOSE: + if (!(Style & WS_SYSMENU)) + return; + ButtonType = DFCS_CAPTIONCLOSE; + SCMsg = SC_CLOSE; + break; + case HTMINBUTTON: + if (!(Style & WS_MINIMIZEBOX)) + return; + ButtonType = DFCS_CAPTIONMIN; + SCMsg = ((Style & WS_MINIMIZE) ? SC_RESTORE : SC_MINIMIZE); + break; + case HTMAXBUTTON: + if (!(Style & WS_MAXIMIZEBOX)) + return; + ButtonType = DFCS_CAPTIONMAX; + SCMsg = ((Style & WS_MAXIMIZE) ? SC_RESTORE : SC_MAXIMIZE); + break; + + default: + ASSERT(FALSE); + return; + } - InBtn = HasBtn; + /* + * FIXME: Not sure where to do this, but we must flush the pending + * window updates when someone clicks on the close button and at + * the same time the window is overlapped with another one. This + * looks like a good place for now... + */ + UpdateWindow(hWnd); + + WindowDC = GetWindowDC(hWnd); + UserDrawCaptionButtonWnd(hWnd, WindowDC, TRUE, ButtonType); + + SetCapture(hWnd); - SetCapture(hWnd); + for (;;) + { + if (GetMessageW(&Msg, 0, WM_MOUSEFIRST, WM_MOUSELAST) <= 0) + break; + + if (Msg.message == WM_LBUTTONUP) + break; + + if (Msg.message != WM_MOUSEMOVE) + continue; + + OldState = Pressed; + Pressed = (DefWndNCHitTest(hWnd, Msg.pt) == wParam); + if (Pressed != OldState) + UserDrawCaptionButtonWnd(hWnd, WindowDC, Pressed, ButtonType); + } - if(HasBtn) - { - WindowDC = GetWindowDC(hWnd); - UserDrawCaptionButtonWnd(hWnd, WindowDC, HasBtn , Btn); - } - - for(;;) - { - GetMessageW(&Msg, 0, 0, 0); - switch(Msg.message) - { - case WM_LBUTTONUP: - if(InBtn) - goto done; - else - { - ReleaseCapture(); - if (HasBtn) - ReleaseDC(hWnd, WindowDC); - return; - } - case WM_MOUSEMOVE: - if(HasBtn) - { - CurBtn = DefWndNCHitTest(hWnd, Msg.pt); - if(InBtn != (CurBtn == OrigBtn)) - { - UserDrawCaptionButtonWnd( hWnd, WindowDC, (CurBtn == OrigBtn) , Btn); - } - InBtn = CurBtn == OrigBtn; - } - break; - } - } - -done: - UserDrawCaptionButtonWnd( hWnd, WindowDC, FALSE , Btn); - ReleaseDC(hWnd, WindowDC); - ReleaseCapture(); - SendMessageW(hWnd, WM_SYSCOMMAND, SCMsg, 0); - return; + if (Pressed) + UserDrawCaptionButtonWnd(hWnd, WindowDC, FALSE, ButtonType); + ReleaseCapture(); + ReleaseDC(hWnd, WindowDC); + if (Pressed) + SendMessageW(hWnd, WM_SYSCOMMAND, SCMsg, 0); }

1 0

[navaraf] 14246: - Move WINDOWOBJECT_NEED_INTERNALPAINT flag handling to NtGdiBeginPaint.
by navaraf＠svn.reactos.com 21 Mar '05

21 Mar '05

- Move WINDOWOBJECT_NEED_INTERNALPAINT flag handling to NtGdiBeginPaint. - Fix IntGetPaintMessage to not return TRUE when no message was returned. - IntIsWindowDirty shouldn't check for the WINDOWOBJECT_NEED_NCPAINT flag (at least not now). Modified: trunk/reactos/subsys/win32k/ntuser/painting.c _____ Modified: trunk/reactos/subsys/win32k/ntuser/painting.c --- trunk/reactos/subsys/win32k/ntuser/painting.c 2005-03-20 23:01:48 UTC (rev 14245) +++ trunk/reactos/subsys/win32k/ntuser/painting.c 2005-03-21 00:55:16 UTC (rev 14246) @@ -144,16 +144,6 @@ Window->Flags & WINDOWOBJECT_NEED_INTERNALPAINT) { IntSendMessage(hWnd, WM_PAINT, 0, 0); - IntLockWindowUpdate(Window); - if (Window->Flags & WINDOWOBJECT_NEED_INTERNALPAINT) - { - Window->Flags &= ~WINDOWOBJECT_NEED_INTERNALPAINT; - if (Window->UpdateRegion == NULL) - { - MsqDecPaintCountQueue(Window->MessageQueue); - } - } - IntUnLockWindowUpdate(Window); } } } @@ -547,8 +537,7 @@ { return (Window->Style & WS_VISIBLE) && ((Window->UpdateRegion != NULL) || - (Window->Flags & WINDOWOBJECT_NEED_INTERNALPAINT) || - (Window->Flags & WINDOWOBJECT_NEED_NCPAINT)); + (Window->Flags & WINDOWOBJECT_NEED_INTERNALPAINT)); } HWND STDCALL @@ -614,6 +603,10 @@ if (!MessageQueue->PaintPosted) return FALSE; + if ((MsgFilterMin != 0 || MsgFilterMax != 0) && + (MsgFilterMin > WM_PAINT || MsgFilterMax < WM_PAINT)) + return FALSE; + if (hWnd) Message->hwnd = IntFindWindowToRepaint(hWnd, PsGetWin32Thread()); else @@ -635,25 +628,10 @@ Window = IntGetWindowObject(Message->hwnd); if (Window != NULL) { - IntLockWindowUpdate(Window); - - if ((MsgFilterMin == 0 && MsgFilterMax == 0) || - (MsgFilterMin <= WM_PAINT && WM_PAINT <= MsgFilterMax)) - { - Message->message = WM_PAINT; - Message->wParam = Message->lParam = 0; - if (Remove && Window->Flags & WINDOWOBJECT_NEED_INTERNALPAINT) - { - Window->Flags &= ~WINDOWOBJECT_NEED_INTERNALPAINT; - if (Window->UpdateRegion == NULL) - { - MsqDecPaintCountQueue(Window->MessageQueue); - } - } - } - IntUnLockWindowUpdate(Window); - + Message->message = WM_PAINT; + Message->wParam = Message->lParam = 0; IntReleaseWindowObject(Window); + return TRUE; } @@ -779,8 +757,11 @@ } else { + if (Window->Flags & WINDOWOBJECT_NEED_INTERNALPAINT) + MsqDecPaintCountQueue(Window->MessageQueue); IntGetClientRect(Window, &Ps.rcPaint); } + Window->Flags &= ~WINDOWOBJECT_NEED_INTERNALPAINT; IntUnLockWindowUpdate(Window); if (Window->Flags & WINDOWOBJECT_NEED_ERASEBKGND)

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs