Ros-diffs April 2020

ros-diffs@reactos.org

45 participants
395 discussions

[reactos] 01/01: [LABEL] Update Chinese Simplified translation (#2692)

by He Yang

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2b6b873cdd6c91ae7ab9b… commit 2b6b873cdd6c91ae7ab9bee369d66aee5f04c74d Author: He Yang <1160386205(a)qq.com> AuthorDate: Wed Apr 29 21:01:10 2020 +0800 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Apr 29 16:01:10 2020 +0300 [LABEL] Update Chinese Simplified translation (#2692) --- base/applications/cmdutils/label/lang/zh-CN.rc | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/base/applications/cmdutils/label/lang/zh-CN.rc b/base/applications/cmdutils/label/lang/zh-CN.rc index a4eea705b4f..ff83d7bdfeb 100644 --- a/base/applications/cmdutils/label/lang/zh-CN.rc +++ b/base/applications/cmdutils/label/lang/zh-CN.rc @@ -1,20 +1,22 @@ -/* Simplified Chinese translation by Song Fuchang (0xfc) <sfc_0(a)yahoo.com.cn> 2011 */ +/* Simplified Chinese translation by Song Fuchang (0xfc) <sfc_0(a)yahoo.com.cn> 2011 + updated by He Yang <1160386205(a)qq.com> 2020 +*/ LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED STRINGTABLE BEGIN // STRING_LABEL_HELP "显示或改变驱动器卷标。\n\nLABEL [驱动器:][卷标]\n" - STRING_LABEL_HELP "Creates, changes or deletes the volume label of a disk.\n\n\ + STRING_LABEL_HELP "创建、更改或是删除驱动器的卷标。\n\n\ LABEL [drive:][label]\n\n\ - drive: Specifies the drive letter of a drive.\n\ - label Specifies the label of the drive." + drive: 指定驱动器号。\n\ + label 指定卷标。" STRING_LABEL_TEXT1 "驱动器 %c 中的卷是 %s\n" STRING_LABEL_TEXT2 "驱动器 %c 中的卷没有卷标。\n" STRING_LABEL_TEXT3 "卷的序列号是 %04X-%04X\n" STRING_LABEL_TEXT4 "驱动器卷标 (32 个字符, 按 ENTER 忽略)? " - STRING_LABEL_PROMPT "Delete current volume label (Y/N)? " + STRING_LABEL_PROMPT "删除当前驱动器卷标 (Y/N)? " STRING_LABEL_OPTIONS "YN" STRING_ERROR_INVALID_DRIVE "无效驱动器指定\n" - STRING_ERROR_INVALID_LABEL "Invalid volume label\n" + STRING_ERROR_INVALID_LABEL "无效驱动器卷标\n" END

4 years, 5 months

[reactos] 01/01: [MSPAINT] Follow-up of #2686

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7fe7f5e4c107451c4485c… commit 7fe7f5e4c107451c4485cc53f140ba5e93612b63 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Wed Apr 29 08:39:47 2020 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Wed Apr 29 08:39:47 2020 +0900 [MSPAINT] Follow-up of #2686 Show error message if SaveDIBToFile failed. CORE-16982, CORE-16979 --- base/applications/mspaint/dib.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/base/applications/mspaint/dib.cpp b/base/applications/mspaint/dib.cpp index 58c4c83e82f..ecdbf22e339 100644 --- a/base/applications/mspaint/dib.cpp +++ b/base/applications/mspaint/dib.cpp @@ -75,7 +75,10 @@ BOOL SaveDIBToFile(HBITMAP hBitmap, LPTSTR FileName, HDC hDC) WIN32_FIND_DATA find; HANDLE hFind = FindFirstFile(FileName, &find); if (hFind == INVALID_HANDLE_VALUE) + { + ShowFileLoadError(FileName); return FALSE; + } FindClose(hFind); // update time and size @@ -114,6 +117,7 @@ HBITMAP SetBitmapAndInfo(HBITMAP hBitmap, LPCTSTR name, DWORD dwFileSize, BOOL i fileHPPM = fileVPPM = 2834; ZeroMemory(&fileTime, sizeof(fileTime)); + isFile = FALSE; } else {

4 years, 5 months

[reactos] 01/01: [KERNEL32_APITEST] Add QueryUserAPC testcase (#2681)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f3235f1074e32de0e0bc6… commit f3235f1074e32de0e0bc60e8530d7c187fae21c3 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Wed Apr 29 07:48:46 2020 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Apr 29 07:48:46 2020 +0900 [KERNEL32_APITEST] Add QueryUserAPC testcase (#2681) Add a testcase for kernel32!QueryUserAPC, SleepEx and WaitForSingleObjectEx functions. CORE-13950 --- modules/rostests/apitests/kernel32/CMakeLists.txt | 1 + modules/rostests/apitests/kernel32/QueryUserAPC.c | 152 ++++++++++++++++++++++ modules/rostests/apitests/kernel32/testlist.c | 2 + 3 files changed, 155 insertions(+) diff --git a/modules/rostests/apitests/kernel32/CMakeLists.txt b/modules/rostests/apitests/kernel32/CMakeLists.txt index da3ea911884..5fdae336b6c 100644 --- a/modules/rostests/apitests/kernel32/CMakeLists.txt +++ b/modules/rostests/apitests/kernel32/CMakeLists.txt @@ -27,6 +27,7 @@ list(APPEND SOURCE Mailslot.c MultiByteToWideChar.c PrivMoveFileIdentityW.c + QueryUserAPC.c SetComputerNameExW.c SetConsoleWindowInfo.c SetCurrentDirectory.c diff --git a/modules/rostests/apitests/kernel32/QueryUserAPC.c b/modules/rostests/apitests/kernel32/QueryUserAPC.c new file mode 100644 index 00000000000..f3a64498506 --- /dev/null +++ b/modules/rostests/apitests/kernel32/QueryUserAPC.c @@ -0,0 +1,152 @@ +/* + * PROJECT: ReactOS api tests + * LICENSE: LGPL-2.0-or-later (https://spdx.org/licenses/LGPL-2.0-or-later) + * PURPOSE: Tests for QueryUserAPC, SleepEx, WaitForSingleObjectEx etc. + * COPYRIGHT: Copyright 2020 Katayama Hirofumi MZ (katayama.hirofumi.mz(a)gmail.com) + */ +#include "precomp.h" + +#define MAX_RECORD 30 + +static DWORD s_record_count = 0; +static DWORD s_record[MAX_RECORD + 1] = { 0 }; +static BOOL s_terminate_all = FALSE; + +static const DWORD s_expected[] = +{ + 0, 1, 7, 8, 4, + 2, 1, 9, 10, 5, + 2, 1, 11, 12, 13, + 6, 2, 3, 14, 15, + 16 +}; +static const SIZE_T s_expected_count = _countof(s_expected); + +static void AddValueToRecord(DWORD dwValue) +{ + s_record[s_record_count] = dwValue; + if (s_record_count < MAX_RECORD) + s_record_count++; +} + +static VOID CheckRecord(void) +{ + SIZE_T i, count = min(s_record_count, s_expected_count); + + for (i = 0; i < count; ++i) + { + ok(s_record[i] == s_expected[i], "s_record[%u]: got %lu vs expected %lu\n", + (INT)i, s_record[i], s_expected[i]); + } + + count = abs((int)s_record_count - (int)s_expected_count); + for (i = 0; i < count; ++i) + { + ok(s_record_count == s_expected_count, + "s_record_count: got %u vs expected %u\n", + (int)s_record_count, (int)s_expected_count); + } +} + +static DWORD WINAPI ThreadFunc1(LPVOID arg) +{ + AddValueToRecord(0); + while (!s_terminate_all) + { + AddValueToRecord(1); + ok_long(SleepEx(INFINITE, TRUE), WAIT_IO_COMPLETION); + AddValueToRecord(2); + } + AddValueToRecord(3); + return 0; +} + +static DWORD WINAPI ThreadFunc2(LPVOID arg) +{ + AddValueToRecord(0); + while (!s_terminate_all) + { + AddValueToRecord(1); + ok_long(WaitForSingleObjectEx(GetCurrentThread(), INFINITE, TRUE), WAIT_IO_COMPLETION); + AddValueToRecord(2); + } + AddValueToRecord(3); + return 0; +} + +static VOID NTAPI DoUserAPC1(ULONG_PTR Parameter) +{ + ok_int((int)Parameter, 1); + AddValueToRecord(4); +} + +static VOID NTAPI DoUserAPC2(ULONG_PTR Parameter) +{ + ok_int((int)Parameter, 2); + AddValueToRecord(5); +} + +static VOID NTAPI DoUserAPC3(ULONG_PTR Parameter) +{ + ok_int((int)Parameter, 3); + AddValueToRecord(6); + s_terminate_all = TRUE; +} + +static void JustDoIt(LPTHREAD_START_ROUTINE fn) +{ + HANDLE hThread; + DWORD dwThreadId; + + s_terminate_all = FALSE; + s_record_count = 0; + ZeroMemory(s_record, sizeof(s_record)); + + hThread = CreateThread(NULL, 0, fn, NULL, 0, &dwThreadId); + ok(hThread != NULL, "hThread was NULL\n"); + + Sleep(100); + + AddValueToRecord(7); + ok_long(QueueUserAPC(DoUserAPC1, hThread, 1), 1); + AddValueToRecord(8); + + Sleep(100); + + AddValueToRecord(9); + ok_long(QueueUserAPC(DoUserAPC2, hThread, 2), 1); + AddValueToRecord(10); + + Sleep(100); + + AddValueToRecord(11); + ok_long(QueueUserAPC(DoUserAPC3, hThread, 3), 1); + AddValueToRecord(12); + + AddValueToRecord(13); + ok_long(WaitForSingleObject(hThread, 5 * 1000), WAIT_OBJECT_0); + AddValueToRecord(14); + + AddValueToRecord(15); + ok_int(CloseHandle(hThread), TRUE); + hThread = NULL; + AddValueToRecord(16); + + CheckRecord(); +} + +static void TestForSleepEx(void) +{ + JustDoIt(ThreadFunc1); +} + +static void TestForWaitForSingleObjectEx(void) +{ + JustDoIt(ThreadFunc2); +} + +START_TEST(QueryUserAPC) +{ + TestForSleepEx(); + TestForWaitForSingleObjectEx(); +} diff --git a/modules/rostests/apitests/kernel32/testlist.c b/modules/rostests/apitests/kernel32/testlist.c index 19217012a9b..1db6b3ff377 100644 --- a/modules/rostests/apitests/kernel32/testlist.c +++ b/modules/rostests/apitests/kernel32/testlist.c @@ -26,6 +26,7 @@ extern void func_lstrlen(void); extern void func_Mailslot(void); extern void func_MultiByteToWideChar(void); extern void func_PrivMoveFileIdentityW(void); +extern void func_QueryUserAPC(void); extern void func_SetComputerNameExW(void); extern void func_SetConsoleWindowInfo(void); extern void func_SetCurrentDirectory(void); @@ -60,6 +61,7 @@ const struct test winetest_testlist[] = { "MailslotRead", func_Mailslot }, { "MultiByteToWideChar", func_MultiByteToWideChar }, { "PrivMoveFileIdentityW", func_PrivMoveFileIdentityW }, + { "QueryUserAPC", func_QueryUserAPC }, { "SetComputerNameExW", func_SetComputerNameExW }, { "SetConsoleWindowInfo", func_SetConsoleWindowInfo }, { "SetCurrentDirectory", func_SetCurrentDirectory },

4 years, 5 months

[reactos] 01/01: [MSPAINT] Refactor loading/saving image file (#2686)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=036206a1c36738584c8df… commit 036206a1c36738584c8df57f6dcd76c725ae7f45 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Wed Apr 29 07:44:18 2020 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Apr 29 07:44:18 2020 +0900 [MSPAINT] Refactor loading/saving image file (#2686) - Add DoLoadImageFile, CreateWhiteDIB, and CMainWindow::ConfirmSave functions. - Replace LoadDIBFromFile function with DoLoadImageFile. - Fix the empty file loading. - Delete UpdateApplicationProperties function. - Rewrite SaveDIBToFile function. CORE-16982, CORE-16979 --- base/applications/mspaint/dib.cpp | 170 +++++++++++++++++++++++++--------- base/applications/mspaint/dib.h | 8 +- base/applications/mspaint/globalvar.h | 1 + base/applications/mspaint/history.cpp | 3 +- base/applications/mspaint/history.h | 2 - base/applications/mspaint/main.cpp | 63 +------------ base/applications/mspaint/winproc.cpp | 158 ++++++++++--------------------- base/applications/mspaint/winproc.h | 2 +- 8 files changed, 184 insertions(+), 223 deletions(-) diff --git a/base/applications/mspaint/dib.cpp b/base/applications/mspaint/dib.cpp index ce74c093bd8..58c4c83e82f 100644 --- a/base/applications/mspaint/dib.cpp +++ b/base/applications/mspaint/dib.cpp @@ -26,6 +26,29 @@ CreateDIBWithProperties(int width, int height) return CreateDIBSection(NULL, &bmi, DIB_RGB_COLORS, NULL, NULL, 0); } +HBITMAP +CreateColorDIB(int width, int height, COLORREF rgb) +{ + HBITMAP ret = CreateDIBWithProperties(width, height); + if (!ret) + return NULL; + + if (rgb) + { + HDC hdc = CreateCompatibleDC(NULL); + HGDIOBJ hbmOld = SelectObject(hdc, ret); + RECT rc; + SetRect(&rc, 0, 0, width, height); + HBRUSH hbr = CreateSolidBrush(rgb); + FillRect(hdc, &rc, hbr); + DeleteObject(hbr); + SelectObject(hdc, hbmOld); + DeleteDC(hdc); + } + + return ret; +} + int GetDIBWidth(HBITMAP hBitmap) { @@ -42,35 +65,32 @@ GetDIBHeight(HBITMAP hBitmap) return bm.bmHeight; } -void -SaveDIBToFile(HBITMAP hBitmap, LPTSTR FileName, HDC hDC, LPSYSTEMTIME time, int *size, int hRes, int vRes) +BOOL SaveDIBToFile(HBITMAP hBitmap, LPTSTR FileName, HDC hDC) { CImage img; img.Attach(hBitmap); img.Save(FileName); // TODO: error handling img.Detach(); - // update time and size - - HANDLE hFile = - CreateFile(FileName, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_FLAG_SEQUENTIAL_SCAN, NULL); - if (hFile == INVALID_HANDLE_VALUE) - return; + WIN32_FIND_DATA find; + HANDLE hFind = FindFirstFile(FileName, &find); + if (hFind == INVALID_HANDLE_VALUE) + return FALSE; + FindClose(hFind); - if (time) - { - FILETIME ft; - GetFileTime(hFile, NULL, NULL, &ft); - FileTimeToSystemTime(&ft, time); - } - if (size) - *size = GetFileSize(hFile, NULL); + // update time and size + FILETIME ft; + FileTimeToLocalFileTime(&find.ftLastWriteTime, &ft); + FileTimeToSystemTime(&ft, &fileTime); + fileSize = find.nFileSizeLow; // TODO: update hRes and vRes - CloseHandle(hFile); - registrySettings.SetMostRecentFile(FileName); + + isAFile = TRUE; + imageSaved = TRUE; + return TRUE; } void ShowFileLoadError(LPCTSTR name) @@ -82,41 +102,105 @@ void ShowFileLoadError(LPCTSTR name) mainWindow.MessageBox(strText, strProgramName, MB_OK | MB_ICONEXCLAMATION); } -void -LoadDIBFromFile(HBITMAP * hBitmap, LPCTSTR name, LPSYSTEMTIME time, int *size, int *hRes, int *vRes) +HBITMAP SetBitmapAndInfo(HBITMAP hBitmap, LPCTSTR name, DWORD dwFileSize, BOOL isFile) { - CImage img; - img.Load(name); - *hBitmap = img.Detach(); + if (hBitmap == NULL) + { + COLORREF white = RGB(255, 255, 255); + hBitmap = CreateColorDIB(registrySettings.BMPWidth, + registrySettings.BMPHeight, white); + if (hBitmap == NULL) + return FALSE; + + fileHPPM = fileVPPM = 2834; + ZeroMemory(&fileTime, sizeof(fileTime)); + } + else + { + // update PPMs + HDC hScreenDC = GetDC(NULL); + fileHPPM = (int)(GetDeviceCaps(hScreenDC, LOGPIXELSX) * 1000 / 25.4); + fileVPPM = (int)(GetDeviceCaps(hScreenDC, LOGPIXELSY) * 1000 / 25.4); + ReleaseDC(NULL, hScreenDC); + } + + // update image + imageModel.Insert(hBitmap); + imageModel.ClearHistory(); + + // update fileSize + fileSize = dwFileSize; + + // update filepathname + if (name && name[0]) + GetFullPathName(name, SIZEOF(filepathname), filepathname, NULL); + else + LoadString(hProgInstance, IDS_DEFAULTFILENAME, filepathname, SIZEOF(filepathname)); + + // set title + CString strTitle; + strTitle.Format(IDS_WINDOWTITLE, PathFindFileName(filepathname)); + mainWindow.SetWindowText(strTitle); + + // update file info and recent + isAFile = isFile; + if (isAFile) + registrySettings.SetMostRecentFile(filepathname); + + imageSaved = TRUE; + + return hBitmap; +} - if (!hBitmap) +HBITMAP DoLoadImageFile(HWND hwnd, LPCTSTR name, BOOL fIsMainFile) +{ + // find the file + WIN32_FIND_DATA find; + HANDLE hFind = FindFirstFile(name, &find); + if (hFind == INVALID_HANDLE_VALUE) { - ShowFileLoadError(name); - return; + // does not exist + CStringW strText; + strText.Format(IDS_LOADERRORTEXT, name); + MessageBoxW(hwnd, strText, NULL, MB_ICONERROR); + return NULL; } + DWORD dwFileSize = find.nFileSizeLow; // get file size + FindClose(hFind); - // update time and size - HANDLE hFile = - CreateFile(name, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_FLAG_SEQUENTIAL_SCAN, NULL); - if (hFile == INVALID_HANDLE_VALUE) + // is file empty? + if (dwFileSize == 0) { - ShowFileLoadError(name); - return; + if (fIsMainFile) + { + FILETIME ft; + FileTimeToLocalFileTime(&find.ftLastWriteTime, &ft); + FileTimeToSystemTime(&ft, &fileTime); + return SetBitmapAndInfo(NULL, name, dwFileSize, TRUE); + } } - if (time) + // load the image + CImage img; + img.Load(name); + HBITMAP hBitmap = img.Detach(); + + if (hBitmap == NULL) { - FILETIME ft; - GetFileTime(hFile, NULL, NULL, &ft); - FileTimeToSystemTime(&ft, time); + // cannot open + CStringW strText; + strText.Format(IDS_LOADERRORTEXT, name); + MessageBoxW(hwnd, strText, NULL, MB_ICONERROR); + return NULL; } - if (size) - *size = GetFileSize(hFile, NULL); - HDC hScreenDC = GetDC(NULL); - *hRes = (int)(GetDeviceCaps(hScreenDC, LOGPIXELSX) * 1000 / 25.4); - *vRes = (int)(GetDeviceCaps(hScreenDC, LOGPIXELSY) * 1000 / 25.4); - ReleaseDC(NULL, hScreenDC); + if (fIsMainFile) + { + FILETIME ft; + FileTimeToLocalFileTime(&find.ftLastWriteTime, &ft); + FileTimeToSystemTime(&ft, &fileTime); + SetBitmapAndInfo(hBitmap, name, dwFileSize, TRUE); + } - CloseHandle(hFile); + return hBitmap; } diff --git a/base/applications/mspaint/dib.h b/base/applications/mspaint/dib.h index 743c2e8e6ad..6bbb56d9c6d 100644 --- a/base/applications/mspaint/dib.h +++ b/base/applications/mspaint/dib.h @@ -9,14 +9,16 @@ #pragma once HBITMAP CreateDIBWithProperties(int width, int height); +HBITMAP CreateColorDIB(int width, int height, COLORREF rgb); int GetDIBWidth(HBITMAP hbm); int GetDIBHeight(HBITMAP hbm); -void SaveDIBToFile(HBITMAP hBitmap, LPTSTR FileName, HDC hDC, LPSYSTEMTIME time, int *size, int hRes, - int vRes); +BOOL SaveDIBToFile(HBITMAP hBitmap, LPTSTR FileName, HDC hDC); -void LoadDIBFromFile(HBITMAP *hBitmap, LPCTSTR name, LPSYSTEMTIME time, int *size, int *hRes, int *vRes); +HBITMAP DoLoadImageFile(HWND hwnd, LPCTSTR name, BOOL fIsMainFile); void ShowFileLoadError(LPCTSTR name); + +HBITMAP SetBitmapAndInfo(HBITMAP hBitmap, LPCTSTR name, DWORD dwFileSize, BOOL isFile); diff --git a/base/applications/mspaint/globalvar.h b/base/applications/mspaint/globalvar.h index ab42977518d..cd427c86b05 100644 --- a/base/applications/mspaint/globalvar.h +++ b/base/applications/mspaint/globalvar.h @@ -53,6 +53,7 @@ extern HINSTANCE hProgInstance; extern TCHAR filepathname[1000]; extern BOOL isAFile; +extern BOOL imageSaved; extern int fileSize; extern int fileHPPM; extern int fileVPPM; diff --git a/base/applications/mspaint/history.cpp b/base/applications/mspaint/history.cpp index abe03bf6318..b9f206cb165 100644 --- a/base/applications/mspaint/history.cpp +++ b/base/applications/mspaint/history.cpp @@ -161,8 +161,7 @@ void ImageModel::Crop(int nWidth, int nHeight, int nOffsetX, int nOffsetY) void ImageModel::SaveImage(LPTSTR lpFileName) { - SaveDIBToFile(hBms[currInd], lpFileName, hDrawingDC, &fileTime, &fileSize, fileHPPM, fileVPPM); - imageSaved = TRUE; + SaveDIBToFile(hBms[currInd], lpFileName, hDrawingDC); } BOOL ImageModel::IsImageSaved() diff --git a/base/applications/mspaint/history.h b/base/applications/mspaint/history.h index 7ed0409cfe1..1c5110f7306 100644 --- a/base/applications/mspaint/history.h +++ b/base/applications/mspaint/history.h @@ -21,8 +21,6 @@ private: int undoSteps; int redoSteps; public: - BOOL imageSaved; - ImageModel(); void CopyPrevious(void); void Undo(void); diff --git a/base/applications/mspaint/main.cpp b/base/applications/mspaint/main.cpp index 2b89afe9417..927eb7fa99f 100644 --- a/base/applications/mspaint/main.cpp +++ b/base/applications/mspaint/main.cpp @@ -51,6 +51,7 @@ HINSTANCE hProgInstance; TCHAR filepathname[1000]; BOOL isAFile = FALSE; +BOOL imageSaved = FALSE; int fileSize; int fileHPPM = 2834; int fileVPPM = 2834; @@ -252,67 +253,7 @@ _tWinMain (HINSTANCE hThisInstance, HINSTANCE hPrevInstance, LPTSTR lpszArgument if (__argc >= 2) { - WIN32_FIND_DATAW find; - HANDLE hFind = FindFirstFileW(__targv[1], &find); - if (hFind != INVALID_HANDLE_VALUE) - { - FindClose(hFind); - - // check the file size - if (find.nFileSizeHigh || find.nFileSizeLow) - { - // load it now - HBITMAP bmNew = NULL; - LoadDIBFromFile(&bmNew, __targv[1], &fileTime, &fileSize, &fileHPPM, &fileVPPM); - if (bmNew) - { - // valid bitmap file - GetFullPathName(__targv[1], SIZEOF(filepathname), filepathname, NULL); - imageModel.Insert(bmNew); - CPath pathFileName(filepathname); - pathFileName.StripPath(); - - CString strTitle; - strTitle.Format(IDS_WINDOWTITLE, (LPCTSTR)pathFileName); - mainWindow.SetWindowText(strTitle); - - imageModel.ClearHistory(); - - isAFile = TRUE; - registrySettings.SetMostRecentFile(filepathname); - } - else - { - // cannot open and not empty - CStringW strText; - strText.Format(IDS_LOADERRORTEXT, __targv[1]); - MessageBoxW(NULL, strText, NULL, MB_ICONERROR); - } - } - else - { - // open the empty file - GetFullPathName(__targv[1], SIZEOF(filepathname), filepathname, NULL); - CPath pathFileName(filepathname); - pathFileName.StripPath(); - - CString strTitle; - strTitle.Format(IDS_WINDOWTITLE, (LPCTSTR)pathFileName); - mainWindow.SetWindowText(strTitle); - - imageModel.ClearHistory(); - - isAFile = TRUE; - registrySettings.SetMostRecentFile(filepathname); - } - } - else - { - // does not exist - CStringW strText; - strText.Format(IDS_LOADERRORTEXT, __targv[1]); - MessageBoxW(NULL, strText, NULL, MB_ICONERROR); - } + DoLoadImageFile(mainWindow, __targv[1], TRUE); } /* initializing the CHOOSECOLOR structure for use with ChooseColor */ diff --git a/base/applications/mspaint/winproc.cpp b/base/applications/mspaint/winproc.cpp index 51ba366fe08..928c21b9e59 100644 --- a/base/applications/mspaint/winproc.cpp +++ b/base/applications/mspaint/winproc.cpp @@ -102,21 +102,6 @@ void CMainWindow::saveImage(BOOL overwrite) } } -void CMainWindow::UpdateApplicationProperties(HBITMAP bitmap, LPCTSTR newfilepathname) -{ - imageModel.Insert(bitmap); - CopyMemory(filepathname, newfilepathname, sizeof(filepathname)); - CPath pathFileName(newfilepathname); - pathFileName.StripPath(); - CString strTitle; - strTitle.Format(IDS_WINDOWTITLE, (LPCTSTR)pathFileName); - SetWindowText(strTitle); - imageModel.ClearHistory(); - isAFile = TRUE; - - registrySettings.SetMostRecentFile(newfilepathname); -} - void CMainWindow::InsertSelectionFromHBITMAP(HBITMAP bitmap, HWND window) { int width = GetDIBWidth(bitmap); @@ -174,17 +159,14 @@ void CMainWindow::InsertSelectionFromHBITMAP(HBITMAP bitmap, HWND window) LRESULT CMainWindow::OnDropFiles(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) { - HDROP drophandle; TCHAR droppedfile[MAX_PATH]; - HBITMAP bmNew = NULL; - drophandle = (HDROP)wParam; - DragQueryFile(drophandle, 0, droppedfile, SIZEOF(droppedfile)); - DragFinish(drophandle); - LoadDIBFromFile(&bmNew, droppedfile, &fileTime, &fileSize, &fileHPPM, &fileVPPM); - if (bmNew != NULL) - { - UpdateApplicationProperties(bmNew, droppedfile); - } + + HDROP hDrop = (HDROP)wParam; + DragQueryFile(hDrop, 0, droppedfile, SIZEOF(droppedfile)); + DragFinish(hDrop); + + ConfirmSave() && DoLoadImageFile(m_hWnd, droppedfile, TRUE); + return 0; } @@ -202,29 +184,34 @@ LRESULT CMainWindow::OnDestroy(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bH return 0; } -LRESULT CMainWindow::OnClose(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) +BOOL CMainWindow::ConfirmSave() { - if (!imageModel.IsImageSaved()) + if (imageModel.IsImageSaved()) + return TRUE; + + CString strProgramName; + strProgramName.LoadString(IDS_PROGRAMNAME); + + CString strSavePromptText; + strSavePromptText.Format(IDS_SAVEPROMPTTEXT, PathFindFileName(filepathname)); + + switch (MessageBox(strSavePromptText, strProgramName, MB_YESNOCANCEL | MB_ICONQUESTION)) { - CString strProgramName; - strProgramName.LoadString(IDS_PROGRAMNAME); - CPath pathFileName(filepathname); - pathFileName.StripPath(); - CString strSavePromptText; - strSavePromptText.Format(IDS_SAVEPROMPTTEXT, (LPCTSTR)pathFileName); - switch (MessageBox(strSavePromptText, strProgramName, MB_YESNOCANCEL | MB_ICONQUESTION)) - { - case IDNO: - DestroyWindow(); - break; - case IDYES: - saveImage(FALSE); - if (imageModel.IsImageSaved()) - DestroyWindow(); - break; - } + case IDYES: + saveImage(TRUE); + return imageModel.IsImageSaved(); + case IDNO: + return TRUE; + case IDCANCEL: + return FALSE; } - else + + return TRUE; +} + +LRESULT CMainWindow::OnClose(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) +{ + if (ConfirmSave()) { DestroyWindow(); } @@ -404,45 +391,15 @@ LRESULT CMainWindow::OnCommand(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bH SendMessage(WM_CLOSE, wParam, lParam); break; case IDM_FILENEW: - { - BOOL reset = TRUE; - if (!imageModel.IsImageSaved()) + if (ConfirmSave()) { - CString strProgramName; - strProgramName.LoadString(IDS_PROGRAMNAME); - CPath pathFileName(filepathname); - pathFileName.StripPath(); - CString strSavePromptText; - strSavePromptText.Format(IDS_SAVEPROMPTTEXT, (LPCTSTR)pathFileName); - switch (MessageBox(strSavePromptText, strProgramName, MB_YESNOCANCEL | MB_ICONQUESTION)) - { - case IDNO: - imageModel.imageSaved = TRUE; //TODO: move to ImageModel - break; - case IDYES: - saveImage(FALSE); - break; - case IDCANCEL: - reset = FALSE; - break; - } - } - if (reset && imageModel.IsImageSaved()) //TODO: move to ImageModel - { - imageModel.Clear(); - imageModel.ClearHistory(); + SetBitmapAndInfo(NULL, NULL, 0, FALSE); } break; - } case IDM_FILEOPEN: - if (GetOpenFileName(&ofn) != 0) + if (ConfirmSave() && GetOpenFileName(&ofn)) { - HBITMAP bmNew = NULL; - LoadDIBFromFile(&bmNew, ofn.lpstrFile, &fileTime, &fileSize, &fileHPPM, &fileVPPM); - if (bmNew != NULL) - { - UpdateApplicationProperties(bmNew, ofn.lpstrFile); - } + DoLoadImageFile(m_hWnd, ofn.lpstrFile, TRUE); } break; case IDM_FILESAVE: @@ -494,42 +451,22 @@ LRESULT CMainWindow::OnCommand(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bH break; case IDM_FILE1: { - HBITMAP bmNew = NULL; - LoadDIBFromFile(&bmNew, registrySettings.strFile1, &fileTime, &fileSize, &fileHPPM, &fileVPPM); - if (bmNew != NULL) - { - UpdateApplicationProperties(bmNew, registrySettings.strFile1); - } + ConfirmSave() && DoLoadImageFile(m_hWnd, registrySettings.strFile1, TRUE); break; } case IDM_FILE2: { - HBITMAP bmNew = NULL; - LoadDIBFromFile(&bmNew, registrySettings.strFile2, &fileTime, &fileSize, &fileHPPM, &fileVPPM); - if (bmNew != NULL) - { - UpdateApplicationProperties(bmNew, registrySettings.strFile2); - } + ConfirmSave() && DoLoadImageFile(m_hWnd, registrySettings.strFile2, TRUE); break; } case IDM_FILE3: { - HBITMAP bmNew = NULL; - LoadDIBFromFile(&bmNew, registrySettings.strFile3, &fileTime, &fileSize, &fileHPPM, &fileVPPM); - if (bmNew != NULL) - { - UpdateApplicationProperties(bmNew, registrySettings.strFile3); - } + ConfirmSave() && DoLoadImageFile(m_hWnd, registrySettings.strFile3, TRUE); break; } case IDM_FILE4: { - HBITMAP bmNew = NULL; - LoadDIBFromFile(&bmNew, registrySettings.strFile4, &fileTime, &fileSize, &fileHPPM, &fileVPPM); - if (bmNew != NULL) - { - UpdateApplicationProperties(bmNew, registrySettings.strFile4); - } + ConfirmSave() && DoLoadImageFile(m_hWnd, registrySettings.strFile4, TRUE); break; } case IDM_EDITUNDO: @@ -578,18 +515,17 @@ LRESULT CMainWindow::OnCommand(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bH break; } case IDM_EDITCOPYTO: - if (GetSaveFileName(&ofn) != 0) - SaveDIBToFile(selectionModel.GetBitmap(), ofn.lpstrFile, imageModel.GetDC(), NULL, NULL, fileHPPM, fileVPPM); + if (GetSaveFileName(&ofn)) + SaveDIBToFile(selectionModel.GetBitmap(), ofn.lpstrFile, imageModel.GetDC()); break; case IDM_EDITPASTEFROM: - if (GetOpenFileName(&ofn) != 0) + if (GetOpenFileName(&ofn)) { - HBITMAP bmNew = NULL; - LoadDIBFromFile(&bmNew, ofn.lpstrFile, &fileTime, &fileSize, &fileHPPM, &fileVPPM); - if (bmNew != NULL) + HBITMAP hbmNew = DoLoadImageFile(m_hWnd, ofn.lpstrFile, FALSE); + if (hbmNew) { - InsertSelectionFromHBITMAP(bmNew, m_hWnd); - DeleteObject(bmNew); + InsertSelectionFromHBITMAP(hbmNew, m_hWnd); + DeleteObject(hbmNew); } } break; diff --git a/base/applications/mspaint/winproc.h b/base/applications/mspaint/winproc.h index 6b212f619b0..0c4a4e799c9 100644 --- a/base/applications/mspaint/winproc.h +++ b/base/applications/mspaint/winproc.h @@ -42,6 +42,6 @@ public: void alignChildrenToMainWindow(); void saveImage(BOOL overwrite); - void UpdateApplicationProperties(HBITMAP bitmap, LPCTSTR newfilepathname); void InsertSelectionFromHBITMAP(HBITMAP bitmap, HWND window); + BOOL ConfirmSave(); };

4 years, 5 months

[reactos] 01/01: [SETUPAPI] Improve SetupRemoveFromSourceListA/W exports (#2680)

by Oleg Dubinskiy

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=125020c23fee608a9b494… commit 125020c23fee608a9b4943df3d54ea1716d26b71 Author: Oleg Dubinskiy <oleg.dubinskij2013(a)yandex.ua> AuthorDate: Wed Apr 29 00:58:40 2020 +0300 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Apr 29 00:58:40 2020 +0300 [SETUPAPI] Improve SetupRemoveFromSourceListA/W exports (#2680) CORE-16968 --- dll/win32/setupapi/setupapi.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dll/win32/setupapi/setupapi.spec b/dll/win32/setupapi/setupapi.spec index 692a0d27acd..2af90d61106 100644 --- a/dll/win32/setupapi/setupapi.spec +++ b/dll/win32/setupapi/setupapi.spec @@ -502,8 +502,8 @@ @ stub SetupRemoveFileLogEntryW @ stub SetupRemoveFromDiskSpaceListA @ stub SetupRemoveFromDiskSpaceListW -@ stub SetupRemoveFromSourceListA -@ stub SetupRemoveFromSourceListW +@ stdcall -stub SetupRemoveFromSourceListA(long str) +@ stdcall -stub SetupRemoveFromSourceListW(long wstr) @ stub SetupRemoveInstallSectionFromDiskSpaceListA @ stub SetupRemoveInstallSectionFromDiskSpaceListW @ stub SetupRemoveSectionFromDiskSpaceListA

4 years, 5 months

[reactos] 01/01: [NETSHELL] Remove erroneous DNS Server line and fix date/time format (#2655)

by Kyle Katarn

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=02d856c9c501de0ef38cd… commit 02d856c9c501de0ef38cd7cea494bd9556e5aeb1 Author: Kyle Katarn <contact(a)kcsoftwares.com> AuthorDate: Fri Apr 24 15:48:54 2020 +0200 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Wed Apr 29 00:18:55 2020 +0300 [NETSHELL] Remove erroneous DNS Server line and fix date/time format (#2655) CORE-16947 --- dll/shellext/netshell/lanstatusui.cpp | 42 ++++++++++++++++++++++++++++++++--- 1 file changed, 39 insertions(+), 3 deletions(-) diff --git a/dll/shellext/netshell/lanstatusui.cpp b/dll/shellext/netshell/lanstatusui.cpp index 033ff13ac47..9210699b622 100644 --- a/dll/shellext/netshell/lanstatusui.cpp +++ b/dll/shellext/netshell/lanstatusui.cpp @@ -354,6 +354,43 @@ InsertItemToListView( return -1; } +static +BOOL +tmToStr( + IN struct tm *pTM, + OUT LPWSTR szBuffer, + IN UINT nBufferSize) +{ + SYSTEMTIME st; + CString strBufferDate; + CString strBufferTime; + UINT nCharDate, nCharTime; + BOOL bResult = FALSE; + + st.wYear = pTM->tm_year + 1900; + st.wMonth = pTM->tm_mon + 1; + st.wDay = pTM->tm_mday; + st.wHour = pTM->tm_hour; + st.wMinute = pTM->tm_min; + st.wSecond = pTM->tm_sec; + + /* Check required size before cpy/cat */ + nCharDate = GetDateFormatW(LOCALE_USER_DEFAULT, 0, &st, NULL, NULL, 0) + 1; + nCharTime = GetTimeFormatW(LOCALE_USER_DEFAULT, 0, &st, NULL, NULL, 0) + 1; + + if (GetDateFormatW(LOCALE_USER_DEFAULT, 0, &st, NULL, strBufferDate.GetBuffer(nCharDate), nCharDate) && + GetTimeFormatW(LOCALE_USER_DEFAULT, 0, &st, NULL, strBufferTime.GetBuffer(nCharTime), nCharTime)) + { + StringCbCopy(szBuffer, nBufferSize, strBufferDate); + StringCbCat(szBuffer, nBufferSize, L" "); + StringCbCat(szBuffer, nBufferSize, strBufferTime); + bResult = TRUE; + } + strBufferDate.ReleaseBuffer(); + strBufferTime.ReleaseBuffer(); + + return bResult; +} INT_PTR CALLBACK @@ -454,7 +491,7 @@ LANStatusUiDetailsDlg( leaseOptained = localtime(&pCurAdapter->LeaseObtained); - if (wcsftime(szBuffer, 100, L"%m/%d/%Y %H:%M:%S %p", leaseOptained) != 0) + if (tmToStr(leaseOptained, szBuffer, _countof(szBuffer))) SendMessageW(hDlgCtrl, LVM_SETITEMW, 0, (LPARAM)&li); } @@ -465,7 +502,7 @@ LANStatusUiDetailsDlg( leaseExpire = localtime(&pCurAdapter->LeaseExpires); - if (wcsftime(szBuffer, 100, L"%m/%d/%Y %H:%M:%S %p", leaseExpire) != 0) + if (tmToStr(leaseExpire, szBuffer, _countof(szBuffer))) SendMessageW(hDlgCtrl, LVM_SETITEMW, 0, (LPARAM)&li); } } @@ -479,7 +516,6 @@ LANStatusUiDetailsDlg( { if (GetPerAdapterInfo(pContext->dwAdapterIndex, pPerAdapter, &dwSize) == ERROR_SUCCESS) { - li.iItem = InsertItemToListView(hDlgCtrl, IDS_DNS_SERVERS); if (li.iItem >= 0) AddIPAddressToListView(hDlgCtrl, &pPerAdapter->DnsServerList, li.iItem); }

4 years, 5 months

[reactos] 01/01: [CRT][STDLIB] Wine-sync _mbtowc_l function code

by Bișoc George

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8266f62ff6881cc321061… commit 8266f62ff6881cc3210617b5eca7bbd2b2644f35 Author: Bișoc George <fraizeraust99(a)gmail.com> AuthorDate: Tue Apr 21 11:28:07 2020 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Tue Apr 28 22:41:57 2020 +0200 [CRT][STDLIB] Wine-sync _mbtowc_l function code The current _mbtowc_l code directly passes the string count size argument to cbMultiByte argument parameter to MultiByteToWideChar(). As the size of lpMultiByteStr expressed in bytes by cbMultiByte is dependent of the actual given string, the size of lpWideCharStr expressed in characters by cchWideChar is always 1. The resulting parameters to MultiByteToWideChar() will lead to a failure as lpWideCharStr cannot accommodate the converted string if the size pointed by lpMultiByteStr is larger than the buffer wide string to receive the converted output, a Win32 error code of ERROR_INSUFFICIENT_BUFFER in other words. The fact that _mbtowc_l never fails without WINE Gecko package installed is because the codepage pointed by lc_codepage is CP_ACP and the converted output is directly given to the destin [...] As _mbtowc_l is imported from WINE and that they have updated their code (which at the same time this fixes the aforementioned problem), the following commit syncs the updated code from WINE. CORE-16885 --- sdk/lib/crt/stdlib/mbtowc.c | 30 +++++++++++++++++++----------- 1 file changed, 19 insertions(+), 11 deletions(-) diff --git a/sdk/lib/crt/stdlib/mbtowc.c b/sdk/lib/crt/stdlib/mbtowc.c index 5ccb7e3a2e8..41bd0234f74 100644 --- a/sdk/lib/crt/stdlib/mbtowc.c +++ b/sdk/lib/crt/stdlib/mbtowc.c @@ -18,24 +18,32 @@ int CDECL _mbtowc_l(wchar_t *dst, const char* str, size_t n, _locale_t locale) MSVCRT_pthreadlocinfo locinfo; wchar_t tmpdst = '\0'; - if(!locale) + if (!locale) locinfo = get_locinfo(); else locinfo = (MSVCRT_pthreadlocinfo)(locale->locinfo); - if(n <= 0 || !str) + if (n <= 0 || !str) return 0; - if(!locinfo->lc_codepage) - tmpdst = (unsigned char)*str; - else if(!MultiByteToWideChar(locinfo->lc_codepage, 0, str, n, &tmpdst, 1)) - return -1; - if(dst) - *dst = tmpdst; - /* return the number of bytes from src that have been used */ - if(!*str) + + if (!*str) { + if (dst) *dst = 0; return 0; - if(n >= 2 && _isleadbyte_l((unsigned char)*str, locale) && str[1]) + } + + if (!locinfo->lc_codepage) { + if (dst) *dst = (unsigned char)*str; + return 1; + } + if (n >= 2 && _isleadbyte_l((unsigned char)*str, locale)) { + if (!MultiByteToWideChar(locinfo->lc_codepage, 0, str, 2, &tmpdst, 1)) + return -1; + if (dst) *dst = tmpdst; return 2; + } + if (!MultiByteToWideChar(locinfo->lc_codepage, 0, str, 1, &tmpdst, 1)) + return -1; + if (dst) *dst = tmpdst; return 1; }

4 years, 5 months

[reactos] 01/01: [BOOTDATA] CORE-16976 Strip netkvm from optional files

by Joachim Henze

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8ce31ad749047ea4a3aef… commit 8ce31ad749047ea4a3aef1e78972c73dcbecb9a7 Author: Joachim Henze <Joachim.Henze(a)reactos.org> AuthorDate: Tue Apr 28 21:33:26 2020 +0200 Commit: Joachim Henze <Joachim.Henze(a)reactos.org> CommitDate: Tue Apr 28 21:33:26 2020 +0200 [BOOTDATA] CORE-16976 Strip netkvm from optional files Because we added it into our sources recently, there is no need anymore for opt-adding binaries. VBox OK https://reactos.org/testman/compare.php?ids=72868,72873 KVM OK https://reactos.org/testman/compare.php?ids=72869,72872 --- boot/bootdata/packages/reactos.dff.in | 3 --- 1 file changed, 3 deletions(-) diff --git a/boot/bootdata/packages/reactos.dff.in b/boot/bootdata/packages/reactos.dff.in index fbd0ed8d856..815db8d167c 100644 --- a/boot/bootdata/packages/reactos.dff.in +++ b/boot/bootdata/packages/reactos.dff.in @@ -103,9 +103,6 @@ Signature = "$Windows NT$" "modules/optional/gulim.ttc" 4 optional "modules/optional/batang.ttc" 4 optional "modules/optional/NOTICE_for_Droid_Font.txt" 1 optional -"modules/optional/netkvm.inf" 6 optional -"modules/optional/netkvm.cat" 6 optional -"modules/optional/netkvm.sys" 3 optional "modules/optional/viostor.inf" 6 optional "modules/optional/viostor.cat" 6 optional "modules/optional/viostor.sys" 3 optional

4 years, 5 months

[reactos] 01/01: [SHIMGVW] Correctly draw display border (#2687)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=03c09c9e2c72e44d96700… commit 03c09c9e2c72e44d967002ea3265f19f3ad2ce13 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Tue Apr 28 20:56:18 2020 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Tue Apr 28 20:56:18 2020 +0900 [SHIMGVW] Correctly draw display border (#2687) Use WS_EX_CLIENTEDGE extended style for display window. Fix message WM_SIZE handling. CORE-16983 --- dll/win32/shimgvw/shimgvw.c | 34 ++++++++++++++++++++++------------ 1 file changed, 22 insertions(+), 12 deletions(-) diff --git a/dll/win32/shimgvw/shimgvw.c b/dll/win32/shimgvw/shimgvw.c index 9215eae87bb..e06af9159d5 100644 --- a/dll/win32/shimgvw/shimgvw.c +++ b/dll/win32/shimgvw/shimgvw.c @@ -900,7 +900,7 @@ ImageView_InitControls(HWND hwnd) if (shiSettings.Maximized) ShowWindow(hwnd, SW_MAXIMIZE); - hDispWnd = CreateWindowEx(0, WC_STATIC, _T(""), + hDispWnd = CreateWindowEx(WS_EX_CLIENTEDGE, WC_STATIC, _T(""), WS_CHILD | WS_VISIBLE, 0, 0, 0, 0, hwnd, NULL, hInstance, NULL); @@ -919,6 +919,25 @@ ImageView_OnMouseWheel(HWND hwnd, INT x, INT y, INT zDelta, UINT fwKeys) } } +static VOID +ImageView_OnSize(HWND hwnd, UINT state, INT cx, INT cy) +{ + RECT rc; + + SendMessage(hToolBar, TB_AUTOSIZE, 0, 0); + + GetWindowRect(hToolBar, &rc); + + MoveWindow(hDispWnd, 0, 0, cx, cy - (rc.bottom - rc.top), TRUE); + + /* is it maximized or restored? */ + if (state == SIZE_MAXIMIZED || state == SIZE_RESTORED) + { + /* reset zoom */ + ResetZoom(); + } +} + LRESULT CALLBACK ImageView_WndProc(HWND hwnd, UINT Message, WPARAM wParam, LPARAM lParam) { @@ -1065,17 +1084,8 @@ ImageView_WndProc(HWND hwnd, UINT Message, WPARAM wParam, LPARAM lParam) } case WM_SIZE: { - RECT rc; - SendMessage(hToolBar, TB_AUTOSIZE, 0, 0); - GetWindowRect(hToolBar, &rc); - MoveWindow(hDispWnd, 1, 1, LOWORD(lParam) - 1, HIWORD(lParam) - (rc.bottom - rc.top) - 1, TRUE); - /* is it maximized or restored? */ - if (wParam == SIZE_MAXIMIZED || wParam == SIZE_RESTORED) - { - /* reset zoom */ - ResetZoom(); - } - return 0L; + ImageView_OnSize(hwnd, (UINT)wParam, GET_X_LPARAM(lParam), GET_Y_LPARAM(lParam)); + return 0; } case WM_DESTROY: {

4 years, 5 months

[reactos] 01/01: [WINSPOOL] EnumPrintersA: Refactor failure handling (#2304)

by Serge Gautherie

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b139bae58dd40f8d378c0… commit b139bae58dd40f8d378c0eb7154fafc03374961c Author: Serge Gautherie <32623169+SergeGautherie(a)users.noreply.github.com> AuthorDate: Mon Apr 27 22:10:22 2020 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Apr 27 22:10:22 2020 +0200 [WINSPOOL] EnumPrintersA: Refactor failure handling (#2304) --- win32ss/printing/base/winspool/printers.c | 62 ++++++++++++++++++------------- 1 file changed, 36 insertions(+), 26 deletions(-) diff --git a/win32ss/printing/base/winspool/printers.c b/win32ss/printing/base/winspool/printers.c index 4180dfb3d1c..219e831cb16 100644 --- a/win32ss/printing/base/winspool/printers.c +++ b/win32ss/printing/base/winspool/printers.c @@ -471,7 +471,8 @@ Cleanup: BOOL WINAPI EnumPrintersA(DWORD Flags, PSTR Name, DWORD Level, PBYTE pPrinterEnum, DWORD cbBuf, PDWORD pcbNeeded, PDWORD pcReturned) { - BOOL bReturnValue = FALSE; + DWORD dwErrorCode; + BOOL bResult; DWORD cch; PWSTR pwszName = NULL; PSTR pszPrinterName = NULL; @@ -502,7 +503,7 @@ EnumPrintersA(DWORD Flags, PSTR Name, DWORD Level, PBYTE pPrinterEnum, DWORD cbB // Check for invalid levels here for early error return. MSDN says that only 1, 2, 4, and 5 are allowable. if (Level != 1 && Level != 2 && Level != 4 && Level != 5) { - SetLastError(ERROR_INVALID_LEVEL); + dwErrorCode = ERROR_INVALID_LEVEL; ERR("Invalid Level!\n"); goto Cleanup; } @@ -515,7 +516,7 @@ EnumPrintersA(DWORD Flags, PSTR Name, DWORD Level, PBYTE pPrinterEnum, DWORD cbB pwszName = HeapAlloc(hProcessHeap, 0, (cch + 1) * sizeof(WCHAR)); if (!pwszName) { - SetLastError(ERROR_NOT_ENOUGH_MEMORY); + dwErrorCode = ERROR_NOT_ENOUGH_MEMORY; ERR("HeapAlloc failed!\n"); goto Cleanup; } @@ -524,10 +525,12 @@ EnumPrintersA(DWORD Flags, PSTR Name, DWORD Level, PBYTE pPrinterEnum, DWORD cbB } /* Ref: https://stackoverflow.com/questions/41147180/why-enumprintersa-and-enumprin… */ - bReturnValue = EnumPrintersW(Flags, pwszName, Level, pPrinterEnum, cbBuf, pcbNeeded, pcReturned); - HeapFree(hProcessHeap, 0, pwszName); - - TRACE("*pcReturned is '%d' and bReturnValue is '%d' and GetLastError is '%ld'.\n", *pcReturned, bReturnValue, GetLastError()); + bResult = EnumPrintersW(Flags, pwszName, Level, pPrinterEnum, cbBuf, pcbNeeded, pcReturned); + if (!bResult) + { + dwErrorCode = GetLastError(); + goto Cleanup; + } /* We are mapping multiple different pointers to the same pPrinterEnum pointer here so that */ /* we can do in-place conversion. We read the Unicode response from the EnumPrintersW and */ @@ -558,7 +561,7 @@ EnumPrintersA(DWORD Flags, PSTR Name, DWORD Level, PBYTE pPrinterEnum, DWORD cbB pszDescription = HeapAlloc(hProcessHeap, 0, (cch + 1) * sizeof(CHAR)); if (!pszDescription) { - SetLastError(ERROR_NOT_ENOUGH_MEMORY); + dwErrorCode = ERROR_NOT_ENOUGH_MEMORY; ERR("HeapAlloc failed!\n"); goto Cleanup; } @@ -577,7 +580,7 @@ EnumPrintersA(DWORD Flags, PSTR Name, DWORD Level, PBYTE pPrinterEnum, DWORD cbB pszName = HeapAlloc(hProcessHeap, 0, (cch + 1) * sizeof(CHAR)); if (!pszName) { - SetLastError(ERROR_NOT_ENOUGH_MEMORY); + dwErrorCode = ERROR_NOT_ENOUGH_MEMORY; ERR("HeapAlloc failed!\n"); goto Cleanup; } @@ -596,7 +599,7 @@ EnumPrintersA(DWORD Flags, PSTR Name, DWORD Level, PBYTE pPrinterEnum, DWORD cbB pszComment = HeapAlloc(hProcessHeap, 0, (cch + 1) * sizeof(CHAR)); if (!pszComment) { - SetLastError(ERROR_NOT_ENOUGH_MEMORY); + dwErrorCode = ERROR_NOT_ENOUGH_MEMORY; ERR("HeapAlloc failed!\n"); goto Cleanup; } @@ -620,7 +623,7 @@ EnumPrintersA(DWORD Flags, PSTR Name, DWORD Level, PBYTE pPrinterEnum, DWORD cbB pszServerName = HeapAlloc(hProcessHeap, 0, (cch + 1) * sizeof(CHAR)); if (!pszServerName) { - SetLastError(ERROR_NOT_ENOUGH_MEMORY); + dwErrorCode = ERROR_NOT_ENOUGH_MEMORY; ERR("HeapAlloc failed!\n"); goto Cleanup; } @@ -639,7 +642,7 @@ EnumPrintersA(DWORD Flags, PSTR Name, DWORD Level, PBYTE pPrinterEnum, DWORD cbB pszPrinterName = HeapAlloc(hProcessHeap, 0, (cch + 1) * sizeof(CHAR)); if (!pszPrinterName) { - SetLastError(ERROR_NOT_ENOUGH_MEMORY); + dwErrorCode = ERROR_NOT_ENOUGH_MEMORY; ERR("HeapAlloc failed!\n"); goto Cleanup; } @@ -658,7 +661,7 @@ EnumPrintersA(DWORD Flags, PSTR Name, DWORD Level, PBYTE pPrinterEnum, DWORD cbB pszShareName = HeapAlloc(hProcessHeap, 0, (cch + 1) * sizeof(CHAR)); if (!pszShareName) { - SetLastError(ERROR_NOT_ENOUGH_MEMORY); + dwErrorCode = ERROR_NOT_ENOUGH_MEMORY; ERR("HeapAlloc failed!\n"); goto Cleanup; } @@ -677,7 +680,7 @@ EnumPrintersA(DWORD Flags, PSTR Name, DWORD Level, PBYTE pPrinterEnum, DWORD cbB pszPortName = HeapAlloc(hProcessHeap, 0, (cch + 1) * sizeof(CHAR)); if (!pszPortName) { - SetLastError(ERROR_NOT_ENOUGH_MEMORY); + dwErrorCode = ERROR_NOT_ENOUGH_MEMORY; ERR("HeapAlloc failed!\n"); goto Cleanup; } @@ -696,7 +699,7 @@ EnumPrintersA(DWORD Flags, PSTR Name, DWORD Level, PBYTE pPrinterEnum, DWORD cbB pszDriverName = HeapAlloc(hProcessHeap, 0, (cch + 1) * sizeof(CHAR)); if (!pszDriverName) { - SetLastError(ERROR_NOT_ENOUGH_MEMORY); + dwErrorCode = ERROR_NOT_ENOUGH_MEMORY; ERR("HeapAlloc failed!\n"); goto Cleanup; } @@ -715,7 +718,7 @@ EnumPrintersA(DWORD Flags, PSTR Name, DWORD Level, PBYTE pPrinterEnum, DWORD cbB pszComment = HeapAlloc(hProcessHeap, 0, (cch + 1) * sizeof(CHAR)); if (!pszComment) { - SetLastError(ERROR_NOT_ENOUGH_MEMORY); + dwErrorCode = ERROR_NOT_ENOUGH_MEMORY; ERR("HeapAlloc failed!\n"); goto Cleanup; } @@ -734,7 +737,7 @@ EnumPrintersA(DWORD Flags, PSTR Name, DWORD Level, PBYTE pPrinterEnum, DWORD cbB pszLocation = HeapAlloc(hProcessHeap, 0, (cch + 1) * sizeof(CHAR)); if (!pszLocation) { - SetLastError(ERROR_NOT_ENOUGH_MEMORY); + dwErrorCode = ERROR_NOT_ENOUGH_MEMORY; ERR("HeapAlloc failed!\n"); goto Cleanup; } @@ -754,7 +757,7 @@ EnumPrintersA(DWORD Flags, PSTR Name, DWORD Level, PBYTE pPrinterEnum, DWORD cbB pszSepFile = HeapAlloc(hProcessHeap, 0, (cch + 1) * sizeof(CHAR)); if (!pszSepFile) { - SetLastError(ERROR_NOT_ENOUGH_MEMORY); + dwErrorCode = ERROR_NOT_ENOUGH_MEMORY; ERR("HeapAlloc failed!\n"); goto Cleanup; } @@ -773,7 +776,7 @@ EnumPrintersA(DWORD Flags, PSTR Name, DWORD Level, PBYTE pPrinterEnum, DWORD cbB pszPrintProcessor = HeapAlloc(hProcessHeap, 0, (cch + 1) * sizeof(CHAR)); if (!pszPrintProcessor) { - SetLastError(ERROR_NOT_ENOUGH_MEMORY); + dwErrorCode = ERROR_NOT_ENOUGH_MEMORY; ERR("HeapAlloc failed!\n"); goto Cleanup; } @@ -793,7 +796,7 @@ EnumPrintersA(DWORD Flags, PSTR Name, DWORD Level, PBYTE pPrinterEnum, DWORD cbB pszDatatype = HeapAlloc(hProcessHeap, 0, (cch + 1) * sizeof(CHAR)); if (!pszDatatype) { - SetLastError(ERROR_NOT_ENOUGH_MEMORY); + dwErrorCode = ERROR_NOT_ENOUGH_MEMORY; ERR("HeapAlloc failed!\n"); goto Cleanup; } @@ -812,7 +815,7 @@ EnumPrintersA(DWORD Flags, PSTR Name, DWORD Level, PBYTE pPrinterEnum, DWORD cbB pszParameters = HeapAlloc(hProcessHeap, 0, (cch + 1) * sizeof(CHAR)); if (!pszParameters) { - SetLastError(ERROR_NOT_ENOUGH_MEMORY); + dwErrorCode = ERROR_NOT_ENOUGH_MEMORY; ERR("HeapAlloc failed!\n"); goto Cleanup; } @@ -836,7 +839,7 @@ EnumPrintersA(DWORD Flags, PSTR Name, DWORD Level, PBYTE pPrinterEnum, DWORD cbB pszPrinterName = HeapAlloc(hProcessHeap, 0, (cch + 1) * sizeof(CHAR)); if (!pszPrinterName) { - SetLastError(ERROR_NOT_ENOUGH_MEMORY); + dwErrorCode = ERROR_NOT_ENOUGH_MEMORY; ERR("HeapAlloc failed!\n"); goto Cleanup; } @@ -855,7 +858,7 @@ EnumPrintersA(DWORD Flags, PSTR Name, DWORD Level, PBYTE pPrinterEnum, DWORD cbB pszServerName = HeapAlloc(hProcessHeap, 0, (cch + 1) * sizeof(CHAR)); if (!pszServerName) { - SetLastError(ERROR_NOT_ENOUGH_MEMORY); + dwErrorCode = ERROR_NOT_ENOUGH_MEMORY; ERR("HeapAlloc failed!\n"); goto Cleanup; } @@ -878,7 +881,7 @@ EnumPrintersA(DWORD Flags, PSTR Name, DWORD Level, PBYTE pPrinterEnum, DWORD cbB pszPrinterName = HeapAlloc(hProcessHeap, 0, (cch + 1) * sizeof(CHAR)); if (!pszPrinterName) { - SetLastError(ERROR_NOT_ENOUGH_MEMORY); + dwErrorCode = ERROR_NOT_ENOUGH_MEMORY; ERR("HeapAlloc failed!\n"); goto Cleanup; } @@ -897,7 +900,7 @@ EnumPrintersA(DWORD Flags, PSTR Name, DWORD Level, PBYTE pPrinterEnum, DWORD cbB pszPortName = HeapAlloc(hProcessHeap, 0, (cch + 1) * sizeof(CHAR)); if (!pszPortName) { - SetLastError(ERROR_NOT_ENOUGH_MEMORY); + dwErrorCode = ERROR_NOT_ENOUGH_MEMORY; ERR("HeapAlloc failed!\n"); goto Cleanup; } @@ -913,9 +916,16 @@ EnumPrintersA(DWORD Flags, PSTR Name, DWORD Level, PBYTE pPrinterEnum, DWORD cbB } // switch } // for + dwErrorCode = ERROR_SUCCESS; + Cleanup: + if (pwszName) + { + HeapFree(hProcessHeap, 0, pwszName); + } - return bReturnValue; + SetLastError(dwErrorCode); + return (dwErrorCode == ERROR_SUCCESS); } BOOL WINAPI

4 years, 5 months

← Newer
1
2
3
4
5
6
7
8
...
40
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 April 2020