June 2013 - Wine-Commits - list.winehq.org

Lauri Kenttä : po: Update Swedish translation.
by Alexandre Julliard June 19, 2013

June 19, 2013

Module: wine Branch: master Commit: fab0c9bea6240e598007ac49f47dbc7b8d64e09b URL: http://source.winehq.org/git/wine.git/?a=commit;h=fab0c9bea6240e598007ac49f… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Wed Jun 19 00:20:33 2013 +0300 po: Update Swedish translation. --- po/sv.po | 168 +++++++++++++++++++------------------------------------------ 1 files changed, 53 insertions(+), 115 deletions(-) diff --git a/po/sv.po b/po/sv.po index 1797c1b..e30807b 100644 --- a/po/sv.po +++ b/po/sv.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2012-06-06 21:20+0300\n" +"PO-Revision-Date: 2013-06-19 00:18+0300\n" "Last-Translator: Lauri Kenttä <lauri.kentta(a)gmail.com>\n" "Language-Team: none\n" "Language: Swedish\n" @@ -744,7 +744,7 @@ msgstr "Utskriftsformat" #: comdlg32.rc:432 msgid "&Tray:" -msgstr "" +msgstr "&Fack:" #: comdlg32.rc:435 wineps.rc:32 msgid "&Portrait" @@ -860,7 +860,7 @@ msgstr "Lista" #: comdlg32.rc:44 cryptui.rc:193 msgid "Details" -msgstr "Detaljerat" +msgstr "Detaljer" #: comdlg32.rc:45 msgid "Browse to Desktop" @@ -3042,7 +3042,7 @@ msgstr "Koreanska (Johab)" #: gdi32.rc:40 msgid "Symbol" -msgstr "" +msgstr "Symboler" #: gdi32.rc:41 msgid "OEM/DOS" @@ -3050,7 +3050,7 @@ msgstr "OEM/DOS" #: gdi32.rc:42 wldap32.rc:107 msgid "Other" -msgstr "" +msgstr "Annan" #: gphoto2.rc:27 msgid "Files on Camera" @@ -3455,10 +3455,8 @@ msgid "Test Force Feedback" msgstr "Testa kraftåterkoppling" #: joy.rc:64 -#, fuzzy -#| msgid "Available formats" msgid "Available Effects" -msgstr "Tillgängliga format" +msgstr "Tillgängliga effekter" #: joy.rc:66 msgid "" @@ -3528,7 +3526,7 @@ msgstr "Oterminerad strängkonstant" #: jscript.rc:39 msgid "'return' statement outside of function" -msgstr "" +msgstr "'return' utanför funktion" #: jscript.rc:40 msgid "Can't have 'break' outside of loop" @@ -5152,7 +5150,7 @@ msgstr "Ingen symbol för personifiering.\n" #: winerror.mc:1956 msgid "Can't disable mandatory group.\n" -msgstr "Kan inte avaktivera obligatorisk grupp.\n" +msgstr "Kan inte inaktivera obligatorisk grupp.\n" #: winerror.mc:1961 msgid "No logon servers available.\n" @@ -5236,7 +5234,7 @@ msgstr "Lösenord utgånget.\n" #: winerror.mc:2061 msgid "Account disabled.\n" -msgstr "Kontot avaktiverat.\n" +msgstr "Kontot inaktiverat.\n" #: winerror.mc:2066 msgid "No security ID mapped.\n" @@ -5272,11 +5270,11 @@ msgstr "Felaktig ärvd ACL.\n" #: winerror.mc:2106 msgid "Server disabled.\n" -msgstr "Servern avaktiverad.\n" +msgstr "Servern inaktiverad.\n" #: winerror.mc:2111 msgid "Server not disabled.\n" -msgstr "Servern ej avaktiverad.\n" +msgstr "Servern ej inaktiverad.\n" #: winerror.mc:2116 msgid "Invalid ID authority.\n" @@ -8237,20 +8235,16 @@ msgid "Security Warning" msgstr "Säkerhetsvarning" #: urlmon.rc:32 -#, fuzzy -#| msgid "Do you want to continue anyway?" msgid "Do you want to install this software?" -msgstr "Vill du fortsätta ändå?" +msgstr "Vill du installera denna programvara?" #: urlmon.rc:34 explorer.rc:29 msgid "Location:" msgstr "Plats:" #: urlmon.rc:36 -#, fuzzy -#| msgid "Install/Uninstall" msgid "Don't install" -msgstr "Installera/Avinstallera" +msgstr "Installera inte" #: urlmon.rc:40 msgid "" @@ -8259,22 +8253,16 @@ msgid "" msgstr "" #: urlmon.rc:48 -#, fuzzy -#| msgid "Installation package failed to open.\n" msgid "Installation of component failed: %08x" -msgstr "Installationspaketet öppnades inte.\n" +msgstr "Installation av komponenten misslyckades: %08x" #: urlmon.rc:49 -#, fuzzy -#| msgid "&Install" msgid "Install (%d)" -msgstr "&Installera" +msgstr "Installera (%d)" #: urlmon.rc:50 -#, fuzzy -#| msgid "&Install" msgid "Install" -msgstr "&Installera" +msgstr "Installera" #: user32.rc:27 user32.rc:40 taskmgr.rc:138 msgctxt "window" @@ -9002,7 +8990,7 @@ msgstr "Lyckades" #: wldap32.rc:28 msgid "Operations Error" -msgstr "" +msgstr "Operationsfel" #: wldap32.rc:29 msgid "Protocol Error" @@ -9995,10 +9983,8 @@ msgid "Wine Command Prompt" msgstr "Wine kommandoprompt" #: cmd.rc:349 -#, fuzzy -#| msgid "CMD Version %1!S!\n" msgid "Wine CMD Version %1!S!\n" -msgstr "CMD Version %1!S!\n" +msgstr "Wine CMD version %1!S!\n" #: cmd.rc:350 msgid "More? " @@ -10038,10 +10024,8 @@ msgid "Expected an operand.\n" msgstr "" #: cmd.rc:359 -#, fuzzy -#| msgid "Unexpected network error.\n" msgid "Expected an operator.\n" -msgstr "Oväntat nätverksfel.\n" +msgstr "Operator förväntades.\n" #: cmd.rc:360 msgid "Mismatch in parentheses.\n" @@ -10100,10 +10084,8 @@ msgid "Connection-specific DNS suffix" msgstr "Anslutningsspecifikt DNS-suffix" #: ipconfig.rc:33 -#, fuzzy -#| msgid "IP address" msgid "IPv4 address" -msgstr "IP-adress" +msgstr "IPv4-adress" #: ipconfig.rc:34 msgid "Hostname" @@ -10146,10 +10128,8 @@ msgid "Default gateway" msgstr "Förvald gateway" #: ipconfig.rc:47 -#, fuzzy -#| msgid "IP address" msgid "IPv6 address" -msgstr "IP-adress" +msgstr "IPv6-adress" #: net.rc:27 msgid "" @@ -10282,152 +10262,116 @@ msgid "The following services are running:\n" msgstr "Följande tjänster körs:\n" #: netstat.rc:27 -#, fuzzy -#| msgid "LAN Connection" msgid "Active Connections" -msgstr "LAN-anslutning" +msgstr "Aktiva anslutningar" #: netstat.rc:28 msgid "Proto" -msgstr "" +msgstr "Proto" #: netstat.rc:29 -#, fuzzy -#| msgid "Email Address" msgid "Local Address" -msgstr "E-postadress" +msgstr "Lokal adress" #: netstat.rc:30 -#, fuzzy -#| msgid "Street Address" msgid "Foreign Address" -msgstr "Postadress" +msgstr "Fjärradress" #: netstat.rc:31 -#, fuzzy -#| msgid "Status" msgid "State" -msgstr "Status" +msgstr "Tillstånd" #: netstat.rc:32 -#, fuzzy -#| msgid "Interfaces" msgid "Interface Statistics" -msgstr "Gränssnitt" +msgstr "Gränssnittsstatistik" #: netstat.rc:33 msgid "Sent" -msgstr "" +msgstr "Skickade" #: netstat.rc:34 msgid "Received" -msgstr "" +msgstr "Mottagna" #: netstat.rc:35 -#, fuzzy -#| msgid "bytes" msgid "Bytes" -msgstr "byte" +msgstr "Byte" #: netstat.rc:36 msgid "Unicast packets" -msgstr "" +msgstr "Unicast-paket" #: netstat.rc:37 msgid "Non-unicast packets" -msgstr "" +msgstr "Icke-unicast-paket" #: netstat.rc:38 -#, fuzzy -#| msgid "Disclaimer" msgid "Discards" -msgstr "Ansvarsfriskrivning" +msgstr "Ignorerade" #: netstat.rc:39 -#, fuzzy -#| msgid "Error" msgid "Errors" msgstr "Fel" #: netstat.rc:40 -#, fuzzy -#| msgid "Unknown port.\n" msgid "Unknown protocols" -msgstr "Okänd port.\n" +msgstr "Okända protokoll" #: netstat.rc:41 msgid "TCP Statistics for IPv4" -msgstr "" +msgstr "TCP-statistik för IPv4" #: netstat.rc:42 -#, fuzzy -#| msgid "LAN Connection" msgid "Active Opens" -msgstr "LAN-anslutning" +msgstr "Öppna aktiva" #: netstat.rc:43 msgid "Passive Opens" -msgstr "" +msgstr "Öppna passiva" #: netstat.rc:44 -#, fuzzy -#| msgid "LAN Connection" msgid "Failed Connection Attempts" -msgstr "LAN-anslutning" +msgstr "Misslyckade anslutningsförsök" #: netstat.rc:45 -#, fuzzy -#| msgid "LAN Connection" msgid "Reset Connections" -msgstr "LAN-anslutning" +msgstr "Återställda anslutningar" #: netstat.rc:46 -#, fuzzy -#| msgid "LAN Connection" msgid "Current Connections" -msgstr "LAN-anslutning" +msgstr "Aktuella anslutningar" #: netstat.rc:47 -#, fuzzy -#| msgid "Segment locked.\n" msgid "Segments Received" -msgstr "Segment låst.\n" +msgstr "Mottagna segment" #: netstat.rc:48 -#, fuzzy -#| msgid "Segment locked.\n" msgid "Segments Sent" -msgstr "Segment låst.\n" +msgstr "Skickade segment" #: netstat.rc:49 msgid "Segments Retransmitted" -msgstr "" +msgstr "Återöverförda segment" #: netstat.rc:50 msgid "UDP Statistics for IPv4" -msgstr "" +msgstr "UDP-statistik för IPv4" #: netstat.rc:51 -#, fuzzy -#| msgid "Segment locked.\n" msgid "Datagrams Received" -msgstr "Segment låst.\n" +msgstr "Mottagna datagram" #: netstat.rc:52 -#, fuzzy -#| msgid "Local Port" msgid "No Ports" -msgstr "Lokal port" +msgstr "Inga portar" #: netstat.rc:53 -#, fuzzy -#| msgid "Error" msgid "Receive Errors" -msgstr "Fel" +msgstr "Mottagna fel" #: netstat.rc:54 msgid "Datagrams Sent" -msgstr "" +msgstr "Skickade datagram" #: notepad.rc:27 msgid "&New\tCtrl+N" @@ -10576,7 +10520,7 @@ msgstr "" #: notepad.rc:136 wordpad.rc:288 msgctxt "accelerator Save" msgid "S" -msgstr "" +msgstr "S" #: notepad.rc:137 msgctxt "accelerator Paste" @@ -13384,7 +13328,7 @@ msgstr "Misslyckades med att spara" #: winedbg.rc:41 msgid "Loading detailed information, please wait..." -msgstr "" +msgstr "Hämtar detaljerna, var god vänta..." #: winefile.rc:26 msgid "&Open\tEnter" @@ -13576,22 +13520,16 @@ msgid "Not yet implemented" msgstr "Inte implementerat ännu" #: winefile.rc:106 -#, fuzzy -#| msgid "Creation failed.\n" msgid "Creation date" -msgstr "Kunde inte skapa.\n" +msgstr "Skapad" #: winefile.rc:107 -#, fuzzy -#| msgid "Access denied.\n" msgid "Access date" -msgstr "Åtkomst nekad.\n" +msgstr "Åtkommen" #: winefile.rc:108 -#, fuzzy -#| msgid "Certification Path" msgid "Modification date" -msgstr "Certifieringssökväg" +msgstr "Modifierad" #: winefile.rc:109 msgid "Index/Inode"

1 0

Alistair Leslie-Hughes : wine.inf: Install msdaps. dll into the correct directory.
by Alexandre Julliard June 19, 2013

June 19, 2013

Module: wine Branch: master Commit: ff9039d94d2f2dc2bd646c23afb4d80cda19b412 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff9039d94d2f2dc2bd646c23a… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Jun 18 14:10:46 2013 +1000 wine.inf: Install msdaps.dll into the correct directory. --- tools/wine.inf.in | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/tools/wine.inf.in b/tools/wine.inf.in index 22c9df0..6636a94 100644 --- a/tools/wine.inf.in +++ b/tools/wine.inf.in @@ -2540,6 +2540,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 11,wbem,wmiutils.dll 16422,Internet Explorer,iexplore.exe 16427,System\OLE DB,oledb32.dll +16427,System\OLE DB,msdaps.dll 11,,* [SystemIni]

1 0

Stefan Dösinger : ddraw/tests: Add a test for fog_start == fog_end.
by Alexandre Julliard June 19, 2013

June 19, 2013

Module: wine Branch: master Commit: 21491c87481886f8df84f7ca6e0c18eec46467a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=21491c87481886f8df84f7ca6… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Jun 17 22:53:25 2013 +0200 ddraw/tests: Add a test for fog_start == fog_end. --- dlls/ddraw/tests/ddraw7.c | 98 +++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 98 insertions(+), 0 deletions(-) diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index c67ad84..6bf5fac 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -3177,6 +3177,103 @@ done: DestroyWindow(window); } +static void test_fog_special(void) +{ + static struct + { + struct vec3 position; + D3DCOLOR diffuse; + } + quad[] = + { + {{ -1.0f, 1.0f, 0.0f}, 0xff00ff00}, + {{ 1.0f, 1.0f, 1.0f}, 0xff00ff00}, + {{ -1.0f, -1.0f, 0.0f}, 0xff00ff00}, + {{ 1.0f, -1.0f, 1.0f}, 0xff00ff00}, + }; + static const struct + { + DWORD vertexmode, tablemode; + D3DCOLOR color_left, color_right; + } + tests[] = + { + {D3DFOG_LINEAR, D3DFOG_NONE, 0x00ff0000, 0x00ff0000}, + {D3DFOG_NONE, D3DFOG_LINEAR, 0x0000ff00, 0x00ff0000}, + }; + union + { + float f; + DWORD d; + } conv; + D3DCOLOR color; + HRESULT hr; + unsigned int i; + HWND window; + IDirect3DDevice7 *device; + IDirectDrawSurface7 *rt; + + window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW, + 0, 0, 640, 480, 0, 0, 0, 0); + + if (!(device = create_device(window, DDSCL_NORMAL))) + { + skip("Failed to create D3D device, skipping test.\n"); + DestroyWindow(window); + return; + } + + hr = IDirect3DDevice7_GetRenderTarget(device, &rt); + ok(SUCCEEDED(hr), "Failed to get render target, hr %#x.\n", hr); + + hr = IDirect3DDevice7_SetRenderState(device, D3DRENDERSTATE_FOGENABLE, TRUE); + ok(SUCCEEDED(hr), "Failed to enable fog, hr %#x.\n", hr); + hr = IDirect3DDevice7_SetRenderState(device, D3DRENDERSTATE_FOGCOLOR, 0xffff0000); + ok(SUCCEEDED(hr), "Failed to set fog color, hr %#x.\n", hr); + hr = IDirect3DDevice7_SetRenderState(device, D3DRENDERSTATE_LIGHTING, FALSE); + ok(SUCCEEDED(hr), "Failed to disable lighting, hr %#x.\n", hr); + hr = IDirect3DDevice7_SetRenderState(device, D3DRENDERSTATE_ZENABLE, D3DZB_FALSE); + ok(SUCCEEDED(hr), "Failed to disable lighting, hr %#x.\n", hr); + + conv.f = 0.5f; + hr = IDirect3DDevice7_SetRenderState(device, D3DRENDERSTATE_FOGSTART, conv.d); + ok(SUCCEEDED(hr), "Failed to set fog start, hr %#x.\n", hr); + hr = IDirect3DDevice7_SetRenderState(device, D3DRENDERSTATE_FOGEND, conv.d); + ok(SUCCEEDED(hr), "Failed to set fog end, hr %#x.\n", hr); + + for (i = 0; i < sizeof(tests) / sizeof(*tests); i++) + { + hr = IDirect3DDevice7_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0x000000ff, 1.0f, 0); + ok(SUCCEEDED(hr), "Failed to clear render target, hr %#x.\n", hr); + + hr = IDirect3DDevice7_SetRenderState(device, D3DRENDERSTATE_FOGVERTEXMODE, tests[i].vertexmode); + ok(SUCCEEDED(hr), "Failed to set fogvertexmode, hr %#x.\n", hr); + hr = IDirect3DDevice7_SetRenderState(device, D3DRENDERSTATE_FOGTABLEMODE, tests[i].tablemode); + ok(SUCCEEDED(hr), "Failed to set fogtablemode, hr %#x.\n", hr); + + hr = IDirect3DDevice7_BeginScene(device); + ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); + hr = IDirect3DDevice7_DrawPrimitive(device, D3DPT_TRIANGLESTRIP, D3DFVF_XYZ | D3DFVF_DIFFUSE, quad, 4, 0); + ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); + hr = IDirect3DDevice7_EndScene(device); + ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); + + color = get_surface_color(rt, 310, 240); + ok(compare_color(color, tests[i].color_left, 1), + "Expected left color 0x%08x, got 0x%08x, case %u.\n", tests[i].color_left, color, i); + color = get_surface_color(rt, 330, 240); + ok(compare_color(color, tests[i].color_right, 1), + "Expected right color 0x%08x, got 0x%08x, case %u.\n", tests[i].color_right, color, i); + } + + hr = IDirect3DDevice7_SetRenderState(device, D3DRENDERSTATE_FOGENABLE, FALSE); + ok(SUCCEEDED(hr), "Failed to disable fog, hr %#x.\n", hr); + + IDirectDrawSurface7_Release(rt); + IDirect3DDevice7_Release(device); + DestroyWindow(window); +} + START_TEST(ddraw7) { HMODULE module = GetModuleHandleA("ddraw.dll"); @@ -3212,4 +3309,5 @@ START_TEST(ddraw7) test_draw_strided(); test_clear_rect_count(); test_coop_level_versions(); + test_fog_special(); }

1 0

Stefan Dösinger : d3d8/tests: Add a test for fog_start == fog_end.
by Alexandre Julliard June 19, 2013

June 19, 2013

Module: wine Branch: master Commit: 5f2f2ae9c8f2b1e6a6505ef6ad21f5bb8b7f94dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f2f2ae9c8f2b1e6a6505ef6a… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Jun 17 22:53:24 2013 +0200 d3d8/tests: Add a test for fog_start == fog_end. --- dlls/d3d8/tests/visual.c | 170 +++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 169 insertions(+), 1 deletions(-) diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index 764e9c1..cd830b6 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -1,6 +1,6 @@ /* * Copyright (C) 2005 Henri Verbeet - * Copyright (C) 2007 Stefan Dösinger(for CodeWeavers) + * Copyright (C) 2007, 2009, 2011-2013 Stefan Dösinger(for CodeWeavers) * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -3220,6 +3220,173 @@ static void zenable_test(IDirect3DDevice8 *device) } } +static void fog_special_test(IDirect3DDevice8 *device) +{ + static const struct + { + struct vec3 position; + D3DCOLOR diffuse; + } + quad[] = + { + {{ -1.0f, -1.0f, 0.0f}, 0xff00ff00}, + {{ 1.0f, -1.0f, 1.0f}, 0xff00ff00}, + {{ -1.0f, 1.0f, 0.0f}, 0xff00ff00}, + {{ 1.0f, 1.0f, 1.0f}, 0xff00ff00} + }; + static const struct + { + DWORD vertexmode, tablemode; + BOOL vs, ps; + D3DCOLOR color_left, color_right; + } + tests[] = + { + {D3DFOG_LINEAR, D3DFOG_NONE, FALSE, FALSE, 0x00ff0000, 0x00ff0000}, + {D3DFOG_LINEAR, D3DFOG_NONE, FALSE, TRUE, 0x00ff0000, 0x00ff0000}, + {D3DFOG_LINEAR, D3DFOG_NONE, TRUE, FALSE, 0x00ff0000, 0x00ff0000}, + {D3DFOG_LINEAR, D3DFOG_NONE, TRUE, TRUE, 0x00ff0000, 0x00ff0000}, + + {D3DFOG_NONE, D3DFOG_LINEAR, FALSE, FALSE, 0x0000ff00, 0x00ff0000}, + {D3DFOG_NONE, D3DFOG_LINEAR, FALSE, TRUE, 0x0000ff00, 0x00ff0000}, + {D3DFOG_NONE, D3DFOG_LINEAR, TRUE, FALSE, 0x0000ff00, 0x00ff0000}, + {D3DFOG_NONE, D3DFOG_LINEAR, TRUE, TRUE, 0x0000ff00, 0x00ff0000}, + }; + static const DWORD pixel_shader_code[] = + { + 0xffff0101, /* ps.1.1 */ + 0x00000001, 0x800f0000, 0x90e40000, /* mov r0, v0 */ + 0x0000ffff + }; + static const DWORD vertex_decl[] = + { + D3DVSD_STREAM(0), + D3DVSD_REG(0, D3DVSDT_FLOAT3), /* position, v0 */ + D3DVSD_REG(1, D3DVSDT_D3DCOLOR), /* diffuse color, v1 */ + D3DVSD_END() + }; + static const DWORD vertex_shader_code[] = + { + 0xfffe0101, /* vs.1.1 */ + 0x00000001, 0xc00f0000, 0x90e40000, /* mov oPos, v0 */ + 0x00000001, 0xd00f0000, 0x90e40001, /* mov oD0, v1 */ + 0x0000ffff + }; + union + { + float f; + DWORD d; + } conv; + DWORD color; + HRESULT hr; + unsigned int i; + DWORD ps, vs; + D3DCAPS8 caps; + + hr = IDirect3DDevice8_GetDeviceCaps(device, &caps); + ok(SUCCEEDED(hr), "Failed to get device caps, hr %#x.\n", hr); + if (caps.VertexShaderVersion >= D3DVS_VERSION(1, 1)) + { + hr = IDirect3DDevice8_CreateVertexShader(device, vertex_decl, vertex_shader_code, &vs, 0); + ok(SUCCEEDED(hr), "Failed to create vertex shader, hr %#x.\n", hr); + } + else + { + skip("Vertex Shaders not supported, skipping some fog tests.\n"); + vs = 0; + } + if (caps.PixelShaderVersion >= D3DPS_VERSION(1, 1)) + { + hr = IDirect3DDevice8_CreatePixelShader(device, pixel_shader_code, &ps); + ok(SUCCEEDED(hr), "Failed to create pixel shader, hr %#x.\n", hr); + } + else + { + skip("Pixel Shaders not supported, skipping some fog tests.\n"); + ps = 0; + } + + hr = IDirect3DDevice8_SetRenderState(device, D3DRS_FOGENABLE, TRUE); + ok(SUCCEEDED(hr), "Failed to enable fog, hr %#x.\n", hr); + hr = IDirect3DDevice8_SetRenderState(device, D3DRS_FOGCOLOR, 0xffff0000); + ok(SUCCEEDED(hr), "Failed to set fog color, hr %#x.\n", hr); + + conv.f = 0.5f; + hr = IDirect3DDevice8_SetRenderState(device, D3DRS_FOGSTART, conv.d); + ok(SUCCEEDED(hr), "Failed to set fog start, hr %#x.\n", hr); + hr = IDirect3DDevice8_SetRenderState(device, D3DRS_FOGEND, conv.d); + ok(SUCCEEDED(hr), "Failed to set fog end, hr %#x.\n", hr); + + for (i = 0; i < sizeof(tests) / sizeof(*tests); i++) + { + hr = IDirect3DDevice8_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xff0000ff, 0.0f, 0); + ok(SUCCEEDED(hr), "Failed to clear render target, hr %#x.\n", hr); + + if (!tests[i].vs) + { + hr = IDirect3DDevice8_SetVertexShader(device, D3DFVF_XYZ | D3DFVF_DIFFUSE); + ok(SUCCEEDED(hr), "Failed to set fvf, hr %#x.\n", hr); + } + else if (vs) + { + hr = IDirect3DDevice8_SetVertexShader(device, vs); + ok(SUCCEEDED(hr), "Failed to set vertex shader, hr %#x.\n", hr); + } + else + { + continue; + } + + if (!tests[i].ps) + { + hr = IDirect3DDevice8_SetPixelShader(device, 0); + ok(SUCCEEDED(hr), "Failed to set pixel shader, hr %#x.\n", hr); + } + else if (ps) + { + hr = IDirect3DDevice8_SetPixelShader(device, ps); + ok(SUCCEEDED(hr), "Failed to set pixel shader, hr %#x.\n", hr); + } + else + { + continue; + } + + hr = IDirect3DDevice8_SetRenderState(device, D3DRS_FOGVERTEXMODE, tests[i].vertexmode); + ok(SUCCEEDED(hr), "Failed to set fogvertexmode, hr %#x.\n", hr); + hr = IDirect3DDevice8_SetRenderState(device, D3DRS_FOGTABLEMODE, tests[i].tablemode); + ok(SUCCEEDED(hr), "Failed to set fogtablemode, hr %#x.\n", hr); + + hr = IDirect3DDevice8_BeginScene(device); + ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); + hr = IDirect3DDevice8_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad, sizeof(*quad)); + ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); + hr = IDirect3DDevice8_EndScene(device); + ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); + + color = getPixelColor(device, 310, 240); + ok(color_match(color, tests[i].color_left, 1), + "Expected left color 0x%08x, got 0x%08x, case %u.\n", tests[i].color_left, color, i); + color = getPixelColor(device, 330, 240); + ok(color_match(color, tests[i].color_right, 1), + "Expected right color 0x%08x, got 0x%08x, case %u.\n", tests[i].color_right, color, i); + + hr = IDirect3DDevice8_Present(device, NULL, NULL, NULL, NULL); + ok(SUCCEEDED(hr), "Failed to present backbuffer, hr %#x.\n", hr); + } + + hr = IDirect3DDevice8_SetRenderState(device, D3DRS_FOGENABLE, FALSE); + ok(SUCCEEDED(hr), "Failed to disable fog, hr %#x.\n", hr); + hr = IDirect3DDevice8_SetPixelShader(device, 0); + ok(SUCCEEDED(hr), "Failed to set pixel shader, hr %#x.\n", hr); + hr = IDirect3DDevice8_SetVertexShader(device, 0); + ok(SUCCEEDED(hr), "Failed to set vertex shader, hr %#x.\n", hr); + if (vs) + IDirect3DDevice8_DeleteVertexShader(device, vs); + if (ps) + IDirect3DDevice8_DeletePixelShader(device, ps); +} + START_TEST(visual) { IDirect3DDevice8 *device_ptr; @@ -3303,6 +3470,7 @@ START_TEST(visual) multisample_copy_rects_test(device_ptr); zenable_test(device_ptr); resz_test(device_ptr); + fog_special_test(device_ptr); cleanup: if(device_ptr) {

1 0

Stefan Dösinger : d3d9/tests: Add a test for fog_start == fog_end.
by Alexandre Julliard June 19, 2013

June 19, 2013

Module: wine Branch: master Commit: e030ed3c2fdc93a80295024220e9e4923a47617b URL: http://source.winehq.org/git/wine.git/?a=commit;h=e030ed3c2fdc93a8029502422… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Jun 17 22:53:23 2013 +0200 d3d9/tests: Add a test for fog_start == fog_end. --- dlls/d3d9/tests/visual.c | 166 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 166 insertions(+), 0 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 32470f0..dc84559 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -14038,6 +14038,171 @@ static void zenable_test(IDirect3DDevice9 *device) } } +static void fog_special_test(IDirect3DDevice9 *device) +{ + static const struct + { + struct vec3 position; + D3DCOLOR diffuse; + } + quad[] = + { + {{ -1.0f, -1.0f, 0.0f}, 0xff00ff00}, + {{ 1.0f, -1.0f, 1.0f}, 0xff00ff00}, + {{ -1.0f, 1.0f, 0.0f}, 0xff00ff00}, + {{ 1.0f, 1.0f, 1.0f}, 0xff00ff00} + }; + static const struct + { + DWORD vertexmode, tablemode; + BOOL vs, ps; + D3DCOLOR color_left, color_right; + } + tests[] = + { + {D3DFOG_LINEAR, D3DFOG_NONE, FALSE, FALSE, 0x00ff0000, 0x00ff0000}, + {D3DFOG_LINEAR, D3DFOG_NONE, FALSE, TRUE, 0x00ff0000, 0x00ff0000}, + {D3DFOG_LINEAR, D3DFOG_NONE, TRUE, FALSE, 0x00ff0000, 0x00ff0000}, + {D3DFOG_LINEAR, D3DFOG_NONE, TRUE, TRUE, 0x00ff0000, 0x00ff0000}, + + {D3DFOG_NONE, D3DFOG_LINEAR, FALSE, FALSE, 0x0000ff00, 0x00ff0000}, + {D3DFOG_NONE, D3DFOG_LINEAR, FALSE, TRUE, 0x0000ff00, 0x00ff0000}, + {D3DFOG_NONE, D3DFOG_LINEAR, TRUE, FALSE, 0x0000ff00, 0x00ff0000}, + {D3DFOG_NONE, D3DFOG_LINEAR, TRUE, TRUE, 0x0000ff00, 0x00ff0000}, + }; + static const DWORD pixel_shader_code[] = + { + 0xffff0101, /* ps_1_1 */ + 0x00000001, 0x800f0000, 0x90e40000, /* mov r0, v0 */ + 0x0000ffff + }; + static const DWORD vertex_shader_code[] = + { + 0xfffe0101, /* vs_1_1 */ + 0x0000001f, 0x80000000, 0x900f0000, /* dcl_position v0 */ + 0x0000001f, 0x8000000a, 0x900f0001, /* dcl_color0 v1 */ + 0x00000001, 0xc00f0000, 0x90e40000, /* mov oPos, v0 */ + 0x00000001, 0xd00f0000, 0x90e40001, /* mov oD0, v1 */ + 0x0000ffff + }; + union + { + float f; + DWORD d; + } conv; + DWORD color; + HRESULT hr; + unsigned int i; + IDirect3DPixelShader9 *ps; + IDirect3DVertexShader9 *vs; + D3DCAPS9 caps; + + hr = IDirect3DDevice9_GetDeviceCaps(device, &caps); + ok(SUCCEEDED(hr), "Failed to get device caps, hr %#x.\n", hr); + if (caps.VertexShaderVersion >= D3DVS_VERSION(1, 1)) + { + hr = IDirect3DDevice9_CreateVertexShader(device, vertex_shader_code, &vs); + ok(SUCCEEDED(hr), "Failed to create vertex shader, hr %#x.\n", hr); + } + else + { + skip("Vertex Shaders not supported, skipping some fog tests.\n"); + vs = NULL; + } + if (caps.PixelShaderVersion >= D3DPS_VERSION(1, 1)) + { + hr = IDirect3DDevice9_CreatePixelShader(device, pixel_shader_code, &ps); + ok(SUCCEEDED(hr), "Failed to create pixel shader, hr %#x.\n", hr); + } + else + { + skip("Pixel Shaders not supported, skipping some fog tests.\n"); + ps = NULL; + } + + hr = IDirect3DDevice9_SetFVF(device, D3DFVF_XYZ | D3DFVF_DIFFUSE); + ok(SUCCEEDED(hr), "Failed to set FVF, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_FOGENABLE, TRUE); + ok(SUCCEEDED(hr), "Failed to enable fog, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_FOGCOLOR, 0xffff0000); + ok(SUCCEEDED(hr), "Failed to set fog color, hr %#x.\n", hr); + + conv.f = 0.5f; + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_FOGSTART, conv.d); + ok(SUCCEEDED(hr), "Failed to set fog start, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_FOGEND, conv.d); + ok(SUCCEEDED(hr), "Failed to set fog end, hr %#x.\n", hr); + + for (i = 0; i < sizeof(tests) / sizeof(*tests); i++) + { + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xff0000ff, 0.0f, 0); + ok(SUCCEEDED(hr), "Failed to clear render target, hr %#x.\n", hr); + + if (!tests[i].vs) + { + hr = IDirect3DDevice9_SetVertexShader(device, NULL); + ok(SUCCEEDED(hr), "Failed to set vertex shader, hr %#x.\n", hr); + } + else if (vs) + { + hr = IDirect3DDevice9_SetVertexShader(device, vs); + ok(SUCCEEDED(hr), "Failed to set vertex shader, hr %#x.\n", hr); + } + else + { + continue; + } + + if (!tests[i].ps) + { + hr = IDirect3DDevice9_SetPixelShader(device, NULL); + ok(SUCCEEDED(hr), "Failed to set pixel shader, hr %#x.\n", hr); + } + else if (ps) + { + hr = IDirect3DDevice9_SetPixelShader(device, ps); + ok(SUCCEEDED(hr), "Failed to set pixel shader, hr %#x.\n", hr); + } + else + { + continue; + } + + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_FOGVERTEXMODE, tests[i].vertexmode); + ok(SUCCEEDED(hr), "Failed to set fogvertexmode, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_FOGTABLEMODE, tests[i].tablemode); + ok(SUCCEEDED(hr), "Failed to set fogtablemode, hr %#x.\n", hr); + + hr = IDirect3DDevice9_BeginScene(device); + ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); + hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad, sizeof(*quad)); + ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); + hr = IDirect3DDevice9_EndScene(device); + ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); + + color = getPixelColor(device, 310, 240); + ok(color_match(color, tests[i].color_left, 1), + "Expected left color 0x%08x, got 0x%08x, case %u.\n", tests[i].color_left, color, i); + color = getPixelColor(device, 330, 240); + ok(color_match(color, tests[i].color_right, 1), + "Expected right color 0x%08x, got 0x%08x, case %u.\n", tests[i].color_right, color, i); + + hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); + ok(SUCCEEDED(hr), "Failed to present backbuffer, hr %#x.\n", hr); + } + + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_FOGENABLE, FALSE); + ok(SUCCEEDED(hr), "Failed to disable fog, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetPixelShader(device, NULL); + ok(SUCCEEDED(hr), "Failed to set pixel shader, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetVertexShader(device, NULL); + ok(SUCCEEDED(hr), "Failed to set vertex shader, hr %#x.\n", hr); + if (vs) + IDirect3DVertexShader9_Release(vs); + if (ps) + IDirect3DPixelShader9_Release(ps); +} + START_TEST(visual) { IDirect3D9 *d3d9; @@ -14215,6 +14380,7 @@ START_TEST(visual) update_surface_test(device_ptr); multisample_get_rtdata_test(device_ptr); zenable_test(device_ptr); + fog_special_test(device_ptr); hr = IDirect3DDevice9_GetDirect3D(device_ptr, &d3d9); ok(SUCCEEDED(hr), "Failed to get d3d9 interface, hr %#x.\n", hr);

1 0

Frédéric Delanoy : loader: Remove copy-paste error in BUGS section of wine manpage.
by Alexandre Julliard June 19, 2013

June 19, 2013

Module: wine Branch: master Commit: 2d19782ec5eb279f1b2fe6e1d778c9db578344fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d19782ec5eb279f1b2fe6e1d… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed Jun 19 14:21:09 2013 +0200 loader: Remove copy-paste error in BUGS section of wine manpage. --- loader/wine.man.in | 15 ++++++--------- 1 files changed, 6 insertions(+), 9 deletions(-) diff --git a/loader/wine.man.in b/loader/wine.man.in index 6779b44..f6b2569 100644 --- a/loader/wine.man.in +++ b/loader/wine.man.in @@ -294,20 +294,17 @@ Please add entries to this list for applications you currently run, if there is no entry for this application. .PP Bug reports may be posted to Wine Bugzilla -.I http://bugs.winehq.org +.IR http://bugs.winehq.org . If you want to post a bug report, please see -.I http://wiki.winehq.org/Bugs -in the -.B wine -source to see what information is necessary +.IR http://wiki.winehq.org/Bugs . .PP -Problems and suggestions with this manpage please also report to -.I http://bugs.winehq.org +Problems and suggestions with this manpage can also be reported on +.IR http://bugs.winehq.org . .SH AVAILABILITY The most recent public version of .B wine can be downloaded from -.I http://www.winehq.org/download +.IR http://www.winehq.org/download . .PP The latest snapshot of the code may be obtained via GIT. For information on how to do this, please see @@ -326,7 +323,7 @@ For further information about development, you might want to subscribe to the .B wine mailing lists at -.I http://www.winehq.org/forums +.IR http://www.winehq.org/forums . .SH "SEE ALSO" .BR wineserver (1),

1 0

André Hentschel : ws2_32: Don' t use autoheader styled define.
by Alexandre Julliard June 18, 2013

June 18, 2013

Module: wine Branch: master Commit: f208e9ef07f07e4bf608a5f1128a646d89eb7d17 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f208e9ef07f07e4bf608a5f11… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Jun 17 21:56:52 2013 +0200 ws2_32: Don't use autoheader styled define. --- dlls/ws2_32/socket.c | 36 ++++++++++++++++++------------------ 1 files changed, 18 insertions(+), 18 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 80b317a..98bb426 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -98,7 +98,7 @@ #ifdef HAVE_NETIPX_IPX_H # include <netipx/ipx.h> -# define HAVE_IPX +# define HAS_IPX #elif defined(HAVE_LINUX_IPX_H) # ifdef HAVE_ASM_TYPES_H # include <asm/types.h> @@ -107,7 +107,7 @@ # include <linux/types.h> # endif # include <linux/ipx.h> -# define HAVE_IPX +# define HAS_IPX #endif #ifdef HAVE_LINUX_IRDA_H @@ -115,7 +115,7 @@ # include <linux/types.h> # endif # include <linux/irda.h> -# define HAVE_IRDA +# define HAS_IRDA #endif #ifdef HAVE_POLL_H @@ -153,7 +153,7 @@ #include "wine/exception.h" #include "wine/unicode.h" -#ifdef HAVE_IPX +#ifdef HAS_IPX # include "wsnwlink.h" #endif @@ -438,7 +438,7 @@ static const int ws_af_map[][2] = MAP_OPTION( AF_UNSPEC ), MAP_OPTION( AF_INET ), MAP_OPTION( AF_INET6 ), -#ifdef HAVE_IPX +#ifdef HAS_IPX MAP_OPTION( AF_IPX ), #endif #ifdef AF_IRDA @@ -1218,11 +1218,11 @@ static inline BOOL supported_pf(int pf) case WS_AF_INET: case WS_AF_INET6: return TRUE; -#ifdef HAVE_IPX +#ifdef HAS_IPX case WS_AF_IPX: return TRUE; #endif -#ifdef HAVE_IRDA +#ifdef HAS_IRDA case WS_AF_IRDA: return TRUE; #endif @@ -1244,7 +1244,7 @@ static unsigned int ws_sockaddr_ws2u(const struct WS_sockaddr* wsaddr, int wsadd switch (wsaddr->sa_family) { -#ifdef HAVE_IPX +#ifdef HAS_IPX case WS_AF_IPX: { const struct WS_sockaddr_ipx* wsipx=(const struct WS_sockaddr_ipx*)wsaddr; @@ -1302,7 +1302,7 @@ static unsigned int ws_sockaddr_ws2u(const struct WS_sockaddr* wsaddr, int wsadd memcpy(&uin->sin_addr,&win->sin_addr,4); /* 4 bytes = 32 address bits */ break; } -#ifdef HAVE_IRDA +#ifdef HAS_IRDA case WS_AF_IRDA: { struct sockaddr_irda *uin = (struct sockaddr_irda *)uaddr; const SOCKADDR_IRDA *win = (const SOCKADDR_IRDA *)wsaddr; @@ -1335,12 +1335,12 @@ static unsigned int ws_sockaddr_ws2u(const struct WS_sockaddr* wsaddr, int wsadd case sizeof(struct WS_sockaddr_in): uaddrlen = sizeof(struct sockaddr_in); break; -#ifdef HAVE_IPX +#ifdef HAS_IPX case sizeof(struct WS_sockaddr_ipx): uaddrlen = sizeof(struct sockaddr_ipx); break; #endif -#ifdef HAVE_IRDA +#ifdef HAS_IRDA case sizeof(SOCKADDR_IRDA): uaddrlen = sizeof(struct sockaddr_irda); break; @@ -1364,7 +1364,7 @@ static BOOL is_sockaddr_bound(const struct sockaddr *uaddr, int uaddrlen) { switch (uaddr->sa_family) { -#ifdef HAVE_IPX +#ifdef HAS_IPX case AF_IPX: FIXME("don't know how to tell if IPX socket is bound, assuming it is!\n"); return TRUE; @@ -1396,7 +1396,7 @@ static int ws_sockaddr_u2ws(const struct sockaddr* uaddr, struct WS_sockaddr* ws switch(uaddr->sa_family) { -#ifdef HAVE_IPX +#ifdef HAS_IPX case AF_IPX: { const struct sockaddr_ipx* uipx=(const struct sockaddr_ipx*)uaddr; @@ -1436,7 +1436,7 @@ static int ws_sockaddr_u2ws(const struct sockaddr* uaddr, struct WS_sockaddr* ws } break; #endif -#ifdef HAVE_IRDA +#ifdef HAS_IRDA case AF_IRDA: { const struct sockaddr_irda *uin = (const struct sockaddr_irda *)uaddr; SOCKADDR_IRDA *win = (SOCKADDR_IRDA *)wsaddr; @@ -1772,7 +1772,7 @@ static int WS2_send( int fd, struct ws2_async *wsa ) return -1; } -#if defined(HAVE_IPX) && defined(SOL_IPX) +#if defined(HAS_IPX) && defined(SOL_IPX) if(wsa->addr->sa_family == WS_AF_IPX) { struct sockaddr_ipx* uipx = (struct sockaddr_ipx*)hdr.msg_name; @@ -2806,7 +2806,7 @@ INT WINAPI WS_getsockopt(SOCKET s, INT level, return SOCKET_ERROR; } /* end switch(optname) */ }/* end case WS_SOL_SOCKET */ -#ifdef HAVE_IPX +#ifdef HAS_IPX case NSPROTO_IPX: { struct WS_sockaddr_ipx addr; @@ -2872,7 +2872,7 @@ INT WINAPI WS_getsockopt(SOCKET s, INT level, } /* end case NSPROTO_IPX */ #endif -#ifdef HAVE_IRDA +#ifdef HAS_IRDA case WS_SOL_IRLMP: switch(optname) { @@ -4342,7 +4342,7 @@ int WINAPI WS_setsockopt(SOCKET s, int level, int optname, } break; /* case WS_SOL_SOCKET */ -#ifdef HAVE_IPX +#ifdef HAS_IPX case NSPROTO_IPX: switch(optname) {

1 0

Ken Thomases : winemac: Don' t give windows focus on click if the click was sent to Wine.
by Alexandre Julliard June 18, 2013

June 18, 2013

Module: wine Branch: master Commit: f035cc73d0ae3f192f19109c1ef16cc536fcc5dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=f035cc73d0ae3f192f19109c1… Author: Ken Thomases <ken(a)codeweavers.com> Date: Mon Jun 17 23:36:01 2013 -0500 winemac: Don't give windows focus on click if the click was sent to Wine. Only clicks on the title bar (outside the close or minimize buttons) or the grow box give windows focus. --- dlls/winemac.drv/cocoa_app.m | 6 +++++- dlls/winemac.drv/cocoa_window.m | 16 ---------------- 2 files changed, 5 insertions(+), 17 deletions(-) diff --git a/dlls/winemac.drv/cocoa_app.m b/dlls/winemac.drv/cocoa_app.m index 2441b5d..20050bf 100644 --- a/dlls/winemac.drv/cocoa_app.m +++ b/dlls/winemac.drv/cocoa_app.m @@ -1426,6 +1426,7 @@ int macdrv_err_on; { WineWindow* window = (WineWindow*)[theEvent window]; NSEventType type = [theEvent type]; + BOOL broughtWindowForward = FALSE; if ([window isKindOfClass:[WineWindow class]] && !window.disabled && !window.noActivate && @@ -1433,7 +1434,8 @@ int macdrv_err_on; (([theEvent modifierFlags] & (NSShiftKeyMask | NSControlKeyMask| NSAlternateKeyMask | NSCommandKeyMask)) != NSCommandKeyMask)) { NSWindowButton windowButton; - BOOL broughtWindowForward = TRUE; + + broughtWindowForward = TRUE; /* Any left-click on our window anyplace other than the close or minimize buttons will bring it forward. */ @@ -1538,6 +1540,8 @@ int macdrv_err_on; macdrv_release_event(event); } + else if (broughtWindowForward && ![window isKeyWindow]) + [self windowGotFocus:window]; } // Since mouse button events deliver absolute cursor position, the diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index cf63b25..d926635 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -1181,8 +1181,6 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers) - (void) sendEvent:(NSEvent*)event { - WineApplicationController* controller = [WineApplicationController sharedController]; - /* NSWindow consumes certain key-down events as part of Cocoa's keyboard interface control. For example, Control-Tab switches focus among views. We want to bypass that feature, so directly route key-down @@ -1190,21 +1188,7 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers) if ([event type] == NSKeyDown) [[self firstResponder] keyDown:event]; else - { - if ([event type] == NSLeftMouseDown && - (([event modifierFlags] & (NSShiftKeyMask | NSControlKeyMask| NSAlternateKeyMask | NSCommandKeyMask)) != NSCommandKeyMask)) - { - /* Since our windows generally claim they can't be made key, clicks - in their title bars are swallowed by the theme frame stuff. So, - we hook directly into the event stream and assume that any click - in the window will activate it, if Wine and the Win32 program - accept. */ - if (![self isKeyWindow] && !self.disabled && !self.noActivate) - [controller windowGotFocus:self]; - } - [super sendEvent:event]; - } }

