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

André Hentschel : Add WWN 389
by Jeremy Newman April 27, 2015

April 27, 2015

Module: website Branch: master Commit: faddebbcbb9098285736afc8c4469643ea456309 URL: http://source.winehq.org/git/website.git/?a=commit;h=faddebbcbb9098285736af… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat Apr 25 16:32:14 2015 +0200 Add WWN 389 --- news/de/2015042501.xml | 10 + news/en/2015042501.xml | 10 + wwn/en/wn20150425_389.xml | 986 ++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 1006 insertions(+) Diff: http://source.winehq.org/git/website.git/?a=commitdiff;h=faddebbcbb90982857…

1 0

Frédéric Delanoy : French translation for release 1.7.41
by Jeremy Newman April 27, 2015

April 27, 2015

Module: website Branch: master Commit: 7cedd393a0d4455a54c07ea5a6ef4b41ad272ecb URL: http://source.winehq.org/git/website.git/?a=commit;h=7cedd393a0d4455a54c07e… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sun Apr 26 21:58:52 2015 +0200 French translation for release 1.7.41 --- news/fr/2015041701.xml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/news/fr/2015041701.xml b/news/fr/2015041701.xml new file mode 100644 index 0000000..64e76ea --- /dev/null +++ b/news/fr/2015041701.xml @@ -0,0 +1,15 @@ +<news> +<date>17 avril 2015</date> +<title>Sortie de Wine 1.7.41</title> +<body> + La version de développement 1.7.41 de Wine est disponible. + <a href="{$root}/announce/1.7.41">Nouveautés</a> de cette version : +<ul> + <li>Dossiers spéciaux supplémentaires pris en charge dans le shell.</li> + <li>Prise en charge complémentaire des objets tâches du noyau.</li> + <li>Améliorations dans la prise en charge des patchs MSI.</li> + <li>Quelques correctifs dans la gestion des thèmes.</li> + <li>Diverses corrections de bugs.</li> +</ul> +Le <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.41.tar.bz2">code source</a> est disponible dès à présent. Les paquets binaires sont en cours de construction, et apparaîtront sous peu sur leurs <a href="{$root}/download">sites de téléchargement</a> respectifs. +</body></news>

1 0

Julian Rüger : German translation for release 1.7.41
by Jeremy Newman April 27, 2015

April 27, 2015

Module: website Branch: master Commit: 852023262cc9e8bdff38047e46a223daf1d2b8ba URL: http://source.winehq.org/git/website.git/?a=commit;h=852023262cc9e8bdff3804… Author: Julian Rüger <jr98(a)gmx.net> Date: Sat Apr 25 19:44:52 2015 +0200 German translation for release 1.7.41 --- news/de/2015041701.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/de/2015041701.xml b/news/de/2015041701.xml new file mode 100644 index 0000000..d261540 --- /dev/null +++ b/news/de/2015041701.xml @@ -0,0 +1,16 @@ +<news> +<date>17. April 2015</date> +<title>Wine 1.7.41 freigegeben</title> +<body> + Die Entwicklungsversion 1.7.41 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/1.7.41">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Mehr bekannte Ordner unterstützt in der Shell.</li> + <li>Ein wenig mehr Unterstützung für Kernel-Job-Objekte.</li> + <li>Mehr Verbesserungen an MSI-Patches.</li> + <li>Einige Korrekturen für grafische Themen.</li> + <li>Diverse Fehlerkorrekturen.</li> +</ul> +Der Quelltext ist ab sofort <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.41.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

Julian Rüger : German translation for release 1.7.40
by Jeremy Newman April 27, 2015

April 27, 2015

Module: website Branch: master Commit: 9b502eda4fc14b045fba328c4ece625e127decf2 URL: http://source.winehq.org/git/website.git/?a=commit;h=9b502eda4fc14b045fba32… Author: Julian Rüger <jr98(a)gmx.net> Date: Sat Apr 25 19:36:11 2015 +0200 German translation for release 1.7.40 --- news/de/2015040301.xml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/news/de/2015040301.xml b/news/de/2015040301.xml new file mode 100644 index 0000000..a007e6b --- /dev/null +++ b/news/de/2015040301.xml @@ -0,0 +1,18 @@ +<news> +<date>3. April 2015</date> +<title>Wine 1.7.40 freigegeben</title> +<body> + Die Entwicklungsversion 1.7.40 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/1.7.40">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Unterstützung für Kernel-Job-Objekte.</li> + <li>Diverse Korrekturen am ListView-Steuerelement.</li> + <li>Bessere Unterstützung von OOB-Daten in Windows Sockets.</li> + <li>Unterstützung von DIB-Bildern im OLE-Datencache.</li> + <li>Verbesserte Unterstützung für MSI-Patches.</li> + <li>Einige Korrekturen an ACL-Dateiberechtigungen.</li> + <li>Diverse Fehlerkorrekturen.</li> +</ul> +Der Quelltext ist ab sofort <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.40.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

Alistair Leslie-Hughes : packager: Mark DllCanUnloadNow, DllGetClassObject , DllRegisterServer, DllUnregisterServer as private.
by Alexandre Julliard April 27, 2015

April 27, 2015

Module: wine Branch: master Commit: d15ca4edb9c3823a698c4bb6137c8777e1ad08dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=d15ca4edb9c3823a698c4bb61… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Apr 27 09:21:54 2015 +1000 packager: Mark DllCanUnloadNow, DllGetClassObject, DllRegisterServer, DllUnregisterServer as private. --- dlls/packager/packager.spec | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/packager/packager.spec b/dlls/packager/packager.spec index 5baed04..b16365d 100644 --- a/dlls/packager/packager.spec +++ b/dlls/packager/packager.spec @@ -1,4 +1,4 @@ -@ stdcall DllCanUnloadNow() -@ stdcall DllGetClassObject(ptr ptr ptr) -@ stdcall DllRegisterServer() -@ stdcall DllUnregisterServer() +@ stdcall -private DllCanUnloadNow() +@ stdcall -private DllGetClassObject(ptr ptr ptr) +@ stdcall -private DllRegisterServer() +@ stdcall -private DllUnregisterServer()

1 0

Aric Stewart : comctl32: TTM_SETTOOLINFO does not change subclassing flags.
by Alexandre Julliard April 27, 2015

April 27, 2015

Module: wine Branch: master Commit: aba3b131bc6ab9f74e9ffcaaad0019253cb3f70d URL: http://source.winehq.org/git/wine.git/?a=commit;h=aba3b131bc6ab9f74e9ffcaaa… Author: Aric Stewart <aric(a)codeweavers.com> Date: Fri Apr 24 07:34:59 2015 -0500 comctl32: TTM_SETTOOLINFO does not change subclassing flags. --- dlls/comctl32/tests/tooltips.c | 149 +++++++++++++++++++++++++++++++++++++++++ dlls/comctl32/tooltips.c | 24 ++++--- 2 files changed, 162 insertions(+), 11 deletions(-) diff --git a/dlls/comctl32/tests/tooltips.c b/dlls/comctl32/tests/tooltips.c index a07a054..3382fce 100644 --- a/dlls/comctl32/tests/tooltips.c +++ b/dlls/comctl32/tests/tooltips.c @@ -839,6 +839,154 @@ static void test_track(void) DestroyWindow(parent); } +static LRESULT CALLBACK info_wnd_proc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) +{ + switch(msg) { + + case WM_DESTROY: + PostQuitMessage(0); + break; + + default: + return DefWindowProcA(hWnd, msg, wParam, lParam); + } + return 0; +} + +static void test_setinfo(void) +{ + WNDCLASSA wc; + LRESULT lResult; + HWND parent, parent2, hwndTip, hwndTip2; + TTTOOLINFOA toolInfo = { 0 }; + TTTOOLINFOA toolInfo2 = { 0 }; + WNDPROC wndProc; + + /* Create a class to use the custom draw wndproc */ + wc.style = CS_HREDRAW | CS_VREDRAW; + wc.cbClsExtra = 0; + wc.cbWndExtra = 0; + wc.hInstance = GetModuleHandleA(NULL); + wc.hIcon = NULL; + wc.hCursor = LoadCursorA(NULL, (LPCSTR)IDC_ARROW); + wc.hbrBackground = GetSysColorBrush(COLOR_WINDOW); + wc.lpszMenuName = NULL; + wc.lpszClassName = "SetInfoClass"; + wc.lpfnWndProc = info_wnd_proc; + RegisterClassA(&wc); + + /* Create a main window */ + parent = CreateWindowExA(0, "SetInfoClass", NULL, + WS_CAPTION | WS_SYSMENU | WS_MINIMIZEBOX | + WS_MAXIMIZEBOX | WS_VISIBLE, + 50, 50, + 300, 300, + NULL, NULL, NULL, 0); + ok(parent != NULL, "Creation of main window failed\n"); + + parent2 = CreateWindowExA(0, "SetInfoClass", NULL, + WS_CAPTION | WS_SYSMENU | WS_MINIMIZEBOX | + WS_MAXIMIZEBOX | WS_VISIBLE, + 50, 50, + 300, 300, + NULL, NULL, NULL, 0); + ok(parent2 != NULL, "Creation of main window failed\n"); + + /* Make it show */ + ShowWindow(parent2, SW_SHOWNORMAL); + flush_events(100); + + /* Create Tooltip */ + hwndTip = CreateWindowExA(WS_EX_TOPMOST, TOOLTIPS_CLASSA, + NULL, TTS_NOPREFIX | TTS_ALWAYSTIP, + CW_USEDEFAULT, CW_USEDEFAULT, + CW_USEDEFAULT, CW_USEDEFAULT, + parent, NULL, GetModuleHandleA(NULL), 0); + ok(hwndTip != NULL, "Creation of tooltip window failed\n"); + + hwndTip2 = CreateWindowExA(WS_EX_TOPMOST, TOOLTIPS_CLASSA, + NULL, TTS_NOPREFIX | TTS_ALWAYSTIP, + CW_USEDEFAULT, CW_USEDEFAULT, + CW_USEDEFAULT, CW_USEDEFAULT, + parent, NULL, GetModuleHandleA(NULL), 0); + ok(hwndTip2 != NULL, "Creation of tooltip window failed\n"); + + + /* Make it topmost, as per the MSDN */ + SetWindowPos(hwndTip, HWND_TOPMOST, 0, 0, 0, 0, + SWP_NOMOVE | SWP_NOSIZE | SWP_NOACTIVATE); + + /* Create a tool */ + toolInfo.cbSize = TTTOOLINFOA_V1_SIZE; + toolInfo.hwnd = parent; + toolInfo.hinst = GetModuleHandleA(NULL); + toolInfo.uFlags = TTF_SUBCLASS; + toolInfo.uId = 0x1234ABCD; + toolInfo.lpszText = (LPSTR)"This is a test tooltip"; + toolInfo.lParam = 0xdeadbeef; + GetClientRect (parent, &toolInfo.rect); + lResult = SendMessageA(hwndTip, TTM_ADDTOOLA, 0, (LPARAM)&toolInfo); + ok(lResult, "Adding the tool to the tooltip failed\n"); + + toolInfo.cbSize = TTTOOLINFOA_V1_SIZE; + toolInfo.hwnd = parent2; + toolInfo.hinst = GetModuleHandleA(NULL); + toolInfo.uFlags = 0; + toolInfo.uId = 0x1234ABCE; + toolInfo.lpszText = (LPSTR)"This is a test tooltip"; + toolInfo.lParam = 0xdeadbeef; + GetClientRect (parent, &toolInfo.rect); + lResult = SendMessageA(hwndTip, TTM_ADDTOOLA, 0, (LPARAM)&toolInfo); + ok(lResult, "Adding the tool to the tooltip failed\n"); + + /* Try to Remove Subclass */ + toolInfo2.cbSize = TTTOOLINFOA_V1_SIZE; + toolInfo2.hwnd = parent; + toolInfo2.uId = 0x1234ABCD; + lResult = SendMessageA(hwndTip, TTM_GETTOOLINFOA, 0, (LPARAM)&toolInfo2); + ok(lResult, "GetToolInfo failed\n"); + ok(toolInfo2.uFlags & TTF_SUBCLASS, "uFlags does not have subclass\n"); + wndProc = (WNDPROC)GetWindowLongPtrA(parent, GWLP_WNDPROC); + ok (wndProc != info_wnd_proc, "Window Proc is wrong\n"); + + toolInfo2.uFlags &= ~TTF_SUBCLASS; + SendMessageA(hwndTip, TTM_SETTOOLINFOA, 0, (LPARAM)&toolInfo2); + lResult = SendMessageA(hwndTip, TTM_GETTOOLINFOA, 0, (LPARAM)&toolInfo2); + ok(lResult, "GetToolInfo failed\n"); + ok(!(toolInfo2.uFlags & TTF_SUBCLASS), "uFlags has subclass\n"); + wndProc = (WNDPROC)GetWindowLongPtrA(parent, GWLP_WNDPROC); + ok (wndProc != info_wnd_proc, "Window Proc is wrong\n"); + + /* Try to Add Subclass */ + + /* Make it topmost, as per the MSDN */ + SetWindowPos(hwndTip2, HWND_TOPMOST, 0, 0, 0, 0, + SWP_NOMOVE | SWP_NOSIZE | SWP_NOACTIVATE); + + toolInfo2.cbSize = TTTOOLINFOA_V1_SIZE; + toolInfo2.hwnd = parent2; + toolInfo2.uId = 0x1234ABCE; + lResult = SendMessageA(hwndTip, TTM_GETTOOLINFOA, 0, (LPARAM)&toolInfo2); + ok(lResult, "GetToolInfo failed\n"); + ok(!(toolInfo2.uFlags & TTF_SUBCLASS), "uFlags has subclass\n"); + wndProc = (WNDPROC)GetWindowLongPtrA(parent2, GWLP_WNDPROC); + ok (wndProc == info_wnd_proc, "Window Proc is wrong\n"); + + toolInfo2.uFlags |= TTF_SUBCLASS; + SendMessageA(hwndTip, TTM_SETTOOLINFOA, 0, (LPARAM)&toolInfo2); + lResult = SendMessageA(hwndTip, TTM_GETTOOLINFOA, 0, (LPARAM)&toolInfo2); + ok(lResult, "GetToolInfo failed\n"); + ok(toolInfo2.uFlags & TTF_SUBCLASS, "uFlags does not have subclass\n"); + wndProc = (WNDPROC)GetWindowLongPtrA(parent2, GWLP_WNDPROC); + ok (wndProc == info_wnd_proc, "Window Proc is wrong\n"); + + /* Clean up */ + DestroyWindow(hwndTip); + DestroyWindow(hwndTip2); + DestroyWindow(parent); + DestroyWindow(parent2); +} + START_TEST(tooltips) { InitCommonControls(); @@ -850,4 +998,5 @@ START_TEST(tooltips) test_longtextA(); test_longtextW(); test_track(); + test_setinfo(); } diff --git a/dlls/comctl32/tooltips.c b/dlls/comctl32/tooltips.c index 5423ca5..8bf6919 100644 --- a/dlls/comctl32/tooltips.c +++ b/dlls/comctl32/tooltips.c @@ -111,6 +111,7 @@ static HICON hTooltipIcons[TTI_ERROR+1]; typedef struct { UINT uFlags; + UINT uInternalFlags; HWND hwnd; BOOL bNotifyUnicode; UINT_PTR uId; @@ -1057,11 +1058,12 @@ TOOLTIPS_AddToolT (TOOLTIPS_INFO *infoPtr, const TTTOOLINFOW *ti, BOOL isW) infoPtr->uNumTools++; /* copy tool data */ - toolPtr->uFlags = ti->uFlags; - toolPtr->hwnd = ti->hwnd; - toolPtr->uId = ti->uId; - toolPtr->rect = ti->rect; - toolPtr->hinst = ti->hinst; + toolPtr->uFlags = ti->uFlags; + toolPtr->uInternalFlags = (ti->uFlags & (TTF_SUBCLASS | TTF_IDISHWND)); + toolPtr->hwnd = ti->hwnd; + toolPtr->uId = ti->uId; + toolPtr->rect = ti->rect; + toolPtr->hinst = ti->hinst; if (ti->cbSize >= TTTOOLINFOW_V1_SIZE) { if (IS_INTRESOURCE(ti->lpszText)) { @@ -1092,8 +1094,8 @@ TOOLTIPS_AddToolT (TOOLTIPS_INFO *infoPtr, const TTTOOLINFOW *ti, BOOL isW) toolPtr->lParam = ti->lParam; /* install subclassing hook */ - if (toolPtr->uFlags & TTF_SUBCLASS) { - if (toolPtr->uFlags & TTF_IDISHWND) { + if (toolPtr->uInternalFlags & TTF_SUBCLASS) { + if (toolPtr->uInternalFlags & TTF_IDISHWND) { SetWindowSubclass((HWND)toolPtr->uId, TOOLTIPS_SubclassProc, 1, (DWORD_PTR)infoPtr->hwndSelf); } @@ -1152,8 +1154,8 @@ TOOLTIPS_DelToolT (TOOLTIPS_INFO *infoPtr, const TTTOOLINFOW *ti, BOOL isW) } /* remove subclassing */ - if (toolPtr->uFlags & TTF_SUBCLASS) { - if (toolPtr->uFlags & TTF_IDISHWND) { + if (toolPtr->uInternalFlags & TTF_SUBCLASS) { + if (toolPtr->uInternalFlags & TTF_IDISHWND) { RemoveWindowSubclass((HWND)toolPtr->uId, TOOLTIPS_SubclassProc, 1); } else { @@ -1918,8 +1920,8 @@ TOOLTIPS_Destroy (TOOLTIPS_INFO *infoPtr) } /* remove subclassing */ - if (toolPtr->uFlags & TTF_SUBCLASS) { - if (toolPtr->uFlags & TTF_IDISHWND) { + if (toolPtr->uInternalFlags & TTF_SUBCLASS) { + if (toolPtr->uInternalFlags & TTF_IDISHWND) { RemoveWindowSubclass((HWND)toolPtr->uId, TOOLTIPS_SubclassProc, 1); } else {

