Ros-diffs

ros-diffs@reactos.org

81390 discussions

[spetreolle] 65606: test
by spetreolle＠svn.reactos.org 11 Dec '14

11 Dec '14

Author: spetreolle Date: Thu Dec 11 18:00:21 2014 New Revision: 65606 URL: http://svn.reactos.org/svn/reactos?rev=65606&view=rev Log: test Added: trunk/reactos/hello Added: trunk/reactos/hello URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hello?rev=65606 ============================================================================== --- trunk/reactos/hello (added) +++ trunk/reactos/hello [iso-8859-1] Thu Dec 11 18:00:21 2014 @@ -0,0 +1 @@ +hello

1 0

[gadamopoulos] 65605: [EXPLORER] - Simplify some code by using the IUnknown_ exports of shlwapi and using CComPtr.
by gadamopoulos＠svn.reactos.org 11 Dec '14

11 Dec '14

Author: gadamopoulos Date: Thu Dec 11 17:42:56 2014 New Revision: 65605 URL: http://svn.reactos.org/svn/reactos?rev=65605&view=rev Log: [EXPLORER] - Simplify some code by using the IUnknown_ exports of shlwapi and using CComPtr. Modified: trunk/reactos/base/shell/explorer/taskband.cpp trunk/reactos/base/shell/explorer/tbsite.cpp Modified: trunk/reactos/base/shell/explorer/taskband.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/taskba… ============================================================================== --- trunk/reactos/base/shell/explorer/taskband.cpp [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/taskband.cpp [iso-8859-1] Thu Dec 11 17:42:56 2014 @@ -272,55 +272,31 @@ virtual HRESULT STDMETHODCALLTYPE SetSite(IUnknown *pUnkSite) { - HRESULT hRet = E_FAIL; + HRESULT hRet; + HWND hwndSite; TRACE("ITaskBand::SetSite(0x%p)\n", pUnkSite); - /* Release the current site */ - if (m_Site != NULL) - { - m_Site->Release(); - } - - m_Site = NULL; - m_hWnd = NULL; - - if (pUnkSite != NULL) - { - CComPtr<IOleWindow> OleWindow; - - /* Check if the site supports IOleWindow */ - hRet = pUnkSite->QueryInterface(IID_PPV_ARG(IOleWindow, &OleWindow)); - if (SUCCEEDED(hRet)) - { - HWND hWndParent = NULL; - - hRet = OleWindow->GetWindow(&hWndParent); - if (SUCCEEDED(hRet)) - { - /* Attempt to create the task switch window */ - - TRACE("CreateTaskSwitchWnd(Parent: 0x%p)\n", hWndParent); - m_hWnd = CreateTaskSwitchWnd(hWndParent, m_Tray); - if (m_hWnd != NULL) - { - m_Site = pUnkSite; - hRet = S_OK; - } - else - { - TRACE("CreateTaskSwitchWnd() failed!\n"); - hRet = E_FAIL; - } - } - } - else - { - TRACE("Querying IOleWindow failed: 0x%x\n", hRet); - } - } - - return hRet; + hRet = IUnknown_GetWindow(pUnkSite, &hwndSite); + if (FAILED(hRet)) + { + TRACE("Querying site window failed: 0x%x\n", hRet); + return hRet; + } + + TRACE("CreateTaskSwitchWnd(Parent: 0x%p)\n", hwndSite); + + HWND hwndTaskSwitch = CreateTaskSwitchWnd(hwndSite, m_Tray); + if (!hwndTaskSwitch) + { + ERR("CreateTaskSwitchWnd failed"); + return E_FAIL; + } + + m_Site = pUnkSite; + m_hWnd = hwndTaskSwitch; + + return S_OK; } virtual HRESULT STDMETHODCALLTYPE GetSite( Modified: trunk/reactos/base/shell/explorer/tbsite.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/tbsite… ============================================================================== --- trunk/reactos/base/shell/explorer/tbsite.cpp [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/tbsite.cpp [iso-8859-1] Thu Dec 11 17:42:56 2014 @@ -350,23 +350,9 @@ virtual HRESULT STDMETHODCALLTYPE AddBand(IN IUnknown *punk) { - IOleCommandTarget *pOct; - HRESULT hRet; - - hRet = punk->QueryInterface(IID_PPV_ARG(IOleCommandTarget, &pOct)); - if (SUCCEEDED(hRet)) - { - /* Send the DBID_DELAYINIT command to initialize the band to be added */ - /* FIXME: Should be delayed */ - pOct->Exec( - &IID_IDeskBand, - DBID_DELAYINIT, - 0, - NULL, - NULL); - - pOct->Release(); - } + /* Send the DBID_DELAYINIT command to initialize the band to be added */ + /* FIXME: Should be delayed */ + IUnknown_Exec(punk, IID_IDeskBand, DBID_DELAYINIT, 0, NULL, NULL); return m_BandSite->AddBand(punk); }

1 0

[dquintana] 65604: Oops. That didn't happen.
by dquintana＠svn.reactos.org 11 Dec '14

11 Dec '14

Author: dquintana Date: Thu Dec 11 16:33:43 2014 New Revision: 65604 URL: http://svn.reactos.org/svn/reactos?rev=65604&view=rev Log: Oops. That didn't happen. Modified: trunk/reactos/base/shell/explorer/precomp.h Modified: trunk/reactos/base/shell/explorer/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/precom… ============================================================================== --- trunk/reactos/base/shell/explorer/precomp.h [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/precomp.h [iso-8859-1] Thu Dec 11 16:33:43 2014 @@ -1,7 +1,7 @@ #ifndef _EXPLORER_PRECOMP__H_ #define _EXPLORER_PRECOMP__H_ -#define WIN7_COMPAT_MODE 1 +#define WIN7_COMPAT_MODE 0 #include <stdio.h> #include <tchar.h>

1 0

[dquintana] 65603: [EXPLORER] * Cleanup variable names and fix a few typos along the way. * Refactor the start button code into a CStartButton class. NOTE: There is a known regression with start bu...
by dquintana＠svn.reactos.org 11 Dec '14

11 Dec '14

Author: dquintana Date: Thu Dec 11 16:32:07 2014 New Revision: 65603 URL: http://svn.reactos.org/svn/reactos?rev=65603&view=rev Log: [EXPLORER] * Cleanup variable names and fix a few typos along the way. * Refactor the start button code into a CStartButton class. NOTE: There is a known regression with start button themeing, which I'm working on. The missing notification icons are not caused by this. CORE-8898 Modified: trunk/reactos/base/shell/explorer/desktop.cpp trunk/reactos/base/shell/explorer/precomp.h trunk/reactos/base/shell/explorer/startctxmnu.cpp trunk/reactos/base/shell/explorer/startmnusite.cpp trunk/reactos/base/shell/explorer/taskband.cpp trunk/reactos/base/shell/explorer/taskswnd.cpp trunk/reactos/base/shell/explorer/tbsite.cpp trunk/reactos/base/shell/explorer/trayntfy.cpp trunk/reactos/base/shell/explorer/traywnd.cpp [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/base/shell/explorer/desktop.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/deskto… Modified: trunk/reactos/base/shell/explorer/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/precom… Modified: trunk/reactos/base/shell/explorer/startctxmnu.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/startc… Modified: trunk/reactos/base/shell/explorer/startmnusite.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/startm… Modified: trunk/reactos/base/shell/explorer/taskband.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/taskba… Modified: trunk/reactos/base/shell/explorer/taskswnd.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/tasksw… Modified: trunk/reactos/base/shell/explorer/tbsite.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/tbsite… Modified: trunk/reactos/base/shell/explorer/trayntfy.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/traynt… Modified: trunk/reactos/base/shell/explorer/traywnd.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/traywn…

1 0

[zguo] 65602: [SHIMGVW] Dynamically allocate the string for the file-type box. Patch by Ricardo Hanke. CORE-7702 #resolve
by zguo＠svn.reactos.org 10 Dec '14

10 Dec '14

Author: zguo Date: Wed Dec 10 21:27:18 2014 New Revision: 65602 URL: http://svn.reactos.org/svn/reactos?rev=65602&view=rev Log: [SHIMGVW] Dynamically allocate the string for the file-type box. Patch by Ricardo Hanke. CORE-7702 #resolve Modified: trunk/reactos/dll/win32/shimgvw/shimgvw.c Modified: trunk/reactos/dll/win32/shimgvw/shimgvw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shimgvw/shimgvw.… ============================================================================== --- trunk/reactos/dll/win32/shimgvw/shimgvw.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shimgvw/shimgvw.c [iso-8859-1] Wed Dec 10 21:27:18 2014 @@ -76,7 +76,7 @@ OPENFILENAMEW sfn; ImageCodecInfo *codecInfo; WCHAR szSaveFileName[MAX_PATH]; - WCHAR szFilterMask[2048]; + WCHAR *szFilterMask; GUID rawFormat; UINT num; UINT size; @@ -84,8 +84,38 @@ UINT j; WCHAR *c; + GdipGetImageEncodersSize(&num, &size); + codecInfo = malloc(size); + if (!codecInfo) + { + DPRINT1("malloc() failed in pSaveImageAs()\n"); + return; + } + + GdipGetImageEncoders(num, size, codecInfo); + GdipGetImageRawFormat(image, &rawFormat); + + sizeRemain = 0; + + for (j = 0; j < num; ++j) + { + // Every pair needs space for the Description, twice the Extensions, 1 char for the space, 2 for the braces and 2 for the NULL terminators. + sizeRemain = sizeRemain + (((wcslen(codecInfo[j].FormatDescription) + (wcslen(codecInfo[j].FilenameExtension) * 2) + 5) * sizeof(WCHAR))); + } + + /* Add two more chars for the last terminator */ + sizeRemain = sizeRemain + (sizeof(WCHAR) * 2); + + szFilterMask = malloc(sizeRemain); + if (!szFilterMask) + { + DPRINT1("cannot allocate memory for filter mask in pSaveImageAs()"); + free(codecInfo); + return; + } + ZeroMemory(szSaveFileName, sizeof(szSaveFileName)); - ZeroMemory(szFilterMask, sizeof(szFilterMask)); + ZeroMemory(szFilterMask, sizeRemain); ZeroMemory(&sfn, sizeof(sfn)); sfn.lStructSize = sizeof(sfn); sfn.hwndOwner = hwnd; @@ -95,18 +125,6 @@ sfn.nMaxFile = MAX_PATH; sfn.Flags = OFN_OVERWRITEPROMPT | OFN_HIDEREADONLY; - GdipGetImageEncodersSize(&num, &size); - codecInfo = malloc(size); - if (!codecInfo) - { - DPRINT1("malloc() failed in pSaveImageAs()\n"); - return; - } - - GdipGetImageEncoders(num, size, codecInfo); - GdipGetImageRawFormat(image, &rawFormat); - - sizeRemain = sizeof(szFilterMask); c = szFilterMask; for (j = 0; j < num; ++j) @@ -137,6 +155,7 @@ } } + free(szFilterMask); free(codecInfo); }

