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

André Hentschel : Add WWN 389
by Jeremy Newman 27 Apr '15

27 Apr '15

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

Julian Rüger : German translation for release 1.7.40
by Jeremy Newman 27 Apr '15

27 Apr '15

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

Julian Rüger : German translation for release 1.7.41
by Jeremy Newman 27 Apr '15

27 Apr '15

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

Frédéric Delanoy : French translation for release 1.7.41
by Jeremy Newman 27 Apr '15

27 Apr '15

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

Aric Stewart : comctl32: TTM_SETTOOLINFO does not change subclassing flags.
by Alexandre Julliard 27 Apr '15

27 Apr '15

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

Alistair Leslie-Hughes : packager: Mark DllCanUnloadNow, DllGetClassObject , DllRegisterServer, DllUnregisterServer as private.
by Alexandre Julliard 27 Apr '15

27 Apr '15

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

Matteo Bruni : wined3d: Don' t use the builtin FFP uniforms for texture transformation matrices.
by Alexandre Julliard 27 Apr '15

27 Apr '15

Module: wine Branch: master Commit: 6984ca7f46a379e3adc8f18c50bd5bab169604ab URL: http://source.winehq.org/git/wine.git/?a=commit;h=6984ca7f46a379e3adc8f18c5… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Apr 24 22:25:44 2015 +0200 wined3d: Don't use the builtin FFP uniforms for texture transformation matrices. --- dlls/wined3d/glsl_shader.c | 101 ++++++++++++++++++++++++++++------------- dlls/wined3d/state.c | 4 +- dlls/wined3d/wined3d_private.h | 9 ++-- 3 files changed, 75 insertions(+), 39 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6984ca7f46a379e3adc8f…

1 0

Matteo Bruni : wined3d: Don' t use the builtin FFP uniforms for the material.
by Alexandre Julliard 27 Apr '15

27 Apr '15

