Ros-diffs July 2017

ros-diffs@reactos.org

19 participants
213 discussions

[pschweitzer] 75354: [RDBSS] Complementary to r75353: implement RxCancelNotifyChangeDirectoryRequestsForFobx() CORE-11327

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Sat Jul 15 11:41:24 2017 New Revision: 75354 URL: http://svn.reactos.org/svn/reactos?rev=75354&view=rev Log: [RDBSS] Complementary to r75353: implement RxCancelNotifyChangeDirectoryRequestsForFobx() CORE-11327 Modified: trunk/reactos/sdk/lib/drivers/rdbsslib/rdbss.c Modified: trunk/reactos/sdk/lib/drivers/rdbsslib/rdbss.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/drivers/rdbsslib/r… ============================================================================== --- trunk/reactos/sdk/lib/drivers/rdbsslib/rdbss.c [iso-8859-1] (original) +++ trunk/reactos/sdk/lib/drivers/rdbsslib/rdbss.c [iso-8859-1] Sat Jul 15 11:41:24 2017 @@ -906,11 +906,81 @@ return STATUS_SUCCESS; } +/* + * @implemented + */ VOID RxCancelNotifyChangeDirectoryRequestsForFobx( PFOBX Fobx) { - UNIMPLEMENTED; + KIRQL OldIrql; + PLIST_ENTRY Entry; + PRX_CONTEXT Context; + LIST_ENTRY ContextsToCancel; + + /* Init a list for the contexts to cancel */ + InitializeListHead(&ContextsToCancel); + + /* Lock our list lock */ + KeAcquireSpinLock(&RxStrucSupSpinLock, &OldIrql); + + /* Now, browse all the active contexts, to find the associated ones */ + Entry = RxActiveContexts.Flink; + while (Entry != &RxActiveContexts) + { + Context = CONTAINING_RECORD(Entry, RX_CONTEXT, ContextListEntry); + Entry = Entry->Flink; + + /* Not the IRP we're looking for, ignore */ + if (Context->MajorFunction != IRP_MJ_DIRECTORY_CONTROL || + Context->MinorFunction != IRP_MN_NOTIFY_CHANGE_DIRECTORY) + { + continue; + } + + /* Not the FOBX we're looking for, ignore */ + if ((PFOBX)Context->pFobx != Fobx) + { + continue; + } + + /* No cancel routine (can't be cancel, then), ignore */ + if (Context->MRxCancelRoutine == NULL) + { + continue; + } + + /* Mark our context as cancelled */ + SetFlag(Context->Flags, RX_CONTEXT_FLAG_CANCELLED); + + /* Move it to our list */ + RemoveEntryList(&Context->ContextListEntry); + InsertTailList(&ContextsToCancel, &Context->ContextListEntry); + + InterlockedIncrement((volatile long *)&Context->ReferenceCount); + } + + /* Done with the contexts */ + KeReleaseSpinLock(&RxStrucSupSpinLock, OldIrql); + + /* Now, handle all our "extracted" contexts */ + while (!IsListEmpty(&ContextsToCancel)) + { + Entry = RemoveHeadList(&ContextsToCancel); + Context = CONTAINING_RECORD(Entry, RX_CONTEXT, ContextListEntry); + + /* If they had an associated IRP (should be always true) */ + if (Context->CurrentIrp != NULL) + { + /* Then, call cancel routine */ + ASSERT(Context->MRxCancelRoutine != NULL); + DPRINT1("Canceling %p with %p\n", Context, Context->MRxCancelRoutine); + Context->MRxCancelRoutine(Context); + } + + /* And delete the context */ + RxDereferenceAndDeleteRxContext(Context); + } } /*

7 years, 3 months

[pschweitzer] 75353: [RDBSS] Implement RxNotifyChangeDirectory(), RxLowIoNotifyChangeDirectoryCompletion(), RxCancelNotifyChangeDirectoryRequestsForVNetRoot() This means the first parts of the dire...

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Sat Jul 15 10:05:32 2017 New Revision: 75353 URL: http://svn.reactos.org/svn/reactos?rev=75353&view=rev Log: [RDBSS] Implement RxNotifyChangeDirectory(), RxLowIoNotifyChangeDirectoryCompletion(), RxCancelNotifyChangeDirectoryRequestsForVNetRoot() This means the first parts of the directory watch are here. Though, NFS driver doesn't support these, but at least, it reduces the UNIMPLEMENTED spam! CORE-11327 Modified: trunk/reactos/sdk/include/ddk/mrx.h trunk/reactos/sdk/lib/drivers/rdbsslib/rdbss.c Modified: trunk/reactos/sdk/include/ddk/mrx.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/ddk/mrx.h?rev=… ============================================================================== --- trunk/reactos/sdk/include/ddk/mrx.h [iso-8859-1] (original) +++ trunk/reactos/sdk/include/ddk/mrx.h [iso-8859-1] Sat Jul 15 10:05:32 2017 @@ -1,5 +1,8 @@ #ifndef _RXMINIRDR_ #define _RXMINIRDR_ + +#define RxSetIoStatusStatus(R, S) (R)->CurrentIrp->IoStatus.Status = (S) +#define RxSetIoStatusInfo(R, I) (R)->CurrentIrp->IoStatus.Information = (I) #define RxShouldPostCompletion() ((KeGetCurrentIrql() >= DISPATCH_LEVEL)) Modified: trunk/reactos/sdk/lib/drivers/rdbsslib/rdbss.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/drivers/rdbsslib/r… ============================================================================== --- trunk/reactos/sdk/lib/drivers/rdbsslib/rdbss.c [iso-8859-1] (original) +++ trunk/reactos/sdk/lib/drivers/rdbsslib/rdbss.c [iso-8859-1] Sat Jul 15 10:05:32 2017 @@ -913,13 +913,100 @@ UNIMPLEMENTED; } +/* + * @implemented + */ NTSTATUS RxCancelNotifyChangeDirectoryRequestsForVNetRoot( PV_NET_ROOT VNetRoot, BOOLEAN ForceFilesClosed) { - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; + KIRQL OldIrql; + NTSTATUS Status; + PLIST_ENTRY Entry; + PRX_CONTEXT Context; + LIST_ENTRY ContextsToCancel; + + /* Init a list for the contexts to cancel */ + InitializeListHead(&ContextsToCancel); + + /* Lock our list lock */ + KeAcquireSpinLock(&RxStrucSupSpinLock, &OldIrql); + + /* Now, browse all the active contexts, to find the associated ones */ + Entry = RxActiveContexts.Flink; + while (Entry != &RxActiveContexts) + { + Context = CONTAINING_RECORD(Entry, RX_CONTEXT, ContextListEntry); + Entry = Entry->Flink; + + /* Not the IRP we're looking for, ignore */ + if (Context->MajorFunction != IRP_MJ_DIRECTORY_CONTROL || + Context->MinorFunction != IRP_MN_NOTIFY_CHANGE_DIRECTORY) + { + continue; + } + + /* Not the VNetRoot we're looking for, ignore */ + if (Context->pFcb == NULL || + (PV_NET_ROOT)Context->NotifyChangeDirectory.pVNetRoot != VNetRoot) + { + continue; + } + + /* No cancel routine (can't be cancel, then), ignore */ + if (Context->MRxCancelRoutine == NULL) + { + continue; + } + + /* At that point, we found a matching context + * If we're not asked to force close, then fail - it's still open + */ + if (!ForceFilesClosed) + { + Status = STATUS_FILES_OPEN; + break; + } + + /* Mark our context as cancelled */ + SetFlag(Context->Flags, RX_CONTEXT_FLAG_CANCELLED); + + /* Move it to our list */ + RemoveEntryList(&Context->ContextListEntry); + InsertTailList(&ContextsToCancel, &Context->ContextListEntry); + + InterlockedIncrement((volatile long *)&Context->ReferenceCount); + } + + /* Done with the contexts */ + KeReleaseSpinLock(&RxStrucSupSpinLock, OldIrql); + + if (Status != STATUS_SUCCESS) + { + return Status; + } + + /* Now, handle all our "extracted" contexts */ + while (!IsListEmpty(&ContextsToCancel)) + { + Entry = RemoveHeadList(&ContextsToCancel); + Context = CONTAINING_RECORD(Entry, RX_CONTEXT, ContextListEntry); + + /* If they had an associated IRP (should be always true) */ + if (Context->CurrentIrp != NULL) + { + /* Then, call cancel routine */ + ASSERT(Context->MRxCancelRoutine != NULL); + DPRINT1("Canceling %p with %p\n", Context, Context->MRxCancelRoutine); + Context->MRxCancelRoutine(Context); + } + + /* And delete the context */ + RxDereferenceAndDeleteRxContext(Context); + } + + return Status; } VOID @@ -5329,6 +5416,25 @@ * @implemented */ NTSTATUS +NTAPI +RxLowIoNotifyChangeDirectoryCompletion( + PRX_CONTEXT RxContext) +{ + PAGED_CODE(); + + DPRINT("Completing NCD with: %lx, %lx\n", RxContext->IoStatusBlock.Status, RxContext->IoStatusBlock.Information); + + /* Just copy back the IO_STATUS to the IRP */ + RxSetIoStatusStatus(RxContext, RxContext->IoStatusBlock.Status); + RxSetIoStatusInfo(RxContext, RxContext->IoStatusBlock.Information); + + return RxContext->IoStatusBlock.Status; +} + +/* + * @implemented + */ +NTSTATUS RxLowIoReadShell( PRX_CONTEXT RxContext) { @@ -5469,12 +5575,63 @@ return Status; } +/* + * @implemented + */ NTSTATUS RxNotifyChangeDirectory( PRX_CONTEXT RxContext) { - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; + PIRP Irp; + NTSTATUS Status; + PIO_STACK_LOCATION Stack; + + PAGED_CODE(); + + /* The IRP can abviously wait */ + SetFlag(RxContext->Flags, RX_CONTEXT_FLAG_WAIT); + + /* Initialize its lowio */ + RxInitializeLowIoContext(&RxContext->LowIoContext, LOWIO_OP_NOTIFY_CHANGE_DIRECTORY); + + _SEH2_TRY + { + /* Lock user buffer */ + Stack = RxContext->CurrentIrpSp; + RxLockUserBuffer(RxContext, IoWriteAccess, Stack->Parameters.NotifyDirectory.Length); + + /* Copy parameters from IO_STACK */ + RxContext->LowIoContext.ParamsFor.NotifyChangeDirectory.WatchTree = BooleanFlagOn(Stack->Flags, SL_WATCH_TREE); + RxContext->LowIoContext.ParamsFor.NotifyChangeDirectory.CompletionFilter = Stack->Parameters.NotifyDirectory.CompletionFilter; + RxContext->LowIoContext.ParamsFor.NotifyChangeDirectory.NotificationBufferLength = Stack->Parameters.NotifyDirectory.Length; + + /* If we have an associated MDL */ + Irp = RxContext->CurrentIrp; + if (Irp->MdlAddress != NULL) + { + /* Then, call mini-rdr */ + RxContext->LowIoContext.ParamsFor.NotifyChangeDirectory.pNotificationBuffer = MmGetSystemAddressForMdlSafe(Irp->MdlAddress, NormalPagePriority); + if (RxContext->LowIoContext.ParamsFor.NotifyChangeDirectory.pNotificationBuffer != NULL) + { + Status = RxLowIoSubmit(RxContext, RxLowIoNotifyChangeDirectoryCompletion); + } + else + { + Status = STATUS_INSUFFICIENT_RESOURCES; + } + } + else + { + Status = STATUS_INVALID_PARAMETER; + } + } + _SEH2_FINALLY + { + /* All correct */ + } + _SEH2_END; + + return Status; } NTSTATUS

7 years, 3 months

[gadamopoulos] 75352: [SHELL32] -Move CFSExtractIcon_CreateInstance to CFSFolder.cpp

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Sat Jul 15 09:38:45 2017 New Revision: 75352 URL: http://svn.reactos.org/svn/reactos?rev=75352&view=rev Log: [SHELL32] -Move CFSExtractIcon_CreateInstance to CFSFolder.cpp Modified: trunk/reactos/dll/win32/shell32/folders.cpp trunk/reactos/dll/win32/shell32/folders/CFSFolder.cpp trunk/reactos/dll/win32/shell32/wine/shell32_main.h Modified: trunk/reactos/dll/win32/shell32/folders.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders.… ============================================================================== --- trunk/reactos/dll/win32/shell32/folders.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/folders.cpp [iso-8859-1] Sat Jul 15 09:38:45 2017 @@ -25,69 +25,6 @@ DWORD NumIconOverlayHandlers = 0; IShellIconOverlayIdentifier ** Handlers = NULL; - -static HRESULT getIconLocationForFolder(IShellFolder * psf, LPCITEMIDLIST pidl, UINT uFlags, - LPWSTR szIconFile, UINT cchMax, int *piIndex, UINT *pwFlags) -{ - static const WCHAR shellClassInfo[] = { '.', 'S', 'h', 'e', 'l', 'l', 'C', 'l', 'a', 's', 's', 'I', 'n', 'f', 'o', 0 }; - static const WCHAR iconFile[] = { 'I', 'c', 'o', 'n', 'F', 'i', 'l', 'e', 0 }; - static const WCHAR clsid[] = { 'C', 'L', 'S', 'I', 'D', 0 }; - static const WCHAR clsid2[] = { 'C', 'L', 'S', 'I', 'D', '2', 0 }; - static const WCHAR iconIndex[] = { 'I', 'c', 'o', 'n', 'I', 'n', 'd', 'e', 'x', 0 }; - static const WCHAR wszDesktopIni[] = { 'd','e','s','k','t','o','p','.','i','n','i',0 }; - int icon_idx; - - if (!(uFlags & GIL_DEFAULTICON) && (_ILGetFileAttributes(ILFindLastID(pidl), NULL, 0) & (FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_READONLY)) != 0 ) - { - WCHAR wszFolderPath[MAX_PATH]; - - if (!ILGetDisplayNameExW(psf, pidl, wszFolderPath, 0)) - return FALSE; - - PathAppendW(wszFolderPath, wszDesktopIni); - - if (PathFileExistsW(wszFolderPath)) - { - WCHAR wszPath[MAX_PATH]; - WCHAR wszCLSIDValue[CHARS_IN_GUID]; - - if (GetPrivateProfileStringW(shellClassInfo, iconFile, NULL, wszPath, MAX_PATH, wszFolderPath)) - { - ExpandEnvironmentStringsW(wszPath, szIconFile, cchMax); - - *piIndex = GetPrivateProfileIntW(shellClassInfo, iconIndex, 0, wszFolderPath); - return S_OK; - } - else if (GetPrivateProfileStringW(shellClassInfo, clsid, NULL, wszCLSIDValue, CHARS_IN_GUID, wszFolderPath) && - HCR_GetIconW(wszCLSIDValue, szIconFile, NULL, cchMax, &icon_idx)) - { - *piIndex = icon_idx; - return S_OK; - } - else if (GetPrivateProfileStringW(shellClassInfo, clsid2, NULL, wszCLSIDValue, CHARS_IN_GUID, wszFolderPath) && - HCR_GetIconW(wszCLSIDValue, szIconFile, NULL, cchMax, &icon_idx)) - { - *piIndex = icon_idx; - return S_OK; - } - } - } - - static const WCHAR folder[] = { 'F', 'o', 'l', 'd', 'e', 'r', 0 }; - - if (!HCR_GetIconW(folder, szIconFile, NULL, cchMax, &icon_idx)) - { - lstrcpynW(szIconFile, swShell32Name, cchMax); - icon_idx = -IDI_SHELL_FOLDER; - } - - if (uFlags & GIL_OPENICON) - *piIndex = icon_idx < 0 ? icon_idx - 1 : icon_idx + 1; - else - *piIndex = icon_idx; - - return S_OK; -} static void InitIconOverlays(void) { @@ -195,109 +132,3 @@ else return FALSE; } - -HRESULT CFSExtractIcon_CreateInstance(IShellFolder * psf, LPCITEMIDLIST pidl, REFIID iid, LPVOID * ppvOut) -{ - CComPtr<IDefaultExtractIconInit> initIcon; - HRESULT hr; - int icon_idx = 0; - UINT flags = 0; // FIXME: Use it! - CHAR sTemp[MAX_PATH] = ""; - WCHAR wTemp[MAX_PATH] = L""; - - hr = SHCreateDefaultExtractIcon(IID_PPV_ARG(IDefaultExtractIconInit,&initIcon)); - if (FAILED(hr)) - return hr; - - if (_ILIsFolder (pidl)) - { - if (SUCCEEDED(getIconLocationForFolder(psf, - pidl, 0, wTemp, _countof(wTemp), - &icon_idx, - &flags))) - { - initIcon->SetNormalIcon(wTemp, icon_idx); - // FIXME: if/when getIconLocationForFolder does something for - // GIL_FORSHORTCUT, code below should be uncommented. and - // the following line removed. - initIcon->SetShortcutIcon(wTemp, icon_idx); - } - if (SUCCEEDED(getIconLocationForFolder(psf, - pidl, GIL_DEFAULTICON, wTemp, _countof(wTemp), - &icon_idx, - &flags))) - { - initIcon->SetDefaultIcon(wTemp, icon_idx); - } - // if (SUCCEEDED(getIconLocationForFolder(psf, - // pidl, GIL_FORSHORTCUT, wTemp, _countof(wTemp), - // &icon_idx, - // &flags))) - // { - // initIcon->SetShortcutIcon(wTemp, icon_idx); - // } - if (SUCCEEDED(getIconLocationForFolder(psf, - pidl, GIL_OPENICON, wTemp, _countof(wTemp), - &icon_idx, - &flags))) - { - initIcon->SetOpenIcon(wTemp, icon_idx); - } - } - else - { - BOOL found = FALSE; - - if (_ILGetExtension(pidl, sTemp, _countof(sTemp))) - { - if (HCR_MapTypeToValueA(sTemp, sTemp, _countof(sTemp), TRUE) - && HCR_GetIconA(sTemp, sTemp, NULL, _countof(sTemp), &icon_idx)) - { - if (!lstrcmpA("%1", sTemp)) /* icon is in the file */ - { - ILGetDisplayNameExW(psf, pidl, wTemp, 0); - icon_idx = 0; - } - else - { - MultiByteToWideChar(CP_ACP, 0, sTemp, -1, wTemp, _countof(wTemp)); - } - - found = TRUE; - } - else if (!lstrcmpiA(sTemp, "lnkfile")) - { - /* extract icon from shell shortcut */ - CComPtr<IShellLinkW> psl; - CComPtr<IExtractIconW> pei; - - HRESULT hr = psf->GetUIObjectOf(NULL, 1, &pidl, IID_NULL_PPV_ARG(IShellLinkW, &psl)); - if (SUCCEEDED(hr)) - { - hr = psl->GetIconLocation(wTemp, _countof(wTemp), &icon_idx); - if (FAILED(hr) || !*wTemp) - { - /* The icon was not found directly, try to retrieve it from the shell link target */ - hr = psl->QueryInterface(IID_PPV_ARG(IExtractIconW, &pei)); - if (FAILED(hr) || !pei) - TRACE("No IExtractIconW interface!\n"); - else - hr = pei->GetIconLocation(GIL_FORSHELL, wTemp, _countof(wTemp), &icon_idx, &flags); - } - - if (SUCCEEDED(hr) && *wTemp) - found = TRUE; - } - } - } - - /* FIXME: We should normally use the correct icon format according to 'flags' */ - if (!found) - /* default icon */ - initIcon->SetNormalIcon(swShell32Name, 0); - else - initIcon->SetNormalIcon(wTemp, icon_idx); - } - - return initIcon->QueryInterface(iid, ppvOut); -} Modified: trunk/reactos/dll/win32/shell32/folders/CFSFolder.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/… ============================================================================== --- trunk/reactos/dll/win32/shell32/folders/CFSFolder.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/folders/CFSFolder.cpp [iso-8859-1] Sat Jul 15 09:38:45 2017 @@ -23,6 +23,175 @@ #include <precomp.h> WINE_DEFAULT_DEBUG_CHANNEL (shell); + +static HRESULT getIconLocationForFolder(IShellFolder * psf, LPCITEMIDLIST pidl, UINT uFlags, + LPWSTR szIconFile, UINT cchMax, int *piIndex, UINT *pwFlags) +{ + static const WCHAR shellClassInfo[] = { '.', 'S', 'h', 'e', 'l', 'l', 'C', 'l', 'a', 's', 's', 'I', 'n', 'f', 'o', 0 }; + static const WCHAR iconFile[] = { 'I', 'c', 'o', 'n', 'F', 'i', 'l', 'e', 0 }; + static const WCHAR clsid[] = { 'C', 'L', 'S', 'I', 'D', 0 }; + static const WCHAR clsid2[] = { 'C', 'L', 'S', 'I', 'D', '2', 0 }; + static const WCHAR iconIndex[] = { 'I', 'c', 'o', 'n', 'I', 'n', 'd', 'e', 'x', 0 }; + static const WCHAR wszDesktopIni[] = { 'd','e','s','k','t','o','p','.','i','n','i',0 }; + int icon_idx; + + if (!(uFlags & GIL_DEFAULTICON) && (_ILGetFileAttributes(ILFindLastID(pidl), NULL, 0) & (FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_READONLY)) != 0 ) + { + WCHAR wszFolderPath[MAX_PATH]; + + if (!ILGetDisplayNameExW(psf, pidl, wszFolderPath, 0)) + return FALSE; + + PathAppendW(wszFolderPath, wszDesktopIni); + + if (PathFileExistsW(wszFolderPath)) + { + WCHAR wszPath[MAX_PATH]; + WCHAR wszCLSIDValue[CHARS_IN_GUID]; + + if (GetPrivateProfileStringW(shellClassInfo, iconFile, NULL, wszPath, MAX_PATH, wszFolderPath)) + { + ExpandEnvironmentStringsW(wszPath, szIconFile, cchMax); + + *piIndex = GetPrivateProfileIntW(shellClassInfo, iconIndex, 0, wszFolderPath); + return S_OK; + } + else if (GetPrivateProfileStringW(shellClassInfo, clsid, NULL, wszCLSIDValue, CHARS_IN_GUID, wszFolderPath) && + HCR_GetIconW(wszCLSIDValue, szIconFile, NULL, cchMax, &icon_idx)) + { + *piIndex = icon_idx; + return S_OK; + } + else if (GetPrivateProfileStringW(shellClassInfo, clsid2, NULL, wszCLSIDValue, CHARS_IN_GUID, wszFolderPath) && + HCR_GetIconW(wszCLSIDValue, szIconFile, NULL, cchMax, &icon_idx)) + { + *piIndex = icon_idx; + return S_OK; + } + } + } + + static const WCHAR folder[] = { 'F', 'o', 'l', 'd', 'e', 'r', 0 }; + + if (!HCR_GetIconW(folder, szIconFile, NULL, cchMax, &icon_idx)) + { + lstrcpynW(szIconFile, swShell32Name, cchMax); + icon_idx = -IDI_SHELL_FOLDER; + } + + if (uFlags & GIL_OPENICON) + *piIndex = icon_idx < 0 ? icon_idx - 1 : icon_idx + 1; + else + *piIndex = icon_idx; + + return S_OK; +} + +HRESULT CFSExtractIcon_CreateInstance(IShellFolder * psf, LPCITEMIDLIST pidl, REFIID iid, LPVOID * ppvOut) +{ + CComPtr<IDefaultExtractIconInit> initIcon; + HRESULT hr; + int icon_idx = 0; + UINT flags = 0; // FIXME: Use it! + CHAR sTemp[MAX_PATH] = ""; + WCHAR wTemp[MAX_PATH] = L""; + + hr = SHCreateDefaultExtractIcon(IID_PPV_ARG(IDefaultExtractIconInit,&initIcon)); + if (FAILED(hr)) + return hr; + + if (_ILIsFolder (pidl)) + { + if (SUCCEEDED(getIconLocationForFolder(psf, + pidl, 0, wTemp, _countof(wTemp), + &icon_idx, + &flags))) + { + initIcon->SetNormalIcon(wTemp, icon_idx); + // FIXME: if/when getIconLocationForFolder does something for + // GIL_FORSHORTCUT, code below should be uncommented. and + // the following line removed. + initIcon->SetShortcutIcon(wTemp, icon_idx); + } + if (SUCCEEDED(getIconLocationForFolder(psf, + pidl, GIL_DEFAULTICON, wTemp, _countof(wTemp), + &icon_idx, + &flags))) + { + initIcon->SetDefaultIcon(wTemp, icon_idx); + } + // if (SUCCEEDED(getIconLocationForFolder(psf, + // pidl, GIL_FORSHORTCUT, wTemp, _countof(wTemp), + // &icon_idx, + // &flags))) + // { + // initIcon->SetShortcutIcon(wTemp, icon_idx); + // } + if (SUCCEEDED(getIconLocationForFolder(psf, + pidl, GIL_OPENICON, wTemp, _countof(wTemp), + &icon_idx, + &flags))) + { + initIcon->SetOpenIcon(wTemp, icon_idx); + } + } + else + { + BOOL found = FALSE; + + if (_ILGetExtension(pidl, sTemp, _countof(sTemp))) + { + if (HCR_MapTypeToValueA(sTemp, sTemp, _countof(sTemp), TRUE) + && HCR_GetIconA(sTemp, sTemp, NULL, _countof(sTemp), &icon_idx)) + { + if (!lstrcmpA("%1", sTemp)) /* icon is in the file */ + { + ILGetDisplayNameExW(psf, pidl, wTemp, 0); + icon_idx = 0; + } + else + { + MultiByteToWideChar(CP_ACP, 0, sTemp, -1, wTemp, _countof(wTemp)); + } + + found = TRUE; + } + else if (!lstrcmpiA(sTemp, "lnkfile")) + { + /* extract icon from shell shortcut */ + CComPtr<IShellLinkW> psl; + CComPtr<IExtractIconW> pei; + + HRESULT hr = psf->GetUIObjectOf(NULL, 1, &pidl, IID_NULL_PPV_ARG(IShellLinkW, &psl)); + if (SUCCEEDED(hr)) + { + hr = psl->GetIconLocation(wTemp, _countof(wTemp), &icon_idx); + if (FAILED(hr) || !*wTemp) + { + /* The icon was not found directly, try to retrieve it from the shell link target */ + hr = psl->QueryInterface(IID_PPV_ARG(IExtractIconW, &pei)); + if (FAILED(hr) || !pei) + TRACE("No IExtractIconW interface!\n"); + else + hr = pei->GetIconLocation(GIL_FORSHELL, wTemp, _countof(wTemp), &icon_idx, &flags); + } + + if (SUCCEEDED(hr) && *wTemp) + found = TRUE; + } + } + } + + /* FIXME: We should normally use the correct icon format according to 'flags' */ + if (!found) + /* default icon */ + initIcon->SetNormalIcon(swShell32Name, 0); + else + initIcon->SetNormalIcon(wTemp, icon_idx); + } + + return initIcon->QueryInterface(iid, ppvOut); +} /* CFileSysEnum should do an initial FindFirstFile and do a FindNextFile as each file is Modified: trunk/reactos/dll/win32/shell32/wine/shell32_main.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/wine/she… ============================================================================== --- trunk/reactos/dll/win32/shell32/wine/shell32_main.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/wine/shell32_main.h [iso-8859-1] Sat Jul 15 09:38:45 2017 @@ -77,8 +77,6 @@ HRESULT WINAPI IFileSystemBindData_Constructor(const WIN32_FIND_DATAW *pfd, LPBC *ppV); HRESULT WINAPI CPanel_ExtractIconA(LPITEMIDLIST pidl, LPCSTR pszFile, UINT nIconIndex, HICON *phiconLarge, HICON *phiconSmall, UINT nIconSize) DECLSPEC_HIDDEN; HRESULT WINAPI CPanel_ExtractIconW(LPITEMIDLIST pidl, LPCWSTR pszFile, UINT nIconIndex, HICON *phiconLarge, HICON *phiconSmall, UINT nIconSize) DECLSPEC_HIDDEN; - -HRESULT CFSExtractIcon_CreateInstance(IShellFolder * psf, LPCITEMIDLIST pidl, REFIID iid, LPVOID * ppvOut); HRESULT CRegFolder_CreateInstance(const GUID *pGuid, LPCITEMIDLIST pidlRoot, LPCWSTR lpszPath, REFIID riid, void **ppv);

