Changeset 5311 for trunk/include

Timestamp:

Mar 14, 2001, 12:13:28 AM (25 years ago)

Author:

hugh

Message:

Synced with WINE

Location:

trunk/include/win

Files:

• dplay.h (modified) (9 diffs)
• dplobby.h (modified) (7 diffs)

trunk/include/win/dplay.h

@@ -1 @@
-// $Id: dplay.h,v 1.6 2000-10-02 17:37:41 sandervl Exp $
+// $Id: dplay.h,v 1.7 2001-03-13 23:13:26 hugh Exp $
 #ifndef __WINE_DPLAY_H
 #define __WINE_DPLAY_H
-
-/* FIXME: GCC doesn't yet support annon structures so some of the structures defined here don't match the sdk exactly.
- * I've tried to come up with suitably terse names, but this file won't cut it for inclusion into a WineLib app.
- */
 
 #include "wine/obj_base.h"
@@ -182 +178 @@
         LPWSTR  lpszShortName;
         LPSTR   lpszShortNameA;
-    }psn;
+    } DUMMYUNIONNAME1;
 
     union /*playerLongName */       /* Player's formal/real name */
@@ -188 +184 @@
         LPWSTR  lpszLongName;
         LPSTR   lpszLongNameA;
-    }pln;
+    } DUMMYUNIONNAME2;
 
 } DPNAME, *LPDPNAME;
@@ -232 +228 @@
         LPWSTR  lpszSessionName;
         LPSTR   lpszSessionNameA;
-    }sess;
+    } DUMMYUNIONNAME1;
 
     union  /* Optional password */
@@ -238 +234 @@
         LPWSTR  lpszPassword;
         LPSTR   lpszPasswordA;
-    }pass;
+    } DUMMYUNIONNAME2;
 
     DWORD   dwReserved1;
@@ -289 +285 @@
         LPWSTR  lpszMessage;   /* Unicode */
         LPSTR   lpszMessageA;  /* ANSI */
-    }msgstr;
+    } DUMMYUNIONNAME;
 } DPCHAT, *LPDPCHAT;
 
@@ -307 +303 @@
         LPWSTR  lpszSSPIProvider;   /* Unicode */
         LPSTR   lpszSSPIProviderA;  /* ANSI */
-    }sspi;
+    } DUMMYUNIONNAME1;
     union
     {                               /* CAPI provider name */
         LPWSTR lpszCAPIProvider;    /* Unicode */
         LPSTR  lpszCAPIProviderA;   /* ANSI */
-    }capi;
+    } DUMMYUNIONNAME2;
     DWORD dwCAPIProviderType;       /* Crypto Service Provider type */
     DWORD dwEncryptionAlgorithm;    /* Encryption Algorithm type */
@@ -327 +323 @@
         LPWSTR  lpszUsername;   /* Unicode */
         LPSTR   lpszUsernameA;  /* ANSI */
-    }name;
+    } DUMMYUNIONNAME1;
     union
     {                           /* Password of the account */
         LPWSTR  lpszPassword;   /* Unicode */
         LPSTR   lpszPasswordA;  /* ANSI */
-    }pass;
+    } DUMMYUNIONNAME2;
     union
     {                           /* Domain name of the account */
         LPWSTR  lpszDomain;     /* Unicode */
         LPSTR   lpszDomainA;    /* ANSI */
-    }domain;
+    } DUMMYUNIONNAME3;
 } DPCREDENTIALS, *LPDPCREDENTIALS;
 
@@ -358 +354 @@
     LPVOID      lpContext);     /* User given */
 
-typedef const GUID   *LPCGUID;
+#ifndef __LPCGUID_DEFINED__
+#define __LPCGUID_DEFINED__
+typedef const GUID *LPCGUID;
+#endif
 
 typedef const DPNAME *LPCDPNAME;

trunk/include/win/dplobby.h

@@ -1 @@
-// $Id: dplobby.h,v 1.5 2000-10-02 17:37:42 sandervl Exp $
+// $Id: dplobby.h,v 1.6 2001-03-13 23:13:27 hugh Exp $
 #ifndef __WINE_DPLOBBY_H
 #define __WINE_DPLOBBY_H
@@ -276 +276 @@
         LPSTR   lpszAppNameA;
         LPWSTR  lpszAppName;
-    } appName;
+    } DUMMYUNIONNAME;
 
 } DPLAPPINFO, *LPDPLAPPINFO;
@@ -298 +298 @@
         LPSTR       lpszApplicationNameA;
         LPWSTR      lpszApplicationName;
-    } appName;
+    } DUMMYUNIONNAME1;
 
     GUID        guidApplication;
@@ -306 +306 @@
         LPSTR       lpszFilenameA;
         LPWSTR      lpszFilename;
-    } fileName;
+    } DUMMYUNIONNAME2;
 
     union
@@ -312 +312 @@
         LPSTR       lpszCommandLineA;
         LPWSTR      lpszCommandLine;
-    } cmdLine;
+    } DUMMYUNIONNAME3;
 
     union
@@ -318 +318 @@
         LPSTR       lpszPathA;
         LPWSTR      lpszPath;
-    } path;
+    } DUMMYUNIONNAME4;
 
     union
@@ -324 +324 @@
         LPSTR       lpszCurrentDirectoryA;
         LPWSTR      lpszCurrentDirectory;
-    } curDir;
+    } DUMMYUNIONNAME5;
 
     LPSTR       lpszDescriptionA;