- Ros-dev - ReactOS.org

Re: [ros-dev] [ros-diffs] [gbrunmar] 33689: * Changed to correct signature of NtUserGetClassName() * Implemented correct behaviour in GetRealWindowClass(), but in reality just shifted the todo parts to NtUserGetClassName() instead.
by Alex Ionescu 11 Jun '08

11 Jun '08

This change breaks mIRC. By the way: 1) Congratulations on the fact it took two weeks for someone to report this on BZ And 2) Even more congratulations on the fact that it's been another week since then, and nobody has: 2.1) Emailed the ros-dev about this yet 2.2) And/or reverted this change. Let's try to ignore this until 0.3.6, to make sure that we ship with a broken release. On 25-May-08, at 1:36 AM, gbrunmar(a)svn.reactos.org wrote: > Author: gbrunmar > Date: Sun May 25 03:36:30 2008 > New Revision: 33689 > > URL: http://svn.reactos.org/svn/reactos?rev=33689&view=rev > Log: > * Changed to correct signature of NtUserGetClassName() > * Implemented correct behaviour in GetRealWindowClass(), but in > reality just shifted the todo parts to NtUserGetClassName() instead. > > Modified: > trunk/reactos/dll/win32/user32/windows/class.c > trunk/reactos/include/reactos/win32k/ntuser.h > trunk/reactos/subsystems/win32/win32k/ntuser/class.c > > Modified: trunk/reactos/dll/win32/user32/windows/class.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/c… > = > = > = > = > = > = > = > = > ====================================================================== > --- trunk/reactos/dll/win32/user32/windows/class.c [iso-8859-1] > (original) > +++ trunk/reactos/dll/win32/user32/windows/class.c [iso-8859-1] Sun > May 25 03:36:30 2008 > @@ -421,15 +421,22 @@ > LPSTR lpClassName, > int nMaxCount) > { > - ANSI_STRING ClassName; > - int Result; > - > - ClassName.MaximumLength = nMaxCount; > - ClassName.Buffer = lpClassName; > - > - Result = NtUserGetClassName(hWnd, > - (PUNICODE_STRING)&ClassName, > - TRUE); > + UNICODE_STRING ClassName; > + INT Result; > + > + ClassName.MaximumLength = nMaxCount * sizeof(WCHAR); > + ClassName.Buffer = LocalAlloc(LMEM_FIXED, > ClassName.MaximumLength); > + if (ClassName.Buffer == NULL) > + { > + SetLastError(ERROR_NOT_ENOUGH_MEMORY); > + return 0; > + } > + > + Result = NtUserGetClassName(hWnd, FALSE, &ClassName); > + > + WideCharToMultiByte(CP_ACP, 0, ClassName.Buffer, Result, > lpClassName, nMaxCount - 1, NULL, NULL); > + lpClassName[nMaxCount - 1] = '\0'; > + LocalFree(ClassName.Buffer); > > TRACE("%p class/atom: %s/%04x %x\n", hWnd, > IS_ATOM(lpClassName) ? NULL : lpClassName, > @@ -456,9 +463,7 @@ > ClassName.MaximumLength = nMaxCount * sizeof(WCHAR); > ClassName.Buffer = lpClassName; > > - Result = NtUserGetClassName(hWnd, > - &ClassName, > - FALSE); > + Result = NtUserGetClassName(hWnd, FALSE, &ClassName); > > TRACE("%p class/atom: %S/%04x %x\n", hWnd, > IS_ATOM(lpClassName) ? NULL : lpClassName, > @@ -629,12 +634,24 @@ > UINT > STDCALL > RealGetWindowClassW( > - HWND hwnd, > + HWND hWnd, > LPWSTR pszType, > UINT cchType) > { > - /* FIXME: Implement correct functionality of RealGetWindowClass */ > - return GetClassNameW(hwnd,pszType,cchType); > + UNICODE_STRING ClassName; > + UINT Length; > + > + ClassName.MaximumLength = cchType * sizeof(WCHAR); > + ClassName.Buffer = pszType; > + > + Length = NtUserGetClassName(hWnd, TRUE, &ClassName); > + > + TRACE("%p class/atom: %S/%04x %x\n", hWnd, > + IS_ATOM(pszType) ? NULL : pszType, > + IS_ATOM(pszType) ? pszType : 0, > + cchType); > + > + return Length; > } > > > @@ -644,12 +661,33 @@ > UINT > STDCALL > RealGetWindowClassA( > - HWND hwnd, > + HWND hWnd, > LPSTR pszType, > UINT cchType) > { > - /* FIXME: Implement correct functionality of RealGetWindowClass */ > - return GetClassNameA(hwnd,pszType,cchType); > + UNICODE_STRING ClassName; > + UINT Length; > + > + ClassName.MaximumLength = cchType * sizeof(WCHAR); > + ClassName.Buffer = LocalAlloc(LMEM_FIXED, > ClassName.MaximumLength); > + if (ClassName.Buffer == NULL) > + { > + SetLastError(ERROR_NOT_ENOUGH_MEMORY); > + return 0; > + } > + > + Length = NtUserGetClassName(hWnd, TRUE, &ClassName); > + > + WideCharToMultiByte(CP_ACP, 0, ClassName.Buffer, Length, > pszType, cchType - 1, NULL, NULL); > + pszType[cchType - 1] = '\0'; > + LocalFree(ClassName.Buffer); > + > + TRACE("%p class/atom: %s/%04x %x\n", hWnd, > + IS_ATOM(pszType) ? NULL : pszType, > + IS_ATOM(pszType) ? pszType : 0, > + cchType); > + > + return Length; > } > > /* > > Modified: trunk/reactos/include/reactos/win32k/ntuser.h > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntu… > = > = > = > = > = > = > = > = > ====================================================================== > --- trunk/reactos/include/reactos/win32k/ntuser.h [iso-8859-1] > (original) > +++ trunk/reactos/include/reactos/win32k/ntuser.h [iso-8859-1] Sun > May 25 03:36:30 2008 > @@ -1160,18 +1160,11 @@ > LPWSTR *ppszMenuName, > BOOL Ansi); > > -INT > +UINT > NTAPI > NtUserGetClassName(HWND hWnd, > - PUNICODE_STRING ClassName, > - BOOL Ansi); > -#if 0 // Real NtUserGetClassName > -INT > -NTAPI > -NtUserGetClassName(HWND hWnd, > - BOOL Unknown, // 0 GetClassNameW, 1 > RealGetWindowClassA/W > + BOOL bGetRealClass, // 0 GetClassNameA/W, 1 > RealGetWindowClassA/W > PUNICODE_STRING ClassName); > -#endif > > HANDLE > NTAPI > > Modified: trunk/reactos/subsystems/win32/win32k/ntuser/class.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… > = > = > = > = > = > = > = > = > ====================================================================== > --- trunk/reactos/subsystems/win32/win32k/ntuser/class.c > [iso-8859-1] (original) > +++ trunk/reactos/subsystems/win32/win32k/ntuser/class.c > [iso-8859-1] Sun May 25 03:36:30 2008 > @@ -1255,118 +1255,39 @@ > > INT > UserGetClassName(IN PWINDOWCLASS Class, > - IN OUT PUNICODE_STRING ClassName, > - IN BOOL Ansi) > + IN OUT PUNICODE_STRING ClassName) > { > NTSTATUS Status = STATUS_SUCCESS; > - WCHAR szStaticTemp[32]; > - PWSTR szTemp = NULL; > - ULONG BufLen = sizeof(szStaticTemp); > + ULONG BufLen; > INT Ret = 0; > > /* Note: Accessing the buffer in ClassName may raise an > exception! */ > > _SEH_TRY > { > - if (Ansi) > - { > - PANSI_STRING AnsiClassName = (PANSI_STRING)ClassName; > - UNICODE_STRING UnicodeClassName; > - > - /* limit the size of the static buffer on the stack to > the > - size of the buffer provided by the caller */ > - if (BufLen / sizeof(WCHAR) > AnsiClassName- > >MaximumLength) > - { > - BufLen = AnsiClassName->MaximumLength * > sizeof(WCHAR); > - } > - > - /* find out how big the buffer needs to be */ > - Status = RtlQueryAtomInAtomTable(gAtomTable, > - Class->Atom, > - NULL, > - NULL, > - szStaticTemp, > - &BufLen); > - if (Status == STATUS_BUFFER_TOO_SMALL) > - { > - if (BufLen / sizeof(WCHAR) > AnsiClassName- > >MaximumLength) > - { > - /* the buffer required exceeds the ansi buffer > provided, > - pretend like we're using the ansi buffer and > limit the > - size to the buffer size provided */ > - BufLen = AnsiClassName->MaximumLength * > sizeof(WCHAR); > - } > - > - /* allocate a temporary buffer that can hold the > unicode class name */ > - szTemp = ExAllocatePool(PagedPool, > - BufLen); > - if (szTemp == NULL) > - { > - SetLastWin32Error(ERROR_NOT_ENOUGH_MEMORY); > - _SEH_LEAVE; > - } > - > - /* query the class name */ > - Status = RtlQueryAtomInAtomTable(gAtomTable, > - Class->Atom, > - NULL, > - NULL, > - szTemp, > - &BufLen); > - } > - else > - szTemp = szStaticTemp; > - > - if (NT_SUCCESS(Status)) > - { > - /* convert the atom name to ansi */ > - > - RtlInitUnicodeString(&UnicodeClassName, > - szTemp); > - > - Status = RtlUnicodeStringToAnsiString(AnsiClassName, > - > &UnicodeClassName, > - FALSE); > - if (!NT_SUCCESS(Status)) > - { > - SetLastNtError(Status); > - _SEH_LEAVE; > - } > - } > - > - Ret = BufLen / sizeof(WCHAR); > - } > - else /* !Ansi */ > - { > - BufLen = ClassName->MaximumLength; > - > - /* query the atom name */ > - Status = RtlQueryAtomInAtomTable(gAtomTable, > - Class->Atom, > - NULL, > - NULL, > - ClassName->Buffer, > - &BufLen); > - > - if (!NT_SUCCESS(Status)) > - { > - SetLastNtError(Status); > - _SEH_LEAVE; > - } > - > - Ret = BufLen / sizeof(WCHAR); > - } > + BufLen = ClassName->MaximumLength; > + > + /* query the atom name */ > + Status = RtlQueryAtomInAtomTable(gAtomTable, > + Class->Atom, > + NULL, > + NULL, > + ClassName->Buffer, > + &BufLen); > + > + if (!NT_SUCCESS(Status)) > + { > + SetLastNtError(Status); > + _SEH_LEAVE; > + } > + > + Ret = BufLen / sizeof(WCHAR); > } > _SEH_HANDLE > { > SetLastNtError(_SEH_GetExceptionCode()); > } > _SEH_END; > - > - if (Ansi && szTemp != NULL && szTemp != szStaticTemp) > - { > - ExFreePool(szTemp); > - } > > return Ret; > } > @@ -2265,10 +2186,10 @@ > > > > -INT NTAPI > -NtUserGetClassName (IN HWND hWnd, > - OUT PUNICODE_STRING ClassName, > - IN BOOL Ansi) > +UINT NTAPI > +NtUserGetClassName(IN HWND hWnd, > + IN BOOL bGetRealClass, // 0 GetClassNameA/W, 1 > RealGetWindowClassA/W > + OUT PUNICODE_STRING ClassName) > { > PWINDOW_OBJECT Window; > UNICODE_STRING CapturedClassName; > @@ -2284,10 +2205,11 @@ > ProbeForWriteUnicodeString(ClassName); > CapturedClassName = *ClassName; > > + /* TODO: Get real class name here if bGetRealClass == > TRUE */ > + > /* get the class name */ > Ret = UserGetClassName(Window->Wnd->Class, > - &CapturedClassName, > - Ansi); > + &CapturedClassName); > > if (Ret != 0) > { > Best regards, Alex Ionescu

2 1

Re: [ros-dev] [ros-diffs] [tkreuzer] 33912: fix an endless loop bug See issue #2142 for more details.
by Steven Edwards 09 Jun '08

09 Jun '08

On Mon, Jun 9, 2008 at 4:57 PM, <tkreuzer(a)svn.reactos.org> wrote: > See issue #2142 for more details. Is there anyway we can add a macro so that when the commit message see's "See issue #### for more details." It will auto magically link to bugzilla? I would look at more bugs as the patches come in but I am too lazy to manually open another tab and copy/paste the bug number. I could set a macro in firefox where I do "bug ####' but that means I still have to manually open a new tab and copy and paste, like I said I am lazy. -- Steven Edwards "There is one thing stronger than all the armies in the world, and that is an idea whose time has come." - Victor Hugo

3 2

comctl32 treeview
by Timo Kreuzer 09 Jun '08

09 Jun '08

Hi, The bug in comctl32 that makes treeviews get messed up on collapsing nodes... ROS: http://www.reactos.org/bugzilla/show_bug.cgi?id=2843 WINE: http://bugs.winehq.org/show_bug.cgi?id=10544 Could someone having wine sources / GIT, please create a patch and send it to the wine-patches mailing list. Thanks, Timo

2 1

rethinking over some thing in ReactOS
by Magnus Olsen 09 Jun '08

09 Jun '08

HI I am been rethinking over some thing in ReactOS mean while I will not be avail coding on ReactOS at all or do any commit or helping people as I use to. I am still piss over some matter betwin me and Alesky this matter is betwin us two. What happen betwin us is betwin us. That is all I have say for now. about that matter. And I am rethinking over a sugestions I got from a old freind maybe start working for him. I do not known if I do i can not be coding on any opensource project the contract is for long terms contract and will need all skill I have. I got this offer for long time ago and I did say no to it, but it still stand, reason I did say no to it was I did not want coding behine dorrs or come up new ideas that being use behine dorrs and u are not avail to talk about them. I see allot of my life works are being using of all people that own a laptop or cellphone today. But one can backtrace the techlogic to me. what I done. That is how I did want thing be when I was younger. it is some background info what I did before 2003 after I join ReactOS most people I known ask me if I can quit from ReactOS and start working for them. One video card manufactor did contact me when I join ReactOS I can not tell which one. I solv the main issue I and the manufactor did have. it was how to open directx hal for the graphic card. next issue I solv was how to create a surface and access all other part of directx hal. Next issue we got was DirectX DdBlt it did not work direcly it took me and the manufactor around 2 days figout how to use DdBlt so it was avail to blit and see it on the screen. This informations did not exstis at all in MSDN. after I told open how it was done and start implemeted it in reactos MS did update the doc how to optain DirectX HAL. See GdiEntry1-16 This does not mean I am leving ReactOS it mean I need rethink what I want todo the options I got is very good one. I like the offer I got. and I do not known if I will say yes or no I am not a person say direcly no to money but none can buy me for money. I choice what I want todo. even it is bad payment. I have say no to many good deal and work in pass. Steven what I told u before, I stand with my word, and waiting on you mail about the details. To reash me is not via irc any longer it is on icq / skype or my mail address. Bestregards Magnus Olsen

1 0

Development process - once again
by Aleksey Bragin 08 Jun '08

08 Jun '08

Hi, this question seems to arise periodically, so let's have a constructive discussion again about the issue once again. The issue is being that a lot of people have direct commit access to the repository, and sooner or later some of them commit patches which introduce a regress in functionality. I will use Magnus (GreatLord) again as an example. He was doing a good thing (as usual), but then somehow lost focus, and along with good fixes committed a breakage for FF2.0 installer (and all other apps using PatBlt functions). I had to (as usual!) spend the whole morning reviewing all his diffs, then regress-testing by bisection to find the guilty revision, then work out a better solution with him, and then come to agreement that the guilty commit could be just reverted for now, since it partly works anyway. This takes up significant amount of my time, which could go into something more productive than just testing patches, finding way to unregress, and so on. Especially I'm angry about this happening right when approaching 0.3.5 release. Ideally (as I explained in #reactos today to blight_), I want the trunk itself be directly committable only by a very limited number of persons, and all developers should be committing to "some other place" at first, and then their patches merged by reviewers/testers (yes, manually, sometimes just reviewing may be enough to commit/ reject the patch, sometimes a thorough testing must be involved, maybe additional devs asked for a review). blight_ called this as a "linux development model" with an intermediate branch - yes, maybe, why not?. What I definately don't want to do is to scare developers away and make their life more complicated by need of sending text patches (this is just not convinient, and as seen on the example of Wine makes a lot of possible contributors going away). I remember what Alex proposed (those who don't, may look up ros-dev ML archives with a similar topic). Would there be any new prepositions? Maybe someone discovered a new CIS for SVN, or a decentralized VCS for patch submission and usual SVN for maintaining HEAD? With time, developers number is only going to increase, so this problem will become more and more annoying. With the best regards, Aleksey Bragin.

6 6

[ros-diffs] [jimtabor] 33830: Move xform data from W structure into DcLevel within unions.
by James Tabor 07 Jun '08

07 Jun '08

Hi, I'm going to explain this ONCE: 1st: The move was to conserve and reduce space and size of the current structure. Writing a floating point package could be hard to do or just copyleft one off the net.... Problem is if we do the later it will most likely not be compatible with M$ SFPP. BTW, M$ did patent their strange and unusual floating point package. Which means I can not write one! Just writing the storage emulation is almost a problem too... But due to US patent law I can just do what I did, to "Talk to the Interface" with the storage emulation. Keeping the current state of ReactOS FP is my first choice. We use the speed of the FPU which is part of the main processor and reduce the size of the source. (Two pluses so far, Speed and Small Size.) The storage emulation for gdi32 is important for compatibility and with ReactOS concept of drop in replacement and play. Thanks, my 1EU References: Fast floating-point truncation to integer form - US Patent 6535898: http://v3.espacenet.com/textdoc?DB=EPODOC&IDX=US6535898&F=0 Use of indices for queries with comparisons based on a function: http://v3.espacenet.com/textdoc?DB=EPODOC&IDX=EP1193619&F=0 System and method for fast and smooth rendering of lit, textured spheres: http://v3.espacenet.com/textdoc?DB=EPODOC&IDX=EP1227443&F=0 John R. Hauser SoftFloat package : http://www.jhauser.us/arithmetic/SoftFloat.html IEEE 754 floating-point test software: http://www.math.utah.edu/~beebe/software/ieee/

2 1

Firefox 1.5 installation regressed
by Aleksey Bragin 05 Jun '08

05 Jun '08

Hi, I experience a hang of FF 1.5 installation app at "0% Extracting". Sometimes hangs completely (even mouse doesn't move), sometimes I'm able to click "X" and choose yes to cancel. It started happening at least since yesterday. WBR, Aleksey Bragin.

4 4

VIA 6103 Rhine II Net Driver Install Crash
by James Tabor 04 Jun '08

04 Jun '08

Hi, I like to start testing FF again on hardware but this bug is still open. http://www.reactos.org/bugzilla/show_bug.cgi?id=2987 I've copied most of the netamd.inf from Ros to match with the inf for the driver. But still the same crash. Please let me know, James

1 0

[ros-diffs] [tkreuzer] 33856: - fix mem leak when failing to create an extpen with penstyles
by James Tabor 04 Jun '08

04 Jun '08

Hi! There was a reason for doing what I commit'ed,,,, since you are looking at it can you please fix this. 8^) James gdi32_winetest pen ExFreePool of already freed address 80e8ba78 KeBugCheck at ntoskrnl/mm/npool.c:1566 *** Fatal System Error: 0x00000000 (0x00000000,0x00000000,0x00000000,0x00000000) Entered debugger on embedded INT3 at 0x0008:0x808ac7d8. kdb:> bt Eip: <NTOSKRNL.EXE:ac7d9 (lib/rtl/i386/debug_asm.S:42 (RtlpBreakWithStatusInstruction))> Frames: <NTOSKRNL.EXE:29a2 (ntoskrnl/ke/bug.c:1100 (KeBugCheckWithTf@24))> <NTOSKRNL.EXE:2aac (ntoskrnl/ke/bug.c:1364 (KeBugCheck@4))> <NTOSKRNL.EXE:5f00c (ntoskrnl/mm/npool.c:1567 (ExFreeNonPagedPool@4))> <NTOSKRNL.EXE:61e64 (ntoskrnl/mm/pool.c:238 (ExFreePool@4))> <win32k.sys:967ff (subsystems/win32/win32k/objects/pen.c:344 (NtGdiExtCreatePen@44))> <NTOSKRNL.EXE:96eda (ntoskrnl/ke/i386/trap.s:244 (KiFastCallEntry))> <ntdll.dll:5dda> <gdi32_winetest.EXE:3b497> <gdi32_winetest.EXE:3d605> <gdi32_winetest.EXE:3d78d> <gdi32_winetest.EXE:3dc3d> <gdi32_winetest.EXE:3dc6a> <kernel32.dll:21610> <00000000>

2 2

Re: [ros-dev] [ros-diffs] [cfinck] 33824: - Add a test suite for ws2_32.dll It currently tests the features I needed to adjust/implement when fixing the wininet problem. ReactOS currently passes all tests, but fails one if you launch the test app for the second tim
by gedmurphy 04 Jun '08

04 Jun '08

Should this not be in the wine tests framework? The API tests framework is quite a specialized model more suited for subsystem testing. Putting the ws2_32 stuff here just makes it more inconvenient to test. Ged. -----Original Message----- From: ros-diffs-bounces(a)reactos.org [mailto:ros-diffs-bounces@reactos.org] On Behalf Of cfinck(a)svn.reactos.org Sent: 01 June 2008 23:09 To: ros-diffs(a)reactos.org Subject: [ros-diffs] [cfinck] 33824: - Add a test suite for ws2_32.dll It currently tests the features I needed to adjust/implement when fixing the wininet problem. ReactOS currently passes all tests, but fails one if you launch the test app for the second time qu Author: cfinck Date: Sun Jun 1 17:08:45 2008 New Revision: 33824 URL: http://svn.reactos.org/svn/reactos?rev=33824&view=rev Log: - Add a test suite for ws2_32.dll It currently tests the features I needed to adjust/implement when fixing the wininet problem. ReactOS currently passes all tests, but fails one if you launch the test app for the second time quickly after the first time (timing problem in the network code?). - Fix the behaviour on an ioctlsocket FIONREAD call: The output buffer is not touched, when we have no socket, but when we have no connection, it is set to 0. - Forward the socket call to WSASocketW instead of WSASocketA, minimal performance improvement Added: trunk/rostests/apitests/ws2_32/ (with props) trunk/rostests/apitests/ws2_32/helpers.c (with props) trunk/rostests/apitests/ws2_32/testlist.c (with props) trunk/rostests/apitests/ws2_32/tests/ trunk/rostests/apitests/ws2_32/tests/ioctlsocket.c (with props) trunk/rostests/apitests/ws2_32/tests/recv.c (with props) trunk/rostests/apitests/ws2_32/ws2_32.c (with props) trunk/rostests/apitests/ws2_32/ws2_32.h (with props) trunk/rostests/apitests/ws2_32/ws2_32.rbuild (with props) Modified: trunk/reactos/dll/win32/ws2_32/misc/dllmain.c trunk/reactos/drivers/network/afd/afd/info.c trunk/rostests/apitests/directory.rbuild Modified: trunk/reactos/dll/win32/ws2_32/misc/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32/misc/dllm… ============================================================================== --- trunk/reactos/dll/win32/ws2_32/misc/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32/misc/dllmain.c [iso-8859-1] Sun Jun 1 17:08:45 2008 @@ -166,7 +166,7 @@ IN INT type, IN INT protocol) { - return WSASocketA(af, + return WSASocketW(af, type, protocol, NULL, Modified: trunk/reactos/drivers/network/afd/afd/info.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/in… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/info.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/info.c [iso-8859-1] Sun Jun 1 17:08:45 2008 @@ -49,9 +49,9 @@ break; case AFD_INFO_RECEIVE_CONTENT_SIZE: - /* Only touch InfoReq if we actually have a valid connection. + /* Only touch InfoReq if a socket has been set up. Behaviour was verified under WinXP SP2. */ - if(FCB->Connection.Handle) + if(FCB->AddressFile.Object) InfoReq->Information.Ulong = FCB->Recv.Content - FCB->Recv.BytesUsed; break; Modified: trunk/rostests/apitests/directory.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/directory.rbuild… ============================================================================== --- trunk/rostests/apitests/directory.rbuild [iso-8859-1] (original) +++ trunk/rostests/apitests/directory.rbuild [iso-8859-1] Sun Jun 1 17:08:45 2008 @@ -23,4 +23,8 @@ <directory name="w32knapi"> <xi:include href="w32knapi/w32knapi.rbuild" /> </directory> + + <directory name="ws2_32"> + <xi:include href="ws2_32/ws2_32.rbuild" /> + </directory> </group> Propchange: trunk/rostests/apitests/ws2_32/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Sun Jun 1 17:08:45 2008 @@ -1,0 +1,7 @@ +GNUmakefile +*.vcproj +*.user +*.cbp +*.ncb +*.suo +*.sln Added: trunk/rostests/apitests/ws2_32/helpers.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ws2_32/helpers.c… ============================================================================== --- trunk/rostests/apitests/ws2_32/helpers.c (added) +++ trunk/rostests/apitests/ws2_32/helpers.c [iso-8859-1] Sun Jun 1 17:08:45 2008 @@ -1,0 +1,65 @@ +/* + * PROJECT: ws2_32.dll API tests + * LICENSE: GPLv2 or any later version + * FILE: apitests/ws2_32/helpers.c + * PURPOSE: Helper functions for the socket tests + * COPYRIGHT: Copyright 2008 Colin Finck <mail(a)colinfinck.de> + */ + +#include "ws2_32.h" + +int CreateSocket(PTESTINFO pti, SOCKET* psck) +{ + /* Create the socket */ + *psck = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); + TEST(*psck != INVALID_SOCKET); + + if(*psck == INVALID_SOCKET) + { + printf("Winsock error code is %u\n", WSAGetLastError()); + WSACleanup(); + return APISTATUS_ASSERTION_FAILED; + } + + return APISTATUS_NORMAL; +} + +int ConnectToReactOSWebsite(PTESTINFO pti, SOCKET sck) +{ + int iResult; + struct hostent* host; + struct sockaddr_in sa; + + /* Connect to "www.reactos.org" */ + host = gethostbyname("www.reactos.org"); + + sa.sin_family = AF_INET; + sa.sin_addr.s_addr = *(u_long*)host->h_addr_list[0]; + sa.sin_port = htons(80); + + SCKTEST(connect(sck, (struct sockaddr *)&sa, sizeof(sa))); + + return APISTATUS_NORMAL; +} + +int GetRequestAndWait(PTESTINFO pti, SOCKET sck) +{ + const char szGetRequest[] = "GET / HTTP/1.0\r\n\r\n"; + int iResult; + struct fd_set readable; + + /* Send the GET request */ + SCKTEST(send(sck, szGetRequest, strlen(szGetRequest), 0)); + TEST(iResult == strlen(szGetRequest)); + + /* Shutdown the SEND connection */ + SCKTEST(shutdown(sck, SD_SEND)); + + /* Wait until we're ready to read */ + FD_ZERO(&readable); + FD_SET(sck, &readable); + + SCKTEST(select(0, &readable, NULL, NULL, NULL)); + + return APISTATUS_NORMAL; +} Propchange: trunk/rostests/apitests/ws2_32/helpers.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/apitests/ws2_32/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ws2_32/testlist.… ============================================================================== --- trunk/rostests/apitests/ws2_32/testlist.c (added) +++ trunk/rostests/apitests/ws2_32/testlist.c [iso-8859-1] Sun Jun 1 17:08:45 2008 @@ -1,0 +1,33 @@ +/* + * PROJECT: ws2_32.dll API tests + * LICENSE: GPLv2 or any later version + * FILE: apitests/ws2_32/testlist.c + * PURPOSE: Test list file + * COPYRIGHT: Copyright 2008 Colin Finck <mail(a)colinfinck.de> + */ + +#ifndef _WS2_32_TESTLIST_H +#define _WS2_32_TESTLIST_H + +#define ARRAY_SIZE(x) (sizeof(x)/sizeof(x[0])) + +#include "ws2_32.h" + +/* include the tests */ +#include "tests/ioctlsocket.c" +#include "tests/recv.c" + +/* The List of tests */ +TESTENTRY TestList[] = +{ + { L"ioctlsocket", Test_ioctlsocket }, + { L"recv", Test_recv } +}; + +/* The function that gives us the number of tests */ +INT NumTests(void) +{ + return ARRAY_SIZE(TestList); +} + +#endif Propchange: trunk/rostests/apitests/ws2_32/testlist.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/apitests/ws2_32/tests/ioctlsocket.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ws2_32/tests/ioc… ============================================================================== --- trunk/rostests/apitests/ws2_32/tests/ioctlsocket.c (added) +++ trunk/rostests/apitests/ws2_32/tests/ioctlsocket.c [iso-8859-1] Sun Jun 1 17:08:45 2008 @@ -1,0 +1,83 @@ +/* + * PROJECT: ws2_32.dll API tests + * LICENSE: GPLv2 or any later version + * FILE: apitests/ws2_32/tests/ioctlsocket.c + * PURPOSE: Tests for the ioctlsocket function + * COPYRIGHT: Copyright 2008 Colin Finck <mail(a)colinfinck.de> + */ + +#include "../ws2_32.h" + +/* For valid test results, the ReactOS Website needs to return at least 2 bytes on a "GET / HTTP/1.0" request. */ +INT +Test_ioctlsocket(PTESTINFO pti) +{ + LPSTR pszBuf; + int iResult; + SOCKET sck; + ULONG BytesAvailable; + ULONG BytesToRead; + WSADATA wdata; + + /* Start up Winsock */ + TEST(WSAStartup(MAKEWORD(2, 2), &wdata) == 0); + + /* If we call ioctlsocket without a socket, it should return with an error and do nothing. */ + BytesAvailable = 0xdeadbeef; + TEST(ioctlsocket(0, FIONREAD, &BytesAvailable) == SOCKET_ERROR); + TEST(BytesAvailable == 0xdeadbeef); + + /* Create the socket */ + iResult = CreateSocket(pti, &sck); + if(iResult != APISTATUS_NORMAL) + return iResult; + + /* Now we can pass at least a socket, but we have no connection yet. The function should return 0. */ + BytesAvailable = 0xdeadbeef; + TEST(ioctlsocket(sck, FIONREAD, &BytesAvailable) == 0); + TEST(BytesAvailable == 0); + + /* Connect to "www.reactos.org" */ + iResult = ConnectToReactOSWebsite(pti, sck); + if(iResult != APISTATUS_NORMAL) + return iResult; + + /* Even with a connection, there shouldn't be any bytes available. */ + TEST(ioctlsocket(sck, FIONREAD, &BytesAvailable) == 0); + TEST(BytesAvailable == 0); + + /* Send the GET request */ + iResult = GetRequestAndWait(pti, sck); + if(iResult != APISTATUS_NORMAL) + return iResult; + + /* Try ioctlsocket with FIONREAD. There should be bytes available now. */ + SCKTEST(ioctlsocket(sck, FIONREAD, &BytesAvailable)); + TEST(BytesAvailable != 0); + + /* Get half of the data */ + BytesToRead = BytesAvailable / 2; + pszBuf = (LPSTR) HeapAlloc(g_hHeap, 0, BytesToRead); + SCKTEST(recv(sck, pszBuf, BytesToRead, 0)); + HeapFree(g_hHeap, 0, pszBuf); + + BytesToRead = BytesAvailable - BytesToRead; + + /* Now try ioctlsocket again. BytesAvailable should be at the value saved in BytesToRead now. */ + SCKTEST(ioctlsocket(sck, FIONREAD, &BytesAvailable)); + TEST(BytesAvailable == BytesToRead); + + /* Read those bytes */ + pszBuf = (LPSTR) HeapAlloc(g_hHeap, 0, BytesToRead); + SCKTEST(recv(sck, pszBuf, BytesToRead, 0)); + HeapFree(g_hHeap, 0, pszBuf); + + /* Try it for the last time. BytesAvailable should be at 0 now. */ + SCKTEST(ioctlsocket(sck, FIONREAD, &BytesAvailable)); + TEST(BytesAvailable == 0); + + closesocket(sck); + WSACleanup(); + + return APISTATUS_NORMAL; +} Propchange: trunk/rostests/apitests/ws2_32/tests/ioctlsocket.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/apitests/ws2_32/tests/recv.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ws2_32/tests/rec… ============================================================================== --- trunk/rostests/apitests/ws2_32/tests/recv.c (added) +++ trunk/rostests/apitests/ws2_32/tests/recv.c [iso-8859-1] Sun Jun 1 17:08:45 2008 @@ -1,0 +1,69 @@ +/* + * PROJECT: ws2_32.dll API tests + * LICENSE: GPLv2 or any later version + * FILE: apitests/ws2_32/tests/recv.c + * PURPOSE: Tests for the recv function + * COPYRIGHT: Copyright 2008 Colin Finck <mail(a)colinfinck.de> + */ + +#include "../ws2_32.h" + +#define RECV_BUF 4 + +/* For valid test results, the ReactOS Website needs to return at least 8 bytes on a "GET / HTTP/1.0" request. + Also the first 4 bytes and the last 4 bytes need to be different. + Both factors usually apply on standard HTTP responses. */ +INT +Test_recv(PTESTINFO pti) +{ + const char szDummyBytes[RECV_BUF] = {0xFF, 0x00, 0xFF, 0x00}; + + char szBuf1[RECV_BUF]; + char szBuf2[RECV_BUF]; + int iResult; + SOCKET sck; + WSADATA wdata; + + /* Start up Winsock */ + TEST(WSAStartup(MAKEWORD(2, 2), &wdata) == 0); + + /* If we call recv without a socket, it should return with an error and do nothing. */ + memcpy(szBuf1, szDummyBytes, RECV_BUF); + TEST(recv(0, szBuf1, RECV_BUF, 0) == SOCKET_ERROR); + TEST(!memcmp(szBuf1, szDummyBytes, RECV_BUF)); + + /* Create the socket */ + iResult = CreateSocket(pti, &sck); + if(iResult != APISTATUS_NORMAL) + return iResult; + + /* Now we can pass at least a socket, but we have no connection yet. Should return with an error and do nothing. */ + memcpy(szBuf1, szDummyBytes, RECV_BUF); + TEST(recv(sck, szBuf1, RECV_BUF, 0) == SOCKET_ERROR); + TEST(!memcmp(szBuf1, szDummyBytes, RECV_BUF)); + + /* Connect to "www.reactos.org" */ + iResult = ConnectToReactOSWebsite(pti, sck); + if(iResult != APISTATUS_NORMAL) + return iResult; + + /* Send the GET request */ + iResult = GetRequestAndWait(pti, sck); + if(iResult != APISTATUS_NORMAL) + return iResult; + + /* Receive the data. + MSG_PEEK will not change the internal number of bytes read, so that a subsequent request should return the same bytes again. */ + SCKTEST(recv(sck, szBuf1, RECV_BUF, MSG_PEEK)); + SCKTEST(recv(sck, szBuf2, RECV_BUF, 0)); + TEST(!memcmp(szBuf1, szBuf2, RECV_BUF)); + + /* The last recv() call moved the internal file pointer, so that the next request should return different data. */ + SCKTEST(recv(sck, szBuf1, RECV_BUF, 0)); + TEST(memcmp(szBuf1, szBuf2, RECV_BUF)); + + closesocket(sck); + WSACleanup(); + + return APISTATUS_NORMAL; +} Propchange: trunk/rostests/apitests/ws2_32/tests/recv.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/apitests/ws2_32/ws2_32.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ws2_32/ws2_32.c?… ============================================================================== --- trunk/rostests/apitests/ws2_32/ws2_32.c (added) +++ trunk/rostests/apitests/ws2_32/ws2_32.c [iso-8859-1] Sun Jun 1 17:08:45 2008 @@ -1,0 +1,24 @@ +/* + * PROJECT: ws2_32.dll API tests + * LICENSE: GPLv2 or any later version + * FILE: apitests/ws2_32/ws2_32.c + * PURPOSE: Program entry point + * COPYRIGHT: Copyright 2008 Colin Finck <mail(a)colinfinck.de> + */ + +#include "ws2_32.h" + +HANDLE g_hHeap; + +BOOL +IsFunctionPresent(LPWSTR lpszFunction) +{ + return TRUE; +} + +int wmain() +{ + g_hHeap = GetProcessHeap(); + + return TestMain(L"ws2_32_apitests", L"ws2_32.dll"); +} Propchange: trunk/rostests/apitests/ws2_32/ws2_32.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/apitests/ws2_32/ws2_32.h URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ws2_32/ws2_32.h?… ============================================================================== --- trunk/rostests/apitests/ws2_32/ws2_32.h (added) +++ trunk/rostests/apitests/ws2_32/ws2_32.h [iso-8859-1] Sun Jun 1 17:08:45 2008 @@ -1,0 +1,36 @@ +/* + * PROJECT: ws2_32.dll API tests + * LICENSE: GPLv2 or any later version + * FILE: apitests/ws2_32/ws2_32.h + * PURPOSE: Main header file + * COPYRIGHT: Copyright 2008 Colin Finck <mail(a)colinfinck.de> + */ + +#ifndef _WS2_32_APITESTS_H +#define _WS2_32_APITESTS_H + +#include <winsock2.h> + +#include "../apitest.h" + +/* Simple macro for executing a socket command and doing cleanup operations in case of a failure */ +#define SCKTEST(_cmd_) \ + iResult = _cmd_; \ + TEST(iResult != SOCKET_ERROR); \ + if(iResult == SOCKET_ERROR) \ + { \ + printf("Winsock error code is %u\n", WSAGetLastError()); \ + closesocket(sck); \ + WSACleanup(); \ + return APISTATUS_ASSERTION_FAILED; \ + } + +/* helpers.c */ +int CreateSocket(PTESTINFO pti, SOCKET* sck); +int ConnectToReactOSWebsite(PTESTINFO pti, SOCKET sck); +int GetRequestAndWait(PTESTINFO pti, SOCKET sck); + +/* ws2_32.c */ +extern HANDLE g_hHeap; + +#endif Propchange: trunk/rostests/apitests/ws2_32/ws2_32.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/apitests/ws2_32/ws2_32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ws2_32/ws2_32.rb… ============================================================================== --- trunk/rostests/apitests/ws2_32/ws2_32.rbuild (added) +++ trunk/rostests/apitests/ws2_32/ws2_32.rbuild [iso-8859-1] Sun Jun 1 17:08:45 2008 @@ -1,0 +1,11 @@ +<module name="ws2_32_apitests" type="win32cui" unicode="yes"> + <define name="_WIN32_WINNT">0x0501</define> + <library>apitest</library> + <library>kernel32</library> + <library>user32</library> + <library>shell32</library> + <library>ws2_32</library> + <file>helpers.c</file> + <file>testlist.c</file> + <file>ws2_32.c</file> +</module> Propchange: trunk/rostests/apitests/ws2_32/ws2_32.rbuild ------------------------------------------------------------------------------ svn:eol-style = native

2 2

Re: [ros-dev] [ros-diffs] [cfinck] 33824: - Add a test suite forws2_32.dll It currently tests the features I needed toadjust/implement when fixing the wininet problem. ReactOScurrently passes all tests, but fails one if you launch the test app for th
by Steven Edwards 04 Jun '08

04 Jun '08

On Tue, Jun 3, 2008 at 5:08 PM, Colin Finck <mail(a)colinfinck.de> wrote: > The Wine test framework is currently only used by tests imported from Wine, > so an own test suite for ws2_32.dll might get lost there. You could have written the tests for the wine test suite and submitted them. > Also Timo's testing framework offers some interesting features like HTML > output not offered by the Wine one. Sure, but given the size of the wine test suite verses Timo's I think the effort is better spent adding this to winetest > Additionally, we have a free hand here and can play with it as we want, > while we can only import and maybe make little changes to the Wine test > framework if we want to avoid a big merging mess. Your always free to fork. As I said given the large number of unit tests in the Wine framework it seems to make more sense to me to extend that rather than develop a new one. Besides you can add the features you need to the Winetest gui and have it be independent of the framework as a whole. -- Steven Edwards "There is one thing stronger than all the armies in the world, and that is an idea whose time has come." - Victor Hugo

1 0

Re: [ros-dev] [ros-diffs] [greatlrd] 33807: add Test for EngDeleteSemaphore, it only test if it been create or not
by Alex Ionescu 02 Jun '08

02 Jun '08

I'm getting *quite* annoyed with seeing these kinds of tests: ret = SomeFunc(); ASSERT(ret == success); How exactly is this a test anyway? It proves in NO way that the function *worked*, only that it returned success. Furthermore, there are *plenty* of cases where a function could legitimately fail -- it is simply stupid to assume that a failure means a regression. What if the system is out of memory? On Sun, Jun 1, 2008 at 10:38 PM, <greatlrd(a)svn.reactos.org> wrote: > Author: greatlrd > Date: Sun Jun 1 09:38:02 2008 > New Revision: 33807 > > URL: http://svn.reactos.org/svn/reactos?rev=33807&view=rev > Log: > add Test for EngDeleteSemaphore, it only test if it been create or not > > Added: > trunk/rostests/apitests/gdi32api/tests/EngCreateSemaphore.c (with props) > Modified: > trunk/rostests/apitests/gdi32api/testlist.c > > Modified: trunk/rostests/apitests/gdi32api/testlist.c > URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32api/testlis… > ============================================================================== > --- trunk/rostests/apitests/gdi32api/testlist.c [iso-8859-1] (original) > +++ trunk/rostests/apitests/gdi32api/testlist.c [iso-8859-1] Sun Jun 1 09:38:02 2008 > @@ -11,6 +11,7 @@ > #include "tests/CreateFont.c" > #include "tests/CreatePen.c" > #include "tests/CreateRectRgn.c" > +#include "tests/EngCreateSemaphore.c" > #include "tests/ExtCreatePen.c" > #include "tests/GdiConvertBitmap.c" > #include "tests/GdiConvertBrush.c" > @@ -51,6 +52,7 @@ > { L"CreateCompatibleDC", Test_CreateCompatibleDC }, > { L"CreateFont", Test_CreateFont }, > { L"CreatePen", Test_CreatePen }, > + { L"EngCreateSemaphore", Test_EngCreateSemaphore }, > { L"CreateRectRgn", Test_CreateRectRgn }, > { L"ExtCreatePen", Test_ExtCreatePen }, > { L"GdiConvertBitmap", Test_GdiConvertBitmap }, > > Added: trunk/rostests/apitests/gdi32api/tests/EngCreateSemaphore.c > URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32api/tests/E… > ============================================================================== > --- trunk/rostests/apitests/gdi32api/tests/EngCreateSemaphore.c (added) > +++ trunk/rostests/apitests/gdi32api/tests/EngCreateSemaphore.c [iso-8859-1] Sun Jun 1 09:38:02 2008 > @@ -1,0 +1,15 @@ > +/* Simple test of EngAcquireSemaphore only check if we got a lock or not */ > +INT > +Test_EngCreateSemaphore(PTESTINFO pti) > +{ > + > + HSEMAPHORE hsem; > + hsem = EngCreateSemaphore(); > + > + RTEST ( hsem != NULL ); > + > + EngDeleteSemaphore(hsem); > + > + return APISTATUS_NORMAL; > +} > + > > Propchange: trunk/rostests/apitests/gdi32api/tests/EngCreateSemaphore.c > ------------------------------------------------------------------------------ > svn:eol-style = native > > -- Best regards, Alex Ionescu

2 1

[ros-diffs] [greatlrd] 33783: revert my last change
by James Tabor 01 Jun '08

01 Jun '08

Hi! I checked this and it is all wrong,,,,, I reverted part of revision 19267: Replacing the code with the original wine code that behaves like "Windows code" but should be called inside EngCreateBitmap if (pvBits) Width = DIB_GetDIBWidthBytes( lWidth, iFormat); . As it should be: INT FASTCALL DIB_GetDIBWidthBytes (INT width, INT depth) { // return ((width * depth + 31) & ~31) >> 3; int words; switch(depth) { case 1: words = (width + 31) / 32; break; case 4: words = (width + 7) / 8; break; case 8: words = (width + 3) / 4; break; case 15: case 16: words = (width + 1) / 2; break; case 24: words = (width * 3 + 3)/4; break; default: DPRINT1("(%d): Unsupported depth\n", depth ); /* fall through */ case 32: words = width; } return 4 * words; }

2 2

Re: [ros-dev] [ros-diffs] [tkreuzer] 33792: preserve code for NtGdiCreateEnhMetaFile from win32k (where it's going to be removed later) in gdi32 (where it's going to be implemented later)
by Steven Edwards 01 Jun '08

01 Jun '08

On Sat, May 31, 2008 at 7:15 PM, <tkreuzer(a)svn.reactos.org> wrote: > Author: tkreuzer > Date: Sat May 31 18:15:34 2008 > New Revision: 33792 > > URL: http://svn.reactos.org/svn/reactos?rev=33792&view=rev > Log: > preserve code for NtGdiCreateEnhMetaFile from win32k (where it's going to be removed later) in gdi32 (where it's going to be implemented later) if your going to implement it all in usermode are you going to try to just rip the Wine metafile and enhanced metefile drivers? Thanks -- Steven Edwards "There is one thing stronger than all the armies in the world, and that is an idea whose time has come." - Victor Hugo

2 1

[ros-diffs] [hyperion] 33703: added nls added nls/3rdparty added nls/3rdparty/icu
by Timo Kreuzer 31 May '08

31 May '08

I hope everyone is clear in his mind about the fact that this makes up 20 % of the complete reactos source or in other words increases the size of the code by 25% ... > [ros-diffs] [hyperion] 33703: added nls added nls/3rdparty added nls/3rdparty/icu We > officially welcome IBM's excellent ICU4C library for Unicode support to > our humble source tree. May our marriage be long, happy and fertile. > >

6 9

Abiword 2.4.1 Menu Drawing
by James Tabor 30 May '08

30 May '08

Hi, Owner Menu Drawing if I remember right, which allows application to draw their own menus. Yes that is right! Not all applications use MDI. Well, it is now all broken (It was in a state of NEAR DO WELL). I understand the reason for wine testing but please understand What You See Is What You Get. >From the debug output: IntSetMenuItemInfo: Invalid combination of fMask bits used It draws a small little box with the line separators. 8^' looks cute~ I need to stay focus on the issues I'm working on,, please help me by fixing this new issue, please don't send me patches, 8^) James

1 0

Re: [ros-dev] [ros-diffs] [greatlrd] 33764: 1. do not use wine def for reactos 2. this is almost 100% correct list of windows 2003 export list of msvcrt.def and it will make abiword working again for it was missing api wfreopen and allot more api from msvcrt 3
by Steven Edwards 30 May '08

30 May '08

On Thu, May 29, 2008 at 9:27 PM, <greatlrd(a)svn.reactos.org> wrote: > Author: greatlrd > Date: Thu May 29 20:27:29 2008 > New Revision: 33764 > > URL: http://svn.reactos.org/svn/reactos?rev=33764&view=rev > Log: > 1. do not use wine def for reactos > 2. this is almost 100% correct list of windows 2003 export list of msvcrt.def and it will make abiword working again for it was missing api wfreopen and allot more api from msvcrt > 3. this add back api that was remove api they exists in windows 2003 export list > 4. List was provide from colin f > > See issue #3293 for more details. I'd suggest putting a comment at the top of the def so that in the future someone won't make this mistake again. Any idea why it works on Wine with the missing exports but not ReactOS? -- Steven Edwards "There is one thing stronger than all the armies in the world, and that is an idea whose time has come." - Victor Hugo

2 1

Re: [ros-dev] [ros-diffs] [dchapyshev] 33741: - Start implementing shimgvw.dll
by gedmurphy 29 May '08

29 May '08

I wish you'd at least make the effort to talk to people before you do things like this. This is meant to be a COM shell extension, and your implementation is completely wrong. It's therefore incompatible with the XP version of the lib and won't integrate with shell32. I already have the outline for the COM lib sketched out if you wanted to think about rewriting it? Your definitions for the exports are also wrong. I've listed these below for you in case you want to change them. VOID ImageView_Fullscreen(HWND hwnd, HINSTANCE hInst, LPCWSTR path, int nShow); VOID ImageView_FullscreenA(HWND hwnd, HINSTANCE hInst, LPCSTR path, int nShow); VOID ImageView_FullscreenW(HWND hwnd, HINSTANCE hInst, LPCWSTR path, int nShow); VOID ImageView_PrintTo(HWND hwnd, HINSTANCE hInst, LPCWSTR path, int nShow); VOID ImageView_PrintToA(HWND hwnd, HINSTANCE hInst, LPCSTR path, int nShow); VOID ImageView_PrintToW(HWND hwnd, HINSTANCE hInst, LPCWSTR path, int nShow); VOID ImageView_fullscreenW(HWND hwnd, HINSTANCE hInst, LPCWSTR path, int nShow); Regards, Ged. -----Original Message----- From: ros-diffs-bounces(a)reactos.org [mailto:ros-diffs-bounces@reactos.org] On Behalf Of dchapyshev(a)svn.reactos.org Sent: 28 May 2008 20:53 To: ros-diffs(a)reactos.org Subject: [ros-diffs] [dchapyshev] 33741: - Start implementing shimgvw.dll Author: dchapyshev Date: Wed May 28 14:52:46 2008 New Revision: 33741 URL: http://svn.reactos.org/svn/reactos?rev=33741&view=rev Log: - Start implementing shimgvw.dll Added: trunk/reactos/dll/win32/shimgvw/ trunk/reactos/dll/win32/shimgvw/lang/ trunk/reactos/dll/win32/shimgvw/lang/en-US.rc (with props) trunk/reactos/dll/win32/shimgvw/res/ trunk/reactos/dll/win32/shimgvw/res/main.ico (with props) trunk/reactos/dll/win32/shimgvw/res/next.bmp (with props) trunk/reactos/dll/win32/shimgvw/res/prev.bmp (with props) trunk/reactos/dll/win32/shimgvw/res/print.bmp (with props) trunk/reactos/dll/win32/shimgvw/res/rot1.bmp (with props) trunk/reactos/dll/win32/shimgvw/res/rot2.bmp (with props) trunk/reactos/dll/win32/shimgvw/res/save.bmp (with props) trunk/reactos/dll/win32/shimgvw/res/zoomm.bmp (with props) trunk/reactos/dll/win32/shimgvw/res/zoomp.bmp (with props) trunk/reactos/dll/win32/shimgvw/resource.h (with props) trunk/reactos/dll/win32/shimgvw/rsrc.rc (with props) trunk/reactos/dll/win32/shimgvw/shimgvw.c (with props) trunk/reactos/dll/win32/shimgvw/shimgvw.h (with props) trunk/reactos/dll/win32/shimgvw/shimgvw.rbuild (with props) trunk/reactos/dll/win32/shimgvw/shimgvw.rc (with props) trunk/reactos/dll/win32/shimgvw/shimgvw.spec (with props) Modified: trunk/reactos/dll/win32/win32.rbuild Added: trunk/reactos/dll/win32/shimgvw/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shimgvw/lang/en-… ============================================================================== --- trunk/reactos/dll/win32/shimgvw/lang/en-US.rc (added) +++ trunk/reactos/dll/win32/shimgvw/lang/en-US.rc [iso-8859-1] Wed May 28 14:52:46 2008 @@ -1,0 +1,17 @@ +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US + +STRINGTABLE +BEGIN + IDS_APPTITLE "ReactOS Picture and Fax Viewer" + IDS_SETASDESKBG "Set as Desktop Background" + + /* Tooltips */ + IDS_TOOLTIP_NEXT_PIC "Next Picture" + IDS_TOOLTIP_PREV_PIC "Previous Picture" + IDS_TOOLTIP_ZOOM_IN "Zoom In (+)" + IDS_TOOLTIP_ZOOM_OUT "Zoom Out (-)" + IDS_TOOLTIP_ROT_CLOCKW "Rotate Clockwise (Ctrl+K)" + IDS_TOOLTIP_ROT_COUNCW "Rotate Counterclockwise (Ctrl+L)" + IDS_TOOLTIP_PRINT "Print (Ctrl+P)" + IDS_TOOLTIP_SAVEAS "Save As... (Ctrl+S)" +END Propchange: trunk/reactos/dll/win32/shimgvw/lang/en-US.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/shimgvw/res/main.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shimgvw/res/main… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/dll/win32/shimgvw/res/main.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/dll/win32/shimgvw/res/next.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shimgvw/res/next… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/dll/win32/shimgvw/res/next.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/dll/win32/shimgvw/res/prev.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shimgvw/res/prev… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/dll/win32/shimgvw/res/prev.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/dll/win32/shimgvw/res/print.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shimgvw/res/prin… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/dll/win32/shimgvw/res/print.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/dll/win32/shimgvw/res/rot1.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shimgvw/res/rot1… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/dll/win32/shimgvw/res/rot1.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/dll/win32/shimgvw/res/rot2.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shimgvw/res/rot2… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/dll/win32/shimgvw/res/rot2.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/dll/win32/shimgvw/res/save.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shimgvw/res/save… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/dll/win32/shimgvw/res/save.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/dll/win32/shimgvw/res/zoomm.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shimgvw/res/zoom… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/dll/win32/shimgvw/res/zoomm.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/dll/win32/shimgvw/res/zoomp.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shimgvw/res/zoom… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/dll/win32/shimgvw/res/zoomp.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/dll/win32/shimgvw/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shimgvw/resource… ============================================================================== --- trunk/reactos/dll/win32/shimgvw/resource.h (added) +++ trunk/reactos/dll/win32/shimgvw/resource.h [iso-8859-1] Wed May 28 14:52:46 2008 @@ -1,0 +1,53 @@ +#ifndef __SHIMGVW_RESOURCE_H +#define __SHIMGVW_RESOURCE_H + +/* Icons */ +#define IDI_APPICON 1 +#define IDI_BMP_ICON 2 +#define IDI_GIF_ICON 3 +#define IDI_JPG_ICON 4 +#define IDI_PNG_ICON 5 + +#define IDB_PREVICON 50 +#define IDB_NEXTICON 51 +#define IDB_ZOOMPICON 52 +#define IDB_ZOOMMICON 53 +#define IDB_SAVEICON 54 +#define IDB_PRINTICON 55 +#define IDB_ROT1ICON 56 +#define IDB_ROT2ICON 57 + +/* ToolBar buttons */ +#define IDC_PREV 500 +#define IDC_NEXT 501 +#define IDC_ZOOMP 502 +#define IDC_ZOOMM 503 +#define IDC_SAVE 504 +#define IDC_PRINT 505 +#define IDC_ROT1 506 +#define IDC_ROT2 507 + +#define TBICON_PREV 0 +#define TBICON_NEXT 1 +#define TBICON_ZOOMP 2 +#define TBICON_ZOOMM 3 +#define TBICON_SAVE 4 +#define TBICON_PRINT 5 +#define TBICON_ROT1 6 +#define TBICON_ROT2 7 + +/* Strings */ +#define IDS_APPTITLE 100 +#define IDS_SETASDESKBG 101 + +/* Tooltips strings */ +#define IDS_TOOLTIP_NEXT_PIC 300 +#define IDS_TOOLTIP_PREV_PIC 301 +#define IDS_TOOLTIP_ZOOM_IN 302 +#define IDS_TOOLTIP_ZOOM_OUT 304 +#define IDS_TOOLTIP_ROT_CLOCKW 305 +#define IDS_TOOLTIP_ROT_COUNCW 306 +#define IDS_TOOLTIP_PRINT 307 +#define IDS_TOOLTIP_SAVEAS 308 + +#endif /* __SHIMGVW_RESOURCE_H */ Propchange: trunk/reactos/dll/win32/shimgvw/resource.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/shimgvw/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shimgvw/rsrc.rc?… ============================================================================== --- trunk/reactos/dll/win32/shimgvw/rsrc.rc (added) +++ trunk/reactos/dll/win32/shimgvw/rsrc.rc [iso-8859-1] Wed May 28 14:52:46 2008 @@ -1,0 +1,4 @@ +#include <windows.h> +#include "resource.h" + +#include "lang/en-US.rc" Propchange: trunk/reactos/dll/win32/shimgvw/rsrc.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/shimgvw/shimgvw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shimgvw/shimgvw.… ============================================================================== --- trunk/reactos/dll/win32/shimgvw/shimgvw.c (added) +++ trunk/reactos/dll/win32/shimgvw/shimgvw.c [iso-8859-1] Wed May 28 14:52:46 2008 @@ -1,0 +1,496 @@ +/* + * + * PROJECT: ReactOS Picture and Fax Viewer + * FILE: dll/win32/shimgvw/shimgvw.c + * PURPOSE: shimgvw.dll + * PROGRAMMER: Dmitry Chapyshev (dmitry(a)reactos.org) + * + * UPDATE HISTORY: + * 28/05/2008 Created + */ + +#include <stdio.h> +#include <stdlib.h> +#include <stdarg.h> + +#include <windows.h> +#include <commctrl.h> +#include <gdiplus.h> +#include <tchar.h> + +#include "shimgvw.h" + + +HINSTANCE hInstance; +SHIMGVW_SETTINGS shiSettings; +WCHAR szOpenFileName[MAX_PATH]; + +HWND hDispWnd, hToolBar; + +/* ToolBar Buttons */ +static const TBBUTTON Buttons [] = +{ /* iBitmap, idCommand, fsState, fsStyle, bReserved[2], dwData, iString */ + {TBICON_PREV, IDC_PREV, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0}, + {TBICON_NEXT, IDC_NEXT, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0}, + {15, 0, TBSTATE_ENABLED, BTNS_SEP, {0}, 0, 0}, + {TBICON_ZOOMP, IDC_ZOOMP, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0}, + {TBICON_ZOOMM, IDC_ZOOMM, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0}, + {15, 0, TBSTATE_ENABLED, BTNS_SEP, {0}, 0, 0}, + {TBICON_ROT1, IDC_ROT1, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0}, + {TBICON_ROT2, IDC_ROT2, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0}, + {15, 0, TBSTATE_ENABLED, BTNS_SEP, {0}, 0, 0}, + {TBICON_SAVE, IDC_SAVE, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0}, + {TBICON_PRINT, IDC_PRINT, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0}, +}; + +static VOID +ImageView_DrawImage(HWND hwnd) +{ + GpGraphics *graphics; + GpImage *image; + UINT uImgWidth, uImgHeight; + UINT height = 0, width = 0, x = 0, y = 0; + PAINTSTRUCT ps; + RECT rect; + HDC hdc; + + if (GetFileAttributesW(szOpenFileName) == 0xFFFFFFFF) + return; + + hdc = BeginPaint(hwnd, &ps); + + GdipCreateFromHDC(hdc, &graphics); + GdipLoadImageFromFile(szOpenFileName, &image); + GdipGetImageWidth(image, &uImgWidth); + GdipGetImageHeight(image, &uImgHeight); + + if (GetClientRect(hwnd, &rect)) + { + FillRect(hdc, &rect, (HBRUSH)COLOR_WINDOW); + + if ((rect.right == uImgWidth)&&(rect.bottom == uImgHeight)) + { + x = 0, y = 0, width = rect.right, height = rect.bottom; + } + else if ((rect.right >= uImgWidth)&&(rect.bottom >= uImgHeight)) + { + x = (rect.right/2)-(uImgWidth/2); + y = (rect.bottom/2)-(uImgHeight/2); + width = uImgWidth; + height = uImgHeight; + } + else if ((rect.right < uImgWidth)||(rect.bottom < uImgHeight)) + { + if (rect.bottom < uImgHeight) + { + height = rect.bottom; + width = uImgWidth*(UINT)rect.bottom/uImgHeight; + x = (rect.right/2)-(width/2); + y = (rect.bottom/2)-(height/2); + } + if (rect.right < uImgWidth) + { + width = rect.right; + height = uImgHeight*(UINT)rect.right/uImgWidth; + x = (rect.right/2)-(width/2); + y = (rect.bottom/2)-(height/2); + } + if ((height > rect.bottom)||(width > rect.right)) + { + for (;;) + { + if (((int)width - 1 < 0)||((int)height - 1 < 0)) break; + width -= 1; + height -= 1; + y = (rect.bottom/2)-(height/2); + x = (rect.right/2)-(width/2); + if ((height < rect.bottom)&&(width < rect.right)) break; + } + } + } + else if ((rect.right <= uImgWidth)&&(rect.bottom <= uImgHeight)) + { + height = uImgHeight*(UINT)rect.right/uImgWidth; + y = (rect.bottom/2)-(height/2); + width = rect.right; + + if ((height > rect.bottom)||(width > rect.right)) + { + for (;;) + { + if (((int)width - 1 < 0)||((int)height - 1 < 0)) break; + width -= 1; + height -= 1; + y = (rect.bottom/2)-(height/2); + x = (rect.right/2)-(width/2); + if ((height < rect.bottom)&&(width < rect.right)) break; + } + } + } + + //TCHAR szBuf[MAX_PATH]; + //wsprintf(szBuf, _T("x = %d\ny = %d\nWidth = %d\nHeight = %d\n\nrect.right = %d\nrect.bottom = %d\n\nuImgWidth = %d\nuImgHeight = %d"), x, y, width, height, rect.right, rect.bottom, uImgWidth, uImgHeight); + //MessageBox(0, szBuf, NULL, MB_OK); + GdipDrawImageRect(graphics, image, x, y, width, height); + } + + DeleteDC(hdc); + EndPaint(hwnd, &ps); +} + +static BOOL +ImageView_LoadSettings() +{ + HKEY hKey; + DWORD dwSize; + + if (RegOpenKeyEx(HKEY_CURRENT_USER, _T("Software\\ReactOS\\shimgvw"), 0, KEY_READ, &hKey) == ERROR_SUCCESS) + { + dwSize = sizeof(SHIMGVW_SETTINGS); + if (RegQueryValueEx(hKey, _T("Settings"), NULL, NULL, (LPBYTE)&shiSettings, &dwSize) == ERROR_SUCCESS) + { + RegCloseKey(hKey); + return TRUE; + } + + RegCloseKey(hKey); + } + + return FALSE; +} + +static VOID +ImageView_SaveSettings(HWND hwnd) +{ + WINDOWPLACEMENT wp; + HKEY hKey; + + ShowWindow(hwnd, SW_HIDE); + wp.length = sizeof(WINDOWPLACEMENT); + GetWindowPlacement(hwnd, &wp); + + shiSettings.Left = wp.rcNormalPosition.left; + shiSettings.Top = wp.rcNormalPosition.top; + shiSettings.Right = wp.rcNormalPosition.right; + shiSettings.Bottom = wp.rcNormalPosition.bottom; + shiSettings.Maximized = (IsZoomed(hwnd) || (wp.flags & WPF_RESTORETOMAXIMIZED)); + + if (RegCreateKeyEx(HKEY_CURRENT_USER, _T("Software\\ReactOS\\shimgvw"), 0, NULL, + REG_OPTION_NON_VOLATILE, KEY_WRITE, NULL, &hKey, NULL) == ERROR_SUCCESS) + { + RegSetValueEx(hKey, _T("Settings"), 0, REG_BINARY, (LPBYTE)&shiSettings, sizeof(SHIMGVW_SETTINGS)); + RegCloseKey(hKey); + } +} + +static BOOL +ImageView_CreateToolBar(HWND hwnd) +{ + INT numButtons = sizeof(Buttons) / sizeof(Buttons[0]); + + hToolBar = CreateWindowEx(0, TOOLBARCLASSNAME, NULL, + WS_CHILD | WS_VISIBLE | TBSTYLE_FLAT | CCS_BOTTOM | TBSTYLE_TOOLTIPS, + 0, 0, 0, 0, hwnd, + 0, hInstance, NULL); + if(hToolBar != NULL) + { + HIMAGELIST hImageList; + + SendMessage(hToolBar, TB_SETEXTENDEDSTYLE, + 0, TBSTYLE_EX_HIDECLIPPEDBUTTONS); + + SendMessage(hToolBar, TB_BUTTONSTRUCTSIZE, + sizeof(Buttons[0]), 0); + + hImageList = ImageList_Create(TB_IMAGE_WIDTH, TB_IMAGE_HEIGHT, ILC_MASK | ILC_COLOR24, 1, 1); + + ImageList_AddMasked(hImageList, LoadImage(hInstance, MAKEINTRESOURCE(IDB_PREVICON), IMAGE_BITMAP, + TB_IMAGE_WIDTH, TB_IMAGE_HEIGHT, LR_DEFAULTCOLOR), RGB(255, 255, 255)); + + ImageList_AddMasked(hImageList, LoadImage(hInstance, MAKEINTRESOURCE(IDB_NEXTICON), IMAGE_BITMAP, + TB_IMAGE_WIDTH, TB_IMAGE_HEIGHT, LR_DEFAULTCOLOR), RGB(255, 255, 255)); + + ImageList_AddMasked(hImageList, LoadImage(hInstance, MAKEINTRESOURCE(IDB_ZOOMPICON), IMAGE_BITMAP, + TB_IMAGE_WIDTH, TB_IMAGE_HEIGHT, LR_DEFAULTCOLOR), RGB(255, 255, 255)); + + ImageList_AddMasked(hImageList, LoadImage(hInstance, MAKEINTRESOURCE(IDB_ZOOMMICON), IMAGE_BITMAP, + TB_IMAGE_WIDTH, TB_IMAGE_HEIGHT, LR_DEFAULTCOLOR), RGB(255, 255, 255)); + + ImageList_AddMasked(hImageList, LoadImage(hInstance, MAKEINTRESOURCE(IDB_SAVEICON), IMAGE_BITMAP, + TB_IMAGE_WIDTH, TB_IMAGE_HEIGHT, LR_DEFAULTCOLOR), RGB(255, 255, 255)); + + ImageList_AddMasked(hImageList, LoadImage(hInstance, MAKEINTRESOURCE(IDB_PRINTICON), IMAGE_BITMAP, + TB_IMAGE_WIDTH, TB_IMAGE_HEIGHT, LR_DEFAULTCOLOR), RGB(255, 255, 255)); + + ImageList_AddMasked(hImageList, LoadImage(hInstance, MAKEINTRESOURCE(IDB_ROT1ICON), IMAGE_BITMAP, + TB_IMAGE_WIDTH, TB_IMAGE_HEIGHT, LR_DEFAULTCOLOR), RGB(255, 255, 255)); + + ImageList_AddMasked(hImageList, LoadImage(hInstance, MAKEINTRESOURCE(IDB_ROT2ICON), IMAGE_BITMAP, + TB_IMAGE_WIDTH, TB_IMAGE_HEIGHT, LR_DEFAULTCOLOR), RGB(255, 255, 255)); + + if (hImageList == NULL) return FALSE; + + ImageList_Destroy((HIMAGELIST)SendMessage(hToolBar, TB_SETIMAGELIST, + 0, (LPARAM)hImageList)); + + SendMessage(hToolBar, TB_ADDBUTTONS, + numButtons, (LPARAM)Buttons); + + return TRUE; + } + + return FALSE; +} + +static VOID +ImageView_InitControls(HWND hwnd) +{ + MoveWindow(hwnd, shiSettings.Left, shiSettings.Top, + shiSettings.Right - shiSettings.Left, + shiSettings.Bottom - shiSettings.Top, TRUE); + + if (shiSettings.Maximized) ShowWindow(hwnd, SW_MAXIMIZE); + + hDispWnd = CreateWindowEx(WS_EX_TRANSPARENT, _T("STATIC"), _T(""), + WS_CHILD | WS_VISIBLE, + 0, 0, 0, 0, hwnd, NULL, hInstance, NULL); + + ImageView_CreateToolBar(hwnd); +} + +LRESULT CALLBACK +ImageView_WndProc(HWND hwnd, UINT Message, WPARAM wParam, LPARAM lParam) +{ + switch (Message) + { + case WM_CREATE: + { + ImageView_InitControls(hwnd); + } + break; + + case WM_COMMAND: + { + switch (wParam) + { + case IDC_PREV: + + break; + case IDC_NEXT: + + break; + case IDC_ZOOMP: + + break; + case IDC_ZOOMM: + + break; + case IDC_SAVE: + + break; + case IDC_PRINT: + + break; + case IDC_ROT1: + + break; + case IDC_ROT2: + + break; + } + } + break; + + case WM_NOTIFY: + { + LPNMHDR pnmhdr = (LPNMHDR)lParam; + + switch (pnmhdr->code) + { + case TTN_GETDISPINFO: + { + LPTOOLTIPTEXT lpttt; + UINT idButton; + + lpttt = (LPTOOLTIPTEXT)lParam; + idButton = (UINT)lpttt->hdr.idFrom; + + switch (idButton) + { + case IDC_PREV: + lpttt->lpszText = MAKEINTRESOURCE(IDS_TOOLTIP_PREV_PIC); + break; + case IDC_NEXT: + lpttt->lpszText = MAKEINTRESOURCE(IDS_TOOLTIP_NEXT_PIC); + break; + case IDC_ZOOMP: + lpttt->lpszText = MAKEINTRESOURCE(IDS_TOOLTIP_ZOOM_IN); + break; + case IDC_ZOOMM: + lpttt->lpszText = MAKEINTRESOURCE(IDS_TOOLTIP_ZOOM_OUT); + break; + case IDC_SAVE: + lpttt->lpszText = MAKEINTRESOURCE(IDS_TOOLTIP_SAVEAS); + break; + case IDC_PRINT: + lpttt->lpszText = MAKEINTRESOURCE(IDS_TOOLTIP_PRINT); + break; + case IDC_ROT1: + lpttt->lpszText = MAKEINTRESOURCE(IDS_TOOLTIP_ROT_COUNCW); + break; + case IDC_ROT2: + lpttt->lpszText = MAKEINTRESOURCE(IDS_TOOLTIP_ROT_CLOCKW); + break; + } + } + } + } + break; + + case WM_PAINT: + { + ImageView_DrawImage(hDispWnd); + } + break; + + case WM_SIZING: + { + LPRECT pRect = (LPRECT)lParam; + if (pRect->right-pRect->left < 350) + pRect->right = pRect->left + 350; + + if (pRect->bottom-pRect->top < 290) + pRect->bottom = pRect->top + 290; + } + break; + + case WM_SIZE: + { + MoveWindow(hDispWnd, 1, 1, LOWORD(lParam)-1, HIWORD(lParam)-35, TRUE); + SendMessage(hToolBar, TB_AUTOSIZE, 0, 0); + } + break; + + case WM_DESTROY: + { + ImageView_SaveSettings(hwnd); + PostQuitMessage(0); + } + break; + } + + return DefWindowProc(hwnd, Message, wParam, lParam); +} + +LONG +ImageView_CreateWindow(HWND hwnd, LPWSTR szFileName) +{ + struct GdiplusStartupInput gdiplusStartupInput; + ULONG_PTR gdiplusToken; + WNDCLASS WndClass = {0}; + TCHAR szBuf[512]; + HWND hMainWnd; + MSG msg; + + wcscpy(szOpenFileName, szFileName); + + if (!ImageView_LoadSettings()) + { + shiSettings.Maximized = FALSE; + shiSettings.Left = 0; + shiSettings.Top = 0; + shiSettings.Right = 520; + shiSettings.Bottom = 400; + } + + // Initialize GDI+ + gdiplusStartupInput.GdiplusVersion = 1; + gdiplusStartupInput.DebugEventCallback = NULL; + gdiplusStartupInput.SuppressBackgroundThread = 0; + gdiplusStartupInput.SuppressExternalCodecs = 0; + + GdiplusStartup(&gdiplusToken, &gdiplusStartupInput, NULL); + + // Create the window + WndClass.lpszClassName = _T("shimgvw_window"); + WndClass.lpfnWndProc = (WNDPROC)ImageView_WndProc; + WndClass.hInstance = hInstance; + WndClass.style = CS_HREDRAW | CS_VREDRAW; + WndClass.hIcon = LoadIcon(hInstance, MAKEINTRESOURCE(IDI_APPICON)); + WndClass.hCursor = LoadCursor(hInstance, IDC_ARROW); + WndClass.hbrBackground = (HBRUSH)COLOR_WINDOW; + + if (!RegisterClass(&WndClass)) return -1; + + LoadString(hInstance, IDS_APPTITLE, szBuf, sizeof(szBuf) / sizeof(TCHAR)); + hMainWnd = CreateWindow(_T("shimgvw_window"), szBuf, + WS_OVERLAPPEDWINDOW | WS_CLIPCHILDREN | WS_VISIBLE | WS_CAPTION, + CW_USEDEFAULT, CW_USEDEFAULT, + 0, 0, NULL, NULL, hInstance, NULL); + + // Show it + ShowWindow(hMainWnd, SW_SHOW); + UpdateWindow(hMainWnd); + + // Message Loop + while(GetMessage(&msg,NULL,0,0)) + { + TranslateMessage(&msg); + DispatchMessageW(&msg); + } + + GdiplusShutdown(gdiplusToken); + return -1; +} + +LONG +CALLBACK +ImageView_FullscreenW(HWND hwnd, UINT uMsg, LPARAM lParam1, LPARAM lParam2) +{ + return ImageView_CreateWindow(hwnd, (LPWSTR)lParam1); +} + +LONG +CALLBACK +ImageView_Fullscreen(HWND hwnd, UINT uMsg, LPARAM lParam1, LPARAM lParam2) +{ + WCHAR szFile[MAX_PATH]; + + if (MultiByteToWideChar(CP_ACP, 0, (char*)lParam1, strlen((char*)lParam1)+1, szFile, MAX_PATH)) + { + return ImageView_CreateWindow(hwnd, (LPWSTR)szFile); + } + + return -1; +} + +LONG +CALLBACK +ImageView_FullscreenA(HWND hwnd, UINT uMsg, LPARAM lParam1, LPARAM lParam2) +{ + WCHAR szFile[MAX_PATH]; + + if (MultiByteToWideChar(CP_ACP, 0, (char*)lParam1, strlen((char*)lParam1)+1, szFile, MAX_PATH)) + { + return ImageView_CreateWindow(hwnd, (LPWSTR)szFile); + } + + return -1; +} + +BOOL WINAPI +DllMain(IN HINSTANCE hinstDLL, + IN DWORD dwReason, + IN LPVOID lpvReserved) +{ + switch (dwReason) + { + case DLL_PROCESS_ATTACH: + case DLL_THREAD_ATTACH: + hInstance = hinstDLL; + break; + } + + return TRUE; +} + Propchange: trunk/reactos/dll/win32/shimgvw/shimgvw.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/shimgvw/shimgvw.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shimgvw/shimgvw.… ============================================================================== --- trunk/reactos/dll/win32/shimgvw/shimgvw.h (added) +++ trunk/reactos/dll/win32/shimgvw/shimgvw.h [iso-8859-1] Wed May 28 14:52:46 2008 @@ -1,0 +1,17 @@ +#include <windows.h> + +#include "resource.h" + +#define TB_IMAGE_WIDTH 16 +#define TB_IMAGE_HEIGHT 16 + +extern HINSTANCE hInstance; + +typedef struct +{ + BOOL Maximized; + INT Left; + INT Top; + INT Right; + INT Bottom; +} SHIMGVW_SETTINGS; Propchange: trunk/reactos/dll/win32/shimgvw/shimgvw.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/shimgvw/shimgvw.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shimgvw/shimgvw.… ============================================================================== --- trunk/reactos/dll/win32/shimgvw/shimgvw.rbuild (added) +++ trunk/reactos/dll/win32/shimgvw/shimgvw.rbuild [iso-8859-1] Wed May 28 14:52:46 2008 @@ -1,0 +1,15 @@ +<module name="shimgvw" type="win32dll" baseaddress="${BASEADDRESS_SHIMGVW}" installbase="system32" installname="shimgvw.dll"> + <importlibrary definition="shimgvw.spec.def" /> + <include base="shimgvw">.</include> + <define name="_DISABLE_TIDENTS" /> + <library>kernel32</library> + <library>advapi32</library> + <library>comctl32</library> + <library>ntdll</library> + <library>user32</library> + <library>gdi32</library> + <library>gdiplus</library> + <file>shimgvw.c</file> + <file>shimgvw.rc</file> + <file>shimgvw.spec</file> +</module> Propchange: trunk/reactos/dll/win32/shimgvw/shimgvw.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/shimgvw/shimgvw.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shimgvw/shimgvw.… ============================================================================== --- trunk/reactos/dll/win32/shimgvw/shimgvw.rc (added) +++ trunk/reactos/dll/win32/shimgvw/shimgvw.rc [iso-8859-1] Wed May 28 14:52:46 2008 @@ -1,0 +1,21 @@ +#include <windows.h> +#include "resource.h" + +#define REACTOS_VERSION_DLL +#define REACTOS_STR_FILE_DESCRIPTION "ReactOS Picture and Fax Viewer\0" +#define REACTOS_STR_INTERNAL_NAME "shimgvw\0" +#define REACTOS_STR_ORIGINAL_FILENAME "shimgvw.dll\0" +#include <reactos/version.rc> + +IDI_APPICON ICON "res/main.ico" + +IDB_PREVICON BITMAP "res/prev.bmp" +IDB_NEXTICON BITMAP "res/next.bmp" +IDB_ZOOMPICON BITMAP "res/zoomp.bmp" +IDB_ZOOMMICON BITMAP "res/zoomm.bmp" +IDB_SAVEICON BITMAP "res/save.bmp" +IDB_PRINTICON BITMAP "res/print.bmp" +IDB_ROT1ICON BITMAP "res/rot1.bmp" +IDB_ROT2ICON BITMAP "res/rot2.bmp" + +#include "rsrc.rc" Propchange: trunk/reactos/dll/win32/shimgvw/shimgvw.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/shimgvw/shimgvw.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shimgvw/shimgvw.… ============================================================================== --- trunk/reactos/dll/win32/shimgvw/shimgvw.spec (added) +++ trunk/reactos/dll/win32/shimgvw/shimgvw.spec [iso-8859-1] Wed May 28 14:52:46 2008 @@ -1,0 +1,14 @@ +@ stub ImageView_COMServer +@ stdcall ImageView_Fullscreen(ptr long ptr ptr) +@ stdcall ImageView_FullscreenA(ptr long ptr ptr) +@ stdcall ImageView_FullscreenW(ptr long ptr ptr) +@ stub ImageView_PrintTo +@ stub ImageView_PrintToA +@ stub ImageView_PrintToW +@ stub imageview_fullscreenW +@ stub ConvertDIBSECTIONToThumbnail +@ stub DllCanUnloadNow +@ stub DllGetClassObject +@ stub DllInstall +@ stub DllRegisterServer +@ stub DllUnregisterServer Propchange: trunk/reactos/dll/win32/shimgvw/shimgvw.spec ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/win32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/win32.rbuild?rev… ============================================================================== --- trunk/reactos/dll/win32/win32.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/win32.rbuild [iso-8859-1] Wed May 28 14:52:46 2008 @@ -292,6 +292,9 @@ <directory name="shfolder"> <xi:include href="shfolder/shfolder.rbuild" /> </directory> +<directory name="shimgvw"> + <xi:include href="shimgvw/shimgvw.rbuild" /> +</directory> <directory name="shlwapi"> <xi:include href="shlwapi/shlwapi.rbuild" /> </directory>

1 0

[ros-diffs] [tkreuzer] 33752: fix palette implementation
by James Tabor 29 May '08

29 May '08

Hi, Could it be easier to just: static GDIDEVICE PrimarySurface; PGDIDEVICE pPrimarySurface = &PrimarySurface; then use pPrimarySurface through out? I will have to rewrite everything later to support the new HDEV code. IDEA~! Stefan100 theres a good patch! ;^D Thanks, James

1 0

Re: [ros-dev] [ros-diffs] [tkreuzer] 33732: exception.h: merge changes from wine. Revision 1.37 fixes the exception in ole32 when opening a file with FoxitReader. Also fixes some warnings and hopefully some usermode crashes. 1.28: Jonathan Ernst <jonathan@ernstfamily.ch> Update the address of the Free Software Foundation. 1.29: Alexandre Julliard <julliard@winehq.org> include: Exception filters should return LONG, not DWORD. Also move UnhandledExceptionFilter definitions to winbase.h since they are there in
by Aleksey Bragin 28 May '08

28 May '08

On May 28, 2008, at 4:41 AM, tkreuzer(a)svn.reactos.org wrote: > 1.28: Jonathan Ernst <jonathan(a)ernstfamily.ch> > Update the address of the Free Software Foundation. This should fix a lot of crashes, since many apps would try to dereference FSF's address, but it would be invalid! :-) WBR, Aleksey Bragin.

1 0

Re: [ros-dev] [ros-diffs] [fireball] 33662: - msiexec is GUI app, not CUI.
by Steven Edwards 24 May '08

24 May '08

On Fri, May 23, 2008 at 1:55 PM, <fireball(a)svn.reactos.org> wrote: > - msiexec is GUI app, not CUI. Is this a Wine bug then? It has it listed as a console based application. When you run msiexec directly on Windows I know it does not start a console window so I guess this would imply it is a GUI with a hidden window right? -- Steven Edwards "There is one thing stronger than all the armies in the world, and that is an idea whose time has come." - Victor Hugo

3 2

Re: [ros-dev] [ros-diffs] [dchapyshev] 33607: - Added kbsdll to install hooks (does not work on ReactOS). To switch layouts temporarily used keys Left Alt + F10
by Steven Edwards 20 May '08

20 May '08

On Tue, May 20, 2008 at 8:53 AM, <dchapyshev(a)svn.reactos.org> wrote: > +#include "../kbswitch.h" Could you set an include path and remove the ../ from the source? gnumake throws a fit with parallel makes and relative paths. -- Steven Edwards "There is one thing stronger than all the armies in the world, and that is an idea whose time has come." - Victor Hugo

1 0

Re: [ros-dev] [ros-diffs] [cfinck] 33571: Check if the GetWindowsDirectory call succeeded and use PathAppend to prevent a buffer overflow, when WinDir + "\regedit.exe" > MAX_PATH
by Alex Ionescu 20 May '08

20 May '08

If GetWindowsDirectory fails, you have much worse issues to worry about than executable redirection. Also note that regedt32.exe is usually in the system32 directory, so how is this a security/redirection issue exactly? This implies someone would have to: 1) Give you a malware regedit.exe in directory foo 2) Give you the legitimate regedt32.exe in directory foo 3) Somehow convince you to: 3.1) Use regedt32 instead of regedit (few people even know this tool) 3.2) Launch regedt32 from this "foo" directory instead of using start/run regedt32 The issue you're looking for just doesn't exist. 2008/5/19 FENG Yu Ning <fengyuning1984(a)gmail.com>: > On Sun, May 18, 2008 at 7:28 PM, Alex Ionescu <ionucu(a)videotron.ca> wrote: >> >> Last nitpick: if you can't get the windows directory, just >> ShellExecute "regedit.exe" directly, as the code originally did -- >> this is the behavior on Windows, fyi. >> > > Though it is the behavior on Windows, it is a bad thing, IMHO. There are > already too many little viruses who pretend to be a system executable, say, > explorer.exe, and they are placed in a (sub)directory of the windows > directory to be shell executed. If we can't get the windows direcoty, we > should let the user know, and give them the chance to fix it, instead of > blindly execute anything. > I used to suffer from those, and they were really annoying. Please consider > being different from Windows in this and similar issues. > MHO. > > _______________________________________________ > Ros-dev mailing list > Ros-dev(a)reactos.org > http://www.reactos.org/mailman/listinfo/ros-dev > > -- Best regards, Alex Ionescu -- Best regards, Alex Ionescu

