Ros-diffs March 2016

ros-diffs@reactos.org

13 participants
263 discussions

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sat Mar 5 22:46:54 2016 New Revision: 70957 URL: http://svn.reactos.org/svn/reactos?rev=70957&view=rev Log: [PSDK]: Fix a define. Modified: trunk/reactos/include/psdk/bcrypt.h Modified: trunk/reactos/include/psdk/bcrypt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/bcrypt.h?rev=… ============================================================================== --- trunk/reactos/include/psdk/bcrypt.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/bcrypt.h [iso-8859-1] Sat Mar 5 22:46:54 2016 @@ -49,7 +49,7 @@ #define BCRYPT_HASH_BLOCK_LENGTH L"HashBlockLength" #define BCRYPT_HASH_LENGTH L"HashDigestLength" #define BCRYPT_HASH_OID_LIST L"HashOIDList" -#define BCRYPT_KEY_LENGTH L"KeyLengths" +#define BCRYPT_KEY_LENGTH L"KeyLength" #define BCRYPT_KEY_LENGTHS L"KeyLengths" #define BCRYPT_KEY_OBJECT_LENGTH L"KeyObjectLength" #define BCRYPT_KEY_STRENGTH L"KeyStrength"

8 years, 9 months

[akhaldi] 70956: [PSDK] Satisfy MSVC 2010. Dedicated to Hermès.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sat Mar 5 22:40:18 2016 New Revision: 70956 URL: http://svn.reactos.org/svn/reactos?rev=70956&view=rev Log: [PSDK] Satisfy MSVC 2010. Dedicated to Hermès. Modified: trunk/reactos/include/psdk/bcrypt.h Modified: trunk/reactos/include/psdk/bcrypt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/bcrypt.h?rev=… ============================================================================== --- trunk/reactos/include/psdk/bcrypt.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/bcrypt.h [iso-8859-1] Sat Mar 5 22:40:18 2016 @@ -40,33 +40,31 @@ typedef NTSTATUS *PNTSTATUS; #endif -#define BCRYPT_ALGORITHM_NAME (const WCHAR []){'A','l','g','o','r','i','t','h','m','N','a','m','e',0} -#define BCRYPT_AUTH_TAG_LENGTH (const WCHAR []){'A','u','t','h','T','a','g','L','e','n','g','t','h',0} -#define BCRYPT_BLOCK_LENGTH (const WCHAR []){'B','l','o','c','k','L','e','n','g','t','h',0} -#define BCRYPT_BLOCK_SIZE_LIST (const WCHAR []){'B','l','o','c','k','S','i','z','e','L','i','s','t',0} -#define BCRYPT_CHAINING_MODE (const WCHAR []){'C','h','a','i','n','i','n','g','M','o','d','e',0} -#define BCRYPT_EFFECTIVE_KEY_LENGTH (const WCHAR []){'E','f','f','e','c','t','i','v','e','K','e','y','L','e','n','g','t','h',0} -#define BCRYPT_HASH_BLOCK_LENGTH (const WCHAR []){'H','a','s','h','B','l','o','c','k','L','e','n','g','t','h',0} -#define BCRYPT_HASH_LENGTH (const WCHAR []){'H','a','s','h','D','i','g','e','s','t','L','e','n','g','t','h',0} -#define BCRYPT_HASH_OID_LIST (const WCHAR []){'H','a','s','h','O','I','D','L','i','s','t',0} -#define BCRYPT_KEY_LENGTH (const WCHAR []){'K','e','y','L','e','n','g','t','h',0} -#define BCRYPT_KEY_LENGTHS (const WCHAR []){'K','e','y','L','e','n','g','t','h','s',0} -#define BCRYPT_KEY_OBJECT_LENGTH (const WCHAR []){'K','e','y','O','b','j','e','c','t','L','e','n','g','t','h',0} -#define BCRYPT_KEY_STRENGTH (const WCHAR []){'K','e','y','S','t','r','e','n','g','t','h',0} -#define BCRYPT_OBJECT_LENGTH (const WCHAR []){'O','b','j','e','c','t','L','e','n','g','t','h',0} -#define BCRYPT_PADDING_SCHEMES (const WCHAR []){'P','a','d','d','i','n','g','S','c','h','e','m','e','s',0} -#define BCRYPT_PROVIDER_HANDLE (const WCHAR []){'P','r','o','v','i','d','e','r','H','a','n','d','l','e',0} -#define BCRYPT_SIGNATURE_LENGTH (const WCHAR []){'S','i','g','n','a','t','u','r','e','L','e','n','g','t','h',0} +#define BCRYPT_ALGORITHM_NAME L"AlgorithmName" +#define BCRYPT_AUTH_TAG_LENGTH L"AuthTagLength" +#define BCRYPT_BLOCK_LENGTH L"BlockLength" +#define BCRYPT_BLOCK_SIZE_LIST L"BlockSizeList" +#define BCRYPT_CHAINING_MODE L"ChainingMode" +#define BCRYPT_EFFECTIVE_KEY_LENGTH L"EffectiveKeyLength" +#define BCRYPT_HASH_BLOCK_LENGTH L"HashBlockLength" +#define BCRYPT_HASH_LENGTH L"HashDigestLength" +#define BCRYPT_HASH_OID_LIST L"HashOIDList" +#define BCRYPT_KEY_LENGTH L"KeyLengths" +#define BCRYPT_KEY_LENGTHS L"KeyLengths" +#define BCRYPT_KEY_OBJECT_LENGTH L"KeyObjectLength" +#define BCRYPT_KEY_STRENGTH L"KeyStrength" +#define BCRYPT_OBJECT_LENGTH L"ObjectLength" +#define BCRYPT_PADDING_SCHEMES L"PaddingSchemes" +#define BCRYPT_PROVIDER_HANDLE L"ProviderHandle" +#define BCRYPT_SIGNATURE_LENGTH L"SignatureLength" -#define MS_PRIMITIVE_PROVIDER (const WCHAR [])\ - {'M','i','c','r','o','s','o','f','t',' ','P','r','i','m','i','t','i','v','e',' ','P','r','o','v','i','d','e','r',0} -#define MS_PLATFORM_CRYPTO_PROVIDER (const WCHAR [])\ - {'M','i','c','r','o','s','o','f','t',' ','P','l','a','t','f','o','r','m',' ','C','r','y','p','t','o',' ','P','r','o','v','i','d','e','r',0} +#define MS_PRIMITIVE_PROVIDER L"Microsoft Primitive Provider" +#define MS_PLATFORM_CRYPTO_PROVIDER L"Microsoft Platform Crypto Provider" -#define BCRYPT_SHA1_ALGORITHM (const WCHAR []){'S','H','A','1',0} -#define BCRYPT_SHA256_ALGORITHM (const WCHAR []){'S','H','A','2','5','6',0} -#define BCRYPT_SHA384_ALGORITHM (const WCHAR []){'S','H','A','3','8','4',0} -#define BCRYPT_SHA512_ALGORITHM (const WCHAR []){'S','H','A','5','1','2',0} +#define BCRYPT_SHA1_ALGORITHM L"SHA1" +#define BCRYPT_SHA256_ALGORITHM L"SHA256" +#define BCRYPT_SHA384_ALGORITHM L"SHA384" +#define BCRYPT_SHA512_ALGORITHM L"SHA512" typedef struct _BCRYPT_ALGORITHM_IDENTIFIER {

8 years, 9 months

[pschweitzer] 70955: [FS_REC] Implement support for recognizing the Btrfs volumes. Patch by Peter Hater. CORE-10892 #comment The fs_rec part has been committed, thanks!

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Sat Mar 5 13:01:11 2016 New Revision: 70955 URL: http://svn.reactos.org/svn/reactos?rev=70955&view=rev Log: [FS_REC] Implement support for recognizing the Btrfs volumes. Patch by Peter Hater. CORE-10892 #comment The fs_rec part has been committed, thanks! Added: trunk/reactos/drivers/filesystems/fs_rec/btrfs.c (with props) trunk/reactos/drivers/filesystems/fs_rec/btrfs.h (with props) Modified: trunk/reactos/drivers/filesystems/fs_rec/CMakeLists.txt trunk/reactos/drivers/filesystems/fs_rec/fs_rec.c trunk/reactos/drivers/filesystems/fs_rec/fs_rec.h Modified: trunk/reactos/drivers/filesystems/fs_rec/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fs_rec… ============================================================================== --- trunk/reactos/drivers/filesystems/fs_rec/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fs_rec/CMakeLists.txt [iso-8859-1] Sat Mar 5 13:01:11 2016 @@ -1,6 +1,6 @@ - list(APPEND SOURCE blockdev.c + btrfs.c cdfs.c ext2.c fat.c Added: trunk/reactos/drivers/filesystems/fs_rec/btrfs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fs_rec… ============================================================================== --- trunk/reactos/drivers/filesystems/fs_rec/btrfs.c (added) +++ trunk/reactos/drivers/filesystems/fs_rec/btrfs.c [iso-8859-1] Sat Mar 5 13:01:11 2016 @@ -0,0 +1,109 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS File System Recognizer + * FILE: drivers/filesystems/fs_rec/btrfs.c + * PURPOSE: Btrfs Recognizer + * PROGRAMMER: Peter Hater + * Pierre Schweitzer (pierre(a)reactos.org) + */ + +/* INCLUDES *****************************************************************/ + +#include "fs_rec.h" +#include "btrfs.h" + +#define NDEBUG +#include <debug.h> + +/* FUNCTIONS ****************************************************************/ + +BOOLEAN +NTAPI +FsRecIsBtrfsVolume(IN PBTRFS_SUPER_BLOCK SuperBlock) +{ + /* Just check for magic */ + return (SuperBlock->magic == BTRFS_MAGIC); +} + +NTSTATUS +NTAPI +FsRecBtrfsFsControl(IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + PIO_STACK_LOCATION Stack; + NTSTATUS Status; + PDEVICE_OBJECT MountDevice; + PBTRFS_SUPER_BLOCK Spb = NULL; + ULONG SectorSize; + LARGE_INTEGER Offset; + BOOLEAN DeviceError = FALSE; + PAGED_CODE(); + + /* Get the I/O Stack and check the function type */ + Stack = IoGetCurrentIrpStackLocation(Irp); + switch (Stack->MinorFunction) + { + case IRP_MN_MOUNT_VOLUME: + + /* Assume failure */ + Status = STATUS_UNRECOGNIZED_VOLUME; + + /* Get the device object and request the sector size */ + MountDevice = Stack->Parameters.MountVolume.DeviceObject; + if (FsRecGetDeviceSectorSize(MountDevice, &SectorSize)) + { + /* Try to read the superblock */ + Offset.QuadPart = BTRFS_SB_OFFSET; + if (FsRecReadBlock(MountDevice, + &Offset, + BTRFS_SB_SIZE, + SectorSize, + (PVOID)&Spb, + &DeviceError)) + { + /* Check if it's an actual BTRFS volume */ + if (FsRecIsBtrfsVolume(Spb)) + { + /* It is! */ + Status = STATUS_FS_DRIVER_REQUIRED; + } + } + + /* Free the boot sector if we have one */ + ExFreePool(Spb); + } + else + { + /* We have some sort of failure in the storage stack */ + DeviceError = TRUE; + } + + /* Check if we have an error on the stack */ + if (DeviceError) + { + /* Was this because of a floppy? */ + if (MountDevice->Characteristics & FILE_FLOPPY_DISKETTE) + { + /* Let the FS try anyway */ + Status = STATUS_FS_DRIVER_REQUIRED; + } + } + + break; + + case IRP_MN_LOAD_FILE_SYSTEM: + + /* Load the file system */ + Status = FsRecLoadFileSystem(DeviceObject, + L"\\Registry\\Machine\\System\\CurrentControlSet\\Services\\btrfs"); + break; + + default: + + /* Invalid request */ + Status = STATUS_INVALID_DEVICE_REQUEST; + } + + /* Return Status */ + return Status; +} Propchange: trunk/reactos/drivers/filesystems/fs_rec/btrfs.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/drivers/filesystems/fs_rec/btrfs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fs_rec… ============================================================================== --- trunk/reactos/drivers/filesystems/fs_rec/btrfs.h (added) +++ trunk/reactos/drivers/filesystems/fs_rec/btrfs.h [iso-8859-1] Sat Mar 5 13:01:11 2016 @@ -0,0 +1,31 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS File System Recognizer + * FILE: drivers/filesystems/fs_rec/btrfs.h + * PURPOSE: BTRFS Header File + * PROGRAMMER: Peter Hater + * Pierre Schweitzer (pierre(a)reactos.org) + */ + +#include <pshpack1.h> +typedef struct { + UINT8 uuid[16]; +} BTRFS_UUID; + +typedef struct _BTRFS_SUPER_BLOCK { + UINT8 checksum[32]; + BTRFS_UUID uuid; + UINT64 sb_phys_addr; + UINT64 flags; + UINT64 magic; + // Partial +} BTRFS_SUPER_BLOCK, *PBTRFS_SUPER_BLOCK; +#include <poppack.h> + +C_ASSERT(FIELD_OFFSET(BTRFS_SUPER_BLOCK, uuid) == 0x20); +C_ASSERT(FIELD_OFFSET(BTRFS_SUPER_BLOCK, sb_phys_addr) == 0x30); +C_ASSERT(FIELD_OFFSET(BTRFS_SUPER_BLOCK, magic) == 0x40); + +#define BTRFS_MAGIC 0x4d5f53665248425f +#define BTRFS_SB_OFFSET 0x10000 +#define BTRFS_SB_SIZE 0x1000 Propchange: trunk/reactos/drivers/filesystems/fs_rec/btrfs.h ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/drivers/filesystems/fs_rec/fs_rec.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fs_rec… ============================================================================== --- trunk/reactos/drivers/filesystems/fs_rec/fs_rec.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fs_rec/fs_rec.c [iso-8859-1] Sat Mar 5 13:01:11 2016 @@ -162,6 +162,12 @@ /* Send EXT2 command */ Status = FsRecExt2FsControl(DeviceObject, Irp); + break; + + case FS_TYPE_BTRFS: + + /* Send BTRFS command */ + Status = FsRecBtrfsFsControl(DeviceObject, Irp); break; default: @@ -382,6 +388,16 @@ FILE_DEVICE_DISK_FILE_SYSTEM); if (NT_SUCCESS(Status)) DeviceCount++; + /* Register BTRFS */ + Status = FsRecRegisterFs(DriverObject, + NULL, + NULL, + L"\\Btrfs", + L"\\FileSystem\\BtrfsRecognizer", + FS_TYPE_BTRFS, + FILE_DEVICE_DISK_FILE_SYSTEM); + if (NT_SUCCESS(Status)) DeviceCount++; + /* Return appropriate Status */ return (DeviceCount > 0) ? STATUS_SUCCESS : STATUS_IMAGE_ALREADY_LOADED; } Modified: trunk/reactos/drivers/filesystems/fs_rec/fs_rec.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fs_rec… ============================================================================== --- trunk/reactos/drivers/filesystems/fs_rec/fs_rec.h [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fs_rec/fs_rec.h [iso-8859-1] Sat Mar 5 13:01:11 2016 @@ -174,6 +174,7 @@ FS_TYPE_CDFS, FS_TYPE_UDFS, FS_TYPE_EXT2, + FS_TYPE_BTRFS, } FILE_SYSTEM_TYPE, *PFILE_SYSTEM_TYPE; /* FS Recognizer State */ @@ -224,6 +225,13 @@ NTSTATUS NTAPI FsRecExt2FsControl( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp +); + +NTSTATUS +NTAPI +FsRecBtrfsFsControl( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp );

8 years, 9 months

[akhaldi] 70954: [XMLLITE_WINETEST] Sync with Wine Staging 1.9.4. CORE-10912

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sat Mar 5 11:09:57 2016 New Revision: 70954 URL: http://svn.reactos.org/svn/reactos?rev=70954&view=rev Log: [XMLLITE_WINETEST] Sync with Wine Staging 1.9.4. CORE-10912 Modified: trunk/rostests/winetests/xmllite/reader.c Modified: trunk/rostests/winetests/xmllite/reader.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/xmllite/reader.… ============================================================================== --- trunk/rostests/winetests/xmllite/reader.c [iso-8859-1] (original) +++ trunk/rostests/winetests/xmllite/reader.c [iso-8859-1] Sat Mar 5 11:09:57 2016 @@ -101,15 +101,9 @@ broken_state = broken((line_broken == -1 ? line : line_broken) == l && (pos_broken == -1 ? pos : pos_broken) == p); - if (todo) - todo_wine + todo_wine_if (todo) ok_(__FILE__, _line_)((l == line && pos == p) || broken_state, "Expected (%d,%d), got (%d,%d)\n", line, pos, l, p); - else - { - ok_(__FILE__, _line_)((l == line && pos == p) || broken_state, - "Expected (%d,%d), got (%d,%d)\n", line, pos, l, p); - } } #define ok_pos(reader, l, p, l_brk, p_brk, todo) ok_pos_(reader, l, p, l_brk, p_brk, todo, __LINE__) @@ -152,12 +146,8 @@ while (expected[i++]) size++; - if (todo) { - todo_wine - ok_(__FILE__, line)(iids->count == size, "Sequence size mismatch (%d), got (%d)\n", size, iids->count); - } - else - ok_(__FILE__, line)(iids->count == size, "Sequence size mismatch (%d), got (%d)\n", size, iids->count); + todo_wine_if (todo) + ok_(__FILE__, line)(iids->count == size, "Sequence size mismatch (%d), got (%d)\n", size, iids->count); if (iids->count != size) return; @@ -252,13 +242,7 @@ else broken_state = broken(exp_broken == state); - if (todo) - { - todo_wine - ok_(__FILE__, line)(state == expected || broken_state, "Expected (%s), got (%s)\n", - state_to_str(expected), state_to_str(state)); - } - else + todo_wine_if (todo) ok_(__FILE__, line)(state == expected || broken_state, "Expected (%s), got (%s)\n", state_to_str(expected), state_to_str(state)); } @@ -1520,14 +1504,7 @@ ok(hr == S_OK, "got 0x%08x\n", hr); str_exp = a2w(test->value); - if (test->todo) - { - todo_wine { - ok(len == strlen(test->value), "got %u\n", len); - ok(!lstrcmpW(str, str_exp), "got %s\n", wine_dbgstr_w(str)); - } - } - else + todo_wine_if (test->todo) { ok(len == strlen(test->value), "got %u\n", len); ok(!lstrcmpW(str, str_exp), "got %s\n", wine_dbgstr_w(str)); @@ -1620,14 +1597,7 @@ ok(hr == S_OK, "got 0x%08x\n", hr); str_exp = a2w(test->value); - if (test->todo) - { - todo_wine { - ok(len == strlen(test->value), "got %u\n", len); - ok(!lstrcmpW(str, str_exp), "got %s\n", wine_dbgstr_w(str)); - } - } - else + todo_wine_if (test->todo) { ok(len == strlen(test->value), "got %u\n", len); ok(!lstrcmpW(str, str_exp), "got %s\n", wine_dbgstr_w(str));

8 years, 9 months

[akhaldi] 70953: [WMIUTILS_WINETEST] Sync with Wine Staging 1.9.4. CORE-10912

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sat Mar 5 11:09:08 2016 New Revision: 70953 URL: http://svn.reactos.org/svn/reactos?rev=70953&view=rev Log: [WMIUTILS_WINETEST] Sync with Wine Staging 1.9.4. CORE-10912 Modified: trunk/rostests/winetests/wmiutils/path.c Modified: trunk/rostests/winetests/wmiutils/path.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/wmiutils/path.c… ============================================================================== --- trunk/rostests/winetests/wmiutils/path.c [iso-8859-1] (original) +++ trunk/rostests/winetests/wmiutils/path.c [iso-8859-1] Sat Mar 5 11:09:08 2016 @@ -140,8 +140,8 @@ for (i = 0; i < sizeof(test)/sizeof(test[0]); i++) { hr = IWbemPath_SetText( path, test[i].mode, test[i].path ); - if (test[i].todo) todo_wine ok( hr == test[i].ret, "%u got %08x\n", i, hr ); - else ok( hr == test[i].ret, "%u got %08x\n", i, hr ); + todo_wine_if (test[i].todo) + ok( hr == test[i].ret, "%u got %08x\n", i, hr ); if (test[i].ret == S_OK) {

8 years, 9 months

[akhaldi] 70952: [WINMM_WINETEST] Sync with Wine Staging 1.9.4. CORE-10912

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sat Mar 5 11:06:50 2016 New Revision: 70952 URL: http://svn.reactos.org/svn/reactos?rev=70952&view=rev Log: [WINMM_WINETEST] Sync with Wine Staging 1.9.4. CORE-10912 Modified: trunk/rostests/winetests/winmm/mixer.c Modified: trunk/rostests/winetests/winmm/mixer.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/winmm/mixer.c?r… ============================================================================== --- trunk/rostests/winetests/winmm/mixer.c [iso-8859-1] (original) +++ trunk/rostests/winetests/winmm/mixer.c [iso-8859-1] Sat Mar 5 11:06:50 2016 @@ -438,11 +438,13 @@ mixerlineA.cbStruct = sizeof(mixerlineA); mixerlineA.dwDestination=d; + mixerlineA.dwUser = (ULONG_PTR)0xdeadbeef; rc = mixerGetLineInfoA(mix, &mixerlineA, MIXER_GETLINEINFOF_DESTINATION); ok(rc==MMSYSERR_NOERROR||rc==MMSYSERR_NODRIVER, "mixerGetLineInfoA(MIXER_GETLINEINFOF_DESTINATION): " "MMSYSERR_NOERROR expected, got %s\n", mmsys_error(rc)); + ok(mixerlineA.dwUser == 0, "dwUser was not reset\n"); if (rc==MMSYSERR_NODRIVER) trace(" No Driver\n"); else if (rc==MMSYSERR_NOERROR) { @@ -822,11 +824,13 @@ mixerlineW.cbStruct = sizeof(mixerlineW); mixerlineW.dwDestination=d; + mixerlineW.dwUser = (ULONG_PTR)0xdeadbeef; rc = mixerGetLineInfoW(mix, &mixerlineW, MIXER_GETLINEINFOF_DESTINATION); ok(rc==MMSYSERR_NOERROR||rc==MMSYSERR_NODRIVER, "mixerGetLineInfoW(MIXER_GETLINEINFOF_DESTINATION): " "MMSYSERR_NOERROR expected, got %s\n", mmsys_error(rc)); + ok(mixerlineW.dwUser == 0, "dwUser was not reset\n"); if (rc==MMSYSERR_NODRIVER) trace(" No Driver\n"); else if (rc==MMSYSERR_NOERROR && winetest_interactive) {

8 years, 9 months

[akhaldi] 70951: [WTSAPI32] Sync with Wine Staging 1.9.4. CORE-10912

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sat Mar 5 11:04:47 2016 New Revision: 70951 URL: http://svn.reactos.org/svn/reactos?rev=70951&view=rev Log: [WTSAPI32] Sync with Wine Staging 1.9.4. CORE-10912 Modified: trunk/reactos/dll/win32/wtsapi32/wtsapi32.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/wtsapi32/wtsapi32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wtsapi32/wtsapi3… ============================================================================== --- trunk/reactos/dll/win32/wtsapi32/wtsapi32.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wtsapi32/wtsapi32.c [iso-8859-1] Sat Mar 5 11:04:47 2016 @@ -28,6 +28,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(wtsapi); +/* FIXME: Inspect */ +#define GetCurrentProcessToken() ((HANDLE)~(ULONG_PTR)3) + /************************************************************ * WTSCloseServer (WTSAPI32.@) @@ -311,7 +314,16 @@ BOOL WINAPI WTSQueryUserToken(ULONG session_id, PHANDLE token) { FIXME("%u %p\n", session_id, token); - return FALSE; + + if (!token) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + return DuplicateHandle(GetCurrentProcess(), GetCurrentProcessToken(), + GetCurrentProcess(), token, + 0, FALSE, DUPLICATE_SAME_ACCESS); } /************************************************************ 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 Mar 5 11:04:47 2016 @@ -216,7 +216,7 @@ reactos/dll/win32/wmiutils # Synced to WineStaging-1.7.55 reactos/dll/win32/wmvcore # Synced to WineStaging-1.7.55 reactos/dll/win32/wshom.ocx # Synced to WineStaging-1.7.55 -reactos/dll/win32/wtsapi32 # Synced to WineStaging-1.7.55 +reactos/dll/win32/wtsapi32 # Synced to WineStaging-1.9.4 reactos/dll/win32/wuapi # Synced to WineStaging-1.7.55 reactos/dll/win32/xinput1_1 # Synced to WineStaging-1.7.55 reactos/dll/win32/xinput1_2 # Synced to WineStaging-1.7.55

8 years, 9 months

