Commit in reactos/lib/shell32 on MAIN
autocomplete.c+31.4 -> 1.5
brsfolder.c+21.3 -> 1.4
cpanelfolder.c+21.6 -> 1.7
dataobject.c+21.2 -> 1.3
dragdrophelper.c+21.2 -> 1.3
enumidlist.c+31.7 -> 1.8
folders.c+21.9 -> 1.10
iconcache.c+31.8 -> 1.9
memorystream.c+21.4 -> 1.5
pidl.c+21.25 -> 1.26
shell32_main.c+21.10 -> 1.11
shelllink.c+31.22 -> 1.23
shellole.c+21.8 -> 1.9
shellord.c+31.9 -> 1.10
shfldr_desktop.c+21.11 -> 1.12
shfldr_fs.c+21.11 -> 1.12
shfldr_mycomp.c+21.13 -> 1.14
shlexec.c+21.41 -> 1.42
shlfolder.c+21.12 -> 1.13
shlfsbind.c+21.7 -> 1.8
shlmenu.c+21.2 -> 1.3
shv_bg_cmenu.c+21.4 -> 1.5
shv_item_cmenu.c+21.4 -> 1.5
+51
23 modified files
Francois Gouget <fgouget@free.fr>
-Don't define COBJMACROS in objbase.h.
Update the Wine sources accordingly.
reactos/lib/shell32
autocomplete.c 1.4 -> 1.5
diff -u -r1.4 -r1.5
--- autocomplete.c	22 Sep 2004 19:46:52 -0000	1.4
+++ autocomplete.c	7 Oct 2004 09:13:56 -0000	1.5
@@ -38,6 +38,9 @@

 #include <stdarg.h>
 #include <stdlib.h>
 #include <string.h>

+
+#define COBJMACROS
+

 #include "wine/debug.h"
 #include "windef.h"
 #include "winbase.h"
reactos/lib/shell32
brsfolder.c 1.3 -> 1.4
diff -u -r1.3 -r1.4
--- brsfolder.c	30 Jun 2004 20:42:18 -0000	1.3
+++ brsfolder.c	7 Oct 2004 09:13:56 -0000	1.4
@@ -23,8 +23,10 @@

 #include <stdlib.h>
 #include <string.h>
 

+#define COBJMACROS

 #define NONAMELESSUNION
 #define NONAMELESSSTRUCT

+

 #include "wine/debug.h"
 #include "undocshell.h"
 #include "shlguid.h"
reactos/lib/shell32
cpanelfolder.c 1.6 -> 1.7
diff -u -r1.6 -r1.7
--- cpanelfolder.c	21 Sep 2004 19:34:21 -0000	1.6
+++ cpanelfolder.c	7 Oct 2004 09:13:56 -0000	1.7
@@ -26,8 +26,10 @@

 #include <stdarg.h>
 #include <stdio.h>
 

+#define COBJMACROS

 #define NONAMELESSUNION
 #define NONAMELESSSTRUCT

+

 #include "winerror.h"
 #include "windef.h"
 #include "winbase.h"
reactos/lib/shell32
dataobject.c 1.2 -> 1.3
diff -u -r1.2 -r1.3
--- dataobject.c	20 Sep 2004 09:18:52 -0000	1.2
+++ dataobject.c	7 Oct 2004 09:13:56 -0000	1.3
@@ -21,8 +21,10 @@

  */
 #include <string.h>
 

+#define COBJMACROS

 #define NONAMELESSUNION
 #define NONAMELESSSTRUCT

+

 #include "windef.h"
 #include "wingdi.h"
 #include "pidl.h"
reactos/lib/shell32
dragdrophelper.c 1.2 -> 1.3
diff -u -r1.2 -r1.3
--- dragdrophelper.c	20 Sep 2004 09:18:52 -0000	1.2
+++ dragdrophelper.c	7 Oct 2004 09:13:56 -0000	1.3
@@ -25,6 +25,8 @@

 #include <stdarg.h>
 #include <string.h>
 

+#define COBJMACROS
+

 #include "windef.h"
 #include "winbase.h"
 #include "winreg.h"
reactos/lib/shell32
enumidlist.c 1.7 -> 1.8
diff -u -r1.7 -r1.8
--- enumidlist.c	20 Sep 2004 09:18:52 -0000	1.7
+++ enumidlist.c	7 Oct 2004 09:13:56 -0000	1.8
@@ -21,6 +21,9 @@

 #include <stdarg.h>
 #include <stdlib.h>
 #include <string.h>

+
+#define COBJMACROS
+

 #include "wine/debug.h"
 #include "windef.h"
 #include "winbase.h"
reactos/lib/shell32
folders.c 1.9 -> 1.10
diff -u -r1.9 -r1.10
--- folders.c	4 Oct 2004 19:41:31 -0000	1.9
+++ folders.c	7 Oct 2004 09:13:56 -0000	1.10
@@ -25,6 +25,8 @@

 #include <stdio.h>
 #include <string.h>
 

+#define COBJMACROS
+

 #include "windef.h"
 #include "winbase.h"
 #include "winerror.h"
reactos/lib/shell32
iconcache.c 1.8 -> 1.9
diff -u -r1.8 -r1.9
--- iconcache.c	23 Sep 2004 06:48:09 -0000	1.8
+++ iconcache.c	7 Oct 2004 09:13:56 -0000	1.9
@@ -27,6 +27,9 @@

 #ifdef HAVE_UNISTD_H
 # include <unistd.h>
 #endif

+
+#define COBJMACROS
+

 #include "windef.h"
 #include "winbase.h"
 #include "wingdi.h"
reactos/lib/shell32
memorystream.c 1.4 -> 1.5
diff -u -r1.4 -r1.5
--- memorystream.c	21 Sep 2004 19:44:19 -0000	1.4
+++ memorystream.c	7 Oct 2004 09:13:56 -0000	1.5
@@ -29,6 +29,8 @@

 #include <stdarg.h>
 #include <string.h>
 

+#define COBJMACROS
+

 #include "windef.h"
 #include "winbase.h"
 #include "winerror.h"
reactos/lib/shell32
pidl.c 1.25 -> 1.26
diff -u -r1.25 -r1.26
--- pidl.c	21 Sep 2004 19:38:17 -0000	1.25
+++ pidl.c	7 Oct 2004 09:13:56 -0000	1.26
@@ -30,8 +30,10 @@

 #include <stdlib.h>
 #include <string.h>
 

+#define COBJMACROS

 #define NONAMELESSUNION
 #define NONAMELESSSTRUCT

+

 #include "windef.h"
 #include "winbase.h"
 #include "winreg.h"
reactos/lib/shell32
shell32_main.c 1.10 -> 1.11
diff -u -r1.10 -r1.11
--- shell32_main.c	22 Sep 2004 19:46:52 -0000	1.10
+++ shell32_main.c	7 Oct 2004 09:13:56 -0000	1.11
@@ -26,6 +26,8 @@

 #include <stdarg.h>
 #include <stdio.h>
 

+#define COBJMACROS
+

 #include "windef.h"
 #include "winbase.h"
 #include "winerror.h"
reactos/lib/shell32
shelllink.c 1.22 -> 1.23
diff -u -r1.22 -r1.23
--- shelllink.c	5 Oct 2004 20:58:38 -0000	1.22
+++ shelllink.c	7 Oct 2004 09:13:56 -0000	1.23
@@ -38,6 +38,9 @@

 #ifdef HAVE_SYS_WAIT_H
 # include <sys/wait.h>
 #endif

+
+#define COBJMACROS
+

 #include "wine/debug.h"
 #include "winerror.h"
 #include "windef.h"
reactos/lib/shell32
shellole.c 1.8 -> 1.9
diff -u -r1.8 -r1.9
--- shellole.c	20 Sep 2004 18:55:21 -0000	1.8
+++ shellole.c	7 Oct 2004 09:13:56 -0000	1.9
@@ -25,6 +25,8 @@

 #include <stdlib.h>
 #include <string.h>
 

+#define COBJMACROS
+

 #include "windef.h"
 #include "winbase.h"
 #include "shellapi.h"
reactos/lib/shell32
shellord.c 1.9 -> 1.10
diff -u -r1.9 -r1.10
--- shellord.c	20 Sep 2004 18:45:00 -0000	1.9
+++ shellord.c	7 Oct 2004 09:13:56 -0000	1.10
@@ -24,6 +24,9 @@

 #include <string.h>
 #include <stdarg.h>
 #include <stdio.h>

+
+#define COBJMACROS
+

 #include "winerror.h"
 #include "windef.h"
 #include "winbase.h"
reactos/lib/shell32
shfldr_desktop.c 1.11 -> 1.12
diff -u -r1.11 -r1.12
--- shfldr_desktop.c	20 Sep 2004 17:42:57 -0000	1.11
+++ shfldr_desktop.c	7 Oct 2004 09:13:56 -0000	1.12
@@ -28,8 +28,10 @@

 #include <stdarg.h>
 #include <stdio.h>
 

+#define COBJMACROS

 #define NONAMELESSUNION
 #define NONAMELESSSTRUCT

+

 #include "winerror.h"
 #include "windef.h"
 #include "winbase.h"
reactos/lib/shell32
shfldr_fs.c 1.11 -> 1.12
diff -u -r1.11 -r1.12
--- shfldr_fs.c	20 Sep 2004 17:55:16 -0000	1.11
+++ shfldr_fs.c	7 Oct 2004 09:13:56 -0000	1.12
@@ -28,8 +28,10 @@

 #include <stdarg.h>
 #include <stdio.h>
 

+#define COBJMACROS

 #define NONAMELESSUNION
 #define NONAMELESSSTRUCT

+

 #include "winerror.h"
 #include "windef.h"
 #include "winbase.h"
reactos/lib/shell32
shfldr_mycomp.c 1.13 -> 1.14
diff -u -r1.13 -r1.14
--- shfldr_mycomp.c	20 Sep 2004 15:36:07 -0000	1.13
+++ shfldr_mycomp.c	7 Oct 2004 09:13:56 -0000	1.14
@@ -28,8 +28,10 @@

 #include <stdarg.h>
 #include <stdio.h>
 

+#define COBJMACROS

 #define NONAMELESSUNION
 #define NONAMELESSSTRUCT

+

 #include "winerror.h"
 #include "windef.h"
 #include "winbase.h"
reactos/lib/shell32
shlexec.c 1.41 -> 1.42
diff -u -r1.41 -r1.42
--- shlexec.c	20 Sep 2004 15:07:21 -0000	1.41
+++ shlexec.c	7 Oct 2004 09:13:56 -0000	1.42
@@ -32,6 +32,8 @@

 #include <ctype.h>
 #include <assert.h>
 

+#define COBJMACROS
+

 #include "windef.h"
 #include "winbase.h"
 #include "winerror.h"
reactos/lib/shell32
shlfolder.c 1.12 -> 1.13
diff -u -r1.12 -r1.13
--- shlfolder.c	4 Oct 2004 19:41:31 -0000	1.12
+++ shlfolder.c	7 Oct 2004 09:13:56 -0000	1.13
@@ -30,6 +30,8 @@

 #include <stdarg.h>
 #include <stdio.h>
 

+#define COBJMACROS
+

 #include "winerror.h"
 #include "windef.h"
 #include "winbase.h"
reactos/lib/shell32
shlfsbind.c 1.7 -> 1.8
diff -u -r1.7 -r1.8
--- shlfsbind.c	20 Sep 2004 09:18:52 -0000	1.7
+++ shlfsbind.c	7 Oct 2004 09:13:56 -0000	1.8
@@ -24,6 +24,8 @@

 
 #include <stdarg.h>
 

+#define COBJMACROS
+

 #include "windef.h"
 #include "winbase.h"
 #include "winreg.h"
reactos/lib/shell32
shlmenu.c 1.2 -> 1.3
diff -u -r1.2 -r1.3
--- shlmenu.c	7 Jan 2004 07:43:19 -0000	1.2
+++ shlmenu.c	7 Oct 2004 09:13:56 -0000	1.3
@@ -21,6 +21,8 @@

 #include <stdarg.h>
 #include <string.h>
 

+#define COBJMACROS
+

 #include "windef.h"
 #include "winbase.h"
 #include "winreg.h"
reactos/lib/shell32
shv_bg_cmenu.c 1.4 -> 1.5
diff -u -r1.4 -r1.5
--- shv_bg_cmenu.c	20 Sep 2004 09:18:52 -0000	1.4
+++ shv_bg_cmenu.c	7 Oct 2004 09:13:56 -0000	1.5
@@ -20,8 +20,10 @@

  */
 #include <string.h>
 

+#define COBJMACROS

 #define NONAMELESSUNION
 #define NONAMELESSSTRUCT

+

 #include "wine/debug.h"
 
 #include "windef.h"
reactos/lib/shell32
shv_item_cmenu.c 1.4 -> 1.5
diff -u -r1.4 -r1.5
--- shv_item_cmenu.c	20 Sep 2004 09:18:52 -0000	1.4
+++ shv_item_cmenu.c	7 Oct 2004 09:13:56 -0000	1.5
@@ -20,8 +20,10 @@

 
 #include <string.h>
 

+#define COBJMACROS

 #define NONAMELESSUNION
 #define NONAMELESSSTRUCT

+

 #include "winerror.h"
 #include "wine/debug.h"
CVSspam 0.2.8