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

Henri Verbeet : d3d9: Don' t assert on invalid IDirect3DBaseTexture9 interfaces.
by Alexandre Julliard 05 Aug '15

05 Aug '15

Module: wine Branch: master Commit: 0c8e78f80dc3bfeb72deeb51274ce42adb623b0b URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c8e78f80dc3bfeb72deeb512… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Aug 4 10:47:57 2015 +0200 d3d9: Don't assert on invalid IDirect3DBaseTexture9 interfaces. --- dlls/d3d9/tests/device.c | 22 ++++++++++++++++++++-- dlls/d3d9/texture.c | 12 +++++++++--- 2 files changed, 29 insertions(+), 5 deletions(-) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index cb4a6e8..e58d1df 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -6627,8 +6627,9 @@ static void test_filter(void) DestroyWindow(window); } -static void test_get_texture(void) +static void test_get_set_texture(void) { + const IDirect3DBaseTexture9Vtbl *texture_vtbl; IDirect3DBaseTexture9 *texture; IDirect3DDevice9 *device; IDirect3D9 *d3d; @@ -6655,6 +6656,23 @@ static void test_get_texture(void) ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); ok(!texture, "Got unexpected texture %p.\n", texture); + hr = IDirect3DDevice9_CreateTexture(device, 16, 16, 1, 0, D3DFMT_A8R8G8B8, + D3DPOOL_MANAGED, (IDirect3DTexture9 **)&texture, NULL); + ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr); + texture_vtbl = texture->lpVtbl; + texture->lpVtbl = (IDirect3DBaseTexture9Vtbl *)0xdeadbeef; + hr = IDirect3DDevice9_SetTexture(device, 0, texture); + ok(SUCCEEDED(hr), "Failed to set texture, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetTexture(device, 0, NULL); + ok(SUCCEEDED(hr), "Failed to set texture, hr %#x.\n", hr); + texture->lpVtbl = NULL; + hr = IDirect3DDevice9_SetTexture(device, 0, texture); + ok(SUCCEEDED(hr), "Failed to set texture, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetTexture(device, 0, NULL); + ok(SUCCEEDED(hr), "Failed to set texture, hr %#x.\n", hr); + texture->lpVtbl = texture_vtbl; + IDirect3DBaseTexture9_Release(texture); + refcount = IDirect3DDevice9_Release(device); ok(!refcount, "Device has %u references left.\n", refcount); IDirect3D9_Release(d3d); @@ -10231,7 +10249,7 @@ START_TEST(device) test_cube_textures(); test_mipmap_gen(); test_filter(); - test_get_texture(); + test_get_set_texture(); test_lod(); test_surface_get_container(); test_surface_alignment(); diff --git a/dlls/d3d9/texture.c b/dlls/d3d9/texture.c index c1a0277..1f8f0f2 100644 --- a/dlls/d3d9/texture.c +++ b/dlls/d3d9/texture.c @@ -1252,9 +1252,15 @@ struct d3d9_texture *unsafe_impl_from_IDirect3DBaseTexture9(IDirect3DBaseTexture { if (!iface) return NULL; - assert(iface->lpVtbl == (const IDirect3DBaseTexture9Vtbl *)&d3d9_texture_2d_vtbl - || iface->lpVtbl == (const IDirect3DBaseTexture9Vtbl *)&d3d9_texture_cube_vtbl - || iface->lpVtbl == (const IDirect3DBaseTexture9Vtbl *)&d3d9_texture_3d_vtbl); + + if (iface->lpVtbl != (const IDirect3DBaseTexture9Vtbl *)&d3d9_texture_2d_vtbl + && iface->lpVtbl != (const IDirect3DBaseTexture9Vtbl *)&d3d9_texture_cube_vtbl + && iface->lpVtbl != (const IDirect3DBaseTexture9Vtbl *)&d3d9_texture_3d_vtbl) + { + WARN("%p is not a valid IDirect3DBaseTexture9 interface.\n", iface); + return NULL; + } + return CONTAINING_RECORD(iface, struct d3d9_texture, IDirect3DBaseTexture9_iface); }

1 0

Henri Verbeet : d3d8/tests: Port test_get_set_texture() to d3d8.
by Alexandre Julliard 05 Aug '15

05 Aug '15

Module: wine Branch: master Commit: 1e439a5ed1a0d82931ca8288e2cf961356746b9a URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e439a5ed1a0d82931ca8288e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Aug 4 08:53:29 2015 +0200 d3d8/tests: Port test_get_set_texture() to d3d8. --- dlls/d3d8/tests/device.c | 53 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 53 insertions(+) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index 7158cf7..d7400e7 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -4394,6 +4394,58 @@ static void test_cube_textures(void) DestroyWindow(window); } +static void test_get_set_texture(void) +{ + const IDirect3DBaseTexture8Vtbl *texture_vtbl; + IDirect3DBaseTexture8 *texture; + IDirect3DDevice8 *device; + IDirect3D8 *d3d; + ULONG refcount; + HWND window; + HRESULT hr; + + window = CreateWindowA("d3d8_test_wc", "d3d8_test", WS_OVERLAPPEDWINDOW, + 0, 0, 640, 480, 0, 0, 0, 0); + d3d = Direct3DCreate8(D3D_SDK_VERSION); + ok(!!d3d, "Failed to create a D3D object.\n"); + if (!(device = create_device(d3d, window, NULL))) + { + skip("Failed to create a D3D device, skipping tests.\n"); + IDirect3D8_Release(d3d); + DestroyWindow(window); + return; + } + + texture = (IDirect3DBaseTexture8 *)0xdeadbeef; + hr = IDirect3DDevice8_SetTexture(device, 0, NULL); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice8_GetTexture(device, 0, &texture); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + ok(!texture, "Got unexpected texture %p.\n", texture); + + hr = IDirect3DDevice8_CreateTexture(device, 16, 16, 1, 0, D3DFMT_A8R8G8B8, + D3DPOOL_MANAGED, (IDirect3DTexture8 **)&texture); + ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr); + texture_vtbl = texture->lpVtbl; + texture->lpVtbl = (IDirect3DBaseTexture8Vtbl *)0xdeadbeef; + hr = IDirect3DDevice8_SetTexture(device, 0, texture); + ok(SUCCEEDED(hr), "Failed to set texture, hr %#x.\n", hr); + hr = IDirect3DDevice8_SetTexture(device, 0, NULL); + ok(SUCCEEDED(hr), "Failed to set texture, hr %#x.\n", hr); + texture->lpVtbl = NULL; + hr = IDirect3DDevice8_SetTexture(device, 0, texture); + ok(SUCCEEDED(hr), "Failed to set texture, hr %#x.\n", hr); + hr = IDirect3DDevice8_SetTexture(device, 0, NULL); + ok(SUCCEEDED(hr), "Failed to set texture, hr %#x.\n", hr); + texture->lpVtbl = texture_vtbl; + IDirect3DBaseTexture8_Release(texture); + + refcount = IDirect3DDevice8_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + IDirect3D8_Release(d3d); + DestroyWindow(window); +} + /* Test the behaviour of the IDirect3DDevice8::CreateImageSurface() method. * * The expected behaviour (as documented in the original DX8 docs) is that the @@ -7270,6 +7322,7 @@ START_TEST(device) test_vb_lock_flags(); test_texture_stage_states(); test_cube_textures(); + test_get_set_texture(); test_image_surface_pool(); test_surface_get_container(); test_lockrect_invalid();

1 0

Ken Thomases : dbghelp: Fix a copy-paste error in comparing Mach-O segment names.
by Alexandre Julliard 05 Aug '15

05 Aug '15

Module: wine Branch: master Commit: be68890cac2ef9e875e0ccac7288834fa9f9bb43 URL: http://source.winehq.org/git/wine.git/?a=commit;h=be68890cac2ef9e875e0ccac7… Author: Ken Thomases <ken(a)codeweavers.com> Date: Tue Aug 4 02:40:37 2015 -0500 dbghelp: Fix a copy-paste error in comparing Mach-O segment names. --- dlls/dbghelp/macho_module.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dbghelp/macho_module.c b/dlls/dbghelp/macho_module.c index 3e91403..8a1c5b2 100644 --- a/dlls/dbghelp/macho_module.c +++ b/dlls/dbghelp/macho_module.c @@ -337,7 +337,7 @@ BOOL macho_find_section(struct image_file_map* ifm, const char* segname, const c for (i = 0; i < fmap->num_sections; i++) { if (strcmp(fmap->sect[i].section->sectname, sectname) == 0 && - (!segname || strcmp(fmap->sect[i].section->sectname, segname) == 0)) + (!segname || strcmp(fmap->sect[i].section->segname, segname) == 0)) { ism->fmap = ifm; ism->sidx = i;

1 0

Ken Thomases : dbghelp: Ignore Mach-O segments other than __TEXT for images in dyld' s shared cache.
by Alexandre Julliard 05 Aug '15

05 Aug '15

Module: wine Branch: master Commit: 49f0bf6f0ba3163028afb2a5910ef4d709abe26a URL: http://source.winehq.org/git/wine.git/?a=commit;h=49f0bf6f0ba3163028afb2a59… Author: Ken Thomases <ken(a)codeweavers.com> Date: Tue Aug 4 02:40:38 2015 -0500 dbghelp: Ignore Mach-O segments other than __TEXT for images in dyld's shared cache. Images in the shared cache have their segments mapped non-contiguously. We don't know how to find where the non-__TEXT segments actually are. Also, the code assumes that the image is mapped contiguously in various places. So, we just ignore those segments. Treating the non-contiguous segments as though they were contiguous caused their apparent memory ranges to overlap, leading to addresses being attributed to the wrong module, let alone symbol. --- dlls/dbghelp/dbghelp_private.h | 2 +- dlls/dbghelp/image_private.h | 1 + dlls/dbghelp/macho_module.c | 96 ++++++++++++++++++++++++++++++++++-------- dlls/dbghelp/minidump.c | 2 +- dlls/dbghelp/path.c | 2 +- 5 files changed, 83 insertions(+), 20 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=49f0bf6f0ba3163028afb…

1 0

Nikolay Sivov : dwrite: Advances and offsets are optional for IDWriteGlyphRunAnalysis.
by Alexandre Julliard 05 Aug '15

05 Aug '15

Module: wine Branch: master Commit: 720c430594a895ce43ffe7a00b930b49d64e63f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=720c430594a895ce43ffe7a00… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Aug 4 11:16:10 2015 +0300 dwrite: Advances and offsets are optional for IDWriteGlyphRunAnalysis. --- dlls/dwrite/analyzer.c | 5 ---- dlls/dwrite/dwrite_private.h | 7 ++++- dlls/dwrite/font.c | 70 ++++++++++++++++++++++++++++++++++++-------- dlls/dwrite/main.c | 2 +- dlls/dwrite/tests/font.c | 69 ++++++++++++++++++++++++++++++++++++++++++- 5 files changed, 133 insertions(+), 20 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=720c430594a895ce43ffe…

1 0

Nikolay Sivov : dwrite: Release run info as soon as it' s rendered to save some memory.
by Alexandre Julliard 05 Aug '15

05 Aug '15

Module: wine Branch: master Commit: 6597453403d33b7e372ae9a7d611f771f1008a3c URL: http://source.winehq.org/git/wine.git/?a=commit;h=6597453403d33b7e372ae9a7d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Aug 4 11:16:35 2015 +0300 dwrite: Release run info as soon as it's rendered to save some memory. --- dlls/dwrite/font.c | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 707ef6d..aaa0f42 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -2907,7 +2907,8 @@ static ULONG WINAPI glyphrunanalysis_Release(IDWriteGlyphRunAnalysis *iface) TRACE("(%p)->(%u)\n", This, ref); if (!ref) { - IDWriteFontFace_Release(This->run.fontFace); + if (This->run.fontFace) + IDWriteFontFace_Release(This->run.fontFace); heap_free(This->glyphs); heap_free(This->advances); heap_free(This->offsets); @@ -3088,6 +3089,20 @@ static void glyphrunanalysis_render(struct dwrite_glyphrunanalysis *analysis, DW IDWriteFontFace2_Release(fontface2); analysis->ready |= RUNANALYSIS_BITMAP; + + /* we don't need this anymore */ + heap_free(analysis->glyphs); + heap_free(analysis->advances); + heap_free(analysis->offsets); + IDWriteFontFace_Release(analysis->run.fontFace); + + analysis->glyphs = NULL; + analysis->advances = NULL; + analysis->offsets = NULL; + analysis->run.glyphIndices = NULL; + analysis->run.glyphAdvances = NULL; + analysis->run.glyphOffsets = NULL; + analysis->run.fontFace = NULL; } static HRESULT WINAPI glyphrunanalysis_CreateAlphaTexture(IDWriteGlyphRunAnalysis *iface, DWRITE_TEXTURE_TYPE type,

1 0

Hugh McMaster : kernel32: Restore the original console cursor size on Enter press, if the Insert key toggle is active.
by Alexandre Julliard 03 Aug '15

03 Aug '15

Module: wine Branch: master Commit: 0adad1f5730abc1f9c75f7e8fb056f8b47f5abe5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0adad1f5730abc1f9c75f7e8f… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Aug 3 17:55:01 2015 +1000 kernel32: Restore the original console cursor size on Enter press, if the Insert key toggle is active. --- dlls/kernel32/editline.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/kernel32/editline.c b/dlls/kernel32/editline.c index 4dfa2cf..f7e42a4 100644 --- a/dlls/kernel32/editline.c +++ b/dlls/kernel32/editline.c @@ -61,6 +61,7 @@ typedef struct WCEL_Context { WCHAR* yanked; /* yanked line */ unsigned mark; /* marked point (emacs mode only) */ CONSOLE_SCREEN_BUFFER_INFO csbi; /* current state (initial cursor, window size, attribute) */ + CONSOLE_CURSOR_INFO cinfo; /* original cursor state (size, visibility) */ HANDLE hConIn; HANDLE hConOut; unsigned done : 1, /* to 1 when we're done with editing */ @@ -485,6 +486,8 @@ static void WCEL_Done(WCEL_Context* ctx) ctx->line[ctx->len++] = '\n'; ctx->line[ctx->len] = 0; WriteConsoleW(ctx->hConOut, &nl, 1, NULL, NULL); + if (ctx->insertkey) + SetConsoleCursorInfo(ctx->hConOut, &ctx->cinfo); ctx->done = 1; } @@ -930,6 +933,7 @@ WCHAR* CONSOLE_Readline(HANDLE hConsoleIn, BOOL can_pos_cursor) if (!GetConsoleMode(ctx.hConOut, &mode)) mode = 0; ctx.can_wrap = (mode & ENABLE_WRAP_AT_EOL_OUTPUT) ? 1 : 0; ctx.can_pos_cursor = can_pos_cursor; + GetConsoleCursorInfo(ctx.hConOut, &ctx.cinfo); if (!WCEL_Grow(&ctx, 1)) {

1 0

Mark Harmstone : user32: Specify size for default window icon in NC_IconForWindow.
by Alexandre Julliard 03 Aug '15

03 Aug '15

Module: wine Branch: master Commit: 27bffea1486b134b58cc30d69be97f7f496010b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=27bffea1486b134b58cc30d69… Author: Mark Harmstone <hellas(a)burntcomma.com> Date: Sat Aug 1 15:03:13 2015 +0100 user32: Specify size for default window icon in NC_IconForWindow. --- dlls/user32/nonclient.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/user32/nonclient.c b/dlls/user32/nonclient.c index 11b8d08..1267ab6 100644 --- a/dlls/user32/nonclient.c +++ b/dlls/user32/nonclient.c @@ -172,7 +172,8 @@ static HICON NC_IconForWindow( HWND hwnd ) * get the default one. */ if (!hIcon && (GetWindowLongW( hwnd, GWL_STYLE ) & DS_MODALFRAME)) - hIcon = LoadImageW(0, (LPCWSTR)IDI_WINLOGO, IMAGE_ICON, 0, 0, LR_DEFAULTCOLOR); + hIcon = LoadImageW(0, (LPCWSTR)IDI_WINLOGO, IMAGE_ICON, GetSystemMetrics(SM_CXSMICON), + GetSystemMetrics(SM_CYSMICON), LR_DEFAULTCOLOR); return hIcon; }

1 0

Mark Harmstone : shell32: Don't hardcode icon sizes in SIC_LoadIcon.
by Alexandre Julliard 03 Aug '15

03 Aug '15

Module: wine Branch: master Commit: 77b75ca14b960f8b36134f0e6e9ad1786f97f296 URL: http://source.winehq.org/git/wine.git/?a=commit;h=77b75ca14b960f8b36134f0e6… Author: Mark Harmstone <hellas(a)burntcomma.com> Date: Sat Aug 1 15:40:05 2015 +0100 shell32: Don't hardcode icon sizes in SIC_LoadIcon. --- dlls/shell32/iconcache.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/iconcache.c b/dlls/shell32/iconcache.c index b294908..4549d5b 100644 --- a/dlls/shell32/iconcache.c +++ b/dlls/shell32/iconcache.c @@ -310,8 +310,10 @@ static INT SIC_LoadIcon (LPCWSTR sSourceFile, INT dwSourceIndex, DWORD dwFlags) HICON hiconLargeShortcut; HICON hiconSmallShortcut; - PrivateExtractIconsW( sSourceFile, dwSourceIndex, 32, 32, &hiconLarge, 0, 1, 0 ); - PrivateExtractIconsW( sSourceFile, dwSourceIndex, 16, 16, &hiconSmall, 0, 1, 0 ); + PrivateExtractIconsW( sSourceFile, dwSourceIndex, GetSystemMetrics(SM_CXICON), + GetSystemMetrics(SM_CYICON), &hiconLarge, 0, 1, 0 ); + PrivateExtractIconsW( sSourceFile, dwSourceIndex, GetSystemMetrics(SM_CXSMICON), + GetSystemMetrics(SM_CYSMICON), &hiconSmall, 0, 1, 0 ); if ( !hiconLarge || !hiconSmall) {

1 0

Austin English : winedump: Avoid LPVOID when creating stub dll.
by Alexandre Julliard 03 Aug '15

03 Aug '15

Module: wine Branch: master Commit: 62c776a7dd98d72f4018337b1c24edddf8c488dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=62c776a7dd98d72f4018337b1… Author: Austin English <austinenglish(a)gmail.com> Date: Fri Jul 31 12:15:54 2015 -0500 winedump: Avoid LPVOID when creating stub dll. --- tools/winedump/output.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/winedump/output.c b/tools/winedump/output.c index aff7f66..6c2bfae 100644 --- a/tools/winedump/output.c +++ b/tools/winedump/output.c @@ -237,8 +237,8 @@ void output_c_preamble (void) } fprintf (cfile, - "BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID " - "reserved)\n{\n" + "BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, void " + "*reserved)\n{\n" " TRACE(\"(%%p, %%u, %%p)\\n\", instance, reason, reserved);\n\n" " switch (reason)\n" " {\n"

1 0