Ros-diffs February 2017

ros-diffs@reactos.org

13 participants
353 discussions

[gadamopoulos] 73866: [SHLWAPI]: Stub SHPropertyBag_WriteLONG and SHPropertyBag_WriteStr. Patch by Jared Smudde. CORE-12805

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Mon Feb 20 20:18:10 2017 New Revision: 73866 URL: http://svn.reactos.org/svn/reactos?rev=73866&view=rev Log: [SHLWAPI]: Stub SHPropertyBag_WriteLONG and SHPropertyBag_WriteStr. Patch by Jared Smudde. CORE-12805 Modified: trunk/reactos/dll/win32/shlwapi/ordinal.c trunk/reactos/dll/win32/shlwapi/shlwapi.spec Modified: trunk/reactos/dll/win32/shlwapi/ordinal.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/ordinal.… ============================================================================== --- trunk/reactos/dll/win32/shlwapi/ordinal.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shlwapi/ordinal.c [iso-8859-1] Mon Feb 20 20:18:10 2017 @@ -5197,6 +5197,46 @@ return hr; } +#ifdef __REACTOS__ +/************************************************************************** + * SHPropertyBag_WriteLONG (SHLWAPI.497) + * + * This function asks a property bag to write a named property as a LONG. + * + * PARAMS + * ppb: a IPropertyBag interface + * pszPropName: Unicode string that names the property + * lValue: address to receive the property value as a 32-bit signed integer + * + * RETURNS + * HRESULT codes + */ +HRESULT WINAPI SHPropertyBag_WriteLONG(IPropertyBag *ppb, LPCWSTR pszPropName, LONG lValue) +{ + UNIMPLEMENTED; + return E_NOTIMPL; +} + +/************************************************************************** + * SHPropertyBag_WriteStr (SHLWAPI.495) + * + * This function asks a property bag to write a string as the value of a named property. + * + * PARAMS + * ppb: a IPropertyBag interface + * pszPropName: Unicode string that names the property + * pValue: address to write the property value + * + * RETURNS + * HRESULT codes + */ +HRESULT WINAPI SHPropertyBag_WriteStr(IPropertyBag *ppb, LPCWSTR pszPropName, LPCWSTR pszValue) +{ + UNIMPLEMENTED; + return E_NOTIMPL; +} +#endif + /* return flags for SHGetObjectCompatFlags, names derived from registry value names */ #define OBJCOMPAT_OTNEEDSSFCACHE 0x00000001 #define OBJCOMPAT_NO_WEBVIEW 0x00000002 Modified: trunk/reactos/dll/win32/shlwapi/shlwapi.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/shlwapi.… ============================================================================== --- trunk/reactos/dll/win32/shlwapi/shlwapi.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shlwapi/shlwapi.spec [iso-8859-1] Mon Feb 20 20:18:10 2017 @@ -492,9 +492,9 @@ 492 stub -noname PrettifyFileDescriptionW 493 stub -noname SHPropertyBag_ReadType 494 stub -noname SHPropertyBag_ReadStr -495 stub -noname SHPropertyBag_WriteStr +495 stdcall -noname SHPropertyBag_WriteStr(ptr wstr wstr) 496 stdcall -noname SHPropertyBag_ReadLONG(ptr wstr ptr) -497 stub -noname SHPropertyBag_WriteLONG +497 stdcall -noname SHPropertyBag_WriteLONG(ptr wstr long) 498 stub -noname SHPropertyBag_ReadBOOLOld 499 stub -noname SHPropertyBag_WriteBOOL 500 stdcall AssocGetPerceivedType(wstr ptr ptr ptr)

7 years, 7 months

