Ros-diffs

ros-diffs@reactos.org

81390 discussions

[tfaber] 63012: [USP10] - Silence an excessively noisy DPRINT to make testman happier
by tfaber＠svn.reactos.org 27 Apr '14

27 Apr '14

Author: tfaber Date: Sun Apr 27 04:52:36 2014 New Revision: 63012 URL: http://svn.reactos.org/svn/reactos?rev=63012&view=rev Log: [USP10] - Silence an excessively noisy DPRINT to make testman happier Modified: trunk/reactos/dll/win32/usp10/opentype.c Modified: trunk/reactos/dll/win32/usp10/opentype.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/usp10/opentype.c… ============================================================================== --- trunk/reactos/dll/win32/usp10/opentype.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/usp10/opentype.c [iso-8859-1] Sun Apr 27 04:52:36 2014 @@ -933,7 +933,9 @@ } else if (GET_BE_WORD(ccsf1->SubstFormat) == 2) { +#ifndef __REACTOS__ FIXME(" TODO: subtype 2 (Class-based Chaining Context Glyph Substitution)\n"); +#endif continue; } else if (GET_BE_WORD(ccsf1->SubstFormat) == 3)

1 0

[pschweitzer] 63011: [NTOSKRNL] Implement IopOpenLinkOrRenameTarget(), IopGetBasicInformationFile(), IopGetFileInformation(). This implements renaming support in kernel via Nt/ZwSetInformationFile, ...
by pschweitzer＠svn.reactos.org 26 Apr '14

26 Apr '14

Author: pschweitzer Date: Sat Apr 26 19:36:51 2014 New Revision: 63011 URL: http://svn.reactos.org/svn/reactos?rev=63011&view=rev Log: [NTOSKRNL] Implement IopOpenLinkOrRenameTarget(), IopGetBasicInformationFile(), IopGetFileInformation(). This implements renaming support in kernel via Nt/ZwSetInformationFile, FileRenameInformation class. This is only the first part to get renaming properly work in ReactOS. As exposed by IopOpenLinkOrRenameTarget(), as second step, it's mandatory to implement support for parent directory open in FSDs (FastFAT at first). See tests for IoCreateFile in kmtests. I've some kind of patch for that purpose. Finally, as third step, it's required to implement support for FileRenameInformation in the FSDs. That part is likely to require way much more work (thanks fastfat <3). Regarding commented out code, I invite you to read as reference: http://fsfilters.blogspot.fr/2012/07/flags-of-fileobjects-part-v.html R. Nagar's book is still a good reference regarding since (if we forget bugs in code examples and stuff that got renamed). Modified: trunk/reactos/ntoskrnl/io/iomgr/iofunc.c Modified: trunk/reactos/ntoskrnl/io/iomgr/iofunc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/iofunc.c… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/iofunc.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/iofunc.c [iso-8859-1] Sat Apr 26 19:36:51 2014 @@ -633,6 +633,233 @@ /* Return the Length and Status. ReturnedLength is NOT optional */ *ReturnedLength = (ULONG)IoStatusBlock.Information; return Status; +} + +NTSTATUS +NTAPI +IopGetFileInformation(IN PFILE_OBJECT FileObject, + IN ULONG Length, + IN FILE_INFORMATION_CLASS FileInfoClass, + OUT PVOID Buffer, + OUT PULONG ReturnedLength) +{ + PIRP Irp; + KEVENT Event; + NTSTATUS Status; + PIO_STACK_LOCATION Stack; + PDEVICE_OBJECT DeviceObject; + IO_STATUS_BLOCK IoStatusBlock; + + PAGED_CODE(); + + /* Allocate an IRP */ + ObReferenceObject(FileObject); + DeviceObject = IoGetRelatedDeviceObject(FileObject); + Irp = IoAllocateIrp(DeviceObject->StackSize, FALSE); + if (Irp == NULL) + { + ObDereferenceObject(FileObject); + return STATUS_INSUFFICIENT_RESOURCES; + } + + /* Setup the IRP */ + Irp->UserIosb = &IoStatusBlock; + Irp->UserEvent = &Event; + Irp->Overlay.AsynchronousParameters.UserApcRoutine = NULL; + Irp->RequestorMode = KernelMode; + Irp->AssociatedIrp.SystemBuffer = Buffer; + Irp->Flags = IRP_SYNCHRONOUS_API | IRP_BUFFERED_IO | IRP_OB_QUERY_NAME; + Irp->Tail.Overlay.OriginalFileObject = FileObject; + Irp->Tail.Overlay.Thread = PsGetCurrentThread(); + + Stack = IoGetNextIrpStackLocation(Irp); + Stack->MajorFunction = IRP_MJ_QUERY_INFORMATION; + Stack->FileObject = FileObject; + Stack->Parameters.QueryFile.FileInformationClass = FileInfoClass; + Stack->Parameters.QueryFile.Length = Length; + + + /* Queue the IRP */ + IopQueueIrpToThread(Irp); + + /* Call the driver */ + Status = IoCallDriver(DeviceObject, Irp); + if (Status == STATUS_PENDING) + { + KeWaitForSingleObject(&Event, Executive, KernelMode, FALSE, NULL); + Status = IoStatusBlock.Status; + } + + *ReturnedLength = IoStatusBlock.Information; + return Status; +} + +NTSTATUS +NTAPI +IopGetBasicInformationFile(IN PFILE_OBJECT FileObject, + OUT PFILE_BASIC_INFORMATION BasicInfo) +{ + ULONG ReturnedLength; + PDEVICE_OBJECT DeviceObject; + IO_STATUS_BLOCK IoStatusBlock; + + PAGED_CODE(); + + /* Try to do it the fast way if possible */ + DeviceObject = IoGetRelatedDeviceObject(FileObject); + if (DeviceObject->DriverObject->FastIoDispatch != NULL && + DeviceObject->DriverObject->FastIoDispatch->FastIoQueryBasicInfo != NULL && + DeviceObject->DriverObject->FastIoDispatch->FastIoQueryBasicInfo(FileObject, + (FileObject->Flags & FO_SYNCHRONOUS_IO), + BasicInfo, + &IoStatusBlock, + DeviceObject)) + { + return IoStatusBlock.Status; + } + + /* In case it failed, fall back to IRP-based method */ + return IopGetFileInformation(FileObject, sizeof(FILE_BASIC_INFORMATION), FileBasicInformation, BasicInfo, &ReturnedLength); +} + +NTSTATUS +NTAPI +IopOpenLinkOrRenameTarget(OUT PHANDLE Handle, + IN PIRP Irp, + IN PFILE_RENAME_INFORMATION RenameInfo, + IN PFILE_OBJECT FileObject) +{ + NTSTATUS Status; + HANDLE TargetHandle; + UNICODE_STRING FileName; + PIO_STACK_LOCATION Stack; + PFILE_OBJECT TargetFileObject; + IO_STATUS_BLOCK IoStatusBlock; + FILE_BASIC_INFORMATION BasicInfo; + OBJECT_ATTRIBUTES ObjectAttributes; + OBJECT_HANDLE_INFORMATION HandleInformation; + ACCESS_MASK DesiredAccess = FILE_WRITE_DATA; + + PAGED_CODE(); + + /* First, establish whether our target is a directory */ + if (!(FileObject->Flags & FO_DIRECT_DEVICE_OPEN)) + { + Status = IopGetBasicInformationFile(FileObject, &BasicInfo); + if (!NT_SUCCESS(Status)) + { + return Status; + } + + if (BasicInfo.FileAttributes & FILE_ATTRIBUTE_DIRECTORY) { + DesiredAccess = FILE_ADD_SUBDIRECTORY; + } + } + + /* Setup the string to the target */ + FileName.Buffer = RenameInfo->FileName; + FileName.Length = RenameInfo->FileNameLength; + FileName.MaximumLength = RenameInfo->FileNameLength; + + InitializeObjectAttributes(&ObjectAttributes, + &FileName, + (FileObject->Flags & FO_OPENED_CASE_SENSITIVE ? 0 : OBJ_CASE_INSENSITIVE) | OBJ_KERNEL_HANDLE, + RenameInfo->RootDirectory, + NULL); + + /* And open its parent directory */ + if (FileObject->Flags & FO_FILE_OBJECT_HAS_EXTENSION) + { + ASSERT(!(FileObject->Flags & FO_DIRECT_DEVICE_OPEN)); +#if 0 + /* Commented out - we don't support FO extension yet + * FIXME: Corrected last arg when it's supported + */ + Status = IoCreateFileSpecifyDeviceObjectHint(&TargetHandle, + DesiredAccess | SYNCHRONIZE, + &ObjectAttributes, + &IoStatusBlock, + NULL, + 0, + FILE_SHARE_READ | FILE_SHARE_WRITE, + FILE_OPEN, + FILE_OPEN_FOR_BACKUP_INTENT, + NULL, + 0, + CreateFileTypeNone, + NULL, + IO_FORCE_ACCESS_CHECK | IO_OPEN_TARGET_DIRECTORY | IO_NO_PARAMETER_CHECKING, + FileObject->DeviceObject); +#else + ASSERT(FALSE); + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +#endif + } + else + { + Status = IoCreateFile(&TargetHandle, + DesiredAccess | SYNCHRONIZE, + &ObjectAttributes, + &IoStatusBlock, + NULL, + 0, + FILE_SHARE_READ | FILE_SHARE_WRITE, + FILE_OPEN, + FILE_OPEN_FOR_BACKUP_INTENT, + NULL, + 0, + CreateFileTypeNone, + NULL, + IO_FORCE_ACCESS_CHECK | IO_OPEN_TARGET_DIRECTORY | IO_NO_PARAMETER_CHECKING); + } + + if (!NT_SUCCESS(Status)) + { + return Status; + } + + /* Once open, continue only if: + * Target exists and we're allowed to overwrite it + */ + Stack = IoGetNextIrpStackLocation(Irp); + if (Stack->Parameters.SetFile.FileInformationClass == FileLinkInformation && + !RenameInfo->ReplaceIfExists && + IoStatusBlock.Information == FILE_EXISTS) + { + ObCloseHandle(TargetHandle, KernelMode); + return STATUS_OBJECT_NAME_COLLISION; + } + + /* Now, we'll get the associated device of the target, to check for same device location + * So, get the FO first + */ + Status = ObReferenceObjectByHandle(TargetHandle, + FILE_WRITE_DATA, + IoFileObjectType, + KernelMode, + (PVOID *)&TargetFileObject, + &HandleInformation); + if (!NT_SUCCESS(Status)) + { + ObCloseHandle(TargetHandle, KernelMode); + return Status; + } + + /* We can dereference, we have the handle */ + ObDereferenceObject(TargetFileObject); + /* If we're not on the same device, error out **/ + if (IoGetRelatedDeviceObject(TargetFileObject) != IoGetRelatedDeviceObject(FileObject)) + { + ObCloseHandle(TargetHandle, KernelMode); + return STATUS_NOT_SAME_DEVICE; + } + + /* Return parent directory file object and handle */ + Stack->Parameters.SetFile.FileObject = TargetFileObject; + *Handle = TargetHandle; + + return STATUS_SUCCESS; } /* PUBLIC FUNCTIONS **********************************************************/ @@ -2218,6 +2445,8 @@ PVOID Queue; PFILE_COMPLETION_INFORMATION CompletionInfo = FileInformation; PIO_COMPLETION_CONTEXT Context; + PFILE_RENAME_INFORMATION RenameInfo; + HANDLE TargetHandle = INVALID_HANDLE_VALUE; PAGED_CODE(); IOTRACE(IO_API_DEBUG, "FileHandle: %p\n", FileHandle); @@ -2469,6 +2698,53 @@ Irp->IoStatus.Status = Status; Irp->IoStatus.Information = 0; } + else if (FileInformationClass == FileRenameInformation || + FileInformationClass == FileLinkInformation || + FileInformationClass == FileMoveClusterInformation) + { + /* Get associated information */ + RenameInfo = Irp->AssociatedIrp.SystemBuffer; + + /* Only rename if: + * -> We have a name + * -> In unicode + * -> sizes are valid + */ + if (RenameInfo->FileNameLength != 0 && + !(RenameInfo->FileNameLength & 1) && + (Length - FIELD_OFFSET(FILE_RENAME_INFORMATION, FileName) >= RenameInfo->FileNameLength)) + { + /* Properly set information received */ + if (FileInformationClass == FileMoveClusterInformation) + { + StackPtr->Parameters.SetFile.ClusterCount = ((PFILE_MOVE_CLUSTER_INFORMATION)RenameInfo)->ClusterCount; + } + else + { + StackPtr->Parameters.SetFile.ReplaceIfExists = RenameInfo->ReplaceIfExists; + } + + /* If we got fully path OR relative target, attempt a parent directory open */ + if (RenameInfo->FileName[0] == OBJ_NAME_PATH_SEPARATOR || RenameInfo->RootDirectory) + { + Status = IopOpenLinkOrRenameTarget(&TargetHandle, Irp, RenameInfo, FileObject); + if (!NT_SUCCESS(Status)) + { + Irp->IoStatus.Status = Status; + } + else + { + /* Call the Driver */ + Status = IoCallDriver(DeviceObject, Irp); + } + } + else + { + /* Call the Driver */ + Status = IoCallDriver(DeviceObject, Irp); + } + } + } else { /* Call the Driver */ @@ -2558,6 +2834,11 @@ /* Release the file object if we had locked it*/ if (!LocalEvent) IopUnlockFileObject(FileObject); + } + + if (TargetHandle != INVALID_HANDLE_VALUE) + { + ObCloseHandle(TargetHandle, KernelMode); } /* Return the Status */

1 0

[akhaldi] 63010: [ATL100_WINETEST] * Sync with Wine 1.7.17. CORE-8080
by akhaldi＠svn.reactos.org 26 Apr '14

26 Apr '14

Author: akhaldi Date: Sat Apr 26 18:52:15 2014 New Revision: 63010 URL: http://svn.reactos.org/svn/reactos?rev=63010&view=rev Log: [ATL100_WINETEST] * Sync with Wine 1.7.17. CORE-8080 Modified: trunk/rostests/winetests/atl100/CMakeLists.txt trunk/rostests/winetests/atl100/atl.c Modified: trunk/rostests/winetests/atl100/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/atl100/CMakeLis… ============================================================================== --- trunk/rostests/winetests/atl100/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/atl100/CMakeLists.txt [iso-8859-1] Sat Apr 26 18:52:15 2014 @@ -2,7 +2,7 @@ add_definitions(-D_ATL_VER=_ATL_VER_100) list(APPEND SOURCE atl.c testlist.c) add_executable(atl100_winetest ${SOURCE}) -target_link_libraries(atl100_winetest wine uuid) +target_link_libraries(atl100_winetest uuid) set_module_type(atl100_winetest win32cui) -add_importlibs(atl100_winetest atl100 oleaut32 ole32 advapi32 user32 msvcrt kernel32 ntdll) +add_importlibs(atl100_winetest atl100 oleaut32 ole32 advapi32 user32 msvcrt kernel32) add_cd_file(TARGET atl100_winetest DESTINATION reactos/bin FOR all) Modified: trunk/rostests/winetests/atl100/atl.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/atl100/atl.c?re… ============================================================================== --- trunk/rostests/winetests/atl100/atl.c [iso-8859-1] (original) +++ trunk/rostests/winetests/atl100/atl.c [iso-8859-1] Sat Apr 26 18:52:15 2014 @@ -51,19 +51,30 @@ {0x178fc163,0x0000,0x0000,{0x00,0x00,0x00,0x00,0x00,0x00,0x02,0x46}}; #define CATID_CATTEST2_STR "178fc163-0000-0000-0000-000000000246" -static const char *debugstr_guid(REFIID riid) -{ - static char buf[50]; - - if(!riid) - return "(null)"; - - sprintf(buf, "{%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x}", - riid->Data1, riid->Data2, riid->Data3, riid->Data4[0], - riid->Data4[1], riid->Data4[2], riid->Data4[3], riid->Data4[4], - riid->Data4[5], riid->Data4[6], riid->Data4[7]); - - return buf; +static BOOL is_process_limited(void) +{ + static BOOL (WINAPI *pOpenProcessToken)(HANDLE, DWORD, PHANDLE) = NULL; + HANDLE token; + + if (!pOpenProcessToken) + { + HMODULE hadvapi32 = GetModuleHandleA("advapi32.dll"); + pOpenProcessToken = (void*)GetProcAddress(hadvapi32, "OpenProcessToken"); + if (!pOpenProcessToken) + return FALSE; + } + + if (pOpenProcessToken(GetCurrentProcess(), TOKEN_QUERY, &token)) + { + BOOL ret; + TOKEN_ELEVATION_TYPE type = TokenElevationTypeDefault; + DWORD size; + + ret = GetTokenInformation(token, TokenElevationType, &type, sizeof(type), &size); + CloseHandle(token); + return (ret && type == TokenElevationTypeLimited); + } + return FALSE; } static void test_winmodule(void) @@ -171,6 +182,12 @@ {_ATL_CATMAP_ENTRY_END} }; + if (is_process_limited()) + { + skip("process is limited\n"); + return; + } + hres = AtlRegisterClassCategoriesHelper(&CLSID_Test, catmap, TRUE); ok(hres == S_OK, "AtlRegisterClassCategoriesHelper failed: %08x\n", hres); @@ -477,7 +494,7 @@ return S_OK; } - ok(0, "unexpected riid: %s\n", debugstr_guid(riid)); + ok(0, "unexpected riid: %s\n", wine_dbgstr_guid(riid)); return E_NOINTERFACE; } @@ -556,8 +573,8 @@ maj_ver = min_ver = 0xdead; hres = AtlGetObjectSourceInterface((IUnknown*)&Dispatch, &libid, &iid, &maj_ver, &min_ver); ok(hres == S_OK, "AtlGetObjectSourceInterface failed: %08x\n", hres); - ok(IsEqualGUID(&libid, &LIBID_MSHTML), "libid = %s\n", debugstr_guid(&libid)); - ok(IsEqualGUID(&iid, &DIID_DispHTMLBody), "iid = %s\n", debugstr_guid(&iid)); + ok(IsEqualGUID(&libid, &LIBID_MSHTML), "libid = %s\n", wine_dbgstr_guid(&libid)); + ok(IsEqualGUID(&iid, &DIID_DispHTMLBody), "iid = %s\n", wine_dbgstr_guid(&iid)); ok(maj_ver == 4 && min_ver == 0, "ver = %d.%d\n", maj_ver, min_ver); support_classinfo2 = FALSE; @@ -566,8 +583,8 @@ maj_ver = min_ver = 0xdead; hres = AtlGetObjectSourceInterface((IUnknown*)&Dispatch, &libid, &iid, &maj_ver, &min_ver); ok(hres == S_OK, "AtlGetObjectSourceInterface failed: %08x\n", hres); - ok(IsEqualGUID(&libid, &LIBID_MSHTML), "libid = %s\n", debugstr_guid(&libid)); - ok(IsEqualGUID(&iid, &DIID_HTMLDocumentEvents), "iid = %s\n", debugstr_guid(&iid)); + ok(IsEqualGUID(&libid, &LIBID_MSHTML), "libid = %s\n", wine_dbgstr_guid(&libid)); + ok(IsEqualGUID(&iid, &DIID_HTMLDocumentEvents), "iid = %s\n", wine_dbgstr_guid(&iid)); ok(maj_ver == 4 && min_ver == 0, "ver = %d.%d\n", maj_ver, min_ver); persist_clsid = CLSID_HTMLStyle; @@ -575,8 +592,8 @@ maj_ver = min_ver = 0xdead; hres = AtlGetObjectSourceInterface((IUnknown*)&Dispatch, &libid, &iid, &maj_ver, &min_ver); ok(hres == S_OK, "AtlGetObjectSourceInterface failed: %08x\n", hres); - ok(IsEqualGUID(&libid, &LIBID_MSHTML), "libid = %s\n", debugstr_guid(&libid)); - ok(IsEqualGUID(&iid, &IID_NULL), "iid = %s\n", debugstr_guid(&iid)); + ok(IsEqualGUID(&libid, &LIBID_MSHTML), "libid = %s\n", wine_dbgstr_guid(&libid)); + ok(IsEqualGUID(&iid, &IID_NULL), "iid = %s\n", wine_dbgstr_guid(&iid)); ok(maj_ver == 4 && min_ver == 0, "ver = %d.%d\n", maj_ver, min_ver); }

1 0

[akhaldi] 63009: [ATL80_WINETEST] * Sync with Wine 1.7.17. CORE-8080
by akhaldi＠svn.reactos.org 26 Apr '14

26 Apr '14

Author: akhaldi Date: Sat Apr 26 18:52:02 2014 New Revision: 63009 URL: http://svn.reactos.org/svn/reactos?rev=63009&view=rev Log: [ATL80_WINETEST] * Sync with Wine 1.7.17. CORE-8080 Added: trunk/rostests/winetests/atl80/atl80.manifest (with props) trunk/rostests/winetests/atl80/atl80.rc (with props) Modified: trunk/rostests/winetests/atl80/CMakeLists.txt Modified: trunk/rostests/winetests/atl80/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/atl80/CMakeList… ============================================================================== --- trunk/rostests/winetests/atl80/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/atl80/CMakeLists.txt [iso-8859-1] Sat Apr 26 18:52:02 2014 @@ -1,8 +1,8 @@ add_definitions(-D_ATL_VER=_ATL_VER_80) list(APPEND SOURCE atl.c testlist.c) -add_executable(atl80_winetest ${SOURCE}) -target_link_libraries(atl80_winetest wine uuid) +add_executable(atl80_winetest ${SOURCE} atl80.rc) +target_link_libraries(atl80_winetest uuid) set_module_type(atl80_winetest win32cui) -add_importlibs(atl80_winetest atl80 oleaut32 ole32 advapi32 user32 msvcrt kernel32 ntdll) +add_importlibs(atl80_winetest atl80 oleaut32 ole32 advapi32 user32 msvcrt kernel32) add_cd_file(TARGET atl80_winetest DESTINATION reactos/bin FOR all) Added: trunk/rostests/winetests/atl80/atl80.manifest URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/atl80/atl80.man… ============================================================================== --- trunk/rostests/winetests/atl80/atl80.manifest (added) +++ trunk/rostests/winetests/atl80/atl80.manifest [iso-8859-1] Sat Apr 26 18:52:02 2014 @@ -0,0 +1,22 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> + <assemblyIdentity + type="win32" + name="Wine.atl80.Test" + version="1.0.0.0" + processorArchitecture="*" + /> +<description>Wine atl80 test suite</description> +<dependency> + <dependentAssembly> + <assemblyIdentity + type="win32" + name="microsoft.vc80.atl" + version="8.0.50727.4053" + processorArchitecture="*" + publicKeyToken="1fc8b3b9a1e18e3b" + language="*" + /> +</dependentAssembly> +</dependency> +</assembly> Propchange: trunk/rostests/winetests/atl80/atl80.manifest ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/winetests/atl80/atl80.rc URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/atl80/atl80.rc?… ============================================================================== --- trunk/rostests/winetests/atl80/atl80.rc (added) +++ trunk/rostests/winetests/atl80/atl80.rc [iso-8859-1] Sat Apr 26 18:52:02 2014 @@ -0,0 +1,22 @@ +/* + * Copyright (c) 2013 Nikolay Sivov + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "winuser.h" + +/* @makedep: atl80.manifest */ +1 RT_MANIFEST atl80.manifest Propchange: trunk/rostests/winetests/atl80/atl80.rc ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[akhaldi] 63008: [ATL_WINETEST] * Sync with Wine 1.7.17. CORE-8080
by akhaldi＠svn.reactos.org 26 Apr '14

26 Apr '14

Author: akhaldi Date: Sat Apr 26 18:50:38 2014 New Revision: 63008 URL: http://svn.reactos.org/svn/reactos?rev=63008&view=rev Log: [ATL_WINETEST] * Sync with Wine 1.7.17. CORE-8080 Modified: trunk/rostests/winetests/atl/CMakeLists.txt trunk/rostests/winetests/atl/atl_ax.c trunk/rostests/winetests/atl/module.c trunk/rostests/winetests/atl/registrar.c Modified: trunk/rostests/winetests/atl/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/atl/CMakeLists.… ============================================================================== --- trunk/rostests/winetests/atl/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/atl/CMakeLists.txt [iso-8859-1] Sat Apr 26 18:50:38 2014 @@ -1,3 +1,4 @@ +add_definitions(-D_ATL_VER=_ATL_VER_30) list(APPEND SOURCE atl_ax.c @@ -8,5 +9,5 @@ add_executable(atl_winetest ${SOURCE}) target_link_libraries(atl_winetest wine uuid) set_module_type(atl_winetest win32cui) -add_importlibs(atl_winetest ole32 user32 atl msvcrt kernel32 ntdll advapi32) +add_importlibs(atl_winetest ole32 user32 atl advapi32 msvcrt kernel32) add_cd_file(TARGET atl_winetest DESTINATION reactos/bin FOR all) Modified: trunk/rostests/winetests/atl/atl_ax.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/atl/atl_ax.c?re… ============================================================================== --- trunk/rostests/winetests/atl/atl_ax.c [iso-8859-1] (original) +++ trunk/rostests/winetests/atl/atl_ax.c [iso-8859-1] Sat Apr 26 18:50:38 2014 @@ -40,6 +40,7 @@ //#include <olectl.h> //#include <ocidl.h> #include <exdisp.h> +#include <wine/atlbase.h> static HRESULT (WINAPI *pAtlAxAttachControl)(IUnknown *, HWND, IUnknown **); @@ -55,12 +56,12 @@ WNDCLASSA wndclassA; wndclassA.style = 0; - wndclassA.lpfnWndProc = DefWindowProc; + wndclassA.lpfnWndProc = DefWindowProcA; wndclassA.cbClsExtra = 0; wndclassA.cbWndExtra = 0; wndclassA.hInstance = GetModuleHandleA(NULL); wndclassA.hIcon = NULL; - wndclassA.hCursor = LoadCursorA(NULL, IDC_ARROW); + wndclassA.hCursor = LoadCursorA(NULL, (LPSTR)IDC_ARROW); wndclassA.hbrBackground = (HBRUSH)(COLOR_BTNFACE+1); wndclassA.lpszMenuName = NULL; wndclassA.lpszClassName = "WineAtlTestClass"; @@ -101,15 +102,11 @@ hr = pAtlAxAttachControl(pObj, NULL, NULL); ok(hr == S_FALSE, "Expected AtlAxAttachControl to return S_FALSE, got 0x%08x\n", hr); - pContainer = (IUnknown *)0xdeadbeef; + pContainer = NULL; hr = pAtlAxAttachControl(pObj, NULL, &pContainer); ok(hr == S_FALSE, "Expected AtlAxAttachControl to return S_FALSE, got 0x%08x\n", hr); - ok(pContainer != (IUnknown *)0xdeadbeef && - pContainer != NULL, - "Expected the output container pointer to be initialized to non-NULL, got %p\n", pContainer); - - if (pContainer != (IUnknown *)0xdeadbeef && pContainer != NULL) - IUnknown_Release(pContainer); + ok(pContainer != NULL, "got %p\n", pContainer); + IUnknown_Release(pContainer); hr = pAtlAxAttachControl(pObj, hwnd, NULL); ok(hr == S_OK, "Expected AtlAxAttachControl to return S_OK, got 0x%08x\n", hr); @@ -117,6 +114,24 @@ IUnknown_Release(pObj); DestroyWindow(hwnd); +} + +static void test_ax_win(void) +{ + BOOL ret; + WNDCLASSEXW wcex; + static const WCHAR AtlAxWin[] = {'A','t','l','A','x','W','i','n',0}; + static HMODULE hinstance = 0; + + ret = AtlAxWinInit(); + ok(ret, "AtlAxWinInit failed\n"); + + hinstance = GetModuleHandleA(NULL); + memset(&wcex, 0, sizeof(wcex)); + wcex.cbSize = sizeof(wcex); + ret = GetClassInfoExW(hinstance, AtlAxWin, &wcex); + ok(ret, "AtlAxWin has not registered\n"); + ok(wcex.style == CS_GLOBALCLASS, "wcex.style %08x\n", wcex.style); } START_TEST(atl_ax) @@ -133,5 +148,7 @@ else win_skip("AtlAxAttachControl is not available\n"); + test_ax_win(); + CoUninitialize(); } Modified: trunk/rostests/winetests/atl/module.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/atl/module.c?re… ============================================================================== --- trunk/rostests/winetests/atl/module.c [iso-8859-1] (original) +++ trunk/rostests/winetests/atl/module.c [iso-8859-1] Sat Apr 26 18:50:38 2014 @@ -29,84 +29,138 @@ #define COBJMACROS #include <wine/test.h> -//#include <windef.h> -//#include <winbase.h> -//#include <winuser.h> -//#include <wingdi.h> -//#include <winnls.h> -//#include <winerror.h> -//#include <winnt.h> -//#include <wtypes.h> + #include <objbase.h> -//#include <olectl.h> -//#include <ocidl.h> -struct _ATL_OBJMAP_ENTRYW; -struct _AtlCreateWndData; -struct _ATL_TERMFUNC_ELEM; - -struct _ATL_MODULEW -{ - UINT cbSize; - HINSTANCE m_hInst; - HINSTANCE m_hInstResource; - HINSTANCE m_hInstTypeLib; - struct _ATL_OBJMAP_ENTRYW* m_pObjMap; - LONG m_nLockCnt; - HANDLE m_hHeap; - union - { - CRITICAL_SECTION m_csTypeInfoHolder; - CRITICAL_SECTION m_csStaticDataInit; - } u; - CRITICAL_SECTION m_csWindowCreate; - CRITICAL_SECTION m_csObjMap; - - DWORD dwAtlBuildVer; - struct _AtlCreateWndData* m_pCreateWndList; - BOOL m_bDestroyHeap; - GUID* pguidVer; - DWORD m_dwHeaps; - HANDLE* m_phHeaps; - int m_nHeap; - struct _ATL_TERMFUNC_ELEM* m_pTermFuncs; -}; - -HRESULT WINAPI AtlModuleInit(struct _ATL_MODULEW* pM, struct _ATL_OBJMAP_ENTRYW* p, HINSTANCE h); +#include <wine/atlbase.h> #define MAXSIZE 512 static void test_StructSize(void) { - struct _ATL_MODULEW *tst; - HRESULT hres; - int i; + _ATL_MODULEW *tst; + HRESULT hres; + int i; - tst = HeapAlloc (GetProcessHeap(),HEAP_ZERO_MEMORY,MAXSIZE); + tst = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, MAXSIZE); - for (i=0;i<MAXSIZE;i++) { - tst->cbSize = i; - hres = AtlModuleInit(tst, NULL, NULL); + for (i=0;i<MAXSIZE;i++) { + tst->cbSize = i; + hres = AtlModuleInit(tst, NULL, NULL); - switch (i) { - case FIELD_OFFSET( struct _ATL_MODULEW, dwAtlBuildVer ): - case sizeof(struct _ATL_MODULEW): + switch (i) { + case FIELD_OFFSET(_ATL_MODULEW, dwAtlBuildVer): + case sizeof(_ATL_MODULEW): #ifdef _WIN64 - case sizeof(struct _ATL_MODULEW) + sizeof(void *): + case sizeof(_ATL_MODULEW) + sizeof(void *): #endif - ok (hres == S_OK, "AtlModuleInit with %d failed (0x%x).\n", i, (int)hres); - break; - default: - ok (FAILED(hres) || - broken((i > FIELD_OFFSET( struct _ATL_MODULEW, dwAtlBuildVer )) && (hres == S_OK)), /* Win95 */ - "AtlModuleInit with %d succeeded? (0x%x).\n", i, (int)hres); - break; - } - } + ok (hres == S_OK, "AtlModuleInit with %d failed (0x%x).\n", i, (int)hres); + break; + default: + ok (FAILED(hres), "AtlModuleInit with %d succeeded? (0x%x).\n", i, (int)hres); + break; + } + } - HeapFree (GetProcessHeap(), 0, tst); + HeapFree (GetProcessHeap(), 0, tst); +} + +static void test_winmodule(void) +{ + _AtlCreateWndData create_data[3]; + _ATL_MODULEW winmod; + void *p; + HRESULT hres; + + winmod.cbSize = sizeof(winmod); + winmod.m_pCreateWndList = (void*)0xdeadbeef; + winmod.m_csWindowCreate.LockCount = 0xdeadbeef; + hres = AtlModuleInit(&winmod, NULL, NULL); + ok(hres == S_OK, "AtlModuleInit failed: %08x\n", hres); + ok(!winmod.m_pCreateWndList, "winmod.m_pCreateWndList = %p\n", winmod.m_pCreateWndList); + ok(winmod.m_csWindowCreate.LockCount == -1, "winmod.m_csWindowCreate.LockCount = %d\n", + winmod.m_csWindowCreate.LockCount); + + AtlModuleAddCreateWndData(&winmod, create_data, (void*)0xdead0001); + ok(winmod.m_pCreateWndList == create_data, "winmod.m_pCreateWndList != create_data\n"); + ok(create_data[0].m_pThis == (void*)0xdead0001, "unexpected create_data[0].m_pThis %p\n", create_data[0].m_pThis); + ok(create_data[0].m_dwThreadID == GetCurrentThreadId(), "unexpected create_data[0].m_dwThreadID %x\n", + create_data[0].m_dwThreadID); + ok(!create_data[0].m_pNext, "unexpected create_data[0].m_pNext %p\n", create_data[0].m_pNext); + + AtlModuleAddCreateWndData(&winmod, create_data+1, (void*)0xdead0002); + ok(winmod.m_pCreateWndList == create_data+1, "winmod.m_pCreateWndList != create_data\n"); + ok(create_data[1].m_pThis == (void*)0xdead0002, "unexpected create_data[1].m_pThis %p\n", create_data[1].m_pThis); + ok(create_data[1].m_dwThreadID == GetCurrentThreadId(), "unexpected create_data[1].m_dwThreadID %x\n", + create_data[1].m_dwThreadID); + ok(create_data[1].m_pNext == create_data, "unexpected create_data[1].m_pNext %p\n", create_data[1].m_pNext); + + AtlModuleAddCreateWndData(&winmod, create_data+2, (void*)0xdead0003); + ok(winmod.m_pCreateWndList == create_data+2, "winmod.m_pCreateWndList != create_data\n"); + ok(create_data[2].m_pThis == (void*)0xdead0003, "unexpected create_data[2].m_pThis %p\n", create_data[2].m_pThis); + ok(create_data[2].m_dwThreadID == GetCurrentThreadId(), "unexpected create_data[2].m_dwThreadID %x\n", + create_data[2].m_dwThreadID); + ok(create_data[2].m_pNext == create_data+1, "unexpected create_data[2].m_pNext %p\n", create_data[2].m_pNext); + + p = AtlModuleExtractCreateWndData(&winmod); + ok(p == (void*)0xdead0003, "unexpected AtlModuleExtractCreateWndData result %p\n", p); + ok(winmod.m_pCreateWndList == create_data+1, "winmod.m_pCreateWndList != create_data\n"); + ok(create_data[2].m_pNext == create_data+1, "unexpected create_data[2].m_pNext %p\n", create_data[2].m_pNext); + + create_data[1].m_dwThreadID = 0xdeadbeef; + + p = AtlModuleExtractCreateWndData(&winmod); + ok(p == (void*)0xdead0001, "unexpected AtlModuleExtractCreateWndData result %p\n", p); + ok(winmod.m_pCreateWndList == create_data+1, "winmod.m_pCreateWndList != create_data\n"); + ok(!create_data[0].m_pNext, "unexpected create_data[0].m_pNext %p\n", create_data[0].m_pNext); + ok(!create_data[1].m_pNext, "unexpected create_data[1].m_pNext %p\n", create_data[1].m_pNext); + + p = AtlModuleExtractCreateWndData(&winmod); + ok(!p, "unexpected AtlModuleExtractCreateWndData result %p\n", p); + ok(winmod.m_pCreateWndList == create_data+1, "winmod.m_pCreateWndList != create_data\n"); +} + +static DWORD cb_val; + +static void WINAPI term_callback(DWORD dw) +{ + cb_val = dw; +} + +static void test_term(void) +{ + _ATL_MODULEW test; + HRESULT hres; + + test.cbSize = sizeof(_ATL_MODULEW); + + hres = AtlModuleInit(&test, NULL, NULL); + ok (hres == S_OK, "AtlModuleInit failed (0x%x).\n", (int)hres); + + hres = AtlModuleAddTermFunc(&test, term_callback, 0x22); + ok (hres == S_OK, "AtlModuleAddTermFunc failed (0x%x).\n", (int)hres); + + cb_val = 0xdeadbeef; + hres = AtlModuleTerm(&test); + ok (hres == S_OK, "AtlModuleTerm failed (0x%x).\n", (int)hres); + ok (cb_val == 0x22, "wrong callback value (0x%x).\n", (int)cb_val); + + test.cbSize = FIELD_OFFSET(_ATL_MODULEW, dwAtlBuildVer); + + hres = AtlModuleInit(&test, NULL, NULL); + ok (hres == S_OK, "AtlModuleInit failed (0x%x).\n", (int)hres); + + hres = AtlModuleAddTermFunc(&test, term_callback, 0x23); + ok (hres == S_OK, "AtlModuleAddTermFunc failed (0x%x).\n", (int)hres); + + cb_val = 0xdeadbeef; + hres = AtlModuleTerm(&test); + ok (hres == S_OK, "AtlModuleTerm failed (0x%x).\n", (int)hres); + ok (cb_val == 0xdeadbeef, "wrong callback value (0x%x).\n", (int)cb_val); } START_TEST(module) { - test_StructSize(); + test_StructSize(); + test_winmodule(); + test_term(); } Modified: trunk/rostests/winetests/atl/registrar.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/atl/registrar.c… ============================================================================== --- trunk/rostests/winetests/atl/registrar.c [iso-8859-1] (original) +++ trunk/rostests/winetests/atl/registrar.c [iso-8859-1] Sat Apr 26 18:50:38 2014 @@ -44,7 +44,7 @@ #include <atliface.h> static const char textA[] = -"HKCR \n" +"HKCU \n" "{ \n" " ForceRemove eebf73c4-50fd-478f-bbcf-db212221227a \n" " { \n" @@ -74,7 +74,7 @@ hr = CoCreateInstance(&CLSID_Registrar, NULL, CLSCTX_INPROC_SERVER, &IID_IRegistrar, (void**)&registrar); if (FAILED(hr)) { - skip("creating IRegistrar failed, hr = 0x%08X\n", hr); + win_skip("creating IRegistrar failed, hr = 0x%08X\n", hr); return; } @@ -90,9 +90,14 @@ MultiByteToWideChar(CP_ACP, 0, textA, -1, textW, count); hr = IRegistrar_StringRegister(registrar, textW); - ok(SUCCEEDED(hr), "IRegistrar_StringRegister failed, hr = 0x%08X\n", hr); + ok(hr == S_OK, "StringRegister failed: %08x\n", hr); + if (FAILED(hr)) + { + IRegistrar_Release(registrar); + return; + } - lret = RegOpenKeyA(HKEY_CLASSES_ROOT, "eebf73c4-50fd-478f-bbcf-db212221227a", &key); + lret = RegOpenKeyA(HKEY_CURRENT_USER, "eebf73c4-50fd-478f-bbcf-db212221227a", &key); ok(lret == ERROR_SUCCESS, "error %d opening registry key\n", lret); size = sizeof(dword); @@ -148,8 +153,9 @@ hres = CoCreateInstance(&CLSID_Registrar, (IUnknown*)0xdeadbeef, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, &IID_IUnknown, (void**)&unk); - ok(hres == CLASS_E_NOAGGREGATION, "CoCreateInstance failed: %08x, expected CLASS_E_NOAGGREGATION\n", hres); - ok(!unk, "unk = %p\n", unk); + ok(hres == CLASS_E_NOAGGREGATION || broken(hres == E_INVALIDARG), + "CoCreateInstance failed: %08x, expected CLASS_E_NOAGGREGATION\n", hres); + ok(!unk || unk == (IUnknown*)0xdeadbeef, "unk = %p\n", unk); } START_TEST(registrar)

1 0

[akhaldi] 63007: [ATL][ATL80][ATL100] * Sync with Wine 1.7.17. CORE-8080
by akhaldi＠svn.reactos.org 26 Apr '14

26 Apr '14

Author: akhaldi Date: Sat Apr 26 18:49:54 2014 New Revision: 63007 URL: http://svn.reactos.org/svn/reactos?rev=63007&view=rev Log: [ATL][ATL80][ATL100] * Sync with Wine 1.7.17. CORE-8080 Added: trunk/reactos/dll/win32/atl/atl.c (with props) trunk/reactos/dll/win32/atl/atl30.c (with props) trunk/reactos/dll/win32/atl/atl_ax.c (with props) trunk/reactos/dll/win32/atl/precomp.h (with props) trunk/reactos/dll/win32/atl/registrar.c (with props) trunk/reactos/dll/win32/atl80/atl80.manifest (with props) trunk/reactos/dll/win32/atl80/atl80.rc (with props) trunk/reactos/dll/win32/atl80/precomp.h (with props) Removed: trunk/reactos/dll/win32/atl/atl_main.c trunk/reactos/dll/win32/atl100/atl.c trunk/reactos/dll/win32/atl100/atl_ax.c trunk/reactos/dll/win32/atl100/registrar.c Modified: trunk/reactos/dll/win32/atl/CMakeLists.txt trunk/reactos/dll/win32/atl/atl.spec trunk/reactos/dll/win32/atl/atl_classes.idl trunk/reactos/dll/win32/atl100/CMakeLists.txt trunk/reactos/dll/win32/atl100/atl100.spec trunk/reactos/dll/win32/atl100/precomp.h trunk/reactos/dll/win32/atl80/CMakeLists.txt trunk/reactos/dll/win32/atl80/atl80.c trunk/reactos/dll/win32/atl80/atl80.spec trunk/reactos/media/doc/README.WINE [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/win32/atl/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/atl/CMakeLists.t… Added: trunk/reactos/dll/win32/atl/atl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/atl/atl.c?rev=63… Modified: trunk/reactos/dll/win32/atl/atl.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/atl/atl.spec?rev… Added: trunk/reactos/dll/win32/atl/atl30.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/atl/atl30.c?rev=… Added: trunk/reactos/dll/win32/atl/atl_ax.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/atl/atl_ax.c?rev… Modified: trunk/reactos/dll/win32/atl/atl_classes.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/atl/atl_classes.… Removed: trunk/reactos/dll/win32/atl/atl_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/atl/atl_main.c?r… Added: trunk/reactos/dll/win32/atl/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/atl/precomp.h?re… Added: trunk/reactos/dll/win32/atl/registrar.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/atl/registrar.c?… Modified: trunk/reactos/dll/win32/atl100/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/atl100/CMakeList… Removed: trunk/reactos/dll/win32/atl100/atl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/atl100/atl.c?rev… Modified: trunk/reactos/dll/win32/atl100/atl100.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/atl100/atl100.sp… Removed: trunk/reactos/dll/win32/atl100/atl_ax.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/atl100/atl_ax.c?… Modified: trunk/reactos/dll/win32/atl100/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/atl100/precomp.h… Removed: trunk/reactos/dll/win32/atl100/registrar.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/atl100/registrar… Modified: trunk/reactos/dll/win32/atl80/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/atl80/CMakeLists… Modified: trunk/reactos/dll/win32/atl80/atl80.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/atl80/atl80.c?re… Added: trunk/reactos/dll/win32/atl80/atl80.manifest URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/atl80/atl80.mani… Added: trunk/reactos/dll/win32/atl80/atl80.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/atl80/atl80.rc?r… Modified: trunk/reactos/dll/win32/atl80/atl80.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/atl80/atl80.spec… Added: trunk/reactos/dll/win32/atl80/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/atl80/precomp.h?… Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=…

1 0

[akhaldi] 63006: [IEFRAME] * Sync with Wine 1.7.17. CORE-8080
by akhaldi＠svn.reactos.org 26 Apr '14

26 Apr '14

Author: akhaldi Date: Sat Apr 26 18:39:56 2014 New Revision: 63006 URL: http://svn.reactos.org/svn/reactos?rev=63006&view=rev Log: [IEFRAME] * Sync with Wine 1.7.17. CORE-8080 Modified: trunk/reactos/dll/win32/ieframe/ieframe.h trunk/reactos/dll/win32/ieframe/ieframe.rgs trunk/reactos/dll/win32/ieframe/ieframe_v1.idl trunk/reactos/dll/win32/ieframe/navigate.c trunk/reactos/dll/win32/ieframe/shellbrowser.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/ieframe/ieframe.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ieframe/ieframe.… ============================================================================== --- trunk/reactos/dll/win32/ieframe/ieframe.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ieframe/ieframe.h [iso-8859-1] Sat Apr 26 18:39:56 2014 @@ -74,6 +74,7 @@ IHlinkFrame IHlinkFrame_iface; ITargetFrame2 ITargetFrame2_iface; ITargetFramePriv2 ITargetFramePriv2_iface; + IWebBrowserPriv2IE9 IWebBrowserPriv2IE9_iface; IUnknown *outer; DocHost *doc_host; Modified: trunk/reactos/dll/win32/ieframe/ieframe.rgs URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ieframe/ieframe.… ============================================================================== --- trunk/reactos/dll/win32/ieframe/ieframe.rgs [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ieframe/ieframe.rgs [iso-8859-1] Sat Apr 26 18:39:56 2014 @@ -34,8 +34,12 @@ { shellex { - MayChangeDefaultMenu {} + MayChangeDefaultMenu } + } + '{8856f961-340a-11d0-a96b-00c04fd705a2}' + { + Control } } 'InternetShortcut' Modified: trunk/reactos/dll/win32/ieframe/ieframe_v1.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ieframe/ieframe_… ============================================================================== --- trunk/reactos/dll/win32/ieframe/ieframe_v1.idl [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ieframe/ieframe_v1.idl [iso-8859-1] Sat Apr 26 18:39:56 2014 @@ -15,6 +15,9 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ + +#pragma makedep regtypelib +#pragma makedep register #include "exdisp.idl" Modified: trunk/reactos/dll/win32/ieframe/navigate.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ieframe/navigate… ============================================================================== --- trunk/reactos/dll/win32/ieframe/navigate.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ieframe/navigate.c [iso-8859-1] Sat Apr 26 18:39:56 2014 @@ -1437,6 +1437,45 @@ TargetFramePriv2_AggregatedNavigation2 }; +static inline HlinkFrame *impl_from_IWebBrowserPriv2IE9(IWebBrowserPriv2IE9 *iface) +{ + return CONTAINING_RECORD(iface, HlinkFrame, IWebBrowserPriv2IE9_iface); +} + +static HRESULT WINAPI WebBrowserPriv2IE9_QueryInterface(IWebBrowserPriv2IE9 *iface, REFIID riid, void **ppv) +{ + HlinkFrame *This = impl_from_IWebBrowserPriv2IE9(iface); + return IUnknown_QueryInterface(This->outer, riid, ppv); +} + +static ULONG WINAPI WebBrowserPriv2IE9_AddRef(IWebBrowserPriv2IE9 *iface) +{ + HlinkFrame *This = impl_from_IWebBrowserPriv2IE9(iface); + return IUnknown_AddRef(This->outer); +} + +static ULONG WINAPI WebBrowserPriv2IE9_Release(IWebBrowserPriv2IE9 *iface) +{ + HlinkFrame *This = impl_from_IWebBrowserPriv2IE9(iface); + return IUnknown_Release(This->outer); +} + +static HRESULT WINAPI WebBrowserPriv2IE9_NavigateWithBindCtx2(IWebBrowserPriv2IE9 *iface, IUri *uri, VARIANT *flags, + VARIANT *target_frame, VARIANT *post_data, VARIANT *headers, IBindCtx *bind_ctx, LPOLESTR url_fragment, DWORD unused) +{ + HlinkFrame *This = impl_from_IWebBrowserPriv2IE9(iface); + FIXME("(%p)->(%p %s %s %s %s %p %s)\n", This, uri, debugstr_variant(flags), debugstr_variant(target_frame), + debugstr_variant(post_data), debugstr_variant(headers), bind_ctx, debugstr_w(url_fragment)); + return E_NOTIMPL; +} + +static const IWebBrowserPriv2IE9Vtbl WebBrowserPriv2IE9Vtbl = { + WebBrowserPriv2IE9_QueryInterface, + WebBrowserPriv2IE9_AddRef, + WebBrowserPriv2IE9_Release, + WebBrowserPriv2IE9_NavigateWithBindCtx2 +}; + BOOL HlinkFrame_QI(HlinkFrame *This, REFIID riid, void **ppv) { if(IsEqualGUID(&IID_IHlinkFrame, riid)) { @@ -1451,6 +1490,9 @@ }else if(IsEqualGUID(&IID_ITargetFramePriv2, riid)) { TRACE("(%p)->(IID_ITargetFramePriv2 %p)\n", This, ppv); *ppv = &This->ITargetFramePriv2_iface; + }else if(IsEqualGUID(&IID_IWebBrowserPriv2IE9, riid)) { + TRACE("(%p)->(IID_IWebBrowserPriv2IE9 %p)\n", This, ppv); + *ppv = &This->IWebBrowserPriv2IE9_iface; }else { return FALSE; } @@ -1464,6 +1506,7 @@ This->IHlinkFrame_iface.lpVtbl = &HlinkFrameVtbl; This->ITargetFrame2_iface.lpVtbl = &TargetFrame2Vtbl; This->ITargetFramePriv2_iface.lpVtbl = &TargetFramePriv2Vtbl; + This->IWebBrowserPriv2IE9_iface.lpVtbl = &WebBrowserPriv2IE9Vtbl; This->outer = outer; This->doc_host = doc_host; Modified: trunk/reactos/dll/win32/ieframe/shellbrowser.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ieframe/shellbro… ============================================================================== --- trunk/reactos/dll/win32/ieframe/shellbrowser.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ieframe/shellbrowser.c [iso-8859-1] Sat Apr 26 18:39:56 2014 @@ -688,7 +688,7 @@ V_VT(params+3) = (VT_BYREF|VT_VARIANT); V_VARIANTREF(params+3) = &var_frame_name; V_VT(&var_frame_name) = VT_BSTR; - V_BSTR(&var_frame_name) = NULL; + V_BSTR(&var_frame_name) = lpszFrameName ? SysAllocString(lpszFrameName) : NULL; V_VT(params+4) = (VT_BYREF|VT_VARIANT); V_VARIANTREF(params+4) = &var_flags; @@ -709,6 +709,7 @@ SysFreeString(V_BSTR(&var_url)); SysFreeString(V_BSTR(&var_headers)); + SysFreeString(V_BSTR(&var_frame_name)); SafeArrayDestroy(post_data); *pfCancel = !!cancel; Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Sat Apr 26 18:39:56 2014 @@ -81,7 +81,7 @@ reactos/dll/win32/httpapi # Synced to Wine-1.7.1 reactos/dll/win32/iccvid # Synced to Wine-1.7.1 reactos/dll/win32/icmp # Out of sync -reactos/dll/win32/ieframe # Synced to Wine-1.7.1 +reactos/dll/win32/ieframe # Synced to Wine-1.7.17 reactos/dll/win32/imaadp32.acm # Synced to Wine-1.7.1 reactos/dll/win32/imagehlp # Synced to Wine-1.7.17 reactos/dll/win32/imm32 # Synced to Wine-1.7.1

1 0

[akhaldi] 63005: [MSHTML_WINETEST] * Sync with Wine 1.7.17. CORE-8080
by akhaldi＠svn.reactos.org 26 Apr '14

26 Apr '14

Author: akhaldi Date: Sat Apr 26 18:34:51 2014 New Revision: 63005 URL: http://svn.reactos.org/svn/reactos?rev=63005&view=rev Log: [MSHTML_WINETEST] * Sync with Wine 1.7.17. CORE-8080 Added: trunk/rostests/winetests/mshtml/blank.html (with props) trunk/rostests/winetests/mshtml/nav_test.html (with props) Modified: trunk/rostests/winetests/mshtml/CMakeLists.txt trunk/rostests/winetests/mshtml/activex.c trunk/rostests/winetests/mshtml/dom.c trunk/rostests/winetests/mshtml/events.c trunk/rostests/winetests/mshtml/events.html trunk/rostests/winetests/mshtml/htmldoc.c trunk/rostests/winetests/mshtml/mshtml_test.h trunk/rostests/winetests/mshtml/protocol.c trunk/rostests/winetests/mshtml/rsrc.rc trunk/rostests/winetests/mshtml/script.c trunk/rostests/winetests/mshtml/style.c trunk/rostests/winetests/mshtml/test_tlb.idl [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/rostests/winetests/mshtml/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/mshtml/CMakeLis… Modified: trunk/rostests/winetests/mshtml/activex.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/mshtml/activex.… Added: trunk/rostests/winetests/mshtml/blank.html URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/mshtml/blank.ht… Modified: trunk/rostests/winetests/mshtml/dom.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/mshtml/dom.c?re… Modified: trunk/rostests/winetests/mshtml/events.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/mshtml/events.c… Modified: trunk/rostests/winetests/mshtml/events.html URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/mshtml/events.h… Modified: trunk/rostests/winetests/mshtml/htmldoc.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/mshtml/htmldoc.… Modified: trunk/rostests/winetests/mshtml/mshtml_test.h URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/mshtml/mshtml_t… Added: trunk/rostests/winetests/mshtml/nav_test.html URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/mshtml/nav_test… Modified: trunk/rostests/winetests/mshtml/protocol.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/mshtml/protocol… Modified: trunk/rostests/winetests/mshtml/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/mshtml/rsrc.rc?… Modified: trunk/rostests/winetests/mshtml/script.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/mshtml/script.c… Modified: trunk/rostests/winetests/mshtml/style.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/mshtml/style.c?… Modified: trunk/rostests/winetests/mshtml/test_tlb.idl URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/mshtml/test_tlb…

1 0

[akhaldi] 63004: [MSHTML] * Sync with Wine 1.7.17. CORE-8080
by akhaldi＠svn.reactos.org 26 Apr '14

26 Apr '14

Author: akhaldi Date: Sat Apr 26 18:30:09 2014 New Revision: 63004 URL: http://svn.reactos.org/svn/reactos?rev=63004&view=rev Log: [MSHTML] * Sync with Wine 1.7.17. CORE-8080 Removed: trunk/reactos/dll/win32/mshtml/htmldoc3.c trunk/reactos/dll/win32/mshtml/htmldoc5.c Modified: trunk/reactos/boot/bootdata/packages/reactos.dff.in trunk/reactos/dll/cpl/appwiz/addons.c trunk/reactos/dll/win32/mshtml/CMakeLists.txt trunk/reactos/dll/win32/mshtml/binding.h trunk/reactos/dll/win32/mshtml/htmlanchor.c trunk/reactos/dll/win32/mshtml/htmlbody.c trunk/reactos/dll/win32/mshtml/htmldoc.c trunk/reactos/dll/win32/mshtml/htmlelem.c trunk/reactos/dll/win32/mshtml/htmlelem2.c trunk/reactos/dll/win32/mshtml/htmlevent.c trunk/reactos/dll/win32/mshtml/htmlevent.h trunk/reactos/dll/win32/mshtml/htmlform.c trunk/reactos/dll/win32/mshtml/htmlframebase.c trunk/reactos/dll/win32/mshtml/htmlselect.c trunk/reactos/dll/win32/mshtml/htmlstyle.c trunk/reactos/dll/win32/mshtml/htmlstyle.h trunk/reactos/dll/win32/mshtml/htmlstyle3.c trunk/reactos/dll/win32/mshtml/htmlstylesheet.c trunk/reactos/dll/win32/mshtml/htmltable.c trunk/reactos/dll/win32/mshtml/htmltablerow.c trunk/reactos/dll/win32/mshtml/htmlwindow.c trunk/reactos/dll/win32/mshtml/main.c trunk/reactos/dll/win32/mshtml/mshtml_classes.idl trunk/reactos/dll/win32/mshtml/mshtml_private.h trunk/reactos/dll/win32/mshtml/mutation.c trunk/reactos/dll/win32/mshtml/navigate.c trunk/reactos/dll/win32/mshtml/npplugin.c trunk/reactos/dll/win32/mshtml/nsembed.c trunk/reactos/dll/win32/mshtml/nsiface.idl trunk/reactos/dll/win32/mshtml/nsio.c trunk/reactos/dll/win32/mshtml/olecmd.c trunk/reactos/dll/win32/mshtml/oleobj.c trunk/reactos/dll/win32/mshtml/persist.c trunk/reactos/dll/win32/mshtml/pluginhost.c trunk/reactos/dll/win32/mshtml/script.c trunk/reactos/include/psdk/mshtmdid.h trunk/reactos/include/psdk/mshtml.idl trunk/reactos/media/doc/README.WINE [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/boot/bootdata/packages/reactos.dff.in URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/packages/rea… Modified: trunk/reactos/dll/cpl/appwiz/addons.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/addons.c?re… Modified: trunk/reactos/dll/win32/mshtml/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/CMakeList… Modified: trunk/reactos/dll/win32/mshtml/binding.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/binding.h… Modified: trunk/reactos/dll/win32/mshtml/htmlanchor.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/htmlancho… Modified: trunk/reactos/dll/win32/mshtml/htmlbody.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/htmlbody.… Modified: trunk/reactos/dll/win32/mshtml/htmldoc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/htmldoc.c… Removed: trunk/reactos/dll/win32/mshtml/htmldoc3.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/htmldoc3.… Removed: trunk/reactos/dll/win32/mshtml/htmldoc5.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/htmldoc5.… Modified: trunk/reactos/dll/win32/mshtml/htmlelem.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/htmlelem.… Modified: trunk/reactos/dll/win32/mshtml/htmlelem2.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/htmlelem2… Modified: trunk/reactos/dll/win32/mshtml/htmlevent.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/htmlevent… Modified: trunk/reactos/dll/win32/mshtml/htmlevent.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/htmlevent… Modified: trunk/reactos/dll/win32/mshtml/htmlform.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/htmlform.… Modified: trunk/reactos/dll/win32/mshtml/htmlframebase.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/htmlframe… Modified: trunk/reactos/dll/win32/mshtml/htmlselect.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/htmlselec… Modified: trunk/reactos/dll/win32/mshtml/htmlstyle.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/htmlstyle… Modified: trunk/reactos/dll/win32/mshtml/htmlstyle.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/htmlstyle… Modified: trunk/reactos/dll/win32/mshtml/htmlstyle3.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/htmlstyle… Modified: trunk/reactos/dll/win32/mshtml/htmlstylesheet.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/htmlstyle… Modified: trunk/reactos/dll/win32/mshtml/htmltable.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/htmltable… Modified: trunk/reactos/dll/win32/mshtml/htmltablerow.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/htmltable… Modified: trunk/reactos/dll/win32/mshtml/htmlwindow.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/htmlwindo… Modified: trunk/reactos/dll/win32/mshtml/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/main.c?re… Modified: trunk/reactos/dll/win32/mshtml/mshtml_classes.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/mshtml_cl… Modified: trunk/reactos/dll/win32/mshtml/mshtml_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/mshtml_pr… Modified: trunk/reactos/dll/win32/mshtml/mutation.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/mutation.… Modified: trunk/reactos/dll/win32/mshtml/navigate.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/navigate.… Modified: trunk/reactos/dll/win32/mshtml/npplugin.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/npplugin.… Modified: trunk/reactos/dll/win32/mshtml/nsembed.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/nsembed.c… Modified: trunk/reactos/dll/win32/mshtml/nsiface.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/nsiface.i… Modified: trunk/reactos/dll/win32/mshtml/nsio.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/nsio.c?re… Modified: trunk/reactos/dll/win32/mshtml/olecmd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/olecmd.c?… Modified: trunk/reactos/dll/win32/mshtml/oleobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/oleobj.c?… Modified: trunk/reactos/dll/win32/mshtml/persist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/persist.c… Modified: trunk/reactos/dll/win32/mshtml/pluginhost.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/pluginhos… Modified: trunk/reactos/dll/win32/mshtml/script.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/script.c?… Modified: trunk/reactos/include/psdk/mshtmdid.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/mshtmdid.h?re… Modified: trunk/reactos/include/psdk/mshtml.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/mshtml.idl?re… Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=…

1 0

[akhaldi] 63003: [VERSION_WINETEST] * Sync with Wine 1.7.17. CORE-8080
by akhaldi＠svn.reactos.org 26 Apr '14

26 Apr '14

Author: akhaldi Date: Sat Apr 26 18:16:00 2014 New Revision: 63003 URL: http://svn.reactos.org/svn/reactos?rev=63003&view=rev Log: [VERSION_WINETEST] * Sync with Wine 1.7.17. CORE-8080 Modified: trunk/rostests/winetests/version/CMakeLists.txt trunk/rostests/winetests/version/info.c trunk/rostests/winetests/version/install.c Modified: trunk/rostests/winetests/version/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/version/CMakeLi… ============================================================================== --- trunk/rostests/winetests/version/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/version/CMakeLists.txt [iso-8859-1] Sat Apr 26 18:16:00 2014 @@ -8,5 +8,8 @@ add_executable(version_winetest ${SOURCE} version.rc) set_module_type(version_winetest win32cui) -add_importlibs(version_winetest version msvcrt kernel32 ntdll) +add_importlibs(version_winetest version msvcrt kernel32) +if(MSVC) + add_importlibs(version_winetest ntdll) +endif() add_cd_file(TARGET version_winetest DESTINATION reactos/bin FOR all) Modified: trunk/rostests/winetests/version/info.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/version/info.c?… ============================================================================== --- trunk/rostests/winetests/version/info.c [iso-8859-1] (original) +++ trunk/rostests/winetests/version/info.c [iso-8859-1] Sat Apr 26 18:16:00 2014 @@ -204,7 +204,7 @@ VS_FIXEDFILEINFO *pFixedVersionInfo; UINT uiLength; char VersionString[MAX_PATH]; - static CHAR backslash[] = "\\"; + static const char backslash[] = "\\"; DWORDLONG dwlVersion; hdl = 0x55555555; @@ -457,7 +457,7 @@ HeapFree( GetProcessHeap(), 0, pVersionInfoW); } -static void test_VerQueryValue(void) +static void test_VerQueryValueA(void) { static const char * const value_name[] = { "Product", "CompanyName", "FileDescription", "Internal", @@ -468,24 +468,24 @@ UINT len, ret, translation, i; char buf[MAX_PATH]; - ret = GetModuleFileName(NULL, buf, sizeof(buf)); + ret = GetModuleFileNameA(NULL, buf, sizeof(buf)); assert(ret); SetLastError(0xdeadbeef); - len = GetFileVersionInfoSize(buf, NULL); - ok(len, "GetFileVersionInfoSize(%s) error %u\n", buf, GetLastError()); + len = GetFileVersionInfoSizeA(buf, NULL); + ok(len, "GetFileVersionInfoSizeA(%s) error %u\n", buf, GetLastError()); ver = HeapAlloc(GetProcessHeap(), 0, len); assert(ver); SetLastError(0xdeadbeef); - ret = GetFileVersionInfo(buf, 0, len, ver); - ok(ret, "GetFileVersionInfo error %u\n", GetLastError()); - - p = (char *)0xdeadbeef; - len = 0xdeadbeef; - SetLastError(0xdeadbeef); - ret = VerQueryValue(ver, "\\VarFileInfo\\Translation", (LPVOID*)&p, &len); + ret = GetFileVersionInfoA(buf, 0, len, ver); + ok(ret, "GetFileVersionInfoA error %u\n", GetLastError()); + + p = (char *)0xdeadbeef; + len = 0xdeadbeef; + SetLastError(0xdeadbeef); + ret = VerQueryValueA(ver, "\\VarFileInfo\\Translation", (LPVOID*)&p, &len); ok(ret, "VerQueryValue error %u\n", GetLastError()); ok(len == 4, "VerQueryValue returned %u, expected 4\n", len); @@ -495,7 +495,7 @@ p = (char *)0xdeadbeef; len = 0xdeadbeef; SetLastError(0xdeadbeef); - ret = VerQueryValue(ver, "String", (LPVOID*)&p, &len); + ret = VerQueryValueA(ver, "String", (LPVOID*)&p, &len); ok(!ret, "VerQueryValue should fail\n"); ok(GetLastError() == ERROR_RESOURCE_TYPE_NOT_FOUND || GetLastError() == 0xdeadbeef /* NT4, W2K */, @@ -506,42 +506,42 @@ p = (char *)0xdeadbeef; len = 0xdeadbeef; SetLastError(0xdeadbeef); - ret = VerQueryValue(ver, "StringFileInfo", (LPVOID*)&p, &len); - ok(ret, "VerQueryValue error %u\n", GetLastError()); -todo_wine ok(len == 0, "VerQueryValue returned %u, expected 0\n", len); + ret = VerQueryValueA(ver, "StringFileInfo", (LPVOID*)&p, &len); + ok(ret, "VerQueryValue error %u\n", GetLastError()); + ok(len == 0, "VerQueryValue returned %u, expected 0\n", len); ok(p != (char *)0xdeadbeef, "not expected 0xdeadbeef\n"); p = (char *)0xdeadbeef; len = 0xdeadbeef; SetLastError(0xdeadbeef); - ret = VerQueryValue(ver, "\\StringFileInfo", (LPVOID*)&p, &len); - ok(ret, "VerQueryValue error %u\n", GetLastError()); -todo_wine ok(len == 0, "VerQueryValue returned %u, expected 0\n", len); + ret = VerQueryValueA(ver, "\\StringFileInfo", (LPVOID*)&p, &len); + ok(ret, "VerQueryValue error %u\n", GetLastError()); + ok(len == 0, "VerQueryValue returned %u, expected 0\n", len); ok(p != (char *)0xdeadbeef, "not expected 0xdeadbeef\n"); p = (char *)0xdeadbeef; len = 0xdeadbeef; SetLastError(0xdeadbeef); - ret = VerQueryValue(ver, "\\\\StringFileInfo", (LPVOID*)&p, &len); - ok(ret, "VerQueryValue error %u\n", GetLastError()); -todo_wine ok(len == 0, "VerQueryValue returned %u, expected 0\n", len); + ret = VerQueryValueA(ver, "\\\\StringFileInfo", (LPVOID*)&p, &len); + ok(ret, "VerQueryValue error %u\n", GetLastError()); + ok(len == 0, "VerQueryValue returned %u, expected 0\n", len); ok(p != (char *)0xdeadbeef, "not expected 0xdeadbeef\n"); p = (char *)0xdeadbeef; len = 0xdeadbeef; SetLastError(0xdeadbeef); - ret = VerQueryValue(ver, "\\StringFileInfo\\\\", (LPVOID*)&p, &len); - ok(ret, "VerQueryValue error %u\n", GetLastError()); -todo_wine ok(len == 0, "VerQueryValue returned %u, expected 0\n", len); + ret = VerQueryValueA(ver, "\\StringFileInfo\\\\", (LPVOID*)&p, &len); + ok(ret, "VerQueryValue error %u\n", GetLastError()); + ok(len == 0, "VerQueryValue returned %u, expected 0\n", len); ok(p != (char *)0xdeadbeef, "not expected 0xdeadbeef\n"); sprintf(buf, "\\StringFileInfo\\%08x", translation); p = (char *)0xdeadbeef; len = 0xdeadbeef; SetLastError(0xdeadbeef); - ret = VerQueryValue(ver, buf, (LPVOID*)&p, &len); - ok(ret, "VerQueryValue error %u\n", GetLastError()); -todo_wine ok(len == 0, "VerQueryValue returned %u, expected 0\n", len); + ret = VerQueryValueA(ver, buf, (LPVOID*)&p, &len); + ok(ret, "VerQueryValue error %u\n", GetLastError()); + ok(len == 0, "VerQueryValue returned %u, expected 0\n", len); ok(p != (char *)0xdeadbeef, "not expected 0xdeadbeef\n"); for (i = 0; i < sizeof(value_name)/sizeof(value_name[0]); i++) @@ -550,20 +550,20 @@ p = (char *)0xdeadbeef; len = 0xdeadbeef; SetLastError(0xdeadbeef); - ret = VerQueryValue(ver, buf, (LPVOID*)&p, &len); - ok(ret, "VerQueryValue(%s) error %u\n", buf, GetLastError()); + ret = VerQueryValueA(ver, buf, (LPVOID*)&p, &len); + ok(ret, "VerQueryValueA(%s) error %u\n", buf, GetLastError()); ok(len == strlen(value_name[i]) + 1, "VerQueryValue returned %u\n", len); ok(!strcmp(value_name[i], p), "expected \"%s\", got \"%s\"\n", value_name[i], p); /* test partial value names */ - len = lstrlen(buf); + len = lstrlenA(buf); buf[len - 2] = 0; p = (char *)0xdeadbeef; len = 0xdeadbeef; SetLastError(0xdeadbeef); - ret = VerQueryValue(ver, buf, (LPVOID*)&p, &len); - ok(!ret, "VerQueryValue(%s) succeeded\n", buf); + ret = VerQueryValueA(ver, buf, (LPVOID*)&p, &len); + ok(!ret, "VerQueryValueA(%s) succeeded\n", buf); ok(GetLastError() == ERROR_RESOURCE_TYPE_NOT_FOUND || GetLastError() == 0xdeadbeef /* NT4, W2K */, "VerQueryValue returned %u\n", GetLastError()); @@ -574,10 +574,61 @@ HeapFree(GetProcessHeap(), 0, ver); } +static void test_extra_block(void) +{ + WORD extra_block[] = { + 72, 0, 0, 'W', 'i', 'n', 'e', 'T', 'e', 's', 't', '\0', + 24, 4, 0, 'B', 'i', 'n', 'a', 'r', 'y', '\0', 0xbeef, 0xdead, + 24, 4, 1, 'T', 'e', 'x', 't', '\0', 'B', '-', ')', '\0', + }; + char buf[MAX_PATH]; + UINT len, ret; + ULONG w; + char *ver, *p; + WORD *length; + + ret = GetModuleFileNameA(NULL, buf, sizeof(buf)); + ok(ret, "GetModuleFileNameA failed\n"); + + len = GetFileVersionInfoSizeA(buf, NULL); + ok(len, "GetFileVersionInfoSizeA(%s) error %u\n", buf, GetLastError()); + + ver = HeapAlloc(GetProcessHeap(), 0, len + sizeof(extra_block) * 2); + ok(ver != NULL, "Can't allocate memory\n"); + + ret = GetFileVersionInfoA(buf, 0, len, ver); + ok(ret, "GetFileVersionInfoA error %u\n", GetLastError()); + + /* forge the string table, as windres dislike an extra block */ + length = (WORD *)ver; /* see VS_VERSION_INFO_STRUCT32 for details */ + memcpy(ver + *length, extra_block, sizeof(extra_block)); + *length += sizeof(extra_block); + + p = (char *)0xdeadbeef; + len = 0xdeadbeef; + w = 0xdeadbeef; + ret = VerQueryValueA(ver, "WineTest\\Binary", (LPVOID*)&p, &len); + ok(ret, "VerQueryValue error %u\n", GetLastError()); + ok(len == 4, "VerQueryValue returned %u, expected 4\n", len); + ok(p != (char *)0xdeadbeef, "not expected 0xdeadbeef\n"); + ok(memcmp(p, &w, sizeof(w)) == 0, "got 0x%08x, expected 0x%08x\n", *(PULONG)p, w); + + p = (char *)0xdeadbeef; + len = 0xdeadbeef; + ret = VerQueryValueA(ver, "WineTest\\Text", (LPVOID*)&p, &len); + ok(ret, "VerQueryValue error %u\n", GetLastError()); + ok(len == 4, "VerQueryValue returned %u, expected 4\n", len); + ok(p != (char *)0xdeadbeef, "not expected 0xdeadbeef\n"); + ok(strcmp(p, "B-)") == 0, "got '%s', expected '%s'\n", p, "B-)"); + + HeapFree(GetProcessHeap(), 0, ver); +} + START_TEST(info) { test_info_size(); test_info(); test_32bit_win(); - test_VerQueryValue(); -} + test_VerQueryValueA(); + test_extra_block(); +} Modified: trunk/rostests/winetests/version/install.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/version/install… ============================================================================== --- trunk/rostests/winetests/version/install.c [iso-8859-1] (original) +++ trunk/rostests/winetests/version/install.c [iso-8859-1] Sat Apr 26 18:16:00 2014 @@ -34,9 +34,9 @@ char filename[MAX_PATH]; char outBuf[MAX_PATH]; char windir[MAX_PATH]; - static CHAR empty[] = "", - regedit[] = "regedit", - regedit_exe[] = "regedit.exe"; + static const char empty[] = "", + regedit[] = "regedit", + regedit_exe[] = "regedit.exe"; memset(appdir, 0, MAX_PATH); memset(windir, 0, MAX_PATH);

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs