wine-commits May 2019

wine-commits@winehq.org

2 participants
1019 discussions

Zebediah Figura : setupapi: Extract individual files from cabinets.
by Alexandre Julliard 01 May '19

01 May '19

Module: wine Branch: master Commit: fccb7552ebe81ea2c0c17bc747a920f90e2537a5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fccb7552ebe81ea2c0c17bc7… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed May 1 09:52:02 2019 -0500 setupapi: Extract individual files from cabinets. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/queue.c | 88 +++++++++++++++++++++++++++++++-------------------- 1 file changed, 54 insertions(+), 34 deletions(-) diff --git a/dlls/setupapi/queue.c b/dlls/setupapi/queue.c index cc17966..f033ef7 100644 --- a/dlls/setupapi/queue.c +++ b/dlls/setupapi/queue.c @@ -353,8 +353,52 @@ static WCHAR *get_destination_dir( HINF hinf, const WCHAR *section ) return strdupW( systemdir ); } +struct extract_cab_ctx +{ + const WCHAR *src; + const WCHAR *dst; +}; + +static UINT WINAPI extract_cab_cb( void *arg, UINT message, UINT_PTR param1, UINT_PTR param2 ) +{ + struct extract_cab_ctx *ctx = arg; + + switch (message) + { + case SPFILENOTIFY_FILEINCABINET: + { + FILE_IN_CABINET_INFO_W *info = (FILE_IN_CABINET_INFO_W *)param1; + const WCHAR *filename; + + if ((filename = strrchrW( info->NameInCabinet, '\\' ))) + filename++; + else + filename = info->NameInCabinet; + + if (lstrcmpiW( filename, ctx->src )) + return FILEOP_SKIP; -static void (WINAPI *pExtractFiles)( LPSTR, LPSTR, DWORD, DWORD, DWORD, DWORD ); + strcpyW( info->FullTargetName, ctx->dst ); + return FILEOP_DOIT; + } + case SPFILENOTIFY_FILEEXTRACTED: + { + const FILEPATHS_W *paths = (const FILEPATHS_W *)param1; + return paths->Win32Error; + } + case SPFILENOTIFY_NEEDNEWCABINET: + { + const CABINET_INFO_W *info = (const CABINET_INFO_W *)param1; + strcpyW( (WCHAR *)param2, info->CabinetPath ); + return ERROR_SUCCESS; + } + case SPFILENOTIFY_CABINETINFO: + return 0; + default: + FIXME("Unexpected message %#x.\n", message); + return 0; + } +} /*********************************************************************** * extract_cabinet_file @@ -365,44 +409,20 @@ static BOOL extract_cabinet_file( const WCHAR *cabinet, const WCHAR *root, const WCHAR *src, const WCHAR *dst ) { static const WCHAR extW[] = {'.','c','a','b',0}; - static HMODULE advpack; - - char *cab_path, *cab_file; + static const WCHAR backslashW[] = {'\\',0}; + struct extract_cab_ctx ctx = {src, dst}; int len = strlenW( cabinet ); + WCHAR path[MAX_PATH]; /* make sure the cabinet file has a .cab extension */ if (len <= 4 || strcmpiW( cabinet + len - 4, extW )) return FALSE; - if (!pExtractFiles) - { - if (!advpack && !(advpack = LoadLibraryA( "advpack.dll" ))) - { - ERR( "could not load advpack.dll\n" ); - return FALSE; - } - if (!(pExtractFiles = (void *)GetProcAddress( advpack, "ExtractFiles" ))) - { - ERR( "could not find ExtractFiles in advpack.dll\n" ); - return FALSE; - } - } - if (!(cab_path = strdupWtoA( root ))) return FALSE; - len = WideCharToMultiByte( CP_ACP, 0, cabinet, -1, NULL, 0, NULL, NULL ); - if (!(cab_file = HeapAlloc( GetProcessHeap(), 0, strlen(cab_path) + len + 1 ))) - { - HeapFree( GetProcessHeap(), 0, cab_path ); - return FALSE; - } - strcpy( cab_file, cab_path ); - if (cab_file[0] && cab_file[strlen(cab_file)-1] != '\\') strcat( cab_file, "\\" ); - WideCharToMultiByte( CP_ACP, 0, cabinet, -1, cab_file + strlen(cab_file), len, NULL, NULL ); - FIXME( "awful hack: extracting cabinet %s\n", debugstr_a(cab_file) ); - pExtractFiles( cab_file, cab_path, 0, 0, 0, 0 ); - HeapFree( GetProcessHeap(), 0, cab_file ); - HeapFree( GetProcessHeap(), 0, cab_path ); - return CopyFileW( src, dst, FALSE /*FIXME*/ ); -} + strcpyW(path, root); + strcatW(path, backslashW); + strcatW(path, cabinet); + return SetupIterateCabinetW( path, 0, extract_cab_cb, &ctx ); +} /*********************************************************************** * SetupOpenFileQueue (SETUPAPI.@) @@ -1309,7 +1329,7 @@ BOOL WINAPI SetupCommitFileQueueW( HWND owner, HSPFILEQ handle, PSP_FILE_CALLBAC if (op->src_tag) { if (extract_cabinet_file( op->src_tag, op->src_root, - paths.Source, paths.Target )) break; + op->src_file, paths.Target )) break; } paths.Win32Error = GetLastError(); op_result = handler( context, SPFILENOTIFY_COPYERROR,

1 0

Alexandre Julliard : crypt32: Fix comparison of domain name components.
by Alexandre Julliard 01 May '19

01 May '19

Module: wine Branch: master Commit: 9e9b28a1797fdb0b221c8c0ee2e6d0ca949f589a URL: https://source.winehq.org/git/wine.git/?a=commit;h=9e9b28a1797fdb0b221c8c0e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 1 22:19:18 2019 +0200 crypt32: Fix comparison of domain name components. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crypt32/chain.c | 27 +++++++++++---------------- 1 file changed, 11 insertions(+), 16 deletions(-) diff --git a/dlls/crypt32/chain.c b/dlls/crypt32/chain.c index 41c87b7..396a563 100644 --- a/dlls/crypt32/chain.c +++ b/dlls/crypt32/chain.c @@ -3214,12 +3214,11 @@ static BOOL match_dns_to_subject_alt_name(const CERT_EXTENSION *ext, } static BOOL find_matching_domain_component(const CERT_NAME_INFO *name, - LPCWSTR component) + const WCHAR *component, size_t len) { - BOOL matches = FALSE; DWORD i, j; - for (i = 0; !matches && i < name->cRDN; i++) + for (i = 0; i < name->cRDN; i++) for (j = 0; j < name->rgRDN[i].cRDNAttr; j++) if (!strcmp(szOID_DOMAIN_COMPONENT, name->rgRDN[i].rgRDNAttr[j].pszObjId)) @@ -3227,15 +3226,16 @@ static BOOL find_matching_domain_component(const CERT_NAME_INFO *name, const CERT_RDN_ATTR *attr; attr = &name->rgRDN[i].rgRDNAttr[j]; - /* Compare with memicmpW rather than strcmpiW in order to avoid + /* Compare with strncmpiW rather than strcmpiW in order to avoid * a match with a string with an embedded NULL. The component * must match one domain component attribute's entire string * value with a case-insensitive match. */ - matches = !memicmpW(component, (LPCWSTR)attr->Value.pbData, - attr->Value.cbData / sizeof(WCHAR)); + if ((len == attr->Value.cbData / sizeof(WCHAR)) && + !strncmpiW(component, (LPCWSTR)attr->Value.pbData, len)) + return TRUE; } - return matches; + return FALSE; } static BOOL match_domain_component(LPCWSTR allowed_component, DWORD allowed_len, @@ -3397,23 +3397,18 @@ static BOOL match_dns_to_subject_dn(PCCERT_CONTEXT cert, LPCWSTR server_name) do { LPCWSTR dot = strchrW(ptr, '.'), end; /* 254 is the maximum DNS label length, see RFC 1035 */ - WCHAR component[255]; - DWORD len; + size_t len; end = dot ? dot : ptr + strlenW(ptr); len = end - ptr; - if (len >= ARRAY_SIZE(component)) + if (len >= 255) { WARN_(chain)("domain component %s too long\n", debugstr_wn(ptr, len)); matches = FALSE; } - else - { - memcpy(component, ptr, len * sizeof(WCHAR)); - component[len] = 0; - matches = find_matching_domain_component(name, component); - } + else matches = find_matching_domain_component(name, ptr, len); + ptr = dot ? dot + 1 : end; } while (matches && ptr && *ptr); }

1 0

Alexandre Julliard : include: Add DECLSPEC_IMPORT on OpenGL functions when not building opengl32.
by Alexandre Julliard 01 May '19

01 May '19

Module: wine Branch: master Commit: 8a576c9906a61f1441e8aacda1fecc30c2d4d7b4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8a576c9906a61f1441e8aacd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 1 20:59:11 2019 +0200 include: Add DECLSPEC_IMPORT on OpenGL functions when not building opengl32. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/opengl32/Makefile.in | 1 + include/wingdi.h | 46 ++++++++++++++++++++++++++-------------------- 2 files changed, 27 insertions(+), 20 deletions(-) diff --git a/dlls/opengl32/Makefile.in b/dlls/opengl32/Makefile.in index 3b1293e..196bb5d 100644 --- a/dlls/opengl32/Makefile.in +++ b/dlls/opengl32/Makefile.in @@ -1,4 +1,5 @@ MODULE = opengl32.dll +EXTRADEFS = -D_OPENGL32_ IMPORTLIB = opengl32 IMPORTS = user32 gdi32 advapi32 DELAYIMPORTS = glu32 diff --git a/include/wingdi.h b/include/wingdi.h index 01d3ff3..347ce1a 100644 --- a/include/wingdi.h +++ b/include/wingdi.h @@ -30,6 +30,12 @@ extern "C" { #define WINGDIAPI DECLSPEC_IMPORT #endif +#ifdef _OPENGL32_ +#define WGLAPI +#else +#define WGLAPI DECLSPEC_IMPORT +#endif + typedef struct _ABCFLOAT { FLOAT abcfA; FLOAT abcfB; @@ -3994,26 +4000,26 @@ WINGDIAPI BOOL WINAPI PolyTextOutW(HDC,const POLYTEXTW*,INT); #define WGL_FONT_POLYGONS 1 /* WGL prototypes */ -WINGDIAPI HGLRC WINAPI wglCreateContext(HDC); -WINGDIAPI HGLRC WINAPI wglCreateLayerContext(HDC,INT); -WINGDIAPI BOOL WINAPI wglCopyContext(HGLRC,HGLRC,UINT); -WINGDIAPI BOOL WINAPI wglDeleteContext(HGLRC); -WINGDIAPI BOOL WINAPI wglDescribeLayerPlane(HDC,INT,INT,UINT,LPLAYERPLANEDESCRIPTOR); -WINGDIAPI HGLRC WINAPI wglGetCurrentContext(void); -WINGDIAPI HDC WINAPI wglGetCurrentDC(void); -WINGDIAPI INT WINAPI wglGetLayerPaletteEntries(HDC,INT,INT,INT,const COLORREF *); -WINGDIAPI PROC WINAPI wglGetProcAddress(LPCSTR); -WINGDIAPI BOOL WINAPI wglMakeCurrent(HDC,HGLRC); -WINGDIAPI BOOL WINAPI wglRealizeLayerPalette(HDC,INT,BOOL); -WINGDIAPI INT WINAPI wglSetLayerPaletteEntries(HDC,INT,INT,INT,const COLORREF *); -WINGDIAPI BOOL WINAPI wglShareLists(HGLRC,HGLRC); -WINGDIAPI BOOL WINAPI wglSwapLayerBuffers(HDC,UINT); -WINGDIAPI BOOL WINAPI wglUseFontBitmapsA(HDC,DWORD,DWORD,DWORD); -WINGDIAPI BOOL WINAPI wglUseFontBitmapsW(HDC,DWORD,DWORD,DWORD); -#define wglUseFontBitmaps WINELIB_NAME_AW(wglUseFontBitmaps) -WINGDIAPI BOOL WINAPI wglUseFontOutlinesA(HDC,DWORD,DWORD,DWORD,FLOAT,FLOAT,INT,LPGLYPHMETRICSFLOAT); -WINGDIAPI BOOL WINAPI wglUseFontOutlinesW(HDC,DWORD,DWORD,DWORD,FLOAT,FLOAT,INT,LPGLYPHMETRICSFLOAT); -#define wglUseFontOutlines WINELIB_NAME_AW(wglUseFontOutlines) +WGLAPI HGLRC WINAPI wglCreateContext(HDC); +WGLAPI HGLRC WINAPI wglCreateLayerContext(HDC,INT); +WGLAPI BOOL WINAPI wglCopyContext(HGLRC,HGLRC,UINT); +WGLAPI BOOL WINAPI wglDeleteContext(HGLRC); +WGLAPI BOOL WINAPI wglDescribeLayerPlane(HDC,INT,INT,UINT,LPLAYERPLANEDESCRIPTOR); +WGLAPI HGLRC WINAPI wglGetCurrentContext(void); +WGLAPI HDC WINAPI wglGetCurrentDC(void); +WGLAPI INT WINAPI wglGetLayerPaletteEntries(HDC,INT,INT,INT,const COLORREF *); +WGLAPI PROC WINAPI wglGetProcAddress(LPCSTR); +WGLAPI BOOL WINAPI wglMakeCurrent(HDC,HGLRC); +WGLAPI BOOL WINAPI wglRealizeLayerPalette(HDC,INT,BOOL); +WGLAPI INT WINAPI wglSetLayerPaletteEntries(HDC,INT,INT,INT,const COLORREF *); +WGLAPI BOOL WINAPI wglShareLists(HGLRC,HGLRC); +WGLAPI BOOL WINAPI wglSwapLayerBuffers(HDC,UINT); +WGLAPI BOOL WINAPI wglUseFontBitmapsA(HDC,DWORD,DWORD,DWORD); +WGLAPI BOOL WINAPI wglUseFontBitmapsW(HDC,DWORD,DWORD,DWORD); +#define wglUseFontBitmaps WINELIB_NAME_AW(wglUseFontBitmaps) +WGLAPI BOOL WINAPI wglUseFontOutlinesA(HDC,DWORD,DWORD,DWORD,FLOAT,FLOAT,INT,LPGLYPHMETRICSFLOAT); +WGLAPI BOOL WINAPI wglUseFontOutlinesW(HDC,DWORD,DWORD,DWORD,FLOAT,FLOAT,INT,LPGLYPHMETRICSFLOAT); +#define wglUseFontOutlines WINELIB_NAME_AW(wglUseFontOutlines) #ifdef __cplusplus }

1 0

Alexandre Julliard : configure: Disable stdcall fixups for PE builds.
by Alexandre Julliard 01 May '19

01 May '19

Module: wine Branch: master Commit: 74799527b022649c75a2ef4c8d5916cccdb7ab35 URL: https://source.winehq.org/git/wine.git/?a=commit;h=74799527b022649c75a2ef4c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 1 19:34:18 2019 +0200 configure: Disable stdcall fixups for PE builds. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 3 +++ configure.ac | 4 ++++ 2 files changed, 7 insertions(+) diff --git a/configure b/configure index 40c6a7d..3cb8bc5 100755 --- a/configure +++ b/configure @@ -8227,6 +8227,9 @@ fi LIBEXT="dll" DLLEXT="" + case $host_cpu in + *i[3456]86*) LDDLLFLAGS="-Wl,--disable-stdcall-fixup" ;; + esac enable_iphlpapi=${enable_iphlpapi:-no} enable_kernel32=${enable_kernel32:-no} enable_ntdll=${enable_ntdll:-no} diff --git a/configure.ac b/configure.ac index e35189c..cd6e61a 100644 --- a/configure.ac +++ b/configure.ac @@ -728,6 +728,10 @@ case $host_os in AC_CHECK_TOOL(DLLTOOL,dlltool,false) LIBEXT="dll" DLLEXT="" + dnl Disable stdcall fixups to catch prototype mismatches + case $host_cpu in + *i[[3456]]86*) LDDLLFLAGS="-Wl,--disable-stdcall-fixup" ;; + esac dnl Disable modules that can't be used on Windows enable_iphlpapi=${enable_iphlpapi:-no} enable_kernel32=${enable_kernel32:-no}

1 0

Alexandre Julliard : makefiles: Don't use custom LDFLAGS to link dlls.
by Alexandre Julliard 01 May '19

01 May '19

Module: wine Branch: master Commit: 21e1018ebdbe3d7d1b3f657c14105f8e6ce67474 URL: https://source.winehq.org/git/wine.git/?a=commit;h=21e1018ebdbe3d7d1b3f657c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 1 17:40:33 2019 +0200 makefiles: Don't use custom LDFLAGS to link dlls. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/makedep.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/tools/makedep.c b/tools/makedep.c index f5c5e0a..b932b9c 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -2945,7 +2945,6 @@ static void output_source_spec( struct makefile *make, struct incl_file *source, output_filename( source->filename ); output_filename( obj_name ); output_filenames( all_libs ); - output_filename( "$(LDFLAGS)" ); output( "\n" ); } @@ -3171,7 +3170,6 @@ static void output_module( struct makefile *make ) output_filenames_obj_dir( make, need_cross ? make->crossobj_files : make->object_files ); output_filenames_obj_dir( make, make->res_files ); output_filenames( all_libs ); - output_filename( "$(LDFLAGS)" ); output( "\n" ); if (spec_file && make->importlib) @@ -3320,7 +3318,6 @@ static void output_test_module( struct makefile *make ) output_filenames_obj_dir( make, crosstarget ? make->crossobj_files : make->object_files ); output_filenames_obj_dir( make, make->res_files ); output_filenames( all_libs ); - output_filename( "$(LDFLAGS)" ); output( "\n" ); output( "%s%s:\n", obj_dir_path( make, stripped ), ext ); output_winegcc_command( make, !!crosstarget ); @@ -3330,7 +3327,6 @@ static void output_test_module( struct makefile *make ) output_filenames_obj_dir( make, crosstarget ? make->crossobj_files : make->object_files ); output_filenames_obj_dir( make, make->res_files ); output_filenames( all_libs ); - output_filename( "$(LDFLAGS)" ); output( "\n" ); output( "%s%s %s%s:", obj_dir_path( make, testmodule ), ext, obj_dir_path( make, stripped ), ext ); output_filenames_obj_dir( make, crosstarget ? make->crossobj_files : make->object_files );

1 0

Nikolay Sivov : dbgeng/tests: Fix event handle leak (Coverity).
by Alexandre Julliard 01 May '19

01 May '19

Module: wine Branch: master Commit: ee7efd76f226d9e2809d03832e039b7b7f7134c9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ee7efd76f226d9e2809d0383… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed May 1 10:01:20 2019 +0300 dbgeng/tests: Fix event handle leak (Coverity). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbgeng/tests/dbgeng.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/dbgeng/tests/dbgeng.c b/dlls/dbgeng/tests/dbgeng.c index 715649b..498ecd4 100644 --- a/dlls/dbgeng/tests/dbgeng.c +++ b/dlls/dbgeng/tests/dbgeng.c @@ -448,7 +448,7 @@ static void test_module_information(void) hr = symbols->lpVtbl->GetModuleNameString(symbols, DEBUG_MODNAME_IMAGE, 0, 0, buffer, length - 1, &length); ok(hr == S_FALSE, "Failed to get image name, hr %#x.\n", hr); - ok(strlen(buffer) + 2 == length, "Unexpected length %u, %u.\n", length, strlen(buffer)); + ok(strlen(buffer) + 2 == length, "Unexpected length %u.\n", length); hr = symbols->lpVtbl->GetModuleNameString(symbols, DEBUG_MODNAME_IMAGE, 0, 0, NULL, length - 1, NULL); ok(hr == S_FALSE, "Failed to get image name, hr %#x.\n", hr); @@ -477,6 +477,7 @@ static void test_module_information(void) CloseHandle(info.hProcess); CloseHandle(info.hThread); + CloseHandle(event); client->lpVtbl->Release(client); control->lpVtbl->Release(control);

1 0

Damjan Jovanovic : qcap/vfwcapture: Implement IPin::CheckMediaType().
by Alexandre Julliard 01 May '19

01 May '19

Module: wine Branch: master Commit: 24ed16e8967d5669a50eac64f8549a603051e281 URL: https://source.winehq.org/git/wine.git/?a=commit;h=24ed16e8967d5669a50eac64… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Tue Apr 30 23:09:13 2019 -0500 qcap/vfwcapture: Implement IPin::CheckMediaType(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/capture.h | 1 + dlls/qcap/tests/Makefile.in | 3 +- dlls/qcap/tests/videocapture.c | 133 +++++++++++++++++++++++++++++++++++++++++ dlls/qcap/v4l.c | 45 ++++++++++++-- dlls/qcap/vfwcapture.c | 6 +- 5 files changed, 178 insertions(+), 10 deletions(-) diff --git a/dlls/qcap/capture.h b/dlls/qcap/capture.h index 65ed2df..aed8889 100644 --- a/dlls/qcap/capture.h +++ b/dlls/qcap/capture.h @@ -25,6 +25,7 @@ typedef struct _Capture Capture; Capture *qcap_driver_init(IPin*,USHORT) DECLSPEC_HIDDEN; HRESULT qcap_driver_destroy(Capture*) DECLSPEC_HIDDEN; +HRESULT qcap_driver_check_format(Capture*,const AM_MEDIA_TYPE*) DECLSPEC_HIDDEN; HRESULT qcap_driver_set_format(Capture*,AM_MEDIA_TYPE*) DECLSPEC_HIDDEN; HRESULT qcap_driver_get_format(const Capture*,AM_MEDIA_TYPE**) DECLSPEC_HIDDEN; HRESULT qcap_driver_get_prop_range(Capture*,VideoProcAmpProperty,LONG*,LONG*,LONG*,LONG*,LONG*) DECLSPEC_HIDDEN; diff --git a/dlls/qcap/tests/Makefile.in b/dlls/qcap/tests/Makefile.in index 2b98847..a5b9d0e 100644 --- a/dlls/qcap/tests/Makefile.in +++ b/dlls/qcap/tests/Makefile.in @@ -5,4 +5,5 @@ C_SRCS = \ audiorecord.c \ avico.c \ qcap.c \ - smartteefilter.c + smartteefilter.c \ + videocapture.c diff --git a/dlls/qcap/tests/videocapture.c b/dlls/qcap/tests/videocapture.c new file mode 100644 index 0000000..b80b0f2 --- /dev/null +++ b/dlls/qcap/tests/videocapture.c @@ -0,0 +1,133 @@ +/* + * WDM video capture filter unit tests + * + * Copyright 2019 Damjan Jovanovic + * + * 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 + */ + +#define COBJMACROS +#include "dshow.h" +#include "wine/test.h" + +static void test_media_types(IPin *pin) +{ + IEnumMediaTypes *enum_media_types; + AM_MEDIA_TYPE mt, *pmt; + HRESULT hr; + + hr = IPin_EnumMediaTypes(pin, &enum_media_types); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + while (IEnumMediaTypes_Next(enum_media_types, 1, &pmt, NULL) == S_OK) + { + hr = IPin_QueryAccept(pin, pmt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + CoTaskMemFree(pmt); + } + IEnumMediaTypes_Release(enum_media_types); + + hr = IPin_QueryAccept(pin, NULL); + todo_wine ok(hr == E_POINTER, "Got hr %#x.\n", hr); + + memset(&mt, 0, sizeof(mt)); + hr = IPin_QueryAccept(pin, &mt); + ok(hr != S_OK, "Got hr %#x.\n", hr); + + mt.majortype = MEDIATYPE_Video; + hr = IPin_QueryAccept(pin, &mt); + ok(hr != S_OK, "Got hr %#x.\n", hr); + + mt.formattype = FORMAT_VideoInfo; + hr = IPin_QueryAccept(pin, &mt); + ok(hr != S_OK, "Got hr %#x.\n", hr); + + mt.formattype = FORMAT_None; + hr = IPin_QueryAccept(pin, &mt); + ok(hr != S_OK, "Got hr %#x.\n", hr); +} + +static void test_capture(IBaseFilter *filter) +{ + IEnumPins *enum_pins; + IPin *pin; + HRESULT hr; + + hr = IBaseFilter_EnumPins(filter, &enum_pins); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + while ((hr = IEnumPins_Next(enum_pins, 1, &pin, NULL)) == S_OK) + { + PIN_DIRECTION pin_direction; + IPin_QueryDirection(pin, &pin_direction); + if (pin_direction == PINDIR_OUTPUT) + test_media_types(pin); + IPin_Release(pin); + } + + IEnumPins_Release(enum_pins); +} + +START_TEST(videocapture) +{ + ICreateDevEnum *dev_enum; + IEnumMoniker *class_enum; + IBaseFilter *filter; + IMoniker *moniker; + WCHAR *name; + HRESULT hr; + ULONG ref; + + CoInitialize(NULL); + + hr = CoCreateInstance(&CLSID_SystemDeviceEnum, NULL, CLSCTX_INPROC, + &IID_ICreateDevEnum, (void **)&dev_enum); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = ICreateDevEnum_CreateClassEnumerator(dev_enum, &CLSID_VideoInputDeviceCategory, &class_enum, 0); + if (hr == S_FALSE) + { + skip("No video capture devices present.\n"); + ICreateDevEnum_Release(dev_enum); + CoUninitialize(); + return; + } + ok(hr == S_OK, "Got hr=%#x.\n", hr); + + while (IEnumMoniker_Next(class_enum, 1, &moniker, NULL) == S_OK) + { + hr = IMoniker_GetDisplayName(moniker, NULL, NULL, &name); + ok(hr == S_OK, "Got hr %#x.\n", hr); + trace("Testing device %s.\n", wine_dbgstr_w(name)); + CoTaskMemFree(name); + + hr = IMoniker_BindToObject(moniker, NULL, NULL, &IID_IBaseFilter, (void**)&filter); + if (hr == S_OK) + { + test_capture(filter); + IBaseFilter_Release(filter); + } + else + skip("Failed to open capture device, hr=%#x.\n", hr); + + ref = IBaseFilter_Release(filter); + ok(!ref, "Got outstanding refcount %d.\n", ref); + IMoniker_Release(moniker); + } + + ICreateDevEnum_Release(dev_enum); + IEnumMoniker_Release(class_enum); + CoUninitialize(); +} diff --git a/dlls/qcap/v4l.c b/dlls/qcap/v4l.c index f0875f7..10b28b3 100644 --- a/dlls/qcap/v4l.c +++ b/dlls/qcap/v4l.c @@ -131,20 +131,48 @@ HRESULT qcap_driver_destroy(Capture *capBox) return S_OK; } +HRESULT qcap_driver_check_format(Capture *device, const AM_MEDIA_TYPE *mt) +{ + HRESULT hr; + TRACE("device %p, mt %p.\n", device, mt); + dump_AM_MEDIA_TYPE(mt); + + if (!mt) + return E_POINTER; + + if (!IsEqualGUID(&mt->majortype, &MEDIATYPE_Video)) + return S_FALSE; + + if (IsEqualGUID(&mt->formattype, &FORMAT_VideoInfo) && mt->pbFormat + && mt->cbFormat >= sizeof(VIDEOINFOHEADER)) + { + VIDEOINFOHEADER *vih = (VIDEOINFOHEADER *)mt->pbFormat; + if (vih->bmiHeader.biBitCount == 24 && vih->bmiHeader.biCompression == BI_RGB) + hr = S_OK; + else + { + FIXME("Unsupported compression %#x, bpp %u.\n", vih->bmiHeader.biCompression, + vih->bmiHeader.biBitCount); + hr = S_FALSE; + } + } + else + hr = VFW_E_INVALIDMEDIATYPE; + + return hr; +} + HRESULT qcap_driver_set_format(Capture *device, AM_MEDIA_TYPE *mt) { struct v4l2_format format = {0}; int newheight, newwidth; VIDEOINFOHEADER *vih; int fd = device->fd; + HRESULT hr; + if (FAILED(hr = qcap_driver_check_format(device, mt))) + return hr; vih = (VIDEOINFOHEADER *)mt->pbFormat; - if (vih->bmiHeader.biBitCount != 24 || vih->bmiHeader.biCompression != BI_RGB) - { - FIXME("Unsupported compression %#x, bpp %u.\n", vih->bmiHeader.biCompression, - vih->bmiHeader.biBitCount); - return VFW_E_INVALIDMEDIATYPE; - } newwidth = vih->bmiHeader.biWidth; newheight = vih->bmiHeader.biHeight; @@ -655,6 +683,11 @@ HRESULT qcap_driver_destroy(Capture *capBox) FAIL_WITH_ERR; } +HRESULT qcap_driver_check_format(Capture *device, const AM_MEDIA_TYPE *mt) +{ + FAIL_WITH_ERR; +} + HRESULT qcap_driver_set_format(Capture *capBox, AM_MEDIA_TYPE * mT) { FAIL_WITH_ERR; diff --git a/dlls/qcap/vfwcapture.c b/dlls/qcap/vfwcapture.c index 6297a80..8cf25c1 100644 --- a/dlls/qcap/vfwcapture.c +++ b/dlls/qcap/vfwcapture.c @@ -658,10 +658,10 @@ static inline VfwPinImpl *impl_from_BasePin(BasePin *pin) return CONTAINING_RECORD(pin, VfwPinImpl, pin.pin); } -static HRESULT WINAPI VfwPin_CheckMediaType(BasePin *pin, const AM_MEDIA_TYPE *amt) +static HRESULT WINAPI VfwPin_CheckMediaType(BasePin *pin, const AM_MEDIA_TYPE *mt) { - FIXME("(%p) stub\n", pin); - return E_NOTIMPL; + VfwPinImpl *filter = impl_from_BasePin(pin); + return qcap_driver_check_format(filter->parent->driver_info, mt); } static HRESULT WINAPI VfwPin_GetMediaType(BasePin *pin, int iPosition, AM_MEDIA_TYPE *pmt)

1 0

Alistair Leslie-Hughes : authz: Add AuthzFreeResourceManager stub.
by Alexandre Julliard 01 May '19

01 May '19

Module: wine Branch: master Commit: d425d519ff5582beae8eaa93164daf75979e82b1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d425d519ff5582beae8eaa93… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Apr 29 04:54:08 2019 +0000 authz: Add AuthzFreeResourceManager stub. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47082 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/authz/authz.c | 9 +++++++++ dlls/authz/authz.spec | 2 +- .../ext-ms-win-authz-context-l1-1-0.spec | 2 +- include/authz.h | 1 + 4 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/authz/authz.c b/dlls/authz/authz.c index 5502e79..72d462d 100644 --- a/dlls/authz/authz.c +++ b/dlls/authz/authz.c @@ -59,6 +59,15 @@ BOOL WINAPI AuthzInitializeResourceManager(DWORD flags, PFN_AUTHZ_DYNAMIC_ACCESS return FALSE; } +/*********************************************************************** + * AuthzFreeResourceManager (AUTHZ.@) + */ +BOOL WINAPI AuthzFreeResourceManager(AUTHZ_RESOURCE_MANAGER_HANDLE handle) +{ + FIXME("%p\n", handle); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} /*********************************************************************** * AuthzInstallSecurityEventSource (AUTHZ.@) diff --git a/dlls/authz/authz.spec b/dlls/authz/authz.spec index eb9e044..933e3d5 100644 --- a/dlls/authz/authz.spec +++ b/dlls/authz/authz.spec @@ -6,7 +6,7 @@ @ stub AuthzFreeAuditEvent @ stdcall AuthzFreeContext(long) @ stub AuthzFreeHandle -@ stub AuthzFreeResourceManager +@ stdcall AuthzFreeResourceManager(ptr) @ stub AuthzGetInformationFromContext @ stub AuthzInitializeContextFromAuthzContext @ stdcall AuthzInitializeContextFromSid(long ptr long ptr int64 ptr ptr) diff --git a/dlls/ext-ms-win-authz-context-l1-1-0/ext-ms-win-authz-context-l1-1-0.spec b/dlls/ext-ms-win-authz-context-l1-1-0/ext-ms-win-authz-context-l1-1-0.spec index 1bce6d3..2aa56d6 100644 --- a/dlls/ext-ms-win-authz-context-l1-1-0/ext-ms-win-authz-context-l1-1-0.spec +++ b/dlls/ext-ms-win-authz-context-l1-1-0/ext-ms-win-authz-context-l1-1-0.spec @@ -1,6 +1,6 @@ @ stub AuthzFreeAuditEvent @ stdcall AuthzFreeContext(long) authz.AuthzFreeContext -@ stub AuthzFreeResourceManager +@ stdcall AuthzFreeResourceManager(ptr) authz.AuthzFreeResourceManager @ stub AuthziFreeAuditEventType @ stub AuthziInitializeAuditEvent @ stub AuthziInitializeAuditEventType diff --git a/include/authz.h b/include/authz.h index 42edc8c..d93372a 100644 --- a/include/authz.h +++ b/include/authz.h @@ -103,6 +103,7 @@ BOOL WINAPI AuthzAccessCheck(DWORD flags, AUTHZ_CLIENT_CONTEXT_HANDLE client_con AUTHZ_ACCESS_CHECK_RESULTS_HANDLE *access_check_result); BOOL WINAPI AuthzFreeContext(AUTHZ_CLIENT_CONTEXT_HANDLE client_context); +BOOL WINAPI AuthzFreeResourceManager(AUTHZ_RESOURCE_MANAGER_HANDLE handle); BOOL WINAPI AuthzInitializeContextFromSid(DWORD flags, PSID sid, AUTHZ_RESOURCE_MANAGER_HANDLE resource_manager, LARGE_INTEGER *expire_time,

1 0

Erich E. Hoover : kernel32: Add SearchPath test demonstrating the priority of the working directory.
by Alexandre Julliard 01 May '19

01 May '19

Module: wine Branch: master Commit: 690a9003b353210696c6da685285a5e6400d2f09 URL: https://source.winehq.org/git/wine.git/?a=commit;h=690a9003b353210696c6da68… Author: Erich E. Hoover <erich.e.hoover(a)gmail.com> Date: Wed Apr 17 10:56:27 2019 +0200 kernel32: Add SearchPath test demonstrating the priority of the working directory. Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Erich E. Hoover <erich.e.hoover(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/path.c | 27 +++++++++++++++++++++++++-- 1 file changed, 25 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/path.c b/dlls/kernel32/tests/path.c index 0a03225..8f55083 100644 --- a/dlls/kernel32/tests/path.c +++ b/dlls/kernel32/tests/path.c @@ -1820,10 +1820,11 @@ static void test_SearchPathA(void) static const CHAR testdeprelA[] = "./testdep.dll"; static const CHAR kernel32A[] = "kernel32.dll"; static const CHAR fileA[] = ""; - CHAR pathA[MAX_PATH], buffA[MAX_PATH], path2A[MAX_PATH]; - CHAR *ptrA = NULL; + CHAR pathA[MAX_PATH], buffA[MAX_PATH], path2A[MAX_PATH], path3A[MAX_PATH], curdirA[MAX_PATH]; + CHAR tmpdirA[MAX_PATH], *ptrA = NULL; ULONG_PTR cookie; HANDLE handle; + BOOL bret; DWORD ret; GetWindowsDirectoryA(pathA, ARRAY_SIZE(pathA)); @@ -1915,6 +1916,28 @@ static void test_SearchPathA(void) ret = pDeactivateActCtx(0, cookie); ok(ret, "failed to deactivate context, %u\n", GetLastError()); pReleaseActCtx(handle); + + /* test the search path priority of the working directory */ + GetTempPathA(sizeof(tmpdirA), tmpdirA); + ret = GetCurrentDirectoryA(MAX_PATH, curdirA); + ok(ret, "failed to obtain working directory.\n"); + sprintf(pathA, "%s\\%s", tmpdirA, kernel32A); + ret = SearchPathA(NULL, kernel32A, NULL, sizeof(path2A)/sizeof(CHAR), path2A, NULL); + ok(ret && ret == strlen(path2A), "got %d\n", ret); + bret = CopyFileA(path2A, pathA, FALSE); + ok(bret != 0, "failed to copy test executable to temp directory, %u\n", GetLastError()); + sprintf(path3A, "%s%s%s", curdirA, curdirA[strlen(curdirA)-1] != '\\' ? "\\" : "", kernel32A); + bret = CopyFileA(path2A, path3A, FALSE); + ok(bret != 0, "failed to copy test executable to launch directory, %u\n", GetLastError()); + bret = SetCurrentDirectoryA(tmpdirA); + ok(bret, "failed to change working directory\n"); + ret = SearchPathA(NULL, kernel32A, ".exe", sizeof(buffA), buffA, NULL); + ok(ret && ret == strlen(buffA), "got %d\n", ret); + ok(strcmp(buffA, path3A) == 0, "expected %s, got %s\n", path3A, buffA); + bret = SetCurrentDirectoryA(curdirA); + ok(bret, "failed to reset working directory\n"); + DeleteFileA(path3A); + DeleteFileA(pathA); } static void test_SearchPathW(void)

1 0

Michael Müller : version: Correctly return VFF_CURNEDEST in VerFindFileA.
by Alexandre Julliard 01 May '19

01 May '19

Module: wine Branch: master Commit: 91f96b2827a1c70e59f7b920beed71aafd05fc2f URL: https://source.winehq.org/git/wine.git/?a=commit;h=91f96b2827a1c70e59f7b920… Author: Michael Müller <michael(a)fds-team.de> Date: Mon Apr 1 08:37:53 2019 +0200 version: Correctly return VFF_CURNEDEST in VerFindFileA. Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/version/tests/Makefile.in | 2 +- dlls/version/tests/install.c | 151 +++++++++++++++++++++++++++++++++++++++-- dlls/version/version.c | 38 +++++++---- 3 files changed, 169 insertions(+), 22 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=91f96b2827a1c70e59f7…

1 0

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 May 2019