December 2005 - Wine-Commits

Filip Navara : kernel: Fix the Mach-O binary magic.
by Alexandre Julliard Dec. 12, 2005

Dec. 12, 2005

Module: wine Branch: refs/heads/master Commit: 2f7480e5afbbcaded9029e34eab323f40c6334a4 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=2f7480e5afbbcaded9029e3… Author: Filip Navara <xnavara(a)volny.cz> Date: Mon Dec 12 11:50:15 2005 +0100 kernel: Fix the Mach-O binary magic. --- dlls/kernel/module.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/kernel/module.c b/dlls/kernel/module.c index 360f534..c26345d 100644 --- a/dlls/kernel/module.c +++ b/dlls/kernel/module.c @@ -270,7 +270,7 @@ enum binary_type MODULE_GetBinaryType( H } /* Mach-o File with Endian set to Big Endian or Little Endian */ - if (header.macho.magic == 0xfeedface || header.macho.magic == 0xecafdeef) + if (header.macho.magic == 0xfeedface || header.macho.magic == 0xcefaedfe) { switch(header.macho.filetype) {

1 0

Thomas Weidenmueller : urlmon: Correctly fix IStream::Read.
by Alexandre Julliard Dec. 12, 2005

Dec. 12, 2005

Module: wine Branch: refs/heads/master Commit: ac459e7ea0592feacc67e322d40cc835a805a99f URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ac459e7ea0592feacc67e32… Author: Thomas Weidenmueller <wine-patches(a)reactsoft.com> Date: Mon Dec 12 11:49:29 2005 +0100 urlmon: Correctly fix IStream::Read. Don't dereference a possible NULL pointer. --- dlls/urlmon/umstream.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/urlmon/umstream.c b/dlls/urlmon/umstream.c index 720c8ba..36909b6 100644 --- a/dlls/urlmon/umstream.c +++ b/dlls/urlmon/umstream.c @@ -225,7 +225,7 @@ static HRESULT WINAPI IStream_fnRead (IS ULONG cb, ULONG* pcbRead) { - DWORD dwBytesRead; + ULONG dwBytesRead; IUMCacheStream *This = (IUMCacheStream *)iface; TRACE("(%p)->(%p,0x%08lx,%p)\n",This, pv, cb, pcbRead); @@ -233,7 +233,10 @@ static HRESULT WINAPI IStream_fnRead (IS if ( !pv ) return STG_E_INVALIDPOINTER; - if ( ! ReadFile( This->handle, pv, cb, (pcbRead ? pcbRead : &dwBytesRead), NULL ) ) + if ( !pcbRead) + pcbRead = &dwBytesRead; + + if ( ! ReadFile( This->handle, pv, cb, (LPDWORD)pcbRead, NULL ) ) return S_FALSE; if (!*pcbRead)

1 0

Markus Amsler : winedos: Implement MCB.
by Alexandre Julliard Dec. 12, 2005

Dec. 12, 2005

Module: wine Branch: refs/heads/master Commit: 19d60d3c5afa63b95d56ce2498c70cb7fd60ca1c URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=19d60d3c5afa63b95d56ce2… Author: Markus Amsler <markus.amsler(a)oribi.org> Date: Mon Dec 12 11:50:01 2005 +0100 winedos: Implement MCB. --- dlls/winedos/dosmem.c | 411 ++++++++++++++++++++++--------------------------- 1 files changed, 185 insertions(+), 226 deletions(-)

1 0

lostwages/wwn wn20051211_301.xml
by WineHQ Dec. 11, 2005

Dec. 11, 2005

ChangeSet ID: 21768 CVSROOT: /opt/cvs-commit Module name: lostwages Changes by: wineowner(a)winehq.org 2005/12/11 23:13:22 Modified files: wwn : wn20051211_301.xml Log message: fix spelling mistakes in WWN #301 Patch: http://cvs.winehq.org/patch.py?id=21768 Old revision New revision Changes Path 1.1 1.2 +19 -19 lostwages/wwn/wn20051211_301.xml Index: lostwages/wwn/wn20051211_301.xml diff -u -p lostwages/wwn/wn20051211_301.xml:1.1 lostwages/wwn/wn20051211_301.xml:1.2 --- lostwages/wwn/wn20051211_301.xml:1.1 12 Dec 2005 5:13:22 -0000 +++ lostwages/wwn/wn20051211_301.xml 12 Dec 2005 5:13:22 -0000 @@ -74,7 +74,7 @@ Its main goal is to break drill bits. It <section title="News: Wine 0.9.3" subject="News" - archive="http://www.winehq.com/?announce=1.107"> + archive="http://www.winehq.com/?announce=1.107" posts="1" > <topic>News</topic> @@ -134,13 +134,13 @@ GetDC/ReleaseDC a lot. While the patch fixes the conversion bottleneck for various games it doesn't handle 8bit paletted which is used by games like StarCraft as OpenGL doesn't -support this by default. The second patch which I attached aswell adds -support for this. On cards (atleast all nvidia cards from geforce 1 to the +support this by default. The second patch which I attached as well adds +support for this. On cards (at least all nvidia cards from geforce 1 to the fx) that support the opengl paletted texture extension this extension is used. It makes StarCraft very fast atleast on my Athlon XP2000 system with a GeforceFX where the game was slow before. As not all cards support paletted textures I emulated this using a simple fragment shader. (a 1D texture -containing the palette is used as a loopup table) +containing the palette is used as a lookup table) The <a href="http://www.winehq.org/pipermail/wine-devel/attachments/20051204/ca64706a/dd…">attached</a> @@ -161,7 +161,7 @@ I can fix the patches and submit them to Jesse Allen asked some questions about it: <quote who="Jesse Allen"> Is Starcraft really that slow? How does this compare with using DGA? - I'm not too sure because its speed vaires. I've been testing + I'm not too sure because its speed varies. I've been testing Starcraft this weekend and it has been plenty speedy. But I do remember when trying to play it multiplayer a few months ago and was burned when it ran slow. In fact it slowed *everyone* down. Not fun. @@ -191,12 +191,12 @@ and the rendering of them. I think the patch is a reasonable solution to work around various depth conversion problems. For sure it is the fastest way for the conversion as -the videocard basicly does it for free. On my system StarCraft and the +the videocard basically does it for free. On my system StarCraft and the Command & Conquer series (although they crash quite quickly due to threading issues) felt a lot faster, I think that the speed is close to that of DGA. Perhaps I should clarify some misunderstandings that some people have. (I -hope I explain it correctly) Basicly DirectDraw provides a mechanism to +hope I explain it correctly) Basically DirectDraw provides a mechanism to directly access the framebuffer of the videocard. This is the fastest way to render 2D images on the screen. Games like StarCraft, Total Annihilation, C&C and lots of others use DirectDraw in this way. Second there's another @@ -206,13 +206,13 @@ then use GetDC/ReleaseDC to get a device the surface. (directly into the video memory) In case of X direct framebuffer access is only possible through DGA but it -is unsecure and has other issues. When DGA works correctly it can accelerate +is insecure and has other issues. When DGA works correctly it can accelerate games like StarCraft. Further DGA doesn't have any depth conversion issues as it does depth switching. Without DGA the rendering operations need to go through X. Because of limitations of X, depth conversion problems appear when the depth of the desktop and X aren't the same. -For depth conversion purposes Wine's DirectDraw uses a DIB section. Basicly +For depth conversion purposes Wine's DirectDraw uses a DIB section. Basically all pixels of an image are translated to the depth of X. This is slow and especially for the case when the application requests 8bit paletted mode using a 24bit desktop. In this case a color lookup needs to happen in a @@ -241,7 +241,7 @@ StarCraft (much) as for those DIBs were the conversion algorithm stays the same (it can't be tweaked much if at all). So there's not really a way to speedup games like StarCraft for old videocards. Perhaps XShm might be of use but not sure how much it would -help. (think it would only be usefull for GetDC/ReleaseDC games) +help. (think it would only be useful for GetDC/ReleaseDC games) </quote> Pretty much everyone was in favor of any patch that would improve @@ -257,7 +257,7 @@ I think that to merge Roderick's and you the best would be to directly hook WineD3D even at the 2D level and not have DDraw hook DDraw's D3D which then goes into WineD3D. -This way we would have an unified DDraw. +This way we would have a unified DDraw. Of course, then the problem remains of what to do with older cards :-) </quote> @@ -269,11 +269,11 @@ a quite long chain. I abandoned it as to worth considering. How about moving the current 2D code to WineD3D, and making DDraw running over -WineD3D in any case. Then WineD3D could decide wether to use plain X11, DGA +WineD3D in any case. Then WineD3D could decide whether to use plain X11, DGA or OpenGL for 2D rendering. :) Maybe we should have a close look at the details of such a thing. I do not -really recommend a ad-hoc attemt, as d3d7->WineD3D was nearly too much. +really recommend a ad-hoc attempt, as d3d7->WineD3D was nearly too much. </quote> Lionel liked the idea: @@ -312,7 +312,7 @@ So what's the point of this mail? While by wrapping D3D7 only and leave DirectDraw in ddraw.dll, it has a few ugly drawbacks: <ul> -<li> Device initalisation: In D3D7, the first step is to create a IDirectDraw +<li> Device initialization: In D3D7, the first step is to create a IDirectDraw Device, set up the device, create a surface and then create a Direct3D Device. When creating the WineD3DDevice in the last step, I have to do some ugly things to wrap the already existing Surface to a newly created @@ -340,7 +340,7 @@ adopt it for D3D9 and D3D8.</li> <li> The IWineD3DSurface interface gets additional functionality for DirectDraw operations. I'd suggest 3 versions of the 2D functions: One based on plain -X11(for compatiblity) calls, one that uses DGA(speed without 3D +X11(for compatibility) calls, one that uses DGA(speed without 3D acceleration), and one that uses OpenGL(For fast rendering without /dev/mem access). For DXVersion > 7 the OpenGL version is used, and for DX7 it can be decided when the primary surface is created.</li> @@ -429,7 +429,7 @@ can also be the most time consuming part out exactly what broke something can get you really close to having a fix. -(There's also some exceptions to this, such as adding in stubbed +(There are also some exceptions to this, such as adding in stubbed functions that cause programs to suddenly break. The right fix is not to remove the stub, but to turn the stub into a complete function.. which may be a lot of work.) @@ -512,7 +512,7 @@ once be a problem?</quote> > <topic>Build Process</topic> Apparently Fedora's 64-bit version doesn't provide some of the -32-bit compatbility libraries necessary for Wine. (Which is somewhat +32-bit compatibility libraries necessary for Wine. (Which is somewhat surprising since Wine doesn't have as many dependencies as you'd expect.) Pavel Roskin came up with a script to work around it: <quote who="Pavel Roskin"> @@ -589,7 +589,7 @@ Wine crashes the first time it enters/us debug setup from ntdll/relay.c:RELAY_SetupDLL. (Which happens to be a RtlInitUnicode in kernel/module:GetModuleHandleW) . If you exclude the ntdll in relaying, wine - without parameters - does not crash. BUT at soon -as you try running a program it will cracsh when calling a kernel32/* +as you try running a program it will crash when calling a kernel32/* function.</quote> Mike McCormack knew of it as well and mentioned there was a @@ -611,6 +611,6 @@ Try booting with <tt>noexec=off</tt>. I month ago, but my mandrake crashed - for some obscure reasons - before reaching a prompt.</quote> -So that's where we stand. A problem with a possible workaround, but +So that's where we stand: a problem with a possible workaround, but insufficient info to have a real fix. Is it a Wine problem? Kernel? </section></kc>

1 0

lostwages/ news/2005121102.xml wwn/wn20051211_ ...
by WineHQ Dec. 11, 2005

Dec. 11, 2005

ChangeSet ID: 21767 CVSROOT: /opt/cvs-commit Module name: lostwages Changes by: wineowner(a)winehq.org 2005/12/11 19:08:34 Added files: news : 2005121102.xml wwn : wn20051211_301.xml Log message: WWN #301 Patch: http://cvs.winehq.org/patch.py?id=21767 Old revision New revision Changes Path Added 1.1 +0 -0 lostwages/news/2005121102.xml Added 1.1 +0 -0 lostwages/wwn/wn20051211_301.xml

1 0

lostwages/ include/winehq.conf news/2005121101.xml
by WineHQ Dec. 11, 2005

Dec. 11, 2005

ChangeSet ID: 21766 CVSROOT: /opt/cvs-commit Module name: lostwages Changes by: wineowner(a)winehq.org 2005/12/11 09:40:31 Modified files: include : winehq.conf Added files: news : 2005121101.xml Log message: News about Wine 0.9.3 Patch: http://cvs.winehq.org/patch.py?id=21766 Old revision New revision Changes Path 1.26 1.27 +1 -1 lostwages/include/winehq.conf Added 1.1 +0 -0 lostwages/news/2005121101.xml Index: lostwages/include/winehq.conf diff -u -p lostwages/include/winehq.conf:1.26 lostwages/include/winehq.conf:1.27 --- lostwages/include/winehq.conf:1.26 11 Dec 2005 15:40:31 -0000 +++ lostwages/include/winehq.conf 11 Dec 2005 15:40:31 -0000 @@ -29,7 +29,7 @@ news_xml_path: news wwn_xml_path: wwn # Snapshot Date -snapshot_date: 0.9.2 +snapshot_date: 0.9.3 # Current RH Packages Snapshot Date snapshot_date_rh: 0.9.2 Index: lostwages/news/2005121101.xml diff -u -p /dev/null lostwages/news/2005121101.xml:1.1 --- /dev/null 11 Dec 2005 15:40:31 -0000 +++ lostwages/news/2005121101.xml 11 Dec 2005 15:40:31 -0000 @@ -0,0 +1,26 @@ +<news> + <date>December 11, 2005</date> + <title>Wine 0.9.3 Released</title> + <body> + +A new CVS snapshot is out, wine-0.9.3. Alexandre noted the following +changes: +<ul> + <li> Many marshalling fixes in rpcrt4.</li> + <li> Various OLE improvements and fixes.</li> + <li> Better audio driver management in winecfg.</li> + <li> Many wininet fixes.</li> + <li> Several Web browser improvements.</li> + <li> More dbghelp APIs implemented.</li> + <li> Directory objects in wineserver.</li> +</ul> + + Binary packages are in the process of being built, but the source is + <a href="http://prdownloads.sourceforge.net/wine/wine-0.9.3.tar.bz2">available + now</a>. You can find out more about this release in the + <a href="?announce=1.107">announcement</a>. Check out our + <a href="/site/download">download page</a> for packages for your favorite + distribution. + + </body> +</news>

1 0

H. Verbeet : d3d9: Add a test for BeginStateBlock and EndStateBlock.
by Alexandre Julliard Dec. 9, 2005

Dec. 9, 2005

Module: wine Branch: refs/heads/master Commit: c26ad82e75e408c302c21228ef08c1af0482326c URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=c26ad82e75e408c302c2122… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Fri Dec 9 14:53:28 2005 +0100 d3d9: Add a test for BeginStateBlock and EndStateBlock. --- configure | 3 + configure.ac | 1 dlls/d3d9/Makefile.in | 2 + dlls/d3d9/tests/.gitignore | 3 + dlls/d3d9/tests/Makefile.in | 13 ++++++ dlls/d3d9/tests/stateblock.c | 88 ++++++++++++++++++++++++++++++++++++++++++ 6 files changed, 109 insertions(+), 1 deletions(-) create mode 100644 dlls/d3d9/tests/.gitignore create mode 100644 dlls/d3d9/tests/Makefile.in create mode 100644 dlls/d3d9/tests/stateblock.c

1 0

Markus Amsler : Remove unneeded ; from DECL_WINELIB_TYPE_AW in mmsystem.h.
by Alexandre Julliard Dec. 9, 2005

Dec. 9, 2005

Module: wine Branch: refs/heads/master Commit: 60519ea7afd5e8cd75c8e5e88cc8cc1b6b78d516 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=60519ea7afd5e8cd75c8e5e… Author: Markus Amsler <markus.amsler(a)oribi.org> Date: Fri Dec 9 14:52:39 2005 +0100 Remove unneeded ; from DECL_WINELIB_TYPE_AW in mmsystem.h. --- include/mmsystem.h | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/mmsystem.h b/include/mmsystem.h index 81b34e6..2b55be0 100644 --- a/include/mmsystem.h +++ b/include/mmsystem.h @@ -2045,8 +2045,8 @@ typedef struct tagMCI_SOUND_PARMSW { LPCWSTR lpstrSoundName; } MCI_SOUND_PARMSW, *LPMCI_SOUND_PARMSW; -DECL_WINELIB_TYPE_AW(MCI_SOUND_PARMS); -DECL_WINELIB_TYPE_AW(LPMCI_SOUND_PARMS); +DECL_WINELIB_TYPE_AW(MCI_SOUND_PARMS) +DECL_WINELIB_TYPE_AW(LPMCI_SOUND_PARMS) typedef struct tagMCI_SAVE_PARMSA { DWORD_PTR dwCallback; @@ -2058,8 +2058,8 @@ typedef struct tagMCI_SAVE_PARMSW { LPCWSTR lpfilename; } MCI_SAVE_PARMSW, *LPMCI_SAVE_PARMSW; -DECL_WINELIB_TYPE_AW(MCI_SAVE_PARMS); -DECL_WINELIB_TYPE_AW(LPMCI_SAVE_PARMS); +DECL_WINELIB_TYPE_AW(MCI_SAVE_PARMS) +DECL_WINELIB_TYPE_AW(LPMCI_SAVE_PARMS) typedef struct tagMCI_LOAD_PARMSA { DWORD_PTR dwCallback;

1 0

Kai Blin : secur32: Fix conversion of password in NTLM AcquireCredentialsHandleA.
by Alexandre Julliard Dec. 9, 2005

Dec. 9, 2005

Module: wine Branch: refs/heads/master Commit: 3ba73f0ff6d749cc6c049b88da287c9afa1e59f9 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=3ba73f0ff6d749cc6c049b8… Author: Kai Blin <blin(a)gmx.net> Date: Fri Dec 9 14:52:20 2005 +0100 secur32: Fix conversion of password in NTLM AcquireCredentialsHandleA. --- dlls/secur32/ntlm.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/secur32/ntlm.c b/dlls/secur32/ntlm.c index 94715b5..3de699f 100644 --- a/dlls/secur32/ntlm.c +++ b/dlls/secur32/ntlm.c @@ -353,7 +353,7 @@ static SECURITY_STATUS SEC_ENTRY ntlm_Ac passwd = HeapAlloc(GetProcessHeap(), 0, passwd_sizeW * sizeof(SEC_WCHAR)); MultiByteToWideChar(CP_ACP, 0, (LPCSTR)identity->Password, - identity->PasswordLength, passwd, passwd_sizeW); + identity->PasswordLength+1, passwd, passwd_sizeW); } else {

1 0

Alexandre Julliard : server: Added object attributes to a few more requests.
by Alexandre Julliard Dec. 9, 2005

Dec. 9, 2005

Module: wine Branch: refs/heads/master Commit: 03b040c51dbfbcc73973199452da0ca6f1c66d64 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=03b040c51dbfbcc73973199… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 9 14:52:04 2005 +0100 server: Added object attributes to a few more requests. --- dlls/kernel/change.c | 8 +++++--- dlls/ntdll/reg.c | 16 +++++++++------- include/wine/server_protocol.h | 6 +++++- server/change.c | 3 +-- server/protocol.def | 4 ++++ server/registry.c | 4 ++-- server/trace.c | 4 ++++ 7 files changed, 30 insertions(+), 15 deletions(-) diff --git a/dlls/kernel/change.c b/dlls/kernel/change.c index e2d6978..601c18f 100644 --- a/dlls/kernel/change.c +++ b/dlls/kernel/change.c @@ -88,9 +88,11 @@ HANDLE WINAPI FindFirstChangeNotificatio SERVER_START_REQ( create_change_notification ) { - req->handle = file; - req->subtree = bWatchSubtree; - req->filter = dwNotifyFilter; + req->access = STANDARD_RIGHTS_REQUIRED | SYNCHRONIZE; + req->attributes = 0; + req->handle = file; + req->subtree = bWatchSubtree; + req->filter = dwNotifyFilter; if (!wine_server_call_err( req )) ret = reply->handle; } SERVER_END_REQ; diff --git a/dlls/ntdll/reg.c b/dlls/ntdll/reg.c index 5ade8bd..d05d9c7 100644 --- a/dlls/ntdll/reg.c +++ b/dlls/ntdll/reg.c @@ -63,11 +63,12 @@ NTSTATUS WINAPI NtCreateKey( PHANDLE ret SERVER_START_REQ( create_key ) { - req->parent = attr->RootDirectory; - req->access = access; - req->options = options; - req->modif = 0; - req->namelen = attr->ObjectName->Length; + req->parent = attr->RootDirectory; + req->access = access; + req->attributes = attr->Attributes; + req->options = options; + req->modif = 0; + req->namelen = attr->ObjectName->Length; wine_server_add_data( req, attr->ObjectName->Buffer, attr->ObjectName->Length ); if (class) wine_server_add_data( req, class->Buffer, class->Length ); if (!(ret = wine_server_call( req ))) @@ -123,8 +124,9 @@ NTSTATUS WINAPI NtOpenKey( PHANDLE retke SERVER_START_REQ( open_key ) { - req->parent = attr->RootDirectory; - req->access = access; + req->parent = attr->RootDirectory; + req->access = access; + req->attributes = attr->Attributes; wine_server_add_data( req, attr->ObjectName->Buffer, len ); ret = wine_server_call( req ); *retkey = reply->hkey; diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index f494e54..46af45f 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -1382,6 +1382,8 @@ struct send_console_signal_reply struct create_change_notification_request { struct request_header __header; + unsigned int access; + unsigned int attributes; obj_handle_t handle; int subtree; unsigned int filter; @@ -1689,6 +1691,7 @@ struct create_key_request struct request_header __header; obj_handle_t parent; unsigned int access; + unsigned int attributes; unsigned int options; time_t modif; size_t namelen; @@ -1708,6 +1711,7 @@ struct open_key_request struct request_header __header; obj_handle_t parent; unsigned int access; + unsigned int attributes; /* VARARG(name,unicode_str); */ }; struct open_key_reply @@ -4321,6 +4325,6 @@ union generic_reply struct query_symlink_reply query_symlink_reply; }; -#define SERVER_PROTOCOL_VERSION 214 +#define SERVER_PROTOCOL_VERSION 215 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/server/change.c b/server/change.c index f85f0d3..661cb87 100644 --- a/server/change.c +++ b/server/change.c @@ -232,8 +232,7 @@ DECL_HANDLER(create_change_notification) if ((change = create_change_notification( fd, req->subtree, req->filter ))) { - reply->handle = alloc_handle( current->process, change, - STANDARD_RIGHTS_REQUIRED|SYNCHRONIZE, 0 ); + reply->handle = alloc_handle( current->process, change, req->access, req->attributes ); release_object( change ); } release_object( fd ); diff --git a/server/protocol.def b/server/protocol.def index 3fd4ff0..3d055cb 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -1031,6 +1031,8 @@ enum char_info_mode /* Create a change notification */ @REQ(create_change_notification) + unsigned int access; /* wanted access rights */ + unsigned int attributes; /* object attributes */ obj_handle_t handle; /* handle to the directory */ int subtree; /* watch all the subtree */ unsigned int filter; /* notification filter */ @@ -1237,6 +1239,7 @@ enum char_info_mode @REQ(create_key) obj_handle_t parent; /* handle to the parent key */ unsigned int access; /* desired access rights */ + unsigned int attributes; /* object attributes */ unsigned int options; /* creation options */ time_t modif; /* last modification time */ size_t namelen; /* length of key name in bytes */ @@ -1251,6 +1254,7 @@ enum char_info_mode @REQ(open_key) obj_handle_t parent; /* handle to the parent key */ unsigned int access; /* desired access rights */ + unsigned int attributes; /* object attributes */ VARARG(name,unicode_str); /* key name */ @REPLY obj_handle_t hkey; /* handle to the open key */ diff --git a/server/registry.c b/server/registry.c index 964bdef..5610984 100644 --- a/server/registry.c +++ b/server/registry.c @@ -1731,7 +1731,7 @@ DECL_HANDLER(create_key) if ((key = create_key( parent, &name, &class, flags, req->modif, &reply->created ))) { - reply->hkey = alloc_handle( current->process, key, access, 0 ); + reply->hkey = alloc_handle( current->process, key, access, req->attributes ); release_object( key ); } release_object( parent ); @@ -1753,7 +1753,7 @@ DECL_HANDLER(open_key) get_req_path( &name, !req->parent ); if ((key = open_key( parent, &name ))) { - reply->hkey = alloc_handle( current->process, key, access, 0 ); + reply->hkey = alloc_handle( current->process, key, access, req->attributes ); release_object( key ); } release_object( parent ); diff --git a/server/trace.c b/server/trace.c index e0947e2..fcc447e 100644 --- a/server/trace.c +++ b/server/trace.c @@ -1432,6 +1432,8 @@ static void dump_send_console_signal_req static void dump_create_change_notification_request( const struct create_change_notification_request *req ) { + fprintf( stderr, " access=%08x,", req->access ); + fprintf( stderr, " attributes=%08x,", req->attributes ); fprintf( stderr, " handle=%p,", req->handle ); fprintf( stderr, " subtree=%d,", req->subtree ); fprintf( stderr, " filter=%08x", req->filter ); @@ -1655,6 +1657,7 @@ static void dump_create_key_request( con { fprintf( stderr, " parent=%p,", req->parent ); fprintf( stderr, " access=%08x,", req->access ); + fprintf( stderr, " attributes=%08x,", req->attributes ); fprintf( stderr, " options=%08x,", req->options ); fprintf( stderr, " modif=%ld,", (long)req->modif ); fprintf( stderr, " namelen=%d,", req->namelen ); @@ -1675,6 +1678,7 @@ static void dump_open_key_request( const { fprintf( stderr, " parent=%p,", req->parent ); fprintf( stderr, " access=%08x,", req->access ); + fprintf( stderr, " attributes=%08x,", req->attributes ); fprintf( stderr, " name=" ); dump_varargs_unicode_str( cur_size ); }

1 0