November 2005 - Wine-Commits

wine/tools/winedump lnk.c
by Alexandre Julliard Nov. 2, 2005

Nov. 2, 2005

ChangeSet ID: 21032 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/02 04:55:13 Modified files: tools/winedump : lnk.c Log message: Mike McCormack <mike(a)codeweavers.com> Handle msi component identifiers without a feature guid. Patch: http://cvs.winehq.org/patch.py?id=21032 Old revision New revision Changes Path 1.12 1.13 +7 -3 wine/tools/winedump/lnk.c Index: wine/tools/winedump/lnk.c diff -u -p wine/tools/winedump/lnk.c:1.12 wine/tools/winedump/lnk.c:1.13 --- wine/tools/winedump/lnk.c:1.12 2 Nov 2005 10:55:13 -0000 +++ wine/tools/winedump/lnk.c 2 Nov 2005 10:55:13 -0000 @@ -363,18 +363,22 @@ static int dump_advertise_info(int fd, c comp = &avt->bufA[20]; feat = strchr(comp,'>'); + if (!feat) + feat = strchr(comp,'<'); if (feat) { memcpy( comp_str, comp, feat - comp ); comp_str[feat-comp] = 0; } else - strcpy( prod_str, "?" ); + { + strcpy( comp_str, "?" ); + } - if (feat && base85_to_guid( &feat[1], &guid )) + if (feat && feat[0] == '>' && base85_to_guid( &feat[1], &guid )) guid_to_string( &guid, feat_str ); else - strcpy( prod_str, "?" ); + feat_str[0] = 0; printf(" product: %s\n", prod_str); printf(" component: %s\n", comp_str );

1 0

wine/dlls/msxml3 node.c
by Alexandre Julliard Nov. 2, 2005

Nov. 2, 2005

ChangeSet ID: 21031 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/02 04:55:03 Modified files: dlls/msxml3 : node.c Log message: Mike McCormack <mike(a)codeweavers.com> Implement IXMLDOMNode::get_nodeName. Patch: http://cvs.winehq.org/patch.py?id=21031 Old revision New revision Changes Path 1.9 1.10 +23 -2 wine/dlls/msxml3/node.c Index: wine/dlls/msxml3/node.c diff -u -p wine/dlls/msxml3/node.c:1.9 wine/dlls/msxml3/node.c:1.10 --- wine/dlls/msxml3/node.c:1.9 2 Nov 2005 10:55: 3 -0000 +++ wine/dlls/msxml3/node.c 2 Nov 2005 10:55: 3 -0000 @@ -173,8 +173,29 @@ static HRESULT WINAPI xmlnode_get_nodeNa IXMLDOMNode *iface, BSTR* name) { - FIXME("\n"); - return E_NOTIMPL; + xmlnode *This = impl_from_IXMLDOMNode( iface ); + const xmlChar *str; + + TRACE("%p\n", This ); + + if ( !This->node ) + return E_FAIL; + + switch( This->node->type ) + { + case XML_TEXT_NODE: + str = (const xmlChar*) "#text"; + break; + default: + str = This->node->name; + break; + } + + *name = bstr_from_xmlChar( str ); + if (!*name) + return S_FALSE; + + return S_OK; } BSTR bstr_from_xmlChar( const xmlChar *buf )

1 0

wine/dlls/oleaut32 oleaut.c
by Alexandre Julliard Nov. 2, 2005

Nov. 2, 2005

ChangeSet ID: 21030 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/02 04:54:52 Modified files: dlls/oleaut32 : oleaut.c Log message: Robert Shearman <rob(a)codeweavers.com> The PSDispatch PS class factory can manage both typelib marshalled and IDispatch, which is NDR marshalled, so we need a wrapper to call the appropriate CreateProxy or CreateStub function. Patch: http://cvs.winehq.org/patch.py?id=21030 Old revision New revision Changes Path 1.53 1.54 +76 -2 wine/dlls/oleaut32/oleaut.c Index: wine/dlls/oleaut32/oleaut.c diff -u -p wine/dlls/oleaut32/oleaut.c:1.53 wine/dlls/oleaut32/oleaut.c:1.54 --- wine/dlls/oleaut32/oleaut.c:1.53 2 Nov 2005 10:54:52 -0000 +++ wine/dlls/oleaut32/oleaut.c 2 Nov 2005 10:54:52 -0000 @@ -699,6 +699,76 @@ extern HRESULT OLEAUTPS_DllGetClassObjec extern void _get_STDFONT_CF(LPVOID); extern void _get_STDPIC_CF(LPVOID); +static HRESULT WINAPI PSDispatchFacBuf_QueryInterface(IPSFactoryBuffer *iface, REFIID riid, void **ppv) +{ + if (IsEqualIID(riid, &IID_IUnknown) || + IsEqualIID(riid, &IID_IPSFactoryBuffer)) + { + IUnknown_AddRef(iface); + *ppv = (void *)iface; + return S_OK; + } + return E_NOINTERFACE; +} + +static ULONG WINAPI PSDispatchFacBuf_AddRef(IPSFactoryBuffer *iface) +{ + return 2; +} + +static ULONG WINAPI PSDispatchFacBuf_Release(IPSFactoryBuffer *iface) +{ + return 1; +} + +static HRESULT WINAPI PSDispatchFacBuf_CreateProxy(IPSFactoryBuffer *iface, IUnknown *pUnkOuter, REFIID riid, IRpcProxyBuffer **ppProxy, void **ppv) +{ + IPSFactoryBuffer *pPSFB; + HRESULT hr; + + if (IsEqualIID(riid, &IID_IDispatch)) + hr = OLEAUTPS_DllGetClassObject(&CLSID_PSDispatch, &IID_IPSFactoryBuffer, (void **)&pPSFB); + else + hr = TMARSHAL_DllGetClassObject(&CLSID_PSOAInterface, &IID_IPSFactoryBuffer, (void **)&pPSFB); + + if (FAILED(hr)) return hr; + + hr = IPSFactoryBuffer_CreateProxy(pPSFB, pUnkOuter, riid, ppProxy, ppv); + + IPSFactoryBuffer_Release(pPSFB); + return hr; +} + +static HRESULT WINAPI PSDispatchFacBuf_CreateStub(IPSFactoryBuffer *iface, REFIID riid, IUnknown *pUnkOuter, IRpcStubBuffer **ppStub) +{ + IPSFactoryBuffer *pPSFB; + HRESULT hr; + + if (IsEqualIID(riid, &IID_IDispatch)) + hr = OLEAUTPS_DllGetClassObject(&CLSID_PSDispatch, &IID_IPSFactoryBuffer, (void **)&pPSFB); + else + hr = TMARSHAL_DllGetClassObject(&CLSID_PSOAInterface, &IID_IPSFactoryBuffer, (void **)&pPSFB); + + if (FAILED(hr)) return hr; + + hr = IPSFactoryBuffer_CreateStub(pPSFB, riid, pUnkOuter, ppStub); + + IPSFactoryBuffer_Release(pPSFB); + return hr; +} + +static const IPSFactoryBufferVtbl PSDispatchFacBuf_Vtbl = +{ + PSDispatchFacBuf_QueryInterface, + PSDispatchFacBuf_AddRef, + PSDispatchFacBuf_Release, + PSDispatchFacBuf_CreateProxy, + PSDispatchFacBuf_CreateStub +}; + +/* This is the whole PSFactoryBuffer object, just the vtableptr */ +static const IPSFactoryBufferVtbl *pPSDispatchFacBuf = &PSDispatchFacBuf_Vtbl; + /*********************************************************************** * DllGetClassObject (OLEAUT32.@) */ @@ -719,12 +789,16 @@ HRESULT WINAPI DllGetClassObject(REFCLSI return S_OK; } } - if (IsEqualCLSID(rclsid, &CLSID_PSDispatch) || - IsEqualCLSID(rclsid, &CLSID_PSTypeInfo) || + if (IsEqualCLSID(rclsid, &CLSID_PSTypeInfo) || IsEqualCLSID(rclsid, &CLSID_PSTypeLib) || IsEqualCLSID(rclsid, &CLSID_PSEnumVariant)) { return OLEAUTPS_DllGetClassObject(&CLSID_PSDispatch, iid, ppv); } + if (IsEqualCLSID(rclsid, &CLSID_PSDispatch) && IsEqualIID(iid, &IID_IPSFactoryBuffer)) { + *ppv = &pPSDispatchFacBuf; + IPSFactoryBuffer_AddRef((IPSFactoryBuffer *)*ppv); + return S_OK; + } if (IsEqualGUID(rclsid,&CLSID_PSOAInterface)) { if (S_OK==TMARSHAL_DllGetClassObject(rclsid,iid,ppv)) return S_OK;

1 0

wine/ include/winuser.h dlls/x11drv/settings.c
by Alexandre Julliard Nov. 2, 2005

Nov. 2, 2005

ChangeSet ID: 21029 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/02 04:54:42 Modified files: include : winuser.h dlls/x11drv : settings.c Log message: Lionel Ulmer <lionel.ulmer(a)free.fr> Add 'ENUM_...._SETTINGS' flag and make use of it in the X11DRV code. Patch: http://cvs.winehq.org/patch.py?id=21029 Old revision New revision Changes Path 1.228 1.229 +4 -0 wine/include/winuser.h 1.3 1.4 +2 -2 wine/dlls/x11drv/settings.c Index: wine/include/winuser.h diff -u -p wine/include/winuser.h:1.228 wine/include/winuser.h:1.229 --- wine/include/winuser.h:1.228 2 Nov 2005 10:54:42 -0000 +++ wine/include/winuser.h 2 Nov 2005 10:54:42 -0000 @@ -1304,6 +1304,10 @@ BOOL WINAPI SetSysColors(INT,cons #define IDTRYAGAIN 10 #define IDCONTINUE 11 +/* Used for EnumDisplaySettingsEx */ +#define ENUM_CURRENT_SETTINGS ((DWORD) -1) +#define ENUM_REGISTRY_SETTINGS ((DWORD) -2) + /****** Window classes ******/ typedef struct tagCREATESTRUCTA Index: wine/dlls/x11drv/settings.c diff -u -p wine/dlls/x11drv/settings.c:1.3 wine/dlls/x11drv/settings.c:1.4 --- wine/dlls/x11drv/settings.c:1.3 2 Nov 2005 10:54:42 -0000 +++ wine/dlls/x11drv/settings.c 2 Nov 2005 10:54:42 -0000 @@ -170,12 +170,12 @@ BOOL X11DRV_EnumDisplaySettingsEx( LPCWS devmode->dmDisplayFlags = 0; devmode->dmDisplayFrequency = 0; devmode->dmSize = sizeof(DEVMODEW); - if (n == (DWORD)-1) + if (n == ENUM_CURRENT_SETTINGS) { TRACE("mode %ld (current) -- getting current mode (%s)\n", n, handler_name); n = pGetCurrentMode(); } - if (n == (DWORD)-2) + if (n == ENUM_REGISTRY_SETTINGS) { TRACE("mode %ld (registry) -- getting default mode (%s)\n", n, handler_name); n = dd_mode_default;

1 0

docs/en wineusr-running.sgml
by Dimi Paun Nov. 2, 2005

Nov. 2, 2005

ChangeSet ID: 1130904571641594955072836 CVSROOT: /cvsroot/wine Module name: docs Changes by: dimi(a)sc8-pr-cvs1.sourceforge.net 2005/11/01 20:09:31 Modified files: en : wineusr-running.sgml Log message: Jonathan Ernst <Jonathan(a)ErnstFamily.ch> - one more deadlink Old revision New revision Changes Path 1.4 1.5 +1 -1 docs/en/wineusr-running.sgml Index: docs/en/wineusr-running.sgml diff -u -p docs/en/wineusr-running.sgml:1.4 docs/en/wineusr-running.sgml:1.5 --- docs/en/wineusr-running.sgml 2 Nov 2005 4: 9:31 -0000 +++ /dev/null 2 Nov 2005 4: 9:31 -0000 @@ -286,7 +286,7 @@ Path="c:\windows;c:\windows\system;e:\;e <para> For more details about debug channels, check out the - <ulink url="http://www.winehq.org/site/docs/wine-devel/"> + <ulink url="http://www.winehq.org/site/docs/winedev-guide/"> The Wine Developer's Guide</ulink>. </para> </sect2>

1 0

wine/ server/thread.c server/protocol.def serv ...
by Alexandre Julliard Nov. 1, 2005

Nov. 1, 2005

