dv17: #i70994#: Proprty handler should work with 64bit, too

6 files changed, 20 insertions, 58 deletions

diff --git a/shell/source/win32/shlxthandler/makefile.mk b/shell/source/win32/shlxthandler/makefile.mk
index c9859578d992..7735a5947c80 100755
--- a/shell/source/win32/shlxthandler/makefile.mk
+++ b/shell/source/win32/shlxthandler/makefile.mk
@@ -6,10 +6,6 @@
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.14 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
@@ -83,7 +79,7 @@ SHL1STDLIBS+=\
     $(GDI32LIB)\
     $(GDIPLUSLIB)\
     $(SHLWAPILIB)\
-    propsys.lib
+    $(PROPSYSLIB)
 
 SHL1LIBS+=$(SLB)$/util.lib\
     $(SLB)$/ooofilereader.lib
@@ -112,7 +108,9 @@ SLOFILES_X64= \
     $(SLO_X64)$/shlxthdl.obj\
     $(SLO_X64)$/listviewbuilder.obj\
     $(SLO_X64)$/document_statistic.obj\
-    $(SLO_X64)$/thumbviewer.obj
+    $(SLO_X64)$/thumbviewer.obj\
+    $(SLO_X64)$/propertyhdl.obj\
+    $(SLO_X64)$/stream_helper.obj\
 
 SHL1TARGET_X64=$(TARGET)
 SHL1LIBS_X64=$(SOLARLIBDIR_X64)$/zlib.lib\
@@ -131,7 +129,8 @@ SHL1STDLIBS_X64+=\
     $(GDIPLUSLIB_X64) \
     $(MSVCRT_X64)   \
     $(MSVCPRT_X64)  \
-    $(OLDNAMESLIB_X64)
+    $(OLDNAMESLIB_X64)\
+    $(PROPSYSLIB_X64)
 
 SHL1LIBS_X64+=$(SLB_X64)$/util.lib\
     $(SLB_X64)$/ooofilereader.lib
diff --git a/shell/source/win32/shlxthandler/ooofilt/makefile.mk b/shell/source/win32/shlxthandler/ooofilt/makefile.mk
index 221ec6ee99c5..88f561ec6749 100755
--- a/shell/source/win32/shlxthandler/ooofilt/makefile.mk
+++ b/shell/source/win32/shlxthandler/ooofilt/makefile.mk
@@ -99,7 +99,8 @@ CDEFS_X64+=-D_WIN32_IE=0x501
 USE_DEFFILE_X64=TRUE
 
 SLOFILES_X64=$(SLO_X64)$/ooofilt.obj\
-        $(SLO_X64)$/propspec.obj
+        $(SLO_X64)$/propspec.obj\
+        $(SLO_X64)$/stream_helper.obj
 
 SHL1TARGET_X64=$(TARGET)
 
diff --git a/shell/source/win32/shlxthandler/prophdl/makefile.mk b/shell/source/win32/shlxthandler/prophdl/makefile.mk
index 30efd7cedaa8..19f9d494b741 100755
--- a/shell/source/win32/shlxthandler/prophdl/makefile.mk
+++ b/shell/source/win32/shlxthandler/prophdl/makefile.mk
@@ -46,7 +46,7 @@ CDEFS+=-D_WIN32_IE=0x501
 
 # --- Files --------------------------------------------------------
 
-SLOFILES=$(SLO)$/propertyhdl.obj
+SLOFILES=$(SLO)$/$(TARGET).obj
 
 .IF "$(BUILD_X64)"!=""
 CFLAGS_X64+=-DISOLATION_AWARE_ENABLED -DWIN32_LEAN_AND_MEAN -DXML_UNICODE -D_NTSDK -DUNICODE -D_UNICODE -D_WIN32_WINNT=0x0501
diff --git a/shell/source/win32/shlxthandler/prophdl/propertyhdl.cxx b/shell/source/win32/shlxthandler/prophdl/propertyhdl.cxx
index 06d619de6f8d..97db20caaea5 100755
--- a/shell/source/win32/shlxthandler/prophdl/propertyhdl.cxx
+++ b/shell/source/win32/shlxthandler/prophdl/propertyhdl.cxx
@@ -42,42 +42,10 @@
 
 #include "internal/stream_helper.hxx"
 
-//----------------------------------------------------------
-#ifdef DEBUG
-inline void OutputDebugStringFormat( LPCSTR pFormat, ... )
-{
-    CHAR    buffer[1024];
-    va_list args;
-
-    va_start( args, pFormat );
-    StringCchVPrintfA( buffer, sizeof(buffer), pFormat, args );
-    OutputDebugStringA( buffer );
-}
-#else
-static inline void OutputDebugStringFormat( LPCSTR, ... )
-{
-}
-#endif
-
 //----------------------------
 //
 //----------------------------
 
