Ros-diffs

ros-diffs@reactos.org

81390 discussions

[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

[spetreolle] 69814: [ARP] Sssh, secret ansi unicode plan is secret.
by spetreolle＠svn.reactos.org 04 Nov '15

04 Nov '15

Author: spetreolle Date: Wed Nov 4 21:22:37 2015 New Revision: 69814 URL: http://svn.reactos.org/svn/reactos?rev=69814&view=rev Log: [ARP] Sssh, secret ansi unicode plan is secret. Modified: trunk/reactos/base/applications/network/arp/CMakeLists.txt Modified: trunk/reactos/base/applications/network/arp/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/arp/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/arp/CMakeLists.txt [iso-8859-1] Wed Nov 4 21:22:37 2015 @@ -1,5 +1,5 @@ add_executable(arp arp.c arp.rc) -set_module_type(arp win32cui ANSI) +set_module_type(arp win32cui) add_importlibs(arp iphlpapi ws2_32 shlwapi msvcrt kernel32) add_cd_file(TARGET arp DESTINATION reactos/system32 FOR all)

1 0

[spetreolle] 69813: [PARTINFO][ARP] Arch, manual define of UNICODE/_UNICODE is a call for trouble.
by spetreolle＠svn.reactos.org 04 Nov '15

04 Nov '15

Author: spetreolle Date: Wed Nov 4 21:19:45 2015 New Revision: 69813 URL: http://svn.reactos.org/svn/reactos?rev=69813&view=rev Log: [PARTINFO][ARP] Arch, manual define of UNICODE/_UNICODE is a call for trouble. Modified: trunk/reactos/base/applications/network/arp/CMakeLists.txt trunk/reactos/base/applications/network/arp/arp.c trunk/rosapps/applications/sysutils/utils/partinfo/partinfo.c Modified: trunk/reactos/base/applications/network/arp/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/arp/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/arp/CMakeLists.txt [iso-8859-1] Wed Nov 4 21:19:45 2015 @@ -1,5 +1,5 @@ add_executable(arp arp.c arp.rc) -set_module_type(arp win32cui) +set_module_type(arp win32cui ANSI) add_importlibs(arp iphlpapi ws2_32 shlwapi msvcrt kernel32) add_cd_file(TARGET arp DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/base/applications/network/arp/arp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/arp/arp.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/arp/arp.c [iso-8859-1] Wed Nov 4 21:19:45 2015 @@ -38,9 +38,6 @@ #define _INC_WINDOWS #include <winsock2.h> #include <iphlpapi.h> - -#define UNICODE -#define _UNICODE /* * Globals Modified: trunk/rosapps/applications/sysutils/utils/partinfo/partinfo.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/util… ============================================================================== --- trunk/rosapps/applications/sysutils/utils/partinfo/partinfo.c [iso-8859-1] (original) +++ trunk/rosapps/applications/sysutils/utils/partinfo/partinfo.c [iso-8859-1] Wed Nov 4 21:19:45 2015 @@ -10,7 +10,6 @@ //#define DUMP_DATA #define DUMP_SIZE_INFO -#define UNICODE #ifdef DUMP_DATA void HexDump(char *buffer, ULONG size) @@ -116,7 +115,7 @@ sprintf(DriveName, "\\\\.\\PHYSICALDRIVE%lu", ulDrive); /* Open drive */ - hDisk = CreateFile(DriveName, + hDisk = CreateFileA(DriveName, GENERIC_READ, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL,

1 0

[akhaldi] 69812: [CMAKE] Properly handle hotpatchable flags requirements in MSVC builds. CORE-10477
by akhaldi＠svn.reactos.org 04 Nov '15

04 Nov '15

Author: akhaldi Date: Wed Nov 4 18:06:16 2015 New Revision: 69812 URL: http://svn.reactos.org/svn/reactos?rev=69812&view=rev Log: [CMAKE] Properly handle hotpatchable flags requirements in MSVC builds. CORE-10477 Modified: trunk/reactos/cmake/CMakeMacros.cmake trunk/reactos/cmake/msvc.cmake trunk/reactos/dll/directx/wine/d3d8/CMakeLists.txt trunk/reactos/dll/directx/wine/d3d9/CMakeLists.txt trunk/reactos/dll/directx/wine/ddraw/CMakeLists.txt trunk/reactos/dll/directx/wine/dinput/CMakeLists.txt trunk/reactos/dll/directx/wine/dinput8/CMakeLists.txt trunk/reactos/dll/ntdll/CMakeLists.txt trunk/reactos/dll/opengl/opengl32/CMakeLists.txt trunk/reactos/dll/win32/iphlpapi/CMakeLists.txt trunk/reactos/dll/win32/kernel32/CMakeLists.txt trunk/reactos/dll/win32/kernel32_vista/CMakeLists.txt trunk/reactos/dll/win32/shell32/CMakeLists.txt trunk/reactos/dll/win32/winmm/CMakeLists.txt trunk/reactos/dll/win32/xinput1_3/CMakeLists.txt trunk/reactos/win32ss/user/user32/CMakeLists.txt Modified: trunk/reactos/cmake/CMakeMacros.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/CMakeMacros.cmake?re… ============================================================================== --- trunk/reactos/cmake/CMakeMacros.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/CMakeMacros.cmake [iso-8859-1] Wed Nov 4 18:06:16 2015 @@ -540,7 +540,7 @@ endfunction() function(set_module_type MODULE TYPE) - cmake_parse_arguments(__module "UNICODE;HOTPATCHABLE" "IMAGEBASE" "ENTRYPOINT" ${ARGN}) + cmake_parse_arguments(__module "UNICODE" "IMAGEBASE" "ENTRYPOINT" ${ARGN}) if(__module_UNPARSED_ARGUMENTS) message(STATUS "set_module_type : unparsed arguments ${__module_UNPARSED_ARGUMENTS}, module : ${MODULE}") @@ -572,17 +572,6 @@ #set unicode definitions if(__module_UNICODE) add_target_compile_definitions(${MODULE} UNICODE _UNICODE) - endif() - - # Handle hotpatchable images. - # GCC has this as a function attribute so we're handling it using DECLSPEC_HOTPATCH - if(__module_HOTPATCHABLE AND MSVC AND (NOT ARCH STREQUAL "arm")) - if(ARCH STREQUAL "i386") - set_property(TARGET ${MODULE} APPEND_STRING PROPERTY COMPILE_FLAGS " /hotpatch") - set_property(TARGET ${MODULE} APPEND_STRING PROPERTY LINK_FLAGS " /FUNCTIONPADMIN:5") - elseif(ARCH STREQUAL "amd64") - set_property(TARGET ${MODULE} APPEND_STRING PROPERTY LINK_FLAGS " /FUNCTIONPADMIN:6") - endif() endif() # set entry point Modified: trunk/reactos/cmake/msvc.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/msvc.cmake?rev=69812… ============================================================================== --- trunk/reactos/cmake/msvc.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/msvc.cmake [iso-8859-1] Wed Nov 4 18:06:16 2015 @@ -95,6 +95,14 @@ add_definitions("/D NDEBUG") endif() +# Hotpatchable images +if(ARCH STREQUAL "i386") + add_compile_flags("/hotpatch") + set(_hotpatch_link_flag "/FUNCTIONPADMIN:5") +elseif(ARCH STREQUAL "amd64") + set(_hotpatch_link_flag "/FUNCTIONPADMIN:6") +endif() + if(MSVC_IDE AND (NOT DEFINED USE_FOLDER_STRUCTURE)) set(USE_FOLDER_STRUCTURE FALSE) endif() @@ -108,9 +116,9 @@ add_compile_flags("/RTC1") endif() -set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /MANIFEST:NO /INCREMENTAL:NO /SAFESEH:NO /NODEFAULTLIB /RELEASE") -set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /MANIFEST:NO /INCREMENTAL:NO /SAFESEH:NO /NODEFAULTLIB /RELEASE /IGNORE:4104") -set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} /MANIFEST:NO /INCREMENTAL:NO /SAFESEH:NO /NODEFAULTLIB /RELEASE") +set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /MANIFEST:NO /INCREMENTAL:NO /SAFESEH:NO /NODEFAULTLIB /RELEASE ${_hotpatch_link_flag}") +set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /MANIFEST:NO /INCREMENTAL:NO /SAFESEH:NO /NODEFAULTLIB /RELEASE /IGNORE:4104 ${_hotpatch_link_flag}") +set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} /MANIFEST:NO /INCREMENTAL:NO /SAFESEH:NO /NODEFAULTLIB /RELEASE ${_hotpatch_link_flag}") if(CMAKE_DISABLE_NINJA_DEPSLOG) set(cl_includes_flag "") Modified: trunk/reactos/dll/directx/wine/d3d8/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/CMak… ============================================================================== --- trunk/reactos/dll/directx/wine/d3d8/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/d3d8/CMakeLists.txt [iso-8859-1] Wed Nov 4 18:06:16 2015 @@ -25,7 +25,7 @@ version.rc ${CMAKE_CURRENT_BINARY_DIR}/d3d8.def) -set_module_type(d3d8 win32dll UNICODE HOTPATCHABLE) +set_module_type(d3d8 win32dll UNICODE) target_link_libraries(d3d8 uuid wine) add_importlibs(d3d8 d3dwine msvcrt kernel32 ntdll) add_pch(d3d8 d3d8_private.h SOURCE) Modified: trunk/reactos/dll/directx/wine/d3d9/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/CMak… ============================================================================== --- trunk/reactos/dll/directx/wine/d3d9/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/d3d9/CMakeLists.txt [iso-8859-1] Wed Nov 4 18:06:16 2015 @@ -28,7 +28,7 @@ ${CMAKE_CURRENT_BINARY_DIR}/d3d9_stubs.c ${CMAKE_CURRENT_BINARY_DIR}/d3d9.def) -set_module_type(d3d9 win32dll UNICODE HOTPATCHABLE) +set_module_type(d3d9 win32dll UNICODE) target_link_libraries(d3d9 wine) add_importlibs(d3d9 d3dwine msvcrt kernel32 ntdll) add_pch(d3d9 d3d9_private.h SOURCE) Modified: trunk/reactos/dll/directx/wine/ddraw/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/CMa… ============================================================================== --- trunk/reactos/dll/directx/wine/ddraw/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/ddraw/CMakeLists.txt [iso-8859-1] Wed Nov 4 18:06:16 2015 @@ -34,7 +34,7 @@ ddraw.rc ${CMAKE_CURRENT_BINARY_DIR}/ddraw.def) -set_module_type(ddraw win32dll HOTPATCHABLE) +set_module_type(ddraw win32dll) target_link_libraries(ddraw wine uuid dxguid ${PSEH_LIB}) add_importlibs(ddraw advapi32 gdi32 user32 d3dwine msvcrt kernel32 ntdll) add_dependencies(ddraw wineheaders) Modified: trunk/reactos/dll/directx/wine/dinput/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/dinput/CM… ============================================================================== --- trunk/reactos/dll/directx/wine/dinput/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/dinput/CMakeLists.txt [iso-8859-1] Wed Nov 4 18:06:16 2015 @@ -24,7 +24,7 @@ add_library(dinput_data_formats data_formats.c) add_dependencies(dinput_data_formats psdk) -set_module_type(dinput win32dll HOTPATCHABLE) +set_module_type(dinput win32dll) target_link_libraries(dinput dxguid uuid wine) add_importlibs(dinput comctl32 ole32 user32 advapi32 msvcrt kernel32 ntdll) add_pch(dinput dinput_private.h SOURCE) Modified: trunk/reactos/dll/directx/wine/dinput8/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/dinput8/C… ============================================================================== --- trunk/reactos/dll/directx/wine/dinput8/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/dinput8/CMakeLists.txt [iso-8859-1] Wed Nov 4 18:06:16 2015 @@ -8,7 +8,7 @@ ${CMAKE_CURRENT_BINARY_DIR}/dinput8.def) add_library(dinput8 SHARED ${SOURCE} version.rc) -set_module_type(dinput8 win32dll HOTPATCHABLE) +set_module_type(dinput8 win32dll) target_link_libraries(dinput8 dxguid uuid wine) add_importlibs(dinput8 ole32 msvcrt kernel32 ntdll) add_cd_file(TARGET dinput8 DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/dll/ntdll/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/CMakeLists.txt?r… ============================================================================== --- trunk/reactos/dll/ntdll/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/CMakeLists.txt [iso-8859-1] Wed Nov 4 18:06:16 2015 @@ -43,7 +43,7 @@ ${CMAKE_CURRENT_BINARY_DIR}/ntdll_stubs.c ${CMAKE_CURRENT_BINARY_DIR}/ntdll.def) -set_module_type(ntdll win32dll HOTPATCHABLE ENTRYPOINT 0) +set_module_type(ntdll win32dll ENTRYPOINT 0) ############################################# ## HACK FOR MSVC COMPILATION WITH win32dll ## set_subsystem(ntdll console) Modified: trunk/reactos/dll/opengl/opengl32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/opengl32/CMakeL… ============================================================================== --- trunk/reactos/dll/opengl/opengl32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/opengl/opengl32/CMakeLists.txt [iso-8859-1] Wed Nov 4 18:06:16 2015 @@ -57,8 +57,7 @@ target_link_libraries(opengl32 mingwex) endif() -set_module_type(opengl32 win32dll HOTPATCHABLE) - +set_module_type(opengl32 win32dll) add_importlibs(opengl32 gdi32 user32 advapi32 msvcrt kernel32 ntdll) add_pch(opengl32 opengl32.h SOURCE) add_cd_file(TARGET opengl32 DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/dll/win32/iphlpapi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/iphlpapi/CMakeLi… ============================================================================== --- trunk/reactos/dll/win32/iphlpapi/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/iphlpapi/CMakeLists.txt [iso-8859-1] Wed Nov 4 18:06:16 2015 @@ -25,7 +25,7 @@ iphlpapi.rc ${CMAKE_CURRENT_BINARY_DIR}/iphlpapi.def) -set_module_type(iphlpapi win32dll UNICODE HOTPATCHABLE) +set_module_type(iphlpapi win32dll UNICODE) target_link_libraries(iphlpapi wine tdilib) add_importlibs(iphlpapi icmp dhcpcsvc advapi32 ws2_32 msvcrt kernel32 ntdll) add_pch(iphlpapi iphlpapi_private.h SOURCE) Modified: trunk/reactos/dll/win32/kernel32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/CMakeLi… ============================================================================== --- trunk/reactos/dll/win32/kernel32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/CMakeLists.txt [iso-8859-1] Wed Nov 4 18:06:16 2015 @@ -103,7 +103,7 @@ kernel32.rc ${CMAKE_CURRENT_BINARY_DIR}/kernel32.def) -set_module_type(kernel32 win32dll HOTPATCHABLE ENTRYPOINT DllMain 12) +set_module_type(kernel32 win32dll ENTRYPOINT DllMain 12) ############################################# ## HACK FOR MSVC COMPILATION WITH win32dll ## set_subsystem(kernel32 console) Modified: trunk/reactos/dll/win32/kernel32_vista/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32_vista/C… ============================================================================== --- trunk/reactos/dll/win32/kernel32_vista/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32_vista/CMakeLists.txt [iso-8859-1] Wed Nov 4 18:06:16 2015 @@ -12,7 +12,7 @@ ${CMAKE_CURRENT_BINARY_DIR}/kernel32_vista.def) add_library(kernel32_vista SHARED ${SOURCE}) -set_module_type(kernel32_vista win32dll HOTPATCHABLE ENTRYPOINT DllMain 12) +set_module_type(kernel32_vista win32dll ENTRYPOINT DllMain 12) add_importlibs(kernel32_vista kernel32 ntdll) add_dependencies(kernel32_vista psdk) add_cd_file(TARGET kernel32_vista DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/dll/win32/shell32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/CMakeLis… ============================================================================== --- trunk/reactos/dll/win32/shell32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/CMakeLists.txt [iso-8859-1] Wed Nov 4 18:06:16 2015 @@ -81,7 +81,7 @@ ${CMAKE_CURRENT_BINARY_DIR}/shell32_stubs.c ${CMAKE_CURRENT_BINARY_DIR}/shell32.def) -set_module_type(shell32 win32dll UNICODE HOTPATCHABLE) +set_module_type(shell32 win32dll UNICODE) target_link_libraries(shell32 shellmenu shelldesktop atlnew wine uuid recyclebin) add_delay_importlibs(shell32 uxtheme ole32 userenv version fmifs) add_importlibs(shell32 advapi32 browseui gdi32 user32 powrprof comctl32 comdlg32 shdocvw shlwapi devmgr winspool winmm msvcrt kernel32 ntdll) Modified: trunk/reactos/dll/win32/winmm/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/winmm/CMakeLists… ============================================================================== --- trunk/reactos/dll/win32/winmm/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/winmm/CMakeLists.txt [iso-8859-1] Wed Nov 4 18:06:16 2015 @@ -21,7 +21,7 @@ winmm_res.rc ${CMAKE_CURRENT_BINARY_DIR}/winmm.def) -set_module_type(winmm win32dll HOTPATCHABLE) +set_module_type(winmm win32dll) target_link_libraries(winmm wine ${PSEH_LIB}) add_importlibs(winmm advapi32 user32 msvcrt kernel32 ntdll) add_pch(winmm winemm.h SOURCE) Modified: trunk/reactos/dll/win32/xinput1_3/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/xinput1_3/CMakeL… ============================================================================== --- trunk/reactos/dll/win32/xinput1_3/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/xinput1_3/CMakeLists.txt [iso-8859-1] Wed Nov 4 18:06:16 2015 @@ -8,7 +8,7 @@ ${CMAKE_CURRENT_BINARY_DIR}/xinput1_3.def) add_library(xinput1_3 SHARED ${SOURCE} version.rc) -set_module_type(xinput1_3 win32dll HOTPATCHABLE) +set_module_type(xinput1_3 win32dll) target_link_libraries(xinput1_3 wine) add_importlibs(xinput1_3 msvcrt kernel32 ntdll) add_cd_file(TARGET xinput1_3 DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/win32ss/user/user32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/CMakeL… ============================================================================== --- trunk/reactos/win32ss/user/user32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/CMakeLists.txt [iso-8859-1] Wed Nov 4 18:06:16 2015 @@ -69,7 +69,7 @@ user32.rc ${CMAKE_CURRENT_BINARY_DIR}/user32.def) -set_module_type(user32 win32dll ENTRYPOINT DllMain 12 UNICODE HOTPATCHABLE) +set_module_type(user32 win32dll ENTRYPOINT DllMain 12 UNICODE) target_link_libraries(user32 user32_wsprintf wine win32ksys ${PSEH_LIB}) if(MSVC)

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs