diff --git a/reactos/dll/shellext/ntobjshex/ntobjenum.cpp b/reactos/dll/shellext/ntobjshex/ntobjenum.cpp index 8e3a7634707..80ae5da6900 100644 --- a/reactos/dll/shellext/ntobjshex/ntobjenum.cpp +++ b/reactos/dll/shellext/ntobjshex/ntobjenum.cpp @@ -19,8 +19,6 @@ #include "precomp.h" #include -WINE_DEFAULT_DEBUG_CHANNEL(ntobjshex); - static struct RootKeyEntry { HKEY key; PCWSTR keyName; diff --git a/reactos/dll/shellext/ntobjshex/ntobjfolder.cpp b/reactos/dll/shellext/ntobjshex/ntobjfolder.cpp index f5e09c363dd..fdc2183001f 100644 --- a/reactos/dll/shellext/ntobjshex/ntobjfolder.cpp +++ b/reactos/dll/shellext/ntobjshex/ntobjfolder.cpp @@ -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 @@ enum NtObjectColumns }; CNtObjectFolderExtractIcon::CNtObjectFolderExtractIcon() : - m_pcidlChild(NULL), - m_NtPath(NULL) + m_NtPath(NULL), + m_pcidlChild(NULL) { } @@ -439,8 +437,8 @@ HRESULT CNtObjectFolder::CompareIDs(LPARAM lParam, const NtPidlEntry * first, co { HRESULT hr; - LPARAM sortMode = lParam & 0xFFFF0000; - LPARAM column = lParam & 0x0000FFFF; + DWORD sortMode = lParam & 0xFFFF0000; + DWORD column = lParam & 0x0000FFFF; if (sortMode == SHCIDS_ALLFIELDS) { diff --git a/reactos/dll/shellext/ntobjshex/ntobjshex.cpp b/reactos/dll/shellext/ntobjshex/ntobjshex.cpp index 8c2cc3d3bf6..571742284e5 100644 --- a/reactos/dll/shellext/ntobjshex/ntobjshex.cpp +++ b/reactos/dll/shellext/ntobjshex/ntobjshex.cpp @@ -10,8 +10,6 @@ #include -WINE_DEFAULT_DEBUG_CHANNEL(ntobjshex); - BEGIN_OBJECT_MAP(ObjectMap) OBJECT_ENTRY(CLSID_NtObjectFolder, CNtObjectFolder) OBJECT_ENTRY(CLSID_RegistryFolder, CRegistryFolder) diff --git a/reactos/dll/shellext/ntobjshex/precomp.h b/reactos/dll/shellext/ntobjshex/precomp.h index 049fd12e886..f117b3771b7 100644 --- a/reactos/dll/shellext/ntobjshex/precomp.h +++ b/reactos/dll/shellext/ntobjshex/precomp.h @@ -57,6 +57,8 @@ DEFINE_GUID(CLSID_NtObjectFolder, #define GET_SHGDN_FOR(dwFlags) ((DWORD)dwFlags & (DWORD)0x0000FF00) #define GET_SHGDN_RELATION(dwFlags) ((DWORD)dwFlags & (DWORD)0x000000FF) +WINE_DEFAULT_DEBUG_CHANNEL(ntobjshex); + #include #include #include "util.h" diff --git a/reactos/dll/shellext/ntobjshex/regfolder.cpp b/reactos/dll/shellext/ntobjshex/regfolder.cpp index fea0ff73882..fdbe93eb880 100644 --- a/reactos/dll/shellext/ntobjshex/regfolder.cpp +++ b/reactos/dll/shellext/ntobjshex/regfolder.cpp @@ -8,8 +8,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 CRegistryFolder::CompareIDs(LPARAM lParam, const RegPidlEntry * first, c { HRESULT hr; - LPARAM sortMode = lParam & 0xFFFF0000; - LPARAM column = lParam & 0x0000FFFF; + DWORD sortMode = lParam & 0xFFFF0000; + DWORD column = lParam & 0x0000FFFF; if (sortMode == SHCIDS_ALLFIELDS) {