January 2019 - Wine-devel - list.winehq.org

[PATCH v2 1/3] mfreadwrite: Create importlib
by Alistair Leslie-Hughes 29 Jan '19

29 Jan '19

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/mfreadwrite/Makefile.in | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/mfreadwrite/Makefile.in b/dlls/mfreadwrite/Makefile.in index 7cf3a59..4b8ee82 100644 --- a/dlls/mfreadwrite/Makefile.in +++ b/dlls/mfreadwrite/Makefile.in @@ -1,4 +1,5 @@ MODULE = mfreadwrite.dll +IMPORTLIB = mfreadwrite C_SRCS = \ main.c -- 1.9.1

1 0

[PATCH 2/3] mfreadwrite: Add initial tests
by Alistair Leslie-Hughes 29 Jan '19

29 Jan '19

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- configure | 1 + configure.ac | 1 + dlls/mfreadwrite/tests/Makefile.in | 5 ++ dlls/mfreadwrite/tests/mfplat.c | 108 +++++++++++++++++++++++++++++++++++++ 4 files changed, 115 insertions(+) create mode 100644 dlls/mfreadwrite/tests/Makefile.in create mode 100644 dlls/mfreadwrite/tests/mfplat.c diff --git a/configure b/configure index b3a360e..663b6dc 100755 --- a/configure +++ b/configure @@ -19692,6 +19692,7 @@ wine_fn_config_makefile dlls/mf3216 enable_mf3216 wine_fn_config_makefile dlls/mfplat enable_mfplat wine_fn_config_makefile dlls/mfplat/tests enable_tests wine_fn_config_makefile dlls/mfreadwrite enable_mfreadwrite +wine_fn_config_makefile dlls/mfreadwrite/tests enable_tests wine_fn_config_makefile dlls/mfuuid enable_mfuuid wine_fn_config_makefile dlls/mgmtapi enable_mgmtapi wine_fn_config_makefile dlls/midimap enable_midimap diff --git a/configure.ac b/configure.ac index 119c4ce..1b425d2 100644 --- a/configure.ac +++ b/configure.ac @@ -3431,6 +3431,7 @@ WINE_CONFIG_MAKEFILE(dlls/mf3216) WINE_CONFIG_MAKEFILE(dlls/mfplat) WINE_CONFIG_MAKEFILE(dlls/mfplat/tests) WINE_CONFIG_MAKEFILE(dlls/mfreadwrite) +WINE_CONFIG_MAKEFILE(dlls/mfreadwrite/tests) WINE_CONFIG_MAKEFILE(dlls/mfuuid) WINE_CONFIG_MAKEFILE(dlls/mgmtapi) WINE_CONFIG_MAKEFILE(dlls/midimap) diff --git a/dlls/mfreadwrite/tests/Makefile.in b/dlls/mfreadwrite/tests/Makefile.in new file mode 100644 index 0000000..5c906a1 --- /dev/null +++ b/dlls/mfreadwrite/tests/Makefile.in @@ -0,0 +1,5 @@ +TESTDLL = mfreadwrite.dll +IMPORTS = ole32 mfplat mfreadwrite mfuuid + +C_SRCS = \ + mfplat.c diff --git a/dlls/mfreadwrite/tests/mfplat.c b/dlls/mfreadwrite/tests/mfplat.c new file mode 100644 index 0000000..700b61b --- /dev/null +++ b/dlls/mfreadwrite/tests/mfplat.c @@ -0,0 +1,108 @@ +/* + * Copyright 2018 Alistair Leslie-Hughes + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> +#include <string.h> + +#define COBJMACROS + +#include "windef.h" +#include "winbase.h" +#include "winuser.h" +#include "winreg.h" + +#include "mfapi.h" +#include "mfidl.h" +#include "mferror.h" +#include "mfreadwrite.h" + +#include "wine/test.h" + +#include "initguid.h" +DEFINE_GUID(MF_READWRITE_MMCSS_PRIORITY_AUDIO,0x273db885, 0x2de2, 0x4db2, 0xa6, 0xa7, 0xfd, 0xb6, 0x6f, 0xb4, 0x0b, 0x61); +DEFINE_GUID(MF_READWRITE_MMCSS_CLASS_AUDIO, 0x430847da, 0x0890, 0x4b0e, 0x93, 0x8c, 0x05, 0x43, 0x32, 0xc5, 0x47, 0xe1); + +static HRESULT (WINAPI *pMFCreateMFByteStreamOnStream)(IStream *stream, IMFByteStream **bytestream); + +static void init_functions(void) +{ + HMODULE mod = GetModuleHandleA("mfplat.dll"); + +#define X(f) if (!(p##f = (void*)GetProcAddress(mod, #f))) return; + X(MFCreateMFByteStreamOnStream); +#undef X +} + +static void test_MFCreateSourceReaderFromByteStream(void) +{ + static const WCHAR audio[] = {'A','u','d','i','o',0}; + IMFSourceReader *source; + IMFAttributes *attributes; + IMFByteStream *bytestream = NULL; + IStream *stream = NULL; + HRESULT hr; + + if(!pMFCreateMFByteStreamOnStream) + { + win_skip("MFCreateMFByteStreamOnStream() not found\n"); + return; + } + + hr = MFCreateAttributes( &attributes, 3 ); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IMFAttributes_SetString(attributes, &MF_READWRITE_MMCSS_CLASS_AUDIO, audio); + todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IMFAttributes_SetUINT32(attributes, &MF_READWRITE_MMCSS_PRIORITY_AUDIO, 0); + todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = CreateStreamOnHGlobal(NULL, TRUE, &stream); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = pMFCreateMFByteStreamOnStream(stream, &bytestream); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = MFCreateSourceReaderFromByteStream(bytestream, attributes, &source); + ok(hr == S_OK, "got 0x%08x\n", hr); + + if(stream) + IStream_Release(stream); + if(bytestream) + IMFByteStream_Release(bytestream); + IMFAttributes_Release(attributes); + IMFSourceReader_Release(source); +} + +START_TEST(mfplat) +{ + HRESULT hr; + + CoInitialize(NULL); + + hr = MFStartup(MF_VERSION, MFSTARTUP_FULL); + ok(hr == S_OK, "got 0x%08x\n", hr); + + init_functions(); + + test_MFCreateSourceReaderFromByteStream(); + + MFShutdown(); + + CoUninitialize(); +} -- 1.9.1

2 1

[PATCH 3/3] include: Add MFSetAttributeSize/MFSetAttributeRatio inline functions
by Alistair Leslie-Hughes 29 Jan '19

29 Jan '19

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- include/mfidl.idl | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/include/mfidl.idl b/include/mfidl.idl index 2373e41..124ae3c 100644 --- a/include/mfidl.idl +++ b/include/mfidl.idl @@ -349,3 +349,14 @@ cpp_quote("#define MF_RESOLUTION_KEEP_BYTE_STREAM_ALIVE_ON_FAIL cpp_quote("#define MF_RESOLUTION_READ 0x00010000") cpp_quote("#define MF_RESOLUTION_WRITE 0x00020000") cpp_quote("#define MF_RESOLUTION_DISABLE_LOCAL_PLUGINS 0x00000040") + +cpp_quote("#ifdef __cplusplus") +cpp_quote("static inline HRESULT MFSetAttributeSize(IMFAttributes *attributes, REFGUID key, UINT32 width, UINT32 height)") +cpp_quote("{") +cpp_quote(" return attributes->SetUINT64(key, ((UINT64)width << 32) | height);") +cpp_quote("}") +cpp_quote("static inline HRESULT MFSetAttributeRatio(IMFAttributes *attributes, REFGUID key, UINT32 numerator, UINT32 denominator)") +cpp_quote("{") +cpp_quote(" return attributes->SetUINT64(key, ((UINT64)numerator << 32) | denominator);") +cpp_quote("}") +cpp_quote("#endif") -- 1.9.1

1 0

[PATCH 1/3] mfreadwrite: Create importlib
by Alistair Leslie-Hughes 29 Jan '19

29 Jan '19

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/mfreadwrite/Makefile.in | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/mfreadwrite/Makefile.in b/dlls/mfreadwrite/Makefile.in index 7cf3a59..4b8ee82 100644 --- a/dlls/mfreadwrite/Makefile.in +++ b/dlls/mfreadwrite/Makefile.in @@ -1,4 +1,5 @@ MODULE = mfreadwrite.dll +IMPORTLIB = mfreadwrite C_SRCS = \ main.c -- 1.9.1

1 0

[PATCH 1/3] ntoskrnl.exe: Implement DPC-level queued spinlock functions.
by Zebediah Figura 29 Jan '19

29 Jan '19

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 4 +- dlls/ntoskrnl.exe/sync.c | 65 +++++++++++++++++++++++++++++ 2 files changed, 67 insertions(+), 2 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 33aa108cd7..3ee0e1f808 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -42,9 +42,9 @@ @ stdcall -norelay IofCallDriver(ptr ptr) @ stdcall -norelay IofCompleteRequest(ptr long) @ stdcall -norelay KeAcquireInStackQueuedSpinLock(ptr ptr) -@ stub KeAcquireInStackQueuedSpinLockAtDpcLevel +@ stdcall -norelay KeAcquireInStackQueuedSpinLockAtDpcLevel(ptr ptr) @ stdcall -norelay KeReleaseInStackQueuedSpinLock(ptr) -@ stub KeReleaseInStackQueuedSpinLockFromDpcLevel +@ stdcall -norelay KeReleaseInStackQueuedSpinLockFromDpcLevel(ptr) @ stub KeSetTimeUpdateNotifyRoutine @ stub KefAcquireSpinLockAtDpcLevel @ stub KefReleaseSpinLockFromDpcLevel diff --git a/dlls/ntoskrnl.exe/sync.c b/dlls/ntoskrnl.exe/sync.c index 2a4685c5b3..4dc1fc3511 100644 --- a/dlls/ntoskrnl.exe/sync.c +++ b/dlls/ntoskrnl.exe/sync.c @@ -414,6 +414,71 @@ void WINAPI KeReleaseSpinLockFromDpcLevel( KSPIN_LOCK *lock ) InterlockedExchangePointer( (void **)lock, 0 ); } +#define QUEUED_SPINLOCK_OWNED 0x2 + +/*********************************************************************** + * KeAcquireInStackQueuedSpinLockAtDpcLevel (NTOSKRNL.EXE.@) + */ +#ifdef DEFINE_FASTCALL2_ENTRYPOINT +DEFINE_FASTCALL2_ENTRYPOINT( KeAcquireInStackQueuedSpinLockAtDpcLevel ) +void WINAPI DECLSPEC_HIDDEN __regs_KeAcquireInStackQueuedSpinLockAtDpcLevel( KSPIN_LOCK *lock, KLOCK_QUEUE_HANDLE *queue ) +#else +void WINAPI KeAcquireInStackQueuedSpinLockAtDpcLevel( KSPIN_LOCK *lock, KLOCK_QUEUE_HANDLE *queue ) +#endif +{ + KSPIN_LOCK_QUEUE *tail; + + TRACE("lock %p, queue %p.\n", lock, queue); + + queue->LockQueue.Next = NULL; + + if (!(tail = InterlockedExchangePointer( (void **)lock, &queue->LockQueue ))) + queue->LockQueue.Lock = (KSPIN_LOCK *)((ULONG_PTR)lock | QUEUED_SPINLOCK_OWNED); + else + { + queue->LockQueue.Lock = lock; + InterlockedExchangePointer( (void **)&tail->Next, &queue->LockQueue ); + + while (!((ULONG_PTR)InterlockedCompareExchangePointer( (void **)&queue->LockQueue.Lock, 0, 0 ) + & QUEUED_SPINLOCK_OWNED)) + { + small_pause(); + } + } +} + +/*********************************************************************** + * KeReleaseInStackQueuedSpinLockFromDpcLevel (NTOSKRNL.EXE.@) + */ +#ifdef DEFINE_FASTCALL1_ENTRYPOINT +DEFINE_FASTCALL1_ENTRYPOINT( KeReleaseInStackQueuedSpinLockFromDpcLevel ) +void WINAPI DECLSPEC_HIDDEN __regs_KeReleaseInStackQueuedSpinLockFromDpcLevel( KLOCK_QUEUE_HANDLE *queue ) +#else +void WINAPI KeReleaseInStackQueuedSpinLockFromDpcLevel( KLOCK_QUEUE_HANDLE *queue ) +#endif +{ + KSPIN_LOCK *lock = (KSPIN_LOCK *)((ULONG_PTR)queue->LockQueue.Lock & ~QUEUED_SPINLOCK_OWNED); + KSPIN_LOCK_QUEUE *next; + + TRACE("lock %p, queue %p.\n", lock, queue); + + queue->LockQueue.Lock = NULL; + + if (!(next = queue->LockQueue.Next)) + { + /* If we are truly the last in the queue, the lock will point to us. */ + if (InterlockedCompareExchangePointer( (void **)lock, NULL, &queue->LockQueue ) == queue) + return; + + /* Otherwise, someone just queued themselves, but hasn't yet set + * themselves as successor. Spin waiting for them to do so. */ + while (!(next = queue->LockQueue.Next)) + small_pause(); + } + + InterlockedExchangePointer( (void **)&next->Lock, (KSPIN_LOCK *)((ULONG_PTR)lock | QUEUED_SPINLOCK_OWNED) ); +} + #ifndef __i386__ /*********************************************************************** * KeReleaseSpinLock (NTOSKRNL.EXE.@) -- 2.20.1

1 2

[PATCH v2] comdlg32: Improve PRINT32 dialog
by Alistair Leslie-Hughes 29 Jan '19

29 Jan '19

- Corrected TAB order to be the same as windows - Moved Help button to Bottom Right, align top with OK/Cancel buttons. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/comdlg32/comdlg32.rc | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/dlls/comdlg32/comdlg32.rc b/dlls/comdlg32/comdlg32.rc index 22a5a93..e4a5a63 100644 --- a/dlls/comdlg32/comdlg32.rc +++ b/dlls/comdlg32/comdlg32.rc @@ -354,16 +354,12 @@ STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | DS_CONTEXTHELP | DS_3DLOOK CAPTION "Print" FONT 8, "MS Shell Dlg" -{ - DEFPUSHBUTTON "OK", IDOK, 176,164, 50,14, WS_GROUP | BS_DEFPUSHBUTTON - PUSHBUTTON "Cancel", IDCANCEL, 230,164, 50,14, WS_GROUP - PUSHBUTTON "&Help", pshHelp, 50, 161, 50,14, WS_GROUP - +BEGIN GROUPBOX "Printer", grp4, 8, 4, 272,84, WS_GROUP - CONTROL "Print to fi&le", chx1, "Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,185,36,90,16 + COMBOBOX cmb4, 52, 18, 152,152,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP PUSHBUTTON "&Properties", psh2, 212, 17, 60,14, WS_GROUP + CONTROL "Print to fi&le", chx1, "Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,185,36,90,16 LTEXT "&Name:", stc6, 16, 20, 36,8 - COMBOBOX cmb4, 52, 18, 152,152,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP LTEXT "Status:", stc8, 16, 36, 47,10, SS_NOPREFIX LTEXT "", stc12, 65, 36, 120,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP LTEXT "Type:", stc7, 16, 48, 47,10, SS_NOPREFIX @@ -373,12 +369,6 @@ FONT 8, "MS Shell Dlg" LTEXT "Comment:", stc9, 16, 72, 47,10, SS_NOPREFIX LTEXT "", stc13, 65, 72, 212,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP - GROUPBOX "Copies", grp2, 160, 92, 120,64, WS_GROUP - LTEXT "Number of &copies:",stc5,168,105,68,8 - ICON "", ico3, 170,131, 76,24, WS_GROUP | SS_CENTERIMAGE - CONTROL "C&ollate", chx2,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,168,118,100,12 - EDITTEXT edt3, 240,103, 32,12, WS_GROUP | ES_NUMBER - GROUPBOX "Print range", grp1, 8,92, 144,64, WS_GROUP CONTROL "&All", rad1,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,106,64,12 CONTROL "Pa&ges", rad3,"Button",BS_AUTORADIOBUTTON,16,122,36,12 @@ -387,7 +377,17 @@ FONT 8, "MS Shell Dlg" EDITTEXT edt2, 120,122, 26,12, WS_GROUP | ES_NUMBER RTEXT "&from:", stc2, 52,124, 20,8 RTEXT "&to:", stc3, 99,124, 20,8 -} + + GROUPBOX "Copies", grp2, 160, 92, 120,64, WS_GROUP + LTEXT "Number of &copies:",stc5,168,105,68,8 + ICON "", ico3, 170,131, 76,24, WS_GROUP | SS_CENTERIMAGE + CONTROL "C&ollate", chx2,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,168,118,100,12 + EDITTEXT edt3, 240,103, 32,12, WS_GROUP | ES_NUMBER + + DEFPUSHBUTTON "OK", IDOK, 176,164, 50,14, WS_GROUP | BS_DEFPUSHBUTTON + PUSHBUTTON "Cancel", IDCANCEL, 230,164, 50,14, WS_GROUP + PUSHBUTTON "&Help", pshHelp, 50, 164, 50,14, WS_GROUP +END PRINT32_SETUP DIALOG 32, 32, 288, 178 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | DS_CONTEXTHELP | DS_3DLOOK -- 1.9.1

1 0

[PATCH 1/3] debug.h: cleanup TRACE macros
by Konstantin Kharlamov 28 Jan '19

28 Jan '19

The complex "#ifdef WINE_NO_TRACE_MSGS && __compiler__" ladder below reduces to "ignore WINE_NO_TRACE_MSGS when !__GNUC__ && !__SUNPRO_C", which is probably a bug. The other nuance is the removed "args" prefix, which is a GNU extension, and was not used anyway. Let's just define all of that in a single place. Signed-off-by: Konstantin Kharlamov <Hi-Angel(a)yandex.ru> --- include/wine/debug.h | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-) diff --git a/include/wine/debug.h b/include/wine/debug.h index 07ac88d264..069e754dfe 100644 --- a/include/wine/debug.h +++ b/include/wine/debug.h @@ -59,8 +59,12 @@ struct __wine_debug_channel #ifndef WINE_NO_TRACE_MSGS # define __WINE_GET_DEBUGGING_TRACE(dbch) ((dbch)->flags & (1 << __WINE_DBCL_TRACE)) +# define WINE_TRACE __WINE_DPRINTF(_TRACE,__wine_dbch___default) +# define WINE_TRACE_(ch) __WINE_DPRINTF(_TRACE,&__wine_dbch_##ch) #else # define __WINE_GET_DEBUGGING_TRACE(dbch) 0 +# define WINE_TRACE(args...) do { } while(0) +# define WINE_TRACE_(ch) WINE_TRACE #endif #ifndef WINE_NO_DEBUG_MSGS @@ -92,12 +96,6 @@ struct __wine_debug_channel #define __WINE_PRINTF_ATTR(fmt,args) __attribute__((format (printf,fmt,args))) - -#ifdef WINE_NO_TRACE_MSGS -#define WINE_TRACE(args...) do { } while(0) -#define WINE_TRACE_(ch) WINE_TRACE -#endif - #ifdef WINE_NO_DEBUG_MSGS #define WINE_WARN(args...) do { } while(0) #define WINE_WARN_(ch) WINE_WARN @@ -118,11 +116,6 @@ struct __wine_debug_channel #define __WINE_PRINTF_ATTR(fmt,args) -#ifdef WINE_NO_TRACE_MSGS -#define WINE_TRACE(...) do { } while(0) -#define WINE_TRACE_(ch) WINE_TRACE -#endif - #ifdef WINE_NO_DEBUG_MSGS #define WINE_WARN(...) do { } while(0) #define WINE_WARN_(ch) WINE_WARN @@ -337,10 +330,6 @@ static inline const char *wine_dbgstr_variant( const VARIANT *v ) #endif /* defined(__oaidl_h__) && defined(V_VT) */ -#ifndef WINE_TRACE -#define WINE_TRACE __WINE_DPRINTF(_TRACE,__wine_dbch___default) -#define WINE_TRACE_(ch) __WINE_DPRINTF(_TRACE,&__wine_dbch_##ch) -#endif #define WINE_TRACE_ON(ch) __WINE_IS_DEBUG_ON(_TRACE,&__wine_dbch_##ch) #ifndef WINE_WARN -- 2.20.1

3 12

[PATCH] d3dx9: Use wincodecs directly without initializing COM system.
by Nikolay Sivov 28 Jan '19

28 Jan '19

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d3dx9_24/Makefile.in | 1 + dlls/d3dx9_25/Makefile.in | 1 + dlls/d3dx9_26/Makefile.in | 1 + dlls/d3dx9_27/Makefile.in | 1 + dlls/d3dx9_28/Makefile.in | 1 + dlls/d3dx9_29/Makefile.in | 1 + dlls/d3dx9_30/Makefile.in | 1 + dlls/d3dx9_31/Makefile.in | 1 + dlls/d3dx9_32/Makefile.in | 1 + dlls/d3dx9_33/Makefile.in | 1 + dlls/d3dx9_34/Makefile.in | 1 + dlls/d3dx9_35/Makefile.in | 1 + dlls/d3dx9_36/Makefile.in | 1 + dlls/d3dx9_36/surface.c | 37 +++++++++++++------------------------ dlls/d3dx9_37/Makefile.in | 1 + dlls/d3dx9_38/Makefile.in | 1 + dlls/d3dx9_39/Makefile.in | 1 + dlls/d3dx9_40/Makefile.in | 1 + dlls/d3dx9_41/Makefile.in | 1 + dlls/d3dx9_42/Makefile.in | 1 + dlls/d3dx9_43/Makefile.in | 1 + 21 files changed, 33 insertions(+), 24 deletions(-) diff --git a/dlls/d3dx9_24/Makefile.in b/dlls/d3dx9_24/Makefile.in index 482c92d64e..02e64d3a89 100644 --- a/dlls/d3dx9_24/Makefile.in +++ b/dlls/d3dx9_24/Makefile.in @@ -2,6 +2,7 @@ EXTRADEFS = -DD3DX_SDK_VERSION=24 MODULE = d3dx9_24.dll IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 PARENTSRC = ../d3dx9_36 +DELAYIMPORTS = windowscodecs C_SRCS = \ animation.c \ diff --git a/dlls/d3dx9_25/Makefile.in b/dlls/d3dx9_25/Makefile.in index be4c76980e..57ed1da74a 100644 --- a/dlls/d3dx9_25/Makefile.in +++ b/dlls/d3dx9_25/Makefile.in @@ -2,6 +2,7 @@ EXTRADEFS = -DD3DX_SDK_VERSION=25 MODULE = d3dx9_25.dll IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 PARENTSRC = ../d3dx9_36 +DELAYIMPORTS = windowscodecs C_SRCS = \ animation.c \ diff --git a/dlls/d3dx9_26/Makefile.in b/dlls/d3dx9_26/Makefile.in index c5e9e85bfb..04d9ba4df4 100644 --- a/dlls/d3dx9_26/Makefile.in +++ b/dlls/d3dx9_26/Makefile.in @@ -2,6 +2,7 @@ EXTRADEFS = -DD3DX_SDK_VERSION=26 MODULE = d3dx9_26.dll IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 PARENTSRC = ../d3dx9_36 +DELAYIMPORTS = windowscodecs C_SRCS = \ animation.c \ diff --git a/dlls/d3dx9_27/Makefile.in b/dlls/d3dx9_27/Makefile.in index ee7f0e2449..faec9b20dd 100644 --- a/dlls/d3dx9_27/Makefile.in +++ b/dlls/d3dx9_27/Makefile.in @@ -2,6 +2,7 @@ EXTRADEFS = -DD3DX_SDK_VERSION=27 MODULE = d3dx9_27.dll IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 PARENTSRC = ../d3dx9_36 +DELAYIMPORTS = windowscodecs C_SRCS = \ animation.c \ diff --git a/dlls/d3dx9_28/Makefile.in b/dlls/d3dx9_28/Makefile.in index 094420013d..b8aad93aa7 100644 --- a/dlls/d3dx9_28/Makefile.in +++ b/dlls/d3dx9_28/Makefile.in @@ -2,6 +2,7 @@ EXTRADEFS = -DD3DX_SDK_VERSION=28 MODULE = d3dx9_28.dll IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 PARENTSRC = ../d3dx9_36 +DELAYIMPORTS = windowscodecs C_SRCS = \ animation.c \ diff --git a/dlls/d3dx9_29/Makefile.in b/dlls/d3dx9_29/Makefile.in index 88cb110ff5..29c76c4a74 100644 --- a/dlls/d3dx9_29/Makefile.in +++ b/dlls/d3dx9_29/Makefile.in @@ -2,6 +2,7 @@ EXTRADEFS = -DD3DX_SDK_VERSION=29 MODULE = d3dx9_29.dll IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 PARENTSRC = ../d3dx9_36 +DELAYIMPORTS = windowscodecs C_SRCS = \ animation.c \ diff --git a/dlls/d3dx9_30/Makefile.in b/dlls/d3dx9_30/Makefile.in index 6ab2ff2451..810edc9a20 100644 --- a/dlls/d3dx9_30/Makefile.in +++ b/dlls/d3dx9_30/Makefile.in @@ -2,6 +2,7 @@ EXTRADEFS = -DD3DX_SDK_VERSION=30 MODULE = d3dx9_30.dll IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 PARENTSRC = ../d3dx9_36 +DELAYIMPORTS = windowscodecs C_SRCS = \ animation.c \ diff --git a/dlls/d3dx9_31/Makefile.in b/dlls/d3dx9_31/Makefile.in index 3d44da147d..fce2b53e1e 100644 --- a/dlls/d3dx9_31/Makefile.in +++ b/dlls/d3dx9_31/Makefile.in @@ -2,6 +2,7 @@ EXTRADEFS = -DD3DX_SDK_VERSION=31 MODULE = d3dx9_31.dll IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 PARENTSRC = ../d3dx9_36 +DELAYIMPORTS = windowscodecs C_SRCS = \ animation.c \ diff --git a/dlls/d3dx9_32/Makefile.in b/dlls/d3dx9_32/Makefile.in index 37cc2797af..ad53b260d0 100644 --- a/dlls/d3dx9_32/Makefile.in +++ b/dlls/d3dx9_32/Makefile.in @@ -2,6 +2,7 @@ EXTRADEFS = -DD3DX_SDK_VERSION=32 MODULE = d3dx9_32.dll IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 PARENTSRC = ../d3dx9_36 +DELAYIMPORTS = windowscodecs C_SRCS = \ animation.c \ diff --git a/dlls/d3dx9_33/Makefile.in b/dlls/d3dx9_33/Makefile.in index 5b03ec134d..318ddce1ac 100644 --- a/dlls/d3dx9_33/Makefile.in +++ b/dlls/d3dx9_33/Makefile.in @@ -2,6 +2,7 @@ EXTRADEFS = -DD3DX_SDK_VERSION=33 MODULE = d3dx9_33.dll IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 PARENTSRC = ../d3dx9_36 +DELAYIMPORTS = windowscodecs C_SRCS = \ animation.c \ diff --git a/dlls/d3dx9_34/Makefile.in b/dlls/d3dx9_34/Makefile.in index b7f9c46d5e..451a371bad 100644 --- a/dlls/d3dx9_34/Makefile.in +++ b/dlls/d3dx9_34/Makefile.in @@ -2,6 +2,7 @@ EXTRADEFS = -DD3DX_SDK_VERSION=34 MODULE = d3dx9_34.dll IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 PARENTSRC = ../d3dx9_36 +DELAYIMPORTS = windowscodecs C_SRCS = \ animation.c \ diff --git a/dlls/d3dx9_35/Makefile.in b/dlls/d3dx9_35/Makefile.in index 9c196ea038..978d0b0bfa 100644 --- a/dlls/d3dx9_35/Makefile.in +++ b/dlls/d3dx9_35/Makefile.in @@ -2,6 +2,7 @@ EXTRADEFS = -DD3DX_SDK_VERSION=35 MODULE = d3dx9_35.dll IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 PARENTSRC = ../d3dx9_36 +DELAYIMPORTS = windowscodecs C_SRCS = \ animation.c \ diff --git a/dlls/d3dx9_36/Makefile.in b/dlls/d3dx9_36/Makefile.in index da8098dd8d..847edece53 100644 --- a/dlls/d3dx9_36/Makefile.in +++ b/dlls/d3dx9_36/Makefile.in @@ -2,6 +2,7 @@ EXTRADEFS = -DD3DX_SDK_VERSION=36 MODULE = d3dx9_36.dll IMPORTLIB = d3dx9 IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 +DELAYIMPORTS = windowscodecs C_SRCS = \ animation.c \ diff --git a/dlls/d3dx9_36/surface.c b/dlls/d3dx9_36/surface.c index cae80a8689..cf8286ec75 100644 --- a/dlls/d3dx9_36/surface.c +++ b/dlls/d3dx9_36/surface.c @@ -29,6 +29,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3dx); +HRESULT WINAPI WICCreateImagingFactory_Proxy(UINT, IWICImagingFactory**); /* Wine-specific WIC GUIDs */ DEFINE_GUID(GUID_WineContainerFormatTga, 0x0c44fda1,0xa5c5,0x4298,0x96,0x85,0x47,0x3f,0xc1,0x7c,0xd3,0x22); @@ -861,7 +862,6 @@ HRESULT WINAPI D3DXGetImageInfoFromFileInMemory(const void *data, UINT datasize, IWICBitmapDecoder *decoder = NULL; IWICStream *stream; HRESULT hr; - HRESULT initresult; BOOL dib; TRACE("(%p, %d, %p)\n", data, datasize, info); @@ -880,9 +880,7 @@ HRESULT WINAPI D3DXGetImageInfoFromFileInMemory(const void *data, UINT datasize, /* In case of DIB file, convert it to BMP */ dib = convert_dib_to_bmp((void**)&data, &datasize); - initresult = CoInitializeEx(NULL, COINIT_APARTMENTTHREADED); - - hr = CoCreateInstance(&CLSID_WICImagingFactory, NULL, CLSCTX_INPROC_SERVER, &IID_IWICImagingFactory, (void**)&factory); + hr = WICCreateImagingFactory_Proxy(WINCODEC_SDK_VERSION, &factory); if (SUCCEEDED(hr)) { IWICImagingFactory_CreateStream(factory, &stream); @@ -968,9 +966,6 @@ HRESULT WINAPI D3DXGetImageInfoFromFileInMemory(const void *data, UINT datasize, if (decoder) IWICBitmapDecoder_Release(decoder); - if (SUCCEEDED(initresult)) - CoUninitialize(); - if (dib) HeapFree(GetProcessHeap(), 0, (void*)data); @@ -1108,7 +1103,7 @@ HRESULT WINAPI D3DXLoadSurfaceFromFileInMemory(IDirect3DSurface9 *pDestSurface, const RECT *pSrcRect, DWORD dwFilter, D3DCOLOR Colorkey, D3DXIMAGE_INFO *pSrcInfo) { D3DXIMAGE_INFO imginfo; - HRESULT hr, com_init; + HRESULT hr; IWICImagingFactory *factory = NULL; IWICBitmapDecoder *decoder; @@ -1161,9 +1156,7 @@ HRESULT WINAPI D3DXLoadSurfaceFromFileInMemory(IDirect3DSurface9 *pDestSurface, if (imginfo.ImageFileFormat == D3DXIFF_DIB) convert_dib_to_bmp((void**)&pSrcData, &SrcDataSize); - com_init = CoInitializeEx(NULL, COINIT_APARTMENTTHREADED); - - if (FAILED(CoCreateInstance(&CLSID_WICImagingFactory, NULL, CLSCTX_INPROC_SERVER, &IID_IWICImagingFactory, (void**)&factory))) + if (FAILED(WICCreateImagingFactory_Proxy(WINCODEC_SDK_VERSION, &factory))) goto cleanup_err; if (FAILED(IWICImagingFactory_CreateStream(factory, &stream))) @@ -1264,9 +1257,6 @@ cleanup_err: if (factory) IWICImagingFactory_Release(factory); - if (SUCCEEDED(com_init)) - CoUninitialize(); - if (imginfo.ImageFileFormat == D3DXIFF_DIB) HeapFree(GetProcessHeap(), 0, (void*)pSrcData); @@ -2087,10 +2077,10 @@ HRESULT WINAPI D3DXSaveSurfaceToFileInMemory(ID3DXBuffer **dst_buffer, D3DXIMAGE IPropertyBag2 *encoder_options = NULL; IStream *stream = NULL; HRESULT hr; - HRESULT initresult; - const CLSID *encoder_clsid; + const GUID *container_format; const GUID *pixel_format_guid; WICPixelFormatGUID wic_pixel_format; + IWICImagingFactory *factory; D3DFORMAT d3d_pixel_format; D3DSURFACE_DESC src_surface_desc; IDirect3DSurface9 *temp_surface; @@ -2116,13 +2106,13 @@ HRESULT WINAPI D3DXSaveSurfaceToFileInMemory(ID3DXBuffer **dst_buffer, D3DXIMAGE { case D3DXIFF_BMP: case D3DXIFF_DIB: - encoder_clsid = &CLSID_WICBmpEncoder; + container_format = &GUID_ContainerFormatBmp; break; case D3DXIFF_PNG: - encoder_clsid = &CLSID_WICPngEncoder; + container_format = &GUID_ContainerFormatPng; break; case D3DXIFF_JPG: - encoder_clsid = &CLSID_WICJpegEncoder; + container_format = &GUID_ContainerFormatJpeg; break; case D3DXIFF_DDS: return save_dds_surface_to_memory(dst_buffer, src_surface, src_rect); @@ -2160,10 +2150,11 @@ HRESULT WINAPI D3DXSaveSurfaceToFileInMemory(ID3DXBuffer **dst_buffer, D3DXIMAGE height = src_surface_desc.Height; } - initresult = CoInitializeEx(NULL, COINIT_APARTMENTTHREADED); + hr = WICCreateImagingFactory_Proxy(WINCODEC_SDK_VERSION, &factory); + if (FAILED(hr)) goto cleanup_err; - hr = CoCreateInstance(encoder_clsid, NULL, CLSCTX_INPROC_SERVER, - &IID_IWICBitmapEncoder, (void **)&encoder); + hr = IWICImagingFactory_CreateEncoder(factory, container_format, NULL, &encoder); + IWICImagingFactory_Release(factory); if (FAILED(hr)) goto cleanup_err; hr = CreateStreamOnHGlobal(NULL, TRUE, &stream); @@ -2294,7 +2285,5 @@ cleanup: if (encoder) IWICBitmapEncoder_Release(encoder); - if (SUCCEEDED(initresult)) CoUninitialize(); - return hr; } diff --git a/dlls/d3dx9_37/Makefile.in b/dlls/d3dx9_37/Makefile.in index ab790a4d5c..a05068c2bf 100644 --- a/dlls/d3dx9_37/Makefile.in +++ b/dlls/d3dx9_37/Makefile.in @@ -2,6 +2,7 @@ EXTRADEFS = -DD3DX_SDK_VERSION=37 MODULE = d3dx9_37.dll IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 PARENTSRC = ../d3dx9_36 +DELAYIMPORTS = windowscodecs C_SRCS = \ animation.c \ diff --git a/dlls/d3dx9_38/Makefile.in b/dlls/d3dx9_38/Makefile.in index 6125c2da67..b092e6267f 100644 --- a/dlls/d3dx9_38/Makefile.in +++ b/dlls/d3dx9_38/Makefile.in @@ -2,6 +2,7 @@ EXTRADEFS = -DD3DX_SDK_VERSION=38 MODULE = d3dx9_38.dll IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 PARENTSRC = ../d3dx9_36 +DELAYIMPORTS = windowscodecs C_SRCS = \ animation.c \ diff --git a/dlls/d3dx9_39/Makefile.in b/dlls/d3dx9_39/Makefile.in index d97a787c67..4d17120e0b 100644 --- a/dlls/d3dx9_39/Makefile.in +++ b/dlls/d3dx9_39/Makefile.in @@ -2,6 +2,7 @@ EXTRADEFS = -DD3DX_SDK_VERSION=39 MODULE = d3dx9_39.dll IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 PARENTSRC = ../d3dx9_36 +DELAYIMPORTS = windowscodecs C_SRCS = \ animation.c \ diff --git a/dlls/d3dx9_40/Makefile.in b/dlls/d3dx9_40/Makefile.in index 36c5a210cd..59f6f3d592 100644 --- a/dlls/d3dx9_40/Makefile.in +++ b/dlls/d3dx9_40/Makefile.in @@ -2,6 +2,7 @@ EXTRADEFS = -DD3DX_SDK_VERSION=40 MODULE = d3dx9_40.dll IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 PARENTSRC = ../d3dx9_36 +DELAYIMPORTS = windowscodecs C_SRCS = \ animation.c \ diff --git a/dlls/d3dx9_41/Makefile.in b/dlls/d3dx9_41/Makefile.in index d4552cf608..f18443a51e 100644 --- a/dlls/d3dx9_41/Makefile.in +++ b/dlls/d3dx9_41/Makefile.in @@ -2,6 +2,7 @@ EXTRADEFS = -DD3DX_SDK_VERSION=41 MODULE = d3dx9_41.dll IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 PARENTSRC = ../d3dx9_36 +DELAYIMPORTS = windowscodecs C_SRCS = \ animation.c \ diff --git a/dlls/d3dx9_42/Makefile.in b/dlls/d3dx9_42/Makefile.in index 5806fce66c..cb142b7ac2 100644 --- a/dlls/d3dx9_42/Makefile.in +++ b/dlls/d3dx9_42/Makefile.in @@ -2,6 +2,7 @@ EXTRADEFS = -DD3DX_SDK_VERSION=42 MODULE = d3dx9_42.dll IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 PARENTSRC = ../d3dx9_36 +DELAYIMPORTS = windowscodecs C_SRCS = \ animation.c \ diff --git a/dlls/d3dx9_43/Makefile.in b/dlls/d3dx9_43/Makefile.in index 72ba8b4c1e..3e6111a13d 100644 --- a/dlls/d3dx9_43/Makefile.in +++ b/dlls/d3dx9_43/Makefile.in @@ -2,6 +2,7 @@ EXTRADEFS = -DD3DX_SDK_VERSION=43 MODULE = d3dx9_43.dll IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 PARENTSRC = ../d3dx9_36 +DELAYIMPORTS = windowscodecs C_SRCS = \ animation.c \ -- 2.20.1

3 2

[PATCH 1/2] d3dcompiler: Add support for two other versions of ID3D11ShaderReflection.
by Matteo Bruni 28 Jan '19

28 Jan '19

From: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> --- After thinking about it a bit more I'm slightly preferring it as a single patch. Sorry for suggesting you otherwise previously. dlls/d3dcompiler_43/reflection.c | 9 +++++++++ include/d3d11shader.h | 7 +++++++ 2 files changed, 16 insertions(+) diff --git a/dlls/d3dcompiler_43/reflection.c b/dlls/d3dcompiler_43/reflection.c index 5a59c64f94d..b36631b9855 100644 --- a/dlls/d3dcompiler_43/reflection.c +++ b/dlls/d3dcompiler_43/reflection.c @@ -665,6 +665,14 @@ static UINT STDMETHODCALLTYPE d3dcompiler_shader_reflection_GetThreadGroupSize( return 0; } +static UINT64 STDMETHODCALLTYPE d3dcompiler_shader_reflection_GetRequiresFlags( + ID3D11ShaderReflection *iface) +{ + FIXME("iface %p stub!\n", iface); + + return 0; +} + static const struct ID3D11ShaderReflectionVtbl d3dcompiler_shader_reflection_vtbl = { /* IUnknown methods */ @@ -690,6 +698,7 @@ static const struct ID3D11ShaderReflectionVtbl d3dcompiler_shader_reflection_vtb d3dcompiler_shader_reflection_GetNumInterfaceSlots, d3dcompiler_shader_reflection_GetMinFeatureLevel, d3dcompiler_shader_reflection_GetThreadGroupSize, + d3dcompiler_shader_reflection_GetRequiresFlags, }; /* ID3D11ShaderReflectionConstantBuffer methods */ diff --git a/include/d3d11shader.h b/include/d3d11shader.h index f9c3b9511ef..479020abbe5 100644 --- a/include/d3d11shader.h +++ b/include/d3d11shader.h @@ -174,7 +174,13 @@ DECLARE_INTERFACE(ID3D11ShaderReflectionConstantBuffer) }; #undef INTERFACE +#if D3D_COMPILER_VERSION <= 42 +DEFINE_GUID(IID_ID3D11ShaderReflection, 0x17f27486, 0xa342, 0x4d10, 0x88, 0x42, 0xab, 0x08, 0x74, 0xe7, 0xf6, 0x70); +#elif D3D_COMPILER_VERSION == 43 DEFINE_GUID(IID_ID3D11ShaderReflection, 0x0a233719, 0x3960, 0x4578, 0x9d, 0x7c, 0x20, 0x3b, 0x8b, 0x1d, 0x9c, 0xc1); +#else +DEFINE_GUID(IID_ID3D11ShaderReflection, 0x8d536ca1, 0x0cca, 0x4956, 0xa8, 0x37, 0x78, 0x69, 0x63, 0x75, 0x55, 0x84); +#endif #define INTERFACE ID3D11ShaderReflection DECLARE_INTERFACE_(ID3D11ShaderReflection, IUnknown) @@ -202,6 +208,7 @@ DECLARE_INTERFACE_(ID3D11ShaderReflection, IUnknown) STDMETHOD_(UINT, GetNumInterfaceSlots)(THIS) PURE; STDMETHOD(GetMinFeatureLevel)(THIS_ enum D3D_FEATURE_LEVEL *level) PURE; STDMETHOD_(UINT, GetThreadGroupSize)(THIS_ UINT *sizex, UINT *sizey, UINT *sizez) PURE; + STDMETHOD_(UINT64, GetRequiresFlags)(THIS) PURE; }; #undef INTERFACE -- 2.19.2

1 1

[PATCH v3 3/3] setupapi: Implement SetupDiGetDevicePropertyW.
by Zhiyi Zhang 28 Jan '19

28 Jan '19

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/setupapi/devinst.c | 71 +++++++++++++- dlls/setupapi/tests/devinst.c | 175 +++++++++++++++++++++++++++++++++- 2 files changed, 239 insertions(+), 7 deletions(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index 13f7853290..7769284d54 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -3815,13 +3815,74 @@ BOOL WINAPI SetupDiGetINFClassW(PCWSTR inf, LPGUID class_guid, PWSTR class_name, /*********************************************************************** * SetupDiGetDevicePropertyW (SETUPAPI.@) */ -BOOL WINAPI SetupDiGetDevicePropertyW(HDEVINFO info_set, PSP_DEVINFO_DATA info_data, +BOOL WINAPI SetupDiGetDevicePropertyW(HDEVINFO devinfo, PSP_DEVINFO_DATA device_data, const DEVPROPKEY *prop_key, DEVPROPTYPE *prop_type, BYTE *prop_buff, DWORD prop_buff_size, DWORD *required_size, DWORD flags) { - FIXME("%p, %p, %p, %p, %p, %d, %p, 0x%08x stub\n", info_set, info_data, prop_key, - prop_type, prop_buff, prop_buff_size, required_size, flags); + static const WCHAR formatW[] = {'\\', '%', '0', '4', 'X', 0}; + WCHAR key_path[55] = {'P', 'r', 'o', 'p', 'e', 'r', 't', 'i', 'e', 's', '\\'}; + HKEY hkey; + DWORD value_type; + DWORD value_size = 0; + LSTATUS ls; + struct device *device; - SetLastError(ERROR_NOT_FOUND); - return FALSE; + TRACE("%p, %p, %p, %p, %p, %d, %p, %#x\n", devinfo, device_data, prop_key, prop_type, prop_buff, prop_buff_size, + required_size, flags); + + if (!(device = get_device(devinfo, device_data))) + return FALSE; + + if (!prop_key) + { + SetLastError(ERROR_INVALID_DATA); + return FALSE; + } + + if (!prop_type || (!prop_buff && prop_buff_size)) + { + SetLastError(ERROR_INVALID_USER_BUFFER); + return FALSE; + } + + if (flags) + { + SetLastError(ERROR_INVALID_FLAGS); + return FALSE; + } + + SETUPDI_GuidToString(&prop_key->fmtid, key_path + 11); + sprintfW(key_path + 49, formatW, prop_key->pid); + + ls = RegOpenKeyExW(device->key, key_path, 0, KEY_QUERY_VALUE, &hkey); + if (!ls) + { + value_size = prop_buff_size; + ls = RegQueryValueExW(hkey, NULL, NULL, &value_type, prop_buff, &value_size); + } + + switch (ls) + { + case NO_ERROR: + case ERROR_MORE_DATA: + *prop_type = 0xffff & value_type; + ls = (ls == ERROR_MORE_DATA || !prop_buff) ? ERROR_INSUFFICIENT_BUFFER : NO_ERROR; + break; + case ERROR_FILE_NOT_FOUND: + *prop_type = DEVPROP_TYPE_EMPTY; + value_size = 0; + ls = ERROR_NOT_FOUND; + break; + default: + *prop_type = DEVPROP_TYPE_EMPTY; + value_size = 0; + FIXME("Unhandled error %#x\n", ls); + break; + } + + if (required_size) + *required_size = value_size; + + SetLastError(ls); + return !ls; } diff --git a/dlls/setupapi/tests/devinst.c b/dlls/setupapi/tests/devinst.c index 0a77fca9c2..5eb0c6befd 100644 --- a/dlls/setupapi/tests/devinst.c +++ b/dlls/setupapi/tests/devinst.c @@ -39,6 +39,7 @@ static GUID guid = {0x6a55b5a4, 0x3f65, 0x11db, {0xb7,0x04,0x00,0x11,0x95,0x5c,0 static GUID guid2 = {0x6a55b5a5, 0x3f65, 0x11db, {0xb7,0x04,0x00,0x11,0x95,0x5c,0x2b,0xdb}}; BOOL (WINAPI *pSetupDiSetDevicePropertyW)(HDEVINFO, PSP_DEVINFO_DATA, const DEVPROPKEY *, DEVPROPTYPE, const BYTE *, DWORD, DWORD); +BOOL (WINAPI *pSetupDiGetDevicePropertyW)(HDEVINFO, PSP_DEVINFO_DATA, const DEVPROPKEY *, DEVPROPTYPE *, BYTE *, DWORD, DWORD *, DWORD); static void test_create_device_list_ex(void) { @@ -351,15 +352,19 @@ static void test_device_property(void) SP_DEVINFO_DATA device_data = {sizeof(device_data)}; HMODULE hmod; HDEVINFO set; + DEVPROPTYPE type; + DWORD size; + BYTE buffer[256]; DWORD err; BOOL ret; hmod = LoadLibraryA("setupapi.dll"); pSetupDiSetDevicePropertyW = (void *)GetProcAddress(hmod, "SetupDiSetDevicePropertyW"); + pSetupDiGetDevicePropertyW = (void *)GetProcAddress(hmod, "SetupDiGetDevicePropertyW"); - if (!pSetupDiSetDevicePropertyW) + if (!pSetupDiSetDevicePropertyW || !pSetupDiGetDevicePropertyW) { - win_skip("SetupDiSetDevicePropertyW() are only available on vista+, skipping tests.\n"); + win_skip("SetupDi{Set,Get}DevicePropertyW() are only available on vista+, skipping tests.\n"); FreeLibrary(hmod); return; } @@ -495,6 +500,172 @@ static void test_device_property(void) ok(!ret, "Expect failure\n"); ok(err == ERROR_NOT_FOUND, "Expect last error %#x, got %#x\n", ERROR_NOT_FOUND, err); + + /* SetupDiGetDevicePropertyW */ + ret = pSetupDiSetDevicePropertyW(set, &device_data, &DEVPKEY_Device_FriendlyName, DEVPROP_TYPE_STRING, (const BYTE *)valueW, sizeof(valueW), 0); + ok(ret, "Expect success\n"); + + /* #1 Null device info list */ + SetLastError(0xdeadbeef); + type = DEVPROP_TYPE_STRING; + size = 0; + ret = pSetupDiGetDevicePropertyW(NULL, &device_data, &DEVPKEY_Device_FriendlyName, &type, buffer, sizeof(buffer), &size, 0); + err = GetLastError(); + ok(!ret, "Expect failure\n"); + ok(err == ERROR_INVALID_HANDLE, "Expect last error %#x, got %#x\n", ERROR_INVALID_HANDLE, err); + ok(type == DEVPROP_TYPE_STRING, "Expect type %#x, got %#x\n", DEVPROP_TYPE_STRING, type); + ok(size == 0, "Expect size %d, got %d\n", 0, size); + + /* #2 Null device */ + SetLastError(0xdeadbeef); + type = DEVPROP_TYPE_STRING; + size = 0; + ret = pSetupDiGetDevicePropertyW(set, NULL, &DEVPKEY_Device_FriendlyName, &type, buffer, sizeof(buffer), &size, 0); + err = GetLastError(); + ok(!ret, "Expect failure\n"); + ok(err == ERROR_INVALID_PARAMETER, "Expect last error %#x, got %#x\n", ERROR_INVALID_PARAMETER, err); + ok(type == DEVPROP_TYPE_STRING, "Expect type %#x, got %#x\n", DEVPROP_TYPE_STRING, type); + ok(size == 0, "Expect size %d, got %d\n", 0, size); + + /* #3 Null property key */ + SetLastError(0xdeadbeef); + type = DEVPROP_TYPE_STRING; + size = 0; + ret = pSetupDiGetDevicePropertyW(set, &device_data, NULL, &type, buffer, sizeof(buffer), &size, 0); + err = GetLastError(); + ok(!ret, "Expect failure\n"); + ok(err == ERROR_INVALID_DATA, "Expect last error %#x, got %#x\n", ERROR_INVALID_DATA, err); + ok(size == 0, "Expect size %d, got %d\n", 0, size); + + /* #4 Null property type */ + SetLastError(0xdeadbeef); + type = DEVPROP_TYPE_STRING; + size = 0; + ret = pSetupDiGetDevicePropertyW(set, &device_data, &DEVPKEY_Device_FriendlyName, NULL, buffer, sizeof(buffer), &size, 0); + err = GetLastError(); + ok(!ret, "Expect failure\n"); + ok(err == ERROR_INVALID_USER_BUFFER, "Expect last error %#x, got %#x\n", ERROR_INVALID_USER_BUFFER, err); + ok(type == DEVPROP_TYPE_STRING, "Expect type %#x, got %#x\n", DEVPROP_TYPE_STRING, type); + ok(size == 0, "Expect size %d, got %d\n", 0, size); + + /* #5 Null buffer */ + SetLastError(0xdeadbeef); + type = DEVPROP_TYPE_STRING; + size = 0; + ret = pSetupDiGetDevicePropertyW(set, &device_data, &DEVPKEY_Device_FriendlyName, &type, NULL, sizeof(buffer), &size, 0); + err = GetLastError(); + ok(!ret, "Expect failure\n"); + ok(err == ERROR_INVALID_USER_BUFFER, "Expect last error %#x, got %#x\n", ERROR_INVALID_USER_BUFFER, err); + ok(type == DEVPROP_TYPE_STRING, "Expect type %#x, got %#x\n", DEVPROP_TYPE_STRING, type); + ok(size == 0, "Expect size %d, got %d\n", 0, size); + + /* #6 Null buffer with zero size and wrong type */ + SetLastError(0xdeadbeef); + type = DEVPROP_TYPE_UINT64; + size = 0; + ret = pSetupDiGetDevicePropertyW(set, &device_data, &DEVPKEY_Device_FriendlyName, &type, NULL, 0, &size, 0); + err = GetLastError(); + ok(!ret, "Expect failure\n"); + ok(err == ERROR_INSUFFICIENT_BUFFER, "Expect last error %#x, got %#x\n", ERROR_INSUFFICIENT_BUFFER, err); + ok(type == DEVPROP_TYPE_STRING, "Expect type %#x, got %#x\n", DEVPROP_TYPE_STRING, type); + ok(size == sizeof(valueW), "Expect size %d, got %d\n", sizeof(valueW), size); + + /* #7 Zero buffer size */ + SetLastError(0xdeadbeef); + type = DEVPROP_TYPE_STRING; + size = 0; + ret = pSetupDiGetDevicePropertyW(set, &device_data, &DEVPKEY_Device_FriendlyName, &type, buffer, 0, &size, 0); + err = GetLastError(); + ok(!ret, "Expect failure\n"); + ok(err == ERROR_INSUFFICIENT_BUFFER, "Expect last error %#x, got %#x\n", ERROR_INSUFFICIENT_BUFFER, err); + ok(type == DEVPROP_TYPE_STRING, "Expect type %#x, got %#x\n", DEVPROP_TYPE_STRING, type); + ok(size == sizeof(valueW), "Expect size %d, got %d\n", sizeof(valueW), size); + + /* #8 Null required size */ + SetLastError(0xdeadbeef); + type = DEVPROP_TYPE_STRING; + ret = pSetupDiGetDevicePropertyW(set, &device_data, &DEVPKEY_Device_FriendlyName, &type, buffer, sizeof(buffer), NULL, 0); + err = GetLastError(); + ok(ret, "Expect success\n"); + ok(err == NO_ERROR, "Expect last error %#x, got %#x\n", NO_ERROR, err); + ok(type == DEVPROP_TYPE_STRING, "Expect type %#x, got %#x\n", DEVPROP_TYPE_STRING, type); + + /* #9 Flags not zero */ + SetLastError(0xdeadbeef); + type = DEVPROP_TYPE_STRING; + size = 0; + ret = pSetupDiGetDevicePropertyW(set, &device_data, &DEVPKEY_Device_FriendlyName, &type, buffer, sizeof(buffer), &size, 1); + err = GetLastError(); + ok(!ret, "Expect failure\n"); + ok(err == ERROR_INVALID_FLAGS, "Expect last error %#x, got %#x\n", ERROR_INVALID_FLAGS, err); + ok(type == DEVPROP_TYPE_STRING, "Expect type %#x, got %#x\n", DEVPROP_TYPE_STRING, type); + ok(size == 0, "Expect size %d, got %d\n", 0, size); + + /* #10 Non-existent property key */ + SetLastError(0xdeadbeef); + type = DEVPROP_TYPE_STRING; + size = 0; + ret = pSetupDiGetDevicePropertyW(set, &device_data, &DEVPKEY_Device_HardwareIds, &type, buffer, sizeof(buffer), &size, 0); + err = GetLastError(); + ok(!ret, "Expect failure\n"); + ok(err == ERROR_NOT_FOUND, "Expect last error %#x, got %#x\n", ERROR_NOT_FOUND, err); + ok(size == 0, "Expect size %d, got %d\n", 0, size); + + /* #11 Wrong property key type */ + SetLastError(0xdeadbeef); + type = DEVPROP_TYPE_UINT64; + size = 0; + memset(buffer, 0, sizeof(buffer)); + ret = pSetupDiGetDevicePropertyW(set, &device_data, &DEVPKEY_Device_FriendlyName, &type, buffer, sizeof(buffer), &size, 0); + err = GetLastError(); + ok(ret, "Expect success\n"); + ok(err == NO_ERROR, "Expect last error %#x, got %#x\n", NO_ERROR, err); + ok(type == DEVPROP_TYPE_STRING, "Expect type %#x, got %#x\n", DEVPROP_TYPE_STRING, type); + ok(size == sizeof(valueW), "Expect size %d, got %d\n", sizeof(valueW), size); + ok(!lstrcmpW((WCHAR *)buffer, valueW), "Expect buffer %s, got %s\n", wine_dbgstr_w(valueW), wine_dbgstr_w((WCHAR *)buffer)); + + /* #12 Get null property value */ + ret = pSetupDiSetDevicePropertyW(set, &device_data, &DEVPKEY_Device_FriendlyName, DEVPROP_TYPE_STRING, (const BYTE *)valueW, sizeof(valueW), 0); + ok(ret, "Expect success\n"); + ret = pSetupDiSetDevicePropertyW(set, &device_data, &DEVPKEY_Device_FriendlyName, DEVPROP_TYPE_NULL, NULL, 0, 0); + ok(ret, "Expect success\n"); + SetLastError(0xdeadbeef); + type = DEVPROP_TYPE_STRING; + size = 0; + ret = pSetupDiGetDevicePropertyW(set, &device_data, &DEVPKEY_Device_FriendlyName, &type, buffer, sizeof(buffer), &size, 0); + err = GetLastError(); + ok(!ret, "Expect failure\n"); + ok(err == ERROR_NOT_FOUND, "Expect last error %#x, got %#x\n", ERROR_NOT_FOUND, err); + ok(size == 0, "Expect size %d, got %d\n", 0, size); + + /* #13 Insufficient buffer size */ + ret = pSetupDiSetDevicePropertyW(set, &device_data, &DEVPKEY_Device_FriendlyName, DEVPROP_TYPE_STRING, (const BYTE *)valueW, sizeof(valueW), 0); + ok(ret, "Expect success\n"); + SetLastError(0xdeadbeef); + type = DEVPROP_TYPE_STRING; + size = 0; + ret = pSetupDiGetDevicePropertyW(set, &device_data, &DEVPKEY_Device_FriendlyName, &type, buffer, sizeof(valueW) - 1, &size, 0); + err = GetLastError(); + ok(!ret, "Expect failure\n"); + ok(err == ERROR_INSUFFICIENT_BUFFER, "Expect last error %#x, got %#x\n", ERROR_INSUFFICIENT_BUFFER, err); + ok(type == DEVPROP_TYPE_STRING, "Expect type %#x, got %#x\n", DEVPROP_TYPE_STRING, type); + ok(size == sizeof(valueW), "Expect size %d, got %d\n", sizeof(valueW), size); + + /* #14 Normal */ + ret = pSetupDiSetDevicePropertyW(set, &device_data, &DEVPKEY_Device_FriendlyName, DEVPROP_TYPE_STRING, (const BYTE *)valueW, sizeof(valueW), 0); + ok(ret, "Expect success\n"); + SetLastError(0xdeadbeef); + type = DEVPROP_TYPE_STRING; + size = 0; + memset(buffer, 0, sizeof(buffer)); + ret = pSetupDiGetDevicePropertyW(set, &device_data, &DEVPKEY_Device_FriendlyName, &type, buffer, sizeof(buffer), &size, 0); + err = GetLastError(); + ok(ret, "Expect success\n"); + ok(err == NO_ERROR, "Expect last error %#x, got %#x\n", NO_ERROR, err); + ok(type == DEVPROP_TYPE_STRING, "Expect type %#x, got %#x\n", DEVPROP_TYPE_STRING, type); + ok(size == sizeof(valueW), "Expect size %d, got %d\n", sizeof(valueW), size); + ok(!lstrcmpW((WCHAR *)buffer, valueW), "Expect buffer %s, got %s\n", wine_dbgstr_w(valueW), wine_dbgstr_w((WCHAR *)buffer)); + ret = SetupDiRemoveDevice(set, &device_data); ok(ret, "Got unexpected error %#x.\n", GetLastError()); -- 2.20.1

1 0