Ros-diffs November 2015

ros-diffs@reactos.org

14 participants
457 discussions

[tfaber] 69824: [WS2_32_NEW] - Treat SO_OPENTYPE's value as a DWORD. Based on a patch by Peter Hater. CORE-10440
by tfaber＠svn.reactos.org 07 Nov '15

07 Nov '15

Author: tfaber Date: Sat Nov 7 08:49:15 2015 New Revision: 69824 URL: http://svn.reactos.org/svn/reactos?rev=69824&view=rev Log: [WS2_32_NEW] - Treat SO_OPENTYPE's value as a DWORD. Based on a patch by Peter Hater. CORE-10440 Modified: trunk/reactos/dll/win32/ws2_32_new/src/sockctrl.c Modified: trunk/reactos/dll/win32/ws2_32_new/src/sockctrl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32_new/src/s… ============================================================================== --- trunk/reactos/dll/win32/ws2_32_new/src/sockctrl.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32_new/src/sockctrl.c [iso-8859-1] Sat Nov 7 08:49:15 2015 @@ -275,7 +275,7 @@ Status = ERROR_SUCCESS; _SEH2_TRY { - if (!(optlen) || (*optlen < sizeof(INT))) + if (!(optlen) || (*optlen < sizeof(DWORD))) { /* Fail */ Status = SOCKET_ERROR; @@ -284,8 +284,8 @@ } /* Set the open type */ - *optval = (CHAR)Thread->OpenType; - *optlen = sizeof(INT); + *(DWORD*)optval = Thread->OpenType; + *optlen = sizeof(DWORD); } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { @@ -419,7 +419,7 @@ if (level == SOL_SOCKET && optname == SO_OPENTYPE) { /* Validate size */ - if (optlen < sizeof(INT)) + if (optlen < sizeof(DWORD)) { /* Fail */ SetLastError(WSAEFAULT); @@ -430,7 +430,7 @@ Status = ERROR_SUCCESS; _SEH2_TRY { - Thread->OpenType = *optval; + Thread->OpenType = *(DWORD*)optval; } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) {

1 0

[tfaber] 69823: [WS2_32_NEW] - Add missing SEH in getsockopt/setsockopt CORE-10440
by tfaber＠svn.reactos.org 07 Nov '15

07 Nov '15

Author: tfaber Date: Sat Nov 7 08:30:00 2015 New Revision: 69823 URL: http://svn.reactos.org/svn/reactos?rev=69823&view=rev Log: [WS2_32_NEW] - Add missing SEH in getsockopt/setsockopt CORE-10440 Modified: trunk/reactos/dll/win32/ws2_32_new/CMakeLists.txt trunk/reactos/dll/win32/ws2_32_new/inc/ws2_32.h trunk/reactos/dll/win32/ws2_32_new/src/sockctrl.c Modified: trunk/reactos/dll/win32/ws2_32_new/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32_new/CMake… ============================================================================== --- trunk/reactos/dll/win32/ws2_32_new/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32_new/CMakeLists.txt [iso-8859-1] Sat Nov 7 08:30:00 2015 @@ -51,7 +51,7 @@ ${CMAKE_CURRENT_BINARY_DIR}/ws2_32_new.def) set_module_type(ws2_32_new win32dll) +target_link_libraries(ws2_32_new ${PSEH_LIB}) add_importlibs(ws2_32_new user32 advapi32 dnsapi ws2help msvcrt kernel32 ntdll) add_pch(ws2_32_new inc/ws2_32.h SOURCE) -target_link_libraries(ws2_32_new wine) add_cd_file(TARGET ws2_32_new DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/dll/win32/ws2_32_new/inc/ws2_32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32_new/inc/w… ============================================================================== --- trunk/reactos/dll/win32/ws2_32_new/inc/ws2_32.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32_new/inc/ws2_32.h [iso-8859-1] Sat Nov 7 08:30:00 2015 @@ -28,6 +28,7 @@ #include <winuser.h> #include <ws2spi.h> #include <ndk/rtlfuncs.h> +#include <pseh/pseh2.h> /* Winsock Helper Header */ #include <ws2help.h> Modified: trunk/reactos/dll/win32/ws2_32_new/src/sockctrl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32_new/src/s… ============================================================================== --- trunk/reactos/dll/win32/ws2_32_new/src/sockctrl.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32_new/src/sockctrl.c [iso-8859-1] Sat Nov 7 08:30:00 2015 @@ -272,17 +272,29 @@ if ((level == SOL_SOCKET) && (optname == SO_OPENTYPE)) { /* Validate size */ - if (!(optlen) || (*optlen < sizeof(INT))) - { - /* Fail */ + Status = ERROR_SUCCESS; + _SEH2_TRY + { + if (!(optlen) || (*optlen < sizeof(INT))) + { + /* Fail */ + Status = SOCKET_ERROR; + SetLastError(WSAEFAULT); + _SEH2_LEAVE; + } + + /* Set the open type */ + *optval = (CHAR)Thread->OpenType; + *optlen = sizeof(INT); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + Status = SOCKET_ERROR; SetLastError(WSAEFAULT); - return SOCKET_ERROR; - } - - /* Set the open type */ - *optval = (CHAR)Thread->OpenType; - *optlen = sizeof(INT); - return ERROR_SUCCESS; + } + _SEH2_END; + + return Status; } /* Get the Socket Context */ @@ -292,27 +304,42 @@ if ((level == SOL_SOCKET) && (optname == SO_PROTOCOL_INFOA)) { /* Validate size and pointers */ - if(!(optval) || - !(optlen) || - (*optlen < sizeof(WSAPROTOCOL_INFOA))) + ErrorCode = NO_ERROR; + _SEH2_TRY { - /* Set return size */ - *optlen = sizeof(WSAPROTOCOL_INFOA); - + if (!(optval) || + !(optlen) || + (*optlen < sizeof(WSAPROTOCOL_INFOA))) + { + /* Set return size and error code */ + *optlen = sizeof(WSAPROTOCOL_INFOA); + ErrorCode = WSAEFAULT; + _SEH2_LEAVE; + } + + /* It worked. Save the values */ + OldOptLen = *optlen; + OldOptVal = optval; + + /* Hack them so WSP will know how to deal with it */ + *optlen = sizeof(WSAPROTOCOL_INFOW); + optval = (PCHAR)&ProtocolInfo; + optname = SO_PROTOCOL_INFOW; + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + ErrorCode = WSAEFAULT; + } + _SEH2_END; + + /* Did we encounter invalid parameters? */ + if (ErrorCode != NO_ERROR) + { /* Dereference the socket and fail */ WsSockDereference(Socket); - SetLastError(WSAEFAULT); + SetLastError(ErrorCode); return SOCKET_ERROR; } - - /* It worked. Save the values */ - OldOptLen = *optlen; - OldOptVal = optval; - - /* Hack them so WSP will know how to deal with it */ - *optlen = sizeof(WSAPROTOCOL_INFOW); - optval = (PCHAR)&ProtocolInfo; - optname = SO_PROTOCOL_INFOW; } /* Make the call */ @@ -338,7 +365,15 @@ OldOptVal); /* Return the length */ - *optlen = OldOptLen; + _SEH2_TRY + { + *optlen = OldOptLen; + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + ErrorCode = WSAEFAULT; + } + _SEH2_END; /* Return success if this worked */ if (ErrorCode == ERROR_SUCCESS) return Status; @@ -392,8 +427,19 @@ } /* Set the open type */ - Thread->OpenType = *optval; - return ERROR_SUCCESS; + Status = ERROR_SUCCESS; + _SEH2_TRY + { + Thread->OpenType = *optval; + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + Status = SOCKET_ERROR; + SetLastError(WSAEFAULT); + } + _SEH2_END; + + return Status; } /* Get the Socket Context */

1 0

[hbelusca] 69822: [NTVDM]: Improve the console resize algorithm.
by hbelusca＠svn.reactos.org 06 Nov '15

06 Nov '15

