April 2015 - Wine-commits - list.winehq.org

Bruno Jesus : ws2_32/tests: Add more select() tests.
by Alexandre Julliard 13 Apr '15

13 Apr '15

Module: wine Branch: master Commit: 2da8f9a9dbc4b759b1deeb339a5856e44c876751 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2da8f9a9dbc4b759b1deeb339… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Sun Apr 12 21:22:49 2015 -0300 ws2_32/tests: Add more select() tests. --- dlls/ws2_32/tests/sock.c | 51 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 8b69cf6..c7b3ea7 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -3368,6 +3368,14 @@ static DWORD WINAPI SelectReadThread(void *param) return 0; } +static DWORD WINAPI SelectCloseThread(void *param) +{ + SOCKET s = *(SOCKET*)param; + Sleep(500); + closesocket(s); + return 0; +} + static void test_errors(void) { SOCKET sock; @@ -3792,6 +3800,49 @@ static void test_select(void) ok(FD_ISSET(fdWrite, &exceptfds), "fdWrite socket is not in the set\n"); ok(select_timeout.tv_usec == 250000, "select timeout should not have changed\n"); closesocket(fdWrite); + + /* Try select() on a closed socket after connection */ + ok(!tcp_socketpair(&fdRead, &fdWrite), "creating socket pair failed\n"); + closesocket(fdRead); + FD_ZERO_ALL(); + FD_SET_ALL(fdWrite); + FD_SET_ALL(fdRead); + SetLastError(0xdeadbeef); + ret = select(0, &readfds, NULL, &exceptfds, &select_timeout); + ok(ret == SOCKET_ERROR, "expected 1, got %d\n", ret); +todo_wine + ok(GetLastError() == WSAENOTSOCK, "expected 10038, got %d\n", GetLastError()); + /* descriptor sets are unchanged */ + ok(readfds.fd_count == 2, "expected 2, got %d\n", readfds.fd_count); + ok(exceptfds.fd_count == 2, "expected 2, got %d\n", exceptfds.fd_count); + closesocket(fdWrite); + + /* Close the socket currently being selected in a thread - bug 38399 */ + ok(!tcp_socketpair(&fdRead, &fdWrite), "creating socket pair failed\n"); + thread_handle = CreateThread(NULL, 0, SelectCloseThread, &fdWrite, 0, &id); + ok(thread_handle != NULL, "CreateThread failed unexpectedly: %d\n", GetLastError()); + FD_ZERO_ALL(); + FD_SET_ALL(fdWrite); + ret = select(0, &readfds, NULL, &exceptfds, &select_timeout); +todo_wine + ok(ret == 1, "expected 1, got %d\n", ret); + ok(FD_ISSET(fdWrite, &readfds), "fdWrite socket is not in the set\n"); + WaitForSingleObject (thread_handle, 1000); + closesocket(fdRead); + /* test again with only the except descriptor */ + ok(!tcp_socketpair(&fdRead, &fdWrite), "creating socket pair failed\n"); + thread_handle = CreateThread(NULL, 0, SelectCloseThread, &fdWrite, 0, &id); + ok(thread_handle != NULL, "CreateThread failed unexpectedly: %d\n", GetLastError()); + FD_ZERO_ALL(); + FD_SET(fdWrite, &exceptfds); + SetLastError(0xdeadbeef); + ret = select(0, NULL, NULL, &exceptfds, &select_timeout); +todo_wine + ok(ret == SOCKET_ERROR, "expected 1, got %d\n", ret); +todo_wine + ok(GetLastError() == WSAENOTSOCK, "expected 10038, got %d\n", GetLastError()); + WaitForSingleObject (thread_handle, 1000); + closesocket(fdRead); } #undef FD_SET_ALL #undef FD_ZERO_ALL

1 0

Vincent Povirk : windowscodecs: Fix crash when PNG decoder is freed without successful init.
by Alexandre Julliard 13 Apr '15

13 Apr '15

Module: wine Branch: master Commit: 27ae589d2aee548d06401153a2bdc5f9af98329d URL: http://source.winehq.org/git/wine.git/?a=commit;h=27ae589d2aee548d06401153a… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Apr 10 11:39:34 2015 -0500 windowscodecs: Fix crash when PNG decoder is freed without successful init. --- dlls/windowscodecs/pngformat.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/windowscodecs/pngformat.c b/dlls/windowscodecs/pngformat.c index 2aac560..f39b31a 100644 --- a/dlls/windowscodecs/pngformat.c +++ b/dlls/windowscodecs/pngformat.c @@ -442,7 +442,8 @@ static ULONG WINAPI PngDecoder_Release(IWICBitmapDecoder *iface) if (ref == 0) { - IStream_Release(This->stream); + if (This->stream) + IStream_Release(This->stream); if (This->png_ptr) ppng_destroy_read_struct(&This->png_ptr, &This->info_ptr, &This->end_info); This->lock.DebugInfo->Spare[0] = 0; @@ -1218,6 +1219,7 @@ HRESULT PngDecoder_CreateInstance(REFIID iid, void** ppv) This->png_ptr = NULL; This->info_ptr = NULL; This->end_info = NULL; + This->stream = NULL; This->initialized = FALSE; This->image_bits = NULL; InitializeCriticalSection(&This->lock);

1 0

Julius Schwartzenberg : dwrite: Font search is case insensitive.
by Alexandre Julliard 13 Apr '15

13 Apr '15

Module: wine Branch: master Commit: 20aee0673dcad26e86ae97d26447bc87977b9eda URL: http://source.winehq.org/git/wine.git/?a=commit;h=20aee0673dcad26e86ae97d26… Author: Julius Schwartzenberg <julius.schwartzenberg(a)gmail.com> Date: Fri Apr 10 21:08:31 2015 +0200 dwrite: Font search is case insensitive. --- dlls/dwrite/font.c | 2 +- dlls/dwrite/tests/font.c | 16 ++++++++++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index fc067a5..c591f4e 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -1431,7 +1431,7 @@ static UINT32 collection_find_family(struct dwrite_fontcollection *collection, c for (j = 0; j < IDWriteLocalizedStrings_GetCount(family_name); j++) { WCHAR buffer[255]; hr = IDWriteLocalizedStrings_GetString(family_name, j, buffer, 255); - if (SUCCEEDED(hr) && !strcmpW(buffer, name)) + if (SUCCEEDED(hr) && !strcmpiW(buffer, name)) return i; } } diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index 65d8bcb..126fba9 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -58,6 +58,8 @@ static inline BOOL heap_free(void *mem) static const WCHAR test_fontfile[] = {'w','i','n','e','_','t','e','s','t','_','f','o','n','t','.','t','t','f',0}; static const WCHAR tahomaW[] = {'T','a','h','o','m','a',0}; +static const WCHAR tahomaUppercaseW[] = {'T','A','H','O','M','A',0}; +static const WCHAR tahomaStrangecaseW[] = {'t','A','h','O','m','A',0}; static const WCHAR blahW[] = {'B','l','a','h','!',0}; static IDWriteFactory *create_factory(void) @@ -1376,6 +1378,20 @@ static void test_system_fontcollection(void) ok(ret, "got %d\n", ret); ok(i != (UINT32)-1, "got %u\n", i); + ret = FALSE; + i = (UINT32)-1; + hr = IDWriteFontCollection_FindFamilyName(collection, tahomaUppercaseW, &i, &ret); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(ret, "got %d\n", ret); + ok(i != (UINT32)-1, "got %u\n", i); + + ret = FALSE; + i = (UINT32)-1; + hr = IDWriteFontCollection_FindFamilyName(collection, tahomaStrangecaseW, &i, &ret); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(ret, "got %d\n", ret); + ok(i != (UINT32)-1, "got %u\n", i); + /* get back local file loader */ hr = IDWriteFontCollection_GetFontFamily(collection, i, &family); ok(hr == S_OK, "got 0x%08x\n", hr);

1 0

Stefan Dösinger : wined3d: Move alpha test states to the fragment pipeline.
by Alexandre Julliard 10 Apr '15

10 Apr '15

Module: wine Branch: master Commit: 5c7707dc775235ec98ada59dc196c33ca2000600 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c7707dc775235ec98ada59dc… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Apr 9 22:48:16 2015 +0200 wined3d: Move alpha test states to the fragment pipeline. This will allow some color keying cleanups. For Core Contexts we'll have to emulate alpha testing in shaders anyway. --- dlls/wined3d/arb_program_shader.c | 4 ++++ dlls/wined3d/ati_fragment_shader.c | 4 ++++ dlls/wined3d/glsl_shader.c | 4 ++++ dlls/wined3d/nvidia_texture_shader.c | 4 ++++ dlls/wined3d/state.c | 14 +++++++------- dlls/wined3d/wined3d_private.h | 2 ++ 6 files changed, 25 insertions(+), 7 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5c7707dc775235ec98ada…

1 0

Stefan Dösinger : wined3d: Simplify alpha test and color keying in GLSL.
by Alexandre Julliard 10 Apr '15

10 Apr '15

Module: wine Branch: master Commit: c5c713721285282c1ed466d287435a88b7b533ad URL: http://source.winehq.org/git/wine.git/?a=commit;h=c5c713721285282c1ed466d28… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Apr 9 22:48:17 2015 +0200 wined3d: Simplify alpha test and color keying in GLSL. --- dlls/wined3d/glsl_shader.c | 35 +++++++++++++++++++++++++++++++++-- dlls/wined3d/state.c | 3 --- 2 files changed, 33 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index c67243f..1a1b6b0 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -7572,6 +7572,37 @@ static void glsl_fragment_pipe_invalidate_constants(struct wined3d_context *cont context->constant_update_mask |= WINED3D_SHADER_CONST_FFP_PS; } +static void glsl_fragment_pipe_alpha_test(struct wined3d_context *context, + const struct wined3d_state *state, DWORD state_id) +{ + const struct wined3d_gl_info *gl_info = context->gl_info; + int glParm; + float ref; + + TRACE("context %p, state %p, state_id %#x.\n", context, state, state_id); + + if (state->render_states[WINED3D_RS_ALPHATESTENABLE]) + { + gl_info->gl_ops.gl.p_glEnable(GL_ALPHA_TEST); + checkGLcall("glEnable GL_ALPHA_TEST"); + } + else + { + gl_info->gl_ops.gl.p_glDisable(GL_ALPHA_TEST); + checkGLcall("glDisable GL_ALPHA_TEST"); + return; + } + + ref = ((float)state->render_states[WINED3D_RS_ALPHAREF]) / 255.0f; + glParm = wined3d_gl_compare_func(state->render_states[WINED3D_RS_ALPHAFUNC]); + + if (glParm) + { + gl_info->gl_ops.gl.p_glAlphaFunc(glParm, ref); + checkGLcall("glAlphaFunc"); + } +} + static const struct StateEntryTemplate glsl_fragment_pipe_state_template[] = { {STATE_VDECL, {STATE_VDECL, glsl_fragment_pipe_vdecl }, WINED3D_GL_EXT_NONE }, @@ -7651,8 +7682,8 @@ static const struct StateEntryTemplate glsl_fragment_pipe_state_template[] = {STATE_SHADER(WINED3D_SHADER_TYPE_PIXEL), {STATE_SHADER(WINED3D_SHADER_TYPE_PIXEL), glsl_fragment_pipe_shader }, WINED3D_GL_EXT_NONE }, {STATE_RENDER(WINED3D_RS_ALPHAFUNC), {STATE_RENDER(WINED3D_RS_ALPHATESTENABLE), NULL }, WINED3D_GL_EXT_NONE }, {STATE_RENDER(WINED3D_RS_ALPHAREF), {STATE_RENDER(WINED3D_RS_ALPHATESTENABLE), NULL }, WINED3D_GL_EXT_NONE }, - {STATE_RENDER(WINED3D_RS_ALPHATESTENABLE), {STATE_RENDER(WINED3D_RS_ALPHATESTENABLE), state_alpha_test }, WINED3D_GL_EXT_NONE }, - {STATE_RENDER(WINED3D_RS_COLORKEYENABLE), {STATE_RENDER(WINED3D_RS_ALPHATESTENABLE), NULL }, WINED3D_GL_EXT_NONE }, + {STATE_RENDER(WINED3D_RS_ALPHATESTENABLE), {STATE_RENDER(WINED3D_RS_ALPHATESTENABLE), glsl_fragment_pipe_alpha_test }, WINED3D_GL_EXT_NONE }, + {STATE_RENDER(WINED3D_RS_COLORKEYENABLE), {STATE_SHADER(WINED3D_SHADER_TYPE_PIXEL), NULL }, WINED3D_GL_EXT_NONE }, {STATE_RENDER(WINED3D_RS_FOGENABLE), {STATE_RENDER(WINED3D_RS_FOGENABLE), glsl_fragment_pipe_fog }, WINED3D_GL_EXT_NONE }, {STATE_RENDER(WINED3D_RS_FOGTABLEMODE), {STATE_RENDER(WINED3D_RS_FOGENABLE), NULL }, WINED3D_GL_EXT_NONE }, {STATE_RENDER(WINED3D_RS_FOGVERTEXMODE), {STATE_RENDER(WINED3D_RS_FOGENABLE), NULL }, WINED3D_GL_EXT_NONE }, diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index edf1e71..b3ac4f1 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -528,9 +528,6 @@ void state_alpha_test(struct wined3d_context *context, const struct wined3d_stat context_apply_state(context, state, STATE_TEXTURESTAGE(0, WINED3D_TSS_ALPHA_OP)); context->last_was_ckey = enable_ckey; - if (context->d3d_info->shader_color_key) - enable_ckey = FALSE; - if (state->render_states[WINED3D_RS_ALPHATESTENABLE] || (state->render_states[WINED3D_RS_COLORKEYENABLE] && enable_ckey)) {

1 0

Hans Leidekker : fusion: Support buffer size queries in IAssemblyName:: GetName.
by Alexandre Julliard 10 Apr '15

10 Apr '15

Module: wine Branch: master Commit: 382b72d729cdd3e5f61e924b9cfff2bab332b98e URL: http://source.winehq.org/git/wine.git/?a=commit;h=382b72d729cdd3e5f61e924b9… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Apr 10 12:56:48 2015 +0200 fusion: Support buffer size queries in IAssemblyName::GetName. --- dlls/fusion/asmname.c | 19 ++++++++++++------- dlls/fusion/tests/asmname.c | 35 +++++++++++++++++++++++++++++++---- 2 files changed, 43 insertions(+), 11 deletions(-) diff --git a/dlls/fusion/asmname.c b/dlls/fusion/asmname.c index f892f2b..c417a23 100644 --- a/dlls/fusion/asmname.c +++ b/dlls/fusion/asmname.c @@ -369,19 +369,24 @@ static HRESULT WINAPI IAssemblyNameImpl_GetName(IAssemblyName *iface, WCHAR *pwzName) { IAssemblyNameImpl *name = impl_from_IAssemblyName(iface); + DWORD len; TRACE("(%p, %p, %p)\n", iface, lpcwBuffer, pwzName); - if (!name->name) + if (name->name) + len = strlenW(name->name) + 1; + else + len = 0; + + if (*lpcwBuffer < len) { - *pwzName = '\0'; - *lpcwBuffer = 0; - return S_OK; + *lpcwBuffer = len; + return E_NOT_SUFFICIENT_BUFFER; } + if (!name->name) lpcwBuffer[0] = 0; + else strcpyW(pwzName, name->name); - lstrcpyW(pwzName, name->name); - *lpcwBuffer = lstrlenW(pwzName) + 1; - + *lpcwBuffer = len; return S_OK; } diff --git a/dlls/fusion/tests/asmname.c b/dlls/fusion/tests/asmname.c index a075288..68309f2 100644 --- a/dlls/fusion/tests/asmname.c +++ b/dlls/fusion/tests/asmname.c @@ -421,12 +421,12 @@ static void test_CreateAssemblyNameObject(void) broken(hr == E_INVALIDARG), /* .NET 1.x */ "Expected FUSION_E_INVALID_NAME, got %08x\n", hr); + str[0] = 'a'; size = MAX_PATH; - str[0] = '\0'; hr = IAssemblyName_GetName(name, &size, str); - ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); - ok(!str[0], "Expected empty name\n"); - ok(size == 0, "Expected 0, got %d\n", size); + ok(hr == S_OK, "got %08x\n", hr); + ok(str[0] == 'a', "got %c\n", str[0]); + ok(!size, "got %u\n", size); hi = 0xbeefcace; lo = 0xcafebabe; @@ -457,6 +457,26 @@ static void test_CreateAssemblyNameObject(void) broken(hr == S_OK), /* .NET 1.x */ "Expected FUSION_E_INVALID_NAME, got %08x\n", hr); + size = 0; + hr = IAssemblyName_GetName(name, &size, NULL); + ok(hr == E_NOT_SUFFICIENT_BUFFER, "got %08x\n", hr); + ok(size == 1, "got %u\n", size); + + if (0) /* crash */ + { + str[0] = '\0'; + hr = IAssemblyName_GetName(name, NULL, str); + ok(hr == E_NOT_SUFFICIENT_BUFFER, "got %08x\n", hr); + ok(!str[0], "got %c\n", str[0]); + } + + size = 0; + str[0] = '\0'; + hr = IAssemblyName_GetName(name, &size, str); + ok(hr == E_NOT_SUFFICIENT_BUFFER, "got %08x\n", hr); + ok(!str[0], "got %c\n", str[0]); + ok(size == 1, "got %u\n", size); + size = MAX_PATH; str[0] = '\0'; hr = IAssemblyName_GetName(name, &size, str); @@ -494,6 +514,13 @@ static void test_CreateAssemblyNameObject(void) ok_aw("wine", str); ok(size == 5, "Expected 5, got %d\n", size); + size = 0; + str[0] = 0; + hr = IAssemblyName_GetName(name, &size, str); + ok(hr == E_NOT_SUFFICIENT_BUFFER, "got %08x\n", hr); + ok(!str[0], "got %c\n", str[0]); + ok(size == 5, "got %u\n", size); + size = MAX_PATH; str[0] = '\0'; hr = IAssemblyName_GetName(name, &size, str);

1 0

Hans Leidekker : fusion: Fix insufficient buffer size handling in IAssemblyName::GetDisplayName.
by Alexandre Julliard 10 Apr '15

10 Apr '15

Module: wine Branch: master Commit: 2eda884bd70c48605a2a857ebe7cb1c7f7ab4948 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2eda884bd70c48605a2a857eb… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Apr 10 12:57:15 2015 +0200 fusion: Fix insufficient buffer size handling in IAssemblyName::GetDisplayName. --- dlls/fusion/asmname.c | 16 ++++++++++------ dlls/fusion/tests/asmname.c | 17 +++++++++++++++++ 2 files changed, 27 insertions(+), 6 deletions(-) diff --git a/dlls/fusion/asmname.c b/dlls/fusion/asmname.c index c417a23..f7a9452 100644 --- a/dlls/fusion/asmname.c +++ b/dlls/fusion/asmname.c @@ -228,12 +228,10 @@ static HRESULT WINAPI IAssemblyNameImpl_GetDisplayName(IAssemblyName *iface, LPDWORD pccDisplayName, DWORD dwDisplayFlags) { + static const WCHAR equals[] = {'=',0}; IAssemblyNameImpl *name = impl_from_IAssemblyName(iface); - WCHAR verstr[30]; + WCHAR verstr[30], *cultureval = NULL; DWORD size; - LPWSTR cultureval = 0; - - static const WCHAR equals[] = {'=',0}; TRACE("(%p, %p, %p, %d)\n", iface, szDisplayName, pccDisplayName, dwDisplayFlags); @@ -243,9 +241,15 @@ static HRESULT WINAPI IAssemblyNameImpl_GetDisplayName(IAssemblyName *iface, if (!name->displayname || !*name->displayname) return FUSION_E_INVALID_NAME; - size = min(*pccDisplayName, lstrlenW(name->displayname) + 1); + size = strlenW(name->displayname) + 1; + + if (*pccDisplayName < size) + { + *pccDisplayName = size; + return E_NOT_SUFFICIENT_BUFFER; + } - lstrcpynW(szDisplayName, name->displayname, size); + if (szDisplayName) strcpyW(szDisplayName, name->displayname); *pccDisplayName = size; return S_OK; diff --git a/dlls/fusion/tests/asmname.c b/dlls/fusion/tests/asmname.c index 68309f2..e415c3a9 100644 --- a/dlls/fusion/tests/asmname.c +++ b/dlls/fusion/tests/asmname.c @@ -508,6 +508,23 @@ static void test_CreateAssemblyNameObject(void) ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); ok(name != NULL, "Expected non-NULL name\n"); + size = 0; + hr = IAssemblyName_GetDisplayName(name, NULL, &size, 0); + ok(hr == E_NOT_SUFFICIENT_BUFFER, "got %08x\n", hr); + ok(size == 5, "got %u\n", size); + + size = 3; + hr = IAssemblyName_GetDisplayName(name, NULL, &size, 0); + ok(hr == E_NOT_SUFFICIENT_BUFFER || broken(hr == E_INVALIDARG), "got %08x\n", hr); + ok(size == 5 || broken(size == 3), "got %u\n", size); + + size = 3; + str[0] = 'a'; + hr = IAssemblyName_GetDisplayName(name, str, &size, 0); + ok(hr == E_NOT_SUFFICIENT_BUFFER, "got %08x\n", hr); + ok(str[0] == 'a', "got %c\n", str[0]); + ok(size == 5, "got %u\n", size); + size = MAX_PATH; hr = IAssemblyName_GetDisplayName(name, str, &size, ASM_DISPLAYF_FULL); ok(hr == S_OK, "Expected S_OK, got %08x\n", hr);

1 0

Hans Leidekker : msi: Don' t read past the end of the patch list in MsiApplyMultiplePatchesW.
by Alexandre Julliard 10 Apr '15

10 Apr '15

Module: wine Branch: master Commit: 17b80c8ec00bba070972eefb8c9f9eafbc810034 URL: http://source.winehq.org/git/wine.git/?a=commit;h=17b80c8ec00bba070972eefb8… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Apr 10 12:57:40 2015 +0200 msi: Don't read past the end of the patch list in MsiApplyMultiplePatchesW. --- dlls/msi/msi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msi/msi.c b/dlls/msi/msi.c index 9dc30be..2c476fa 100644 --- a/dlls/msi/msi.c +++ b/dlls/msi/msi.c @@ -487,7 +487,7 @@ UINT WINAPI MsiApplyMultiplePatchesW(LPCWSTR szPatchPackages, r = MSI_ApplyPatchW(patch, szProductCode, szPropertiesList); msi_free(patch); - if (r != ERROR_SUCCESS) + if (r != ERROR_SUCCESS || !*end) break; beg = ++end;

1 0

Hans Leidekker : msi: Take the component action into account for file patches.
by Alexandre Julliard 10 Apr '15

10 Apr '15

Module: wine Branch: master Commit: e4fd6265ebc18a152b4c24f0bd7c8d44ad8ace16 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e4fd6265ebc18a152b4c24f0b… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Apr 10 12:58:01 2015 +0200 msi: Take the component action into account for file patches. --- dlls/msi/files.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/dlls/msi/files.c b/dlls/msi/files.c index d1e3ecf..3116754 100644 --- a/dlls/msi/files.c +++ b/dlls/msi/files.c @@ -455,8 +455,19 @@ static BOOL patchfiles_cb(MSIPACKAGE *package, LPCWSTR file, DWORD action, if (action == MSICABEXTRACT_BEGINEXTRACT) { + MSICOMPONENT *comp; + if (!(patch = find_filepatch( package, patch->disk_id, file ))) return FALSE; + comp = patch->File->Component; + comp->Action = msi_get_component_action( package, comp ); + if (!comp->Enabled || comp->Action != INSTALLSTATE_LOCAL) + { + TRACE("file %s component %s not installed or disabled\n", + debugstr_w(patch->File->File), debugstr_w(comp->Component)); + return FALSE; + } + patch->path = msi_create_temp_file( package->db ); *path = strdupW( patch->path ); *attrs = patch->File->Attributes;

1 0

Hans Leidekker : msi: Assume that file patches from registered MSI patches have already been applied.
by Alexandre Julliard 10 Apr '15

10 Apr '15

Module: wine Branch: master Commit: d263c91ce28b39102770c03d65ecab0d71a97e3c URL: http://source.winehq.org/git/wine.git/?a=commit;h=d263c91ce28b39102770c03d6… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Apr 10 12:58:26 2015 +0200 msi: Assume that file patches from registered MSI patches have already been applied. --- dlls/msi/files.c | 14 +++++++++++++- dlls/msi/msipriv.h | 1 + dlls/msi/patch.c | 2 ++ 3 files changed, 16 insertions(+), 1 deletion(-) diff --git a/dlls/msi/files.c b/dlls/msi/files.c index 3116754..ca758dd 100644 --- a/dlls/msi/files.c +++ b/dlls/msi/files.c @@ -448,6 +448,17 @@ static MSIFILEPATCH *find_filepatch( MSIPACKAGE *package, UINT disk_id, const WC return NULL; } +static BOOL is_registered_patch_media( MSIPACKAGE *package, UINT disk_id ) +{ + MSIPATCHINFO *patch; + + LIST_FOR_EACH_ENTRY( patch, &package->patches, MSIPATCHINFO, entry ) + { + if (patch->disk_id == disk_id && patch->registered) return TRUE; + } + return FALSE; +} + static BOOL patchfiles_cb(MSIPACKAGE *package, LPCWSTR file, DWORD action, LPWSTR *path, DWORD *attrs, PVOID user) { @@ -457,7 +468,8 @@ static BOOL patchfiles_cb(MSIPACKAGE *package, LPCWSTR file, DWORD action, { MSICOMPONENT *comp; - if (!(patch = find_filepatch( package, patch->disk_id, file ))) return FALSE; + if (is_registered_patch_media( package, patch->disk_id ) || + !(patch = find_filepatch( package, patch->disk_id, file ))) return FALSE; comp = patch->File->Component; comp->Action = msi_get_component_action( package, comp ); diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index 5a8c24f..9bec75f 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -193,6 +193,7 @@ typedef struct tagMSIPATCHINFO LPWSTR localfile; MSIPATCHSTATE state; BOOL delete_on_close; + BOOL registered; UINT disk_id; } MSIPATCHINFO; diff --git a/dlls/msi/patch.c b/dlls/msi/patch.c index b7bf2ef..5456359 100644 --- a/dlls/msi/patch.c +++ b/dlls/msi/patch.c @@ -918,6 +918,7 @@ static UINT msi_apply_patch_package( MSIPACKAGE *package, const WCHAR *file ) goto done; r = ERROR_OUTOFMEMORY; + patch->registered = FALSE; if (!(patch->filename = strdupW( file ))) goto done; if (!(patch->localfile = strdupW( localfile ))) goto done; @@ -1034,6 +1035,7 @@ UINT msi_apply_registered_patch( MSIPACKAGE *package, LPCWSTR patch_code ) msiobj_release( &patch_db->hdr ); return r; } + patch_info->registered = TRUE; patch_info->localfile = strdupW( patch_file ); if (!patch_info->localfile) {

1 0