-//namespace /* private */
-/*{
-    SHPropertyHdl PropertyHdlTable[] =
-    {
-        {{PSGUID_SUMMARYINFORMATION, PIDSI_TITLE},    VT_BSTR, LVCFMT_LEFT, 30, SHCOLSTATE_TYPE_STR, L"Title",    L"Title"},
-        {{PSGUID_SUMMARYINFORMATION, PIDSI_AUTHOR},   VT_BSTR, LVCFMT_LEFT, 30, SHCOLSTATE_TYPE_STR, L"Author",   L"Author"},
-        {{PSGUID_SUMMARYINFORMATION, PIDSI_SUBJECT},  VT_BSTR, LVCFMT_LEFT, 30, SHCOLSTATE_TYPE_STR, L"Subject",  L"Subject"},
-        {{PSGUID_SUMMARYINFORMATION, PIDSI_KEYWORDS}, VT_BSTR, LVCFMT_LEFT, 30, SHCOLSTATE_TYPE_STR, L"Keywords", L"Keywords"},
-        {{PSGUID_SUMMARYINFORMATION, PIDSI_COMMENTS}, VT_BSTR, LVCFMT_LEFT, 30, SHCOLSTATE_TYPE_STR, L"Comments", L"Comments"},
-        {{PSGUID_SUMMARYINFORMATION, PIDSI_PAGECOUNT},VT_BSTR, LVCFMT_LEFT, 30, SHCOLSTATE_TYPE_STR, L"Pagecount", L"Pagecount"}
-    };
-
-    size_t PropertyHdlTableSize = sizeof(PropertyHdlTable)/sizeof(PropertyHdlTable[0]);
-}*/
-
 //
 // Map of property keys to the locations of their value(s) in the .??? XML schema
 //
diff --git a/shell/source/win32/shlxthandler/propsheets/propsheets.cxx b/shell/source/win32/shlxthandler/propsheets/propsheets.cxx
index 0dd5e37fb4ea..f2aa131cb0ef 100755
--- a/shell/source/win32/shlxthandler/propsheets/propsheets.cxx
+++ b/shell/source/win32/shlxthandler/propsheets/propsheets.cxx
@@ -53,23 +53,6 @@
 #include <utility>
 #include <strsafe.h>
 
-//----------------------------------------------------------
-#ifdef DEBUG
-inline void OutputDebugStringFormat( LPCSTR pFormat, ... )
-{
-    CHAR    buffer[1024];
-    va_list args;
-
-    va_start( args, pFormat );
-    StringCchVPrintfA( buffer, sizeof(buffer), pFormat, args );
-    OutputDebugStringA( buffer );
-}
-#else
-static inline void OutputDebugStringFormat( LPCSTR, ... )
-{
-}
-#endif
-
 
 /*---------------------------------------------
     INFO - INFO - INFO - INFO - INFO - INFO
diff --git a/shell/source/win32/shlxthandler/shlxthdl.cxx b/shell/source/win32/shlxthandler/shlxthdl.cxx
index 9af1f6314ae0..80f17470c379 100755
--- a/shell/source/win32/shlxthandler/shlxthdl.cxx
+++ b/shell/source/win32/shlxthandler/shlxthdl.cxx
@@ -399,6 +399,17 @@ extern "C" STDAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, void** ppv)
     if ((riid != IID_IUnknown) && (riid != IID_IClassFactory))
         return E_NOINTERFACE;
 
+    if ( rclsid == CLSID_INFOTIP_HANDLER )
+        OutputDebugStringFormat( "DllGetClassObject: Create CLSID_INFOTIP_HANDLER\n" );
+    else if ( rclsid == CLSID_COLUMN_HANDLER )
+        OutputDebugStringFormat( "DllGetClassObject: Create CLSID_COLUMN_HANDLER\n" );
+    else if ( rclsid == CLSID_PROPERTYSHEET_HANDLER )
+        OutputDebugStringFormat( "DllGetClassObject: Create CLSID_PROPERTYSHEET_HANDLER\n" );
+    else if ( rclsid == CLSID_THUMBVIEWER_HANDLER )
+        OutputDebugStringFormat( "DllGetClassObject: Create CLSID_THUMBVIEWER_HANDLER\n" );
+    else if ( rclsid == CLSID_PROPERTY_HANDLER )
+        OutputDebugStringFormat( "DllGetClassObject: Create CLSID_PROPERTY_HANDLER\n" );
+
     IUnknown* pUnk = new CClassFactory(rclsid);
     if (0 == pUnk)
         return E_OUTOFMEMORY;