Ros-diffs

ros-diffs@reactos.org

81390 discussions

[greatlrd] 21543: Bug 1376, patch from SuperTrax at gmx dot de if a Window was showed normaly, GetWindowPlacement never returned a showCmd.
by greatlrd＠svn.reactos.org 10 Apr '06

10 Apr '06

Author: greatlrd Date: Mon Apr 10 23:21:22 2006 New Revision: 21543 URL: http://svn.reactos.ru/svn/reactos?rev=21543&view=rev Log: Bug 1376, patch from SuperTrax at gmx dot de if a Window was showed normaly, GetWindowPlacement never returned a showCmd. Modified: trunk/reactos/subsystems/win32/win32k/ntuser/window.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/window.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/subsystems/win32/win32k/ntu… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/window.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/window.c Mon Apr 10 23:21:22 2006 @@ -3676,7 +3676,7 @@ { Safepl.showCmd = SW_MINIMIZE; } - else if (0 != (Window->Style & WS_MINIMIZE)) + else if (0 != (Window->Style & WS_VISIBLE)) { Safepl.showCmd = SW_SHOWNORMAL; }

1 0

[tretiakov] 21542: Make windows button open start menu. Fixes buf 1356. Patch by SuperTrax@gmx.de
by tretiakov＠svn.reactos.org 10 Apr '06

10 Apr '06

Author: tretiakov Date: Mon Apr 10 21:58:47 2006 New Revision: 21542 URL: http://svn.reactos.ru/svn/reactos?rev=21542&view=rev Log: Make windows button open start menu. Fixes buf 1356. Patch by SuperTrax(a)gmx.de Modified: trunk/reactos/base/shell/explorer/taskbar/desktopbar.cpp trunk/reactos/base/shell/explorer/taskbar/desktopbar.h Modified: trunk/reactos/base/shell/explorer/taskbar/desktopbar.cpp URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/shell/explorer/taskbar… ============================================================================== --- trunk/reactos/base/shell/explorer/taskbar/desktopbar.cpp (original) +++ trunk/reactos/base/shell/explorer/taskbar/desktopbar.cpp Mon Apr 10 21:58:47 2006 @@ -102,6 +102,10 @@ // create "Start" button HWND hwndStart = Button(_hwnd, start_str, 1, 1, start_btn_width, REBARBAND_HEIGHT, IDC_START, WS_VISIBLE|WS_CHILD|BS_OWNERDRAW); new StartButton(hwndStart); + + /* Save the handle to the window, needed for push-state handling */ + _hwndStartButton = hwndStart; + // disable double clicks SetClassLong(hwndStart, GCL_STYLE, GetClassLong(hwndStart, GCL_STYLE) & ~CS_DBLCLKS); @@ -451,7 +455,16 @@ void DesktopBar::ShowStartMenu() { if (_startMenuRoot) - _startMenuRoot->TrackStartmenu(); + { + // set the Button, if not set + if (!Button_GetState(_hwndStartButton)) + Button_SetState(_hwndStartButton, TRUE); + + _startMenuRoot->TrackStartmenu(); + + // StartMenu was closed, release button state + Button_SetState(_hwndStartButton, false); + } } Modified: trunk/reactos/base/shell/explorer/taskbar/desktopbar.h URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/shell/explorer/taskbar… ============================================================================== --- trunk/reactos/base/shell/explorer/taskbar/desktopbar.h (original) +++ trunk/reactos/base/shell/explorer/taskbar/desktopbar.h Mon Apr 10 21:58:47 2006 @@ -104,7 +104,9 @@ WindowHandle _hwndNotify; WindowHandle _hwndQuickLaunch; WindowHandle _hwndrebar; - + /* Needed to make the StartButton pushed, if it's called by windowskey: SC_TASKLIST command */ + WindowHandle _hwndStartButton; + struct StartMenuRoot* _startMenuRoot; #ifdef _ROS_

1 0

[greatlrd] 21541: RtlIntegerToUnicodeString incress the interal buffer size to 33bytes as wine does RtlInt64ToUnicodeString incress the interal buffer size to 65bytes as wine does This will take care of some intToChar Bugs I have been locking of it for sometimes now thanks to crashfourit network patch and we talk I did found it.
by greatlrd＠svn.reactos.org 10 Apr '06

10 Apr '06

Author: greatlrd Date: Mon Apr 10 21:21:46 2006 New Revision: 21541 URL: http://svn.reactos.ru/svn/reactos?rev=21541&view=rev Log: RtlIntegerToUnicodeString incress the interal buffer size to 33bytes as wine does RtlInt64ToUnicodeString incress the interal buffer size to 65bytes as wine does This will take care of some intToChar Bugs I have been locking of it for sometimes now thanks to crashfourit network patch and we talk I did found it. Modified: trunk/reactos/lib/rtl/unicode.c Modified: trunk/reactos/lib/rtl/unicode.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/lib/rtl/unicode.c?rev=21541… ============================================================================== --- trunk/reactos/lib/rtl/unicode.c (original) +++ trunk/reactos/lib/rtl/unicode.c Mon Apr 10 21:21:46 2006 @@ -625,7 +625,7 @@ IN OUT PUNICODE_STRING String) { ANSI_STRING AnsiString; - CHAR Buffer[16]; + CHAR Buffer[33]; NTSTATUS Status; Status = RtlIntegerToChar(Value, Base, sizeof(Buffer), Buffer); @@ -653,7 +653,7 @@ { LARGE_INTEGER LargeInt; ANSI_STRING AnsiString; - CHAR Buffer[32]; + CHAR Buffer[65]; NTSTATUS Status; LargeInt.QuadPart = Value;

1 0

[tretiakov] 21540: Add gradient tests. Patch by Timo Kreuzer <timo.kreuzer@web.de>
by tretiakov＠svn.reactos.org 10 Apr '06

10 Apr '06