1 0

Henri Verbeet : wined3d: Also free the input signature in shader_cleanup() (Valgrind).
by Alexandre Julliard April 27, 2015

April 27, 2015

Module: wine Branch: master Commit: 4b86f13adef659dea80618afc5359bdeb5124e62 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b86f13adef659dea80618afc… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Apr 24 19:31:39 2015 +0200 wined3d: Also free the input signature in shader_cleanup() (Valgrind). --- dlls/wined3d/shader.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 2a2cf3a..d9ff768 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -1862,6 +1862,7 @@ static void shader_trace_init(const struct wined3d_shader_frontend *fe, void *fe static void shader_cleanup(struct wined3d_shader *shader) { HeapFree(GetProcessHeap(), 0, shader->output_signature.elements); + HeapFree(GetProcessHeap(), 0, shader->input_signature.elements); HeapFree(GetProcessHeap(), 0, shader->signature_strings); shader->device->shader_backend->shader_destroy(shader); HeapFree(GetProcessHeap(), 0, shader->reg_maps.constf);

1 0

Nikolay Sivov : dwrite: Implement ApplyCharacterSpacing().
by Alexandre Julliard April 27, 2015

April 27, 2015

Module: wine Branch: master Commit: 14158a71db73c4bfb4c293f67277fc2e79d310cd URL: http://source.winehq.org/git/wine.git/?a=commit;h=14158a71db73c4bfb4c293f67… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Apr 27 00:20:32 2015 +0300 dwrite: Implement ApplyCharacterSpacing(). --- dlls/dwrite/analyzer.c | 219 ++++++++++++++++++++++++++++++++++++++++++- dlls/dwrite/tests/analyzer.c | 162 ++++++++++++++++++++++++++++++++ 2 files changed, 379 insertions(+), 2 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=14158a71db73c4bfb4c29…

1 0

Gerald Pfeifer : urlmon: Simplify a (redundant) expression in parse_canonicalize.
by Alexandre Julliard April 27, 2015

April 27, 2015

Module: wine Branch: master Commit: 2cfdaaef557c1e2cb6b7454695e2c4ca3e381fd3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2cfdaaef557c1e2cb6b745469… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sat Apr 25 21:18:18 2015 +0200 urlmon: Simplify a (redundant) expression in parse_canonicalize. --- dlls/urlmon/uri.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/urlmon/uri.c b/dlls/urlmon/uri.c index e43d372..48b485b 100644 --- a/dlls/urlmon/uri.c +++ b/dlls/urlmon/uri.c @@ -6842,8 +6842,7 @@ static HRESULT parse_canonicalize(const Uri *uri, DWORD flags, LPWSTR output, ptr = uri->canon_uri+uri->scheme_start+uri->scheme_len+1; pptr = &ptr; } - reduce_path = !(flags & URL_NO_META) && - !(flags & URL_DONT_SIMPLIFY) && + reduce_path = !(flags & URL_DONT_SIMPLIFY) && ptr && check_hierarchical(pptr); for(ptr = uri->canon_uri; ptr < uri->canon_uri+uri->canon_len; ++ptr) {

1 0

Francois Gouget : ddraw/tests: Fix compilation on systems that don' t support nameless unions.
by Alexandre Julliard April 27, 2015

April 27, 2015

Module: wine Branch: master Commit: 7929155e55e1f25a09eb1174293ca9d098768657 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7929155e55e1f25a09eb11742… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Apr 25 09:52:46 2015 +0200 ddraw/tests: Fix compilation on systems that don't support nameless unions. --- dlls/ddraw/tests/ddraw1.c | 10 +++++----- dlls/ddraw/tests/ddraw2.c | 10 +++++----- dlls/ddraw/tests/ddraw4.c | 10 +++++----- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index ab6bf36..839b2b7 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -5612,11 +5612,11 @@ static void test_lighting(void) memset(&light_desc, 0, sizeof(light_desc)); light_desc.dwSize = sizeof(light_desc); light_desc.dltType = D3DLIGHT_DIRECTIONAL; - U1(U(light_desc).dcvColor).r = 0.0f; - U2(U(light_desc).dcvColor).g = 0.0f; - U3(U(light_desc).dcvColor).b = 1.0f; - U4(U(light_desc).dcvColor).a = 1.0f; - light_desc.dvDirection.z = 1.0f; + U1(light_desc.dcvColor).r = 0.0f; + U2(light_desc.dcvColor).g = 0.0f; + U3(light_desc.dcvColor).b = 1.0f; + U4(light_desc.dcvColor).a = 1.0f; + U3(light_desc.dvDirection).z = 1.0f; hr = IDirect3DLight_SetLight(light, &light_desc); ok(SUCCEEDED(hr), "Failed to set light, hr %#x.\n", hr); hr = IDirect3DViewport_AddLight(viewport, light); diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index 11248f5..42f65bc 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -6587,11 +6587,11 @@ static void test_lighting(void) memset(&light_desc, 0, sizeof(light_desc)); light_desc.dwSize = sizeof(light_desc); light_desc.dltType = D3DLIGHT_DIRECTIONAL; - U1(U(light_desc).dcvColor).r = 0.0f; - U2(U(light_desc).dcvColor).g = 0.0f; - U3(U(light_desc).dcvColor).b = 1.0f; - U4(U(light_desc).dcvColor).a = 1.0f; - light_desc.dvDirection.z = 1.0f; + U1(light_desc.dcvColor).r = 0.0f; + U2(light_desc.dcvColor).g = 0.0f; + U3(light_desc.dcvColor).b = 1.0f; + U4(light_desc.dcvColor).a = 1.0f; + U3(light_desc.dvDirection).z = 1.0f; hr = IDirect3DLight_SetLight(light, (D3DLIGHT *)&light_desc); ok(SUCCEEDED(hr), "Failed to set light, hr %#x.\n", hr); hr = IDirect3DViewport2_AddLight(viewport, light); diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index aedc11c..ddb7a1d 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -3938,11 +3938,11 @@ static void test_lighting(void) memset(&light_desc, 0, sizeof(light_desc)); light_desc.dwSize = sizeof(light_desc); light_desc.dltType = D3DLIGHT_DIRECTIONAL; - U1(U(light_desc).dcvColor).r = 1.0f; - U2(U(light_desc).dcvColor).g = 1.0f; - U3(U(light_desc).dcvColor).b = 1.0f; - U4(U(light_desc).dcvColor).a = 1.0f; - light_desc.dvDirection.z = 1.0f; + U1(light_desc.dcvColor).r = 1.0f; + U2(light_desc.dcvColor).g = 1.0f; + U3(light_desc.dcvColor).b = 1.0f; + U4(light_desc.dcvColor).a = 1.0f; + U3(light_desc.dvDirection).z = 1.0f; hr = IDirect3DLight_SetLight(light, (D3DLIGHT *)&light_desc); ok(SUCCEEDED(hr), "Failed to set light, hr %#x.\n", hr); hr = IDirect3DViewport3_AddLight(viewport, light);

1 0