[DLLS]
authorThomas Faber <thomas.faber@reactos.org>
Thu, 19 Dec 2013 19:42:33 +0000 (19:42 +0000)
committerThomas Faber <thomas.faber@reactos.org>
Thu, 19 Dec 2013 19:42:33 +0000 (19:42 +0000)
- Warnings are not okay
[SHELL32]
- Comment out unused variables in WIP code

svn path=/trunk/; revision=61299

12 files changed:
reactos/dll/directx/wine/quartz/CMakeLists.txt
reactos/dll/win32/aclui/CMakeLists.txt
reactos/dll/win32/advpack/CMakeLists.txt
reactos/dll/win32/dbghelp/CMakeLists.txt
reactos/dll/win32/framedyn/CMakeLists.txt
reactos/dll/win32/localspl/CMakeLists.txt
reactos/dll/win32/rpcrt4/CMakeLists.txt
reactos/dll/win32/shell32/CMakeLists.txt
reactos/dll/win32/shell32/defcontextmenu.cpp
reactos/dll/win32/shell32/folders/desktop.cpp
reactos/dll/win32/windowscodecs/CMakeLists.txt
reactos/dll/win32/winmm/CMakeLists.txt

index 1109272..abfb560 100644 (file)
@@ -58,9 +58,3 @@ add_importlibs(quartz dsound msacm32 msvfw32 ole32 oleaut32 shlwapi rpcrt4 user3
 add_dependencies(quartz dxsdk quartz_idlheader stdole2)
 add_pch(quartz quartz_private.h)
 add_cd_file(TARGET quartz DESTINATION reactos/system32 FOR all)
-
-if(NOT MSVC)
-    # FIXME: http://www.cmake.org/Bug/view.php?id=12998
-    #allow_warnings(quartz)
-    set_source_files_properties(${SOURCE} PROPERTIES COMPILE_FLAGS "-Wno-error")
-endif()
index 11eedfc..1b914a2 100644 (file)
@@ -13,12 +13,6 @@ list(APPEND SOURCE
 
 add_library(aclui SHARED ${SOURCE} aclui.rc)
 
-if(NOT MSVC)
-    # FIXME: http://www.cmake.org/Bug/view.php?id=12998
-    #allow_warnings(aclui)
-    set_source_files_properties(${SOURCE} PROPERTIES COMPILE_FLAGS "-Wno-error")
-endif()
-
 set_module_type(aclui win32dll UNICODE)
 add_importlibs(aclui user32 gdi32 comctl32 ole32 oleaut32 advapi32 uxtheme msvcrt kernel32 ntdll)
 add_pch(aclui precomp.h)
index 9650fc6..ec8cfb1 100644 (file)
@@ -13,7 +13,6 @@ list(APPEND SOURCE
     ${CMAKE_CURRENT_BINARY_DIR}/advpack.def)
 
 add_library(advpack SHARED ${SOURCE})
-allow_warnings(advpack)
 set_module_type(advpack win32dll)
 target_link_libraries(advpack wine)
 add_importlibs(advpack ole32 setupapi version advapi32 msvcrt kernel32 ntdll)
index 1dccd59..c107cb7 100644 (file)
@@ -74,12 +74,6 @@ else()
 
     add_library(dbghelp SHARED ${SOURCE} version.rc)
 
-    if(NOT MSVC)
-        # FIXME: http://www.cmake.org/Bug/view.php?id=12998
-        #allow_warnings(dbghelp)
-        set_source_files_properties(${SOURCE} PROPERTIES COMPILE_FLAGS "-Wno-error")
-    endif()
-
     set_module_type(dbghelp win32dll)
     target_link_libraries(dbghelp wine ${PSEH_LIB} oldnames zlib)
     add_delay_importlibs(dbghelp version)
index 9af13ca..f3f59e5 100644 (file)
@@ -20,12 +20,6 @@ add_library(framedyn SHARED ${SOURCE} ${framedyn_asm})
 set_module_type(framedyn win32dll UNICODE)
 add_importlibs(framedyn oleaut32 msvcrt kernel32 ntdll)
 
-if(NOT MSVC)
-    # FIXME: http://www.cmake.org/Bug/view.php?id=12998
-    #add_target_compile_flags(framedyn "-Wno-deprecated-declarations")
-    set_source_files_properties(${SOURCE} PROPERTIES COMPILE_FLAGS "-Wno-error=deprecated-declarations")
-endif()
-
 add_cd_file(TARGET framedyn DESTINATION reactos/system32/wbem FOR all)
 
 if(MSVC)
index 5ec6e0e..7765fa5 100644 (file)
@@ -18,9 +18,3 @@ set_module_type(localspl win32dll)
 target_link_libraries(localspl wine)
 add_importlibs(localspl spoolss user32 advapi32 msvcrt kernel32 ntdll)
 add_cd_file(TARGET localspl DESTINATION reactos/system32 FOR all)
-
-if(NOT MSVC)
-    # FIXME: http://www.cmake.org/Bug/view.php?id=12998
-    #allow_warnings(localspl)
-    set_source_files_properties(${SOURCE} PROPERTIES COMPILE_FLAGS "-Wno-error")
-endif()
index ce6108a..beab1fd 100644 (file)
@@ -53,10 +53,3 @@ target_link_libraries(rpcrt4 wine uuid ${PSEH_LIB})
 add_delay_importlibs(rpcrt4 iphlpapi wininet secur32 user32)
 add_importlibs(rpcrt4 msvcrt advapi32 ws2_32 kernel32 ntdll)
 add_cd_file(TARGET rpcrt4 DESTINATION reactos/system32 FOR all)
-
-
-if(NOT MSVC)
-    # FIXME: http://www.cmake.org/Bug/view.php?id=12998
-    #allow_warnings(rpcrt4)
-    set_source_files_properties(${SOURCE} PROPERTIES COMPILE_FLAGS "-Wno-error")
-endif()
index 9703a80..d542de5 100644 (file)
@@ -79,12 +79,6 @@ add_library(shell32 SHARED
     ${SOURCE}
     shell32.rc)
 
-if(NOT MSVC)
-    # FIXME: http://www.cmake.org/Bug/view.php?id=12998
-    #allow_warnings(shell32)
-    set_source_files_properties(${SOURCE} PROPERTIES COMPILE_FLAGS "-Wno-error")
-endif()
-
 set_module_type(shell32 win32dll UNICODE)
 
 target_link_libraries(shell32
index 6f0e20f..e7dadab 100644 (file)
@@ -413,7 +413,7 @@ CDefaultContextMenu::LoadDynamicContextMenuHandler(HKEY hKey, const CLSID *pclsi
 BOOL
 CDefaultContextMenu::EnumerateDynamicContextHandlerForKey(HKEY hRootKey)
 {
-    
+
     WCHAR wszName[MAX_PATH], wszBuf[MAX_PATH], *pwszClsid;
     DWORD cchName;
     HRESULT hr;
@@ -636,7 +636,7 @@ CDefaultContextMenu::AddStaticContextMenusToMenu(
         {
             WCHAR wszKey[256];
             HRESULT hr = StringCbPrintfW(wszKey, sizeof(wszKey), L"%s\\shell\\%s", pEntry->szClass, pEntry->szVerb);
-            
+
             if (SUCCEEDED(hr))
             {
                 DWORD cbVerb = sizeof(wszVerb);
@@ -1004,7 +1004,7 @@ CDefaultContextMenu::DoPaste(
     FORMATETC formatetc2;
     STGMEDIUM medium2;
     InitFormatEtc(formatetc2, RegisterClipboardFormatW(CFSTR_PREFERREDDROPEFFECT), TYMED_HGLOBAL);
-    
+
     DWORD dwKey= 0;
 
     if (SUCCEEDED(pda->GetData(&formatetc2, &medium2)))
@@ -1104,7 +1104,7 @@ CDefaultContextMenu::DoCreateLink(
         ERR("no IDropTarget Interface\n");
         return hr;
     }
-    DWORD link = DROPEFFECT_LINK;
+    //DWORD link = DROPEFFECT_LINK;
     SHSimulateDrop(pDT, pDataObj, MK_CONTROL|MK_SHIFT, NULL, NULL);
     NotifyShellViewWindow(lpcmi, TRUE);
 
@@ -1278,7 +1278,7 @@ CDefaultContextMenu::DoProperties(
     if (!pidlParent)
     {
         IPersistFolder2 *pf;
-        
+
         /* pidlFolder is optional */
         if (SUCCEEDED(m_Dcm.psf->QueryInterface(IID_PPV_ARG(IPersistFolder2, &pf))))
         {
@@ -1400,7 +1400,7 @@ CDefaultContextMenu::DoDynamicShellExtensions(
     return E_FAIL;
 }
 
-DWORD 
+DWORD
 CDefaultContextMenu::BrowserFlagsFromVerb(LPCMINVOKECOMMANDINFO lpcmi, PStaticShellEntry pEntry)
 {
     LPSHELLBROWSER lpSB;
@@ -1436,7 +1436,7 @@ CDefaultContextMenu::BrowserFlagsFromVerb(LPCMINVOKECOMMANDINFO lpcmi, PStaticSh
     return 0;
 }
 
-HRESULT 
+HRESULT
 CDefaultContextMenu::TryToBrowse(
     LPCMINVOKECOMMANDINFO lpcmi, LPCITEMIDLIST pidl, DWORD wFlags)
 {
@@ -1451,7 +1451,7 @@ CDefaultContextMenu::TryToBrowse(
     return hr;
 }
 
-HRESULT 
+HRESULT
 CDefaultContextMenu::InvokePidl(LPCMINVOKECOMMANDINFO lpcmi, LPCITEMIDLIST pidl, PStaticShellEntry pEntry)
 {
     LPITEMIDLIST pidlFull = ILCombine(m_Dcm.pidlFolder, pidl);
@@ -1462,7 +1462,7 @@ CDefaultContextMenu::InvokePidl(LPCMINVOKECOMMANDINFO lpcmi, LPCITEMIDLIST pidl,
 
     WCHAR wszPath[MAX_PATH];
     BOOL bHasPath = SHGetPathFromIDListW(pidlFull, wszPath);
-    
+
     WCHAR wszDir[MAX_PATH];
     if(bHasPath)
     {
@@ -1526,7 +1526,7 @@ CDefaultContextMenu::DoStaticShellExtensions(
         if (wFlags > 0)
         {
             /* In xp if we have browsed, we don't open any more folders .
-             * In win7 we browse to the first folder we find and 
+             * In win7 we browse to the first folder we find and
              * open new windows fo for each of the rest of the folders */
             if (bBrowsed)
                 continue;
index 9ddbb7a..474bdd6 100644 (file)
@@ -1353,7 +1353,7 @@ HRESULT WINAPI CDesktopFolder::CopyItems(IShellFolder *pSFFrom, UINT cidl, LPCIT
  */
 BOOL CDesktopFolder::QueryDrop(DWORD dwKeyState, LPDWORD pdwEffect)
 {
-    /* TODO Windows does different drop effects if dragging across drives. 
+    /* TODO Windows does different drop effects if dragging across drives.
     i.e., it will copy instead of move if the directories are on different disks. */
 
     DWORD dwEffect = DROPEFFECT_MOVE;
@@ -1436,24 +1436,24 @@ HRESULT WINAPI CDesktopFolder::Drop(IDataObject *pDataObject,
         return E_FAIL;
     }
 
-    /* We only want to really move files around if they don't already 
+    /* We only want to really move files around if they don't already
        come from the desktop, or we're linking or copying */
     if ((!_ILIsDesktop(pidl)) || (dwKeyState & MK_CONTROL))
     {
         LPITEMIDLIST pidl = NULL;
 
         WCHAR szPath[MAX_PATH];
-        LPWSTR pathPtr;
+        //LPWSTR pathPtr;
 
         /* build a complete path to create a simple pidl */
         lstrcpynW(szPath, sPathTarget, MAX_PATH);
-        pathPtr = PathAddBackslashW(szPath);
+        /*pathPtr = */PathAddBackslashW(szPath);
         //hr = _ILCreateFromPathW(szPath, &pidl);
         hr = this->ParseDisplayName(NULL, NULL, szPath, NULL, &pidl, NULL);
 
         if (SUCCEEDED(hr))
         {
-            IDropTarget *pDT; 
+            IDropTarget *pDT;
             hr = this->BindToObject(pidl, NULL, IID_IDropTarget, (LPVOID*)&pDT);
             CoTaskMemFree(pidl);
             if (SUCCEEDED(hr))
@@ -1465,7 +1465,7 @@ HRESULT WINAPI CDesktopFolder::Drop(IDataObject *pDataObject,
             ERR("Error creating from %s\n", debugstr_w(szPath));
     }
 
-    /* Todo, rewrite the registry such that the icons are well placed. 
+    /* Todo, rewrite the registry such that the icons are well placed.
     Blocked by no bags implementation. */
 
     SHFree(pidl);
index 02c3a5c..a78a2ce 100644 (file)
@@ -56,12 +56,6 @@ list(APPEND SOURCE
     ${CMAKE_CURRENT_BINARY_DIR}/windowscodecs.def
     ${CMAKE_CURRENT_BINARY_DIR}/windowscodecs_wincodec_p.c)
 
-if(NOT MSVC)
-    # FIXME: http://www.cmake.org/Bug/view.php?id=12998
-    #allow_warnings(windowscodecs)
-    set_source_files_properties(${SOURCE} PROPERTIES COMPILE_FLAGS "-Wno-error")
-endif()
-
 add_library(windowscodecs SHARED ${SOURCE} version.rc)
 set_module_type(windowscodecs win32dll)
 target_link_libraries(windowscodecs wine uuid ${PSEH_LIB})
index a1a362e..78cd2d5 100644 (file)
@@ -21,12 +21,6 @@ add_library(winmm SHARED
     ${SOURCE}
     winmm_res.rc)
 
-if(NOT MSVC)
-    # FIXME: http://www.cmake.org/Bug/view.php?id=12998
-    #allow_warnings(winmm)
-    set_source_files_properties(${SOURCE} PROPERTIES COMPILE_FLAGS "-Wno-error")
-endif()
-
 set_module_type(winmm win32dll)
 target_link_libraries(winmm wine ${PSEH_LIB})
 add_importlibs(winmm advapi32 user32 msvcrt kernel32 ntdll)