Ros-diffs October 2017

ros-diffs@reactos.org

43 participants
275 discussions

[reactos] 01/03: [PSDK] Update msi.h. CORE-13762

by Amine Khaldi

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=154006810e4a1b014550a… commit 154006810e4a1b014550a0b35b02bb1fabb88242 Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Sun Oct 8 09:10:16 2017 +0100 [PSDK] Update msi.h. CORE-13762 --- sdk/include/psdk/msi.h | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/sdk/include/psdk/msi.h b/sdk/include/psdk/msi.h index 58a1eb2c5e..84386c5ec4 100644 --- a/sdk/include/psdk/msi.h +++ b/sdk/include/psdk/msi.h @@ -105,7 +105,10 @@ typedef enum tagINSTALLMESSAGE INSTALLMESSAGE_COMMONDATA = 0x0b000000, INSTALLMESSAGE_INITIALIZE = 0x0c000000, INSTALLMESSAGE_TERMINATE = 0x0d000000, - INSTALLMESSAGE_SHOWDIALOG = 0x0e000000 + INSTALLMESSAGE_SHOWDIALOG = 0x0e000000, + INSTALLMESSAGE_RMFILESINUSE = 0x19000000, + INSTALLMESSAGE_INSTALLSTART = 0x1A000000, + INSTALLMESSAGE_INSTALLEND = 0x1B000000, } INSTALLMESSAGE; typedef enum tagREINSTALLMODE @@ -130,18 +133,22 @@ typedef enum tagINSTALLLOGMODE INSTALLLOGMODE_WARNING = (1 << (INSTALLMESSAGE_WARNING >> 24)), INSTALLLOGMODE_USER = (1 << (INSTALLMESSAGE_USER >> 24)), INSTALLLOGMODE_INFO = (1 << (INSTALLMESSAGE_INFO >> 24)), + INSTALLLOGMODE_FILESINUSE = (1 << (INSTALLMESSAGE_FILESINUSE >> 24)), INSTALLLOGMODE_RESOLVESOURCE = (1 << (INSTALLMESSAGE_RESOLVESOURCE >> 24)), INSTALLLOGMODE_OUTOFDISKSPACE = (1 << (INSTALLMESSAGE_OUTOFDISKSPACE >> 24)), INSTALLLOGMODE_ACTIONSTART = (1 << (INSTALLMESSAGE_ACTIONSTART >> 24)), INSTALLLOGMODE_ACTIONDATA = (1 << (INSTALLMESSAGE_ACTIONDATA >> 24)), - INSTALLLOGMODE_COMMONDATA = (1 << (INSTALLMESSAGE_COMMONDATA >> 24)), - INSTALLLOGMODE_PROPERTYDUMP = (1 << (INSTALLMESSAGE_PROGRESS >> 24)), - INSTALLLOGMODE_VERBOSE = (1 << (INSTALLMESSAGE_INITIALIZE >> 24)), - INSTALLLOGMODE_EXTRADEBUG = (1 << (INSTALLMESSAGE_TERMINATE >> 24)), INSTALLLOGMODE_PROGRESS = (1 << (INSTALLMESSAGE_PROGRESS >> 24)), + INSTALLLOGMODE_PROPERTYDUMP = (1 << (INSTALLMESSAGE_PROGRESS >> 24)), + INSTALLLOGMODE_COMMONDATA = (1 << (INSTALLMESSAGE_COMMONDATA >> 24)), INSTALLLOGMODE_INITIALIZE = (1 << (INSTALLMESSAGE_INITIALIZE >> 24)), + INSTALLLOGMODE_VERBOSE = (1 << (INSTALLMESSAGE_INITIALIZE >> 24)), INSTALLLOGMODE_TERMINATE = (1 << (INSTALLMESSAGE_TERMINATE >> 24)), - INSTALLLOGMODE_SHOWDIALOG = (1 << (INSTALLMESSAGE_SHOWDIALOG >> 24)) + INSTALLLOGMODE_EXTRADEBUG = (1 << (INSTALLMESSAGE_TERMINATE >> 24)), + INSTALLLOGMODE_SHOWDIALOG = (1 << (INSTALLMESSAGE_SHOWDIALOG >> 24)), + INSTALLLOGMODE_RMFILESINUSE = (1 << (INSTALLMESSAGE_RMFILESINUSE >> 24)), + INSTALLLOGMODE_INSTALLSTART = (1 << (INSTALLMESSAGE_INSTALLSTART >> 24)), + INSTALLLOGMODE_INSTALLEND = (1 << (INSTALLMESSAGE_INSTALLEND >> 24)), } INSTALLLOGMODE; typedef enum tagINSTALLLOGATTRIBUTES

6 years, 11 months

[reactos] 01/01: [WDMAUD] Close mixers on cleanup. Should fix CORE-10735 definitely (#21)

by Sylvain Deverre

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c51df789e869379a515d9… commit c51df789e869379a515d94c66da152c5b26660ff Author: Sylvain Deverre <deverre.sylv(a)gmail.com> AuthorDate: Sun Oct 8 11:29:17 2017 +0200 [WDMAUD] Close mixers on cleanup. Should fix CORE-10735 definitely (#21) [WDMAUD] Close mixers on cleanup. CORE-10735 --- drivers/wdm/audio/legacy/wdmaud/entry.c | 1 + drivers/wdm/audio/legacy/wdmaud/mmixer.c | 30 +++++++++++++++++++++++++++++- drivers/wdm/audio/legacy/wdmaud/wdmaud.h | 6 ++++++ 3 files changed, 36 insertions(+), 1 deletion(-) diff --git a/drivers/wdm/audio/legacy/wdmaud/entry.c b/drivers/wdm/audio/legacy/wdmaud/entry.c index ee304845bb..eede79172d 100644 --- a/drivers/wdm/audio/legacy/wdmaud/entry.c +++ b/drivers/wdm/audio/legacy/wdmaud/entry.c @@ -326,6 +326,7 @@ WdmAudCleanup( /* found an still open audio pin */ ZwClose(pClient->hPins[Index].Handle); } + WdmAudCloseAllMixers(DeviceObject, pClient, Index); } /* free pin array */ diff --git a/drivers/wdm/audio/legacy/wdmaud/mmixer.c b/drivers/wdm/audio/legacy/wdmaud/mmixer.c index 9887d0974a..3016d24c67 100644 --- a/drivers/wdm/audio/legacy/wdmaud/mmixer.c +++ b/drivers/wdm/audio/legacy/wdmaud/mmixer.c @@ -480,7 +480,7 @@ WdmAudControlCloseMixer( IN ULONG Index) { /* Remove event associated to this client */ - if (MMixerClose(&MixerContext, DeviceInfo->DeviceIndex, ClientInfo, EventCallback)) + if (MMixerClose(&MixerContext, DeviceInfo->DeviceIndex, ClientInfo, EventCallback) != MM_STATUS_SUCCESS) { DPRINT1("Failed to close mixer\n"); return SetIrpIoStatus(Irp, STATUS_UNSUCCESSFUL, sizeof(WDMAUD_DEVICE_INFO)); @@ -497,6 +497,34 @@ WdmAudControlCloseMixer( return SetIrpIoStatus(Irp, STATUS_SUCCESS, sizeof(WDMAUD_DEVICE_INFO)); } +VOID +WdmAudCloseAllMixers( + IN PDEVICE_OBJECT DeviceObject, + IN PWDMAUD_CLIENT ClientInfo, + IN ULONG Index) +{ + ULONG DeviceCount, DeviceIndex; + + /* Get all mixers */ + DeviceCount = GetSysAudioDeviceCount(DeviceObject); + + /* Close every mixer attached to the device */ + for (DeviceIndex = 0; DeviceIndex < DeviceCount; DeviceIndex++) + { + if (MMixerClose(&MixerContext, DeviceIndex, ClientInfo, EventCallback) != MM_STATUS_SUCCESS) + { + DPRINT1("Failed to close mixer for device %lu\n", DeviceIndex); + } + } + + /* Dereference event */ + if (ClientInfo->hPins[Index].NotifyEvent) + { + ObDereferenceObject(ClientInfo->hPins[Index].NotifyEvent); + ClientInfo->hPins[Index].NotifyEvent = NULL; + } +} + NTSTATUS NTAPI WdmAudGetControlDetails( diff --git a/drivers/wdm/audio/legacy/wdmaud/wdmaud.h b/drivers/wdm/audio/legacy/wdmaud/wdmaud.h index 04d8975b9a..49f01f2fbd 100644 --- a/drivers/wdm/audio/legacy/wdmaud/wdmaud.h +++ b/drivers/wdm/audio/legacy/wdmaud/wdmaud.h @@ -136,6 +136,12 @@ WdmAudControlCloseMixer( IN PWDMAUD_CLIENT ClientInfo, IN ULONG Index); +VOID +WdmAudCloseAllMixers( + IN PDEVICE_OBJECT DeviceObject, + IN PWDMAUD_CLIENT ClientInfo, + IN ULONG Index); + NTSTATUS WdmAudControlOpenWave( IN PDEVICE_OBJECT DeviceObject,

6 years, 11 months

[reactos] 01/01: [KERNEL32_APITEST]: Add tests for IOCTL_MOUNTDEV_QUERY_SUGGESTED_LINK_NAME that show its usage is "one-shot". Once queried, it gets forgotten.

by Pierre Schweitzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d788a52c79f5822cc8a21… commit d788a52c79f5822cc8a21920de421b77519ebd94 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sun Oct 8 10:12:08 2017 +0200 [KERNEL32_APITEST]: Add tests for IOCTL_MOUNTDEV_QUERY_SUGGESTED_LINK_NAME that show its usage is "one-shot". Once queried, it gets forgotten. --- .../rostests/apitests/kernel32/DeviceIoControl.c | 37 ++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/modules/rostests/apitests/kernel32/DeviceIoControl.c b/modules/rostests/apitests/kernel32/DeviceIoControl.c index faa10d5465..be3086edda 100644 --- a/modules/rostests/apitests/kernel32/DeviceIoControl.c +++ b/modules/rostests/apitests/kernel32/DeviceIoControl.c @@ -183,6 +183,42 @@ QueryUniqueId(VOID) HeapFree(GetProcessHeap(), 0, AllocatedMUI); } +static +VOID +QuerySuggestedLinkName(VOID) +{ + UINT Ret; + DWORD Size, Error; + MOUNTDEV_SUGGESTED_LINK_NAME MSLN; + + Size = 0; + Ret = DeviceIoControl(Device, IOCTL_MOUNTDEV_QUERY_SUGGESTED_LINK_NAME, NULL, 0, &MSLN, sizeof(MSLN) - 1, &Size, NULL); + ok_type(Ret == 0, "DeviceIoControl succeed\n"); + Error = GetLastError(); + if (DriveType == DRIVE_FIXED) + { + ok_type(Error == ERROR_INVALID_PARAMETER, "Expecting ERROR_INVALID_PARAMETER, got %ld\n", Error); + } + else + { + ok_type(Error == ERROR_INSUFFICIENT_BUFFER, "Expecting ERROR_INSUFFICIENT_BUFFER, got %ld\n", Error); + } + ok_type(Size == 0, "Invalid output size: %ld\n", Size); + + Ret = DeviceIoControl(Device, IOCTL_MOUNTDEV_QUERY_SUGGESTED_LINK_NAME, NULL, 0, &MSLN, sizeof(MSLN), &Size, NULL); + ok_type(Ret == 0, "DeviceIoControl succeed\n"); + Error = GetLastError(); + if (DriveType == DRIVE_FIXED) + { + ok_type(Error == ERROR_NOT_FOUND, "Expecting ERROR_NOT_FOUND, got %ld\n", Error); + } + else + { + ok_type(Error == ERROR_FILE_NOT_FOUND, "Expecting ERROR_FILE_NOT_FOUND, got %ld\n", Error); + } + ok_type(Size == 0, "Invalid output size: %ld\n", Size); +} + START_TEST(DeviceIoControl) { UINT Ret; @@ -221,6 +257,7 @@ START_TEST(DeviceIoControl) { QueryDeviceName(); QueryUniqueId(); + QuerySuggestedLinkName(); } CloseHandle(Device);

6 years, 11 months

[reactos] 01/01: [URLMON] Convert urlmon.inf to utf8 since git insists on fucking up utf16 files.

by Mark Jansen

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=48fe08654d7ee94baad7a… commit 48fe08654d7ee94baad7ae3768a095749cc81b29 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Sat Oct 7 23:43:57 2017 +0200 [URLMON] Convert urlmon.inf to utf8 since git insists on fucking up utf16 files. --- dll/win32/urlmon/CMakeLists.txt | 10 ++++++++++ dll/win32/urlmon/urlmon.inf | Bin 55000 -> 27317 bytes dll/win32/urlmon/urlmon.rc | 2 +- 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/dll/win32/urlmon/CMakeLists.txt b/dll/win32/urlmon/CMakeLists.txt index ab1765033a..6194ab7431 100644 --- a/dll/win32/urlmon/CMakeLists.txt +++ b/dll/win32/urlmon/CMakeLists.txt @@ -11,6 +11,16 @@ include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine) spec2def(urlmon.dll urlmon.spec ADD_IMPORTLIB) add_rpcproxy_files(urlmon_urlmon.idl) +set(_source_file ${CMAKE_CURRENT_SOURCE_DIR}/urlmon.inf) +set(_converted_file ${CMAKE_CURRENT_BINARY_DIR}/urlmon_utf16.inf) +add_custom_command( + OUTPUT "${_converted_file}" + COMMAND native-utf16le "${_source_file}" "${_converted_file}" + DEPENDS native-utf16le "${_source_file}") + +set_source_files_properties(${_converted_file} PROPERTIES GENERATED TRUE) +set_source_files_properties(urlmon.rc PROPERTIES OBJECT_DEPENDS "${_converted_file}") + list(APPEND SOURCE axinstall.c bindctx.c diff --git a/dll/win32/urlmon/urlmon.inf b/dll/win32/urlmon/urlmon.inf index 91d3af2e3c..d92f7ed107 100644 Binary files a/dll/win32/urlmon/urlmon.inf and b/dll/win32/urlmon/urlmon.inf differ diff --git a/dll/win32/urlmon/urlmon.rc b/dll/win32/urlmon/urlmon.rc index 098f398f6c..cea1099888 100644 --- a/dll/win32/urlmon/urlmon.rc +++ b/dll/win32/urlmon/urlmon.rc @@ -55,7 +55,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL 2 WINE_REGISTRY "urlmon_urlmon.rgs" /* @makedep: urlmon.inf */ -REGINST REGINST urlmon.inf +REGINST REGINST urlmon_utf16.inf #define WINE_FILENAME_STR "urlmon.dll" #define WINE_FILEVERSION 6,0,2800,1485

6 years, 11 months

[reactos] 01/01: Fix encoding of some INF files (-> UTF-8 without BOM).

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=66c2299bfecc129fa30ba… commit 66c2299bfecc129fa30bac6e8ece8317b2eeaebe Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sat Oct 7 22:21:19 2017 +0200 Fix encoding of some INF files (-> UTF-8 without BOM). --- boot/bootdata/hivecls.inf | 2 +- boot/bootdata/hivesft.inf | 2 +- dll/win32/urlmon/urlmon.inf | Bin 54998 -> 55000 bytes 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/boot/bootdata/hivecls.inf b/boot/bootdata/hivecls.inf index cd67bc0c0d..d902ac5dca 100644 --- a/boot/bootdata/hivecls.inf +++ b/boot/bootdata/hivecls.inf @@ -1,4 +1,4 @@ -[Version] +[Version] Signature="$ReactOS$" [AddReg] diff --git a/boot/bootdata/hivesft.inf b/boot/bootdata/hivesft.inf index 63a51ff0c1..75c395340f 100644 --- a/boot/bootdata/hivesft.inf +++ b/boot/bootdata/hivesft.inf @@ -1,4 +1,4 @@ -[Version] +[Version] Signature="$ReactOS$" [AddReg] diff --git a/dll/win32/urlmon/urlmon.inf b/dll/win32/urlmon/urlmon.inf index e96103eaaa..91d3af2e3c 100644 Binary files a/dll/win32/urlmon/urlmon.inf and b/dll/win32/urlmon/urlmon.inf differ

6 years, 11 months

[reactos] 01/01: [URLMON] Remove BOM from urlmon.inf

by Mark Jansen

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=da27e0026a89253fcbb3b… commit da27e0026a89253fcbb3b3930f85aba22e13d99a Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Sat Oct 7 22:11:41 2017 +0200 [URLMON] Remove BOM from urlmon.inf --- dll/win32/urlmon/urlmon.inf | Bin 55000 -> 54998 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/dll/win32/urlmon/urlmon.inf b/dll/win32/urlmon/urlmon.inf index 91d3af2e3c..e96103eaaa 100644 Binary files a/dll/win32/urlmon/urlmon.inf and b/dll/win32/urlmon/urlmon.inf differ

6 years, 11 months

[reactos] 01/01: Fix typo

by Aditya Giri

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1600baa762948499a6731… commit 1600baa762948499a673111184276d28eaaa7889 Author: Aditya Giri <dtrg21(a)gmail.com> AuthorDate: Sat Oct 7 22:13:17 2017 +0530 Fix typo --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 4e01ecfecb..80825631ca 100644 --- a/README.md +++ b/README.md @@ -83,6 +83,6 @@ Also see the [CREDITS](CREDITS) file for others. ## Code mirrors -The main development is done on [GitHub](https://github.com/reactos/reactos). We have an [alternative mirror](https://git.reactos.org/) it case GitHub is down. +The main development is done on [GitHub](https://github.com/reactos/reactos). We have an [alternative mirror](https://git.reactos.org/) in case GitHub is down. There is also an obsolete [SVN archive repository](https://svn.reactos.org/svn/reactos?view=revision) that is kept for historical purposes.

6 years, 11 months

[reactos] 01/01: [KERNEL32_APITEST]: Rewrite DeviceIoControl to test both disk.sys and cdrom.sys

by Pierre Schweitzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ac8d04546131c5b54977a… commit ac8d04546131c5b54977a462de88ee22adb1b660 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sat Oct 7 14:06:34 2017 +0200 [KERNEL32_APITEST]: Rewrite DeviceIoControl to test both disk.sys and cdrom.sys --- .../rostests/apitests/kernel32/DeviceIoControl.c | 177 ++++++++++++++------- 1 file changed, 120 insertions(+), 57 deletions(-) diff --git a/modules/rostests/apitests/kernel32/DeviceIoControl.c b/modules/rostests/apitests/kernel32/DeviceIoControl.c index 2f993eb25e..faa10d5465 100644 --- a/modules/rostests/apitests/kernel32/DeviceIoControl.c +++ b/modules/rostests/apitests/kernel32/DeviceIoControl.c @@ -13,9 +13,13 @@ WCHAR Letter; HANDLE Device; +UINT DriveType; + +#define ok_type(condition, format, ...) ok(condition, "(%d): " format, DriveType, ##__VA_ARGS__) +#define skip_type(format, ...) skip("(%d): " format, DriveType, ##__VA_ARGS__) static -VOID +BOOL GetDiskGeometry(VOID) { UINT Ret; @@ -25,32 +29,47 @@ GetDiskGeometry(VOID) Size = 0; Ret = DeviceIoControl(Device, IOCTL_DISK_GET_DRIVE_GEOMETRY, NULL, 0, &DG, sizeof(DG) - 1, &Size, NULL); - ok(Ret == 0, "DeviceIoControl succeed\n"); + ok_type(Ret == 0, "DeviceIoControl succeed\n"); Error = GetLastError(); - ok(Error == ERROR_INSUFFICIENT_BUFFER, "Expecting ERROR_INSUFFICIENT_BUFFER, got %ld\n", Error); - ok(Size == 0, "Invalid output size: %ld\n", Size); + ok_type(Error == ERROR_INSUFFICIENT_BUFFER, "Expecting ERROR_INSUFFICIENT_BUFFER, got %ld\n", Error); + ok_type(Size == 0, "Invalid output size: %ld\n", Size); Size = 0; Ret = DeviceIoControl(Device, IOCTL_DISK_GET_DRIVE_GEOMETRY, NULL, 0, &DG, sizeof(DG), &Size, NULL); - ok(Ret != 0, "DeviceIoControl failed: %ld\n", GetLastError()); - ok(Size == sizeof(DG), "Invalid output size: %ld\n", Size); + /* Specific for CDROM, no disk present */ + if (Ret == 0 && GetLastError() == ERROR_NOT_READY) + { + skip_type("No CDROM present\n"); + return FALSE; + } + ok_type(Ret != 0, "DeviceIoControl failed: %ld\n", GetLastError()); + ok_type(Size == sizeof(DG), "Invalid output size: %ld\n", Size); Size = 0; Ret = DeviceIoControl(Device, IOCTL_DISK_GET_DRIVE_GEOMETRY_EX, NULL, 0, &DGE, FIELD_OFFSET(DISK_GEOMETRY_EX, Data) - 1, &Size, NULL); - ok(Ret == 0, "DeviceIoControl succeed\n"); + ok_type(Ret == 0, "DeviceIoControl succeed\n"); Error = GetLastError(); - ok(Error == ERROR_INSUFFICIENT_BUFFER, "Expecting ERROR_INSUFFICIENT_BUFFER, got %ld\n", Error); - ok(Size == 0, "Invalid output size: %ld\n", Size); + ok_type(Error == ERROR_INSUFFICIENT_BUFFER, "Expecting ERROR_INSUFFICIENT_BUFFER, got %ld\n", Error); + ok_type(Size == 0, "Invalid output size: %ld\n", Size); Size = 0; Ret = DeviceIoControl(Device, IOCTL_DISK_GET_DRIVE_GEOMETRY_EX, NULL, 0, &DGE, FIELD_OFFSET(DISK_GEOMETRY_EX, Data), &Size, NULL); - ok(Ret != 0, "DeviceIoControl failed: %ld\n", GetLastError()); - ok(Size == FIELD_OFFSET(DISK_GEOMETRY_EX, Data), "Invalid output size: %ld\n", Size); + ok_type(Ret != 0, "DeviceIoControl failed: %ld\n", GetLastError()); + ok_type(Size == FIELD_OFFSET(DISK_GEOMETRY_EX, Data), "Invalid output size: %ld\n", Size); Size = 0; Ret = DeviceIoControl(Device, IOCTL_DISK_GET_DRIVE_GEOMETRY_EX, NULL, 0, &DGE, sizeof(DGE), &Size, NULL); - ok(Ret != 0, "DeviceIoControl failed: %ld\n", GetLastError()); - ok(Size == sizeof(DGE), "Invalid output size: %ld\n", Size); + ok_type(Ret != 0, "DeviceIoControl failed: %ld\n", GetLastError()); + if (DriveType == DRIVE_FIXED) + { + ok_type(Size == sizeof(DGE), "Invalid output size: %ld\n", Size); + } + else + { + ok_type(Size == FIELD_OFFSET(DISK_GEOMETRY_EX, Data), "Invalid output size: %ld\n", Size); + } + + return TRUE; } static @@ -64,36 +83,44 @@ QueryDeviceName(VOID) Size = 0; Ret = DeviceIoControl(Device, IOCTL_MOUNTDEV_QUERY_DEVICE_NAME, NULL, 0, &MDN, sizeof(MDN) - 1, &Size, NULL); - ok(Ret == 0, "DeviceIoControl succeed\n"); + ok_type(Ret == 0, "DeviceIoControl succeed\n"); Error = GetLastError(); - ok(Error == ERROR_INVALID_PARAMETER, "Expecting ERROR_INVALID_PARAMETER, got %ld\n", Error); - ok(Size == 0, "Invalid output size: %ld\n", Size); + if (DriveType == DRIVE_FIXED) + { + ok_type(Error == ERROR_INVALID_PARAMETER, "Expecting ERROR_INVALID_PARAMETER, got %ld\n", Error); + } + else + { + ok_type(Error == ERROR_INSUFFICIENT_BUFFER, "Expecting ERROR_INSUFFICIENT_BUFFER, got %ld\n", Error); + } + ok_type(Size == 0, "Invalid output size: %ld\n", Size); Ret = DeviceIoControl(Device, IOCTL_MOUNTDEV_QUERY_DEVICE_NAME, NULL, 0, &MDN, sizeof(MDN), &Size, NULL); - ok(Ret == 0, "DeviceIoControl succeed\n"); + ok_type(Ret == 0, "DeviceIoControl succeed\n"); Error = GetLastError(); - ok(Error == ERROR_MORE_DATA, "Expecting ERROR_MORE_DATA, got %ld\n", Error); - ok(Size == sizeof(MOUNTDEV_NAME), "Invalid output size: %ld\n", Size); + ok_type(Error == ERROR_MORE_DATA, "Expecting ERROR_MORE_DATA, got %ld\n", Error); + ok_type(Size == sizeof(MOUNTDEV_NAME), "Invalid output size: %ld\n", Size); AllocatedMDN = HeapAlloc(GetProcessHeap(), 0, FIELD_OFFSET(MOUNTDEV_NAME, Name) + MDN.NameLength + sizeof(UNICODE_NULL)); if (AllocatedMDN == NULL) { - skip("Memory allocation failure\n"); + skip_type("Memory allocation failure\n"); return; } Size = 0; Ret = DeviceIoControl(Device, IOCTL_MOUNTDEV_QUERY_DEVICE_NAME, NULL, 0, AllocatedMDN, FIELD_OFFSET(MOUNTDEV_NAME, Name) + MDN.NameLength, &Size, NULL); - ok(Ret != 0, "DeviceIoControl failed: %ld\n", GetLastError()); - ok(Size == FIELD_OFFSET(MOUNTDEV_NAME, Name) + MDN.NameLength, "Invalid output size: %ld\n", Size); - ok(AllocatedMDN->NameLength == MDN.NameLength, "Mismatching sizes: %d %d\n", AllocatedMDN->NameLength, MDN.NameLength); + ok_type(Ret != 0, "DeviceIoControl failed: %ld\n", GetLastError()); + ok_type(Size == FIELD_OFFSET(MOUNTDEV_NAME, Name) + MDN.NameLength, "Invalid output size: %ld\n", Size); + ok_type(AllocatedMDN->NameLength == MDN.NameLength, "Mismatching sizes: %d %d\n", AllocatedMDN->NameLength, MDN.NameLength); if (Ret != 0) { IsValid = FALSE; AllocatedMDN->Name[AllocatedMDN->NameLength / sizeof(WCHAR) - 1] = UNICODE_NULL; - if (wcsstr(AllocatedMDN->Name, L"\\Device\\HarddiskVolume") != NULL) + if ((DriveType == DRIVE_FIXED && wcsstr(AllocatedMDN->Name, L"\\Device\\HarddiskVolume") != NULL) || + (DriveType == DRIVE_CDROM && wcsstr(AllocatedMDN->Name, L"\\Device\\CdRom") != NULL)) { IsValid = TRUE; } @@ -102,11 +129,11 @@ QueryDeviceName(VOID) IsValid = (AllocatedMDN->Name[12] == Letter && AllocatedMDN->Name[13] == L':'); } - ok(IsValid, "Invalid name: %.*S", AllocatedMDN->NameLength, AllocatedMDN->Name); + ok_type(IsValid, "Invalid name: %.*S\n", AllocatedMDN->NameLength, AllocatedMDN->Name); } else { - skip("Failed to query device name\n"); + skip_type("Failed to query device name\n"); } HeapFree(GetProcessHeap(), 0, AllocatedMDN); @@ -122,29 +149,36 @@ QueryUniqueId(VOID) Size = 0; Ret = DeviceIoControl(Device, IOCTL_MOUNTDEV_QUERY_UNIQUE_ID, NULL, 0, &MUI, sizeof(MUI) - 1, &Size, NULL); - ok(Ret == 0, "DeviceIoControl succeed\n"); + ok_type(Ret == 0, "DeviceIoControl succeed\n"); Error = GetLastError(); - ok(Error == ERROR_INVALID_PARAMETER, "Expecting ERROR_INVALID_PARAMETER, got %ld\n", Error); - ok(Size == 0, "Invalid output size: %ld\n", Size); + if (DriveType == DRIVE_FIXED) + { + ok_type(Error == ERROR_INVALID_PARAMETER, "Expecting ERROR_INVALID_PARAMETER, got %ld\n", Error); + } + else + { + ok_type(Error == ERROR_INSUFFICIENT_BUFFER, "Expecting ERROR_INSUFFICIENT_BUFFER, got %ld\n", Error); + } + ok_type(Size == 0, "Invalid output size: %ld\n", Size); Ret = DeviceIoControl(Device, IOCTL_MOUNTDEV_QUERY_UNIQUE_ID, NULL, 0, &MUI, sizeof(MUI), &Size, NULL); - ok(Ret == 0, "DeviceIoControl succeed\n"); + ok_type(Ret == 0, "DeviceIoControl succeed\n"); Error = GetLastError(); - ok(Error == ERROR_MORE_DATA, "Expecting ERROR_MORE_DATA, got %ld\n", Error); - ok(Size == sizeof(MOUNTDEV_UNIQUE_ID), "Invalid output size: %ld\n", Size); + ok_type(Error == ERROR_MORE_DATA, "Expecting ERROR_MORE_DATA, got %ld\n", Error); + ok_type(Size == sizeof(MOUNTDEV_UNIQUE_ID), "Invalid output size: %ld\n", Size); AllocatedMUI = HeapAlloc(GetProcessHeap(), 0, FIELD_OFFSET(MOUNTDEV_UNIQUE_ID, UniqueId) + MUI.UniqueIdLength + sizeof(UNICODE_NULL)); if (AllocatedMUI == NULL) { - skip("Memory allocation failure\n"); + skip_type("Memory allocation failure\n"); return; } Size = 0; Ret = DeviceIoControl(Device, IOCTL_MOUNTDEV_QUERY_UNIQUE_ID, NULL, 0, AllocatedMUI, FIELD_OFFSET(MOUNTDEV_UNIQUE_ID, UniqueId) + MUI.UniqueIdLength, &Size, NULL); - ok(Ret != 0, "DeviceIoControl failed: %ld\n", GetLastError()); - ok(Size == FIELD_OFFSET(MOUNTDEV_UNIQUE_ID, UniqueId) + MUI.UniqueIdLength, "Invalid output size: %ld\n", Size); - ok(AllocatedMUI->UniqueIdLength == MUI.UniqueIdLength, "Mismatching sizes: %d %d\n", AllocatedMUI->UniqueIdLength, MUI.UniqueIdLength); + ok_type(Ret != 0, "DeviceIoControl failed: %ld\n", GetLastError()); + ok_type(Size == FIELD_OFFSET(MOUNTDEV_UNIQUE_ID, UniqueId) + MUI.UniqueIdLength, "Invalid output size: %ld\n", Size); + ok_type(AllocatedMUI->UniqueIdLength == MUI.UniqueIdLength, "Mismatching sizes: %d %d\n", AllocatedMUI->UniqueIdLength, MUI.UniqueIdLength); HeapFree(GetProcessHeap(), 0, AllocatedMUI); } @@ -153,30 +187,59 @@ START_TEST(DeviceIoControl) { UINT Ret; WCHAR Path[MAX_PATH]; + DWORD DriveMap, Current; + BOOL DiskDone, CdRomDone; - Path[0] = 'C'; - Path[1] = ':'; - Path[2] = '\\'; - Ret = GetSystemDirectoryW(Path, MAX_PATH); - ok(Ret > 0, "GetSystemDirectory failed\n"); - - Letter = towupper(Path[0]); - ok(Path[1] == ':', "Not a drive letter: %c\n", Path[1]); - ok(Path[2] == '\\', "Not a drive letter: %c\n", Path[2]); - - Ret = StringCchPrintfW(Path, MAX_PATH, L"\\\\?\\%c:", Letter); - ok(Ret == S_OK, "StringCchPrintfW failed: %d\n", Ret); - - Device = CreateFileW(Path, 0, FILE_SHARE_DELETE | FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); - if (Device == INVALID_HANDLE_VALUE) + DiskDone = FALSE; + CdRomDone = FALSE; + DriveMap = GetLogicalDrives(); + for (Current = 0; Current < 26; ++Current) { - skip("CreateFileW for %S failed: %ld\n", Path, GetLastError()); - return; + if (DriveMap & (1 << Current)) + { + Ret = StringCchPrintfW(Path, MAX_PATH, L"%c:\\", Current + L'A'); + ok(Ret == S_OK, "StringCchPrintfW failed: %d\n", Ret); + + DriveType = GetDriveTypeW(Path); + if ((DriveType == DRIVE_FIXED && !DiskDone) || + (DriveType == DRIVE_CDROM && !CdRomDone)) + { + Ret = StringCchPrintfW(Path, MAX_PATH, L"\\\\?\\%c:", Current + L'A'); + ok(Ret == S_OK, "StringCchPrintfW failed: %d\n", Ret); + + Device = CreateFileW(Path, 0, FILE_SHARE_DELETE | FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); + if (Device == INVALID_HANDLE_VALUE) + { + skip_type("CreateFileW for %S failed: %ld\n", Path, GetLastError()); + continue; + } + + DiskDone = (DiskDone || (DriveType == DRIVE_FIXED)); + CdRomDone = (CdRomDone || (DriveType == DRIVE_CDROM)); + + if (GetDiskGeometry()) + { + QueryDeviceName(); + QueryUniqueId(); + } + + CloseHandle(Device); + } + + if (CdRomDone && DiskDone) + { + break; + } + } } - GetDiskGeometry(); - QueryDeviceName(); - QueryUniqueId(); + if (!DiskDone) + { + skip("No disk drive found\n"); + } - CloseHandle(Device); + if (!CdRomDone) + { + skip("No CDROM drive found\n"); + } }

6 years, 11 months

[reactos] 01/01: [MSI] Group translations into the lang folder.

by Amine Khaldi

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=bd6e933ca59272862e4d5… commit bd6e933ca59272862e4d59cba1c42762cad00935 Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Sat Oct 7 12:32:05 2017 +0100 [MSI] Group translations into the lang folder. --- dll/win32/msi/{ => lang}/msi_Bg.rc | 0 dll/win32/msi/{ => lang}/msi_Da.rc | 0 dll/win32/msi/{ => lang}/msi_De.rc | 0 dll/win32/msi/{ => lang}/msi_En.rc | 0 dll/win32/msi/{ => lang}/msi_Es.rc | 0 dll/win32/msi/{ => lang}/msi_Fi.rc | 0 dll/win32/msi/{ => lang}/msi_Fr.rc | 0 dll/win32/msi/{ => lang}/msi_He.rc | 0 dll/win32/msi/{ => lang}/msi_Hu.rc | 0 dll/win32/msi/{ => lang}/msi_It.rc | 0 dll/win32/msi/{ => lang}/msi_Ja.rc | 0 dll/win32/msi/{ => lang}/msi_Ko.rc | 0 dll/win32/msi/{ => lang}/msi_Lt.rc | 0 dll/win32/msi/{ => lang}/msi_Nl.rc | 0 dll/win32/msi/{ => lang}/msi_No.rc | 0 dll/win32/msi/{ => lang}/msi_Pl.rc | 0 dll/win32/msi/{ => lang}/msi_Pt.rc | 0 dll/win32/msi/{ => lang}/msi_Ro.rc | 0 dll/win32/msi/{ => lang}/msi_Ru.rc | 0 dll/win32/msi/{ => lang}/msi_Si.rc | 0 dll/win32/msi/{ => lang}/msi_Sq.rc | 0 dll/win32/msi/{ => lang}/msi_Sr.rc | 0 dll/win32/msi/{ => lang}/msi_Sv.rc | 0 dll/win32/msi/{ => lang}/msi_Tr.rc | 0 dll/win32/msi/{ => lang}/msi_Uk.rc | 0 dll/win32/msi/{ => lang}/msi_Zh.rc | 0 26 files changed, 0 insertions(+), 0 deletions(-) diff --git a/dll/win32/msi/msi_Bg.rc b/dll/win32/msi/lang/msi_Bg.rc similarity index 100% rename from dll/win32/msi/msi_Bg.rc rename to dll/win32/msi/lang/msi_Bg.rc diff --git a/dll/win32/msi/msi_Da.rc b/dll/win32/msi/lang/msi_Da.rc similarity index 100% rename from dll/win32/msi/msi_Da.rc rename to dll/win32/msi/lang/msi_Da.rc diff --git a/dll/win32/msi/msi_De.rc b/dll/win32/msi/lang/msi_De.rc similarity index 100% rename from dll/win32/msi/msi_De.rc rename to dll/win32/msi/lang/msi_De.rc diff --git a/dll/win32/msi/msi_En.rc b/dll/win32/msi/lang/msi_En.rc similarity index 100% rename from dll/win32/msi/msi_En.rc rename to dll/win32/msi/lang/msi_En.rc diff --git a/dll/win32/msi/msi_Es.rc b/dll/win32/msi/lang/msi_Es.rc similarity index 100% rename from dll/win32/msi/msi_Es.rc rename to dll/win32/msi/lang/msi_Es.rc diff --git a/dll/win32/msi/msi_Fi.rc b/dll/win32/msi/lang/msi_Fi.rc similarity index 100% rename from dll/win32/msi/msi_Fi.rc rename to dll/win32/msi/lang/msi_Fi.rc diff --git a/dll/win32/msi/msi_Fr.rc b/dll/win32/msi/lang/msi_Fr.rc similarity index 100% rename from dll/win32/msi/msi_Fr.rc rename to dll/win32/msi/lang/msi_Fr.rc diff --git a/dll/win32/msi/msi_He.rc b/dll/win32/msi/lang/msi_He.rc similarity index 100% rename from dll/win32/msi/msi_He.rc rename to dll/win32/msi/lang/msi_He.rc diff --git a/dll/win32/msi/msi_Hu.rc b/dll/win32/msi/lang/msi_Hu.rc similarity index 100% rename from dll/win32/msi/msi_Hu.rc rename to dll/win32/msi/lang/msi_Hu.rc diff --git a/dll/win32/msi/msi_It.rc b/dll/win32/msi/lang/msi_It.rc similarity index 100% rename from dll/win32/msi/msi_It.rc rename to dll/win32/msi/lang/msi_It.rc diff --git a/dll/win32/msi/msi_Ja.rc b/dll/win32/msi/lang/msi_Ja.rc similarity index 100% rename from dll/win32/msi/msi_Ja.rc rename to dll/win32/msi/lang/msi_Ja.rc diff --git a/dll/win32/msi/msi_Ko.rc b/dll/win32/msi/lang/msi_Ko.rc similarity index 100% rename from dll/win32/msi/msi_Ko.rc rename to dll/win32/msi/lang/msi_Ko.rc diff --git a/dll/win32/msi/msi_Lt.rc b/dll/win32/msi/lang/msi_Lt.rc similarity index 100% rename from dll/win32/msi/msi_Lt.rc rename to dll/win32/msi/lang/msi_Lt.rc diff --git a/dll/win32/msi/msi_Nl.rc b/dll/win32/msi/lang/msi_Nl.rc similarity index 100% rename from dll/win32/msi/msi_Nl.rc rename to dll/win32/msi/lang/msi_Nl.rc diff --git a/dll/win32/msi/msi_No.rc b/dll/win32/msi/lang/msi_No.rc similarity index 100% rename from dll/win32/msi/msi_No.rc rename to dll/win32/msi/lang/msi_No.rc diff --git a/dll/win32/msi/msi_Pl.rc b/dll/win32/msi/lang/msi_Pl.rc similarity index 100% rename from dll/win32/msi/msi_Pl.rc rename to dll/win32/msi/lang/msi_Pl.rc diff --git a/dll/win32/msi/msi_Pt.rc b/dll/win32/msi/lang/msi_Pt.rc similarity index 100% rename from dll/win32/msi/msi_Pt.rc rename to dll/win32/msi/lang/msi_Pt.rc diff --git a/dll/win32/msi/msi_Ro.rc b/dll/win32/msi/lang/msi_Ro.rc similarity index 100% rename from dll/win32/msi/msi_Ro.rc rename to dll/win32/msi/lang/msi_Ro.rc diff --git a/dll/win32/msi/msi_Ru.rc b/dll/win32/msi/lang/msi_Ru.rc similarity index 100% rename from dll/win32/msi/msi_Ru.rc rename to dll/win32/msi/lang/msi_Ru.rc diff --git a/dll/win32/msi/msi_Si.rc b/dll/win32/msi/lang/msi_Si.rc similarity index 100% rename from dll/win32/msi/msi_Si.rc rename to dll/win32/msi/lang/msi_Si.rc diff --git a/dll/win32/msi/msi_Sq.rc b/dll/win32/msi/lang/msi_Sq.rc similarity index 100% rename from dll/win32/msi/msi_Sq.rc rename to dll/win32/msi/lang/msi_Sq.rc diff --git a/dll/win32/msi/msi_Sr.rc b/dll/win32/msi/lang/msi_Sr.rc similarity index 100% rename from dll/win32/msi/msi_Sr.rc rename to dll/win32/msi/lang/msi_Sr.rc diff --git a/dll/win32/msi/msi_Sv.rc b/dll/win32/msi/lang/msi_Sv.rc similarity index 100% rename from dll/win32/msi/msi_Sv.rc rename to dll/win32/msi/lang/msi_Sv.rc diff --git a/dll/win32/msi/msi_Tr.rc b/dll/win32/msi/lang/msi_Tr.rc similarity index 100% rename from dll/win32/msi/msi_Tr.rc rename to dll/win32/msi/lang/msi_Tr.rc diff --git a/dll/win32/msi/msi_Uk.rc b/dll/win32/msi/lang/msi_Uk.rc similarity index 100% rename from dll/win32/msi/msi_Uk.rc rename to dll/win32/msi/lang/msi_Uk.rc diff --git a/dll/win32/msi/msi_Zh.rc b/dll/win32/msi/lang/msi_Zh.rc similarity index 100% rename from dll/win32/msi/msi_Zh.rc rename to dll/win32/msi/lang/msi_Zh.rc

6 years, 11 months

[reactos] 01/01: Add modules/optional to .gitignore

by Pierre Schweitzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=dcff3c92987104a4ee532… commit dcff3c92987104a4ee532e15d2666359c5fc9d27 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sat Oct 7 13:26:01 2017 +0200 Add modules/optional to .gitignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 3be9623e90..a9817100ac 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ output-* +modules/optional

6 years, 11 months

← Newer
1
...
19
20
21
22
23
24
25
...
28
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 October 2017