November 2012 - Wine-Commits

Alexandre Julliard : setupapi: Load IRegistrar from atl100.dll.
by Alexandre Julliard Nov. 29, 2012

Nov. 29, 2012

Module: wine Branch: master Commit: 960f0595b2648f5fdfe253a9df8c0671ab6efb61 URL: http://source.winehq.org/git/wine.git/?a=commit;h=960f0595b2648f5fdfe253a9d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 28 21:25:00 2012 +0100 setupapi: Load IRegistrar from atl100.dll. --- dlls/setupapi/fakedll.c | 20 +++++++------------- 1 files changed, 7 insertions(+), 13 deletions(-) diff --git a/dlls/setupapi/fakedll.c b/dlls/setupapi/fakedll.c index 7393e40..525f399 100644 --- a/dlls/setupapi/fakedll.c +++ b/dlls/setupapi/fakedll.c @@ -770,7 +770,7 @@ static BOOL CALLBACK register_resource( HMODULE module, LPCWSTR type, LPWSTR nam static void register_fake_dll( const WCHAR *name, const void *data, size_t size ) { - static const WCHAR atlW[] = {'a','t','l','.','d','l','l',0}; + static const WCHAR atlW[] = {'a','t','l','1','0','0','.','d','l','l',0}; static const WCHAR moduleW[] = {'M','O','D','U','L','E',0}; static const WCHAR regtypeW[] = {'W','I','N','E','_','R','E','G','I','S','T','R','Y',0}; static const WCHAR manifestW[] = {'W','I','N','E','_','M','A','N','I','F','E','S','T',0}; @@ -791,20 +791,14 @@ static void register_fake_dll( const WCHAR *name, const void *data, size_t size if (!registrar) { - /* create the object by hand since we can't guarantee that atl and ole32 are registered */ - IClassFactory *cf; - HRESULT (WINAPI *pDllGetClassObject)( REFCLSID clsid, REFIID iid, LPVOID *ppv ); + HRESULT (WINAPI *pAtlCreateRegistrar)(IRegistrar**); HMODULE atl = LoadLibraryW( atlW ); - if ((pDllGetClassObject = (void *)GetProcAddress( atl, "DllGetClassObject" ))) - { - hr = pDllGetClassObject( &CLSID_Registrar, &IID_IClassFactory, (void **)&cf ); - if (SUCCEEDED( hr )) - { - hr = IClassFactory_CreateInstance( cf, NULL, &IID_IRegistrar, (void **)&registrar ); - IClassFactory_Release( cf ); - } - } + if ((pAtlCreateRegistrar = (void *)GetProcAddress( atl, "AtlCreateRegistrar" ))) + hr = pAtlCreateRegistrar( &registrar ); + else + hr = E_NOINTERFACE; + if (!registrar) { ERR( "failed to create IRegistrar: %x\n", hr );

1 0

Andrew Talbot : wtsapi32: Remove unused variable.
by Alexandre Julliard Nov. 29, 2012

Nov. 29, 2012

Module: wine Branch: master Commit: ffb2cae6fc29553d52b4a991ec93fd1633c5dbca URL: http://source.winehq.org/git/wine.git/?a=commit;h=ffb2cae6fc29553d52b4a991e… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Wed Nov 28 20:37:39 2012 +0000 wtsapi32: Remove unused variable. --- dlls/wtsapi32/wtsapi32.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/wtsapi32/wtsapi32.c b/dlls/wtsapi32/wtsapi32.c index 875cfb5..c25f75b 100644 --- a/dlls/wtsapi32/wtsapi32.c +++ b/dlls/wtsapi32/wtsapi32.c @@ -25,7 +25,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(wtsapi); -static HMODULE WTSAPI32_hModule; BOOL WINAPI DllMain (HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) { @@ -35,7 +34,6 @@ BOOL WINAPI DllMain (HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) case DLL_PROCESS_ATTACH: { DisableThreadLibraryCalls(hinstDLL); - WTSAPI32_hModule = hinstDLL; break; } case DLL_PROCESS_DETACH:

1 0

Andrew Talbot : winscard: Remove unused variable.
by Alexandre Julliard Nov. 29, 2012

Nov. 29, 2012

Module: wine Branch: master Commit: 960189b5536cafb9d85de77d9345d86ef0f4aedb URL: http://source.winehq.org/git/wine.git/?a=commit;h=960189b5536cafb9d85de77d9… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Wed Nov 28 20:37:33 2012 +0000 winscard: Remove unused variable. --- dlls/winscard/winscard.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/winscard/winscard.c b/dlls/winscard/winscard.c index 473d5f3..c57ef49 100644 --- a/dlls/winscard/winscard.c +++ b/dlls/winscard/winscard.c @@ -26,7 +26,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(winscard); -static HMODULE WINSCARD_hModule; static HANDLE g_startedEvent = NULL; const SCARD_IO_REQUEST g_rgSCardT0Pci = { SCARD_PROTOCOL_T0, 8 }; @@ -43,7 +42,6 @@ BOOL WINAPI DllMain (HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) case DLL_PROCESS_ATTACH: { DisableThreadLibraryCalls(hinstDLL); - WINSCARD_hModule = hinstDLL; /* FIXME: for now, we act as if the pcsc daemon is always started */ g_startedEvent = CreateEventA(NULL,TRUE,TRUE,NULL); break;

1 0

Francois Gouget : testbot/testagentd: Add dependencies on the header file.
by Alexandre Julliard Nov. 29, 2012

Nov. 29, 2012

Module: tools Branch: master Commit: 3f68628812e189a8dac9649c8abbdfed7342478c URL: http://source.winehq.org/git/tools.git/?a=commit;h=3f68628812e189a8dac9649c… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Nov 29 03:52:49 2012 +0100 testbot/testagentd: Add dependencies on the header file. --- testbot/src/testagentd/Makefile | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/testbot/src/testagentd/Makefile b/testbot/src/testagentd/Makefile index ddd4fa0..6090d02 100644 --- a/testbot/src/testagentd/Makefile +++ b/testbot/src/testagentd/Makefile @@ -24,6 +24,8 @@ TestAgentd.exe: testagentd.obj platform_windows.obj .c.obj: $(CROSSCC32) -Wall -c -o $@ $< +C_SRCS = testagentd.c platform_unix.c platform_windows.c +$(C_SRCS:.c=.o) $(C_SRCS:.c=.obj): platform.h iso: windows mkdir winetest

1 0

Francois Gouget : testbot/TestAgent: Adopt a more client/ server-oriented terminology.
by Alexandre Julliard Nov. 29, 2012

Nov. 29, 2012

Module: tools Branch: master Commit: 534b42d9be75c702b5192280bc85815405b9d3a4 URL: http://source.winehq.org/git/tools.git/?a=commit;h=534b42d9be75c702b5192280… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Nov 29 03:59:58 2012 +0100 testbot/TestAgent: Adopt a more client/server-oriented terminology. --- testbot/lib/WineTestBot/TestAgent.pm | 30 +++++++++++++------------- testbot/scripts/TestAgent | 38 +++++++++++++++++----------------- 2 files changed, 34 insertions(+), 34 deletions(-) diff --git a/testbot/lib/WineTestBot/TestAgent.pm b/testbot/lib/WineTestBot/TestAgent.pm index f2fa888..40f1bed 100644 --- a/testbot/lib/WineTestBot/TestAgent.pm +++ b/testbot/lib/WineTestBot/TestAgent.pm @@ -137,20 +137,20 @@ sub _Copy($$) sub SendFile($$$) { - my ($Hostname, $HostPathName, $GuestPathName) = @_; - LogMsg "SendFile $HostPathName -> $Hostname $GuestPathName\n"; + my ($Hostname, $LocalPathName, $ServerPathName) = @_; + LogMsg "SendFile $LocalPathName -> $Hostname $ServerPathName\n"; my $fh; - if (!open($fh, "<", $HostPathName)) + if (!open($fh, "<", $LocalPathName)) { - return "unable to open '$HostPathName' for reading: $!"; + return "unable to open '$LocalPathName' for reading: $!"; } my $Err; my $nc = _Connect($Hostname); if ($nc) { - $nc->send("write\n$GuestPathName\n", 0); + $nc->send("write\n$ServerPathName\n", 0); $Err = $! if (!_Copy($fh, $nc)); $nc->shutdown($DONE_WRITING); @@ -170,20 +170,20 @@ sub SendFile($$$) sub GetFile($$$) { - my ($Hostname, $GuestPathName, $HostPathName) = @_; - LogMsg "GetFile $Hostname $GuestPathName -> $HostPathName\n"; + my ($Hostname, $ServerPathName, $LocalPathName) = @_; + LogMsg "GetFile $Hostname $ServerPathName -> $LocalPathName\n"; my $fh; - if (!open($fh, ">", $HostPathName)) + if (!open($fh, ">", $LocalPathName)) { - return "unable to open '$HostPathName' for writing: $!"; + return "unable to open '$LocalPathName' for writing: $!"; } - my ($Err, $GuestSize); + my ($Err, $ServerSize); my $nc = _Connect($Hostname); if ($nc) { - $nc->send("read\n$GuestPathName\n", 0); + $nc->send("read\n$ServerPathName\n", 0); # The status of the open operation is returned first so it does not # get mixed up with the file data. However we must not mix buffered # (<> or read()) and unbuffered (File:Copy::copy()) read operations on @@ -194,7 +194,7 @@ sub GetFile($$$) } elsif ($Err =~ s/^ok: size=(-?[0-9]+)\n//) { - $GuestSize=$1; + $ServerSize = $1; if ($Err ne "" and syswrite($fh, $Err, length($Err)) < 0) { $Err = $!; @@ -211,8 +211,8 @@ sub GetFile($$$) $Err = $@; } close($fh); - my $HostSize=-s $HostPathName; - if (!defined $Err and $HostSize != $GuestSize) + my $LocalSize = -s $LocalPathName; + if (!defined $Err and $LocalSize != $ServerSize) { # Something still went wrong during the transfer. Get the last operation # status @@ -220,7 +220,7 @@ sub GetFile($$$) ($Err, $StatusErr) = GetStatus($Hostname); $Err = $StatusErr if (!defined $StatusErr); } - unlink $HostPathName if ($Err); + unlink $LocalPathName if ($Err); return $Err; } diff --git a/testbot/scripts/TestAgent b/testbot/scripts/TestAgent index cc823f6..c917b0a 100755 --- a/testbot/scripts/TestAgent +++ b/testbot/scripts/TestAgent @@ -1,7 +1,7 @@ #!/usr/bin/perl -w # # This is a testagentd client. It can be used to exchange files or run -# commands on VMs, mostly for testing purposes. +# commands on the testagentd server, mostly for testing purposes. # # Copyright 2012 Francois Gouget # @@ -42,7 +42,7 @@ sub error(@) print STDERR "$name0:error: ", @_; } -my ($Cmd, $Hostname, $HostPathName, $GuestPathName, $Script, $ScriptTimeout); +my ($Cmd, $Hostname, $LocalPathName, $ServerPathName, $Script, $ScriptTimeout); my $Port; my $Timeout; my $Usage; @@ -86,14 +86,14 @@ while (@ARGV) } elsif ($arg eq "send") { - $HostPathName = check_opt_val($arg, $HostPathName); - $GuestPathName = check_opt_val($arg, $GuestPathName) if (!$Usage); + $LocalPathName = check_opt_val($arg, $LocalPathName); + $ServerPathName = check_opt_val($arg, $ServerPathName) if (!$Usage); $Cmd = $arg; } elsif ($arg eq "get") { - $GuestPathName = check_opt_val($arg, $GuestPathName); - $HostPathName = check_opt_val($arg, $HostPathName) if (!$Usage); + $ServerPathName = check_opt_val($arg, $ServerPathName); + $LocalPathName = check_opt_val($arg, $LocalPathName) if (!$Usage); $Cmd = $arg; } elsif ($arg eq "runscript") @@ -128,25 +128,25 @@ if (defined $Usage) error("try '$name0 --help' for more information\n"); exit $Usage; } - print "Usage: $name0 [options] <hostname> send <hostpath> <guestpath>\n"; - print "or $name0 [options] <hostname> get <guestpath> <hostpath>\n"; + print "Usage: $name0 [options] <hostname> send <localpath> <serverpath>\n"; + print "or $name0 [options] <hostname> get <serverpath> <localpath>\n"; print "or $name0 [options] <hostname> runscript <command>\n"; print "or $name0 [options] <hostname> status\n"; print "\n"; - print "This is a testagentd client. It can be used to send/receive files and to run scripts on the specified guest host.\n"; + print "This is a testagentd client. It can be used to send/receive files and to run scripts on the specified server.\n"; print "\n"; print "Where:\n"; - print " send Sends the <hostpath> file and saves it as <guestpath> on the\n"; - print " guest.\n"; - print " get Retrieves the <guestpath> file from the guest and saves it as\n"; - print " <hostpath>.\n"; - print " runscript Runs the specified <command> on the guest.\n"; + print " send Sends the <localpath> file and saves it as <serverpath> on the\n"; + print " server.\n"; + print " get Retrieves the <serverpath> file from the server and saves it as\n"; + print " <localpath>.\n"; + print " runscript Runs the specified <command> on the server.\n"; print " status Retrieves the status of the last command that was run on the\n"; - print " guest.\n"; - print " <hostname> Is the hostname of the guest.\n"; + print " server.\n"; + print " <hostname> Is the hostname of the TestAgent server.\n"; print " --port <port> Use the specified port number instead of the default one.\n"; print " --timeout <timeout> Use the specified timeout (in seconds) instead of the\n"; - print " default one.\n"; + print " default one.\n"; print " --help Shows this usage message.\n"; exit 0; } @@ -154,11 +154,11 @@ if (defined $Usage) my $Err; if ($Cmd eq "send") { - $Err = TestAgent::SendFile($Hostname, $HostPathName, $GuestPathName); + $Err = TestAgent::SendFile($Hostname, $LocalPathName, $ServerPathName); } elsif ($Cmd eq "get") { - $Err = TestAgent::GetFile($Hostname, $GuestPathName, $HostPathName); + $Err = TestAgent::GetFile($Hostname, $ServerPathName, $LocalPathName); } elsif ($Cmd eq "runscript") {

1 0

Francois Gouget : testbot/TestAgent: Fix some formatting inconsistencies.
by Alexandre Julliard Nov. 29, 2012

Nov. 29, 2012

Module: tools Branch: master Commit: e9bd41df9964336e3e1121c27367a04c5172b601 URL: http://source.winehq.org/git/tools.git/?a=commit;h=e9bd41df9964336e3e1121c2… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Nov 29 03:53:48 2012 +0100 testbot/TestAgent: Fix some formatting inconsistencies. --- testbot/scripts/TestAgent | 26 +++++++++++++------------- 1 files changed, 13 insertions(+), 13 deletions(-) diff --git a/testbot/scripts/TestAgent b/testbot/scripts/TestAgent index a16bd5f..cc823f6 100755 --- a/testbot/scripts/TestAgent +++ b/testbot/scripts/TestAgent @@ -30,7 +30,7 @@ sub BEGIN } } -my $name0=$0; +my $name0 = $0; $name0 =~ s+^.*/++; use WineTestBot::Config; @@ -49,17 +49,17 @@ my $Usage; sub check_opt_val($$) { - my ($option, $val)=@_; + my ($option, $val) = @_; if (defined $val) { error("$option can only be specified once\n"); - $Usage=2; # but continue processing this option + $Usage = 2; # but continue processing this option } if (!@ARGV) { error("missing value for $option\n"); - $Usage=2; + $Usage = 2; return undef; } return shift @ARGV; @@ -67,18 +67,18 @@ sub check_opt_val($$) while (@ARGV) { - my $arg=shift @ARGV; + my $arg = shift @ARGV; if ($arg eq "--help") { - $Usage=0; + $Usage = 0; } elsif ($arg eq "--port") { - $Port=check_opt_val($arg, $Port); + $Port = check_opt_val($arg, $Port); } elsif ($arg eq "--timeout") { - $ScriptTimeout=check_opt_val($arg, $ScriptTimeout); + $ScriptTimeout = check_opt_val($arg, $ScriptTimeout); } elsif (!defined $Hostname) { @@ -86,19 +86,19 @@ while (@ARGV) } elsif ($arg eq "send") { - $HostPathName=check_opt_val($arg, $HostPathName); - $GuestPathName=check_opt_val($arg, $GuestPathName) if (!$Usage); + $HostPathName = check_opt_val($arg, $HostPathName); + $GuestPathName = check_opt_val($arg, $GuestPathName) if (!$Usage); $Cmd = $arg; } elsif ($arg eq "get") { - $GuestPathName=check_opt_val($arg, $GuestPathName); - $HostPathName=check_opt_val($arg, $HostPathName) if (!$Usage); + $GuestPathName = check_opt_val($arg, $GuestPathName); + $HostPathName = check_opt_val($arg, $HostPathName) if (!$Usage); $Cmd = $arg; } elsif ($arg eq "runscript") { - $Script=check_opt_val($arg, $Script); + $Script = check_opt_val($arg, $Script); $Cmd = $arg; } elsif ($arg eq "status")

1 0

Stefan Dösinger : ddraw: Make the index buffer write only.
by Alexandre Julliard Nov. 28, 2012

Nov. 28, 2012

Module: wine Branch: master Commit: 108fcb691c3116aefa5e1bcc2d19e0290085d610 URL: http://source.winehq.org/git/wine.git/?a=commit;h=108fcb691c3116aefa5e1bcc2… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Nov 27 00:00:31 2012 +0100 ddraw: Make the index buffer write only. --- dlls/ddraw/device.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index dd7d3ee..6cc25ba 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -4063,7 +4063,7 @@ static HRESULT d3d_device7_DrawIndexedPrimitiveVB(IDirect3DDevice7 *iface, TRACE("Growing index buffer to %u bytes\n", size); - hr = wined3d_buffer_create_ib(This->wined3d_device, size, WINED3DUSAGE_DYNAMIC /* Usage */, + hr = wined3d_buffer_create_ib(This->wined3d_device, size, WINED3DUSAGE_DYNAMIC | WINED3DUSAGE_WRITEONLY, WINED3D_POOL_DEFAULT, NULL, &ddraw_null_wined3d_parent_ops, &buffer); if (FAILED(hr)) {

1 0

Stefan Dösinger : ddraw: Don' t create a wastefully large index buffer.
by Alexandre Julliard Nov. 28, 2012

Nov. 28, 2012

Module: wine Branch: master Commit: 4b95487bddd34f6dac3eb84f34110e0acc97470c URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b95487bddd34f6dac3eb84f3… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Nov 27 00:00:30 2012 +0100 ddraw: Don't create a wastefully large index buffer. --- dlls/ddraw/ddraw_private.h | 1 + dlls/ddraw/device.c | 29 ++++++----------------------- 2 files changed, 7 insertions(+), 23 deletions(-) diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index 319fcab..a7fac29 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -276,6 +276,7 @@ struct d3d_device struct wined3d_device *wined3d_device; struct ddraw *ddraw; struct wined3d_buffer *indexbuffer; + UINT indexbuffer_size; struct ddraw_surface *target; /* Viewport management */ diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index ba7d011..dd7d3ee 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -240,7 +240,7 @@ static ULONG WINAPI d3d_device_inner_Release(IUnknown *iface) * care of that on uninit_3d(). */ /* Free the index buffer. */ - wined3d_buffer_decref(This->indexbuffer); + if (This->indexbuffer) wined3d_buffer_decref(This->indexbuffer); /* Set the device up to render to the front buffer since the back * buffer will vanish soon. */ @@ -4039,8 +4039,6 @@ static HRESULT d3d_device7_DrawIndexedPrimitiveVB(IDirect3DDevice7 *iface, struct d3d_device *This = impl_from_IDirect3DDevice7(iface); struct d3d_vertex_buffer *vb = unsafe_impl_from_IDirect3DVertexBuffer7(D3DVertexBuf); DWORD stride = get_flexible_vertex_size(vb->fvf); - struct wined3d_resource *wined3d_resource; - struct wined3d_resource_desc desc; WORD *LockedIndices; HRESULT hr; @@ -4058,13 +4056,9 @@ static HRESULT d3d_device7_DrawIndexedPrimitiveVB(IDirect3DDevice7 *iface, wined3d_device_set_vertex_declaration(This->wined3d_device, vb->wineD3DVertexDeclaration); - /* check that the buffer is large enough to hold the indices, - * reallocate if necessary. */ - wined3d_resource = wined3d_buffer_get_resource(This->indexbuffer); - wined3d_resource_get_desc(wined3d_resource, &desc); - if (desc.size < IndexCount * sizeof(WORD)) + if (This->indexbuffer_size < IndexCount * sizeof(WORD)) { - UINT size = max(desc.size * 2, IndexCount * sizeof(WORD)); + UINT size = max(This->indexbuffer_size * 2, IndexCount * sizeof(WORD)); struct wined3d_buffer *buffer; TRACE("Growing index buffer to %u bytes\n", size); @@ -4073,13 +4067,14 @@ static HRESULT d3d_device7_DrawIndexedPrimitiveVB(IDirect3DDevice7 *iface, WINED3D_POOL_DEFAULT, NULL, &ddraw_null_wined3d_parent_ops, &buffer); if (FAILED(hr)) { - ERR("(%p) IWineD3DDevice::CreateIndexBuffer failed with hr = %08x\n", This, hr); + ERR("(%p) wined3d_buffer_create_ib failed with hr = %08x\n", This, hr); wined3d_mutex_unlock(); return hr; } - wined3d_buffer_decref(This->indexbuffer); + if (This->indexbuffer) wined3d_buffer_decref(This->indexbuffer); This->indexbuffer = buffer; + This->indexbuffer_size = size; } /* Copy the index stream into the index buffer. A new IWineD3DDevice @@ -6529,17 +6524,6 @@ static HRESULT d3d_device_init(struct d3d_device *device, struct ddraw *ddraw, device->legacy_projection = ident; device->legacy_clipspace = ident; - /* Create an index buffer, it's needed for indexed drawing */ - hr = wined3d_buffer_create_ib(ddraw->wined3d_device, 0x40000 /* Length. Don't know how long it should be */, - WINED3DUSAGE_DYNAMIC /* Usage */, WINED3D_POOL_DEFAULT, NULL, - &ddraw_null_wined3d_parent_ops, &device->indexbuffer); - if (FAILED(hr)) - { - ERR("Failed to create an index buffer, hr %#x.\n", hr); - ddraw_handle_table_destroy(&device->handle_table); - return hr; - } - /* This is for convenience. */ device->wined3d_device = ddraw->wined3d_device; wined3d_device_incref(ddraw->wined3d_device); @@ -6549,7 +6533,6 @@ static HRESULT d3d_device_init(struct d3d_device *device, struct ddraw *ddraw, if (FAILED(hr)) { ERR("Failed to set render target, hr %#x.\n", hr); - wined3d_buffer_decref(device->indexbuffer); ddraw_handle_table_destroy(&device->handle_table); return hr; }

1 0

Jason Edmeades : cmd: Change what 'ver' issues.
by Alexandre Julliard Nov. 28, 2012

Nov. 28, 2012

1 0

Stefan Dösinger : ddraw: Properly use the index buffer as a dynamic buffer.
by Alexandre Julliard Nov. 28, 2012

Nov. 28, 2012

Module: wine Branch: master Commit: a61f68fc5ab67e9c08665bd1861d6811be42d30f URL: http://source.winehq.org/git/wine.git/?a=commit;h=a61f68fc5ab67e9c08665bd18… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Nov 27 00:00:32 2012 +0100 ddraw: Properly use the index buffer as a dynamic buffer. --- dlls/ddraw/ddraw_private.h | 1 + dlls/ddraw/device.c | 12 +++++++++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index a7fac29..3a35c47 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -277,6 +277,7 @@ struct d3d_device struct ddraw *ddraw; struct wined3d_buffer *indexbuffer; UINT indexbuffer_size; + UINT indexbuffer_pos; struct ddraw_surface *target; /* Viewport management */ diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 6cc25ba..64a5d46 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -4041,6 +4041,7 @@ static HRESULT d3d_device7_DrawIndexedPrimitiveVB(IDirect3DDevice7 *iface, DWORD stride = get_flexible_vertex_size(vb->fvf); WORD *LockedIndices; HRESULT hr; + UINT ib_pos = This->indexbuffer_pos; TRACE("iface %p, primitive_type %#x, vb %p, start_vertex %u, vertex_count %u, indices %p, index_count %u, flags %#x.\n", iface, PrimitiveType, D3DVertexBuf, StartVertex, NumVertices, Indices, IndexCount, Flags); @@ -4075,14 +4076,18 @@ static HRESULT d3d_device7_DrawIndexedPrimitiveVB(IDirect3DDevice7 *iface, if (This->indexbuffer) wined3d_buffer_decref(This->indexbuffer); This->indexbuffer = buffer; This->indexbuffer_size = size; + ib_pos = 0; } + if (This->indexbuffer_size - IndexCount * sizeof(WORD) < ib_pos) + ib_pos = 0; + /* Copy the index stream into the index buffer. A new IWineD3DDevice * method could be created which takes an user pointer containing the * indices or a SetData-Method for the index buffer, which overrides the * index buffer data with our pointer. */ - hr = wined3d_buffer_map(This->indexbuffer, 0, IndexCount * sizeof(WORD), - (BYTE **)&LockedIndices, 0); + hr = wined3d_buffer_map(This->indexbuffer, ib_pos, IndexCount * sizeof(WORD), + (BYTE **)&LockedIndices, ib_pos ? WINED3D_MAP_NOOVERWRITE : WINED3D_MAP_DISCARD); if (FAILED(hr)) { ERR("Failed to map buffer, hr %#x.\n", hr); @@ -4091,6 +4096,7 @@ static HRESULT d3d_device7_DrawIndexedPrimitiveVB(IDirect3DDevice7 *iface, } memcpy(LockedIndices, Indices, IndexCount * sizeof(WORD)); wined3d_buffer_unmap(This->indexbuffer); + This->indexbuffer_pos = ib_pos + IndexCount * sizeof(WORD); /* Set the index stream */ wined3d_device_set_base_vertex_index(This->wined3d_device, StartVertex); @@ -4107,7 +4113,7 @@ static HRESULT d3d_device7_DrawIndexedPrimitiveVB(IDirect3DDevice7 *iface, wined3d_device_set_primitive_type(This->wined3d_device, PrimitiveType); - hr = wined3d_device_draw_indexed_primitive(This->wined3d_device, 0, IndexCount); + hr = wined3d_device_draw_indexed_primitive(This->wined3d_device, ib_pos / sizeof(WORD), IndexCount); wined3d_mutex_unlock();

1 0