1 0

Alexandre Julliard : winefile: Avoid abbreviations in column names.
by Alexandre Julliard June 18, 2013

June 18, 2013

1 0

Dmitry Timoshkov : comctl32: Fix broken logic for retrieving default font properties.
by Alexandre Julliard June 18, 2013

June 18, 2013

Module: wine Branch: master Commit: c14ff4bef0bd87000fea08eb69d29ddc6d874f5f URL: http://source.winehq.org/git/wine.git/?a=commit;h=c14ff4bef0bd87000fea08eb6… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Jun 18 16:34:27 2013 +0900 comctl32: Fix broken logic for retrieving default font properties. --- dlls/comctl32/tab.c | 8 +++----- 1 files changed, 3 insertions(+), 5 deletions(-) diff --git a/dlls/comctl32/tab.c b/dlls/comctl32/tab.c index bd75c88..85467ba 100644 --- a/dlls/comctl32/tab.c +++ b/dlls/comctl32/tab.c @@ -1899,7 +1899,7 @@ TAB_DrawItemInterior(const TAB_INFO *infoPtr, HDC hdc, INT iItem, RECT *drawRect if(infoPtr->dwStyle & TCS_VERTICAL) /* if we are vertical rotate the text and each character */ { LOGFONTW logfont; - HFONT hFont = 0; + HFONT hFont; INT nEscapement = 900; INT nOrientation = 900; @@ -1911,10 +1911,8 @@ TAB_DrawItemInterior(const TAB_INFO *infoPtr, HDC hdc, INT iItem, RECT *drawRect /* to get a font with the escapement and orientation we are looking for, we need to */ /* call CreateFontIndirect, which requires us to set the values of the logfont we pass in */ - if (!GetObjectW((infoPtr->hFont) ? - infoPtr->hFont : GetStockObject(DEFAULT_GUI_FONT), - sizeof(LOGFONTW),&logfont)) - GetStockObject(DEFAULT_GUI_FONT); + if (!GetObjectW(infoPtr->hFont, sizeof(logfont), &logfont)) + GetObjectW(GetStockObject(DEFAULT_GUI_FONT), sizeof(logfont), &logfont); logfont.lfEscapement = nEscapement; logfont.lfOrientation = nOrientation;

1 0