From b1091c8722a29fe515391621a2eefa29a662b3a2 Mon Sep 17 00:00:00 2001 From: Amine Khaldi Date: Fri, 20 Nov 2015 18:40:41 +0000 Subject: [PATCH] [DWMAPI] Actually we don't seem to be needing this for anything. Zap it. svn path=/trunk/; revision=69966 --- reactos/dll/win32/dwmapi/CMakeLists.txt | 15 -- reactos/dll/win32/dwmapi/dwmapi.spec | 45 ---- reactos/dll/win32/dwmapi/dwmapi_main.c | 267 ----------------------- reactos/dll/win32/dwmapi/dwmapi_ros.diff | 48 ---- reactos/dll/win32/dwmapi/version.rc | 26 --- reactos/media/doc/README.WINE | 1 - 6 files changed, 402 deletions(-) delete mode 100644 reactos/dll/win32/dwmapi/CMakeLists.txt delete mode 100644 reactos/dll/win32/dwmapi/dwmapi.spec delete mode 100644 reactos/dll/win32/dwmapi/dwmapi_main.c delete mode 100644 reactos/dll/win32/dwmapi/dwmapi_ros.diff delete mode 100644 reactos/dll/win32/dwmapi/version.rc diff --git a/reactos/dll/win32/dwmapi/CMakeLists.txt b/reactos/dll/win32/dwmapi/CMakeLists.txt deleted file mode 100644 index da4c1cc50d2..00000000000 --- a/reactos/dll/win32/dwmapi/CMakeLists.txt +++ /dev/null @@ -1,15 +0,0 @@ - -add_definitions(-D__WINESRC__) -include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) -spec2def(dwmapi.dll dwmapi.spec) - -list(APPEND SOURCE - dwmapi_main.c - ${CMAKE_CURRENT_BINARY_DIR}/dwmapi_stubs.c - ${CMAKE_CURRENT_BINARY_DIR}/dwmapi.def) - -add_library(dwmapi SHARED ${SOURCE} version.rc) -set_module_type(dwmapi win32dll) -target_link_libraries(dwmapi wine) -add_importlibs(dwmapi msvcrt kernel32 ntdll) -add_cd_file(TARGET dwmapi DESTINATION reactos/system32 FOR all) diff --git a/reactos/dll/win32/dwmapi/dwmapi.spec b/reactos/dll/win32/dwmapi/dwmapi.spec deleted file mode 100644 index 49823608601..00000000000 --- a/reactos/dll/win32/dwmapi/dwmapi.spec +++ /dev/null @@ -1,45 +0,0 @@ -100 stub DWMAPI_100 -101 stub DWMAPI_101 -102 stdcall DwmEnableComposition (long) -103 stub DWMAPI_103 -104 stub DWMAPI_104 -105 stub DWMAPI_105 -106 stub DWMAPI_106 -107 stub DWMAPI_107 -108 stub DWMAPI_108 -109 stub DWMAPI_109 -110 stub DWMAPI_110 -111 stub DWMAPI_111 -112 stub DWMAPI_112 -113 stub DWMAPI_113 - -115 stub DWMAPI_114 -116 stub DWMAPI_115 -117 stub DWMAPI_116 -118 stub DWMAPI_117 -119 stub DWMAPI_118 -120 stub DWMAPI_120 - -@ stdcall DwmAttachMilContent(long) -@ stdcall DwmDefWindowProc(long long long long ptr) -@ stdcall DwmDetachMilContent(long) -@ stdcall DwmEnableBlurBehindWindow(ptr ptr) -@ stdcall DwmEnableMMCSS(long) -@ stdcall DwmExtendFrameIntoClientArea(long ptr) -@ stdcall DwmFlush() -@ stdcall DwmGetColorizationColor(ptr long) -@ stdcall DwmGetCompositionTimingInfo(long ptr) -@ stdcall DwmGetGraphicsStreamClient(long ptr) -@ stdcall DwmGetGraphicsStreamTransformHint(long ptr) -@ stdcall DwmGetTransportAttributes(ptr ptr ptr) -@ stdcall DwmGetWindowAttribute(ptr long ptr long) -@ stdcall DwmInvalidateIconicBitmaps(ptr) -@ stdcall DwmIsCompositionEnabled(ptr) -@ stub DwmModifyPreviousDxFrameDuration -@ stub DwmQueryThumbnailSourceSize -@ stdcall DwmRegisterThumbnail(long long ptr) -@ stub DwmSetDxFrameDuration -@ stub DwmSetPresentParameters -@ stdcall DwmSetWindowAttribute(long long ptr long) -@ stdcall DwmUnregisterThumbnail(long) -@ stdcall DwmUpdateThumbnailProperties(ptr ptr) diff --git a/reactos/dll/win32/dwmapi/dwmapi_main.c b/reactos/dll/win32/dwmapi/dwmapi_main.c deleted file mode 100644 index 76c10cebd4d..00000000000 --- a/reactos/dll/win32/dwmapi/dwmapi_main.c +++ /dev/null @@ -1,267 +0,0 @@ -/* - * Dwmapi - * - * Copyright 2007 Andras Kovacs - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - * - */ - -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H - -#include -#include - -#define NONAMELESSUNION -#define NONAMELESSSTRUCT -#define COBJMACROS -#include -#include -#include -#include -#include -#include - -WINE_DEFAULT_DEBUG_CHANNEL(dwmapi); - - -/* At process attach */ -BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) -{ - switch(fdwReason) - { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls( hInstDLL ); - break; - } - return TRUE; -} - -/********************************************************************** - * DwmIsCompositionEnabled (DWMAPI.@) - */ -HRESULT WINAPI DwmIsCompositionEnabled(BOOL *enabled) -{ - static int once; - if (!once) - { - FIXME("%p\n", enabled); - once = 1; - } - else - TRACE("%p\n", enabled); - - *enabled = FALSE; - return S_OK; -} - -/********************************************************************** - * DwmEnableComposition (DWMAPI.102) - */ -HRESULT WINAPI DwmEnableComposition(UINT uCompositionAction) -{ - FIXME("(%d) stub\n", uCompositionAction); - - return S_OK; -} - -/********************************************************************** - * DwmExtendFrameIntoClientArea (DWMAPI.@) - */ -HRESULT WINAPI DwmExtendFrameIntoClientArea(HWND hwnd, const MARGINS* margins) -{ - FIXME("(%p, %p) stub\n", hwnd, margins); - - return E_NOTIMPL; -} - -/********************************************************************** - * DwmGetColorizationColor (DWMAPI.@) - */ -HRESULT WINAPI DwmGetColorizationColor(DWORD *colorization, BOOL opaque_blend) -{ - FIXME("(%p, %d) stub\n", colorization, opaque_blend); - - return E_NOTIMPL; -} - -/********************************************************************** - * DwmFlush (DWMAPI.@) - */ -HRESULT WINAPI DwmFlush(void) -{ - FIXME("() stub\n"); - - return E_NOTIMPL; -} - -/********************************************************************** - * DwmInvalidateIconicBitmaps (DWMAPI.@) - */ -HRESULT WINAPI DwmInvalidateIconicBitmaps(HWND hwnd) -{ - static BOOL once; - - if (!once++) FIXME("(%p) stub\n", hwnd); - - return E_NOTIMPL; -} - -/********************************************************************** - * DwmSetWindowAttribute (DWMAPI.@) - */ -HRESULT WINAPI DwmSetWindowAttribute(HWND hwnd, DWORD attributenum, LPCVOID attribute, DWORD size) -{ - static BOOL once; - - if (!once++) FIXME("(%p, %x, %p, %x) stub\n", hwnd, attributenum, attribute, size); - - return E_NOTIMPL; -} - -/********************************************************************** - * DwmGetGraphicsStreamClient (DWMAPI.@) - */ -HRESULT WINAPI DwmGetGraphicsStreamClient(UINT uIndex, UUID *pClientUuid) -{ - FIXME("(%d, %p) stub\n", uIndex, pClientUuid); - - return E_NOTIMPL; -} - -/********************************************************************** - * DwmGetTransportAttributes (DWMAPI.@) - */ -HRESULT WINAPI DwmGetTransportAttributes(BOOL *pfIsRemoting, BOOL *pfIsConnected, DWORD *pDwGeneration) -{ - FIXME("(%p, %p, %p) stub\n", pfIsRemoting, pfIsConnected, pDwGeneration); - - return E_NOTIMPL; -} - -/********************************************************************** - * DwmUnregisterThumbnail (DWMAPI.@) - */ -HRESULT WINAPI DwmUnregisterThumbnail(HTHUMBNAIL thumbnail) -{ - FIXME("(%p) stub\n", thumbnail); - - return E_NOTIMPL; -} - -/********************************************************************** - * DwmEnableMMCSS (DWMAPI.@) - */ -HRESULT WINAPI DwmEnableMMCSS(BOOL enableMMCSS) -{ - FIXME("(%d) stub\n", enableMMCSS); - - return S_OK; -} - -/********************************************************************** - * DwmGetGraphicsStreamTransformHint (DWMAPI.@) - */ -HRESULT WINAPI DwmGetGraphicsStreamTransformHint(UINT uIndex, MilMatrix3x2D *pTransform) -{ - FIXME("(%d, %p) stub\n", uIndex, pTransform); - - return E_NOTIMPL; -} - -/********************************************************************** - * DwmEnableBlurBehindWindow (DWMAPI.@) - */ -HRESULT WINAPI DwmEnableBlurBehindWindow(HWND hWnd, const DWM_BLURBEHIND *pBlurBuf) -{ - FIXME("%p %p\n", hWnd, pBlurBuf); - - return E_NOTIMPL; -} - -/********************************************************************** - * DwmDefWindowProc (DWMAPI.@) - */ -BOOL WINAPI DwmDefWindowProc(HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam, LRESULT *plResult) -{ - static int i; - - if (!i++) FIXME("stub\n"); - - return FALSE; -} - -/********************************************************************** - * DwmGetWindowAttribute (DWMAPI.@) - */ -HRESULT WINAPI DwmGetWindowAttribute(HWND hwnd, DWORD attribute, PVOID pv_attribute, DWORD size) -{ - FIXME("(%p %d %p %d) stub\n", hwnd, attribute, pv_attribute, size); - - return E_NOTIMPL; -} - -/********************************************************************** - * DwmRegisterThumbnail (DWMAPI.@) - */ -HRESULT WINAPI DwmRegisterThumbnail(HWND dest, HWND src, PHTHUMBNAIL thumbnail_id) -{ - FIXME("(%p %p %p) stub\n", dest, src, thumbnail_id); - - return E_NOTIMPL; -} - -/********************************************************************** - * DwmGetCompositionTimingInfo (DWMAPI.@) - */ -HRESULT WINAPI DwmGetCompositionTimingInfo(HWND hwnd, DWM_TIMING_INFO *info) -{ - static int i; - - if(!i++) FIXME("(%p %p)\n", hwnd, info); - - return E_NOTIMPL; -} - -/********************************************************************** - * DwmAttachMilContent (DWMAPI.@) - */ -HRESULT WINAPI DwmAttachMilContent(HWND hwnd) -{ - FIXME("(%p) stub\n", hwnd); - return E_NOTIMPL; -} - -/********************************************************************** - * DwmDetachMilContent (DWMAPI.@) - */ -HRESULT WINAPI DwmDetachMilContent(HWND hwnd) -{ - FIXME("(%p) stub\n", hwnd); - return E_NOTIMPL; -} - -/********************************************************************** - * DwmUpdateThumbnailProperties (DWMAPI.@) - */ -HRESULT WINAPI DwmUpdateThumbnailProperties(HTHUMBNAIL thumbnail, const DWM_THUMBNAIL_PROPERTIES *props) -{ - FIXME("(%p, %p) stub\n", thumbnail, props); - return E_NOTIMPL; -} diff --git a/reactos/dll/win32/dwmapi/dwmapi_ros.diff b/reactos/dll/win32/dwmapi/dwmapi_ros.diff deleted file mode 100644 index 48917bd147d..00000000000 --- a/reactos/dll/win32/dwmapi/dwmapi_ros.diff +++ /dev/null @@ -1,48 +0,0 @@ -Index: dwmapi.spec -=================================================================== ---- dwmapi.spec (revision 49877) -+++ dwmapi.spec (working copy) -@@ -1,24 +1,24 @@ --100 stub @ --101 stub @ -+100 stub DWMAPI_100 -+101 stub DWMAPI_101 - 102 stdcall DwmEnableComposition (long) --103 stub @ --104 stub @ --105 stub @ --106 stub @ --107 stub @ --108 stub @ --109 stub @ --110 stub @ --111 stub @ --112 stub @ --113 stub @ -+103 stub DWMAPI_103 -+104 stub DWMAPI_104 -+105 stub DWMAPI_105 -+106 stub DWMAPI_106 -+107 stub DWMAPI_107 -+108 stub DWMAPI_108 -+109 stub DWMAPI_109 -+110 stub DWMAPI_110 -+111 stub DWMAPI_111 -+112 stub DWMAPI_112 -+113 stub DWMAPI_113 - --115 stub @ --116 stub @ --117 stub @ --118 stub @ --119 stub @ --120 stub @ -+115 stub DWMAPI_114 -+116 stub DWMAPI_115 -+117 stub DWMAPI_116 -+118 stub DWMAPI_117 -+119 stub DWMAPI_118 -+120 stub DWMAPI_120 - - @ stub DwmAttachMilContent - @ stub DwmDefWindowProc diff --git a/reactos/dll/win32/dwmapi/version.rc b/reactos/dll/win32/dwmapi/version.rc deleted file mode 100644 index b76f194dd65..00000000000 --- a/reactos/dll/win32/dwmapi/version.rc +++ /dev/null @@ -1,26 +0,0 @@ -/* - * Copyright 2007 Andras Kovacs - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#define WINE_FILEDESCRIPTION_STR "Desktop Window Manager API" -#define WINE_FILENAME_STR "dwmapi.dll" -#define WINE_FILEVERSION 6,0,6000,16386 -#define WINE_FILEVERSION_STR "6.0.6000.16386" -#define WINE_PRODUCTVERSION 6,0,6000,16386 -#define WINE_PRODUCTVERSION_STR "6.0.6000.16386" - -#include "wine/wine_common_ver.rc" diff --git a/reactos/media/doc/README.WINE b/reactos/media/doc/README.WINE index e5bb20c746a..cd2b6829928 100644 --- a/reactos/media/doc/README.WINE +++ b/reactos/media/doc/README.WINE @@ -65,7 +65,6 @@ reactos/dll/win32/cryptnet # Synced to WineStaging-1.7.47 reactos/dll/win32/cryptui # Synced to WineStaging-1.7.47 reactos/dll/win32/dbghelp # Synced to WineStaging-1.7.47 reactos/dll/win32/dciman32 # Synced to WineStaging-1.7.47 -reactos/dll/win32/dwmapi # Synced to WineStaging-1.7.55 reactos/dll/win32/faultrep # Synced to WineStaging-1.7.47 reactos/dll/win32/fltlib # Synced to WineStaging-1.7.47 reactos/dll/win32/fusion # Synced to WineStaging-1.7.47