Ros-diffs

ros-diffs@reactos.org

16 participants
81077 discussions

[reactos] 01/01: [BOOTDATA] Add TEMP folder to livecd image (#5683)

by Julio Carchi

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4651faeaa2030cb60314d… commit 4651faeaa2030cb60314d50866f63e83cf8375fe Author: Julio Carchi <juliocarchi(a)yahoo.com> AuthorDate: Wed Sep 20 13:57:04 2023 -0500 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Sep 20 18:57:04 2023 +0000 [BOOTDATA] Add TEMP folder to livecd image (#5683) Create the folder TEMP in X:\reactos so now we can match current livecd environment variables TMP and TEMP can be seen as a part of solving CORE-13041 The use-case for that is: copying the livecd folder structure directly to writable media as USB sticks or memory cards, will work then out-of-the-box without any other change. --- boot/boot_images.cmake | 3 +++ 1 file changed, 3 insertions(+) diff --git a/boot/boot_images.cmake b/boot/boot_images.cmake index 877cf28bb4a..ae3e600c05b 100644 --- a/boot/boot_images.cmake +++ b/boot/boot_images.cmake @@ -141,6 +141,9 @@ add_custom_target(bootcdregtest file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/livecd.cmake.lst "") file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/livecd.cmake.lst "${CMAKE_CURRENT_BINARY_DIR}/empty\n") +# Create TEMP dir +file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/livecd.cmake.lst "reactos/TEMP=${CMAKE_CURRENT_BINARY_DIR}/empty\n") + # Create user profile directories add_allusers_profile_dirs(${CMAKE_CURRENT_BINARY_DIR}/livecd.cmake.lst "Profiles") add_user_profile_dirs(${CMAKE_CURRENT_BINARY_DIR}/livecd.cmake.lst "Profiles" "Default User")

1 year, 3 months

[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

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs