Ros-diffs

ros-diffs@reactos.org

81390 discussions

[hbelusca] 66461: [NTOS] - Use a more standard name for the cursor position headless command structure. - Remove the useless SysThreadCreated variable. - Implement the remaining headless support in...
by hbelusca＠svn.reactos.org 26 Feb '15

26 Feb '15

Author: hbelusca Date: Thu Feb 26 01:59:05 2015 New Revision: 66461 URL: http://svn.reactos.org/svn/reactos?rev=66461&view=rev Log: [NTOS] - Use a more standard name for the cursor position headless command structure. - Remove the useless SysThreadCreated variable. - Implement the remaining headless support in inbv functions, dealing with text colour (on windows, always set white text on black background). I added an extra feature (disabled by default) in case you want to get colourful headless support. - Disable all code related to displaying different logos for different SKUs since up to now ReactOS doesn't have Storage or Cluster flavours, but keep it for reference in case somebody needs it. The resource IDs are still there. - Disable all code related to rotating progress bar (à la XP) since it is not really implemented in ReactOS at the moment. CORE-6781 Modified: trunk/reactos/ntoskrnl/ex/hdlsterm.c trunk/reactos/ntoskrnl/inbv/inbv.c trunk/reactos/ntoskrnl/include/internal/hdl.h trunk/reactos/ntoskrnl/include/resource.h trunk/reactos/ntoskrnl/ntoskrnl.rc trunk/reactos/ntoskrnl/po/poshtdwn.c trunk/reactos/ntoskrnl/ps/psmgr.c Modified: trunk/reactos/ntoskrnl/ex/hdlsterm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/hdlsterm.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ex/hdlsterm.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/hdlsterm.c [iso-8859-1] Thu Feb 26 01:59:05 2015 @@ -259,7 +259,7 @@ PHEADLESS_CMD_PUT_STRING PutString; PHEADLESS_CMD_ENABLE_TERMINAL EnableTerminal; PHEADLESS_CMD_SET_COLOR SetColor; - PHEADLESS_CMD_CURSOR_POS CursorPos; + PHEADLESS_CMD_POSITION_CURSOR CursorPos; PHEADLESS_RSP_GET_BYTE GetByte; UCHAR DataBuffer[80]; Modified: trunk/reactos/ntoskrnl/inbv/inbv.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/inbv/inbv.c?rev=6… ============================================================================== --- trunk/reactos/ntoskrnl/inbv/inbv.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/inbv/inbv.c [iso-8859-1] Thu Feb 26 01:59:05 2015 @@ -7,22 +7,86 @@ /* GLOBALS *******************************************************************/ -KSPIN_LOCK BootDriverLock; -KIRQL InbvOldIrql; -INBV_DISPLAY_STATE InbvDisplayState; +/* + * Enable this define if you want Inbv to use coloured headless mode. + */ +// #define INBV_HEADLESS_COLORS + +/* + * ReactOS uses the same boot screen for all the products. + * Also it doesn't use a parallel system thread for the + * rotating "progress" bar. + */ + +/* + * Enable this define when ReactOS will have different SKUs + * (Workstation, Server, Storage Server, Cluster Server, etc...). + */ +// #define REACTOS_SKUS + +/* + * Enable this define when Inbv will support rotating progress bar. + */ +// #define INBV_ROTBAR_IMPLEMENTED + +static KSPIN_LOCK BootDriverLock; +static KIRQL InbvOldIrql; +static INBV_DISPLAY_STATE InbvDisplayState; BOOLEAN InbvBootDriverInstalled = FALSE; -BOOLEAN InbvDisplayDebugStrings = FALSE; -INBV_DISPLAY_STRING_FILTER InbvDisplayFilter; -ULONG ProgressBarLeft, ProgressBarTop; -BOOLEAN ShowProgressBar = FALSE; -INBV_PROGRESS_STATE InbvProgressState; -INBV_RESET_DISPLAY_PARAMETERS InbvResetDisplayParameters; -ULONG ResourceCount; -PUCHAR ResourceList[64]; -BOOLEAN SysThreadCreated = FALSE; -ROT_BAR_TYPE RotBarSelection; -ULONG PltRotBarStatus; -BT_PROGRESS_INDICATOR InbvProgressIndicator = {0, 25, 0}; +static BOOLEAN InbvDisplayDebugStrings = FALSE; +static INBV_DISPLAY_STRING_FILTER InbvDisplayFilter; +static ULONG ProgressBarLeft, ProgressBarTop; +static BOOLEAN ShowProgressBar = FALSE; +static INBV_PROGRESS_STATE InbvProgressState; +static BT_PROGRESS_INDICATOR InbvProgressIndicator = {0, 25, 0}; +static INBV_RESET_DISPLAY_PARAMETERS InbvResetDisplayParameters; +static ULONG ResourceCount; +static PUCHAR ResourceList[IDB_CLUSTER_SERVER + 1]; // The first entry in the table is the NULL pointer + +#ifdef INBV_ROTBAR_IMPLEMENTED +static BOOLEAN RotBarThreadActive = FALSE; +static ROT_BAR_TYPE RotBarSelection; +static ULONG PltRotBarStatus; +#endif + + +/* + * Headless terminal text colors + */ + +#ifdef INBV_HEADLESS_COLORS + +// Conversion table CGA to ANSI color index +static const UCHAR CGA_TO_ANSI_COLOR_TABLE[16] = +{ + 0, // Black + 4, // Blue + 2, // Green + 6, // Cyan + 1, // Red + 5, // Magenta + 3, // Brown/Yellow + 7, // Grey/White + + 60, // Bright Black + 64, // Bright Blue + 62, // Bright Green + 66, // Bright Cyan + 61, // Bright Red + 65, // Bright Magenta + 63, // Bright Yellow + 67 // Bright Grey (White) +}; + +#define CGA_TO_ANSI_COLOR(CgaColor) \ + CGA_TO_ANSI_COLOR_TABLE[CgaColor & 0x0F] + +#endif + +// Default colors: text in white, background in black +static ULONG InbvTerminalTextColor = 37; +static ULONG InbvTerminalBkgdColor = 40; + /* FADING FUNCTION ***********************************************************/ @@ -36,7 +100,7 @@ } RGBQUAD,*LPRGBQUAD; /*******************************/ -static RGBQUAD _MainPalette[16]; +static RGBQUAD MainPalette[16]; #define PALETTE_FADE_STEPS 15 #define PALETTE_FADE_TIME 20 * 1000 /* 20ms */ @@ -68,17 +132,16 @@ VOID NTAPI InbvReleaseLock(VOID); static VOID -NTAPI -BootImageFadeIn(VOID) -{ - UCHAR PaletteBitmapBuffer[sizeof(BITMAPINFOHEADER) + sizeof(_MainPalette)]; +BootLogoFadeIn(VOID) +{ + UCHAR PaletteBitmapBuffer[sizeof(BITMAPINFOHEADER) + sizeof(MainPalette)]; PBITMAPINFOHEADER PaletteBitmap = (PBITMAPINFOHEADER)PaletteBitmapBuffer; LPRGBQUAD Palette = (LPRGBQUAD)(PaletteBitmapBuffer + sizeof(BITMAPINFOHEADER)); ULONG Iteration, Index, ClrUsed; /* Check if we're installed and we own it */ - if ((InbvBootDriverInstalled) && + if (InbvBootDriverInstalled && (InbvDisplayState == INBV_DISPLAY_STATE_OWNED)) { /* Acquire the lock */ @@ -88,7 +151,7 @@ * Build a bitmap containing the fade in palette. The palette entries * are then processed in a loop and set using VidBitBlt function. */ - ClrUsed = sizeof(_MainPalette) / sizeof(_MainPalette[0]); + ClrUsed = RTL_NUMBER_OF(MainPalette); RtlZeroMemory(PaletteBitmap, sizeof(BITMAPINFOHEADER)); PaletteBitmap->biSize = sizeof(BITMAPINFOHEADER); PaletteBitmap->biBitCount = 4; @@ -102,11 +165,11 @@ for (Index = 0; Index < ClrUsed; Index++) { Palette[Index].rgbRed = (UCHAR) - (_MainPalette[Index].rgbRed * Iteration / PALETTE_FADE_STEPS); + (MainPalette[Index].rgbRed * Iteration / PALETTE_FADE_STEPS); Palette[Index].rgbGreen = (UCHAR) - (_MainPalette[Index].rgbGreen * Iteration / PALETTE_FADE_STEPS); + (MainPalette[Index].rgbGreen * Iteration / PALETTE_FADE_STEPS); Palette[Index].rgbBlue = (UCHAR) - (_MainPalette[Index].rgbBlue * Iteration / PALETTE_FADE_STEPS); + (MainPalette[Index].rgbBlue * Iteration / PALETTE_FADE_STEPS); } VidBitBlt(PaletteBitmapBuffer, 0, 0); @@ -220,8 +283,8 @@ VidResetDisplay(CustomLogo); /* Find bitmap resources in the kernel */ - ResourceCount = min(IDB_CLUSTER_SERVER, Count); - for (i = 1; i <= Count; i++) + ResourceCount = min(Count, RTL_NUMBER_OF(ResourceList)); + for (i = 1; i <= ResourceCount; i++) { /* Do the lookup */ ResourceList[i] = FindBitmapResource(LoaderBlock, i); @@ -291,7 +354,7 @@ if (InbvDisplayState == INBV_DISPLAY_STATE_OWNED) VidCleanUp(); /* Set the new display state */ - InbvDisplayState = Enable ? INBV_DISPLAY_STATE_OWNED: + InbvDisplayState = Enable ? INBV_DISPLAY_STATE_OWNED : INBV_DISPLAY_STATE_DISABLED; /* Release the lock */ @@ -300,7 +363,7 @@ else { /* Set the new display state */ - InbvDisplayState = Enable ? INBV_DISPLAY_STATE_OWNED: + InbvDisplayState = Enable ? INBV_DISPLAY_STATE_OWNED : INBV_DISPLAY_STATE_DISABLED; } } @@ -326,7 +389,7 @@ InbvSetDisplayOwnership(IN BOOLEAN DisplayOwned) { /* Set the new display state */ - InbvDisplayState = DisplayOwned ? INBV_DISPLAY_STATE_OWNED: + InbvDisplayState = DisplayOwned ? INBV_DISPLAY_STATE_OWNED : INBV_DISPLAY_STATE_LOST; } @@ -446,7 +509,7 @@ InbvResetDisplay(VOID) { /* Check if we're installed and we own it */ - if ((InbvBootDriverInstalled) && + if (InbvBootDriverInstalled && (InbvDisplayState == INBV_DISPLAY_STATE_OWNED)) { /* Do the reset */ @@ -473,7 +536,21 @@ NTAPI InbvSetTextColor(IN ULONG Color) { - /* FIXME: Headless */ + HEADLESS_CMD_SET_COLOR HeadlessSetColor; + + /* Set color for EMS port */ +#ifdef INBV_HEADLESS_COLORS + InbvTerminalTextColor = 30 + CGA_TO_ANSI_COLOR(Color); +#else + InbvTerminalTextColor = 37; +#endif + HeadlessSetColor.TextColor = InbvTerminalTextColor; + HeadlessSetColor.BkgdColor = InbvTerminalBkgdColor; + HeadlessDispatch(HeadlessCmdSetColor, + &HeadlessSetColor, + sizeof(HeadlessSetColor), + NULL, + NULL); /* Update the text color */ VidSetTextColor(Color); @@ -487,6 +564,8 @@ IN ULONG Bottom, IN ULONG Color) { + HEADLESS_CMD_SET_COLOR HeadlessSetColor; + /* Make sure we own it */ if (InbvDisplayState == INBV_DISPLAY_STATE_OWNED) { @@ -500,7 +579,22 @@ VidSolidColorFill(Left, Top, Right, Bottom, (UCHAR)Color); } - /* FIXME: Headless */ + /* Set color for EMS port and clear display */ +#ifdef INBV_HEADLESS_COLORS + InbvTerminalBkgdColor = 40 + CGA_TO_ANSI_COLOR(Color); +#else + InbvTerminalBkgdColor = 40; +#endif + HeadlessSetColor.TextColor = InbvTerminalTextColor; + HeadlessSetColor.BkgdColor = InbvTerminalBkgdColor; + HeadlessDispatch(HeadlessCmdSetColor, + &HeadlessSetColor, + sizeof(HeadlessSetColor), + NULL, + NULL); + HeadlessDispatch(HeadlessCmdClearDisplay, + NULL, 0, + NULL, NULL); /* Release the lock */ InbvReleaseLock(); @@ -515,8 +609,8 @@ ULONG FillCount, BoundedProgress; /* Make sure the progress bar is enabled, that we own and are installed */ - if ((ShowProgressBar) && - (InbvBootDriverInstalled) && + if (ShowProgressBar && + InbvBootDriverInstalled && (InbvDisplayState == INBV_DISPLAY_STATE_OWNED)) { /* Compute fill count */ @@ -548,7 +642,7 @@ IN ULONG Delta) { /* Check if we're installed and we own it */ - if ((InbvBootDriverInstalled) && + if (InbvBootDriverInstalled && (InbvDisplayState == INBV_DISPLAY_STATE_OWNED)) { /* Do the blit */ @@ -563,7 +657,7 @@ IN ULONG Y) { /* Check if we're installed and we own it */ - if ((InbvBootDriverInstalled) && + if (InbvBootDriverInstalled && (InbvDisplayState == INBV_DISPLAY_STATE_OWNED)) { /* Acquire the lock */ @@ -587,7 +681,7 @@ IN ULONG Delta) { /* Check if we're installed and we own it */ - if ((InbvBootDriverInstalled) && + if (InbvBootDriverInstalled && (InbvDisplayState == INBV_DISPLAY_STATE_OWNED)) { /* Do the blit */ @@ -653,7 +747,7 @@ if (ResourceNumber > ResourceCount) return NULL; /* Return the address */ - return ResourceList[ResourceNumber--]; + return ResourceList[ResourceNumber]; } NTSTATUS @@ -676,76 +770,85 @@ INIT_FUNCTION DisplayBootBitmap(IN BOOLEAN TextMode) { - PBITMAPINFOHEADER BitmapInfoHeader; - LPRGBQUAD Palette; - - PVOID Header, Band, Text, Screen; + PVOID Header = NULL, Footer = NULL, Screen = NULL; + +#ifdef INBV_ROTBAR_IMPLEMENTED + PVOID Bar = NULL; ROT_BAR_TYPE TempRotBarSelection = RB_UNSPECIFIED; - -#ifdef CORE_6781_resolved +#endif + +#ifdef REACTOS_SKUS + PVOID Text = NULL; UCHAR Buffer[64]; #endif +#ifdef INBV_ROTBAR_IMPLEMENTED /* Check if the system thread has already been created */ - if (SysThreadCreated) + if (RotBarThreadActive) { /* Reset the progress bar */ InbvAcquireLock(); RotBarSelection = RB_UNSPECIFIED; InbvReleaseLock(); } +#endif + + ShowProgressBar = FALSE; /* Check if this is text mode */ - ShowProgressBar = FALSE; if (TextMode) { - /* Check if this is a server OS */ + /* Check the type of the OS: workstation or server */ if (SharedUserData->NtProductType == NtProductWinNt) { - /* It's not, set workstation settings */ + /* Workstation; set colors */ InbvSetTextColor(15); InbvSolidColorFill(0, 0, 639, 479, 7); InbvSolidColorFill(0, 421, 639, 479, 1); /* Get resources */ - Header = InbvGetResourceAddress(IDB_LOGO_HEADER); - Band = InbvGetResourceAddress(IDB_LOGO_BAND); + Header = InbvGetResourceAddress(IDB_WKSTA_HEADER); + Footer = InbvGetResourceAddress(IDB_WKSTA_FOOTER); } else { - /* Set server settings */ + /* Server; set colors */ InbvSetTextColor(14); InbvSolidColorFill(0, 0, 639, 479, 6); InbvSolidColorFill(0, 421, 639, 479, 1); /* Get resources */ Header = InbvGetResourceAddress(IDB_SERVER_HEADER); - Band = InbvGetResourceAddress(IDB_SERVER_BAND); + Footer = InbvGetResourceAddress(IDB_SERVER_FOOTER); } /* Set the scrolling region */ InbvSetScrollRegion(32, 80, 631, 400); /* Make sure we have resources */ - if ((Header) && (Band)) + if (Header && Footer) { /* BitBlt them on the screen */ - InbvBitBlt(Band, 0, 419); + InbvBitBlt(Footer, 0, 419); InbvBitBlt(Header, 0, 0); } } else { /* Is the boot driver installed? */ + if (!InbvBootDriverInstalled) return; + + /* Load the standard boot screen */ + Screen = InbvGetResourceAddress(IDB_BOOT_SCREEN); + +#ifdef REACTOS_SKUS Text = NULL; - if (!InbvBootDriverInstalled) return; - - /* Load the standard boot screen */ - Screen = InbvGetResourceAddress(IDB_BOOT_LOGO); if (SharedUserData->NtProductType == NtProductWinNt) { - /* Workstation product, display appropriate status bar color */ - InbvGetResourceAddress(IDB_BAR_PRO); +#ifdef INBV_ROTBAR_IMPLEMENTED + /* Workstation product, use appropriate status bar color */ + Bar = InbvGetResourceAddress(IDB_BAR_WKSTA); +#endif } else { @@ -766,15 +869,18 @@ Text = InbvGetResourceAddress(IDB_SERVER_LOGO); } - /* Server product, display appropriate status bar color */ - InbvGetResourceAddress(IDB_BAR_SERVER); - } - - /* Make sure we had a logo */ +#ifdef INBV_ROTBAR_IMPLEMENTED + /* Server product, use appropriate status bar color */ + Bar = InbvGetResourceAddress(IDB_BAR_SERVER); +#endif + } +#endif + + /* Make sure we have a logo */ if (Screen) { - /* Choose progress bar */ - TempRotBarSelection = RB_SQUARE_CELLS; + PBITMAPINFOHEADER BitmapInfoHeader; + LPRGBQUAD Palette; /* * Save the main image palette and replace it with black palette, @@ -782,19 +888,21 @@ */ BitmapInfoHeader = (PBITMAPINFOHEADER)Screen; Palette = (LPRGBQUAD)((PUCHAR)Screen + BitmapInfoHeader->biSize); - RtlCopyMemory(_MainPalette, Palette, sizeof(_MainPalette)); - RtlZeroMemory(Palette, sizeof(_MainPalette)); + RtlCopyMemory(MainPalette, Palette, sizeof(MainPalette)); + RtlZeroMemory(Palette, sizeof(MainPalette)); /* Blit the background */ InbvBitBlt(Screen, 0, 0); +#ifdef INBV_ROTBAR_IMPLEMENTED + /* Choose progress bar */ + TempRotBarSelection = RB_SQUARE_CELLS; +#endif + /* Set progress bar coordinates and display it */ InbvSetProgressBarCoordinates(259, 352); - /* Display the boot logo and fade it in */ - BootImageFadeIn(); - -#ifdef CORE_6781_resolved +#ifdef REACTOS_SKUS /* Check for non-workstation products */ if (SharedUserData->NtProductType != NtProductWinNt) { @@ -809,29 +917,34 @@ #endif } -#ifdef CORE_6781_resolved +#ifdef REACTOS_SKUS /* Draw the SKU text if it exits */ if (Text) InbvBitBlt(Text, 180, 121); -#else - DBG_UNREFERENCED_LOCAL_VARIABLE(Text); -#endif - +#endif + +#ifdef INBV_ROTBAR_IMPLEMENTED /* Draw the progress bar bit */ -// if (Bar) InbvBitBlt(Bar, 0, 0); + if (Bar) InbvBitBlt(Bar, 0, 0); +#endif + + /* Display the boot logo and fade it in */ + BootLogoFadeIn(); /* Set filter which will draw text display if needed */ InbvInstallDisplayStringFilter(DisplayFilter); } +#ifdef INBV_ROTBAR_IMPLEMENTED /* Do we have a system thread? */ - if (SysThreadCreated) - { - /* We do, set the progress bar location */ + if (RotBarThreadActive) + { + /* We do, initialize the progress bar */ InbvAcquireLock(); RotBarSelection = TempRotBarSelection; - //InbvRotBarInit(); + // InbvRotBarInit(); InbvReleaseLock(); } +#endif } VOID @@ -872,6 +985,8 @@ } /* Reset progress bar and lock */ +#ifdef INBV_ROTBAR_IMPLEMENTED PltRotBarStatus = 3; +#endif InbvReleaseLock(); } Modified: trunk/reactos/ntoskrnl/include/internal/hdl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/hdl.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/hdl.h [iso-8859-1] Thu Feb 26 01:59:05 2015 @@ -198,11 +198,11 @@ ULONG BkgdColor; } HEADLESS_CMD_SET_COLOR, *PHEADLESS_CMD_SET_COLOR; -typedef struct _HEADLESS_CMD_CURSOR_POS +typedef struct _HEADLESS_CMD_POSITION_CURSOR { ULONG CursorCol; ULONG CursorRow; -} HEADLESS_CMD_CURSOR_POS, *PHEADLESS_CMD_CURSOR_POS; +} HEADLESS_CMD_POSITION_CURSOR, *PHEADLESS_CMD_POSITION_CURSOR; typedef struct _HEADLESS_RSP_GET_BYTE { Modified: trunk/reactos/ntoskrnl/include/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/resource.… ============================================================================== --- trunk/reactos/ntoskrnl/include/resource.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/resource.h [iso-8859-1] Thu Feb 26 01:59:05 2015 @@ -1,23 +1,23 @@ #pragma once -#define IDB_BOOT_LOGO 1 -#define IDB_HIBERNATE_LOGO 2 -#define IDB_SHUTDOWN_LOGO 3 -#define IDB_LOGO 5 -#define IDB_LOGO_HEADER 6 -#define IDB_LOGO_BAND 7 +#define IDB_BOOT_SCREEN 1 +#define IDB_HIBERNATE_BAR 2 +#define IDB_SHUTDOWN_MSG 3 +#define IDB_DEFAULT_LOGO 5 +#define IDB_WKSTA_HEADER 6 +#define IDB_WKSTA_FOOTER 7 -#define IDB_BAR_SERVER 4 -#define IDB_BAR_PRO 8 -#define IDB_BAR_HOME 9 +#define IDB_BAR_SERVER 4 +#define IDB_BAR_WKSTA 8 +#define IDB_BAR_HOME 9 -#define IDB_PROF_TEXT 10 -#define IDB_HOME_TEXT 11 -#define IDB_EMBEDDED_TEXT 12 -#define IDB_MCE_TEXT 18 +#define IDB_PROF_TEXT 10 +#define IDB_HOME_TEXT 11 +#define IDB_EMBEDDED_TEXT 12 +#define IDB_MCE_TEXT 18 -#define IDB_SERVER_LOGO 13 -#define IDB_SERVER_HEADER 14 -#define IDB_SERVER_BAND 15 -#define IDB_STORAGE_SERVER 16 -#define IDB_CLUSTER_SERVER 17 +#define IDB_SERVER_LOGO 13 +#define IDB_SERVER_HEADER 14 +#define IDB_SERVER_FOOTER 15 +#define IDB_STORAGE_SERVER 16 +#define IDB_CLUSTER_SERVER 17 Modified: trunk/reactos/ntoskrnl/ntoskrnl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl.rc?rev=6… ============================================================================== --- trunk/reactos/ntoskrnl/ntoskrnl.rc [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ntoskrnl.rc [iso-8859-1] Thu Feb 26 01:59:05 2015 @@ -28,14 +28,14 @@ #include <bugcodes.rc> -IDB_BOOT_LOGO BITMAP "inbv/logo/1.bmp" -IDB_HIBERNATE_LOGO BITMAP "inbv/logo/2.bmp" -IDB_SHUTDOWN_LOGO BITMAP "inbv/logo/3.bmp" -IDB_BAR_SERVER BITMAP "inbv/logo/4.bmp" -IDB_LOGO BITMAP "inbv/logo/5.bmp" -IDB_LOGO_HEADER BITMAP "inbv/logo/6.bmp" -IDB_LOGO_BAND BITMAP "inbv/logo/7.bmp" -IDB_BAR_PRO BITMAP "inbv/logo/8.bmp" -IDB_SERVER_LOGO BITMAP "inbv/logo/5.bmp" -IDB_SERVER_HEADER BITMAP "inbv/logo/14.bmp" -IDB_SERVER_BAND BITMAP "inbv/logo/15.bmp" +IDB_BOOT_SCREEN BITMAP "inbv/logo/1.bmp" +IDB_HIBERNATE_BAR BITMAP "inbv/logo/2.bmp" +IDB_SHUTDOWN_MSG BITMAP "inbv/logo/3.bmp" +IDB_BAR_SERVER BITMAP "inbv/logo/4.bmp" +IDB_DEFAULT_LOGO BITMAP "inbv/logo/5.bmp" +IDB_WKSTA_HEADER BITMAP "inbv/logo/6.bmp" +IDB_WKSTA_FOOTER BITMAP "inbv/logo/7.bmp" +IDB_BAR_WKSTA BITMAP "inbv/logo/8.bmp" +IDB_SERVER_LOGO BITMAP "inbv/logo/5.bmp" +IDB_SERVER_HEADER BITMAP "inbv/logo/14.bmp" +IDB_SERVER_FOOTER BITMAP "inbv/logo/15.bmp" Modified: trunk/reactos/ntoskrnl/po/poshtdwn.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/po/poshtdwn.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/po/poshtdwn.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/po/poshtdwn.c [iso-8859-1] Thu Feb 26 01:59:05 2015 @@ -164,8 +164,8 @@ InbvSetScrollRegion(0, 0, 639, 479); /* Display shutdown logo and message */ - Logo1 = InbvGetResourceAddress(IDB_SHUTDOWN_LOGO); - Logo2 = InbvGetResourceAddress(IDB_LOGO); + Logo1 = InbvGetResourceAddress(IDB_SHUTDOWN_MSG); + Logo2 = InbvGetResourceAddress(IDB_DEFAULT_LOGO); if ((Logo1) && (Logo2)) { InbvBitBlt(Logo1, 220, 352); Modified: trunk/reactos/ntoskrnl/ps/psmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/psmgr.c?rev=66… ============================================================================== --- trunk/reactos/ntoskrnl/ps/psmgr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ps/psmgr.c [iso-8859-1] Thu Feb 26 01:59:05 2015 @@ -13,7 +13,6 @@ #include <debug.h> extern ULONG ExpInitializationPhase; -extern BOOLEAN SysThreadCreated; PVOID KeUserPopEntrySListEnd; PVOID KeUserPopEntrySListFault; @@ -50,7 +49,7 @@ PEPROCESS PsInitialSystemProcess = NULL; PEPROCESS PsIdleProcess = NULL; -HANDLE PspInitialSystemProcessHandle; +HANDLE PspInitialSystemProcessHandle = NULL; ULONG PsMinimumWorkingSet, PsMaximumWorkingSet; struct @@ -617,7 +616,6 @@ (PVOID*)&SysThread, NULL); ObCloseHandle(SysThreadHandle, KernelMode); - SysThreadCreated = TRUE; /* Return success */ return TRUE;

1 0

[hbelusca] 66460: [NTOS] Implement headless terminal commands: * HeadlessCmdClearToEndOfDisplay * HeadlessCmdClearToEndOfLine * HeadlessCmdDisplayAttributesOff * HeadlessCmdDisplayInverseVideo * He...
by hbelusca＠svn.reactos.org 26 Feb '15

26 Feb '15

Author: hbelusca Date: Thu Feb 26 00:40:25 2015 New Revision: 66460 URL: http://svn.reactos.org/svn/reactos?rev=66460&view=rev Log: [NTOS] Implement headless terminal commands: * HeadlessCmdClearToEndOfDisplay * HeadlessCmdClearToEndOfLine * HeadlessCmdDisplayAttributesOff * HeadlessCmdDisplayInverseVideo * HeadlessCmdSetColor * HeadlessCmdPositionCursor Modified: trunk/reactos/ntoskrnl/ex/hdlsterm.c trunk/reactos/ntoskrnl/include/internal/hdl.h Modified: trunk/reactos/ntoskrnl/ex/hdlsterm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/hdlsterm.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ex/hdlsterm.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/hdlsterm.c [iso-8859-1] Thu Feb 26 00:40:25 2015 @@ -153,16 +153,11 @@ !((HeadlessGlobals->IsMMIODevice) && (HeadlessGlobals->InBugCheck))) { /* Initialize the COM port with cportlib */ - HeadlessGlobals->TerminalEnabled = InbvPortInitialize(HeadlessGlobals-> - TerminalBaudRate, - HeadlessGlobals-> - TerminalPortNumber, - HeadlessGlobals-> - TerminalPortAddress, - &HeadlessGlobals-> - TerminalPort, - HeadlessGlobals-> - IsMMIODevice); + HeadlessGlobals->TerminalEnabled = InbvPortInitialize(HeadlessGlobals->TerminalBaudRate, + HeadlessGlobals->TerminalPortNumber, + HeadlessGlobals->TerminalPortAddress, + &HeadlessGlobals->TerminalPort, + HeadlessGlobals->IsMMIODevice); if (!HeadlessGlobals->TerminalEnabled) { DPRINT1("Failed to initialize port through cportlib\n"); @@ -259,11 +254,15 @@ OUT PSIZE_T OutputBufferSize) { KIRQL OldIrql; + NTSTATUS Status = STATUS_NOT_IMPLEMENTED; PHEADLESS_RSP_QUERY_INFO HeadlessInfo; PHEADLESS_CMD_PUT_STRING PutString; PHEADLESS_CMD_ENABLE_TERMINAL EnableTerminal; + PHEADLESS_CMD_SET_COLOR SetColor; + PHEADLESS_CMD_CURSOR_POS CursorPos; PHEADLESS_RSP_GET_BYTE GetByte; - NTSTATUS Status = STATUS_NOT_IMPLEMENTED; + UCHAR DataBuffer[80]; + ASSERT(HeadlessGlobals != NULL); // ASSERT(HeadlessGlobals->PageLockHandle != NULL); @@ -332,30 +331,80 @@ } case HeadlessCmdClearDisplay: - { - /* Send the VT100 clear screen command if the terminal is enabled */ + case HeadlessCmdClearToEndOfDisplay: + case HeadlessCmdClearToEndOfLine: + case HeadlessCmdDisplayAttributesOff: + case HeadlessCmdDisplayInverseVideo: + case HeadlessCmdSetColor: + case HeadlessCmdPositionCursor: + { + /* By default return success */ + Status = STATUS_SUCCESS; + + /* Send the VT100 commands only if the terminal is enabled */ if (HeadlessGlobals->TerminalEnabled) { - HdlspSendStringAtBaud((PUCHAR)"\033[2J"); - } - - /* Return success either way */ - Status = STATUS_SUCCESS; - break; - } - - case HeadlessCmdClearToEndOfDisplay: - break; - case HeadlessCmdClearToEndOfLine: - break; - case HeadlessCmdDisplayAttributesOff: - break; - case HeadlessCmdDisplayInverseVideo: - break; - case HeadlessCmdSetColor: - break; - case HeadlessCmdPositionCursor: - break; + PUCHAR CommandStr = NULL; + + if (Command == HeadlessCmdClearDisplay) + CommandStr = (PUCHAR)"\x1B[2J"; + else if (Command == HeadlessCmdClearToEndOfDisplay) + CommandStr = (PUCHAR)"\x1B[0J"; + else if (Command == HeadlessCmdClearToEndOfLine) + CommandStr = (PUCHAR)"\x1B[0K"; + else if (Command == HeadlessCmdDisplayAttributesOff) + CommandStr = (PUCHAR)"\x1B[0m"; + else if (Command == HeadlessCmdDisplayInverseVideo) + CommandStr = (PUCHAR)"\x1B[7m"; + else if (Command == HeadlessCmdSetColor) + { + /* Make sure the caller passed valid data */ + if (!InputBuffer || + (InputBufferSize != sizeof(*SetColor))) + { + DPRINT1("Invalid buffer\n"); + Status = STATUS_INVALID_PARAMETER; + break; + } + + SetColor = InputBuffer; + Status = RtlStringCbPrintfA((PCHAR)DataBuffer, sizeof(DataBuffer), + "\x1B[%d;%dm", + SetColor->BkgdColor, + SetColor->TextColor); + if (!NT_SUCCESS(Status)) break; + + CommandStr = DataBuffer; + } + else // if (Command == HeadlessCmdPositionCursor) + { + /* Make sure the caller passed valid data */ + if (!InputBuffer || + (InputBufferSize != sizeof(*CursorPos))) + { + DPRINT1("Invalid buffer\n"); + Status = STATUS_INVALID_PARAMETER; + break; + } + + CursorPos = InputBuffer; + /* Cursor position is 1-based */ + Status = RtlStringCbPrintfA((PCHAR)DataBuffer, sizeof(DataBuffer), + "\x1B[%d;%dH", + CursorPos->CursorRow + 1, + CursorPos->CursorCol + 1); + if (!NT_SUCCESS(Status)) break; + + CommandStr = DataBuffer; + } + + /* Send the command */ + HdlspSendStringAtBaud(CommandStr); + } + + break; + } + case HeadlessCmdTerminalPoll: break; Modified: trunk/reactos/ntoskrnl/include/internal/hdl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/hdl.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/hdl.h [iso-8859-1] Thu Feb 26 00:40:25 2015 @@ -192,6 +192,18 @@ UCHAR String[1]; } HEADLESS_CMD_PUT_STRING, *PHEADLESS_CMD_PUT_STRING; +typedef struct _HEADLESS_CMD_SET_COLOR +{ + ULONG TextColor; + ULONG BkgdColor; +} HEADLESS_CMD_SET_COLOR, *PHEADLESS_CMD_SET_COLOR; + +typedef struct _HEADLESS_CMD_CURSOR_POS +{ + ULONG CursorCol; + ULONG CursorRow; +} HEADLESS_CMD_CURSOR_POS, *PHEADLESS_CMD_CURSOR_POS; + typedef struct _HEADLESS_RSP_GET_BYTE { UCHAR Value;

