Ros-diffs

ros-diffs@reactos.org

17 participants
81085 discussions

[reactos] 01/01: [CMD] Tweak comment for %TIME% format (#5499)

by Andrew Dent

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=bea6d7635aad60dfc25f3… commit bea6d7635aad60dfc25f31f63d18b0746fe64fd7 Author: Andrew Dent <dent.ace(a)gmail.com> AuthorDate: Thu Aug 3 23:34:24 2023 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Fri Aug 4 01:34:24 2023 +0300 [CMD] Tweak comment for %TIME% format (#5499) - Precisely describe `time` format, based on CLDR standard: http://www.unicode.org/reports/tr35/tr35-dates.html#Date_Field_Symbol_Table - Had spent time verifying the behavior on Windows and ReactOS, this strict definition may be helpful for future researchers. --- base/shell/cmd/locale.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/base/shell/cmd/locale.c b/base/shell/cmd/locale.c index ae6981f02c2..d2ab3d13a89 100644 --- a/base/shell/cmd/locale.c +++ b/base/shell/cmd/locale.c @@ -68,7 +68,7 @@ GetDateString(VOID) return szDate; } -/* Return time in hh:mm:ss.xx format. Used for $T in prompt and %TIME% */ +/* Return time in H:mm:ss.SS format. Used for $T in prompt and %TIME% */ LPTSTR GetTimeString(VOID) {

1 year, 5 months

[reactos] 01/01: [SHLWAPI] Add G. Chappell's documentation links (#5515)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6bc864acac87804be07c5… commit 6bc864acac87804be07c5866fbea498b5124b570 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu Aug 3 20:48:58 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Aug 3 20:48:58 2023 +0900 [SHLWAPI] Add G. Chappell's documentation links (#5515) Add comments to SHPropertyBag_... functions. CORE-9283 --- dll/win32/shlwapi/ordinal.c | 49 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) diff --git a/dll/win32/shlwapi/ordinal.c b/dll/win32/shlwapi/ordinal.c index 3599e723011..9053c33b956 100644 --- a/dll/win32/shlwapi/ordinal.c +++ b/dll/win32/shlwapi/ordinal.c @@ -5382,6 +5382,8 @@ VariantArrayToBuffer( /************************************************************************** * SHPropertyBag_ReadType (SHLWAPI.493) + * + * @see https://www.geoffchappell.com/studies/windows/shell/shlwapi/api/propbag/rea… */ HRESULT WINAPI SHPropertyBag_ReadType(IPropertyBag *ppb, LPCWSTR pszPropName, VARIANTARG *pvarg, VARTYPE vt) @@ -5404,6 +5406,8 @@ SHPropertyBag_ReadType(IPropertyBag *ppb, LPCWSTR pszPropName, VARIANTARG *pvarg /************************************************************************** * SHPropertyBag_ReadBOOL (SHLWAPI.534) + * + * @see https://www.geoffchappell.com/studies/windows/shell/shlwapi/api/propbag/rea… */ HRESULT WINAPI SHPropertyBag_ReadBOOL(IPropertyBag *ppb, LPCWSTR pszPropName, BOOL *pbValue) { @@ -5427,6 +5431,8 @@ HRESULT WINAPI SHPropertyBag_ReadBOOL(IPropertyBag *ppb, LPCWSTR pszPropName, BO /************************************************************************** * SHPropertyBag_ReadBOOLOld (SHLWAPI.498) + * + * @see https://www.geoffchappell.com/studies/windows/shell/shlwapi/api/propbag/rea… */ BOOL WINAPI SHPropertyBag_ReadBOOLOld(IPropertyBag *ppb, LPCWSTR pszPropName, BOOL bDefValue) { @@ -5444,6 +5450,8 @@ BOOL WINAPI SHPropertyBag_ReadBOOLOld(IPropertyBag *ppb, LPCWSTR pszPropName, BO /************************************************************************** * SHPropertyBag_ReadSHORT (SHLWAPI.527) + * + * @see https://www.geoffchappell.com/studies/windows/shell/shlwapi/api/propbag/rea… */ HRESULT WINAPI SHPropertyBag_ReadSHORT(IPropertyBag *ppb, LPCWSTR pszPropName, SHORT *psValue) { @@ -5478,6 +5486,9 @@ HRESULT WINAPI SHPropertyBag_ReadSHORT(IPropertyBag *ppb, LPCWSTR pszPropName, S * * RETURNS * HRESULT codes +#ifdef __REACTOS__ + * @see https://www.geoffchappell.com/studies/windows/shell/shlwapi/api/propbag/rea… +#endif */ HRESULT WINAPI SHPropertyBag_ReadLONG(IPropertyBag *ppb, LPCWSTR pszPropName, LPLONG pValue) { @@ -5518,6 +5529,8 @@ HRESULT WINAPI SHPropertyBag_ReadLONG(IPropertyBag *ppb, LPCWSTR pszPropName, LP #ifdef __REACTOS__ /************************************************************************** * SHPropertyBag_ReadDWORD (SHLWAPI.507) + * + * @see https://www.geoffchappell.com/studies/windows/shell/shlwapi/api/propbag/rea… */ HRESULT WINAPI SHPropertyBag_ReadDWORD(IPropertyBag *ppb, LPCWSTR pszPropName, DWORD *pdwValue) { @@ -5541,6 +5554,8 @@ HRESULT WINAPI SHPropertyBag_ReadDWORD(IPropertyBag *ppb, LPCWSTR pszPropName, D /************************************************************************** * SHPropertyBag_ReadBSTR (SHLWAPI.520) + * + * @see https://www.geoffchappell.com/studies/windows/shell/shlwapi/api/propbag/rea… */ HRESULT WINAPI SHPropertyBag_ReadBSTR(IPropertyBag *ppb, LPCWSTR pszPropName, BSTR *pbstr) { @@ -5566,6 +5581,8 @@ HRESULT WINAPI SHPropertyBag_ReadBSTR(IPropertyBag *ppb, LPCWSTR pszPropName, BS /************************************************************************** * SHPropertyBag_ReadStr (SHLWAPI.494) + * + * @see https://www.geoffchappell.com/studies/windows/shell/shlwapi/api/propbag/rea… */ HRESULT WINAPI SHPropertyBag_ReadStr(IPropertyBag *ppb, LPCWSTR pszPropName, LPWSTR pszDst, int cchMax) { @@ -5591,6 +5608,8 @@ HRESULT WINAPI SHPropertyBag_ReadStr(IPropertyBag *ppb, LPCWSTR pszPropName, LPW /************************************************************************** * SHPropertyBag_ReadPOINTL (SHLWAPI.521) + * + * @see https://www.geoffchappell.com/studies/windows/shell/shlwapi/api/propbag/rea… */ HRESULT WINAPI SHPropertyBag_ReadPOINTL(IPropertyBag *ppb, LPCWSTR pszPropName, POINTL *pptl) { @@ -5629,6 +5648,8 @@ HRESULT WINAPI SHPropertyBag_ReadPOINTL(IPropertyBag *ppb, LPCWSTR pszPropName, /************************************************************************** * SHPropertyBag_ReadPOINTS (SHLWAPI.525) + * + * @see https://www.geoffchappell.com/studies/windows/shell/shlwapi/api/propbag/rea… */ HRESULT WINAPI SHPropertyBag_ReadPOINTS(IPropertyBag *ppb, LPCWSTR pszPropName, POINTS *ppts) { @@ -5654,6 +5675,8 @@ HRESULT WINAPI SHPropertyBag_ReadPOINTS(IPropertyBag *ppb, LPCWSTR pszPropName, /************************************************************************** * SHPropertyBag_ReadRECTL (SHLWAPI.523) + * + * @see https://www.geoffchappell.com/studies/windows/shell/shlwapi/api/propbag/rea… */ HRESULT WINAPI SHPropertyBag_ReadRECTL(IPropertyBag *ppb, LPCWSTR pszPropName, RECTL *prcl) { @@ -5702,6 +5725,8 @@ HRESULT WINAPI SHPropertyBag_ReadRECTL(IPropertyBag *ppb, LPCWSTR pszPropName, R /************************************************************************** * SHPropertyBag_ReadGUID (SHLWAPI.505) + * + * @see https://www.geoffchappell.com/studies/windows/shell/shlwapi/api/propbag/rea… */ HRESULT WINAPI SHPropertyBag_ReadGUID(IPropertyBag *ppb, LPCWSTR pszPropName, GUID *pguid) { @@ -5744,6 +5769,8 @@ HRESULT WINAPI SHPropertyBag_ReadGUID(IPropertyBag *ppb, LPCWSTR pszPropName, GU /************************************************************************** * SHPropertyBag_ReadStream (SHLWAPI.531) + * + * @see https://www.geoffchappell.com/studies/windows/shell/shlwapi/api/propbag/rea… */ HRESULT WINAPI SHPropertyBag_ReadStream(IPropertyBag *ppb, LPCWSTR pszPropName, IStream **ppStream) { @@ -5770,6 +5797,8 @@ HRESULT WINAPI SHPropertyBag_ReadStream(IPropertyBag *ppb, LPCWSTR pszPropName, /************************************************************************** * SHPropertyBag_Delete (SHLWAPI.535) + * + * @see https://www.geoffchappell.com/studies/windows/shell/shlwapi/api/propbag/del… */ HRESULT WINAPI SHPropertyBag_Delete(IPropertyBag *ppb, LPCWSTR pszPropName) { @@ -5789,6 +5818,8 @@ HRESULT WINAPI SHPropertyBag_Delete(IPropertyBag *ppb, LPCWSTR pszPropName) /************************************************************************** * SHPropertyBag_WriteBOOL (SHLWAPI.499) + * + * @see https://www.geoffchappell.com/studies/windows/shell/shlwapi/api/propbag/wri… */ HRESULT WINAPI SHPropertyBag_WriteBOOL(IPropertyBag *ppb, LPCWSTR pszPropName, BOOL bValue) { @@ -5809,6 +5840,8 @@ HRESULT WINAPI SHPropertyBag_WriteBOOL(IPropertyBag *ppb, LPCWSTR pszPropName, B /************************************************************************** * SHPropertyBag_WriteSHORT (SHLWAPI.528) + * + * @see https://www.geoffchappell.com/studies/windows/shell/shlwapi/api/propbag/wri… */ HRESULT WINAPI SHPropertyBag_WriteSHORT(IPropertyBag *ppb, LPCWSTR pszPropName, SHORT sValue) { @@ -5831,6 +5864,8 @@ HRESULT WINAPI SHPropertyBag_WriteSHORT(IPropertyBag *ppb, LPCWSTR pszPropName, * SHPropertyBag_WriteLONG (SHLWAPI.497) * * This function asks a property bag to write a named property as a LONG. + * + * @see https://www.geoffchappell.com/studies/windows/shell/shlwapi/api/propbag/wri… */ HRESULT WINAPI SHPropertyBag_WriteLONG(IPropertyBag *ppb, LPCWSTR pszPropName, LONG lValue) { @@ -5851,6 +5886,8 @@ HRESULT WINAPI SHPropertyBag_WriteLONG(IPropertyBag *ppb, LPCWSTR pszPropName, L /************************************************************************** * SHPropertyBag_WriteDWORD (SHLWAPI.508) + * + * @see https://www.geoffchappell.com/studies/windows/shell/shlwapi/api/propbag/wri… */ HRESULT WINAPI SHPropertyBag_WriteDWORD(IPropertyBag *ppb, LPCWSTR pszPropName, DWORD dwValue) { @@ -5873,6 +5910,8 @@ HRESULT WINAPI SHPropertyBag_WriteDWORD(IPropertyBag *ppb, LPCWSTR pszPropName, * SHPropertyBag_WriteStr (SHLWAPI.495) * * This function asks a property bag to write a string as the value of a named property. + * + * @see https://www.geoffchappell.com/studies/windows/shell/shlwapi/api/propbag/wri… */ HRESULT WINAPI SHPropertyBag_WriteStr(IPropertyBag *ppb, LPCWSTR pszPropName, LPCWSTR pszValue) { @@ -5900,6 +5939,8 @@ HRESULT WINAPI SHPropertyBag_WriteStr(IPropertyBag *ppb, LPCWSTR pszPropName, LP /************************************************************************** * SHPropertyBag_WriteGUID (SHLWAPI.506) + * + * @see https://www.geoffchappell.com/studies/windows/shell/shlwapi/api/propbag/wri… */ HRESULT WINAPI SHPropertyBag_WriteGUID(IPropertyBag *ppb, LPCWSTR pszPropName, const GUID *pguid) { @@ -5919,6 +5960,8 @@ HRESULT WINAPI SHPropertyBag_WriteGUID(IPropertyBag *ppb, LPCWSTR pszPropName, c /************************************************************************** * SHPropertyBag_WriteStream (SHLWAPI.532) + * + * @see https://www.geoffchappell.com/studies/windows/shell/shlwapi/api/propbag/wri… */ HRESULT WINAPI SHPropertyBag_WriteStream(IPropertyBag *ppb, LPCWSTR pszPropName, IStream *pStream) { @@ -5939,6 +5982,8 @@ HRESULT WINAPI SHPropertyBag_WriteStream(IPropertyBag *ppb, LPCWSTR pszPropName, /************************************************************************** * SHPropertyBag_WritePOINTL (SHLWAPI.522) + * + * @see https://www.geoffchappell.com/studies/windows/shell/shlwapi/api/propbag/wri… */ HRESULT WINAPI SHPropertyBag_WritePOINTL(IPropertyBag *ppb, LPCWSTR pszPropName, const POINTL *pptl) { @@ -5984,6 +6029,8 @@ HRESULT WINAPI SHPropertyBag_WritePOINTL(IPropertyBag *ppb, LPCWSTR pszPropName, /************************************************************************** * SHPropertyBag_WritePOINTS (SHLWAPI.526) + * + * @see https://www.geoffchappell.com/studies/windows/shell/shlwapi/api/propbag/wri… */ HRESULT WINAPI SHPropertyBag_WritePOINTS(IPropertyBag *ppb, LPCWSTR pszPropName, const POINTS *ppts) { @@ -6004,6 +6051,8 @@ HRESULT WINAPI SHPropertyBag_WritePOINTS(IPropertyBag *ppb, LPCWSTR pszPropName, /************************************************************************** * SHPropertyBag_WriteRECTL (SHLWAPI.524) + * + * @see https://www.geoffchappell.com/studies/windows/shell/shlwapi/api/propbag/wri… */ HRESULT WINAPI SHPropertyBag_WriteRECTL(IPropertyBag *ppb, LPCWSTR pszPropName, const RECTL *prcl) {

1 year, 5 months

[reactos] 01/01: [HALX86] HalHandleNMI: Re-enable debugger-entering code.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=bd0eaa924d6f91cac3d89… commit bd0eaa924d6f91cac3d89dbfbe1984681761846d Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Wed Aug 2 22:03:54 2023 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Thu Aug 3 13:26:24 2023 +0200 [HALX86] HalHandleNMI: Re-enable debugger-entering code. --- hal/halx86/generic/nmi.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/hal/halx86/generic/nmi.c b/hal/halx86/generic/nmi.c index 3da64f1e1aa..42a003d75bd 100644 --- a/hal/halx86/generic/nmi.c +++ b/hal/halx86/generic/nmi.c @@ -99,7 +99,8 @@ HalHandleNMI( /* Enter the debugger if possible */ KiBugCheckData[0] = (ULONG_PTR)KeServiceDescriptorTable; /* NMI Corruption? */ - //if (!(KdDebuggerNotPresent) && (KdDebuggerEnabled)) KeEnterKernelDebugger(); + if (!KdDebuggerNotPresent && KdDebuggerEnabled) + KeEnterKernelDebugger(); #endif /* !_MINIHAL_ */ /* Freeze the system */

1 year, 5 months

[reactos] 03/03: [SHELL32] Fix taskbar large icon for control panel applets

by Thamatip Chitpong

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=32411dece03b7559b6e0c… commit 32411dece03b7559b6e0cae92bc00c15e11e232c Author: Thamatip Chitpong <thamatip.chitpong(a)reactos.org> AuthorDate: Thu Aug 3 12:57:17 2023 +0700 Commit: Thamatip Chitpong <thamatip.chitpong(a)reactos.org> CommitDate: Thu Aug 3 16:43:08 2023 +0700 [SHELL32] Fix taskbar large icon for control panel applets Addendum to 0e8cf6f (#5465). CORE-11698 --- dll/win32/shell32/wine/control.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dll/win32/shell32/wine/control.c b/dll/win32/shell32/wine/control.c index 7485efcf261..82768d2971c 100644 --- a/dll/win32/shell32/wine/control.c +++ b/dll/win32/shell32/wine/control.c @@ -815,6 +815,12 @@ Control_ShowAppletInTaskbar(CPlApplet* applet, UINT index) SetWindowTextW(applet->hWnd, applet->info[index].name); + /* Set large icon for the taskbar button */ + if (applet->info[index].icon) + { + SendMessageW(applet->hWnd, WM_SETICON, ICON_BIG, (LPARAM)applet->info[index].icon); + } + /* Try loading the small icon for the taskbar button */ hSmallIcon = (HICON)LoadImageW(applet->hModule, MAKEINTRESOURCEW(applet->info[index].idIcon),

1 year, 5 months

[reactos] 02/03: [EXPLORER] Add comments for CTaskSwitchWnd::GetWndIcon

by Thamatip Chitpong

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4c21d97d848168b33d681… commit 4c21d97d848168b33d68133f2503c1aa9ce48820 Author: Thamatip Chitpong <thamatip.chitpong(a)reactos.org> AuthorDate: Wed Aug 2 19:09:58 2023 +0700 Commit: Thamatip Chitpong <thamatip.chitpong(a)reactos.org> CommitDate: Thu Aug 3 16:43:08 2023 +0700 [EXPLORER] Add comments for CTaskSwitchWnd::GetWndIcon --- base/shell/explorer/taskswnd.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/base/shell/explorer/taskswnd.cpp b/base/shell/explorer/taskswnd.cpp index 2602a76c686..588e7d73fd3 100644 --- a/base/shell/explorer/taskswnd.cpp +++ b/base/shell/explorer/taskswnd.cpp @@ -490,6 +490,8 @@ public: HICON GetWndIcon(HWND hwnd) { HICON hIcon = NULL; + + /* Retrieve icon by sending a message */ #define GET_ICON(type) \ SendMessageTimeout(hwnd, WM_GETICON, (type), 0, SMTO_NOTIMEOUTIFNOTHUNG, 100, (PDWORD_PTR)&hIcon) @@ -512,6 +514,7 @@ public: } #undef GET_ICON + /* If we failed, retrieve icon from the window class */ hIcon = (HICON)GetClassLongPtr(hwnd, g_TaskbarSettings.bSmallIcons ? GCLP_HICONSM : GCLP_HICON); if (hIcon) return hIcon;

1 year, 5 months

[reactos] 01/03: [EXPLORER] Fix taskbar large icon for some apps

by Thamatip Chitpong

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9049638dac6774eeceafa… commit 9049638dac6774eeceafa51a4e2a5e17acabf36e Author: Thamatip Chitpong <thamatip.chitpong(a)reactos.org> AuthorDate: Wed Aug 2 13:40:50 2023 +0700 Commit: Thamatip Chitpong <thamatip.chitpong(a)reactos.org> CommitDate: Thu Aug 3 16:43:08 2023 +0700 [EXPLORER] Fix taskbar large icon for some apps Addendum to 0e8cf6f (#5465). CORE-11698 --- base/shell/explorer/taskswnd.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/base/shell/explorer/taskswnd.cpp b/base/shell/explorer/taskswnd.cpp index abe3f10ae47..2602a76c686 100644 --- a/base/shell/explorer/taskswnd.cpp +++ b/base/shell/explorer/taskswnd.cpp @@ -512,11 +512,11 @@ public: } #undef GET_ICON - hIcon = (HICON)GetClassLongPtr(hwnd, GCLP_HICONSM); + hIcon = (HICON)GetClassLongPtr(hwnd, g_TaskbarSettings.bSmallIcons ? GCLP_HICONSM : GCLP_HICON); if (hIcon) return hIcon; - return (HICON)GetClassLongPtr(hwnd, GCLP_HICON); + return (HICON)GetClassLongPtr(hwnd, g_TaskbarSettings.bSmallIcons ? GCLP_HICON : GCLP_HICONSM); } INT UpdateTaskItemButton(IN PTASK_ITEM TaskItem)

1 year, 5 months

[reactos] 01/01: [SHLWAPI] Fix version control (_WIN32_WINNT) (#5514)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=01603541454b9153097e6… commit 01603541454b9153097e675459a6da9ccd6e96d1 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu Aug 3 18:25:12 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Aug 3 18:25:12 2023 +0900 [SHLWAPI] Fix version control (_WIN32_WINNT) (#5514) - _WIN32_WINNT had wrong value to do workaround on Vista+ RegGetValueW. - Do #undef and #define _WIN32_WINNT _WIN32_WINNT_VISTA in assoc.c. - Delete _WIN32_WINNT hack in CMakeLists.txt. CORE-9283 --- dll/win32/shlwapi/CMakeLists.txt | 5 +---- dll/win32/shlwapi/assoc.c | 4 ++++ dll/win32/shlwapi/path.c | 4 ++-- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/dll/win32/shlwapi/CMakeLists.txt b/dll/win32/shlwapi/CMakeLists.txt index af8ec781824..fcb03a15c37 100644 --- a/dll/win32/shlwapi/CMakeLists.txt +++ b/dll/win32/shlwapi/CMakeLists.txt @@ -1,9 +1,6 @@ project(SHELL) -remove_definitions(-D_WIN32_WINNT=0x502) -add_definitions(-D_WIN32_WINNT=0x600) - add_definitions( -D__WINESRC__ -D_SHLWAPI_) @@ -11,7 +8,6 @@ add_definitions( spec2def(shlwapi.dll shlwapi.spec ADD_IMPORTLIB) list(APPEND SOURCE - assoc.c clist.c istream.c msgbox.c @@ -27,6 +23,7 @@ list(APPEND SOURCE url.c) list(APPEND PCH_SKIP_SOURCE + assoc.c wsprintf.c ${CMAKE_CURRENT_BINARY_DIR}/shlwapi_stubs.c) diff --git a/dll/win32/shlwapi/assoc.c b/dll/win32/shlwapi/assoc.c index a5cb4b11290..28c54527497 100644 --- a/dll/win32/shlwapi/assoc.c +++ b/dll/win32/shlwapi/assoc.c @@ -17,6 +17,10 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#ifdef __REACTOS__ + #undef _WIN32_WINNT + #define _WIN32_WINNT _WIN32_WINNT_VISTA /* for RegGetValueW */ +#endif #include <stdarg.h> #include <assert.h> diff --git a/dll/win32/shlwapi/path.c b/dll/win32/shlwapi/path.c index 2966a8bf93b..b1b55b3f244 100644 --- a/dll/win32/shlwapi/path.c +++ b/dll/win32/shlwapi/path.c @@ -2249,7 +2249,7 @@ BOOL WINAPI PathIsUNCA(LPCSTR lpszPath) * considered UNC, while on Windows Vista+ this is not the case anymore. */ // #ifdef __REACTOS__ -#if (WINVER >= _WIN32_WINNT_VISTA) +#if (_WIN32_WINNT >= _WIN32_WINNT_VISTA) if (lpszPath && (lpszPath[0]=='\\') && (lpszPath[1]=='\\') && (lpszPath[2]!='?')) #else if (lpszPath && (lpszPath[0]=='\\') && (lpszPath[1]=='\\')) @@ -2272,7 +2272,7 @@ BOOL WINAPI PathIsUNCW(LPCWSTR lpszPath) * considered UNC, while on Windows Vista+ this is not the case anymore. */ // #ifdef __REACTOS__ -#if (WINVER >= _WIN32_WINNT_VISTA) +#if (_WIN32_WINNT >= _WIN32_WINNT_VISTA) if (lpszPath && (lpszPath[0]=='\\') && (lpszPath[1]=='\\') && (lpszPath[2]!='?')) #else if (lpszPath && (lpszPath[0]=='\\') && (lpszPath[1]=='\\'))

1 year, 5 months

[reactos] 01/01: [SHLWAPI][SHLWAPI_APITEST][SDK] Implement SHPropertyBag_ReadGUID etc. (#5491)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6299340c453afd140f6fc… commit 6299340c453afd140f6fc7d96795d90c0852458c Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Wed Aug 2 10:35:25 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Aug 2 10:35:25 2023 +0900 [SHLWAPI][SHLWAPI_APITEST][SDK] Implement SHPropertyBag_ReadGUID etc. (#5491) - Implement SHPropertyBag_ReadGUID and SHPropertyBag_ReadStream functions. - Modify shlwapi.spec and shlwapi_undoc.h. CORE-9283 --- dll/win32/shlwapi/ordinal.c | 98 ++++++++++++++++++++++ dll/win32/shlwapi/shlwapi.spec | 4 +- modules/rostests/apitests/shlwapi/CMakeLists.txt | 4 +- .../rostests/apitests/shlwapi/SHPropertyBag.cpp | 88 +++++++++++++++++-- sdk/include/reactos/shlwapi_undoc.h | 3 +- 5 files changed, 187 insertions(+), 10 deletions(-) diff --git a/dll/win32/shlwapi/ordinal.c b/dll/win32/shlwapi/ordinal.c index 1162e8b720f..3599e723011 100644 --- a/dll/win32/shlwapi/ordinal.c +++ b/dll/win32/shlwapi/ordinal.c @@ -5350,6 +5350,36 @@ DoDefault: return hr; } +BOOL +VariantArrayToBuffer( + _In_ const VARIANT *pvarIn, + _Out_writes_(cbSize) LPVOID pvDest, + _In_ SIZE_T cbSize) +{ + LPVOID pvData; + LONG LowerBound, UpperBound; + LPSAFEARRAY pArray; + + /* Only supports byte array */ + if (!pvarIn || V_VT(pvarIn) != (VT_UI1 | VT_ARRAY)) + return FALSE; + + /* Boundary check and access */ + pArray = V_ARRAY(pvarIn); + if (SafeArrayGetDim(pArray) == 1 && + SUCCEEDED(SafeArrayGetLBound(pArray, 1, &LowerBound)) && + SUCCEEDED(SafeArrayGetUBound(pArray, 1, &UpperBound)) && + ((LONG)cbSize <= UpperBound - LowerBound + 1) && + SUCCEEDED(SafeArrayAccessData(pArray, &pvData))) + { + CopyMemory(pvDest, pvData, cbSize); + SafeArrayUnaccessData(pArray); + return TRUE; /* Success */ + } + + return FALSE; /* Failure */ +} + /************************************************************************** * SHPropertyBag_ReadType (SHLWAPI.493) */ @@ -5670,6 +5700,74 @@ HRESULT WINAPI SHPropertyBag_ReadRECTL(IPropertyBag *ppb, LPCWSTR pszPropName, R return SHPropertyBag_ReadLONG(ppb, szBuff, &prcl->bottom); } +/************************************************************************** + * SHPropertyBag_ReadGUID (SHLWAPI.505) + */ +HRESULT WINAPI SHPropertyBag_ReadGUID(IPropertyBag *ppb, LPCWSTR pszPropName, GUID *pguid) +{ + HRESULT hr; + BOOL bRet; + VARIANT vari; + + TRACE("%p %s %p\n", ppb, debugstr_w(pszPropName), pguid); + + if (!ppb || !pszPropName || !pguid) + { + ERR("%p %s %p\n", ppb, debugstr_w(pszPropName), pguid); + return E_INVALIDARG; + } + + hr = SHPropertyBag_ReadType(ppb, pszPropName, &vari, VT_EMPTY); + if (FAILED(hr)) + { + ERR("%p %s %p\n", ppb, debugstr_w(pszPropName), pguid); + return hr; + } + + if (V_VT(&vari) == (VT_UI1 | VT_ARRAY)) /* Byte Array */ + bRet = VariantArrayToBuffer(&vari, pguid, sizeof(*pguid)); + else if (V_VT(&vari) == VT_BSTR) + bRet = GUIDFromStringW(V_BSTR(&vari), pguid); + else +#if (_WIN32_WINNT >= _WIN32_WINNT_VISTA) + bRet = FALSE; +#else + bRet = TRUE; /* This is by design in WinXP/Win2k3. */ +#endif + + if (!bRet) + ERR("%p %s %p\n", ppb, debugstr_w(pszPropName), pguid); + + VariantClear(&vari); + return (bRet ? S_OK : E_FAIL); +} + +/************************************************************************** + * SHPropertyBag_ReadStream (SHLWAPI.531) + */ +HRESULT WINAPI SHPropertyBag_ReadStream(IPropertyBag *ppb, LPCWSTR pszPropName, IStream **ppStream) +{ + HRESULT hr; + VARIANT vari; + + TRACE("%p %s %p\n", ppb, debugstr_w(pszPropName), ppStream); + + if (!ppb || !pszPropName || !ppStream) + { + ERR("%p %s %p\n", ppb, debugstr_w(pszPropName), ppStream); + return E_INVALIDARG; + } + + hr = SHPropertyBag_ReadType(ppb, pszPropName, &vari, VT_UNKNOWN); + if (FAILED(hr)) + return hr; + + hr = IUnknown_QueryInterface(V_UNKNOWN(&vari), &IID_IStream, (void **)ppStream); + IUnknown_Release(V_UNKNOWN(&vari)); + + return hr; +} + /************************************************************************** * SHPropertyBag_Delete (SHLWAPI.535) */ diff --git a/dll/win32/shlwapi/shlwapi.spec b/dll/win32/shlwapi/shlwapi.spec index 001d7b9ab17..8dc01d454dc 100644 --- a/dll/win32/shlwapi/shlwapi.spec +++ b/dll/win32/shlwapi/shlwapi.spec @@ -502,7 +502,7 @@ 502 stdcall AssocQueryKeyA(long long str str ptr) 503 stdcall AssocQueryKeyW(long long wstr wstr ptr) 504 stdcall AssocQueryStringA(long long str str ptr ptr) -505 stub -noname SHPropertyBag_ReadGUID +505 stdcall -noname SHPropertyBag_ReadGUID(ptr wstr ptr) 506 stdcall -noname SHPropertyBag_WriteGUID(ptr wstr ptr) 507 stdcall -noname SHPropertyBag_ReadDWORD(ptr wstr ptr) 508 stdcall -noname SHPropertyBag_WriteDWORD(ptr wstr long) @@ -528,7 +528,7 @@ 528 stdcall -noname SHPropertyBag_WriteSHORT(ptr wstr long) 529 stdcall -noname SHPropertyBag_ReadInt(ptr wstr ptr) SHPropertyBag_ReadLONG 530 stdcall -noname SHPropertyBag_WriteInt(ptr wstr long) SHPropertyBag_WriteLONG -531 stub -noname SHPropertyBag_ReadStream +531 stdcall -noname SHPropertyBag_ReadStream(ptr wstr ptr) 532 stdcall -noname SHPropertyBag_WriteStream(ptr wstr ptr) 533 stub -noname SHGetPerScreenResName 534 stdcall -noname SHPropertyBag_ReadBOOL(ptr wstr ptr) diff --git a/modules/rostests/apitests/shlwapi/CMakeLists.txt b/modules/rostests/apitests/shlwapi/CMakeLists.txt index ef141efc92f..d5c4d32562e 100644 --- a/modules/rostests/apitests/shlwapi/CMakeLists.txt +++ b/modules/rostests/apitests/shlwapi/CMakeLists.txt @@ -24,7 +24,7 @@ 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}) -add_importlibs(shlwapi_apitest shlwapi oleaut32 user32 advapi32 msvcrt kernel32) +target_link_libraries(shlwapi_apitest ${PSEH_LIB} uuid) +add_importlibs(shlwapi_apitest shlwapi oleaut32 ole32 user32 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 bdf3e6f02e1..1aca2d256c0 100644 --- a/modules/rostests/apitests/shlwapi/SHPropertyBag.cpp +++ b/modules/rostests/apitests/shlwapi/SHPropertyBag.cpp @@ -9,6 +9,7 @@ #include <shlwapi.h> #include <shlobj.h> #include <shlwapi_undoc.h> +#include <versionhelpers.h> #include <pseh/pseh2.h> @@ -29,6 +30,30 @@ static void ResetTest(VARTYPE vt, s_pszPropNames[3] = pszName3; } +static SAFEARRAY* CreateByteArray(LPCVOID pvSrc, DWORD cbSize) +{ + SAFEARRAYBOUND Bound; + Bound.lLbound = 0; + Bound.cElements = cbSize; + + SAFEARRAY* pArray = SafeArrayCreate(VT_UI1, 1, &Bound); + if (!pArray) + return NULL; + + void HUGEP *pvData; + HRESULT hr = SafeArrayAccessData(pArray, &pvData); + if (FAILED(hr)) + { + SafeArrayDestroy(pArray); + return NULL; + } + + CopyMemory(pvData, pvSrc, cbSize); + SafeArrayUnaccessData(pArray); + + return pArray; +} + class CDummyPropertyBag : public IPropertyBag { public: @@ -39,17 +64,17 @@ public: // IUnknown STDMETHODIMP QueryInterface(REFIID riid, void **ppvObject) override { - ok_int(0, 1); + ok(FALSE, "Unexpected call\n"); return S_OK; } STDMETHODIMP_(ULONG) AddRef() override { - ok_int(0, 1); + ok(FALSE, "Unexpected call\n"); return S_OK; } STDMETHODIMP_(ULONG) Release() override { - ok_int(0, 1); + ok(FALSE, "Unexpected call\n"); return S_OK; } @@ -64,13 +89,38 @@ public: { ok_wstr(pszPropName, s_pszPropNames[i]); s_pszPropNames[i] = NULL; + if (lstrcmpiW(pszPropName, L"RECTL2.top") == 0) return E_FAIL; + if (lstrcmpiW(pszPropName, L"GUID1") == 0) + { + V_VT(pvari) = (VT_UI1 | VT_ARRAY); + V_ARRAY(pvari) = CreateByteArray(&IID_IShellLink, sizeof(IID)); + return S_OK; + } + + if (lstrcmpiW(pszPropName, L"GUID2") == 0) + { + WCHAR szText[50]; + StringFromGUID2(IID_IUnknown, szText, _countof(szText)); + + V_VT(pvari) = VT_BSTR; + V_BSTR(pvari) = SysAllocString(szText); + return S_OK; + } + + if (lstrcmpiW(pszPropName, L"GUID3") == 0) + { + V_VT(pvari) = VT_EMPTY; + V_UI4(pvari) = 0xDEADFACE; + return S_OK; + } + goto Skip1; } } - ok_int(0, 1); + ok(FALSE, "Unexpected call\n"); Skip1: return S_OK; } @@ -95,7 +145,7 @@ Skip1: goto Skip2; } } - ok_int(0, 1); + ok(FALSE, "Unexpected call\n"); Skip2: return S_OK; } @@ -113,6 +163,7 @@ static void SHPropertyBag_ReadTest(void) POINTL ptl = { 0xEEEE, 0xDDDD }; POINTS pts = { 0x2222, 0x3333 }; RECTL rcl = { 123, 456, 789, 101112 }; + GUID guid = { 0 }; ResetTest(VT_BOOL, L"BOOL1"); hr = SHPropertyBag_ReadBOOL(&dummy, s_pszPropNames[0], &bValue); @@ -168,6 +219,33 @@ static void SHPropertyBag_ReadTest(void) ok_long(hr, E_FAIL); ok_int(s_cRead, 2); ok_int(s_cWrite, 0); + + ResetTest(VT_EMPTY, L"GUID1"); + hr = SHPropertyBag_ReadGUID(&dummy, L"GUID1", &guid); + ok_long(hr, S_OK); + ok_int(s_cRead, 1); + ok_int(s_cWrite, 0); + ok_int(IsEqualGUID(guid, IID_IShellLink), TRUE); + + ResetTest(VT_EMPTY, L"GUID2"); + hr = SHPropertyBag_ReadGUID(&dummy, L"GUID2", &guid); + ok_long(hr, S_OK); + ok_int(s_cRead, 1); + ok_int(s_cWrite, 0); + ok_int(IsEqualGUID(guid, IID_IUnknown), TRUE); + + ResetTest(VT_EMPTY, L"GUID3"); + guid = IID_IExtractIcon; + hr = SHPropertyBag_ReadGUID(&dummy, L"GUID3", &guid); + + if (IsWindowsVistaOrGreater()) + ok_long(hr, E_INVALIDARG); + else + ok_long(hr, S_OK); + + ok_int(s_cRead, 1); + ok_int(s_cWrite, 0); + ok_int(IsEqualGUID(guid, IID_IExtractIcon), TRUE); } static void SHPropertyBag_WriteTest(void) diff --git a/sdk/include/reactos/shlwapi_undoc.h b/sdk/include/reactos/shlwapi_undoc.h index 564a105f5e9..a2cec2e047c 100644 --- a/sdk/include/reactos/shlwapi_undoc.h +++ b/sdk/include/reactos/shlwapi_undoc.h @@ -103,12 +103,13 @@ HRESULT WINAPI SHPropertyBag_ReadStr(IPropertyBag *ppb, LPCWSTR pszPropName, LPW HRESULT WINAPI SHPropertyBag_ReadPOINTL(IPropertyBag *ppb, LPCWSTR pszPropName, POINTL *pptl); HRESULT WINAPI SHPropertyBag_ReadPOINTS(IPropertyBag *ppb, LPCWSTR pszPropName, POINTS *ppts); HRESULT WINAPI SHPropertyBag_ReadRECTL(IPropertyBag *ppb, LPCWSTR pszPropName, RECTL *prcl); +HRESULT WINAPI SHPropertyBag_ReadGUID(IPropertyBag *ppb, LPCWSTR pszPropName, GUID *pguid); +HRESULT WINAPI SHPropertyBag_ReadStream(IPropertyBag *ppb, LPCWSTR pszPropName, IStream **ppStream); HRESULT WINAPI SHGetPerScreenResName(OUT LPWSTR lpResName, IN INT cchResName, IN DWORD dwReserved); -HRESULT WINAPI SHPropertyBag_ReadStream(IPropertyBag*,LPCWSTR,IStream**); HRESULT WINAPI SHPropertyBag_Delete(IPropertyBag *ppb, LPCWSTR pszPropName); HRESULT WINAPI SHPropertyBag_WriteBOOL(IPropertyBag *ppb, LPCWSTR pszPropName, BOOL bValue); HRESULT WINAPI SHPropertyBag_WriteSHORT(IPropertyBag *ppb, LPCWSTR pszPropName, SHORT sValue);

1 year, 5 months

[reactos] 01/01: [NTOSKRNL][NTGDI] Formatting addendum, no functional change

by Joachim Henze

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=53b30e3f3bf454356dad5… commit 53b30e3f3bf454356dad537c782543cba35e0f1a Author: Joachim Henze <Joachim.Henze(a)reactos.org> AuthorDate: Tue Aug 1 22:31:36 2023 +0200 Commit: Joachim Henze <Joachim.Henze(a)reactos.org> CommitDate: Tue Aug 1 22:32:25 2023 +0200 [NTOSKRNL][NTGDI] Formatting addendum, no functional change I intend to port back the combined work of Thomas Faber and Serge Gautherie in context of CORE 14271. Both developers fixed wrong retval evaluations for SeSinglePrivilegeCheck() and RtlCreateUnicodeString(). Both functions do return a BOOLEAN, and therefore using NTSTATUS() on them is wrong. Those bugs have been fixed at multiple places. That is long gone. But Serge fixed his locations a bit more elegantly, without the need for additional variables. Therefore this addendum adapts a few of Thomas locations to the improved Serge-ified style. Yes: I intentionally used a space instead of a minus after the mentioned CORE 14271, as I don't want that pure stylistic addendum to be linked with the initial ticket anymore. That would be overkill. --- ntoskrnl/config/cmsysini.c | 8 +------- win32ss/gdi/ntgdi/freetype.c | 12 +++--------- 2 files changed, 4 insertions(+), 16 deletions(-) diff --git a/ntoskrnl/config/cmsysini.c b/ntoskrnl/config/cmsysini.c index 572f8a342f8..282e422b759 100644 --- a/ntoskrnl/config/cmsysini.c +++ b/ntoskrnl/config/cmsysini.c @@ -1,7 +1,6 @@ /* * PROJECT: ReactOS Kernel * LICENSE: BSD - See COPYING.ARM in the top level directory - * FILE: ntoskrnl/config/cmsysini.c * PURPOSE: Configuration Manager - System Initialization Code * PROGRAMMERS: ReactOS Portable Systems Group * Alex Ionescu (alex.ionescu(a)reactos.org) @@ -873,7 +872,6 @@ CmpInitializeSystemHive(IN PLOADER_PARAMETER_BLOCK LoaderBlock) UNICODE_STRING KeyName; PCMHIVE SystemHive = NULL; PSECURITY_DESCRIPTOR SecurityDescriptor; - BOOLEAN Success; PAGED_CODE(); @@ -921,12 +919,8 @@ CmpInitializeSystemHive(IN PLOADER_PARAMETER_BLOCK LoaderBlock) } /* Set the hive filename */ - Success = RtlCreateUnicodeString(&SystemHive->FileFullPath, - L"\\SystemRoot\\System32\\Config\\SYSTEM"); - if (!Success) - { + if (!RtlCreateUnicodeString(&SystemHive->FileFullPath, L"\\SystemRoot\\System32\\Config\\SYSTEM")) return FALSE; - } /* Manually set the hive as volatile, if in Live CD mode */ if (HiveBase && CmpShareSystemHives) diff --git a/win32ss/gdi/ntgdi/freetype.c b/win32ss/gdi/ntgdi/freetype.c index fcf6f2dfcc7..c8bdd59f773 100644 --- a/win32ss/gdi/ntgdi/freetype.c +++ b/win32ss/gdi/ntgdi/freetype.c @@ -1,7 +1,6 @@ /* * PROJECT: ReactOS win32 kernel mode subsystem * LICENSE: GPL - See COPYING in the top level directory - * FILE: win32ss/gdi/ntgdi/freetype.c * PURPOSE: FreeType font engine interface * PROGRAMMERS: Copyright 2001 Huw D M Davies for CodeWeavers. * Copyright 2006 Dmitry Timoshkov for CodeWeavers. @@ -521,7 +520,6 @@ IntLoadFontSubstList(PLIST_ENTRY pHead) BYTE CharSets[FONTSUBST_FROM_AND_TO]; LPWSTR pch; PFONTSUBST_ENTRY pEntry; - BOOLEAN Success; /* the FontSubstitutes registry key */ static UNICODE_STRING FontSubstKey = @@ -566,8 +564,7 @@ IntLoadFontSubstList(PLIST_ENTRY pHead) pInfo = (PKEY_VALUE_FULL_INFORMATION)InfoBuffer; Length = pInfo->NameLength / sizeof(WCHAR); pInfo->Name[Length] = UNICODE_NULL; /* truncate */ - Success = RtlCreateUnicodeString(&FromW, pInfo->Name); - if (!Success) + if (!RtlCreateUnicodeString(&FromW, pInfo->Name)) { Status = STATUS_INSUFFICIENT_RESOURCES; DPRINT("RtlCreateUnicodeString failed\n"); @@ -589,8 +586,7 @@ IntLoadFontSubstList(PLIST_ENTRY pHead) pch = (LPWSTR)((PUCHAR)pInfo + pInfo->DataOffset); Length = pInfo->DataLength / sizeof(WCHAR); pch[Length] = UNICODE_NULL; /* truncate */ - Success = RtlCreateUnicodeString(&ToW, pch); - if (!Success) + if (!RtlCreateUnicodeString(&ToW, pch)) { Status = STATUS_INSUFFICIENT_RESOURCES; DPRINT("RtlCreateUnicodeString failed\n"); @@ -1650,7 +1646,6 @@ IntLoadFontsInRegistry(VOID) LPBYTE InfoBuffer; PKEY_VALUE_FULL_INFORMATION pInfo; LPWSTR pchPath; - BOOLEAN Success; WCHAR szPath[MAX_PATH]; INT nFontCount = 0; DWORD dwFlags; @@ -1717,8 +1712,7 @@ IntLoadFontsInRegistry(VOID) pInfo = (PKEY_VALUE_FULL_INFORMATION)InfoBuffer; Length = pInfo->NameLength / sizeof(WCHAR); pInfo->Name[Length] = UNICODE_NULL; /* truncate */ - Success = RtlCreateUnicodeString(&FontTitleW, pInfo->Name); - if (!Success) + if (!RtlCreateUnicodeString(&FontTitleW, pInfo->Name)) { Status = STATUS_INSUFFICIENT_RESOURCES; DPRINT1("RtlCreateUnicodeString failed\n");

1 year, 5 months

[reactos] 01/01: [ATL] CImage: Respect CODEC info (#5408)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=50774f865c4f9d9b926f3… commit 50774f865c4f9d9b926f32a8bcfc20bbeced8fb5 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Mon Jul 31 07:22:38 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Jul 31 07:22:38 2023 +0900 [ATL] CImage: Respect CODEC info (#5408) Add _getAllEncoders and _getAllDecoders helper functions and use them in GetImporterFilterString, GetExporterFilterString, FileTypeFromExtension and GetClsidFromFileType functions. CORE-18867, CORE-19008 --- sdk/lib/atl/atlimage.h | 490 +++++++++++++++++++++++++++---------------------- 1 file changed, 266 insertions(+), 224 deletions(-) diff --git a/sdk/lib/atl/atlimage.h b/sdk/lib/atl/atlimage.h index 9765b0e70d5..236defea834 100644 --- a/sdk/lib/atl/atlimage.h +++ b/sdk/lib/atl/atlimage.h @@ -387,14 +387,10 @@ public: return E_FAIL; } - // TODO & FIXME: get parameters (m_rgbTransColor etc.) - // get bitmap handle HBITMAP hbm = NULL; Color color(0xFF, 0xFF, 0xFF); - Gdiplus::Status status; - status = GetCommon().CreateHBITMAPFromBitmap( - pBitmap, &hbm, color.GetValue()); + Status status = GetCommon().CreateHBITMAPFromBitmap(pBitmap, &hbm, color.GetValue()); // delete GpBitmap GetCommon().DisposeImage(pBitmap); @@ -414,14 +410,10 @@ public: return E_FAIL; } - // TODO & FIXME: get parameters (m_rgbTransColor etc.) - // get bitmap handle HBITMAP hbm = NULL; Color color(0xFF, 0xFF, 0xFF); - Gdiplus::Status status; - status = GetCommon().CreateHBITMAPFromBitmap( - pBitmap, &hbm, color.GetValue()); + Status status = GetCommon().CreateHBITMAPFromBitmap(pBitmap, &hbm, color.GetValue()); // delete Bitmap GetCommon().DisposeImage(pBitmap); @@ -525,10 +517,13 @@ public: using namespace Gdiplus; ATLASSERT(m_hbm); - // TODO & FIXME: set parameters (m_rgbTransColor etc.) - CLSID clsid; - if (!GetClsidFromFileType(&clsid, guidFileType)) - return E_FAIL; + // Get encoders + UINT cEncoders = 0; + ImageCodecInfo* pEncoders = _getAllEncoders(cEncoders); + + // Get Codec + CLSID clsid = FindCodecForFileType(*guidFileType, pEncoders, cEncoders); + delete[] pEncoders; // create a GpBitmap from HBITMAP GpBitmap *pBitmap = NULL; @@ -550,31 +545,32 @@ public: using namespace Gdiplus; ATLASSERT(m_hbm); - // TODO & FIXME: set parameters (m_rgbTransColor etc.) - // convert the file name string into Unicode CStringW pszNameW(pszFileName); + // Get encoders + UINT cEncoders = 0; + ImageCodecInfo* pEncoders = _getAllEncoders(cEncoders); + // if the file type is null, get the file type from extension - const GUID *FileType = &guidFileType; + CLSID clsid; if (::IsEqualGUID(guidFileType, GUID_NULL)) { - LPCWSTR pszExt = GetFileExtension(pszNameW); - FileType = FileTypeFromExtension(pszExt); + CString strExt(GetFileExtension(pszNameW)); + clsid = FindCodecForExtension(strExt, pEncoders, cEncoders); } - - // get CLSID from file type - CLSID clsid; - if (!GetClsidFromFileType(&clsid, FileType)) - return E_FAIL; + else + { + clsid = FindCodecForFileType(guidFileType, pEncoders, cEncoders); + } + delete[] pEncoders; // create a GpBitmap from HBITMAP GpBitmap *pBitmap = NULL; GetCommon().CreateBitmapFromHBITMAP(m_hbm, NULL, &pBitmap); // save to file - Status status; - status = GetCommon().SaveImageToFile(pBitmap, pszNameW, &clsid, NULL); + Status status = GetCommon().SaveImageToFile(pBitmap, pszNameW, &clsid, NULL); // destroy GpBitmap GetCommon().DisposeImage(pBitmap); @@ -714,73 +710,96 @@ public: excludeDefaultSave = excludeIcon | excludeEMF | excludeWMF }; - struct FILTER_DATA { - DWORD dwExclude; - const TCHAR *title; - const TCHAR *extensions; - const GUID *guid; - }; - protected: - static HRESULT GetCommonFilterString( + static bool ShouldExcludeFormat(REFGUID guidFileType, DWORD dwExclude) + { + if (::IsEqualGUID(guidFileType, Gdiplus::ImageFormatGIF)) + return !!(dwExclude & excludeGIF); + if (::IsEqualGUID(guidFileType, Gdiplus::ImageFormatBMP)) + return !!(dwExclude & excludeBMP); + if (::IsEqualGUID(guidFileType, Gdiplus::ImageFormatEMF)) + return !!(dwExclude & excludeEMF); + if (::IsEqualGUID(guidFileType, Gdiplus::ImageFormatWMF)) + return !!(dwExclude & excludeWMF); + if (::IsEqualGUID(guidFileType, Gdiplus::ImageFormatJPEG)) + return !!(dwExclude & excludeJPEG); + if (::IsEqualGUID(guidFileType, Gdiplus::ImageFormatPNG)) + return !!(dwExclude & excludePNG); + if (::IsEqualGUID(guidFileType, Gdiplus::ImageFormatTIFF)) + return !!(dwExclude & excludeTIFF); + if (::IsEqualGUID(guidFileType, Gdiplus::ImageFormatIcon)) + return !!(dwExclude & excludeIcon); + return ((dwExclude & excludeOther) == excludeOther); + } + + static HRESULT BuildCodecFilterString( + const Gdiplus::ImageCodecInfo* pCodecs, + UINT cCodecs, CSimpleString& strFilter, CSimpleArray<GUID>& aguidFileTypes, LPCTSTR pszAllFilesDescription, DWORD dwExclude, TCHAR chSeparator) { - static const FILTER_DATA table[] = + if (!pCodecs || !cCodecs) { - {excludeBMP, TEXT("BMP"), TEXT("*.BMP;*.DIB;*.RLE"), &Gdiplus::ImageFormatBMP}, - {excludeJPEG, TEXT("JPEG"), TEXT("*.JPG;*.JPEG;*.JPE;*.JFIF"), &Gdiplus::ImageFormatJPEG}, - {excludeGIF, TEXT("GIF"), TEXT("*.GIF"), &Gdiplus::ImageFormatGIF}, - {excludeEMF, TEXT("EMF"), TEXT("*.EMF"), &Gdiplus::ImageFormatEMF}, - {excludeWMF, TEXT("WMF"), TEXT("*.WMF"), &Gdiplus::ImageFormatWMF}, - {excludeTIFF, TEXT("TIFF"), TEXT("*.TIF;*.TIFF"), &Gdiplus::ImageFormatTIFF}, - {excludePNG, TEXT("PNG"), TEXT("*.PNG"), &Gdiplus::ImageFormatPNG}, - {excludeIcon, TEXT("ICO"), TEXT("*.ICO"), &Gdiplus::ImageFormatIcon} - }; + strFilter += chSeparator; + return E_FAIL; + } if (pszAllFilesDescription) { strFilter += pszAllFilesDescription; - strFilter += chSeparator; BOOL bFirst = TRUE; - for (size_t i = 0; i < _countof(table); ++i) + CString extensions; + for (UINT i = 0; i < cCodecs; ++i) { - if ((dwExclude & table[i].dwExclude) != 0) + if (ShouldExcludeFormat(pCodecs[i].FormatID, dwExclude)) continue; if (bFirst) bFirst = FALSE; else - strFilter += TEXT(';'); + extensions += TEXT(';'); - strFilter += table[i].extensions; + CString ext(pCodecs[i].FilenameExtension); + extensions += ext; } + extensions.MakeLower(); + + strFilter += TEXT(" ("); + strFilter += extensions; + strFilter += TEXT(")"); + strFilter += chSeparator; + + strFilter += extensions; strFilter += chSeparator; aguidFileTypes.Add(GUID_NULL); } - for (size_t i = 0; i < _countof(table); ++i) + for (UINT i = 0; i < cCodecs; ++i) { - if ((dwExclude & table[i].dwExclude) != 0) + if (ShouldExcludeFormat(pCodecs[i].FormatID, dwExclude)) continue; - strFilter += table[i].title; + + CString extensions(pCodecs[i].FilenameExtension); + extensions.MakeLower(); + + CString desc(pCodecs[i].FormatDescription); + strFilter += desc; strFilter += TEXT(" ("); - strFilter += table[i].extensions; + strFilter += extensions; strFilter += TEXT(")"); strFilter += chSeparator; - strFilter += table[i].extensions; + strFilter += extensions; strFilter += chSeparator; - aguidFileTypes.Add(*table[i].guid); + aguidFileTypes.Add(pCodecs[i].FormatID); } strFilter += chSeparator; - return S_OK; } @@ -792,11 +811,17 @@ public: DWORD dwExclude = excludeDefaultLoad, TCHAR chSeparator = TEXT('|')) { - return GetCommonFilterString(strImporters, - aguidFileTypes, - pszAllFilesDescription, - dwExclude, - chSeparator); + UINT cDecoders = 0; + Gdiplus::ImageCodecInfo* pDecoders = _getAllDecoders(cDecoders); + HRESULT hr = BuildCodecFilterString(pDecoders, + cDecoders, + strImporters, + aguidFileTypes, + pszAllFilesDescription, + dwExclude, + chSeparator); + delete[] pDecoders; + return hr; } static HRESULT GetExporterFilterString( @@ -806,30 +831,27 @@ public: DWORD dwExclude = excludeDefaultSave, TCHAR chSeparator = TEXT('|')) { - return GetCommonFilterString(strExporters, - aguidFileTypes, - pszAllFilesDescription, - dwExclude, - chSeparator); + UINT cEncoders = 0; + Gdiplus::ImageCodecInfo* pEncoders = _getAllEncoders(cEncoders); + HRESULT hr = BuildCodecFilterString(pEncoders, + cEncoders, + strExporters, + aguidFileTypes, + pszAllFilesDescription, + dwExclude, + chSeparator); + delete[] pEncoders; + return hr; } protected: // an extension of BITMAPINFO - struct MYBITMAPINFOEX + struct MYBITMAPINFOEX : BITMAPINFO { - BITMAPINFOHEADER bmiHeader; - RGBQUAD bmiColors[256]; - BITMAPINFO *get() - { - return reinterpret_cast<BITMAPINFO *>(this); - } - const BITMAPINFO *get() const - { - return reinterpret_cast<const BITMAPINFO *>(this); - } + RGBQUAD bmiColorsExtra[256 - 1]; }; - // abbreviations of GDI+ basic types + // abbreviations of GDI+ basic types. FIXME: Delete us typedef Gdiplus::GpStatus St; typedef Gdiplus::GpBitmap Bm; typedef Gdiplus::GpImage Im; @@ -837,69 +859,45 @@ protected: // The common data of atlimage struct COMMON { - // abbreviations of GDI+ basic types - typedef Gdiplus::ImageCodecInfo ICI; - typedef Gdiplus::EncoderParameters EncParams; - typedef Gdiplus::ARGB ARGB; - typedef HBITMAP HBM; - typedef Gdiplus::GdiplusStartupInput GSI; - typedef Gdiplus::GdiplusStartupOutput GSO; - // GDI+ function types -#undef API -#undef CST -#define API WINGDIPAPI -#define CST GDIPCONST - typedef St (WINAPI *STARTUP)(ULONG_PTR *, const GSI *, GSO *); - typedef void (WINAPI *SHUTDOWN)(ULONG_PTR); - typedef St (API *GETIMAGEENCODERSSIZE)(UINT *, UINT *); - typedef St (API *GETIMAGEENCODERS)(UINT, UINT, ICI *); - typedef St (API *CREATEBITMAPFROMFILE)(CST WCHAR*, Bm **); - typedef St (API *CREATEHBITMAPFROMBITMAP)(Bm *, HBM *, ARGB); - typedef St (API *CREATEBITMAPFROMSTREAM)(IStream *, Bm **); - typedef St (API *CREATEBITMAPFROMHBITMAP)(HBM, HPALETTE, Bm **); - typedef St (API *SAVEIMAGETOSTREAM)(Im *, IStream *, CST CLSID *, - CST EncParams *); - typedef St (API *SAVEIMAGETOFILE)(Im *, CST WCHAR *, CST CLSID *, - CST EncParams *); - typedef St (API *DISPOSEIMAGE)(Im*); -#undef API -#undef CST + using FUN_Startup = decltype(&Gdiplus::GdiplusStartup); + using FUN_Shutdown = decltype(&Gdiplus::GdiplusShutdown); + using FUN_GetImageEncoderSize = decltype(&Gdiplus::DllExports::GdipGetImageEncodersSize); + using FUN_GetImageEncoder = decltype(&Gdiplus::DllExports::GdipGetImageEncoders); + using FUN_GetImageDecoderSize = decltype(&Gdiplus::DllExports::GdipGetImageDecodersSize); + using FUN_GetImageDecoder = decltype(&Gdiplus::DllExports::GdipGetImageDecoders); + using FUN_CreateBitmapFromFile = decltype(&Gdiplus::DllExports::GdipCreateBitmapFromFile); + using FUN_CreateHBITMAPFromBitmap = decltype(&Gdiplus::DllExports::GdipCreateHBITMAPFromBitmap); + using FUN_CreateBitmapFromStream = decltype(&Gdiplus::DllExports::GdipCreateBitmapFromStream); + using FUN_CreateBitmapFromHBITMAP = decltype(&Gdiplus::DllExports::GdipCreateBitmapFromHBITMAP); + using FUN_SaveImageToStream = decltype(&Gdiplus::DllExports::GdipSaveImageToStream); + using FUN_SaveImageToFile = decltype(&Gdiplus::DllExports::GdipSaveImageToFile); + using FUN_DisposeImage = decltype(&Gdiplus::DllExports::GdipDisposeImage); // members - int count; - HINSTANCE hinstGdiPlus; - ULONG_PTR gdiplusToken; + int count = 0; + HINSTANCE hinstGdiPlus = NULL; + ULONG_PTR gdiplusToken = 0; // GDI+ functions - STARTUP Startup; - SHUTDOWN Shutdown; - GETIMAGEENCODERSSIZE GetImageEncodersSize; - GETIMAGEENCODERS GetImageEncoders; - CREATEBITMAPFROMFILE CreateBitmapFromFile; - CREATEHBITMAPFROMBITMAP CreateHBITMAPFromBitmap; - CREATEBITMAPFROMSTREAM CreateBitmapFromStream; - CREATEBITMAPFROMHBITMAP CreateBitmapFromHBITMAP; - SAVEIMAGETOSTREAM SaveImageToStream; - SAVEIMAGETOFILE SaveImageToFile; - DISPOSEIMAGE DisposeImage; + FUN_Startup Startup = NULL; + FUN_Shutdown Shutdown = NULL; + FUN_GetImageEncoderSize GetImageEncodersSize = NULL; + FUN_GetImageEncoder GetImageEncoders = NULL; + FUN_GetImageDecoderSize GetImageDecodersSize = NULL; + FUN_GetImageDecoder GetImageDecoders = NULL; + FUN_CreateBitmapFromFile CreateBitmapFromFile = NULL; + FUN_CreateHBITMAPFromBitmap CreateHBITMAPFromBitmap = NULL; + FUN_CreateBitmapFromStream CreateBitmapFromStream = NULL; + FUN_CreateBitmapFromHBITMAP CreateBitmapFromHBITMAP = NULL; + FUN_SaveImageToStream SaveImageToStream = NULL; + FUN_SaveImageToFile SaveImageToFile = NULL; + FUN_DisposeImage DisposeImage = NULL; COMMON() { - count = 0; - hinstGdiPlus = NULL; - Startup = NULL; - Shutdown = NULL; - GetImageEncodersSize = NULL; - GetImageEncoders = NULL; - CreateBitmapFromFile = NULL; - CreateHBITMAPFromBitmap = NULL; - CreateBitmapFromStream = NULL; - CreateBitmapFromHBITMAP = NULL; - SaveImageToStream = NULL; - SaveImageToFile = NULL; - DisposeImage = NULL; } + ~COMMON() { FreeLib(); @@ -915,11 +913,13 @@ protected: } // get procedure address of the DLL - template <typename TYPE> - TYPE AddrOf(const char *name) + template <typename FUN_T> + FUN_T _getFUN(FUN_T& fun, const char *name) { - FARPROC proc = ::GetProcAddress(hinstGdiPlus, name); - return reinterpret_cast<TYPE>(proc); + if (fun) + return fun; + fun = reinterpret_cast<FUN_T>(::GetProcAddress(hinstGdiPlus, name)); + return fun; } HINSTANCE LoadLib() @@ -929,24 +929,19 @@ protected: hinstGdiPlus = ::LoadLibraryA("gdiplus.dll"); - // get procedure addresses from the DLL - Startup = AddrOf<STARTUP>("GdiplusStartup"); - Shutdown = AddrOf<SHUTDOWN>("GdiplusShutdown"); - GetImageEncodersSize = - AddrOf<GETIMAGEENCODERSSIZE>("GdipGetImageEncodersSize"); - GetImageEncoders = AddrOf<GETIMAGEENCODERS>("GdipGetImageEncoders"); - CreateBitmapFromFile = - AddrOf<CREATEBITMAPFROMFILE>("GdipCreateBitmapFromFile"); - CreateHBITMAPFromBitmap = - AddrOf<CREATEHBITMAPFROMBITMAP>("GdipCreateHBITMAPFromBitmap"); - CreateBitmapFromStream = - AddrOf<CREATEBITMAPFROMSTREAM>("GdipCreateBitmapFromStream"); - CreateBitmapFromHBITMAP = - AddrOf<CREATEBITMAPFROMHBITMAP>("GdipCreateBitmapFromHBITMAP"); - SaveImageToStream = - AddrOf<SAVEIMAGETOSTREAM>("GdipSaveImageToStream"); - SaveImageToFile = AddrOf<SAVEIMAGETOFILE>("GdipSaveImageToFile"); - DisposeImage = AddrOf<DISPOSEIMAGE>("GdipDisposeImage"); + _getFUN(Startup, "GdiplusStartup"); + _getFUN(Shutdown, "GdiplusShutdown"); + _getFUN(GetImageEncodersSize, "GdipGetImageEncodersSize"); + _getFUN(GetImageEncoders, "GdipGetImageEncoders"); + _getFUN(GetImageDecodersSize, "GdipGetImageDecodersSize"); + _getFUN(GetImageDecoders, "GdipGetImageDecoders"); + _getFUN(CreateBitmapFromFile, "GdipCreateBitmapFromFile"); + _getFUN(CreateHBITMAPFromBitmap, "GdipCreateHBITMAPFromBitmap"); + _getFUN(CreateBitmapFromStream, "GdipCreateBitmapFromStream"); + _getFUN(CreateBitmapFromHBITMAP, "GdipCreateBitmapFromHBITMAP"); + _getFUN(SaveImageToStream, "GdipSaveImageToStream"); + _getFUN(SaveImageToFile, "GdipSaveImageToFile"); + _getFUN(DisposeImage, "GdipDisposeImage"); if (hinstGdiPlus && Startup) { @@ -966,6 +961,8 @@ protected: Shutdown = NULL; GetImageEncodersSize = NULL; GetImageEncoders = NULL; + GetImageDecodersSize = NULL; + GetImageDecoders = NULL; CreateBitmapFromFile = NULL; CreateHBITMAPFromBitmap = NULL; CreateBitmapFromStream = NULL; @@ -1024,96 +1021,143 @@ protected: return RGB(quad.rgbRed, quad.rgbGreen, quad.rgbBlue); } - struct EXTENSION_ENTRY + static CLSID + FindCodecForExtension(LPCTSTR dotext, const Gdiplus::ImageCodecInfo *pCodecs, UINT nCodecs) { - LPCWSTR pszExt; - GUID guid; - }; - - const GUID *FileTypeFromExtension(LPCWSTR pszExt) const - { - static const EXTENSION_ENTRY table[] = - { - {L".jpg", Gdiplus::ImageFormatJPEG}, - {L".png", Gdiplus::ImageFormatPNG}, - {L".bmp", Gdiplus::ImageFormatBMP}, - {L".gif", Gdiplus::ImageFormatGIF}, - {L".tif", Gdiplus::ImageFormatTIFF}, - {L".jpeg", Gdiplus::ImageFormatJPEG}, - {L".jpe", Gdiplus::ImageFormatJPEG}, - {L".jfif", Gdiplus::ImageFormatJPEG}, - {L".dib", Gdiplus::ImageFormatBMP}, - {L".rle", Gdiplus::ImageFormatBMP}, - {L".tiff", Gdiplus::ImageFormatTIFF} - }; - const size_t count = _countof(table); - for (size_t i = 0; i < count; ++i) + for (UINT i = 0; i < nCodecs; ++i) { - if (::lstrcmpiW(table[i].pszExt, pszExt) == 0) - return &table[i].guid; + CString strSpecs(pCodecs[i].FilenameExtension); + int ichOld = 0, ichSep; + for (;;) + { + ichSep = strSpecs.Find(TEXT(';'), ichOld); + + CString strSpec; + if (ichSep < 0) + strSpec = strSpecs.Mid(ichOld); + else + strSpec = strSpecs.Mid(ichOld, ichSep - ichOld); + + int ichDot = strSpec.ReverseFind(TEXT('.')); + if (ichDot >= 0) + strSpec = strSpec.Mid(ichDot); + + if (!dotext || strSpec.CompareNoCase(dotext) == 0) + return pCodecs[i].Clsid; + + if (ichSep < 0) + break; + + ichOld = ichSep + 1; + } } - return NULL; + return CLSID_NULL; } - struct FORMAT_ENTRY + // Deprecated. Don't use this + static const GUID *FileTypeFromExtension(LPCTSTR dotext) { - GUID guid; - LPCWSTR mime; - }; + UINT cEncoders = 0; + Gdiplus::ImageCodecInfo* pEncoders = _getAllEncoders(cEncoders); - bool GetClsidFromFileType(CLSID *clsid, const GUID *guid) const - { - static const FORMAT_ENTRY table[] = - { - {Gdiplus::ImageFormatJPEG, L"image/jpeg"}, - {Gdiplus::ImageFormatPNG, L"image/png"}, - {Gdiplus::ImageFormatBMP, L"image/bmp"}, - {Gdiplus::ImageFormatGIF, L"image/gif"}, - {Gdiplus::ImageFormatTIFF, L"image/tiff"} - }; - const size_t count = _countof(table); - for (size_t i = 0; i < count; ++i) + for (UINT i = 0; i < cEncoders; ++i) { - if (::IsEqualGUID(table[i].guid, *guid)) + CString strSpecs(pEncoders[i].FilenameExtension); + int ichOld = 0, ichSep; + for (;;) { - int num = GetEncoderClsid(table[i].mime, clsid); - if (num >= 0) + ichSep = strSpecs.Find(TEXT(';'), ichOld); + + CString strSpec; + if (ichSep < 0) + strSpec = strSpecs.Mid(ichOld); + else + strSpec = strSpecs.Mid(ichOld, ichSep - ichOld); + + int ichDot = strSpec.ReverseFind(TEXT('.')); + if (ichDot >= 0) + strSpec = strSpec.Mid(ichDot); + + if (!dotext || strSpec.CompareNoCase(dotext) == 0) { - return true; + static GUID s_guid; + s_guid = pEncoders[i].FormatID; + delete[] pEncoders; + return &s_guid; } + + if (ichSep < 0) + break; + + ichOld = ichSep + 1; } } - return false; + + delete[] pEncoders; + return NULL; + } + + static CLSID + FindCodecForFileType(REFGUID guidFileType, const Gdiplus::ImageCodecInfo *pCodecs, UINT nCodecs) + { + for (UINT iInfo = 0; iInfo < nCodecs; ++iInfo) + { + if (::IsEqualGUID(pCodecs[iInfo].FormatID, guidFileType)) + return pCodecs[iInfo].Clsid; + } + return CLSID_NULL; } - int GetEncoderClsid(LPCWSTR mime, CLSID *clsid) const + // Deprecated. Don't use this + static bool GetClsidFromFileType(CLSID *clsid, const GUID *guid) { - UINT count = 0, total_size = 0; - GetCommon().GetImageEncodersSize(&count, &total_size); + UINT cEncoders = 0; + Gdiplus::ImageCodecInfo* pEncoders = _getAllEncoders(cEncoders); + *clsid = FindCodecForFileType(*guid, pEncoders, cEncoders); + delete[] pEncoders; + return true; + } + + static Gdiplus::ImageCodecInfo* _getAllEncoders(UINT& cEncoders) + { + CImage image; // Initialize common + + UINT total_size = 0; + GetCommon().GetImageEncodersSize(&cEncoders, &total_size); if (total_size == 0) - return -1; // failure + return NULL; // failure - Gdiplus::ImageCodecInfo *pInfo; - BYTE *pb = new BYTE[total_size]; - ATLASSERT(pb); - pInfo = reinterpret_cast<Gdiplus::ImageCodecInfo *>(pb); - if (pInfo == NULL) - return -1; // failure + Gdiplus::ImageCodecInfo *ret; + ret = new Gdiplus::ImageCodecInfo[total_size / sizeof(ret[0])]; + if (ret == NULL) + { + cEncoders = 0; + return NULL; // failure + } - GetCommon().GetImageEncoders(count, total_size, pInfo); + GetCommon().GetImageEncoders(cEncoders, total_size, ret); + return ret; // needs delete[] + } + + static Gdiplus::ImageCodecInfo* _getAllDecoders(UINT& cDecoders) + { + CImage image; // Initialize common - for (UINT iInfo = 0; iInfo < count; ++iInfo) + UINT total_size = 0; + GetCommon().GetImageDecodersSize(&cDecoders, &total_size); + if (total_size == 0) + return NULL; // failure + + Gdiplus::ImageCodecInfo *ret; + ret = new Gdiplus::ImageCodecInfo[total_size / sizeof(ret[0])]; + if (ret == NULL) { - if (::lstrcmpiW(pInfo[iInfo].MimeType, mime) == 0) - { - *clsid = pInfo[iInfo].Clsid; - delete[] pb; - return iInfo; // success - } + cDecoders = 0; + return NULL; // failure } - delete[] pb; - return -1; // failure + GetCommon().GetImageDecoders(cDecoders, total_size, ret); + return ret; // needs delete[] } void AttachInternal(HBITMAP hBitmap, DIBOrientation eOrientation, @@ -1186,9 +1230,7 @@ protected: // create a DIB section HDC hDC = ::CreateCompatibleDC(NULL); ATLASSERT(hDC); - LPVOID pvBits; - HBITMAP hbm = ::CreateDIBSection(hDC, bi.get(), DIB_RGB_COLORS, - &pvBits, NULL, 0); + HBITMAP hbm = ::CreateDIBSection(hDC, &bi, DIB_RGB_COLORS, NULL, NULL, 0); ATLASSERT(hbm); ::DeleteDC(hDC);

1 year, 5 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