Resubmitting because I forgot to attach the file. Sorry. I'm also sorry about
the large number of posts today. I got wine compiled and working with the Forte
compiler (as you might have guessed) and wanted to submit a lot of the necessary
changes. Most of these changes are trivial, and should have no effect on gcc or
other compilers.
changelog: include/shlwapi.h include/wine/obj_shellfolder.h
- Removed extra , from last element in enum declarations
Gregg Mattinson
Co-op Developer
Sun Microsystems of Canada
Index: include/shlwapi.h
===================================================================
RCS file: /opcom/comp/ws/wine/CVSROOT/wine/include/shlwapi.h,v
retrieving revision 1.1
diff -u -r1.1 shlwapi.h
--- /tmp/T0UtaiJF Tue Jul 2 13:53:08 2002
+++ shlwapi.h Thu Jun 27 15:05:02 2002
@@ -91,7 +91,7 @@
SHREGDEL_DEFAULT = 0,
SHREGDEL_HKCU = 0x1,
SHREGDEL_HKLM = 0x10,
- SHREGDEL_BOTH = SHREGDEL_HKLM | SHREGDEL_HKCU,
+ SHREGDEL_BOTH = SHREGDEL_HKLM | SHREGDEL_HKCU
} SHREGDEL_FLAGS;
typedef enum
@@ -99,7 +99,7 @@
SHREGENUM_DEFAULT = 0,
SHREGENUM_HKCU = 0x1,
SHREGENUM_HKLM = 0x10,
- SHREGENUM_BOTH = SHREGENUM_HKLM | SHREGENUM_HKCU,
+ SHREGENUM_BOTH = SHREGENUM_HKLM | SHREGENUM_HKCU
} SHREGENUM_FLAGS;
#define SHREGSET_HKCU 0x1 /* Apply to HKCU if empty */
@@ -408,7 +408,7 @@
URL_PART_USERNAME,
URL_PART_PASSWORD,
URL_PART_PORT,
- URL_PART_QUERY,
+ URL_PART_QUERY
} URL_PART;
#define URL_PARTFLAG_KEEPSCHEME 0x00000001
@@ -421,7 +421,7 @@
URLIS_FILEURL,
URLIS_APPLIABLE,
URLIS_DIRECTORY,
- URLIS_HASQUERY,
+ URLIS_HASQUERY
} URLIS;
/* This is used by the UrlApplyScheme... routines */
Index: include/wine/obj_shellfolder.h
===================================================================
RCS file: /opcom/comp/ws/wine/CVSROOT/wine/include/wine/obj_shellfolder.h,v
retrieving revision 1.1
diff -u -r1.1 obj_shellfolder.h
--- /tmp/T0ldaGMF Tue Jul 2 13:53:27 2002
+++ obj_shellfolder.h Tue Jul 2 11:32:51 2002
@@ -252,7 +252,7 @@
SHCOLSTATE_SLOW = 0x00000020,
SHCOLSTATE_EXTENDED = 0x00000040,
SHCOLSTATE_SECONDARYUI = 0x00000080,
- SHCOLSTATE_HIDDEN = 0x00000100,
+ SHCOLSTATE_HIDDEN = 0x00000100
} SHCOLSTATE;
typedef struct
