Ros-diffs October 2015

ros-diffs@reactos.org

18 participants
347 discussions

[tfaber] 69627: [TASKMGR] - Fix potential stack buffer overflows. CID 1322094, 1322095

by tfaber＠svn.reactos.org

Author: tfaber Date: Tue Oct 20 08:30:14 2015 New Revision: 69627 URL: http://svn.reactos.org/svn/reactos?rev=69627&view=rev Log: [TASKMGR] - Fix potential stack buffer overflows. CID 1322094, 1322095 Modified: trunk/reactos/base/applications/taskmgr/perfpage.c Modified: trunk/reactos/base/applications/taskmgr/perfpage.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/perfpage.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/perfpage.c [iso-8859-1] Tue Oct 20 08:30:14 2015 @@ -371,11 +371,11 @@ StrFormatByteSizeW(CommitChargeTotal * 1024, szChargeTotalFormat, - sizeof(szChargeTotalFormat)); + _countof(szChargeTotalFormat)); StrFormatByteSizeW(CommitChargeLimit * 1024, szChargeLimitFormat, - sizeof(szChargeLimitFormat)); + _countof(szChargeLimitFormat)); if (!bInMenuLoop) {

9 years

[tfaber] 69626: [RAPPS] - Pass the correct buffer size to StringCbCopyW

by tfaber＠svn.reactos.org

Author: tfaber Date: Tue Oct 20 08:15:30 2015 New Revision: 69626 URL: http://svn.reactos.org/svn/reactos?rev=69626&view=rev Log: [RAPPS] - Pass the correct buffer size to StringCbCopyW Modified: trunk/reactos/base/applications/rapps/misc.c trunk/reactos/base/applications/rapps_new/misc.cpp Modified: trunk/reactos/base/applications/rapps/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/mi… ============================================================================== --- trunk/reactos/base/applications/rapps/misc.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/misc.c [iso-8859-1] Tue Oct 20 08:15:30 2015 @@ -431,7 +431,7 @@ /* copy the locale-dependent string into the buffer of the future neutral one */ StringCbCopyW(szCachedINISectionLocaleNeutral, - sizeof(szCachedINISectionLocale), + sizeof(szCachedINISectionLocaleNeutral), szCachedINISectionLocale); /* turn "Section.0c0a" into "Section.0a", keeping just the neutral lang part */ Modified: trunk/reactos/base/applications/rapps_new/misc.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps_ne… ============================================================================== --- trunk/reactos/base/applications/rapps_new/misc.cpp [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps_new/misc.cpp [iso-8859-1] Tue Oct 20 08:15:30 2015 @@ -431,7 +431,7 @@ /* copy the locale-dependent string into the buffer of the future neutral one */ StringCbCopyW(szCachedINISectionLocaleNeutral, - sizeof(szCachedINISectionLocale), + sizeof(szCachedINISectionLocaleNeutral), szCachedINISectionLocale); /* turn "Section.0c0a" into "Section.0a", keeping just the neutral lang part */

9 years

[jimtabor] 69625: [User32] - Patch by Joachim Priesner : Hide horizontal Listbox scroll bar if no horizontal extent is set. See CORE-1101. - Patch by Alex Henrie : Simplify if-else statement. Scrol...

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Tue Oct 20 01:54:18 2015 New Revision: 69625 URL: http://svn.reactos.org/svn/reactos?rev=69625&view=rev Log: [User32] - Patch by Joachim Priesner : Hide horizontal Listbox scroll bar if no horizontal extent is set. See CORE-1101. - Patch by Alex Henrie : Simplify if-else statement. Scroll listbox item completely into view on LB_SETCURSEL. Modified: trunk/reactos/win32ss/user/user32/controls/listbox.c Modified: trunk/reactos/win32ss/user/user32/controls/listbox.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/contro… ============================================================================== --- trunk/reactos/win32ss/user/user32/controls/listbox.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/controls/listbox.c [iso-8859-1] Tue Oct 20 01:54:18 2015 @@ -259,7 +259,7 @@ if (descr->style & WS_VSCROLL) SetScrollInfo( descr->self, SB_VERT, &info, TRUE ); - if (descr->style & WS_HSCROLL) + if (descr->style & WS_HSCROLL && descr->horz_extent) { info.nPos = descr->horz_pos; info.nPage = descr->width; @@ -267,6 +267,20 @@ if (descr->style & LBS_DISABLENOSCROLL) info.fMask |= SIF_DISABLENOSCROLL; SetScrollInfo( descr->self, SB_HORZ, &info, TRUE ); + } + else + { + if (descr->style & LBS_DISABLENOSCROLL) + { + info.nMin = 0; + info.nMax = 0; + info.fMask = SIF_RANGE | SIF_DISABLENOSCROLL; + SetScrollInfo( descr->self, SB_HORZ, &info, TRUE ); + } + else + { + ShowScrollBar( descr->self, SB_HORZ, FALSE ); + } } } } @@ -313,7 +327,8 @@ ScrollWindowEx( descr->self, 0, diff, NULL, NULL, 0, NULL, SW_INVALIDATE | SW_ERASE | SW_SCROLLCHILDREN ); } - if (!scroll) InvalidateRect( descr->self, NULL, TRUE ); + else + InvalidateRect( descr->self, NULL, TRUE ); descr->top_item = index; LISTBOX_UpdateScroll( descr ); return LB_OKAY; @@ -1244,6 +1259,8 @@ info.nMin = 0; info.nMax = descr->horz_extent ? descr->horz_extent - 1 : 0; info.fMask = SIF_RANGE; + if (descr->style & LBS_DISABLENOSCROLL) + info.fMask |= SIF_DISABLENOSCROLL; SetScrollInfo( descr->self, SB_HORZ, &info, TRUE ); } if (descr->horz_pos > extent - descr->width) @@ -2908,7 +2925,7 @@ case LB_SETCURSEL: if (IS_MULTISELECT(descr)) return LB_ERR; - LISTBOX_SetCaretIndex( descr, wParam, FALSE ); + LISTBOX_SetCaretIndex( descr, wParam, TRUE ); ret = LISTBOX_SetSelection( descr, wParam, TRUE, FALSE ); if (ret != LB_ERR) ret = descr->selected_item; return ret;