1 0

[pschweitzer] 65601: [NTFS] Implement the downward fashion of FSCTL_GET_NTFS_FILE_RECORD and always return a file record which is in use CORE-8725
by pschweitzer＠svn.reactos.org 10 Dec '14

10 Dec '14

Author: pschweitzer Date: Wed Dec 10 20:45:04 2014 New Revision: 65601 URL: http://svn.reactos.org/svn/reactos?rev=65601&view=rev Log: [NTFS] Implement the downward fashion of FSCTL_GET_NTFS_FILE_RECORD and always return a file record which is in use CORE-8725 Modified: trunk/reactos/drivers/filesystems/ntfs/fsctl.c Modified: trunk/reactos/drivers/filesystems/ntfs/fsctl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/f… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/fsctl.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/fsctl.c [iso-8859-1] Wed Dec 10 20:45:04 2014 @@ -626,14 +626,23 @@ InputBuffer = (PNTFS_FILE_RECORD_INPUT_BUFFER)Irp->AssociatedIrp.SystemBuffer; MFTRecord = InputBuffer->FileReferenceNumber.QuadPart; - Status = ReadFileRecord(DeviceExt, MFTRecord, FileRecord); - if (!NT_SUCCESS(Status)) - { - DPRINT1("Failed reading record: %I64x\n", MFTRecord); - ExFreePoolWithTag(FileRecord, TAG_NTFS); - return Status; - } - + DPRINT1("Requesting: %I64x\n", MFTRecord); + + do + { + Status = ReadFileRecord(DeviceExt, MFTRecord, FileRecord); + if (NT_SUCCESS(Status)) + { + if (FileRecord->Flags & FRH_IN_USE) + { + break; + } + } + + --MFTRecord; + } while (TRUE); + + DPRINT1("Returning: %I64x\n", MFTRecord); OutputBuffer = (PNTFS_FILE_RECORD_OUTPUT_BUFFER)Irp->AssociatedIrp.SystemBuffer; OutputBuffer->FileReferenceNumber.QuadPart = MFTRecord; OutputBuffer->FileRecordLength = DeviceExt->NtfsInfo.BytesPerFileRecord;

1 0

[gadamopoulos] 65600: [EXPLORER] * Simplify CreateStartMenu. Use CComPtr and IUnknown_SetSite.
by gadamopoulos＠svn.reactos.org 09 Dec '14

09 Dec '14

Author: gadamopoulos Date: Tue Dec 9 22:49:54 2014 New Revision: 65600 URL: http://svn.reactos.org/svn/reactos?rev=65600&view=rev Log: [EXPLORER] * Simplify CreateStartMenu. Use CComPtr and IUnknown_SetSite. Modified: trunk/reactos/base/shell/explorer/startmnu.cpp Modified: trunk/reactos/base/shell/explorer/startmnu.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/startm… ============================================================================== --- trunk/reactos/base/shell/explorer/startmnu.cpp [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/startmnu.cpp [iso-8859-1] Tue Dec 9 22:49:54 2014 @@ -47,13 +47,12 @@ IN BOOL bSmallIcons) { HRESULT hr; - IObjectWithSite *pOws = NULL; - IMenuPopup *pMp = NULL; - IUnknown *pSms = NULL; - IMenuBand *pMb = NULL; - IInitializeObject *pIo; - IUnknown *pUnk = NULL; - IBandSite *pBs = NULL; + CComPtr<IMenuPopup> pMp; + CComPtr<IUnknown> pSms; + CComPtr<IMenuBand> pMb; + CComPtr<IInitializeObject> pIo; + CComPtr<IUnknown> pUnk; + CComPtr<IBandSite> pBs; DWORD dwBandId = 0; hr = CreateStartMenuSite(Tray, IID_PPV_ARG(IUnknown, &pSms)); @@ -70,95 +69,47 @@ hr = _CStartMenu_Constructor(IID_PPV_ARG(IMenuPopup, &pMp)); #endif if (FAILED_UNEXPECTEDLY(hr)) - { - TRACE("CoCreateInstance failed: %x\n", hr); - goto cleanup; - } - - hr = pMp->QueryInterface(IID_PPV_ARG(IObjectWithSite, &pOws)); - if (FAILED_UNEXPECTEDLY(hr)) - { - TRACE("IMenuPopup_QueryInterface failed: %x\n", hr); - goto cleanup; - } + return NULL; /* Set the menu site so we can handle messages */ - hr = pOws->SetSite(pSms); + hr = IUnknown_SetSite(pMp, pSms); if (FAILED_UNEXPECTEDLY(hr)) - { - TRACE("IObjectWithSite_SetSite failed: %x\n", hr); - goto cleanup; - } + return NULL; /* Initialize the menu object */ hr = pMp->QueryInterface(IID_PPV_ARG(IInitializeObject, &pIo)); if (SUCCEEDED(hr)) - { hr = pIo->Initialize(); - pIo->Release(); - } else hr = S_OK; /* Everything is initialized now. Let's get the IMenuBand interface. */ if (FAILED_UNEXPECTEDLY(hr)) - { - TRACE("IMenuPopup_QueryInterface failed: %x\n", hr); - goto cleanup; - } + return NULL; hr = pMp->GetClient(&pUnk); if (FAILED_UNEXPECTEDLY(hr)) - { - TRACE("IMenuPopup_GetClient failed: %x\n", hr); - goto cleanup; - } + return NULL; hr = pUnk->QueryInterface(IID_PPV_ARG(IBandSite, &pBs)); if (FAILED_UNEXPECTEDLY(hr)) - { - TRACE("IUnknown_QueryInterface pBs failed: %x\n", hr); - goto cleanup; - } + return NULL; /* Finally we have the IBandSite interface, there's only one band in it that apparently provides the IMenuBand interface */ hr = pBs->EnumBands(0, &dwBandId); if (FAILED_UNEXPECTEDLY(hr)) - { - TRACE("IBandSite_EnumBands failed: %x\n", hr); - goto cleanup; - } + return NULL; hr = pBs->GetBandObject(dwBandId, IID_PPV_ARG(IMenuBand, &pMb)); if (FAILED_UNEXPECTEDLY(hr)) - { - TRACE("IBandSite_GetBandObject failed: %x\n", hr); - goto cleanup; - } + return NULL; UpdateStartMenu(pMp, hbmBanner, bSmallIcons); -cleanup: - if (SUCCEEDED(hr)) - *ppMenuBand = pMb; - else if (pMb != NULL) - pMb->Release(); + *ppMenuBand = pMb.Detach(); - if (pBs != NULL) - pBs->Release(); - if (pUnk != NULL) - pUnk->Release(); - if (pOws != NULL) - pOws->Release(); - if (pMp != NULL) - pMp->Release(); - if (pSms != NULL) - pSms->Release(); - - if (FAILED_UNEXPECTEDLY(hr)) - return NULL; - return pMp; + return pMp.Detach(); }

1 0

[gadamopoulos] 65599: [EXPLORER] * Make SetWindowStyle and SetWindowExStyle simple wrappers around SHSetWindowBits. There is no reason to reinvent the wheel.
by gadamopoulos＠svn.reactos.org 09 Dec '14

09 Dec '14

Author: gadamopoulos Date: Tue Dec 9 22:01:46 2014 New Revision: 65599 URL: http://svn.reactos.org/svn/reactos?rev=65599&view=rev Log: [EXPLORER] * Make SetWindowStyle and SetWindowExStyle simple wrappers around SHSetWindowBits. There is no reason to reinvent the wheel. Modified: trunk/reactos/base/shell/explorer/precomp.h trunk/reactos/base/shell/explorer/util.cpp Modified: trunk/reactos/base/shell/explorer/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/precom… ============================================================================== --- trunk/reactos/base/shell/explorer/precomp.h [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/precomp.h [iso-8859-1] Tue Dec 9 22:01:46 2014 @@ -56,15 +56,23 @@ * explorer.c */ +static inline LONG SetWindowStyle(IN HWND hWnd, IN LONG dwStyleMask, -IN LONG dwStyle); - +IN LONG dwStyle) +{ + return SHSetWindowBits(hWnd, GWL_STYLE, dwStyleMask, dwStyle); +} + +static inline LONG SetWindowExStyle(IN HWND hWnd, IN LONG dwStyleMask, -IN LONG dwStyle); +IN LONG dwStyle) +{ + return SHSetWindowBits(hWnd, GWL_EXSTYLE, dwStyleMask, dwStyle); +} HMENU LoadPopupMenu(IN HINSTANCE hInstance, Modified: trunk/reactos/base/shell/explorer/util.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/util.c… ============================================================================== --- trunk/reactos/base/shell/explorer/util.cpp [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/util.cpp [iso-8859-1] Tue Dec 9 22:01:46 2014 @@ -28,50 +28,6 @@ /* We're dealing with the same object if the IUnknown pointers are equal */ return (punk1 == punk2) ? S_OK : S_FALSE; -} - -LONG -SetWindowStyle(IN HWND hWnd, - IN LONG dwStyleMask, - IN LONG dwStyle) -{ - LONG PrevStyle, Style; - - ASSERT((~dwStyleMask & dwStyle) == 0); - - PrevStyle = GetWindowLong(hWnd, GWL_STYLE); - if (PrevStyle != 0 && - (PrevStyle & dwStyleMask) != dwStyle) - { - Style = PrevStyle & ~dwStyleMask; - Style |= dwStyle; - - PrevStyle = SetWindowLong(hWnd, GWL_STYLE, Style); - } - - return PrevStyle; -} - -LONG -SetWindowExStyle(IN HWND hWnd, - IN LONG dwStyleMask, - IN LONG dwStyle) -{ - LONG PrevStyle, Style; - - ASSERT((~dwStyleMask & dwStyle) == 0); - - PrevStyle = GetWindowLong(hWnd, GWL_EXSTYLE); - if (PrevStyle != 0 && - (PrevStyle & dwStyleMask) != dwStyle) - { - Style = PrevStyle & ~dwStyleMask; - Style |= dwStyle; - - PrevStyle = SetWindowLong(hWnd, GWL_EXSTYLE, Style); - } - - return PrevStyle; } HMENU