ChangeSet ID: 21028 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/01 15:47:07 Modified files: server : thread.c protocol.def debugger.c include/wine : server_protocol.h dlls/ntdll : exception.c dlls/kernel : except.c Log message: Don't send an extra signal when waiting for a debug event, just do a normal wait. Return the debug event status directly as return value of the server call. Patch: http://cvs.winehq.org/patch.py?id=21028 Old revision New revision Changes Path 1.127 1.128 +1 -0 wine/server/thread.c 1.158 1.159 +0 -1 wine/server/protocol.def 1.58 1.59 +2 -2 wine/server/debugger.c 1.159 1.160 +1 -1 wine/include/wine/server_protocol.h 1.87 1.88 +3 -7 wine/dlls/ntdll/exception.c 1.14 1.15 +3 -7 wine/dlls/kernel/except.c Index: wine/server/thread.c diff -u -p wine/server/thread.c:1.127 wine/server/thread.c:1.128 --- wine/server/thread.c:1.127 1 Nov 2005 21:47: 7 -0000 +++ wine/server/thread.c 1 Nov 2005 21:47: 7 -0000 @@ -315,6 +315,7 @@ static void set_thread_info( struct thre /* stop a thread (at the Unix level) */ void stop_thread( struct thread *thread ) { + if (thread->context) return; /* already inside a debug event, no need for a signal */ /* can't stop a thread while initialisation is in progress */ if (is_process_init_done(thread->process)) send_thread_signal( thread, SIGUSR1 ); } Index: wine/server/protocol.def diff -u -p wine/server/protocol.def:1.158 wine/server/protocol.def:1.159 --- wine/server/protocol.def:1.158 1 Nov 2005 21:47: 7 -0000 +++ wine/server/protocol.def 1 Nov 2005 21:47: 7 -0000 @@ -1162,7 +1162,6 @@ enum char_info_mode @REQ(get_exception_status) obj_handle_t handle; /* handle to the queued event */ @REPLY - int status; /* event continuation status */ VARARG(context,context); /* modified thread context */ @END Index: wine/server/debugger.c diff -u -p wine/server/debugger.c:1.58 wine/server/debugger.c:1.59 --- wine/server/debugger.c:1.58 1 Nov 2005 21:47: 8 -0000 +++ wine/server/debugger.c 1 Nov 2005 21:47: 8 -0000 @@ -661,19 +661,19 @@ DECL_HANDLER(get_exception_status) { struct debug_event *event; - reply->status = 0; if ((event = (struct debug_event *)get_handle_obj( current->process, req->handle, 0, &debug_event_ops ))) { + close_handle( current->process, req->handle, NULL ); if (event->state == EVENT_CONTINUED) { - reply->status = event->status; if (current->context == &event->context) { size_t size = min( sizeof(CONTEXT), get_reply_max_size() ); set_reply_data( &event->context, size ); current->context = NULL; } + set_error( event->status ); } else set_error( STATUS_PENDING ); release_object( event ); Index: wine/include/wine/server_protocol.h diff -u -p wine/include/wine/server_protocol.h:1.159 wine/include/wine/server_protocol.h:1.160 --- wine/include/wine/server_protocol.h:1.159 1 Nov 2005 21:47: 8 -0000 +++ wine/include/wine/server_protocol.h 1 Nov 2005 21:47: 8 -0000 @@ -4207,6 +4207,6 @@ union generic_reply struct set_mailslot_info_reply set_mailslot_info_reply; }; -#define SERVER_PROTOCOL_VERSION 195 +#define SERVER_PROTOCOL_VERSION 196 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ Index: wine/dlls/ntdll/exception.c diff -u -p wine/dlls/ntdll/exception.c:1.87 wine/dlls/ntdll/exception.c:1.88 --- wine/dlls/ntdll/exception.c:1.87 1 Nov 2005 21:47: 8 -0000 +++ wine/dlls/ntdll/exception.c 1 Nov 2005 21:47: 8 -0000 @@ -164,19 +164,15 @@ static int send_debug_event( EXCEPTION_R SERVER_END_REQ; if (!handle) return 0; - /* No need to wait on the handle since the process gets suspended - * once the event is passed to the debugger, so when we get back - * here the event has been continued already. - */ + NTDLL_wait_for_multiple_objects( 1, &handle, 0, NULL, 0 ); + SERVER_START_REQ( get_exception_status ) { req->handle = handle; wine_server_set_reply( req, context, sizeof(*context) ); - wine_server_call( req ); - ret = reply->status; + ret = wine_server_call( req ); } SERVER_END_REQ; - NtClose( handle ); return ret; } Index: wine/dlls/kernel/except.c diff -u -p wine/dlls/kernel/except.c:1.14 wine/dlls/kernel/except.c:1.15 --- wine/dlls/kernel/except.c:1.14 1 Nov 2005 21:47: 8 -0000 +++ wine/dlls/kernel/except.c 1 Nov 2005 21:47: 8 -0000 @@ -196,19 +196,15 @@ static NTSTATUS send_debug_event( EXCEPT SERVER_END_REQ; if (ret) return ret; - /* No need to wait on the handle since the process gets suspended - * once the event is passed to the debugger, so when we get back - * here the event has been continued already. - */ + WaitForSingleObject( handle, INFINITE ); + SERVER_START_REQ( get_exception_status ) { req->handle = handle; wine_server_set_reply( req, context, sizeof(*context) ); - wine_server_call( req ); - ret = reply->status; + ret = wine_server_call( req ); } SERVER_END_REQ; - NtClose( handle ); return ret; }

1 0

wine/ server/context_x86_64.c server/context_s ...
by Alexandre Julliard Nov. 1, 2005

Nov. 1, 2005

ChangeSet ID: 21027 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/01 15:41:26 Modified files: server : context_x86_64.c context_sparc.c context_powerpc.c context_i386.c dlls/ntdll : thread.c Log message: Don't send the incoming context to the server for get_thread_context, instead copy only the relevant fields of the return value on the client side. Patch: http://cvs.winehq.org/patch.py?id=21027 Old revision New revision Changes Path 1.1 1.2 +0 -2 wine/server/context_x86_64.c 1.13 1.14 +2 -0 wine/server/context_sparc.c 1.9 1.10 +2 -0 wine/server/context_powerpc.c 1.31 1.32 +0 -2 wine/server/context_i386.c 1.41 1.42 +228 -2 wine/dlls/ntdll/thread.c

1 0

wine/ server/named_pipe.c dlls/ntdll/tests/om.c
by Alexandre Julliard Nov. 1, 2005

Nov. 1, 2005

ChangeSet ID: 21026 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/01 15:37:30 Modified files: server : named_pipe.c dlls/ntdll/tests: om.c Log message: Vitaliy Margolen <wine-patch(a)kievinfo.com> Fix error returned when exceeding allowed instances. Patch: http://cvs.winehq.org/patch.py?id=21026 Old revision New revision Changes Path 1.50 1.51 +2 -2 wine/server/named_pipe.c 1.2 1.3 +1 -1 wine/dlls/ntdll/tests/om.c Index: wine/server/named_pipe.c diff -u -p wine/server/named_pipe.c:1.50 wine/server/named_pipe.c:1.51 --- wine/server/named_pipe.c:1.50 1 Nov 2005 21:37:30 -0000 +++ wine/server/named_pipe.c 1 Nov 2005 21:37:30 -0000 @@ -562,10 +562,9 @@ DECL_HANDLER(create_named_pipe) } else { - set_error( 0 ); /* clear the name collision */ if (pipe->maxinstances <= pipe->instances) { - set_error( STATUS_PIPE_BUSY ); + set_error( STATUS_INSTANCE_NOT_AVAILABLE ); release_object( pipe ); return; } @@ -577,6 +576,7 @@ DECL_HANDLER(create_named_pipe) release_object( pipe ); return; } + set_error( 0 ); /* clear the name collision */ } server = create_pipe_server( pipe, req->options ); Index: wine/dlls/ntdll/tests/om.c diff -u -p wine/dlls/ntdll/tests/om.c:1.2 wine/dlls/ntdll/tests/om.c:1.3 --- wine/dlls/ntdll/tests/om.c:1.2 1 Nov 2005 21:37:30 -0000 +++ wine/dlls/ntdll/tests/om.c 1 Nov 2005 21:37:30 -0000 @@ -109,7 +109,7 @@ void test_namespace_pipe(void) status = pNtCreateNamedPipeFile(&pipe, GENERIC_READ|GENERIC_WRITE, &attr, &iosb, FILE_SHARE_READ|FILE_SHARE_WRITE, FILE_CREATE, FILE_PIPE_FULL_DUPLEX, FALSE, FALSE, FALSE, 1, 256, 256, &timeout); - todo_wine ok(status == STATUS_INSTANCE_NOT_AVAILABLE, + ok(status == STATUS_INSTANCE_NOT_AVAILABLE, "NtCreateNamedPipeFile should have failed with STATUS_INSTANCE_NOT_AVAILABLE got(%08lx)\n", status); pRtlInitUnicodeString(&str, buffer2);

1 0

wine/dlls/comctl32 string.c
by Alexandre Julliard Nov. 1, 2005

Nov. 1, 2005

ChangeSet ID: 21025 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/01 15:37:19 Modified files: dlls/comctl32 : string.c Log message: Martin Fuchs <martin-fuchs(a)gmx.net> Include config.h and port.h for strncasecmp() in MSVC port. Patch: http://cvs.winehq.org/patch.py?id=21025 Old revision New revision Changes Path 1.6 1.7 +3 -0 wine/dlls/comctl32/string.c Index: wine/dlls/comctl32/string.c diff -u -p wine/dlls/comctl32/string.c:1.6 wine/dlls/comctl32/string.c:1.7 --- wine/dlls/comctl32/string.c:1.6 1 Nov 2005 21:37:19 -0000 +++ wine/dlls/comctl32/string.c 1 Nov 2005 21:37:19 -0000 @@ -22,6 +22,9 @@ * */ +#include "config.h" +#include "wine/port.h" + #include <stdarg.h> #include <string.h> #include <stdlib.h> /* atoi */

1 0

wine/dlls/kernel file.c
by Alexandre Julliard Nov. 1, 2005

Nov. 1, 2005

ChangeSet ID: 21024 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/01 15:37:05 Modified files: dlls/kernel : file.c Log message: Bernd Schmidt <bernds_cb1(a)t-online.de> Implemented FindExSearchLimitToDirectories. Patch: http://cvs.winehq.org/patch.py?id=21024 Old revision New revision Changes Path 1.43 1.44 +16 -10 wine/dlls/kernel/file.c Index: wine/dlls/kernel/file.c diff -u -p wine/dlls/kernel/file.c:1.43 wine/dlls/kernel/file.c:1.44 --- wine/dlls/kernel/file.c:1.43 1 Nov 2005 21:37: 5 -0000 +++ wine/dlls/kernel/file.c 1 Nov 2005 21:37: 5 -0000 @@ -55,15 +55,16 @@ HANDLE dos_handles[DOS_TABLE_SIZE]; /* info structure for FindFirstFile handle */ typedef struct { - DWORD magic; /* magic number */ - HANDLE handle; /* handle to directory */ - CRITICAL_SECTION cs; /* crit section protecting this structure */ - UNICODE_STRING mask; /* file mask */ - UNICODE_STRING path; /* NT path used to open the directory */ - BOOL is_root; /* is directory the root of the drive? */ - UINT data_pos; /* current position in dir data */ - UINT data_len; /* length of dir data */ - BYTE data[8192]; /* directory data */ + DWORD magic; /* magic number */ + HANDLE handle; /* handle to directory */ + CRITICAL_SECTION cs; /* crit section protecting this structure */ + FINDEX_SEARCH_OPS search_op; /* Flags passed to FindFirst. */ + UNICODE_STRING mask; /* file mask */ + UNICODE_STRING path; /* NT path used to open the directory */ + BOOL is_root; /* is directory the root of the drive? */ + UINT data_pos; /* current position in dir data */ + UINT data_len; /* length of dir data */ + BYTE data[8192]; /* directory data */ } FIND_FIRST_INFO; #define FIND_FIRST_MAGIC 0xc0ffee11 @@ -1500,7 +1501,8 @@ HANDLE WINAPI FindFirstFileExW( LPCWSTR TRACE("%s %d %p %d %p %lx\n", debugstr_w(filename), level, data, search_op, filter, flags); - if ((search_op != FindExSearchNameMatch) || (flags != 0)) + if ((search_op != FindExSearchNameMatch && search_op != FindExSearchLimitToDirectories) + || flags != 0) { FIXME("options not implemented 0x%08x 0x%08lx\n", search_op, flags ); return INVALID_HANDLE_VALUE; @@ -1572,6 +1574,7 @@ HANDLE WINAPI FindFirstFileExW( LPCWSTR info->magic = FIND_FIRST_MAGIC; info->data_pos = 0; info->data_len = 0; + info->search_op = search_op; if (!FindNextFileW( (HANDLE)info, data )) { @@ -1650,6 +1653,9 @@ BOOL WINAPI FindNextFileW( HANDLE handle { if (!check_dir_symlink( info, dir_info )) continue; } + if (info->search_op == FindExSearchLimitToDirectories && + (dir_info->FileAttributes & FILE_ATTRIBUTE_DIRECTORY) == 0) + continue; data->dwFileAttributes = dir_info->FileAttributes; data->ftCreationTime = *(FILETIME *)&dir_info->CreationTime;

1 0