Ros-diffs

ros-diffs@reactos.org

81390 discussions

[tfaber] 64865: [WIN32K] - Remove bug-hiding list macros that accept NULL in LIST_ENTRYs. CORE-8668 #resolve
by tfaber＠svn.reactos.org 21 Oct '14

21 Oct '14

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);

1 0

[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 21 Oct '14

21 Oct '14

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()

1 0

[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 21 Oct '14

21 Oct '14

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;

1 0

[jgardou] 64862: [WIN32K] - Avoid use after free in debug configuration CORE-8661 #resolve
by jgardou＠svn.reactos.org 21 Oct '14

21 Oct '14

Author: jgardou Date: Tue Oct 21 10:45:49 2014 New Revision: 64862 URL: http://svn.reactos.org/svn/reactos?rev=64862&view=rev Log: [WIN32K] - Avoid use after free in debug configuration CORE-8661 #resolve Modified: trunk/reactos/win32ss/user/ntuser/object.c Modified: trunk/reactos/win32ss/user/ntuser/object.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/object… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/object.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/object.c [iso-8859-1] Tue Oct 21 10:45:49 2014 @@ -710,14 +710,15 @@ return; } +#if DBG + oldppi->DbgHandleCount[type]--; + ppi->DbgHandleCount[type]++; +#endif + oldppi->UserHandleCount--; IntDereferenceProcessInfo(oldppi); ppi->UserHandleCount++; IntReferenceProcessInfo(ppi); -#if DBG - oldppi->DbgHandleCount[type]--; - ppi->DbgHandleCount[type]++; -#endif } BOOLEAN

1 0

[jgardou] 64861: [CMAKE] - link keyboard layout modules to gcc_ssp if the stack protector is enabled.
by jgardou＠svn.reactos.org 21 Oct '14

21 Oct '14

Author: jgardou Date: Tue Oct 21 10:45:36 2014 New Revision: 64861 URL: http://svn.reactos.org/svn/reactos?rev=64861&view=rev Log: [CMAKE] - link keyboard layout modules to gcc_ssp if the stack protector is enabled. Modified: trunk/reactos/dll/keyboard/CMakeLists.txt Modified: trunk/reactos/dll/keyboard/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/CMakeLists.tx… ============================================================================== --- trunk/reactos/dll/keyboard/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/CMakeLists.txt [iso-8859-1] Tue Oct 21 10:45:36 2014 @@ -102,6 +102,10 @@ add_target_link_flags(${_keyboard_layout} "-Wl,-T,${CMAKE_SOURCE_DIR}/kbdlayout.lds") endif() + if (STACK_PROTECTOR) + target_link_libraries(${_keyboard_layout} gcc_ssp) + endif() + if(RUNTIME_CHECKS) target_link_libraries(${_keyboard_layout} runtmchk) endif()

1 0

[jimtabor] 64860: [User32] - Remove code that breaks wine release 1.7.29 user32 input tests. Code was there since r2505. - So due to this commit, over compensating hacks can break.
by jimtabor＠svn.reactos.org 21 Oct '14

21 Oct '14

Author: jimtabor Date: Tue Oct 21 03:13:21 2014 New Revision: 64860 URL: http://svn.reactos.org/svn/reactos?rev=64860&view=rev Log: [User32] - Remove code that breaks wine release 1.7.29 user32 input tests. Code was there since r2505. - So due to this commit, over compensating hacks can break. Modified: trunk/reactos/win32ss/user/user32/windows/defwnd.c Modified: trunk/reactos/win32ss/user/user32/windows/defwnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/window… ============================================================================== --- trunk/reactos/win32ss/user/user32/windows/defwnd.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/windows/defwnd.c [iso-8859-1] Tue Oct 21 03:13:21 2014 @@ -622,10 +622,7 @@ case WM_RBUTTONUP: { POINT Pt; - if (hWnd == GetCapture()) - { - ReleaseCapture(); - } + Pt.x = GET_X_LPARAM(lParam); Pt.y = GET_Y_LPARAM(lParam); ClientToScreen(hWnd, &Pt);

1 0

[jimtabor] 64859: [Win32k] - rpdeskParent can be NULL and should not be depended on! Fixes CORE-8665.
by jimtabor＠svn.reactos.org 21 Oct '14

21 Oct '14

Author: jimtabor Date: Tue Oct 21 03:02:07 2014 New Revision: 64859 URL: http://svn.reactos.org/svn/reactos?rev=64859&view=rev Log: [Win32k] - rpdeskParent can be NULL and should not be depended on! Fixes CORE-8665. Modified: trunk/reactos/win32ss/user/ntuser/callproc.c Modified: trunk/reactos/win32ss/user/ntuser/callproc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/callpr… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/callproc.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/callproc.c [iso-8859-1] Tue Oct 21 03:02:07 2014 @@ -7,6 +7,7 @@ */ #include <win32k.h> +DBG_DEFAULT_CHANNEL(UserClass); /* CALLPROC ******************************************************************/ @@ -110,6 +111,7 @@ { PCLS pCls; PWND pWnd; + PDESKTOP pDesk; PCALLPROCDATA CallProc = NULL; PTHREADINFO pti; @@ -131,7 +133,14 @@ // No luck, create a new one for the requested proc. if (!CallProc) { - CallProc = CreateCallProc( pCls->rpdeskParent, + if (!pCls->rpdeskParent) + { + TRACE("Null DESKTOP Atom %d\n",pCls->atomClassName); + pDesk = pti->rpdesk; + } + else + pDesk = pCls->rpdeskParent; + CallProc = CreateCallProc( pDesk, (WNDPROC)ProcIn, !!(Flags & UserGetCPDA2U), pti->ppi);

1 0

[dquintana] 64858: [BROWSEUI] * SHOnCWMCommandLine: Fix IETHREADPARAM leak. [SHELL32] * Fix HMENU leak of the popup used in the view mode button of the toolbar. [RSHELL] * Undo a previous change to...
by dquintana＠svn.reactos.org 20 Oct '14

20 Oct '14

Author: dquintana Date: Mon Oct 20 21:35:22 2014 New Revision: 64858 URL: http://svn.reactos.org/svn/reactos?rev=64858&view=rev Log: [BROWSEUI] * SHOnCWMCommandLine: Fix IETHREADPARAM leak. [SHELL32] * Fix HMENU leak of the popup used in the view mode button of the toolbar. [RSHELL] * Undo a previous change to help debug the leaks. * Remove child submenus when closing a menu band. * Add some extra verification for debugging purposes. [BROWSEUI] [RSHELL] [SHELL32] * Move ReleaseCComPtrExpectZero to the shared header. Modified: branches/shell-experiments/base/shell/rshell/CMenuBand.cpp branches/shell-experiments/base/shell/rshell/CMenuBand.h branches/shell-experiments/base/shell/rshell/CMenuDeskBar.cpp branches/shell-experiments/base/shell/rshell/CStartMenu.cpp branches/shell-experiments/dll/win32/browseui/desktopipc.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 branches/shell-experiments/include/reactos/undocshell.h Modified: branches/shell-experiments/base/shell/rshell/CMenuBand.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/rs… ============================================================================== --- branches/shell-experiments/base/shell/rshell/CMenuBand.cpp [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/rshell/CMenuBand.cpp [iso-8859-1] Mon Oct 20 21:35:22 2014 @@ -56,7 +56,9 @@ m_popupBar(NULL), m_popupItem(-1), m_Show(FALSE), - m_shellBottom(FALSE) + m_shellBottom(FALSE), + m_trackedPopup(NULL), + m_trackedHwnd(NULL) { m_focusManager = CMenuFocusManager::AcquireManager(); } @@ -418,6 +420,16 @@ HRESULT STDMETHODCALLTYPE CMenuBand::CloseDW(DWORD dwReserved) { + if (m_subMenuChild) + { + m_subMenuChild->OnSelect(MPOS_CANCELLEVEL); + } + + if (m_subMenuChild) + { + DbgPrint("Child object should have removed itself.\n"); + } + ShowDW(FALSE); if (m_staticToolbar != NULL) @@ -594,7 +606,10 @@ HRESULT STDMETHODCALLTYPE CMenuBand::SetClient(IUnknown *punkClient) { - m_subMenuChild = NULL; + if (m_subMenuChild) + { + ReleaseCComPtrExpectZero(m_subMenuChild); + } if (!punkClient) { @@ -738,9 +753,15 @@ UINT flags = TPM_VERPOSANIMATION | TPM_VERTICAL | TPM_LEFTALIGN; HWND hwnd = m_menuOwner ? m_menuOwner : m_topLevelWindow; + m_trackedPopup = popup; + m_trackedHwnd = hwnd; + m_focusManager->PushTrackedPopup(popup); ::TrackPopupMenuEx(popup, flags, x, y, hwnd, &params); m_focusManager->PopTrackedPopup(popup); + + m_trackedPopup = NULL; + m_trackedHwnd = NULL; _DisableMouseTrack(FALSE); @@ -950,11 +971,19 @@ HRESULT CMenuBand::_CancelCurrentPopup() { - if (!m_subMenuChild) - return S_FALSE; - - HRESULT hr = m_subMenuChild->OnSelect(MPOS_CANCELLEVEL); - return hr; + if (m_subMenuChild) + { + HRESULT hr = m_subMenuChild->OnSelect(MPOS_CANCELLEVEL); + return hr; + } + + if (m_trackedPopup) + { + ::SendMessage(m_trackedHwnd, WM_CANCELMODE, 0, 0); + return S_OK; + } + + return S_FALSE; } HRESULT CMenuBand::_OnPopupSubMenu(IShellMenu * childShellMenu, POINTL * pAt, RECTL * pExclude, BOOL keyInitiated) @@ -1044,6 +1073,11 @@ return S_OK; } +HRESULT CMenuBand::_HasSubMenu() +{ + return m_popupBar ? S_OK : S_FALSE; +} + HRESULT STDMETHODCALLTYPE CMenuBand::InvalidateItem(LPSMDATA psmd, DWORD dwFlags) { UNIMPLEMENTED; Modified: branches/shell-experiments/base/shell/rshell/CMenuBand.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/rs… ============================================================================== --- branches/shell-experiments/base/shell/rshell/CMenuBand.h [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/rshell/CMenuBand.h [iso-8859-1] Mon Oct 20 21:35:22 2014 @@ -68,6 +68,9 @@ BOOL m_Show; BOOL m_shellBottom; + HMENU m_trackedPopup; + HWND m_trackedHwnd; + public: CMenuBand(); virtual ~CMenuBand(); @@ -194,6 +197,7 @@ HRESULT _KillPopupTimers(); HRESULT _MenuBarMouseDown(HWND hwnd, INT item); HRESULT _MenuBarMouseUp(HWND hwnd, INT item); + HRESULT _HasSubMenu(); BOOL UseBigIcons() { 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] Mon Oct 20 21:35:22 2014 @@ -171,7 +171,17 @@ CComPtr<IDeskBarClient> pDeskBandClient; HRESULT hr; - m_Client.Release(); + if (m_Client) + { + hr = m_Client->QueryInterface(IID_PPV_ARG(IDeskBarClient, &pDeskBandClient)); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; + + pDeskBandClient->SetDeskBarSite(NULL); + + pDeskBandClient = NULL; + m_Client = NULL; + } if (punkClient == NULL) return S_OK; @@ -222,9 +232,19 @@ if (m_Shown) _CloseBar(); + m_SubMenuParent = NULL; + m_Site = pUnkSite; - IUnknown_QueryService(m_Site, SID_SMenuPopup, IID_PPV_ARG(IMenuPopup, &m_SubMenuParent)); + if (m_Site) + { + IUnknown_QueryService(m_Site, SID_SMenuPopup, IID_PPV_ARG(IMenuPopup, &m_SubMenuParent)); + } + else + { + DestroyWindow(); + SetClient(NULL); + } return S_OK; } Modified: branches/shell-experiments/base/shell/rshell/CStartMenu.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/rs… ============================================================================== --- branches/shell-experiments/base/shell/rshell/CStartMenu.cpp [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/rshell/CStartMenu.cpp [iso-8859-1] Mon Oct 20 21:35:22 2014 @@ -151,7 +151,14 @@ int csidl = 0; IShellMenu *pShellMenu; +#if USE_SYSTEM_MENUBAND + hr = CoCreateInstance(CLSID_MenuBand, + NULL, + CLSCTX_INPROC_SERVER, + IID_PPV_ARG(IShellMenu, &pShellMenu)); +#else hr = CMenuBand_Constructor(IID_PPV_ARG(IShellMenu, &pShellMenu)); +#endif if (FAILED_UNEXPECTEDLY(hr)) return hr; @@ -394,15 +401,36 @@ LPITEMIDLIST pidlPrograms; CComPtr<IShellFolder> psfPrograms; +#if USE_SYSTEM_MENUBAND + hr = CoCreateInstance(CLSID_MenuBand, + NULL, + CLSCTX_INPROC_SERVER, + IID_PPV_ARG(IShellMenu, &pShellMenu)); +#else hr = CMenuBand_Constructor(IID_PPV_ARG(IShellMenu, &pShellMenu)); - if (FAILED_UNEXPECTEDLY(hr)) - return hr; - +#endif + if (FAILED_UNEXPECTEDLY(hr)) + return hr; + +#if USE_SYSTEM_MENUSITE + hr = CoCreateInstance(CLSID_MenuBandSite, + NULL, + CLSCTX_INPROC_SERVER, + IID_PPV_ARG(IBandSite, &pBandSite)); +#else hr = CMenuSite_Constructor(IID_PPV_ARG(IBandSite, &pBandSite)); - if (FAILED_UNEXPECTEDLY(hr)) - return hr; - +#endif + if (FAILED_UNEXPECTEDLY(hr)) + return hr; + +#if USE_SYSTEM_MENUDESKBAR + hr = CoCreateInstance(CLSID_MenuDeskBar, + NULL, + CLSCTX_INPROC_SERVER, + IID_PPV_ARG(IDeskBar, &pDeskBar)); +#else hr = CMenuDeskBar_Constructor(IID_PPV_ARG(IDeskBar, &pDeskBar)); +#endif if (FAILED_UNEXPECTEDLY(hr)) return hr; Modified: branches/shell-experiments/dll/win32/browseui/desktopipc.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/bro… ============================================================================== --- branches/shell-experiments/dll/win32/browseui/desktopipc.cpp [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/browseui/desktopipc.cpp [iso-8859-1] Mon Oct 20 21:35:22 2014 @@ -345,22 +345,6 @@ return params; } - -/************************************************************************* -* SHOnCWMCommandLine [BROWSEUI.127] -*/ -extern "C" BOOL WINAPI SHOnCWMCommandLine(HANDLE hSharedInfo) -{ - DbgPrint("SHOnCWMCommandLine\n"); - - PIE_THREAD_PARAM_BLOCK params = ParseSharedPacket(hSharedInfo); - - if (params) - return SHOpenFolderWindow(params); - - return FALSE; -} - /************************************************************************* * SHCreateIETHREADPARAM [BROWSEUI.123] */ @@ -442,6 +426,23 @@ } /************************************************************************* +* SHOnCWMCommandLine [BROWSEUI.127] +*/ +extern "C" BOOL WINAPI SHOnCWMCommandLine(HANDLE hSharedInfo) +{ + DbgPrint("SHOnCWMCommandLine\n"); + + PIE_THREAD_PARAM_BLOCK params = ParseSharedPacket(hSharedInfo); + + if (params) + return SHOpenFolderWindow(params); + + SHDestroyIETHREADPARAM(params); + + return FALSE; +} + +/************************************************************************* * SHOpenFolderWindow [BROWSEUI.102] * see SHOpenNewFrame below for remarks */ 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] Mon Oct 20 21:35:22 2014 @@ -992,27 +992,6 @@ return hResult; } return S_OK; -} - -template<class T> -void ReleaseCComPtrExpectZero(CComPtr<T>& cptr, BOOL forceRelease = FALSE) -{ - if (cptr.p != NULL) - { - int nrc = cptr->Release(); - if (nrc > 0) - { - DbgPrint("WARNING: Unexpected RefCount > 0 (%d)!\n", nrc); - if (forceRelease) - { - while (nrc > 0) - { - nrc = cptr->Release(); - } - } - } - cptr.Detach(); - } } HRESULT STDMETHODCALLTYPE CInternetToolbar::CloseDW(DWORD dwReserved) 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] Mon Oct 20 21:35:22 2014 @@ -2563,6 +2563,9 @@ return S_OK; } + if (!fCurrentShellView) + return S_FALSE; + return fCurrentShellView->TranslateAcceleratorW(pmsg); } @@ -3068,27 +3071,6 @@ { OnCreate(reinterpret_cast<LPCREATESTRUCT> (lParam)); return 0; -} - -template<class T> -void ReleaseCComPtrExpectZero(CComPtr<T>& cptr, BOOL forceRelease = FALSE) -{ - if (cptr.p != NULL) - { - int nrc = cptr->Release(); - if (nrc > 0) - { - DbgPrint("WARNING: Unexpected RefCount > 0!\n"); - if (forceRelease) - { - while (nrc > 0) - { - nrc = cptr->Release(); - } - } - } - cptr.Detach(); - } } LRESULT CShellBrowser::OnDestroy(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled) 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] Mon Oct 20 21:35:22 2014 @@ -341,36 +341,37 @@ typedef void (CALLBACK *PFNSHGETSETTINGSPROC)(LPSHELLFLAGSTATE lpsfs, DWORD dwMask); -CDefView::CDefView() -{ - m_hWndList = NULL; - m_hWndParent = NULL; - m_FolderSettings.fFlags = 0; - m_FolderSettings.ViewMode = 0; - m_hMenu = NULL; - m_menusLoaded = FALSE; - m_uState = 0; - m_cidl = 0; - m_apidl = NULL; - m_sortInfo.bIsAscending = FALSE; - m_sortInfo.nHeaderID = 0; - m_sortInfo.nLastHeaderID = 0; - m_hNotify = 0; - m_hAccel = NULL; - m_dwAspects = 0; - m_dwAdvf = 0; - m_iDragOverItem = 0; - m_cScrollDelay = 0; - m_ptLastMousePos.x = 0; - m_ptLastMousePos.y = 0; - m_isEditing = FALSE; - ZeroMemory(&m_Category, sizeof(m_Category)); - m_hView = NULL; +CDefView::CDefView() : + m_hWndList(NULL), + m_hWndParent(NULL), + m_hMenu(NULL), + m_menusLoaded(FALSE), + m_uState(0), + m_cidl(0), + m_apidl(NULL), + m_hNotify(0), + m_hAccel(NULL), + m_dwAspects(0), + m_dwAdvf(0), + m_iDragOverItem(0), + m_cScrollDelay(0), + m_isEditing(FALSE), + m_hView(NULL) +{ + m_FolderSettings = { 0 }; + m_sortInfo = { 0 }; + m_ptLastMousePos = { 0 }; + m_Category = { 0 }; } CDefView::~CDefView() { TRACE(" destroying IShellView(%p)\n", this); + + if (m_hWnd) + { + DestroyViewWindow(); + } SHFree(m_apidl); } @@ -2122,12 +2123,35 @@ /*Make absolutely sure all our UI is cleaned up.*/ UIActivate(SVUIA_DEACTIVATE); + if (m_hAccel) + { + // "Accelerator tables loaded from resources are freed automatically when the application terminates." -- MSDN + m_hAccel = NULL; + } + + if (m_hView) + { + DestroyMenu(m_hView); + m_hView = NULL; + } + if (m_hMenu) { DestroyMenu(m_hMenu); - } - - DestroyWindow(); + m_hView = NULL; + } + + if (m_hWndList) + { + ::DestroyWindow(m_hWndList); + m_hWndList = NULL; + } + + if (m_hWnd) + { + DestroyWindow(); + } + m_pShellBrowser.Release(); m_pCommDlgBrowser.Release(); Modified: branches/shell-experiments/include/reactos/undocshell.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/include/react… ============================================================================== --- branches/shell-experiments/include/reactos/undocshell.h [iso-8859-1] (original) +++ branches/shell-experiments/include/reactos/undocshell.h [iso-8859-1] Mon Oct 20 21:35:22 2014 @@ -691,6 +691,27 @@ } }; +template<class T> +void ReleaseCComPtrExpectZero(CComPtr<T>& cptr, BOOL forceRelease = FALSE) +{ + if (cptr.p != NULL) + { + int nrc = cptr->Release(); + if (nrc > 0) + { + DbgPrint("WARNING: Unexpected RefCount > 0 (%d)!\n", nrc); + if (forceRelease) + { + while (nrc > 0) + { + nrc = cptr->Release(); + } + } + } + cptr.Detach(); + } +} + template<class T, class R> HRESULT inline ShellObjectCreator(REFIID riid, R ** ppv) {

1 0

[dquintana] 64857: [EXPLORER-NEW] * Initialize struct contents to zero. CID 1102492 [BROWSEUI] * Fix build.
by dquintana＠svn.reactos.org 20 Oct '14

20 Oct '14

Author: dquintana Date: Mon Oct 20 21:23:32 2014 New Revision: 64857 URL: http://svn.reactos.org/svn/reactos?rev=64857&view=rev Log: [EXPLORER-NEW] * Initialize struct contents to zero. CID 1102492 [BROWSEUI] * Fix build. Modified: branches/shell-experiments/base/shell/explorer-new/trayntfy.c branches/shell-experiments/include/reactos/undocshell.h Modified: branches/shell-experiments/base/shell/explorer-new/trayntfy.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/ex… ============================================================================== --- branches/shell-experiments/base/shell/explorer-new/trayntfy.c [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/explorer-new/trayntfy.c [iso-8859-1] Mon Oct 20 21:23:32 2014 @@ -117,7 +117,7 @@ SysPagerWnd_UpdateButton(IN OUT PSYS_PAGER_WND_DATA This, IN CONST NOTIFYICONDATA *iconData) { - TBBUTTONINFO tbbi; + TBBUTTONINFO tbbi = {0}; PNOTIFY_ITEM notifyItem; PPNOTIFY_ITEM NotifyPointer; Modified: branches/shell-experiments/include/reactos/undocshell.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/include/react… ============================================================================== --- branches/shell-experiments/include/reactos/undocshell.h [iso-8859-1] (original) +++ branches/shell-experiments/include/reactos/undocshell.h [iso-8859-1] Mon Oct 20 21:23:32 2014 @@ -735,11 +735,11 @@ return S_OK; } -template<class T, class T1, class R> -HRESULT inline ShellObjectCreatorInit(T1 initArg1, REFIID riid, R ** ppv) +template<class T> +HRESULT inline ShellObjectCreatorInit(REFIID riid, void ** ppv) { CComPtr<T> obj; - CComPtr<R> result; + CComPtr<IUnknown> result; HRESULT hResult; if (ppv == NULL) @@ -752,7 +752,7 @@ if (FAILED(hResult)) return hResult; - hResult = obj->Initialize(initArg1); + hResult = obj->Initialize(); if (FAILED(hResult)) return hResult; @@ -761,8 +761,8 @@ return S_OK; } -template<class T, class T1, class T2, class R> -HRESULT inline ShellObjectCreatorInit(T1 initArg1, T2 initArg2, REFIID riid, R ** ppv) +template<class T, class T1, class R> +HRESULT inline ShellObjectCreatorInit(T1 initArg1, REFIID riid, R ** ppv) { CComPtr<T> obj; CComPtr<R> result; @@ -778,7 +778,7 @@ if (FAILED(hResult)) return hResult; - hResult = obj->Initialize(initArg1, initArg2); + hResult = obj->Initialize(initArg1); if (FAILED(hResult)) return hResult; @@ -787,8 +787,8 @@ return S_OK; } -template<class T, class T1, class T2, class T3, class R> -HRESULT inline ShellObjectCreatorInit(T1 initArg1, T2 initArg2, T3 initArg3, REFIID riid, R ** ppv) +template<class T, class T1, class T2, class R> +HRESULT inline ShellObjectCreatorInit(T1 initArg1, T2 initArg2, REFIID riid, R ** ppv) { CComPtr<T> obj; CComPtr<R> result; @@ -804,7 +804,7 @@ if (FAILED(hResult)) return hResult; - hResult = obj->Initialize(initArg1, initArg2, initArg3); + hResult = obj->Initialize(initArg1, initArg2); if (FAILED(hResult)) return hResult; @@ -813,8 +813,8 @@ return S_OK; } -template<class T, class T1, class T2, class T3, class T4, class R> -HRESULT inline ShellObjectCreatorInit(T1 initArg1, T2 initArg2, T3 initArg3, T4 initArg4, REFIID riid, R ** ppv) +template<class T, class T1, class T2, class T3, class R> +HRESULT inline ShellObjectCreatorInit(T1 initArg1, T2 initArg2, T3 initArg3, REFIID riid, R ** ppv) { CComPtr<T> obj; CComPtr<R> result; @@ -830,6 +830,32 @@ if (FAILED(hResult)) return hResult; + hResult = obj->Initialize(initArg1, initArg2, initArg3); + if (FAILED(hResult)) + return hResult; + + *ppv = result.Detach(); + + return S_OK; +} + +template<class T, class T1, class T2, class T3, class T4, class R> +HRESULT inline ShellObjectCreatorInit(T1 initArg1, T2 initArg2, T3 initArg3, T4 initArg4, REFIID riid, R ** ppv) +{ + CComPtr<T> obj; + CComPtr<R> result; + HRESULT hResult; + + if (ppv == NULL) + return E_POINTER; + *ppv = NULL; + ATLTRY(obj = new CComObject<T>); + if (obj.p == NULL) + return E_OUTOFMEMORY; + hResult = obj->QueryInterface(riid, reinterpret_cast<void **>(&result)); + if (FAILED(hResult)) + return hResult; + hResult = obj->Initialize(initArg1, initArg2, initArg3, initArg4); if (FAILED(hResult)) return hResult;

1 0

[spetreolle] 64856: [UNIATA] Update to 0.45b1. CORE-8280 #resolve
by spetreolle＠svn.reactos.org 20 Oct '14

20 Oct '14

Author: spetreolle Date: Mon Oct 20 21:21:43 2014 New Revision: 64856 URL: http://svn.reactos.org/svn/reactos?rev=64856&view=rev Log: [UNIATA] Update to 0.45b1. CORE-8280 #resolve Modified: trunk/reactos/drivers/storage/ide/uniata/id_dma.cpp trunk/reactos/drivers/storage/ide/uniata/uniata_ver.h Modified: trunk/reactos/drivers/storage/ide/uniata/id_dma.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… ============================================================================== --- trunk/reactos/drivers/storage/ide/uniata/id_dma.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/ide/uniata/id_dma.cpp [iso-8859-1] Mon Oct 20 21:21:43 2014 @@ -587,10 +587,8 @@ case ATA_PROMISE_ID: if(ChipType == PRNEW) { ULONG Channel = deviceExtension->Channel + lChannel; + if(chan->ChannelCtrlFlags & CTRFLAGS_LBA48) { - AtapiWritePortEx1(chan, (ULONGIO_PTR)(&deviceExtension->BaseIoAddressBM_0),0x11, - AtapiReadPortEx1(chan, (ULONGIO_PTR)(&deviceExtension->BaseIoAddressBM_0),0x11) | - (Channel ? 0x08 : 0x02)); AtapiWritePortEx4(chan, (ULONGIO_PTR)(&deviceExtension->BaseIoAddressBM_0),(Channel ? 0x24 : 0x20), ((Srb->SrbFlags & SRB_FLAGS_DATA_IN) ? 0x05000000 : 0x06000000) | (Srb->DataTransferLength >> 1) ); @@ -659,10 +657,12 @@ case ATA_PROMISE_ID: if(ChipType == PRNEW) { ULONG Channel = deviceExtension->Channel + lChannel; +/* + AtapiWritePortEx1(chan, (ULONGIO_PTR)(&deviceExtension->BaseIoAddressBM_0),0x11, + AtapiReadPortEx1(chan, (ULONGIO_PTR)(&deviceExtension->BaseIoAddressBM_0),0x11) & + ~(Channel ? 0x08 : 0x02)); +*/ if(chan->ChannelCtrlFlags & CTRFLAGS_LBA48) { - AtapiWritePortEx1(chan, (ULONGIO_PTR)(&deviceExtension->BaseIoAddressBM_0),0x11, - AtapiReadPortEx1(chan, (ULONGIO_PTR)(&deviceExtension->BaseIoAddressBM_0),0x11) & - ~(Channel ? 0x08 : 0x02)); AtapiWritePortEx4(chan, (ULONGIO_PTR)(&deviceExtension->BaseIoAddressBM_0),(Channel ? 0x24 : 0x20), 0 ); @@ -1555,10 +1555,13 @@ return; break; } - case ATA_PROMISE_ID: + case ATA_PROMISE_ID: { /***********/ /* Promise */ /***********/ + + UCHAR sel66 = Channel ? 0x08: 0x02; + if(ChipType < PRTX) { if (isAtapi) { udmamode = @@ -1566,12 +1569,29 @@ } } for(i=udmamode; i>=0; i--) { + + if(ChipType == PRNEW) { + if(i>2) { + AtapiWritePortEx1(chan, (ULONGIO_PTR)(&deviceExtension->BaseIoAddressBM_0),0x11, + AtapiReadPortEx1(chan, (ULONGIO_PTR)(&deviceExtension->BaseIoAddressBM_0),0x11) | + sel66); + } else { + AtapiWritePortEx1(chan, (ULONGIO_PTR)(&deviceExtension->BaseIoAddressBM_0),0x11, + AtapiReadPortEx1(chan, (ULONGIO_PTR)(&deviceExtension->BaseIoAddressBM_0),0x11) & + ~sel66); + } + } + if(AtaSetTransferMode(deviceExtension, DeviceNumber, lChannel, LunExt, ATA_UDMA0 + i)) { promise_timing(deviceExtension, dev, (UCHAR)(ATA_UDMA + i)); // ??? return; } } - + if(ChipType == PRNEW) { + AtapiWritePortEx1(chan, (ULONGIO_PTR)(&deviceExtension->BaseIoAddressBM_0),0x11, + AtapiReadPortEx1(chan, (ULONGIO_PTR)(&deviceExtension->BaseIoAddressBM_0),0x11) & + ~sel66); + } for(i=wdmamode; i>=0; i--) { if(AtaSetTransferMode(deviceExtension, DeviceNumber, lChannel, LunExt, ATA_WDMA0 + i)) { promise_timing(deviceExtension, dev, (UCHAR)(ATA_WDMA0+i)); @@ -1587,7 +1607,7 @@ AtaSetTransferMode(deviceExtension, DeviceNumber, lChannel, LunExt, ATA_PIO0 + apiomode); promise_timing(deviceExtension, dev, ATA_PIO0 + apiomode); return; - break; + break; } case ATA_ATI_ID: KdPrint2((PRINT_PREFIX "ATI\n")); Modified: trunk/reactos/drivers/storage/ide/uniata/uniata_ver.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… ============================================================================== --- trunk/reactos/drivers/storage/ide/uniata/uniata_ver.h [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/ide/uniata/uniata_ver.h [iso-8859-1] Mon Oct 20 21:21:43 2014 @@ -1,10 +1,10 @@ -#define UNIATA_VER_STR "45b" -#define UNIATA_VER_DOT 0.45.2.0 +#define UNIATA_VER_STR "45b1" +#define UNIATA_VER_DOT 0.45.2.1 #define UNIATA_VER_MJ 0 #define UNIATA_VER_MN 45 #define UNIATA_VER_SUB_MJ 2 -#define UNIATA_VER_SUB_MN 0 -#define UNIATA_VER_DOT_COMMA 0,45,2,0 -#define UNIATA_VER_DOT_STR "0.45.2.0" +#define UNIATA_VER_SUB_MN 1 +#define UNIATA_VER_DOT_COMMA 0,45,2,1 +#define UNIATA_VER_DOT_STR "0.45.2.1" #define UNIATA_VER_YEAR 2014 #define UNIATA_VER_YEAR_STR "2014"

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