From eec6585a27d0830b43be063a69a509aa6a8e6fa0 Mon Sep 17 00:00:00 2001
From: Steven Edwards <Steven_Ed4153@yahoo.com>
Date: Fri, 21 Jun 2002 20:08:50 +0000
Subject: [PATCH] Moved a few win32 functions to a better location for building
 a Win32 only dll.

---
 dlls/shell32/iconcache.c | 35 +++++++++++++++++++++++++++++++++++
 dlls/shell32/shell.c     | 35 -----------------------------------
 2 files changed, 35 insertions(+), 35 deletions(-)

diff --git a/dlls/shell32/iconcache.c b/dlls/shell32/iconcache.c
index 751265e6a30..009c95cfc5d 100644
--- a/dlls/shell32/iconcache.c
+++ b/dlls/shell32/iconcache.c
@@ -449,3 +449,38 @@ HICON WINAPI ExtractIconExW ( LPCWSTR lpszFile, INT nIconIndex, HICON * phiconLa
 	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;
+}
diff --git a/dlls/shell32/shell.c b/dlls/shell32/shell.c
index 0ac09037ba3..5e28f2c3c1b 100644
--- a/dlls/shell32/shell.c
+++ b/dlls/shell32/shell.c
@@ -363,41 +363,6 @@ HICON16 WINAPI ExtractAssociatedIcon16(HINSTANCE16 hInst, LPSTR lpIconPath, LPWO
 }
 
 /*************************************************************************
- *				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.
-- 
2.11.4.GIT