Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 01/01: [SHELL32] SHChangeRegistrationReceive just returns FALSE
by Katayama Hirofumi MZ 21 Sep '23

21 Sep '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=539123c62f2efc4604cdb… commit 539123c62f2efc4604cdb658ed8249e1f906006f Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu Sep 21 12:09:28 2023 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Thu Sep 21 12:09:28 2023 +0900 [SHELL32] SHChangeRegistrationReceive just returns FALSE --- dll/win32/shell32/changenotify.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dll/win32/shell32/changenotify.cpp b/dll/win32/shell32/changenotify.cpp index 4666771734b..d21c3aaa2d2 100644 --- a/dll/win32/shell32/changenotify.cpp +++ b/dll/win32/shell32/changenotify.cpp @@ -592,8 +592,8 @@ static LPCSTR DumpEvent(LONG event) EXTERN_C BOOL WINAPI SHChangeRegistrationReceive(LPVOID lpUnknown1, DWORD dwUnknown2) { - FIXME("SHChangeRegistrationReceive() stub\n"); - return FALSE; + TRACE("\n"); + return FALSE; /* Just return FALSE */ } EXTERN_C VOID WINAPI

1 0

[reactos] 01/01: [SHELL32][SDK] Implement SHGetShellStyleHInstance (#5707)
by Katayama Hirofumi MZ 21 Sep '23

21 Sep '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=29e1a41d0774c7eee432b… commit 29e1a41d0774c7eee432b204a3eff26bd4cdd95b Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu Sep 21 09:22:33 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Sep 21 09:22:33 2023 +0900 [SHELL32][SDK] Implement SHGetShellStyleHInstance (#5707) Co-authored-by: Oleg Dubinskiy <oleg.dubinskij30(a)gmail.com> This PR supersedes PR #3851. - Implement SHGetShellStyleHInstance function. - Add SHGetShellStyleHInstance prototype to <shlobj.h>. CORE-17707 --- dll/win32/shell32/stubs.cpp | 11 ----------- dll/win32/shell32/utils.cpp | 42 ++++++++++++++++++++++++++++++++++++++++++ sdk/include/psdk/shlobj.h | 4 ++++ 3 files changed, 46 insertions(+), 11 deletions(-) diff --git a/dll/win32/shell32/stubs.cpp b/dll/win32/shell32/stubs.cpp index a49a506928e..a048e2c5274 100644 --- a/dll/win32/shell32/stubs.cpp +++ b/dll/win32/shell32/stubs.cpp @@ -1202,14 +1202,3 @@ DWORD WINAPI SHGetComputerDisplayNameW(DWORD param1, DWORD param2, DWORD param3, FIXME("SHGetComputerDisplayNameW() stub\n"); return E_FAIL; } - -/* - * Unimplemented - */ -EXTERN_C HINSTANCE -WINAPI -SHGetShellStyleHInstance(VOID) -{ - FIXME("SHGetShellStyleHInstance() stub\n"); - return NULL; -} diff --git a/dll/win32/shell32/utils.cpp b/dll/win32/shell32/utils.cpp index 4140fcaa274..edb1f64b87d 100644 --- a/dll/win32/shell32/utils.cpp +++ b/dll/win32/shell32/utils.cpp @@ -9,6 +9,48 @@ WINE_DEFAULT_DEBUG_CHANNEL(shell); +/************************************************************************* + * SHGetShellStyleHInstance (SHELL32.749) + */ +EXTERN_C HINSTANCE +WINAPI +SHGetShellStyleHInstance(VOID) +{ + HINSTANCE hInst = NULL; + WCHAR szPath[MAX_PATH], szColorName[100]; + HRESULT hr; + CStringW strShellStyle; + + TRACE("SHGetShellStyleHInstance called\n"); + + /* First, attempt to load the shellstyle dll from the current active theme */ + hr = GetCurrentThemeName(szPath, _countof(szPath), szColorName, _countof(szColorName), NULL, 0); + if (FAILED(hr)) + goto DoDefault; + + /* Strip the theme filename */ + PathRemoveFileSpecW(szPath); + + strShellStyle = szPath; + strShellStyle += L"\\Shell\\"; + strShellStyle += szColorName; + strShellStyle += L"\\ShellStyle.dll"; + + hInst = LoadLibraryExW(strShellStyle, NULL, LOAD_LIBRARY_AS_DATAFILE); + if (hInst) + return hInst; + + /* Otherwise, use the version stored in the System32 directory */ +DoDefault: + if (!ExpandEnvironmentStringsW(L"%SystemRoot%\\System32\\ShellStyle.dll", + szPath, _countof(szPath))) + { + ERR("Expand failed\n"); + return NULL; + } + return LoadLibraryExW(szPath, NULL, LOAD_LIBRARY_AS_DATAFILE); +} + /************************************************************************* * SHCreatePropertyBag (SHELL32.715) */ diff --git a/sdk/include/psdk/shlobj.h b/sdk/include/psdk/shlobj.h index 26745ce3390..601fd58f30c 100644 --- a/sdk/include/psdk/shlobj.h +++ b/sdk/include/psdk/shlobj.h @@ -336,6 +336,10 @@ SHOpenFolderAndSelectItems( int WINAPI PathCleanupSpec(_In_opt_ LPCWSTR, _Inout_ LPWSTR); +#if (_WIN32_WINNT >= _WIN32_WINNT_WINXP) && (_WIN32_WINNT <= _WIN32_WINNT_WS03) +HINSTANCE WINAPI SHGetShellStyleHInstance(VOID); +#endif + /***************************************************************************** * IContextMenu interface */

1 0

[reactos] 01/01: [SHELL32][SHELL32_APITEST][SDK] Implement Int64ToString (#5706)
by Katayama Hirofumi MZ 21 Sep '23

21 Sep '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6c55a3aa2ad4afb06a931… commit 6c55a3aa2ad4afb06a931ec648055abf63e42651 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu Sep 21 09:14:40 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Sep 21 09:14:40 2023 +0900 [SHELL32][SHELL32_APITEST][SDK] Implement Int64ToString (#5706) - Implement Int64ToString and LargeIntegerToString functions. - Add Int64ToString and LargeIntegerToString prototypes to <shellundoc.h>. - Add Int64ToString testcase. - I found a bug in GetNumberFormat.LeadingZero. http://undoc.airesoft.co.uk/shell32.dll/Int64ToString.php http://undoc.airesoft.co.uk/shell32.dll/LargeIntegerToString.php --- dll/win32/shell32/stubs.cpp | 32 ---- dll/win32/shell32/utils.cpp | 156 +++++++++++++++++ modules/rostests/apitests/shell32/CMakeLists.txt | 1 + .../rostests/apitests/shell32/Int64ToString.cpp | 194 +++++++++++++++++++++ modules/rostests/apitests/shell32/testlist.c | 2 + sdk/include/reactos/undocshell.h | 26 +++ 6 files changed, 379 insertions(+), 32 deletions(-) diff --git a/dll/win32/shell32/stubs.cpp b/dll/win32/shell32/stubs.cpp index 4c019e9b031..a49a506928e 100644 --- a/dll/win32/shell32/stubs.cpp +++ b/dll/win32/shell32/stubs.cpp @@ -949,38 +949,6 @@ Printers_GetPidl(LPCITEMIDLIST pidl, LPCWSTR lpName, DWORD dwUnknown1, DWORD dwU return NULL; } -/* - * Unimplemented - */ -EXTERN_C INT -WINAPI -Int64ToString(LONGLONG llInt64, - LPWSTR lpOut, - UINT uSize, - BOOL bUseFormat, - NUMBERFMT *pNumberFormat, - DWORD dwNumberFlags) -{ - FIXME("Int64ToString() stub\n"); - return 0; -} - -/* - * Unimplemented - */ -EXTERN_C INT -WINAPI -LargeIntegerToString(LARGE_INTEGER *pLargeInt, - LPWSTR lpOut, - UINT uSize, - BOOL bUseFormat, - NUMBERFMT *pNumberFormat, - DWORD dwNumberFlags) -{ - FIXME("LargeIntegerToString() stub\n"); - return 0; -} - /* * Unimplemented */ diff --git a/dll/win32/shell32/utils.cpp b/dll/win32/shell32/utils.cpp index c21e679a07b..4140fcaa274 100644 --- a/dll/win32/shell32/utils.cpp +++ b/dll/win32/shell32/utils.cpp @@ -99,3 +99,159 @@ SHFindComputer(LPCITEMIDLIST pidlRoot, LPCITEMIDLIST pidlSavedSearch) return SUCCEEDED(hr); } + +static HRESULT +Int64ToStr( + _In_ LONGLONG llValue, + _Out_writes_z_(cchValue) LPWSTR pszValue, + _In_ UINT cchValue) +{ + WCHAR szBuff[40]; + UINT ich = 0, ichValue; +#if (WINVER >= _WIN32_WINNT_VISTA) + BOOL bMinus = (llValue < 0); + + if (bMinus) + llValue = -llValue; +#endif + + if (cchValue <= 0) + return E_FAIL; + + do + { + szBuff[ich++] = (WCHAR)(L'0' + (llValue % 10)); + llValue /= 10; + } while (llValue != 0 && ich < _countof(szBuff) - 1); + +#if (WINVER >= _WIN32_WINNT_VISTA) + if (bMinus && ich < _countof(szBuff)) + szBuff[ich++] = '-'; +#endif + + for (ichValue = 0; ich > 0 && ichValue < cchValue; ++ichValue) + { + --ich; + pszValue[ichValue] = szBuff[ich]; + } + + if (ichValue >= cchValue) + { + pszValue[cchValue - 1] = UNICODE_NULL; + return E_FAIL; + } + + pszValue[ichValue] = UNICODE_NULL; + return S_OK; +} + +static VOID +Int64GetNumFormat( + _Out_ NUMBERFMTW *pDest, + _In_opt_ const NUMBERFMTW *pSrc, + _In_ DWORD dwNumberFlags, + _Out_writes_z_(cchDecimal) LPWSTR pszDecimal, + _In_ INT cchDecimal, + _Out_writes_z_(cchThousand) LPWSTR pszThousand, + _In_ INT cchThousand) +{ + WCHAR szBuff[20]; + + if (pSrc) + *pDest = *pSrc; + else + dwNumberFlags = 0; + + if (!(dwNumberFlags & FMT_USE_NUMDIGITS)) + { + GetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_IDIGITS, szBuff, _countof(szBuff)); + pDest->NumDigits = StrToIntW(szBuff); + } + + if (!(dwNumberFlags & FMT_USE_LEADZERO)) + { + GetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_ILZERO, szBuff, _countof(szBuff)); + pDest->LeadingZero = StrToIntW(szBuff); + } + + if (!(dwNumberFlags & FMT_USE_GROUPING)) + { + GetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_SGROUPING, szBuff, _countof(szBuff)); + pDest->Grouping = StrToIntW(szBuff); + } + + if (!(dwNumberFlags & FMT_USE_DECIMAL)) + { + GetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_SDECIMAL, pszDecimal, cchDecimal); + pDest->lpDecimalSep = pszDecimal; + } + + if (!(dwNumberFlags & FMT_USE_THOUSAND)) + { + GetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_STHOUSAND, pszThousand, cchThousand); + pDest->lpThousandSep = pszThousand; + } + + if (!(dwNumberFlags & FMT_USE_NEGNUMBER)) + { + GetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_INEGNUMBER, szBuff, _countof(szBuff)); + pDest->NegativeOrder = StrToIntW(szBuff); + } +} + +/************************************************************************* + * Int64ToString [SHELL32.209] + * + * @see http://undoc.airesoft.co.uk/shell32.dll/Int64ToString.php + */ +EXTERN_C +INT WINAPI +Int64ToString( + _In_ LONGLONG llValue, + _Out_writes_z_(cchOut) LPWSTR pszOut, + _In_ UINT cchOut, + _In_ BOOL bUseFormat, + _In_opt_ const NUMBERFMTW *pNumberFormat, + _In_ DWORD dwNumberFlags) +{ + INT ret; + NUMBERFMTW NumFormat; + WCHAR szValue[80], szDecimalSep[6], szThousandSep[6]; + + Int64ToStr(llValue, szValue, _countof(szValue)); + + if (bUseFormat) + { + Int64GetNumFormat(&NumFormat, pNumberFormat, dwNumberFlags, + szDecimalSep, _countof(szDecimalSep), + szThousandSep, _countof(szThousandSep)); + ret = GetNumberFormatW(LOCALE_USER_DEFAULT, 0, szValue, &NumFormat, pszOut, cchOut); + if (ret) + --ret; + return ret; + } + + if (FAILED(StringCchCopyW(pszOut, cchOut, szValue))) + return 0; + + return lstrlenW(pszOut); +} + +/************************************************************************* + * LargeIntegerToString [SHELL32.210] + * + * @see http://undoc.airesoft.co.uk/shell32.dll/LargeIntegerToString.php + */ +EXTERN_C +INT WINAPI +LargeIntegerToString( + _In_ const LARGE_INTEGER *pLargeInt, + _Out_writes_z_(cchOut) LPWSTR pszOut, + _In_ UINT cchOut, + _In_ BOOL bUseFormat, + _In_opt_ const NUMBERFMTW *pNumberFormat, + _In_ DWORD dwNumberFlags) +{ + return Int64ToString(pLargeInt->QuadPart, pszOut, cchOut, bUseFormat, + pNumberFormat, dwNumberFlags); +} diff --git a/modules/rostests/apitests/shell32/CMakeLists.txt b/modules/rostests/apitests/shell32/CMakeLists.txt index 602e25ad199..07ba4a96ca6 100644 --- a/modules/rostests/apitests/shell32/CMakeLists.txt +++ b/modules/rostests/apitests/shell32/CMakeLists.txt @@ -16,6 +16,7 @@ list(APPEND SOURCE ExtractIconEx.cpp FindExecutable.cpp GetDisplayNameOf.cpp + Int64ToString.cpp IShellFolderViewCB.cpp OpenAs_RunDLL.cpp PathResolve.cpp diff --git a/modules/rostests/apitests/shell32/Int64ToString.cpp b/modules/rostests/apitests/shell32/Int64ToString.cpp new file mode 100644 index 00000000000..19ff028db6f --- /dev/null +++ b/modules/rostests/apitests/shell32/Int64ToString.cpp @@ -0,0 +1,194 @@ +/* + * PROJECT: ReactOS API Tests + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Tests for Int64ToString + * COPYRIGHT: Copyright 2023 Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> + */ + +#include "shelltest.h" +#include <undocshell.h> +#include <versionhelpers.h> + +typedef struct tagTEST_RETURN +{ + INT ret; + LPCWSTR text; +} TEST_RETURN, *PTEST_RETURN; + +typedef struct tagTEST_ENTRY +{ + INT lineno; + LONGLONG value; + + UINT NumDigits; + UINT LeadingZero; + UINT Grouping; + LPCWSTR pszDecimalSep; + LPCWSTR pszThousandSep; + UINT NegativeOrder; + + TEST_RETURN NonVista; + TEST_RETURN Vista; +} TEST_ENTRY, *PTEST_ENTRY; + +#define DATA0 2, FALSE, 3, L".", L",", 0 +#define DATA1 3, TRUE, 3, L"<>", L":", 1 + +static const TEST_ENTRY s_Entries[] = +{ + { __LINE__, 0, DATA0, { 3, L".00" }, { 3, L".00" } }, + { __LINE__, 0, DATA1, { 6, L"0<>000" }, { 6, L"0<>000" } }, + { __LINE__, 1, DATA0, { 4, L"1.00" }, { 4, L"1.00" } }, + { __LINE__, 1, DATA1, { 6, L"1<>000" }, { 6, L"1<>000" } }, + { __LINE__, -999, DATA0, { 0, L"#####" }, { 8, L"(999.00)" } }, + { __LINE__, -999, DATA1, { 0, L"#####" }, { 9, L"-999<>000" } }, + { __LINE__, 100000, DATA0, { 10, L"100,000.00" }, { 10, L"100,000.00" } }, + { __LINE__, 100000, DATA1, { 12, L"100:000<>000" }, { 12, L"100:000<>000" } }, + { __LINE__, 0xE8D4A51000LL, DATA0, { 20, L"1,000,000,000,000.00" }, { 20, L"1,000,000,000,000.00" } }, + { __LINE__, 0xE8D4A51000LL, DATA1, { 22, L"1:000:000:000:000<>000" }, { 22, L"1:000:000:000:000<>000" } }, + { __LINE__, 0x7FFFFFFFFFFFFFFFLL, DATA0, { 28, L"9,223,372,036,854,775,807.00" }, { 28, L"9,223,372,036,854,775,807.00" } }, + { __LINE__, 0x7FFFFFFFFFFFFFFFLL, DATA1, { 30, L"9:223:372:036:854:775:807<>000" }, { 30, L"9:223:372:036:854:775:807<>000" } }, +}; +static const SIZE_T s_cEntries = _countof(s_Entries); + +static void DoTestEntry(BOOL bVista, const TEST_ENTRY *pEntry) +{ + INT lineno = pEntry->lineno; + + WCHAR szDecimalSep[10], szThousandSep[10]; + lstrcpynW(szDecimalSep, pEntry->pszDecimalSep, _countof(szDecimalSep)); + lstrcpynW(szThousandSep, pEntry->pszThousandSep, _countof(szThousandSep)); + + NUMBERFMTW format = + { + pEntry->NumDigits, pEntry->LeadingZero, pEntry->Grouping, + szDecimalSep, szThousandSep, pEntry->NegativeOrder + }; + + WCHAR szBuff[64]; + lstrcpynW(szBuff, L"#####", _countof(szBuff)); + + INT ret = Int64ToString(pEntry->value, szBuff, _countof(szBuff), TRUE, &format, -1); + if (bVista) + { + ok(pEntry->Vista.ret == ret, "Line %d: %d vs %d\n", lineno, pEntry->Vista.ret, ret); + ok(lstrcmpW(pEntry->Vista.text, szBuff) == 0, "Line %d: %ls vs %ls\n", + lineno, pEntry->Vista.text, szBuff); + } + else + { + ok(pEntry->NonVista.ret == ret, "Line %d: %d vs %d\n", lineno, pEntry->NonVista.ret, ret); + ok(lstrcmpW(pEntry->NonVista.text, szBuff) == 0, "Line %d: %ls vs %ls\n", + lineno, pEntry->NonVista.text, szBuff); + } + + lstrcpynW(szBuff, L"#####", _countof(szBuff)); + + LARGE_INTEGER LInt; + LInt.QuadPart = pEntry->value; + ret = LargeIntegerToString(&LInt, szBuff, _countof(szBuff), TRUE, &format, -1); + if (bVista) + { + ok(pEntry->Vista.ret == ret, "Line %d: %d vs %d\n", lineno, pEntry->Vista.ret, ret); + ok(lstrcmpW(pEntry->Vista.text, szBuff) == 0, "Line %d: %ls vs %ls\n", + lineno, pEntry->Vista.text, szBuff); + } + else + { + ok(pEntry->NonVista.ret == ret, "Line %d: %d vs %d\n", lineno, pEntry->NonVista.ret, ret); + ok(lstrcmpW(pEntry->NonVista.text, szBuff) == 0, "Line %d: %ls vs %ls\n", + lineno, pEntry->NonVista.text, szBuff); + } +} + +static void Test_EntryTest(BOOL bVista) +{ + for (SIZE_T i = 0; i < s_cEntries; ++i) + { + DoTestEntry(bVista, &s_Entries[i]); + } +} + +static void Test_Int64ToString(BOOL bVista) +{ + WCHAR szBuff[64]; + INT ret; + + ret = Int64ToString(0, szBuff, _countof(szBuff), FALSE, NULL, 0); + ok_int(ret, 1); + ok_wstr(szBuff, L"0"); + + ret = Int64ToString(1, szBuff, _countof(szBuff), FALSE, NULL, 0); + ok_int(ret, 1); + ok_wstr(szBuff, L"1"); + + ret = Int64ToString(-9999, szBuff, _countof(szBuff), FALSE, NULL, 0); + if (bVista) + { + ok_int(ret, 5); + ok_wstr(szBuff, L"-9999"); + } + else + { + ok_int(ret, 4); + ok_wstr(szBuff, L"''''"); + } + + ret = Int64ToString(10000, szBuff, _countof(szBuff), FALSE, NULL, 0); + ok_int(ret, 5); + ok_wstr(szBuff, L"10000"); + + ret = Int64ToString(0xE8D4A51000LL, szBuff, _countof(szBuff), FALSE, NULL, 0); + ok_int(ret, 13); + ok_wstr(szBuff, L"1000000000000"); +} + +static void Test_LargeIntegerToString(BOOL bVista) +{ + LARGE_INTEGER LInt; + WCHAR szBuff[64]; + INT ret; + + LInt.QuadPart = 0; + ret = LargeIntegerToString(&LInt, szBuff, _countof(szBuff), FALSE, NULL, 0); + ok_int(ret, 1); + ok_wstr(szBuff, L"0"); + + LInt.QuadPart = 1; + ret = LargeIntegerToString(&LInt, szBuff, _countof(szBuff), FALSE, NULL, 0); + ok_int(ret, 1); + ok_wstr(szBuff, L"1"); + + LInt.QuadPart = -9999; + ret = LargeIntegerToString(&LInt, szBuff, _countof(szBuff), FALSE, NULL, 0); + if (bVista) + { + ok_int(ret, 5); + ok_wstr(szBuff, L"-9999"); + } + else + { + ok_int(ret, 4); + ok_wstr(szBuff, L"''''"); + } + + LInt.QuadPart = 10000; + ret = LargeIntegerToString(&LInt, szBuff, _countof(szBuff), FALSE, NULL, 0); + ok_int(ret, 5); + ok_wstr(szBuff, L"10000"); + + LInt.QuadPart = 0xE8D4A51000LL; + ret = LargeIntegerToString(&LInt, szBuff, _countof(szBuff), FALSE, NULL, 0); + ok_int(ret, 13); + ok_wstr(szBuff, L"1000000000000"); +} + +START_TEST(Int64ToString) +{ + BOOL bVista = IsWindowsVistaOrGreater(); + trace("bVista: %d\n", bVista); + + Test_EntryTest(bVista); + Test_Int64ToString(bVista); + Test_LargeIntegerToString(bVista); +} diff --git a/modules/rostests/apitests/shell32/testlist.c b/modules/rostests/apitests/shell32/testlist.c index 2d364f19770..424e878d3b9 100644 --- a/modules/rostests/apitests/shell32/testlist.c +++ b/modules/rostests/apitests/shell32/testlist.c @@ -17,6 +17,7 @@ extern void func_DragDrop(void); extern void func_ExtractIconEx(void); extern void func_FindExecutable(void); extern void func_GetDisplayNameOf(void); +extern void func_Int64ToString(void); extern void func_IShellFolderViewCB(void); extern void func_menu(void); extern void func_OpenAs_RunDLL(void); @@ -52,6 +53,7 @@ const struct test winetest_testlist[] = { "ExtractIconEx", func_ExtractIconEx }, { "FindExecutable", func_FindExecutable }, { "GetDisplayNameOf", func_GetDisplayNameOf }, + { "Int64ToString", func_Int64ToString }, { "IShellFolderViewCB", func_IShellFolderViewCB }, { "menu", func_menu }, { "OpenAs_RunDLL", func_OpenAs_RunDLL }, diff --git a/sdk/include/reactos/undocshell.h b/sdk/include/reactos/undocshell.h index 370fef7377e..93fc4201d8c 100644 --- a/sdk/include/reactos/undocshell.h +++ b/sdk/include/reactos/undocshell.h @@ -658,6 +658,32 @@ BOOL WINAPI GUIDFromStringW( LPSTR WINAPI SheRemoveQuotesA(LPSTR psz); LPWSTR WINAPI SheRemoveQuotesW(LPWSTR psz); +/* Flags for Int64ToString and LargeIntegerToString */ +#define FMT_USE_NUMDIGITS 0x01 +#define FMT_USE_LEADZERO 0x02 +#define FMT_USE_GROUPING 0x04 +#define FMT_USE_DECIMAL 0x08 +#define FMT_USE_THOUSAND 0x10 +#define FMT_USE_NEGNUMBER 0x20 + +INT WINAPI +Int64ToString( + _In_ LONGLONG llValue, + _Out_writes_z_(cchOut) LPWSTR pszOut, + _In_ UINT cchOut, + _In_ BOOL bUseFormat, + _In_opt_ const NUMBERFMTW *pNumberFormat, + _In_ DWORD dwNumberFlags); + +INT WINAPI +LargeIntegerToString( + _In_ const LARGE_INTEGER *pLargeInt, + _Out_writes_z_(cchOut) LPWSTR pszOut, + _In_ UINT cchOut, + _In_ BOOL bUseFormat, + _In_opt_ const NUMBERFMTW *pNumberFormat, + _In_ DWORD dwNumberFlags); + /***************************************************************************** * Shell32 resources */

1 0

[reactos] 01/01: [BOOTDATA] Add TEMP folder to livecd image (#5683)
by Julio Carchi 20 Sep '23

20 Sep '23

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 0

[reactos] 01/01: [SDK:RTL] RtlpCallQueryRegistryRoutine(): Correctly set SpareData and SpareLength (#5466)
by Jose Carlos Jesus 20 Sep '23

20 Sep '23

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 0

[reactos] 01/01: [ATL][ATL_APITEST] Independent ReactOS ATL (RATL) support (#5657)
by Katayama Hirofumi MZ 20 Sep '23

20 Sep '23

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 0

[reactos] 01/01: [DDK] wsk header: Add WSKAPI to exported functions. (#5687)
by Johannes Thoma 19 Sep '23

19 Sep '23

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 0

[reactos] 01/01: [ATL] CImage: Follow-up to #5702 (5da3ed6)
by Katayama Hirofumi MZ 19 Sep '23

19 Sep '23

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 0

[reactos] 01/01: [COMDLG32] Implement CDM_SETDEFEXT (#5704)
by Katayama Hirofumi MZ 19 Sep '23

19 Sep '23

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 0

[reactos] 01/01: [ATL] Fix CImage members (#5702)
by Katayama Hirofumi MZ 19 Sep '23

19 Sep '23

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 0

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