Revert b51bf08

microsoft · Apr 12, 2018 · 8a29c12 · 8a29c12
1 parent 90600b6
commit 8a29c12
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 68 deletions.
diff --git a/.gitignore b/.gitignore
@@ -54,7 +54,6 @@ artifacts/
 *.ilk
 *.meta
 *.obj
-*.o
 *.pch
 *.pdb
 *.pgc

diff --git a/src/Makefile.mingw b/src/Makefile.mingw
diff --git a/src/wfcomman.c b/src/wfcomman.c
@@ -19,9 +19,7 @@
 #include <commctrl.h>
 #include <ole2.h>
 
-#ifndef HELP_PARTIALKEY
 #define HELP_PARTIALKEY 0x0105L    // call the search engine in winhelp
-#endif
 
 #define VIEW_NOCHANGE VIEW_PLUSES
 
@@ -2332,4 +2330,4 @@ VOID
 UpdateMoveStatus(DWORD dwEffect)
 {
 	SendMessage(hwndStatus, SB_SETTEXT, 2, (LPARAM)(dwEffect == DROPEFFECT_MOVE ? TEXT("MOVE PENDING") : NULL));
-}
+}
diff --git a/src/wfdrop.c b/src/wfdrop.c
@@ -16,11 +16,9 @@
 #include <ole2.h>
 #include <shlobj.h>
 
-#ifndef GUID_DEFINED
 DEFINE_OLEGUID(IID_IUnknown,            0x00000000L, 0, 0);
 DEFINE_OLEGUID(IID_IDropSource,             0x00000121, 0, 0);
 DEFINE_OLEGUID(IID_IDropTarget,             0x00000122, 0, 0);
-#endif
 
 HRESULT CreateDropTarget(HWND hwnd, WF_IDropTarget **ppDropTarget);
 void DropData(WF_IDropTarget *This, IDataObject *pDataObject, DWORD dwEffect);