December 2005 - Wine-commits

Thomas Weidenmueller : devenum: Don't leak key handle creating a category registry key.
by Alexandre Julliard 05 Dec '05

05 Dec '05

Module: wine Branch: refs/heads/master Commit: ae4eafbeccbf03a2659cf9d9ccfab008340d2721 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ae4eafbeccbf03a2659cf9d… Author: Thomas Weidenmueller <wine-patches(a)reactsoft.com> Date: Mon Dec 5 20:39:47 2005 +0100 devenum: Don't leak key handle creating a category registry key. --- dlls/devenum/createdevenum.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/devenum/createdevenum.c b/dlls/devenum/createdevenum.c index 15948cf..416c238 100644 --- a/dlls/devenum/createdevenum.c +++ b/dlls/devenum/createdevenum.c @@ -202,8 +202,10 @@ static HRESULT DEVENUM_CreateAMCategoryK res = E_INVALIDARG; if (SUCCEEDED(res)) - res = HRESULT_FROM_WIN32( - RegCreateKeyW(HKEY_CURRENT_USER, wszRegKey, &hkeyDummy)); + { + LONG lRes = RegCreateKeyW(HKEY_CURRENT_USER, wszRegKey, &hkeyDummy); + res = HRESULT_FROM_WIN32(lRes); + } if (hkeyDummy) RegCloseKey(hkeyDummy);

1 0

Huw Davies : msi: Fix MsiProvideQualifiedComponentW spec file entry.
by Alexandre Julliard 05 Dec '05

05 Dec '05

Module: wine Branch: refs/heads/master Commit: 0d13aeb26e17a592d34e20b49bea3e4f870d5ab0 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=0d13aeb26e17a592d34e20b… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Dec 5 20:38:18 2005 +0100 msi: Fix MsiProvideQualifiedComponentW spec file entry. --- dlls/msi/msi.spec | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msi/msi.spec b/dlls/msi/msi.spec index 28b2628..ee28694 100644 --- a/dlls/msi/msi.spec +++ b/dlls/msi/msi.spec @@ -102,7 +102,7 @@ 106 stdcall MsiProvideComponentFromDescriptorW(wstr ptr ptr ptr) 107 stub MsiProvideComponentW 108 stdcall MsiProvideQualifiedComponentA(str str long ptr ptr) -109 stdcall MsiProvideQualifiedComponentW(str str long ptr ptr) +109 stdcall MsiProvideQualifiedComponentW(wstr wstr long ptr ptr) 110 stdcall MsiQueryFeatureStateA(str str) 111 stdcall MsiQueryFeatureStateW(wstr wstr) 112 stdcall MsiQueryProductStateA(str)

1 0

Wojciech Migda : imagehlp: fixed typo in SymSetOptions entry.
by Alexandre Julliard 05 Dec '05

05 Dec '05

Module: wine Branch: refs/heads/master Commit: c8c52d79790f79f6cce6160c935e13e9c0560d19 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=c8c52d79790f79f6cce6160… Author: Wojciech Migda <migda(a)chemia.uj.edu.pl> Date: Mon Dec 5 20:38:45 2005 +0100 imagehlp: fixed typo in SymSetOptions entry. --- dlls/imagehlp/imagehlp.spec | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/imagehlp/imagehlp.spec b/dlls/imagehlp/imagehlp.spec index fce953b..ac5a2ae 100644 --- a/dlls/imagehlp/imagehlp.spec +++ b/dlls/imagehlp/imagehlp.spec @@ -95,7 +95,7 @@ @ stub SymRegisterFunctionEntryCallback64 @ stub SymRegisterFunctionEntryCallback @ stdcall SymSetContext(long ptr ptr) dbghelp.SymSetContext -@ stdcall SymSetOptions(long) dbghelp.SymGetOptions +@ stdcall SymSetOptions(long) dbghelp.SymSetOptions @ stdcall SymSetSearchPath(long str) dbghelp.SymSetSearchPath @ stub SymUnDName64 @ stdcall SymUnDName(ptr str long) dbghelp.SymUnDName

1 0

lostwages/wwn wn20051202_300.xml
by Jeremy Newman 05 Dec '05

05 Dec '05

ChangeSet ID: 21679 CVSROOT: /opt/cvs-commit Module name: lostwages Changes by: jnewman(a)winehq.org 2005/12/05 10:42:52 Modified files: wwn : wn20051202_300.xml Log message: Francois Gouget <fgouget(a)free.fr> Two <section> tags were prematurely closed. Remove the duplicate 'Installing the Mozilla ActiveX Control' Patch: http://cvs.winehq.org/patch.py?id=21679 Old revision New revision Changes Path 1.1 1.2 +2 -39 lostwages/wwn/wn20051202_300.xml Index: lostwages/wwn/wn20051202_300.xml diff -u -p lostwages/wwn/wn20051202_300.xml:1.1 lostwages/wwn/wn20051202_300.xml:1.2 --- lostwages/wwn/wn20051202_300.xml:1.1 5 Dec 2005 16:42:52 -0000 +++ lostwages/wwn/wn20051202_300.xml 5 Dec 2005 16:42:52 -0000 @@ -128,7 +128,7 @@ since I can publish it there directly. <section title="wine.git" subject="Git" - archive="http://wiki.winehq.org/GitWine"> + archive="http://wiki.winehq.org/GitWine" posts="1" > <topic>Project Management</topic> @@ -485,46 +485,9 @@ http://www.blastwave.org/wine</a> ?< </section> <section - title="Installing the Mozilla ActiveX Control" - subject="Does the Windows version of Mozilla need to be installed to use the Mozilla ActiveX plugin?" - archive="http://www.winehq.com/pipermail/wine-devel/2005-November/042878.html" - posts="5" -> -<topic>Web/HTML</topic> -The Mozilla ActiveX control is currently used when an application -requires a <tt>WebBrowser</tt> control to embed OLE documnents, namely HTML, -within an application. Ongoing work by Jacek Caban to implement -MSHTML.DLL and SHDOCVW.DLL will hopefully obviate the need for it, but -that work isn't complete enough yet (although Jacek sent about a -bizillion patches last week.) That led David Hagood to ask this week: -<quote who="David Hagood"> -Does the Windows version of Mozilla need to be in place for the Mozilla -Active X control to work, or is there a way to point the control at my -Linux install of Mozilla?</quote> - -Aric Cyr replied: -<quote who="Aric Cyr"> -Yup, you'll need to install a win32 version of mozilla. There is a decent -little Mozilla ActiveX HOWTO at:<ul> -<a href="http://gentoo-wiki.com/HOWTO_Install_and_update_World_Of_Warcraft_with_wine"> -http://gentoo-wiki.com/HOWTO_Install_and_update_World_Of_Warcraft_with_wine</a> -</ul> - -(Installing Active X for the new Patchsystem) - -</quote> - -Jacek pointed out that was actually incorrect and it was easier, -<quote who="Jacek Caban"> -Mozilla ActiveX Control doesn't need any version of Mozilla. It just uses -Gecko (Mozilla's engine), which is provided with it, so you don't have -to install anything else.</quote> - -</section> -<section title="Quake 2 Evolved & Winelib" subject="A working winelib application" - archive="http://www.winehq.com/pipermail/wine-devel/2005-December/042975.html"> + archive="http://www.winehq.com/pipermail/wine-devel/2005-December/042975.html" posts="1" > <topic>Winelib</topic>

1 0

lostwages/wwn wn20011212_110.xml wn20051125_29 ...
by Jeremy Newman 05 Dec '05

05 Dec '05

