wine-commits March 2017

wine-commits@winehq.org

2 participants
717 discussions

Zebediah Figura : user32: Don't call ReleaseCapture() in EnableWindow().
by Alexandre Julliard 29 Mar '17

29 Mar '17

Module: wine Branch: master Commit: b4fea4f2f0df40976f50d396e9e4046929697879 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b4fea4f2f0df40976f50d396e… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Mar 27 14:01:40 2017 -0500 user32: Don't call ReleaseCapture() in EnableWindow(). Killing the capture is already handled in DefWindowProc(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/win.c | 26 ++++++++++++++++++++++++++ dlls/user32/win.c | 6 ------ 2 files changed, 26 insertions(+), 6 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index f0ea182..fef9cb0 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -6561,8 +6561,16 @@ static DWORD CALLBACK enablewindow_thread(LPVOID arg) return 0; } +static LRESULT CALLBACK enable_window_procA(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) +{ + if (msg == WM_CANCELMODE) + return 0; + return DefWindowProcA(hwnd, msg, wParam, lParam); +} + static void test_EnableWindow(void) { + WNDCLASSA cls; HWND hwnd; HANDLE hthread; DWORD tid; @@ -6604,6 +6612,24 @@ static void test_EnableWindow(void) CloseHandle(hthread); DestroyWindow(hwnd); + + /* test preventing release of capture */ + memset(&cls, 0, sizeof(cls)); + cls.lpfnWndProc = enable_window_procA; + cls.hInstance = GetModuleHandleA(0); + cls.lpszClassName = "EnableWindowClass"; + ok(RegisterClassA(&cls), "RegisterClass failed\n"); + + hwnd = CreateWindowExA(0, "EnableWindowClass", NULL, WS_OVERLAPPEDWINDOW, + 0, 0, 100, 100, 0, 0, 0, NULL); + assert(hwnd); + SetFocus(hwnd); + SetCapture(hwnd); + + EnableWindow(hwnd, FALSE); + check_wnd_state(hwnd, hwnd, 0, hwnd); + + DestroyWindow(hwnd); } static DWORD CALLBACK gettext_msg_thread( LPVOID arg ) diff --git a/dlls/user32/win.c b/dlls/user32/win.c index f3b4ef5..38604b4 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -2161,8 +2161,6 @@ BOOL WINAPI EnableWindow( HWND hwnd, BOOL enable ) } else if (!enable && !retvalue) { - HWND capture_wnd; - SendMessageW( hwnd, WM_CANCELMODE, 0, 0); WIN_SetStyle( hwnd, WS_DISABLED, 0 ); @@ -2170,10 +2168,6 @@ BOOL WINAPI EnableWindow( HWND hwnd, BOOL enable ) if (hwnd == GetFocus()) SetFocus( 0 ); /* A disabled window can't have the focus */ - capture_wnd = GetCapture(); - if (capture_wnd && (hwnd == capture_wnd || IsChild(hwnd, capture_wnd))) - ReleaseCapture(); /* A disabled window can't capture the mouse */ - SendMessageW( hwnd, WM_ENABLE, FALSE, 0 ); } return retvalue;

1 0

Zebediah Figura : user32/tests: Add tests for EnableWindow().
by Alexandre Julliard 29 Mar '17

29 Mar '17

Module: wine Branch: master Commit: 3d133beccec552291303ac6d052dcc5289bd6316 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d133beccec552291303ac6d0… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Mar 27 14:01:39 2017 -0500 user32/tests: Add tests for EnableWindow(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/win.c | 53 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 53 insertions(+) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 915012c..f0ea182 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -6554,6 +6554,58 @@ static void test_ShowWindow(void) ok(!IsWindow(hwnd), "window should not exist\n"); } +static DWORD CALLBACK enablewindow_thread(LPVOID arg) +{ + HWND hwnd = arg; + EnableWindow(hwnd, FALSE); + return 0; +} + +static void test_EnableWindow(void) +{ + HWND hwnd; + HANDLE hthread; + DWORD tid; + MSG msg; + + hwnd = CreateWindowExA(0, "MainWindowClass", NULL, WS_OVERLAPPEDWINDOW, + 0, 0, 100, 100, 0, 0, 0, NULL); + assert(hwnd); + ok(IsWindowEnabled(hwnd), "window should be enabled\n"); + SetFocus(hwnd); + SetCapture(hwnd); + + EnableWindow(hwnd, FALSE); + check_wnd_state(hwnd, hwnd, 0, 0); + ok(!IsWindowEnabled(hwnd), "window should not be enabled\n"); + + SetFocus(hwnd); + SetCapture(hwnd); + check_wnd_state(hwnd, hwnd, 0, hwnd); + + EnableWindow(hwnd, TRUE); + SetFocus(hwnd); + check_wnd_state(hwnd, hwnd, hwnd, hwnd); + ok(IsWindowEnabled(hwnd), "window should be enabled\n"); + + /* test disabling from thread */ + hthread = CreateThread(NULL, 0, enablewindow_thread, hwnd, 0, &tid); + + while (MsgWaitForMultipleObjects(1, &hthread, FALSE, INFINITE, QS_SENDMESSAGE) != WAIT_OBJECT_0) + { + while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE | PM_QS_SENDMESSAGE)) + DispatchMessageA(&msg); + } + + ok(!IsWindowEnabled(hwnd), "window should not be enabled\n"); + todo_wine + check_active_state(hwnd, hwnd, hwnd); + ok(0 == GetCapture(), "GetCapture() = %p\n", GetCapture()); + + CloseHandle(hthread); + DestroyWindow(hwnd); +} + static DWORD CALLBACK gettext_msg_thread( LPVOID arg ) { HWND hwnd = arg; @@ -9778,6 +9830,7 @@ START_TEST(win) test_SetWindowLong(); test_set_window_style(); test_ShowWindow(); + test_EnableWindow(); test_gettext(); test_GetUpdateRect(); test_Expose();

1 0

Hugh McMaster : regedit: Do not select/ highlight a listview item on refresh.
by Alexandre Julliard 29 Mar '17

29 Mar '17

Module: wine Branch: master Commit: 5aaa77c9bb70e2669e1f1b8282bec7c62b16326e URL: http://source.winehq.org/git/wine.git/?a=commit;h=5aaa77c9bb70e2669e1f1b828… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Wed Mar 29 05:25:56 2017 +0000 regedit: Do not select/highlight a listview item on refresh. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/listview.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/regedit/listview.c b/programs/regedit/listview.c index b9366e5..fc234d4 100644 --- a/programs/regedit/listview.c +++ b/programs/regedit/listview.c @@ -138,7 +138,7 @@ static void AddEntryToList(HWND hwndLV, LPWSTR Name, DWORD dwValType, item.pszText = Name ? Name : LPSTR_TEXTCALLBACKW; item.cchTextMax = Name ? lstrlenW(item.pszText) : 0; if (bHighlight) { - item.stateMask = item.state = LVIS_FOCUSED | LVIS_SELECTED; + item.stateMask = item.state = LVIS_FOCUSED; } switch (dwValType) {

1 0

Hugh McMaster : regedit: Do not use REG_NONE as the default data type on import error.
by Alexandre Julliard 29 Mar '17

29 Mar '17

Module: wine Branch: master Commit: 6d89696121f738edba59246c02c40b86aa405c33 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d89696121f738edba59246c0… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Wed Mar 29 05:25:43 2017 +0000 regedit: Do not use REG_NONE as the default data type on import error. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/regproc.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c index a54a96f..751a3a5 100644 --- a/programs/regedit/regproc.c +++ b/programs/regedit/regproc.c @@ -193,6 +193,8 @@ static BYTE* convertHexCSVToHex(WCHAR *str, DWORD *size) return data; } +#define REG_UNKNOWN_TYPE 99 + /****************************************************************************** * This function returns the HKEY associated with the data type encoded in the * value. It modifies the input parameter (key value) in order to skip this @@ -242,8 +244,8 @@ static DWORD getDataType(LPWSTR *lpValue, DWORD* parse_type) } return type; } - *parse_type=REG_NONE; - return REG_NONE; + *parse_type = REG_UNKNOWN_TYPE; + return REG_UNKNOWN_TYPE; } /****************************************************************************** @@ -343,6 +345,7 @@ static const WCHAR type_dword[] = {'R','E','G','_','D','W','O','R','D',0}; static const WCHAR type_dword_le[] = {'R','E','G','_','D','W','O','R','D','_','L','I','T','T','L','E','_','E','N','D','I','A','N',0}; static const WCHAR type_dword_be[] = {'R','E','G','_','D','W','O','R','D','_','B','I','G','_','E','N','D','I','A','N',0}; static const WCHAR type_multi_sz[] = {'R','E','G','_','M','U','L','T','I','_','S','Z',0}; +static const WCHAR unknown_type[] = {'U','n','k','n','o','w','n',' ','T','y','p','e',0}; static const struct { @@ -359,6 +362,7 @@ type_rels[] = {REG_DWORD_LITTLE_ENDIAN, type_dword_le}, {REG_DWORD_BIG_ENDIAN, type_dword_be}, {REG_MULTI_SZ, type_multi_sz}, + {REG_UNKNOWN_TYPE, unknown_type} }; static const WCHAR *reg_type_to_wchar(DWORD type)

