Ros-diffs November 2015

ros-diffs@reactos.org

14 participants
457 discussions

[hbelusca] 69844: [NTVDM]: For now, use the shared Text/GraphicsFramebuffer variables for console+video/svga. This ambiguity will be fixed later.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sun Nov 8 02:27:41 2015 New Revision: 69844 URL: http://svn.reactos.org/svn/reactos?rev=69844&view=rev Log: [NTVDM]: For now, use the shared Text/GraphicsFramebuffer variables for console+video/svga. This ambiguity will be fixed later. Modified: trunk/reactos/subsystems/mvdm/ntvdm/console/video.c trunk/reactos/subsystems/mvdm/ntvdm/console/video.h trunk/reactos/subsystems/mvdm/ntvdm/hardware/video/svga.c Modified: trunk/reactos/subsystems/mvdm/ntvdm/console/video.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/cons… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/console/video.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/console/video.c [iso-8859-1] Sun Nov 8 02:27:41 2015 @@ -631,7 +631,7 @@ } BOOL -VgaConsoleCreateGraphicsScreen(OUT PBYTE* GraphicsFramebuffer, +VgaConsoleCreateGraphicsScreen(// OUT PBYTE* GraphicsFramebuffer, IN PCOORD Resolution, IN HANDLE PaletteHandle) { @@ -677,11 +677,13 @@ if (GraphicsConsoleBuffer == INVALID_HANDLE_VALUE) return FALSE; /* Save the framebuffer address and mutex */ - *GraphicsFramebuffer = GraphicsBufferInfo.lpBitMap; + // *GraphicsFramebuffer = GraphicsBufferInfo.lpBitMap; + GraphicsFramebuffer = GraphicsBufferInfo.lpBitMap; ConsoleMutex = GraphicsBufferInfo.hMutex; /* Clear the framebuffer */ - RtlZeroMemory(*GraphicsFramebuffer, BitmapInfo->bmiHeader.biSizeImage); + // RtlZeroMemory(*GraphicsFramebuffer, BitmapInfo->bmiHeader.biSizeImage); + RtlZeroMemory(GraphicsFramebuffer, BitmapInfo->bmiHeader.biSizeImage); /* Set the graphics mode palette */ SetConsolePalette(GraphicsConsoleBuffer, @@ -717,7 +719,7 @@ } BOOL -VgaConsoleCreateTextScreen(OUT PCHAR_CELL* TextFramebuffer, +VgaConsoleCreateTextScreen(// OUT PCHAR_CELL* TextFramebuffer, IN PCOORD Resolution, IN HANDLE PaletteHandle) { Modified: trunk/reactos/subsystems/mvdm/ntvdm/console/video.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/cons… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/console/video.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/console/video.h [iso-8859-1] Sun Nov 8 02:27:41 2015 @@ -16,14 +16,14 @@ WORD Location); BOOL -VgaConsoleCreateGraphicsScreen(OUT PBYTE* GraphicsFramebuffer, +VgaConsoleCreateGraphicsScreen(// OUT PBYTE* GraphicsFramebuffer, IN PCOORD Resolution, IN HANDLE PaletteHandle); VOID VgaConsoleDestroyGraphicsScreen(VOID); BOOL -VgaConsoleCreateTextScreen(OUT PCHAR_CELL* TextFramebuffer, +VgaConsoleCreateTextScreen(// OUT PCHAR_CELL* TextFramebuffer, IN PCOORD Resolution, IN HANDLE PaletteHandle); Modified: trunk/reactos/subsystems/mvdm/ntvdm/hardware/video/svga.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/hard… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/hardware/video/svga.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/hardware/video/svga.c [iso-8859-1] Sun Nov 8 02:27:41 2015 @@ -619,7 +619,7 @@ { /* Enter new text mode */ - if (!VgaConsoleCreateTextScreen(&TextFramebuffer, + if (!VgaConsoleCreateTextScreen(// &TextFramebuffer, Resolution, TextPaletteHandle)) { @@ -640,7 +640,7 @@ { /* Enter graphics mode */ - if (!VgaConsoleCreateGraphicsScreen(&GraphicsFramebuffer, + if (!VgaConsoleCreateGraphicsScreen(// &GraphicsFramebuffer, Resolution, PaletteHandle)) {

9 years, 1 month

