October 2017 - Wine-Commits

Hans Leidekker : webservices: Always create a copy of strings to insert in the dictionary.
by Alexandre Julliard Oct. 3, 2017

Oct. 3, 2017

Module: wine Branch: master Commit: 3076f5e3fbcf610320a37b6673a48553fe27b9be URL: http://source.winehq.org/git/wine.git/?a=commit;h=3076f5e3fbcf610320a37b667… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Oct 3 16:14:44 2017 +0200 webservices: Always create a copy of strings to insert in the dictionary. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/channel.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/dlls/webservices/channel.c b/dlls/webservices/channel.c index ef37095..92569fd 100644 --- a/dlls/webservices/channel.c +++ b/dlls/webservices/channel.c @@ -1208,14 +1208,24 @@ static HRESULT CALLBACK dict_cb( void *state, const WS_XML_STRING *str, BOOL *fo { struct dictionary *dict = state; HRESULT hr = S_OK; + BYTE *bytes; int index; - if ((index = find_string( dict, str->bytes, str->length, id )) == -1 || - (hr = insert_string( dict, str->bytes, str->length, index, id )) == S_OK) + if ((index = find_string( dict, str->bytes, str->length, id )) == -1) + { + *found = TRUE; + return S_OK; + } + + if (!(bytes = heap_alloc( str->length ))) return E_OUTOFMEMORY; + memcpy( bytes, str->bytes, str->length ); + if ((hr = insert_string( dict, bytes, str->length, index, id )) == S_OK) { *found = TRUE; return S_OK; } + heap_free( bytes ); + *found = FALSE; return hr; } @@ -1672,6 +1682,7 @@ static HRESULT build_dict( const BYTE *buf, ULONG buflen, struct dictionary *dic } if ((hr = insert_string( dict, bytes, size, index, NULL )) != S_OK) { + heap_free( bytes ); clear_dict( dict ); return hr; }

1 0

Fabian Maurer : crypt32: In CRYPT_CollectionAdvanceEnum remove unneeded statement (cppcheck).
by Alexandre Julliard Oct. 3, 2017

Oct. 3, 2017

Module: wine Branch: master Commit: b34ea10112227a0d8554c81fc093c0cf6e1bc1b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b34ea10112227a0d8554c81fc… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Tue Oct 3 17:44:54 2017 +0200 crypt32: In CRYPT_CollectionAdvanceEnum remove unneeded statement (cppcheck). Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crypt32/collectionstore.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/crypt32/collectionstore.c b/dlls/crypt32/collectionstore.c index 8b90270..2c2398d 100644 --- a/dlls/crypt32/collectionstore.c +++ b/dlls/crypt32/collectionstore.c @@ -164,7 +164,6 @@ static context_t *CRYPT_CollectionAdvanceEnum(WINE_COLLECTIONSTORE *store, Context_AddRef(child); child = contextFuncs->enumContext(storeEntry->store, child); Context_Release(prev); - prev = NULL; } else {

1 0

Fabian Maurer : winedump: Fix potential null-pointer dereference (cppcheck ).
by Alexandre Julliard Oct. 3, 2017

Oct. 3, 2017

Module: wine Branch: master Commit: b58094f74c2d773f110443ba52b873d1d6a8c829 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b58094f74c2d773f110443ba5… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Tue Oct 3 17:28:08 2017 +0200 winedump: Fix potential null-pointer dereference (cppcheck). Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winedump/pdb.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/winedump/pdb.c b/tools/winedump/pdb.c index 6a6a9b4..6fd70ce 100644 --- a/tools/winedump/pdb.c +++ b/tools/winedump/pdb.c @@ -215,7 +215,8 @@ static void *read_string_table(struct pdb_reader* reader) stream_idx = get_stream_by_name(reader, "/names"); if (stream_idx == -1) return NULL; ret = reader->read_file(reader, stream_idx); - if (ret && *(const DWORD*)ret == 0xeffeeffe) return ret; + if (!ret) return NULL; + if(*(const DWORD*)ret == 0xeffeeffe) return ret; printf("wrong header %x expecting 0xeffeeffe\n", *(const DWORD*)ret); free( ret ); return NULL;

1 0

Fabian Maurer : secur32: In LsaLookupAuthenticationPackage properly set out parameter (cppcheck).
by Alexandre Julliard Oct. 3, 2017

Oct. 3, 2017

Module: wine Branch: master Commit: fe2d45094f8e9b05b9d1626f6639befc3fa7294d URL: http://source.winehq.org/git/wine.git/?a=commit;h=fe2d45094f8e9b05b9d1626f6… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Tue Oct 3 17:19:23 2017 +0200 secur32: In LsaLookupAuthenticationPackage properly set out parameter (cppcheck). Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/secur32/lsa.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/secur32/lsa.c b/dlls/secur32/lsa.c index fa765ed..6fa9972 100644 --- a/dlls/secur32/lsa.c +++ b/dlls/secur32/lsa.c @@ -96,7 +96,7 @@ NTSTATUS WINAPI LsaLookupAuthenticationPackage(HANDLE LsaHandle, PLSA_STRING PackageName, PULONG AuthenticationPackage) { FIXME("%p %p %p stub\n", LsaHandle, PackageName, AuthenticationPackage); - AuthenticationPackage = NULL; + *AuthenticationPackage = 0; return STATUS_SUCCESS; }

1 0

Fabian Maurer : inetcomm: In SMTPTransport_ParseResponse remove unneeded statement (cppcheck).
by Alexandre Julliard Oct. 3, 2017

Oct. 3, 2017

Module: wine Branch: master Commit: 6641efad7d8de1f36f5235a343c8cf9a8609b34e URL: http://source.winehq.org/git/wine.git/?a=commit;h=6641efad7d8de1f36f5235a34… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Tue Oct 3 17:37:26 2017 +0200 inetcomm: In SMTPTransport_ParseResponse remove unneeded statement (cppcheck). Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/inetcomm/smtptransport.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/dlls/inetcomm/smtptransport.c b/dlls/inetcomm/smtptransport.c index c88ac9c..af11308 100644 --- a/dlls/inetcomm/smtptransport.c +++ b/dlls/inetcomm/smtptransport.c @@ -59,13 +59,7 @@ static HRESULT SMTPTransport_ParseResponse(SMTPTransport *This, char *pszRespons pResponse->rIxpResult.pszResponse = pszResponse; pResponse->rIxpResult.dwSocketError = 0; pResponse->rIxpResult.uiServerError = strtol(pszResponse, &pszResponse, 10); - if (*pszResponse == '-') - { - pResponse->fDone = FALSE; - pszResponse++; - } - else - pResponse->fDone = TRUE; + pResponse->fDone = (*pszResponse != '-'); switch (pResponse->rIxpResult.uiServerError) {

1 0

Fabian Maurer : wineandroid.drv: In AudioClient_IsFormatSupported remove unneeded statement (cppcheck).
by Alexandre Julliard Oct. 3, 2017

Oct. 3, 2017

Module: wine Branch: master Commit: 67756774f5b8d37fee278959d4ba0400acb9d68f URL: http://source.winehq.org/git/wine.git/?a=commit;h=67756774f5b8d37fee278959d… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Tue Oct 3 17:43:23 2017 +0200 wineandroid.drv: In AudioClient_IsFormatSupported remove unneeded statement (cppcheck). Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineandroid.drv/mmdevdrv.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/dlls/wineandroid.drv/mmdevdrv.c b/dlls/wineandroid.drv/mmdevdrv.c index 275b652..84aafb7 100644 --- a/dlls/wineandroid.drv/mmdevdrv.c +++ b/dlls/wineandroid.drv/mmdevdrv.c @@ -1079,11 +1079,8 @@ static HRESULT WINAPI AudioClient_IsFormatSupported(IAudioClient *iface, dump_fmt(pwfx); - if(outpwfx){ + if(outpwfx) *outpwfx = NULL; - if(mode != AUDCLNT_SHAREMODE_SHARED) - outpwfx = NULL; - } hr = waveformat_to_pcm(This, pwfx, &pcm); TRACE("returning: %08x\n", hr);

1 0

Hans Leidekker : webservices: Fix return value in read_type_text.
by Alexandre Julliard Oct. 3, 2017

Oct. 3, 2017

Module: wine Branch: master Commit: 0567952c7083c4a3e4921760728d172837577bb3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0567952c7083c4a3e49217607… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Oct 3 16:14:43 2017 +0200 webservices: Fix return value in read_type_text. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/reader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c index 2ed9319..0906cba 100644 --- a/dlls/webservices/reader.c +++ b/dlls/webservices/reader.c @@ -6216,7 +6216,7 @@ static HRESULT read_type_text( struct reader *reader, const WS_FIELD_DESCRIPTION if (reader->current == reader->last) { BOOL found; - if ((hr = read_to_startelement( reader, &found )) != S_OK) return S_OK; + if ((hr = read_to_startelement( reader, &found )) != S_OK) return hr; if (!found) return WS_E_INVALID_FORMAT; } if ((hr = read_next_node( reader )) != S_OK) return hr;

1 0

Hans Leidekker : webservices: Simplify get_field_size.
by Alexandre Julliard Oct. 3, 2017

Oct. 3, 2017

Module: wine Branch: master Commit: a808821d722d7f7f1a6f351e6b639c963394167b URL: http://source.winehq.org/git/wine.git/?a=commit;h=a808821d722d7f7f1a6f351e6… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Oct 3 16:14:41 2017 +0200 webservices: Simplify get_field_size. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/reader.c | 24 ++---------------------- 1 file changed, 2 insertions(+), 22 deletions(-) diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c index d767d5c..2ed9319 100644 --- a/dlls/webservices/reader.c +++ b/dlls/webservices/reader.c @@ -7311,28 +7311,8 @@ HRESULT get_param_desc( const WS_STRUCT_DESCRIPTION *desc, USHORT index, const W static ULONG get_field_size( const WS_FIELD_DESCRIPTION *desc ) { - WS_READ_OPTION option; - ULONG size; - - switch ((option = get_field_read_option( desc->type, desc->options ))) - { - case WS_READ_REQUIRED_POINTER: - case WS_READ_OPTIONAL_POINTER: - case WS_READ_NILLABLE_POINTER: - size = sizeof(void *); - break; - - case WS_READ_REQUIRED_VALUE: - case WS_READ_NILLABLE_VALUE: - size = get_type_size( desc->type, desc->typeDescription ); - break; - - default: - WARN( "unhandled option %u\n", option ); - return 0; - } - - return size; + if (desc->options & WS_FIELD_POINTER) return sizeof(void *); + return get_type_size( desc->type, desc->typeDescription ); } static HRESULT read_param( struct reader *reader, const WS_FIELD_DESCRIPTION *desc, WS_HEAP *heap, void *ret )

1 0

Nikolay Sivov : gdiplus/tests: Fix matrix leak (Valgrind).
by Alexandre Julliard Oct. 3, 2017

Oct. 3, 2017

Module: wine Branch: master Commit: 160f5b2387a7b1e36f254e5393770a2efd7397f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=160f5b2387a7b1e36f254e539… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Oct 2 21:06:11 2017 +0300 gdiplus/tests: Fix matrix leak (Valgrind). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/tests/matrix.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/gdiplus/tests/matrix.c b/dlls/gdiplus/tests/matrix.c index 3e655ce..5ca0209 100644 --- a/dlls/gdiplus/tests/matrix.c +++ b/dlls/gdiplus/tests/matrix.c @@ -164,6 +164,7 @@ static void test_invert(void) GdipCreateMatrix2(2.0/16.0, 2.0/16.0, -5.0/16.0, 3.0/16.0, 3.0/16.0, -21.0/16.0, &inverted); GdipIsMatrixEqual(matrix, inverted, &equal); expect(TRUE, equal); + GdipDeleteMatrix(matrix); GdipCreateMatrix2(0.0006, 0, 0, 0.0006, 400, 400, &matrix); status = GdipInvertMatrix(matrix);

1 0

Andrey Gusev : api-ms-win-appmodel-runtime-l1-1-2: Add dll.
by Alexandre Julliard Oct. 3, 2017

Oct. 3, 2017

Module: wine Branch: master Commit: d56c576bc1fe5be78e98c9972343b5093e141935 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d56c576bc1fe5be78e98c9972… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Tue Oct 3 12:01:11 2017 +0300 api-ms-win-appmodel-runtime-l1-1-2: Add dll. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + dlls/api-ms-win-appmodel-runtime-l1-1-2/Makefile.in | 1 + .../api-ms-win-appmodel-runtime-l1-1-2.spec | 17 +++++++++++++++++ tools/make_specfiles | 1 + 5 files changed, 22 insertions(+) diff --git a/configure b/configure index cc49fa4..74fd4d4 100755 --- a/configure +++ b/configure @@ -881,6 +881,7 @@ enable_advpack enable_amstream enable_api_ms_win_appmodel_identity_l1_1_0 enable_api_ms_win_appmodel_runtime_l1_1_1 +enable_api_ms_win_appmodel_runtime_l1_1_2 enable_api_ms_win_core_apiquery_l1_1_0 enable_api_ms_win_core_appcompat_l1_1_1 enable_api_ms_win_core_appinit_l1_1_0 @@ -17953,6 +17954,7 @@ wine_fn_config_dll amstream enable_amstream clean wine_fn_config_test dlls/amstream/tests amstream_test wine_fn_config_dll api-ms-win-appmodel-identity-l1-1-0 enable_api_ms_win_appmodel_identity_l1_1_0 wine_fn_config_dll api-ms-win-appmodel-runtime-l1-1-1 enable_api_ms_win_appmodel_runtime_l1_1_1 +wine_fn_config_dll api-ms-win-appmodel-runtime-l1-1-2 enable_api_ms_win_appmodel_runtime_l1_1_2 wine_fn_config_dll api-ms-win-core-apiquery-l1-1-0 enable_api_ms_win_core_apiquery_l1_1_0 wine_fn_config_dll api-ms-win-core-appcompat-l1-1-1 enable_api_ms_win_core_appcompat_l1_1_1 wine_fn_config_dll api-ms-win-core-appinit-l1-1-0 enable_api_ms_win_core_appinit_l1_1_0 diff --git a/configure.ac b/configure.ac index b958ff3..2f6922f 100644 --- a/configure.ac +++ b/configure.ac @@ -2734,6 +2734,7 @@ WINE_CONFIG_DLL(amstream,,[clean]) WINE_CONFIG_TEST(dlls/amstream/tests) WINE_CONFIG_DLL(api-ms-win-appmodel-identity-l1-1-0) WINE_CONFIG_DLL(api-ms-win-appmodel-runtime-l1-1-1) +WINE_CONFIG_DLL(api-ms-win-appmodel-runtime-l1-1-2) WINE_CONFIG_DLL(api-ms-win-core-apiquery-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-appcompat-l1-1-1) WINE_CONFIG_DLL(api-ms-win-core-appinit-l1-1-0) diff --git a/dlls/api-ms-win-appmodel-runtime-l1-1-2/Makefile.in b/dlls/api-ms-win-appmodel-runtime-l1-1-2/Makefile.in new file mode 100644 index 0000000..ea8597e --- /dev/null +++ b/dlls/api-ms-win-appmodel-runtime-l1-1-2/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-appmodel-runtime-l1-1-2.dll diff --git a/dlls/api-ms-win-appmodel-runtime-l1-1-2/api-ms-win-appmodel-runtime-l1-1-2.spec b/dlls/api-ms-win-appmodel-runtime-l1-1-2/api-ms-win-appmodel-runtime-l1-1-2.spec new file mode 100644 index 0000000..ce38d95 --- /dev/null +++ b/dlls/api-ms-win-appmodel-runtime-l1-1-2/api-ms-win-appmodel-runtime-l1-1-2.spec @@ -0,0 +1,17 @@ +@ stub AppPolicyGetClrCompat +@ stub AppPolicyGetCreateFileAccess +@ stub AppPolicyGetLifecycleManagement +@ stub AppPolicyGetMediaFoundationCodecLoading +@ stub AppPolicyGetProcessTerminationMethod +@ stub AppPolicyGetShowDeveloperDiagnostic +@ stub AppPolicyGetThreadInitializationType +@ stub AppPolicyGetWindowingModel +@ stub GetApplicationUserModelIdFromToken +@ stub GetPackageFamilyNameFromToken +@ stub GetPackageFullNameFromToken +@ stub OpenPackageInfoByFullNameForUser +@ stub VerifyApplicationUserModelId +@ stub VerifyPackageFamilyName +@ stub VerifyPackageFullName +@ stub VerifyPackageId +@ stub VerifyPackageRelativeApplicationId diff --git a/tools/make_specfiles b/tools/make_specfiles index 3d29af8..d5747c4 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -292,6 +292,7 @@ my @dll_groups = ], [ "kernelbase", + "api-ms-win-appmodel-runtime-l1-1-2", "api-ms-win-core-quirks-l1-1-0", "api-ms-win-security-grouppolicy-l1-1-0", ],

1 0