February 2016 - Wine-Commits

Vincent Povirk : kernel32/tests: Add tests for GetTimeZoneInformationForYear.
by Alexandre Julliard Feb. 2, 2016

Feb. 2, 2016

Module: wine Branch: master Commit: 2e3ce3a37d08c022ddfbfb751432c2ed37354429 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e3ce3a37d08c022ddfbfb751… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Jan 29 14:31:26 2016 -0600 kernel32/tests: Add tests for GetTimeZoneInformationForYear. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/time.c | 120 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 120 insertions(+) diff --git a/dlls/kernel32/tests/time.c b/dlls/kernel32/tests/time.c index c4de194..cd100f2 100644 --- a/dlls/kernel32/tests/time.c +++ b/dlls/kernel32/tests/time.c @@ -31,6 +31,7 @@ static int (WINAPI *pGetCalendarInfoA)(LCID,CALID,CALTYPE,LPSTR,int,LPDWORD); static int (WINAPI *pGetCalendarInfoW)(LCID,CALID,CALTYPE,LPWSTR,int,LPDWORD); static DWORD (WINAPI *pGetDynamicTimeZoneInformation)(DYNAMIC_TIME_ZONE_INFORMATION*); static void (WINAPI *pGetSystemTimePreciseAsFileTime)(LPFILETIME); +static BOOL (WINAPI *pGetTimeZoneInformationForYear)(USHORT, PDYNAMIC_TIME_ZONE_INFORMATION, LPTIME_ZONE_INFORMATION); #define SECSPERMIN 60 #define SECSPERDAY 86400 @@ -869,6 +870,123 @@ static void test_GetSystemTimes(void) HeapFree(GetProcessHeap(), 0, sppi); } +static WORD day_of_month(const SYSTEMTIME* systemtime, WORD year) +{ + SYSTEMTIME first_of_month = {0}; + FILETIME filetime; + WORD result; + + if (systemtime->wYear != 0) + return systemtime->wDay; + + first_of_month.wYear = year; + first_of_month.wMonth = systemtime->wMonth; + first_of_month.wDay = 1; + + /* round-trip conversion sets day of week field */ + SystemTimeToFileTime(&first_of_month, &filetime); + FileTimeToSystemTime(&filetime, &first_of_month); + + result = 1 + ((systemtime->wDayOfWeek - first_of_month.wDayOfWeek + 7) % 7) + + (7 * (systemtime->wDay - 1)); + + if (systemtime->wDay == 5) + { + /* make sure this isn't in the next month */ + SYSTEMTIME result_date; + + result_date = first_of_month; + result_date.wDay = result; + + SystemTimeToFileTime(&result_date, &filetime); + FileTimeToSystemTime(&filetime, &result_date); + + if (result_date.wDay != result) + result = 1 + ((systemtime->wDayOfWeek - first_of_month.wDayOfWeek + 7) % 7) + + (7 * (4 - 1)); + } + + return result; +} + +static void test_GetTimeZoneInformationForYear(void) +{ + BOOL ret; + SYSTEMTIME systemtime; + TIME_ZONE_INFORMATION local_tzinfo, tzinfo; + DYNAMIC_TIME_ZONE_INFORMATION dyn_tzinfo; + static const WCHAR std_tzname[] = {'G','r','e','e','n','l','a','n','d',' ','S','t','a','n','d','a','r','d',' ','T','i','m','e',0}; + static const WCHAR dlt_tzname[] = {'G','r','e','e','n','l','a','n','d',' ','D','a','y','l','i','g','h','t',' ','T','i','m','e',0}; + WORD std_day, dlt_day; + + if (!pGetTimeZoneInformationForYear || !pGetDynamicTimeZoneInformation) + { + todo_wine win_skip("GetTimeZoneInformationForYear not available\n"); + return; + } + + GetLocalTime(&systemtime); + + GetTimeZoneInformation(&local_tzinfo); + + ret = pGetTimeZoneInformationForYear(systemtime.wYear, NULL, &tzinfo); + ok(ret == TRUE, "GetTimeZoneInformationForYear failed, err %u\n", GetLastError()); + ok(tzinfo.Bias == local_tzinfo.Bias, "Expected Bias %d, got %d\n", local_tzinfo.Bias, tzinfo.Bias); + ok(!lstrcmpW(tzinfo.StandardName, local_tzinfo.StandardName), + "Expected StandardName %s, got %s\n", wine_dbgstr_w(local_tzinfo.StandardName), wine_dbgstr_w(tzinfo.StandardName)); + ok(!memcmp(&tzinfo.StandardDate, &local_tzinfo.StandardDate, sizeof(SYSTEMTIME)), "StandardDate does not match\n"); + ok(tzinfo.StandardBias == local_tzinfo.StandardBias, "Expected StandardBias %d, got %d\n", local_tzinfo.StandardBias, tzinfo.StandardBias); + ok(!lstrcmpW(tzinfo.DaylightName, local_tzinfo.DaylightName), + "Expected DaylightName %s, got %s\n", wine_dbgstr_w(local_tzinfo.DaylightName), wine_dbgstr_w(tzinfo.DaylightName)); + ok(!memcmp(&tzinfo.DaylightDate, &local_tzinfo.DaylightDate, sizeof(SYSTEMTIME)), "DaylightDate does not match\n"); + ok(tzinfo.DaylightBias == local_tzinfo.DaylightBias, "Expected DaylightBias %d, got %d\n", local_tzinfo.DaylightBias, tzinfo.DaylightBias); + + pGetDynamicTimeZoneInformation(&dyn_tzinfo); + + ret = pGetTimeZoneInformationForYear(systemtime.wYear, &dyn_tzinfo, &tzinfo); + ok(ret == TRUE, "GetTimeZoneInformationForYear failed, err %u\n", GetLastError()); + ok(tzinfo.Bias == local_tzinfo.Bias, "Expected Bias %d, got %d\n", local_tzinfo.Bias, tzinfo.Bias); + ok(!lstrcmpW(tzinfo.StandardName, local_tzinfo.StandardName), + "Expected StandardName %s, got %s\n", wine_dbgstr_w(local_tzinfo.StandardName), wine_dbgstr_w(tzinfo.StandardName)); + ok(!memcmp(&tzinfo.StandardDate, &local_tzinfo.StandardDate, sizeof(SYSTEMTIME)), "StandardDate does not match\n"); + ok(tzinfo.StandardBias == local_tzinfo.StandardBias, "Expected StandardBias %d, got %d\n", local_tzinfo.StandardBias, tzinfo.StandardBias); + ok(!lstrcmpW(tzinfo.DaylightName, local_tzinfo.DaylightName), + "Expected DaylightName %s, got %s\n", wine_dbgstr_w(local_tzinfo.DaylightName), wine_dbgstr_w(tzinfo.DaylightName)); + ok(!memcmp(&tzinfo.DaylightDate, &local_tzinfo.DaylightDate, sizeof(SYSTEMTIME)), "DaylightDate does not match\n"); + ok(tzinfo.DaylightBias == local_tzinfo.DaylightBias, "Expected DaylightBias %d, got %d\n", local_tzinfo.DaylightBias, tzinfo.DaylightBias); + + memset(&dyn_tzinfo, 0xaa, sizeof(dyn_tzinfo)); + lstrcpyW(dyn_tzinfo.TimeZoneKeyName, std_tzname); + dyn_tzinfo.DynamicDaylightTimeDisabled = FALSE; + + ret = pGetTimeZoneInformationForYear(2015, &dyn_tzinfo, &tzinfo); + ok(ret == TRUE, "GetTimeZoneInformationForYear failed, err %u\n", GetLastError()); + ok(tzinfo.Bias == 180, "Expected Bias 180, got %d\n", tzinfo.Bias); + ok(!lstrcmpW(tzinfo.StandardName, std_tzname) || broken(!tzinfo.StandardName[0]) /* vista,7 */, + "Expected StandardName %s, got %s\n", + wine_dbgstr_w(std_tzname), wine_dbgstr_w(tzinfo.StandardName)); + ok(tzinfo.StandardDate.wMonth == 10, "Expected standard month 10, got %d\n", tzinfo.StandardDate.wMonth); + std_day = day_of_month(&tzinfo.StandardDate, 2015); + ok(std_day == 24, "Expected standard day 24, got %d\n", std_day); + ok(tzinfo.StandardBias == 0, "Expected StandardBias 0, got %d\n", tzinfo.StandardBias); + ok(!lstrcmpW(tzinfo.DaylightName, dlt_tzname) || broken(!tzinfo.DaylightName[0]) /* vista,7 */, + "Expected DaylightName %s, got %s\n", + wine_dbgstr_w(dlt_tzname), wine_dbgstr_w(tzinfo.DaylightName)); + ok(tzinfo.DaylightDate.wMonth == 3, "Expected daylight month 3, got %d\n", tzinfo.DaylightDate.wMonth); + dlt_day = day_of_month(&tzinfo.DaylightDate, 2015); + ok(dlt_day == 28, "Expected daylight day 28, got %d\n", dlt_day); + ok(tzinfo.DaylightBias == -60, "Expected DaylightBias -60, got %d\n", tzinfo.DaylightBias); + + memset(&dyn_tzinfo, 0xaa, sizeof(dyn_tzinfo)); + lstrcpyW(dyn_tzinfo.TimeZoneKeyName, dlt_tzname); + + SetLastError(0xdeadbeef); + ret = pGetTimeZoneInformationForYear(2015, &dyn_tzinfo, &tzinfo); + ok((ret == FALSE && GetLastError() == ERROR_FILE_NOT_FOUND) || + broken(ret == TRUE) /* vista,7 */, + "GetTimeZoneInformationForYear err %u\n", GetLastError()); +} + START_TEST(time) { HMODULE hKernel = GetModuleHandleA("kernel32"); @@ -879,6 +997,7 @@ START_TEST(time) pGetCalendarInfoW = (void *)GetProcAddress(hKernel, "GetCalendarInfoW"); pGetDynamicTimeZoneInformation = (void *)GetProcAddress(hKernel, "GetDynamicTimeZoneInformation"); pGetSystemTimePreciseAsFileTime = (void *)GetProcAddress(hKernel, "GetSystemTimePreciseAsFileTime"); + pGetTimeZoneInformationForYear = (void *)GetProcAddress(hKernel, "GetTimeZoneInformationForYear"); test_conversions(); test_invalid_arg(); @@ -891,4 +1010,5 @@ START_TEST(time) test_GetCalendarInfo(); test_GetDynamicTimeZoneInformation(); test_GetSystemTimePreciseAsFileTime(); + test_GetTimeZoneInformationForYear(); }

1 0

Christopher Thielen : user32: Ensure that button responds only to changes in WM_CAPTURECHANGED handler.
by Alexandre Julliard Feb. 2, 2016

Feb. 2, 2016

Module: wine Branch: master Commit: 85faafc0e3f3861e7c03d4f7dc842bd7d4cf6ae9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=85faafc0e3f3861e7c03d4f7d… Author: Christopher Thielen <cthielen(a)gmail.com> Date: Sun Jan 31 20:31:02 2016 -0800 user32: Ensure that button responds only to changes in WM_CAPTURECHANGED handler. Signed-off-by: Christopher Thielen <cthielen(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/button.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/user32/button.c b/dlls/user32/button.c index 890d154..9c52147 100644 --- a/dlls/user32/button.c +++ b/dlls/user32/button.c @@ -364,6 +364,7 @@ LRESULT ButtonWndProc_common(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam, case WM_CAPTURECHANGED: TRACE("WM_CAPTURECHANGED %p\n", hWnd); + if (hWnd == (HWND)lParam) break; state = get_button_state( hWnd ); if (state & BUTTON_BTNPRESSED) {

1 0

Christopher Thielen : comctl32: Ensure that toolbar respond only to changes in WM_CAPTURECHANGED handler.
by Alexandre Julliard Feb. 2, 2016

Feb. 2, 2016

Module: wine Branch: master Commit: ff063d9e250310d3cf8d27371040609b97c24f6c URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff063d9e250310d3cf8d27371… Author: Christopher Thielen <cthielen(a)gmail.com> Date: Sun Jan 31 20:26:47 2016 -0800 comctl32: Ensure that toolbar respond only to changes in WM_CAPTURECHANGED handler. Signed-off-by: Christopher Thielen <cthielen(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/toolbar.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c index 890c18e..ae6f21e 100644 --- a/dlls/comctl32/toolbar.c +++ b/dlls/comctl32/toolbar.c @@ -6807,6 +6807,7 @@ ToolbarWindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) return TOOLBAR_MouseLeave (infoPtr); case WM_CAPTURECHANGED: + if (hwnd == (HWND)lParam) return 0; return TOOLBAR_CaptureChanged(infoPtr); case WM_NCACTIVATE:

1 0

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

Feb. 2, 2016

Module: wine Branch: master Commit: e379a17a0a2d7d4d2564dac4f9dc95f227ae44e1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e379a17a0a2d7d4d2564dac4f… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Feb 2 11:32:34 2016 +0100 wined3d: Recognize SM4 dcl_globalFlags 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 | 26 ++++++++++++++++++++++++++ dlls/wined3d/shader_sm4.c | 9 +++++++++ dlls/wined3d/wined3d_private.h | 7 +++++++ 5 files changed, 44 insertions(+) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index ffaff80..9c19600 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -5227,6 +5227,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL /* WINED3DSIH_CUT */ NULL, /* WINED3DSIH_DCL */ shader_hw_nop, /* WINED3DSIH_DCL_CONSTANT_BUFFER */ shader_hw_nop, + /* WINED3DSIH_DCL_GLOBAL_FLAGS */ NULL, /* WINED3DSIH_DCL_IMMEDIATE_CONSTANT_BUFFER */ NULL, /* WINED3DSIH_DCL_INPUT */ NULL, /* WINED3DSIH_DCL_INPUT_PRIMITIVE */ shader_hw_nop, diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 7e78e64..fa82196 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -8015,6 +8015,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_CUT */ shader_glsl_cut, /* WINED3DSIH_DCL */ shader_glsl_nop, /* WINED3DSIH_DCL_CONSTANT_BUFFER */ shader_glsl_nop, + /* WINED3DSIH_DCL_GLOBAL_FLAGS */ shader_glsl_nop, /* WINED3DSIH_DCL_IMMEDIATE_CONSTANT_BUFFER */ NULL, /* WINED3DSIH_DCL_INPUT */ shader_glsl_nop, /* WINED3DSIH_DCL_INPUT_PRIMITIVE */ shader_glsl_nop, diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 4829ad2..2ae6393 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -55,6 +55,7 @@ static const char * const shader_opcode_names[] = /* WINED3DSIH_CUT */ "cut", /* WINED3DSIH_DCL */ "dcl", /* WINED3DSIH_DCL_CONSTANT_BUFFER */ "dcl_constantBuffer", + /* WINED3DSIH_DCL_GLOBAL_FLAGS */ "dcl_globalFlags", /* WINED3DSIH_DCL_IMMEDIATE_CONSTANT_BUFFER */ "dcl_immediateConstantBuffer", /* WINED3DSIH_DCL_INPUT */ "dcl_input", /* WINED3DSIH_DCL_INPUT_PRIMITIVE */ "dcl_inputPrimitive", @@ -1229,6 +1230,26 @@ unsigned int shader_find_free_input_register(const struct wined3d_shader_reg_map return wined3d_log2i(map); } +static void shader_dump_global_flags(DWORD global_flags) +{ + if (global_flags & WINED3DSGF_REFACTORING_ALLOWED) + { + TRACE("refactoringAllowed"); + global_flags &= ~WINED3DSGF_REFACTORING_ALLOWED; + if (global_flags) + TRACE(" | "); + } + + if (global_flags & WINED3DSGF_ENABLE_RAW_AND_STRUCTURED_BUFFERS) + { + TRACE("enableRawAndStructuredBuffers"); + global_flags &= ~WINED3DSGF_ENABLE_RAW_AND_STRUCTURED_BUFFERS; + } + + if (global_flags) + TRACE("unknown_flags(%#x)", global_flags); +} + static void shader_dump_sysval_semantic(enum wined3d_sysval_semantic semantic) { unsigned int i; @@ -1899,6 +1920,11 @@ static void shader_trace_init(const struct wined3d_shader_frontend *fe, void *fe shader_dump_src_param(&ins.declaration.src, &shader_version); TRACE(", %s", ins.flags & WINED3DSI_INDEXED_DYNAMIC ? "dynamicIndexed" : "immediateIndexed"); } + else if (ins.handler_idx == WINED3DSIH_DCL_GLOBAL_FLAGS) + { + TRACE("%s ", shader_opcode_names[ins.handler_idx]); + shader_dump_global_flags(ins.flags); + } else if (ins.handler_idx == WINED3DSIH_DCL_IMMEDIATE_CONSTANT_BUFFER) { TRACE("%s {\n", shader_opcode_names[ins.handler_idx]); diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index 4a9aa6b..ce1067f 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -50,6 +50,9 @@ WINE_DECLARE_DEBUG_CHANNEL(d3d_bytecode); #define WINED3D_SM4_INTERPOLATION_MODE_SHIFT 11 #define WINED3D_SM4_INTERPOLATION_MODE_MASK (0xfu << WINED3D_SM4_INTERPOLATION_MODE_SHIFT) +#define WINED3D_SM4_GLOBAL_FLAGS_SHIFT 11 +#define WINED3D_SM4_GLOBAL_FLAGS_MASK (0xffu << WINED3D_SM4_GLOBAL_FLAGS_SHIFT) + #define WINED3D_SM4_OPCODE_MASK 0xff #define WINED3D_SM4_REGISTER_MODIFIER (0x1u << 31) @@ -170,6 +173,7 @@ enum wined3d_sm4_opcode WINED3D_SM4_OP_DCL_OUTPUT = 0x65, WINED3D_SM4_OP_DCL_OUTPUT_SIV = 0x67, WINED3D_SM4_OP_DCL_TEMPS = 0x68, + WINED3D_SM4_OP_DCL_GLOBAL_FLAGS = 0x6a, }; enum wined3d_sm4_register_type @@ -380,6 +384,7 @@ static const struct wined3d_sm4_opcode_info opcode_table[] = {WINED3D_SM4_OP_DCL_OUTPUT, WINED3DSIH_DCL_OUTPUT, "", ""}, {WINED3D_SM4_OP_DCL_OUTPUT_SIV, WINED3DSIH_DCL_OUTPUT_SIV, "", ""}, {WINED3D_SM4_OP_DCL_TEMPS, WINED3DSIH_DCL_TEMPS, "", ""}, + {WINED3D_SM4_OP_DCL_GLOBAL_FLAGS, WINED3DSIH_DCL_GLOBAL_FLAGS, "", ""}, }; static const enum wined3d_shader_register_type register_type_table[] = @@ -1019,6 +1024,10 @@ static void shader_sm4_read_instruction(void *data, const DWORD **ptr, struct wi { ins->declaration.count = *p++; } + else if (opcode == WINED3D_SM4_OP_DCL_GLOBAL_FLAGS) + { + ins->flags = (opcode_token & WINED3D_SM4_GLOBAL_FLAGS_MASK) >> WINED3D_SM4_GLOBAL_FLAGS_SHIFT; + } else { enum wined3d_shader_dst_modifier instruction_dst_modifier = WINED3DSPDM_NONE; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 9e4d1c3..dd2dacd 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -427,6 +427,12 @@ enum wined3d_shader_interpolation_mode WINED3DSIM_LINEAR_NOPERSPECTIVE_SAMPLE = 7, }; +enum wined3d_shader_global_flags +{ + WINED3DSGF_REFACTORING_ALLOWED = 0x1, + WINED3DSGF_ENABLE_RAW_AND_STRUCTURED_BUFFERS = 0x8, +}; + /* Undocumented opcode control to identify projective texture lookups in ps 2.0 and later */ #define WINED3DSI_TEXLD_PROJECT 0x1 #define WINED3DSI_TEXLD_BIAS 0x2 @@ -499,6 +505,7 @@ enum WINED3D_SHADER_INSTRUCTION_HANDLER WINED3DSIH_CUT, WINED3DSIH_DCL, WINED3DSIH_DCL_CONSTANT_BUFFER, + WINED3DSIH_DCL_GLOBAL_FLAGS, WINED3DSIH_DCL_IMMEDIATE_CONSTANT_BUFFER, WINED3DSIH_DCL_INPUT, WINED3DSIH_DCL_INPUT_PRIMITIVE,

1 0

Nikolay Sivov : dwrite/tests: Test that soft hyphen is not marked as a whitespace.
by Alexandre Julliard Feb. 2, 2016

Feb. 2, 2016

Module: wine Branch: master Commit: 20b5cdb1d4758c923cdc500ee2dcb96c69f5eff6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=20b5cdb1d4758c923cdc500ee… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Feb 2 01:41:13 2016 +0300 dwrite/tests: Test that soft hyphen is not marked as a whitespace. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/tests/analyzer.c | 3 +++ dlls/dwrite/tests/layout.c | 2 ++ 2 files changed, 5 insertions(+) diff --git a/dlls/dwrite/tests/analyzer.c b/dlls/dwrite/tests/analyzer.c index d60b977..b5437c5 100644 --- a/dlls/dwrite/tests/analyzer.c +++ b/dlls/dwrite/tests/analyzer.c @@ -1028,6 +1028,9 @@ static void compare_breakpoints(const struct linebreaks_test *test, DWRITE_LINE_ conditions[test->bp[i].breakConditionAfter], test->bp[i].isWhitespace ? "WS" : "0", test->bp[i].isSoftHyphen ? "SHY" : "0"); + if (g_actual_bp[i].isSoftHyphen) + ok(!g_actual_bp[i].isWhitespace, "%s: soft hyphen marked as a whitespace\n", + wine_dbgstr_wn(&test->text[i], 1)); text++; i++; } diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c index bc49b2f..bf46df8 100644 --- a/dlls/dwrite/tests/layout.c +++ b/dlls/dwrite/tests/layout.c @@ -2025,6 +2025,8 @@ todo_wine for (i = 0; i < count; i++) { ok(metrics[i].length == 1, "%d: got %d\n", i, metrics[i].length); ok(metrics[i].isSoftHyphen == (i == count - 2), "%d: got %d\n", i, metrics[i].isSoftHyphen); + if (metrics[i].isSoftHyphen) + ok(!metrics[i].isWhitespace, "%u: got %d\n", i, metrics[i].isWhitespace); if (metrics[i].isNewline) { if (i == 17 || i == 19) todo_wine ok(metrics[i].width == 0.0f, "%u: got width %f\n", i, metrics[i].width);

1 0

Nikolay Sivov : dwrite: Improve SetScriptAnalysis()/SetBidiLevel() tracing.
by Alexandre Julliard Feb. 2, 2016

Feb. 2, 2016

Module: wine Branch: master Commit: e94264e6bde1e733e055f48be54540a958785352 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e94264e6bde1e733e055f48be… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Feb 2 01:41:11 2016 +0300 dwrite: Improve SetScriptAnalysis()/SetBidiLevel() tracing. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/analyzer.c | 5 +++++ dlls/dwrite/dwrite_private.h | 2 ++ dlls/dwrite/layout.c | 4 ++-- dlls/dwrite/tests/layout.c | 2 +- 4 files changed, 10 insertions(+), 3 deletions(-) diff --git a/dlls/dwrite/analyzer.c b/dlls/dwrite/analyzer.c index 4b21f11..0f88fd9 100644 --- a/dlls/dwrite/analyzer.c +++ b/dlls/dwrite/analyzer.c @@ -177,6 +177,11 @@ static const struct dwritescript_properties dwritescripts_properties[Script_Last }; #undef _OT +const char *debugstr_sa_script(UINT16 script) +{ + return script < Script_LastId ? debugstr_an((char*)&dwritescripts_properties[script].props.isoScriptCode, 4): "not defined"; +} + struct dwrite_numbersubstitution { IDWriteNumberSubstitution IDWriteNumberSubstitution_iface; LONG ref; diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index 79b34a5..ce08572 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -99,6 +99,8 @@ static inline const char *debugstr_matrix(const DWRITE_MATRIX *m) m->dx, m->dy); } +const char *debugstr_sa_script(UINT16) DECLSPEC_HIDDEN; + static inline unsigned short get_table_entry(const unsigned short *table, WCHAR ch) { return table[table[table[ch >> 8] + ((ch >> 4) & 0x0f)] + (ch & 0xf)]; diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index d281243..93c9c7b 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -3977,7 +3977,7 @@ static HRESULT WINAPI dwritetextlayout_sink_SetScriptAnalysis(IDWriteTextAnalysi struct dwrite_textlayout *layout = impl_from_IDWriteTextAnalysisSink1(iface); struct layout_run *run; - TRACE("%u %u script=%d\n", position, length, sa->script); + TRACE("[%u,%u) script=%u:%s\n", position, position + length, sa->script, debugstr_sa_script(sa->script)); run = alloc_layout_run(LAYOUT_RUN_REGULAR); if (!run) @@ -4009,7 +4009,7 @@ static HRESULT WINAPI dwritetextlayout_sink_SetBidiLevel(IDWriteTextAnalysisSink struct dwrite_textlayout *layout = impl_from_IDWriteTextAnalysisSink1(iface); struct layout_run *cur_run; - TRACE("%u %u %u %u\n", position, length, explicitLevel, resolvedLevel); + TRACE("[%u,%u) %u %u\n", position, position + length, explicitLevel, resolvedLevel); LIST_FOR_EACH_ENTRY(cur_run, &layout->runs, struct layout_run, entry) { struct regular_layout_run *cur = &cur_run->u.regular; diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c index fe760c6..bc49b2f 100644 --- a/dlls/dwrite/tests/layout.c +++ b/dlls/dwrite/tests/layout.c @@ -1410,7 +1410,7 @@ static const struct drawcall_entry draw_seq2[] = { }; static const struct drawcall_entry draw_seq3[] = { - { DRAW_GLYPHRUN }, + { DRAW_GLYPHRUN, {0x202a,0x202c,0} }, { DRAW_GLYPHRUN, {'a','b',0} }, { DRAW_LAST_KIND } };

1 0

Henri Verbeet : ddraw: Use wined3d_resource_map() in d3d_texture2_Load().
by Alexandre Julliard Feb. 2, 2016

Feb. 2, 2016

Module: wine Branch: master Commit: 6b2a080372ae49cdde6b7752de5de20142ce2a70 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6b2a080372ae49cdde6b7752d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Feb 1 18:42:12 2016 +0100 ddraw: Use wined3d_resource_map() in d3d_texture2_Load(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/surface.c | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 25aa9b8..6a07cd7 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -5062,6 +5062,7 @@ static HRESULT WINAPI d3d_texture2_Load(IDirect3DTexture2 *iface, IDirect3DTextu { struct ddraw_surface *dst_surface = impl_from_IDirect3DTexture2(iface); struct ddraw_surface *src_surface = unsafe_impl_from_IDirect3DTexture2(src_texture); + struct wined3d_resource *dst_resource, *src_resource; HRESULT hr; TRACE("iface %p, src_texture %p.\n", iface, src_texture); @@ -5074,6 +5075,9 @@ static HRESULT WINAPI d3d_texture2_Load(IDirect3DTexture2 *iface, IDirect3DTextu wined3d_mutex_lock(); + dst_resource = wined3d_texture_get_resource(dst_surface->wined3d_texture); + src_resource = wined3d_texture_get_resource(src_surface->wined3d_texture); + if (((src_surface->surface_desc.ddsCaps.dwCaps & DDSCAPS_MIPMAP) != (dst_surface->surface_desc.ddsCaps.dwCaps & DDSCAPS_MIPMAP)) || (src_surface->surface_desc.u2.dwMipMapCount != dst_surface->surface_desc.u2.dwMipMapCount)) @@ -5131,22 +5135,19 @@ static HRESULT WINAPI d3d_texture2_Load(IDirect3DTexture2 *iface, IDirect3DTextu DDCKEY_SRCBLT, &src_desc->ddckCKSrcBlt); } - /* Copy the main memory texture into the surface that corresponds - * to the OpenGL texture object. */ - - hr = wined3d_surface_map(src_surface->wined3d_surface, &src_map_desc, NULL, 0); - if (FAILED(hr)) + if (FAILED(hr = wined3d_resource_map(src_resource, + src_surface->sub_resource_idx, &src_map_desc, NULL, 0))) { ERR("Failed to lock source surface, hr %#x.\n", hr); wined3d_mutex_unlock(); return D3DERR_TEXTURE_LOAD_FAILED; } - hr = wined3d_surface_map(dst_surface->wined3d_surface, &dst_map_desc, NULL, 0); - if (FAILED(hr)) + if (FAILED(hr = wined3d_resource_map(dst_resource, + dst_surface->sub_resource_idx, &dst_map_desc, NULL, 0))) { ERR("Failed to lock destination surface, hr %#x.\n", hr); - wined3d_surface_unmap(src_surface->wined3d_surface); + wined3d_resource_unmap(src_resource, src_surface->sub_resource_idx); wined3d_mutex_unlock(); return D3DERR_TEXTURE_LOAD_FAILED; } @@ -5156,8 +5157,8 @@ static HRESULT WINAPI d3d_texture2_Load(IDirect3DTexture2 *iface, IDirect3DTextu else memcpy(dst_map_desc.data, src_map_desc.data, src_map_desc.row_pitch * src_desc->dwHeight); - wined3d_surface_unmap(src_surface->wined3d_surface); - wined3d_surface_unmap(dst_surface->wined3d_surface); + wined3d_resource_unmap(dst_resource, dst_surface->sub_resource_idx); + wined3d_resource_unmap(src_resource, src_surface->sub_resource_idx); } if (src_surface->surface_desc.ddsCaps.dwCaps & DDSCAPS_MIPMAP)

1 0

Henri Verbeet : wined3d: Use wined3d_texture_get_dc() in device_load_logo( ).
by Alexandre Julliard Feb. 2, 2016

Feb. 2, 2016

Module: wine Branch: master Commit: 9bdab23bf7a57e92656782907ae2ac67ed292f0b URL: http://source.winehq.org/git/wine.git/?a=commit;h=9bdab23bf7a57e92656782907… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Feb 1 18:42:11 2016 +0100 wined3d: Use wined3d_texture_get_dc() in device_load_logo(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 10 ++--- dlls/wined3d/surface.c | 96 +----------------------------------------- dlls/wined3d/texture.c | 87 +++++++++++++++++++++++++++++++++++++- dlls/wined3d/wined3d_private.h | 3 +- 4 files changed, 93 insertions(+), 103 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9bdab23bf7a57e9265678…

1 0

Christopher Thielen : comctl32: Ensure that trackbar respond only to changes in WM_CAPTURECHANGED handler.
by Alexandre Julliard Feb. 2, 2016

Feb. 2, 2016

Module: wine Branch: master Commit: 0bea2f73d37481546d19bd9f380d9390c3eb9ddb URL: http://source.winehq.org/git/wine.git/?a=commit;h=0bea2f73d37481546d19bd9f3… Author: Christopher Thielen <cthielen(a)gmail.com> Date: Sun Jan 31 20:26:47 2016 -0800 comctl32: Ensure that trackbar respond only to changes in WM_CAPTURECHANGED handler. Signed-off-by: Christopher Thielen <cthielen(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/trackbar.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/comctl32/trackbar.c b/dlls/comctl32/trackbar.c index 87d955c..12c3e9d 100644 --- a/dlls/comctl32/trackbar.c +++ b/dlls/comctl32/trackbar.c @@ -1979,6 +1979,7 @@ TRACKBAR_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) case WM_CAPTURECHANGED: + if (hwnd == (HWND)lParam) return 0; return TRACKBAR_CaptureChanged (infoPtr); case WM_CREATE:

1 0

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

Feb. 2, 2016

Module: wine Branch: master Commit: f71bd60bcdad75393b8bf4572b09af53e787489b URL: http://source.winehq.org/git/wine.git/?a=commit;h=f71bd60bcdad75393b8bf4572… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Feb 2 11:32:32 2016 +0100 wined3d: Recognize SM4 dcl_output_siv 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 | 4 +++- dlls/wined3d/shader_sm4.c | 5 ++++- dlls/wined3d/wined3d_private.h | 1 + 5 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 2be7c88..6b35042 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -5235,6 +5235,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL /* WINED3DSIH_DCL_INPUT_PS_SIV */ NULL, /* WINED3DSIH_DCL_INPUT_SGV */ NULL, /* WINED3DSIH_DCL_OUTPUT */ NULL, + /* WINED3DSIH_DCL_OUTPUT_SIV */ NULL, /* WINED3DSIH_DCL_OUTPUT_TOPOLOGY */ shader_hw_nop, /* WINED3DSIH_DCL_SAMPLER */ NULL, /* WINED3DSIH_DCL_TEMPS */ NULL, diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 5220a22..926c1e3 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -8023,6 +8023,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_DCL_INPUT_PS_SIV */ NULL, /* WINED3DSIH_DCL_INPUT_SGV */ shader_glsl_nop, /* WINED3DSIH_DCL_OUTPUT */ shader_glsl_nop, + /* WINED3DSIH_DCL_OUTPUT_SIV */ shader_glsl_nop, /* WINED3DSIH_DCL_OUTPUT_TOPOLOGY */ shader_glsl_nop, /* WINED3DSIH_DCL_SAMPLER */ NULL, /* WINED3DSIH_DCL_TEMPS */ shader_glsl_nop, diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 8f36fc6..6315bf5 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -63,6 +63,7 @@ static const char * const shader_opcode_names[] = /* WINED3DSIH_DCL_INPUT_PS_SIV */ "dcl_input_ps_siv", /* WINED3DSIH_DCL_INPUT_SGV */ "dcl_input_sgv", /* WINED3DSIH_DCL_OUTPUT */ "dcl_output", + /* WINED3DSIH_DCL_OUTPUT_SIV */ "dcl_output_siv", /* WINED3DSIH_DCL_OUTPUT_TOPOLOGY */ "dcl_outputTopology", /* WINED3DSIH_DCL_SAMPLER */ "dcl_sampler", /* WINED3DSIH_DCL_TEMPS */ "dcl_temps", @@ -1918,7 +1919,8 @@ static void shader_trace_init(const struct wined3d_shader_frontend *fe, void *fe shader_dump_dst_param(&ins.declaration.dst, &shader_version); } else if (ins.handler_idx == WINED3DSIH_DCL_INPUT_PS_SGV - || ins.handler_idx == WINED3DSIH_DCL_INPUT_SGV) + || ins.handler_idx == WINED3DSIH_DCL_INPUT_SGV + || ins.handler_idx == WINED3DSIH_DCL_OUTPUT_SIV) { TRACE("%s ", shader_opcode_names[ins.handler_idx]); shader_dump_dst_param(&ins.declaration.register_semantic.reg, &shader_version); diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index 5b50889..11c0494 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -167,6 +167,7 @@ enum wined3d_sm4_opcode WINED3D_SM4_OP_DCL_INPUT_PS_SGV = 0x63, WINED3D_SM4_OP_DCL_INPUT_PS_SIV = 0x64, WINED3D_SM4_OP_DCL_OUTPUT = 0x65, + WINED3D_SM4_OP_DCL_OUTPUT_SIV = 0x67, WINED3D_SM4_OP_DCL_TEMPS = 0x68, }; @@ -375,6 +376,7 @@ static const struct wined3d_sm4_opcode_info opcode_table[] = {WINED3D_SM4_OP_DCL_INPUT_PS_SGV, WINED3DSIH_DCL_INPUT_PS_SGV, "", ""}, {WINED3D_SM4_OP_DCL_INPUT_PS_SIV, WINED3DSIH_DCL_INPUT_PS_SIV, "", ""}, {WINED3D_SM4_OP_DCL_OUTPUT, WINED3DSIH_DCL_OUTPUT, "", ""}, + {WINED3D_SM4_OP_DCL_OUTPUT_SIV, WINED3DSIH_DCL_OUTPUT_SIV, "", ""}, {WINED3D_SM4_OP_DCL_TEMPS, WINED3DSIH_DCL_TEMPS, "", ""}, }; @@ -992,7 +994,8 @@ static void shader_sm4_read_instruction(void *data, const DWORD **ptr, struct wi shader_sm4_read_dst_param(priv, &p, WINED3D_DATA_FLOAT, &ins->declaration.dst); } else if (opcode == WINED3D_SM4_OP_DCL_INPUT_PS_SGV - || opcode == WINED3D_SM4_OP_DCL_INPUT_SGV) + || opcode == WINED3D_SM4_OP_DCL_INPUT_SGV + || opcode == WINED3D_SM4_OP_DCL_OUTPUT_SIV) { shader_sm4_read_dst_param(priv, &p, WINED3D_DATA_FLOAT, &ins->declaration.register_semantic.reg); ins->declaration.register_semantic.sysval_semantic = *p++; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 73b4d14..624a0e9 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -507,6 +507,7 @@ enum WINED3D_SHADER_INSTRUCTION_HANDLER WINED3DSIH_DCL_INPUT_PS_SIV, WINED3DSIH_DCL_INPUT_SGV, WINED3DSIH_DCL_OUTPUT, + WINED3DSIH_DCL_OUTPUT_SIV, WINED3DSIH_DCL_OUTPUT_TOPOLOGY, WINED3DSIH_DCL_SAMPLER, WINED3DSIH_DCL_TEMPS,

1 0