Changeset 796 for trunk/include/win/module.h

Timestamp:

Sep 2, 1999, 7:39:37 PM (26 years ago)

Author:

phaller

Message:

Fix: header fixes for src/shell32/new

File:

• trunk/include/win/module.h (modified) (8 diffs)

trunk/include/win/module.h

@@ -1 @@
-/* $Id: module.h,v 1.2 1999-06-19 13:57:50 sandervl Exp $ */
+/* $Id: module.h,v 1.3 1999-09-02 17:39:35 phaller Exp $ */
 
 /*
@@ -97 +97 @@
     FARPROC16 LoadAppSeg;    /* procedure to load a segment */
     FARPROC16 reserved2;
-    FARPROC16 MyAlloc;       /* memory allocation procedure, 
+    FARPROC16 MyAlloc;       /* memory allocation procedure,
                               * wine must write this field */
     FARPROC16 EntryAddrProc;
@@ -114 +114 @@
 } LOADPARAMS16;
 
-typedef struct 
+typedef struct
 {
     LPSTR lpEnvAddress;
@@ -163 +163 @@
 
 
-
+#ifndef __WIN32OS2__
 /* Resource types */
 typedef struct resource_typeinfo_s NE_TYPEINFO;
@@ -176 +176 @@
 #define NE_MODULE_NAME(pModule) \
     (((OFSTRUCT *)((char*)(pModule) + (pModule)->fileinfo))->szPathName)
+#endif
 
 /* module.c */
@@ -193 +194 @@
 
 /* resource.c */
-extern INT       WINAPI AccessResource(HMODULE,HRSRC); 
-
+extern INT       WINAPI AccessResource(HMODULE,HRSRC);
+
+#ifndef __WIN32OS2__
 /* loader/ne/module.c */
 extern NE_MODULE *NE_GetPtr( HMODULE16 hModule );
@@ -206 +208 @@
 extern HANDLE NE_OpenFile( NE_MODULE *pModule );
 extern HINSTANCE16 MODULE_LoadModule16( LPCSTR name, BOOL implicit );
-extern BOOL NE_CreateProcess( HFILE hFile, OFSTRUCT *ofs, LPCSTR cmd_line, LPCSTR env, 
+extern BOOL NE_CreateProcess( HFILE hFile, OFSTRUCT *ofs, LPCSTR cmd_line, LPCSTR env,
                               LPSECURITY_ATTRIBUTES psa, LPSECURITY_ATTRIBUTES tsa,
                               BOOL inherit, LPSTARTUPINFOA startup,
@@ -246 +248 @@
 /* if1632/builtin.c */
 extern HMODULE16 (*fnBUILTIN_LoadModule)(LPCSTR name, BOOL force);
+#endif
 
 #endif  /* __WINE_MODULE_H */