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

Nikolay Sivov : po: Update Russian translation.
by Alexandre Julliard March 3, 2016

March 3, 2016

Module: wine Branch: master Commit: 35845ddc5fc69f0b47cb1936b28cbf1bab769c27 URL: http://source.winehq.org/git/wine.git/?a=commit;h=35845ddc5fc69f0b47cb1936b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Mar 3 11:26:29 2016 +0300 po: Update Russian translation. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/ru.po | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/po/ru.po b/po/ru.po index 517fa14..aa28fdb 100644 --- a/po/ru.po +++ b/po/ru.po @@ -5,14 +5,14 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2016-02-14 19:13+0300\n" +"PO-Revision-Date: 2016-03-03 11:25+0300\n" "Last-Translator: Nikolay Sivov <nsivov(a)codeweavers.com>\n" "Language-Team: Russian\n" "Language: ru\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Poedit 1.8.7\n" +"X-Generator: Poedit 1.8.7.1\n" #: appwiz.rc:58 msgid "Install/Uninstall" @@ -11631,10 +11631,8 @@ msgid "Are you sure you want to delete the registry key '%1'?" msgstr "Вы точно хотите удалить ключ реестра «%1»?" #: reg.rc:52 -#, fuzzy -#| msgid "reg: The option [/d] must be followed by a valid integer\n" msgid "reg: The option [/d] must be followed by a valid string\n" -msgstr "reg: за опцией [/d] должно следовать целое число\n" +msgstr "reg: за опцией [/d] должна следовать строка\n" #: regedit.rc:34 msgid "&Registry"

1 0

Sebastian Lackner : services: Move process related fields into a separate struct.
by Alexandre Julliard March 3, 2016

March 3, 2016

Module: wine Branch: master Commit: 7fc3f72de77d0ab69a91f9efc38c78956de7bffb URL: http://source.winehq.org/git/wine.git/?a=commit;h=7fc3f72de77d0ab69a91f9efc… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Mar 3 06:28:16 2016 +0100 services: Move process related fields into a separate struct. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/services/rpc.c | 28 ++++++------ programs/services/services.c | 100 +++++++++++++++++++++++++++---------------- programs/services/services.h | 20 ++++++--- 3 files changed, 92 insertions(+), 56 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7fc3f72de77d0ab69a91f…

1 0

Sebastian Lackner : services: Store a separate variable instead of clearing control_mutex.
by Alexandre Julliard March 3, 2016

March 3, 2016