1 0

[ekohl] 66459: [INCLUDE] wkssvc.idl: Add NetrWkstaUserGetInfo and NetrWkstaUserSetInfo definitions based on the Samba wkssvc.idl and MSDN. [NETAPI32] - Implement NetWkstaUserGetInfo and NetWkstaUse...
by ekohl＠svn.reactos.org 25 Feb '15

25 Feb '15

Author: ekohl Date: Wed Feb 25 22:11:41 2015 New Revision: 66459 URL: http://svn.reactos.org/svn/reactos?rev=66459&view=rev Log: [INCLUDE] wkssvc.idl: Add NetrWkstaUserGetInfo and NetrWkstaUserSetInfo definitions based on the Samba wkssvc.idl and MSDN. [NETAPI32] - Implement NetWkstaUserGetInfo and NetWkstaUserSetInfo. - Add some debug output. [WKSSVC] Add NetrWkstaUserGetInfo and NetrWkstaUserSetInfo stubs. CORE-9248 Modified: trunk/reactos/base/services/wkssvc/rpcserver.c trunk/reactos/dll/win32/netapi32/netapi32.spec trunk/reactos/dll/win32/netapi32/wksta.c trunk/reactos/dll/win32/netapi32/wksta_new.c trunk/reactos/include/reactos/idl/wkssvc.idl Modified: trunk/reactos/base/services/wkssvc/rpcserver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/wkssvc/rpcse… ============================================================================== --- trunk/reactos/base/services/wkssvc/rpcserver.c [iso-8859-1] (original) +++ trunk/reactos/base/services/wkssvc/rpcserver.c [iso-8859-1] Wed Feb 25 22:11:41 2015 @@ -121,22 +121,31 @@ /* Function 3 */ -void -__stdcall -Opnum3NotUsedOnWire(void) -{ - UNIMPLEMENTED; -// return 0; +unsigned long +__stdcall +NetrWkstaUserGetInfo( + WKSSVC_IDENTIFY_HANDLE Unused, + unsigned long Level, + LPWKSTA_USER_INFO UserInfo) +{ + FIXME("(%s, %d, %p)\n", debugstr_w(Unused), Level, UserInfo); + + UNIMPLEMENTED; + return 0; } /* Function 4 */ -void -__stdcall -Opnum4NotUsedOnWire(void) -{ - UNIMPLEMENTED; -// return 0; +unsigned long +__stdcall +NetrWkstaUserSetInfo ( + WKSSVC_IDENTIFY_HANDLE Unused, + unsigned long Level, + LPWKSTA_USER_INFO UserInfo, + unsigned long *ErrorParameter) +{ + UNIMPLEMENTED; + return 0; } Modified: trunk/reactos/dll/win32/netapi32/netapi32.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netapi32/netapi3… ============================================================================== --- trunk/reactos/dll/win32/netapi32/netapi32.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netapi32/netapi32.spec [iso-8859-1] Wed Feb 25 22:11:41 2015 @@ -260,7 +260,7 @@ @ stdcall NetWkstaTransportEnum(wstr long ptr long ptr ptr ptr) @ stdcall NetWkstaUserEnum(wstr long ptr long ptr ptr ptr) @ stdcall NetWkstaUserGetInfo(wstr long ptr) -@ stub NetWkstaUserSetInfo +@ stdcall NetWkstaUserSetInfo(wstr long ptr ptr) @ stdcall NetapipBufferAllocate(long ptr) NetApiBufferAllocate @ stdcall Netbios(ptr) @ stub NetpAccessCheck Modified: trunk/reactos/dll/win32/netapi32/wksta.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netapi32/wksta.c… ============================================================================== --- trunk/reactos/dll/win32/netapi32/wksta.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netapi32/wksta.c [iso-8859-1] Wed Feb 25 22:11:41 2015 @@ -276,6 +276,7 @@ /************************************************************ * NetWkstaUserGetInfo (NETAPI32.@) */ +#if 0 NET_API_STATUS WINAPI NetWkstaUserGetInfo(LMSTR reserved, DWORD level, PBYTE* bufptr) { @@ -413,6 +414,7 @@ } return NERR_Success; } +#endif /************************************************************ * NetWkstaUserEnum (NETAPI32.@) Modified: trunk/reactos/dll/win32/netapi32/wksta_new.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netapi32/wksta_n… ============================================================================== --- trunk/reactos/dll/win32/netapi32/wksta_new.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netapi32/wksta_new.c [iso-8859-1] Wed Feb 25 22:11:41 2015 @@ -147,7 +147,8 @@ { NET_API_STATUS status; - FIXME("Stub %s %p %p\n", wine_dbgstr_w(Server), Name, type); + TRACE("NetGetJoinInformation(%s %p %p)\n", wine_dbgstr_w(Server), + Name, type); if (Name == NULL || type == NULL) return ERROR_INVALID_PARAMETER; @@ -177,6 +178,9 @@ { NET_API_STATUS status; + TRACE("NetWkstaGetInfo(%s, %d, %p)\n", debugstr_w(servername), + level, bufptr); + *bufptr = NULL; RpcTryExcept @@ -204,6 +208,9 @@ LPDWORD parm_err) { NET_API_STATUS status; + + TRACE("NetWkstaSetInfo(%s, %d, %p, %p)\n", debugstr_w(servername), + level, buffer, parm_err); RpcTryExcept { @@ -238,7 +245,7 @@ WKSTA_USER_INFO_1_CONTAINER Level1; NET_API_STATUS status; - TRACE("(%s, %d, %p, %d, %p, %p, %p): stub!\n", debugstr_w(servername), + TRACE("NetWkstaUserEnum(%s, %d, %p, %d, %p, %p, %p)\n", debugstr_w(servername), level, bufptr, prefmaxlen, entriesread, totalentries, resumehandle); UserEnumInfo.Level = level; @@ -292,4 +299,70 @@ return status; } + +NET_API_STATUS +WINAPI +NetWkstaUserGetInfo( + LPWSTR reserved, + DWORD level, + PBYTE *bufptr) +{ + NET_API_STATUS status; + + TRACE("NetWkstaUserGetInfo(%s, %d, %p)\n", debugstr_w(reserved), + level, bufptr); + + if (reserved != NULL) + return ERROR_INVALID_PARAMETER; + + *bufptr = NULL; + + RpcTryExcept + { + status = NetrWkstaUserGetInfo(NULL, + level, + (LPWKSTA_USER_INFO)bufptr); + } + RpcExcept(EXCEPTION_EXECUTE_HANDLER) + { + status = I_RpcMapWin32Status(RpcExceptionCode()); + } + RpcEndExcept; + + return status; +} + + +NET_API_STATUS +WINAPI +NetWkstaUserSetInfo( + LPWSTR reserved, + DWORD level, + LPBYTE buf, + LPDWORD parm_err) +{ + NET_API_STATUS status; + + TRACE("NetWkstaSetInfo(%s, %d, %p, %p)\n", debugstr_w(reserved), + level, buf, parm_err); + + if (reserved != NULL) + return ERROR_INVALID_PARAMETER; + + RpcTryExcept + { + status = NetrWkstaUserSetInfo(NULL, + level, + (LPWKSTA_USER_INFO)&buf, + parm_err); + } + RpcExcept(EXCEPTION_EXECUTE_HANDLER) + { + status = I_RpcMapWin32Status(RpcExceptionCode()); + } + RpcEndExcept; + + return status; +} + /* EOF */ Modified: trunk/reactos/include/reactos/idl/wkssvc.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/idl/wkssvc… ============================================================================== --- trunk/reactos/include/reactos/idl/wkssvc.idl [iso-8859-1] (original) +++ trunk/reactos/include/reactos/idl/wkssvc.idl [iso-8859-1] Wed Feb 25 22:11:41 2015 @@ -174,6 +174,19 @@ [string] wchar_t *wkui1_logon_server; } WKSTA_USER_INFO_1, *PWKSTA_USER_INFO_1, *LPWKSTA_USER_INFO_1; +typedef struct _WKSTA_USER_INFO_1101 +{ + [string] wchar_t *wkui1101_oth_domains; +} WKSTA_USER_INFO_1101, *PWKSTA_USER_INFO_1101, *LPWKSTA_USER_INFO_1101; + +typedef [switch_type(unsigned long)] union _WKSTA_USER_INFO +{ + [case(0)] LPWKSTA_USER_INFO_0 UserInfo0; + [case(1)] LPWKSTA_USER_INFO_1 UserInfo1; + [case(1101)] LPWKSTA_USER_INFO_1101 UserInfo1101; + [default] ; +} WKSTA_USER_INFO, *PWKSTA_USER_INFO, *LPWKSTA_USER_INFO; + typedef struct _WKSTA_TRANSPORT_INFO_0 { unsigned long wkti0_quality_of_service; @@ -373,14 +386,21 @@ [in, out, unique] unsigned long *ResumeHandle); /* Function 3 */ - void - __stdcall - Opnum3NotUsedOnWire(void); + unsigned long + __stdcall + NetrWkstaUserGetInfo( + [in, string, unique] WKSSVC_IDENTIFY_HANDLE Unused, + [in] unsigned long Level, + [out, switch_is(Level)] LPWKSTA_USER_INFO UserInfo); /* Function 4 */ - void - __stdcall - Opnum4NotUsedOnWire(void); + unsigned long + __stdcall + NetrWkstaUserSetInfo ( + [in, string, unique] WKSSVC_IDENTIFY_HANDLE Unused, + [in] unsigned long Level, + [in, switch_is(Level)] LPWKSTA_USER_INFO UserInfo, + [in, out, unique] unsigned long *ErrorParameter); /* Function 5 */ unsigned long

