December 2005 - Wine-Commits

Christian Gmeiner : msi: Implemented DllCanUnloadNow.
by Alexandre Julliard Dec. 5, 2005

Dec. 5, 2005

Module: wine Branch: refs/heads/master Commit: e02e539c1e91cffe4f29281c8a120ba60c041ba2 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=e02e539c1e91cffe4f29281… Author: Christian Gmeiner <christian.gmeiner(a)students.fh-vorarlberg.ac.at> Date: Mon Dec 5 20:39:33 2005 +0100 msi: Implemented DllCanUnloadNow. --- dlls/msi/msi.c | 28 +++++++++++++++++++++++++--- 1 files changed, 25 insertions(+), 3 deletions(-) diff --git a/dlls/msi/msi.c b/dlls/msi/msi.c index 625b16c..0591a42 100644 --- a/dlls/msi/msi.c +++ b/dlls/msi/msi.c @@ -53,8 +53,24 @@ LPVOID gUIContext = NULL; WCHAR gszLogFile[MAX_PATH]; HINSTANCE msi_hInstance; +static LONG dll_count; + static const WCHAR installerW[] = {'\\','I','n','s','t','a','l','l','e','r',0}; +/********************************************************************** + * Dll lifetime tracking declaration + */ +static void LockModule(void) +{ + InterlockedIncrement(&dll_count); +} + +static void UnlockModule(void) +{ + InterlockedDecrement(&dll_count); +} + + UINT WINAPI MsiOpenProductA(LPCSTR szProduct, MSIHANDLE *phProduct) { UINT r; @@ -1285,11 +1301,13 @@ static HRESULT WINAPI MsiCF_QueryInterfa static ULONG WINAPI MsiCF_AddRef(LPCLASSFACTORY iface) { + LockModule(); return 2; } static ULONG WINAPI MsiCF_Release(LPCLASSFACTORY iface) { + UnlockModule(); return 1; } @@ -1304,9 +1322,13 @@ static HRESULT WINAPI MsiCF_CreateInstan static HRESULT WINAPI MsiCF_LockServer(LPCLASSFACTORY iface, BOOL dolock) { - IClassFactoryImpl *This = (IClassFactoryImpl *)iface; + TRACE("(%p)->(%d)\n", iface, dolock); + + if(dolock) + LockModule(); + else + UnlockModule(); - FIXME("%p %d\n", This, dolock); return S_OK; } @@ -1363,7 +1385,7 @@ HRESULT WINAPI DllGetVersion(DLLVERSIONI */ HRESULT WINAPI DllCanUnloadNow(void) { - return S_FALSE; + return dll_count == 0 ? S_OK : S_FALSE; } /***********************************************************************

1 0

Wojciech Migda : imagehlp: fixed typo in SymSetOptions entry.
by Alexandre Julliard Dec. 5, 2005

Dec. 5, 2005

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

Huw Davies : msi: Fix MsiProvideQualifiedComponentW spec file entry.
by Alexandre Julliard Dec. 5, 2005

Dec. 5, 2005

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

lostwages/wwn wn20051202_300.xml
by Jeremy Newman Dec. 5, 2005

Dec. 5, 2005

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 Dec. 5, 2005

Dec. 5, 2005

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 Dec. 5, 2005

Dec. 5, 2005

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

Alexandre Julliard : server: Let the directory code handle device names.
by Alexandre Julliard Dec. 5, 2005

Dec. 5, 2005

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 mailslot devices into directory name space.
by Alexandre Julliard Dec. 5, 2005

Dec. 5, 2005

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

Vitaliy Margolen : Move named pipe objects into directory name space.
by Alexandre Julliard Dec. 5, 2005

Dec. 5, 2005

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 Dec. 5, 2005

Dec. 5, 2005

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

Eric Pouech : dbghelp: Implemented StackWalk64.
by Alexandre Julliard Dec. 5, 2005

Dec. 5, 2005

Module: wine Branch: refs/heads/master Commit: 1f872df26c2781fd274d8e3d10f46610933e9a06 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=1f872df26c2781fd274d8e3… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Mon Dec 5 12:50:10 2005 +0100 dbghelp: Implemented StackWalk64. --- dlls/dbghelp/stack.c | 239 ++++++++++++++++++++++++++++++++++++-------------- include/dbghelp.h | 4 - 2 files changed, 175 insertions(+), 68 deletions(-)

1 0

Francois Gouget : Update win32.api to match the current sources.
by Alexandre Julliard Dec. 5, 2005

Dec. 5, 2005

Module: wine Branch: refs/heads/master Commit: 5193c8565f5c07a37f52068ca2b06151a9091bc2 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=5193c8565f5c07a37f52068… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Dec 5 12:49:30 2005 +0100 Update win32.api to match the current sources. --- tools/winapi/win32.api | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/tools/winapi/win32.api b/tools/winapi/win32.api index 5d14faf..9f81c13 100644 --- a/tools/winapi/win32.api +++ b/tools/winapi/win32.api @@ -604,7 +604,6 @@ ALG_ID BOOL DWORD HANDLE -HCERTSTORE HCRYPTPROV HMODULE LONG @@ -620,7 +619,9 @@ CRYPT_OID_FUNC_ENTRY[] DATA_BLOB * DWORD * GUID * +HCERTSTORE HCRYPTKEY * +HCRYPTOIDFUNCADDR HCRYPTOIDFUNCADDR * HCRYPTOIDFUNCSET HLRUCACHE @@ -3301,7 +3302,7 @@ GLvoid * GLvoid ** LPGLYPHMETRICSFLOAT LPLAYERPLANEDESCRIPTOR -void * +PROC %str

1 0

Francois Gouget : msvidc32: Add a comment for DllMain() to stop winapi_check from
by Alexandre Julliard Dec. 5, 2005

Dec. 5, 2005

Module: wine Branch: refs/heads/master Commit: 6e7d8a7271b5f81cb1a508cabb6d2c5b8ddb8226 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=6e7d8a7271b5f81cb1a508c… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Dec 5 12:49:51 2005 +0100 msvidc32: Add a comment for DllMain() to stop winapi_check from complaining about it. --- dlls/msvidc32/msvideo1.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/msvidc32/msvideo1.c b/dlls/msvidc32/msvideo1.c index 0932978..f971d4f 100644 --- a/dlls/msvidc32/msvideo1.c +++ b/dlls/msvidc32/msvideo1.c @@ -561,6 +561,9 @@ LRESULT WINAPI CRAM_DriverProc( DWORD_PT return r; } +/*********************************************************************** + * DllMain + */ BOOL WINAPI DllMain(HINSTANCE hModule, DWORD dwReason, LPVOID lpReserved) { TRACE("(%p,%ld,%p)\n", hModule, dwReason, lpReserved);

1 0

Cihan Altinay : riched20: register ListBox & ComboBox classes
by Alexandre Julliard Dec. 5, 2005

Dec. 5, 2005

Module: wine Branch: refs/heads/master Commit: 2a1a0cf22dbef9b4acc2d76b339e16f2b141d554 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=2a1a0cf22dbef9b4acc2d76… Author: Cihan Altinay <cihan(a)uq.edu.au> Date: Mon Dec 5 12:48:45 2005 +0100 riched20: register ListBox & ComboBox classes Partially implement REExtendedRegisterClass() to register missing window classes so that applications relying on them don't get confused. --- dlls/riched20/editor.c | 65 +++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 63 insertions(+), 2 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index a25a90d..1383bcf 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -2,6 +2,7 @@ * RichEdit - functions dealing with editor object * * Copyright 2004 by Krzysztof Foltman + * Copyright 2005 by Cihan Altinay * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -208,6 +209,7 @@ * - full justification * - hyphenation * - tables + * - ListBox & ComboBox not implemented * * Bugs that are probably fixed, but not so easy to verify: * - EN_UPDATE/EN_CHANGE are handled very incorrectly (should be OK now) @@ -235,6 +237,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(richedit); int me_debug = 0; HANDLE me_heap = NULL; +static BOOL ME_ListBoxRegistered = FALSE; +static BOOL ME_ComboBoxRegistered = FALSE; + static ME_TextBuffer *ME_MakeText(void) { ME_TextBuffer *buf = ALLOC_OBJ(ME_TextBuffer); @@ -934,6 +939,8 @@ void ME_DestroyEditor(ME_TextEditor *edi static WCHAR wszClassName[] = {'R', 'i', 'c', 'h', 'E', 'd', 'i', 't', '2', '0', 'W', 0}; static WCHAR wszClassName50[] = {'R', 'i', 'c', 'h', 'E', 'd', 'i', 't', '5', '0', 'W', 0}; +static WCHAR wszClassNameListBox[] = {'R','E','L','i','s','t','B','o','x','2','0','W', 0}; +static WCHAR wszClassNameComboBox[] = {'R','E','C','o','m','b','o','B','o','x','2','0','W', 0}; BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) { @@ -951,6 +958,10 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, UnregisterClassW(wszClassName50, 0); UnregisterClassA("RichEdit20A", 0); UnregisterClassA("RichEdit50A", 0); + if (ME_ListBoxRegistered) + UnregisterClassW(wszClassNameListBox, 0); + if (ME_ComboBoxRegistered) + UnregisterClassW(wszClassNameComboBox, 0); HeapDestroy (me_heap); me_heap = NULL; break; @@ -2167,12 +2178,62 @@ HRESULT WINAPI CreateTextServices(IUnkno return E_FAIL; /* E_NOTIMPL isn't allowed by MSDN */ } +LRESULT WINAPI REComboWndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) { + /* FIXME: Not implemented */ + TRACE("hWnd %p msg %04x (%s) %08x %08lx\n", + hWnd, msg, get_msg_name(msg), wParam, lParam); + return DefWindowProcW(hWnd, msg, wParam, lParam); +} + +LRESULT WINAPI REListWndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) { + /* FIXME: Not implemented */ + TRACE("hWnd %p msg %04x (%s) %08x %08lx\n", + hWnd, msg, get_msg_name(msg), wParam, lParam); + return DefWindowProcW(hWnd, msg, wParam, lParam); +} + /****************************************************************** * REExtendedRegisterClass (RICHED20.8) * * FIXME undocumented + * Need to check for errors and implement controls and callbacks */ -void WINAPI REExtendedRegisterClass(void) +LRESULT WINAPI REExtendedRegisterClass(void) { - FIXME("stub\n"); + WNDCLASSW wcW; + UINT result; + + FIXME("semi stub\n"); + + wcW.cbClsExtra = 0; + wcW.cbWndExtra = 4; + wcW.hInstance = NULL; + wcW.hIcon = NULL; + wcW.hCursor = NULL; + wcW.hbrBackground = (HBRUSH)(COLOR_WINDOW+1); + wcW.lpszMenuName = NULL; + + if (!ME_ListBoxRegistered) + { + wcW.style = CS_PARENTDC | CS_DBLCLKS | CS_GLOBALCLASS; + wcW.lpfnWndProc = REListWndProc; + wcW.lpszClassName = wszClassNameListBox; + if (RegisterClassW(&wcW)) ME_ListBoxRegistered = TRUE; + } + + if (!ME_ComboBoxRegistered) + { + wcW.style = CS_PARENTDC | CS_DBLCLKS | CS_GLOBALCLASS | CS_VREDRAW | CS_HREDRAW; + wcW.lpfnWndProc = REComboWndProc; + wcW.lpszClassName = wszClassNameComboBox; + if (RegisterClassW(&wcW)) ME_ComboBoxRegistered = TRUE; + } + + result = 0; + if (ME_ListBoxRegistered) + result += 1; + if (ME_ComboBoxRegistered) + result += 2; + + return result; }

1 0

Pavel Roskin : notepad: Russian translation for Font... menu item.
by Alexandre Julliard Dec. 5, 2005

Dec. 5, 2005

