June 2009 - Wine-commits - list.winehq.org

Detlef Riekenberg : kernel32/tests: Fix failures on localized Windows versions.
by Alexandre Julliard 03 Jun '09

03 Jun '09

Module: wine Branch: master Commit: 8588748bc88b42f9439f579da305d898299a6ba7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8588748bc88b42f9439f579da… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Tue Jun 2 23:41:52 2009 +0200 kernel32/tests: Fix failures on localized Windows versions. --- dlls/kernel32/tests/locale.c | 68 +++++++++++++++++++++++++---------------- 1 files changed, 41 insertions(+), 27 deletions(-) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index 2b7a165..8a56100 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -118,45 +118,59 @@ static void InitFunctionPointers(void) static void test_GetLocaleInfoA(void) { int ret; + int len; LCID lcid = MAKELCID(MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_US), SORT_DEFAULT); char buffer[BUFFER_SIZE]; - const char * expected; + char expected[BUFFER_SIZE]; ok(lcid == 0x409, "wrong LCID calculated - %d\n", lcid); /* en, ar and zh use SUBLANG_NEUTRAL, but GetLocaleInfo assume SUBLANG_DEFAULT */ + memset(expected, 0, COUNTOF(expected)); + len = GetLocaleInfoA(MAKELANGID(LANG_ENGLISH, SUBLANG_DEFAULT), LOCALE_SLANGUAGE, expected, COUNTOF(expected)); SetLastError(0xdeadbeef); memset(buffer, 0, COUNTOF(buffer)); ret = GetLocaleInfoA(LANG_ENGLISH, LOCALE_SLANGUAGE, buffer, COUNTOF(buffer)); - expected = "English (United States)"; - ok((ret == (lstrlenA(expected)+1)) && !lstrcmpA(buffer, expected), - "got %d with '%s' (expected %d with '%s')\n", - ret, buffer, lstrlenA(expected)+1, expected); - - SetLastError(0xdeadbeef); - memset(buffer, 0, COUNTOF(buffer)); - ret = GetLocaleInfoA(LANG_ARABIC, LOCALE_SLANGUAGE, buffer, COUNTOF(buffer)); - expected = "Arabic (Saudi Arabia)"; - ok((ret == (lstrlenA(expected)+1)) && !lstrcmpA(buffer, expected), - "got %d with '%s' (expected %d with '%s')\n", - ret, buffer, lstrlenA(expected)+1, expected); - - SetLastError(0xdeadbeef); - memset(buffer, 0, COUNTOF(buffer)); - ret = GetLocaleInfoA(LANG_CHINESE, LOCALE_SLANGUAGE, buffer, COUNTOF(buffer)); - expected = "Chinese (Taiwan)"; - ok((ret == (lstrlenA(expected)+1)) && !lstrcmpA(buffer, expected), - "got %d with '%s' (expected %d with '%s')\n", - ret, buffer, lstrlenA(expected)+1, expected); + ok((ret == len) && !lstrcmpA(buffer, expected), + "got %d with '%s' (expected %d with '%s')\n", + ret, buffer, len, expected); + + memset(expected, 0, COUNTOF(expected)); + len = GetLocaleInfoA(MAKELANGID(LANG_ARABIC, SUBLANG_DEFAULT), LOCALE_SLANGUAGE, expected, COUNTOF(expected)); + if (len) { + SetLastError(0xdeadbeef); + memset(buffer, 0, COUNTOF(buffer)); + ret = GetLocaleInfoA(LANG_ARABIC, LOCALE_SLANGUAGE, buffer, COUNTOF(buffer)); + ok((ret == len) && !lstrcmpA(buffer, expected), + "got %d with '%s' (expected %d with '%s')\n", + ret, buffer, len, expected); + } + else + win_skip("LANG_ARABIC not installed\n"); + + memset(expected, 0, COUNTOF(expected)); + len = GetLocaleInfoA(MAKELANGID(LANG_CHINESE, SUBLANG_DEFAULT), LOCALE_SLANGUAGE, expected, COUNTOF(expected)); + if (len) { + SetLastError(0xdeadbeef); + memset(buffer, 0, COUNTOF(buffer)); + ret = GetLocaleInfoA(LANG_CHINESE, LOCALE_SLANGUAGE, buffer, COUNTOF(buffer)); + ok((ret == len) && !lstrcmpA(buffer, expected), + "got %d with '%s' (expected %d with '%s')\n", + ret, buffer, len, expected); + } + else + win_skip("LANG_CHINESE not installed\n"); - /* SUBLANG_DEFAULT is not required for GetLocaleInfo */ + /* SUBLANG_DEFAULT is required for mlang.dll, but optional for GetLocaleInfo */ + memset(expected, 0, COUNTOF(expected)); + len = GetLocaleInfoA(MAKELANGID(LANG_GERMAN, SUBLANG_DEFAULT), LOCALE_SLANGUAGE, expected, COUNTOF(expected)); SetLastError(0xdeadbeef); memset(buffer, 0, COUNTOF(buffer)); ret = GetLocaleInfoA(LANG_GERMAN, LOCALE_SLANGUAGE, buffer, COUNTOF(buffer)); - expected = "German (Germany)"; - ok((ret == (lstrlenA(expected)+1)) && !lstrcmpA(buffer, expected), - "got %d with '%s' (expected %d with '%s')\n", - ret, buffer, lstrlenA(expected)+1, expected); + ok((ret == len) && !lstrcmpA(buffer, expected), + "got %d with '%s' (expected %d with '%s')\n", + ret, buffer, len, expected); + /* HTMLKit and "Font xplorer lite" expect GetLocaleInfoA to * partially fill the buffer even if it is too short. See bug 637.

1 0

Alexandre Julliard : winebuild: Add detection of duplicate resources.
by Alexandre Julliard 02 Jun '09

02 Jun '09

Module: wine Branch: master Commit: e112286366d9dff2777dc8d8441531f0b8aabed3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e112286366d9dff2777dc8d84… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 2 14:19:31 2009 +0200 winebuild: Add detection of duplicate resources. --- tools/winebuild/res32.c | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/tools/winebuild/res32.c b/tools/winebuild/res32.c index 5eabc1b..ed902bb 100644 --- a/tools/winebuild/res32.c +++ b/tools/winebuild/res32.c @@ -318,6 +318,16 @@ static int cmp_res( const void *ptr1, const void *ptr2 ) return res1->lang - res2->lang; } +static char *format_res_string( const struct string_id *str ) +{ + int i, len = str->str ? strlenW(str->str) + 1 : 5; + char *ret = xmalloc( len ); + + if (!str->str) sprintf( ret, "%04x", str->id ); + else for (i = 0; i < len; i++) ret[i] = str->str[i]; /* dumb W->A conversion */ + return ret; +} + /* build the 3-level (type,name,language) resource tree */ static struct res_tree *build_resource_tree( DLLSPEC *spec ) { @@ -343,6 +353,13 @@ static struct res_tree *build_resource_tree( DLLSPEC *spec ) { name = add_name( type, &spec->resources[i] ); } + else if (spec->resources[i].lang == spec->resources[i-1].lang) + { + char *type_str = format_res_string( &spec->resources[i].type ); + char *name_str = format_res_string( &spec->resources[i].name ); + error( "winebuild: duplicate resource type %s name %s language %04x\n", + type_str, name_str, spec->resources[i].lang ); + } else name->nb_languages++; } return tree;

