Ros-diffs March 2014

ros-diffs@reactos.org

14 participants
233 discussions

[aandrejevic] 62435: [BASESRV] BaseSrvCopyCommand should return TRUE if it was successful.
by aandrejevic＠svn.reactos.org 05 Mar '14

05 Mar '14

Author: aandrejevic Date: Wed Mar 5 20:01:57 2014 New Revision: 62435 URL: http://svn.reactos.org/svn/reactos?rev=62435&view=rev Log: [BASESRV] BaseSrvCopyCommand should return TRUE if it was successful. Modified: branches/ntvdm/subsystems/win/basesrv/vdm.c Modified: branches/ntvdm/subsystems/win/basesrv/vdm.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/win/basesrv/vd… ============================================================================== --- branches/ntvdm/subsystems/win/basesrv/vdm.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/win/basesrv/vdm.c [iso-8859-1] Wed Mar 5 20:01:57 2014 @@ -339,6 +339,9 @@ /* Set the DOS record's command structure */ DosRecord->CommandInfo = CommandInfo; + + /* The operation was successful */ + Success = TRUE; Cleanup: /* If it wasn't successful, free the memory */

1 0

[akhaldi] 62434: [XINPUT1_3] * Mark as hotpatchable. CORE-7959
by akhaldi＠svn.reactos.org 05 Mar '14

05 Mar '14

Author: akhaldi Date: Wed Mar 5 14:31:26 2014 New Revision: 62434 URL: http://svn.reactos.org/svn/reactos?rev=62434&view=rev Log: [XINPUT1_3] * Mark as hotpatchable. CORE-7959 Modified: trunk/reactos/dll/win32/xinput1_3/CMakeLists.txt trunk/reactos/dll/win32/xinput1_3/xinput1_3_main.c Modified: trunk/reactos/dll/win32/xinput1_3/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/xinput1_3/CMakeL… ============================================================================== --- trunk/reactos/dll/win32/xinput1_3/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/xinput1_3/CMakeLists.txt [iso-8859-1] Wed Mar 5 14:31:26 2014 @@ -8,7 +8,7 @@ ${CMAKE_CURRENT_BINARY_DIR}/xinput1_3.def) add_library(xinput1_3 SHARED ${SOURCE} version.rc) -set_module_type(xinput1_3 win32dll) +set_module_type(xinput1_3 win32dll HOTPATCHABLE) target_link_libraries(xinput1_3 wine) add_importlibs(xinput1_3 msvcrt kernel32 ntdll) add_cd_file(TARGET xinput1_3 DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/dll/win32/xinput1_3/xinput1_3_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/xinput1_3/xinput… ============================================================================== --- trunk/reactos/dll/win32/xinput1_3/xinput1_3_main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/xinput1_3/xinput1_3_main.c [iso-8859-1] Wed Mar 5 14:31:26 2014 @@ -65,7 +65,7 @@ return ERROR_BAD_ARGUMENTS; } -DWORD WINAPI XInputGetState(DWORD dwUserIndex, XINPUT_STATE* pState) +DWORD WINAPI DECLSPEC_HOTPATCH XInputGetState(DWORD dwUserIndex, XINPUT_STATE* pState) { static int warn_once;

1 0

[dquintana] 62433: [EXPLORER-NEW] * I don't know what this may fix, but it was wrong. On the upside, now there's less spam in the log.
by dquintana＠svn.reactos.org 05 Mar '14

05 Mar '14

Author: dquintana Date: Wed Mar 5 13:57:02 2014 New Revision: 62433 URL: http://svn.reactos.org/svn/reactos?rev=62433&view=rev Log: [EXPLORER-NEW] * I don't know what this may fix, but it was wrong. On the upside, now there's less spam in the log. Modified: branches/shell-experiments/base/shell/explorer-new/taskband.c Modified: branches/shell-experiments/base/shell/explorer-new/taskband.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/ex… ============================================================================== --- branches/shell-experiments/base/shell/explorer-new/taskband.c [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/explorer-new/taskband.c [iso-8859-1] Wed Mar 5 13:57:02 2014 @@ -596,18 +596,15 @@ IN HWND hWnd) { ITaskBandImpl *This = ITaskBandImpl_from_IWinEventHandler(iface); - HRESULT hRet = S_OK; - - if (This->hWnd != hWnd || - !IsChild(This->hWnd, - hWnd)) - { - hRet = S_FALSE; - } - - DbgPrint("ITaskBand::ContainsWindow(0x%p) returns %s\n", hWnd, hRet == S_OK ? "S_OK" : "S_FALSE"); - - return hRet; + + if (This->hWnd == hWnd || + IsChild(This->hWnd, hWnd)) + { + DbgPrint("ITaskBand::ContainsWindow(0x%p) returns S_OK\n", hWnd); + return S_OK; + } + + return S_FALSE; } static const IWinEventHandlerVtbl IWinEventHandlerImpl_Vtbl =

