August 2015 - Wine-Commits - list.winehq.org

Henri Verbeet : wined3d: Add base format info for WINED3DFMT_R8G8B8A8_UNORM_SRGB.
by Alexandre Julliard Aug. 6, 2015

Aug. 6, 2015

Module: wine Branch: master Commit: 7f29d994ad12faf10e543d31adcf9da07f0af813 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f29d994ad12faf10e543d31a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Aug 6 00:21:54 2015 +0200 wined3d: Add base format info for WINED3DFMT_R8G8B8A8_UNORM_SRGB. --- dlls/wined3d/utils.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 30ad0e0..0d4e878 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -93,6 +93,7 @@ static const struct wined3d_format_channels formats[] = {WINED3DFMT_R10G10B10A2_UINT, 10, 10, 10, 2, 0, 10, 20, 30, 4, 0, 0}, {WINED3DFMT_R10G10B10A2_SNORM, 10, 10, 10, 2, 0, 10, 20, 30, 4, 0, 0}, {WINED3DFMT_R8G8B8A8_UNORM, 8, 8, 8, 8, 0, 8, 16, 24, 4, 0, 0}, + {WINED3DFMT_R8G8B8A8_UNORM_SRGB, 8, 8, 8, 8, 0, 8, 16, 24, 4, 0, 0}, {WINED3DFMT_R8G8B8A8_UINT, 8, 8, 8, 8, 0, 8, 16, 24, 4, 0, 0}, {WINED3DFMT_R8G8B8X8_UNORM, 8, 8, 8, 0, 0, 8, 16, 0, 4, 0, 0}, {WINED3DFMT_R16G16_UNORM, 16, 16, 0, 0, 0, 16, 0, 0, 4, 0, 0},

1 0

Henri Verbeet : dxgi: Introduce a helper function to convert dxgi multisample info to wined3d.
by Alexandre Julliard Aug. 6, 2015

Aug. 6, 2015

Module: wine Branch: master Commit: fbc8f59629b296d9da8981a130871b3adeac80af URL: http://source.winehq.org/git/wine.git/?a=commit;h=fbc8f59629b296d9da8981a13… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Aug 6 00:21:55 2015 +0200 dxgi: Introduce a helper function to convert dxgi multisample info to wined3d. --- dlls/dxgi/device.c | 4 ++-- dlls/dxgi/dxgi_private.h | 2 ++ dlls/dxgi/factory.c | 12 ++---------- dlls/dxgi/utils.c | 15 +++++++++++++++ 4 files changed, 21 insertions(+), 12 deletions(-) diff --git a/dlls/dxgi/device.c b/dlls/dxgi/device.c index 2b8a05f..e288774 100644 --- a/dlls/dxgi/device.c +++ b/dlls/dxgi/device.c @@ -185,8 +185,8 @@ static HRESULT STDMETHODCALLTYPE dxgi_device_CreateSurface(IWineDXGIDevice *ifac FIXME("Implement DXGI<->wined3d usage conversion\n"); surface_desc.resource_type = WINED3D_RTYPE_SURFACE; surface_desc.format = wined3dformat_from_dxgi_format(desc->Format); - surface_desc.multisample_type = desc->SampleDesc.Count > 1 ? desc->SampleDesc.Count : WINED3D_MULTISAMPLE_NONE; - surface_desc.multisample_quality = desc->SampleDesc.Quality; + wined3d_sample_desc_from_dxgi(&surface_desc.multisample_type, + &surface_desc.multisample_quality, &desc->SampleDesc); surface_desc.usage = usage; surface_desc.pool = WINED3D_POOL_DEFAULT; surface_desc.width = desc->Width; diff --git a/dlls/dxgi/dxgi_private.h b/dlls/dxgi/dxgi_private.h index 8703158..02e37ba 100644 --- a/dlls/dxgi/dxgi_private.h +++ b/dlls/dxgi/dxgi_private.h @@ -76,6 +76,8 @@ const char *debug_dxgi_format(DXGI_FORMAT format) DECLSPEC_HIDDEN; DXGI_FORMAT dxgi_format_from_wined3dformat(enum wined3d_format_id format) DECLSPEC_HIDDEN; enum wined3d_format_id wined3dformat_from_dxgi_format(DXGI_FORMAT format) DECLSPEC_HIDDEN; +void wined3d_sample_desc_from_dxgi(enum wined3d_multisample_type *wined3d_type, + unsigned int *wined3d_quality, const DXGI_SAMPLE_DESC *dxgi_desc) DECLSPEC_HIDDEN; HRESULT dxgi_get_private_data(struct wined3d_private_store *store, REFGUID guid, UINT *data_size, void *data) DECLSPEC_HIDDEN; HRESULT dxgi_set_private_data(struct wined3d_private_store *store, diff --git a/dlls/dxgi/factory.c b/dlls/dxgi/factory.c index a66585e..a716e1b 100644 --- a/dlls/dxgi/factory.c +++ b/dlls/dxgi/factory.c @@ -211,16 +211,8 @@ static HRESULT STDMETHODCALLTYPE dxgi_factory_CreateSwapChain(IDXGIFactory1 *ifa wined3d_desc.backbuffer_height = desc->BufferDesc.Height; wined3d_desc.backbuffer_format = wined3dformat_from_dxgi_format(desc->BufferDesc.Format); wined3d_desc.backbuffer_count = desc->BufferCount; - if (desc->SampleDesc.Count > 1) - { - wined3d_desc.multisample_type = desc->SampleDesc.Count; - wined3d_desc.multisample_quality = desc->SampleDesc.Quality; - } - else - { - wined3d_desc.multisample_type = WINED3D_MULTISAMPLE_NONE; - wined3d_desc.multisample_quality = 0; - } + wined3d_sample_desc_from_dxgi(&wined3d_desc.multisample_type, + &wined3d_desc.multisample_quality, &desc->SampleDesc); wined3d_desc.swap_effect = WINED3D_SWAP_EFFECT_DISCARD; wined3d_desc.device_window = desc->OutputWindow; wined3d_desc.windowed = desc->Windowed; diff --git a/dlls/dxgi/utils.c b/dlls/dxgi/utils.c index be2b5f7..ea88567 100644 --- a/dlls/dxgi/utils.c +++ b/dlls/dxgi/utils.c @@ -325,6 +325,21 @@ enum wined3d_format_id wined3dformat_from_dxgi_format(DXGI_FORMAT format) } } +void wined3d_sample_desc_from_dxgi(enum wined3d_multisample_type *wined3d_type, + unsigned int *wined3d_quality, const DXGI_SAMPLE_DESC *dxgi_desc) +{ + if (dxgi_desc->Count > 1) + { + *wined3d_type = dxgi_desc->Count; + *wined3d_quality = dxgi_desc->Quality; + } + else + { + *wined3d_type = WINED3D_MULTISAMPLE_NONE; + *wined3d_quality = 0; + } +} + HRESULT dxgi_get_private_data(struct wined3d_private_store *store, REFGUID guid, UINT *data_size, void *data) {

1 0

Henri Verbeet : d3d10core: Ensure the information we return in d3d10_texture2d_GetDesc() is current.
by Alexandre Julliard Aug. 6, 2015

Aug. 6, 2015

Module: wine Branch: master Commit: 82dffc9567988ece44207553cd5d4fe1dacb4944 URL: http://source.winehq.org/git/wine.git/?a=commit;h=82dffc9567988ece44207553c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Aug 6 00:21:58 2015 +0200 d3d10core: Ensure the information we return in d3d10_texture2d_GetDesc() is current. --- dlls/d3d10core/texture.c | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/dlls/d3d10core/texture.c b/dlls/d3d10core/texture.c index 3ee87df..04b9e2d 100644 --- a/dlls/d3d10core/texture.c +++ b/dlls/d3d10core/texture.c @@ -243,11 +243,26 @@ static void STDMETHODCALLTYPE d3d10_texture2d_Unmap(ID3D10Texture2D *iface, UINT static void STDMETHODCALLTYPE d3d10_texture2d_GetDesc(ID3D10Texture2D *iface, D3D10_TEXTURE2D_DESC *desc) { - struct d3d10_texture2d *This = impl_from_ID3D10Texture2D(iface); + struct d3d10_texture2d *texture = impl_from_ID3D10Texture2D(iface); + struct wined3d_resource_desc wined3d_desc; TRACE("iface %p, desc %p\n", iface, desc); - *desc = This->desc; + *desc = texture->desc; + + wined3d_mutex_lock(); + wined3d_resource_get_desc(wined3d_texture_get_resource(texture->wined3d_texture), &wined3d_desc); + wined3d_mutex_unlock(); + + /* FIXME: Resizing swapchain buffers can cause these to change. We'd like + * to get everything from wined3d, but e.g. bind flags don't exist as such + * there (yet). */ + desc->Width = wined3d_desc.width; + desc->Height = wined3d_desc.height; + desc->Format = dxgi_format_from_wined3dformat(wined3d_desc.format); + desc->SampleDesc.Count = wined3d_desc.multisample_type == WINED3D_MULTISAMPLE_NONE + ? 1 : wined3d_desc.multisample_type; + desc->SampleDesc.Quality = wined3d_desc.multisample_quality; } static const struct ID3D10Texture2DVtbl d3d10_texture2d_vtbl =

1 0

Sebastian Lackner : vcomp: Implement _vcomp_for_dynamic_init and _vcomp_for_dynamic_next.
by Alexandre Julliard Aug. 6, 2015

Aug. 6, 2015

Module: wine Branch: master Commit: 69ec8904557f2ecb9708dd38034a13993be9a646 URL: http://source.winehq.org/git/wine.git/?a=commit;h=69ec8904557f2ecb9708dd380… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Aug 6 09:30:57 2015 +0200 vcomp: Implement _vcomp_for_dynamic_init and _vcomp_for_dynamic_next. --- dlls/vcomp/main.c | 141 ++++++++++++++++++++++++++++++++++++++++++++ dlls/vcomp/vcomp.spec | 4 +- dlls/vcomp100/vcomp100.spec | 4 +- dlls/vcomp110/vcomp110.spec | 4 +- dlls/vcomp90/vcomp90.spec | 4 +- 5 files changed, 149 insertions(+), 8 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=69ec8904557f2ecb9708d…

1 0

Hans Leidekker : mscms: Check the return value of a couple of liblcms2 calls.
by Alexandre Julliard Aug. 6, 2015

Aug. 6, 2015

Module: wine Branch: master Commit: ee849808957773e8ad8b21c86b1f4b347b2f0cbf URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee849808957773e8ad8b21c86… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Aug 6 14:46:15 2015 +0200 mscms: Check the return value of a couple of liblcms2 calls. --- dlls/mscms/profile.c | 15 ++++++++++++--- dlls/mscms/transform.c | 22 ++++++++++++++++++---- 2 files changed, 30 insertions(+), 7 deletions(-) diff --git a/dlls/mscms/profile.c b/dlls/mscms/profile.c index eb9b4d0..f0c4087 100644 --- a/dlls/mscms/profile.c +++ b/dlls/mscms/profile.c @@ -1152,7 +1152,7 @@ BOOL WINAPI IsColorProfileTagPresent( HPROFILE handle, TAGTYPE type, PBOOL prese release_profile( profile ); return FALSE; } - *present = cmsIsTag( profile->cmsprofile, type ); + *present = (cmsIsTag( profile->cmsprofile, type ) != 0); release_profile( profile ); ret = TRUE; @@ -1406,7 +1406,11 @@ HPROFILE WINAPI OpenColorProfileW( PPROFILE profile, DWORD access, DWORD sharing if (!(data = HeapAlloc( GetProcessHeap(), 0, profile->cbDataSize ))) return NULL; memcpy( data, profile->pProfileData, profile->cbDataSize ); - cmsprofile = cmsOpenProfileFromMem( data, profile->cbDataSize ); + if (!(cmsprofile = cmsOpenProfileFromMem( data, profile->cbDataSize ))) + { + HeapFree( GetProcessHeap(), 0, data ); + return FALSE; + } size = profile->cbDataSize; } else if (profile->dwType == PROFILE_FILENAME) @@ -1464,7 +1468,12 @@ HPROFILE WINAPI OpenColorProfileW( PPROFILE profile, DWORD access, DWORD sharing HeapFree( GetProcessHeap(), 0, data ); return NULL; } - cmsprofile = cmsOpenProfileFromMem( data, size ); + if (!(cmsprofile = cmsOpenProfileFromMem( data, size ))) + { + CloseHandle( handle ); + HeapFree( GetProcessHeap(), 0, data ); + return NULL; + } } else { diff --git a/dlls/mscms/transform.c b/dlls/mscms/transform.c index aed7011..058cffa 100644 --- a/dlls/mscms/transform.c +++ b/dlls/mscms/transform.c @@ -175,6 +175,12 @@ HTRANSFORM WINAPI CreateColorTransformW( LPLOGCOLORSPACEW space, HPROFILE dest, cmsoutput = dst->cmsprofile; transform.cmstransform = cmsCreateProofingTransform(cmsinput, in_format, cmsoutput, out_format, cmstarget, intent, INTENT_ABSOLUTE_COLORIMETRIC, proofing); + if (!transform.cmstransform) + { + if (tgt) release_profile( tgt ); + release_profile( dst ); + return FALSE; + } ret = create_transform( &transform ); @@ -254,9 +260,15 @@ HTRANSFORM WINAPI CreateMultiProfileTransform( PHPROFILE profiles, DWORD nprofil { cmsprofiles[1] = profile1->cmsprofile; } - transform.cmstransform = cmsCreateMultiprofileTransform( cmsprofiles, nprofiles, in_format, out_format, *intents, 0 ); - + transform.cmstransform = cmsCreateMultiprofileTransform( cmsprofiles, nprofiles, in_format, + out_format, *intents, 0 ); HeapFree( GetProcessHeap(), 0, cmsprofiles ); + if (!transform.cmstransform) + { + release_profile( profile0 ); + release_profile( profile1 ); + return FALSE; + } ret = create_transform( &transform ); } @@ -327,7 +339,8 @@ BOOL WINAPI TranslateBitmapBits( HTRANSFORM handle, PVOID srcbits, BMFORMAT inpu outputstride, callback, data ); if (!transform) return FALSE; - cmsChangeBuffersFormat( transform->cmstransform, from_bmformat(input), from_bmformat(output) ); + if (!cmsChangeBuffersFormat( transform->cmstransform, from_bmformat(input), from_bmformat(output) )) + return FALSE; cmsDoTransform( transform->cmstransform, srcbits, destbits, width * height ); release_transform( transform ); @@ -368,7 +381,8 @@ BOOL WINAPI TranslateColors( HTRANSFORM handle, PCOLOR in, DWORD count, if (!transform) return FALSE; xfrm = transform->cmstransform; - cmsChangeBuffersFormat( xfrm, from_type(input_type), from_type(output_type) ); + if (!cmsChangeBuffersFormat( xfrm, from_type(input_type), from_type(output_type) )) + return FALSE; switch (input_type) {

1 0

Lauri Kenttä : po: Update Finnish translation.
by Alexandre Julliard Aug. 6, 2015

Aug. 6, 2015

Module: wine Branch: master Commit: 864105b66d9739d0f58e201600563f0f09c87746 URL: http://source.winehq.org/git/wine.git/?a=commit;h=864105b66d9739d0f58e20160… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Thu Aug 6 16:45:04 2015 +0300 po: Update Finnish translation. --- po/fi.po | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/po/fi.po b/po/fi.po index 1b86d7a..dfae62f 100644 --- a/po/fi.po +++ b/po/fi.po @@ -9934,8 +9934,7 @@ msgid "" "redirected). No check is made that the file is readable text.\n" msgstr "" "TYPE <tiedostonimi> kopioi tiedoston <tiedostonimi> konsolilaitteeseen (tai\n" -"muualle, jos ohjataan muualle). Sitä, onko tiedosto luettavissa, ei\n" -"tarkisteta.\n" +"uudelleenohjattuna muualle). Tiedoston tekstimuotoisuutta ei tarkisteta.\n" #: cmd.rc:253 msgid ""

1 0

Nikolay Sivov : dwrite: Use right charmap for symbol encoding.
by Alexandre Julliard Aug. 6, 2015

Aug. 6, 2015

Module: wine Branch: master Commit: 813368481679a5848bc715d1e181782de157485f URL: http://source.winehq.org/git/wine.git/?a=commit;h=813368481679a5848bc715d1e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Aug 6 18:03:12 2015 +0300 dwrite: Use right charmap for symbol encoding. --- dlls/dwrite/dwrite_private.h | 2 +- dlls/dwrite/font.c | 2 +- dlls/dwrite/freetype.c | 14 +++++++++++--- 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index cee49df..4418c92 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -190,7 +190,7 @@ extern void freetype_notify_cacheremove(IDWriteFontFace2*) DECLSPEC_HIDDEN; extern BOOL freetype_is_monospaced(IDWriteFontFace2*) DECLSPEC_HIDDEN; extern HRESULT freetype_get_glyph_outline(IDWriteFontFace2*,FLOAT,UINT16,USHORT,struct glyph_outline**) DECLSPEC_HIDDEN; extern UINT16 freetype_get_glyphcount(IDWriteFontFace2*) DECLSPEC_HIDDEN; -extern UINT16 freetype_get_glyphindex(IDWriteFontFace2*,UINT32) DECLSPEC_HIDDEN; +extern UINT16 freetype_get_glyphindex(IDWriteFontFace2*,UINT32,INT) DECLSPEC_HIDDEN; extern BOOL freetype_has_kerning_pairs(IDWriteFontFace2*) DECLSPEC_HIDDEN; extern INT32 freetype_get_kerning_pair_adjustment(IDWriteFontFace2*,UINT16,UINT16) DECLSPEC_HIDDEN; extern void freetype_get_glyph_bbox(IDWriteFontFace2*,FLOAT,UINT16,BOOL,RECT*) DECLSPEC_HIDDEN; diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index a4ed575..56a3655 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -469,7 +469,7 @@ static HRESULT WINAPI dwritefontface_GetGlyphIndices(IDWriteFontFace2 *iface, UI } for (i = 0; i < count; i++) - glyph_indices[i] = freetype_get_glyphindex(iface, codepoints[i]); + glyph_indices[i] = freetype_get_glyphindex(iface, codepoints[i], This->charmap); return S_OK; } diff --git a/dlls/dwrite/freetype.c b/dlls/dwrite/freetype.c index e693f9a..3290243 100644 --- a/dlls/dwrite/freetype.c +++ b/dlls/dwrite/freetype.c @@ -437,12 +437,20 @@ UINT16 freetype_get_glyphcount(IDWriteFontFace2 *fontface) return count; } -UINT16 freetype_get_glyphindex(IDWriteFontFace2 *fontface, UINT32 codepoint) +UINT16 freetype_get_glyphindex(IDWriteFontFace2 *fontface, UINT32 codepoint, INT charmap) { UINT16 glyph; EnterCriticalSection(&freetype_cs); - glyph = pFTC_CMapCache_Lookup(cmap_cache, fontface, -1, codepoint); + if (charmap == -1) + glyph = pFTC_CMapCache_Lookup(cmap_cache, fontface, charmap, codepoint); + else { + /* special handling for symbol fonts */ + if (codepoint < 0x100) codepoint += 0xf000; + glyph = pFTC_CMapCache_Lookup(cmap_cache, fontface, charmap, codepoint); + if (!glyph) + glyph = pFTC_CMapCache_Lookup(cmap_cache, fontface, charmap, codepoint - 0xf000); + } LeaveCriticalSection(&freetype_cs); return glyph; @@ -627,7 +635,7 @@ UINT16 freetype_get_glyphcount(IDWriteFontFace2 *fontface) return 0; } -UINT16 freetype_get_glyphindex(IDWriteFontFace2 *fontface, UINT32 codepoint) +UINT16 freetype_get_glyphindex(IDWriteFontFace2 *fontface, UINT32 codepoint, INT charmap) { return 0; }

1 0

Piotr Caban : msvcp120: Fix tr2::sys:: _Copy_file test failures on non-ntfs file system.
by Alexandre Julliard Aug. 6, 2015

Aug. 6, 2015

Module: wine Branch: master Commit: 47a3719f22ef870acc7a869a96d0612923c4c013 URL: http://source.winehq.org/git/wine.git/?a=commit;h=47a3719f22ef870acc7a869a9… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Aug 6 12:07:22 2015 +0200 msvcp120: Fix tr2::sys::_Copy_file test failures on non-ntfs file system. --- dlls/msvcp120/tests/msvcp120.c | 33 ++++++++++++++++++--------------- 1 file changed, 18 insertions(+), 15 deletions(-) diff --git a/dlls/msvcp120/tests/msvcp120.c b/dlls/msvcp120/tests/msvcp120.c index 84eb096..762a261 100644 --- a/dlls/msvcp120/tests/msvcp120.c +++ b/dlls/msvcp120/tests/msvcp120.c @@ -558,18 +558,20 @@ static void test_tr2_sys__Copy_file(void) char const *dest; MSVCP_bool fail_if_exists; int last_error; + int last_error2; MSVCP_bool is_todo; } tests[] = { - { "f1", "f1_copy", TRUE, ERROR_SUCCESS, FALSE }, - { "f1", "tr2_test_dir\\f1_copy", TRUE, ERROR_SUCCESS, FALSE }, - { "f1", "tr2_test_dir\\f1_copy", TRUE, ERROR_FILE_EXISTS, FALSE }, - { "f1", "tr2_test_dir\\f1_copy", FALSE, ERROR_SUCCESS, FALSE }, - { "tr2_test_dir", "f1", TRUE, ERROR_ACCESS_DENIED, FALSE }, - { "tr2_test_dir", "tr2_test_dir_copy", TRUE, ERROR_ACCESS_DENIED, FALSE }, - { NULL, "f1", TRUE, ERROR_INVALID_PARAMETER, TRUE }, - { "f1", NULL, TRUE, ERROR_INVALID_PARAMETER, TRUE }, - { "not_exist", "tr2_test_dir", TRUE, ERROR_FILE_NOT_FOUND, FALSE }, - { "f1", "not_exist_dir\\f1_copy", TRUE, ERROR_PATH_NOT_FOUND, FALSE } + { "f1", "f1_copy", TRUE, ERROR_SUCCESS, ERROR_SUCCESS, FALSE }, + { "f1", "tr2_test_dir\\f1_copy", TRUE, ERROR_SUCCESS, ERROR_SUCCESS, FALSE }, + { "f1", "tr2_test_dir\\f1_copy", TRUE, ERROR_FILE_EXISTS, ERROR_FILE_EXISTS, FALSE }, + { "f1", "tr2_test_dir\\f1_copy", FALSE, ERROR_SUCCESS, ERROR_SUCCESS, FALSE }, + { "tr2_test_dir", "f1", TRUE, ERROR_ACCESS_DENIED, ERROR_ACCESS_DENIED, FALSE }, + { "tr2_test_dir", "tr2_test_dir_copy", TRUE, ERROR_ACCESS_DENIED, ERROR_ACCESS_DENIED, FALSE }, + { NULL, "f1", TRUE, ERROR_INVALID_PARAMETER, ERROR_INVALID_PARAMETER, TRUE }, + { "f1", NULL, TRUE, ERROR_INVALID_PARAMETER, ERROR_INVALID_PARAMETER, TRUE }, + { "not_exist", "tr2_test_dir", TRUE, ERROR_FILE_NOT_FOUND, ERROR_FILE_NOT_FOUND, FALSE }, + { "f1", "not_exist_dir\\f1_copy", TRUE, ERROR_PATH_NOT_FOUND, ERROR_FILE_NOT_FOUND, FALSE }, + { "f1", "tr2_test_dir", TRUE, ERROR_ACCESS_DENIED, ERROR_FILE_EXISTS, FALSE } }; ret = p_tr2_sys__Make_dir("tr2_test_dir"); @@ -585,17 +587,18 @@ static void test_tr2_sys__Copy_file(void) errno = 0xdeadbeef; ret = p_tr2_sys__Copy_file(tests[i].source, tests[i].dest, tests[i].fail_if_exists); if(tests[i].is_todo) - todo_wine ok(ret == tests[i].last_error, "test_tr2_sys__Copy_file(): test %d expect: %d, got %d\n", i+1, tests[i].last_error, ret); + todo_wine ok(ret == tests[i].last_error || ret == tests[i].last_error2, + "test_tr2_sys__Copy_file(): test %d expect: %d, got %d\n", + i+1, tests[i].last_error, ret); else - ok(ret == tests[i].last_error, "test_tr2_sys__Copy_file(): test %d expect: %d, got %d\n", i+1, tests[i].last_error, ret); + ok(ret == tests[i].last_error || ret == tests[i].last_error2, + "test_tr2_sys__Copy_file(): test %d expect: %d, got %d\n", + i+1, tests[i].last_error, ret); ok(errno == 0xdeadbeef, "test_tr2_sys__Copy_file(): test %d errno expect 0xdeadbeef, got %d\n", i+1, errno); if(ret == ERROR_SUCCESS) ok(p_tr2_sys__File_size(tests[i].source) == p_tr2_sys__File_size(tests[i].dest), "test_tr2_sys__Copy_file(): test %d failed, two files' size are not equal\n", i+1); } - ret = p_tr2_sys__Copy_file("f1", "tr2_test_dir", TRUE); - ok(ret==ERROR_ACCESS_DENIED || ret==ERROR_FILE_EXISTS, - "test_tr2_sys__Copy_file(): expect: ERROR_ACCESS_DENIED or ERROR_FILE_EXISTS, got %d\n", ret); ok(DeleteFileA("f1"), "expect f1 to exist\n"); ok(DeleteFileA("f1_copy"), "expect f1_copy to exist\n");

1 0

Vincent Povirk : ole32: Ignore high part of size in storage version 3 files.
by Alexandre Julliard Aug. 6, 2015

Aug. 6, 2015

Module: wine Branch: master Commit: 9d517a1727f7de379912019e417d87634427288b URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d517a1727f7de379912019e4… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Aug 5 16:33:07 2015 -0500 ole32: Ignore high part of size in storage version 3 files. --- dlls/ole32/storage32.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index ce72b73..c881620 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -3446,10 +3446,18 @@ static HRESULT StorageImpl_ReadDirEntry( OFFSET_PS_SIZE, &buffer->size.u.LowPart); - StorageUtl_ReadDWord( - currentEntry, - OFFSET_PS_SIZE_HIGH, - &buffer->size.u.HighPart); + if (This->bigBlockSize < 4096) + { + /* Version 3 files may have junk in the high part of size. */ + buffer->size.u.HighPart = 0; + } + else + { + StorageUtl_ReadDWord( + currentEntry, + OFFSET_PS_SIZE_HIGH, + &buffer->size.u.HighPart); + } } return readRes;

1 0

Akihiro Sagawa : user.exe: Release the Win16 lock due to loading 32-bit dlls in CreateWindow.
by Alexandre Julliard Aug. 6, 2015

Aug. 6, 2015

Module: wine Branch: master Commit: 9ac7bca209e1b11af898d1b393d13c8dc92c66e1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ac7bca209e1b11af898d1b39… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Mon Aug 3 23:48:47 2015 +0900 user.exe: Release the Win16 lock due to loading 32-bit dlls in CreateWindow. --- dlls/user.exe16/message.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/user.exe16/message.c b/dlls/user.exe16/message.c index 935b025..b5d9225 100644 --- a/dlls/user.exe16/message.c +++ b/dlls/user.exe16/message.c @@ -2648,11 +2648,17 @@ static DWORD wait_message16( DWORD count, const HANDLE *handles, DWORD timeout, */ HWND create_window16( CREATESTRUCTW *cs, LPCWSTR className, HINSTANCE instance, BOOL unicode ) { + DWORD lock; + HWND ret; + /* map to module handle */ if (instance && !((ULONG_PTR)instance >> 16)) instance = HINSTANCE_32( GetExePtr( HINSTANCE_16(instance) )); - return wow_handlers32.create_window( cs, className, instance, unicode ); + ReleaseThunkLock( &lock ); + ret = wow_handlers32.create_window( cs, className, instance, unicode ); + RestoreThunkLock( lock ); + return ret; }

1 0