Ros-diffs June 2017

ros-diffs@reactos.org

20 participants
526 discussions

[hbelusca] 75141: [NTOS]: Improve parameter namings in CmpLinkKeyToHive() and some of its DPRINTs; use UNICODE_NULL where needed.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Mon Jun 19 20:04:25 2017 New Revision: 75141 URL: http://svn.reactos.org/svn/reactos?rev=75141&view=rev Log: [NTOS]: Improve parameter namings in CmpLinkKeyToHive() and some of its DPRINTs; use UNICODE_NULL where needed. Modified: trunk/reactos/ntoskrnl/config/cmsysini.c Modified: trunk/reactos/ntoskrnl/config/cmsysini.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmsysini.c… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmsysini.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/config/cmsysini.c [iso-8859-1] Mon Jun 19 20:04:25 2017 @@ -40,26 +40,27 @@ BOOLEAN NTAPI CmpLinkKeyToHive( - _In_z_ PWSTR LinkKeyName, - _In_z_ PWSTR TargetKeyName) -{ + _In_z_ PCWSTR LinkKeyName, + _In_z_ PCWSTR TargetKeyName) +{ + NTSTATUS Status; OBJECT_ATTRIBUTES ObjectAttributes; - UNICODE_STRING LinkKeyName_U; - HANDLE TargetKeyHandle; + UNICODE_STRING KeyName; + HANDLE LinkKeyHandle; ULONG Disposition; - NTSTATUS Status; + PAGED_CODE(); /* Initialize the object attributes */ - RtlInitUnicodeString(&LinkKeyName_U, LinkKeyName); + RtlInitUnicodeString(&KeyName, LinkKeyName); InitializeObjectAttributes(&ObjectAttributes, - &LinkKeyName_U, + &KeyName, OBJ_CASE_INSENSITIVE | OBJ_KERNEL_HANDLE, NULL, NULL); /* Create the link key */ - Status = ZwCreateKey(&TargetKeyHandle, + Status = ZwCreateKey(&LinkKeyHandle, KEY_CREATE_LINK, &ObjectAttributes, 0, @@ -68,7 +69,7 @@ &Disposition); if (!NT_SUCCESS(Status)) { - DPRINT1("CM: CmpLinkKeyToHive: couldn't create %S Status = 0x%lx\n", + DPRINT1("CM: CmpLinkKeyToHive: couldn't create %S, Status = 0x%lx\n", LinkKeyName, Status); return FALSE; } @@ -77,25 +78,26 @@ if (Disposition != REG_CREATED_NEW_KEY) { DPRINT1("CM: CmpLinkKeyToHive: %S already exists!\n", LinkKeyName); - ZwClose(TargetKeyHandle); + ZwClose(LinkKeyHandle); return FALSE; } /* Set the target key name as link target */ - Status = ZwSetValueKey(TargetKeyHandle, + RtlInitUnicodeString(&KeyName, TargetKeyName); + Status = ZwSetValueKey(LinkKeyHandle, &CmSymbolicLinkValueName, 0, REG_LINK, - TargetKeyName, - (ULONG)wcslen(TargetKeyName) * sizeof(WCHAR)); + KeyName.Buffer, + KeyName.Length); /* Close the link key handle */ - ObCloseHandle(TargetKeyHandle, KernelMode); - - if (!NT_SUCCESS(Status)) - { - DPRINT1("CM: CmpLinkKeyToHive: couldn't create symbolic link for %S\n", - TargetKeyName); + ObCloseHandle(LinkKeyHandle, KernelMode); + + if (!NT_SUCCESS(Status)) + { + DPRINT1("CM: CmpLinkKeyToHive: couldn't create symbolic link for %S, Status = 0x%lx\n", + TargetKeyName, Status); return FALSE; } @@ -263,7 +265,7 @@ BytesToCopy); /* Null terminate it */ - ObjectNameInfo->Name.Buffer[BytesToCopy / sizeof(WCHAR)] = 0; + ObjectNameInfo->Name.Buffer[BytesToCopy / sizeof(WCHAR)] = UNICODE_NULL; } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { @@ -1640,7 +1642,7 @@ /* Create the default security descriptor */ SecurityDescriptor = CmpHiveRootSecurityDescriptor(); - /* Create '\Registry\Machine' key. */ + /* Create '\Registry\Machine' key */ RtlInitUnicodeString(&KeyName, L"\\REGISTRY\\MACHINE"); InitializeObjectAttributes(&ObjectAttributes, &KeyName, @@ -1663,7 +1665,7 @@ /* Close the handle */ NtClose(KeyHandle); - /* Create '\Registry\User' key. */ + /* Create '\Registry\User' key */ RtlInitUnicodeString(&KeyName, L"\\REGISTRY\\USER"); InitializeObjectAttributes(&ObjectAttributes, &KeyName, @@ -1696,7 +1698,7 @@ KeBugCheckEx(CONFIG_INITIALIZATION_FAILED, 1, 7, 0, 0); } - /* Create the 'CurrentControlSet' link. */ + /* Create the 'CurrentControlSet' link */ Status = CmpCreateControlSet(KeLoaderBlock); if (!NT_SUCCESS(Status)) {

7 years, 3 months

[mjansen] 75140: [WIN32SS] Rewrite GetFontFamilyInfoForSubstitutes to use the subsitute list loaded at boot. Patch by Katayama Hirofumi MZ. CORE-13064

by mjansen＠svn.reactos.org

Author: mjansen Date: Mon Jun 19 20:00:36 2017 New Revision: 75140 URL: http://svn.reactos.org/svn/reactos?rev=75140&view=rev Log: [WIN32SS] Rewrite GetFontFamilyInfoForSubstitutes to use the subsitute list loaded at boot. Patch by Katayama Hirofumi MZ. CORE-13064 Modified: trunk/reactos/win32ss/gdi/ntgdi/freetype.c Modified: trunk/reactos/win32ss/gdi/ntgdi/freetype.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/freetype… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/freetype.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/freetype.c [iso-8859-1] Mon Jun 19 20:00:36 2017 @@ -2503,114 +2503,48 @@ return TRUE; } -typedef struct FontFamilyInfoCallbackContext -{ - LPLOGFONTW LogFont; - PFONTFAMILYINFO Info; - DWORD Count; - DWORD Size; -} FONT_FAMILY_INFO_CALLBACK_CONTEXT, *PFONT_FAMILY_INFO_CALLBACK_CONTEXT; - -_Function_class_(RTL_QUERY_REGISTRY_ROUTINE) -static NTSTATUS APIENTRY -FontFamilyInfoQueryRegistryCallback(IN PWSTR ValueName, IN ULONG ValueType, - IN PVOID ValueData, IN ULONG ValueLength, - IN PVOID Context, IN PVOID EntryContext) -{ - PFONT_FAMILY_INFO_CALLBACK_CONTEXT InfoContext; - UNICODE_STRING RegistryName, RegistryValue; - int Existing; - PFONTGDI FontGDI; - - if (REG_SZ != ValueType) - { - return STATUS_SUCCESS; - } - InfoContext = (PFONT_FAMILY_INFO_CALLBACK_CONTEXT) Context; - RtlInitUnicodeString(&RegistryName, ValueName); - - /* Do we need to include this font family? */ - if (FontFamilyInclude(InfoContext->LogFont, &RegistryName, InfoContext->Info, - min(InfoContext->Count, InfoContext->Size))) - { - RtlInitUnicodeString(&RegistryValue, (PCWSTR) ValueData); - Existing = FindFaceNameInInfo(&RegistryValue, InfoContext->Info, - min(InfoContext->Count, InfoContext->Size)); - if (0 <= Existing) - { - /* We already have the information about the "real" font. Just copy it */ - if (InfoContext->Count < InfoContext->Size) - { - InfoContext->Info[InfoContext->Count] = InfoContext->Info[Existing]; - RtlStringCbCopyNW(InfoContext->Info[InfoContext->Count].EnumLogFontEx.elfLogFont.lfFaceName, - sizeof(InfoContext->Info[InfoContext->Count].EnumLogFontEx.elfLogFont.lfFaceName), - RegistryName.Buffer, - RegistryName.Length); - } - InfoContext->Count++; - return STATUS_SUCCESS; - } - - /* Try to find information about the "real" font */ - FontGDI = FindFaceNameInLists(&RegistryValue); - if (NULL == FontGDI) - { - /* "Real" font not found, discard this registry entry */ - return STATUS_SUCCESS; - } - - /* Return info about the "real" font but with the name of the alias */ - if (InfoContext->Count < InfoContext->Size) - { - FontFamilyFillInfo(InfoContext->Info + InfoContext->Count, - RegistryName.Buffer, NULL, FontGDI); - } - InfoContext->Count++; - return STATUS_SUCCESS; - } - - return STATUS_SUCCESS; -} - static BOOLEAN FASTCALL GetFontFamilyInfoForSubstitutes(LPLOGFONTW LogFont, PFONTFAMILYINFO Info, - DWORD *Count, - DWORD Size) -{ - RTL_QUERY_REGISTRY_TABLE QueryTable[2] = {{0}}; - FONT_FAMILY_INFO_CALLBACK_CONTEXT Context; - NTSTATUS Status; - - /* Enumerate font families found in HKLM\Software\Microsoft\Windows NT\CurrentVersion\FontSubstitutes - The real work is done in the registry callback function */ - Context.LogFont = LogFont; - Context.Info = Info; - Context.Count = *Count; - Context.Size = Size; - - QueryTable[0].QueryRoutine = FontFamilyInfoQueryRegistryCallback; - QueryTable[0].Flags = 0; - QueryTable[0].Name = NULL; - QueryTable[0].EntryContext = NULL; - QueryTable[0].DefaultType = REG_NONE; - QueryTable[0].DefaultData = NULL; - QueryTable[0].DefaultLength = 0; - - QueryTable[1].QueryRoutine = NULL; - QueryTable[1].Name = NULL; - - Status = RtlQueryRegistryValues(RTL_REGISTRY_WINDOWS_NT, - L"FontSubstitutes", - QueryTable, - &Context, - NULL); - if (NT_SUCCESS(Status)) - { - *Count = Context.Count; - } - - return NT_SUCCESS(Status) || STATUS_OBJECT_NAME_NOT_FOUND == Status; + DWORD *pCount, + DWORD MaxCount) +{ + PLIST_ENTRY pEntry, pHead = &FontSubstListHead; + PFONTSUBST_ENTRY pCurrentEntry; + PUNICODE_STRING pFromW; + FONTGDI *FontGDI; + LOGFONTW lf = *LogFont; + UNICODE_STRING NameW; + + for (pEntry = pHead->Flink; pEntry != pHead; pEntry = pEntry->Flink) + { + pCurrentEntry = CONTAINING_RECORD(pEntry, FONTSUBST_ENTRY, ListEntry); + + pFromW = &pCurrentEntry->FontNames[FONTSUBST_FROM]; + if (LogFont->lfFaceName[0] != UNICODE_NULL) + { + if (!FontFamilyInclude(LogFont, pFromW, Info, min(*pCount, MaxCount))) + continue; /* mismatch */ + } + + RtlStringCchCopyW(lf.lfFaceName, LF_FACESIZE, pFromW->Buffer); + SubstituteFontRecurse(&lf); + + RtlInitUnicodeString(&NameW, lf.lfFaceName); + FontGDI = FindFaceNameInLists(&NameW); + if (FontGDI == NULL) + { + continue; /* no real font */ + } + + if (*pCount < MaxCount) + { + FontFamilyFillInfo(&Info[*pCount], pFromW->Buffer, NULL, FontGDI); + } + (*pCount)++; + } + + return TRUE; } BOOL

7 years, 3 months

[hbelusca] 75139: [NTOS]: Improve some DPRINTs, and variables naming + buffer data type in CmpAddToHiveFileList().

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Mon Jun 19 19:55:14 2017 New Revision: 75139 URL: http://svn.reactos.org/svn/reactos?rev=75139&view=rev Log: [NTOS]: Improve some DPRINTs, and variables naming + buffer data type in CmpAddToHiveFileList(). Modified: trunk/reactos/ntoskrnl/config/cmhvlist.c Modified: trunk/reactos/ntoskrnl/config/cmhvlist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmhvlist.c… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmhvlist.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/config/cmhvlist.c [iso-8859-1] Mon Jun 19 19:55:14 2017 @@ -134,9 +134,9 @@ HANDLE KeyHandle; UNICODE_STRING HivePath; PWCHAR FilePath; - CHAR Buffer[sizeof(OBJECT_NAME_INFORMATION) + 512 * sizeof(WCHAR)]; + UCHAR Buffer[sizeof(OBJECT_NAME_INFORMATION) + MAX_PATH * sizeof(WCHAR)]; ULONG Length = sizeof(Buffer); - POBJECT_NAME_INFORMATION LocalNameInfo = (POBJECT_NAME_INFORMATION)&Buffer; + POBJECT_NAME_INFORMATION FileNameInfo = (POBJECT_NAME_INFORMATION)&Buffer; HivePath.Buffer = NULL; /* Create or open the hive list key */ @@ -155,7 +155,7 @@ if (!NT_SUCCESS(Status)) { /* Fail */ - DPRINT1("CmpAddToHiveFileList: Creation or opening of the hive list failed, status = %08lx\n", Status); + DPRINT1("CmpAddToHiveFileList: Creation or opening of the hive list failed, status = 0x%08lx\n", Status); return Status; } @@ -174,21 +174,21 @@ /* Try to get the value */ Status = ZwQueryObject(Hive->FileHandles[HFILE_TYPE_PRIMARY], ObjectNameInformation, - LocalNameInfo, + FileNameInfo, Length, &Length); if (NT_SUCCESS(Status)) { /* Null-terminate and add the length of the terminator */ Length -= sizeof(OBJECT_NAME_INFORMATION); - FilePath = LocalNameInfo->Name.Buffer; + FilePath = FileNameInfo->Name.Buffer; FilePath[Length / sizeof(WCHAR)] = UNICODE_NULL; Length += sizeof(UNICODE_NULL); } else { /* Fail */ - DPRINT1("CmpAddToHiveFileList: Hive file name query failed, status = %08lx\n", Status); + DPRINT1("CmpAddToHiveFileList: Hive file name query failed, status = 0x%08lx\n", Status); goto Quickie; } } @@ -209,7 +209,7 @@ if (!NT_SUCCESS(Status)) { /* Fail */ - DPRINT1("CmpAddToHiveFileList: Setting of entry in the hive list failed, status = %08lx\n", Status); + DPRINT1("CmpAddToHiveFileList: Setting of entry in the hive list failed, status = 0x%08lx\n", Status); } Quickie: @@ -240,7 +240,7 @@ if (!NT_SUCCESS(Status)) { /* Fail */ - DPRINT1("CmpRemoveFromHiveFileList: Opening of the hive list failed, status = %08lx\n", Status); + DPRINT1("CmpRemoveFromHiveFileList: Opening of the hive list failed, status = 0x%08lx\n", Status); return; }

7 years, 3 months

[hbelusca] 75138: [NTDLL_APITEST]: Temporarily disable part of the NtLoad/UnloadKey test (related to force-unload a hive while some handles to subkeys are still opened), because this creates memory...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Mon Jun 19 19:50:49 2017 New Revision: 75138 URL: http://svn.reactos.org/svn/reactos?rev=75138&view=rev Log: [NTDLL_APITEST]: Temporarily disable part of the NtLoad/UnloadKey test (related to force-unload a hive while some handles to subkeys are still opened), because this creates memory corruptions, due to the fact we currently don't perform force-unloads correctly. CORE-13448 Modified: trunk/rostests/apitests/ntdll/NtLoadUnloadKey.c Modified: trunk/rostests/apitests/ntdll/NtLoadUnloadKey.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ntdll/NtLoadUnlo… ============================================================================== --- trunk/rostests/apitests/ntdll/NtLoadUnloadKey.c [iso-8859-1] (original) +++ trunk/rostests/apitests/ntdll/NtLoadUnloadKey.c [iso-8859-1] Mon Jun 19 19:50:49 2017 @@ -524,6 +524,8 @@ Status = NtFlushKey(KeyHandle); ok_ntstatus(Status, STATUS_SUCCESS); +#if 0 // Currently, leads to memory corruption !!!!! + /* Force-unmount the hive, with the handle key still opened */ Status = DisconnectRegistry(NULL, RegistryHives[0].RegMountPoint, REG_FORCE_UNLOAD); DPRINT1("Force-unmounting '%S' %s\n", RegistryHives[0].RegMountPoint, NT_SUCCESS(Status) ? "succeeded" : "failed"); @@ -536,6 +538,8 @@ { ok_ntstatus(Status, STATUS_KEY_DELETED); } + +#endif /* The key handle should not be valid anymore */ Status = NtDeleteKey(KeyHandle);

7 years, 3 months

[ssawant] 75137: [QCKLNCH] -Added a sample toolbar. -Tested via CISFBand.

by ssawant＠svn.reactos.org

Author: ssawant Date: Mon Jun 19 19:19:10 2017 New Revision: 75137 URL: http://svn.reactos.org/svn/reactos?rev=75137&view=rev Log: [QCKLNCH] -Added a sample toolbar. -Tested via CISFBand. Modified: branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/CISFBand.cpp branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/CISFBand.h Modified: branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/CISFBand.cpp URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/shellext/reactos/dll/… ============================================================================== --- branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/CISFBand.cpp [iso-8859-1] (original) +++ branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/CISFBand.cpp [iso-8859-1] Mon Jun 19 19:19:10 2017 @@ -7,8 +7,72 @@ */ #include "precomp.h" +#include <mshtmcid.h> + +#define GET_X_LPARAM(lp) ((int)(short)LOWORD(lp)) +#define GET_Y_LPARAM(lp) ((int)(short)HIWORD(lp)) WINE_DEFAULT_DEBUG_CHANNEL(qcklnch); + +//Toolbar + +HWND CreateSimpleToolbar(HWND hWndParent, HINSTANCE hInst) +{ + //This ought to be global.. (currently testing) + //HIMAGELIST g_hImageList = NULL; + + // Declare and initialize local constants. + const int ImageListID = 0; + const int numButtons = 3; + const int bitmapSize = 16; + + const DWORD buttonStyles = BTNS_AUTOSIZE; + + // Create the toolbar. + HWND hWndToolbar = CreateWindowEx(0, TOOLBARCLASSNAME, NULL, + WS_CHILD | TBSTYLE_WRAPABLE | TBSTYLE_FLAT | CCS_NORESIZE, CW_USEDEFAULT, CW_USEDEFAULT, 0, 0, + hWndParent, NULL, hInst, NULL); + + if (hWndToolbar == NULL) + return NULL; + + // Create the image list. + /* g_hImageList = ImageList_Create(bitmapSize, bitmapSize, // Dimensions of individual bitmaps. + ILC_COLOR16 | ILC_MASK, // Ensures transparent background. + numButtons, 0); + + // Set the image list. + SendMessage(hWndToolbar, TB_SETIMAGELIST, + (WPARAM)ImageListID, + (LPARAM)g_hImageList); + + // Load the button images. + SendMessage(hWndToolbar, TB_LOADIMAGES, + (WPARAM)IDB_STD_SMALL_COLOR, + (LPARAM)HINST_COMMCTRL);*/ + + // Initialize button info. + // IDM_NEW, IDM_OPEN, and IDM_SAVE are application-defined command constants. + + TBBUTTON tbButtons[numButtons] = + { + { MAKELONG(STD_FILENEW, ImageListID), IDM_NEW, TBSTATE_ENABLED, buttonStyles,{ 0 }, 0, (INT_PTR)L"New" }, + { MAKELONG(STD_FILEOPEN, ImageListID), IDM_OPEN, TBSTATE_ENABLED, buttonStyles,{ 0 }, 0, (INT_PTR)L"Open" }, + { MAKELONG(STD_FILESAVE, ImageListID), IDM_SAVE, 0, buttonStyles,{ 0 }, 0, (INT_PTR)L"Save" } + }; + + // Add buttons. + SendMessage(hWndToolbar, TB_BUTTONSTRUCTSIZE, (WPARAM)sizeof(TBBUTTON), 0); + SendMessage(hWndToolbar, TB_ADDBUTTONS, (WPARAM)numButtons, (LPARAM)&tbButtons); + + //SendMessage(hWndToolbar, TB_INSERTBUTTON, /*(WPARAM)numButtons*/ 0, (LPARAM)&tbButtons[0]); + + // Resize the toolbar, and then show it. + SendMessage(hWndToolbar, TB_AUTOSIZE, 0, 0); + ShowWindow(hWndToolbar, TRUE); + + return hWndToolbar; +} //Subclassing Button @@ -48,10 +112,13 @@ TRACE("Querying site window failed: 0x%x\n", hRet); return hRet; } - m_Site = pUnkSite; - m_hWnd = CreateWindowEx(0, L"BUTTON", L">>", WS_CHILD, CW_USEDEFAULT, CW_USEDEFAULT, 50, 50, hwndParent, 0, m_hInstance, 0); - SetWindowSubclass(hwndParent, MyWndProc, 0, 0); //when button is clicked, parent receives WM_COMMAND, and thus subclassed to show a test message box - + m_Site = pUnkSite; + + //m_hWnd = CreateWindowEx(0, L"BUTTON", L">>", WS_CHILD, CW_USEDEFAULT, CW_USEDEFAULT, 50, 50, hwndParent, 0, m_hInstance, 0); + //SetWindowSubclass(hwndParent, MyWndProc, 0, 0); //when button is clicked, parent receives WM_COMMAND, and thus subclassed to show a test message box + + m_hWnd = CreateSimpleToolbar(hwndParent, m_hInstance); + return S_OK; } @@ -144,71 +211,61 @@ IN OUT DESKBANDINFO *pdbi) { //MessageBox(0, L"GetBandInfo called!", L"Test Caption", MB_OK | MB_ICONINFORMATION); - + TRACE("CTaskBand::GetBandInfo(0x%x,0x%x,0x%p) hWnd=0x%p\n", dwBandID, dwViewMode, pdbi, m_hWnd); - - HRESULT hr = E_INVALIDARG; - + if (m_hWnd && pdbi) { m_BandID = dwBandID; - pdbi->dwModeFlags = DBIMF_VARIABLEHEIGHT; - - if (dwViewMode & DBIF_VIEWMODE_VERTICAL) - { - pdbi->ptIntegral.y = 1; - pdbi->ptMinSize.y = 20; - /* FIXME: Get the button metrics from the task bar object!!! */ - pdbi->ptMinSize.x = (3 * GetSystemMetrics(SM_CXEDGE) / 2) + /* FIXME: Might be wrong if only one column! */ - GetSystemMetrics(SM_CXSIZE) + (2 * GetSystemMetrics(SM_CXEDGE)); /* FIXME: Min button size, query!!! */ + + RECT actualRect; + POINTL actualSize; + POINTL idealSize; + POINTL maxSize; + POINTL itemSize; + + ::GetWindowRect(m_hWnd, &actualRect); + actualSize.x = actualRect.right - actualRect.left; + actualSize.y = actualRect.bottom - actualRect.top; + + // Obtain the ideal size, to be used as min and max + SendMessageW(m_hWnd, TB_AUTOSIZE, 0, 0); + SendMessageW(m_hWnd, TB_GETMAXSIZE, 0, reinterpret_cast<LPARAM>(&maxSize)); + + idealSize = maxSize; + SendMessageW(m_hWnd, TB_GETIDEALSIZE, FALSE, reinterpret_cast<LPARAM>(&idealSize)); + + // Obtain the button size, to be used as the integral size + DWORD size = SendMessageW(m_hWnd, TB_GETBUTTONSIZE, 0, 0); + itemSize.x = GET_X_LPARAM(size); + itemSize.y = GET_Y_LPARAM(size); + + if (pdbi->dwMask & DBIM_MINSIZE) + { + pdbi->ptMinSize = idealSize; } - else - { - /* When the band is horizontal its minimum height is the height of the start button */ - RECT rcButton; - GetWindowRect(m_hWndStartButton, &rcButton); - pdbi->ptMinSize.y = rcButton.bottom - rcButton.top; - pdbi->ptIntegral.y = pdbi->ptMinSize.y + (3 * GetSystemMetrics(SM_CYEDGE) / 2); /* FIXME: Query metrics */ - /* We're not going to allow task bands where not even the minimum button size fits into the band */ - pdbi->ptMinSize.x = pdbi->ptIntegral.y; + if (pdbi->dwMask & DBIM_MAXSIZE) + { + pdbi->ptMaxSize = maxSize; } - - if (pdbi->dwMask & DBIM_MAXSIZE) - { - pdbi->ptMaxSize.y = -1; + if (pdbi->dwMask & DBIM_INTEGRAL) + { + pdbi->ptIntegral = itemSize; } - if (pdbi->dwMask & DBIM_ACTUAL) { - pdbi->ptActual.x = 35; - pdbi->ptActual.y = 30; + pdbi->ptActual = actualSize; } - if (pdbi->dwMask & DBIM_TITLE) - { - // Don't show title by removing this flag. - pdbi->dwMask &= ~DBIM_TITLE; - } - + wcscpy(pdbi->wszTitle, L""); if (pdbi->dwMask & DBIM_MODEFLAGS) { pdbi->dwModeFlags = DBIMF_NORMAL | DBIMF_VARIABLEHEIGHT; } - if (pdbi->dwMask & DBIM_BKCOLOR) - { - // Use the default background color by removing this flag. - pdbi->dwMask &= ~DBIM_BKCOLOR; - } - - TRACE("H: %d, Min: %d,%d, Integral.y: %d Actual: %d,%d\n", (dwViewMode & DBIF_VIEWMODE_VERTICAL) == 0, - pdbi->ptMinSize.x, pdbi->ptMinSize.y, pdbi->ptIntegral.y, - pdbi->ptActual.x, pdbi->ptActual.y); - - hr = S_OK; - } - - return hr; + pdbi->crBkgnd = 0; + } + return S_OK; } /*****************************************************************************/ Modified: branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/CISFBand.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/shellext/reactos/dll/… ============================================================================== --- branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/CISFBand.h [iso-8859-1] (original) +++ branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/CISFBand.h [iso-8859-1] Mon Jun 19 19:19:10 2017 @@ -19,7 +19,8 @@ public IOleCommandTarget { HINSTANCE m_hInstance; - CComPtr<IUnknown> m_Site; + CComPtr<IUnknown> m_Site; + CComPtr<IShellFolder> m_pISF; HWND m_hWnd; HWND m_hWndStartButton; DWORD m_BandID;

7 years, 3 months

[hbelusca] 75136: [NTOS]: Fix the ObpLookupObjectName() prototype in regard to r75133.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Mon Jun 19 16:47:45 2017 New Revision: 75136 URL: http://svn.reactos.org/svn/reactos?rev=75136&view=rev Log: [NTOS]: Fix the ObpLookupObjectName() prototype in regard to r75133. Modified: trunk/reactos/ntoskrnl/include/internal/ob.h trunk/reactos/ntoskrnl/ob/obname.c Modified: trunk/reactos/ntoskrnl/include/internal/ob.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ob.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/ob.h [iso-8859-1] Mon Jun 19 16:47:45 2017 @@ -268,16 +268,16 @@ NTSTATUS NTAPI ObpLookupObjectName( - IN HANDLE RootHandle, - IN PUNICODE_STRING ObjectName, + IN HANDLE RootHandle OPTIONAL, + IN OUT PUNICODE_STRING ObjectName, IN ULONG Attributes, IN POBJECT_TYPE ObjectType, IN KPROCESSOR_MODE AccessMode, IN OUT PVOID ParseContext, - IN PSECURITY_QUALITY_OF_SERVICE SecurityQos, - IN PVOID InsertObject, - IN PACCESS_STATE AccessState, - IN POBP_LOOKUP_CONTEXT LookupContext, + IN PSECURITY_QUALITY_OF_SERVICE SecurityQos OPTIONAL, + IN PVOID InsertObject OPTIONAL, + IN OUT PACCESS_STATE AccessState, + OUT POBP_LOOKUP_CONTEXT LookupContext, OUT PVOID *FoundObject ); Modified: trunk/reactos/ntoskrnl/ob/obname.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/obname.c?rev=7… ============================================================================== --- trunk/reactos/ntoskrnl/ob/obname.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ob/obname.c [iso-8859-1] Mon Jun 19 16:47:45 2017 @@ -356,7 +356,7 @@ NTSTATUS NTAPI ObpLookupObjectName(IN HANDLE RootHandle OPTIONAL, - IN PUNICODE_STRING ObjectName, + IN OUT PUNICODE_STRING ObjectName, IN ULONG Attributes, IN POBJECT_TYPE ObjectType, IN KPROCESSOR_MODE AccessMode,

7 years, 3 months

[mjansen] 75135: [APPHELP] Implement Sdb[Un]packAppCompatData and SdbGetAppCompatDataSize. CORE-13284

by mjansen＠svn.reactos.org

Author: mjansen Date: Mon Jun 19 16:37:47 2017 New Revision: 75135 URL: http://svn.reactos.org/svn/reactos?rev=75135&view=rev Log: [APPHELP] Implement Sdb[Un]packAppCompatData and SdbGetAppCompatDataSize. CORE-13284 Modified: trunk/reactos/dll/appcompat/apphelp/apphelp.spec trunk/reactos/dll/appcompat/apphelp/hsdb.c Modified: trunk/reactos/dll/appcompat/apphelp/apphelp.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/appcompat/apphelp/apph… ============================================================================== --- trunk/reactos/dll/appcompat/apphelp/apphelp.spec [iso-8859-1] (original) +++ trunk/reactos/dll/appcompat/apphelp/apphelp.spec [iso-8859-1] Mon Jun 19 16:37:47 2017 @@ -51,7 +51,7 @@ @ stdcall SdbFreeFileAttributes(ptr) @ stub SdbFreeFileInfo @ stub SdbFreeFlagInfo -@ stub SdbGetAppCompatDataSize +@ stdcall SdbGetAppCompatDataSize(ptr) @ stdcall SdbGetAppPatchDir(ptr wstr long) @ stdcall SdbGetBinaryTagData(ptr long) @ stdcall SdbGetDatabaseID(ptr ptr) @@ -103,7 +103,8 @@ @ stdcall SdbOpenDatabase(wstr long) @ stub SdbOpenDbFromGuid @ stub SdbOpenLocalDatabase -@ stub SdbPackAppCompatData +@ stdcall SdbPackAppCompatData(ptr ptr ptr ptr) +@ stdcall SdbUnpackAppCompatData(ptr wstr ptr ptr) @ stub SdbQueryApphelpInformation @ stub SdbQueryBlockUpgrade @ stub SdbQueryContext Modified: trunk/reactos/dll/appcompat/apphelp/hsdb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/appcompat/apphelp/hsdb… ============================================================================== --- trunk/reactos/dll/appcompat/apphelp/hsdb.c [iso-8859-1] (original) +++ trunk/reactos/dll/appcompat/apphelp/hsdb.c [iso-8859-1] Mon Jun 19 16:37:47 2017 @@ -29,6 +29,19 @@ #define MAX_LAYER_LENGTH 256 #define GPLK_USER 1 #define GPLK_MACHINE 2 + +typedef struct _ShimData +{ + WCHAR szModule[MAX_PATH]; + DWORD dwSize; + DWORD dwMagic; + SDBQUERYRESULT Query; + WCHAR szLayer[MAX_LAYER_LENGTH]; + DWORD unknown; // 0x14c +} ShimData; + +#define SHIMDATA_MAGIC 0xAC0DEDAB + static BOOL WINAPI SdbpFileExists(LPCWSTR path) { @@ -554,3 +567,79 @@ +BOOL WINAPI SdbPackAppCompatData(HSDB hsdb, PSDBQUERYRESULT pQueryResult, PVOID* ppData, DWORD *pdwSize) +{ + ShimData* pData; + HRESULT hr; + DWORD n; + + if (!pQueryResult || !ppData || !pdwSize) + { + SHIM_WARN("Invalid params: %p, %p, %p\n", pQueryResult, ppData, pdwSize); + return FALSE; + } + + pData = RtlAllocateHeap(RtlGetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(ShimData)); + if (!pData) + { + SHIM_WARN("Unable to allocate %d bytes\n", sizeof(ShimData)); + return FALSE; + } + + GetWindowsDirectoryW(pData->szModule, _countof(pData->szModule)); + hr = StringCchCatW(pData->szModule, _countof(pData->szModule), L"\\system32\\apphelp.dll"); + if (!SUCCEEDED(hr)) + { + SHIM_ERR("Unable to append module name (0x%x)\n", hr); + RtlFreeHeap(RtlGetProcessHeap(), 0, pData); + return FALSE; + } + + pData->dwSize = sizeof(*pData); + pData->dwMagic = SHIMDATA_MAGIC; + pData->Query = *pQueryResult; + pData->unknown = 0; + pData->szLayer[0] = UNICODE_NULL; /* TODO */ + + SHIM_INFO("\ndwFlags 0x%x\ndwMagic 0x%x\ntrExe 0x%x\ntrLayer 0x%x", + pData->Query.dwFlags, pData->dwMagic, pData->Query.atrExes[0], pData->Query.atrLayers[0]); + + /* Database List */ + /* 0x0 {GUID} NAME */ + + for (n = 0; n < pQueryResult->dwLayerCount; ++n) + { + SHIM_INFO("Layer 0x%x\n", pQueryResult->atrLayers[n]); + } + + *ppData = pData; + *pdwSize = pData->dwSize; + + return TRUE; +} + +BOOL WINAPI SdbUnpackAppCompatData(HSDB hsdb, LPCWSTR pszImageName, PVOID pData, PSDBQUERYRESULT pQueryResult) +{ + ShimData* pShimData = pData; + + if (!pShimData || pShimData->dwMagic != SHIMDATA_MAGIC || pShimData->dwSize < sizeof(ShimData)) + return FALSE; + + if (!pQueryResult) + return FALSE; + + /* szLayer? */ + + *pQueryResult = pShimData->Query; + return TRUE; +} + +DWORD WINAPI SdbGetAppCompatDataSize(ShimData* pData) +{ + if (!pData || pData->dwMagic != SHIMDATA_MAGIC) + return 0; + + + return pData->dwSize; +} +

7 years, 3 months

[hbelusca] 75134: [NTOS]: Avoid initializing variables within if-conditions.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Mon Jun 19 16:30:17 2017 New Revision: 75134 URL: http://svn.reactos.org/svn/reactos?rev=75134&view=rev Log: [NTOS]: Avoid initializing variables within if-conditions. Modified: trunk/reactos/ntoskrnl/ob/oblife.c Modified: trunk/reactos/ntoskrnl/ob/oblife.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/oblife.c?rev=7… ============================================================================== --- trunk/reactos/ntoskrnl/ob/oblife.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ob/oblife.c [iso-8859-1] Mon Jun 19 16:30:17 2017 @@ -405,7 +405,8 @@ } /* Make sure there really is a string */ - if ((StringLength = LocalName.Length)) + StringLength = LocalName.Length; + if (StringLength) { /* Check that the size is a valid WCHAR multiple */ if ((StringLength & (sizeof(WCHAR) - 1)) ||

7 years, 3 months

[hbelusca] 75133: [NTOS]: Revert the pool tag change from r75128, and explain in comment why we cannot actually use it.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Mon Jun 19 16:29:44 2017 New Revision: 75133 URL: http://svn.reactos.org/svn/reactos?rev=75133&view=rev Log: [NTOS]: Revert the pool tag change from r75128, and explain in comment why we cannot actually use it. Modified: trunk/reactos/ntoskrnl/ob/oblife.c Modified: trunk/reactos/ntoskrnl/ob/oblife.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/oblife.c?rev=7… ============================================================================== --- trunk/reactos/ntoskrnl/ob/oblife.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ob/oblife.c [iso-8859-1] Mon Jun 19 16:29:44 2017 @@ -351,8 +351,19 @@ /* We know this is a pool-allocation if the size doesn't match */ if (Name->MaximumLength != OBP_NAME_LOOKASIDE_MAX_SIZE) { - /* Free it from the pool */ - ExFreePoolWithTag(Buffer, OB_NAME_TAG); + /* + * Free it from the pool. + * + * We cannot use here ExFreePoolWithTag(..., OB_NAME_TAG); , because + * the object name may have been massaged during operation by different + * object parse routines. If the latter ones have to resolve a symbolic + * link (e.g. as is done by CmpParseKey() and CmpGetSymbolicLink()), + * the original object name is freed and re-allocated from the pool, + * possibly with a different pool tag. At the end of the day, the new + * object name can be reallocated and completely different, but we + * should still be able to free it! + */ + ExFreePool(Buffer); } else {

7 years, 3 months

[hbelusca] 75132: [NTOS]: Fix typos.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Mon Jun 19 15:26:08 2017 New Revision: 75132 URL: http://svn.reactos.org/svn/reactos?rev=75132&view=rev Log: [NTOS]: Fix typos. Modified: trunk/reactos/ntoskrnl/include/internal/ob_x.h trunk/reactos/ntoskrnl/include/internal/ps_x.h Modified: trunk/reactos/ntoskrnl/include/internal/ob_x.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ob_x.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/ob_x.h [iso-8859-1] Mon Jun 19 15:26:08 2017 @@ -2,7 +2,7 @@ * PROJECT: ReactOS Kernel * LICENSE: GPL - See COPYING in the top level directory * FILE: ntoskrnl/include/internal/ob_x.h -* PURPOSE: Intenral Inlined Functions for the Object Manager +* PURPOSE: Internal Inlined Functions for the Object Manager * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) */ Modified: trunk/reactos/ntoskrnl/include/internal/ps_x.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ps_x.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/ps_x.h [iso-8859-1] Mon Jun 19 15:26:08 2017 @@ -2,7 +2,7 @@ * PROJECT: ReactOS Kernel * LICENSE: GPL - See COPYING in the top level directory * FILE: ntoskrnl/include/internal/ps_x.h -* PURPOSE: Intenral Inlined Functions for the Process Manager +* PURPOSE: Internal Inlined Functions for the Process Manager * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) * Thomas Weidenmueller (w3seek(a)reactos.org) */

7 years, 3 months

← Newer
1
...
9
10
11
12
13
14
15
...
53
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 June 2017