Ros-diffs

ros-diffs@reactos.org

81390 discussions

[pschweitzer] 69681: [CRT_APITEST] Add more tests CORE-10390
by pschweitzer＠svn.reactos.org 25 Oct '15

25 Oct '15

Author: pschweitzer Date: Sun Oct 25 07:42:34 2015 New Revision: 69681 URL: http://svn.reactos.org/svn/reactos?rev=69681&view=rev Log: [CRT_APITEST] Add more tests CORE-10390 Modified: trunk/rostests/apitests/crt/mbstowcs.c trunk/rostests/apitests/crt/wcstombs.c Modified: trunk/rostests/apitests/crt/mbstowcs.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/crt/mbstowcs.c?r… ============================================================================== --- trunk/rostests/apitests/crt/mbstowcs.c [iso-8859-1] (original) +++ trunk/rostests/apitests/crt/mbstowcs.c [iso-8859-1] Sun Oct 25 07:42:34 2015 @@ -12,14 +12,26 @@ #include <specstrings.h> #define StrROS "ReactOS" - +#define LStrROS L"ReactOS" START_TEST(mbstowcs) { size_t len; + wchar_t out[ARRAYSIZE(LStrROS)]; - len = mbstowcs(NULL, StrROS, sizeof(StrROS) / sizeof(StrROS[0])); + len = mbstowcs(NULL, StrROS, 0); ok(len == 7, "Got len = %u, excepting 7\n", len); - len = mbstowcs(NULL, StrROS, sizeof(StrROS) / sizeof(StrROS[0]) - 1); + len = mbstowcs(NULL, StrROS, 0); ok(len == 7, "Got len = %u, excepting 7\n", len); + len = mbstowcs(NULL, StrROS, ARRAYSIZE(out)); + ok(len == 7, "Got len = %u, excepting 7\n", len); + len = mbstowcs(NULL, StrROS, ARRAYSIZE(out)); + ok(len == 7, "Got len = %u, excepting 7\n", len); + len = mbstowcs(out, StrROS, ARRAYSIZE(out)); + ok(len == 7, "Got len = %u, excepting 7\n", len); + ok_wstr(out, LStrROS); + memset(out, 0, sizeof(out)); + len = mbstowcs(out, StrROS, ARRAYSIZE(out)); + ok(len == 7, "Got len = %u, excepting 7\n", len); + ok_wstr(out, LStrROS); } Modified: trunk/rostests/apitests/crt/wcstombs.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/crt/wcstombs.c?r… ============================================================================== --- trunk/rostests/apitests/crt/wcstombs.c [iso-8859-1] (original) +++ trunk/rostests/apitests/crt/wcstombs.c [iso-8859-1] Sun Oct 25 07:42:34 2015 @@ -11,15 +11,27 @@ #include <stdlib.h> #include <specstrings.h> -#define StrROS L"ReactOS" - +#define LStrROS L"ReactOS" +#define StrROS "ReactOS" START_TEST(wcstombs) { size_t len; + char out[ARRAYSIZE(StrROS)]; - len = wcstombs(NULL, StrROS, sizeof(StrROS) / sizeof(StrROS[0])); + len = wcstombs(NULL, LStrROS, 0); ok(len == 7, "Got len = %u, excepting 7\n", len); - len = wcstombs(NULL, StrROS, sizeof(StrROS) / sizeof(StrROS[0]) - 1); + len = wcstombs(NULL, LStrROS, 0); ok(len == 7, "Got len = %u, excepting 7\n", len); + len = wcstombs(NULL, LStrROS, ARRAYSIZE(out)); + ok(len == 7, "Got len = %u, excepting 7\n", len); + len = wcstombs(NULL, LStrROS, ARRAYSIZE(out)); + ok(len == 7, "Got len = %u, excepting 7\n", len); + len = wcstombs(out, LStrROS, ARRAYSIZE(out)); + ok(len == 7, "Got len = %u, excepting 7\n", len); + ok_str(out, StrROS); + memset(out, 0, sizeof(out)); + len = wcstombs(out, LStrROS, ARRAYSIZE(out)); + ok(len == 7, "Got len = %u, excepting 7\n", len); + ok_str(out, StrROS); }

1 0

[pschweitzer] 69680: [CRT_APITEST] Add a few tests to show mbstowcs/wcstombs behavior will NULL ptr. CORE-10390
by pschweitzer＠svn.reactos.org 24 Oct '15

24 Oct '15