1 0

Alexandre Julliard : winegcc: Transparently compile resource files for the Windows build.
by Alexandre Julliard 02 Jun '09

02 Jun '09

Module: wine Branch: master Commit: 9e96918cf7d152e7968cd1408a3d6896b8698b80 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e96918cf7d152e7968cd1408… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat May 30 18:33:11 2009 +0200 winegcc: Transparently compile resource files for the Windows build. --- tools/winegcc/winegcc.c | 29 +++++++++++++++++++++++++++++ 1 files changed, 29 insertions(+), 0 deletions(-) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index f64b677..b0853c1 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -482,6 +482,21 @@ static strarray *get_winebuild_args(struct options *opts) return spec_args; } +static const char* compile_resources_to_object(struct options* opts, const strarray *resources, + const char *res_o_name) +{ + strarray *winebuild_args = get_winebuild_args( opts ); + + strarray_add( winebuild_args, "--resources" ); + strarray_add( winebuild_args, "-o" ); + strarray_add( winebuild_args, res_o_name ); + strarray_addall( winebuild_args, resources ); + + spawn( opts->prefix, winebuild_args, 0 ); + strarray_free( winebuild_args ); + return res_o_name; +} + /* check if there is a static lib associated to a given dll */ static char *find_static_lib( const char *dll ) { @@ -633,6 +648,9 @@ static void build(struct options* opts) if (opts->target_platform == PLATFORM_WINDOWS) { + strarray *resources = strarray_alloc(); + char *res_o_name = NULL; + if (opts->shared) { /* run winebuild to generate the .def file */ @@ -717,10 +735,21 @@ static void build(struct options* opts) } strarray_add(link_args, name); break; + case 'r': + if (!res_o_name) + { + res_o_name = get_temp_file( output_name, ".res.o" ); + strarray_add( link_args, res_o_name ); + } + strarray_add( resources, name ); + break; } } + if (res_o_name) compile_resources_to_object( opts, resources, res_o_name ); + spawn(opts->prefix, link_args, 0); + strarray_free (resources); strarray_free (link_args); return; }

1 0

Alexandre Julliard : makefiles: Remove special handling of .res. o files now that winegcc takes care of this.
by Alexandre Julliard 02 Jun '09

02 Jun '09

Module: wine Branch: master Commit: c18d69ef5f605cbcb3705e1f4250ddda3554de6d URL: http://source.winehq.org/git/wine.git/?a=commit;h=c18d69ef5f605cbcb3705e1f4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 2 13:31:22 2009 +0200 makefiles: Remove special handling of .res.o files now that winegcc takes care of this. --- Make.rules.in | 7 +--- configure | 93 ----------------------------------------- configure.ac | 1 - dlls/Makedll.rules.in | 9 +---- dlls/Maketest.rules.in | 11 +---- programs/Makeprog.rules.in | 9 +---- programs/winetest/Makefile.in | 5 +-- 7 files changed, 6 insertions(+), 129 deletions(-) diff --git a/Make.rules.in b/Make.rules.in index a259da9..05cfa12 100644 --- a/Make.rules.in +++ b/Make.rules.in @@ -40,7 +40,6 @@ AR = @AR@ ARFLAGS = @ARFLAGS@ RANLIB = @RANLIB@ STRIP = @STRIP@ -WINDRES = @WINDRES@ LN = @LN@ LN_S = @LN_S@ TOOLSDIR = @TOOLSDIR@ @@ -121,7 +120,6 @@ CLEAN_TARGETS = $(IDL_GEN_C_SRCS) $(IDL_GEN_HEADERS) $(IDL_TLB_SRCS:.idl=.tlb) $ OBJS = $(C_SRCS:.c=.o) $(BISON_SRCS:.y=.tab.o) $(LEX_SRCS:.l=.yy.o) $(IDL_GEN_C_SRCS:.c=.o) $(EXTRA_OBJS) -RCOBJS = $(RC_SRCS:.rc=.res.o) LINTS = $(C_SRCS:.c=.ln) # 'all' target first in case the enclosing Makefile didn't define any target @@ -135,7 +133,7 @@ filter: dummy # Implicit rules -.SUFFIXES: .mc .rc .mc.rc .res .res.o .spec .spec.o .idl .tlb .h .y .l .tab.c .tab.h .yy.c .ok .man.in .man _c.c _i.c _p.c _s.c @MAINTAINER_MODE@ .sfd .ttf .svg .ico +.SUFFIXES: .mc .rc .mc.rc .res .spec .spec.o .idl .tlb .h .y .l .tab.c .tab.h .yy.c .ok .man.in .man _c.c _i.c _p.c _s.c @MAINTAINER_MODE@ .sfd .ttf .svg .ico .c.o: $(CC) -c $(ALLCFLAGS) -o $@ $< @@ -155,9 +153,6 @@ filter: dummy .rc.res: $(LDPATH) $(RC) $(RCFLAGS) -fo$@ $< -.res.res.o: - $(WINDRES) -i $< -o $@ - .spec.spec.o: $(WINEBUILD) $(WINEBUILDFLAGS) --dll -o $@ --main-module $(MODULE) --export $< diff --git a/configure b/configure index 4ed22e0..35fb4ac 100755 --- a/configure +++ b/configure @@ -733,7 +733,6 @@ EGREP GREP LN LN_S -WINDRES STRIP RANLIB ARFLAGS @@ -4345,98 +4344,6 @@ else STRIP="$ac_cv_prog_STRIP" fi -if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}windres", so it can be a program name with args. -set dummy ${ac_tool_prefix}windres; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_WINDRES+set}" = set; then - $as_echo_n "(cached) " >&6 -else - if test -n "$WINDRES"; then - ac_cv_prog_WINDRES="$WINDRES" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_WINDRES="${ac_tool_prefix}windres" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - -fi -fi -WINDRES=$ac_cv_prog_WINDRES -if test -n "$WINDRES"; then - { $as_echo "$as_me:$LINENO: result: $WINDRES" >&5 -$as_echo "$WINDRES" >&6; } -else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } -fi - - -fi -if test -z "$ac_cv_prog_WINDRES"; then - ac_ct_WINDRES=$WINDRES - # Extract the first word of "windres", so it can be a program name with args. -set dummy windres; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_WINDRES+set}" = set; then - $as_echo_n "(cached) " >&6 -else - if test -n "$ac_ct_WINDRES"; then - ac_cv_prog_ac_ct_WINDRES="$ac_ct_WINDRES" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_ac_ct_WINDRES="windres" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - -fi -fi -ac_ct_WINDRES=$ac_cv_prog_ac_ct_WINDRES -if test -n "$ac_ct_WINDRES"; then - { $as_echo "$as_me:$LINENO: result: $ac_ct_WINDRES" >&5 -$as_echo "$ac_ct_WINDRES" >&6; } -else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } -fi - - if test "x$ac_ct_WINDRES" = x; then - WINDRES="false" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -ac_tool_warned=yes ;; -esac - WINDRES=$ac_ct_WINDRES - fi -else - WINDRES="$ac_cv_prog_WINDRES" -fi - { $as_echo "$as_me:$LINENO: checking whether ln -s works" >&5 $as_echo_n "checking whether ln -s works... " >&6; } LN_S=$as_ln_s diff --git a/configure.ac b/configure.ac index 2185331..9fc8936 100644 --- a/configure.ac +++ b/configure.ac @@ -203,7 +203,6 @@ AC_CHECK_TOOLS(AR,[ar gar],ar) AC_SUBST(ARFLAGS,rc) AC_PROG_RANLIB AC_CHECK_TOOL(STRIP,strip,strip) -AC_CHECK_TOOL(WINDRES,windres,false) AC_PROG_LN_S WINE_PROG_LN AC_PROG_EGREP diff --git a/dlls/Makedll.rules.in b/dlls/Makedll.rules.in index 29ee76a..a571ae3 100644 --- a/dlls/Makedll.rules.in +++ b/dlls/Makedll.rules.in @@ -28,16 +28,9 @@ all: $(MODULE)$(DLLEXT) $(SUBDIRS) @MAKE_RULES@ -# Rules for .so files - -$(MODULE).so: $(MAINSPEC) $(ALL_OBJS) Makefile.in +$(MODULE) $(MODULE).so: $(MAINSPEC) $(ALL_OBJS) Makefile.in $(WINEGCC) -shared $(SRCDIR)/$(MAINSPEC) $(ALL_OBJS) $(EXTRADLLFLAGS) -o $@ $(DELAYIMPORTS:%=-l%) $(IMPORTS:%=-l%) $(DELAYIMPORTS:%=-Wb,-d%) $(ALL_LIBS) -# Rules for .dll files - -$(MODULE): $(MAINSPEC) $(RCOBJS) $(OBJS) Makefile.in - $(WINEGCC) -shared $(SRCDIR)/$(MAINSPEC) $(OBJS) $(RCOBJS) $(EXTRADLLFLAGS) -o $@ $(DELAYIMPORTS:%=-l%) $(IMPORTS:%=-l%) $(ALL_LIBS) - # Rules for import libraries .PHONY: implib $(IMPLIB_SRCS:%=__static_implib__%) diff --git a/dlls/Maketest.rules.in b/dlls/Maketest.rules.in index 58bd3a3..7ea8372 100644 --- a/dlls/Maketest.rules.in +++ b/dlls/Maketest.rules.in @@ -30,15 +30,8 @@ CROSSWINDRES = @CROSSWINDRES@ all: $(TESTPROGRAM) -# Rules for .so main module - -$(MODULE).so: $(OBJS) $(RC_SRCS:.rc=.res) Makefile.in - $(WINEGCC) -mconsole $(APPMODE) $(OBJS) $(RC_SRCS:.rc=.res) -o $@ $(LIBPORT) $(ALL_LIBS) - -# Rules for .exe main module - -$(MODULE): $(OBJS) $(RCOBJS) Makefile.in - $(WINEGCC) $(APPMODE) $(OBJS) $(RCOBJS) -o $@ $(LIBPORT) $(ALL_LIBS) +$(MODULE) $(MODULE).so: $(OBJS) $(RC_SRCS:.rc=.res) Makefile.in + $(WINEGCC) $(APPMODE) $(OBJS) $(RC_SRCS:.rc=.res) -o $@ $(LIBPORT) $(ALL_LIBS) # Rules for building test list diff --git a/programs/Makeprog.rules.in b/programs/Makeprog.rules.in index 95772f3..7c47727 100644 --- a/programs/Makeprog.rules.in +++ b/programs/Makeprog.rules.in @@ -19,16 +19,9 @@ INSTALLDIRS = $(DESTDIR)$(bindir) $(DESTDIR)$(dlldir) $(DESTDIR)$(mandir)/man$(p all: $(MODULE)$(DLLEXT) -# Rules for .so main module - -$(MODULE).so: $(OBJS) $(RC_SRCS:.rc=.res) Makefile.in +$(MODULE) $(MODULE).so: $(OBJS) $(RC_SRCS:.rc=.res) Makefile.in $(WINEGCC) $(APPMODE) $(OBJS) $(RC_SRCS:.rc=.res) -o $@ $(ALL_LIBS) $(DELAYIMPORTS:%=-Wb,-d%) -# Rules for .exe main module - -$(MODULE): $(OBJS) $(RCOBJS) Makefile.in - $(WINEGCC) $(APPMODE) $(OBJS) $(RCOBJS) -o $@ $(ALL_LIBS) $(DELAYIMPORTS:%=-Wb,-d%) - # Rules for testing check test:: $(SUBDIRS:%=%/__test__) dummy diff --git a/programs/winetest/Makefile.in b/programs/winetest/Makefile.in index d880cab..bb1ff86 100644 --- a/programs/winetest/Makefile.in +++ b/programs/winetest/Makefile.in @@ -46,11 +46,8 @@ depend: tests.rc dist: winetest-dist.exe$(DLLEXT) -winetest-dist.exe.so: $(OBJS) dist.res Makefile.in +winetest-dist.exe winetest-dist.exe.so: $(OBJS) dist.res Makefile.in $(WINEGCC) $(APPMODE) $(OBJS) dist.res -o $@ -L$(DLLDIR) $(DELAYIMPORTS:%=-Wb,-d%) $(ALL_LIBS) - -winetest-dist.exe: $(OBJS) dist.res.o Makefile.in - $(WINEGCC) $(APPMODE) $(OBJS) dist.res.o -o $@ -L$(DLLDIR) $(DELAYIMPORTS:%=-Wb,-d%) $(ALL_LIBS) -upx -9 -qqq $@ dist.res: winetest.rc tests.rc build.nfo winetest.ico $(TESTBINS)

1 0

Tony Wasserka : d3dx9: Add utility functions for loading files and resources into memory.
by Alexandre Julliard 02 Jun '09

02 Jun '09

Module: wine Branch: master Commit: 32d2be575e015e4ea17788104c9f58c4a6c65363 URL: http://source.winehq.org/git/wine.git/?a=commit;h=32d2be575e015e4ea17788104… Author: Tony Wasserka <tony.wasserka(a)freenet.de> Date: Mon Jun 1 18:25:32 2009 +0200 d3dx9: Add utility functions for loading files and resources into memory. --- dlls/d3dx9_36/Makefile.in | 3 +- dlls/d3dx9_36/d3dx9_36_private.h | 4 ++ dlls/d3dx9_36/util.c | 104 ++++++++++++++++++++++++++++++++++++++ 3 files changed, 110 insertions(+), 1 deletions(-) diff --git a/dlls/d3dx9_36/Makefile.in b/dlls/d3dx9_36/Makefile.in index 16fd41c..c094071 100644 --- a/dlls/d3dx9_36/Makefile.in +++ b/dlls/d3dx9_36/Makefile.in @@ -13,7 +13,8 @@ C_SRCS = \ mesh.c \ shader.c \ sprite.c \ - surface.c + surface.c \ + util.c RC_SRCS = version.rc diff --git a/dlls/d3dx9_36/d3dx9_36_private.h b/dlls/d3dx9_36/d3dx9_36_private.h index cd4122d..4460f67 100644 --- a/dlls/d3dx9_36/d3dx9_36_private.h +++ b/dlls/d3dx9_36/d3dx9_36_private.h @@ -26,6 +26,10 @@ #include "wingdi.h" #include "d3dx9.h" +/* for internal use */ +HRESULT map_view_of_file(LPCWSTR filename, LPVOID *buffer, DWORD *length); +HRESULT load_resource_into_memory(HMODULE module, HRSRC resinfo, LPVOID *buffer, DWORD *length); + /* ID3DXFont */ typedef struct ID3DXFontImpl diff --git a/dlls/d3dx9_36/util.c b/dlls/d3dx9_36/util.c new file mode 100644 index 0000000..ff41ee7 --- /dev/null +++ b/dlls/d3dx9_36/util.c @@ -0,0 +1,104 @@ +/* + * Copyright (C) 2009 Tony Wasserka + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + * + */ + +#include "wine/debug.h" +#include "d3dx9_36_private.h" + +/************************************************************ + * map_view_of_file + * + * Loads a file into buffer and stores the number of read bytes in length. + * + * PARAMS + * filename [I] name of the file to be loaded + * buffer [O] pointer to destination buffer + * length [O] size of the obtained data + * + * RETURNS + * Success: D3D_OK + * Failure: + * see error codes for CreateFileW, GetFileSize, CreateFileMapping and MapViewOfFile + * + * NOTES + * The caller must UnmapViewOfFile when it doesn't need the data anymore + * + */ +HRESULT map_view_of_file(LPCWSTR filename, LPVOID *buffer, DWORD *length) +{ + HANDLE hfile, hmapping = NULL; + + hfile = CreateFileW(filename, GENERIC_READ, FILE_SHARE_READ, 0, OPEN_EXISTING, 0, 0); + if(hfile == INVALID_HANDLE_VALUE) goto error; + + *length = GetFileSize(hfile, NULL); + if(*length == INVALID_FILE_SIZE) goto error; + + hmapping = CreateFileMappingW(hfile, NULL, PAGE_READONLY, 0, 0, NULL); + if(!hmapping) goto error; + + *buffer = MapViewOfFile(hmapping, FILE_MAP_READ, 0, 0, 0); + if(*buffer == NULL) goto error; + + CloseHandle(hmapping); + CloseHandle(hfile); + + return S_OK; + +error: + CloseHandle(hmapping); + CloseHandle(hfile); + return HRESULT_FROM_WIN32(GetLastError()); +} + +/************************************************************ + * load_resource_into_memory + * + * Loads a resource into buffer and stores the number of + * read bytes in length. + * + * PARAMS + * module [I] handle to the module + * resinfo [I] handle to the resource's information block + * buffer [O] pointer to destination buffer + * length [O] size of the obtained data + * + * RETURNS + * Success: D3D_OK + * Failure: + * See error codes for SizeofResource, LoadResource and LockResource + * + * NOTES + * The memory doesn't need to be freed by the caller manually + * + */ +HRESULT load_resource_into_memory(HMODULE module, HRSRC resinfo, LPVOID *buffer, DWORD *length) +{ + HGLOBAL resource; + + *length = SizeofResource(module, resinfo); + if(*length == 0) return HRESULT_FROM_WIN32(GetLastError()); + + resource = LoadResource(module, resinfo); + if( !resource ) return HRESULT_FROM_WIN32(GetLastError()); + + *buffer = LockResource(resource); + if(*buffer == NULL) return HRESULT_FROM_WIN32(GetLastError()); + + return S_OK; +}

1 0

Tony Wasserka : d3dx9: Redirect D3DXGetImageInfo functions to the FromFileInMemory variant.
by Alexandre Julliard 02 Jun '09

02 Jun '09

Module: wine Branch: master Commit: f1938898153380107cb7ec9e797d98e1b39cecee URL: http://source.winehq.org/git/wine.git/?a=commit;h=f1938898153380107cb7ec9e7… Author: Tony Wasserka <tony.wasserka(a)freenet.de> Date: Mon Jun 1 18:30:15 2009 +0200 d3dx9: Redirect D3DXGetImageInfo functions to the FromFileInMemory variant. --- dlls/d3dx9_36/d3dx9_36_private.h | 2 + dlls/d3dx9_36/surface.c | 112 ++++++++++++++++++++++++++++++++++---- 2 files changed, 104 insertions(+), 10 deletions(-) diff --git a/dlls/d3dx9_36/d3dx9_36_private.h b/dlls/d3dx9_36/d3dx9_36_private.h index 4460f67..a2b0698 100644 --- a/dlls/d3dx9_36/d3dx9_36_private.h +++ b/dlls/d3dx9_36/d3dx9_36_private.h @@ -23,7 +23,9 @@ #include <stdarg.h> #define COBJMACROS +#include "winbase.h" #include "wingdi.h" +#include "winuser.h" #include "d3dx9.h" /* for internal use */ diff --git a/dlls/d3dx9_36/surface.c b/dlls/d3dx9_36/surface.c index 968e3ef..1614e44 100644 --- a/dlls/d3dx9_36/surface.c +++ b/dlls/d3dx9_36/surface.c @@ -18,6 +18,7 @@ */ #include "wine/debug.h" +#include "wine/unicode.h" #include "d3dx9_36_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3dx); @@ -34,36 +35,127 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3dx); * info [O] pointer to the destination structure * * RETURNS - * Success: D3D_OK - * Failure: D3DERR_INVALIDCALL + * Success: D3D_OK, if info is not NULL and data and datasize make up a valid image file or + * if info is NULL and data and datasize are not NULL + * Failure: D3DXERR_INVALIDDATA, if data is no valid image file and datasize and info are not NULL + * D3DERR_INVALIDCALL, if data is NULL or + * if datasize is 0 + * + * NOTES + * datasize may be bigger than the actual file size * */ HRESULT WINAPI D3DXGetImageInfoFromFileInMemory(LPCVOID data, UINT datasize, D3DXIMAGE_INFO *info) { FIXME("stub\n"); + + if(data && datasize && !info) return D3D_OK; + if( !data || !datasize ) return D3DERR_INVALIDCALL; + return E_NOTIMPL; } +/************************************************************ + * D3DXGetImageInfoFromFile + * + * RETURNS + * Success: D3D_OK, if we successfully load a valid image file or + * if we successfully load a file which is no valid image and info is NULL + * Failure: D3DXERR_INVALIDDATA, if we fail to load file or + * if file is not a valid image file and info is not NULL + * D3DERR_INVALIDCALL, if file is NULL + * + */ HRESULT WINAPI D3DXGetImageInfoFromFileA(LPCSTR file, D3DXIMAGE_INFO *info) { - FIXME("stub\n"); - return E_NOTIMPL; + LPWSTR widename; + HRESULT hr; + int strlength; + TRACE("(void): relay\n"); + + if( !file ) return D3DERR_INVALIDCALL; + + strlength = MultiByteToWideChar(CP_ACP, 0, file, -1, NULL, 0); + widename = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, strlength * sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, file, -1, widename, strlength); + + hr = D3DXGetImageInfoFromFileW(widename, info); + HeapFree(GetProcessHeap(), 0, widename); + + return hr; } HRESULT WINAPI D3DXGetImageInfoFromFileW(LPCWSTR file, D3DXIMAGE_INFO *info) { - FIXME("stub\n"); - return E_NOTIMPL; + HRESULT hr; + DWORD size; + LPVOID buffer; + TRACE("(void): relay\n"); + + if( !file ) return D3DERR_INVALIDCALL; + + hr = map_view_of_file(file, &buffer, &size); + if(FAILED(hr)) return D3DXERR_INVALIDDATA; + + hr = D3DXGetImageInfoFromFileInMemory(buffer, size, info); + UnmapViewOfFile(buffer); + + return hr; } +/************************************************************ + * D3DXGetImageInfoFromResource + * + * RETURNS + * Success: D3D_OK, if resource is a valid image file + * Failure: D3DXERR_INVALIDDATA, if resource is no valid image file or NULL or + * if we fail to load resource + * + */ HRESULT WINAPI D3DXGetImageInfoFromResourceA(HMODULE module, LPCSTR resource, D3DXIMAGE_INFO *info) { - FIXME("stub\n"); - return E_NOTIMPL; + HRSRC resinfo; + TRACE("(void)\n"); + + resinfo = FindResourceA(module, resource, (LPCSTR)RT_RCDATA); + if(resinfo) { + LPVOID buffer; + HRESULT hr; + DWORD size; + + hr = load_resource_into_memory(module, resinfo, &buffer, &size); + if(FAILED(hr)) return D3DXERR_INVALIDDATA; + return D3DXGetImageInfoFromFileInMemory(buffer, size, info); + } + + resinfo = FindResourceA(module, resource, (LPCSTR)RT_BITMAP); + if(resinfo) { + FIXME("Implement loading bitmaps from resource type RT_BITMAP\n"); + return E_NOTIMPL; + } + return D3DXERR_INVALIDDATA; } HRESULT WINAPI D3DXGetImageInfoFromResourceW(HMODULE module, LPCWSTR resource, D3DXIMAGE_INFO *info) { - FIXME("stub\n"); - return E_NOTIMPL; + HRSRC resinfo; + TRACE("(void)\n"); + + resinfo = FindResourceW(module, resource, (LPCWSTR)RT_RCDATA); + if(resinfo) { + LPVOID buffer; + HRESULT hr; + DWORD size; + + hr = load_resource_into_memory(module, resinfo, &buffer, &size); + if(FAILED(hr)) return D3DXERR_INVALIDDATA; + return D3DXGetImageInfoFromFileInMemory(buffer, size, info); + } + + resinfo = FindResourceW(module, resource, (LPCWSTR)RT_BITMAP); + if(resinfo) { + FIXME("Implement loading bitmaps from resource type RT_BITMAP\n"); + return E_NOTIMPL; + } + return D3DXERR_INVALIDDATA; }

1 0

Andrew Eikum : gdiplus: Stubs for GdipCreateMetafileFromFile, GdipCreateMetafileFromStream.
by Alexandre Julliard 02 Jun '09

02 Jun '09

Module: wine Branch: master Commit: c02e75cf782488e7d24a1dcb5246c3fa180593e9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c02e75cf782488e7d24a1dcb5… Author: Andrew Eikum <andrew(a)brightnightgames.com> Date: Mon Jun 1 20:02:11 2009 -0500 gdiplus: Stubs for GdipCreateMetafileFromFile, GdipCreateMetafileFromStream. --- dlls/gdiplus/gdiplus.spec | 4 ++-- dlls/gdiplus/graphics.c | 14 ++++++++++++++ include/gdiplusflat.h | 2 ++ 3 files changed, 18 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index beff7a4..abb20a3 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -109,8 +109,8 @@ @ stdcall GdipCreateMatrix3I(ptr ptr ptr) @ stdcall GdipCreateMatrix(ptr) @ stdcall GdipCreateMetafileFromEmf(ptr long ptr) -@ stub GdipCreateMetafileFromFile -@ stub GdipCreateMetafileFromStream +@ stdcall GdipCreateMetafileFromFile(ptr ptr) +@ stdcall GdipCreateMetafileFromStream(ptr ptr) @ stdcall GdipCreateMetafileFromWmf(ptr long ptr ptr) @ stdcall GdipCreateMetafileFromWmfFile(wstr ptr ptr) @ stdcall GdipCreatePath2(ptr ptr long long ptr) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 8d3d09e..21ccea6 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -1116,6 +1116,20 @@ GpStatus WINGDIPAPI GdipCreateMetafileFromWmfFile(GDIPCONST WCHAR *file, return GdipCreateMetafileFromWmf(hmf, TRUE, placeable, metafile); } +GpStatus WINGDIPAPI GdipCreateMetafileFromFile(GDIPCONST WCHAR *file, + GpMetafile **metafile) +{ + FIXME("(%p, %p): stub\n", file, metafile); + return NotImplemented; +} + +GpStatus WINGDIPAPI GdipCreateMetafileFromStream(IStream *stream, + GpMetafile **metafile) +{ + FIXME("(%p, %p): stub\n", stream, metafile); + return NotImplemented; +} + GpStatus WINGDIPAPI GdipCreateStreamOnFile(GDIPCONST WCHAR * filename, UINT access, IStream **stream) { diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index bade9e5..3cf1020 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -432,6 +432,8 @@ GpStatus WINGDIPAPI GdipCreateMetafileFromWmf(HMETAFILE,BOOL, GDIPCONST WmfPlaceableFileHeader*,GpMetafile**); GpStatus WINGDIPAPI GdipCreateMetafileFromWmfFile(GDIPCONST WCHAR*, GDIPCONST WmfPlaceableFileHeader*, GpMetafile**); +GpStatus WINGDIPAPI GdipCreateMetafileFromFile(GDIPCONST WCHAR*,GpMetafile**); +GpStatus WINGDIPAPI GdipCreateMetafileFromStream(IStream*,GpMetafile**); GpStatus WINGDIPAPI GdipSetMetafileDownLevelRasterizationLimit(GpMetafile*,UINT); /* MetafileHeader */

1 0

Austin Lund : riched20: If DataObjectImpl_EnumFormatEtc returns E_NOTIMPL then ensure that returned pointers are nulled .
by Alexandre Julliard 02 Jun '09

02 Jun '09

Module: wine Branch: master Commit: 33534916a3439e1df8910bc8ebbf096f19de854e URL: http://source.winehq.org/git/wine.git/?a=commit;h=33534916a3439e1df8910bc8e… Author: Austin Lund <austin.lund(a)gmail.com> Date: Tue Jun 2 15:57:37 2009 +1000 riched20: If DataObjectImpl_EnumFormatEtc returns E_NOTIMPL then ensure that returned pointers are nulled. --- dlls/riched20/clipboard.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/riched20/clipboard.c b/dlls/riched20/clipboard.c index 648f0c5..cf4fe4b 100644 --- a/dlls/riched20/clipboard.c +++ b/dlls/riched20/clipboard.c @@ -282,6 +282,7 @@ static HRESULT WINAPI DataObjectImpl_EnumFormatEtc(IDataObject* iface, DWORD dwD if(dwDirection != DATADIR_GET) { FIXME("Unsupported direction: %d\n", dwDirection); /* WinXP riched20 also returns E_NOTIMPL in this case */ + *ppenumFormatEtc = NULL; return E_NOTIMPL; } return EnumFormatImpl_Create(This->fmtetc, This->fmtetc_cnt, ppenumFormatEtc);

1 0

Stefan Dösinger : wined3d: Handle LRP in vertex shaders.
by Alexandre Julliard 02 Jun '09

02 Jun '09

Module: wine Branch: master Commit: 7e1100d0e41611724b6838ac5b297cc8c098c059 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e1100d0e41611724b6838ac5… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue May 26 16:34:44 2009 +0200 wined3d: Handle LRP in vertex shaders. The ARB "LRP" instruction is a fragment program only instruction. It is however valid in vs_2_0+ vertex shaders, so we have to emulate it. --- dlls/wined3d/arb_program_shader.c | 24 +++++++++++++++++++++++- 1 files changed, 23 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index f59ef54..ac68683 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -1819,6 +1819,28 @@ static void shader_hw_nrm(const struct wined3d_shader_instruction *ins) } } +static void shader_hw_lrp(const struct wined3d_shader_instruction *ins) +{ + SHADER_BUFFER *buffer = ins->ctx->buffer; + char dst_name[50]; + char src_name[3][50]; + + /* ARB_fragment_program has a convenient LRP instruction */ + if(shader_is_pshader_version(ins->ctx->reg_maps->shader_version.type)) { + shader_hw_map2gl(ins); + return; + } + + shader_arb_get_dst_param(ins, &ins->dst[0], dst_name); + shader_arb_get_src_param(ins, &ins->src[0], 0, src_name[0]); + shader_arb_get_src_param(ins, &ins->src[1], 1, src_name[1]); + shader_arb_get_src_param(ins, &ins->src[2], 2, src_name[2]); + + shader_addline(buffer, "SUB TA, %s, %s;\n", src_name[1], src_name[2]); + shader_addline(buffer, "MAD%s %s, %s, TA, %s;\n", shader_arb_get_modifier(ins), + dst_name, src_name[0], src_name[2]); +} + static void shader_hw_sincos(const struct wined3d_shader_instruction *ins) { /* This instruction exists in ARB, but the d3d instruction takes two extra parameters which @@ -2820,7 +2842,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL /* WINED3DSIH_LOG */ shader_hw_map2gl, /* WINED3DSIH_LOGP */ shader_hw_map2gl, /* WINED3DSIH_LOOP */ NULL, - /* WINED3DSIH_LRP */ shader_hw_map2gl, + /* WINED3DSIH_LRP */ shader_hw_lrp, /* WINED3DSIH_M3x2 */ shader_hw_mnxn, /* WINED3DSIH_M3x3 */ shader_hw_mnxn, /* WINED3DSIH_M3x4 */ shader_hw_mnxn,

1 0

Stefan Dösinger : wined3d: Use condition code for sRGB write correction if available.
by Alexandre Julliard 02 Jun '09

02 Jun '09

Module: wine Branch: master Commit: dfc91414588ea546d7c6757db7810f3767bcb9d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dfc91414588ea546d7c6757db… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue May 26 19:50:27 2009 +0200 wined3d: Use condition code for sRGB write correction if available. This gives a small performance improvement. Don't enable NVfp for it though, because the NVfp penalty is bigger than the gain from this patch. But if NVfp is enabled anyway, make use of it. --- dlls/wined3d/arb_program_shader.c | 63 +++++++++++++++++++++++------------- 1 files changed, 40 insertions(+), 23 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index ac68683..b27d4bf 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -2047,29 +2047,45 @@ static GLuint create_arb_blt_fragment_program(const WineD3D_GL_Info *gl_info, en } static void arbfp_add_sRGB_correction(SHADER_BUFFER *buffer, const char *fragcolor, const char *tmp1, - const char *tmp2, const char *tmp3, const char *tmp4) { + const char *tmp2, const char *tmp3, const char *tmp4, BOOL condcode) { /* Perform sRGB write correction. See GLX_EXT_framebuffer_sRGB */ - /* Calculate the > 0.0031308 case */ - shader_addline(buffer, "POW %s.x, %s.x, srgb_consts1.z;\n", tmp1, fragcolor); - shader_addline(buffer, "POW %s.y, %s.y, srgb_consts1.z;\n", tmp1, fragcolor); - shader_addline(buffer, "POW %s.z, %s.z, srgb_consts1.z;\n", tmp1, fragcolor); - shader_addline(buffer, "MUL %s, %s, srgb_consts1.w;\n", tmp1, tmp1); - shader_addline(buffer, "SUB %s, %s, srgb_consts2.x;\n", tmp1, tmp1); - /* Calculate the < case */ - shader_addline(buffer, "MUL %s, srgb_consts1.x, %s;\n", tmp2, fragcolor); - /* Get 1.0 / 0.0 masks for > 0.0031308 and < 0.0031308 */ - shader_addline(buffer, "SLT %s, srgb_consts1.y, %s;\n", tmp3, fragcolor); - shader_addline(buffer, "SGE %s, srgb_consts1.y, %s;\n", tmp4, fragcolor); - /* Store the components > 0.0031308 in the destination */ - shader_addline(buffer, "MUL %s.xyz, %s, %s;\n", fragcolor, tmp1, tmp3); - /* Add the components that are < 0.0031308 */ - shader_addline(buffer, "MAD %s.xyz, %s, %s, %s;\n", fragcolor, tmp2, tmp4, fragcolor); - /* Move everything into result.color at once. Nvidia hardware cannot handle partial - * result.color writes(.rgb first, then .a), or handle overwriting already written - * components. The assembler uses a temporary register in this case, which is usually - * not allocated from one of our registers that were used earlier. - */ + if(condcode) + { + /* Sigh. MOVC CC doesn't work, so use one of the temps as dummy dest */ + shader_addline(buffer, "SUBC %s, %s.x, srgb_consts1.y;\n", tmp1, fragcolor); + /* Calculate the > 0.0031308 case */ + shader_addline(buffer, "POW %s.x (GE), %s.x, srgb_consts1.z;\n", fragcolor, fragcolor); + shader_addline(buffer, "POW %s.y (GE), %s.y, srgb_consts1.z;\n", fragcolor, fragcolor); + shader_addline(buffer, "POW %s.z (GE), %s.z, srgb_consts1.z;\n", fragcolor, fragcolor); + shader_addline(buffer, "MUL %s.xyz (GE), %s, srgb_consts1.w;\n", fragcolor, fragcolor); + shader_addline(buffer, "SUB %s.xyz (GE), %s, srgb_consts2.x;\n", fragcolor, fragcolor); + /* Calculate the < case */ + shader_addline(buffer, "MUL %s.xyz (LT), srgb_consts1.x, %s;\n", fragcolor, fragcolor); + } + else + { + /* Calculate the > 0.0031308 case */ + shader_addline(buffer, "POW %s.x, %s.x, srgb_consts1.z;\n", tmp1, fragcolor); + shader_addline(buffer, "POW %s.y, %s.y, srgb_consts1.z;\n", tmp1, fragcolor); + shader_addline(buffer, "POW %s.z, %s.z, srgb_consts1.z;\n", tmp1, fragcolor); + shader_addline(buffer, "MUL %s, %s, srgb_consts1.w;\n", tmp1, tmp1); + shader_addline(buffer, "SUB %s, %s, srgb_consts2.x;\n", tmp1, tmp1); + /* Calculate the < case */ + shader_addline(buffer, "MUL %s, srgb_consts1.x, %s;\n", tmp2, fragcolor); + /* Get 1.0 / 0.0 masks for > 0.0031308 and < 0.0031308 */ + shader_addline(buffer, "SLT %s, srgb_consts1.y, %s;\n", tmp3, fragcolor); + shader_addline(buffer, "SGE %s, srgb_consts1.y, %s;\n", tmp4, fragcolor); + /* Store the components > 0.0031308 in the destination */ + shader_addline(buffer, "MUL %s.xyz, %s, %s;\n", fragcolor, tmp1, tmp3); + /* Add the components that are < 0.0031308 */ + shader_addline(buffer, "MAD %s.xyz, %s, %s, %s;\n", fragcolor, tmp2, tmp4, fragcolor); + /* Move everything into result.color at once. Nvidia hardware cannot handle partial + * result.color writes(.rgb first, then .a), or handle overwriting already written + * components. The assembler uses a temporary register in this case, which is usually + * not allocated from one of our registers that were used earlier. + */ + } shader_addline(buffer, "MOV result.color, %s;\n", fragcolor); /* [0.0;1.0] clamping. Not needed, this is done implicitly */ } @@ -2227,7 +2243,8 @@ static GLuint shader_arb_generate_pshader(IWineD3DPixelShaderImpl *This, shader_generate_main((IWineD3DBaseShader *)This, buffer, reg_maps, function, &priv_ctx); if(args->super.srgb_correction) { - arbfp_add_sRGB_correction(buffer, fragcolor, srgbtmp[0], srgbtmp[1], srgbtmp[2], srgbtmp[3]); + arbfp_add_sRGB_correction(buffer, fragcolor, srgbtmp[0], srgbtmp[1], srgbtmp[2], srgbtmp[3], + priv_ctx.target_version >= NV2); } else if(reg_maps->shader_version.major < 2) { shader_addline(buffer, "MOV result.color, %s;\n", fragcolor); } @@ -3688,7 +3705,7 @@ static GLuint gen_arbfp_ffp_shader(const struct ffp_frag_settings *settings, IWi if(settings->sRGB_write) { shader_addline(&buffer, "MAD ret, fragment.color.secondary, specular_enable, %s;\n", final_combiner_src); - arbfp_add_sRGB_correction(&buffer, "ret", "arg0", "arg1", "arg2", "tempreg"); + arbfp_add_sRGB_correction(&buffer, "ret", "arg0", "arg1", "arg2", "tempreg", FALSE); } else { shader_addline(&buffer, "MAD result.color, fragment.color.secondary, specular_enable, %s;\n", final_combiner_src); }

1 0