Module: wine Branch: master Commit: 00b1184f1092ecc6ab6b7ef7a9e6213c4b6fc54c URL: http://source.winehq.org/git/wine.git/?a=commit;h=00b1184f1092ecc6ab6b7ef7a… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Mar 3 06:26:26 2016 +0100 services: Store a separate variable instead of clearing control_mutex. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/services/rpc.c | 53 ++++++++++++++++++-------------------------- programs/services/services.c | 1 + programs/services/services.h | 1 + 3 files changed, 24 insertions(+), 31 deletions(-) diff --git a/programs/services/rpc.c b/programs/services/rpc.c index 6951fb8..ece8dce 100644 --- a/programs/services/rpc.c +++ b/programs/services/rpc.c @@ -1137,7 +1137,8 @@ DWORD __cdecl svcctl_ControlService( break; } - if (result==ERROR_SUCCESS && !service->service_entry->control_mutex) { + if (result == ERROR_SUCCESS && service->service_entry->force_shutdown) + { result = ERROR_SERVICE_CANNOT_ACCEPT_CTRL; service_terminate(service->service_entry); } @@ -1164,45 +1165,35 @@ DWORD __cdecl svcctl_ControlService( return ERROR_INVALID_SERVICE_CONTROL; } - /* prevent races by caching control_mutex and clearing it on - * stop instead of outside the services lock */ - control_mutex = service->service_entry->control_mutex; + /* Remember that we tried to shutdown this service. When the service is + * still running on the second invocation, it will be forcefully killed. */ if (dwControl == SERVICE_CONTROL_STOP) - service->service_entry->control_mutex = NULL; + service->service_entry->force_shutdown = TRUE; + control_mutex = service->service_entry->control_mutex; service_unlock(service->service_entry); ret = WaitForSingleObject(control_mutex, 30000); - if (ret == WAIT_OBJECT_0) - { - service_send_control(service->service_entry, dwControl, &result); - - if (lpServiceStatus) - { - service_lock(service->service_entry); - lpServiceStatus->dwServiceType = service->service_entry->status.dwServiceType; - lpServiceStatus->dwCurrentState = service->service_entry->status.dwCurrentState; - lpServiceStatus->dwControlsAccepted = service->service_entry->status.dwControlsAccepted; - lpServiceStatus->dwWin32ExitCode = service->service_entry->status.dwWin32ExitCode; - lpServiceStatus->dwServiceSpecificExitCode = service->service_entry->status.dwServiceSpecificExitCode; - lpServiceStatus->dwCheckPoint = service->service_entry->status.dwCheckPoint; - lpServiceStatus->dwWaitHint = service->service_entry->status.dwWaitHint; - service_unlock(service->service_entry); - } + if (ret != WAIT_OBJECT_0) + return ERROR_SERVICE_REQUEST_TIMEOUT; - if (dwControl == SERVICE_CONTROL_STOP) - CloseHandle(control_mutex); - else - ReleaseMutex(control_mutex); + service_send_control(service->service_entry, dwControl, &result); - return result; - } - else + if (lpServiceStatus) { - if (dwControl == SERVICE_CONTROL_STOP) - CloseHandle(control_mutex); - return ERROR_SERVICE_REQUEST_TIMEOUT; + service_lock(service->service_entry); + lpServiceStatus->dwServiceType = service->service_entry->status.dwServiceType; + lpServiceStatus->dwCurrentState = service->service_entry->status.dwCurrentState; + lpServiceStatus->dwControlsAccepted = service->service_entry->status.dwControlsAccepted; + lpServiceStatus->dwWin32ExitCode = service->service_entry->status.dwWin32ExitCode; + lpServiceStatus->dwServiceSpecificExitCode = service->service_entry->status.dwServiceSpecificExitCode; + lpServiceStatus->dwCheckPoint = service->service_entry->status.dwCheckPoint; + lpServiceStatus->dwWaitHint = service->service_entry->status.dwWaitHint; + service_unlock(service->service_entry); } + + ReleaseMutex(control_mutex); + return result; } DWORD __cdecl svcctl_CloseServiceHandle( diff --git a/programs/services/services.c b/programs/services/services.c index c45aed3..02a46f9 100644 --- a/programs/services/services.c +++ b/programs/services/services.c @@ -852,6 +852,7 @@ DWORD service_start(struct service_entry *service, DWORD service_argc, LPCWSTR * CloseHandle(service->control_pipe); service->control_mutex = CreateMutexW(NULL, TRUE, NULL); + service->force_shutdown = FALSE; if (!service->status_changed_event) service->status_changed_event = CreateEventW(NULL, FALSE, FALSE, NULL); diff --git a/programs/services/services.h b/programs/services/services.h index a9e6313..7f43b22 100644 --- a/programs/services/services.h +++ b/programs/services/services.h @@ -48,6 +48,7 @@ struct service_entry HANDLE control_pipe; HANDLE overlapped_event; HANDLE status_changed_event; + BOOL force_shutdown; BOOL marked_for_delete; BOOL is_wow64; };

1 0

Sebastian Lackner : services/tests: Consistently terminate service_{ok, trace} strings with linebreak.
by Alexandre Julliard March 3, 2016

March 3, 2016

Module: wine Branch: master Commit: a80c0d3cf2efdaac3043c6603d0982daa3aa1434 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a80c0d3cf2efdaac3043c6603… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Mar 3 06:24:59 2016 +0100 services/tests: Consistently terminate service_{ok,trace} strings with linebreak. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/services/tests/service.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/programs/services/tests/service.c b/programs/services/tests/service.c index 203882d..e228069 100644 --- a/programs/services/tests/service.c +++ b/programs/services/tests/service.c @@ -95,9 +95,9 @@ static void WINAPI service_main(DWORD argc, char **argv) SERVICE_STATUS status; BOOL res; - service_ok(argc == 1, "argc = %d", argc); + service_ok(argc == 1, "argc = %d\n", argc); if(argc) - service_ok(!strcmp(argv[0], service_name), "argv[0] = %s, expected %s", argv[0], service_name); + service_ok(!strcmp(argv[0], service_name), "argv[0] = %s, expected %s\n", argv[0], service_name); service_handle = pRegisterServiceCtrlHandlerExA(service_name, service_handler, NULL); service_ok(service_handle != NULL, "RegisterServiceCtrlHandlerEx failed: %u\n", GetLastError()); @@ -112,7 +112,7 @@ static void WINAPI service_main(DWORD argc, char **argv) status.dwCheckPoint = 0; status.dwWaitHint = 10000; res = SetServiceStatus(service_handle, &status); - service_ok(res, "SetServiceStatus(SERVICE_RUNNING) failed: %u", GetLastError()); + service_ok(res, "SetServiceStatus(SERVICE_RUNNING) failed: %u\n", GetLastError()); service_event("RUNNING"); @@ -121,7 +121,7 @@ static void WINAPI service_main(DWORD argc, char **argv) status.dwCurrentState = SERVICE_STOPPED; status.dwControlsAccepted = 0; res = SetServiceStatus(service_handle, &status); - service_ok(res, "SetServiceStatus(SERVICE_STOPPED) failed: %u", GetLastError()); + service_ok(res, "SetServiceStatus(SERVICE_STOPPED) failed: %u\n", GetLastError()); } static void service_process(void (WINAPI *p_service_main)(DWORD, char **)) @@ -141,7 +141,7 @@ static void service_process(void (WINAPI *p_service_main)(DWORD, char **)) if(pipe_handle == INVALID_HANDLE_VALUE) return; - service_trace("Starting..."); + service_trace("Starting...\n"); service_stop_event = CreateEventA(NULL, TRUE, FALSE, NULL); service_ok(service_stop_event != NULL, "Could not create event: %u\n", GetLastError()); @@ -191,9 +191,9 @@ static void WINAPI no_stop_main(DWORD argc, char **argv) SERVICE_STATUS status; BOOL res; - service_ok(argc == 1, "argc = %d", argc); + service_ok(argc == 1, "argc = %d\n", argc); if(argc) - service_ok(!strcmp(argv[0], service_name), "argv[0] = %s, expected %s", argv[0], service_name); + service_ok(!strcmp(argv[0], service_name), "argv[0] = %s, expected %s\n", argv[0], service_name); service_handle = pRegisterServiceCtrlHandlerExA(service_name, no_stop_handler, NULL); service_ok(service_handle != NULL, "RegisterServiceCtrlHandlerEx failed: %u\n", GetLastError()); @@ -208,7 +208,7 @@ static void WINAPI no_stop_main(DWORD argc, char **argv) status.dwCheckPoint = 0; status.dwWaitHint = 10000; res = SetServiceStatus(service_handle, &status); - service_ok(res, "SetServiceStatus(SERVICE_RUNNING) failed: %u", GetLastError()); + service_ok(res, "SetServiceStatus(SERVICE_RUNNING) failed: %u\n", GetLastError()); service_event("RUNNING"); } @@ -292,11 +292,11 @@ static DWORD WINAPI pipe_thread(void *arg) for(ptr = buf; ptr < buf+read; ptr += strlen(ptr)+1) { if(!strncmp(ptr, "TRACE:", 6)) { - trace("service trace: %s\n", ptr+6); + trace("service trace: %s", ptr+6); }else if(!strncmp(ptr, "OK:", 3)) { - ok(1, "service: %s\n", ptr+3); + ok(1, "service: %s", ptr+3); }else if(!strncmp(ptr, "FAIL:", 5)) { - ok(0, "service: %s\n", ptr+5); + ok(0, "service: %s", ptr+5); }else if(!strncmp(ptr, "EVENT:", 6)) { trace("service event: %s\n", ptr+6); EnterCriticalSection(&event_cs);

1 0

Nikolay Sivov : dwrite: Update to IDWriteFontFace3.
by Alexandre Julliard March 3, 2016

March 3, 2016

Module: wine Branch: master Commit: 77c5ed607aea965c1122f3a17124ea25c0ac6c4b URL: http://source.winehq.org/git/wine.git/?a=commit;h=77c5ed607aea965c1122f3a17… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Mar 3 08:16:25 2016 +0300 dwrite: Update to IDWriteFontFace3. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/dwrite_private.h | 24 +-- dlls/dwrite/font.c | 388 ++++++++++++++++++++++++++++--------------- dlls/dwrite/freetype.c | 44 ++--- dlls/dwrite/main.c | 4 +- include/dwrite_3.idl | 2 +- 5 files changed, 290 insertions(+), 172 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=77c5ed607aea965c1122f…

1 0

Józef Kucia : wined3d: Add support for WINED3DFMT_R11G11B10_FLOAT format.
by Alexandre Julliard March 3, 2016

March 3, 2016

Module: wine Branch: master Commit: f50818171866ec2477895389667ac9879b775817 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f50818171866ec24778953896… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Mar 3 12:58:20 2016 +0100 wined3d: Add support for WINED3DFMT_R11G11B10_FLOAT format. 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/directx.c | 2 ++ dlls/wined3d/utils.c | 6 ++++++ dlls/wined3d/wined3d_gl.h | 1 + 3 files changed, 9 insertions(+) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 5f995ce..60fb5ac 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -185,6 +185,7 @@ static const struct wined3d_extension_map gl_extension_map[] = {"GL_EXT_gpu_program_parameters", EXT_GPU_PROGRAM_PARAMETERS }, {"GL_EXT_gpu_shader4", EXT_GPU_SHADER4 }, {"GL_EXT_packed_depth_stencil", EXT_PACKED_DEPTH_STENCIL }, + {"GL_EXT_packed_float", EXT_PACKED_FLOAT }, {"GL_EXT_point_parameters", EXT_POINT_PARAMETERS }, {"GL_EXT_provoking_vertex", EXT_PROVOKING_VERTEX }, {"GL_EXT_secondary_color", EXT_SECONDARY_COLOR }, @@ -3411,6 +3412,7 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter, DWORD {ARB_TEXTURE_FLOAT, MAKEDWORD_VERSION(3, 0)}, {ARB_TEXTURE_RG, MAKEDWORD_VERSION(3, 0)}, {EXT_DRAW_BUFFERS2, MAKEDWORD_VERSION(3, 0)}, + {EXT_PACKED_FLOAT, MAKEDWORD_VERSION(3, 0)}, {EXT_TEXTURE_INTEGER, MAKEDWORD_VERSION(3, 0)}, /* We don't want to enable EXT_GPU_SHADER4: even though similar * functionality is available in core GL 3.0 / GLSL 1.30, it's different diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 8e3d64a..c567380 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -100,6 +100,7 @@ static const struct wined3d_format_channels formats[] = {WINED3DFMT_R8G8_SNORM_Cx, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0}, {WINED3DFMT_R16G16_SINT, 16, 16, 0, 0, 0, 16, 0, 0, 4, 0, 0}, {WINED3DFMT_R16G16B16A16_SINT, 16, 16, 16, 16, 0, 16, 32, 48, 8, 0, 0}, + {WINED3DFMT_R11G11B10_FLOAT, 11, 11, 10, 0, 0, 11, 22, 0, 4, 0, 0}, /* Palettized formats */ {WINED3DFMT_P8_UINT_A8_UNORM, 0, 0, 0, 8, 0, 0, 0, 8, 2, 0, 0}, {WINED3DFMT_P8_UINT, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0}, @@ -273,6 +274,7 @@ static const struct wined3d_format_base_flags format_base_flags[] = {WINED3DFMT_R8G8B8X8_UNORM, WINED3DFMT_FLAG_GETDC}, {WINED3DFMT_ATI1N, WINED3DFMT_FLAG_BROKEN_PITCH}, {WINED3DFMT_ATI2N, WINED3DFMT_FLAG_BROKEN_PITCH}, + {WINED3DFMT_R11G11B10_FLOAT, WINED3DFMT_FLAG_FLOAT}, {WINED3DFMT_D32_FLOAT, WINED3DFMT_FLAG_FLOAT}, {WINED3DFMT_S8_UINT_D24_FLOAT, WINED3DFMT_FLAG_FLOAT}, }; @@ -1114,6 +1116,10 @@ static const struct wined3d_format_texture_info format_texture_info[] = WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_RENDERTARGET | WINED3DFMT_FLAG_VTF, ARB_TEXTURE_FLOAT, NULL}, + {WINED3DFMT_R11G11B10_FLOAT, GL_R11F_G11F_B10F, GL_R11F_G11F_B10F, 0, + GL_RGB, GL_UNSIGNED_INT_10F_11F_11F_REV, 0, + WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_RENDERTARGET, + EXT_PACKED_FLOAT}, /* Palettized formats */ {WINED3DFMT_P8_UINT, GL_ALPHA8, GL_ALPHA8, 0, GL_ALPHA, GL_UNSIGNED_BYTE, 0, diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index be4e308..51053c5 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -119,6 +119,7 @@ enum wined3d_gl_extension EXT_GPU_PROGRAM_PARAMETERS, EXT_GPU_SHADER4, EXT_PACKED_DEPTH_STENCIL, + EXT_PACKED_FLOAT, EXT_POINT_PARAMETERS, EXT_PROVOKING_VERTEX, EXT_SECONDARY_COLOR,

1 0

Józef Kucia : d3d10core/tests: Add test for DXGI_FORMAT_BC5_UNORM format.
by Alexandre Julliard March 3, 2016

March 3, 2016

Module: wine Branch: master Commit: 90589e697e81694e9bb17349c47800bb1ec52f87 URL: http://source.winehq.org/git/wine.git/?a=commit;h=90589e697e81694e9bb17349c… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Mar 3 12:58:19 2016 +0100 d3d10core/tests: Add test for DXGI_FORMAT_BC5_UNORM format. 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/d3d10core/tests/device.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index 806a1a2..d644603 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -3613,6 +3613,13 @@ static void test_texture(void) 0x10, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x10, 0x7f, 0xb6, 0x6d, 0xdb, 0xb6, 0x6d, 0xdb, }; + static const BYTE bc5_data[4 * 16] = + { + 0x10, 0x7f, 0x77, 0x39, 0x05, 0x00, 0x00, 0x00, 0x10, 0x7f, 0x77, 0x39, 0x05, 0x00, 0x00, 0x00, + 0x10, 0x7f, 0x49, 0x92, 0x24, 0x49, 0x92, 0x24, 0x10, 0x7f, 0x49, 0x92, 0x24, 0x49, 0x92, 0x24, + 0x10, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x10, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0x10, 0x7f, 0xb6, 0x6d, 0xdb, 0xb6, 0x6d, 0xdb, 0x10, 0x7f, 0xb6, 0x6d, 0xdb, 0xb6, 0x6d, 0xdb, + }; static const struct texture rgba_texture = { 4, 4, 3, DXGI_FORMAT_R8G8B8A8_UNORM, @@ -3628,6 +3635,7 @@ static void test_texture(void) static const struct texture bc2_texture = {8, 8, 1, DXGI_FORMAT_BC2_UNORM, {{bc2_data, 2 * 16}}}; static const struct texture bc3_texture = {8, 8, 1, DXGI_FORMAT_BC3_UNORM, {{bc3_data, 2 * 16}}}; static const struct texture bc4_texture = {8, 8, 1, DXGI_FORMAT_BC4_UNORM, {{bc4_data, 2 * 8}}}; + static const struct texture bc5_texture = {8, 8, 1, DXGI_FORMAT_BC5_UNORM, {{bc5_data, 2 * 16}}}; static const struct texture bc1_texture_srgb = {8, 8, 1, DXGI_FORMAT_BC1_UNORM_SRGB, {{bc1_data, 2 * 8}}}; static const struct texture bc2_texture_srgb = {8, 8, 1, DXGI_FORMAT_BC2_UNORM_SRGB, {{bc2_data, 2 * 16}}}; static const struct texture bc3_texture_srgb = {8, 8, 1, DXGI_FORMAT_BC3_UNORM_SRGB, {{bc3_data, 2 * 16}}}; @@ -3677,6 +3685,13 @@ static void test_texture(void) 0xff0000ff, 0xff0000ff, 0xff000000, 0xff000000, 0xff0000ff, 0xff0000ff, 0xff000000, 0xff000000, }; + static const DWORD bc5_colors[] = + { + 0xff002626, 0xff001010, 0xff007f7f, 0xff007f7f, + 0xff001010, 0xff001010, 0xff007f7f, 0xff007f7f, + 0xff00ffff, 0xff00ffff, 0xff000000, 0xff000000, + 0xff00ffff, 0xff00ffff, 0xff000000, 0xff000000, + }; static const DWORD sint8_colors[] = { 0x7e80807e, 0x7e807e7e, 0x7e807e80, 0x7e7e7e80, @@ -3712,6 +3727,7 @@ static void test_texture(void) {&ps_ld, &bc3_texture, D3D10_FILTER_MIN_MAG_MIP_POINT, 0.0f, 0.0f, 0.0f, 0.0f, bc_colors}, {&ps_ld, &bc3_texture, D3D10_FILTER_MIN_MAG_MIP_POINT, 0.0f, 0.0f, 0.0f, 1.0f, zero_colors}, {&ps_ld, &bc4_texture, D3D10_FILTER_MIN_MAG_MIP_POINT, 0.0f, 0.0f, 0.0f, 0.0f, bc4_colors}, + {&ps_ld, &bc5_texture, D3D10_FILTER_MIN_MAG_MIP_POINT, 0.0f, 0.0f, 0.0f, 0.0f, bc5_colors}, {&ps_ld, &bc1_texture_srgb, D3D10_FILTER_MIN_MAG_MIP_POINT, 0.0f, 0.0f, 0.0f, 0.0f, bc_colors}, {&ps_ld, &bc2_texture_srgb, D3D10_FILTER_MIN_MAG_MIP_POINT, 0.0f, 0.0f, 0.0f, 0.0f, bc_colors}, {&ps_ld, &bc3_texture_srgb, D3D10_FILTER_MIN_MAG_MIP_POINT, 0.0f, 0.0f, 0.0f, 0.0f, bc_colors}, @@ -3721,6 +3737,7 @@ static void test_texture(void) {&ps_sample, &bc2_texture, D3D10_FILTER_MIN_MAG_MIP_POINT, 0.0f, 0.0f, 0.0f, 0.0f, bc_colors}, {&ps_sample, &bc3_texture, D3D10_FILTER_MIN_MAG_MIP_POINT, 0.0f, 0.0f, 0.0f, 0.0f, bc_colors}, {&ps_sample, &bc4_texture, D3D10_FILTER_MIN_MAG_MIP_POINT, 0.0f, 0.0f, 0.0f, 0.0f, bc4_colors}, + {&ps_sample, &bc5_texture, D3D10_FILTER_MIN_MAG_MIP_POINT, 0.0f, 0.0f, 0.0f, 0.0f, bc5_colors}, {&ps_sample, &rgba_texture, D3D10_FILTER_MIN_MAG_MIP_POINT, 0.0f, 0.0f, 0.0f, 0.0f, rgba_level_0}, {&ps_sample, &rgba_texture, D3D10_FILTER_MIN_MAG_MIP_POINT, 0.0f, 0.0f, D3D10_FLOAT32_MAX, 0.0f, rgba_level_0}, {&ps_sample, &rgba_texture, D3D10_FILTER_MIN_MAG_MIP_POINT, 2.0f, 0.0f, D3D10_FLOAT32_MAX, 0.0f, rgba_level_0},

1 0

Józef Kucia : wined3d: Add support for WINED3DFMT_BC4_UNORM format.
by Alexandre Julliard March 3, 2016

March 3, 2016

Module: wine Branch: master Commit: 24b951389efdd741f3af75ccf93866ea7adba697 URL: http://source.winehq.org/git/wine.git/?a=commit;h=24b951389efdd741f3af75ccf… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Mar 3 12:58:14 2016 +0100 wined3d: Add support for WINED3DFMT_BC4_UNORM format. 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/utils.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 4e33f86..60ff776 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -241,6 +241,7 @@ static const struct wined3d_typed_format_info typed_formats[] = {WINED3DFMT_BC2_UNORM, WINED3DFMT_BC2_TYPELESS, ""}, {WINED3DFMT_BC3_UNORM_SRGB, WINED3DFMT_BC3_TYPELESS, ""}, {WINED3DFMT_BC3_UNORM, WINED3DFMT_BC3_TYPELESS, ""}, + {WINED3DFMT_BC4_UNORM, WINED3DFMT_BC4_TYPELESS, ""}, {WINED3DFMT_B8G8R8A8_UNORM_SRGB, WINED3DFMT_B8G8R8A8_TYPELESS, "uuuu"}, {WINED3DFMT_B8G8R8A8_UNORM, WINED3DFMT_B8G8R8A8_TYPELESS, "uuuu"}, {WINED3DFMT_B8G8R8X8_UNORM_SRGB, WINED3DFMT_B8G8R8X8_TYPELESS, "uuu"}, @@ -294,6 +295,7 @@ static const struct wined3d_format_block_info format_block_info[] = {WINED3DFMT_BC1_UNORM, 4, 4, 8, TRUE}, {WINED3DFMT_BC2_UNORM, 4, 4, 16, TRUE}, {WINED3DFMT_BC3_UNORM, 4, 4, 16, TRUE}, + {WINED3DFMT_BC4_UNORM, 4, 4, 8, TRUE}, {WINED3DFMT_ATI1N, 4, 4, 8, FALSE}, {WINED3DFMT_ATI2N, 4, 4, 16, FALSE}, {WINED3DFMT_YUY2, 2, 1, 4, FALSE}, @@ -1053,6 +1055,11 @@ static const struct wined3d_format_texture_info format_texture_info[] = WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING | WINED3DFMT_FLAG_COMPRESSED, EXT_TEXTURE_COMPRESSION_S3TC, NULL}, + {WINED3DFMT_BC4_UNORM, GL_COMPRESSED_RED_RGTC1, GL_COMPRESSED_RED_RGTC1, 0, + GL_RED, GL_UNSIGNED_BYTE, 0, + WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING + | WINED3DFMT_FLAG_COMPRESSED, + ARB_TEXTURE_COMPRESSION_RGTC, NULL}, /* IEEE formats */ {WINED3DFMT_R32_FLOAT, GL_RGB32F_ARB, GL_RGB32F_ARB, 0, GL_RED, GL_FLOAT, 0,

1 0

Nikolay Sivov : d3drm: Implement AddDestroyCallback/ DeleteDestroyCallback for a viewport.
by Alexandre Julliard March 3, 2016

March 3, 2016

Module: wine Branch: master Commit: 45743b4d9fb792d836e502c01f07a75a1814a602 URL: http://source.winehq.org/git/wine.git/?a=commit;h=45743b4d9fb792d836e502c01… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Mar 3 11:10:21 2016 +0300 d3drm: Implement AddDestroyCallback/DeleteDestroyCallback for a viewport. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3drm/d3drm_main.c | 70 ++++++++++++++++++++++++++++++++-- dlls/d3drm/d3drm_private.h | 8 ++++ dlls/d3drm/tests/d3drm.c | 95 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/d3drm/viewport.c | 29 +++++++++----- 4 files changed, 190 insertions(+), 12 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=45743b4d9fb792d836e50…

1 0

Hans Leidekker : msiexec: Fix manpage markup for repair and logging modifiers.
by Alexandre Julliard March 3, 2016

March 3, 2016

Module: wine Branch: master Commit: 8d4ac88a6b18fa0655e92d292fa847021a55bfc3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d4ac88a6b18fa0655e92d292… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Mar 3 11:42:02 2016 +0100 msiexec: Fix manpage markup for repair and logging modifiers. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/msiexec/msiexec.man.in | 50 ++++++++++++++++++++--------------------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/programs/msiexec/msiexec.man.in b/programs/msiexec/msiexec.man.in index 23b3b58..e7c3798 100644 --- a/programs/msiexec/msiexec.man.in +++ b/programs/msiexec/msiexec.man.in @@ -24,25 +24,25 @@ Same as \fB/x\fR. \fR[\fBp\fR|\fBo\fR|\fBe\fR|\fBd\fR|\fBc\fR|\fBa\fR|\fBu\fR|\fBm\fR|\fBs\fR|\fBv\fR]\ \ \fR{\fIpackage\fR|\fIproductcode\fR} Repair an installation. Default options are \'omus\' -.IP "\fBlp\fR" +.IP "\fBp\fR" Reinstall the file if it is missing. -.IP "\fBlo\fR" +.IP "\fBo\fR" Reinstall the file if it is missing or if any older version is installed. -.IP "\fBle\fR" +.IP "\fBe\fR" Reinstall the file if it is missing, or if the installed version is equal or older. -.IP "\fBld\fR" +.IP "\fBd\fR" Reinstall the file if it is missing or a different version is installed. -.IP "\fBlc\fR" +.IP "\fBc\fR" Reinstall the file if it is missing or the checksum does not match. -.IP "\fBla\fR" +.IP "\fBa\fR" Reinstall all files. -.IP "\fBlu\fR" +.IP "\fBu\fR" Rewrite all required user registry entries. -.IP "\fBlm\fR" +.IP "\fBm\fR" Rewrite all required machine registry entries. -.IP "\fBls\fR" +.IP "\fBs\fR" Overwrite any conflicting shortcuts. -.IP "\fBlv\fR" +.IP "\fBv\fR" Recache the local installation package from the source installation package. .SH PATCHING .IP \fB/p\ \fR{\fIpatch\fR}\ \fR[\fIproperty\fR=\fIfoobar\fR] @@ -65,35 +65,35 @@ Shows a full UI. [\fBi\fR|\fBw\fR|\fBe\fR|\fBa\fR|\fBr\fR|\fBu\fR|\fBc\fR|\fBm\fR|\fBo\fR|\fBp\fR|\fBv\fR]\ [\fB+\fR|\fB!\fR]\ {\fIlogfile\fR} Enable logging to \fIlogfile\fR. Defaults are \'iwearmo\'. -.IP "\fBl*\fR" +.IP "\fB*\fR" Enable all logging options except \'v\' and \'x\'. -.IP "\fBli\fR" +.IP "\fBi\fR" Log status messages. -.IP "\fBlw\fR" +.IP "\fBw\fR" Log nonfatal warnings. -.IP "\fBle\fR" +.IP "\fBe\fR" Log all error messages. -.IP "\fBla\fR" +.IP "\fBa\fR" Log start of actions. -.IP "\fBlr\fR" +.IP "\fBr\fR" Log action specifc records. -.IP "\fBlu\fR" +.IP "\fBu\fR" Log user requests. -.IP "\fBlc\fR" +.IP "\fBc\fR" Log initial UI parameters. -.IP "\fBlm\fR" +.IP "\fBm\fR" Log out of memory errors. -.IP "\fBlo\fR" +.IP "\fBo\fR" Log out of diskspace messages. -.IP "\fBlp \fR" +.IP "\fBp \fR" Log terminal properties. -.IP "\fBlv \fR" +.IP "\fBv \fR" Verbose logging. -.IP "\fBlx \fR" +.IP "\fBx \fR" Log extra debugging messages. -.IP "\fBl+ \fR" +.IP "\fB+ \fR" Append logging to existing file. -.IP "\fBl! \fR" +.IP "\fB! \fR" Flush each line to log. .SH OTHER OPTIONS .IP \fB/h

1 0