18 Jul
2009
18 Jul
'09
1:33 p.m.
Author: fireball
Date: Sat Jul 18 15:33:33 2009
New Revision: 42048
URL: http://svn.reactos.org/svn/reactos?rev=42048&view=rev
Log:
- Fix some of build problems related to newer headers.
Added:
branches/arwinss/reactos/subsystems/win32/win32k/include/csr.h (with props)
branches/arwinss/reactos/subsystems/win32/win32k/include/tags.h (with props)
Modified:
branches/arwinss/reactos/subsystems/win32/win32k/include/request.h
branches/arwinss/reactos/subsystems/win32/win32k/include/win32k.h
branches/arwinss/reactos/subsystems/win32/win32k/include/win32kp.h
branches/arwinss/reactos/subsystems/win32/win32k/main/init.c
branches/arwinss/reactos/subsystems/win32/win32k/win32k.rbuild
Added: branches/arwinss/reactos/subsystems/win32/win32k/include/csr.h
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3…
==============================================================================
--- branches/arwinss/reactos/subsystems/win32/win32k/include/csr.h (added)
+++ branches/arwinss/reactos/subsystems/win32/win32k/include/csr.h [iso-8859-1] Sat Jul 18
15:33:33 2009
@@ -1,0 +1,8 @@
+#ifndef __WIN32K_CSR_H
+#define __WIN32K_CSR_H
+
+/* Notifies CSR about a new desktop */
+NTSTATUS NTAPI
+CsrNotifyCreateDesktop(HDESK Desktop);
+
+#endif
Propchange: branches/arwinss/reactos/subsystems/win32/win32k/include/csr.h
------------------------------------------------------------------------------
svn:eol-style = native
Modified: branches/arwinss/reactos/subsystems/win32/win32k/include/request.h
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3…
==============================================================================
--- branches/arwinss/reactos/subsystems/win32/win32k/include/request.h [iso-8859-1]
(original)
+++ branches/arwinss/reactos/subsystems/win32/win32k/include/request.h [iso-8859-1] Sat
Jul 18 15:33:33 2009
@@ -28,6 +28,16 @@
#define DECL_HANDLER(name) \
void req_##name( const struct name##_request *req, struct name##_reply *reply )
+extern void *set_reply_data_size( void *req, data_size_t size );
+
+extern PVOID RequestData;
+
+/* get the request vararg data */
+static inline const void *get_req_data()
+{
+ return RequestData;
+}
+
/* get the request vararg size */
static inline data_size_t get_req_data_size(struct __server_request_info *req)
{
@@ -38,9 +48,26 @@
static inline void get_req_unicode_str( void *req, struct unicode_str *str )
{
struct __server_request_info *serv_req = (struct __server_request_info *)req;
- str->str = serv_req->data[0].ptr;
+ str->str = get_req_data();
str->len = (get_req_data_size(serv_req) / sizeof(WCHAR)) * sizeof(WCHAR);
}
+
+/* get the reply maximum vararg size */
+static inline data_size_t get_reply_max_size(void *req)
+{
+ struct __server_request_info *serv_req = (struct __server_request_info *)req;
+ return serv_req->u.req.request_header.reply_size;
+}
+
+/* allocate and fill the reply data */
+static inline void *set_reply_data( void *req, const void *data, data_size_t size )
+{
+ void *ret = set_reply_data_size( req, size );
+ if (ret) memcpy( ret, data, size );
+ return ret;
+}
+
+void set_reply_data_ptr( void *req, void *data, data_size_t size );
/* Everything below this line is generated automatically by tools/make_requests */
/* ### make_requests begin ### */
@@ -529,6 +556,7 @@
(req_handler)req_set_window_layered_info,
};
+#if 0
C_ASSERT( sizeof(affinity_t) == 8 );
C_ASSERT( sizeof(apc_call_t) == 40 );
C_ASSERT( sizeof(apc_param_t) == 8 );
@@ -1828,7 +1856,7 @@
C_ASSERT( FIELD_OFFSET(struct set_window_layered_info_request, alpha) == 20 );
C_ASSERT( FIELD_OFFSET(struct set_window_layered_info_request, flags) == 24 );
C_ASSERT( sizeof(struct set_window_layered_info_request) == 32 );
-
+#endif
#endif /* WANT_REQUEST_HANDLERS */
/* ### make_requests end ### */
Added: branches/arwinss/reactos/subsystems/win32/win32k/include/tags.h
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3…
==============================================================================
--- branches/arwinss/reactos/subsystems/win32/win32k/include/tags.h (added)
+++ branches/arwinss/reactos/subsystems/win32/win32k/include/tags.h [iso-8859-1] Sat Jul
18 15:33:33 2009
@@ -1,0 +1,16 @@
+#ifndef _WIN32K_TAGS_H
+#define _WIN32K_TAGS_H
+
+#define TAG_BRUSHOBJ TAG('B', 'R', 'H', 'O') /* brush
object */
+#define TAG_CLIP TAG('C', 'L', 'I', 'P') /*
clipping */
+#define TAG_CLIPOBJ TAG('C', 'L', 'P', 'O') /* clip
object */
+#define TAG_COLORMAP TAG('C', 'O', 'L', 'M') /* color
map */
+#define TAG_DFSM TAG('D', 'f', 's', 'm') /* Eng
event allocation */
+#define TAG_DIB TAG('D', 'I', 'B', ' ') /* dib
*/
+#define TAG_DRIVER TAG('G', 'D', 'R', 'V') /* video
drivers */
+#define TAG_GSEM TAG('G', 's', 'e', 'm') /* Gdi
Semaphore */
+#define TAG_PALETTE TAG('G', 'l', 'a', '8')
+#define TAG_RTLREGISTRY TAG('R', 'q', 'r', 'v') /* RTL
registry */
+#define TAG_XLATEOBJ TAG('X', 'L', 'A', 'O') /* xlate
object */
+
+#endif /* _WIN32K_TAGS_H */
Propchange: branches/arwinss/reactos/subsystems/win32/win32k/include/tags.h
------------------------------------------------------------------------------
svn:eol-style = native
Modified: branches/arwinss/reactos/subsystems/win32/win32k/include/win32k.h
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3…
==============================================================================
--- branches/arwinss/reactos/subsystems/win32/win32k/include/win32k.h [iso-8859-1]
(original)
+++ branches/arwinss/reactos/subsystems/win32/win32k/include/win32k.h [iso-8859-1] Sat Jul
18 15:33:33 2009
@@ -8,21 +8,14 @@
/* INCLUDES ******************************************************************/
-/* Version Data */
-#undef __MSVCRT__
-#include <psdk/ntverp.h>
-#define _WIN32_WINNT _WIN32_WINNT_WS03
-#define NTDDI_VERSION NTDDI_WS03SP1
-#define WINVER 0x600
+#define _NO_COM
-/* Initial DDK/IFS Headers */
-#ifdef _MSC_VER
-#include <excpt.h>
-#include <ntdef.h>
-#undef DECLSPEC_IMPORT
-#define DECLSPEC_IMPORT
-#endif
-#include <ntifs.h>
+/* DDK/NDK/SDK Headers */
+#include <ddk/ntddk.h>
+#include <ddk/ntddmou.h>
+#include <ddk/ntifs.h>
+#include <ddk/tvout.h>
+#include <ndk/ntndk.h>
/* Win32 Headers */
/* FIXME: Defines in winbase.h that we need... */
@@ -40,30 +33,14 @@
#include <prntfont.h>
#include <dde.h>
#include <wincon.h>
-
-/* This set of headers is greatly incompatible */
-/* TODO: Either fix ddrawi.h + all dependencies, or create a new temporary
- header */
#define _NOCSECT_TYPE
// #include <ddrawi.h>
-typedef LPVOID LPVIDMEM;
-typedef LPVOID LPVMEMHEAP;
-typedef LPVOID LPSURFACEALIGNMENT;
-
-/* NDK Headers */
-#include <ntndk.h>
/* SEH Support with PSEH */
-#include <pseh/pseh.h>
+#include <pseh/pseh2.h>
/* CSRSS Header */
#include <csrss/csrss.h>
-
-/* Helper Header */
-#include <reactos/helper.h>
-
-/* Probe and capture */
-#include <reactos/probe.h>
/* Public Win32K Headers */
#include <win32k/callback.h>
@@ -76,3 +53,6 @@
/* Internal Win32K Header */
#include <win32kp.h>
+
+/* Probe and capture */
+#include <reactos/probe.h>
Modified: branches/arwinss/reactos/subsystems/win32/win32k/include/win32kp.h
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3…
==============================================================================
--- branches/arwinss/reactos/subsystems/win32/win32k/include/win32kp.h [iso-8859-1]
(original)
+++ branches/arwinss/reactos/subsystems/win32/win32k/include/win32kp.h [iso-8859-1] Sat
Jul 18 15:33:33 2009
@@ -25,13 +25,13 @@
//#include <win32k/rosuser.h>
/* CSR interaction */
-//#include <csr.h>
+#include <csr.h>
#include <win32.h>
#include <heap.h>
#include <tags.h>
-#include <dib.h>
+//#include <dib.h>
/* Eng and GRE stuff */
#if 0
Modified: branches/arwinss/reactos/subsystems/win32/win32k/main/init.c
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3…
==============================================================================
--- branches/arwinss/reactos/subsystems/win32/win32k/main/init.c [iso-8859-1] (original)
+++ branches/arwinss/reactos/subsystems/win32/win32k/main/init.c [iso-8859-1] Sat Jul 18
15:33:33 2009
@@ -331,7 +331,7 @@
init_directories();
/* Initialize GDI objects implementation */
- if (!GDIOBJ_Init()) return STATUS_UNSUCCESSFUL;
+ //if (!GDIOBJ_Init()) return STATUS_UNSUCCESSFUL;
/* Init video driver implementation */
//InitDcImpl();
Modified: branches/arwinss/reactos/subsystems/win32/win32k/win32k.rbuild
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3…
==============================================================================
--- branches/arwinss/reactos/subsystems/win32/win32k/win32k.rbuild [iso-8859-1]
(original)
+++ branches/arwinss/reactos/subsystems/win32/win32k/win32k.rbuild [iso-8859-1] Sat Jul 18
15:33:33 2009
@@ -4,10 +4,17 @@
<module name="win32k" type="kernelmodedriver"
installbase="system32" installname="win32k.sys">
<importlibrary definition="win32k.def" />
<define name="_WIN32K_" />
+
+ <include base="win32k">.</include>
<include base="win32k">include</include>
- <include base="win32k" root="intermediate"></include>
- <include base="win32k"
root="intermediate">include</include>
+ <include base="win32k" root="intermediate">.</include>
+ <include base="ntoskrnl">include</include>
+ <include base="freetype">include</include>
<include base="ReactOS">include/reactos/subsys</include>
+ <include base="ReactOS">include/reactos/drivers</include>
+
+ <compilerflag compilerset="gcc">-fms-extensions</compilerflag>
+
<library>ntoskrnl</library>
<library>hal</library>
<library>freetype</library>
@@ -22,11 +29,20 @@
<file>usrheap.c</file>
</directory>
<directory name="wine">
+ <file>atom.c</file>
<file>class.c</file>
+ <file>directory.c</file>
+ <file>handle.c</file>
+ <file>hook.c</file>
<file>main.c</file>
<file>object.c</file>
+ <file>queue.c</file>
+ <file>region.c</file>
<file>stubs.c</file>
+ <file>user.c</file>
+ <file>window.c</file>
<file>winesup.c</file>
+ <file>winstation.c</file>
</directory>
<file>win32k.rc</file>
</module>