Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 01/01: [MEDIA][FONTS] Improve tahomabd.ttf (Cyrillic and Latin) No.17
by Katayama Hirofumi MZ 19 Nov '19

19 Nov '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=36163a235b32433e31f2e… commit 36163a235b32433e31f2e4ed7530ef19452ad386 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Tue Nov 19 09:36:10 2019 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Tue Nov 19 09:36:10 2019 +0900 [MEDIA][FONTS] Improve tahomabd.ttf (Cyrillic and Latin) No.17 Tahoma Bold. Version 0.009 khmz. 11px LATIN CAPITAL LETTER J. 11px LATIN SMALL LETTER F. 11px LATIN SMALL LETTER K. 11px CYRILLIC CAPITAL LETTER ZHE. 11px CYRILLIC CAPITAL LETTER EL. 11px CYRILLIC CAPITAL LETTER U. 11px CYRILLIC CAPITAL LETTER EF. 11px CYRILLIC CAPITAL LETTER SHA. 11px CYRILLIC CAPITAL LETTER YERU. 11px CYRILLIC CAPITAL LETTER YU. 11px CYRILLIC CAPITAL LETTER I. 11px CYRILLIC CAPITAL LETTER SHORT I. 11px CYRILLIC SMALL LETTER HARD SIGN. CORE-8408 --- media/fonts/tahomabd.ttf | Bin 160488 -> 160488 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/media/fonts/tahomabd.ttf b/media/fonts/tahomabd.ttf index 1b0ef28bdd9..c527b28c786 100644 Binary files a/media/fonts/tahomabd.ttf and b/media/fonts/tahomabd.ttf differ

1 0

[reactos] 02/02: [SHELLBTRFS] Use again .data() method of vector class
by Pierre Schweitzer 18 Nov '19

18 Nov '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=30986920687b2e35a0bc2… commit 30986920687b2e35a0bc280a71da85f8743d216c Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Thu Nov 14 15:01:55 2019 +0100 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Mon Nov 18 23:50:33 2019 +0100 [SHELLBTRFS] Use again .data() method of vector class This reverts commit 45a643a136eedf8b39d22f5add94fd372320fdee. This reverts commit a3c13c624f4a115f99560990f065dd94e4526304. This reverts commit 1725ddfd8f06bbff1b853c93be35f2b0ab672a01. --- dll/shellext/shellbtrfs/contextmenu.cpp | 20 -------------- dll/shellext/shellbtrfs/mountmgr_local.cpp | 44 ------------------------------ 2 files changed, 64 deletions(-) diff --git a/dll/shellext/shellbtrfs/contextmenu.cpp b/dll/shellext/shellbtrfs/contextmenu.cpp index bf4b5e92c09..3fbca1cb7c2 100755 --- a/dll/shellext/shellbtrfs/contextmenu.cpp +++ b/dll/shellext/shellbtrfs/contextmenu.cpp @@ -833,25 +833,15 @@ void BtrfsContextMenu::reflink_copy(HWND hwnd, const WCHAR* fn, const WCHAR* dir streambufsize += 0x1000; streambuf.resize(streambufsize); -#ifndef __REACTOS__ memset(streambuf.data(), 0, streambufsize); Status = NtQueryInformationFile(source, &iosb, streambuf.data(), streambufsize, FileStreamInformation); -#else - memset(&streambuf[0], 0, streambufsize); - - Status = NtQueryInformationFile(source, &iosb, &streambuf[0], streambufsize, FileStreamInformation); -#endif } while (Status == STATUS_BUFFER_OVERFLOW); if (!NT_SUCCESS(Status)) throw ntstatus_error(Status); -#ifndef __REACTOS__ auto fsi = reinterpret_cast<FILE_STREAM_INFORMATION*>(streambuf.data()); -#else - auto fsi = reinterpret_cast<FILE_STREAM_INFORMATION*>(&streambuf[0]); -#endif while (true) { if (fsi->StreamNameLength > 0) { @@ -1535,25 +1525,15 @@ static void reflink_copy2(const wstring& srcfn, const wstring& destdir, const ws streambufsize += 0x1000; streambuf.resize(streambufsize); -#ifndef __REACTOS__ memset(streambuf.data(), 0, streambufsize); Status = NtQueryInformationFile(source, &iosb, streambuf.data(), streambufsize, FileStreamInformation); -#else - memset(&streambuf[0], 0, streambufsize); - - Status = NtQueryInformationFile(source, &iosb, &streambuf[0], streambufsize, FileStreamInformation); -#endif } while (Status == STATUS_BUFFER_OVERFLOW); if (!NT_SUCCESS(Status)) throw ntstatus_error(Status); -#ifndef __REACTOS__ auto fsi = reinterpret_cast<FILE_STREAM_INFORMATION*>(streambuf.data()); -#else - auto fsi = reinterpret_cast<FILE_STREAM_INFORMATION*>(&streambuf[0]); -#endif while (true) { if (fsi->StreamNameLength > 0) { diff --git a/dll/shellext/shellbtrfs/mountmgr_local.cpp b/dll/shellext/shellbtrfs/mountmgr_local.cpp index 45a47e68e15..164cf4d4804 100644 --- a/dll/shellext/shellbtrfs/mountmgr_local.cpp +++ b/dll/shellext/shellbtrfs/mountmgr_local.cpp @@ -33,11 +33,7 @@ void mountmgr::create_point(const wstring_view& symlink, const wstring_view& dev IO_STATUS_BLOCK iosb; vector<uint8_t> buf(sizeof(MOUNTMGR_CREATE_POINT_INPUT) + ((symlink.length() + device.length()) * sizeof(WCHAR))); -#ifndef __REACTOS__ auto mcpi = reinterpret_cast<MOUNTMGR_CREATE_POINT_INPUT*>(buf.data()); -#else - auto mcpi = reinterpret_cast<MOUNTMGR_CREATE_POINT_INPUT*>(&buf[0]); -#endif mcpi->SymbolicLinkNameOffset = sizeof(MOUNTMGR_CREATE_POINT_INPUT); mcpi->SymbolicLinkNameLength = (USHORT)(symlink.length() * sizeof(WCHAR)); @@ -48,11 +44,7 @@ void mountmgr::create_point(const wstring_view& symlink, const wstring_view& dev memcpy((uint8_t*)mcpi + mcpi->DeviceNameOffset, device.data(), device.length() * sizeof(WCHAR)); Status = NtDeviceIoControlFile(h, nullptr, nullptr, nullptr, &iosb, IOCTL_MOUNTMGR_CREATE_POINT, -#ifndef __REACTOS__ buf.data(), (ULONG)buf.size(), nullptr, 0); -#else - &buf[0], (ULONG)buf.size(), nullptr, 0); -#endif if (!NT_SUCCESS(Status)) throw ntstatus_error(Status); @@ -63,11 +55,7 @@ void mountmgr::delete_points(const wstring_view& symlink, const wstring_view& un IO_STATUS_BLOCK iosb; vector<uint8_t> buf(sizeof(MOUNTMGR_MOUNT_POINT) + ((symlink.length() + unique_id.length() + device_name.length()) * sizeof(WCHAR))); -#ifndef __REACTOS__ auto mmp = reinterpret_cast<MOUNTMGR_MOUNT_POINT*>(buf.data()); -#else - auto mmp = reinterpret_cast<MOUNTMGR_MOUNT_POINT*>(&buf[0]); -#endif memset(mmp, 0, sizeof(MOUNTMGR_MOUNT_POINT)); @@ -100,28 +88,16 @@ void mountmgr::delete_points(const wstring_view& symlink, const wstring_view& un } vector<uint8_t> buf2(sizeof(MOUNTMGR_MOUNT_POINTS)); -#ifndef __REACTOS__ auto mmps = reinterpret_cast<MOUNTMGR_MOUNT_POINTS*>(buf2.data()); -#else - auto mmps = reinterpret_cast<MOUNTMGR_MOUNT_POINTS*>(&buf2[0]); -#endif Status = NtDeviceIoControlFile(h, nullptr, nullptr, nullptr, &iosb, IOCTL_MOUNTMGR_DELETE_POINTS, -#ifndef __REACTOS__ buf.data(), (ULONG)buf.size(), buf2.data(), (ULONG)buf2.size()); -#else - &buf[0], (ULONG)buf.size(), &buf2[0], (ULONG)buf2.size()); -#endif if (Status == STATUS_BUFFER_OVERFLOW) { buf2.resize(mmps->Size); Status = NtDeviceIoControlFile(h, nullptr, nullptr, nullptr, &iosb, IOCTL_MOUNTMGR_DELETE_POINTS, -#ifndef __REACTOS__ buf.data(), (ULONG)buf.size(), buf2.data(), (ULONG)buf2.size()); -#else - &buf[0], (ULONG)buf.size(), &buf2[0], (ULONG)buf2.size()); -#endif } if (!NT_SUCCESS(Status)) @@ -134,11 +110,7 @@ vector<mountmgr_point> mountmgr::query_points(const wstring_view& symlink, const vector<mountmgr_point> v; vector<uint8_t> buf(sizeof(MOUNTMGR_MOUNT_POINT) + ((symlink.length() + unique_id.length() + device_name.length()) * sizeof(WCHAR))); -#ifndef __REACTOS__ auto mmp = reinterpret_cast<MOUNTMGR_MOUNT_POINT*>(buf.data()); -#else - auto mmp = reinterpret_cast<MOUNTMGR_MOUNT_POINT*>(&buf[0]); -#endif memset(mmp, 0, sizeof(MOUNTMGR_MOUNT_POINT)); @@ -171,35 +143,19 @@ vector<mountmgr_point> mountmgr::query_points(const wstring_view& symlink, const } vector<uint8_t> buf2(sizeof(MOUNTMGR_MOUNT_POINTS)); -#ifndef __REACTOS__ auto mmps = reinterpret_cast<MOUNTMGR_MOUNT_POINTS*>(buf2.data()); -#else - auto mmps = reinterpret_cast<MOUNTMGR_MOUNT_POINTS*>(&buf2[0]); -#endif Status = NtDeviceIoControlFile(h, nullptr, nullptr, nullptr, &iosb, IOCTL_MOUNTMGR_QUERY_POINTS, -#ifndef __REACTOS__ buf.data(), (ULONG)buf.size(), buf2.data(), (ULONG)buf2.size()); -#else - &buf[0], (ULONG)buf.size(), &buf2[0], (ULONG)buf2.size()); -#endif if (!NT_SUCCESS(Status) && Status != STATUS_BUFFER_OVERFLOW) throw ntstatus_error(Status); buf2.resize(mmps->Size); -#ifndef __REACTOS__ mmps = reinterpret_cast<MOUNTMGR_MOUNT_POINTS*>(buf2.data()); -#else - mmps = reinterpret_cast<MOUNTMGR_MOUNT_POINTS*>(&buf2[0]); -#endif Status = NtDeviceIoControlFile(h, nullptr, nullptr, nullptr, &iosb, IOCTL_MOUNTMGR_QUERY_POINTS, -#ifndef __REACTOS__ buf.data(), (ULONG)buf.size(), buf2.data(), (ULONG)buf2.size()); -#else - &buf[0], (ULONG)buf.size(), &buf2[0], (ULONG)buf2.size()); -#endif if (!NT_SUCCESS(Status)) throw ntstatus_error(Status);

1 0

[reactos] 01/02: [SDK] Implement std::vector.data()
by Pierre Schweitzer 18 Nov '19

18 Nov '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=114556b1c97859f81cf73… commit 114556b1c97859f81cf73881c5f2a5ad0de1c2df Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Wed Nov 13 22:56:16 2019 +0100 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Mon Nov 18 23:50:33 2019 +0100 [SDK] Implement std::vector.data() --- sdk/include/c++/stlport/stl/_vector.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sdk/include/c++/stlport/stl/_vector.h b/sdk/include/c++/stlport/stl/_vector.h index ed243ef3749..4eb9d755278 100644 --- a/sdk/include/c++/stlport/stl/_vector.h +++ b/sdk/include/c++/stlport/stl/_vector.h @@ -210,6 +210,9 @@ public: reference at(size_type __n) { _M_range_check(__n); return (*this)[__n]; } const_reference at(size_type __n) const { _M_range_check(__n); return (*this)[__n]; } + _Tp* data() { return this->_M_start; } + const _Tp* data() const { return this->_M_start; } + #if !defined (_STLP_DONT_SUP_DFLT_PARAM) explicit vector(const allocator_type& __a = allocator_type()) #else

