April 2010 - Wine-Commits - list.winehq.org

Gerald Pfeifer : oleaut32: Remove two variables that are not really used; corresponding checks are disabled.
by Alexandre Julliard April 22, 2010

April 22, 2010

Module: wine Branch: master Commit: 14bf2dd2b6db2aaebdb737ff53c567ef061da27a URL: http://source.winehq.org/git/wine.git/?a=commit;h=14bf2dd2b6db2aaebdb737ff5… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Wed Apr 21 19:38:50 2010 +0200 oleaut32: Remove two variables that are not really used; corresponding checks are disabled. --- dlls/oleaut32/tests/vartype.c | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-) diff --git a/dlls/oleaut32/tests/vartype.c b/dlls/oleaut32/tests/vartype.c index d785a59..88ef2a4 100644 --- a/dlls/oleaut32/tests/vartype.c +++ b/dlls/oleaut32/tests/vartype.c @@ -5338,7 +5338,6 @@ static void test_SysReAllocString(void) if (str) { LPINTERNAL_BSTR bstr; - BSTR oldstr = str; int changed; bstr = Get(str); @@ -5353,7 +5352,6 @@ static void test_SysReAllocString(void) ok (bstr->dwLen == 2, "Expected 2, got %d\n", bstr->dwLen); ok (!lstrcmpW(bstr->szString, szSmaller), "String different\n"); - oldstr = str; changed = SysReAllocString(&str, szLarger); ok (changed == 1, "Expected 1, got %d\n", changed); /* Early versions always make new strings rather than resizing */ @@ -5378,7 +5376,6 @@ static void test_SysReAllocStringLen(void) if (str) { LPINTERNAL_BSTR bstr; - BSTR oldstr = str; int changed; bstr = Get(str); @@ -5393,7 +5390,6 @@ static void test_SysReAllocStringLen(void) ok (bstr->dwLen == 2, "Expected 2, got %d\n", bstr->dwLen); ok (!lstrcmpW(bstr->szString, szSmaller), "String different\n"); - oldstr = str; changed = SysReAllocStringLen(&str, szLarger, 6); ok (changed == 1, "Expected 1, got %d\n", changed); /* Early versions always make new strings rather than resizing */

1 0

Nikolay Sivov : shell32/shlview: Fix a typo in null pointer test condition, should be IShellFolder2 instead.
by Alexandre Julliard April 22, 2010

April 22, 2010

Module: wine Branch: master Commit: 9d5b6bb965a50ed1e4b3d6ffbf2a47bda113b5e4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d5b6bb965a50ed1e4b3d6ffb… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Apr 22 01:34:35 2010 +0400 shell32/shlview: Fix a typo in null pointer test condition, should be IShellFolder2 instead. --- dlls/shell32/shlview.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/shell32/shlview.c b/dlls/shell32/shlview.c index c7d9ee8..b3d300a 100644 --- a/dlls/shell32/shlview.c +++ b/dlls/shell32/shlview.c @@ -417,7 +417,7 @@ static void ShellView_InitList(IShellViewImpl *This) for (i = 0; 1; i++) { - if (This->pSFParent) + if (This->pSF2Parent) hr = IShellFolder2_GetDetailsOf(This->pSF2Parent, NULL, i, &sd); else hr = IShellDetails_GetDetailsOf(details, NULL, i, &sd);

1 0

Detlef Riekenberg : urlmon/tests: Skip even more tests on IE 4.0.
by Alexandre Julliard April 22, 2010

April 22, 2010

Module: wine Branch: master Commit: 7458345fb8101bc9d0e69365d312f16f31f9221e URL: http://source.winehq.org/git/wine.git/?a=commit;h=7458345fb8101bc9d0e69365d… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Thu Apr 22 00:28:53 2010 +0200 urlmon/tests: Skip even more tests on IE 4.0. ObtainUserAgentString, ReleaseBindInfo and UrlMkGetSessionOption missing on IE 4.0 (winetestbot W95B). --- dlls/urlmon/tests/misc.c | 70 +++++++++++++++++++++++++++++---------------- 1 files changed, 45 insertions(+), 25 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7458345fb8101bc9d0e69…

1 0

Detlef Riekenberg : urlmon/tests: Skip protocol tests on IE 4.0.
by Alexandre Julliard April 22, 2010

April 22, 2010

Module: wine Branch: master Commit: 63b53ff5865359e53bf348dee32be9a67880d847 URL: http://source.winehq.org/git/wine.git/?a=commit;h=63b53ff5865359e53bf348dee… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Thu Apr 22 00:28:54 2010 +0200 urlmon/tests: Skip protocol tests on IE 4.0. Register the filters is not possible due to the missing functions. No tests left, so skip all of them (winetestbot W95B). --- dlls/urlmon/tests/protocol.c | 23 +++++++++++++++++++---- 1 files changed, 19 insertions(+), 4 deletions(-) diff --git a/dlls/urlmon/tests/protocol.c b/dlls/urlmon/tests/protocol.c index ba0c32c..19e1e98 100644 --- a/dlls/urlmon/tests/protocol.c +++ b/dlls/urlmon/tests/protocol.c @@ -29,6 +29,9 @@ #include "urlmon.h" #include "wininet.h" +static HRESULT (WINAPI *pCoInternetGetSession)(DWORD, IInternetSession **, DWORD); +static HRESULT (WINAPI *pReleaseBindInfo)(BINDINFO*); + #define DEFINE_EXPECT(func) \ static BOOL expect_ ## func = FALSE, called_ ## func = FALSE @@ -1318,7 +1321,7 @@ static HRESULT WINAPI ProtocolEmul_Start(IInternetProtocol *iface, LPCWSTR szUrl ok(cbindf == (bindf|BINDF_FROMURLMON), "bindf = %x, expected %x\n", cbindf, (bindf|BINDF_FROMURLMON)); ok(!memcmp(&exp_bindinfo, &bindinfo, sizeof(bindinfo)), "unexpected bindinfo\n"); - ReleaseBindInfo(&bindinfo); + pReleaseBindInfo(&bindinfo); SET_EXPECT(ReportProgress_SENDINGREQUEST); hres = IInternetProtocolSink_ReportProgress(pOIProtSink, BINDSTATUS_SENDINGREQUEST, emptyW); @@ -2793,7 +2796,7 @@ static void test_CreateBinding(void) trace("Testing CreateBinding...\n"); init_test(BIND_TEST, TEST_BINDING); - hres = CoInternetGetSession(0, &session, 0); + hres = pCoInternetGetSession(0, &session, 0); ok(hres == S_OK, "CoInternetGetSession failed: %08x\n", hres); hres = IInternetSession_RegisterNameSpace(session, &ClassFactory, &IID_NULL, wsz_test, 0, NULL, 0); @@ -2932,7 +2935,7 @@ static void test_binding(int prot, DWORD grf_pi, DWORD test_flags) init_test(prot, test_flags|TEST_BINDING); - hres = CoInternetGetSession(0, &session, 0); + hres = pCoInternetGetSession(0, &session, 0); ok(hres == S_OK, "CoInternetGetSession failed: %08x\n", hres); if(test_flags & TEST_EMULATEPROT) { @@ -3042,7 +3045,8 @@ static void register_filter(void) static const WCHAR gzipW[] = {'g','z','i','p',0}; - CoInternetGetSession(0, &session, 0); + hres = pCoInternetGetSession(0, &session, 0); + ok(hres == S_OK, "CoInternetGetSession failed: %08x\n", hres); hres = IInternetSession_RegisterMimeFilter(session, &mimefilter_cf, &IID_IInternetProtocol, gzipW); ok(hres == S_OK, "RegisterMimeFilter failed: %08x\n", hres); @@ -3052,6 +3056,17 @@ static void register_filter(void) START_TEST(protocol) { + HMODULE hurlmon; + + hurlmon = GetModuleHandle("urlmon.dll"); + pCoInternetGetSession = (void*) GetProcAddress(hurlmon, "CoInternetGetSession"); + pReleaseBindInfo = (void*) GetProcAddress(hurlmon, "ReleaseBindInfo"); + + if (!pCoInternetGetSession || !pReleaseBindInfo) { + win_skip("Various needed functions not present in IE 4.0\n"); + return; + } + OleInitialize(NULL); event_complete = CreateEvent(NULL, FALSE, FALSE, NULL);

1 0

Maarten Lankhorst : mmdevapi: Add stub for IAudioEndpointVolume.
by Alexandre Julliard April 22, 2010

April 22, 2010

Module: wine Branch: master Commit: b0dfbcbe087835261e1fe15c164b4611bc23d2d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b0dfbcbe087835261e1fe15c1… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Wed Apr 21 15:44:07 2010 +0200 mmdevapi: Add stub for IAudioEndpointVolume. --- dlls/mmdevapi/Makefile.in | 1 + dlls/mmdevapi/audiovolume.c | 297 +++++++++++++++++++++++++++++++++++++++++++ dlls/mmdevapi/devenum.c | 28 ++-- dlls/mmdevapi/mmdevapi.h | 1 + 4 files changed, 313 insertions(+), 14 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b0dfbcbe087835261e1fe…

1 0

André Hentschel : winemaker: Allow compiling 32-bit targets to be compiled on 64-bit hosts.
by Alexandre Julliard April 22, 2010

April 22, 2010

Module: wine Branch: master Commit: 65900b4a310d2392b0618e8a64ea3154919705a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=65900b4a310d2392b0618e8a6… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Apr 21 20:22:13 2010 +0200 winemaker: Allow compiling 32-bit targets to be compiled on 64-bit hosts. --- tools/winemaker | 28 ++++++++++++++++++++++------ tools/winemaker.de.man.in | 7 ++++--- tools/winemaker.man.in | 7 ++++--- 3 files changed, 30 insertions(+), 12 deletions(-) diff --git a/tools/winemaker b/tools/winemaker index 4cd46ff..60fe31f 100755 --- a/tools/winemaker +++ b/tools/winemaker @@ -67,6 +67,10 @@ my $OPT_ASK_SKIP=-1; # The following constants define the architecture ## +# Default Architecture will be choosen +my $OPT_ARCH_DEFAULT=0; + +## # 32-Bit Target my $OPT_ARCH_32=32; @@ -1019,7 +1023,9 @@ sub source_scan_project_file($$$) } if ((@$target[$T_FLAGS] & $TF_NOMSVCRT) == 0) { push @{@$target[$T_LDFLAGS]},"-mno-cygwin"; - push @{@$target[$T_LDFLAGS]},"-m$opt_arch"; + if ($opt_arch != $OPT_ARCH_DEFAULT) { + push @{@$target[$T_LDFLAGS]},"-m$opt_arch"; + } } push @{@$project[$P_TARGETS]},$target; @@ -1082,6 +1088,10 @@ sub source_scan_project_file($$$) if ((@$project_settings[$T_FLAGS] & $TF_NOMSVCRT) == 0) { push @{@$project_settings[$T_CEXTRA]},"-mno-cygwin"; push @{@$project_settings[$T_CXXEXTRA]},"-mno-cygwin"; + if ($opt_arch != $OPT_ARCH_DEFAULT) { + push @{@$project_settings[$T_CEXTRA]},"-m$opt_arch"; + push @{@$project_settings[$T_CXXEXTRA]},"-m$opt_arch"; + } } if (@$project_settings[$T_FLAGS] & $TF_MFC) { @@ -1506,7 +1516,9 @@ sub source_scan_directory($$$$) } if ((@$target[$T_FLAGS] & $TF_NOMSVCRT) == 0) { push @{@$target[$T_LDFLAGS]},"-mno-cygwin"; - push @{@$target[$T_LDFLAGS]},"-m$opt_arch"; + if ($opt_arch != $OPT_ARCH_DEFAULT) { + push @{@$target[$T_LDFLAGS]},"-m$opt_arch"; + } } push @{@$project[$P_TARGETS]},$target; @@ -1599,6 +1611,10 @@ sub source_scan_directory($$$$) if ((@$project_settings[$T_FLAGS] & $TF_NOMSVCRT) == 0) { push @{@$project_settings[$T_CEXTRA]},"-mno-cygwin"; push @{@$project_settings[$T_CXXEXTRA]},"-mno-cygwin"; + if ($opt_arch != $OPT_ARCH_DEFAULT) { + push @{@$project_settings[$T_CEXTRA]},"-m$opt_arch"; + push @{@$project_settings[$T_CXXEXTRA]},"-m$opt_arch"; + } } if (@$project_settings[$T_FLAGS] & $TF_MFC) { @@ -2496,7 +2512,7 @@ $opt_work_dir=undef; $opt_single_target=undef; $opt_target_type=$TT_GUIEXE; $opt_flags=0; -$opt_arch=$OPT_ARCH_32; +$opt_arch=$OPT_ARCH_DEFAULT; $opt_is_interactive=$OPT_ASK_NO; $opt_ask_project_options=$OPT_ASK_NO; $opt_ask_target_options=$OPT_ASK_NO; @@ -2530,7 +2546,7 @@ sub usage() print STDERR " [-Dmacro[=defn]] [-Idir] [-Pdir] [-idll] [-Ldir] [-llibrary]\n"; print STDERR " [--nodlls] [--nomsvcrt] [--interactive] [--single-target name]\n"; print STDERR " [--generated-files|--nogenerated-files]\n"; - print STDERR " [--wine64]\n"; + print STDERR " [--wine32]\n"; print STDERR " work_directory|project_file|workspace_file\n"; print STDERR "\nWinemaker is designed to recursively convert all the Windows sources found in\n"; print STDERR "the specified directory or project-file, so that they can be compiled with Winelib.\n"; @@ -2568,8 +2584,8 @@ while (@ARGV>0) { $opt_no_generated_files=0; } elsif ($arg eq "--nogenerated-files") { $opt_no_generated_files=1; - } elsif ($arg eq "--wine64") { - $opt_arch=$OPT_ARCH_64; + } elsif ($arg eq "--wine32") { + $opt_arch=$OPT_ARCH_32; } elsif ($arg =~ /^-D/) { push @{$global_settings[$T_DEFINES]},$arg; } elsif ($arg =~ /^-I/) { diff --git a/tools/winemaker.de.man.in b/tools/winemaker.de.man.in index 12a58d0..ccb9731 100644 --- a/tools/winemaker.de.man.in +++ b/tools/winemaker.de.man.in @@ -33,7 +33,7 @@ winemaker \- Erzeugt eine Buildumgebung um Windows Programme unter Unix zu kompi ] .br [ -.IR "--wine64 " "] +.IR "--wine32 " "] .br .IR "Arbeitsverzeichnis" "| " "Projektdatei" "| " "Workspacedatei" @@ -174,8 +174,9 @@ Eine Makefile soll erzeugt werden. Diese Option ist Standard. .I --nogenerated-files Keine Makefile erstellen. .TP -.I --wine64 -Eine Makefile für 64-Bit erstellen. +.I --wine32 +Ein 32-Bit Target erstellen. Das ist nützlich unter wow64 Systemen. +Ohne dieser Option wird die Standard Architektur genutzt. .SH BEISPIELE .PP diff --git a/tools/winemaker.man.in b/tools/winemaker.man.in index ef78b4a..1169f57 100644 --- a/tools/winemaker.man.in +++ b/tools/winemaker.man.in @@ -33,7 +33,7 @@ winemaker \- generate a build infrastructure for compiling Windows programs on U ] .br [ -.IR "--wine64 " "] +.IR "--wine32 " "] .br .IR "work_directory" "| " "project_file" "| " "workspace_file" @@ -175,8 +175,9 @@ Tells winemaker to generate the Makefile. This is the default. .I --nogenerated-files Tells winemaker not to generate the Makefile. .TP -.I --wine64 -Tells winemaker to generate a 64-bit Makefile. +.I --wine32 +Tells winemaker to generate a 32-bit target. This is useful on a wow64 systems. +Without that option the default architecture is used. .SH EXAMPLES .PP

1 0

Detlef Riekenberg : urlmon/tests: Skip some tests on IE 4.0.
by Alexandre Julliard April 22, 2010

April 22, 2010

Module: wine Branch: master Commit: cb620908eeccf0f1b93933f86de4748634a7c420 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb620908eeccf0f1b93933f86… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Thu Apr 22 00:28:51 2010 +0200 urlmon/tests: Skip some tests on IE 4.0. CoInternetCompareUrl, CoInternetGetSecurityUrl, CoInternetGetSession, CoInternetParseUrl missing on IE 4.0 (winetestbot W95B). --- dlls/urlmon/tests/misc.c | 90 ++++++++++++++++++++++++++++++---------------- 1 files changed, 59 insertions(+), 31 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=cb620908eeccf0f1b9393…

1 0

Detlef Riekenberg : urlmon/tests: Skip more tests on IE 4.0.
by Alexandre Julliard April 22, 2010

April 22, 2010

Module: wine Branch: master Commit: eef8be369813ac1727ae9f47628937ca1fae4a5b URL: http://source.winehq.org/git/wine.git/?a=commit;h=eef8be369813ac1727ae9f476… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Thu Apr 22 00:28:52 2010 +0200 urlmon/tests: Skip more tests on IE 4.0. CoInternetQueryInfo, CopyStgMedium and FindMimeFromData missing on IE 4.0 (winetestbot W95B). --- dlls/urlmon/tests/misc.c | 68 +++++++++++++++++++++++++++++---------------- 1 files changed, 44 insertions(+), 24 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=eef8be369813ac1727ae9…

1 0

Detlef Riekenberg : urlmon/tests: CreateAsyncBindCtxEx is not present on IE 4.0.
by Alexandre Julliard April 22, 2010

April 22, 2010

Module: wine Branch: master Commit: 4942f6b8e487fdc4e492e0257218fe6ad2d64eb4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4942f6b8e487fdc4e492e0257… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Thu Apr 22 00:28:55 2010 +0200 urlmon/tests: CreateAsyncBindCtxEx is not present on IE 4.0. --- dlls/urlmon/tests/url.c | 26 ++++++++++++++++++++------ 1 files changed, 20 insertions(+), 6 deletions(-) diff --git a/dlls/urlmon/tests/url.c b/dlls/urlmon/tests/url.c index 09cbb42..fc249a6 100644 --- a/dlls/urlmon/tests/url.c +++ b/dlls/urlmon/tests/url.c @@ -35,6 +35,10 @@ #include "wine/test.h" +static HRESULT (WINAPI *pCreateAsyncBindCtxEx)(IBindCtx *, DWORD, + IBindStatusCallback *, IEnumFORMATETC *, IBindCtx **, DWORD); + + DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); DEFINE_GUID(CLSID_IdentityUnmarshal,0x0000001b,0x0000,0x0000,0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x46); DEFINE_GUID(IID_IBindStatusCallbackHolder,0x79eac9cc,0xbaf9,0x11ce,0x8c,0x82,0x00,0xaa,0x00,0x4b,0xa9,0x0b); @@ -1897,10 +1901,15 @@ static void test_CreateAsyncBindCtxEx(void) static WCHAR testW[] = {'t','e','s','t',0}; - hres = CreateAsyncBindCtxEx(NULL, 0, NULL, NULL, NULL, 0); + if (!pCreateAsyncBindCtxEx) { + win_skip("CreateAsyncBindCtxEx not present\n"); + return; + } + + hres = pCreateAsyncBindCtxEx(NULL, 0, NULL, NULL, NULL, 0); ok(hres == E_INVALIDARG, "CreateAsyncBindCtx failed: %08x, expected E_INVALIDARG\n", hres); - hres = CreateAsyncBindCtxEx(NULL, 0, NULL, NULL, &bctx, 0); + hres = pCreateAsyncBindCtxEx(NULL, 0, NULL, NULL, &bctx, 0); ok(hres == S_OK, "CreateAsyncBindCtxEx failed: %08x\n", hres); if(SUCCEEDED(hres)) { @@ -1919,7 +1928,7 @@ static void test_CreateAsyncBindCtxEx(void) } CreateBindCtx(0, &bctx_arg); - hres = CreateAsyncBindCtxEx(NULL, 0, NULL, NULL, &bctx, 0); + hres = pCreateAsyncBindCtxEx(NULL, 0, NULL, NULL, &bctx, 0); ok(hres == S_OK, "CreateAsyncBindCtxEx failed: %08x\n", hres); if(SUCCEEDED(hres)) { @@ -1940,7 +1949,7 @@ static void test_CreateAsyncBindCtxEx(void) IBindCtx_Release(bctx_arg); SET_EXPECT(QueryInterface_IServiceProvider); - hres = CreateAsyncBindCtxEx(NULL, 0, (IBindStatusCallback*)&bsc, NULL, &bctx, 0); + hres = pCreateAsyncBindCtxEx(NULL, 0, (IBindStatusCallback*)&bsc, NULL, &bctx, 0); ok(hres == S_OK, "CreateAsyncBindCtxEx failed: %08x\n", hres); CHECK_CALLED(QueryInterface_IServiceProvider); @@ -1954,7 +1963,7 @@ static void test_CreateAsyncBindCtxEx(void) hres = CreateBindCtx(0, &bctx2); ok(hres == S_OK, "CreateBindCtx failed: %08x\n", hres); - hres = CreateAsyncBindCtxEx(bctx2, 0, NULL, NULL, &bctx, 0); + hres = pCreateAsyncBindCtxEx(bctx2, 0, NULL, NULL, &bctx, 0); ok(hres == S_OK, "CreateAsyncBindCtxEx failed: %08x\n", hres); hres = IBindCtx_RegisterObjectParam(bctx2, testW, (IUnknown*)&Protocol); @@ -2823,7 +2832,7 @@ static void test_BindToStorage_fail(void) if(FAILED(hres)) return; - hres = CreateAsyncBindCtxEx(NULL, 0, NULL, NULL, &bctx, 0); + hres = pCreateAsyncBindCtxEx(NULL, 0, NULL, NULL, &bctx, 0); ok(hres == S_OK, "CreateAsyncBindCtxEx failed: %08x\n", hres); hres = IMoniker_BindToStorage(mon, bctx, NULL, &IID_IStream, (void**)&unk); @@ -2863,6 +2872,11 @@ static void test_StdURLMoniker(void) START_TEST(url) { + HMODULE hurlmon; + + hurlmon = GetModuleHandle("urlmon.dll"); + pCreateAsyncBindCtxEx = (void*) GetProcAddress(hurlmon, "CreateAsyncBindCtxEx"); + complete_event = CreateEvent(NULL, FALSE, FALSE, NULL); complete_event2 = CreateEvent(NULL, FALSE, FALSE, NULL); thread_id = GetCurrentThreadId();

1 0

Henri Verbeet : wined3d: Simply pass an IWineD3DSurfaceImpl pointer to color_fill_fbo().
by Alexandre Julliard April 22, 2010

April 22, 2010

Module: wine Branch: master Commit: 158a001859ab515a08ebf5204a5375fc0ba2e336 URL: http://source.winehq.org/git/wine.git/?a=commit;h=158a001859ab515a08ebf5204… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Apr 21 22:02:33 2010 +0200 wined3d: Simply pass an IWineD3DSurfaceImpl pointer to color_fill_fbo(). --- dlls/wined3d/device.c | 29 +++++++++++++++-------------- 1 files changed, 15 insertions(+), 14 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 4913805..d2b20c4 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5449,23 +5449,23 @@ static HRESULT WINAPI IWineD3DDeviceImpl_DeletePatch(IWineD3DDevice *iface, UINT return WINED3DERR_INVALIDCALL; } -static void color_fill_fbo(IWineD3DDevice *iface, IWineD3DSurface *surface, +static void color_fill_fbo(IWineD3DDevice *iface, IWineD3DSurfaceImpl *surface, const WINED3DRECT *rect, const float color[4]) { IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *) iface; struct wined3d_context *context; - if (rect) IWineD3DSurface_LoadLocation(surface, SFLAG_INDRAWABLE, NULL); - IWineD3DSurface_ModifyLocation(surface, SFLAG_INDRAWABLE, TRUE); + if (rect) IWineD3DSurface_LoadLocation((IWineD3DSurface *)surface, SFLAG_INDRAWABLE, NULL); + IWineD3DSurface_ModifyLocation((IWineD3DSurface *)surface, SFLAG_INDRAWABLE, TRUE); - if (!surface_is_offscreen((IWineD3DSurfaceImpl *)surface)) + if (!surface_is_offscreen(surface)) { TRACE("Surface %p is onscreen\n", surface); - context = context_acquire(This, (IWineD3DSurfaceImpl *)surface, CTXUSAGE_RESOURCELOAD); + context = context_acquire(This, surface, CTXUSAGE_RESOURCELOAD); ENTER_GL(); context_bind_fbo(context, GL_FRAMEBUFFER, NULL); - context_set_draw_buffer(context, surface_get_gl_buffer((IWineD3DSurfaceImpl *)surface)); + context_set_draw_buffer(context, surface_get_gl_buffer(surface)); } else { @@ -5474,16 +5474,16 @@ static void color_fill_fbo(IWineD3DDevice *iface, IWineD3DSurface *surface, context = context_acquire(This, NULL, CTXUSAGE_RESOURCELOAD); ENTER_GL(); context_bind_fbo(context, GL_FRAMEBUFFER, &context->dst_fbo); - context_attach_surface_fbo(context, GL_FRAMEBUFFER, 0, (IWineD3DSurfaceImpl *)surface); + context_attach_surface_fbo(context, GL_FRAMEBUFFER, 0, surface); context_attach_depth_stencil_fbo(context, GL_FRAMEBUFFER, NULL, FALSE); } if (rect) { glEnable(GL_SCISSOR_TEST); - if (surface_is_offscreen((IWineD3DSurfaceImpl *)surface)) + if (surface_is_offscreen(surface)) glScissor(rect->x1, rect->y1, rect->x2 - rect->x1, rect->y2 - rect->y1); else - glScissor(rect->x1, ((IWineD3DSurfaceImpl *)surface)->currentDesc.Height - rect->y2, + glScissor(rect->x1, surface->currentDesc.Height - rect->y2, rect->x2 - rect->x1, rect->y2 - rect->y1); checkGLcall("glScissor"); IWineD3DDeviceImpl_MarkStateDirty(This, STATE_SCISSORRECT); @@ -5527,7 +5527,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_ColorFill(IWineD3DDevice *iface, if (wined3d_settings.offscreen_rendering_mode == ORM_FBO) { const float c[4] = {D3DCOLOR_R(color), D3DCOLOR_G(color), D3DCOLOR_B(color), D3DCOLOR_A(color)}; - color_fill_fbo(iface, pSurface, pRect, c); + color_fill_fbo(iface, surface, pRect, c); return WINED3D_OK; } else { /* Just forward this to the DirectDraw blitting engine */ @@ -5543,7 +5543,7 @@ static void WINAPI IWineD3DDeviceImpl_ClearRendertargetView(IWineD3DDevice *ifac IWineD3DRendertargetView *rendertarget_view, const float color[4]) { IWineD3DResource *resource; - IWineD3DSurface *surface; + IWineD3DSurfaceImpl *surface; HRESULT hr; hr = IWineD3DRendertargetView_GetResource(rendertarget_view, &resource); @@ -5560,7 +5560,7 @@ static void WINAPI IWineD3DDeviceImpl_ClearRendertargetView(IWineD3DDevice *ifac return; } - surface = (IWineD3DSurface *)resource; + surface = (IWineD3DSurfaceImpl *)resource; if (wined3d_settings.offscreen_rendering_mode == ORM_FBO) { @@ -5581,8 +5581,9 @@ static void WINAPI IWineD3DDeviceImpl_ClearRendertargetView(IWineD3DDevice *ifac /* Just forward this to the DirectDraw blitting engine */ memset(&BltFx, 0, sizeof(BltFx)); BltFx.dwSize = sizeof(BltFx); - BltFx.u5.dwFillColor = color_convert_argb_to_fmt(c, ((IWineD3DSurfaceImpl *)surface)->resource.format_desc->format); - hr = IWineD3DSurface_Blt(surface, NULL, NULL, NULL, WINEDDBLT_COLORFILL, &BltFx, WINED3DTEXF_POINT); + BltFx.u5.dwFillColor = color_convert_argb_to_fmt(c, surface->resource.format_desc->format); + hr = IWineD3DSurface_Blt((IWineD3DSurface *)surface, NULL, NULL, NULL, + WINEDDBLT_COLORFILL, &BltFx, WINED3DTEXF_POINT); if (FAILED(hr)) { ERR("Blt failed, hr %#x\n", hr);

1 0