[ros-diffs] [tfaber] 74458: [0.4.5] - Revert r73436 to avoid trouble with VirtualBox Guest Additions. CORE-13172 CORE-12700 CORE-12765

Author: tfaber
Date: Wed May  3 11:18:11 2017
New Revision: 74458

URL: http://svn.reactos.org/svn/reactos?rev=74458&view=rev
Log:
[0.4.5]
- Revert r73436 to avoid trouble with VirtualBox Guest Additions.
CORE-13172 CORE-12700 CORE-12765

Modified:
    branches/ros-branch-0_4_5/reactos/dll/win32/shell32/iconcache.cpp
    branches/ros-branch-0_4_5/reactos/dll/win32/shell32/shell32.cpp
    branches/ros-branch-0_4_5/reactos/dll/win32/shell32/wine/shellord.c

Modified: branches/ros-branch-0_4_5/reactos/dll/win32/shell32/iconcache.cpp
URL:
http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_5/reactos/dll/wi…
==============================================================================
--- branches/ros-branch-0_4_5/reactos/dll/win32/shell32/iconcache.cpp	[iso-8859-1]
(original)
+++ branches/ros-branch-0_4_5/reactos/dll/win32/shell32/iconcache.cpp	[iso-8859-1] Wed May
 3 11:18:11 2017
@@ -453,9 +453,6 @@
     sice.dwSourceIndex = dwSourceIndex;
     sice.dwFlags = dwFlags;
 
-    if (!sic_hdpa)
-        SIC_Initialize();
-
     EnterCriticalSection(&SHELL32_SicCS);
 
     if (NULL != DPA_GetPtr (sic_hdpa, 0))
@@ -690,9 +687,6 @@
         RegCloseKey(hKeyShellIcons);
     }
 
-    if (!sic_hdpa)
-        SIC_Initialize();
-
     return SIC_LoadIcon(iconPath, iconIdx, 0);
 }
 
@@ -704,17 +698,13 @@
  *
  */
 BOOL WINAPI Shell_GetImageLists(HIMAGELIST * lpBigList, HIMAGELIST * lpSmallList)
-{
-    TRACE("(%p,%p)\n",lpBigList,lpSmallList);
-
-    if (!sic_hdpa)
-        SIC_Initialize();
-
+{    TRACE("(%p,%p)\n",lpBigList,lpSmallList);
     if (lpBigList)
-        *lpBigList = ShellBigIconList;
-
+    { *lpBigList = ShellBigIconList;
+    }
     if (lpSmallList)
-        *lpSmallList = ShellSmallIconList;
+    { *lpSmallList = ShellSmallIconList;
+    }
 
     return TRUE;
 }
@@ -744,9 +734,6 @@
     int        iShortcutDefaultIndex = INVALID_INDEX;
 
     TRACE("sf=%p pidl=%p %s\n", sh, pidl,
bBigIcon?"Big":"Small");
-
-    if (!sic_hdpa)
-        SIC_Initialize();
 
     if (SUCCEEDED (sh->GetUIObjectOf(0, 1, &pidl, IID_NULL_PPV_ARG(IExtractIconW,
&ei))))
     {

Modified: branches/ros-branch-0_4_5/reactos/dll/win32/shell32/shell32.cpp
URL:
http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_5/reactos/dll/wi…
==============================================================================
--- branches/ros-branch-0_4_5/reactos/dll/win32/shell32/shell32.cpp	[iso-8859-1]
(original)
+++ branches/ros-branch-0_4_5/reactos/dll/win32/shell32/shell32.cpp	[iso-8859-1] Wed May 
3 11:18:11 2017
@@ -346,6 +346,7 @@
         InitCommonControlsEx(&InitCtrls);
 
         /* Bad idea, initialization in DllMain! */
+        SIC_Initialize();
         InitChangeNotifications();
     }
     else if (dwReason == DLL_PROCESS_DETACH)

Modified: branches/ros-branch-0_4_5/reactos/dll/win32/shell32/wine/shellord.c
URL:
http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_5/reactos/dll/wi…
==============================================================================
--- branches/ros-branch-0_4_5/reactos/dll/win32/shell32/wine/shellord.c	[iso-8859-1]
(original)
+++ branches/ros-branch-0_4_5/reactos/dll/win32/shell32/wine/shellord.c	[iso-8859-1] Wed
May  3 11:18:11 2017
@@ -1292,8 +1292,8 @@
  *
  */
 BOOL WINAPI FileIconInit(BOOL bFullInit)
-{
-    return SIC_Initialize();
+{	FIXME("(%s)\n", bFullInit ? "true" : "false");
+	return FALSE;
 }
 
 /*************************************************************************