ChangeSet ID: 21678 CVSROOT: /opt/cvs-commit Module name: lostwages Changes by: jnewman(a)winehq.org 2005/12/05 10:41:54 Modified files: wwn : wn20011212_110.xml wn20051125_299.xml Log message: Francois Gouget <fgouget(a)free.fr> Assorted spelling fixes Patch: http://cvs.winehq.org/patch.py?id=21678 Old revision New revision Changes Path 1.10 1.11 +1 -1 lostwages/wwn/wn20011212_110.xml 1.1 1.2 +17 -17 lostwages/wwn/wn20051125_299.xml Index: lostwages/wwn/wn20011212_110.xml diff -u -p lostwages/wwn/wn20011212_110.xml:1.10 lostwages/wwn/wn20011212_110.xml:1.11 --- lostwages/wwn/wn20011212_110.xml:1.10 5 Dec 2005 16:41:54 -0000 +++ lostwages/wwn/wn20011212_110.xml 5 Dec 2005 16:41:54 -0000 @@ -164,7 +164,7 @@ replied with some concerns: Patrik Stridvall had some thoughts as well: <quote who="Patrik Stridvall"> What is perhaps more realistic to require IMHO that Office and other - Microsoft applications shouldn't crash or behave in an inconsistant + Microsoft applications shouldn't crash or behave in an inconsistent way just because some odd feature in some API call is not available. Instead it should say, sorry can't do that not supported in the OS. Index: lostwages/wwn/wn20051125_299.xml diff -u -p lostwages/wwn/wn20051125_299.xml:1.1 lostwages/wwn/wn20051125_299.xml:1.2 --- lostwages/wwn/wn20051125_299.xml:1.1 5 Dec 2005 16:41:54 -0000 +++ lostwages/wwn/wn20051125_299.xml 5 Dec 2005 16:41:54 -0000 @@ -193,7 +193,7 @@ For those of you who don't speak italian They included some technical bits to illustrate using Wine. Steven J. Vaughan-Nichols -<a href="http://www.eweek.com/article2/0,1895,1886920,00.asp">reviewed</a> u +<a href="http://www.eweek.com/article2/0,1895,1886920,00.asp">reviewed</a> CrossOver Office 5 for eWeek and had a lot of positive comments. Interestingly, Steven included a link to a CrossOver mailing list post which shows he's more familiar with the product than just being a casual reviewer. From his @@ -257,8 +257,8 @@ support for permanent objects. There wil for ntoskrnl for that to work. I'm just about finished integrating new OM into ntoskrnl tree and almost ready to give it a try. -As far as OM goes it's mostly finished and passes all but two of om -tests. Also it don't see any side-affects from it either. All the +As far as OM goes it's mostly finished and passes all but two om +tests. Also it don't see any side-effects from it either. All the programs I've tested work in the same way as they were before. All named object moved to directories and using RootDirectory part of OBJECT_ATTRIBUTES for create/open. @@ -310,7 +310,7 @@ can mail the current code too). himself: <quote who="Stephan Dosinger"> -I have sorted that texture problem out now(Incorrect Loading and the +I have sorted out that texture problem out now(Incorrect Loading and the TEXTUREHANDLE render state was missing), and to my eyes Tomb Raider 3 runs correct now with WineD3D. @@ -336,7 +336,7 @@ what he was doing: <quote who="Oliver Stieber"> I've put together a Direct3D 8 wrapper for wined3d which should hopefully replace the current Direct3D 8 code. The patch needs a little bit of tidying, -some work of vertex declarations and a hell of a lot of testing before it +some work on vertex declarations and a hell of a lot of testing before it can go into Wine. So far I've tested Rail Road Tycoon 3, Celebrity Death match, Madden NFL 2004 @@ -376,7 +376,7 @@ https://sourceforge.net/project/shownote posts="7" > <topic>Documentation</topic> -Wine has documented the Win32 similar to how Microsoft has done with +Wine has documented the Win32 similarly to how Microsoft has done with MSDN. While it's definitely a work in progress, it does provide an alternative source of information for various API's. Robert Shearman mentioned WineHQ was out of date regarding it: @@ -448,7 +448,7 @@ screen. Next time I booted with grub-floppy and then restored the MBR with grub-install /dev/hda. Please let me know what additional information you need. -It's happend on Slackware 10.2 system, 2.6.14 kernel with ck-3 patches. +It's happened on Slackware 10.2 system, 2.6.14 kernel with ck-3 patches. </quote> A bunch of people asked for different output to try to figure out @@ -567,7 +567,7 @@ Also part of the problem, though I don't far as its impact, is that our architectures are different. For example, the code obfuscation tools (securom, safedisk et al) depend on device drivers being loaded by ntoskrnl.exe. This is related to the hidden -assumpmtions problem I described already, but sometimes we have to +assumptions problem I described already, but sometimes we have to implement a large amount of silliness that we didn't anticipate having to do, or reimplement stuff that was already working for some apps. ReactOS can potentially avoid some of these issues, since they're copying much @@ -618,7 +618,7 @@ deep interwoven dependencies. So, to summarize, the punishment to Microsoft for illegally pushing IE and destroying Netscape is...the continued -use of IE as an monopolistic lever. Nice.</quote> +use of IE as a monopolistic lever. Nice.</quote> From there the thread went in different directions. </section> @@ -632,10 +632,10 @@ use of IE as an monopolistic lever. Nic Charles A wanted to know how to go about using Wine on a machine without X running, specifically running a cron job: <quote who="Charles A"> - I'm not able to use wine command in crontab it giving following error + I'm not able to use wine command in crontab due to it giving the following error <tt>"Error opening terminal: unknown"</tt> -I'm using wine 0.9, i have added following command in crontab +I'm using wine 0.9, i have added the following command in crontab <ul><code> 20 10 * * * /home/Maven/test.sh </code></ul> @@ -762,7 +762,7 @@ winebrowser to handle sending email: <quote who="Hans Leidekker"> Modeled after winebrowser. Local testing found that thunderbird (know as mozilla-thunderbird on Debian-based systems) and evolution -accept a mailto: url on the command line. kmail however has it's +accept a mailto: url on the command line. kmail however has its own interface. Any other GUI-based mail client of interest that handles these urls? Test it like so: <ul><code> @@ -945,7 +945,7 @@ out of FD.O scope (and for which work-ar <=> one context rule).</li> <li> GLX extension that would export the 'clip-list' functionnalities of cards - (or at lest the one which is in the X code itself). Would help on + (or at least the one which is in the X code itself). Would help on applications (like Wine) that do their own in-window clipping.</li> <li> same point as before but for Xv the day we will re-add this code for @@ -958,14 +958,14 @@ Some 'misc' stuff that is really in the X setting (resolution, mouse acceleration, ...), as soon as this client exits, restore the previous configuration. Would be useful to prevent having people restarting X because Wine crashed after having changed the - resolution using XRand.</li> + resolution using XRandR.</li> <li> have a non-connection limited mouse-grab. To explain better, this would enable one to grab the pointer into a window (i.e. the mouse would never leave this window) while still sending events to all connections and not only to the connection which started the grab. This could be nice to simulate 'full-screen desktop mode' or for DXGrab. No idea if with Wine's - current event model this is still usefull though.</li></ul> + current event model this is still useful though.</li></ul> Another 'let's dream' possibilities: <ul> @@ -1079,10 +1079,10 @@ explained what some of the likely proble I do not know what special needs the VB database apps have but for sure they need a good oleaut32.dll. At least the variant arithmetic functions -aren't good enough for your requirements. With good enough I mean is +aren't good enough for your requirements. With good enough what I mean is that they do not handle all the input variants that native oleaut32 are handling. That isn't hard to implement but requires a lot of tests as -this functions are very poorly documented and are designed specificaly +these functions are very poorly documented and are designed specifically to support only the variants they get passed down by the VB runtime. Good examples of such tests and implementation are VarMul, VarAdd and 1-2 other functions (from which I adapted the tests for VarMul and

1 0

Vitaliy Margolen : server: Remove sync_namespace.
by Alexandre Julliard 05 Dec '05

05 Dec '05

Module: wine Branch: refs/heads/master Commit: 4e3652491600f1d434eaa1b67fe83277b7ff7101 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=4e3652491600f1d434eaa1b… Author: Vitaliy Margolen <wine-patch(a)kievinfo.com> Date: Mon Dec 5 14:52:18 2005 +0100 server: Remove sync_namespace. --- server/main.c | 4 ---- server/object.h | 3 --- 2 files changed, 0 insertions(+), 7 deletions(-) diff --git a/server/main.c b/server/main.c index 7f07aac..43d3cf7 100644 --- a/server/main.c +++ b/server/main.c @@ -40,9 +40,6 @@ int master_socket_timeout = 3; /* maste int foreground = 0; const char *server_argv0; -/* name space for synchronization objects */ -struct namespace *sync_namespace; - /* parse-line args */ /* FIXME: should probably use getopt, and add a (more complete?) help option */ @@ -130,7 +127,6 @@ int main( int argc, char *argv[] ) sock_init(); open_master_socket(); - sync_namespace = create_namespace( 37 ); setvbuf( stderr, NULL, _IOLBF, 0 ); if (debug_level) fprintf( stderr, "wineserver: starting (pid=%ld)\n", (long) getpid() ); diff --git a/server/object.h b/server/object.h index ba7ca90..62c0015 100644 --- a/server/object.h +++ b/server/object.h @@ -214,7 +214,4 @@ extern const char *server_argv0; /* server start time used for GetTickCount() */ extern time_t server_start_time; -/* name space for synchronization objects */ -extern struct namespace *sync_namespace; - #endif /* __WINE_SERVER_OBJECT_H */

1 0

Vitaliy Margolen : Move mailslot devices into directory name space.
by Alexandre Julliard 05 Dec '05

05 Dec '05

Module: wine Branch: refs/heads/master Commit: cf21d4d7ca7184dfb42583a39a830f96037b1e6b URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=cf21d4d7ca7184dfb42583a… Author: Vitaliy Margolen <wine-patch(a)kievinfo.com> Date: Mon Dec 5 13:30:26 2005 +0100 Move mailslot devices into directory name space. --- dlls/ntdll/file.c | 22 +++--- include/wine/server_protocol.h | 4 + server/directory.c | 3 + server/mailslot.c | 148 +++++++++++++++++++++++++++++++--------- server/object.h | 1 server/protocol.def | 2 + server/trace.c | 2 + 7 files changed, 136 insertions(+), 46 deletions(-)

1 0

Alexandre Julliard : server: Let the directory code handle device names.
by Alexandre Julliard 05 Dec '05

05 Dec '05

Module: wine Branch: refs/heads/master Commit: d13095bc8476ce8259ffad4ff732da915398d458 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=d13095bc8476ce8259ffad4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 5 14:52:02 2005 +0100 server: Let the directory code handle device names. --- server/directory.c | 16 +++++++++++----- server/mailslot.c | 6 ++---- server/named_pipe.c | 9 +++------ server/object.h | 6 ++++-- 4 files changed, 20 insertions(+), 17 deletions(-) diff --git a/server/directory.c b/server/directory.c index 14ed4cc..21dec3a 100644 --- a/server/directory.c +++ b/server/directory.c @@ -283,7 +283,7 @@ void *open_object_dir( struct directory /* Global initialization */ -static struct directory *dir_driver; +static struct directory *dir_driver, *dir_device; static struct symlink *link_dosdev, *link_global1, *link_global2, *link_local; static struct named_pipe_device *dev_named_pipe; static struct mailslot_device *dev_mailslot; @@ -308,7 +308,13 @@ void init_directories(void) static const struct unicode_str link_global_str = {link_globalW, sizeof(link_globalW)}; static const struct unicode_str link_local_str = {link_localW, sizeof(link_localW)}; - struct directory *dir_global, *dir_basenamed, *dir_device; + /* devices */ + static const WCHAR pipeW[] = {'P','I','P','E'}; + static const WCHAR mailslotW[] = {'M','A','I','L','S','L','O','T'}; + static const struct unicode_str pipe_str = {pipeW, sizeof(pipeW)}; + static const struct unicode_str mailslot_str = {mailslotW, sizeof(mailslotW)}; + + struct directory *dir_global, *dir_basenamed; root_directory = create_directory( NULL, NULL, 0, HASH_SIZE ); dir_driver = create_directory( root_directory, &dir_driver_str, 0, HASH_SIZE ); @@ -325,11 +331,10 @@ void init_directories(void) link_local = create_symlink( dir_basenamed, &link_local_str, 0, &dir_basenamed_str ); /* devices */ - dev_named_pipe = create_named_pipe_device(); - dev_mailslot = create_mailslot_device(); + dev_named_pipe = create_named_pipe_device( dir_global, &pipe_str ); + dev_mailslot = create_mailslot_device( dir_global, &mailslot_str ); /* the symlinks or devices hold references so we can release these */ - release_object( dir_device ); release_object( dir_global ); release_object( dir_basenamed ); } @@ -344,6 +349,7 @@ void close_directories(void) release_object( link_global2 ); release_object( link_local ); + release_object( dir_device ); release_object( dir_driver ); release_object( root_directory ); } diff --git a/server/mailslot.c b/server/mailslot.c index 7d2d0b0..c882896 100644 --- a/server/mailslot.c +++ b/server/mailslot.c @@ -269,13 +269,11 @@ static void mailslot_device_destroy( str free( device->mailslots ); } -struct mailslot_device *create_mailslot_device( void ) +struct mailslot_device *create_mailslot_device( struct directory *root, const struct unicode_str *name ) { - static const WCHAR mailslotW[] = {'\\','?','?','\\','M','A','I','L','S','L','O','T'}; - static struct unicode_str mailslot = {mailslotW, sizeof(mailslotW)}; struct mailslot_device *dev; - if ((dev = create_named_object_dir( NULL, &mailslot, 0, &mailslot_device_ops )) && + if ((dev = create_named_object_dir( root, name, 0, &mailslot_device_ops )) && get_error() != STATUS_OBJECT_NAME_EXISTS) { if (!(dev->mailslots = create_namespace( 7 ))) diff --git a/server/named_pipe.c b/server/named_pipe.c index ac6aaab..2917d7b 100644 --- a/server/named_pipe.c +++ b/server/named_pipe.c @@ -379,8 +379,6 @@ static struct object *named_pipe_device_ assert( obj->ops == &named_pipe_device_ops ); assert( device->pipes ); - if (!name->len) return NULL; - if ((found = find_object( device->pipes, name, attr | OBJ_CASE_INSENSITIVE ))) name->len = 0; @@ -397,13 +395,12 @@ static void named_pipe_device_destroy( s /* this will be deleted as soon an we fix wait_named_pipe */ static struct named_pipe_device *named_pipe_device; -struct named_pipe_device *create_named_pipe_device( void ) +struct named_pipe_device *create_named_pipe_device( struct directory *root, + const struct unicode_str *name ) { - static const WCHAR pipeW[] = {'\\','?','?','\\','P','I','P','E'}; - static struct unicode_str pipe = {pipeW, sizeof(pipeW)}; struct named_pipe_device *dev; - if ((dev = create_named_object_dir( NULL, &pipe, 0, &named_pipe_device_ops )) && + if ((dev = create_named_object_dir( root, name, 0, &named_pipe_device_ops )) && get_error() != STATUS_OBJECT_NAME_EXISTS) { if (!(dev->pipes = create_namespace( 7 ))) diff --git a/server/object.h b/server/object.h index 06ce443..ba7ca90 100644 --- a/server/object.h +++ b/server/object.h @@ -198,8 +198,10 @@ extern struct symlink *create_symlink( s unsigned int attr, const struct unicode_str *target ); /* devices */ -extern struct named_pipe_device *create_named_pipe_device( void ); -extern struct mailslot_device *create_mailslot_device( void ); +extern struct named_pipe_device *create_named_pipe_device( struct directory *root, + const struct unicode_str *name ); +extern struct mailslot_device *create_mailslot_device( struct directory *root, + const struct unicode_str *name ); /* global variables */

1 0

Vitaliy Margolen : Move named pipe objects into directory name space.
by Alexandre Julliard 05 Dec '05

05 Dec '05

Module: wine Branch: refs/heads/master Commit: babfa79436e1d745886ead360bee402bfd46074a URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=babfa79436e1d745886ead3… Author: Vitaliy Margolen <wine-patch(a)kievinfo.com> Date: Mon Dec 5 13:09:35 2005 +0100 Move named pipe objects into directory name space. Change tests accordingly. Add small test for WaitNamedPipe. --- dlls/kernel/sync.c | 3 + dlls/kernel/tests/pipe.c | 4 + dlls/ntdll/file.c | 21 +++--- dlls/ntdll/tests/om.c | 4 + include/wine/server_protocol.h | 4 + server/directory.c | 14 +++- server/named_pipe.c | 151 ++++++++++++++++++++++++++++++++++------ server/object.h | 2 + server/protocol.def | 2 + server/trace.c | 2 + 10 files changed, 165 insertions(+), 42 deletions(-)

1 0

Alexandre Julliard : server: Move handle allocation out of open_object_dir.
by Alexandre Julliard 05 Dec '05

05 Dec '05

Module: wine Branch: refs/heads/master Commit: 3764da68deb43bcda87283b58ae1e1287aabc816 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=3764da68deb43bcda87283b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 5 12:52:05 2005 +0100 server: Move handle allocation out of open_object_dir. --- server/directory.c | 19 +++++++++++-------- server/event.c | 8 +++++++- server/mapping.c | 8 +++++++- server/mutex.c | 8 +++++++- server/object.h | 5 ++--- server/semaphore.c | 8 +++++++- server/symlink.c | 9 +++++++-- server/timer.c | 8 +++++++- 8 files changed, 55 insertions(+), 18 deletions(-) diff --git a/server/directory.c b/server/directory.c index 052de10..c5de986 100644 --- a/server/directory.c +++ b/server/directory.c @@ -260,11 +260,9 @@ void *create_named_object_dir( struct di } /* open a new handle to an existing object */ -obj_handle_t open_object_dir( struct directory *root, const struct unicode_str *name, - unsigned int attr, const struct object_ops *ops, - unsigned int access ) +void *open_object_dir( struct directory *root, const struct unicode_str *name, + unsigned int attr, const struct object_ops *ops ) { - obj_handle_t handle = 0; struct unicode_str name_left; struct object *obj; @@ -275,11 +273,11 @@ obj_handle_t open_object_dir( struct dir else if (ops && obj->ops != ops) set_error( STATUS_OBJECT_TYPE_MISMATCH ); else - handle = alloc_handle( current->process, obj, access, attr & OBJ_INHERIT ); + return obj; release_object( obj ); } - return handle; + return NULL; } @@ -367,13 +365,18 @@ DECL_HANDLER(create_directory) DECL_HANDLER(open_directory) { struct unicode_str name; - struct directory *root = NULL; + struct directory *dir, *root = NULL; get_req_unicode_str( &name ); if (req->rootdir && !(root = get_directory_obj( current->process, req->rootdir, 0 ))) return; - reply->handle = open_object_dir( root, &name, req->attributes, &directory_ops, req->access ); + if ((dir = open_object_dir( root, &name, req->attributes, &directory_ops ))) + { + reply->handle = alloc_handle( current->process, &dir->obj, req->access, + req->attributes & OBJ_INHERIT ); + release_object( dir ); + } if (root) release_object( root ); } diff --git a/server/event.c b/server/event.c index 8443837..7464e18 100644 --- a/server/event.c +++ b/server/event.c @@ -172,12 +172,18 @@ DECL_HANDLER(open_event) { struct unicode_str name; struct directory *root = NULL; + struct event *event; get_req_unicode_str( &name ); if (req->rootdir && !(root = get_directory_obj( current->process, req->rootdir, 0 ))) return; - reply->handle = open_object_dir( root, &name, req->attributes, &event_ops, req->access ); + if ((event = open_object_dir( root, &name, req->attributes, &event_ops ))) + { + reply->handle = alloc_handle( current->process, &event->obj, req->access, + req->attributes & OBJ_INHERIT ); + release_object( event ); + } if (root) release_object( root ); } diff --git a/server/mapping.c b/server/mapping.c index cf87361..cc81e37 100644 --- a/server/mapping.c +++ b/server/mapping.c @@ -402,12 +402,18 @@ DECL_HANDLER(open_mapping) { struct unicode_str name; struct directory *root = NULL; + struct mapping *mapping; get_req_unicode_str( &name ); if (req->rootdir && !(root = get_directory_obj( current->process, req->rootdir, 0 ))) return; - reply->handle = open_object_dir( root, &name, req->attributes, &mapping_ops, req->access ); + if ((mapping = open_object_dir( root, &name, req->attributes, &mapping_ops ))) + { + reply->handle = alloc_handle( current->process, &mapping->obj, req->access, + req->attributes & OBJ_INHERIT ); + release_object( mapping ); + } if (root) release_object( root ); } diff --git a/server/mutex.c b/server/mutex.c index 9e3bdc3..18c194e 100644 --- a/server/mutex.c +++ b/server/mutex.c @@ -198,12 +198,18 @@ DECL_HANDLER(open_mutex) { struct unicode_str name; struct directory *root = NULL; + struct mutex *mutex; get_req_unicode_str( &name ); if (req->rootdir && !(root = get_directory_obj( current->process, req->rootdir, 0 ))) return; - reply->handle = open_object_dir( root, &name, req->attributes, &mutex_ops, req->access ); + if ((mutex = open_object_dir( root, &name, req->attributes, &mutex_ops ))) + { + reply->handle = alloc_handle( current->process, &mutex->obj, req->access, + req->attributes & OBJ_INHERIT ); + release_object( mutex ); + } if (root) release_object( root ); } diff --git a/server/object.h b/server/object.h index d138729..2beb148 100644 --- a/server/object.h +++ b/server/object.h @@ -187,9 +187,8 @@ extern struct object *find_object_dir( s unsigned int attr, struct unicode_str *name_left ); extern void *create_named_object_dir( struct directory *root, const struct unicode_str *name, unsigned int attr, const struct object_ops *ops ); -extern obj_handle_t open_object_dir( struct directory *root, const struct unicode_str *name, - unsigned int attr, const struct object_ops *ops, - unsigned int access ); +extern void *open_object_dir( struct directory *root, const struct unicode_str *name, + unsigned int attr, const struct object_ops *ops ); extern void init_directories(void); extern void close_directories(void); diff --git a/server/semaphore.c b/server/semaphore.c index e8d9cbb..2dd6beb 100644 --- a/server/semaphore.c +++ b/server/semaphore.c @@ -172,12 +172,18 @@ DECL_HANDLER(open_semaphore) { struct unicode_str name; struct directory *root = NULL; + struct semaphore *sem; get_req_unicode_str( &name ); if (req->rootdir && !(root = get_directory_obj( current->process, req->rootdir, 0 ))) return; - reply->handle = open_object_dir( root, &name, req->attributes, &semaphore_ops, req->access ); + if ((sem = open_object_dir( root, &name, req->attributes, &semaphore_ops ))) + { + reply->handle = alloc_handle( current->process, &sem->obj, req->access, + req->attributes & OBJ_INHERIT ); + release_object( sem ); + } if (root) release_object( root ); } diff --git a/server/symlink.c b/server/symlink.c index 7f28cc8..cf805a7 100644 --- a/server/symlink.c +++ b/server/symlink.c @@ -168,13 +168,18 @@ DECL_HANDLER(open_symlink) { struct unicode_str name; struct directory *root = NULL; + struct symlink *symlink; get_req_unicode_str( &name ); if (req->rootdir && !(root = get_directory_obj( current->process, req->rootdir, 0 ))) return; - reply->handle = open_object_dir( root, &name, req->attributes | OBJ_OPENLINK, - &symlink_ops, req->access ); + if ((symlink = open_object_dir( root, &name, req->attributes | OBJ_OPENLINK, &symlink_ops ))) + { + reply->handle = alloc_handle( current->process, &symlink->obj, req->access, + req->attributes & OBJ_INHERIT ); + release_object( symlink ); + } if (root) release_object( root ); } diff --git a/server/timer.c b/server/timer.c index 74419e5..436ed7c 100644 --- a/server/timer.c +++ b/server/timer.c @@ -231,12 +231,18 @@ DECL_HANDLER(open_timer) { struct unicode_str name; struct directory *root = NULL; + struct timer *timer; get_req_unicode_str( &name ); if (req->rootdir && !(root = get_directory_obj( current->process, req->rootdir, 0 ))) return; - reply->handle = open_object_dir( root, &name, req->attributes, &timer_ops, req->access ); + if ((timer = open_object_dir( root, &name, req->attributes, &timer_ops ))) + { + reply->handle = alloc_handle( current->process, &timer->obj, req->access, + req->attributes & OBJ_INHERIT ); + release_object( timer ); + } if (root) release_object( root ); }

1 0