1 0

Hugh McMaster : regedit: Remove data types that cannot be imported and clean-up data_types array.
by Alexandre Julliard 29 Mar '17

29 Mar '17

Module: wine Branch: master Commit: 523a61da855d0aff094553f65e263467dcab92f2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=523a61da855d0aff094553f65… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Wed Mar 29 05:25:31 2017 +0000 regedit: Remove data types that cannot be imported and clean-up data_types array. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/regproc.c | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c index 066fb2d..a54a96f 100644 --- a/programs/regedit/regproc.c +++ b/programs/regedit/regproc.c @@ -205,21 +205,18 @@ static DWORD getDataType(LPWSTR *lpValue, DWORD* parse_type) struct data_type { const WCHAR *tag; int len; int type; int parse_type; }; static const WCHAR quote[] = {'"'}; - static const WCHAR str[] = {'s','t','r',':','"'}; - static const WCHAR str2[] = {'s','t','r','(','2',')',':','"'}; static const WCHAR hex[] = {'h','e','x',':'}; static const WCHAR dword[] = {'d','w','o','r','d',':'}; static const WCHAR hexp[] = {'h','e','x','('}; - static const struct data_type data_types[] = { /* actual type */ /* type to assume for parsing */ - { quote, 1, REG_SZ, REG_SZ }, - { str, 5, REG_SZ, REG_SZ }, - { str2, 8, REG_EXPAND_SZ, REG_SZ }, - { hex, 4, REG_BINARY, REG_BINARY }, - { dword, 6, REG_DWORD, REG_DWORD }, - { hexp, 4, -1, REG_BINARY }, - { NULL, 0, 0, 0 } - }; + static const struct data_type data_types[] = { + /* tag len type parse type */ + { quote, 1, REG_SZ, REG_SZ }, + { hex, 4, REG_BINARY, REG_BINARY }, + { dword, 6, REG_DWORD, REG_DWORD }, + { hexp, 4, -1, REG_BINARY }, /* REG_NONE, REG_EXPAND_SZ, REG_MULTI_SZ */ + { NULL, 0, 0, 0 } + }; const struct data_type *ptr; int type;

1 0

Henri Verbeet : wined3d: Validate the rectangle in wined3d_device_clear_rendertarget_view().
by Alexandre Julliard 29 Mar '17

29 Mar '17

Module: wine Branch: master Commit: 01cea136d6405765fee21dbc2932b7bca5353294 URL: http://source.winehq.org/git/wine.git/?a=commit;h=01cea136d6405765fee21dbc2… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 28 23:37:39 2017 +0200 wined3d: Validate the rectangle in wined3d_device_clear_rendertarget_view(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 627a4a7..1e4011c 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4173,6 +4173,16 @@ HRESULT CDECL wined3d_device_clear_rendertarget_view(struct wined3d_device *devi SetRect(&r, 0, 0, view->width, view->height); rect = &r; } + else + { + struct wined3d_box b = {rect->left, rect->top, rect->right, rect->bottom, 0, 1}; + struct wined3d_texture *texture = texture_from_resource(view->resource); + HRESULT hr; + + if (FAILED(hr = wined3d_texture_check_box_dimensions(texture, + view->sub_resource_idx % texture->level_count, &b))) + return hr; + } if (flags & WINED3DCLEAR_TARGET) blit_op = WINED3D_BLIT_OP_COLOR_FILL;

1 0

Henri Verbeet : wined3d: Introduce a separate function for doing colour fills in the CPU blitter.
by Alexandre Julliard 29 Mar '17

29 Mar '17

Module: wine Branch: master Commit: 4bb1565a54507d58a40d1667539deee4c6fd9cce URL: http://source.winehq.org/git/wine.git/?a=commit;h=4bb1565a54507d58a40d16675… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 28 23:37:38 2017 +0200 wined3d: Introduce a separate function for doing colour fills in the CPU blitter. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 159 ++++++++++++++++++++++++++----------------------- 1 file changed, 84 insertions(+), 75 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 135e02d..64f6024 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1454,64 +1454,6 @@ static struct wined3d_texture *surface_convert_format(struct wined3d_texture *sr return dst_texture; } -static HRESULT _Blt_ColorFill(BYTE *buf, unsigned int width, unsigned int height, - unsigned int bpp, UINT pitch, DWORD color) -{ - BYTE *first; - unsigned int x, y; - - /* Do first row */ - -#define COLORFILL_ROW(type) \ -do { \ - type *d = (type *)buf; \ - for (x = 0; x < width; ++x) \ - d[x] = (type)color; \ -} while(0) - - switch (bpp) - { - case 1: - COLORFILL_ROW(BYTE); - break; - - case 2: - COLORFILL_ROW(WORD); - break; - - case 3: - { - BYTE *d = buf; - for (x = 0; x < width; ++x, d += 3) - { - d[0] = (color ) & 0xff; - d[1] = (color >> 8) & 0xff; - d[2] = (color >> 16) & 0xff; - } - break; - } - case 4: - COLORFILL_ROW(DWORD); - break; - - default: - FIXME("Color fill not implemented for bpp %u!\n", bpp * 8); - return WINED3DERR_NOTAVAILABLE; - } - -#undef COLORFILL_ROW - - /* Now copy first row. */ - first = buf; - for (y = 1; y < height; ++y) - { - buf += pitch; - memcpy(buf, first, width * bpp); - } - - return WINED3D_OK; -} - static void read_from_framebuffer(struct wined3d_surface *surface, struct wined3d_context *old_ctx, DWORD dst_location) { @@ -3032,13 +2974,6 @@ static HRESULT surface_cpu_blt(struct wined3d_texture *dst_texture, unsigned int goto release; } - /* First, all the 'source-less' blits */ - if (flags & (WINED3D_BLT_COLOR_FILL | WINED3D_BLT_DEPTH_FILL)) - { - hr = _Blt_ColorFill(dbuf, dst_width, dst_height, bpp, dst_map.row_pitch, fx->fill_color); - flags &= ~(WINED3D_BLT_COLOR_FILL | WINED3D_BLT_DEPTH_FILL); - } - /* Now the 'with source' blits. */ if (src_texture) { @@ -3393,16 +3328,89 @@ release: return hr; } +static HRESULT surface_cpu_blt_colour_fill(struct wined3d_texture *texture, unsigned int sub_resource_idx, + const struct wined3d_box *box, DWORD c) +{ + struct wined3d_resource *resource = &texture->resource; + unsigned int x, y, w, h, bpp; + struct wined3d_map_desc map; + BYTE *row; + + TRACE("texture %p, sub_resource_idx %u, box %s, colour 0x%08x.\n", + texture, sub_resource_idx, debug_box(box), c); + + if (resource->format_flags & WINED3DFMT_FLAG_BLOCKS) + { + FIXME("Not implemented for format %s.\n", debug_d3dformat(resource->format->id)); + return E_NOTIMPL; + } + + bpp = resource->format->byte_count; + w = box->right - box->left; + h = box->bottom - box->top; + + wined3d_resource_map(resource, sub_resource_idx, &map, box, 0); + + switch (bpp) + { + case 1: + for (x = 0; x < w; ++x) + { + ((BYTE *)map.data)[x] = c; + } + break; + + case 2: + for (x = 0; x < w; ++x) + { + ((WORD *)map.data)[x] = c; + } + break; + + case 3: + { + row = map.data; + for (x = 0; x < w; ++x, row += 3) + { + row[0] = (c ) & 0xff; + row[1] = (c >> 8) & 0xff; + row[2] = (c >> 16) & 0xff; + } + break; + } + case 4: + for (x = 0; x < w; ++x) + { + ((DWORD *)map.data)[x] = c; + } + break; + + default: + FIXME("Not implemented for bpp %u.\n", bpp); + wined3d_resource_unmap(resource, sub_resource_idx); + return WINED3DERR_NOTAVAILABLE; + } + + row = map.data; + for (y = 1; y < h; ++y) + { + row += map.row_pitch; + memcpy(row, map.data, w * bpp); + } + wined3d_resource_unmap(resource, sub_resource_idx); + + return WINED3D_OK; +} + static HRESULT cpu_blit_color_fill(struct wined3d_device *device, struct wined3d_rendertarget_view *view, const RECT *rect, const struct wined3d_color *color) { const struct wined3d_box box = {rect->left, rect->top, rect->right, rect->bottom, 0, 1}; - static const struct wined3d_box src_box; - struct wined3d_blt_fx fx; + DWORD c; - fx.fill_color = wined3d_format_convert_from_float(view->format, color); - return surface_cpu_blt(texture_from_resource(view->resource), view->sub_resource_idx, - &box, NULL, 0, &src_box, WINED3D_BLT_COLOR_FILL, &fx, WINED3D_TEXF_POINT); + c = wined3d_format_convert_from_float(view->format, color); + return surface_cpu_blt_colour_fill(texture_from_resource(view->resource), + view->sub_resource_idx, &box, c); } static HRESULT cpu_blit_depth_fill(struct wined3d_device *device, @@ -3411,8 +3419,7 @@ static HRESULT cpu_blit_depth_fill(struct wined3d_device *device, { const struct wined3d_box box = {rect->left, rect->top, rect->right, rect->bottom, 0, 1}; struct wined3d_color color = {depth, 0.0f, 0.0f, 0.0f}; - static const struct wined3d_box src_box; - struct wined3d_blt_fx fx; + DWORD c; if (clear_flags != WINED3DCLEAR_ZBUFFER) { @@ -3420,9 +3427,9 @@ static HRESULT cpu_blit_depth_fill(struct wined3d_device *device, return WINED3DERR_INVALIDCALL; } - fx.fill_color = wined3d_format_convert_from_float(view->format, &color); - return surface_cpu_blt(texture_from_resource(view->resource), view->sub_resource_idx, - &box, NULL, 0, &src_box, WINED3D_BLT_DEPTH_FILL, &fx, WINED3D_TEXF_POINT); + c = wined3d_format_convert_from_float(view->format, &color); + return surface_cpu_blt_colour_fill(texture_from_resource(view->resource), + view->sub_resource_idx, &box, c); } static void cpu_blit_blit_surface(struct wined3d_device *device, enum wined3d_blit_op op, @@ -3742,6 +3749,8 @@ fallback: return WINED3D_OK; cpu: + if (flags & (WINED3D_BLT_COLOR_FILL | WINED3D_BLT_DEPTH_FILL)) + return surface_cpu_blt_colour_fill(dst_texture, dst_sub_resource_idx, &dst_box, fx->fill_color); return surface_cpu_blt(dst_texture, dst_sub_resource_idx, &dst_box, src_texture, src_sub_resource_idx, &src_box, flags, fx, filter); }

1 0

Henri Verbeet : wined3d: Just print a message if loading the logo bitmap failed.
by Alexandre Julliard 29 Mar '17

29 Mar '17

Module: wine Branch: master Commit: b44b2c2dce370b32bc07b1dfe7121cf3604c13a7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b44b2c2dce370b32bc07b1dfe… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 28 23:37:37 2017 +0200 wined3d: Just print a message if loading the logo bitmap failed. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 51 ++++++++++++++++++--------------------------------- 1 file changed, 18 insertions(+), 33 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index d52df27..627a4a7 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -35,6 +35,7 @@ #include "wined3d_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d); +WINE_DECLARE_DEBUG_CHANNEL(winediag); /* Define the default light parameters as specified by MSDN. */ const struct wined3d_light WINED3D_default_light = @@ -547,23 +548,16 @@ static void device_load_logo(struct wined3d_device *device, const char *filename HRESULT hr; HDC dcb = NULL, dcs = NULL; - hbm = LoadImageA(NULL, filename, IMAGE_BITMAP, 0, 0, LR_LOADFROMFILE | LR_CREATEDIBSECTION); - if(hbm) + if (!(hbm = LoadImageA(NULL, filename, IMAGE_BITMAP, 0, 0, LR_LOADFROMFILE | LR_CREATEDIBSECTION))) { - GetObjectA(hbm, sizeof(BITMAP), &bm); - dcb = CreateCompatibleDC(NULL); - if(!dcb) goto out; - SelectObject(dcb, hbm); - } - else - { - /* Create a 32x32 white surface to indicate that wined3d is used, but the specified image - * couldn't be loaded - */ - memset(&bm, 0, sizeof(bm)); - bm.bmWidth = 32; - bm.bmHeight = 32; + ERR_(winediag)("Failed to load logo %s.\n", wine_dbgstr_a(filename)); + return; } + GetObjectA(hbm, sizeof(BITMAP), &bm); + + if (!(dcb = CreateCompatibleDC(NULL))) + goto out; + SelectObject(dcb, hbm); desc.resource_type = WINED3D_RTYPE_TEXTURE_2D; desc.format = WINED3DFMT_B5G6R5_UNORM; @@ -583,27 +577,18 @@ static void device_load_logo(struct wined3d_device *device, const char *filename goto out; } - if (dcb) + if (FAILED(hr = wined3d_texture_get_dc(device->logo_texture, 0, &dcs))) { - if (FAILED(hr = wined3d_texture_get_dc(device->logo_texture, 0, &dcs))) - goto out; - BitBlt(dcs, 0, 0, bm.bmWidth, bm.bmHeight, dcb, 0, 0, SRCCOPY); - wined3d_texture_release_dc(device->logo_texture, 0, dcs); - - color_key.color_space_low_value = 0; - color_key.color_space_high_value = 0; - wined3d_texture_set_color_key(device->logo_texture, WINED3D_CKEY_SRC_BLT, &color_key); + wined3d_texture_decref(device->logo_texture); + device->logo_texture = NULL; + goto out; } - else - { - const struct wined3d_color c = {1.0f, 1.0f, 1.0f, 1.0f}; - const RECT rect = {0, 0, desc.width, desc.height}; - struct wined3d_surface *surface; + BitBlt(dcs, 0, 0, bm.bmWidth, bm.bmHeight, dcb, 0, 0, SRCCOPY); + wined3d_texture_release_dc(device->logo_texture, 0, dcs); - /* Fill the surface with a white color to show that wined3d is there */ - surface = device->logo_texture->sub_resources[0].u.surface; - surface_color_fill(surface, &rect, &c); - } + color_key.color_space_low_value = 0; + color_key.color_space_high_value = 0; + wined3d_texture_set_color_key(device->logo_texture, WINED3D_CKEY_SRC_BLT, &color_key); out: if (dcb) DeleteDC(dcb);

1 0

Henri Verbeet : wined3d: Recreate the logo texture if needed in wined3d_device_reset().
by Alexandre Julliard 29 Mar '17

29 Mar '17

Module: wine Branch: master Commit: 74492d78572e99712d4ee6801d3f247469a9f898 URL: http://source.winehq.org/git/wine.git/?a=commit;h=74492d78572e99712d4ee6801… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 28 23:37:36 2017 +0200 wined3d: Recreate the logo texture if needed in wined3d_device_reset(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 4f8faa1..d52df27 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4751,6 +4751,8 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, device->update_state = &device->state; device_init_swapchain_state(device, swapchain); + if (wined3d_settings.logo) + device_load_logo(device, wined3d_settings.logo); } else if (device->back_buffer_view) {

1 0

Henri Verbeet : wined3d: Create the logo texture with WINED3D_TEXTURE_CREATE_GET_DC.
by Alexandre Julliard 29 Mar '17

29 Mar '17

Module: wine Branch: master Commit: b5da9ea38294d9bae124291eef2c61de5005d851 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b5da9ea38294d9bae124291ee… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 28 23:37:35 2017 +0200 wined3d: Create the logo texture with WINED3D_TEXTURE_CREATE_GET_DC. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index b058d45..4f8faa1 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -575,7 +575,8 @@ static void device_load_logo(struct wined3d_device *device, const char *filename desc.height = bm.bmHeight; desc.depth = 1; desc.size = 0; - if (FAILED(hr = wined3d_texture_create(device, &desc, 1, 1, WINED3D_TEXTURE_CREATE_MAPPABLE, + if (FAILED(hr = wined3d_texture_create(device, &desc, 1, 1, + WINED3D_TEXTURE_CREATE_MAPPABLE | WINED3D_TEXTURE_CREATE_GET_DC, NULL, NULL, &wined3d_null_parent_ops, &device->logo_texture))) { ERR("Wine logo requested, but failed to create texture, hr %#x.\n", hr);

1 0

← Newer
1
...
8
9
10
11
12
13
14
...
72
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits March 2017