[hbelusca] 69843: [NTVDM]: Implement mouse capture. There are still "bugs" remaining, namely, if somebody moves the NTVDM console window, or, if resolution changes, the mouse clip rectangle is not ...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sat Nov 7 23:40:26 2015 New Revision: 69843 URL: http://svn.reactos.org/svn/reactos?rev=69843&view=rev Log: [NTVDM]: Implement mouse capture. There are still "bugs" remaining, namely, if somebody moves the NTVDM console window, or, if resolution changes, the mouse clip rectangle is not recomputed. This is left as an exercice for the programmer (or, if I don't find patches in Jira soon, I or somebody else will fix it). Modified: trunk/reactos/subsystems/mvdm/ntvdm/console/console.c trunk/reactos/subsystems/mvdm/ntvdm/lang/cs-CZ.rc trunk/reactos/subsystems/mvdm/ntvdm/lang/de-DE.rc trunk/reactos/subsystems/mvdm/ntvdm/lang/en-US.rc trunk/reactos/subsystems/mvdm/ntvdm/lang/es-ES.rc trunk/reactos/subsystems/mvdm/ntvdm/lang/fr-FR.rc trunk/reactos/subsystems/mvdm/ntvdm/lang/it-IT.rc trunk/reactos/subsystems/mvdm/ntvdm/lang/pl-PL.rc trunk/reactos/subsystems/mvdm/ntvdm/lang/ro-RO.rc trunk/reactos/subsystems/mvdm/ntvdm/lang/ru-RU.rc trunk/reactos/subsystems/mvdm/ntvdm/lang/tr-TR.rc trunk/reactos/subsystems/mvdm/ntvdm/lang/zh-CN.rc trunk/reactos/subsystems/mvdm/ntvdm/resource.h Modified: trunk/reactos/subsystems/mvdm/ntvdm/console/console.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/cons… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/console/console.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/console/console.c [iso-8859-1] Sat Nov 7 23:40:26 2015 @@ -18,9 +18,9 @@ static DWORD OrgConsoleInputMode, OrgConsoleOutputMode; HWND hConsoleWnd = NULL; -static HMENU hConsoleMenu = NULL; -static INT VdmMenuPos = -1; -static BOOLEAN ShowPointer = TRUE; +static HMENU hConsoleMenu = NULL; +static INT VdmMenuPos = -1; +static BOOL CaptureMouse = FALSE; /* * Those menu helpers were taken from the GUI frontend in winsrv.dll @@ -48,8 +48,8 @@ static const VDM_MENUITEM VdmMainMenuItems[] = { { -1, NULL, 0 }, /* Separator */ - { IDS_HIDE_MOUSE, NULL, ID_SHOWHIDE_MOUSE }, /* "Hide mouse"; can be renamed to "Show mouse" */ - { IDS_VDM_MENU , VdmMenuItems, 0 }, /* ReactOS VDM Menu */ + { IDS_CAPTURE_MOUSE, NULL, ID_CAPTURE_MOUSE }, /* "Capture mouse"; can be renamed to "Release mouse" */ + { IDS_VDM_MENU , VdmMenuItems, 0 }, /* ReactOS VDM Menu */ { 0, NULL, 0 } /* End of list */ }; @@ -116,7 +116,7 @@ /* Check for the presence of one of the VDM menu items */ for (i = 0; i <= MenuPos; i++) { - if (GetMenuItemID(hConsoleMenu, i) == ID_SHOWHIDE_MOUSE) + if (GetMenuItemID(hConsoleMenu, i) == ID_CAPTURE_MOUSE) { /* Set VdmMenuPos to the position of the existing menu */ VdmMenuPos = i - 1; @@ -131,14 +131,14 @@ { WCHAR szMenuString[256]; - /* Update "Hide/Show mouse" menu item */ + /* Update "Capture/Release mouse" menu item */ if (LoadStringW(GetModuleHandle(NULL), - (!ShowPointer ? IDS_SHOW_MOUSE : IDS_HIDE_MOUSE), + (CaptureMouse ? IDS_RELEASE_MOUSE : IDS_CAPTURE_MOUSE), szMenuString, ARRAYSIZE(szMenuString)) > 0) { - ModifyMenuW(hConsoleMenu, ID_SHOWHIDE_MOUSE, - MF_BYCOMMAND, ID_SHOWHIDE_MOUSE, szMenuString); + ModifyMenuW(hConsoleMenu, ID_CAPTURE_MOUSE, + MF_BYCOMMAND, ID_CAPTURE_MOUSE, szMenuString); } } @@ -210,7 +210,7 @@ WCHAR szMenuString1[256], szMenuString2[256]; hConsoleMenu = ConsoleMenuControl(ConOutHandle, - ID_SHOWHIDE_MOUSE, + ID_CAPTURE_MOUSE, ID_VDM_DRIVES + (2 * ARRAYSIZE(GlobalSettings.FloppyDisks))); if (hConsoleMenu == NULL) return; @@ -285,17 +285,33 @@ DrawMenuBar(hConsoleWnd); } -static VOID ShowHideMousePointer(HANDLE ConOutHandle, BOOLEAN ShowPtr) -{ - if (ShowPtr) - { +static VOID CaptureMousePointer(HANDLE ConOutHandle, BOOLEAN Capture) +{ + static BOOL IsClipped = FALSE; // For debugging purposes + UNREFERENCED_PARAMETER(IsClipped); + + if (Capture) + { + RECT rcClip; + + // if (IsClipped) return; + + /* Be sure the cursor will be hidden */ + while (ShowConsoleCursor(ConOutHandle, FALSE) >= 0) ; + + GetClientRect(hConsoleWnd, &rcClip); + MapWindowPoints(hConsoleWnd, HWND_DESKTOP /*NULL*/, (LPPOINT)&rcClip, 2 /* Magic value when the LPPOINT parameter is a RECT */); + IsClipped = ClipCursor(&rcClip); + } + else + { + // if (!IsClipped) return; + + ClipCursor(NULL); + IsClipped = FALSE; + /* Be sure the cursor will be shown */ while (ShowConsoleCursor(ConOutHandle, TRUE) < 0) ; - } - else - { - /* Be sure the cursor will be hidden */ - while (ShowConsoleCursor(ConOutHandle, FALSE) >= 0) ; } } @@ -373,7 +389,7 @@ ConsoleCleanupUI(VOID) { /* Display again properly the mouse pointer */ - if (ShowPointer) ShowHideMousePointer(ConsoleOutput, ShowPointer); + if (CaptureMouse) CaptureMousePointer(ConsoleOutput, !CaptureMouse); DestroyVdmMenu(); } @@ -423,7 +439,7 @@ CreateVdmMenu(ConOutHandle); /* Synchronize mouse cursor display with console screenbuffer switches */ - ShowHideMousePointer(CurrentConsoleOutput, ShowPointer); + CaptureMousePointer(CurrentConsoleOutput, CaptureMouse); } static BOOL @@ -493,21 +509,25 @@ */ case WM_INITMENU: - DPRINT1("WM_INITMENU\n"); - break; - case WM_MENUSELECT: - DPRINT1("WM_MENUSELECT\n"); - break; + { + /* + * If the mouse is captured, release it or recapture it + * when the menu opens or closes, respectively. + */ + if (!CaptureMouse) break; + CaptureMousePointer(CurrentConsoleOutput, MenuEvent->dwCommandId == WM_INITMENU ? FALSE : TRUE); + break; + } /* * User-defined menu commands */ - case ID_SHOWHIDE_MOUSE: - ShowPointer = !ShowPointer; - ShowHideMousePointer(CurrentConsoleOutput, ShowPointer); + case ID_CAPTURE_MOUSE: + CaptureMouse = !CaptureMouse; + CaptureMousePointer(CurrentConsoleOutput, CaptureMouse); UpdateVdmMenuMouse(); break; @@ -555,5 +575,10 @@ VOID FocusEventHandler(PFOCUS_EVENT_RECORD FocusEvent) { - DPRINT1("Focus events not handled\n"); -} + /* + * If the mouse is captured, release it or recapture it + * when we lose or regain focus, respectively. + */ + if (!CaptureMouse) return; + CaptureMousePointer(CurrentConsoleOutput, FocusEvent->bSetFocus); +} Modified: trunk/reactos/subsystems/mvdm/ntvdm/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/lang… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/lang/cs-CZ.rc [iso-8859-1] Sat Nov 7 23:40:26 2015 @@ -8,9 +8,9 @@ STRINGTABLE BEGIN - IDS_HIDE_MOUSE, "&SkrÃ½t ukazatel myÅ¡i" - IDS_SHOW_MOUSE, "&Zobrazit ukazatel myÅ¡i" - IDS_VDM_MENU , "ReactOS &VDM" + IDS_CAPTURE_MOUSE, "&Capture Mouse Pointer" + IDS_RELEASE_MOUSE, "&Release Mouse Pointer" + IDS_VDM_MENU , "ReactOS &VDM" END STRINGTABLE Modified: trunk/reactos/subsystems/mvdm/ntvdm/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/lang… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/lang/de-DE.rc [iso-8859-1] Sat Nov 7 23:40:26 2015 @@ -2,9 +2,9 @@ STRINGTABLE BEGIN - IDS_HIDE_MOUSE, "Mauszeiger &verstecken" - IDS_SHOW_MOUSE, "Mauszeiger &anzeigen" - IDS_VDM_MENU , "&ReactOS VDM" + IDS_CAPTURE_MOUSE, "&Capture Mouse Pointer" + IDS_RELEASE_MOUSE, "&Release Mouse Pointer" + IDS_VDM_MENU , "ReactOS &VDM" END STRINGTABLE Modified: trunk/reactos/subsystems/mvdm/ntvdm/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/lang… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/lang/en-US.rc [iso-8859-1] Sat Nov 7 23:40:26 2015 @@ -2,9 +2,9 @@ STRINGTABLE BEGIN - IDS_HIDE_MOUSE, "&Hide Mouse Pointer" - IDS_SHOW_MOUSE, "&Display Mouse Pointer" - IDS_VDM_MENU , "ReactOS &VDM" + IDS_CAPTURE_MOUSE, "&Capture Mouse Pointer" + IDS_RELEASE_MOUSE, "&Release Mouse Pointer" + IDS_VDM_MENU , "ReactOS &VDM" END STRINGTABLE Modified: trunk/reactos/subsystems/mvdm/ntvdm/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/lang… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/lang/es-ES.rc [iso-8859-1] Sat Nov 7 23:40:26 2015 @@ -2,9 +2,9 @@ STRINGTABLE BEGIN - IDS_HIDE_MOUSE, "&Ocultar puntero del ratÃ³n" - IDS_SHOW_MOUSE, "&Mostrar puntero del ratÃ³n" - IDS_VDM_MENU , "ReactOS &VDM" + IDS_CAPTURE_MOUSE, "&Capture Mouse Pointer" + IDS_RELEASE_MOUSE, "&Release Mouse Pointer" + IDS_VDM_MENU , "ReactOS &VDM" END STRINGTABLE Modified: trunk/reactos/subsystems/mvdm/ntvdm/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/lang… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/lang/fr-FR.rc [iso-8859-1] Sat Nov 7 23:40:26 2015 @@ -2,9 +2,9 @@ STRINGTABLE BEGIN - IDS_HIDE_MOUSE, "Mas&quer le pointeur de la souris" - IDS_SHOW_MOUSE, "&Afficher le pointeur de la souris" - IDS_VDM_MENU , "ReactOS &VDM" + IDS_CAPTURE_MOUSE, "&Capturer le pointeur de la souris" + IDS_RELEASE_MOUSE, "&LibÃ©rer le pointeur de la souris" + IDS_VDM_MENU , "ReactOS &VDM" END STRINGTABLE Modified: trunk/reactos/subsystems/mvdm/ntvdm/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/lang… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/lang/it-IT.rc [iso-8859-1] Sat Nov 7 23:40:26 2015 @@ -2,9 +2,9 @@ STRINGTABLE BEGIN - IDS_HIDE_MOUSE, "&Nascondi il mouse" - IDS_SHOW_MOUSE, "&Mostra il mouse" - IDS_VDM_MENU , "ReactOS &VDM" + IDS_CAPTURE_MOUSE, "&Capture Mouse Pointer" + IDS_RELEASE_MOUSE, "&Release Mouse Pointer" + IDS_VDM_MENU , "ReactOS &VDM" END STRINGTABLE Modified: trunk/reactos/subsystems/mvdm/ntvdm/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/lang… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/lang/pl-PL.rc [iso-8859-1] Sat Nov 7 23:40:26 2015 @@ -4,9 +4,9 @@ STRINGTABLE BEGIN - IDS_HIDE_MOUSE, "&Ukryj WskaÅºnik Myszki" - IDS_SHOW_MOUSE, "&PokaÅ¼ WskaÅºnik Myszki" - IDS_VDM_MENU , "ReactOS &VDM" + IDS_CAPTURE_MOUSE, "&Capture Mouse Pointer" + IDS_RELEASE_MOUSE, "&Release Mouse Pointer" + IDS_VDM_MENU , "ReactOS &VDM" END STRINGTABLE Modified: trunk/reactos/subsystems/mvdm/ntvdm/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/lang… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/lang/ro-RO.rc [iso-8859-1] Sat Nov 7 23:40:26 2015 @@ -3,9 +3,9 @@ STRINGTABLE BEGIN - IDS_HIDE_MOUSE, "Asc&unde indicatorul Èoricelului" - IDS_SHOW_MOUSE, "AfiÈea&zÄ indicatorul Èoricelului" - IDS_VDM_MENU , "ReactOS &VDM" + IDS_CAPTURE_MOUSE, "&Capture Mouse Pointer" + IDS_RELEASE_MOUSE, "&Release Mouse Pointer" + IDS_VDM_MENU , "ReactOS &VDM" END STRINGTABLE Modified: trunk/reactos/subsystems/mvdm/ntvdm/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/lang… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/lang/ru-RU.rc [iso-8859-1] Sat Nov 7 23:40:26 2015 @@ -2,9 +2,9 @@ STRINGTABLE BEGIN - IDS_HIDE_MOUSE, "&Ð¡Ð¿ÑÑÑÐ°ÑÑ ÑÐºÐ°Ð·Ð°ÑÐµÐ»Ñ Ð¼ÑÑÐ¸" - IDS_SHOW_MOUSE, "&ÐÑÐ¾Ð±ÑÐ°Ð·Ð¸ÑÑ ÑÐºÐ°Ð·Ð°ÑÐµÐ»Ñ Ð¼ÑÑÐ¸" - IDS_VDM_MENU , "ReactOS &VDM" + IDS_CAPTURE_MOUSE, "&Capture Mouse Pointer" + IDS_RELEASE_MOUSE, "&Release Mouse Pointer" + IDS_VDM_MENU , "ReactOS &VDM" END STRINGTABLE Modified: trunk/reactos/subsystems/mvdm/ntvdm/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/lang… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/lang/tr-TR.rc [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/lang/tr-TR.rc [iso-8859-1] Sat Nov 7 23:40:26 2015 @@ -4,9 +4,9 @@ STRINGTABLE BEGIN - IDS_HIDE_MOUSE, "&FÃ¢re Ä°mlecini Gizle" - IDS_SHOW_MOUSE, "FÃ¢re &Ä°mlecini GÃ¶ster" - IDS_VDM_MENU , "&ReactOS VDM" + IDS_CAPTURE_MOUSE, "&Capture Mouse Pointer" + IDS_RELEASE_MOUSE, "&Release Mouse Pointer" + IDS_VDM_MENU , "ReactOS &VDM" END STRINGTABLE Modified: trunk/reactos/subsystems/mvdm/ntvdm/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/lang… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/lang/zh-CN.rc [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/lang/zh-CN.rc [iso-8859-1] Sat Nov 7 23:40:26 2015 @@ -4,9 +4,9 @@ STRINGTABLE BEGIN - IDS_HIDE_MOUSE, "éèé¼ æ æé (&H)" - IDS_SHOW_MOUSE, "æ¾ç¤ºé¼ æ æé (&D)" - IDS_VDM_MENU , "ReactOS DOS èææº (&V)" + IDS_CAPTURE_MOUSE, "&Capture Mouse Pointer" + IDS_RELEASE_MOUSE, "&Release Mouse Pointer" + IDS_VDM_MENU , "ReactOS DOS èææº (&V)" END STRINGTABLE Modified: trunk/reactos/subsystems/mvdm/ntvdm/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/reso… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/resource.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/resource.h [iso-8859-1] Sat Nov 7 23:40:26 2015 @@ -1,7 +1,7 @@ #pragma once /* Menu IDs */ -#define ID_SHOWHIDE_MOUSE 1000 +#define ID_CAPTURE_MOUSE 1000 #define ID_VDM_DUMPMEM_TXT 1001 #define ID_VDM_DUMPMEM_BIN 1002 #define ID_VDM_QUIT 1003 @@ -10,9 +10,9 @@ #define ID_VDM_DRIVES 1010 /* String IDs */ -#define IDS_HIDE_MOUSE 100 -#define IDS_SHOW_MOUSE 101 -#define IDS_VDM_MENU 102 +#define IDS_CAPTURE_MOUSE 100 +#define IDS_RELEASE_MOUSE 101 +#define IDS_VDM_MENU 102 #define IDS_VDM_DUMPMEM_TXT 200 #define IDS_VDM_DUMPMEM_BIN 201