Author: hbelusca Date: Fri Nov 6 23:59:42 2015 New Revision: 69822 URL: http://svn.reactos.org/svn/reactos?rev=69822&view=rev Log: [NTVDM]: Improve the console resize algorithm. Modified: trunk/reactos/subsystems/mvdm/ntvdm/hardware/video/svga.c 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] Fri Nov 6 23:59:42 2015 @@ -460,6 +460,93 @@ VgaUpdateTextCursor(); } +static VOID ResizeTextConsole(PCOORD Resolution, PSMALL_RECT WindowSize OPTIONAL) +{ + BOOL Success; + SMALL_RECT ConRect; + SHORT oldWidth, oldHeight; + + /* + * Use this trick to effectively resize the console buffer and window, + * because: + * - SetConsoleScreenBufferSize fails if the new console screen buffer size + * is smaller than the current console window size, and: + * - SetConsoleWindowInfo fails if the new console window size is larger + * than the current console screen buffer size. + */ + + + /* Retrieve the latest console information */ + GetConsoleScreenBufferInfo(TextConsoleBuffer, &ConsoleInfo); + + oldWidth = ConsoleInfo.srWindow.Right - ConsoleInfo.srWindow.Left + 1; + oldHeight = ConsoleInfo.srWindow.Bottom - ConsoleInfo.srWindow.Top + 1; + + /* + * If the current console window is too large to hold the full contents + * of the new screen buffer, resize it first. + */ + if (oldWidth > Resolution->X || oldHeight > Resolution->Y) + { + // + // NOTE: This is not a problem if we move the window back to (0,0) + // because when we resize the screen buffer, the window will move back + // to where the cursor is. Or, if the screen buffer is not resized, + // when we readjust again the window, we will move back to a correct + // position. This is what we wanted after all... + // + + ConRect.Left = ConRect.Top = 0; + ConRect.Right = ConRect.Left + min(oldWidth , Resolution->X) - 1; + ConRect.Bottom = ConRect.Top + min(oldHeight, Resolution->Y) - 1; + + Success = SetConsoleWindowInfo(TextConsoleBuffer, TRUE, &ConRect); + if (!Success) DPRINT1("(resize) SetConsoleWindowInfo(1) failed with error %d\n", GetLastError()); + } + + /* Resize the screen buffer if needed */ + if (Resolution->X != ConsoleInfo.dwSize.X || Resolution->Y != ConsoleInfo.dwSize.Y) + { + /* + * SetConsoleScreenBufferSize automatically takes into account the current + * cursor position when it computes starting which row it should copy text + * when resizing the sceenbuffer, and scrolls the console window such that + * the cursor is placed in it again. We therefore do not need to care about + * the cursor position and do the maths ourselves. + */ + Success = SetConsoleScreenBufferSize(TextConsoleBuffer, *Resolution); + if (!Success) DPRINT1("(resize) SetConsoleScreenBufferSize failed with error %d\n", GetLastError()); + + /* + * Setting a new screen buffer size can change other information, + * so update the saved console information. + */ + GetConsoleScreenBufferInfo(TextConsoleBuffer, &ConsoleInfo); + } + + if (!WindowSize) + { + ConRect.Left = 0; + ConRect.Right = ConRect.Left + Resolution->X - 1; + ConRect.Bottom = max(ConsoleInfo.dwCursorPosition.Y, Resolution->Y - 1); + ConRect.Top = ConRect.Bottom - Resolution->Y + 1; + + // NOTE: We may take ConsoleInfo.dwMaximumWindowSize into account + } + else + { + ConRect.Left = ConRect.Top = 0; + ConRect.Right = ConRect.Left + WindowSize->Right - WindowSize->Left; + ConRect.Bottom = ConRect.Top + WindowSize->Bottom - WindowSize->Top ; + } + + Success = SetConsoleWindowInfo(TextConsoleBuffer, TRUE, &ConRect); + if (!Success) DPRINT1("(resize) SetConsoleWindowInfo(2) failed with error %d\n", GetLastError()); + + /* Update the saved console information */ + GetConsoleScreenBufferInfo(TextConsoleBuffer, &ConsoleInfo); +} + static BOOL VgaAttachToConsoleInternal(PCOORD Resolution) { BOOL Success; @@ -484,7 +571,7 @@ * Windows 2k3 winsrv.dll calls NtVdmControl(VdmQueryVdmProcess == 14, &ConsoleHandle); * in the two following APIs: * SrvRegisterConsoleVDM (corresponding Win32 API: RegisterConsoleVDM) - * SrvVDMConsoleOperation (corresponding Win32 API: ??) + * SrvVDMConsoleOperation (corresponding Win32 API: VDMConsoleOperation) * to check whether the current process is a VDM process, and fails otherwise * with the error 0xC0000022 (STATUS_ACCESS_DENIED). * @@ -520,28 +607,8 @@ ASSERT(CharBuff); #endif - /* Retrieve the latest console information */ - GetConsoleScreenBufferInfo(TextConsoleBuffer, &ConsoleInfo); - /* Resize the console */ - ConRect.Left = 0; - ConRect.Right = ConRect.Left + Resolution->X - 1; - ConRect.Bottom = max(ConsoleInfo.dwCursorPosition.Y, Resolution->Y - 1); - ConRect.Top = ConRect.Bottom - Resolution->Y + 1; - /* - * Use this trick to effectively resize the console buffer and window, - * because: - * - SetConsoleScreenBufferSize fails if the new console screen buffer size - * is smaller than the current console window size, and: - * - SetConsoleWindowInfo fails if the new console window size is larger - * than the current console screen buffer size. - */ - Success = SetConsoleScreenBufferSize(TextConsoleBuffer, *Resolution); - DPRINT1("(attach) SetConsoleScreenBufferSize(1) %s with error %d\n", Success ? "succeeded" : "failed", GetLastError()); - Success = SetConsoleWindowInfo(TextConsoleBuffer, TRUE, &ConRect); - DPRINT1("(attach) SetConsoleWindowInfo %s with error %d\n", Success ? "succeeded" : "failed", GetLastError()); - Success = SetConsoleScreenBufferSize(TextConsoleBuffer, *Resolution); - DPRINT1("(attach) SetConsoleScreenBufferSize(2) %s with error %d\n", Success ? "succeeded" : "failed", GetLastError()); + ResizeTextConsole(Resolution, NULL); /* Update the saved console information */ GetConsoleScreenBufferInfo(TextConsoleBuffer, &ConsoleInfo); @@ -1095,7 +1162,7 @@ * we get the default palette and our external behaviour is * just like Windows' one), but it should success on ReactOS * (so that we get console palette changes even for text-mode - * screen-buffers, which is a new feature on ReactOS). + * screen buffers, which is a new feature on ReactOS). */ SetConsolePalette(TextConsoleBuffer, TextPaletteHandle, @@ -1542,7 +1609,7 @@ Position.X = (SHORT)(Location % ScanlineSize); Position.Y = (SHORT)(Location / ScanlineSize); - DPRINT("VgaUpdateTextCursor: X = %d ; Y = %d\n", Position.X, Position.Y); + DPRINT("VgaUpdateTextCursor: (X = %d ; Y = %d)\n", Position.X, Position.Y); /* Update the physical cursor */ SetConsoleCursorInfo(TextConsoleBuffer, &CursorInfo); @@ -2338,7 +2405,42 @@ VOID ScreenEventHandler(PWINDOW_BUFFER_SIZE_RECORD ScreenEvent) { - DPRINT1("Screen events not handled\n"); + /* + * This function monitors and allows console resizings only if they are triggered by us. + * User-driven resizings via the console properties, or programmatical console resizings + * made by explicit calls to SetConsoleScreenBufferSize by external applications, are forbidden. + * In that case only a console window resize is done in case the size is reduced. + * This protection is enabled in CONSRV side when NTVDM registers as a VDM to CONSRV, + * but we also implement it there in case we are running in STANDALONE mode without + * CONSRV registration. + * + * The only potential problem we have is that, when this handler is called, + * the console is already resized. In case this corresponds to a forbidden resize, + * we resize the console back to its original size from inside the handler. + * This will trigger a recursive call to the handler, that should be detected. + */ + + if (CurrResolution.X == ScreenEvent->dwSize.X && + CurrResolution.Y == ScreenEvent->dwSize.Y) + { + /* Allowed resize, we are OK */ + return; + } + + DPRINT1("ScreenEventHandler - Detected forbidden resize! Reset console screenbuffer size back to (X = %d ; Y = %d)\n", CurrResolution.X, CurrResolution.Y); + + // FIXME: If we're detaching, then stop monitoring for changes!! + + /* Restore the original console size */ + ResizeTextConsole(&CurrResolution, NULL); + + /* Force refresh of all the screen */ + NeedsUpdate = TRUE; + UpdateRectangle.Left = 0; + UpdateRectangle.Top = 0; + UpdateRectangle.Right = CurrResolution.X; + UpdateRectangle.Bottom = CurrResolution.Y; + VgaRefreshDisplay(); } BOOL VgaAttachToConsole(VOID) @@ -2384,10 +2486,6 @@ VOID VgaDetachFromConsole(VOID) { - BOOL Success; - - SMALL_RECT ConRect; - VgaDetachFromConsoleInternal(); /* Save the screen state */ @@ -2401,16 +2499,7 @@ ConsoleFramebuffer = NULL; /* Restore the original console size */ - ConRect.Left = ConRect.Top = 0; - ConRect.Right = ConRect.Left + OrgConsoleBufferInfo.srWindow.Right - OrgConsoleBufferInfo.srWindow.Left; - ConRect.Bottom = ConRect.Top + OrgConsoleBufferInfo.srWindow.Bottom - OrgConsoleBufferInfo.srWindow.Top ; - /* See the following trick explanation in VgaAttachToConsoleInternal */ - Success = SetConsoleScreenBufferSize(TextConsoleBuffer, OrgConsoleBufferInfo.dwSize); - DPRINT1("(detach) SetConsoleScreenBufferSize(1) %s with error %d\n", Success ? "succeeded" : "failed", GetLastError()); - Success = SetConsoleWindowInfo(TextConsoleBuffer, TRUE, &ConRect); - DPRINT1("(detach) SetConsoleWindowInfo %s with error %d\n", Success ? "succeeded" : "failed", GetLastError()); - Success = SetConsoleScreenBufferSize(TextConsoleBuffer, OrgConsoleBufferInfo.dwSize); - DPRINT1("(detach) SetConsoleScreenBufferSize(2) %s with error %d\n", Success ? "succeeded" : "failed", GetLastError()); + ResizeTextConsole(&OrgConsoleBufferInfo.dwSize, &OrgConsoleBufferInfo.srWindow); /* Restore the original cursor shape */ SetConsoleCursorInfo(TextConsoleBuffer, &OrgConsoleCursorInfo);

1 0

[akhaldi] 69821: [WIN32K] Do not truncate the result of the color translation to 8 bits in DIB_24BPP_TransparentBlt. Fixes icon drawing at 24 bpp. Brought to you by Vort. CORE-10469
by akhaldi＠svn.reactos.org 06 Nov '15

06 Nov '15

Author: akhaldi Date: Fri Nov 6 22:07:49 2015 New Revision: 69821 URL: http://svn.reactos.org/svn/reactos?rev=69821&view=rev Log: [WIN32K] Do not truncate the result of the color translation to 8 bits in DIB_24BPP_TransparentBlt. Fixes icon drawing at 24 bpp. Brought to you by Vort. CORE-10469 Modified: trunk/reactos/win32ss/gdi/dib/dib24bpp.c Modified: trunk/reactos/win32ss/gdi/dib/dib24bpp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/dib/dib24bpp.c… ============================================================================== --- trunk/reactos/win32ss/gdi/dib/dib24bpp.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/dib/dib24bpp.c [iso-8859-1] Fri Nov 6 22:07:49 2015 @@ -431,7 +431,7 @@ Source = DIB_GetSourceIndex(SourceSurf, SourceX, SourceY); if(Source != iTransColor) { - Dest = (BYTE)XLATEOBJ_iXlate(ColorTranslation, Source) & 0xFFFFFF; + Dest = XLATEOBJ_iXlate(ColorTranslation, Source) & 0xFFFFFF; *(PUSHORT)(DestBits) = Dest & 0xFFFF; *(DestBits + 2) = (BYTE)(Dest >> 16); }

1 0

[tkreuzer] 69820: [INTL] Split a too long text resource into 2 in Italian resource. Fixes an MSVC warning / truncated text. Translators, please check https://build.reactos.org/builders/Build%20MSVC...
by tkreuzer＠svn.reactos.org 06 Nov '15

06 Nov '15

Author: tkreuzer Date: Fri Nov 6 22:00:28 2015 New Revision: 69820 URL: http://svn.reactos.org/svn/reactos?rev=69820&view=rev Log: [INTL] Split a too long text resource into 2 in Italian resource. Fixes an MSVC warning / truncated text. Translators, please check https://build.reactos.org/builders/Build%20MSVC_x86/builds/3402/steps/compi… for warning RC4206 and help fixing these, thanks. Modified: trunk/reactos/dll/cpl/intl/lang/it-IT.rc Modified: trunk/reactos/dll/cpl/intl/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/lang/it-IT.rc… ============================================================================== --- trunk/reactos/dll/cpl/intl/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/intl/lang/it-IT.rc [iso-8859-1] Fri Nov 6 22:00:28 2015 @@ -49,7 +49,8 @@ BEGIN GROUPBOX "Lingua per programmi non Unicode", -1, 5, 5, 234, 90 COMBOBOX IDC_LANGUAGE_COMBO, 14, 75, 217, 160, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | CBS_SORT - LTEXT "In base a questa impostazione di sistema Ã¨ possibile visualizzare menÃ¹ e finestre di dialogo di programmi non Unicode nella lingua di origine. I programmi Unicode resteranno invariati, ma l'impostazione verrÃ applicata per tutti gli utenti che utilizzano il computer.", -1, 14, 18, 223, 33 //TOO LONG, MAX 256 CHARS ALLOWED + LTEXT "In base a questa impostazione di sistema Ã¨ possibile visualizzare menÃ¹ e finestre di dialogo di programmi non Unicode nella lingua di origine.", -1, 14, 18, 223, 17 + LTEXT "I programmi Unicode resteranno invariati, ma l\'impostazione verrÃ applicata per tutti gli utenti che utilizzano il computer.", -1, 14, 35, 223, 17 LTEXT "Selezionare una lingua per i programmi non Unicode da utilizzare:", -1, 14, 55, 223, 18 GROUPBOX "Tabella di conversione di tabelle codici", -1, 5, 101, 234, 88 CONTROL "", IDC_CONV_TABLES, "SysListView32", LVS_REPORT | LVS_SORTASCENDING | LVS_NOCOLUMNHEADER | WS_BORDER | WS_TABSTOP, 14, 114, 217, 70

1 0

[jimtabor] 69819: [NtGdi] - Add function for NtUser.
by jimtabor＠svn.reactos.org 06 Nov '15

06 Nov '15

Author: jimtabor Date: Fri Nov 6 13:34:58 2015 New Revision: 69819 URL: http://svn.reactos.org/svn/reactos?rev=69819&view=rev Log: [NtGdi] - Add function for NtUser. Modified: trunk/reactos/win32ss/gdi/ntgdi/dc.h trunk/reactos/win32ss/gdi/ntgdi/dcutil.c Modified: trunk/reactos/win32ss/gdi/ntgdi/dc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/dc.h?rev… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/dc.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/dc.h [iso-8859-1] Fri Nov 6 13:34:58 2015 @@ -179,6 +179,7 @@ int FASTCALL GreGetBkMode(HDC); int FASTCALL GreGetMapMode(HDC); COLORREF FASTCALL GreGetTextColor(HDC); +COLORREF FASTCALL GreGetBkColor(HDC); COLORREF FASTCALL IntSetDCBrushColor(HDC,COLORREF); COLORREF FASTCALL IntSetDCPenColor(HDC,COLORREF); int FASTCALL GreGetGraphicsMode(HDC); Modified: trunk/reactos/win32ss/gdi/ntgdi/dcutil.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/dcutil.c… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/dcutil.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/dcutil.c [iso-8859-1] Fri Nov 6 13:34:58 2015 @@ -44,6 +44,21 @@ lBkMode = dc->pdcattr->lBkMode; DC_UnlockDc(dc); return lBkMode; +} + +COLORREF FASTCALL +GreGetBkColor(HDC hdc) +{ + PDC dc; + COLORREF crBk; + if (!(dc = DC_LockDc(hdc))) + { + EngSetLastError(ERROR_INVALID_HANDLE); + return CLR_INVALID; + } + crBk = dc->pdcattr->ulBackgroundClr; + DC_UnlockDc(dc); + return crBk; } int FASTCALL

1 0

[jimtabor] 69818: [Win32k] - Fix use after free crash in send messages timeout tests. See CORE-10482 - Dedicated to Thomas Faber.
by jimtabor＠svn.reactos.org 06 Nov '15

06 Nov '15

Author: jimtabor Date: Fri Nov 6 09:37:30 2015 New Revision: 69818 URL: http://svn.reactos.org/svn/reactos?rev=69818&view=rev Log: [Win32k] - Fix use after free crash in send messages timeout tests. See CORE-10482 - Dedicated to Thomas Faber. Modified: trunk/reactos/win32ss/user/ntuser/msgqueue.c Modified: trunk/reactos/win32ss/user/ntuser/msgqueue.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/msgque… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/msgqueue.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/msgqueue.c [iso-8859-1] Fri Nov 6 09:37:30 2015 @@ -778,7 +778,7 @@ KeInitializeEvent(Message->pkCompletionEvent, NotificationEvent, FALSE); } SendMsgCount++; - //ERR("AUM pti %p msg %p\n",PsGetCurrentThreadWin32Thread(),Message); + TRACE("AUM pti %p msg %p\n",PsGetCurrentThreadWin32Thread(),Message); return Message; } @@ -2226,6 +2226,12 @@ else if ( pti == CurrentSentMessage->ptiSender || pti == CurrentSentMessage->ptiCallBackSender ) { + // Determine whether this message is being processed or not. + if ((CurrentSentMessage->flags & (SMF_RECEIVERBUSY|SMF_RECEIVEDMESSAGE)) != SMF_RECEIVEDMESSAGE) + { + CurrentSentMessage->flags |= SMF_RECEIVERFREE; + } + if (!(CurrentSentMessage->flags & SMF_RECEIVERFREE)) {

1 0

[akhaldi] 69817: [FONTS] Marlett font improvements by dsp8195. CORE-9115
by akhaldi＠svn.reactos.org 05 Nov '15

05 Nov '15

Author: akhaldi Date: Thu Nov 5 20:38:34 2015 New Revision: 69817 URL: http://svn.reactos.org/svn/reactos?rev=69817&view=rev Log: [FONTS] Marlett font improvements by dsp8195. CORE-9115 Modified: trunk/reactos/media/fonts/Marlett.ttf Modified: trunk/reactos/media/fonts/Marlett.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/Marlett.ttf?re… ============================================================================== Binary files - no diff available.

1 0

[akhaldi] 69816: [WIN32SS::DRIVERS] Improve the FILE header section. Brought to you by Adam Stachowicz. CORE-10114
by akhaldi＠svn.reactos.org 05 Nov '15

05 Nov '15

Author: akhaldi Date: Thu Nov 5 18:07:00 2015 New Revision: 69816 URL: http://svn.reactos.org/svn/reactos?rev=69816&view=rev Log: [WIN32SS::DRIVERS] Improve the FILE header section. Brought to you by Adam Stachowicz. CORE-10114 Modified: trunk/reactos/win32ss/drivers/displays/framebuf_new/debug.c trunk/reactos/win32ss/drivers/displays/framebuf_new/debug.h trunk/reactos/win32ss/drivers/displays/framebuf_new/driver.h trunk/reactos/win32ss/drivers/displays/framebuf_new/enable.c trunk/reactos/win32ss/drivers/displays/framebuf_new/palette.c trunk/reactos/win32ss/drivers/displays/framebuf_new/pointer.c trunk/reactos/win32ss/drivers/displays/framebuf_new/screen.c trunk/reactos/win32ss/drivers/displays/vga/main/enable.c trunk/reactos/win32ss/drivers/displays/vga/objects/bitblt.c trunk/reactos/win32ss/drivers/displays/vga/objects/copybits.c trunk/reactos/win32ss/drivers/displays/vga/objects/lineto.c trunk/reactos/win32ss/drivers/displays/vga/objects/offscreen.c trunk/reactos/win32ss/drivers/displays/vga/objects/paint.c trunk/reactos/win32ss/drivers/displays/vga/objects/pointer.c trunk/reactos/win32ss/drivers/displays/vga/objects/screen.c trunk/reactos/win32ss/drivers/displays/vga/objects/transblt.c trunk/reactos/win32ss/drivers/displays/vga/vgavideo/vgavideo.c trunk/reactos/win32ss/drivers/displays/vga_new/debug.c trunk/reactos/win32ss/drivers/displays/vga_new/debug.h trunk/reactos/win32ss/drivers/displays/vga_new/driver.h trunk/reactos/win32ss/drivers/displays/vga_new/enable.c trunk/reactos/win32ss/drivers/displays/vga_new/palette.c trunk/reactos/win32ss/drivers/displays/vga_new/screen.c trunk/reactos/win32ss/drivers/font/ftfd/rosglue.c trunk/reactos/win32ss/drivers/miniport/vga_new/cmdcnst.h trunk/reactos/win32ss/drivers/miniport/vga_new/modeset.c trunk/reactos/win32ss/drivers/miniport/vga_new/vbe.c trunk/reactos/win32ss/drivers/miniport/vga_new/vbe.h trunk/reactos/win32ss/drivers/miniport/vga_new/vbemodes.c trunk/reactos/win32ss/drivers/miniport/vga_new/vga.c trunk/reactos/win32ss/drivers/miniport/vga_new/vga.h trunk/reactos/win32ss/drivers/miniport/vga_new/vgadata.c trunk/reactos/win32ss/drivers/miniport/vmx_svga/precomp.h trunk/reactos/win32ss/drivers/miniport/vmx_svga/vmx_regs.h trunk/reactos/win32ss/drivers/miniport/vmx_svga/vmx_svga.c trunk/reactos/win32ss/drivers/videoprt/dma.c trunk/reactos/win32ss/drivers/videoprt/event.c Modified: trunk/reactos/win32ss/drivers/displays/framebuf_new/debug.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/drivers/displays/f… ============================================================================== --- trunk/reactos/win32ss/drivers/displays/framebuf_new/debug.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/drivers/displays/framebuf_new/debug.c [iso-8859-1] Thu Nov 5 18:07:00 2015 @@ -1,7 +1,7 @@ /* * PROJECT: ReactOS Framebuffer Display Driver * LICENSE: Microsoft NT4 DDK Sample Code License - * FILE: boot/drivers/video/displays/framebuf/debug.c + * FILE: win32ss/drivers/displays/framebuf_new/debug.c * PURPOSE: Debug Support * PROGRAMMERS: Copyright (c) 1992-1995 Microsoft Corporation */ Modified: trunk/reactos/win32ss/drivers/displays/framebuf_new/debug.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/drivers/displays/f… ============================================================================== --- trunk/reactos/win32ss/drivers/displays/framebuf_new/debug.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/drivers/displays/framebuf_new/debug.h [iso-8859-1] Thu Nov 5 18:07:00 2015 @@ -1,7 +1,7 @@ /* * PROJECT: ReactOS Framebuffer Display Driver * LICENSE: Microsoft NT4 DDK Sample Code License - * FILE: boot/drivers/video/displays/framebuf/debug.h + * FILE: win32ss/drivers/displays/framebuf_new/debug.h * PURPOSE: Debug Support Header * PROGRAMMERS: Copyright (c) 1992-1995 Microsoft Corporation */ Modified: trunk/reactos/win32ss/drivers/displays/framebuf_new/driver.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/drivers/displays/f… ============================================================================== --- trunk/reactos/win32ss/drivers/displays/framebuf_new/driver.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/drivers/displays/framebuf_new/driver.h [iso-8859-1] Thu Nov 5 18:07:00 2015 @@ -1,7 +1,7 @@ /* * PROJECT: ReactOS Framebuffer Display Driver * LICENSE: Microsoft NT4 DDK Sample Code License - * FILE: boot/drivers/video/displays/framebuf/driver.h + * FILE: win32ss/drivers/displays/framebuf_new/driver.h * PURPOSE: Main Driver Header File * PROGRAMMERS: Copyright (c) 1992-1995 Microsoft Corporation * ReactOS Portable Systems Group Modified: trunk/reactos/win32ss/drivers/displays/framebuf_new/enable.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/drivers/displays/f… ============================================================================== --- trunk/reactos/win32ss/drivers/displays/framebuf_new/enable.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/drivers/displays/framebuf_new/enable.c [iso-8859-1] Thu Nov 5 18:07:00 2015 @@ -1,7 +1,7 @@ /* * PROJECT: ReactOS Framebuffer Display Driver * LICENSE: Microsoft NT4 DDK Sample Code License - * FILE: boot/drivers/video/displays/framebuf/enable.c + * FILE: win32ss/drivers/displays/framebuf_new/enable.c * PURPOSE: Main Driver Initialization and PDEV Enabling * PROGRAMMERS: Copyright (c) 1992-1995 Microsoft Corporation * ReactOS Portable Systems Group Modified: trunk/reactos/win32ss/drivers/displays/framebuf_new/palette.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/drivers/displays/f… ============================================================================== --- trunk/reactos/win32ss/drivers/displays/framebuf_new/palette.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/drivers/displays/framebuf_new/palette.c [iso-8859-1] Thu Nov 5 18:07:00 2015 @@ -1,7 +1,7 @@ /* * PROJECT: ReactOS Framebuffer Display Driver * LICENSE: Microsoft NT4 DDK Sample Code License - * FILE: boot/drivers/video/displays/framebuf/palette.c + * FILE: win32ss/drivers/displays/framebuf_new/palette.c * PURPOSE: Palette Support * PROGRAMMERS: Copyright (c) 1992-1995 Microsoft Corporation */ Modified: trunk/reactos/win32ss/drivers/displays/framebuf_new/pointer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/drivers/displays/f… ============================================================================== --- trunk/reactos/win32ss/drivers/displays/framebuf_new/pointer.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/drivers/displays/framebuf_new/pointer.c [iso-8859-1] Thu Nov 5 18:07:00 2015 @@ -1,7 +1,7 @@ /* * PROJECT: ReactOS Framebuffer Display Driver * LICENSE: Microsoft NT4 DDK Sample Code License - * FILE: boot/drivers/video/displays/framebuf/pointer.c + * FILE: win32ss/drivers/displays/framebuf_new/pointer.c * PURPOSE: Hardware Pointer Support * PROGRAMMERS: Copyright (c) 1992-1995 Microsoft Corporation */ Modified: trunk/reactos/win32ss/drivers/displays/framebuf_new/screen.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/drivers/displays/f… ============================================================================== --- trunk/reactos/win32ss/drivers/displays/framebuf_new/screen.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/drivers/displays/framebuf_new/screen.c [iso-8859-1] Thu Nov 5 18:07:00 2015 @@ -1,7 +1,7 @@ /* * PROJECT: ReactOS Framebuffer Display Driver * LICENSE: Microsoft NT4 DDK Sample Code License - * FILE: boot/drivers/video/displays/framebuf/screen.c + * FILE: win32ss/drivers/displays/framebuf_new/screen.c * PURPOSE: Surface, Screen and PDEV support/initialization * PROGRAMMERS: Copyright (c) 1992-1995 Microsoft Corporation * ReactOS Portable Systems Group Modified: trunk/reactos/win32ss/drivers/displays/vga/main/enable.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/drivers/displays/v… ============================================================================== --- trunk/reactos/win32ss/drivers/displays/vga/main/enable.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/drivers/displays/vga/main/enable.c [iso-8859-1] Thu Nov 5 18:07:00 2015 @@ -1,7 +1,7 @@ /* * PROJECT: ReactOS VGA display driver * LICENSE: GPL - See COPYING in the top level directory - * FILE: drivers/video/displays/vga/main/enable.c + * FILE: win32ss/drivers/displays/vga/main/enable.c * PURPOSE: * PROGRAMMERS: */ Modified: trunk/reactos/win32ss/drivers/displays/vga/objects/bitblt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/drivers/displays/v… ============================================================================== --- trunk/reactos/win32ss/drivers/displays/vga/objects/bitblt.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/drivers/displays/vga/objects/bitblt.c [iso-8859-1] Thu Nov 5 18:07:00 2015 @@ -1,7 +1,7 @@ /* * PROJECT: ReactOS VGA display driver * LICENSE: GPL - See COPYING in the top level directory - * FILE: drivers/video/displays/vga/objects/bitblt.c + * FILE: win32ss/drivers/displays/vga/objects/bitblt.c * PURPOSE: * PROGRAMMERS: */ Modified: trunk/reactos/win32ss/drivers/displays/vga/objects/copybits.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/drivers/displays/v… ============================================================================== --- trunk/reactos/win32ss/drivers/displays/vga/objects/copybits.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/drivers/displays/vga/objects/copybits.c [iso-8859-1] Thu Nov 5 18:07:00 2015 @@ -1,7 +1,7 @@ /* * PROJECT: ReactOS VGA display driver * LICENSE: GPL - See COPYING in the top level directory - * FILE: drivers/video/displays/vga/objects/copybits.c + * FILE: win32ss/drivers/displays/vga/objects/copybits.c * PURPOSE: * PROGRAMMERS: */ Modified: trunk/reactos/win32ss/drivers/displays/vga/objects/lineto.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/drivers/displays/v… ============================================================================== --- trunk/reactos/win32ss/drivers/displays/vga/objects/lineto.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/drivers/displays/vga/objects/lineto.c [iso-8859-1] Thu Nov 5 18:07:00 2015 @@ -1,7 +1,7 @@ /* * PROJECT: ReactOS VGA display driver * LICENSE: GPL - See COPYING in the top level directory - * FILE: drivers/video/displays/vga/objects/lineto.c + * FILE: win32ss/drivers/displays/vga/objects/lineto.c * PURPOSE: * PROGRAMMERS: Copyright (C) 1998-2003 ReactOS Team */ Modified: trunk/reactos/win32ss/drivers/displays/vga/objects/offscreen.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/drivers/displays/v… ============================================================================== --- trunk/reactos/win32ss/drivers/displays/vga/objects/offscreen.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/drivers/displays/vga/objects/offscreen.c [iso-8859-1] Thu Nov 5 18:07:00 2015 @@ -1,7 +1,7 @@ /* * PROJECT: ReactOS VGA display driver * LICENSE: GPL - See COPYING in the top level directory - * FILE: drivers/video/displays/vga/objects/offscreen.c + * FILE: win32ss/drivers/displays/vga/objects/offscreen.c * PURPOSE: Manages off-screen video memory * PROGRAMMERS: Copyright (C) 1998-2001 ReactOS Team */ Modified: trunk/reactos/win32ss/drivers/displays/vga/objects/paint.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/drivers/displays/v… ============================================================================== --- trunk/reactos/win32ss/drivers/displays/vga/objects/paint.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/drivers/displays/vga/objects/paint.c [iso-8859-1] Thu Nov 5 18:07:00 2015 @@ -1,7 +1,7 @@ /* * PROJECT: ReactOS VGA display driver * LICENSE: GPL - See COPYING in the top level directory - * FILE: drivers/video/displays/vga/objects/paint.c + * FILE: win32ss/drivers/displays/vga/objects/paint.c * PURPOSE: * PROGRAMMERS: */ Modified: trunk/reactos/win32ss/drivers/displays/vga/objects/pointer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/drivers/displays/v… ============================================================================== --- trunk/reactos/win32ss/drivers/displays/vga/objects/pointer.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/drivers/displays/vga/objects/pointer.c [iso-8859-1] Thu Nov 5 18:07:00 2015 @@ -1,7 +1,7 @@ /* * PROJECT: ReactOS VGA display driver * LICENSE: GPL - See COPYING in the top level directory - * FILE: drivers/video/displays/vga/objects/pointer.c + * FILE: win32ss/drivers/displays/vga/objects/pointer.c * PURPOSE: Draws the mouse pointer * PROGRAMMERS: Copyright (C) 1998-2001 ReactOS Team */ Modified: trunk/reactos/win32ss/drivers/displays/vga/objects/screen.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/drivers/displays/v… ============================================================================== --- trunk/reactos/win32ss/drivers/displays/vga/objects/screen.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/drivers/displays/vga/objects/screen.c [iso-8859-1] Thu Nov 5 18:07:00 2015 @@ -1,7 +1,7 @@ /* * PROJECT: ReactOS VGA display driver * LICENSE: GPL - See COPYING in the top level directory - * FILE: drivers/video/displays/vga/objects/screen.c + * FILE: win32ss/drivers/displays/vga/objects/screen.c * PURPOSE: * PROGRAMMERS: */ Modified: trunk/reactos/win32ss/drivers/displays/vga/objects/transblt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/drivers/displays/v… ============================================================================== --- trunk/reactos/win32ss/drivers/displays/vga/objects/transblt.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/drivers/displays/vga/objects/transblt.c [iso-8859-1] Thu Nov 5 18:07:00 2015 @@ -1,7 +1,7 @@ /* * PROJECT: ReactOS VGA display driver * LICENSE: GPL - See COPYING in the top level directory - * FILE: drivers/video/displays/vga/objects/transblt.c + * FILE: win32ss/drivers/displays/vga/objects/transblt.c * PURPOSE: * PROGRAMMERS: */ Modified: trunk/reactos/win32ss/drivers/displays/vga/vgavideo/vgavideo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/drivers/displays/v… ============================================================================== --- trunk/reactos/win32ss/drivers/displays/vga/vgavideo/vgavideo.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/drivers/displays/vga/vgavideo/vgavideo.c [iso-8859-1] Thu Nov 5 18:07:00 2015 @@ -1,7 +1,7 @@ /* * PROJECT: ReactOS VGA display driver * LICENSE: GPL - See COPYING in the top level directory - * FILE: drivers/video/displays/vga/vgavideo/vgavideo.c + * FILE: win32ss/drivers/displays/vga/vgavideo/vgavideo.c * PURPOSE: * PROGRAMMERS: */ Modified: trunk/reactos/win32ss/drivers/displays/vga_new/debug.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/drivers/displays/v… ============================================================================== --- trunk/reactos/win32ss/drivers/displays/vga_new/debug.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/drivers/displays/vga_new/debug.c [iso-8859-1] Thu Nov 5 18:07:00 2015 @@ -1,7 +1,7 @@ /* * PROJECT: ReactOS VGA Display Driver * LICENSE: Microsoft NT4 DDK Sample Code License - * FILE: boot/drivers/video/displays/vga/debug.c + * FILE: win32ss/drivers/displays/vga_new/debug.c * PURPOSE: Debug Support * PROGRAMMERS: Copyright (c) 1992-1995 Microsoft Corporation */ Modified: trunk/reactos/win32ss/drivers/displays/vga_new/debug.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/drivers/displays/v… ============================================================================== --- trunk/reactos/win32ss/drivers/displays/vga_new/debug.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/drivers/displays/vga_new/debug.h [iso-8859-1] Thu Nov 5 18:07:00 2015 @@ -1,7 +1,7 @@ /* * PROJECT: ReactOS VGA Display Driver * LICENSE: Microsoft NT4 DDK Sample Code License - * FILE: boot/drivers/video/displays/vga/debug.h + * FILE: win32ss/drivers/displays/vga_new/debug.h * PURPOSE: Debug Support Header * PROGRAMMERS: Copyright (c) 1992-1995 Microsoft Corporation */ Modified: trunk/reactos/win32ss/drivers/displays/vga_new/driver.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/drivers/displays/v… ============================================================================== --- trunk/reactos/win32ss/drivers/displays/vga_new/driver.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/drivers/displays/vga_new/driver.h [iso-8859-1] Thu Nov 5 18:07:00 2015 @@ -1,7 +1,7 @@ /* * PROJECT: ReactOS Framebuffer Display Driver * LICENSE: Microsoft NT4 DDK Sample Code License - * FILE: boot/drivers/video/displays/framebuf/driver.h + * FILE: win32ss/drivers/displays/vga_new/driver.h * PURPOSE: Main Driver Header File * PROGRAMMERS: Copyright (c) 1992-1995 Microsoft Corporation * ReactOS Portable Systems Group Modified: trunk/reactos/win32ss/drivers/displays/vga_new/enable.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/drivers/displays/v… ============================================================================== --- trunk/reactos/win32ss/drivers/displays/vga_new/enable.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/drivers/displays/vga_new/enable.c [iso-8859-1] Thu Nov 5 18:07:00 2015 @@ -1,7 +1,7 @@ /* * PROJECT: ReactOS Framebuffer Display Driver * LICENSE: Microsoft NT4 DDK Sample Code License - * FILE: boot/drivers/video/displays/framebuf/enable.c + * FILE: win32ss/drivers/displays/vga_new/enable.c * PURPOSE: Main Driver Initialization and PDEV Enabling * PROGRAMMERS: Copyright (c) 1992-1995 Microsoft Corporation * ReactOS Portable Systems Group Modified: trunk/reactos/win32ss/drivers/displays/vga_new/palette.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/drivers/displays/v… ============================================================================== --- trunk/reactos/win32ss/drivers/displays/vga_new/palette.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/drivers/displays/vga_new/palette.c [iso-8859-1] Thu Nov 5 18:07:00 2015 @@ -1,7 +1,7 @@ /* * PROJECT: ReactOS Framebuffer Display Driver * LICENSE: Microsoft NT4 DDK Sample Code License - * FILE: boot/drivers/video/displays/vga/palette.c + * FILE: win32ss/drivers/displays/vga_new/palette.c * PURPOSE: Palette Support * PROGRAMMERS: Copyright (c) 1992-1995 Microsoft Corporation */ Modified: trunk/reactos/win32ss/drivers/displays/vga_new/screen.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/drivers/displays/v… ============================================================================== --- trunk/reactos/win32ss/drivers/displays/vga_new/screen.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/drivers/displays/vga_new/screen.c [iso-8859-1] Thu Nov 5 18:07:00 2015 @@ -1,7 +1,7 @@ /* * PROJECT: ReactOS Framebuffer Display Driver * LICENSE: Microsoft NT4 DDK Sample Code License - * FILE: boot/drivers/video/displays/framebuf/screen.c + * FILE: win32ss/drivers/displays/vga_new/screen.c * PURPOSE: Surface, Screen and PDEV support/initialization * PROGRAMMERS: Copyright (c) 1992-1995 Microsoft Corporation * ReactOS Portable Systems Group Modified: trunk/reactos/win32ss/drivers/font/ftfd/rosglue.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/drivers/font/ftfd/… ============================================================================== --- trunk/reactos/win32ss/drivers/font/ftfd/rosglue.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/drivers/font/ftfd/rosglue.c [iso-8859-1] Thu Nov 5 18:07:00 2015 @@ -2,7 +2,7 @@ * COPYRIGHT: See COPYING in the top level directory * PROJECT: FreeType implementation for ReactOS * PURPOSE: Glue functions between FreeType - * FILE: thirdparty/freetype/rosglue.c + * FILE: win32ss/drivers/font/ftfd/rosglue.c * PROGRAMMER: Ge van Geldorp (ge(a)gse.nl) * NOTES: */ Modified: trunk/reactos/win32ss/drivers/miniport/vga_new/cmdcnst.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/drivers/miniport/v… ============================================================================== --- trunk/reactos/win32ss/drivers/miniport/vga_new/cmdcnst.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/drivers/miniport/vga_new/cmdcnst.h [iso-8859-1] Thu Nov 5 18:07:00 2015 @@ -1,7 +1,7 @@ /* * PROJECT: ReactOS VGA Miniport Driver * LICENSE: Microsoft NT4 DDK Sample Code License - * FILE: boot/drivers/video/miniport/vga/cmdcnst.h + * FILE: win32ss/drivers/miniport/vga_new/cmdcnst.h * PURPOSE: Command Code Definitions for VGA Command Streams * PROGRAMMERS: Copyright (c) 1992 Microsoft Corporation */ Modified: trunk/reactos/win32ss/drivers/miniport/vga_new/modeset.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/drivers/miniport/v… ============================================================================== --- trunk/reactos/win32ss/drivers/miniport/vga_new/modeset.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/drivers/miniport/vga_new/modeset.c [iso-8859-1] Thu Nov 5 18:07:00 2015 @@ -1,7 +1,7 @@ /* * PROJECT: ReactOS VGA Miniport Driver * LICENSE: Microsoft NT4 DDK Sample Code License - * FILE: boot/drivers/video/miniport/vga/modeset.c + * FILE: win32ss/drivers/miniport/vga_new/modeset.c * PURPOSE: Handles switching to Standard VGA Modes for compatible cards * PROGRAMMERS: Copyright (c) 1992 Microsoft Corporation * ReactOS Portable Systems Group Modified: trunk/reactos/win32ss/drivers/miniport/vga_new/vbe.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/drivers/miniport/v… ============================================================================== --- trunk/reactos/win32ss/drivers/miniport/vga_new/vbe.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/drivers/miniport/vga_new/vbe.c [iso-8859-1] Thu Nov 5 18:07:00 2015 @@ -1,7 +1,7 @@ /* * PROJECT: ReactOS VGA Miniport Driver * LICENSE: BSD - See COPYING.ARM in the top level directory - * FILE: boot/drivers/video/miniport/vga/vbe.c + * FILE: win32ss/drivers/miniport/vga_new/vbe.c * PURPOSE: Main VESA VBE 1.02+ SVGA Miniport Handling Code * PROGRAMMERS: ReactOS Portable Systems Group */ Modified: trunk/reactos/win32ss/drivers/miniport/vga_new/vbe.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/drivers/miniport/v… ============================================================================== --- trunk/reactos/win32ss/drivers/miniport/vga_new/vbe.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/drivers/miniport/vga_new/vbe.h [iso-8859-1] Thu Nov 5 18:07:00 2015 @@ -1,7 +1,7 @@ /* * PROJECT: VGA Miniport Driver * LICENSE: BSD - See COPYING.ARM in the top level directory - * FILE: boot/drivers/video/miniport/vga/vbe.h + * FILE: win32ss/drivers/miniport/vga_new/vbe.h * PURPOSE: VESA VBE Registers and Structures * PROGRAMMERS: ReactOS Portable Systems Group */ Modified: trunk/reactos/win32ss/drivers/miniport/vga_new/vbemodes.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/drivers/miniport/v… ============================================================================== --- trunk/reactos/win32ss/drivers/miniport/vga_new/vbemodes.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/drivers/miniport/vga_new/vbemodes.c [iso-8859-1] Thu Nov 5 18:07:00 2015 @@ -1,7 +1,7 @@ /* * PROJECT: ReactOS VGA Miniport Driver * LICENSE: BSD - See COPYING.ARM in the top level directory - * FILE: boot/drivers/video/miniport/vga/vbemodes.c + * FILE: win32ss/drivers/miniport/vga_new/vbemodes.c * PURPOSE: Mode Initialization and Mode Set for VBE-compatible cards * PROGRAMMERS: ReactOS Portable Systems Group */ Modified: trunk/reactos/win32ss/drivers/miniport/vga_new/vga.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/drivers/miniport/v… ============================================================================== --- trunk/reactos/win32ss/drivers/miniport/vga_new/vga.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/drivers/miniport/vga_new/vga.c [iso-8859-1] Thu Nov 5 18:07:00 2015 @@ -1,7 +1,7 @@ /* * PROJECT: ReactOS VGA Miniport Driver * LICENSE: Microsoft NT4 DDK Sample Code License - * FILE: boot/drivers/video/miniport/vga/vga.c + * FILE: win32ss/drivers/miniport/vga_new/vga.c * PURPOSE: Main Standard VGA-compatible Minport Handling Code * PROGRAMMERS: Copyright (c) 1992 Microsoft Corporation * ReactOS Portable Systems Group Modified: trunk/reactos/win32ss/drivers/miniport/vga_new/vga.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/drivers/miniport/v… ============================================================================== --- trunk/reactos/win32ss/drivers/miniport/vga_new/vga.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/drivers/miniport/vga_new/vga.h [iso-8859-1] Thu Nov 5 18:07:00 2015 @@ -1,7 +1,7 @@ /* * PROJECT: ReactOS VGA Miniport Driver * LICENSE: Microsoft NT4 DDK Sample Code License - * FILE: boot/drivers/video/miniport/vga/vga.h + * FILE: win32ss/drivers/miniport/vga_new/vga.h * PURPOSE: Main Header File * PROGRAMMERS: Copyright (c) 1992 Microsoft Corporation * ReactOS Portable Systems Group Modified: trunk/reactos/win32ss/drivers/miniport/vga_new/vgadata.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/drivers/miniport/v… ============================================================================== --- trunk/reactos/win32ss/drivers/miniport/vga_new/vgadata.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/drivers/miniport/vga_new/vgadata.c [iso-8859-1] Thu Nov 5 18:07:00 2015 @@ -1,7 +1,7 @@ /* * PROJECT: ReactOS VGA Miniport Driver * LICENSE: Microsoft NT4 DDK Sample Code License - * FILE: boot/drivers/video/miniport/vga/vgadata.c + * FILE: win32ss/drivers/miniport/vga_new/vgadata.c * PURPOSE: Handles switching to VGA Modes and holds VGA Built-in Modes * PROGRAMMERS: Copyright (c) 1992 Microsoft Corporation * ReactOS Portable Systems Group Modified: trunk/reactos/win32ss/drivers/miniport/vmx_svga/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/drivers/miniport/v… ============================================================================== --- trunk/reactos/win32ss/drivers/miniport/vmx_svga/precomp.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/drivers/miniport/vmx_svga/precomp.h [iso-8859-1] Thu Nov 5 18:07:00 2015 @@ -1,7 +1,7 @@ /* * PROJECT: ReactOS Boot Loader * LICENSE: BSD - See COPYING.ARM in the top level directory - * FILE: drivers/video/miniport/vmx_svga/precomp.h + * FILE: win32ss/drivers/miniport/vmx_svga/precomp.h * PURPOSE: VMWARE SVGA-II Driver Header * PROGRAMMERS: ReactOS Portable Systems Group */ Modified: trunk/reactos/win32ss/drivers/miniport/vmx_svga/vmx_regs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/drivers/miniport/v… ============================================================================== --- trunk/reactos/win32ss/drivers/miniport/vmx_svga/vmx_regs.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/drivers/miniport/vmx_svga/vmx_regs.h [iso-8859-1] Thu Nov 5 18:07:00 2015 @@ -1,7 +1,7 @@ /* * PROJECT: ReactOS Boot Loader * LICENSE: BSD - See COPYING.ARM in the top level directory - * FILE: drivers/video/miniport/vmx_svga/vmware.h + * FILE: win32ss/drivers/miniport/vmx_svga/vmx_regs.h * PURPOSE: VMWARE SVGA-II Card Registers and Definitions * PROGRAMMERS: ReactOS Portable Systems Group */ Modified: trunk/reactos/win32ss/drivers/miniport/vmx_svga/vmx_svga.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/drivers/miniport/v… ============================================================================== --- trunk/reactos/win32ss/drivers/miniport/vmx_svga/vmx_svga.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/drivers/miniport/vmx_svga/vmx_svga.c [iso-8859-1] Thu Nov 5 18:07:00 2015 @@ -1,7 +1,7 @@ /* * PROJECT: ReactOS Boot Loader * LICENSE: BSD - See COPYING.ARM in the top level directory - * FILE: drivers/video/miniport/vmx_svga/vmx_svga.c + * FILE: win32ss/drivers/miniport/vmx_svga/vmx_svga.c * PURPOSE: VMWARE SVGA-II Card Main Driver File * PROGRAMMERS: ReactOS Portable Systems Group */ Modified: trunk/reactos/win32ss/drivers/videoprt/dma.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/drivers/videoprt/d… ============================================================================== --- trunk/reactos/win32ss/drivers/videoprt/dma.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/drivers/videoprt/dma.c [iso-8859-1] Thu Nov 5 18:07:00 2015 @@ -1,7 +1,7 @@ /* * PROJECT: ReactOS Videoport * LICENSE: GPL - See COPYING in the top level directory - * FILE: drivers/video/videoprt/dma.c + * FILE: win32ss/drivers/videoprt/dma.c * PURPOSE: Videoport Direct Memory Access Support * PROGRAMMERS: ... */ Modified: trunk/reactos/win32ss/drivers/videoprt/event.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/drivers/videoprt/e… ============================================================================== --- trunk/reactos/win32ss/drivers/videoprt/event.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/drivers/videoprt/event.c [iso-8859-1] Thu Nov 5 18:07:00 2015 @@ -1,7 +1,7 @@ /* * PROJECT: ReactOS Video Port Driver * LICENSE: BSD - See COPYING.ARM in the top level directory - * FILE: drivers/video/videoprt/event.c + * FILE: win32ss/drivers/videoprt/event.c * PURPOSE: Event Support Routines * PROGRAMMERS: ReactOS Portable Systems Group */

1 0

[tfaber] 69815: [ATL] - Implement more CComBSTR methods. Patch by Mark Jansen. CORE-10478 #resolve
by tfaber＠svn.reactos.org 05 Nov '15

05 Nov '15

Author: tfaber Date: Thu Nov 5 10:49:52 2015 New Revision: 69815 URL: http://svn.reactos.org/svn/reactos?rev=69815&view=rev Log: [ATL] - Implement more CComBSTR methods. Patch by Mark Jansen. CORE-10478 #resolve Added: trunk/rostests/apitests/atl/CComBSTR.cpp (with props) trunk/rostests/apitests/atl/atl_apitest.rc (with props) trunk/rostests/apitests/atl/resource.h (with props) Modified: trunk/reactos/lib/atl/atlbase.h trunk/rostests/apitests/atl/CMakeLists.txt trunk/rostests/apitests/atl/testlist.c Modified: trunk/reactos/lib/atl/atlbase.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/atl/atlbase.h?rev=6981… ============================================================================== --- trunk/reactos/lib/atl/atlbase.h [iso-8859-1] (original) +++ trunk/reactos/lib/atl/atlbase.h [iso-8859-1] Thu Nov 5 10:49:52 2015 @@ -929,6 +929,11 @@ public: BSTR m_str; public: + CComBSTR() : + m_str(NULL) + { + } + CComBSTR(LPCOLESTR pSrc) { if (pSrc == NULL) @@ -936,15 +941,115 @@ else m_str = ::SysAllocString(pSrc); } + + CComBSTR(int length) + { + if (length == 0) + m_str = NULL; + else + m_str = ::SysAllocStringLen(NULL, length); + } + + CComBSTR(int length, LPCOLESTR pSrc) + { + if (length == 0) + m_str = NULL; + else + m_str = ::SysAllocStringLen(pSrc, length); + } + + CComBSTR(PCSTR pSrc) + { + if (pSrc) + { + int len = MultiByteToWideChar(CP_THREAD_ACP, 0, pSrc, -1, NULL, 0); + m_str = ::SysAllocStringLen(NULL, len - 1); + if (m_str) + { + int res = MultiByteToWideChar(CP_THREAD_ACP, 0, pSrc, -1, m_str, len); + ATLASSERT(res == len); + if (res != len) + { + ::SysFreeString(m_str); + m_str = NULL; + } + } + } + else + { + m_str = NULL; + } + } + + CComBSTR(const CComBSTR &other) + { + m_str = other.Copy(); + } + + CComBSTR(REFGUID guid) + { + OLECHAR szGuid[40]; + ::StringFromGUID2(guid, szGuid, 40); + m_str = ::SysAllocString(szGuid); + } + ~CComBSTR() { ::SysFreeString(m_str); m_str = NULL; } - + operator BSTR () const { return m_str; + } + + BSTR *operator & () + { + return &m_str; + } + + CComBSTR &operator = (const CComBSTR &other) + { + ::SysFreeString(m_str); + m_str = other.Copy(); + return *this; + } + + BSTR Copy() const + { + if (!m_str) + return NULL; + return ::SysAllocStringLen(m_str, ::SysStringLen(m_str)); + } + + HRESULT CopyTo(BSTR *other) const + { + if (!other) + return E_POINTER; + *other = Copy(); + return S_OK; + } + + bool LoadString(HMODULE module, DWORD uID) + { + ::SysFreeString(m_str); + m_str = NULL; + const wchar_t *ptr = NULL; + int len = ::LoadStringW(module, uID, (PWSTR)&ptr, 0); + if (len) + m_str = ::SysAllocStringLen(ptr, len); + return m_str != NULL; + } + + unsigned int Length() const + { + return ::SysStringLen(m_str); + } + + unsigned int ByteLength() const + { + return ::SysStringByteLen(m_str); } }; Added: trunk/rostests/apitests/atl/CComBSTR.cpp URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/atl/CComBSTR.cpp… ============================================================================== --- trunk/rostests/apitests/atl/CComBSTR.cpp (added) +++ trunk/rostests/apitests/atl/CComBSTR.cpp [iso-8859-1] Thu Nov 5 10:49:52 2015 @@ -0,0 +1,140 @@ +/* + * PROJECT: ReactOS api tests + * LICENSE: LGPLv2.1+ - See COPYING.LIB in the top level directory + * PURPOSE: Test for CComBSTR + * PROGRAMMER: Mark Jansen + */ + +#include <apitest.h> +#include <atlbase.h> +#include <atlcom.h> +#include "resource.h" + +#define verify_str (winetest_set_location(__FILE__, __LINE__), 0) ? (void)0 : verify_str_imp +#define verify_str2 (winetest_set_location(__FILE__, __LINE__), 0) ? (void)0 : verify_str_imp2 + + +static void verify_str_imp2(const CComBSTR& comstr, PCWSTR expected, size_t ExpectedLength) +{ + BSTR str = (BSTR)comstr; + if (expected || ExpectedLength) + { + winetest_ok(str != NULL, "Expected str to be a valid pointer\n"); + if (str) + { + if (expected) + { + winetest_ok(!wcscmp(str, expected), "Expected the string to be '%s', was '%s'\n", wine_dbgstr_w(expected), wine_dbgstr_w(str)); + } + size_t Length = comstr.Length(); + winetest_ok(Length == ExpectedLength, "Expected Length to be %u, was: %u\n", ExpectedLength, Length); + Length = comstr.ByteLength(); + ExpectedLength *= sizeof(WCHAR); + winetest_ok(Length == ExpectedLength, "Expected ByteLength to be %u, was: %u\n", ExpectedLength, Length); + } + } + else + { + winetest_ok(str == NULL || str[0] == '\0', "Expected str to be empty, was: '%s'\n", wine_dbgstr_w(str)); + } +} + +static void verify_str_imp(const CComBSTR& comstr, PCWSTR expected) +{ + verify_str_imp2(comstr, expected, expected ? wcslen(expected) : 0); +} + +void test_construction() +{ + CComBSTR empty1, empty2; + CComBSTR happyW(L"I am a happy BSTR"); + CComBSTR happyA("I am a happy BSTR"); + CComBSTR happyW4(4, L"I am a happy BSTR"); + CComBSTR fromlen1(1), fromlen10(10); + CComBSTR fromBSTRW(happyW), fromBSTRA(happyA), fromBSTRW4(happyW4); + CComBSTR fromBSTRlen1(fromlen1), fromBSTRlen10(fromlen10); + + verify_str(empty1, NULL); + verify_str(empty2, NULL); + verify_str(happyW, L"I am a happy BSTR"); + verify_str(happyA, L"I am a happy BSTR"); + verify_str(happyW4, L"I am"); + verify_str2(fromlen1, NULL, 1); + verify_str2(fromlen10, NULL, 10); + verify_str(fromBSTRW, L"I am a happy BSTR"); + verify_str(fromBSTRA, L"I am a happy BSTR"); + verify_str(fromBSTRW4, L"I am"); + verify_str2(fromBSTRlen1, NULL, 1); + verify_str2(fromBSTRlen10, NULL, 10); +} + +void test_copyassignment() +{ + CComBSTR happy(L"I am a happy BSTR"), empty, odd; + CComBSTR happyCopy1, happyCopy2, emptyCopy, oddCopy; + + odd = ::SysAllocStringByteLen("aaaaa", 3); + + happyCopy1 = happy.Copy(); + happyCopy2 = happy; // Calls happyW.Copy() + emptyCopy = empty.Copy(); + oddCopy = odd.Copy(); + + verify_str(happy, L"I am a happy BSTR"); + verify_str(empty, NULL); + verify_str2(odd, L"\u6161a", 2); + verify_str(happyCopy1, L"I am a happy BSTR"); + verify_str(happyCopy2, L"I am a happy BSTR"); + verify_str(emptyCopy, NULL); + verify_str2(oddCopy, L"\u6161a", 2); + ok((BSTR)happy != (BSTR)happyCopy1, "Expected pointers to be different\n"); + ok((BSTR)happy != (BSTR)happyCopy2, "Expected pointers to be different\n"); + + + happyCopy1 = (LPCOLESTR)NULL; + happyCopy2 = (LPCSTR)NULL; + + verify_str(happyCopy1, NULL); + verify_str(happyCopy2, NULL); + + HRESULT hr = happy.CopyTo(&happyCopy1); + ok(hr == S_OK, "Expected hr to be E_POINTER, was: %08lx\n", hr); + +#if 0 + // This asserts + hr = happy.CopyTo((BSTR*)NULL); + ok(hr == E_POINTER, "Expected hr to be E_POINTER, was: %u\n"); +#endif +} + +void test_fromguid() +{ + GUID guid = { 0x12345678, 0x9abc, 0xdef0, { 0x12, 0x34, 0x56, 0x78, 0x9a, 0xbc, 0xde, 0xf0} }; + CComBSTR fromGuid(guid), empty; + verify_str(fromGuid, L"{12345678-9ABC-DEF0-1234-56789ABCDEF0}"); + verify_str(empty, NULL); + empty = fromGuid; + verify_str(empty, L"{12345678-9ABC-DEF0-1234-56789ABCDEF0}"); +} + +void test_loadres() +{ + CComBSTR test1, test2, test3; + HMODULE mod = GetModuleHandle(NULL); + + ok(true == test1.LoadString(mod, IDS_TEST1), "Expected LoadString to succeed\n"); + ok(true == test2.LoadString(mod, IDS_TEST2), "Expected LoadString to succeed\n"); + ok(false == test3.LoadString(mod, IDS_TEST2 + 1), "Expected LoadString to fail\n"); + + verify_str(test1, L"Test string one."); + verify_str(test2, L"I am a happy BSTR"); + verify_str(test3, NULL); +} + +START_TEST(CComBSTR) +{ + test_construction(); + test_copyassignment(); + test_fromguid(); + test_loadres(); +} Propchange: trunk/rostests/apitests/atl/CComBSTR.cpp ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rostests/apitests/atl/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/atl/CMakeLists.t… ============================================================================== --- trunk/rostests/apitests/atl/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/apitests/atl/CMakeLists.txt [iso-8859-1] Thu Nov 5 10:49:52 2015 @@ -4,9 +4,12 @@ include_directories(${REACTOS_SOURCE_DIR}/lib/atl) add_executable(atl_apitest + CComBSTR.cpp CComHeapPtr.cpp - testlist.c) + testlist.c + atl_apitest.rc) + target_link_libraries(atl_apitest wine uuid) set_module_type(atl_apitest win32cui) -add_importlibs(atl_apitest ole32 oleaut32 msvcrt kernel32) +add_importlibs(atl_apitest ole32 oleaut32 user32 msvcrt kernel32) add_cd_file(TARGET atl_apitest DESTINATION reactos/bin FOR all) Added: trunk/rostests/apitests/atl/atl_apitest.rc URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/atl/atl_apitest.… ============================================================================== --- trunk/rostests/apitests/atl/atl_apitest.rc (added) +++ trunk/rostests/apitests/atl/atl_apitest.rc [iso-8859-1] Thu Nov 5 10:49:52 2015 @@ -0,0 +1,11 @@ +#include <windef.h> +#include "resource.h" + +LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL + +STRINGTABLE +BEGIN + IDS_TEST1 "Test string one." + IDS_TEST2 "I am a happy BSTR" +END + Propchange: trunk/rostests/apitests/atl/atl_apitest.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/apitests/atl/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/atl/resource.h?r… ============================================================================== --- trunk/rostests/apitests/atl/resource.h (added) +++ trunk/rostests/apitests/atl/resource.h [iso-8859-1] Thu Nov 5 10:49:52 2015 @@ -0,0 +1,3 @@ + +#define IDS_TEST1 2000 +#define IDS_TEST2 2001 Propchange: trunk/rostests/apitests/atl/resource.h ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rostests/apitests/atl/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/atl/testlist.c?r… ============================================================================== --- trunk/rostests/apitests/atl/testlist.c [iso-8859-1] (original) +++ trunk/rostests/apitests/atl/testlist.c [iso-8859-1] Thu Nov 5 10:49:52 2015 @@ -1,10 +1,12 @@ #define STANDALONE #include <apitest.h> +extern void func_CComBSTR(void); extern void func_CComHeapPtr(void); const struct test winetest_testlist[] = { + { "CComBSTR", func_CComBSTR }, { "CComHeapPtr", func_CComHeapPtr }, { 0, 0 } };

1 0

← Newer
1
...
38
39
40
41
42
43
44
45
46
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs November 2015