Ros-diffs July 2016

ros-diffs@reactos.org

18 participants
358 discussions

[gadamopoulos] 72026: [SHELL32] - Query the drop effect from the key state. After latest wine sync we correctly get all possible effects instead of the effect of the last DragOver event. CORE-11681
by gadamopoulos＠svn.reactos.org 27 Jul '16

27 Jul '16

Author: gadamopoulos Date: Wed Jul 27 20:51:36 2016 New Revision: 72026 URL: http://svn.reactos.org/svn/reactos?rev=72026&view=rev Log: [SHELL32] - Query the drop effect from the key state. After latest wine sync we correctly get all possible effects instead of the effect of the last DragOver event. CORE-11681 Modified: trunk/reactos/dll/win32/shell32/folders/CFSFolder.cpp Modified: trunk/reactos/dll/win32/shell32/folders/CFSFolder.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/… ============================================================================== --- trunk/reactos/dll/win32/shell32/folders/CFSFolder.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/folders/CFSFolder.cpp [iso-8859-1] Wed Jul 27 20:51:36 2016 @@ -1177,7 +1177,7 @@ if (fAcceptFmt) { /* Does our interpretation of the keystate ... */ *pdwEffect = KeyStateToDropEffect (dwKeyState); - + if (*pdwEffect == DROPEFFECT_NONE) *pdwEffect = dwEffect; @@ -1236,6 +1236,11 @@ { TRACE("(%p) object dropped, effect %u\n", this, *pdwEffect); + if (!pdwEffect) + return E_INVALIDARG; + + QueryDrop(dwKeyState, pdwEffect); + BOOL fIsOpAsync = FALSE; CComPtr<IAsyncOperation> pAsyncOperation;

1 0

[akhaldi] 72025: [0.4.2] * Merge setupapi work by Hermès in revisions 72020-72022. CORE-11689 ROSTESTS-234
by akhaldi＠svn.reactos.org 27 Jul '16

27 Jul '16

