[ros-diffs] [dquintana] 75176: [NTOBJSHEX] Make GCC happy.

Author: dquintana
Date: Fri Jun 23 21:40:19 2017
New Revision: 75176
URL: http://svn.reactos.org/svn/reactos?rev=75176&view=rev
Log:
[NTOBJSHEX]
Make GCC happy.
Modified:
    trunk/reactos/dll/shellext/ntobjshex/ntobjenum.cpp
    trunk/reactos/dll/shellext/ntobjshex/ntobjfolder.cpp
    trunk/reactos/dll/shellext/ntobjshex/ntobjshex.cpp
    trunk/reactos/dll/shellext/ntobjshex/precomp.h
    trunk/reactos/dll/shellext/ntobjshex/regfolder.cpp
Modified: trunk/reactos/dll/shellext/ntobjshex/ntobjenum.cpp
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/ntobjshex/nto…
==============================================================================
--- trunk/reactos/dll/shellext/ntobjshex/ntobjenum.cpp  [iso-8859-1] (original)
+++ trunk/reactos/dll/shellext/ntobjshex/ntobjenum.cpp  [iso-8859-1] Fri Jun 23 21:40:19
2017
@@ -19,8 +19,6 @@
 #include "precomp.h"
 #include <strsafe.h>
-WINE_DEFAULT_DEBUG_CHANNEL(ntobjshex);
-
 static struct RootKeyEntry {
     HKEY key;
     PCWSTR keyName;
Modified: trunk/reactos/dll/shellext/ntobjshex/ntobjfolder.cpp
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/ntobjshex/nto…
==============================================================================
--- trunk/reactos/dll/shellext/ntobjshex/ntobjfolder.cpp        [iso-8859-1] (original)
+++ trunk/reactos/dll/shellext/ntobjshex/ntobjfolder.cpp        [iso-8859-1] Fri Jun 23
21:40:19 2017
@@ -8,8 +8,6 @@
 #include "precomp.h"
-WINE_DEFAULT_DEBUG_CHANNEL(ntobjshex);
-
 // {845B0FB2-66E0-416B-8F91-314E23F7C12D}
 const GUID CLSID_NtObjectFolder = { 0x845b0fb2, 0x66e0, 0x416b, { 0x8f, 0x91, 0x31, 0x4e,
0x23, 0xf7, 0xc1, 0x2d } };
@@ -25,8 +23,8 @@
 };
 CNtObjectFolderExtractIcon::CNtObjectFolderExtractIcon() :
-    m_pcidlChild(NULL),
-    m_NtPath(NULL)
+    m_NtPath(NULL),
+    m_pcidlChild(NULL)
 {
 }
@@ -439,8 +437,8 @@
 {
     HRESULT hr;
-    LPARAM sortMode = lParam & 0xFFFF0000;
-    LPARAM column = lParam & 0x0000FFFF;
+    DWORD sortMode = lParam & 0xFFFF0000;
+    DWORD column = lParam & 0x0000FFFF;
     if (sortMode == SHCIDS_ALLFIELDS)
     {
Modified: trunk/reactos/dll/shellext/ntobjshex/ntobjshex.cpp
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/ntobjshex/nto…
==============================================================================
--- trunk/reactos/dll/shellext/ntobjshex/ntobjshex.cpp  [iso-8859-1] (original)
+++ trunk/reactos/dll/shellext/ntobjshex/ntobjshex.cpp  [iso-8859-1] Fri Jun 23 21:40:19
2017
@@ -9,8 +9,6 @@
 #include "precomp.h"
 #include <atlwin.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(ntobjshex);
 BEGIN_OBJECT_MAP(ObjectMap)
     OBJECT_ENTRY(CLSID_NtObjectFolder, CNtObjectFolder)
Modified: trunk/reactos/dll/shellext/ntobjshex/precomp.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/ntobjshex/pre…
==============================================================================
--- trunk/reactos/dll/shellext/ntobjshex/precomp.h      [iso-8859-1] (original)
+++ trunk/reactos/dll/shellext/ntobjshex/precomp.h      [iso-8859-1] Fri Jun 23 21:40:19
2017
@@ -57,6 +57,8 @@
 #define GET_SHGDN_FOR(dwFlags)         ((DWORD)dwFlags & (DWORD)0x0000FF00)
 #define GET_SHGDN_RELATION(dwFlags)    ((DWORD)dwFlags & (DWORD)0x000000FF)
+WINE_DEFAULT_DEBUG_CHANNEL(ntobjshex);
+
 #include <rtlfuncs.h>
 #include <ntquery.h>
 #include "util.h"
Modified: trunk/reactos/dll/shellext/ntobjshex/regfolder.cpp
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/ntobjshex/reg…
==============================================================================
--- trunk/reactos/dll/shellext/ntobjshex/regfolder.cpp  [iso-8859-1] (original)
+++ trunk/reactos/dll/shellext/ntobjshex/regfolder.cpp  [iso-8859-1] Fri Jun 23 21:40:19
2017
@@ -7,8 +7,6 @@
  */
 #include "precomp.h"
-
-WINE_DEFAULT_DEBUG_CHANNEL(ntobjshex);
 // {1C6D6E08-2332-4A7B-A94D-6432DB2B5AE6}
 const GUID CLSID_RegistryFolder = { 0x1c6d6e08, 0x2332, 0x4a7b, { 0xa9, 0x4d, 0x64, 0x32,
0xdb, 0x2b, 0x5a, 0xe6 } };
@@ -376,8 +374,8 @@
 {
     HRESULT hr;
-    LPARAM sortMode = lParam & 0xFFFF0000;
-    LPARAM column = lParam & 0x0000FFFF;
+    DWORD sortMode = lParam & 0xFFFF0000;
+    DWORD column = lParam & 0x0000FFFF;
     if (sortMode == SHCIDS_ALLFIELDS)
     {