Ros-diffs

ros-diffs@reactos.org

81390 discussions

[hbelusca] 60629: [CONSRV] Implement SetConsolePalette (see r59711 for more details), but it is still WIP: - the helper function ConDrvSetConsolePalette uses a hardcoded palette for testing purpose...
by hbelusca＠svn.reactos.org 12 Oct '13

12 Oct '13

Author: hbelusca Date: Sat Oct 12 15:37:50 2013 New Revision: 60629 URL: http://svn.reactos.org/svn/reactos?rev=60629&view=rev Log: [CONSRV] Implement SetConsolePalette (see r59711 for more details), but it is still WIP: - the helper function ConDrvSetConsolePalette uses a hardcoded palette for testing purposes, - lots of DPRINT1 are displayed when using this function or when swapping active screen buffers, - lot of code redundancy which will be put in some helper functions when this code will work correctly, - and I get some WIN32K warnings: WARNING: IntGdiRealizePalette at ../../win32ss/gdi/ntgdi/palette.c:777 is UNIMPLEMENTED! It would be great if a win32k guy can have a look at this!! And I suspect that's because of this that the changed palette is not used... Also, deactivate the WM_NCRBUTTONDOWN/WM_NCRBUTTONUP hack I introduced in revision 58632, because James worked on this in revisions 60622 and 60626 (see CORE-7054 too). Modified: trunk/reactos/win32ss/user/winsrv/consrv/condrv/conoutput.c trunk/reactos/win32ss/user/winsrv/consrv/condrv/dummyfrontend.c trunk/reactos/win32ss/user/winsrv/consrv/conoutput.c trunk/reactos/win32ss/user/winsrv/consrv/frontendctl.c trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/guisettings.h trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/guiterm.c trunk/reactos/win32ss/user/winsrv/consrv/frontends/tui/tuiterm.c trunk/reactos/win32ss/user/winsrv/consrv/include/conio.h trunk/reactos/win32ss/user/winsrv/consrv/include/term.h Modified: trunk/reactos/win32ss/user/winsrv/consrv/condrv/conoutput.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/condrv/conoutput.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/condrv/conoutput.c [iso-8859-1] Sat Oct 12 15:37:50 2013 @@ -58,11 +58,23 @@ CONSOLE_SCREEN_BUFFER_Destroy(IN OUT PCONSOLE_SCREEN_BUFFER Buffer) { if (Buffer->Header.Type == TEXTMODE_BUFFER) + { TEXTMODE_BUFFER_Destroy(Buffer); + } else if (Buffer->Header.Type == GRAPHICS_BUFFER) + { GRAPHICS_BUFFER_Destroy(Buffer); + } else if (Buffer->Header.Type == SCREEN_BUFFER) + { + // TODO: Free Buffer->Data + + /* Free the palette handle */ + if (Buffer->PaletteHandle != NULL) DeleteObject(Buffer->PaletteHandle); + + /* Free the screen buffer memory */ ConsoleFreeHeap(Buffer); + } // else // do_nothing; } @@ -218,12 +230,125 @@ NTSTATUS NTAPI ConDrvSetConsolePalette(IN PCONSOLE Console, - IN PGRAPHICS_SCREEN_BUFFER Buffer, + // IN PGRAPHICS_SCREEN_BUFFER Buffer, + IN PCONSOLE_SCREEN_BUFFER Buffer, IN HPALETTE PaletteHandle, - IN UINT Usage) -{ - DPRINT1("ConDrvSetConsolePalette is UNIMPLEMENTED but returns STATUS_SUCCESS\n"); - return STATUS_SUCCESS; + IN UINT PaletteUsage) +{ + BOOL Success; + +/******************************************************************************\ +|************** HACK! HACK! HACK! HACK! HACK! HACK! HACK! HACK! ***************| +\******************************************************************************/ + +#define PALETTESIZE 256 + + UINT i; + LPLOGPALETTE LogPalette; /* Pointer to logical palette */ + +PALETTEENTRY MyPalette[] = +{ {0, 0, 0x80,0} , // 1 + {0, 0x80,0, 0} , // 2 + {0, 0, 0, 0} , // 0 + {0, 0x80,0x80,0} , // 3 + {0x80,0, 0, 0} , // 4 + {0x80,0, 0x80,0} , // 5 + {0x80,0x80,0, 0} , // 6 + {0xC0,0xC0,0xC0,0} , // 7 + {0x80,0x80,0x80,0} , // 8 + {0, 0, 0xFF,0} , // 9 + {0, 0xFF,0, 0} , // 10 + {0, 0xFF,0xFF,0} , // 11 + {0xFF,0, 0, 0} , // 12 + {0xFF,0, 0xFF,0} , // 13 + {0xFF,0xFF,0, 0} , // 14 + {0xFF,0xFF,0xFF,0} }; // 15 + +/******************************************************************************\ +|************** HACK! HACK! HACK! HACK! HACK! HACK! HACK! HACK! ***************| +\******************************************************************************/ + + DPRINT1("ConDrvSetConsolePalette checkpt 0\n"); + + if (Console == NULL || Buffer == NULL) + return STATUS_INVALID_PARAMETER; + + DPRINT1("ConDrvSetConsolePalette checkpt 1\n"); + + // FIXME: Is it useful ? + if ( PaletteUsage != SYSPAL_STATIC && + PaletteUsage != SYSPAL_NOSTATIC && + PaletteUsage != SYSPAL_NOSTATIC256 ) + { + return STATUS_INVALID_PARAMETER; + } + + DPRINT1("ConDrvSetConsolePalette checkpt 2\n"); + + /* Validity check */ + ASSERT(Console == Buffer->Header.Console); + + + +/******************************************************************************\ +|************** HACK! HACK! HACK! HACK! HACK! HACK! HACK! HACK! ***************| +\******************************************************************************/ + + DPRINT1("HACK: FIXME: ConDrvSetConsolePalette - Use hacked palette for testing purposes!!\n"); + + LogPalette = (LPLOGPALETTE)ConsoleAllocHeap(HEAP_ZERO_MEMORY, + (sizeof(LOGPALETTE) + + (sizeof(PALETTEENTRY) * PALETTESIZE))); + + if (LogPalette) + { + LogPalette->palVersion = 0x300; + LogPalette->palNumEntries = PALETTESIZE; + + for(i=0; i < PALETTESIZE;i++) + { + LogPalette->palPalEntry[i] = MyPalette[i % sizeof(MyPalette)/sizeof(MyPalette[0])]; + } + + PaletteHandle = CreatePalette(LogPalette); + PaletteUsage = SYSPAL_NOSTATIC256; + ConsoleFreeHeap(LogPalette); + } + else + { + DPRINT1("ConDrvSetConsolePalette - Hacked LogPalette is NULL\n"); + } + +/******************************************************************************\ +|************** HACK! HACK! HACK! HACK! HACK! HACK! HACK! HACK! ***************| +\******************************************************************************/ + + + + + /* Change the palette */ + DPRINT1("ConDrvSetConsolePalette calling TermSetPalette\n"); + Success = TermSetPalette(Console, PaletteHandle, PaletteUsage); + if (Success) + { + DPRINT1("TermSetPalette succeeded\n"); + /* Free the old palette handle if there was already one set */ + if ( Buffer->PaletteHandle != NULL && + Buffer->PaletteHandle != PaletteHandle ) + { + DeleteObject(Buffer->PaletteHandle); + } + + /* Save the new palette in the screen buffer */ + Buffer->PaletteHandle = PaletteHandle; + Buffer->PaletteUsage = PaletteUsage; + } + else + { + DPRINT1("TermSetPalette failed\n"); + } + + return (Success ? STATUS_SUCCESS : STATUS_UNSUCCESSFUL); } NTSTATUS NTAPI Modified: trunk/reactos/win32ss/user/winsrv/consrv/condrv/dummyfrontend.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/condrv/dummyfrontend.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/condrv/dummyfrontend.c [iso-8859-1] Sat Oct 12 15:37:50 2013 @@ -116,6 +116,14 @@ DummyGetLargestConsoleWindowSize(IN OUT PFRONTEND This, PCOORD pSize) { +} + +static BOOL NTAPI +DummySetPalette(IN OUT PFRONTEND This, + HPALETTE PaletteHandle, + UINT PaletteUsage) +{ + return TRUE; } static ULONG NTAPI @@ -177,6 +185,7 @@ DummyChangeIcon, DummyGetConsoleWindowHandle, DummyGetLargestConsoleWindowSize, + DummySetPalette, DummyGetDisplayMode, DummySetDisplayMode, DummyShowMouseCursor, Modified: trunk/reactos/win32ss/user/winsrv/consrv/conoutput.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/conoutput.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/conoutput.c [iso-8859-1] Sat Oct 12 15:37:50 2013 @@ -52,29 +52,42 @@ NTSTATUS NTAPI ConDrvSetConsolePalette(IN PCONSOLE Console, - IN PGRAPHICS_SCREEN_BUFFER Buffer, + // IN PGRAPHICS_SCREEN_BUFFER Buffer, + IN PCONSOLE_SCREEN_BUFFER Buffer, IN HPALETTE PaletteHandle, - IN UINT Usage); + IN UINT PaletteUsage); CSR_API(SrvSetConsolePalette) { NTSTATUS Status; PCONSOLE_SETPALETTE SetPaletteRequest = &((PCONSOLE_API_MESSAGE)ApiMessage)->Data.SetPaletteRequest; - // PCONSOLE_SCREEN_BUFFER Buffer; - PGRAPHICS_SCREEN_BUFFER Buffer; - - DPRINT("SrvSetConsolePalette\n"); + // PGRAPHICS_SCREEN_BUFFER Buffer; + PCONSOLE_SCREEN_BUFFER Buffer; + + DPRINT1("SrvSetConsolePalette\n"); // NOTE: Tests show that this function is used only for graphics screen buffers - // and otherwise it returns false + sets last error to invalid handle. + // and otherwise it returns FALSE + sets last error to invalid handle. + // I think it's ridiculous, because if you are in text mode, simulating + // a change of VGA palette via DAC registers (done by a call to SetConsolePalette) + // cannot be done... So I allow it in ReactOS ! + /* Status = ConSrvGetGraphicsBuffer(ConsoleGetPerProcessData(CsrGetClientThread()->Process), SetPaletteRequest->OutputHandle, &Buffer, GENERIC_WRITE, TRUE); - if (!NT_SUCCESS(Status)) return Status; + */ + Status = ConSrvGetScreenBuffer(ConsoleGetPerProcessData(CsrGetClientThread()->Process), + SetPaletteRequest->OutputHandle, + &Buffer, GENERIC_WRITE, TRUE); + if (!NT_SUCCESS(Status)) return Status; + + DPRINT1("ConDrvSetConsolePalette calling...\n"); Status = ConDrvSetConsolePalette(Buffer->Header.Console, Buffer, SetPaletteRequest->PaletteHandle, SetPaletteRequest->Usage); + + DPRINT1("ConDrvSetConsolePalette returned Status 0x%08lx\n", Status); ConSrvReleaseScreenBuffer(Buffer, TRUE); return Status; Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontendctl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/frontendctl.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/frontendctl.c [iso-8859-1] Sat Oct 12 15:37:50 2013 @@ -220,7 +220,7 @@ PCONSOLE_SCREEN_BUFFER Buff; // FIXME: Tests show that this function is used only for graphics screen buffers - // and otherwise it returns false + sets last error to invalid handle. + // and otherwise it returns FALSE + sets last error to invalid handle. // NOTE: I find that behaviour is ridiculous but ok, let's accept that at the moment... Status = ConSrvGetGraphicsBuffer(ConsoleGetPerProcessData(CsrGetClientThread()->Process), SetCursorRequest->OutputHandle, Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/guisettings.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/guisettings.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/guisettings.h [iso-8859-1] Sat Oct 12 15:37:50 2013 @@ -40,14 +40,18 @@ typedef struct _GUI_CONSOLE_DATA { CRITICAL_SECTION Lock; + BOOL WindowSizeLock; + HANDLE hGuiInitEvent; - BOOL WindowSizeLock; POINT OldCursor; HWND hWindow; /* Handle to the console's window */ HICON hIcon; /* Handle to the console's icon (big) */ HICON hIconSm; /* Handle to the console's icon (small) */ + HPALETTE hSysPalette; /* Handle to the original system palette */ + +/*** The following may be put per-screen-buffer !! ***/ HCURSOR hCursor; /* Handle to the mouse cursor */ INT MouseCursorRefCount; /* The reference counter associated with the mouse cursor. >= 0 and the cursor is shown; < 0 and the cursor is hidden. */ BOOL IgnoreNextMouseSignal; /* Used in cases where we don't want to treat a mouse signal */ @@ -63,9 +67,11 @@ HFONT Font; UINT CharWidth; UINT CharHeight; +/*****************************************************/ PCONSOLE Console; /* Pointer to the owned console */ PCONSOLE_SCREEN_BUFFER ActiveBuffer; /* Pointer to the active screen buffer (then maybe the previous Console member is redundant?? Or not...) */ + GUI_CONSOLE_INFO GuiInfo; /* GUI terminal settings */ } GUI_CONSOLE_DATA, *PGUI_CONSOLE_DATA; Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/guiterm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/guiterm.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/guiterm.c [iso-8859-1] Sat Oct 12 15:37:50 2013 @@ -513,7 +513,7 @@ { PGUI_CONSOLE_DATA GuiData = (PGUI_CONSOLE_DATA)Create->lpCreateParams; PCONSOLE Console; - HDC Dc; + HDC hDC; HFONT OldFont; TEXTMETRICW Metrics; SIZE CharSize; @@ -552,8 +552,8 @@ SetEvent(GuiData->hGuiInitEvent); return FALSE; } - Dc = GetDC(GuiData->hWindow); - if (NULL == Dc) + hDC = GetDC(GuiData->hWindow); + if (NULL == hDC) { DPRINT1("GuiConsoleNcCreate: GetDC failed\n"); DeleteObject(GuiData->Font); @@ -561,21 +561,21 @@ SetEvent(GuiData->hGuiInitEvent); return FALSE; } - OldFont = SelectObject(Dc, GuiData->Font); + OldFont = SelectObject(hDC, GuiData->Font); if (NULL == OldFont) { DPRINT1("GuiConsoleNcCreate: SelectObject failed\n"); - ReleaseDC(GuiData->hWindow, Dc); + ReleaseDC(GuiData->hWindow, hDC); DeleteObject(GuiData->Font); GuiData->hWindow = NULL; SetEvent(GuiData->hGuiInitEvent); return FALSE; } - if (!GetTextMetricsW(Dc, &Metrics)) + if (!GetTextMetricsW(hDC, &Metrics)) { DPRINT1("GuiConsoleNcCreate: GetTextMetrics failed\n"); - SelectObject(Dc, OldFont); - ReleaseDC(GuiData->hWindow, Dc); + SelectObject(hDC, OldFont); + ReleaseDC(GuiData->hWindow, hDC); DeleteObject(GuiData->Font); GuiData->hWindow = NULL; SetEvent(GuiData->hGuiInitEvent); @@ -585,12 +585,12 @@ GuiData->CharHeight = Metrics.tmHeight + Metrics.tmExternalLeading; /* Measure real char width more precisely if possible. */ - if (GetTextExtentPoint32W(Dc, L"R", 1, &CharSize)) + if (GetTextExtentPoint32W(hDC, L"R", 1, &CharSize)) GuiData->CharWidth = CharSize.cx; - SelectObject(Dc, OldFont); - - ReleaseDC(GuiData->hWindow, Dc); + SelectObject(hDC, OldFont); + + ReleaseDC(GuiData->hWindow, hDC); // FIXME: Keep these instructions here ? /////////////////////////////////// Console->ActiveBuffer->CursorBlinkOn = TRUE; @@ -1700,6 +1700,52 @@ GuiConsoleHandlePaint(GuiData); break; + case WM_PALETTECHANGED: + { + PCONSOLE_SCREEN_BUFFER ActiveBuffer = GuiData->ActiveBuffer; // ConDrvGetActiveScreenBuffer(GuiData->Console); + + DPRINT1("WM_PALETTECHANGED called\n"); + + /* + * Protects against infinite loops: + * "... A window that receives this message must not realize + * its palette, unless it determines that wParam does not contain + * its own window handle." (WM_PALETTECHANGED description - MSDN) + * + * This message is sent to all windows, including the one that + * changed the system palette and caused this message to be sent. + * The wParam of this message contains the handle of the window + * that caused the system palette to change. To avoid an infinite + * loop, care must be taken to check that the wParam of this message + * does not match the window's handle. + */ + if ((HWND)wParam == hWnd) break; + + DPRINT1("WM_PALETTECHANGED ok\n"); + + // if (GetType(ActiveBuffer) == GRAPHICS_BUFFER) + if (ActiveBuffer->PaletteHandle) + { + /* Get the Device Context of the console window */ + HDC hDC = GetDC(GuiData->hWindow); + + DPRINT1("WM_PALETTECHANGED changing palette\n"); + + /* Specify the use of the system palette */ + SetSystemPaletteUse(hDC, ActiveBuffer->PaletteUsage); + + /* Realize the (logical) palette */ + RealizePalette(hDC); + + /* Release the Device Context and return */ + ReleaseDC(GuiData->hWindow, hDC); + } + + DPRINT1("WM_PALETTECHANGED quit\n"); + + break; + } + case WM_KEYDOWN: case WM_KEYUP: case WM_CHAR: @@ -1805,14 +1851,16 @@ * call after that DefWindowProc, on ReactOS, right-clicks on the * (non-client) application title-bar does not display the system * menu and does not trigger a WM_NCRBUTTONUP message too. - * See: http://git.reactos.org/?p=reactos.git;a=blob;f=reactos/win32ss/user/user32/… + * See: http://git.reactos.org/?p=reactos.git;a=blob;f=reactos/win32ss/user/user32/… * and line 1135 too. */ +#if 0 if (DefWindowProcW(hWnd, WM_NCHITTEST, 0, lParam) == HTCAPTION) { /* Call DefWindowProcW with the WM_CONTEXTMENU message */ msg = WM_CONTEXTMENU; } +#endif goto Default; } // case WM_NCRBUTTONUP: @@ -2370,6 +2418,9 @@ } } + /* Original system palette */ + GuiData->hSysPalette = NULL; + /* Mouse is shown by default with its default cursor shape */ GuiData->hCursor = ghDefaultCursor; GuiData->MouseCursorRefCount = 0; @@ -2567,6 +2618,9 @@ GuiSetActiveScreenBuffer(IN OUT PFRONTEND This) { PGUI_CONSOLE_DATA GuiData = This->Data; + PCONSOLE_SCREEN_BUFFER ActiveBuffer; // = GuiData->ActiveBuffer; // ConDrvGetActiveScreenBuffer(GuiData->Console); + HDC hDC; + HPALETTE hPalette; EnterCriticalSection(&GuiData->Lock); GuiData->WindowSizeLock = TRUE; @@ -2577,10 +2631,37 @@ GuiData->WindowSizeLock = FALSE; LeaveCriticalSection(&GuiData->Lock); + ActiveBuffer = GuiData->ActiveBuffer; + + /* Change the current palette */ + if (ActiveBuffer->PaletteHandle == NULL) + { + hPalette = GuiData->hSysPalette; + } + else + { + hPalette = ActiveBuffer->PaletteHandle; + } + + DPRINT1("GuiSetActiveScreenBuffer using palette 0x%p\n", hPalette); + + /* Get the Device Context of the console window */ + hDC = GetDC(GuiData->hWindow); + + /* Set the new palette */ + SelectPalette(hDC, hPalette, FALSE); + + /* Specify the use of the system palette */ + SetSystemPaletteUse(hDC, ActiveBuffer->PaletteUsage); + + /* Realize the (logical) palette */ + RealizePalette(hDC); + + /* Release the Device Context */ + ReleaseDC(GuiData->hWindow, hDC); + GuiResizeTerminal(This); // ConioDrawConsole(Console); - - // FIXME: Change the palette. } static VOID WINAPI @@ -2588,6 +2669,7 @@ IN PCONSOLE_SCREEN_BUFFER ScreenBuffer) { PGUI_CONSOLE_DATA GuiData = This->Data; + HDC hDC; /* * If we were notified to release a screen buffer that is not actually @@ -2603,6 +2685,20 @@ * it ONLY. */ + /* Get the Device Context of the console window */ + hDC = GetDC(GuiData->hWindow); + + /* Release the old active palette and set the default one */ + if (GetCurrentObject(hDC, OBJ_PAL) == ScreenBuffer->PaletteHandle) + { + /* Set the new palette */ + SelectPalette(hDC, GuiData->hSysPalette, FALSE); + } + + /* Release the Device Context */ + ReleaseDC(GuiData->hWindow, hDC); + + /* Set the adequate active screen buffer */ if (ScreenBuffer != GuiData->Console->ActiveBuffer) { GuiSetActiveScreenBuffer(This); @@ -2765,6 +2861,61 @@ pSize->X = (SHORT)(width / (int)WidthUnit ) /* HACK */ + 2; pSize->Y = (SHORT)(height / (int)HeightUnit) /* HACK */ + 1; +} + +static BOOL WINAPI +GuiSetPalette(IN OUT PFRONTEND This, + HPALETTE PaletteHandle, + UINT PaletteUsage) +{ + BOOL Success = TRUE; + PGUI_CONSOLE_DATA GuiData = This->Data; + // PCONSOLE_SCREEN_BUFFER ActiveBuffer = GuiData->ActiveBuffer; // ConDrvGetActiveScreenBuffer(GuiData->Console); + HDC hDC; + HPALETTE OldPalette; + + DPRINT1("GuiSetPalette checkpt 0\n"); + + // if (GetType(ActiveBuffer) != GRAPHICS_BUFFER) return FALSE; + if (PaletteHandle == NULL) return FALSE; + + DPRINT1("GuiSetPalette checkpt 1\n"); + + /* Get the Device Context of the console window */ + hDC = GetDC(GuiData->hWindow); + + DPRINT1("GuiSetPalette calling SelectPalette(0x%p, 0x%p, FALSE)\n", hDC, PaletteHandle); + + /* Set the new palette */ + OldPalette = SelectPalette(hDC, PaletteHandle, FALSE); + DPRINT1("OldPalette = 0x%p\n", OldPalette); + if (OldPalette == NULL) + { + DPRINT1("SelectPalette failed\n"); + Success = FALSE; + goto Quit; + } + + DPRINT1("GuiSetPalette checkpt 2\n"); + + /* Specify the use of the system palette */ + SetSystemPaletteUse(hDC, PaletteUsage); + + /* Realize the (logical) palette */ + RealizePalette(hDC); + + DPRINT1("GuiData->hSysPalette before == 0x%p\n", GuiData->hSysPalette); + + /* Save the original system palette handle */ + if (GuiData->hSysPalette == NULL) GuiData->hSysPalette = OldPalette; + + DPRINT1("GuiData->hSysPalette after == 0x%p\n", GuiData->hSysPalette); + +Quit: + DPRINT1("GuiSetPalette Quit\n"); + /* Release the Device Context and return */ + ReleaseDC(GuiData->hWindow, hDC); + return Success; } static ULONG WINAPI @@ -2880,6 +3031,7 @@ GuiChangeIcon, GuiGetConsoleWindowHandle, GuiGetLargestConsoleWindowSize, + GuiSetPalette, GuiGetDisplayMode, GuiSetDisplayMode, GuiShowMouseCursor, Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontends/tui/tuiterm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/frontends/tui/tuiterm.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/frontends/tui/tuiterm.c [iso-8859-1] Sat Oct 12 15:37:50 2013 @@ -746,6 +746,14 @@ *pSize = PhysicalConsoleSize; } +static BOOL WINAPI +TuiSetPalette(IN OUT PFRONTEND This, + HPALETTE PaletteHandle, + UINT PaletteUsage) +{ + return TRUE; +} + static ULONG WINAPI TuiGetDisplayMode(IN OUT PFRONTEND This) { @@ -805,6 +813,7 @@ TuiChangeIcon, TuiGetConsoleWindowHandle, TuiGetLargestConsoleWindowSize, + TuiSetPalette, TuiGetDisplayMode, TuiSetDisplayMode, TuiShowMouseCursor, Modified: trunk/reactos/win32ss/user/winsrv/consrv/include/conio.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/include/conio.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/include/conio.h [iso-8859-1] Sat Oct 12 15:37:50 2013 @@ -64,6 +64,8 @@ LIST_ENTRY ListEntry; /* Entry in console's list of buffers */ + // PVOID Data; /* Private data for the frontend to use */ + COORD ScreenBufferSize; /* Size of this screen buffer. (Rows, Columns) for text-mode and (Width, Height) for graphics */ COORD ViewSize; /* Associated "view" (i.e. console) size */ @@ -81,6 +83,9 @@ // ULONG CursorSize; CONSOLE_CURSOR_INFO CursorInfo; // FIXME: Keep this member or not ?? /*********************************************/ + + HPALETTE PaletteHandle; /* Handle to the color palette associated to this buffer */ + UINT PaletteUsage; /* The new use of the system palette. See SetSystemPaletteUse 'uUsage' parameter */ // WORD ScreenDefaultAttrib; /* Default screen char attribute */ // WORD PopupDefaultAttrib; /* Default popup char attribute */ @@ -223,6 +228,9 @@ HWND (WINAPI *GetConsoleWindowHandle)(IN OUT PFRONTEND This); VOID (WINAPI *GetLargestConsoleWindowSize)(IN OUT PFRONTEND This, PCOORD pSize); + BOOL (WINAPI *SetPalette)(IN OUT PFRONTEND This, + HPALETTE PaletteHandle, + UINT PaletteUsage); ULONG (WINAPI *GetDisplayMode)(IN OUT PFRONTEND This); BOOL (WINAPI *SetDisplayMode)(IN OUT PFRONTEND This, ULONG NewMode); Modified: trunk/reactos/win32ss/user/winsrv/consrv/include/term.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/include/term.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/include/term.h [iso-8859-1] Sat Oct 12 15:37:50 2013 @@ -38,6 +38,8 @@ (Console)->TermIFace.Vtbl->GetConsoleWindowHandle(&(Console)->TermIFace) #define TermGetLargestConsoleWindowSize(Console, pSize) \ (Console)->TermIFace.Vtbl->GetLargestConsoleWindowSize(&(Console)->TermIFace, (pSize)) +#define TermSetPalette(Console, PaletteHandle, PaletteUsage) \ + (Console)->TermIFace.Vtbl->SetPalette(&(Console)->TermIFace, (PaletteHandle), (PaletteUsage)) #define TermGetDisplayMode(Console) \ (Console)->TermIFace.Vtbl->GetDisplayMode(&(Console)->TermIFace) #define TermSetDisplayMode(Console, NewMode) \

1 0

[aandrejevic] 60628: [SOFT386] Implement Soft386Interrupt. [NTVDM] Implement EmulatorInterrupt and EmulatorExternalInterrupt for NEW_EMULATOR.
by aandrejevic＠svn.reactos.org 12 Oct '13

12 Oct '13

Author: aandrejevic Date: Sat Oct 12 13:58:34 2013 New Revision: 60628 URL: http://svn.reactos.org/svn/reactos?rev=60628&view=rev Log: [SOFT386] Implement Soft386Interrupt. [NTVDM] Implement EmulatorInterrupt and EmulatorExternalInterrupt for NEW_EMULATOR. Modified: branches/ntvdm/include/reactos/libs/soft386/soft386.h branches/ntvdm/lib/soft386/soft386.c branches/ntvdm/subsystems/ntvdm/emulator.c Modified: branches/ntvdm/include/reactos/libs/soft386/soft386.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/include/reactos/libs/soft… ============================================================================== --- branches/ntvdm/include/reactos/libs/soft386/soft386.h [iso-8859-1] (original) +++ branches/ntvdm/include/reactos/libs/soft386/soft386.h [iso-8859-1] Sat Oct 12 13:58:34 2013 @@ -359,7 +359,7 @@ VOID NTAPI -Soft386Interrupt(PSOFT386_STATE State, UCHAR Number); +Soft386Interrupt(PSOFT386_STATE State, UCHAR Number, BOOLEAN Hardware); VOID NTAPI Modified: branches/ntvdm/lib/soft386/soft386.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/soft386/soft386.c?rev… ============================================================================== --- branches/ntvdm/lib/soft386/soft386.c [iso-8859-1] (original) +++ branches/ntvdm/lib/soft386/soft386.c [iso-8859-1] Sat Oct 12 13:58:34 2013 @@ -273,10 +273,27 @@ VOID NTAPI -Soft386Interrupt(PSOFT386_STATE State, UCHAR Number) -{ - // TODO: NOT IMPLEMENTED!!! - UNIMPLEMENTED; +Soft386Interrupt(PSOFT386_STATE State, UCHAR Number, BOOLEAN Hardware) +{ + SOFT386_IDT_ENTRY IdtEntry; + + if (Hardware) + { + /* Set the hardware interrupt flag */ + State->HardwareInt = TRUE; + } + + if (!Soft386GetIntVector(State, Number, &IdtEntry)) + { + /* An exception occurred, let the handler execute */ + return; + } + + /* Perform the interrupt */ + Soft386InterruptInternal(State, + IdtEntry.Selector, + MAKELONG(IdtEntry.Offset, IdtEntry.OffsetHigh), + IdtEntry.Type); } VOID Modified: branches/ntvdm/subsystems/ntvdm/emulator.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/emulator… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/emulator.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/emulator.c [iso-8859-1] Sat Oct 12 13:58:34 2013 @@ -461,6 +461,7 @@ VOID EmulatorInterrupt(BYTE Number) { +#ifndef NEW_EMULATOR LPDWORD IntVecTable = (LPDWORD)((ULONG_PTR)BaseAddress); UINT Segment, Offset; @@ -468,13 +469,11 @@ Segment = HIWORD(IntVecTable[Number]); Offset = LOWORD(IntVecTable[Number]); -#ifndef NEW_EMULATOR /* Call the softx86 API */ softx86_make_simple_interrupt_call(&EmulatorContext, &Segment, &Offset); #else - UNREFERENCED_PARAMETER(Segment); - UNREFERENCED_PARAMETER(Offset); - // TODO: NOT IMPLEMENTED + /* Call the Soft386 API */ + Soft386Interrupt(&EmulatorContext, Number, FALSE); #endif } @@ -483,6 +482,9 @@ #ifndef NEW_EMULATOR /* Call the softx86 API */ softx86_ext_hw_signal(&EmulatorContext, Number); +#else + /* Call the Soft386 API */ + Soft386Interrupt(&EmulatorContext, Number, TRUE); #endif }

1 0

[fireball] 60627: [RAPPS] - Alexander Rechitskiy: Improve "DVD write Now!" entry in rapps. CORE-7506
by fireball＠svn.reactos.org 12 Oct '13

12 Oct '13

Author: fireball Date: Sat Oct 12 12:28:18 2013 New Revision: 60627 URL: http://svn.reactos.org/svn/reactos?rev=60627&view=rev Log: [RAPPS] - Alexander Rechitskiy: Improve "DVD write Now!" entry in rapps. CORE-7506 Modified: trunk/reactos/base/applications/rapps/rapps/dvdwritenow.txt Modified: trunk/reactos/base/applications/rapps/rapps/dvdwritenow.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/dvdwritenow.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/dvdwritenow.txt [iso-8859-1] Sat Oct 12 12:28:18 2013 @@ -6,9 +6,15 @@ Licence = Freeware Description = A free direct CD/DVD recording software. Once installed, you can use your CD/DVD RW as USB Flash or removable hard drives. Along with this you can write to CD/DVD RW recorded with UDF filesystem. You can also read UDF disks created with other software. (Microsoft DVDâROMs, RW disks recorded with Ahead InCD). You need a ZIP decompression program to install it. Size = 1.2MB -Category = 13 +Category = 12 +URLSite = http://dwn.alter.org.ua/ URLDownload = http://dwn.alter.org.ua/downloads/dwn_1_5_12_sp2.zip CDPath = none [Section.0407] Description = Eine kostenlose CD/DVD Brennsoftware. Sobald es installiert ist, kann man CD/DVD RW als USB Flash oder WechseldatentrÃ¤ger beschreiben. Auch kann man hiermit auf CD/DVD RW schreiben, welche mit dem UDF Dateisystem beschrieben wurden. Auch kann man mit dieser Software UDF Disks, welche mit anderer Software erstellt wurden, lesen. (Microsoft DVDâROMs, RW Disks erstellt mit Ahead InCD). Es wird fÃ¼r die Installation ein ZIP Dekomprimierprogramm benÃ¶tigt. + +[Section.0419] +Description = DVD Write Now - Ð±ÐµÑÐ¿Ð»Ð°ÑÐ½Ð°Ñ Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð¼Ð° Ð´Ð»Ñ Ð¿ÑÑÐ¼Ð¾Ð¹ Ð·Ð°Ð¿Ð¸ÑÐ¸ Ð½Ð° CD Ð¸ DVD Ð´Ð¸ÑÐºÐ¸. ÐÐ¾Ð·Ð²Ð¾Ð»ÑÐµÑ Ð¸ÑÐ¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÑ Ð¿ÐµÑÐµÐ·Ð°Ð¿Ð¸ÑÑÐ²Ð°ÐµÐ¼ÑÐµ CD Ð¸ DVD Ð´Ð¸ÑÐºÐ¸ ÐºÐ°Ðº USB-Flash Ð¸Ð»Ð¸ ÑÑÐµÐ¼Ð½ÑÐµ Ð¶ÐµÑÑÐºÐ¸Ðµ Ð´Ð¸ÑÐºÐ¸, Ð·Ð°Ð¿Ð¸ÑÑÐ²Ð°ÑÑ ÑÐ°Ð¹Ð»Ñ Ð½Ð° Ð¿ÐµÑÐµÐ·Ð°Ð¿Ð¸ÑÑÐ²Ð°ÐµÐ¼ÑÐµ CD/DVD Ð´Ð¸ÑÐºÐ¸, ÑÐ¾Ð·Ð´Ð°Ð½Ð½ÑÐµ Ð² ÑÐ¾ÑÐ¼Ð°ÑÐµ UDF, Ð¸ ÑÐ¸ÑÐ°ÑÑ UDF-Ð´Ð¸ÑÐºÐ¸, ÑÐ¾Ð·Ð´Ð°Ð½Ð½ÑÐµ Ð´ÑÑÐ³Ð¸Ð¼Ð¸ Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð¼Ð°Ð¼Ð¸. +URLSite = http://dwn.alter.org.ua/ru/ +

1 0

[jimtabor] 60626: - Hacky wine patch to fix CORE-7054.
by jimtabor＠svn.reactos.org 12 Oct '13

12 Oct '13

Author: jimtabor Date: Sat Oct 12 01:05:37 2013 New Revision: 60626 URL: http://svn.reactos.org/svn/reactos?rev=60626&view=rev Log: - Hacky wine patch to fix CORE-7054. Modified: trunk/reactos/win32ss/user/user32/windows/defwnd.c Modified: trunk/reactos/win32ss/user/user32/windows/defwnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/window… ============================================================================== --- trunk/reactos/win32ss/user/user32/windows/defwnd.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/windows/defwnd.c [iso-8859-1] Sat Oct 12 01:05:37 2013 @@ -22,6 +22,7 @@ LRESULT DefWndNCHitTest(HWND hWnd, POINT Point); LRESULT DefWndNCLButtonDown(HWND hWnd, WPARAM wParam, LPARAM lParam); LRESULT DefWndNCLButtonDblClk(HWND hWnd, WPARAM wParam, LPARAM lParam); +LRESULT NC_HandleNCRButtonDown( HWND hwnd, WPARAM wParam, LPARAM lParam ); void FASTCALL MenuInitSysMenuPopup(HMENU Menu, DWORD Style, DWORD ClsStyle, LONG HitTest ); void MENU_EndMenu( HWND ); @@ -1163,14 +1164,7 @@ } case WM_NCRBUTTONDOWN: - { - /* in Windows, capture is taken when right-clicking on the caption bar */ - if (wParam == HTCAPTION) - { - SetCapture(hWnd); - } - break; - } + return NC_HandleNCRButtonDown( hWnd, wParam, lParam ); case WM_RBUTTONUP: {

1 0

[aandrejevic] 60625: [SOFT386] - Fix calculation of the AF flag in opcode groups 0xFE and 0xFF (INC/DEC). - Fix a bug in the REP prefix by simulating the wrap-around of DI which can occur when the ...
by aandrejevic＠svn.reactos.org 11 Oct '13

11 Oct '13

Author: aandrejevic Date: Fri Oct 11 23:45:42 2013 New Revision: 60625 URL: http://svn.reactos.org/svn/reactos?rev=60625&view=rev Log: [SOFT386] - Fix calculation of the AF flag in opcode groups 0xFE and 0xFF (INC/DEC). - Fix a bug in the REP prefix by simulating the wrap-around of DI which can occur when the current address size is 16-bit. - Exception error codes are only pushed on the stack in protected mode. Modified: branches/ntvdm/lib/soft386/common.c branches/ntvdm/lib/soft386/opcodes.c branches/ntvdm/lib/soft386/opgroups.c Modified: branches/ntvdm/lib/soft386/common.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/soft386/common.c?rev=… ============================================================================== --- branches/ntvdm/lib/soft386/common.c [iso-8859-1] (original) +++ branches/ntvdm/lib/soft386/common.c [iso-8859-1] Fri Oct 11 23:45:42 2013 @@ -494,7 +494,8 @@ return; } - if (EXCEPTION_HAS_ERROR_CODE(ExceptionCode)) + if (EXCEPTION_HAS_ERROR_CODE(ExceptionCode) + && (State->ControlRegisters[SOFT386_REG_CR0] & SOFT386_CR0_PE)) { /* Push the error code */ Soft386StackPush(State, ErrorCode); Modified: branches/ntvdm/lib/soft386/opcodes.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/soft386/opcodes.c?rev… ============================================================================== --- branches/ntvdm/lib/soft386/opcodes.c [iso-8859-1] (original) +++ branches/ntvdm/lib/soft386/opcodes.c [iso-8859-1] Fri Oct 11 23:45:42 2013 @@ -6168,6 +6168,15 @@ { ULONG Processed = min(Count, STRING_BLOCK_SIZE / DataSize); + /* Simulate the 16-bit wrap-around of DI in 16-bit address mode */ + if (!AddressSize) + { + ULONG MaxBytes = 0x10000 - (ULONG)State->GeneralRegs[SOFT386_REG_EDI].LowWord; + + Processed = min(Processed, MaxBytes / DataSize); + if (Processed == 0) Processed = 1; + } + if (State->Flags.Df) { /* Reduce EDI by the number of bytes to transfer */ @@ -6436,6 +6445,15 @@ while (Count) { ULONG Processed = min(Count, STRING_BLOCK_SIZE / DataSize); + + /* Simulate the 16-bit wrap-around of DI in 16-bit address mode */ + if (!AddressSize) + { + ULONG MaxBytes = 0x10000 - (ULONG)State->GeneralRegs[SOFT386_REG_EDI].LowWord; + + Processed = min(Processed, MaxBytes / DataSize); + if (Processed == 0) Processed = 1; + } /* Read from the I/O port */ State->IoReadCallback(State, @@ -6574,6 +6592,15 @@ { ULONG Processed = min(Count, STRING_BLOCK_SIZE / DataSize); + /* Simulate the 16-bit wrap-around of DI in 16-bit address mode */ + if (!AddressSize) + { + ULONG MaxBytes = 0x10000 - (ULONG)State->GeneralRegs[SOFT386_REG_EDI].LowWord; + + Processed = min(Processed, MaxBytes / DataSize); + if (Processed == 0) Processed = 1; + } + /* Read from memory */ if (!Soft386ReadMemory(State, SOFT386_REG_ES, Modified: branches/ntvdm/lib/soft386/opgroups.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/soft386/opgroups.c?re… ============================================================================== --- branches/ntvdm/lib/soft386/opgroups.c [iso-8859-1] (original) +++ branches/ntvdm/lib/soft386/opgroups.c [iso-8859-1] Fri Oct 11 23:45:42 2013 @@ -1414,21 +1414,22 @@ if (ModRegRm.Register == 0) { - /* Increment and update OF */ + /* Increment and update OF and AF */ Value++; State->Flags.Of = (Value == SIGN_FLAG_BYTE) ? TRUE : FALSE; + State->Flags.Af = ((Value & 0x0F) == 0); } else { - /* Decrement and update OF */ + /* Decrement and update OF and AF */ State->Flags.Of = (Value == SIGN_FLAG_BYTE) ? TRUE : FALSE; Value--; + State->Flags.Af = ((Value & 0x0F) == 0x0F); } /* Update flags */ State->Flags.Sf = (Value & SIGN_FLAG_BYTE) ? TRUE : FALSE; State->Flags.Zf = (Value == 0) ? TRUE : FALSE; - State->Flags.Af = ((Value & 0x0F) == 0) ? TRUE : FALSE; State->Flags.Pf = Soft386CalculateParity(Value); /* Write back the result */ @@ -1483,15 +1484,17 @@ if (ModRegRm.Register == 0) { - /* Increment and update OF */ + /* Increment and update OF and AF */ Value++; State->Flags.Of = (Value == SIGN_FLAG_LONG) ? TRUE : FALSE; + State->Flags.Af = ((Value & 0x0F) == 0); } else if (ModRegRm.Register == 1) { - /* Decrement and update OF */ + /* Decrement and update OF and AF */ State->Flags.Of = (Value == SIGN_FLAG_LONG) ? TRUE : FALSE; Value--; + State->Flags.Af = ((Value & 0x0F) == 0x0F); } if (ModRegRm.Register <= 1) @@ -1499,7 +1502,6 @@ /* Update flags */ State->Flags.Sf = (Value & SIGN_FLAG_LONG) ? TRUE : FALSE; State->Flags.Zf = (Value == 0) ? TRUE : FALSE; - State->Flags.Af = ((Value & 0x0F) == 0) ? TRUE : FALSE; State->Flags.Pf = Soft386CalculateParity(Value); /* Write back the result */ @@ -1524,12 +1526,14 @@ /* Increment and update OF */ Value++; State->Flags.Of = (Value == SIGN_FLAG_WORD) ? TRUE : FALSE; + State->Flags.Af = ((Value & 0x0F) == 0); } else if (ModRegRm.Register == 1) { /* Decrement and update OF */ State->Flags.Of = (Value == SIGN_FLAG_WORD) ? TRUE : FALSE; Value--; + State->Flags.Af = ((Value & 0x0F) == 0x0F); } if (ModRegRm.Register <= 1) @@ -1537,7 +1541,6 @@ /* Update flags */ State->Flags.Sf = (Value & SIGN_FLAG_WORD) ? TRUE : FALSE; State->Flags.Zf = (Value == 0) ? TRUE : FALSE; - State->Flags.Af = ((Value & 0x0F) == 0) ? TRUE : FALSE; State->Flags.Pf = Soft386CalculateParity(Value); /* Write back the result */

1 0

[akhaldi] 60624: [NTOSKRNL] * Fix a potential null pointer dereference. CID 701145. * Change the ASSERT to NT_ASSERT. CORE-6681
by akhaldi＠svn.reactos.org 11 Oct '13

11 Oct '13

Author: akhaldi Date: Fri Oct 11 23:29:08 2013 New Revision: 60624 URL: http://svn.reactos.org/svn/reactos?rev=60624&view=rev Log: [NTOSKRNL] * Fix a potential null pointer dereference. CID 701145. * Change the ASSERT to NT_ASSERT. CORE-6681 Modified: trunk/reactos/ntoskrnl/mm/section.c Modified: trunk/reactos/ntoskrnl/mm/section.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/section.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/section.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/section.c [iso-8859-1] Fri Oct 11 23:29:08 2013 @@ -4137,7 +4137,7 @@ MemoryArea->Type != MEMORY_AREA_SECTION_VIEW || MemoryArea->DeleteInProgress) { - ASSERT(MemoryArea->Type != MEMORY_AREA_OWNED_BY_ARM3); + if (MemoryArea) NT_ASSERT(MemoryArea->Type != MEMORY_AREA_OWNED_BY_ARM3); MmUnlockAddressSpace(AddressSpace); return STATUS_NOT_MAPPED_VIEW; }

1 0

[hbelusca] 60623: [CONSRV] Definitely fix "Select All" functionality (see r59811).
by hbelusca＠svn.reactos.org 11 Oct '13

11 Oct '13

Author: hbelusca Date: Fri Oct 11 22:59:05 2013 New Revision: 60623 URL: http://svn.reactos.org/svn/reactos?rev=60623&view=rev Log: [CONSRV] Definitely fix "Select All" functionality (see r59811). Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/guiterm.c Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/guiterm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/guiterm.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/guiterm.c [iso-8859-1] Fri Oct 11 22:59:05 2013 @@ -318,13 +318,33 @@ SIZE_T Length = 0; /* - * We select all the characters from line 1 to - * the line where the cursor is positioned. + * The selection area extends to the whole screen buffer's width. */ Console->Selection.dwSelectionAnchor.X = 0; Console->Selection.dwSelectionAnchor.Y = 0; - Console->dwSelectionCursor.X = ActiveBuffer->ViewSize.X - 1; - Console->dwSelectionCursor.Y = ActiveBuffer->CursorPosition.Y; + Console->dwSelectionCursor.X = ActiveBuffer->ScreenBufferSize.X - 1; + + /* + * Determine whether the selection must extend to just some part + * (for text-mode screen buffers) or to all of the screen buffer's + * height (for graphics ones). + */ + if (GetType(ActiveBuffer) == TEXTMODE_BUFFER) + { + /* + * We select all the characters from the first line + * to the line where the cursor is positioned. + */ + Console->dwSelectionCursor.Y = ActiveBuffer->CursorPosition.Y; + } + else /* if (GetType(ActiveBuffer) == GRAPHICS_BUFFER) */ + { + /* + * We select all the screen buffer area. + */ + Console->dwSelectionCursor.Y = ActiveBuffer->ScreenBufferSize.Y - 1; + } + Console->Selection.dwFlags |= CONSOLE_SELECTION_IN_PROGRESS | CONSOLE_MOUSE_SELECTION; GuiConsoleUpdateSelection(Console, &Console->dwSelectionCursor);

1 0

[jimtabor] 60622: [Win32k] - Fix CORE-6945. - Miscellaneous adds and changes.
by jimtabor＠svn.reactos.org 11 Oct '13

11 Oct '13

Author: jimtabor Date: Fri Oct 11 21:46:30 2013 New Revision: 60622 URL: http://svn.reactos.org/svn/reactos?rev=60622&view=rev Log: [Win32k] - Fix CORE-6945. - Miscellaneous adds and changes. Modified: trunk/reactos/win32ss/include/callback.h trunk/reactos/win32ss/include/ntgdityp.h trunk/reactos/win32ss/include/ntuser.h trunk/reactos/win32ss/user/ntuser/callback.c trunk/reactos/win32ss/user/ntuser/callback.h trunk/reactos/win32ss/user/ntuser/class.c trunk/reactos/win32ss/user/ntuser/defwnd.c trunk/reactos/win32ss/user/ntuser/painting.c trunk/reactos/win32ss/user/ntuser/painting.h trunk/reactos/win32ss/user/ntuser/prop.c trunk/reactos/win32ss/user/ntuser/prop.h trunk/reactos/win32ss/user/ntuser/window.c trunk/reactos/win32ss/user/user32/include/user32p.h trunk/reactos/win32ss/user/user32/misc/dllmain.c trunk/reactos/win32ss/user/user32/windows/defwnd.c trunk/reactos/win32ss/user/user32/windows/nonclient.c trunk/reactos/win32ss/user/user32/windows/prop.c Modified: trunk/reactos/win32ss/include/callback.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/include/callback.h… ============================================================================== --- trunk/reactos/win32ss/include/callback.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/include/callback.h [iso-8859-1] Fri Oct 11 21:46:30 2013 @@ -12,7 +12,8 @@ #define USER32_CALLBACK_CLIENTLOADLIBRARY (8) #define USER32_CALLBACK_GETCHARSETINFO (9) #define USER32_CALLBACK_COPYIMAGE (10) -#define USER32_CALLBACK_MAXIMUM (10) +#define USER32_CALLBACK_SETWNDICONS (11) +#define USER32_CALLBACK_MAXIMUM (11) typedef struct _WINDOWPROC_CALLBACK_ARGUMENTS { @@ -105,8 +106,16 @@ CHARSETINFO Cs; } GET_CHARSET_INFO, *PGET_CHARSET_INFO; +typedef struct _SETWNDICONS_CALLBACK_ARGUMENTS +{ + HICON hIconSmWindows; + HICON hIconWindows; +} SETWNDICONS_CALLBACK_ARGUMENTS, *PSETWNDICONS_CALLBACK_ARGUMENTS; + NTSTATUS WINAPI User32CallCopyImageFromKernel(PVOID Arguments, ULONG ArgumentLength); +NTSTATUS WINAPI +User32CallSetWndIconsFromKernel(PVOID Arguments, ULONG ArgumentLength); NTSTATUS WINAPI User32CallWindowProcFromKernel(PVOID Arguments, ULONG ArgumentLength); NTSTATUS WINAPI Modified: trunk/reactos/win32ss/include/ntgdityp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/include/ntgdityp.h… ============================================================================== --- trunk/reactos/win32ss/include/ntgdityp.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/include/ntgdityp.h [iso-8859-1] Fri Oct 11 21:46:30 2013 @@ -742,5 +742,6 @@ ASSERT_PFN(QueryGlyphAttrs); ASSERT_PFN(Notify); ASSERT_PFN(SynchronizeSurface); +ASSERT_PFN(ResetDevice); #endif Modified: trunk/reactos/win32ss/include/ntuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/include/ntuser.h?r… ============================================================================== --- trunk/reactos/win32ss/include/ntuser.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/include/ntuser.h [iso-8859-1] Fri Oct 11 21:46:30 2013 @@ -69,6 +69,7 @@ UserThreadWOWInformation, UserThreadHungStatus, UserThreadInitiateShutdown, + UserThreadEndShutdown, UserThreadUseActiveDesktop, UserThreadUseDesktop, @@ -119,6 +120,7 @@ HWND hTaskManWindow; HWND hProgmanWindow; HWND hShellWindow; + struct _WND * spwndShell; PPROCESSINFO ppiShellProcess; @@ -857,7 +859,7 @@ TEXTMETRICW tmSysFont; DPISERVERINFO dpiSystem; HICON hIconSmWindows; - HICON hIcoWindows; + HICON hIconWindows; DWORD dwKeyCache; DWORD dwAsyncKeyCache; ULONG cCaptures; Modified: trunk/reactos/win32ss/user/ntuser/callback.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/callba… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/callback.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/callback.c [iso-8859-1] Fri Oct 11 21:46:30 2013 @@ -881,7 +881,6 @@ return Status; } - HANDLE FASTCALL co_IntCopyImage(HANDLE hnd, UINT type, INT desiredx, INT desiredy, UINT flags) { @@ -993,4 +992,53 @@ return TRUE; } +BOOL FASTCALL +co_IntSetWndIcons(VOID) +{ + NTSTATUS Status; + ULONG ArgumentLength, ResultLength; + PVOID Argument, ResultPointer; + PSETWNDICONS_CALLBACK_ARGUMENTS Common; + + ArgumentLength = ResultLength = 0; + Argument = ResultPointer = NULL; + + ArgumentLength = sizeof(SETWNDICONS_CALLBACK_ARGUMENTS); + + Argument = IntCbAllocateMemory(ArgumentLength); + if (NULL == Argument) + { + ERR("Set Window Icons callback failed: out of memory\n"); + return FALSE; + } + Common = (PSETWNDICONS_CALLBACK_ARGUMENTS) Argument; + + UserLeaveCo(); + + Status = KeUserModeCallback(USER32_CALLBACK_SETWNDICONS, + Argument, + ArgumentLength, + &ResultPointer, + &ResultLength); + + + UserEnterCo(); + + /* FIXME: Need to setup Registry System Cursor & Icons via Callbacks at init time! */ + gpsi->hIconSmWindows = Common->hIconSmWindows; + gpsi->hIconWindows = Common->hIconWindows; + + ERR("hIconSmWindows %p hIconWindows %p \n",gpsi->hIconSmWindows,gpsi->hIconWindows); + + IntCbFreeMemory(Argument); + + if (!NT_SUCCESS(Status)) + { + ERR("Set Window Icons callback failed!\n"); + return FALSE; + } + + return TRUE; +} + /* EOF */ Modified: trunk/reactos/win32ss/user/ntuser/callback.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/callba… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/callback.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/callback.h [iso-8859-1] Fri Oct 11 21:46:30 2013 @@ -69,3 +69,5 @@ co_IntGetCharsetInfo(LCID Locale, PCHARSETINFO pCs); HANDLE FASTCALL co_IntCopyImage(HANDLE,UINT,INT,INT,UINT); + +BOOL FASTCALL co_IntSetWndIcons(VOID); Modified: trunk/reactos/win32ss/user/ntuser/class.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/class.… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/class.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/class.c [iso-8859-1] Fri Oct 11 21:46:30 2013 @@ -1899,8 +1899,6 @@ if (hIconSmIntern) Class->CSF_flags |= CSF_CACHEDSMICON; //// FIXME: Very hacky here but it passes the tests.... - //// We should not kill a users handle!!! - if (Class->hIconSm) IntClassDestroyIcon(Class->hIconSm); // Fixes 1013 Ret = 0; // Fixes 1009 } Class->hIconSm = (HANDLE)NewLong; Modified: trunk/reactos/win32ss/user/ntuser/defwnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/defwnd… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/defwnd.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/defwnd.c [iso-8859-1] Fri Oct 11 21:46:30 2013 @@ -172,6 +172,7 @@ BOOL Ansi) { LRESULT lResult = 0; + USER_REFERENCE_ENTRY Ref; if (Msg > WM_USER) return 0; @@ -204,6 +205,20 @@ break; case WM_CLIENTSHUTDOWN: return IntClientShutdown(Wnd, wParam, lParam); + + case WM_APPCOMMAND: + ERR("WM_APPCOMMAND\n"); + if ( (Wnd->style & (WS_POPUP|WS_CHILD)) != WS_CHILD && + Wnd != co_GetDesktopWindow(Wnd) ) + { + if (!co_HOOK_CallHooks(WH_SHELL, HSHELL_APPCOMMAND, wParam, lParam)) + co_IntShellHookNotify(HSHELL_APPCOMMAND, wParam, lParam); + break; + } + UserRefObjectCo(Wnd->spwndParent, &Ref); + lResult = co_IntSendMessage(UserHMGetHandle(Wnd->spwndParent), WM_APPCOMMAND, wParam, lParam); + UserDerefObjectCo(Wnd->spwndParent); + break; case WM_CTLCOLORMSGBOX: case WM_CTLCOLOREDIT: @@ -303,20 +318,22 @@ return lResult; } -static HICON NC_IconForWindow( PWND pWnd ) +HICON FASTCALL NC_IconForWindow( PWND pWnd ) { HICON hIcon = 0; - - if (!pWnd->pcls || pWnd->fnid == FNID_DESKTOP) return hIcon; + // First thing to do, init the Window Logo icons. + if (!gpsi->hIconSmWindows) co_IntSetWndIcons(); + + if (!hIcon) hIcon = UserGetProp(pWnd, gpsi->atomIconSmProp); + if (!hIcon) hIcon = UserGetProp(pWnd, gpsi->atomIconProp); if (!hIcon) hIcon = pWnd->pcls->hIconSm; if (!hIcon) hIcon = pWnd->pcls->hIcon; if (!hIcon && pWnd->style & DS_MODALFRAME) - { // Fake it out for now, we use it as a test. + { + if (!hIcon) hIcon = gpsi->hIconSmWindows; // Both are IDI_WINLOGO Small + if (!hIcon) hIcon = gpsi->hIconWindows; // Reg size. hIcon = (HICON)1; - /* FIXME: Need to setup Registry System Cursor & Icons via Callbacks at init time! */ - if (!hIcon) hIcon = gpsi->hIconSmWindows; // Both are IDI_WINLOGO Small - if (!hIcon) hIcon = gpsi->hIcoWindows; // Reg size. } return hIcon; } Modified: trunk/reactos/win32ss/user/ntuser/painting.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/painti… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/painting.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/painting.c [iso-8859-1] Fri Oct 11 21:46:30 2013 @@ -1987,9 +1987,7 @@ if (!hIcon && pWnd) { - hIcon = pWnd->pcls->hIconSm; // FIXME: Windows does not do that - if(!hIcon) - hIcon = pWnd->pcls->hIcon; + hIcon = NC_IconForWindow( pWnd ); } if (hIcon) Modified: trunk/reactos/win32ss/user/ntuser/painting.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/painti… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/painting.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/painting.h [iso-8859-1] Fri Oct 11 21:46:30 2013 @@ -10,3 +10,4 @@ BOOL FASTCALL IntIsWindowDirty(PWND); BOOL FASTCALL IntEndPaint(PWND,PPAINTSTRUCT); HDC FASTCALL IntBeginPaint(PWND,PPAINTSTRUCT); +HICON FASTCALL NC_IconForWindow( PWND ); Modified: trunk/reactos/win32ss/user/ntuser/prop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/prop.c… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/prop.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/prop.c [iso-8859-1] Fri Oct 11 21:46:30 2013 @@ -30,6 +30,15 @@ return(NULL); } +HANDLE +FASTCALL +UserGetProp(PWND pWnd, ATOM Atom) +{ + PPROPERTY Prop; + Prop = IntGetProp(pWnd, Atom); + return Prop ? Prop->Data : NULL; +} + BOOL FASTCALL IntRemoveProp(PWND Window, ATOM Atom) { Modified: trunk/reactos/win32ss/user/ntuser/prop.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/prop.h… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/prop.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/prop.h [iso-8859-1] Fri Oct 11 21:46:30 2013 @@ -3,3 +3,4 @@ PPROPERTY FASTCALL IntGetProp(PWND,ATOM); BOOL FASTCALL IntRemoveProp(PWND,ATOM); BOOL FASTCALL IntSetProp(PWND, ATOM, HANDLE); +HANDLE FASTCALL UserGetProp(PWND, ATOM); Modified: trunk/reactos/win32ss/user/ntuser/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/window… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/window.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/window.c [iso-8859-1] Fri Oct 11 21:46:30 2013 @@ -426,6 +426,8 @@ PWND Child; PMENU_OBJECT Menu; BOOLEAN BelongsToThreadData; + PLIST_ENTRY ListEntry; + PPROPERTY Property; ASSERT(Window); @@ -553,6 +555,14 @@ #endif IntUnlinkWindow(Window); + + ListEntry = Window->PropListHead.Flink; + while (ListEntry != &Window->PropListHead) + { + Property = CONTAINING_RECORD(ListEntry, PROPERTY, PropListEntry); + ListEntry = ListEntry->Flink; + IntRemoveProp(Window, Property->Atom); + } UserReferenceObject(Window); UserDeleteObject(Window->head.h, TYPE_WINDOW); Modified: trunk/reactos/win32ss/user/user32/include/user32p.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/includ… ============================================================================== --- trunk/reactos/win32ss/user/user32/include/user32p.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/include/user32p.h [iso-8859-1] Fri Oct 11 21:46:30 2013 @@ -32,6 +32,7 @@ extern RTL_CRITICAL_SECTION gcsUserApiHook; extern USERAPIHOOK guah; extern HINSTANCE ghmodUserApiHook; +extern HICON hIconSmWindows, hIconWindows; #define IS_ATOM(x) \ (((ULONG_PTR)(x) > 0x0) && ((ULONG_PTR)(x) < 0x10000)) @@ -101,5 +102,6 @@ HWND* WIN_ListChildren (HWND hWndparent); VOID DeleteFrameBrushes(VOID); BOOL WINAPI GdiValidateHandle(HGDIOBJ); +HANDLE FASTCALL UserGetProp(HWND hWnd, ATOM Atom); /* EOF */ Modified: trunk/reactos/win32ss/user/user32/misc/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/misc/d… ============================================================================== --- trunk/reactos/win32ss/user/user32/misc/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/misc/dllmain.c [iso-8859-1] Fri Oct 11 21:46:30 2013 @@ -15,6 +15,7 @@ ULONG_PTR g_ulSharedDelta; BOOLEAN gfLogonProcess = FALSE; BOOLEAN gfServerProcess = FALSE; +HICON hIconSmWindows = NULL, hIconWindows = NULL; WCHAR szAppInit[KEY_LENGTH]; @@ -207,6 +208,7 @@ User32CallClientLoadLibraryFromKernel, User32CallGetCharsetInfo, User32CallCopyImageFromKernel, + User32CallSetWndIconsFromKernel, }; /* @@ -352,11 +354,38 @@ return TRUE; } + +VOID +FASTCALL +GetConnected(VOID) +{ + USERCONNECT UserCon; +// ERR("GetConnected\n"); + + if ((PTHREADINFO)NtCurrentTeb()->Win32ThreadInfo == NULL) + NtUserGetThreadState(THREADSTATE_GETTHREADINFO); + + if (gpsi && g_ppi) return; +// FIXME HAX: Due to the "Dll Initialization Bug" we have to call this too. + GdiDllInitialize(NULL, DLL_PROCESS_ATTACH, NULL); + + NtUserProcessConnect( NtCurrentProcess(), + &UserCon, + sizeof(USERCONNECT)); + + g_ppi = GetWin32ClientInfo()->ppi; + g_ulSharedDelta = UserCon.siClient.ulSharedDelta; + gpsi = SharedPtrToUser(UserCon.siClient.psi); + gHandleTable = SharedPtrToUser(UserCon.siClient.aheList); + gHandleEntries = SharedPtrToUser(gHandleTable->handles); + +} + NTSTATUS WINAPI User32CallClientThreadSetupFromKernel(PVOID Arguments, ULONG ArgumentLength) { - ERR("GetConnected\n"); + ERR("ClientThreadSetup\n"); ClientThreadSetup(); return ZwCallbackReturn(NULL, 0, STATUS_SUCCESS); } @@ -374,3 +403,20 @@ return ZwCallbackReturn(Arguments, ArgumentLength, Ret ? STATUS_SUCCESS : STATUS_UNSUCCESSFUL); } + +NTSTATUS +WINAPI +User32CallSetWndIconsFromKernel(PVOID Arguments, ULONG ArgumentLength) +{ + PSETWNDICONS_CALLBACK_ARGUMENTS Common = Arguments; + + if (!hIconSmWindows) + { + hIconSmWindows = LoadImageW(0, IDI_WINLOGO, IMAGE_ICON, GetSystemMetrics(SM_CXSMICON), GetSystemMetrics(SM_CYSMICON), LR_DEFAULTCOLOR); + hIconWindows = LoadImageW(0, IDI_WINLOGO, IMAGE_ICON, 0, 0, LR_DEFAULTCOLOR); + } + Common->hIconSmWindows = hIconSmWindows; + Common->hIconWindows = hIconWindows; + + return ZwCallbackReturn(Arguments, ArgumentLength, STATUS_SUCCESS); +} Modified: trunk/reactos/win32ss/user/user32/windows/defwnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/window… ============================================================================== --- trunk/reactos/win32ss/user/user32/windows/defwnd.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/windows/defwnd.c [iso-8859-1] Fri Oct 11 21:46:30 2013 @@ -982,6 +982,68 @@ return TRUE; } +// WM_SETICON +LRESULT FASTCALL +DefWndSetIcon(PWND pWnd, WPARAM wParam, LPARAM lParam) +{ + HICON hIcon, hIconSmall, hIconOld; + + if ( wParam > ICON_SMALL2 ) + { + SetLastError(ERROR_INVALID_PARAMETER); + return 0; + } + hIconSmall = UserGetProp(UserHMGetHandle(pWnd), gpsi->atomIconSmProp); + hIcon = UserGetProp(UserHMGetHandle(pWnd), gpsi->atomIconProp); + + hIconOld = wParam == ICON_BIG ? hIcon : hIconSmall; + + switch(wParam) + { + case ICON_BIG: + hIcon = (HICON)lParam; + break; + case ICON_SMALL: + hIconSmall = (HICON)lParam; + break; + case ICON_SMALL2: + ERR("FIXME: Set ICON_SMALL2 support!\n"); + default: + break; + } + + NtUserSetProp(UserHMGetHandle(pWnd), gpsi->atomIconProp, hIcon); + NtUserSetProp(UserHMGetHandle(pWnd), gpsi->atomIconSmProp, hIconSmall); + + if ((pWnd->style & WS_CAPTION ) == WS_CAPTION) + DefWndNCPaint(UserHMGetHandle(pWnd), HRGN_WINDOW, -1); /* Repaint caption */ + + return (LRESULT)hIconOld; +} + +LRESULT FASTCALL +DefWndGetIcon(PWND pWnd, WPARAM wParam, LPARAM lParam) +{ + HICON hIconRet; + if ( wParam > ICON_SMALL2 ) + { + SetLastError(ERROR_INVALID_PARAMETER); + return 0; + } + switch(wParam) + { + case ICON_BIG: + hIconRet = UserGetProp(UserHMGetHandle(pWnd), gpsi->atomIconProp); + break; + case ICON_SMALL: + case ICON_SMALL2: + hIconRet = UserGetProp(UserHMGetHandle(pWnd), gpsi->atomIconSmProp); + break; + default: + break; + } + return (LRESULT)hIconRet; +} VOID FASTCALL DefWndScreenshot(HWND hWnd) @@ -1523,19 +1585,12 @@ case WM_SETICON: { - INT Index = (wParam != 0) ? GCL_HICON : GCL_HICONSM; - HICON hOldIcon = (HICON)GetClassLongPtrW(hWnd, Index); - SetClassLongPtrW(hWnd, Index, lParam); - SetWindowPos(hWnd, 0, 0, 0, 0, 0, - SWP_FRAMECHANGED | SWP_NOSIZE | SWP_NOMOVE | - SWP_NOACTIVATE | SWP_NOZORDER); - return ((LRESULT)hOldIcon); + return DefWndSetIcon(pWnd, wParam, lParam); } case WM_GETICON: { - INT Index = (wParam == ICON_BIG) ? GCL_HICON : GCL_HICONSM; - return (GetClassLongPtrW(hWnd, Index)); + return DefWndGetIcon(pWnd, wParam, lParam); } case WM_HELP: Modified: trunk/reactos/win32ss/user/user32/windows/nonclient.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/window… ============================================================================== --- trunk/reactos/win32ss/user/user32/windows/nonclient.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/windows/nonclient.c [iso-8859-1] Fri Oct 11 21:46:30 2013 @@ -24,6 +24,7 @@ #include <user32.h> #include <wine/debug.h> +WINE_DEFAULT_DEBUG_CHANNEL(user32); #define HAS_DLGFRAME(Style, ExStyle) \ (((ExStyle) & WS_EX_DLGMODALFRAME) || \ @@ -124,18 +125,15 @@ SendMessageTimeout(hwnd, WM_GETICON, ICON_SMALL2, 0, SMTO_ABORTIFHUNG, 1000, (PDWORD_PTR)&hIcon); - if (!hIcon) - SendMessageTimeout(hwnd, WM_GETICON, ICON_SMALL, 0, SMTO_ABORTIFHUNG, 1000, (PDWORD_PTR)&hIcon); - - if (!hIcon) - SendMessageTimeout(hwnd, WM_GETICON, ICON_BIG, 0, SMTO_ABORTIFHUNG, 1000, (PDWORD_PTR)&hIcon); - - if (!hIcon) - hIcon = (HICON)GetClassLongPtr(hwnd, GCL_HICONSM); - - if (!hIcon) - hIcon = (HICON)GetClassLongPtr(hwnd, GCL_HICON); - + if (!hIcon) hIcon = UserGetProp(hwnd, gpsi->atomIconSmProp); + if (!hIcon) hIcon = UserGetProp(hwnd, gpsi->atomIconProp); + if (!hIcon) hIcon = (HICON)GetClassLongPtr(hwnd, GCL_HICONSM); + if (!hIcon) hIcon = (HICON)GetClassLongPtr(hwnd, GCL_HICON); + if (!hIcon && (GetWindowLongW( hwnd, GWL_STYLE ) & DS_MODALFRAME)) + { + if (!hIcon) hIcon = gpsi->hIconSmWindows; // Both are IDI_WINLOGO Small + if (!hIcon) hIcon = gpsi->hIconWindows; // Reg size. + } return hIcon; } @@ -1035,6 +1033,14 @@ case HTBOTTOMLEFT: case HTBOTTOMRIGHT: { + /* Old comment: + * "make sure hittest fits into 0xf and doesn't overlap with HTSYSMENU" + * This was previously done by setting wParam=SC_SIZE + wParam - 2 + */ + /* But that is not what WinNT does. Instead it sends this. This + * is easy to differentiate from HTSYSMENU, because HTSYSMENU adds + * SC_MOUSEMENU into wParam. + */ SendMessageW(hWnd, WM_SYSCOMMAND, SC_SIZE + wParam - (HTLEFT - WMSZ_LEFT), lParam); break; } @@ -1073,25 +1079,125 @@ return(0); } -VOID -DefWndTrackScrollBar(HWND hWnd, WPARAM wParam, POINT Point) -{ - //INT ScrollBar; - - if ((wParam & 0xfff0) == SC_HSCROLL) - { - if ((wParam & 0x0f) != HTHSCROLL) - return; - //ScrollBar = SB_HORZ; - } - else - { - if ((wParam & 0x0f) != HTVSCROLL) - return; - //ScrollBar = SB_VERT; - } - - /* FIXME */ +/*********************************************************************** + * NC_HandleNCRButtonDown + * + * Handle a WM_NCRBUTTONDOWN message. Called from DefWindowProc(). + */ +LRESULT NC_HandleNCRButtonDown( HWND hwnd, WPARAM wParam, LPARAM lParam ) +{ + MSG msg; + INT hittest = wParam; + + switch (hittest) + { + case HTCAPTION: + case HTSYSMENU: + if (!GetSystemMenu( hwnd, FALSE )) break; + + SetCapture( hwnd ); + for (;;) + { + if (!GetMessageW( &msg, 0, WM_MOUSEFIRST, WM_MOUSELAST )) break; + if (CallMsgFilterW( &msg, MSGF_MAX )) continue; + if (msg.message == WM_RBUTTONUP) + { + hittest = DefWndNCHitTest( hwnd, msg.pt ); + break; + } + if (hwnd != GetCapture()) return 0; + } + ReleaseCapture(); + if (hittest == HTCAPTION || hittest == HTSYSMENU) + { + ERR("Msg pt %x and Msg.lParam %x and lParam %x\n",MAKELONG(msg.pt.x,msg.pt.y),msg.lParam,lParam); + SendMessageW( hwnd, WM_SYSCOMMAND, SC_MOUSEMENU + HTSYSMENU, msg.lParam ); + } + break; + } + return 0; +} + +/*********************************************************************** + * NcGetInsideRect + * + * Get the 'inside' rectangle of a window, i.e. the whole window rectangle + * but without the borders (if any). + * The rectangle is in window coordinates (for drawing with GetWindowDC()). + */ +static void FASTCALL +NcGetInsideRect(HWND Wnd, RECT *Rect) +{ + DWORD Style; + DWORD ExStyle; + + GetWindowRect(Wnd, Rect); + Rect->right = Rect->right - Rect->left; + Rect->left = 0; + Rect->bottom = Rect->bottom - Rect->top; + Rect->top = 0; + + Style = GetWindowLongPtrW(Wnd, GWL_STYLE); + if (0 != (Style & WS_ICONIC)) + { + return; + } + + /* Remove frame from rectangle */ + ExStyle = GetWindowLongPtrW(Wnd, GWL_EXSTYLE); + if (HAS_THICKFRAME(Style, ExStyle)) + { + InflateRect(Rect, - GetSystemMetrics(SM_CXFRAME), - GetSystemMetrics(SM_CYFRAME)); + } + else if (HAS_DLGFRAME(Style, ExStyle)) + { + InflateRect(Rect, - GetSystemMetrics(SM_CXDLGFRAME), - GetSystemMetrics(SM_CYDLGFRAME)); + } + else if (HAS_THINFRAME(Style, ExStyle)) + { + InflateRect(Rect, - GetSystemMetrics(SM_CXBORDER), - GetSystemMetrics(SM_CYBORDER)); + } + + /* We have additional border information if the window + * is a child (but not an MDI child) */ + if (0 != (Style & WS_CHILD) + && 0 == (ExStyle & WS_EX_MDICHILD)) + { + if (0 != (ExStyle & WS_EX_CLIENTEDGE)) + { + InflateRect(Rect, - GetSystemMetrics(SM_CXEDGE), - GetSystemMetrics(SM_CYEDGE)); + } + if (0 != (ExStyle & WS_EX_STATICEDGE)) + { + InflateRect(Rect, - GetSystemMetrics(SM_CXBORDER), - GetSystemMetrics(SM_CYBORDER)); + } + } +} + +/*********************************************************************** + * NcGetSysPopupPos + */ +void FASTCALL +NcGetSysPopupPos(HWND Wnd, RECT *Rect) +{ + RECT WindowRect; + + if (IsIconic(Wnd)) + { + GetWindowRect(Wnd, Rect); + } + else + { + NcGetInsideRect(Wnd, Rect); + GetWindowRect(Wnd, &WindowRect); + OffsetRect(Rect, WindowRect.left, WindowRect.top); + if (0 != (GetWindowLongPtrW(Wnd, GWL_STYLE) & WS_CHILD)) + { + ClientToScreen(GetParent(Wnd), (POINT *) Rect); + } + Rect->right = Rect->left + GetSystemMetrics(SM_CYCAPTION) - 1; + Rect->bottom = Rect->top + GetSystemMetrics(SM_CYCAPTION) - 1; + } } /* PUBLIC FUNCTIONS ***********************************************************/ @@ -1251,85 +1357,3 @@ } return ret; } - -/*********************************************************************** - * NcGetInsideRect - * - * Get the 'inside' rectangle of a window, i.e. the whole window rectangle - * but without the borders (if any). - * The rectangle is in window coordinates (for drawing with GetWindowDC()). - */ -static void FASTCALL -NcGetInsideRect(HWND Wnd, RECT *Rect) -{ - DWORD Style; - DWORD ExStyle; - - GetWindowRect(Wnd, Rect); - Rect->right = Rect->right - Rect->left; - Rect->left = 0; - Rect->bottom = Rect->bottom - Rect->top; - Rect->top = 0; - - Style = GetWindowLongPtrW(Wnd, GWL_STYLE); - if (0 != (Style & WS_ICONIC)) - { - return; - } - - /* Remove frame from rectangle */ - ExStyle = GetWindowLongPtrW(Wnd, GWL_EXSTYLE); - if (HAS_THICKFRAME(Style, ExStyle)) - { - InflateRect(Rect, - GetSystemMetrics(SM_CXFRAME), - GetSystemMetrics(SM_CYFRAME)); - } - else if (HAS_DLGFRAME(Style, ExStyle)) - { - InflateRect(Rect, - GetSystemMetrics(SM_CXDLGFRAME), - GetSystemMetrics(SM_CYDLGFRAME)); - } - else if (HAS_THINFRAME(Style, ExStyle)) - { - InflateRect(Rect, - GetSystemMetrics(SM_CXBORDER), - GetSystemMetrics(SM_CYBORDER)); - } - - /* We have additional border information if the window - * is a child (but not an MDI child) */ - if (0 != (Style & WS_CHILD) - && 0 == (ExStyle & WS_EX_MDICHILD)) - { - if (0 != (ExStyle & WS_EX_CLIENTEDGE)) - { - InflateRect(Rect, - GetSystemMetrics(SM_CXEDGE), - GetSystemMetrics(SM_CYEDGE)); - } - if (0 != (ExStyle & WS_EX_STATICEDGE)) - { - InflateRect(Rect, - GetSystemMetrics(SM_CXBORDER), - GetSystemMetrics(SM_CYBORDER)); - } - } -} - -/*********************************************************************** - * NcGetSysPopupPos - */ -void FASTCALL -NcGetSysPopupPos(HWND Wnd, RECT *Rect) -{ - RECT WindowRect; - - if (IsIconic(Wnd)) - { - GetWindowRect(Wnd, Rect); - } - else - { - NcGetInsideRect(Wnd, Rect); - GetWindowRect(Wnd, &WindowRect); - OffsetRect(Rect, WindowRect.left, WindowRect.top); - if (0 != (GetWindowLongPtrW(Wnd, GWL_STYLE) & WS_CHILD)) - { - ClientToScreen(GetParent(Wnd), (POINT *) Rect); - } - Rect->right = Rect->left + GetSystemMetrics(SM_CYCAPTION) - 1; - Rect->bottom = Rect->top + GetSystemMetrics(SM_CYCAPTION) - 1; - } -} Modified: trunk/reactos/win32ss/user/user32/windows/prop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/window… ============================================================================== --- trunk/reactos/win32ss/user/user32/windows/prop.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/windows/prop.c [iso-8859-1] Fri Oct 11 21:46:30 2013 @@ -18,8 +18,8 @@ */ /* * PROJECT: ReactOS user32.dll - * FILE: lib/user32/windows/input.c - * PURPOSE: Input + * FILE: user/user32/windows/prop.c + * PURPOSE: Window Property * PROGRAMMER: Casper S. Hornstrup (chorns(a)users.sourceforge.net) * UPDATE HISTORY: * 09-05-2001 CSH Created @@ -63,6 +63,14 @@ return NULL; } +HANDLE +FASTCALL +UserGetProp(HWND hWnd, ATOM Atom) +{ + PPROPERTY Prop; + Prop = IntGetProp(hWnd, Atom); + return Prop ? Prop->Data : NULL; +} /* FUNCTIONS *****************************************************************/

1 0

[aandrejevic] 60621: [SOFT386] Improve the performance of Soft386CalculateParity.
by aandrejevic＠svn.reactos.org 11 Oct '13

11 Oct '13

Author: aandrejevic Date: Fri Oct 11 20:54:46 2013 New Revision: 60621 URL: http://svn.reactos.org/svn/reactos?rev=60621&view=rev Log: [SOFT386] Improve the performance of Soft386CalculateParity. Modified: branches/ntvdm/lib/soft386/common.inl Modified: branches/ntvdm/lib/soft386/common.inl URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/soft386/common.inl?re… ============================================================================== --- branches/ntvdm/lib/soft386/common.inl [iso-8859-1] (original) +++ branches/ntvdm/lib/soft386/common.inl [iso-8859-1] Fri Oct 11 20:54:46 2013 @@ -436,10 +436,7 @@ BOOLEAN Soft386CalculateParity(UCHAR Number) { - Number ^= Number >> 1; - Number ^= Number >> 2; - Number ^= Number >> 4; - return !(Number & 1); + return (0x9669 >> ((Number & 0x0F) ^ (Number >> 4))) & 1; } FORCEINLINE

1 0

[aandrejevic] 60620: [SOFT386] Fix prefix handling.
by aandrejevic＠svn.reactos.org 11 Oct '13

