Author: akhaldi Date: Mon Sep 16 14:56:39 2013 New Revision: 60166
URL: http://svn.reactos.org/svn/reactos?rev=60166&view=rev Log: [DWMAPI] * Sync with Wine 1.7.1.
Modified: trunk/reactos/dll/win32/dwmapi/CMakeLists.txt trunk/reactos/dll/win32/dwmapi/dwmapi.spec trunk/reactos/dll/win32/dwmapi/dwmapi_main.c trunk/reactos/include/psdk/dwmapi.h trunk/reactos/media/doc/README.WINE
Modified: trunk/reactos/dll/win32/dwmapi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dwmapi/CMakeLists... ============================================================================== --- trunk/reactos/dll/win32/dwmapi/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/dwmapi/CMakeLists.txt [iso-8859-1] Mon Sep 16 14:56:39 2013 @@ -6,11 +6,10 @@
list(APPEND SOURCE dwmapi_main.c - version.rc ${CMAKE_CURRENT_BINARY_DIR}/dwmapi_stubs.c ${CMAKE_CURRENT_BINARY_DIR}/dwmapi.def)
-add_library(dwmapi SHARED ${SOURCE}) +add_library(dwmapi SHARED ${SOURCE} version.rc) set_module_type(dwmapi win32dll) target_link_libraries(dwmapi wine) add_importlibs(dwmapi msvcrt kernel32 ntdll)
Modified: trunk/reactos/dll/win32/dwmapi/dwmapi.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dwmapi/dwmapi.spe... ============================================================================== --- trunk/reactos/dll/win32/dwmapi/dwmapi.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/dwmapi/dwmapi.spec [iso-8859-1] Mon Sep 16 14:56:39 2013 @@ -28,7 +28,7 @@ @ stdcall DwmExtendFrameIntoClientArea(long ptr) @ stdcall DwmFlush() @ stdcall DwmGetColorizationColor(ptr long) -@ stub DwmGetCompositionTimingInfo +@ stdcall DwmGetCompositionTimingInfo(long ptr) @ stdcall DwmGetGraphicsStreamClient(long ptr) @ stdcall DwmGetGraphicsStreamTransformHint(long ptr) @ stdcall DwmGetTransportAttributes(ptr ptr ptr)
Modified: trunk/reactos/dll/win32/dwmapi/dwmapi_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dwmapi/dwmapi_mai... ============================================================================== --- trunk/reactos/dll/win32/dwmapi/dwmapi_main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/dwmapi/dwmapi_main.c [iso-8859-1] Mon Sep 16 14:56:39 2013 @@ -212,3 +212,15 @@
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; +}
Modified: trunk/reactos/include/psdk/dwmapi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/dwmapi.h?rev=6... ============================================================================== --- trunk/reactos/include/psdk/dwmapi.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/dwmapi.h [iso-8859-1] Mon Sep 16 14:56:39 2013 @@ -32,6 +32,59 @@ DECLARE_HANDLE(HTHUMBNAIL); typedef HTHUMBNAIL *PHTHUMBNAIL;
+#include <pshpack1.h> + +typedef ULONGLONG DWM_FRAME_COUNT; +typedef ULONGLONG QPC_TIME; + +typedef struct _UNSIGNED_RATIO { + UINT32 uiNumerator; + UINT32 uiDenominator; +} UNSIGNED_RATIO; + +typedef struct _DWM_TIMING_INFO { + UINT32 cbSize; + UNSIGNED_RATIO rateRefresh; + QPC_TIME qpcRefreshPeriod; + UNSIGNED_RATIO rateCompose; + QPC_TIME qpcVBlank; + DWM_FRAME_COUNT cRefresh; + UINT cDXRefresh; + QPC_TIME qpcCompose; + DWM_FRAME_COUNT cFrame; + UINT cDXPresent; + DWM_FRAME_COUNT cRefreshFrame; + DWM_FRAME_COUNT cFrameSubmitted; + UINT cDXPresentSubmitted; + DWM_FRAME_COUNT cFrameConfirmed; + UINT cDXPresentConfirmed; + DWM_FRAME_COUNT cRefreshConfirmed; + UINT cDXRefreshConfirmed; + DWM_FRAME_COUNT cFramesLate; + UINT cFramesOutstanding; + DWM_FRAME_COUNT cFrameDisplayed; + QPC_TIME qpcFrameDisplayed; + DWM_FRAME_COUNT cRefreshFrameDisplayed; + DWM_FRAME_COUNT cFrameComplete; + QPC_TIME qpcFrameComplete; + DWM_FRAME_COUNT cFramePending; + QPC_TIME qpcFramePending; + DWM_FRAME_COUNT cFramesDisplayed; + DWM_FRAME_COUNT cFramesComplete; + DWM_FRAME_COUNT cFramesPending; + DWM_FRAME_COUNT cFramesAvailable; + DWM_FRAME_COUNT cFramesDropped; + DWM_FRAME_COUNT cFramesMissed; + DWM_FRAME_COUNT cRefreshNextDisplayed; + DWM_FRAME_COUNT cRefreshNextPresented; + DWM_FRAME_COUNT cRefreshesDisplayed; + DWM_FRAME_COUNT cRefreshesPresented; + DWM_FRAME_COUNT cRefreshStarted; + ULONGLONG cPixelsReceived; + ULONGLONG cPixelsDrawn; + DWM_FRAME_COUNT cBuffersEmpty; +} DWM_TIMING_INFO; + typedef struct _MilMatrix3x2D { DOUBLE S_11; @@ -41,6 +94,8 @@ DOUBLE DX; DOUBLE DY; } MilMatrix3x2D; + +#include <poppack.h>
#define DWM_BB_ENABLE 0x00000001 #define DWM_BB_BLURREGION 0x00000002 @@ -60,6 +115,7 @@ DWMAPI DwmEnableMMCSS(BOOL); DWMAPI DwmExtendFrameIntoClientArea(HWND,const MARGINS*); DWMAPI DwmGetColorizationColor(DWORD*,BOOL); +DWMAPI DwmGetCompositionTimingInfo(HWND,DWM_TIMING_INFO*); DWMAPI DwmIsCompositionEnabled(BOOL*); DWMAPI DwmRegisterThumbnail(HWND, HWND, PHTHUMBNAIL); DWMAPI DwmSetWindowAttribute(HWND, DWORD, LPCVOID, DWORD);
Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=6... ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Mon Sep 16 14:56:39 2013 @@ -70,7 +70,7 @@ reactos/dll/win32/cryptui # Synced to Wine-1.7.1 reactos/dll/win32/dbghelp # Synced to Wine-1.7.1 reactos/dll/win32/dciman32 # Synced to Wine-1.7.1 -reactos/dll/win32/dwmapi # Synced to Wine-1.5.19 +reactos/dll/win32/dwmapi # Synced to Wine-1.7.1 reactos/dll/win32/faultrep # Synced to Wine-1.5.4 reactos/dll/win32/fusion # Synced to Wine-1.5.26 reactos/dll/win32/gdiplus # Synced to Wine-1.5.26
-
akhaldi＠svn.reactos.org