[akhaldi] 70950: [WLDAP32] Sync with Wine Staging 1.9.4. CORE-10912

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sat Mar 5 11:01:59 2016 New Revision: 70950 URL: http://svn.reactos.org/svn/reactos?rev=70950&view=rev Log: [WLDAP32] Sync with Wine Staging 1.9.4. CORE-10912 Modified: trunk/reactos/dll/win32/wldap32/control.c trunk/reactos/dll/win32/wldap32/wldap32.h trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/wldap32/control.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wldap32/control.… ============================================================================== --- trunk/reactos/dll/win32/wldap32/control.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wldap32/control.c [iso-8859-1] Sat Mar 5 11:01:59 2016 @@ -258,15 +258,37 @@ return ret; } +static inline void bv_val_dup( const struct WLDAP32_berval *src, struct WLDAP32_berval *dst ) +{ + dst->bv_val = HeapAlloc( GetProcessHeap(), 0, src->bv_len ); + if (dst->bv_val) + { + memcpy( dst->bv_val, src->bv_val, src->bv_len ); + dst->bv_len = src->bv_len; + } + else + dst->bv_len = 0; +} + /*********************************************************************** * ldap_encode_sort_controlA (WLDAP32.@) * * See ldap_encode_sort_controlW. */ ULONG CDECL ldap_encode_sort_controlA( WLDAP32_LDAP *ld, PLDAPSortKeyA *sortkeys, - PLDAPControlA control, BOOLEAN critical ) -{ - return ldap_create_sort_controlA( ld, sortkeys, critical, &control ); + PLDAPControlA ret, BOOLEAN critical ) +{ + LDAPControlA *control = NULL; + ULONG result; + + if ((result = ldap_create_sort_controlA( ld, sortkeys, critical, &control )) == WLDAP32_LDAP_SUCCESS) + { + ret->ldctl_oid = strdupU(control->ldctl_oid); + bv_val_dup( &control->ldctl_value, &ret->ldctl_value ); + ret->ldctl_iscritical = control->ldctl_iscritical; + ldap_control_freeA( control ); + } + return result; } /*********************************************************************** @@ -292,9 +314,19 @@ * ldap_create_sort_control instead. */ ULONG CDECL ldap_encode_sort_controlW( WLDAP32_LDAP *ld, PLDAPSortKeyW *sortkeys, - PLDAPControlW control, BOOLEAN critical ) -{ - return ldap_create_sort_controlW( ld, sortkeys, critical, &control ); + PLDAPControlW ret, BOOLEAN critical ) +{ + LDAPControlW *control = NULL; + ULONG result; + + if ((result = ldap_create_sort_controlW( ld, sortkeys, critical, &control )) == WLDAP32_LDAP_SUCCESS) + { + ret->ldctl_oid = strdupW(control->ldctl_oid); + bv_val_dup( &control->ldctl_value, &ret->ldctl_value ); + ret->ldctl_iscritical = control->ldctl_iscritical; + ldap_control_freeW( control ); + } + return result; } /*********************************************************************** Modified: trunk/reactos/dll/win32/wldap32/wldap32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wldap32/wldap32.… ============================================================================== --- trunk/reactos/dll/win32/wldap32/wldap32.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wldap32/wldap32.h [iso-8859-1] Sat Mar 5 11:01:59 2016 @@ -20,6 +20,8 @@ #pragma once +#include <wine/unicode.h> + extern HINSTANCE hwldap32 DECLSPEC_HIDDEN; ULONG map_error( int ) DECLSPEC_HIDDEN; @@ -36,6 +38,17 @@ dst = HeapAlloc( GetProcessHeap(), 0, (strlen( src ) + 1) * sizeof(char) ); if (dst) strcpy( dst, src ); + return dst; +} + +static inline WCHAR *strdupW( const WCHAR *src ) +{ + WCHAR *dst; + + if (!src) return NULL; + dst = HeapAlloc( GetProcessHeap(), 0, (strlenW( src ) + 1) * sizeof(WCHAR) ); + if (dst) + strcpyW( dst, src ); return dst; } 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 Mar 5 11:01:59 2016 @@ -211,7 +211,7 @@ reactos/dll/win32/winmm/wavemap # Forked at Wine-20050628 reactos/dll/win32/winscard # Synced to WineStaging-1.7.55 reactos/dll/win32/wintrust # Synced to WineStaging-1.7.55 -reactos/dll/win32/wldap32 # Synced to WineStaging-1.7.55 +reactos/dll/win32/wldap32 # Synced to WineStaging-1.9.4 reactos/dll/win32/wmi # Synced to WineStaging-1.7.55 reactos/dll/win32/wmiutils # Synced to WineStaging-1.7.55 reactos/dll/win32/wmvcore # Synced to WineStaging-1.7.55

8 years, 9 months

[akhaldi] 70949: [WININET_WINETEST] Sync with Wine Staging 1.9.4. CORE-10912

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sat Mar 5 10:59:21 2016 New Revision: 70949 URL: http://svn.reactos.org/svn/reactos?rev=70949&view=rev Log: [WININET_WINETEST] Sync with Wine Staging 1.9.4. CORE-10912 Modified: trunk/rostests/winetests/wininet/http.c trunk/rostests/winetests/wininet/internet.c Modified: trunk/rostests/winetests/wininet/http.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/wininet/http.c?… ============================================================================== --- trunk/rostests/winetests/wininet/http.c [iso-8859-1] (original) +++ trunk/rostests/winetests/wininet/http.c [iso-8859-1] Sat Mar 5 10:59:21 2016 @@ -212,9 +212,7 @@ size = sizeof(code); res = HttpQueryInfoA(req, HTTP_QUERY_STATUS_CODE|HTTP_QUERY_FLAG_NUMBER, &code, &size, NULL); ok_(__FILE__,line)(res, "[1] HttpQueryInfoA(HTTP_QUERY_STATUS_CODE|number) failed: %u\n", GetLastError()); - if (is_todo) - todo_wine ok_(__FILE__,line)(code == excode, "code = %d, expected %d\n", code, excode); - else + todo_wine_if (is_todo) ok_(__FILE__,line)(code == excode, "code = %d, expected %d\n", code, excode); ok_(__FILE__,line)(size == sizeof(code), "size = %u\n", size); @@ -223,10 +221,7 @@ size = sizeof(code); res = HttpQueryInfoA(req, HTTP_QUERY_STATUS_CODE|HTTP_QUERY_FLAG_NUMBER, &code, &size, &index); ok_(__FILE__,line)(res, "[2] HttpQueryInfoA(HTTP_QUERY_STATUS_CODE|number index) failed: %u\n", GetLastError()); - if (is_todo) - todo_wine ok_(__FILE__,line)(code == excode, "code = %d, expected %d\n", code, excode); - else - ok_(__FILE__,line)(!index, "index = %d, expected 0\n", code); + ok_(__FILE__,line)(!index, "index = %d, expected 0\n", index); ok_(__FILE__,line)(size == sizeof(code), "size = %u\n", size); sprintf(exbuf, "%u", excode); @@ -234,9 +229,7 @@ size = sizeof(bufa); res = HttpQueryInfoA(req, HTTP_QUERY_STATUS_CODE, bufa, &size, NULL); ok_(__FILE__,line)(res, "[3] HttpQueryInfoA(HTTP_QUERY_STATUS_CODE) failed: %u\n", GetLastError()); - if (is_todo) - todo_wine ok_(__FILE__,line)(!strcmp(bufa, exbuf), "unexpected status code %s, expected %s\n", bufa, exbuf); - else + todo_wine_if (is_todo) ok_(__FILE__,line)(!strcmp(bufa, exbuf), "unexpected status code %s, expected %s\n", bufa, exbuf); ok_(__FILE__,line)(size == strlen(exbuf), "unexpected size %d for \"%s\"\n", size, exbuf); @@ -249,9 +242,7 @@ size = sizeof(bufw); res = HttpQueryInfoW(req, HTTP_QUERY_STATUS_CODE, bufw, &size, NULL); ok_(__FILE__,line)(res, "[5] HttpQueryInfoW(HTTP_QUERY_STATUS_CODE) failed: %u\n", GetLastError()); - if (is_todo) - todo_wine ok_(__FILE__,line)(!strcmp_wa(bufw, exbuf), "unexpected status code %s, expected %s\n", bufa, exbuf); - else + todo_wine_if (is_todo) ok_(__FILE__,line)(!strcmp_wa(bufw, exbuf), "unexpected status code %s, expected %s\n", bufa, exbuf); ok_(__FILE__,line)(size == strlen(exbuf)*sizeof(WCHAR), "unexpected size %d for \"%s\"\n", size, exbuf); @@ -296,10 +287,8 @@ /* FIXME: Remove once we have INTERNET_REQFLAG_CACHE_WRITE_DISABLED implementation */ flags &= ~INTERNET_REQFLAG_CACHE_WRITE_DISABLED; - if(!is_todo) + todo_wine_if (is_todo) ok_(__FILE__,line)(flags == exflags, "flags = %x, expected %x\n", flags, exflags); - else - todo_wine ok_(__FILE__,line)(flags == exflags, "flags = %x, expected %x\n", flags, exflags); } #define test_http_version(a) _test_http_version(__LINE__,a) @@ -6093,15 +6082,33 @@ static void WINAPI header_cb( HINTERNET handle, DWORD_PTR ctx, DWORD status, LPVOID info, DWORD len ) { - if (status == INTERNET_STATUS_REQUEST_COMPLETE) SetEvent( (HANDLE)ctx ); + BOOL ret; + DWORD index, size; + char buf[256]; + + if (status == INTERNET_STATUS_SENDING_REQUEST) + { + ret = HttpAddRequestHeadersA( handle, "winetest: winetest", ~0u, HTTP_ADDREQ_FLAG_ADD ); + ok( ret, "HttpAddRequestHeadersA failed %u\n", GetLastError() ); + SetEvent( (HANDLE)ctx ); + } + else if (status == INTERNET_STATUS_REQUEST_SENT) + { + index = 0; + size = sizeof(buf); + ret = HttpQueryInfoA( handle, HTTP_QUERY_RAW_HEADERS_CRLF|HTTP_QUERY_FLAG_REQUEST_HEADERS, + buf, &size, &index ); + ok( ret, "HttpQueryInfoA failed %u\n", GetLastError() ); + ok( strstr( buf, "winetest: winetest" ) != NULL, "header missing\n" ); + SetEvent( (HANDLE)ctx ); + } } static void test_concurrent_header_access(void) { HINTERNET ses, con, req; - DWORD index, len, err; + DWORD err; BOOL ret; - char buf[128]; HANDLE wait = CreateEventW( NULL, FALSE, FALSE, NULL ); ses = InternetOpenA( "winetest", 0, NULL, NULL, INTERNET_FLAG_ASYNC ); @@ -6122,16 +6129,7 @@ ok( !ret, "HttpSendRequestA succeeded\n" ); ok( err == ERROR_IO_PENDING, "got %u\n", ERROR_IO_PENDING ); - ret = HttpAddRequestHeadersA( req, "winetest: winetest", ~0u, HTTP_ADDREQ_FLAG_ADD ); - ok( ret, "HttpAddRequestHeadersA failed %u\n", GetLastError() ); - - index = 0; - len = sizeof(buf); - ret = HttpQueryInfoA( req, HTTP_QUERY_RAW_HEADERS_CRLF|HTTP_QUERY_FLAG_REQUEST_HEADERS, - buf, &len, &index ); - ok( ret, "HttpQueryInfoA failed %u\n", GetLastError() ); - ok( strstr( buf, "winetest: winetest" ) != NULL, "header missing\n" ); - + WaitForSingleObject( wait, 5000 ); WaitForSingleObject( wait, 5000 ); InternetCloseHandle( req ); Modified: trunk/rostests/winetests/wininet/internet.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/wininet/interne… ============================================================================== --- trunk/rostests/winetests/wininet/internet.c [iso-8859-1] (original) +++ trunk/rostests/winetests/wininet/internet.c [iso-8859-1] Sat Mar 5 10:59:21 2016 @@ -1518,16 +1518,12 @@ default: break; } - if(test_flags & FLAG_TODO) - todo_wine ok(res == expected, "Got %d, expected %d (%d)\n", res, expected, i); - else + todo_wine_if(test_flags & FLAG_TODO) ok(res == expected, "Got %d, expected %d (%d)\n", res, expected, i); /* Same thing with NULL hwnd */ res = InternetErrorDlg(NULL, req, i, flags, NULL); - if(test_flags & FLAG_TODO) - todo_wine ok(res == expected, "Got %d, expected %d (%d)\n", res, expected, i); - else + todo_wine_if(test_flags & FLAG_TODO) ok(res == expected, "Got %d, expected %d (%d)\n", res, expected, i); @@ -1536,9 +1532,7 @@ expected = ERROR_INVALID_PARAMETER; res = InternetErrorDlg(hwnd, NULL, i, flags, NULL); - if( test_flags & FLAG_TODO || i == ERROR_INTERNET_INCORRECT_PASSWORD) - todo_wine ok(res == expected, "Got %d, expected %d (%d)\n", res, expected, i); - else + todo_wine_if( test_flags & FLAG_TODO || i == ERROR_INTERNET_INCORRECT_PASSWORD) ok(res == expected, "Got %d, expected %d (%d)\n", res, expected, i); }

8 years, 9 months

[akhaldi] 70948: [WININET] Sync with Wine Staging 1.9.4. CORE-10912

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sat Mar 5 10:58:26 2016 New Revision: 70948 URL: http://svn.reactos.org/svn/reactos?rev=70948&view=rev Log: [WININET] Sync with Wine Staging 1.9.4. CORE-10912 Modified: trunk/reactos/dll/win32/wininet/cookie.c trunk/reactos/dll/win32/wininet/dialogs.c trunk/reactos/dll/win32/wininet/ftp.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/wininet/cookie.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/cookie.c… ============================================================================== --- trunk/reactos/dll/win32/wininet/cookie.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wininet/cookie.c [iso-8859-1] Sat Mar 5 10:58:26 2016 @@ -703,7 +703,7 @@ } LeaveCriticalSection(&cookie_cs); - return ERROR_SUCCESS; + return res; } /*********************************************************************** Modified: trunk/reactos/dll/win32/wininet/dialogs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/dialogs.… ============================================================================== --- trunk/reactos/dll/win32/wininet/dialogs.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wininet/dialogs.c [iso-8859-1] Sat Mar 5 10:58:26 2016 @@ -397,8 +397,6 @@ case WM_COMMAND: if( wParam == IDOK ) { - BOOL res = TRUE; - if( params->dwFlags & FLAGS_ERROR_UI_FLAGS_CHANGE_OPTIONS ) { http_request_t *req = params->req; @@ -437,7 +435,7 @@ req->netconn->security_flags |= flags; } - EndDialog( hdlg, res ? ERROR_SUCCESS : ERROR_NOT_SUPPORTED ); + EndDialog( hdlg, ERROR_SUCCESS ); return TRUE; } if( wParam == IDCANCEL ) Modified: trunk/reactos/dll/win32/wininet/ftp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/ftp.c?re… ============================================================================== --- trunk/reactos/dll/win32/wininet/ftp.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wininet/ftp.c [iso-8859-1] Sat Mar 5 10:58:26 2016 @@ -2286,7 +2286,7 @@ strcat(cmd, szCRLF); len--; - TRACE("Sending (%s) len(%d)\n", cmd, len); + TRACE("Sending (%s) len(%d)\n", debugstr_a(cmd), len); while ((nBytesSent < len) && (nRC != -1)) { nRC = sock_send(lpwfs->sndSocket, cmd + nBytesSent, len - nBytesSent, 0); @@ -2705,7 +2705,7 @@ sprintf(buf, "%s%s%s%s", szFtpCommands[ftpCmd], dwParamLen ? " " : "", dwParamLen ? lpszParam : "", szCRLF); - TRACE("Sending (%s) len(%d)\n", buf, len); + TRACE("Sending (%s) len(%d)\n", debugstr_a(buf), len); while((nBytesSent < len) && (nRC != -1)) { nRC = sock_send(nSocket, buf+nBytesSent, len - nBytesSent, 0); 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 Mar 5 10:58:26 2016 @@ -205,7 +205,7 @@ reactos/dll/win32/winemp3.acm # Synced to WineStaging-1.7.55 reactos/dll/win32/wing32 # Synced to WineStaging-1.7.55 reactos/dll/win32/winhttp # Synced to WineStaging-1.9.4 -reactos/dll/win32/wininet # Synced to WineStaging-1.7.55 +reactos/dll/win32/wininet # Synced to WineStaging-1.9.4 reactos/dll/win32/winmm # Forked at Wine-20050628 reactos/dll/win32/winmm/midimap # Forked at Wine-20050628 reactos/dll/win32/winmm/wavemap # Forked at Wine-20050628

8 years, 9 months

← Newer
1
...
11
12
13
14
15
16
17
...
27
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 March 2016