March 2011 - Wine-Commits - list.winehq.org

Hans Leidekker : msi: Compare keys only in compare_record.
by Alexandre Julliard March 7, 2011

March 7, 2011

Module: wine Branch: master Commit: 659db6e9024d60d997d065021b8ab46f765d0e3c URL: http://source.winehq.org/git/wine.git/?a=commit;h=659db6e9024d60d997d065021… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Mar 7 12:40:06 2011 +0100 msi: Compare keys only in compare_record. --- dlls/msi/table.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/msi/table.c b/dlls/msi/table.c index cdbdd58..bc05987 100644 --- a/dlls/msi/table.c +++ b/dlls/msi/table.c @@ -1630,6 +1630,8 @@ static int compare_record( MSITABLEVIEW *tv, UINT row, MSIRECORD *rec ) for (i = 0; i < tv->num_cols; i++ ) { + if (!(tv->columns[i].type & MSITYPE_KEY)) continue; + r = get_table_value_from_record( tv, rec, i + 1, &ivalue ); if (r != ERROR_SUCCESS) return 1;

1 0

Hans Leidekker : userenv: Initialize a variable (valgrind).
by Alexandre Julliard March 7, 2011

March 7, 2011

Module: wine Branch: master Commit: 8c7d6b1c94ca5a15a28c4e1e6a687ac699dc6c99 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c7d6b1c94ca5a15a28c4e1e6… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Mar 7 12:39:18 2011 +0100 userenv: Initialize a variable (valgrind). --- dlls/userenv/userenv_main.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/userenv/userenv_main.c b/dlls/userenv/userenv_main.c index 6221e7e..3a02149 100644 --- a/dlls/userenv/userenv_main.c +++ b/dlls/userenv/userenv_main.c @@ -161,7 +161,7 @@ BOOL WINAPI GetUserProfileDirectoryW( HANDLE hToken, LPWSTR lpProfileDir, if (!(t = HeapAlloc( GetProcessHeap(), 0, len ))) return FALSE; if (!GetTokenInformation( hToken, TokenUser, t, len, &len )) goto done; - len = 0; + len = domain_len = 0; LookupAccountSidW( NULL, t->User.Sid, NULL, &len, NULL, &domain_len, NULL ); if (GetLastError() != ERROR_INSUFFICIENT_BUFFER) goto done; if (!(userW = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) ))) goto done;

1 0

Henri Verbeet : wined3d: Check subresources for NULL during texture cleanup .
by Alexandre Julliard March 7, 2011

March 7, 2011

Module: wine Branch: master Commit: 9059271442db4e75c7d5c9e39a061807b6e64a33 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9059271442db4e75c7d5c9e39… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 7 01:30:31 2011 +0100 wined3d: Check subresources for NULL during texture cleanup. This fixes a regression introduced by 1de6adfbae7ac36c6649aab209d1a62a64e80465. --- dlls/wined3d/cubetexture.c | 6 ++++-- dlls/wined3d/texture.c | 7 +++++-- dlls/wined3d/volumetexture.c | 6 ++++-- 3 files changed, 13 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/cubetexture.c b/dlls/wined3d/cubetexture.c index 765c11a..165f6c0 100644 --- a/dlls/wined3d/cubetexture.c +++ b/dlls/wined3d/cubetexture.c @@ -179,10 +179,12 @@ static void cubetexture_cleanup(IWineD3DCubeTextureImpl *This) for (i = 0; i < sub_count; ++i) { - IWineD3DSurfaceImpl *surface = surface_from_resource(This->baseTexture.sub_resources[i]); + struct wined3d_resource *sub_resource = This->baseTexture.sub_resources[i]; - if (surface) + if (sub_resource) { + IWineD3DSurfaceImpl *surface = surface_from_resource(sub_resource); + /* Clean out the texture name we gave to the surface so that the * surface doesn't try and release it. */ surface_set_texture_name(surface, 0, TRUE); diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 8f98739..6ed3c7d 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -201,9 +201,12 @@ static void texture_cleanup(IWineD3DTextureImpl *This) for (i = 0; i < This->baseTexture.level_count; ++i) { - IWineD3DSurfaceImpl *surface = surface_from_resource(This->baseTexture.sub_resources[i]); - if (surface) + struct wined3d_resource *sub_resource = This->baseTexture.sub_resources[i]; + + if (sub_resource) { + IWineD3DSurfaceImpl *surface = surface_from_resource(sub_resource); + /* Clean out the texture name we gave to the surface so that the * surface doesn't try and release it */ surface_set_texture_name(surface, 0, TRUE); diff --git a/dlls/wined3d/volumetexture.c b/dlls/wined3d/volumetexture.c index e24ff79..a0eb4d0 100644 --- a/dlls/wined3d/volumetexture.c +++ b/dlls/wined3d/volumetexture.c @@ -121,10 +121,12 @@ static void volumetexture_cleanup(IWineD3DVolumeTextureImpl *This) for (i = 0; i < This->baseTexture.level_count; ++i) { - IWineD3DVolumeImpl *volume = volume_from_resource(This->baseTexture.sub_resources[i]); + struct wined3d_resource *sub_resource = This->baseTexture.sub_resources[i]; - if (volume) + if (sub_resource) { + IWineD3DVolumeImpl *volume = volume_from_resource(sub_resource); + /* Cleanup the container. */ volume_set_container(volume, NULL); IWineD3DVolume_Release((IWineD3DVolume *)volume);

1 0

Hans Leidekker : msi: Manage one assembly cache per major version of the . NET runtime.
by Alexandre Julliard March 7, 2011

March 7, 2011

Module: wine Branch: master Commit: f1e59351ded497a7f9cd7c27c0fdfcf6db3765c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f1e59351ded497a7f9cd7c27c… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Mar 7 12:40:39 2011 +0100 msi: Manage one assembly cache per major version of the .NET runtime. --- dlls/msi/assembly.c | 188 +++++++++++++++++++++++++++++++++------------------ dlls/msi/msipriv.h | 10 +++- dlls/msi/package.c | 6 +- 3 files changed, 135 insertions(+), 69 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f1e59351ded497a7f9cd7…

1 0

Henri Verbeet : wined3d: Try to evict the surface' s sysmem copy in surface_load_location().
by Alexandre Julliard March 7, 2011

March 7, 2011

Module: wine Branch: master Commit: 60a710455ef8dd4ac38901a8741189defa427e1f URL: http://source.winehq.org/git/wine.git/?a=commit;h=60a710455ef8dd4ac38901a87… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 7 01:30:34 2011 +0100 wined3d: Try to evict the surface's sysmem copy in surface_load_location(). The memory may not be freed until surface destruction otherwise. The PBO creation code in surface_prepare_system_memory() also depends on the SYSMEM location being recreated regularly, although arguably that's just a symptom of the resource location management being somewhat broken. --- dlls/wined3d/surface.c | 31 ++++++++++++++++++++++--------- 1 files changed, 22 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 03d597c..2c9aa48 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1275,6 +1275,17 @@ static BOOL surface_convert_color_to_float(IWineD3DSurfaceImpl *surface, DWORD c return TRUE; } +static void surface_evict_sysmem(IWineD3DSurfaceImpl *surface) +{ + if (surface->flags & SFLAG_DONOTFREE) + return; + + HeapFree(GetProcessHeap(), 0, surface->resource.heapMemory); + surface->resource.allocatedMemory = NULL; + surface->resource.heapMemory = NULL; + surface_modify_location(surface, SFLAG_INSYSMEM, FALSE); +} + HRESULT surface_load(IWineD3DSurfaceImpl *surface, BOOL srgb) { DWORD flag = srgb ? SFLAG_INSRGBTEX : SFLAG_INTEXTURE; @@ -1316,14 +1327,7 @@ HRESULT surface_load(IWineD3DSurfaceImpl *surface, BOOL srgb) /* No partial locking for textures yet. */ surface_load_location(surface, flag, NULL); - - if (!(surface->flags & SFLAG_DONOTFREE)) - { - HeapFree(GetProcessHeap(), 0, surface->resource.heapMemory); - surface->resource.allocatedMemory = NULL; - surface->resource.heapMemory = NULL; - surface_modify_location(surface, SFLAG_INSYSMEM, FALSE); - } + surface_evict_sysmem(surface); return WINED3D_OK; } @@ -2071,7 +2075,10 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_Unmap(IWineD3DSurface *iface) * merged again in the drawable. The sysmem copy is not fully up to * date because only a subrectangle was read in Map(). */ if (!fullsurface) + { surface_modify_location(This, SFLAG_INDRAWABLE, TRUE); + surface_evict_sysmem(This); + } This->dirtyRect.left = This->currentDesc.Width; This->dirtyRect.top = This->currentDesc.Height; @@ -4652,7 +4659,13 @@ HRESULT surface_load_location(IWineD3DSurfaceImpl *surface, DWORD flag, const RE } } - if (!rect) surface->flags |= flag; + if (!rect) + { + surface->flags |= flag; + + if (flag != SFLAG_INSYSMEM && (surface->flags & SFLAG_INSYSMEM)) + surface_evict_sysmem(surface); + } if (in_fbo && (surface->flags & (SFLAG_INTEXTURE | SFLAG_INDRAWABLE))) {

1 0

Francois Gouget : mscoree: Add a '\n' to an ERR() trace.
by Alexandre Julliard March 7, 2011

March 7, 2011

Module: wine Branch: master Commit: e0b2307f9c6208d7672a03338e6f84e8966fd2a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e0b2307f9c6208d7672a03338… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Mar 5 11:50:29 2011 +0100 mscoree: Add a '\n' to an ERR() trace. --- dlls/mscoree/metahost.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mscoree/metahost.c b/dlls/mscoree/metahost.c index 708f638..ca4795e 100644 --- a/dlls/mscoree/metahost.c +++ b/dlls/mscoree/metahost.c @@ -119,7 +119,7 @@ static HRESULT load_mono(CLRRuntimeInfo *This, loaded_mono **result) if ((*result)->is_shutdown) { - ERR("Cannot load Mono after it has been shut down."); + ERR("Cannot load Mono after it has been shut down.\n"); *result = NULL; return E_FAIL; }

1 0

Francois Gouget : wscript/tests: Add a '\n' to an ok() call.
by Alexandre Julliard March 7, 2011

March 7, 2011

Module: wine Branch: master Commit: bc6a7f40d5bb02483a166fe388e1cc81195cbcda URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc6a7f40d5bb02483a166fe38… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Mar 5 11:50:42 2011 +0100 wscript/tests: Add a '\n' to an ok() call. --- programs/wscript/tests/run.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/wscript/tests/run.c b/programs/wscript/tests/run.c index 7cb7bc8..405aae4 100644 --- a/programs/wscript/tests/run.c +++ b/programs/wscript/tests/run.c @@ -272,7 +272,7 @@ static BOOL WINAPI test_enum_proc(HMODULE module, LPCTSTR type, LPSTR name, LONG script_size--; ext = strrchr(name, '.'); - ok(ext != NULL, "no script extension"); + ok(ext != NULL, "no script extension\n"); if(!ext) return TRUE;

1 0

Francois Gouget : urlmon/tests: Add a '\n' to an ok() call.
by Alexandre Julliard March 7, 2011

March 7, 2011

Module: wine Branch: master Commit: 91aa80b7e3dbf39de2ea1f2aa109cdb21b73082b URL: http://source.winehq.org/git/wine.git/?a=commit;h=91aa80b7e3dbf39de2ea1f2aa… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Mar 5 11:52:01 2011 +0100 urlmon/tests: Add a '\n' to an ok() call. --- dlls/urlmon/tests/url.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/urlmon/tests/url.c b/dlls/urlmon/tests/url.c index 4469949..17a797b 100644 --- a/dlls/urlmon/tests/url.c +++ b/dlls/urlmon/tests/url.c @@ -2765,7 +2765,7 @@ static void test_BindToStorage(int protocol, DWORD flags, DWORD t) ok(hres == S_OK, "IMoniker_BindToStorage failed: %08x\n", hres); ok(unk != NULL, "unk == NULL\n"); if(unk == NULL) { - ok(0, "Expected security problem to be ignored."); + ok(0, "Expected security problem to be ignored.\n"); invalid_cn_accepted = FALSE; binding_hres = INET_E_INVALID_CERTIFICATE; }

1 0

Francois Gouget : msvcrt/tests: Add a trailing '\n' to an ok() call.
by Alexandre Julliard March 7, 2011

March 7, 2011

Module: wine Branch: master Commit: bf75229a0402b8eca8e2f41ded1e69830b587eef URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf75229a0402b8eca8e2f41de… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Mar 5 11:51:15 2011 +0100 msvcrt/tests: Add a trailing '\n' to an ok() call. --- dlls/msvcrt/tests/printf.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msvcrt/tests/printf.c b/dlls/msvcrt/tests/printf.c index f05d124..ddf4801 100644 --- a/dlls/msvcrt/tests/printf.c +++ b/dlls/msvcrt/tests/printf.c @@ -859,7 +859,7 @@ static void test_xcvt(void) for( i = 0; strcmp( test_cvt_testcases[i].expstr_e, "END"); i++){ decpt = sign = 100; err = p__fcvt_s(str, 1024, test_cvt_testcases[i].value, test_cvt_testcases[i].nrdigits, &decpt, &sign); - ok(err == 0, "_fcvt_s() failed with error code %d", err); + ok(err == 0, "_fcvt_s() failed with error code %d\n", err); ok( 0 == strncmp( str, test_cvt_testcases[i].expstr_f, 15), "_fcvt_s() bad return, got '%s' expected '%s'. test %d\n", str, test_cvt_testcases[i].expstr_f, i);

1 0

Francois Gouget : riched20/tests: Add a '\n' to an ok() call.
by Alexandre Julliard March 7, 2011

March 7, 2011

Module: wine Branch: master Commit: cc2cd5a525ba94656751e57b4a96988b813cc22c URL: http://source.winehq.org/git/wine.git/?a=commit;h=cc2cd5a525ba94656751e57b4… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Mar 5 11:50:48 2011 +0100 riched20/tests: Add a '\n' to an ok() call. --- dlls/riched20/tests/editor.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index 955a394..7a4e032 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -6028,7 +6028,7 @@ static void test_EM_CHARFROMPOS(void) hwnd = new_richedit(NULL); result = SendMessageA(hwnd, WM_SETTEXT, 0, (LPARAM)"one two three four five six seven\reight"); - ok(result == 1, "Expected 1, got %d", result); + ok(result == 1, "Expected 1, got %d\n", result); GetClientRect(hwnd, &rcClient); result = SendMessage(hwnd, EM_CHARFROMPOS, 0, (LPARAM)&point);

1 0