9 years, 1 month

[jimtabor] 69842: [Win32k] - Fix arrows on owner drawn menu bars. See CORE-6320 and CORE-9386.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Sat Nov 7 21:41:42 2015 New Revision: 69842 URL: http://svn.reactos.org/svn/reactos?rev=69842&view=rev Log: [Win32k] - Fix arrows on owner drawn menu bars. See CORE-6320 and CORE-9386. Modified: trunk/reactos/win32ss/user/ntuser/menu.c Modified: trunk/reactos/win32ss/user/ntuser/menu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/menu.c… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/menu.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/menu.c [iso-8859-1] Sat Nov 7 21:41:42 2015 @@ -2291,7 +2291,7 @@ TRACE("Ownerdraw: Width %d Height %d\n", dis.rcItem.right-dis.rcItem.left, dis.rcItem.bottom-dis.rcItem.top); co_IntSendMessage(UserHMGetHandle(WndOwner), WM_DRAWITEM, 0, (LPARAM) &dis); /* Draw the popup-menu arrow */ - if (lpitem->spSubMenu) + if (!menuBar && lpitem->spSubMenu) { RECT rectTemp; RtlCopyMemory(&rectTemp, &rect, sizeof(RECT));

9 years, 1 month

[ekohl] 69841: [USERENV] - GetAllUsersProfileDirectoryW: Fail if lpcchSize is NULL. - GetDefaultUserProfileDirectoryW: Fail if lpcchSize is NULL. - GetUserProfileDirectoryW: Fail if hToken is NULL.