Author: tretiakov Date: Mon Apr 10 21:16:37 2006 New Revision: 21540 URL: http://svn.reactos.ru/svn/reactos?rev=21540&view=rev Log: Add gradient tests. Patch by Timo Kreuzer <timo.kreuzer(a)web.de> Added: trunk/reactos/base/applications/utils/rosperf/gradient.c Modified: trunk/reactos/base/applications/utils/rosperf/rosperf.h trunk/reactos/base/applications/utils/rosperf/rosperf.rbuild trunk/reactos/base/applications/utils/rosperf/testlist.c Added: trunk/reactos/base/applications/utils/rosperf/gradient.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/utils/ros… ============================================================================== --- trunk/reactos/base/applications/utils/rosperf/gradient.c (added) +++ trunk/reactos/base/applications/utils/rosperf/gradient.c Mon Apr 10 21:16:37 2006 @@ -1,0 +1,154 @@ +/* + * ReactOS RosPerf - ReactOS GUI performance test program (gradient.c) + * + * Copyright 2006 Timo Kreuzer <timo.kreuzer(a)web.de> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +#include <windows.h> +#include "rosperf.h" + +void +GradientProc(void *Context, PPERF_INFO PerfInfo, unsigned Reps) +{ + unsigned Rep; + HDC Dc; + TRIVERTEX vert[6]; + static GRADIENT_TRIANGLE gcap[4]; + + Dc = PerfInfo->ForegroundDc; + vert[0].x = 0; + vert[0].y = 0; + vert[0].Red = 0xff00; + vert[0].Green = 0; + vert[0].Blue = 0; + vert[0].Alpha = 0; + vert[1].x = PerfInfo->WndWidth;; + vert[1].y = 0; + vert[1].Red = 0; + vert[1].Green = 0xff00; + vert[1].Blue = 0; + vert[1].Alpha = 0; + vert[2].x = PerfInfo->WndWidth; + vert[2].y = PerfInfo->WndHeight; + vert[2].Red = 0; + vert[2].Green = 0; + vert[2].Blue = 0xff00; + vert[2].Alpha = 0; + vert[3].x = 0; + vert[3].y = PerfInfo->WndHeight; + vert[3].Red = 0; + vert[3].Green = 0xff00; + vert[3].Blue = 0; + vert[3].Alpha = 0; + vert[4].Red = 0; + vert[4].Green = 0; + vert[4].Blue = 0; + vert[4].Alpha = 0; + vert[5].Red = 0; + vert[5].Green = 0; + vert[5].Blue = 0; + vert[5].Alpha = 0; + + for (Rep = 0; Rep < Reps; Rep++) + { + switch (2 * Rep / Reps) + { + case 0: + vert[4].x = PerfInfo->WndWidth * 2 * Rep / Reps; + vert[4].y = 0; + vert[5].x = PerfInfo->WndWidth - vert[4].x; + vert[5].y = PerfInfo->WndHeight; + gcap[0].Vertex1 = 5; gcap[0].Vertex2 = 0; gcap[0].Vertex3 = 4; + gcap[1].Vertex1 = 5; gcap[1].Vertex2 = 4; gcap[1].Vertex3 = 1; + gcap[2].Vertex1 = 5; gcap[2].Vertex2 = 1; gcap[2].Vertex3 = 2; + gcap[3].Vertex1 = 5; gcap[3].Vertex2 = 3; gcap[3].Vertex3 = 0; + break; + case 1: + vert[4].x = PerfInfo->WndWidth; + vert[4].y = PerfInfo->WndHeight * 2 * Rep / Reps - PerfInfo->WndHeight; + vert[5].x = 0; + vert[5].y = PerfInfo->WndHeight - vert[4].y; + gcap[0].Vertex1 = 5; gcap[0].Vertex2 = 1; gcap[0].Vertex3 = 4; + gcap[1].Vertex1 = 5; gcap[1].Vertex2 = 4; gcap[1].Vertex3 = 2; + gcap[2].Vertex1 = 5; gcap[2].Vertex2 = 2; gcap[2].Vertex3 = 3; + gcap[3].Vertex1 = 5; gcap[3].Vertex2 = 0; gcap[3].Vertex3 = 1; + break; + } + + GradientFill(Dc, vert, 6, &gcap, 4, GRADIENT_FILL_TRIANGLE); + } +} + +void +GradientHorizontalProc(void *Context, PPERF_INFO PerfInfo, unsigned Reps) +{ + unsigned Rep; + HDC Dc; + TRIVERTEX vert[2]; + static GRADIENT_RECT gcap = {0, 1}; + + Dc = PerfInfo->ForegroundDc; + for (Rep = 0; Rep < Reps; Rep++) + { + vert[0].x = 0; + vert[0].y = 0; + vert[0].Red = 0xff00; + vert[0].Green = 0xff00 - 0xff00 * Rep / Reps; + vert[0].Blue = 0xff00 * Rep / Reps; + vert[0].Alpha = 0; + + vert[1].x = PerfInfo->WndWidth; + vert[1].y = PerfInfo->WndHeight; + vert[1].Red = 0xff00 - 0xff00 * Rep / Reps; + vert[1].Green = 0xff00 * Rep / Reps; + vert[1].Blue = 0xff00; + vert[1].Alpha = 0; + + GradientFill(Dc, vert, 2, &gcap, 1, GRADIENT_FILL_RECT_H); + } +} + +void +GradientVerticalProc(void *Context, PPERF_INFO PerfInfo, unsigned Reps) +{ + unsigned Rep; + HDC Dc; + TRIVERTEX vert[2]; + static GRADIENT_RECT gcap = {0, 1}; + + Dc = PerfInfo->ForegroundDc; + for (Rep = 0; Rep < Reps; Rep++) + { + vert[0].x = 0; + vert[0].y = 0; + vert[0].Red = 0xff00 * Rep / Reps; + vert[0].Green = 0xff00 - 0xff00 * Rep / Reps; + vert[0].Blue = 0xff00; + vert[0].Alpha = 0; + + vert[1].x = PerfInfo->WndWidth; + vert[1].y = PerfInfo->WndHeight; + vert[1].Red = 0xff00 - 0xff00 * Rep / Reps; + vert[1].Green = 0xff00; + vert[1].Blue = 0xff00 * Rep / Reps; + vert[1].Alpha = 0; + + GradientFill(Dc, vert, 2, &gcap, 1, GRADIENT_FILL_RECT_V); + } +} + +/* EOF */ Modified: trunk/reactos/base/applications/utils/rosperf/rosperf.h URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/utils/ros… ============================================================================== --- trunk/reactos/base/applications/utils/rosperf/rosperf.h (original) +++ trunk/reactos/base/applications/utils/rosperf/rosperf.h Mon Apr 10 21:16:37 2006 @@ -65,6 +65,10 @@ void AlphaBlendCleanup(void *Context, PPERF_INFO PerfInfo); void AlphaBlendProc(void *Context, PPERF_INFO PerfInfo, unsigned Reps); +void GradientHorizontalProc(void *Context, PPERF_INFO PerfInfo, unsigned Reps); +void GradientVerticalProc(void *Context, PPERF_INFO PerfInfo, unsigned Reps); +void GradientProc(void *Context, PPERF_INFO PerfInfo, unsigned Reps); + #endif /* ROSPERF_H_INCLUDED */ /* EOF */ Modified: trunk/reactos/base/applications/utils/rosperf/rosperf.rbuild URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/utils/ros… ============================================================================== --- trunk/reactos/base/applications/utils/rosperf/rosperf.rbuild (original) +++ trunk/reactos/base/applications/utils/rosperf/rosperf.rbuild Mon Apr 10 21:16:37 2006 @@ -2,7 +2,7 @@ <include base="rosperf">.</include> <define name="__USE_W32API" /> <define name="UNICODE" /> - <define name="WINVER">0x0500</define> + <define name="WINVER">0x0501</define> <library>version</library> <library>msimg32</library> <library>gdi32</library> @@ -15,5 +15,6 @@ <file>text.c</file> <file>alphablend.c</file> <file>testlist.c</file> + <file>gradient.c</file> <file>rosperf.rc</file> </module> Modified: trunk/reactos/base/applications/utils/rosperf/testlist.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/utils/ros… ============================================================================== --- trunk/reactos/base/applications/utils/rosperf/testlist.c (original) +++ trunk/reactos/base/applications/utils/rosperf/testlist.c Mon Apr 10 21:16:37 2006 @@ -27,7 +27,10 @@ { L"vlines", L"Vertical Lines", NullInit, LinesVerticalProc, NullCleanup, NullCleanup }, { L"lines", L"Lines", NullInit, LinesProc, NullCleanup, NullCleanup }, { L"text", L"Text", NullInit, TextProc, NullCleanup, NullCleanup }, - { L"alpha", L"Alpha Blend", AlphaBlendInit, AlphaBlendProc, NullCleanup, AlphaBlendCleanup } + { L"alpha", L"Alpha Blend", AlphaBlendInit, AlphaBlendProc, NullCleanup, AlphaBlendCleanup }, + { L"hgradient", L"Horizontal Gradient", NullInit, GradientHorizontalProc, NullCleanup, NullCleanup }, + { L"vgradient", L"Vertical Gradient", NullInit, GradientVerticalProc, NullCleanup, NullCleanup }, + { L"gradient", L"Gradient", NullInit, GradientProc, NullCleanup, NullCleanup } };

1 0

[tretiakov] 21539: Build rosperf and ps
by tretiakov＠svn.reactos.org 10 Apr '06

10 Apr '06

Author: tretiakov Date: Mon Apr 10 20:42:55 2006 New Revision: 21539 URL: http://svn.reactos.ru/svn/reactos?rev=21539&view=rev Log: Build rosperf and ps Added: trunk/reactos/base/applications/utils/utils.rbuild Removed: trunk/reactos/base/applications/utils/directory.rbuild Modified: trunk/reactos/base/applications/applications.rbuild Modified: trunk/reactos/base/applications/applications.rbuild URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/applicati… ============================================================================== --- trunk/reactos/base/applications/applications.rbuild (original) +++ trunk/reactos/base/applications/applications.rbuild Mon Apr 10 20:42:55 2006 @@ -61,4 +61,7 @@ <directory name="control"> <xi:include href="control/control.rbuild" /> </directory> +<directory name="utils"> + <xi:include href="utils/utils.rbuild" /> +</directory> </group> Removed: trunk/reactos/base/applications/utils/directory.rbuild URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/utils/dir… ============================================================================== --- trunk/reactos/base/applications/utils/directory.rbuild (original) +++ trunk/reactos/base/applications/utils/directory.rbuild (removed) @@ -1,17 +1,0 @@ -<group> -<directory name="net"> - <xi:include href="net/directory.rbuild" /> -</directory> -<directory name="getfirefox"> - <xi:include href="getfirefox/getfirefox.rbuild" /> -</directory> -<directory name="shutdown"> - <xi:include href="shutdown/shutdown.rbuild" /> -</directory> -<directory name="ps"> - <xi:include href="ps/ps.rbuild" /> -</directory> -<directory name="rosperf"> - <xi:include href="rosperf/rosperf.rbuild" /> -</directory> -</group> Added: trunk/reactos/base/applications/utils/utils.rbuild URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/utils/uti… ============================================================================== --- trunk/reactos/base/applications/utils/utils.rbuild (added) +++ trunk/reactos/base/applications/utils/utils.rbuild Mon Apr 10 20:42:55 2006 @@ -1,0 +1,8 @@ +<group> +<directory name="ps"> + <xi:include href="ps/ps.rbuild" /> +</directory> +<directory name="rosperf"> + <xi:include href="rosperf/rosperf.rbuild" /> +</directory> +</group>

1 0

[tretiakov] 21538: [AUDIT] \trunk\reactos\base\applications\utils\rosperf (unlock) GvG (the author) confirmed it is clean.
by tretiakov＠svn.reactos.org 10 Apr '06

10 Apr '06

Author: tretiakov Date: Mon Apr 10 20:13:17 2006 New Revision: 21538 URL: http://svn.reactos.ru/svn/reactos?rev=21538&view=rev Log: [AUDIT] \trunk\reactos\base\applications\utils\rosperf (unlock) GvG (the author) confirmed it is clean. Modified: trunk/reactos/base/applications/utils/rosperf/alphablend.c (props changed) trunk/reactos/base/applications/utils/rosperf/fill.c (props changed) trunk/reactos/base/applications/utils/rosperf/lines.c (props changed) trunk/reactos/base/applications/utils/rosperf/rosperf.c (props changed) trunk/reactos/base/applications/utils/rosperf/rosperf.h (props changed) trunk/reactos/base/applications/utils/rosperf/testlist.c (props changed) trunk/reactos/base/applications/utils/rosperf/text.c (props changed) Propchange: trunk/reactos/base/applications/utils/rosperf/alphablend.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/base/applications/utils/rosperf/fill.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/base/applications/utils/rosperf/lines.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/base/applications/utils/rosperf/rosperf.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/base/applications/utils/rosperf/rosperf.h ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/base/applications/utils/rosperf/testlist.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/base/applications/utils/rosperf/text.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -*

1 0

[gedmurphy] 21537: vendor drop, stdole from Wine
by gedmurphy＠svn.reactos.org 09 Apr '06

09 Apr '06

Author: gedmurphy Date: Mon Apr 10 02:12:21 2006 New Revision: 21537 URL: http://svn.reactos.ru/svn/reactos?rev=21537&view=rev Log: vendor drop, stdole from Wine Added: vendor/wine/dlls/stdole2/ vendor/wine/dlls/stdole2/Wine-0_9_11/ vendor/wine/dlls/stdole2/Wine-0_9_11/Makefile.in vendor/wine/dlls/stdole2/Wine-0_9_11/rsrc.rc vendor/wine/dlls/stdole2/Wine-0_9_11/std_ole_v2.idl vendor/wine/dlls/stdole2/Wine-0_9_11/stdole2.tlb.spec vendor/wine/dlls/stdole2/current/ vendor/wine/dlls/stdole2/current/Makefile.in vendor/wine/dlls/stdole2/current/rsrc.rc vendor/wine/dlls/stdole2/current/std_ole_v2.idl vendor/wine/dlls/stdole2/current/stdole2.tlb.spec vendor/wine/dlls/stdole32/ vendor/wine/dlls/stdole32/Wine-0_9_11/ vendor/wine/dlls/stdole32/Wine-0_9_11/Makefile.in vendor/wine/dlls/stdole32/Wine-0_9_11/rsrc.rc vendor/wine/dlls/stdole32/Wine-0_9_11/std_ole_v1.idl vendor/wine/dlls/stdole32/Wine-0_9_11/stdole32.tlb.spec vendor/wine/dlls/stdole32/current/ vendor/wine/dlls/stdole32/current/Makefile.in vendor/wine/dlls/stdole32/current/rsrc.rc vendor/wine/dlls/stdole32/current/std_ole_v1.idl vendor/wine/dlls/stdole32/current/stdole32.tlb.spec Added: vendor/wine/dlls/stdole2/Wine-0_9_11/Makefile.in URL: http://svn.reactos.ru/svn/reactos/vendor/wine/dlls/stdole2/Wine-0_9_11/Make… ============================================================================== --- vendor/wine/dlls/stdole2/Wine-0_9_11/Makefile.in (added) +++ vendor/wine/dlls/stdole2/Wine-0_9_11/Makefile.in Mon Apr 10 02:12:21 2006 @@ -1,0 +1,13 @@ +TOPSRCDIR = @top_srcdir@ +TOPOBJDIR = ../.. +SRCDIR = @srcdir@ +VPATH = @srcdir@ +MODULE = stdole2.tlb +IMPORTS = kernel32 + +RC_SRCS = rsrc.rc +RC_TLB = std_ole_v2.tlb + +@MAKE_DLL_RULES@ + +### Dependencies: Added: vendor/wine/dlls/stdole2/Wine-0_9_11/rsrc.rc URL: http://svn.reactos.ru/svn/reactos/vendor/wine/dlls/stdole2/Wine-0_9_11/rsrc… ============================================================================== --- vendor/wine/dlls/stdole2/Wine-0_9_11/rsrc.rc (added) +++ vendor/wine/dlls/stdole2/Wine-0_9_11/rsrc.rc Mon Apr 10 02:12:21 2006 @@ -1,0 +1,30 @@ +/* + * Resource file for stdole2 + * + * Copyright 2005 Huw Davies + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#include "windef.h" +#include "winbase.h" +#include "winuser.h" +#include "winnls.h" + +LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL + +#include "wine/wine_common_ver.rc" + +1 TYPELIB LOADONCALL DISCARDABLE std_ole_v2.tlb Added: vendor/wine/dlls/stdole2/Wine-0_9_11/std_ole_v2.idl URL: http://svn.reactos.ru/svn/reactos/vendor/wine/dlls/stdole2/Wine-0_9_11/std_… ============================================================================== --- vendor/wine/dlls/stdole2/Wine-0_9_11/std_ole_v2.idl (added) +++ vendor/wine/dlls/stdole2/Wine-0_9_11/std_ole_v2.idl Mon Apr 10 02:12:21 2006 @@ -1,0 +1,434 @@ +/* + * Copyright (C) 2003 Robert Shearman + * 2005 Huw Davies + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + */ + +[ + uuid(00020430-0000-0000-C000-000000000046), + version(2.0), + helpstring("OLE Automation") +] +library stdole +{ + /* typedefs aren't stored in the type library. + These type names are known by the type compiler so it + doesn't really matter what we define them as. */ + + typedef short VARIANT_BOOL; + typedef long BSTR; + typedef double CURRENCY; + typedef unsigned long HRESULT; + typedef void *VARIANT; + typedef unsigned long SCODE; + + typedef struct GUID { + unsigned long Data1; + unsigned short Data2; + unsigned short Data3; + unsigned char Data4[ 8 ]; + } GUID; + + typedef struct DISPPARAMS { + VARIANT *rgvarg; + long *rgdispidNamedArgs; + unsigned int cArgs; + unsigned int cNamedArgs; + } DISPPARAMS; + + typedef struct EXCEPINFO { + unsigned short wCode; + unsigned short wReserved; + BSTR bstrSource; + BSTR bstrDescription; + BSTR bstrHelpFile; + unsigned long dwHelpContext; + void *pvReserved; + void *pfnDeferredFillIn; + SCODE scode; + } EXCEPINFO; + + [ + odl, + uuid(00000000-0000-0000-C000-000000000046) + ] + interface IUnknown + { + [restricted] + HRESULT QueryInterface( + [in] GUID *riid, + [out] void **ppvObj); + + [restricted] + unsigned long AddRef(); + + [restricted] + unsigned long Release(); + } + + [ + odl, + uuid(00020400-0000-0000-C000-000000000046) + ] + interface IDispatch : IUnknown + { + [restricted] + HRESULT GetTypeInfoCount( + [out] unsigned int *pctinfo); + + [restricted] + HRESULT GetTypeInfo( + [in] unsigned int itinfo, + [in] unsigned long lcid, + [out] void **pptinfo); + + [restricted] + HRESULT GetIDsOfNames( + [in] GUID *riid, + [in] char **rgszNames, + [in] unsigned int cNames, + [in] unsigned long lcid, + [out] long *rgdispid); + + [restricted] + HRESULT Invoke( + [in] long dispidMember, + [in] GUID *riid, + [in] unsigned long lcid, + [in] unsigned short wFlags, + [in] DISPPARAMS *pdispparams, + [out] VARIANT *pvarResult, + [out] EXCEPINFO *pexcepinfo, + [out] unsigned int *puArgErr); + + } + + [ + odl, + uuid(00020404-0000-0000-C000-000000000046) + ] + interface IEnumVARIANT : IUnknown + { + HRESULT Next( + [in] unsigned long celt, + [in] VARIANT *rgvar, + [out] unsigned long *pceltFetched); + + HRESULT Skip( + [in] unsigned long celt); + + HRESULT Reset(); + + HRESULT Clone( + [out] IEnumVARIANT **ppenum); + } + + typedef [uuid(66504301-BE0F-101A-8BBB-00AA00300CAB), public] + unsigned long OLE_COLOR; + + typedef [uuid(66504302-BE0F-101A-8BBB-00AA00300CAB), public] + long OLE_XPOS_PIXELS; + + typedef [uuid(66504303-BE0F-101A-8BBB-00AA00300CAB), public] + long OLE_YPOS_PIXELS; + + typedef [uuid(66504304-BE0F-101A-8BBB-00AA00300CAB), public] + long OLE_XSIZE_PIXELS; + + typedef [uuid(66504305-BE0F-101A-8BBB-00AA00300CAB), public] + long OLE_YSIZE_PIXELS; + + typedef [uuid(66504306-BE0F-101A-8BBB-00AA00300CAB), public] + long OLE_XPOS_HIMETRIC; + + typedef [uuid(66504307-BE0F-101A-8BBB-00AA00300CAB), public] + long OLE_YPOS_HIMETRIC; + + typedef [uuid(66504308-BE0F-101A-8BBB-00AA00300CAB), public] + long OLE_XSIZE_HIMETRIC; + + typedef [uuid(66504309-BE0F-101A-8BBB-00AA00300CAB), public] + long OLE_YSIZE_HIMETRIC; + + typedef [uuid(BF030640-9069-101B-AE2D-08002B2EC713), public] + float OLE_XPOS_CONTAINER; + + typedef [uuid(BF030641-9069-101B-AE2D-08002B2EC713), public] + float OLE_YPOS_CONTAINER; + + typedef [uuid(BF030642-9069-101B-AE2D-08002B2EC713), public] + float OLE_XSIZE_CONTAINER; + + typedef [uuid(BF030643-9069-101B-AE2D-08002B2EC713), public] + float OLE_YSIZE_CONTAINER; + + typedef [uuid(66504313-BE0F-101A-8BBB-00AA00300CAB), public] + int OLE_HANDLE; + + typedef [uuid(6650430B-BE0F-101A-8BBB-00AA00300CAB), public] + VARIANT_BOOL OLE_OPTEXCLUSIVE; + + typedef [uuid(BF030644-9069-101B-AE2D-08002B2EC713), public] + VARIANT_BOOL OLE_CANCELBOOL; + + typedef [uuid(BF030645-9069-101B-AE2D-08002B2EC713), public] + VARIANT_BOOL OLE_ENABLEDEFAULTBOOL; + + /* FIXME: widl can't cope with enum attributes yet */ + /* + [ + uuid(6650430A-BE0F-101A-8BBB-00AA00300CAB) + ] + */ + enum OLE_TRISTATE { + Unchecked = 0, + Checked = 1, + Gray = 2 + }; + + typedef [uuid(6650430D-BE0F-101A-8BBB-00AA00300CAB), public] + BSTR FONTNAME; + + typedef [uuid(6650430E-BE0F-101A-8BBB-00AA00300CAB), public] + CURRENCY FONTSIZE; + + typedef [uuid(6650430F-BE0F-101A-8BBB-00AA00300CAB), public] + VARIANT_BOOL FONTBOLD; + + typedef [uuid(66504310-BE0F-101A-8BBB-00AA00300CAB), public] + VARIANT_BOOL FONTITALIC; + + typedef [uuid(66504311-BE0F-101A-8BBB-00AA00300CAB), public] + VARIANT_BOOL FONTUNDERSCORE; + + typedef [uuid(66504312-BE0F-101A-8BBB-00AA00300CAB), public] + VARIANT_BOOL FONTSTRIKETHROUGH; + + + [ + odl, + uuid(BEF6E002-A874-101A-8BBA-00AA00300CAB), + helpstring("Font Object"), + hidden + ] + interface IFont { + [propget] HRESULT Name([out, retval] BSTR *pname); + [propput] HRESULT Name([in] BSTR pname); + + [propget] HRESULT Size([out, retval] CURRENCY *psize); + [propput] HRESULT Size([in] BSTR psize); + + [propget] HRESULT Bold([out, retval] VARIANT_BOOL *pbold); + [propput] HRESULT Bold([in] VARIANT_BOOL pbold); + + [propget] HRESULT Italic([out, retval] VARIANT_BOOL *pitalic); + [propput] HRESULT Italic([in] VARIANT_BOOL pitalic); + + [propget] HRESULT Underline([out, retval] VARIANT_BOOL *punderline); + [propput] HRESULT Underline([in] VARIANT_BOOL punderline); + + [propget] HRESULT Strikethrough([out, retval] VARIANT_BOOL *pstrikethrough); + [propput] HRESULT Strikethrough([in] VARIANT_BOOL pstrikethrough); + + [propget] HRESULT Weight([out, retval] short *pweight); + [propput] HRESULT Weight([in] short pweight); + + [propget] HRESULT Charset([out, retval] short *pcharset); + [propput] HRESULT Charset([in] short pcharset); + + [propget] HRESULT hFont([out, retval] OLE_HANDLE *phfont); + + HRESULT Clone([out] IFont **ppfont); + + HRESULT IsEqual([in] IFont *pfontOther); + + HRESULT SetRatio([in] long cyLogical, [in] long cyHimetric); + + HRESULT AddRefHfont([in] OLE_HANDLE hFont); + + HRESULT ReleaseHfont([in] OLE_HANDLE hFont); + }; + + + [ + odl, + uuid(BEF6E003-A874-101A-8BBA-00AA00300CAB) + ] + dispinterface Font { + properties: + [id(0x0)] BSTR Name; + [id(0x2)] CURRENCY Size; + [id(0x3)] VARIANT_BOOL Bold; + [id(0x4)] VARIANT_BOOL Italic; + [id(0x5)] VARIANT_BOOL Underline; + [id(0x6)] VARIANT_BOOL Strikethrough; + [id(0x7)] short Weight; + [id(0x8)] short Charset; + methods: + } + + typedef [public] Font IFontDisp; + + [ + uuid(0BE35203-8F91-11CE-9DE3-00AA004BB851) + ] + coclass StdFont { + [default] dispinterface Font; + /* FIXME: We can't reference dispinterface FontEvents here because we need it to + appear at the end of the typelib. */ +/* [default, source] dispinterface FontEvents;*/ + interface IFont; + }; + + [ + odl, + uuid(7BF80980-BF32-101A-8BBB-00AA00300CAB), + helpstring("Picture Object"), + hidden + ] + interface IPicture /*: IUnknown*/ { + [propget] HRESULT Handle([out, retval] OLE_HANDLE *phandle); + + [propget] HRESULT hPal([out, retval] OLE_HANDLE *phpal); + + [propget] HRESULT Type([out, retval] short *ptype); + + [propget] HRESULT Width([out, retval] OLE_XSIZE_HIMETRIC *pwidth); + + [propget] HRESULT Height([out, retval] OLE_YSIZE_HIMETRIC *pheight); + + HRESULT Render([in] int hdc, + [in] long x, + [in] long y, + [in] long cx, + [in] long cy, + [in] OLE_XPOS_HIMETRIC xSrc, + [in] OLE_YPOS_HIMETRIC ySrc, + [in] OLE_XSIZE_HIMETRIC cxSrc, + [in] OLE_YSIZE_HIMETRIC cySrc, + [in] void *prcWBounds); + + [propput] HRESULT hPal([in] OLE_HANDLE phpal); + + [propget] HRESULT CurDC([out, retval] int *phdcOut); + + HRESULT SelectPicture([in] int hdcIn, + [out] int *phdcOut, + [out] OLE_HANDLE *phbmpOut); + + [propget] HRESULT KeepOriginalFormat([out, retval] VARIANT_BOOL *pfkeep); + [propput] HRESULT KeepOriginalFormat([in] VARIANT_BOOL pfkeep); + + HRESULT PictureChanged(); + + HRESULT SaveAsFile([in] void *pstm, + [in] VARIANT_BOOL fSaveMemCopy, + [out] long *pcbSize); + + [propget] HRESULT Attributes([out, retval] long *pdwAttr); + + HRESULT SetHdc([in] OLE_HANDLE hdc); + }; + + [ + uuid(7BF80981-BF32-101A-8BBB-00AA00300CAB) + ] + dispinterface Picture { + properties: + [id(0x0), readonly] OLE_HANDLE Handle; + [id(0x2)] OLE_HANDLE hPal; + [id(0x3), readonly] short Type; + [id(0x4), readonly] OLE_XSIZE_HIMETRIC Width; + [id(0x5), readonly] OLE_XSIZE_HIMETRIC Height; + methods: + [id(0x6)] void Render(int hdc, + long x, + long y, + long cx, + long cy, + OLE_XPOS_HIMETRIC xSrc, + OLE_YPOS_HIMETRIC ySrc, + OLE_XSIZE_HIMETRIC cxSrc, + OLE_YSIZE_HIMETRIC cySrc, + void *prcWBounds); + }; + + typedef [public] Picture IPictureDisp; + + [ + uuid(0BE35204-8F91-11CE-9DE3-00AA004BB851) + ] + coclass StdPicture { + [default] dispinterface Picture; + interface IPicture; + }; + + /* FIXME: widl can't cope with enum attributes yet */ + /* + [ + uuid(E6C8FA08-BD9F-11D0-985E-00C04FC29993) + ] + */ + enum LoadPictureConstants { + Default = 0, + Monochrome = 1, + VgaColor = 2, + Color = 4 + }; + + [ + dllname("oleaut32.dll"), + uuid(91209AC0-60F6-11CF-9C5D-00AA00C1489E), + helpstring("Functions for Standard OLE Objects"), + helpcontext(0x2775) + ] + module StdFunctions{ + [ + entry("OleLoadPictureFileEx"), + helpstring("Loads a picture from a file"), + helpcontext(0x2775) + ] + HRESULT LoadPicture([in, optional] VARIANT filename, + [in, optional, defaultvalue(0)] int widthDesired, + [in, optional, defaultvalue(0)] int heightDesired, + [in, optional, defaultvalue(Default)] enum LoadPictureConstants flags, + [out, retval] IPictureDisp **retval); + [ + entry("OleSavePictureFile"), + helpstring("Saves a picture to a file"), + helpcontext(0x2775) + ] + HRESULT SavePicture([in] IPictureDisp *Picture, + [in] BSTR filename); + }; + + + [ + uuid(4EF6100A-AF88-11D0-9846-00C04FC29993), + helpstring("Event Interface for the Font Object"), + hidden + ] + dispinterface FontEvents { + properties: + methods: + [id(0x9)] void FontChanged([in] BSTR PropertyName); + }; + + typedef [public] FontEvents IFontEventsDisp; + + +}; Added: vendor/wine/dlls/stdole2/Wine-0_9_11/stdole2.tlb.spec URL: http://svn.reactos.ru/svn/reactos/vendor/wine/dlls/stdole2/Wine-0_9_11/stdo… ============================================================================== --- vendor/wine/dlls/stdole2/Wine-0_9_11/stdole2.tlb.spec (added) +++ vendor/wine/dlls/stdole2/Wine-0_9_11/stdole2.tlb.spec Mon Apr 10 02:12:21 2006 @@ -1,0 +1,1 @@ +# no exported entry points Added: vendor/wine/dlls/stdole2/current/Makefile.in URL: http://svn.reactos.ru/svn/reactos/vendor/wine/dlls/stdole2/current/Makefile… ============================================================================== --- vendor/wine/dlls/stdole2/current/Makefile.in (added) +++ vendor/wine/dlls/stdole2/current/Makefile.in Mon Apr 10 02:12:21 2006 @@ -1,0 +1,13 @@ +TOPSRCDIR = @top_srcdir@ +TOPOBJDIR = ../.. +SRCDIR = @srcdir@ +VPATH = @srcdir@ +MODULE = stdole2.tlb +IMPORTS = kernel32 + +RC_SRCS = rsrc.rc +RC_TLB = std_ole_v2.tlb + +@MAKE_DLL_RULES@ + +### Dependencies: Added: vendor/wine/dlls/stdole2/current/rsrc.rc URL: http://svn.reactos.ru/svn/reactos/vendor/wine/dlls/stdole2/current/rsrc.rc?… ============================================================================== --- vendor/wine/dlls/stdole2/current/rsrc.rc (added) +++ vendor/wine/dlls/stdole2/current/rsrc.rc Mon Apr 10 02:12:21 2006 @@ -1,0 +1,30 @@ +/* + * Resource file for stdole2 + * + * Copyright 2005 Huw Davies + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#include "windef.h" +#include "winbase.h" +#include "winuser.h" +#include "winnls.h" + +LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL + +#include "wine/wine_common_ver.rc" + +1 TYPELIB LOADONCALL DISCARDABLE std_ole_v2.tlb Added: vendor/wine/dlls/stdole2/current/std_ole_v2.idl URL: http://svn.reactos.ru/svn/reactos/vendor/wine/dlls/stdole2/current/std_ole_… ============================================================================== --- vendor/wine/dlls/stdole2/current/std_ole_v2.idl (added) +++ vendor/wine/dlls/stdole2/current/std_ole_v2.idl Mon Apr 10 02:12:21 2006 @@ -1,0 +1,434 @@ +/* + * Copyright (C) 2003 Robert Shearman + * 2005 Huw Davies + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + */ + +[ + uuid(00020430-0000-0000-C000-000000000046), + version(2.0), + helpstring("OLE Automation") +] +library stdole +{ + /* typedefs aren't stored in the type library. + These type names are known by the type compiler so it + doesn't really matter what we define them as. */ + + typedef short VARIANT_BOOL; + typedef long BSTR; + typedef double CURRENCY; + typedef unsigned long HRESULT; + typedef void *VARIANT; + typedef unsigned long SCODE; + + typedef struct GUID { + unsigned long Data1; + unsigned short Data2; + unsigned short Data3; + unsigned char Data4[ 8 ]; + } GUID; + + typedef struct DISPPARAMS { + VARIANT *rgvarg; + long *rgdispidNamedArgs; + unsigned int cArgs; + unsigned int cNamedArgs; + } DISPPARAMS; + + typedef struct EXCEPINFO { + unsigned short wCode; + unsigned short wReserved; + BSTR bstrSource; + BSTR bstrDescription; + BSTR bstrHelpFile; + unsigned long dwHelpContext; + void *pvReserved; + void *pfnDeferredFillIn; + SCODE scode; + } EXCEPINFO; + + [ + odl, + uuid(00000000-0000-0000-C000-000000000046) + ] + interface IUnknown + { + [restricted] + HRESULT QueryInterface( + [in] GUID *riid, + [out] void **ppvObj); + + [restricted] + unsigned long AddRef(); + + [restricted] + unsigned long Release(); + } + + [ + odl, + uuid(00020400-0000-0000-C000-000000000046) + ] + interface IDispatch : IUnknown + { + [restricted] + HRESULT GetTypeInfoCount( + [out] unsigned int *pctinfo); + + [restricted] + HRESULT GetTypeInfo( + [in] unsigned int itinfo, + [in] unsigned long lcid, + [out] void **pptinfo); + + [restricted] + HRESULT GetIDsOfNames( + [in] GUID *riid, + [in] char **rgszNames, + [in] unsigned int cNames, + [in] unsigned long lcid, + [out] long *rgdispid); + + [restricted] + HRESULT Invoke( + [in] long dispidMember, + [in] GUID *riid, + [in] unsigned long lcid, + [in] unsigned short wFlags, + [in] DISPPARAMS *pdispparams, + [out] VARIANT *pvarResult, + [out] EXCEPINFO *pexcepinfo, + [out] unsigned int *puArgErr); + + } + + [ + odl, + uuid(00020404-0000-0000-C000-000000000046) + ] + interface IEnumVARIANT : IUnknown + { + HRESULT Next( + [in] unsigned long celt, + [in] VARIANT *rgvar, + [out] unsigned long *pceltFetched); + + HRESULT Skip( + [in] unsigned long celt); + + HRESULT Reset(); + + HRESULT Clone( + [out] IEnumVARIANT **ppenum); + } + + typedef [uuid(66504301-BE0F-101A-8BBB-00AA00300CAB), public] + unsigned long OLE_COLOR; + + typedef [uuid(66504302-BE0F-101A-8BBB-00AA00300CAB), public] + long OLE_XPOS_PIXELS; + + typedef [uuid(66504303-BE0F-101A-8BBB-00AA00300CAB), public] + long OLE_YPOS_PIXELS; + + typedef [uuid(66504304-BE0F-101A-8BBB-00AA00300CAB), public] + long OLE_XSIZE_PIXELS; + + typedef [uuid(66504305-BE0F-101A-8BBB-00AA00300CAB), public] + long OLE_YSIZE_PIXELS; + + typedef [uuid(66504306-BE0F-101A-8BBB-00AA00300CAB), public] + long OLE_XPOS_HIMETRIC; + + typedef [uuid(66504307-BE0F-101A-8BBB-00AA00300CAB), public] + long OLE_YPOS_HIMETRIC; + + typedef [uuid(66504308-BE0F-101A-8BBB-00AA00300CAB), public] + long OLE_XSIZE_HIMETRIC; + + typedef [uuid(66504309-BE0F-101A-8BBB-00AA00300CAB), public] + long OLE_YSIZE_HIMETRIC; + + typedef [uuid(BF030640-9069-101B-AE2D-08002B2EC713), public] + float OLE_XPOS_CONTAINER; + + typedef [uuid(BF030641-9069-101B-AE2D-08002B2EC713), public] + float OLE_YPOS_CONTAINER; + + typedef [uuid(BF030642-9069-101B-AE2D-08002B2EC713), public] + float OLE_XSIZE_CONTAINER; + + typedef [uuid(BF030643-9069-101B-AE2D-08002B2EC713), public] + float OLE_YSIZE_CONTAINER; + + typedef [uuid(66504313-BE0F-101A-8BBB-00AA00300CAB), public] + int OLE_HANDLE; + + typedef [uuid(6650430B-BE0F-101A-8BBB-00AA00300CAB), public] + VARIANT_BOOL OLE_OPTEXCLUSIVE; + + typedef [uuid(BF030644-9069-101B-AE2D-08002B2EC713), public] + VARIANT_BOOL OLE_CANCELBOOL; + + typedef [uuid(BF030645-9069-101B-AE2D-08002B2EC713), public] + VARIANT_BOOL OLE_ENABLEDEFAULTBOOL; + + /* FIXME: widl can't cope with enum attributes yet */ + /* + [ + uuid(6650430A-BE0F-101A-8BBB-00AA00300CAB) + ] + */ + enum OLE_TRISTATE { + Unchecked = 0, + Checked = 1, + Gray = 2 + }; + + typedef [uuid(6650430D-BE0F-101A-8BBB-00AA00300CAB), public] + BSTR FONTNAME; + + typedef [uuid(6650430E-BE0F-101A-8BBB-00AA00300CAB), public] + CURRENCY FONTSIZE; + + typedef [uuid(6650430F-BE0F-101A-8BBB-00AA00300CAB), public] + VARIANT_BOOL FONTBOLD; + + typedef [uuid(66504310-BE0F-101A-8BBB-00AA00300CAB), public] + VARIANT_BOOL FONTITALIC; + + typedef [uuid(66504311-BE0F-101A-8BBB-00AA00300CAB), public] + VARIANT_BOOL FONTUNDERSCORE; + + typedef [uuid(66504312-BE0F-101A-8BBB-00AA00300CAB), public] + VARIANT_BOOL FONTSTRIKETHROUGH; + + + [ + odl, + uuid(BEF6E002-A874-101A-8BBA-00AA00300CAB), + helpstring("Font Object"), + hidden + ] + interface IFont { + [propget] HRESULT Name([out, retval] BSTR *pname); + [propput] HRESULT Name([in] BSTR pname); + + [propget] HRESULT Size([out, retval] CURRENCY *psize); + [propput] HRESULT Size([in] BSTR psize); + + [propget] HRESULT Bold([out, retval] VARIANT_BOOL *pbold); + [propput] HRESULT Bold([in] VARIANT_BOOL pbold); + + [propget] HRESULT Italic([out, retval] VARIANT_BOOL *pitalic); + [propput] HRESULT Italic([in] VARIANT_BOOL pitalic); + + [propget] HRESULT Underline([out, retval] VARIANT_BOOL *punderline); + [propput] HRESULT Underline([in] VARIANT_BOOL punderline); + + [propget] HRESULT Strikethrough([out, retval] VARIANT_BOOL *pstrikethrough); + [propput] HRESULT Strikethrough([in] VARIANT_BOOL pstrikethrough); + + [propget] HRESULT Weight([out, retval] short *pweight); + [propput] HRESULT Weight([in] short pweight); + + [propget] HRESULT Charset([out, retval] short *pcharset); + [propput] HRESULT Charset([in] short pcharset); + + [propget] HRESULT hFont([out, retval] OLE_HANDLE *phfont); + + HRESULT Clone([out] IFont **ppfont); + + HRESULT IsEqual([in] IFont *pfontOther); + + HRESULT SetRatio([in] long cyLogical, [in] long cyHimetric); + + HRESULT AddRefHfont([in] OLE_HANDLE hFont); + + HRESULT ReleaseHfont([in] OLE_HANDLE hFont); + }; + + + [ + odl, + uuid(BEF6E003-A874-101A-8BBA-00AA00300CAB) + ] + dispinterface Font { + properties: + [id(0x0)] BSTR Name; + [id(0x2)] CURRENCY Size; + [id(0x3)] VARIANT_BOOL Bold; + [id(0x4)] VARIANT_BOOL Italic; + [id(0x5)] VARIANT_BOOL Underline; + [id(0x6)] VARIANT_BOOL Strikethrough; + [id(0x7)] short Weight; + [id(0x8)] short Charset; + methods: + } + + typedef [public] Font IFontDisp; + + [ + uuid(0BE35203-8F91-11CE-9DE3-00AA004BB851) + ] + coclass StdFont { + [default] dispinterface Font; + /* FIXME: We can't reference dispinterface FontEvents here because we need it to + appear at the end of the typelib. */ +/* [default, source] dispinterface FontEvents;*/ + interface IFont; + }; + + [ + odl, + uuid(7BF80980-BF32-101A-8BBB-00AA00300CAB), + helpstring("Picture Object"), + hidden + ] + interface IPicture /*: IUnknown*/ { + [propget] HRESULT Handle([out, retval] OLE_HANDLE *phandle); + + [propget] HRESULT hPal([out, retval] OLE_HANDLE *phpal); + + [propget] HRESULT Type([out, retval] short *ptype); + + [propget] HRESULT Width([out, retval] OLE_XSIZE_HIMETRIC *pwidth); + + [propget] HRESULT Height([out, retval] OLE_YSIZE_HIMETRIC *pheight); + + HRESULT Render([in] int hdc, + [in] long x, + [in] long y, + [in] long cx, + [in] long cy, + [in] OLE_XPOS_HIMETRIC xSrc, + [in] OLE_YPOS_HIMETRIC ySrc, + [in] OLE_XSIZE_HIMETRIC cxSrc, + [in] OLE_YSIZE_HIMETRIC cySrc, + [in] void *prcWBounds); + + [propput] HRESULT hPal([in] OLE_HANDLE phpal); + + [propget] HRESULT CurDC([out, retval] int *phdcOut); + + HRESULT SelectPicture([in] int hdcIn, + [out] int *phdcOut, + [out] OLE_HANDLE *phbmpOut); + + [propget] HRESULT KeepOriginalFormat([out, retval] VARIANT_BOOL *pfkeep); + [propput] HRESULT KeepOriginalFormat([in] VARIANT_BOOL pfkeep); + + HRESULT PictureChanged(); + + HRESULT SaveAsFile([in] void *pstm, + [in] VARIANT_BOOL fSaveMemCopy, + [out] long *pcbSize); + + [propget] HRESULT Attributes([out, retval] long *pdwAttr); + + HRESULT SetHdc([in] OLE_HANDLE hdc); + }; + + [ + uuid(7BF80981-BF32-101A-8BBB-00AA00300CAB) + ] + dispinterface Picture { + properties: + [id(0x0), readonly] OLE_HANDLE Handle; + [id(0x2)] OLE_HANDLE hPal; + [id(0x3), readonly] short Type; + [id(0x4), readonly] OLE_XSIZE_HIMETRIC Width; + [id(0x5), readonly] OLE_XSIZE_HIMETRIC Height; + methods: + [id(0x6)] void Render(int hdc, + long x, + long y, + long cx, + long cy, + OLE_XPOS_HIMETRIC xSrc, + OLE_YPOS_HIMETRIC ySrc, + OLE_XSIZE_HIMETRIC cxSrc, + OLE_YSIZE_HIMETRIC cySrc, + void *prcWBounds); + }; + + typedef [public] Picture IPictureDisp; + + [ + uuid(0BE35204-8F91-11CE-9DE3-00AA004BB851) + ] + coclass StdPicture { + [default] dispinterface Picture; + interface IPicture; + }; + + /* FIXME: widl can't cope with enum attributes yet */ + /* + [ + uuid(E6C8FA08-BD9F-11D0-985E-00C04FC29993) + ] + */ + enum LoadPictureConstants { + Default = 0, + Monochrome = 1, + VgaColor = 2, + Color = 4 + }; + + [ + dllname("oleaut32.dll"), + uuid(91209AC0-60F6-11CF-9C5D-00AA00C1489E), + helpstring("Functions for Standard OLE Objects"), + helpcontext(0x2775) + ] + module StdFunctions{ + [ + entry("OleLoadPictureFileEx"), + helpstring("Loads a picture from a file"), + helpcontext(0x2775) + ] + HRESULT LoadPicture([in, optional] VARIANT filename, + [in, optional, defaultvalue(0)] int widthDesired, + [in, optional, defaultvalue(0)] int heightDesired, + [in, optional, defaultvalue(Default)] enum LoadPictureConstants flags, + [out, retval] IPictureDisp **retval); + [ + entry("OleSavePictureFile"), + helpstring("Saves a picture to a file"), + helpcontext(0x2775) + ] + HRESULT SavePicture([in] IPictureDisp *Picture, + [in] BSTR filename); + }; + + + [ + uuid(4EF6100A-AF88-11D0-9846-00C04FC29993), + helpstring("Event Interface for the Font Object"), + hidden + ] + dispinterface FontEvents { + properties: + methods: + [id(0x9)] void FontChanged([in] BSTR PropertyName); + }; + + typedef [public] FontEvents IFontEventsDisp; + + +}; Added: vendor/wine/dlls/stdole2/current/stdole2.tlb.spec URL: http://svn.reactos.ru/svn/reactos/vendor/wine/dlls/stdole2/current/stdole2.… ============================================================================== --- vendor/wine/dlls/stdole2/current/stdole2.tlb.spec (added) +++ vendor/wine/dlls/stdole2/current/stdole2.tlb.spec Mon Apr 10 02:12:21 2006 @@ -1,0 +1,1 @@ +# no exported entry points Added: vendor/wine/dlls/stdole32/Wine-0_9_11/Makefile.in URL: http://svn.reactos.ru/svn/reactos/vendor/wine/dlls/stdole32/Wine-0_9_11/Mak… ============================================================================== --- vendor/wine/dlls/stdole32/Wine-0_9_11/Makefile.in (added) +++ vendor/wine/dlls/stdole32/Wine-0_9_11/Makefile.in Mon Apr 10 02:12:21 2006 @@ -1,0 +1,13 @@ +TOPSRCDIR = @top_srcdir@ +TOPOBJDIR = ../.. +SRCDIR = @srcdir@ +VPATH = @srcdir@ +MODULE = stdole32.tlb +IMPORTS = kernel32 + +RC_SRCS = rsrc.rc +RC_TLB = std_ole_v1.tlb + +@MAKE_DLL_RULES@ + +### Dependencies: Added: vendor/wine/dlls/stdole32/Wine-0_9_11/rsrc.rc URL: http://svn.reactos.ru/svn/reactos/vendor/wine/dlls/stdole32/Wine-0_9_11/rsr… ============================================================================== --- vendor/wine/dlls/stdole32/Wine-0_9_11/rsrc.rc (added) +++ vendor/wine/dlls/stdole32/Wine-0_9_11/rsrc.rc Mon Apr 10 02:12:21 2006 @@ -1,0 +1,30 @@ +/* + * Resource file for stdole32 + * + * Copyright 2005 Huw Davies + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#include "windef.h" +#include "winbase.h" +#include "winuser.h" +#include "winnls.h" + +LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL + +#include "wine/wine_common_ver.rc" + +1 TYPELIB LOADONCALL DISCARDABLE std_ole_v1.tlb Added: vendor/wine/dlls/stdole32/Wine-0_9_11/std_ole_v1.idl URL: http://svn.reactos.ru/svn/reactos/vendor/wine/dlls/stdole32/Wine-0_9_11/std… ============================================================================== --- vendor/wine/dlls/stdole32/Wine-0_9_11/std_ole_v1.idl (added) +++ vendor/wine/dlls/stdole32/Wine-0_9_11/std_ole_v1.idl Mon Apr 10 02:12:21 2006 @@ -1,0 +1,137 @@ +/* + * Copyright (C) 2003 Robert Shearman + * 2005 Huw Davies + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + */ + +[ + uuid(00020430-0000-0000-C000-000000000046), + version(1.0), + helpstring("OLE Automation") +] +library stdole +{ + /* typedefs aren't stored in the type library. + These type names are known by the type compiler so it + doesn't really matter what we define them as. */ + + typedef void *VARIANT; + typedef wchar_t *BSTR; + typedef unsigned long SCODE; + typedef unsigned long HRESULT; + + typedef struct GUID { + unsigned long Data1; + unsigned short Data2; + unsigned short Data3; + unsigned char Data4[ 8 ]; + } GUID; + + typedef struct DISPPARAMS { + VARIANT *rgvarg; + long *rgdispidNamedArgs; + unsigned int cArgs; + unsigned int cNamedArgs; + } DISPPARAMS; + + typedef struct EXCEPINFO { + unsigned short wCode; + unsigned short wReserved; + BSTR bstrSource; + BSTR bstrDescription; + BSTR bstrHelpFile; + unsigned long dwHelpContext; + void *pvReserved; + void *pfnDeferredFillIn; + SCODE scode; + } EXCEPINFO; + + [ + odl, + uuid(00000000-0000-0000-C000-000000000046) + ] + interface IUnknown + { + [restricted] + HRESULT QueryInterface( + [in] GUID *riid, + [out] void **ppvObj); + + [restricted] + unsigned long AddRef(); + + [restricted] + unsigned long Release(); + } + + [ + odl, + uuid(00020400-0000-0000-C000-000000000046) + ] + interface IDispatch : IUnknown + { + [restricted] + HRESULT GetTypeInfoCount( + [out] unsigned int *pctinfo); + + [restricted] + HRESULT GetTypeInfo( + [in] unsigned int itinfo, + [in] unsigned long lcid, + [out] void **pptinfo); + + [restricted] + HRESULT GetIDsOfNames( + [in] GUID *riid, + [in] char **rgszNames, + [in] unsigned int cNames, + [in] unsigned long lcid, + [out] long *rgdispid); + + [restricted] + HRESULT Invoke( + [in] long dispidMember, + [in] GUID *riid, + [in] unsigned long lcid, + [in] unsigned short wFlags, + [in] DISPPARAMS *pdispparams, + [out] VARIANT *pvarResult, + [out] EXCEPINFO *pexcepinfo, + [out] unsigned int *puArgErr); + + } + + [ + odl, + uuid(00020404-0000-0000-C000-000000000046) + ] + interface IEnumVARIANT : IUnknown + { + HRESULT Next( + [in] unsigned long celt, + [in] VARIANT *rgvar, + [out] unsigned long *pceltFetched); + + HRESULT Skip( + [in] unsigned long celt); + + HRESULT Reset(); + + HRESULT Clone( + [out] IEnumVARIANT **ppenum); + } +}; Added: vendor/wine/dlls/stdole32/Wine-0_9_11/stdole32.tlb.spec URL: http://svn.reactos.ru/svn/reactos/vendor/wine/dlls/stdole32/Wine-0_9_11/std… ============================================================================== --- vendor/wine/dlls/stdole32/Wine-0_9_11/stdole32.tlb.spec (added) +++ vendor/wine/dlls/stdole32/Wine-0_9_11/stdole32.tlb.spec Mon Apr 10 02:12:21 2006 @@ -1,0 +1,1 @@ +# no exported entry points Added: vendor/wine/dlls/stdole32/current/Makefile.in URL: http://svn.reactos.ru/svn/reactos/vendor/wine/dlls/stdole32/current/Makefil… ============================================================================== --- vendor/wine/dlls/stdole32/current/Makefile.in (added) +++ vendor/wine/dlls/stdole32/current/Makefile.in Mon Apr 10 02:12:21 2006 @@ -1,0 +1,13 @@ +TOPSRCDIR = @top_srcdir@ +TOPOBJDIR = ../.. +SRCDIR = @srcdir@ +VPATH = @srcdir@ +MODULE = stdole32.tlb +IMPORTS = kernel32 + +RC_SRCS = rsrc.rc +RC_TLB = std_ole_v1.tlb + +@MAKE_DLL_RULES@ + +### Dependencies: Added: vendor/wine/dlls/stdole32/current/rsrc.rc URL: http://svn.reactos.ru/svn/reactos/vendor/wine/dlls/stdole32/current/rsrc.rc… ============================================================================== --- vendor/wine/dlls/stdole32/current/rsrc.rc (added) +++ vendor/wine/dlls/stdole32/current/rsrc.rc Mon Apr 10 02:12:21 2006 @@ -1,0 +1,30 @@ +/* + * Resource file for stdole32 + * + * Copyright 2005 Huw Davies + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#include "windef.h" +#include "winbase.h" +#include "winuser.h" +#include "winnls.h" + +LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL + +#include "wine/wine_common_ver.rc" + +1 TYPELIB LOADONCALL DISCARDABLE std_ole_v1.tlb Added: vendor/wine/dlls/stdole32/current/std_ole_v1.idl URL: http://svn.reactos.ru/svn/reactos/vendor/wine/dlls/stdole32/current/std_ole… ============================================================================== --- vendor/wine/dlls/stdole32/current/std_ole_v1.idl (added) +++ vendor/wine/dlls/stdole32/current/std_ole_v1.idl Mon Apr 10 02:12:21 2006 @@ -1,0 +1,137 @@ +/* + * Copyright (C) 2003 Robert Shearman + * 2005 Huw Davies + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + */ + +[ + uuid(00020430-0000-0000-C000-000000000046), + version(1.0), + helpstring("OLE Automation") +] +library stdole +{ + /* typedefs aren't stored in the type library. + These type names are known by the type compiler so it + doesn't really matter what we define them as. */ + + typedef void *VARIANT; + typedef wchar_t *BSTR; + typedef unsigned long SCODE; + typedef unsigned long HRESULT; + + typedef struct GUID { + unsigned long Data1; + unsigned short Data2; + unsigned short Data3; + unsigned char Data4[ 8 ]; + } GUID; + + typedef struct DISPPARAMS { + VARIANT *rgvarg; + long *rgdispidNamedArgs; + unsigned int cArgs; + unsigned int cNamedArgs; + } DISPPARAMS; + + typedef struct EXCEPINFO { + unsigned short wCode; + unsigned short wReserved; + BSTR bstrSource; + BSTR bstrDescription; + BSTR bstrHelpFile; + unsigned long dwHelpContext; + void *pvReserved; + void *pfnDeferredFillIn; + SCODE scode; + } EXCEPINFO; + + [ + odl, + uuid(00000000-0000-0000-C000-000000000046) + ] + interface IUnknown + { + [restricted] + HRESULT QueryInterface( + [in] GUID *riid, + [out] void **ppvObj); + + [restricted] + unsigned long AddRef(); + + [restricted] + unsigned long Release(); + } + + [ + odl, + uuid(00020400-0000-0000-C000-000000000046) + ] + interface IDispatch : IUnknown + { + [restricted] + HRESULT GetTypeInfoCount( + [out] unsigned int *pctinfo); + + [restricted] + HRESULT GetTypeInfo( + [in] unsigned int itinfo, + [in] unsigned long lcid, + [out] void **pptinfo); + + [restricted] + HRESULT GetIDsOfNames( + [in] GUID *riid, + [in] char **rgszNames, + [in] unsigned int cNames, + [in] unsigned long lcid, + [out] long *rgdispid); + + [restricted] + HRESULT Invoke( + [in] long dispidMember, + [in] GUID *riid, + [in] unsigned long lcid, + [in] unsigned short wFlags, + [in] DISPPARAMS *pdispparams, + [out] VARIANT *pvarResult, + [out] EXCEPINFO *pexcepinfo, + [out] unsigned int *puArgErr); + + } + + [ + odl, + uuid(00020404-0000-0000-C000-000000000046) + ] + interface IEnumVARIANT : IUnknown + { + HRESULT Next( + [in] unsigned long celt, + [in] VARIANT *rgvar, + [out] unsigned long *pceltFetched); + + HRESULT Skip( + [in] unsigned long celt); + + HRESULT Reset(); + + HRESULT Clone( + [out] IEnumVARIANT **ppenum); + } +}; Added: vendor/wine/dlls/stdole32/current/stdole32.tlb.spec URL: http://svn.reactos.ru/svn/reactos/vendor/wine/dlls/stdole32/current/stdole3… ============================================================================== --- vendor/wine/dlls/stdole32/current/stdole32.tlb.spec (added) +++ vendor/wine/dlls/stdole32/current/stdole32.tlb.spec Mon Apr 10 02:12:21 2006 @@ -1,0 +1,1 @@ +# no exported entry points

1 0

[greatlrd] 21536: fixing a typcast do it compile on gcc 4.0 thx w3seek
by greatlrd＠svn.reactos.org 09 Apr '06

09 Apr '06

Author: greatlrd Date: Sun Apr 9 22:28:53 2006 New Revision: 21536 URL: http://svn.reactos.ru/svn/reactos?rev=21536&view=rev Log: fixing a typcast do it compile on gcc 4.0 thx w3seek Modified: trunk/reactos/dll/directx/ddraw/main/ddraw_main.c Modified: trunk/reactos/dll/directx/ddraw/main/ddraw_main.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/directx/ddraw/main/ddra… ============================================================================== --- trunk/reactos/dll/directx/ddraw/main/ddraw_main.c (original) +++ trunk/reactos/dll/directx/ddraw/main/ddraw_main.c Sun Apr 9 22:28:53 2006 @@ -121,7 +121,7 @@ if (iface!=NULL) { - ref = InterlockedIncrement(&This->ref); + ref = InterlockedIncrement( (PLONG) &This->ref); } return ref; } @@ -143,7 +143,7 @@ if (iface!=NULL) { - ref = InterlockedDecrement(&This->ref); + ref = InterlockedDecrement( (PLONG) &This->ref); if (ref == 0) {

1 0

[greatlrd] 21535: Fixing a bug fill in a struct it return zero info but we need that info later
by greatlrd＠svn.reactos.org 09 Apr '06

09 Apr '06

Author: greatlrd Date: Sun Apr 9 22:08:18 2006 New Revision: 21535 URL: http://svn.reactos.ru/svn/reactos?rev=21535&view=rev Log: Fixing a bug fill in a struct it return zero info but we need that info later Modified: trunk/reactos/dll/directx/ddraw/hal/surface_hal.c trunk/reactos/dll/directx/ddraw/main/ddraw_main.c Modified: trunk/reactos/dll/directx/ddraw/hal/surface_hal.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/directx/ddraw/hal/surfa… ============================================================================== --- trunk/reactos/dll/directx/ddraw/hal/surface_hal.c (original) +++ trunk/reactos/dll/directx/ddraw/hal/surface_hal.c Sun Apr 9 22:08:18 2006 @@ -94,7 +94,55 @@ return mDdCreateSurface.ddRVal; } - + + /* FIXME fill in this if they are avali + DDSD_BACKBUFFERCOUNT + DDSD_CKDESTBLT + DDSD_CKDESTOVERLAY + DDSD_CKSRCBLT + DDSD_CKSRCOVERLAY + DDSD_LINEARSIZE + DDSD_LPSURFACE + DDSD_MIPMAPCOUNT + DDSD_ZBUFFERBITDEPTH + */ + + That->Surf->mddsdPrimary.dwFlags = DDSD_CAPS + DDSD_PIXELFORMAT; + RtlCopyMemory(&That->Surf->mddsdPrimary.ddpfPixelFormat,&This->mDDrawGlobal.vmiData.ddpfDisplay,sizeof(DDPIXELFORMAT)); + RtlCopyMemory(&That->Surf->mddsdPrimary.ddsCaps,&This->mDDrawGlobal.ddCaps,sizeof(DDCORECAPS)); + + //RtlCopyMemory(&pDDSD->ddckCKDestOverlay,&This->mDDrawGlobal.ddckCKDestOverlay,sizeof(DDCOLORKEY)); + //RtlCopyMemory(&pDDSD->ddckCKSrcOverlay,&This->mDDrawGlobal.ddckCKSrcOverlay,sizeof(DDCOLORKEY)); + + if (This->mDDrawGlobal.vmiData.dwDisplayHeight != 0) + { + That->Surf->mddsdPrimary.dwFlags += DDSD_HEIGHT ; + That->Surf->mddsdPrimary.dwHeight = This->mDDrawGlobal.vmiData.dwDisplayHeight; + } + + if (This->mDDrawGlobal.vmiData.dwDisplayWidth != 0) + { + That->Surf->mddsdPrimary.dwFlags += DDSD_WIDTH ; + That->Surf->mddsdPrimary.dwWidth = This->mDDrawGlobal.vmiData.dwDisplayWidth; + } + + if (This->mDDrawGlobal.vmiData.lDisplayPitch != 0) + { + That->Surf->mddsdPrimary.dwFlags += DDSD_PITCH ; + That->Surf->mddsdPrimary.lPitch = This->mDDrawGlobal.vmiData.lDisplayPitch; + } + + if ( This->mDDrawGlobal.dwMonitorFrequency != 0) + { + That->Surf->mddsdPrimary.dwFlags += DDSD_REFRESHRATE ; + That->Surf->mddsdPrimary.dwRefreshRate = This->mDDrawGlobal.dwMonitorFrequency; + } + + if (This->mDDrawGlobal.vmiData.ddpfDisplay.dwAlphaBitDepth != 0) + { + That->Surf->mddsdPrimary.dwFlags += DDSD_ALPHABITDEPTH ; + That->Surf->mddsdPrimary.dwAlphaBitDepth = This->mDDrawGlobal.vmiData.ddpfDisplay.dwAlphaBitDepth; + } return DD_OK; @@ -346,6 +394,8 @@ Lock.lpDD = &This->owner->mDDrawGlobal; Lock.lpSurfData = NULL; + // FIXME some how lock goes wrong; + return DD_FALSE; if (This->owner->mCallbacks.HALDDSurface.Lock(&Lock)!= DDHAL_DRIVER_HANDLED) { return Lock.ddRVal; Modified: trunk/reactos/dll/directx/ddraw/main/ddraw_main.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/directx/ddraw/main/ddra… ============================================================================== --- trunk/reactos/dll/directx/ddraw/main/ddraw_main.c (original) +++ trunk/reactos/dll/directx/ddraw/main/ddraw_main.c Sun Apr 9 22:08:18 2006 @@ -473,6 +473,7 @@ { return DD_FALSE; } + pDDSD->dwFlags = DDSD_CAPS | DDSD_HEIGHT | DDSD_PITCH | DDSD_PIXELFORMAT | DDSD_REFRESHRATE | DDSD_WIDTH; pDDSD->dwHeight = This->mDDrawGlobal.vmiData.dwDisplayHeight;

1 0

[peterw] 21534: Changed DbgPrint to DPRINT.
by peterw＠svn.reactos.org 09 Apr '06

09 Apr '06

Author: peterw Date: Sun Apr 9 21:58:43 2006 New Revision: 21534 URL: http://svn.reactos.ru/svn/reactos?rev=21534&view=rev Log: Changed DbgPrint to DPRINT. Modified: trunk/reactos/drivers/storage/disk/disk.c Modified: trunk/reactos/drivers/storage/disk/disk.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/drivers/storage/disk/disk.c… ============================================================================== --- trunk/reactos/drivers/storage/disk/disk.c (original) +++ trunk/reactos/drivers/storage/disk/disk.c Sun Apr 9 21:58:43 2006 @@ -500,7 +500,7 @@ &ObjectAttributes); if (!NT_SUCCESS(Status)) { - DbgPrint("Could not create device dir object\n"); + DPRINT("Could not create device dir object\n"); return(Status); } @@ -511,7 +511,7 @@ &PortDeviceObject); if (!NT_SUCCESS(Status)) { - DbgPrint("Could not claim disk device\n"); + DPRINT("Could not claim disk device\n"); ZwMakeTemporaryObject(Handle); ZwClose(Handle);

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