1 0

[dquintana] 62432: [RSHELL] * CMenuSite: Reworked the code to avoid SHIsSameObject, since newer versions of windows do not implement that function. The code should be equivalent, and does less unne...
by dquintana＠svn.reactos.org 05 Mar '14

05 Mar '14

Author: dquintana Date: Wed Mar 5 13:14:51 2014 New Revision: 62432 URL: http://svn.reactos.org/svn/reactos?rev=62432&view=rev Log: [RSHELL] * CMenuSite: Reworked the code to avoid SHIsSameObject, since newer versions of windows do not implement that function. The code should be equivalent, and does less unnecessary calls to QueryInterface. CORE-7879 Modified: branches/shell-experiments/base/shell/rshell/CMenuSite.cpp Modified: branches/shell-experiments/base/shell/rshell/CMenuSite.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/rs… ============================================================================== --- branches/shell-experiments/base/shell/rshell/CMenuSite.cpp [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/rshell/CMenuSite.cpp [iso-8859-1] Wed Mar 5 13:14:51 2014 @@ -103,7 +103,11 @@ #define TO_HRESULT(x) ((HRESULT)(S_OK+(x))) - if (SHIsSameObject(punk, m_BandObject)) + CComPtr<IUnknown> pUnknown; + + punk->QueryInterface(IID_PPV_ARG(IUnknown, &pUnknown)); + + if (pUnknown == m_BandObject) return TO_HRESULT(0); if (m_BandObject) @@ -118,28 +122,26 @@ m_WinEventHandler = NULL; m_hWndBand = NULL; - if (!punk) + if (!pUnknown) return TO_HRESULT(0); - hr = punk->QueryInterface(IID_PPV_ARG(IDeskBand, &m_DeskBand)); + hr = pUnknown->QueryInterface(IID_PPV_ARG(IDeskBand, &m_DeskBand)); if (FAILED_UNEXPECTEDLY(hr)) return hr; - hr = punk->QueryInterface(IID_PPV_ARG(IWinEventHandler, &m_WinEventHandler)); + hr = pUnknown->QueryInterface(IID_PPV_ARG(IWinEventHandler, &m_WinEventHandler)); if (FAILED_UNEXPECTEDLY(hr)) return hr; - hr = IUnknown_SetSite(punk, this->ToIUnknown()); + hr = IUnknown_SetSite(pUnknown, this->ToIUnknown()); if (FAILED_UNEXPECTEDLY(hr)) return hr; - hr = IUnknown_GetWindow(punk, &m_hWndBand); + hr = IUnknown_GetWindow(pUnknown, &m_hWndBand); if (FAILED_UNEXPECTEDLY(hr)) return hr; - m_BandObject = punk; - - punk->AddRef(); + m_BandObject = pUnknown; return TO_HRESULT(0); }

1 0

[akhaldi] 62431: [WINMM] * Mark as hotpatchable. CORE-7959
by akhaldi＠svn.reactos.org 05 Mar '14

05 Mar '14

