Ros-diffs January 2023

ros-diffs@reactos.org

18 participants
79 discussions

[reactos] 01/07: [CRT] Get back MSVCRT prefix in wine heap code

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=73ef1c3c8bf5bce24adb0… commit 73ef1c3c8bf5bce24adb0bc20d7393c949a8235b Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Tue Jan 10 10:09:15 2023 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Tue Jan 24 18:53:13 2023 +0100 [CRT] Get back MSVCRT prefix in wine heap code --- sdk/lib/crt/wine/heap.c | 137 ++++++++++++++++++++++++++++-------------------- 1 file changed, 79 insertions(+), 58 deletions(-) diff --git a/sdk/lib/crt/wine/heap.c b/sdk/lib/crt/wine/heap.c index 3716fe52c39..43c321fb9c9 100644 --- a/sdk/lib/crt/wine/heap.c +++ b/sdk/lib/crt/wine/heap.c @@ -24,6 +24,27 @@ #include <precomp.h> #include <malloc.h> +#define MSVCRT_size_t size_t +#define MSVCRT_intptr_t intptr_t +#define MSVCRT__HEAPBADNODE _HEAPBADNODE +#define MSVCRT__HEAPOK _HEAPOK +#define MSVCRT__HEAPEND _HEAPEND +#define MSVCRT__FREEENTRY _FREEENTRY +#define MSVCRT__USEDENTRY _USEDENTRY +#define MSVCRT__HEAPBADBEGIN _HEAPBADBEGIN +#define MSVCRT_EINVAL EINVAL +#define MSVCRT_ENOSYS ENOSYS +#define MSVCRT_ENOMEM ENOMEM +#define MSVCRT__TRUNCATE _TRUNCATE +#define MSVCRT__heapinfo _heapinfo +#define MSVCRT__errno _errno +#define MSVCRT_calloc calloc +#define MSVCRT_malloc malloc +#define MSVCRT_realloc realloc +#define MSVCRT_free free +#define MSVCRT_memmove_s memmove_s +#define MSVCRT_strncpy_s strncpy_s + /* MT */ #define LOCK_HEAP _mlock( _HEAP_LOCK ) #define UNLOCK_HEAP _munlock( _HEAP_LOCK ) @@ -36,7 +57,7 @@ ~(alignment - 1)) - offset)) -typedef int (CDECL *MSVCRT_new_handler_func)(size_t size); +typedef int (CDECL *MSVCRT_new_handler_func)(MSVCRT_size_t size); static MSVCRT_new_handler_func MSVCRT_new_handler; static int MSVCRT_new_mode; @@ -44,12 +65,12 @@ static int MSVCRT_new_mode; /* FIXME - According to documentation it should be 8*1024, at runtime it returns 16 */ static unsigned int MSVCRT_amblksiz = 16; /* FIXME - According to documentation it should be 480 bytes, at runtime default is 0 */ -static size_t MSVCRT_sbh_threshold = 0; +static MSVCRT_size_t MSVCRT_sbh_threshold = 0; /********************************************************************* * ??2@YAPAXI@Z (MSVCRT.@) */ -void* CDECL MSVCRT_operator_new(size_t size) +void* CDECL MSVCRT_operator_new(MSVCRT_size_t size) { void *retval; int freed; @@ -79,7 +100,7 @@ void* CDECL MSVCRT_operator_new(size_t size) /********************************************************************* * ??2@YAPAXIHPBDH@Z (MSVCRT.@) */ -void* CDECL MSVCRT_operator_new_dbg(size_t size, int type, const char *file, int line) +void* CDECL MSVCRT_operator_new_dbg(MSVCRT_size_t size, int type, const char *file, int line) { return MSVCRT_operator_new( size ); } @@ -151,7 +172,7 @@ int CDECL MSVCRT__set_new_mode(int mode) /********************************************************************* * _callnewh (MSVCRT.@) */ -int CDECL _callnewh(size_t size) +int CDECL _callnewh(MSVCRT_size_t size) { if(MSVCRT_new_handler) (*MSVCRT_new_handler)(size); @@ -161,7 +182,7 @@ int CDECL _callnewh(size_t size) /********************************************************************* * _expand (MSVCRT.@) */ -void* CDECL _expand(void* mem, size_t size) +void* CDECL _expand(void* mem, MSVCRT_size_t size) { return HeapReAlloc(GetProcessHeap(), HEAP_REALLOC_IN_PLACE_ONLY, mem, size); } @@ -174,9 +195,9 @@ int CDECL _heapchk(void) if (!HeapValidate( GetProcessHeap(), 0, NULL)) { _dosmaperr(GetLastError()); - return _HEAPBADNODE; + return MSVCRT__HEAPBADNODE; } - return _HEAPOK; + return MSVCRT__HEAPOK; } /********************************************************************* @@ -196,21 +217,21 @@ int CDECL _heapmin(void) /********************************************************************* * _heapwalk (MSVCRT.@) */ -int CDECL _heapwalk(_HEAPINFO* next) +int CDECL _heapwalk(struct MSVCRT__heapinfo* next) { PROCESS_HEAP_ENTRY phe; LOCK_HEAP; phe.lpData = next->_pentry; phe.cbData = (DWORD)next->_size; - phe.wFlags = next->_useflag == _USEDENTRY ? PROCESS_HEAP_ENTRY_BUSY : 0; + phe.wFlags = next->_useflag == MSVCRT__USEDENTRY ? PROCESS_HEAP_ENTRY_BUSY : 0; if (phe.lpData && phe.wFlags & PROCESS_HEAP_ENTRY_BUSY && !HeapValidate( GetProcessHeap(), 0, phe.lpData )) { UNLOCK_HEAP; _dosmaperr(GetLastError()); - return _HEAPBADNODE; + return MSVCRT__HEAPBADNODE; } do @@ -219,19 +240,19 @@ int CDECL _heapwalk(_HEAPINFO* next) { UNLOCK_HEAP; if (GetLastError() == ERROR_NO_MORE_ITEMS) - return _HEAPEND; + return MSVCRT__HEAPEND; _dosmaperr(GetLastError()); if (!phe.lpData) - return _HEAPBADBEGIN; - return _HEAPBADNODE; + return MSVCRT__HEAPBADBEGIN; + return MSVCRT__HEAPBADNODE; } } while (phe.wFlags & (PROCESS_HEAP_REGION|PROCESS_HEAP_UNCOMMITTED_RANGE)); UNLOCK_HEAP; next->_pentry = phe.lpData; next->_size = phe.cbData; - next->_useflag = phe.wFlags & PROCESS_HEAP_ENTRY_BUSY ? _USEDENTRY : _FREEENTRY; - return _HEAPOK; + next->_useflag = phe.wFlags & PROCESS_HEAP_ENTRY_BUSY ? MSVCRT__USEDENTRY : MSVCRT__FREEENTRY; + return MSVCRT__HEAPOK; } /********************************************************************* @@ -240,44 +261,44 @@ int CDECL _heapwalk(_HEAPINFO* next) int CDECL _heapset(unsigned int value) { int retval; - _HEAPINFO heap; + struct MSVCRT__heapinfo heap; memset( &heap, 0, sizeof(heap) ); LOCK_HEAP; - while ((retval = _heapwalk(&heap)) == _HEAPOK) + while ((retval = _heapwalk(&heap)) == MSVCRT__HEAPOK) { - if (heap._useflag == _FREEENTRY) + if (heap._useflag == MSVCRT__FREEENTRY) memset(heap._pentry, value, heap._size); } UNLOCK_HEAP; - return retval == _HEAPEND? _HEAPOK : retval; + return retval == MSVCRT__HEAPEND? MSVCRT__HEAPOK : retval; } /********************************************************************* * _heapadd (MSVCRT.@) */ -int CDECL _heapadd(void* mem, size_t size) +int CDECL _heapadd(void* mem, MSVCRT_size_t size) { TRACE("(%p,%ld) unsupported in Win32\n", mem,size); - *_errno() = ENOSYS; + *MSVCRT__errno() = MSVCRT_ENOSYS; return -1; } /********************************************************************* * _heapadd (MSVCRT.@) */ -intptr_t CDECL _get_heap_handle(void) +MSVCRT_intptr_t CDECL _get_heap_handle(void) { - return (intptr_t)GetProcessHeap(); + return (MSVCRT_intptr_t)GetProcessHeap(); } /********************************************************************* * _msize (MSVCRT.@) */ -size_t CDECL _msize(void* mem) +MSVCRT_size_t CDECL _msize(void* mem) { - size_t size = HeapSize(GetProcessHeap(),0,mem); - if (size == ~(size_t)0) + MSVCRT_size_t size = HeapSize(GetProcessHeap(),0,mem); + if (size == ~(MSVCRT_size_t)0) { WARN(":Probably called with non wine-allocated memory, ret = -1\n"); /* At least the Win32 crtdll/msvcrt also return -1 in this case */ @@ -288,7 +309,7 @@ size_t CDECL _msize(void* mem) /********************************************************************* * calloc (MSVCRT.@) */ -void* CDECL calloc(size_t count, size_t size) +void* CDECL MSVCRT_calloc(MSVCRT_size_t count, MSVCRT_size_t size) { return HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, count * size ); } @@ -296,7 +317,7 @@ void* CDECL calloc(size_t count, size_t size) /********************************************************************* * free (MSVCRT.@) */ -void CDECL free(void* ptr) +void CDECL MSVCRT_free(void* ptr) { if(ptr == NULL) return; HeapFree(GetProcessHeap(),0,ptr); @@ -305,22 +326,22 @@ void CDECL free(void* ptr) /********************************************************************* * malloc (MSVCRT.@) */ -void* CDECL malloc(size_t size) +void* CDECL MSVCRT_malloc(MSVCRT_size_t size) { void *ret = HeapAlloc(GetProcessHeap(),0,size); if (!ret) - *_errno() = ENOMEM; + *MSVCRT__errno() = MSVCRT_ENOMEM; return ret; } /********************************************************************* * realloc (MSVCRT.@) */ -void* CDECL realloc(void* ptr, size_t size) +void* CDECL MSVCRT_realloc(void* ptr, MSVCRT_size_t size) { - if (!ptr) return malloc(size); + if (!ptr) return MSVCRT_malloc(size); if (size) return HeapReAlloc(GetProcessHeap(), 0, ptr, size); - free(ptr); + MSVCRT_free(ptr); return NULL; } @@ -335,7 +356,7 @@ unsigned int* CDECL __p__amblksiz(void) /********************************************************************* * _get_sbh_threshold (MSVCRT.@) */ -size_t CDECL _get_sbh_threshold(void) +MSVCRT_size_t CDECL _get_sbh_threshold(void) { return MSVCRT_sbh_threshold; } @@ -343,7 +364,7 @@ size_t CDECL _get_sbh_threshold(void) /********************************************************************* * _set_sbh_threshold (MSVCRT.@) */ -int CDECL _set_sbh_threshold(size_t threshold) +int CDECL _set_sbh_threshold(MSVCRT_size_t threshold) { if(threshold > 1016) return 0; @@ -362,14 +383,14 @@ void CDECL _aligned_free(void *memblock) if (memblock) { void **saved = SAVED_PTR(memblock); - free(*saved); + MSVCRT_free(*saved); } } /********************************************************************* * _aligned_offset_malloc (MSVCRT.@) */ -void * CDECL _aligned_offset_malloc(size_t size, size_t alignment, size_t offset) +void * CDECL _aligned_offset_malloc(MSVCRT_size_t size, MSVCRT_size_t alignment, MSVCRT_size_t offset) { void *memblock, *temp, **saved; TRACE("(%lu, %lu, %lu)\n", size, alignment, offset); @@ -377,14 +398,14 @@ void * CDECL _aligned_offset_malloc(size_t size, size_t alignment, size_t offset /* alignment must be a power of 2 */ if ((alignment & (alignment - 1)) != 0) { - *_errno() = EINVAL; + *MSVCRT__errno() = MSVCRT_EINVAL; return NULL; } /* offset must be less than size */ if (offset >= size) { - *_errno() = EINVAL; + *MSVCRT__errno() = MSVCRT_EINVAL; return NULL; } @@ -393,7 +414,7 @@ void * CDECL _aligned_offset_malloc(size_t size, size_t alignment, size_t offset alignment = sizeof(void *); /* allocate enough space for void pointer and alignment */ - temp = malloc(size + alignment + sizeof(void *)); + temp = MSVCRT_malloc(size + alignment + sizeof(void *)); if (!temp) return NULL; @@ -412,7 +433,7 @@ void * CDECL _aligned_offset_malloc(size_t size, size_t alignment, size_t offset /********************************************************************* * _aligned_malloc (MSVCRT.@) */ -void * CDECL _aligned_malloc(size_t size, size_t alignment) +void * CDECL _aligned_malloc(MSVCRT_size_t size, MSVCRT_size_t alignment) { TRACE("(%lu, %lu)\n", size, alignment); return _aligned_offset_malloc(size, alignment, 0); @@ -421,11 +442,11 @@ void * CDECL _aligned_malloc(size_t size, size_t alignment) /********************************************************************* * _aligned_offset_realloc (MSVCRT.@) */ -void * CDECL _aligned_offset_realloc(void *memblock, size_t size, - size_t alignment, size_t offset) +void * CDECL _aligned_offset_realloc(void *memblock, MSVCRT_size_t size, + MSVCRT_size_t alignment, MSVCRT_size_t offset) { void * temp, **saved; - size_t old_padding, new_padding, old_size; + MSVCRT_size_t old_padding, new_padding, old_size; TRACE("(%p, %lu, %lu, %lu)\n", memblock, size, alignment, offset); if (!memblock) @@ -434,14 +455,14 @@ void * CDECL _aligned_offset_realloc(void *memblock, size_t size, /* alignment must be a power of 2 */ if ((alignment & (alignment - 1)) != 0) { - *_errno() = EINVAL; + *MSVCRT__errno() = MSVCRT_EINVAL; return NULL; } /* offset must be less than size */ if (offset >= size) { - *_errno() = EINVAL; + *MSVCRT__errno() = MSVCRT_EINVAL; return NULL; } @@ -459,7 +480,7 @@ void * CDECL _aligned_offset_realloc(void *memblock, size_t size, saved = SAVED_PTR(memblock); if (memblock != ALIGN_PTR(*saved, alignment, offset)) { - *_errno() = EINVAL; + *MSVCRT__errno() = MSVCRT_EINVAL; return NULL; } @@ -481,7 +502,7 @@ void * CDECL _aligned_offset_realloc(void *memblock, size_t size, } old_size -= old_padding; - temp = realloc(*saved, size + alignment + sizeof(void *)); + temp = MSVCRT_realloc(*saved, size + alignment + sizeof(void *)); if (!temp) return NULL; @@ -536,7 +557,7 @@ void * CDECL _aligned_offset_realloc(void *memblock, size_t size, /********************************************************************* * _aligned_realloc (MSVCRT.@) */ -void * CDECL _aligned_realloc(void *memblock, size_t size, size_t alignment) +void * CDECL _aligned_realloc(void *memblock, MSVCRT_size_t size, MSVCRT_size_t alignment) { TRACE("(%p, %lu, %lu)\n", memblock, size, alignment); return _aligned_offset_realloc(memblock, size, alignment, 0); @@ -545,7 +566,7 @@ void * CDECL _aligned_realloc(void *memblock, size_t size, size_t alignment) /********************************************************************* * memmove_s (MSVCRT.@) */ -int CDECL memmove_s(void *dest, size_t numberOfElements, const void *src, size_t count) +int CDECL MSVCRT_memmove_s(void *dest, MSVCRT_size_t numberOfElements, const void *src, MSVCRT_size_t count) { TRACE("(%p %lu %p %lu)\n", dest, numberOfElements, src, count); @@ -574,10 +595,10 @@ int CDECL memmove_s(void *dest, size_t numberOfElements, const void *src, size_t /********************************************************************* * strncpy_s (MSVCRT.@) */ -int CDECL strncpy_s(char *dest, size_t numberOfElements, - const char *src, size_t count) +int CDECL MSVCRT_strncpy_s(char *dest, MSVCRT_size_t numberOfElements, + const char *src, MSVCRT_size_t count) { - size_t i, end; + MSVCRT_size_t i, end; TRACE("(%s %lu %s %lu)\n", dest, numberOfElements, src, count); @@ -590,7 +611,7 @@ int CDECL strncpy_s(char *dest, size_t numberOfElements, return EINVAL; } - if(count!=_TRUNCATE && count<numberOfElements) + if(count!=MSVCRT__TRUNCATE && count<numberOfElements) end = count; else end = numberOfElements-1; @@ -598,12 +619,12 @@ int CDECL strncpy_s(char *dest, size_t numberOfElements, for(i=0; i<end && src[i]; i++) dest[i] = src[i]; - if(!src[i] || end==count || count==_TRUNCATE) { + if(!src[i] || end==count || count==MSVCRT__TRUNCATE) { dest[i] = '\0'; return 0; } - MSVCRT_INVALID_PMT("dest[numberOfElements] is too small", EINVAL); + MSVCRT_INVALID_PMT("dest[numberOfElements] is too small", MSVCRT_EINVAL); dest[0] = '\0'; - return EINVAL; + return MSVCRT_EINVAL; }

1 year, 11 months

[reactos] 01/01: [NTUSER] Check IME-like after WNDS_DESTROYED check (#5005)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d992c07239de9ab645f9d… commit d992c07239de9ab645f9d77986075abd8069d51d Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Mon Jan 23 12:22:54 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Jan 23 12:22:54 2023 +0900 [NTUSER] Check IME-like after WNDS_DESTROYED check (#5005) The guilty commit a2c6af0 enabled the IMM mode. So we have to take care of the default IME windows. Using IS_WND_IMELIKE against WNDS_DESTROYED window was the cause of BSoD. CORE-18777 --- win32ss/user/ntuser/window.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/win32ss/user/ntuser/window.c b/win32ss/user/ntuser/window.c index 2bdc64f6be9..142815a6884 100644 --- a/win32ss/user/ntuser/window.c +++ b/win32ss/user/ntuser/window.c @@ -2953,7 +2953,7 @@ BOOLEAN co_UserDestroyWindow(PVOID Object) * Check if this window is the Shell's Desktop Window. If so set hShellWindow to NULL */ - if ((ti != NULL) && (ti->pDeskInfo != NULL)) + if (ti->pDeskInfo != NULL) { if (ti->pDeskInfo->hShellWindow == hWnd) { @@ -2987,9 +2987,10 @@ BOOLEAN co_UserDestroyWindow(PVOID Object) /* Send destroy messages */ IntSendDestroyMsg(UserHMGetHandle(Window)); - // Destroy the default IME window if necessary + /* Destroy the default IME window if necessary */ if (IS_IMM_MODE() && !(ti->TIF_flags & TIF_INCLEANUP) && - ti->spwndDefaultIme && !IS_WND_IMELIKE(Window) && !(Window->state & WNDS_DESTROYED)) + ti->spwndDefaultIme && (ti->spwndDefaultIme != Window) && + !(Window->state & WNDS_DESTROYED) && !IS_WND_IMELIKE(Window)) { if (IS_WND_CHILD(Window)) {

1 year, 11 months

[reactos] 02/02: [USER32_WINETEST] Add test for WM_CONTEXTMENU from grandchild window

by Roy Tam

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1321c802fc9a34f007e3c… commit 1321c802fc9a34f007e3cee96ff4d9d0e212c03e Author: Roy Tam <roytam(a)gmail.com> AuthorDate: Sat Jan 21 21:05:28 2023 +0800 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Sun Jan 22 22:18:11 2023 +0300 [USER32_WINETEST] Add test for WM_CONTEXTMENU from grandchild window Cherry-picked from https://github.com/wine-mirror/wine/commit/3af8415ca9dc50e6c394c1001aad97db… --- modules/rostests/winetests/user32/msg.c | 29 +++++++++++++++++++++++++++-- 1 file changed, 27 insertions(+), 2 deletions(-) diff --git a/modules/rostests/winetests/user32/msg.c b/modules/rostests/winetests/user32/msg.c index ecc63baf6f7..6249c6f178d 100644 --- a/modules/rostests/winetests/user32/msg.c +++ b/modules/rostests/winetests/user32/msg.c @@ -112,6 +112,7 @@ typedef struct } MEASURE_ITEM_STRUCT; static BOOL test_DestroyWindow_flag; +static BOOL test_context_menu; static HWINEVENTHOOK hEvent_hook; static HHOOK hKBD_hook; static HHOOK hCBT_hook; @@ -9514,7 +9515,7 @@ static LRESULT MsgCheckProc (BOOL unicode, HWND hwnd, UINT message, return 0; } - if (message == WM_CONTEXTMENU) + if (!test_context_menu && message == WM_CONTEXTMENU) { /* don't create context menu */ return 0; @@ -15506,6 +15507,13 @@ static const struct message WmRestoreMinimizedOverlappedSeq[] = { 0 } }; +static struct message WmContextMenuSeq[] = { + { WM_CONTEXTMENU, sent|wparam, 0 }, /* wparams set in the code */ + { WM_CONTEXTMENU, sent|wparam|defwinproc, 0 }, + { WM_CONTEXTMENU, sent|wparam|defwinproc, 0 }, + { 0 } +}; + struct rbuttonup_thread_data { HWND hwnd; @@ -15527,7 +15535,7 @@ static DWORD CALLBACK post_rbuttonup_msg( void *arg ) static void test_defwinproc(void) { - HWND hwnd; + HWND hwnd, child[3]; MSG msg; BOOL gotwmquit = FALSE; POINT pos; @@ -15569,6 +15577,23 @@ static void test_defwinproc(void) ok_sequence(WmRestoreMinimizedOverlappedSeq, "DefWindowProcA(SC_RESTORE):overlapped", TRUE); flush_sequence(); + child[0] = CreateWindowExA(0, "TestWindowClass", "1st child", + WS_VISIBLE | WS_CHILD, 0,0,500,100, hwnd, 0, 0, NULL); + child[1] = CreateWindowExA(0, "TestWindowClass", "2nd child", + WS_VISIBLE | WS_CHILD, 0,0,500,100, child[0], 0, 0, NULL); + child[2] = CreateWindowExA(0, "TestWindowClass", "3rd child", + WS_VISIBLE | WS_CHILD, 0,0,500,100, child[1], 0, 0, NULL); + flush_events(); + flush_sequence(); + test_context_menu = TRUE; + DefWindowProcA(child[2], WM_CONTEXTMENU, 0xcafe, 0); + test_context_menu = FALSE; + WmContextMenuSeq[0].wParam = (WPARAM)child[2]; + WmContextMenuSeq[1].wParam = (WPARAM)child[1]; + WmContextMenuSeq[2].wParam = (WPARAM)child[0]; + ok_sequence(WmContextMenuSeq, "DefWindowProcA(WM_CONTEXTMENU)", FALSE); + DestroyWindow(child[0]); + GetCursorPos(&pos); GetWindowRect(hwnd, &rect); x = (rect.left+rect.right) / 2;

1 year, 11 months

[reactos] 01/02: [NTUSER][USER32] Set WM_CONTEXTMENU's wParam to the child window's handle

by Roy Tam

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0bab3a1048c7aba13e365… commit 0bab3a1048c7aba13e36540e6f8fc400835cc1a6 Author: Roy Tam <roytam(a)gmail.com> AuthorDate: Sat Jan 21 11:42:48 2023 +0800 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Sun Jan 22 22:18:11 2023 +0300 [NTUSER][USER32] Set WM_CONTEXTMENU's wParam to the child window's handle Cherry-picked from https://github.com/wine-mirror/wine/commit/3af8415ca9dc50e6c394c1001aad97db… CORE-18801 --- win32ss/user/ntuser/defwnd.c | 2 +- win32ss/user/user32/windows/defwnd.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/win32ss/user/ntuser/defwnd.c b/win32ss/user/ntuser/defwnd.c index 27929de7dbe..0faadbce3f9 100644 --- a/win32ss/user/ntuser/defwnd.c +++ b/win32ss/user/ntuser/defwnd.c @@ -738,7 +738,7 @@ IntDefWindowProc( { if (Wnd->style & WS_CHILD) { - co_IntSendMessage(UserHMGetHandle(IntGetParent(Wnd)), Msg, wParam, lParam); + co_IntSendMessage(UserHMGetHandle(IntGetParent(Wnd)), Msg, (WPARAM)UserHMGetHandle(Wnd), lParam); } else { diff --git a/win32ss/user/user32/windows/defwnd.c b/win32ss/user/user32/windows/defwnd.c index 2433178a49f..0a976bf50ee 100644 --- a/win32ss/user/user32/windows/defwnd.c +++ b/win32ss/user/user32/windows/defwnd.c @@ -390,11 +390,11 @@ User32DefWindowProc(HWND hWnd, { if (bUnicode) { - SendMessageW(GetParent(hWnd), Msg, wParam, lParam); + SendMessageW(GetParent(hWnd), Msg, (WPARAM)hWnd, lParam); } else { - SendMessageA(GetParent(hWnd), WM_CONTEXTMENU, wParam, lParam); + SendMessageA(GetParent(hWnd), Msg, (WPARAM)hWnd, lParam); } } else

1 year, 11 months

[reactos] 01/01: [OLEAUT32] OaBuildVersion: Add Windows Server 2003 case (#5004)

by Ratin Gao

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5b3b4151e2c4a49fb19b5… commit 5b3b4151e2c4a49fb19b5e16b327f79c5bde9d12 Author: Ratin Gao <ratin(a)knsoft.org> AuthorDate: Mon Jan 23 02:34:54 2023 +0800 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Jan 22 21:34:54 2023 +0300 [OLEAUT32] OaBuildVersion: Add Windows Server 2003 case (#5004) Fixes debug print in Visual Studio 6 PRO installation. CORE-18419 --- dll/win32/oleaut32/oleaut.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dll/win32/oleaut32/oleaut.c b/dll/win32/oleaut32/oleaut.c index 87606bbf344..c38bb09a893 100644 --- a/dll/win32/oleaut32/oleaut.c +++ b/dll/win32/oleaut32/oleaut.c @@ -660,6 +660,9 @@ ULONG WINAPI OaBuildVersion(void) case 0x00000005: /* W2K */ return MAKELONG(0xffff, 40); case 0x00000105: /* WinXP */ +#ifdef __REACTOS__ + case 0x00000205: /* Win2K3 */ +#endif /* __REACTOS__ */ case 0x00000006: /* Vista */ case 0x00000106: /* Win7 */ return MAKELONG(0xffff, 50);

1 year, 11 months

[reactos] 01/01: [ATL] CImage::Load(): Return E_FAIL without ATLASSERT on failure (#4993)

by Ratin Gao

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=21a168e574f8a64a2c47d… commit 21a168e574f8a64a2c47d5392a728ae934314195 Author: Ratin Gao <ratin(a)knsoft.org> AuthorDate: Mon Jan 23 01:38:16 2023 +0800 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Jan 22 20:38:16 2023 +0300 [ATL] CImage::Load(): Return E_FAIL without ATLASSERT on failure (#4993) Application won't be interrupted by ATLASSERT when image load failure happens, just like it was done in MS ATL. CORE-18589 --- sdk/lib/atl/atlimage.h | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/sdk/lib/atl/atlimage.h b/sdk/lib/atl/atlimage.h index f124c9a1483..f84d8cb5919 100644 --- a/sdk/lib/atl/atlimage.h +++ b/sdk/lib/atl/atlimage.h @@ -382,8 +382,10 @@ public: // create a GpBitmap object from file using namespace Gdiplus; GpBitmap *pBitmap = NULL; - GetCommon().CreateBitmapFromFile(pszNameW, &pBitmap); - ATLASSERT(pBitmap); + if (GetCommon().CreateBitmapFromFile(pszNameW, &pBitmap) != Ok) + { + return E_FAIL; + } // TODO & FIXME: get parameters (m_rgbTransColor etc.) @@ -407,8 +409,10 @@ public: // create GpBitmap from stream using namespace Gdiplus; GpBitmap *pBitmap = NULL; - GetCommon().CreateBitmapFromStream(pStream, &pBitmap); - ATLASSERT(pBitmap); + if (GetCommon().CreateBitmapFromStream(pStream, &pBitmap) != Ok) + { + return E_FAIL; + } // TODO & FIXME: get parameters (m_rgbTransColor etc.)

1 year, 11 months

[reactos] 01/01: [WIN32K:NTUSER] ValidateHwndNoErr: Fix window handle validation (#4981)

by Thamatip Chitpong

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=74c45e0975fe9d070ef0b… commit 74c45e0975fe9d070ef0b0903354a57357649d84 Author: Thamatip Chitpong <tangaming123456(a)outlook.com> AuthorDate: Sun Jan 22 21:44:52 2023 +0700 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Jan 22 17:44:52 2023 +0300 [WIN32K:NTUSER] ValidateHwndNoErr: Fix window handle validation (#4981) Also check window state. Addendum to 4d48b88b. --- win32ss/user/ntuser/window.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/win32ss/user/ntuser/window.c b/win32ss/user/ntuser/window.c index 1c2b0474c08..2bdc64f6be9 100644 --- a/win32ss/user/ntuser/window.c +++ b/win32ss/user/ntuser/window.c @@ -117,8 +117,16 @@ PWND FASTCALL VerifyWnd(PWND pWnd) PWND FASTCALL ValidateHwndNoErr(HWND hWnd) { - if (hWnd) return (PWND)UserGetObjectNoErr(gHandleTable, hWnd, TYPE_WINDOW); - return NULL; + PWND Window; + + if (!hWnd) + return NULL; + + Window = (PWND)UserGetObjectNoErr(gHandleTable, hWnd, TYPE_WINDOW); + if (!Window || (Window->state & WNDS_DESTROYED)) + return NULL; + + return Window; } /* Temp HACK */

1 year, 11 months

[reactos] 01/01: [NTOS:PNP] Avoid recursion when walking the device tree.

by Thomas Faber

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c0e7eaf4036fd23cf4fb7… commit c0e7eaf4036fd23cf4fb79d15d82150e3fd0e689 Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Sat Jan 14 17:40:14 2023 -0500 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Sun Jan 22 09:42:08 2023 -0500 [NTOS:PNP] Avoid recursion when walking the device tree. --- ntoskrnl/io/pnpmgr/plugplay.c | 55 +++++++++++++++++++++++++------------------ 1 file changed, 32 insertions(+), 23 deletions(-) diff --git a/ntoskrnl/io/pnpmgr/plugplay.c b/ntoskrnl/io/pnpmgr/plugplay.c index 192612c66a2..46585458b84 100644 --- a/ntoskrnl/io/pnpmgr/plugplay.c +++ b/ntoskrnl/io/pnpmgr/plugplay.c @@ -18,6 +18,12 @@ typedef struct _PNP_EVENT_ENTRY PLUGPLAY_EVENT_BLOCK Event; } PNP_EVENT_ENTRY, *PPNP_EVENT_ENTRY; +typedef struct _IOP_FIND_DEVICE_INSTANCE_TRAVERSE_CONTEXT +{ + PCUNICODE_STRING InstancePath; + PDEVICE_OBJECT DeviceObject; +} IOP_FIND_DEVICE_INSTANCE_TRAVERSE_CONTEXT, *PIOP_FIND_DEVICE_INSTANCE_TRAVERSE_CONTEXT; + /* GLOBALS *******************************************************************/ @@ -88,39 +94,32 @@ IopQueueTargetDeviceEvent(const GUID *Guid, return STATUS_SUCCESS; } - -static PDEVICE_OBJECT -IopTraverseDeviceNode(PDEVICE_NODE Node, PUNICODE_STRING DeviceInstance) +NTSTATUS +IopFindDeviceInstanceTraverse( + _In_ PDEVICE_NODE DeviceNode, + _Inout_ PVOID Context) { - PDEVICE_OBJECT DeviceObject; - PDEVICE_NODE ChildNode; + PIOP_FIND_DEVICE_INSTANCE_TRAVERSE_CONTEXT DeviceInstanceContext = Context; - if (RtlEqualUnicodeString(&Node->InstancePath, - DeviceInstance, TRUE)) + if (RtlEqualUnicodeString(&DeviceNode->InstancePath, + DeviceInstanceContext->InstancePath, TRUE)) { - ObReferenceObject(Node->PhysicalDeviceObject); - return Node->PhysicalDeviceObject; - } + ObReferenceObject(DeviceNode->PhysicalDeviceObject); + DeviceInstanceContext->DeviceObject = DeviceNode->PhysicalDeviceObject; - /* Traversal of all children nodes */ - for (ChildNode = Node->Child; - ChildNode != NULL; - ChildNode = ChildNode->Sibling) - { - DeviceObject = IopTraverseDeviceNode(ChildNode, DeviceInstance); - if (DeviceObject != NULL) - { - return DeviceObject; - } + /* Stop enumeration */ + return STATUS_UNSUCCESSFUL; } - return NULL; + return STATUS_SUCCESS; } - PDEVICE_OBJECT IopGetDeviceObjectFromDeviceInstance(PUNICODE_STRING DeviceInstance) { + DEVICETREE_TRAVERSE_CONTEXT Context; + IOP_FIND_DEVICE_INSTANCE_TRAVERSE_CONTEXT DeviceInstanceContext; + if (IopRootDeviceNode == NULL) return NULL; @@ -136,7 +135,17 @@ IopGetDeviceObjectFromDeviceInstance(PUNICODE_STRING DeviceInstance) return NULL; } - return IopTraverseDeviceNode(IopRootDeviceNode, DeviceInstance); + /* Traverse the device tree to find the matching device node */ + DeviceInstanceContext.InstancePath = DeviceInstance; + DeviceInstanceContext.DeviceObject = NULL; + IopInitDeviceTreeTraverseContext(&Context, + IopRootDeviceNode, + IopFindDeviceInstanceTraverse, + &DeviceInstanceContext); + (void)IopTraverseDeviceTree(&Context); + + /* In case of error or instance not found, this will still be NULL from above. */ + return DeviceInstanceContext.DeviceObject; } static NTSTATUS

1 year, 11 months

[reactos] 01/01: [PCI] Fix I/O range size of the resource descriptors

by Dmitry Borisov

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3dd3d1053123cb750dbc6… commit 3dd3d1053123cb750dbc6b9fb8728f58b6327705 Author: Dmitry Borisov <di.sean(a)protonmail.com> AuthorDate: Wed Jan 4 22:58:39 2023 +0600 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Sat Jan 21 07:33:03 2023 +0100 [PCI] Fix I/O range size of the resource descriptors Fixes incorrect PCI IDE resources in VPC 2007 CORE-17256 --- drivers/bus/pci/pdo.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/drivers/bus/pci/pdo.c b/drivers/bus/pci/pdo.c index 139aed69439..88576bbaa26 100644 --- a/drivers/bus/pci/pdo.c +++ b/drivers/bus/pci/pdo.c @@ -283,6 +283,7 @@ PdoGetRangeLength(PPDO_DEVICE_EXTENSION DeviceExtension, ULONGLONG Bar; } NewValue; ULONG Offset; + ULONGLONG Size; /* Compute the offset of this BAR in PCI config space */ Offset = 0x10 + Bar * 4; @@ -359,9 +360,10 @@ PdoGetRangeLength(PPDO_DEVICE_EXTENSION DeviceExtension, ? (OriginalValue.Bar & PCI_ADDRESS_IO_ADDRESS_MASK_64) : (OriginalValue.Bar & PCI_ADDRESS_MEMORY_ADDRESS_MASK_64)); - *Length = ~((NewValue.Bar & PCI_ADDRESS_IO_SPACE) - ? (NewValue.Bar & PCI_ADDRESS_IO_ADDRESS_MASK_64) - : (NewValue.Bar & PCI_ADDRESS_MEMORY_ADDRESS_MASK_64)) + 1; + Size = (NewValue.Bar & PCI_ADDRESS_IO_SPACE) + ? (NewValue.Bar & PCI_ADDRESS_IO_ADDRESS_MASK_64) + : (NewValue.Bar & PCI_ADDRESS_MEMORY_ADDRESS_MASK_64); + *Length = Size & ~(Size - 1); *Flags = (NewValue.Bar & PCI_ADDRESS_IO_SPACE) ? (NewValue.Bar & ~PCI_ADDRESS_IO_ADDRESS_MASK_64)

1 year, 11 months

[reactos] 01/01: [COMPBATT] Add inf entry. CORE-18167

by Thomas Faber

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d3a718eb01b47b8a6f3cd… commit d3a718eb01b47b8a6f3cdc2460c8ebb9dcf7c723 Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Fri Jan 20 23:58:18 2023 -0500 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Sat Jan 21 00:10:06 2023 -0500 [COMPBATT] Add inf entry. CORE-18167 --- drivers/bus/acpi/acpi.inf | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/drivers/bus/acpi/acpi.inf b/drivers/bus/acpi/acpi.inf index b1b94764d30..7fcafbfa630 100644 --- a/drivers/bus/acpi/acpi.inf +++ b/drivers/bus/acpi/acpi.inf @@ -19,6 +19,7 @@ DefaultDestDir = 12 [GenericMfg] %*PNP0C08.DeviceDesc% = ACPI_Inst,*PNP0C08 +%COMPOSITE_BATTERY.DeviceDesc% = CompBatt_Inst,COMPOSITE_BATTERY ;------------------------------ ACPI DRIVER ----------------------------- @@ -38,6 +39,24 @@ ErrorControl = 1 ServiceBinary = %12%\acpi.sys LoadOrderGroup = Boot Bus Extender +;---------------------------- COMPBATT DRIVER --------------------------- + +[CompBatt_Inst.NT] +CopyFiles = CompBatt_CopyFiles.NT + +[CompBatt_CopyFiles.NT] +compbatt.sys + +[CompBatt_Inst.NT.Services] +AddService = compbatt, 0x00000002, compbatt_Service_Inst + +[compbatt_Service_Inst] +ServiceType = 1 +StartType = 0 +ErrorControl = 1 +ServiceBinary = %12%\compbatt.sys +LoadOrderGroup = System Bus Extender + ;-------------------------------- STRINGS ------------------------------- [Strings] @@ -47,6 +66,7 @@ ReactOS = "ReactOS Project" ; Localizable GenericMfg = "(Generic system devices)" *PNP0C08.DeviceDesc = "ACPI hardware" +COMPOSITE_BATTERY.DeviceDesc = "Composite battery" [Strings.0405] GenericMfg = "(Generická systémová zařízení)"

1 year, 11 months

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs January 2023