Sync to Wine-20041019

svn path=/trunk/; revision=11350

reactos/lib/shell32/Makefile.in

@@ -6,10 +6,7 @@ VPATH     = @srcdir@
 MODULE    = shell32.dll
 IMPORTS   = shlwapi comctl32 user32 gdi32 advapi32 kernel32
 DELAYIMPORTS = ole32
-ALTNAMES  = shell.dll
+EXTRALIBS = -luuid $(LIBUNICODE)
-EXTRALIBS = $(LIBUUID) $(LIBUNICODE)
-
-SPEC_SRCS16 = $(ALTNAMES:.dll=.spec)
 
 C_SRCS = \
 	authors.c \
@@ -54,20 +51,21 @@ C_SRCS = \
 RC_SRCS = shres.rc
 RC_BINSRC = shres.rc
 RC_BINARIES = \
+	cdrom.ico \
 	desktop.ico \
 	document.ico \
 	drive.ico \
+	floppy.ico \
 	folder.ico \
 	folder_open.ico \
-	floppy.ico \
+	mycomputer.ico \
 	netdrive.ico \
 	netdrive2.ico \
-	cdrom.ico \
+	ramdisk.ico
-	ramdisk.ico \
-	mycomputer.ico
 
 C_SRCS16  = shell.c
 RC_SRCS16 = version16.rc
+SPEC_SRCS16 = shell.spec
 
 SUBDIRS = tests
 

reactos/lib/shell32/shell32.spec

@@ -52,7 +52,7 @@
   56 stdcall PathUnquoteSpaces(str) PathUnquoteSpacesAW
   57 stdcall PathGetDriveNumber (str) PathGetDriveNumberAW
   58 stdcall ParseField(str long ptr long) ParseFieldAW
-  59 stdcall RestartDialog(long long long)
+  59 stdcall RestartDialog(long wstr long)
   60 stdcall ExitWindowsDialog(long)
   61 stdcall RunFileDlg(long long long str str long)
   62 stdcall PickIconDlg(long long long long)
@@ -83,7 +83,7 @@
   87 stdcall SHRevokeDragDrop(long)
   88 stdcall SHDoDragDrop(long ptr ptr long ptr)
   89 stdcall SHCloneSpecialIDList(long long long)
-  90 stub SHFindFiles
+  90 stdcall SHFindFiles(ptr ptr)
   91 stub SHFindComputer
   92 stdcall PathGetShortPath (ptr) PathGetShortPathAW
   93 stdcall Win32CreateDirectory(wstr ptr) Win32CreateDirectoryAW
@@ -282,11 +282,11 @@
  511 stdcall SHRegQueryValueExW (long wstr ptr ptr ptr ptr)
  512 stdcall SHRegDeleteKeyW (long wstr)
 
- 520 stdcall -noname SHAllocShared (long long long)
+ 520 stdcall -noname SHAllocShared (ptr long long)
  521 stdcall -noname SHLockShared (long long)
- 522 stdcall -noname SHUnlockShared (long)
+ 522 stdcall -noname SHUnlockShared (ptr)
  523 stdcall -noname SHFreeShared (long long)
- 524 stub RealDriveType
+ 524 stdcall RealDriveType (long long)
  525 stub RealDriveTypeFlags
 
  640 stdcall NTSHChangeNotifyRegister (long long long long long long)
@@ -313,8 +313,7 @@
 
 # >= NT5
  714 stdcall @(ptr)SHELL32_714 # PathIsTemporaryW
-
+ 730 stdcall RestartDialogEx(long wstr long long)
- 730 stdcall RestartDialogEx(long long long long)
 
 1217 stub FOOBAR1217   # no joke! This is the real name!!
 

reactos/lib/shell32/shellfolder.h

@@ -33,7 +33,6 @@
  * Predeclare the interfaces
  */
 DEFINE_GUID(IID_ISFHelper, 0x1fe68efbL, 0x1874, 0x9812, 0x56, 0xdc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00);
-typedef struct ISFHelper *LPISFHELPER;
 
 /*****************************************************************************
  * ISFHelper interface

reactos/lib/shell32/shlview.c

@@ -2314,7 +2314,7 @@ static HRESULT WINAPI ISVViewObject_Draw(
 	LPCRECTL lprcBounds,
 	LPCRECTL lprcWBounds,
 	BOOL (CALLBACK *pfnContinue)(ULONG_PTR dwContinue),
-	DWORD dwContinue)
+	ULONG_PTR dwContinue)
 {
 
 	_ICOM_THIS_From_IViewObject(IShellViewImpl, iface);