wine-commits January 2019

wine-commits@winehq.org

2 participants
499 discussions

Zebediah Figura : ntoskrnl.exe: Implement KeInitializeSpinLock().
by Alexandre Julliard 24 Jan '19

24 Jan '19

Module: wine Branch: master Commit: 92b047e722b0b9bd783139b5bdd34c1d9a6478e4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=92b047e722b0b9bd783139b5… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Jan 23 23:50:33 2019 -0600 ntoskrnl.exe: Implement KeInitializeSpinLock(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 8 -------- dlls/ntoskrnl.exe/sync.c | 9 +++++++++ include/ddk/wdm.h | 1 + 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index c46418e..06a1cbd 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -2278,14 +2278,6 @@ PRKTHREAD WINAPI KeGetCurrentThread(void) } /*********************************************************************** - * KeInitializeSpinLock (NTOSKRNL.EXE.@) - */ -void WINAPI KeInitializeSpinLock( PKSPIN_LOCK SpinLock ) -{ - FIXME( "stub: %p\n", SpinLock ); -} - -/*********************************************************************** * KeInsertQueue (NTOSKRNL.EXE.@) */ LONG WINAPI KeInsertQueue(PRKQUEUE Queue, PLIST_ENTRY Entry) diff --git a/dlls/ntoskrnl.exe/sync.c b/dlls/ntoskrnl.exe/sync.c index da51ca0..bd58f33 100644 --- a/dlls/ntoskrnl.exe/sync.c +++ b/dlls/ntoskrnl.exe/sync.c @@ -373,3 +373,12 @@ NTSTATUS WINAPI KeDelayExecutionThread( KPROCESSOR_MODE mode, BOOLEAN alertable, TRACE("mode %d, alertable %u, timeout %p.\n", mode, alertable, timeout); return NtDelayExecution( alertable, timeout ); } + +/*********************************************************************** + * KeInitializeSpinLock (NTOSKRNL.EXE.@) + */ +void WINAPI KeInitializeSpinLock( KSPIN_LOCK *lock ) +{ + TRACE("lock %p.\n", lock); + *lock = 0; +} diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index 077fec1..3aa1c8a 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -1426,6 +1426,7 @@ PKTHREAD WINAPI KeGetCurrentThread(void); void WINAPI KeInitializeEvent(PRKEVENT,EVENT_TYPE,BOOLEAN); void WINAPI KeInitializeMutex(PRKMUTEX,ULONG); void WINAPI KeInitializeSemaphore(PRKSEMAPHORE,LONG,LONG); +void WINAPI KeInitializeSpinLock(KSPIN_LOCK*); void WINAPI KeInitializeTimerEx(PKTIMER,TIMER_TYPE); void WINAPI KeInitializeTimer(KTIMER*); void WINAPI KeQuerySystemTime(LARGE_INTEGER*);

1 0

Zebediah Figura : hal: Limit exports to the appropriate architectures.
by Alexandre Julliard 24 Jan '19

24 Jan '19

Module: wine Branch: master Commit: b6ea5f347e84644f38b3f5fffc88890c9e0af633 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b6ea5f347e84644f38b3f5ff… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Jan 23 23:50:32 2019 -0600 hal: Limit exports to the appropriate architectures. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hal/hal.c | 81 +++++++++++++++++++++---------------------------------- dlls/hal/hal.spec | 26 +++++++++--------- 2 files changed, 43 insertions(+), 64 deletions(-) diff --git a/dlls/hal/hal.c b/dlls/hal/hal.c index 51bf55d..5560d9b 100644 --- a/dlls/hal/hal.c +++ b/dlls/hal/hal.c @@ -47,53 +47,42 @@ WINE_DEFAULT_DEBUG_CHANNEL(ntoskrnl); "pushl %ecx\n\t" \ "pushl %eax\n\t" \ "jmp " __ASM_NAME("__regs_") #name __ASM_STDCALL(8)) -#endif - -#ifdef DEFINE_FASTCALL1_ENTRYPOINT DEFINE_FASTCALL1_ENTRYPOINT( ExAcquireFastMutex ) VOID WINAPI DECLSPEC_HIDDEN __regs_ExAcquireFastMutex(PFAST_MUTEX FastMutex) -#else -VOID WINAPI ExAcquireFastMutex(PFAST_MUTEX FastMutex) -#endif { FIXME("%p: stub\n", FastMutex); } -#ifdef DEFINE_FASTCALL1_ENTRYPOINT DEFINE_FASTCALL1_ENTRYPOINT( ExReleaseFastMutex ) VOID WINAPI DECLSPEC_HIDDEN __regs_ExReleaseFastMutex(PFAST_MUTEX FastMutex) -#else -VOID WINAPI ExReleaseFastMutex(PFAST_MUTEX FastMutex) -#endif { FIXME("%p: stub\n", FastMutex); } -#ifdef DEFINE_FASTCALL1_ENTRYPOINT DEFINE_FASTCALL1_ENTRYPOINT( ExTryToAcquireFastMutex ) BOOLEAN WINAPI DECLSPEC_HIDDEN __regs_ExTryToAcquireFastMutex(PFAST_MUTEX FastMutex) -#else -BOOLEAN WINAPI ExTryToAcquireFastMutex(PFAST_MUTEX FastMutex) -#endif { FIXME("(%p) stub\n", FastMutex); return TRUE; } -#ifdef DEFINE_FASTCALL1_ENTRYPOINT DEFINE_FASTCALL1_ENTRYPOINT( KfAcquireSpinLock ) KIRQL WINAPI DECLSPEC_HIDDEN __regs_KfAcquireSpinLock(PKSPIN_LOCK SpinLock) -#else -KIRQL WINAPI KfAcquireSpinLock(PKSPIN_LOCK SpinLock) -#endif { FIXME( "(%p) stub!\n", SpinLock ); return 0; } +DEFINE_FASTCALL2_ENTRYPOINT( KfReleaseSpinLock ) +VOID WINAPI DECLSPEC_HIDDEN __regs_KfReleaseSpinLock(PKSPIN_LOCK SpinLock, KIRQL NewIrql) +{ + FIXME( "(%p %u) stub!\n", SpinLock, NewIrql ); +} +#endif /* __i386__ */ +#if defined(__i386__) || defined(__arm__) || defined(__aarch64__) #ifdef DEFINE_FASTCALL1_ENTRYPOINT DEFINE_FASTCALL1_ENTRYPOINT( KfLowerIrql ) VOID WINAPI DECLSPEC_HIDDEN __regs_KfLowerIrql(KIRQL NewIrql) @@ -117,39 +106,6 @@ KIRQL WINAPI KfRaiseIrql(KIRQL NewIrql) return 0; } - -#ifdef DEFINE_FASTCALL2_ENTRYPOINT -DEFINE_FASTCALL2_ENTRYPOINT( KfReleaseSpinLock ) -VOID WINAPI DECLSPEC_HIDDEN __regs_KfReleaseSpinLock(PKSPIN_LOCK SpinLock, KIRQL NewIrql) -#else -VOID WINAPI KfReleaseSpinLock(PKSPIN_LOCK SpinLock, KIRQL NewIrql) -#endif -{ - FIXME( "(%p %u) stub!\n", SpinLock, NewIrql ); -} - -ULONG WINAPI HalGetBusData(BUS_DATA_TYPE BusDataType, ULONG BusNumber, ULONG SlotNumber, PVOID Buffer, ULONG Length) -{ - FIXME("(%u %u %u %p %u) stub!\n", BusDataType, BusNumber, SlotNumber, Buffer, Length); - /* Claim that there is no such bus */ - return 0; -} - -ULONG WINAPI HalGetBusDataByOffset(BUS_DATA_TYPE BusDataType, ULONG BusNumber, ULONG SlotNumber, PVOID Buffer, ULONG Offset, ULONG Length) -{ - FIXME("(%u %u %u %p %u %u) stub!\n", BusDataType, BusNumber, SlotNumber, Buffer, Offset, Length); - /* Claim that there is no such bus */ - return 0; -} - -BOOLEAN WINAPI HalTranslateBusAddress(INTERFACE_TYPE InterfaceType, ULONG BusNumber, PHYSICAL_ADDRESS BusAddress, - PULONG AddressSpace, PPHYSICAL_ADDRESS TranslatedAddress) -{ - FIXME("(%d %d %s %p %p) stub!\n", InterfaceType, BusNumber, - wine_dbgstr_longlong(BusAddress.QuadPart), AddressSpace, TranslatedAddress); - return FALSE; -} - KIRQL WINAPI KeGetCurrentIrql(VOID) { FIXME( " stub!\n"); @@ -177,6 +133,29 @@ void WINAPI WRITE_PORT_ULONG(ULONG *port, ULONG value) { FIXME("(%p %d) stub!\n", port, value); } +#endif /* __i386__ || __arm__ || __arm64__ */ + +ULONG WINAPI HalGetBusData(BUS_DATA_TYPE BusDataType, ULONG BusNumber, ULONG SlotNumber, PVOID Buffer, ULONG Length) +{ + FIXME("(%u %u %u %p %u) stub!\n", BusDataType, BusNumber, SlotNumber, Buffer, Length); + /* Claim that there is no such bus */ + return 0; +} + +ULONG WINAPI HalGetBusDataByOffset(BUS_DATA_TYPE BusDataType, ULONG BusNumber, ULONG SlotNumber, PVOID Buffer, ULONG Offset, ULONG Length) +{ + FIXME("(%u %u %u %p %u %u) stub!\n", BusDataType, BusNumber, SlotNumber, Buffer, Offset, Length); + /* Claim that there is no such bus */ + return 0; +} + +BOOLEAN WINAPI HalTranslateBusAddress(INTERFACE_TYPE InterfaceType, ULONG BusNumber, PHYSICAL_ADDRESS BusAddress, + PULONG AddressSpace, PPHYSICAL_ADDRESS TranslatedAddress) +{ + FIXME("(%d %d %s %p %p) stub!\n", InterfaceType, BusNumber, + wine_dbgstr_longlong(BusAddress.QuadPart), AddressSpace, TranslatedAddress); + return FALSE; +} ULONGLONG WINAPI KeQueryPerformanceCounter(LARGE_INTEGER *frequency) { diff --git a/dlls/hal/hal.spec b/dlls/hal/hal.spec index 5dc3fa8..818e56c 100644 --- a/dlls/hal/hal.spec +++ b/dlls/hal/hal.spec @@ -1,6 +1,6 @@ -@ stdcall -norelay ExAcquireFastMutex(ptr) -@ stdcall -norelay ExReleaseFastMutex(ptr) -@ stdcall -norelay ExTryToAcquireFastMutex(ptr) +@ stdcall -arch=i386 -norelay ExAcquireFastMutex(ptr) +@ stdcall -arch=i386 -norelay ExReleaseFastMutex(ptr) +@ stdcall -arch=i386 -norelay ExTryToAcquireFastMutex(ptr) @ stub HalClearSoftwareInterrupt @ stub HalRequestSoftwareInterrupt @ stub HalSystemVectorDispatchEntry @@ -13,10 +13,10 @@ @ stub KeReleaseQueuedSpinLock @ stub KeTryToAcquireQueuedSpinLock @ stub KeTryToAcquireQueuedSpinLockRaiseToSynch -@ stdcall -norelay KfAcquireSpinLock(ptr) -@ stdcall -norelay KfLowerIrql(long) -@ stdcall -norelay KfRaiseIrql(long) -@ stdcall -norelay KfReleaseSpinLock(ptr long) +@ stdcall -arch=i386 -norelay KfAcquireSpinLock(ptr) +@ stdcall -arch=arm,arm64,i386 -norelay KfLowerIrql(long) +@ stdcall -arch=arm,arm64,i386 -norelay KfRaiseIrql(long) +@ stdcall -arch=i386 -norelay KfReleaseSpinLock(ptr long) @ stub HalAcquireDisplayOwnership @ stub HalAdjustResourceList @ stub HalAllProcessorsStarted @@ -70,23 +70,23 @@ @ stub KdComPortInUse @ stub KeAcquireSpinLock @ stub KeFlushWriteBuffer -@ stdcall KeGetCurrentIrql() +@ stdcall -arch=arm,arm64,i386 KeGetCurrentIrql() @ stub KeLowerIrql @ stdcall -ret64 KeQueryPerformanceCounter(ptr) @ stub KeRaiseIrql @ stub KeRaiseIrqlToDpcLevel @ stub KeRaiseIrqlToSynchLevel -@ stdcall KeReleaseSpinLock(ptr long) ntoskrnl.exe.KeReleaseSpinLock +@ stdcall -arch=i386 KeReleaseSpinLock(ptr long) ntoskrnl.exe.KeReleaseSpinLock @ stub KeStallExecutionProcessor @ stub READ_PORT_BUFFER_UCHAR @ stub READ_PORT_BUFFER_ULONG @ stub READ_PORT_BUFFER_USHORT -@ stdcall READ_PORT_UCHAR(ptr) -@ stdcall READ_PORT_ULONG(ptr) +@ stdcall -arch=arm,arm64,i386 READ_PORT_UCHAR(ptr) +@ stdcall -arch=arm,arm64,i386 READ_PORT_ULONG(ptr) @ stub READ_PORT_USHORT @ stub WRITE_PORT_BUFFER_UCHAR @ stub WRITE_PORT_BUFFER_ULONG @ stub WRITE_PORT_BUFFER_USHORT -@ stdcall WRITE_PORT_UCHAR(ptr long) -@ stdcall WRITE_PORT_ULONG(ptr long) +@ stdcall -arch=arm,arm64,i386 WRITE_PORT_UCHAR(ptr long) +@ stdcall -arch=arm,arm64,i386 WRITE_PORT_ULONG(ptr long) @ stub WRITE_PORT_USHORT

1 0

Sebastian Lackner : wtsapi32: Improve WTSQueryUserToken stub.
by Alexandre Julliard 24 Jan '19

24 Jan '19

Module: wine Branch: master Commit: 0e89c840a6c8227b387aadac539e5f6edf3dbd16 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0e89c840a6c8227b387aadac… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Jan 23 03:22:56 2019 +0100 wtsapi32: Improve WTSQueryUserToken stub. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=39663 Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wtsapi32/tests/wtsapi.c | 1 - dlls/wtsapi32/wtsapi32.c | 13 +++++++++++-- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/dlls/wtsapi32/tests/wtsapi.c b/dlls/wtsapi32/tests/wtsapi.c index c24bd49..67f56bb 100644 --- a/dlls/wtsapi32/tests/wtsapi.c +++ b/dlls/wtsapi32/tests/wtsapi.c @@ -112,7 +112,6 @@ static void test_WTSQueryUserToken(void) SetLastError(0xdeadbeef); ret = WTSQueryUserToken(WTS_CURRENT_SESSION, NULL); ok(!ret, "expected WTSQueryUserToken to fail\n"); - todo_wine ok(GetLastError()==ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER got: %d\n", GetLastError()); } diff --git a/dlls/wtsapi32/wtsapi32.c b/dlls/wtsapi32/wtsapi32.c index 5569502..3edf921 100644 --- a/dlls/wtsapi32/wtsapi32.c +++ b/dlls/wtsapi32/wtsapi32.c @@ -254,8 +254,17 @@ BOOL WINAPI WTSQuerySessionInformationW( */ BOOL WINAPI WTSQueryUserToken(ULONG session_id, PHANDLE token) { - FIXME("%u %p\n", session_id, token); - return FALSE; + FIXME("%u %p semi-stub!\n", session_id, token); + + if (!token) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + return DuplicateHandle(GetCurrentProcess(), GetCurrentProcessToken(), + GetCurrentProcess(), token, + 0, FALSE, DUPLICATE_SAME_ACCESS); } /************************************************************

1 0

Zhiyi Zhang : user32: Fix a memory leak.
by Alexandre Julliard 24 Jan '19

24 Jan '19

Module: wine Branch: master Commit: 7c8cf96e9cb88cdec3d3a8ec862b257452effd42 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7c8cf96e9cb88cdec3d3a8ec… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Jan 23 23:34:12 2019 +0800 user32: Fix a memory leak. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/rawinput.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/user32/rawinput.c b/dlls/user32/rawinput.c index 4bfccdf..b247c15 100644 --- a/dlls/user32/rawinput.c +++ b/dlls/user32/rawinput.c @@ -172,6 +172,7 @@ static void find_hid_devices(void) done: LeaveCriticalSection(&hid_devices_cs); + SetupDiDestroyDeviceInfoList(set); heap_free(detail); }

1 0

Gabriel Ivăncescu : shell32/tests: Test GetDisplayNameOf for special folders with both SHGDN_FORPARSING and SHGDN_FORADDRESSBAR.
by Alexandre Julliard 24 Jan '19

24 Jan '19

Module: wine Branch: master Commit: de837ca7eba8aecba1aff72b2b2213461252a010 URL: https://source.winehq.org/git/wine.git/?a=commit;h=de837ca7eba8aecba1aff72b… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Jan 23 17:27:16 2019 +0200 shell32/tests: Test GetDisplayNameOf for special folders with both SHGDN_FORPARSING and SHGDN_FORADDRESSBAR. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/tests/shfldr_special.c | 55 +++++++++++++++++++++++++++++++++++++ 1 file changed, 55 insertions(+) diff --git a/dlls/shell32/tests/shfldr_special.c b/dlls/shell32/tests/shfldr_special.c index dd4cc04..b73759e 100644 --- a/dlls/shell32/tests/shfldr_special.c +++ b/dlls/shell32/tests/shfldr_special.c @@ -29,6 +29,7 @@ #define WIN32_LEAN_AND_MEAN #include <windows.h> #include "shellapi.h" +#include "shlwapi.h" #include "shlobj.h" #include "wine/test.h" @@ -238,10 +239,64 @@ static void test_desktop_folder(void) IShellFolder_Release(psf); } +static void test_desktop_displaynameof(void) +{ + static WCHAR MyComputer[] = { ':',':','{','2','0','D','0','4','F','E','0','-','3','A','E','A','-','1','0','6','9','-','A','2','D','8','-','0','8','0','0','2','B','3','0','3','0','9','D','}', 0 }; + static WCHAR MyDocuments[] = { ':',':','{','4','5','0','D','8','F','B','A','-','A','D','2','5','-','1','1','D','0','-','9','8','A','8','-','0','8','0','0','3','6','1','B','1','1','0','3','}', 0 }; + static WCHAR RecycleBin[] = { ':',':','{','6','4','5','F','F','0','4','0','-','5','0','8','1','-','1','0','1','B','-','9','F','0','8','-','0','0','A','A','0','0','2','F','9','5','4','E','}', 0 }; + static WCHAR ControlPanel[]= { ':',':','{','2','0','D','0','4','F','E','0','-','3','A','E','A','-','1','0','6','9','-','A','2','D','8','-','0','8','0','0','2','B','3','0','3','0','9','D','}','\\', + ':',':','{','2','1','E','C','2','0','2','0','-','3','A','E','A','-','1','0','6','9','-','A','2','D','D','-','0','8','0','0','2','B','3','0','3','0','9','D','}', 0 }; + static WCHAR *folders[] = { MyComputer, MyDocuments, RecycleBin, ControlPanel }; + IShellFolder *desktop; + ITEMIDLIST *pidl; + STRRET strret; + DWORD eaten; + HRESULT hr; + UINT i; + + hr = SHGetDesktopFolder(&desktop); + ok(hr == S_OK, "SHGetDesktopFolder failed with error 0x%08x\n", hr); + if (FAILED(hr)) return; + + for (i = 0; i < ARRAY_SIZE(folders); i++) + { + WCHAR name1[MAX_PATH], name2[MAX_PATH]; + + hr = IShellFolder_ParseDisplayName(desktop, NULL, NULL, folders[i], &eaten, &pidl, NULL); + ok(hr == S_OK, "IShellFolder::ParseDisplayName failed with error 0x%08x\n", hr); + if (FAILED(hr)) continue; + + hr = IShellFolder_GetDisplayNameOf(desktop, pidl, SHGDN_INFOLDER, &strret); + ok(hr == S_OK, "IShellFolder::GetDisplayNameOf failed with error 0x%08x\n", hr); + hr = StrRetToBufW(&strret, pidl, name1, ARRAY_SIZE(name1)); + ok(hr == S_OK, "StrRetToBuf failed with error 0x%08x\n", hr); + + hr = IShellFolder_GetDisplayNameOf(desktop, pidl, SHGDN_INFOLDER | SHGDN_FORPARSING | SHGDN_FORADDRESSBAR, &strret); + ok(hr == S_OK, "IShellFolder::GetDisplayNameOf failed with error 0x%08x\n", hr); + hr = StrRetToBufW(&strret, pidl, name2, ARRAY_SIZE(name2)); + ok(hr == S_OK, "StrRetToBuf failed with error 0x%08x\n", hr); + + ok(!lstrcmpW(name1, name2), "the display names are not equal: %s vs %s\n", wine_dbgstr_w(name1), wine_dbgstr_w(name2)); + ok(name1[0] != ':' || name1[1] != ':', "display name is a GUID: %s\n", wine_dbgstr_w(name1)); + + hr = IShellFolder_GetDisplayNameOf(desktop, pidl, SHGDN_INFOLDER | SHGDN_FORPARSING, &strret); + ok(hr == S_OK, "IShellFolder::GetDisplayNameOf failed with error 0x%08x\n", hr); + hr = StrRetToBufW(&strret, pidl, name1, ARRAY_SIZE(name1)); + ok(hr == S_OK, "StrRetToBuf failed with error 0x%08x\n", hr); + + ok(lstrcmpW(name1, name2), "the display names are equal: %s\n", wine_dbgstr_w(name1)); + ok(name1[0] == ':' && name1[1] == ':', "display name is not a GUID: %s\n", wine_dbgstr_w(name1)); + + ILFree(pidl); + } + IShellFolder_Release(desktop); +} + START_TEST(shfldr_special) { test_parse_for_entire_network(); test_parse_for_control_panel(); test_printers_folder(); test_desktop_folder(); + test_desktop_displaynameof(); }

1 0

Gabriel Ivăncescu : shell32/shfldr_mycomp: Use friendly name instead of GUID when SHGDN_FORADDRESSBAR is set.
by Alexandre Julliard 24 Jan '19

24 Jan '19

Module: wine Branch: master Commit: 889fce0887451aa2b67541fe9b6951d66c4805d7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=889fce0887451aa2b67541fe… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Jan 23 17:27:15 2019 +0200 shell32/shfldr_mycomp: Use friendly name instead of GUID when SHGDN_FORADDRESSBAR is set. On Windows, SHGDN_FORPARSING returns the GUID name of a special folder, but only when SHGDN_FORADDRESSBAR is not set. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shfldr_mycomp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/shell32/shfldr_mycomp.c b/dlls/shell32/shfldr_mycomp.c index 60f32f1..6a31e8c 100644 --- a/dlls/shell32/shfldr_mycomp.c +++ b/dlls/shell32/shfldr_mycomp.c @@ -615,7 +615,7 @@ static HRESULT WINAPI ISF_MyComputer_fnGetDisplayNameOf (IShellFolder2 *iface, clsid = _ILGetGUIDPointer (pidl); if (clsid) { - if (GET_SHGDN_FOR (dwFlags) & SHGDN_FORPARSING) + if ((GET_SHGDN_FOR (dwFlags) & (SHGDN_FORPARSING | SHGDN_FORADDRESSBAR)) == SHGDN_FORPARSING) { static const WCHAR clsidW[] = { 'C','L','S','I','D','\\',0 };

1 0

Gabriel Ivăncescu : shell32/shfldr_desktop: Use friendly name instead of GUID when SHGDN_FORADDRESSBAR is set.
by Alexandre Julliard 24 Jan '19

24 Jan '19

Module: wine Branch: master Commit: ba31ce27fd12714b2a290856df9752ba473994cb URL: https://source.winehq.org/git/wine.git/?a=commit;h=ba31ce27fd12714b2a290856… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Jan 23 17:27:14 2019 +0200 shell32/shfldr_desktop: Use friendly name instead of GUID when SHGDN_FORADDRESSBAR is set. On Windows, SHGDN_FORPARSING returns the GUID name of a special folder, but only when SHGDN_FORADDRESSBAR is not set. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shfldr_desktop.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/shell32/shfldr_desktop.c b/dlls/shell32/shfldr_desktop.c index d0b97c6..938871e 100644 --- a/dlls/shell32/shfldr_desktop.c +++ b/dlls/shell32/shfldr_desktop.c @@ -611,7 +611,7 @@ static HRESULT WINAPI ISF_Desktop_fnGetDisplayNameOf (IShellFolder2 * iface, if ((clsid = _ILGetGUIDPointer (pidl))) { - if (GET_SHGDN_FOR (dwFlags) & SHGDN_FORPARSING) + if ((GET_SHGDN_FOR (dwFlags) & (SHGDN_FORPARSING | SHGDN_FORADDRESSBAR)) == SHGDN_FORPARSING) { BOOL bWantsForParsing;

1 0

Dmitry Timoshkov : wininet: Return proper cache path from GetUrlCacheConfigInfo.
by Alexandre Julliard 24 Jan '19

24 Jan '19

Module: wine Branch: master Commit: 0cdca521e9bdf9838cd789cf3ef225a95cdaf6d5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0cdca521e9bdf9838cd789cf… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Jan 23 14:51:26 2019 +0800 wininet: Return proper cache path from GetUrlCacheConfigInfo. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/tests/urlcache.c | 2 - dlls/wininet/urlcache.c | 89 +++++++++++++++++++++++++++++++++++++++---- 2 files changed, 81 insertions(+), 10 deletions(-) diff --git a/dlls/wininet/tests/urlcache.c b/dlls/wininet/tests/urlcache.c index acd4ff2..c5e72ae 100644 --- a/dlls/wininet/tests/urlcache.c +++ b/dlls/wininet/tests/urlcache.c @@ -1184,10 +1184,8 @@ static void test_GetUrlCacheConfigInfo(void) SetLastError(0xdeadbeef); ret = GetUrlCacheConfigInfoA(td[i].info, NULL, td[i].flags); -todo_wine ok(ret == td[i].ret, "%d: expected %d, got %d\n", i, td[i].ret, ret); if (!ret) -todo_wine ok(GetLastError() == td[i].error, "%d: expected %u, got %u\n", i, td[i].error, GetLastError()); else { diff --git a/dlls/wininet/urlcache.c b/dlls/wininet/urlcache.c index f26fa34..4d422c9 100644 --- a/dlls/wininet/urlcache.c +++ b/dlls/wininet/urlcache.c @@ -23,6 +23,7 @@ */ #define NONAMELESSUNION +#define NONAMELESSSTRUCT #include "ws2tcpip.h" @@ -3764,21 +3765,93 @@ BOOL WINAPI SetUrlCacheEntryGroupW(LPCWSTR lpszUrlName, DWORD dwFlags, /*********************************************************************** * GetUrlCacheConfigInfoW (WININET.@) */ -BOOL WINAPI GetUrlCacheConfigInfoW(LPINTERNET_CACHE_CONFIG_INFOW CacheInfo, LPDWORD size, DWORD bitmask) +BOOL WINAPI GetUrlCacheConfigInfoW(LPINTERNET_CACHE_CONFIG_INFOW info, LPDWORD size, DWORD flags) { - FIXME("(%p, %p, %x)\n", CacheInfo, size, bitmask); - INTERNET_SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; + cache_container *container; + + FIXME("(%p, %p, %x): semi-stub\n", info, size, flags); + + if (!info) + { + INTERNET_SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + info->dwContainer = 0; + info->dwQuota = 0x3e800; /* FIXME */ + info->dwReserved4 = 0; + info->fPerUser = TRUE; + info->dwSyncMode = 0; + info->dwNumCachePaths = 1; + info->dwNormalUsage = 0; + info->dwExemptUsage = 0; + + info->u.s.CachePath[0] = 0; + info->u.s.dwCacheSize = 0x3e800; /* FIXME */ + + LIST_FOR_EACH_ENTRY(container, &UrlContainers, cache_container, entry) + { + switch (flags & (CACHE_CONFIG_CONTENT_PATHS_FC | CACHE_CONFIG_COOKIES_PATHS_FC | CACHE_CONFIG_HISTORY_PATHS_FC)) + { + case 0: + case CACHE_CONFIG_CONTENT_PATHS_FC: + if (container->default_entry_type == NORMAL_CACHE_ENTRY) + lstrcpynW(info->u.s.CachePath, container->path, MAX_PATH); + break; + + case CACHE_CONFIG_COOKIES_PATHS_FC: + if (container->default_entry_type == COOKIE_CACHE_ENTRY) + lstrcpynW(info->u.s.CachePath, container->path, MAX_PATH); + break; + + case CACHE_CONFIG_HISTORY_PATHS_FC: + if (container->default_entry_type == URLHISTORY_CACHE_ENTRY) + lstrcpynW(info->u.s.CachePath, container->path, MAX_PATH); + break; + + default: + FIXME("flags %08x not handled\n", flags); + break; + } + } + + TRACE("CachePath %s\n", debugstr_w(info->u.s.CachePath)); + + return TRUE; } /*********************************************************************** * GetUrlCacheConfigInfoA (WININET.@) */ -BOOL WINAPI GetUrlCacheConfigInfoA(LPINTERNET_CACHE_CONFIG_INFOA CacheInfo, LPDWORD size, DWORD bitmask) +BOOL WINAPI GetUrlCacheConfigInfoA(LPINTERNET_CACHE_CONFIG_INFOA info, LPDWORD size, DWORD flags) { - FIXME("(%p, %p, %x)\n", CacheInfo, size, bitmask); - INTERNET_SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; + INTERNET_CACHE_CONFIG_INFOW infoW; + + TRACE("(%p, %p, %x)\n", info, size, flags); + + if (!info) + { + INTERNET_SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + infoW.dwStructSize = sizeof(infoW); + if (!GetUrlCacheConfigInfoW(&infoW, size, flags)) + return FALSE; + + info->dwContainer = infoW.dwContainer; + info->dwQuota = infoW.dwQuota; + info->dwReserved4 = infoW.dwReserved4; + info->fPerUser = infoW.fPerUser; + info->dwSyncMode = infoW.dwSyncMode; + info->dwNumCachePaths = infoW.dwNumCachePaths; + info->dwNormalUsage = infoW.dwNormalUsage; + info->dwExemptUsage = infoW.dwExemptUsage; + + info->u.s.dwCacheSize = infoW.u.s.dwCacheSize; + WideCharToMultiByte(CP_ACP, 0, infoW.u.s.CachePath, -1, info->u.s.CachePath, MAX_PATH, NULL, NULL); + + return TRUE; } BOOL WINAPI GetUrlCacheGroupAttributeA( GROUPID gid, DWORD dwFlags, DWORD dwAttributes,

1 0

Nikolay Sivov : user32/dialog: Fix setting negative dialog item ids.
by Alexandre Julliard 24 Jan '19

24 Jan '19

Module: wine Branch: master Commit: 47a44e6d9c4ffafce562f73d31fa3318b229ab3a URL: https://source.winehq.org/git/wine.git/?a=commit;h=47a44e6d9c4ffafce562f73d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jan 24 11:52:01 2019 +0300 user32/dialog: Fix setting negative dialog item ids. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46494 Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/dialog.c | 4 ++-- dlls/user32/tests/dialog.c | 41 +++++++++++++++++++++++++++++++++++++++++ dlls/user32/tests/resource.rc | 9 +++++++++ dlls/user32/user_private.h | 1 + 4 files changed, 53 insertions(+), 2 deletions(-) diff --git a/dlls/user32/dialog.c b/dlls/user32/dialog.c index 72e6eee..deaeb84 100644 --- a/dlls/user32/dialog.c +++ b/dlls/user32/dialog.c @@ -131,8 +131,8 @@ static const WORD *DIALOG_GetControl32( const WORD *p, DLG_CONTROL_INFO *info, if (dialogEx) { - /* id is a DWORD for DIALOGEX */ - info->id = GET_DWORD(p); + /* id is 4 bytes for DIALOGEX */ + info->id = GET_LONG(p); p += 2; } else diff --git a/dlls/user32/tests/dialog.c b/dlls/user32/tests/dialog.c index 8c9bd21..070ddce 100644 --- a/dlls/user32/tests/dialog.c +++ b/dlls/user32/tests/dialog.c @@ -1181,9 +1181,47 @@ static void test_GetDlgItemText(void) "string retrieved using GetDlgItemText should have been NULL terminated\n"); } +static INT_PTR CALLBACK getdlgitem_test_dialog_proc(HWND hdlg, UINT msg, WPARAM wparam, LPARAM lparam) +{ + if (msg == WM_INITDIALOG) + { + char text[64]; + LONG_PTR val; + HWND hwnd; + BOOL ret; + + hwnd = GetDlgItem(hdlg, -1); + ok(hwnd != NULL, "Expected dialog item.\n"); + + *text = 0; + ret = GetDlgItemTextA(hdlg, -1, text, ARRAY_SIZE(text)); + ok(ret && !strcmp(text, "Text1"), "Unexpected item text.\n"); + + val = GetWindowLongA(hwnd, GWLP_ID); + ok(val == -1, "Unexpected id.\n"); + + val = GetWindowLongPtrA(hwnd, GWLP_ID); + ok(val == -1, "Unexpected id %ld.\n", val); + + hwnd = GetDlgItem(hdlg, -2); + ok(hwnd != NULL, "Expected dialog item.\n"); + + val = GetWindowLongA(hwnd, GWLP_ID); + ok(val == -2, "Unexpected id.\n"); + + val = GetWindowLongPtrA(hwnd, GWLP_ID); + ok(val == -2, "Unexpected id %ld.\n", val); + + EndDialog(hdlg, 0xdead); + } + + return FALSE; +} + static void test_GetDlgItem(void) { HWND hwnd, child1, child2, hwnd2; + INT_PTR retval; BOOL ret; hwnd = CreateWindowA("button", "parent", WS_VISIBLE, 0, 0, 100, 100, NULL, 0, g_hinst, NULL); @@ -1230,6 +1268,9 @@ static void test_GetDlgItem(void) DestroyWindow(child1); DestroyWindow(child2); DestroyWindow(hwnd); + + retval = DialogBoxParamA(g_hinst, "GETDLGITEM_TEST_DIALOG", NULL, getdlgitem_test_dialog_proc, 0); + ok(retval == 0xdead, "Unexpected return value.\n"); } static INT_PTR CALLBACK DestroyDlgWinProc (HWND hDlg, UINT uiMsg, diff --git a/dlls/user32/tests/resource.rc b/dlls/user32/tests/resource.rc index 3823ed3..4301af6 100644 --- a/dlls/user32/tests/resource.rc +++ b/dlls/user32/tests/resource.rc @@ -237,6 +237,15 @@ FONT 8, "MS Sans Serif" CONTROL "oddlengthtext", -1, "TESTCONTROL", WS_CHILD|WS_VISIBLE|WS_BORDER|WS_TABSTOP, 10,60,100,50 { 1,2,3,4,5 } } +GETDLGITEM_TEST_DIALOG DIALOGEX 6, 15, 207, 111 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Test Dialog" +FONT 8, "MS Shell Dlg" +{ + LTEXT "Text1",-1,10,10,100,50 + LTEXT "Text2",-2,10,10,100,50 +} + /* @makedep: test_mono.bmp */ 100 BITMAP test_mono.bmp diff --git a/dlls/user32/user_private.h b/dlls/user32/user_private.h index bf02ee5..514cf67 100644 --- a/dlls/user32/user_private.h +++ b/dlls/user32/user_private.h @@ -33,6 +33,7 @@ #define GET_WORD(ptr) (*(const WORD *)(ptr)) #define GET_DWORD(ptr) (*(const DWORD *)(ptr)) +#define GET_LONG(ptr) (*(const LONG *)(ptr)) #define WM_SYSTIMER 0x0118 #define WM_POPUPSYSTEMMENU 0x0313

1 0

Joshua Ashton : include: Add a few missing d3d9 constants.
by Alexandre Julliard 24 Jan '19

24 Jan '19

Module: wine Branch: master Commit: 9f258dab603334d95115e7170144c8031affcbd3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9f258dab603334d95115e717… Author: Joshua Ashton <joshua(a)froggi.es> Date: Thu Jan 24 20:39:01 2019 +0330 include: Add a few missing d3d9 constants. Signed-off-by: Joshua Ashton <joshua(a)froggi.es> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/d3d9.h | 2 ++ include/d3d9types.h | 3 +++ 2 files changed, 5 insertions(+) diff --git a/include/d3d9.h b/include/d3d9.h index ef3ea2a9..3ebde45 100644 --- a/include/d3d9.h +++ b/include/d3d9.h @@ -65,8 +65,10 @@ #define D3DPRESENT_DONOTWAIT __MSABI_LONG(1) #define D3DPRESENT_LINEAR_CONTENT __MSABI_LONG(2) #define D3DPRESENT_BACK_BUFFERS_MAX __MSABI_LONG(3) +#define D3DPRESENT_BACK_BUFFERS_MAX_EX __MSABI_LONG(30) #define D3DSGR_NO_CALIBRATION __MSABI_LONG(0x00000000) #define D3DSGR_CALIBRATE __MSABI_LONG(0x00000001) +#define D3DCURSOR_IMMEDIATE_UPDATE __MSABI_LONG(0x00000001) #define _FACD3D 0x876 #define MAKE_D3DHRESULT( code ) MAKE_HRESULT( 1, _FACD3D, code ) diff --git a/include/d3d9types.h b/include/d3d9types.h index 4891858..56394df 100644 --- a/include/d3d9types.h +++ b/include/d3d9types.h @@ -481,6 +481,9 @@ typedef enum _D3DSHADER_INSTRUCTION_OPCODE_TYPE { #define D3DSP_DCL_USAGEINDEX_SHIFT 16 #define D3DSP_DCL_USAGEINDEX_MASK 0x000f0000 +#define D3DSP_OPCODESPECIFICCONTROL_SHIFT 16 +#define D3DSP_OPCODESPECIFICCONTROL_MASK 0x00ff0000 + #define D3DSP_TEXTURETYPE_SHIFT 27 #define D3DSP_TEXTURETYPE_MASK 0x78000000

1 0

← Newer
1
...
19
20
21
22
23
24
25
...
50
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits January 2019