by ekohl＠svn.reactos.org

Author: ekohl Date: Sat Nov 7 21:06:07 2015 New Revision: 69841 URL: http://svn.reactos.org/svn/reactos?rev=69841&view=rev Log: [USERENV] - GetAllUsersProfileDirectoryW: Fail if lpcchSize is NULL. - GetDefaultUserProfileDirectoryW: Fail if lpcchSize is NULL. - GetUserProfileDirectoryW: Fail if hToken is NULL. Modified: trunk/reactos/dll/win32/userenv/profile.c Modified: trunk/reactos/dll/win32/userenv/profile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/userenv/profile.… ============================================================================== --- trunk/reactos/dll/win32/userenv/profile.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/userenv/profile.c [iso-8859-1] Sat Nov 7 21:06:07 2015 @@ -464,6 +464,12 @@ HKEY hKey; LONG Error; + if (!lpcchSize) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + Error = RegOpenKeyExW(HKEY_LOCAL_MACHINE, L"SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\ProfileList", 0, @@ -586,6 +592,12 @@ HKEY hKey; LONG Error; + if (!lpcchSize) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + Error = RegOpenKeyExW(HKEY_LOCAL_MACHINE, L"SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\ProfileList", 0, @@ -839,9 +851,15 @@ HKEY hKey; LONG Error; + if (!hToken) + { + SetLastError(ERROR_INVALID_HANDLE); + return FALSE; + } + if (!lpcchSize) { - SetLastError( ERROR_INVALID_PARAMETER ); + SetLastError(ERROR_INVALID_PARAMETER); return FALSE; }

9 years, 1 month

[hbelusca] 69840: [NTVDM]: Natively use UNICODE strings for the disk mounting system.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sat Nov 7 20:19:32 2015 New Revision: 69840 URL: http://svn.reactos.org/svn/reactos?rev=69840&view=rev Log: [NTVDM]: Natively use UNICODE strings for the disk mounting system. Modified: trunk/reactos/subsystems/mvdm/ntvdm/console/console.c trunk/reactos/subsystems/mvdm/ntvdm/emulator.c trunk/reactos/subsystems/mvdm/ntvdm/hardware/disk.c trunk/reactos/subsystems/mvdm/ntvdm/hardware/disk.h trunk/reactos/subsystems/mvdm/ntvdm/ntvdm.c trunk/reactos/subsystems/mvdm/ntvdm/ntvdm.h Modified: trunk/reactos/subsystems/mvdm/ntvdm/console/console.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/cons… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/console/console.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/console/console.c [iso-8859-1] Sat Nov 7 20:19:32 2015 @@ -146,7 +146,6 @@ UpdateVdmMenuDisks(VOID) { UINT_PTR ItemID; - UNICODE_STRING ValueString; USHORT i; WCHAR szNoMedia[100]; @@ -170,17 +169,12 @@ if (GlobalSettings.FloppyDisks[i].Length != 0 && GlobalSettings.FloppyDisks[i].Buffer && - GlobalSettings.FloppyDisks[i].Buffer != '\0') - { - /* Convert the ANSI string to UNICODE */ - RtlAnsiStringToUnicodeString(&ValueString, &GlobalSettings.FloppyDisks[i], TRUE); - + GlobalSettings.FloppyDisks[i].Buffer != L'\0') + { /* Update item text */ - _snwprintf(szMenuString2, ARRAYSIZE(szMenuString2), szMenuString1, i, ValueString.Buffer); + _snwprintf(szMenuString2, ARRAYSIZE(szMenuString2), szMenuString1, i, GlobalSettings.FloppyDisks[i].Buffer); szMenuString2[ARRAYSIZE(szMenuString2) - 1] = UNICODE_NULL; ModifyMenuW(hConsoleMenu, ItemID, MF_BYCOMMAND | MF_STRING, ItemID, szMenuString2); - - RtlFreeUnicodeString(&ValueString); /* Enable the eject item */ EnableMenuItem(hConsoleMenu, ItemID + 1, MF_BYCOMMAND | MF_ENABLED); Modified: trunk/reactos/subsystems/mvdm/ntvdm/emulator.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/emul… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/emulator.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/emulator.c [iso-8859-1] Sat Nov 7 20:19:32 2015 @@ -419,9 +419,9 @@ #define OFN_EX_NOPLACESBAR 0x00000001 #endif // (_WIN32_WINNT >= 0x0500) + BOOLEAN Success; OPENFILENAMEW ofn; WCHAR szFile[MAX_PATH] = L""; - UNICODE_STRING ValueString; ASSERT(DiskNumber < ARRAYSIZE(GlobalSettings.FloppyDisks)); @@ -445,19 +445,18 @@ /* Free the old string */ if (GlobalSettings.FloppyDisks[DiskNumber].Buffer) - RtlFreeAnsiString(&GlobalSettings.FloppyDisks[DiskNumber]); - - /* Convert the UNICODE string to ANSI and store it */ - RtlInitEmptyUnicodeString(&ValueString, szFile, wcslen(szFile) * sizeof(WCHAR)); - ValueString.Length = ValueString.MaximumLength; - RtlUnicodeStringToAnsiString(&GlobalSettings.FloppyDisks[DiskNumber], &ValueString, TRUE); + RtlFreeUnicodeString(&GlobalSettings.FloppyDisks[DiskNumber]); + + /* Reinitialize the string */ + Success = RtlCreateUnicodeString(&GlobalSettings.FloppyDisks[DiskNumber], szFile); + ASSERT(Success); /* Mount the disk */ if (!MountDisk(FLOPPY_DISK, DiskNumber, GlobalSettings.FloppyDisks[DiskNumber].Buffer, !!(ofn.Flags & OFN_READONLY))) { DisplayMessage(L"An error happened when mounting disk %d", DiskNumber); - RtlFreeAnsiString(&GlobalSettings.FloppyDisks[DiskNumber]); - RtlInitEmptyAnsiString(&GlobalSettings.FloppyDisks[DiskNumber], NULL, 0); + RtlFreeUnicodeString(&GlobalSettings.FloppyDisks[DiskNumber]); + RtlInitEmptyUnicodeString(&GlobalSettings.FloppyDisks[DiskNumber], NULL, 0); return; } @@ -476,8 +475,8 @@ /* Free the old string */ if (GlobalSettings.FloppyDisks[DiskNumber].Buffer) { - RtlFreeAnsiString(&GlobalSettings.FloppyDisks[DiskNumber]); - RtlInitEmptyAnsiString(&GlobalSettings.FloppyDisks[DiskNumber], NULL, 0); + RtlFreeUnicodeString(&GlobalSettings.FloppyDisks[DiskNumber]); + RtlInitEmptyUnicodeString(&GlobalSettings.FloppyDisks[DiskNumber], NULL, 0); } /* Refresh the menu state */ @@ -597,9 +596,9 @@ { if (!MountDisk(FLOPPY_DISK, i, GlobalSettings.FloppyDisks[i].Buffer, FALSE)) { - DPRINT1("Failed to mount floppy disk file '%Z'.\n", &GlobalSettings.FloppyDisks[i]); - RtlFreeAnsiString(&GlobalSettings.FloppyDisks[i]); - RtlInitEmptyAnsiString(&GlobalSettings.FloppyDisks[i], NULL, 0); + DPRINT1("Failed to mount floppy disk file '%wZ'.\n", &GlobalSettings.FloppyDisks[i]); + RtlFreeUnicodeString(&GlobalSettings.FloppyDisks[i]); + RtlInitEmptyUnicodeString(&GlobalSettings.FloppyDisks[i], NULL, 0); } } } @@ -612,11 +611,11 @@ { if (GlobalSettings.HardDisks[i].Length != 0 && GlobalSettings.HardDisks[i].Buffer && - GlobalSettings.HardDisks[i].Buffer != '\0') + GlobalSettings.HardDisks[i].Buffer != L'\0') { if (!MountDisk(HARD_DISK, i, GlobalSettings.HardDisks[i].Buffer, FALSE)) { - wprintf(L"FATAL: Failed to mount hard disk file '%Z'.\n", &GlobalSettings.HardDisks[i]); + wprintf(L"FATAL: Failed to mount hard disk file '%wZ'.\n", &GlobalSettings.HardDisks[i]); EmulatorCleanup(); return FALSE; } Modified: trunk/reactos/subsystems/mvdm/ntvdm/hardware/disk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/hard… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/hardware/disk.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/hardware/disk.c [iso-8859-1] Sat Nov 7 20:19:32 2015 @@ -499,7 +499,7 @@ BOOLEAN MountDisk(IN DISK_TYPE DiskType, IN ULONG DiskNumber, - IN PCSTR FileName, + IN PCWSTR FileName, IN BOOLEAN ReadOnly) { BOOLEAN Success = FALSE; @@ -527,7 +527,7 @@ SetLastError(0); // For debugging purposes if (ReadOnly) { - hFile = CreateFileA(FileName, + hFile = CreateFileW(FileName, GENERIC_READ, FILE_SHARE_READ, NULL, @@ -537,7 +537,7 @@ } else { - hFile = CreateFileA(FileName, + hFile = CreateFileW(FileName, GENERIC_READ | GENERIC_WRITE, 0, // No sharing access NULL, @@ -545,13 +545,13 @@ FILE_ATTRIBUTE_NORMAL, NULL); } - DPRINT1("File '%s' opening %s ; GetLastError() = %u\n", + DPRINT1("File '%S' opening %s ; GetLastError() = %u\n", FileName, hFile != INVALID_HANDLE_VALUE ? "succeeded" : "failed", GetLastError()); /* If we failed, bail out */ if (hFile == INVALID_HANDLE_VALUE) { - DisplayMessage(L"MountDisk: Error when opening disk file '%S' (Error: %u).", FileName, GetLastError()); + DisplayMessage(L"MountDisk: Error when opening disk file '%s' (Error: %u).", FileName, GetLastError()); return FALSE; } @@ -569,7 +569,7 @@ GetLastError() == ERROR_INVALID_FUNCTION) { /* Objects other than real files are not supported */ - DisplayMessage(L"MountDisk: '%S' is not a valid disk file.", FileName); + DisplayMessage(L"MountDisk: '%s' is not a valid disk file.", FileName); goto Quit; } SetLastError(0); @@ -577,14 +577,14 @@ GetLastError() == ERROR_INVALID_FUNCTION) { /* Objects other than real files are not supported */ - DisplayMessage(L"MountDisk: '%S' is not a valid disk file.", FileName); + DisplayMessage(L"MountDisk: '%s' is not a valid disk file.", FileName); goto Quit; } /* Success, mount the image */ if (!DiskMountInfo[DiskType].MountDiskHelper(DiskImage, hFile)) { - DisplayMessage(L"MountDisk: Failed to mount disk file '%S' in 0x%p.", FileName, DiskImage); + DisplayMessage(L"MountDisk: Failed to mount disk file '%s' in 0x%p.", FileName, DiskImage); goto Quit; } Modified: trunk/reactos/subsystems/mvdm/ntvdm/hardware/disk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/hard… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/hardware/disk.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/hardware/disk.h [iso-8859-1] Sat Nov 7 20:19:32 2015 @@ -78,7 +78,7 @@ BOOLEAN MountDisk(IN DISK_TYPE DiskType, IN ULONG DiskNumber, - IN PCSTR FileName, + IN PCWSTR FileName, IN BOOLEAN ReadOnly); BOOLEAN Modified: trunk/reactos/subsystems/mvdm/ntvdm/ntvdm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/ntvd… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/ntvdm.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/ntvdm.c [iso-8859-1] Sat Nov 7 20:19:32 2015 @@ -93,8 +93,8 @@ IN PVOID Context, IN PVOID EntryContext) { + BOOLEAN Success; PNTVDM_SETTINGS Settings = (PNTVDM_SETTINGS)Context; - UNICODE_STRING ValueString; ULONG DiskNumber = (ULONG)EntryContext; ASSERT(DiskNumber < ARRAYSIZE(Settings->FloppyDisks)); @@ -102,21 +102,20 @@ /* Check whether the Hard Disk entry was not already configured */ if (Settings->FloppyDisks[DiskNumber].Buffer != NULL) { - DPRINT1("Floppy Disk %d -- '%Z' already configured\n", DiskNumber, &Settings->FloppyDisks[DiskNumber]); + DPRINT1("Floppy Disk %d -- '%wZ' already configured\n", DiskNumber, &Settings->FloppyDisks[DiskNumber]); return STATUS_SUCCESS; } /* Check for the type of the value */ if (ValueType != REG_SZ) { - RtlInitEmptyAnsiString(&Settings->FloppyDisks[DiskNumber], NULL, 0); + RtlInitEmptyUnicodeString(&Settings->FloppyDisks[DiskNumber], NULL, 0); return STATUS_SUCCESS; } - /* Convert the UNICODE string to ANSI and store it */ - RtlInitEmptyUnicodeString(&ValueString, (PWCHAR)ValueData, ValueLength); - ValueString.Length = ValueString.MaximumLength; - RtlUnicodeStringToAnsiString(&Settings->FloppyDisks[DiskNumber], &ValueString, TRUE); + /* Initialize the string */ + Success = RtlCreateUnicodeString(&Settings->FloppyDisks[DiskNumber], (PCWSTR)ValueData); + ASSERT(Success); return STATUS_SUCCESS; } @@ -130,8 +129,8 @@ IN PVOID Context, IN PVOID EntryContext) { + BOOLEAN Success; PNTVDM_SETTINGS Settings = (PNTVDM_SETTINGS)Context; - UNICODE_STRING ValueString; ULONG DiskNumber = (ULONG)EntryContext; ASSERT(DiskNumber < ARRAYSIZE(Settings->HardDisks)); @@ -139,21 +138,20 @@ /* Check whether the Hard Disk entry was not already configured */ if (Settings->HardDisks[DiskNumber].Buffer != NULL) { - DPRINT1("Hard Disk %d -- '%Z' already configured\n", DiskNumber, &Settings->HardDisks[DiskNumber]); + DPRINT1("Hard Disk %d -- '%wZ' already configured\n", DiskNumber, &Settings->HardDisks[DiskNumber]); return STATUS_SUCCESS; } /* Check for the type of the value */ if (ValueType != REG_SZ) { - RtlInitEmptyAnsiString(&Settings->HardDisks[DiskNumber], NULL, 0); + RtlInitEmptyUnicodeString(&Settings->HardDisks[DiskNumber], NULL, 0); return STATUS_SUCCESS; } - /* Convert the UNICODE string to ANSI and store it */ - RtlInitEmptyUnicodeString(&ValueString, (PWCHAR)ValueData, ValueLength); - ValueString.Length = ValueString.MaximumLength; - RtlUnicodeStringToAnsiString(&Settings->HardDisks[DiskNumber], &ValueString, TRUE); + /* Initialize the string */ + Success = RtlCreateUnicodeString(&Settings->HardDisks[DiskNumber], (PCWSTR)ValueData); + ASSERT(Success); return STATUS_SUCCESS; } @@ -291,13 +289,13 @@ for (i = 0; i < ARRAYSIZE(Settings->FloppyDisks); ++i) { if (Settings->FloppyDisks[i].Buffer) - RtlFreeAnsiString(&Settings->FloppyDisks[i]); + RtlFreeUnicodeString(&Settings->FloppyDisks[i]); } for (i = 0; i < ARRAYSIZE(Settings->HardDisks); ++i) { if (Settings->HardDisks[i].Buffer) - RtlFreeAnsiString(&Settings->HardDisks[i]); + RtlFreeUnicodeString(&Settings->HardDisks[i]); } } Modified: trunk/reactos/subsystems/mvdm/ntvdm/ntvdm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/ntvd… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/ntvdm.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/ntvdm.h [iso-8859-1] Sat Nov 7 20:19:32 2015 @@ -74,8 +74,8 @@ { ANSI_STRING BiosFileName; ANSI_STRING RomFiles; - ANSI_STRING FloppyDisks[2]; - ANSI_STRING HardDisks[4]; + UNICODE_STRING FloppyDisks[2]; + UNICODE_STRING HardDisks[4]; } NTVDM_SETTINGS, *PNTVDM_SETTINGS; extern NTVDM_SETTINGS GlobalSettings;