1 0

[gadamopoulos] 65598: [EXPLORER] * Remove dragdrop.cpp. It was never used.
by gadamopoulos＠svn.reactos.org 09 Dec '14

09 Dec '14

Author: gadamopoulos Date: Tue Dec 9 21:55:56 2014 New Revision: 65598 URL: http://svn.reactos.org/svn/reactos?rev=65598&view=rev Log: [EXPLORER] * Remove dragdrop.cpp. It was never used. Removed: trunk/reactos/base/shell/explorer/dragdrop.cpp Modified: trunk/reactos/base/shell/explorer/CMakeLists.txt trunk/reactos/base/shell/explorer/precomp.h Modified: trunk/reactos/base/shell/explorer/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/CMakeL… ============================================================================== --- trunk/reactos/base/shell/explorer/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/CMakeLists.txt [iso-8859-1] Tue Dec 9 21:55:56 2014 @@ -6,7 +6,6 @@ list(APPEND SOURCE desktop.cpp - dragdrop.cpp explorer.cpp rshell.cpp settings.cpp Removed: trunk/reactos/base/shell/explorer/dragdrop.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/dragdr… ============================================================================== --- trunk/reactos/base/shell/explorer/dragdrop.cpp [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/dragdrop.cpp (removed) @@ -1,314 +0,0 @@ -/* - * ReactOS Explorer - * - * Copyright 2006 - 2007 Thomas Weidenmueller <w3seek(a)reactos.org> - * - * 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 Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -#include "precomp.h" - -class CDropTarget : - public CComCoClass<CDropTarget>, - public CComObjectRootEx<CComMultiThreadModelNoCS>, - public IDropTarget -{ - HWND hwndTarget; - CComPtr<IDropTargetHelper> DropTargetHelper; - PVOID Context; - BOOL CanDrop; - DROPTARGET_CALLBACKS Callbacks; - DWORD FormatsCount; - FORMATETC* Formats; - - const FORMATETC * - FindSupportedFormat(IN IDataObject *pDataObject) - { - FORMATETC *Current, *Last; - HRESULT hr; - - /* NOTE: we could use IDataObject::EnumFormatEtc(), - but this appears to be a lot easier! */ - Last = Formats + FormatsCount; - for (Current = Formats; - Current != Last; - Current++) - { - hr = pDataObject->QueryGetData(Current); - if (SUCCEEDED(hr)) - return Current; - } - - return NULL; - } - -public: - CDropTarget() : - hwndTarget(NULL), - Context(NULL), - CanDrop(FALSE), - FormatsCount(0), - Formats(NULL) - { - ZeroMemory(&Callbacks, sizeof(Callbacks)); - } - - virtual ~CDropTarget() { } - - HRESULT Initialize(IN HWND hwndTarget, - IN DWORD nSupportedFormats, - IN const FORMATETC *formats OPTIONAL, - IN PVOID Context OPTIONAL, - IN const DROPTARGET_CALLBACKS *Callbacks OPTIONAL) - { - this->hwndTarget = hwndTarget; - FormatsCount = nSupportedFormats; - if (nSupportedFormats != 0) - { - Formats = new FORMATETC[nSupportedFormats]; - CopyMemory(Formats, - formats, - sizeof(formats[0]) * nSupportedFormats); - } - - this->Context = Context; - if (Callbacks != NULL) - { - CopyMemory(&this->Callbacks, - Callbacks, - sizeof(*Callbacks)); - } - - HRESULT hr = CoCreateInstance(CLSID_DragDropHelper, - NULL, - CLSCTX_INPROC_SERVER, - IID_PPV_ARG(IDropTargetHelper, &DropTargetHelper)); - - return hr; - } - - virtual HRESULT STDMETHODCALLTYPE DragEnter( - IN IDataObject *pDataObject, - IN DWORD grfKeyState, - IN POINTL pt, - IN OUT DWORD *pdwEffect) - { - const FORMATETC *Format; - HRESULT hr; - - if (pDataObject == NULL) - return E_INVALIDARG; - - CanDrop = FALSE; - - hr = DropTargetHelper->DragEnter( - hwndTarget, - pDataObject, - (POINT *) &pt, - *pdwEffect); - - if (SUCCEEDED(hr)) - { - Format = FindSupportedFormat( - pDataObject); - if (Format != NULL) - { - /* We found a format that we support! */ - if (Callbacks.OnDragEnter != NULL) - { - hr = Callbacks.OnDragEnter(this, - Context, - Format, - grfKeyState, - pt, - pdwEffect); - if (SUCCEEDED(hr)) - { - if (hr == S_OK) - CanDrop = TRUE; - else - { - /* Special return value by the callback routine, - doesn't want to allow dragging */ - *pdwEffect = DROPEFFECT_NONE; - } - - hr = S_OK; - } - else - { - *pdwEffect = DROPEFFECT_NONE; - hr = S_OK; - } - } - else - *pdwEffect = DROPEFFECT_NONE; - } - else - *pdwEffect = DROPEFFECT_NONE; - } - - return hr; - } - - virtual HRESULT STDMETHODCALLTYPE DragOver( - IN DWORD grfKeyState, - IN POINTL pt, - IN OUT DWORD *pdwEffect) - { - HRESULT hr; - - hr = DropTargetHelper->DragOver( - (POINT *) &pt, - *pdwEffect); - - if (SUCCEEDED(hr)) - { - if (CanDrop) - { - if (Callbacks.OnDragOver != NULL) - { - hr = Callbacks.OnDragOver(this, - Context, - grfKeyState, - pt, - pdwEffect); - if (SUCCEEDED(hr)) - { - if (hr != S_OK) - { - /* Special return value by the callback routine, - doesn't want to allow dropping here */ - *pdwEffect = DROPEFFECT_NONE; - } - - hr = S_OK; - } - else - { - *pdwEffect = DROPEFFECT_NONE; - hr = S_OK; - } - } - else - *pdwEffect = DROPEFFECT_NONE; - } - else - *pdwEffect = DROPEFFECT_NONE; - } - - return hr; - } - - virtual HRESULT STDMETHODCALLTYPE DragLeave() - { - HRESULT hr; - - hr = DropTargetHelper->DragLeave(); - if (SUCCEEDED(hr)) - { - if (Callbacks.OnDragLeave != NULL) - { - hr = Callbacks.OnDragLeave(this, - Context); - } - } - - return hr; - } - - virtual HRESULT STDMETHODCALLTYPE Drop( - IN IDataObject *pDataObject, - IN DWORD grfKeyState, - IN POINTL pt, - IN OUT DWORD *pdwEffect) - { - const FORMATETC *Format; - HRESULT hr; - - if (pDataObject == NULL) - return E_INVALIDARG; - - hr = DropTargetHelper->Drop( - pDataObject, - (POINT *) &pt, - *pdwEffect); - - if (SUCCEEDED(hr) && CanDrop) - { - Format = FindSupportedFormat(pDataObject); - if (Format != NULL) - { - /* We found a format that we support! */ - if (Callbacks.OnDrop != NULL) - { - hr = Callbacks.OnDrop(this, - Context, - Format, - grfKeyState, - pt, - pdwEffect); - if (SUCCEEDED(hr)) - { - if (hr == S_OK) - CanDrop = TRUE; - else - { - /* Special return value by the callback routine, - doesn't want to allow dragging */ - *pdwEffect = DROPEFFECT_NONE; - } - - hr = S_OK; - } - else - { - *pdwEffect = DROPEFFECT_NONE; - hr = S_OK; - } - } - else - *pdwEffect = DROPEFFECT_NONE; - } - else - *pdwEffect = DROPEFFECT_NONE; - } - - return hr; - } - - DECLARE_NOT_AGGREGATABLE(CDropTarget) - - DECLARE_PROTECT_FINAL_CONSTRUCT() - BEGIN_COM_MAP(CDropTarget) - COM_INTERFACE_ENTRY_IID(IID_IDropTarget, IDropTarget) - END_COM_MAP() -}; - -IDropTarget * -CreateDropTarget(IN HWND hwndTarget, - IN DWORD nSupportedFormats, - IN const FORMATETC *Formats OPTIONAL, - IN PVOID Context OPTIONAL, - IN const DROPTARGET_CALLBACKS *Callbacks OPTIONAL) -{ - IDropTarget *dt; - - HRESULT hr = ShellObjectCreatorInit<CDropTarget>(hwndTarget, nSupportedFormats, Formats, Context, Callbacks, IID_IDropTarget, &dt); - if (FAILED_UNEXPECTEDLY(hr)) - return NULL; - - return dt; -} Modified: trunk/reactos/base/shell/explorer/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/precom… ============================================================================== --- trunk/reactos/base/shell/explorer/precomp.h [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/precomp.h [iso-8859-1] Tue Dec 9 21:55:56 2014 @@ -51,40 +51,6 @@ extern HINSTANCE hExplorerInstance; extern HANDLE hProcessHeap; extern HKEY hkExplorer; - -/* - * dragdrop.c - */ - -typedef struct _DROPTARGET_CALLBACKS -{ - HRESULT(*OnDragEnter)(IN IDropTarget *pDropTarget, - IN PVOID Context, - IN const FORMATETC *Format, - IN DWORD grfKeyState, - IN POINTL pt, - IN OUT DWORD *pdwEffect); - HRESULT(*OnDragOver)(IN IDropTarget *pDropTarget, - IN PVOID Context, - IN DWORD grfKeyState, - IN POINTL pt, - IN OUT DWORD *pdwEffect); - HRESULT(*OnDragLeave)(IN IDropTarget *pDropTarget, - IN PVOID Context); - HRESULT(*OnDrop)(IN IDropTarget *pDropTarget, - IN PVOID Context, - IN const FORMATETC *Format, - IN DWORD grfKeyState, - IN POINTL pt, - IN OUT DWORD *pdwEffect); -} DROPTARGET_CALLBACKS, *PDROPTARGET_CALLBACKS; - -IDropTarget * -CreateDropTarget(IN HWND hwndTarget, -IN DWORD nSupportedFormats, -IN const FORMATETC *Formats OPTIONAL, -IN PVOID Context OPTIONAL, -IN const DROPTARGET_CALLBACKS *Callbacks OPTIONAL); /* * explorer.c

1 0

[gadamopoulos] 65597: [EXPLORER] * Import some undocumented functions directly instead of using GetProcAddress
by gadamopoulos＠svn.reactos.org 09 Dec '14

09 Dec '14

Author: gadamopoulos Date: Tue Dec 9 21:37:59 2014 New Revision: 65597 URL: http://svn.reactos.org/svn/reactos?rev=65597&view=rev Log: [EXPLORER] * Import some undocumented functions directly instead of using GetProcAddress Modified: trunk/reactos/base/shell/explorer/explorer.cpp trunk/reactos/base/shell/explorer/precomp.h trunk/reactos/base/shell/explorer/startmnusite.cpp trunk/reactos/base/shell/explorer/taskswnd.cpp trunk/reactos/base/shell/explorer/traywnd.cpp Modified: trunk/reactos/base/shell/explorer/explorer.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/explor… ============================================================================== --- trunk/reactos/base/shell/explorer/explorer.cpp [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/explorer.cpp [iso-8859-1] Tue Dec 9 21:37:59 2014 @@ -22,10 +22,8 @@ #include <browseui_undoc.h> HINSTANCE hExplorerInstance; -HMODULE hUser32; HANDLE hProcessHeap; HKEY hkExplorer = NULL; -DRAWCAPTEMP DrawCapTemp = NULL; class CExplorerModule : public CComModule { @@ -137,14 +135,8 @@ hExplorerInstance = hInstance; hProcessHeap = GetProcessHeap(); + LoadAdvancedSettings(); - - hUser32 = GetModuleHandle(TEXT("USER32.DLL")); - if (hUser32 != NULL) - { - DrawCapTemp = (DRAWCAPTEMP) GetProcAddress(hUser32, PROC_NAME_DRAWCAPTIONTEMP); - } - InitCommonControls(); OleInitialize(NULL); Modified: trunk/reactos/base/shell/explorer/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/precom… ============================================================================== --- trunk/reactos/base/shell/explorer/precomp.h [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/precomp.h [iso-8859-1] Tue Dec 9 21:37:59 2014 @@ -28,6 +28,7 @@ #include <strsafe.h> #include <undocuser.h> +#include <shlwapi_undoc.h> #include <shlobj_undoc.h> #include <shlguid_undoc.h> #include <undocshell.h> @@ -41,23 +42,6 @@ #include <wine/debug.h> WINE_DEFAULT_DEBUG_CHANNEL(explorernew); - -/* dynamic imports due to lack of support in msvc linker libs */ -typedef INT(APIENTRY *REGSHELLHOOK)(HWND, DWORD); -#ifdef UNICODE -#define PROC_NAME_DRAWCAPTIONTEMP "DrawCaptionTempW" -typedef BOOL(APIENTRY *DRAWCAPTEMP)(HWND, HDC, const RECT*, HFONT, HICON, LPCWSTR, UINT); -#else -#define PROC_NAME_DRAWCAPTIONTEMP "DrawCaptionTempA" -typedef BOOL (APIENTRY *DRAWCAPTEMP)(HWND, HDC, const RECT*, HFONT, HICON, LPCSTR, UINT); -#endif -typedef HRESULT(APIENTRY *SHINVDEFCMD)(HWND, IShellFolder*, LPCITEMIDLIST); -typedef void (APIENTRY *RUNFILEDLG)(HWND, HICON, LPCWSTR, LPCWSTR, LPCWSTR, UINT); -typedef void (APIENTRY *EXITWINDLG)(HWND); -typedef HRESULT(APIENTRY *SHWINHELP)(HWND, LPWSTR, UINT, DWORD); - -/* Constants for RunFileDlg */ -#define RFF_CALCDIRECTORY 0x04 /* Calculates the working directory from the file name. */ #define ASSERT(cond) \ do if (!(cond)) { \ @@ -65,10 +49,8 @@ } while (0) extern HINSTANCE hExplorerInstance; -extern HMODULE hUser32; extern HANDLE hProcessHeap; extern HKEY hkExplorer; -extern DRAWCAPTEMP DrawCapTemp; /* * dragdrop.c Modified: trunk/reactos/base/shell/explorer/startmnusite.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/startm… ============================================================================== --- trunk/reactos/base/shell/explorer/startmnusite.cpp [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/startmnusite.cpp [iso-8859-1] Tue Dec 9 21:37:59 2014 @@ -83,26 +83,11 @@ IN IShellFolder *pShellFolder, IN LPCITEMIDLIST pidl) { - HMODULE hShlwapi; HRESULT ret = S_FALSE; TRACE("ITrayPriv::Execute\n"); - hShlwapi = GetModuleHandle(TEXT("SHLWAPI.DLL")); - if (hShlwapi != NULL) - { - SHINVDEFCMD SHInvokeDefCmd; - - /* SHInvokeDefaultCommand */ - SHInvokeDefCmd = (SHINVDEFCMD) GetProcAddress(hShlwapi, - (LPCSTR) ((LONG) 279)); - if (SHInvokeDefCmd != NULL) - { - ret = SHInvokeDefCmd(Tray->GetHWND(), - pShellFolder, - pidl); - } - } + ret = SHInvokeDefaultCommand(Tray->GetHWND(), pShellFolder, pidl); return ret; } Modified: trunk/reactos/base/shell/explorer/taskswnd.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/tasksw… ============================================================================== --- trunk/reactos/base/shell/explorer/taskswnd.cpp [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/taskswnd.cpp [iso-8859-1] Tue Dec 9 21:37:59 2014 @@ -1312,18 +1312,7 @@ TRACE("ShellHookMsg got assigned number %d\n", ShellHookMsg); - HMODULE hShell32 = GetModuleHandle(TEXT("SHELL32.DLL")); - if (hShell32 != NULL) - { - REGSHELLHOOK RegShellHook; - - /* RegisterShellHook */ - RegShellHook = (REGSHELLHOOK) GetProcAddress(hShell32, (LPCSTR) ((LONG) 181)); - if (RegShellHook != NULL) - { - RegShellHook(m_hWnd, 3); /* 1 if no NT! We're targeting NT so we don't care! */ - } - } + RegisterShellHook(m_hWnd, 3); /* 1 if no NT! We're targeting NT so we don't care! */ RefreshWindowList(); @@ -1338,25 +1327,10 @@ LRESULT OnDestroy(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) { - HMODULE hShell32; - IsDestroying = TRUE; /* Unregister the shell hook */ - hShell32 = GetModuleHandle(TEXT("SHELL32.DLL")); - if (hShell32 != NULL) - { - REGSHELLHOOK RegShellHook; - - /* RegisterShellHook */ - RegShellHook = (REGSHELLHOOK) GetProcAddress(hShell32, - (LPCSTR) ((LONG) 181)); - if (RegShellHook != NULL) - { - RegShellHook(m_hWnd, - FALSE); - } - } + RegisterShellHook(m_hWnd, FALSE); CloseThemeData(TaskBandTheme); DeleteAllTasks(); Modified: trunk/reactos/base/shell/explorer/traywnd.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/traywn… ============================================================================== --- trunk/reactos/base/shell/explorer/traywnd.cpp [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/traywnd.cpp [iso-8859-1] Tue Dec 9 21:37:59 2014 @@ -1364,16 +1364,13 @@ if (hIconStart != NULL) Flags |= DC_ICON; - if (DrawCapTemp != NULL) - { - Ret = DrawCapTemp(NULL, - hDC, - &rcButton, - hStartBtnFont, - hIconStart, - szStartCaption, - Flags); - } + DrawCaptionTemp(NULL, + hDC, + &rcButton, + hStartBtnFont, + hIconStart, + szStartCaption, + Flags); SelectObject(hDC, hbmpOld); @@ -1926,8 +1923,6 @@ DWORD WINAPI RunFileDlgThread() { - HINSTANCE hShell32; - RUNFILEDLG RunFileDlg; HWND hwnd; RECT posRect; @@ -1947,9 +1942,6 @@ NULL); hwndRunFileDlgOwner = hwnd; - - hShell32 = GetModuleHandle(TEXT("SHELL32.DLL")); - RunFileDlg = (RUNFILEDLG) GetProcAddress(hShell32, (LPCSTR) 61); RunFileDlg(hwnd, NULL, NULL, NULL, NULL, RFF_CALCDIRECTORY);

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