Ros-diffs October 2014

ros-diffs@reactos.org

19 participants
730 discussions

[akhaldi] 64872: [KERNEL32] * Sync format_msg.c with Wine 1.7.27. CORE-8540

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Tue Oct 21 18:25:34 2014 New Revision: 64872 URL: http://svn.reactos.org/svn/reactos?rev=64872&view=rev Log: [KERNEL32] * Sync format_msg.c with Wine 1.7.27. CORE-8540 Modified: trunk/reactos/dll/win32/kernel32/winnls/string/format_msg.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/kernel32/winnls/string/format_msg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/winnls/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/winnls/string/format_msg.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/winnls/string/format_msg.c [iso-8859-1] Tue Oct 21 18:25:34 2014 @@ -285,7 +285,7 @@ LPWSTR notspace; if (fmd->space) { notspace = fmd->space; - while (*notspace == ' ' && notspace != fmd->t) + while (notspace != fmd->t && *notspace == ' ') notspace++; } else notspace = fmd->space = fmd->t; Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Tue Oct 21 18:25:34 2014 @@ -272,7 +272,7 @@ reactos/dll/win32/kernel32/winnls/string/casemap.c # Synced in r52754 reactos/dll/win32/kernel32/winnls/string/chartype.c # Synced in r52754 reactos/dll/win32/kernel32/winnls/string/collation.c # Synced in r52754 - reactos/dll/win32/kernel32/winnls/string/format_msg.c # Synced to Wine-1.5.4 + reactos/dll/win32/kernel32/winnls/string/format_msg.c # Synced to Wine-1.7.27 reactos/dll/win32/kernel32/winnls/string/lang.c # Synced in r52754 reactos/dll/win32/kernel32/winnls/string/lcformat.c # Synced in r52754 reactos/dll/win32/kernel32/winnls/string/nls.c # Synced in r52754

9 years, 11 months

[khornicek] 64871: [CMD] - fix resource leaks CID 716324, 716323, 716322, 716321, 716320, 716319, 716318

by khornicek＠svn.reactos.org

Author: khornicek Date: Tue Oct 21 16:05:54 2014 New Revision: 64871 URL: http://svn.reactos.org/svn/reactos?rev=64871&view=rev Log: [CMD] - fix resource leaks CID 716324, 716323, 716322, 716321, 716320, 716319, 716318 Modified: trunk/reactos/base/shell/cmd/copy.c trunk/reactos/base/shell/cmd/internal.c trunk/reactos/base/shell/cmd/move.c trunk/reactos/base/shell/cmd/replace.c Modified: trunk/reactos/base/shell/cmd/copy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/copy.c?rev=… ============================================================================== --- trunk/reactos/base/shell/cmd/copy.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/copy.c [iso-8859-1] Tue Oct 21 16:05:54 2014 @@ -136,6 +136,7 @@ _tcscat(TempSrc,_T(".decrypt")); if (!CopyFileEx(source, TempSrc, NULL, NULL, FALSE, COPY_FILE_ALLOW_DECRYPTED_DESTINATION)) { + CloseHandle (hFileSrc); nErrorLevel = 1; return 0; } @@ -766,6 +767,7 @@ /* Check Breaker */ if (CheckCtrlBreak(BREAK_INPUT)) { + FindClose(hFile); freep(arg); return 1; } @@ -789,6 +791,7 @@ if (_tcscmp(tmpDestPath, _T("\\\\.\\")) && !IsExistingDirectory(tmpDestPath)) { + FindClose(hFile); ConOutFormatMessage(GetLastError(), szSrcPath); freep(arg); nErrorLevel = 1; Modified: trunk/reactos/base/shell/cmd/internal.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/internal.c?… ============================================================================== --- trunk/reactos/base/shell/cmd/internal.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/internal.c [iso-8859-1] Tue Oct 21 16:05:54 2014 @@ -382,7 +382,10 @@ { SetFileAttributes(TempFileName,FILE_ATTRIBUTE_NORMAL); if (!DeleteFile(TempFileName)) + { + FindClose (hFile); return 0; + } } }while (FindNextFile (hFile, &f)); Modified: trunk/reactos/base/shell/cmd/move.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/move.c?rev=… ============================================================================== --- trunk/reactos/base/shell/cmd/move.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/move.c [iso-8859-1] Tue Oct 21 16:05:54 2014 @@ -100,7 +100,7 @@ HANDLE hFile; /* used only when source and destination directories are on different volume */ - HANDLE hDestFile; + HANDLE hDestFile = NULL; WIN32_FIND_DATA findDestBuffer; TCHAR szMoveDest[MAX_PATH]; TCHAR szMoveSrc[MAX_PATH]; @@ -505,6 +505,9 @@ FindNextFile (hFile, &findBuffer)); FindClose (hFile); + if(hDestFile && hDestFile != INVALID_HANDLE_VALUE) + FindClose(hDestFile); + freep (arg); return 0; } Modified: trunk/reactos/base/shell/cmd/replace.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/replace.c?r… ============================================================================== --- trunk/reactos/base/shell/cmd/replace.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/replace.c [iso-8859-1] Tue Oct 21 16:05:54 2014 @@ -131,7 +131,10 @@ else ConOutResPrintf(STRING_REPLACE_HELP10, dest); if ( !FilePromptYNA (0)) + { + CloseHandle (hFileSrc); return 0; + } } /* Output depending on add flag */ @@ -220,7 +223,7 @@ HANDLE hFile; WIN32_FIND_DATA findBuffer; - /* Get file handel to the sourcefile(s) */ + /* Get file handle to the sourcefile(s) */ hFile = FindFirstFile (szSrcPath, &findBuffer); /* @@ -301,6 +304,8 @@ /* Take next sourcefile if any */ } while(FindNextFile (hFile, &findBuffer)); + + FindClose(hFile); return filesReplaced; } @@ -377,6 +382,8 @@ } /* Get the next handle */ } while(FindNextFile (hFile, &findBuffer)); + + FindClose(hFile); return filesReplaced; }

9 years, 11 months

[akhaldi] 64870: [STRMBASE] * Zap InputPin_Vtbl, OutputPin_Vtbl and impl_BaseInputPin_from_BasePin(). Already accepted upstream.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Tue Oct 21 15:52:51 2014 New Revision: 64870 URL: http://svn.reactos.org/svn/reactos?rev=64870&view=rev Log: [STRMBASE] * Zap InputPin_Vtbl, OutputPin_Vtbl and impl_BaseInputPin_from_BasePin(). Already accepted upstream. Modified: trunk/reactos/lib/3rdparty/strmbase/pin.c Modified: trunk/reactos/lib/3rdparty/strmbase/pin.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/strmbase/pin.… ============================================================================== --- trunk/reactos/lib/3rdparty/strmbase/pin.c [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/strmbase/pin.c [iso-8859-1] Tue Oct 21 15:52:51 2014 @@ -21,8 +21,6 @@ #include "strmbase_private.h" -static const IPinVtbl InputPin_Vtbl; -static const IPinVtbl OutputPin_Vtbl; static const IMemInputPinVtbl MemInputPin_Vtbl; typedef HRESULT (*SendPinFunc)( IPin *to, LPVOID arg ); @@ -545,28 +543,6 @@ return E_UNEXPECTED; } -static const IPinVtbl OutputPin_Vtbl = -{ - BaseOutputPinImpl_QueryInterface, - BasePinImpl_AddRef, - BaseOutputPinImpl_Release, - BaseOutputPinImpl_Connect, - BaseOutputPinImpl_ReceiveConnection, - BaseOutputPinImpl_Disconnect, - BasePinImpl_ConnectedTo, - BasePinImpl_ConnectionMediaType, - BasePinImpl_QueryPinInfo, - BasePinImpl_QueryDirection, - BasePinImpl_QueryId, - BasePinImpl_QueryAccept, - BasePinImpl_EnumMediaTypes, - BasePinImpl_QueryInternalConnections, - BaseOutputPinImpl_EndOfStream, - BaseOutputPinImpl_BeginFlush, - BaseOutputPinImpl_EndFlush, - BasePinImpl_NewSegment -}; - HRESULT WINAPI BaseOutputPinImpl_GetDeliveryBuffer(BaseOutputPin *This, IMediaSample ** ppSample, REFERENCE_TIME * tStart, REFERENCE_TIME * tStop, DWORD dwFlags) { HRESULT hr; @@ -851,11 +827,6 @@ return CONTAINING_RECORD(iface, BaseInputPin, pin.IPin_iface); } -static inline BaseInputPin *impl_BaseInputPin_from_BasePin( BasePin *iface ) -{ - return CONTAINING_RECORD(iface, BaseInputPin, pin); -} - HRESULT WINAPI BaseInputPinImpl_QueryInterface(IPin * iface, REFIID riid, LPVOID * ppv) { BaseInputPin *This = impl_BaseInputPin_from_IPin(iface); @@ -1049,28 +1020,6 @@ return SendFurther( iface, deliver_newsegment, &args, NULL ); } - -static const IPinVtbl InputPin_Vtbl = -{ - BaseInputPinImpl_QueryInterface, - BasePinImpl_AddRef, - BaseInputPinImpl_Release, - BaseInputPinImpl_Connect, - BaseInputPinImpl_ReceiveConnection, - BasePinImpl_Disconnect, - BasePinImpl_ConnectedTo, - BasePinImpl_ConnectionMediaType, - BasePinImpl_QueryPinInfo, - BasePinImpl_QueryDirection, - BasePinImpl_QueryId, - BaseInputPinImpl_QueryAccept, - BasePinImpl_EnumMediaTypes, - BasePinImpl_QueryInternalConnections, - BaseInputPinImpl_EndOfStream, - BaseInputPinImpl_BeginFlush, - BaseInputPinImpl_EndFlush, - BaseInputPinImpl_NewSegment -}; /*** IMemInputPin implementation ***/

9 years, 11 months

[akhaldi] 64869: [XCOPY_WINETEST] * Import from Wine 1.7.27. CORE-8540

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Tue Oct 21 15:50:16 2014 New Revision: 64869 URL: http://svn.reactos.org/svn/reactos?rev=64869&view=rev Log: [XCOPY_WINETEST] * Import from Wine 1.7.27. CORE-8540 Added: trunk/rostests/winetests/xcopy/ (with props) trunk/rostests/winetests/xcopy/CMakeLists.txt (with props) trunk/rostests/winetests/xcopy/testlist.c (with props) trunk/rostests/winetests/xcopy/xcopy.c (with props) Modified: trunk/rostests/winetests/CMakeLists.txt Modified: trunk/rostests/winetests/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/CMakeLists.txt?… ============================================================================== --- trunk/rostests/winetests/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/CMakeLists.txt [iso-8859-1] Tue Oct 21 15:50:16 2014 @@ -114,5 +114,6 @@ add_subdirectory(wlanapi) add_subdirectory(wldap32) add_subdirectory(ws2_32) +add_subdirectory(xcopy) add_subdirectory(xinput1_3) add_subdirectory(xmllite) Propchange: trunk/rostests/winetests/xcopy/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Tue Oct 21 15:50:16 2014 @@ -0,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: trunk/rostests/winetests/xcopy/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: trunk/rostests/winetests/xcopy/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Added: trunk/rostests/winetests/xcopy/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/xcopy/CMakeList… ============================================================================== --- trunk/rostests/winetests/xcopy/CMakeLists.txt (added) +++ trunk/rostests/winetests/xcopy/CMakeLists.txt [iso-8859-1] Tue Oct 21 15:50:16 2014 @@ -0,0 +1,5 @@ + +add_executable(xcopy_winetest xcopy.c testlist.c) +set_module_type(xcopy_winetest win32cui) +add_importlibs(xcopy_winetest msvcrt kernel32) +add_cd_file(TARGET xcopy_winetest DESTINATION reactos/bin FOR all) Propchange: trunk/rostests/winetests/xcopy/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/winetests/xcopy/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/xcopy/testlist.… ============================================================================== --- trunk/rostests/winetests/xcopy/testlist.c (added) +++ trunk/rostests/winetests/xcopy/testlist.c [iso-8859-1] Tue Oct 21 15:50:16 2014 @@ -0,0 +1,12 @@ +/* Automatically generated by make depend; DO NOT EDIT!! */ + +#define STANDALONE +#include <wine/test.h> + +extern void func_xcopy(void); + +const struct test winetest_testlist[] = +{ + { "xcopy", func_xcopy }, + { 0, 0 } +}; Propchange: trunk/rostests/winetests/xcopy/testlist.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/winetests/xcopy/xcopy.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/xcopy/xcopy.c?r… ============================================================================== --- trunk/rostests/winetests/xcopy/xcopy.c (added) +++ trunk/rostests/winetests/xcopy/xcopy.c [iso-8859-1] Tue Oct 21 15:50:16 2014 @@ -0,0 +1,97 @@ +/* + * Copyright 2013 Francois Gouget + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <wine/test.h> + +static DWORD runcmd(const char* cmd) +{ + STARTUPINFOA si = {sizeof(STARTUPINFOA)}; + PROCESS_INFORMATION pi; + char* wcmd; + DWORD rc; + + /* Create a writable copy for CreateProcessA() */ + wcmd = HeapAlloc(GetProcessHeap(), 0, strlen(cmd) + 1); + strcpy(wcmd, cmd); + + /* On Windows 2003 and older, xcopy.exe fails if stdin is not a console + * handle, even with '/I /Y' options. + */ + rc = CreateProcessA(NULL, wcmd, NULL, NULL, FALSE, CREATE_NEW_CONSOLE, NULL, NULL, &si, &pi); + HeapFree(GetProcessHeap(), 0, wcmd); + if (!rc) + return 260; + + rc = WaitForSingleObject(pi.hProcess, 5000); + if (rc == WAIT_OBJECT_0) + GetExitCodeProcess(pi.hProcess, &rc); + else + TerminateProcess(pi.hProcess, 1); + CloseHandle(pi.hThread); + CloseHandle(pi.hProcess); + + return rc; +} + +static void test_date_format(void) +{ + DWORD rc; + + rc = runcmd("xcopy /D:20-01-2000 xcopy1 xcopytest"); + ok(rc == 4, "xcopy /D:d-m-y test returned rc=%u\n", rc); + ok(GetFileAttributesA("xcopytest\\xcopy1") == INVALID_FILE_ATTRIBUTES, + "xcopy should not have created xcopytest\\xcopy1\n"); + + rc = runcmd("xcopy /D:01-20-2000 xcopy1 xcopytest"); + ok(rc == 0, "xcopy /D:m-d-y test failed rc=%u\n", rc); + ok(GetFileAttributesA("xcopytest\\xcopy1") != INVALID_FILE_ATTRIBUTES, + "xcopy did not create xcopytest\\xcopy1\n"); + DeleteFileA("xcopytest\\xcopy1"); + + rc = runcmd("xcopy /D:1-20-2000 xcopy1 xcopytest"); + ok(rc == 0, "xcopy /D:m-d-y test failed rc=%u\n", rc); + ok(GetFileAttributesA("xcopytest\\xcopy1") != INVALID_FILE_ATTRIBUTES, + "xcopy did not create xcopytest\\xcopy1\n"); + DeleteFileA("xcopytest\\xcopy1"); +} + +START_TEST(xcopy) +{ + char tmpdir[MAX_PATH]; + HANDLE hfile; + + GetTempPathA(MAX_PATH, tmpdir); + SetCurrentDirectoryA(tmpdir); + trace("%s\n", tmpdir); + + CreateDirectoryA("xcopytest", NULL); + hfile = CreateFileA("xcopy1", GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, + FILE_ATTRIBUTE_NORMAL, NULL); + ok(hfile != INVALID_HANDLE_VALUE, "Failed to create xcopy1 file\n"); + if (hfile == INVALID_HANDLE_VALUE) + { + skip("skipping xcopy tests\n"); + return; + } + CloseHandle(hfile); + + test_date_format(); + + DeleteFileA("xcopy1"); + RemoveDirectoryA("xcopytest"); +} Propchange: trunk/rostests/winetests/xcopy/xcopy.c ------------------------------------------------------------------------------ svn:eol-style = native

9 years, 11 months

[tfaber] 64868: [WIN32K] - Fix DCE list entry handling CORE-8669 #resolve

by tfaber＠svn.reactos.org

Author: tfaber Date: Tue Oct 21 14:28:16 2014 New Revision: 64868 URL: http://svn.reactos.org/svn/reactos?rev=64868&view=rev Log: [WIN32K] - Fix DCE list entry handling CORE-8669 #resolve Modified: trunk/reactos/win32ss/user/ntuser/dce.h trunk/reactos/win32ss/user/ntuser/windc.c Modified: trunk/reactos/win32ss/user/ntuser/dce.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/dce.h?… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/dce.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/dce.h [iso-8859-1] Tue Oct 21 14:28:16 2014 @@ -44,7 +44,7 @@ INIT_FUNCTION NTSTATUS NTAPI InitDCEImpl(VOID); PDCE FASTCALL DceAllocDCE(PWND Window, DCE_TYPE Type); HWND FASTCALL IntWindowFromDC(HDC hDc); -PDCE FASTCALL DceFreeDCE(PDCE dce, BOOLEAN Force); +void FASTCALL DceFreeDCE(PDCE dce, BOOLEAN Force); void FASTCALL DceEmptyCache(void); VOID FASTCALL DceResetActiveDCEs(PWND Window); void FASTCALL DceFreeClassDCE(HDC); Modified: trunk/reactos/win32ss/user/ntuser/windc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/windc.… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/windc.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/windc.c [iso-8859-1] Tue Oct 21 14:28:16 2014 @@ -51,15 +51,16 @@ FASTCALL DceGetDceFromDC(HDC hdc) { - LIST_ENTRY* Entry = LEDce.Flink; + PLIST_ENTRY ListEntry; DCE* dce; - while (Entry != &LEDce) + ListEntry = LEDce.Flink; + while (ListEntry != &LEDce) { - dce = CONTAINING_RECORD(Entry, DCE, List); + dce = CONTAINING_RECORD(ListEntry, DCE, List); + ListEntry = ListEntry->Flink; if (dce->hDC == hdc) return dce; - Entry = Entry->Flink; } return NULL; @@ -247,7 +248,7 @@ if (Dce->hrgnClip != NULL) RgnClip = REGION_LockRgn(Dce->hrgnClip); - + if (RgnClip) { IntGdiCombineRgn(RgnVisible, RgnVisible, RgnClip, RGN_AND); @@ -330,18 +331,16 @@ #if 0 // Need to research and fix before this is a "growing" issue. if (++DCECache > 32) { - pLE = LEDce.Flink; - pDCE = CONTAINING_RECORD(pLE, DCE, List); - do - { + ListEntry = LEDce.Flink; + while (ListEntry != &LEDce) + { + pDCE = CONTAINING_RECORD(ListEntry, DCE, List); + ListEntry = ListEntry->Flink; if (!(pDCE->DCXFlags & DCX_DCEBUSY)) { /* Free the unused cache DCEs. */ - pDCE = DceFreeDCE(pDCE, TRUE); - if (!pDCE) break; - continue; + DceFreeDCE(pDCE, TRUE); } } - while (pLE != &LEDce ); } #endif } @@ -359,7 +358,7 @@ BOOL bUpdateVisRgn = TRUE; HDC hDC = NULL; PPROCESSINFO ppi; - PLIST_ENTRY pLE; + PLIST_ENTRY ListEntry; if (NULL == Wnd) { @@ -463,15 +462,11 @@ DCE* DceEmpty = NULL; DCE* DceUnused = NULL; KeEnterCriticalRegion(); - pLE = LEDce.Flink; - Dce = CONTAINING_RECORD(pLE, DCE, List); - do - { -// The reason for this you may ask? -// Well, it seems ReactOS calls GetDC without first creating a desktop DC window! -// Need to test for null here. Not sure if this is a bug or a feature. -// First time use hax, need to use DceAllocDCE during window display init. - if (!Dce) break; + ListEntry = LEDce.Flink; + while (ListEntry != &LEDce) + { + Dce = CONTAINING_RECORD(ListEntry, DCE, List); + ListEntry = ListEntry->Flink; // // The way I understand this, you can have more than one DC per window. // Only one Owned if one was requested and saved and one Cached. @@ -490,10 +485,7 @@ break; } } - pLE = Dce->List.Flink; - Dce = CONTAINING_RECORD(pLE, DCE, List); - } - while (pLE != &LEDce); + } KeLeaveCriticalRegion(); Dce = (DceEmpty == NULL) ? DceUnused : DceEmpty; @@ -510,20 +502,19 @@ else // If we are here, we are POWNED or having CLASS. { KeEnterCriticalRegion(); - pLE = LEDce.Flink; - Dce = CONTAINING_RECORD(pLE, DCE, List); - do - { // Check for Window handle than HDC match for CLASS. + ListEntry = LEDce.Flink; + while (ListEntry != &LEDce) + { + Dce = CONTAINING_RECORD(ListEntry, DCE, List); + ListEntry = ListEntry->Flink; + // Check for Window handle than HDC match for CLASS. if (Dce->hwndCurrent == Wnd->head.h) { bUpdateVisRgn = FALSE; break; } if (Dce->hDC == hDC) break; - pLE = Dce->List.Flink; - Dce = CONTAINING_RECORD(pLE, DCE, List); - } - while (pLE != &LEDce); + } KeLeaveCriticalRegion(); if ( (Flags & (DCX_INTERSECTRGN|DCX_EXCLUDERGN)) && @@ -554,11 +545,8 @@ * http://www.reactos.org/archives/public/ros-dev/2008-July/010498.html * http://www.reactos.org/archives/public/ros-dev/2008-July/010499.html */ - if (pLE != &LEDce) - { - RemoveEntryList(&Dce->List); - InsertHeadList(&LEDce, &Dce->List); - } + RemoveEntryList(&Dce->List); + InsertHeadList(&LEDce, &Dce->List); /* Introduced in rev 6691 and modified later. */ if ( (Flags & DCX_INTERSECTUPDATE) && !ClipRegion ) @@ -637,17 +625,13 @@ /*********************************************************************** * DceFreeDCE */ -PDCE FASTCALL +void FASTCALL DceFreeDCE(PDCE pdce, BOOLEAN Force) { - DCE *ret; - PLIST_ENTRY pLE; BOOL Hit = FALSE; - if (NULL == pdce) return NULL; - - pLE = pdce->List.Flink; - ret = CONTAINING_RECORD(pLE, DCE, List); + ASSERT(pdce != NULL); + if (NULL == pdce) return; pdce->DCXFlags |= DCX_INDESTROY; @@ -683,18 +667,10 @@ RemoveEntryList(&pdce->List); - if (IsListEmpty(&pdce->List)) - { - ERR("List is Empty! DCE! -> %p\n" , pdce); - return NULL; - } - ExFreePoolWithTag(pdce, USERTAG_DCE); DCECount--; TRACE("Freed DCE's! %d \n", DCECount); - - return ret; } /*********************************************************************** @@ -706,7 +682,7 @@ DceFreeWindowDCE(PWND Window) { PDCE pDCE; - PLIST_ENTRY pLE; + PLIST_ENTRY ListEntry; if (DCECount <= 0) { @@ -714,20 +690,11 @@ return; } - pLE = LEDce.Flink; - pDCE = CONTAINING_RECORD(pLE, DCE, List); - do - { - if (!pDCE) - { - ERR("FreeWindowDCE No DCE Pointer!\n"); - break; - } - if (IsListEmpty(&pDCE->List)) - { - ERR("FreeWindowDCE List is Empty!!!!\n"); - break; - } + ListEntry = LEDce.Flink; + while (ListEntry != &LEDce) + { + pDCE = CONTAINING_RECORD(ListEntry, DCE, List); + ListEntry = ListEntry->Flink; if ( pDCE->hwndCurrent == Window->head.h && !(pDCE->DCXFlags & DCX_DCEEMPTY) ) { @@ -755,8 +722,7 @@ } else if (Window->pcls->style & CS_OWNDC) /* Owned DCE */ { - pDCE = DceFreeDCE(pDCE, FALSE); - if (!pDCE) break; + DceFreeDCE(pDCE, FALSE); continue; } else @@ -785,76 +751,61 @@ pDCE->pwndOrg = pDCE->pwndClip = NULL; } } - pLE = pDCE->List.Flink; - pDCE = CONTAINING_RECORD(pLE, DCE, List); - } - while (pLE != &LEDce); + } } void FASTCALL DceFreeClassDCE(HDC hDC) { PDCE pDCE; - PLIST_ENTRY pLE; - pLE = LEDce.Flink; - pDCE = CONTAINING_RECORD(pLE, DCE, List); - - do - { - if(!pDCE) break; + PLIST_ENTRY ListEntry; + + ListEntry = LEDce.Flink; + while (ListEntry != &LEDce) + { + pDCE = CONTAINING_RECORD(ListEntry, DCE, List); + ListEntry = ListEntry->Flink; if (pDCE->hDC == hDC) { - pDCE = DceFreeDCE(pDCE, TRUE); // Might have gone cheap! - if (!pDCE) break; - continue; + DceFreeDCE(pDCE, TRUE); // Might have gone cheap! } - pLE = pDCE->List.Flink; - pDCE = CONTAINING_RECORD(pLE, DCE, List); - } - while (pLE != &LEDce); + } } void FASTCALL DceFreeThreadDCE(PTHREADINFO pti) { PDCE pDCE; - PLIST_ENTRY pLE; - pLE = LEDce.Flink; - pDCE = CONTAINING_RECORD(pLE, DCE, List); - - do - { - if(!pDCE) break; + PLIST_ENTRY ListEntry; + + ListEntry = LEDce.Flink; + while (ListEntry != &LEDce) + { + pDCE = CONTAINING_RECORD(ListEntry, DCE, List); + ListEntry = ListEntry->Flink; if (pDCE->ptiOwner == pti) { if (pDCE->DCXFlags & DCX_CACHE) { - pDCE = DceFreeDCE(pDCE, TRUE); - if (!pDCE) break; - continue; + DceFreeDCE(pDCE, TRUE); } } - pLE = pDCE->List.Flink; - pDCE = CONTAINING_RECORD(pLE, DCE, List); - } - while (pLE != &LEDce); + } } VOID FASTCALL DceEmptyCache(VOID) { PDCE pDCE; - PLIST_ENTRY pLE; - pLE = LEDce.Flink; - pDCE = CONTAINING_RECORD(pLE, DCE, List); - - do - { - if(!pDCE) break; - pDCE = DceFreeDCE(pDCE, TRUE); - if(!pDCE) break; - } - while (pLE != &LEDce); + PLIST_ENTRY ListEntry; + + ListEntry = LEDce.Flink; + while (ListEntry != &LEDce) + { + pDCE = CONTAINING_RECORD(ListEntry, DCE, List); + ListEntry = ListEntry->Flink; + DceFreeDCE(pDCE, TRUE); + } } VOID FASTCALL @@ -865,19 +816,18 @@ PWND CurrentWindow; INT DeltaX; INT DeltaY; - PLIST_ENTRY pLE; + PLIST_ENTRY ListEntry; if (NULL == Window) { return; } - pLE = LEDce.Flink; - pDCE = CONTAINING_RECORD(pLE, DCE, List); - - do - { - if(!pDCE) break; - if(pLE == &LEDce) break; + + ListEntry = LEDce.Flink; + while (ListEntry != &LEDce) + { + pDCE = CONTAINING_RECORD(ListEntry, DCE, List); + ListEntry = ListEntry->Flink; if (0 == (pDCE->DCXFlags & (DCX_DCEEMPTY|DCX_INDESTROY))) { if (Window->head.h == pDCE->hwndCurrent) @@ -892,8 +842,6 @@ CurrentWindow = UserGetWindowObject(pDCE->hwndCurrent); if (NULL == CurrentWindow) { - pLE = pDCE->List.Flink; - pDCE = CONTAINING_RECORD(pLE, DCE, List); continue; } } @@ -901,8 +849,6 @@ if (!GreIsHandleValid(pDCE->hDC) || (dc = DC_LockDc(pDCE->hDC)) == NULL) { - pLE = pDCE->List.Flink; - pDCE = CONTAINING_RECORD(pLE, DCE, List); continue; } if (Window == CurrentWindow || IntIsChildWindow(Window, CurrentWindow)) @@ -937,23 +883,21 @@ DceUpdateVisRgn(pDCE, CurrentWindow, pDCE->DCXFlags); IntGdiSetHookFlags(pDCE->hDC, DCHF_VALIDATEVISRGN); } - pLE = pDCE->List.Flink; - pDCE = CONTAINING_RECORD(pLE, DCE, List); - } - while (pLE != &LEDce); + } } HWND FASTCALL IntWindowFromDC(HDC hDc) { DCE *Dce; - PLIST_ENTRY pLE; + PLIST_ENTRY ListEntry; HWND Ret = NULL; - pLE = LEDce.Flink; - Dce = CONTAINING_RECORD(pLE, DCE, List); - do - { + ListEntry = LEDce.Flink; + while (ListEntry != &LEDce) + { + Dce = CONTAINING_RECORD(ListEntry, DCE, List); + ListEntry = ListEntry->Flink; if (Dce->hDC == hDc) { if (Dce->DCXFlags & DCX_INDESTROY) @@ -962,10 +906,7 @@ Ret = Dce->hwndCurrent; break; } - pLE = Dce->List.Flink; - Dce = CONTAINING_RECORD(pLE, DCE, List); - } - while (pLE != &LEDce); + } return Ret; } @@ -973,25 +914,22 @@ UserReleaseDC(PWND Window, HDC hDc, BOOL EndPaint) { PDCE dce; - PLIST_ENTRY pLE; + PLIST_ENTRY ListEntry; INT nRet = 0; BOOL Hit = FALSE; TRACE("%p %p\n", Window, hDc); - pLE = LEDce.Flink; - dce = CONTAINING_RECORD(pLE, DCE, List); - do - { - if(!dce) break; + ListEntry = LEDce.Flink; + while (ListEntry != &LEDce) + { + dce = CONTAINING_RECORD(ListEntry, DCE, List); + ListEntry = ListEntry->Flink; if (dce->hDC == hDc) { Hit = TRUE; break; } - pLE = dce->List.Flink; - dce = CONTAINING_RECORD(pLE, DCE, List); - } - while (pLE != &LEDce ); + } if ( Hit && (dce->DCXFlags & DCX_DCEBUSY)) {

9 years, 11 months

[tfaber] 64867: [RTL] - Fix a buffer overflow in RtlSetBits/RtlClearBits

by tfaber＠svn.reactos.org

Author: tfaber Date: Tue Oct 21 14:22:28 2014 New Revision: 64867 URL: http://svn.reactos.org/svn/reactos?rev=64867&view=rev Log: [RTL] - Fix a buffer overflow in RtlSetBits/RtlClearBits Modified: trunk/reactos/lib/rtl/bitmap.c trunk/rostests/apitests/ntdll/RtlBitmap.c Modified: trunk/reactos/lib/rtl/bitmap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/bitmap.c?rev=64867… ============================================================================== --- trunk/reactos/lib/rtl/bitmap.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/bitmap.c [iso-8859-1] Tue Oct 21 14:22:28 2014 @@ -362,8 +362,11 @@ /* Clear what's left */ NumberToClear &= (_BITCOUNT - 1); - Mask = MAXINDEX << NumberToClear; - *Buffer &= Mask; + if (NumberToClear) + { + Mask = MAXINDEX << NumberToClear; + *Buffer &= Mask; + } } VOID @@ -419,8 +422,11 @@ /* Set what's left */ NumberToSet &= (_BITCOUNT - 1); - Mask = MAXINDEX << NumberToSet; - *Buffer |= ~Mask; + if (NumberToSet) + { + Mask = MAXINDEX << NumberToSet; + *Buffer |= ~Mask; + } } BOOLEAN Modified: trunk/rostests/apitests/ntdll/RtlBitmap.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ntdll/RtlBitmap.… ============================================================================== --- trunk/rostests/apitests/ntdll/RtlBitmap.c [iso-8859-1] (original) +++ trunk/rostests/apitests/ntdll/RtlBitmap.c [iso-8859-1] Tue Oct 21 14:22:28 2014 @@ -200,6 +200,11 @@ ok_hex(Buffer[0], 0x00001fff); ok_hex(Buffer[1], 0xfffffff8); + memset(Buffer, 0xff, BufferSize); + RtlClearBits(&BitMapHeader, 63, 1); + ok_hex(Buffer[0], 0xffffffff); + ok_hex(Buffer[1], 0x7fffffff); + memset(Buffer, 0xcc, BufferSize); RtlClearBits(&BitMapHeader, 3, 6); RtlClearBits(&BitMapHeader, 11, 5); @@ -244,6 +249,11 @@ RtlSetBits(&BitMapHeader, 13, 22); ok_hex(Buffer[0], 0xffffe000); ok_hex(Buffer[1], 0x00000007); + + memset(Buffer, 0x00, BufferSize); + RtlSetBits(&BitMapHeader, 63, 1); + ok_hex(Buffer[0], 0x00000000); + ok_hex(Buffer[1], 0x80000000); memset(Buffer, 0xcc, BufferSize); RtlSetBits(&BitMapHeader, 3, 6);

9 years, 11 months

[dquintana] 64866: [USER32] * Fix wrong array length passed to GetClassNameW. CID 716222 * Replace other instances of explicit array length to GetWindowTextW with _countof(x). Based on a patch by C...

by dquintana＠svn.reactos.org

Author: dquintana Date: Tue Oct 21 13:32:00 2014 New Revision: 64866 URL: http://svn.reactos.org/svn/reactos?rev=64866&view=rev Log: [USER32] * Fix wrong array length passed to GetClassNameW. CID 716222 * Replace other instances of explicit array length to GetWindowTextW with _countof(x). Based on a patch by Christoph von Wittich. Modified: branches/shell-experiments/win32ss/user/user32/controls/appswitch.c Modified: branches/shell-experiments/win32ss/user/user32/controls/appswitch.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/user/… ============================================================================== --- branches/shell-experiments/win32ss/user/user32/controls/appswitch.c [iso-8859-1] (original) +++ branches/shell-experiments/win32ss/user/user32/controls/appswitch.c [iso-8859-1] Tue Oct 21 13:32:00 2014 @@ -83,7 +83,7 @@ { HWND hwnd = windowList[selectedWindow]; - GetWindowTextW(hwnd, windowText, 1023); + GetWindowTextW(hwnd, windowText, _countof(windowText)); TRACE("[ATbot] CompleteSwitch Switching to 0x%08x (%ls)\n", hwnd, windowText); @@ -103,9 +103,9 @@ if (!IsWindowVisible(window)) return TRUE; - GetClassNameW(window,windowText,4095); - if ((wcscmp(L"Shell_TrayWnd",windowText)==0) || - (wcscmp(L"Progman",windowText)==0) ) + GetClassNameW(window, windowText, _countof(windowText)); + if ((wcscmp(L"Shell_TrayWnd", windowText)==0) || + (wcscmp(L"Progman", windowText)==0) ) return TRUE; // First try to get the big icon assigned to the window @@ -194,7 +194,7 @@ HPEN hPen; HFONT dcFont; COLORREF cr; - int nch = GetWindowTextW(windowList[selectedWindow], windowText, 1023); + int nch = GetWindowTextW(windowList[selectedWindow], windowText, _countof(windowText)); dialogDC = BeginPaint(hWnd, &paint); { @@ -373,7 +373,7 @@ } TRACE("DoAppSwitch VK_ESCAPE 1 Count %d windowCount %d\n",Count,windowCount); hwnd = windowList[Count]; - GetWindowTextW(hwnd, Text, 1023); + GetWindowTextW(hwnd, Text, _countof(Text)); TRACE("[ATbot] Switching to 0x%08x (%ls)\n", hwnd, Text); MakeWindowActive(hwnd); Esc = TRUE; @@ -456,7 +456,7 @@ Count = windowCount - 1; } hwnd = windowList[Count]; - GetWindowTextW(hwnd, Text, 1023); + GetWindowTextW(hwnd, Text, _countof(Text)); MakeWindowActive(hwnd); } }

9 years, 11 months

[tfaber] 64865: [WIN32K] - Remove bug-hiding list macros that accept NULL in LIST_ENTRYs. CORE-8668 #resolve

by tfaber＠svn.reactos.org

Author: tfaber Date: Tue Oct 21 12:43:15 2014 New Revision: 64865 URL: http://svn.reactos.org/svn/reactos?rev=64865&view=rev Log: [WIN32K] - Remove bug-hiding list macros that accept NULL in LIST_ENTRYs. CORE-8668 #resolve Modified: trunk/reactos/win32ss/gdi/ntgdi/misc.h trunk/reactos/win32ss/user/ntuser/cursoricon.c trunk/reactos/win32ss/user/ntuser/desktop.c Modified: trunk/reactos/win32ss/gdi/ntgdi/misc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/misc.h?r… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/misc.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/misc.h [iso-8859-1] Tue Oct 21 12:43:15 2014 @@ -162,15 +162,3 @@ #define ROUND_UP(n, align) \ ROUND_DOWN(((ULONG)n) + (align) - 1, (align)) - -#define LIST_FOR_EACH(elem, list, type, field) \ - for ((elem) = CONTAINING_RECORD((list)->Flink, type, field); \ - &(elem)->field != (list) && ((&((elem)->field)) != NULL); \ - (elem) = CONTAINING_RECORD((elem)->field.Flink, type, field)) - -#define LIST_FOR_EACH_SAFE(cursor, cursor2, list, type, field) \ - for ((cursor) = CONTAINING_RECORD((list)->Flink, type, field), \ - (cursor2) = CONTAINING_RECORD((cursor)->field.Flink, type, field); \ - &(cursor)->field != (list); \ - (cursor) = (cursor2), \ - (cursor2) = CONTAINING_RECORD((cursor)->field.Flink, type, field)) Modified: trunk/reactos/win32ss/user/ntuser/cursoricon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/cursor… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/cursoricon.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/cursoricon.c [iso-8859-1] Tue Oct 21 12:43:15 2014 @@ -144,12 +144,16 @@ ReferenceCurIconByProcess(PCURICON_OBJECT CurIcon) { PPROCESSINFO Win32Process; + PLIST_ENTRY ListEntry; PCURICON_PROCESS Current; Win32Process = PsGetCurrentProcessWin32Process(); - LIST_FOR_EACH(Current, &CurIcon->ProcessList, CURICON_PROCESS, ListEntry) - { + ListEntry = CurIcon->ProcessList.Flink; + while (ListEntry != &CurIcon->ProcessList) + { + Current = CONTAINING_RECORD(ListEntry, CURICON_PROCESS, ListEntry); + ListEntry = ListEntry->Flink; if (Current->Process == Win32Process) { /* Already registered for this process */ @@ -173,10 +177,14 @@ IntFindExistingCurIconObject(HMODULE hModule, HRSRC hRsrc, LONG cx, LONG cy) { + PLIST_ENTRY ListEntry; PCURICON_OBJECT CurIcon; - LIST_FOR_EACH(CurIcon, &gCurIconList, CURICON_OBJECT, ListEntry) - { + ListEntry = gCurIconList.Flink; + while (ListEntry != &gCurIconList) + { + CurIcon = CONTAINING_RECORD(ListEntry, CURICON_OBJECT, ListEntry); + ListEntry = ListEntry->Flink; // if (NT_SUCCESS(UserReferenceObjectByPointer(Object, TYPE_CURSOR))) // <- huh???? // UserReferenceObject( CurIcon); @@ -247,7 +255,8 @@ PSYSTEM_CURSORINFO CurInfo; HBITMAP bmpMask, bmpColor; BOOLEAN Ret, bListEmpty, bFound = FALSE; - PCURICON_PROCESS Current = NULL; + PLIST_ENTRY ListEntry; + PCURICON_PROCESS Current; /* For handles created without any data (error handling) */ if(IsListEmpty(&CurIcon->ProcessList)) @@ -255,8 +264,11 @@ /* Now find this process in the list of processes referencing this object and remove it from that list */ - LIST_FOR_EACH(Current, &CurIcon->ProcessList, CURICON_PROCESS, ListEntry) - { + ListEntry = CurIcon->ProcessList.Flink; + while (ListEntry != &CurIcon->ProcessList) + { + Current = CONTAINING_RECORD(ListEntry, CURICON_PROCESS, ListEntry); + ListEntry = ListEntry->Flink; if (Current->Process == ppi) { bFound = TRUE; Modified: trunk/reactos/win32ss/user/ntuser/desktop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/deskto… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/desktop.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/desktop.c [iso-8859-1] Tue Oct 21 12:43:15 2014 @@ -806,12 +806,17 @@ UserBuildShellHookHwndList(PDESKTOP Desktop) { ULONG entries=0; + PLIST_ENTRY ListEntry; PSHELL_HOOK_WINDOW Current; HWND* list; /* FIXME: If we save nb elements in desktop, we dont have to loop to find nb entries */ - LIST_FOR_EACH(Current, &Desktop->ShellHookWindows, SHELL_HOOK_WINDOW, ListEntry) + ListEntry = Desktop->ShellHookWindows.Flink; + while (ListEntry != &Desktop->ShellHookWindows) + { + ListEntry = ListEntry->Flink; entries++; + } if (!entries) return NULL; @@ -820,8 +825,13 @@ { HWND* cursor = list; - LIST_FOR_EACH(Current, &Desktop->ShellHookWindows, SHELL_HOOK_WINDOW, ListEntry) + ListEntry = Desktop->ShellHookWindows.Flink; + while (ListEntry != &Desktop->ShellHookWindows) + { + Current = CONTAINING_RECORD(ListEntry, SHELL_HOOK_WINDOW, ListEntry); + ListEntry = ListEntry->Flink; *cursor++ = Current->hWnd; + } *cursor = NULL; /* Nullterm list */ } @@ -930,10 +940,14 @@ { PTHREADINFO pti = PsGetCurrentThreadWin32Thread(); PDESKTOP Desktop = pti->rpdesk; + PLIST_ENTRY ListEntry; PSHELL_HOOK_WINDOW Current; - LIST_FOR_EACH(Current, &Desktop->ShellHookWindows, SHELL_HOOK_WINDOW, ListEntry) - { + ListEntry = Desktop->ShellHookWindows.Flink; + while (ListEntry != &Desktop->ShellHookWindows) + { + Current = CONTAINING_RECORD(ListEntry, SHELL_HOOK_WINDOW, ListEntry); + ListEntry = ListEntry->Flink; if (Current->hWnd == hWnd) { RemoveEntryList(&Current->ListEntry);

9 years, 11 months

[dquintana] 64864: [EXPLORER-NEW] * Cleanup in case of error. CID 1248426 [RSHELL] * Add uninitialized class fields. CID 1248477 * Avoid leaking memory. CID 1248438 [BROWSEUI] * Fix potential overw...

by dquintana＠svn.reactos.org

Author: dquintana Date: Tue Oct 21 12:24:15 2014 New Revision: 64864 URL: http://svn.reactos.org/svn/reactos?rev=64864&view=rev Log: [EXPLORER-NEW] * Cleanup in case of error. CID 1248426 [RSHELL] * Add uninitialized class fields. CID 1248477 * Avoid leaking memory. CID 1248438 [BROWSEUI] * Fix potential overwriting of a variable. CID 716363 * Save the rshell handle instead of loading it every time. CID 1248435 * Fix leaked PIDL. CID 1248418 [SHELL32] * Fix GCC build. And one small nickpick that has been bothering me for a long time. Modified: branches/shell-experiments/base/shell/explorer-new/shellservice.c branches/shell-experiments/base/shell/rshell/CMenuDeskBar.cpp branches/shell-experiments/base/shell/rshell/CMenuToolbars.cpp branches/shell-experiments/dll/win32/browseui/bandsite.cpp branches/shell-experiments/dll/win32/browseui/internettoolbar.cpp branches/shell-experiments/dll/win32/browseui/shellbrowser.cpp branches/shell-experiments/dll/win32/shell32/shlview.cpp Modified: branches/shell-experiments/base/shell/explorer-new/shellservice.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/ex… ============================================================================== --- branches/shell-experiments/base/shell/explorer-new/shellservice.c [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/explorer-new/shellservice.c [iso-8859-1] Tue Oct 21 12:24:15 2014 @@ -61,7 +61,7 @@ HRESULT hr = S_OK; int count = 0; - hdpa = DPA_Create(5); + *phdpa = NULL; TRACE("Enumerating Shell Service Ojbect GUIDs...\n"); @@ -72,6 +72,8 @@ ERR("RegOpenKey failed.\n"); return HRESULT_FROM_WIN32(GetLastError()); } + + hdpa = DPA_Create(5); /* Enumerate */ do Modified: branches/shell-experiments/base/shell/rshell/CMenuDeskBar.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/rs… ============================================================================== --- branches/shell-experiments/base/shell/rshell/CMenuDeskBar.cpp [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/rshell/CMenuDeskBar.cpp [iso-8859-1] Tue Oct 21 12:24:15 2014 @@ -35,8 +35,11 @@ CMenuDeskBar::CMenuDeskBar() : m_Client(NULL), + m_ClientWindow(NULL), + m_IconSize(0), m_Banner(NULL), - m_Shown(FALSE) + m_Shown(FALSE), + m_ShowFlags(0) { } Modified: branches/shell-experiments/base/shell/rshell/CMenuToolbars.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/rs… ============================================================================== --- branches/shell-experiments/base/shell/rshell/CMenuToolbars.cpp [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/rshell/CMenuToolbars.cpp [iso-8859-1] Tue Oct 21 12:24:15 2014 @@ -1191,7 +1191,10 @@ HRESULT hr = m_menuBand->_CallCBWithItemId(info.wID, SMC_GETINFO, 0, reinterpret_cast<LPARAM>(sminfo)); if (FAILED_UNEXPECTEDLY(hr)) + { + delete sminfo; return hr; + } AddButton(info.wID, info.dwTypeData, info.hSubMenu != NULL, sminfo->iIcon, reinterpret_cast<DWORD_PTR>(sminfo), last); Modified: branches/shell-experiments/dll/win32/browseui/bandsite.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/bro… ============================================================================== --- branches/shell-experiments/dll/win32/browseui/bandsite.cpp [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/browseui/bandsite.cpp [iso-8859-1] Tue Oct 21 12:24:15 2014 @@ -337,7 +337,6 @@ /* Initialize the added bands */ memset(&NewBand[fBandsAllocated], 0, (NewAllocated - fBandsAllocated) * sizeof(struct BandObject)); - NewBand = &fBands[fBandsAllocated]; fBandsAllocated = NewAllocated; CoTaskMemFree(fBands); fBands = NewBand; Modified: branches/shell-experiments/dll/win32/browseui/internettoolbar.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/bro… ============================================================================== --- branches/shell-experiments/dll/win32/browseui/internettoolbar.cpp [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/browseui/internettoolbar.cpp [iso-8859-1] Tue Oct 21 12:24:15 2014 @@ -30,6 +30,7 @@ #define GET_Y_LPARAM(lp) ((int)(short)HIWORD(lp)) #define USE_CUSTOM_MENUBAND 1 +HMODULE g_hRShell = NULL; #if 1 // TODO: declare these GUIDs and interfaces in the right place (whatever that may be) @@ -729,13 +730,13 @@ hResult = E_FAIL; #if USE_CUSTOM_MENUBAND - HMODULE hrs = GetModuleHandleW(L"rshell.dll"); + if (!g_hRShell) g_hRShell = GetModuleHandleW(L"rshell.dll"); - if (!hrs) hrs = LoadLibraryW(L"rshell.dll"); - - if (hrs) - { - PMENUBAND_CONSTRUCTOR func = (PMENUBAND_CONSTRUCTOR) GetProcAddress(hrs, "CMenuBand_Constructor"); + if (!g_hRShell) g_hRShell = LoadLibraryW(L"rshell.dll"); + + if (g_hRShell) + { + PMENUBAND_CONSTRUCTOR func = (PMENUBAND_CONSTRUCTOR) GetProcAddress(g_hRShell, "CMenuBand_Constructor"); if (func) { hResult = func(IID_PPV_ARG(IShellMenu, &menubar)); Modified: branches/shell-experiments/dll/win32/browseui/shellbrowser.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/bro… ============================================================================== --- branches/shell-experiments/dll/win32/browseui/shellbrowser.cpp [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/browseui/shellbrowser.cpp [iso-8859-1] Tue Oct 21 12:24:15 2014 @@ -897,28 +897,32 @@ LPWSTR pszBuf, UINT cchBuf, SFGAOF *rgfInOut) { CComPtr<IShellFolder> parentFolder; - LPITEMIDLIST childPIDL; + LPITEMIDLIST childPIDL = NULL; STRRET L108; HRESULT hResult; hResult = SHBindToFolderIDListParent(NULL, pidl, &IID_PPV_ARG(IShellFolder, &parentFolder), &childPIDL); if (FAILED(hResult)) - return hResult; + goto cleanup; hResult = parentFolder->GetDisplayNameOf(childPIDL, uFlags, &L108); if (FAILED(hResult)) - return hResult; + goto cleanup; StrRetToBufW(&L108, childPIDL, pszBuf, cchBuf); if (rgfInOut) { hResult = parentFolder->GetAttributesOf(1, const_cast<LPCITEMIDLIST *>(&childPIDL), rgfInOut); if (FAILED(hResult)) - return hResult; - } - - ILFree(childPIDL); - return S_OK; + goto cleanup; + } + + hResult = S_OK; + +cleanup: + if (childPIDL) + ILFree(childPIDL); + return hResult; } long IEGetNameAndFlags(LPITEMIDLIST pidl, SHGDNF uFlags, LPWSTR pszBuf, UINT cchBuf, SFGAOF *rgfInOut) Modified: branches/shell-experiments/dll/win32/shell32/shlview.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/she… ============================================================================== --- branches/shell-experiments/dll/win32/shell32/shlview.cpp [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/shell32/shlview.cpp [iso-8859-1] Tue Oct 21 12:24:15 2014 @@ -59,7 +59,8 @@ static const WCHAR SV_CLASS_NAME[] = {'S', 'H', 'E', 'L', 'L', 'D', 'L', 'L', '_', 'D', 'e', 'f', 'V', 'i', 'e', 'w', 0}; typedef struct -{ BOOL bIsAscending; +{ + BOOL bIsAscending; INT nHeaderID; INT nLastHeaderID; } LISTVIEW_SORT_INFO, *LPLISTVIEW_SORT_INFO; @@ -358,10 +359,10 @@ m_isEditing(FALSE), m_hView(NULL) { - m_FolderSettings = { 0 }; - m_sortInfo = { 0 }; - m_ptLastMousePos = { 0 }; - m_Category = { 0 }; + ZeroMemory(&m_FolderSettings, sizeof(m_FolderSettings)); + ZeroMemory(&m_sortInfo, sizeof(m_sortInfo)); + ZeroMemory(&m_ptLastMousePos, sizeof(m_ptLastMousePos)); + ZeroMemory(&m_Category, sizeof(m_Category)); } CDefView::~CDefView()

9 years, 11 months

[jgardou] 64863: [WIN32K] - reference the current process info structure while we're leaving win32k. The process can die anytime while we're not looking. CORE-8663 #resolve

by jgardou＠svn.reactos.org

Author: jgardou Date: Tue Oct 21 10:45:55 2014 New Revision: 64863 URL: http://svn.reactos.org/svn/reactos?rev=64863&view=rev Log: [WIN32K] - reference the current process info structure while we're leaving win32k. The process can die anytime while we're not looking. CORE-8663 #resolve Modified: trunk/reactos/win32ss/user/ntuser/message.c Modified: trunk/reactos/win32ss/user/ntuser/message.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/messag… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/message.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/message.c [iso-8859-1] Tue Oct 21 10:45:55 2014 @@ -2882,6 +2882,13 @@ TRACE("WFII: ppi %p\n", W32Process); TRACE("WFII: waiting for %p\n", Handles[1] ); + + /* + * We must add a refcount to our current PROCESSINFO, + * because anything could happen (including process death) we're leaving win32k + */ + IntReferenceProcessInfo(W32Process); + do { UserLeave(); @@ -2935,6 +2942,7 @@ pti->pClientInfo->dwTIFlags = pti->TIF_flags; } W32Process->W32PF_flags &= ~W32PF_WAITFORINPUTIDLE; + IntDereferenceProcessInfo(W32Process); ObDereferenceObject(Process); UserLeave(); return Status;

9 years, 11 months

← Newer
1
...
27
28
29
30
31
32
33
...
73
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs October 2014