April 2015 - Wine-Commits - list.winehq.org

Matteo Bruni : wined3d: Use string_buffer_sprintf() in handle_ps3_input().
by Alexandre Julliard April 29, 2015

April 29, 2015

Module: wine Branch: master Commit: 12e59c5278afcae17d540ecc4fe4be07c7be66af URL: http://source.winehq.org/git/wine.git/?a=commit;h=12e59c5278afcae17d540ecc4… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Apr 29 01:38:19 2015 +0200 wined3d: Use string_buffer_sprintf() in handle_ps3_input(). --- dlls/wined3d/glsl_shader.c | 31 +++++++++++++++++-------------- 1 file changed, 17 insertions(+), 14 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 132ecdf..1851714 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -4766,19 +4766,20 @@ static void delete_glsl_program_entry(struct shader_glsl_priv *priv, const struc HeapFree(GetProcessHeap(), 0, entry); } -static void handle_ps3_input(struct wined3d_string_buffer *buffer, +static void handle_ps3_input(struct shader_glsl_priv *priv, const struct wined3d_gl_info *gl_info, const DWORD *map, const struct wined3d_shader_signature *input_signature, const struct wined3d_shader_reg_maps *reg_maps_in, const struct wined3d_shader_signature *output_signature, const struct wined3d_shader_reg_maps *reg_maps_out) { + struct wined3d_string_buffer *buffer = &priv->shader_buffer; unsigned int i, j; DWORD *set; DWORD in_idx; unsigned int in_count = vec4_varyings(3, gl_info); char reg_mask[6]; - char destination[50]; + struct wined3d_string_buffer *destination = string_buffer_get(&priv->string_buffers); set = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*set) * (in_count + 2)); @@ -4800,11 +4801,11 @@ static void handle_ps3_input(struct wined3d_string_buffer *buffer, } if (in_idx == in_count) - sprintf(destination, "gl_FrontColor"); + string_buffer_sprintf(destination, "gl_FrontColor"); else if (in_idx == in_count + 1) - sprintf(destination, "gl_FrontSecondaryColor"); + string_buffer_sprintf(destination, "gl_FrontSecondaryColor"); else - sprintf(destination, "ps_link[%u]", in_idx); + string_buffer_sprintf(destination, "ps_link[%u]", in_idx); if (!set[in_idx]) set[in_idx] = ~0u; @@ -4827,7 +4828,7 @@ static void handle_ps3_input(struct wined3d_string_buffer *buffer, shader_glsl_write_mask_to_str(mask, reg_mask); shader_addline(buffer, "%s%s = vs_out[%u]%s;\n", - destination, reg_mask, output->register_idx, reg_mask); + destination->buffer, reg_mask, output->register_idx, reg_mask); } } @@ -4848,24 +4849,26 @@ static void handle_ps3_input(struct wined3d_string_buffer *buffer, reg_mask[size] = '\0'; if (i == in_count) - sprintf(destination, "gl_FrontColor"); + string_buffer_sprintf(destination, "gl_FrontColor"); else if (i == in_count + 1) - sprintf(destination, "gl_FrontSecondaryColor"); + string_buffer_sprintf(destination, "gl_FrontSecondaryColor"); else - sprintf(destination, "ps_link[%u]", i); + string_buffer_sprintf(destination, "ps_link[%u]", i); - if (size == 1) shader_addline(buffer, "%s.%s = 0.0;\n", destination, reg_mask); - else shader_addline(buffer, "%s.%s = vec%u(0.0);\n", destination, reg_mask, size); + if (size == 1) shader_addline(buffer, "%s.%s = 0.0;\n", destination->buffer, reg_mask); + else shader_addline(buffer, "%s.%s = vec%u(0.0);\n", destination->buffer, reg_mask, size); } HeapFree(GetProcessHeap(), 0, set); + string_buffer_release(&priv->string_buffers, destination); } /* Context activation is done by the caller. */ -static GLuint generate_param_reorder_function(struct wined3d_string_buffer *buffer, +static GLuint generate_param_reorder_function(struct shader_glsl_priv *priv, const struct wined3d_shader *vs, const struct wined3d_shader *ps, const struct wined3d_gl_info *gl_info) { + struct wined3d_string_buffer *buffer = &priv->shader_buffer; GLuint ret = 0; DWORD ps_major = ps ? ps->reg_maps.shader_version.major : 0; unsigned int i; @@ -4964,7 +4967,7 @@ static GLuint generate_param_reorder_function(struct wined3d_string_buffer *buff } /* Then, fix the pixel shader input */ - handle_ps3_input(buffer, gl_info, ps->u.ps.input_reg_map, &ps->input_signature, + handle_ps3_input(priv, gl_info, ps->u.ps.input_reg_map, &ps->input_signature, &ps->reg_maps, &vs->output_signature, &vs->reg_maps); shader_addline(buffer, "}\n"); @@ -6578,7 +6581,7 @@ static void set_glsl_shader_program(const struct wined3d_context *context, const WORD map = vshader->reg_maps.input_registers; struct wined3d_string_buffer *tmp_name = string_buffer_get(&priv->string_buffers); - reorder_shader_id = generate_param_reorder_function(&priv->shader_buffer, vshader, pshader, gl_info); + reorder_shader_id = generate_param_reorder_function(priv, vshader, pshader, gl_info); TRACE("Attaching GLSL shader object %u to program %u.\n", reorder_shader_id, program_id); GL_EXTCALL(glAttachShader(program_id, reorder_shader_id)); checkGLcall("glAttachShader");

1 0

Matteo Bruni : ddraw/tests: Add a ddraw7 specular lighting test.
by Alexandre Julliard April 29, 2015

April 29, 2015

Module: wine Branch: master Commit: 287093e26ee5905ed14bfdc305c37704bb821024 URL: http://source.winehq.org/git/wine.git/?a=commit;h=287093e26ee5905ed14bfdc30… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Apr 29 01:38:18 2015 +0200 ddraw/tests: Add a ddraw7 specular lighting test. --- dlls/ddraw/tests/ddraw7.c | 296 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 296 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=287093e26ee5905ed14bf…

1 0

Alex Henrie : comdlg32: Remove unused string resource "Borders".
by Alexandre Julliard April 29, 2015

April 29, 2015

1 0

Matteo Bruni : d3d9/tests: Add spotlight and light range tests.
by Alexandre Julliard April 29, 2015

April 29, 2015

Module: wine Branch: master Commit: 40ce3d16e8e4f9d000811a453cfd321337b1ecf1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=40ce3d16e8e4f9d000811a453… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Apr 29 01:38:16 2015 +0200 d3d9/tests: Add spotlight and light range tests. --- dlls/d3d9/tests/visual.c | 71 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 71 insertions(+) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 14b80d5..23050d6 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -28,6 +28,8 @@ * causes visible results in games can be tested in a way that does not depend on pixel exactness */ +#include <math.h> + #define COBJMACROS #include <d3d9.h> #include "wine/test.h" @@ -569,6 +571,33 @@ static void test_specular_lighting(void) 100.0f, 0.0f, 0.0f, 0.0f, 1.0f, + }, + spot = + { + D3DLIGHT_SPOT, + {0.0f, 0.0f, 0.0f, 0.0f}, + {1.0f, 1.0f, 1.0f, 0.0f}, + {0.0f, 0.0f, 0.0f, 0.0f}, + {0.0f, 0.0f, 0.0f}, + {0.0f, 0.0f, 1.0f}, + 100.0f, + 1.0f, + 0.0f, 0.0f, 1.0f, + M_PI / 12.0f, M_PI / 3.0f + }, + /* The chosen range value makes the test fail when using a manhattan + * distance metric vs the correct euclidean distance. */ + point_range = + { + D3DLIGHT_POINT, + {0.0f, 0.0f, 0.0f, 0.0f}, + {1.0f, 1.0f, 1.0f, 0.0f}, + {0.0f, 0.0f, 0.0f, 0.0f}, + {0.0f, 0.0f, 0.0f}, + {0.0f, 0.0f, 0.0f}, + 1.2f, + 0.0f, + 0.0f, 0.0f, 1.0f, }; static const struct expected_color { @@ -622,6 +651,42 @@ static void test_specular_lighting(void) {160, 360, 0x00000000}, {320, 360, 0x00070707}, {480, 360, 0x00000000}, + }, + expected_spot[] = + { + {160, 120, 0x00000000}, + {320, 120, 0x00141414}, + {480, 120, 0x00000000}, + {160, 240, 0x00141414}, + {320, 240, 0x00ffffff}, + {480, 240, 0x00141414}, + {160, 360, 0x00000000}, + {320, 360, 0x00141414}, + {480, 360, 0x00000000}, + }, + expected_spot_local[] = + { + {160, 120, 0x00000000}, + {320, 120, 0x00020202}, + {480, 120, 0x00000000}, + {160, 240, 0x00020202}, + {320, 240, 0x00ffffff}, + {480, 240, 0x00020202}, + {160, 360, 0x00000000}, + {320, 360, 0x00020202}, + {480, 360, 0x00000000}, + }, + expected_point_range[] = + { + {160, 120, 0x00000000}, + {320, 120, 0x005a5a5a}, + {480, 120, 0x00000000}, + {160, 240, 0x005a5a5a}, + {320, 240, 0x00ffffff}, + {480, 240, 0x005a5a5a}, + {160, 360, 0x00000000}, + {320, 360, 0x005a5a5a}, + {480, 360, 0x00000000}, }; static const struct { @@ -640,6 +705,12 @@ static void test_specular_lighting(void) sizeof(expected_point) / sizeof(expected_point[0])}, {&point, TRUE, expected_point_local, sizeof(expected_point_local) / sizeof(expected_point_local[0])}, + {&spot, FALSE, expected_spot, + sizeof(expected_spot) / sizeof(expected_spot[0])}, + {&spot, TRUE, expected_spot_local, + sizeof(expected_spot_local) / sizeof(expected_spot_local[0])}, + {&point_range, FALSE, expected_point_range, + sizeof(expected_point_range) / sizeof(expected_point_range[0])}, }; IDirect3DDevice9 *device; D3DMATERIAL9 material;

1 0

Nikolay Sivov : shell32/tests: Some tests for IShellWindows.
by Alexandre Julliard April 29, 2015

April 29, 2015

Module: wine Branch: master Commit: fae0f6785a110029670d8497e38887750d2eb27b URL: http://source.winehq.org/git/wine.git/?a=commit;h=fae0f6785a110029670d8497e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Apr 28 17:38:20 2015 +0300 shell32/tests: Some tests for IShellWindows. --- dlls/shell32/tests/shelldispatch.c | 97 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 97 insertions(+) diff --git a/dlls/shell32/tests/shelldispatch.c b/dlls/shell32/tests/shelldispatch.c index 75a06cc..02a45cb 100644 --- a/dlls/shell32/tests/shelldispatch.c +++ b/dlls/shell32/tests/shelldispatch.c @@ -385,6 +385,102 @@ static void test_ShellFolderView(void) IShellFolder_Release(desktop); } +static void test_ShellWindows(void) +{ + IShellWindows *shellwindows; + LONG cookie, cookie2, ret; + IDispatch *disp; + VARIANT v, v2; + HRESULT hr; + HWND hwnd; + + hr = CoCreateInstance(&CLSID_ShellWindows, NULL, CLSCTX_LOCAL_SERVER, + &IID_IShellWindows, (void**)&shellwindows); +todo_wine + ok(hr == S_OK, "got 0x%08x\n", hr); + if (hr != S_OK) return; + + /* NULL out argument */ + hr = IShellWindows_Register(shellwindows, NULL, 0, SWC_EXPLORER, NULL); + ok(hr == HRESULT_FROM_WIN32(RPC_X_NULL_REF_POINTER), "got 0x%08x\n", hr); + + hr = IShellWindows_Register(shellwindows, NULL, 0, SWC_EXPLORER, &cookie); + ok(hr == E_POINTER, "got 0x%08x\n", hr); + + hr = IShellWindows_Register(shellwindows, (IDispatch*)shellwindows, 0, SWC_EXPLORER, &cookie); + ok(hr == E_POINTER, "got 0x%08x\n", hr); + + hr = IShellWindows_Register(shellwindows, (IDispatch*)shellwindows, 0, SWC_EXPLORER, &cookie); + ok(hr == E_POINTER, "got 0x%08x\n", hr); + + hwnd = CreateWindowExA(0, "button", "test", BS_CHECKBOX | WS_VISIBLE | WS_POPUP, + 0, 0, 50, 14, 0, 0, 0, NULL); + ok(hwnd != NULL, "got %p, error %d\n", hwnd, GetLastError()); + + cookie = 0; + hr = IShellWindows_Register(shellwindows, NULL, HandleToLong(hwnd), SWC_EXPLORER, &cookie); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(cookie != 0, "got %d\n", cookie); + + cookie2 = 0; + hr = IShellWindows_Register(shellwindows, NULL, HandleToLong(hwnd), SWC_EXPLORER, &cookie2); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(cookie2 != 0 && cookie2 != cookie, "got %d\n", cookie2); + + hr = IShellWindows_Revoke(shellwindows, cookie); + ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IShellWindows_Revoke(shellwindows, cookie2); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IShellWindows_Revoke(shellwindows, 0); + ok(hr == S_FALSE, "got 0x%08x\n", hr); + + /* we can register ourselves as desktop, but FindWindowSW still returns real desktop window */ + cookie = 0; + hr = IShellWindows_Register(shellwindows, NULL, HandleToLong(hwnd), SWC_DESKTOP, &cookie); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(cookie != 0, "got %d\n", cookie); + + disp = (void*)0xdeadbeef; + ret = 0xdead; + VariantInit(&v); + hr = IShellWindows_FindWindowSW(shellwindows, &v, &v, SWC_DESKTOP, &ret, SWFO_NEEDDISPATCH, &disp); + ok(hr == S_OK || broken(hr == S_FALSE), "got 0x%08x\n", hr); + if (hr == S_FALSE) /* winxp and earlier */ { + /* older versions allowed to regiser SWC_DESKTOP and access it with FindWindowSW */ + ok(disp == NULL, "got %p\n", disp); + ok(ret == 0, "got %d\n", ret); + } + else { + ok(disp != NULL, "got %p\n", disp); + ok(ret != HandleToUlong(hwnd), "got %d\n", ret); + if (disp) IDispatch_Release(disp); + } + + disp = (void*)0xdeadbeef; + ret = 0xdead; + VariantInit(&v); + hr = IShellWindows_FindWindowSW(shellwindows, &v, &v, SWC_DESKTOP, &ret, 0, &disp); + ok(hr == S_OK || broken(hr == S_FALSE) /* winxp */, "got 0x%08x\n", hr); + ok(disp == NULL, "got %p\n", disp); + ok(ret != HandleToUlong(hwnd), "got %d\n", ret); + + disp = (void*)0xdeadbeef; + ret = 0xdead; + V_VT(&v) = VT_I4; + V_I4(&v) = cookie; + VariantInit(&v2); + hr = IShellWindows_FindWindowSW(shellwindows, &v, &v2, SWC_BROWSER, &ret, SWFO_COOKIEPASSED, &disp); + ok(hr == S_FALSE, "got 0x%08x\n", hr); + ok(disp == NULL, "got %p\n", disp); + ok(ret == 0, "got %d\n", ret); + + hr = IShellWindows_Revoke(shellwindows, cookie); + ok(hr == S_OK, "got 0x%08x\n", hr); + DestroyWindow(hwnd); + IShellWindows_Release(shellwindows); +} + START_TEST(shelldispatch) { HRESULT r; @@ -398,6 +494,7 @@ START_TEST(shelldispatch) test_namespace(); test_service(); test_ShellFolderView(); + test_ShellWindows(); CoUninitialize(); }

1 0

Henri Verbeet : d3d10core: Release the wined3d query in d3d10_query_Release() (Valgrind).
by Alexandre Julliard April 29, 2015

April 29, 2015

Module: wine Branch: master Commit: 39fc8553162dac7635a0e8d0970d64b09c801ee2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=39fc8553162dac7635a0e8d09… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 28 20:30:55 2015 +0200 d3d10core: Release the wined3d query in d3d10_query_Release() (Valgrind). --- dlls/d3d10core/async.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/dlls/d3d10core/async.c b/dlls/d3d10core/async.c index d6c3d81..f6886a7 100644 --- a/dlls/d3d10core/async.c +++ b/dlls/d3d10core/async.c @@ -66,16 +66,17 @@ static ULONG STDMETHODCALLTYPE d3d10_query_AddRef(ID3D10Query *iface) static ULONG STDMETHODCALLTYPE d3d10_query_Release(ID3D10Query *iface) { - struct d3d10_query *This = impl_from_ID3D10Query(iface); - ULONG refcount = InterlockedDecrement(&This->refcount); + struct d3d10_query *query = impl_from_ID3D10Query(iface); + ULONG refcount = InterlockedDecrement(&query->refcount); - TRACE("%p decreasing refcount to %u.\n", This, refcount); + TRACE("%p decreasing refcount to %u.\n", query, refcount); if (!refcount) { - ID3D10Device1_Release(This->device); - wined3d_private_store_cleanup(&This->private_store); - HeapFree(GetProcessHeap(), 0, This); + ID3D10Device1_Release(query->device); + wined3d_query_decref(query->wined3d_query); + wined3d_private_store_cleanup(&query->private_store); + HeapFree(GetProcessHeap(), 0, query); } return refcount;

1 0

Sebastian Lackner : wine.inf: Add dynamic DST information for Asia/ Jerusalem.
by Alexandre Julliard April 29, 2015

April 29, 2015

Module: wine Branch: master Commit: 624957b39cc848039c3adc92903ca20258e66155 URL: http://source.winehq.org/git/wine.git/?a=commit;h=624957b39cc848039c3adc929… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Tue Apr 28 17:43:29 2015 +0200 wine.inf: Add dynamic DST information for Asia/Jerusalem. --- loader/wine.inf.in | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index e15ced7..86aa732 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -2829,7 +2829,19 @@ HKLM,%CurrentVersionNT%\Time Zones\Iran Standard Time,"TZI",1,2e,ff,ff,ff,00,00, HKLM,%CurrentVersionNT%\Time Zones\Israel Standard Time,"Display",,"Asia/Jerusalem" HKLM,%CurrentVersionNT%\Time Zones\Israel Standard Time,"Dlt",,"Israel Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\Israel Standard Time,"Std",,"Israel Standard Time" -HKLM,%CurrentVersionNT%\Time Zones\Israel Standard Time,"TZI",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,02,00,00,00,00,00,00,00,00,00,03,00,05,00,05,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Israel Standard Time,"TZI",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,02,00,00,00,00,00,00,00,00,00,03,00,05,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Israel Standard Time\Dynamic DST,"2019",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,e3,07,0a,00,00,00,1b,00,02,00,00,00,00,00,00,00,e3,07,03,00,05,00,1d,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Israel Standard Time\Dynamic DST,"2024",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,e8,07,0a,00,00,00,1b,00,02,00,00,00,00,00,00,00,e8,07,03,00,05,00,1d,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Israel Standard Time\Dynamic DST,"2030",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,ee,07,0a,00,00,00,1b,00,02,00,00,00,00,00,00,00,ee,07,03,00,05,00,1d,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Israel Standard Time\Dynamic DST,"2041",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,f9,07,0a,00,00,00,1b,00,02,00,00,00,00,00,00,00,f9,07,03,00,05,00,1d,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Israel Standard Time\Dynamic DST,"2047",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,ff,07,0a,00,00,00,1b,00,02,00,00,00,00,00,00,00,ff,07,03,00,05,00,1d,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Israel Standard Time\Dynamic DST,"2052",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,04,08,0a,00,00,00,1b,00,02,00,00,00,00,00,00,00,04,08,03,00,05,00,1d,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Israel Standard Time\Dynamic DST,"2058",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,0a,08,0a,00,00,00,1b,00,02,00,00,00,00,00,00,00,0a,08,03,00,05,00,1d,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Israel Standard Time\Dynamic DST,"2069",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,15,08,0a,00,00,00,1b,00,02,00,00,00,00,00,00,00,15,08,03,00,05,00,1d,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Israel Standard Time\Dynamic DST,"2075",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,1b,08,0a,00,00,00,1b,00,02,00,00,00,00,00,00,00,1b,08,03,00,05,00,1d,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Israel Standard Time\Dynamic DST,"2080",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,20,08,0a,00,00,00,1b,00,02,00,00,00,00,00,00,00,20,08,03,00,05,00,1d,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Israel Standard Time\Dynamic DST,"2086",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,26,08,0a,00,00,00,1b,00,02,00,00,00,00,00,00,00,26,08,03,00,05,00,1d,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Israel Standard Time\Dynamic DST,"2097",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,31,08,0a,00,00,00,1b,00,02,00,00,00,00,00,00,00,31,08,03,00,05,00,1d,00,02,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Jordan Standard Time,"Display",,"Asia/Amman" HKLM,%CurrentVersionNT%\Time Zones\Jordan Standard Time,"Dlt",,"Jordan Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\Jordan Standard Time,"Std",,"Jordan Standard Time"

1 0

Nikolay Sivov : include: Fixed method arguments attributes for oleacc.idl.
by Alexandre Julliard April 29, 2015

April 29, 2015

Module: wine Branch: master Commit: 9a11e524801a1540dd3c36848e7f0e4b6778746f URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a11e524801a1540dd3c36848… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Apr 29 00:58:00 2015 +0300 include: Fixed method arguments attributes for oleacc.idl. --- include/oleacc.idl | 108 ++++++++++++++++++++++++++++++++++++----------------- 1 file changed, 74 insertions(+), 34 deletions(-) diff --git a/include/oleacc.idl b/include/oleacc.idl index 97b7858..dc7af15 100644 --- a/include/oleacc.idl +++ b/include/oleacc.idl @@ -228,7 +228,9 @@ interface IAccessibleHandler : IUnknown ] interface IAccIdentity : IUnknown { - HRESULT GetIdentityString ([in] DWORD dwIDChild, [out] BYTE **ppIDString, [out] DWORD *pdwIDStringLen); + HRESULT GetIdentityString([in] DWORD idchild, + [out, size_is(*string_len)] BYTE **str, + [out] DWORD *string_len); } [ @@ -238,8 +240,11 @@ interface IAccIdentity : IUnknown ] interface IAccPropServer: IUnknown { - HRESULT GetPropValue ([in] const BYTE *pIDString, [in] DWORD dwIDStringLen, [in] MSAAPROPID idProp, - [out] VARIANT *pvarValue, [out] BOOL *pfHasProp); + HRESULT GetPropValue([in, size_is(string_len)] const BYTE *str, + [in] DWORD string_len, + [in] MSAAPROPID idProp, + [out] VARIANT *value, + [out] BOOL *has_prop); } [ @@ -249,45 +254,80 @@ interface IAccPropServer: IUnknown ] interface IAccPropServices : IUnknown { - HRESULT SetPropValue([in] const BYTE *pIDString, [in] DWORD dwIDStringLen, [in] MSAAPROPID idProp, [in] VARIANT var); - - HRESULT SetPropServer([in] const BYTE * pIDString, [in] DWORD dwIDStringLen, [in] const MSAAPROPID* paProps, - [in] int cProps, [in] IAccPropServer* pServer, [in] AnnoScope AnnoScope); - - HRESULT ClearProps([in] const BYTE *pIDString, [in] DWORD dwIDStringLen, [in] const MSAAPROPID* paProps, [in] int cProps); + HRESULT SetPropValue([in, size_is(string_len)] const BYTE *str, + [in] DWORD string_len, + [in] MSAAPROPID idProp, + [in] VARIANT var); + + HRESULT SetPropServer([in, size_is(string_len)] const BYTE *str, + [in] DWORD string_len, + [in, size_is(cProps)] const MSAAPROPID *props, + [in] int cProps, + [in] IAccPropServer* pServer, + [in] AnnoScope AnnoScope); + + HRESULT ClearProps([in, size_is(string_len)] const BYTE *str, + [in] DWORD string_len, + [in, size_is(cProps)] const MSAAPROPID *props, + [in] int cProps); HRESULT SetHwndProp([in] HWND hwnd, [in] DWORD idObject, [in] DWORD idChild, [in] MSAAPROPID idProp, [in] VARIANT var); HRESULT SetHwndPropStr([in] HWND hwnd, [in] DWORD idObject, [in] DWORD idChild, - [in] MSAAPROPID idProp, [in] LPWSTR str); - - HRESULT SetHwndPropServer([in] HWND hwnd, [in] DWORD idObject, [in] DWORD idChild, - [in] const MSAAPROPID* paProps, [in] int cProps, [in] IAccPropServer* pServer, [in] AnnoScope AnnoScope); - - HRESULT ClearHwndProps([in] HWND hwnd, [in] DWORD idObject, [in] DWORD idChild, - [in] const MSAAPROPID* paProps, [in] int cProps); - - HRESULT ComposeHwndIdentityString([in] HWND hwnd, [in] DWORD idObject, [in] DWORD idChild, - [out] BYTE **ppIDString, [out] DWORD* pdwIDStringLen); - - HRESULT DecomposeHwndIdentityString([in] const BYTE *pIDString, [in] DWORD dwIDStringLen, - [out] HWND* phwnd, [out] DWORD* pidObject, [out] DWORD* pidChild); + [in] MSAAPROPID idProp, [in, string] LPWSTR str); + + HRESULT SetHwndPropServer([in] HWND hwnd, + [in] DWORD idObject, + [in] DWORD idChild, + [in, size_is(cProps)] const MSAAPROPID *props, + [in] int cProps, + [in] IAccPropServer *server, + [in] AnnoScope scope); + + HRESULT ClearHwndProps([in] HWND hwnd, + [in] DWORD idObject, + [in] DWORD idChild, + [in, size_is(cProps)] const MSAAPROPID *props, + [in] int cProps); + + HRESULT ComposeHwndIdentityString([in] HWND hwnd, + [in] DWORD idObject, + [in] DWORD idChild, + [out, size_is(*string_len)] BYTE **str, + [out] DWORD *string_len); + + HRESULT DecomposeHwndIdentityString([in, size_is(string_len)] const BYTE *str, + [in] DWORD string_len, + [out] HWND *phwnd, + [out] DWORD *pidObject, + [out] DWORD *pidChild); HRESULT SetHmenuProp([in] HMENU hmenu, [in] DWORD idChild, [in] MSAAPROPID idProp, [in] VARIANT var); - HRESULT SetHmenuPropStr([in] HMENU hmenu, [in] DWORD idChild, [in] MSAAPROPID idProp, [in] LPWSTR str); - - HRESULT SetHmenuPropServer([in] HMENU hmenu, [in] DWORD idChild, [in] const MSAAPROPID* paProps, - [in] int cProps, [in] IAccPropServer* pServer, [in] AnnoScope AnnoScope); - - HRESULT ClearHmenuProps([in] HMENU hmenu, [in] DWORD idChild, [in] const MSAAPROPID* paProps, [in] int cProps); - - HRESULT ComposeHmenuIdentityString([in] HMENU hmenu, [in] DWORD idChild, - [out] BYTE **ppIDString, [out] DWORD *pdwIDStringLen); - - HRESULT DecomposeHmenuIdentityString([in] const BYTE *pIDString, [in] DWORD dwIDStringLen, - [out] HMENU *phmenu, [out] DWORD *pidChild); + HRESULT SetHmenuPropStr([in] HMENU hmenu, [in] DWORD idChild, [in] MSAAPROPID idProp, [in, string] LPWSTR str); + + HRESULT SetHmenuPropServer([in] HMENU hmenu, + [in] DWORD idChild, + [in, size_is(cProps)] const MSAAPROPID *props, + [in] int cProps, + [in] IAccPropServer *server, + [in] AnnoScope scope); + + HRESULT ClearHmenuProps([in] HMENU hmenu, + [in] DWORD idChild, + [in, size_is(cProps)] const MSAAPROPID *props, + [in] int cProps); + + HRESULT ComposeHmenuIdentityString([in] HMENU hmenu, + [in] DWORD idChild, + [out, size_is(*string_len)] BYTE **str, + [out] DWORD *string_len); + + HRESULT DecomposeHmenuIdentityString([in, size_is(string_len)] const BYTE *str, + [in] DWORD string_len, + [out] HMENU *phmenu, + [out] DWORD *pidChild); } [

1 0

Nikolay Sivov : explorer: Added a stub IShellWindows implementation.
by Alexandre Julliard April 29, 2015

April 29, 2015

Module: wine Branch: master Commit: b4769495bc6310f9683a005303bd6cff23e167c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b4769495bc6310f9683a00530… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Apr 28 18:55:21 2015 +0300 explorer: Added a stub IShellWindows implementation. Most of it was done by Andrew Eikum. --- dlls/shell32/tests/shelldispatch.c | 26 +++- programs/explorer/desktop.c | 269 +++++++++++++++++++++++++++++++++++++ 2 files changed, 288 insertions(+), 7 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b4769495bc6310f9683a0…

1 0

Henri Verbeet : wined3d: Don' t try to apply format fixups for SM4+ shaders.
by Alexandre Julliard April 29, 2015

April 29, 2015

Module: wine Branch: master Commit: da24b5113949fd98059c43ad9288e4bae8d78326 URL: http://source.winehq.org/git/wine.git/?a=commit;h=da24b5113949fd98059c43ad9… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 28 20:30:53 2015 +0200 wined3d: Don't try to apply format fixups for SM4+ shaders. --- dlls/wined3d/glsl_shader.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index ff884f9..132ecdf 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -2765,7 +2765,10 @@ static void PRINTF_ATTR(8, 9) shader_glsl_gen_sample_code(const struct wined3d_s shader_glsl_swizzle_to_str(swizzle, FALSE, ins->dst[0].write_mask, dst_swizzle); - if (version->type == WINED3D_SHADER_TYPE_PIXEL) + /* FIXME: We currently don't support fixups for vertex shaders or anything + * above SM3. Note that for SM4+ the sampler index doesn't have to match + * the resource index. */ + if (version->type == WINED3D_SHADER_TYPE_PIXEL && version->major < 4) { const struct shader_glsl_ctx_priv *priv = ins->ctx->backend_data; fixup = priv->cur_ps_args->color_fixup[sampler]; @@ -2780,7 +2783,7 @@ static void PRINTF_ATTR(8, 9) shader_glsl_gen_sample_code(const struct wined3d_s } else { - fixup = COLOR_FIXUP_IDENTITY; /* FIXME: Vshader color fixup */ + fixup = COLOR_FIXUP_IDENTITY; } shader_glsl_append_dst_ext(ins->ctx->buffer, ins, &ins->dst[0], sample_function->data_type);

1 0

Henri Verbeet : d2d1/tests: Add some extend mode tests to test_bitmap_brush().
by Alexandre Julliard April 29, 2015

April 29, 2015

Module: wine Branch: master Commit: d3cc27f1d8ad65a8d3ea5dfb6adc92146e32df7c URL: http://source.winehq.org/git/wine.git/?a=commit;h=d3cc27f1d8ad65a8d3ea5dfb6… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 28 20:30:52 2015 +0200 d2d1/tests: Add some extend mode tests to test_bitmap_brush(). --- dlls/d2d1/tests/d2d1.c | 49 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index 357a518..29e1bc6 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -706,11 +706,32 @@ static void test_bitmap_brush(void) IDXGISurface *surface; D2D1_COLOR_F color; D2D1_SIZE_U size; + unsigned int i; ULONG refcount; float opacity; HWND window; HRESULT hr; + static const struct + { + D2D1_EXTEND_MODE extend_mode_x; + D2D1_EXTEND_MODE extend_mode_y; + float translate_x; + float translate_y; + D2D1_RECT_F rect; + } + extend_mode_tests[] = + { + {D2D1_EXTEND_MODE_MIRROR, D2D1_EXTEND_MODE_MIRROR, -7.0f, 1.0f, {-4.0f, 0.0f, -8.0f, 4.0f}}, + {D2D1_EXTEND_MODE_WRAP, D2D1_EXTEND_MODE_MIRROR, -3.0f, 1.0f, {-4.0f, 4.0f, 0.0f, 0.0f}}, + {D2D1_EXTEND_MODE_CLAMP, D2D1_EXTEND_MODE_MIRROR, 1.0f, 1.0f, { 4.0f, 0.0f, 0.0f, 4.0f}}, + {D2D1_EXTEND_MODE_MIRROR, D2D1_EXTEND_MODE_WRAP, -7.0f, 5.0f, {-8.0f, 8.0f, -4.0f, 4.0f}}, + {D2D1_EXTEND_MODE_WRAP, D2D1_EXTEND_MODE_WRAP, -3.0f, 5.0f, { 0.0f, 4.0f, -4.0f, 8.0f}}, + {D2D1_EXTEND_MODE_CLAMP, D2D1_EXTEND_MODE_WRAP, 1.0f, 5.0f, { 0.0f, 8.0f, 4.0f, 4.0f}}, + {D2D1_EXTEND_MODE_MIRROR, D2D1_EXTEND_MODE_CLAMP, -7.0f, 9.0f, {-4.0f, 8.0f, -8.0f, 12.0f}}, + {D2D1_EXTEND_MODE_WRAP, D2D1_EXTEND_MODE_CLAMP, -3.0f, 9.0f, {-4.0f, 12.0f, 0.0f, 8.0f}}, + {D2D1_EXTEND_MODE_CLAMP, D2D1_EXTEND_MODE_CLAMP, 1.0f, 9.0f, { 4.0f, 8.0f, 0.0f, 12.0f}}, + }; static const DWORD bitmap_data[] = { 0xffff0000, 0xffffff00, 0xff00ff00, 0xff00ffff, @@ -814,6 +835,34 @@ static void test_bitmap_brush(void) ok(SUCCEEDED(hr), "Failed to end draw, hr %#x.\n", hr); ok(compare_surface(surface, "393636185359a550d459e1e5f0e25411814f724c"), "Surface does not match.\n"); + ID2D1RenderTarget_BeginDraw(rt); + + ID2D1RenderTarget_Clear(rt, &color); + + ID2D1BitmapBrush_SetOpacity(brush, 1.0f); + for (i = 0; i < sizeof(extend_mode_tests) / sizeof(*extend_mode_tests); ++i) + { + ID2D1BitmapBrush_SetExtendModeX(brush, extend_mode_tests[i].extend_mode_x); + extend_mode = ID2D1BitmapBrush_GetExtendModeX(brush); + ok(extend_mode == extend_mode_tests[i].extend_mode_x, + "Test %u: Got unexpected extend mode %#x, expected %#x.\n", + i, extend_mode, extend_mode_tests[i].extend_mode_x); + ID2D1BitmapBrush_SetExtendModeY(brush, extend_mode_tests[i].extend_mode_y); + extend_mode = ID2D1BitmapBrush_GetExtendModeY(brush); + ok(extend_mode == extend_mode_tests[i].extend_mode_y, + "Test %u: Got unexpected extend mode %#x, expected %#x.\n", + i, extend_mode, extend_mode_tests[i].extend_mode_y); + set_matrix_identity(&matrix); + translate_matrix(&matrix, extend_mode_tests[i].translate_x, extend_mode_tests[i].translate_y); + scale_matrix(&matrix, 0.5f, 0.5f); + ID2D1BitmapBrush_SetTransform(brush, &matrix); + ID2D1RenderTarget_FillRectangle(rt, &extend_mode_tests[i].rect, (ID2D1Brush *)brush); + } + + hr = ID2D1RenderTarget_EndDraw(rt, NULL, NULL); + ok(SUCCEEDED(hr), "Failed to end draw, hr %#x.\n", hr); + ok(compare_surface(surface, "b4b775afecdae2d26642001f4faff73663bb8b31"), "Surface does not match.\n"); + ID2D1BitmapBrush_Release(brush); refcount = ID2D1Bitmap_Release(bitmap); ok(!refcount, "Bitmap has %u references left.\n", refcount);

1 0

Henri Verbeet : d2d1: Do not flip/ mirror the rectangle in d2d_d3d_render_target_FillRectangle().
by Alexandre Julliard April 29, 2015

April 29, 2015

Module: wine Branch: master Commit: c92d7aff63dfe96158cd7770f15e364cd613353d URL: http://source.winehq.org/git/wine.git/?a=commit;h=c92d7aff63dfe96158cd7770f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 28 20:30:51 2015 +0200 d2d1: Do not flip/mirror the rectangle in d2d_d3d_render_target_FillRectangle(). --- dlls/d2d1/render_target.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/d2d1/render_target.c b/dlls/d2d1/render_target.c index 757cdac..3870295 100644 --- a/dlls/d2d1/render_target.c +++ b/dlls/d2d1/render_target.c @@ -580,12 +580,12 @@ static void STDMETHODCALLTYPE d2d_d3d_render_target_FillRectangle(ID2D1RenderTar transform.pad1 = 0.0f; /* Translate from world space to object space. */ - tmp_x = rect->left + (rect->right - rect->left) / 2.0f; - tmp_y = rect->top + (rect->bottom - rect->top) / 2.0f; + tmp_x = min(rect->left, rect->right) + fabsf(rect->right - rect->left) / 2.0f; + tmp_y = min(rect->top, rect->bottom) + fabsf(rect->bottom - rect->top) / 2.0f; transform._31 += tmp_x * transform._11 + tmp_y * transform._21; transform._32 += tmp_x * transform._12 + tmp_y * transform._22; - tmp_x = (rect->right - rect->left) / 2.0f; - tmp_y = (rect->bottom - rect->top) / 2.0f; + tmp_x = fabsf(rect->right - rect->left) / 2.0f; + tmp_y = fabsf(rect->bottom - rect->top) / 2.0f; transform._11 *= tmp_x; transform._12 *= tmp_x; transform._21 *= tmp_y;

1 0

Sebastian Lackner : wine.inf: Add dynamic DST information for America/ Godthab.
by Alexandre Julliard April 29, 2015

April 29, 2015

Module: wine Branch: master Commit: 14be416dc2f69c4c15edbe955c6a331507248723 URL: http://source.winehq.org/git/wine.git/?a=commit;h=14be416dc2f69c4c15edbe955… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Tue Apr 28 17:39:20 2015 +0200 wine.inf: Add dynamic DST information for America/Godthab. --- loader/wine.inf.in | 27 ++++++++++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index b130ee8..e15ced7 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -2780,7 +2780,32 @@ HKLM,%CurrentVersionNT%\Time Zones\GMT Standard Time,"TZI",1,00,00,00,00,00,00,0 HKLM,%CurrentVersionNT%\Time Zones\Greenland Standard Time,"Display",,"America/Godthab" HKLM,%CurrentVersionNT%\Time Zones\Greenland Standard Time,"Dlt",,"Greenland Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\Greenland Standard Time,"Std",,"Greenland Standard Time" -HKLM,%CurrentVersionNT%\Time Zones\Greenland Standard Time,"TZI",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,06,00,04,00,17,00,00,00,00,00,00,00,00,00,03,00,06,00,05,00,16,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Greenland Standard Time,"TZI",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,06,00,05,00,17,00,00,00,00,00,00,00,00,00,03,00,06,00,05,00,16,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Greenland Standard Time\Dynamic DST,"2015",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,df,07,0a,00,06,00,18,00,17,00,00,00,00,00,00,00,df,07,03,00,06,00,1c,00,16,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Greenland Standard Time\Dynamic DST,"2018",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,e2,07,0a,00,06,00,1b,00,17,00,00,00,00,00,00,00,e2,07,03,00,06,00,18,00,16,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Greenland Standard Time\Dynamic DST,"2020",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,e4,07,0a,00,06,00,18,00,17,00,00,00,00,00,00,00,e4,07,03,00,06,00,1c,00,16,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Greenland Standard Time\Dynamic DST,"2026",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,ea,07,0a,00,06,00,18,00,17,00,00,00,00,00,00,00,ea,07,03,00,06,00,1c,00,16,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Greenland Standard Time\Dynamic DST,"2029",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,ed,07,0a,00,06,00,1b,00,17,00,00,00,00,00,00,00,ed,07,03,00,06,00,18,00,16,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Greenland Standard Time\Dynamic DST,"2035",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,f3,07,0a,00,06,00,1b,00,17,00,00,00,00,00,00,00,f3,07,03,00,06,00,18,00,16,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Greenland Standard Time\Dynamic DST,"2037",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,f5,07,0a,00,06,00,18,00,17,00,00,00,00,00,00,00,f5,07,03,00,06,00,1c,00,16,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Greenland Standard Time\Dynamic DST,"2040",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,f8,07,0a,00,06,00,1b,00,17,00,00,00,00,00,00,00,f8,07,03,00,06,00,18,00,16,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Greenland Standard Time\Dynamic DST,"2043",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,fb,07,0a,00,06,00,18,00,17,00,00,00,00,00,00,00,fb,07,03,00,06,00,1c,00,16,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Greenland Standard Time\Dynamic DST,"2046",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,fe,07,0a,00,06,00,1b,00,17,00,00,00,00,00,00,00,fe,07,03,00,06,00,18,00,16,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Greenland Standard Time\Dynamic DST,"2048",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,00,08,0a,00,06,00,18,00,17,00,00,00,00,00,00,00,00,08,03,00,06,00,1c,00,16,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Greenland Standard Time\Dynamic DST,"2054",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,06,08,0a,00,06,00,18,00,17,00,00,00,00,00,00,00,06,08,03,00,06,00,1c,00,16,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Greenland Standard Time\Dynamic DST,"2057",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,09,08,0a,00,06,00,1b,00,17,00,00,00,00,00,00,00,09,08,03,00,06,00,18,00,16,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Greenland Standard Time\Dynamic DST,"2063",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,0f,08,0a,00,06,00,1b,00,17,00,00,00,00,00,00,00,0f,08,03,00,06,00,18,00,16,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Greenland Standard Time\Dynamic DST,"2065",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,11,08,0a,00,06,00,18,00,17,00,00,00,00,00,00,00,11,08,03,00,06,00,1c,00,16,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Greenland Standard Time\Dynamic DST,"2068",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,14,08,0a,00,06,00,1b,00,17,00,00,00,00,00,00,00,14,08,03,00,06,00,18,00,16,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Greenland Standard Time\Dynamic DST,"2071",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,17,08,0a,00,06,00,18,00,17,00,00,00,00,00,00,00,17,08,03,00,06,00,1c,00,16,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Greenland Standard Time\Dynamic DST,"2074",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,1a,08,0a,00,06,00,1b,00,17,00,00,00,00,00,00,00,1a,08,03,00,06,00,18,00,16,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Greenland Standard Time\Dynamic DST,"2076",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,1c,08,0a,00,06,00,18,00,17,00,00,00,00,00,00,00,1c,08,03,00,06,00,1c,00,16,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Greenland Standard Time\Dynamic DST,"2082",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,22,08,0a,00,06,00,18,00,17,00,00,00,00,00,00,00,22,08,03,00,06,00,1c,00,16,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Greenland Standard Time\Dynamic DST,"2085",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,25,08,0a,00,06,00,1b,00,17,00,00,00,00,00,00,00,25,08,03,00,06,00,18,00,16,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Greenland Standard Time\Dynamic DST,"2091",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,2b,08,0a,00,06,00,1b,00,17,00,00,00,00,00,00,00,2b,08,03,00,06,00,18,00,16,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Greenland Standard Time\Dynamic DST,"2093",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,2d,08,0a,00,06,00,18,00,17,00,00,00,00,00,00,00,2d,08,03,00,06,00,1c,00,16,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Greenland Standard Time\Dynamic DST,"2096",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,30,08,0a,00,06,00,1b,00,17,00,00,00,00,00,00,00,30,08,03,00,06,00,18,00,16,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Greenland Standard Time\Dynamic DST,"2099",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,33,08,0a,00,06,00,18,00,17,00,00,00,00,00,00,00,33,08,03,00,06,00,1c,00,16,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Greenwich Standard Time,"Display",,"Greenwich" HKLM,%CurrentVersionNT%\Time Zones\Greenwich Standard Time,"Dlt",,"Greenwich Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\Greenwich Standard Time,"Std",,"Greenwich Standard Time"

1 0

YongHao Hu : msvcp90/tests: Fix a spelling error.
by Alexandre Julliard April 29, 2015

April 29, 2015

Module: wine Branch: master Commit: 4810f44cf9815c1eb707bdde55400486a6b6b5f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4810f44cf9815c1eb707bdde5… Author: YongHao Hu <christopherwuy(a)gmail.com> Date: Wed Apr 29 11:31:52 2015 +0800 msvcp90/tests: Fix a spelling error. --- dlls/msvcp90/tests/ios.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msvcp90/tests/ios.c b/dlls/msvcp90/tests/ios.c index 1a74147..0c57ca1 100644 --- a/dlls/msvcp90/tests/ios.c +++ b/dlls/msvcp90/tests/ios.c @@ -626,7 +626,7 @@ static BOOL init(void) msvcr = LoadLibraryA("msvcr90.dll"); msvcp = LoadLibraryA("msvcp90.dll"); if(!msvcr || !msvcp) { - win_skip("msvcp90.dll or msvcrt90.dll not installed\n"); + win_skip("msvcp90.dll or msvcr90.dll not installed\n"); return FALSE; }

1 0

Alexandre Julliard : secur32: Add a loop around gnutls_record_send since it may send a partial record.
by Alexandre Julliard April 29, 2015

April 29, 2015

Module: wine Branch: master Commit: f54a9f4db407ab8224ee76c945e72741e4f3ffba URL: http://source.winehq.org/git/wine.git/?a=commit;h=f54a9f4db407ab8224ee76c94… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 29 13:07:17 2015 +0900 secur32: Add a loop around gnutls_record_send since it may send a partial record. --- dlls/secur32/schannel_gnutls.c | 41 +++++++++++++++++++++-------------------- 1 file changed, 21 insertions(+), 20 deletions(-) diff --git a/dlls/secur32/schannel_gnutls.c b/dlls/secur32/schannel_gnutls.c index 1173574..7039dcd 100644 --- a/dlls/secur32/schannel_gnutls.c +++ b/dlls/secur32/schannel_gnutls.c @@ -400,30 +400,31 @@ SECURITY_STATUS schan_imp_send(schan_imp_session session, const void *buffer, SIZE_T *length) { gnutls_session_t s = (gnutls_session_t)session; - ssize_t ret; - -again: - ret = pgnutls_record_send(s, buffer, *length); + ssize_t ret, total = 0; - if (ret >= 0) - *length = ret; - else if (ret == GNUTLS_E_AGAIN) + for (;;) { - struct schan_transport *t = (struct schan_transport *)pgnutls_transport_get_ptr(s); - SIZE_T count = 0; - - if (schan_get_buffer(t, &t->out, &count)) - goto again; + ret = pgnutls_record_send(s, (const char *)buffer + total, *length - total); + if (ret >= 0) + { + total += ret; + TRACE( "sent %d now %d/%ld\n", ret, total, *length ); + if (total == *length) return SEC_E_OK; + } + else if (ret == GNUTLS_E_AGAIN) + { + struct schan_transport *t = (struct schan_transport *)pgnutls_transport_get_ptr(s); + SIZE_T count = 0; - return SEC_I_CONTINUE_NEEDED; - } - else - { - pgnutls_perror(ret); - return SEC_E_INTERNAL_ERROR; + if (schan_get_buffer(t, &t->out, &count)) continue; + return SEC_I_CONTINUE_NEEDED; + } + else + { + pgnutls_perror(ret); + return SEC_E_INTERNAL_ERROR; + } } - - return SEC_E_OK; } SECURITY_STATUS schan_imp_recv(schan_imp_session session, void *buffer,

1 0

Nikolay Sivov : dmime: Remove separate IUnknown vtable from IDirectMusicAudioPath impl.
by Alexandre Julliard April 29, 2015

April 29, 2015

Module: wine Branch: master Commit: ef585842d6af0a705586238b6f79eb9c9ce1800a URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef585842d6af0a705586238b6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Apr 27 02:10:26 2015 +0300 dmime: Remove separate IUnknown vtable from IDirectMusicAudioPath impl. --- dlls/dmime/audiopath.c | 126 ++++++++++++++++++----------------------------- dlls/dmime/tests/dmime.c | 1 + 2 files changed, 50 insertions(+), 77 deletions(-) diff --git a/dlls/dmime/audiopath.c b/dlls/dmime/audiopath.c index bd789c2..16d04c5 100644 --- a/dlls/dmime/audiopath.c +++ b/dlls/dmime/audiopath.c @@ -23,8 +23,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(dmime); WINE_DECLARE_DEBUG_CHANNEL(dmfile); struct IDirectMusicAudioPathImpl { - /* IUnknown fields */ - const IUnknownVtbl *UnknownVtbl; const IDirectMusicAudioPathVtbl *AudioPathVtbl; const IDirectMusicObjectVtbl *ObjectVtbl; const IPersistStreamVtbl *PersistStreamVtbl; @@ -62,82 +60,57 @@ void set_audiopath_primary_dsound_buffer(IDirectMusicAudioPath *iface, IDirectSo /***************************************************************************** * IDirectMusicAudioPathImpl implementation */ -/* IDirectMusicAudioPath IUnknown part: */ -static HRESULT WINAPI IDirectMusicAudioPathImpl_IUnknown_QueryInterface (LPUNKNOWN iface, REFIID riid, LPVOID *ppobj) { - ICOM_THIS_MULTI(IDirectMusicAudioPathImpl, UnknownVtbl, iface); - TRACE("(%p, %s, %p)\n", This, debugstr_dmguid(riid), ppobj); - - if (IsEqualIID (riid, &IID_IUnknown)) { - *ppobj = &This->UnknownVtbl; - IUnknown_AddRef (iface); - return S_OK; - } else if (IsEqualIID (riid, &IID_IDirectMusicAudioPath)) { - *ppobj = &This->AudioPathVtbl; - IUnknown_AddRef (iface); - return S_OK; - } else if (IsEqualIID (riid, &IID_IDirectMusicObject)) { - *ppobj = &This->ObjectVtbl; - IUnknown_AddRef (iface); - return S_OK; - } else if (IsEqualIID (riid, &IID_IPersistStream)) { - *ppobj = &This->PersistStreamVtbl; - IUnknown_AddRef (iface); - return S_OK; - } - - WARN("(%p, %s, %p): not found\n", This, debugstr_dmguid(riid), ppobj); - return E_NOINTERFACE; -} +static HRESULT WINAPI IDirectMusicAudioPathImpl_QueryInterface (IDirectMusicAudioPath *iface, REFIID riid, void **ppobj) +{ + ICOM_THIS_MULTI(IDirectMusicAudioPathImpl, AudioPathVtbl, iface); -static ULONG WINAPI IDirectMusicAudioPathImpl_IUnknown_AddRef (LPUNKNOWN iface) { - ICOM_THIS_MULTI(IDirectMusicAudioPathImpl, UnknownVtbl, iface); - ULONG ref = InterlockedIncrement(&This->ref); + TRACE("(%p, %s, %p)\n", This, debugstr_dmguid(riid), ppobj); - TRACE("(%p): AddRef from %d\n", This, ref - 1); + *ppobj = NULL; - DMIME_LockModule(); + if (IsEqualIID (riid, &IID_IDirectMusicAudioPath) || IsEqualIID (riid, &IID_IUnknown)) + *ppobj = &This->AudioPathVtbl; + else if (IsEqualIID (riid, &IID_IDirectMusicObject)) + *ppobj = &This->ObjectVtbl; + else if (IsEqualIID (riid, &IID_IPersistStream)) + *ppobj = &This->PersistStreamVtbl; - return ref; -} - -static ULONG WINAPI IDirectMusicAudioPathImpl_IUnknown_Release (LPUNKNOWN iface) { - ICOM_THIS_MULTI(IDirectMusicAudioPathImpl, UnknownVtbl, iface); - ULONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p): ReleaseRef to %d\n", This, ref); - - if (ref == 0) { - if (This->pDSBuffer) { - IDirectSoundBuffer8_Release(This->pDSBuffer); + if (*ppobj) { + IUnknown_AddRef((IUnknown*)*ppobj); + return S_OK; } - This->pPerf = NULL; - HeapFree(GetProcessHeap(), 0, This); - } - DMIME_UnlockModule(); - - return ref; + WARN("(%p, %s, %p): not found\n", This, debugstr_dmguid(riid), ppobj); + return E_NOINTERFACE; } -static const IUnknownVtbl DirectMusicAudioPath_Unknown_Vtbl = { - IDirectMusicAudioPathImpl_IUnknown_QueryInterface, - IDirectMusicAudioPathImpl_IUnknown_AddRef, - IDirectMusicAudioPathImpl_IUnknown_Release -}; +static ULONG WINAPI IDirectMusicAudioPathImpl_AddRef (IDirectMusicAudioPath *iface) +{ + ICOM_THIS_MULTI(IDirectMusicAudioPathImpl, AudioPathVtbl, iface); + ULONG ref = InterlockedIncrement(&This->ref); -/* IDirectMusicAudioPathImpl IDirectMusicAudioPath part: */ -static HRESULT WINAPI IDirectMusicAudioPathImpl_IDirectMusicAudioPath_QueryInterface (LPDIRECTMUSICAUDIOPATH iface, REFIID riid, LPVOID *ppobj) { - ICOM_THIS_MULTI(IDirectMusicAudioPathImpl, AudioPathVtbl, iface); - return IUnknown_QueryInterface ((LPUNKNOWN)&This->UnknownVtbl, riid, ppobj); -} + TRACE("(%p): AddRef from %d\n", This, ref - 1); -static ULONG WINAPI IDirectMusicAudioPathImpl_IDirectMusicAudioPath_AddRef (LPDIRECTMUSICAUDIOPATH iface) { - ICOM_THIS_MULTI(IDirectMusicAudioPathImpl, AudioPathVtbl, iface); - return IUnknown_AddRef ((LPUNKNOWN)&This->UnknownVtbl); + DMIME_LockModule(); + return ref; } -static ULONG WINAPI IDirectMusicAudioPathImpl_IDirectMusicAudioPath_Release (LPDIRECTMUSICAUDIOPATH iface) { - ICOM_THIS_MULTI(IDirectMusicAudioPathImpl, AudioPathVtbl, iface); - return IUnknown_Release ((LPUNKNOWN)&This->UnknownVtbl); +static ULONG WINAPI IDirectMusicAudioPathImpl_Release (IDirectMusicAudioPath *iface) +{ + ICOM_THIS_MULTI(IDirectMusicAudioPathImpl, AudioPathVtbl, iface); + ULONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p): ReleaseRef to %d\n", This, ref); + + if (ref == 0) { + if (This->pDSBuffer) + IDirectSoundBuffer8_Release(This->pDSBuffer); + This->pPerf = NULL; + HeapFree(GetProcessHeap(), 0, This); + } + + DMIME_UnlockModule(); + return ref; } static HRESULT WINAPI IDirectMusicAudioPathImpl_IDirectMusicAudioPath_GetObjectInPath (LPDIRECTMUSICAUDIOPATH iface, DWORD dwPChannel, DWORD dwStage, DWORD dwBuffer, REFGUID guidObject, WORD dwIndex, REFGUID iidInterface, void** ppObject) { @@ -258,9 +231,9 @@ static HRESULT WINAPI IDirectMusicAudioPathImpl_IDirectMusicAudioPath_ConvertPCh } static const IDirectMusicAudioPathVtbl DirectMusicAudioPath_AudioPath_Vtbl = { - IDirectMusicAudioPathImpl_IDirectMusicAudioPath_QueryInterface, - IDirectMusicAudioPathImpl_IDirectMusicAudioPath_AddRef, - IDirectMusicAudioPathImpl_IDirectMusicAudioPath_Release, + IDirectMusicAudioPathImpl_QueryInterface, + IDirectMusicAudioPathImpl_AddRef, + IDirectMusicAudioPathImpl_Release, IDirectMusicAudioPathImpl_IDirectMusicAudioPath_GetObjectInPath, IDirectMusicAudioPathImpl_IDirectMusicAudioPath_Activate, IDirectMusicAudioPathImpl_IDirectMusicAudioPath_SetVolume, @@ -270,17 +243,17 @@ static const IDirectMusicAudioPathVtbl DirectMusicAudioPath_AudioPath_Vtbl = { /* IDirectMusicAudioPathImpl IDirectMusicObject part: */ static HRESULT WINAPI IDirectMusicAudioPathImpl_IDirectMusicObject_QueryInterface (LPDIRECTMUSICOBJECT iface, REFIID riid, LPVOID *ppobj) { ICOM_THIS_MULTI(IDirectMusicAudioPathImpl, ObjectVtbl, iface); - return IUnknown_QueryInterface ((LPUNKNOWN)&This->UnknownVtbl, riid, ppobj); + return IUnknown_QueryInterface ((LPUNKNOWN)&This->AudioPathVtbl, riid, ppobj); } static ULONG WINAPI IDirectMusicAudioPathImpl_IDirectMusicObject_AddRef (LPDIRECTMUSICOBJECT iface) { ICOM_THIS_MULTI(IDirectMusicAudioPathImpl, ObjectVtbl, iface); - return IUnknown_AddRef ((LPUNKNOWN)&This->UnknownVtbl); + return IUnknown_AddRef ((LPUNKNOWN)&This->AudioPathVtbl); } static ULONG WINAPI IDirectMusicAudioPathImpl_IDirectMusicObject_Release (LPDIRECTMUSICOBJECT iface) { ICOM_THIS_MULTI(IDirectMusicAudioPathImpl, ObjectVtbl, iface); - return IUnknown_Release ((LPUNKNOWN)&This->UnknownVtbl); + return IUnknown_Release ((LPUNKNOWN)&This->AudioPathVtbl); } static HRESULT WINAPI IDirectMusicAudioPathImpl_IDirectMusicObject_GetDescriptor (LPDIRECTMUSICOBJECT iface, LPDMUS_OBJECTDESC pDesc) { @@ -485,17 +458,17 @@ static const IDirectMusicObjectVtbl DirectMusicAudioPath_Object_Vtbl = { /* IDirectMusicAudioPathImpl IPersistStream part: */ static HRESULT WINAPI IDirectMusicAudioPathImpl_IPersistStream_QueryInterface (LPPERSISTSTREAM iface, REFIID riid, LPVOID *ppobj) { ICOM_THIS_MULTI(IDirectMusicAudioPathImpl, PersistStreamVtbl, iface); - return IUnknown_QueryInterface ((LPUNKNOWN)&This->UnknownVtbl, riid, ppobj); + return IUnknown_QueryInterface ((LPUNKNOWN)&This->AudioPathVtbl, riid, ppobj); } static ULONG WINAPI IDirectMusicAudioPathImpl_IPersistStream_AddRef (LPPERSISTSTREAM iface) { ICOM_THIS_MULTI(IDirectMusicAudioPathImpl, PersistStreamVtbl, iface); - return IUnknown_AddRef ((LPUNKNOWN)&This->UnknownVtbl); + return IUnknown_AddRef ((LPUNKNOWN)&This->AudioPathVtbl); } static ULONG WINAPI IDirectMusicAudioPathImpl_IPersistStream_Release (LPPERSISTSTREAM iface) { ICOM_THIS_MULTI(IDirectMusicAudioPathImpl, PersistStreamVtbl, iface); - return IUnknown_Release ((LPUNKNOWN)&This->UnknownVtbl); + return IUnknown_Release ((LPUNKNOWN)&This->AudioPathVtbl); } static HRESULT WINAPI IDirectMusicAudioPathImpl_IPersistStream_GetClassID (LPPERSISTSTREAM iface, CLSID* pClassID) { @@ -682,7 +655,6 @@ HRESULT WINAPI create_dmaudiopath(REFIID lpcGUID, void **ppobj) *ppobj = NULL; return E_OUTOFMEMORY; } - obj->UnknownVtbl = &DirectMusicAudioPath_Unknown_Vtbl; obj->AudioPathVtbl = &DirectMusicAudioPath_AudioPath_Vtbl; obj->ObjectVtbl = &DirectMusicAudioPath_Object_Vtbl; obj->PersistStreamVtbl = &DirectMusicAudioPath_PersistStream_Vtbl; @@ -692,5 +664,5 @@ HRESULT WINAPI create_dmaudiopath(REFIID lpcGUID, void **ppobj) obj->pDesc->guidClass = CLSID_DirectMusicAudioPathConfig; obj->ref = 0; /* will be inited by QueryInterface */ - return IDirectMusicAudioPathImpl_IUnknown_QueryInterface ((LPUNKNOWN)&obj->UnknownVtbl, lpcGUID, ppobj); + return IUnknown_QueryInterface ((LPUNKNOWN)&obj->AudioPathVtbl, lpcGUID, ppobj); } diff --git a/dlls/dmime/tests/dmime.c b/dlls/dmime/tests/dmime.c index 18586fd..eb65cb2 100644 --- a/dlls/dmime/tests/dmime.c +++ b/dlls/dmime/tests/dmime.c @@ -81,6 +81,7 @@ static void test_COM_audiopath(void) hr = IDirectMusicAudioPath_QueryInterface(dmap, &IID_IUnknown, (void**)&unk); ok(hr == S_OK, "QueryInterface for IID_IUnknown failed: %08x\n", hr); + ok(unk == (IUnknown*)dmap, "got %p, %p\n", unk, dmap); refcount = IUnknown_AddRef(unk); ok(refcount == 5, "refcount == %u, expected 5\n", refcount); refcount = IUnknown_Release(unk);

1 0

Henri Verbeet : d3d10core: Don' t use potentially uninitialized data in the depth/stencil state key ( Valgrind).
by Alexandre Julliard April 29, 2015

April 29, 2015

Module: wine Branch: master Commit: 0a12107604859f04fdab75eff8240a790221d085 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a12107604859f04fdab75eff… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 28 20:30:54 2015 +0200 d3d10core: Don't use potentially uninitialized data in the depth/stencil state key (Valgrind). --- dlls/d3d10core/device.c | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/dlls/d3d10core/device.c b/dlls/d3d10core/device.c index d8b3d7e..3ba87b4 100644 --- a/dlls/d3d10core/device.c +++ b/dlls/d3d10core/device.c @@ -1744,6 +1744,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateDepthStencilState(ID3D10Devi { struct d3d10_device *device = impl_from_ID3D10Device(iface); struct d3d10_depthstencil_state *object; + D3D10_DEPTH_STENCIL_DESC tmp_desc; struct wine_rb_entry *entry; HRESULT hr; @@ -1752,7 +1753,19 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateDepthStencilState(ID3D10Devi if (!desc) return E_INVALIDARG; - if ((entry = wine_rb_get(&device->depthstencil_states, desc))) + /* D3D10_DEPTH_STENCIL_DESC has a hole, which is a problem because we use + * it as a key in the rbtree. */ + memset(&tmp_desc, 0, sizeof(tmp_desc)); + tmp_desc.DepthEnable = desc->DepthEnable; + tmp_desc.DepthWriteMask = desc->DepthWriteMask; + tmp_desc.DepthFunc = desc->DepthFunc; + tmp_desc.StencilEnable = desc->StencilEnable; + tmp_desc.StencilReadMask = desc->StencilReadMask; + tmp_desc.StencilWriteMask = desc->StencilWriteMask; + tmp_desc.FrontFace = desc->FrontFace; + tmp_desc.BackFace = desc->BackFace; + + if ((entry = wine_rb_get(&device->depthstencil_states, &tmp_desc))) { object = WINE_RB_ENTRY_VALUE(entry, struct d3d10_depthstencil_state, entry); @@ -1767,7 +1780,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateDepthStencilState(ID3D10Devi if (!object) return E_OUTOFMEMORY; - if (FAILED(hr = d3d10_depthstencil_state_init(object, device, desc))) + if (FAILED(hr = d3d10_depthstencil_state_init(object, device, &tmp_desc))) { WARN("Failed to initialize depthstencil state, hr %#x.\n", hr); HeapFree(GetProcessHeap(), 0, object);

1 0

Sebastian Lackner : wine.inf: Add dynamic DST information for Asia/Amman.
by Alexandre Julliard April 29, 2015

April 29, 2015

Module: wine Branch: master Commit: 2501ec7cf29f2b3b95f063a2332cf37abca4691b URL: http://source.winehq.org/git/wine.git/?a=commit;h=2501ec7cf29f2b3b95f063a23… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Tue Apr 28 17:44:59 2015 +0200 wine.inf: Add dynamic DST information for Asia/Amman. --- loader/wine.inf.in | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index 86aa732..40bf26d 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -2845,7 +2845,19 @@ HKLM,%CurrentVersionNT%\Time Zones\Israel Standard Time\Dynamic DST,"2097",1,88, HKLM,%CurrentVersionNT%\Time Zones\Jordan Standard Time,"Display",,"Asia/Amman" HKLM,%CurrentVersionNT%\Time Zones\Jordan Standard Time,"Dlt",,"Jordan Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\Jordan Standard Time,"Std",,"Jordan Standard Time" -HKLM,%CurrentVersionNT%\Time Zones\Jordan Standard Time,"TZI",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,05,00,05,00,01,00,00,00,00,00,00,00,00,00,03,00,04,00,05,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Jordan Standard Time,"TZI",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,05,00,05,00,01,00,00,00,00,00,00,00,00,00,03,00,05,00,05,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Jordan Standard Time\Dynamic DST,"2016",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,e0,07,0a,00,05,00,1c,00,01,00,00,00,00,00,00,00,e0,07,04,00,05,00,01,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Jordan Standard Time\Dynamic DST,"2022",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,e6,07,0a,00,05,00,1c,00,01,00,00,00,00,00,00,00,e6,07,04,00,05,00,01,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Jordan Standard Time\Dynamic DST,"2033",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,f1,07,0a,00,05,00,1c,00,01,00,00,00,00,00,00,00,f1,07,04,00,05,00,01,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Jordan Standard Time\Dynamic DST,"2039",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,f7,07,0a,00,05,00,1c,00,01,00,00,00,00,00,00,00,f7,07,04,00,05,00,01,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Jordan Standard Time\Dynamic DST,"2044",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,fc,07,0a,00,05,00,1c,00,01,00,00,00,00,00,00,00,fc,07,04,00,05,00,01,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Jordan Standard Time\Dynamic DST,"2050",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,02,08,0a,00,05,00,1c,00,01,00,00,00,00,00,00,00,02,08,04,00,05,00,01,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Jordan Standard Time\Dynamic DST,"2061",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,0d,08,0a,00,05,00,1c,00,01,00,00,00,00,00,00,00,0d,08,04,00,05,00,01,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Jordan Standard Time\Dynamic DST,"2067",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,13,08,0a,00,05,00,1c,00,01,00,00,00,00,00,00,00,13,08,04,00,05,00,01,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Jordan Standard Time\Dynamic DST,"2072",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,18,08,0a,00,05,00,1c,00,01,00,00,00,00,00,00,00,18,08,04,00,05,00,01,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Jordan Standard Time\Dynamic DST,"2078",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,1e,08,0a,00,05,00,1c,00,01,00,00,00,00,00,00,00,1e,08,04,00,05,00,01,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Jordan Standard Time\Dynamic DST,"2089",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,29,08,0a,00,05,00,1c,00,01,00,00,00,00,00,00,00,29,08,04,00,05,00,01,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Jordan Standard Time\Dynamic DST,"2095",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,2f,08,0a,00,05,00,1c,00,01,00,00,00,00,00,00,00,2f,08,04,00,05,00,01,00,00,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Korea Standard Time,"Display",,"Asia/Seoul" HKLM,%CurrentVersionNT%\Time Zones\Korea Standard Time,"Dlt",,"Korea Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\Korea Standard Time,"Std",,"Korea Standard Time"

1 0

YongHao Hu : msvcp120/tests: Free msvcp120 library.
by Alexandre Julliard April 29, 2015

April 29, 2015

Module: wine Branch: master Commit: 085d74e69ba379ac49809321756dfa5cd79cc903 URL: http://source.winehq.org/git/wine.git/?a=commit;h=085d74e69ba379ac498093217… Author: YongHao Hu <christopherwuy(a)gmail.com> Date: Wed Apr 29 11:32:06 2015 +0800 msvcp120/tests: Free msvcp120 library. --- dlls/msvcp120/tests/msvcp120.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/msvcp120/tests/msvcp120.c b/dlls/msvcp120/tests/msvcp120.c index e468a7e..32ca437 100644 --- a/dlls/msvcp120/tests/msvcp120.c +++ b/dlls/msvcp120/tests/msvcp120.c @@ -196,4 +196,6 @@ START_TEST(msvcp120) test__Xtime_diff_to_millis2(); test_xtime_get(); test__Getcvt(); + + FreeLibrary(msvcp); }

1 0

Sebastian Lackner : wine.inf: Add dynamic DST information for Pacific/ Fiji.
by Alexandre Julliard April 29, 2015

April 29, 2015

Module: wine Branch: master Commit: d6137739ba723863ceb13b9e759de79f8466c7c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d6137739ba723863ceb13b9e7… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Tue Apr 28 17:38:04 2015 +0200 wine.inf: Add dynamic DST information for Pacific/Fiji. --- loader/wine.inf.in | 38 +++++++++++++++++++++++++++++++++++++- 1 file changed, 37 insertions(+), 1 deletion(-) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index d8a9310..b130ee8 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -2728,7 +2728,43 @@ HKLM,%CurrentVersionNT%\Time Zones\Ekaterinburg Standard Time,"TZI",1,d4,fe,ff,f HKLM,%CurrentVersionNT%\Time Zones\Fiji Standard Time,"Display",,"Pacific/Fiji" HKLM,%CurrentVersionNT%\Time Zones\Fiji Standard Time,"Dlt",,"Fiji Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\Fiji Standard Time,"Std",,"Fiji Standard Time" -HKLM,%CurrentVersionNT%\Time Zones\Fiji Standard Time,"TZI",1,30,fd,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Fiji Standard Time,"TZI",1,30,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,01,00,00,00,03,00,03,00,00,00,00,00,00,00,00,00,0b,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Fiji Standard Time\Dynamic DST,"2016",1,30,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,e0,07,01,00,00,00,18,00,03,00,00,00,00,00,00,00,e0,07,0b,00,00,00,06,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Fiji Standard Time\Dynamic DST,"2017",1,30,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,e1,07,01,00,00,00,16,00,03,00,00,00,00,00,00,00,e1,07,0b,00,00,00,05,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Fiji Standard Time\Dynamic DST,"2021",1,30,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,e5,07,01,00,00,00,18,00,03,00,00,00,00,00,00,00,e5,07,0b,00,00,00,07,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Fiji Standard Time\Dynamic DST,"2022",1,30,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,e6,07,01,00,00,00,17,00,03,00,00,00,00,00,00,00,e6,07,0b,00,00,00,06,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Fiji Standard Time\Dynamic DST,"2023",1,30,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,e7,07,01,00,00,00,16,00,03,00,00,00,00,00,00,00,e7,07,0b,00,00,00,05,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Fiji Standard Time\Dynamic DST,"2027",1,30,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,eb,07,01,00,00,00,18,00,03,00,00,00,00,00,00,00,eb,07,0b,00,00,00,07,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Fiji Standard Time\Dynamic DST,"2028",1,30,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,ec,07,01,00,00,00,17,00,03,00,00,00,00,00,00,00,ec,07,0b,00,00,00,05,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Fiji Standard Time\Dynamic DST,"2033",1,30,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,f1,07,01,00,00,00,17,00,03,00,00,00,00,00,00,00,f1,07,0b,00,00,00,06,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Fiji Standard Time\Dynamic DST,"2034",1,30,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,f2,07,01,00,00,00,16,00,03,00,00,00,00,00,00,00,f2,07,0b,00,00,00,05,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Fiji Standard Time\Dynamic DST,"2038",1,30,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,f6,07,01,00,00,00,18,00,03,00,00,00,00,00,00,00,f6,07,0b,00,00,00,07,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Fiji Standard Time\Dynamic DST,"2039",1,30,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,f7,07,01,00,00,00,17,00,03,00,00,00,00,00,00,00,f7,07,0b,00,00,00,06,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Fiji Standard Time\Dynamic DST,"2040",1,30,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,f8,07,01,00,00,00,16,00,03,00,00,00,00,00,00,00,f8,07,0b,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Fiji Standard Time\Dynamic DST,"2044",1,30,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,fc,07,01,00,00,00,18,00,03,00,00,00,00,00,00,00,fc,07,0b,00,00,00,06,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Fiji Standard Time\Dynamic DST,"2045",1,30,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,fd,07,01,00,00,00,16,00,03,00,00,00,00,00,00,00,fd,07,0b,00,00,00,05,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Fiji Standard Time\Dynamic DST,"2049",1,30,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,01,08,01,00,00,00,18,00,03,00,00,00,00,00,00,00,01,08,0b,00,00,00,07,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Fiji Standard Time\Dynamic DST,"2050",1,30,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,02,08,01,00,00,00,17,00,03,00,00,00,00,00,00,00,02,08,0b,00,00,00,06,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Fiji Standard Time\Dynamic DST,"2051",1,30,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,03,08,01,00,00,00,16,00,03,00,00,00,00,00,00,00,03,08,0b,00,00,00,05,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Fiji Standard Time\Dynamic DST,"2055",1,30,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,07,08,01,00,00,00,18,00,03,00,00,00,00,00,00,00,07,08,0b,00,00,00,07,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Fiji Standard Time\Dynamic DST,"2056",1,30,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,08,08,01,00,00,00,17,00,03,00,00,00,00,00,00,00,08,08,0b,00,00,00,05,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Fiji Standard Time\Dynamic DST,"2061",1,30,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,0d,08,01,00,00,00,17,00,03,00,00,00,00,00,00,00,0d,08,0b,00,00,00,06,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Fiji Standard Time\Dynamic DST,"2062",1,30,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,0e,08,01,00,00,00,16,00,03,00,00,00,00,00,00,00,0e,08,0b,00,00,00,05,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Fiji Standard Time\Dynamic DST,"2066",1,30,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,12,08,01,00,00,00,18,00,03,00,00,00,00,00,00,00,12,08,0b,00,00,00,07,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Fiji Standard Time\Dynamic DST,"2067",1,30,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,13,08,01,00,00,00,17,00,03,00,00,00,00,00,00,00,13,08,0b,00,00,00,06,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Fiji Standard Time\Dynamic DST,"2068",1,30,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,14,08,01,00,00,00,16,00,03,00,00,00,00,00,00,00,14,08,0b,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Fiji Standard Time\Dynamic DST,"2072",1,30,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,18,08,01,00,00,00,18,00,03,00,00,00,00,00,00,00,18,08,0b,00,00,00,06,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Fiji Standard Time\Dynamic DST,"2073",1,30,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,19,08,01,00,00,00,16,00,03,00,00,00,00,00,00,00,19,08,0b,00,00,00,05,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Fiji Standard Time\Dynamic DST,"2077",1,30,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,1d,08,01,00,00,00,18,00,03,00,00,00,00,00,00,00,1d,08,0b,00,00,00,07,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Fiji Standard Time\Dynamic DST,"2078",1,30,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,1e,08,01,00,00,00,17,00,03,00,00,00,00,00,00,00,1e,08,0b,00,00,00,06,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Fiji Standard Time\Dynamic DST,"2079",1,30,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,1f,08,01,00,00,00,16,00,03,00,00,00,00,00,00,00,1f,08,0b,00,00,00,05,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Fiji Standard Time\Dynamic DST,"2083",1,30,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,23,08,01,00,00,00,18,00,03,00,00,00,00,00,00,00,23,08,0b,00,00,00,07,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Fiji Standard Time\Dynamic DST,"2084",1,30,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,24,08,01,00,00,00,17,00,03,00,00,00,00,00,00,00,24,08,0b,00,00,00,05,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Fiji Standard Time\Dynamic DST,"2089",1,30,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,29,08,01,00,00,00,17,00,03,00,00,00,00,00,00,00,29,08,0b,00,00,00,06,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Fiji Standard Time\Dynamic DST,"2090",1,30,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,2a,08,01,00,00,00,16,00,03,00,00,00,00,00,00,00,2a,08,0b,00,00,00,05,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Fiji Standard Time\Dynamic DST,"2094",1,30,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,2e,08,01,00,00,00,18,00,03,00,00,00,00,00,00,00,2e,08,0b,00,00,00,07,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Fiji Standard Time\Dynamic DST,"2095",1,30,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,2f,08,01,00,00,00,17,00,03,00,00,00,00,00,00,00,2f,08,0b,00,00,00,06,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Fiji Standard Time\Dynamic DST,"2096",1,30,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,30,08,01,00,00,00,16,00,03,00,00,00,00,00,00,00,30,08,0b,00,00,00,04,00,02,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\FLE Standard Time,"Display",,"Europe/Helsinki" HKLM,%CurrentVersionNT%\Time Zones\FLE Standard Time,"Dlt",,"FLE Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\FLE Standard Time,"Std",,"FLE Standard Time"

1 0

Andrew Eikum : dsound: Apply rolloff factor to distance attenuation.
by Alexandre Julliard April 29, 2015

April 29, 2015

Module: wine Branch: master Commit: 2edb4bf320f5c09b658c382c8d8b9d9600d1f1e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2edb4bf320f5c09b658c382c8… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Tue Apr 28 10:21:04 2015 -0500 dsound: Apply rolloff factor to distance attenuation. --- dlls/dsound/sound3d.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dsound/sound3d.c b/dlls/dsound/sound3d.c index 5eb02a6..e428053 100644 --- a/dlls/dsound/sound3d.c +++ b/dlls/dsound/sound3d.c @@ -207,7 +207,7 @@ void DSOUND_Calc3DBuffer(IDirectSoundBufferImpl *dsb) flDistance = dsb->ds3db_ds3db.flMinDistance; /* attenuation proportional to the distance squared, converted to millibels as in lVolume*/ - lVolume -= log10(flDistance/dsb->ds3db_ds3db.flMinDistance * flDistance/dsb->ds3db_ds3db.flMinDistance)*1000; + lVolume -= log10(flDistance/dsb->ds3db_ds3db.flMinDistance * flDistance/dsb->ds3db_ds3db.flMinDistance)*1000 * dsb->device->ds3dl.flRolloffFactor; TRACE("dist. att: Distance = %f, MinDistance = %f => adjusting volume %d to %f\n", flDistance, dsb->ds3db_ds3db.flMinDistance, dsb->ds3db_lVolume, lVolume); /* conning */

1 0

Michael Müller : wbemprox: Allow connecting to localhost.
by Alexandre Julliard April 29, 2015

April 29, 2015

Module: wine Branch: master Commit: 99619619011a171a7b7fe1399b577779a69ac359 URL: http://source.winehq.org/git/wine.git/?a=commit;h=99619619011a171a7b7fe1399… Author: Michael Müller <michael(a)fds-team.de> Date: Thu Apr 16 21:27:22 2015 +0200 wbemprox: Allow connecting to localhost. --- dlls/wbemprox/tests/services.c | 6 +++++- dlls/wbemprox/wbemlocator.c | 3 ++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/wbemprox/tests/services.c b/dlls/wbemprox/tests/services.c index 8ab6e83..4c42a50 100644 --- a/dlls/wbemprox/tests/services.c +++ b/dlls/wbemprox/tests/services.c @@ -111,6 +111,8 @@ static void test_IWbemLocator(void) static const WCHAR path22W[] = {'r','o','o','t','\\','d','e','f','a','u','l','t',0}; static const WCHAR path23W[] = {'r','o','o','t','\\','c','i','m','v','0',0}; static const WCHAR path24W[] = {'r','o','o','t','\\','c','i','m','v','1',0}; + static const WCHAR path25W[] = {'\\','\\','l','o','c','a','l','h','o','s','t','\\','R','O','O','T',0}; + static const WCHAR path26W[] = {'\\','\\','L','O','C','A','L','H','O','S','T','\\','R','O','O','T',0}; static const struct { const WCHAR *path; @@ -144,7 +146,9 @@ static void test_IWbemLocator(void) { path21W, S_OK }, { path22W, S_OK }, { path23W, WBEM_E_INVALID_NAMESPACE }, - { path24W, WBEM_E_INVALID_NAMESPACE } + { path24W, WBEM_E_INVALID_NAMESPACE }, + { path25W, S_OK }, + { path26W, S_OK } }; IWbemLocator *locator; IWbemServices *services; diff --git a/dlls/wbemprox/wbemlocator.c b/dlls/wbemprox/wbemlocator.c index 463e6d4..6ed0aed 100644 --- a/dlls/wbemprox/wbemlocator.c +++ b/dlls/wbemprox/wbemlocator.c @@ -89,10 +89,11 @@ static HRESULT WINAPI wbem_locator_QueryInterface( static BOOL is_local_machine( const WCHAR *server ) { static const WCHAR dotW[] = {'.',0}; + static const WCHAR localhostW[] = {'l','o','c','a','l','h','o','s','t',0}; WCHAR buffer[MAX_COMPUTERNAME_LENGTH + 1]; DWORD len = sizeof(buffer) / sizeof(buffer[0]); - if (!server || !strcmpW( server, dotW )) return TRUE; + if (!server || !strcmpW( server, dotW ) || !strcmpiW( server, localhostW )) return TRUE; if (GetComputerNameW( buffer, &len ) && !strcmpiW( server, buffer )) return TRUE; return FALSE; }

1 0

Sebastian Lackner : wine.inf: Add dynamic DST information for America/ Sao_Paulo.
by Alexandre Julliard April 29, 2015

April 29, 2015

Module: wine Branch: master Commit: 8dfcc397082e8618ceb5b4566d76960a165ec850 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8dfcc397082e8618ceb5b4566… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Tue Apr 28 17:35:06 2015 +0200 wine.inf: Add dynamic DST information for America/Sao_Paulo. --- loader/wine.inf.in | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index 1e4de94..d8a9310 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -2707,7 +2707,12 @@ HKLM,%CurrentVersionNT%\Time Zones\E. Europe Standard Time,"TZI",1,4c,ff,ff,ff,0 HKLM,%CurrentVersionNT%\Time Zones\E. South America Standard Time,"Display",,"America/Sao_Paulo" HKLM,%CurrentVersionNT%\Time Zones\E. South America Standard Time,"Dlt",,"E. South America Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\E. South America Standard Time,"Std",,"E. South America Standard Time" -HKLM,%CurrentVersionNT%\Time Zones\E. South America Standard Time,"TZI",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,02,00,00,00,03,00,00,00,00,00,00,00,00,00,00,00,0a,00,00,00,02,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\E. South America Standard Time,"TZI",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,02,00,00,00,03,00,00,00,00,00,00,00,00,00,00,00,0a,00,00,00,03,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\E. South America Standard Time\Dynamic DST,"2015",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,df,07,02,00,00,00,16,00,00,00,00,00,00,00,00,00,df,07,0a,00,00,00,12,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\E. South America Standard Time\Dynamic DST,"2023",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,e7,07,02,00,00,00,1a,00,00,00,00,00,00,00,00,00,e7,07,0a,00,00,00,0f,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\E. South America Standard Time\Dynamic DST,"2026",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,ea,07,02,00,00,00,16,00,00,00,00,00,00,00,00,00,ea,07,0a,00,00,00,12,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\E. South America Standard Time\Dynamic DST,"2034",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,f2,07,02,00,00,00,1a,00,00,00,00,00,00,00,00,00,f2,07,0a,00,00,00,0f,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\E. South America Standard Time\Dynamic DST,"2037",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,f5,07,02,00,00,00,16,00,00,00,00,00,00,00,00,00,f5,07,0a,00,00,00,12,00,00,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Eastern Standard Time,"Display",,"America/New_York" HKLM,%CurrentVersionNT%\Time Zones\Eastern Standard Time,"Dlt",,"Eastern Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\Eastern Standard Time,"Std",,"Eastern Standard Time"

1 0

Alexandre Julliard : msi: Inherit state for radio buttons from the parent group dynamically.
by Alexandre Julliard April 29, 2015

April 29, 2015

Module: wine Branch: master Commit: 12a2b849a652da0e79fd37ccaac58a62f10482c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=12a2b849a652da0e79fd37cca… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 29 12:22:57 2015 +0900 msi: Inherit state for radio buttons from the parent group dynamically. --- dlls/msi/dialog.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/dlls/msi/dialog.c b/dlls/msi/dialog.c index 0b81951..5d3527f 100644 --- a/dlls/msi/dialog.c +++ b/dlls/msi/dialog.c @@ -121,7 +121,6 @@ typedef struct { msi_dialog* dialog; msi_control *parent; - DWORD attributes; LPWSTR propval; } radio_button_group_descr; @@ -2261,15 +2260,10 @@ static UINT msi_dialog_create_radiobutton( MSIRECORD *rec, LPVOID param ) msi_dialog *dialog = group->dialog; msi_control *control; LPCWSTR prop, text, name; - DWORD style, attributes = group->attributes; + DWORD style = WS_CHILD | WS_VISIBLE | WS_TABSTOP | BS_AUTORADIOBUTTON | BS_MULTILINE; - style = WS_CHILD | BS_AUTORADIOBUTTON | BS_MULTILINE | WS_TABSTOP; name = MSI_RecordGetString( rec, 3 ); text = MSI_RecordGetString( rec, 8 ); - if( attributes & msidbControlAttributesVisible ) - style |= WS_VISIBLE; - if( ~attributes & msidbControlAttributesEnabled ) - style |= WS_DISABLED; control = dialog_create_window( dialog, rec, 0, szButton, name, text, style, group->parent->hwnd ); @@ -2332,6 +2326,10 @@ static UINT msi_dialog_radiogroup_control( msi_dialog *dialog, MSIRECORD *rec ) TRACE("%p %p %s\n", dialog, rec, debugstr_w( prop )); attr = MSI_RecordGetInteger( rec, 8 ); + if (attr & msidbControlAttributesVisible) + style |= WS_VISIBLE; + if (~attr & msidbControlAttributesEnabled) + style |= WS_DISABLED; if (attr & msidbControlAttributesHasBorder) style |= BS_GROUPBOX; else @@ -2361,7 +2359,6 @@ static UINT msi_dialog_radiogroup_control( msi_dialog *dialog, MSIRECORD *rec ) group.dialog = dialog; group.parent = control; - group.attributes = MSI_RecordGetInteger( rec, 8 ); group.propval = msi_dup_property( dialog->package->db, control->property ); r = MSI_IterateRecords( view, 0, msi_dialog_create_radiobutton, &group );

1 0

Huw Davies : comctl32: A change in TBSTYLE_WRAPABLE should produce a recalc.
by Alexandre Julliard April 28, 2015

April 28, 2015

Module: wine Branch: master Commit: abd673bde93b76a361ddf7342c538c2dd99af2bd URL: http://source.winehq.org/git/wine.git/?a=commit;h=abd673bde93b76a361ddf7342… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Apr 28 11:32:01 2015 +0100 comctl32: A change in TBSTYLE_WRAPABLE should produce a recalc. --- dlls/comctl32/tests/toolbar.c | 46 +++++++++++++++++++++++++++++++++++++++++-- dlls/comctl32/toolbar.c | 4 +++- 2 files changed, 47 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/tests/toolbar.c b/dlls/comctl32/tests/toolbar.c index d3088f9..365bfe2 100644 --- a/dlls/comctl32/tests/toolbar.c +++ b/dlls/comctl32/tests/toolbar.c @@ -1388,12 +1388,12 @@ static void restore_recalc_state(HWND hToolbar) RECT rect; /* return to style with a 2px top margin */ SetWindowLongA(hToolbar, GWL_STYLE, - GetWindowLongA(hToolbar, GWL_STYLE) & ~TBSTYLE_FLAT); + SendMessageA(hToolbar, TB_GETSTYLE, 0, 0) & ~TBSTYLE_FLAT); /* recalc */ SendMessageA(hToolbar, TB_ADDBUTTONSA, 1, (LPARAM)&buttons3[3]); /* top margin will be 0px if a recalc occurs */ SetWindowLongA(hToolbar, GWL_STYLE, - GetWindowLongA(hToolbar, GWL_STYLE) | TBSTYLE_FLAT); + SendMessageA(hToolbar, TB_GETSTYLE, 0, 0) | TBSTYLE_FLAT); /* safety check */ SendMessageA(hToolbar, TB_GETITEMRECT, 1, (LPARAM)&rect); ok(rect.top == 2, "Test will make no sense because initial top is %d instead of 2\n", @@ -1408,6 +1408,7 @@ static void test_recalc(void) const int EX_STYLES_COUNT = 5; int i; BOOL recalc; + DWORD style; /* Like TB_ADDBUTTONSA tested in test_sized, inserting a button without text * results in a relayout, while adding one with text forces a recalc */ @@ -1468,6 +1469,47 @@ static void test_recalc(void) /* undocumented exstyle 0x2 seems to change the top margin, which * interferes with these tests */ + /* Show that a change in TBSTYLE_WRAPABLE causes a recalc */ + prepare_recalc_test(&hToolbar); + style = SendMessageA(hToolbar, TB_GETSTYLE, 0, 0); + SendMessageA(hToolbar, TB_SETSTYLE, 0, style); + recalc = did_recalc(hToolbar); + ok(!recalc, "recalc %d\n", recalc); + + SendMessageA(hToolbar, TB_SETSTYLE, 0, style | TBSTYLE_TOOLTIPS | TBSTYLE_TRANSPARENT | CCS_BOTTOM); + recalc = did_recalc(hToolbar); + ok(!recalc, "recalc %d\n", recalc); + + SendMessageA(hToolbar, TB_SETSTYLE, 0, style | TBSTYLE_WRAPABLE); + recalc = did_recalc(hToolbar); + ok(recalc, "recalc %d\n", recalc); + restore_recalc_state(hToolbar); + + SendMessageA(hToolbar, TB_SETSTYLE, 0, style | TBSTYLE_WRAPABLE); + recalc = did_recalc(hToolbar); + ok(!recalc, "recalc %d\n", recalc); + + SendMessageA(hToolbar, TB_SETSTYLE, 0, style); + recalc = did_recalc(hToolbar); + ok(recalc, "recalc %d\n", recalc); + restore_recalc_state(hToolbar); + + /* Changing CCS_VERT does not recalc */ + SendMessageA(hToolbar, TB_SETSTYLE, 0, style | CCS_VERT); + recalc = did_recalc(hToolbar); + ok(!recalc, "recalc %d\n", recalc); + restore_recalc_state(hToolbar); + + SendMessageA(hToolbar, TB_SETSTYLE, 0, style); + recalc = did_recalc(hToolbar); + ok(!recalc, "recalc %d\n", recalc); + restore_recalc_state(hToolbar); + + /* Setting the window's style directly also causes recalc */ + SetWindowLongA(hToolbar, GWL_STYLE, style | TBSTYLE_WRAPABLE); + recalc = did_recalc(hToolbar); + ok(recalc, "recalc %d\n", recalc); + DestroyWindow(hToolbar); } diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c index 695e450..b2f13c5 100644 --- a/dlls/comctl32/toolbar.c +++ b/dlls/comctl32/toolbar.c @@ -4934,7 +4934,9 @@ TOOLBAR_SetStyle (TOOLBAR_INFO *infoPtr, DWORD style) infoPtr->dwStyle = style; TOOLBAR_CheckStyle(infoPtr); - if ((dwOldStyle ^ style) & (TBSTYLE_WRAPABLE | CCS_VERT)) + if ((dwOldStyle ^ style) & TBSTYLE_WRAPABLE) + TOOLBAR_CalcToolbar(infoPtr); + else if ((dwOldStyle ^ style) & CCS_VERT) TOOLBAR_LayoutToolbar(infoPtr); /* only resize if one of the CCS_* styles was changed */

1 0