1 0

[gadamopoulos] 66458: fix build. I forgot this file
by gadamopoulos＠svn.reactos.org 25 Feb '15

25 Feb '15

Author: gadamopoulos Date: Wed Feb 25 20:04:53 2015 New Revision: 66458 URL: http://svn.reactos.org/svn/reactos?rev=66458&view=rev Log: fix build. I forgot this file Modified: trunk/reactos/win32ss/include/ntuser.h 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] Wed Feb 25 20:04:53 2015 @@ -1366,9 +1366,9 @@ DWORD NTAPI NtUserAlterWindowStyle( - DWORD Unknown0, - DWORD Unknown1, - DWORD Unknown2); + HWND hWnd, + DWORD Index, + LONG NewValue); BOOL NTAPI

1 0

[gadamopoulos] 66457: [USER32] - button.c: Use NtUserAlterWindowStyle where wine uses WIN_SetStyle (usage and parameters were confirmed with windbg) [NTUSER] - Implement NtUserAlterWindowStyle. Fix...
by gadamopoulos＠svn.reactos.org 25 Feb '15

25 Feb '15

Author: gadamopoulos Date: Wed Feb 25 20:02:10 2015 New Revision: 66457 URL: http://svn.reactos.org/svn/reactos?rev=66457&view=rev Log: [USER32] - button.c: Use NtUserAlterWindowStyle where wine uses WIN_SetStyle (usage and parameters were confirmed with windbg) [NTUSER] - Implement NtUserAlterWindowStyle. Fixes remaining failures in user32:msg_controls test. Modified: trunk/reactos/win32ss/user/ntuser/ntstubs.c trunk/reactos/win32ss/user/ntuser/window.c trunk/reactos/win32ss/user/user32/controls/button.c Modified: trunk/reactos/win32ss/user/ntuser/ntstubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/ntstub… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/ntstubs.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/ntstubs.c [iso-8859-1] Wed Feb 25 20:02:10 2015 @@ -1157,19 +1157,6 @@ return 0; } -/* - * @unimplemented - */ -DWORD APIENTRY -NtUserAlterWindowStyle(DWORD Unknown0, - DWORD Unknown1, - DWORD Unknown2) -{ - STUB - - return(0); -} - BOOL APIENTRY NtUserAddClipboardFormatListener( HWND hwnd ) 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] Wed Feb 25 20:02:10 2015 @@ -3537,8 +3537,8 @@ return FALSE; } -LONG FASTCALL -co_UserSetWindowLong(HWND hWnd, DWORD Index, LONG NewValue, BOOL Ansi) +static LONG +co_IntSetWindowLong(HWND hWnd, DWORD Index, LONG NewValue, BOOL Ansi, BOOL bAlter) { PWND Window, Parent; PWINSTATION_OBJECT WindowStation; @@ -3597,6 +3597,7 @@ Style.styleNew &= ~WS_EX_WINDOWEDGE; Window->ExStyle = (DWORD)Style.styleNew; + co_IntSendMessage(hWnd, WM_STYLECHANGED, GWL_EXSTYLE, (LPARAM) &Style); break; @@ -3604,7 +3605,9 @@ OldValue = (LONG) Window->style; Style.styleOld = OldValue; Style.styleNew = NewValue; - co_IntSendMessage(hWnd, WM_STYLECHANGING, GWL_STYLE, (LPARAM) &Style); + + if (!bAlter) + co_IntSendMessage(hWnd, WM_STYLECHANGING, GWL_STYLE, (LPARAM) &Style); /* WS_CLIPSIBLINGS can't be reset on top-level windows */ if (Window->spwndParent == UserGetDesktopWindow()) Style.styleNew |= WS_CLIPSIBLINGS; @@ -3621,7 +3624,9 @@ DceResetActiveDCEs( Window ); } Window->style = (DWORD)Style.styleNew; - co_IntSendMessage(hWnd, WM_STYLECHANGED, GWL_STYLE, (LPARAM) &Style); + + if (!bAlter) + co_IntSendMessage(hWnd, WM_STYLECHANGED, GWL_STYLE, (LPARAM) &Style); break; case GWL_WNDPROC: @@ -3672,6 +3677,13 @@ return( OldValue); } + +LONG FASTCALL +co_UserSetWindowLong(HWND hWnd, DWORD Index, LONG NewValue, BOOL Ansi) +{ + return co_IntSetWindowLong(hWnd, Index, NewValue, Ansi, FALSE); +} + /* * NtUserSetWindowLong * @@ -3686,24 +3698,45 @@ LONG APIENTRY NtUserSetWindowLong(HWND hWnd, DWORD Index, LONG NewValue, BOOL Ansi) { - DECLARE_RETURN(LONG); - - TRACE("Enter NtUserSetWindowLong\n"); + LONG ret; + UserEnterExclusive(); if (hWnd == IntGetDesktopWindow()) { EngSetLastError(STATUS_ACCESS_DENIED); - RETURN( 0); - } - - RETURN( co_UserSetWindowLong(hWnd, Index, NewValue, Ansi)); - -CLEANUP: - TRACE("Leave NtUserSetWindowLong, ret=%i\n",_ret_); + UserLeave(); + return 0; + } + + ret = co_IntSetWindowLong(hWnd, Index, NewValue, Ansi, FALSE); + UserLeave(); - END_CLEANUP; -} + + return ret; +} + +DWORD APIENTRY +NtUserAlterWindowStyle(HWND hWnd, DWORD Index, LONG NewValue) +{ + LONG ret; + + UserEnterExclusive(); + + if (hWnd == IntGetDesktopWindow()) + { + EngSetLastError(STATUS_ACCESS_DENIED); + UserLeave(); + return 0; + } + + ret = co_IntSetWindowLong(hWnd, Index, NewValue, FALSE, TRUE); + + UserLeave(); + + return ret; +} + /* * NtUserSetWindowWord Modified: trunk/reactos/win32ss/user/user32/controls/button.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/contro… ============================================================================== --- trunk/reactos/win32ss/user/user32/controls/button.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/controls/button.c [iso-8859-1] Wed Feb 25 20:02:10 2015 @@ -298,11 +298,10 @@ /* XP turns a BS_USERBUTTON into BS_PUSHBUTTON */ if (btn_type == BS_USERBUTTON ) { + style = (style & ~BS_TYPEMASK) | BS_PUSHBUTTON; #ifdef __REACTOS__ - style = (style & ~BS_TYPEMASK) | BS_PUSHBUTTON; - SetWindowLongPtrW( hWnd, GWL_STYLE, style ); + NtUserAlterWindowStyle(hWnd, GWL_STYLE, style ); #else - style = (style & ~BS_TYPEMASK) | BS_PUSHBUTTON; WIN_SetStyle( hWnd, style, BS_TYPEMASK & ~style ); #endif } @@ -508,8 +507,11 @@ if ((wParam & BS_TYPEMASK) >= MAX_BTN_TYPE) break; btn_type = wParam & BS_TYPEMASK; style = (style & ~BS_TYPEMASK) | btn_type; - SetWindowLongPtrW( hWnd, GWL_STYLE, style ); - //WIN_SetStyle( hWnd, style, BS_TYPEMASK & ~style ); +#ifdef __REACTOS__ + NtUserAlterWindowStyle(hWnd, GWL_STYLE, style ); +#else + WIN_SetStyle( hWnd, style, BS_TYPEMASK & ~style ); +#endif /* Only redraw if lParam flag is set.*/ if (lParam) @@ -565,7 +567,7 @@ #ifdef __REACTOS__ if (wParam) style |= WS_TABSTOP; else style &= ~WS_TABSTOP; - SetWindowLongPtrW( hWnd, GWL_STYLE, style ); + NtUserAlterWindowStyle(hWnd, GWL_STYLE, style ); #else if (wParam) WIN_SetStyle( hWnd, WS_TABSTOP, 0 ); else WIN_SetStyle( hWnd, 0, WS_TABSTOP );

1 0

[tfaber] 66456: [USER32_WINETEST] - Apply hacks to make the tests succeed on Windows
by tfaber＠svn.reactos.org 25 Feb '15

25 Feb '15

Author: tfaber Date: Wed Feb 25 17:31:53 2015 New Revision: 66456 URL: http://svn.reactos.org/svn/reactos?rev=66456&view=rev Log: [USER32_WINETEST] - Apply hacks to make the tests succeed on Windows Modified: trunk/rostests/winetests/user32/msg.c Modified: trunk/rostests/winetests/user32/msg.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/user32/msg.c?re… ============================================================================== --- trunk/rostests/winetests/user32/msg.c [iso-8859-1] (original) +++ trunk/rostests/winetests/user32/msg.c [iso-8859-1] Wed Feb 25 17:31:53 2015 @@ -14717,9 +14717,12 @@ START_TEST(msg_focus) { init_tests(); + test_SetActiveWindow(); test_SetFocus(); - test_SetActiveWindow(); - + + /* HACK: For some reason test_SetForegroundWindow fails on Windows unless + * we do this */ + keybd_event(VK_CONTROL, 0, KEYEVENTF_KEYUP, 0); /* keep it the last test, under Windows it tends to break the tests * which rely on active/foreground windows being correct. */

1 0

[tfaber] 66455: [COM_APITEST] - Add some more interfaces
by tfaber＠svn.reactos.org 25 Feb '15

25 Feb '15

Author: tfaber Date: Wed Feb 25 16:22:26 2015 New Revision: 66455 URL: http://svn.reactos.org/svn/reactos?rev=66455&view=rev Log: [COM_APITEST] - Add some more interfaces Modified: trunk/rostests/apitests/com/com_apitest.c trunk/rostests/apitests/com/com_apitest.h trunk/rostests/apitests/com/shell32.c Modified: trunk/rostests/apitests/com/com_apitest.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/com/com_apitest.… ============================================================================== --- trunk/rostests/apitests/com/com_apitest.c [iso-8859-1] (original) +++ trunk/rostests/apitests/com/com_apitest.c [iso-8859-1] Wed Feb 25 16:22:26 2015 @@ -186,14 +186,18 @@ { ID_NAME(IID_IQueryAssociations), TRUE }, { ID_NAME(IID_IQueryInfo), TRUE }, { ID_NAME(IID_IRegTreeOptions), TRUE }, + { ID_NAME(IID_IRemoteComputer) }, + { ID_NAME(IID_IResolveShellLink) }, { ID_NAME(IID_IRunnableObject) }, { ID_NAME(IID_IServerSecurity), TRUE }, { ID_NAME(IID_IServiceProvider) }, { ID_NAME(IID_ISFHelper), TRUE }, + { ID_NAME(IID_IShellApp), TRUE }, { ID_NAME(IID_IShellBrowser) }, { ID_NAME(IID_IShellBrowserService), TRUE }, { ID_NAME(IID_IShellChangeNotify), TRUE }, { ID_NAME(IID_IShellDesktopTray), TRUE }, + { ID_NAME(IID_IShellDetails), TRUE }, { ID_NAME(IID_IShellDispatch) }, { ID_NAME(IID_IShellDispatch2) }, { ID_NAME(IID_IShellDispatch3) }, @@ -205,16 +209,25 @@ { ID_NAME(IID_IShellFolder) }, { ID_NAME(IID_IShellFolder2) }, { ID_NAME(IID_IShellFolderBand), TRUE }, + { ID_NAME(IID_IShellFolderSearchable), TRUE }, + { ID_NAME(IID_IShellFolderSearchableCallback), TRUE }, { ID_NAME(IID_IShellFolderView), TRUE }, { ID_NAME(IID_IShellFolderViewCB), TRUE }, { ID_NAME(IID_IShellFolderViewDual) }, { ID_NAME(IID_IShellFolderViewDual2) }, + { ID_NAME(IID_IShellFolderViewType), TRUE }, { ID_NAME(IID_IShellIcon) }, + { ID_NAME(IID_IShellIconOverlay), TRUE }, + { ID_NAME(IID_IShellIconOverlayIdentifier), TRUE }, + { ID_NAME(IID_IShellImageData), TRUE }, + { ID_NAME(IID_IShellImageDataAbort), TRUE }, + { ID_NAME(IID_IShellImageDataFactory), TRUE }, { ID_NAME(IID_IShellItem) }, { ID_NAME(IID_IShellItem2) }, { ID_NAME(IID_IShellItemArray) }, { ID_NAME(IID_IShellItemFilter) }, { ID_NAME(IID_IShellLinkA) }, + { ID_NAME(IID_IShellLinkDataList), TRUE }, { ID_NAME(IID_IShellLinkDual) }, { ID_NAME(IID_IShellLinkDual2) }, { ID_NAME(IID_IShellLinkW) }, @@ -223,6 +236,7 @@ { ID_NAME(IID_IShellMenuAcc), TRUE }, { ID_NAME(IID_IShellMenuCallback), TRUE }, { ID_NAME(IID_IShellNameSpace) }, + { ID_NAME(IID_IShellPropSheetExt), TRUE }, { ID_NAME(IID_IShellService), TRUE }, { ID_NAME(IID_IShellTaskScheduler), TRUE }, { ID_NAME(IID_IShellView) }, Modified: trunk/rostests/apitests/com/com_apitest.h URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/com/com_apitest.… ============================================================================== --- trunk/rostests/apitests/com/com_apitest.h [iso-8859-1] (original) +++ trunk/rostests/apitests/com/com_apitest.h [iso-8859-1] Wed Feb 25 16:22:26 2015 @@ -84,6 +84,7 @@ DEFINE_GUID(CLSID_QuickLinks, 0x0E5CBF21, 0xD15F, 0x11D0, 0x83, 0x01, 0x00, 0xAA, 0x00, 0x5B, 0x43, 0x83); DEFINE_GUID(CLSID_SendToMenu, 0x7BA4C740, 0x9E81, 0x11CF, 0x99, 0xD3, 0x00, 0xAA, 0x00, 0x4A, 0xE8, 0x37); DEFINE_GUID(CLSID_ShellFolderView, 0x62112aa1, 0xebe4, 0x11cf, 0xa5, 0xfb, 0x00, 0x20, 0xaf, 0xe7, 0x29, 0x2d); +DEFINE_GUID(CLSID_ShellImageDataFactory, 0x66e4e4fb, 0xf385, 0x4dd0, 0x8d, 0x74, 0xa2, 0xef, 0xd1, 0xbc, 0x61, 0x78); DEFINE_GUID(CLSID_ShellLinkObject, 0x11219420, 0x1768, 0x11d1, 0x95, 0xbe, 0x00, 0x60, 0x97, 0x97, 0xea, 0x4f); DEFINE_GUID(CLSID_StartMenuPin, 0xa2a9545d, 0xa0c2, 0x42b4, 0x97, 0x08, 0xa0, 0xb2, 0xba, 0xdd, 0x77, 0xc8); DEFINE_GUID(CLSID_TrackShellMenu, 0x8278F931, 0x2A3E, 0x11d2, 0x83, 0x8F, 0x00, 0xC0, 0x4F, 0xD9, 0x18, 0xD0); @@ -131,14 +132,22 @@ DEFINE_GUID(IID_IPreviewHandler, 0x8895b1c6, 0xb41f, 0x4c1c, 0xa5, 0x62, 0x0d, 0x56, 0x42, 0x50, 0x83, 0x6f); DEFINE_GUID(IID_IPreviewHandlerFrame, 0xfec87aaf, 0x35f9, 0x447a, 0xad, 0xb7, 0x20, 0x23, 0x44, 0x91, 0x40, 0x1a); DEFINE_GUID(IID_IPreviewHandlerVisuals, 0x196bf9a5, 0xb346, 0x4ef0, 0xaa, 0x1e, 0x5d, 0xcd, 0xb7, 0x67, 0x68, 0xb1); +DEFINE_GUID(IID_IShellApp, 0xa3e14960, 0x935f, 0x11d1, 0xb8, 0xb8, 0x00, 0x60, 0x08, 0x05, 0x93, 0x82); DEFINE_GUID(IID_IShellDispatch3, 0x177160ca, 0xbb5a, 0x411c, 0x84, 0x1d, 0xbd, 0x38, 0xfa, 0xcd, 0xea, 0xa0); DEFINE_GUID(IID_IShellDispatch4, 0xefd84b2d, 0x4bcf, 0x4298, 0xbe, 0x25, 0xeb, 0x54, 0x2a, 0x59, 0xfb, 0xda); DEFINE_GUID(IID_IShellDispatch5, 0x866738b9, 0x6cf2, 0x4de8, 0x87, 0x67, 0xf7, 0x94, 0xeb, 0xe7, 0x4f, 0x4e); +DEFINE_GUID(IID_IShellFolderSearchable, 0x4e1ae66c, 0x204b, 0x11d2, 0x8d, 0xb3, 0x00, 0x00, 0xf8, 0x7a, 0x55, 0x6c); +DEFINE_GUID(IID_IShellFolderSearchableCallback,0xf98d8294, 0x2bbc, 0x11d2, 0x8d, 0xbd, 0x00, 0x00, 0xf8, 0x7a, 0x55, 0x6c); +DEFINE_GUID(IID_IShellFolderViewType, 0x49422c1e, 0x1c03, 0x11d2, 0x8d, 0xab, 0x00, 0x00, 0xf8, 0x7a, 0x55, 0x6c); +DEFINE_GUID(IID_IShellIconOverlay, 0x7d688a70, 0xc613, 0x11d0, 0x99, 0x9b, 0x00, 0xc0, 0x4f, 0xd6, 0x55, 0xe1); DEFINE_GUID(IID_IContextMenuSite, 0x0811aebe, 0x0b87, 0x4c54, 0x9e, 0x72, 0x54, 0x8c, 0xf6, 0x49, 0x01, 0x6b); DEFINE_GUID(IID_IShellDesktopTray, 0x213e2df9, 0x9a14, 0x4328, 0x99, 0xb1, 0x69, 0x61, 0xf9, 0x14, 0x3c, 0xe9); DEFINE_GUID(IID_IShellFolderBand, 0x7fe80cc8, 0xc247, 0x11d0, 0xb9, 0x3a, 0x00, 0xa0, 0xc9, 0x03, 0x12, 0xe1); DEFINE_GUID(IID_IShellFolderViewDual, 0xe7a1af80, 0x4d96, 0x11cf, 0x96, 0x0c, 0x00, 0x80, 0xc7, 0xf4, 0xee, 0x85); DEFINE_GUID(IID_IShellFolderViewDual2, 0x31c147b6, 0x0ade, 0x4a3c, 0xb5, 0x14, 0xdd, 0xf9, 0x32, 0xef, 0x6d, 0x17); +DEFINE_GUID(IID_IShellImageData, 0xbfdeec12, 0x8040, 0x4403, 0xa5, 0xea, 0x9e, 0x07, 0xda, 0xfc, 0xf5, 0x30); +DEFINE_GUID(IID_IShellImageDataAbort, 0x53fb8e58, 0x50c0, 0x4003, 0xb4, 0xaa, 0x0c, 0x8d, 0xf2, 0x8e, 0x7f, 0x3a); +DEFINE_GUID(IID_IShellImageDataFactory, 0x9be8ed5c, 0xedab, 0x4d75, 0x90, 0xf3, 0xbd, 0x5b, 0xdb, 0xb2, 0x1c, 0x82); DEFINE_GUID(IID_IShellLinkDual, 0x88a05c00, 0xf000, 0x11ce, 0x83, 0x50, 0x44, 0x45, 0x53, 0x54, 0x00, 0x00); DEFINE_GUID(IID_IShellLinkDual2, 0x317ee249, 0xf12e, 0x11d2, 0xb1, 0xe4, 0x00, 0xc0, 0x4f, 0x8e, 0xeb, 0x3e); DEFINE_GUID(IID_IShellView3, 0xec39fa88, 0xf8af, 0x41c5, 0x84, 0x21, 0x38, 0xbe, 0xd2, 0x8f, 0x46, 0x73); Modified: trunk/rostests/apitests/com/shell32.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/com/shell32.c?re… ============================================================================== --- trunk/rostests/apitests/com/shell32.c [iso-8859-1] (original) +++ trunk/rostests/apitests/com/shell32.c [iso-8859-1] Wed Feb 25 16:22:26 2015 @@ -35,6 +35,7 @@ { 0x10, &IID_IPersistFolder2 }, { 0x10, &IID_IPersistFolder }, { 0x10, &IID_IPersist }, + { FARAWY, &IID_IShellIconOverlay }, { FARAWY, &IID_IShellFolder2 }, { FARAWY, &IID_IShellFolder }, } @@ -251,6 +252,7 @@ { 0xc, &IID_IPersistFolder }, { 0xc, &IID_IPersist }, { 0x10, &IID_IPersistPropertyBag }, + { 0x14, &IID_IShellIconOverlay }, } }, { @@ -272,6 +274,7 @@ { 0x10, &IID_IPersistFolder2 }, { 0x10, &IID_IPersistFolder }, { 0x10, &IID_IPersist }, + { FARAWY, &IID_IShellIconOverlay }, { FARAWY, &IID_IShellFolder2 }, { FARAWY, &IID_IShellFolder }, } @@ -284,6 +287,7 @@ { 0x0, &IID_IShellFolder2 }, { 0x0, &IID_IShellFolder }, { 0x0, &IID_IUnknown }, + { 0x4, &IID_IShellIconOverlay }, { FARAWY, &IID_IShellIcon }, { FARAWY, &IID_IPersistFolder3 }, { FARAWY, &IID_IPersistFolder2 }, @@ -300,6 +304,7 @@ { 0x10, &IID_IPersistFolder2 }, { 0x10, &IID_IPersistFolder }, { 0x10, &IID_IPersist }, + { FARAWY, &IID_IShellIconOverlay }, { FARAWY, &IID_IShellFolder2 }, { FARAWY, &IID_IShellFolder }, } @@ -340,6 +345,7 @@ { ID_NAME(CLSID_Printers), { + { -0xc, &IID_IRemoteComputer }, { 0x0, &IID_IShellFolder2 }, { 0x0, &IID_IShellFolder }, { 0x0, &IID_IUnknown }, @@ -347,6 +353,7 @@ { 0x4, &IID_IPersistFolder }, { 0x4, &IID_IPersist }, { 0x8, &IID_IContextMenuCB }, + { 0xc, &IID_IShellIconOverlay }, } }, { @@ -429,6 +436,7 @@ { 0x14, &IID_IContextMenuCB }, { 0x18, &IID_ITranslateShellChangeNotify }, { 0x20, &IID_IOleCommandTarget }, + { FARAWY, &IID_IShellIconOverlay }, { FARAWY, &IID_IShellFolder2 }, { FARAWY, &IID_IShellFolder }, } @@ -440,6 +448,7 @@ { 0xc, &IID_IShellFolder2 }, { 0xc, &IID_IShellFolder }, { 0x10, &IID_IShellIcon }, + { 0x14, &IID_IShellIconOverlay }, { 0x18, &IID_IPersistFolder3 }, { 0x18, &IID_IPersistFolder2 }, { 0x18, &IID_IPersistFolder }, @@ -509,6 +518,7 @@ { 0x14, &IID_IContextMenu }, { 0x18, &IID_IDropTarget }, { 0x1c, &IID_IQueryInfo }, + { 0x20, &IID_IShellLinkDataList }, { 0x24, &IID_IExtractIconA }, { 0x28, &IID_IExtractIconW }, { 0x2c, &IID_IExtractImage2 },

