June 2017 - Wine-commits - list.winehq.org

Hugh McMaster : regedit/tests: Test line concatenation with comments, new lines and comma variations before a new default registry value.
by Alexandre Julliard 27 Jun '17

27 Jun '17

Module: wine Branch: master Commit: a31f070adaf8e3ecd3c42e651054ac09a1d1fe58 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a31f070adaf8e3ecd3c42e651… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Tue Jun 27 12:31:08 2017 +0000 regedit/tests: Test line concatenation with comments, new lines and comma variations before a new default registry value. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/tests/regedit.c | 42 +++++++++++++++++++++++++++++++++++++++- 1 file changed, 41 insertions(+), 1 deletion(-) diff --git a/programs/regedit/tests/regedit.c b/programs/regedit/tests/regedit.c index 706b987..ba372b4 100644 --- a/programs/regedit/tests/regedit.c +++ b/programs/regedit/tests/regedit.c @@ -559,7 +559,7 @@ static void test_invalid_import(void) exec_import_str("REGEDIT4\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" "\"TestNoEndQuote\"=\"Asdffdsa\n"); - lr = RegOpenKeyExA(HKEY_CURRENT_USER, KEY_BASE, 0, KEY_READ, &hkey); + lr = RegOpenKeyExA(HKEY_CURRENT_USER, KEY_BASE, 0, KEY_READ|KEY_SET_VALUE, &hkey); ok(lr == ERROR_SUCCESS, "RegOpenKeyExA failed: %d\n", lr); verify_reg_nonexist(hkey, "TestNoEndQuote"); @@ -961,6 +961,46 @@ static void test_invalid_import(void) verify_reg_nonexist(hkey, "Wine27i"); todo_wine verify_reg(hkey, "Wine27j", REG_EXPAND_SZ, "%PATH%", 7, 0); + exec_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine28a\"=hex(2):4c,69,6e,65,20,\\\n" + "@=\"Default value 1\"\n\n"); + verify_reg_nonexist(hkey, "Wine28a"); + verify_reg_nonexist(hkey, NULL); + + exec_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine28b\"=hex(2):4c,69,6e,65,20,\\\n" + ";comment\n" + "@=\"Default value 2\"\n\n"); + verify_reg_nonexist(hkey, "Wine28b"); + todo_wine verify_reg_nonexist(hkey, NULL); + + exec_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine28c\"=hex(2):4c,69,6e,65,20,\\\n" + "#comment\n" + "@=\"Default value 3\"\n\n"); + verify_reg_nonexist(hkey, "Wine28c"); + verify_reg(hkey, NULL, REG_SZ, "Default value 3", 16, 0); + + lr = RegDeleteValueW(hkey, NULL); + ok(lr == ERROR_SUCCESS, "RegDeleteValue failed: %u\n", lr); + + exec_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine28d\"=hex(2):4c,69,6e,65,20,\\\n\n" + "@=\"Default value 4\"\n\n"); + todo_wine verify_reg_nonexist(hkey, "Wine28d"); + todo_wine verify_reg_nonexist(hkey, NULL); + + exec_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine28e\"=hex(2):4c,69,6e,65,20\\\n" + "@=\"Default value 5\"\n\n"); + verify_reg_nonexist(hkey, "Wine28e"); + verify_reg(hkey, NULL, REG_SZ, "Default value 5", 16, TODO_REG_DATA); + RegCloseKey(hkey); lr = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE);

1 0

Hugh McMaster : regedit/tests: Test whether a line beginning with a backslash can follow a line ending in a backslash.
by Alexandre Julliard 27 Jun '17

27 Jun '17

Module: wine Branch: master Commit: a9726d0b902e3d48b7c1c96029a2a7fe891f6af2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a9726d0b902e3d48b7c1c9602… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Tue Jun 27 12:31:15 2017 +0000 regedit/tests: Test whether a line beginning with a backslash can follow a line ending in a backslash. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/tests/regedit.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/programs/regedit/tests/regedit.c b/programs/regedit/tests/regedit.c index ba372b4..c293f4a 100644 --- a/programs/regedit/tests/regedit.c +++ b/programs/regedit/tests/regedit.c @@ -1001,6 +1001,17 @@ static void test_invalid_import(void) verify_reg_nonexist(hkey, "Wine28e"); verify_reg(hkey, NULL, REG_SZ, "Default value 5", 16, TODO_REG_DATA); + exec_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine29a\"=hex:11,22,33,\\\n" + "\\\n" + " 44,55,66\n" + "\"Wine29b\"=hex:11,22,33,\\\n" + " \\\n" + " 44,55,66\n\n"); + todo_wine verify_reg_nonexist(hkey, "Wine29a"); + todo_wine verify_reg_nonexist(hkey, "Wine29b"); + RegCloseKey(hkey); lr = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE);

1 0

Hugh McMaster : regedit/tests: Test the effects of comments and new lines that appear between valid hex data lines.
by Alexandre Julliard 27 Jun '17

27 Jun '17

Module: wine Branch: master Commit: 81fa51743605b34881047962f48651e06217fd94 URL: http://source.winehq.org/git/wine.git/?a=commit;h=81fa51743605b34881047962f… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Tue Jun 27 12:31:24 2017 +0000 regedit/tests: Test the effects of comments and new lines that appear between valid hex data lines. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/tests/regedit.c | 45 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) diff --git a/programs/regedit/tests/regedit.c b/programs/regedit/tests/regedit.c index c293f4a..f7334e4 100644 --- a/programs/regedit/tests/regedit.c +++ b/programs/regedit/tests/regedit.c @@ -1266,6 +1266,42 @@ static void test_comments(void) todo_wine verify_reg(hkey, "Wine28e", REG_EXPAND_SZ, "%HOME%\\%PATH%", 14, 0); verify_reg_nonexist(hkey, "Wine28f"); + exec_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine29a\"=hex(7):4c,69,6e,65,20,\\\n" + " 63,6f,6e,63,61,74,\\\n" + ";comment\n" + " 65,6e,\\;comment\n" + " 61,74,69,6f,6e,00,00\n\n"); + todo_wine verify_reg(hkey, "Wine29a", REG_MULTI_SZ, "Line concatenation\0", 20, 0); + + exec_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine29b\"=hex(7):4c,69,6e,65,20,\\\n" + " 63,6f,6e,63,61,74,\\\n" + " ;comment\n" + " 65,6e,\\;comment\n" + " 61,74,69,6f,6e,00,00\n\n"); + todo_wine verify_reg(hkey, "Wine29b", REG_MULTI_SZ, "Line concatenation\0", 20, 0); + + exec_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine29c\"=hex(7):4c,69,6e,65,20,\\\n" + " 63,6f,6e,63,61,74,\\\n" + "#comment\n" + " 65,6e,\\;comment\n" + " 61,74,69,6f,6e,00,00\n\n"); + verify_reg_nonexist(hkey, "Wine29c"); + + exec_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine29d\"=hex(7):4c,69,6e,65,20,\\\n" + " 63,6f,6e,63,61,74,\\\n" + " #comment\n" + " 65,6e,\\;comment\n" + " 61,74,69,6f,6e,00,00\n\n"); + verify_reg_nonexist(hkey, "Wine29d"); + RegCloseKey(hkey); lr = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE); @@ -1394,6 +1430,15 @@ static void test_import_with_whitespace(void) "\t@\t=\tdword:\t00000008\t\n\n"); verify_reg(hkey, "", REG_DWORD, &dword, sizeof(DWORD), 0); + exec_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine10\"=hex(7):4c,69,6e,65,20,\\\n" + " 63,6f,6e,\\\n\n" + " 63,61,74,\\\n\n\n" + " 65,6e,\\\n\n\n\n" + " 61,74,69,6f,6e,00,00\n\n"); + verify_reg(hkey, "Wine10", REG_MULTI_SZ, "Line concatenation\0", 20, TODO_REG_SIZE); + lr = RegCloseKey(hkey); ok(lr == ERROR_SUCCESS, "RegCloseKey failed: got %d, expected 0\n", lr);

1 0

Hugh McMaster : regedit/tests: Test whether a forward slash can be used as a concatenation marker.
by Alexandre Julliard 27 Jun '17

27 Jun '17

Module: wine Branch: master Commit: 82d3be80948390c84d8528078eb3d6eadc349bdb URL: http://source.winehq.org/git/wine.git/?a=commit;h=82d3be80948390c84d8528078… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Tue Jun 27 12:33:11 2017 +0000 regedit/tests: Test whether a forward slash can be used as a concatenation marker. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/tests/regedit.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/programs/regedit/tests/regedit.c b/programs/regedit/tests/regedit.c index f7334e4..79213c6 100644 --- a/programs/regedit/tests/regedit.c +++ b/programs/regedit/tests/regedit.c @@ -1012,6 +1012,15 @@ static void test_invalid_import(void) todo_wine verify_reg_nonexist(hkey, "Wine29a"); todo_wine verify_reg_nonexist(hkey, "Wine29b"); + exec_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine30a\"=hex(0):25,48,4f,4d,45,25,5c,/\n" + " 25,50,41,54,48,25,00\n" + "\"Wine30b\"=hex(0):25,48,4f,4d,45,25,5c/\n" + " 25,50,41,54,48,25,00\n\n"); + verify_reg_nonexist(hkey, "Wine30a"); + verify_reg_nonexist(hkey, "Wine30b"); + RegCloseKey(hkey); lr = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE);

1 0

Hugh McMaster : regedit/tests: Test whether EOF invalidates a hex data line ending in a backslash.
by Alexandre Julliard 27 Jun '17

27 Jun '17

Module: wine Branch: master Commit: ec0043f0839d6a9b617858ce8512194805d5754f URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec0043f0839d6a9b617858ce8… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Tue Jun 27 12:37:12 2017 +0000 regedit/tests: Test whether EOF invalidates a hex data line ending in a backslash. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/tests/regedit.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/programs/regedit/tests/regedit.c b/programs/regedit/tests/regedit.c index 79213c6..fec6e3e 100644 --- a/programs/regedit/tests/regedit.c +++ b/programs/regedit/tests/regedit.c @@ -486,6 +486,15 @@ static void test_basic_import(void) " 25,48,4f,4d,45,25,00\n\n"); verify_reg(hkey, "Wine16", REG_EXPAND_SZ, "%HOME%", 7, 0); + exec_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine62a\"=hex(7):4c,69,6e,65,20,\\"); + lr = RegQueryValueExA(hkey, "Wine62a", NULL, NULL, NULL, NULL); + todo_wine ok(lr == ERROR_SUCCESS || broken(lr == ERROR_FILE_NOT_FOUND) /* WinXP */, + "got %u, expected 0\n", lr); + if (lr == ERROR_SUCCESS) + todo_wine verify_reg(hkey, "Wine62a", REG_MULTI_SZ, "Line ", 6, 0); + RegCloseKey(hkey); lr = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE); @@ -1021,6 +1030,11 @@ static void test_invalid_import(void) verify_reg_nonexist(hkey, "Wine30a"); verify_reg_nonexist(hkey, "Wine30b"); + exec_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine62b\"=hex(7):4c,69,6e,65,20\\"); + verify_reg_nonexist(hkey, "Wine62b"); + RegCloseKey(hkey); lr = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE);

1 0

Alistair Leslie-Hughes : dsound: Free MMDevice on Release.
by Alexandre Julliard 27 Jun '17

27 Jun '17

Module: wine Branch: master Commit: a731eaa705dc844f484f4e8153e73ddb9dcade52 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a731eaa705dc844f484f4e815… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sun Jun 25 10:42:46 2017 +0000 dsound: Free MMDevice on Release. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dsound/dsound.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/dsound/dsound.c b/dlls/dsound/dsound.c index e8c10a7..a8b20b1 100644 --- a/dlls/dsound/dsound.c +++ b/dlls/dsound/dsound.c @@ -232,7 +232,8 @@ static ULONG DirectSoundDevice_Release(DirectSoundDevice * device) IAudioRenderClient_Release(device->render); if(device->volume) IAudioStreamVolume_Release(device->volume); - + if(device->mmdevice) + IMMDevice_Release(device->mmdevice); HeapFree(GetProcessHeap(), 0, device->tmp_buffer); HeapFree(GetProcessHeap(), 0, device->cp_buffer); HeapFree(GetProcessHeap(), 0, device->buffer);

1 0

Nikolay Sivov : d3drm: Store animated frame pointer in animation object.
by Alexandre Julliard 27 Jun '17

27 Jun '17

Module: wine Branch: master Commit: 9b35d5c6d47d1956ff687c5f4440876e03266b40 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b35d5c6d47d1956ff687c5f4… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jun 27 11:17:11 2017 +0300 d3drm: Store animated frame pointer in animation object. 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_private.h | 1 + dlls/d3drm/frame.c | 37 +++++++++++++++++++++++++++++++------ dlls/d3drm/tests/d3drm.c | 38 ++++++++++++++++++++++++++++++++++++++ 3 files changed, 70 insertions(+), 6 deletions(-) diff --git a/dlls/d3drm/d3drm_private.h b/dlls/d3drm/d3drm_private.h index f2a6131..802a171 100644 --- a/dlls/d3drm/d3drm_private.h +++ b/dlls/d3drm/d3drm_private.h @@ -213,6 +213,7 @@ struct d3drm_animation IDirect3DRMAnimation IDirect3DRMAnimation_iface; LONG ref; IDirect3DRM *d3drm; + IDirect3DRMFrame3 *frame; }; struct d3drm_wrap diff --git a/dlls/d3drm/frame.c b/dlls/d3drm/frame.c index 5969b50..c95c5df 100644 --- a/dlls/d3drm/frame.c +++ b/dlls/d3drm/frame.c @@ -3277,9 +3277,21 @@ static HRESULT WINAPI d3drm_animation1_DeleteKey(IDirect3DRMAnimation *iface, D3 static HRESULT WINAPI d3drm_animation1_SetFrame(IDirect3DRMAnimation *iface, IDirect3DRMFrame *frame) { - FIXME("iface %p, frame %p.\n", iface, frame); + struct d3drm_animation *animation = impl_from_IDirect3DRMAnimation(iface); + HRESULT hr = D3DRM_OK; - return E_NOTIMPL; + TRACE("iface %p, frame %p.\n", iface, frame); + + if (frame) + { + hr = IDirect3DRMFrame_QueryInterface(frame, &IID_IDirect3DRMFrame3, (void **)&animation->frame); + if (SUCCEEDED(hr)) + IDirect3DRMFrame3_Release(animation->frame); + } + else + animation->frame = NULL; + + return hr; } static HRESULT WINAPI d3drm_animation1_SetTime(IDirect3DRMAnimation *iface, D3DVALUE time) @@ -3335,9 +3347,13 @@ static HRESULT WINAPI d3drm_animation2_DeleteKey(IDirect3DRMAnimation2 *iface, D static HRESULT WINAPI d3drm_animation2_SetFrame(IDirect3DRMAnimation2 *iface, IDirect3DRMFrame3 *frame) { - FIXME("iface %p, frame %p.\n", iface, frame); + struct d3drm_animation *animation = impl_from_IDirect3DRMAnimation2(iface); - return E_NOTIMPL; + TRACE("iface %p, frame %p.\n", iface, frame); + + animation->frame = frame; + + return D3DRM_OK; } static HRESULT WINAPI d3drm_animation2_SetTime(IDirect3DRMAnimation2 *iface, D3DVALUE time) @@ -3356,9 +3372,18 @@ static D3DRMANIMATIONOPTIONS WINAPI d3drm_animation2_GetOptions(IDirect3DRMAnima static HRESULT WINAPI d3drm_animation2_GetFrame(IDirect3DRMAnimation2 *iface, IDirect3DRMFrame3 **frame) { - FIXME("iface %p, frame %p.\n", iface, frame); + struct d3drm_animation *animation = impl_from_IDirect3DRMAnimation2(iface); - return E_NOTIMPL; + TRACE("iface %p, frame %p.\n", iface, frame); + + if (!frame) + return D3DRMERR_BADVALUE; + + *frame = animation->frame; + if (*frame) + IDirect3DRMFrame3_AddRef(*frame); + + return D3DRM_OK; } static HRESULT WINAPI d3drm_animation2_DeleteKeyByID(IDirect3DRMAnimation2 *iface, DWORD id) diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index ff1aadd..051f8cb 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -6707,6 +6707,8 @@ static void test_animation(void) IDirect3DRMAnimation2 *animation2; IDirect3DRMAnimation *animation; IDirect3DRMObject *obj, *obj2; + IDirect3DRMFrame3 *frame3; + IDirect3DRMFrame *frame; IDirect3DRM *d3drm1; HRESULT hr; @@ -6738,6 +6740,42 @@ static void test_animation(void) IDirect3DRMObject_Release(obj); IDirect3DRMObject_Release(obj2); + /* Set animated frame, get it back. */ + hr = IDirect3DRM_CreateFrame(d3drm1, NULL, &frame); + ok(SUCCEEDED(hr), "Failed to create a frame, hr %#x.\n", hr); + + hr = IDirect3DRMAnimation_SetFrame(animation, NULL); + ok(SUCCEEDED(hr), "Failed to reset frame, hr %#x.\n", hr); + + CHECK_REFCOUNT(frame, 1); + hr = IDirect3DRMAnimation_SetFrame(animation, frame); + ok(SUCCEEDED(hr), "Failed to set a frame, hr %#x.\n", hr); + CHECK_REFCOUNT(frame, 1); + + hr = IDirect3DRMAnimation2_GetFrame(animation2, NULL); + ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#x.\n", hr); + + hr = IDirect3DRMAnimation2_GetFrame(animation2, &frame3); + ok(SUCCEEDED(hr), "Failed to get the frame, %#x.\n", hr); + ok(frame3 != (void *)frame, "Unexpected interface pointer.\n"); + CHECK_REFCOUNT(frame, 2); + + IDirect3DRMFrame3_Release(frame3); + + hr = IDirect3DRMAnimation_SetFrame(animation, NULL); + ok(SUCCEEDED(hr), "Failed to reset frame, hr %#x.\n", hr); + + hr = IDirect3DRMFrame_QueryInterface(frame, &IID_IDirect3DRMFrame3, (void **)&frame3); + ok(SUCCEEDED(hr), "Failed to get IDirect3DRMFrame3, hr %#x.\n", hr); + + CHECK_REFCOUNT(frame3, 2); + hr = IDirect3DRMAnimation2_SetFrame(animation2, frame3); + ok(SUCCEEDED(hr), "Failed to set a frame, hr %#x.\n", hr); + CHECK_REFCOUNT(frame3, 2); + + IDirect3DRMFrame3_Release(frame3); + IDirect3DRMFrame_Release(frame); + IDirect3DRMAnimation2_Release(animation2); IDirect3DRMAnimation_Release(animation);

1 0

Paul Gofman : d3dx9: Remove redundant parameter size check in set_constants().
by Alexandre Julliard 27 Jun '17

27 Jun '17

Module: wine Branch: master Commit: ed7e27ad8db2c08afbf222d80ec0d6d093ad4498 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed7e27ad8db2c08afbf222d80… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Thu Jun 22 16:11:54 2017 +0300 d3dx9: Remove redundant parameter size check in set_constants(). Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/preshader.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/dlls/d3dx9_36/preshader.c b/dlls/d3dx9_36/preshader.c index 7ca0c8f..3b06f66 100644 --- a/dlls/d3dx9_36/preshader.c +++ b/dlls/d3dx9_36/preshader.c @@ -1181,11 +1181,6 @@ static void set_constants(struct d3dx_regstore *rs, struct d3dx_const_tab *const param_offset = i + j * info.major; else param_offset = i * info.minor + j; - if (param_offset * sizeof(unsigned int) >= param->bytes) - { - WARN("Parameter data is too short, name %s, component %u.\n", debugstr_a(param->name), i); - break; - } out[offset] = data[param_offset]; } }

1 0

Dmitry Timoshkov : windowscodecs/tests: Add more tests for IWICMetadataQueryReader::GetMetadataByName.
by Alexandre Julliard 27 Jun '17

27 Jun '17

Module: wine Branch: master Commit: ad76bbec2264f6b759fb7c64e9e358aee7b2ad30 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ad76bbec2264f6b759fb7c64e… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Sun Jun 25 13:24:30 2017 +0800 windowscodecs/tests: Add more tests for IWICMetadataQueryReader::GetMetadataByName. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/tests/Makefile.in | 2 +- dlls/windowscodecs/tests/metadata.c | 619 +++++++++++++++++++++++++++++++++++ po/ar.po | 480 ++++++++++++++++++++++++++- po/bg.po | 437 ++++++++++++++++++++++++- po/ca.po | 482 ++++++++++++++++++++++++++- po/cs.po | 478 ++++++++++++++++++++++++++- po/da.po | 482 ++++++++++++++++++++++++++- po/de.po | 482 ++++++++++++++++++++++++++- po/el.po | 422 +++++++++++++++++++++++- po/en.po | 402 ++++++++++++++++++++++- po/en_US.po | 402 ++++++++++++++++++++++- po/eo.po | 456 +++++++++++++++++++++++++- po/es.po | 482 ++++++++++++++++++++++++++- po/fa.po | 415 ++++++++++++++++++++++- po/fi.po | 482 ++++++++++++++++++++++++++- po/fr.po | 482 ++++++++++++++++++++++++++- po/he.po | 455 ++++++++++++++++++++++++- po/hi.po | 410 ++++++++++++++++++++++- po/hr.po | 476 ++++++++++++++++++++++++++- po/hu.po | 482 ++++++++++++++++++++++++++- po/it.po | 482 ++++++++++++++++++++++++++- po/ja.po | 482 ++++++++++++++++++++++++++- po/ko.po | 482 ++++++++++++++++++++++++++- po/lt.po | 482 ++++++++++++++++++++++++++- po/ml.po | 410 ++++++++++++++++++++++- po/nb_NO.po | 482 ++++++++++++++++++++++++++- po/nl.po | 482 ++++++++++++++++++++++++++- po/or.po | 410 ++++++++++++++++++++++- po/pa.po | 410 ++++++++++++++++++++++- po/pl.po | 482 ++++++++++++++++++++++++++- po/pt_BR.po | 482 ++++++++++++++++++++++++++- po/pt_PT.po | 482 ++++++++++++++++++++++++++- po/rm.po | 416 ++++++++++++++++++++++- po/ro.po | 479 ++++++++++++++++++++++++++- po/ru.po | 482 ++++++++++++++++++++++++++- po/sk.po | 450 ++++++++++++++++++++++++- po/sl.po | 482 ++++++++++++++++++++++++++- po/sr_RS(a)cyrillic.po | 443 ++++++++++++++++++++++++- po/sr_RS(a)latin.po | 458 +++++++++++++++++++++++++- po/sv.po | 482 ++++++++++++++++++++++++++- po/te.po | 410 ++++++++++++++++++++++- po/th.po | 423 +++++++++++++++++++++++- po/tr.po | 482 ++++++++++++++++++++++++++- po/uk.po | 480 ++++++++++++++++++++++++++- po/wa.po | 419 +++++++++++++++++++++++- po/wine.pot | 402 ++++++++++++++++++++++- po/zh_CN.po | 482 ++++++++++++++++++++++++++- po/zh_TW.po | 482 ++++++++++++++++++++++++++- 48 files changed, 21253 insertions(+), 415 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ad76bbec2264f6b759fb7…

1 0

Zebediah Figura : winedbg: Add support for printing floating point registers.
by Alexandre Julliard 27 Jun '17

27 Jun '17

Module: wine Branch: master Commit: 8314cdc45eeed61629688d0e841090b373e79dd7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8314cdc45eeed61629688d0e8… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Jun 26 14:48:14 2017 -0500 winedbg: Add support for printing floating point registers. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winedbg/be_i386.c | 14 +++++++++++--- programs/winedbg/be_x86_64.c | 14 +++++++++++--- programs/winedbg/types.c | 27 +++++++++++++++++++++++++++ 3 files changed, 49 insertions(+), 6 deletions(-) diff --git a/programs/winedbg/be_i386.c b/programs/winedbg/be_i386.c index 99e3b29..154d4e7 100644 --- a/programs/winedbg/be_i386.c +++ b/programs/winedbg/be_i386.c @@ -287,6 +287,14 @@ static struct dbg_internal_var be_i386_ctx[] = {CV_REG_FLAGS, "FLAGS", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, EFlags), dbg_itype_unsigned_short_int}, {CV_REG_EIP, "EIP", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, Eip), dbg_itype_unsigned_int}, {CV_REG_EFLAGS, "EFLAGS", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, EFlags), dbg_itype_unsigned_int}, + {CV_REG_ST0, "ST0", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, FloatSave.RegisterArea[ 0]), dbg_itype_long_real}, + {CV_REG_ST0+1, "ST1", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, FloatSave.RegisterArea[10]), dbg_itype_long_real}, + {CV_REG_ST0+2, "ST2", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, FloatSave.RegisterArea[20]), dbg_itype_long_real}, + {CV_REG_ST0+3, "ST3", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, FloatSave.RegisterArea[30]), dbg_itype_long_real}, + {CV_REG_ST0+4, "ST4", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, FloatSave.RegisterArea[40]), dbg_itype_long_real}, + {CV_REG_ST0+5, "ST5", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, FloatSave.RegisterArea[50]), dbg_itype_long_real}, + {CV_REG_ST0+6, "ST6", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, FloatSave.RegisterArea[60]), dbg_itype_long_real}, + {CV_REG_ST0+7, "ST7", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, FloatSave.RegisterArea[70]), dbg_itype_long_real}, {0, NULL, 0, dbg_itype_none} }; @@ -767,9 +775,9 @@ static BOOL be_i386_fetch_float(const struct dbg_lvalue* lvalue, unsigned size, if (!memory_read_value(lvalue, size, tmp)) return FALSE; /* float & double types have to be promoted to a long double */ - if (size == sizeof(float)) *ret = *(float*)tmp; - else if (size == sizeof(double)) *ret = *(double*)tmp; - else if (size == sizeof(long double)) *ret = *(long double*)tmp; + if (size == 4) *ret = *(float*)tmp; + else if (size == 8) *ret = *(double*)tmp; + else if (size == 10) *ret = *(long double*)tmp; else return FALSE; return TRUE; diff --git a/programs/winedbg/be_x86_64.c b/programs/winedbg/be_x86_64.c index 17feb88..abb4140 100644 --- a/programs/winedbg/be_x86_64.c +++ b/programs/winedbg/be_x86_64.c @@ -237,6 +237,14 @@ static struct dbg_internal_var be_x86_64_ctx[] = {CV_AMD64_R13, "R13", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, R13), dbg_itype_unsigned_long_int}, {CV_AMD64_R14, "R14", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, R14), dbg_itype_unsigned_long_int}, {CV_AMD64_R15, "R15", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, R15), dbg_itype_unsigned_long_int}, + {CV_AMD64_ST0, "ST0", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, u.FltSave.FloatRegisters[0]), dbg_itype_long_real}, + {CV_AMD64_ST0+1, "ST1", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, u.FltSave.FloatRegisters[1]), dbg_itype_long_real}, + {CV_AMD64_ST0+2, "ST2", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, u.FltSave.FloatRegisters[2]), dbg_itype_long_real}, + {CV_AMD64_ST0+3, "ST3", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, u.FltSave.FloatRegisters[3]), dbg_itype_long_real}, + {CV_AMD64_ST0+4, "ST4", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, u.FltSave.FloatRegisters[4]), dbg_itype_long_real}, + {CV_AMD64_ST0+5, "ST5", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, u.FltSave.FloatRegisters[5]), dbg_itype_long_real}, + {CV_AMD64_ST0+6, "ST6", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, u.FltSave.FloatRegisters[6]), dbg_itype_long_real}, + {CV_AMD64_ST0+7, "ST7", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, u.FltSave.FloatRegisters[7]), dbg_itype_long_real}, {0, NULL, 0, dbg_itype_none} }; @@ -631,9 +639,9 @@ static BOOL be_x86_64_fetch_float(const struct dbg_lvalue* lvalue, unsigned size if (!memory_read_value(lvalue, size, tmp)) return FALSE; /* float & double types have to be promoted to a long double */ - if (size == sizeof(float)) *ret = *(float*)tmp; - else if (size == sizeof(double)) *ret = *(double*)tmp; - else if (size == sizeof(long double)) *ret = *(long double*)tmp; + if (size == 4) *ret = *(float*)tmp; + else if (size == 8) *ret = *(double*)tmp; + else if (size == 10) *ret = *(long double*)tmp; else return FALSE; return TRUE; diff --git a/programs/winedbg/types.c b/programs/winedbg/types.c index 2df7572..f050db5 100644 --- a/programs/winedbg/types.c +++ b/programs/winedbg/types.c @@ -894,6 +894,33 @@ BOOL types_get_info(const struct dbg_type* type, IMAGEHLP_SYMBOL_TYPE_INFO ti, v default: WINE_FIXME("unsupported %u for seg-ptr\n", ti); return FALSE; } break; + case dbg_itype_short_real: + switch (ti) + { + case TI_GET_SYMTAG: X(DWORD) = SymTagBaseType; break; + case TI_GET_LENGTH: X(DWORD64) = 4; break; + case TI_GET_BASETYPE: X(DWORD) = btFloat; break; + default: WINE_FIXME("unsupported %u for short real\n", ti); return FALSE; + } + break; + case dbg_itype_real: + switch (ti) + { + case TI_GET_SYMTAG: X(DWORD) = SymTagBaseType; break; + case TI_GET_LENGTH: X(DWORD64) = 8; break; + case TI_GET_BASETYPE: X(DWORD) = btFloat; break; + default: WINE_FIXME("unsupported %u for real\n", ti); return FALSE; + } + break; + case dbg_itype_long_real: + switch (ti) + { + case TI_GET_SYMTAG: X(DWORD) = SymTagBaseType; break; + case TI_GET_LENGTH: X(DWORD64) = 10; break; + case TI_GET_BASETYPE: X(DWORD) = btFloat; break; + default: WINE_FIXME("unsupported %u for long real\n", ti); return FALSE; + } + break; default: WINE_FIXME("unsupported type id 0x%lx\n", type->id); }

1 0