Module: wine Branch: refs/heads/master Commit: 83f2069b6dabb6ad50244e01facadb1dd9b55787 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=83f2069b6dabb6ad50244e0… Author: Pavel Roskin <proski(a)gnu.org> Date: Mon Dec 5 12:48:58 2005 +0100 notepad: Russian translation for "Font..." menu item. --- programs/notepad/Ru.rc | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/programs/notepad/Ru.rc b/programs/notepad/Ru.rc index deea89b..bb98229 100644 --- a/programs/notepad/Ru.rc +++ b/programs/notepad/Ru.rc @@ -44,6 +44,7 @@ POPUP "&��" { MENUITEM "��&� � ��\tF5", CMD_TIME_DATE MENUITEM SEPARATOR MENUITEM "&�� ", CMD_WRAP + MENUITEM "&��...", CMD_FONT } POPUP "�&��" { MENUITEM "&��", CMD_SEARCH

1 0

YunSong Hwang : winefile: Fix an incorrect translation.
by Alexandre Julliard Dec. 5, 2005

Dec. 5, 2005

Module: wine Branch: refs/heads/master Commit: 38dbf09da2eee8155fca383b48bcc95e97d95482 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=38dbf09da2eee8155fca383… Author: YunSong Hwang <hys545(a)dreamwiz.com> Date: Mon Dec 5 12:48:33 2005 +0100 winefile: Fix an incorrect translation. --- programs/winefile/Ko.rc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/winefile/Ko.rc b/programs/winefile/Ko.rc index 13150de..602f4f0 100644 --- a/programs/winefile/Ko.rc +++ b/programs/winefile/Ko.rc @@ -29,7 +29,7 @@ LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT IDM_WINEFILE MENU FIXED IMPURE { POPUP "��(&F)" { - MENUITEM "��(&O)\OCtEnter", ID_ACTIVATE + MENUITEM "��(&O)\tEnter", ID_ACTIVATE MENUITEM "�̵�(&M)...\tF7", ID_FILE_MOVE MENUITEM "��(&C)...\tF8", ID_FILE_COPY MENUITEM "Ŭ��(&I)...\tF9", 118

1 0

Alexander N. Sørnes : Update Norwegian Bokmaal resources.
by Alexandre Julliard Dec. 5, 2005

Dec. 5, 2005

Module: wine Branch: refs/heads/master Commit: f33d726276c5f13eec0ebd7d291d0d8992400971 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=f33d726276c5f13eec0ebd7… Author: Alexander N. Sørnes <alex(a)thehandofagony.com> Date: Mon Dec 5 12:02:38 2005 +0100 Update Norwegian Bokmaal resources. --- dlls/commdlg/cdlg_No.rc | 6 ++--- dlls/iccvid/iccvid_No.rc | 25 +++++++++++++++++++++ dlls/iccvid/rsrc.rc | 1 + dlls/msvidc32/msvidc32_No.rc | 25 +++++++++++++++++++++ dlls/msvidc32/rsrc.rc | 1 + dlls/msvideo/msvfw32_No.rc | 51 ++++++++++++++++++++++++++++++++++++++++++ dlls/msvideo/rsrc.rc | 1 + programs/notepad/No.rc | 2 +- programs/regedit/No.rc | 41 ++++++++++++++++++++++++++++++++-- programs/winecfg/No.rc | 4 +++ 10 files changed, 151 insertions(+), 6 deletions(-) create mode 100644 dlls/iccvid/iccvid_No.rc create mode 100644 dlls/msvidc32/msvidc32_No.rc create mode 100644 dlls/msvideo/msvfw32_No.rc

1 0

Patrick Ammann : wininet: compilation fix
by Alexandre Julliard Dec. 5, 2005

Dec. 5, 2005

Module: wine Branch: refs/heads/master Commit: d437f37f5840cec798fa80f87450f6ae09a4ada0 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=d437f37f5840cec798fa80f… Author: Patrick Ammann <pammann(a)aro.ch> Date: Mon Dec 5 12:01:56 2005 +0100 wininet: compilation fix - make netconnection.c compile when HAVE_OPENSSL_SSL_H or HAVE_OPENSSL_ERR_H are not defined. --- dlls/wininet/netconnection.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/wininet/netconnection.c b/dlls/wininet/netconnection.c index 3c13818..f488d69 100644 --- a/dlls/wininet/netconnection.c +++ b/dlls/wininet/netconnection.c @@ -36,6 +36,8 @@ #include <stdarg.h> #include <stdlib.h> #include <string.h> +#include <stdio.h> +#include <errno.h> #include "wine/library.h" #include "windef.h" @@ -317,13 +319,13 @@ BOOL NETCON_close(WININET_NETCONNECTION } return TRUE; } - +#if defined HAVE_OPENSSL_SSL_H && defined HAVE_OPENSSL_ERR_H static BOOL check_hostname(X509 *cert, char *hostname) { /* FIXME: implement */ return TRUE; } - +#endif /****************************************************************************** * NETCON_secure_connect * Initiates a secure connection over an existing plaintext connection.

1 0

Eric Pouech : winmm: driver unloading.
by Alexandre Julliard Dec. 5, 2005

Dec. 5, 2005

Module: wine Branch: refs/heads/master Commit: 60884fc3b33a152277a15568dcccd5abe99ac530 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=60884fc3b33a152277a1556… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Mon Dec 5 12:01:26 2005 +0100 winmm: driver unloading. - properly handle drivers unloading when no session instance of the driver has been created --- dlls/winmm/driver.c | 8 ++++++-- dlls/winmm/winemm.h | 7 +++++-- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/dlls/winmm/driver.c b/dlls/winmm/driver.c index dabce42..717ba47 100644 --- a/dlls/winmm/driver.c +++ b/dlls/winmm/driver.c @@ -291,6 +291,7 @@ LPWINE_DRIVER DRIVER_TryOpenDriver32(LPC cause = "load1 failed"; goto exit; } + lpDrv->dwFlags |= WINE_GDF_SESSION; return ret; } @@ -416,8 +417,11 @@ LRESULT WINAPI CloseDriver(HDRVR hDrvr, { LPWINE_DRIVER lpDrv0; + if (lpDrv->dwFlags & WINE_GDF_SESSION) + FIXME("Shouldn't happen (%p)\n", lpDrv); /* if driver has an opened session instance, we have to close it too */ - if (DRIVER_GetNumberOfModuleRefs(lpDrv->d.d32.hModule, &lpDrv0) == 1) + if (DRIVER_GetNumberOfModuleRefs(lpDrv->d.d32.hModule, &lpDrv0) == 1 && + (lpDrv0->dwFlags & WINE_GDF_SESSION)) { DRIVER_SendMessage(lpDrv0, DRV_CLOSE, 0L, 0L); lpDrv0->d.d32.dwDriverID = 0; @@ -456,7 +460,7 @@ DWORD WINAPI GetDriverFlags(HDRVR hDrvr) TRACE("(%p)\n", hDrvr); if ((lpDrv = DRIVER_FindFromHDrvr(hDrvr)) != NULL) { - ret = WINE_GDF_EXIST | lpDrv->dwFlags; + ret = WINE_GDF_EXIST | (lpDrv->dwFlags & WINE_GDF_EXTERNAL_MASK); } return ret; } diff --git a/dlls/winmm/winemm.h b/dlls/winmm/winemm.h index 4725359..3295199 100644 --- a/dlls/winmm/winemm.h +++ b/dlls/winmm/winemm.h @@ -306,8 +306,11 @@ extern unsigned (*pFnLoadMMDrvFu extern LRESULT (*pFnMmioCallback16)(DWORD,LPMMIOINFO,UINT,LPARAM,LPARAM); extern void (WINAPI *pFnReleaseThunkLock)(DWORD*); extern void (WINAPI *pFnRestoreThunkLock)(DWORD); + /* GetDriverFlags() returned bits is not documented (nor the call itself) * Here are Wine only definitions of the bits */ -#define WINE_GDF_EXIST 0x80000000 -#define WINE_GDF_16BIT 0x10000000 +#define WINE_GDF_EXIST 0x80000000 +#define WINE_GDF_16BIT 0x10000000 +#define WINE_GDF_EXTERNAL_MASK 0xF0000000 +#define WINE_GDF_SESSION 0x00000001

1 0

Eric Pouech : dbghelp,winedbg: SYMBOL_INFO fix.
by Alexandre Julliard Dec. 5, 2005

Dec. 5, 2005

Module: wine Branch: refs/heads/master Commit: 34db4856ae0431dd0c6e14ee6e35729271070052 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=34db4856ae0431dd0c6e14e… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Mon Dec 5 12:00:54 2005 +0100 dbghelp,winedbg: SYMBOL_INFO fix. - native dbghelp returns in SYMBOL_INFO.TypeIndex the index of the type of the symbol (we were returning the symbol index instead) - fixed winedbg accordingly --- dlls/dbghelp/symbol.c | 5 +++-- dlls/dbghelp/type.c | 1 + programs/winedbg/expr.c | 6 ++---- programs/winedbg/symbol.c | 13 +++++-------- 4 files changed, 11 insertions(+), 14 deletions(-) diff --git a/dlls/dbghelp/symbol.c b/dlls/dbghelp/symbol.c index 0dfa606..c47c04c 100644 --- a/dlls/dbghelp/symbol.c +++ b/dlls/dbghelp/symbol.c @@ -443,8 +443,9 @@ static void symt_fill_sym_info(const str const char* name; DWORD64 size; - sym_info->TypeIndex = (DWORD)sym; - sym_info->info = 0; /* TBD */ + if (!symt_get_info(sym, TI_GET_TYPE, &sym_info->TypeIndex)) + sym_info->TypeIndex = 0; + sym_info->info = (DWORD)sym; symt_get_info(sym, TI_GET_LENGTH, &size); sym_info->Size = (DWORD)size; sym_info->ModBase = module->module.BaseOfImage; diff --git a/dlls/dbghelp/type.c b/dlls/dbghelp/type.c index 7617be8..fba6942 100644 --- a/dlls/dbghelp/type.c +++ b/dlls/dbghelp/type.c @@ -718,6 +718,7 @@ BOOL symt_get_info(const struct symt* ty default: FIXME("Unsupported sym-tag %s for get-type\n", symt_get_tag_str(type->tag)); + case SymTagPublicSymbol: case SymTagThunk: return FALSE; } diff --git a/programs/winedbg/expr.c b/programs/winedbg/expr.c index 848eb91..5eb4d49 100644 --- a/programs/winedbg/expr.c +++ b/programs/winedbg/expr.c @@ -461,10 +461,8 @@ struct dbg_lvalue expr_eval(struct expr* exp->un.call.result = 0; #endif rtn.cookie = DLV_HOST; - /* get function signature type */ - types_get_info(&rtn.type, TI_GET_TYPE, &rtn.type); - /* and now, return type */ - types_get_info(&rtn.type, TI_GET_TYPE, &rtn.type); + /* get return type from function signature tupe */ + types_get_info(&rtn.type, TI_GET_TYPE, &rtn.type.id); rtn.addr.Offset = (unsigned int)&exp->un.call.result; break; case EXPR_TYPE_INTVAR: diff --git a/programs/winedbg/symbol.c b/programs/winedbg/symbol.c index 61ef3dc..f7dcfce 100644 --- a/programs/winedbg/symbol.c +++ b/programs/winedbg/symbol.c @@ -40,6 +40,7 @@ static BOOL symbol_get_debug_start(DWORD int i; struct dbg_type type; + if (!typeid) return FALSE; /* native dbghelp not always fills the info field */ type.module = mod_base; type.id = typeid; @@ -134,7 +135,7 @@ static BOOL CALLBACK sgv_cb(SYMBOL_INFO* if (sgv->lineno == -1) { if (!sgv->bp_disp || - !symbol_get_debug_start(sym->ModBase, sym->TypeIndex, &addr)) + !symbol_get_debug_start(sym->ModBase, sym->info, &addr)) addr = sym->Address; } else @@ -185,9 +186,7 @@ static BOOL CALLBACK sgv_cb(SYMBOL_INFO* sgv->syms[insp].lvalue.addr.Mode = AddrModeFlat; sgv->syms[insp].lvalue.addr.Offset = addr; sgv->syms[insp].lvalue.type.module = sym->ModBase; - sgv->syms[insp].lvalue.type.id = sym->TypeIndex; - types_get_info(&sgv->syms[insp].lvalue.type, TI_GET_TYPE, - &sgv->syms[insp].lvalue.type.id); + sgv->syms[insp].lvalue.type.id = sym->TypeIndex; sgv->syms[insp].flags = sym->Flags; sgv->num++; @@ -463,7 +462,7 @@ enum dbg_line_status symbol_get_function if (!SymGetLineFromAddr(dbg_curr_process->handle, lin, &disp, &il)) return dbg_no_line_info; - if (symbol_get_debug_start(sym->ModBase, sym->TypeIndex, &start) && lin < start) + if (symbol_get_debug_start(sym->ModBase, sym->info, &start) && lin < start) return dbg_not_on_a_line_number; if (!sym->Size) sym->Size = 0x100000; if (il.FileName && il.FileName[0] && disp < sym->Size) @@ -545,7 +544,6 @@ static BOOL CALLBACK info_locals_cb(SYMB dbg_printf("\t"); type.module = sym->ModBase; type.id = sym->TypeIndex; - types_get_info(&type, TI_GET_TYPE, &type.id); types_print_type(&type, FALSE); if (sym->Flags & SYMFLAG_PARAMETER) explain = "parameter"; @@ -624,8 +622,7 @@ static BOOL CALLBACK symbols_info_cb(SYM type.id = sym->TypeIndex; type.module = sym->ModBase; - if (sym->TypeIndex != dbg_itype_none && sym->TypeIndex != 0 && - types_get_info(&type, TI_GET_TYPE, &type.id)) + if (sym->TypeIndex != dbg_itype_none && sym->TypeIndex != 0) { dbg_printf(" "); types_print_type(&type, FALSE);

1 0

Michael Stefaniuc : Fix VarBstrCmp for NULL input BSTRs (MSDN is wrong).
by Alexandre Julliard Dec. 5, 2005

Dec. 5, 2005

Module: wine Branch: refs/heads/master Commit: 8ec390676890a64e4c32a060a3340fed7350d5eb URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=8ec390676890a64e4c32a06… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Dec 5 12:00:24 2005 +0100 Fix VarBstrCmp for NULL input BSTRs (MSDN is wrong). --- dlls/oleaut32/tests/vartype.c | 32 ++++++++++++++++++++++++++++++++ dlls/oleaut32/vartype.c | 18 ++++++++---------- 2 files changed, 40 insertions(+), 10 deletions(-) diff --git a/dlls/oleaut32/tests/vartype.c b/dlls/oleaut32/tests/vartype.c index 9beaa35..d77655c 100644 --- a/dlls/oleaut32/tests/vartype.c +++ b/dlls/oleaut32/tests/vartype.c @@ -516,6 +516,7 @@ static HRESULT (WINAPI *pVarBoolFromUI8) static HRESULT (WINAPI *pVarBstrFromR4)(FLOAT,LCID,ULONG,BSTR*); static HRESULT (WINAPI *pVarBstrFromDate)(DATE,LCID,ULONG,BSTR*); static HRESULT (WINAPI *pVarBstrFromDec)(DECIMAL*,LCID,ULONG,BSTR*); +static HRESULT (WINAPI *pVarBstrCmp)(BSTR,BSTR,LCID,ULONG); static HRESULT (WINAPI *pVarCmp)(LPVARIANT,LPVARIANT,LCID,ULONG); @@ -4960,6 +4961,36 @@ static void test_VarBstrFromDec(void) #undef BSTR_DEC #undef BSTR_DEC64 +#define _VARBSTRCMP(left,right,lcid,flags,result) \ + hres = pVarBstrCmp(left,right,lcid,flags); \ + ok(hres == result, "VarBstrCmp: expected " #result ", got hres=0x%lx\n", hres) +#define VARBSTRCMP(left,right,result) \ + _VARBSTRCMP(left,right,lcid,0,result) + +static void test_VarBstrCmp(void) +{ + LCID lcid; + HRESULT hres; + static const WCHAR sz[] = {'W','u','r','s','c','h','t','\0'}; + static const WCHAR szempty[] = {'\0'}; + BSTR bstr, bstrempty; + + CHECKPTR(VarBstrCmp); + + lcid = MAKELCID(MAKELANGID(LANG_ENGLISH,SUBLANG_ENGLISH_US),SORT_DEFAULT); + bstr = SysAllocString(sz); + bstrempty = SysAllocString(szempty); + + /* NULL handling. Yepp, MSDN is totaly wrong here */ + VARBSTRCMP(NULL,NULL,VARCMP_EQ); + VARBSTRCMP(bstr,NULL,VARCMP_GT); + VARBSTRCMP(NULL,bstr,VARCMP_LT); + + /* NULL and empty string comparisions */ + VARBSTRCMP(bstrempty,NULL,VARCMP_EQ); + VARBSTRCMP(NULL,bstrempty,VARCMP_EQ); +} + /* Get the internal representation of a BSTR */ static inline LPINTERNAL_BSTR Get(const BSTR lpszString) { @@ -5968,6 +5999,7 @@ START_TEST(vartype) test_VarBstrFromR4(); test_VarBstrFromDate(); test_VarBstrFromDec(); + test_VarBstrCmp(); test_SysStringLen(); test_SysStringByteLen(); test_SysAllocString(); diff --git a/dlls/oleaut32/vartype.c b/dlls/oleaut32/vartype.c index 2075827..1214752 100644 --- a/dlls/oleaut32/vartype.c +++ b/dlls/oleaut32/vartype.c @@ -6599,23 +6599,21 @@ HRESULT WINAPI VarBstrCat(BSTR pbstrLeft * RETURNS * VARCMP_LT, VARCMP_EQ or VARCMP_GT indicating that pbstrLeft is less * than, equal to or greater than pbstrRight respectively. - * VARCMP_NULL is returned if either string is NULL, unless both are NULL - * in which case VARCMP_EQ is returned. + * + * NOTES + * VARCMP_NULL is NOT returned if either string is NULL unlike MSDN + * states. A NULL BSTR pointer is equivalent to an empty string. */ HRESULT WINAPI VarBstrCmp(BSTR pbstrLeft, BSTR pbstrRight, LCID lcid, DWORD dwFlags) { - if (!pbstrLeft) + if (!pbstrLeft || !*pbstrLeft) { if (!pbstrRight || !*pbstrRight) return VARCMP_EQ; - return VARCMP_NULL; - } - else if (!pbstrRight) - { - if (!*pbstrLeft) - return VARCMP_EQ; - return VARCMP_NULL; + return VARCMP_LT; } + else if (!pbstrRight || !*pbstrRight) + return VARCMP_GT; return CompareStringW(lcid, dwFlags, pbstrLeft, -1, pbstrRight, -1) - 1; }

1 0

Milko Krachounov : Update the Bulgarian resources for commdlg and regedit.
by Alexandre Julliard Dec. 5, 2005

Dec. 5, 2005

Module: wine Branch: refs/heads/master Commit: 58e156b5e8e490d3c119cd11f36fdc09407f3015 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=58e156b5e8e490d3c119cd1… Author: Milko Krachounov <milko(a)3mhz.net> Date: Mon Dec 5 12:00:04 2005 +0100 Update the Bulgarian resources for commdlg and regedit. --- dlls/commdlg/cdlg_Bg.rc | 6 +++--- programs/regedit/Bg.rc | 20 ++++++++++++++++++-- 2 files changed, 21 insertions(+), 5 deletions(-) diff --git a/dlls/commdlg/cdlg_Bg.rc b/dlls/commdlg/cdlg_Bg.rc index 3dafd69..33a756a 100644 --- a/dlls/commdlg/cdlg_Bg.rc +++ b/dlls/commdlg/cdlg_Bg.rc @@ -406,9 +406,9 @@ �� .\n�� PD32_OUT_OF_MEMORY "�� ." PD32_GENERIC_ERROR "�� ." PD32_DRIVER_UNKNOWN "�� ." - PD32_NO_DEVICES "Before you can perform printer-related tasks \ -such as page setup or printing a document, you need to install a printer. \ -Please install one and retry." + PD32_NO_DEVICES "�� , \ +�� , \ +�� . �� ." PD32_DEFAULT_PRINTER "�� ; " PD32_NR_OF_DOCUMENTS_IN_QUEUE "�� %d �� " diff --git a/programs/regedit/Bg.rc b/programs/regedit/Bg.rc index 5e29842..e40c216 100644 --- a/programs/regedit/Bg.rc +++ b/programs/regedit/Bg.rc @@ -59,8 +59,8 @@ BEGIN MENUITEM SEPARATOR MENUITEM "&�� ", ID_EDIT_COPYKEYNAME MENUITEM SEPARATOR - MENUITEM "&��\tCtrl+F", ID_EDIT_FIND, GRAYED - MENUITEM "�� &��\tF3", ID_EDIT_FINDNEXT, GRAYED + MENUITEM "&��\tCtrl+F", ID_EDIT_FIND + MENUITEM "�� &��\tF3", ID_EDIT_FINDNEXT END POPUP "&��" BEGIN @@ -130,6 +130,22 @@ BEGIN DEFPUSHBUTTON "OK",IDOK,195,6,30,11,WS_GROUP END +IDD_FIND DIALOG DISCARDABLE 22, 17, 210, 85 +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +CAPTION "��" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "��:",IDC_STATIC,5,7,119,8 + EDITTEXT IDC_VALUE_NAME,40,5,125,12, WS_BORDER | WS_TABSTOP | ES_AUTOHSCROLL + LTEXT "�� :",IDC_STATIC,5, 22, 119, 8 + CHECKBOX "��", IDC_FIND_KEYS, 5, 34, 90, 10, WS_TABSTOP | WS_GROUP | BS_AUTOCHECKBOX + CHECKBOX "�� ", IDC_FIND_VALUES, 5, 46, 90, 10, WS_TABSTOP | BS_AUTOCHECKBOX + CHECKBOX "�� ", IDC_FIND_CONTENT, 5, 58, 90, 10, WS_TABSTOP | BS_AUTOCHECKBOX + CHECKBOX "�� ", IDC_FIND_WHOLE, 5, 70, 90, 10, WS_TABSTOP | BS_AUTOCHECKBOX + DEFPUSHBUTTON "��",IDOK,175,5,30,11,WS_GROUP + PUSHBUTTON "��",IDCANCEL,175,22,30,11, WS_GROUP +END + IDD_ADDFAVORITE DIALOG DISCARDABLE 22, 17, 210, 55 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "�� "

1 0

Marcus Meissner : winsock: Rewrote mappers to use sizeof() based loops.
by Alexandre Julliard Dec. 5, 2005

Dec. 5, 2005

Module: wine Branch: refs/heads/master Commit: 851328cd853f9c443d746eba76d1c067b146f2f1 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=851328cd853f9c443d746eb… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Mon Dec 5 11:59:43 2005 +0100 winsock: Rewrote mappers to use sizeof() based loops. Added IPPROTO_IP and AF_UNSPEC to the mappers. --- dlls/winsock/socket.c | 38 +++++++++++++------------------------- 1 files changed, 13 insertions(+), 25 deletions(-) diff --git a/dlls/winsock/socket.c b/dlls/winsock/socket.c index db903f7..e83e747 100644 --- a/dlls/winsock/socket.c +++ b/dlls/winsock/socket.c @@ -260,7 +260,6 @@ static const int ws_sock_map[][2] = #ifdef SO_SNDTIMEO MAP_OPTION( SO_SNDTIMEO ), #endif - { 0, 0 } }; static const int ws_tcp_map[][2] = @@ -268,7 +267,6 @@ static const int ws_tcp_map[][2] = #ifdef TCP_NODELAY MAP_OPTION( TCP_NODELAY ), #endif - { 0, 0 } }; static const int ws_ip_map[][2] = @@ -284,17 +282,16 @@ static const int ws_ip_map[][2] = #endif MAP_OPTION( IP_TOS ), MAP_OPTION( IP_TTL ), - { 0, 0 } }; static const int ws_af_map[][2] = { + MAP_OPTION( AF_UNSPEC ), MAP_OPTION( AF_INET ), MAP_OPTION( AF_INET6 ), #ifdef HAVE_IPX MAP_OPTION( AF_IPX ), #endif - { 0, 0 } }; static const int ws_socktype_map[][2] = @@ -302,17 +299,16 @@ static const int ws_socktype_map[][2] = MAP_OPTION( SOCK_DGRAM ), MAP_OPTION( SOCK_STREAM ), MAP_OPTION( SOCK_RAW ), - { 0, 0 } }; static const int ws_proto_map[][2] = { + MAP_OPTION( IPPROTO_IP ), MAP_OPTION( IPPROTO_TCP ), MAP_OPTION( IPPROTO_UDP ), MAP_OPTION( IPPROTO_ICMP ), MAP_OPTION( IPPROTO_IGMP ), MAP_OPTION( IPPROTO_RAW ), - { 0, 0 } }; static const int ws_aiflag_map[][2] = @@ -323,7 +319,6 @@ static const int ws_aiflag_map[][2] = /* Linux/UNIX knows a lot more. But Windows only * has 3 as far as I could see. -Marcus */ - { 0, 0 } }; static const int ws_eai_map[][2] = @@ -531,8 +526,7 @@ static int convert_sockopt(INT *level, I { case WS_SOL_SOCKET: *level = SOL_SOCKET; - for(i=0; ws_sock_map[i][0]; i++) - { + for(i=0; i<sizeof(ws_sock_map)/sizeof(ws_sock_map[0]); i++) { if( ws_sock_map[i][0] == *optname ) { *optname = ws_sock_map[i][1]; @@ -543,8 +537,7 @@ static int convert_sockopt(INT *level, I break; case WS_IPPROTO_TCP: *level = IPPROTO_TCP; - for(i=0; ws_tcp_map[i][0]; i++) - { + for(i=0; i<sizeof(ws_tcp_map)/sizeof(ws_tcp_map[0]); i++) { if ( ws_tcp_map[i][0] == *optname ) { *optname = ws_tcp_map[i][1]; @@ -555,8 +548,7 @@ static int convert_sockopt(INT *level, I break; case WS_IPPROTO_IP: *level = IPPROTO_IP; - for(i=0; ws_ip_map[i][0]; i++) - { + for(i=0; i<sizeof(ws_ip_map)/sizeof(ws_ip_map[0]); i++) { if (ws_ip_map[i][0] == *optname ) { *optname = ws_ip_map[i][1]; @@ -727,7 +719,7 @@ static int convert_af_w2u(int windowsaf) { int i; - for (i=0;ws_af_map[i][0];i++) + for (i=0;i<sizeof(ws_af_map)/sizeof(ws_af_map[0]);i++) if (ws_af_map[i][0] == windowsaf) return ws_af_map[i][1]; FIXME("unhandled Windows address family %d\n", windowsaf); @@ -738,7 +730,7 @@ static int convert_af_u2w(int unixaf) { int i; - for (i=0;ws_af_map[i][0];i++) + for (i=0;i<sizeof(ws_af_map)/sizeof(ws_af_map[0]);i++) if (ws_af_map[i][1] == unixaf) return ws_af_map[i][0]; FIXME("unhandled UNIX address family %d\n", unixaf); @@ -749,7 +741,7 @@ static int convert_proto_w2u(int windowsproto) { int i; - for (i=0;ws_proto_map[i][0];i++) + for (i=0;i<sizeof(ws_proto_map)/sizeof(ws_proto_map[0]);i++) if (ws_proto_map[i][0] == windowsproto) return ws_proto_map[i][1]; FIXME("unhandled Windows socket protocol %d\n", windowsproto); @@ -760,11 +752,9 @@ static int convert_proto_u2w(int unixproto) { int i; - for (i=0;ws_proto_map[i][0];i++) + for (i=0;i<sizeof(ws_proto_map)/sizeof(ws_proto_map[0]);i++) if (ws_proto_map[i][1] == unixproto) return ws_proto_map[i][0]; - if (unixproto == 0) /* 0 is ok too as wild card */ - return 0; FIXME("unhandled UNIX socket protocol %d\n", unixproto); return -1; } @@ -773,7 +763,7 @@ static int convert_socktype_w2u(int windowssocktype) { int i; - for (i=0;ws_socktype_map[i][0];i++) + for (i=0;i<sizeof(ws_socktype_map)/sizeof(ws_socktype_map[0]);i++) if (ws_socktype_map[i][0] == windowssocktype) return ws_socktype_map[i][1]; FIXME("unhandled Windows socket type %d\n", windowssocktype); @@ -784,7 +774,7 @@ static int convert_socktype_u2w(int unixsocktype) { int i; - for (i=0;ws_socktype_map[i][0];i++) + for (i=0;i<sizeof(ws_socktype_map)/sizeof(ws_socktype_map[0]);i++) if (ws_socktype_map[i][1] == unixsocktype) return ws_socktype_map[i][0]; FIXME("unhandled UNIX socket type %d\n", unixsocktype); @@ -3089,12 +3079,11 @@ void WINAPI WS_freeaddrinfo(struct WS_ad static int convert_aiflag_w2u(int winflags) { int i, unixflags = 0; - for (i=0;ws_aiflag_map[i][0];i++) { + for (i=0;i<sizeof(ws_aiflag_map)/sizeof(ws_aiflag_map[0]);i++) if (ws_aiflag_map[i][0] & winflags) { unixflags |= ws_aiflag_map[i][1]; winflags &= ~ws_aiflag_map[i][0]; } - } if (winflags) FIXME("Unhandled windows AI_xxx flags %x\n", winflags); return unixflags; @@ -3103,12 +3092,11 @@ static int convert_aiflag_w2u(int winfla static int convert_aiflag_u2w(int unixflags) { int i, winflags = 0; - for (i=0;ws_aiflag_map[i][0];i++) { + for (i=0;i<sizeof(ws_aiflag_map)/sizeof(ws_aiflag_map[0]);i++) if (ws_aiflag_map[i][1] & unixflags) { winflags |= ws_aiflag_map[i][0]; unixflags &= ~ws_aiflag_map[i][1]; } - } if (unixflags) /* will warn usually */ WARN("Unhandled UNIX AI_xxx flags %x\n", unixflags); return winflags;

1 0

lostwages/ news/2005120201.xml wwn/wn20051202_ ...
by WineHQ Dec. 5, 2005

Dec. 5, 2005

ChangeSet ID: 21659 CVSROOT: /opt/cvs-commit Module name: lostwages Changes by: wineowner(a)winehq.org 2005/12/04 23:29:39 Added files: news : 2005120201.xml wwn : wn20051202_300.xml Log message: WWN #300. Patch: http://cvs.winehq.org/patch.py?id=21659 Old revision New revision Changes Path Added 1.1 +0 -0 lostwages/news/2005120201.xml Added 1.1 +0 -0 lostwages/wwn/wn20051202_300.xml

1 0

appdb/include application.php version.php
by WineHQ Dec. 5, 2005

Dec. 5, 2005

ChangeSet ID: 21658 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2005/12/04 22:19:14 Modified files: include : application.php version.php Log message: Chris Morgan <cmorgan(a)alum.wpi.edu> Fix SendNotificationEmail() so it appends to the existing message in the 'edit' case instead of overwriting the message passed in Patch: http://cvs.winehq.org/patch.py?id=21658 Old revision New revision Changes Path 1.38 1.39 +1 -1 appdb/include/application.php 1.43 1.44 +1 -1 appdb/include/version.php Index: appdb/include/application.php diff -u -p appdb/include/application.php:1.38 appdb/include/application.php:1.39 --- appdb/include/application.php:1.38 5 Dec 2005 4:19:14 -0000 +++ appdb/include/application.php 5 Dec 2005 4:19:14 -0000 @@ -376,7 +376,7 @@ class Application { break; case "edit": $sSubject = $this->sName." has been modified by ".$_SESSION['current']->sRealname; - $sMsg = APPDB_ROOT."appview.php?appId=".$this->iAppId."\n"; + $sMsg .= APPDB_ROOT."appview.php?appId=".$this->iAppId."\n"; addmsg("Application modified.", "green"); break; case "delete": Index: appdb/include/version.php diff -u -p appdb/include/version.php:1.43 appdb/include/version.php:1.44 --- appdb/include/version.php:1.43 5 Dec 2005 4:19:14 -0000 +++ appdb/include/version.php 5 Dec 2005 4:19:14 -0000 @@ -486,7 +486,7 @@ class Version { break; case "edit": $sSubject = "'".$oApp->sName." ".$this->sName."' has been modified by ".$_SESSION['current']->sRealname; - $sMsg = APPDB_ROOT."appview.php?versionId=".$this->iVersionId."\n"; + $sMsg .= APPDB_ROOT."appview.php?versionId=".$this->iVersionId."\n"; addmsg("Version modified.", "green"); break; case "delete":

1 0

Robert Shearman : OLE: Support HREFTYPEs For ITypeInfos
by Alexandre Julliard Dec. 3, 2005

Dec. 3, 2005

Module: wine Branch: refs/heads/master Commit: 190d05f4db08190b86517832a5608325da9734e3 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=190d05f4db08190b8651783… Author: Robert Shearman <rob(a)codeweavers.com> Date: Sat Dec 3 18:20:27 2005 +0100 OLE: Support HREFTYPEs For ITypeInfos Add support for reading the hreftype of a typeinfo, return it to the application in ITypeComp_Bind for the DESKIND_APPOBJECT case and support referencing it in ITypeInfo_GetRefTypeInfo. --- dlls/oleaut32/typelib.c | 32 ++++++++++++++++++++++++++++++-- 1 files changed, 30 insertions(+), 2 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 3e4b83b..4d8a736 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -976,6 +976,7 @@ typedef struct tagITypeInfoImpl TYPEATTR TypeAttr ; /* _lots_ of type information. */ ITypeLibImpl * pTypeLib; /* back pointer to typelib */ int index; /* index in this typelib; */ + HREFTYPE hreftype; /* hreftype for app object binding */ /* type libs seem to store the doc strings in ascii * so why should we do it in unicode? */ @@ -1448,6 +1449,22 @@ static void MSFT_ReadGuid( GUID *pGuid, TRACE_(typelib)("%s\n", debugstr_guid(pGuid)); } +static HREFTYPE MSFT_ReadHreftype( TLBContext *pcx, int offset ) +{ + MSFT_NameIntro niName; + + if (offset < 0) + { + ERR_(typelib)("bad offset %d\n", offset); + return -1; + } + + MSFT_ReadLEDWords(&niName, sizeof(niName), pcx, + pcx->pTblDir->pNametab.offset+offset); + + return niName.hreftype; +} + static BSTR MSFT_ReadName( TLBContext *pcx, int offset) { char * name; @@ -2057,6 +2074,7 @@ static ITypeInfoImpl * MSFT_DoTypeInfo( /* name, eventually add to a hash table */ ptiRet->Name=MSFT_ReadName(pcx, tiBase.NameOffset); + ptiRet->hreftype = MSFT_ReadHreftype(pcx, tiBase.NameOffset); TRACE_(typelib)("reading %s\n", debugstr_w(ptiRet->Name)); /* help info */ ptiRet->DocString=MSFT_ReadString(pcx, tiBase.docstringoffs); @@ -4111,7 +4129,7 @@ static HRESULT WINAPI ITypeLibComp_fnBin TYPEDESC tdesc_appobject = { { - 0 /* FIXME */ + (TYPEDESC *)pTypeInfo->hreftype }, VT_USERDEFINED }; @@ -4153,6 +4171,9 @@ static HRESULT WINAPI ITypeLibComp_fnBin } if (subtypeinfo) ITypeInfo_Release(subtypeinfo); + if (pTypeInfo->hreftype == -1) + FIXME("no hreftype for interface %p\n", pTypeInfo); + hr = TLB_AllocAndInitVarDesc(&vardesc_appobject, &pBindPtr->lpvardesc); if (FAILED(hr)) return hr; @@ -4202,6 +4223,7 @@ static ITypeInfo2 * WINAPI ITypeInfo_Con pTypeInfoImpl->lpVtbl = &tinfvt; pTypeInfoImpl->lpVtblTypeComp = &tcompvt; pTypeInfoImpl->ref=1; + pTypeInfoImpl->hreftype = -1; } TRACE("(%p)\n", pTypeInfoImpl); return (ITypeInfo2*) pTypeInfoImpl; @@ -5535,7 +5557,13 @@ static HRESULT WINAPI ITypeInfo_fnGetRef ITypeInfoImpl *This = (ITypeInfoImpl *)iface; HRESULT result = E_FAIL; - if (hRefType == -1 && + if ((This->hreftype != -1) && (This->hreftype == hRefType)) + { + *ppTInfo = (ITypeInfo *)&This->lpVtbl; + ITypeInfo_AddRef(*ppTInfo); + result = S_OK; + } + else if (hRefType == -1 && (((ITypeInfoImpl*) This)->TypeAttr.typekind == TKIND_DISPATCH) && (((ITypeInfoImpl*) This)->TypeAttr.wTypeFlags & TYPEFLAG_FDUAL)) {

1 0

Robert Shearman : OLE: fix function name loading
by Alexandre Julliard Dec. 3, 2005

Dec. 3, 2005

Module: wine Branch: refs/heads/master Commit: d8d1693def4dea73b60d9ce0786bf938a0a6f7cc URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=d8d1693def4dea73b60d9ce… Author: Robert Shearman <rob(a)codeweavers.com> Date: Sat Dec 3 18:20:03 2005 +0100 OLE: fix function name loading Correctly get the name of the second function of a propget/propput pair in MSFT typelibs when the name offset is set to -1. --- dlls/oleaut32/typelib.c | 11 ++++++++++- 1 files changed, 10 insertions(+), 1 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 07fa031..3e4b83b 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -1685,6 +1685,7 @@ MSFT_DoFuncs(TLBContext* pcx, char recbuf[512]; MSFT_FuncRecord * pFuncRec=(MSFT_FuncRecord *) recbuf; + TLBFuncDesc *ptfd_prev = NULL; TRACE_(typelib)("\n"); @@ -1698,7 +1699,12 @@ MSFT_DoFuncs(TLBContext* pcx, MSFT_ReadLEDWords(&nameoffset, sizeof(INT), pcx, offset + infolen + (cFuncs + cVars + i + 1) * sizeof(INT)); - (*pptfd)->Name = MSFT_ReadName(pcx, nameoffset); + /* nameoffset is sometimes -1 on the second half of a propget/propput + * pair of functions */ + if ((nameoffset == -1) && (i > 0)) + (*pptfd)->Name = SysAllocString(ptfd_prev->Name); + else + (*pptfd)->Name = MSFT_ReadName(pcx, nameoffset); /* read the function information record */ MSFT_ReadLEDWords(&reclength, sizeof(INT), pcx, recoffset); @@ -1844,6 +1850,8 @@ MSFT_DoFuncs(TLBContext* pcx, MSFT_ReadValue(&(pParamDesc->pparamdescex->varDefaultValue), pInt[j], pcx); } + else + elemdesc->u.paramdesc.pparamdescex = NULL; /* custom info */ if ( nrattributes > 7 + j && pFuncRec->FKCCIC & 0x80 ) { @@ -1867,6 +1875,7 @@ MSFT_DoFuncs(TLBContext* pcx, (*pptfd)->funcdesc.cScodes = 0 ; (*pptfd)->funcdesc.lprgscode = NULL ; + ptfd_prev = *pptfd; pptfd = & ((*pptfd)->next); recoffset += reclength; }

1 0

Robert Shearman : OLE: fix invoking dispinterface functions
by Alexandre Julliard Dec. 3, 2005

Dec. 3, 2005

Module: wine Branch: refs/heads/master Commit: bd8fefd66b8457c39420ee146a6bd42effe7ee49 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=bd8fefd66b8457c39420ee1… Author: Robert Shearman <rob(a)codeweavers.com> Date: Sat Dec 3 18:19:17 2005 +0100 OLE: fix invoking dispinterface functions Fix invoking dispinterface functions by using the internal representation of the function, not the one returned to applications. --- dlls/oleaut32/typelib.c | 19 +++++++++++-------- 1 files changed, 11 insertions(+), 8 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 8e37ea9..07fa031 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -5185,25 +5185,29 @@ static HRESULT WINAPI ITypeInfo_fnInvoke { ITypeInfoImpl *This = (ITypeInfoImpl *)iface; int i; - unsigned int func_index, var_index; + unsigned int var_index; TYPEKIND type_kind; HRESULT hres; + const TLBFuncDesc *pFuncInfo; TRACE("(%p)(%p,id=%ld,flags=0x%08x,%p,%p,%p,%p) partial stub!\n", This,pIUnk,memid,dwFlags,pDispParams,pVarResult,pExcepInfo,pArgErr ); dump_DispParms(pDispParams); - hres = ITypeInfo2_GetFuncIndexOfMemId(iface, memid, dwFlags, &func_index); - if (SUCCEEDED(hres)) { - FUNCDESC *func_desc; + /* we do this instead of using GetFuncDesc since it will return a fake + * FUNCDESC for dispinterfaces and we want the real function description */ + for (pFuncInfo = This->funclist; pFuncInfo; pFuncInfo=pFuncInfo->next) + if (memid == pFuncInfo->funcdesc.memid && (dwFlags & pFuncInfo->funcdesc.invkind)) + break; + + if (pFuncInfo) { + const FUNCDESC *func_desc = &pFuncInfo->funcdesc; - hres = ITypeInfo2_GetFuncDesc(iface, func_index, &func_desc); - if(FAILED(hres)) return hres; if (TRACE_ON(ole)) { TRACE("invoking:\n"); - dump_FUNCDESC(func_desc); + dump_TLBFuncDesc(pFuncInfo); } switch (func_desc->funckind) { @@ -5376,7 +5380,6 @@ func_fail: break; } - ITypeInfo2_ReleaseFuncDesc(iface, func_desc); TRACE("-- 0x%08lx\n", hres); return hres;

1 0

H. Verbeet : wined3d: Return the correct parent in IWineD3DPixelShaderImpl_GetParent.
by Alexandre Julliard Dec. 3, 2005

Dec. 3, 2005

Module: wine Branch: refs/heads/master Commit: 246b07de7c6390f59b48f997c8e3038cc182e95d URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=246b07de7c6390f59b48f99… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Sat Dec 3 18:10:56 2005 +0100 wined3d: Return the correct parent in IWineD3DPixelShaderImpl_GetParent. Remove an unnecessary cast. --- dlls/wined3d/pixelshader.c | 2 +- dlls/wined3d/vertexshader.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/pixelshader.c b/dlls/wined3d/pixelshader.c index a22f39b..123b3a5 100644 --- a/dlls/wined3d/pixelshader.c +++ b/dlls/wined3d/pixelshader.c @@ -100,7 +100,7 @@ ULONG WINAPI IWineD3DPixelShaderImpl_Rel HRESULT WINAPI IWineD3DPixelShaderImpl_GetParent(IWineD3DPixelShader *iface, IUnknown** parent){ IWineD3DPixelShaderImpl *This = (IWineD3DPixelShaderImpl *)iface; - *parent= (IUnknown*) parent; + *parent = This->parent; IUnknown_AddRef(*parent); TRACE("(%p) : returning %p\n", This, *parent); return D3D_OK; diff --git a/dlls/wined3d/vertexshader.c b/dlls/wined3d/vertexshader.c index ce5258d..af7a566 100644 --- a/dlls/wined3d/vertexshader.c +++ b/dlls/wined3d/vertexshader.c @@ -2012,7 +2012,7 @@ ULONG WINAPI IWineD3DVertexShaderImpl_Re HRESULT WINAPI IWineD3DVertexShaderImpl_GetParent(IWineD3DVertexShader *iface, IUnknown** parent){ IWineD3DVertexShaderImpl *This = (IWineD3DVertexShaderImpl *)iface; - *parent = (IUnknown*)This->parent; + *parent = This->parent; IUnknown_AddRef(*parent); TRACE("(%p) : returning %p\n", This, *parent); return D3D_OK;

1 0

H. Verbeet : wined3d: Set pixel shader version correctly in IWineD3DPixelShaderImpl_SetFunction.
by Alexandre Julliard Dec. 3, 2005

Dec. 3, 2005

Module: wine Branch: refs/heads/master Commit: c73679e4ebe68a505a261aa28d58de7b965c190d URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=c73679e4ebe68a505a261aa… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Sat Dec 3 18:18:58 2005 +0100 wined3d: Set pixel shader version correctly in IWineD3DPixelShaderImpl_SetFunction. --- dlls/wined3d/pixelshader.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/pixelshader.c b/dlls/wined3d/pixelshader.c index 123b3a5..4f868ee 100644 --- a/dlls/wined3d/pixelshader.c +++ b/dlls/wined3d/pixelshader.c @@ -1664,7 +1664,7 @@ HRESULT WINAPI IWineD3DPixelShaderImpl_S if (NULL != pToken) { while (D3DPS_END() != *pToken) { if (pshader_is_version_token(*pToken)) { /** version */ - version = *pToken & 0xFF; + version = (((*pToken >> 8) & 0x0F) * 10) + (*pToken & 0x0F); TRACE("ps_%lu_%lu\n", (*pToken >> 8) & 0x0F, (*pToken & 0x0F)); ++pToken; ++len;

1 0

Robert Shearman : OLE: Move the dispinterface return value handling to functions that
by Alexandre Julliard Dec. 3, 2005

Dec. 3, 2005

Module: wine Branch: refs/heads/master Commit: d48f6f36827dc12fd194fce6bc2c7b786fcb7b69 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=d48f6f36827dc12fd194fce… Author: Robert Shearman <rob(a)codeweavers.com> Date: Sat Dec 3 18:10:30 2005 +0100 OLE: Move the dispinterface return value handling to functions that return the FUNCDESC to the user. --- dlls/oleaut32/typelib.c | 76 +++++++++++++++++++++++++---------------------- 1 files changed, 41 insertions(+), 35 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 32c2780..8e37ea9 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -1863,38 +1863,6 @@ MSFT_DoFuncs(TLBContext* pcx, } } - /* special treatment for dispinterfaces: this makes functions appear - * to return their [retval] value when it is really returning an - * HRESULT */ - if ((pTI->TypeAttr.typekind == TKIND_DISPATCH) && - (*pptfd)->funcdesc.elemdescFunc.tdesc.vt == VT_HRESULT) - { - if (pFuncRec->nrargs && - ((*pptfd)->funcdesc.lprgelemdescParam[pFuncRec->nrargs - 1].u.paramdesc.wParamFlags & PARAMFLAG_FRETVAL)) - { - ELEMDESC *elemdesc = &(*pptfd)->funcdesc.lprgelemdescParam[pFuncRec->nrargs - 1]; - if (elemdesc->tdesc.vt != VT_PTR) - { - ERR_(typelib)("elemdesc should have started with VT_PTR instead of:\n"); - if (ERR_ON(typelib)) - dump_ELEMDESC(elemdesc); - /* FIXME: return error */ - break; - } - - (*pptfd)->funcdesc.elemdescFunc = *elemdesc; - - /* dereference parameter */ - (*pptfd)->funcdesc.elemdescFunc.tdesc = *elemdesc->tdesc.u.lptdesc; - - pFuncRec->nrargs--; - (*pptfd)->funcdesc.cParams = pFuncRec->nrargs; - } - else - (*pptfd)->funcdesc.elemdescFunc.tdesc.vt = VT_VOID; - - } - /* scode is not used: archaic win16 stuff FIXME: right? */ (*pptfd)->funcdesc.cScodes = 0 ; (*pptfd)->funcdesc.lprgscode = NULL ; @@ -4403,7 +4371,7 @@ static void TLB_FreeElemDesc( ELEMDESC * VariantClear(&elemdesc->u.paramdesc.pparamdescex->varDefaultValue); } -static HRESULT TLB_AllocAndInitFuncDesc( const FUNCDESC *src, FUNCDESC **dest_ptr ) +static HRESULT TLB_AllocAndInitFuncDesc( const FUNCDESC *src, FUNCDESC **dest_ptr, BOOL dispinterface ) { FUNCDESC *dest; char *buffer; @@ -4454,6 +4422,38 @@ static HRESULT TLB_AllocAndInitFuncDesc( return hr; } + /* special treatment for dispinterfaces: this makes functions appear + * to return their [retval] value when it is really returning an + * HRESULT */ + if (dispinterface && dest->elemdescFunc.tdesc.vt == VT_HRESULT) + { + if (dest->cParams && + (dest->lprgelemdescParam[dest->cParams - 1].u.paramdesc.wParamFlags & PARAMFLAG_FRETVAL)) + { + ELEMDESC *elemdesc = &dest->lprgelemdescParam[dest->cParams - 1]; + if (elemdesc->tdesc.vt != VT_PTR) + { + ERR("elemdesc should have started with VT_PTR instead of:\n"); + if (ERR_ON(ole)) + dump_ELEMDESC(elemdesc); + return E_UNEXPECTED; + } + + /* copy last parameter to the return value. we are using a flat + * buffer so there is no danger of leaking memory in + * elemdescFunc */ + dest->elemdescFunc.tdesc = *elemdesc->tdesc.u.lptdesc; + + /* remove the last parameter */ + dest->cParams--; + } + else + /* otherwise this function is made to appear to have no return + * value */ + dest->elemdescFunc.tdesc.vt = VT_VOID; + + } + *dest_ptr = dest; return S_OK; } @@ -4477,7 +4477,10 @@ static HRESULT WINAPI ITypeInfo_fnGetFun ; if(pFDesc) - return TLB_AllocAndInitFuncDesc(&pFDesc->funcdesc, ppFuncDesc); + return TLB_AllocAndInitFuncDesc( + &pFDesc->funcdesc, + ppFuncDesc, + This->TypeAttr.typekind == TKIND_DISPATCH); return E_INVALIDARG; } @@ -6362,7 +6365,10 @@ static HRESULT WINAPI ITypeComp_fnBind( if (pFDesc) { - HRESULT hr = TLB_AllocAndInitFuncDesc(&pFDesc->funcdesc, &pBindPtr->lpfuncdesc); + HRESULT hr = TLB_AllocAndInitFuncDesc( + &pFDesc->funcdesc, + &pBindPtr->lpfuncdesc, + This->TypeAttr.typekind == TKIND_DISPATCH); if (FAILED(hr)) return hr; *pDescKind = DESCKIND_FUNCDESC;

1 0

Robert Shearman : wininet: Correctly set the last error when a called Unix network
by Alexandre Julliard Dec. 3, 2005

Dec. 3, 2005

Module: wine Branch: refs/heads/master Commit: efd067f2c36b118add41e2566a6957a5cdc5c5df URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=efd067f2c36b118add41e25… Author: Robert Shearman <rob(a)codeweavers.com> Date: Sat Dec 3 18:10:14 2005 +0100 wininet: Correctly set the last error when a called Unix network function fails. --- dlls/wininet/http.c | 5 -- dlls/wininet/internet.c | 2 + dlls/wininet/netconnection.c | 86 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 87 insertions(+), 6 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 23affbc..f234530 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -38,8 +38,6 @@ #ifdef HAVE_UNISTD_H # include <unistd.h> #endif -#include <errno.h> -#include <string.h> #include <time.h> #include <assert.h> @@ -2237,10 +2235,7 @@ static BOOL HTTP_OpenConnection(LPWININE if (!NETCON_connect(&lpwhr->netConnection, (struct sockaddr *)&lpwhs->socketAddress, sizeof(lpwhs->socketAddress))) - { - WARN("Unable to connect to host (%s)\n", strerror(errno)); goto lend; - } if (lpwhr->hdr.dwFlags & INTERNET_FLAG_SECURE) { diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index d3e84bb..b91c9ff 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -2965,6 +2965,8 @@ void INTERNET_SetLastError(DWORD dwError DWORD INTERNET_GetLastError(void) { LPWITHREADERROR lpwite = (LPWITHREADERROR)TlsGetValue(g_dwTlsErrIndex); + /* TlsGetValue clears last error, so set it again here */ + SetLastError(lpwite->dwError); return lpwite->dwError; } diff --git a/dlls/wininet/netconnection.c b/dlls/wininet/netconnection.c index 05c6562..3c13818 100644 --- a/dlls/wininet/netconnection.c +++ b/dlls/wininet/netconnection.c @@ -43,6 +43,11 @@ #include "wininet.h" #include "winerror.h" +/* To avoid conflicts with the Unix socket headers. we only need it for + * the error codes anyway. */ +#define USE_WS_PREFIX +#include "winsock2.h" + #include "wine/debug.h" #include "internet.h" @@ -192,6 +197,70 @@ BOOL NETCON_connected(WININET_NETCONNECT return TRUE; } +/* translate a unix error code into a winsock one */ +static int sock_get_error( int err ) +{ + switch (err) + { + case EINTR: return WSAEINTR; + case EBADF: return WSAEBADF; + case EPERM: + case EACCES: return WSAEACCES; + case EFAULT: return WSAEFAULT; + case EINVAL: return WSAEINVAL; + case EMFILE: return WSAEMFILE; + case EWOULDBLOCK: return WSAEWOULDBLOCK; + case EINPROGRESS: return WSAEINPROGRESS; + case EALREADY: return WSAEALREADY; + case ENOTSOCK: return WSAENOTSOCK; + case EDESTADDRREQ: return WSAEDESTADDRREQ; + case EMSGSIZE: return WSAEMSGSIZE; + case EPROTOTYPE: return WSAEPROTOTYPE; + case ENOPROTOOPT: return WSAENOPROTOOPT; + case EPROTONOSUPPORT: return WSAEPROTONOSUPPORT; + case ESOCKTNOSUPPORT: return WSAESOCKTNOSUPPORT; + case EOPNOTSUPP: return WSAEOPNOTSUPP; + case EPFNOSUPPORT: return WSAEPFNOSUPPORT; + case EAFNOSUPPORT: return WSAEAFNOSUPPORT; + case EADDRINUSE: return WSAEADDRINUSE; + case EADDRNOTAVAIL: return WSAEADDRNOTAVAIL; + case ENETDOWN: return WSAENETDOWN; + case ENETUNREACH: return WSAENETUNREACH; + case ENETRESET: return WSAENETRESET; + case ECONNABORTED: return WSAECONNABORTED; + case EPIPE: + case ECONNRESET: return WSAECONNRESET; + case ENOBUFS: return WSAENOBUFS; + case EISCONN: return WSAEISCONN; + case ENOTCONN: return WSAENOTCONN; + case ESHUTDOWN: return WSAESHUTDOWN; + case ETOOMANYREFS: return WSAETOOMANYREFS; + case ETIMEDOUT: return WSAETIMEDOUT; + case ECONNREFUSED: return WSAECONNREFUSED; + case ELOOP: return WSAELOOP; + case ENAMETOOLONG: return WSAENAMETOOLONG; + case EHOSTDOWN: return WSAEHOSTDOWN; + case EHOSTUNREACH: return WSAEHOSTUNREACH; + case ENOTEMPTY: return WSAENOTEMPTY; +#ifdef EPROCLIM + case EPROCLIM: return WSAEPROCLIM; +#endif +#ifdef EUSERS + case EUSERS: return WSAEUSERS; +#endif +#ifdef EDQUOT + case EDQUOT: return WSAEDQUOT; +#endif +#ifdef ESTALE + case ESTALE: return WSAESTALE; +#endif +#ifdef EREMOTE + case EREMOTE: return WSAEREMOTE; +#endif + default: errno=err; perror("sock_set_error"); return WSAEFAULT; + } +} + /****************************************************************************** * NETCON_create * Basically calls 'socket()' @@ -206,7 +275,10 @@ BOOL NETCON_create(WININET_NETCONNECTION connection->socketFD = socket(domain, type, protocol); if (connection->socketFD == -1) + { + INTERNET_SetLastError(sock_get_error(errno)); return FALSE; + } return TRUE; } @@ -239,7 +311,10 @@ BOOL NETCON_close(WININET_NETCONNECTION connection->socketFD = -1; if (result == -1) + { + INTERNET_SetLastError(sock_get_error(errno)); return FALSE; + } return TRUE; } @@ -358,6 +433,9 @@ BOOL NETCON_connect(WININET_NETCONNECTIO result = connect(connection->socketFD, serv_addr, addrlen); if (result == -1) { + WARN("Unable to connect to host (%s)\n", strerror(errno)); + INTERNET_SetLastError(sock_get_error(errno)); + closesocket(connection->socketFD); connection->socketFD = -1; return FALSE; @@ -379,7 +457,10 @@ BOOL NETCON_send(WININET_NETCONNECTION * { *sent = send(connection->socketFD, msg, len, flags); if (*sent == -1) + { + INTERNET_SetLastError(sock_get_error(errno)); return FALSE; + } return TRUE; } else @@ -410,7 +491,10 @@ BOOL NETCON_recv(WININET_NETCONNECTION * { *recvd = recv(connection->socketFD, buf, len, flags); if (*recvd == -1) + { + INTERNET_SetLastError(sock_get_error(errno)); return FALSE; + } return TRUE; } else @@ -498,7 +582,7 @@ BOOL NETCON_getNextLine(WININET_NETCONNE { if (recv(connection->socketFD, &lpszBuffer[nRecv], 1, 0) <= 0) { - INTERNET_SetLastError(ERROR_CONNECTION_ABORTED); /* fixme: right error? */ + INTERNET_SetLastError(sock_get_error(errno)); goto lend; }

1 0

Eric Pouech : winedbg: simplify some code.
by Alexandre Julliard Dec. 3, 2005

Dec. 3, 2005

Module: wine Branch: refs/heads/master Commit: 56dcea4d16e6ca85f0330c85cb66a1991ff39408 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=56dcea4d16e6ca85f0330c8… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Sat Dec 3 18:09:59 2005 +0100 winedbg: simplify some code. --- programs/winedbg/symbol.c | 10 +++------- 1 files changed, 3 insertions(+), 7 deletions(-) diff --git a/programs/winedbg/symbol.c b/programs/winedbg/symbol.c index 1118fc0..61ef3dc 100644 --- a/programs/winedbg/symbol.c +++ b/programs/winedbg/symbol.c @@ -432,11 +432,10 @@ enum dbg_line_status symbol_get_function { IMAGEHLP_LINE il; DWORD disp; - ULONG64 disp64, start, size; + ULONG64 disp64, start; DWORD lin = (DWORD)memory_to_linear_addr(addr); char buffer[sizeof(SYMBOL_INFO) + 256]; SYMBOL_INFO* sym = (SYMBOL_INFO*)buffer; - struct dbg_type type; il.SizeOfStruct = sizeof(il); sym->SizeOfStruct = sizeof(SYMBOL_INFO); @@ -466,11 +465,8 @@ enum dbg_line_status symbol_get_function if (symbol_get_debug_start(sym->ModBase, sym->TypeIndex, &start) && lin < start) return dbg_not_on_a_line_number; - type.module = sym->ModBase; - type.id = sym->TypeIndex; - if (!types_get_info(&type, TI_GET_LENGTH, &size) || size == 0) - size = 0x100000; - if (il.FileName && il.FileName[0] && disp < size) + if (!sym->Size) sym->Size = 0x100000; + if (il.FileName && il.FileName[0] && disp < sym->Size) return (disp == 0) ? dbg_on_a_line_number : dbg_not_on_a_line_number; return dbg_no_line_info;

1 0

H. Verbeet : wined3d: return D3DERR_INVALIDCALL when calling BeginStateBlock and
by Alexandre Julliard Dec. 3, 2005

Dec. 3, 2005

Module: wine Branch: refs/heads/master Commit: 4880c586d8013e7271c744f581eb19905d90e0f0 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=4880c586d8013e7271c744f… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Sat Dec 3 18:04:26 2005 +0100 wined3d: return D3DERR_INVALIDCALL when calling BeginStateBlock and already recording. --- dlls/wined3d/device.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 9b8dc5c..185bca7 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4493,6 +4493,11 @@ HRESULT WINAPI IWineD3DDeviceImpl_BeginS IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; IWineD3DStateBlockImpl *object; TRACE("(%p)", This); + + if (This->isRecordingState) { + return D3DERR_INVALIDCALL; + } + object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IWineD3DStateBlockImpl)); if (NULL == object ) { FIXME("(%p)Error allocating memory for stateblock\n", This);

1 0

Pavel Roskin : Fixed regression in wineconsole creation (curses backend).
by Alexandre Julliard Dec. 3, 2005

Dec. 3, 2005

Module: wine Branch: refs/heads/master Commit: 2b1747ccda3b303a07402d821e06c7f7314dc6f1 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=2b1747ccda3b303a07402d8… Author: Pavel Roskin <proski at gnu.org> Date: Sat Dec 3 18:04:07 2005 +0100 Fixed regression in wineconsole creation (curses backend). --- programs/wineconsole/wineconsole.c | 16 +++++++--------- 1 files changed, 7 insertions(+), 9 deletions(-) diff --git a/programs/wineconsole/wineconsole.c b/programs/wineconsole/wineconsole.c index 486d86d..d73dc96 100644 --- a/programs/wineconsole/wineconsole.c +++ b/programs/wineconsole/wineconsole.c @@ -290,17 +290,13 @@ int WINECON_GrabChanges(struct inner_dat break; case CONSOLE_RENDERER_SB_RESIZE_EVENT: if (data->curcfg.sb_width != evts[i].u.resize.width || - data->curcfg.sb_height != evts[i].u.resize.height || !data->cells) + data->curcfg.sb_height != evts[i].u.resize.height) { WINE_TRACE(" resize(%d,%d)", evts[i].u.resize.width, evts[i].u.resize.height); data->curcfg.sb_width = evts[i].u.resize.width; data->curcfg.sb_height = evts[i].u.resize.height; - if (data->cells) - data->cells = HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, data->cells, - data->curcfg.sb_width * data->curcfg.sb_height * sizeof(CHAR_INFO)); - else - data->cells = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, + data->cells = HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, data->cells, data->curcfg.sb_width * data->curcfg.sb_height * sizeof(CHAR_INFO)); if (!data->cells) WINECON_Fatal("OOM\n"); @@ -557,9 +553,6 @@ static BOOL WINECON_GetServerConfig(stru } SERVER_END_REQ; WINECON_DumpConfig("first cfg: ", &data->curcfg); - data->cells = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, - data->curcfg.sb_width * data->curcfg.sb_height * sizeof(CHAR_INFO)); - if (!data->cells) WINECON_Fatal("OOM\n"); return ret; } @@ -655,6 +648,11 @@ static struct inner_data* WINECON_Init(H { case init_success: WINECON_GetServerConfig(data); + data->cells = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, + data->curcfg.sb_width * data->curcfg.sb_height * sizeof(CHAR_INFO)); + if (!data->cells) WINECON_Fatal("OOM\n"); + data->fnResizeScreenBuffer(data); + data->fnComputePositions(data); WINECON_SetConfig(data, &cfg); data->curcfg.registry = cfg.registry; WINECON_DumpConfig("fint", &data->curcfg);

1 0

Vincent Béron : winapi_check: fully descend in included files to check for prototype.
by Alexandre Julliard Dec. 3, 2005

Dec. 3, 2005

Module: wine Branch: refs/heads/master Commit: 18c5a0a2a0153ef22f40d90d25ba7a8172910758 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=18c5a0a2a0153ef22f40d90… Author: Vincent Béron <vberon(a)mecano.gme.usherb.ca> Date: Sat Dec 3 18:03:50 2005 +0100 winapi_check: fully descend in included files to check for prototype. --- tools/winapi/winapi_check | 17 +++++++++++++---- 1 files changed, 13 insertions(+), 4 deletions(-) diff --git a/tools/winapi/winapi_check b/tools/winapi/winapi_check index 8ad0550..1ef85dd 100755 --- a/tools/winapi/winapi_check +++ b/tools/winapi/winapi_check @@ -498,6 +498,18 @@ foreach my $file (@c_files) { my $type = shift; }; + sub recursive_include { + my $include = shift; + my $includes = shift; + + if(!defined($includes->{$include})) { + $includes->{$include}++; + foreach my $include (keys(%{$include2info{$include}{includes}})) { + recursive_include($include, \%$includes); + } + } + }; + my $preprocessor = 'preprocessor'->new($found_include, $found_conditional); my $found_preprocessor = sub { my $directive = shift; @@ -545,10 +557,7 @@ foreach my $file (@c_files) { } if(defined($include)) { - $includes{$include}++; - foreach my $include (keys(%{$include2info{$include}{includes}})) { - $includes{$include}++; - } + recursive_include($include, \%includes); } }

1 0

Robert Shearman : OLE: fix handling of INVOKE_PROPERTYGET flag in ITypeComp_fnBind.
by Alexandre Julliard Dec. 3, 2005

Dec. 3, 2005

Module: wine Branch: refs/heads/master Commit: a61e4e802ce05e9aa9380ec2547fe98016efd1ca URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=a61e4e802ce05e9aa9380ec… Author: Robert Shearman <rob(a)codeweavers.com> Date: Sat Dec 3 18:03:29 2005 +0100 OLE: fix handling of INVOKE_PROPERTYGET flag in ITypeComp_fnBind. The INVOKE_PROPERTYGET flag shouldn't affect binding to variables; it should just affect which of a pair of [propget] and [propput] functions should be returned. --- dlls/oleaut32/typelib.c | 21 +++++++++------------ 1 files changed, 9 insertions(+), 12 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 09c6fd7..32c2780 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -6370,18 +6370,15 @@ static HRESULT WINAPI ITypeComp_fnBind( ITypeInfo_AddRef(*ppTInfo); return S_OK; } else { - if (!(wFlags & ~(INVOKE_PROPERTYGET))) - { - for(pVDesc = This->varlist; pVDesc; pVDesc = pVDesc->next) { - if (!strcmpW(pVDesc->Name, szName)) { - HRESULT hr = TLB_AllocAndInitVarDesc(&pVDesc->vardesc, &pBindPtr->lpvardesc); - if (FAILED(hr)) - return hr; - *pDescKind = DESCKIND_VARDESC; - *ppTInfo = (ITypeInfo *)&This->lpVtbl; - ITypeInfo_AddRef(*ppTInfo); - return S_OK; - } + for(pVDesc = This->varlist; pVDesc; pVDesc = pVDesc->next) { + if (!strcmpW(pVDesc->Name, szName)) { + HRESULT hr = TLB_AllocAndInitVarDesc(&pVDesc->vardesc, &pBindPtr->lpvardesc); + if (FAILED(hr)) + return hr; + *pDescKind = DESCKIND_VARDESC; + *ppTInfo = (ITypeInfo *)&This->lpVtbl; + ITypeInfo_AddRef(*ppTInfo); + return S_OK; } } }

1 0

Robert Shearman : wininet: global function/data cleanup
by Alexandre Julliard Dec. 3, 2005

Dec. 3, 2005

Module: wine Branch: refs/heads/master Commit: 067f09604ad69d2c41a2bc78a3c3308f60ce3d51 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=067f09604ad69d2c41a2bc7… Author: Robert Shearman <rob(a)codeweavers.com> Date: Sat Dec 3 18:03:08 2005 +0100 wininet: global function/data cleanup Make some functions and a structure static since they are only used in one file. --- dlls/wininet/ftp.c | 82 +++++++++++++++++----------------- dlls/wininet/http.c | 2 - dlls/wininet/internet.c | 114 ++++++++++++++++++++++++----------------------- dlls/wininet/internet.h | 2 - 4 files changed, 99 insertions(+), 101 deletions(-)

1 0

Eric Pouech : winedbg: fixed regression (and simplified code!) for arguments
by Alexandre Julliard Dec. 3, 2005

Dec. 3, 2005

Module: wine Branch: refs/heads/master Commit: 30121124b95e388e6a25f7e0f073ec5a4be77191 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=30121124b95e388e6a25f7e… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Sat Dec 3 18:02:49 2005 +0100 winedbg: fixed regression (and simplified code!) for arguments printing in backtrace. --- programs/winedbg/stack.c | 9 +-------- 1 files changed, 1 insertions(+), 8 deletions(-) diff --git a/programs/winedbg/stack.c b/programs/winedbg/stack.c index c7d4994..b33cf60 100644 --- a/programs/winedbg/stack.c +++ b/programs/winedbg/stack.c @@ -176,18 +176,11 @@ static BOOL WINAPI sym_enum_cb(SYMBOL_IN struct sym_enum* se = (struct sym_enum*)user; DWORD addr; unsigned val; - long offset; if ((sym_info->Flags & (SYMFLAG_PARAMETER|SYMFLAG_FRAMEREL)) == (SYMFLAG_PARAMETER|SYMFLAG_FRAMEREL)) { - struct dbg_type type; - if (se->tmp[0]) strcat(se->tmp, ", "); - addr = se->frame; - type.module = sym_info->ModBase; - type.id = sym_info->TypeIndex; - types_get_info(&type, TI_GET_OFFSET, &offset); - addr += offset; + addr = se->frame + sym_info->Address; if (dbg_read_memory((char*)addr, &val, sizeof(val))) sprintf(se->tmp + strlen(se->tmp), "%s=0x%x", sym_info->Name, val); else

1 0

Eric Pouech : winedbg: fixed regression in 'info local' command.
by Alexandre Julliard Dec. 3, 2005

Dec. 3, 2005

Module: wine Branch: refs/heads/master Commit: 28c503a947ee1e8498fbc5ea3be139d162677544 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=28c503a947ee1e8498fbc5e… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Sat Dec 3 18:02:31 2005 +0100 winedbg: fixed regression in 'info local' command. --- programs/winedbg/symbol.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/winedbg/symbol.c b/programs/winedbg/symbol.c index 65a0bf7..1118fc0 100644 --- a/programs/winedbg/symbol.c +++ b/programs/winedbg/symbol.c @@ -579,7 +579,7 @@ static BOOL CALLBACK info_locals_cb(SYMB else if (sym->Flags & SYMFLAG_LOCAL) { type.id = sym->TypeIndex; - v = ((IMAGEHLP_STACK_FRAME*)ctx)->FrameOffset + sym->Address; + v = (ULONG)ctx + sym->Address; if (!dbg_read_memory((void*)v, &val, sizeof(val))) {

1 0

Aric Cyr : Move standard WGL function declarations to wingdi.h.
by Alexandre Julliard Dec. 3, 2005

Dec. 3, 2005

Module: wine Branch: refs/heads/master Commit: d0713d28e2b264d0aa719b765c5f4aa439a0d775 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=d0713d28e2b264d0aa719b7… Author: Aric Cyr <aric.cyr(a)gmail.com> Date: Sat Dec 3 18:01:51 2005 +0100 Move standard WGL function declarations to wingdi.h. dlls/opengl32/wgl.h is now empty and no longer needed. --- dlls/opengl32/wgl.c | 4 +- dlls/opengl32/wgl.h | 77 ----------------------------------------------- dlls/opengl32/wgl_ext.c | 7 ++++ include/wingdi.h | 18 +++++++++++ 4 files changed, 26 insertions(+), 80 deletions(-) delete mode 100644 dlls/opengl32/wgl.h diff --git a/dlls/opengl32/wgl.c b/dlls/opengl32/wgl.c index 812e9aa..e35680d 100644 --- a/dlls/opengl32/wgl.c +++ b/dlls/opengl32/wgl.c @@ -30,8 +30,8 @@ #include "winuser.h" #include "winerror.h" #include "winreg.h" +#include "wingdi.h" -#include "wgl.h" #include "wgl_ext.h" #include "opengl_ext.h" #include "wine/library.h" @@ -360,7 +360,7 @@ static int wgl_compar(const void *elt_a, ((const WGL_extension *) elt_b)->func_name); } -void* WINAPI wglGetProcAddress(LPCSTR lpszProc) { +PROC WINAPI wglGetProcAddress(LPCSTR lpszProc) { void *local_func; OpenGL_extension ext; OpenGL_extension *ext_ret; diff --git a/dlls/opengl32/wgl.h b/dlls/opengl32/wgl.h deleted file mode 100644 index a363c34..0000000 --- a/dlls/opengl32/wgl.h +++ /dev/null @@ -1,77 +0,0 @@ -/* Window-specific OpenGL functions implementation. - * - * Copyright (c) 2000 Lionel Ulmer - * Copyright (c) 2005 Raphael Junqueira - * - * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#ifndef __DLLS_OPENGL32_WGL_H -#define __DLLS_OPENGL32_WGL_H - -#include "wingdi.h" - -HGLRC WINAPI wglCreateContext(HDC hdc) ; -HGLRC WINAPI wglCreateLayerContext(HDC hdc, - int iLayerPlane) ; -BOOL WINAPI wglCopyContext(HGLRC hglrcSrc, - HGLRC hglrcDst, - UINT mask) ; -BOOL WINAPI wglDeleteContext(HGLRC hglrc) ; -BOOL WINAPI wglDescribeLayerPlane(HDC hdc, - int iPixelFormat, - int iLayerPlane, - UINT nBytes, - LPLAYERPLANEDESCRIPTOR plpd) ; -HGLRC WINAPI wglGetCurrentContext(void) ; -HDC WINAPI wglGetCurrentDC(void) ; -int WINAPI wglGetLayerPaletteEntries(HDC hdc, - int iLayerPlane, - int iStart, - int cEntries, - const COLORREF *pcr) ; -void * WINAPI wglGetProcAddress(LPCSTR lpszProc) ; -BOOL WINAPI wglMakeCurrent(HDC hdc, - HGLRC hglrc) ; -BOOL WINAPI wglRealizeLayerPalette(HDC hdc, - int iLayerPlane, - BOOL bRealize) ; -int WINAPI wglSetLayerPaletteEntries(HDC hdc, - int iLayerPlane, - int iStart, - int cEntries, - const COLORREF *pcr) ; -BOOL WINAPI wglShareLists(HGLRC hglrc1, - HGLRC hglrc2) ; -BOOL WINAPI wglSwapLayerBuffers(HDC hdc, - UINT fuPlanes); -BOOL WINAPI wglUseFontBitmaps(HDC hdc, - DWORD first, - DWORD count, - DWORD listBase) ; -BOOL WINAPI wglUseFontOutlines(HDC hdc, - DWORD first, - DWORD count, - DWORD listBase, - FLOAT deviation, - FLOAT extrusion, - int format, - LPGLYPHMETRICSFLOAT lpgmf) ; -const char * WINAPI wglGetExtensionsStringARB(HDC hdc) ; - -BOOL WINAPI wglMakeContextCurrentARB(HDC hDrawDC, HDC hReadDC, HGLRC hglrc); -HDC WINAPI wglGetCurrentReadDCARB(void) ; - -#endif /* __DLLS_OPENGL32_WGL_H */ diff --git a/dlls/opengl32/wgl_ext.c b/dlls/opengl32/wgl_ext.c index c4bc6cb..b323d7c 100644 --- a/dlls/opengl32/wgl_ext.c +++ b/dlls/opengl32/wgl_ext.c @@ -32,7 +32,6 @@ #include "winerror.h" #include "gdi.h" -#include "wgl.h" #include "wgl_ext.h" #include "opengl_ext.h" #include "wine/library.h" @@ -1120,6 +1119,12 @@ void wgl_ext_finalize_extensions(void) } } + +/* these are located in wgl.c for convenience of implementation */ +BOOL WINAPI wglMakeContextCurrentARB(HDC,HDC,HGLRC); +HDC WINAPI wglGetCurrentReadDCARB(void); + + /* * Putting this at the end to prevent having to write the prototypes :-) * diff --git a/include/wingdi.h b/include/wingdi.h index 89b1d07..032efbb 100644 --- a/include/wingdi.h +++ b/include/wingdi.h @@ -3678,6 +3678,24 @@ BOOL WINAPI PolyTextOutW(HDC,PPOLYT #define WGL_SWAP_UNDERLAY14 (1 << 29) #define WGL_SWAP_UNDERLAY15 (1 << 30) +/* WGL prototypes */ +HGLRC WINAPI wglCreateContext(HDC); +HGLRC WINAPI wglCreateLayerContext(HDC,INT); +BOOL WINAPI wglCopyContext(HGLRC,HGLRC,UINT); +BOOL WINAPI wglDeleteContext(HGLRC); +BOOL WINAPI wglDescribeLayerPlane(HDC,INT,INT,UINT,LPLAYERPLANEDESCRIPTOR); +HGLRC WINAPI wglGetCurrentContext(void); +HDC WINAPI wglGetCurrentDC(void); +INT WINAPI wglGetLayerPaletteEntries(HDC,INT,INT,INT,const COLORREF *); +PROC WINAPI wglGetProcAddress(LPCSTR); +BOOL WINAPI wglMakeCurrent(HDC,HGLRC); +BOOL WINAPI wglRealizeLayerPalette(HDC,INT,BOOL); +INT WINAPI wglSetLayerPaletteEntries(HDC,INT,INT,INT,const COLORREF *); +BOOL WINAPI wglShareLists(HGLRC,HGLRC); +BOOL WINAPI wglSwapLayerBuffers(HDC,UINT); +BOOL WINAPI wglUseFontBitmaps(HDC,DWORD,DWORD,DWORD); +BOOL WINAPI wglUseFontOutlines(HDC,DWORD,DWORD,DWORD,FLOAT,FLOAT,INT,LPGLYPHMETRICSFLOAT); + #ifdef __cplusplus } #endif

1 0

Aric Stewart : wcmd: mkdir recursive create
by Alexandre Julliard Dec. 3, 2005

Dec. 3, 2005

Module: wine Branch: refs/heads/master Commit: 1d5adff0f1216f9930762c00cdb44d1e16e73836 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=1d5adff0f1216f9930762c0… Author: Aric Stewart <aric(a)codeweavers.com> Date: Sat Dec 3 18:02:15 2005 +0100 wcmd: mkdir recursive create In at least both win2k and winxp mkdir from the command prompt can recursively create full directory paths. This implements that functionality. --- programs/wcmd/builtins.c | 49 +++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 48 insertions(+), 1 deletions(-) diff --git a/programs/wcmd/builtins.c b/programs/wcmd/builtins.c index 5652089..a47bc0a 100644 --- a/programs/wcmd/builtins.c +++ b/programs/wcmd/builtins.c @@ -150,11 +150,58 @@ char string[8], outpath[MAX_PATH], inpat * WCMD_create_dir * * Create a directory. + * + * this works recursivly. so mkdir dir1\dir2\dir3 will create dir1 and dir2 if + * they do not already exist. */ +BOOL create_full_path(CHAR* path) +{ + int len; + CHAR *new_path; + BOOL ret = TRUE; + + new_path = HeapAlloc(GetProcessHeap(),0,strlen(path)+1); + strcpy(new_path,path); + + while ((len = strlen(new_path)) && new_path[len - 1] == '\\') + new_path[len - 1] = 0; + + while (!CreateDirectory(new_path,NULL)) + { + CHAR *slash; + DWORD last_error = GetLastError(); + if (last_error == ERROR_ALREADY_EXISTS) + break; + + if (last_error != ERROR_PATH_NOT_FOUND) + { + ret = FALSE; + break; + } + + if (!(slash = strrchr(new_path,'\\')) && ! (slash = strrchr(new_path,'/'))) + { + ret = FALSE; + break; + } + + len = slash - new_path; + new_path[len] = 0; + if (!create_full_path(new_path)) + { + ret = FALSE; + break; + } + new_path[len] = '\\'; + } + HeapFree(GetProcessHeap(),0,new_path); + return ret; +} + void WCMD_create_dir (void) { - if (!CreateDirectory (param1, NULL)) WCMD_print_error (); + if (!create_full_path(param1)) WCMD_print_error (); } /****************************************************************************

1 0

Francois Gouget : Assorted spelling fixes.
by Alexandre Julliard Dec. 2, 2005

Dec. 2, 2005

Module: wine Branch: refs/heads/master Commit: 5127dc9f49d4505d08ceb353467939c0c4f58e04 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=5127dc9f49d4505d08ceb35… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Dec 2 15:15:09 2005 Assorted spelling fixes. --- dlls/ole32/usrmarshal.c | 4 ++-- dlls/wined3d/surface.c | 12 ++++++------ dlls/winspool/info.c | 2 +- tools/winapi/msvcmaker | 4 ++-- tools/winapi/winapi_check_options.pm | 18 +++++++++--------- tools/winapi/winapi_extract | 2 +- tools/winebuild/utils.c | 2 +- 7 files changed, 22 insertions(+), 22 deletions(-) diff --git a/dlls/ole32/usrmarshal.c b/dlls/ole32/usrmarshal.c index 294be08..3bd46cb 100644 --- a/dlls/ole32/usrmarshal.c +++ b/dlls/ole32/usrmarshal.c @@ -333,7 +333,7 @@ unsigned char * __RPC_USER HGLOBAL_UserU size = *(ULONG *)pBuffer; pBuffer += sizeof(ULONG); - /* redunancy is bad - it means you have to check consistancy like + /* redundancy is bad - it means you have to check consistency like * this: */ if (*(ULONG *)pBuffer != handle) { @@ -341,7 +341,7 @@ unsigned char * __RPC_USER HGLOBAL_UserU return pBuffer; } pBuffer += sizeof(ULONG); - /* redunancy is bad - it means you have to check consistancy like + /* redundancy is bad - it means you have to check consistency like * this: */ if (*(ULONG *)pBuffer != size) { diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 0aa1446..e1711e6 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -320,19 +320,19 @@ HRESULT WINAPI IWineD3DSurfaceImpl_LockR if (0 == This->resource.usage || This->resource.usage & D3DUSAGE_DYNAMIC) { /* classic surface TODO: non 2d surfaces? - Thease resources may be POOL_SYSTEMMEM, so they must not access the device */ + These resources may be POOL_SYSTEMMEM, so they must not access the device */ TRACE("locking an ordinarary surface\n"); - /* Check to see if memory has already been allocated fro the sufrace*/ + /* Check to see if memory has already been allocated from the surface*/ if (NULL == This->resource.allocatedMemory) { /* TODO: check to see if an update has been performed on the surface (an update could just clobber allocatedMemory */ - /* Non-systemmemory surfaces */ + /* Non-system memory surfaces */ - /*Surface has no memory currently allocate to it!*/ + /*Surface has no memory currently allocated to it!*/ TRACE("(%p) Locking rect\n" , This); This->resource.allocatedMemory = HeapAlloc(GetProcessHeap() ,0 , This->pow2Size); if (0 != This->glDescription.textureName) { /* Now I have to copy thing bits back */ - This->activeLock = TRUE; /* When this flag is set to true, laoding the surface again won't free THis->resource.allocatedMemory */ - /* TODO: make activeLock a bit more intelegent, maybe implement a method to purge the texture memory. */ + This->activeLock = TRUE; /* When this flag is set to true, loading the surface again won't free THis->resource.allocatedMemory */ + /* TODO: make activeLock a bit more intelligent, maybe implement a method to purge the texture memory. */ ENTER_GL(); /* Make sure that the texture is loaded */ diff --git a/dlls/winspool/info.c b/dlls/winspool/info.c index ffee18a..3bdd01d 100644 --- a/dlls/winspool/info.c +++ b/dlls/winspool/info.c @@ -3243,7 +3243,7 @@ BOOL WINAPI GetPrinterDriverW(HANDLE hPr * RETURNS * Success: TRUE and in pcbNeeded the Bytes used in pDriverDirectory * Failure: FALSE and in pcbNeeded the Bytes required for pDriverDirectory, - * if cbBuf is to small + * if cbBuf is too small * * Native Values returned in pDriverDirectory on Success: *| NT(Windows NT x86): "%winsysdir%\\spool\\DRIVERS\\w32x86" diff --git a/tools/winapi/msvcmaker b/tools/winapi/msvcmaker index fd40f3d..1d31ae0 100755 --- a/tools/winapi/msvcmaker +++ b/tools/winapi/msvcmaker @@ -52,7 +52,7 @@ sub read_spec_file($) { while($lookahead || defined($_ = <IN>)) { $lookahead = 0; - s/^\s*?(.*?)\s*$/$1/; # remove whitespace at begining and end of line + s/^\s*?(.*?)\s*$/$1/; # remove whitespace at beginning and end of line s/^(.*?)\s*#.*$/$1/; # remove comments /^$/ && next; # skip empty lines @@ -137,7 +137,7 @@ MAKEFILE_IN: foreach my $makefile_in_fil $again = 0; } - s/^\s*?(.*?)\s*$/$1/; # remove whitespace at begining and end of line + s/^\s*?(.*?)\s*$/$1/; # remove whitespace at beginning and end of line s/^(.*?)\s*#.*$/$1/; # remove comments /^$/ && next; # skip empty lines diff --git a/tools/winapi/winapi_check_options.pm b/tools/winapi/winapi_check_options.pm index cd788fd..cccfaa4 100644 --- a/tools/winapi/winapi_check_options.pm +++ b/tools/winapi/winapi_check_options.pm @@ -75,7 +75,7 @@ my %options_long = ( "calling-convention-win16" => { default => 0, parent => "calling-convention", description => "calling convention checking (Win16)" }, "calling-convention-win32" => { default => 1, parent => "calling-convention", description => "calling convention checking (Win32)" }, "misplaced" => { default => 1, parent => "local", description => "check for misplaced functions" }, - "statements" => { default => 0, parent => "local", description => "check for statements inconsistances" }, + "statements" => { default => 0, parent => "local", description => "check for statements inconsistencies" }, "cross-call" => { default => 0, parent => ["statements", "win16", "win32"], description => "check for cross calling functions" }, "cross-call-win32-win16" => { default => 0, parent => "cross-call", description => "check for cross calls between win32 and win16" @@ -83,7 +83,7 @@ my %options_long = ( "cross-call-unicode-ascii" => { default => 0, parent => "cross-call", description => "check for cross calls between Unicode and ASCII" }, - "debug-messages" => { default => 0, parent => "statements", description => "check for debug messages inconsistances" }, + "debug-messages" => { default => 0, parent => "statements", description => "check for debug messages inconsistencies" }, "comments" => { default => 1, @@ -99,36 +99,36 @@ my %options_long = ( "documentation" => { default => 1, parent => "local", - description => "check for documentation inconsistances" + description => "check for documentation inconsistencies" }, "documentation-pedantic" => { default => 0, parent => "documentation", - description => "be pendantic when checking for documentation inconsistances" + description => "be pendantic when checking for documentation inconsistencies" }, "documentation-arguments" => { default => 1, parent => "documentation", - description => "check for arguments documentation inconsistances\n" + description => "check for arguments documentation inconsistencies\n" }, "documentation-comment-indent" => { default => 0, - parent => "documentation", description => "check for documentation comment indent inconsistances" + parent => "documentation", description => "check for documentation comment indent inconsistencies" }, "documentation-comment-width" => { default => 0, - parent => "documentation", description => "check for documentation comment width inconsistances" + parent => "documentation", description => "check for documentation comment width inconsistencies" }, "documentation-name" => { default => 1, parent => "documentation", - description => "check for documentation name inconsistances\n" + description => "check for documentation name inconsistencies\n" }, "documentation-ordinal" => { default => 1, parent => "documentation", - description => "check for documentation ordinal inconsistances\n" + description => "check for documentation ordinal inconsistencies\n" }, "documentation-wrong" => { default => 1, diff --git a/tools/winapi/winapi_extract b/tools/winapi/winapi_extract index 70b3f5a..040f228 100755 --- a/tools/winapi/winapi_extract +++ b/tools/winapi/winapi_extract @@ -70,7 +70,7 @@ if($options->spec_files || $options->win while($lookahead || defined($_ = <IN>)) { $lookahead = 0; - s/^\s*?(.*?)\s*$/$1/; # remove whitespace at begining and end of line + s/^\s*?(.*?)\s*$/$1/; # remove whitespace at beginning and end of line s/^(.*?)\s*#.*$/$1/; # remove comments /^$/ && next; # skip empty lines diff --git a/tools/winebuild/utils.c b/tools/winebuild/utils.c index dbfa07c..a4cbb6f 100644 --- a/tools/winebuild/utils.c +++ b/tools/winebuild/utils.c @@ -417,7 +417,7 @@ const char *get_stub_name( const ORDDEF * * The reason gas is written this way is that it's trying to mimick * native assemblers for the various architectures it runs on. gas - * provides other directives that work consistantly across + * provides other directives that work consistently across * architectures, but of course we want to work on all arches with or * without gas. Hence this function. *

1 0

Vitaliy Margolen : Move mapping (section) objects into directory name space.
by Alexandre Julliard Dec. 2, 2005

Dec. 2, 2005

Module: wine Branch: refs/heads/master Commit: 348a3d912bf3d8c0523bf76566683dfc63ff050b URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=348a3d912bf3d8c0523bf76… Author: Vitaliy Margolen <wine-patch(a)kievinfo.com> Date: Fri Dec 2 15:13:13 2005 Move mapping (section) objects into directory name space. --- dlls/kernel/virtual.c | 5 ++++- dlls/ntdll/virtual.c | 2 ++ include/wine/server_protocol.h | 4 +++- server/mapping.c | 23 ++++++++++++++++++----- server/protocol.def | 2 ++ server/trace.c | 2 ++ 6 files changed, 31 insertions(+), 7 deletions(-) diff --git a/dlls/kernel/virtual.c b/dlls/kernel/virtual.c index d3dee13..ef46e30 100644 --- a/dlls/kernel/virtual.c +++ b/dlls/kernel/virtual.c @@ -43,6 +43,8 @@ #include "excpt.h" #include "wine/debug.h" +#include "kernel_private.h" + WINE_DEFAULT_DEBUG_CHANNEL(virtual); WINE_DECLARE_DEBUG_CHANNEL(seh); @@ -318,6 +320,7 @@ HANDLE WINAPI CreateFileMappingW( HANDLE { RtlInitUnicodeString( &nameW, name ); attr.ObjectName = &nameW; + attr.RootDirectory = get_BaseNamedObjects_handle(); } sec_type = protect & sec_flags; @@ -406,7 +409,7 @@ HANDLE WINAPI OpenFileMappingW( DWORD ac return 0; } attr.Length = sizeof(attr); - attr.RootDirectory = 0; + attr.RootDirectory = get_BaseNamedObjects_handle(); attr.ObjectName = &nameW; attr.Attributes = OBJ_CASE_INSENSITIVE | (inherit ? OBJ_INHERIT : 0); attr.SecurityDescriptor = NULL; diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index 93392f5..d04c79e 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -1662,6 +1662,7 @@ NTSTATUS WINAPI NtCreateSection( HANDLE { req->access = access; req->attributes = (attr) ? attr->Attributes : 0; + req->rootdir = attr ? attr->RootDirectory : 0; req->file_handle = file; req->size_high = size ? size->u.HighPart : 0; req->size_low = size ? size->u.LowPart : 0; @@ -1690,6 +1691,7 @@ NTSTATUS WINAPI NtOpenSection( HANDLE *h { req->access = access; req->attributes = (attr) ? attr->Attributes : 0; + req->rootdir = attr ? attr->RootDirectory : 0; wine_server_add_data( req, attr->ObjectName->Buffer, len ); if (!(ret = wine_server_call( req ))) *handle = reply->handle; } diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 982d840..4ab0136 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -1407,6 +1407,7 @@ struct create_mapping_request struct request_header __header; unsigned int access; unsigned int attributes; + obj_handle_t rootdir; int size_high; int size_low; int protect; @@ -1435,6 +1436,7 @@ struct open_mapping_request struct request_header __header; unsigned int access; unsigned int attributes; + obj_handle_t rootdir; /* VARARG(name,unicode_str); */ }; struct open_mapping_reply @@ -4310,6 +4312,6 @@ union generic_reply struct query_symlink_reply query_symlink_reply; }; -#define SERVER_PROTOCOL_VERSION 204 +#define SERVER_PROTOCOL_VERSION 205 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/server/mapping.c b/server/mapping.c index b6e99e4..cf87361 100644 --- a/server/mapping.c +++ b/server/mapping.c @@ -273,15 +273,16 @@ inline static int get_file_size( struct return 1; } -static struct object *create_mapping( const struct unicode_str *name, unsigned int attr, - file_pos_t size, int protect, obj_handle_t handle ) +static struct object *create_mapping( struct directory *root, const struct unicode_str *name, + unsigned int attr, file_pos_t size, int protect, + obj_handle_t handle ) { struct mapping *mapping; int access = 0; if (!page_mask) init_page_size(); - if (!(mapping = create_named_object( sync_namespace, &mapping_ops, name, attr ))) + if (!(mapping = create_named_object_dir( root, name, attr, &mapping_ops ))) return NULL; if (get_error() == STATUS_OBJECT_NAME_EXISTS) return &mapping->obj; /* Nothing else to do */ @@ -378,25 +379,37 @@ DECL_HANDLER(create_mapping) { struct object *obj; struct unicode_str name; + struct directory *root = NULL; file_pos_t size = ((file_pos_t)req->size_high << 32) | req->size_low; reply->handle = 0; get_req_unicode_str( &name ); - if ((obj = create_mapping( &name, req->attributes, size, req->protect, req->file_handle ))) + if (req->rootdir && !(root = get_directory_obj( current->process, req->rootdir, 0 ))) + return; + + if ((obj = create_mapping( root, &name, req->attributes, size, req->protect, req->file_handle ))) { reply->handle = alloc_handle( current->process, obj, req->access, req->attributes & OBJ_INHERIT ); release_object( obj ); } + + if (root) release_object( root ); } /* open a handle to a mapping */ DECL_HANDLER(open_mapping) { struct unicode_str name; + struct directory *root = NULL; get_req_unicode_str( &name ); - reply->handle = open_object( sync_namespace, &name, &mapping_ops, req->access, req->attributes ); + 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 (root) release_object( root ); } /* get a mapping information */ diff --git a/server/protocol.def b/server/protocol.def index 4228258..297313c 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -1045,6 +1045,7 @@ enum char_info_mode @REQ(create_mapping) unsigned int access; /* wanted access rights */ unsigned int attributes; /* object attributes */ + obj_handle_t rootdir; /* root directory */ int size_high; /* mapping size */ int size_low; /* mapping size */ int protect; /* protection flags (see below) */ @@ -1068,6 +1069,7 @@ enum char_info_mode @REQ(open_mapping) unsigned int access; /* wanted access rights */ unsigned int attributes; /* object attributes */ + obj_handle_t rootdir; /* root directory */ VARARG(name,unicode_str); /* object name */ @REPLY obj_handle_t handle; /* handle to the mapping */ diff --git a/server/trace.c b/server/trace.c index 3d4983a..5d5159a 100644 --- a/server/trace.c +++ b/server/trace.c @@ -1448,6 +1448,7 @@ static void dump_create_mapping_request( { fprintf( stderr, " access=%08x,", req->access ); fprintf( stderr, " attributes=%08x,", req->attributes ); + fprintf( stderr, " rootdir=%p,", req->rootdir ); fprintf( stderr, " size_high=%d,", req->size_high ); fprintf( stderr, " size_low=%d,", req->size_low ); fprintf( stderr, " protect=%d,", req->protect ); @@ -1465,6 +1466,7 @@ static void dump_open_mapping_request( c { fprintf( stderr, " access=%08x,", req->access ); fprintf( stderr, " attributes=%08x,", req->attributes ); + fprintf( stderr, " rootdir=%p,", req->rootdir ); fprintf( stderr, " name=" ); dump_varargs_unicode_str( cur_size ); }

1 0

Vitaliy Margolen : Move timer objects into directory name space.
by Alexandre Julliard Dec. 2, 2005

Dec. 2, 2005

Module: wine Branch: refs/heads/master Commit: 7c5cb7a229a9058bdee08c40d20401670e2f05f8 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=7c5cb7a229a9058bdee08c4… Author: Vitaliy Margolen <wine-patch(a)kievinfo.com> Date: Fri Dec 2 15:05:54 2005 Move timer objects into directory name space. --- dlls/kernel/sync.c | 2 ++ dlls/ntdll/sync.c | 2 ++ include/wine/server_protocol.h | 4 +++- server/protocol.def | 2 ++ server/timer.c | 22 +++++++++++++++++----- server/trace.c | 2 ++ 6 files changed, 28 insertions(+), 6 deletions(-) diff --git a/dlls/kernel/sync.c b/dlls/kernel/sync.c index 54f95a7..0c34098 100644 --- a/dlls/kernel/sync.c +++ b/dlls/kernel/sync.c @@ -927,6 +927,7 @@ HANDLE WINAPI CreateWaitableTimerW( SECU { RtlInitUnicodeString( &nameW, name ); attr.ObjectName = &nameW; + attr.RootDirectory = get_BaseNamedObjects_handle(); } status = NtCreateTimer(&handle, TIMER_ALL_ACCESS, &attr, @@ -979,6 +980,7 @@ HANDLE WINAPI OpenWaitableTimerW( DWORD { RtlInitUnicodeString( &nameW, name ); attr.ObjectName = &nameW; + attr.RootDirectory = get_BaseNamedObjects_handle(); } status = NtOpenTimer(&handle, access, &attr); diff --git a/dlls/ntdll/sync.c b/dlls/ntdll/sync.c index 675b9b7..3cf448f 100644 --- a/dlls/ntdll/sync.c +++ b/dlls/ntdll/sync.c @@ -422,6 +422,7 @@ NTSTATUS WINAPI NtCreateTimer(OUT HANDLE { req->access = access; req->attributes = (attr) ? attr->Attributes : 0; + req->rootdir = attr ? attr->RootDirectory : 0; req->manual = (timer_type == NotificationTimer) ? TRUE : FALSE; if (len) wine_server_add_data( req, attr->ObjectName->Buffer, len ); status = wine_server_call( req ); @@ -449,6 +450,7 @@ NTSTATUS WINAPI NtOpenTimer(OUT PHANDLE { req->access = access; req->attributes = (attr) ? attr->Attributes : 0; + req->rootdir = attr ? attr->RootDirectory : 0; if (len) wine_server_add_data( req, attr->ObjectName->Buffer, len ); status = wine_server_call( req ); *handle = reply->handle; diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index c144f24..982d840 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -1885,6 +1885,7 @@ struct create_timer_request struct request_header __header; unsigned int access; unsigned int attributes; + obj_handle_t rootdir; int manual; /* VARARG(name,unicode_str); */ }; @@ -1901,6 +1902,7 @@ struct open_timer_request struct request_header __header; unsigned int access; unsigned int attributes; + obj_handle_t rootdir; /* VARARG(name,unicode_str); */ }; struct open_timer_reply @@ -4308,6 +4310,6 @@ union generic_reply struct query_symlink_reply query_symlink_reply; }; -#define SERVER_PROTOCOL_VERSION 203 +#define SERVER_PROTOCOL_VERSION 204 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/server/protocol.def b/server/protocol.def index a691e90..4228258 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -1360,6 +1360,7 @@ enum char_info_mode @REQ(create_timer) unsigned int access; /* wanted access rights */ unsigned int attributes; /* object attributes */ + obj_handle_t rootdir; /* root directory */ int manual; /* manual reset */ VARARG(name,unicode_str); /* object name */ @REPLY @@ -1371,6 +1372,7 @@ enum char_info_mode @REQ(open_timer) unsigned int access; /* wanted access rights */ unsigned int attributes; /* object attributes */ + obj_handle_t rootdir; /* root directory */ VARARG(name,unicode_str); /* object name */ @REPLY obj_handle_t handle; /* handle to the timer */ diff --git a/server/timer.c b/server/timer.c index 2576dcd..74419e5 100644 --- a/server/timer.c +++ b/server/timer.c @@ -72,12 +72,12 @@ static const struct object_ops timer_ops /* create a timer object */ -static struct timer *create_timer( const struct unicode_str *name, unsigned int attr, - int manual ) +static struct timer *create_timer( struct directory *root, const struct unicode_str *name, + unsigned int attr, int manual ) { struct timer *timer; - if ((timer = create_named_object( sync_namespace, &timer_ops, name, attr ))) + if ((timer = create_named_object_dir( root, name, attr, &timer_ops ))) { if (get_error() != STATUS_OBJECT_NAME_EXISTS) { @@ -209,24 +209,36 @@ DECL_HANDLER(create_timer) { struct timer *timer; struct unicode_str name; + struct directory *root = NULL; reply->handle = 0; get_req_unicode_str( &name ); - if ((timer = create_timer( &name, req->attributes, req->manual ))) + if (req->rootdir && !(root = get_directory_obj( current->process, req->rootdir, 0 ))) + return; + + if ((timer = create_timer( root, &name, req->attributes, req->manual ))) { reply->handle = alloc_handle( current->process, timer, req->access, req->attributes & OBJ_INHERIT ); release_object( timer ); } + + if (root) release_object( root ); } /* open a handle to a timer */ DECL_HANDLER(open_timer) { struct unicode_str name; + struct directory *root = NULL; get_req_unicode_str( &name ); - reply->handle = open_object( sync_namespace, &name, &timer_ops, req->access, req->attributes ); + 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 (root) release_object( root ); } /* set a waitable timer */ diff --git a/server/trace.c b/server/trace.c index e50e71a..3d4983a 100644 --- a/server/trace.c +++ b/server/trace.c @@ -1798,6 +1798,7 @@ static void dump_create_timer_request( c { fprintf( stderr, " access=%08x,", req->access ); fprintf( stderr, " attributes=%08x,", req->attributes ); + fprintf( stderr, " rootdir=%p,", req->rootdir ); fprintf( stderr, " manual=%d,", req->manual ); fprintf( stderr, " name=" ); dump_varargs_unicode_str( cur_size ); @@ -1812,6 +1813,7 @@ static void dump_open_timer_request( con { fprintf( stderr, " access=%08x,", req->access ); fprintf( stderr, " attributes=%08x,", req->attributes ); + fprintf( stderr, " rootdir=%p,", req->rootdir ); fprintf( stderr, " name=" ); dump_varargs_unicode_str( cur_size ); }

1 0

Vitaliy Margolen : Move event and mutex objects into directory name space.
by Alexandre Julliard Dec. 2, 2005

Dec. 2, 2005

Module: wine Branch: refs/heads/master Commit: f676bc8d85bdf890caece85e030099bde4ebc139 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=f676bc8d85bdf890caece85… Author: Vitaliy Margolen <wine-patch(a)kievinfo.com> Date: Fri Dec 2 14:55:48 2005 Move event and mutex objects into directory name space. --- dlls/kernel/kernel_private.h | 3 +++ dlls/kernel/sync.c | 30 ++++++++++++++++++++++++++++++ dlls/ntdll/sync.c | 4 ++++ dlls/ntdll/tests/om.c | 12 ++++++------ include/wine/server_protocol.h | 6 +++++- server/console.c | 2 +- server/event.c | 22 +++++++++++++++++----- server/mutex.c | 21 +++++++++++++++++---- server/named_pipe.c | 2 +- server/object.h | 4 ++-- server/process.c | 2 +- server/protocol.def | 4 ++++ server/trace.c | 4 ++++ 13 files changed, 95 insertions(+), 21 deletions(-)

1 0

Vitaliy Margolen : Move semaphore objects into directory name space.
by Alexandre Julliard Dec. 2, 2005

Dec. 2, 2005

Module: wine Branch: refs/heads/master Commit: 5daae3dfa9bc4403b26e742cc5446e3081e9bbd6 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=5daae3dfa9bc4403b26e742… Author: Vitaliy Margolen <wine-patch(a)kievinfo.com> Date: Fri Dec 2 15:01:17 2005 Move semaphore objects into directory name space. --- dlls/kernel/sync.c | 2 ++ dlls/ntdll/sync.c | 2 ++ include/wine/server_protocol.h | 4 +++- server/protocol.def | 2 ++ server/semaphore.c | 22 +++++++++++++++++----- server/trace.c | 2 ++ 6 files changed, 28 insertions(+), 6 deletions(-) diff --git a/dlls/kernel/sync.c b/dlls/kernel/sync.c index 659ee30..54f95a7 100644 --- a/dlls/kernel/sync.c +++ b/dlls/kernel/sync.c @@ -807,6 +807,7 @@ HANDLE WINAPI CreateSemaphoreW( SECURITY { RtlInitUnicodeString( &nameW, name ); attr.ObjectName = &nameW; + attr.RootDirectory = get_BaseNamedObjects_handle(); } status = NtCreateSemaphore( &ret, SEMAPHORE_ALL_ACCESS, &attr, initial, max ); @@ -858,6 +859,7 @@ HANDLE WINAPI OpenSemaphoreW( DWORD acce { RtlInitUnicodeString( &nameW, name ); attr.ObjectName = &nameW; + attr.RootDirectory = get_BaseNamedObjects_handle(); } status = NtOpenSemaphore( &ret, access, &attr ); diff --git a/dlls/ntdll/sync.c b/dlls/ntdll/sync.c index f5d85ae..675b9b7 100644 --- a/dlls/ntdll/sync.c +++ b/dlls/ntdll/sync.c @@ -85,6 +85,7 @@ NTSTATUS WINAPI NtCreateSemaphore( OUT P { req->access = access; req->attributes = (attr) ? attr->Attributes : 0; + req->rootdir = attr ? attr->RootDirectory : 0; req->initial = InitialCount; req->max = MaximumCount; if (len) wine_server_add_data( req, attr->ObjectName->Buffer, len ); @@ -111,6 +112,7 @@ NTSTATUS WINAPI NtOpenSemaphore( OUT PHA { req->access = access; req->attributes = (attr) ? attr->Attributes : 0; + req->rootdir = attr ? attr->RootDirectory : 0; if (len) wine_server_add_data( req, attr->ObjectName->Buffer, len ); ret = wine_server_call( req ); *SemaphoreHandle = reply->handle; diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 1818846..c144f24 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -707,6 +707,7 @@ struct create_semaphore_request struct request_header __header; unsigned int access; unsigned int attributes; + obj_handle_t rootdir; unsigned int initial; unsigned int max; /* VARARG(name,unicode_str); */ @@ -738,6 +739,7 @@ struct open_semaphore_request struct request_header __header; unsigned int access; unsigned int attributes; + obj_handle_t rootdir; /* VARARG(name,unicode_str); */ }; struct open_semaphore_reply @@ -4306,6 +4308,6 @@ union generic_reply struct query_symlink_reply query_symlink_reply; }; -#define SERVER_PROTOCOL_VERSION 202 +#define SERVER_PROTOCOL_VERSION 203 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/server/protocol.def b/server/protocol.def index 934ae42..a691e90 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -558,6 +558,7 @@ enum event_op { PULSE_EVENT, SET_EVENT, @REQ(create_semaphore) unsigned int access; /* wanted access rights */ unsigned int attributes; /* object attributes */ + obj_handle_t rootdir; /* root directory */ unsigned int initial; /* initial count */ unsigned int max; /* maximum count */ VARARG(name,unicode_str); /* object name */ @@ -579,6 +580,7 @@ enum event_op { PULSE_EVENT, SET_EVENT, @REQ(open_semaphore) unsigned int access; /* wanted access rights */ unsigned int attributes; /* object attributes */ + obj_handle_t rootdir; /* root directory */ VARARG(name,unicode_str); /* object name */ @REPLY obj_handle_t handle; /* handle to the semaphore */ diff --git a/server/semaphore.c b/server/semaphore.c index bff60c5..e8d9cbb 100644 --- a/server/semaphore.c +++ b/server/semaphore.c @@ -63,8 +63,8 @@ static const struct object_ops semaphore }; -static struct semaphore *create_semaphore( const struct unicode_str *name, unsigned int attr, - unsigned int initial, unsigned int max ) +static struct semaphore *create_semaphore( struct directory *root, const struct unicode_str *name, + unsigned int attr, unsigned int initial, unsigned int max ) { struct semaphore *sem; @@ -73,7 +73,7 @@ static struct semaphore *create_semaphor set_error( STATUS_INVALID_PARAMETER ); return NULL; } - if ((sem = create_named_object( sync_namespace, &semaphore_ops, name, attr ))) + if ((sem = create_named_object_dir( root, name, attr, &semaphore_ops ))) { if (get_error() != STATUS_OBJECT_NAME_EXISTS) { @@ -150,24 +150,36 @@ DECL_HANDLER(create_semaphore) { struct semaphore *sem; struct unicode_str name; + struct directory *root = NULL; reply->handle = 0; get_req_unicode_str( &name ); - if ((sem = create_semaphore( &name, req->attributes, req->initial, req->max ))) + if (req->rootdir && !(root = get_directory_obj( current->process, req->rootdir, 0 ))) + return; + + if ((sem = create_semaphore( root, &name, req->attributes, req->initial, req->max ))) { reply->handle = alloc_handle( current->process, sem, req->access, req->attributes & OBJ_INHERIT ); release_object( sem ); } + + if (root) release_object( root ); } /* open a handle to a semaphore */ DECL_HANDLER(open_semaphore) { struct unicode_str name; + struct directory *root = NULL; get_req_unicode_str( &name ); - reply->handle = open_object( sync_namespace, &name, &semaphore_ops, req->access, req->attributes ); + 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 (root) release_object( root ); } /* release a semaphore */ diff --git a/server/trace.c b/server/trace.c index 04c4bb4..e50e71a 100644 --- a/server/trace.c +++ b/server/trace.c @@ -968,6 +968,7 @@ static void dump_create_semaphore_reques { fprintf( stderr, " access=%08x,", req->access ); fprintf( stderr, " attributes=%08x,", req->attributes ); + fprintf( stderr, " rootdir=%p,", req->rootdir ); fprintf( stderr, " initial=%08x,", req->initial ); fprintf( stderr, " max=%08x,", req->max ); fprintf( stderr, " name=" ); @@ -994,6 +995,7 @@ static void dump_open_semaphore_request( { fprintf( stderr, " access=%08x,", req->access ); fprintf( stderr, " attributes=%08x,", req->attributes ); + fprintf( stderr, " rootdir=%p,", req->rootdir ); fprintf( stderr, " name=" ); dump_varargs_unicode_str( cur_size ); }

1 0

Jacek Caban : Sync the WebBrowser's window size with document's window.
by Alexandre Julliard Dec. 2, 2005

Dec. 2, 2005

Module: wine Branch: refs/heads/master Commit: 84f0597d08a83844289ed6e7248eb72a9da828c8 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=84f0597d08a83844289ed6e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Dec 2 14:54:58 2005 Sync the WebBrowser's window size with document's window. --- dlls/shdocvw/dochost.c | 15 ++++++++++++++- 1 files changed, 14 insertions(+), 1 deletions(-) diff --git a/dlls/shdocvw/dochost.c b/dlls/shdocvw/dochost.c index 257ac78..d5dc95c 100644 --- a/dlls/shdocvw/dochost.c +++ b/dlls/shdocvw/dochost.c @@ -88,6 +88,18 @@ static LRESULT navigate2(WebBrowser *Thi return 0; } +static LRESULT resize_document(WebBrowser *This, LONG width, LONG height) +{ + RECT rect = {0, 0, width, height}; + + TRACE("(%p)->(%ld %ld)\n", This, width, height); + + if(This->view) + IOleDocumentView_SetRect(This->view, &rect); + + return 0; +} + static LRESULT WINAPI doc_view_proc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) { WebBrowser *This; @@ -96,13 +108,14 @@ static LRESULT WINAPI doc_view_proc(HWND if(msg == WM_CREATE) { This = *(WebBrowser**)lParam; - ERR("create %p\n", This); SetPropW(hwnd, wszTHIS, This); }else { This = GetPropW(hwnd, wszTHIS); } switch(msg) { + case WM_SIZE: + return resize_document(This, LOWORD(lParam), HIWORD(lParam)); case WB_WM_NAVIGATE2: return navigate2(This); }

1 0

CVSROOT/. loginfo
by Alexandre Julliard Dec. 2, 2005

Dec. 2, 2005

ChangeSet ID: 21634 CVSROOT: /opt/cvs-commit Module name: CVSROOT Changes by: julliard(a)winehq.org 2005/12/02 09:43:52 Modified files: . : loginfo Log message: Don't send mail to wine-cvs for the wine module, this will be done from the git repository. Patch: http://cvs.winehq.org/patch.py?id=21634 Old revision New revision Changes Path 1.50 1.51 +2 -1 CVSROOT/loginfo Index: CVSROOT/loginfo diff -u -p CVSROOT/loginfo:1.50 CVSROOT/loginfo:1.51 --- CVSROOT/loginfo:1.50 2 Dec 2005 15:43:52 -0000 +++ CVSROOT/loginfo 2 Dec 2005 15:43:52 -0000 @@ -28,7 +28,8 @@ # Use this for testing ^test /usr/bin/perl $CVSROOT/CVSROOT/log_accum -m testing(a)winehq.org -f $CVSROOT/CVSROOT/commitlog -S -s %p %s +^wine /usr/bin/perl $CVSROOT/CVSROOT/log_accum -f $CVSROOT/CVSROOT/commitlog -S -s %p %s + # All others go to wine-cvs -^wine /usr/bin/perl $CVSROOT/CVSROOT/log_accum -m wine-cvs(a)winehq.org -f $CVSROOT/CVSROOT/commitlog -L 200 -p -S -s %p %s DEFAULT /usr/bin/perl $CVSROOT/CVSROOT/log_accum -m wine-cvs(a)winehq.org -f $CVSROOT/CVSROOT/commitlog -P winehq -L 200 -p -c -S -s %p %s

1 0

CVSROOT/. log_accum
by Alexandre Julliard Dec. 2, 2005

Dec. 2, 2005

ChangeSet ID: 21633 CVSROOT: /opt/cvs-commit Module name: CVSROOT Changes by: julliard(a)winehq.org 2005/12/02 09:41:56 Modified files: . : log_accum Log message: Don't die if no mail recipient was specified. Patch: http://cvs.winehq.org/patch.py?id=21633 Old revision New revision Changes Path 1.31 1.32 +0 -1 CVSROOT/log_accum Index: CVSROOT/log_accum diff -u -p CVSROOT/log_accum:1.31 CVSROOT/log_accum:1.32 --- CVSROOT/log_accum:1.31 2 Dec 2005 15:41:56 -0000 +++ CVSROOT/log_accum 2 Dec 2005 15:41:56 -0000 @@ -600,7 +600,6 @@ while (@ARGV) { push @files, $arg; } } -($mailto) || die("No -m mail recipient specified\n"); if ($do_summary) {

1 0