7 years, 3 months

[mjansen] 75351: [USBPORT] Fix incorrect transfer direction for URBs. Patch by Vadim Galyant. CORE-13546

by mjansen＠svn.reactos.org

Author: mjansen Date: Sat Jul 15 09:24:30 2017 New Revision: 75351 URL: http://svn.reactos.org/svn/reactos?rev=75351&view=rev Log: [USBPORT] Fix incorrect transfer direction for URBs. Patch by Vadim Galyant. CORE-13546 Modified: trunk/reactos/drivers/usb/usbport/urb.c trunk/reactos/sdk/include/reactos/drivers/usbport/usbmport.h Modified: trunk/reactos/drivers/usb/usbport/urb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbport/urb.c?… ============================================================================== --- trunk/reactos/drivers/usb/usbport/urb.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbport/urb.c [iso-8859-1] Sat Jul 15 09:24:30 2017 @@ -385,13 +385,13 @@ if (Endpoint->EndpointProperties.TransferType != USBPORT_TRANSFER_TYPE_CONTROL) { - if (Endpoint->EndpointProperties.Direction) + if (Endpoint->EndpointProperties.Direction == USBPORT_TRANSFER_DIRECTION_OUT) { - Urb->UrbBulkOrInterruptTransfer.TransferFlags |= USBD_TRANSFER_DIRECTION_IN; + Urb->UrbBulkOrInterruptTransfer.TransferFlags &= ~USBD_TRANSFER_DIRECTION_IN; } else { - Urb->UrbBulkOrInterruptTransfer.TransferFlags &= ~USBD_TRANSFER_DIRECTION_IN; + Urb->UrbBulkOrInterruptTransfer.TransferFlags |= USBD_TRANSFER_DIRECTION_IN; } } Modified: trunk/reactos/sdk/include/reactos/drivers/usbport/usbmport.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/reactos/driver… ============================================================================== --- trunk/reactos/sdk/include/reactos/drivers/usbport/usbmport.h [iso-8859-1] (original) +++ trunk/reactos/sdk/include/reactos/drivers/usbport/usbmport.h [iso-8859-1] Sat Jul 15 09:24:30 2017 @@ -580,6 +580,7 @@ C_ASSERT(sizeof(USBPORT_MINIPORT_INTERFACE) == 336); +#define USBPORT_TRANSFER_DIRECTION_OUT 1 // From host to device typedef struct _USBPORT_ENDPOINT_PROPERTIES { USHORT DeviceAddress; USHORT EndpointAddress;

7 years, 3 months

[gadamopoulos] 75350: [SHELL32] - CDesktopFolder: Create the enumerators of the internal fs folders and add their items in its own list instead of calling CreateFolderEnumList which enumerates ... ...

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Sat Jul 15 09:18:06 2017 New Revision: 75350 URL: http://svn.reactos.org/svn/reactos?rev=75350&view=rev Log: [SHELL32] - CDesktopFolder: Create the enumerators of the internal fs folders and add their items in its own list instead of calling CreateFolderEnumList which enumerates ... files. - Remove CEnumIDListBase::CreateFolderEnumList and move its code to CFileSysEnum::Initialize. Modified: trunk/reactos/dll/win32/shell32/CEnumIDListBase.cpp trunk/reactos/dll/win32/shell32/CEnumIDListBase.h trunk/reactos/dll/win32/shell32/folders/CDesktopFolder.cpp trunk/reactos/dll/win32/shell32/folders/CFSFolder.cpp Modified: trunk/reactos/dll/win32/shell32/CEnumIDListBase.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/CEnumIDL… ============================================================================== --- trunk/reactos/dll/win32/shell32/CEnumIDListBase.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/CEnumIDListBase.cpp [iso-8859-1] Sat Jul 15 09:18:06 2017 @@ -123,73 +123,6 @@ return FALSE; } - -/************************************************************************** - * CreateFolderEnumList() - */ -BOOL CEnumIDListBase::CreateFolderEnumList( - LPCWSTR lpszPath, - DWORD dwFlags) -{ - WIN32_FIND_DATAW stffile; - HANDLE hFile; - WCHAR szPath[MAX_PATH]; - BOOL succeeded = TRUE; - static const WCHAR stars[] = { '*','.','*',0 }; - static const WCHAR dot[] = { '.',0 }; - static const WCHAR dotdot[] = { '.','.',0 }; - - TRACE("(%p)->(path=%s flags=0x%08x)\n", this, debugstr_w(lpszPath), dwFlags); - - if(!lpszPath || !lpszPath[0]) return FALSE; - - wcscpy(szPath, lpszPath); - PathAddBackslashW(szPath); - wcscat(szPath,stars); - - hFile = FindFirstFileW(szPath,&stffile); - if ( hFile != INVALID_HANDLE_VALUE ) - { - BOOL findFinished = FALSE; - - do - { - if ( !(stffile.dwFileAttributes & FILE_ATTRIBUTE_HIDDEN) - || (dwFlags & SHCONTF_INCLUDEHIDDEN) ) - { - LPITEMIDLIST pidl = NULL; - - if ( (stffile.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) && - dwFlags & SHCONTF_FOLDERS && - strcmpW(stffile.cFileName, dot) && strcmpW(stffile.cFileName, dotdot)) - { - pidl = _ILCreateFromFindDataW(&stffile); - succeeded = succeeded && AddToEnumList(pidl); - } - else if (!(stffile.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) - && dwFlags & SHCONTF_NONFOLDERS) - { - pidl = _ILCreateFromFindDataW(&stffile); - succeeded = succeeded && AddToEnumList(pidl); - } - } - if (succeeded) - { - if (!FindNextFileW(hFile, &stffile)) - { - if (GetLastError() == ERROR_NO_MORE_FILES) - findFinished = TRUE; - else - succeeded = FALSE; - } - } - } while (succeeded && !findFinished); - FindClose(hFile); - } - - return succeeded; -} - /************************************************************************** * IEnumIDList_fnNext */ Modified: trunk/reactos/dll/win32/shell32/CEnumIDListBase.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/CEnumIDL… ============================================================================== --- trunk/reactos/dll/win32/shell32/CEnumIDListBase.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/CEnumIDListBase.h [iso-8859-1] Sat Jul 15 09:18:06 2017 @@ -37,7 +37,6 @@ BOOL AddToEnumList(LPITEMIDLIST pidl); BOOL DeleteList(); BOOL HasItemWithCLSID(LPITEMIDLIST pidl); - BOOL CreateFolderEnumList(LPCWSTR lpszPath, DWORD dwFlags); // *** IEnumIDList methods *** virtual HRESULT STDMETHODCALLTYPE Next(ULONG celt, LPITEMIDLIST *rgelt, ULONG *pceltFetched); Modified: trunk/reactos/dll/win32/shell32/folders/CDesktopFolder.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/… ============================================================================== --- trunk/reactos/dll/win32/shell32/folders/CDesktopFolder.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/folders/CDesktopFolder.cpp [iso-8859-1] Sat Jul 15 09:18:06 2017 @@ -53,7 +53,7 @@ public: CDesktopFolderEnum(); ~CDesktopFolderEnum(); - HRESULT WINAPI Initialize(CDesktopFolder *desktopFolder, HWND hwndOwner, DWORD dwFlags); + HRESULT WINAPI Initialize(HWND hwndOwner, DWORD dwFlags, IEnumIDList *pDesktopEnumerator, IEnumIDList *pCommonDesktopEnumerator); BEGIN_COM_MAP(CDesktopFolderEnum) COM_INTERFACE_ENTRY_IID(IID_IEnumIDList, IEnumIDList) @@ -119,10 +119,10 @@ * CreateDesktopEnumList() */ -HRESULT WINAPI CDesktopFolderEnum::Initialize(CDesktopFolder *desktopFolder, HWND hwndOwner, DWORD dwFlags) +HRESULT WINAPI CDesktopFolderEnum::Initialize(HWND hwndOwner, DWORD dwFlags, IEnumIDList *pDesktopEnumerator, IEnumIDList *pCommonDesktopEnumerator) { BOOL ret = TRUE; - WCHAR szPath[MAX_PATH]; + LPITEMIDLIST pidl; static const WCHAR MyDocumentsClassString[] = L"{450D8FBA-AD25-11D0-98A8-0800361B1103}"; static const WCHAR Desktop_NameSpaceW[] = L"SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Explorer\\Desktop\\Namespace"; @@ -153,7 +153,6 @@ if (dwResult == ERROR_SUCCESS) { WCHAR iid[50]; - LPITEMIDLIST pidl; int i = 0; while (ret) @@ -213,7 +212,7 @@ { if (Val == 0 && dwType == REG_DWORD) { - LPITEMIDLIST pidl = _ILCreateGuidFromStrW(iid); + pidl = _ILCreateGuidFromStrW(iid); if (pidl != NULL) { if (!HasItemWithCLSID(pidl)) @@ -238,12 +237,20 @@ } } - /* enumerate the elements in %windir%\desktop */ - ret = ret && SHGetSpecialFolderPathW(0, szPath, CSIDL_DESKTOPDIRECTORY, FALSE); - ret = ret && CreateFolderEnumList(szPath, dwFlags); - - ret = ret && SHGetSpecialFolderPathW(0, szPath, CSIDL_COMMON_DESKTOPDIRECTORY, FALSE); - ret = ret && CreateFolderEnumList(szPath, dwFlags); + DWORD dwFetched; + + /* Enumerate the items in the two fs folders */ + if (pDesktopEnumerator) + { + while((S_OK == pDesktopEnumerator->Next(1, &pidl, &dwFetched)) && dwFetched) + AddToEnumList(pidl); + } + + if (pCommonDesktopEnumerator) + { + while((S_OK == pCommonDesktopEnumerator->Next(1, &pidl, &dwFetched)) && dwFetched) + AddToEnumList(pidl); + } return ret ? S_OK : E_FAIL; } @@ -439,7 +446,19 @@ */ HRESULT WINAPI CDesktopFolder::EnumObjects(HWND hwndOwner, DWORD dwFlags, LPENUMIDLIST *ppEnumIDList) { - return ShellObjectCreatorInit<CDesktopFolderEnum>(this, hwndOwner, dwFlags, IID_PPV_ARG(IEnumIDList, ppEnumIDList)); + CComPtr<IEnumIDList> pDesktopEnumerator; + CComPtr<IEnumIDList> pCommonDesktopEnumerator; + HRESULT hr; + + hr = m_DesktopFSFolder->EnumObjects(hwndOwner, dwFlags, &pDesktopEnumerator); + if (FAILED(hr)) + ERR("EnumObjects for desktop fs folder failed\n"); + + hr = m_SharedDesktopFSFolder->EnumObjects(hwndOwner, dwFlags, &pCommonDesktopEnumerator); + if (FAILED(hr)) + ERR("EnumObjects for shared desktop fs folder failed\n"); + + return ShellObjectCreatorInit<CDesktopFolderEnum>(hwndOwner, dwFlags, pDesktopEnumerator, pCommonDesktopEnumerator, IID_PPV_ARG(IEnumIDList, ppEnumIDList)); } /************************************************************************** Modified: trunk/reactos/dll/win32/shell32/folders/CFSFolder.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/… ============================================================================== --- trunk/reactos/dll/win32/shell32/folders/CFSFolder.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/folders/CFSFolder.cpp [iso-8859-1] Sat Jul 15 09:18:06 2017 @@ -57,9 +57,65 @@ { } -HRESULT WINAPI CFileSysEnum::Initialize(LPWSTR sPathTarget, DWORD dwFlags) -{ - return CreateFolderEnumList(sPathTarget, dwFlags); +HRESULT WINAPI CFileSysEnum::Initialize(LPWSTR lpszPath, DWORD dwFlags) +{ + WIN32_FIND_DATAW stffile; + HANDLE hFile; + WCHAR szPath[MAX_PATH]; + BOOL succeeded = TRUE; + static const WCHAR stars[] = { '*','.','*',0 }; + static const WCHAR dot[] = { '.',0 }; + static const WCHAR dotdot[] = { '.','.',0 }; + + TRACE("(%p)->(path=%s flags=0x%08x)\n", this, debugstr_w(lpszPath), dwFlags); + + if(!lpszPath || !lpszPath[0]) return FALSE; + + wcscpy(szPath, lpszPath); + PathAddBackslashW(szPath); + wcscat(szPath,stars); + + hFile = FindFirstFileW(szPath,&stffile); + if ( hFile != INVALID_HANDLE_VALUE ) + { + BOOL findFinished = FALSE; + + do + { + if ( !(stffile.dwFileAttributes & FILE_ATTRIBUTE_HIDDEN) + || (dwFlags & SHCONTF_INCLUDEHIDDEN) ) + { + LPITEMIDLIST pidl = NULL; + + if ( (stffile.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) && + dwFlags & SHCONTF_FOLDERS && + strcmpW(stffile.cFileName, dot) && strcmpW(stffile.cFileName, dotdot)) + { + pidl = _ILCreateFromFindDataW(&stffile); + succeeded = succeeded && AddToEnumList(pidl); + } + else if (!(stffile.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) + && dwFlags & SHCONTF_NONFOLDERS) + { + pidl = _ILCreateFromFindDataW(&stffile); + succeeded = succeeded && AddToEnumList(pidl); + } + } + if (succeeded) + { + if (!FindNextFileW(hFile, &stffile)) + { + if (GetLastError() == ERROR_NO_MORE_FILES) + findFinished = TRUE; + else + succeeded = FALSE; + } + } + } while (succeeded && !findFinished); + FindClose(hFile); + } + + return succeeded; } CFSFolder::CFSFolder()

7 years, 3 months

[pschweitzer] 75349: [SHELL32] In case a FSD doesn't support directory changes notifications, don't try to requeue a notification each time it returns 0 data. Just quit instead. CORE-13549

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Sat Jul 15 07:48:47 2017 New Revision: 75349 URL: http://svn.reactos.org/svn/reactos?rev=75349&view=rev Log: [SHELL32] In case a FSD doesn't support directory changes notifications, don't try to requeue a notification each time it returns 0 data. Just quit instead. CORE-13549 Modified: trunk/reactos/dll/win32/shell32/wine/changenotify.c Modified: trunk/reactos/dll/win32/shell32/wine/changenotify.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/wine/cha… ============================================================================== --- trunk/reactos/dll/win32/shell32/wine/changenotify.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/wine/changenotify.c [iso-8859-1] Sat Jul 15 07:48:47 2017 @@ -735,6 +735,15 @@ { InterlockedIncrement(&item->pParent->wQueuedCount); } + + /* If the FSD doesn't support directory change notifications, there's no + * no need to retry and requeue notification + */ + if (dwErrorCode == ERROR_INVALID_FUNCTION) + { + WARN("Directory watching not supported\n"); + goto quit; + } #endif /* This likely means overflow, so force whole directory refresh. */

7 years, 3 months

[pschweitzer] 75348: [SHELL32] Avoid double-free and use-after-free in case the FSD fails to register the change directory notification CORE-13549

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Sat Jul 15 07:45:28 2017 New Revision: 75348 URL: http://svn.reactos.org/svn/reactos?rev=75348&view=rev Log: [SHELL32] Avoid double-free and use-after-free in case the FSD fails to register the change directory notification CORE-13549 Modified: trunk/reactos/dll/win32/shell32/wine/changenotify.c Modified: trunk/reactos/dll/win32/shell32/wine/changenotify.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/wine/cha… ============================================================================== --- trunk/reactos/dll/win32/shell32/wine/changenotify.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/wine/changenotify.c [iso-8859-1] Sat Jul 15 07:45:28 2017 @@ -723,6 +723,20 @@ } #endif +#ifdef __REACTOS__ + /* This is to avoid double-free and potential use after free + * In case it failed, _BeginRead() already deferenced item + * But if failure comes the FSD, the APC routine (us) will + * be called as well, which will cause a double-free on quit. + * Avoid this by deferencing only once in case of failure and thus, + * incrementing reference count here + */ + if (dwErrorCode != ERROR_SUCCESS) + { + InterlockedIncrement(&item->pParent->wQueuedCount); + } +#endif + /* This likely means overflow, so force whole directory refresh. */ if (!dwNumberOfBytesTransfered) {

7 years, 3 months

[jimtabor] 75347: [ENG] - Patch by Katayama Hirofumi MZ : Add counts to path data. See CORE-13536.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Sat Jul 15 03:58:42 2017 New Revision: 75347 URL: http://svn.reactos.org/svn/reactos?rev=75347&view=rev Log: [ENG] - Patch by Katayama Hirofumi MZ : Add counts to path data. See CORE-13536. Modified: trunk/reactos/win32ss/gdi/eng/pathobj.c Modified: trunk/reactos/win32ss/gdi/eng/pathobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/eng/pathobj.c?… ============================================================================== --- trunk/reactos/win32ss/gdi/eng/pathobj.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/eng/pathobj.c [iso-8859-1] Sat Jul 15 03:58:42 2017 @@ -217,7 +217,6 @@ /* store data */ RtlZeroMemory(ppd, sizeof(EXTPATHDATA)); ppd->pd.flags = PD_BEGINSUBPATH; - ppd->pd.count = cptfx; size = cptfx * sizeof(POINTFIX); pptfxNew = ExAllocatePoolWithTag(PagedPool, size, GDITAG_PATHOBJ); @@ -228,6 +227,7 @@ } RtlCopyMemory(pptfxNew, pptfx, size); ppd->pd.pptfx = pptfxNew; + ppd->pd.count = cptfx; /* set the subpath */ pPathObj->ppdLast = pPathObj->ppdFirst = ppd; @@ -277,6 +277,7 @@ pptfxOld = ppdLast->pd.pptfx; ppdLast->pd.pptfx = pptfxNew; + ppdLast->pd.count += cptfx; ExFreePoolWithTag(pptfxOld, GDITAG_PATHOBJ); } @@ -313,7 +314,6 @@ /* store data */ RtlZeroMemory(ppd, sizeof(EXTPATHDATA)); ppd->pd.flags = PD_BEGINSUBPATH | PD_BEZIERS; - ppd->pd.count = cptfx; size = cptfx * sizeof(POINTFIX); pptfxNew = ExAllocatePoolWithTag(PagedPool, size, GDITAG_PATHOBJ); @@ -324,6 +324,7 @@ } RtlCopyMemory(pptfxNew, pptfx, size); ppd->pd.pptfx = pptfxNew; + ppd->pd.count = cptfx; /* set the subpath */ pPathObj->ppdLast = pPathObj->ppdFirst = ppd; @@ -373,6 +374,7 @@ pptfxOld = ppdLast->pd.pptfx; ppdLast->pd.pptfx = pptfxNew; + ppdLast->pd.count += cptfx; ExFreePoolWithTag(pptfxOld, GDITAG_PATHOBJ); }

7 years, 3 months

[hbelusca] 75346: [USETUP][SETUPLIB]: Improve how the Setup* INF APIs are interfaced in the code. Define prototypes compatibles (including their calling convention) to the ones defined by setupapi ...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Fri Jul 14 23:16:21 2017 New Revision: 75346 URL: http://svn.reactos.org/svn/reactos?rev=75346&view=rev Log: [USETUP][SETUPLIB]: Improve how the Setup* INF APIs are interfaced in the code. Define prototypes compatibles (including their calling convention) to the ones defined by setupapi (.h/.dll) so that it can be possible to either use an internal implementation of these functions (via the inflib library), as currently done, or using imported setupapi functions, as would be done by the future 1st-stage GUI installer. [SETUPLIB]: Cleanup the registry.c file and use the infsupp.h header. Fixes build that was technically broken since r75247. Added: branches/setup_improvements/base/setup/lib/infsupp.h (with props) Modified: branches/setup_improvements/base/setup/lib/registry.c branches/setup_improvements/base/setup/usetup/CMakeLists.txt branches/setup_improvements/base/setup/usetup/inffile.c branches/setup_improvements/base/setup/usetup/inffile.h Added: branches/setup_improvements/base/setup/lib/infsupp.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/l… ============================================================================== --- branches/setup_improvements/base/setup/lib/infsupp.h (added) +++ branches/setup_improvements/base/setup/lib/infsupp.h [iso-8859-1] Fri Jul 14 23:16:21 2017 @@ -0,0 +1,53 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS Setup Library + * FILE: base/setup/lib/infsupp.h + * PURPOSE: Interfacing with Setup* API .inf files support functions + * PROGRAMMER: Hermes Belusca-Maito (hermes.belusca(a)sfr.fr) + */ + +#pragma once + +// #ifndef __REACTOS__ + +#define _SETUPAPI_ +#include <setupapi.h> + +/* Lower the MAX_INF_STRING_LENGTH value in order to avoid too much stack usage */ +#undef MAX_INF_STRING_LENGTH +#define MAX_INF_STRING_LENGTH 1024 // Still larger than in infcommon.h + +// #else /* __REACTOS__ */ + +// /* Functions from the INFLIB library */ +// #include <infcommon.h> + +#define INF_STYLE_WIN4 0x00000002 + +#if 0 +/* FIXME: this structure is the one used in inflib, not in setupapi + * Delete it once we don't use inflib anymore */ +typedef struct _INFCONTEXT +{ + PVOID Inf; + PVOID CurrentInf; + PVOID Section; + PVOID Line; +} INFCONTEXT; +#else +C_ASSERT(sizeof(INFCONTEXT) == 2 * sizeof(PVOID) + 2 * sizeof(UINT)); +#endif + +// #endif + +/* SetupOpenInfFileW with support for a user-provided LCID */ +HINF +WINAPI +SetupOpenInfFileExW( + IN PCWSTR FileName, + IN PCWSTR InfClass, + IN DWORD InfStyle, + IN LCID LocaleId, + OUT PUINT ErrorLine); + +/* EOF */ Propchange: branches/setup_improvements/base/setup/lib/infsupp.h ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/setup_improvements/base/setup/lib/registry.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/l… ============================================================================== --- branches/setup_improvements/base/setup/lib/registry.c [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/lib/registry.c [iso-8859-1] Fri Jul 14 23:16:21 2017 @@ -29,96 +29,13 @@ #include "precomp.h" #include "filesup.h" +#include "infsupp.h" #include "regutil.h" #include "registry.h" #define NDEBUG #include <debug.h> - - -/* - * INF stuff -- Check usetup/inffile.h - */ -// #include <infcommon.h> -#include <setupapi.h> - -extern LONG InfGetFieldCount(PINFCONTEXT Context); -extern BOOLEAN InfGetIntField(PINFCONTEXT Context, - ULONG FieldIndex, - INT *IntegerValue); -extern BOOL -WINAPI -InfpFindFirstLineW( - IN HINF InfHandle, - IN PCWSTR Section, - IN PCWSTR Key, - IN OUT PINFCONTEXT Context); - -extern VOID InfCloseFile(HINF InfHandle); -extern BOOLEAN InfFindNextLine(PINFCONTEXT ContextIn, - PINFCONTEXT ContextOut); -extern BOOLEAN InfGetBinaryField(PINFCONTEXT Context, - ULONG FieldIndex, - PUCHAR ReturnBuffer, - ULONG ReturnBufferSize, - PULONG RequiredSize); -extern BOOLEAN InfGetMultiSzField(PINFCONTEXT Context, - ULONG FieldIndex, - PWSTR ReturnBuffer, - ULONG ReturnBufferSize, - PULONG RequiredSize); -extern BOOLEAN InfGetStringField(PINFCONTEXT Context, - ULONG FieldIndex, - PWSTR ReturnBuffer, - ULONG ReturnBufferSize, - PULONG RequiredSize); - -#define SetupCloseInfFile InfCloseFile -#define SetupFindNextLine InfFindNextLine -#define SetupGetBinaryField InfGetBinaryField -#define SetupGetMultiSzFieldW InfGetMultiSzField -#define SetupGetStringFieldW InfGetStringField - -#define SetupFindFirstLineW InfpFindFirstLineW -#define SetupGetFieldCount InfGetFieldCount -#define SetupGetIntField InfGetIntField - -// SetupOpenInfFileW with support for a user-provided LCID -#define SetupOpenInfFileExW InfpOpenInfFileW - -HINF -WINAPI -InfpOpenInfFileW( - IN PCWSTR FileName, - IN PCWSTR InfClass, - IN DWORD InfStyle, - IN LCID LocaleId, - OUT PUINT ErrorLine); - -/*******************************************/ - - - -// HACK!! These functions should actually be moved in the setup lib! -// For the moment, see usetup/filesup.c (or .h) -#if 1 - -NTSTATUS -SetupCopyFile( - IN PCWSTR SourceFileName, - IN PCWSTR DestinationFileName, - IN BOOLEAN FailIfExists); - -#define MOVEFILE_REPLACE_EXISTING 1 - -NTSTATUS -SetupMoveFile( - IN PCWSTR ExistingFileName, - IN PCWSTR NewFileName, - IN ULONG Flags); - -#endif // #ifdef __REACTOS__ Modified: branches/setup_improvements/base/setup/usetup/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… ============================================================================== --- branches/setup_improvements/base/setup/usetup/CMakeLists.txt [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/usetup/CMakeLists.txt [iso-8859-1] Fri Jul 14 23:16:21 2017 @@ -38,8 +38,8 @@ endif() add_executable(usetup ${SOURCE} usetup.rc) -target_link_libraries(usetup setuplib zlib inflib ext2lib vfatlib) +add_pch(usetup usetup.h SOURCE) set_module_type(usetup nativecui) +target_link_libraries(usetup inflib setuplib zlib ext2lib vfatlib) add_importlibs(usetup ntdll) -add_pch(usetup usetup.h SOURCE) add_cd_file(TARGET usetup DESTINATION reactos/system32 NO_CAB NAME_ON_CD smss.exe FOR bootcd regtest) Modified: branches/setup_improvements/base/setup/usetup/inffile.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… ============================================================================== --- branches/setup_improvements/base/setup/usetup/inffile.c [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/usetup/inffile.c [iso-8859-1] Fri Jul 14 23:16:21 2017 @@ -21,7 +21,8 @@ * PROJECT: ReactOS text-mode setup * FILE: base/setup/usetup/inffile.c * PURPOSE: .inf files support functions - * PROGRAMMER: Hervé Poussineau + * PROGRAMMERS: Hervé Poussineau + * Hermes Belusca-Maito (hermes.belusca(a)sfr.fr) */ /* INCLUDES ******************************************************************/ @@ -31,13 +32,24 @@ #define NDEBUG #include <debug.h> -/* FUNCTIONS *****************************************************************/ - +/* SETUP* API COMPATIBILITY FUNCTIONS ****************************************/ + +/* Functions from the INFLIB library */ #ifdef __REACTOS__ -BOOL -WINAPI -InfpFindFirstLineW( +extern VOID InfCloseFile(HINF InfHandle); +// #define SetupCloseInfFile InfCloseFile +VOID +WINAPI +SetupCloseInfFile(HINF InfHandle) +{ + InfCloseFile(InfHandle); +} + +// #define SetupFindFirstLineW InfpFindFirstLineW +BOOL +WINAPI +SetupFindFirstLineW( IN HINF InfHandle, IN PCWSTR Section, IN PCWSTR Key, @@ -55,10 +67,108 @@ return TRUE; } - +extern BOOLEAN InfFindNextLine(PINFCONTEXT ContextIn, + PINFCONTEXT ContextOut); +// #define SetupFindNextLine InfFindNextLine +BOOL +WINAPI +SetupFindNextLine(PINFCONTEXT ContextIn, + PINFCONTEXT ContextOut) +{ + return !!InfFindNextLine(ContextIn, ContextOut); +} + +extern LONG InfGetFieldCount(PINFCONTEXT Context); +// #define SetupGetFieldCount InfGetFieldCount +LONG +WINAPI +SetupGetFieldCount(PINFCONTEXT Context) +{ + return InfGetFieldCount(Context); +} + +extern BOOLEAN InfGetIntField(PINFCONTEXT Context, + ULONG FieldIndex, + INT *IntegerValue); +// #define SetupGetIntField InfGetIntField +BOOLEAN +WINAPI +SetupGetIntField(PINFCONTEXT Context, + ULONG FieldIndex, + INT *IntegerValue) +{ + return InfGetIntField(Context, FieldIndex, IntegerValue); +} + +extern BOOLEAN InfGetBinaryField(PINFCONTEXT Context, + ULONG FieldIndex, + PUCHAR ReturnBuffer, + ULONG ReturnBufferSize, + PULONG RequiredSize); +// #define SetupGetBinaryField InfGetBinaryField +BOOL +WINAPI +SetupGetBinaryField(PINFCONTEXT Context, + ULONG FieldIndex, + PUCHAR ReturnBuffer, + ULONG ReturnBufferSize, + PULONG RequiredSize) +{ + return !!InfGetBinaryField(Context, + FieldIndex, + ReturnBuffer, + ReturnBufferSize, + RequiredSize); +} + +extern BOOLEAN InfGetMultiSzField(PINFCONTEXT Context, + ULONG FieldIndex, + PWSTR ReturnBuffer, + ULONG ReturnBufferSize, + PULONG RequiredSize); +// #define SetupGetMultiSzFieldW InfGetMultiSzField +BOOL +WINAPI +SetupGetMultiSzFieldW(PINFCONTEXT Context, + ULONG FieldIndex, + PWSTR ReturnBuffer, + ULONG ReturnBufferSize, + PULONG RequiredSize) +{ + return !!InfGetMultiSzField(Context, + FieldIndex, + ReturnBuffer, + ReturnBufferSize, + RequiredSize); +} + +extern BOOLEAN InfGetStringField(PINFCONTEXT Context, + ULONG FieldIndex, + PWSTR ReturnBuffer, + ULONG ReturnBufferSize, + PULONG RequiredSize); +// #define SetupGetStringFieldW InfGetStringField +BOOL +WINAPI +SetupGetStringFieldW(PINFCONTEXT Context, + ULONG FieldIndex, + PWSTR ReturnBuffer, + ULONG ReturnBufferSize, + PULONG RequiredSize) +{ + return !!InfGetStringField(Context, + FieldIndex, + ReturnBuffer, + ReturnBufferSize, + RequiredSize); +} + + +/* SetupOpenInfFileW with support for a user-provided LCID */ +// #define SetupOpenInfFileExW InfpOpenInfFileW HINF WINAPI -InfpOpenInfFileW( +SetupOpenInfFileExW( IN PCWSTR FileName, IN PCWSTR InfClass, IN DWORD InfStyle, @@ -84,6 +194,8 @@ #endif /* __REACTOS__ */ + +/* HELPER FUNCTIONS **********************************************************/ BOOLEAN INF_GetData( @@ -141,7 +253,6 @@ #endif /* !__REACTOS__ */ } - BOOLEAN INF_GetDataField( IN PINFCONTEXT Context, @@ -182,7 +293,6 @@ #endif /* !__REACTOS__ */ } - HINF WINAPI INF_OpenBufferedFileA( IN PSTR FileBuffer, Modified: branches/setup_improvements/base/setup/usetup/inffile.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… ============================================================================== --- branches/setup_improvements/base/setup/usetup/inffile.h [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/usetup/inffile.h [iso-8859-1] Fri Jul 14 23:16:21 2017 @@ -21,7 +21,8 @@ * PROJECT: ReactOS text-mode setup * FILE: base/setup/usetup/inffile.h * PURPOSE: .inf files support functions - * PROGRAMMER: Hervé Poussineau + * PROGRAMMERS: Hervé Poussineau + * Hermes Belusca-Maito (hermes.belusca(a)sfr.fr) */ #pragma once @@ -32,41 +33,8 @@ #else /* __REACTOS__ */ +/* Functions from the INFLIB library */ #include <infcommon.h> - -extern VOID InfSetHeap(PVOID Heap); -extern VOID InfCloseFile(HINF InfHandle); -extern BOOLEAN InfFindNextLine(PINFCONTEXT ContextIn, - PINFCONTEXT ContextOut); -extern BOOLEAN InfGetBinaryField(PINFCONTEXT Context, - ULONG FieldIndex, - PUCHAR ReturnBuffer, - ULONG ReturnBufferSize, - PULONG RequiredSize); -extern BOOLEAN InfGetMultiSzField(PINFCONTEXT Context, - ULONG FieldIndex, - PWSTR ReturnBuffer, - ULONG ReturnBufferSize, - PULONG RequiredSize); -extern BOOLEAN InfGetStringField(PINFCONTEXT Context, - ULONG FieldIndex, - PWSTR ReturnBuffer, - ULONG ReturnBufferSize, - PULONG RequiredSize); - -#define SetupCloseInfFile InfCloseFile -#define SetupFindNextLine InfFindNextLine -#define SetupGetBinaryField InfGetBinaryField -#define SetupGetMultiSzFieldW InfGetMultiSzField -#define SetupGetStringFieldW InfGetStringField - - -#define SetupFindFirstLineW InfpFindFirstLineW -#define SetupGetFieldCount InfGetFieldCount -#define SetupGetIntField InfGetIntField - -// SetupOpenInfFileW with support for a user-provided LCID -#define SetupOpenInfFileExW InfpOpenInfFileW #define INF_STYLE_WIN4 0x00000002 @@ -81,17 +49,72 @@ } INFCONTEXT; C_ASSERT(sizeof(INFCONTEXT) == 2 * sizeof(PVOID) + 2 * sizeof(UINT)); +extern VOID InfSetHeap(PVOID Heap); + +// #define SetupCloseInfFile InfCloseFile +VOID +WINAPI +SetupCloseInfFile(HINF InfHandle); + +// #define SetupFindFirstLineW InfpFindFirstLineW BOOL WINAPI -InfpFindFirstLineW( +SetupFindFirstLineW( IN HINF InfHandle, IN PCWSTR Section, IN PCWSTR Key, IN OUT PINFCONTEXT Context); +// #define SetupFindNextLine InfFindNextLine +BOOL +WINAPI +SetupFindNextLine(PINFCONTEXT ContextIn, + PINFCONTEXT ContextOut); + +// #define SetupGetFieldCount InfGetFieldCount +LONG +WINAPI +SetupGetFieldCount(PINFCONTEXT Context); + +// #define SetupGetIntField InfGetIntField +BOOLEAN +WINAPI +SetupGetIntField(PINFCONTEXT Context, + ULONG FieldIndex, + INT *IntegerValue); + +// #define SetupGetBinaryField InfGetBinaryField +BOOL +WINAPI +SetupGetBinaryField(PINFCONTEXT Context, + ULONG FieldIndex, + PUCHAR ReturnBuffer, + ULONG ReturnBufferSize, + PULONG RequiredSize); + +// #define SetupGetMultiSzFieldW InfGetMultiSzField +BOOL +WINAPI +SetupGetMultiSzFieldW(PINFCONTEXT Context, + ULONG FieldIndex, + PWSTR ReturnBuffer, + ULONG ReturnBufferSize, + PULONG RequiredSize); + +// #define SetupGetStringFieldW InfGetStringField +BOOL +WINAPI +SetupGetStringFieldW(PINFCONTEXT Context, + ULONG FieldIndex, + PWSTR ReturnBuffer, + ULONG ReturnBufferSize, + PULONG RequiredSize); + +/* SetupOpenInfFileW with support for a user-provided LCID */ +// #define SetupOpenInfFileExW InfpOpenInfFileW HINF WINAPI -InfpOpenInfFileW( +SetupOpenInfFileExW( IN PCWSTR FileName, IN PCWSTR InfClass, IN DWORD InfStyle, @@ -99,6 +122,9 @@ OUT PUINT ErrorLine); #endif /* __REACTOS__ */ + + +/* HELPER FUNCTIONS **********************************************************/ BOOLEAN INF_GetData(

7 years, 3 months

[hbelusca] 75345: Sync with trunk r75344 to get the inflib stuff in place.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Fri Jul 14 22:33:15 2017 New Revision: 75345 URL: http://svn.reactos.org/svn/reactos?rev=75345&view=rev Log: Sync with trunk r75344 to get the inflib stuff in place. Modified: branches/setup_improvements/ (props changed) branches/setup_improvements/base/setup/usetup/inffile.h branches/setup_improvements/boot/freeldr/freeldr/include/inffile.h branches/setup_improvements/dll/appcompat/apphelp/hsdb.c branches/setup_improvements/dll/appcompat/apphelp/layer.c branches/setup_improvements/dll/win32/dnsapi/dnsapi/query.c branches/setup_improvements/media/sdb/sysmain.xml branches/setup_improvements/sdk/lib/3rdparty/adns/src/adns.h branches/setup_improvements/sdk/lib/3rdparty/adns/src/setup.c branches/setup_improvements/sdk/lib/inflib/infpriv.h branches/setup_improvements/win32ss/printing/base/spoolss/main.c branches/setup_improvements/win32ss/printing/base/spoolss/spoolss.spec Propchange: branches/setup_improvements/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Jul 14 22:33:15 2017 @@ -23,4 +23,4 @@ /branches/usb-bringup:51335,51337,51341-51343,51348,51350,51353,51355,51365-51369,51372,51384-54388,54396-54398,54736-54737,54752-54754,54756-54760,54762,54764-54765,54767-54768,54772,54774-54777,54781,54787,54790-54792,54797-54798,54806,54808,54834-54838,54843,54850,54852,54856,54858-54859 /branches/usb-bringup-trunk:55019-55543,55548-55554,55556-55567 /branches/wlan-bringup:54809-54998 -/trunk/reactos:74526-75337 +/trunk/reactos:74526-75344 Modified: branches/setup_improvements/base/setup/usetup/inffile.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… ============================================================================== --- branches/setup_improvements/base/setup/usetup/inffile.h [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/usetup/inffile.h [iso-8859-1] Fri Jul 14 22:33:15 2017 @@ -74,10 +74,12 @@ * Delete it once we don't use inflib anymore */ typedef struct _INFCONTEXT { - PVOID Inf; - PVOID Section; - PVOID Line; + PVOID Inf; + PVOID CurrentInf; + PVOID Section; + PVOID Line; } INFCONTEXT; +C_ASSERT(sizeof(INFCONTEXT) == 2 * sizeof(PVOID) + 2 * sizeof(UINT)); BOOL WINAPI Modified: branches/setup_improvements/boot/freeldr/freeldr/include/inffile.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/boot/freeldr… ============================================================================== --- branches/setup_improvements/boot/freeldr/freeldr/include/inffile.h [iso-8859-1] (original) +++ branches/setup_improvements/boot/freeldr/freeldr/include/inffile.h [iso-8859-1] Fri Jul 14 22:33:15 2017 @@ -39,7 +39,7 @@ typedef struct _INFCONTEXT { PVOID Inf; -// PVOID CurrentInf; + PVOID CurrentInf; PVOID Section; PVOID Line; } INFCONTEXT, *PINFCONTEXT; Modified: branches/setup_improvements/dll/appcompat/apphelp/hsdb.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/appcompa… ============================================================================== --- branches/setup_improvements/dll/appcompat/apphelp/hsdb.c [iso-8859-1] (original) +++ branches/setup_improvements/dll/appcompat/apphelp/hsdb.c [iso-8859-1] Fri Jul 14 22:33:15 2017 @@ -577,7 +577,7 @@ if (!default_dir) { - WCHAR* tmp = NULL; + WCHAR* tmp; UINT len = GetSystemWindowsDirectoryW(NULL, 0) + lstrlenW(szAppPatch); tmp = SdbAlloc((len + 1)* sizeof(WCHAR)); if (tmp) @@ -706,7 +706,7 @@ pData->unknown = 0; pData->szLayer[0] = UNICODE_NULL; /* TODO */ - SHIM_INFO("\ndwFlags 0x%x\ndwMagic 0x%x\ntrExe 0x%x\ntrLayer 0x%x", + SHIM_INFO("\ndwFlags 0x%x\ndwMagic 0x%x\ntrExe 0x%x\ntrLayer 0x%x\n", pData->Query.dwFlags, pData->dwMagic, pData->Query.atrExes[0], pData->Query.atrLayers[0]); /* Database List */ Modified: branches/setup_improvements/dll/appcompat/apphelp/layer.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/appcompa… ============================================================================== --- branches/setup_improvements/dll/appcompat/apphelp/layer.c [iso-8859-1] (original) +++ branches/setup_improvements/dll/appcompat/apphelp/layer.c [iso-8859-1] Fri Jul 14 22:33:15 2017 @@ -159,7 +159,7 @@ FindClose(FindHandle); SdbpResizeTempStr(LongPath, (LongPath->Str.Length >> 1) + 20); StringCbPrintfW(LongPath->Str.Buffer, LongPath->Str.MaximumLength, SIGN_MEDIA_FMT, SignMedia, Scratch.Str.Buffer + 3); - LongPath->Str.Length = wcslen(LongPath->Str.Buffer) * sizeof(WCHAR); + LongPath->Str.Length = (USHORT)wcslen(LongPath->Str.Buffer) * sizeof(WCHAR); SdbpFreeTempStr(&Scratch); return TRUE; } @@ -217,7 +217,7 @@ return Status; } } - FullPath->MaximumLength = BasePath.Length + (wcslen(LayersKey) + 1) * sizeof(WCHAR); + FullPath->MaximumLength = (USHORT)(BasePath.Length + (wcslen(LayersKey) + 1) * sizeof(WCHAR)); FullPath->Buffer = SdbAlloc(FullPath->MaximumLength); FullPath->Length = 0; RtlAppendUnicodeStringToString(FullPath, &BasePath); Modified: branches/setup_improvements/dll/win32/dnsapi/dnsapi/query.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/win32/dn… ============================================================================== --- branches/setup_improvements/dll/win32/dnsapi/dnsapi/query.c [iso-8859-1] (original) +++ branches/setup_improvements/dll/win32/dnsapi/dnsapi/query.c [iso-8859-1] Fri Jul 14 22:33:15 2017 @@ -798,6 +798,14 @@ } } + if (!adns_numservers(astate)) + { + /* There are no servers to query so bail out */ + adns_finish(astate); + RtlFreeHeap(RtlGetProcessHeap(), 0, AnsiName); + return ERROR_FILE_NOT_FOUND; + } + /* * adns doesn't resolve chained CNAME records (a CNAME which points to * another CNAME pointing to another... pointing to an A record), according Modified: branches/setup_improvements/media/sdb/sysmain.xml URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/media/sdb/sy… ============================================================================== --- branches/setup_improvements/media/sdb/sysmain.xml [iso-8859-1] (original) +++ branches/setup_improvements/media/sdb/sysmain.xml [iso-8859-1] Fri Jul 14 22:33:15 2017 @@ -7,224 +7,183 @@  - <SHIM> - <NAME>Win95VersionLie</NAME> + <SHIM NAME="Win95VersionLie"> <DLLFILE>aclayers.dll</DLLFILE> </SHIM> - <SHIM> - <NAME>Win98VersionLie</NAME> + <SHIM NAME="Win98VersionLie"> <DLLFILE>aclayers.dll</DLLFILE> </SHIM> - <SHIM> - <NAME>WinNT4SP5VersionLie</NAME> + <SHIM NAME="WinNT4SP5VersionLie"> <DLLFILE>aclayers.dll</DLLFILE> </SHIM> - <SHIM> - <NAME>Win2000VersionLie</NAME> + <SHIM NAME="Win2000VersionLie"> <DLLFILE>aclayers.dll</DLLFILE> </SHIM> - <SHIM> - <NAME>Win2000SP1VersionLie</NAME> + <SHIM NAME="Win2000SP1VersionLie"> <DLLFILE>aclayers.dll</DLLFILE> </SHIM> - <SHIM> - <NAME>Win2000SP2VersionLie</NAME> + <SHIM NAME="Win2000SP2VersionLie"> <DLLFILE>aclayers.dll</DLLFILE> </SHIM> - <SHIM> - <NAME>Win2000SP3VersionLie</NAME> + <SHIM NAME="Win2000SP3VersionLie"> <DLLFILE>aclayers.dll</DLLFILE> </SHIM> - <SHIM> - <NAME>WinXPVersionLie</NAME> + <SHIM NAME="WinXPVersionLie"> <DLLFILE>aclayers.dll</DLLFILE> </SHIM> - <SHIM> - <NAME>WinXPSP1VersionLie</NAME> + <SHIM NAME="WinXPSP1VersionLie"> <DLLFILE>aclayers.dll</DLLFILE> </SHIM> - <SHIM> - <NAME>WinXPSP2VersionLie</NAME> + <SHIM NAME="WinXPSP2VersionLie"> <DLLFILE>aclayers.dll</DLLFILE> </SHIM> - <SHIM> - <NAME>WinXPSP3VersionLie</NAME> + <SHIM NAME="WinXPSP3VersionLie"> <DLLFILE>aclayers.dll</DLLFILE> </SHIM> - <SHIM> - <NAME>Win2k3RTMVersionLie</NAME> + <SHIM NAME="Win2k3RTMVersionLie"> <DLLFILE>aclayers.dll</DLLFILE> </SHIM> - <SHIM> - <NAME>Win2k3SP1VersionLie</NAME> + <SHIM NAME="Win2k3SP1VersionLie"> <DLLFILE>aclayers.dll</DLLFILE> </SHIM> - <SHIM> - <NAME>Win2k3SP2VersionLie</NAME> + <SHIM NAME="Win2k3SP2VersionLie"> <DLLFILE>aclayers.dll</DLLFILE> </SHIM> - <SHIM> - <NAME>VistaRTMVersionLie</NAME> + <SHIM NAME="VistaRTMVersionLie"> <DLLFILE>aclayers.dll</DLLFILE> </SHIM> - <SHIM> - <NAME>VistaSP1VersionLie</NAME> + <SHIM NAME="VistaSP1VersionLie"> <DLLFILE>aclayers.dll</DLLFILE> </SHIM> - <SHIM> - <NAME>VistaSP2VersionLie</NAME> + <SHIM NAME="VistaSP2VersionLie"> <DLLFILE>aclayers.dll</DLLFILE> </SHIM> - <SHIM> - <NAME>Win7RTMVersionLie</NAME> + <SHIM NAME="Win7RTMVersionLie"> <DLLFILE>aclayers.dll</DLLFILE> </SHIM>  - <SHIM> - <NAME>Force640x480</NAME> + <SHIM NAME="Force640x480"> <DLLFILE>aclayers.dll</DLLFILE> </SHIM> - <SHIM> - <NAME>Force8BitColor</NAME> + <SHIM NAME="Force8BitColor"> <DLLFILE>aclayers.dll</DLLFILE> </SHIM>  - <SHIM> - <NAME>DisableThemes</NAME> + <SHIM NAME="DisableThemes"> <DLLFILE>acgenral.dll</DLLFILE> + </SHIM> + + <SHIM NAME="HideShimEnv"> + <DLLFILE>aclayers.dll</DLLFILE> </SHIM> </LIBRARY>  - <LAYER> - <NAME>WIN95</NAME> + <LAYER NAME="WIN95"> <SHIM_REF NAME="Win95VersionLie" />  </LAYER> - <LAYER> - <NAME>WIN98</NAME> + <LAYER NAME="WIN98"> <SHIM_REF NAME="Win98VersionLie" />  </LAYER> - <LAYER> - <NAME>NT4SP5</NAME> + <LAYER NAME="NT4SP5"> <SHIM_REF NAME="WinNT4SP5VersionLie" />  </LAYER> - <LAYER> - <NAME>WIN2000</NAME> + <LAYER NAME="WIN2000"> <SHIM_REF NAME="Win2000VersionLie" />  </LAYER> - <LAYER> - <NAME>WIN2000SP1</NAME> + <LAYER NAME="WIN2000SP1"> <SHIM_REF NAME="Win2000SP1VersionLie" />  </LAYER> - <LAYER> - <NAME>WIN2000SP2</NAME> + <LAYER NAME="WIN2000SP2"> <SHIM_REF NAME="Win2000SP2VersionLie" />  </LAYER> - <LAYER> - <NAME>WIN2000SP3</NAME> + <LAYER NAME="WIN2000SP3"> <SHIM_REF NAME="Win2000SP3VersionLie" />  </LAYER> - <LAYER> - <NAME>WINXP</NAME> + <LAYER NAME="WINXP"> <SHIM_REF NAME="WinXPVersionLie" />  </LAYER> - <LAYER> - <NAME>WINXPSP1</NAME> + <LAYER NAME="WINXPSP1"> <SHIM_REF NAME="WinXPSP1VersionLie" />  </LAYER> - <LAYER> - <NAME>WINXPSP2</NAME> + <LAYER NAME="WINXPSP2"> <SHIM_REF NAME="WinXPSP2VersionLie" />  </LAYER> - <LAYER> - <NAME>WINXPSP3</NAME> + <LAYER NAME="WINXPSP3"> <SHIM_REF NAME="WinXPSP3VersionLie" />  </LAYER> - <LAYER> - <NAME>WINSRV03RTM</NAME> + <LAYER NAME="WINSRV03RTM"> <SHIM_REF NAME="Win2k3RTMVersionLie" />  </LAYER> - <LAYER> - <NAME>WINSRV03SP1</NAME> + <LAYER NAME="WINSRV03SP1"> <SHIM_REF NAME="Win2k3SP1VersionLie" />  </LAYER> - <LAYER> - <NAME>WINSRV03SP2</NAME> + <LAYER NAME="WINSRV03SP2"> <SHIM_REF NAME="Win2k3SP2VersionLie" />  </LAYER> - <LAYER> - <NAME>VISTARTM</NAME> + <LAYER NAME="VISTARTM"> <SHIM_REF NAME="VistaRTMVersionLie" />  </LAYER> - <LAYER> - <NAME>VISTASP1</NAME> + <LAYER NAME="VISTASP1"> <SHIM_REF NAME="VistaSP1VersionLie" />  </LAYER> - <LAYER> - <NAME>VISTASP2</NAME> + <LAYER NAME="VISTASP2"> <SHIM_REF NAME="VistaSP2VersionLie" />  </LAYER> - <LAYER> - <NAME>WINSRV08</NAME> + <LAYER NAME="WINSRV08"> <SHIM_REF NAME="VistaRTMVersionLie" />  </LAYER> - <LAYER> - <NAME>WINSRV08SP1</NAME> + <LAYER NAME="WINSRV08SP1"> <SHIM_REF NAME="VistaSP1VersionLie" />  </LAYER> - <LAYER> - <NAME>WINSRV08SP2</NAME> + <LAYER NAME="WINSRV08SP2"> <SHIM_REF NAME="VistaSP2VersionLie" />  </LAYER> - <LAYER> - <NAME>WIN7RTM</NAME> + <LAYER NAME="WIN7RTM"> <SHIM_REF NAME="Win7RTMVersionLie" />  </LAYER>  - <LAYER> - <NAME>256Color</NAME> + <LAYER NAME="256Color"> <SHIM_REF NAME="DisableThemes" /> <SHIM_REF NAME="Force8BitColor" /> </LAYER> - <LAYER> - <NAME>640X480</NAME> + <LAYER NAME="640X480"> <SHIM_REF NAME="Force640x480" /> </LAYER>  - <LAYER> - <NAME>DisableThemes</NAME> + <LAYER NAME="DisableThemes"> <SHIM_REF NAME="DisableThemes" /> </LAYER> Modified: branches/setup_improvements/sdk/lib/3rdparty/adns/src/adns.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/sdk/lib/3rdp… ============================================================================== --- branches/setup_improvements/sdk/lib/3rdparty/adns/src/adns.h [iso-8859-1] (original) +++ branches/setup_improvements/sdk/lib/3rdparty/adns/src/adns.h [iso-8859-1] Fri Jul 14 22:33:15 2017 @@ -368,7 +368,11 @@ /* ReactOS addition */ ADNS_API void adns_addserver(adns_state state, struct in_addr server); -ADNS_API void adns_ccf_search(adns_state ads, const char *fn, int lno, const char *buf); +ADNS_API void adns_ccf_search(adns_state state, + const char *fn, + int lno, + const char *buf); +ADNS_API int adns_numservers(adns_state state); ADNS_API int adns_init_strcfg(adns_state *newstate_r, adns_initflags flags, FILE *diagfile /*0=>discard*/, const char *configtext); Modified: branches/setup_improvements/sdk/lib/3rdparty/adns/src/setup.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/sdk/lib/3rdp… ============================================================================== --- branches/setup_improvements/sdk/lib/3rdparty/adns/src/setup.c [iso-8859-1] (original) +++ branches/setup_improvements/sdk/lib/3rdparty/adns/src/setup.c [iso-8859-1] Fri Jul 14 22:33:15 2017 @@ -715,3 +715,6 @@ void adns_ccf_search(adns_state ads, const char *fn, int lno, const char *buf) { ccf_search(ads, fn, lno, buf); } +int adns_numservers(adns_state ads) { + return ads->nservers; +} Modified: branches/setup_improvements/sdk/lib/inflib/infpriv.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/sdk/lib/infl… ============================================================================== --- branches/setup_improvements/sdk/lib/inflib/infpriv.h [iso-8859-1] (original) +++ branches/setup_improvements/sdk/lib/inflib/infpriv.h [iso-8859-1] Fri Jul 14 22:33:15 2017 @@ -65,6 +65,7 @@ typedef struct _INFCONTEXT { PINFCACHE Inf; + PINFCACHE CurrentInf; PINFCACHESECTION Section; PINFCACHELINE Line; } INFCONTEXT; Modified: branches/setup_improvements/win32ss/printing/base/spoolss/main.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/win32ss/prin… ============================================================================== --- branches/setup_improvements/win32ss/printing/base/spoolss/main.c [iso-8859-1] (original) +++ branches/setup_improvements/win32ss/printing/base/spoolss/main.c [iso-8859-1] Fri Jul 14 22:33:15 2017 @@ -246,3 +246,14 @@ SetLastError(ERROR_SUCCESS); return TRUE; } + +BOOL WINAPI +BuildOtherNamesFromMachineName(LPVOID * ptr1, LPVOID * ptr2) +{ + FIXME("(%p, %p) stub\n", ptr1, ptr2); + + *ptr1 = NULL; + *ptr2 = NULL; + return FALSE; +} + Modified: branches/setup_improvements/win32ss/printing/base/spoolss/spoolss.spec URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/win32ss/prin… ============================================================================== --- branches/setup_improvements/win32ss/printing/base/spoolss/spoolss.spec [iso-8859-1] (original) +++ branches/setup_improvements/win32ss/printing/base/spoolss/spoolss.spec [iso-8859-1] Fri Jul 14 22:33:15 2017 @@ -22,7 +22,7 @@ @ stub AppendPrinterNotifyInfoData @ stub bGetDevModePerUser @ stub bSetDevModePerUser -@ stub BuildOtherNamesFromMachineName +@ stdcall BuildOtherNamesFromMachineName(ptr ptr) @ stub CacheAddName @ stub CacheCreateAndAddNode @ stub CacheCreateAndAddNodeWithIPAddresses

7 years, 3 months

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