Author: akhaldi Date: Wed Mar 5 12:46:34 2014 New Revision: 62431 URL: http://svn.reactos.org/svn/reactos?rev=62431&view=rev Log: [WINMM] * Mark as hotpatchable. CORE-7959 Modified: trunk/reactos/dll/win32/winmm/CMakeLists.txt trunk/reactos/dll/win32/winmm/joystick.c Modified: trunk/reactos/dll/win32/winmm/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/winmm/CMakeLists… ============================================================================== --- trunk/reactos/dll/win32/winmm/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/winmm/CMakeLists.txt [iso-8859-1] Wed Mar 5 12:46:34 2014 @@ -22,7 +22,7 @@ winmm_res.rc ${CMAKE_CURRENT_BINARY_DIR}/winmm.def) -set_module_type(winmm win32dll) +set_module_type(winmm win32dll HOTPATCHABLE) target_link_libraries(winmm wine ${PSEH_LIB}) add_importlibs(winmm advapi32 user32 msvcrt kernel32 ntdll) add_pch(winmm winemm.h SOURCE) Modified: trunk/reactos/dll/win32/winmm/joystick.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/winmm/joystick.c… ============================================================================== --- trunk/reactos/dll/win32/winmm/joystick.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/winmm/joystick.c [iso-8859-1] Wed Mar 5 12:46:34 2014 @@ -123,7 +123,7 @@ /************************************************************************** * joyGetNumDevs [WINMM.@] */ -UINT WINAPI joyGetNumDevs(void) +UINT WINAPI DECLSPEC_HOTPATCH joyGetNumDevs(void) { UINT ret = 0; int i; @@ -139,7 +139,7 @@ /************************************************************************** * joyGetDevCapsW [WINMM.@] */ -MMRESULT WINAPI joyGetDevCapsW(UINT_PTR wID, LPJOYCAPSW lpCaps, UINT wSize) +MMRESULT WINAPI DECLSPEC_HOTPATCH joyGetDevCapsW(UINT_PTR wID, LPJOYCAPSW lpCaps, UINT wSize) { if (wID >= MAXJOYSTICK) return JOYERR_PARMS; if (!JOY_LoadDriver(wID)) return MMSYSERR_NODRIVER; @@ -153,7 +153,7 @@ /************************************************************************** * joyGetDevCapsA [WINMM.@] */ -MMRESULT WINAPI joyGetDevCapsA(UINT_PTR wID, LPJOYCAPSA lpCaps, UINT wSize) +MMRESULT WINAPI DECLSPEC_HOTPATCH joyGetDevCapsA(UINT_PTR wID, LPJOYCAPSA lpCaps, UINT wSize) { JOYCAPSW jcw; MMRESULT ret; @@ -202,7 +202,7 @@ /************************************************************************** * joyGetPosEx [WINMM.@] */ -MMRESULT WINAPI joyGetPosEx(UINT wID, LPJOYINFOEX lpInfo) +MMRESULT WINAPI DECLSPEC_HOTPATCH joyGetPosEx(UINT wID, LPJOYINFOEX lpInfo) { TRACE("(%d, %p);\n", wID, lpInfo);

1 0

[akhaldi] 62430: [USER32] * Mark some APIs as hotpatchable. CORE-7959
by akhaldi＠svn.reactos.org 05 Mar '14

05 Mar '14

Author: akhaldi Date: Wed Mar 5 12:36:04 2014 New Revision: 62430 URL: http://svn.reactos.org/svn/reactos?rev=62430&view=rev Log: [USER32] * Mark some APIs as hotpatchable. CORE-7959 Modified: trunk/reactos/win32ss/user/user32/controls/scrollbar.c trunk/reactos/win32ss/user/user32/misc/stubs.c trunk/reactos/win32ss/user/user32/windows/class.c trunk/reactos/win32ss/user/user32/windows/cursoricon.c trunk/reactos/win32ss/user/user32/windows/defwnd.c trunk/reactos/win32ss/user/user32/windows/input.c trunk/reactos/win32ss/user/user32/windows/message.c trunk/reactos/win32ss/user/user32/windows/nonclient.c trunk/reactos/win32ss/user/user32/windows/window.c Modified: trunk/reactos/win32ss/user/user32/controls/scrollbar.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/contro… ============================================================================== --- trunk/reactos/win32ss/user/user32/controls/scrollbar.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/controls/scrollbar.c [iso-8859-1] Wed Mar 5 12:36:04 2014 @@ -1438,7 +1438,10 @@ /* * @implemented */ -BOOL WINAPI EnableScrollBar( HWND hwnd, UINT nBar, UINT flags ) +BOOL +WINAPI +DECLSPEC_HOTPATCH +EnableScrollBar( HWND hwnd, UINT nBar, UINT flags ) { BOOL Hook, Ret = FALSE; @@ -1499,7 +1502,9 @@ /* * @implemented */ -BOOL WINAPI +BOOL +WINAPI +DECLSPEC_HOTPATCH GetScrollInfo(HWND Wnd, INT SBType, LPSCROLLINFO Info) { BOOL Hook, Ret = FALSE; @@ -1528,7 +1533,9 @@ /* * @implemented */ -INT WINAPI +INT +WINAPI +DECLSPEC_HOTPATCH GetScrollPos(HWND Wnd, INT Bar) { PWND pwnd; @@ -1563,7 +1570,9 @@ /* * @implemented */ -BOOL WINAPI +BOOL +WINAPI +DECLSPEC_HOTPATCH GetScrollRange(HWND Wnd, int Bar, LPINT MinPos, LPINT MaxPos) { PWND pwnd; @@ -1615,7 +1624,9 @@ /* * @implemented */ -INT WINAPI +INT +WINAPI +DECLSPEC_HOTPATCH SetScrollInfo(HWND Wnd, int SBType, LPCSCROLLINFO Info, BOOL bRedraw) { BOOL Hook; @@ -1646,7 +1657,9 @@ /* * @implemented */ -INT WINAPI +INT +WINAPI +DECLSPEC_HOTPATCH SetScrollPos(HWND hWnd, INT nBar, INT nPos, BOOL bRedraw) { SCROLLINFO ScrollInfo; @@ -1661,7 +1674,9 @@ /* * @implemented */ -BOOL WINAPI +BOOL +WINAPI +DECLSPEC_HOTPATCH SetScrollRange(HWND hWnd, INT nBar, INT nMinPos, INT nMaxPos, BOOL bRedraw) { PWND pWnd; Modified: trunk/reactos/win32ss/user/user32/misc/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/misc/s… ============================================================================== --- trunk/reactos/win32ss/user/user32/misc/stubs.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/misc/stubs.c [iso-8859-1] Wed Mar 5 12:36:04 2014 @@ -297,6 +297,7 @@ */ UINT WINAPI +DECLSPEC_HOTPATCH GetRawInputBuffer( PRAWINPUT pData, PUINT pcbSize, @@ -359,6 +360,7 @@ */ BOOL WINAPI +DECLSPEC_HOTPATCH RegisterRawInputDevices( PCRAWINPUTDEVICE pRawInputDevices, UINT uiNumDevices, Modified: trunk/reactos/win32ss/user/user32/windows/class.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/window… ============================================================================== --- trunk/reactos/win32ss/user/user32/windows/class.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/windows/class.c [iso-8859-1] Wed Mar 5 12:36:04 2014 @@ -1832,6 +1832,7 @@ */ LONG WINAPI +DECLSPEC_HOTPATCH SetWindowLongA( HWND hWnd, int nIndex, Modified: trunk/reactos/win32ss/user/user32/windows/cursoricon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/window… ============================================================================== --- trunk/reactos/win32ss/user/user32/windows/cursoricon.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/windows/cursoricon.c [iso-8859-1] Wed Mar 5 12:36:04 2014 @@ -2112,6 +2112,7 @@ */ BOOL WINAPI +DECLSPEC_HOTPATCH SetCursorPos(int X, int Y) { return NtUserxSetCursorPos(X,Y); @@ -2122,6 +2123,7 @@ */ BOOL WINAPI +DECLSPEC_HOTPATCH GetCursorPos(LPPOINT lpPoint) { BOOL res; 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] Wed Mar 5 12:36:04 2014 @@ -36,7 +36,9 @@ /* * @implemented */ -DWORD WINAPI +DWORD +WINAPI +DECLSPEC_HOTPATCH GetSysColor(int nIndex) { if(nIndex >= 0 && nIndex < NUM_SYSCOLORS) @@ -51,7 +53,9 @@ /* * @implemented */ -HBRUSH WINAPI +HBRUSH +WINAPI +DECLSPEC_HOTPATCH GetSysColorBrush(int nIndex) { if(nIndex >= 0 && nIndex < NUM_SYSCOLORS) Modified: trunk/reactos/win32ss/user/user32/windows/input.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/window… ============================================================================== --- trunk/reactos/win32ss/user/user32/windows/input.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/windows/input.c [iso-8859-1] Wed Mar 5 12:36:04 2014 @@ -114,7 +114,9 @@ /* * @implemented */ -SHORT WINAPI +SHORT +WINAPI +DECLSPEC_HOTPATCH GetAsyncKeyState(int vKey) { if (vKey < 0 || vKey > 256) @@ -185,7 +187,9 @@ /* * @implemented */ -SHORT WINAPI +SHORT +WINAPI +DECLSPEC_HOTPATCH GetKeyState(int nVirtKey) { return (SHORT)NtUserGetKeyState((DWORD)nVirtKey); Modified: trunk/reactos/win32ss/user/user32/windows/message.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/window… ============================================================================== --- trunk/reactos/win32ss/user/user32/windows/message.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/windows/message.c [iso-8859-1] Wed Mar 5 12:36:04 2014 @@ -1908,7 +1908,9 @@ /* * @implemented */ -LRESULT WINAPI +LRESULT +WINAPI +DECLSPEC_HOTPATCH DispatchMessageA(CONST MSG *lpmsg) { LRESULT Ret = 0; @@ -2000,7 +2002,9 @@ /* * @implemented */ -LRESULT WINAPI +LRESULT +WINAPI +DECLSPEC_HOTPATCH DispatchMessageW(CONST MSG *lpmsg) { LRESULT Ret = 0; @@ -2100,7 +2104,9 @@ /* * @implemented */ -BOOL WINAPI +BOOL +WINAPI +DECLSPEC_HOTPATCH GetMessageA(LPMSG lpMsg, HWND hWnd, UINT wMsgFilterMin, @@ -2128,7 +2134,9 @@ /* * @implemented */ -BOOL WINAPI +BOOL +WINAPI +DECLSPEC_HOTPATCH GetMessageW(LPMSG lpMsg, HWND hWnd, UINT wMsgFilterMin, @@ -2191,7 +2199,9 @@ /* * @implemented */ -BOOL WINAPI +BOOL +WINAPI +DECLSPEC_HOTPATCH PeekMessageA(LPMSG lpMsg, HWND hWnd, UINT wMsgFilterMin, @@ -2217,6 +2227,7 @@ */ BOOL WINAPI +DECLSPEC_HOTPATCH PeekMessageW( LPMSG lpMsg, HWND hWnd, Modified: trunk/reactos/win32ss/user/user32/windows/nonclient.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/window… ============================================================================== --- trunk/reactos/win32ss/user/user32/windows/nonclient.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/windows/nonclient.c [iso-8859-1] Wed Mar 5 12:36:04 2014 @@ -1233,7 +1233,9 @@ /* * @implemented */ -BOOL WINAPI +BOOL +WINAPI +DECLSPEC_HOTPATCH AdjustWindowRectEx(LPRECT lpRect, DWORD dwStyle, BOOL bMenu, @@ -1266,7 +1268,9 @@ /* * @implemented */ -BOOL WINAPI +BOOL +WINAPI +DECLSPEC_HOTPATCH AdjustWindowRect(LPRECT lpRect, DWORD dwStyle, BOOL bMenu) Modified: trunk/reactos/win32ss/user/user32/windows/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/window… ============================================================================== --- trunk/reactos/win32ss/user/user32/windows/window.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/windows/window.c [iso-8859-1] Wed Mar 5 12:36:04 2014 @@ -322,7 +322,9 @@ /* * @implemented */ -HWND WINAPI +HWND +WINAPI +DECLSPEC_HOTPATCH CreateWindowExA(DWORD dwExStyle, LPCSTR lpClassName, LPCSTR lpWindowName, @@ -445,7 +447,9 @@ /* * @implemented */ -HWND WINAPI +HWND +WINAPI +DECLSPEC_HOTPATCH CreateWindowExW(DWORD dwExStyle, LPCWSTR lpClassName, LPCWSTR lpWindowName, @@ -1143,7 +1147,9 @@ /* * @implemented */ -BOOL WINAPI +BOOL +WINAPI +DECLSPEC_HOTPATCH GetWindowInfo(HWND hWnd, PWINDOWINFO pwi) { @@ -1636,7 +1642,9 @@ /* * @implemented */ -BOOL WINAPI +BOOL +WINAPI +DECLSPEC_HOTPATCH SetWindowTextA(HWND hWnd, LPCSTR lpString) { @@ -1659,7 +1667,9 @@ /* * @implemented */ -BOOL WINAPI +BOOL +WINAPI +DECLSPEC_HOTPATCH SetWindowTextW(HWND hWnd, LPCWSTR lpString) {

1 0

[dquintana] 62429: [RSHELL] * CMenuSFToolbar: Keep the m_shellFolder pointer in a CComPtr, so that it doesn't get deleted and possibly reused for something else. CORE-7586
by dquintana＠svn.reactos.org 05 Mar '14

05 Mar '14

Author: dquintana Date: Wed Mar 5 12:34:30 2014 New Revision: 62429 URL: http://svn.reactos.org/svn/reactos?rev=62429&view=rev Log: [RSHELL] * CMenuSFToolbar: Keep the m_shellFolder pointer in a CComPtr, so that it doesn't get deleted and possibly reused for something else. CORE-7586 Modified: branches/shell-experiments/base/shell/rshell/CMenuToolbars.h Modified: branches/shell-experiments/base/shell/rshell/CMenuToolbars.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/rs… ============================================================================== --- branches/shell-experiments/base/shell/rshell/CMenuToolbars.h [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/rshell/CMenuToolbars.h [iso-8859-1] Wed Mar 5 12:34:30 2014 @@ -120,7 +120,7 @@ public CMenuToolbarBase { private: - IShellFolder * m_shellFolder; + CComPtr<IShellFolder> m_shellFolder; LPCITEMIDLIST m_idList; HKEY m_hKey;

1 0

[akhaldi] 62428: [SHELL32] * Mark as hotpatchable. CORE-7959
by akhaldi＠svn.reactos.org 05 Mar '14