1 0

[gadamopoulos] 66454: [USER32_WINETEST] - Split user32:msg test to 14 separate tests - The original test consisted of more than 14k lines of code
by gadamopoulos＠svn.reactos.org 25 Feb '15

25 Feb '15

Author: gadamopoulos Date: Wed Feb 25 15:55:57 2015 New Revision: 66454 URL: http://svn.reactos.org/svn/reactos?rev=66454&view=rev Log: [USER32_WINETEST] - Split user32:msg test to 14 separate tests - The original test consisted of more than 14k lines of code Modified: trunk/rostests/winetests/user32/msg.c trunk/rostests/winetests/user32/testlist.c Modified: trunk/rostests/winetests/user32/msg.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/user32/msg.c?re… ============================================================================== --- trunk/rostests/winetests/user32/msg.c [iso-8859-1] (original) +++ trunk/rostests/winetests/user32/msg.c [iso-8859-1] Wed Feb 25 15:55:57 2015 @@ -13324,7 +13324,11 @@ { ResetEvent( start_event ); ResetEvent( end_event ); +#if 0 sprintf( path, "%s msg %u", argv0, i ); +#else + sprintf( path, "%s msg_queue %u", argv0, i ); +#endif ret = CreateProcessA( NULL, path, NULL, NULL, TRUE, 0, NULL, NULL, &startup, &pi ); ok( ret, "CreateProcess '%s' failed err %u.\n", path, GetLastError() ); if (ret) @@ -14483,6 +14487,7 @@ #undef X } +#if 0 START_TEST(msg) { char **test_argv; @@ -14623,3 +14628,239 @@ } DeleteCriticalSection( &sequence_cs ); } +#endif + +static void init_tests() +{ + HMODULE hModuleImm32; + BOOL (WINAPI *pImmDisableIME)(DWORD); + + init_funcs(); + + InitializeCriticalSection( &sequence_cs ); + init_procs(); + + hModuleImm32 = LoadLibraryA("imm32.dll"); + if (hModuleImm32) { + pImmDisableIME = (void *)GetProcAddress(hModuleImm32, "ImmDisableIME"); + if (pImmDisableIME) + pImmDisableIME(0); + } + pImmDisableIME = NULL; + FreeLibrary(hModuleImm32); + + if (!RegisterWindowClasses()) assert(0); + + cbt_hook_thread_id = GetCurrentThreadId(); + hCBT_hook = SetWindowsHookExA(WH_CBT, cbt_hook_proc, 0, GetCurrentThreadId()); + if (!hCBT_hook) win_skip( "cannot set global hook, will skip hook tests\n" ); +} + +static void cleanup_tests() +{ + BOOL ret; + UnhookWindowsHookEx(hCBT_hook); + if (pUnhookWinEvent && hEvent_hook) + { + ret = pUnhookWinEvent(hEvent_hook); + ok( ret, "UnhookWinEvent error %d\n", GetLastError()); + SetLastError(0xdeadbeef); + ok(!pUnhookWinEvent(hEvent_hook), "UnhookWinEvent succeeded\n"); + ok(GetLastError() == ERROR_INVALID_HANDLE || /* Win2k */ + GetLastError() == 0xdeadbeef, /* Win9x */ + "unexpected error %d\n", GetLastError()); + } + DeleteCriticalSection( &sequence_cs ); + +} + +START_TEST(msg_queue) +{ + int argc; + char **test_argv; + argc = winetest_get_mainargs( &test_argv ); + if (argc >= 3) + { + unsigned int arg; + /* Child process. */ + sscanf (test_argv[2], "%d", (unsigned int *) &arg); + do_wait_idle_child( arg ); + return; + } + + init_tests(); + test_PostMessage(); + test_PeekMessage(); + test_PeekMessage2(); + test_interthread_messages(); + test_DispatchMessage(); + test_SendMessageTimeout(); + test_quit_message(); + test_WaitForInputIdle( test_argv[0] ); + test_DestroyWindow(); + cleanup_tests(); +} + +START_TEST(msg_messages) +{ + init_tests(); + test_message_conversion(); + test_messages(); + test_wmime_keydown_message(); + test_nullCallback(); + test_dbcs_wm_char(); + test_unicode_wm_char(); + test_defwinproc(); + cleanup_tests(); +} + +START_TEST(msg_focus) +{ + init_tests(); + test_SetFocus(); + test_SetActiveWindow(); + + /* keep it the last test, under Windows it tends to break the tests + * which rely on active/foreground windows being correct. + */ + test_SetForegroundWindow(); + cleanup_tests(); +} + +START_TEST(msg_winpos) +{ + init_tests(); + test_SetParent(); + test_ShowWindow(); + test_setwindowpos(); + test_showwindow(); + test_SetWindowRgn(); + invisible_parent_tests(); + cleanup_tests(); +} + +START_TEST(msg_paint) +{ + init_tests(); + test_scrollwindowex(); + test_paint_messages(); + test_paintingloop(); + cleanup_tests(); +} + +START_TEST(msg_input) +{ + init_tests(); + test_accelerators(); + if (!pTrackMouseEvent) + win_skip("TrackMouseEvent is not available\n"); + else + test_TrackMouseEvent(); + + test_keyflags(); + test_hotkey(); + cleanup_tests(); +} + +START_TEST(msg_timer) +{ + init_tests(); + test_timers(); + test_timers_no_wnd(); + cleanup_tests(); +} + +typedef BOOL (WINAPI *IS_WINEVENT_HOOK_INSTALLED)(DWORD); + +START_TEST(msg_hook) +{ +// HMODULE user32 = GetModuleHandleA("user32.dll"); +// IS_WINEVENT_HOOK_INSTALLED pIsWinEventHookInstalled = (IS_WINEVENT_HOOK_INSTALLED)GetProcAddress(user32, "IsWinEventHookInstalled"); + BOOL (WINAPI *pIsWinEventHookInstalled)(DWORD)= 0;/*GetProcAddress(user32, "IsWinEventHookInstalled");*/ + + init_tests(); + + if (pSetWinEventHook) + { + hEvent_hook = pSetWinEventHook(EVENT_MIN, EVENT_MAX, + GetModuleHandleA(0), win_event_proc, + 0, GetCurrentThreadId(), + WINEVENT_INCONTEXT); + if (pIsWinEventHookInstalled && hEvent_hook) + { + UINT event; + for (event = EVENT_MIN; event <= EVENT_MAX; event++) + ok(pIsWinEventHookInstalled(event), "IsWinEventHookInstalled(%u) failed\n", event); + } + } + if (!hEvent_hook) win_skip( "no win event hook support\n" ); + + test_winevents(); + + /* Fix message sequences before removing 4 lines below */ + if (pUnhookWinEvent && hEvent_hook) + { + BOOL ret; + ret = pUnhookWinEvent(hEvent_hook); + ok( ret, "UnhookWinEvent error %d\n", GetLastError()); + pUnhookWinEvent = 0; + } + hEvent_hook = 0; + if (hCBT_hook) test_set_hook(); + cleanup_tests(); +} + +START_TEST(msg_menu) +{ + init_tests(); + test_sys_menu(); + test_menu_messages(); + if(!winetest_interactive) + skip("CORE-8299 : Skip Tracking popup menu tests.\n"); + else + { + test_TrackPopupMenu(); + test_TrackPopupMenuEmpty(); + } + cleanup_tests(); +} + +START_TEST(msg_mdi) +{ + init_tests(); + test_mdi_messages(); + cleanup_tests(); +} + +START_TEST(msg_controls) +{ + init_tests(); + test_button_messages(); + test_static_messages(); + test_listbox_messages(); + test_combobox_messages(); + test_edit_messages(); + cleanup_tests(); +} + +START_TEST(msg_layered_window) +{ + init_tests(); + test_layered_window(); + cleanup_tests(); +} + +START_TEST(msg_dialog) +{ + init_tests(); + test_dialog_messages(); + test_EndDialog(); + cleanup_tests(); +} + +START_TEST(msg_clipboard) +{ + init_tests(); + test_clipboard_viewers(); + cleanup_tests(); +} Modified: trunk/rostests/winetests/user32/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/user32/testlist… ============================================================================== --- trunk/rostests/winetests/user32/testlist.c [iso-8859-1] (original) +++ trunk/rostests/winetests/user32/testlist.c [iso-8859-1] Wed Feb 25 15:55:57 2015 @@ -17,7 +17,21 @@ extern void func_listbox(void); extern void func_menu(void); extern void func_monitor(void); -extern void func_msg(void); +//extern void func_msg(void); +extern void func_msg_queue(void); +extern void func_msg_messages(void); +extern void func_msg_focus(void); +extern void func_msg_winpos(void); +extern void func_msg_paint(void); +extern void func_msg_input(void); +extern void func_msg_timer(void); +extern void func_msg_hook(void); +extern void func_msg_menu(void); +extern void func_msg_mdi(void); +extern void func_msg_controls(void); +extern void func_msg_layered_window(void); +extern void func_msg_dialog(void); +extern void func_msg_clipboard(void); extern void func_resource(void); extern void func_scroll(void); extern void func_static(void); @@ -44,7 +58,20 @@ { "listbox", func_listbox }, { "menu", func_menu }, { "monitor", func_monitor }, - { "msg", func_msg }, + { "msg_queue", func_msg_queue}, + { "msg_messages", func_msg_messages}, + { "msg_focus", func_msg_focus}, + { "msg_winpos", func_msg_winpos}, + { "msg_paint", func_msg_paint}, + { "msg_input", func_msg_input}, + { "msg_timer", func_msg_timer}, + { "msg_hook", func_msg_hook}, + { "msg_menu", func_msg_menu}, + { "msg_mdi", func_msg_mdi}, + { "msg_controls", func_msg_controls}, + { "msg_layered_window", func_msg_layered_window}, + { "msg_dialog", func_msg_dialog}, + { "msg_clipboard", func_msg_clipboard}, { "resource", func_resource }, { "scroll", func_scroll }, { "static", func_static },

1 0

[tfaber] 66453: [COM_APITEST] - Add some more interfaces - Add CLSID_CDBurn
by tfaber＠svn.reactos.org 25 Feb '15

25 Feb '15

Author: tfaber Date: Wed Feb 25 15:00:24 2015 New Revision: 66453 URL: http://svn.reactos.org/svn/reactos?rev=66453&view=rev Log: [COM_APITEST] - Add some more interfaces - Add CLSID_CDBurn Modified: trunk/rostests/apitests/com/browseui.c trunk/rostests/apitests/com/com_apitest.c trunk/rostests/apitests/com/com_apitest.h trunk/rostests/apitests/com/shell32.c Modified: trunk/rostests/apitests/com/browseui.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/com/browseui.c?r… ============================================================================== --- trunk/rostests/apitests/com/browseui.c [iso-8859-1] (original) +++ trunk/rostests/apitests/com/browseui.c [iso-8859-1] Wed Feb 25 15:00:24 2015 @@ -75,6 +75,7 @@ { 0x0, &IID_IAutoComplete2 }, { 0x0, &IID_IAutoComplete }, { 0x0, &IID_IUnknown }, + { 0x4, &IID_IAutoCompleteDropDown }, { 0x8, &IID_IEnumString }, { 0xc, &IID_IAccessible }, { 0xc, &IID_IDispatch }, @@ -218,6 +219,8 @@ { 0x0, &IID_IProgressDialog }, { 0x0, &IID_IUnknown }, { 0x4, &IID_IOleWindow }, + { 0x8, &IID_IActionProgressDialog }, + { 0xc, &IID_IActionProgress }, { 0x10, &IID_IObjectWithSite }, }, L"Both" Modified: trunk/rostests/apitests/com/com_apitest.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/com/com_apitest.… ============================================================================== --- trunk/rostests/apitests/com/com_apitest.c [iso-8859-1] (original) +++ trunk/rostests/apitests/com/com_apitest.c [iso-8859-1] Wed Feb 25 15:00:24 2015 @@ -39,6 +39,8 @@ { ID_NAME(IID_IAccessor) }, { ID_NAME(IID_IActiveDesktop), TRUE }, { ID_NAME(IID_IActiveDesktopP), TRUE }, + { ID_NAME(IID_IActionProgress) }, + { ID_NAME(IID_IActionProgressDialog) }, { ID_NAME(IID_IAddressBarParser), TRUE }, { ID_NAME(IID_IAddressBand), TRUE }, { ID_NAME(IID_IAddressEditBox), TRUE }, @@ -46,6 +48,8 @@ { ID_NAME(IID_IAugmentedShellFolder2), TRUE }, { ID_NAME(IID_IAutoComplete), TRUE }, { ID_NAME(IID_IAutoComplete2), TRUE }, + { ID_NAME(IID_IAutoCompleteDropDown) }, + { ID_NAME(IID_IBandHost) }, { ID_NAME(IID_IBandNavigate), TRUE }, { ID_NAME(IID_IBandProxy), TRUE }, { ID_NAME(IID_IBandSite) }, @@ -56,10 +60,16 @@ { ID_NAME(IID_IBrowserService) }, { ID_NAME(IID_IBrowserService2), TRUE }, { ID_NAME(IID_IBrowserService3), TRUE }, + { ID_NAME(IID_ICDBurn) }, + { ID_NAME(IID_ICDBurnExt) }, { ID_NAME(IID_IClassFactory) }, { ID_NAME(IID_IClassFactory2) }, { ID_NAME(IID_IClassFactory3), TRUE }, { ID_NAME(IID_IClientSecurity), TRUE }, + { ID_NAME(IID_ICommDlgBrowser) }, + { ID_NAME(IID_ICommDlgBrowser2) }, + { ID_NAME(IID_ICommDlgBrowser3) }, + { ID_NAME(IID_IComputerInfoChangeNotify), }, { ID_NAME(IID_IComThreadingInfo), TRUE }, { ID_NAME(IID_IContext), TRUE }, { ID_NAME(IID_IContextMenu), TRUE }, @@ -68,6 +78,8 @@ { ID_NAME(IID_IContextMenuCB), TRUE }, { ID_NAME(IID_IContextMenuSite) }, { ID_NAME(IID_IContinue) }, + { ID_NAME(IID_ICopyHookA), TRUE }, + { ID_NAME(IID_ICopyHookW), TRUE }, { ID_NAME(IID_IDVGetEnum), TRUE }, { ID_NAME(IID_IDataObject) }, //{ ID_NAME(IID_IDefViewID) }, == DefViewFrame3 @@ -98,6 +110,7 @@ { ID_NAME(IID_IEnumUnknown) }, { ID_NAME(IID_IEnumVARIANT) }, { ID_NAME(IID_IErrorLog) }, + { ID_NAME(IID_IExplorerBrowser) }, { ID_NAME(IID_IExplorerToolbar), TRUE }, { ID_NAME(IID_IExtractIconA), TRUE }, { ID_NAME(IID_IExtractIconW), TRUE }, @@ -108,14 +121,20 @@ { ID_NAME(IID_IFileOpenDialog) }, { ID_NAME(IID_IFileSaveDialog) }, { ID_NAME(IID_IFileSearchBand) }, + { ID_NAME(IID_IFileViewerA), TRUE }, + { ID_NAME(IID_IFileViewerSite), TRUE }, + { ID_NAME(IID_IFileViewerW), TRUE }, { ID_NAME(IID_IFolderBandPriv) }, { ID_NAME(IID_IFolderFilter) }, { ID_NAME(IID_IFolderFilterSite) }, { ID_NAME(IID_IFolderView) }, { ID_NAME(IID_IFolderView2) }, + { ID_NAME(IID_IFolderViewHost), TRUE }, { ID_NAME(IID_IFolderViewOC) }, { ID_NAME(IID_IFolderViewSettings) }, { ID_NAME(IID_IGlobalFolderSettings), TRUE }, + { ID_NAME(IID_IHWEventHandler) }, + { ID_NAME(IID_IHWEventHandler2) }, { ID_NAME(IID_IInitializeObject), TRUE }, { ID_NAME(IID_IInputObject) }, { ID_NAME(IID_IInputObjectSite) }, @@ -123,6 +142,7 @@ { ID_NAME(IID_IMarshal) }, { ID_NAME(IID_IMenuBand), TRUE }, { ID_NAME(IID_IMenuPopup), TRUE }, + { ID_NAME(IID_IModalWindow) }, { ID_NAME(IID_IMoniker) }, { ID_NAME(IID_IMultiMonitorDockingSite), TRUE }, { ID_NAME(IID_IMultiQI), TRUE }, @@ -157,6 +177,9 @@ { ID_NAME(IID_IPersistStorage) }, { ID_NAME(IID_IPersistStream) }, { ID_NAME(IID_IPersistStreamInit) }, + { ID_NAME(IID_IPreviewHandler) }, + { ID_NAME(IID_IPreviewHandlerFrame) }, + { ID_NAME(IID_IPreviewHandlerVisuals) }, { ID_NAME(IID_IProgressDialog), TRUE }, { ID_NAME(IID_IPropertyBag) }, { ID_NAME(IID_IPropertyBag2) }, Modified: trunk/rostests/apitests/com/com_apitest.h URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/com/com_apitest.… ============================================================================== --- trunk/rostests/apitests/com/com_apitest.h [iso-8859-1] (original) +++ trunk/rostests/apitests/com/com_apitest.h [iso-8859-1] Wed Feb 25 15:00:24 2015 @@ -68,6 +68,7 @@ DEFINE_GUID(CLSID_AugmentedShellFolder, 0x91ea3f8b, 0xc99b, 0x11d0, 0x98, 0x15, 0x00, 0xc0, 0x4f, 0xd9, 0x19, 0x72); DEFINE_GUID(CLSID_AugmentedShellFolder2, 0x6413ba2c, 0xb461, 0x11d1, 0xa1, 0x8a, 0x08, 0x00, 0x36, 0xb1, 0x1a, 0x03); DEFINE_GUID(CLSID_CopyToMenu, 0xC2FBB630, 0x2971, 0x11D1, 0xA1, 0x8C, 0x00, 0xC0, 0x4F, 0xD7, 0x5D, 0x13); +DEFINE_GUID(CLSID_CDBurn, 0xfbeb8a05, 0xbeee, 0x4442, 0x80, 0x4e, 0x40, 0x9d, 0x6c, 0x45, 0x15, 0xe9); DEFINE_GUID(CLSID_DeskMovr, 0x72267F6A, 0xA6F9, 0x11D0, 0xBC, 0x94, 0x00, 0xC0, 0x4F, 0xB6, 0x78, 0x63); DEFINE_GUID(CLSID_FadeTask, 0x7EB5FBE4, 0x2100, 0x49E6, 0x85, 0x93, 0x17, 0xE1, 0x30, 0x12, 0x2F, 0x91); DEFINE_GUID(CLSID_FileSearchBand, 0xc4ee31f3, 0x4768, 0x11d2, 0xbe, 0x5c, 0x00, 0xa0, 0xc9, 0xa8, 0x3d, 0xa1); @@ -90,13 +91,21 @@ DEFINE_GUID(IID_IADesktopP2, 0xb22754e2, 0x4574, 0x11d1, 0x98, 0x88, 0x00, 0x60, 0x97, 0xde, 0xac, 0xf9); DEFINE_GUID(IID_IAccessControl, 0xeedd23e0, 0x8410, 0x11ce, 0xa1, 0xc3, 0x08, 0x00, 0x2b, 0x2b, 0x8d, 0x8f); DEFINE_GUID(IID_IAccessor, 0x0c733a8c, 0x2a1c, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d); +DEFINE_GUID(IID_IActionProgress, 0x49ff1173, 0xeadc, 0x446d, 0x92, 0x85, 0x15, 0x64, 0x53, 0xa6, 0x43, 0x1c); +DEFINE_GUID(IID_IActionProgressDialog, 0x49ff1172, 0xeadc, 0x446d, 0x92, 0x85, 0x15, 0x64, 0x53, 0xa6, 0x43, 0x1c); DEFINE_GUID(IID_IActiveDesktop, 0xf490eb00, 0x1240, 0x11d1, 0x98, 0x88, 0x00, 0x60, 0x97, 0xde, 0xac, 0xf9); DEFINE_GUID(IID_IActiveDesktopP, 0x52502ee0, 0xec80, 0x11d0, 0x89, 0xab, 0x00, 0xc0, 0x4f, 0xc2, 0x97, 0x2d); DEFINE_GUID(IID_IAddressBarParser, 0xc9d81948, 0x443a, 0x40c7, 0x94, 0x5c, 0x5e, 0x17, 0x1b, 0x8c, 0x66, 0xb4); DEFINE_GUID(IID_IAugmentedShellFolder, 0x91ea3f8c, 0xc99b, 0x11d0, 0x98, 0x15, 0x00, 0xc0, 0x4f, 0xd9, 0x19, 0x72); DEFINE_GUID(IID_IAugmentedShellFolder2, 0x8db3b3f4, 0x6cfe, 0x11d1, 0x8a, 0xe9, 0x00, 0xc0, 0x4f, 0xd9, 0x18, 0xd0); +DEFINE_GUID(IID_IBandHost, 0xb9075c7c, 0xd48e, 0x403f, 0xab, 0x99, 0xd6, 0xc7, 0x7a, 0x10, 0x84, 0xac); DEFINE_GUID(IID_IBrowserFrameOptions, 0x10df43c8, 0x1dbe, 0x11d3, 0x8b, 0x34, 0x00, 0x60, 0x97, 0xdf, 0x5b, 0xd4); -DEFINE_GUID(IID_IContext, 0x000001c0, 0x0000, 0x0000, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x46); +DEFINE_GUID(IID_IComputerInfoChangeNotify, 0x0df60d92, 0x6818, 0x46d6, 0xb3, 0x58, 0xd6, 0x61, 0x70, 0xdd, 0xe4, 0x66); +DEFINE_OLEGUID(IID_IContext, 0x000001c0, 0x0000, 0x0000); +DEFINE_OLEGUID(IID_ICopyHookA, 0x000214ef, 0x0000, 0x0000); +DEFINE_OLEGUID(IID_ICopyHookW, 0x000214fc, 0x0000, 0x0000); +DEFINE_GUID(IID_ICDBurn, 0x3d73a659, 0xe5d0, 0x4d42, 0xaf, 0xc0, 0x51, 0x21, 0xba, 0x42, 0x5c, 0x8d); +DEFINE_GUID(IID_ICDBurnExt, 0x2271dcca, 0x74fc, 0x4414, 0x8f, 0xb7, 0xc5, 0x6b, 0x05, 0xac, 0xe2, 0xd7); DEFINE_GUID(IID_IDVGetEnum, 0x70f55181, 0x5fea, 0x4900, 0xb6, 0xb8, 0x73, 0x43, 0xcb, 0x0a, 0x34, 0x8c); DEFINE_GUID(IID_IDefViewID, 0x985f64f0, 0xd410, 0x4e02, 0xbe, 0x22, 0xda, 0x07, 0xf2, 0xb5, 0xc5, 0xe1); DEFINE_GUID(IID_IDefViewFrame, 0x710EB7A0, 0x45ED, 0x11D0, 0x92, 0x4A, 0x00, 0x20, 0xAF, 0xC7, 0xAC, 0x4D); @@ -114,8 +123,14 @@ DEFINE_GUID(IID_IFolderFilter, 0x9cc22886, 0xdc8e, 0x11d2, 0xb1, 0xd0, 0x00, 0xc0, 0x4f, 0x8e, 0xeb, 0x3e); DEFINE_GUID(IID_IFolderFilterSite, 0xc0a651f5, 0xb48b, 0x11d2, 0xb5, 0xed, 0x00, 0x60, 0x97, 0xc6, 0x86, 0xf6); DEFINE_GUID(IID_IFolderView2, 0x1af3a467, 0x214f, 0x4298, 0x90, 0x8e, 0x06, 0xb0, 0x3e, 0x0b, 0x39, 0xf9); +DEFINE_GUID(IID_IFolderViewHost, 0x1ea58f02, 0xd55a, 0x411d, 0xb0, 0x9e, 0x9e, 0x65, 0xac, 0x21, 0x60, 0x5b); DEFINE_GUID(IID_IFolderViewSettings, 0xae8c987d, 0x8797, 0x4ed3, 0xbe, 0x72, 0x2a, 0x47, 0xdd, 0x93, 0x8d, 0xb0); +DEFINE_GUID(IID_IHWEventHandler, 0xc1fb73d0, 0xec3a, 0x4ba2, 0xb5, 0x12, 0x8c, 0xdb, 0x91, 0x87, 0xb6, 0xd1); +DEFINE_GUID(IID_IHWEventHandler2, 0xcfcc809f, 0x295d, 0x42e8, 0x9f, 0xfc, 0x42, 0x4b, 0x33, 0xc4, 0x87, 0xe6); DEFINE_GUID(IID_IMultiMonitorDockingSite, 0x03879de0, 0xa205, 0x11d0, 0x99, 0xcb, 0x00, 0xc0, 0x4f, 0xd6, 0x55, 0xe1); +DEFINE_GUID(IID_IPreviewHandler, 0x8895b1c6, 0xb41f, 0x4c1c, 0xa5, 0x62, 0x0d, 0x56, 0x42, 0x50, 0x83, 0x6f); +DEFINE_GUID(IID_IPreviewHandlerFrame, 0xfec87aaf, 0x35f9, 0x447a, 0xad, 0xb7, 0x20, 0x23, 0x44, 0x91, 0x40, 0x1a); +DEFINE_GUID(IID_IPreviewHandlerVisuals, 0x196bf9a5, 0xb346, 0x4ef0, 0xaa, 0x1e, 0x5d, 0xcd, 0xb7, 0x67, 0x68, 0xb1); DEFINE_GUID(IID_IShellDispatch3, 0x177160ca, 0xbb5a, 0x411c, 0x84, 0x1d, 0xbd, 0x38, 0xfa, 0xcd, 0xea, 0xa0); DEFINE_GUID(IID_IShellDispatch4, 0xefd84b2d, 0x4bcf, 0x4298, 0xbe, 0x25, 0xeb, 0x54, 0x2a, 0x59, 0xfb, 0xda); DEFINE_GUID(IID_IShellDispatch5, 0x866738b9, 0x6cf2, 0x4de8, 0x87, 0x67, 0xf7, 0x94, 0xeb, 0xe7, 0x4f, 0x4e); Modified: trunk/rostests/apitests/com/shell32.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/com/shell32.c?re… ============================================================================== --- trunk/rostests/apitests/com/shell32.c [iso-8859-1] (original) +++ trunk/rostests/apitests/com/shell32.c [iso-8859-1] Wed Feb 25 15:00:24 2015 @@ -13,6 +13,22 @@ static const CLASS_AND_INTERFACES ExpectedInterfaces[] = { { + ID_NAME(CLSID_CDBurn), + { + { 0x0, &IID_IObjectWithSite }, + { 0x0, &IID_IUnknown }, + { 0x8, &IID_IShellExtInit }, + { 0xc, &IID_IContextMenu }, + { 0x10, &IID_IShellPropSheetExt }, + { 0x18, &IID_IDropTarget }, + { 0x1c, &IID_IPersistFile }, + { 0x20, &IID_IOleCommandTarget }, + { 0x24, &IID_ICDBurn }, + { 0x2c, &IID_IPersistPropertyBag }, + { 0x3c, &IID_IServiceProvider }, + } + }, + { ID_NAME(CLSID_ControlPanel), { { 0x0, &IID_IUnknown }, @@ -131,7 +147,8 @@ { ID_NAME(CLSID_FolderViewHost), { - { 0x0, &IID_IUnknown }, + { 0x0, &IID_IFolderViewHost }, + { 0x0, &IID_IUnknown }, { 0x4, &IID_IServiceProvider }, { 0x8, &IID_IOleWindow }, { 0xc, &IID_IFolderView },

1 0

[jimtabor] 66452: [NtUser] - Fix API GetDCEx tests! Dedicated to the great work by Timo Kreuzer. - This uncovered a loop flaw, witch passed on any DCE last accessed.
by jimtabor＠svn.reactos.org 25 Feb '15

25 Feb '15

Author: jimtabor Date: Wed Feb 25 13:25:57 2015 New Revision: 66452 URL: http://svn.reactos.org/svn/reactos?rev=66452&view=rev Log: [NtUser] - Fix API GetDCEx tests! Dedicated to the great work by Timo Kreuzer. - This uncovered a loop flaw, witch passed on any DCE last accessed. Modified: trunk/reactos/win32ss/user/ntuser/windc.c Modified: trunk/reactos/win32ss/user/ntuser/windc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/windc.… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/windc.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/windc.c [iso-8859-1] Wed Feb 25 13:25:57 2015 @@ -366,7 +366,7 @@ Flags |= DCX_CACHE; } - if (Flags & (DCX_WINDOW | DCX_PARENTCLIP)) Flags |= DCX_CACHE; + if (Flags & DCX_PARENTCLIP) Flags |= DCX_CACHE; // When GetDC is called with hWnd nz, DCX_CACHE & _WINDOW are clear w _USESTYLE set. if (Flags & DCX_USESTYLE) @@ -488,6 +488,7 @@ break; } } + Dce = NULL; // Loop issue? } KeLeaveCriticalRegion(); @@ -497,7 +498,7 @@ { Dce = DceAllocDCE(NULL, DCE_CACHE_DC); } - if (!Dce) return NULL; + if (Dce == NULL) return NULL; Dce->hwndCurrent = (Wnd ? Wnd->head.h : NULL); Dce->pwndOrg = Dce->pwndClip = Wnd; @@ -510,20 +511,31 @@ { Dce = CONTAINING_RECORD(ListEntry, DCE, List); ListEntry = ListEntry->Flink; - // Check for Window handle than HDC match for CLASS. - if (Dce->hwndCurrent == Wnd->head.h) + + // Skip Cache DCE entries. + if (!(Dce->DCXFlags & DCX_CACHE)) { - bUpdateVisRgn = FALSE; - break; + // Check for Window handle than HDC match for CLASS. + if (Dce->hwndCurrent == Wnd->head.h) + { + bUpdateVisRgn = FALSE; + break; + } + else if (Dce->hDC == hDC) break; } - if (Dce->hDC == hDC) break; + Dce = NULL; // Loop issue? } KeLeaveCriticalRegion(); + + if (Dce == NULL) + { + return(NULL); + } if ( (Flags & (DCX_INTERSECTRGN|DCX_EXCLUDERGN)) && (Dce->DCXFlags & (DCX_INTERSECTRGN|DCX_EXCLUDERGN)) ) { - DceDeleteClipRgn(Dce); + DceDeleteClipRgn(Dce); } } // First time use hax, need to use DceAllocDCE during window display init.

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