- Imported dciman32.dll from Wine HEAD

- Added it to bootcd
- Update README.WINE

svn path=/trunk/; revision=33670

reactos/baseaddress.rbuild

@@ -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" />

reactos/boot/bootdata/packages/reactos.dff

@@ -237,6 +237,7 @@ dll\win32\cryptdll\cryptdll.dll                     1
 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

reactos/dll/win32/dciman32/dciman32.rbuild

@@ -0,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>

reactos/dll/win32/dciman32/dciman32.spec

@@ -0,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

reactos/dll/win32/dciman32/dciman_main.c

@@ -0,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;
+}

reactos/dll/win32/win32.rbuild

@@ -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>

reactos/include/psdk/dciddi.h

@@ -0,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 */

reactos/include/psdk/dciman.h

@@ -0,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 */

reactos/media/doc/README.WINE

@@ -44,6 +44,7 @@ reactos/dll/win32/crypt32         # Out of sync
 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