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

Paul Vriens : wininet/tests: Fix a few typos.
by Alexandre Julliard June 3, 2009

June 3, 2009

Module: wine Branch: master Commit: 094cc84ed27e782e30a9b36a7e10a15b26b85642 URL: http://source.winehq.org/git/wine.git/?a=commit;h=094cc84ed27e782e30a9b36a7… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Tue Jun 2 20:31:43 2009 +0200 wininet/tests: Fix a few typos. --- dlls/wininet/tests/http.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index 62b158c..7aa3575 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -1111,7 +1111,7 @@ static void test_http_cache(void) size = sizeof(url); ret = InternetQueryOptionA(request, INTERNET_OPTION_URL, url, &size); - ok(ret, "InternetQueryOptionA(INTERNET_OPTION_url) failed: %u\n", GetLastError()); + ok(ret, "InternetQueryOptionA(INTERNET_OPTION_URL) failed: %u\n", GetLastError()); ok(!strcmp(url, "http://test.winehq.org/hello.html"), "Wrong URL %s\n", url); size = sizeof(file_name); @@ -1146,7 +1146,7 @@ static void test_http_cache(void) file = CreateFile(file_name, GENERIC_READ, FILE_SHARE_READ|FILE_SHARE_WRITE, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); - todo_wine ok(file != INVALID_HANDLE_VALUE, "CreateFile succeeded\n"); + todo_wine ok(file != INVALID_HANDLE_VALUE, "Could not create file: %u\n", GetLastError()); CloseHandle(file); request = HttpOpenRequestA(connect, NULL, "/", NULL, NULL, types, INTERNET_FLAG_NO_CACHE_WRITE, 0); @@ -1167,7 +1167,7 @@ static void test_http_cache(void) file = CreateFile(file_name, GENERIC_READ, FILE_SHARE_READ|FILE_SHARE_WRITE, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); - todo_wine ok(file != INVALID_HANDLE_VALUE, "CreateFile succeeded\n"); + todo_wine ok(file != INVALID_HANDLE_VALUE, "Could not create file: %u\n", GetLastError()); CloseHandle(file); ok(InternetCloseHandle(request), "Close request handle failed\n");

1 0

Alexandre Julliard : makefiles: Remove special handling of .res. o files now that winegcc takes care of this.
by Alexandre Julliard June 2, 2009

June 2, 2009

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

Alexandre Julliard : winebuild: Add detection of duplicate resources.
by Alexandre Julliard June 2, 2009

June 2, 2009

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 June 2, 2009

June 2, 2009

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

Stefan Leichter : kernel32: Added missing newline to win_skip.
by Alexandre Julliard June 2, 2009

June 2, 2009

Module: wine Branch: master Commit: a37b8f79af9387d7b6cd88682124585fd2b35f52 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a37b8f79af9387d7b6cd88682… Author: Stefan Leichter <Stefan.Leichter(a)camline.com> Date: Mon Jun 1 20:28:37 2009 +0200 kernel32: Added missing newline to win_skip. --- dlls/kernel32/tests/process.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index d54a4b8..05fab17 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -386,7 +386,7 @@ static void doChild(const char* file, const char* option) ret = SetConsoleCP(1252); if (!ret && GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) { - win_skip("Setting the codepage is not implemented"); + win_skip("Setting the codepage is not implemented\n"); } else {

1 0

Austin Lund : riched20: If DataObjectImpl_EnumFormatEtc returns E_NOTIMPL then ensure that returned pointers are nulled .
by Alexandre Julliard June 2, 2009

June 2, 2009

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

Tony Wasserka : d3dx9: Redirect D3DXGetImageInfo functions to the FromFileInMemory variant.
by Alexandre Julliard June 2, 2009

June 2, 2009

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

Stefan Dösinger : wined3d: Handle LRP in vertex shaders.
by Alexandre Julliard June 2, 2009

June 2, 2009

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: Update clipplanes on a shader-fixed function switch.
by Alexandre Julliard June 2, 2009

June 2, 2009

Module: wine Branch: master Commit: 1276b090b409f1a5c24ad5ed4b9ef889314d8a85 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1276b090b409f1a5c24ad5ed4… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri May 29 01:09:22 2009 +0200 wined3d: Update clipplanes on a shader-fixed function switch. The view matrix that was set at the time the clipplane was applied is hardcoded into the clipplane. With vertex shaders clip planes ignore the view matrix in d3d. We implement that, but this also means that the clip planes potentially change when we switch between vs and fixed func. --- dlls/wined3d/state.c | 13 ++++++++++++- 1 files changed, 12 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 8f7ead3..143b508 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -4348,6 +4348,7 @@ static void vertexdeclaration(DWORD state, IWineD3DStateBlockImpl *stateblock, W /* Some stuff is in the device until we have per context tracking */ IWineD3DDeviceImpl *device = stateblock->wineD3DDevice; BOOL wasrhw = context->last_was_rhw; + unsigned int i; transformed = device->strided_streams.position_transformed; if(transformed != context->last_was_rhw && !useVertexShaderFunction) { @@ -4419,13 +4420,15 @@ static void vertexdeclaration(DWORD state, IWineD3DStateBlockImpl *stateblock, W if(!device->vs_clipping && !isStateDirty(context, STATE_RENDER(WINED3DRS_CLIPPLANEENABLE))) { state_clipping(STATE_RENDER(WINED3DRS_CLIPPLANEENABLE), stateblock, context); } + for(i = 0; i < GL_LIMITS(clipplanes); i++) { + clipplane(STATE_CLIPPLANE(i), stateblock, context); + } } if(!isStateDirty(context, STATE_RENDER(WINED3DRS_NORMALIZENORMALS))) { state_normalize(STATE_RENDER(WINED3DRS_NORMALIZENORMALS), stateblock, context); } } else { if(!context->last_was_vshader) { - unsigned int i; static BOOL warned = FALSE; if(!device->vs_clipping) { /* Disable all clip planes to get defined results on all drivers. See comment in the @@ -4455,6 +4458,14 @@ static void vertexdeclaration(DWORD state, IWineD3DStateBlockImpl *stateblock, W } } updateFog = TRUE; + + /* Vertex shader clipping ignores the view matrix. Update all clipplanes + * (Note: ARB shaders can read the clip planes for clipping emulation even if + * device->vs_clipping is false. + */ + for(i = 0; i < GL_LIMITS(clipplanes); i++) { + clipplane(STATE_CLIPPLANE(i), stateblock, context); + } } }

1 0

Alexandre Julliard : winebuild: Add a --resources mode that compiles multiple resource files into a single object .
by Alexandre Julliard June 2, 2009

June 2, 2009

Module: wine Branch: master Commit: a328834f5bdc53eef0ee5598aa9a227a9e88e3b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a328834f5bdc53eef0ee5598a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat May 30 21:39:50 2009 +0200 winebuild: Add a --resources mode that compiles multiple resource files into a single object. --- tools/winebuild/build.h | 2 + tools/winebuild/main.c | 13 +++- tools/winebuild/res32.c | 138 ++++++++++++++++++++++++++++++++++++-- tools/winebuild/utils.c | 21 ++++++ tools/winebuild/winebuild.man.in | 7 ++ 5 files changed, 175 insertions(+), 6 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a328834f5bdc53eef0ee5…

1 0