11 Oct '13

Author: aandrejevic Date: Fri Oct 11 20:48:19 2013 New Revision: 60620 URL: http://svn.reactos.org/svn/reactos?rev=60620&view=rev Log: [SOFT386] Fix prefix handling. Modified: branches/ntvdm/lib/soft386/opcodes.c Modified: branches/ntvdm/lib/soft386/opcodes.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/soft386/opcodes.c?rev… ============================================================================== --- branches/ntvdm/lib/soft386/opcodes.c [iso-8859-1] (original) +++ branches/ntvdm/lib/soft386/opcodes.c [iso-8859-1] Fri Oct 11 20:48:19 2013 @@ -466,12 +466,13 @@ ULONG Value; BOOLEAN Size = State->SegmentRegs[SOFT386_REG_CS].Size; - if (State->PrefixFlags == SOFT386_PREFIX_OPSIZE) + if (State->PrefixFlags & SOFT386_PREFIX_OPSIZE) { /* The OPSIZE prefix toggles the size */ Size = !Size; } - else if (State->PrefixFlags != 0) + + if (State->PrefixFlags & SOFT386_PREFIX_LOCK) { /* Invalid prefix */ Soft386Exception(State, SOFT386_EXCEPTION_UD); @@ -509,12 +510,13 @@ ULONG Value; BOOLEAN Size = State->SegmentRegs[SOFT386_REG_CS].Size; - if (State->PrefixFlags == SOFT386_PREFIX_OPSIZE) + if (State->PrefixFlags & SOFT386_PREFIX_OPSIZE) { /* The OPSIZE prefix toggles the size */ Size = !Size; } - else if (State->PrefixFlags != 0) + + if (State->PrefixFlags & SOFT386_PREFIX_LOCK) { /* Invalid prefix */ Soft386Exception(State, SOFT386_EXCEPTION_UD); @@ -618,12 +620,13 @@ INT Reg = Opcode & 0x07; BOOLEAN Size = State->SegmentRegs[SOFT386_REG_CS].Size; - if (State->PrefixFlags == SOFT386_PREFIX_OPSIZE) + if (State->PrefixFlags & SOFT386_PREFIX_OPSIZE) { /* The OPSIZE prefix toggles the size */ Size = !Size; } - else if (State->PrefixFlags != 0) + + if (State->PrefixFlags & SOFT386_PREFIX_LOCK) { /* Invalid prefix */ Soft386Exception(State, SOFT386_EXCEPTION_UD); @@ -974,12 +977,13 @@ /* Make sure this is the right instruction */ ASSERT((Opcode & 0xF7) == 0xE5); - if (State->PrefixFlags == SOFT386_PREFIX_OPSIZE) + if (State->PrefixFlags & SOFT386_PREFIX_OPSIZE) { /* The OPSIZE prefix toggles the size */ Size = !Size; } - else if (State->PrefixFlags != 0) + + if (State->PrefixFlags & SOFT386_PREFIX_LOCK) { /* Invalid prefix */ Soft386Exception(State, SOFT386_EXCEPTION_UD); @@ -1073,12 +1077,13 @@ /* Make sure this is the right instruction */ ASSERT((Opcode & 0xF7) == 0xE7); - if (State->PrefixFlags == SOFT386_PREFIX_OPSIZE) + if (State->PrefixFlags & SOFT386_PREFIX_OPSIZE) { /* The OPSIZE prefix toggles the size */ Size = !Size; } - else if (State->PrefixFlags != 0) + + if (State->PrefixFlags & SOFT386_PREFIX_LOCK) { /* Invalid prefix */ Soft386Exception(State, SOFT386_EXCEPTION_UD); @@ -4533,12 +4538,13 @@ /* Make sure this is the right instruction */ ASSERT(Opcode == 0x98); - if (State->PrefixFlags == SOFT386_PREFIX_OPSIZE) + if (State->PrefixFlags & SOFT386_PREFIX_OPSIZE) { /* The OPSIZE prefix toggles the size */ Size = !Size; } - else if (State->PrefixFlags != 0) + + if (State->PrefixFlags & SOFT386_PREFIX_LOCK) { /* Invalid prefix */ Soft386Exception(State, SOFT386_EXCEPTION_UD); @@ -4573,12 +4579,13 @@ /* Make sure this is the right instruction */ ASSERT(Opcode == 0x99); - if (State->PrefixFlags == SOFT386_PREFIX_OPSIZE) + if (State->PrefixFlags & SOFT386_PREFIX_OPSIZE) { /* The OPSIZE prefix toggles the size */ Size = !Size; } - else if (State->PrefixFlags != 0) + + if (State->PrefixFlags & SOFT386_PREFIX_LOCK) { /* Invalid prefix */ Soft386Exception(State, SOFT386_EXCEPTION_UD); @@ -4825,7 +4832,7 @@ return FALSE; } - if (State->PrefixFlags == SOFT386_PREFIX_OPSIZE) + if (State->PrefixFlags & SOFT386_PREFIX_OPSIZE) { /* The OPSIZE prefix toggles the size */ Size = !Size; @@ -5538,7 +5545,7 @@ return FALSE; } - if (State->PrefixFlags == SOFT386_PREFIX_OPSIZE) + if (State->PrefixFlags & SOFT386_PREFIX_OPSIZE) { /* The OPSIZE prefix toggles the size */ Size = !Size; @@ -5570,12 +5577,13 @@ /* Make sure this is the right instruction */ ASSERT(Opcode == 0xE8); - if (State->PrefixFlags == SOFT386_PREFIX_OPSIZE) + if (State->PrefixFlags & SOFT386_PREFIX_OPSIZE) { /* The OPSIZE prefix toggles the size */ Size = !Size; } - else if (State->PrefixFlags != 0) + + if (State->PrefixFlags & SOFT386_PREFIX_LOCK) { /* Invalid prefix */ Soft386Exception(State, SOFT386_EXCEPTION_UD); @@ -5635,12 +5643,13 @@ /* Make sure this is the right instruction */ ASSERT(Opcode == 0xE9); - if (State->PrefixFlags == SOFT386_PREFIX_OPSIZE) + if (State->PrefixFlags & SOFT386_PREFIX_OPSIZE) { /* The OPSIZE prefix toggles the size */ Size = !Size; } - else if (State->PrefixFlags != 0) + + if (State->PrefixFlags & SOFT386_PREFIX_LOCK) { /* Invalid prefix */ Soft386Exception(State, SOFT386_EXCEPTION_UD);

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