[gadamopoulos] 73865: [SHELL32] -Cleanup CFSFolder::_LoadDynamicDropTargetHandlerForKey. Inspired by patch by Victor Martinez Calvo. CORE-12799. CID 1401249

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Mon Feb 20 20:13:22 2017 New Revision: 73865 URL: http://svn.reactos.org/svn/reactos?rev=73865&view=rev Log: [SHELL32] -Cleanup CFSFolder::_LoadDynamicDropTargetHandlerForKey. Inspired by patch by Victor Martinez Calvo. CORE-12799. CID 1401249 Modified: trunk/reactos/dll/win32/shell32/folders/CFSFolder.cpp Modified: trunk/reactos/dll/win32/shell32/folders/CFSFolder.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/… ============================================================================== --- trunk/reactos/dll/win32/shell32/folders/CFSFolder.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/folders/CFSFolder.cpp [iso-8859-1] Mon Feb 20 20:13:22 2017 @@ -1056,38 +1056,41 @@ { TRACE("CFSFolder::_LoadDynamicDropTargetHandlerForKey entered\n"); - WCHAR wszName[MAX_PATH], *pwszClsid; + WCHAR wszName[MAX_PATH]; DWORD dwSize = sizeof(wszName); HRESULT hr; - - if (RegGetValueW(hRootKey, L"shellex\\DropHandler", NULL, RRF_RT_REG_SZ, NULL, wszName, &dwSize) == ERROR_SUCCESS) - { - CLSID clsid; - hr = CLSIDFromString(wszName, &clsid); - if (hr == S_OK) - pwszClsid = wszName; - - if (m_bGroupPolicyActive) - { - if (RegGetValueW(HKEY_LOCAL_MACHINE, - L"Software\\Microsoft\\Windows\\CurrentVersion\\Shell Extensions\\Approved", - pwszClsid, - RRF_RT_REG_SZ, - NULL, - NULL, - NULL) == ERROR_SUCCESS) - { - hr = _LoadDynamicDropTargetHandler(&clsid, pwcsname, ppvOut); - } - } - else - { - hr = _LoadDynamicDropTargetHandler(&clsid, pwcsname, ppvOut); - } - } - else - return E_FAIL; - return hr; + LRESULT res; + + res = RegGetValueW(hRootKey, L"shellex\\DropHandler", NULL, RRF_RT_REG_SZ, NULL, wszName, &dwSize); + if (res != ERROR_SUCCESS) + return S_FALSE; + + CLSID clsid; + hr = CLSIDFromString(wszName, &clsid); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; + + if (m_bGroupPolicyActive) + { + res = RegGetValueW(HKEY_LOCAL_MACHINE, + L"Software\\Microsoft\\Windows\\CurrentVersion\\Shell Extensions\\Approved", + wszName, + RRF_RT_REG_SZ, + NULL, + NULL, + NULL); + if (res != ERROR_SUCCESS) + { + ERR("DropHandler extension %S not approved\n", wszName); + return E_FAIL; + } + } + + hr = _LoadDynamicDropTargetHandler(&clsid, pwcsname, ppvOut); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; + + return S_OK; } HRESULT WINAPI CFSFolder::_LoadDynamicDropTargetHandler(const CLSID *pclsid, LPCWSTR pwcsname, LPVOID *ppvOut)

7 years, 7 months

[gadamopoulos] 73864: [MSGINA] -Make ShellIsFriendlyUIActive export a non fatal stub. CORE-12805

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Mon Feb 20 19:51:12 2017 New Revision: 73864 URL: http://svn.reactos.org/svn/reactos?rev=73864&view=rev Log: [MSGINA] -Make ShellIsFriendlyUIActive export a non fatal stub. CORE-12805 Modified: trunk/reactos/dll/win32/msgina/msgina.spec Modified: trunk/reactos/dll/win32/msgina/msgina.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/msgina.sp… ============================================================================== --- trunk/reactos/dll/win32/msgina/msgina.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/msgina.spec [iso-8859-1] Mon Feb 20 19:51:12 2017 @@ -1,6 +1,6 @@ 1 stub -noname ShellGetUserList ; (long long long) 2 stub -noname ShellStatusHostEnd ; (long) -3 stub -noname ShellIsFriendlyUIActive ; () +3 stdcall -stub -noname ShellIsFriendlyUIActive() 4 stub -noname ShellIsSuspendAllowed ; () 5 stub -noname ShellIsRemoteConnectionsEnabled ; () 6 stub -noname ShellEnableFriendlyUI ; (long)

7 years, 7 months

[tfaber] 73863: [MSWSOCK] - Eliminate dead code in NSP_LookupServiceNextW. Patch by Víctor Martínez Calvo. CID 1400942 CORE-12806 #resolve

by tfaber＠svn.reactos.org

Author: tfaber Date: Mon Feb 20 19:32:12 2017 New Revision: 73863 URL: http://svn.reactos.org/svn/reactos?rev=73863&view=rev Log: [MSWSOCK] - Eliminate dead code in NSP_LookupServiceNextW. Patch by Víctor Martínez Calvo. CID 1400942 CORE-12806 #resolve Modified: trunk/reactos/dll/win32/mswsock/CMakeLists.txt trunk/reactos/dll/win32/mswsock/nsplookup.c Modified: trunk/reactos/dll/win32/mswsock/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mswsock/CMakeLis… ============================================================================== --- trunk/reactos/dll/win32/mswsock/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mswsock/CMakeLists.txt [iso-8859-1] Mon Feb 20 19:32:12 2017 @@ -16,6 +16,6 @@ ${CMAKE_CURRENT_BINARY_DIR}/mswsock.def) set_module_type(mswsock win32dll UNICODE) -add_importlibs(mswsock ws2_32 advapi32 dnsapi msvcrt kernel32) +add_importlibs(mswsock ws2_32 advapi32 dnsapi msvcrt kernel32 ntdll) add_pch(mswsock precomp.h SOURCE) add_cd_file(TARGET mswsock DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/dll/win32/mswsock/nsplookup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mswsock/nsplooku… ============================================================================== --- trunk/reactos/dll/win32/mswsock/nsplookup.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mswsock/nsplookup.c [iso-8859-1] Mon Feb 20 19:32:12 2017 @@ -13,6 +13,9 @@ #include <winreg.h> #include "mswhelper.h" + +#define NDEBUG +#include <debug.h> #define NSP_CALLID_DNS 0x0001 #define NSP_CALLID_HOSTNAME 0x0002 @@ -891,18 +894,14 @@ if (result != ERROR_SUCCESS) goto End; } - else if (CallID == NSP_CALLID_SERVICEBYNAME) - { + else + { + ASSERT(CallID == NSP_CALLID_SERVICEBYNAME); result = NSP_GetServiceByNameHeapAllocW(data->hostnameW, &data->providerId, &hostinfo); if (result != ERROR_SUCCESS) goto End; - } - else - { - result = WSANO_RECOVERY; // Internal error! - goto End; } if (((LUP_RETURN_BLOB & data->dwControlFlags) != 0) ||

7 years, 7 months

[tfaber] 73862: [USER32][UXTHEME] - Make API hooks type-safe. Fixes stack pointer corruption when calling ThemeGetScrollInfo. Powered by /RTC1

by tfaber＠svn.reactos.org

Author: tfaber Date: Mon Feb 20 17:31:50 2017 New Revision: 73862 URL: http://svn.reactos.org/svn/reactos?rev=73862&view=rev Log: [USER32][UXTHEME] - Make API hooks type-safe. Fixes stack pointer corruption when calling ThemeGetScrollInfo. Powered by /RTC1 Modified: trunk/reactos/dll/win32/uxtheme/themehooks.c trunk/reactos/sdk/include/reactos/undocuser.h trunk/reactos/win32ss/user/user32/misc/usrapihk.c Modified: trunk/reactos/dll/win32/uxtheme/themehooks.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/uxtheme/themehoo… ============================================================================== --- trunk/reactos/dll/win32/uxtheme/themehooks.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/uxtheme/themehooks.c [iso-8859-1] Mon Feb 20 17:31:50 2017 @@ -269,7 +269,7 @@ return user32ApiHook.SetWindowRgn(hWnd, hRgn, bRedraw); } -BOOL ThemeGetScrollInfo(HWND hwnd, int fnBar, LPSCROLLINFO lpsi) +BOOL WINAPI ThemeGetScrollInfo(HWND hwnd, int fnBar, LPSCROLLINFO lpsi) { PWND_CONTEXT pwndContext; DWORD style; @@ -341,7 +341,7 @@ puah->DlgProcArray.Size = UAHOWP_MAX_SIZE; puah->SetWindowRgn = ThemeSetWindowRgn; - puah->GetScrollInfo = (FARPROC)ThemeGetScrollInfo; + puah->GetScrollInfo = ThemeGetScrollInfo; UAH_HOOK_MESSAGE(puah->DefWndProcArray, WM_NCPAINT); UAH_HOOK_MESSAGE(puah->DefWndProcArray, WM_NCACTIVATE); Modified: trunk/reactos/sdk/include/reactos/undocuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/reactos/undocu… ============================================================================== --- trunk/reactos/sdk/include/reactos/undocuser.h [iso-8859-1] (original) +++ trunk/reactos/sdk/include/reactos/undocuser.h [iso-8859-1] Mon Feb 20 17:31:50 2017 @@ -204,6 +204,18 @@ typedef LRESULT(CALLBACK *WNDPROC_OWP)(HWND,UINT,WPARAM,LPARAM,ULONG_PTR,PDWORD); typedef int (WINAPI *SETWINDOWRGN)(HWND hWnd, HRGN hRgn, BOOL bRedraw); +typedef BOOL (WINAPI *GETSCROLLINFO)(HWND,INT,LPSCROLLINFO); +typedef INT (WINAPI *SETSCROLLINFO)(HWND,int,LPCSCROLLINFO,BOOL); +typedef BOOL (WINAPI *ENABLESCROLLBAR)(HWND,UINT,UINT); +typedef BOOL (WINAPI *ADJUSTWINDOWRECTEX)(LPRECT,DWORD,BOOL,DWORD); +typedef int (WINAPI *GETSYSTEMMETRICS)(int); +typedef BOOL (WINAPI *SYSTEMPARAMETERSINFOA)(UINT,UINT,PVOID,UINT); +typedef BOOL (WINAPI *SYSTEMPARAMETERSINFOW)(UINT,UINT,PVOID,UINT); +typedef BOOL (__fastcall *FORCERESETUSERAPIHOOK)(HINSTANCE); +typedef BOOL (WINAPI *DRAWFRAMECONTROL)(HDC,LPRECT,UINT,UINT); +typedef BOOL (WINAPI *DRAWCAPTION)(HWND,HDC,LPCRECT,UINT); +typedef BOOL (WINAPI *MDIREDRAWFRAME)(HWND,DWORD); +typedef DWORD (WINAPI *GETREALWINDOWOWNER)(HWND); typedef struct _UAHOWP { @@ -221,10 +233,10 @@ WNDPROC DefWindowProcA; WNDPROC DefWindowProcW; UAHOWP DefWndProcArray; - FARPROC GetScrollInfo; - FARPROC SetScrollInfo; - FARPROC EnableScrollBar; - FARPROC AdjustWindowRectEx; + GETSCROLLINFO GetScrollInfo; + SETSCROLLINFO SetScrollInfo; + ENABLESCROLLBAR EnableScrollBar; + ADJUSTWINDOWRECTEX AdjustWindowRectEx; SETWINDOWRGN SetWindowRgn; WNDPROC_OWP PreWndProc; WNDPROC_OWP PostWndProc; @@ -232,14 +244,14 @@ WNDPROC_OWP PreDefDlgProc; WNDPROC_OWP PostDefDlgProc; UAHOWP DlgProcArray; - FARPROC GetSystemMetrics; - FARPROC SystemParametersInfoA; - FARPROC SystemParametersInfoW; - FARPROC ForceResetUserApiHook; - FARPROC DrawFrameControl; - FARPROC DrawCaption; - FARPROC MDIRedrawFrame; - FARPROC GetRealWindowOwner; + GETSYSTEMMETRICS GetSystemMetrics; + SYSTEMPARAMETERSINFOA SystemParametersInfoA; + SYSTEMPARAMETERSINFOW SystemParametersInfoW; + FORCERESETUSERAPIHOOK ForceResetUserApiHook; + DRAWFRAMECONTROL DrawFrameControl; + DRAWCAPTION DrawCaption; + MDIREDRAWFRAME MDIRedrawFrame; + GETREALWINDOWOWNER GetRealWindowOwner; } USERAPIHOOK, *PUSERAPIHOOK; typedef enum _UAPIHK Modified: trunk/reactos/win32ss/user/user32/misc/usrapihk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/misc/u… ============================================================================== --- trunk/reactos/win32ss/user/user32/misc/usrapihk.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/misc/usrapihk.c [iso-8859-1] Mon Feb 20 17:31:50 2017 @@ -28,7 +28,7 @@ BOOL WINAPI RealSystemParametersInfoA(UINT,UINT,PVOID,UINT); BOOL WINAPI RealSystemParametersInfoW(UINT,UINT,PVOID,UINT); DWORD WINAPI GetRealWindowOwner(HWND); -LRESULT WINAPI RealUserDrawCaption(HWND hWnd, HDC hDC, LPCRECT lpRc, UINT uFlags); +BOOL WINAPI RealUserDrawCaption(HWND hWnd, HDC hDC, LPCRECT lpRc, UINT uFlags); /* GLOBALS *******************************************************************/ @@ -137,10 +137,10 @@ puah->DefWindowProcW = RealDefWindowProcW; puah->DefWndProcArray.MsgBitArray = NULL; puah->DefWndProcArray.Size = 0; - puah->GetScrollInfo = (FARPROC)RealGetScrollInfo; - puah->SetScrollInfo = (FARPROC)RealSetScrollInfo; - puah->EnableScrollBar = (FARPROC)NtUserEnableScrollBar; - puah->AdjustWindowRectEx = (FARPROC)RealAdjustWindowRectEx; + puah->GetScrollInfo = RealGetScrollInfo; + puah->SetScrollInfo = RealSetScrollInfo; + puah->EnableScrollBar = NtUserEnableScrollBar; + puah->AdjustWindowRectEx = RealAdjustWindowRectEx; puah->SetWindowRgn = NtUserSetWindowRgn; puah->PreWndProc = DefaultOWP; puah->PostWndProc = DefaultOWP; @@ -150,14 +150,14 @@ puah->PostDefDlgProc = DefaultOWP; puah->DlgProcArray.MsgBitArray = NULL; puah->DlgProcArray.Size = 0; - puah->GetSystemMetrics = (FARPROC)RealGetSystemMetrics; - puah->SystemParametersInfoA = (FARPROC)RealSystemParametersInfoA; - puah->SystemParametersInfoW = (FARPROC)RealSystemParametersInfoW; - puah->ForceResetUserApiHook = (FARPROC)ForceResetUserApiHook; - puah->DrawFrameControl = (FARPROC)RealDrawFrameControl; - puah->DrawCaption = (FARPROC)RealUserDrawCaption; - puah->MDIRedrawFrame = (FARPROC)RealMDIRedrawFrame; - puah->GetRealWindowOwner = (FARPROC)GetRealWindowOwner; + puah->GetSystemMetrics = RealGetSystemMetrics; + puah->SystemParametersInfoA = RealSystemParametersInfoA; + puah->SystemParametersInfoW = RealSystemParametersInfoW; + puah->ForceResetUserApiHook = ForceResetUserApiHook; + puah->DrawFrameControl = RealDrawFrameControl; + puah->DrawCaption = RealUserDrawCaption; + puah->MDIRedrawFrame = RealMDIRedrawFrame; + puah->GetRealWindowOwner = GetRealWindowOwner; } BOOL @@ -262,7 +262,7 @@ RtlEnterCriticalSection(&gcsUserApiHook); if (!pfn(uahLoadInit,&uah) || // Swap data, User32 to and Uxtheme from! - uah.ForceResetUserApiHook != (FARPROC)ForceResetUserApiHook || + uah.ForceResetUserApiHook != ForceResetUserApiHook || uah.size <= 0 ) { RtlLeaveCriticalSection(&gcsUserApiHook); @@ -347,10 +347,10 @@ RealDefWindowProcA, RealDefWindowProcW, {NULL, 0}, - (FARPROC)RealGetScrollInfo, - (FARPROC)RealSetScrollInfo, - (FARPROC)NtUserEnableScrollBar, - (FARPROC)RealAdjustWindowRectEx, + RealGetScrollInfo, + RealSetScrollInfo, + NtUserEnableScrollBar, + RealAdjustWindowRectEx, NtUserSetWindowRgn, DefaultOWP, DefaultOWP, @@ -358,14 +358,14 @@ DefaultOWP, DefaultOWP, {NULL, 0}, - (FARPROC)RealGetSystemMetrics, - (FARPROC)RealSystemParametersInfoA, - (FARPROC)RealSystemParametersInfoW, - (FARPROC)ForceResetUserApiHook, - (FARPROC)RealDrawFrameControl, - (FARPROC)NtUserDrawCaption, - (FARPROC)RealMDIRedrawFrame, - (FARPROC)GetRealWindowOwner, + RealGetSystemMetrics, + RealSystemParametersInfoA, + RealSystemParametersInfoW, + ForceResetUserApiHook, + RealDrawFrameControl, + NtUserDrawCaption, + RealMDIRedrawFrame, + GetRealWindowOwner, }; /* FUNCTIONS *****************************************************************/

7 years, 7 months

[tfaber] 73861: [WS2_32] - Re-apply null termination fix in GetProtoGetNextEnt, which was lost in ws2_32_new work. CID 716700 CORE-11218

by tfaber＠svn.reactos.org

Author: tfaber Date: Mon Feb 20 16:33:44 2017 New Revision: 73861 URL: http://svn.reactos.org/svn/reactos?rev=73861&view=rev Log: [WS2_32] - Re-apply null termination fix in GetProtoGetNextEnt, which was lost in ws2_32_new work. CID 716700 CORE-11218 Modified: trunk/reactos/dll/win32/ws2_32/src/getproto.c Modified: trunk/reactos/dll/win32/ws2_32/src/getproto.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32/src/getpr… ============================================================================== --- trunk/reactos/dll/win32/ws2_32/src/getproto.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32/src/getproto.c [iso-8859-1] Mon Feb 20 16:33:44 2017 @@ -145,12 +145,13 @@ /* Read 512 bytes */ if (!ReadFile(DbHandle, Buffer->LineBuffer, - 512, + sizeof(Buffer->LineBuffer) - 1, &Read, NULL)) return NULL; /* Find out where the line ends */ p1 = Buffer->LineBuffer; + Buffer->LineBuffer[Read] = ANSI_NULL; p = strchr(Buffer->LineBuffer, '\n'); /* Bail out if the file is parsed */ @@ -243,7 +244,7 @@ PWSTHREAD Thread; INT ErrorCode; PPROTOENT Protoent; - PVOID GetProtoBuffer; + PVOID GetProtoBuffer; HANDLE DbHandle; DPRINT("getprotobynumber: %lx\n", number); @@ -307,7 +308,7 @@ PWSTHREAD Thread; INT ErrorCode; PPROTOENT Protoent; - PVOID GetProtoBuffer; + PVOID GetProtoBuffer; HANDLE DbHandle; DPRINT("getprotobyname: %s\n", name);

7 years, 7 months

[tfaber] 73860: [BROWSEUI] - Correctly pass the buffer size to RegQueryValueW in CAutoComplete::Init. Patch by Víctor Martínez Calvo. CID 1401255 CORE-12795 #resolve

by tfaber＠svn.reactos.org

Author: tfaber Date: Mon Feb 20 16:07:05 2017 New Revision: 73860 URL: http://svn.reactos.org/svn/reactos?rev=73860&view=rev Log: [BROWSEUI] - Correctly pass the buffer size to RegQueryValueW in CAutoComplete::Init. Patch by Víctor Martínez Calvo. CID 1401255 CORE-12795 #resolve Modified: trunk/reactos/dll/win32/browseui/CAutoComplete.cpp Modified: trunk/reactos/dll/win32/browseui/CAutoComplete.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/CAutoCo… ============================================================================== --- trunk/reactos/dll/win32/browseui/CAutoComplete.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/CAutoComplete.cpp [iso-8859-1] Mon Feb 20 16:07:05 2017 @@ -184,6 +184,7 @@ if (res == ERROR_SUCCESS) { + len = sizeof(result); res = RegQueryValueW(hKey, value, result, &len); if (res == ERROR_SUCCESS) {

7 years, 7 months

[hbelusca] 73859: [FREELDR]: Update the FreeLdr's startup notes.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Mon Feb 20 15:45:01 2017 New Revision: 73859 URL: http://svn.reactos.org/svn/reactos?rev=73859&view=rev Log: [FREELDR]: Update the FreeLdr's startup notes. Modified: trunk/reactos/boot/freeldr/notes.txt Modified: trunk/reactos/boot/freeldr/notes.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/notes.txt?rev… ============================================================================== --- trunk/reactos/boot/freeldr/notes.txt [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/notes.txt [iso-8859-1] Mon Feb 20 15:45:01 2017 @@ -1,6 +1,8 @@ -FreeLoader notes +FreeLoader notes (for x86 PC architecture only!) +================================================ -Memory layout: +Memory layout (WARNING: may be out-of-date) +-~-~-~-~-~-~- 0000:0000 - 0000:0FFF: Interrupt vector table & BIOS data 0000:1000 - 0000:6FFF: Real mode stack area @@ -14,44 +16,45 @@ FreeLoader Boot Process +-~-~-~-~-~-~-~-~-~-~-~- FAT 12/16/32 Boot Sector - The BIOS loads the boot sector at 0000:7C00. The FAT32 boot sector -relocates itself higher in memory at 9000:0000 and loads it's extra sector -at 9000:0200 and then looks for freeldr.sys on the file system. Once found -it loads freeldr.sys to 0000:7E00 and then jumps to it's entry point at -0000:8000. The FAT12/16 boot sector does no relocation, it just searches for -the freeldr.sys and loads the first 512 bytes to 0000:7E00. This extra code -enables it to fully navigate the file allocation table. Then it loads -freeldr.sys to 0000:7E00 and jumps to it's entry point at 0000:8000. Before -FreeLoader gets control the boot sector saves the screen contents to a buffer -at 9000:8000 and the cursor x & y position to bytes at 9000:8FA0 & 9000:8FA1 -respectively. + The BIOS loads the boot sector at 0000:7C00. The FAT12/16 boot sector just +searches for FREELDR.SYS and loads its first 512 bytes to 0000:F800. This extra +helper code enables it to fully navigate the file allocation table. The boot +sector then jumps to FREELDR.SYS entry point at 0000:F803 and the helper code +takes the relay. It finishes loading the FREELDR.SYS image and finally jumps to +its final entry point at 0000:FA00. + The FAT32 boot sector loads its extra sector at 0000:7E00 and looks for +FREELDR.SYS on the file system. Once found it loads FREELDR.SYS to 0000:F800 +and jumps to its entry point at the same address. This allows it to jump over +the FAT12/16 extra helper code situated at this address, and go to the final +entry point at 0000:FA00. ISO-9660 (CD-ROM) Boot Sector - The BIOS loads the boot sector (2048 bytes) at 0000:7C00. First, the + The BIOS loads the boot sector (2048 bytes) at 0000:7C00. First, the boot sector relocates itself to 0000:7000 (up to 0000:7800). Then it looks -for the LOADER directory and makes it the current directory. Next it looks for -FREELDR.SYS and loads it at 0000:8000. Finally it restores the boot drive -number in the DL register and jumps to FreeLoader's entry point at 0000:8000. +for the LOADER directory and makes it the current directory. Next it looks +for FREELDR.SYS and loads it at 0000:F800. Finally it restores the boot drive +number in the DL register and jumps to FreeLoader's entry point at 0000:F800. Multiboot - Freeldr contains a multiboot signature and can itself be loaded by a -multiboot-compliant loader (like Grub). The multiboot header instructs the -primary loader to load freeldr.sys at 0x200000 (needs to be above 1MB). Control -is then transferred to the multiboot entry point. Since freeldr.sys expects to -be loaded at a base address 0000:8000 it will start by relocating itself there + Freeldr contains a multiboot signature and can itself be loaded by a +multiboot-compliant loader (like GRUB). The multiboot header instructs the +primary loader to load FREELDR.SYS at 0x200000 (needs to be above 1MB). Control +is then transferred to the multiboot entry point. Since FREELDR.SYS expects to +be loaded at a base address 0000:F800 it will start by relocating itself there and then jumping to the relocated copy. +FreeLoader Initialization +-~-~-~-~-~-~-~-~-~-~-~-~- -FreeLoader Initialization - - When FreeLoader gets control it saves the boot drive, passed to it in -the DL register, and sets up the stack, enables protected mode, and calls -BootMain(). + When FreeLoader gets control it saves the boot drive and partition, passed +to it respectively in the DL and DH registers, and sets up the stack, enables +protected mode, and calls BootMain().

7 years, 7 months

[khornicek] 73858: [EVENTLOG] - Silence some debug prints. This commit bears the "Hermès' seal of approval".

by khornicek＠svn.reactos.org

Author: khornicek Date: Mon Feb 20 14:45:03 2017 New Revision: 73858 URL: http://svn.reactos.org/svn/reactos?rev=73858&view=rev Log: [EVENTLOG] - Silence some debug prints. This commit bears the "Hermès' seal of approval". Modified: trunk/reactos/base/services/eventlog/file.c Modified: trunk/reactos/base/services/eventlog/file.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/eventlog/fil… ============================================================================== --- trunk/reactos/base/services/eventlog/file.c [iso-8859-1] (original) +++ trunk/reactos/base/services/eventlog/file.c [iso-8859-1] Mon Feb 20 14:45:03 2017 @@ -332,7 +332,7 @@ NULL, NULL); - DPRINT1("Going to create or open %wZ\n", FileName); + DPRINT("Going to create or open %wZ\n", FileName); Status = NtCreateFile(&pLogFile->FileHandle, Backup ? (GENERIC_READ | SYNCHRONIZE) : (GENERIC_READ | GENERIC_WRITE | SYNCHRONIZE), @@ -352,7 +352,7 @@ } CreateNew = (IoStatusBlock.Information == FILE_CREATED); - DPRINT1("%wZ %s successfully\n", FileName, CreateNew ? "created" : "opened"); + DPRINT("%wZ %s successfully\n", FileName, CreateNew ? "created" : "opened"); /* * Retrieve the log file size and check whether the file is not too large; @@ -504,7 +504,7 @@ OBJECT_ATTRIBUTES ObjectAttributes; IO_STATUS_BLOCK IoStatusBlock; - DPRINT1("LogfBackupFile(%p, %wZ)\n", LogFile, BackupFileName); + DPRINT("LogfBackupFile(%p, %wZ)\n", LogFile, BackupFileName); /* Lock the log file shared */ RtlAcquireResourceShared(&LogFile->Lock, TRUE);

7 years, 7 months

[tfaber] 73857: [WINPRINT] - Avoid uninitialized hPrintMonitor in PrintRawJob failure case. Patch by Víctor Martínez Calvo CORE-12792 #resolve

by tfaber＠svn.reactos.org

Author: tfaber Date: Mon Feb 20 12:00:13 2017 New Revision: 73857 URL: http://svn.reactos.org/svn/reactos?rev=73857&view=rev Log: [WINPRINT] - Avoid uninitialized hPrintMonitor in PrintRawJob failure case. Patch by Víctor Martínez Calvo CORE-12792 #resolve Modified: trunk/reactos/win32ss/printing/processors/winprint/raw.c Modified: trunk/reactos/win32ss/printing/processors/winprint/raw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/printing/processor… ============================================================================== --- trunk/reactos/win32ss/printing/processors/winprint/raw.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/printing/processors/winprint/raw.c [iso-8859-1] Mon Feb 20 12:00:13 2017 @@ -31,7 +31,7 @@ DWORD cbWritten; DWORD dwErrorCode; HANDLE hPrintJob; - HANDLE hPrintMonitor; + HANDLE hPrintMonitor = NULL; PBYTE pBuffer = NULL; // Open the spooled job to read from it.

7 years, 7 months

← Newer
1
...
12
13
14
15
16
17
18
...
36
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 February 2017