Ros-diffs March 2020

ros-diffs@reactos.org

25 participants
156 discussions

[reactos] 01/01: [ACLUI] Properly enumerate cache+queue entries (#1937)

by Serge Gautherie

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=30613b92abdbd113751c9… commit 30613b92abdbd113751c9dcd0a5a20434778f825 Author: Serge Gautherie <32623169+SergeGautherie(a)users.noreply.github.com> AuthorDate: Mon Mar 30 13:13:22 2020 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Mar 30 13:13:22 2020 +0200 [ACLUI] Properly enumerate cache+queue entries (#1937) --- dll/win32/aclui/sidcache.c | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/dll/win32/aclui/sidcache.c b/dll/win32/aclui/sidcache.c index 6fde2a4641d..e68cf9320b4 100644 --- a/dll/win32/aclui/sidcache.c +++ b/dll/win32/aclui/sidcache.c @@ -337,8 +337,9 @@ FindSidInCache(IN PSIDCACHEMGR scm, /* NOTE: assumes the lists are locked! */ - CurrentEntry = &scm->CacheListHead; - while (CurrentEntry != &scm->CacheListHead) + for (CurrentEntry = scm->CacheListHead.Flink; + CurrentEntry != &scm->CacheListHead; + CurrentEntry = CurrentEntry->Flink) { CacheEntry = CONTAINING_RECORD(CurrentEntry, SIDCACHEENTRY, @@ -383,8 +384,6 @@ FindSidInCache(IN PSIDCACHEMGR scm, *ReqResult = ReqRes; break; } - - CurrentEntry = CurrentEntry->Flink; } return Ret; @@ -699,8 +698,9 @@ QueueSidLookup(IN PSIDCACHEMGR scm, } else { - CurrentEntry = &scm->QueueListHead; - while (CurrentEntry != &scm->QueueListHead) + for (CurrentEntry = scm->QueueListHead.Flink; + CurrentEntry != &scm->QueueListHead; + CurrentEntry = CurrentEntry->Flink) { QueueEntry = CONTAINING_RECORD(CurrentEntry, SIDQUEUEENTRY, @@ -712,8 +712,6 @@ QueueSidLookup(IN PSIDCACHEMGR scm, FoundEntry = QueueEntry; break; } - - CurrentEntry = CurrentEntry->Flink; } } @@ -805,8 +803,9 @@ DequeueSidLookup(IN HANDLE SidCacheMgr, } else { - CurrentEntry = &scm->QueueListHead; - while (CurrentEntry != &scm->QueueListHead) + for (CurrentEntry = scm->QueueListHead.Flink; + CurrentEntry != &scm->QueueListHead; + CurrentEntry = CurrentEntry->Flink) { QueueEntry = CONTAINING_RECORD(CurrentEntry, SIDQUEUEENTRY, @@ -819,8 +818,6 @@ DequeueSidLookup(IN HANDLE SidCacheMgr, QueueEntry); break; } - - CurrentEntry = CurrentEntry->Flink; } }

4 years, 9 months

[reactos] 01/01: [PORTCLS] Stub missing IoControlCode switches (#1756)

by Benjamin Aerni

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=66cf7b602871d16b968ef… commit 66cf7b602871d16b968ef99d51ab90720f7b20e8 Author: Benjamin Aerni <daprogramerforbatch(a)gmail.com> AuthorDate: Mon Mar 30 03:58:25 2020 -0700 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Mar 30 12:58:25 2020 +0200 [PORTCLS] Stub missing IoControlCode switches (#1756) Stub missing switches: IOCTL_KS_HANDSHAKE and IOCTL_KS_METHOD. --- drivers/wdm/audio/backpln/portcls/pin_wavert.cpp | 62 +++++++++++++----------- 1 file changed, 35 insertions(+), 27 deletions(-) diff --git a/drivers/wdm/audio/backpln/portcls/pin_wavert.cpp b/drivers/wdm/audio/backpln/portcls/pin_wavert.cpp index d2e86881464..11ff57ab330 100644 --- a/drivers/wdm/audio/backpln/portcls/pin_wavert.cpp +++ b/drivers/wdm/audio/backpln/portcls/pin_wavert.cpp @@ -305,35 +305,43 @@ CPortPinWaveRT::DeviceIoControl( IoStack = IoGetCurrentIrpStackLocation(Irp); - if (IoStack->Parameters.DeviceIoControl.IoControlCode == IOCTL_KS_PROPERTY) + switch (IoStack->Parameters.DeviceIoControl.IoControlCode) { - return HandleKsProperty(Irp); + case IOCTL_KS_PROPERTY: + return HandleKsProperty(Irp); + + case IOCTL_KS_ENABLE_EVENT: + /* FIXME UNIMPLEMENTED */ + UNIMPLEMENTED_ONCE; + break; + + case IOCTL_KS_DISABLE_EVENT: + /* FIXME UNIMPLEMENTED */ + UNIMPLEMENTED_ONCE; + break; + + case IOCTL_KS_HANDSHAKE: + /* FIXME UNIMPLEMENTED */ + UNIMPLEMENTED_ONCE; + break; + + case IOCTL_KS_METHOD: + /* FIXME UNIMPLEMENTED */ + UNIMPLEMENTED_ONCE; + return KsDefaultDeviceIoCompletion(DeviceObject, Irp); + + case IOCTL_KS_RESET_STATE: + /* FIXME UNIMPLEMENTED */ + UNIMPLEMENTED_ONCE; + break; + + case IOCTL_KS_WRITE_STREAM: + case IOCTL_KS_READ_STREAM: + return HandleKsStream(Irp); + + default: + return KsDefaultDeviceIoCompletion(DeviceObject, Irp); } - else if (IoStack->Parameters.DeviceIoControl.IoControlCode == IOCTL_KS_ENABLE_EVENT) - { - /// FIXME - /// handle enable event - } - else if (IoStack->Parameters.DeviceIoControl.IoControlCode == IOCTL_KS_DISABLE_EVENT) - { - /// FIXME - /// handle disable event - } - else if (IoStack->Parameters.DeviceIoControl.IoControlCode == IOCTL_KS_RESET_STATE) - { - /// FIXME - /// handle reset state - } - else if (IoStack->Parameters.DeviceIoControl.IoControlCode == IOCTL_KS_WRITE_STREAM || IoStack->Parameters.DeviceIoControl.IoControlCode == IOCTL_KS_READ_STREAM) - { - return HandleKsStream(Irp); - } - else - { - return KsDefaultDeviceIoCompletion(DeviceObject, Irp); - } - - UNIMPLEMENTED; Irp->IoStatus.Information = 0; Irp->IoStatus.Status = STATUS_UNSUCCESSFUL;

4 years, 9 months

[reactos] 01/01: [KERNEL32_APITEST][WS2_32_APITEST] Call SetLastError() before checking LastError (#2437)

by Serge Gautherie

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c6e854ce7b2efaa3605e3… commit c6e854ce7b2efaa3605e3be285fd1842b8b0f275 Author: Serge Gautherie <32623169+SergeGautherie(a)users.noreply.github.com> AuthorDate: Mon Mar 30 12:52:37 2020 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Mar 30 12:52:37 2020 +0200 [KERNEL32_APITEST][WS2_32_APITEST] Call SetLastError() before checking LastError (#2437) Follow-up to cb5aa7be. --- modules/rostests/apitests/kernel32/GetComputerNameEx.c | 12 ++++++++++++ modules/rostests/apitests/ws2_32/WSARecv.c | 5 +++++ 2 files changed, 17 insertions(+) diff --git a/modules/rostests/apitests/kernel32/GetComputerNameEx.c b/modules/rostests/apitests/kernel32/GetComputerNameEx.c index 4eee1a8c350..a0a3d7e0a9a 100644 --- a/modules/rostests/apitests/kernel32/GetComputerNameEx.c +++ b/modules/rostests/apitests/kernel32/GetComputerNameEx.c @@ -41,12 +41,14 @@ TestGetComputerNameEx( /* NULL buffer, NULL size */ StartSeh() + SetLastError(0xdeadbeef); Ret = GetComputerNameExW(NameType, NULL, NULL); Error = GetLastError(); ok(Ret == FALSE, "[%d] GetComputerNameExW returned %d\n", NameType, Ret); ok(Error == ERROR_INVALID_PARAMETER, "[%d] GetComputerNameExW returned error %lu\n", NameType, Error); EndSeh(STATUS_SUCCESS); StartSeh() + SetLastError(0xdeadbeef); Ret = GetComputerNameExA(NameType, NULL, NULL); Error = GetLastError(); ok(Ret == FALSE, "[%d] GetComputerNameExA returned %d\n", NameType, Ret); @@ -55,6 +57,7 @@ TestGetComputerNameEx( /* NULL buffer, nonzero size */ Size = 0x55555555; + SetLastError(0xdeadbeef); Ret = GetComputerNameExW(NameType, NULL, &Size); Error = GetLastError(); ok(Ret == FALSE, "[%d] GetComputerNameExW returned %d\n", NameType, Ret); @@ -62,6 +65,7 @@ TestGetComputerNameEx( ok(Size == 0x55555555, "[%d] Got Size %lu\n", NameType, Size); Size = 0x55555555; + SetLastError(0xdeadbeef); Ret = GetComputerNameExA(NameType, NULL, &Size); Error = GetLastError(); ok(Ret == FALSE, "[%d] GetComputerNameExA returned %d\n", NameType, Ret); @@ -70,6 +74,7 @@ TestGetComputerNameEx( /* non-NULL buffer, NULL size */ RtlFillMemory(BufferW, sizeof(BufferW), 0x55); + SetLastError(0xdeadbeef); Ret = GetComputerNameExW(NameType, BufferW, NULL); Error = GetLastError(); ok(Ret == FALSE, "[%d] GetComputerNameExW returned %d\n", NameType, Ret); @@ -77,6 +82,7 @@ TestGetComputerNameEx( ok(BufferW[0] == 0x5555, "[%d] BufferW[0] = 0x%x\n", NameType, BufferW[0]); RtlFillMemory(BufferA, sizeof(BufferA), 0x55); + SetLastError(0xdeadbeef); Ret = GetComputerNameExA(NameType, BufferA, NULL); Error = GetLastError(); ok(Ret == FALSE, "[%d] GetComputerNameExA returned %d\n", NameType, Ret); @@ -85,6 +91,7 @@ TestGetComputerNameEx( /* NULL buffer, zero size */ Size = 0; + SetLastError(0xdeadbeef); Ret = GetComputerNameExW(NameType, NULL, &Size); Error = GetLastError(); ok(Ret == FALSE, "[%d] GetComputerNameExW returned %d\n", NameType, Ret); @@ -92,6 +99,7 @@ TestGetComputerNameEx( ok(Size == ReferenceLen + 1, "[%d] Got Size %lu, expected %lu\n", NameType, Size, ReferenceLen + 1); Size = 0; + SetLastError(0xdeadbeef); Ret = GetComputerNameExA(NameType, NULL, &Size); Error = GetLastError(); ok(Ret == FALSE, "[%d] GetComputerNameExA returned %d\n", NameType, Ret); @@ -101,6 +109,7 @@ TestGetComputerNameEx( /* non-NULL buffer, zero size */ RtlFillMemory(BufferW, sizeof(BufferW), 0x55); Size = 0; + SetLastError(0xdeadbeef); Ret = GetComputerNameExW(NameType, BufferW, &Size); Error = GetLastError(); ok(Ret == FALSE, "[%d] GetComputerNameExW returned %d\n", NameType, Ret); @@ -110,6 +119,7 @@ TestGetComputerNameEx( RtlFillMemory(BufferA, sizeof(BufferA), 0x55); Size = 0; + SetLastError(0xdeadbeef); Ret = GetComputerNameExA(NameType, BufferA, &Size); Error = GetLastError(); ok(Ret == FALSE, "[%d] GetComputerNameExA returned %d\n", NameType, Ret); @@ -120,6 +130,7 @@ TestGetComputerNameEx( /* non-NULL buffer, too small size */ RtlFillMemory(BufferW, sizeof(BufferW), 0x55); Size = ReferenceLen; + SetLastError(0xdeadbeef); Ret = GetComputerNameExW(NameType, BufferW, &Size); Error = GetLastError(); ok(Ret == FALSE, "[%d] GetComputerNameExW returned %d\n", NameType, Ret); @@ -142,6 +153,7 @@ TestGetComputerNameEx( RtlFillMemory(BufferA, sizeof(BufferA), 0x55); Size = ReferenceLen; + SetLastError(0xdeadbeef); Ret = GetComputerNameExA(NameType, BufferA, &Size); Error = GetLastError(); ok(Ret == FALSE, "[%d] GetComputerNameExA returned %d\n", NameType, Ret); diff --git a/modules/rostests/apitests/ws2_32/WSARecv.c b/modules/rostests/apitests/ws2_32/WSARecv.c index a7c4b16669a..fac8a61f21c 100644 --- a/modules/rostests/apitests/ws2_32/WSARecv.c +++ b/modules/rostests/apitests/ws2_32/WSARecv.c @@ -98,6 +98,7 @@ void Test_WSARecv() buffers.buf = szGetRequest; buffers.len = lstrlenA(szGetRequest); dwSent = 0; + WSASetLastError(0xdeadbeef); iResult = WSASend(sck, &buffers, 1, &dwSent, 0, &overlapped, NULL); err = WSAGetLastError(); ok(iResult == 0 || (iResult == SOCKET_ERROR && err == WSA_IO_PENDING), "iResult = %d, %d\n", iResult, err); @@ -134,6 +135,7 @@ void Test_WSARecv() dwFlags = MSG_PEEK; dwRecv = sizeof(szRecvBuf); ok(overlapped.hEvent != NULL, "WSACreateEvent failed %d\n", WSAGetLastError()); + WSASetLastError(0xdeadbeef); iResult = WSARecv(sck, &buffers, 1, &dwRecv, &dwFlags, &overlapped, NULL); err = WSAGetLastError(); ok(iResult == 0 || (iResult == SOCKET_ERROR && err == WSA_IO_PENDING), "iResult = %d, %d\n", iResult, err); @@ -151,6 +153,7 @@ void Test_WSARecv() dwFlags = 0; dwRecv = sizeof(szBuf); WSAResetEvent(overlapped.hEvent); + WSASetLastError(0xdeadbeef); iResult = WSARecv(sck, &buffers, 1, &dwRecv, &dwFlags, &overlapped, NULL); err = WSAGetLastError(); ok(iResult == 0 || (iResult == SOCKET_ERROR && err == WSA_IO_PENDING), "iResult = %d, %d\n", iResult, err); @@ -167,6 +170,7 @@ void Test_WSARecv() dwFlags = 0; dwRecv = sizeof(szBuf); WSAResetEvent(overlapped.hEvent); + WSASetLastError(0xdeadbeef); iResult = WSARecv(sck, &buffers, 1, &dwRecv, &dwFlags, &overlapped, &completion); err = WSAGetLastError(); ok(iResult == 0 || (iResult == SOCKET_ERROR && err == WSA_IO_PENDING), "iResult = %d, %d\n", iResult, err); @@ -183,6 +187,7 @@ void Test_WSARecv() /* no overlapped with completion */ dwFlags = 0; dwRecv = sizeof(szBuf); + WSASetLastError(0xdeadbeef); /* call doesn't fail, but completion is not called */ iResult = WSARecv(sck, &buffers, 1, &dwRecv, &dwFlags, NULL, &completion); err = WSAGetLastError();

4 years, 9 months

[reactos] 01/01: [APITEST][NTDLL] Initial implementation of NtSetInformationProcess() testcase

by Bișoc George

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f70e43c8f34a0cfa44e5f… commit f70e43c8f34a0cfa44e5fad3279909b18588be4c Author: Bișoc George <fraizeraust99(a)gmail.com> AuthorDate: Sun Mar 29 19:01:41 2020 +0200 Commit: Victor Perevertkin <victor(a)perevertkin.ru> CommitDate: Mon Mar 30 13:52:15 2020 +0300 [APITEST][NTDLL] Initial implementation of NtSetInformationProcess() testcase The following testcase only performs argument checks for ProcessForegroundInformation class for the moment. The testcase will be expanded with further tests when needed. --- modules/rostests/apitests/ntdll/CMakeLists.txt | 1 + .../apitests/ntdll/NtSetInformationProcess.c | 80 ++++++++++++++++++++++ modules/rostests/apitests/ntdll/testlist.c | 2 + 3 files changed, 83 insertions(+) diff --git a/modules/rostests/apitests/ntdll/CMakeLists.txt b/modules/rostests/apitests/ntdll/CMakeLists.txt index 64b147bdeec..7da1843babe 100644 --- a/modules/rostests/apitests/ntdll/CMakeLists.txt +++ b/modules/rostests/apitests/ntdll/CMakeLists.txt @@ -33,6 +33,7 @@ list(APPEND SOURCE NtReadFile.c NtSaveKey.c NtSetInformationFile.c + NtSetInformationProcess.c NtSetValueKey.c NtSetVolumeInformationFile.c NtUnloadDriver.c diff --git a/modules/rostests/apitests/ntdll/NtSetInformationProcess.c b/modules/rostests/apitests/ntdll/NtSetInformationProcess.c new file mode 100644 index 00000000000..b5fcc18e2db --- /dev/null +++ b/modules/rostests/apitests/ntdll/NtSetInformationProcess.c @@ -0,0 +1,80 @@ +/* + * PROJECT: ReactOS API tests + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Tests for the NtSetInformationProcess API + * COPYRIGHT: Copyright 2020 Bișoc George <fraizeraust99 at gmail dot com> + */ + +#include "precomp.h" + +static +void +Test_ProcForegroundBackgroundClass(void) +{ + NTSTATUS Status; + PPROCESS_FOREGROUND_BACKGROUND ProcForeground; + + ProcForeground = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(PROCESS_FOREGROUND_BACKGROUND)); + if (ProcForeground == NULL) + { + skip("Failed to allocate memory block from heap for PROCESS_FOREGROUND_BACKGROUND!\n"); + return; + } + + /* As a test, set the foreground of the retrieved current process to FALSE */ + ProcForeground->Foreground = FALSE; + + /* Set everything NULL for the caller */ + Status = NtSetInformationProcess(NULL, + ProcessForegroundInformation, + NULL, + 0); + ok_hex(Status, STATUS_INFO_LENGTH_MISMATCH); + + /* Give an invalid process handle (but the input buffer and length are correct) */ + Status = NtSetInformationProcess(NULL, + ProcessForegroundInformation, + ProcForeground, + sizeof(PROCESS_FOREGROUND_BACKGROUND)); + ok_hex(Status, STATUS_INVALID_HANDLE); + + /* Give a buffer data to the argument input as NULL */ + Status = NtSetInformationProcess(NtCurrentProcess(), + ProcessForegroundInformation, + NULL, + sizeof(PROCESS_FOREGROUND_BACKGROUND)); + ok_hex(Status, STATUS_ACCESS_VIOLATION); + + /* Set the information process foreground with an incorrect buffer alignment and zero buffer length */ + Status = NtSetInformationProcess(NtCurrentProcess(), + ProcessForegroundInformation, + (PVOID)1, + 0); + ok_hex(Status, STATUS_INFO_LENGTH_MISMATCH); + + /* + * Set the information process foreground with an incorrect buffer alignment but correct size length. + * The function will return STATUS_ACCESS_VIOLATION as the alignment probe requirement is not performed + * in this class. + */ + Status = NtSetInformationProcess(NtCurrentProcess(), + ProcessForegroundInformation, + (PVOID)1, + sizeof(PROCESS_FOREGROUND_BACKGROUND)); + ok_hex(Status, STATUS_ACCESS_VIOLATION); + + /* Set the foreground information to the current given process, we must expect the function should succeed */ + Status = NtSetInformationProcess(NtCurrentProcess(), + ProcessForegroundInformation, + ProcForeground, + sizeof(PROCESS_FOREGROUND_BACKGROUND)); + ok_hex(Status, STATUS_SUCCESS); + + /* Clear all the stuff */ + HeapFree(GetProcessHeap(), 0, ProcForeground); +} + +START_TEST(NtSetInformationProcess) +{ + Test_ProcForegroundBackgroundClass(); +} diff --git a/modules/rostests/apitests/ntdll/testlist.c b/modules/rostests/apitests/ntdll/testlist.c index 7624c3c23af..76357f6ece6 100644 --- a/modules/rostests/apitests/ntdll/testlist.c +++ b/modules/rostests/apitests/ntdll/testlist.c @@ -31,6 +31,7 @@ extern void func_NtQueryVolumeInformationFile(void); extern void func_NtReadFile(void); extern void func_NtSaveKey(void); extern void func_NtSetInformationFile(void); +extern void func_NtSetInformationProcess(void); extern void func_NtSetValueKey(void); extern void func_NtSetVolumeInformationFile(void); extern void func_NtSystemInformation(void); @@ -98,6 +99,7 @@ const struct test winetest_testlist[] = { "NtReadFile", func_NtReadFile }, { "NtSaveKey", func_NtSaveKey}, { "NtSetInformationFile", func_NtSetInformationFile }, + { "NtSetInformationProcess", func_NtSetInformationProcess }, { "NtSetValueKey", func_NtSetValueKey}, { "NtSetVolumeInformationFile", func_NtSetVolumeInformationFile }, { "NtSystemInformation", func_NtSystemInformation },

4 years, 9 months

[reactos] 01/01: [REACTOS] Remove forced _WIN32_IE defines

by Serge Gautherie

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=724466597f33bbb926d97… commit 724466597f33bbb926d97d609670302d1cc9eb0d Author: Serge Gautherie <reactos-git_serge_171003(a)gautherie.fr> AuthorDate: Sat Mar 21 02:09:33 2020 +0100 Commit: Victor Perevertkin <victor(a)perevertkin.ru> CommitDate: Mon Mar 30 13:47:09 2020 +0300 [REACTOS] Remove forced _WIN32_IE defines No impact, as already deactivated or superseded or superfluous. Import https://source.winehq.org/git/wine.git/commit/7770e26f2d773dcade6f073585b6f… --- base/applications/wordpad/wordpad.c | 1 - dll/win32/riched20/editstr.h | 4 ---- modules/rostests/winetests/comctl32/rebar.c | 6 ------ modules/rostests/winetests/shell32/systray.c | 3 --- modules/rostests/winetests/urlmon/sec_mgr.c | 6 ------ modules/rostests/winetests/user32/input.c | 5 ----- sdk/include/reactos/wine/commctrl.h | 5 ----- 7 files changed, 30 deletions(-) diff --git a/base/applications/wordpad/wordpad.c b/base/applications/wordpad/wordpad.c index ba4cf537889..4cd8cc21b19 100644 --- a/base/applications/wordpad/wordpad.c +++ b/base/applications/wordpad/wordpad.c @@ -21,7 +21,6 @@ */ #define WIN32_LEAN_AND_MEAN -#define _WIN32_IE 0x0400 #include <stdio.h> #include <assert.h> diff --git a/dll/win32/riched20/editstr.h b/dll/win32/riched20/editstr.h index a2e6f8584b7..608901a5e22 100644 --- a/dll/win32/riched20/editstr.h +++ b/dll/win32/riched20/editstr.h @@ -21,10 +21,6 @@ #ifndef __EDITSTR_H #define __EDITSTR_H -#ifndef _WIN32_IE -#define _WIN32_IE 0x0400 -#endif - #include <assert.h> #include <stdarg.h> #include <stdio.h> diff --git a/modules/rostests/winetests/comctl32/rebar.c b/modules/rostests/winetests/comctl32/rebar.c index 501638c758f..6b4a71b0542 100644 --- a/modules/rostests/winetests/comctl32/rebar.c +++ b/modules/rostests/winetests/comctl32/rebar.c @@ -17,12 +17,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -/* make sure the structures work with a comctl32 v5.x */ -#ifndef __REACTOS__ -#define _WIN32_WINNT 0x500 -#define _WIN32_IE 0x500 -#endif - #include <assert.h> #include <stdarg.h> diff --git a/modules/rostests/winetests/shell32/systray.c b/modules/rostests/winetests/shell32/systray.c index c0f963467d6..ba5832e51c7 100644 --- a/modules/rostests/winetests/shell32/systray.c +++ b/modules/rostests/winetests/shell32/systray.c @@ -17,9 +17,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#ifndef __REACTOS__ -#define _WIN32_IE 0x600 -#endif #include <stdarg.h> #include <windows.h> diff --git a/modules/rostests/winetests/urlmon/sec_mgr.c b/modules/rostests/winetests/urlmon/sec_mgr.c index 4d96eba6289..bdf1286132b 100644 --- a/modules/rostests/winetests/urlmon/sec_mgr.c +++ b/modules/rostests/winetests/urlmon/sec_mgr.c @@ -21,12 +21,6 @@ #define COBJMACROS #define CONST_VTABLE -/* needed for IInternetZoneManagerEx2 */ -#ifdef __REACTOS__ -#undef _WIN32_IE -#endif -#define _WIN32_IE 0x0700 - #include <wine/test.h> #include <stdarg.h> #include <stddef.h> diff --git a/modules/rostests/winetests/user32/input.c b/modules/rostests/winetests/user32/input.c index d856e6916dc..8e1838953e3 100644 --- a/modules/rostests/winetests/user32/input.c +++ b/modules/rostests/winetests/user32/input.c @@ -44,11 +44,6 @@ * */ -#ifndef __REACTOS__ -#define _WIN32_WINNT 0x401 -#define _WIN32_IE 0x0500 -#endif - #include <stdarg.h> #include <assert.h> diff --git a/sdk/include/reactos/wine/commctrl.h b/sdk/include/reactos/wine/commctrl.h index ab4e957261b..6306fc3e158 100644 --- a/sdk/include/reactos/wine/commctrl.h +++ b/sdk/include/reactos/wine/commctrl.h @@ -5,11 +5,6 @@ #define DPA_GetPtr DPA_GetPtr_wine_hack #define FlatSB_SetScrollProp FlatSB_SetScrollProp_wine_hack -#if (_WIN32_IE < 0x501) -#undef _WIN32_IE -#define _WIN32_IE 0x0501 -#endif - #include <psdk/commctrl.h> #ifdef __cplusplus

4 years, 9 months

[reactos] 01/01: [NTDLL_WINETEST] Remove forced 0x500 API versions (#2483)

by Serge Gautherie

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5d393d73ad4ac221d2bf0… commit 5d393d73ad4ac221d2bf077b25ac37330ace3bca Author: Serge Gautherie <32623169+SergeGautherie(a)users.noreply.github.com> AuthorDate: Mon Mar 30 12:38:47 2020 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Mar 30 12:38:47 2020 +0200 [NTDLL_WINETEST] Remove forced 0x500 API versions (#2483) No impact, as conditional. Import https://source.winehq.org/git/wine.git/commit/71d810319059d171df0e40d857525… --- modules/rostests/winetests/ntdll/exception.c | 4 ---- modules/rostests/winetests/ntdll/ntdll_test.h | 4 ---- 2 files changed, 8 deletions(-) diff --git a/modules/rostests/winetests/ntdll/exception.c b/modules/rostests/winetests/ntdll/exception.c index d5a197b4a31..142913f7db1 100644 --- a/modules/rostests/winetests/ntdll/exception.c +++ b/modules/rostests/winetests/ntdll/exception.c @@ -21,10 +21,6 @@ #include <stdarg.h> #include <stdio.h> -#ifndef _WIN32_WINNT -#define _WIN32_WINNT 0x500 /* For NTSTATUS */ -#endif - #include "ntstatus.h" #define WIN32_NO_STATUS #define NONAMELESSUNION diff --git a/modules/rostests/winetests/ntdll/ntdll_test.h b/modules/rostests/winetests/ntdll/ntdll_test.h index 6883c9867bc..d87801a983a 100644 --- a/modules/rostests/winetests/ntdll/ntdll_test.h +++ b/modules/rostests/winetests/ntdll/ntdll_test.h @@ -20,10 +20,6 @@ #include <stdarg.h> -#ifndef _WIN32_WINNT -#define _WIN32_WINNT 0x500 /* For NTSTATUS */ -#endif - #include "ntstatus.h" #define WIN32_NO_STATUS #include "windef.h"

4 years, 9 months

[reactos] 01/01: [SHELL32] HCR_GetIconA(): Properly use icon_idx (#2482)

by Serge Gautherie

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=07efa2ef53b3538b314c8… commit 07efa2ef53b3538b314c814a86ff7560ed8a137e Author: Serge Gautherie <32623169+SergeGautherie(a)users.noreply.github.com> AuthorDate: Mon Mar 30 12:24:59 2020 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Mar 30 12:24:59 2020 +0200 [SHELL32] HCR_GetIconA(): Properly use icon_idx (#2482) CORE-11713 Import https://source.winehq.org/git/wine.git/commit/7cc2806e0e0d97c0df93e2695351a… --- dll/win32/shell32/wine/classes.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dll/win32/shell32/wine/classes.c b/dll/win32/shell32/wine/classes.c index c2c014c09d0..b2a5ca54256 100644 --- a/dll/win32/shell32/wine/classes.c +++ b/dll/win32/shell32/wine/classes.c @@ -332,7 +332,12 @@ BOOL HCR_GetIconA(LPCSTR szClass, LPSTR szDest, LPCSTR szName, DWORD len, int* p ret = HCR_RegGetIconA(hkey, szDest, szName, len, picon_idx); RegCloseKey(hkey); } - TRACE("-- %s %i\n", szDest, *picon_idx); + + if (ret) + TRACE("-- %s %i\n", szDest, *picon_idx); + else + TRACE("-- not found\n"); + return ret; }

4 years, 9 months

[reactos] 01/01: [WINMM] Add a WARN() when winejoystick.drv is missing (#2480)

by Serge Gautherie

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=78d8705181721c5e6cffb… commit 78d8705181721c5e6cffb4598fcfeb947b0d91e3 Author: Serge Gautherie <32623169+SergeGautherie(a)users.noreply.github.com> AuthorDate: Mon Mar 30 12:14:52 2020 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Mar 30 12:14:52 2020 +0200 [WINMM] Add a WARN() when winejoystick.drv is missing (#2480) Follow-up to 97150ce9. Import https://source.winehq.org/git/wine.git/commit/175a2a027637719d1f3c644d97b6d… --- dll/win32/winmm/joystick.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dll/win32/winmm/joystick.c b/dll/win32/winmm/joystick.c index 92bd48d3995..304c279e322 100644 --- a/dll/win32/winmm/joystick.c +++ b/dll/win32/winmm/joystick.c @@ -66,6 +66,8 @@ static BOOL JOY_LoadDriver(DWORD dwJoyID) if (!JOY_Sticks[dwJoyID].hDriver) { + WARN("OpenDriverA(\"winejoystick.drv\") failed\n"); + /* The default driver is missing, don't attempt to load it again */ winejoystick_missing = TRUE; }

4 years, 9 months

[reactos] 01/01: [GDI32] Allow BI_BITFIELDS compression in CreateDIBitmap (#2448)

by Tibor Lajos Füzi

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6020af20146d798b878d5… commit 6020af20146d798b878d5701fb16328c16835be5 Author: Tibor Lajos Füzi <tibor.fuzi(a)gmail.com> AuthorDate: Mon Mar 30 12:11:38 2020 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Mar 30 12:11:38 2020 +0200 [GDI32] Allow BI_BITFIELDS compression in CreateDIBitmap (#2448) CORE-16750, CORE-15960 --- win32ss/gdi/gdi32/objects/bitmap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/win32ss/gdi/gdi32/objects/bitmap.c b/win32ss/gdi/gdi32/objects/bitmap.c index a3f4c482c6f..3e56194ce95 100644 --- a/win32ss/gdi/gdi32/objects/bitmap.c +++ b/win32ss/gdi/gdi32/objects/bitmap.c @@ -486,7 +486,7 @@ CreateDIBitmap( } /* Check if the Compr is incompatible */ - if ((Compression == BI_JPEG) || (Compression == BI_PNG) || (Compression == BI_BITFIELDS)) + if ((Compression == BI_JPEG) || (Compression == BI_PNG)) { DPRINT1("Invalid compression: %lu!\n", Compression); goto Exit;

4 years, 9 months

[reactos] 01/01: [RPCRT4] Fix 'Routeines' typos (#2481)

by Serge Gautherie

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6e79e60883aed64ab1820… commit 6e79e60883aed64ab18201ac24e945d2933faa2b Author: Serge Gautherie <32623169+SergeGautherie(a)users.noreply.github.com> AuthorDate: Mon Mar 30 10:28:52 2020 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Mar 30 10:28:52 2020 +0200 [RPCRT4] Fix 'Routeines' typos (#2481) Addendum to b6fdb56b9adf780902cc9cf65af1f76365a96ce4. Import https://source.winehq.org/git/wine.git/commit/c73352047d20a503c67bdd583f6ef… CORE-15682 --- dll/win32/rpcrt4/rpcrt4.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dll/win32/rpcrt4/rpcrt4.spec b/dll/win32/rpcrt4/rpcrt4.spec index 38bdfd310ee..77b0e8d9c09 100644 --- a/dll/win32/rpcrt4/rpcrt4.spec +++ b/dll/win32/rpcrt4/rpcrt4.spec @@ -511,9 +511,9 @@ 511 stub long_from_ndr 512 stub long_from_ndr_temp 513 stub pfnFreeRoutines -514 stub pfnMarshallRouteines +514 stub pfnMarshallRoutines 515 stub pfnSizeRoutines -516 stub pfnUnmarshallRouteines +516 stub pfnUnmarshallRoutines 517 stub short_array_from_ndr 518 stub short_from_ndr 519 stub short_from_ndr_temp

4 years, 9 months

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 2020