Module: wine Branch: master Commit: 978fe23218c98ef695e6d9999797dd959e56a9ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=978fe23218c98ef695e6d9999… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Apr 24 22:25:45 2015 +0200 wined3d: Don't use the builtin FFP uniforms for the material. --- dlls/wined3d/glsl_shader.c | 67 +++++++++++++++++++++++++++++++++++++----- dlls/wined3d/wined3d_private.h | 5 ++-- 2 files changed, 62 insertions(+), 10 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 3d04956..851fc28 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -122,6 +122,11 @@ struct glsl_vs_program GLint projection_matrix_location; GLint normal_matrix_location; GLint texture_matrix_location[MAX_TEXTURES]; + GLint material_ambient_location; + GLint material_diffuse_location; + GLint material_specular_location; + GLint material_emission_location; + GLint material_shininess_location; }; struct glsl_gs_program @@ -1071,6 +1076,28 @@ static void shader_glsl_ffp_vertex_texmatrix_uniform(const struct wined3d_contex checkGLcall("glUniformMatrix4fv"); } +static void shader_glsl_ffp_vertex_material_uniform(const struct wined3d_context *context, + const struct wined3d_state *state, struct glsl_shader_prog_link *prog) +{ + const struct wined3d_gl_info *gl_info = context->gl_info; + + if (state->render_states[WINED3D_RS_SPECULARENABLE]) + { + GL_EXTCALL(glUniform4fv(prog->vs.material_specular_location, 1, &state->material.specular.r)); + GL_EXTCALL(glUniform1f(prog->vs.material_shininess_location, state->material.power)); + } + else + { + static const float black[] = {0.0f, 0.0f, 0.0f, 0.0f}; + + GL_EXTCALL(glUniform4fv(prog->vs.material_specular_location, 1, black)); + } + GL_EXTCALL(glUniform4fv(prog->vs.material_ambient_location, 1, &state->material.ambient.r)); + GL_EXTCALL(glUniform4fv(prog->vs.material_diffuse_location, 1, &state->material.diffuse.r)); + GL_EXTCALL(glUniform4fv(prog->vs.material_emission_location, 1, &state->material.emissive.r)); + checkGLcall("setting FFP material uniforms"); +} + /* Context activation is done by the caller (state handler). */ static void shader_glsl_load_color_key_constant(const struct glsl_ps_program *ps, const struct wined3d_gl_info *gl_info, const struct wined3d_state *state) @@ -1151,6 +1178,9 @@ static void shader_glsl_load_constants(void *shader_priv, struct wined3d_context shader_glsl_ffp_vertex_texmatrix_uniform(context, state, i, prog); } + if (update_mask & WINED3D_SHADER_CONST_FFP_MATERIAL) + shader_glsl_ffp_vertex_material_uniform(context, state, prog); + if (update_mask & WINED3D_SHADER_CONST_PS_F) shader_glsl_load_constantsF(pshader, gl_info, state->ps_consts_f, prog->ps.uniform_f_locations, &priv->pconst_heap, priv->stack, constant_version); @@ -5279,10 +5309,10 @@ static void shader_glsl_ffp_vertex_lighting(struct wined3d_string_buffer *buffer shader_addline(buffer, "vec3 dir, dst;\n"); shader_addline(buffer, "float att, t;\n"); - ambient = shader_glsl_ffp_mcs(settings->ambient_source, "gl_FrontMaterial.ambient"); - diffuse = shader_glsl_ffp_mcs(settings->diffuse_source, "gl_FrontMaterial.diffuse"); - specular = shader_glsl_ffp_mcs(settings->specular_source, "gl_FrontMaterial.specular"); - emission = shader_glsl_ffp_mcs(settings->emission_source, "gl_FrontMaterial.emission"); + ambient = shader_glsl_ffp_mcs(settings->ambient_source, "ffp_material.ambient"); + diffuse = shader_glsl_ffp_mcs(settings->diffuse_source, "ffp_material.diffuse"); + specular = shader_glsl_ffp_mcs(settings->specular_source, "ffp_material.specular"); + emission = shader_glsl_ffp_mcs(settings->emission_source, "ffp_material.emission"); for (i = 0; i < MAX_ACTIVE_LIGHTS; ++i) { @@ -5306,7 +5336,7 @@ static void shader_glsl_ffp_vertex_lighting(struct wined3d_string_buffer *buffer shader_addline(buffer, "t = dot(normal, normalize(dir - normalize(ec_pos.xyz)));\n"); else shader_addline(buffer, "t = dot(normal, normalize(dir + vec3(0.0, 0.0, -1.0)));\n"); - shader_addline(buffer, "if (t > 0.0) specular += (pow(t, gl_FrontMaterial.shininess)" + shader_addline(buffer, "if (t > 0.0) specular += (pow(t, ffp_material.shininess)" " * gl_LightSource[%u].specular) / att;\n", i); break; @@ -5331,7 +5361,7 @@ static void shader_glsl_ffp_vertex_lighting(struct wined3d_string_buffer *buffer shader_addline(buffer, "t = dot(normal, normalize(dir - normalize(ec_pos.xyz)));\n"); else shader_addline(buffer, "t = dot(normal, normalize(dir + vec3(0.0, 0.0, -1.0)));\n"); - shader_addline(buffer, "if (t > 0.0) specular += (pow(t, gl_FrontMaterial.shininess)" + shader_addline(buffer, "if (t > 0.0) specular += (pow(t, ffp_material.shininess)" " * gl_LightSource[%u].specular) * att;\n", i); break; @@ -5348,7 +5378,7 @@ static void shader_glsl_ffp_vertex_lighting(struct wined3d_string_buffer *buffer shader_addline(buffer, "t = dot(normal, normalize(dir - normalize(ec_pos.xyz)));\n"); else shader_addline(buffer, "t = dot(normal, normalize(dir + vec3(0.0, 0.0, -1.0)));\n"); - shader_addline(buffer, "if (t > 0.0) specular += pow(t, gl_FrontMaterial.shininess)" + shader_addline(buffer, "if (t > 0.0) specular += pow(t, ffp_material.shininess)" " * gl_LightSource[%u].specular;\n", i); break; @@ -5382,6 +5412,14 @@ static GLuint shader_glsl_generate_ffp_vertex_shader(struct wined3d_string_buffe shader_addline(buffer, "uniform mat3 ffp_normal_matrix;\n"); shader_addline(buffer, "uniform mat4 ffp_texture_matrix[%u];\n", MAX_TEXTURES); + shader_addline(buffer, "uniform struct\n{\n"); + shader_addline(buffer, " vec4 emission;\n"); + shader_addline(buffer, " vec4 ambient;\n"); + shader_addline(buffer, " vec4 diffuse;\n"); + shader_addline(buffer, " vec4 specular;\n"); + shader_addline(buffer, " float shininess;\n"); + shader_addline(buffer, "} ffp_material;\n"); + shader_addline(buffer, "\nvoid main()\n{\n"); shader_addline(buffer, "float m;\n"); shader_addline(buffer, "vec3 r;\n"); @@ -6176,6 +6214,11 @@ static void shader_glsl_init_vs_uniform_locations(const struct wined3d_gl_info * string_buffer_sprintf(name, "ffp_texture_matrix[%u]", i); vs->texture_matrix_location[i] = GL_EXTCALL(glGetUniformLocation(program_id, name->buffer)); } + vs->material_ambient_location = GL_EXTCALL(glGetUniformLocation(program_id, "ffp_material.ambient")); + vs->material_diffuse_location = GL_EXTCALL(glGetUniformLocation(program_id, "ffp_material.diffuse")); + vs->material_specular_location = GL_EXTCALL(glGetUniformLocation(program_id, "ffp_material.specular")); + vs->material_emission_location = GL_EXTCALL(glGetUniformLocation(program_id, "ffp_material.emission")); + vs->material_shininess_location = GL_EXTCALL(glGetUniformLocation(program_id, "ffp_material.shininess")); string_buffer_release(&priv->string_buffers, name); } @@ -6497,6 +6540,8 @@ static void set_glsl_shader_program(const struct wined3d_context *context, const break; } } + if (entry->vs.material_ambient_location != -1) + entry->constant_update_mask |= WINED3D_SHADER_CONST_FFP_MATERIAL; } if (gshader) @@ -7534,12 +7579,18 @@ static void glsl_vertex_pipe_texmatrix(struct wined3d_context *context, context->constant_update_mask |= WINED3D_SHADER_CONST_FFP_TEXMATRIX; } +static void glsl_vertex_pipe_material(struct wined3d_context *context, + const struct wined3d_state *state, DWORD state_id) +{ + context->constant_update_mask |= WINED3D_SHADER_CONST_FFP_MATERIAL; +} + static const struct StateEntryTemplate glsl_vertex_pipe_vp_states[] = { {STATE_VDECL, {STATE_VDECL, glsl_vertex_pipe_vdecl }, WINED3D_GL_EXT_NONE }, {STATE_SHADER(WINED3D_SHADER_TYPE_VERTEX), {STATE_SHADER(WINED3D_SHADER_TYPE_VERTEX), glsl_vertex_pipe_vs }, WINED3D_GL_EXT_NONE }, {STATE_MATERIAL, {STATE_RENDER(WINED3D_RS_SPECULARENABLE), NULL }, WINED3D_GL_EXT_NONE }, - {STATE_RENDER(WINED3D_RS_SPECULARENABLE), {STATE_RENDER(WINED3D_RS_SPECULARENABLE), state_specularenable }, WINED3D_GL_EXT_NONE }, + {STATE_RENDER(WINED3D_RS_SPECULARENABLE), {STATE_RENDER(WINED3D_RS_SPECULARENABLE), glsl_vertex_pipe_material}, WINED3D_GL_EXT_NONE }, /* Clip planes */ {STATE_CLIPPLANE(0), {STATE_CLIPPLANE(0), clipplane }, WINED3D_GL_EXT_NONE }, {STATE_CLIPPLANE(1), {STATE_CLIPPLANE(1), clipplane }, WINED3D_GL_EXT_NONE }, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index fcba39b..eeb752a 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -309,8 +309,9 @@ enum wined3d_shader_resource_type #define WINED3D_SHADER_CONST_FFP_MODELVIEW 0x00000400 #define WINED3D_SHADER_CONST_FFP_PROJ 0x00000800 #define WINED3D_SHADER_CONST_FFP_TEXMATRIX 0x00001000 -#define WINED3D_SHADER_CONST_FFP_PS 0x00002000 -#define WINED3D_SHADER_CONST_FFP_COLOR_KEY 0x00004000 +#define WINED3D_SHADER_CONST_FFP_MATERIAL 0x00002000 +#define WINED3D_SHADER_CONST_FFP_PS 0x00004000 +#define WINED3D_SHADER_CONST_FFP_COLOR_KEY 0x00008000 enum wined3d_shader_register_type {

