October 2019 - Wine-commits

Joseph Kogut : ncrypt: Add NCryptIsAlgSupported stub.
by Alexandre Julliard 07 Oct '19

07 Oct '19

Module: wine Branch: master Commit: 1f75b081275c7e7991584206dad4bb37094cd80c URL: https://source.winehq.org/git/wine.git/?a=commit;h=1f75b081275c7e7991584206… Author: Joseph Kogut <joseph.kogut(a)gmail.com> Date: Fri Oct 4 18:27:12 2019 -0700 ncrypt: Add NCryptIsAlgSupported stub. Signed-off-by: Joseph Kogut <joseph.kogut(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ncrypt/main.c | 7 +++++++ dlls/ncrypt/ncrypt.spec | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/ncrypt/main.c b/dlls/ncrypt/main.c index 1f06ed398e..c0cc05c43c 100644 --- a/dlls/ncrypt/main.c +++ b/dlls/ncrypt/main.c @@ -125,6 +125,13 @@ SECURITY_STATUS WINAPI NCryptImportKey(NCRYPT_PROV_HANDLE provider, NCRYPT_KEY_H return NTE_NOT_SUPPORTED; } +SECURITY_STATUS WINAPI NCryptIsAlgSupported(NCRYPT_PROV_HANDLE provider, const WCHAR *algid, + DWORD flags) +{ + FIXME("(0x%lx, %s, 0x%08x): stub\n", provider, wine_dbgstr_w(algid), flags); + return NTE_NOT_SUPPORTED; +} + SECURITY_STATUS WINAPI NCryptOpenKey(NCRYPT_PROV_HANDLE provider, NCRYPT_KEY_HANDLE *key, const WCHAR *name, DWORD keyspec, DWORD flags) { diff --git a/dlls/ncrypt/ncrypt.spec b/dlls/ncrypt/ncrypt.spec index b58ef34434..3908cbfb91 100644 --- a/dlls/ncrypt/ncrypt.spec +++ b/dlls/ncrypt/ncrypt.spec @@ -77,7 +77,7 @@ @ stdcall NCryptGetProperty(ptr wstr ptr long ptr long) @ stub NCryptGetProtectionDescriptorInfo @ stdcall NCryptImportKey(long long wstr ptr ptr ptr long long) -@ stub NCryptIsAlgSupported +@ stub NCryptIsAlgSupported(long wstr long) @ stub NCryptIsKeyHandle @ stub NCryptKeyDerivation @ stub NCryptNotifyChangeKey

1 0

Sven Baars : comctl32/tests: Prevent some test failures by moving the cursor away from the window.
by Alexandre Julliard 07 Oct '19

07 Oct '19

Module: wine Branch: master Commit: 3dcff4de701bc08845f1945a9b8efd3c4a1aedad URL: https://source.winehq.org/git/wine.git/?a=commit;h=3dcff4de701bc08845f1945a… Author: Sven Baars <sven.wine(a)gmail.com> Date: Mon Oct 7 11:19:40 2019 +0200 comctl32/tests: Prevent some test failures by moving the cursor away from the window. Signed-off-by: Sven Baars <sven.wine(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/edit.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dlls/comctl32/tests/edit.c b/dlls/comctl32/tests/edit.c index f454434a0c..6013cafb59 100644 --- a/dlls/comctl32/tests/edit.c +++ b/dlls/comctl32/tests/edit.c @@ -3315,6 +3315,9 @@ static void test_change_focus(void) HWND hwnd, parent_wnd; WNDPROC oldproc; MSG msg; + POINT orig_pos; + + GetCursorPos(&orig_pos); parent_wnd = CreateWindowA("ParentWnd", "", WS_OVERLAPPEDWINDOW, 0, 0, 200, 200, NULL, NULL, GetModuleHandleA(NULL), NULL); @@ -3329,6 +3332,8 @@ static void test_change_focus(void) oldproc = (WNDPROC)SetWindowLongPtrA(hwnd, GWLP_WNDPROC, (LONG_PTR)edit_subclass_proc); SetWindowLongPtrA(hwnd, GWLP_USERDATA, (LONG_PTR)oldproc); + SetCursorPos(400, 400); + SetFocus(parent_wnd); flush_sequences(sequences, NUM_MSG_SEQUENCES); SetFocus(hwnd); @@ -3340,6 +3345,8 @@ static void test_change_focus(void) while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) DispatchMessageA(&msg); ok_sequence(sequences, COMBINED_SEQ_INDEX, killfocus_combined_seq, "Kill focus", TRUE); + SetCursorPos(orig_pos.x, orig_pos.y); + DestroyWindow(hwnd); }

1 0

Andrey Gusev : d3dcompiler: Add missing defines, enums and declarations.
by Alexandre Julliard 07 Oct '19

07 Oct '19

Module: wine Branch: master Commit: 6ad18ca33a738edf2eecbf0a7e7309e81c192ab6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6ad18ca33a738edf2eecbf0a… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Fri Oct 4 23:20:28 2019 +0300 d3dcompiler: Add missing defines, enums and declarations. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/d3dcompiler.h | 92 +++++++++++++++++++++++++++++++++------------------ 1 file changed, 60 insertions(+), 32 deletions(-) diff --git a/include/d3dcompiler.h b/include/d3dcompiler.h index 70bdfa273f..5151f94510 100644 --- a/include/d3dcompiler.h +++ b/include/d3dcompiler.h @@ -34,34 +34,48 @@ static const WCHAR D3DCOMPILER_DLL_W[] = {'d','3','d','c','o','m','p','i','l','e #define D3DCOMPILER_DLL_A "d3dcompiler_47.dll" #define D3DCOMPILER_DLL WINELIB_NAME_AW(D3DCOMPILER_DLL_) -#define D3DCOMPILE_DEBUG 0x00000001 -#define D3DCOMPILE_SKIP_VALIDATION 0x00000002 -#define D3DCOMPILE_SKIP_OPTIMIZATION 0x00000004 -#define D3DCOMPILE_PACK_MATRIX_ROW_MAJOR 0x00000008 -#define D3DCOMPILE_PACK_MATRIX_COLUMN_MAJOR 0x00000010 -#define D3DCOMPILE_PARTIAL_PRECISION 0x00000020 -#define D3DCOMPILE_FORCE_VS_SOFTWARE_NO_OPT 0x00000040 -#define D3DCOMPILE_FORCE_PS_SOFTWARE_NO_OPT 0x00000080 -#define D3DCOMPILE_NO_PRESHADER 0x00000100 -#define D3DCOMPILE_AVOID_FLOW_CONTROL 0x00000200 -#define D3DCOMPILE_PREFER_FLOW_CONTROL 0x00000400 -#define D3DCOMPILE_ENABLE_STRICTNESS 0x00000800 -#define D3DCOMPILE_ENABLE_BACKWARDS_COMPATIBILITY 0x00001000 -#define D3DCOMPILE_IEEE_STRICTNESS 0x00002000 -#define D3DCOMPILE_OPTIMIZATION_LEVEL0 0x00004000 -#define D3DCOMPILE_OPTIMIZATION_LEVEL1 0x00000000 -#define D3DCOMPILE_OPTIMIZATION_LEVEL2 0x0000c000 -#define D3DCOMPILE_OPTIMIZATION_LEVEL3 0x00008000 -#define D3DCOMPILE_RESERVED16 0x00010000 -#define D3DCOMPILE_RESERVED17 0x00020000 -#define D3DCOMPILE_WARNINGS_ARE_ERRORS 0x00040000 -#define D3DCOMPILE_RESOURCES_MAY_ALIAS 0x00080000 - -#define D3D_DISASM_ENABLE_COLOR_CODE 0x00000001 -#define D3D_DISASM_ENABLE_DEFAULT_VALUE_PRINTS 0x00000002 -#define D3D_DISASM_ENABLE_INSTRUCTION_NUMBERING 0x00000004 -#define D3D_DISASM_ENABLE_INSTRUCTION_CYCLE 0x00000008 -#define D3D_DISASM_DISABLE_DEBUG_INFO 0x00000010 +#define D3DCOMPILE_DEBUG 0x00000001 +#define D3DCOMPILE_SKIP_VALIDATION 0x00000002 +#define D3DCOMPILE_SKIP_OPTIMIZATION 0x00000004 +#define D3DCOMPILE_PACK_MATRIX_ROW_MAJOR 0x00000008 +#define D3DCOMPILE_PACK_MATRIX_COLUMN_MAJOR 0x00000010 +#define D3DCOMPILE_PARTIAL_PRECISION 0x00000020 +#define D3DCOMPILE_FORCE_VS_SOFTWARE_NO_OPT 0x00000040 +#define D3DCOMPILE_FORCE_PS_SOFTWARE_NO_OPT 0x00000080 +#define D3DCOMPILE_NO_PRESHADER 0x00000100 +#define D3DCOMPILE_AVOID_FLOW_CONTROL 0x00000200 +#define D3DCOMPILE_PREFER_FLOW_CONTROL 0x00000400 +#define D3DCOMPILE_ENABLE_STRICTNESS 0x00000800 +#define D3DCOMPILE_ENABLE_BACKWARDS_COMPATIBILITY 0x00001000 +#define D3DCOMPILE_IEEE_STRICTNESS 0x00002000 +#define D3DCOMPILE_OPTIMIZATION_LEVEL0 0x00004000 +#define D3DCOMPILE_OPTIMIZATION_LEVEL1 0x00000000 +#define D3DCOMPILE_OPTIMIZATION_LEVEL2 0x0000c000 +#define D3DCOMPILE_OPTIMIZATION_LEVEL3 0x00008000 +#define D3DCOMPILE_RESERVED16 0x00010000 +#define D3DCOMPILE_RESERVED17 0x00020000 +#define D3DCOMPILE_WARNINGS_ARE_ERRORS 0x00040000 +#define D3DCOMPILE_RESOURCES_MAY_ALIAS 0x00080000 +#define D3DCOMPILE_ENABLE_UNBOUNDED_DESCRIPTOR_TABLES 0x00100000 +#define D3DCOMPILE_ALL_RESOURCES_BOUND 0x00200000 +#define D3DCOMPILE_DEBUG_NAME_FOR_SOURCE 0x00400000 +#define D3DCOMPILE_DEBUG_NAME_FOR_BINARY 0x00800000 + +#define D3DCOMPILE_EFFECT_CHILD_EFFECT 0x00000001 +#define D3DCOMPILE_EFFECT_ALLOW_SLOW_OPS 0x00000002 + +#define D3DCOMPILE_FLAGS2_FORCE_ROOT_SIGNATURE_LATEST 0x00000000 +#define D3DCOMPILE_FLAGS2_FORCE_ROOT_SIGNATURE_1_0 0x00000010 +#define D3DCOMPILE_FLAGS2_FORCE_ROOT_SIGNATURE_1_1 0x00000020 + +#define D3D_DISASM_ENABLE_COLOR_CODE 0x00000001 +#define D3D_DISASM_ENABLE_DEFAULT_VALUE_PRINTS 0x00000002 +#define D3D_DISASM_ENABLE_INSTRUCTION_NUMBERING 0x00000004 +#define D3D_DISASM_ENABLE_INSTRUCTION_CYCLE 0x00000008 +#define D3D_DISASM_DISABLE_DEBUG_INFO 0x00000010 +#define D3D_DISASM_ENABLE_INSTRUCTION_OFFSET 0x00000020 +#define D3D_DISASM_INSTRUCTION_ONLY 0x00000040 +#define D3D_DISASM_PRINT_HEX_LITERALS 0x00000080 HRESULT WINAPI D3DCompile(const void *data, SIZE_T data_size, const char *filename, const D3D_SHADER_MACRO *defines, ID3DInclude *include, const char *entrypoint, @@ -69,12 +83,19 @@ HRESULT WINAPI D3DCompile(const void *data, SIZE_T data_size, const char *filena typedef HRESULT (WINAPI *pD3DCompile)(const void *data, SIZE_T data_size, const char *filename, const D3D_SHADER_MACRO *defines, ID3DInclude *include, const char *entrypoint, const char *target, UINT sflags, UINT eflags, ID3DBlob **shader, ID3DBlob **error_messages); +HRESULT WINAPI D3DCompile2(const void *data, SIZE_T data_size, const char *filename, + const D3D_SHADER_MACRO *defines, ID3DInclude *include, const char *entrypoint, + const char *target, UINT sflags, UINT eflags, UINT secondary_flags, + const void *secondary_data, SIZE_T secondary_data_size, ID3DBlob **shader, + ID3DBlob **error_messages); typedef enum D3DCOMPILER_STRIP_FLAGS { - D3DCOMPILER_STRIP_REFLECTION_DATA = 1, - D3DCOMPILER_STRIP_DEBUG_INFO = 2, - D3DCOMPILER_STRIP_TEST_BLOBS = 4, + D3DCOMPILER_STRIP_REFLECTION_DATA = 0x1, + D3DCOMPILER_STRIP_DEBUG_INFO = 0x2, + D3DCOMPILER_STRIP_TEST_BLOBS = 0x4, + D3DCOMPILER_STRIP_PRIVATE_DATA = 0x8, + D3DCOMPILER_STRIP_ROOT_SIGNATURE = 0x10, D3DCOMPILER_STRIP_FORCE_DWORD = 0x7fffffff } D3DCOMPILER_STRIP_FLAGS; @@ -91,15 +112,22 @@ typedef enum D3D_BLOB_PART D3D_BLOB_LEGACY_SHADER, D3D_BLOB_XNA_PREPASS_SHADER, D3D_BLOB_XNA_SHADER, + D3D_BLOB_PDB, + D3D_BLOB_PRIVATE_DATA, + D3D_BLOB_ROOT_SIGNATURE, + D3D_BLOB_DEBUG_NAME, D3D_BLOB_TEST_ALTERNATE_SHADER = 0x8000, D3D_BLOB_TEST_COMPILE_DETAILS, - D3D_BLOB_TEST_COMPILE_PERF + D3D_BLOB_TEST_COMPILE_PERF, + D3D_BLOB_TEST_COMPILE_REPORT } D3D_BLOB_PART; HRESULT WINAPI D3DDisassemble(const void *data, SIZE_T data_size, UINT flags, const char *comments, ID3DBlob **disassembly); typedef HRESULT (WINAPI *pD3DDisassemble)(const void *data, SIZE_T data_size, UINT flags, const char *comments, ID3DBlob **disassembly); +HRESULT WINAPI D3DCompileFromFile(const WCHAR *filename, const D3D_SHADER_MACRO *defines, ID3DInclude *includes, + const char *entrypoint, const char *target, UINT flags1, UINT flags2, ID3DBlob **code, ID3DBlob **errors); HRESULT WINAPI D3DGetBlobPart(const void *data, SIZE_T data_size, D3D_BLOB_PART part, UINT flags, ID3DBlob **blob); HRESULT WINAPI D3DGetInputSignatureBlob(const void *data, SIZE_T data_size, ID3DBlob **blob); HRESULT WINAPI D3DGetOutputSignatureBlob(const void *data, SIZE_T data_size, ID3DBlob **blob);

1 0

Alexandre Julliard : make_unicode: Avoid duplicate lead bytes.
by Alexandre Julliard 07 Oct '19

07 Oct '19

Module: wine Branch: master Commit: a9285c51315d5c669349697148155769a37b126a URL: https://source.winehq.org/git/wine.git/?a=commit;h=a9285c51315d5c6693496971… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Oct 6 13:39:53 2019 +0200 make_unicode: Avoid duplicate lead bytes. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/port/c_10001.c | 1503 +-------------------------------------------------- tools/make_unicode | 6 +- 2 files changed, 11 insertions(+), 1498 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a9285c51315d5c669349…

1 0

Sven Baars : wbemprox: Fix a string leak (Valgrind).
by Alexandre Julliard 07 Oct '19

07 Oct '19

Module: wine Branch: master Commit: e4f078681668b0f393eb756472682e9b3a25622f URL: https://source.winehq.org/git/wine.git/?a=commit;h=e4f078681668b0f393eb7564… Author: Sven Baars <sven.wine(a)gmail.com> Date: Fri Oct 4 21:58:39 2019 +0200 wbemprox: Fix a string leak (Valgrind). Signed-off-by: Sven Baars <sven.wine(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemprox/query.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wbemprox/query.c b/dlls/wbemprox/query.c index 0f43412473..0f7eada9af 100644 --- a/dlls/wbemprox/query.c +++ b/dlls/wbemprox/query.c @@ -632,6 +632,7 @@ done: if (query) release_query( query ); free_path( path ); SysFreeString( antecedent ); + heap_free( str ); return hr; }

1 0

Sven Baars : wbemprox/tests: Fix a memory leak (Valgrind).
by Alexandre Julliard 07 Oct '19

07 Oct '19

Module: wine Branch: master Commit: ffb9bd9e6c99677572b695d453c9b5c87a7162f4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ffb9bd9e6c99677572b695d4… Author: Sven Baars <sven.wine(a)gmail.com> Date: Fri Oct 4 21:58:40 2019 +0200 wbemprox/tests: Fix a memory leak (Valgrind). Signed-off-by: Sven Baars <sven.wine(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemprox/tests/query.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index cdbbc02820..1c6ffcaf8d 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -1654,6 +1654,7 @@ static void test_Win32_PnPEntity( IWbemServices *services ) VariantClear( &val ); } } + IWbemClassObject_Release( obj ); } SysFreeString( bstr );

1 0

Sven Baars : wbemprox/tests: Remove some unused variables.
by Alexandre Julliard 07 Oct '19

07 Oct '19

Module: wine Branch: master Commit: 62a5e16eec17194def60e1f0f89aae46571a3c16 URL: https://source.winehq.org/git/wine.git/?a=commit;h=62a5e16eec17194def60e1f0… Author: Sven Baars <sven.wine(a)gmail.com> Date: Fri Oct 4 21:58:41 2019 +0200 wbemprox/tests: Remove some unused variables. Signed-off-by: Sven Baars <sven.wine(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemprox/tests/query.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index 1c6ffcaf8d..40eaefee4c 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -750,7 +750,7 @@ static void test_StdRegProv( IWbemServices *services ) {'S','o','f','t','w','a','r','e','\\','S','t','d','R','e','g','P','r','o','v','T','e','s','t',0}; BSTR class = SysAllocString( stdregprovW ), method, name; IWbemClassObject *reg, *sig_in, *sig_out, *in, *out; - VARIANT defkey, subkey, retval, names, types, value, valuename; + VARIANT defkey, subkey, retval, valuename; CIMTYPE type; HRESULT hr; LONG res; @@ -854,7 +854,6 @@ static void test_StdRegProv( IWbemServices *services ) check_property( out, namesW, VT_BSTR|VT_ARRAY, CIM_STRING|CIM_FLAG_ARRAY ); - VariantClear( &names ); VariantClear( &subkey ); IWbemClassObject_Release( in ); IWbemClassObject_Release( out ); @@ -893,8 +892,6 @@ static void test_StdRegProv( IWbemServices *services ) check_property( out, namesW, VT_BSTR|VT_ARRAY, CIM_STRING|CIM_FLAG_ARRAY ); check_property( out, typesW, VT_I4|VT_ARRAY, CIM_SINT32|CIM_FLAG_ARRAY ); - VariantClear( &types ); - VariantClear( &names ); VariantClear( &subkey ); IWbemClassObject_Release( in ); IWbemClassObject_Release( out ); @@ -937,7 +934,6 @@ static void test_StdRegProv( IWbemServices *services ) check_property( out, valueW, VT_BSTR, CIM_STRING ); - VariantClear( &value ); VariantClear( &valuename ); VariantClear( &subkey ); IWbemClassObject_Release( in );

1 0

Sven Baars : wbemprox: Fix a leak on error path (Coverity).
by Alexandre Julliard 07 Oct '19

07 Oct '19

Module: wine Branch: master Commit: 11470a7763afc1404a830a5ad1c53f65806f5a9a URL: https://source.winehq.org/git/wine.git/?a=commit;h=11470a7763afc1404a830a5a… Author: Sven Baars <sven.wine(a)gmail.com> Date: Fri Oct 4 21:58:42 2019 +0200 wbemprox: Fix a leak on error path (Coverity). Signed-off-by: Sven Baars <sven.wine(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemprox/query.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/wbemprox/query.c b/dlls/wbemprox/query.c index 0f7eada9af..f46dcd922f 100644 --- a/dlls/wbemprox/query.c +++ b/dlls/wbemprox/query.c @@ -57,7 +57,11 @@ HRESULT create_view( enum view_type type, const WCHAR *path, const struct keywor struct table *table = grab_table( class ); HRESULT hr; - if (table && (hr = append_table( view, table )) != S_OK) return hr; + if (table && (hr = append_table( view, table )) != S_OK) + { + heap_free( view ); + return hr; + } view->proplist = proplist; view->cond = cond; break;

1 0

Sven Baars : wbemprox: Fix multiple leaks in parse_path (Coverity).
by Alexandre Julliard 07 Oct '19

07 Oct '19

Module: wine Branch: master Commit: a3b6054afb00619254b2b95a1b7b317e541b2685 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a3b6054afb00619254b2b95a… Author: Sven Baars <sven.wine(a)gmail.com> Date: Fri Oct 4 21:58:43 2019 +0200 wbemprox: Fix multiple leaks in parse_path (Coverity). Signed-off-by: Sven Baars <sven.wine(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemprox/services.c | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/dlls/wbemprox/services.c b/dlls/wbemprox/services.c index e1cd2466e4..5909c02e61 100644 --- a/dlls/wbemprox/services.c +++ b/dlls/wbemprox/services.c @@ -335,24 +335,42 @@ HRESULT parse_path( const WCHAR *str, struct path **ret ) DWORD server_len = ARRAY_SIZE(server); p++; - if (*p != '\\') return WBEM_E_INVALID_OBJECT_PATH; + if (*p != '\\') + { + heap_free( path ); + return WBEM_E_INVALID_OBJECT_PATH; + } p++; q = p; while (*p && *p != '\\') p++; - if (!*p) return WBEM_E_INVALID_OBJECT_PATH; + if (!*p) + { + heap_free( path ); + return WBEM_E_INVALID_OBJECT_PATH; + } len = p - q; if (!GetComputerNameW( server, &server_len ) || server_len != len || wcsnicmp( q, server, server_len )) + { + heap_free( path ); return WBEM_E_NOT_SUPPORTED; + } q = ++p; while (*p && *p != ':') p++; - if (!*p) return WBEM_E_INVALID_OBJECT_PATH; + if (!*p) + { + heap_free( path ); + return WBEM_E_INVALID_OBJECT_PATH; + } len = p - q; if (len != ARRAY_SIZE(cimv2W) - 1 || wcsnicmp( q, cimv2W, ARRAY_SIZE(cimv2W) - 1 )) + { + heap_free( path ); return WBEM_E_INVALID_NAMESPACE; + } p++; }

1 0

Zebediah Figura : advapi32/tests: Use unique service names in test_wow64().
by Alexandre Julliard 07 Oct '19

07 Oct '19

Module: wine Branch: master Commit: fec26c87ffa9d8efe6cf971e53c69bfceace8c89 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fec26c87ffa9d8efe6cf971e… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Oct 4 22:02:29 2019 -0500 advapi32/tests: Use unique service names in test_wow64(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47891 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/tests/service.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/advapi32/tests/service.c b/dlls/advapi32/tests/service.c index 9dad710490..83c0a9b257 100644 --- a/dlls/advapi32/tests/service.c +++ b/dlls/advapi32/tests/service.c @@ -1806,7 +1806,7 @@ static void test_wow64(void) ok(ret, "Failed to delete service, error %u.\n", GetLastError()); CloseServiceHandle(service); - service = CreateServiceA(manager, "winetestsvc", "winetestsvc", SERVICE_START | DELETE, + service = CreateServiceA(manager, "winetestsvc2", "winetestsvc2", SERVICE_START | DELETE, SERVICE_KERNEL_DRIVER, SERVICE_DEMAND_START, SERVICE_ERROR_NORMAL, "C:\\windows\\system32\\winetestsvc.exe", NULL, NULL, NULL, NULL, NULL); ok(!!service, "Failed to create service, error %u.\n", GetLastError()); @@ -1825,7 +1825,7 @@ static void test_wow64(void) 0, NULL, CREATE_ALWAYS, 0, NULL); CloseHandle(file); - service = CreateServiceA(manager, "winetestsvc", "winetestsvc", SERVICE_START | DELETE, + service = CreateServiceA(manager, "winetestsvc3", "winetestsvc3", SERVICE_START | DELETE, SERVICE_WIN32_OWN_PROCESS, SERVICE_DEMAND_START, SERVICE_ERROR_NORMAL, "C:\\windows\\system32\\winetestsvc.exe service serve", NULL, NULL, NULL, NULL, NULL); ok(!!service, "Failed to create service, error %u.\n", GetLastError()); @@ -1837,7 +1837,7 @@ static void test_wow64(void) ok(ret, "Failed to delete service, error %u.\n", GetLastError()); CloseServiceHandle(service); - service = CreateServiceA(manager, "winetestsvc", "winetestsvc", SERVICE_START | DELETE, + service = CreateServiceA(manager, "winetestsvc4", "winetestsvc4", SERVICE_START | DELETE, SERVICE_KERNEL_DRIVER, SERVICE_DEMAND_START, SERVICE_ERROR_NORMAL, "C:\\windows\\system32\\winetestsvc.exe", NULL, NULL, NULL, NULL, NULL); ok(!!service, "Failed to create service, error %u.\n", GetLastError());

1 0