2 2

Re: [ros-dev] [ros-diffs] [greatlrd] 33593: adding 1 new syscall from vista : NtGdiCreateOPMProtectedOutputs Adding 62 new syscall from vista, they are known as D3DKMT for the graphic drv and gdi32.dll, I have not fix the protype for I do not known if it same
by Alex Ionescu 19 May '08

19 May '08

Why the hell are you putting function headers in a header called "types"? On Mon, May 19, 2008 at 2:33 AM, <greatlrd(a)svn.reactos.org> wrote: > Author: greatlrd > Date: Sun May 18 13:33:27 2008 > New Revision: 33593 > > URL: http://svn.reactos.org/svn/reactos?rev=33593&view=rev > Log: > adding 1 new syscall from vista : NtGdiCreateOPMProtectedOutputs > Adding 62 new syscall from vista, they are known as D3DKMT for the graphic drv and gdi32.dll, I have not fix the protype for I do not known if it same as the drv prototype or not, yet. > NtGdiDdDDICheckExclusiveOwnership,NtGdiDdDDICheckMonitorPowerState,NtGdiDdDDICheckOcclusion,NtGdiDdDDICloseAdapter, NtGdiDdDDICreateAllocation, NtGdiDdDDICreateContext, NtGdiDdDDICreateDCFromMemory, NtGdiDdDDICreateDevice, NtGdiDdDDICreateOverlay, NtGdiDdDDICreateSynchronizationObject, NtGdiDdDDIDestroyAllocation, NtGdiDdDDIDestroyContext, NtGdiDdDDIDestroyDCFromMemory, NtGdiDdDDIDestroyDevice, NtGdiDdDDIDestroyOverlay, NtGdiDdDDIDestroySynchronizationObject, NtGdiDdDDIEscape, NtGdiDdDDIFlipOverlay, NtGdiDdDDIGetContextSchedulingPriority, NtGdiDdDDIGetDeviceState, NtGdiDdDDIGetDisplayModeList, NtGdiDdDDIGetMultisampleMethodList, NtGdiDdDDIGetPresentHistory, NtGdiDdDDIGetProcessSchedulingPriorityClass, NtGdiDdDDIGetRuntimeData, NtGdiDdDDIGetScanLine, NtGdiDdDDIGetSharedPrimaryHandle, NtGdiDdDDIInvalidateActiveVidPn, NtGdiDdDDILock, NtGdiDdDDIOpenAdapterFromDeviceName, NtGdiDdDDIOpenAdapterFromHdc, NtGdiDdDDIOpenResource, NtGdiDdDDIPollDisplayChildren, NtGdiDdDDIPresent, > NtGdiDdDDIQueryAdapterInfo, NtGdiDdDDIQueryAllocationResidency, NtGdiDdDDIQueryResourceInfo, NtGdiDdDDIQueryStatistics, NtGdiDdDDIReleaseProcessVidPnSourceOwners, NtGdiDdDDIRender, NtGdiDdDDISetAllocationPriority, NtGdiDdDDISetContextSchedulingPriority, NtGdiDdDDISetDisplayMode, NtGdiDdDDISetDisplayPrivateDriverFormat, NtGdiDdDDISetGammaRamp, NtGdiDdDDISetProcessSchedulingPriorityClass, NtGdiDdDDISetQueuedLimit, NtGdiDdDDISetVidPnSourceOwner, NtGdiDdDDISharedPrimaryLockNotification, NtGdiDdDDISharedPrimaryUnLockNotification, NtGdiDdDDISignalSynchronizationObject, NtGdiDdDDIUnlock, NtGdiDdDDIUpdateOverlay, NtGdiDdDDIWaitForIdle, NtGdiDdDDIWaitForSynchronizationObject, NtGdiDdDDIWaitForVerticalBlankEvent, NtGdiDDCCIGetCapabilitiesString, NtGdiDDCCIGetCapabilitiesStringLength, NtGdiDDCCIGetTimingReport, NtGdiDDCCIGetVCPFeature, NtGdiDDCCISaveCurrentSettings, NtGdiDDCCISetVCPFeature, > > Added: > branches/win32k-gdi-dx/subsystems/win32/win32k/ntddraw/d3dkmt.c (with props) > Modified: > branches/win32k-gdi-dx/include/reactos/win32k/ntgdityp.h > branches/win32k-gdi-dx/subsystems/win32/win32k/stubs/stubs.c > branches/win32k-gdi-dx/subsystems/win32/win32k/w32ksvc.db > > Modified: branches/win32k-gdi-dx/include/reactos/win32k/ntgdityp.h > URL: http://svn.reactos.org/svn/reactos/branches/win32k-gdi-dx/include/reactos/w… > ============================================================================== > --- branches/win32k-gdi-dx/include/reactos/win32k/ntgdityp.h [iso-8859-1] (original) > +++ branches/win32k-gdi-dx/include/reactos/win32k/ntgdityp.h [iso-8859-1] Sun May 18 13:33:27 2008 > @@ -1,667 +1,738 @@ > -/* > - * COPYRIGHT: See COPYING in the top level directory > - * PROJECT: ReactOS Win32 Graphical Subsystem (WIN32K) > - * FILE: include/win32k/ntgdityp.h > - * PURPOSE: Win32 Shared GDI Types for NtGdi* > - * PROGRAMMER: Alex Ionescu (alex(a)relsoft.net) > - */ > - > -/* INCLUDES ******************************************************************/ > - > -#ifndef _NTGDITYP_ > -#define _NTGDITYP_ > - > -/* ENUMERATIONS **************************************************************/ > - > -typedef enum _ARCTYPE > -{ > - GdiTypeArc, > - GdiTypeArcTo, > - GdiTypeChord, > - GdiTypePie, > -} ARCTYPE, *PARCTYPE; > - > -typedef enum _PALFUNCTYPE > -{ > - GdiPalAnimate, > - GdiPalSetEntries, > - GdiPalGetEntries, > - GdiPalGetSystemEntries, > - GdiPalSetColorTable, > - GdiPalGetColorTable, > -} PALFUNCTYPE, *PPALFUNCTYPE; > - > -typedef enum _POLYFUNCTYPE > -{ > - GdiPolyPolygon = 1, > - GdiPolyPolyLine, > - GdiPolyBezier, > - GdiPolyLineTo, > - GdiPolyBezierTo, > - GdiPolyPolyRgn, > -} POLYFUNCTYPE, *PPOLYFUNCTYPE; > - > -typedef enum _GETDCDWORD > -{ > - GdiGetJournal, > - GdiGetRelAbs, > - GdiGetBreakExtra, > - GdiGerCharBreak, > - GdiGetArcDirection, > - GdiGetEMFRestorDc, > - GdiGetFontLanguageInfo, > - GdiGetIsMemDc, > - GdiGetMapMode, > - GdiGetTextCharExtra, > -} GETDCDWORD, *PGETDCDWORD; > - > -typedef enum _GETSETDCDWORD > -{ > - GdiGetSetCopyCount = 2, > - GdiGetSetTextAlign, > - GdiGetSetRelAbs, > - GdiGetSetTextCharExtra, > - GdiGetSetSelectFont, > - GdiGetSetMapperFlagsInternal, > - GdiGetSetMapMode, > - GdiGetSetArcDirection, > -} GETSETDCDWORD, *PGETSETDCDWORD; > - > -typedef enum _GETDCPOINT > -{ > - GdiGetViewPortExt = 1, > - GdiGetWindowExt, > - GdiGetViewPortOrg, > - GdiGetWindowOrg, > - GdiGetAspectRatioFilter, > - GdiGetDCOrg = 6, > -} GETDCPOINT, *PGETDCPOINT; > - > - > -typedef enum _GDIBATCHCMD > -{ > - GdiBCPatBlt, > - GdiBCPolyPatBlt, > - GdiBCTextOut, > - GdiBCExtTextOut, > - GdiBCSetBrushOrg, > - GdiBCExtSelClipRgn, > - GdiBCSelObj, > - GdiBCDelObj, > - GdiBCDelRgn, > -} GDIBATCHCMD, *PGDIBATCHCMD; > - > -typedef enum _TRANSFORMTYPE > -{ > - GdiDpToLp, > - GdiLpToDp, > -} TRANSFORMTYPE, *PTRANSFORMTYPE; > - > -typedef enum GDIObjType > -{ > - GDIObjType_DEF_TYPE = 0x00, > - GDIObjType_DC_TYPE = 0x01, > - GDIObjType_UNUSED1_TYPE = 0x02, > - GDIObjType_UNUSED2_TYPE = 0x03, > - GDIObjType_RGN_TYPE = 0x04, > - GDIObjType_SURF_TYPE = 0x05, > - GDIObjType_CLIENTOBJ_TYPE = 0x06, > - GDIObjType_PATH_TYPE = 0x07, > - GDIObjType_PAL_TYPE = 0x08, > - GDIObjType_ICMLCS_TYPE = 0x09, > - GDIObjType_LFONT_TYPE = 0x0a, > - GDIObjType_RFONT_TYPE = 0x0b, > - GDIObjType_PFE_TYPE = 0x0c, > - GDIObjType_PFT_TYPE = 0x0d, > - GDIObjType_ICMCXF_TYPE = 0x0e, > - GDIObjType_SPRITE_TYPE = 0x0f, > - GDIObjType_BRUSH_TYPE = 0x10, > - GDIObjType_UMPD_TYPE = 0x11, > - GDIObjType_UNUSED4_TYPE = 0x12, > - GDIObjType_SPACE_TYPE = 0x13, > - GDIObjType_UNUSED5_TYPE = 0x14, > - GDIObjType_META_TYPE = 0x15, > - GDIObjType_EFSTATE_TYPE = 0x16, > - GDIObjType_BMFD_TYPE = 0x17, > - GDIObjType_VTFD_TYPE = 0x18, > - GDIObjType_TTFD_TYPE = 0x19, > - GDIObjType_RC_TYPE = 0x1a, > - GDIObjType_TEMP_TYPE = 0x1b, > - GDIObjType_DRVOBJ_TYPE = 0x1c, > - GDIObjType_DCIOBJ_TYPE = 0x1d, > - GDIObjType_SPOOL_TYPE = 0x1e, > - GDIObjType_MAX_TYPE = 0x1e, > - GDIObjTypeTotal = 0x1f, > -} GDIOBJTYPE, *PGDIOBJTYPE; > - > -typedef enum GDILoObjType > -{ > - GDILoObjType_LO_BRUSH_TYPE = 0x100000, > - GDILoObjType_LO_DC_TYPE = 0x10000, > - GDILoObjType_LO_BITMAP_TYPE = 0x50000, > - GDILoObjType_LO_PALETTE_TYPE = 0x80000, > - GDILoObjType_LO_FONT_TYPE = 0xa0000, > - GDILoObjType_LO_REGION_TYPE = 0x40000, > - GDILoObjType_LO_ICMLCS_TYPE = 0x90000, > - GDILoObjType_LO_CLIENTOBJ_TYPE = 0x60000, > - GDILoObjType_LO_ALTDC_TYPE = 0x210000, > - GDILoObjType_LO_PEN_TYPE = 0x300000, > - GDILoObjType_LO_EXTPEN_TYPE = 0x500000, > - GDILoObjType_LO_DIBSECTION_TYPE = 0x250000, > - GDILoObjType_LO_METAFILE16_TYPE = 0x260000, > - GDILoObjType_LO_METAFILE_TYPE = 0x460000, > - GDILoObjType_LO_METADC16_TYPE = 0x660000 > -} GDILOOBJTYPE, *PGDILOOBJTYPE; > - > -#define GdiWorldSpaceToPageSpace 0x203 > - > -/* FIXME: Unknown */ > -typedef DWORD FULLSCREENCONTROL; > -typedef DWORD LFTYPE; > - > -/* Public LAST_STOCK = 19, plus 2 more internal entries */ > -#define NB_STOCK_OBJECTS 22 > - > -/* extra stock object: default 1x1 bitmap for memory DCs */ > -#define DEFAULT_BITMAP (21) > - > - > -/* DEFINES *******************************************************************/ > - > -#define GDIBATCHBUFSIZE 0x136*4 > -#define GDI_BATCH_LIMIT 20 > - > -// NtGdiGetCharWidthW Flags > -#define GCW_WIN32 0x0001 > -#define GCW_NOFLOAT 0x0002 > -#define GCW_INDICES 0x0008 > - > -// NtGdiGetCharABCWidthW Flags > -#define GCABCW_NOFLOAT 0x0001 > -#define GCABCW_INDICES 0x0002 > - > -/* CAPS1 support */ > -//#define C1_TRANSPARENT 0x0001 > -#define TC_TT_ABLE 0x0002 > -#define C1_TT_CR_ANY 0x0004 > -#define C1_EMF_COMPLIANT 0x0008 > -#define C1_DIBENGINE 0x0010 > -#define C1_GAMMA_RAMP 0x0040 > -#define C1_REINIT_ABLE 0x0080 > -#define C1_GLYPH_INDEX 0x0100 > -#define C1_BIT_PACKED 0x0200 > -#define C1_BYTE_PACKED 0x0400 > -#define C1_COLORCURSOR 0x0800 > -#define C1_CMYK_ABLE 0x1000 > -#define C1_SLOW_CARD 0x2000 > - > -/* TYPES *********************************************************************/ > - > -typedef PVOID KERNEL_PVOID; > -typedef D3DNTHAL_CONTEXTCREATEDATA D3DNTHAL_CONTEXTCREATEI; > -typedef LONG FIX; > - > -typedef struct _CHWIDTHINFO > -{ > - LONG lMaxNegA; > - LONG lMaxNegC; > - LONG lMinWidthD; > -} CHWIDTHINFO, *PCHWIDTHINFO; > - > -typedef struct _UNIVERSAL_FONT_ID > -{ > - DWORD dwUfid[2]; > -} UNIVERSAL_FONT_ID, *PUNIVERSAL_FONT_ID; > - > -typedef struct _REALIZATION_INFO // Based on LOCALESIGNATURE > -{ > - DWORD dwCsbDefault[2]; > - DWORD dwCsbSupported0; > -} REALIZATION_INFO, *PREALIZATION_INFO; > - > -typedef struct _WIDTHDATA > -{ > - USHORT sOverhang; > - USHORT sHeight; > - USHORT sCharInc; > - USHORT sBreak; > - BYTE jFirst; > - BYTE jLast; > - BYTE jBreak; > - BYTE jDefault; > - USHORT sDBCSInc; > - USHORT sDefaultInc; > -} WIDTHDATA, *PWIDTHDATA; > - > -typedef struct _DEVCAPS // Very similar to GDIINFO > -{ > - ULONG ulVersion; > - ULONG ulTechnology; > - ULONG ulHorzSizeM; > - ULONG ulVertSizeM; > - ULONG ulHorzSize; > - ULONG ulVertSize; > - ULONG ulHorzRes; > - ULONG ulVertRes; > - ULONG ulBitsPixel; > - ULONG ulPlanes; > - ULONG ulNumPens; > - ULONG ulNumFonts; > - ULONG ulNumColors; > - ULONG ulRasterCaps; > - ULONG ulAspectX; > - ULONG ulAspectY; > - ULONG ulAspectXY; > - ULONG ulLogPixelsX; > - ULONG ulLogPixelsY; > - ULONG ulSizePalette; > - ULONG ulColorRes; > - ULONG ulPhysicalWidth; > - ULONG ulPhysicalHeight; > - ULONG ulPhysicalOffsetX; > - ULONG ulPhysicalOffsetY; > - ULONG ulTextCaps; > - ULONG ulVRefresh; > - ULONG ulDesktopHorzRes; > - ULONG ulDesktopVertRes; > - ULONG ulBltAlignment; > - ULONG ulReserved[4]; > - ULONG ulShadeBlend; > - ULONG ulColorMgmtCaps; > -} DEVCAPS, *PDEVCAPS; > - > -/* Gdi Handle Cache Types and Structures */ > -#define GDI_CACHED_HADNLE_TYPES 4 > -#define CACHE_BRUSH_ENTRIES 10 > -#define CACHE_PEN_ENTRIES 8 > -#define CACHE_REGION_ENTRIES 8 > -#define CACHE_LFONT_ENTRIES 1 > - > -typedef enum _HANDLECACHETYPE > -{ > - hctBrushHandle, > - hctPenHandle, > - hctRegionHandle, > - hctLFontHandle > -} HANDLECACHETYPE,*PHANDLECACHETYPE; > - > -typedef struct _GDIHANDLECACHE > -{ > - ULONG ulLock; > - ULONG ulNumHandles[GDI_CACHED_HADNLE_TYPES]; > - HANDLE Handle[CACHE_BRUSH_ENTRIES+CACHE_PEN_ENTRIES+CACHE_REGION_ENTRIES+CACHE_LFONT_ENTRIES]; > -} GDIHANDLECACHE, *PGDIHANDLECACHE; > - > -/* Font Structures */ > -typedef struct _TMDIFF > -{ > - ULONG cjotma; > - CHAR chFirst; > - CHAR chLast; > - CHAR ChDefault; > - CHAR ChBreak; > -} TMDIFF, *PTMDIFF; > - > -typedef struct _TMW_INTERNAL > -{ > - TEXTMETRICW TextMetric; > - TMDIFF Diff; > -} TMW_INTERNAL, *PTMW_INTERNAL; > - > -typedef struct _NTMW_INTERNAL > -{ > - TMDIFF tmd; > - NEWTEXTMETRICEXW ntmw; > -} NTMW_INTERNAL, *PNTMW_INTERNAL; > - > -typedef struct _ENUMFONTDATAW > -{ > - ULONG cbSize; > - ULONG ulNtmwiOffset; > - DWORD dwFontType; > - ENUMLOGFONTEXDVW elfexdv; /* variable size! */ > - /* NTMW_INTERNAL ntmwi; use ulNtwmOffset */ > -} ENUMFONTDATAW, *PENUMFONTDATAW; > - > -/* Number Representation */ > -typedef struct _EFLOAT_S > -{ > - LONG lMant; > - LONG lExp; > -} EFLOAT_S; > - > -/* XFORM Structures */ > -typedef struct _MATRIX_S > -{ > - EFLOAT_S efM11; > - EFLOAT_S efM12; > - EFLOAT_S efM21; > - EFLOAT_S efM22; > - EFLOAT_S efDx; > - EFLOAT_S efDy; > - FIX fxDx; > - FIX fxDy; > - FLONG flAccel; > -} MATRIX_S; > - > -/* Gdi XForm storage union */ > -typedef union > -{ > - FLOAT f; > - ULONG l; > -} gxf_long; > - > -typedef struct _CFONT > -{ > - struct _CFONT *pcfNext; > - HFONT hf; > - ULONG cRef; // Count of all pointers to this CFONT. > - FLONG fl; > - LONG lHeight; // Precomputed logical height. > - HDC hdc; // HDC of realization. 0 for display. > - EFLOAT_S efM11; // efM11 of WtoD of DC of realization > - EFLOAT_S efM22; // efM22 of WtoD of DC of realization > - EFLOAT_S efDtoWBaseline; // Precomputed back transform. (FXtoL) > - EFLOAT_S efDtoWAscent; // Precomputed back transform. (FXtoL) > - WIDTHDATA wd; > - FLONG flInfo; > - USHORT sWidth[256]; // Widths in pels. > - ULONG ulAveWidth; // bogus average used by USER > - TMW_INTERNAL tmw; // cached metrics > - LOCALESIGNATURE lsLocSig; // font signature information > -} CFONT, *PCFONT; > - > -// > -// GDI Batch structures. > -// > -typedef struct _GDIBATCHHDR > -{ > - SHORT Size; > - SHORT Cmd; > -} GDIBATCHHDR, *PGDIBATCHHDR; > - > -typedef struct _GDIBSPATBLT > -{ > - GDIBATCHHDR gbHdr; > - int nXLeft; > - int nYLeft; > - int nWidth; > - int nHeight; > - HANDLE hbrush; > - DWORD dwRop; > - COLORREF crForegroundClr; > - COLORREF crBackgroundClr; > - COLORREF crBrushClr; > - INT IcmBrushColor; > - POINTL ptlViewportOrg; > - ULONG ulForegroundClr; > - ULONG ulBackgroundClr; > - ULONG ulBrushClr; > -} GDIBSPATBLT, *PGDIBSPATBLT; > - > -#ifndef _NTUSRTYP_ > -typedef struct _PATRECT > -{ > - RECT r; > - HBRUSH hBrush; > -} PATRECT, * PPATRECT; > - > -typedef struct _W32CLIENTINFO > -{ > - ULONG CI_flags; > - ULONG cSpins; > - ULONG ulWindowsVersion; > - ULONG ulAppCompatFlags; > - ULONG ulAppCompatFlags2; > - ULONG W32ClientInfo[57]; > -} W32CLIENTINFO, *PW32CLIENTINFO; > -#endif > - > -typedef struct _GDIBSPPATBLT > -{ > - GDIBATCHHDR gbHdr; > - DWORD rop4; > - DWORD Mode; > - DWORD Count; > - COLORREF crForegroundClr; > - COLORREF crBackgroundClr; > - COLORREF crBrushClr; > - ULONG ulForegroundClr; > - ULONG ulBackgroundClr; > - ULONG ulBrushClr; > - POINTL ptlViewportOrg; > - PATRECT pRect[1]; // POLYPATBLT > -} GDIBSPPATBLT, *PGDIBSPPATBLT; > - > -typedef struct _GDIBSTEXTOUT > -{ > - GDIBATCHHDR gbHdr; > - COLORREF crForegroundClr; > - COLORREF crBackgroundClr; > - LONG lmBkMode; > - ULONG ulForegroundClr; > - ULONG ulBackgroundClr; > - int x; > - int y; > - UINT Options; > - RECT Rect; > - DWORD iCS_CP; > - UINT cbCount; > - UINT Size; > - HANDLE hlfntNew; > - FLONG flTextAlign; > - POINTL ptlViewportOrg; > - WCHAR String[2]; > -} GDIBSTEXTOUT, *PGDIBSTEXTOUT; > - > -typedef struct _GDIBSEXTTEXTOUT > -{ > - GDIBATCHHDR gbHdr; > - UINT Count; > - UINT Options; > - RECT Rect; > - POINTL ptlViewportOrg; > - ULONG ulBackgroundClr; > -} GDIBSEXTTEXTOUT, *PGDIBSEXTTEXTOUT; > - > -typedef struct _GDIBSSETBRHORG > -{ > - GDIBATCHHDR gbHdr; > - POINTL ptlBrushOrigin; > -} GDIBSSETBRHORG, *PGDIBSSETBRHORG; > - > -typedef struct _GDIBSEXTSELCLPRGN > -{ > - GDIBATCHHDR gbHdr; > - int fnMode; > - LONG right; > - LONG bottom; > - LONG left; > - LONG top; > -} GDIBSEXTSELCLPRGN, *PGDIBSEXTSELCLPRGN; > -// > -// Use with GdiBCSelObj, GdiBCDelObj and GdiBCDelRgn. > -typedef struct _GDIBSOBJECT > -{ > - GDIBATCHHDR gbHdr; > - HGDIOBJ hgdiobj; > -} GDIBSOBJECT, *PGDIBSOBJECT; > - > -// > -// Driver Functions > -// > -typedef BOOL (NTAPI *PGD_ENABLEDRIVER)(ULONG, ULONG, PDRVENABLEDATA); > -typedef DHPDEV (NTAPI *PGD_ENABLEPDEV)(DEVMODEW *, LPWSTR, ULONG, HSURF *, ULONG, ULONG *, ULONG, DEVINFO *, LPWSTR, LPWSTR, HANDLE); > -typedef VOID (NTAPI *PGD_COMPLETEPDEV)(DHPDEV, HDEV); > -typedef VOID (NTAPI *PGD_DISABLEPDEV)(DHPDEV); > -typedef HSURF (NTAPI *PGD_ENABLESURFACE)(DHPDEV); > -typedef VOID (NTAPI *PGD_DISABLESURFACE)(DHPDEV); > -typedef BOOL (NTAPI *PGD_ASSERTMODE)(DHPDEV, BOOL); > -typedef BOOL (NTAPI *PGD_OFFSET)(SURFOBJ*, LONG, LONG, FLONG); > -typedef BOOL (NTAPI *PGD_RESETPDEV)(DHPDEV, DHPDEV); > -typedef VOID (NTAPI *PGD_DISABLEDRIVER)(VOID); > -typedef HBITMAP (NTAPI *PGD_CREATEDEVICEBITMAP)(DHPDEV, SIZEL, ULONG); > -typedef VOID (NTAPI *PGD_DELETEDEVICEBITMAP)(DHSURF); > -typedef BOOL (NTAPI *PGD_ALPHABLEND)(SURFOBJ*, SURFOBJ*, CLIPOBJ*, XLATEOBJ*, RECTL*, RECTL*, BLENDOBJ*); > -typedef BOOL (NTAPI *PGD_REALIZEBRUSH)(BRUSHOBJ*, SURFOBJ*, SURFOBJ*, SURFOBJ*, XLATEOBJ*, ULONG); > -typedef ULONG (NTAPI *PGD_DITHERCOLOR)(DHPDEV, ULONG, ULONG, PULONG); > -typedef BOOL (NTAPI *PGD_STROKEPATH)(SURFOBJ*, PATHOBJ*, CLIPOBJ*, XFORMOBJ*, BRUSHOBJ*, POINTL*, PLINEATTRS, MIX); > -typedef BOOL (NTAPI *PGD_FILLPATH)(SURFOBJ*, PATHOBJ*, CLIPOBJ*, BRUSHOBJ*, POINTL*, MIX, ULONG); > -typedef BOOL (NTAPI *PGD_STROKEANDFILLPATH)(SURFOBJ*, PATHOBJ*, CLIPOBJ*, XFORMOBJ*, BRUSHOBJ*, PLINEATTRS, BRUSHOBJ*, POINTL*, MIX, ULONG); > -typedef BOOL (NTAPI *PGD_PAINT)(SURFOBJ*, CLIPOBJ*, BRUSHOBJ*, POINTL*, MIX); > -typedef BOOL (NTAPI *PGD_BITBLT)(SURFOBJ*, SURFOBJ*, SURFOBJ*, CLIPOBJ*, XLATEOBJ*, RECTL*, POINTL*, POINTL*, BRUSHOBJ*, POINTL*, ROP4); > -typedef BOOL (NTAPI *PGD_TRANSPARENTBLT)(SURFOBJ*, SURFOBJ*, CLIPOBJ*, XLATEOBJ*, RECTL*, RECTL*, ULONG, ULONG); > -typedef BOOL (NTAPI *PGD_COPYBITS)(SURFOBJ*, SURFOBJ*, CLIPOBJ*, XLATEOBJ*, RECTL*, POINTL*); > -typedef BOOL (NTAPI *PGD_STRETCHBLT)(SURFOBJ*, SURFOBJ*, SURFOBJ*, CLIPOBJ*, XLATEOBJ*, COLORADJUSTMENT*, POINTL*, RECTL*, RECTL*, POINTL*, ULONG); > -typedef BOOL (NTAPI *PGD_STRETCHBLTROP)(SURFOBJ*, SURFOBJ*, SURFOBJ*, CLIPOBJ*, XLATEOBJ*, COLORADJUSTMENT*, POINTL*, RECTL*, RECTL*, POINTL*, ULONG, BRUSHOBJ*, DWORD); > -typedef BOOL (NTAPI *PGD_SETPALETTE)(DHPDEV, PALOBJ*, ULONG, ULONG, ULONG); > -typedef BOOL (NTAPI *PGD_TEXTOUT)(SURFOBJ*, STROBJ*, FONTOBJ*, CLIPOBJ*, RECTL*, RECTL*, BRUSHOBJ*, BRUSHOBJ*, POINTL*, MIX); > -typedef ULONG (NTAPI *PGD_ESCAPE)(SURFOBJ*, ULONG, ULONG, PVOID *, ULONG, PVOID *); > -typedef ULONG (NTAPI *PGD_DRAWESCAPE)(SURFOBJ*, ULONG, CLIPOBJ*, RECTL*, ULONG, PVOID *); > -typedef PIFIMETRICS (NTAPI *PGD_QUERYFONT)(DHPDEV, ULONG, ULONG, PULONG); > -typedef PVOID (NTAPI *PGD_QUERYFONTTREE)(DHPDEV, ULONG, ULONG, ULONG, PULONG); > -typedef LONG (NTAPI *PGD_QUERYFONTDATA)(DHPDEV, FONTOBJ*, ULONG, HGLYPH, GLYPHDATA*, PVOID, ULONG); > -typedef ULONG (NTAPI *PGD_SETPOINTERSHAPE)(SURFOBJ*, SURFOBJ*, SURFOBJ*, XLATEOBJ*, LONG, LONG, LONG, LONG, RECTL*, ULONG); > -typedef VOID (NTAPI *PGD_MOVEPOINTER)(SURFOBJ*, LONG, LONG, RECTL*); > -typedef BOOL (NTAPI *PGD_LINETO)(SURFOBJ*, CLIPOBJ*, BRUSHOBJ*, LONG, LONG, LONG, LONG, RECTL*, MIX); > -typedef BOOL (NTAPI *PGD_SENDPAGE)(SURFOBJ*); > -typedef BOOL (NTAPI *PGD_STARTPAGE)(SURFOBJ*); > -typedef BOOL (NTAPI *PGD_ENDDOC)(SURFOBJ*, ULONG); > -typedef BOOL (NTAPI *PGD_STARTDOC)(SURFOBJ*, PWSTR, DWORD); > -typedef ULONG (NTAPI *PGD_GETGLYPHMODE)(DHPDEV, FONTOBJ*); > -typedef VOID (NTAPI *PGD_SYNCHRONIZE)(DHPDEV, RECTL*); > -typedef ULONG (NTAPI *PGD_SAVESCREENBITS)(SURFOBJ*, ULONG, ULONG, RECTL*); > -typedef ULONG (NTAPI *PGD_GETMODES)(HANDLE, ULONG, PDEVMODEW); > -typedef VOID (NTAPI *PGD_FREE)(PVOID, ULONG); > -typedef VOID (NTAPI *PGD_DESTROYFONT)(FONTOBJ*); > -typedef LONG (NTAPI *PGD_QUERYFONTCAPS)(ULONG, PULONG); > -typedef ULONG (NTAPI *PGD_LOADFONTFILE)(ULONG, PVOID, ULONG, ULONG); > -typedef BOOL (NTAPI *PGD_UNLOADFONTFILE)(ULONG); > -typedef ULONG (NTAPI *PGD_FONTMANAGEMENT)(SURFOBJ*, FONTOBJ*, ULONG, ULONG, PVOID, ULONG, PVOID); > -typedef LONG (NTAPI *PGD_QUERYTRUETYPETABLE)(ULONG, ULONG, ULONG, PTRDIFF, ULONG, PBYTE); > -typedef LONG (NTAPI *PGD_QUERYTRUETYPEOUTLINE)(DHPDEV, FONTOBJ*, HGLYPH, BOOL, GLYPHDATA*, ULONG, TTPOLYGONHEADER*); > -typedef PVOID (NTAPI *PGD_GETTRUETYPEFILE)(ULONG, PULONG); > -typedef LONG (NTAPI *PGD_QUERYFONTFILE)(ULONG, ULONG, ULONG, PULONG); > -typedef BOOL (NTAPI *PGD_QUERYADVANCEWIDTHS)(DHPDEV, FONTOBJ*, ULONG, HGLYPH *, PVOID *, ULONG); > -typedef BOOL (NTAPI *PGD_SETPIXELFORMAT)(SURFOBJ*, LONG, ULONG); > -typedef LONG (NTAPI *PGD_DESCRIBEPIXELFORMAT)(DHPDEV, LONG, ULONG, PPIXELFORMATDESCRIPTOR); > -typedef BOOL (NTAPI *PGD_SWAPBUFFERS)(SURFOBJ*, PWNDOBJ); > -typedef BOOL (NTAPI *PGD_STARTBANDING)(SURFOBJ*, POINTL*); > -typedef BOOL (NTAPI *PGD_NEXTBAND)(SURFOBJ*, POINTL*); > -typedef BOOL (NTAPI *PGD_GETDIRECTDRAWINFO)(DHPDEV, PDD_HALINFO, PDWORD, VIDEOMEMORY*, PDWORD, PDWORD); > -typedef BOOL (NTAPI *PGD_ENABLEDIRECTDRAW)(DHPDEV, PDD_CALLBACKS, PDD_SURFACECALLBACKS, PDD_PALETTECALLBACKS); > -typedef VOID (NTAPI *PGD_DISABLEDIRECTDRAW)(DHPDEV); > -typedef LONG (NTAPI *PGD_QUERYSPOOLTYPE)(DHPDEV, LPWSTR); > -typedef BOOL (NTAPI *PGD_GRADIENTFILL)(SURFOBJ*, CLIPOBJ*, XLATEOBJ*, TRIVERTEX*, ULONG, PVOID, ULONG, RECTL*, POINTL*, ULONG); > -typedef VOID (NTAPI *PGD_SYNCHRONIZESURFACE)(SURFOBJ*, RECTL *, FLONG); > - > -// > -// Most of these are definded in ddk/winddi.h > -// > -typedef struct _DRIVER_FUNCTIONS > -{ > - PGD_ENABLEPDEV EnablePDEV; > - PGD_COMPLETEPDEV CompletePDEV; > - PGD_DISABLEPDEV DisablePDEV; > - PGD_ENABLESURFACE EnableSurface; > - PGD_DISABLESURFACE DisableSurface; > - PGD_ASSERTMODE AssertMode; > - PGD_OFFSET Offset; > - PGD_RESETPDEV ResetPDEV; > - PGD_DISABLEDRIVER DisableDriver; > - PVOID Unknown1; > - PGD_CREATEDEVICEBITMAP CreateDeviceBitmap; > - PGD_DELETEDEVICEBITMAP DeleteDeviceBitmap; > - PGD_REALIZEBRUSH RealizeBrush; > - PGD_DITHERCOLOR DitherColor; > - PGD_STROKEPATH StrokePath; > - PGD_FILLPATH FillPath; > - PGD_STROKEANDFILLPATH StrokeAndFillPath; > - PGD_PAINT Paint; > - PGD_BITBLT BitBlt; > - PGD_COPYBITS CopyBits; > - PGD_STRETCHBLT StretchBlt; > - PVOID Unknown2; > - PGD_SETPALETTE SetPalette; > - PGD_TEXTOUT TextOut; > - PGD_ESCAPE Escape; > - PGD_DRAWESCAPE DrawEscape; > - PGD_QUERYFONT QueryFont; > - PGD_QUERYFONTTREE QueryFontTree; > - PGD_QUERYFONTDATA QueryFontData; > - PGD_SETPOINTERSHAPE SetPointerShape; > - PGD_MOVEPOINTER MovePointer; > - PGD_LINETO LineTo; > - PGD_SENDPAGE SendPage; > - PGD_STARTPAGE StartPage; > - PGD_ENDDOC EndDoc; > - PGD_STARTDOC StartDoc; > - PVOID Unknown3; > - PGD_GETGLYPHMODE GetGlyphMode; > - PGD_SYNCHRONIZE Synchronize; > - PVOID Unknown4; > - PGD_SAVESCREENBITS SaveScreenBits; > - PGD_GETMODES GetModes; > - PGD_FREE Free; > - PGD_DESTROYFONT DestroyFont; > - PGD_QUERYFONTCAPS QueryFontCaps; > - PGD_LOADFONTFILE LoadFontFile; > - PGD_UNLOADFONTFILE UnloadFontFile; > - PGD_FONTMANAGEMENT FontManagement; > - PGD_QUERYTRUETYPETABLE QueryTrueTypeTable; > - PGD_QUERYTRUETYPEOUTLINE QueryTrueTypeOutline; > - PGD_GETTRUETYPEFILE GetTrueTypeFile; > - PGD_QUERYFONTFILE QueryFontFile; > - PFN_DrvMovePanning MovePanning; > - PGD_QUERYADVANCEWIDTHS QueryAdvanceWidths; > - PGD_SETPIXELFORMAT SetPixelFormat; > - PGD_DESCRIBEPIXELFORMAT DescribePixelFormat; > - PGD_SWAPBUFFERS SwapBuffers; > - PGD_STARTBANDING StartBanding; > - PGD_NEXTBAND NextBand; > - PGD_GETDIRECTDRAWINFO GetDirectDrawInfo; > - PGD_ENABLEDIRECTDRAW EnableDirectDraw; > - PGD_DISABLEDIRECTDRAW DisableDirectDraw; > - PGD_QUERYSPOOLTYPE QuerySpoolType; > - PVOID Unknown5; > - PFN_DrvIcmCreateColorTransform IcmCreateColorTransform; > - PFN_DrvIcmDeleteColorTransform IcmDeleteColorTransform; > - PFN_DrvIcmCheckBitmapBits IcmCheckBitmapBits; > - PFN_DrvIcmSetDeviceGammaRamp IcmSetDeviceGammaRamp; > - PGD_GRADIENTFILL GradientFill; > - PGD_STRETCHBLTROP StretchBltROP; > - PFN_DrvPlgBlt PlgBlt; > - PGD_ALPHABLEND AlphaBlend; > - PVOID SynthesizeFont; > - PVOID GetSynthesizedFontFiles; > - PGD_TRANSPARENTBLT TransparentBlt; > - PFN_DrvQueryPerBandInfo QueryPerBandInfo; > - PFN_DrvQueryDeviceSupport QueryDeviceSupport; > - PVOID Reserved1; > - PVOID Reserved2; > - PVOID Reserved3; > - PVOID Reserved4; > - PVOID Reserved5; > - PVOID Reserved6; > - PVOID Reserved7; > - PVOID Reserved8; > - PFN_DrvDeriveSurface DeriveSurface; > - PFN_DrvQueryGlyphAttrs QueryGlyphAttrs; > - PFN_DrvNotify Notify; > - PGD_SYNCHRONIZESURFACE SynchronizeSurface; > - PFN_DrvResetDevice ResetDevice; > - PVOID Reserved9; > - PVOID Reserved10; > - PVOID Reserved11; /* 92 */ > - > - /* ReactOS specify */ > - PGD_ENABLEDRIVER EnableDriver; //ReactOS Extra > -} DRIVER_FUNCTIONS, *PDRIVER_FUNCTIONS; > - > -/* FIXME move to more proper place, Vista syscall */ > -DWORD > -STDCALL > -NtGdiConfigureOPMProtectedOutput(DWORD x1, DWORD x2, DWORD x3, DWORD x4); > - > - > -#endif > +/* > + * COPYRIGHT: See COPYING in the top level directory > + * PROJECT: ReactOS Win32 Graphical Subsystem (WIN32K) > + * FILE: include/win32k/ntgdityp.h > + * PURPOSE: Win32 Shared GDI Types for NtGdi* > + * PROGRAMMER: Alex Ionescu (alex(a)relsoft.net) > + */ > + > +/* INCLUDES ******************************************************************/ > + > +#ifndef _NTGDITYP_ > +#define _NTGDITYP_ > + > +/* ENUMERATIONS **************************************************************/ > + > +typedef enum _ARCTYPE > +{ > + GdiTypeArc, > + GdiTypeArcTo, > + GdiTypeChord, > + GdiTypePie, > +} ARCTYPE, *PARCTYPE; > + > +typedef enum _PALFUNCTYPE > +{ > + GdiPalAnimate, > + GdiPalSetEntries, > + GdiPalGetEntries, > + GdiPalGetSystemEntries, > + GdiPalSetColorTable, > + GdiPalGetColorTable, > +} PALFUNCTYPE, *PPALFUNCTYPE; > + > +typedef enum _POLYFUNCTYPE > +{ > + GdiPolyPolygon = 1, > + GdiPolyPolyLine, > + GdiPolyBezier, > + GdiPolyLineTo, > + GdiPolyBezierTo, > + GdiPolyPolyRgn, > +} POLYFUNCTYPE, *PPOLYFUNCTYPE; > + > +typedef enum _GETDCDWORD > +{ > + GdiGetJournal, > + GdiGetRelAbs, > + GdiGetBreakExtra, > + GdiGerCharBreak, > + GdiGetArcDirection, > + GdiGetEMFRestorDc, > + GdiGetFontLanguageInfo, > + GdiGetIsMemDc, > + GdiGetMapMode, > + GdiGetTextCharExtra, > +} GETDCDWORD, *PGETDCDWORD; > + > +typedef enum _GETSETDCDWORD > +{ > + GdiGetSetCopyCount = 2, > + GdiGetSetTextAlign, > + GdiGetSetRelAbs, > + GdiGetSetTextCharExtra, > + GdiGetSetSelectFont, > + GdiGetSetMapperFlagsInternal, > + GdiGetSetMapMode, > + GdiGetSetArcDirection, > +} GETSETDCDWORD, *PGETSETDCDWORD; > + > +typedef enum _GETDCPOINT > +{ > + GdiGetViewPortExt = 1, > + GdiGetWindowExt, > + GdiGetViewPortOrg, > + GdiGetWindowOrg, > + GdiGetAspectRatioFilter, > + GdiGetDCOrg = 6, > +} GETDCPOINT, *PGETDCPOINT; > + > + > +typedef enum _GDIBATCHCMD > +{ > + GdiBCPatBlt, > + GdiBCPolyPatBlt, > + GdiBCTextOut, > + GdiBCExtTextOut, > + GdiBCSetBrushOrg, > + GdiBCExtSelClipRgn, > + GdiBCSelObj, > + GdiBCDelObj, > + GdiBCDelRgn, > +} GDIBATCHCMD, *PGDIBATCHCMD; > + > +typedef enum _TRANSFORMTYPE > +{ > + GdiDpToLp, > + GdiLpToDp, > +} TRANSFORMTYPE, *PTRANSFORMTYPE; > + > +typedef enum GDIObjType > +{ > + GDIObjType_DEF_TYPE = 0x00, > + GDIObjType_DC_TYPE = 0x01, > + GDIObjType_UNUSED1_TYPE = 0x02, > + GDIObjType_UNUSED2_TYPE = 0x03, > + GDIObjType_RGN_TYPE = 0x04, > + GDIObjType_SURF_TYPE = 0x05, > + GDIObjType_CLIENTOBJ_TYPE = 0x06, > + GDIObjType_PATH_TYPE = 0x07, > + GDIObjType_PAL_TYPE = 0x08, > + GDIObjType_ICMLCS_TYPE = 0x09, > + GDIObjType_LFONT_TYPE = 0x0a, > + GDIObjType_RFONT_TYPE = 0x0b, > + GDIObjType_PFE_TYPE = 0x0c, > + GDIObjType_PFT_TYPE = 0x0d, > + GDIObjType_ICMCXF_TYPE = 0x0e, > + GDIObjType_SPRITE_TYPE = 0x0f, > + GDIObjType_BRUSH_TYPE = 0x10, > + GDIObjType_UMPD_TYPE = 0x11, > + GDIObjType_UNUSED4_TYPE = 0x12, > + GDIObjType_SPACE_TYPE = 0x13, > + GDIObjType_UNUSED5_TYPE = 0x14, > + GDIObjType_META_TYPE = 0x15, > + GDIObjType_EFSTATE_TYPE = 0x16, > + GDIObjType_BMFD_TYPE = 0x17, > + GDIObjType_VTFD_TYPE = 0x18, > + GDIObjType_TTFD_TYPE = 0x19, > + GDIObjType_RC_TYPE = 0x1a, > + GDIObjType_TEMP_TYPE = 0x1b, > + GDIObjType_DRVOBJ_TYPE = 0x1c, > + GDIObjType_DCIOBJ_TYPE = 0x1d, > + GDIObjType_SPOOL_TYPE = 0x1e, > + GDIObjType_MAX_TYPE = 0x1e, > + GDIObjTypeTotal = 0x1f, > +} GDIOBJTYPE, *PGDIOBJTYPE; > + > +typedef enum GDILoObjType > +{ > + GDILoObjType_LO_BRUSH_TYPE = 0x100000, > + GDILoObjType_LO_DC_TYPE = 0x10000, > + GDILoObjType_LO_BITMAP_TYPE = 0x50000, > + GDILoObjType_LO_PALETTE_TYPE = 0x80000, > + GDILoObjType_LO_FONT_TYPE = 0xa0000, > + GDILoObjType_LO_REGION_TYPE = 0x40000, > + GDILoObjType_LO_ICMLCS_TYPE = 0x90000, > + GDILoObjType_LO_CLIENTOBJ_TYPE = 0x60000, > + GDILoObjType_LO_ALTDC_TYPE = 0x210000, > + GDILoObjType_LO_PEN_TYPE = 0x300000, > + GDILoObjType_LO_EXTPEN_TYPE = 0x500000, > + GDILoObjType_LO_DIBSECTION_TYPE = 0x250000, > + GDILoObjType_LO_METAFILE16_TYPE = 0x260000, > + GDILoObjType_LO_METAFILE_TYPE = 0x460000, > + GDILoObjType_LO_METADC16_TYPE = 0x660000 > +} GDILOOBJTYPE, *PGDILOOBJTYPE; > + > +#define GdiWorldSpaceToPageSpace 0x203 > + > +/* FIXME: Unknown */ > +typedef DWORD FULLSCREENCONTROL; > +typedef DWORD LFTYPE; > + > +/* Public LAST_STOCK = 19, plus 2 more internal entries */ > +#define NB_STOCK_OBJECTS 22 > + > +/* extra stock object: default 1x1 bitmap for memory DCs */ > +#define DEFAULT_BITMAP (21) > + > + > +/* DEFINES *******************************************************************/ > + > +#define GDIBATCHBUFSIZE 0x136*4 > +#define GDI_BATCH_LIMIT 20 > + > +// NtGdiGetCharWidthW Flags > +#define GCW_WIN32 0x0001 > +#define GCW_NOFLOAT 0x0002 > +#define GCW_INDICES 0x0008 > + > +// NtGdiGetCharABCWidthW Flags > +#define GCABCW_NOFLOAT 0x0001 > +#define GCABCW_INDICES 0x0002 > + > +/* CAPS1 support */ > +//#define C1_TRANSPARENT 0x0001 > +#define TC_TT_ABLE 0x0002 > +#define C1_TT_CR_ANY 0x0004 > +#define C1_EMF_COMPLIANT 0x0008 > +#define C1_DIBENGINE 0x0010 > +#define C1_GAMMA_RAMP 0x0040 > +#define C1_REINIT_ABLE 0x0080 > +#define C1_GLYPH_INDEX 0x0100 > +#define C1_BIT_PACKED 0x0200 > +#define C1_BYTE_PACKED 0x0400 > +#define C1_COLORCURSOR 0x0800 > +#define C1_CMYK_ABLE 0x1000 > +#define C1_SLOW_CARD 0x2000 > + > +/* TYPES *********************************************************************/ > + > +typedef PVOID KERNEL_PVOID; > +typedef D3DNTHAL_CONTEXTCREATEDATA D3DNTHAL_CONTEXTCREATEI; > +typedef LONG FIX; > + > +typedef struct _CHWIDTHINFO > +{ > + LONG lMaxNegA; > + LONG lMaxNegC; > + LONG lMinWidthD; > +} CHWIDTHINFO, *PCHWIDTHINFO; > + > +typedef struct _UNIVERSAL_FONT_ID > +{ > + DWORD dwUfid[2]; > +} UNIVERSAL_FONT_ID, *PUNIVERSAL_FONT_ID; > + > +typedef struct _REALIZATION_INFO // Based on LOCALESIGNATURE > +{ > + DWORD dwCsbDefault[2]; > + DWORD dwCsbSupported0; > +} REALIZATION_INFO, *PREALIZATION_INFO; > + > +typedef struct _WIDTHDATA > +{ > + USHORT sOverhang; > + USHORT sHeight; > + USHORT sCharInc; > + USHORT sBreak; > + BYTE jFirst; > + BYTE jLast; > + BYTE jBreak; > + BYTE jDefault; > + USHORT sDBCSInc; > + USHORT sDefaultInc; > +} WIDTHDATA, *PWIDTHDATA; > + > +typedef struct _DEVCAPS // Very similar to GDIINFO > +{ > + ULONG ulVersion; > + ULONG ulTechnology; > + ULONG ulHorzSizeM; > + ULONG ulVertSizeM; > + ULONG ulHorzSize; > + ULONG ulVertSize; > + ULONG ulHorzRes; > + ULONG ulVertRes; > + ULONG ulBitsPixel; > + ULONG ulPlanes; > + ULONG ulNumPens; > + ULONG ulNumFonts; > + ULONG ulNumColors; > + ULONG ulRasterCaps; > + ULONG ulAspectX; > + ULONG ulAspectY; > + ULONG ulAspectXY; > + ULONG ulLogPixelsX; > + ULONG ulLogPixelsY; > + ULONG ulSizePalette; > + ULONG ulColorRes; > + ULONG ulPhysicalWidth; > + ULONG ulPhysicalHeight; > + ULONG ulPhysicalOffsetX; > + ULONG ulPhysicalOffsetY; > + ULONG ulTextCaps; > + ULONG ulVRefresh; > + ULONG ulDesktopHorzRes; > + ULONG ulDesktopVertRes; > + ULONG ulBltAlignment; > + ULONG ulReserved[4]; > + ULONG ulShadeBlend; > + ULONG ulColorMgmtCaps; > +} DEVCAPS, *PDEVCAPS; > + > +/* Gdi Handle Cache Types and Structures */ > +#define GDI_CACHED_HADNLE_TYPES 4 > +#define CACHE_BRUSH_ENTRIES 10 > +#define CACHE_PEN_ENTRIES 8 > +#define CACHE_REGION_ENTRIES 8 > +#define CACHE_LFONT_ENTRIES 1 > + > +typedef enum _HANDLECACHETYPE > +{ > + hctBrushHandle, > + hctPenHandle, > + hctRegionHandle, > + hctLFontHandle > +} HANDLECACHETYPE,*PHANDLECACHETYPE; > + > +typedef struct _GDIHANDLECACHE > +{ > + ULONG ulLock; > + ULONG ulNumHandles[GDI_CACHED_HADNLE_TYPES]; > + HANDLE Handle[CACHE_BRUSH_ENTRIES+CACHE_PEN_ENTRIES+CACHE_REGION_ENTRIES+CACHE_LFONT_ENTRIES]; > +} GDIHANDLECACHE, *PGDIHANDLECACHE; > + > +/* Font Structures */ > +typedef struct _TMDIFF > +{ > + ULONG cjotma; > + CHAR chFirst; > + CHAR chLast; > + CHAR ChDefault; > + CHAR ChBreak; > +} TMDIFF, *PTMDIFF; > + > +typedef struct _TMW_INTERNAL > +{ > + TEXTMETRICW TextMetric; > + TMDIFF Diff; > +} TMW_INTERNAL, *PTMW_INTERNAL; > + > +typedef struct _NTMW_INTERNAL > +{ > + TMDIFF tmd; > + NEWTEXTMETRICEXW ntmw; > +} NTMW_INTERNAL, *PNTMW_INTERNAL; > + > +typedef struct _ENUMFONTDATAW > +{ > + ULONG cbSize; > + ULONG ulNtmwiOffset; > + DWORD dwFontType; > + ENUMLOGFONTEXDVW elfexdv; /* variable size! */ > + /* NTMW_INTERNAL ntmwi; use ulNtwmOffset */ > +} ENUMFONTDATAW, *PENUMFONTDATAW; > + > +/* Number Representation */ > +typedef struct _EFLOAT_S > +{ > + LONG lMant; > + LONG lExp; > +} EFLOAT_S; > + > +/* XFORM Structures */ > +typedef struct _MATRIX_S > +{ > + EFLOAT_S efM11; > + EFLOAT_S efM12; > + EFLOAT_S efM21; > + EFLOAT_S efM22; > + EFLOAT_S efDx; > + EFLOAT_S efDy; > + FIX fxDx; > + FIX fxDy; > + FLONG flAccel; > +} MATRIX_S; > + > +/* Gdi XForm storage union */ > +typedef union > +{ > + FLOAT f; > + ULONG l; > +} gxf_long; > + > +typedef struct _CFONT > +{ > + struct _CFONT *pcfNext; > + HFONT hf; > + ULONG cRef; // Count of all pointers to this CFONT. > + FLONG fl; > + LONG lHeight; // Precomputed logical height. > + HDC hdc; // HDC of realization. 0 for display. > + EFLOAT_S efM11; // efM11 of WtoD of DC of realization > + EFLOAT_S efM22; // efM22 of WtoD of DC of realization > + EFLOAT_S efDtoWBaseline; // Precomputed back transform. (FXtoL) > + EFLOAT_S efDtoWAscent; // Precomputed back transform. (FXtoL) > + WIDTHDATA wd; > + FLONG flInfo; > + USHORT sWidth[256]; // Widths in pels. > + ULONG ulAveWidth; // bogus average used by USER > + TMW_INTERNAL tmw; // cached metrics > + LOCALESIGNATURE lsLocSig; // font signature information > +} CFONT, *PCFONT; > + > +// > +// GDI Batch structures. > +// > +typedef struct _GDIBATCHHDR > +{ > + SHORT Size; > + SHORT Cmd; > +} GDIBATCHHDR, *PGDIBATCHHDR; > + > +typedef struct _GDIBSPATBLT > +{ > + GDIBATCHHDR gbHdr; > + int nXLeft; > + int nYLeft; > + int nWidth; > + int nHeight; > + HANDLE hbrush; > + DWORD dwRop; > + COLORREF crForegroundClr; > + COLORREF crBackgroundClr; > + COLORREF crBrushClr; > + INT IcmBrushColor; > + POINTL ptlViewportOrg; > + ULONG ulForegroundClr; > + ULONG ulBackgroundClr; > + ULONG ulBrushClr; > +} GDIBSPATBLT, *PGDIBSPATBLT; > + > +#ifndef _NTUSRTYP_ > +typedef struct _PATRECT > +{ > + RECT r; > + HBRUSH hBrush; > +} PATRECT, * PPATRECT; > + > +typedef struct _W32CLIENTINFO > +{ > + ULONG CI_flags; > + ULONG cSpins; > + ULONG ulWindowsVersion; > + ULONG ulAppCompatFlags; > + ULONG ulAppCompatFlags2; > + ULONG W32ClientInfo[57]; > +} W32CLIENTINFO, *PW32CLIENTINFO; > +#endif > + > +typedef struct _GDIBSPPATBLT > +{ > + GDIBATCHHDR gbHdr; > + DWORD rop4; > + DWORD Mode; > + DWORD Count; > + COLORREF crForegroundClr; > + COLORREF crBackgroundClr; > + COLORREF crBrushClr; > + ULONG ulForegroundClr; > + ULONG ulBackgroundClr; > + ULONG ulBrushClr; > + POINTL ptlViewportOrg; > + PATRECT pRect[1]; // POLYPATBLT > +} GDIBSPPATBLT, *PGDIBSPPATBLT; > + > +typedef struct _GDIBSTEXTOUT > +{ > + GDIBATCHHDR gbHdr; > + COLORREF crForegroundClr; > + COLORREF crBackgroundClr; > + LONG lmBkMode; > + ULONG ulForegroundClr; > + ULONG ulBackgroundClr; > + int x; > + int y; > + UINT Options; > + RECT Rect; > + DWORD iCS_CP; > + UINT cbCount; > + UINT Size; > + HANDLE hlfntNew; > + FLONG flTextAlign; > + POINTL ptlViewportOrg; > + WCHAR String[2]; > +} GDIBSTEXTOUT, *PGDIBSTEXTOUT; > + > +typedef struct _GDIBSEXTTEXTOUT > +{ > + GDIBATCHHDR gbHdr; > + UINT Count; > + UINT Options; > + RECT Rect; > + POINTL ptlViewportOrg; > + ULONG ulBackgroundClr; > +} GDIBSEXTTEXTOUT, *PGDIBSEXTTEXTOUT; > + > +typedef struct _GDIBSSETBRHORG > +{ > + GDIBATCHHDR gbHdr; > + POINTL ptlBrushOrigin; > +} GDIBSSETBRHORG, *PGDIBSSETBRHORG; > + > +typedef struct _GDIBSEXTSELCLPRGN > +{ > + GDIBATCHHDR gbHdr; > + int fnMode; > + LONG right; > + LONG bottom; > + LONG left; > + LONG top; > +} GDIBSEXTSELCLPRGN, *PGDIBSEXTSELCLPRGN; > +// > +// Use with GdiBCSelObj, GdiBCDelObj and GdiBCDelRgn. > +typedef struct _GDIBSOBJECT > +{ > + GDIBATCHHDR gbHdr; > + HGDIOBJ hgdiobj; > +} GDIBSOBJECT, *PGDIBSOBJECT; > + > +// > +// Driver Functions > +// > +typedef BOOL (NTAPI *PGD_ENABLEDRIVER)(ULONG, ULONG, PDRVENABLEDATA); > +typedef DHPDEV (NTAPI *PGD_ENABLEPDEV)(DEVMODEW *, LPWSTR, ULONG, HSURF *, ULONG, ULONG *, ULONG, DEVINFO *, LPWSTR, LPWSTR, HANDLE); > +typedef VOID (NTAPI *PGD_COMPLETEPDEV)(DHPDEV, HDEV); > +typedef VOID (NTAPI *PGD_DISABLEPDEV)(DHPDEV); > +typedef HSURF (NTAPI *PGD_ENABLESURFACE)(DHPDEV); > +typedef VOID (NTAPI *PGD_DISABLESURFACE)(DHPDEV); > +typedef BOOL (NTAPI *PGD_ASSERTMODE)(DHPDEV, BOOL); > +typedef BOOL (NTAPI *PGD_OFFSET)(SURFOBJ*, LONG, LONG, FLONG); > +typedef BOOL (NTAPI *PGD_RESETPDEV)(DHPDEV, DHPDEV); > +typedef VOID (NTAPI *PGD_DISABLEDRIVER)(VOID); > +typedef HBITMAP (NTAPI *PGD_CREATEDEVICEBITMAP)(DHPDEV, SIZEL, ULONG); > +typedef VOID (NTAPI *PGD_DELETEDEVICEBITMAP)(DHSURF); > +typedef BOOL (NTAPI *PGD_ALPHABLEND)(SURFOBJ*, SURFOBJ*, CLIPOBJ*, XLATEOBJ*, RECTL*, RECTL*, BLENDOBJ*); > +typedef BOOL (NTAPI *PGD_REALIZEBRUSH)(BRUSHOBJ*, SURFOBJ*, SURFOBJ*, SURFOBJ*, XLATEOBJ*, ULONG); > +typedef ULONG (NTAPI *PGD_DITHERCOLOR)(DHPDEV, ULONG, ULONG, PULONG); > +typedef BOOL (NTAPI *PGD_STROKEPATH)(SURFOBJ*, PATHOBJ*, CLIPOBJ*, XFORMOBJ*, BRUSHOBJ*, POINTL*, PLINEATTRS, MIX); > +typedef BOOL (NTAPI *PGD_FILLPATH)(SURFOBJ*, PATHOBJ*, CLIPOBJ*, BRUSHOBJ*, POINTL*, MIX, ULONG); > +typedef BOOL (NTAPI *PGD_STROKEANDFILLPATH)(SURFOBJ*, PATHOBJ*, CLIPOBJ*, XFORMOBJ*, BRUSHOBJ*, PLINEATTRS, BRUSHOBJ*, POINTL*, MIX, ULONG); > +typedef BOOL (NTAPI *PGD_PAINT)(SURFOBJ*, CLIPOBJ*, BRUSHOBJ*, POINTL*, MIX); > +typedef BOOL (NTAPI *PGD_BITBLT)(SURFOBJ*, SURFOBJ*, SURFOBJ*, CLIPOBJ*, XLATEOBJ*, RECTL*, POINTL*, POINTL*, BRUSHOBJ*, POINTL*, ROP4); > +typedef BOOL (NTAPI *PGD_TRANSPARENTBLT)(SURFOBJ*, SURFOBJ*, CLIPOBJ*, XLATEOBJ*, RECTL*, RECTL*, ULONG, ULONG); > +typedef BOOL (NTAPI *PGD_COPYBITS)(SURFOBJ*, SURFOBJ*, CLIPOBJ*, XLATEOBJ*, RECTL*, POINTL*); > +typedef BOOL (NTAPI *PGD_STRETCHBLT)(SURFOBJ*, SURFOBJ*, SURFOBJ*, CLIPOBJ*, XLATEOBJ*, COLORADJUSTMENT*, POINTL*, RECTL*, RECTL*, POINTL*, ULONG); > +typedef BOOL (NTAPI *PGD_STRETCHBLTROP)(SURFOBJ*, SURFOBJ*, SURFOBJ*, CLIPOBJ*, XLATEOBJ*, COLORADJUSTMENT*, POINTL*, RECTL*, RECTL*, POINTL*, ULONG, BRUSHOBJ*, DWORD); > +typedef BOOL (NTAPI *PGD_SETPALETTE)(DHPDEV, PALOBJ*, ULONG, ULONG, ULONG); > +typedef BOOL (NTAPI *PGD_TEXTOUT)(SURFOBJ*, STROBJ*, FONTOBJ*, CLIPOBJ*, RECTL*, RECTL*, BRUSHOBJ*, BRUSHOBJ*, POINTL*, MIX); > +typedef ULONG (NTAPI *PGD_ESCAPE)(SURFOBJ*, ULONG, ULONG, PVOID *, ULONG, PVOID *); > +typedef ULONG (NTAPI *PGD_DRAWESCAPE)(SURFOBJ*, ULONG, CLIPOBJ*, RECTL*, ULONG, PVOID *); > +typedef PIFIMETRICS (NTAPI *PGD_QUERYFONT)(DHPDEV, ULONG, ULONG, PULONG); > +typedef PVOID (NTAPI *PGD_QUERYFONTTREE)(DHPDEV, ULONG, ULONG, ULONG, PULONG); > +typedef LONG (NTAPI *PGD_QUERYFONTDATA)(DHPDEV, FONTOBJ*, ULONG, HGLYPH, GLYPHDATA*, PVOID, ULONG); > +typedef ULONG (NTAPI *PGD_SETPOINTERSHAPE)(SURFOBJ*, SURFOBJ*, SURFOBJ*, XLATEOBJ*, LONG, LONG, LONG, LONG, RECTL*, ULONG); > +typedef VOID (NTAPI *PGD_MOVEPOINTER)(SURFOBJ*, LONG, LONG, RECTL*); > +typedef BOOL (NTAPI *PGD_LINETO)(SURFOBJ*, CLIPOBJ*, BRUSHOBJ*, LONG, LONG, LONG, LONG, RECTL*, MIX); > +typedef BOOL (NTAPI *PGD_SENDPAGE)(SURFOBJ*); > +typedef BOOL (NTAPI *PGD_STARTPAGE)(SURFOBJ*); > +typedef BOOL (NTAPI *PGD_ENDDOC)(SURFOBJ*, ULONG); > +typedef BOOL (NTAPI *PGD_STARTDOC)(SURFOBJ*, PWSTR, DWORD); > +typedef ULONG (NTAPI *PGD_GETGLYPHMODE)(DHPDEV, FONTOBJ*); > +typedef VOID (NTAPI *PGD_SYNCHRONIZE)(DHPDEV, RECTL*); > +typedef ULONG (NTAPI *PGD_SAVESCREENBITS)(SURFOBJ*, ULONG, ULONG, RECTL*); > +typedef ULONG (NTAPI *PGD_GETMODES)(HANDLE, ULONG, PDEVMODEW); > +typedef VOID (NTAPI *PGD_FREE)(PVOID, ULONG); > +typedef VOID (NTAPI *PGD_DESTROYFONT)(FONTOBJ*); > +typedef LONG (NTAPI *PGD_QUERYFONTCAPS)(ULONG, PULONG); > +typedef ULONG (NTAPI *PGD_LOADFONTFILE)(ULONG, PVOID, ULONG, ULONG); > +typedef BOOL (NTAPI *PGD_UNLOADFONTFILE)(ULONG); > +typedef ULONG (NTAPI *PGD_FONTMANAGEMENT)(SURFOBJ*, FONTOBJ*, ULONG, ULONG, PVOID, ULONG, PVOID); > +typedef LONG (NTAPI *PGD_QUERYTRUETYPETABLE)(ULONG, ULONG, ULONG, PTRDIFF, ULONG, PBYTE); > +typedef LONG (NTAPI *PGD_QUERYTRUETYPEOUTLINE)(DHPDEV, FONTOBJ*, HGLYPH, BOOL, GLYPHDATA*, ULONG, TTPOLYGONHEADER*); > +typedef PVOID (NTAPI *PGD_GETTRUETYPEFILE)(ULONG, PULONG); > +typedef LONG (NTAPI *PGD_QUERYFONTFILE)(ULONG, ULONG, ULONG, PULONG); > +typedef BOOL (NTAPI *PGD_QUERYADVANCEWIDTHS)(DHPDEV, FONTOBJ*, ULONG, HGLYPH *, PVOID *, ULONG); > +typedef BOOL (NTAPI *PGD_SETPIXELFORMAT)(SURFOBJ*, LONG, ULONG); > +typedef LONG (NTAPI *PGD_DESCRIBEPIXELFORMAT)(DHPDEV, LONG, ULONG, PPIXELFORMATDESCRIPTOR); > +typedef BOOL (NTAPI *PGD_SWAPBUFFERS)(SURFOBJ*, PWNDOBJ); > +typedef BOOL (NTAPI *PGD_STARTBANDING)(SURFOBJ*, POINTL*); > +typedef BOOL (NTAPI *PGD_NEXTBAND)(SURFOBJ*, POINTL*); > +typedef BOOL (NTAPI *PGD_GETDIRECTDRAWINFO)(DHPDEV, PDD_HALINFO, PDWORD, VIDEOMEMORY*, PDWORD, PDWORD); > +typedef BOOL (NTAPI *PGD_ENABLEDIRECTDRAW)(DHPDEV, PDD_CALLBACKS, PDD_SURFACECALLBACKS, PDD_PALETTECALLBACKS); > +typedef VOID (NTAPI *PGD_DISABLEDIRECTDRAW)(DHPDEV); > +typedef LONG (NTAPI *PGD_QUERYSPOOLTYPE)(DHPDEV, LPWSTR); > +typedef BOOL (NTAPI *PGD_GRADIENTFILL)(SURFOBJ*, CLIPOBJ*, XLATEOBJ*, TRIVERTEX*, ULONG, PVOID, ULONG, RECTL*, POINTL*, ULONG); > +typedef VOID (NTAPI *PGD_SYNCHRONIZESURFACE)(SURFOBJ*, RECTL *, FLONG); > + > +// > +// Most of these are definded in ddk/winddi.h > +// > +typedef struct _DRIVER_FUNCTIONS > +{ > + PGD_ENABLEPDEV EnablePDEV; > + PGD_COMPLETEPDEV CompletePDEV; > + PGD_DISABLEPDEV DisablePDEV; > + PGD_ENABLESURFACE EnableSurface; > + PGD_DISABLESURFACE DisableSurface; > + PGD_ASSERTMODE AssertMode; > + PGD_OFFSET Offset; > + PGD_RESETPDEV ResetPDEV; > + PGD_DISABLEDRIVER DisableDriver; > + PVOID Unknown1; > + PGD_CREATEDEVICEBITMAP CreateDeviceBitmap; > + PGD_DELETEDEVICEBITMAP DeleteDeviceBitmap; > + PGD_REALIZEBRUSH RealizeBrush; > + PGD_DITHERCOLOR DitherColor; > + PGD_STROKEPATH StrokePath; > + PGD_FILLPATH FillPath; > + PGD_STROKEANDFILLPATH StrokeAndFillPath; > + PGD_PAINT Paint; > + PGD_BITBLT BitBlt; > + PGD_COPYBITS CopyBits; > + PGD_STRETCHBLT StretchBlt; > + PVOID Unknown2; > + PGD_SETPALETTE SetPalette; > + PGD_TEXTOUT TextOut; > + PGD_ESCAPE Escape; > + PGD_DRAWESCAPE DrawEscape; > + PGD_QUERYFONT QueryFont; > + PGD_QUERYFONTTREE QueryFontTree; > + PGD_QUERYFONTDATA QueryFontData; > + PGD_SETPOINTERSHAPE SetPointerShape; > + PGD_MOVEPOINTER MovePointer; > + PGD_LINETO LineTo; > + PGD_SENDPAGE SendPage; > + PGD_STARTPAGE StartPage; > + PGD_ENDDOC EndDoc; > + PGD_STARTDOC StartDoc; > + PVOID Unknown3; > + PGD_GETGLYPHMODE GetGlyphMode; > + PGD_SYNCHRONIZE Synchronize; > + PVOID Unknown4; > + PGD_SAVESCREENBITS SaveScreenBits; > + PGD_GETMODES GetModes; > + PGD_FREE Free; > + PGD_DESTROYFONT DestroyFont; > + PGD_QUERYFONTCAPS QueryFontCaps; > + PGD_LOADFONTFILE LoadFontFile; > + PGD_UNLOADFONTFILE UnloadFontFile; > + PGD_FONTMANAGEMENT FontManagement; > + PGD_QUERYTRUETYPETABLE QueryTrueTypeTable; > + PGD_QUERYTRUETYPEOUTLINE QueryTrueTypeOutline; > + PGD_GETTRUETYPEFILE GetTrueTypeFile; > + PGD_QUERYFONTFILE QueryFontFile; > + PFN_DrvMovePanning MovePanning; > + PGD_QUERYADVANCEWIDTHS QueryAdvanceWidths; > + PGD_SETPIXELFORMAT SetPixelFormat; > + PGD_DESCRIBEPIXELFORMAT DescribePixelFormat; > + PGD_SWAPBUFFERS SwapBuffers; > + PGD_STARTBANDING StartBanding; > + PGD_NEXTBAND NextBand; > + PGD_GETDIRECTDRAWINFO GetDirectDrawInfo; > + PGD_ENABLEDIRECTDRAW EnableDirectDraw; > + PGD_DISABLEDIRECTDRAW DisableDirectDraw; > + PGD_QUERYSPOOLTYPE QuerySpoolType; > + PVOID Unknown5; > + PFN_DrvIcmCreateColorTransform IcmCreateColorTransform; > + PFN_DrvIcmDeleteColorTransform IcmDeleteColorTransform; > + PFN_DrvIcmCheckBitmapBits IcmCheckBitmapBits; > + PFN_DrvIcmSetDeviceGammaRamp IcmSetDeviceGammaRamp; > + PGD_GRADIENTFILL GradientFill; > + PGD_STRETCHBLTROP StretchBltROP; > + PFN_DrvPlgBlt PlgBlt; > + PGD_ALPHABLEND AlphaBlend; > + PVOID SynthesizeFont; > + PVOID GetSynthesizedFontFiles; > + PGD_TRANSPARENTBLT TransparentBlt; > + PFN_DrvQueryPerBandInfo QueryPerBandInfo; > + PFN_DrvQueryDeviceSupport QueryDeviceSupport; > + PVOID Reserved1; > + PVOID Reserved2; > + PVOID Reserved3; > + PVOID Reserved4; > + PVOID Reserved5; > + PVOID Reserved6; > + PVOID Reserved7; > + PVOID Reserved8; > + PFN_DrvDeriveSurface DeriveSurface; > + PFN_DrvQueryGlyphAttrs QueryGlyphAttrs; > + PFN_DrvNotify Notify; > + PGD_SYNCHRONIZESURFACE SynchronizeSurface; > + PFN_DrvResetDevice ResetDevice; > + PVOID Reserved9; > + PVOID Reserved10; > + PVOID Reserved11; /* 92 */ > + > + /* ReactOS specify */ > + PGD_ENABLEDRIVER EnableDriver; //ReactOS Extra > +} DRIVER_FUNCTIONS, *PDRIVER_FUNCTIONS; > + > +/* FIXME move to more proper place, Vista syscall */ > +DWORD STDCALL NtGdiConfigureOPMProtectedOutput(DWORD x1, DWORD x2, DWORD x3, DWORD x4); > +DWORD STDCALL NtGdiCreateOPMProtectedOutputs(DWORD x1, DWORD x2, DWORD x3, DWORD x4, DWORD x5); > + > +/* Doc exists in msdn see ReactOS def file which D3DKMT* it is, rember I have not check if the doc are correct, > + * it is for the drv, which api it should export. > + * comucate way > + * gdi32.dll -- Direcly syscall --> win33k.sys > + * win33k.sys -- doing direct call to -->dxkrnl.sys (note dxkrnl doing allot work here) > + * dxkrnl.sys (note dxkrnl doing allot work here) -- the drv export function --> graphic drv, > + * this api should move to more proper place later. > + */ > +DWORD STDCALL NtGdiDdDDICheckExclusiveOwnership(); > +DWORD STDCALL NtGdiDdDDICheckMonitorPowerState(DWORD x1); > +DWORD STDCALL NtGdiDdDDICheckOcclusion(DWORD x1); > +DWORD STDCALL NtGdiDdDDICloseAdapter(DWORD x1); > +DWORD STDCALL NtGdiDdDDICreateAllocation(DWORD x1); > +DWORD STDCALL NtGdiDdDDICreateContext(DWORD x1); > +DWORD STDCALL NtGdiDdDDICreateDCFromMemory(DWORD x1); > +DWORD STDCALL NtGdiDdDDICreateDevice(DWORD x1); > +DWORD STDCALL NtGdiDdDDICreateOverlay(DWORD x1); > +DWORD STDCALL NtGdiDdDDICreateSynchronizationObject(DWORD x1); > +DWORD STDCALL NtGdiDdDDIDestroyAllocation(DWORD x1); > +DWORD STDCALL NtGdiDdDDIDestroyContext(DWORD x1); > +DWORD STDCALL NtGdiDdDDIDestroyDCFromMemory(DWORD x1); > +DWORD STDCALL NtGdiDdDDIDestroyDevice(DWORD x1); > +DWORD STDCALL NtGdiDdDDIDestroyOverlay(DWORD x1); > +DWORD STDCALL NtGdiDdDDIDestroySynchronizationObject(DWORD x1); > +DWORD STDCALL NtGdiDdDDIEscape(DWORD x1); > +DWORD STDCALL NtGdiDdDDIFlipOverlay(DWORD x1); > +DWORD STDCALL NtGdiDdDDIGetContextSchedulingPriority(DWORD x1); > +DWORD STDCALL NtGdiDdDDIGetDeviceState(DWORD x1); > +DWORD STDCALL NtGdiDdDDIGetDisplayModeList(DWORD x1); > +DWORD STDCALL NtGdiDdDDIGetMultisampleMethodList(DWORD x1); > +DWORD STDCALL NtGdiDdDDIGetPresentHistory(DWORD x1); > +DWORD STDCALL NtGdiDdDDIGetProcessSchedulingPriorityClass(DWORD x1, DWORD x2); > +DWORD STDCALL NtGdiDdDDIGetRuntimeData(DWORD x1); > +DWORD STDCALL NtGdiDdDDIGetScanLine(DWORD x1); > +DWORD STDCALL NtGdiDdDDIGetSharedPrimaryHandle(DWORD x1); > +DWORD STDCALL NtGdiDdDDIInvalidateActiveVidPn(DWORD x1); > +DWORD STDCALL NtGdiDdDDILock(DWORD x1); > +DWORD STDCALL NtGdiDdDDIOpenAdapterFromDeviceName(DWORD x1); > +DWORD STDCALL NtGdiDdDDIOpenAdapterFromHdc(DWORD x1); > +DWORD STDCALL NtGdiDdDDIOpenResource(DWORD x1); > +DWORD STDCALL NtGdiDdDDIPollDisplayChildren(DWORD x1); > +DWORD STDCALL NtGdiDdDDIPresent(DWORD x1); > +DWORD STDCALL NtGdiDdDDIQueryAdapterInfo(DWORD x1); > +DWORD STDCALL NtGdiDdDDIQueryAllocationResidency(DWORD x1); > +DWORD STDCALL NtGdiDdDDIQueryResourceInfo(DWORD x1); > +DWORD STDCALL NtGdiDdDDIQueryStatistics(DWORD x1); > +DWORD STDCALL NtGdiDdDDIReleaseProcessVidPnSourceOwners(DWORD x1); > +DWORD STDCALL NtGdiDdDDIRender(DWORD x1); > +DWORD STDCALL NtGdiDdDDISetAllocationPriority(DWORD x1); > +DWORD STDCALL NtGdiDdDDISetContextSchedulingPriority(DWORD x1); > +DWORD STDCALL NtGdiDdDDISetDisplayMode(DWORD x1); > +DWORD STDCALL NtGdiDdDDISetDisplayPrivateDriverFormat(DWORD x1); > +DWORD STDCALL NtGdiDdDDISetGammaRamp(DWORD x1); > +DWORD STDCALL NtGdiDdDDISetProcessSchedulingPriorityClass(DWORD x1, x2); > +DWORD STDCALL NtGdiDdDDISetQueuedLimit(DWORD x1); > +DWORD STDCALL NtGdiDdDDISetVidPnSourceOwner(DWORD x1); > +DWORD STDCALL NtGdiDdDDISharedPrimaryLockNotification(DWORD x1); > +DWORD STDCALL NtGdiDdDDISharedPrimaryUnLockNotification(DWORD x1); > +DWORD STDCALL NtGdiDdDDISignalSynchronizationObject(DWORD x1); > +DWORD STDCALL NtGdiDdDDIUnlock(DWORD x1); > +DWORD STDCALL NtGdiDdDDIUpdateOverlay(DWORD x1); > +DWORD STDCALL NtGdiDdDDIWaitForIdle(DWORD x1); > +DWORD STDCALL NtGdiDdDDIWaitForSynchronizationObject(DWORD x1); > +DWORD STDCALL NtGdiDdDDIWaitForVerticalBlankEvent(DWORD x1); > +DWORD STDCALL NtGdiDDCCIGetCapabilitiesString(DWORD x1, DWORD x2, DWORD x3); > +DWORD STDCALL NtGdiDDCCIGetCapabilitiesStringLength(DWORD x1, DWORD x2); > +DWORD STDCALL NtGdiDDCCIGetTimingReport(DWORD x1, DWORD x2); > +DWORD STDCALL NtGdiDDCCIGetVCPFeature(DWORD x1, DWORD x2, DWORD x3, DWORD x4); > +DWORD STDCALL NtGdiDDCCISaveCurrentSettings(DWORD x1); > +DWORD STDCALL NtGdiDDCCISetVCPFeature(DWORD x1, DWORD x2, DWORD x3); > + > + > + > +#endif > > Added: branches/win32k-gdi-dx/subsystems/win32/win32k/ntddraw/d3dkmt.c > URL: http://svn.reactos.org/svn/reactos/branches/win32k-gdi-dx/subsystems/win32/… > ============================================================================== > --- branches/win32k-gdi-dx/subsystems/win32/win32k/ntddraw/d3dkmt.c (added) > +++ branches/win32k-gdi-dx/subsystems/win32/win32k/ntddraw/d3dkmt.c [iso-8859-1] Sun May 18 13:33:27 2008 > @@ -1,0 +1,507 @@ > +/* > + * COPYRIGHT: See COPYING in the top level directory > + * PROJECT: ReactOS kernel > + * PURPOSE: Native DirectDraw implementation > + * FILE: subsys/win32k/ntddraw/d3d.c > + * PROGRAMER: Magnus olsen (magnus(a)greatlord.com) > + * REVISION HISTORY: > + * 18/5-2008 Magnus Olsen > + */ > + > + > +#include <w32k.h> > +#include <debug.h> > + > +DWORD > +STDCALL > +NtGdiDdDDICheckExclusiveOwnership() > +{ > + UNIMPLEMENTED; > + return 0 > +} > + > +DWORD > +STDCALL > +NtGdiDdDDICheckMonitorPowerState(DWORD x1) > +{ > + UNIMPLEMENTED; > + return 0 > +} > + > +DWORD > +STDCALL > +NtGdiDdDDICheckOcclusion(DWORD x1) > +{ > + UNIMPLEMENTED; > + return 0 > +} > + > +DWORD > +STDCALL > +NtGdiDdDDICloseAdapter(DWORD x1) > +{ > + UNIMPLEMENTED; > + return 0 > +} > + > +DWORD > +STDCALL > +NtGdiDdDDICreateAllocation(DWORD x1) > +{ > + UNIMPLEMENTED; > + return 0 > +} > + > +DWORD > +STDCALL > +NtGdiDdDDICreateContext(DWORD x1) > +{ > + UNIMPLEMENTED; > + return 0 > +} > + > +DWORD > +STDCALL > +NtGdiDdDDICreateDCFromMemory(DWORD x1) > +{ > + UNIMPLEMENTED; > + return 0 > +} > + > +DWORD > +STDCALL > +NtGdiDdDDICreateDevice(DWORD x1) > +{ > + UNIMPLEMENTED; > + return 0 > +} > + > +DWORD > +STDCALL > +NtGdiDdDDICreateOverlay(DWORD x1) > +{ > + UNIMPLEMENTED; > + return 0 > +} > + > +DWORD > +STDCALL > +NtGdiDdDDICreateSynchronizationObject(DWORD x1) > +{ > + UNIMPLEMENTED; > + return 0 > +} > + > +DWORD > +STDCALL > +NtGdiDdDDIDestroyAllocation(DWORD x1) > +{ > + UNIMPLEMENTED; > + return 0 > +} > + > +NtGdiDdDDIDestroyContext(DWORD x1) > +{ > + UNIMPLEMENTED; > + return 0 > +} > + > +DWORD > +STDCALL > +NtGdiDdDDIDestroyDCFromMemory(DWORD x1) > +{ > + UNIMPLEMENTED; > + return 0 > +} > + > +DWORD > +STDCALL > +NtGdiDdDDIDestroyDevice(DWORD x1) > +{ > + UNIMPLEMENTED; > + return 0 > +} > + > +DWORD > +STDCALL > +NtGdiDdDDIDestroyOverlay(DWORD x1) > +{ > + UNIMPLEMENTED; > + return 0 > +} > + > +DWORD > +STDCALL > +NtGdiDdDDIDestroySynchronizationObject(DWORD x1) > +{ > + UNIMPLEMENTED; > + return 0 > +} > + > +DWORD > +STDCALL > +NtGdiDdDDIEscape(DWORD x1) > +{ > + UNIMPLEMENTED; > + return 0 > +} > + > +DWORD > +STDCALL > +NtGdiDdDDIFlipOverlay(DWORD x1) > +{ > + UNIMPLEMENTED; > + return 0 > +} > + > +DWORD > +STDCALL > +NtGdiDdDDIGetContextSchedulingPriority(DWORD x1) > +{ > + UNIMPLEMENTED; > + return 0 > +} > + > +DWORD > +STDCALL > +NtGdiDdDDIGetDeviceState(DWORD x1) > +{ > + UNIMPLEMENTED; > + return 0 > +} > + > +DWORD > +STDCALL > +NtGdiDdDDIGetDisplayModeList(DWORD x1) > +{ > + UNIMPLEMENTED; > + return 0 > +} > + > +DWORD > +STDCALL > +NtGdiDdDDIGetMultisampleMethodList(DWORD x1) > +{ > + UNIMPLEMENTED; > + return 0 > +} > + > +DWORD > +STDCALL > +NtGdiDdDDIGetPresentHistory(DWORD x1) > +{ > + UNIMPLEMENTED; > + return 0 > +} > + > +DWORD > +STDCALL > +NtGdiDdDDIGetProcessSchedulingPriorityClass > +{ > + UNIMPLEMENTED; > + return 0 > +} > + > +DWORD > +STDCALL > +NtGdiDdDDIGetRuntimeData(DWORD x1) > +{ > + UNIMPLEMENTED; > + return 0 > +} > + > +DWORD > +STDCALL > +NtGdiDdDDIGetScanLine(DWORD x1) > +{ > + UNIMPLEMENTED; > + return 0 > +} > + > +DWORD > +STDCALL > +NtGdiDdDDIGetSharedPrimaryHandle(DWORD x1) > +{ > + UNIMPLEMENTED; > + return 0 > +} > + > +DWORD > +STDCALL > +NtGdiDdDDIInvalidateActiveVidPn(DWORD x1) > +{ > + UNIMPLEMENTED; > + return 0 > +} > + > +DWORD > +STDCALL > +NtGdiDdDDILock(DWORD x1) > +{ > + UNIMPLEMENTED; > + return 0 > +} > + > +DWORD > +STDCALL > +NtGdiDdDDIOpenAdapterFromDeviceName(DWORD x1) > +{ > + UNIMPLEMENTED; > + return 0 > +} > + > +DWORD > +STDCALL > +NtGdiDdDDIOpenAdapterFromHdc(DWORD x1) > +{ > + UNIMPLEMENTED; > + return 0 > +} > + > +DWORD > +STDCALL > +NtGdiDdDDIOpenResource(DWORD x1) > +{ > + UNIMPLEMENTED; > + return 0 > +} > + > +DWORD > +STDCALL > +NtGdiDdDDIPollDisplayChildren(DWORD x1) > +{ > + UNIMPLEMENTED; > + return 0 > +} > + > +DWORD > +STDCALL > +NtGdiDdDDIPresent(DWORD x1) > +{ > + UNIMPLEMENTED; > + return 0 > +} > + > +DWORD > +STDCALL > +NtGdiDdDDIQueryAdapterInfo(DWORD x1) > +{ > + UNIMPLEMENTED; > + return 0 > +} > + > +DWORD > +STDCALL > +NtGdiDdDDIQueryAllocationResidency(DWORD x1) > +{ > + UNIMPLEMENTED; > + return 0 > +} > + > +DWORD > +STDCALL > +NtGdiDdDDIQueryResourceInfo(DWORD x1) > +{ > + UNIMPLEMENTED; > + return 0 > +} > + > +DWORD > +STDCALL > +NtGdiDdDDIQueryStatistics(DWORD x1) > +{ > + UNIMPLEMENTED; > + return 0 > +} > + > +DWORD > +STDCALL > +NtGdiDdDDIReleaseProcessVidPnSourceOwners(DWORD x1) > +{ > + UNIMPLEMENTED; > + return 0 > +} > + > +DWORD > +STDCALL > +NtGdiDdDDIRender(DWORD x1) > +{ > + UNIMPLEMENTED; > + return 0 > +} > + > +DWORD > +STDCALL > +NtGdiDdDDISetAllocationPriority(DWORD x1) > +{ > + UNIMPLEMENTED; > + return 0 > +} > + > +DWORD > +STDCALL > +NtGdiDdDDISetContextSchedulingPriority(DWORD x1) > +{ > + UNIMPLEMENTED; > + return 0 > +} > + > +DWORD > +STDCALL > +NtGdiDdDDISetDisplayMode(DWORD x1) > +{ > + UNIMPLEMENTED; > + return 0 > +} > + > +DWORD > +STDCALL > +NtGdiDdDDISetDisplayPrivateDriverFormat(DWORD x1) > +{ > + UNIMPLEMENTED; > + return 0 > +} > + > +DWORD > +STDCALL > +NtGdiDdDDISetGammaRamp(DWORD x1) > +{ > + UNIMPLEMENTED; > + return 0 > +} > + > +DWORD > +STDCALL > +NtGdiDdDDISetProcessSchedulingPriorityClass(DWORD x1, x2) > +{ > + UNIMPLEMENTED; > + return 0 > +} > + > +DWORD > +STDCALL > +NtGdiDdDDISetQueuedLimit(DWORD x1) > +{ > + UNIMPLEMENTED; > + return 0 > +} > + > +DWORD > +STDCALL > +NtGdiDdDDISetVidPnSourceOwner(DWORD x1) > +{ > + UNIMPLEMENTED; > + return 0 > +} > + > +DWORD > +STDCALL > +NtGdiDdDDISharedPrimaryLockNotification(DWORD x1) > +{ > + UNIMPLEMENTED; > + return 0 > +} > + > +DWORD > +STDCALL > +NtGdiDdDDISharedPrimaryUnLockNotification(DWORD x1) > +{ > + UNIMPLEMENTED; > + return 0 > +} > + > +DWORD > +STDCALL > +NtGdiDdDDISignalSynchronizationObject(DWORD x1) > +{ > + UNIMPLEMENTED; > + return 0 > +} > + > +DWORD > +STDCALL > +NtGdiDdDDIUnlock(DWORD x1) > +{ > + UNIMPLEMENTED; > + return 0 > +} > + > +DWORD > +STDCALL > +NtGdiDdDDIUpdateOverlay(DWORD x1) > +{ > + UNIMPLEMENTED; > + return 0 > +} > + > +DWORD > +STDCALL > +NtGdiDdDDIWaitForIdle(DWORD x1) > +{ > + UNIMPLEMENTED; > + return 0 > +} > + > +DWORD > +STDCALL > +NtGdiDdDDIWaitForSynchronizationObject(DWORD x1) > +{ > + UNIMPLEMENTED; > + return 0 > +} > + > +DWORD > +STDCALL > +NtGdiDdDDIWaitForVerticalBlankEvent(DWORD x1) > +{ > + UNIMPLEMENTED; > + return 0 > +} > + > +DWORD > +STDCALL > +NtGdiDDCCIGetCapabilitiesString(DWORD x1, DWORD x2, DWORD x3) > +{ > + UNIMPLEMENTED; > + return 0 > +} > + > +DWORD > +STDCALL > +NtGdiDDCCIGetCapabilitiesStringLength(DWORD x1, DWORD x2) > +{ > + UNIMPLEMENTED; > + return 0 > +} > + > +DWORD > +STDCALL > +NtGdiDDCCIGetTimingReport(DWORD x1, DWORD x2) > +{ > + UNIMPLEMENTED; > + return 0 > +} > + > +DWORD > +STDCALL > +NtGdiDDCCIGetVCPFeature(DWORD x1, DWORD x2, DWORD x3, DWORD x4) > +{ > + UNIMPLEMENTED; > + return 0 > +} > + > +DWORD > +STDCALL > +NtGdiDDCCISaveCurrentSettings(DWORD x1) > +{ > + UNIMPLEMENTED; > + return 0 > +} > + > +DWORD > +STDCALL > +NtGdiDDCCISetVCPFeature(DWORD x1, DWORD x2, DWORD x3) > +{ > + UNIMPLEMENTED; > + return 0 > +} > > Propchange: branches/win32k-gdi-dx/subsystems/win32/win32k/ntddraw/d3dkmt.c > ------------------------------------------------------------------------------ > svn:eol-style = native > > Modified: branches/win32k-gdi-dx/subsystems/win32/win32k/stubs/stubs.c > URL: http://svn.reactos.org/svn/reactos/branches/win32k-gdi-dx/subsystems/win32/… > ============================================================================== > --- branches/win32k-gdi-dx/subsystems/win32/win32k/stubs/stubs.c [iso-8859-1] (original) > +++ branches/win32k-gdi-dx/subsystems/win32/win32k/stubs/stubs.c [iso-8859-1] Sun May 18 13:33:27 2008 > @@ -2974,3 +2974,11 @@ > UNIMPLEMENTED; > return 0 > } > + > +DWORD > +STDCALL > +NtGdiCreateOPMProtectedOutputs(DWORD x1, DWORD x2, DWORD x3, DWORD x4, DWORD x5) > +{ > + UNIMPLEMENTED; > + return 0 > +} > > Modified: branches/win32k-gdi-dx/subsystems/win32/win32k/w32ksvc.db > URL: http://svn.reactos.org/svn/reactos/branches/win32k-gdi-dx/subsystems/win32/… > ============================================================================== > --- branches/win32k-gdi-dx/subsystems/win32/win32k/w32ksvc.db [iso-8859-1] (original) > +++ branches/win32k-gdi-dx/subsystems/win32/win32k/w32ksvc.db [iso-8859-1] Sun May 18 13:33:27 2008 > @@ -674,7 +674,70 @@ > # > # > # Vista Syscall add on > -NtGdiConfigureOPMProtectedOutput 4 > +NtGdiConfigureOPMProtectedOutput 4 > +NtGdiCreateOPMProtectedOutputs 5 > +NtGdiDdDDICheckExclusiveOwnership 0 > +NtGdiDdDDICheckMonitorPowerState 1 > +NtGdiDdDDICheckOcclusion 1 > +NtGdiDdDDICloseAdapter 1 > +NtGdiDdDDICreateAllocation 1 > +NtGdiDdDDICreateContext 1 > +NtGdiDdDDICreateDCFromMemory 1 > +NtGdiDdDDICreateDevice 1 > +NtGdiDdDDICreateOverlay 1 > +NtGdiDdDDICreateSynchronizationObject 1 > +NtGdiDdDDIDestroyAllocation 1 > +NtGdiDdDDIDestroyContext 1 > +NtGdiDdDDIDestroyDCFromMemory 1 > +NtGdiDdDDIDestroyDevice 1 > +NtGdiDdDDIDestroyOverlay 1 > +NtGdiDdDDIDestroySynchronizationObject 1 > +NtGdiDdDDIEscape 1 > +NtGdiDdDDIFlipOverlay 1 > +NtGdiDdDDIGetContextSchedulingPriority 1 > +NtGdiDdDDIGetDeviceState 1 > +NtGdiDdDDIGetDisplayModeList 1 > +NtGdiDdDDIGetMultisampleMethodList 1 > +NtGdiDdDDIGetPresentHistory 1 > +NtGdiDdDDIGetProcessSchedulingPriorityClass 2 > +NtGdiDdDDIGetRuntimeData 1 > +NtGdiDdDDIGetScanLine 1 > +NtGdiDdDDIGetSharedPrimaryHandle 1 > +NtGdiDdDDIInvalidateActiveVidPn 1 > +NtGdiDdDDILock 1 > +NtGdiDdDDIOpenAdapterFromDeviceName 1 > +NtGdiDdDDIOpenAdapterFromHdc 1 > +NtGdiDdDDIOpenResource 1 > +NtGdiDdDDIPollDisplayChildren 1 > +NtGdiDdDDIPresent 1 > +NtGdiDdDDIQueryAdapterInfo 1 > +NtGdiDdDDIQueryAllocationResidency 1 > +NtGdiDdDDIQueryResourceInfo 1 > +NtGdiDdDDIQueryStatistics 1 > +NtGdiDdDDIReleaseProcessVidPnSourceOwners 1 > +NtGdiDdDDIRender 1 > +NtGdiDdDDISetAllocationPriority 1 > +NtGdiDdDDISetContextSchedulingPriority 1 > +NtGdiDdDDISetDisplayMode 1 > +NtGdiDdDDISetDisplayPrivateDriverFormat 1 > +NtGdiDdDDISetGammaRamp 1 > +NtGdiDdDDISetProcessSchedulingPriorityClass 1 > +NtGdiDdDDISetQueuedLimit 1 > +NtGdiDdDDISetVidPnSourceOwner 1 > +NtGdiDdDDISharedPrimaryLockNotification 1 > +NtGdiDdDDISharedPrimaryUnLockNotification 1 > +NtGdiDdDDISignalSynchronizationObject 1 > +NtGdiDdDDIUnlock 1 > +NtGdiDdDDIUpdateOverlay 1 > +NtGdiDdDDIWaitForIdle 1 > +NtGdiDdDDIWaitForSynchronizationObject 1 > +NtGdiDdDDIWaitForVerticalBlankEvent 1 > +NtGdiDDCCIGetCapabilitiesString 3 > +NtGdiDDCCIGetCapabilitiesStringLength 2 > +NtGdiDDCCIGetTimingReport 2 > +NtGdiDDCCIGetVCPFeature 4 > +NtGdiDDCCISaveCurrentSettings 1 > +NtGdiDDCCISetVCPFeature 3 > # > # > #ReactOS specific syscalls > > -- Best regards, Alex Ionescu

2 1

Re: [ros-dev] [ros-diffs] [cfinck] 33571: Check if the GetWindowsDirectory call succeeded and use PathAppend to prevent a buffer overflow, when WinDir + "\regedit.exe" > MAX_PATH
by Alex Ionescu 19 May '08

19 May '08

Last nitpick: if you can't get the windows directory, just ShellExecute "regedit.exe" directly, as the code originally did -- this is the behavior on Windows, fyi. On Sun, May 18, 2008 at 6:56 PM, <cfinck(a)svn.reactos.org> wrote: > Author: cfinck > Date: Sun May 18 05:56:31 2008 > New Revision: 33571 > > URL: http://svn.reactos.org/svn/reactos?rev=33571&view=rev > Log: > Check if the GetWindowsDirectory call succeeded and use PathAppend to prevent a buffer overflow, when WinDir + "\regedit.exe" > MAX_PATH > > Modified: > trunk/reactos/base/applications/regedt32/regedt32.c > > Modified: trunk/reactos/base/applications/regedt32/regedt32.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedt32… > ============================================================================== > --- trunk/reactos/base/applications/regedt32/regedt32.c [iso-8859-1] (original) > +++ trunk/reactos/base/applications/regedt32/regedt32.c [iso-8859-1] Sun May 18 05:56:31 2008 > @@ -1,16 +1,18 @@ > #include <windows.h> > #include <tchar.h> > #include <shellapi.h> > +#include <shlwapi.h> > > int WINAPI _tWinMain(HINSTANCE hCurInst, HINSTANCE hPrevInst, > LPTSTR lpsCmdLine, int nCmdShow) > { > TCHAR szPath[MAX_PATH]; > > - GetWindowsDirectory(szPath, MAX_PATH); > - _tcscat(szPath, _T("\\regedit.exe")); > - > - ShellExecute(NULL, NULL, szPath, lpsCmdLine, NULL, nCmdShow); > + if(GetWindowsDirectory(szPath, MAX_PATH)) > + { > + PathAppend(szPath, _T("regedit.exe")); > + ShellExecute(NULL, NULL, szPath, lpsCmdLine, NULL, nCmdShow); > + } > > return 0; > } > > -- Best regards, Alex Ionescu

2 1

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-dev