Ros-diffs November 2019

ros-diffs@reactos.org

24 participants
322 discussions

[reactos] 01/01: [MEDIA][FONTS] Improve tahomabd.ttf (Cyrillic and Latin and Greek) No.23

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=454ea3d85b612f760a657… commit 454ea3d85b612f760a657d660c9bccc56b6e92fb Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Fri Nov 22 16:23:55 2019 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Fri Nov 22 16:23:55 2019 +0900 [MEDIA][FONTS] Improve tahomabd.ttf (Cyrillic and Latin and Greek) No.23 Tahoma Bold. Version 0.013 khmz. I shrinked 1px of 13px captal characters to correct the glyph height. CORE-8408 --- media/fonts/tahomabd.ttf | Bin 160504 -> 160284 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/media/fonts/tahomabd.ttf b/media/fonts/tahomabd.ttf index 6acc3e176f5..105718df06c 100644 Binary files a/media/fonts/tahomabd.ttf and b/media/fonts/tahomabd.ttf differ

4 years, 11 months

[reactos] 01/01: Revert [NOTEPAD] Add SBS_SIZEGRIP to status bar CORE-16528

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=34947add7902a1f21427d… commit 34947add7902a1f21427db1c3b4ee0239b552994 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Fri Nov 22 10:53:26 2019 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Fri Nov 22 10:53:26 2019 +0900 Revert [NOTEPAD] Add SBS_SIZEGRIP to status bar CORE-16528 --- base/applications/notepad/dialog.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/base/applications/notepad/dialog.c b/base/applications/notepad/dialog.c index 92e2a5614e4..f69773e3b04 100644 --- a/base/applications/notepad/dialog.c +++ b/base/applications/notepad/dialog.c @@ -832,10 +832,10 @@ VOID DoCreateStatusBar(VOID) /* Check if status bar object already exists. */ if (Globals.hStatusBar == NULL) { - const DWORD style = WS_CHILD | WS_VISIBLE | WS_EX_STATICEDGE | SBS_SIZEGRIP; - /* Try to create the status bar */ - Globals.hStatusBar = CreateStatusWindow(style, NULL, Globals.hMainWnd, + Globals.hStatusBar = CreateStatusWindow(WS_CHILD | WS_VISIBLE | WS_EX_STATICEDGE, + NULL, + Globals.hMainWnd, CMD_STATUSBAR_WND_ID); if (Globals.hStatusBar == NULL)

4 years, 11 months

[reactos] 01/01: [MEDIA][FONTS] Improve tahomabd.ttf (Cyrillic and Latin and Greek) No.22

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9ef61bb887e107ec7161f… commit 9ef61bb887e107ec7161fb4d6e8945023350c310 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Fri Nov 22 10:45:21 2019 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Fri Nov 22 10:45:21 2019 +0900 [MEDIA][FONTS] Improve tahomabd.ttf (Cyrillic and Latin and Greek) No.22 Tahoma Bold. Version 0.012 khmz. Many 13px bitmap glyphs are improved. CORE-8408 --- media/fonts/tahomabd.ttf | Bin 160488 -> 160504 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/media/fonts/tahomabd.ttf b/media/fonts/tahomabd.ttf index a68ca150952..6acc3e176f5 100644 Binary files a/media/fonts/tahomabd.ttf and b/media/fonts/tahomabd.ttf differ

4 years, 11 months

[reactos] 01/01: [NOTEPAD] Add SBS_SIZEGRIP to status bar CORE-16528

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1f2d4a78a1b8ccef2abf4… commit 1f2d4a78a1b8ccef2abf4bb480113a2570ab52b1 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Fri Nov 22 09:26:01 2019 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Fri Nov 22 09:26:01 2019 +0900 [NOTEPAD] Add SBS_SIZEGRIP to status bar CORE-16528 --- base/applications/notepad/dialog.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/base/applications/notepad/dialog.c b/base/applications/notepad/dialog.c index f69773e3b04..92e2a5614e4 100644 --- a/base/applications/notepad/dialog.c +++ b/base/applications/notepad/dialog.c @@ -832,10 +832,10 @@ VOID DoCreateStatusBar(VOID) /* Check if status bar object already exists. */ if (Globals.hStatusBar == NULL) { + const DWORD style = WS_CHILD | WS_VISIBLE | WS_EX_STATICEDGE | SBS_SIZEGRIP; + /* Try to create the status bar */ - Globals.hStatusBar = CreateStatusWindow(WS_CHILD | WS_VISIBLE | WS_EX_STATICEDGE, - NULL, - Globals.hMainWnd, + Globals.hStatusBar = CreateStatusWindow(style, NULL, Globals.hMainWnd, CMD_STATUSBAR_WND_ID); if (Globals.hStatusBar == NULL)

4 years, 11 months

[reactos] 01/01: [SDK][INCLUDE] Update winxx.h and msgdump.h

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=382675fc0de2b473c13e2… commit 382675fc0de2b473c13e27be43ad4b60bbae72c1 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu Nov 21 18:18:47 2019 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Thu Nov 21 18:18:47 2019 +0900 [SDK][INCLUDE] Update winxx.h and msgdump.h --- sdk/include/reactos/msgdump.h | 27 ++++++++------------------- sdk/include/reactos/winxx.h | 10 +++++++++- 2 files changed, 17 insertions(+), 20 deletions(-) diff --git a/sdk/include/reactos/msgdump.h b/sdk/include/reactos/msgdump.h index a2ae64c4156..eeea6a2cae8 100644 --- a/sdk/include/reactos/msgdump.h +++ b/sdk/include/reactos/msgdump.h @@ -5,7 +5,7 @@ * COPYRIGHT: Copyright 2018-2019 Katayama Hirofumi MZ (katayama.hirofumi.mz(a)gmail.com) */ #ifndef _INC_MSGDUMP -#define _INC_MSGDUMP 16 /* Version 16 */ +#define _INC_MSGDUMP 17 /* Version 17 */ /* * NOTE: MD_msgdump function in this file provides Win32API message dump feature. @@ -261,22 +261,12 @@ MD_OnShowWindow(HWND hwnd, BOOL fShow, UINT status) MSGDUMP_PREFIX, (void *)hwnd, fShow, status); } -static __inline void MSGDUMP_API -MD_OnWinIniChange(HWND hwnd, LPCTSTR lpszSectionName) -{ - if (IsWindowUnicode(hwnd)) - MSGDUMP_TPRINTF(TEXT("%sWM_WININICHANGE(hwnd:%p, lpszSectionName:%ls)\n"), - MSGDUMP_PREFIX, (void *)hwnd, (LPCWSTR)lpszSectionName); - else - MSGDUMP_TPRINTF(TEXT("%sWM_WININICHANGE(hwnd:%p, lpszSectionName:%hs)\n"), - MSGDUMP_PREFIX, (void *)hwnd, (LPCSTR)lpszSectionName); -} - -static __inline void MSGDUMP_API -MD_OnSettingChange(HWND hwnd, WPARAM wParam, LPARAM lParam) +static __inline LRESULT MSGDUMP_API +MD_OnSettingChange(HWND hwnd, UINT_PTR wFlag, LPCTSTR pszSection) { - MSGDUMP_TPRINTF(TEXT("%sWM_SETTINGCHANGE(hwnd:%p)\n"), - MSGDUMP_PREFIX, (void *)hwnd); + MSGDUMP_TPRINTF(TEXT("%sWM_SETTINGCHANGE(hwnd:%p, wFlag:%p, pszSection:%s)\n"), + MSGDUMP_PREFIX, (void *)hwnd, (void *)wFlag, pszSection); + return 0; } static __inline void MSGDUMP_API @@ -5122,9 +5112,8 @@ MD_msgdump(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) HANDLE_MSG(hwnd, WM_ERASEBKGND, MD_OnEraseBkgnd); HANDLE_MSG(hwnd, WM_SYSCOLORCHANGE, MD_OnSysColorChange); HANDLE_MSG(hwnd, WM_SHOWWINDOW, MD_OnShowWindow); - HANDLE_MSG(hwnd, WM_WININICHANGE, MD_OnWinIniChange); - /*HANDLE_MSG(hwnd, WM_SETTINGCHANGE, MD_OnSettingChange);*/ - /* WM_SETTINGCHANGE duplicates WM_WININICHANGE */ + /* HANDLE_MSG(hwnd, WM_WININICHANGE, MD_OnWinIniChange); */ + HANDLE_MSG(hwnd, WM_SETTINGCHANGE, MD_OnSettingChange); HANDLE_MSG(hwnd, WM_DEVMODECHANGE, MD_OnDevModeChange); HANDLE_MSG(hwnd, WM_ACTIVATEAPP, MD_OnActivateApp); HANDLE_MSG(hwnd, WM_FONTCHANGE, MD_OnFontChange); diff --git a/sdk/include/reactos/winxx.h b/sdk/include/reactos/winxx.h index e4acbbd8d6c..4921b106100 100644 --- a/sdk/include/reactos/winxx.h +++ b/sdk/include/reactos/winxx.h @@ -6,7 +6,7 @@ */ #ifndef _INC_WINXX -#define _INC_WINXX 7 /* Version 7 */ +#define _INC_WINXX 8 /* Version 8 */ #pragma once @@ -538,6 +538,14 @@ #define FORWARD_WM_NCACTIVATE(hwnd, fActive, hwndActDeact, fMinimized, fn) \ (BOOL)(DWORD)(fn)((hwnd), WM_NCACTIVATE, (WPARAM)(BOOL)(fActive), 0L) +/* LRESULT Cls_OnSettingChange(HWND hwnd, UINT_PTR wFlag, LPCTSTR pszSection) */ +#undef HANDLE_WM_SETTINGCHANGE +#define HANDLE_WM_SETTINGCHANGE(hwnd,wParam,lParam,fn) \ + ((fn)((hwnd), (UINT_PTR)(wParam), (LPCTSTR)(LPARAM)(lParam)), 0L) +#undef FORWARD_WM_SETTINGCHANGE +#define FORWARD_WM_SETTINGCHANGE(hwnd,wFlag,pszSection,fn) \ + (LRESULT)(fn)((hwnd), WM_SETTINGCHANGE, (WPARAM)(UINT_PTR)(wFlag), (LPARAM)(LPCTSTR)(pszSection)) + /* LONG Edit_OnGetSel(HWND hwnd, LPDWORD lpdwStart, LPDWORD lpdwEnd) */ #define HANDLE_EM_GETSEL(hwnd, wParam, lParam, fn) \ (LRESULT)(LONG)(fn)((hwnd), (LPDWORD)(wParam), (LPDWORD)(lParam))

4 years, 11 months

[reactos] 01/01: [NTGDI][FONT] Delete FillTMEx function and simplify codes

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ebfb62b420009fc3a827f… commit ebfb62b420009fc3a827f41d3534f9c3ba995e3e Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu Nov 21 17:01:25 2019 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Thu Nov 21 17:01:25 2019 +0900 [NTGDI][FONT] Delete FillTMEx function and simplify codes --- win32ss/gdi/ntgdi/freetype.c | 67 +++++++++++--------------------------------- 1 file changed, 16 insertions(+), 51 deletions(-) diff --git a/win32ss/gdi/ntgdi/freetype.c b/win32ss/gdi/ntgdi/freetype.c index 31bbf37fc7b..7ddf52fca1f 100644 --- a/win32ss/gdi/ntgdi/freetype.c +++ b/win32ss/gdi/ntgdi/freetype.c @@ -2234,9 +2234,9 @@ static BOOL face_has_symbol_charmap(FT_Face ft_face) } static void FASTCALL -FillTMEx(TEXTMETRICW *TM, PFONTGDI FontGDI, - TT_OS2 *pOS2, TT_HoriHeader *pHori, - FT_WinFNT_HeaderRec *pFNT, BOOL RealFont) +FillTM(TEXTMETRICW *TM, PFONTGDI FontGDI, + TT_OS2 *pOS2, TT_HoriHeader *pHori, + FT_WinFNT_HeaderRec *pFNT) { FT_Fixed XScale, YScale; int Ascent, Descent; @@ -2264,22 +2264,11 @@ FillTMEx(TEXTMETRICW *TM, PFONTGDI FontGDI, TM->tmDefaultChar = pFNT->default_char + pFNT->first_char; TM->tmBreakChar = pFNT->break_char + pFNT->first_char; TM->tmPitchAndFamily = pFNT->pitch_and_family; - if (RealFont) - { - TM->tmWeight = FontGDI->OriginalWeight; - TM->tmItalic = FontGDI->OriginalItalic; - TM->tmUnderlined = pFNT->underline; - TM->tmStruckOut = pFNT->strike_out; - TM->tmCharSet = pFNT->charset; - } - else - { - TM->tmWeight = FontGDI->RequestWeight; - TM->tmItalic = FontGDI->RequestItalic; - TM->tmUnderlined = FontGDI->RequestUnderline; - TM->tmStruckOut = FontGDI->RequestStrikeOut; - TM->tmCharSet = FontGDI->CharSet; - } + TM->tmWeight = FontGDI->RequestWeight; + TM->tmItalic = FontGDI->RequestItalic; + TM->tmUnderlined = FontGDI->RequestUnderline; + TM->tmStruckOut = FontGDI->RequestStrikeOut; + TM->tmCharSet = FontGDI->CharSet; return; } @@ -2316,21 +2305,14 @@ FillTMEx(TEXTMETRICW *TM, PFONTGDI FontGDI, /* Correct forumla to get the maxcharwidth from unicode and ansi font */ TM->tmMaxCharWidth = (FT_MulFix(Face->max_advance_width, XScale) + 32) >> 6; - if (RealFont) + if (FontGDI->OriginalWeight != FW_DONTCARE && + FontGDI->OriginalWeight != FW_NORMAL) { TM->tmWeight = FontGDI->OriginalWeight; } else { - if (FontGDI->OriginalWeight != FW_DONTCARE && - FontGDI->OriginalWeight != FW_NORMAL) - { - TM->tmWeight = FontGDI->OriginalWeight; - } - else - { - TM->tmWeight = FontGDI->RequestWeight; - } + TM->tmWeight = FontGDI->RequestWeight; } TM->tmOverhang = 0; @@ -2368,25 +2350,16 @@ FillTMEx(TEXTMETRICW *TM, PFONTGDI FontGDI, TM->tmDefaultChar = TM->tmBreakChar - 1; } - if (RealFont) + if (FontGDI->OriginalItalic || FontGDI->RequestItalic) { - TM->tmItalic = FontGDI->OriginalItalic; - TM->tmUnderlined = FALSE; - TM->tmStruckOut = FALSE; + TM->tmItalic = 0xFF; } else { - if (FontGDI->OriginalItalic || FontGDI->RequestItalic) - { - TM->tmItalic = 0xFF; - } - else - { - TM->tmItalic = 0; - } - TM->tmUnderlined = (FontGDI->RequestUnderline ? 0xFF : 0); - TM->tmStruckOut = (FontGDI->RequestStrikeOut ? 0xFF : 0); + TM->tmItalic = 0; } + TM->tmUnderlined = (FontGDI->RequestUnderline ? 0xFF : 0); + TM->tmStruckOut = (FontGDI->RequestStrikeOut ? 0xFF : 0); if (!FT_IS_FIXED_WIDTH(Face)) { @@ -2471,14 +2444,6 @@ FillTMEx(TEXTMETRICW *TM, PFONTGDI FontGDI, TM->tmCharSet = FontGDI->CharSet; } -static void FASTCALL -FillTM(TEXTMETRICW *TM, PFONTGDI FontGDI, - TT_OS2 *pOS2, TT_HoriHeader *pHori, - FT_WinFNT_HeaderRec *pFNT) -{ - FillTMEx(TM, FontGDI, pOS2, pHori, pFNT, FALSE); -} - static NTSTATUS IntGetFontLocalizedName(PUNICODE_STRING pNameW, PSHARED_FACE SharedFace, FT_UShort NameID, FT_UShort LangID);

4 years, 11 months

[reactos] 01/01: [MEDIA][FONTS] Improve UniVGA16.ttf (VGA) font

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6f2662688b4dcb44d8da7… commit 6f2662688b4dcb44d8da7fb5f99edf4817070b0e Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu Nov 21 16:39:15 2019 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Thu Nov 21 16:39:15 2019 +0900 [MEDIA][FONTS] Improve UniVGA16.ttf (VGA) font VGA Medium font. Version 1.01 khmz. Underline position. Strikeout position. CORE-8408 --- media/fonts/UniVGA16.ttf | Bin 293248 -> 260064 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/media/fonts/UniVGA16.ttf b/media/fonts/UniVGA16.ttf index e7b74a6030d..9702b4b33ce 100644 Binary files a/media/fonts/UniVGA16.ttf and b/media/fonts/UniVGA16.ttf differ

4 years, 11 months

[reactos] 01/01: [DESK] StringCbCat() needs bytes, not chars (#2070)

by Serge Gautherie

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5b37caa9d74db52d46118… commit 5b37caa9d74db52d46118e0fd496a4154ecedae6 Author: Serge Gautherie <32623169+SergeGautherie(a)users.noreply.github.com> AuthorDate: Thu Nov 21 01:10:20 2019 +0100 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Thu Nov 21 01:10:20 2019 +0100 [DESK] StringCbCat() needs bytes, not chars (#2070) --- dll/cpl/desk/background.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dll/cpl/desk/background.c b/dll/cpl/desk/background.c index 1e12963b356..a92f27b7185 100644 --- a/dll/cpl/desk/background.c +++ b/dll/cpl/desk/background.c @@ -1012,7 +1012,7 @@ SetWallpaper(PBACKGROUND_DATA pData) return; } - if (FAILED(StringCbCat(szWallpaper, MAX_PATH, TEXT("\\Wallpaper1.bmp")))) + if (FAILED(StringCbCat(szWallpaper, sizeof(szWallpaper), TEXT("\\Wallpaper1.bmp")))) { return; }

4 years, 11 months

[reactos] 01/01: [REACTOS] Use explicit StringCb*W() (#2069)

by Serge Gautherie

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0f92924a994245f737a84… commit 0f92924a994245f737a84a0f695d3e70e09a01d0 Author: Serge Gautherie <32623169+SergeGautherie(a)users.noreply.github.com> AuthorDate: Thu Nov 21 00:47:06 2019 +0100 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Thu Nov 21 00:47:06 2019 +0100 [REACTOS] Use explicit StringCb*W() (#2069) --- base/applications/control/control.c | 4 ++-- base/applications/network/dwnl/dwnl.c | 2 +- dll/cpl/desk/devsett.c | 2 +- dll/win32/shell32/dialogs/filetypes.cpp | 3 ++- dll/win32/shell32/folders/CRecycleBin.cpp | 2 +- modules/rostests/kmtests/kmtest/fltsupport.c | 18 +++++++++--------- modules/rostests/kmtests/kmtest/service.c | 2 +- modules/rostests/kmtests/kmtest/support.c | 12 ++++++------ 8 files changed, 23 insertions(+), 22 deletions(-) diff --git a/base/applications/control/control.c b/base/applications/control/control.c index d008cae4abd..f0ca50b444c 100644 --- a/base/applications/control/control.c +++ b/base/applications/control/control.c @@ -43,8 +43,8 @@ OpenShellFolder(LPWSTR lpFolderCLSID) * Open a shell folder using "explorer.exe". The passed CLSIDs * are all subfolders of the "Control Panel" shell folder. */ - StringCbCopy(szParameters, sizeof(szParameters), L"/n,::{20D04FE0-3AEA-1069-A2D8-08002B30309D}\\::{21EC2020-3AEA-1069-A2DD-08002B30309D}"); - StringCbCat(szParameters,sizeof(szParameters), lpFolderCLSID); + StringCbCopyW(szParameters, sizeof(szParameters), L"/n,::{20D04FE0-3AEA-1069-A2D8-08002B30309D}\\::{21EC2020-3AEA-1069-A2DD-08002B30309D}"); + StringCbCatW(szParameters, sizeof(szParameters), lpFolderCLSID); return (INT_PTR)ShellExecuteW(NULL, L"open", diff --git a/base/applications/network/dwnl/dwnl.c b/base/applications/network/dwnl/dwnl.c index 7660906a5f4..74826ef8052 100644 --- a/base/applications/network/dwnl/dwnl.c +++ b/base/applications/network/dwnl/dwnl.c @@ -49,7 +49,7 @@ write_status(LPCWSTR lpFmt, ...) CONSOLE_SCREEN_BUFFER_INFO csbi; va_start(args, lpFmt); - StringCbVPrintf(szTxt, sizeof(szTxt), lpFmt, args); + StringCbVPrintfW(szTxt, sizeof(szTxt), lpFmt, args); va_end(args); if (GetConsoleScreenBufferInfo(GetStdHandle(STD_OUTPUT_HANDLE), &csbi)) diff --git a/dll/cpl/desk/devsett.c b/dll/cpl/desk/devsett.c index 446848fa0cc..73dbb78a62f 100644 --- a/dll/cpl/desk/devsett.c +++ b/dll/cpl/desk/devsett.c @@ -665,7 +665,7 @@ CDevSettings_GetData(IDataObject* iface, (wcslen(pszRet) + 1) * sizeof(WCHAR)); if (pszBuf != NULL) { - hr = StringCbCopy(pszBuf, (wcslen(pszRet) + 1) * sizeof(WCHAR), pszRet); + hr = StringCbCopyW(pszBuf, (wcslen(pszRet) + 1) * sizeof(WCHAR), pszRet); if (FAILED(hr)) { GlobalFree(pszBuf); diff --git a/dll/win32/shell32/dialogs/filetypes.cpp b/dll/win32/shell32/dialogs/filetypes.cpp index 56b32cb20aa..f54203d0511 100644 --- a/dll/win32/shell32/dialogs/filetypes.cpp +++ b/dll/win32/shell32/dialogs/filetypes.cpp @@ -682,7 +682,8 @@ FileTypesDlg_InsertToLV(HWND hListView, LPCWSTR szName, INT iItem, LPCWSTR szFil // construct default 'FileExtensionFile' by formatting the uppercase extension // with IDS_FILE_EXT_TYPE, outputting something like a l18n 'INI File' - StringCbPrintf(Entry->FileDescription, sizeof(Entry->FileDescription), szFile, &Entry->FileExtension[1]); + StringCbPrintfW(Entry->FileDescription, sizeof(Entry->FileDescription), + szFile, &Entry->FileExtension[1]); } ZeroMemory(&lvItem, sizeof(LVITEMW)); diff --git a/dll/win32/shell32/folders/CRecycleBin.cpp b/dll/win32/shell32/folders/CRecycleBin.cpp index d227720fe34..a62696a2628 100644 --- a/dll/win32/shell32/folders/CRecycleBin.cpp +++ b/dll/win32/shell32/folders/CRecycleBin.cpp @@ -891,7 +891,7 @@ TRASH_CanTrashFile(LPCWSTR wszPath) // Copy and retrieve the root path from get given string WCHAR wszRootPathName[MAX_PATH]; - StringCbCopy(wszRootPathName, sizeof(wszRootPathName), wszPath); + StringCbCopyW(wszRootPathName, sizeof(wszRootPathName), wszPath); PathStripToRootW(wszRootPathName); // Test to see if the drive is fixed (non removable) diff --git a/modules/rostests/kmtests/kmtest/fltsupport.c b/modules/rostests/kmtests/kmtest/fltsupport.c index 4127ccad24f..1488a44a183 100644 --- a/modules/rostests/kmtests/kmtest/fltsupport.c +++ b/modules/rostests/kmtests/kmtest/fltsupport.c @@ -67,11 +67,11 @@ KmtFltCreateService( { WCHAR ServicePath[MAX_PATH]; - StringCbCopy(ServicePath, sizeof ServicePath, ServiceName); - StringCbCat(ServicePath, sizeof ServicePath, L"_drv.sys"); + StringCbCopyW(ServicePath, sizeof(ServicePath), ServiceName); + StringCbCatW(ServicePath, sizeof(ServicePath), L"_drv.sys"); - StringCbCopy(TestServiceName, sizeof TestServiceName, L"Kmtest-"); - StringCbCat(TestServiceName, sizeof TestServiceName, ServiceName); + StringCbCopyW(TestServiceName, sizeof(TestServiceName), L"Kmtest-"); + StringCbCatW(TestServiceName, sizeof(TestServiceName), ServiceName); return KmtpCreateService(TestServiceName, ServicePath, @@ -455,9 +455,9 @@ KmtFltAddAltitude( DWORD Zero = 0; LONG Error; - StringCbCopy(KeyPath, sizeof KeyPath, L"SYSTEM\\CurrentControlSet\\Services\\"); - StringCbCat(KeyPath, sizeof KeyPath, TestServiceName); - StringCbCat(KeyPath, sizeof KeyPath, L"\\Instances\\"); + StringCbCopyW(KeyPath, sizeof(KeyPath), L"SYSTEM\\CurrentControlSet\\Services\\"); + StringCbCatW(KeyPath, sizeof(KeyPath), TestServiceName); + StringCbCatW(KeyPath, sizeof(KeyPath), L"\\Instances\\"); Error = RegCreateKeyEx(HKEY_LOCAL_MACHINE, KeyPath, @@ -473,8 +473,8 @@ KmtFltAddAltitude( return Error; } - StringCbCopy(DefaultInstance, sizeof DefaultInstance, TestServiceName); - StringCbCat(DefaultInstance, sizeof DefaultInstance, L" Instance"); + StringCbCopyW(DefaultInstance, sizeof(DefaultInstance), TestServiceName); + StringCbCatW(DefaultInstance, sizeof(DefaultInstance), L" Instance"); Error = RegSetValueExW(hKey, L"DefaultInstance", diff --git a/modules/rostests/kmtests/kmtest/service.c b/modules/rostests/kmtests/kmtest/service.c index 7427fbfdd39..249b3a8f47e 100644 --- a/modules/rostests/kmtests/kmtest/service.c +++ b/modules/rostests/kmtests/kmtest/service.c @@ -431,7 +431,7 @@ KmtpCreateService( assert(wcsrchr(DriverPath, L'\\') != NULL); wcsrchr(DriverPath, L'\\')[1] = L'\0'; - result = StringCbCat(DriverPath, sizeof DriverPath, ServicePath); + result = StringCbCatW(DriverPath, sizeof(DriverPath), ServicePath); if (FAILED(result)) error_value_goto(Error, result, cleanup); diff --git a/modules/rostests/kmtests/kmtest/support.c b/modules/rostests/kmtests/kmtest/support.c index 2a2c99ed226..13bd66b323d 100644 --- a/modules/rostests/kmtests/kmtest/support.c +++ b/modules/rostests/kmtests/kmtest/support.c @@ -131,11 +131,11 @@ KmtLoadDriver( DWORD Error = ERROR_SUCCESS; WCHAR ServicePath[MAX_PATH]; - StringCbCopy(ServicePath, sizeof ServicePath, ServiceName); - StringCbCat(ServicePath, sizeof ServicePath, L"_drv.sys"); + StringCbCopyW(ServicePath, sizeof(ServicePath), ServiceName); + StringCbCatW(ServicePath, sizeof(ServicePath), L"_drv.sys"); - StringCbCopy(TestServiceName, sizeof TestServiceName, L"Kmtest-"); - StringCbCat(TestServiceName, sizeof TestServiceName, ServiceName); + StringCbCopyW(TestServiceName, sizeof(TestServiceName), L"Kmtest-"); + StringCbCatW(TestServiceName, sizeof(TestServiceName), ServiceName); Error = KmtCreateAndStartService(TestServiceName, ServicePath, NULL, &TestServiceHandle, RestartIfRunning); @@ -176,8 +176,8 @@ KmtOpenDriver(VOID) DWORD Error = ERROR_SUCCESS; WCHAR DevicePath[MAX_PATH]; - StringCbCopy(DevicePath, sizeof DevicePath, L"\\\\.\\Global\\GLOBALROOT\\Device\\"); - StringCbCat(DevicePath, sizeof DevicePath, TestServiceName); + StringCbCopyW(DevicePath, sizeof(DevicePath), L"\\\\.\\Global\\GLOBALROOT\\Device\\"); + StringCbCatW(DevicePath, sizeof(DevicePath), TestServiceName); TestDeviceHandle = CreateFile(DevicePath, GENERIC_READ | GENERIC_WRITE, 0, NULL, OPEN_EXISTING, 0, NULL); if (TestDeviceHandle == INVALID_HANDLE_VALUE)

4 years, 11 months

[reactos] 01/01: [NOTEPAD] StringCbPrintf() need sizeof(), not ARRAY_SIZE() (#2067)

by Serge Gautherie

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f3af9cfcf12be8673a227… commit f3af9cfcf12be8673a227ac2231ecf7b8ceec28b Author: Serge Gautherie <32623169+SergeGautherie(a)users.noreply.github.com> AuthorDate: Wed Nov 20 18:42:04 2019 +0100 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Wed Nov 20 18:42:04 2019 +0100 [NOTEPAD] StringCbPrintf() need sizeof(), not ARRAY_SIZE() (#2067) --- base/applications/notepad/dialog.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/base/applications/notepad/dialog.c b/base/applications/notepad/dialog.c index d3b5deeea8a..f69773e3b04 100644 --- a/base/applications/notepad/dialog.c +++ b/base/applications/notepad/dialog.c @@ -81,13 +81,16 @@ void UpdateWindowCaption(BOOL clearModifyAlert) /* When a file is being opened or created, there is no need to have the edited flag shown when the new or opened file has not been edited yet */ if (clearModifyAlert) - StringCbPrintf(szCaption, ARRAY_SIZE(szCaption), _T("%s - %s"), szFilename, szNotepad); + { + StringCbPrintf(szCaption, sizeof(szCaption), _T("%s - %s"), + szFilename, szNotepad); + } else { BOOL isModified = (SendMessage(Globals.hEdit, EM_GETMODIFY, 0, 0) ? TRUE : FALSE); /* Update the caption based upon if the user has modified the contents of the file or not */ - StringCbPrintf(szCaption, ARRAY_SIZE(szCaption), _T("%s%s - %s"), + StringCbPrintf(szCaption, sizeof(szCaption), _T("%s%s - %s"), (isModified ? _T("*") : _T("")), szFilename, szNotepad); }

4 years, 11 months

← Newer
1
...
10
11
12
13
14
15
16
...
33
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs November 2019