Patch 16/32 cleanup in shell32

[Steven Edwards]

Changelog: Moved a few win32 functions to a better location for build a
Win32 only dll

Thanks
Steven

"Every revolution was once a thought in one man's mind"
- Ralph Waldo Emerson 

cvs diff -u shell.c 
Index: shell.c
===================================================================
RCS file: /home/wine/wine/dlls/shell32/shell.c,v
retrieving revision 1.40
diff -u -r1.40 shell.c
--- shell.c	31 May 2002 23:25:52 -0000	1.40
+++ shell.c	7 Jun 2002 04:13:00 -0000
@@ -363,41 +363,6 @@
 }
 
 
/***********************************************************************
**
- *				ExtractAssociatedIconA (SHELL32.@)
- *
- * Return icon for given file (either from file itself or from
associated
- * executable) and patch parameters if needed.
- */
-HICON WINAPI ExtractAssociatedIconA(HINSTANCE hInst, LPSTR lpIconPath,
LPWORD lpiIcon)
-{	TRACE("\n");
-	return ExtractAssociatedIcon16(hInst,lpIconPath,lpiIcon);
-}
-
-/**********************************************************************
***
- *				ExtractAssociatedIconExA (SHELL32.@)
- *
- * Return icon for given file (either from file itself or from
associated
- * executable) and patch parameters if needed.
- */
-HICON WINAPI ExtractAssociatedIconExA(DWORD d1, DWORD d2, DWORD d3,
DWORD d4)
-{
-  FIXME("(%lx %lx %lx %lx): stub\n", d1, d2, d3, d4);
-  return 0;
-}
-
-/**********************************************************************
***
- *				ExtractAssociatedIconExW (SHELL32.@)
- *
- * Return icon for given file (either from file itself or from
associated
- * executable) and patch parameters if needed.
- */
-HICON WINAPI ExtractAssociatedIconExW(DWORD d1, DWORD d2, DWORD d3,
DWORD d4)
-{
-  FIXME("(%lx %lx %lx %lx): stub\n", d1, d2, d3, d4);
-  return 0;
-}
-
-/**********************************************************************
***
  *				FindEnvironmentString	[SHELL.38]
  *
  * Returns a pointer into the DOS environment... Ugh.


cvs diff -u iconcache.c 
Index: iconcache.c
===================================================================
RCS file: /home/wine/wine/dlls/shell32/iconcache.c,v
retrieving revision 1.55
diff -u -r1.55 iconcache.c
--- iconcache.c	31 May 2002 23:25:52 -0000	1.55
+++ iconcache.c	7 Jun 2002 04:15:13 -0000
@@ -449,3 +449,38 @@
 	HeapFree(GetProcessHeap(),0,sFile);
 	return ret;
 }
+
+/**********************************************************************
***
+ *				ExtractAssociatedIconA (SHELL32.@)
+ *
+ * Return icon for given file (either from file itself or from
associated
+ * executable) and patch parameters if needed.
+ */
+HICON WINAPI ExtractAssociatedIconA(HINSTANCE hInst, LPSTR lpIconPath,
LPWORD lpiIcon)
+{	TRACE("\n");
+	return ExtractAssociatedIcon16(hInst,lpIconPath,lpiIcon);
+}
+
+/**********************************************************************
***
+ *				ExtractAssociatedIconExA (SHELL32.@)
+ *
+ * Return icon for given file (either from file itself or from
associated
+ * executable) and patch parameters if needed.
+ */
+HICON WINAPI ExtractAssociatedIconExA(DWORD d1, DWORD d2, DWORD d3,
DWORD d4)
+{
+  FIXME("(%lx %lx %lx %lx): stub\n", d1, d2, d3, d4);
+  return 0;
+}
+
+/**********************************************************************
***
+ *				ExtractAssociatedIconExW (SHELL32.@)
+ *
+ * Return icon for given file (either from file itself or from
associated
+ * executable) and patch parameters if needed.
+ */
+HICON WINAPI ExtractAssociatedIconExW(DWORD d1, DWORD d2, DWORD d3,
DWORD d4)
+{
+  FIXME("(%lx %lx %lx %lx): stub\n", d1, d2, d3, d4);
+  return 0;
+}