April 2020 - Wine-Commits - list.winehq.org

Francois Gouget : winapi_test: Add support for more base types.
by Alexandre Julliard April 14, 2020

April 14, 2020

Module: wine Branch: master Commit: 8bd4bc47166716762bf03e29e87b9eaaa9cb7b41 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8bd4bc47166716762bf03e29… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Apr 14 20:10:04 2020 +0200 winapi_test: Add support for more base types. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winapi/winapi_test | 98 +++++++++++++++++++++++++++--------------------- 1 file changed, 55 insertions(+), 43 deletions(-) diff --git a/tools/winapi/winapi_test b/tools/winapi/winapi_test index 453b7a42e1..8b7596f040 100755 --- a/tools/winapi/winapi_test +++ b/tools/winapi/winapi_test @@ -177,42 +177,74 @@ sub _find_align_kind_size($) { $align = $pointer_size; $kind = "pointer"; $size = $pointer_size; + } elsif (/^(?:void|VOID)$/) { + $align = 4; + $kind = "signed"; + $size = 4; } elsif(/^char$/) { $align = 1; $kind = "char"; $size = 1; - } elsif(/^(?:(signed|unsigned)\s+)?(?:__int8|char|byte)$/) { + } elsif(/^(?:(signed|unsigned)\s+)?(?:__int8|char)$/) { $align = 1; $kind = defined($1) ? $1 : "signed"; $size = 1; + } elsif(/^CHAR$/) { + $align = 1; + $kind = "signed"; + $size = 1; + } elsif(/^(?:byte|BOOLEAN|BYTE|UCHAR)$/) { + $align = 1; + $kind = "unsigned"; + $size = 1; } elsif (/^(?:(signed|unsigned)\s+)?(?:__int16|short(?:\s+int)?)$/) { $align = 2; $kind = defined($1) ? $1 : "signed"; $size = 2; - } elsif (/^(?:wchar_t)$/) { + } elsif (/^SHORT$/) { $align = 2; $kind = "signed"; $size = 2; + } elsif (/^(?:char16_t|wchar_t|USHORT|WCHAR|WORD)$/) { + $align = 2; + $kind = "unsigned"; + $size = 2; } elsif (/^(signed|unsigned)$/) { $align = 4; - $kind = defined($1) ? $1 : "signed"; + $kind = $1; $size = 4; } elsif (/^(?:(signed|unsigned)\s+)?(?:__int32|int)$/) { $align = 4; $kind = defined($1) ? $1 : "signed"; $size = 4; + } elsif (/^(?:BOOL|INT|LONG)$/) { + $align = 4; + $kind = "signed"; + $size = 4; + } elsif (/^(?:DWORD|FOURCC|LCID|UINT|ULONG)$/) { + $align = 4; + $kind = "unsigned"; + $size = 4; + } elsif (/^(?:float|FLOAT)$/) { + $align = 4; + $kind = "float"; + $size = 4; } elsif (/^(?:(signed|unsigned)\s+)?(?:long(?:\s+int)?)$/) { $align = $pointer_size; $kind = defined($1) ? $1 : "signed"; $size = $pointer_size; - } elsif (/^(?:float)$/) { - $align = 4; - $kind = "float"; - $size = 4; } elsif (/^(?:(signed|unsigned)\s+)?__int64$/) { $align = 8; $kind = defined($1) ? $1 : "signed"; $size = 8; + } elsif (/^(?:INT64|LONG64|LONGLONG)$/) { + $align = 8; + $kind = "signed"; + $size = 8; + } elsif (/^(?:UINT64|ULONG64|DWORD64|ULONGLONG|DWORDLONG)$/) { + $align = 8; + $kind = "unsigned"; + $size = 8; } elsif (/^(?:double|DOUBLE|DATE)$/) { $align = 8; $kind = "float"; @@ -221,58 +253,38 @@ sub _find_align_kind_size($) { $align = 4; $kind = "float"; $size = 12; - } elsif (/^H(?:DC|BITMAP|BRUSH|ICON|INSTANCE|KEY|MENU|METAFILE|WND)$/) { + } elsif (/^(?:INT|LONG)_PTR$/) { + $align = $pointer_size; + $kind = "signed"; + $size = $pointer_size; + } elsif (/^(?:UINT|MMVERSION|ULONG|DWORD)_PTR$/) { + $align = $pointer_size; + $kind = "unsigned"; + $size = $pointer_size; + } elsif (/^H(?:ANDLE|DC|BITMAP|BRUSH|ICON|INSTANCE|KEY|MENU|METAFILE|MMIO|TASK|WND)$/) { $align = $pointer_size; $kind = "pointer"; $size = $pointer_size; - } elsif (/^LP(?:BYTE|CSTR|CWSTR|DWORD|STR|VOID|WSTR)$/) { + } elsif (/^(?:HPSTR|LP[A-Z0-9_]+|PVOID)$/) { $align = $pointer_size; $kind = "pointer"; $size = $pointer_size; - } elsif (/^(?:FILETIME)$/) { + } elsif (/^POINTS$/) { + $align = 2; + $kind = "struct"; + $size = 4; + } elsif (/^(?:FILETIME|LUID|POINT|POINTL)$/) { $align = 4; $kind = "struct"; $size = 8; - } elsif (/^GUID$/) { + } elsif (/^(?:CLSID|GUID|RECT|RECTL)$/) { $align = 4; $kind = "struct"; $size = 16; - } elsif (/^(?:VOID)$/) { - $align = 4; - $kind = "signed"; - $size = 4; - } elsif (/^(?:SHORT)$/) { - $align = 2; - $kind = "unsigned"; - $size = 2; - } elsif (/^(?:BYTE)$/) { - $align = 1; - $kind = "unsigned"; - $size = 1; - } elsif (/^(?:DWORD)$/) { - $align = 4; - $kind = "unsigned"; - $size = 4; - } elsif (/^(?:WORD)$/) { - $align = 2; - $kind = "unsigned"; - $size = 2; - } elsif (/^(?:INT64|LONG64|LONGLONG)$/) { - $align = 8; - $kind = "signed"; - $size = 8; - } elsif (/^(?:UINT64|ULONG64|DWORD64|ULONGLONG|DWORDLONG)$/) { - $align = 8; - $kind = "unsigned"; - $size = 8; } elsif (/^(?:LARGE_INTEGER)$/) { $align = 8; $kind = "union"; $size = 8; - } elsif (/^(?:POINTS)$/) { - $align = 2; - $kind = "struct"; - $size = 4; } elsif (/^(struct|union)$/) { $kind = $1; if (!$size_parse_reported{$_}) {

1 0

Jacek Caban : devpropdef.h: Fix DECLSPEC_SELECTANY usage.
by Alexandre Julliard April 14, 2020

April 14, 2020

Module: wine Branch: master Commit: c32a97fad131ccbd6532aff0c808fef099e221c9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c32a97fad131ccbd6532aff0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Apr 14 20:22:39 2020 +0200 devpropdef.h: Fix DECLSPEC_SELECTANY usage. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/devpropdef.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/include/devpropdef.h b/include/devpropdef.h index 8db292c7d1..2b0b7f4a84 100644 --- a/include/devpropdef.h +++ b/include/devpropdef.h @@ -82,18 +82,18 @@ typedef struct _DEVPROPKEY { #ifdef INITGUID #ifdef __cplusplus #define DEFINE_DEVPROPKEY(name, l, w1, w2, b1, b2, b3, b4, b5, b6, b7, b8, pid) \ - EXTERN_C const DEVPROPKEY name DECLSPEC_HIDDEN DECLSPEC_SELECTANY; \ - EXTERN_C const DEVPROPKEY name = \ + EXTERN_C const DEVPROPKEY name DECLSPEC_HIDDEN; \ + EXTERN_C const DEVPROPKEY DECLSPEC_SELECTANY name = \ { { l, w1, w2, { b1, b2, b3, b4, b5, b6, b7, b8 } }, pid } #else #define DEFINE_DEVPROPKEY(name, l, w1, w2, b1, b2, b3, b4, b5, b6, b7, b8, pid) \ - const DEVPROPKEY name DECLSPEC_HIDDEN DECLSPEC_SELECTANY; \ - const DEVPROPKEY name = \ + extern const DEVPROPKEY name DECLSPEC_HIDDEN; \ + const DEVPROPKEY DECLSPEC_SELECTANY name = \ { { l, w1, w2, { b1, b2, b3, b4, b5, b6, b7, b8 } }, pid } #endif #else #define DEFINE_DEVPROPKEY(name, l, w1, w2, b1, b2, b3, b4, b5, b6, b7, b8, pid) \ - EXTERN_C const DEVPROPKEY name DECLSPEC_HIDDEN DECLSPEC_SELECTANY + EXTERN_C const DEVPROPKEY name DECLSPEC_HIDDEN #endif #ifndef IsEqualDevPropKey

1 0

Jeff Smith : gdiplus: Check that GdipAddPathLine2 is passed at least one point.
by Alexandre Julliard April 14, 2020

April 14, 2020

Module: wine Branch: master Commit: 93a5ce24453e12cde5d3b04cf6e300e74439c78e URL: https://source.winehq.org/git/wine.git/?a=commit;h=93a5ce24453e12cde5d3b04c… Author: Jeff Smith <whydoubt(a)gmail.com> Date: Mon Apr 13 22:50:52 2020 -0500 gdiplus: Check that GdipAddPathLine2 is passed at least one point. Signed-off-by: Jeff Smith <whydoubt(a)gmail.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/graphicspath.c | 2 +- dlls/gdiplus/tests/graphicspath.c | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/dlls/gdiplus/graphicspath.c b/dlls/gdiplus/graphicspath.c index 2b191dd30d..4d5a73588f 100644 --- a/dlls/gdiplus/graphicspath.c +++ b/dlls/gdiplus/graphicspath.c @@ -627,7 +627,7 @@ GpStatus WINGDIPAPI GdipAddPathLine2(GpPath *path, GDIPCONST GpPointF *points, TRACE("(%p, %p, %d)\n", path, points, count); - if(!path || !points) + if(!path || !points || count < 1) return InvalidParameter; if(!lengthen_path(path, count)) diff --git a/dlls/gdiplus/tests/graphicspath.c b/dlls/gdiplus/tests/graphicspath.c index 0c5297249a..7670a6c41f 100644 --- a/dlls/gdiplus/tests/graphicspath.c +++ b/dlls/gdiplus/tests/graphicspath.c @@ -308,6 +308,16 @@ static void test_line2(void) } GdipCreatePath(FillModeAlternate, &path); + + status = GdipAddPathLine2(NULL, line2_points, 2); + expect(InvalidParameter, status); + status = GdipAddPathLine2(path, NULL, 2); + expect(InvalidParameter, status); + status = GdipAddPathLine2(path, line2_points, 0); + expect(InvalidParameter, status); + status = GdipAddPathLine2(path, line2_points, -1); + expect(InvalidParameter, status); + status = GdipAddPathLine2(path, line2_points, 3); expect(Ok, status); status = GdipAddPathLine2(path, &(line2_points[3]), 3);

1 0

Alexandre Julliard : ntdll: Allow the module file name to not be null-terminated.
by Alexandre Julliard April 14, 2020

April 14, 2020

Module: wine Branch: master Commit: 19c48204bb0aa3dadde1247a66b69d9cd51b7e03 URL: https://source.winehq.org/git/wine.git/?a=commit;h=19c48204bb0aa3dadde1247a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 14 21:58:23 2020 +0200 ntdll: Allow the module file name to not be null-terminated. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 2be0cde537..524eab7460 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -1174,6 +1174,7 @@ static NTSTATUS fixup_imports( WINE_MODREF *wm, LPCWSTR load_path ) */ static WINE_MODREF *alloc_module( HMODULE hModule, const UNICODE_STRING *nt_name, BOOL builtin ) { + WCHAR *buffer; WINE_MODREF *wm; const WCHAR *p; const IMAGE_NT_HEADERS *nt = RtlImageNtHeader(hModule); @@ -1186,9 +1187,16 @@ static WINE_MODREF *alloc_module( HMODULE hModule, const UNICODE_STRING *nt_name wm->ldr.TlsIndex = -1; wm->ldr.LoadCount = 1; - RtlCreateUnicodeString( &wm->ldr.FullDllName, nt_name->Buffer + 4 /* \??\ prefix */ ); - if ((p = wcsrchr( wm->ldr.FullDllName.Buffer, '\\' ))) p++; - else p = wm->ldr.FullDllName.Buffer; + if (!(buffer = RtlAllocateHeap( GetProcessHeap(), 0, nt_name->Length - 3 * sizeof(WCHAR) ))) + { + RtlFreeHeap( GetProcessHeap(), 0, wm ); + return NULL; + } + memcpy( buffer, nt_name->Buffer + 4 /* \??\ prefix */, nt_name->Length - 4 * sizeof(WCHAR) ); + buffer[nt_name->Length/sizeof(WCHAR) - 4] = 0; + if ((p = wcsrchr( buffer, '\\' ))) p++; + else p = buffer; + RtlInitUnicodeString( &wm->ldr.FullDllName, buffer ); RtlInitUnicodeString( &wm->ldr.BaseDllName, p ); if (!is_dll_native_subsystem( &wm->ldr, nt, p ))

1 0

Zebediah Figura : ntdll: Handle unaligned SRW locks when using keyed events.
by Alexandre Julliard April 14, 2020

April 14, 2020

Module: wine Branch: master Commit: 28619e60358f75740df29d0ff0be80cbd0c9e10c URL: https://source.winehq.org/git/wine.git/?a=commit;h=28619e60358f75740df29d0f… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Apr 13 18:09:44 2020 -0500 ntdll: Handle unaligned SRW locks when using keyed events. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/sync.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/sync.c b/dlls/ntdll/sync.c index 5d1f5c3910..c0e1a30e2c 100644 --- a/dlls/ntdll/sync.c +++ b/dlls/ntdll/sync.c @@ -1985,11 +1985,11 @@ static NTSTATUS fast_release_srw_shared( RTL_SRWLOCK *lock ) #define SRWLOCK_RES_SHARED 0x00000001 #ifdef WORDS_BIGENDIAN -#define srwlock_key_exclusive(lock) (&lock->Ptr) -#define srwlock_key_shared(lock) ((void *)((char *)&lock->Ptr + 2)) +#define srwlock_key_exclusive(lock) ((void *)(((ULONG_PTR)&lock->Ptr + 1) & ~1)) +#define srwlock_key_shared(lock) ((void *)(((ULONG_PTR)&lock->Ptr + 3) & ~1)) #else -#define srwlock_key_exclusive(lock) ((void *)((char *)&lock->Ptr + 2)) -#define srwlock_key_shared(lock) (&lock->Ptr) +#define srwlock_key_exclusive(lock) ((void *)(((ULONG_PTR)&lock->Ptr + 3) & ~1)) +#define srwlock_key_shared(lock) ((void *)(((ULONG_PTR)&lock->Ptr + 1) & ~1)) #endif static inline void srwlock_check_invalid( unsigned int val )

1 0

Zebediah Figura : ntdll: Handle unaligned condition variables when using futexes.
by Alexandre Julliard April 14, 2020

April 14, 2020

Module: wine Branch: master Commit: aceff2102296300010dc8db7db72f059a3204eeb URL: https://source.winehq.org/git/wine.git/?a=commit;h=aceff2102296300010dc8db7… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Apr 13 18:09:43 2020 -0500 ntdll: Handle unaligned condition variables when using futexes. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48389 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/sync.c | 76 +++++++++++++++++------------ dlls/ntdll/sync.c | 117 ++++++++++++++++++++++++++++++++++++++------- 2 files changed, 144 insertions(+), 49 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=aceff2102296300010dc…

1 0

Zebediah Figura : devenum: Don't support VT_LPWSTR in IPropertyBag methods.
by Alexandre Julliard April 14, 2020

April 14, 2020

Module: wine Branch: master Commit: e3df3ca839bfdd9a3fc71ddff04d72d40ee4ef7a URL: https://source.winehq.org/git/wine.git/?a=commit;h=e3df3ca839bfdd9a3fc71ddf… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Apr 14 00:16:02 2020 -0500 devenum: Don't support VT_LPWSTR in IPropertyBag methods. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/devenum/mediacatenum.c | 10 ++-------- dlls/devenum/tests/devenum.c | 4 ++-- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/dlls/devenum/mediacatenum.c b/dlls/devenum/mediacatenum.c index 4a5ae45e8b..aab044cbad 100644 --- a/dlls/devenum/mediacatenum.c +++ b/dlls/devenum/mediacatenum.c @@ -170,11 +170,6 @@ static HRESULT WINAPI property_bag_Read(IPropertyBag *iface, case REG_SZ: switch (V_VT(pVar)) { - case VT_LPWSTR: - V_BSTR(pVar) = CoTaskMemAlloc(received); - memcpy(V_BSTR(pVar), pData, received); - res = S_OK; - break; case VT_EMPTY: V_VT(pVar) = VT_BSTR; /* fall through */ @@ -261,7 +256,6 @@ static HRESULT WINAPI property_bag_Write(IPropertyBag *iface, switch (V_VT(pVar)) { case VT_BSTR: - case VT_LPWSTR: TRACE("writing %s\n", debugstr_w(V_BSTR(pVar))); lpData = V_BSTR(pVar); dwType = REG_SZ; @@ -481,13 +475,13 @@ static HRESULT WINAPI moniker_BindToObject(IMoniker *iface, IBindCtx *pbc, pProp = pvptr; if (SUCCEEDED(res)) { - V_VT(&var) = VT_LPWSTR; + V_VT(&var) = VT_BSTR; res = IPropertyBag_Read(pProp, clsidW, &var, NULL); } if (SUCCEEDED(res)) { res = CLSIDFromString(V_BSTR(&var), &clsID); - CoTaskMemFree(V_BSTR(&var)); + VariantClear(&var); } if (SUCCEEDED(res)) { diff --git a/dlls/devenum/tests/devenum.c b/dlls/devenum/tests/devenum.c index 89f6f8d5bb..ce452e3904 100644 --- a/dlls/devenum/tests/devenum.c +++ b/dlls/devenum/tests/devenum.c @@ -359,7 +359,7 @@ static void test_directshow_filter(void) VariantClear(&var); V_VT(&var) = VT_LPWSTR; hr = IPropertyBag_Read(prop_bag, L"FriendlyName", &var, NULL); - todo_wine ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); V_VT(&var) = VT_BSTR; hr = IPropertyBag_Read(prop_bag, L"FriendlyName", &var, NULL); @@ -517,7 +517,7 @@ static void test_codec(void) VariantClear(&var); V_VT(&var) = VT_LPWSTR; hr = IPropertyBag_Read(prop_bag, L"FriendlyName", &var, NULL); - todo_wine ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); V_VT(&var) = VT_BSTR; hr = IPropertyBag_Read(prop_bag, L"FriendlyName", &var, NULL);

1 0

Ziqing Hui : comctl32/tests: Add more tests for ILD_PRESERVEALPHA.
by Alexandre Julliard April 14, 2020

April 14, 2020

Module: wine Branch: master Commit: a6bb675eb7b9c12020e0af93793442aaba967b1d URL: https://source.winehq.org/git/wine.git/?a=commit;h=a6bb675eb7b9c12020e0af93… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Tue Apr 14 10:39:50 2020 +0800 comctl32/tests: Add more tests for ILD_PRESERVEALPHA. Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/imagelist.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/comctl32/tests/imagelist.c b/dlls/comctl32/tests/imagelist.c index 1c047e046c..d3f12e1679 100644 --- a/dlls/comctl32/tests/imagelist.c +++ b/dlls/comctl32/tests/imagelist.c @@ -1599,7 +1599,10 @@ static void test_ImageList_DrawIndirect(void) todo_wine check_ImageList_DrawIndirect_broken(hdcDst, himl, bits, iAlphaImage, ILD_BLEND50, ILS_NORMAL, 0, 0xFFE8F1FA, broken_value, __LINE__); check_ImageList_DrawIndirect_fStyle(hdcDst, himl, bits, iAlphaImage, ILD_MASK, 0xFFD3E5F7, __LINE__); check_ImageList_DrawIndirect_fStyle(hdcDst, himl, bits, iAlphaImage, ILD_IMAGE, 0xFFD3E5F7, __LINE__); + todo_wine check_ImageList_DrawIndirect_fStyle(hdcDst, himl, bits, iAlphaImage, ILD_PRESERVEALPHA, 0x895D6F81, __LINE__); + check_ImageList_DrawIndirect_broken(hdcDst, himl, bits, iAlphaImage, ILD_PRESERVEALPHA, ILS_ALPHA, 127, 0xFFE9F2FB, 0xFFAEB7C0, __LINE__); + check_ImageList_DrawIndirect_broken(hdcDst, himl, bits, iAlphaImage, ILD_PRESERVEALPHA, ILS_SATURATE, 0, 0xFFAFAFAF, 0xFFF0F0F0, __LINE__); check_ImageList_DrawIndirect_fStyle(hdcDst, himl, bits, iTransparentImage, ILD_NORMAL, 0xFFFFFFFF, __LINE__);

1 0

Serge Gautherie : winapi_test: Do not multiply type size when it is undefined, in _refresh().
by Alexandre Julliard April 14, 2020

April 14, 2020

Module: wine Branch: master Commit: 3462153a05197e4951ed6b65195829ed9cea980e URL: https://source.winehq.org/git/wine.git/?a=commit;h=3462153a05197e4951ed6b65… Author: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> Date: Tue Apr 14 11:47:23 2020 +0200 winapi_test: Do not multiply type size when it is undefined, in _refresh(). Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winapi/c_type.pm | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/tools/winapi/c_type.pm b/tools/winapi/c_type.pm index b00cf81894..c6aeb6a912 100644 --- a/tools/winapi/c_type.pm +++ b/tools/winapi/c_type.pm @@ -239,8 +239,14 @@ sub _refresh($) } else { - print STDERR "$type_name -> type_size=undef, count=$count\n" if (!defined $type_size); - $type_size *= int($count); + if (!defined $type_size) + { + print STDERR "$type_name -> type_size=undef, count=$count\n"; + } + else + { + $type_size *= int($count); + } } } if ($bitfield_size != 0)

1 0

Zebediah Figura : devenum/tests: Add more tests for IPropertyBag methods.
by Alexandre Julliard April 14, 2020

April 14, 2020

Module: wine Branch: master Commit: 27f13b2bb4d0b9837775fe0a8a9e485eca53da0e URL: https://source.winehq.org/git/wine.git/?a=commit;h=27f13b2bb4d0b9837775fe0a… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Apr 14 00:16:01 2020 -0500 devenum/tests: Add more tests for IPropertyBag methods. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/devenum/tests/devenum.c | 128 +++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 124 insertions(+), 4 deletions(-) diff --git a/dlls/devenum/tests/devenum.c b/dlls/devenum/tests/devenum.c index a666b2753b..89f6f8d5bb 100644 --- a/dlls/devenum/tests/devenum.c +++ b/dlls/devenum/tests/devenum.c @@ -310,8 +310,10 @@ static IMoniker *check_display_name_(int line, IParseDisplayName *parser, WCHAR static void test_directshow_filter(void) { + SAFEARRAYBOUND bound = {.cElements = 10}; IParseDisplayName *parser; IPropertyBag *prop_bag; + void *array_data; IMoniker *mon; WCHAR buffer[200]; LRESULT res; @@ -348,9 +350,72 @@ static void test_directshow_filter(void) ok(find_moniker(&CLSID_AudioRendererCategory, mon), "filter should be registered\n"); VariantClear(&var); + V_VT(&var) = VT_EMPTY; hr = IPropertyBag_Read(prop_bag, L"FriendlyName", &var, NULL); - ok(hr == S_OK, "Read failed: %#x\n", hr); - ok(!wcscmp(V_BSTR(&var), L"test"), "got %s\n", wine_dbgstr_w(V_BSTR(&var))); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(V_VT(&var) == VT_BSTR, "Got type %#x.\n", V_VT(&var)); + ok(!wcscmp(V_BSTR(&var), L"test"), "Got name %s.\n", wine_dbgstr_w(V_BSTR(&var))); + + VariantClear(&var); + V_VT(&var) = VT_LPWSTR; + hr = IPropertyBag_Read(prop_bag, L"FriendlyName", &var, NULL); + todo_wine ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); + + V_VT(&var) = VT_BSTR; + hr = IPropertyBag_Read(prop_bag, L"FriendlyName", &var, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(V_VT(&var) == VT_BSTR, "Got type %#x.\n", V_VT(&var)); + ok(!wcscmp(V_BSTR(&var), L"test"), "Got name %s.\n", wine_dbgstr_w(V_BSTR(&var))); + + V_VT(&var) = VT_LPWSTR; + hr = IPropertyBag_Write(prop_bag, L"FriendlyName", &var); + todo_wine ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); + VariantClear(&var); + + V_VT(&var) = VT_I4; + V_I4(&var) = 0xdeadbeef; + hr = IPropertyBag_Write(prop_bag, L"foobar", &var); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + V_VT(&var) = VT_EMPTY; + hr = IPropertyBag_Read(prop_bag, L"foobar", &var, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(V_VT(&var) == VT_I4, "Got type %#x.\n", V_VT(&var)); + ok(V_I4(&var) == 0xdeadbeef, "Got value %#x.\n", V_I4(&var)); + + V_VT(&var) = VT_UI4; + hr = IPropertyBag_Read(prop_bag, L"foobar", &var, NULL); + todo_wine ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); + V_VT(&var) = VT_BSTR; + hr = IPropertyBag_Read(prop_bag, L"foobar", &var, NULL); + ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); + + V_VT(&var) = VT_I4; + hr = IPropertyBag_Read(prop_bag, L"foobar", &var, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(V_VT(&var) == VT_I4, "Got type %#x.\n", V_VT(&var)); + ok(V_I4(&var) == 0xdeadbeef, "Got value %#x.\n", V_I4(&var)); + + V_VT(&var) = VT_UI4; + hr = IPropertyBag_Write(prop_bag, L"foobar", &var); + todo_wine ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); + + V_VT(&var) = VT_ARRAY | VT_UI1; + V_ARRAY(&var) = SafeArrayCreate(VT_UI1, 1, &bound); + SafeArrayAccessData(V_ARRAY(&var), &array_data); + memcpy(array_data, "test data", 10); + SafeArrayUnaccessData(V_ARRAY(&var)); + hr = IPropertyBag_Write(prop_bag, L"foobar", &var); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + VariantClear(&var); + V_VT(&var) = VT_EMPTY; + hr = IPropertyBag_Read(prop_bag, L"foobar", &var, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(V_VT(&var) == (VT_ARRAY | VT_UI1), "Got type %#x.\n", V_VT(&var)); + SafeArrayAccessData(V_ARRAY(&var), &array_data); + ok(!memcmp(array_data, "test data", 10), "Got wrong data.\n"); + SafeArrayUnaccessData(V_ARRAY(&var)); IMoniker_Release(mon); @@ -405,8 +470,10 @@ static void test_directshow_filter(void) static void test_codec(void) { + SAFEARRAYBOUND bound = {.cElements = 10}; IParseDisplayName *parser; IPropertyBag *prop_bag; + void *array_data; IMoniker *mon; WCHAR buffer[200]; VARIANT var; @@ -436,10 +503,63 @@ static void test_codec(void) hr = IPropertyBag_Write(prop_bag, L"FriendlyName", &var); ok(hr == S_OK, "Write failed: %#x\n", hr); + V_VT(&var) = VT_LPWSTR; + hr = IPropertyBag_Write(prop_bag, L"FriendlyName", &var); + todo_wine ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); + VariantClear(&var); + V_VT(&var) = VT_EMPTY; hr = IPropertyBag_Read(prop_bag, L"FriendlyName", &var, NULL); - ok(hr == S_OK, "Read failed: %#x\n", hr); - ok(!wcscmp(V_BSTR(&var), L"test"), "got %s\n", wine_dbgstr_w(V_BSTR(&var))); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(V_VT(&var) == VT_BSTR, "Got type %#x.\n", V_VT(&var)); + ok(!wcscmp(V_BSTR(&var), L"test"), "Got name %s.\n", wine_dbgstr_w(V_BSTR(&var))); + + VariantClear(&var); + V_VT(&var) = VT_LPWSTR; + hr = IPropertyBag_Read(prop_bag, L"FriendlyName", &var, NULL); + todo_wine ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); + + V_VT(&var) = VT_BSTR; + hr = IPropertyBag_Read(prop_bag, L"FriendlyName", &var, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(V_VT(&var) == VT_BSTR, "Got type %#x.\n", V_VT(&var)); + ok(!wcscmp(V_BSTR(&var), L"test"), "Got name %s.\n", wine_dbgstr_w(V_BSTR(&var))); + + V_VT(&var) = VT_I4; + V_I4(&var) = 0xdeadbeef; + hr = IPropertyBag_Write(prop_bag, L"foobar", &var); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + V_VT(&var) = VT_EMPTY; + hr = IPropertyBag_Read(prop_bag, L"foobar", &var, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(V_VT(&var) == VT_I4, "Got type %#x.\n", V_VT(&var)); + ok(V_I4(&var) == 0xdeadbeef, "Got value %#x.\n", V_I4(&var)); + + V_VT(&var) = VT_UI4; + hr = IPropertyBag_Read(prop_bag, L"foobar", &var, NULL); + todo_wine ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); + V_VT(&var) = VT_BSTR; + hr = IPropertyBag_Read(prop_bag, L"foobar", &var, NULL); + ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); + + V_VT(&var) = VT_I4; + hr = IPropertyBag_Read(prop_bag, L"foobar", &var, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(V_VT(&var) == VT_I4, "Got type %#x.\n", V_VT(&var)); + ok(V_I4(&var) == 0xdeadbeef, "Got value %#x.\n", V_I4(&var)); + + V_VT(&var) = VT_UI4; + hr = IPropertyBag_Write(prop_bag, L"foobar", &var); + todo_wine ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); + + V_VT(&var) = VT_ARRAY | VT_UI1; + V_ARRAY(&var) = SafeArrayCreate(VT_UI1, 1, &bound); + SafeArrayAccessData(V_ARRAY(&var), &array_data); + memcpy(array_data, "test data", 10); + SafeArrayUnaccessData(V_ARRAY(&var)); + hr = IPropertyBag_Write(prop_bag, L"foobar", &var); + ok(hr == S_OK, "Got hr %#x.\n", hr); /* unlike DirectShow filters, these are automatically generated, so * enumerating them will destroy the key */

1 0