1 0

[reactos] 01/01: [OSK] Validate the registry value data on query (#2050)
by Bișoc George 18 Nov '19

18 Nov '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=48d81f845dd294d71f21d… commit 48d81f845dd294d71f21d3312a5a16c426c4904e Author: Bișoc George <fraizeraust99(a)gmail.com> AuthorDate: Mon Nov 18 21:25:51 2019 +0100 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Mon Nov 18 21:25:51 2019 +0100 [OSK] Validate the registry value data on query (#2050) Ensure that the value data we query on loading the registry configuration settings matches with its data size --- base/applications/osk/settings.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/base/applications/osk/settings.c b/base/applications/osk/settings.c index b1bcb210f96..1f4d9c94800 100644 --- a/base/applications/osk/settings.c +++ b/base/applications/osk/settings.c @@ -16,7 +16,7 @@ BOOL LoadDataFromRegistry(VOID) HKEY hKey; LONG lResult; DWORD dwValue; - DWORD cbData = sizeof(DWORD); + DWORD cbData = sizeof(dwValue); /* Initialize the registry application settings */ Globals.bShowWarning = TRUE; @@ -49,7 +49,7 @@ BOOL LoadDataFromRegistry(VOID) (BYTE *)&dwValue, &cbData); - if (lResult != ERROR_SUCCESS) + if (lResult != ERROR_SUCCESS || cbData != sizeof(dwValue)) { /* Bail out and return FALSE if we fail */ RegCloseKey(hKey); @@ -67,7 +67,7 @@ BOOL LoadDataFromRegistry(VOID) (BYTE *)&dwValue, &cbData); - if (lResult != ERROR_SUCCESS) + if (lResult != ERROR_SUCCESS || cbData != sizeof(dwValue)) { /* Bail out and return FALSE if we fail */ RegCloseKey(hKey); @@ -85,7 +85,7 @@ BOOL LoadDataFromRegistry(VOID) (BYTE *)&dwValue, &cbData); - if (lResult != ERROR_SUCCESS) + if (lResult != ERROR_SUCCESS || cbData != sizeof(dwValue)) { /* Bail out and return FALSE if we fail */ RegCloseKey(hKey); @@ -103,7 +103,7 @@ BOOL LoadDataFromRegistry(VOID) (BYTE *)&dwValue, &cbData); - if (lResult != ERROR_SUCCESS) + if (lResult != ERROR_SUCCESS || cbData != sizeof(dwValue)) { /* Bail out and return FALSE if we fail */ RegCloseKey(hKey); @@ -120,7 +120,7 @@ BOOL LoadDataFromRegistry(VOID) (BYTE *)&dwValue, &cbData); - if (lResult != ERROR_SUCCESS) + if (lResult != ERROR_SUCCESS || cbData != sizeof(dwValue)) { /* Bail out and return FALSE if we fail */ RegCloseKey(hKey); @@ -137,7 +137,7 @@ BOOL LoadDataFromRegistry(VOID) (BYTE *)&dwValue, &cbData); - if (lResult != ERROR_SUCCESS) + if (lResult != ERROR_SUCCESS || cbData != sizeof(dwValue)) { /* Bail out and return FALSE if we fail */ RegCloseKey(hKey);

1 0

[reactos] 01/01: [OSK] Reduce the delay when redrawing LED keyboard resources (#1385)
by Bișoc George 18 Nov '19

18 Nov '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=411a59961002b4e5ec9a7… commit 411a59961002b4e5ec9a79c3681c7a6e2fff6af7 Author: Bișoc George <fraizeraust99(a)gmail.com> AuthorDate: Mon Nov 18 21:24:45 2019 +0100 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Mon Nov 18 21:24:45 2019 +0100 [OSK] Reduce the delay when redrawing LED keyboard resources (#1385) 200 ms would mean that the LEDs redraw each 0,2 second and this adds a slight delay. This can be seen if you press the Num lock key (for example) many times in a row and the LED resources won't update instantly. Therefore reducing the value of uElapse should significantly decrease the delay and the LEDs should update in a realistic way. Furthermore, before invalidating the LED resource check the toggle state of the keys. --- base/applications/osk/main.c | 59 ++++++++++++++++++++++++++++++++++++----- base/applications/osk/precomp.h | 9 +++++++ 2 files changed, 62 insertions(+), 6 deletions(-) diff --git a/base/applications/osk/main.c b/base/applications/osk/main.c index a467eb24518..7994571dfee 100644 --- a/base/applications/osk/main.c +++ b/base/applications/osk/main.c @@ -14,6 +14,13 @@ OSK_GLOBALS Globals; +OSK_KEYLEDINDICATOR LedKey[] = +{ + {VK_NUMLOCK, IDC_LED_NUM, 0x0145, FALSE}, + {VK_CAPITAL, IDC_LED_CAPS, 0x013A, FALSE}, + {VK_SCROLL, IDC_LED_SCROLL, 0x0146, FALSE} +}; + /* FUNCTIONS ******************************************************************/ /*********************************************************************** @@ -237,7 +244,7 @@ int OSK_DlgInitDialog(HWND hDlg) Globals.hBrushGreenLed = CreateSolidBrush(RGB(0, 255, 0)); /* Set a timer for periodics tasks */ - Globals.iTimer = SetTimer(hDlg, 0, 200, NULL); + Globals.iTimer = SetTimer(hDlg, 0, 50, NULL); return TRUE; } @@ -281,6 +288,29 @@ int OSK_DlgClose(void) return TRUE; } +/*********************************************************************** + * + * OSK_RefreshLEDKeys + * + * Updates (invalidates) the LED icon resources then the respective + * keys (Caps Lock, Scroll Lock or Num Lock) are being held down + */ +VOID OSK_RefreshLEDKeys(VOID) +{ + INT i; + BOOL bKeyIsPressed; + + for (i = 0; i < _countof(LedKey); i++) + { + bKeyIsPressed = (GetAsyncKeyState(LedKey[i].vKey) & 0x8000) != 0; + if (LedKey[i].bWasKeyPressed != bKeyIsPressed) + { + LedKey[i].bWasKeyPressed = bKeyIsPressed; + InvalidateRect(GetDlgItem(Globals.hMainWnd, LedKey[i].DlgResource), NULL, FALSE); + } + } +} + /*********************************************************************** * * OSK_DlgTimer @@ -298,10 +328,11 @@ int OSK_DlgTimer(void) Globals.hActiveWnd = hWndActiveWindow; } - /* Always redraw leds because it can be changed by the real keyboard) */ - InvalidateRect(GetDlgItem(Globals.hMainWnd, IDC_LED_NUM), NULL, TRUE); - InvalidateRect(GetDlgItem(Globals.hMainWnd, IDC_LED_CAPS), NULL, TRUE); - InvalidateRect(GetDlgItem(Globals.hMainWnd, IDC_LED_SCROLL), NULL, TRUE); + /* + Update the LED key indicators accordingly to their state (if one + of the specific keys is held down). + */ + OSK_RefreshLEDKeys(); return TRUE; } @@ -320,6 +351,7 @@ BOOL OSK_DlgCommand(WPARAM wCommand, HWND hWndControl) BOOL bKeyDown; BOOL bKeyUp; LONG WindowStyle; + INT i; /* FIXME: To be deleted when ReactOS will support WS_EX_NOACTIVATE */ if (Globals.hActiveWnd) @@ -357,8 +389,23 @@ BOOL OSK_DlgCommand(WPARAM wCommand, HWND hWndControl) bKeyUp = TRUE; } - /* Extended key ? */ + /* Get the key from dialog control key command */ ScanCode = wCommand; + + /* + The user could've pushed one of the key buttons of the dialog that + can trigger particular function toggling (Caps Lock, Num Lock or Scroll Lock). Update + (invalidate) the LED icon resources accordingly. + */ + for (i = 0; i < _countof(LedKey); i++) + { + if (LedKey[i].wScanCode == ScanCode) + { + InvalidateRect(GetDlgItem(Globals.hMainWnd, LedKey[i].DlgResource), NULL, FALSE); + } + } + + /* Extended key ? */ if (ScanCode & 0x0200) bExtendedKey = TRUE; else diff --git a/base/applications/osk/precomp.h b/base/applications/osk/precomp.h index c1e7e50543d..e2503f787e4 100644 --- a/base/applications/osk/precomp.h +++ b/base/applications/osk/precomp.h @@ -46,6 +46,14 @@ typedef struct INT PosY; } OSK_GLOBALS; +typedef struct +{ + INT vKey; + INT DlgResource; + WORD wScanCode; + BOOL bWasKeyPressed; +} OSK_KEYLEDINDICATOR; + /* PROTOTYPES *****************************************************************/ /* main.c */ @@ -59,6 +67,7 @@ INT_PTR APIENTRY OSK_DlgProc(HWND hDlg, UINT msg, WPARAM wParam, LPARAM lParam); LRESULT APIENTRY OSK_ThemeHandler(HWND hDlg, NMCUSTOMDRAW *pNmDraw); int WINAPI wWinMain(HINSTANCE, HINSTANCE, LPWSTR, int); VOID OSK_RestoreDlgPlacement(HWND hDlg); +VOID OSK_RefreshLEDKeys(VOID); /* settings.c */ BOOL LoadDataFromRegistry(VOID);

1 0

[reactos] 01/01: [CMAKE] Define HAVE_* constants unconditionally (follow-up to PR #2041) (#2052)
by Colin Finck 18 Nov '19

18 Nov '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=eb0f16433b0012b84bc13… commit eb0f16433b0012b84bc13c0a70afb4ee38f41d23 Author: Colin Finck <colin(a)reactos.org> AuthorDate: Mon Nov 18 18:57:35 2019 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Nov 18 18:57:35 2019 +0100 [CMAKE] Define HAVE_* constants unconditionally (follow-up to PR #2041) (#2052) sys/types.h is guaranteed to be available on all our supported host platforms and always contains a pid_t definition. --- sdk/include/host/CMakeLists.txt | 18 +----------------- sdk/include/host/{config.h.in => config.h} | 5 +++-- 2 files changed, 4 insertions(+), 19 deletions(-) diff --git a/sdk/include/host/CMakeLists.txt b/sdk/include/host/CMakeLists.txt index 216e0120bdb..651367404a3 100644 --- a/sdk/include/host/CMakeLists.txt +++ b/sdk/include/host/CMakeLists.txt @@ -1,19 +1,3 @@ -include(CheckIncludeFile) -include(CheckTypeSize) - -# check for <sys/types.h> -CHECK_INCLUDE_FILE("sys/types.h" HAVE_SYS_TYPES_H) - -# check for pid_t definition -if (HAVE_SYS_TYPES_H) - set(CMAKE_EXTRA_INCLUDE_FILES "sys/types.h") - #this sets HAVE_PID_T - CHECK_TYPE_SIZE("pid_t" PID_T) - unset(CMAKE_EXTRA_INCLUDE_FILES) -endif() - -configure_file(config.h.in config.h @ONLY) - add_library(host_includes INTERFACE) -target_include_directories(host_includes INTERFACE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}) +target_include_directories(host_includes INTERFACE ${CMAKE_CURRENT_SOURCE_DIR}) diff --git a/sdk/include/host/config.h.in b/sdk/include/host/config.h similarity index 97% rename from sdk/include/host/config.h.in rename to sdk/include/host/config.h index 5ba4eaa7460..4da9f3baa59 100644 --- a/sdk/include/host/config.h.in +++ b/sdk/include/host/config.h @@ -4,11 +4,12 @@ #define __WINE_CONFIG_H /* Define to 1 if you have the <sys/types.h> header file. */ -#cmakedefine HAVE_SYS_TYPES_H @HAVE_SYS_TYPES_H@ +#define HAVE_SYS_TYPES_H 1 /* Define to 1 if the system has the type `pid_t'. */ -#cmakedefine HAVE_PID_T 1 +#define HAVE_PID_T 1 +/* Define to 1 if you have the `spawnvp' function. */ #define HAVE_SPAWNVP 1 /* Define to 1 if you have the `z' library (-lz). */

1 0

[reactos] 01/01: [SHELL32_APITEST] Add EnumPropW call CORE-11701
by Katayama Hirofumi MZ 18 Nov '19

18 Nov '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=803532b8c2f87870fdf6a… commit 803532b8c2f87870fdf6a73bf63089b75a54558d Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Mon Nov 18 20:20:12 2019 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Mon Nov 18 20:20:12 2019 +0900 [SHELL32_APITEST] Add EnumPropW call CORE-11701 --- modules/rostests/apitests/shell32/SHLimitInputEdit.cpp | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/modules/rostests/apitests/shell32/SHLimitInputEdit.cpp b/modules/rostests/apitests/shell32/SHLimitInputEdit.cpp index 2b08bd55226..9112b8f7f21 100644 --- a/modules/rostests/apitests/shell32/SHLimitInputEdit.cpp +++ b/modules/rostests/apitests/shell32/SHLimitInputEdit.cpp @@ -228,6 +228,16 @@ STDMETHODIMP CShellFolder::GetValidCharacters( return S_OK; } +static BOOL CALLBACK +PropEnumProc( + HWND hwnd, + LPCWSTR lpszString, + HANDLE hData) +{ + trace("PropEnumProc: '%S' --> %p\n", lpszString, hData); + return TRUE; +} + static INT_PTR CALLBACK DialogProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) { @@ -266,6 +276,8 @@ DialogProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) trace("GWLP_WNDPROC: %p\n", (void *)GetWindowLongPtr(hEdt1, GWLP_WNDPROC)); + EnumPropsW(hEdt1, PropEnumProc); + n = (INT)SendMessageW(hEdt1, EM_GETLIMITTEXT, 0, 0); ok_int(n, 234); }

1 0

[reactos] 01/01: [INCLUDE][SHELL32_APITEST] Add SHLimitInputEdit testcase (#2053)
by Katayama Hirofumi MZ 18 Nov '19

18 Nov '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6cc8e7db4bda80dda3774… commit 6cc8e7db4bda80dda3774bb58de016ca9f54289d Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Mon Nov 18 20:02:18 2019 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Nov 18 20:02:18 2019 +0900 [INCLUDE][SHELL32_APITEST] Add SHLimitInputEdit testcase (#2053) - Add IItemNameLimits interface into shobjidl.idl. - Add a testcase for shell32!SHLimitInputEdit function. CORE-11701 --- modules/rostests/apitests/shell32/CMakeLists.txt | 1 + .../rostests/apitests/shell32/SHLimitInputEdit.cpp | 367 +++++++++++++++++++++ modules/rostests/apitests/shell32/resource.rc | 11 + modules/rostests/apitests/shell32/testlist.c | 2 + sdk/include/psdk/shobjidl.idl | 18 + 5 files changed, 399 insertions(+) diff --git a/modules/rostests/apitests/shell32/CMakeLists.txt b/modules/rostests/apitests/shell32/CMakeLists.txt index f8d8c84e8d8..f1cd11fefaa 100644 --- a/modules/rostests/apitests/shell32/CMakeLists.txt +++ b/modules/rostests/apitests/shell32/CMakeLists.txt @@ -27,6 +27,7 @@ list(APPEND SOURCE ShellExecCmdLine.cpp ShellExecuteEx.cpp ShellState.cpp + SHLimitInputEdit.cpp menu.cpp shelltest.cpp shelltest.h) diff --git a/modules/rostests/apitests/shell32/SHLimitInputEdit.cpp b/modules/rostests/apitests/shell32/SHLimitInputEdit.cpp new file mode 100644 index 00000000000..2b08bd55226 --- /dev/null +++ b/modules/rostests/apitests/shell32/SHLimitInputEdit.cpp @@ -0,0 +1,367 @@ +/* + * PROJECT: ReactOS api tests + * LICENSE: LGPLv2.1+ - See COPYING.LIB in the top level directory + * PURPOSE: Test for SHLimitInputEdit + * PROGRAMMER: Katayama Hirofumi MZ + */ + +#include "shelltest.h" +#include <shobjidl.h> +#include <shlwapi.h> + +class CShellFolder + : public IShellFolder + , public IItemNameLimits +{ +public: + LONG m_cRefs; + + CShellFolder(INT iMaxNameLen = 0, BOOL bDisabled = FALSE) + : m_cRefs(1) + , m_iMaxNameLen(iMaxNameLen) + , m_bDisabled(bDisabled) + { + trace("CShellFolder\n"); + } + + virtual ~CShellFolder() + { + trace("~CShellFolder\n"); + } + + /*** IUnknown methods ***/ + + STDMETHODIMP QueryInterface(REFIID riid, void **ppvObject); + STDMETHODIMP_(ULONG) AddRef(); + STDMETHODIMP_(ULONG) Release(); + + /*** IShellFolder methods ***/ + + STDMETHODIMP ParseDisplayName( + HWND hwnd, + IBindCtx *pbc, + LPWSTR pszDisplayName, + ULONG *pchEaten, + PIDLIST_RELATIVE *ppidl, + ULONG *pdwAttributes) + { + trace("ParseDisplayName\n"); + return E_NOTIMPL; + } + + STDMETHODIMP EnumObjects( + HWND hwnd, + SHCONTF grfFlags, + IEnumIDList **ppenumIDList) + { + trace("EnumObjects\n"); + return E_NOTIMPL; + } + + STDMETHODIMP BindToObject( + PCUIDLIST_RELATIVE pidl, + IBindCtx *pbc, + REFIID riid, + void **ppv) + { + trace("BindToObject\n"); + return E_NOTIMPL; + } + + STDMETHODIMP BindToStorage( + PCUIDLIST_RELATIVE pidl, + IBindCtx *pbc, + REFIID riid, + void **ppv) + { + trace("BindToStorage\n"); + return E_NOTIMPL; + } + + STDMETHODIMP CompareIDs( + LPARAM lParam, + PCUIDLIST_RELATIVE pidl1, + PCUIDLIST_RELATIVE pidl2) + { + trace("CompareIDs\n"); + return E_NOTIMPL; + } + + STDMETHODIMP CreateViewObject( + HWND hwndOwner, + REFIID riid, + void **ppv) + { + trace("CreateViewObject\n"); + return E_NOTIMPL; + } + + STDMETHODIMP GetAttributesOf( + UINT cidl, + PCUITEMID_CHILD_ARRAY apidl, + SFGAOF *rgfInOut) + { + trace("GetAttributesOf\n"); + return E_NOTIMPL; + } + + STDMETHODIMP GetUIObjectOf( + HWND hwndOwner, + UINT cidl, + PCUITEMID_CHILD_ARRAY apidl, + REFIID riid, + UINT *rgfReserved, + void **ppv) + { + trace("GetUIObjectOf\n"); + return E_NOTIMPL; + } + + STDMETHODIMP GetDisplayNameOf( + PCUITEMID_CHILD pidl, + SHGDNF uFlags, + STRRET *pName) + { + trace("GetDisplayNameOf\n"); + return E_NOTIMPL; + } + + STDMETHODIMP SetNameOf( + HWND hwnd, + PCUITEMID_CHILD pidl, + LPCWSTR pszName, + SHGDNF uFlags, + PITEMID_CHILD *ppidlOut) + { + trace("SetNameOf\n"); + return E_NOTIMPL; + } + + /*** IItemNameLimits methods ***/ + + STDMETHODIMP GetMaxLength( + LPCWSTR pszName, + int *piMaxNameLen); + + STDMETHODIMP GetValidCharacters( + LPWSTR *ppwszValidChars, + LPWSTR *ppwszInvalidChars); + +protected: + INT m_iMaxNameLen; + BOOL m_bDisabled; +}; + +STDMETHODIMP CShellFolder::QueryInterface(REFIID riid, void **ppvObject) +{ + trace("QueryInterface\n"); + + if (!ppvObject) + return E_POINTER; + + if (IsEqualIID(riid, IID_IShellFolder) || IsEqualIID(riid, IID_IUnknown)) + { + trace("IID_IShellFolder\n"); + *ppvObject = static_cast<IShellFolder *>(this); + AddRef(); + return S_OK; + } + if (IsEqualIID(riid, IID_IItemNameLimits)) + { + trace("IID_IItemNameLimits\n"); + *ppvObject = static_cast<IItemNameLimits *>(this); + AddRef(); + return S_OK; + } + + return E_NOINTERFACE; +} + +STDMETHODIMP_(ULONG) CShellFolder::AddRef() +{ + trace("AddRef\n"); + return ++m_cRefs; +} + +STDMETHODIMP_(ULONG) CShellFolder::Release() +{ + trace("Release\n"); + + if (--m_cRefs == 0) + { + //delete this; + return 0; + } + return m_cRefs; +} + +STDMETHODIMP CShellFolder::GetMaxLength( + LPCWSTR pszName, + int *piMaxNameLen) +{ + trace("GetMaxLength('%S', %p (%d))\n", pszName, piMaxNameLen, *piMaxNameLen); + + if (!piMaxNameLen) + return E_POINTER; + + *piMaxNameLen = m_iMaxNameLen; + return S_OK; +} + +STDMETHODIMP CShellFolder::GetValidCharacters( + LPWSTR *ppwszValidChars, + LPWSTR *ppwszInvalidChars) +{ + trace("GetValidCharacters(%p, %p)\n", ppwszValidChars, ppwszInvalidChars); + + if (m_bDisabled) + return E_NOTIMPL; + + if (ppwszInvalidChars) + { + SHStrDupW(L"/:*?\"<>|", ppwszInvalidChars); + } + if (ppwszValidChars) + { + *ppwszValidChars = NULL; + } + return S_OK; +} + +static INT_PTR CALLBACK +DialogProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) +{ + if (uMsg != WM_INITDIALOG) + return FALSE; + + HWND hEdt1 = GetDlgItem(hwnd, edt1); + INT n; + HRESULT hr; + WCHAR szText[64]; + + _SEH2_TRY + { + hr = SHLimitInputEdit(hEdt1, NULL); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + hr = 0xDEAD; + } + _SEH2_END; + ok_int(hr, 0xDEAD); + + { + CShellFolder sf(123, FALSE); + + ok_long(sf.m_cRefs, 1); + + SendMessageW(hEdt1, EM_LIMITTEXT, 234, 0); + + trace("GWLP_WNDPROC: %p\n", (void *)GetWindowLongPtr(hEdt1, GWLP_WNDPROC)); + + hr = SHLimitInputEdit(hEdt1, &sf); + ok_int(hr, S_OK); + + ok_long(sf.m_cRefs, 1); + + trace("GWLP_WNDPROC: %p\n", (void *)GetWindowLongPtr(hEdt1, GWLP_WNDPROC)); + + n = (INT)SendMessageW(hEdt1, EM_GETLIMITTEXT, 0, 0); + ok_int(n, 234); + } + + { + CShellFolder sf(345, TRUE); + + hr = SHLimitInputEdit(hEdt1, &sf); + ok_int(hr, E_NOTIMPL); + + n = (INT)SendMessageW(hEdt1, EM_GETLIMITTEXT, 0, 0); + ok_int(n, 234); + } + + { + CShellFolder sf(999, FALSE); + + ok_long(sf.m_cRefs, 1); + + SetWindowTextW(hEdt1, L"TEST/TEST"); + hr = SHLimitInputEdit(hEdt1, &sf); + ok_int(hr, S_OK); + GetWindowTextW(hEdt1, szText, _countof(szText)); + ok_wstr(szText, L"TEST/TEST"); + + ok_long(sf.m_cRefs, 1); + + n = (INT)SendMessageW(hEdt1, EM_GETLIMITTEXT, 0, 0); + ok_int(n, 234); + + SetWindowTextW(hEdt1, L""); + SendMessageW(hEdt1, WM_CHAR, L'A', 1); + GetWindowTextW(hEdt1, szText, _countof(szText)); + ok_wstr(szText, L"A"); + + SendMessageW(hEdt1, WM_CHAR, L'/', 1); + GetWindowTextW(hEdt1, szText, _countof(szText)); + ok_wstr(szText, L"A"); + + SendMessageW(hEdt1, WM_CHAR, L'/', 1); + GetWindowTextW(hEdt1, szText, _countof(szText)); + ok_wstr(szText, L"A"); + + SendMessageW(hEdt1, WM_CHAR, L'A', 1); + GetWindowTextW(hEdt1, szText, _countof(szText)); + ok_wstr(szText, L"AA"); + } + + { + CShellFolder sf(4, FALSE); + + ok_long(sf.m_cRefs, 1); + + SetWindowTextW(hEdt1, L"ABC"); + hr = SHLimitInputEdit(hEdt1, &sf); + + SendMessageW(hEdt1, WM_CHAR, L'D', 1); + GetWindowTextW(hEdt1, szText, _countof(szText)); + ok_wstr(szText, L"DABC"); + + SendMessageW(hEdt1, WM_CHAR, L'E', 1); + GetWindowTextW(hEdt1, szText, _countof(szText)); + ok_wstr(szText, L"DEABC"); + + ok_long(sf.m_cRefs, 1); + } + + EndDialog(hwnd, IDABORT); + return TRUE; +} + +START_TEST(SHLimitInputEdit) +{ + HRESULT hr; + + _SEH2_TRY + { + hr = SHLimitInputEdit(NULL, NULL); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + hr = 0xDEAD; + } + _SEH2_END; + ok_int(hr, 0xDEAD); + + _SEH2_TRY + { + hr = SHLimitInputEdit((HWND)0xDEAD, NULL); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + hr = 0xDEAD; + } + _SEH2_END; + ok_int(hr, 0xDEAD); + + DialogBoxW(GetModuleHandleW(NULL), L"SHLIMIT", NULL, DialogProc); +} diff --git a/modules/rostests/apitests/shell32/resource.rc b/modules/rostests/apitests/shell32/resource.rc index 89a0f853a89..f57af647e3d 100644 --- a/modules/rostests/apitests/shell32/resource.rc +++ b/modules/rostests/apitests/shell32/resource.rc @@ -1,5 +1,16 @@ #include <windef.h> +#include <winuser.h> +#include <dlgs.h> LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL 1 ICON "1.ico" + +SHLIMIT DIALOG 0, 0, 122, 84 +CAPTION "SHLIMIT" +STYLE DS_MODALFRAME | WS_POPUPWINDOW | WS_CAPTION +FONT 9, "Tahoma" +{ + CONTROL "edt1", edt1, "EDIT", ES_AUTOHSCROLL | ES_MULTILINE | WS_BORDER | WS_TABSTOP, 19, 18, 80, 14 + LTEXT "stc1", stc1, 24, 49, 72, 21 +} diff --git a/modules/rostests/apitests/shell32/testlist.c b/modules/rostests/apitests/shell32/testlist.c index b16ace6cc23..a274688b0f5 100644 --- a/modules/rostests/apitests/shell32/testlist.c +++ b/modules/rostests/apitests/shell32/testlist.c @@ -21,6 +21,7 @@ extern void func_SHCreateFileExtractIconW(void); extern void func_ShellExecCmdLine(void); extern void func_ShellExecuteEx(void); extern void func_ShellState(void); +extern void func_SHLimitInputEdit(void); extern void func_SHParseDisplayName(void); const struct test winetest_testlist[] = @@ -43,6 +44,7 @@ const struct test winetest_testlist[] = { "ShellExecCmdLine", func_ShellExecCmdLine }, { "ShellExecuteEx", func_ShellExecuteEx }, { "ShellState", func_ShellState }, + { "SHLimitInputEdit", func_SHLimitInputEdit }, { "SHParseDisplayName", func_SHParseDisplayName }, { 0, 0 } }; diff --git a/sdk/include/psdk/shobjidl.idl b/sdk/include/psdk/shobjidl.idl index c540f232e00..1fa2e3940b5 100644 --- a/sdk/include/psdk/shobjidl.idl +++ b/sdk/include/psdk/shobjidl.idl @@ -4745,4 +4745,22 @@ interface IUserNotification2 : IUnknown [in, string] LPCWSTR pszSoundName); }; +/***************************************************************************** + * IItemNameLimits interface + */ + +[ + uuid(1df0d7f1-b267-4d28-8b10-12e23202a5c4) +] +interface IItemNameLimits : IUnknown +{ + HRESULT GetValidCharacters( + [out, string] LPWSTR *ppwszValidChars, + [out, string] LPWSTR *ppwszInvalidChars); + + HRESULT GetMaxLength( + [in, string] LPCWSTR pszName, + [out] int *piMaxNameLen); +}; + #endif // __REACTOS__

1 0

[reactos] 01/01: [RDBSSLIB] RxFirstCanonicalize(): Fix pointer arithmetic
by Victor Martinez 18 Nov '19

18 Nov '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9420daee3dc926a347feb… commit 9420daee3dc926a347feb379b1c5fb1ecffc10ee Author: Victor Martinez <vicmarcal(a)gmail.com> AuthorDate: Sun Nov 17 17:09:51 2019 +0100 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Mon Nov 18 08:20:49 2019 +0100 [RDBSSLIB] RxFirstCanonicalize(): Fix pointer arithmetic CORE-13383 --- sdk/lib/drivers/rdbsslib/rdbss.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk/lib/drivers/rdbsslib/rdbss.c b/sdk/lib/drivers/rdbsslib/rdbss.c index 489d3116570..851b0f543a3 100644 --- a/sdk/lib/drivers/rdbsslib/rdbss.c +++ b/sdk/lib/drivers/rdbsslib/rdbss.c @@ -6074,7 +6074,7 @@ RxFirstCanonicalize( } } - if (EndOfString - FirstSlash <= sizeof(WCHAR)) + if (EndOfString - FirstSlash <= 1) { Status = STATUS_OBJECT_NAME_INVALID; }

1 0

[reactos] 01/01: [USER32_APITEST] Add DM_REPOSITION testcase (#2043)
by Katayama Hirofumi MZ 18 Nov '19

18 Nov '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=bef841c3eebf6e2f67f56… commit bef841c3eebf6e2f67f56f1857caed52f765d486 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Mon Nov 18 10:46:36 2019 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Nov 18 10:46:36 2019 +0900 [USER32_APITEST] Add DM_REPOSITION testcase (#2043) CORE-16490 --- modules/rostests/apitests/user32/CMakeLists.txt | 1 + modules/rostests/apitests/user32/DM_REPOSITION.c | 98 ++++++++++++++++++++++ modules/rostests/apitests/user32/testlist.c | 2 + modules/rostests/apitests/user32/user32_apitest.rc | 7 ++ 4 files changed, 108 insertions(+) diff --git a/modules/rostests/apitests/user32/CMakeLists.txt b/modules/rostests/apitests/user32/CMakeLists.txt index 24a6921472b..302a084934e 100644 --- a/modules/rostests/apitests/user32/CMakeLists.txt +++ b/modules/rostests/apitests/user32/CMakeLists.txt @@ -8,6 +8,7 @@ list(APPEND SOURCE CreateWindowEx.c DeferWindowPos.c DestroyCursorIcon.c + DM_REPOSITION.c DrawIconEx.c desktop.c EmptyClipboard.c diff --git a/modules/rostests/apitests/user32/DM_REPOSITION.c b/modules/rostests/apitests/user32/DM_REPOSITION.c new file mode 100644 index 00000000000..70d7c9e7632 --- /dev/null +++ b/modules/rostests/apitests/user32/DM_REPOSITION.c @@ -0,0 +1,98 @@ +/* + * PROJECT: ReactOS API tests + * LICENSE: LGPL-2.1+ (https://spdx.org/licenses/LGPL-2.1+) + * PURPOSE: Test for DM_REPOSITION + * COPYRIGHT: Copyright 2019 Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> + */ + +#include "precomp.h" +#include <windowsx.h> + +static BOOL OnInitDialog(HWND hwnd, HWND hwndFocus, LPARAM lParam) +{ + RECT rc, rcWork; + INT cx, cy; + HMONITOR hMon; + MONITORINFO mi = { sizeof(mi) }; + + /* get monitor info */ + hMon = MonitorFromWindow(hwnd, MONITOR_DEFAULTTONEAREST); + ok(hMon != NULL, "hMon is NULL\n"); + ok_int(GetMonitorInfoW(hMon, &mi), TRUE); + rcWork = mi.rcWork; + + /* get size */ + GetWindowRect(hwnd, &rc); + cx = rc.right - rc.left; + cy = rc.bottom - rc.top; + + /* move */ + ok_int(SetWindowPos(hwnd, NULL, rcWork.left - 80, rcWork.top - 80, 0, 0, + SWP_NOACTIVATE | SWP_NOSIZE | SWP_NOOWNERZORDER | + SWP_NOZORDER), TRUE); + ok_int(GetWindowRect(hwnd, &rc), TRUE); + ok_long(rc.left, rcWork.left - 80); + ok_long(rc.top, rcWork.top - 80); + ok_long(rc.right, rc.left + cx); + ok_long(rc.bottom, rc.top + cy); + + /* reposition */ + ok_int(SendMessageW(hwnd, DM_REPOSITION, 0, 0), 0); + ok_int(GetWindowRect(hwnd, &rc), TRUE); + ok_long(rc.left, rcWork.left); + ok_long(rc.top, rcWork.top); + ok_long(rc.right, rc.left + cx); + ok_long(rc.bottom, rc.top + cy); + + /* move */ + ok_int(SetWindowPos(hwnd, NULL, + rcWork.right - cx + 80, rcWork.bottom - cy + 80, 0, 0, + SWP_NOACTIVATE | SWP_NOSIZE | SWP_NOOWNERZORDER | + SWP_NOZORDER), TRUE); + ok_int(GetWindowRect(hwnd, &rc), TRUE); + ok_long(rc.left, rcWork.right - cx + 80); + ok_long(rc.top, rcWork.bottom - cy + 80); + ok_long(rc.right, rc.left + cx); + ok_long(rc.bottom, rc.top + cy); + + /* reposition */ + ok_int(SendMessageW(hwnd, DM_REPOSITION, 0, 0), 0); + ok_int(GetWindowRect(hwnd, &rc), TRUE); + ok_long(rc.left, rcWork.right - cx); + ok_long(rc.top, rcWork.bottom - cy - 4); + ok_long(rc.right, rc.left + cx); + ok_long(rc.bottom, rc.top + cy); + + /* quit */ + PostMessage(hwnd, WM_COMMAND, IDOK, 0); + return TRUE; +} + +static void OnCommand(HWND hwnd, int id, HWND hwndCtl, UINT codeNotify) +{ + switch (id) + { + case IDOK: + case IDCANCEL: + EndDialog(hwnd, id); + break; + } +} + +static INT_PTR CALLBACK +DialogProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) +{ + switch (uMsg) + { + HANDLE_MSG(hwnd, WM_INITDIALOG, OnInitDialog); + HANDLE_MSG(hwnd, WM_COMMAND, OnCommand); + } + return 0; +} + +START_TEST(DM_REPOSITION) +{ + HMODULE hMod = GetModuleHandle(NULL); + ok(hMod != NULL, "\n"); + DialogBox(hMod, TEXT("REPOSITION"), NULL, DialogProc); +} diff --git a/modules/rostests/apitests/user32/testlist.c b/modules/rostests/apitests/user32/testlist.c index 0118bf23b69..5803f028e69 100644 --- a/modules/rostests/apitests/user32/testlist.c +++ b/modules/rostests/apitests/user32/testlist.c @@ -10,6 +10,7 @@ extern void func_CreateIconFromResourceEx(void); extern void func_CreateWindowEx(void); extern void func_DeferWindowPos(void); extern void func_DestroyCursorIcon(void); +extern void func_DM_REPOSITION(void); extern void func_DrawIconEx(void); extern void func_desktop(void); extern void func_EmptyClipboard(void); @@ -57,6 +58,7 @@ const struct test winetest_testlist[] = { "CreateWindowEx", func_CreateWindowEx }, { "DeferWindowPos", func_DeferWindowPos }, { "DestroyCursorIcon", func_DestroyCursorIcon }, + { "DM_REPOSITION", func_DM_REPOSITION }, { "DrawIconEx", func_DrawIconEx }, { "desktop", func_desktop }, { "EmptyClipboard", func_EmptyClipboard }, diff --git a/modules/rostests/apitests/user32/user32_apitest.rc b/modules/rostests/apitests/user32/user32_apitest.rc index 85b88e08da5..8f56c8c8647 100644 --- a/modules/rostests/apitests/user32/user32_apitest.rc +++ b/modules/rostests/apitests/user32/user32_apitest.rc @@ -31,3 +31,10 @@ FONT 8, "MS Shell Dlg" CONTROL "OK", IDOK, "BUTTON", BS_DEFPUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 65, 98, 60, 14 CONTROL "Cancel", IDCANCEL, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 187, 100, 60, 14 } + +REPOSITION DIALOG 0, 0, 200, 150 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "DM_REPOSITION" +FONT 8, "MS Shell Dlg" +{ +}

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs