Ros-diffs August 2015

ros-diffs@reactos.org

15 participants
301 discussions

[cwittich] 68795: [UXTHEME] Fix bug preventing GetThemeString from working (patch by Mark Harmstone)

by cwittich＠svn.reactos.org

Author: cwittich Date: Sat Aug 22 18:40:59 2015 New Revision: 68795 URL: http://svn.reactos.org/svn/reactos?rev=68795&view=rev Log: [UXTHEME] Fix bug preventing GetThemeString from working (patch by Mark Harmstone) Modified: trunk/reactos/dll/win32/uxtheme/property.c Modified: trunk/reactos/dll/win32/uxtheme/property.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/uxtheme/property… ============================================================================== --- trunk/reactos/dll/win32/uxtheme/property.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/uxtheme/property.c [iso-8859-1] Sat Aug 22 18:40:59 2015 @@ -194,7 +194,7 @@ if(!hTheme) return E_HANDLE; - if(!(tp = MSSTYLES_FindProperty(hTheme, iPartId, iStateId, TMT_FILENAME, iPropId))) + if(!(tp = MSSTYLES_FindProperty(hTheme, iPartId, iStateId, TMT_STRING, iPropId))) return E_PROP_ID_UNSUPPORTED; return MSSTYLES_GetPropertyString(tp, pszBuff, cchMaxBuffChars); }

9 years, 4 months

