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

Hugh McMaster : po: Fix two mistakes in the Swedish translation.
by Alexandre Julliard March 4, 2016

March 4, 2016

Module: wine Branch: master Commit: 4a5431192e89c2726a228950b884aafb6817d6fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a5431192e89c2726a228950b… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Fri Mar 4 12:21:40 2016 +1100 po: Fix two mistakes in the Swedish translation. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/sv.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/sv.po b/po/sv.po index 4718cb4..00de41b 100644 --- a/po/sv.po +++ b/po/sv.po @@ -11490,7 +11490,7 @@ msgstr "" #: reg.rc:39 msgid "reg: Unsupported registry data type [%1]\n" -msgstr "Error: Ej stödd typ [%1] i registret\n" +msgstr "reg: Ej stödd typ [%1] i registret\n" #: reg.rc:40 msgid "reg: The option [/d] must be followed by a valid integer\n" @@ -11522,7 +11522,7 @@ msgstr "Vill du verkligen ta bort registervärdet '%1'?" #: reg.rc:50 msgid "Are you sure you want to delete all registry values in '%1'?" -msgstr "Vill du verkligen ta bort alla registervärden i '%s'?" +msgstr "Vill du verkligen ta bort alla registervärden i '%1'?" #: reg.rc:51 msgid "Are you sure you want to delete the registry key '%1'?"

1 0

Julian Rüger : German translation for release 1.9.4
by Jeremy Newman March 3, 2016

March 3, 2016

Module: website Branch: master Commit: a2720665d71f4595112b304371420ccfd6f55607 URL: http://source.winehq.org/git/website.git/?a=commit;h=a2720665d71f4595112b30… Author: Julian Rüger <jr98(a)gmx.net> Date: Thu Mar 3 09:11:11 2016 +0100 German translation for release 1.9.4 Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- news/de/2016021901.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/de/2016021901.xml b/news/de/2016021901.xml new file mode 100644 index 0000000..fcc93e2 --- /dev/null +++ b/news/de/2016021901.xml @@ -0,0 +1,16 @@ +<news> +<date>19. Februar 2016</date> +<title>Wine 1.9.4 freigegeben</title> +<body> + Die Entwicklungsversion 1.9.4 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/1.9.4">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Unterstützung von Farbglyphen und Font-Fallbacks in DirectWrite.</li> + <li>Verbesserungen am WebServices Reader.</li> + <li>Unterstützung für zusätzliche Formate in Direct3D 11.</li> + <li>Vereinfachte Syntax und Aufräumarbeiten an "todo"-markierten Tests.</li> + <li>Diverse Fehlerkorrekturen.</li> +</ul> +Der Quelltext ist ab sofort <a href="//dl.winehq.org/wine/source/1.9/wine-1.9.4.tar.bz2">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</body></news>

1 0

Lauri Kenttä : po: Update Finnish translation.
by Alexandre Julliard March 3, 2016

March 3, 2016

Module: wine Branch: master Commit: 66b359a1378f1a5795df8d7b779c931a5e3ed11a URL: http://source.winehq.org/git/wine.git/?a=commit;h=66b359a1378f1a5795df8d7b7… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Thu Mar 3 17:09:33 2016 +0200 po: Update Finnish translation. Signed-off-by: Lauri Kenttä <lauri.kentta(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/fi.po | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/po/fi.po b/po/fi.po index b8d19c7..293a509 100644 --- a/po/fi.po +++ b/po/fi.po @@ -11607,10 +11607,8 @@ msgid "Are you sure you want to delete the registry key '%1'?" msgstr "Haluatko varmasti tuhota rekisteriavaimen '%1'?" #: reg.rc:52 -#, fuzzy -#| msgid "reg: The option [/d] must be followed by a valid integer\n" msgid "reg: The option [/d] must be followed by a valid string\n" -msgstr "reg: Valitsinta [/d] täytyy seurata kelpo kokonaisluku\n" +msgstr "reg: Valitsinta [/d] täytyy seurata kelpo merkkijono\n" #: regedit.rc:34 msgid "&Registry"

1 0

Lauri Kenttä : po: Update Swedish translation.
by Alexandre Julliard March 3, 2016

March 3, 2016

Module: wine Branch: master Commit: 6158405ffdb027fab10456087ee0846c36000a56 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6158405ffdb027fab10456087… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Thu Mar 3 17:12:03 2016 +0200 po: Update Swedish translation. Signed-off-by: Lauri Kenttä <lauri.kentta(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/sv.po | 178 ++++++++++++++++++++++++--------------------------------------- 1 file changed, 68 insertions(+), 110 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6158405ffdb027fab1045…

1 0

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

March 3, 2016

Module: wine Branch: master Commit: 53716ba8cbbf4b5d3238bb08d8dbe2b15f6a671e URL: http://source.winehq.org/git/wine.git/?a=commit;h=53716ba8cbbf4b5d3238bb08d… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Mar 3 12:58:17 2016 +0100 d3d11/tests: Add test for DXGI_FORMAT_BC5_UNORM format. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index e76e9ac..878cab8 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -3276,6 +3276,13 @@ static void test_texture(void) 0x10, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x10, 0x7f, 0xb6, 0x6d, 0xdb, 0xb6, 0x6d, 0xdb, }; + static const BYTE bc5_data[4 * 16] = + { + 0x10, 0x7f, 0x77, 0x39, 0x05, 0x00, 0x00, 0x00, 0x10, 0x7f, 0x77, 0x39, 0x05, 0x00, 0x00, 0x00, + 0x10, 0x7f, 0x49, 0x92, 0x24, 0x49, 0x92, 0x24, 0x10, 0x7f, 0x49, 0x92, 0x24, 0x49, 0x92, 0x24, + 0x10, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x10, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0x10, 0x7f, 0xb6, 0x6d, 0xdb, 0xb6, 0x6d, 0xdb, 0x10, 0x7f, 0xb6, 0x6d, 0xdb, 0xb6, 0x6d, 0xdb, + }; static const struct texture rgba_texture = { 4, 4, 3, DXGI_FORMAT_R8G8B8A8_UNORM, @@ -3291,6 +3298,7 @@ static void test_texture(void) static const struct texture bc2_texture = {8, 8, 1, DXGI_FORMAT_BC2_UNORM, {{bc2_data, 2 * 16}}}; static const struct texture bc3_texture = {8, 8, 1, DXGI_FORMAT_BC3_UNORM, {{bc3_data, 2 * 16}}}; static const struct texture bc4_texture = {8, 8, 1, DXGI_FORMAT_BC4_UNORM, {{bc4_data, 2 * 8}}}; + static const struct texture bc5_texture = {8, 8, 1, DXGI_FORMAT_BC5_UNORM, {{bc5_data, 2 * 16}}}; static const struct texture bc1_texture_srgb = {8, 8, 1, DXGI_FORMAT_BC1_UNORM_SRGB, {{bc1_data, 2 * 8}}}; static const struct texture bc2_texture_srgb = {8, 8, 1, DXGI_FORMAT_BC2_UNORM_SRGB, {{bc2_data, 2 * 16}}}; static const struct texture bc3_texture_srgb = {8, 8, 1, DXGI_FORMAT_BC3_UNORM_SRGB, {{bc3_data, 2 * 16}}}; @@ -3340,6 +3348,13 @@ static void test_texture(void) 0xff0000ff, 0xff0000ff, 0xff000000, 0xff000000, 0xff0000ff, 0xff0000ff, 0xff000000, 0xff000000, }; + static const DWORD bc5_colors[] = + { + 0xff002626, 0xff001010, 0xff007f7f, 0xff007f7f, + 0xff001010, 0xff001010, 0xff007f7f, 0xff007f7f, + 0xff00ffff, 0xff00ffff, 0xff000000, 0xff000000, + 0xff00ffff, 0xff00ffff, 0xff000000, 0xff000000, + }; static const DWORD sint8_colors[] = { 0x7e80807e, 0x7e807e7e, 0x7e807e80, 0x7e7e7e80, @@ -3378,12 +3393,14 @@ static void test_texture(void) {&ps_ld, &bc2_texture_srgb, D3D11_FILTER_MIN_MAG_MIP_POINT, 0.0f, 0.0f, 0.0f, 0.0f, bc_colors}, {&ps_ld, &bc3_texture_srgb, D3D11_FILTER_MIN_MAG_MIP_POINT, 0.0f, 0.0f, 0.0f, 0.0f, bc_colors}, {&ps_ld, &bc4_texture, D3D11_FILTER_MIN_MAG_MIP_POINT, 0.0f, 0.0f, 0.0f, 0.0f, bc4_colors}, + {&ps_ld, &bc5_texture, D3D11_FILTER_MIN_MAG_MIP_POINT, 0.0f, 0.0f, 0.0f, 0.0f, bc5_colors}, {&ps_ld_sint8, &sint8_texture, D3D11_FILTER_MIN_MAG_MIP_POINT, 0.0f, 0.0f, 0.0f, 0.0f, sint8_colors}, {&ps_ld_uint8, &uint8_texture, D3D11_FILTER_MIN_MAG_MIP_POINT, 0.0f, 0.0f, 0.0f, 0.0f, rgba_level_0}, {&ps_sample, &bc1_texture, D3D11_FILTER_MIN_MAG_MIP_POINT, 0.0f, 0.0f, 0.0f, 0.0f, bc_colors}, {&ps_sample, &bc2_texture, D3D11_FILTER_MIN_MAG_MIP_POINT, 0.0f, 0.0f, 0.0f, 0.0f, bc_colors}, {&ps_sample, &bc3_texture, D3D11_FILTER_MIN_MAG_MIP_POINT, 0.0f, 0.0f, 0.0f, 0.0f, bc_colors}, {&ps_sample, &bc4_texture, D3D11_FILTER_MIN_MAG_MIP_POINT, 0.0f, 0.0f, 0.0f, 0.0f, bc4_colors}, + {&ps_sample, &bc5_texture, D3D11_FILTER_MIN_MAG_MIP_POINT, 0.0f, 0.0f, 0.0f, 0.0f, bc5_colors}, {&ps_sample, &rgba_texture, D3D11_FILTER_MIN_MAG_MIP_POINT, 0.0f, 0.0f, 0.0f, 0.0f, rgba_level_0}, {&ps_sample, &rgba_texture, D3D11_FILTER_MIN_MAG_MIP_POINT, 0.0f, 0.0f, D3D11_FLOAT32_MAX, 0.0f, rgba_level_0}, {&ps_sample, &rgba_texture, D3D11_FILTER_MIN_MAG_MIP_POINT, 2.0f, 0.0f, D3D11_FLOAT32_MAX, 0.0f, rgba_level_0},

1 0

Michael Stefaniuc : shell32/tests: Use SetRectEmpty() instead of open coding it.
by Alexandre Julliard March 3, 2016

March 3, 2016

Module: wine Branch: master Commit: fba64b5cacc58e28a7dd83c96be1daef2e136aa1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fba64b5cacc58e28a7dd83c96… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Mar 3 10:00:18 2016 +0100 shell32/tests: Use SetRectEmpty() instead of open coding it. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/tests/ebrowser.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/tests/ebrowser.c b/dlls/shell32/tests/ebrowser.c index 7a01d56..3b22ffb 100644 --- a/dlls/shell32/tests/ebrowser.c +++ b/dlls/shell32/tests/ebrowser.c @@ -881,7 +881,7 @@ static void test_initialization(void) /* empty rectangle */ ebrowser_instantiate(&peb); - rc.left = 0; rc.top = 0; rc.right = 0; rc.bottom = 0; + SetRectEmpty(&rc); hr = IExplorerBrowser_Initialize(peb, hwnd, &rc, NULL); ok(hr == S_OK, "got (0x%08x)\n", hr); IExplorerBrowser_Destroy(peb); @@ -1101,7 +1101,7 @@ static void test_basics(void) ebrowser_initialize(peb); /* SetRect */ - rc.left = 0; rc.top = 0; rc.right = 0; rc.bottom = 0; + SetRectEmpty(&rc); hr = IExplorerBrowser_SetRect(peb, NULL, rc); ok(hr == S_OK, "got (0x%08x)\n", hr);

1 0

Michael Stefaniuc : user32/tests: Use SetRectEmpty() instead of open coding it.
by Alexandre Julliard March 3, 2016

March 3, 2016

Module: wine Branch: master Commit: 3a74fd3f724d882fe33acecda1b84f505d9d4453 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a74fd3f724d882fe33acecda… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Mar 3 09:59:46 2016 +0100 user32/tests: Use SetRectEmpty() instead of open coding it. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/text.c | 10 +++++----- dlls/user32/tests/win.c | 8 ++++---- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/user32/tests/text.c b/dlls/user32/tests/text.c index df8d3ee..0352d66 100644 --- a/dlls/user32/tests/text.c +++ b/dlls/user32/tests/text.c @@ -315,16 +315,16 @@ static void test_DrawTextCalcRect(void) dtp.cbSize = sizeof(dtp); dtp.iLeftMargin = 0; dtp.iRightMargin = 0; - SetRect( &rect, 0, 0, 0, 0); + SetRectEmpty(&rect); DrawTextExA(hdc, text, -1, &rect, DT_CALCRECT, &dtp); textlen = rect.right; /* Width without margin */ dtp.iLeftMargin = 8; - SetRect( &rect, 0, 0, 0, 0); + SetRectEmpty(&rect); DrawTextExA(hdc, text, -1, &rect, DT_CALCRECT, &dtp); ok(rect.right==dtp.iLeftMargin+textlen ,"Incorrect left margin calculated rc(%d,%d)\n", rect.left, rect.right); dtp.iLeftMargin = 0; dtp.iRightMargin = 8; - SetRect( &rect, 0, 0, 0, 0); + SetRectEmpty(&rect); DrawTextExA(hdc, text, -1, &rect, DT_CALCRECT, &dtp); ok(rect.right==dtp.iRightMargin+textlen ,"Incorrect right margin calculated rc(%d,%d)\n", rect.left, rect.right); @@ -535,7 +535,7 @@ static void test_DrawTextCalcRect(void) } /* More test cases from bug 12226 */ - SetRect(&rect, 0, 0, 0, 0); + SetRectEmpty(&rect); textheight = DrawTextA(hdc, emptystring, -1, &rect, DT_CALCRECT | DT_LEFT | DT_SINGLELINE); ok(textheight, "DrawTextA error %u\n", GetLastError()); ok(0 == rect.left, "expected 0, got %d\n", rect.left); @@ -543,7 +543,7 @@ static void test_DrawTextCalcRect(void) ok(0 == rect.top, "expected 0, got %d\n", rect.top); ok(rect.bottom, "rect.bottom should not be 0\n"); - SetRect(&rect, 0, 0, 0, 0); + SetRectEmpty(&rect); textheight = DrawTextW(hdc, emptystringW, -1, &rect, DT_CALCRECT | DT_LEFT | DT_SINGLELINE); if (!textheight && GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) { diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 4a09e39..44f0557 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -5687,7 +5687,7 @@ static void test_CreateWindow(void) DestroyWindow(hwnd); expected_cx = expected_cy = -10; - SetRect( &expected_rect, 0, 0, 0, 0 ); + SetRectEmpty(&expected_rect); SetRect( &broken_rect, 0, 0, -10, -10 ); hwnd = CreateWindowExA(0, "Sizes_WndClass", NULL, WS_CHILD, -20, -20, -10, -10, parent, 0, 0, NULL); ok( hwnd != 0, "creation failed err %u\n", GetLastError()); @@ -5697,7 +5697,7 @@ static void test_CreateWindow(void) DestroyWindow(hwnd); expected_cx = expected_cy = -200000; - SetRect( &expected_rect, 0, 0, 0, 0 ); + SetRectEmpty(&expected_rect); SetRect( &broken_rect, 0, 0, -200000, -200000 ); hwnd = CreateWindowExA(0, "Sizes_WndClass", NULL, WS_CHILD, -300000, -300000, -200000, -200000, parent, 0, 0, NULL); ok( hwnd != 0, "creation failed err %u\n", GetLastError()); @@ -6249,7 +6249,7 @@ static void test_GetUpdateRect(void) flush_events( TRUE ); ShowWindow(hchild, SW_HIDE); - SetRect(&rc2, 0, 0, 0, 0); + SetRectEmpty(&rc2); ret = GetUpdateRect(hgrandparent, &rc1, FALSE); ok(!ret, "GetUpdateRect returned not empty region\n"); ok(EqualRect(&rc1, &rc2), "rects do not match (%d,%d,%d,%d) / (%d,%d,%d,%d)\n", @@ -6313,7 +6313,7 @@ static void test_GetUpdateRect(void) ShowWindow(hchild, SW_HIDE); - SetRect(&rc2, 0, 0, 0, 0); + SetRectEmpty(&rc2); ret = GetUpdateRect(hgrandparent, &rc1, FALSE); ok(!ret, "GetUpdateRect returned not empty region\n"); ok(EqualRect(&rc1, &rc2), "rects do not match (%d,%d,%d,%d) / (%d,%d,%d,%d)\n",

1 0

Michael Stefaniuc : ddraw: Use SetRectEmpty() instead of open coding it.
by Alexandre Julliard March 3, 2016

March 3, 2016

Module: wine Branch: master Commit: 3db08a49e170109ece767596b97ddf68fb12bfd4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3db08a49e170109ece767596b… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Mar 3 09:26:06 2016 +0100 ddraw: Use SetRectEmpty() instead of open coding it. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/surface.c | 2 +- dlls/ddraw/tests/d3d.c | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index e9c9c65..d133e7e 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -1436,7 +1436,7 @@ static HRESULT ddraw_surface_blt_clipped(struct ddraw_surface *dst_surface, cons } else { - SetRect(&src_rect, 0, 0, 0, 0); + SetRectEmpty(&src_rect); wined3d_src_texture = NULL; src_sub_resource_idx = 0; } diff --git a/dlls/ddraw/tests/d3d.c b/dlls/ddraw/tests/d3d.c index 06f16f3..d877020 100644 --- a/dlls/ddraw/tests/d3d.c +++ b/dlls/ddraw/tests/d3d.c @@ -1832,10 +1832,7 @@ static void DeviceLoadTest(void) /* First test some broken coordinates. */ loadpoint.x = loadpoint.y = 0; - loadrect.left = 0; - loadrect.top = 0; - loadrect.right = 0; - loadrect.bottom = 0; + SetRectEmpty(&loadrect); hr = IDirect3DDevice7_Load(lpD3DDevice, texture_levels[1][0], &loadpoint, texture_levels[0][0], &loadrect, 0); ok(hr==DDERR_INVALIDPARAMS, "IDirect3DDevice7_Load returned: %x\n",hr);

1 0

Nikolay Sivov : d3drm: Support IDirect3DRMObject in viewport QI.
by Alexandre Julliard March 3, 2016

March 3, 2016

Module: wine Branch: master Commit: b54afbc3a1667576683fcfb0c4c33ae8989304e1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b54afbc3a1667576683fcfb0c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Mar 3 11:10:20 2016 +0300 d3drm: Support IDirect3DRMObject in viewport QI. 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/tests/d3drm.c | 17 +++++++++++++++++ dlls/d3drm/viewport.c | 1 + 2 files changed, 18 insertions(+) diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index 16f0913..23193bf 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -1221,6 +1221,7 @@ static void test_Viewport(void) IDirect3DRMFrame *frame; IDirect3DRMViewport *viewport; IDirect3DRMViewport2 *viewport2; + IDirect3DRMObject *obj, *obj2; GUID driver; HWND window; RECT rc; @@ -1249,6 +1250,22 @@ static void test_Viewport(void) hr = IDirect3DRM_CreateViewport(d3drm, device, frame, rc.left, rc.top, rc.right, rc.bottom, &viewport); ok(hr == D3DRM_OK, "Cannot get IDirect3DRMViewport interface (hr = %x)\n", hr); + hr = IDirect3DRMViewport_QueryInterface(viewport, &IID_IDirect3DRMObject, (void**)&obj); + ok(hr == D3DRM_OK, "expected D3DRM_OK (hr = %x)\n", hr); + ok((IDirect3DRMObject*)viewport == obj, "got object pointer %p, expected %p\n", obj, viewport); + + hr = IDirect3DRMViewport_QueryInterface(viewport, &IID_IDirect3DRMViewport2, (void**)&viewport2); + ok(hr == D3DRM_OK, "expected D3DRM_OK (hr = %x)\n", hr); + + hr = IDirect3DRMViewport2_QueryInterface(viewport2, &IID_IDirect3DRMObject, (void**)&obj2); + ok(hr == D3DRM_OK, "expected D3DRM_OK (hr = %x)\n", hr); + ok(obj == obj2, "got object pointer %p, expected %p\n", obj2, obj); + ok((IUnknown*)viewport != (IUnknown*)viewport2, "got viewport1 %p, viewport2 %p\n", viewport, viewport2); + + IDirect3DRMViewport2_Release(viewport2); + IDirect3DRMObject_Release(obj); + IDirect3DRMObject_Release(obj2); + hr = IDirect3DRMViewport_GetClassName(viewport, NULL, cname); ok(hr == E_INVALIDARG, "GetClassName failed with %x\n", hr); hr = IDirect3DRMViewport_GetClassName(viewport, NULL, NULL); diff --git a/dlls/d3drm/viewport.c b/dlls/d3drm/viewport.c index 34c6fb4..e092559 100644 --- a/dlls/d3drm/viewport.c +++ b/dlls/d3drm/viewport.c @@ -57,6 +57,7 @@ static HRESULT WINAPI d3drm_viewport1_QueryInterface(IDirect3DRMViewport *iface, TRACE("iface %p, riid %s, out %p.\n", iface, debugstr_guid(riid), out); if (IsEqualGUID(riid, &IID_IDirect3DRMViewport) + || IsEqualGUID(riid, &IID_IDirect3DRMObject) || IsEqualGUID(riid, &IID_IUnknown)) { *out = &viewport->IDirect3DRMViewport_iface;

1 0

Hugh McMaster : reg/tests: Add more tests for all supported data types.
by Alexandre Julliard March 3, 2016

March 3, 2016

Module: wine Branch: master Commit: 9af841ea3951e216add98c0dac8d127f2c297734 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9af841ea3951e216add98c0da… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Thu Mar 3 22:32:13 2016 +1100 reg/tests: Add more tests for all supported data types. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/reg.c | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index 93de7ec..af28a43 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -149,6 +149,10 @@ static void test_add(void) ok(r == REG_EXIT_SUCCESS, "got exit code %u, expected 0\n", r); verify_reg(hkey, "none1", REG_NONE, "\0", 2, TODO_REG_SIZE); + run_reg_exe("reg add HKCU\\" KEY_BASE " /ve /t REG_NONE /f", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %u, expected 0\n", r); + todo_wine verify_reg(hkey, NULL, REG_NONE, "\0", 2, TODO_REG_SIZE|TODO_REG_TYPE|TODO_REG_DATA); + /* REG_SZ */ run_reg_exe("reg add HKCU\\" KEY_BASE " /d WineTest /f", &r); ok(r == REG_EXIT_SUCCESS || broken(r == REG_EXIT_FAILURE /* WinXP */), @@ -181,6 +185,14 @@ static void test_add(void) ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); verify_reg(hkey, "test3", REG_SZ, "", 1, 0); + run_reg_exe("reg add HKCU\\" KEY_BASE " /ve /f", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %u, expected 0\n", r); + verify_reg(hkey, NULL, REG_SZ, "", 1, TODO_REG_SIZE|TODO_REG_DATA); + + run_reg_exe("reg add HKCU\\" KEY_BASE " /ve /t REG_SZ /f", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %u, expected 0\n", r); + verify_reg(hkey, NULL, REG_SZ, "", 1, TODO_REG_SIZE|TODO_REG_DATA); + /* REG_EXPAND_SZ */ run_reg_exe("reg add HKCU\\" KEY_BASE " /v expand0 /t REG_EXpand_sz /d \"dead%PATH%beef\" /f", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %u\n", r); @@ -202,6 +214,10 @@ static void test_add(void) ok(r == REG_EXIT_SUCCESS, "got exit code %u\n", r); verify_reg(hkey, "expand3", REG_EXPAND_SZ, "", 1, 0); + run_reg_exe("reg add HKCU\\" KEY_BASE " /ve /t REG_EXPAND_SZ /f", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %u, expected 0\n", r); + verify_reg(hkey, NULL, REG_EXPAND_SZ, "", 1, TODO_REG_SIZE|TODO_REG_DATA); + /* REG_BINARY */ run_reg_exe("reg add HKCU\\" KEY_BASE " /t REG_BINARY /v bin0 /f", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %u\n", r); @@ -242,6 +258,10 @@ static void test_add(void) run_reg_exe("reg add HKCU\\" KEY_BASE " /v bin6 /t REG_BINARY /f /d", &r); ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + run_reg_exe("reg add HKCU\\" KEY_BASE " /ve /t REG_BINARY /f", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %u, expected 0\n", r); + verify_reg(hkey, NULL, REG_BINARY, buffer, 0, TODO_REG_DATA|TODO_REG_SIZE); + /* REG_DWORD */ run_reg_exe("reg add HKCU\\" KEY_BASE " /t REG_DWORD /f /d 12345678", &r); ok(r == REG_EXIT_SUCCESS || broken(r == REG_EXIT_FAILURE /* WinXP */), @@ -310,6 +330,10 @@ static void test_add(void) run_reg_exe("reg add HKCU\\" KEY_BASE " /v dword15 /t REG_DWORD /d 4294967296 /f", &r); ok(r == REG_EXIT_FAILURE || broken(r == REG_EXIT_SUCCESS /* WinXP */), "got exit code %u\n", r); + run_reg_exe("reg add HKCU\\" KEY_BASE " /ve /t REG_DWORD /f", &r); + todo_wine ok(r == REG_EXIT_FAILURE || broken(r == REG_EXIT_SUCCESS /* WinXP */), + "got exit code %u\n", r); + /* REG_DWORD_LITTLE_ENDIAN */ run_reg_exe("reg add HKCU\\" KEY_BASE " /v DWORD_LE /t REG_DWORD_LITTLE_ENDIAN /d 456 /f", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); @@ -324,6 +348,17 @@ static void test_add(void) /* REG_DWORD_BIG_ENDIAN is broken in every version of windows. It behaves like * an ordinary REG_DWORD - that is little endian. GG */ + run_reg_exe("reg add HKCU\\" KEY_BASE " /v DWORD_BE2 /t REG_DWORD_BIG_ENDIAN /f /d", &r); + ok(r == REG_EXIT_FAILURE, "got exit code %u, expected 1\n", r); + + run_reg_exe("reg add HKCU\\" KEY_BASE " /v DWORD_BE3 /t REG_DWORD_BIG_ENDIAN /f", &r); + todo_wine ok(r == REG_EXIT_FAILURE || broken(r == REG_EXIT_SUCCESS /* WinXP */), + "got exit code %u\n", r); + + run_reg_exe("reg add HKCU\\" KEY_BASE " /ve /t REG_DWORD_BIG_ENDIAN /f", &r); + todo_wine ok(r == REG_EXIT_FAILURE || broken(r == REG_EXIT_SUCCESS /* WinXP */), + "got exit code %u\n", r); + /* REG_MULTI_SZ */ run_reg_exe("reg add HKCU\\" KEY_BASE " /v multi0 /t REG_MULTI_SZ /d \"three\\0little\\0strings\" /f", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %u, expected 0\n", r); @@ -401,6 +436,10 @@ static void test_add(void) ok(r == REG_EXIT_SUCCESS, "got exit code %u, expected 0\n", r); verify_reg(hkey, "multi21", REG_MULTI_SZ, "two\\0\\0strings\0", 16, 0); + run_reg_exe("reg add HKCU\\" KEY_BASE " /ve /t REG_MULTI_SZ /f", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %u, expected 0\n", r); + verify_reg(hkey, NULL, REG_MULTI_SZ, buffer, 1, TODO_REG_SIZE|TODO_REG_DATA|TODO_REG_TYPE); + RegCloseKey(hkey); err = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE);

1 0