1 0

Stefan Dösinger : wined3d: Move volume DXTn handling to apply_format_fixups.
by Alexandre Julliard 27 Apr '15

27 Apr '15

Module: wine Branch: master Commit: 7109bebd024ee68ec2b3ef0a6b29e72ded08abc0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7109bebd024ee68ec2b3ef0a6… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun Apr 26 16:09:10 2015 +0200 wined3d: Move volume DXTn handling to apply_format_fixups. --- dlls/d3d8/tests/device.c | 24 ++++-------------------- dlls/d3d9/tests/device.c | 24 ++++-------------------- dlls/d3dx9_36/tests/texture.c | 15 +++++++++++++-- dlls/wined3d/directx.c | 19 ------------------- dlls/wined3d/utils.c | 16 ++++++++++++++++ 5 files changed, 37 insertions(+), 61 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7109bebd024ee68ec2b3e…

1 0

Stefan Dösinger : wined3d: Move the ARB_texture_cube_map check to init_format_texture_info.
by Alexandre Julliard 27 Apr '15

27 Apr '15

Module: wine Branch: master Commit: 0d6d64b35897eb384ddacaaf8f54067088a247ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d6d64b35897eb384ddacaaf8… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun Apr 26 16:09:11 2015 +0200 wined3d: Move the ARB_texture_cube_map check to init_format_texture_info. --- dlls/wined3d/directx.c | 6 ------ dlls/wined3d/texture.c | 6 ------ dlls/wined3d/utils.c | 3 ++- 3 files changed, 2 insertions(+), 13 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index faa1a7f..36be539 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -4430,12 +4430,6 @@ HRESULT CDECL wined3d_check_device_format(const struct wined3d *wined3d, UINT ad switch (resource_type) { case WINED3D_RTYPE_CUBE_TEXTURE: - if (!gl_info->supported[ARB_TEXTURE_CUBE_MAP]) - { - TRACE("[FAILED] - No cube texture support.\n"); - return WINED3DERR_NOTAVAILABLE; - } - format_flags |= WINED3DFMT_FLAG_TEXTURE; allowed_usage = WINED3DUSAGE_AUTOGENMIPMAP | WINED3DUSAGE_DYNAMIC diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index c62dea4..589f8bf 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -979,12 +979,6 @@ static HRESULT cubetexture_init(struct wined3d_texture *texture, const struct wi return WINED3DERR_INVALIDCALL; } - if (!gl_info->supported[ARB_TEXTURE_CUBE_MAP] && desc->pool != WINED3D_POOL_SCRATCH) - { - WARN("(%p) : Tried to create not supported cube texture.\n", texture); - return WINED3DERR_INVALIDCALL; - } - /* Calculate levels for mip mapping */ if (desc->usage & WINED3DUSAGE_AUTOGENMIPMAP) { diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index b45e0bf..405a79c 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -1859,7 +1859,8 @@ static BOOL init_format_texture_info(struct wined3d_adapter *adapter, struct win format->flags[WINED3D_GL_RES_TYPE_TEX_2D] |= format_texture_info[i].flags; if (gl_info->supported[EXT_TEXTURE3D]) format->flags[WINED3D_GL_RES_TYPE_TEX_3D] |= format_texture_info[i].flags; - format->flags[WINED3D_GL_RES_TYPE_TEX_CUBE] |= format_texture_info[i].flags; + if (gl_info->supported[ARB_TEXTURE_CUBE_MAP]) + format->flags[WINED3D_GL_RES_TYPE_TEX_CUBE] |= format_texture_info[i].flags; format->flags[WINED3D_GL_RES_TYPE_TEX_RECT] |= format_texture_info[i].flags; format->flags[WINED3D_GL_RES_TYPE_BUFFER] |= format_texture_info[i].flags;

1 0