September 2013 - Wine-commits

Stefan Dösinger : wined3d: Explicitly pass the state information to buffer_internal_preload.
by Alexandre Julliard 12 Sep '13

12 Sep '13

Module: wine Branch: master Commit: b8eb171b6bd4f930aee265af981223fd7a557b52 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b8eb171b6bd4f930aee265af9… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Sep 12 12:23:30 2013 +0200 wined3d: Explicitly pass the state information to buffer_internal_preload. --- dlls/wined3d/buffer.c | 12 +++++++----- dlls/wined3d/context.c | 4 ++-- dlls/wined3d/wined3d_private.h | 4 ++-- 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 84fe45a..2deb7d2 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -728,7 +728,8 @@ static void buffer_direct_upload(struct wined3d_buffer *This, const struct wined } /* Context activation is done by the caller. */ -void buffer_internal_preload(struct wined3d_buffer *buffer, struct wined3d_context *context) +void buffer_internal_preload(struct wined3d_buffer *buffer, struct wined3d_context *context, + const struct wined3d_state *state) { DWORD flags = buffer->flags & (WINED3D_BUFFER_NOSYNC | WINED3D_BUFFER_DISCARD); struct wined3d_device *device = buffer->resource.device; @@ -763,12 +764,13 @@ void buffer_internal_preload(struct wined3d_buffer *buffer, struct wined3d_conte } } - /* Reading the declaration makes only sense if the stateblock is finalized and the buffer bound to a stream */ - if (device->isInDraw && buffer->resource.bind_count > 0) + /* Reading the declaration makes only sense if we have valid state information + * (i.e., if this function is called during draws). */ + if (state) { DWORD fixup_flags = 0; - if (!use_vs(&device->state)) + if (!use_vs(state)) { if (!context->gl_info->supported[ARB_VERTEX_ARRAY_BGRA]) fixup_flags |= WINED3D_BUFFER_FIXUP_D3DCOLOR; @@ -935,7 +937,7 @@ void CDECL wined3d_buffer_preload(struct wined3d_buffer *buffer) { struct wined3d_context *context; context = context_acquire(buffer->resource.device, NULL); - buffer_internal_preload(buffer, context); + buffer_internal_preload(buffer, context, NULL); context_release(context); } diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index f870700..af3addc 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -2498,7 +2498,7 @@ void context_stream_info_from_declaration(struct wined3d_context *context, element = &stream_info->elements[i]; buffer = state->streams[element->stream_idx].buffer; - buffer_internal_preload(buffer, context); + buffer_internal_preload(buffer, context, state); /* If the preload dropped the buffer object, update the stream info. */ if (buffer->buffer_object != element->data.buffer_object) @@ -2583,7 +2583,7 @@ BOOL context_apply_draw_state(struct wined3d_context *context, struct wined3d_de if (state->index_buffer) { if (context->stream_info.all_vbo) - buffer_internal_preload(state->index_buffer, context); + buffer_internal_preload(state->index_buffer, context, state); else buffer_get_sysmem(state->index_buffer, context); } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index a1b7238..a30db57 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2525,8 +2525,8 @@ static inline struct wined3d_buffer *buffer_from_resource(struct wined3d_resourc void buffer_get_memory(struct wined3d_buffer *buffer, struct wined3d_context *context, struct wined3d_bo_address *data) DECLSPEC_HIDDEN; BYTE *buffer_get_sysmem(struct wined3d_buffer *This, struct wined3d_context *context) DECLSPEC_HIDDEN; -void buffer_internal_preload(struct wined3d_buffer *buffer, - struct wined3d_context *context) DECLSPEC_HIDDEN; +void buffer_internal_preload(struct wined3d_buffer *buffer, struct wined3d_context *context, + const struct wined3d_state *state) DECLSPEC_HIDDEN; struct wined3d_rendertarget_view {

1 0

Stefan Dösinger : d3d9/tests: Clean up z_range_test a bit.
by Alexandre Julliard 12 Sep '13

12 Sep '13

Module: wine Branch: master Commit: ed504576941126464b3799f311f63df98224e8eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed504576941126464b3799f31… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Sep 12 12:23:31 2013 +0200 d3d9/tests: Clean up z_range_test a bit. --- dlls/d3d9/tests/visual.c | 232 +++++++++++++++++++++------------------------- 1 files changed, 107 insertions(+), 125 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ed504576941126464b379…

1 0

Stefan Dösinger : d3d9/tests: D3DCMP_GREATER is broken on r500.
by Alexandre Julliard 12 Sep '13

12 Sep '13

Module: wine Branch: master Commit: 53741d2bb92b68379885e280c1b4c7c088478994 URL: http://source.winehq.org/git/wine.git/?a=commit;h=53741d2bb92b68379885e280c… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Sep 12 12:23:32 2013 +0200 d3d9/tests: D3DCMP_GREATER is broken on r500. --- dlls/d3d9/tests/visual.c | 15 +++++++++++---- 1 files changed, 11 insertions(+), 4 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 1deba5f..f047cd7 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -2558,15 +2558,21 @@ static void z_range_test(IDirect3DDevice9 *device) else ok(color_match(color, 0x00ffff00, 0), "Z range failed: Got color 0x%08x, expected 0x00ffff00.\n", color); - /* Not clipped, > z buffer clear value(0.75) */ + /* Not clipped, > z buffer clear value(0.75). + * + * On the r500 driver on Windows D3DCMP_GREATER and D3DCMP_GREATEREQUAL are broken for depth + * values > 0.5. The range appears to be distorted, apparently an incoming value of ~0.875 is + * equal to a stored depth buffer value of 0.5. */ color = getPixelColor(device, 31, 238); ok(color_match(color, 0x00ff0000, 0), "Z range failed: Got color 0x%08x, expected 0x00ff0000.\n", color); color = getPixelColor(device, 31, 241); ok(color_match(color, 0x00ffff00, 0), "Z range failed: Got color 0x%08x, expected 0x00ffff00.\n", color); color = getPixelColor(device, 100, 238); - ok(color_match(color, 0x00ff0000, 0), "Z range failed: Got color 0x%08x, expected 0x00ff0000.\n", color); + ok(color_match(color, 0x00ff0000, 0) || broken(color_match(color, 0x00ffffff, 0)), + "Z range failed: Got color 0x%08x, expected 0x00ff0000.\n", color); color = getPixelColor(device, 100, 241); - ok(color_match(color, 0x00ffff00, 0), "Z range failed: Got color 0x%08x, expected 0x00ffff00.\n", color); + ok(color_match(color, 0x00ffff00, 0) || broken(color_match(color, 0x00ffffff, 0)), + "Z range failed: Got color 0x%08x, expected 0x00ffff00.\n", color); /* Not clipped, < z buffer clear value */ color = getPixelColor(device, 104, 238); @@ -2638,7 +2644,8 @@ static void z_range_test(IDirect3DDevice9 *device) color = getPixelColor(device, 31, 238); ok(color_match(color, 0x00ff0000, 0), "Z range failed: Got color 0x%08x, expected 0x00ff0000.\n", color); color = getPixelColor(device, 100, 238); - ok(color_match(color, 0x00ff0000, 0), "Z range failed: Got color 0x%08x, expected 0x00ff0000.\n", color); + ok(color_match(color, 0x00ff0000, 0) || broken(color_match(color, 0x00ffffff, 0)), + "Z range failed: Got color 0x%08x, expected 0x00ff0000.\n", color); /* 0.75 < z < 0.0 */ color = getPixelColor(device, 104, 238);

1 0

Andrew Eikum : ieframe: Register CLSID_WebBrowser as an ActiveX control.
by Alexandre Julliard 12 Sep '13

12 Sep '13

Module: wine Branch: master Commit: b6570bb88c52f1edeb096a7b85a5ebd1cf1551a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b6570bb88c52f1edeb096a7b8… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Thu Sep 12 10:49:25 2013 -0500 ieframe: Register CLSID_WebBrowser as an ActiveX control. Also cleanup the RGS to not create an unintended '{}' registry entry for InternetShortcut. --- dlls/ieframe/ieframe.rgs | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/dlls/ieframe/ieframe.rgs b/dlls/ieframe/ieframe.rgs index cf8f3b4..f99e6b6 100644 --- a/dlls/ieframe/ieframe.rgs +++ b/dlls/ieframe/ieframe.rgs @@ -34,9 +34,13 @@ HKCR { shellex { - MayChangeDefaultMenu {} + MayChangeDefaultMenu } } + '{8856f961-340a-11d0-a96b-00c04fd705a2}' + { + Control + } } 'InternetShortcut' {

1 0

Andrew Eikum : mshtml: Free advpack after use.
by Alexandre Julliard 12 Sep '13

12 Sep '13

Module: wine Branch: master Commit: 93c01b81882df7c8ff887dcb7786f5235f5b6969 URL: http://source.winehq.org/git/wine.git/?a=commit;h=93c01b81882df7c8ff887dcb7… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Thu Sep 12 10:58:57 2013 -0500 mshtml: Free advpack after use. --- dlls/mshtml/main.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/main.c b/dlls/mshtml/main.c index f81255a..4c7c489 100644 --- a/dlls/mshtml/main.c +++ b/dlls/mshtml/main.c @@ -461,6 +461,8 @@ static HRESULT register_server(BOOL do_register) hres = pRegInstall(hInst, do_register ? "RegisterDll" : "UnregisterDll", &strtable); + FreeLibrary(hAdvpack); + for(i=0; i < sizeof(pse)/sizeof(pse[0]); i++) heap_free(pse[i].pszValue);

1 0

Aric Stewart : gdi32: ABC value signs remain the same despite any changes in layout direction or viewport .
by Alexandre Julliard 12 Sep '13

12 Sep '13

Module: wine Branch: master Commit: 3f4ef58b0fdb771ffacb64812c32aa625892a16f URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f4ef58b0fdb771ffacb64812… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Sep 12 13:01:56 2013 -0500 gdi32: ABC value signs remain the same despite any changes in layout direction or viewport. --- dlls/gdi32/font.c | 19 +++++---- dlls/gdi32/tests/font.c | 95 ++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 104 insertions(+), 10 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 68b2713..7fd5bd3 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -2700,9 +2700,9 @@ BOOL WINAPI GetCharABCWidthsW( HDC hdc, UINT firstChar, UINT lastChar, { /* convert device units to logical */ for( i = firstChar; i <= lastChar; i++, abc++ ) { - abc->abcA = INTERNAL_XDSTOWS(dc, abc->abcA); - abc->abcB = INTERNAL_XDSTOWS(dc, abc->abcB); - abc->abcC = INTERNAL_XDSTOWS(dc, abc->abcC); + abc->abcA = width_to_LP(dc, abc->abcA); + abc->abcB = width_to_LP(dc, abc->abcB); + abc->abcC = width_to_LP(dc, abc->abcC); } } @@ -2752,9 +2752,9 @@ BOOL WINAPI GetCharABCWidthsI( HDC hdc, UINT firstChar, UINT count, { /* convert device units to logical */ for( i = 0; i < count; i++, abc++ ) { - abc->abcA = INTERNAL_XDSTOWS(dc, abc->abcA); - abc->abcB = INTERNAL_XDSTOWS(dc, abc->abcB); - abc->abcC = INTERNAL_XDSTOWS(dc, abc->abcC); + abc->abcA = width_to_LP(dc, abc->abcA); + abc->abcB = width_to_LP(dc, abc->abcB); + abc->abcC = width_to_LP(dc, abc->abcC); } } @@ -3352,11 +3352,12 @@ BOOL WINAPI GetCharABCWidthsFloatW( HDC hdc, UINT first, UINT last, LPABCFLOAT a if (ret) { /* convert device units to logical */ + FLOAT scale = fabs( dc->xformVport2World.eM11 ); for (i = first; i <= last; i++, abcf++) { - abcf->abcfA = abc[i - first].abcA * dc->xformVport2World.eM11; - abcf->abcfB = abc[i - first].abcB * dc->xformVport2World.eM11; - abcf->abcfC = abc[i - first].abcC * dc->xformVport2World.eM11; + abcf->abcfA = abc[i - first].abcA * scale; + abcf->abcfB = abc[i - first].abcB * scale; + abcf->abcfC = abc[i - first].abcC * scale; } } HeapFree( GetProcessHeap(), 0, abc ); diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 11299f3..99c5eef 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -1113,17 +1113,50 @@ static int CALLBACK create_font_proc(const LOGFONT *lpelfe, return 1; } +static void ABCWidths_helper(const char* description, HDC hdc, WORD *glyphs, ABC *base_abci, ABC *base_abcw, ABCFLOAT *base_abcf, INT todo) +{ + ABC abc[1]; + ABCFLOAT abcf[1]; + BOOL ret = FALSE; + + ret = pGetCharABCWidthsI(hdc, 0, 1, glyphs, abc); + ok(ret, "%s: GetCharABCWidthsI should have succeeded\n", description); + ok ((INT)abc->abcB > 0, "%s: abcB should be positive\n", description); + if (todo) todo_wine ok(abc->abcA * base_abci->abcA >= 0, "%s: abcA's sign should be unchanged\n", description); + else ok(abc->abcA * base_abci->abcA >= 0, "%s: abcA's sign should be unchanged\n", description); + if (todo) todo_wine ok(abc->abcC * base_abci->abcC >= 0, "%s: abcC's sign should be unchanged\n", description); + else ok(abc->abcC * base_abci->abcC >= 0, "%s: abcC's sign should be unchanged\n", description); + + ret = pGetCharABCWidthsW(hdc, 'i', 'i', abc); + ok(ret, "%s: GetCharABCWidthsW should have succeeded\n", description); + ok ((INT)abc->abcB > 0, "%s: abcB should be positive\n", description); + if (todo) todo_wine ok(abc->abcA * base_abcw->abcA >= 0, "%s: abcA's sign should be unchanged\n", description); + else ok(abc->abcA * base_abcw->abcA >= 0, "%s: abcA's sign should be unchanged\n", description); + if (todo) todo_wine ok(abc->abcC * base_abcw->abcC >= 0, "%s: abcC's sign should be unchanged\n", description); + else ok(abc->abcC * base_abcw->abcC >= 0, "%s: abcC's should be unchanged\n", description); + + ret = pGetCharABCWidthsFloatW(hdc, 'i', 'i', abcf); + ok(ret, "%s: GetCharABCWidthsFloatW should have succeeded\n", description); + ok (abcf->abcfB > 0.0, "%s: abcfB should be positive\n", description); + if (todo) todo_wine ok(abcf->abcfA * base_abcf->abcfA >= 0.0, "%s: abcfA's sign should be unchanged\n", description); + else ok(abcf->abcfA * base_abcf->abcfA >= 0.0, "%s: abcfA's should be unchanged\n", description); + if (todo) todo_wine ok(abcf->abcfC * base_abcf->abcfC >= 0.0, "%s: abcfC's sign should be unchanged\n", description); + else ok(abcf->abcfC * base_abcf->abcfC >= 0.0, "%s: abcfC's sign should be unchanged\n", description); +} + static void test_GetCharABCWidths(void) { - static const WCHAR str[] = {'a',0}; + static const WCHAR str[] = {'i',0}; BOOL ret; HDC hdc; LOGFONTA lf; HFONT hfont; ABC abc[1]; + ABC abcw[1]; ABCFLOAT abcf[1]; WORD glyphs[1]; DWORD nb; + HWND hwnd; static const struct { UINT first; @@ -1266,6 +1299,66 @@ static void test_GetCharABCWidths(void) } ReleaseDC(NULL, hdc); + + memset(&lf, 0, sizeof(lf)); + strcpy(lf.lfFaceName, "Tahoma"); + lf.lfHeight = 20; + + trace("ABC sign test for a varity of transforms:\n"); + hfont = CreateFontIndirectA(&lf); + hwnd = CreateWindowEx(0, "static", "", WS_POPUP, 0,0,100,100, + 0, 0, 0, NULL); + hdc = GetDC(hwnd); + SetMapMode(hdc, MM_ANISOTROPIC); + SelectObject(hdc, hfont); + + nb = pGetGlyphIndicesW(hdc, str, 1, glyphs, 0); + ok(nb == 1, "GetGlyphIndicesW should have returned 1\n"); + + ret = pGetCharABCWidthsI(hdc, 0, 1, glyphs, abc); + ok(ret, "GetCharABCWidthsI should have succeeded\n"); + ret = pGetCharABCWidthsW(hdc, 'i', 'i', abcw); + ok(ret, "GetCharABCWidthsI should have succeeded\n"); + ret = pGetCharABCWidthsFloatW(hdc, 'i', 'i', abcf); + ok(ret, "GetCharABCWidthsFloatW should have succeeded\n"); + + ABCWidths_helper("LTR", hdc, glyphs, abc, abcw, abcf, 0); + SetWindowExtEx(hdc, -1, -1, NULL); + SetGraphicsMode(hdc, GM_COMPATIBLE); + ABCWidths_helper("LTR -1 compatible", hdc, glyphs, abc, abcw, abcf, 0); + SetGraphicsMode(hdc, GM_ADVANCED); + ABCWidths_helper("LTR -1 advanced", hdc, glyphs, abc, abcw, abcf, 1); + SetWindowExtEx(hdc, 1, 1, NULL); + SetGraphicsMode(hdc, GM_COMPATIBLE); + ABCWidths_helper("LTR 1 compatible", hdc, glyphs, abc, abcw, abcf, 0); + SetGraphicsMode(hdc, GM_ADVANCED); + ABCWidths_helper("LTR 1 advanced", hdc, glyphs, abc, abcw, abcf, 0); + + ReleaseDC(hwnd, hdc); + DestroyWindow(hwnd); + + trace("RTL layout\n"); + hwnd = CreateWindowEx(WS_EX_LAYOUTRTL, "static", "", WS_POPUP, 0,0,100,100, + 0, 0, 0, NULL); + hdc = GetDC(hwnd); + SetMapMode(hdc, MM_ANISOTROPIC); + SelectObject(hdc, hfont); + + ABCWidths_helper("RTL", hdc, glyphs, abc, abcw, abcf, 0); + SetWindowExtEx(hdc, -1, -1, NULL); + SetGraphicsMode(hdc, GM_COMPATIBLE); + ABCWidths_helper("RTL -1 compatible", hdc, glyphs, abc, abcw, abcf, 0); + SetGraphicsMode(hdc, GM_ADVANCED); + ABCWidths_helper("RTL -1 advanced", hdc, glyphs, abc, abcw, abcf, 0); + SetWindowExtEx(hdc, 1, 1, NULL); + SetGraphicsMode(hdc, GM_COMPATIBLE); + ABCWidths_helper("RTL 1 compatible", hdc, glyphs, abc, abcw, abcf, 0); + SetGraphicsMode(hdc, GM_ADVANCED); + ABCWidths_helper("RTL 1 advanced", hdc, glyphs, abc, abcw, abcf, 1); + + ReleaseDC(hwnd, hdc); + DestroyWindow(hwnd); + DeleteObject(hfont); } static void test_text_extents(void)

1 0

Henri Verbeet : wined3d: Make primary_render_target_is_p8() work on a swapchain.
by Alexandre Julliard 12 Sep '13

12 Sep '13

Module: wine Branch: master Commit: 1b53cbd8de7f9d74c73f17db80ae75fdc6b9d3fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b53cbd8de7f9d74c73f17db8… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Sep 12 09:20:51 2013 +0200 wined3d: Make primary_render_target_is_p8() work on a swapchain. --- dlls/wined3d/surface.c | 22 ++++++++-------------- dlls/wined3d/wined3d_private.h | 5 +++++ 2 files changed, 13 insertions(+), 14 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index f1a3683..b64c8e9 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1289,12 +1289,6 @@ static BOOL fbo_blit_supported(const struct wined3d_gl_info *gl_info, enum wined return TRUE; } -/* This function checks if the primary render target uses the 8bit paletted format. */ -static BOOL primary_render_target_is_p8(const struct wined3d_device *device) -{ - return device->swapchains[0]->desc.backbuffer_format == WINED3DFMT_P8_UINT; -} - static BOOL surface_convert_color_to_float(const struct wined3d_surface *surface, DWORD color, struct wined3d_color *float_color) { @@ -1316,7 +1310,7 @@ static BOOL surface_convert_color_to_float(const struct wined3d_surface *surface float_color->g = 0.0f; float_color->b = 0.0f; } - float_color->a = primary_render_target_is_p8(device) ? color / 255.0f : 1.0f; + float_color->a = swapchain_is_p8(device->swapchains[0]) ? color / 255.0f : 1.0f; break; case WINED3DFMT_B5G6R5_UNORM: @@ -1780,7 +1774,7 @@ static void surface_download_data(struct wined3d_surface *surface, const struct int dst_pitch = 0; /* In case of P8 the index is stored in the alpha component if the primary render target uses P8. */ - if (format->id == WINED3DFMT_P8_UINT && primary_render_target_is_p8(surface->resource.device)) + if (format->id == WINED3DFMT_P8_UINT && swapchain_is_p8(surface->resource.device->swapchains[0])) { gl_format = GL_ALPHA; gl_type = GL_UNSIGNED_BYTE; @@ -3806,7 +3800,7 @@ static void read_from_framebuffer(struct wined3d_surface *surface, const RECT *r { case WINED3DFMT_P8_UINT: { - if (primary_render_target_is_p8(device)) + if (swapchain_is_p8(context->swapchain)) { /* In case of P8 render targets the index is stored in the alpha component */ fmt = GL_ALPHA; @@ -3942,14 +3936,12 @@ static void read_from_framebuffer(struct wined3d_surface *surface, const RECT *r } } - context_release(context); - /* For P8 textures we need to perform an inverse palette lookup. This is * done by searching for a palette index which matches the RGB value. * Note this isn't guaranteed to work when there are multiple entries for * the same color but we have no choice. In case of P8 render targets, * the index is stored in the alpha component so no conversion is needed. */ - if (surface->resource.format->id == WINED3DFMT_P8_UINT && !primary_render_target_is_p8(device)) + if (surface->resource.format->id == WINED3DFMT_P8_UINT && !swapchain_is_p8(context->swapchain)) { const PALETTEENTRY *pal = NULL; DWORD width = pitch / 3; @@ -3986,6 +3978,8 @@ static void read_from_framebuffer(struct wined3d_surface *surface, const RECT *r } HeapFree(GetProcessHeap(), 0, mem); } + + context_release(context); } /* Read the framebuffer contents into a texture. Note that this function @@ -4108,7 +4102,7 @@ void d3dfmt_p8_init_palette(const struct wined3d_surface *surface, BYTE table[25 * is slow. Further RGB->P8 conversion is not possible because palettes can have * duplicate entries. Store the color key in the unused alpha component to speed the * download up and to make conversion unneeded. */ - index_in_alpha = primary_render_target_is_p8(device); + index_in_alpha = swapchain_is_p8(device->swapchains[0]); if (!pal) { @@ -4838,7 +4832,7 @@ static void surface_blt_to_drawable(const struct wined3d_device *device, * contains the palette index. Which means that the colorkey is one of * the palette entries. In other cases pixels that should be masked * away have alpha set to 0. */ - if (primary_render_target_is_p8(device)) + if (swapchain_is_p8(context->swapchain)) gl_info->gl_ops.gl.p_glAlphaFunc(GL_NOTEQUAL, (float)src_surface->src_blt_color_key.color_space_low_value / 256.0f); else diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 3548094..44d6e38 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2569,6 +2569,11 @@ struct wined3d_swapchain HWND backup_wnd; }; +static inline BOOL swapchain_is_p8(const struct wined3d_swapchain *swapchain) +{ + return swapchain->desc.backbuffer_format == WINED3DFMT_P8_UINT; +} + void x11_copy_to_screen(const struct wined3d_swapchain *swapchain, const RECT *rect) DECLSPEC_HIDDEN; struct wined3d_context *swapchain_get_context(struct wined3d_swapchain *swapchain) DECLSPEC_HIDDEN;

1 0

Henri Verbeet : wined3d: Allow the first render target to be set to NULL.
by Alexandre Julliard 12 Sep '13

12 Sep '13

Module: wine Branch: master Commit: 1a78667862139fea1491453deddf285b52f85870 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a78667862139fea1491453de… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Sep 12 09:20:52 2013 +0200 wined3d: Allow the first render target to be set to NULL. Note that it still isn't necessarily safe to render in this case, because there are places where we assume the first render target is always non-NULL in order to determine e.g. framebuffer dimensions. It's now the responsibility of the caller to ensure that doesn't happen. --- dlls/d3d9/device.c | 6 ++++++ dlls/ddraw/device.c | 11 ++++++++--- dlls/wined3d/device.c | 10 ++-------- 3 files changed, 16 insertions(+), 11 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 17664b1..a70832d 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -1226,6 +1226,12 @@ static HRESULT WINAPI d3d9_device_SetRenderTarget(IDirect3DDevice9Ex *iface, DWO return D3DERR_INVALIDCALL; } + if (!idx && !surface_impl) + { + WARN("Trying to set render target 0 to NULL.\n"); + return D3DERR_INVALIDCALL; + } + wined3d_mutex_lock(); hr = wined3d_device_set_render_target(device->wined3d_device, idx, surface_impl ? surface_impl->wined3d_surface : NULL, TRUE); diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 15145c0..2c02d65 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -1827,10 +1827,15 @@ static HRESULT d3d_device_set_render_target(struct d3d_device *device, struct dd wined3d_mutex_unlock(); return D3D_OK; } + if (!target) + { + WARN("Trying to set render target to NULL.\n"); + wined3d_mutex_unlock(); + return DDERR_INVALIDPARAMS; + } device->target = target; - hr = wined3d_device_set_render_target(device->wined3d_device, 0, - target ? target->wined3d_surface : NULL, FALSE); - if(hr != D3D_OK) + if (FAILED(hr = wined3d_device_set_render_target(device->wined3d_device, + 0, target->wined3d_surface, FALSE))) { wined3d_mutex_unlock(); return hr; diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 1b0137f..ef0ba9e 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1350,7 +1350,8 @@ HRESULT CDECL wined3d_device_uninit_3d(struct wined3d_device *device) TRACE("Setting rendertarget 0 to NULL\n"); device->fb.render_targets[0] = NULL; TRACE("Releasing the render target at %p\n", surface); - wined3d_surface_decref(surface); + if (surface) + wined3d_surface_decref(surface); context_release(context); @@ -4482,13 +4483,6 @@ HRESULT CDECL wined3d_device_set_render_target(struct wined3d_device *device, return WINED3DERR_INVALIDCALL; } - /* Render target 0 can't be set to NULL. */ - if (!render_target && !render_target_idx) - { - WARN("Trying to set render target 0 to NULL.\n"); - return WINED3DERR_INVALIDCALL; - } - if (render_target && !(render_target->resource.usage & WINED3DUSAGE_RENDERTARGET)) { FIXME("Surface %p doesn't have render target usage.\n", render_target);

1 0

Henri Verbeet : ddraw: Just set the render target to NULL in d3d_device_inner_Release().
by Alexandre Julliard 12 Sep '13

12 Sep '13

Module: wine Branch: master Commit: 3c6d11706fd5d71c1781f75f19ddab5e9f91d7cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c6d11706fd5d71c1781f75f1… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Sep 12 09:20:53 2013 +0200 ddraw: Just set the render target to NULL in d3d_device_inner_Release(). The wined3d front buffer is not a render target. --- dlls/ddraw/device.c | 5 +---- 1 files changed, 1 insertions(+), 4 deletions(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 2c02d65..c0332d9 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -245,10 +245,7 @@ static ULONG WINAPI d3d_device_inner_Release(IUnknown *iface) if (This->vertex_buffer) wined3d_buffer_decref(This->vertex_buffer); - /* Set the device up to render to the front buffer since the back - * buffer will vanish soon. */ - wined3d_device_set_render_target(This->wined3d_device, 0, - This->ddraw->wined3d_frontbuffer, TRUE); + wined3d_device_set_render_target(This->wined3d_device, 0, NULL, FALSE); /* Release the wined3d device. This won't destroy it. */ if (!wined3d_device_decref(This->wined3d_device))

1 0

Henri Verbeet : ddrawex: Avoid LPVOID.
by Alexandre Julliard 12 Sep '13

12 Sep '13

Module: wine Branch: master Commit: 545f83bc8f693c227347d14cfdf51dc98fd04681 URL: http://source.winehq.org/git/wine.git/?a=commit;h=545f83bc8f693c227347d14cf… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Sep 12 09:20:54 2013 +0200 ddrawex: Avoid LPVOID. --- dlls/ddrawex/ddrawex_private.h | 2 +- dlls/ddrawex/main.c | 23 +++++++++-------------- dlls/ddrawex/tests/ddrawex.c | 2 +- dlls/ddrawex/tests/ddrawex.h | 2 +- dlls/ddrawex/tests/surface.c | 2 +- 5 files changed, 13 insertions(+), 18 deletions(-) diff --git a/dlls/ddrawex/ddrawex_private.h b/dlls/ddrawex/ddrawex_private.h index 9fbb37f..be602b5 100644 --- a/dlls/ddrawex/ddrawex_private.h +++ b/dlls/ddrawex/ddrawex_private.h @@ -30,7 +30,7 @@ DECLARE_INTERFACE_(IDirectDrawFactory, IUnknown) STDMETHOD_(ULONG, Release)(THIS) PURE; STDMETHOD(CreateDirectDraw)(THIS_ GUID * pGUID, HWND hWnd, DWORD dwCoopLevelFlags, DWORD dwReserved, IUnknown *pUnkOuter, IDirectDraw **ppDirectDraw) PURE; - STDMETHOD(_DirectDrawEnumerate)(THIS_ LPDDENUMCALLBACKW lpCallback, LPVOID lpContext) PURE; + STDMETHOD(_DirectDrawEnumerate)(THIS_ LPDDENUMCALLBACKW cb, void *ctx) PURE; }; #undef INTERFACE diff --git a/dlls/ddrawex/main.c b/dlls/ddrawex/main.c index d1c0fda..be989ef 100644 --- a/dlls/ddrawex/main.c +++ b/dlls/ddrawex/main.c @@ -43,7 +43,7 @@ typedef struct { IClassFactory IClassFactory_iface; LONG ref; - HRESULT (*pfnCreateInstance)(IUnknown *pUnkOuter, REFIID iid, LPVOID *ppObj); + HRESULT (*pfnCreateInstance)(IUnknown *outer, REFIID iid, void **out); } IClassFactoryImpl; static inline IClassFactoryImpl *impl_from_IClassFactory(IClassFactory *iface) @@ -215,13 +215,8 @@ static ULONG WINAPI IDirectDrawFactoryImpl_Release(IDirectDrawFactory *iface) return ref; } -/******************************************************************************* - * IDirectDrawFactoryImpl_DirectDrawEnumerate - *******************************************************************************/ -static HRESULT WINAPI -IDirectDrawFactoryImpl_DirectDrawEnumerate(IDirectDrawFactory* iface, - LPDDENUMCALLBACKW lpCallback, - LPVOID lpContext) +static HRESULT WINAPI IDirectDrawFactoryImpl_DirectDrawEnumerate(IDirectDrawFactory *iface, + LPDDENUMCALLBACKW cb, void *ctx) { FIXME("Stub!\n"); return E_FAIL; @@ -286,11 +281,11 @@ HRESULT WINAPI DllCanUnloadNow(void) /******************************************************************************* * DllGetClassObject [DDRAWEX.@] */ -HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) +HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, void **out) { IClassFactoryImpl *factory; - TRACE("ddrawex (%s,%s,%p)\n", debugstr_guid(rclsid), debugstr_guid(riid), ppv); + TRACE("rclsid %s, riid %s, out %p.\n", debugstr_guid(rclsid), debugstr_guid(riid), out); if (!IsEqualGUID( &IID_IClassFactory, riid) && !IsEqualGUID( &IID_IUnknown, riid)) @@ -310,7 +305,7 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) factory->pfnCreateInstance = CreateDirectDrawFactory; - *ppv = factory; + *out = factory; return S_OK; } @@ -319,13 +314,13 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) /*********************************************************************** * DllMain */ -BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD reason, LPVOID lpv) +BOOL WINAPI DllMain(HINSTANCE inst, DWORD reason, void *reserved) { switch (reason) { case DLL_PROCESS_ATTACH: - instance = hInstDLL; - DisableThreadLibraryCalls( hInstDLL ); + instance = inst; + DisableThreadLibraryCalls( inst ); break; } return TRUE; diff --git a/dlls/ddrawex/tests/ddrawex.c b/dlls/ddrawex/tests/ddrawex.c index 7a6440b..c07e694 100644 --- a/dlls/ddrawex/tests/ddrawex.c +++ b/dlls/ddrawex/tests/ddrawex.c @@ -25,7 +25,7 @@ #include "unknwn.h" static IDirectDrawFactory *factory; -static HRESULT (WINAPI *pDllGetClassObject)(REFCLSID rclsid, REFIID riid, LPVOID *ppv); +static HRESULT (WINAPI *pDllGetClassObject)(REFCLSID rclsid, REFIID riid, void **out); static IDirectDraw *createDD(void) { diff --git a/dlls/ddrawex/tests/ddrawex.h b/dlls/ddrawex/tests/ddrawex.h index f57adcf..15dd812 100644 --- a/dlls/ddrawex/tests/ddrawex.h +++ b/dlls/ddrawex/tests/ddrawex.h @@ -30,7 +30,7 @@ DECLARE_INTERFACE_(IDirectDrawFactory, IUnknown) STDMETHOD_(ULONG, Release)(THIS) PURE; STDMETHOD(CreateDirectDraw)(THIS_ GUID * pGUID, HWND hWnd, DWORD dwCoopLevelFlags, DWORD dwReserved, IUnknown *pUnkOuter, IDirectDraw **ppDirectDraw) PURE; - STDMETHOD(_DirectDrawEnumerate)(THIS_ LPDDENUMCALLBACKW lpCallback, LPVOID lpContext) PURE; + STDMETHOD(_DirectDrawEnumerate)(THIS_ LPDDENUMCALLBACKW cb, void *ctx) PURE; }; #undef INTERFACE diff --git a/dlls/ddrawex/tests/surface.c b/dlls/ddrawex/tests/surface.c index ecf0084..d81bc4e 100644 --- a/dlls/ddrawex/tests/surface.c +++ b/dlls/ddrawex/tests/surface.c @@ -27,7 +27,7 @@ #include "unknwn.h" static IDirectDrawFactory *factory; -static HRESULT (WINAPI *pDllGetClassObject)(REFCLSID rclsid, REFIID riid, LPVOID *ppv); +static HRESULT (WINAPI *pDllGetClassObject)(REFCLSID rclsid, REFIID riid, void **out); static IDirectDraw *createDD(void) {

1 0