[pschweitzer] 68794: [HACKSSIGN] Stack hacks! Let's introduce hackssign. This application (and its associated driver) are here to allow users to assign drive letter to their VMware/VBox shared fold...

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Sat Aug 22 12:29:37 2015 New Revision: 68794 URL: http://svn.reactos.org/svn/reactos?rev=68794&view=rev Log: [HACKSSIGN] Stack hacks! Let's introduce hackssign. This application (and its associated driver) are here to allow users to assign drive letter to their VMware/VBox shared folders. It relies on two components: a client to communicate the instructions and a driver to execute such instructions. Do not execute this application nor its driver outside ReactOS. There are barely no security checks nor sanety checks. You could do substantial damages. So, let's go back to shared folders state in ReactOS nowadays... VMware ------ Configure your shared folders Install VMware Tools Reboot >From here, you can access your share from cmd or explorer with UNC path (for instance: \\vmware-host\Shared Folders\ReactOS) Go to C:\ReactOS\bin (or whatever, depending on your setup) Execute hackssign assign z ReactOS vmware (for instance) z is the letter you want to give, and ReactOS is the name of your share (you gave it in VMware configuration) You're done, you can access your share with the Z drive letter VirtualBox ---------- Configure your shared folders Install VBox Guest Additions Reboot Go to C:\ReactOS\bin (or whatever, depending on your setup) Execute rosvboxmgmt start >From here, you can access your share from cmd or explorer with UNC path (for instance: \\vboxsvr\ReactOS) Execute hackssign assign z ReactOS virtualbox (for instance) z is the letter you want to give, and ReactOS is the name of your share (you gave it in VMware configuration) You're done, you can access your share with the Z drive letter Note that you can delete an assignement by performing a hackssign delete z (or whatever drive you want to remove). In such case, the share remains available with its UNC path. Added: trunk/rosapps/applications/cmdutils/hackssign/ trunk/rosapps/applications/cmdutils/hackssign/CMakeLists.txt (with props) trunk/rosapps/applications/cmdutils/hackssign/client.c (with props) trunk/rosapps/applications/cmdutils/hackssign/driver.c (with props) trunk/rosapps/applications/cmdutils/hackssign/hackssign.rc (with props) trunk/rosapps/applications/cmdutils/hackssign/ioctl.h (with props) Modified: trunk/rosapps/applications/cmdutils/CMakeLists.txt trunk/rosapps/applications/cmdutils/rosvboxmgmt/rosvboxmgmt.c Modified: trunk/rosapps/applications/cmdutils/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/cmdutils/CMak… ============================================================================== --- trunk/rosapps/applications/cmdutils/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rosapps/applications/cmdutils/CMakeLists.txt [iso-8859-1] Sat Aug 22 12:29:37 2015 @@ -1,5 +1,6 @@ add_subdirectory(appwiz) add_subdirectory(cat) +add_subdirectory(hackssign) add_subdirectory(ntfsinfo) add_subdirectory(rosvboxmgmt) add_subdirectory(tee) Added: trunk/rosapps/applications/cmdutils/hackssign/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/cmdutils/hack… ============================================================================== --- trunk/rosapps/applications/cmdutils/hackssign/CMakeLists.txt (added) +++ trunk/rosapps/applications/cmdutils/hackssign/CMakeLists.txt [iso-8859-1] Sat Aug 22 12:29:37 2015 @@ -0,0 +1,9 @@ +add_executable(hackssign_client client.c hackssign.rc) +set_module_type(hackssign_client win32cui UNICODE) +add_importlibs(hackssign_client msvcrt kernel32 advapi32) +add_cd_file(TARGET hackssign_client DESTINATION reactos/bin FOR all) + +add_library(hackssign_driver SHARED driver.c hackssign.rc) +set_module_type(hackssign_driver kernelmodedriver) +add_importlibs(hackssign_driver ntoskrnl hal) +add_cd_file(TARGET hackssign_driver DESTINATION reactos/bin FOR all) Propchange: trunk/rosapps/applications/cmdutils/hackssign/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rosapps/applications/cmdutils/hackssign/client.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/cmdutils/hack… ============================================================================== --- trunk/rosapps/applications/cmdutils/hackssign/client.c (added) +++ trunk/rosapps/applications/cmdutils/hackssign/client.c [iso-8859-1] Sat Aug 22 12:29:37 2015 @@ -0,0 +1,263 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: Hackssign application & driver + * FILE: cmdutils/hackssign/client.c + * PURPOSE: Client: Assign drive letter to shared folders for VMware/VBox VMs + * PROGRAMMERS: Pierre Schweitzer <pierre(a)reactos.org> + */ + +#include <stdio.h> +#include <wchar.h> +#include <windows.h> + +#include "ioctl.h" + +/* DON'T MESS AROUND THIS! */ +typedef enum _HV_TYPES +{ + vmVMware, + vmVirtualBox, + vmMax, +} HV_TYPES; +PCWSTR hV[] = { L"vmware", L"virtualbox" }; +PCWSTR dev[] = { L"\\Device\\hgfs\\;", L"\\Device\\VBoxMiniRdr\\;" }; +PCWSTR unc[] = { L":\\vmware-host\\Shared Folders\\", L":\\vboxsvr\\" }; + +BOOL performDevIoCtl(DWORD dwIoControlCode, LPVOID lpInBuffer, DWORD nInBufferSize) +{ + BOOL ret; + HANDLE dev; + DWORD lpBytesReturned; + + dev = CreateFile(L"\\\\.\\hackssign", + GENERIC_READ | GENERIC_WRITE, + FILE_SHARE_READ | FILE_SHARE_WRITE, + NULL, OPEN_EXISTING, 0, NULL); + if (dev == INVALID_HANDLE_VALUE) + { + wprintf(L"Opening device failed\n"); + return FALSE; + } + + ret = DeviceIoControl(dev, dwIoControlCode, lpInBuffer, nInBufferSize, NULL, 0, &lpBytesReturned, NULL); + wprintf(L"Done: it %s with error: %lx\n", (ret != 0 ? L"succeed" : L"failed"), (ret != 0 ? ERROR_SUCCESS : GetLastError())); + + CloseHandle(dev); + + return ret; +} + + +BOOL startService() +{ + PWSTR fileName; + WCHAR path[MAX_PATH]; + SC_HANDLE hManager, hService; + + hManager = OpenSCManager(NULL, NULL, SC_MANAGER_CREATE_SERVICE); + if (hManager == NULL) + { + wprintf(L"Service manager opening failed\n"); + return FALSE; + } + + hService = OpenService(hManager, L"hackssign", SERVICE_START | SERVICE_STOP | DELETE); + if (hService == NULL) + { + if (GetModuleFileName(NULL, path, MAX_PATH) == 0) + { + wprintf(L"Getting own path failed\n"); + CloseServiceHandle(hManager); + return FALSE; + } + + fileName = wcsrchr(path, L'\\'); + if (fileName == NULL) + { + wprintf(L"Invalid path: %s\n", path); + CloseServiceHandle(hManager); + return FALSE; + } + + ++fileName; + *fileName = UNICODE_NULL; + wcscat(path, L"hackssign_driver.sys"); + + if (GetFileAttributes(path) == INVALID_FILE_ATTRIBUTES) + { + wprintf(L"Driver not found: %s\n", path); + CloseServiceHandle(hManager); + return FALSE; + } + + hService = CreateService(hManager, L"hackssign", L"hackssign", + SERVICE_START | SERVICE_STOP | DELETE, SERVICE_KERNEL_DRIVER, + SERVICE_DEMAND_START, SERVICE_ERROR_NORMAL, path, NULL, NULL, + NULL, NULL, NULL); + if (hService == NULL) + { + wprintf(L"Creating service failed\n"); + CloseServiceHandle(hManager); + return FALSE; + } + } + + if (!StartService(hService, 0, NULL) && + GetLastError() != ERROR_SERVICE_ALREADY_RUNNING) + { + wprintf(L"Starting service failed\n"); + CloseServiceHandle(hService); + CloseServiceHandle(hManager); + return FALSE; + } + + wprintf(L"Starting service succeed\n"); + CloseServiceHandle(hService); + CloseServiceHandle(hManager); + return TRUE; +} + +int assignLetter(WCHAR letter, PCWSTR path, PCWSTR device) +{ + BOOL ret; + DWORD len; + PWSTR str; + HV_TYPES vm; + WCHAR capsLetter; + DWORD inputBufferSize; + PASSIGN_INPUT inputBuffer; + + for (vm = vmVMware; vm < vmMax; ++vm) + { + if (_wcsicmp(device, hV[vm]) == 0) + { + break; + } + } + if (vm == vmMax) + { + wprintf(L"Unsupported VM type\n"); + return 1; + } + + if (iswalpha(letter) == 0) + { + wprintf(L"Invalid letter provided\n"); + return 1; + } + + capsLetter = towupper(letter); + if (capsLetter == L'C') + { + wprintf(L"Looks suspicious, won't proceed\n"); + return 1; + } + + len = wcslen(path); + if (len == 0) + { + wprintf(L"Invalid share name\n"); + return 1; + } + + if (wcschr(path, L'\\') != NULL) + { + wprintf(L"Only give the name of a share\n"); + return 1; + } + + inputBufferSize = len * sizeof(WCHAR) + sizeof(ASSIGN_INPUT) + (wcslen(dev[vm]) + wcslen(unc[vm]) + 2) * sizeof(WCHAR); + inputBuffer = malloc(inputBufferSize); + if (inputBuffer == NULL) + { + wprintf(L"Memory failure\n"); + return 1; + } + + inputBuffer->letter = capsLetter; + inputBuffer->offset = sizeof(ASSIGN_INPUT); + inputBuffer->len = len * sizeof(WCHAR) + (wcslen(dev[vm]) + wcslen(unc[vm]) + 1) * sizeof(WCHAR); + str = (PWSTR)((ULONG_PTR)inputBuffer + inputBuffer->offset); + swprintf(str, L"%s%c%s%s", dev[vm], capsLetter, unc[vm], path); + + if (!startService()) + { + free(inputBuffer); + return 1; + } + + Sleep(500); + + ret = performDevIoCtl(FSCTL_HACKSSIGN_ASSIGN, inputBuffer, inputBufferSize); + free(inputBuffer); + + return (ret == FALSE); +} + +int deleteLetter(WCHAR letter) +{ + WCHAR capsLetter; + + if (iswalpha(letter) == 0) + { + wprintf(L"Invalid letter provided\n"); + return 1; + } + + capsLetter = towupper(letter); + if (capsLetter == L'C') + { + wprintf(L"Looks suspicious, won't proceed\n"); + return 1; + } + + if (!startService()) + { + return 1; + } + + Sleep(500); + + return (performDevIoCtl(FSCTL_HACKSSIGN_DELETE, &capsLetter, sizeof(WCHAR)) == FALSE); +} + +void printUsage(void) +{ + wprintf(L"ReactOS Hackssign application\n"); + wprintf(L"\assign <letter> <share name> <vmtype>: Assign a drive letter to the share given the VM type\n"); + wprintf(L"\t\tVM types are: vmware or virtual\n"); + wprintf(L"\tdelete <letter>: delete driver letter assignation\n"); +} + +int wmain(int argc, wchar_t *argv[]) +{ + PCWSTR cmd; + + if (argc < 3) + { + printUsage(); + return 0; + } + + cmd = argv[1]; + + if (_wcsicmp(cmd, L"assign") == 0) + { + if (argc < 5) + { + printUsage(); + return 0; + } + + return assignLetter(argv[2][0], argv[3], argv[4]); + } + else if (_wcsicmp(cmd, L"delete") == 0) + { + return deleteLetter(argv[2][0]); + } + else + { + printUsage(); + return 0; + } +} Propchange: trunk/rosapps/applications/cmdutils/hackssign/client.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rosapps/applications/cmdutils/hackssign/driver.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/cmdutils/hack… ============================================================================== --- trunk/rosapps/applications/cmdutils/hackssign/driver.c (added) +++ trunk/rosapps/applications/cmdutils/hackssign/driver.c [iso-8859-1] Sat Aug 22 12:29:37 2015 @@ -0,0 +1,198 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: Hackssign application & driver + * FILE: cmdutils/hackssign/driver.c + * PURPOSE: Driver: Assign drive letter to shared folders for VMware/VBox VMs + * PROGRAMMERS: Pierre Schweitzer <pierre(a)reactos.org> + */ + +#include <wdm.h> +#include <ntifs.h> +#include <wchar.h> +#define NDEBUG +#include <debug.h> + +#include "ioctl.h" + +typedef struct _HS_VCB +{ + SHARE_ACCESS shareAccess; +} HS_VCB, *PHS_VCB; + +ERESOURCE globalLock; +PDEVICE_OBJECT gDevObj; + +NTSTATUS +NTAPI +hsDispatch(PDEVICE_OBJECT DeviceObject, + PIRP Irp) +{ + PHS_VCB vcb; + NTSTATUS status; + WCHAR dosBuffer[7]; + PFILE_OBJECT fileObject; + PIO_STACK_LOCATION stack; + PASSIGN_INPUT inputBuffer; + UNICODE_STRING target, source; + + FsRtlEnterFileSystem(); + ExAcquireResourceExclusiveLite(&globalLock, TRUE); + + stack = IoGetCurrentIrpStackLocation(Irp); + fileObject = stack->FileObject; + switch (stack->MajorFunction) + { + case IRP_MJ_CREATE: + if (fileObject->FileName.Length != 0) + { + status = STATUS_INVALID_DEVICE_REQUEST; + break; + } + + status = IoCheckShareAccess(stack->Parameters.Create.SecurityContext->DesiredAccess, + stack->Parameters.Create.ShareAccess, + fileObject, &((PHS_VCB)DeviceObject->DeviceExtension)->shareAccess, TRUE); + if (NT_SUCCESS(status)) + { + DPRINT1("Device opened\n"); + + Irp->IoStatus.Information = FILE_OPENED; + fileObject->FsContext = DeviceObject->DeviceExtension; + status = STATUS_SUCCESS; + } + break; + + case IRP_MJ_FILE_SYSTEM_CONTROL: + if (stack->Parameters.FileSystemControl.FsControlCode == FSCTL_HACKSSIGN_ASSIGN) + { + if (stack->Parameters.FileSystemControl.InputBufferLength <= sizeof(ASSIGN_INPUT) || + Irp->AssociatedIrp.SystemBuffer == NULL) + { + status = STATUS_INVALID_DEVICE_REQUEST; + break; + } + + inputBuffer = Irp->AssociatedIrp.SystemBuffer; + + swprintf(dosBuffer, L"\\??\\%c:", inputBuffer->letter); + RtlInitUnicodeString(&source, dosBuffer); + target.Buffer = (PWSTR)((ULONG_PTR)inputBuffer + inputBuffer->offset); + target.Length = inputBuffer->len; + target.MaximumLength = target.Length; + + DPRINT1("Will link %wZ to %wZ\n", &source, &target); + + status = IoCreateSymbolicLink(&source, &target); + break; + } + else if (stack->Parameters.FileSystemControl.FsControlCode == FSCTL_HACKSSIGN_DELETE) + { + if (stack->Parameters.FileSystemControl.InputBufferLength < sizeof(WCHAR) || + Irp->AssociatedIrp.SystemBuffer == NULL) + { + status = STATUS_INVALID_DEVICE_REQUEST; + break; + } + + inputBuffer = Irp->AssociatedIrp.SystemBuffer; + + swprintf(dosBuffer, L"\\??\\%c:", inputBuffer->letter); + RtlInitUnicodeString(&source, dosBuffer); + + DPRINT1("Will unlink %wZ\n", &source); + + status = IoDeleteSymbolicLink(&source); + break; + } + + status = STATUS_INVALID_DEVICE_REQUEST; + break; + + case IRP_MJ_CLEANUP: + vcb = fileObject->FsContext; + if (vcb == NULL) + { + status = STATUS_INVALID_HANDLE; + break; + } + + DPRINT1("Device cleaned up\n"); + IoRemoveShareAccess(fileObject, &vcb->shareAccess); + status = STATUS_SUCCESS; + break; + + case IRP_MJ_CLOSE: + vcb = fileObject->FsContext; + if (vcb == NULL) + { + status = STATUS_INVALID_HANDLE; + break; + } + + DPRINT1("Device closed\n"); + fileObject->FsContext = NULL; + status = STATUS_SUCCESS; + break; + + default: + status = STATUS_INVALID_DEVICE_REQUEST; + break; + } + + ExReleaseResourceLite(&globalLock); + FsRtlExitFileSystem(); + + Irp->IoStatus.Status = status; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + + return status; +} + +VOID +NTAPI +hsUnload(PDRIVER_OBJECT DriverObject) +{ + IoDeleteDevice(gDevObj); + ExDeleteResourceLite(&globalLock); +} + +NTSTATUS +NTAPI +DriverEntry(PDRIVER_OBJECT DriverObject, + PUNICODE_STRING RegistryPath) +{ + NTSTATUS status; + PDEVICE_OBJECT devObj; + UNICODE_STRING devName, uDevName; + + DPRINT1("Starting hackssign driver\n"); + + RtlInitUnicodeString(&devName, L"\\Device\\hackssign"); + status = IoCreateDevice(DriverObject, sizeof(HS_VCB), &devName, FILE_DEVICE_FILE_SYSTEM, 0, FALSE, &devObj); + if (!NT_SUCCESS(status)) + { + DPRINT1("IoCreateDevice failed\n"); + return status; + } + + RtlInitUnicodeString(&uDevName, L"\\??\\hackssign"); + status = IoCreateSymbolicLink(&uDevName, &devName); + if (!NT_SUCCESS(status)) + { + DPRINT1("IoCreateSymbolicLink failed\n"); + IoDeleteDevice(devObj); + return status; + } + + gDevObj = devObj; + ExInitializeResourceLite(&globalLock); + RtlZeroMemory(devObj->DeviceExtension, sizeof(HS_VCB)); + + DriverObject->DriverUnload = hsUnload; + DriverObject->MajorFunction[IRP_MJ_CREATE] = hsDispatch; + DriverObject->MajorFunction[IRP_MJ_FILE_SYSTEM_CONTROL] = hsDispatch; + DriverObject->MajorFunction[IRP_MJ_CLEANUP] = hsDispatch; + DriverObject->MajorFunction[IRP_MJ_CLOSE] = hsDispatch; + + return STATUS_SUCCESS; +} Propchange: trunk/rosapps/applications/cmdutils/hackssign/driver.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rosapps/applications/cmdutils/hackssign/hackssign.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/cmdutils/hack… ============================================================================== --- trunk/rosapps/applications/cmdutils/hackssign/hackssign.rc (added) +++ trunk/rosapps/applications/cmdutils/hackssign/hackssign.rc [iso-8859-1] Sat Aug 22 12:29:37 2015 @@ -0,0 +1,5 @@ + +#define REACTOS_STR_FILE_DESCRIPTION "Hack assign letters\0" +#define REACTOS_STR_INTERNAL_NAME "hackssign\0" +#define REACTOS_STR_ORIGINAL_FILENAME "hackssign.exe\0" +#include <reactos/version.rc> Propchange: trunk/rosapps/applications/cmdutils/hackssign/hackssign.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rosapps/applications/cmdutils/hackssign/ioctl.h URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/cmdutils/hack… ============================================================================== --- trunk/rosapps/applications/cmdutils/hackssign/ioctl.h (added) +++ trunk/rosapps/applications/cmdutils/hackssign/ioctl.h [iso-8859-1] Sat Aug 22 12:29:37 2015 @@ -0,0 +1,9 @@ +typedef struct _ASSIGN_INPUT +{ + WCHAR letter; + USHORT offset; + USHORT len; +} ASSIGN_INPUT, *PASSIGN_INPUT; + +#define FSCTL_HACKSSIGN_ASSIGN CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 0x42, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define FSCTL_HACKSSIGN_DELETE CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 42, METHOD_BUFFERED, FILE_ANY_ACCESS) Propchange: trunk/rosapps/applications/cmdutils/hackssign/ioctl.h ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rosapps/applications/cmdutils/rosvboxmgmt/rosvboxmgmt.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/cmdutils/rosv… ============================================================================== --- trunk/rosapps/applications/cmdutils/rosvboxmgmt/rosvboxmgmt.c [iso-8859-1] (original) +++ trunk/rosapps/applications/cmdutils/rosvboxmgmt/rosvboxmgmt.c [iso-8859-1] Sat Aug 22 12:29:37 2015 @@ -1,3 +1,11 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS VBox Shared Folders Management + * FILE: cmdutils/hackssign/client.c + * PURPOSE: Communicate with VBox mini redirector to deal with shared folders + * PROGRAMMERS: Pierre Schweitzer <pierre(a)reactos.org> + */ + #include <stdio.h> #include <wchar.h> #include <windows.h>

9 years, 4 months

[bfreisen] 68793: [HHPCOMP] Remove __inline to fix VS 2015 build. See CORE-10013.

by bfreisen＠svn.reactos.org

Author: bfreisen Date: Sat Aug 22 11:41:11 2015 New Revision: 68793 URL: http://svn.reactos.org/svn/reactos?rev=68793&view=rev Log: [HHPCOMP] Remove __inline to fix VS 2015 build. See CORE-10013. Modified: trunk/reactos/tools/hhpcomp/lzx_compress/lz_nonslide.c Modified: trunk/reactos/tools/hhpcomp/lzx_compress/lz_nonslide.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/hhpcomp/lzx_compress… ============================================================================== --- trunk/reactos/tools/hhpcomp/lzx_compress/lz_nonslide.c [iso-8859-1] (original) +++ trunk/reactos/tools/hhpcomp/lzx_compress/lz_nonslide.c [iso-8859-1] Sat Aug 22 11:41:11 2015 @@ -139,7 +139,7 @@ } #endif -__inline int lz_left_to_process(lz_info *lzi) +int lz_left_to_process(lz_info *lzi) { return lzi->chars_in_buf - lzi->block_loc; }

9 years, 4 months

[bfreisen] 68792: [HHPCOMP] Improve functionality of Windows MSVC build. Based on a WIP patch by Michael Fritscher. See CORE-10019.

by bfreisen＠svn.reactos.org

Author: bfreisen Date: Sat Aug 22 11:16:50 2015 New Revision: 68792 URL: http://svn.reactos.org/svn/reactos?rev=68792&view=rev Log: [HHPCOMP] Improve functionality of Windows MSVC build. Based on a WIP patch by Michael Fritscher. See CORE-10019. Modified: trunk/reactos/tools/hhpcomp/chmc/chmc.c trunk/reactos/tools/hhpcomp/hhpcomp.cpp trunk/reactos/tools/hhpcomp/port/mkstemps.c Modified: trunk/reactos/tools/hhpcomp/chmc/chmc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/hhpcomp/chmc/chmc.c?… ============================================================================== --- trunk/reactos/tools/hhpcomp/chmc/chmc.c [iso-8859-1] (original) +++ trunk/reactos/tools/hhpcomp/chmc/chmc.c [iso-8859-1] Sat Aug 22 11:16:50 2015 @@ -44,6 +44,11 @@ #include "../lzx_compress/lzx_compress.h" #define PACKAGE_STRING "hhpcomp development version" + +/* if O_BINARY is not defined, the system is probably not expecting any such flag */ +#ifndef O_BINARY +#define O_BINARY 0 +#endif int chmc_section_add(struct chmcFile *chm, const char *name); struct chmcSection * chmc_section_create(struct chmcFile *chm, @@ -133,7 +138,7 @@ chm->config = config; if (strcmp(filename, "-") != 0) { - chm->fd = creat(filename, 0644); + chm->fd = open(filename, O_RDWR | O_CREAT | O_TRUNC | O_BINARY, 0644); if (chm->fd < 0) { chmcerr_set(errno, strerror(errno)); chmcerr_return_msg("creat file '%s'", filename); @@ -978,7 +983,9 @@ struct chmcLzxInfo *lzx_info = (struct chmcLzxInfo *)arg; struct chmcSect0 *sect0 = &lzx_info->chm->sect0; int wx; - + static int counter = 0; + + counter += n; wx = write(lzx_info->section->fd, buf, n); sect0->file_len += wx; lzx_info->section->len += wx; @@ -1025,7 +1032,7 @@ // need to keep current entry file and offset trought blocks // until last entry while (todo) { - // end of entris reached? + // end of entries reached? if (lzx_info->pos == &chm->entries_list) { lzx_info->eof = 1; break; @@ -1046,7 +1053,7 @@ else if (lzx_info->fd == -1) { // open file if it isn't - lzx_info->fd = open(node->name, O_RDONLY); + lzx_info->fd = open(node->name, O_RDONLY | O_BINARY); if (lzx_info->fd < 0) { chmc_error("%s: %d: error %d: '%s' %s\n", __FILE__, __LINE__, @@ -1073,7 +1080,8 @@ { rx = read(lzx_info->fd, (char *)buf + (n - todo), toread); if (rx <= 0) { - chmc_error("read error\n"); + int temp = errno; + chmc_error("read error %s \n", strerror(temp)); lzx_info->error = 2; break; } @@ -1610,18 +1618,24 @@ assert(chm); + chmc_dump("write itsf %d\n", _CHMC_ITSF_V3_LEN); write(chm->fd, itsf, _CHMC_ITSF_V3_LEN); + chmc_dump("write sect0 %d\n", _CHMC_SECT0_LEN); write(chm->fd, sect0, _CHMC_SECT0_LEN); + chmc_dump("write itsp %d\n", _CHMC_ITSP_V1_LEN); write(chm->fd, itsp, _CHMC_ITSP_V1_LEN); list_for_each(pos, &chm->pmgl_list) { pmgl = list_entry(pos, struct chmcPmglChunkNode, list); + chmc_dump("write pmgl %d\n", _CHMC_CHUNK_LEN); write(chm->fd, &pmgl->chunk, _CHMC_CHUNK_LEN); } + chmc_dump("itsp->num_blocks %d", itsp->num_blocks); if (itsp->num_blocks > 1) { list_for_each( pos, &chm->pmgi_list ) { pmgi = list_entry(pos, struct chmcPmgiChunkNode, list); + chmc_dump("write pmgi %d\n", _CHMC_CHUNK_LEN); write(chm->fd, &pmgi->chunk, _CHMC_CHUNK_LEN); } } @@ -1640,7 +1654,7 @@ if (stat(filename, &statbuf) < 0) return errno; - in = open(filename, O_RDONLY); + in = open(filename, O_RDONLY | O_BINARY); if (in >= 0) { todo = statbuf.st_size; Modified: trunk/reactos/tools/hhpcomp/hhpcomp.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/hhpcomp/hhpcomp.cpp?… ============================================================================== --- trunk/reactos/tools/hhpcomp/hhpcomp.cpp [iso-8859-1] (original) +++ trunk/reactos/tools/hhpcomp/hhpcomp.cpp [iso-8859-1] Sat Aug 22 11:16:50 2015 @@ -62,11 +62,14 @@ struct chmcFile chm; struct chmcConfig chm_config; + memset(&chm, 0, sizeof(struct chmcFile)); + memset(&chm_config, 0, sizeof(struct chmcConfig)); chm_config.title = project_file.get_title_string().c_str(); chm_config.hhc = project_file.get_contents_file_string().c_str(); chm_config.hhk = project_file.get_index_file_string().c_str(); chm_config.deftopic = project_file.get_default_topic_string().c_str(); chm_config.language = project_file.get_language_code(); + chm_config.tmpdir = "."; int err; err = chmc_init(&chm, replace_backslashes(project_file.get_compiled_file_string()).c_str(), &chm_config); Modified: trunk/reactos/tools/hhpcomp/port/mkstemps.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/hhpcomp/port/mkstemp… ============================================================================== --- trunk/reactos/tools/hhpcomp/port/mkstemps.c [iso-8859-1] (original) +++ trunk/reactos/tools/hhpcomp/port/mkstemps.c [iso-8859-1] Sat Aug 22 11:16:50 2015 @@ -46,6 +46,11 @@ #define TMP_MAX 16384 #endif +/* if O_BINARY is not defined, the system is probably not expecting any such flag */ +#ifndef O_BINARY +#define O_BINARY 0 +#endif + /* @deftypefn Replacement int mkstemps (char *@var{template}, int @var{suffix_len}) @@ -87,6 +92,7 @@ if ((int) len < 6 + suffix_len || strncmp (&template[len - 6 - suffix_len], "XXXXXX", 6)) { + printf("wrong parameter\n"); return -1; } @@ -121,7 +127,7 @@ #ifdef VMS fd = open (template, O_RDWR|O_CREAT|O_EXCL, 0600, "fop=tmd"); #else - fd = open (template, O_RDWR|O_CREAT|O_EXCL, 0600); + fd = open (template, O_RDWR|O_CREAT|O_EXCL|O_BINARY, 0600); #endif if (fd >= 0) /* The file does not exist. */

9 years, 4 months

[dquintana] 68791: [BROWSEUI] [OLEAUT32] [DDK] [PSDK] [STLPORT] [CPPRT] Port the vs2015 fixes to also work on x64 [HHCOMP] Fix compilation with VS in x64 mode

by dquintana＠svn.reactos.org

Author: dquintana Date: Sat Aug 22 00:17:15 2015 New Revision: 68791 URL: http://svn.reactos.org/svn/reactos?rev=68791&view=rev Log: [BROWSEUI] [OLEAUT32] [DDK] [PSDK] [STLPORT] [CPPRT] Port the vs2015 fixes to also work on x64 [HHCOMP] Fix compilation with VS in x64 mode Modified: trunk/reactos/dll/win32/browseui/utility.cpp trunk/reactos/dll/win32/oleaut32/tmarshal.c trunk/reactos/include/ddk/stdunk.h trunk/reactos/include/psdk/kcom.h trunk/reactos/lib/3rdparty/stlport/test/eh/nc_alloc.cpp trunk/reactos/lib/sdk/cpprt/amd64/cpprt.s trunk/reactos/tools/hhpcomp/chmc/chm.h Modified: trunk/reactos/dll/win32/browseui/utility.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/utility… ============================================================================== --- trunk/reactos/dll/win32/browseui/utility.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/utility.cpp [iso-8859-1] Sat Aug 22 00:17:15 2015 @@ -10,7 +10,7 @@ LocalFree(p); } -void operator delete(void *p, unsigned int) +void operator delete(void *p, UINT_PTR) { LocalFree(p); } Modified: trunk/reactos/dll/win32/oleaut32/tmarshal.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/tmarsha… ============================================================================== --- trunk/reactos/dll/win32/oleaut32/tmarshal.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/oleaut32/tmarshal.c [iso-8859-1] Sat Aug 22 00:17:15 2015 @@ -1785,7 +1785,11 @@ /* nrofargs including This */ int nrofargs = 1; ITypeInfo *tinfo2; + +#ifdef __i386__ TMAsmProxy *xasm = proxy->asmstubs + num; +#endif + HRESULT hres; const FUNCDESC *fdesc; Modified: trunk/reactos/include/ddk/stdunk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/stdunk.h?rev=6… ============================================================================== --- trunk/reactos/include/ddk/stdunk.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/stdunk.h [iso-8859-1] Sat Aug 22 00:17:15 2015 @@ -206,7 +206,7 @@ inline void __cdecl operator delete( - PVOID ptr, UINT) + PVOID ptr, UINT_PTR) { ExFreePool(ptr); } Modified: trunk/reactos/include/psdk/kcom.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/kcom.h?rev=68… ============================================================================== --- trunk/reactos/include/psdk/kcom.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/kcom.h [iso-8859-1] Sat Aug 22 00:17:15 2015 @@ -235,7 +235,7 @@ } inline void __cdecl operator delete( - PVOID pVoid, UINT) + PVOID pVoid, UINT_PTR) { if (pVoid) ExFreePool(pVoid); } Modified: trunk/reactos/lib/3rdparty/stlport/test/eh/nc_alloc.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/stlport/test/… ============================================================================== --- trunk/reactos/lib/3rdparty/stlport/test/eh/nc_alloc.cpp [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/stlport/test/eh/nc_alloc.cpp [iso-8859-1] Sat Aug 22 00:17:15 2015 @@ -265,9 +265,9 @@ } #if defined (EH_DELETE_HAS_THROW_SPEC) -void _STLP_CALL operator delete(void* s, unsigned int) throw() -#else -void _STLP_CALL operator delete(void* s, unsigned int) +void _STLP_CALL operator delete(void* s, uintptr_t) throw() +#else +void _STLP_CALL operator delete(void* s, uintptr_t) #endif { ::operator delete(s); Modified: trunk/reactos/lib/sdk/cpprt/amd64/cpprt.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/cpprt/amd64/cpprt.… ============================================================================== --- trunk/reactos/lib/sdk/cpprt/amd64/cpprt.s [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/cpprt/amd64/cpprt.s [iso-8859-1] Sat Aug 22 00:17:15 2015 @@ -9,6 +9,12 @@ ; void __cdecl `eh vector constructor iterator'(void * __ptr64,unsigned __int64,int,void (__cdecl*)(void * __ptr64),void (__cdecl*)(void * __ptr64)) DEFINE_ALIAS ??_L@YAXPEAX_KHP6AX0@Z2@Z, ?MSVCRTEX_eh_vector_constructor_iterator@@YAXPEAX_KHP6AX0@Z2@Z + +; void __cdecl `eh vector constructor iterator'(void *,unsigned __int64,unsigned __int64,void (__cdecl*)(void *),void (__cdecl*)(void *))" +DEFINE_ALIAS ??_L@YAXPEAX_K1P6AX0@Z2@Z, ?MSVCRTEX_eh_vector_constructor_iterator@@YAXPEAX_KHP6AX0@Z2@Z + +; void __cdecl `eh vector destructor iterator'(void *,unsigned __int64,unsigned __int64,void (__cdecl*)(void *)) +DEFINE_ALIAS ??_M@YAXPEAX_K1P6AX0@Z@Z, ?MSVCRTEX_eh_vector_destructor_iterator@@YAXPEAX_KHP6AX0@Z@Z ; void __cdecl `eh vector destructor iterator'(void * __ptr64,unsigned __int64,int,void (__cdecl*)(void * __ptr64)) DEFINE_ALIAS ??_M@YAXPEAX_KHP6AX0@Z@Z, ?MSVCRTEX_eh_vector_destructor_iterator@@YAXPEAX_KHP6AX0@Z@Z @@ -22,4 +28,7 @@ ; void __cdecl operator delete[](void * __ptr64,struct std::nothrow_t const & __ptr64) DEFINE_ALIAS ??_V@YAXPEAXAEBUnothrow_t@std@@@Z, ??3@YAXPEAX@Z +; void __cdecl operator delete(void *,unsigned __int64) +DEFINE_ALIAS ??3@YAXPEAX_K@Z, ??3@YAXPEAX@Z + END Modified: trunk/reactos/tools/hhpcomp/chmc/chm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/hhpcomp/chmc/chm.h?r… ============================================================================== --- trunk/reactos/tools/hhpcomp/chmc/chm.h [iso-8859-1] (original) +++ trunk/reactos/tools/hhpcomp/chmc/chm.h [iso-8859-1] Sat Aug 22 00:17:15 2015 @@ -35,8 +35,8 @@ * many bits as they specify. */ -/* i386, 32-bit, Windows */ -#ifdef WIN32 +/* i386, 32-bit/64-bit, Windows */ +#ifdef _MSC_VER typedef unsigned char UChar; typedef __int16 Int16; typedef unsigned __int16 UInt16;

9 years, 4 months

[sginsberg] 68790: - Fix a "clever" check in KdpDeleteBreakpointRange that made the routine unable to delete more than one breakpoint in the specified range.

by sginsberg＠svn.reactos.org

Author: sginsberg Date: Fri Aug 21 20:57:19 2015 New Revision: 68790 URL: http://svn.reactos.org/svn/reactos?rev=68790&view=rev Log: - Fix a "clever" check in KdpDeleteBreakpointRange that made the routine unable to delete more than one breakpoint in the specified range. Modified: trunk/reactos/ntoskrnl/kd64/kdbreak.c Modified: trunk/reactos/ntoskrnl/kd64/kdbreak.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kd64/kdbreak.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/kd64/kdbreak.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/kd64/kdbreak.c [iso-8859-1] Fri Aug 21 20:57:19 2015 @@ -206,7 +206,10 @@ IN PVOID Limit) { ULONG BpIndex; - BOOLEAN Return = FALSE; + BOOLEAN DeletedBreakpoints; + + /* Assume no breakpoints will be deleted */ + DeletedBreakpoints = FALSE; /* Loop the breakpoint table */ for (BpIndex = 0; BpIndex < KD_BREAKPOINT_MAX; BpIndex++) @@ -216,13 +219,13 @@ ((KdpBreakpointTable[BpIndex].Address >= Base) && (KdpBreakpointTable[BpIndex].Address <= Limit))) { - /* Delete it */ - Return = Return || KdpDeleteBreakpoint(BpIndex + 1); - } - } - - /* Return to caller */ - return Return; + /* Delete it, and remember if we succeeded at least once */ + if (KdpDeleteBreakpoint(BpIndex + 1)) DeletedBreakpoints = TRUE; + } + } + + /* Return whether we deleted anything */ + return DeletedBreakpoints; } VOID

9 years, 4 months

[pschweitzer] 68789: [MUP] Now we know MUP is working, reduce a bit its verbosity

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Fri Aug 21 20:44:30 2015 New Revision: 68789 URL: http://svn.reactos.org/svn/reactos?rev=68789&view=rev Log: [MUP] Now we know MUP is working, reduce a bit its verbosity Modified: trunk/reactos/drivers/filesystems/mup/mup.c Modified: trunk/reactos/drivers/filesystems/mup/mup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/mup/mu… ============================================================================== --- trunk/reactos/drivers/filesystems/mup/mup.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/mup/mup.c [iso-8859-1] Fri Aug 21 20:44:30 2015 @@ -1620,7 +1620,7 @@ if (References != 0) { - DPRINT1("Still having refs (%ld)\n", References); + DPRINT("Still having refs (%ld)\n", References); return STATUS_PENDING; } @@ -1700,7 +1700,7 @@ MasterQueryContext = QueryContext->MasterQueryContext; Status = Irp->IoStatus.Status; - DPRINT1("Reply from %wZ: %u (Status: %lx)\n", &QueryContext->UncProvider->DeviceName, QueryResponse->LengthAccepted, Status); + DPRINT("Reply from %wZ: %u (Status: %lx)\n", &QueryContext->UncProvider->DeviceName, QueryResponse->LengthAccepted, Status); ExAcquireResourceExclusiveLite(&MasterQueryContext->QueryPathListLock, TRUE); RemoveEntryList(&QueryContext->QueryPathListEntry); @@ -1920,7 +1920,7 @@ { Prefix = CONTAINING_RECORD(TableEntry, MUP_PFX, PrefixTableEntry); - DPRINT1("Matching prefix found: %wZ\n", &Prefix->AcceptedPrefix); + DPRINT("Matching prefix found: %wZ\n", &Prefix->AcceptedPrefix); /* If so, check whether the prefix is still valid */ KeQuerySystemTime(&CurrentTime); @@ -2115,7 +2115,7 @@ /* Query the provider !*/ DPRINT1("Requeting UNC provider: %wZ\n", &UncProvider->DeviceName); - DPRINT1("Calling: %wZ\n", &UncProvider->DeviceObject->DriverObject->DriverName); + DPRINT("Calling: %wZ\n", &UncProvider->DeviceObject->DriverObject->DriverName); Status = IoCallDriver(UncProvider->DeviceObject, QueryIrp); }

9 years, 4 months

[pschweitzer] 68788: [NTOSKRNL] Don't enforce tag on free, it may have been reallocated by someone else (Ob)

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Fri Aug 21 20:40:47 2015 New Revision: 68788 URL: http://svn.reactos.org/svn/reactos?rev=68788&view=rev Log: [NTOSKRNL] Don't enforce tag on free, it may have been reallocated by someone else (Ob) Modified: trunk/reactos/ntoskrnl/io/iomgr/file.c Modified: trunk/reactos/ntoskrnl/io/iomgr/file.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/file.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/file.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/file.c [iso-8859-1] Fri Aug 21 20:40:47 2015 @@ -981,7 +981,7 @@ /* Release the old one */ if (CompleteName->Buffer != NULL) { - ExFreePoolWithTag(CompleteName->Buffer, TAG_IO_NAME); + ExFreePoolWithTag(CompleteName->Buffer, 0); } /* And setup the new one */

9 years, 4 months

[gadamopoulos] 68787: [SHELL32] - Hackplement support for parsing UNC paths. We are not able to enumerate UNC shares yet. However until it is properly implemented we will be able to enter a UNC pat...

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Fri Aug 21 18:35:07 2015 New Revision: 68787 URL: http://svn.reactos.org/svn/reactos?rev=68787&view=rev Log: [SHELL32] - Hackplement support for parsing UNC paths. We are not able to enumerate UNC shares yet. However until it is properly implemented we will be able to enter a UNC patch in the addressbar or start explorer with a path that points to a UNC share. Modified: trunk/reactos/dll/win32/shell32/folders/CNetFolder.cpp Modified: trunk/reactos/dll/win32/shell32/folders/CNetFolder.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/… ============================================================================== --- trunk/reactos/dll/win32/shell32/folders/CNetFolder.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/folders/CNetFolder.cpp [iso-8859-1] Fri Aug 21 18:35:07 2015 @@ -25,6 +25,8 @@ WINE_DEFAULT_DEBUG_CHANNEL (shell); +#define HACKY_UNC_PATHS + /*********************************************************************** * IShellFolder implementation */ @@ -69,6 +71,31 @@ DWORD *pchEaten, PIDLIST_RELATIVE *ppidl, DWORD *pdwAttributes) { HRESULT hr = E_UNEXPECTED; +#ifdef HACKY_UNC_PATHS + /* FIXME: the code below is an ugly hack */ + + /* Can we use a CFSFolder on that path? */ + DWORD attrs = GetFileAttributes(lpszDisplayName); + if ((attrs & FILE_ATTRIBUTE_DIRECTORY)) + { + /* YES WE CAN */ + + /* Create our hacky pidl */ + int cbData = sizeof(WORD) + sizeof(WCHAR) * (wcslen(lpszDisplayName)+1); + LPITEMIDLIST pidl = (LPITEMIDLIST)SHAlloc(cbData + sizeof(WORD)); + if (!pidl) + return NULL; + + pidl->mkid.cb = cbData; + wcscpy((WCHAR*)&pidl->mkid.abID[0], lpszDisplayName); + *(WORD*)((char*)pidl + cbData) = 0; + + *ppidl = pidl; + if (pdwAttributes) + *pdwAttributes = SFGAO_FILESYSTEM | SFGAO_CANLINK | SFGAO_FOLDER | SFGAO_HASSUBFOLDER | SFGAO_FILESYSANCESTOR; + return S_OK; + } +#endif TRACE("(%p)->(HWND=%p,%p,%p=%s,%p,pidl=%p,%p)\n", this, hwndOwner, pbcReserved, lpszDisplayName, debugstr_w (lpszDisplayName), @@ -103,10 +130,40 @@ */ HRESULT WINAPI CNetFolder::BindToObject(PCUIDLIST_RELATIVE pidl, LPBC pbcReserved, REFIID riid, LPVOID *ppvOut) { - TRACE ("(%p)->(pidl=%p,%p,%s,%p)\n", this, - pidl, pbcReserved, shdebugstr_guid (&riid), ppvOut); - - return E_NOTIMPL; +#ifdef HACKY_UNC_PATHS + HRESULT hr; + CComPtr<IPersistFolder3> ppf3; + hr = SHCoCreateInstance(NULL, &CLSID_ShellFSFolder, NULL, IID_PPV_ARG(IPersistFolder3, &ppf3)); + if (FAILED(hr)) + return hr; + + PERSIST_FOLDER_TARGET_INFO pfti = {0}; + pfti.csidl = -1; + wcscpy(pfti.szTargetParsingName, (WCHAR*)pidl->mkid.abID); + + PCUIDLIST_RELATIVE pidlChild = ILCloneFirst (pidl); + + hr = ppf3->InitializeEx(NULL, ILCombine(pidlRoot,pidlChild), &pfti); + if (FAILED(hr)) + return hr; + + if (_ILIsPidlSimple (pidl)) + { + return ppf3->QueryInterface(riid, ppvOut); + } + else + { + CComPtr<IShellFolder> psf; + hr = ppf3->QueryInterface(IID_PPV_ARG(IShellFolder, &psf)); + if (FAILED(hr)) + return hr; + + return psf->BindToObject(ILGetNext (pidl), pbcReserved, riid, ppvOut); + } + +#else + return E_NOTIMPL; +#endif } /************************************************************************** @@ -190,6 +247,9 @@ else { /* FIXME: Implement when enumerating items is implemented */ +#ifdef HACKY_UNC_PATHS + *rgfInOut = SFGAO_FILESYSTEM | SFGAO_CANLINK | SFGAO_FOLDER | SFGAO_HASSUBFOLDER | SFGAO_FILESYSANCESTOR; +#endif } /* make sure SFGAO_VALIDATE is cleared, some apps depend on that */ @@ -299,7 +359,20 @@ CoTaskMemFree(pszName); return E_FAIL; } - +#ifdef HACKY_UNC_PATHS + else + { + LPCWSTR pstr = (LPCWSTR)pidl->mkid.abID; + pszName = (LPWSTR)CoTaskMemAlloc(MAX_PATH * sizeof(WCHAR)); + if (!pszName) + return E_OUTOFMEMORY; + + wcscpy(pszName, pstr); + strRet->pOleStr = pszName; + strRet->uType = STRRET_WSTR; + return S_OK; + } +#endif return E_NOTIMPL; }

9 years, 4 months

[gadamopoulos] 68786: [SHELL32] - We are not wine so we can speed things up by trying to read desktop.ini only for system folders.

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Fri Aug 21 16:03:14 2015 New Revision: 68786 URL: http://svn.reactos.org/svn/reactos?rev=68786&view=rev Log: [SHELL32] - We are not wine so we can speed things up by trying to read desktop.ini only for system folders. Modified: trunk/reactos/dll/win32/shell32/shlfolder.cpp Modified: trunk/reactos/dll/win32/shell32/shlfolder.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shlfolde… ============================================================================== --- trunk/reactos/dll/win32/shell32/shlfolder.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shlfolder.cpp [iso-8859-1] Fri Aug 21 16:03:14 2015 @@ -89,8 +89,7 @@ WCHAR wszFolderPath[MAX_PATH]; /* Hack around not having system attribute on non-Windows file systems */ - if (0) - dwAttrib = _ILGetFileAttributes(pidl, NULL, 0); + dwAttrib = _ILGetFileAttributes(pidl, NULL, 0); if (dwAttrib & FILE_ATTRIBUTE_SYSTEM) {

9 years, 4 months

← Newer
1
...
7
8
9
10
11
12
13
...
31
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 August 2015