Module: wine Branch: refs/heads/master Commit: b4629addbd8e5fd6792db3aa54b5520309a101f0 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=b4629addbd8e5fd6792db3aa...
Author: Alexandre Julliard julliard@winehq.org Date: Fri Jun 9 21:10:25 2006 +0200
shell32: Use the standard DEFINE_GUID macro to define GUIDs.
---
dlls/shell32/regsvr.c | 3 ++- dlls/shell32/shfldr.h | 3 +++ dlls/shell32/shfldr_unixfs.c | 3 --- 3 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/dlls/shell32/regsvr.c b/dlls/shell32/regsvr.c index 5cf0dc7..1d37d4e 100644 --- a/dlls/shell32/regsvr.c +++ b/dlls/shell32/regsvr.c @@ -31,8 +31,9 @@ #include "winerror.h" #include "ole2.h" #include "shlguid.h" #include "shell32_main.h" -#include "shfldr.h" #include "shresdef.h" +#include "initguid.h" +#include "shfldr.h"
#include "wine/debug.h"
diff --git a/dlls/shell32/shfldr.h b/dlls/shell32/shfldr.h index 8fd557a..74f59d8 100644 --- a/dlls/shell32/shfldr.h +++ b/dlls/shell32/shfldr.h @@ -71,3 +71,6 @@ static inline int SHELL32_GUIDToStringW
void SHELL_FS_ProcessDisplayFilename(LPWSTR szPath, DWORD dwFlags); BOOL SHELL_FS_HideExtension(LPWSTR pwszPath); + +DEFINE_GUID( CLSID_UnixFolder, 0xcc702eb2, 0x7dc5, 0x11d9, 0xc6, 0x87, 0x00, 0x04, 0x23, 0x8a, 0x01, 0xcd ); +DEFINE_GUID( CLSID_UnixDosFolder, 0x9d20aae8, 0x0625, 0x44b0, 0x9c, 0xa7, 0x71, 0x88, 0x9c, 0x22, 0x54, 0xd9 ); diff --git a/dlls/shell32/shfldr_unixfs.c b/dlls/shell32/shfldr_unixfs.c index 4d72f97..b74b458 100644 --- a/dlls/shell32/shfldr_unixfs.c +++ b/dlls/shell32/shfldr_unixfs.c @@ -163,9 +163,6 @@ #include "pidl.h"
WINE_DEFAULT_DEBUG_CHANNEL(shell);
-const GUID CLSID_UnixFolder = {0xcc702eb2, 0x7dc5, 0x11d9, {0xc6, 0x87, 0x00, 0x04, 0x23, 0x8a, 0x01, 0xcd}}; -const GUID CLSID_UnixDosFolder = {0x9d20aae8, 0x0625, 0x44b0, {0x9c, 0xa7, 0x71, 0x88, 0x9c, 0x22, 0x54, 0xd9}}; - #define ADJUST_THIS(c,m,p) ((c*)(((long)p)-(long)&(((c*)0)->lp##m##Vtbl))) #define STATIC_CAST(i,p) ((i*)&p->lp##i##Vtbl)