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

Hans Leidekker : webservices: Implement WS_CHANNEL_PROPERTY_CHANNEL_TYPE.
by Alexandre Julliard March 29, 2017

March 29, 2017

Module: wine Branch: master Commit: 9716776326df8ece5c810ff1d4fd5bff2d75e6e1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9716776326df8ece5c810ff1d… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Mar 29 11:14:47 2017 +0200 webservices: Implement WS_CHANNEL_PROPERTY_CHANNEL_TYPE. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/channel.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/webservices/channel.c b/dlls/webservices/channel.c index 7e7c409..d44fcc0 100644 --- a/dlls/webservices/channel.c +++ b/dlls/webservices/channel.c @@ -232,7 +232,7 @@ HRESULT WINAPI WsGetChannelProperty( WS_CHANNEL *handle, WS_CHANNEL_PROPERTY_ID ULONG size, WS_ERROR *error ) { struct channel *channel = (struct channel *)handle; - HRESULT hr; + HRESULT hr = S_OK; TRACE( "%p %u %p %u %p\n", handle, id, buf, size, error ); if (error) FIXME( "ignoring error parameter\n" ); @@ -247,7 +247,16 @@ HRESULT WINAPI WsGetChannelProperty( WS_CHANNEL *handle, WS_CHANNEL_PROPERTY_ID return E_INVALIDARG; } - hr = prop_get( channel->prop, channel->prop_count, id, buf, size ); + switch (id) + { + case WS_CHANNEL_PROPERTY_CHANNEL_TYPE: + if (!buf || size != sizeof(channel->type)) hr = E_INVALIDARG; + else *(WS_CHANNEL_TYPE *)buf = channel->type; + break; + + default: + hr = prop_get( channel->prop, channel->prop_count, id, buf, size ); + } LeaveCriticalSection( &channel->cs ); return hr;

1 0

Hans Leidekker : webservices: Move heap support to a separate file.
by Alexandre Julliard March 29, 2017

March 29, 2017

Module: wine Branch: master Commit: 7c94cf90aef43f07ea6204e43cfc1f3decaf2dc2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c94cf90aef43f07ea6204e43… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Mar 29 11:14:46 2017 +0200 webservices: Move heap support to a separate file. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/Makefile.in | 1 + dlls/webservices/heap.c | 356 +++++++++++++++++++++++++++++++++ dlls/webservices/reader.c | 285 -------------------------- dlls/webservices/webservices_private.h | 5 + dlls/webservices/writer.c | 41 ---- 5 files changed, 362 insertions(+), 326 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7c94cf90aef43f07ea620…

1 0

Hans Leidekker : webservices: No longer prefer native.
by Alexandre Julliard March 29, 2017

March 29, 2017

Module: wine Branch: master Commit: 5a88f52f3f29d55de78ccf4aed267234eb264122 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5a88f52f3f29d55de78ccf4ae… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Mar 29 11:14:43 2017 +0200 webservices: No longer prefer native. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/Makefile.in | 1 - dlls/webservices/main.c | 44 -------------------------------------------- 2 files changed, 45 deletions(-) diff --git a/dlls/webservices/Makefile.in b/dlls/webservices/Makefile.in index 8de4f6b..342ecc9 100644 --- a/dlls/webservices/Makefile.in +++ b/dlls/webservices/Makefile.in @@ -4,7 +4,6 @@ IMPORTS = winhttp rpcrt4 user32 C_SRCS = \ channel.c \ - main.c \ msg.c \ proxy.c \ reader.c \ diff --git a/dlls/webservices/main.c b/dlls/webservices/main.c deleted file mode 100644 index f99c5cd..0000000 --- a/dlls/webservices/main.c +++ /dev/null @@ -1,44 +0,0 @@ -/* - * Web Services - * - * Copyright 2013 Alistair Leslie-Hughes - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#include <stdarg.h> - -#include "windef.h" -#include "winbase.h" -#include "webservices.h" -#include "wine/debug.h" - -WINE_DEFAULT_DEBUG_CHANNEL(webservices); - -BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID reserved) -{ - TRACE("(%p, %u, %p)\n", instance, reason, reserved); - - switch (reason) - { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls(instance); - break; - } - - return TRUE; -}

1 0

Andrey Gusev : kernelbase: Add QuirkIsEnabled3 stub.
by Alexandre Julliard March 29, 2017

March 29, 2017

Module: wine Branch: master Commit: 7584e082bf6669923d9c16ca6d617b767179d410 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7584e082bf6669923d9c16ca6… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Tue Mar 28 17:16:01 2017 +0300 kernelbase: Add QuirkIsEnabled3 stub. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-core-quirks-l1-1-0.spec | 2 +- dlls/kernelbase/Makefile.in | 3 +++ dlls/kernelbase/kernelbase.spec | 2 +- dlls/kernelbase/main.c | 30 ++++++++++++++++++++++ 4 files changed, 35 insertions(+), 2 deletions(-) diff --git a/dlls/api-ms-win-core-quirks-l1-1-0/api-ms-win-core-quirks-l1-1-0.spec b/dlls/api-ms-win-core-quirks-l1-1-0/api-ms-win-core-quirks-l1-1-0.spec index 761120f..e8f77c7 100644 --- a/dlls/api-ms-win-core-quirks-l1-1-0/api-ms-win-core-quirks-l1-1-0.spec +++ b/dlls/api-ms-win-core-quirks-l1-1-0/api-ms-win-core-quirks-l1-1-0.spec @@ -2,7 +2,7 @@ @ stub QuirkGetData2 @ stub QuirkIsEnabled @ stub QuirkIsEnabled2 -@ stub QuirkIsEnabled3 +@ stdcall QuirkIsEnabled3(ptr ptr) kernelbase.QuirkIsEnabled3 @ stub QuirkIsEnabledForPackage @ stub QuirkIsEnabledForPackage2 @ stub QuirkIsEnabledForProcess diff --git a/dlls/kernelbase/Makefile.in b/dlls/kernelbase/Makefile.in index b9caed0..74df98c 100644 --- a/dlls/kernelbase/Makefile.in +++ b/dlls/kernelbase/Makefile.in @@ -1 +1,4 @@ MODULE = kernelbase.dll + +C_SRCS = \ + main.c diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index ff0e75f..e8cf502 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -1225,7 +1225,7 @@ # @ stub QuirkGetData2 # @ stub QuirkIsEnabled # @ stub QuirkIsEnabled2 -# @ stub QuirkIsEnabled3 +@ stdcall QuirkIsEnabled3(ptr ptr) # @ stub QuirkIsEnabledForPackage # @ stub QuirkIsEnabledForPackage2 # @ stub QuirkIsEnabledForPackage3 diff --git a/dlls/kernelbase/main.c b/dlls/kernelbase/main.c new file mode 100644 index 0000000..30cba3f --- /dev/null +++ b/dlls/kernelbase/main.c @@ -0,0 +1,30 @@ +/* + * Copyright 2017 Andrey Gusev + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(kernelbase); + +/*********************************************************************** + * QuirkIsEnabled3 (KERNELBASE.@) + */ +BOOL WINAPI QuirkIsEnabled3(void *unk1, void *unk2) +{ + FIXME("(%p, %p) stub!\n", unk1, unk2); + return FALSE; +}

1 0

Zebediah Figura : user32/tests: Add tests for EnableWindow().
by Alexandre Julliard March 29, 2017

March 29, 2017

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

Hans Leidekker : webservices: Implement WsResetMessage.
by Alexandre Julliard March 29, 2017

March 29, 2017

Module: wine Branch: master Commit: 6f3afc1a1ca24edf51ed70dc1a7d1ec1586127d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f3afc1a1ca24edf51ed70dc1… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Mar 29 11:14:49 2017 +0200 webservices: Implement WsResetMessage. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/msg.c | 63 ++++++++++++++++++++++++++++++++++++--- dlls/webservices/tests/msg.c | 38 +++++++++++++++++++++++ dlls/webservices/webservices.spec | 2 +- include/webservices.h | 1 + 4 files changed, 99 insertions(+), 5 deletions(-) diff --git a/dlls/webservices/msg.c b/dlls/webservices/msg.c index ae021cc..9e94d7c 100644 --- a/dlls/webservices/msg.c +++ b/dlls/webservices/msg.c @@ -123,15 +123,44 @@ static void free_header( struct header *header ) heap_free( header ); } -static void free_msg( struct msg *msg ) +static void reset_msg( struct msg *msg ) { ULONG i; - WsFreeWriter( msg->writer ); - WsFreeHeap( msg->heap ); + msg->state = WS_MESSAGE_STATE_EMPTY; + msg->init = 0; + UuidCreate( &msg->id ); + msg->is_addressed = FALSE; heap_free( msg->addr.chars ); + msg->addr.chars = NULL; + msg->addr.length = 0; + heap_free( msg->action.chars ); - for (i = 0; i < msg->header_count; i++) free_header( msg->header[i] ); + msg->action.chars = NULL; + msg->action.length = 0; + + WsResetHeap( msg->heap, NULL ); + msg->buf = NULL; /* allocated on msg->heap */ + msg->writer_body = NULL; /* owned by caller */ + msg->reader_body = NULL; /* owned by caller */ + + for (i = 0; i < msg->header_count; i++) + { + free_header( msg->header[i] ); + msg->header[i] = NULL; + } + msg->header_count = 0; + + memset( &msg->ctx_send, 0, sizeof(msg->ctx_send) ); + memset( &msg->ctx_receive, 0, sizeof(msg->ctx_receive) ); +} + +static void free_msg( struct msg *msg ) +{ + reset_msg( msg ); + + WsFreeWriter( msg->writer ); + WsFreeHeap( msg->heap ); heap_free( msg->header ); msg->cs.DebugInfo->Spare[0] = 0; @@ -246,6 +275,32 @@ void WINAPI WsFreeMessage( WS_MESSAGE *handle ) } /************************************************************************** + * WsResetMessage [webservices.@] + */ +HRESULT WINAPI WsResetMessage( WS_MESSAGE *handle, WS_ERROR *error ) +{ + struct msg *msg = (struct msg *)handle; + + TRACE( "%p %p\n", handle, error ); + if (error) FIXME( "ignoring error parameter\n" ); + + if (!msg) return E_INVALIDARG; + + EnterCriticalSection( &msg->cs ); + + if (msg->magic != MSG_MAGIC) + { + LeaveCriticalSection( &msg->cs ); + return E_INVALIDARG; + } + + reset_msg( msg ); + + LeaveCriticalSection( &msg->cs ); + return S_OK; +} + +/************************************************************************** * WsGetMessageProperty [webservices.@] */ HRESULT WINAPI WsGetMessageProperty( WS_MESSAGE *handle, WS_MESSAGE_PROPERTY_ID id, void *buf, diff --git a/dlls/webservices/tests/msg.c b/dlls/webservices/tests/msg.c index b13a97e..f6a6ba1 100644 --- a/dlls/webservices/tests/msg.c +++ b/dlls/webservices/tests/msg.c @@ -1105,6 +1105,43 @@ static void test_WsReadBody(void) WsFreeHeap( heap ); } +static void test_WsResetMessage(void) +{ + WS_MESSAGE *msg; + WS_MESSAGE_STATE state; + WS_ENVELOPE_VERSION env_version; + WS_ADDRESSING_VERSION addr_version; + HRESULT hr; + + hr = WsCreateMessage( WS_ENVELOPE_VERSION_SOAP_1_1, WS_ADDRESSING_VERSION_0_9, NULL, 0, &msg, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsInitializeMessage( msg, WS_REQUEST_MESSAGE, NULL, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsResetMessage( msg, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + state = 0xdeadbeef; + hr = WsGetMessageProperty( msg, WS_MESSAGE_PROPERTY_STATE, &state, sizeof(state), NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( state == WS_MESSAGE_STATE_EMPTY, "got %u\n", state ); + + env_version = 0xdeadbeef; + hr = WsGetMessageProperty( msg, WS_MESSAGE_PROPERTY_ENVELOPE_VERSION, &env_version, + sizeof(env_version), NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( env_version == WS_ENVELOPE_VERSION_SOAP_1_1, "got %u\n", env_version ); + + addr_version = 0xdeadbeef; + hr = WsGetMessageProperty( msg, WS_MESSAGE_PROPERTY_ADDRESSING_VERSION, &addr_version, + sizeof(addr_version), NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( addr_version == WS_ADDRESSING_VERSION_0_9, "got %u\n", addr_version ); + + WsFreeMessage( msg ); +} + START_TEST(msg) { test_WsCreateMessage(); @@ -1123,4 +1160,5 @@ START_TEST(msg) test_WsReadEnvelopeStart(); test_WsReadEnvelopeEnd(); test_WsReadBody(); + test_WsResetMessage(); } diff --git a/dlls/webservices/webservices.spec b/dlls/webservices/webservices.spec index 074f612..fd4a831 100644 --- a/dlls/webservices/webservices.spec +++ b/dlls/webservices/webservices.spec @@ -137,7 +137,7 @@ @ stdcall WsResetError(ptr) @ stdcall WsResetHeap(ptr ptr) @ stub WsResetListener -@ stub WsResetMessage +@ stdcall WsResetMessage(ptr ptr) @ stub WsResetMetadata @ stub WsResetServiceHost @ stub WsResetServiceProxy diff --git a/include/webservices.h b/include/webservices.h index 3274082..532275b 100644 --- a/include/webservices.h +++ b/include/webservices.h @@ -1488,6 +1488,7 @@ HRESULT WINAPI WsRemoveHeader(WS_MESSAGE*, WS_HEADER_TYPE, WS_ERROR*); HRESULT WINAPI WsRemoveMappedHeader(WS_MESSAGE*, const WS_XML_STRING*, WS_ERROR*); HRESULT WINAPI WsRemoveNode(const WS_XML_NODE_POSITION*, WS_ERROR*); HRESULT WINAPI WsResetChannel(WS_CHANNEL*, WS_ERROR*); +HRESULT WINAPI WsResetMessage(WS_MESSAGE*, WS_ERROR*); HRESULT WINAPI WsResetError(WS_ERROR*); HRESULT WINAPI WsResetHeap(WS_HEAP*, WS_ERROR*); HRESULT WINAPI WsResetMessage(WS_MESSAGE*, WS_ERROR*);

1 0

Henri Verbeet : wined3d: Introduce a separate function for doing colour fills in the CPU blitter.
by Alexandre Julliard March 29, 2017

March 29, 2017

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 March 29, 2017

March 29, 2017

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 March 29, 2017

March 29, 2017

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 March 29, 2017

March 29, 2017

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