October 2012 - Wine-commits

Francois Gouget : testbot/scripts: Add a TestAgent script to test the TestAgentd server.
by Alexandre Julliard 18 Oct '12

18 Oct '12

Module: tools Branch: master Commit: 655c406c0a44b561cc3810d16bb87c24f3cf9bce URL: http://source.winehq.org/git/tools.git/?a=commit;h=655c406c0a44b561cc3810d1… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Oct 18 15:37:21 2012 +0200 testbot/scripts: Add a TestAgent script to test the TestAgentd server. --- testbot/scripts/TestAgent | 179 +++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 179 insertions(+), 0 deletions(-) diff --git a/testbot/scripts/TestAgent b/testbot/scripts/TestAgent new file mode 100755 index 0000000..2e9850d --- /dev/null +++ b/testbot/scripts/TestAgent @@ -0,0 +1,179 @@ +#!/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. +# +# Copyright 2012 Francois Gouget +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License, or (at your option) any later version. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA +use strict; + +my $name0=$0; +$name0 =~ s+^.*/++; + + +my $Dir; +sub BEGIN +{ + $0 =~ m=^(.*)/[^/]*$=; + $Dir = $1; +} +use lib "$Dir/../lib"; + +use WineTestBot::Config; +use WineTestBot::TestAgent; +use WineTestBot::Log; + +sub error(@) +{ + print STDERR "$name0:error: ", @_; +} + +my ($Cmd, $Hostname, $HostPathName, $GuestPathName, $Script, $ScriptTimeout); +my $Port; +my $Timeout; +my $Usage; + +sub check_opt_val($$) +{ + my ($option, $val)=@_; + + if (defined $val) + { + error("$option can only be specified once\n"); + $Usage=2; # but continue processing this option + } + if (!@ARGV) + { + error("missing value for $option\n"); + $Usage=2; + return undef; + } + return shift @ARGV; +} + +while (@ARGV) +{ + my $arg=shift @ARGV; + if ($arg eq "--help") + { + $Usage=0; + } + elsif ($arg eq "--port") + { + $Port=check_opt_val($arg, $Port); + } + elsif ($arg eq "--timeout") + { + $ScriptTimeout=check_opt_val($arg, $ScriptTimeout); + } + elsif (!defined $Hostname) + { + $Hostname = $arg; + } + elsif ($arg eq "send") + { + $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); + $Cmd = $arg; + } + elsif ($arg eq "runscript") + { + $Script=check_opt_val($arg, $Script); + $Cmd = $arg; + } + elsif ($arg eq "status") + { + $Cmd = $arg; + } + else + { + error("unknown command $arg\n"); + $Usage = 2; + } +} + +if (!defined $Usage) +{ + if (!defined $Cmd) + { + error("you must specify a command to run\n"); + $Usage = 2; + } + $AgentPort = $Port if (defined $Port); +} +if (defined $Usage) +{ + if ($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 "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 "\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 " 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 " --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 " --help Shows this usage message.\n"; + exit 0; +} + +my $Err; +if ($Cmd eq "send") +{ + $Err = TestAgent::SendFile($Hostname, $HostPathName, $GuestPathName); +} +elsif ($Cmd eq "get") +{ + $Err = TestAgent::GetFile($Hostname, $GuestPathName, $HostPathName); +} +elsif ($Cmd eq "runscript") +{ + $Err = TestAgent::RunScript($Hostname, $Script, $ScriptTimeout); +} +elsif ($Cmd eq "status") +{ + my $Status; + ($Status, $Err) = TestAgent::GetStatus($Hostname); + print "Status=$Status"; +} + +if ($Err) +{ + error("$Err\n"); + exit 1; +} + +exit 0;

1 0

Francois Gouget : testbot/doc: Some more installation instruction updates for the server.
by Alexandre Julliard 18 Oct '12

18 Oct '12

Module: tools Branch: master Commit: 24d2cf2bb411edcdbdd08eaef8abd84db494b6ee URL: http://source.winehq.org/git/tools.git/?a=commit;h=24d2cf2bb411edcdbdd08eae… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Oct 18 15:23:54 2012 +0200 testbot/doc: Some more installation instruction updates for the server. --- testbot/doc/INSTALL.txt | 28 ++++++++++++++-------------- 1 files changed, 14 insertions(+), 14 deletions(-) diff --git a/testbot/doc/INSTALL.txt b/testbot/doc/INSTALL.txt index d7c093e..54e5e31 100644 --- a/testbot/doc/INSTALL.txt +++ b/testbot/doc/INSTALL.txt @@ -90,31 +90,31 @@ Setup for Wine's patches site: - Arrange for the WinePatchesWebNotify.pl script to be fed the notification emails. One way to do so would be to use procmail and add the following lines to the $HOME/.procmailrc file: - :0: + :0c: * ^Subject: New patches available at | $HOME/tools/testbot/bin/WinePatchesWebNotify.pl Setup for Winetest updates: - Use a cron job to run CheckForWinetestUpdate.pl periodically. For instance: - * 0 * * * /home/winehq/tools/testbot/scripts/CheckForWinetestUpdate.pl + * 0 * * * /home/winehq/tools/testbot/bin/CheckForWinetestUpdate.pl 32 + * 0 * * * /home/winehq/tools/testbot/bin/CheckForWinetestUpdate.pl 64 Setup for wine-patches: -- FIXME: WineTestBot now expects to receive the patches to test from - Wine's Patches site instead of straight from the wine-patches mailing - list. Furthermore WinePatchesMLSubmit.pl is currently broken (because - the patch ids are no longer auto-generated). So this should be - skipped. +- A proper WineTestBot system should integrate with Wine's patches site. + An alternative is to interface directly with wine-patches as described in + this section. - Arrange for the WinePatchesMLSubmit.pl script to be fed the wine-patches emails. One way to do so would be to subscribe the winehq user to the wine-patches mailing list and to then add the following lines to the .procmailrc file: - :0: + :0c: * ^List-Id: Wine Patch Submissions + * ^TO wine-patches | $HOME/tools/testbot/bin/WinePatchesMLSubmit.pl - Or if you have a set of patches to test in the mbox format you can test with: - formail -s $HOME/tools/testbot/bin/WinePatchesMLSubmit.pl <mbox-file + formail -ds $HOME/tools/testbot/bin/WinePatchesMLSubmit.pl <mbox-file 2. VM hosts setup @@ -136,12 +136,12 @@ Dependencies: make sure to make user winehq a member of group winehq. - Clone Wine's tools repository to $HOME/tools (so this document should be available as $HOME/tools/testbot/doc/INSTALL.txt). -- Create the $HOME/tools/testbot/var and $HOME/tools/testbot/log - directories and make them writable to group winehq. - mkdir $HOME/tools/testbot/var $HOME/tools/testbot/log - chmod g+w $HOME/tools/testbot/var $HOME/tools/testbot/log +- Create the $HOME/tools/testbot/var directory and make it writable to + group winehq. + mkdir $HOME/tools/testbot/var + chmod g+w $HOME/tools/testbot/var - Clone the Wine git repository to $HOME/tools/testbot/var/wine-git. -- In the winetest account, run Reconfig.pl. +- In the winehq account, run Reconfig.pl. Check $HOME/tools/testbot/log/Reconfig.log to make sure it succeeded. - Take a snapshot of the running VM. Make sure restoring this snapshot

1 0

Piotr Caban : msvcp: Sync implementations.
by Alexandre Julliard 17 Oct '12

17 Oct '12

Module: wine Branch: master Commit: 9b516abb482ade8594ffdca86bc3924491cc17dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b516abb482ade8594ffdca86… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Oct 17 10:01:40 2012 +0200 msvcp: Sync implementations. --- dlls/msvcp100/exception.c | 7 + dlls/msvcp100/locale.c | 289 +++++++++++++++++++++---------------------- dlls/msvcp100/msvcp100.spec | 2 +- dlls/msvcp100/string.c | 8 +- dlls/msvcp60/exception.c | 7 + dlls/msvcp60/ios.c | 240 +++++++++++++++++++++++++++++++++++ dlls/msvcp60/locale.c | 292 +++++++++++++++++++++---------------------- dlls/msvcp60/msvcp60.spec | 22 ++-- dlls/msvcp70/msvcp70.spec | 56 ++++---- dlls/msvcp71/exception.c | 7 + dlls/msvcp71/locale.c | 289 +++++++++++++++++++++---------------------- dlls/msvcp71/msvcp71.spec | 2 +- dlls/msvcp71/string.c | 4 + dlls/msvcp80/msvcp80.spec | 58 +++++----- dlls/msvcp90/string.c | 12 ++- 15 files changed, 774 insertions(+), 521 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9b516abb482ade8594ffd…

1 0

Henri Verbeet : ddraw/tests: Add some display mode set / restore tests with multiple ddraw objects.
by Alexandre Julliard 17 Oct '12

17 Oct '12

Module: wine Branch: master Commit: f9105db050eee83621f4aea75b9db8786fdb2188 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f9105db050eee83621f4aea75… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Oct 17 11:33:36 2012 +0200 ddraw/tests: Add some display mode set / restore tests with multiple ddraw objects. --- dlls/ddraw/tests/ddraw1.c | 200 +++++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw2.c | 200 +++++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw4.c | 192 +++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw7.c | 192 +++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 784 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f9105db050eee83621f4a…

1 0

Jason Edmeades : cmd: Handle very odd delimiter support for command line.
by Alexandre Julliard 17 Oct '12

17 Oct '12

Module: wine Branch: master Commit: dccccfc27341c2b156fa14c58de2c19cb41b486d URL: http://source.winehq.org/git/wine.git/?a=commit;h=dccccfc27341c2b156fa14c58… Author: Jason Edmeades <jason(a)edmeades.me.uk> Date: Tue Oct 16 23:35:33 2012 +0100 cmd: Handle very odd delimiter support for command line. --- programs/cmd/batch.c | 17 ++++++++-- programs/cmd/builtins.c | 51 ++++++++++++++++--------------- programs/cmd/directory.c | 2 +- programs/cmd/tests/test_cmdline.cmd.exp | 22 +++++++------- programs/cmd/wcmd.h | 2 +- programs/cmd/wcmdmain.c | 19 ++++++----- 6 files changed, 63 insertions(+), 50 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=dccccfc27341c2b156fa1…

1 0

Jason Edmeades : cmd: Rename parameter passed to builtin calls.
by Alexandre Julliard 17 Oct '12

17 Oct '12

Module: wine Branch: master Commit: 9f83165efb341d7cb65a60ae97d9453df72f0c8e URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f83165efb341d7cb65a60ae9… Author: Jason Edmeades <jason(a)edmeades.me.uk> Date: Tue Oct 16 23:41:58 2012 +0100 cmd: Rename parameter passed to builtin calls. --- programs/cmd/builtins.c | 142 +++++++++++++++++++++++----------------------- programs/cmd/directory.c | 8 +- programs/cmd/wcmd.h | 18 +++--- 3 files changed, 84 insertions(+), 84 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9f83165efb341d7cb65a6…

1 0

Jason Edmeades : cmd: Add support for calling a built in command.
by Alexandre Julliard 17 Oct '12

17 Oct '12

Module: wine Branch: master Commit: 3c058185155a24f0e059d55c5d6318bc9a3f6400 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c058185155a24f0e059d55c5… Author: Jason Edmeades <jason(a)edmeades.me.uk> Date: Sun Oct 14 00:38:53 2012 +0100 cmd: Add support for calling a built in command. --- programs/cmd/batch.c | 7 +++- programs/cmd/builtins.c | 10 +++--- programs/cmd/tests/test_builtins.cmd | 16 +++++++++ programs/cmd/tests/test_builtins.cmd.exp | 19 +++++++---- programs/cmd/wcmd.h | 4 +- programs/cmd/wcmdmain.c | 50 ++++++++++++++++++++++------- 6 files changed, 79 insertions(+), 27 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3c058185155a24f0e059d…

1 0

Alexandre Julliard : gdi32: Store the object type directly in the GDI handle table.
by Alexandre Julliard 17 Oct '12

17 Oct '12

Module: wine Branch: master Commit: 2bdf447744b3d380ed266e7627976612ec58ffe2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2bdf447744b3d380ed266e762… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 17 12:25:28 2012 +0200 gdi32: Store the object type directly in the GDI handle table. --- dlls/gdi32/dc.c | 14 +++-- dlls/gdi32/enhmfdrv/init.c | 2 +- dlls/gdi32/gdi_private.h | 1 - dlls/gdi32/gdiobj.c | 114 +++++++++++++++++++++++-------------------- dlls/gdi32/mfdrv/init.c | 2 +- dlls/gdi32/pen.c | 4 +- 6 files changed, 73 insertions(+), 64 deletions(-) diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index 1f089de..5a68aa6 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -55,16 +55,18 @@ static inline DC *get_dc_obj( HDC hdc ) DC *dc = GDI_GetObjPtr( hdc, 0 ); if (!dc) return NULL; - if ((dc->header.type != OBJ_DC) && - (dc->header.type != OBJ_MEMDC) && - (dc->header.type != OBJ_METADC) && - (dc->header.type != OBJ_ENHMETADC)) + switch (GetObjectType( hdc )) { + case OBJ_DC: + case OBJ_MEMDC: + case OBJ_METADC: + case OBJ_ENHMETADC: + return dc; + default: GDI_ReleaseObj( hdc ); SetLastError( ERROR_INVALID_HANDLE ); - dc = NULL; + return NULL; } - return dc; } diff --git a/dlls/gdi32/enhmfdrv/init.c b/dlls/gdi32/enhmfdrv/init.c index bd4c906..57a4d18 100644 --- a/dlls/gdi32/enhmfdrv/init.c +++ b/dlls/gdi32/enhmfdrv/init.c @@ -435,7 +435,7 @@ HENHMETAFILE WINAPI CloseEnhMetaFile(HDC hdc) /* [in] metafile DC */ TRACE("(%p)\n", hdc ); if (!(dc = get_dc_ptr( hdc ))) return NULL; - if (dc->header.type != OBJ_ENHMETADC) + if (GetObjectType( hdc ) != OBJ_ENHMETADC) { release_dc_ptr( dc ); return NULL; diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 5b79526..9c926d4 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -65,7 +65,6 @@ struct hdc_list typedef struct tagGDIOBJHDR { - WORD type; /* object type (one of the OBJ_* constants) */ WORD system : 1; /* system object flag */ WORD deleted : 1; /* whether DeleteObject has been called on this object */ DWORD selcount; /* number of times the object is selected in a DC */ diff --git a/dlls/gdi32/gdiobj.c b/dlls/gdi32/gdiobj.c index 9da5533..0cd182a 100644 --- a/dlls/gdi32/gdiobj.c +++ b/dlls/gdi32/gdiobj.c @@ -38,12 +38,34 @@ WINE_DEFAULT_DEBUG_CHANNEL(gdi); -#define HGDIOBJ_32(h16) ((HGDIOBJ)(ULONG_PTR)(h16)) +#define FIRST_GDI_HANDLE 16 +#define MAX_GDI_HANDLES 16384 -#define GDI_HEAP_SIZE 0xffe0 +struct gdi_handle_entry +{ + GDIOBJHDR *obj; /* pointer to the object-specific data */ + WORD type; /* object type (one of the OBJ_* constants) */ +}; +static struct gdi_handle_entry gdi_handles[MAX_GDI_HANDLES]; +static int next_gdi_handle; +static LONG debug_count; HMODULE gdi32_module = 0; +static inline HGDIOBJ entry_to_handle( struct gdi_handle_entry *entry ) +{ + unsigned int idx = entry - gdi_handles + FIRST_GDI_HANDLE; + return ULongToHandle( idx << 2 ); +} + +static inline struct gdi_handle_entry *handle_entry( HGDIOBJ handle ) +{ + unsigned int idx = (HandleToULong(handle) >> 2) - FIRST_GDI_HANDLE; + + if (idx < MAX_GDI_HANDLES && gdi_handles[idx].type) return &gdi_handles[idx]; + return NULL; +} + /*********************************************************************** * GDI stock objects */ @@ -600,22 +622,6 @@ BOOL WINAPI DllMain( HINSTANCE inst, DWORD reason, LPVOID reserved ) return TRUE; } -#define FIRST_GDI_HANDLE 16 -#define MAX_GDI_HANDLES ((GDI_HEAP_SIZE >> 2) - FIRST_GDI_HANDLE) -static GDIOBJHDR *gdi_handles[MAX_GDI_HANDLES]; -static int next_gdi_handle; -static LONG debug_count; - -static inline HGDIOBJ index_to_handle( int index ) -{ - return ULongToHandle( (index + FIRST_GDI_HANDLE) << 2); -} - -static inline int handle_to_index( HGDIOBJ handle ) -{ - return (HandleToULong(handle) >> 2) - FIRST_GDI_HANDLE; -} - static const char *gdi_obj_type( unsigned type ) { switch ( type ) @@ -640,21 +646,21 @@ static const char *gdi_obj_type( unsigned type ) static void dump_gdi_objects( void ) { - int i; + struct gdi_handle_entry *entry; TRACE( "%u objects:\n", MAX_GDI_HANDLES ); EnterCriticalSection( &gdi_section ); - for (i = 0; i < MAX_GDI_HANDLES; i++) + for (entry = gdi_handles; entry < gdi_handles + MAX_GDI_HANDLES; entry++) { - if (!gdi_handles[i]) + if (!entry->type) { - TRACE( "index %d handle %p FREE\n", i, index_to_handle( i )); + TRACE( "handle %p FREE\n", entry_to_handle( entry )); continue; } TRACE( "handle %p obj %p type %s selcount %u deleted %u\n", - index_to_handle( i ), gdi_handles[i], gdi_obj_type( gdi_handles[i]->type ), - gdi_handles[i]->selcount, gdi_handles[i]->deleted ); + entry_to_handle( entry ), entry->obj, gdi_obj_type( entry->type ), + entry->obj->selcount, entry->obj->deleted ); } LeaveCriticalSection( &gdi_section ); } @@ -666,10 +672,13 @@ static void dump_gdi_objects( void ) */ HGDIOBJ alloc_gdi_handle( GDIOBJHDR *obj, WORD type, const struct gdi_obj_funcs *funcs ) { + struct gdi_handle_entry *entry; + HGDIOBJ ret; int i; + assert( type ); /* type 0 is reserved to mark free entries */ + /* initialize the object header */ - obj->type = type; obj->system = 0; obj->deleted = 0; obj->selcount = 0; @@ -678,9 +687,9 @@ HGDIOBJ alloc_gdi_handle( GDIOBJHDR *obj, WORD type, const struct gdi_obj_funcs EnterCriticalSection( &gdi_section ); for (i = next_gdi_handle + 1; i < MAX_GDI_HANDLES; i++) - if (!gdi_handles[i]) goto found; + if (!gdi_handles[i].type) goto found; for (i = 0; i <= next_gdi_handle; i++) - if (!gdi_handles[i]) goto found; + if (!gdi_handles[i].type) goto found; LeaveCriticalSection( &gdi_section ); ERR( "out of GDI object handles, expect a crash\n" ); @@ -688,13 +697,15 @@ HGDIOBJ alloc_gdi_handle( GDIOBJHDR *obj, WORD type, const struct gdi_obj_funcs return 0; found: - gdi_handles[i] = obj; + entry = &gdi_handles[i]; + entry->obj = obj; + entry->type = type; next_gdi_handle = i; + ret = entry_to_handle( entry ); LeaveCriticalSection( &gdi_section ); - TRACE( "allocated %s %p %u/%u\n", - gdi_obj_type(type), index_to_handle( i ), + TRACE( "allocated %s %p %u/%u\n", gdi_obj_type(type), ret, InterlockedIncrement( &debug_count ), MAX_GDI_HANDLES ); - return index_to_handle( i ); + return ret; } @@ -706,20 +717,20 @@ HGDIOBJ alloc_gdi_handle( GDIOBJHDR *obj, WORD type, const struct gdi_obj_funcs void *free_gdi_handle( HGDIOBJ handle ) { GDIOBJHDR *object = NULL; - int i = handle_to_index( handle ); + struct gdi_handle_entry *entry; - if (i >= 0 && i < MAX_GDI_HANDLES) + EnterCriticalSection( &gdi_section ); + if ((entry = handle_entry( handle ))) { - EnterCriticalSection( &gdi_section ); - object = gdi_handles[i]; - gdi_handles[i] = NULL; - LeaveCriticalSection( &gdi_section ); + TRACE( "freed %s %p %u/%u\n", gdi_obj_type( entry->type ), handle, + InterlockedDecrement( &debug_count ) + 1, MAX_GDI_HANDLES ); + object = entry->obj; + entry->type = 0; } + LeaveCriticalSection( &gdi_section ); + if (object) { - TRACE( "freed %s %p %u/%u\n", gdi_obj_type( object->type ), handle, - InterlockedDecrement( &debug_count ) + 1, MAX_GDI_HANDLES ); - object->type = 0; /* mark it as invalid */ object->funcs = NULL; } return object; @@ -736,14 +747,13 @@ void *free_gdi_handle( HGDIOBJ handle ) void *GDI_GetObjPtr( HGDIOBJ handle, WORD type ) { GDIOBJHDR *ptr = NULL; - int i = handle_to_index( handle ); + struct gdi_handle_entry *entry; EnterCriticalSection( &gdi_section ); - if (i >= 0 && i < MAX_GDI_HANDLES) + if ((entry = handle_entry( handle ))) { - ptr = gdi_handles[i]; - if (ptr && type && ptr->type != type) ptr = NULL; + if (!type || entry->type == type) ptr = entry->obj; } if (!ptr) @@ -995,17 +1005,15 @@ INT WINAPI GetObjectW( HGDIOBJ handle, INT count, LPVOID buffer ) */ DWORD WINAPI GetObjectType( HGDIOBJ handle ) { - GDIOBJHDR * ptr; - DWORD result; + struct gdi_handle_entry *entry; + DWORD result = 0; + + EnterCriticalSection( &gdi_section ); + if ((entry = handle_entry( handle ))) result = entry->type; + LeaveCriticalSection( &gdi_section ); - if (!(ptr = GDI_GetObjPtr( handle, 0 ))) - { - SetLastError( ERROR_INVALID_HANDLE ); - return 0; - } - result = ptr->type; - GDI_ReleaseObj( handle ); TRACE("%p -> %u\n", handle, result ); + if (!result) SetLastError( ERROR_INVALID_HANDLE ); return result; } diff --git a/dlls/gdi32/mfdrv/init.c b/dlls/gdi32/mfdrv/init.c index f75637c..03cd22c 100644 --- a/dlls/gdi32/mfdrv/init.c +++ b/dlls/gdi32/mfdrv/init.c @@ -390,7 +390,7 @@ static DC *MFDRV_CloseMetaFile( HDC hdc ) TRACE("(%p)\n", hdc ); if (!(dc = get_dc_ptr( hdc ))) return NULL; - if (dc->header.type != OBJ_METADC) + if (GetObjectType( hdc ) != OBJ_METADC) { release_dc_ptr( dc ); return NULL; diff --git a/dlls/gdi32/pen.c b/dlls/gdi32/pen.c index 6695ee9..94c3933 100644 --- a/dlls/gdi32/pen.c +++ b/dlls/gdi32/pen.c @@ -236,7 +236,7 @@ static HGDIOBJ PEN_SelectObject( HGDIOBJ handle, HDC hdc ) struct brush_pattern *pattern; PHYSDEV physdev = GET_DC_PHYSDEV( dc, pSelectPen ); - switch (pen->header.type) + switch (GetObjectType( handle )) { case OBJ_PEN: pattern = NULL; @@ -293,7 +293,7 @@ static INT PEN_GetObject( HGDIOBJ handle, INT count, LPVOID buffer ) if (!pen) return 0; - switch (pen->header.type) + switch (GetObjectType( handle )) { case OBJ_PEN: {

1 0

Alexandre Julliard : gdi32: Store the object function table directly in the GDI handle table.
by Alexandre Julliard 17 Oct '12

17 Oct '12

Module: wine Branch: master Commit: cf3cafdc18d1f839f67e0237cfbb608944746b1d URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf3cafdc18d1f839f67e0237c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 17 12:43:23 2012 +0200 gdi32: Store the object function table directly in the GDI handle table. --- dlls/gdi32/gdi_private.h | 1 - dlls/gdi32/gdiobj.c | 133 +++++++++++++++++++++------------------------- 2 files changed, 60 insertions(+), 74 deletions(-) diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 9c926d4..36566b1 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -68,7 +68,6 @@ typedef struct tagGDIOBJHDR WORD system : 1; /* system object flag */ WORD deleted : 1; /* whether DeleteObject has been called on this object */ DWORD selcount; /* number of times the object is selected in a DC */ - const struct gdi_obj_funcs *funcs; struct hdc_list *hdcs; } GDIOBJHDR; diff --git a/dlls/gdi32/gdiobj.c b/dlls/gdi32/gdiobj.c index 0cd182a..2e32de9 100644 --- a/dlls/gdi32/gdiobj.c +++ b/dlls/gdi32/gdiobj.c @@ -44,6 +44,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(gdi); struct gdi_handle_entry { GDIOBJHDR *obj; /* pointer to the object-specific data */ + const struct gdi_obj_funcs *funcs; /* type-specific functions */ WORD type; /* object type (one of the OBJ_* constants) */ }; @@ -682,7 +683,6 @@ HGDIOBJ alloc_gdi_handle( GDIOBJHDR *obj, WORD type, const struct gdi_obj_funcs obj->system = 0; obj->deleted = 0; obj->selcount = 0; - obj->funcs = funcs; obj->hdcs = NULL; EnterCriticalSection( &gdi_section ); @@ -699,6 +699,7 @@ HGDIOBJ alloc_gdi_handle( GDIOBJHDR *obj, WORD type, const struct gdi_obj_funcs found: entry = &gdi_handles[i]; entry->obj = obj; + entry->funcs = funcs; entry->type = type; next_gdi_handle = i; ret = entry_to_handle( entry ); @@ -728,11 +729,6 @@ void *free_gdi_handle( HGDIOBJ handle ) entry->type = 0; } LeaveCriticalSection( &gdi_section ); - - if (object) - { - object->funcs = NULL; - } return object; } @@ -805,60 +801,59 @@ void GDI_CheckNotLock(void) */ BOOL WINAPI DeleteObject( HGDIOBJ obj ) { - /* Check if object is valid */ - + struct gdi_handle_entry *entry; struct hdc_list *hdcs_head; const struct gdi_obj_funcs *funcs; - GDIOBJHDR * header; - - if (HIWORD(obj)) return FALSE; - if (!(header = GDI_GetObjPtr( obj, 0 ))) return FALSE; + EnterCriticalSection( &gdi_section ); + if (!(entry = handle_entry( obj ))) + { + LeaveCriticalSection( &gdi_section ); + return FALSE; + } - if (header->system) + if (entry->obj->system) { TRACE("Preserving system object %p\n", obj); - GDI_ReleaseObj( obj ); + LeaveCriticalSection( &gdi_section ); return TRUE; } - while ((hdcs_head = header->hdcs) != NULL) + while ((hdcs_head = entry->obj->hdcs) != NULL) { DC *dc = get_dc_ptr(hdcs_head->hdc); - header->hdcs = hdcs_head->next; + entry->obj->hdcs = hdcs_head->next; TRACE("hdc %p has interest in %p\n", hdcs_head->hdc, obj); if(dc) { PHYSDEV physdev = GET_DC_PHYSDEV( dc, pDeleteObject ); - GDI_ReleaseObj( obj ); /* release the GDI lock */ + LeaveCriticalSection( &gdi_section ); physdev->funcs->pDeleteObject( physdev, obj ); - header = GDI_GetObjPtr( obj, 0 ); /* and grab it again */ + EnterCriticalSection( &gdi_section ); /* and grab it again */ + entry = handle_entry( obj ); release_dc_ptr( dc ); } HeapFree(GetProcessHeap(), 0, hdcs_head); - if (!header) return FALSE; + if (!entry) return FALSE; } - if (header->selcount) + if (entry->obj->selcount) { - TRACE("delayed for %p because object in use, count %u\n", obj, header->selcount ); - header->deleted = 1; /* mark for delete */ - GDI_ReleaseObj( obj ); + TRACE("delayed for %p because object in use, count %u\n", obj, entry->obj->selcount ); + entry->obj->deleted = 1; /* mark for delete */ + LeaveCriticalSection( &gdi_section ); return TRUE; } - TRACE("%p\n", obj ); + funcs = entry->funcs; + LeaveCriticalSection( &gdi_section ); - /* Delete object */ + TRACE("%p\n", obj ); - funcs = header->funcs; - GDI_ReleaseObj( obj ); - if (funcs && funcs->pDeleteObject) - return funcs->pDeleteObject( obj ); - else - return FALSE; + if (funcs && funcs->pDeleteObject) return funcs->pDeleteObject( obj ); + return FALSE; } /*********************************************************************** @@ -950,26 +945,25 @@ HGDIOBJ WINAPI GetStockObject( INT obj ) */ INT WINAPI GetObjectA( HGDIOBJ handle, INT count, LPVOID buffer ) { - const struct gdi_obj_funcs *funcs; - GDIOBJHDR * ptr; + struct gdi_handle_entry *entry; + const struct gdi_obj_funcs *funcs = NULL; INT result = 0; TRACE("%p %d %p\n", handle, count, buffer ); - if (!(ptr = GDI_GetObjPtr( handle, 0 ))) return 0; - funcs = ptr->funcs; - GDI_ReleaseObj( handle ); + EnterCriticalSection( &gdi_section ); + if ((entry = handle_entry( handle ))) funcs = entry->funcs; + LeaveCriticalSection( &gdi_section ); - if (funcs && funcs->pGetObjectA) + if (funcs) { - if (buffer && ((ULONG_PTR)buffer >> 16) == 0) /* catch apps getting argument order wrong */ + if (!funcs->pGetObjectA) + SetLastError( ERROR_INVALID_HANDLE ); + else if (buffer && ((ULONG_PTR)buffer >> 16) == 0) /* catch apps getting argument order wrong */ SetLastError( ERROR_NOACCESS ); else result = funcs->pGetObjectA( handle, count, buffer ); } - else - SetLastError( ERROR_INVALID_HANDLE ); - return result; } @@ -978,25 +972,25 @@ INT WINAPI GetObjectA( HGDIOBJ handle, INT count, LPVOID buffer ) */ INT WINAPI GetObjectW( HGDIOBJ handle, INT count, LPVOID buffer ) { - const struct gdi_obj_funcs *funcs; - GDIOBJHDR * ptr; + struct gdi_handle_entry *entry; + const struct gdi_obj_funcs *funcs = NULL; INT result = 0; + TRACE("%p %d %p\n", handle, count, buffer ); - if (!(ptr = GDI_GetObjPtr( handle, 0 ))) return 0; - funcs = ptr->funcs; - GDI_ReleaseObj( handle ); + EnterCriticalSection( &gdi_section ); + if ((entry = handle_entry( handle ))) funcs = entry->funcs; + LeaveCriticalSection( &gdi_section ); - if (funcs && funcs->pGetObjectW) + if (funcs) { - if (buffer && ((ULONG_PTR)buffer >> 16) == 0) /* catch apps getting argument order wrong */ + if (!funcs->pGetObjectW) + SetLastError( ERROR_INVALID_HANDLE ); + else if (buffer && ((ULONG_PTR)buffer >> 16) == 0) /* catch apps getting argument order wrong */ SetLastError( ERROR_NOACCESS ); else result = funcs->pGetObjectW( handle, count, buffer ); } - else - SetLastError( ERROR_INVALID_HANDLE ); - return result; } @@ -1083,19 +1077,17 @@ HGDIOBJ WINAPI GetCurrentObject(HDC hdc,UINT type) */ HGDIOBJ WINAPI SelectObject( HDC hdc, HGDIOBJ hObj ) { - HGDIOBJ ret = 0; - GDIOBJHDR *header; + struct gdi_handle_entry *entry; + const struct gdi_obj_funcs *funcs = NULL; TRACE( "(%p,%p)\n", hdc, hObj ); - header = GDI_GetObjPtr( hObj, 0 ); - if (header) - { - const struct gdi_obj_funcs *funcs = header->funcs; - GDI_ReleaseObj( hObj ); - if (funcs && funcs->pSelectObject) ret = funcs->pSelectObject( hObj, hdc ); - } - return ret; + EnterCriticalSection( &gdi_section ); + if ((entry = handle_entry( hObj ))) funcs = entry->funcs; + LeaveCriticalSection( &gdi_section ); + + if (funcs && funcs->pSelectObject) return funcs->pSelectObject( hObj, hdc ); + return 0; } @@ -1104,20 +1096,15 @@ HGDIOBJ WINAPI SelectObject( HDC hdc, HGDIOBJ hObj ) */ BOOL WINAPI UnrealizeObject( HGDIOBJ obj ) { - BOOL result = FALSE; - GDIOBJHDR * header = GDI_GetObjPtr( obj, 0 ); + struct gdi_handle_entry *entry; + const struct gdi_obj_funcs *funcs = NULL; - if (header) - { - const struct gdi_obj_funcs *funcs = header->funcs; + EnterCriticalSection( &gdi_section ); + if ((entry = handle_entry( obj ))) funcs = entry->funcs; + LeaveCriticalSection( &gdi_section ); - GDI_ReleaseObj( obj ); - if (funcs && funcs->pUnrealizeObject) - result = header->funcs->pUnrealizeObject( obj ); - else - result = TRUE; - } - return result; + if (funcs && funcs->pUnrealizeObject) return funcs->pUnrealizeObject( obj ); + return funcs != NULL; }

1 0

Alexandre Julliard : gdi32: Store the HDC list directly in the GDI handle table.
by Alexandre Julliard 17 Oct '12

17 Oct '12

Module: wine Branch: master Commit: 2e693d00c9bc38009d305b04b6425ce7b67ceffd URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e693d00c9bc38009d305b04b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 17 13:03:18 2012 +0200 gdi32: Store the HDC list directly in the GDI handle table. --- dlls/gdi32/gdi_private.h | 11 +----- dlls/gdi32/gdiobj.c | 87 ++++++++++++++++++++------------------------- 2 files changed, 41 insertions(+), 57 deletions(-) diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 36566b1..5dadbc2 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -57,18 +57,11 @@ struct gdi_obj_funcs BOOL (*pDeleteObject)( HGDIOBJ handle ); }; -struct hdc_list -{ - HDC hdc; - struct hdc_list *next; -}; - typedef struct tagGDIOBJHDR { WORD system : 1; /* system object flag */ WORD deleted : 1; /* whether DeleteObject has been called on this object */ DWORD selcount; /* number of times the object is selected in a DC */ - struct hdc_list *hdcs; } GDIOBJHDR; typedef struct tagGdiFont GdiFont; @@ -325,8 +318,8 @@ extern void GDI_ReleaseObj( HGDIOBJ ) DECLSPEC_HIDDEN; extern void GDI_CheckNotLock(void) DECLSPEC_HIDDEN; extern HGDIOBJ GDI_inc_ref_count( HGDIOBJ handle ) DECLSPEC_HIDDEN; extern BOOL GDI_dec_ref_count( HGDIOBJ handle ) DECLSPEC_HIDDEN; -extern BOOL GDI_hdc_using_object(HGDIOBJ obj, HDC hdc) DECLSPEC_HIDDEN; -extern BOOL GDI_hdc_not_using_object(HGDIOBJ obj, HDC hdc) DECLSPEC_HIDDEN; +extern void GDI_hdc_using_object(HGDIOBJ obj, HDC hdc) DECLSPEC_HIDDEN; +extern void GDI_hdc_not_using_object(HGDIOBJ obj, HDC hdc) DECLSPEC_HIDDEN; /* metafile.c */ extern HMETAFILE MF_Create_HMETAFILE(METAHEADER *mh) DECLSPEC_HIDDEN; diff --git a/dlls/gdi32/gdiobj.c b/dlls/gdi32/gdiobj.c index 2e32de9..750e95b 100644 --- a/dlls/gdi32/gdiobj.c +++ b/dlls/gdi32/gdiobj.c @@ -41,10 +41,17 @@ WINE_DEFAULT_DEBUG_CHANNEL(gdi); #define FIRST_GDI_HANDLE 16 #define MAX_GDI_HANDLES 16384 +struct hdc_list +{ + HDC hdc; + struct hdc_list *next; +}; + struct gdi_handle_entry { GDIOBJHDR *obj; /* pointer to the object-specific data */ const struct gdi_obj_funcs *funcs; /* type-specific functions */ + struct hdc_list *hdcs; /* list of HDCs interested in this object */ WORD type; /* object type (one of the OBJ_* constants) */ }; @@ -683,7 +690,6 @@ HGDIOBJ alloc_gdi_handle( GDIOBJHDR *obj, WORD type, const struct gdi_obj_funcs obj->system = 0; obj->deleted = 0; obj->selcount = 0; - obj->hdcs = NULL; EnterCriticalSection( &gdi_section ); for (i = next_gdi_handle + 1; i < MAX_GDI_HANDLES; i++) @@ -700,6 +706,7 @@ HGDIOBJ alloc_gdi_handle( GDIOBJHDR *obj, WORD type, const struct gdi_obj_funcs entry = &gdi_handles[i]; entry->obj = obj; entry->funcs = funcs; + entry->hdcs = NULL; entry->type = type; next_gdi_handle = i; ret = entry_to_handle( entry ); @@ -819,11 +826,11 @@ BOOL WINAPI DeleteObject( HGDIOBJ obj ) return TRUE; } - while ((hdcs_head = entry->obj->hdcs) != NULL) + while ((hdcs_head = entry->hdcs) != NULL) { DC *dc = get_dc_ptr(hdcs_head->hdc); - entry->obj->hdcs = hdcs_head->next; + entry->hdcs = hdcs_head->next; TRACE("hdc %p has interest in %p\n", hdcs_head->hdc, obj); if(dc) @@ -861,70 +868,54 @@ BOOL WINAPI DeleteObject( HGDIOBJ obj ) * * Call this if the dc requires DeleteObject notification */ -BOOL GDI_hdc_using_object(HGDIOBJ obj, HDC hdc) +void GDI_hdc_using_object(HGDIOBJ obj, HDC hdc) { - GDIOBJHDR * header; - struct hdc_list **pphdc; + struct gdi_handle_entry *entry; + struct hdc_list *phdc; TRACE("obj %p hdc %p\n", obj, hdc); - if (!(header = GDI_GetObjPtr( obj, 0 ))) return FALSE; - - if (header->system) + EnterCriticalSection( &gdi_section ); + if ((entry = handle_entry( obj )) && !entry->obj->system) { - GDI_ReleaseObj(obj); - return FALSE; - } - - for(pphdc = &header->hdcs; *pphdc; pphdc = &(*pphdc)->next) - if((*pphdc)->hdc == hdc) - break; + for (phdc = entry->hdcs; phdc; phdc = phdc->next) + if (phdc->hdc == hdc) break; - if(!*pphdc) { - *pphdc = HeapAlloc(GetProcessHeap(), 0, sizeof(**pphdc)); - (*pphdc)->hdc = hdc; - (*pphdc)->next = NULL; + if (!phdc) + { + phdc = HeapAlloc(GetProcessHeap(), 0, sizeof(*phdc)); + phdc->hdc = hdc; + phdc->next = entry->hdcs; + entry->hdcs = phdc; + } } - - GDI_ReleaseObj(obj); - return TRUE; + LeaveCriticalSection( &gdi_section ); } /*********************************************************************** * GDI_hdc_not_using_object * */ -BOOL GDI_hdc_not_using_object(HGDIOBJ obj, HDC hdc) +void GDI_hdc_not_using_object(HGDIOBJ obj, HDC hdc) { - GDIOBJHDR * header; - struct hdc_list *phdc, **prev; + struct gdi_handle_entry *entry; + struct hdc_list **pphdc; TRACE("obj %p hdc %p\n", obj, hdc); - if (!(header = GDI_GetObjPtr( obj, 0 ))) return FALSE; - - if (header->system) + EnterCriticalSection( &gdi_section ); + if ((entry = handle_entry( obj )) && !entry->obj->system) { - GDI_ReleaseObj(obj); - return FALSE; + for (pphdc = &entry->hdcs; *pphdc; pphdc = &(*pphdc)->next) + if ((*pphdc)->hdc == hdc) + { + struct hdc_list *phdc = *pphdc; + *pphdc = phdc->next; + HeapFree(GetProcessHeap(), 0, phdc); + break; + } } - - phdc = header->hdcs; - prev = &header->hdcs; - - while(phdc) { - if(phdc->hdc == hdc) { - *prev = phdc->next; - HeapFree(GetProcessHeap(), 0, phdc); - phdc = *prev; - } else { - prev = &phdc->next; - phdc = phdc->next; - } - } - - GDI_ReleaseObj(obj); - return TRUE; + LeaveCriticalSection( &gdi_section ); } /***********************************************************************

1 0