Author: akhaldi Date: Wed Jul 27 19:32:11 2016 New Revision: 72025 URL: http://svn.reactos.org/svn/reactos?rev=72025&view=rev Log: [0.4.2] * Merge setupapi work by Hermès in revisions 72020-72022. CORE-11689 ROSTESTS-234 Modified: branches/ros-branch-0_4_2/ (props changed) branches/ros-branch-0_4_2/reactos/ (props changed) branches/ros-branch-0_4_2/reactos/dll/win32/setupapi/install.c branches/ros-branch-0_4_2/rostests/ (props changed) branches/ros-branch-0_4_2/rostests/winetests/setupapi/dialog.c Propchange: branches/ros-branch-0_4_2/ ------------------------------------------------------------------------------ svn:mergeinfo = /trunk:72020-72022 Propchange: branches/ros-branch-0_4_2/reactos/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Jul 27 19:32:11 2016 @@ -20,3 +20,4 @@ /branches/usb-bringup:51335,51337,51341-51343,51348,51350,51353,51355,51365-51369,51372,51384-54388,54396-54398,54736-54737,54752-54754,54756-54760,54762,54764-54765,54767-54768,54772,54774-54777,54781,54787,54790-54792,54797-54798,54806,54808,54834-54838,54843,54850,54852,54856,54858-54859 /branches/usb-bringup-trunk:55019-55543,55548-55554,55556-55567 /branches/wlan-bringup:54809-54998 +/trunk/reactos:72020-72022 Modified: branches/ros-branch-0_4_2/reactos/dll/win32/setupapi/install.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_2/reactos/dll/wi… ============================================================================== --- branches/ros-branch-0_4_2/reactos/dll/win32/setupapi/install.c [iso-8859-1] (original) +++ branches/ros-branch-0_4_2/reactos/dll/win32/setupapi/install.c [iso-8859-1] Wed Jul 27 19:32:11 2016 @@ -1577,11 +1577,15 @@ if ( hinf != INVALID_HANDLE_VALUE ) SetupCloseInfFile( hinf ); +#ifdef CORE_11689_IS_FIXED // TODO: Localize the error string. if (!ret && !(GlobalSetupFlags & PSPGF_NONINTERACTIVE)) { MessageBoxW(hwnd, section, L"setupapi.dll: An error happened...", MB_ICONERROR | MB_OK); } +#else + #pragma message("We need to understand why setupapi_winetest fails before reenabling the error popup in InstallHinfSectionW. CORE-11689") +#endif } Propchange: branches/ros-branch-0_4_2/rostests/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Jul 27 19:32:11 2016 @@ -1,2 +1,3 @@ /branches/GSoC_2011/KMTestSuite:51165-53670 /branches/ros-amd64-bringup/rostests:44459,44462,44537 +/trunk/rostests:72020-72022 Modified: branches/ros-branch-0_4_2/rostests/winetests/setupapi/dialog.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_2/rostests/winet… ============================================================================== --- branches/ros-branch-0_4_2/rostests/winetests/setupapi/dialog.c [iso-8859-1] (original) +++ branches/ros-branch-0_4_2/rostests/winetests/setupapi/dialog.c [iso-8859-1] Wed Jul 27 19:32:11 2016 @@ -32,7 +32,12 @@ static void test_SetupPromptForDiskA(void) { +#ifdef __REACTOS__ + char path[] = "C:\\ReactOS\\system32"; +#else + #error "path must use GetSystemDirectoryA()! ROSTESTS_234" char path[] = "C:\\windows\\system32"; +#endif char file[] = "kernel32.dll"; char buffer[MAX_PATH]; UINT ret; @@ -66,7 +71,12 @@ static void test_SetupPromptForDiskW(void) { +#ifdef __REACTOS__ + WCHAR path[] = {'C',':','\\','R','e','a','c','t','O','S','\\','s','y','s','t','e','m','3','2','\0'}; +#else + #error "path must use GetSystemDirectoryW()! ROSTESTS_234" WCHAR path[] = {'C',':','\\','w','i','n','d','o','w','s','\\','s','y','s','t','e','m','3','2','\0'}; +#endif WCHAR file[] = {'k','e','r','n','e','l','3','2','.','d','l','l','\0'}; WCHAR title[] = {'T','e','s','t','\0'}; WCHAR disk[] = {'T','e','s','t','d','i','s','k','\0'};

1 0

[pschweitzer] 72024: [BTRFS] Import three fixes from my local GitHub repository: - Don't attempt to remove Vcb from list twice on shutdown - Properly add CCB to root_file - Init cache for root_file...
by pschweitzer＠svn.reactos.org 27 Jul '16

27 Jul '16

Author: pschweitzer Date: Wed Jul 27 19:32:05 2016 New Revision: 72024 URL: http://svn.reactos.org/svn/reactos?rev=72024&view=rev Log: [BTRFS] Import three fixes from my local GitHub repository: - Don't attempt to remove Vcb from list twice on shutdown - Properly add CCB to root_file - Init cache for root_file so that cache uninit on shutdown isn't problematic This fixes BTRFS in ReactOS. These fixes have already been submitted upstream (https://github.com/maharmstone/btrfs/pull/23). CORE-11674 Modified: trunk/reactos/drivers/filesystems/btrfs/btrfs.c Modified: trunk/reactos/drivers/filesystems/btrfs/btrfs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/btrfs/… ============================================================================== --- trunk/reactos/drivers/filesystems/btrfs/btrfs.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/btrfs/btrfs.c [iso-8859-1] Wed Jul 27 19:32:05 2016 @@ -1935,7 +1935,9 @@ LIST_ENTRY* le; LARGE_INTEGER time; +#ifndef __REACTOS__ RemoveEntryList(&Vcb->list_entry); +#endif Status = registry_mark_volume_unmounted(&Vcb->superblock.uuid); if (!NT_SUCCESS(Status)) @@ -3762,12 +3764,27 @@ Vcb->root_file = IoCreateStreamFileObject(NULL, DeviceToMount); Vcb->root_file->FsContext = root_fcb; +#ifdef __REACTOS__ + Vcb->root_file->SectionObjectPointer = &root_fcb->nonpaged->segment_object; + Vcb->root_file->Vpb = DeviceObject->Vpb; +#endif RtlZeroMemory(root_ccb, sizeof(ccb)); root_ccb->NodeType = BTRFS_NODE_TYPE_CCB; root_ccb->NodeSize = sizeof(ccb); +#ifndef __REACTOS__ Vcb->root_file->FsContext = root_ccb; +#else + Vcb->root_file->FsContext2 = root_ccb; + + _SEH2_TRY { + CcInitializeCacheMap(Vcb->root_file, (PCC_FILE_SIZES)(&root_fcb->Header.AllocationSize), FALSE, cache_callbacks, Vcb->root_file); + } _SEH2_EXCEPT (EXCEPTION_EXECUTE_HANDLER) { + Status = _SEH2_GetExceptionCode(); + goto exit; + } _SEH2_END; +#endif for (i = 0; i < Vcb->superblock.num_devices; i++) { Status = find_disk_holes(Vcb, &Vcb->devices[i]);

1 0

[pschweitzer] 72023: [BTRFS] Sync btrfs to 0.5. This breaks BTRFS in ReactOS. CORE-11674
by pschweitzer＠svn.reactos.org 27 Jul '16

27 Jul '16

Author: pschweitzer Date: Wed Jul 27 19:24:26 2016 New Revision: 72023 URL: http://svn.reactos.org/svn/reactos?rev=72023&view=rev Log: [BTRFS] Sync btrfs to 0.5. This breaks BTRFS in ReactOS. CORE-11674 Added: trunk/reactos/drivers/filesystems/btrfs/registry.c (with props) trunk/reactos/drivers/filesystems/btrfs/worker-thread.c (with props) Modified: trunk/reactos/drivers/filesystems/btrfs/CMakeLists.txt trunk/reactos/drivers/filesystems/btrfs/btrfs.c trunk/reactos/drivers/filesystems/btrfs/btrfs.rc trunk/reactos/drivers/filesystems/btrfs/btrfs_drv.h trunk/reactos/drivers/filesystems/btrfs/create.c trunk/reactos/drivers/filesystems/btrfs/dirctrl.c trunk/reactos/drivers/filesystems/btrfs/extent-tree.c trunk/reactos/drivers/filesystems/btrfs/fastio.c trunk/reactos/drivers/filesystems/btrfs/fileinfo.c trunk/reactos/drivers/filesystems/btrfs/flushthread.c trunk/reactos/drivers/filesystems/btrfs/free-space.c trunk/reactos/drivers/filesystems/btrfs/fsctl.c trunk/reactos/drivers/filesystems/btrfs/pnp.c trunk/reactos/drivers/filesystems/btrfs/read.c trunk/reactos/drivers/filesystems/btrfs/reparse.c trunk/reactos/drivers/filesystems/btrfs/search.c trunk/reactos/drivers/filesystems/btrfs/security.c trunk/reactos/drivers/filesystems/btrfs/treefuncs.c trunk/reactos/drivers/filesystems/btrfs/write.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/drivers/filesystems/btrfs/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/btrfs/… Modified: trunk/reactos/drivers/filesystems/btrfs/btrfs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/btrfs/… Modified: trunk/reactos/drivers/filesystems/btrfs/btrfs.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/btrfs/… Modified: trunk/reactos/drivers/filesystems/btrfs/btrfs_drv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/btrfs/… Modified: trunk/reactos/drivers/filesystems/btrfs/create.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/btrfs/… Modified: trunk/reactos/drivers/filesystems/btrfs/dirctrl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/btrfs/… Modified: trunk/reactos/drivers/filesystems/btrfs/extent-tree.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/btrfs/… Modified: trunk/reactos/drivers/filesystems/btrfs/fastio.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/btrfs/… Modified: trunk/reactos/drivers/filesystems/btrfs/fileinfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/btrfs/… Modified: trunk/reactos/drivers/filesystems/btrfs/flushthread.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/btrfs/… Modified: trunk/reactos/drivers/filesystems/btrfs/free-space.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/btrfs/… Modified: trunk/reactos/drivers/filesystems/btrfs/fsctl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/btrfs/… Modified: trunk/reactos/drivers/filesystems/btrfs/pnp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/btrfs/… Modified: trunk/reactos/drivers/filesystems/btrfs/read.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/btrfs/… Added: trunk/reactos/drivers/filesystems/btrfs/registry.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/btrfs/… Modified: trunk/reactos/drivers/filesystems/btrfs/reparse.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/btrfs/… Modified: trunk/reactos/drivers/filesystems/btrfs/search.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/btrfs/… Modified: trunk/reactos/drivers/filesystems/btrfs/security.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/btrfs/… Modified: trunk/reactos/drivers/filesystems/btrfs/treefuncs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/btrfs/… Added: trunk/reactos/drivers/filesystems/btrfs/worker-thread.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/btrfs/… Modified: trunk/reactos/drivers/filesystems/btrfs/write.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/btrfs/…

1 0

[hbelusca] 72022: [SETUPAPI_WINETEST]: Use #ifdef __REACTOS__ instead to underline our local differences wrt. the synced Wine code. Per Amine request. ROSTESTS_234
by hbelusca＠svn.reactos.org 27 Jul '16

27 Jul '16

Author: hbelusca Date: Wed Jul 27 19:17:35 2016 New Revision: 72022 URL: http://svn.reactos.org/svn/reactos?rev=72022&view=rev Log: [SETUPAPI_WINETEST]: Use #ifdef __REACTOS__ instead to underline our local differences wrt. the synced Wine code. Per Amine request. ROSTESTS_234 Modified: trunk/rostests/winetests/setupapi/dialog.c Modified: trunk/rostests/winetests/setupapi/dialog.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/setupapi/dialog… ============================================================================== --- trunk/rostests/winetests/setupapi/dialog.c [iso-8859-1] (original) +++ trunk/rostests/winetests/setupapi/dialog.c [iso-8859-1] Wed Jul 27 19:17:35 2016 @@ -32,11 +32,11 @@ static void test_SetupPromptForDiskA(void) { -#ifndef ROSTESTS_234_IS_FIXED - // char path[] = "C:\\windows\\system32"; +#ifdef __REACTOS__ char path[] = "C:\\ReactOS\\system32"; #else - #error "path should use GetSystemDirectoryA()" + #error "path must use GetSystemDirectoryA()! ROSTESTS_234" + char path[] = "C:\\windows\\system32"; #endif char file[] = "kernel32.dll"; char buffer[MAX_PATH]; @@ -71,11 +71,11 @@ static void test_SetupPromptForDiskW(void) { -#ifndef ROSTESTS_234_IS_FIXED - // WCHAR path[] = {'C',':','\\','w','i','n','d','o','w','s','\\','s','y','s','t','e','m','3','2','\0'}; +#ifdef __REACTOS__ WCHAR path[] = {'C',':','\\','R','e','a','c','t','O','S','\\','s','y','s','t','e','m','3','2','\0'}; #else - #error "path should use GetSystemDirectoryW()" + #error "path must use GetSystemDirectoryW()! ROSTESTS_234" + WCHAR path[] = {'C',':','\\','w','i','n','d','o','w','s','\\','s','y','s','t','e','m','3','2','\0'}; #endif WCHAR file[] = {'k','e','r','n','e','l','3','2','.','d','l','l','\0'}; WCHAR title[] = {'T','e','s','t','\0'};

1 0

[hbelusca] 72021: [SETUPAPI]: Temporarily remove the error popup since setupapi_winetest pops it out unexpectedly. We don't lose functionality wrt. what we had before r72008 (or with what Wine curr...
by hbelusca＠svn.reactos.org 27 Jul '16

27 Jul '16

Author: hbelusca Date: Wed Jul 27 19:12:35 2016 New Revision: 72021 URL: http://svn.reactos.org/svn/reactos?rev=72021&view=rev Log: [SETUPAPI]: Temporarily remove the error popup since setupapi_winetest pops it out unexpectedly. We don't lose functionality wrt. what we had before r72008 (or with what Wine currently has). CORE-11689 Modified: trunk/reactos/dll/win32/setupapi/install.c Modified: trunk/reactos/dll/win32/setupapi/install.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/install… ============================================================================== --- trunk/reactos/dll/win32/setupapi/install.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/setupapi/install.c [iso-8859-1] Wed Jul 27 19:12:35 2016 @@ -1577,11 +1577,15 @@ if ( hinf != INVALID_HANDLE_VALUE ) SetupCloseInfFile( hinf ); +#ifdef CORE_11689_IS_FIXED // TODO: Localize the error string. if (!ret && !(GlobalSetupFlags & PSPGF_NONINTERACTIVE)) { MessageBoxW(hwnd, section, L"setupapi.dll: An error happened...", MB_ICONERROR | MB_OK); } +#else + #pragma message("We need to understand why setupapi_winetest fails before reenabling the error popup in InstallHinfSectionW. CORE-11689") +#endif }

1 0

[hbelusca] 72020: [SETUPAPI_WINETEST]: Temporarily "hackfix" the test so that it uses a more "suitable" test path. ROSTESTS-234
by hbelusca＠svn.reactos.org 27 Jul '16

27 Jul '16

Author: hbelusca Date: Wed Jul 27 19:05:52 2016 New Revision: 72020 URL: http://svn.reactos.org/svn/reactos?rev=72020&view=rev Log: [SETUPAPI_WINETEST]: Temporarily "hackfix" the test so that it uses a more "suitable" test path. ROSTESTS-234 Modified: trunk/rostests/winetests/setupapi/dialog.c Modified: trunk/rostests/winetests/setupapi/dialog.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/setupapi/dialog… ============================================================================== --- trunk/rostests/winetests/setupapi/dialog.c [iso-8859-1] (original) +++ trunk/rostests/winetests/setupapi/dialog.c [iso-8859-1] Wed Jul 27 19:05:52 2016 @@ -32,7 +32,12 @@ static void test_SetupPromptForDiskA(void) { - char path[] = "C:\\windows\\system32"; +#ifndef ROSTESTS_234_IS_FIXED + // char path[] = "C:\\windows\\system32"; + char path[] = "C:\\ReactOS\\system32"; +#else + #error "path should use GetSystemDirectoryA()" +#endif char file[] = "kernel32.dll"; char buffer[MAX_PATH]; UINT ret; @@ -66,7 +71,12 @@ static void test_SetupPromptForDiskW(void) { - WCHAR path[] = {'C',':','\\','w','i','n','d','o','w','s','\\','s','y','s','t','e','m','3','2','\0'}; +#ifndef ROSTESTS_234_IS_FIXED + // WCHAR path[] = {'C',':','\\','w','i','n','d','o','w','s','\\','s','y','s','t','e','m','3','2','\0'}; + WCHAR path[] = {'C',':','\\','R','e','a','c','t','O','S','\\','s','y','s','t','e','m','3','2','\0'}; +#else + #error "path should use GetSystemDirectoryW()" +#endif WCHAR file[] = {'k','e','r','n','e','l','3','2','.','d','l','l','\0'}; WCHAR title[] = {'T','e','s','t','\0'}; WCHAR disk[] = {'T','e','s','t','d','i','s','k','\0'};

1 0

[pschweitzer] 72019: [KMTESTS] Add missing dependency
by pschweitzer＠svn.reactos.org 27 Jul '16

27 Jul '16

Author: pschweitzer Date: Wed Jul 27 16:40:30 2016 New Revision: 72019 URL: http://svn.reactos.org/svn/reactos?rev=72019&view=rev Log: [KMTESTS] Add missing dependency Modified: trunk/rostests/kmtests/CMakeLists.txt Modified: trunk/rostests/kmtests/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/CMakeLists.txt?re… ============================================================================== --- trunk/rostests/kmtests/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/kmtests/CMakeLists.txt [iso-8859-1] Wed Jul 27 16:40:30 2016 @@ -152,7 +152,8 @@ iohelper_drv ioreadwrite_drv poirp_drv - tcpip_drv) + tcpip_drv + cccopyread_drv) add_custom_target(kmtest_all) add_dependencies(kmtest_all kmtest_drivers kmtest)

1 0

[akhaldi] 72018: [0.4.2] * Apply the hackfix from CORE-9836 by Joachim Henze.
by akhaldi＠svn.reactos.org 27 Jul '16

27 Jul '16

Author: akhaldi Date: Wed Jul 27 15:21:39 2016 New Revision: 72018 URL: http://svn.reactos.org/svn/reactos?rev=72018&view=rev Log: [0.4.2] * Apply the hackfix from CORE-9836 by Joachim Henze. Modified: branches/ros-branch-0_4_2/reactos/win32ss/user/ntuser/class.c branches/ros-branch-0_4_2/reactos/win32ss/user/ntuser/cursoricon.c branches/ros-branch-0_4_2/reactos/win32ss/user/ntuser/msgqueue.c Modified: branches/ros-branch-0_4_2/reactos/win32ss/user/ntuser/class.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_2/reactos/win32s… ============================================================================== --- branches/ros-branch-0_4_2/reactos/win32ss/user/ntuser/class.c [iso-8859-1] (original) +++ branches/ros-branch-0_4_2/reactos/win32ss/user/ntuser/class.c [iso-8859-1] Wed Jul 27 15:21:39 2016 @@ -267,8 +267,11 @@ if (Class->spicn) UserDereferenceObject(Class->spicn); - if (Class->spcur) + if (Class->spcur && !UserObjectInDestroy(Class->spcur)) + { UserDereferenceObject(Class->spcur); + Class->spcur = NULL; + } if (Class->spicnSm) { UserDereferenceObject(Class->spicnSm); Modified: branches/ros-branch-0_4_2/reactos/win32ss/user/ntuser/cursoricon.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_2/reactos/win32s… ============================================================================== --- branches/ros-branch-0_4_2/reactos/win32ss/user/ntuser/cursoricon.c [iso-8859-1] (original) +++ branches/ros-branch-0_4_2/reactos/win32ss/user/ntuser/cursoricon.c [iso-8859-1] Wed Jul 27 15:21:39 2016 @@ -1086,11 +1086,14 @@ goto leave; } + pcurOld->CURSORF_flags &= ~CURSORF_CURRENT; + /* See if it was destroyed in the meantime */ if (UserObjectInDestroy(hOldCursor)) - hOldCursor = NULL; - pcurOld->CURSORF_flags &= ~CURSORF_CURRENT; - UserDereferenceObject(pcurOld); + { + UserDereferenceObject(pcurOld); + pcurOld = NULL; + } } leave: Modified: branches/ros-branch-0_4_2/reactos/win32ss/user/ntuser/msgqueue.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_2/reactos/win32s… ============================================================================== --- branches/ros-branch-0_4_2/reactos/win32ss/user/ntuser/msgqueue.c [iso-8859-1] (original) +++ branches/ros-branch-0_4_2/reactos/win32ss/user/ntuser/msgqueue.c [iso-8859-1] Wed Jul 27 15:21:39 2016 @@ -2288,8 +2288,12 @@ IntGetSysCursorInfo()->CurrentCursorObject = NULL; } - TRACE("DereferenceObject pCursor\n"); - UserDereferenceObject(pCursor); + if (pCursor && UserObjectInDestroy(UserHMGetHandle(pCursor))) + { + TRACE("DereferenceObject pCursor\n"); + UserDereferenceObject(pCursor); + pCursor = NULL; + } } if (gpqForeground == MessageQueue)

1 0

[tfaber] 72017: [NTOS:PO] - Send power IRPs to the top of the device stack instead of the PDO CORE-10110 #resolve
by tfaber＠svn.reactos.org 27 Jul '16

27 Jul '16

Author: tfaber Date: Wed Jul 27 11:15:52 2016 New Revision: 72017 URL: http://svn.reactos.org/svn/reactos?rev=72017&view=rev Log: [NTOS:PO] - Send power IRPs to the top of the device stack instead of the PDO CORE-10110 #resolve Modified: trunk/reactos/ntoskrnl/po/power.c Modified: trunk/reactos/ntoskrnl/po/power.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/po/power.c?rev=72… ============================================================================== --- trunk/reactos/ntoskrnl/po/power.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/po/power.c [iso-8859-1] Wed Jul 27 11:15:52 2016 @@ -153,6 +153,7 @@ PVOID Context) { PPOWER_STATE_TRAVERSE_CONTEXT PowerStateContext = Context; + PDEVICE_OBJECT TopDeviceObject; NTSTATUS Status; DPRINT("PopQuerySystemPowerStateTraverse(%p, %p)\n", DeviceNode, Context); @@ -163,13 +164,16 @@ if (DeviceNode->Flags & DNF_LEGACY_DRIVER) return STATUS_SUCCESS; - Status = PopSendQuerySystemPowerState(DeviceNode->PhysicalDeviceObject, + TopDeviceObject = IoGetAttachedDeviceReference(DeviceNode->PhysicalDeviceObject); + + Status = PopSendQuerySystemPowerState(TopDeviceObject, PowerStateContext->SystemPowerState, PowerStateContext->PowerAction); if (!NT_SUCCESS(Status)) { DPRINT1("Device '%wZ' failed IRP_MN_QUERY_POWER\n", &DeviceNode->InstancePath); } + ObDereferenceObject(TopDeviceObject); #if 0 return Status; @@ -183,6 +187,7 @@ PVOID Context) { PPOWER_STATE_TRAVERSE_CONTEXT PowerStateContext = Context; + PDEVICE_OBJECT TopDeviceObject; NTSTATUS Status; DPRINT("PopSetSystemPowerStateTraverse(%p, %p)\n", DeviceNode, Context); @@ -196,13 +201,22 @@ if (DeviceNode->Flags & DNF_LEGACY_DRIVER) return STATUS_SUCCESS; - Status = PopSendSetSystemPowerState(DeviceNode->PhysicalDeviceObject, + TopDeviceObject = IoGetAttachedDeviceReference(DeviceNode->PhysicalDeviceObject); + if (TopDeviceObject == PowerStateContext->PowerDevice) + { + ObDereferenceObject(TopDeviceObject); + return STATUS_SUCCESS; + } + + Status = PopSendSetSystemPowerState(TopDeviceObject, PowerStateContext->SystemPowerState, PowerStateContext->PowerAction); if (!NT_SUCCESS(Status)) { DPRINT1("Device '%wZ' failed IRP_MN_SET_POWER\n", &DeviceNode->InstancePath); } + + ObDereferenceObject(TopDeviceObject); #if 0 return Status;

1 0

← Newer
1
2
3
4
5
6
7
8
...
36
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs July 2016