05 Mar '14

Author: akhaldi Date: Wed Mar 5 12:12:05 2014 New Revision: 62428 URL: http://svn.reactos.org/svn/reactos?rev=62428&view=rev Log: [SHELL32] * Mark as hotpatchable. CORE-7959 Modified: trunk/reactos/dll/win32/shell32/CMakeLists.txt trunk/reactos/dll/win32/shell32/shlexec.cpp Modified: trunk/reactos/dll/win32/shell32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/CMakeLis… ============================================================================== --- trunk/reactos/dll/win32/shell32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/CMakeLists.txt [iso-8859-1] Wed Mar 5 12:12:05 2014 @@ -80,7 +80,7 @@ ${CMAKE_CURRENT_BINARY_DIR}/shell32_stubs.c ${CMAKE_CURRENT_BINARY_DIR}/shell32.def) -set_module_type(shell32 win32dll UNICODE) +set_module_type(shell32 win32dll UNICODE HOTPATCHABLE) target_link_libraries(shell32 atlnew Modified: trunk/reactos/dll/win32/shell32/shlexec.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shlexec.… ============================================================================== --- trunk/reactos/dll/win32/shell32/shlexec.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shlexec.cpp [iso-8859-1] Wed Mar 5 12:12:05 2014 @@ -2025,7 +2025,10 @@ * ShellExecuteExA [SHELL32.292] * */ -BOOL WINAPI ShellExecuteExA(LPSHELLEXECUTEINFOA sei) +BOOL +WINAPI +DECLSPEC_HOTPATCH +ShellExecuteExA(LPSHELLEXECUTEINFOA sei) { SHELLEXECUTEINFOW seiW; BOOL ret; @@ -2072,7 +2075,10 @@ * ShellExecuteExW [SHELL32.293] * */ -BOOL WINAPI ShellExecuteExW(LPSHELLEXECUTEINFOW sei) +BOOL +WINAPI +DECLSPEC_HOTPATCH +ShellExecuteExW(LPSHELLEXECUTEINFOW sei) { return SHELL_execute(sei, SHELL_ExecuteW); }

1 0

[akhaldi] 62427: [NTDLL] * Mark as hotpatchable. CORE-7959
by akhaldi＠svn.reactos.org 05 Mar '14

05 Mar '14

Author: akhaldi Date: Wed Mar 5 12:06:28 2014 New Revision: 62427 URL: http://svn.reactos.org/svn/reactos?rev=62427&view=rev Log: [NTDLL] * Mark as hotpatchable. CORE-7959 Modified: trunk/reactos/dll/ntdll/CMakeLists.txt trunk/reactos/dll/ntdll/ldr/ldrapi.c Modified: trunk/reactos/dll/ntdll/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/CMakeLists.txt?r… ============================================================================== --- trunk/reactos/dll/ntdll/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/CMakeLists.txt [iso-8859-1] Wed Mar 5 12:06:28 2014 @@ -42,7 +42,7 @@ def/ntdll.rc ${CMAKE_CURRENT_BINARY_DIR}/ntdll.def) -set_module_type(ntdll win32dll ENTRYPOINT 0) +set_module_type(ntdll win32dll HOTPATCHABLE ENTRYPOINT 0) ############################################# ## HACK FOR MSVC COMPILATION WITH win32dll ## set_subsystem(ntdll console) Modified: trunk/reactos/dll/ntdll/ldr/ldrapi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/ldr/ldrapi.c?rev… ============================================================================== --- trunk/reactos/dll/ntdll/ldr/ldrapi.c [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/ldr/ldrapi.c [iso-8859-1] Wed Mar 5 12:06:28 2014 @@ -307,6 +307,7 @@ */ NTSTATUS NTAPI +DECLSPEC_HOTPATCH LdrLoadDll(IN PWSTR SearchPath OPTIONAL, IN PULONG DllCharacteristics OPTIONAL, IN PUNICODE_STRING DllName,

1 0

[dquintana] 62426: [COMCTL32] * Make horizontal separators of vertical toolbars draw. * Apply the same padding to separators as the rest of the buttons. * Fixup some tabs into spaces, for consisten...
by dquintana＠svn.reactos.org 05 Mar '14

05 Mar '14

Author: dquintana Date: Wed Mar 5 11:48:55 2014 New Revision: 62426 URL: http://svn.reactos.org/svn/reactos?rev=62426&view=rev Log: [COMCTL32] * Make horizontal separators of vertical toolbars draw. * Apply the same padding to separators as the rest of the buttons. * Fixup some tabs into spaces, for consistency. * Needs to be sent to wine. Modified: branches/shell-experiments/dll/win32/comctl32/toolbar.c Modified: branches/shell-experiments/dll/win32/comctl32/toolbar.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/com… ============================================================================== --- branches/shell-experiments/dll/win32/comctl32/toolbar.c [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/comctl32/toolbar.c [iso-8859-1] Wed Mar 5 11:48:55 2014 @@ -843,16 +843,20 @@ /* empirical tests show that iBitmap can/will be non-zero */ /* when drawing the vertical bar... */ if ((dwStyle & TBSTYLE_FLAT) /* && (btnPtr->iBitmap == 0) */) { - if (dwStyle & CCS_VERT) - TOOLBAR_DrawFlatHorizontalSeparator (&rc, hdc, infoPtr); - else - TOOLBAR_DrawFlatSeparator (&rc, hdc, infoPtr); - } - else if (btnPtr->fsStyle != BTNS_SEP) { - FIXME("Draw some kind of separator: fsStyle=%x\n", - btnPtr->fsStyle); - } - return; + if (dwStyle & CCS_VERT) { + RECT rcsep = rc; + InflateRect(&rcsep, -infoPtr->szPadding.cx, -infoPtr->szPadding.cy); + TOOLBAR_DrawFlatHorizontalSeparator (&rcsep, hdc, infoPtr); + } + else { + TOOLBAR_DrawFlatSeparator (&rc, hdc, infoPtr); + } + } + else if (btnPtr->fsStyle != BTNS_SEP) { + FIXME("Draw some kind of separator: fsStyle=%x\n", + btnPtr->fsStyle); + } + return; } /* get a pointer to the text */ @@ -1662,7 +1666,7 @@ if (btnPtr->fsStyle & BTNS_SEP) { if (infoPtr->dwStyle & CCS_VERT) { cy = (btnPtr->iBitmap > 0) ? btnPtr->iBitmap : SEPARATOR_WIDTH; - cx = (btnPtr->cx > 0) ? btnPtr->cx : infoPtr->nWidth; + cx = (btnPtr->cx > 0) ? btnPtr->cx : infoPtr->nButtonWidth; } else cx = (btnPtr->cx > 0) ? btnPtr->cx :

1 0

← Newer
1
...
14
15
16
17
18
19
20
...
24
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs March 2014