November 2015 - Wine-commits

Alexandre Julliard : makefiles: Try to remove all include directories on uninstall.
by Alexandre Julliard 10 Nov '15

10 Nov '15

Module: wine Branch: master Commit: a3fcb8dc8804c3a9e34d8616f39fc52546ba7e34 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a3fcb8dc8804c3a9e34d8616f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 10 17:31:46 2015 +0900 makefiles: Try to remove all include directories on uninstall. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- Makefile.in | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Makefile.in b/Makefile.in index eb58fd2..78a8c8c 100644 --- a/Makefile.in +++ b/Makefile.in @@ -118,7 +118,8 @@ distclean:: clean .PHONY: install install-lib install-dev uninstall __uninstall__ uninstall:: __uninstall__ - -rmdir $(DESTDIR)$(fontdir) $(DESTDIR)$(datadir)/wine $(DESTDIR)$(fakedlldir) $(DESTDIR)$(dlldir) $(DESTDIR)$(includedir) + -rmdir $(DESTDIR)$(fontdir) $(DESTDIR)$(datadir)/wine $(DESTDIR)$(fakedlldir) $(DESTDIR)$(dlldir) $(DESTDIR)$(includedir)/windows/ddk \ + $(DESTDIR)$(includedir)/windows $(DESTDIR)$(includedir)/msvcrt/sys $(DESTDIR)$(includedir)/msvcrt $(DESTDIR)$(includedir) # Rules for API documentation

1 0

Alexandre Julliard : makefiles: Add support in make_makefiles for flags in sfd files.
by Alexandre Julliard 10 Nov '15

10 Nov '15

Module: wine Branch: master Commit: fabc25d8b7d51f2315deed048a0713cfcc8f97cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=fabc25d8b7d51f2315deed048… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 10 18:09:19 2015 +0900 makefiles: Add support in make_makefiles for flags in sfd files. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- fonts/Makefile.in | 4 ---- tools/make_makefiles | 36 ++++++++++++++++++++++++++++++------ 2 files changed, 30 insertions(+), 10 deletions(-) diff --git a/fonts/Makefile.in b/fonts/Makefile.in index 9d4ea9f..08c8264 100644 --- a/fonts/Makefile.in +++ b/fonts/Makefile.in @@ -11,7 +11,3 @@ FONT_SRCS = \ tahoma.sfd \ tahomabd.sfd \ wingding.sfd - -# Make sure that make_makefiles sees the generated rules -install install-lib:: -clean:: diff --git a/tools/make_makefiles b/tools/make_makefiles index 3c14751..b7f8b63 100755 --- a/tools/make_makefiles +++ b/tools/make_makefiles @@ -266,13 +266,32 @@ sub get_makedep_flags($) my %flags; open FILE, $file or die "cannot open $file"; - while (<FILE>) + if ($file =~ /\.sfd$/) { - next unless /^#\s*pragma\s+makedep\s+(.*)/; - foreach my $flag (split /\s+/, $1) + while (<FILE>) { - last if $flag eq "depend"; - $flags{$flag} = 1; + next unless /^UComments:\s*\"(.*)\"$/; + foreach my $pragma (split /\+AAoA/, $1) + { + next unless $pragma =~ /^#\s*pragma\s+makedep\s+(.*)/; + foreach my $flag (split /\s+/, $1) + { + $flags{$flag} = 1; + last if $flag eq "font"; + } + } + } + } + else + { + while (<FILE>) + { + next unless /^#\s*pragma\s+makedep\s+(.*)/; + foreach my $flag (split /\s+/, $1) + { + last if $flag eq "depend"; + $flags{$flag} = 1; + } } } close FILE; @@ -342,7 +361,12 @@ sub assign_sources_to_makefiles(@) elsif ($name =~ /\.rh$/) { push @{${$make}{"=HEADER_SRCS"}}, $name; } elsif ($name =~ /\.inl$/) { push @{${$make}{"=HEADER_SRCS"}}, $name; } elsif ($name =~ /\.svg$/) { push @{${$make}{"=SVG_SRCS"}}, $name; } - elsif ($name =~ /\.sfd$/) { push @{${$make}{"=FONT_SRCS"}}, $name; } + elsif ($name =~ /\.sfd$/) + { + ${${$make}{"=flags"}}{"clean"} = 1 if defined $flags{"font"}; + ${${$make}{"=flags"}}{"install-lib"} = 1 if defined $flags{"install"}; + push @{${$make}{"=FONT_SRCS"}}, $name; + } elsif ($name =~ /\.c$/) { ${${$make}{"=flags"}}{"staticimplib"} = 1 if defined $flags{"implib"};

1 0

Alexandre Julliard : makefiles: Always build .in files.
by Alexandre Julliard 10 Nov '15

10 Nov '15

Module: wine Branch: master Commit: b06ff1e55f6e0b2a2d0bcf08e8f67b4e3f93d5e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b06ff1e55f6e0b2a2d0bcf08e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 10 18:28:28 2015 +0900 makefiles: Always build .in files. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 9 +++------ configure.ac | 5 +---- tools/Makefile.in | 2 -- tools/makedep.c | 3 +-- 4 files changed, 5 insertions(+), 14 deletions(-) diff --git a/configure b/configure index 376b3f2..e1f69e0 100755 --- a/configure +++ b/configure @@ -705,11 +705,11 @@ COREFOUNDATION_LIBS LIBWINE_RULES SOCKET_LIBS DLLTOOL -LOADER_RULES ALL_TEST_RESOURCES READELF OTOOL LDD +LOADER_RULES LDRPATH_LOCAL LDRPATH_INSTALL DLLFLAGS @@ -7139,6 +7139,8 @@ LDRPATH_INSTALL="" LDRPATH_LOCAL="" +LOADER_RULES="" + LIBEXT="so" DLLEXT=".so" IMPLIBEXT="def" @@ -7863,11 +7865,6 @@ test "x$enable_win64" != "xyes" || wine_binary="wine64" loader_programs="$wine_binary" libwine_soversion=`expr $libwine_version : '$[0-9]*$\..*'` -LOADER_RULES=" -all: wine.inf -" - - case $host_os in cygwin*|mingw32*) if test -n "$ac_tool_prefix"; then diff --git a/configure.ac b/configure.ac index a516b19..b9f90c7 100644 --- a/configure.ac +++ b/configure.ac @@ -677,6 +677,7 @@ AC_SUBST(dlldir,"\${libdir}/wine") AC_SUBST(DLLFLAGS,"-D_REENTRANT") AC_SUBST(LDRPATH_INSTALL,"") AC_SUBST(LDRPATH_LOCAL,"") +AC_SUBST(LOADER_RULES,"") LIBEXT="so" DLLEXT=".so" IMPLIBEXT="def" @@ -689,10 +690,6 @@ test "x$enable_win64" != "xyes" || wine_binary="wine64" loader_programs="$wine_binary" libwine_soversion=`expr $libwine_version : '$[[0-9]]*$\..*'` -AC_SUBST(LOADER_RULES,[" -all: wine.inf -"]) - case $host_os in cygwin*|mingw32*) AC_CHECK_TOOL(DLLTOOL,dlltool,false) diff --git a/tools/Makefile.in b/tools/Makefile.in index bc13cc9..adf53bb 100644 --- a/tools/Makefile.in +++ b/tools/Makefile.in @@ -6,5 +6,3 @@ C_SRCS = \ IN_SRCS = \ wineapploader.in - -all: wineapploader diff --git a/tools/makedep.c b/tools/makedep.c index e4ba7c4..d8cf2f5 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -2155,9 +2155,8 @@ static struct strarray output_sources( const struct makefile *make, struct strar strmake( "y%s/%s.%s", dir, symlinks.str[i], section )); free( dest ); free( dir ); - strarray_add( &all_targets, xstrdup(obj) ); } - else strarray_add( &clean_files, xstrdup(obj) ); + strarray_add( &all_targets, xstrdup(obj) ); output( "%s: %s\n", obj_dir_path( make, obj ), source->filename ); output( "\t$(SED_CMD) %s >$@ || ($(RM) $@ && false)\n", source->filename ); output( "%s:", obj_dir_path( make, obj ));

1 0

Ken Thomases : winemac: Fix a crash on versions of OS X prior to 10.9 which don't have the -[ NSImage drawInRect:] method.
by Alexandre Julliard 10 Nov '15

10 Nov '15

Module: wine Branch: master Commit: 682820d3cb5abf8fc1b0d98a3f9f9d1e4ed16fc9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=682820d3cb5abf8fc1b0d98a3… Author: Ken Thomases <ken(a)codeweavers.com> Date: Tue Nov 10 02:29:18 2015 -0600 winemac: Fix a crash on versions of OS X prior to 10.9 which don't have the -[NSImage drawInRect:] method. [image drawInRect:rect] is documented as being "exactly equivalent to calling [image drawInRect:rect fromRect:NSZeroRect operation:NSCompositeSourceOver fraction:1 respectFlipped:YES hints:nil]". So, that's what I replace it with. Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/cocoa_window.m | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index 15fa16f..75f5605 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -1841,7 +1841,12 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi } CGContextDrawImage(cgcontext, rect, windowImage); - [appImage drawInRect:NSMakeRect(156, 4, 96, 96)]; + [appImage drawInRect:NSMakeRect(156, 4, 96, 96) + fromRect:NSZeroRect + operation:NSCompositeSourceOver + fraction:1 + respectFlipped:YES + hints:nil]; [dockIcon unlockFocus];

1 0

Austin English : wine.inf: Add System\CurrentControlSet\Services\RpcSs registry key.
by Alexandre Julliard 10 Nov '15

10 Nov '15

Module: wine Branch: master Commit: f46f2149cceacab8455ce2c7f3630b05459222d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f46f2149cceacab8455ce2c7f… Author: Austin English <austinenglish(a)gmail.com> Date: Mon Nov 9 01:13:10 2015 -0500 wine.inf: Add System\CurrentControlSet\Services\RpcSs registry key. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- loader/wine.inf.in | 1 + 1 file changed, 1 insertion(+) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index 0cb7a02..b6b1e00 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -3238,6 +3238,7 @@ HKLM,%CurrentVersionNT%\SvcHost,"netsvcs",0x00010008,"Schedule" [Services] HKLM,%CurrentVersion%\RunServices,"winemenubuilder",2,"%11%\winemenubuilder.exe -a -r" HKLM,"System\CurrentControlSet\Services\Eventlog\Application",,16 +HKLM,"System\CurrentControlSet\Services\RpcSs",,16 HKLM,"System\CurrentControlSet\Services\Tcpip\Parameters",,16 HKLM,"System\CurrentControlSet\Services\VxD\MSTCP",,16 HKLM,"System\CurrentControlSet\Services\Winsock\Parameters",,16

1 0

Austin English : dbghelp: Version to 6.1.7601.17514.
by Alexandre Julliard 10 Nov '15

10 Nov '15

Module: wine Branch: master Commit: 4f3f8a8cb73204170ec5cdc356b45a3fae4d0484 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f3f8a8cb73204170ec5cdc35… Author: Austin English <austinenglish(a)gmail.com> Date: Mon Nov 9 01:19:12 2015 -0600 dbghelp: Version to 6.1.7601.17514. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/version.rc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/dbghelp/version.rc b/dlls/dbghelp/version.rc index 1818010..03f03a3 100644 --- a/dlls/dbghelp/version.rc +++ b/dlls/dbghelp/version.rc @@ -18,9 +18,9 @@ #define WINE_FILEDESCRIPTION_STR "Wine Image Helper" #define WINE_FILENAME_STR "dbghelp.dll" -#define WINE_FILEVERSION 5,1,2600,3264 -#define WINE_FILEVERSION_STR "5.1.2600.3264" -#define WINE_PRODUCTVERSION 5,1,2600,3264 -#define WINE_PRODUCTVERSION_STR "5.1.2600.3264" +#define WINE_FILEVERSION 6,1,7601,17514 +#define WINE_FILEVERSION_STR "6.1.7601.17514" +#define WINE_PRODUCTVERSION 6,1,7601,17514 +#define WINE_PRODUCTVERSION_STR "6.1.7601.17514" #include "wine/wine_common_ver.rc"

1 0

Huw Davies : riched20: Store the font cache entry rather than the HFONT.
by Alexandre Julliard 10 Nov '15

10 Nov '15

Module: wine Branch: master Commit: bb165d22e0f7d134e592088880353aff42729a5f URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb165d22e0f7d134e59208888… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Nov 9 16:11:41 2015 +0000 riched20: Store the font cache entry rather than the HFONT. This also removes an incorrect DeleteObject() from DestroyStyle(). Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/editstr.h | 22 +++++++++++----------- dlls/riched20/style.c | 46 ++++++++++++++++++++-------------------------- 2 files changed, 31 insertions(+), 37 deletions(-) diff --git a/dlls/riched20/editstr.h b/dlls/riched20/editstr.h index 90f7fa0..3e98dac 100644 --- a/dlls/riched20/editstr.h +++ b/dlls/riched20/editstr.h @@ -60,11 +60,21 @@ typedef struct tagME_String int nLen, nBuffer; } ME_String; +typedef struct tagME_FontCacheItem +{ + LOGFONTW lfSpecs; + HFONT hFont; + int nRefs; + int nAge; +} ME_FontCacheItem; + +#define HFONT_CACHE_SIZE 10 + typedef struct tagME_Style { CHARFORMAT2W fmt; - HFONT hFont; /* cached font for the style */ + ME_FontCacheItem *font_cache; /* cached font for the style */ TEXTMETRICW tm; /* cached font metrics for the style */ int nRefs; /* reference count */ SCRIPT_CACHE script_cache; @@ -372,16 +382,6 @@ typedef struct tagME_OutStream { UINT nNestingLevel; } ME_OutStream; -typedef struct tagME_FontCacheItem -{ - LOGFONTW lfSpecs; - HFONT hFont; - int nRefs; - int nAge; -} ME_FontCacheItem; - -#define HFONT_CACHE_SIZE 10 - typedef struct tagME_TextEditor { HWND hWnd, hwndParent; diff --git a/dlls/riched20/style.c b/dlls/riched20/style.c index 0817ea8..0e990e2 100644 --- a/dlls/riched20/style.c +++ b/dlls/riched20/style.c @@ -146,7 +146,7 @@ ME_Style *ME_MakeStyle(CHARFORMAT2W *style) assert(style->cbSize == sizeof(CHARFORMAT2W)); s->fmt = *style; s->nRefs = 1; - s->hFont = NULL; + s->font_cache = NULL; memset(&s->tm, 0, sizeof(s->tm)); s->tm.tmAscent = -1; s->script_cache = NULL; @@ -383,8 +383,6 @@ HFONT ME_SelectStyleFont(ME_Context *c, ME_Style *s) { item = &c->editor->pFontCache[i]; TRACE_(richedit_style)("font reused %d\n", i); - - s->hFont = item->hFont; item->nRefs++; } else @@ -397,44 +395,40 @@ HFONT ME_SelectStyleFont(ME_Context *c, ME_Style *s) DeleteObject(item->hFont); item->hFont = NULL; } - s->hFont = CreateFontIndirectW(&lf); - assert(s->hFont); + item->hFont = CreateFontIndirectW(&lf); TRACE_(richedit_style)("font created %d\n", nEmpty); - item->hFont = s->hFont; item->nRefs = 1; item->lfSpecs = lf; } - hOldFont = SelectObject(c->hDC, s->hFont); + s->font_cache = item; + hOldFont = SelectObject(c->hDC, item->hFont); /* should be cached too, maybe ? */ GetTextMetricsW(c->hDC, &s->tm); return hOldFont; } -void ME_UnselectStyleFont(ME_Context *c, ME_Style *s, HFONT hOldFont) +static void release_font_cache(ME_FontCacheItem *item) { - int i; - - assert(s); - SelectObject(c->hDC, hOldFont); - for (i=0; i<HFONT_CACHE_SIZE; i++) - { - ME_FontCacheItem *pItem = &c->editor->pFontCache[i]; - if (pItem->hFont == s->hFont && pItem->nRefs > 0) + if (item->nRefs > 0) { - pItem->nRefs--; - pItem->nAge = 0; - s->hFont = NULL; - return; + item->nRefs--; + item->nAge = 0; } - } - assert(0 == "UnselectStyleFont without SelectStyleFont"); } -static void ME_DestroyStyle(ME_Style *s) { - if (s->hFont) +void ME_UnselectStyleFont(ME_Context *c, ME_Style *s, HFONT hOldFont) +{ + SelectObject(c->hDC, hOldFont); + release_font_cache(s->font_cache); + s->font_cache = NULL; +} + +static void ME_DestroyStyle(ME_Style *s) +{ + if (s->font_cache) { - DeleteObject(s->hFont); - s->hFont = NULL; + release_font_cache( s->font_cache ); + s->font_cache = NULL; } ScriptFreeCache( &s->script_cache ); FREE_OBJ(s);

1 0

Józef Kucia : d3d11: Implement d3d11_immediate_context_PSSetShaderResources().
by Alexandre Julliard 09 Nov '15

09 Nov '15

Module: wine Branch: master Commit: b62720feb69063ffa36ef8c3de1aa8a23c28c375 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b62720feb69063ffa36ef8c3d… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Nov 6 18:38:11 2015 +0100 d3d11: Implement d3d11_immediate_context_PSSetShaderResources(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/d3d11_private.h | 2 ++ dlls/d3d11/device.c | 15 ++++++++++++++- dlls/d3d11/view.c | 8 ++++++++ 3 files changed, 24 insertions(+), 1 deletion(-) diff --git a/dlls/d3d11/d3d11_private.h b/dlls/d3d11/d3d11_private.h index c680249..474943b 100644 --- a/dlls/d3d11/d3d11_private.h +++ b/dlls/d3d11/d3d11_private.h @@ -207,6 +207,8 @@ struct d3d_shader_resource_view HRESULT d3d_shader_resource_view_create(struct d3d_device *device, ID3D11Resource *resource, const D3D11_SHADER_RESOURCE_VIEW_DESC *desc, struct d3d_shader_resource_view **view) DECLSPEC_HIDDEN; +struct d3d_shader_resource_view *unsafe_impl_from_ID3D11ShaderResourceView( + ID3D11ShaderResourceView *iface) DECLSPEC_HIDDEN; struct d3d_shader_resource_view *unsafe_impl_from_ID3D10ShaderResourceView( ID3D10ShaderResourceView *iface) DECLSPEC_HIDDEN; diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index c44ec4a..fcbb8a8 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -140,8 +140,21 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_VSSetConstantBuffers(ID3D1 static void STDMETHODCALLTYPE d3d11_immediate_context_PSSetShaderResources(ID3D11DeviceContext *iface, UINT start_slot, UINT view_count, ID3D11ShaderResourceView *const *views) { - FIXME("iface %p, start_slot %u, view_count %u, views %p stub!\n", + struct d3d_device *device = device_from_immediate_ID3D11DeviceContext(iface); + unsigned int i; + + TRACE("iface %p, start_slot %u, view_count %u, views %p.\n", iface, start_slot, view_count, views); + + wined3d_mutex_lock(); + for (i = 0; i < view_count; ++i) + { + struct d3d_shader_resource_view *view = unsafe_impl_from_ID3D11ShaderResourceView(views[i]); + + wined3d_device_set_ps_resource_view(device->wined3d_device, start_slot + i, + view ? view->wined3d_view : NULL); + } + wined3d_mutex_unlock(); } static void STDMETHODCALLTYPE d3d11_immediate_context_PSSetShader(ID3D11DeviceContext *iface, diff --git a/dlls/d3d11/view.c b/dlls/d3d11/view.c index 33c7a07..1d9b766 100644 --- a/dlls/d3d11/view.c +++ b/dlls/d3d11/view.c @@ -1546,6 +1546,14 @@ HRESULT d3d_shader_resource_view_create(struct d3d_device *device, ID3D11Resourc return S_OK; } +struct d3d_shader_resource_view *unsafe_impl_from_ID3D11ShaderResourceView(ID3D11ShaderResourceView *iface) +{ + if (!iface) + return NULL; + assert(iface->lpVtbl == &d3d11_shader_resource_view_vtbl); + return impl_from_ID3D11ShaderResourceView(iface); +} + struct d3d_shader_resource_view *unsafe_impl_from_ID3D10ShaderResourceView(ID3D10ShaderResourceView *iface) { if (!iface)

1 0

Józef Kucia : d3d11/tests: Port test_texture() from d3d10core.
by Alexandre Julliard 09 Nov '15

09 Nov '15

Module: wine Branch: master Commit: 28110c1217764d8cc4e06dcaa489fd0c45dd04df URL: http://source.winehq.org/git/wine.git/?a=commit;h=28110c1217764d8cc4e06dcaa… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Nov 6 18:38:12 2015 +0100 d3d11/tests: Port test_texture() from d3d10core. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 220 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 220 insertions(+) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index ddb524d..3806217 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -2801,6 +2801,225 @@ done: DestroyWindow(window); } +static void test_texture(void) +{ + ID3D11RenderTargetView *backbuffer_rtv; + D3D11_SUBRESOURCE_DATA resource_data; + D3D11_TEXTURE2D_DESC texture_desc; + ID3D11SamplerState *sampler_state; + ID3D11ShaderResourceView *ps_srv; + D3D11_SAMPLER_DESC sampler_desc; + ID3D11InputLayout *input_layout; + D3D11_BUFFER_DESC buffer_desc; + ID3D11DeviceContext *context; + ID3D11Texture2D *backbuffer; + unsigned int stride, offset; + IDXGISwapChain *swapchain; + ID3D11Texture2D *texture; + ID3D11VertexShader *vs; + ID3D11PixelShader *ps; + ID3D11Device *device; + D3D11_VIEWPORT vp; + unsigned int i, j; + ID3D11Buffer *vb; + ULONG refcount; + DWORD color; + HWND window; + HRESULT hr; + + static const D3D11_INPUT_ELEMENT_DESC layout_desc[] = + { + {"POSITION", 0, DXGI_FORMAT_R32G32_FLOAT, 0, 0, D3D11_INPUT_PER_VERTEX_DATA, 0}, + }; + static const DWORD vs_code[] = + { +#if 0 + float4 main(float4 position : POSITION) : SV_POSITION + { + return position; + } +#endif + 0x43425844, 0xa7a2f22d, 0x83ff2560, 0xe61638bd, 0x87e3ce90, 0x00000001, 0x000000d8, 0x00000003, + 0x0000002c, 0x00000060, 0x00000094, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, + 0x00000000, 0x00000000, 0x00000003, 0x00000000, 0x00000f0f, 0x49534f50, 0x4e4f4954, 0xababab00, + 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000001, 0x00000003, + 0x00000000, 0x0000000f, 0x505f5653, 0x5449534f, 0x004e4f49, 0x52444853, 0x0000003c, 0x00010040, + 0x0000000f, 0x0300005f, 0x001010f2, 0x00000000, 0x04000067, 0x001020f2, 0x00000000, 0x00000001, + 0x05000036, 0x001020f2, 0x00000000, 0x00101e46, 0x00000000, 0x0100003e, + }; + static const DWORD ps_code[] = + { +#if 0 + Texture2D t; + SamplerState s; + + float4 main(float4 position : SV_POSITION) : SV_Target + { + float2 p; + + p.x = position.x / 640.0f; + p.y = position.y / 480.0f; + return t.Sample(s, p); + } +#endif + 0x43425844, 0x1ce9b612, 0xc8176faa, 0xd37844af, 0xdb515605, 0x00000001, 0x00000134, 0x00000003, + 0x0000002c, 0x00000060, 0x00000094, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, + 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x0000030f, 0x505f5653, 0x5449534f, 0x004e4f49, + 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, + 0x00000000, 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x52444853, 0x00000098, 0x00000040, + 0x00000026, 0x0300005a, 0x00106000, 0x00000000, 0x04001858, 0x00107000, 0x00000000, 0x00005555, + 0x04002064, 0x00101032, 0x00000000, 0x00000001, 0x03000065, 0x001020f2, 0x00000000, 0x02000068, + 0x00000001, 0x0a000038, 0x00100032, 0x00000000, 0x00101046, 0x00000000, 0x00004002, 0x3acccccd, + 0x3b088889, 0x00000000, 0x00000000, 0x09000045, 0x001020f2, 0x00000000, 0x00100046, 0x00000000, + 0x00107e46, 0x00000000, 0x00106000, 0x00000000, 0x0100003e, + }; + static const struct + { + float x, y; + } + quad[] = + { + {-1.0f, -1.0f}, + {-1.0f, 1.0f}, + { 1.0f, -1.0f}, + { 1.0f, 1.0f}, + }; + static const float red[] = {1.0f, 0.0f, 0.0f, 0.5f}; + static const DWORD bitmap_data[] = + { + 0xff0000ff, 0xff00ffff, 0xff00ff00, 0xffffff00, + 0xffff0000, 0xffff00ff, 0xff000000, 0xff7f7f7f, + 0xffffffff, 0xffffffff, 0xffffffff, 0xff000000, + 0xffffffff, 0xff000000, 0xff000000, 0xff000000, + }; + + if (!(device = create_device(NULL))) + { + skip("Failed to create device.\n"); + return; + } + window = CreateWindowA("static", "d3d11_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE, + 0, 0, 640, 480, NULL, NULL, NULL, NULL); + swapchain = create_swapchain(device, window, TRUE); + hr = IDXGISwapChain_GetBuffer(swapchain, 0, &IID_ID3D11Texture2D, (void **)&backbuffer); + ok(SUCCEEDED(hr), "Failed to get buffer, hr %#x.\n", hr); + + hr = ID3D11Device_CreateInputLayout(device, layout_desc, sizeof(layout_desc) / sizeof(*layout_desc), + vs_code, sizeof(vs_code), &input_layout); + ok(SUCCEEDED(hr), "Failed to create input layout, hr %#x.\n", hr); + + buffer_desc.ByteWidth = sizeof(quad); + buffer_desc.Usage = D3D11_USAGE_DEFAULT; + buffer_desc.BindFlags = D3D11_BIND_VERTEX_BUFFER; + buffer_desc.CPUAccessFlags = 0; + buffer_desc.MiscFlags = 0; + buffer_desc.StructureByteStride = 0; + + resource_data.pSysMem = quad; + resource_data.SysMemPitch = 0; + resource_data.SysMemSlicePitch = 0; + + hr = ID3D11Device_CreateBuffer(device, &buffer_desc, &resource_data, &vb); + ok(SUCCEEDED(hr), "Failed to create vertex buffer, hr %#x.\n", hr); + + texture_desc.Width = 4; + texture_desc.Height = 4; + texture_desc.MipLevels = 1; + texture_desc.ArraySize = 1; + texture_desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; + texture_desc.SampleDesc.Count = 1; + texture_desc.SampleDesc.Quality = 0; + texture_desc.Usage = D3D11_USAGE_DEFAULT; + texture_desc.BindFlags = D3D11_BIND_SHADER_RESOURCE; + texture_desc.CPUAccessFlags = 0; + texture_desc.MiscFlags = 0; + + resource_data.pSysMem = bitmap_data; + resource_data.SysMemPitch = 4 * sizeof(*bitmap_data); + + hr = ID3D11Device_CreateTexture2D(device, &texture_desc, &resource_data, &texture); + ok(SUCCEEDED(hr), "Failed to create 2d texture, hr %#x.\n", hr); + + hr = ID3D11Device_CreateShaderResourceView(device, (ID3D11Resource *)texture, NULL, &ps_srv); + ok(SUCCEEDED(hr), "Failed to create shader resource view, hr %#x.\n", hr); + + sampler_desc.Filter = D3D11_FILTER_MIN_MAG_MIP_POINT; + sampler_desc.AddressU = D3D11_TEXTURE_ADDRESS_CLAMP; + sampler_desc.AddressV = D3D11_TEXTURE_ADDRESS_CLAMP; + sampler_desc.AddressW = D3D11_TEXTURE_ADDRESS_CLAMP; + sampler_desc.MipLODBias = 0.0f; + sampler_desc.MaxAnisotropy = 0; + sampler_desc.ComparisonFunc = D3D11_COMPARISON_NEVER; + sampler_desc.BorderColor[0] = 0.0f; + sampler_desc.BorderColor[1] = 0.0f; + sampler_desc.BorderColor[2] = 0.0f; + sampler_desc.BorderColor[3] = 0.0f; + sampler_desc.MinLOD = 0.0f; + sampler_desc.MaxLOD = 0.0f; + + hr = ID3D11Device_CreateSamplerState(device, &sampler_desc, &sampler_state); + ok(SUCCEEDED(hr), "Failed to create sampler state, hr %#x.\n", hr); + + hr = ID3D11Device_CreateVertexShader(device, vs_code, sizeof(vs_code), NULL, &vs); + ok(SUCCEEDED(hr), "Failed to create vertex shader, hr %#x.\n", hr); + hr = ID3D11Device_CreatePixelShader(device, ps_code, sizeof(ps_code), NULL, &ps); + ok(SUCCEEDED(hr), "Failed to create pixel shader, hr %#x.\n", hr); + + hr = ID3D11Device_CreateRenderTargetView(device, (ID3D11Resource *)backbuffer, NULL, &backbuffer_rtv); + ok(SUCCEEDED(hr), "Failed to create rendertarget view, hr %#x.\n", hr); + + ID3D11Device_GetImmediateContext(device, &context); + + ID3D11DeviceContext_OMSetRenderTargets(context, 1, &backbuffer_rtv, NULL); + ID3D11DeviceContext_IASetInputLayout(context, input_layout); + ID3D11DeviceContext_IASetPrimitiveTopology(context, D3D11_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP); + stride = sizeof(*quad); + offset = 0; + ID3D11DeviceContext_IASetVertexBuffers(context, 0, 1, &vb, &stride, &offset); + ID3D11DeviceContext_VSSetShader(context, vs, NULL, 0); + ID3D11DeviceContext_PSSetShaderResources(context, 0, 1, &ps_srv); + ID3D11DeviceContext_PSSetSamplers(context, 0, 1, &sampler_state); + ID3D11DeviceContext_PSSetShader(context, ps, NULL, 0); + + vp.TopLeftX = 0.0f; + vp.TopLeftY = 0.0f; + vp.Width = 640.0f; + vp.Height = 480.0f; + vp.MinDepth = 0.0f; + vp.MaxDepth = 1.0f; + ID3D11DeviceContext_RSSetViewports(context, 1, &vp); + + ID3D11DeviceContext_ClearRenderTargetView(context, backbuffer_rtv, red); + + ID3D11DeviceContext_Draw(context, 4, 0); + + for (i = 0; i < 4; ++i) + { + for (j = 0; j < 4; ++j) + { + color = get_texture_color(backbuffer, 80 + j * 160, 60 + i * 120); + ok(compare_color(color, bitmap_data[j + i * 4], 1), + "Got unexpected color 0x%08x at (%u, %u), expected 0x%08x.\n", + color, j, i, bitmap_data[j + i * 4]); + } + } + + ID3D11PixelShader_Release(ps); + ID3D11VertexShader_Release(vs); + ID3D11SamplerState_Release(sampler_state); + ID3D11ShaderResourceView_Release(ps_srv); + ID3D11Texture2D_Release(texture); + ID3D11Buffer_Release(vb); + ID3D11InputLayout_Release(input_layout); + ID3D11RenderTargetView_Release(backbuffer_rtv); + ID3D11Texture2D_Release(backbuffer); + IDXGISwapChain_Release(swapchain); + ID3D11DeviceContext_Release(context); + refcount = ID3D11Device_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + DestroyWindow(window); +} + static void test_scissor(void) { ID3D11DeviceContext *immediate_context; @@ -3412,6 +3631,7 @@ START_TEST(d3d11) test_device_removed_reason(); test_private_data(); test_blend(); + test_texture(); test_scissor(); test_il_append_aligned(); test_resource_map();

1 0

Józef Kucia : d3d11: Implement d3d11_immediate_context_PSSetConstantBuffers().
by Alexandre Julliard 09 Nov '15

09 Nov '15

Module: wine Branch: master Commit: 9b7737ac06a3182708a0be9f1c05411eb35c8dd6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b7737ac06a3182708a0be9f1… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Nov 6 18:38:13 2015 +0100 d3d11: Implement d3d11_immediate_context_PSSetConstantBuffers(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/device.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index fcbb8a8..d8a219e 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -275,8 +275,21 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_Unmap(ID3D11DeviceContext static void STDMETHODCALLTYPE d3d11_immediate_context_PSSetConstantBuffers(ID3D11DeviceContext *iface, UINT start_slot, UINT buffer_count, ID3D11Buffer *const *buffers) { - FIXME("iface %p, start_slot %u, buffer_count %u, buffers %p stub!\n", + struct d3d_device *device = device_from_immediate_ID3D11DeviceContext(iface); + unsigned int i; + + TRACE("iface %p, start_slot %u, buffer_count %u, buffers %p.\n", iface, start_slot, buffer_count, buffers); + + wined3d_mutex_lock(); + for (i = 0; i < buffer_count; ++i) + { + struct d3d_buffer *buffer = unsafe_impl_from_ID3D11Buffer(buffers[i]); + + wined3d_device_set_ps_cb(device->wined3d_device, start_slot + i, + buffer ? buffer->wined3d_buffer : NULL); + } + wined3d_mutex_unlock(); } static void STDMETHODCALLTYPE d3d11_immediate_context_IASetInputLayout(ID3D11DeviceContext *iface,

1 0