wine-commits May 2010

wine-commits@winehq.org

3 participants
955 discussions

Paul Vriens : user32/tests: Run the tests again on Win95.
by Alexandre Julliard 03 May '10

03 May '10

Module: wine Branch: master Commit: 1b50493ba674b48609ae3648f38bf27e5ee740ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b50493ba674b48609ae3648f… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Sat May 1 21:18:13 2010 +0200 user32/tests: Run the tests again on Win95. --- dlls/user32/tests/edit.c | 18 ++++++++++++++++-- 1 files changed, 16 insertions(+), 2 deletions(-) diff --git a/dlls/user32/tests/edit.c b/dlls/user32/tests/edit.c index 9e4f336..9dd6fac 100644 --- a/dlls/user32/tests/edit.c +++ b/dlls/user32/tests/edit.c @@ -38,6 +38,15 @@ struct edit_notify { static struct edit_notify notifications; +static BOOL (WINAPI *pEndMenu) (void); + +static void init_function_pointers(void) +{ + HMODULE hdll = GetModuleHandleA("user32"); + + pEndMenu = (void*)GetProcAddress(hdll, "EndMenu"); +} + static INT_PTR CALLBACK multi_edit_dialog_proc(HWND hdlg, UINT msg, WPARAM wparam, LPARAM lparam) { static int num_ok_commands = 0; @@ -2099,7 +2108,7 @@ static LRESULT CALLBACK edit4_wnd_procA(HWND hWnd, UINT msg, WPARAM wParam, LPAR if (hWnd != (HWND)lParam) { got_wm_capturechanged = 1; - EndMenu(); + pEndMenu(); } break; } @@ -2427,6 +2436,8 @@ static void test_dialogmode(void) START_TEST(edit) { + init_function_pointers(); + hinst = GetModuleHandleA(NULL); assert(RegisterWindowClasses()); @@ -2452,7 +2463,10 @@ START_TEST(edit) test_child_edit_wmkeydown(); test_fontsize(); test_dialogmode(); - test_contextmenu_focus(); + if (pEndMenu) + test_contextmenu_focus(); + else + win_skip("EndMenu is not available\n"); UnregisterWindowClasses(); }

1 0

Andrew Nguyen : kernel32: Reject a format string with insertions if no variadic arguments are passed to FormatMessageA /W.
by Alexandre Julliard 03 May '10

03 May '10

Module: wine Branch: master Commit: f2c91f0d3c7203a4394eded89a54759e765aa8a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f2c91f0d3c7203a4394eded89… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Sat May 1 03:40:46 2010 -0500 kernel32: Reject a format string with insertions if no variadic arguments are passed to FormatMessageA/W. --- dlls/kernel32/format_msg.c | 7 ++++ dlls/kernel32/tests/format_msg.c | 64 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 71 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/format_msg.c b/dlls/kernel32/format_msg.c index 302a78d..b1befb3 100644 --- a/dlls/kernel32/format_msg.c +++ b/dlls/kernel32/format_msg.c @@ -296,6 +296,13 @@ static LPWSTR format_message( BOOL unicode_caller, DWORD dwFlags, LPCWSTR fmtstr case '6':case '7':case '8':case '9': if (dwFlags & FORMAT_MESSAGE_IGNORE_INSERTS) goto ignore_inserts; + else if (((dwFlags & FORMAT_MESSAGE_ARGUMENT_ARRAY) && !format_args->args) || + (!(dwFlags & FORMAT_MESSAGE_ARGUMENT_ARRAY) && !format_args->list)) + { + SetLastError(ERROR_INVALID_PARAMETER); + HeapFree(GetProcessHeap(), 0, target); + return NULL; + } insertnr = *f-'0'; switch (f[1]) { case '0':case '1':case '2':case '3': diff --git a/dlls/kernel32/tests/format_msg.c b/dlls/kernel32/tests/format_msg.c index 25be3ac..1c4dd76 100644 --- a/dlls/kernel32/tests/format_msg.c +++ b/dlls/kernel32/tests/format_msg.c @@ -180,6 +180,27 @@ static void test_message_from_string_wide(void) ok(r==0, "succeeded: r=%d\n", r); ok(error==ERROR_INVALID_PARAMETER, "last error %u\n", error); + /* insertion with no variadic arguments */ + SetLastError(0xdeadbeef); + memcpy(out, init_buf, sizeof(init_buf)); + r = FormatMessageW(FORMAT_MESSAGE_FROM_STRING, fmt_1, 0, + 0, out, sizeof(out)/sizeof(WCHAR), NULL); + error = GetLastError(); + ok(!memcmp(out, init_buf, sizeof(init_buf)), + "Expected the buffer to be unchanged\n"); + ok(r==0, "succeeded: r=%d\n", r); + ok(error==ERROR_INVALID_PARAMETER, "last error %u\n", error); + + SetLastError(0xdeadbeef); + memcpy(out, init_buf, sizeof(init_buf)); + r = FormatMessageW(FORMAT_MESSAGE_FROM_STRING | FORMAT_MESSAGE_ARGUMENT_ARRAY, fmt_1, 0, + 0, out, sizeof(out)/sizeof(WCHAR), NULL); + error = GetLastError(); + ok(!memcmp(out, init_buf, sizeof(init_buf)), + "Expected the buffer to be unchanged\n"); + ok(r==0, "succeeded: r=%d\n", r); + ok(error==ERROR_INVALID_PARAMETER, "last error %u\n", error); + /* using the format feature */ r = doitW(FORMAT_MESSAGE_FROM_STRING, fmt_1s, 0, 0, out, sizeof(out)/sizeof(WCHAR), test); @@ -483,6 +504,35 @@ static void test_message_from_string(void) ok(GetLastError()==ERROR_INVALID_PARAMETER, "last error %u\n", GetLastError()); + /* insertion with no variadic arguments */ + SetLastError(0xdeadbeef); + memcpy(out, init_buf, sizeof(init_buf)); + r = FormatMessageA(FORMAT_MESSAGE_FROM_STRING, "%1", 0, + 0, out, sizeof(out)/sizeof(CHAR), NULL); + ok(!memcmp(out, init_buf, sizeof(init_buf)) || + broken(!strcmp("%1", out)), /* Win9x */ + "Expected the buffer to be untouched\n"); + ok(r==0 || + broken(r==2), /* Win9x */ + "succeeded: r=%d\n", r); + ok(GetLastError()==ERROR_INVALID_PARAMETER || + broken(GetLastError()==0xdeadbeef), /* Win9x */ + "last error %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + memcpy(out, init_buf, sizeof(init_buf)); + r = FormatMessageA(FORMAT_MESSAGE_FROM_STRING | FORMAT_MESSAGE_ARGUMENT_ARRAY, "%1", 0, + 0, out, sizeof(out)/sizeof(CHAR), NULL); + ok(!memcmp(out, init_buf, sizeof(init_buf)) || + broken(!strcmp("%1", out)), /* Win9x */ + "Expected the buffer to be untouched\n"); + ok(r==0 || + broken(r==2), /* Win9x */ + "succeeded: r=%d\n", r); + ok(GetLastError()==ERROR_INVALID_PARAMETER || + broken(GetLastError()==0xdeadbeef), /* Win9x */ + "last error %u\n", GetLastError()); + /* using the format feature */ r = doit(FORMAT_MESSAGE_FROM_STRING, "%1!s!", 0, 0, out, sizeof(out)/sizeof(CHAR), "test"); @@ -1340,6 +1390,20 @@ static void test_message_from_hmodule(void) MAKELANGID(LANG_NEUTRAL, SUBLANG_NEUTRAL), out, sizeof(out)/sizeof(CHAR), NULL); ok(ret != 0, "FormatMessageA returned 0\n"); + /* Test a message string with an insertion without passing any variadic arguments. */ + ret = FormatMessageA(FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_FROM_HMODULE, h, 193 /* ERROR_BAD_EXE_FORMAT */, + MAKELANGID(LANG_NEUTRAL, SUBLANG_NEUTRAL), out, sizeof(out)/sizeof(CHAR), NULL); + ok(ret == 0 || + broken(ret != 0), /* Win9x */ + "FormatMessageA returned non-zero\n"); + + ret = FormatMessageA(FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_FROM_HMODULE | + FORMAT_MESSAGE_ARGUMENT_ARRAY, h, 193 /* ERROR_BAD_EXE_FORMAT */, + MAKELANGID(LANG_NEUTRAL, SUBLANG_NEUTRAL), out, sizeof(out)/sizeof(CHAR), NULL); + ok(ret == 0 || + broken(ret != 0), /* Win9x */ + "FormatMessageA returned non-zero\n"); + /*Test nonexistent messageID with varying language ID's Note: FormatMessageW behaves the same*/ SetLastError(0xdeadbeef); ret = FormatMessageA(FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_FROM_HMODULE, h, 3044,

1 0

Andrew Eikum : ole32: Only fail on missing Implemented Categories key if we actually have categories to check .
by Alexandre Julliard 03 May '10

03 May '10

Module: wine Branch: master Commit: c22d776e7425ae8466f88bdbb56572c8a4f08859 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c22d776e7425ae8466f88bdbb… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri Apr 30 18:03:05 2010 -0500 ole32: Only fail on missing Implemented Categories key if we actually have categories to check. --- dlls/ole32/comcat.c | 22 ++++++++++++---------- 1 files changed, 12 insertions(+), 10 deletions(-) diff --git a/dlls/ole32/comcat.c b/dlls/ole32/comcat.c index b8060bd..fe0f7e5 100644 --- a/dlls/ole32/comcat.c +++ b/dlls/ole32/comcat.c @@ -232,18 +232,20 @@ static HRESULT COMCAT_IsClassOfCategories( LPCWSTR string; /* Check that every given category is implemented by class. */ - res = RegOpenKeyExW(key, impl_keyname, 0, KEY_READ, &subkey); - if (res != ERROR_SUCCESS) return S_FALSE; - for (string = categories->impl_strings; *string; string += 39) { - HKEY catkey; - res = RegOpenKeyExW(subkey, string, 0, 0, &catkey); - if (res != ERROR_SUCCESS) { - RegCloseKey(subkey); - return S_FALSE; + if (*categories->impl_strings) { + res = RegOpenKeyExW(key, impl_keyname, 0, KEY_READ, &subkey); + if (res != ERROR_SUCCESS) return S_FALSE; + for (string = categories->impl_strings; *string; string += 39) { + HKEY catkey; + res = RegOpenKeyExW(subkey, string, 0, 0, &catkey); + if (res != ERROR_SUCCESS) { + RegCloseKey(subkey); + return S_FALSE; + } + RegCloseKey(catkey); } - RegCloseKey(catkey); + RegCloseKey(subkey); } - RegCloseKey(subkey); /* Check that all categories required by class are given. */ res = RegOpenKeyExW(key, req_keyname, 0, KEY_READ, &subkey);

1 0

Damjan Jovanovic : winemenubuilder: Store menu paths in Unicode.
by Alexandre Julliard 03 May '10

03 May '10

Module: wine Branch: master Commit: 21f75386ec3de52c8001bd72dfdb8e47619b0a0d URL: http://source.winehq.org/git/wine.git/?a=commit;h=21f75386ec3de52c8001bd72d… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Fri Apr 30 13:41:40 2010 +0200 winemenubuilder: Store menu paths in Unicode. --- programs/winemenubuilder/winemenubuilder.c | 61 ++++++++++++++++++++------- 1 files changed, 45 insertions(+), 16 deletions(-) diff --git a/programs/winemenubuilder/winemenubuilder.c b/programs/winemenubuilder/winemenubuilder.c index 0ab3639..9532a2e 100644 --- a/programs/winemenubuilder/winemenubuilder.c +++ b/programs/winemenubuilder/winemenubuilder.c @@ -883,11 +883,52 @@ static HKEY open_menus_reg_key(void) static const WCHAR Software_Wine_FileOpenAssociationsW[] = { 'S','o','f','t','w','a','r','e','\\','W','i','n','e','\\','M','e','n','u','F','i','l','e','s',0}; HKEY assocKey; - if (RegCreateKeyW(HKEY_CURRENT_USER, Software_Wine_FileOpenAssociationsW, &assocKey) == ERROR_SUCCESS) + DWORD ret; + ret = RegCreateKeyW(HKEY_CURRENT_USER, Software_Wine_FileOpenAssociationsW, &assocKey); + if (ret == ERROR_SUCCESS) return assocKey; + SetLastError(ret); return NULL; } +static DWORD register_menus_entry(const char *unix_file, const char *windows_file) +{ + WCHAR *unix_fileW; + WCHAR *windows_fileW; + INT size; + DWORD ret; + + size = MultiByteToWideChar(CP_UNIXCP, 0, unix_file, -1, NULL, 0); + unix_fileW = HeapAlloc(GetProcessHeap(), 0, size * sizeof(WCHAR)); + if (unix_fileW) + { + MultiByteToWideChar(CP_UNIXCP, 0, unix_file, -1, unix_fileW, size); + size = MultiByteToWideChar(CP_UNIXCP, 0, windows_file, -1, NULL, 0); + windows_fileW = HeapAlloc(GetProcessHeap(), 0, size * sizeof(WCHAR)); + if (windows_fileW) + { + HKEY hkey; + MultiByteToWideChar(CP_UNIXCP, 0, windows_file, -1, windows_fileW, size); + hkey = open_menus_reg_key(); + if (hkey) + { + ret = RegSetValueExW(hkey, unix_fileW, 0, REG_SZ, (const BYTE*)windows_fileW, + (strlenW(windows_fileW) + 1) * sizeof(WCHAR)); + RegCloseKey(hkey); + } + else + ret = GetLastError(); + HeapFree(GetProcessHeap(), 0, windows_fileW); + } + else + ret = ERROR_NOT_ENOUGH_MEMORY; + HeapFree(GetProcessHeap(), 0, unix_fileW); + } + else + ret = ERROR_NOT_ENOUGH_MEMORY; + return ret; +} + static BOOL write_desktop_entry(const char *unix_link, const char *location, const char *linkname, const char *path, const char *args, const char *descr, const char *workdir, const char *icon) @@ -919,13 +960,8 @@ static BOOL write_desktop_entry(const char *unix_link, const char *location, con if (unix_link) { - HKEY hkey = open_menus_reg_key(); - if (hkey) - { - RegSetValueExA(hkey, location, 0, REG_SZ, (const BYTE*) unix_link, lstrlenA(unix_link) + 1); - RegCloseKey(hkey); - } - else + DWORD ret = register_menus_entry(location, unix_link); + if (ret != ERROR_SUCCESS) return FALSE; } @@ -1057,14 +1093,7 @@ end: remove(tempfilename); HeapFree(GetProcessHeap(), 0, tempfilename); if (ret) - { - HKEY hkey = open_menus_reg_key(); - if (hkey) - { - RegSetValueExA(hkey, menuPath, 0, REG_SZ, (const BYTE*) unix_link, lstrlenA(unix_link) + 1); - RegCloseKey(hkey); - } - } + register_menus_entry(menuPath, unix_link); HeapFree(GetProcessHeap(), 0, name); HeapFree(GetProcessHeap(), 0, menuPath); return ret;

1 0

Detlef Riekenberg : msvcr100: Add VS2010 C/ C++ runtime library with forwards to msvcrt.
by Alexandre Julliard 03 May '10

03 May '10

Module: wine Branch: master Commit: 1434ef4e743763e5e7c15350a20655a285154e6a URL: http://source.winehq.org/git/wine.git/?a=commit;h=1434ef4e743763e5e7c15350a… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Fri Apr 30 14:07:34 2010 +0200 msvcr100: Add VS2010 C/C++ runtime library with forwards to msvcrt. --- configure | 1 + configure.ac | 1 + dlls/msvcr100/Makefile.in | 13 + dlls/msvcr100/msvcr100.c | 44 ++ dlls/msvcr100/msvcr100.spec | 1623 +++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 1682 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1434ef4e743763e5e7c15…

1 0

Jacek Caban : shdocvw: Set IE version to IE8.
by Alexandre Julliard 03 May '10

03 May '10

Module: wine Branch: master Commit: 961145a7d18d66bd4defbcd5fcad7f72a8b97e2f URL: http://source.winehq.org/git/wine.git/?a=commit;h=961145a7d18d66bd4defbcd5f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Apr 30 18:45:33 2010 +0200 shdocvw: Set IE version to IE8. --- dlls/shdocvw/shdocvw.inf | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/shdocvw/shdocvw.inf b/dlls/shdocvw/shdocvw.inf index 97891fb..a612952 100644 --- a/dlls/shdocvw/shdocvw.inf +++ b/dlls/shdocvw/shdocvw.inf @@ -149,9 +149,9 @@ HKLM,"Software\Microsoft\Windows\CurrentVersion\App Paths\iexplore.exe","Path",, [IE.Reg] -HKLM,"Software\Microsoft\Internet Explorer","Build",,"62900.2180" -HKLM,"Software\Microsoft\Internet Explorer","IVer",,"103" -HKLM,"Software\Microsoft\Internet Explorer","Version",,"6.0.2900.2180" +HKLM,"Software\Microsoft\Internet Explorer","Build",,"86001" +HKLM,"Software\Microsoft\Internet Explorer","Version",,"8.0.6001.18702" +HKLM,"Software\Microsoft\Internet Explorer","W2kVersion",,"8.0.6001.18702" [Strings]

1 0

Sven Baars : msi: Fix Dutch translation.
by Alexandre Julliard 03 May '10

03 May '10

Module: wine Branch: master Commit: 2d2823ae44a69097b7d4e814d02e5d2a7e2d3bd7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d2823ae44a69097b7d4e814d… Author: Sven Baars <sven.wine(a)gmail.com> Date: Fri Apr 30 15:24:33 2010 +0200 msi: Fix Dutch translation. --- dlls/msi/msi_Nl.rc | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msi/msi_Nl.rc b/dlls/msi/msi_Nl.rc index 70af83e..c028240 100644 --- a/dlls/msi/msi_Nl.rc +++ b/dlls/msi/msi_Nl.rc @@ -29,8 +29,8 @@ STRINGTABLE DISCARDABLE 9 "Plaats disk %s" 10 "Ongeldige parameters" 11 "Voer de map in die %s bevat" - 12 "De installatiebron van het feature ontbreekt" - 13 "De netwerkschijf met het feature ontbreekt" + 12 "De installatiebron van de feature ontbreekt" + 13 "De netwerkschijf met de feature ontbreekt" 14 "Feature van:" 15 "Kies de map die %s bevat" }

1 0

Paul Vriens : msi: Update Dutch translation.
by Alexandre Julliard 03 May '10

03 May '10

Module: wine Branch: master Commit: 1cc32247e07ed5a52a961bea275af6c038a9dc94 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1cc32247e07ed5a52a961bea2… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Fri Apr 30 14:34:51 2010 +0200 msi: Update Dutch translation. --- dlls/msi/msi_Nl.rc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msi/msi_Nl.rc b/dlls/msi/msi_Nl.rc index da30430..70af83e 100644 --- a/dlls/msi/msi_Nl.rc +++ b/dlls/msi/msi_Nl.rc @@ -24,7 +24,7 @@ LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL STRINGTABLE DISCARDABLE { - 4 "The specified installation package could not be opened. Please check the file path and try again." + 4 "Het opgegeven installatie pakket kon niet worden geopend. Verifieer het bestandspad en probeer opnieuw." 5 "Pad %s niet gevonden" 9 "Plaats disk %s" 10 "Ongeldige parameters"

1 0

Paul Vriens : winmm: Update Dutch translation.
by Alexandre Julliard 03 May '10

03 May '10

Module: wine Branch: master Commit: be7c8113387f43db81afa2af7de226bd9382d547 URL: http://source.winehq.org/git/wine.git/?a=commit;h=be7c8113387f43db81afa2af7… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Fri Apr 30 14:18:46 2010 +0200 winmm: Update Dutch translation. --- dlls/winmm/winmm_Nl.rc | 40 +++++++++++++++++++++------------------- 1 files changed, 21 insertions(+), 19 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=be7c8113387f43db81afa…

1 0

Henri Verbeet : wined3d: Allow the ARB shader backend to work with GL implementations with low amounts of native parameters .
by Alexandre Julliard 03 May '10

03 May '10

Module: wine Branch: master Commit: 87f34ce5f9ca98d5c767cc4d5eeac3c33eb25b81 URL: http://source.winehq.org/git/wine.git/?a=commit;h=87f34ce5f9ca98d5c767cc4d5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 29 23:41:31 2010 +0200 wined3d: Allow the ARB shader backend to work with GL implementations with low amounts of native parameters. --- dlls/wined3d/arb_program_shader.c | 37 ++++++++++++++++++++++++++++++++----- 1 files changed, 32 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 3852847..fd719c2 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -671,12 +671,23 @@ static DWORD shader_generate_arb_declarations(IWineD3DBaseShader *iface, const s if (pshader) { max_constantsF = gl_info->limits.arb_ps_native_constants; + /* 24 is the minimum MAX_PROGRAM_ENV_PARAMETERS_ARB value. */ + if (max_constantsF < 24) + max_constantsF = gl_info->limits.arb_ps_float_constants; } else { + max_constantsF = gl_info->limits.arb_vs_native_constants; + /* 96 is the minimum MAX_PROGRAM_ENV_PARAMETERS_ARB value. + * Also prevents max_constantsF from becoming less than 0 and + * wrapping . */ + if (max_constantsF < 96) + max_constantsF = gl_info->limits.arb_vs_float_constants; + if(This->baseShader.reg_maps.usesrelconstF) { DWORD highest_constf = 0, clip_limit; - max_constantsF = gl_info->limits.arb_vs_native_constants - reserved_vs_const(iface, gl_info); + + max_constantsF -= reserved_vs_const(iface, gl_info); max_constantsF -= count_bits(This->baseShader.reg_maps.integer_constants); for(i = 0; i < This->baseShader.limits.constant_float; i++) @@ -709,7 +720,6 @@ static DWORD shader_generate_arb_declarations(IWineD3DBaseShader *iface, const s { if (ctx->target_version >= NV2) *num_clipplanes = gl_info->limits.clipplanes; else *num_clipplanes = min(gl_info->limits.clipplanes, 4); - max_constantsF = gl_info->limits.arb_vs_native_constants; } } @@ -4664,11 +4674,19 @@ static BOOL shader_arb_dirty_const(IWineD3DDevice *iface) { static void shader_arb_get_caps(const struct wined3d_gl_info *gl_info, struct shader_caps *pCaps) { - DWORD vs_consts = min(gl_info->limits.arb_vs_float_constants, gl_info->limits.arb_vs_native_constants); - DWORD ps_consts = min(gl_info->limits.arb_ps_float_constants, gl_info->limits.arb_ps_native_constants); - if (gl_info->supported[ARB_VERTEX_PROGRAM]) { + DWORD vs_consts; + + /* 96 is the minimum allowed value of MAX_PROGRAM_ENV_PARAMETERS_ARB + * for vertex programs. If the native limit is less than that it's + * not very useful, and e.g. Mesa swrast returns 0, probably to + * indicate it's a software implementation. */ + if (gl_info->limits.arb_vs_native_constants < 96) + vs_consts = gl_info->limits.arb_vs_float_constants; + else + vs_consts = min(gl_info->limits.arb_vs_float_constants, gl_info->limits.arb_vs_native_constants); + if (gl_info->supported[NV_VERTEX_PROGRAM3]) { pCaps->VertexShaderVersion = WINED3DVS_VERSION(3,0); @@ -4695,6 +4713,15 @@ static void shader_arb_get_caps(const struct wined3d_gl_info *gl_info, struct sh if (gl_info->supported[ARB_FRAGMENT_PROGRAM]) { + DWORD ps_consts; + + /* Similar as above for vertex programs, but the minimum for fragment + * programs is 24. */ + if (gl_info->limits.arb_ps_native_constants < 24) + ps_consts = gl_info->limits.arb_ps_float_constants; + else + ps_consts = min(gl_info->limits.arb_ps_float_constants, gl_info->limits.arb_ps_native_constants); + if (gl_info->supported[NV_FRAGMENT_PROGRAM2]) { pCaps->PixelShaderVersion = WINED3DPS_VERSION(3,0);

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits May 2010