Author: pschweitzer Date: Sat Oct 24 23:18:33 2015 New Revision: 69680 URL: http://svn.reactos.org/svn/reactos?rev=69680&view=rev Log: [CRT_APITEST] Add a few tests to show mbstowcs/wcstombs behavior will NULL ptr. CORE-10390 Added: trunk/rostests/apitests/crt/mbstowcs.c (with props) trunk/rostests/apitests/crt/wcstombs.c (with props) Modified: trunk/rostests/apitests/crt/crtdll_crt_apitest.cmake trunk/rostests/apitests/crt/msvcrt_crt_apitest.cmake trunk/rostests/apitests/crt/ntdll_crt_apitest.cmake trunk/rostests/apitests/crt/testlist.c Modified: trunk/rostests/apitests/crt/crtdll_crt_apitest.cmake URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/crt/crtdll_crt_a… ============================================================================== --- trunk/rostests/apitests/crt/crtdll_crt_apitest.cmake [iso-8859-1] (original) +++ trunk/rostests/apitests/crt/crtdll_crt_apitest.cmake [iso-8859-1] Sat Oct 24 23:18:33 2015 @@ -425,7 +425,7 @@ # longjmp.c # malloc.c # mblen.c -# mbstowcs.c + mbstowcs.c # mbtowc.c # memchr.c # memcmp.c @@ -517,7 +517,7 @@ # wcstod.c # wcstok.c # wcstol.c -# wcstombs.c + wcstombs.c # wcstoul.c # wcsxfrm.c # wctomb.c Added: trunk/rostests/apitests/crt/mbstowcs.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/crt/mbstowcs.c?r… ============================================================================== --- trunk/rostests/apitests/crt/mbstowcs.c (added) +++ trunk/rostests/apitests/crt/mbstowcs.c [iso-8859-1] Sat Oct 24 23:18:33 2015 @@ -0,0 +1,25 @@ +/* + * PROJECT: ReactOS api tests + * LICENSE: GPL - See COPYING in the top level directory + * PURPOSE: Test for mbstowcs + */ + +#include <apitest.h> + +#define WIN32_NO_STATUS +#include <stdio.h> +#include <stdlib.h> +#include <specstrings.h> + +#define StrROS "ReactOS" + + +START_TEST(mbstowcs) +{ + size_t len; + + len = mbstowcs(NULL, StrROS, sizeof(StrROS) / sizeof(StrROS[0])); + ok(len == 7, "Got len = %u, excepting 7\n", len); + len = mbstowcs(NULL, StrROS, sizeof(StrROS) / sizeof(StrROS[0]) - 1); + ok(len == 7, "Got len = %u, excepting 7\n", len); +} Propchange: trunk/rostests/apitests/crt/mbstowcs.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rostests/apitests/crt/msvcrt_crt_apitest.cmake URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/crt/msvcrt_crt_a… ============================================================================== --- trunk/rostests/apitests/crt/msvcrt_crt_apitest.cmake [iso-8859-1] (original) +++ trunk/rostests/apitests/crt/msvcrt_crt_apitest.cmake [iso-8859-1] Sat Oct 24 23:18:33 2015 @@ -1117,7 +1117,7 @@ # mbsdup_dbg # mbsrtowcs # mbsrtowcs_s -# mbstowcs.c + mbstowcs.c # mbstowcs_s Not exported in 2k3 Sp1 # mbtowc.c # memchr.c @@ -1250,7 +1250,7 @@ # wcstok.c # wcstok_s.c # wcstol.c -# wcstombs.c + wcstombs.c # wcstombs_s.c Not exported in 2k3 Sp1 # wcstoul.c # wcsxfrm.c Modified: trunk/rostests/apitests/crt/ntdll_crt_apitest.cmake URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/crt/ntdll_crt_ap… ============================================================================== --- trunk/rostests/apitests/crt/ntdll_crt_apitest.cmake [iso-8859-1] (original) +++ trunk/rostests/apitests/crt/ntdll_crt_apitest.cmake [iso-8859-1] Sat Oct 24 23:18:33 2015 @@ -71,7 +71,7 @@ # isxdigit.c # labs.c # log.c -# mbstowcs.c + mbstowcs.c # memchr.c # memcmp.c # memcpy == memmove @@ -120,7 +120,7 @@ # wcsstr.c # wcstok.c # wcstol.c -# wcstombs.c + wcstombs.c # wcstoul.c ) Modified: trunk/rostests/apitests/crt/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/crt/testlist.c?r… ============================================================================== --- trunk/rostests/apitests/crt/testlist.c [iso-8859-1] (original) +++ trunk/rostests/apitests/crt/testlist.c [iso-8859-1] Sat Oct 24 23:18:33 2015 @@ -12,15 +12,19 @@ #endif extern void func__vsnprintf(void); extern void func__vsnwprintf(void); +extern void func_mbstowcs(void); extern void func_sprintf(void); extern void func_strcpy(void); +extern void func_wcstombs(void); const struct test winetest_testlist[] = { { "_vsnprintf", func__vsnprintf }, { "_vsnwprintf", func__vsnwprintf }, + { "mbstowcs", func_mbstowcs }, { "sprintf", func_sprintf }, { "strcpy", func_strcpy }, + { "wcstombs", func_wcstombs }, #if defined(TEST_CRTDLL) || defined(TEST_MSVCRT) || defined(TEST_STATIC_CRT) // ... #endif Added: trunk/rostests/apitests/crt/wcstombs.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/crt/wcstombs.c?r… ============================================================================== --- trunk/rostests/apitests/crt/wcstombs.c (added) +++ trunk/rostests/apitests/crt/wcstombs.c [iso-8859-1] Sat Oct 24 23:18:33 2015 @@ -0,0 +1,25 @@ +/* + * PROJECT: ReactOS api tests + * LICENSE: GPL - See COPYING in the top level directory + * PURPOSE: Test for wcstombs + */ + +#include <apitest.h> + +#define WIN32_NO_STATUS +#include <stdio.h> +#include <stdlib.h> +#include <specstrings.h> + +#define StrROS L"ReactOS" + + +START_TEST(wcstombs) +{ + size_t len; + + len = wcstombs(NULL, StrROS, sizeof(StrROS) / sizeof(StrROS[0])); + ok(len == 7, "Got len = %u, excepting 7\n", len); + len = wcstombs(NULL, StrROS, sizeof(StrROS) / sizeof(StrROS[0]) - 1); + ok(len == 7, "Got len = %u, excepting 7\n", len); +} Propchange: trunk/rostests/apitests/crt/wcstombs.c ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[tfaber] 69679: [WIN32K:NTUSER] - Make CaretInfo part of the USER_MESSAGE_QUEUE structure since the pointer can no longer change CORE-10395
by tfaber＠svn.reactos.org 24 Oct '15

24 Oct '15

Author: tfaber Date: Sat Oct 24 15:46:34 2015 New Revision: 69679 URL: http://svn.reactos.org/svn/reactos?rev=69679&view=rev Log: [WIN32K:NTUSER] - Make CaretInfo part of the USER_MESSAGE_QUEUE structure since the pointer can no longer change CORE-10395 Modified: trunk/reactos/win32ss/user/ntuser/caret.c trunk/reactos/win32ss/user/ntuser/input.c trunk/reactos/win32ss/user/ntuser/misc.c trunk/reactos/win32ss/user/ntuser/msgqueue.c trunk/reactos/win32ss/user/ntuser/msgqueue.h trunk/reactos/win32ss/user/ntuser/scrollex.c trunk/reactos/win32ss/user/ntuser/window.c Modified: trunk/reactos/win32ss/user/ntuser/caret.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/caret.… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/caret.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/caret.c [iso-8859-1] Sat Oct 24 15:46:34 2015 @@ -101,7 +101,7 @@ pti = PsGetCurrentThreadWin32Thread(); ThreadQueue = pti->MessageQueue; - if (ThreadQueue->CaretInfo->hWnd != hwnd) + if (ThreadQueue->CaretInfo.hWnd != hwnd) { TRACE("Not the same caret window!\n"); return; @@ -126,8 +126,8 @@ { case IDCARETTIMER: { - ThreadQueue->CaretInfo->Showing = (ThreadQueue->CaretInfo->Showing ? 0 : 1); - co_IntDrawCaret(pWnd, ThreadQueue->CaretInfo); + ThreadQueue->CaretInfo.Showing = (ThreadQueue->CaretInfo.Showing ? 0 : 1); + co_IntDrawCaret(pWnd, &ThreadQueue->CaretInfo); } } return; @@ -155,18 +155,18 @@ { PUSER_MESSAGE_QUEUE ThreadQueue; PWND pWnd; - ThreadQueue = (PUSER_MESSAGE_QUEUE)Win32Thread->MessageQueue; - - if(!ThreadQueue || !ThreadQueue->CaretInfo) - return FALSE; - - pWnd = ValidateHwndNoErr(ThreadQueue->CaretInfo->hWnd); - co_IntHideCaret(ThreadQueue->CaretInfo); - ThreadQueue->CaretInfo->Bitmap = (HBITMAP)0; - ThreadQueue->CaretInfo->hWnd = (HWND)0; - ThreadQueue->CaretInfo->Size.cx = ThreadQueue->CaretInfo->Size.cy = 0; - ThreadQueue->CaretInfo->Showing = 0; - ThreadQueue->CaretInfo->Visible = 0; + ThreadQueue = Win32Thread->MessageQueue; + + if (!ThreadQueue) + return FALSE; + + pWnd = ValidateHwndNoErr(ThreadQueue->CaretInfo.hWnd); + co_IntHideCaret(&ThreadQueue->CaretInfo); + ThreadQueue->CaretInfo.Bitmap = (HBITMAP)0; + ThreadQueue->CaretInfo.hWnd = (HWND)0; + ThreadQueue->CaretInfo.Size.cx = ThreadQueue->CaretInfo.Size.cy = 0; + ThreadQueue->CaretInfo.Showing = 0; + ThreadQueue->CaretInfo.Visible = 0; if (pWnd) { IntNotifyWinEvent(EVENT_OBJECT_DESTROY, pWnd, OBJID_CARET, CHILDID_SELF, 0); @@ -201,16 +201,16 @@ pti = PsGetCurrentThreadWin32Thread(); ThreadQueue = pti->MessageQueue; - if(ThreadQueue->CaretInfo->hWnd) - { - pWnd = UserGetWindowObject(ThreadQueue->CaretInfo->hWnd); - if(ThreadQueue->CaretInfo->Pos.x != X || ThreadQueue->CaretInfo->Pos.y != Y) - { - co_IntHideCaret(ThreadQueue->CaretInfo); - ThreadQueue->CaretInfo->Showing = 1; - ThreadQueue->CaretInfo->Pos.x = X; - ThreadQueue->CaretInfo->Pos.y = Y; - co_IntDrawCaret(pWnd, ThreadQueue->CaretInfo); + if(ThreadQueue->CaretInfo.hWnd) + { + pWnd = UserGetWindowObject(ThreadQueue->CaretInfo.hWnd); + if(ThreadQueue->CaretInfo.Pos.x != X || ThreadQueue->CaretInfo.Pos.y != Y) + { + co_IntHideCaret(&ThreadQueue->CaretInfo); + ThreadQueue->CaretInfo.Showing = 1; + ThreadQueue->CaretInfo.Pos.x = X; + ThreadQueue->CaretInfo.Pos.y = Y; + co_IntDrawCaret(pWnd, &ThreadQueue->CaretInfo); IntSetTimer(pWnd, IDCARETTIMER, gpsi->dtCaretBlink, CaretSystemTimerProc, TMRF_SYSTEM); IntNotifyWinEvent(EVENT_OBJECT_LOCATIONCHANGE, pWnd, OBJID_CARET, CHILDID_SELF, 0); @@ -237,20 +237,20 @@ pti = PsGetCurrentThreadWin32Thread(); ThreadQueue = pti->MessageQueue; - if(Window && ThreadQueue->CaretInfo->hWnd != Window->head.h) + if(Window && ThreadQueue->CaretInfo.hWnd != Window->head.h) { EngSetLastError(ERROR_ACCESS_DENIED); return FALSE; } - if(ThreadQueue->CaretInfo->Visible) - { - PWND pwnd = UserGetWindowObject(ThreadQueue->CaretInfo->hWnd); + if(ThreadQueue->CaretInfo.Visible) + { + PWND pwnd = UserGetWindowObject(ThreadQueue->CaretInfo.hWnd); IntKillTimer(pwnd, IDCARETTIMER, TRUE); - co_IntHideCaret(ThreadQueue->CaretInfo); - ThreadQueue->CaretInfo->Visible = 0; - ThreadQueue->CaretInfo->Showing = 0; + co_IntHideCaret(&ThreadQueue->CaretInfo); + ThreadQueue->CaretInfo.Visible = 0; + ThreadQueue->CaretInfo.Showing = 0; } return TRUE; @@ -273,17 +273,17 @@ pti = PsGetCurrentThreadWin32Thread(); ThreadQueue = pti->MessageQueue; - if(Window && ThreadQueue->CaretInfo->hWnd != Window->head.h) + if(Window && ThreadQueue->CaretInfo.hWnd != Window->head.h) { EngSetLastError(ERROR_ACCESS_DENIED); return FALSE; } - if (!ThreadQueue->CaretInfo->Visible) - { - ThreadQueue->CaretInfo->Visible = 1; - pWnd = ValidateHwndNoErr(ThreadQueue->CaretInfo->hWnd); - if (!ThreadQueue->CaretInfo->Showing && pWnd) + if (!ThreadQueue->CaretInfo.Visible) + { + ThreadQueue->CaretInfo.Visible = 1; + pWnd = ValidateHwndNoErr(ThreadQueue->CaretInfo.hWnd); + if (!ThreadQueue->CaretInfo.Showing && pWnd) { IntNotifyWinEvent(EVENT_OBJECT_SHOW, pWnd, OBJID_CARET, OBJID_CARET, 0); } @@ -324,17 +324,17 @@ pti = PsGetCurrentThreadWin32Thread(); ThreadQueue = pti->MessageQueue; - if (ThreadQueue->CaretInfo->Visible) + if (ThreadQueue->CaretInfo.Visible) { IntKillTimer(Window, IDCARETTIMER, TRUE); - co_IntHideCaret(ThreadQueue->CaretInfo); - } - - ThreadQueue->CaretInfo->hWnd = hWnd; + co_IntHideCaret(&ThreadQueue->CaretInfo); + } + + ThreadQueue->CaretInfo.hWnd = hWnd; if(hBitmap) { - ThreadQueue->CaretInfo->Bitmap = hBitmap; - ThreadQueue->CaretInfo->Size.cx = ThreadQueue->CaretInfo->Size.cy = 0; + ThreadQueue->CaretInfo.Bitmap = hBitmap; + ThreadQueue->CaretInfo.Size.cx = ThreadQueue->CaretInfo.Size.cy = 0; } else { @@ -346,12 +346,12 @@ { nHeight = UserGetSystemMetrics(SM_CYBORDER); } - ThreadQueue->CaretInfo->Bitmap = (HBITMAP)0; - ThreadQueue->CaretInfo->Size.cx = nWidth; - ThreadQueue->CaretInfo->Size.cy = nHeight; - } - ThreadQueue->CaretInfo->Visible = 0; - ThreadQueue->CaretInfo->Showing = 0; + ThreadQueue->CaretInfo.Bitmap = (HBITMAP)0; + ThreadQueue->CaretInfo.Size.cx = nWidth; + ThreadQueue->CaretInfo.Size.cy = nHeight; + } + ThreadQueue->CaretInfo.Visible = 0; + ThreadQueue->CaretInfo.Showing = 0; IntSetTimer( Window, IDCARETTIMER, gpsi->dtCaretBlink, CaretSystemTimerProc, TMRF_SYSTEM ); @@ -396,7 +396,7 @@ pti = PsGetCurrentThreadWin32Thread(); ThreadQueue = pti->MessageQueue; - Status = MmCopyToCaller(lpPoint, &(ThreadQueue->CaretInfo->Pos), sizeof(POINT)); + Status = MmCopyToCaller(lpPoint, &ThreadQueue->CaretInfo.Pos, sizeof(POINT)); if(!NT_SUCCESS(Status)) { SetLastNtError(Status); Modified: trunk/reactos/win32ss/user/ntuser/input.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/input.… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/input.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/input.c [iso-8859-1] Sat Oct 24 15:46:34 2015 @@ -524,9 +524,9 @@ ptiTo->MessageQueue->spwndFocus = ptiFrom->MessageQueue->spwndFocus; ptiTo->MessageQueue->spwndCapture = ptiFrom->MessageQueue->spwndCapture; ptiTo->MessageQueue->QF_flags ^= ((ptiTo->MessageQueue->QF_flags ^ ptiFrom->MessageQueue->QF_flags) & QF_CAPTURELOCKED); - RtlCopyMemory(ptiTo->MessageQueue->CaretInfo, - ptiFrom->MessageQueue->CaretInfo, - sizeof(*ptiTo->MessageQueue->CaretInfo)); + RtlCopyMemory(&ptiTo->MessageQueue->CaretInfo, + &ptiFrom->MessageQueue->CaretInfo, + sizeof(ptiTo->MessageQueue->CaretInfo)); IntSetFocusMessageQueue(NULL); IntSetFocusMessageQueue(ptiTo->MessageQueue); gptiForeground = ptiTo; Modified: trunk/reactos/win32ss/user/ntuser/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/misc.c… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/misc.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/misc.c [iso-8859-1] Sat Oct 24 15:46:34 2015 @@ -394,7 +394,7 @@ if ( Desktop ) MsgQueue = Desktop->ActiveMessageQueue; } - CaretInfo = MsgQueue->CaretInfo; + CaretInfo = &MsgQueue->CaretInfo; SafeGui.flags = (CaretInfo->Visible ? GUI_CARETBLINKING : 0); /* Modified: trunk/reactos/win32ss/user/ntuser/msgqueue.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/msgque… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/msgqueue.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/msgqueue.c [iso-8859-1] Sat Oct 24 15:46:34 2015 @@ -2080,7 +2080,6 @@ BOOLEAN FASTCALL MsqInitializeMessageQueue(PTHREADINFO pti, PUSER_MESSAGE_QUEUE MessageQueue) { - MessageQueue->CaretInfo = (PTHRDCARETINFO)(MessageQueue + 1); InitializeListHead(&MessageQueue->HardwareMessagesListHead); // Keep here! MessageQueue->spwndFocus = NULL; MessageQueue->iCursorLevel = 0; @@ -2269,16 +2268,16 @@ { PUSER_MESSAGE_QUEUE MessageQueue; - MessageQueue = (PUSER_MESSAGE_QUEUE)ExAllocatePoolWithTag(NonPagedPool, - sizeof(USER_MESSAGE_QUEUE) + sizeof(THRDCARETINFO), - USERTAG_Q); + MessageQueue = ExAllocatePoolWithTag(NonPagedPool, + sizeof(*MessageQueue), + USERTAG_Q); if (!MessageQueue) { return NULL; } - RtlZeroMemory(MessageQueue, sizeof(USER_MESSAGE_QUEUE) + sizeof(THRDCARETINFO)); + RtlZeroMemory(MessageQueue, sizeof(*MessageQueue)); /* hold at least one reference until it'll be destroyed */ IntReferenceMessageQueue(MessageQueue); /* initialize the queue */ @@ -2406,9 +2405,8 @@ MessageQueue->MoveSize = hWnd; return Prev; case MSQ_STATE_CARET: - ASSERT(MessageQueue->CaretInfo); - Prev = MessageQueue->CaretInfo->hWnd; - MessageQueue->CaretInfo->hWnd = hWnd; + Prev = MessageQueue->CaretInfo.hWnd; + MessageQueue->CaretInfo.hWnd = hWnd; return Prev; } Modified: trunk/reactos/win32ss/user/ntuser/msgqueue.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/msgque… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/msgqueue.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/msgqueue.h [iso-8859-1] Sat Oct 24 15:46:34 2015 @@ -67,8 +67,6 @@ HWND MenuOwner; /* Identifes the menu state */ BYTE MenuState; - /* Caret information for this queue */ - PTHRDCARETINFO CaretInfo; /* Message Queue Flags */ DWORD QF_flags; DWORD cThreads; // Shared message queue counter. @@ -85,6 +83,8 @@ /* Cursor object */ PCURICON_OBJECT CursorObject; + /* Caret information for this queue */ + THRDCARETINFO CaretInfo; } USER_MESSAGE_QUEUE, *PUSER_MESSAGE_QUEUE; #define QF_UPDATEKEYSTATE 0x00000001 Modified: trunk/reactos/win32ss/user/ntuser/scrollex.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/scroll… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/scrollex.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/scrollex.c [iso-8859-1] Sat Oct 24 15:46:34 2015 @@ -27,7 +27,7 @@ Desktop = pti->rpdesk; ActiveMessageQueue = Desktop->ActiveMessageQueue; if (!ActiveMessageQueue) return 0; - CaretInfo = ActiveMessageQueue->CaretInfo; + CaretInfo = &ActiveMessageQueue->CaretInfo; hWndCaret = CaretInfo->hWnd; WndCaret = ValidateHwndNoErr(hWndCaret); Modified: trunk/reactos/win32ss/user/ntuser/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/window… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/window.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/window.c [iso-8859-1] Sat Oct 24 15:46:34 2015 @@ -417,7 +417,7 @@ } } - if (ti->MessageQueue->CaretInfo->hWnd == UserHMGetHandle(Window)) + if (ti->MessageQueue->CaretInfo.hWnd == UserHMGetHandle(Window)) { co_IntDestroyCaret(ti); }

1 0

[tfaber] 69678: [WIN32K:NTUSER] - Copy the right size... CORE-10395
by tfaber＠svn.reactos.org 24 Oct '15

24 Oct '15

Author: tfaber Date: Sat Oct 24 15:14:09 2015 New Revision: 69678 URL: http://svn.reactos.org/svn/reactos?rev=69678&view=rev Log: [WIN32K:NTUSER] - Copy the right size... CORE-10395 Modified: trunk/reactos/win32ss/user/ntuser/input.c Modified: trunk/reactos/win32ss/user/ntuser/input.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/input.… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/input.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/input.c [iso-8859-1] Sat Oct 24 15:14:09 2015 @@ -526,7 +526,7 @@ ptiTo->MessageQueue->QF_flags ^= ((ptiTo->MessageQueue->QF_flags ^ ptiFrom->MessageQueue->QF_flags) & QF_CAPTURELOCKED); RtlCopyMemory(ptiTo->MessageQueue->CaretInfo, ptiFrom->MessageQueue->CaretInfo, - sizeof(ptiTo->MessageQueue->CaretInfo)); + sizeof(*ptiTo->MessageQueue->CaretInfo)); IntSetFocusMessageQueue(NULL); IntSetFocusMessageQueue(ptiTo->MessageQueue); gptiForeground = ptiTo;

1 0

[tfaber] 69677: [WIN32K:NTUSER] - In UserAttachThreadInput, copy the CaretInfo structure instead of saving a pointer that may be freed right after CORE-10395 #resolve
by tfaber＠svn.reactos.org 24 Oct '15

24 Oct '15

Author: tfaber Date: Sat Oct 24 15:04:12 2015 New Revision: 69677 URL: http://svn.reactos.org/svn/reactos?rev=69677&view=rev Log: [WIN32K:NTUSER] - In UserAttachThreadInput, copy the CaretInfo structure instead of saving a pointer that may be freed right after CORE-10395 #resolve Modified: trunk/reactos/win32ss/user/ntuser/input.c Modified: trunk/reactos/win32ss/user/ntuser/input.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/input.… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/input.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/input.c [iso-8859-1] Sat Oct 24 15:04:12 2015 @@ -524,7 +524,9 @@ ptiTo->MessageQueue->spwndFocus = ptiFrom->MessageQueue->spwndFocus; ptiTo->MessageQueue->spwndCapture = ptiFrom->MessageQueue->spwndCapture; ptiTo->MessageQueue->QF_flags ^= ((ptiTo->MessageQueue->QF_flags ^ ptiFrom->MessageQueue->QF_flags) & QF_CAPTURELOCKED); - ptiTo->MessageQueue->CaretInfo = ptiFrom->MessageQueue->CaretInfo; + RtlCopyMemory(ptiTo->MessageQueue->CaretInfo, + ptiFrom->MessageQueue->CaretInfo, + sizeof(ptiTo->MessageQueue->CaretInfo)); IntSetFocusMessageQueue(NULL); IntSetFocusMessageQueue(ptiTo->MessageQueue); gptiForeground = ptiTo;

1 0

[tfaber] 69676: [ATL] - Add CComBSTR::operator BSTR. Mark by Mark Jansen. CORE-10394 #resolve
by tfaber＠svn.reactos.org 24 Oct '15

24 Oct '15

Author: tfaber Date: Sat Oct 24 13:26:44 2015 New Revision: 69676 URL: http://svn.reactos.org/svn/reactos?rev=69676&view=rev Log: [ATL] - Add CComBSTR::operator BSTR. Mark by Mark Jansen. CORE-10394 #resolve Modified: trunk/reactos/lib/atl/atlbase.h Modified: trunk/reactos/lib/atl/atlbase.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/atl/atlbase.h?rev=6967… ============================================================================== --- trunk/reactos/lib/atl/atlbase.h [iso-8859-1] (original) +++ trunk/reactos/lib/atl/atlbase.h [iso-8859-1] Sat Oct 24 13:26:44 2015 @@ -941,6 +941,11 @@ ::SysFreeString(m_str); m_str = NULL; } + + operator BSTR () const + { + return m_str; + } }; class CComVariant : public tagVARIANT

1 0

[spetreolle] 69675: [CONFIGURE] NEW_STYLE_BUILD is used for official builds. Enable it.
by spetreolle＠svn.reactos.org 24 Oct '15

24 Oct '15

Author: spetreolle Date: Sat Oct 24 12:30:42 2015 New Revision: 69675 URL: http://svn.reactos.org/svn/reactos?rev=69675&view=rev Log: [CONFIGURE] NEW_STYLE_BUILD is used for official builds. Enable it. Modified: trunk/reactos/configure.cmd Modified: trunk/reactos/configure.cmd URL: http://svn.reactos.org/svn/reactos/trunk/reactos/configure.cmd?rev=69675&r1… ============================================================================== --- trunk/reactos/configure.cmd [iso-8859-1] (original) +++ trunk/reactos/configure.cmd [iso-8859-1] Sat Oct 24 12:30:42 2015 @@ -80,7 +80,7 @@ exit /b ) -set NEW_STYLE_BUILD=0 +set NEW_STYLE_BUILD=1 REM Parse command line parameters :repeat

1 0

[pschweitzer] 69674: [SHELL32] Backport Wine commit: 0efa2331e2f54b81480adeb588972ca16a8dab16 "Fix a cloned pidl leak (Coverity)." by Nikolay Sivov CID 716480
by pschweitzer＠svn.reactos.org 24 Oct '15

24 Oct '15

Author: pschweitzer Date: Sat Oct 24 10:27:40 2015 New Revision: 69674 URL: http://svn.reactos.org/svn/reactos?rev=69674&view=rev Log: [SHELL32] Backport Wine commit: 0efa2331e2f54b81480adeb588972ca16a8dab16 "Fix a cloned pidl leak (Coverity)." by Nikolay Sivov CID 716480 Modified: trunk/reactos/dll/win32/shell32/shlfolder.cpp Modified: trunk/reactos/dll/win32/shell32/shlfolder.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shlfolde… ============================================================================== --- trunk/reactos/dll/win32/shell32/shlfolder.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shlfolder.cpp [iso-8859-1] Sat Oct 24 10:27:40 2015 @@ -664,15 +664,15 @@ if (isEmpty1 && isEmpty2) { - return MAKE_HRESULT(SEVERITY_SUCCESS, 0, 0); + nReturn = MAKE_HRESULT( SEVERITY_SUCCESS, 0, 0 ); } else if (isEmpty1) { - return MAKE_HRESULT(SEVERITY_SUCCESS, 0, (WORD) -1); + nReturn = MAKE_HRESULT( SEVERITY_SUCCESS, 0, (WORD)-1 ); } else if (isEmpty2) { - return MAKE_HRESULT(SEVERITY_SUCCESS, 0, 1); + nReturn = MAKE_HRESULT( SEVERITY_SUCCESS, 0, 1 ); /* optimizing end */ } else if (SUCCEEDED(iface->BindToObject(firstpidl, NULL, IID_PPV_ARG(IShellFolder, &psf)))) {

1 0

[pschweitzer] 69673: [SHELL32] Fix a memory leak CID 1322131
by pschweitzer＠svn.reactos.org 24 Oct '15

24 Oct '15

Author: pschweitzer Date: Sat Oct 24 10:24:37 2015 New Revision: 69673 URL: http://svn.reactos.org/svn/reactos?rev=69673&view=rev Log: [SHELL32] Fix a memory leak CID 1322131 Modified: trunk/reactos/dll/win32/shell32/shellmenu/CMenuToolbars.cpp Modified: trunk/reactos/dll/win32/shell32/shellmenu/CMenuToolbars.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shellmen… ============================================================================== --- trunk/reactos/dll/win32/shell32/shellmenu/CMenuToolbars.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shellmenu/CMenuToolbars.cpp [iso-8859-1] Sat Oct 24 10:24:37 2015 @@ -1321,6 +1321,7 @@ // If no items were added, show the "empty" placeholder if (DPA_GetPtrCount(dpaSort) == 0) { + DPA_Destroy(dpaSort); return AddPlaceholder(); } @@ -1341,7 +1342,10 @@ hr = m_shellFolder->GetDisplayNameOf(item, SIGDN_NORMALDISPLAY, &sr); if (FAILED_UNEXPECTEDLY(hr)) + { + DPA_Destroy(dpaSort); return hr; + } StrRetToStr(&sr, NULL, &MenuString);

1 0

[pschweitzer] 69672: [SETUPAPI] Partly backport Wine commit: 4d796458d0ed517d45adc57a1aedaf1c3bdde232 "Avoid memory leaks (coverity)." by André Hentschel CID 716469
by pschweitzer＠svn.reactos.org 24 Oct '15

24 Oct '15

Author: pschweitzer Date: Sat Oct 24 10:14:21 2015 New Revision: 69672 URL: http://svn.reactos.org/svn/reactos?rev=69672&view=rev Log: [SETUPAPI] Partly backport Wine commit: 4d796458d0ed517d45adc57a1aedaf1c3bdde232 "Avoid memory leaks (coverity)." by André Hentschel CID 716469 Modified: trunk/reactos/dll/win32/setupapi/queue.c Modified: trunk/reactos/dll/win32/setupapi/queue.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/queue.c… ============================================================================== --- trunk/reactos/dll/win32/setupapi/queue.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/setupapi/queue.c [iso-8859-1] Sat Oct 24 10:14:21 2015 @@ -1216,7 +1216,11 @@ SetLastError( ERROR_NOT_ENOUGH_MEMORY ); return FALSE; } - if (!SetupGetStringFieldW( inf_context, 1, inf_source, len, NULL )) return FALSE; + if (!SetupGetStringFieldW( inf_context, 1, inf_source, len, NULL )) + { + HeapFree( GetProcessHeap(), 0, inf_source ); + return FALSE; + } source = inf_source; } else if (!source)

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