9 years, 1 month

[hbelusca] 69839: Forgot this file.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sat Nov 7 20:07:51 2015 New Revision: 69839 URL: http://svn.reactos.org/svn/reactos?rev=69839&view=rev Log: Forgot this file. Modified: trunk/reactos/subsystems/mvdm/ntvdm/hardware/mouse.c Modified: trunk/reactos/subsystems/mvdm/ntvdm/hardware/mouse.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/hard… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/hardware/mouse.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/hardware/mouse.c [iso-8859-1] Sat Nov 7 20:07:51 2015 @@ -18,6 +18,9 @@ #include "clock.h" #include "video/svga.h" +/**/ +#include "../console/video.h" +/**/ /* PRIVATE VARIABLES **********************************************************/

9 years, 1 month

[hbelusca] 69838: [NTVDM] Start factoring out all code related to console-specific stuff (while leaving everything else in place). This is WIP (and the corresponding .c files are included where the...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sat Nov 7 20:07:12 2015 New Revision: 69838 URL: http://svn.reactos.org/svn/reactos?rev=69838&view=rev Log: [NTVDM] Start factoring out all code related to console-specific stuff (while leaving everything else in place). This is WIP (and the corresponding .c files are included where they are needed instead of being compiled, will be fixed later). Added: trunk/reactos/subsystems/mvdm/ntvdm/console/ (with props) trunk/reactos/subsystems/mvdm/ntvdm/console/console.c (with props) trunk/reactos/subsystems/mvdm/ntvdm/console/video.c (with props) trunk/reactos/subsystems/mvdm/ntvdm/console/video.h (with props) Modified: trunk/reactos/subsystems/mvdm/ntvdm/bios/vidbios.c trunk/reactos/subsystems/mvdm/ntvdm/dos/mouse32.c trunk/reactos/subsystems/mvdm/ntvdm/emulator.c trunk/reactos/subsystems/mvdm/ntvdm/hardware/video/svga.c trunk/reactos/subsystems/mvdm/ntvdm/hardware/video/svga.h trunk/reactos/subsystems/mvdm/ntvdm/ntvdm.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/subsystems/mvdm/ntvdm/bios/vidbios.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/bios… Added: trunk/reactos/subsystems/mvdm/ntvdm/console/console.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/cons… Added: trunk/reactos/subsystems/mvdm/ntvdm/console/video.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/cons… Added: trunk/reactos/subsystems/mvdm/ntvdm/console/video.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/cons… Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/mouse32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/dos/… Modified: trunk/reactos/subsystems/mvdm/ntvdm/emulator.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/emul… Modified: trunk/reactos/subsystems/mvdm/ntvdm/hardware/video/svga.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/hard… Modified: trunk/reactos/subsystems/mvdm/ntvdm/hardware/video/svga.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/hard… Modified: trunk/reactos/subsystems/mvdm/ntvdm/ntvdm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/ntvd…

9 years, 1 month

[ekohl] 69837: [USERENV] - GetProfilesDirectoryA: In case of success, return the length of the profiles directory. - GetProfilesDirectoryW: Set ERROR_INSUFFICIENT_BUFFER, if lpProfilesDir is NULL.

by ekohl＠svn.reactos.org

Author: ekohl Date: Sat Nov 7 19:47:24 2015 New Revision: 69837 URL: http://svn.reactos.org/svn/reactos?rev=69837&view=rev Log: [USERENV] - GetProfilesDirectoryA: In case of success, return the length of the profiles directory. - GetProfilesDirectoryW: Set ERROR_INSUFFICIENT_BUFFER, if lpProfilesDir is NULL. Modified: trunk/reactos/dll/win32/userenv/profile.c Modified: trunk/reactos/dll/win32/userenv/profile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/userenv/profile.… ============================================================================== --- trunk/reactos/dll/win32/userenv/profile.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/userenv/profile.c [iso-8859-1] Sat Nov 7 19:47:24 2015 @@ -687,14 +687,14 @@ lpcchSize); if (bResult) { - WideCharToMultiByte(CP_ACP, - 0, - lpBuffer, - -1, - lpProfileDir, - *lpcchSize, - NULL, - NULL); + bResult = WideCharToMultiByte(CP_ACP, + 0, + lpBuffer, + -1, + lpProfileDir, + *lpcchSize, + NULL, + NULL); } GlobalFree(lpBuffer); @@ -713,6 +713,7 @@ DWORD dwLength; HKEY hKey; LONG Error; + BOOL bRet = FALSE; if (!lpcchSize) { @@ -764,17 +765,22 @@ { if (*lpcchSize < dwLength) { - *lpcchSize = dwLength; SetLastError(ERROR_INSUFFICIENT_BUFFER); - return FALSE; - } - - wcscpy(lpProfilesDir, szProfilesPath); + } + else + { + wcscpy(lpProfilesDir, szProfilesPath); + bRet = TRUE; + } + } + else + { + SetLastError(ERROR_INSUFFICIENT_BUFFER); } *lpcchSize = dwLength; - return TRUE; + return bRet; }

9 years, 1 month

[akhaldi] 69836: [CMAKE] Properly pass arguments to the host tools phase. Fixes MSVC x64 build.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sat Nov 7 17:35:27 2015 New Revision: 69836 URL: http://svn.reactos.org/svn/reactos?rev=69836&view=rev Log: [CMAKE] Properly pass arguments to the host tools phase. Fixes MSVC x64 build. Modified: trunk/reactos/cmake/host-tools.cmake Modified: trunk/reactos/cmake/host-tools.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/host-tools.cmake?rev… ============================================================================== --- trunk/reactos/cmake/host-tools.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/host-tools.cmake [iso-8859-1] Sat Nov 7 17:35:27 2015 @@ -32,6 +32,6 @@ BUILD_ALWAYS 1 PREFIX host-tools EXCLUDE_FROM_ALL 1 - CMAKE_ARGS "-DNEW_STYLE_BUILD=1 -DARCH:STRING=${ARCH}" + CMAKE_ARGS "-DNEW_STYLE_BUILD=1;-DARCH:STRING=${ARCH}" INSTALL_COMMAND "" BUILD_BYPRODUCTS ${tools_binaries})

9 years, 1 month

[akhaldi] 69835: [CMAKE] Pass the architecture to host tools configure phase.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sat Nov 7 17:18:19 2015 New Revision: 69835 URL: http://svn.reactos.org/svn/reactos?rev=69835&view=rev Log: [CMAKE] Pass the architecture to host tools configure phase. Modified: trunk/reactos/cmake/host-tools.cmake Modified: trunk/reactos/cmake/host-tools.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/host-tools.cmake?rev… ============================================================================== --- trunk/reactos/cmake/host-tools.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/host-tools.cmake [iso-8859-1] Sat Nov 7 17:18:19 2015 @@ -32,6 +32,6 @@ BUILD_ALWAYS 1 PREFIX host-tools EXCLUDE_FROM_ALL 1 - CMAKE_ARGS "-DNEW_STYLE_BUILD=1" + CMAKE_ARGS "-DNEW_STYLE_BUILD=1 -DARCH:STRING=${ARCH}" INSTALL_COMMAND "" BUILD_BYPRODUCTS ${tools_binaries})

9 years, 1 month

← Newer
1
...
36
37
38
39
40
41
42
...
46
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs November 2015