February 2016 - Wine-Commits

Józef Kucia : wined3d: Recognize SM4 dcl_output opcode.
by Alexandre Julliard Feb. 1, 2016

Feb. 1, 2016

Module: wine Branch: master Commit: 479051060f58d143915b9f7753ed3e2ea30ab22a URL: http://source.winehq.org/git/wine.git/?a=commit;h=479051060f58d143915b9f775… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Feb 1 00:14:37 2016 +0100 wined3d: Recognize SM4 dcl_output opcode. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/arb_program_shader.c | 1 + dlls/wined3d/glsl_shader.c | 1 + dlls/wined3d/shader.c | 6 ++++++ dlls/wined3d/shader_sm4.c | 6 ++++++ dlls/wined3d/wined3d_private.h | 2 ++ 5 files changed, 16 insertions(+) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 58c4c12..a6db262 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -5229,6 +5229,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL /* WINED3DSIH_DCL_CONSTANT_BUFFER */ shader_hw_nop, /* WINED3DSIH_DCL_IMMEDIATE_CONSTANT_BUFFER */ NULL, /* WINED3DSIH_DCL_INPUT_PRIMITIVE */ shader_hw_nop, + /* WINED3DSIH_DCL_OUTPUT */ NULL, /* WINED3DSIH_DCL_OUTPUT_TOPOLOGY */ shader_hw_nop, /* WINED3DSIH_DCL_TEMPS */ NULL, /* WINED3DSIH_DCL_VERTICES_OUT */ shader_hw_nop, diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index dd8e68b..04f8ab4 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -8012,6 +8012,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_DCL_CONSTANT_BUFFER */ shader_glsl_nop, /* WINED3DSIH_DCL_IMMEDIATE_CONSTANT_BUFFER */ NULL, /* WINED3DSIH_DCL_INPUT_PRIMITIVE */ shader_glsl_nop, + /* WINED3DSIH_DCL_OUTPUT */ shader_glsl_nop, /* WINED3DSIH_DCL_OUTPUT_TOPOLOGY */ shader_glsl_nop, /* WINED3DSIH_DCL_TEMPS */ shader_glsl_nop, /* WINED3DSIH_DCL_VERTICES_OUT */ shader_glsl_nop, diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 77e8ab4..88c1330 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -57,6 +57,7 @@ static const char * const shader_opcode_names[] = /* WINED3DSIH_DCL_CONSTANT_BUFFER */ "dcl_constantBuffer", /* WINED3DSIH_DCL_IMMEDIATE_CONSTANT_BUFFER */ "dcl_immediateConstantBuffer", /* WINED3DSIH_DCL_INPUT_PRIMITIVE */ "dcl_inputPrimitive", + /* WINED3DSIH_DCL_OUTPUT */ "dcl_output", /* WINED3DSIH_DCL_OUTPUT_TOPOLOGY */ "dcl_outputTopology", /* WINED3DSIH_DCL_TEMPS */ "dcl_temps", /* WINED3DSIH_DCL_VERTICES_OUT */ "dcl_maxOutputVertexCount", @@ -1842,6 +1843,11 @@ static void shader_trace_init(const struct wined3d_shader_frontend *fe, void *fe } TRACE("}"); } + else if (ins.handler_idx == WINED3DSIH_DCL_OUTPUT) + { + TRACE("%s ", shader_opcode_names[ins.handler_idx]); + shader_dump_dst_param(&ins.declaration.dst, &shader_version); + } else if (ins.handler_idx == WINED3DSIH_DCL_INPUT_PRIMITIVE || ins.handler_idx == WINED3DSIH_DCL_OUTPUT_TOPOLOGY) { diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index e7c92d2..d9535a5 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -154,6 +154,7 @@ enum wined3d_sm4_opcode WINED3D_SM4_OP_DCL_OUTPUT_TOPOLOGY = 0x5c, WINED3D_SM4_OP_DCL_INPUT_PRIMITIVE = 0x5d, WINED3D_SM4_OP_DCL_VERTICES_OUT = 0x5e, + WINED3D_SM4_OP_DCL_OUTPUT = 0x65, WINED3D_SM4_OP_DCL_TEMPS = 0x68, }; @@ -349,6 +350,7 @@ static const struct wined3d_sm4_opcode_info opcode_table[] = {WINED3D_SM4_OP_DCL_OUTPUT_TOPOLOGY, WINED3DSIH_DCL_OUTPUT_TOPOLOGY, "", ""}, {WINED3D_SM4_OP_DCL_INPUT_PRIMITIVE, WINED3DSIH_DCL_INPUT_PRIMITIVE, "", ""}, {WINED3D_SM4_OP_DCL_VERTICES_OUT, WINED3DSIH_DCL_VERTICES_OUT, "", ""}, + {WINED3D_SM4_OP_DCL_OUTPUT, WINED3DSIH_DCL_OUTPUT, "", ""}, {WINED3D_SM4_OP_DCL_TEMPS, WINED3DSIH_DCL_TEMPS, "", ""}, }; @@ -953,6 +955,10 @@ static void shader_sm4_read_instruction(void *data, const DWORD **ptr, struct wi ins->declaration.primitive_type = input_primitive_type_table[primitive_type]; } } + else if (opcode == WINED3D_SM4_OP_DCL_OUTPUT) + { + shader_sm4_read_dst_param(priv, &p, WINED3D_DATA_FLOAT, &ins->declaration.dst); + } else if (opcode == WINED3D_SM4_OP_DCL_VERTICES_OUT || opcode == WINED3D_SM4_OP_DCL_TEMPS) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 50a9e65..9960685 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -489,6 +489,7 @@ enum WINED3D_SHADER_INSTRUCTION_HANDLER WINED3DSIH_DCL_CONSTANT_BUFFER, WINED3DSIH_DCL_IMMEDIATE_CONSTANT_BUFFER, WINED3DSIH_DCL_INPUT_PRIMITIVE, + WINED3DSIH_DCL_OUTPUT, WINED3DSIH_DCL_OUTPUT_TOPOLOGY, WINED3DSIH_DCL_TEMPS, WINED3DSIH_DCL_VERTICES_OUT, @@ -780,6 +781,7 @@ struct wined3d_shader_instruction { struct wined3d_shader_semantic semantic; enum wined3d_primitive_type primitive_type; + struct wined3d_shader_dst_param dst; struct wined3d_shader_src_param src; UINT count; struct wined3d_shader_immediate_constant_buffer *icb;

1 0

Józef Kucia : wined3d: Recognize SM4 dcl_immediateConstantBuffer.
by Alexandre Julliard Feb. 1, 2016

Feb. 1, 2016

Module: wine Branch: master Commit: c59f036e93c310cd9b12350c8f6cad1502d60d3c URL: http://source.winehq.org/git/wine.git/?a=commit;h=c59f036e93c310cd9b12350c8… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Feb 1 00:14:36 2016 +0100 wined3d: Recognize SM4 dcl_immediateConstantBuffer. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/arb_program_shader.c | 261 +++++++++++++++++------------------ dlls/wined3d/glsl_shader.c | 261 +++++++++++++++++------------------ dlls/wined3d/shader.c | 280 ++++++++++++++++++++------------------ dlls/wined3d/shader_sm4.c | 190 ++++++++++++++++---------- dlls/wined3d/wined3d_private.h | 11 ++ 5 files changed, 539 insertions(+), 464 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c59f036e93c310cd9b123…

1 0

Aric Stewart : imm32: Messages from ImmGenerateMessage are sent not posted.
by Alexandre Julliard Feb. 1, 2016

Feb. 1, 2016

Module: wine Branch: master Commit: 64c772dcc28e8a6ea5608725de3272fc4c04f691 URL: http://source.winehq.org/git/wine.git/?a=commit;h=64c772dcc28e8a6ea5608725d… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Jan 28 20:36:30 2016 -0600 imm32: Messages from ImmGenerateMessage are sent not posted. Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/imm32/imm.c | 12 ++++++++- dlls/imm32/tests/imm32.c | 69 +++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 79 insertions(+), 2 deletions(-) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index 3fab6fc..2d08378 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -439,6 +439,16 @@ static void ImmInternalPostIMEMessage(InputContextData *data, UINT msg, WPARAM w PostMessageW(target, msg, wParam, lParam); } +/* for sending messages as the IME */ +static void ImmInternalSendIMEMessage(InputContextData *data, UINT msg, WPARAM wParam, LPARAM lParam) +{ + HWND target = GetFocus(); + if (!target) + SendMessageW(data->IMC.hWnd,msg,wParam,lParam); + else + SendMessageW(target, msg, wParam, lParam); +} + static LRESULT ImmInternalSendIMENotify(InputContextData *data, WPARAM notify, LPARAM lParam) { HWND target; @@ -2887,7 +2897,7 @@ BOOL WINAPI ImmGenerateMessage(HIMC hIMC) lpTransMsg = ImmLockIMCC(data->IMC.hMsgBuf); for (i = 0; i < data->IMC.dwNumMsgBuf; i++) - ImmInternalPostIMEMessage(data, lpTransMsg[i].message, lpTransMsg[i].wParam, lpTransMsg[i].lParam); + ImmInternalSendIMEMessage(data, lpTransMsg[i].message, lpTransMsg[i].wParam, lpTransMsg[i].lParam); ImmUnlockIMCC(data->IMC.hMsgBuf); diff --git a/dlls/imm32/tests/imm32.c b/dlls/imm32/tests/imm32.c index b1f3913..d55503a 100644 --- a/dlls/imm32/tests/imm32.c +++ b/dlls/imm32/tests/imm32.c @@ -44,7 +44,7 @@ static struct _msg_spy { HWND hwnd; HHOOK get_msg_hook; HHOOK call_wnd_proc_hook; - imm_msgs msgs[32]; + imm_msgs msgs[64]; unsigned int i_msg; } msg_spy; @@ -59,6 +59,12 @@ typedef struct } u; } TEST_INPUT; +typedef struct _tagTRANSMSG { + UINT message; + WPARAM wParam; + LPARAM lParam; +} TRANSMSG, *LPTRANSMSG; + static UINT (WINAPI *pSendInput) (UINT, INPUT*, size_t); static LRESULT CALLBACK get_msg_filter(int nCode, WPARAM wParam, LPARAM lParam) @@ -1015,6 +1021,9 @@ static void test_ImmMessages(void) HIMC imc; UINT idx = 0; + LPINPUTCONTEXT lpIMC; + LPTRANSMSG lpTransMsg; + HWND hwnd = CreateWindowExA(WS_EX_CLIENTEDGE, "EDIT", "Wine imm32.dll test", WS_OVERLAPPEDWINDOW, CW_USEDEFAULT, CW_USEDEFAULT, 240, 120, NULL, NULL, GetModuleHandleA(NULL), NULL); @@ -1032,6 +1041,64 @@ static void test_ImmMessages(void) if (msg) ok(!msg->post, "Message should not be posted\n"); } while (msg); msg_spy_flush_msgs(); + + lpIMC = ImmLockIMC(imc); + lpIMC->hMsgBuf = ImmReSizeIMCC(lpIMC->hMsgBuf, (lpIMC->dwNumMsgBuf + 1) * sizeof(TRANSMSG)); + lpTransMsg = ImmLockIMCC(lpIMC->hMsgBuf); + lpTransMsg += lpIMC->dwNumMsgBuf; + lpTransMsg->message = WM_IME_STARTCOMPOSITION; + lpTransMsg->wParam = 0; + lpTransMsg->lParam = 0; + ImmUnlockIMCC(lpIMC->hMsgBuf); + lpIMC->dwNumMsgBuf++; + ImmUnlockIMC(imc); + ImmGenerateMessage(imc); + idx = 0; + do + { + msg = msg_spy_find_next_msg(WM_IME_STARTCOMPOSITION, &idx); + if (msg) ok(!msg->post, "Message should not be posted\n"); + } while (msg); + msg_spy_flush_msgs(); + + lpIMC = ImmLockIMC(imc); + lpIMC->hMsgBuf = ImmReSizeIMCC(lpIMC->hMsgBuf, (lpIMC->dwNumMsgBuf + 1) * sizeof(TRANSMSG)); + lpTransMsg = ImmLockIMCC(lpIMC->hMsgBuf); + lpTransMsg += lpIMC->dwNumMsgBuf; + lpTransMsg->message = WM_IME_COMPOSITION; + lpTransMsg->wParam = 0; + lpTransMsg->lParam = 0; + ImmUnlockIMCC(lpIMC->hMsgBuf); + lpIMC->dwNumMsgBuf++; + ImmUnlockIMC(imc); + ImmGenerateMessage(imc); + idx = 0; + do + { + msg = msg_spy_find_next_msg(WM_IME_COMPOSITION, &idx); + if (msg) ok(!msg->post, "Message should not be posted\n"); + } while (msg); + msg_spy_flush_msgs(); + + lpIMC = ImmLockIMC(imc); + lpIMC->hMsgBuf = ImmReSizeIMCC(lpIMC->hMsgBuf, (lpIMC->dwNumMsgBuf + 1) * sizeof(TRANSMSG)); + lpTransMsg = ImmLockIMCC(lpIMC->hMsgBuf); + lpTransMsg += lpIMC->dwNumMsgBuf; + lpTransMsg->message = WM_IME_ENDCOMPOSITION; + lpTransMsg->wParam = 0; + lpTransMsg->lParam = 0; + ImmUnlockIMCC(lpIMC->hMsgBuf); + lpIMC->dwNumMsgBuf++; + ImmUnlockIMC(imc); + ImmGenerateMessage(imc); + idx = 0; + do + { + msg = msg_spy_find_next_msg(WM_IME_ENDCOMPOSITION, &idx); + if (msg) ok(!msg->post, "Message should not be posted\n"); + } while (msg); + msg_spy_flush_msgs(); + ImmSetOpenStatus(imc, FALSE); ImmReleaseContext(hwnd, imc); DestroyWindow(hwnd);

1 0

Paul Gofman : msvcrt: Handle of thread created by _beginthread should not be closed on thread detach.
by Alexandre Julliard Feb. 1, 2016

Feb. 1, 2016

Module: wine Branch: master Commit: faf59e5f06a9ccf1bb6ae83716e68f63b883c001 URL: http://source.winehq.org/git/wine.git/?a=commit;h=faf59e5f06a9ccf1bb6ae8371… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Mon Feb 1 15:16:01 2016 +0300 msvcrt: Handle of thread created by _beginthread should not be closed on thread detach. Handle should be closed if _endthread is called or thread function exits. If thread is terminated by ExitThread or _endthreadex, thread handle remains valid. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/main.c | 1 - dlls/msvcrt/tests/misc.c | 62 ++++++++++++++++++++++++++++++++++++++++++++++++ dlls/msvcrt/thread.c | 56 +++++++++++++++++++++++++------------------ 3 files changed, 95 insertions(+), 24 deletions(-) diff --git a/dlls/msvcrt/main.c b/dlls/msvcrt/main.c index 6973dca..a930a32 100644 --- a/dlls/msvcrt/main.c +++ b/dlls/msvcrt/main.c @@ -67,7 +67,6 @@ static inline void msvcrt_free_tls_mem(void) if (tls) { - CloseHandle(tls->handle); MSVCRT_free(tls->efcvt_buffer); MSVCRT_free(tls->asctime_buffer); MSVCRT_free(tls->wasctime_buffer); diff --git a/dlls/msvcrt/tests/misc.c b/dlls/msvcrt/tests/misc.c index c568361..4968cbb 100644 --- a/dlls/msvcrt/tests/misc.c +++ b/dlls/msvcrt/tests/misc.c @@ -23,6 +23,7 @@ #include <stdio.h> #include <math.h> #include "msvcrt.h" +#include <process.h> static inline float __port_infinity(void) { @@ -540,6 +541,66 @@ static void test_math_functions(void) ok(errno == 0xdeadbeef, "errno = %d\n", errno); } +static void __cdecl test_thread_func(void *end_thread_type) +{ + if (end_thread_type == (void*)1) + _endthread(); + else if (end_thread_type == (void*)2) + ExitThread(0); + else if (end_thread_type == (void*)3) + _endthreadex(0); +} + +static unsigned __stdcall test_thread_func_ex(void *arg) +{ + _endthread(); + return 0; +} + +static void test_thread_handle_close(void) +{ + HANDLE hThread; + DWORD ret; + + /* _beginthread: handle is not closed on ExitThread and _endthreadex */ + hThread = (HANDLE)_beginthread(test_thread_func, 0, (void*)0); + ok(hThread != INVALID_HANDLE_VALUE, "_beginthread failed (%d)\n", errno); + WaitForSingleObject(hThread, INFINITE); + ret = CloseHandle(hThread); + ok(!ret, "ret = %d\n", ret); + + hThread = (HANDLE)_beginthread(test_thread_func, 0, (void*)1); + ok(hThread != INVALID_HANDLE_VALUE, "_beginthread failed (%d)\n", errno); + WaitForSingleObject(hThread, INFINITE); + ret = CloseHandle(hThread); + ok(!ret, "ret = %d\n", ret); + + hThread = (HANDLE)_beginthread(test_thread_func, 0, (void*)2); + ok(hThread != INVALID_HANDLE_VALUE, "_beginthread failed (%d)\n", errno); + Sleep(150); + ret = WaitForSingleObject(hThread, INFINITE); + ok(ret == WAIT_OBJECT_0, "ret = %d\n", ret); + ret = CloseHandle(hThread); + ok(ret, "ret = %d\n", ret); + + hThread = (HANDLE)_beginthread(test_thread_func, 0, (void*)3); + ok(hThread != INVALID_HANDLE_VALUE, "_beginthread failed (%d)\n", errno); + Sleep(150); + ret = WaitForSingleObject(hThread, INFINITE); + ok(ret == WAIT_OBJECT_0, "ret = %d\n", ret); + ret = CloseHandle(hThread); + ok(ret, "ret = %d\n", ret); + + /* _beginthreadex: handle is not closed on _endthread */ + hThread = (HANDLE)_beginthreadex(NULL,0, test_thread_func_ex, NULL, 0, NULL); + ok(hThread != NULL, "_beginthreadex failed (%d)\n", errno); + Sleep(150); + ret = WaitForSingleObject(hThread, INFINITE); + ok(ret == WAIT_OBJECT_0, "ret = %d\n", ret); + ret = CloseHandle(hThread); + ok(ret, "ret = %d\n", ret); +} + START_TEST(misc) { int arg_c; @@ -568,4 +629,5 @@ START_TEST(misc) test__invalid_parameter(); test_qsort_s(); test_math_functions(); + test_thread_handle_close(); } diff --git a/dlls/msvcrt/thread.c b/dlls/msvcrt/thread.c index 5e62354..da1f8bf 100644 --- a/dlls/msvcrt/thread.c +++ b/dlls/msvcrt/thread.c @@ -55,6 +55,38 @@ thread_data_t *msvcrt_get_thread_data(void) return ptr; } +/********************************************************************* + * _endthread (MSVCRT.@) + */ +void CDECL _endthread(void) +{ + thread_data_t *tls; + + TRACE("(void)\n"); + + tls = TlsGetValue(msvcrt_tls_index); + if (tls && tls->handle != INVALID_HANDLE_VALUE) + { + CloseHandle(tls->handle); + tls->handle = INVALID_HANDLE_VALUE; + } else + WARN("tls=%p tls->handle=%p\n", tls, tls ? tls->handle : INVALID_HANDLE_VALUE); + + /* FIXME */ + ExitThread(0); +} + +/********************************************************************* + * _endthreadex (MSVCRT.@) + */ +void CDECL _endthreadex( + unsigned int retval) /* [in] Thread exit code */ +{ + TRACE("(%d)\n", retval); + + /* FIXME */ + ExitThread(retval); +} /********************************************************************* * _beginthread_trampoline @@ -69,6 +101,7 @@ static DWORD CALLBACK _beginthread_trampoline(LPVOID arg) MSVCRT_free(arg); local_trampoline.start_address(local_trampoline.arglist); + _endthread(); return 0; } @@ -132,29 +165,6 @@ MSVCRT_uintptr_t CDECL _beginthreadex( } /********************************************************************* - * _endthread (MSVCRT.@) - */ -void CDECL _endthread(void) -{ - TRACE("(void)\n"); - - /* FIXME */ - ExitThread(0); -} - -/********************************************************************* - * _endthreadex (MSVCRT.@) - */ -void CDECL _endthreadex( - unsigned int retval) /* [in] Thread exit code */ -{ - TRACE("(%d)\n", retval); - - /* FIXME */ - ExitThread(retval); -} - -/********************************************************************* * _getptd (MSVCR80.@) */ thread_data_t* CDECL _getptd(void)

1 0

Józef Kucia : wined3d: Clean up naming in shader_sm1.c.
by Alexandre Julliard Feb. 1, 2016

Feb. 1, 2016

Module: wine Branch: master Commit: 7561f343815a34c3445238047e1742baec05fdb7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7561f343815a34c3445238047… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Feb 1 00:14:40 2016 +0100 wined3d: Clean up naming in shader_sm1.c. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/shader_sm1.c | 130 +++++++++++++++++++++++----------------------- 1 file changed, 65 insertions(+), 65 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7561f343815a34c344523…

1 0

Nikolay Sivov : dwrite: Remove some redundant includes.
by Alexandre Julliard Feb. 1, 2016

Feb. 1, 2016

Module: wine Branch: master Commit: 567f83a3172ca8fef877bc2f60694f8f83ec5231 URL: http://source.winehq.org/git/wine.git/?a=commit;h=567f83a3172ca8fef877bc2f6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Feb 1 14:59:14 2016 +0300 dwrite: Remove some redundant includes. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/freetype.c | 1 - dlls/dwrite/tests/analyzer.c | 1 - dlls/dwrite/tests/layout.c | 1 - 3 files changed, 3 deletions(-) diff --git a/dlls/dwrite/freetype.c b/dlls/dwrite/freetype.c index ba946a8..18b720a 100644 --- a/dlls/dwrite/freetype.c +++ b/dlls/dwrite/freetype.c @@ -32,7 +32,6 @@ #endif /* HAVE_FT2BUILD_H */ #include "windef.h" -#include "dwrite_2.h" #include "wine/library.h" #include "wine/debug.h" diff --git a/dlls/dwrite/tests/analyzer.c b/dlls/dwrite/tests/analyzer.c index fa0d7eb..d60b977 100644 --- a/dlls/dwrite/tests/analyzer.c +++ b/dlls/dwrite/tests/analyzer.c @@ -27,7 +27,6 @@ #include "initguid.h" #include "windows.h" -#include "dwrite.h" #include "dwrite_2.h" #include "wine/test.h" diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c index a8203f9..b2cdfc3 100644 --- a/dlls/dwrite/tests/layout.c +++ b/dlls/dwrite/tests/layout.c @@ -25,7 +25,6 @@ #include <limits.h> #include "windows.h" -#include "dwrite.h" #include "dwrite_2.h" #include "wine/test.h"

1 0

Nikolay Sivov : dwrite: Implement GetTextBeforePosition() for layout analysis source.
by Alexandre Julliard Feb. 1, 2016

Feb. 1, 2016

Module: wine Branch: master Commit: 0691af08c6645aede26028fd44f2be8802e256f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0691af08c6645aede26028fd4… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Feb 1 14:59:13 2016 +0300 dwrite: Implement GetTextBeforePosition() for layout analysis source. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/layout.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index 8847c97..86eab09 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -4130,8 +4130,20 @@ static HRESULT WINAPI dwritetextlayout_source_GetTextAtPosition(IDWriteTextAnaly static HRESULT WINAPI dwritetextlayout_source_GetTextBeforePosition(IDWriteTextAnalysisSource1 *iface, UINT32 position, WCHAR const** text, UINT32* text_len) { - FIXME("%u %p %p: stub\n", position, text, text_len); - return E_NOTIMPL; + struct dwrite_textlayout *layout = impl_from_IDWriteTextAnalysisSource1(iface); + + TRACE("(%p)->(%u %p %p)\n", layout, position, text, text_len); + + if (position > 0 && position < layout->len) { + *text = layout->str; + *text_len = position; + } + else { + *text = NULL; + *text_len = 0; + } + + return S_OK; } static DWRITE_READING_DIRECTION WINAPI dwritetextlayout_source_GetParagraphReadingDirection(IDWriteTextAnalysisSource1 *iface)

1 0

Nikolay Sivov : dwrite: Update callback analysis interfaces used by layout internally.
by Alexandre Julliard Feb. 1, 2016

Feb. 1, 2016

Module: wine Branch: master Commit: a43fd70f4a182d001b918c3842093fb4d1111e05 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a43fd70f4a182d001b918c384… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Feb 1 14:59:10 2016 +0300 dwrite: Update callback analysis interfaces used by layout internally. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/layout.c | 104 ++++++++++++++++++++++++++++++--------------------- 1 file changed, 62 insertions(+), 42 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a43fd70f4a182d001b918…

1 0

Henri Verbeet : ddraw: Use wined3d_texture_preload() in d3d_device7_PreLoad().
by Alexandre Julliard Feb. 1, 2016

Feb. 1, 2016

Module: wine Branch: master Commit: 59116f833ea29839b186617b625bb3aa01927944 URL: http://source.winehq.org/git/wine.git/?a=commit;h=59116f833ea29839b186617b6… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jan 29 18:48:57 2016 +0100 ddraw: Use wined3d_texture_preload() in d3d_device7_PreLoad(). This is safe because D3D is always initialized in D3D device methods. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/device.c | 2 +- dlls/wined3d/surface.c | 13 ------------- dlls/wined3d/wined3d.spec | 1 - include/wine/wined3d.h | 1 - 4 files changed, 1 insertion(+), 16 deletions(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 6c1bd49..c460658 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -5631,7 +5631,7 @@ static HRESULT d3d_device7_PreLoad(IDirect3DDevice7 *iface, IDirectDrawSurface7 return DDERR_INVALIDPARAMS; wined3d_mutex_lock(); - wined3d_surface_preload(surface->wined3d_surface); + wined3d_texture_preload(surface->wined3d_texture); wined3d_mutex_unlock(); return D3D_OK; diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 863eca2..245cf27 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1867,19 +1867,6 @@ static inline unsigned short float_32_to_16(const float *in) return ret; } -void CDECL wined3d_surface_preload(struct wined3d_surface *surface) -{ - TRACE("surface %p.\n", surface); - - if (!surface->resource.device->d3d_initialized) - { - ERR("D3D not initialized.\n"); - return; - } - - wined3d_texture_preload(surface->container); -} - void * CDECL wined3d_surface_get_parent(const struct wined3d_surface *surface) { TRACE("surface %p.\n", surface); diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 49041bb..65220c6 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -228,7 +228,6 @@ @ cdecl wined3d_surface_get_resource(ptr) @ cdecl wined3d_surface_getdc(ptr ptr) @ cdecl wined3d_surface_map(ptr ptr ptr long) -@ cdecl wined3d_surface_preload(ptr) @ cdecl wined3d_surface_releasedc(ptr ptr) @ cdecl wined3d_surface_set_overlay_position(ptr long long) @ cdecl wined3d_surface_unmap(ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 893fd67..24e4063 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2479,7 +2479,6 @@ struct wined3d_resource * __cdecl wined3d_surface_get_resource(struct wined3d_su HRESULT __cdecl wined3d_surface_getdc(struct wined3d_surface *surface, HDC *dc); HRESULT __cdecl wined3d_surface_map(struct wined3d_surface *surface, struct wined3d_map_desc *map_desc, const struct wined3d_box *box, DWORD flags); -void __cdecl wined3d_surface_preload(struct wined3d_surface *surface); HRESULT __cdecl wined3d_surface_releasedc(struct wined3d_surface *surface, HDC dc); HRESULT __cdecl wined3d_surface_set_overlay_position(struct wined3d_surface *surface, LONG x, LONG y); HRESULT __cdecl wined3d_surface_unmap(struct wined3d_surface *surface);

1 0

Henri Verbeet : ddraw: Use wined3d_texture_blt() in ddraw_surface_update_frontbuffer().
by Alexandre Julliard Feb. 1, 2016

Feb. 1, 2016

Module: wine Branch: master Commit: 257ee8cc6e63acc54576f60ad09de5b4051f8045 URL: http://source.winehq.org/git/wine.git/?a=commit;h=257ee8cc6e63acc54576f60ad… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jan 29 18:48:54 2016 +0100 ddraw: Use wined3d_texture_blt() in ddraw_surface_update_frontbuffer(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/ddraw.c | 2 +- dlls/ddraw/ddraw_private.h | 2 +- dlls/ddraw/surface.c | 4 ++-- dlls/wined3d/surface.c | 5 ----- dlls/wined3d/wined3d.spec | 1 - include/wine/wined3d.h | 1 - 6 files changed, 4 insertions(+), 11 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index d7bf099..89ce07a 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -4822,7 +4822,7 @@ static HRESULT CDECL device_parent_create_swapchain_texture(struct wined3d_devic return hr; } - ddraw->wined3d_frontbuffer = wined3d_surface_from_resource(wined3d_texture_get_sub_resource(*texture, 0)); + ddraw->wined3d_frontbuffer = *texture; return hr; } diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index 4fb1820..704d6db 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -92,7 +92,7 @@ struct ddraw struct ddraw_surface *primary; RECT primary_lock; - struct wined3d_surface *wined3d_frontbuffer; + struct wined3d_texture *wined3d_frontbuffer; struct wined3d_swapchain *wined3d_swapchain; HWND swapchain_window; diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index ac1c140..3e57ad6 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -69,8 +69,8 @@ HRESULT ddraw_surface_update_frontbuffer(struct ddraw_surface *surface, const RE if (read) return DD_OK; - return wined3d_surface_blt(surface->ddraw->wined3d_frontbuffer, rect, - surface->wined3d_surface, rect, 0, NULL, WINED3D_TEXF_POINT); + return wined3d_texture_blt(surface->ddraw->wined3d_frontbuffer, 0, rect, + surface->wined3d_texture, surface->sub_resource_idx, rect, 0, NULL, WINED3D_TEXF_POINT); } if (FAILED(hr = wined3d_surface_getdc(surface->wined3d_surface, &surface_dc))) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 7b1cf28..86e5290 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2431,11 +2431,6 @@ do { \ return WINED3D_OK; } -struct wined3d_surface * CDECL wined3d_surface_from_resource(struct wined3d_resource *resource) -{ - return surface_from_resource(resource); -} - HRESULT CDECL wined3d_surface_unmap(struct wined3d_surface *surface) { TRACE("surface %p.\n", surface); diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index cd8174c..c8a172f 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -223,7 +223,6 @@ @ cdecl wined3d_stateblock_incref(ptr) @ cdecl wined3d_surface_blt(ptr ptr ptr ptr long ptr long) -@ cdecl wined3d_surface_from_resource(ptr) @ cdecl wined3d_surface_get_overlay_position(ptr ptr ptr) @ cdecl wined3d_surface_get_parent(ptr) @ cdecl wined3d_surface_get_pitch(ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index bd0a9c7..c502cc4 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2475,7 +2475,6 @@ ULONG __cdecl wined3d_stateblock_incref(struct wined3d_stateblock *stateblock); HRESULT __cdecl wined3d_surface_blt(struct wined3d_surface *dst_surface, const RECT *dst_rect, struct wined3d_surface *src_surface, const RECT *src_rect, DWORD flags, const WINEDDBLTFX *blt_fx, enum wined3d_texture_filter_type filter); -struct wined3d_surface * __cdecl wined3d_surface_from_resource(struct wined3d_resource *resource); HRESULT __cdecl wined3d_surface_get_overlay_position(const struct wined3d_surface *surface, LONG *x, LONG *y); void * __cdecl wined3d_surface_get_parent(const struct wined3d_surface *surface); DWORD __cdecl wined3d_surface_get_pitch(const struct wined3d_surface *surface);

1 0