[ros-diffs] [hbelusca] 71504: [WIN32K][BUILDNO] Add the compiler ID and version to the ROS version desktop watermark. Idea of encoded & learn_more, thanks :) [BOOTDATA] Enable the ROS version desktop
Author: hbelusca Date: Thu Jun 2 22:28:36 2016 New Revision: 71504 URL: http://svn.reactos.org/svn/reactos?rev=71504=rev Log: [WIN32K][BUILDNO] Add the compiler ID and version to the ROS version desktop watermark. Idea of encoded & learn_more, thanks :) [BOOTDATA] Enable the ROS version desktop watermark on our daily builds. CORE-11349 Modified: trunk/reactos/boot/bootdata/hivesft.inf trunk/reactos/sdk/include/reactos/buildno.h.cmake trunk/reactos/win32ss/user/ntuser/desktop.c Modified: trunk/reactos/boot/bootdata/hivesft.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesft.inf?rev=71504=71503=71504=diff == --- trunk/reactos/boot/bootdata/hivesft.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesft.inf [iso-8859-1] Thu Jun 2 22:28:36 2016 @@ -1388,6 +1388,7 @@ HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Windows","AppInit_DLLs",0x,"" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Windows","DesktopHeapLogging",0x00010001,0x1 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Windows","DeviceNotSelectedTimeout",0x,"15" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Windows","DisplayVersion",0x00010001,0x1 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Windows","GDIProcessHandleQuota",0x00010001,0x2710 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Windows","Spooler",0x,"yes" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Windows","swapdisk",0x,"" Modified: trunk/reactos/sdk/include/reactos/buildno.h.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/reactos/buildno.h.cmake?rev=71504=71503=71504=diff == --- trunk/reactos/sdk/include/reactos/buildno.h.cmake [iso-8859-1] (original) +++ trunk/reactos/sdk/include/reactos/buildno.h.cmake [iso-8859-1] Thu Jun 2 22:28:36 2016 @@ -14,5 +14,8 @@ #define REACTOS_DLL_VERSION_RC "@DLL_VERSION_STR@\0" #define REACTOS_DLL_VERSION_STR "@DLL_VERSION_STR@" +#define REACTOS_COMPILER_NAME "@CMAKE_C_COMPILER_ID@" +#define REACTOS_COMPILER_VERSION"@CMAKE_C_COMPILER_VERSION@" + #endif /* EOF */ Modified: trunk/reactos/win32ss/user/ntuser/desktop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/desktop.c?rev=71504=71503=71504=diff == --- trunk/reactos/win32ss/user/ntuser/desktop.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/desktop.c [iso-8859-1] Thu Jun 2 22:28:36 2016 @@ -343,9 +343,11 @@ /* String for Safe Mode */ Status = RtlStringCchPrintfW(pwszzVersion, cchDest, - L"ReactOS Version %S %S (NT %u.%u Build %u%s)\n", + L"ReactOS Version %S %S.%S_%S (NT %u.%u Build %u%s)\n", KERNEL_VERSION_STR, KERNEL_VERSION_BUILD_STR, // Same as the "BuildLab" string in the registry + REACTOS_COMPILER_NAME, + REACTOS_COMPILER_VERSION, SharedUserData->NtMajorVersion, SharedUserData->NtMinorVersion, (VerInfo.dwBuildNumber & 0x), @@ -384,10 +386,12 @@ Status = RtlStringCchPrintfW(pwszzVersion, cchDest, L"ReactOS Version %S\n" - L"Build %S\n" + L"Build %S.%S_%S\n" L"Reporting NT %u.%u (Build %u%s)\n", KERNEL_VERSION_STR, KERNEL_VERSION_BUILD_STR, // Same as the "BuildLab" string in the registry + REACTOS_COMPILER_NAME, + REACTOS_COMPILER_VERSION, SharedUserData->NtMajorVersion, SharedUserData->NtMinorVersion, (VerInfo.dwBuildNumber & 0x), @@ -416,9 +420,11 @@ /* Fall-back string */ Status = RtlStringCchPrintfW(pwszzVersion, cchDest, - L"ReactOS Version %S %S\n", + L"ReactOS Version %S %S.%S_%S\n", KERNEL_VERSION_STR, - KERNEL_VERSION_BUILD_STR); + KERNEL_VERSION_BUILD_STR, // Same as the "BuildLab" string in the registry +
[ros-diffs] [hbelusca] 71503: [SNDREC32]: Use a sunken edge for the waveform viewer.
Author: hbelusca Date: Thu Jun 2 21:38:47 2016 New Revision: 71503 URL: http://svn.reactos.org/svn/reactos?rev=71503=rev Log: [SNDREC32]: Use a sunken edge for the waveform viewer. Modified: trunk/reactos/base/applications/sndrec32/sndrec32.cpp Modified: trunk/reactos/base/applications/sndrec32/sndrec32.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndrec32/sndrec32.cpp?rev=71503=71502=71503=diff == --- trunk/reactos/base/applications/sndrec32/sndrec32.cpp [iso-8859-1] (original) +++ trunk/reactos/base/applications/sndrec32/sndrec32.cpp [iso-8859-1] Thu Jun 2 21:38:47 2016 @@ -317,17 +317,18 @@ hInst = hInstance; -hWnd = CreateWindow(TEXT("sndrec32_wave"), -TEXT(""), -WS_DLGFRAME | WS_VISIBLE | WS_CHILD, -WAVEBAR_X, -WAVEBAR_Y, -WAVEBAR_CX, -WAVEBAR_CY, -f, -(HMENU)8, -hInstance, -0); +hWnd = CreateWindowEx(WS_EX_STATICEDGE, + TEXT("sndrec32_wave"), + TEXT(""), + WS_VISIBLE | WS_CHILD, + WAVEBAR_X, + WAVEBAR_Y, + WAVEBAR_CX, + WAVEBAR_CY, + f, + (HMENU)8, + hInstance, + 0); if (!hWnd ) { @@ -363,6 +364,7 @@ case WM_CREATE: GetClientRect(hWnd, ); break; + case WM_PAINT: /* Initialize hdc objects */ hdc = BeginPaint(hWnd, ); @@ -420,6 +422,7 @@ case WM_USER: break; + default: return DefWindowProc(hWnd, message, wParam, lParam); }
[ros-diffs] [spetreolle] 71502: [HIVES] Fix paths passed to the hive maker.
Author: spetreolle Date: Thu Jun 2 20:21:46 2016 New Revision: 71502 URL: http://svn.reactos.org/svn/reactos?rev=71502=rev Log: [HIVES] Fix paths passed to the hive maker. Modified: trunk/reactos/sdk/cmake/CMakeMacros.cmake Modified: trunk/reactos/sdk/cmake/CMakeMacros.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/cmake/CMakeMacros.cmake?rev=71502=71501=71502=diff == --- trunk/reactos/sdk/cmake/CMakeMacros.cmake [iso-8859-1] (original) +++ trunk/reactos/sdk/cmake/CMakeMacros.cmake [iso-8859-1] Thu Jun 2 20:21:46 2016 @@ -764,7 +764,7 @@ ${CMAKE_BINARY_DIR}/boot/bootdata/security ${CMAKE_BINARY_DIR}/boot/bootdata/software ${CMAKE_BINARY_DIR}/boot/bootdata/system -COMMAND native-mkhive ${CMAKE_BINARY_DIR}/boot/bootdata/ ${_livecd_inf_files} +COMMAND native-mkhive ${CMAKE_BINARY_DIR}/boot/bootdata ${_livecd_inf_files} DEPENDS native-mkhive ${_livecd_inf_files}) add_custom_target(livecd_hives @@ -787,7 +787,7 @@ # BCD Hive add_custom_command( OUTPUT ${CMAKE_BINARY_DIR}/boot/bootdata/BCD -COMMAND native-mkhive ${CMAKE_BINARY_DIR}/boot/bootdata/ ${CMAKE_BINARY_DIR}/boot/bootdata/hivebcd_utf16.inf +COMMAND native-mkhive ${CMAKE_BINARY_DIR}/boot/bootdata ${CMAKE_BINARY_DIR}/boot/bootdata/hivebcd_utf16.inf DEPENDS native-mkhive ${CMAKE_SOURCE_DIR}/boot/bootdata/hivebcd.inf) add_custom_target(bcd_hive
[ros-diffs] [mjansen] 71501: [APPHELP_APITEST][APPHELP] Add new tests showing that SdbWriteStringTag and SdbEndWriteListTag are incorrect, fix SdbEndWriteListTag CORE-10367 SdbWriteStringTag requires
Author: mjansen Date: Thu Jun 2 18:59:04 2016 New Revision: 71501 URL: http://svn.reactos.org/svn/reactos?rev=71501=rev Log: [APPHELP_APITEST][APPHELP] Add new tests showing that SdbWriteStringTag and SdbEndWriteListTag are incorrect, fix SdbEndWriteListTag CORE-10367 SdbWriteStringTag requires the database to keep track of written strings, and append a stringtable to a database. Modified: trunk/reactos/dll/appcompat/apphelp/sdbapi.c trunk/reactos/dll/appcompat/apphelp/sdbpapi.h trunk/reactos/dll/appcompat/apphelp/sdbwrite.c trunk/rostests/apitests/apphelp/db.c Modified: trunk/reactos/dll/appcompat/apphelp/sdbapi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/appcompat/apphelp/sdbapi.c?rev=71501=71500=71501=diff == --- trunk/reactos/dll/appcompat/apphelp/sdbapi.c[iso-8859-1] (original) +++ trunk/reactos/dll/appcompat/apphelp/sdbapi.c[iso-8859-1] Thu Jun 2 18:59:04 2016 @@ -259,12 +259,17 @@ DWORD SdbpStrlen(PCWSTR string) { -return (lstrlenW(string) + 1) * sizeof(WCHAR); +return lstrlenW(string); +} + +DWORD SdbpStrsize(PCWSTR string) +{ +return (SdbpStrlen(string) + 1) * sizeof(WCHAR); } PWSTR SdbpStrDup(LPCWSTR string) { -PWSTR ret = SdbpAlloc(SdbpStrlen(string)); +PWSTR ret = SdbpAlloc(SdbpStrsize(string)); lstrcpyW(ret, string); return ret; } Modified: trunk/reactos/dll/appcompat/apphelp/sdbpapi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/appcompat/apphelp/sdbpapi.h?rev=71501=71500=71501=diff == --- trunk/reactos/dll/appcompat/apphelp/sdbpapi.h [iso-8859-1] (original) +++ trunk/reactos/dll/appcompat/apphelp/sdbpapi.h [iso-8859-1] Thu Jun 2 18:59:04 2016 @@ -65,7 +65,8 @@ PDB WINAPI SdbpCreate(LPCWSTR path, PATH_TYPE type, BOOL write); void WINAPI SdbpFlush(PDB db); -DWORD SdbpStrlen(LPCWSTR string); +DWORD SdbpStrlen(PCWSTR string); +DWORD SdbpStrsize(PCWSTR string); #ifdef __cplusplus Modified: trunk/reactos/dll/appcompat/apphelp/sdbwrite.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/appcompat/apphelp/sdbwrite.c?rev=71501=71500=71501=diff == --- trunk/reactos/dll/appcompat/apphelp/sdbwrite.c [iso-8859-1] (original) +++ trunk/reactos/dll/appcompat/apphelp/sdbwrite.c [iso-8859-1] Thu Jun 2 18:59:04 2016 @@ -36,6 +36,10 @@ #include "sdbtagid.h" #endif + +BOOL WINAPI SdbWriteStringRefTag(PDB db, TAG tag, TAGID tagid); +TAGID WINAPI SdbBeginWriteListTag(PDB db, TAG tag); +BOOL WINAPI SdbEndWriteListTag(PDB db, TAGID tagid); static void WINAPI SdbpWrite(PDB db, const void* data, DWORD size) @@ -51,6 +55,23 @@ db->write_iter += size; } +static BOOL WINAPI SdbpGetOrAddStringRef(PDB db, LPCWSTR string, TAGID* tagid) +{ +/* TODO: +- Insert or find in stringtable +- return TAGID +*/ + +return FALSE; +} + +static void WINAPI SdbpWriteStringtable(PDB db) +{ +TAGID table = SdbBeginWriteListTag(db, TAG_STRINGTABLE); +/* TODO: Write out all strings*/ +SdbEndWriteListTag(db, table); +} + /** * Creates new shim database file * @@ -90,6 +111,7 @@ */ void WINAPI SdbCloseDatabaseWrite(PDB db) { +SdbpWriteStringtable(db); SdbpFlush(db); SdbCloseDatabase(db); } @@ -181,10 +203,19 @@ { DWORD size; +if (SdbpCheckTagType(tag, TAG_TYPE_STRINGREF)) +{ +TAGID tagid = 0; +if (!SdbpGetOrAddStringRef(db, string, )) +return FALSE; + +return SdbWriteStringRefTag(db, tag, tagid); +} + if (!SdbpCheckTagType(tag, TAG_TYPE_STRING)) return FALSE; -size = SdbpStrlen(string); +size = SdbpStrsize(string); SdbpWrite(db, , sizeof(TAG)); SdbpWrite(db, , sizeof(size)); SdbpWrite(db, string, size); @@ -297,7 +328,7 @@ return FALSE; /* Write size of list to list tag header */ -*(DWORD*)>data[tagid + sizeof(TAG)] = db->write_iter - tagid - sizeof(TAG); -return TRUE; -} - +*(DWORD*)>data[tagid + sizeof(TAG)] = db->write_iter - tagid - sizeof(TAG) - sizeof(TAGID); +return TRUE; +} + Modified: trunk/rostests/apitests/apphelp/db.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/apphelp/db.c?rev=71501=71500=71501=diff == --- trunk/rostests/apitests/apphelp/db.c[iso-8859-1] (original) +++ trunk/rostests/apitests/apphelp/db.c[iso-8859-1] Thu Jun 2 18:59:04 2016 @@ -312,6 +312,91 @@ } DeleteFileW(path1); } + +/* + - Show that a stringtable is automatically generated, + - validate multiple lists (for the length) +*/ +static void test_write_ex(void) +{ +WCHAR path1[] = {'t','e','s','t','.','s','d','b',0}; +WCHAR test1[] = {'T','E','S','T',0}; +
[ros-diffs] [apriyadarshi] 71500: Required changes to meet community coding style.
Author: apriyadarshi Date: Thu Jun 2 14:43:56 2016 New Revision: 71500 URL: http://svn.reactos.org/svn/reactos?rev=71500=rev Log: Required changes to meet community coding style. Modified: branches/GSoC_2016/AHCI/drivers/storage/storahci/sources branches/GSoC_2016/AHCI/drivers/storage/storahci/storahci.c branches/GSoC_2016/AHCI/drivers/storage/storahci/storahci.h Modified: branches/GSoC_2016/AHCI/drivers/storage/storahci/sources URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/AHCI/drivers/storage/storahci/sources?rev=71500=71499=71500=diff == --- branches/GSoC_2016/AHCI/drivers/storage/storahci/sources[iso-8859-1] (original) +++ branches/GSoC_2016/AHCI/drivers/storage/storahci/sources[iso-8859-1] Thu Jun 2 14:43:56 2016 @@ -2,7 +2,7 @@ TARGETTYPE = MINIPORT TARGETLIBS=$(DDK_LIB_PATH)\storport.lib - + INCLUDES = %BUILD%\inc LIBS = %BUILD%\lib SOURCES= storahci.c Modified: branches/GSoC_2016/AHCI/drivers/storage/storahci/storahci.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/AHCI/drivers/storage/storahci/storahci.c?rev=71500=71499=71500=diff == --- branches/GSoC_2016/AHCI/drivers/storage/storahci/storahci.c [iso-8859-1] (original) +++ branches/GSoC_2016/AHCI/drivers/storage/storahci/storahci.c [iso-8859-1] Thu Jun 2 14:43:56 2016 @@ -1,231 +1,263 @@ +/* + * PROJECT:ReactOS Kernel + * LICENSE:GNU GPLv2 only as published by the Free Software Foundation + * PURPOSE:To Implement AHCI Miniport driver targeting storport NT 5.2 + * PROGRAMMERS:Aman Priyadarshi (aman.eur...@gmail.com) + */ + #include "storahci.h" BOOLEAN AhciAdapterReset( -__in PAHCI_ADAPTER_EXTENSION adapterExtension +__in PAHCI_ADAPTER_EXTENSION adapterExtension ); +/** + * @name AhciFindAdapter + * @implemented + * + * The HwStorFindAdapter routine uses the supplied configuration to determine whether a specific + * HBA is supported and, if it is, to return configuration information about that adapter. + * + * 10.1 Platform Communication + * http://www.intel.in/content/dam/www/public/us/en/documents/technical-specifications/serial-ata-ahci-spec-rev1_2.pdf + + * @param DeviceExtension + * @param HwContext + * @param BusInformation + * @param ArgumentString + * @param ConfigInfo + * @param Reserved3 + * + * @return + * SP_RETURN_FOUND + * Indicates that a supported HBA was found and that the HBA-relevant configuration information was successfully determined and set in the PORT_CONFIGURATION_INFORMATION structure. + * + * SP_RETURN_ERROR + * Indicates that an HBA was found but there was an error obtaining the configuration information. If possible, such an error should be logged with StorPortLogError. + * + * SP_RETURN_BAD_CONFIG + * Indicates that the supplied configuration information was invalid for the adapter. + * + * SP_RETURN_NOT_FOUND + * Indicates that no supported HBA was found for the supplied configuration information. + * + * @remarks Called by Storport. + */ ULONG AhciFindAdapter( - IN PVOID DeviceExtension, - __inPVOID HwContext, - __inPVOID BusInformation, - __inIN PVOID ArgumentString, - __inout PPORT_CONFIGURATION_INFORMATION ConfigInfo, - __inPBOOLEAN Reserved3 + IN PVOID DeviceExtension, + __inPVOID HwContext, + __inPVOID BusInformation, + __inIN PVOID ArgumentString, + __inout PPORT_CONFIGURATION_INFORMATION ConfigInfo, + __inPBOOLEAN Reserved3 ) { - /* Description : -* The HwStorFindAdapter routine uses the supplied configuration to determine whether a specific -* HBA is supported and, if it is, to return configuration information about that adapter. -* -* Refernce: -* 10.1 Platform Communication -* http://www.intel.in/content/dam/www/public/us/en/documents/technical-specifications/serial-ata-ahci-spec-rev1_2.pdf -* -* Return Value: -* SP_RETURN_FOUND -* Indicates that a supported HBA was found and that the HBA-relevant configuration information was successfully determined and set in the PORT_CONFIGURATION_INFORMATION structure. -* -* SP_RETURN_ERROR -*
[ros-diffs] [apriyadarshi] 71499: == Storahci driver - Added DriverEntry - Added AhciFindAdapter : Need to add code for port initialization. - Compile : OK - Test : NOT TESTED
Author: apriyadarshi Date: Thu Jun 2 14:13:06 2016 New Revision: 71499 URL: http://svn.reactos.org/svn/reactos?rev=71499=rev Log: == Storahci driver - Added DriverEntry - Added AhciFindAdapter : Need to add code for port initialization. - Compile : OK - Test : NOT TESTED Added: branches/GSoC_2016/AHCI/drivers/storage/storahci/ branches/GSoC_2016/AHCI/drivers/storage/storahci/makefile (with props) branches/GSoC_2016/AHCI/drivers/storage/storahci/sources (with props) branches/GSoC_2016/AHCI/drivers/storage/storahci/storahci.c (with props) branches/GSoC_2016/AHCI/drivers/storage/storahci/storahci.h (with props) Added: branches/GSoC_2016/AHCI/drivers/storage/storahci/makefile URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/AHCI/drivers/storage/storahci/makefile?rev=71499 == --- branches/GSoC_2016/AHCI/drivers/storage/storahci/makefile (added) +++ branches/GSoC_2016/AHCI/drivers/storage/storahci/makefile [iso-8859-1] Thu Jun 2 14:13:06 2016 @@ -0,0 +1,3 @@ + +MINIMUM_NT_TARGET_VERSION=0x502 +!INCLUDE $(NTMAKEENV)\makefile.def Propchange: branches/GSoC_2016/AHCI/drivers/storage/storahci/makefile -- svn:eol-style = native Added: branches/GSoC_2016/AHCI/drivers/storage/storahci/sources URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/AHCI/drivers/storage/storahci/sources?rev=71499 == --- branches/GSoC_2016/AHCI/drivers/storage/storahci/sources(added) +++ branches/GSoC_2016/AHCI/drivers/storage/storahci/sources[iso-8859-1] Thu Jun 2 14:13:06 2016 @@ -0,0 +1,8 @@ +TARGETNAME = storahci +TARGETTYPE = MINIPORT + +TARGETLIBS=$(DDK_LIB_PATH)\storport.lib + +INCLUDES = %BUILD%\inc +LIBS = %BUILD%\lib +SOURCES= storahci.c Propchange: branches/GSoC_2016/AHCI/drivers/storage/storahci/sources -- svn:eol-style = native Added: branches/GSoC_2016/AHCI/drivers/storage/storahci/storahci.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/AHCI/drivers/storage/storahci/storahci.c?rev=71499 == --- branches/GSoC_2016/AHCI/drivers/storage/storahci/storahci.c (added) +++ branches/GSoC_2016/AHCI/drivers/storage/storahci/storahci.c [iso-8859-1] Thu Jun 2 14:13:06 2016 @@ -0,0 +1,231 @@ +#include "storahci.h" + +BOOLEAN AhciAdapterReset( +__in PAHCI_ADAPTER_EXTENSION adapterExtension +); + +ULONG AhciFindAdapter( + IN PVOID DeviceExtension, + __inPVOID HwContext, + __inPVOID BusInformation, + __inIN PVOID ArgumentString, + __inout PPORT_CONFIGURATION_INFORMATION ConfigInfo, + __inPBOOLEAN Reserved3 +) +{ + /* Description : +* The HwStorFindAdapter routine uses the supplied configuration to determine whether a specific +* HBA is supported and, if it is, to return configuration information about that adapter. +* +* Refernce: +* 10.1 Platform Communication +* http://www.intel.in/content/dam/www/public/us/en/documents/technical-specifications/serial-ata-ahci-spec-rev1_2.pdf +* +* Return Value: +* SP_RETURN_FOUND +* Indicates that a supported HBA was found and that the HBA-relevant configuration information was successfully determined and set in the PORT_CONFIGURATION_INFORMATION structure. +* +* SP_RETURN_ERROR +* Indicates that an HBA was found but there was an error obtaining the configuration information. If possible, such an error should be logged with StorPortLogError. +* +* SP_RETURN_BAD_CONFIG +* Indicates that the supplied configuration information was invalid for the adapter. +* +* SP_RETURN_NOT_FOUND +* Indicates that no supported HBA was found for the supplied configuration information. +*/ + + ULONG ghc; + ULONG portCount, portImplemented; + ULONG pci_cfg_len; + UCHAR pci_cfg_buf[0x30]; + + PAHCI_MEMORY_REGISTERS abar; + PPCI_COMMON_CONFIG pciConfigData; + PAHCI_ADAPTER_EXTENSION adapterExtension; + + adapterExtension = (PAHCI_ADAPTER_EXTENSION)DeviceExtension; +
[ros-diffs] [tfaber] 71498: [BROWSEUI] - Avoid a double free in CComCatCachedCategory::CacheDSA. CComHeapPtr already takes care of this.
Author: tfaber Date: Thu Jun 2 12:19:56 2016 New Revision: 71498 URL: http://svn.reactos.org/svn/reactos?rev=71498=rev Log: [BROWSEUI] - Avoid a double free in CComCatCachedCategory::CacheDSA. CComHeapPtr already takes care of this. Modified: trunk/reactos/dll/win32/browseui/comcat.cpp Modified: trunk/reactos/dll/win32/browseui/comcat.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/comcat.cpp?rev=71498=71497=71498=diff == --- trunk/reactos/dll/win32/browseui/comcat.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/comcat.cpp [iso-8859-1] Thu Jun 2 12:19:56 2016 @@ -161,7 +161,6 @@ SHSetValue(HKEY_CURRENT_USER, bufKey, IMPLEMENTING, REG_BINARY, buffer, bufferSize); guidArray = NULL; -CoTaskMemFree(buffer); return S_OK; }
[ros-diffs] [akhaldi] 71497: [MSI] Really silence DllRegisterServer MessageBoxes. Addendum to r71483. Spotted by Peter Hater. CORE-11244
Author: akhaldi Date: Thu Jun 2 08:55:58 2016 New Revision: 71497 URL: http://svn.reactos.org/svn/reactos?rev=71497=rev Log: [MSI] Really silence DllRegisterServer MessageBoxes. Addendum to r71483. Spotted by Peter Hater. CORE-11244 Modified: trunk/reactos/dll/win32/msi/action.c Modified: trunk/reactos/dll/win32/msi/action.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/action.c?rev=71497=71496=71497=diff == --- trunk/reactos/dll/win32/msi/action.c[iso-8859-1] (original) +++ trunk/reactos/dll/win32/msi/action.c[iso-8859-1] Thu Jun 2 08:55:58 2016 @@ -4769,7 +4769,7 @@ static void register_dll( const WCHAR *dll, BOOL unregister ) { -#ifdef __REACTOS_ +#ifdef __REACTOS__ static const WCHAR regW[] = {'r','e','g','s','v','r','3','2','.','e','x','e',' ','/','s',' ','\"','%','s','\"',0}; static const WCHAR unregW[] =