9 years

[jimtabor] 69624: [User32] - Patch by Dmitry Timoshkov : Always call BeginPaint/EndPaint when handling a WM_PAINT message for the button. - Patch by Alex Henrie : Remove always-false condition.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Tue Oct 20 01:51:16 2015 New Revision: 69624 URL: http://svn.reactos.org/svn/reactos?rev=69624&view=rev Log: [User32] - Patch by Dmitry Timoshkov : Always call BeginPaint/EndPaint when handling a WM_PAINT message for the button. - Patch by Alex Henrie : Remove always-false condition. Modified: trunk/reactos/win32ss/user/user32/controls/button.c Modified: trunk/reactos/win32ss/user/user32/controls/button.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/contro… ============================================================================== --- trunk/reactos/win32ss/user/user32/controls/button.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/controls/button.c [iso-8859-1] Tue Oct 20 01:51:16 2015 @@ -356,16 +356,18 @@ case WM_PRINTCLIENT: case WM_PAINT: + { + PAINTSTRUCT ps; + HDC hdc = wParam ? (HDC)wParam : BeginPaint( hWnd, &ps ); if (btnPaintFunc[btn_type]) { - PAINTSTRUCT ps; - HDC hdc = wParam ? (HDC)wParam : BeginPaint( hWnd, &ps ); int nOldMode = SetBkMode( hdc, OPAQUE ); (btnPaintFunc[btn_type])( hWnd, hdc, ODA_DRAWENTIRE ); SetBkMode(hdc, nOldMode); /* reset painting mode */ - if( !wParam ) EndPaint( hWnd, &ps ); - } - break; + } + if ( !wParam ) EndPaint( hWnd, &ps ); + break; + } case WM_KEYDOWN: if (wParam == VK_SPACE) @@ -545,7 +547,6 @@ break; case BM_SETSTYLE: - if ((wParam & BS_TYPEMASK) >= MAX_BTN_TYPE) break; btn_type = wParam & BS_TYPEMASK; style = (style & ~BS_TYPEMASK) | btn_type; #ifdef __REACTOS__

9 years

[tfaber] 69623: [GDIPLUS] - Mark a ROS-Diff and fix MSVC warnings in it

by tfaber＠svn.reactos.org

Author: tfaber Date: Mon Oct 19 18:16:17 2015 New Revision: 69623 URL: http://svn.reactos.org/svn/reactos?rev=69623&view=rev Log: [GDIPLUS] - Mark a ROS-Diff and fix MSVC warnings in it Modified: trunk/reactos/dll/win32/gdiplus/brush.c Modified: trunk/reactos/dll/win32/gdiplus/brush.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdiplus/brush.c?… ============================================================================== --- trunk/reactos/dll/win32/gdiplus/brush.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdiplus/brush.c [iso-8859-1] Mon Oct 19 18:16:17 2015 @@ -18,18 +18,19 @@ #include "gdiplus_private.h" +#ifdef __REACTOS__ /* Unix stuff Code from http://www.johndcook.com/blog/2009/01/19/stand-alone-error-function-erf/ */ double erf(double x) { - const float a1 = 0.254829592; - const float a2 = -0.284496736; - const float a3 = 1.421413741; - const float a4 = -1.453152027; - const float a5 = 1.061405429; - const float p = 0.3275911; + const float a1 = 0.254829592f; + const float a2 = -0.284496736f; + const float a3 = 1.421413741f; + const float a4 = -1.453152027f; + const float a5 = 1.061405429f; + const float p = 0.3275911f; float t, y, sign; /* Save the sign of x */ @@ -44,6 +45,7 @@ return sign*y; } +#endif /****************************************************************************** * GdipCloneBrush [GDIPLUS.@]

9 years

[tfaber] 69622: [SHLWAPI_WINETEST] - Fix build until I figure out how to upstream this

by tfaber＠svn.reactos.org

Author: tfaber Date: Mon Oct 19 16:03:00 2015 New Revision: 69622 URL: http://svn.reactos.org/svn/reactos?rev=69622&view=rev Log: [SHLWAPI_WINETEST] - Fix build until I figure out how to upstream this Modified: trunk/rostests/winetests/shlwapi/ordinal.c Modified: trunk/rostests/winetests/shlwapi/ordinal.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shlwapi/ordinal… ============================================================================== --- trunk/rostests/winetests/shlwapi/ordinal.c [iso-8859-1] (original) +++ trunk/rostests/winetests/shlwapi/ordinal.c [iso-8859-1] Mon Oct 19 16:03:00 2015 @@ -2688,14 +2688,22 @@ } static HRESULT WINAPI SF_GetAttributesOf(IShellFolder *iface, +#ifdef __REACTOS__ + UINT cidl, PCUITEMID_CHILD_ARRAY idl, SFGAOF *inOut) +#else UINT cidl, LPCITEMIDLIST *idl, SFGAOF *inOut) +#endif { ok(0, "Didn't expect GetAttributesOf\n"); return E_NOTIMPL; } static HRESULT WINAPI SF_GetUIObjectOf(IShellFolder *iface, +#ifdef __REACTOS__ + HWND owner, UINT cidl, PCUITEMID_CHILD_ARRAY idls, REFIID riid, UINT *inOut, +#else HWND owner, UINT cidl, LPCITEMIDLIST *idls, REFIID riid, UINT *inOut, +#endif void **out) { ok(0, "Didn't expect GetUIObjectOf\n");

9 years

[tfaber] 69621: [PSDK] - Add missing shlobj.h changes from the previous commit - Correctly define ITEMIDLIST types, and add initial support for STRICT_TYPED_ITEMIDS CORE-8441 #resolve

by tfaber＠svn.reactos.org

Author: tfaber Date: Mon Oct 19 15:28:24 2015 New Revision: 69621 URL: http://svn.reactos.org/svn/reactos?rev=69621&view=rev Log: [PSDK] - Add missing shlobj.h changes from the previous commit - Correctly define ITEMIDLIST types, and add initial support for STRICT_TYPED_ITEMIDS CORE-8441 #resolve Modified: trunk/reactos/include/psdk/shlobj.h trunk/reactos/include/psdk/shtypes.idl Modified: trunk/reactos/include/psdk/shlobj.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/shlobj.h?rev=… ============================================================================== --- trunk/reactos/include/psdk/shlobj.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/shlobj.h [iso-8859-1] Mon Oct 19 15:28:24 2015 @@ -2139,10 +2139,10 @@ { HWND hwnd; IContextMenuCB *pcmcb; - LPCITEMIDLIST pidlFolder; + PCIDLIST_ABSOLUTE pidlFolder; IShellFolder *psf; UINT cidl; - LPCITEMIDLIST* apidl; + PCUITEMID_CHILD_ARRAY apidl; IUnknown *punkAssociationInfo; UINT cKeys; const HKEY *aKeys; @@ -2167,10 +2167,10 @@ HRESULT WINAPI CDefFolderMenu_Create2( - _In_opt_ LPCITEMIDLIST, + _In_opt_ PCIDLIST_ABSOLUTE, _In_opt_ HWND, UINT cidl, - _In_reads_opt_(cidl) LPCITEMIDLIST*, + _In_reads_opt_(cidl) PCUITEMID_CHILD_ARRAY, _In_opt_ IShellFolder*, _In_opt_ LPFNDFMCALLBACK, UINT nKeys, @@ -2190,9 +2190,9 @@ */ HRESULT WINAPI SHCreateDataObject( - _In_opt_ LPCITEMIDLIST pidlFolder, + _In_opt_ PCIDLIST_ABSOLUTE pidlFolder, _In_ UINT cidl, - _In_reads_opt_(cidl) LPCITEMIDLIST* apidl, + _In_reads_opt_(cidl) PCUITEMID_CHILD_ARRAY apidl, _In_opt_ IDataObject *pdtInner, _In_ REFIID riid, _Outptr_ void **ppv); @@ -2202,9 +2202,9 @@ */ HRESULT WINAPI CIDLData_CreateFromIDArray( - _In_ LPCITEMIDLIST pidlFolder, + _In_ PCIDLIST_ABSOLUTE pidlFolder, _In_ UINT cidl, - _In_reads_opt_(cidl) LPCITEMIDLIST* apidl, + _In_reads_opt_(cidl) PCUIDLIST_RELATIVE_ARRAY apidl, _Outptr_ IDataObject **ppdtobj); /**************************************************************************** Modified: trunk/reactos/include/psdk/shtypes.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/shtypes.idl?r… ============================================================================== --- trunk/reactos/include/psdk/shtypes.idl [iso-8859-1] (original) +++ trunk/reactos/include/psdk/shtypes.idl [iso-8859-1] Mon Oct 19 15:28:24 2015 @@ -32,16 +32,44 @@ typedef struct _ITEMIDLIST { SHITEMID mkid; /* first itemid in list */ -} ITEMIDLIST,*LPITEMIDLIST; -typedef const ITEMIDLIST *LPCITEMIDLIST; -typedef LPITEMIDLIST PITEMID_CHILD; -typedef LPCITEMIDLIST PCITEMID_CHILD; -typedef LPCITEMIDLIST PCUITEMID_CHILD; -typedef LPCITEMIDLIST *PCUITEMID_CHILD_ARRAY; -typedef LPITEMIDLIST PIDLIST_RELATIVE; -typedef LPCITEMIDLIST PCUIDLIST_RELATIVE; -typedef LPITEMIDLIST PIDLIST_ABSOLUTE; -typedef LPCITEMIDLIST PCIDLIST_ABSOLUTE; +} ITEMIDLIST; + +#ifndef UNALIGNED +#define UNALIGNED +#endif + +typedef ITEMIDLIST UNALIGNED *LPITEMIDLIST; +typedef const ITEMIDLIST UNALIGNED *LPCITEMIDLIST; + +cpp_quote("#if defined(STRICT_TYPED_ITEMIDS) && defined(__cplusplus)") +cpp_quote("typedef struct _ITEMIDLIST_RELATIVE : public ITEMIDLIST { } ITEMIDLIST_RELATIVE;") +cpp_quote("typedef struct _ITEMIDLIST_ABSOLUTE : public ITEMIDLIST_RELATIVE { } ITEMIDLIST_ABSOLUTE;") +cpp_quote("typedef struct _ITEMID_CHILD : public ITEMIDLIST_RELATIVE { } ITEMID_CHILD;") +cpp_quote("#else") +typedef ITEMIDLIST ITEMIDLIST_RELATIVE; +typedef ITEMIDLIST ITEMIDLIST_ABSOLUTE; +typedef ITEMIDLIST ITEMID_CHILD; +cpp_quote("#endif") + +typedef ITEMIDLIST_RELATIVE *PIDLIST_RELATIVE; +typedef ITEMIDLIST_RELATIVE UNALIGNED *PUIDLIST_RELATIVE; +typedef const ITEMIDLIST_RELATIVE *PCIDLIST_RELATIVE; +typedef const ITEMIDLIST_RELATIVE UNALIGNED *PCUIDLIST_RELATIVE; +typedef const PCUIDLIST_RELATIVE *PCUIDLIST_RELATIVE_ARRAY; + +typedef ITEMIDLIST_ABSOLUTE *PIDLIST_ABSOLUTE; +typedef ITEMIDLIST_ABSOLUTE UNALIGNED *PUIDLIST_ABSOLUTE; +typedef const ITEMIDLIST_ABSOLUTE *PCIDLIST_ABSOLUTE; +typedef const ITEMIDLIST_ABSOLUTE UNALIGNED *PCUIDLIST_ABSOLUTE; +typedef const PCIDLIST_ABSOLUTE *PCIDLIST_ABSOLUTE_ARRAY; +typedef const PCUIDLIST_ABSOLUTE *PCUIDLIST_ABSOLUTE_ARRAY; + +typedef ITEMID_CHILD *PITEMID_CHILD; +typedef ITEMID_CHILD UNALIGNED *PUITEMID_CHILD; +typedef const ITEMID_CHILD *PCITEMID_CHILD; +typedef const ITEMID_CHILD UNALIGNED *PCUITEMID_CHILD; +typedef const PCUITEMID_CHILD *PCUITEMID_CHILD_ARRAY; + cpp_quote("#include <poppack.h>") #ifndef MAX_PATH

9 years

[tfaber] 69620: [SHELL32] - Fix some ITEMIDLIST types CORE-8441

by tfaber＠svn.reactos.org

Author: tfaber Date: Mon Oct 19 15:17:29 2015 New Revision: 69620 URL: http://svn.reactos.org/svn/reactos?rev=69620&view=rev Log: [SHELL32] - Fix some ITEMIDLIST types CORE-8441 Modified: trunk/reactos/dll/win32/shell32/CDefView.cpp trunk/reactos/dll/win32/shell32/CDefaultContextMenu.cpp trunk/reactos/dll/win32/shell32/CIDLDataObj.cpp trunk/reactos/dll/win32/shell32/folders/CControlPanelFolder.cpp trunk/reactos/dll/win32/shell32/folders/CControlPanelFolder.h trunk/reactos/dll/win32/shell32/wine/pidl.c trunk/reactos/dll/win32/shell32/wine/pidl.h trunk/reactos/dll/win32/shell32/wine/shell32_main.h trunk/reactos/dll/win32/shell32/wine/shellord.c Modified: trunk/reactos/dll/win32/shell32/CDefView.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/CDefView… ============================================================================== --- trunk/reactos/dll/win32/shell32/CDefView.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/CDefView.cpp [iso-8859-1] Mon Oct 19 15:17:29 2015 @@ -92,7 +92,7 @@ BOOL m_menusLoaded; UINT m_uState; UINT m_cidl; - PCUITEMID_CHILD_ARRAY m_apidl; + PCUITEMID_CHILD *m_apidl; PIDLIST_ABSOLUTE m_pidlParent; LISTVIEW_SORT_INFO m_sortInfo; ULONG m_hNotify; /* change notification handle */ @@ -1227,7 +1227,7 @@ SHFree(m_apidl); m_cidl = m_ListView.GetSelectedCount(); - m_apidl = reinterpret_cast<PCUITEMID_CHILD_ARRAY>(SHAlloc(m_cidl * sizeof(PCUITEMID_CHILD))); + m_apidl = static_cast<PCUITEMID_CHILD*>(SHAlloc(m_cidl * sizeof(PCUITEMID_CHILD))); if (!m_apidl) { m_cidl = 0; Modified: trunk/reactos/dll/win32/shell32/CDefaultContextMenu.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/CDefault… ============================================================================== --- trunk/reactos/dll/win32/shell32/CDefaultContextMenu.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/CDefaultContextMenu.cpp [iso-8859-1] Mon Oct 19 15:17:29 2015 @@ -1746,10 +1746,10 @@ HRESULT WINAPI CDefFolderMenu_Create2( - LPCITEMIDLIST pidlFolder, + PCIDLIST_ABSOLUTE pidlFolder, HWND hwnd, UINT cidl, - LPCITEMIDLIST *apidl, + PCUITEMID_CHILD_ARRAY apidl, IShellFolder *psf, LPFNDFMCALLBACK lpfn, UINT nKeys, Modified: trunk/reactos/dll/win32/shell32/CIDLDataObj.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/CIDLData… ============================================================================== --- trunk/reactos/dll/win32/shell32/CIDLDataObj.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/CIDLDataObj.cpp [iso-8859-1] Mon Oct 19 15:17:29 2015 @@ -147,7 +147,7 @@ { private: LPITEMIDLIST pidl; - LPITEMIDLIST * apidl; + PIDLIST_RELATIVE *apidl; UINT cidl; DWORD dropeffect; @@ -160,7 +160,7 @@ public: CIDLDataObj(); ~CIDLDataObj(); - HRESULT WINAPI Initialize(HWND hwndOwner, LPCITEMIDLIST pMyPidl, LPCITEMIDLIST * apidlx, UINT cidlx); + HRESULT WINAPI Initialize(HWND hwndOwner, PCIDLIST_ABSOLUTE pMyPidl, PCUIDLIST_RELATIVE_ARRAY apidlx, UINT cidlx); /////////// virtual HRESULT WINAPI GetData(LPFORMATETC pformatetcIn, STGMEDIUM *pmedium); @@ -204,7 +204,7 @@ ILFree(pidl); } -HRESULT WINAPI CIDLDataObj::Initialize(HWND hwndOwner, LPCITEMIDLIST pMyPidl, LPCITEMIDLIST * apidlx, UINT cidlx) +HRESULT WINAPI CIDLDataObj::Initialize(HWND hwndOwner, PCIDLIST_ABSOLUTE pMyPidl, PCUIDLIST_RELATIVE_ARRAY apidlx, UINT cidlx) { pidl = ILClone(pMyPidl); apidl = _ILCopyaPidl(apidlx, cidlx); @@ -408,7 +408,7 @@ /************************************************************************** * IDataObject_Constructor */ -HRESULT IDataObject_Constructor(HWND hwndOwner, LPCITEMIDLIST pMyPidl, LPCITEMIDLIST * apidl, UINT cidl, IDataObject **dataObject) +HRESULT IDataObject_Constructor(HWND hwndOwner, PCIDLIST_ABSOLUTE pMyPidl, PCUIDLIST_RELATIVE_ARRAY apidl, UINT cidl, IDataObject **dataObject) { return ShellObjectCreatorInit<CIDLDataObj>(hwndOwner, pMyPidl, apidl, cidl, IID_IDataObject, dataObject); } @@ -418,7 +418,7 @@ * */ -HRESULT WINAPI SHCreateDataObject(LPCITEMIDLIST pidlFolder, UINT cidl, LPCITEMIDLIST* apidl, IDataObject *pdtInner, REFIID riid, void **ppv) +HRESULT WINAPI SHCreateDataObject(PCIDLIST_ABSOLUTE pidlFolder, UINT cidl, PCUITEMID_CHILD_ARRAY apidl, IDataObject *pdtInner, REFIID riid, void **ppv) { if (IsEqualIID(riid, IID_IDataObject)) { Modified: trunk/reactos/dll/win32/shell32/folders/CControlPanelFolder.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/… ============================================================================== --- trunk/reactos/dll/win32/shell32/folders/CControlPanelFolder.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/folders/CControlPanelFolder.cpp [iso-8859-1] Mon Oct 19 15:17:29 2015 @@ -673,7 +673,7 @@ HRESULT WINAPI CCPLItemMenu::Initialize(UINT cidl, PCUITEMID_CHILD_ARRAY apidl) { m_cidl = cidl; - m_apidl = const_cast<PCUITEMID_CHILD_ARRAY>(_ILCopyaPidl(apidl, m_cidl)); + m_apidl = _ILCopyaPidl(apidl, m_cidl); if (m_cidl && !m_apidl) return E_OUTOFMEMORY; @@ -682,7 +682,7 @@ CCPLItemMenu::~CCPLItemMenu() { - _ILFreeaPidl(const_cast<PITEMID_CHILD *>(m_apidl), m_cidl); + _ILFreeaPidl(m_apidl, m_cidl); } HRESULT WINAPI CCPLItemMenu::QueryContextMenu( Modified: trunk/reactos/dll/win32/shell32/folders/CControlPanelFolder.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/… ============================================================================== --- trunk/reactos/dll/win32/shell32/folders/CControlPanelFolder.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/folders/CControlPanelFolder.h [iso-8859-1] Mon Oct 19 15:17:29 2015 @@ -89,7 +89,7 @@ public IContextMenu2 { private: - LPCITEMIDLIST *m_apidl; + PITEMID_CHILD *m_apidl; UINT m_cidl; public: Modified: trunk/reactos/dll/win32/shell32/wine/pidl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/wine/pid… ============================================================================== --- trunk/reactos/dll/win32/shell32/wine/pidl.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/wine/pidl.c [iso-8859-1] Mon Oct 19 15:17:29 2015 @@ -2597,15 +2597,15 @@ * * copies an aPidl struct */ -LPITEMIDLIST* _ILCopyaPidl(const LPCITEMIDLIST * apidlsrc, UINT cidl) +PITEMID_CHILD* _ILCopyaPidl(PCUITEMID_CHILD_ARRAY apidlsrc, UINT cidl) { UINT i; - LPITEMIDLIST *apidldest; + PITEMID_CHILD *apidldest; if (!apidlsrc) return NULL; - apidldest = SHAlloc(cidl * sizeof(LPITEMIDLIST)); + apidldest = SHAlloc(cidl * sizeof(PITEMID_CHILD)); for (i = 0; i < cidl; i++) apidldest[i] = ILClone(apidlsrc[i]); Modified: trunk/reactos/dll/win32/shell32/wine/pidl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/wine/pid… ============================================================================== --- trunk/reactos/dll/win32/shell32/wine/pidl.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/wine/pidl.h [iso-8859-1] Mon Oct 19 15:17:29 2015 @@ -306,7 +306,7 @@ * aPidl helper */ void _ILFreeaPidl(LPITEMIDLIST * apidl, UINT cidl) DECLSPEC_HIDDEN; -LPITEMIDLIST * _ILCopyaPidl(const LPCITEMIDLIST * apidlsrc, UINT cidl) DECLSPEC_HIDDEN; +PITEMID_CHILD* _ILCopyaPidl(PCUITEMID_CHILD_ARRAY apidlsrc, UINT cidl) DECLSPEC_HIDDEN; LPITEMIDLIST * _ILCopyCidaToaPidl(LPITEMIDLIST* pidl, const CIDA * cida) DECLSPEC_HIDDEN; BOOL ILGetDisplayNameExW(LPSHELLFOLDER psf, LPCITEMIDLIST pidl, LPWSTR path, DWORD type) DECLSPEC_HIDDEN; Modified: trunk/reactos/dll/win32/shell32/wine/shell32_main.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/wine/she… ============================================================================== --- trunk/reactos/dll/win32/shell32/wine/shell32_main.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/wine/shell32_main.h [iso-8859-1] Mon Oct 19 15:17:29 2015 @@ -61,7 +61,7 @@ /**************************************************************************** * Class constructors */ -HRESULT IDataObject_Constructor(HWND hwndOwner, LPCITEMIDLIST pMyPidl, LPCITEMIDLIST * apidl, UINT cidl, IDataObject **dataObject); +HRESULT IDataObject_Constructor(HWND hwndOwner, LPCITEMIDLIST pMyPidl, PCUITEMID_CHILD_ARRAY apidl, UINT cidl, IDataObject **dataObject); HRESULT IEnumFORMATETC_Constructor(UINT cfmt, const FORMATETC afmt[], IEnumFORMATETC **enumerator); LPCLASSFACTORY IClassFactory_Constructor(REFCLSID); Modified: trunk/reactos/dll/win32/shell32/wine/shellord.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/wine/she… ============================================================================== --- trunk/reactos/dll/win32/shell32/wine/shellord.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/wine/shellord.c [iso-8859-1] Mon Oct 19 15:17:29 2015 @@ -1837,9 +1837,9 @@ * Create IDataObject from PIDLs?? */ HRESULT WINAPI CIDLData_CreateFromIDArray( - LPCITEMIDLIST pidlFolder, + PCIDLIST_ABSOLUTE pidlFolder, UINT cpidlFiles, - LPCITEMIDLIST *lppidlFiles, + PCUIDLIST_RELATIVE_ARRAY lppidlFiles, LPDATAOBJECT *ppdataObject) { UINT i;

9 years

[gedmurphy] 69619: [DEVMGR] - Implement the add new hardware wizard - fix stray header CORE-10363

by gedmurphy＠svn.reactos.org

Author: gedmurphy Date: Mon Oct 19 13:52:12 2015 New Revision: 69619 URL: http://svn.reactos.org/svn/reactos?rev=69619&view=rev Log: [DEVMGR] - Implement the add new hardware wizard - fix stray header CORE-10363 Modified: trunk/reactos/dll/win32/devmgr/api.cpp trunk/reactos/dll/win32/devmgr/devmgmt/DeviceView.cpp trunk/reactos/dll/win32/devmgr/devmgmt/DeviceView.h trunk/reactos/dll/win32/devmgr/precomp.h trunk/reactos/dll/win32/devmgr/properties/advprop.cpp trunk/reactos/dll/win32/devmgr/properties/devprblm.cpp trunk/reactos/dll/win32/devmgr/properties/hwpage.cpp trunk/reactos/dll/win32/devmgr/properties/hwresource.cpp trunk/reactos/dll/win32/devmgr/properties/misc.cpp Modified: trunk/reactos/dll/win32/devmgr/api.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/api.cpp?r… ============================================================================== --- trunk/reactos/dll/win32/devmgr/api.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/api.cpp [iso-8859-1] Mon Oct 19 13:52:12 2015 @@ -17,7 +17,6 @@ */ #include "precomp.h" -#include <devmgr/devmgr.h> #include "devmgmt/MainWindow.h" #include "properties/properties.h" Modified: trunk/reactos/dll/win32/devmgr/devmgmt/DeviceView.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/devmgmt/D… ============================================================================== --- trunk/reactos/dll/win32/devmgr/devmgmt/DeviceView.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/devmgmt/DeviceView.cpp [iso-8859-1] Mon Oct 19 13:52:12 2015 @@ -19,18 +19,8 @@ #define CLASS_DESC_LEN 256 #define ROOT_NAME_SIZE MAX_COMPUTERNAME_LENGTH + 1 -extern "C" { -INT_PTR -WINAPI -DevicePropertiesExW( - IN HWND hWndParent OPTIONAL, - IN LPCWSTR lpMachineName OPTIONAL, - IN LPCWSTR lpDeviceID OPTIONAL, - IN DWORD dwFlags OPTIONAL, - IN BOOL bShowDevMgr -); -} -typedef INT_PTR(WINAPI *pDevicePropertiesExW)(HWND,LPCWSTR,LPCWSTR,DWORD,BOOL); + +typedef VOID(WINAPI *PADDHARDWAREWIZARD)(HWND hwnd, LPWSTR lpName); struct RefreshThreadData { @@ -284,7 +274,7 @@ case IDC_ADD_HARDWARE: { - MessageBox(m_hMainWnd, L"Not yet implemented", L"Add Hardware", MB_OK); + RunAddHardwareWizard(); break; } } @@ -295,24 +285,6 @@ void CDeviceView::DisplayPropertySheet() { - // - // In ReactOS we can link to DevicePropertiesEx but - // not in windows as it's not part of the SDK - -#ifndef __REACTOS__ - HMODULE hModule = LoadLibraryW(L"devmgr.dll"); - if (hModule == NULL) return; - - pDevicePropertiesExW DevicePropertiesExW; - DevicePropertiesExW = (pDevicePropertiesExW)GetProcAddress(hModule, - "DevicePropertiesExW"); - if (DevicePropertiesExW == NULL) - { - FreeLibrary(hModule); - return; - } -#endif - CNode *Node = GetSelectedNode(); if (Node && Node->HasProperties()) { @@ -322,10 +294,6 @@ 1,//DPF_EXTENDED, FALSE); } - -#ifndef __REACTOS__ - FreeLibrary(hModule); -#endif } void @@ -782,6 +750,29 @@ } bool +CDeviceView::RunAddHardwareWizard() +{ + PADDHARDWAREWIZARD pAddHardwareWizard; + HMODULE hModule; + + hModule = LoadLibraryW(L"hdwwiz.cpl"); + if (hModule == NULL) return false; + + pAddHardwareWizard = (PADDHARDWAREWIZARD)GetProcAddress(hModule, + "AddHardwareWizard"); + if (pAddHardwareWizard == NULL) + { + FreeLibrary(hModule); + return false; + } + + pAddHardwareWizard(m_hMainWnd, NULL); + + FreeLibrary(hModule); + return true; +} + +bool CDeviceView::GetChildDevice( _In_ DEVINST ParentDevInst, _Out_ PDEVINST DevInst Modified: trunk/reactos/dll/win32/devmgr/devmgmt/DeviceView.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/devmgmt/D… ============================================================================== --- trunk/reactos/dll/win32/devmgr/devmgmt/DeviceView.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/devmgmt/DeviceView.h [iso-8859-1] Mon Oct 19 13:52:12 2015 @@ -122,6 +122,9 @@ bool UninstallSelectedDevice( ); + bool RunAddHardwareWizard( + ); + bool GetChildDevice( _In_ DEVINST ParentDevInst, _Out_ PDEVINST DevInst Modified: trunk/reactos/dll/win32/devmgr/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/precomp.h… ============================================================================== --- trunk/reactos/dll/win32/devmgr/precomp.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/precomp.h [iso-8859-1] Mon Oct 19 13:52:12 2015 @@ -21,6 +21,8 @@ #include <atlcoll.h> #include <strsafe.h> + +#include <devmgr/devmgr.h> #define ERR printf #define FIXME printf @@ -68,6 +70,7 @@ #include <atlstr.h> #include <atlcoll.h> +#include <devmgr/devmgr.h> #include <wine/debug.h> //WINE_DEFAULT_DEBUG_CHANNEL(devmgr); Modified: trunk/reactos/dll/win32/devmgr/properties/advprop.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/propertie… ============================================================================== --- trunk/reactos/dll/win32/devmgr/properties/advprop.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/properties/advprop.cpp [iso-8859-1] Mon Oct 19 13:52:12 2015 @@ -28,7 +28,6 @@ */ #include "precomp.h" -#include <devmgr/devmgr.h> #include "properties.h" #include "resource.h" Modified: trunk/reactos/dll/win32/devmgr/properties/devprblm.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/propertie… ============================================================================== --- trunk/reactos/dll/win32/devmgr/properties/devprblm.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/properties/devprblm.cpp [iso-8859-1] Mon Oct 19 13:52:12 2015 @@ -26,7 +26,6 @@ */ #include "precomp.h" -#include <devmgr/devmgr.h> #include "properties.h" #include "resource.h" Modified: trunk/reactos/dll/win32/devmgr/properties/hwpage.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/propertie… ============================================================================== --- trunk/reactos/dll/win32/devmgr/properties/hwpage.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/properties/hwpage.cpp [iso-8859-1] Mon Oct 19 13:52:12 2015 @@ -26,7 +26,6 @@ */ #include "precomp.h" -#include <devmgr/devmgr.h> #include "properties.h" #include "resource.h" Modified: trunk/reactos/dll/win32/devmgr/properties/hwresource.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/propertie… ============================================================================== --- trunk/reactos/dll/win32/devmgr/properties/hwresource.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/properties/hwresource.cpp [iso-8859-1] Mon Oct 19 13:52:12 2015 @@ -8,7 +8,6 @@ */ #include "precomp.h" -#include <devmgr/devmgr.h> #include "properties.h" #include "resource.h" Modified: trunk/reactos/dll/win32/devmgr/properties/misc.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/propertie… ============================================================================== --- trunk/reactos/dll/win32/devmgr/properties/misc.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/properties/misc.cpp [iso-8859-1] Mon Oct 19 13:52:12 2015 @@ -26,7 +26,6 @@ */ #include "precomp.h" -#include <devmgr/devmgr.h> #include "properties.h" #include "resource.h"

9 years

[gedmurphy] 69618: Missed this file. Having a shocker today...

by gedmurphy＠svn.reactos.org

Author: gedmurphy Date: Mon Oct 19 11:17:14 2015 New Revision: 69618 URL: http://svn.reactos.org/svn/reactos?rev=69618&view=rev Log: Missed this file. Having a shocker today... Modified: trunk/reactos/dll/win32/devmgr/devmgr.rc Modified: trunk/reactos/dll/win32/devmgr/devmgr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/devmgr.rc… ============================================================================== --- trunk/reactos/dll/win32/devmgr/devmgr.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/devmgr.rc [iso-8859-1] Mon Oct 19 11:17:14 2015 @@ -20,6 +20,7 @@ /* main toolbar icons */ IDB_TOOLBAR BITMAP DISCARDABLE "resources/toolbar.bmp" + /* UTF-8 */ #pragma code_page(65001) @@ -41,6 +42,9 @@ #ifdef LANGUAGE_ES_ES #include "lang/es-ES.rc" #endif +#ifdef LANGUAGE_HE_IL + #include "lang/he-IL.rc" +#endif #ifdef LANGUAGE_FR_FR #include "lang/fr-FR.rc" #endif @@ -56,17 +60,11 @@ #ifdef LANGUAGE_NB_NO #include "lang/no-NO.rc" #endif +#ifdef LANGUAGE_PL_PL + #include "lang/pl-PL.rc" +#endif #ifdef LANGUAGE_PT_BR #include "lang/pt-BR.rc" -#endif -#ifdef LANGUAGE_SK_SK - #include "lang/sk-SK.rc" -#endif - -// UTF-8 -#pragma code_page(65001) -#ifdef LANGUAGE_PL_PL - #include "lang/pl-PL.rc" #endif #ifdef LANGUAGE_RO_RO #include "lang/ro-RO.rc" @@ -74,6 +72,15 @@ #ifdef LANGUAGE_RU_RU #include "lang/ru-RU.rc" #endif +#ifdef LANGUAGE_SK_SK + #include "lang/sk-SK.rc" +#endif +#ifdef LANGUAGE_SQ_AL + #include "lang/sq-AL.rc" +#endif +#ifdef LANGUAGE_TR_TR + #include "lang/tr-TR.rc" +#endif #ifdef LANGUAGE_UK_UA #include "lang/uk-UA.rc" #endif

9 years

← Newer
1
...
12
13
14
15
16
17
18
...
35
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs October 2015