Ros-diffs

ros-diffs@reactos.org

81390 discussions

[greatlrd] 33673: gdi32 rename GdiSharedHandleTable to pGdiSharedHandleTable, GDI_BatchLimit to GdiBatchLimit, GdiDevCaps to pGdiDevCaps for match windows xp/vista add pGdiSharedMemory it is same as pGdiSharedHandleTable but it is more logic to use pGdiSharedMemory for share memory stuff change GdiBatchLimit init value to 20 to match vista GdiProcessSetup() using now GetAppCompatFlags2 to determent to use GdiBatchLimit or not, if the flag is not set the GdiBatchLimit is set to 0 add include/reac
by greatlrd＠svn.reactos.org 24 May '08

24 May '08

Author: greatlrd Date: Sat May 24 12:02:55 2008 New Revision: 33673 URL: http://svn.reactos.org/svn/reactos?rev=33673&view=rev Log: gdi32 rename GdiSharedHandleTable to pGdiSharedHandleTable, GDI_BatchLimit to GdiBatchLimit, GdiDevCaps to pGdiDevCaps for match windows xp/vista add pGdiSharedMemory it is same as pGdiSharedHandleTable but it is more logic to use pGdiSharedMemory for share memory stuff change GdiBatchLimit init value to 20 to match vista GdiProcessSetup() using now GetAppCompatFlags2 to determent to use GdiBatchLimit or not, if the flag is not set the GdiBatchLimit is set to 0 add include/reactos/dll/user32/user32_ros.h for prototype for GetAppCompatFlags2 Added: branches/win32k-gdi-dx/include/reactos/dll/user32/ branches/win32k-gdi-dx/include/reactos/dll/user32/user32_ros.h (with props) Modified: branches/win32k-gdi-dx/dll/win32/gdi32/include/gdi32p.h branches/win32k-gdi-dx/dll/win32/gdi32/main/dllmain.c branches/win32k-gdi-dx/dll/win32/gdi32/misc/gdientry.c branches/win32k-gdi-dx/dll/win32/gdi32/misc/misc.c branches/win32k-gdi-dx/dll/win32/gdi32/objects/brush.c branches/win32k-gdi-dx/dll/win32/gdi32/objects/dc.c branches/win32k-gdi-dx/dll/win32/user32/misc/stubs.c Modified: branches/win32k-gdi-dx/dll/win32/gdi32/include/gdi32p.h URL: http://svn.reactos.org/svn/reactos/branches/win32k-gdi-dx/dll/win32/gdi32/i… ============================================================================== --- branches/win32k-gdi-dx/dll/win32/gdi32/include/gdi32p.h [iso-8859-1] (original) +++ branches/win32k-gdi-dx/dll/win32/gdi32/include/gdi32p.h [iso-8859-1] Sat May 24 12:02:55 2008 @@ -8,13 +8,15 @@ /* DATA **********************************************************************/ +#include <dll/user32/user32_ros.h> extern PGDI_TABLE_ENTRY GdiHandleTable; -extern PGDI_SHARED_HANDLE_TABLE GdiSharedHandleTable; +extern PGDI_SHARED_HANDLE_TABLE pGdiSharedHandleTable; +extern PGDI_SHARED_HANDLE_TABLE pGdiSharedMemory; extern HANDLE hProcessHeap; extern HANDLE CurrentProcessId; -extern DWORD GDI_BatchLimit; -extern PDEVCAPS GdiDevCaps; +extern DWORD GdiBatchLimit; +extern PDEVCAPS pGdiDevCaps; typedef INT (CALLBACK* EMFPLAYPROC)( Modified: branches/win32k-gdi-dx/dll/win32/gdi32/main/dllmain.c URL: http://svn.reactos.org/svn/reactos/branches/win32k-gdi-dx/dll/win32/gdi32/m… ============================================================================== --- branches/win32k-gdi-dx/dll/win32/gdi32/main/dllmain.c [iso-8859-1] (original) +++ branches/win32k-gdi-dx/dll/win32/gdi32/main/dllmain.c [iso-8859-1] Sat May 24 12:02:55 2008 @@ -11,8 +11,18 @@ extern HGDIOBJ stock_objects[]; BOOL SetStockObjects = FALSE; -PDEVCAPS GdiDevCaps = NULL; + +PGDI_TABLE_ENTRY GdiHandleTable = NULL; +HANDLE CurrentProcessId = NULL; + +/* Note match vista */ +PDEVCAPS pGdiDevCaps = NULL; PGDIHANDLECACHE GdiHandleCache = NULL; +PGDI_SHARED_HANDLE_TABLE pGdiSharedHandleTable = NULL; +PGDI_SHARED_HANDLE_TABLE pGdiSharedMemory = NULL; +DWORD GdiBatchLimit = 20; + + /* * GDI32.DLL does have an entry point for disable threadlibrarycall,. The initialization is done by a call @@ -37,20 +47,33 @@ return TRUE; } - VOID WINAPI GdiProcessSetup (VOID) { + hProcessHeap = GetProcessHeap(); + CurrentProcessId = NtCurrentTeb()->Cid.UniqueProcess; - /* map the gdi handle table to user space */ - GdiHandleTable = NtCurrentTeb()->ProcessEnvironmentBlock->GdiSharedHandleTable; - GdiSharedHandleTable = NtCurrentTeb()->ProcessEnvironmentBlock->GdiSharedHandleTable; - GdiDevCaps = &GdiSharedHandleTable->DevCaps; - CurrentProcessId = NtCurrentTeb()->Cid.UniqueProcess; - GDI_BatchLimit = (DWORD) NtCurrentTeb()->ProcessEnvironmentBlock->GdiDCAttributeList; - GdiHandleCache = (PGDIHANDLECACHE)NtCurrentTeb()->ProcessEnvironmentBlock->GdiHandleBuffer; + /* map the gdi handle table to user space */ + pGdiSharedMemory = NtCurrentTeb()->ProcessEnvironmentBlock->GdiSharedHandleTable; + pGdiSharedHandleTable = NtCurrentTeb()->ProcessEnvironmentBlock->GdiSharedHandleTable; + GdiHandleTable = NtCurrentTeb()->ProcessEnvironmentBlock->GdiSharedHandleTable; + pGdiDevCaps = &pGdiSharedMemory->DevCaps; + GdiHandleCache = (PGDIHANDLECACHE)NtCurrentTeb()->ProcessEnvironmentBlock->GdiHandleBuffer; + + /* why does vista send down 0x400 to GetAppCompatFlags2 no doc in msdn found + * 0x200 GdiBatchLimit is ON if this is not set in AppCompatFlags2 no GdiBatchLimit is active */ + + if ((GetAppCompatFlags2( (HTASK) 0x400) & 0x200) == 0x200) + { + GdiBatchLimit = (DWORD) NtCurrentTeb()->ProcessEnvironmentBlock->GdiDCAttributeList; + } + else + { + /* GdiBatchLimit set to 0 */ + GdiBatchLimit = 0; + } } Modified: branches/win32k-gdi-dx/dll/win32/gdi32/misc/gdientry.c URL: http://svn.reactos.org/svn/reactos/branches/win32k-gdi-dx/dll/win32/gdi32/m… ============================================================================== --- branches/win32k-gdi-dx/dll/win32/gdi32/misc/gdientry.c [iso-8859-1] (original) +++ branches/win32k-gdi-dx/dll/win32/gdi32/misc/gdientry.c [iso-8859-1] Sat May 24 12:02:55 2008 @@ -2022,7 +2022,7 @@ STDCALL DdQueryDisplaySettingsUniqueness() { - return GdiSharedHandleTable->flDeviceUniq; + return pGdiSharedMemory->flDeviceUniq; } /* Modified: branches/win32k-gdi-dx/dll/win32/gdi32/misc/misc.c URL: http://svn.reactos.org/svn/reactos/branches/win32k-gdi-dx/dll/win32/gdi32/m… ============================================================================== --- branches/win32k-gdi-dx/dll/win32/gdi32/misc/misc.c [iso-8859-1] (original) +++ branches/win32k-gdi-dx/dll/win32/gdi32/misc/misc.c [iso-8859-1] Sat May 24 12:02:55 2008 @@ -28,10 +28,7 @@ #include "precomp.h" -PGDI_TABLE_ENTRY GdiHandleTable = NULL; -PGDI_SHARED_HANDLE_TABLE GdiSharedHandleTable = NULL; -HANDLE CurrentProcessId = NULL; -DWORD GDI_BatchLimit = 1; + BOOL @@ -171,7 +168,7 @@ STDCALL GdiSetBatchLimit(DWORD Limit) { - DWORD OldLimit = GDI_BatchLimit; + DWORD OldLimit = GdiBatchLimit; if ( (!Limit) || (Limit >= GDI_BATCH_LIMIT)) @@ -180,7 +177,7 @@ } GdiFlush(); - GDI_BatchLimit = Limit; + GdiBatchLimit = Limit; return OldLimit; } @@ -192,7 +189,7 @@ STDCALL GdiGetBatchLimit() { - return GDI_BatchLimit; + return GdiBatchLimit; } /* Modified: branches/win32k-gdi-dx/dll/win32/gdi32/objects/brush.c URL: http://svn.reactos.org/svn/reactos/branches/win32k-gdi-dx/dll/win32/gdi32/o… ============================================================================== --- branches/win32k-gdi-dx/dll/win32/gdi32/objects/brush.c [iso-8859-1] (original) +++ branches/win32k-gdi-dx/dll/win32/gdi32/objects/brush.c [iso-8859-1] Sat May 24 12:02:55 2008 @@ -344,7 +344,7 @@ pTeb->GdiBatchCount++; DPRINT("Loading the Flush!! COUNT-> %d\n", pTeb->GdiBatchCount); - if (pTeb->GdiBatchCount >= GDI_BatchLimit) + if (pTeb->GdiBatchCount >= GdiBatchLimit) { DPRINT("Call GdiFlush!!\n"); NtGdiFlush(); Modified: branches/win32k-gdi-dx/dll/win32/gdi32/objects/dc.c URL: http://svn.reactos.org/svn/reactos/branches/win32k-gdi-dx/dll/win32/gdi32/o… ============================================================================== --- branches/win32k-gdi-dx/dll/win32/gdi32/objects/dc.c [iso-8859-1] (original) +++ branches/win32k-gdi-dx/dll/win32/gdi32/objects/dc.c [iso-8859-1] Sat May 24 12:02:55 2008 @@ -347,7 +347,7 @@ pTeb->GdiTebBatch.Offset += sizeof(GDIBSOBJECT); pTeb->GdiBatchCount++; - if (pTeb->GdiBatchCount >= GDI_BatchLimit) NtGdiFlush(); + if (pTeb->GdiBatchCount >= GdiBatchLimit) NtGdiFlush(); return TRUE; } break; @@ -1404,7 +1404,7 @@ pTeb->GdiTebBatch.Offset += sizeof(GDIBSOBJECT); pTeb->GdiTebBatch.HDC = (ULONG)hDC; pTeb->GdiBatchCount++; - if (pTeb->GdiBatchCount >= GDI_BatchLimit) NtGdiFlush(); + if (pTeb->GdiBatchCount >= GdiBatchLimit) NtGdiFlush(); return pDc_Attr->hlfntNew; } #endif Modified: branches/win32k-gdi-dx/dll/win32/user32/misc/stubs.c URL: http://svn.reactos.org/svn/reactos/branches/win32k-gdi-dx/dll/win32/user32/… ============================================================================== --- branches/win32k-gdi-dx/dll/win32/user32/misc/stubs.c [iso-8859-1] (original) +++ branches/win32k-gdi-dx/dll/win32/user32/misc/stubs.c [iso-8859-1] Sat May 24 12:02:55 2008 @@ -118,6 +118,7 @@ return ti->AppCompatFlags; } + /* * @implemented */ @@ -129,6 +130,10 @@ /* If there is no threadinfo (?!), then return 0 */ if (!ti) return 0; + + /* return value for bit + * 0x200 GdiBatchLimit is Activate in gdi32 + */ return ti->AppCompatFlags2; } Added: branches/win32k-gdi-dx/include/reactos/dll/user32/user32_ros.h URL: http://svn.reactos.org/svn/reactos/branches/win32k-gdi-dx/include/reactos/d… ============================================================================== --- branches/win32k-gdi-dx/include/reactos/dll/user32/user32_ros.h (added) +++ branches/win32k-gdi-dx/include/reactos/dll/user32/user32_ros.h [iso-8859-1] Sat May 24 12:02:55 2008 @@ -1,0 +1,1 @@ +DWORD STDCALL GetAppCompatFlags2(HTASK hTask); Propchange: branches/win32k-gdi-dx/include/reactos/dll/user32/user32_ros.h ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[mpiulachs] 33672: - remove 'basename' , no such attribute exists for <importlibrary>
by mpiulachs＠svn.reactos.org 24 May '08

24 May '08

Author: mpiulachs Date: Sat May 24 10:33:49 2008 New Revision: 33672 URL: http://svn.reactos.org/svn/reactos?rev=33672&view=rev Log: - remove 'basename' , no such attribute exists for <importlibrary> Modified: trunk/reactos/hal/hal/hal.rbuild Modified: trunk/reactos/hal/hal/hal.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/hal/hal.rbuild?rev=336… ============================================================================== --- trunk/reactos/hal/hal/hal.rbuild [iso-8859-1] (original) +++ trunk/reactos/hal/hal/hal.rbuild [iso-8859-1] Sat May 24 10:33:49 2008 @@ -2,7 +2,7 @@ <!DOCTYPE group SYSTEM "../../tools/rbuild/project.dtd"> <group> <module name="hal" type="kernelmodedll"> - <importlibrary basename="hal" definition="hal_$(ARCH).def" /> + <importlibrary definition="hal_$(ARCH).def" /> <include base="ntoskrnl">include</include> <library>ntoskrnl</library> <define name="_NTHAL_" />

1 0

[pschweitzer] 33671: Set default return of IRP_MJ_QUERY_INFORMATION to STATUS_INVALID_PARAMETER
by pschweitzer＠svn.reactos.org 24 May '08

24 May '08

Author: pschweitzer Date: Sat May 24 04:06:53 2008 New Revision: 33671 URL: http://svn.reactos.org/svn/reactos?rev=33671&view=rev Log: Set default return of IRP_MJ_QUERY_INFORMATION to STATUS_INVALID_PARAMETER Modified: trunk/reactos/drivers/filesystems/cdfs/finfo.c trunk/reactos/drivers/filesystems/fastfat/finfo.c trunk/reactos/drivers/filesystems/ntfs/finfo.c Modified: trunk/reactos/drivers/filesystems/cdfs/finfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/cdfs/f… ============================================================================== --- trunk/reactos/drivers/filesystems/cdfs/finfo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/cdfs/finfo.c [iso-8859-1] Sat May 24 04:06:53 2008 @@ -390,7 +390,7 @@ default: DPRINT("Unimplemented information class %u\n", FileInformationClass); - Status = STATUS_NOT_SUPPORTED; + Status = STATUS_INVALID_PARAMETER; break; } Modified: trunk/reactos/drivers/filesystems/fastfat/finfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/finfo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat/finfo.c [iso-8859-1] Sat May 24 04:06:53 2008 @@ -835,7 +835,7 @@ RC = STATUS_NOT_IMPLEMENTED; break; default: - RC = STATUS_NOT_SUPPORTED; + RC = STATUS_INVALID_PARAMETER; } if (!(FCB->Flags & FCB_IS_PAGE_FILE)) Modified: trunk/reactos/drivers/filesystems/ntfs/finfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/f… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/finfo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/finfo.c [iso-8859-1] Sat May 24 04:06:53 2008 @@ -248,7 +248,7 @@ default: DPRINT("Unimplemented information class %u\n", FileInformationClass); - Status = STATUS_NOT_SUPPORTED; + Status = STATUS_INVALID_PARAMETER; } Irp->IoStatus.Status = Status;

1 0

[pschweitzer] 33670: - Imported dciman32.dll from Wine HEAD - Added it to bootcd - Update README.WINE
by pschweitzer＠svn.reactos.org 24 May '08

24 May '08

Author: pschweitzer Date: Sat May 24 03:42:53 2008 New Revision: 33670 URL: http://svn.reactos.org/svn/reactos?rev=33670&view=rev Log: - Imported dciman32.dll from Wine HEAD - Added it to bootcd - Update README.WINE Added: trunk/reactos/dll/win32/dciman32/ trunk/reactos/dll/win32/dciman32/dciman32.rbuild (with props) trunk/reactos/dll/win32/dciman32/dciman32.spec (with props) trunk/reactos/dll/win32/dciman32/dciman_main.c (with props) trunk/reactos/include/psdk/dciddi.h (with props) trunk/reactos/include/psdk/dciman.h (with props) Modified: trunk/reactos/baseaddress.rbuild trunk/reactos/boot/bootdata/packages/reactos.dff trunk/reactos/dll/win32/win32.rbuild trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/baseaddress.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/baseaddress.rbuild?rev=336… ============================================================================== --- trunk/reactos/baseaddress.rbuild [iso-8859-1] (original) +++ trunk/reactos/baseaddress.rbuild [iso-8859-1] Sat May 24 03:42:53 2008 @@ -92,6 +92,7 @@ <property name="BASEADDRESS_WINSPOOL" value="0x72f50000" /> <property name="BASEADDRESS_MSDMO" value="0x73670000" /> <property name="BASEADDRESS_AVIFIL32" value="0x73ac0000" /> + <property name="BASEADDRESS_DCIMAN32" value="0x73b10000" /> <property name="BASEADDRESS_LZ32" value="0x73d80000" /> <property name="BASEADDRESS_COREDLL" value="0x73d80000" /> <property name="BASEADDRESS_KSUSER" value="0x73ea0000" /> Modified: trunk/reactos/boot/bootdata/packages/reactos.dff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/packages/rea… ============================================================================== --- trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] Sat May 24 03:42:53 2008 @@ -237,6 +237,7 @@ dll\win32\cryptnet\cryptnet.dll 1 dll\win32\cryptui\cryptui.dll 1 dll\win32\dbghelp\dbghelp.dll 1 +dll\win32\dciman32\dciman32.dll 1 dll\win32\devmgr\devmgr.dll 1 dll\win32\dhcpcsvc\dhcpcsvc.dll 1 dll\win32\dnsapi\dnsapi.dll 1 Added: trunk/reactos/dll/win32/dciman32/dciman32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dciman32/dciman3… ============================================================================== --- trunk/reactos/dll/win32/dciman32/dciman32.rbuild (added) +++ trunk/reactos/dll/win32/dciman32/dciman32.rbuild [iso-8859-1] Sat May 24 03:42:53 2008 @@ -1,0 +1,17 @@ +<?xml version="1.0"?> +<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> +<group> +<module name="dciman32" type="win32dll" baseaddress="${BASEADDRESS_DCIMAN32}" installbase="system32" installname="dciman32.dll" allowwarnings="true"> + <importlibrary definition="dciman32.spec.def" /> + <include base="dciman32">.</include> + <include base="ReactOS">include/reactos/wine</include> + <define name="__WINESRC__" /> + <define name="WINVER">0x600</define> + <define name="_WIN32_WINNT">0x600</define> + <file>dciman_main.c</file> + <file>dciman32.spec</file> + <library>wine</library> + <library>kernel32</library> + <library>ntdll</library> +</module> +</group> Propchange: trunk/reactos/dll/win32/dciman32/dciman32.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/dciman32/dciman32.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dciman32/dciman3… ============================================================================== --- trunk/reactos/dll/win32/dciman32/dciman32.spec (added) +++ trunk/reactos/dll/win32/dciman32/dciman32.spec [iso-8859-1] Sat May 24 03:42:53 2008 @@ -1,0 +1,21 @@ +@ stub DCIBeginAccess +@ stdcall DCICloseProvider(long) +@ stub DCICreateOffscreen +@ stub DCICreateOverlay +@ stdcall DCICreatePrimary(long ptr) +@ stub DCIDestroy +@ stub DCIDraw +@ stub DCIEndAccess +@ stub DCIEnum +@ stdcall DCIOpenProvider() +@ stub DCISetClipList +@ stub DCISetDestination +@ stub DCISetSrcDestClip +@ stdcall -private DllEntryPoint(long long ptr) DllMain +@ stub GetDCRegionData +@ stub GetWindowRegionData +@ stub WinWatchClose +@ stub WinWatchDidStatusChange +@ stub WinWatchGetClipList +@ stub WinWatchNotify +@ stub WinWatchOpen Propchange: trunk/reactos/dll/win32/dciman32/dciman32.spec ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/dciman32/dciman_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dciman32/dciman_… ============================================================================== --- trunk/reactos/dll/win32/dciman32/dciman_main.c (added) +++ trunk/reactos/dll/win32/dciman32/dciman_main.c [iso-8859-1] Sat May 24 03:42:53 2008 @@ -1,0 +1,72 @@ +/* + * Implementation of DCIMAN32 - DCI Manager + * "Device Context Interface" ? + * + * Copyright 2000 Marcus Meissner + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> +#include <stdio.h> + +#include "windef.h" +#include "winbase.h" +#include "winerror.h" +#include "dciman.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(dciman); + +/*********************************************************************** + * DllEntryPoint (DCIMAN32.@) + * + * DCIMAN32 initialisation routine. + */ +BOOL WINAPI DllMain( HINSTANCE inst, DWORD reason, LPVOID reserved ) +{ + if (reason == DLL_PROCESS_ATTACH) DisableThreadLibraryCalls( inst ); + return TRUE; +} + + +/*********************************************************************** + * DCIOpenProvider (DCIMAN32.@) + */ +HDC WINAPI +DCIOpenProvider(void) { + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return NULL; +} + +/*********************************************************************** + * DCICloseProvider (DCIMAN32.@) + */ +void WINAPI +DCICloseProvider(HDC hdc) { + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return; +} + +/************************************************************************** + * DCICreatePrimary (DCIMAN32.@) + */ +int WINAPI +DCICreatePrimary(HDC hdc, LPDCISURFACEINFO *pDciSurfaceInfo) +{ + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + FIXME("%p %p\n", hdc, pDciSurfaceInfo); + return DCI_FAIL_UNSUPPORTED; +} Propchange: trunk/reactos/dll/win32/dciman32/dciman_main.c ------------------------------------------------------------------------------ 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] Sat May 24 03:42:53 2008 @@ -70,6 +70,9 @@ <directory name="dbghelp"> <xi:include href="dbghelp/dbghelp.rbuild" /> </directory> +<directory name="dciman32"> + <xi:include href="dciman32/dciman32.rbuild" /> +</directory> <directory name="devmgr"> <xi:include href="devmgr/devmgr.rbuild" /> </directory> Added: trunk/reactos/include/psdk/dciddi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/dciddi.h?rev=… ============================================================================== --- trunk/reactos/include/psdk/dciddi.h (added) +++ trunk/reactos/include/psdk/dciddi.h [iso-8859-1] Sat May 24 03:42:53 2008 @@ -1,0 +1,83 @@ +/* + * DCI driver interface + * + * Copyright (C) 2001 Ove Kaaven + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef __WINE_DCIDDI_H +#define __WINE_DCIDDI_H + +#ifdef __cplusplus +extern "C" { +#endif + +/* DCI Command Escape */ +#define DCICOMMAND 3075 +#define DCI_VERSION 0x0100 + +#define DCICREATEPRIMARYSURFACE 1 +#define DCICREATEOFFSCREENSURFACE 2 +#define DCICREATEOVERLAYSURFACE 3 +#define DCIENUMSURFACE 4 +#define DCIESCAPE 5 + +/* DCI Errors */ +#define DCI_OK 0 +#define DCI_FAIL_GENERIC -1 +#define DCI_FAIL_UNSUPPORTEDVERSION -2 +#define DCI_FAIL_INVALIDSURFACE -3 +#define DCI_FAIL_UNSUPPORTED -4 + + +typedef int DCIRVAL; /* DCI callback return type */ + +/***************************************************************************** + * Escape command structures + */ +typedef struct _DCICMD { + DWORD dwCommand; + DWORD dwParam1; + DWORD dwParam2; + DWORD dwVersion; + DWORD dwReserved; +} DCICMD,*LPDCICMD; + +typedef struct _DCISURFACEINFO { + DWORD dwSize; + DWORD dwDCICaps; + DWORD dwCompression; + DWORD dwMask[3]; + DWORD dwWidth; + DWORD dwHeight; + LONG lStride; + DWORD dwBitCount; + ULONG_PTR dwOffSurface; + WORD wSelSurface; + WORD wReserved; + DWORD dwReserved1; + DWORD dwReserved2; + DWORD dwReserved3; + DCIRVAL (CALLBACK *BeginAccess)(LPVOID, LPRECT); + void (CALLBACK *EndAccess)(LPVOID); + void (CALLBACK *DestroySurface)(LPVOID); +} DCISURFACEINFO, *LPDCISURFACEINFO; + +#ifdef __cplusplus +} /* extern "C" */ +#endif + +#endif /* __WINE_DCIDDI_H */ Propchange: trunk/reactos/include/psdk/dciddi.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/include/psdk/dciman.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/dciman.h?rev=… ============================================================================== --- trunk/reactos/include/psdk/dciman.h (added) +++ trunk/reactos/include/psdk/dciman.h [iso-8859-1] Sat May 24 03:42:53 2008 @@ -1,0 +1,38 @@ +/* + * DCI driver interface + * + * Copyright (C) 2005 Francois Gouget + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef _INC_DCIMAN +#define _INC_DCIMAN + +#include <dciddi.h> + +#ifdef __cplusplus +extern "C" { +#endif + +HDC WINAPI DCIOpenProvider(void); +void WINAPI DCICloseProvider(HDC); +int WINAPI DCICreatePrimary(HDC,LPDCISURFACEINFO*); + +#ifdef __cplusplus +} /* extern "C" */ +#endif + +#endif /* _INC_DCIMAN */ Propchange: trunk/reactos/include/psdk/dciman.h ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Sat May 24 03:42:53 2008 @@ -44,6 +44,7 @@ reactos/dll/win32/cryptdll # Autosync reactos/dll/win32/cryptnet # Autosync reactos/dll/win32/dbghelp # Synced to Wine-20080106 +reactos/dll/win32/dciman32 # Synced to Wine-1_0-rc2 reactos/dll/win32/gdiplus # Autosync reactos/dll/win32/hhctrl.ocx # Autosync reactos/dll/win32/hlink # Autosync

1 0

[greatlrd] 33669: Fixed so the branch can be compile gdi32 : DllMain make it work simluare as windows xp/vista does
by greatlrd＠svn.reactos.org 24 May '08

24 May '08

Author: greatlrd Date: Sat May 24 03:08:10 2008 New Revision: 33669 URL: http://svn.reactos.org/svn/reactos?rev=33669&view=rev Log: Fixed so the branch can be compile gdi32 : DllMain make it work simluare as windows xp/vista does Modified: branches/win32k-gdi-dx/dll/win32/gdi32/main/dllmain.c branches/win32k-gdi-dx/dll/win32/gdi32/misc/gdientry.c branches/win32k-gdi-dx/dll/win32/gdi32/misc/stubs.c branches/win32k-gdi-dx/include/reactos/win32k/ntgdityp.h branches/win32k-gdi-dx/subsystems/win32/win32k/ntddraw/d3dkmt.c branches/win32k-gdi-dx/subsystems/win32/win32k/w32ksvc.db Modified: branches/win32k-gdi-dx/dll/win32/gdi32/main/dllmain.c URL: http://svn.reactos.org/svn/reactos/branches/win32k-gdi-dx/dll/win32/gdi32/m… ============================================================================== --- branches/win32k-gdi-dx/dll/win32/gdi32/main/dllmain.c [iso-8859-1] (original) +++ branches/win32k-gdi-dx/dll/win32/gdi32/main/dllmain.c [iso-8859-1] Sat May 24 03:08:10 2008 @@ -15,18 +15,26 @@ PGDIHANDLECACHE GdiHandleCache = NULL; /* - * GDI32.DLL doesn't have an entry point. The initialization is done by a call + * GDI32.DLL does have an entry point for disable threadlibrarycall,. The initialization is done by a call * to GdiDllInitialize(). This call is done from the entry point of USER32.DLL. */ BOOL WINAPI DllMain ( - HANDLE hDll, - DWORD dwReason, - LPVOID lpReserved - ) + HANDLE hDll, + DWORD dwReason, + LPVOID lpReserved) { - return TRUE; + switch (dwReason) + { + case DLL_PROCESS_ATTACH : + DisableThreadLibraryCalls(hDll); + break; + + default: + break; + } + return TRUE; } @@ -34,15 +42,15 @@ WINAPI GdiProcessSetup (VOID) { - hProcessHeap = GetProcessHeap(); + hProcessHeap = GetProcessHeap(); /* map the gdi handle table to user space */ - GdiHandleTable = NtCurrentTeb()->ProcessEnvironmentBlock->GdiSharedHandleTable; - GdiSharedHandleTable = NtCurrentTeb()->ProcessEnvironmentBlock->GdiSharedHandleTable; - GdiDevCaps = &GdiSharedHandleTable->DevCaps; - CurrentProcessId = NtCurrentTeb()->Cid.UniqueProcess; - GDI_BatchLimit = (DWORD) NtCurrentTeb()->ProcessEnvironmentBlock->GdiDCAttributeList; - GdiHandleCache = (PGDIHANDLECACHE)NtCurrentTeb()->ProcessEnvironmentBlock->GdiHandleBuffer; + GdiHandleTable = NtCurrentTeb()->ProcessEnvironmentBlock->GdiSharedHandleTable; + GdiSharedHandleTable = NtCurrentTeb()->ProcessEnvironmentBlock->GdiSharedHandleTable; + GdiDevCaps = &GdiSharedHandleTable->DevCaps; + CurrentProcessId = NtCurrentTeb()->Cid.UniqueProcess; + GDI_BatchLimit = (DWORD) NtCurrentTeb()->ProcessEnvironmentBlock->GdiDCAttributeList; + GdiHandleCache = (PGDIHANDLECACHE)NtCurrentTeb()->ProcessEnvironmentBlock->GdiHandleBuffer; } @@ -52,34 +60,33 @@ BOOL WINAPI GdiDllInitialize ( - HANDLE hDll, - DWORD dwReason, - LPVOID lpReserved - ) + HANDLE hDll, + DWORD dwReason, + LPVOID lpReserved) { - switch (dwReason) - { - case DLL_PROCESS_ATTACH: - GdiProcessSetup (); - break; + switch (dwReason) + { + case DLL_PROCESS_ATTACH: + GdiProcessSetup (); + break; - case DLL_THREAD_ATTACH: + case DLL_THREAD_ATTACH: NtCurrentTeb()->GdiTebBatch.Offset = 0; NtCurrentTeb()->GdiBatchCount = 0; - break; + break; - default: - return FALSE; - } + default: + return FALSE; + } - // Very simple, the list will fill itself as it is needed. + // Very simple, the list will fill itself as it is needed. if(!SetStockObjects) { RtlZeroMemory( &stock_objects, NB_STOCK_OBJECTS); //Assume Ros is dirty. SetStockObjects = TRUE; } - return TRUE; + return TRUE; } /* EOF */ Modified: branches/win32k-gdi-dx/dll/win32/gdi32/misc/gdientry.c URL: http://svn.reactos.org/svn/reactos/branches/win32k-gdi-dx/dll/win32/gdi32/m… ============================================================================== --- branches/win32k-gdi-dx/dll/win32/gdi32/misc/gdientry.c [iso-8859-1] (original) +++ branches/win32k-gdi-dx/dll/win32/gdi32/misc/gdientry.c [iso-8859-1] Sat May 24 03:08:10 2008 @@ -2072,3 +2072,4 @@ + Modified: branches/win32k-gdi-dx/dll/win32/gdi32/misc/stubs.c URL: http://svn.reactos.org/svn/reactos/branches/win32k-gdi-dx/dll/win32/gdi32/m… ============================================================================== --- branches/win32k-gdi-dx/dll/win32/gdi32/misc/stubs.c [iso-8859-1] (original) +++ branches/win32k-gdi-dx/dll/win32/gdi32/misc/stubs.c [iso-8859-1] Sat May 24 03:08:10 2008 @@ -2325,3 +2325,12 @@ return 0; } +DWORD +WINAPI +D3DKMTOpenAdapterFromGdiDisplayName(DWORD x1) +{ + UNIMPLEMENTED; + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return 0; +} + 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] Sat May 24 03:08:10 2008 @@ -729,7 +729,7 @@ 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 NtGdiDDCCIGetVCPFeature(DWORD x1, DWORD x2, DWORD x3, DWORD x4, DWORD x5); DWORD STDCALL NtGdiDDCCISaveCurrentSettings(DWORD x1); DWORD STDCALL NtGdiDDCCISetVCPFeature(DWORD x1, DWORD x2, DWORD x3); Modified: 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 [iso-8859-1] (original) +++ branches/win32k-gdi-dx/subsystems/win32/win32k/ntddraw/d3dkmt.c [iso-8859-1] Sat May 24 03:08:10 2008 @@ -100,10 +100,12 @@ return 0; } +DWORD +STDCALL NtGdiDdDDIDestroyContext(DWORD x1) { UNIMPLEMENTED; - return 0; + return 0; } DWORD @@ -196,7 +198,7 @@ DWORD STDCALL -NtGdiDdDDIGetProcessSchedulingPriorityClass +NtGdiDdDDIGetProcessSchedulingPriorityClass(DWORD x1, DWORD x2) { UNIMPLEMENTED; return 0; @@ -372,7 +374,7 @@ DWORD STDCALL -NtGdiDdDDISetProcessSchedulingPriorityClass(DWORD x1, x2) +NtGdiDdDDISetProcessSchedulingPriorityClass(DWORD x1, DWORD x2) { UNIMPLEMENTED; return 0; @@ -407,7 +409,7 @@ NtGdiDdDDISharedPrimaryUnLockNotification(DWORD x1) { UNIMPLEMENTED; - return 0 + return 0; } DWORD @@ -415,7 +417,7 @@ NtGdiDdDDISignalSynchronizationObject(DWORD x1) { UNIMPLEMENTED; - return 0 + return 0; } DWORD @@ -423,7 +425,7 @@ NtGdiDdDDIUnlock(DWORD x1) { UNIMPLEMENTED; - return 0 + return 0; } DWORD @@ -484,7 +486,7 @@ DWORD STDCALL -NtGdiDDCCIGetVCPFeature(DWORD x1, DWORD x2, DWORD x3, DWORD x4) +NtGdiDDCCIGetVCPFeature(DWORD x1, DWORD x2, DWORD x3, DWORD x4, DWORD x5) { UNIMPLEMENTED; return 0; @@ -498,10 +500,9 @@ return 0; } -DWORD -STDCALL -NtGdiDDCCISetVCPFeature(DWORD x1, DWORD x2, DWORD x3) -{ - UNIMPLEMENTED; - return 0; -} +DWORD STDCALL NtGdiDDCCISetVCPFeature(DWORD x1, DWORD x2, DWORD x3) +{ + 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] Sat May 24 03:08:10 2008 @@ -721,7 +721,7 @@ NtGdiDdDDISetDisplayMode 1 NtGdiDdDDISetDisplayPrivateDriverFormat 1 NtGdiDdDDISetGammaRamp 1 -NtGdiDdDDISetProcessSchedulingPriorityClass 1 +NtGdiDdDDISetProcessSchedulingPriorityClass 2 NtGdiDdDDISetQueuedLimit 1 NtGdiDdDDISetVidPnSourceOwner 1 NtGdiDdDDISharedPrimaryLockNotification 1 @@ -735,7 +735,7 @@ NtGdiDDCCIGetCapabilitiesString 3 NtGdiDDCCIGetCapabilitiesStringLength 2 NtGdiDDCCIGetTimingReport 2 -NtGdiDDCCIGetVCPFeature 4 +NtGdiDDCCIGetVCPFeature 5 NtGdiDDCCISaveCurrentSettings 1 NtGdiDDCCISetVCPFeature 3 #

1 0

[greatlrd] 33668: add d3dkmt.c to win32k and fixed some typo for vista prototype
by greatlrd＠svn.reactos.org 24 May '08

24 May '08

Author: greatlrd Date: Sat May 24 01:54:59 2008 New Revision: 33668 URL: http://svn.reactos.org/svn/reactos?rev=33668&view=rev Log: add d3dkmt.c to win32k and fixed some typo for vista prototype Modified: branches/win32k-gdi-dx/subsystems/win32/win32k/ntddraw/d3dkmt.c branches/win32k-gdi-dx/subsystems/win32/win32k/stubs/stubs.c branches/win32k-gdi-dx/subsystems/win32/win32k/win32k.rbuild Modified: 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 [iso-8859-1] (original) +++ branches/win32k-gdi-dx/subsystems/win32/win32k/ntddraw/d3dkmt.c [iso-8859-1] Sat May 24 01:54:59 2008 @@ -17,12 +17,402 @@ 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 -NtGdiDdDDICheckMonitorPowerState(DWORD x1) +NtGdiDdDDISignalSynchronizationObject(DWORD x1) { UNIMPLEMENTED; return 0 @@ -30,7 +420,7 @@ DWORD STDCALL -NtGdiDdDDICheckOcclusion(DWORD x1) +NtGdiDdDDIUnlock(DWORD x1) { UNIMPLEMENTED; return 0 @@ -38,400 +428,10 @@ 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 + return 0; } DWORD @@ -439,7 +439,7 @@ NtGdiDdDDIWaitForIdle(DWORD x1) { UNIMPLEMENTED; - return 0 + return 0; } DWORD @@ -447,7 +447,7 @@ NtGdiDdDDIWaitForSynchronizationObject(DWORD x1) { UNIMPLEMENTED; - return 0 + return 0; } DWORD @@ -455,7 +455,7 @@ NtGdiDdDDIWaitForVerticalBlankEvent(DWORD x1) { UNIMPLEMENTED; - return 0 + return 0; } DWORD @@ -463,7 +463,7 @@ NtGdiDDCCIGetCapabilitiesString(DWORD x1, DWORD x2, DWORD x3) { UNIMPLEMENTED; - return 0 + return 0; } DWORD @@ -471,7 +471,7 @@ NtGdiDDCCIGetCapabilitiesStringLength(DWORD x1, DWORD x2) { UNIMPLEMENTED; - return 0 + return 0; } DWORD @@ -479,7 +479,7 @@ NtGdiDDCCIGetTimingReport(DWORD x1, DWORD x2) { UNIMPLEMENTED; - return 0 + return 0; } DWORD @@ -487,7 +487,7 @@ NtGdiDDCCIGetVCPFeature(DWORD x1, DWORD x2, DWORD x3, DWORD x4) { UNIMPLEMENTED; - return 0 + return 0; } DWORD @@ -495,7 +495,7 @@ NtGdiDDCCISaveCurrentSettings(DWORD x1) { UNIMPLEMENTED; - return 0 + return 0; } DWORD @@ -503,5 +503,5 @@ NtGdiDDCCISetVCPFeature(DWORD x1, DWORD x2, DWORD x3) { UNIMPLEMENTED; - return 0 -} + return 0; +} 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] Sat May 24 01:54:59 2008 @@ -2972,7 +2972,7 @@ NtGdiConfigureOPMProtectedOutput(DWORD x1, DWORD x2, DWORD x3, DWORD x4) { UNIMPLEMENTED; - return 0 + return 0; } DWORD @@ -2980,5 +2980,5 @@ NtGdiCreateOPMProtectedOutputs(DWORD x1, DWORD x2, DWORD x3, DWORD x4, DWORD x5) { UNIMPLEMENTED; - return 0 -} + return 0; +} Modified: branches/win32k-gdi-dx/subsystems/win32/win32k/win32k.rbuild URL: http://svn.reactos.org/svn/reactos/branches/win32k-gdi-dx/subsystems/win32/… ============================================================================== --- branches/win32k-gdi-dx/subsystems/win32/win32k/win32k.rbuild [iso-8859-1] (original) +++ branches/win32k-gdi-dx/subsystems/win32/win32k/win32k.rbuild [iso-8859-1] Sat May 24 01:54:59 2008 @@ -100,6 +100,7 @@ <file>mocomp.c</file> <file>eng.c</file> <file>dxeng.c</file> + <file>d3dkmt.c</file> </directory> <directory name="ntuser"> <file>accelerator.c</file>

1 0

[greatlrd] 33667: Fixed a typo in vista prototype
by greatlrd＠svn.reactos.org 24 May '08

24 May '08

Author: greatlrd Date: Sat May 24 01:34:16 2008 New Revision: 33667 URL: http://svn.reactos.org/svn/reactos?rev=33667&view=rev Log: Fixed a typo in vista prototype Modified: branches/win32k-gdi-dx/include/reactos/win32k/ntgdityp.h 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] Sat May 24 01:34:16 2008 @@ -715,7 +715,7 @@ DWORD STDCALL NtGdiDdDDISetDisplayMode(DWORD x1); DWORD STDCALL NtGdiDdDDISetDisplayPrivateDriverFormat(DWORD x1); DWORD STDCALL NtGdiDdDDISetGammaRamp(DWORD x1); -DWORD STDCALL NtGdiDdDDISetProcessSchedulingPriorityClass(DWORD x1, x2); +DWORD STDCALL NtGdiDdDDISetProcessSchedulingPriorityClass(DWORD x1, DWORD x2); DWORD STDCALL NtGdiDdDDISetQueuedLimit(DWORD x1); DWORD STDCALL NtGdiDdDDISetVidPnSourceOwner(DWORD x1); DWORD STDCALL NtGdiDdDDISharedPrimaryLockNotification(DWORD x1);

1 0

[fireball] 33662: - msiexec is GUI app, not CUI.
by fireball＠svn.reactos.org 24 May '08

24 May '08

Author: fireball Date: Fri May 23 12:55:30 2008 New Revision: 33662 URL: http://svn.reactos.org/svn/reactos?rev=33662&view=rev Log: - msiexec is GUI app, not CUI. Modified: trunk/reactos/base/system/msiexec/msiexec.rbuild Modified: trunk/reactos/base/system/msiexec/msiexec.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/msiexec/msiexe… ============================================================================== --- trunk/reactos/base/system/msiexec/msiexec.rbuild [iso-8859-1] (original) +++ trunk/reactos/base/system/msiexec/msiexec.rbuild [iso-8859-1] Fri May 23 12:55:30 2008 @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> -<module name="msiexec" type="win32cui" installbase="system32" installname="msiexec.exe" allowwarnings="true"> +<module name="msiexec" type="win32gui" installbase="system32" installname="msiexec.exe" allowwarnings="true"> <include base="msiexec">.</include> <include base="ReactOS">include/wine</include> <define name="_WIN32_IE">0x501</define>

2 1

[greatlrd] 33666: Fixed at typo from me thx Daniel Zimmermann (netzimme at aim dot com) that notes it.
by greatlrd＠svn.reactos.org 23 May '08

23 May '08

Author: greatlrd Date: Fri May 23 14:12:07 2008 New Revision: 33666 URL: http://svn.reactos.org/svn/reactos?rev=33666&view=rev Log: Fixed at typo from me thx Daniel Zimmermann (netzimme at aim dot com) that notes it. Modified: trunk/reactos/subsystems/win32/win32k/ntuser/menu.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/menu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/menu.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/menu.c [iso-8859-1] Fri May 23 14:12:07 2008 @@ -1683,7 +1683,7 @@ PWINDOW_OBJECT WindowObject; TITLEBARINFO bartitleinfo; DECLARE_RETURN(BOOLEAN); - BOOLEAN retValue = FALSE; + BOOLEAN retValue = TRUE; DPRINT("Enter NtUserGetTitleBarInfo\n"); UserEnterExclusive(); @@ -1712,7 +1712,7 @@ /* Get the tile bar info */ if (retValue) { - retValue = intGetTitleBarInfo(WindowObject, &bartitleinfo); + retValue = intGetTitleBarInfo(WindowObject, &bartitleinfo); if (retValue) { _SEH_TRY

1 0

[greatlrd] 33665: add test for NtUserGetTitleBarInfo patch by Daniel Zimmermann (netzimme at aim dot com) tested on xp sp3 by me See issue #3266 for more details.
by greatlrd＠svn.reactos.org 23 May '08

23 May '08

Author: greatlrd Date: Fri May 23 13:22:39 2008 New Revision: 33665 URL: http://svn.reactos.org/svn/reactos?rev=33665&view=rev Log: add test for NtUserGetTitleBarInfo patch by Daniel Zimmermann (netzimme at aim dot com) tested on xp sp3 by me See issue #3266 for more details. Added: trunk/rostests/apitests/w32knapi/ntuser/NtUserGetTitleBarInfo.c (with props) Modified: trunk/rostests/apitests/w32knapi/testlist.c Added: trunk/rostests/apitests/w32knapi/ntuser/NtUserGetTitleBarInfo.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32knapi/ntuser/… ============================================================================== --- trunk/rostests/apitests/w32knapi/ntuser/NtUserGetTitleBarInfo.c (added) +++ trunk/rostests/apitests/w32knapi/ntuser/NtUserGetTitleBarInfo.c [iso-8859-1] Fri May 23 13:22:39 2008 @@ -1,0 +1,40 @@ +INT +Test_NtUserGetTitleBarInfo(PTESTINFO pti) +{ + HWND hWnd; + TITLEBARINFO tbi; + + hWnd = CreateWindowA("BUTTON", + "Test", + BS_PUSHBUTTON | WS_VISIBLE, + 0, + 0, + 50, + 30, + NULL, + NULL, + g_hInstance, + 0); + + ASSERT(hWnd); + + /* FALSE case */ + /* no windows handle */ + TEST(NtUserGetTitleBarInfo(NULL, &tbi) == FALSE); + /* no TITLEBARINFO struct */ + TEST(NtUserGetTitleBarInfo(hWnd, NULL) == FALSE); + /* nothing */ + TEST(NtUserGetTitleBarInfo(NULL, NULL) == FALSE); + /* wrong size */ + tbi.cbSize = 0; + TEST(NtUserGetTitleBarInfo(hWnd, &tbi) == FALSE); + + /* TRUE case */ + tbi.cbSize = sizeof(TITLEBARINFO); + TEST(NtUserGetTitleBarInfo(hWnd, &tbi) == TRUE); + + DestroyWindow(hWnd); + + return APISTATUS_NORMAL; +} + Propchange: trunk/rostests/apitests/w32knapi/ntuser/NtUserGetTitleBarInfo.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rostests/apitests/w32knapi/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32knapi/testlis… ============================================================================== --- trunk/rostests/apitests/w32knapi/testlist.c [iso-8859-1] (original) +++ trunk/rostests/apitests/w32knapi/testlist.c [iso-8859-1] Fri May 23 13:22:39 2008 @@ -41,6 +41,7 @@ #include "ntuser/NtUserScrollDC.c" #include "ntuser/NtUserSystemParametersInfo.c" #include "ntuser/NtUserToUnicodeEx.c" +#include "ntuser/NtUserGetTitleBarInfo.c" /* The List of tests */ TESTENTRY TestList[] = @@ -86,7 +87,8 @@ { L"NtUserRedrawWindow", Test_NtUserRedrawWindow }, { L"NtUserScrollDC", Test_NtUserScrollDC }, { L"NtUserSystemParametersInfo", Test_NtUserSystemParametersInfo }, - { L"NtUserToUnicodeEx", Test_NtUserToUnicodeEx } + { L"NtUserToUnicodeEx", Test_NtUserToUnicodeEx }, + { L"NtUserGetTitleBarInfo", Test_NtUserGetTitleBarInfo } }; /* The function that gives us the number of tests */ @@ -95,3 +97,4 @@ return sizeof(TestList) / sizeof(TESTENTRY); } +

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs