Ros-diffs

ros-diffs@reactos.org

81390 discussions

[gadamopoulos] 74924: Fix gcc build.
by gadamopoulos＠svn.reactos.org 05 Jun '17

05 Jun '17

Author: gadamopoulos Date: Mon Jun 5 14:40:48 2017 New Revision: 74924 URL: http://svn.reactos.org/svn/reactos?rev=74924&view=rev Log: Fix gcc build. Modified: trunk/rostests/apitests/comctl32/toolbar.c Modified: trunk/rostests/apitests/comctl32/toolbar.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/comctl32/toolbar… ============================================================================== --- trunk/rostests/apitests/comctl32/toolbar.c [iso-8859-1] (original) +++ trunk/rostests/apitests/comctl32/toolbar.c [iso-8859-1] Mon Jun 5 14:40:48 2017 @@ -109,7 +109,7 @@ TestVersionMessage(); hV5ActCtx = _CreateV5ActCtx(); - ok (hV5ActCtx != INVALID_HANDLE_VALUE, ""); + ok (hV5ActCtx != INVALID_HANDLE_VALUE, "CreateActCtxW failed\n"); if (hV5ActCtx) { ULONG_PTR cookie;

1 0

[gadamopoulos] 74923: [COMCTL32_APITEST] -Add tests for CCM_GETVERSION and CCM_SETVERSION for the v5 and v6 toolbar control.
by gadamopoulos＠svn.reactos.org 05 Jun '17

05 Jun '17

Author: gadamopoulos Date: Mon Jun 5 14:25:37 2017 New Revision: 74923 URL: http://svn.reactos.org/svn/reactos?rev=74923&view=rev Log: [COMCTL32_APITEST] -Add tests for CCM_GETVERSION and CCM_SETVERSION for the v5 and v6 toolbar control. Added: trunk/rostests/apitests/comctl32/comctl32v5.manifest (with props) trunk/rostests/apitests/comctl32/toolbar.c (with props) Modified: trunk/rostests/apitests/comctl32/CMakeLists.txt trunk/rostests/apitests/comctl32/testlist.c Modified: trunk/rostests/apitests/comctl32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/comctl32/CMakeLi… ============================================================================== --- trunk/rostests/apitests/comctl32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/apitests/comctl32/CMakeLists.txt [iso-8859-1] Mon Jun 5 14:25:37 2017 @@ -1,6 +1,7 @@ -add_executable(comctl32_apitest button.c testlist.c ../include/msgtrace.c comctl32_apitest.rc) +add_executable(comctl32_apitest button.c toolbar.c testlist.c ../include/msgtrace.c comctl32_apitest.rc) target_link_libraries(comctl32_apitest wine) set_module_type(comctl32_apitest win32cui) add_importlibs(comctl32_apitest uxtheme comctl32 user32 gdi32 msvcrt kernel32 ntdll) add_rostests_file(TARGET comctl32_apitest) +add_rostests_file(FILE "${CMAKE_CURRENT_SOURCE_DIR}/comctl32v5.manifest") Added: trunk/rostests/apitests/comctl32/comctl32v5.manifest URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/comctl32/comctl3… ============================================================================== --- trunk/rostests/apitests/comctl32/comctl32v5.manifest (added) +++ trunk/rostests/apitests/comctl32/comctl32v5.manifest [iso-8859-1] Mon Jun 5 14:25:37 2017 @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> +<dependency> + <dependentAssembly> + <assemblyIdentity + type="win32" + name="Microsoft.Windows.Common-Controls" + version="6.0.0.0" + publicKeyToken="6595b64144ccf1df" + processorArchitecture="*" + language="*" + /> + </dependentAssembly> +</dependency> +</assembly> Propchange: trunk/rostests/apitests/comctl32/comctl32v5.manifest ------------------------------------------------------------------------------ svn:eol-style = CRLF Modified: trunk/rostests/apitests/comctl32/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/comctl32/testlis… ============================================================================== --- trunk/rostests/apitests/comctl32/testlist.c [iso-8859-1] (original) +++ trunk/rostests/apitests/comctl32/testlist.c [iso-8859-1] Mon Jun 5 14:25:37 2017 @@ -2,9 +2,11 @@ #include <apitest.h> extern void func_button(void); +extern void func_toolbar(void); const struct test winetest_testlist[] = { { "buttonv6", func_button }, + { "toolbarv6", func_toolbar }, { 0, 0 } }; Added: trunk/rostests/apitests/comctl32/toolbar.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/comctl32/toolbar… ============================================================================== --- trunk/rostests/apitests/comctl32/toolbar.c (added) +++ trunk/rostests/apitests/comctl32/toolbar.c [iso-8859-1] Mon Jun 5 14:25:37 2017 @@ -0,0 +1,123 @@ +/* + * PROJECT: ReactOS api tests + * LICENSE: GPL - See COPYING in the top level directory + * PURPOSE: Test for toolbar window class v6 + * PROGRAMMERS: Giannis Adamopoulos + */ + +#include "wine/test.h" +#include <stdio.h> +#include <windows.h> +#include <commctrl.h> +#include <uxtheme.h> +#include <undocuser.h> +#include <msgtrace.h> +#include <user32testhelpers.h> + +HANDLE _CreateV5ActCtx() +{ + ACTCTXW ActCtx = {sizeof(ACTCTX)}; + WCHAR buffer[MAX_PATH] , *separator; + + ok (GetModuleFileNameW(NULL, buffer, MAX_PATH), "GetModuleFileName failed\n"); + separator = wcsrchr(buffer, L'\\'); + if (separator) + wcscpy(separator + 1, L"comctl32v5.manifest"); + + ActCtx.lpSource = buffer; + + return CreateActCtxW(&ActCtx);; +} + + +void TestVersionMessage() +{ + HWND hwnd; + int version; + + hwnd = CreateWindowExW(0, TOOLBARCLASSNAMEW, L"Test", 0, 0, 0, 0, 0, 0, 0, 0, NULL); + ok(hwnd != NULL, "CreateWindowEx failed\n"); + + version = SendMessageW(hwnd, CCM_GETVERSION, 0, 0); + ok(version == 6, "Got %d, expected 6\n", version); + + version = SendMessageW(hwnd, CCM_SETVERSION, 5, 0); + ok(version == 6, "Got %d, expected 6\n", version); + + version = SendMessageW(hwnd, CCM_GETVERSION, 0, 0); + ok(version == 6, "Got %d, expected 6\n", version); + + version = SendMessageW(hwnd, CCM_SETVERSION, 7, 0); + ok(version == 6, "Got %d, expected 6\n", version); + + version = SendMessageW(hwnd, CCM_GETVERSION, 0, 0); + ok(version == 6, "Got %d, expected 6\n", version); + + version = SendMessageW(hwnd, CCM_SETVERSION, 4, 0); + ok(version == 6, "Got %d, expected 6\n", version); + + version = SendMessageW(hwnd, CCM_GETVERSION, 0, 0); + ok(version == 6, "Got %d, expected 6\n", version); + + DestroyWindow(hwnd); +} + +void TestV5VersionMessage() +{ + HWND hwnd; + int version; + + hwnd = CreateWindowExW(0, TOOLBARCLASSNAMEW, L"Test", 0, 0, 0, 0, 0, 0, 0, 0, NULL); + ok(hwnd != NULL, "CreateWindowEx failed\n"); + + version = SendMessageW(hwnd, CCM_GETVERSION, 0, 0); + ok(version == 0, "Got %d, expected 0\n", version); + + version = SendMessageW(hwnd, CCM_SETVERSION, 6, 0); + ok(version == -1, "Got %d, expected -1\n", version); + + version = SendMessageW(hwnd, CCM_SETVERSION, 7, 0); + ok(version == -1, "Got %d, expected -1\n", version); + + version = SendMessageW(hwnd, CCM_SETVERSION, 5, 0); + ok(version == 0, "Got %d, expected -1\n", version); + + version = SendMessageW(hwnd, CCM_GETVERSION, 0, 0); + ok(version == 5, "Got %d, expected 5\n", version); + + version = SendMessageW(hwnd, CCM_SETVERSION, 4, 0); + ok(version == 5, "Got %d, expected -1\n", version); + + version = SendMessageW(hwnd, CCM_GETVERSION, 0, 0); + ok(version == 4, "Got %d, expected 5\n", version); + + version = SendMessageW(hwnd, CCM_SETVERSION, 3, 0); + ok(version == 4, "Got %d, expected -1\n", version); + + version = SendMessageW(hwnd, CCM_GETVERSION, 0, 0); + ok(version == 3, "Got %d, expected 5\n", version); + + DestroyWindow(hwnd); +} + +START_TEST(toolbar) +{ + HANDLE hV5ActCtx; + + LoadLibraryW(L"comctl32.dll"); + + TestVersionMessage(); + + hV5ActCtx = _CreateV5ActCtx(); + ok (hV5ActCtx != INVALID_HANDLE_VALUE, ""); + if (hV5ActCtx) + { + ULONG_PTR cookie; + BOOL bActivated = ActivateActCtx(hV5ActCtx, &cookie); + if (bActivated) + { + TestV5VersionMessage(); + DeactivateActCtx(0, cookie); + } + } +} Propchange: trunk/rostests/apitests/comctl32/toolbar.c ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[gadamopoulos] 74922: [COMCTL32] -Differentiate between v5 and v6 toolbar and make their CCM_SETVERSION behave correct according to their version.
by gadamopoulos＠svn.reactos.org 05 Jun '17

05 Jun '17

Author: gadamopoulos Date: Mon Jun 5 14:23:42 2017 New Revision: 74922 URL: http://svn.reactos.org/svn/reactos?rev=74922&view=rev Log: [COMCTL32] -Differentiate between v5 and v6 toolbar and make their CCM_SETVERSION behave correct according to their version. Modified: trunk/reactos/dll/win32/comctl32/comctl32.h trunk/reactos/dll/win32/comctl32/commctrl.c trunk/reactos/dll/win32/comctl32/toolbar.c Modified: trunk/reactos/dll/win32/comctl32/comctl32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl3… ============================================================================== --- trunk/reactos/dll/win32/comctl32/comctl32.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/comctl32.h [iso-8859-1] Mon Jun 5 14:23:42 2017 @@ -177,6 +177,10 @@ extern void UPDOWN_Unregister(void) DECLSPEC_HIDDEN; extern void BUTTON_Register(); extern void BUTTON_Unregister(); +#ifdef __REACTOS__ +extern void TOOLBARv6_Register(void) DECLSPEC_HIDDEN; +extern void TOOLBARv6_Unregister(void) DECLSPEC_HIDDEN; +#endif int MONTHCAL_MonthLength(int month, int year) DECLSPEC_HIDDEN; int MONTHCAL_CalculateDayOfWeek(SYSTEMTIME *date, BOOL inplace) DECLSPEC_HIDDEN; Modified: trunk/reactos/dll/win32/comctl32/commctrl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/commctr… ============================================================================== --- trunk/reactos/dll/win32/comctl32/commctrl.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/commctrl.c [iso-8859-1] Mon Jun 5 14:23:42 2017 @@ -207,7 +207,7 @@ return ret; } -static void RegisterControls() +static void RegisterControls(BOOL bV6) { ANIMATE_Register (); COMBOEX_Register (); @@ -225,14 +225,23 @@ STATUS_Register (); SYSLINK_Register (); TAB_Register (); - TOOLBAR_Register (); TOOLTIPS_Register (); TRACKBAR_Register (); TREEVIEW_Register (); UPDOWN_Register (); -} - -static void UnregisterControls() + + if (!bV6) + { + TOOLBAR_Register (); + } + else + { + BUTTON_Register(); + TOOLBARv6_Register(); + } +} + +static void UnregisterControls(BOOL bV6) { ANIMATE_Unregister (); COMBOEX_Unregister (); @@ -250,11 +259,21 @@ STATUS_Unregister (); SYSLINK_Unregister (); TAB_Unregister (); - TOOLBAR_Unregister (); TOOLTIPS_Unregister (); TRACKBAR_Unregister (); TREEVIEW_Unregister (); UPDOWN_Unregister (); + + if (!bV6) + { + TOOLBAR_Unregister (); + } + else + { + BUTTON_Unregister(); + TOOLBARv6_Unregister (); + } + } static void InitializeClasses() @@ -267,15 +286,14 @@ /* Register the classes once no matter what */ hActCtx5 = CreateComctl32ActCtx(FALSE); activated = (hActCtx5 != INVALID_HANDLE_VALUE ? ActivateActCtx(hActCtx5, &ulCookie) : FALSE); - RegisterControls(); /* Register the classes pretending to be v5 */ + RegisterControls(FALSE); /* Register the classes pretending to be v5 */ if (activated) DeactivateActCtx(0, ulCookie); hActCtx6 = CreateComctl32ActCtx(TRUE); if (hActCtx6 != INVALID_HANDLE_VALUE) { activated = ActivateActCtx(hActCtx6, &ulCookie); - RegisterControls(); /* Register the classes pretending to be v6 */ - BUTTON_Register(); + RegisterControls(TRUE); /* Register the classes pretending to be v6 */ if (activated) DeactivateActCtx(0, ulCookie); /* Initialize the themed controls only when the v6 manifest is present */ @@ -291,7 +309,7 @@ hActCtx5 = CreateComctl32ActCtx(FALSE); activated = (hActCtx5 != INVALID_HANDLE_VALUE ? ActivateActCtx(hActCtx5, &ulCookie) : FALSE); - UnregisterControls(); + UnregisterControls(FALSE); if (activated) DeactivateActCtx(0, ulCookie); hActCtx6 = CreateComctl32ActCtx(TRUE); @@ -299,8 +317,7 @@ { activated = ActivateActCtx(hActCtx6, &ulCookie); THEMING_Uninitialize(); - UnregisterControls(); - BUTTON_Unregister(); + UnregisterControls(TRUE); if (activated) DeactivateActCtx(0, ulCookie); } } Modified: trunk/reactos/dll/win32/comctl32/toolbar.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/toolbar… ============================================================================== --- trunk/reactos/dll/win32/comctl32/toolbar.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/toolbar.c [iso-8859-1] Mon Jun 5 14:23:42 2017 @@ -5268,6 +5268,16 @@ { INT iOldVersion = infoPtr->iVersion; +#ifdef __REACTOS__ + /* The v6 control doesn't support changing its version */ + if (iOldVersion == 6) + return iOldVersion; + + /* And a control that is not v6 can't be set to be a v6 one */ + if (iVersion >= 6) + return -1; +#endif + infoPtr->iVersion = iVersion; if (infoPtr->iVersion >= 5) @@ -6178,7 +6188,11 @@ static LRESULT +#ifdef __REACTOS__ +TOOLBAR_NCCreate (HWND hwnd, WPARAM wParam, const CREATESTRUCTW *lpcs, int iVersion) +#else TOOLBAR_NCCreate (HWND hwnd, WPARAM wParam, const CREATESTRUCTW *lpcs) +#endif { TOOLBAR_INFO *infoPtr; DWORD styleadd = 0; @@ -6212,7 +6226,11 @@ infoPtr->dwDTFlags = (lpcs->style & TBSTYLE_LIST) ? DT_LEFT | DT_VCENTER | DT_SINGLELINE | DT_END_ELLIPSIS: DT_CENTER | DT_END_ELLIPSIS; infoPtr->bAnchor = FALSE; /* no anchor highlighting */ infoPtr->bDragOutSent = FALSE; +#ifdef __REACTOS__ + infoPtr->iVersion = iVersion; +#else infoPtr->iVersion = 0; +#endif infoPtr->hwndSelf = hwnd; infoPtr->bDoRedraw = TRUE; infoPtr->clrBtnHighlight = CLR_DEFAULT; @@ -7003,7 +7021,11 @@ return TOOLBAR_NCCalcSize (hwnd, wParam, lParam); case WM_NCCREATE: +#ifdef __REACTOS__ + return TOOLBAR_NCCreate (hwnd, wParam, (CREATESTRUCTW*)lParam, 0); +#else return TOOLBAR_NCCreate (hwnd, wParam, (CREATESTRUCTW*)lParam); +#endif case WM_NCPAINT: return TOOLBAR_NCPaint (hwnd, wParam, lParam); @@ -7089,6 +7111,40 @@ UnregisterClassW (TOOLBARCLASSNAMEW, NULL); } +#ifdef __REACTOS__ +static LRESULT WINAPI +ToolbarV6WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) +{ + if (uMsg == WM_NCCREATE) + return TOOLBAR_NCCreate (hwnd, wParam, (CREATESTRUCTW*)lParam, 6); + else + return ToolbarWindowProc(hwnd, uMsg, wParam, lParam); +} + +VOID +TOOLBARv6_Register (void) +{ + WNDCLASSW wndClass; + + ZeroMemory (&wndClass, sizeof(WNDCLASSW)); + wndClass.style = CS_GLOBALCLASS | CS_DBLCLKS; + wndClass.lpfnWndProc = ToolbarV6WindowProc; + wndClass.cbClsExtra = 0; + wndClass.cbWndExtra = sizeof(TOOLBAR_INFO *); + wndClass.hCursor = LoadCursorW (0, (LPWSTR)IDC_ARROW); + wndClass.hbrBackground = (HBRUSH)(COLOR_BTNFACE + 1); + wndClass.lpszClassName = TOOLBARCLASSNAMEW; + + RegisterClassW (&wndClass); +} + +VOID +TOOLBARv6_Unregister (void) +{ + UnregisterClassW (TOOLBARCLASSNAMEW, NULL); +} +#endif + static HIMAGELIST TOOLBAR_InsertImageList(PIMLENTRY **pies, INT *cies, HIMAGELIST himl, INT id) { HIMAGELIST himlold;

1 0

[pschweitzer] 74921: [UDFS] Misc coverity fixes. CID 1412011, 1321904, 1322008, 1322151, 1321905 CORE-4375
by pschweitzer＠svn.reactos.org 05 Jun '17

05 Jun '17

Author: pschweitzer Date: Mon Jun 5 13:00:58 2017 New Revision: 74921 URL: http://svn.reactos.org/svn/reactos?rev=74921&view=rev Log: [UDFS] Misc coverity fixes. CID 1412011, 1321904, 1322008, 1322151, 1321905 CORE-4375 Modified: trunk/reactos/drivers/filesystems/udfs/fileinfo.cpp trunk/reactos/drivers/filesystems/udfs/namesup.cpp trunk/reactos/drivers/filesystems/udfs/udf_info/dirtree.cpp trunk/reactos/drivers/filesystems/udfs/udf_info/extent.cpp trunk/reactos/drivers/filesystems/udfs/udf_info/mount.cpp Modified: trunk/reactos/drivers/filesystems/udfs/fileinfo.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/udfs/f… ============================================================================== --- trunk/reactos/drivers/filesystems/udfs/fileinfo.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/udfs/fileinfo.cpp [iso-8859-1] Mon Jun 5 13:00:58 2017 @@ -1242,7 +1242,7 @@ UDF_FCB_DELETE_PARENT); } else { AdPrint((" CLEAR stream DeleteOnClose\n")); - FileInfo->Fcb->FCBFlags &= !(UDF_FCB_DELETE_ON_CLOSE | + FileInfo->Fcb->FCBFlags &= ~(UDF_FCB_DELETE_ON_CLOSE | UDF_FCB_DELETE_PARENT); } } Modified: trunk/reactos/drivers/filesystems/udfs/namesup.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/udfs/n… ============================================================================== --- trunk/reactos/drivers/filesystems/udfs/namesup.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/udfs/namesup.cpp [iso-8859-1] Mon Jun 5 13:00:58 2017 @@ -241,7 +241,7 @@ if((*Buffer) != DOS_QM) return FALSE; } - if(*DosOpen) + if(DosOpen) *DosOpen = TRUE; return TRUE; } else @@ -253,7 +253,7 @@ return FALSE; if(Buffer[2] != DOS_STAR) return FALSE; - if(*DosOpen) + if(DosOpen) *DosOpen = TRUE; return TRUE; } else { Modified: trunk/reactos/drivers/filesystems/udfs/udf_info/dirtree.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/udfs/u… ============================================================================== --- trunk/reactos/drivers/filesystems/udfs/udf_info/dirtree.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/udfs/udf_info/dirtree.cpp [iso-8859-1] Mon Jun 5 13:00:58 2017 @@ -612,6 +612,7 @@ if(DirNdx->FileEntryLoc.logicalBlockNum == (ULONG)-1) { DirPrint((" err: FileEntryLoc=-1\n")); DbgFreePool(buff); + UDFDirIndexFree(hDirNdx); return STATUS_FILE_CORRUPT_ERROR; } DirNdx->FileCharacteristics = (FileInfo->FileIdent) ? Modified: trunk/reactos/drivers/filesystems/udfs/udf_info/extent.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/udfs/u… ============================================================================== --- trunk/reactos/drivers/filesystems/udfs/udf_info/extent.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/udfs/udf_info/extent.cpp [iso-8859-1] Mon Jun 5 13:00:58 2017 @@ -2640,6 +2640,7 @@ InitSz = Vcb->LBlockSize - FileInfo->Dloc->FileEntryLen; Allocs = (int8*)MyAllocatePool__(NonPagedPool, InitSz); if(!Allocs) { + *AllocData = NULL; AdPrint(("BuildAllocDesc: cant alloc %x bytes for Allocs\n", InitSz)); return STATUS_INSUFFICIENT_RESOURCES; } Modified: trunk/reactos/drivers/filesystems/udfs/udf_info/mount.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/udfs/u… ============================================================================== --- trunk/reactos/drivers/filesystems/udfs/udf_info/mount.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/udfs/udf_info/mount.cpp [iso-8859-1] Mon Jun 5 13:00:58 2017 @@ -391,7 +391,7 @@ LVID_iUse = UDFGetLVIDiUse(Vcb); if((LVID_iUse->minUDFReadRev == Vcb->minUDFReadRev) && - (LVID_iUse->minUDFReadRev == Vcb->minUDFReadRev) && + (LVID_iUse->minUDFWriteRev == Vcb->minUDFWriteRev) && (LVID_iUse->maxUDFWriteRev == Vcb->maxUDFWriteRev) && (LVID_iUse->numFiles == Vcb->numFiles) && (LVID_iUse->numDirs == Vcb->numDirs))

1 0

[ashaposhnikov] 74920: [RAPPS] * Added constants in resource.h for stringtables * Removed "Installed apps" from the TreeView * Added intallation status to the RichEdit using existing check * Change...
by ashaposhnikov＠svn.reactos.org 04 Jun '17

04 Jun '17

Author: ashaposhnikov Date: Sun Jun 4 21:36:14 2017 New Revision: 74920 URL: http://svn.reactos.org/svn/reactos?rev=74920&view=rev Log: [RAPPS] * Added constants in resource.h for stringtables * Removed "Installed apps" from the TreeView * Added intallation status to the RichEdit using existing check * Changed IsInstalledApplication signature to accept access righta This is needed for the 64 bit systems. Modified: branches/GSoC_2017/rapps/reactos/base/applications/rapps/available.cpp branches/GSoC_2017/rapps/reactos/base/applications/rapps/crichedit.h branches/GSoC_2017/rapps/reactos/base/applications/rapps/gui.cpp branches/GSoC_2017/rapps/reactos/base/applications/rapps/installed.cpp branches/GSoC_2017/rapps/reactos/base/applications/rapps/rapps.h branches/GSoC_2017/rapps/reactos/base/applications/rapps/resource.h Modified: branches/GSoC_2017/rapps/reactos/base/applications/rapps/available.cpp URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/rapps/reactos/base/ap… ============================================================================== --- branches/GSoC_2017/rapps/reactos/base/applications/rapps/available.cpp [iso-8859-1] (original) +++ branches/GSoC_2017/rapps/reactos/base/applications/rapps/available.cpp [iso-8859-1] Sun Jun 4 21:36:14 2017 @@ -17,6 +17,12 @@ InsertRichEditText(b, d); \ } \ +#define ADD_TEXT_NEWL(a, b) \ + LoadStringW(hInst, a, szText, _countof(szText)); \ + InsertRichEditText(L"\n", 0); \ + InsertRichEditText(szText, b); \ + InsertRichEditText(L"\n", 0); + #define GET_STRING1(a, b) \ if (!ParserGetString(a, b, _countof(b), FindFileData.cFileName)) \ continue; @@ -25,6 +31,16 @@ if (!ParserGetString(a, b, _countof(b), FindFileData.cFileName)) \ b[0] = '\0'; +//App is "installed" if the RegName is in the registry +#define APP_INSTALL_CHECK_K(Info, key) \ + (*Info->szRegName && (IsInstalledApplicationEx(Info->szRegName, FALSE, key) \ + || IsInstalledApplicationEx(Info->szRegName, TRUE, key))) + +//Check both registry keys in 64bit system +//TODO: check system type beforehand to avoid double checks? +#define APP_INSTALL_CHECK(Info) \ + (APP_INSTALL_CHECK_K(Info, KEY_WOW64_32KEY) || APP_INSTALL_CHECK_K(Info, KEY_WOW64_64KEY)) + LIST_ENTRY CachedEntriesHead = { &CachedEntriesHead, &CachedEntriesHead }; PLIST_ENTRY pCachedEntry = &CachedEntriesHead; @@ -37,8 +53,13 @@ if (!Info) return FALSE; NewRichEditText(Info->szName, CFE_BOLD); - - InsertRichEditText(L"\n", 0); + if (APP_INSTALL_CHECK(Info)) + { + ADD_TEXT_NEWL(IDS_STATUS_INSTALLED, CFE_ITALIC); + } else + { + ADD_TEXT_NEWL(IDS_STATUS_NOTINSTALLED, CFE_ITALIC); + } ADD_TEXT(IDS_AINFO_VERSION, Info->szVersion, CFE_BOLD, 0); ADD_TEXT(IDS_AINFO_LICENSE, Info->szLicense, CFE_BOLD, 0); Modified: branches/GSoC_2017/rapps/reactos/base/applications/rapps/crichedit.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/rapps/reactos/base/ap… ============================================================================== --- branches/GSoC_2017/rapps/reactos/base/applications/rapps/crichedit.h [iso-8859-1] (original) +++ branches/GSoC_2017/rapps/reactos/base/applications/rapps/crichedit.h [iso-8859-1] Sun Jun 4 21:36:14 2017 @@ -90,7 +90,6 @@ return m_hWnd; } -public: virtual VOID OnLink(ENLINK *Link) { } Modified: branches/GSoC_2017/rapps/reactos/base/applications/rapps/gui.cpp URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/rapps/reactos/base/ap… ============================================================================== --- branches/GSoC_2017/rapps/reactos/base/applications/rapps/gui.cpp [iso-8859-1] (original) +++ branches/GSoC_2017/rapps/reactos/base/applications/rapps/gui.cpp [iso-8859-1] Sun Jun 4 21:36:14 2017 @@ -372,33 +372,28 @@ VOID InitCategoriesList(VOID) { - HTREEITEM hRootItem1, hRootItem2; - - hRootItem1 = AddCategory(TVI_ROOT, IDS_INSTALLED, IDI_CATEGORY); - AddCategory(hRootItem1, IDS_APPLICATIONS, IDI_APPS); - AddCategory(hRootItem1, IDS_UPDATES, IDI_APPUPD); - - hRootItem2 = AddCategory(TVI_ROOT, IDS_AVAILABLEFORINST, IDI_CATEGORY); - AddCategory(hRootItem2, IDS_CAT_AUDIO, IDI_CAT_AUDIO); - AddCategory(hRootItem2, IDS_CAT_VIDEO, IDI_CAT_VIDEO); - AddCategory(hRootItem2, IDS_CAT_GRAPHICS, IDI_CAT_GRAPHICS); - AddCategory(hRootItem2, IDS_CAT_GAMES, IDI_CAT_GAMES); - AddCategory(hRootItem2, IDS_CAT_INTERNET, IDI_CAT_INTERNET); - AddCategory(hRootItem2, IDS_CAT_OFFICE, IDI_CAT_OFFICE); - AddCategory(hRootItem2, IDS_CAT_DEVEL, IDI_CAT_DEVEL); - AddCategory(hRootItem2, IDS_CAT_EDU, IDI_CAT_EDU); - AddCategory(hRootItem2, IDS_CAT_ENGINEER, IDI_CAT_ENGINEER); - AddCategory(hRootItem2, IDS_CAT_FINANCE, IDI_CAT_FINANCE); - AddCategory(hRootItem2, IDS_CAT_SCIENCE, IDI_CAT_SCIENCE); - AddCategory(hRootItem2, IDS_CAT_TOOLS, IDI_CAT_TOOLS); - AddCategory(hRootItem2, IDS_CAT_DRIVERS, IDI_CAT_DRIVERS); - AddCategory(hRootItem2, IDS_CAT_LIBS, IDI_CAT_LIBS); - AddCategory(hRootItem2, IDS_CAT_OTHER, IDI_CAT_OTHER); + HTREEITEM hRootItem; + + hRootItem = AddCategory(TVI_ROOT, IDS_AVAILABLEFORINST, IDI_CATEGORY); + AddCategory(hRootItem, IDS_CAT_AUDIO, IDI_CAT_AUDIO); + AddCategory(hRootItem, IDS_CAT_VIDEO, IDI_CAT_VIDEO); + AddCategory(hRootItem, IDS_CAT_GRAPHICS, IDI_CAT_GRAPHICS); + AddCategory(hRootItem, IDS_CAT_GAMES, IDI_CAT_GAMES); + AddCategory(hRootItem, IDS_CAT_INTERNET, IDI_CAT_INTERNET); + AddCategory(hRootItem, IDS_CAT_OFFICE, IDI_CAT_OFFICE); + AddCategory(hRootItem, IDS_CAT_DEVEL, IDI_CAT_DEVEL); + AddCategory(hRootItem, IDS_CAT_EDU, IDI_CAT_EDU); + AddCategory(hRootItem, IDS_CAT_ENGINEER, IDI_CAT_ENGINEER); + AddCategory(hRootItem, IDS_CAT_FINANCE, IDI_CAT_FINANCE); + AddCategory(hRootItem, IDS_CAT_SCIENCE, IDI_CAT_SCIENCE); + AddCategory(hRootItem, IDS_CAT_TOOLS, IDI_CAT_TOOLS); + AddCategory(hRootItem, IDS_CAT_DRIVERS, IDI_CAT_DRIVERS); + AddCategory(hRootItem, IDS_CAT_LIBS, IDI_CAT_LIBS); + AddCategory(hRootItem, IDS_CAT_OTHER, IDI_CAT_OTHER); m_TreeView->SetImageList(hImageTreeView, TVSIL_NORMAL); - m_TreeView->Expand(hRootItem2, TVE_EXPAND); - m_TreeView->Expand(hRootItem1, TVE_EXPAND); - m_TreeView->SelectItem(hRootItem1); + m_TreeView->Expand(hRootItem, TVE_EXPAND); + m_TreeView->SelectItem(hRootItem); } BOOL CreateStatusBar() @@ -1138,17 +1133,10 @@ return TRUE; } - /* Only add a ListView entry if... - - no RegName was supplied (so we cannot determine whether the application is installed or not) or - - a RegName was supplied and the application is not installed - */ - if (!*Info->szRegName || (!IsInstalledApplication(Info->szRegName, FALSE) && !IsInstalledApplication(Info->szRegName, TRUE))) - { - Index = ListViewAddItem(Info->Category, 0, Info->szName, (LPARAM) Info); - - ListView_SetItemText(hListView, Index, 1, Info->szVersion); - ListView_SetItemText(hListView, Index, 2, Info->szDesc); - } + Index = ListViewAddItem(Info->Category, 0, Info->szName, (LPARAM) Info); + + ListView_SetItemText(hListView, Index, 1, Info->szVersion); + ListView_SetItemText(hListView, Index, 2, Info->szDesc); return TRUE; } @@ -1183,14 +1171,15 @@ ImageList_AddIcon(hImageListView, hIcon); DestroyIcon(hIcon); - + /* if (IS_INSTALLED_ENUM(EnumType)) { - /* Enum installed applications and updates */ + / Enum installed applications and updates EnumInstalledApplications(EnumType, TRUE, s_EnumInstalledAppProc); EnumInstalledApplications(EnumType, FALSE, s_EnumInstalledAppProc); } - else if (IS_AVAILABLE_ENUM(EnumType)) + + else */if (IS_AVAILABLE_ENUM(EnumType)) { /* Enum available applications */ EnumAvailableApplications(EnumType, s_EnumAvailableAppProc); Modified: branches/GSoC_2017/rapps/reactos/base/applications/rapps/installed.cpp URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/rapps/reactos/base/ap… ============================================================================== --- branches/GSoC_2017/rapps/reactos/base/applications/rapps/installed.cpp [iso-8859-1] (original) +++ branches/GSoC_2017/rapps/reactos/base/applications/rapps/installed.cpp [iso-8859-1] Sun Jun 4 21:36:14 2017 @@ -28,9 +28,8 @@ return FALSE; } - -BOOL -IsInstalledApplication(LPWSTR lpRegName, BOOL IsUserKey) +BOOL +IsInstalledApplicationEx(LPWSTR lpRegName, BOOL IsUserKey, REGSAM keyWow) { DWORD dwSize = MAX_PATH, dwType; WCHAR szName[MAX_PATH]; @@ -38,8 +37,8 @@ HKEY hKey, hSubKey; INT ItemIndex = 0; - if (RegOpenKeyW(IsUserKey ? HKEY_CURRENT_USER : HKEY_LOCAL_MACHINE, - L"Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall", + if (RegOpenKeyExW(IsUserKey ? HKEY_CURRENT_USER : HKEY_LOCAL_MACHINE, + L"Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall", 0, keyWow | KEY_ENUMERATE_SUB_KEYS, &hKey) != ERROR_SUCCESS) { return FALSE; @@ -47,8 +46,9 @@ while (RegEnumKeyExW(hKey, ItemIndex, szName, &dwSize, NULL, NULL, NULL, NULL) == ERROR_SUCCESS) { - if (RegOpenKeyW(hKey, szName, &hSubKey) == ERROR_SUCCESS) + if (RegOpenKeyExW(hKey, szName, 0, keyWow | KEY_READ, &hSubKey) == ERROR_SUCCESS) { + dwType = REG_SZ; dwSize = sizeof(szDisplayName); if (RegQueryValueExW(hSubKey, @@ -63,15 +63,13 @@ RegCloseKey(hSubKey); RegCloseKey(hKey); return TRUE; - } + } } } - RegCloseKey(hSubKey); dwSize = MAX_PATH; ItemIndex++; } - RegCloseKey(hKey); return FALSE; } Modified: branches/GSoC_2017/rapps/reactos/base/applications/rapps/rapps.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/rapps/reactos/base/ap… ============================================================================== --- branches/GSoC_2017/rapps/reactos/base/applications/rapps/rapps.h [iso-8859-1] (original) +++ branches/GSoC_2017/rapps/reactos/base/applications/rapps/rapps.h [iso-8859-1] Sun Jun 4 21:36:14 2017 @@ -142,7 +142,7 @@ BOOL GetApplicationString(HKEY hKey, LPCWSTR lpKeyName, LPWSTR lpString); BOOL ShowInstalledAppInfo(INT Index); BOOL UninstallApplication(INT Index, BOOL bModify); -BOOL IsInstalledApplication(LPWSTR lpRegName, BOOL IsUserKey); +BOOL IsInstalledApplicationEx(LPWSTR lpRegName, BOOL IsUserKey, REGSAM keyWow); VOID RemoveAppFromRegistry(INT Index); /* winmain.c */ Modified: branches/GSoC_2017/rapps/reactos/base/applications/rapps/resource.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/rapps/reactos/base/ap… ============================================================================== --- branches/GSoC_2017/rapps/reactos/base/applications/rapps/resource.h [iso-8859-1] (original) +++ branches/GSoC_2017/rapps/reactos/base/applications/rapps/resource.h [iso-8859-1] Sun Jun 4 21:36:14 2017 @@ -111,7 +111,7 @@ #define IDS_TOOLTIP_SETTINGS 203 #define IDS_TOOLTIP_REFRESH 204 #define IDS_TOOLTIP_EXIT 205 -#define IDS_TOOLTIP_UPDATE_DB 206 +#define IDS_TOOLTIP_UPDATE_DB 206 /* Columns info */ #define IDS_APP_NAME 250 @@ -162,6 +162,15 @@ #define IDS_CAT_TOOLS 713 #define IDS_CAT_VIDEO 714 +/* App installation status */ +#define IDS_STATUS_INSTALLED 800 +#define IDS_STATUS_NOTINSTALLED 801 +#define IDS_STATUS_DOWNLOADED 802 +#define IDS_STATUS_UPDATE_AVAILABLE 803 +#define IDS_STATUS_DOWNLOADING 804 +#define IDS_STATUS_INSTALLING 805 + + /* Accelerators */ #define HOTKEYS 715

1 0

[pschweitzer] 74919: [UDFS] Complete the implementation of UDFGetNetworkInformation() so that it sets all the fields. This fixes displaying file size in explorer. CORE-4375 CORE-13366
by pschweitzer＠svn.reactos.org 04 Jun '17

04 Jun '17

Author: pschweitzer Date: Sun Jun 4 19:17:10 2017 New Revision: 74919 URL: http://svn.reactos.org/svn/reactos?rev=74919&view=rev Log: [UDFS] Complete the implementation of UDFGetNetworkInformation() so that it sets all the fields. This fixes displaying file size in explorer. CORE-4375 CORE-13366 Modified: trunk/reactos/drivers/filesystems/udfs/fileinfo.cpp Modified: trunk/reactos/drivers/filesystems/udfs/fileinfo.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/udfs/f… ============================================================================== --- trunk/reactos/drivers/filesystems/udfs/fileinfo.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/udfs/fileinfo.cpp [iso-8859-1] Sun Jun 4 19:17:10 2017 @@ -697,6 +697,7 @@ PtrBuffer->CreationTime = Fcb->NTRequiredFCB->CreationTime; PtrBuffer->LastAccessTime = Fcb->NTRequiredFCB->LastAccessTime; PtrBuffer->LastWriteTime = Fcb->NTRequiredFCB->LastWriteTime; + PtrBuffer->ChangeTime = Fcb->NTRequiredFCB->ChangeTime; FileInfo = Fcb->FileInfo; @@ -711,6 +712,13 @@ #ifdef UDF_DBG if(!FileInfo->Dloc->DirIndex) AdPrint(("*****!!!!! Directory has no DirIndex !!!!!*****\n")); #endif + } else { + if(Fcb->NTRequiredFCB->CommonFCBHeader.AllocationSize.LowPart == 0xffffffff) { + Fcb->NTRequiredFCB->CommonFCBHeader.AllocationSize.QuadPart = + UDFSysGetAllocSize(Fcb->Vcb, UDFGetFileSize(FileInfo)); + } + PtrBuffer->AllocationSize = Fcb->NTRequiredFCB->CommonFCBHeader.AllocationSize; + PtrBuffer->EndOfFile = Fcb->NTRequiredFCB->CommonFCBHeader.FileSize; } // Similarly, fill in attributes indicating a hidden file, system // file, compressed file, temporary file, etc. if the FSD supports

1 0

[hbelusca] 74918: [i8042prt]: Yet another hack for Dell trackpad, but this time, we inaugurate the Inspiron series with a Dell Inspiron 6000 hack!! x^( Something's fishy in our driver... Tested and...
by hbelusca＠svn.reactos.org 04 Jun '17

04 Jun '17

Author: hbelusca Date: Sun Jun 4 18:24:05 2017 New Revision: 74918 URL: http://svn.reactos.org/svn/reactos?rev=74918&view=rev Log: [i8042prt]: Yet another hack for Dell trackpad, but this time, we inaugurate the Inspiron series with a Dell Inspiron 6000 hack!! x^( Something's fishy in our driver... Tested and confirmed working by Jared Smudde. CORE-6901 Modified: trunk/reactos/drivers/input/i8042prt/hwhacks.c Modified: trunk/reactos/drivers/input/i8042prt/hwhacks.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/i8042prt/hwh… ============================================================================== --- trunk/reactos/drivers/input/i8042prt/hwhacks.c [iso-8859-1] (original) +++ trunk/reactos/drivers/input/i8042prt/hwhacks.c [iso-8859-1] Sun Jun 4 18:24:05 2017 @@ -59,6 +59,7 @@ // { {{BOARD_VENDOR, "ASUSTeK Computer Inc."}, {BOARD_NAME, "G1S"}, {BOARD_VERSION, "1.0"}}, FL_NOLOOP }, { {{SYS_VENDOR, "Microsoft Corporation"}, {SYS_PRODUCT, "Virtual Machine"}}, FL_INITHACK }, + { {{SYS_VENDOR, "Dell Inc."}, {SYS_PRODUCT, "Inspiron 6000 "}}, FL_INITHACK }, { {{SYS_VENDOR, "Dell Inc."}, {SYS_PRODUCT, "Latitude D430 "}}, FL_INITHACK }, { {{SYS_VENDOR, "Dell Inc."}, {SYS_PRODUCT, "Latitude D530 "}}, FL_INITHACK }, { {{SYS_VENDOR, "Dell Inc."}, {SYS_PRODUCT, "Latitude D531 "}}, FL_INITHACK },

1 0

[hbelusca] 74917: [PSDK]: Remove a couple of redundant #defines that are already defined in this regstr.h file.
by hbelusca＠svn.reactos.org 04 Jun '17

04 Jun '17

Author: hbelusca Date: Sun Jun 4 18:19:55 2017 New Revision: 74917 URL: http://svn.reactos.org/svn/reactos?rev=74917&view=rev Log: [PSDK]: Remove a couple of redundant #defines that are already defined in this regstr.h file. Modified: trunk/reactos/sdk/include/psdk/regstr.h Modified: trunk/reactos/sdk/include/psdk/regstr.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/psdk/regstr.h?… ============================================================================== --- trunk/reactos/sdk/include/psdk/regstr.h [iso-8859-1] (original) +++ trunk/reactos/sdk/include/psdk/regstr.h [iso-8859-1] Sun Jun 4 18:19:55 2017 @@ -756,9 +756,7 @@ #define REGSTR_VAL_SYSTEMBUSNUMBER TEXT("SystemBusNumber") #define REGSTR_VAL_BUSDATATYPE TEXT("BusDataType") #define REGSTR_VAL_INTERFACETYPE TEXT("InterfaceType") -#define REGSTR_VAL_SERVICE TEXT("Service") #define REGSTR_VAL_DETECTSIGNATURE TEXT("DetectSignature") -#define REGSTR_VAL_CLASSGUID TEXT("ClassGUID") #define REGSTR_VAL_INSTANCEIDENTIFIER TEXT("InstanceIdentifier") #define REGSTR_VAL_DUPLICATEOF TEXT("DuplicateOf") #define REGSTR_VAL_STATUSFLAGS TEXT("StatusFlags") @@ -770,10 +768,6 @@ #define REGSTR_VAL_DEVICE_INSTANCE TEXT("DeviceInstance") #define REGSTR_VAL_SYMBOLIC_LINK TEXT("SymbolicLink") #define REGSTR_VAL_DEFAULT TEXT("Default") -#define REGSTR_VAL_LOWERFILTERS TEXT("LowerFilters") -#define REGSTR_VAL_UPPERFILTERS TEXT("UpperFilters") -#define REGSTR_VAL_LOCATION_INFORMATION TEXT("LocationInformation") -#define REGSTR_VAL_UI_NUMBER TEXT("UINumber") #define REGSTR_VAL_UI_NUMBER_DESC_FORMAT TEXT("UINumberDescFormat") #define REGSTR_VAL_CAPABILITIES TEXT("Capabilities") #define REGSTR_VAL_DEVICE_TYPE TEXT("DeviceType")

1 0

[hbelusca] 74916: [SETUPAPI]: Fix a 9-year old bug in the SETUP_CreateClassKey() logic, introduced in r31860, that set a wrong Class name value if the corresponding registry key already existed. Th...
by hbelusca＠svn.reactos.org 04 Jun '17

04 Jun '17

Author: hbelusca Date: Sun Jun 4 18:16:24 2017 New Revision: 74916 URL: http://svn.reactos.org/svn/reactos?rev=74916&view=rev Log: [SETUPAPI]: Fix a 9-year old bug in the SETUP_CreateClassKey() logic, introduced in r31860, that set a wrong Class name value if the corresponding registry key already existed. The bug was unveiled by my commit r74761. [SETUPAPI_APITEST]: When selecting another test_class_guid and test_class_name couple via SetupDiClassNameFromGuidA(), check whether this function actually succeeds. Also, improve some error output. Modified: trunk/reactos/dll/win32/setupapi/devinst.c trunk/rostests/apitests/setupapi/devclass.c Modified: trunk/reactos/dll/win32/setupapi/devinst.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/devinst… ============================================================================== --- trunk/reactos/dll/win32/setupapi/devinst.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/setupapi/devinst.c [iso-8859-1] Sun Jun 4 18:16:24 2017 @@ -3599,58 +3599,72 @@ HKEY SETUP_CreateClassKey(HINF hInf) { - static const WCHAR slash[] = { '\\',0 }; WCHAR FullBuffer[MAX_PATH]; WCHAR Buffer[MAX_PATH]; DWORD RequiredSize; HKEY hClassKey; - + DWORD Disposition; + + /* Obtain the Class GUID for this class */ if (!SetupGetLineTextW(NULL, hInf, Version, REGSTR_VAL_CLASSGUID, Buffer, - MAX_PATH, + sizeof(Buffer) / sizeof(WCHAR), &RequiredSize)) { return INVALID_HANDLE_VALUE; } + /* Build the corresponding registry key name */ lstrcpyW(FullBuffer, REGSTR_PATH_CLASS_NT); - lstrcatW(FullBuffer, slash); + lstrcatW(FullBuffer, BackSlash); lstrcatW(FullBuffer, Buffer); + /* Obtain the Class name for this class */ + if (!SetupGetLineTextW(NULL, + hInf, + Version, + REGSTR_VAL_CLASS, + Buffer, + sizeof(Buffer) / sizeof(WCHAR), + &RequiredSize)) + { + return INVALID_HANDLE_VALUE; + } + + /* Try to open or create the registry key */ + TRACE("Opening class key %s\n", debugstr_w(FullBuffer)); +#if 0 // I keep this for reference... if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, FullBuffer, 0, KEY_SET_VALUE, &hClassKey)) { - if (!SetupGetLineTextW(NULL, - hInf, - Version, - REGSTR_VAL_CLASS, - Buffer, - MAX_PATH, - &RequiredSize)) - { - return INVALID_HANDLE_VALUE; - } - - if (RegCreateKeyExW(HKEY_LOCAL_MACHINE, - FullBuffer, - 0, - NULL, - REG_OPTION_NON_VOLATILE, - KEY_SET_VALUE, - NULL, - &hClassKey, - NULL)) - { - return INVALID_HANDLE_VALUE; - } - } - + /* Use RegCreateKeyExW */ + } +#endif + if (RegCreateKeyExW(HKEY_LOCAL_MACHINE, + FullBuffer, + 0, + NULL, + REG_OPTION_NON_VOLATILE, + KEY_SET_VALUE, + NULL, + &hClassKey, + &Disposition)) + { + ERR("RegCreateKeyExW(%s) failed\n", debugstr_w(FullBuffer)); + return INVALID_HANDLE_VALUE; + } + if (Disposition == REG_CREATED_NEW_KEY) + TRACE("The class key %s was successfully created\n", debugstr_w(FullBuffer)); + else + TRACE("The class key %s was successfully opened\n", debugstr_w(FullBuffer)); + + TRACE( "setting value %s to %s\n", debugstr_w(REGSTR_VAL_CLASS), debugstr_w(Buffer) ); if (RegSetValueExW(hClassKey, REGSTR_VAL_CLASS, 0, Modified: trunk/rostests/apitests/setupapi/devclass.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/setupapi/devclas… ============================================================================== --- trunk/rostests/apitests/setupapi/devclass.c [iso-8859-1] (original) +++ trunk/rostests/apitests/setupapi/devclass.c [iso-8859-1] Sun Jun 4 18:16:24 2017 @@ -89,9 +89,10 @@ if ( size > 0 ) { - /* That's better to use the first class found, as we know for sure that it exists */ - memcpy(&test_class_guid, &guid_list[0], sizeof( GUID ) ); - SetupDiClassNameFromGuidA( &test_class_guid, test_class_name, sizeof( test_class_name ), NULL ); + /* That's better to use the first class found, as we know for sure that it exists */ + memcpy(&test_class_guid, &guid_list[0], sizeof( GUID ) ); + ok( SetupDiClassNameFromGuidA( &test_class_guid, test_class_name, sizeof( test_class_name ), NULL ), + "Error reported %lx\n", GetLastError() ); } HeapFree( GetProcessHeap(), 0, guid_list ); } @@ -131,13 +132,13 @@ "Error reported %lx\n", GetLastError() ); ok( size == required_size, "Expected size %lu, got %lu\n", required_size, size ); ok( IsEqualIID( &guid_list[0], &test_class_guid ), - "Expected %s, got %s\n", debugstr_guid( &test_class_guid ), debugstr_guid( &guid_list[0] ) ); + "Expected %s, got %s for class %s\n", debugstr_guid( &test_class_guid ), debugstr_guid( &guid_list[0] ), test_class_name ); SetLastError( 0xdeadbeef ); ok( SetupDiClassGuidsFromNameA( test_class_name, guid_list, required_size + 1, &size ), "Error reported %lx\n", GetLastError() ); ok( size == required_size, "Expected size %lu, got %lu\n", required_size, size ); ok( IsEqualIID( &guid_list[0], &test_class_guid ), - "Expected %s, got %s\n", debugstr_guid( &test_class_guid ), debugstr_guid( &guid_list[0] ) ); + "Expected %s, got %s for class %s\n", debugstr_guid( &test_class_guid ), debugstr_guid( &guid_list[0] ), test_class_name ); HeapFree( GetProcessHeap(), 0, guid_list ); } @@ -162,7 +163,7 @@ "Fail expected\n" ); ok_lasterr( ERROR_INSUFFICIENT_BUFFER ); ok( required_size > 0, "Expected > 0, got %lu\n", required_size ); - ok( required_size < MAX_CLASS_NAME_LEN, "Expected < %u, got %lu\n", MAX_CLASS_NAME_LEN, required_size ); + ok( required_size < MAX_CLASS_NAME_LEN, "Expected < %u, got %lu for GUID %s\n", MAX_CLASS_NAME_LEN, required_size, debugstr_guid( &test_class_guid ) ); class_name = HeapAlloc( GetProcessHeap(), 0, required_size ); if ( !class_name )

1 0

[ssawant] 74915: [QCKLNCH] -Added .rgs script and other files to facilitate component registration.
by ssawant＠svn.reactos.org 04 Jun '17

04 Jun '17

Author: ssawant Date: Sun Jun 4 17:33:06 2017 New Revision: 74915 URL: http://svn.reactos.org/svn/reactos?rev=74915&view=rev Log: [QCKLNCH] -Added .rgs script and other files to facilitate component registration. Added: branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/qcklnch.rc (with props) branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/rgs/ branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/rgs/qcklnch.rgs (with props) Modified: branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/CMakeLists.txt branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/CQuickLaunchBand.cpp branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/CQuickLaunchBand.h branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/qcklnch.cpp Modified: branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/shellext/reactos/dll/… ============================================================================== --- branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/CMakeLists.txt [iso-8859-1] (original) +++ branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/CMakeLists.txt [iso-8859-1] Sun Jun 4 17:33:06 2017 @@ -16,6 +16,7 @@ add_library(qcklnch SHARED qcklnch.cpp + qcklnch.rc CQuickLaunchBand.cpp ${CMAKE_CURRENT_BINARY_DIR}/qcklnch.def) Modified: branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/CQuickLaunchBand.cpp URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/shellext/reactos/dll/… ============================================================================== --- branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/CQuickLaunchBand.cpp [iso-8859-1] (original) +++ branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/CQuickLaunchBand.cpp [iso-8859-1] Sun Jun 4 17:33:06 2017 @@ -13,6 +13,20 @@ // {260CB95D-4544-44F6-A079-575BAA60B72F} static const GUID CLSID_QuickLaunchBand = { 0x260cb95d, 0x4544, 0x44f6, { 0xa0, 0x79, 0x57, 0x5b, 0xaa, 0x60, 0xb7, 0x2f } }; +//RegComCat function +HRESULT RegisterComCat() +{ + ICatRegister *pcr; + HRESULT hr = CoCreateInstance(CLSID_StdComponentCategoriesMgr, NULL, CLSCTX_INPROC_SERVER, IID_ICatRegister, (void**)&pcr); + if (SUCCEEDED(hr)) + { + CATID catid = CATID_DeskBand; + hr = pcr->RegisterClassImplCategories(CLSID_QuickLaunchBand, 1, &catid); + pcr->Release(); + } + return hr; +} + //CQuickLaunchBand CQuickLaunchBand::CQuickLaunchBand() : @@ -59,9 +73,9 @@ IN REFIID riid, OUT VOID **ppvSite) { - /*TRACE("CQuickLaunchBand::GetSite(0x%p,0x%p)\n", riid, ppvSite); - - if (m_Site != NULL) + TRACE("CQuickLaunchBand::GetSite(0x%p,0x%p)\n", riid, ppvSite); + + /* if (m_Site != NULL) { return m_Site->QueryInterface(riid, ppvSite); } @@ -117,8 +131,7 @@ IN DWORD dwViewMode, IN OUT DESKBANDINFO *pdbi) { - //TRACE("CQuickLaunchBand::GetBandInfo(0x%x,0x%x,0x%p) hWnd=0x%p\n", dwBandID, dwViewMode, pdbi, m_hWnd); - + TRACE("CQuickLaunchBand::GetBandInfo(0x%x,0x%x,0x%p) hWnd=0x%p\n", dwBandID, dwViewMode, pdbi, m_hWnd); return E_FAIL; } @@ -127,14 +140,14 @@ HRESULT STDMETHODCALLTYPE CQuickLaunchBand::SetClient( IN IUnknown *punkClient) { - /*TRACE("IDeskBar::SetClient(0x%p)\n", punkClient);*/ + TRACE("IDeskBar::SetClient(0x%p)\n", punkClient); return E_NOTIMPL; } HRESULT STDMETHODCALLTYPE CQuickLaunchBand::GetClient( OUT IUnknown **ppunkClient) { - /*TRACE("IDeskBar::GetClient(0x%p)\n", ppunkClient);*/ + TRACE("IDeskBar::GetClient(0x%p)\n", ppunkClient); return E_NOTIMPL; } @@ -155,7 +168,7 @@ { TRACE("CQuickLaunchBand::GetClassID(0x%p)\n", pClassID); /* We're going to return the (internal!) CLSID of the task band interface */ - //*pClassID = CLSID_ITaskBand; + *pClassID = CLSID_QuickLaunchBand; return S_OK; } @@ -168,7 +181,7 @@ HRESULT STDMETHODCALLTYPE CQuickLaunchBand::Load( IN IStream *pStm) { - //TRACE("CQuickLaunchBand::Load called\n"); + TRACE("CQuickLaunchBand::Load called\n"); /* Nothing to do */ return S_OK; } @@ -200,7 +213,7 @@ IN LPARAM lParam, OUT LRESULT *plrResult) { - //TRACE("CQuickLaunchBand: IWinEventHandler::ProcessMessage(0x%p, 0x%x, 0x%p, 0x%p, 0x%p)\n", hWnd, uMsg, wParam, lParam, plrResult); + TRACE("CQuickLaunchBand: IWinEventHandler::ProcessMessage(0x%p, 0x%x, 0x%p, 0x%p, 0x%p)\n", hWnd, uMsg, wParam, lParam, plrResult); return E_NOTIMPL; } @@ -252,18 +265,3 @@ return E_NOTIMPL; } - - - - - -/*****************************************************************************/ - - /* HRESULT STDMETHODCALLTYPE Initialize(IN OUT ITrayWindow *tray, HWND hWndStartButton) - { - m_Tray = tray; - m_BandID = (DWORD) -1; - m_hWndStartButton = hWndStartButton; - return S_OK; - } -*/ Modified: branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/CQuickLaunchBand.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/shellext/reactos/dll/… ============================================================================== --- branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/CQuickLaunchBand.h [iso-8859-1] (original) +++ branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/CQuickLaunchBand.h [iso-8859-1] Sun Jun 4 17:33:06 2017 @@ -8,6 +8,8 @@ #pragma once extern const GUID CLSID_QuickLaunchBand; + +HRESULT RegisterComCat(); class CQuickLaunchBand : public CComCoClass<CQuickLaunchBand, &CLSID_QuickLaunchBand>, @@ -147,7 +149,8 @@ ); //***************************************************************************************************** - + + DECLARE_REGISTRY_RESOURCEID(1001) DECLARE_NOT_AGGREGATABLE(CQuickLaunchBand) DECLARE_PROTECT_FINAL_CONSTRUCT() Modified: branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/qcklnch.cpp URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/shellext/reactos/dll/… ============================================================================== --- branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/qcklnch.cpp [iso-8859-1] (original) +++ branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/qcklnch.cpp [iso-8859-1] Sun Jun 4 17:33:06 2017 @@ -13,7 +13,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(qcklnch); BEGIN_OBJECT_MAP(ObjectMap) - //OBJECT_ENTRY(CLSID_QuickLaunchBand, CQuickLaunchBand) + OBJECT_ENTRY(CLSID_QuickLaunchBand, CQuickLaunchBand) END_OBJECT_MAP() HINSTANCE g_hInstance; @@ -45,7 +45,12 @@ STDAPI DllRegisterServer(void) { - return g_Module.DllRegisterServer(FALSE); + HRESULT hr = g_Module.DllRegisterServer(FALSE); + + if (FAILED(hr)) + return hr; + else + return RegisterComCat(); } STDAPI Added: branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/qcklnch.rc URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/shellext/reactos/dll/… ============================================================================== --- branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/qcklnch.rc (added) +++ branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/qcklnch.rc [iso-8859-1] Sun Jun 4 17:33:06 2017 @@ -0,0 +1,10 @@ +#include <windef.h> +#include <winuser.h> +#include <commctrl.h> + +LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL + +1001 REGISTRY "rgs/qcklnch.rgs" + +#include <reactos/manifest_dll.rc> + Propchange: branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/qcklnch.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/rgs/qcklnch.rgs URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/shellext/reactos/dll/… ============================================================================== --- branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/rgs/qcklnch.rgs (added) +++ branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/rgs/qcklnch.rgs [iso-8859-1] Sun Jun 4 17:33:06 2017 @@ -0,0 +1,13 @@ +HKCR +{ + NoRemove CLSID + { + ForceRemove {260CB95D-4544-44F6-A079-575BAA60B72F} = s 'QuickLaunchBand' + { + InprocServer32 = s '%MODULE%' + { + val ThreadingModel = s 'Apartment' + } + } + } +} Propchange: branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/rgs/qcklnch.rgs ------------------------------------------------------------------------------ svn:eol-style = native

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs