Ros-diffs September 2023

ros-diffs@reactos.org

23 participants
113 discussions

[reactos] 01/01: [SDK:RTL] RtlpCallQueryRegistryRoutine(): Correctly set SpareData and SpareLength (#5466)

by Jose Carlos Jesus

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=02883d1c163c3e11c95ff… commit 02883d1c163c3e11c95ffb873f071be384b13bda Author: Jose Carlos Jesus <zecarlos1957(a)hotmail.com> AuthorDate: Wed Sep 20 12:06:06 2023 -0400 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Sep 20 18:06:06 2023 +0200 [SDK:RTL] RtlpCallQueryRegistryRoutine(): Correctly set SpareData and SpareLength (#5466) SpareData and SpareLength need to be calculated correctly, as they are used later in that function as well. This allows to not overwrite Source UString when writing to Destination UString. Fixes the problem described in the following JIRA issue, where services could not start when installing ReactOS in a very-long-named directory. CORE-18988 --- sdk/lib/rtl/registry.c | 54 +++++++++++++++++++++++++------------------------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/sdk/lib/rtl/registry.c b/sdk/lib/rtl/registry.c index 3172213265f..8beeb388ab8 100644 --- a/sdk/lib/rtl/registry.c +++ b/sdk/lib/rtl/registry.c @@ -196,36 +196,36 @@ RtlpCallQueryRegistryRoutine(IN PRTL_QUERY_REGISTRY_TABLE QueryTable, } else { - /* Check if this isn't a direct return */ - if (!(QueryTable->Flags & RTL_QUERY_REGISTRY_DIRECT)) + /* Check if we have length */ + if (KeyValueInfo->DataLength) { - /* Check if we have length */ - if (KeyValueInfo->DataLength) - { - /* Increase the spare data */ - SpareData += KeyValueInfo->DataOffset + - KeyValueInfo->DataLength; - } - else - { - /* Otherwise, the spare data only has the name data */ - SpareData += FIELD_OFFSET(KEY_VALUE_FULL_INFORMATION, Name) + - KeyValueInfo->NameLength; - } + /* Increase the spare data */ + SpareData += KeyValueInfo->DataOffset + + KeyValueInfo->DataLength; + } + else + { + /* Otherwise, the spare data only has the name data */ + SpareData += FIELD_OFFSET(KEY_VALUE_FULL_INFORMATION, Name) + + KeyValueInfo->NameLength; + } - /* Align the pointer and get new size of spare data */ - SpareData = (PVOID)(((ULONG_PTR)SpareData + 7) & ~7); - SpareLength = DataEnd - SpareData; + /* Align the pointer and get new size of spare data */ + SpareData = (PVOID)(((ULONG_PTR)SpareData + 7) & ~7); + SpareLength = DataEnd - SpareData; - /* Check if we have space to copy the data */ - RequiredLength = KeyValueInfo->NameLength + sizeof(UNICODE_NULL); - if ((SpareData > DataEnd) || (SpareLength < RequiredLength)) - { - /* Fail and return the missing length */ - *InfoSize = (ULONG)(SpareData - (PCHAR)KeyValueInfo) + RequiredLength; - return STATUS_BUFFER_TOO_SMALL; - } + /* Check if we have space to copy the data */ + RequiredLength = KeyValueInfo->NameLength + sizeof(UNICODE_NULL); + if ((SpareData > DataEnd) || (SpareLength < RequiredLength)) + { + /* Fail and return the missing length */ + *InfoSize = (ULONG)(SpareData - (PCHAR)KeyValueInfo) + RequiredLength; + return STATUS_BUFFER_TOO_SMALL; + } + /* Check if this isn't a direct return */ + if (!(QueryTable->Flags & RTL_QUERY_REGISTRY_DIRECT)) + { /* Copy the data and null-terminate it */ Name = (PWCHAR)SpareData; RtlCopyMemory(Name, KeyValueInfo->Name, KeyValueInfo->NameLength); @@ -330,7 +330,7 @@ RtlpCallQueryRegistryRoutine(IN PRTL_QUERY_REGISTRY_TABLE QueryTable, RtlInitEmptyUnicodeString(&Source, Data, (USHORT)Length); Source.Length = Source.MaximumLength - sizeof(UNICODE_NULL); - /* Setup the desination string */ + /* Setup the destination string */ RtlInitEmptyUnicodeString(&Destination, (PWCHAR)SpareData, 0); /* Check if we're out of space */

1 year, 3 months

[reactos] 01/01: [ATL][ATL_APITEST] Independent ReactOS ATL (RATL) support (#5657)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ebfec38cd1f0d428d8bfd… commit ebfec38cd1f0d428d8bfd00aa6efcffcd6d8bc4f Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Wed Sep 20 12:02:33 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Sep 20 12:02:33 2023 +0900 [ATL][ATL_APITEST] Independent ReactOS ATL (RATL) support (#5657) This is an attempt to make ReactOS ATL (RATL) independent. https://github.com/katahiromz/RATL CORE-19153 --- modules/rostests/apitests/atl/CComObject.cpp | 4 ++-- modules/rostests/apitests/atl/CComQIPtr.cpp | 2 ++ sdk/lib/atl/atlsimpstr.h | 6 ++++++ sdk/lib/atl/atlwin.h | 6 ++++++ 4 files changed, 16 insertions(+), 2 deletions(-) diff --git a/modules/rostests/apitests/atl/CComObject.cpp b/modules/rostests/apitests/atl/CComObject.cpp index 396290dfd5e..8f486c8fb6e 100644 --- a/modules/rostests/apitests/atl/CComObject.cpp +++ b/modules/rostests/apitests/atl/CComObject.cpp @@ -63,13 +63,13 @@ public: END_COM_MAP() }; - +#ifndef __RATL__ // Avoid conflict (causing assertion at CAtlModule::CAtlModule) class CDumExe: public CAtlExeModuleT<CDumExe> { }; CDumExe dum; - +#endif START_TEST(CComObject) { diff --git a/modules/rostests/apitests/atl/CComQIPtr.cpp b/modules/rostests/apitests/atl/CComQIPtr.cpp index 1ab179bb176..ed411141455 100644 --- a/modules/rostests/apitests/atl/CComQIPtr.cpp +++ b/modules/rostests/apitests/atl/CComQIPtr.cpp @@ -80,6 +80,8 @@ public: #define DECLARE_QIPTR(type) CComQIIDPtr<I_ID(type)> #elif defined(__GNUC__) #define DECLARE_QIPTR(type) CComQIIDPtr<I_ID(type)> +#elif defined(__RATL__) +#define DECLARE_QIPTR(type) CComQIIDPtr<I_ID(type)> #else #define DECLARE_QIPTR(type) CComQIPtr<type> #endif diff --git a/sdk/lib/atl/atlsimpstr.h b/sdk/lib/atl/atlsimpstr.h index 7d78f41abc4..a2956a9abbe 100644 --- a/sdk/lib/atl/atlsimpstr.h +++ b/sdk/lib/atl/atlsimpstr.h @@ -6,6 +6,12 @@ #include <atlcore.h> #include <atlexcept.h> +#ifdef __RATL__ + #ifndef _In_count_ + #define _In_count_(nLength) + #endif +#endif + namespace ATL { struct CStringData; diff --git a/sdk/lib/atl/atlwin.h b/sdk/lib/atl/atlwin.h index 69225fe262c..19d438523cc 100644 --- a/sdk/lib/atl/atlwin.h +++ b/sdk/lib/atl/atlwin.h @@ -49,6 +49,12 @@ inline LONG_PTR GetWindowLongPtr(HWND hWnd, int nIndex) #pragma push_macro("SubclassWindow") #undef SubclassWindow +#ifdef __RATL__ + #ifndef _Post_z_ + #define _Post_z_ + #endif +#endif + namespace ATL {

1 year, 3 months

[reactos] 01/01: [DDK] wsk header: Add WSKAPI to exported functions. (#5687)

by Johannes Thoma

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=490fbfb2c599f61c780fa… commit 490fbfb2c599f61c780fae8e60cd5e45b3f21ffe Author: Johannes Thoma <johannes(a)johannesthoma.com> AuthorDate: Tue Sep 19 17:28:19 2023 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Tue Sep 19 18:28:19 2023 +0300 [DDK] wsk header: Add WSKAPI to exported functions. (#5687) Names need decoration (stdcall) in order to be linked. When using the wsk.h header functions exported therein should be WSKAPI (which enforces the stdcall calling convention). Linking would later fail because stdcall functions are named differently in the object code. --- sdk/include/ddk/wsk.h | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/sdk/include/ddk/wsk.h b/sdk/include/ddk/wsk.h index e9458e8d882..0fe2fd3fd60 100644 --- a/sdk/include/ddk/wsk.h +++ b/sdk/include/ddk/wsk.h @@ -585,28 +585,33 @@ typedef struct _WSK_TRANSPORT _Must_inspect_result_ NTSTATUS +WSKAPI WskRegister( _In_ PWSK_CLIENT_NPI WskClientNpi, _Out_ PWSK_REGISTRATION WskRegistration); _Must_inspect_result_ NTSTATUS +WSKAPI WskCaptureProviderNPI( _In_ PWSK_REGISTRATION WskRegistration, _In_ ULONG WaitTimeout, _Out_ PWSK_PROVIDER_NPI WskProviderNpi); VOID +WSKAPI WskReleaseProviderNPI( _In_ PWSK_REGISTRATION WskRegistration); _Must_inspect_result_ NTSTATUS +WSKAPI WskQueryProviderCharacteristics( _In_ PWSK_REGISTRATION WskRegistration, _Out_ PWSK_PROVIDER_CHARACTERISTICS WskProviderCharacteristics); VOID +WSKAPI WskDeregister( _In_ PWSK_REGISTRATION WskRegistration);

1 year, 3 months

[reactos] 01/01: [ATL] CImage: Follow-up to #5702 (5da3ed6)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8d74bc4b46ffcf5d06ef4… commit 8d74bc4b46ffcf5d06ef44b0117eb7b10b8f5eeb Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Wed Sep 20 00:04:45 2023 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Wed Sep 20 00:04:45 2023 +0900 [ATL] CImage: Follow-up to #5702 (5da3ed6) Fix the return value of CImage::Detach. CORE-19008 --- sdk/lib/atl/atlimage.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk/lib/atl/atlimage.h b/sdk/lib/atl/atlimage.h index 84c6d63e511..21d5752280d 100644 --- a/sdk/lib/atl/atlimage.h +++ b/sdk/lib/atl/atlimage.h @@ -65,7 +65,7 @@ public: HBITMAP Detach() noexcept { - m_hOldBitmap = m_hBitmap = NULL; + m_hOldBitmap = NULL; m_nWidth = m_nHeight = m_nPitch = m_nBPP = 0; m_pBits = NULL;

1 year, 3 months

[reactos] 01/01: [COMDLG32] Implement CDM_SETDEFEXT (#5704)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6911fab69ad1a4a147c9d… commit 6911fab69ad1a4a147c9dceaf52ecfee61055c77 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Tue Sep 19 22:17:48 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Tue Sep 19 22:17:48 2023 +0900 [COMDLG32] Implement CDM_SETDEFEXT (#5704) - CDM_SETDEFEXT message handling was a missing feature of COMDLG32. - Make info->defext dynamic allocation. - On CDM_SETDEFEXT handling, replace info->defext data. CORE-15020 --- dll/win32/comdlg32/filedlg.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) diff --git a/dll/win32/comdlg32/filedlg.c b/dll/win32/comdlg32/filedlg.c index 8aa8eae3987..0adb3357b3a 100644 --- a/dll/win32/comdlg32/filedlg.c +++ b/dll/win32/comdlg32/filedlg.c @@ -552,7 +552,17 @@ static void init_filedlg_infoW(OPENFILENAMEW *ofn, FileOpenDlgInfos *info) info->ofnInfos = ofn; info->title = ofn->lpstrTitle; +#ifdef __REACTOS__ + if (ofn->lpstrDefExt) + { + INT cchExt = lstrlenW(ofn->lpstrDefExt); + LPWSTR pszExt = heap_alloc((cchExt + 1) * sizeof(WCHAR)); + lstrcpyW(pszExt, ofn->lpstrDefExt); + info->defext = pszExt; + } +#else info->defext = ofn->lpstrDefExt; +#endif info->filter = ofn->lpstrFilter; info->customfilter = ofn->lpstrCustomFilter; @@ -697,6 +707,12 @@ static BOOL GetFileDialog95(FileOpenDlgInfos *info, UINT dlg_type) heap_free((void *)info->filter); heap_free((void *)info->customfilter); } +#ifdef __REACTOS__ + else + { + heap_free((void *)info->defext); + } +#endif heap_free(info->filename); heap_free(info->initdir); @@ -1207,6 +1223,34 @@ static INT_PTR FILEDLG95_HandleCustomDialogMessages(HWND hwnd, UINT uMsg, WPARAM else retval = FALSE; break; +#ifdef __REACTOS__ + case CDM_SETDEFEXT: + { + LPWSTR olddefext = (LPWSTR)fodInfos->defext; + fodInfos->defext = NULL; + + if (fodInfos->unicode) + { + LPCWSTR pszExt = (LPCWSTR)lParam; + if (pszExt) + { + INT cchExt = lstrlenW(pszExt); + fodInfos->defext = heap_alloc((cchExt + 1) * sizeof(WCHAR)); + lstrcpyW((LPWSTR)fodInfos->defext, pszExt); + } + } + else + { + LPCSTR pszExt = (LPCSTR)lParam; + if (pszExt) + fodInfos->defext = heap_strdupAtoW(pszExt); + } + + heap_free(olddefext); + break; + } +#endif + default: if (uMsg >= CDM_FIRST && uMsg <= CDM_LAST) FIXME("message CDM_FIRST+%04x not implemented\n", uMsg - CDM_FIRST);

1 year, 3 months

[reactos] 01/01: [ATL] Fix CImage members (#5702)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5da3ed638be708a6501b4… commit 5da3ed638be708a6501b49794059ef35e224ce7a Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Tue Sep 19 22:19:03 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Tue Sep 19 22:19:03 2023 +0900 [ATL] Fix CImage members (#5702) - Delete m_ds and m_bm members from CImage. - Add m_nWidth, m_nHeight, m_nPitch, m_nBPP, and m_pBits members. CORE-19008 --- sdk/lib/atl/atlimage.h | 117 ++++++++++++++++++++++--------------------------- 1 file changed, 53 insertions(+), 64 deletions(-) diff --git a/sdk/lib/atl/atlimage.h b/sdk/lib/atl/atlimage.h index 874ef0f60e8..84c6d63e511 100644 --- a/sdk/lib/atl/atlimage.h +++ b/sdk/lib/atl/atlimage.h @@ -39,16 +39,6 @@ public: CImage() noexcept { - m_hBitmap = NULL; - m_hOldBitmap = NULL; - m_hDC = NULL; - - m_eOrientation = DIBOR_DEFAULT; - m_bHasAlphaChannel = false; - m_bIsDIBSection = false; - m_clrTransparentColor = CLR_INVALID; - ZeroMemory(&m_ds, sizeof(m_ds)); - s_gdiplus.IncreaseCImageCount(); } @@ -75,10 +65,12 @@ public: HBITMAP Detach() noexcept { - m_eOrientation = DIBOR_DEFAULT; - m_bHasAlphaChannel = false; + m_hOldBitmap = m_hBitmap = NULL; + m_nWidth = m_nHeight = m_nPitch = m_nBPP = 0; + m_pBits = NULL; + + m_bHasAlphaChannel = m_bIsDIBSection = FALSE; m_clrTransparentColor = CLR_INVALID; - ZeroMemory(&m_ds, sizeof(m_ds)); HBITMAP hBitmap = m_hBitmap; m_hBitmap = NULL; @@ -275,12 +267,7 @@ public: void *GetBits() noexcept { ATLASSERT(IsDIBSection()); - BYTE *pb = (BYTE *)m_bm.bmBits; - if (m_eOrientation == DIBOR_BOTTOMUP) - { - pb += m_bm.bmWidthBytes * (m_bm.bmHeight - 1); - } - return pb; + return m_pBits; } const void *GetBits() const noexcept @@ -291,7 +278,7 @@ public: int GetBPP() const noexcept { ATLASSERT(m_hBitmap); - return m_bm.bmBitsPixel; + return m_nBPP; } void GetColorTable(UINT iFirstColor, UINT nColors, @@ -306,24 +293,18 @@ public: int GetHeight() const noexcept { ATLASSERT(m_hBitmap); - return m_bm.bmHeight; + return m_nHeight; } int GetMaxColorTableEntries() const noexcept { ATLASSERT(IsDIBSection()); - if (m_ds.dsBmih.biClrUsed && m_ds.dsBmih.biBitCount < 16) - return m_ds.dsBmih.biClrUsed; - switch (m_bm.bmBitsPixel) + switch (m_nBPP) { - case 1: return 2; - case 4: return 16; - case 8: return 256; - case 16: case 32: - if (m_ds.dsBmih.biCompression == BI_BITFIELDS) - return 3; - return 0; - case 24: + case 1: case 4: case 8: + return (1 << m_nBPP); + + case 16: case 24: case 32: default: return 0; } @@ -332,10 +313,7 @@ public: int GetPitch() const noexcept { ATLASSERT(IsDIBSection()); - if (m_eOrientation == DIBOR_BOTTOMUP) - return -m_bm.bmWidthBytes; - else - return m_bm.bmWidthBytes; + return m_nPitch; } COLORREF GetPixel(int x, int y) const noexcept @@ -368,7 +346,7 @@ public: int GetWidth() const noexcept { ATLASSERT(m_hBitmap); - return m_bm.bmWidth; + return m_nWidth; } bool IsDIBSection() const noexcept @@ -1030,21 +1008,18 @@ private: } private: - // FIXME: MS ATL CImage has m_nWidth, m_nHeight, m_nPitch, m_nBPP, and m_pBits. - // FIXME: MS ATL CImage hasn't m_eOrientation, m_bm, and m_ds. - HBITMAP m_hBitmap; - mutable HBITMAP m_hOldBitmap; - mutable HDC m_hDC; - mutable LONG m_nDCRefCount = 0; - DIBOrientation m_eOrientation; - bool m_bHasAlphaChannel; - bool m_bIsDIBSection; - COLORREF m_clrTransparentColor; - union - { - BITMAP m_bm; - DIBSECTION m_ds; - }; + HBITMAP m_hBitmap = NULL; + mutable HBITMAP m_hOldBitmap = NULL; + INT m_nWidth = 0; + INT m_nHeight = 0; + INT m_nPitch = 0; + INT m_nBPP = 0; + LPVOID m_pBits = NULL; + BOOL m_bHasAlphaChannel = FALSE; + BOOL m_bIsDIBSection = FALSE; + COLORREF m_clrTransparentColor = CLR_INVALID; + mutable HDC m_hDC = NULL; + mutable LONG m_nDCRefCount = 0; LPCWSTR GetFileExtension(LPCWSTR pszFileName) const { @@ -1150,26 +1125,40 @@ private: { Destroy(); - const int size = sizeof(DIBSECTION); - m_bIsDIBSection = (::GetObject(hBitmap, size, &m_ds) == size); + DIBSECTION ds; + BITMAP& bm = ds.dsBm; + + m_bIsDIBSection = (::GetObjectW(hBitmap, sizeof(ds), &ds) == sizeof(ds)); - bool bOK = (::GetObject(hBitmap, sizeof(BITMAP), &m_bm) != 0); - if (!bOK) + if (!m_bIsDIBSection && !::GetObjectW(hBitmap, sizeof(bm), &bm)) return; m_hBitmap = hBitmap; + m_nWidth = bm.bmWidth; + m_nHeight = bm.bmHeight; + m_nBPP = bm.bmBitsPixel; + m_bHasAlphaChannel = (bm.bmBitsPixel == 32); + m_clrTransparentColor = CLR_INVALID; - if (m_bIsDIBSection && eOrientation == DIBOR_DEFAULT) + m_nPitch = 0; + m_pBits = NULL; + if (m_bIsDIBSection) { - if (m_ds.dsBmih.biHeight < 0) - eOrientation = DIBOR_TOPDOWN; + if (eOrientation == DIBOR_DEFAULT) + eOrientation = ((ds.dsBmih.biHeight < 0) ? DIBOR_TOPDOWN : DIBOR_BOTTOMUP); + + LPBYTE pb = (LPBYTE)bm.bmBits; + if (eOrientation == DIBOR_BOTTOMUP) + { + m_nPitch = -bm.bmWidthBytes; + m_pBits = pb + bm.bmWidthBytes * (m_nHeight - 1); + } else - eOrientation = DIBOR_BOTTOMUP; + { + m_nPitch = bm.bmWidthBytes; + m_pBits = pb; + } } - m_eOrientation = eOrientation; - - m_bHasAlphaChannel = (m_bm.bmBitsPixel == 32); - m_clrTransparentColor = CLR_INVALID; } BOOL CreateInternal(int nWidth, int nHeight, int nBPP,

1 year, 3 months

[reactos] 01/01: [ATL] Default value of dwInitParam is zero instead of NULL (#5703)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3fa90b539e24d44bf8a05… commit 3fa90b539e24d44bf8a0587ffb0d060ad0c6350b Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Tue Sep 19 17:28:33 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Tue Sep 19 17:28:33 2023 +0900 [ATL] Default value of dwInitParam is zero instead of NULL (#5703) Fix warnings when dwInitParam was omitted at CDialogImpl::Create and/or CDialogImpl::DoModal. --- sdk/lib/atl/atlwin.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sdk/lib/atl/atlwin.h b/sdk/lib/atl/atlwin.h index b970fe7b173..69225fe262c 100644 --- a/sdk/lib/atl/atlwin.h +++ b/sdk/lib/atl/atlwin.h @@ -1478,7 +1478,7 @@ public: using CWindowImplRoot<TBase>::m_hWnd; // - Hacks for gcc - HWND Create(HWND hWndParent, LPARAM dwInitParam = NULL) + HWND Create(HWND hWndParent, LPARAM dwInitParam = 0) { BOOL result; HWND hWnd; @@ -1495,7 +1495,7 @@ public: return hWnd; } - INT_PTR DoModal(HWND hWndParent = ::GetActiveWindow(), LPARAM dwInitParam = NULL) + INT_PTR DoModal(HWND hWndParent = ::GetActiveWindow(), LPARAM dwInitParam = 0) { BOOL result; T* pImpl;

1 year, 3 months

[reactos] 01/01: [SHLWAPI][SHLWAPI_APITEST] Fix SHGetPerScreenResName (#5701)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ff5ccb5948b32b46bb4a1… commit ff5ccb5948b32b46bb4a1b4e59255b865dfbbae3 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Tue Sep 19 11:02:59 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Tue Sep 19 11:02:59 2023 +0900 [SHLWAPI][SHLWAPI_APITEST] Fix SHGetPerScreenResName (#5701) Use HORZRES and VERTRES instead of SM_CXFULLSCREEN and SM_CYFULLSCREEN. CORE-9283 --- dll/win32/shlwapi/propbag.cpp | 7 +++++-- modules/rostests/apitests/shlwapi/CMakeLists.txt | 2 +- modules/rostests/apitests/shlwapi/SHPropertyBag.cpp | 10 +++++++--- 3 files changed, 13 insertions(+), 6 deletions(-) diff --git a/dll/win32/shlwapi/propbag.cpp b/dll/win32/shlwapi/propbag.cpp index c355647166e..98d2bc45926 100644 --- a/dll/win32/shlwapi/propbag.cpp +++ b/dll/win32/shlwapi/propbag.cpp @@ -1947,9 +1947,12 @@ SHGetPerScreenResName( if (dwReserved) return 0; - INT cxWidth = ::GetSystemMetrics(SM_CXFULLSCREEN); - INT cyHeight = ::GetSystemMetrics(SM_CYFULLSCREEN); + HDC hDC = ::GetDC(NULL); + INT cxWidth = ::GetDeviceCaps(hDC, HORZRES); + INT cyHeight = ::GetDeviceCaps(hDC, VERTRES); INT cMonitors = ::GetSystemMetrics(SM_CMONITORS); + ::ReleaseDC(NULL, hDC); + StringCchPrintfW(pszBuffer, cchBuffer, L"%dx%d(%d)", cxWidth, cyHeight, cMonitors); return lstrlenW(pszBuffer); } diff --git a/modules/rostests/apitests/shlwapi/CMakeLists.txt b/modules/rostests/apitests/shlwapi/CMakeLists.txt index d5c4d32562e..8eeb818902c 100644 --- a/modules/rostests/apitests/shlwapi/CMakeLists.txt +++ b/modules/rostests/apitests/shlwapi/CMakeLists.txt @@ -25,6 +25,6 @@ add_rc_deps(testdata.rc ${CMAKE_CURRENT_BINARY_DIR}/shlwapi_resource_dll/shlwapi add_executable(shlwapi_apitest ${SOURCE}) set_module_type(shlwapi_apitest win32cui) target_link_libraries(shlwapi_apitest ${PSEH_LIB} uuid) -add_importlibs(shlwapi_apitest shlwapi oleaut32 ole32 user32 advapi32 msvcrt kernel32) +add_importlibs(shlwapi_apitest shlwapi oleaut32 ole32 user32 gdi32 advapi32 msvcrt kernel32) add_dependencies(shlwapi_apitest shlwapi_resource_dll) add_rostests_file(TARGET shlwapi_apitest) diff --git a/modules/rostests/apitests/shlwapi/SHPropertyBag.cpp b/modules/rostests/apitests/shlwapi/SHPropertyBag.cpp index eae457b698e..c155693e214 100644 --- a/modules/rostests/apitests/shlwapi/SHPropertyBag.cpp +++ b/modules/rostests/apitests/shlwapi/SHPropertyBag.cpp @@ -826,10 +826,14 @@ static void SHPropertyBag_OnIniFile(void) static void SHPropertyBag_PerScreenRes(void) { + HDC hDC = GetDC(NULL); + INT cxWidth = GetDeviceCaps(hDC, HORZRES); + INT cyHeight = GetDeviceCaps(hDC, VERTRES); + INT cMonitors = GetSystemMetrics(SM_CMONITORS); + ReleaseDC(NULL, hDC); + WCHAR szBuff1[64], szBuff2[64]; - StringCchPrintfW(szBuff1, _countof(szBuff1), L"%dx%d(%d)", - GetSystemMetrics(SM_CXFULLSCREEN), GetSystemMetrics(SM_CYFULLSCREEN), - GetSystemMetrics(SM_CMONITORS)); + StringCchPrintfW(szBuff1, _countof(szBuff1), L"%dx%d(%d)", cxWidth, cyHeight, cMonitors); szBuff2[0] = UNICODE_NULL; SHGetPerScreenResName(szBuff2, _countof(szBuff2), 0);

1 year, 3 months

[reactos] 01/01: [ATL_APITEST] atlconv: Disable corner case test of CWAEX

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=08cc45eef97e3a96e2747… commit 08cc45eef97e3a96e274703b5ff02c809a93cc41 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Tue Sep 19 10:45:46 2023 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Tue Sep 19 10:45:46 2023 +0900 [ATL_APITEST] atlconv: Disable corner case test of CWAEX --- modules/rostests/apitests/atl/atlconv.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/rostests/apitests/atl/atlconv.cpp b/modules/rostests/apitests/atl/atlconv.cpp index 96cbac21790..fc622e77c8c 100644 --- a/modules/rostests/apitests/atl/atlconv.cpp +++ b/modules/rostests/apitests/atl/atlconv.cpp @@ -122,7 +122,7 @@ START_TEST(atlconv) CW2AEX<5> w2ax(L"123"); ok_str((LPSTR)w2ax, "123"); ok_str(w2ax.m_psz, "123"); - ok(w2ax.m_psz != w2ax.m_szBuffer, "w2ax.m_psz == w2ax.m_szBuffer\n"); // corner case + //ok(w2ax.m_psz != w2ax.m_szBuffer, "w2ax.m_psz == w2ax.m_szBuffer\n"); // corner case CA2WEX<5> a2wx("123"); ok_wstr((LPWSTR)a2wx, L"123");

1 year, 3 months

[reactos] 01/01: [WINESYNC][SDK][DWMAPI] Import DWMAPI from WINE 8-14 (#5594)

by Justin Miller

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6bbf09b6a5002da661965… commit 6bbf09b6a5002da661965c9106ee079736316a3a Author: Justin Miller <justin.miller(a)reactos.org> AuthorDate: Mon Sep 18 07:30:44 2023 -0700 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Sep 18 07:30:44 2023 -0700 [WINESYNC][SDK][DWMAPI] Import DWMAPI from WINE 8-14 (#5594) --- dll/win32/CMakeLists.txt | 4 + dll/win32/dwmapi/CMakeLists.txt | 19 +++ dll/win32/dwmapi/dwmapi.spec | 67 ++++++++ dll/win32/dwmapi/dwmapi_main.c | 338 ++++++++++++++++++++++++++++++++++++++++ dll/win32/dwmapi/version.rc | 26 ++++ media/doc/WINESYNC.txt | 1 + sdk/include/psdk/dwmapi.h | 85 +++++++++- sdk/include/psdk/winerror.h | 10 ++ 8 files changed, 548 insertions(+), 2 deletions(-) diff --git a/dll/win32/CMakeLists.txt b/dll/win32/CMakeLists.txt index 50c4080a8ca..da4dfb9162d 100644 --- a/dll/win32/CMakeLists.txt +++ b/dll/win32/CMakeLists.txt @@ -259,3 +259,7 @@ add_subdirectory(xinput1_3) add_subdirectory(xinput9_1_0) add_subdirectory(xmllite) add_subdirectory(xolehlp) + +if(DLL_EXPORT_VERSION GREATER_EQUAL 0x600) + add_subdirectory(dwmapi) +endif() diff --git a/dll/win32/dwmapi/CMakeLists.txt b/dll/win32/dwmapi/CMakeLists.txt new file mode 100644 index 00000000000..2c5eb4f0eca --- /dev/null +++ b/dll/win32/dwmapi/CMakeLists.txt @@ -0,0 +1,19 @@ + +add_definitions(-D__WINESRC__) + +include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine) +spec2def(dwmapi.dll dwmapi.spec) + +list(APPEND SOURCE + dwmapi_main.c) + +add_library(dwmapi MODULE + ${SOURCE} + version.rc + ${CMAKE_CURRENT_BINARY_DIR}/dwmapi.def + ${CMAKE_CURRENT_BINARY_DIR}/dwmapi_stubs.c) + +set_module_type(dwmapi win32dll UNICODE ENTRYPOINT 0) +target_link_libraries(dwmapi uuid wine) +add_importlibs(dwmapi user32 kernel32 ntdll) +add_cd_file(TARGET dwmapi DESTINATION reactos/system32 FOR all) diff --git a/dll/win32/dwmapi/dwmapi.spec b/dll/win32/dwmapi/dwmapi.spec new file mode 100644 index 00000000000..8477d9150ad --- /dev/null +++ b/dll/win32/dwmapi/dwmapi.spec @@ -0,0 +1,67 @@ +100 stub DwmpDxGetWindowSharedSurface +101 stub DwmpDxUpdateWindowSharedSurface +102 stdcall DwmEnableComposition(long) +103 stub -noname DwmpRestartComposition +104 stub -noname DwmpSetColorizationColor +105 stub -noname DwmpStartOrStopFlip3D +106 stub -noname DwmpIsCompositionCapable +107 stub -noname DwmpGetGlobalState +108 stub -noname DwmpEnableRedirection +109 stub -noname DwmpOpenGraphicsStream +110 stub -noname DwmpCloseGraphicsStream +112 stub -noname DwmpSetGraphicsStreamTransformHint +113 stub -noname DwmpActivateLivePreview +114 stub -noname DwmpQueryThumbnailType +115 stub -noname DwmpStartupViaUserInit +118 stub -noname DwmpGetAssessment +119 stub -noname DwmpGetAssessmentUsage +120 stub -noname DwmpSetAssessmentUsage +121 stub -noname DwmpIsSessionDWM +124 stub -noname DwmpRegisterThumbnail +125 stub DwmpDxBindSwapChain +126 stub DwmpDxUnbindSwapChain +127 stdcall -noname DwmpGetColorizationParameters(ptr) +128 stub DwmpDxgiIsThreadDesktopComposited +129 stub -noname DwmpDxgiDisableRedirection +130 stub -noname DwmpDxgiEnableRedirection +131 stub -noname DwmpSetColorizationParameters +132 stub -noname DwmpGetCompositionTimingInfoEx +133 stub DwmpDxUpdateWindowRedirectionBltSurface +134 stub -noname DwmpDxSetContentHostingInformation +135 stub DwmpRenderFlick +136 stub DwmpAllocateSecurityDescriptor +137 stub DwmpFreeSecurityDescriptor +143 stub DwmpEnableDDASupport +156 stub DwmTetherTextContact + +# @ stdcall -private DllCanUnloadNow() +# @ stdcall -private DllGetClassObject(ptr ptr ptr) +@ 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 ptr) +@ 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 DwmRenderGesture +@ stub DwmSetDxFrameDuration +@ stdcall DwmSetIconicLivePreviewBitmap(long long ptr long) +@ stdcall DwmSetIconicThumbnail(long long long) +@ stdcall DwmSetPresentParameters(ptr ptr) +@ stdcall DwmSetWindowAttribute(long long ptr long) +# @ stub DwmShowContact +# @ stub DwmTetherContact +# @ stub DwmTransitionOwnedWindow +@ stdcall DwmUnregisterThumbnail(long) +@ stdcall DwmUpdateThumbnailProperties(ptr ptr) diff --git a/dll/win32/dwmapi/dwmapi_main.c b/dll/win32/dwmapi/dwmapi_main.c new file mode 100644 index 00000000000..2e6a91c7ded --- /dev/null +++ b/dll/win32/dwmapi/dwmapi_main.c @@ -0,0 +1,338 @@ +/* + * 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 + * + */ + +#include <stdarg.h> + +#ifdef __REACTOS__ +#include <rtlfuncs.h> +#else +#include "winternl.h" +#endif + +#define COBJMACROS +#include "windef.h" +#include "winbase.h" +#include "wingdi.h" +#include "winuser.h" +#include "dwmapi.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(dwmapi); + + +/********************************************************************** + * DwmIsCompositionEnabled (DWMAPI.@) + */ +HRESULT WINAPI DwmIsCompositionEnabled(BOOL *enabled) +{ + +#ifdef __REACTOS__ + RTL_OSVERSIONINFOW version; +#else + RTL_OSVERSIONINFOEXW version; +#endif + + TRACE("%p\n", enabled); + + if (!enabled) + return E_INVALIDARG; + + *enabled = FALSE; + version.dwOSVersionInfoSize = sizeof(version); + if (!RtlGetVersion(&version)) + *enabled = (version.dwMajorVersion > 6 || (version.dwMajorVersion == 6 && version.dwMinorVersion >= 3)); + + 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 S_OK; +} + +/********************************************************************** + * DwmGetColorizationColor (DWMAPI.@) + */ +HRESULT WINAPI DwmGetColorizationColor(DWORD *colorization, BOOL *opaque_blend) +{ + FIXME("(%p, %p) stub\n", colorization, opaque_blend); + + return E_NOTIMPL; +} + +/********************************************************************** + * DwmFlush (DWMAPI.@) + */ +HRESULT WINAPI DwmFlush(void) +{ + static BOOL once; + + if (!once++) FIXME("() stub\n"); + + return S_OK; +} + +/********************************************************************** + * 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, %lx, %p, %lx) stub\n", hwnd, attributenum, attribute, size); + + return S_OK; +} + +/********************************************************************** + * 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 DWM_E_COMPOSITIONDISABLED; +} + +/********************************************************************** + * 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 %ld %p %ld) 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; +} + +static int get_display_frequency(void) +{ + DEVMODEW mode; + BOOL ret; + + memset(&mode, 0, sizeof(mode)); + mode.dmSize = sizeof(mode); + ret = EnumDisplaySettingsExW(NULL, ENUM_CURRENT_SETTINGS, &mode, 0); + if (ret && mode.dmFields & DM_DISPLAYFREQUENCY && mode.dmDisplayFrequency) + { + return mode.dmDisplayFrequency; + } + else + { + WARN("Failed to query display frequency, returning a fallback value.\n"); + return 60; + } +} + +/********************************************************************** + * DwmGetCompositionTimingInfo (DWMAPI.@) + */ +HRESULT WINAPI DwmGetCompositionTimingInfo(HWND hwnd, DWM_TIMING_INFO *info) +{ + LARGE_INTEGER performance_frequency, qpc; + static int i, display_frequency; + + if (!info) + return E_INVALIDARG; + + if (info->cbSize != sizeof(DWM_TIMING_INFO)) + return MILERR_MISMATCHED_SIZE; + + if(!i++) FIXME("(%p %p)\n", hwnd, info); + + memset(info, 0, info->cbSize); + info->cbSize = sizeof(DWM_TIMING_INFO); + + display_frequency = get_display_frequency(); + info->rateRefresh.uiNumerator = display_frequency; + info->rateRefresh.uiDenominator = 1; + info->rateCompose.uiNumerator = display_frequency; + info->rateCompose.uiDenominator = 1; + + QueryPerformanceFrequency(&performance_frequency); + info->qpcRefreshPeriod = performance_frequency.QuadPart / display_frequency; + + QueryPerformanceCounter(&qpc); + info->qpcVBlank = (qpc.QuadPart / info->qpcRefreshPeriod) * info->qpcRefreshPeriod; + + return S_OK; +} + +/********************************************************************** + * 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; +} + +/********************************************************************** + * DwmSetPresentParameters (DWMAPI.@) + */ +HRESULT WINAPI DwmSetPresentParameters(HWND hwnd, DWM_PRESENT_PARAMETERS *params) +{ + FIXME("(%p %p) stub\n", hwnd, params); + return S_OK; +}; + +/********************************************************************** + * DwmSetIconicLivePreviewBitmap (DWMAPI.@) + */ +HRESULT WINAPI DwmSetIconicLivePreviewBitmap(HWND hwnd, HBITMAP hbmp, POINT *pos, DWORD flags) +{ + FIXME("(%p %p %p %lx) stub\n", hwnd, hbmp, pos, flags); + return S_OK; +}; + +/********************************************************************** + * DwmSetIconicThumbnail (DWMAPI.@) + */ +HRESULT WINAPI DwmSetIconicThumbnail(HWND hwnd, HBITMAP hbmp, DWORD flags) +{ + FIXME("(%p %p %lx) stub\n", hwnd, hbmp, flags); + return S_OK; +}; + +/********************************************************************** + * DwmpGetColorizationParameters (DWMAPI.@) + */ +HRESULT WINAPI DwmpGetColorizationParameters(void *params) +{ + FIXME("(%p) stub\n", params); + return E_NOTIMPL; +} diff --git a/dll/win32/dwmapi/version.rc b/dll/win32/dwmapi/version.rc new file mode 100644 index 00000000000..b76f194dd65 --- /dev/null +++ b/dll/win32/dwmapi/version.rc @@ -0,0 +1,26 @@ +/* + * 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/media/doc/WINESYNC.txt b/media/doc/WINESYNC.txt index 228295cedb1..f6614ac83a9 100644 --- a/media/doc/WINESYNC.txt +++ b/media/doc/WINESYNC.txt @@ -68,6 +68,7 @@ dll/win32/cryptui # Synced to WineStaging-4.18 dll/win32/dbgeng # Synced to WineStaging-4.18 dll/win32/dbghelp # Synced to WineStaging-5.16 dll/win32/dciman32 # Synced to WineStaging-3.3 +dll/win32/dwmapi # Synced to Wine-8.14 dll/win32/faultrep # Synced to WineStaging-4.18 dll/win32/fontsub # Synced to WineStaging-2.9 dll/win32/fusion # Synced to WineStaging-4.18 diff --git a/sdk/include/psdk/dwmapi.h b/sdk/include/psdk/dwmapi.h index 035c831a2b3..1b19426ce2d 100644 --- a/sdk/include/psdk/dwmapi.h +++ b/sdk/include/psdk/dwmapi.h @@ -34,9 +34,52 @@ typedef HTHUMBNAIL *PHTHUMBNAIL; #include <pshpack1.h> +static const UINT c_DwmMaxQueuedBuffers = 8; +static const UINT c_DwmMaxMonitors = 16; +static const UINT c_DwmMaxAdapters = 16; + typedef ULONGLONG DWM_FRAME_COUNT; typedef ULONGLONG QPC_TIME; +enum DWMWINDOWATTRIBUTE { + DWMWA_NCRENDERING_ENABLED = 1, + DWMWA_NCRENDERING_POLICY, + DWMWA_TRANSITIONS_FORCEDISABLED, + DWMWA_ALLOW_NCPAINT, + DWMWA_CAPTION_BUTTON_BOUNDS, + DWMWA_NONCLIENT_RTL_LAYOUT, + DWMWA_FORCE_ICONIC_REPRESENTATION, + DWMWA_FLIP3D_POLICY, + DWMWA_EXTENDED_FRAME_BOUNDS, + DWMWA_HAS_ICONIC_BITMAP, + DWMWA_DISALLOW_PEEK, + DWMWA_EXCLUDED_FROM_PEEK, + DWMWA_CLOAK, + DWMWA_CLOAKED, + DWMWA_FREEZE_REPRESENTATION, + DWMWA_LAST +}; + +enum DWMNCRENDERINGPOLICY { + DWMNCRP_USEWINDOWSTYLE, + DWMNCRP_DISABLED, + DWMNCRP_ENABLED, + DWMNCRP_LAST +}; + +enum DWMFLIP3DWINDOWPOLICY { + DWMFLIP3D_DEFAULT, + DWMFLIP3D_EXCLUDEBELOW, + DWMFLIP3D_EXCLUDEABOVE, + DWMFLIP3D_LAST +}; + +typedef enum _DWM_SOURCE_FRAME_SAMPLING { + DWM_SOURCE_FRAME_SAMPLING_POINT, + DWM_SOURCE_FRAME_SAMPLING_COVERAGE, + DWM_SOURCE_FRAME_SAMPLING_LAST +} DWM_SOURCE_FRAME_SAMPLING; + typedef struct _UNSIGNED_RATIO { UINT32 uiNumerator; UINT32 uiDenominator; @@ -95,6 +138,11 @@ typedef struct _MilMatrix3x2D DOUBLE DY; } MilMatrix3x2D; +#define DWM_FRAME_DURATION_DEFAULT -1 + +#define DWM_EC_DISABLECOMPOSITION 0 +#define DWM_EC_ENABLECOMPOSITION 1 + #define DWM_BB_ENABLE 0x00000001 #define DWM_BB_BLURREGION 0x00000002 #define DWM_BB_TRANSITIONONMAXIMIZED 0x00000004 @@ -107,6 +155,18 @@ typedef struct _DWM_BLURBEHIND BOOL fTransitionOnMaximized; } DWM_BLURBEHIND, *PDWM_BLURBEHIND; +#define DWM_SIT_DISPLAYFRAME 0x00000001 + +#define DWM_CLOAKED_APP 0x00000001 +#define DWM_CLOAKED_SHELL 0x00000002 +#define DWM_CLOAKED_INHERITED 0x00000004 + +#define DWM_TNP_RECTDESTINATION 0x00000001 +#define DWM_TNP_RECTSOURCE 0x00000002 +#define DWM_TNP_OPACITY 0x00000004 +#define DWM_TNP_VISIBLE 0x00000008 +#define DWM_TNP_SOURCECLIENTAREAONLY 0x00000010 + typedef struct _DWM_THUMBNAIL_PROPERTIES { DWORD dwFlags; @@ -117,18 +177,39 @@ typedef struct _DWM_THUMBNAIL_PROPERTIES BOOL fSourceClientAreaOnly; } DWM_THUMBNAIL_PROPERTIES, *PDWM_THUMBNAIL_PROPERTIES; +typedef struct _DWM_PRESENT_PARAMETERS { + UINT32 cbSize; + BOOL fQueue; + DWM_FRAME_COUNT cRefreshStart; + UINT cBuffer; + BOOL fUseSourceRate; + UNSIGNED_RATIO rateSource; + UINT cRefreshesPerFrame; + DWM_SOURCE_FRAME_SAMPLING eSampling; +} DWM_PRESENT_PARAMETERS; + #include <poppack.h> -DWMAPI DwmDefWindowProc(HWND, UINT, WPARAM, LPARAM, LRESULT*); +DWMAPI DwmAttachMilContent(HWND); +DWMAPI_(BOOL) DwmDefWindowProc(HWND, UINT, WPARAM, LPARAM, LRESULT*); +DWMAPI DwmDetachMilContent(HWND); DWMAPI DwmEnableBlurBehindWindow(HWND, const DWM_BLURBEHIND *); DWMAPI DwmEnableComposition(UINT); DWMAPI DwmEnableMMCSS(BOOL); DWMAPI DwmExtendFrameIntoClientArea(HWND,const MARGINS*); -DWMAPI DwmGetColorizationColor(DWORD*,BOOL); +DWMAPI DwmFlush(void); +DWMAPI DwmGetColorizationColor(DWORD *, BOOL *); DWMAPI DwmGetCompositionTimingInfo(HWND,DWM_TIMING_INFO*); +DWMAPI DwmGetGraphicsStreamClient(UINT, UUID *); +DWMAPI DwmGetGraphicsStreamTransformHint(UINT, MilMatrix3x2D *); +DWMAPI DwmGetTransportAttributes(BOOL*, BOOL*, DWORD*); +DWMAPI DwmGetWindowAttribute(HWND, DWORD, PVOID, DWORD); DWMAPI DwmInvalidateIconicBitmaps(HWND); DWMAPI DwmIsCompositionEnabled(BOOL*); DWMAPI DwmRegisterThumbnail(HWND, HWND, PHTHUMBNAIL); +DWMAPI DwmSetIconicLivePreviewBitmap(HWND, HBITMAP, POINT*, DWORD); +DWMAPI DwmSetIconicThumbnail(HWND, HBITMAP, DWORD); +DWMAPI DwmSetPresentParameters(HWND, DWM_PRESENT_PARAMETERS *); DWMAPI DwmSetWindowAttribute(HWND, DWORD, LPCVOID, DWORD); DWMAPI DwmUnregisterThumbnail(HTHUMBNAIL); DWMAPI DwmUpdateThumbnailProperties(HTHUMBNAIL, const DWM_THUMBNAIL_PROPERTIES *); diff --git a/sdk/include/psdk/winerror.h b/sdk/include/psdk/winerror.h index c3815c27e36..f20c7a9249b 100644 --- a/sdk/include/psdk/winerror.h +++ b/sdk/include/psdk/winerror.h @@ -3270,6 +3270,14 @@ #define WININET_E_NAME_NOT_RESOLVED _HRESULT_TYPEDEF_(0x80072ee7) +#define ERROR_HUNG_DISPLAY_DRIVER_THREAD _HRESULT_TYPEDEF_(0x80260001) +#define DWM_E_COMPOSITIONDISABLED _HRESULT_TYPEDEF_(0x80263001) +#define DWM_E_REMOTING_NOT_SUPPORTED _HRESULT_TYPEDEF_(0x80263002) +#define DWM_E_NO_REDIRECTION_SURFACE_AVAILABLE _HRESULT_TYPEDEF_(0x80263003) +#define DWM_E_NOT_QUEUING_PRESENTS _HRESULT_TYPEDEF_(0x80263004) +#define DWM_E_ADAPTER_NOT_FOUND _HRESULT_TYPEDEF_(0x80263005) +#define DWM_S_GDI_REDIRECTION_SURFACE _HRESULT_TYPEDEF_(0x00263005) + #define WINCODEC_ERR_WRONGSTATE _HRESULT_TYPEDEF_(0x88982f04) #define WINCODEC_ERR_VALUEOUTOFRANGE _HRESULT_TYPEDEF_(0x88982f05) #define WINCODEC_ERR_UNKNOWNIMAGEFORMAT _HRESULT_TYPEDEF_(0x88982f07) @@ -3311,6 +3319,8 @@ #define WINCODEC_ERR_WIN32ERROR _HRESULT_TYPEDEF_(0x88982f94) #define WINCODEC_ERR_INVALIDPROGRESSIVELEVEL _HRESULT_TYPEDEF_(0x88982f95) +#define MILERR_MISMATCHED_SIZE _HRESULT_TYPEDEF_(0x88980090) + #define ERROR_AUDITING_DISABLED _HRESULT_TYPEDEF_(0xC0090001L) #define ERROR_ALL_SIDS_FILTERED _HRESULT_TYPEDEF_(0xC0090002L)

1 year, 3 months

← Newer
1
2
3
4
5
6
7
8
...
12
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs September 2023