August 2010 - Wine-Commits - list.winehq.org

Thomas Mullaly : urlmon: Implemented a path parser for hierarchical URIs.
by Alexandre Julliard Aug. 3, 2010

Aug. 3, 2010

Module: wine Branch: master Commit: 0ecec6d7c01050ac5b97a8bab7b9d4177f934b98 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ecec6d7c01050ac5b97a8bab… Author: Thomas Mullaly <thomas.mullaly(a)gmail.com> Date: Sun Jul 18 10:27:21 2010 -0400 urlmon: Implemented a path parser for hierarchical URIs. --- dlls/urlmon/tests/uri.c | 32 ++++++++++++++++++- dlls/urlmon/uri.c | 79 ++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 109 insertions(+), 2 deletions(-) diff --git a/dlls/urlmon/tests/uri.c b/dlls/urlmon/tests/uri.c index b87b9a3..7cd11ff 100644 --- a/dlls/urlmon/tests/uri.c +++ b/dlls/urlmon/tests/uri.c @@ -2217,6 +2217,34 @@ static const uri_properties uri_tests[] = { {URL_SCHEME_HTTP,S_OK,FALSE}, {URLZONE_INVALID,E_NOTIMPL,FALSE} } + }, + { "zip://www.google.com\\test", Uri_CREATE_NO_CANONICALIZE, S_OK, FALSE, + Uri_HAS_ABSOLUTE_URI|Uri_HAS_AUTHORITY|Uri_HAS_DISPLAY_URI|Uri_HAS_DOMAIN| + Uri_HAS_HOST|Uri_HAS_RAW_URI|Uri_HAS_SCHEME_NAME|Uri_HAS_HOST_TYPE|Uri_HAS_SCHEME, + TRUE, + { + {"zip://www.google.com\\test",S_OK,TRUE}, + {"www.google.com\\test",S_OK,FALSE}, + {"zip://www.google.com\\test",S_OK,TRUE}, + {"google.com\\test",S_OK,FALSE}, + {"",S_FALSE,TRUE}, + {"",S_FALSE,TRUE}, + {"www.google.com\\test",S_OK,FALSE}, + {"",S_FALSE,FALSE}, + {"",S_FALSE,TRUE}, + {"",S_FALSE,TRUE}, + {"",S_FALSE,TRUE}, + {"zip://www.google.com\\test",S_OK,FALSE}, + {"zip",S_OK,FALSE}, + {"",S_FALSE,FALSE}, + {"",S_FALSE,FALSE} + }, + { + {Uri_HOST_DNS,S_OK,FALSE}, + {0,S_FALSE,FALSE}, + {URL_SCHEME_UNKNOWN,S_OK,FALSE}, + {URLZONE_INVALID,E_NOTIMPL,FALSE} + } } }; @@ -2264,7 +2292,9 @@ static const invalid_uri invalid_uri_tests[] = { /* Invalid port with IPv4 address. */ {"http://www.winehq.org:1abcd",0,FALSE}, /* Invalid port with IPv6 address. */ - {"http://[::ffff]:32xy",0,FALSE} + {"http://[::ffff]:32xy",0,FALSE}, + /* Not allowed to have backslashes with NO_CANONICALIZE. */ + {"gopher://www.google.com\\test",Uri_CREATE_NO_CANONICALIZE,FALSE} }; typedef struct _uri_equality { diff --git a/dlls/urlmon/uri.c b/dlls/urlmon/uri.c index 20d8bb1..9ab1dda 100644 --- a/dlls/urlmon/uri.c +++ b/dlls/urlmon/uri.c @@ -113,6 +113,9 @@ typedef struct { const WCHAR *port; DWORD port_len; USHORT port_value; + + const WCHAR *path; + DWORD path_len; } parse_data; static const CHAR hexDigits[] = "0123456789ABCDEF"; @@ -257,6 +260,10 @@ static inline BOOL is_hexdigit(WCHAR val) { (val >= '0' && val <= '9')); } +static inline BOOL is_path_delim(WCHAR val) { + return (!val || val == '#' || val == '?'); +} + /* Computes the size of the given IPv6 address. * Each h16 component is 16bits, if there is an IPv4 address, it's * 32bits. If there's an elision it can be 16bits to 128bits, depending @@ -1482,6 +1489,70 @@ static BOOL parse_authority(const WCHAR **ptr, parse_data *data, DWORD flags) { return TRUE; } +/* Attempts to parse the path information of a hierarchical URI. */ +static BOOL parse_path_hierarchical(const WCHAR **ptr, parse_data *data, DWORD flags) { + const WCHAR *start = *ptr; + static const WCHAR slash[] = {'/',0}; + + if(is_path_delim(**ptr)) { + if(data->scheme_type == URL_SCHEME_WILDCARD) { + /* Wildcard schemes don't get a '/' attached if their path is + * empty. + */ + data->path = NULL; + data->path_len = 0; + } else if(!(flags & Uri_CREATE_NO_CANONICALIZE)) { + /* If the path component is empty, then a '/' is added. */ + data->path = slash; + data->path_len = 1; + } + } else { + while(!is_path_delim(**ptr)) { + if(**ptr == '%' && data->scheme_type != URL_SCHEME_UNKNOWN && + data->scheme_type != URL_SCHEME_FILE) { + if(!check_pct_encoded(ptr)) { + *ptr = start; + return FALSE; + } else + continue; + } else if(**ptr == '\\') { + /* Not allowed to have a backslash if NO_CANONICALIZE is set + * and the scheme is known type (but not a file scheme). + */ + if(flags & Uri_CREATE_NO_CANONICALIZE) { + if(data->scheme_type != URL_SCHEME_FILE && + data->scheme_type != URL_SCHEME_UNKNOWN) { + *ptr = start; + return FALSE; + } + } + } + + ++(*ptr); + } + + /* The only time a URI doesn't have a path is when + * the NO_CANONICALIZE flag is set and the raw URI + * didn't contain one. + */ + if(*ptr == start) { + data->path = NULL; + data->path_len = 0; + } else { + data->path = start; + data->path_len = *ptr - start; + } + } + + if(data->path) + TRACE("(%p %p %x): Parsed path %s len=%d\n", ptr, data, flags, + debugstr_wn(data->path, data->path_len), data->path_len); + else + TRACE("(%p %p %x): The URI contained no path\n", ptr, data, flags); + + return TRUE; +} + /* Determines how the URI should be parsed after the scheme information. * * If the scheme is followed, by "//" then, it is treated as an hierarchical URI @@ -1525,11 +1596,15 @@ static BOOL parse_hierpart(const WCHAR **ptr, parse_data *data, DWORD flags) { TRACE("(%p %p %x): Treating URI as an hierarchical URI.\n", ptr, data, flags); data->is_opaque = FALSE; + if(data->scheme_type == URL_SCHEME_FILE) + /* Skip past the "//" after the scheme (if any). */ + check_hierarchical(ptr); + /* TODO: Handle hierarchical URI's, parse authority then parse the path. */ if(!parse_authority(ptr, data, flags)) return FALSE; - return TRUE; + return parse_path_hierarchical(ptr, data, flags); } } @@ -1564,6 +1639,8 @@ static BOOL parse_uri(parse_data *data, DWORD flags) { if(!parse_hierpart(pptr, data, flags)) return FALSE; + /* TODO: Parse query and fragment (if the URI has one). */ + TRACE("(%p %x): FINISHED PARSING URI.\n", data, flags); return TRUE; }

1 0

Alexandre Julliard : winemenubuilder: Rename some variables to reflect the fact that we no longer use XPM format .
by Alexandre Julliard Aug. 3, 2010

Aug. 3, 2010

Module: wine Branch: master Commit: e446a7c7bf146f82460f5d898b0ff309e3daadb2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e446a7c7bf146f82460f5d898… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Aug 2 20:28:58 2010 +0200 winemenubuilder: Rename some variables to reflect the fact that we no longer use XPM format. --- programs/winemenubuilder/winemenubuilder.c | 58 ++++++++++++---------------- 1 files changed, 25 insertions(+), 33 deletions(-) diff --git a/programs/winemenubuilder/winemenubuilder.c b/programs/winemenubuilder/winemenubuilder.c index 7a77358..b7971e4 100644 --- a/programs/winemenubuilder/winemenubuilder.c +++ b/programs/winemenubuilder/winemenubuilder.c @@ -372,7 +372,7 @@ static BOOL CALLBACK EnumResNameProc(HMODULE hModule, LPCWSTR lpszType, LPWSTR l return TRUE; } -static BOOL extract_icon32(LPCWSTR szFileName, int nIndex, char *szXPMFileName) +static BOOL extract_icon_from_module(LPCWSTR szFileName, int nIndex, const char *icon_name) { HMODULE hModule; HRSRC hResInfo; @@ -452,7 +452,7 @@ static BOOL extract_icon32(LPCWSTR szFileName, int nIndex, char *szXPMFileName) { if ((pIcon = LockResource(hResData))) { - if (reassemble_and_save_to_png(&iconDirEntry, pIcon, szXPMFileName, szFileName)) + if (reassemble_and_save_to_png(&iconDirEntry, pIcon, icon_name, szFileName)) ret = TRUE; else ret = FALSE; @@ -466,24 +466,16 @@ static BOOL extract_icon32(LPCWSTR szFileName, int nIndex, char *szXPMFileName) return ret; } -static BOOL ExtractFromEXEDLL(LPCWSTR szFileName, int nIndex, char *szXPMFileName) +static int ExtractFromICO(LPCWSTR szFileName, const char *icon_name) { - if (!extract_icon32(szFileName, nIndex, szXPMFileName) /*&& - !extract_icon16(szFileName, szXPMFileName)*/) - return FALSE; - return TRUE; -} - -static int ExtractFromICO(LPCWSTR szFileName, char *szXPMFileName) -{ - FILE *fICOFile = NULL; + FILE *fICOFile; ICONDIR iconDir; ICONDIRENTRY *pIconDirEntry = NULL; int nMax = 0, nMaxBits = 0; int nIndex = 0; void *pIcon = NULL; int i; - char *filename = NULL; + char *filename; IStream *icoStream = NULL; HRESULT hr; @@ -536,7 +528,7 @@ static int ExtractFromICO(LPCWSTR szFileName, char *szXPMFileName) goto error; } - if (!SaveIconStreamAsPNG(icoStream, nIndex, szXPMFileName, szFileName)) + if (!SaveIconStreamAsPNG(icoStream, nIndex, icon_name, szFileName)) goto error; HeapFree(GetProcessHeap(), 0, pIcon); @@ -556,7 +548,7 @@ static int ExtractFromICO(LPCWSTR szFileName, char *szXPMFileName) return 0; } -static int ExtractFromFileType(LPCWSTR szFileName, char *szXPMFileName) +static int ExtractFromFileType(LPCWSTR szFileName, const char *icon_name) { int ret = 0; WCHAR *extension; @@ -590,7 +582,7 @@ static int ExtractFromFileType(LPCWSTR szFileName, char *szXPMFileName) WINE_TRACE("executable %s -> icon %s\n", wine_dbgstr_w(executable), wine_dbgstr_a(output_path)); } if (output_path) - ret = (rename(output_path, szXPMFileName) == 0); + ret = (rename(output_path, icon_name) == 0); end: HeapFree(GetProcessHeap(), 0, icon); @@ -599,11 +591,11 @@ end: return ret; } -static BOOL create_default_icon( char *filename ) +static BOOL create_default_icon( const char *filename ) { static const WCHAR user32W[] = {'u','s','e','r','3','2',0}; - return extract_icon32( user32W, -(INT_PTR)IDI_WINLOGO, filename ); + return extract_icon_from_module( user32W, -(INT_PTR)IDI_WINLOGO, filename ); } static unsigned short crc16(const char* string) @@ -737,7 +729,7 @@ static WCHAR* utf8_chars_to_wchars(LPCSTR string) static char *extract_icon( LPCWSTR path, int index, const char *destFilename, BOOL bWait ) { unsigned short crc; - char *iconsdir = NULL, *ico_path = NULL, *ico_name, *xpm_path = NULL; + char *iconsdir = NULL, *ico_path = NULL, *ico_name, *png_path = NULL; char* s; int n; @@ -781,37 +773,37 @@ static char *extract_icon( LPCWSTR path, int index, const char *destFilename, BO /* Try to treat the source file as an exe */ if (destFilename) - xpm_path=heap_printf("%s/%s.png",iconsdir,destFilename); + png_path=heap_printf("%s/%s.png",iconsdir,destFilename); else - xpm_path=heap_printf("%s/%04x_%s.%d.png",iconsdir,crc,ico_name,index); - if (xpm_path == NULL) + png_path=heap_printf("%s/%04x_%s.%d.png",iconsdir,crc,ico_name,index); + if (png_path == NULL) { WINE_ERR("could not extract icon %s, out of memory\n", wine_dbgstr_a(ico_name)); return NULL; } - if (ExtractFromEXEDLL( path, index, xpm_path )) + if (extract_icon_from_module( path, index, png_path )) goto end; /* Must be something else, ignore the index in that case */ if (destFilename) - sprintf(xpm_path,"%s/%s.png",iconsdir,destFilename); + sprintf(png_path,"%s/%s.png",iconsdir,destFilename); else - sprintf(xpm_path,"%s/%04x_%s.png",iconsdir,crc,ico_name); - if (ExtractFromICO( path, xpm_path)) + sprintf(png_path,"%s/%04x_%s.png",iconsdir,crc,ico_name); + if (ExtractFromICO( path, png_path)) goto end; - if (ExtractFromFileType( path, xpm_path )) + if (ExtractFromFileType( path, png_path )) goto end; - if (!bWait && create_default_icon( xpm_path )) + if (!bWait && create_default_icon( png_path )) goto end; - HeapFree( GetProcessHeap(), 0, xpm_path ); - xpm_path=NULL; + HeapFree( GetProcessHeap(), 0, png_path ); + png_path=NULL; end: HeapFree(GetProcessHeap(), 0, iconsdir); HeapFree(GetProcessHeap(), 0, ico_path); - return xpm_path; + return png_path; } static HKEY open_menus_reg_key(void) @@ -2815,12 +2807,12 @@ static void thumbnail_lnk(LPCWSTR lnkPath, LPCWSTR outputPath) if (szIconPath[0]) { - if (!ExtractFromEXEDLL(szIconPath, iconId, utf8OutputPath)) + if (!extract_icon_from_module(szIconPath, iconId, utf8OutputPath)) ExtractFromICO(szIconPath, utf8OutputPath); } else { - if (!ExtractFromEXEDLL(szPath, iconId, utf8OutputPath)) + if (!extract_icon_from_module(szPath, iconId, utf8OutputPath)) ExtractFromICO(szPath, utf8OutputPath); }

1 0

Thomas Mullaly : urlmon: Implemented canonicalization function for paths in opaque URIs.
by Alexandre Julliard Aug. 3, 2010

Aug. 3, 2010

Module: wine Branch: master Commit: 42e8af7a4a33591fe0bd5231a45a7b7350f89982 URL: http://source.winehq.org/git/wine.git/?a=commit;h=42e8af7a4a33591fe0bd5231a… Author: Thomas Mullaly <thomas.mullaly(a)gmail.com> Date: Sun Jul 25 16:00:50 2010 -0400 urlmon: Implemented canonicalization function for paths in opaque URIs. --- dlls/urlmon/tests/uri.c | 202 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/urlmon/uri.c | 83 +++++++++++++++++++- 2 files changed, 284 insertions(+), 1 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=42e8af7a4a33591fe0bd5…

1 0

Thomas Mullaly : urlmon: Implemented a function which removes dot segments from paths of hierarchical URIs .
by Alexandre Julliard Aug. 3, 2010

Aug. 3, 2010

Module: wine Branch: master Commit: 5758b068aedbdd97e83e1fa2848d0f601b257234 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5758b068aedbdd97e83e1fa28… Author: Thomas Mullaly <thomas.mullaly(a)gmail.com> Date: Thu Jul 22 22:49:44 2010 -0400 urlmon: Implemented a function which removes dot segments from paths of hierarchical URIs. --- dlls/urlmon/tests/uri.c | 205 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/urlmon/uri.c | 94 +++++++++++++++++++++ 2 files changed, 299 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5758b068aedbdd97e83e1…

1 0

Thomas Mullaly : urlmon: Implemented canonicalization function for hierarchical URI paths.
by Alexandre Julliard Aug. 3, 2010

Aug. 3, 2010

Module: wine Branch: master Commit: 300d0e1ad4aff3895c3c8db06c1c4bdd72892641 URL: http://source.winehq.org/git/wine.git/?a=commit;h=300d0e1ad4aff3895c3c8db06… Author: Thomas Mullaly <thomas.mullaly(a)gmail.com> Date: Mon Jul 19 21:05:30 2010 -0400 urlmon: Implemented canonicalization function for hierarchical URI paths. --- dlls/urlmon/tests/uri.c | 181 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/urlmon/uri.c | 116 ++++++++++++++++++++++++++++++- 2 files changed, 296 insertions(+), 1 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=300d0e1ad4aff3895c3c8…

1 0

Huw Davies : rpcrt4: Add a missing STUBLESS_INITOUT case.
by Alexandre Julliard Aug. 2, 2010

Aug. 2, 2010

Module: wine Branch: master Commit: 300536d88e0370d66391759fde414aa3accbc467 URL: http://source.winehq.org/git/wine.git/?a=commit;h=300536d88e0370d66391759fd… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Aug 2 15:24:53 2010 +0100 rpcrt4: Add a missing STUBLESS_INITOUT case. --- dlls/rpcrt4/ndr_stubless.c | 9 ++------- 1 files changed, 2 insertions(+), 7 deletions(-) diff --git a/dlls/rpcrt4/ndr_stubless.c b/dlls/rpcrt4/ndr_stubless.c index ed7912f..243c55a 100644 --- a/dlls/rpcrt4/ndr_stubless.c +++ b/dlls/rpcrt4/ndr_stubless.c @@ -1258,6 +1258,8 @@ static LONG_PTR *stub_do_old_args(MIDL_STUB_MESSAGE *pStubMsg, if (pParam->param_direction == RPC_FC_IN_PARAM_BASETYPE) call_freer(pStubMsg, pArg, pTypeFormat); break; + case STUBLESS_INITOUT: + break; case STUBLESS_UNMARSHAL: if (pParam->param_direction == RPC_FC_IN_PARAM_BASETYPE) call_unmarshaller(pStubMsg, &pArg, pTypeFormat, 0); @@ -1512,13 +1514,6 @@ LONG WINAPI NdrStubCall2( if (pThis) *(void **)args = ((CStdStubBuffer *)pThis)->pvServerObject; - /* order of phases: - * 1. STUBLESS_UNMARHSAL - unmarshal [in] params from buffer - * 2. STUBLESS_CALLSERVER - send/receive buffer - * 3. STUBLESS_CALCSIZE - get [out] buffer size - * 4. STUBLESS_GETBUFFER - allocate [out] buffer - * 5. STUBLESS_MARHSAL - marshal [out] params to buffer - */ for (phase = STUBLESS_UNMARSHAL; phase <= STUBLESS_FREE; phase++) { TRACE("phase = %d\n", phase);

1 0

Jeff Latimer : msvcirt: Add some stubs.
by Alexandre Julliard Aug. 2, 2010

Aug. 2, 2010

Module: wine Branch: master Commit: 1510698b5656e74c37c70c7630c9896c1434a0ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=1510698b5656e74c37c70c763… Author: Jeff Latimer <lats(a)yless4u.com.au> Date: Sat Jul 31 18:11:44 2010 +1000 msvcirt: Add some stubs. --- dlls/msvcirt/msvcirt.c | 62 +++++++++++++++++++++++++++++++++++++++++++++ dlls/msvcirt/msvcirt.spec | 12 ++++---- 2 files changed, 68 insertions(+), 6 deletions(-) diff --git a/dlls/msvcirt/msvcirt.c b/dlls/msvcirt/msvcirt.c index 924e84c..b15f410 100644 --- a/dlls/msvcirt/msvcirt.c +++ b/dlls/msvcirt/msvcirt.c @@ -29,8 +29,16 @@ WINE_DEFAULT_DEBUG_CHANNEL(msvcirt); typedef struct { LPVOID VTable; +} class_ios; + +typedef struct { + LPVOID VTable; } class_ostream; +typedef struct { + LPVOID VTable; +} class_strstreambuf; + #ifdef __i386__ /* thiscall functions are i386-specific */ #define THISCALL(func) __thiscall_ ## func @@ -51,6 +59,39 @@ typedef struct { #endif /* __i386__ */ /****************************************************************** + * ??1ios@@UAE(a)XZ (MSVCRTI.@) + * class ios & __thiscall ios::-ios<<(void) + */ +DEFINE_THISCALL_WRAPPER(MSVCIRT_ios_sl_void,4) +void * __stdcall MSVCIRT_ios_sl_void(class_ios * _this) +{ + FIXME("(%p) stub\n", _this); + return _this; +} + +/****************************************************************** + * ??0ostrstream@@QAE(a)XZ (MSVCRTI.@) + * class ostream & __thiscall ostrstream::ostrstream<<(void) + */ +DEFINE_THISCALL_WRAPPER(MSVCIRT_ostrstream_sl_void,4) +void * __stdcall MSVCIRT_ostrstream_sl_void(class_ostream * _this) +{ + FIXME("(%p) stub\n", _this); + return _this; +} + +/****************************************************************** + * ??6ostream@@QAEAAV0(a)E@Z (MSVCRTI.@) + * class ostream & __thiscall ostream::operator<<(unsigned char) + */ +DEFINE_THISCALL_WRAPPER(MSVCIRT_operator_sl_uchar,8) +void * __stdcall MSVCIRT_operator_sl_uchar(class_ostream * _this, unsigned char ch) +{ + FIXME("(%p)->(%c) stub\n", _this, ch); + return _this; +} + +/****************************************************************** * ??6ostream@@QAEAAV0(a)H@Z (MSVCRTI.@) * class ostream & __thiscall ostream::operator<<(int) */ @@ -93,6 +134,27 @@ void * CDECL MSVCIRT_endl(class_ostream * _this) return _this; } +/****************************************************************** + * ?ends@@YAAAVostream@@AAV1@@Z (MSVCRTI.@) + * class ostream & __cdecl ends(class ostream &) + */ +void * CDECL MSVCIRT_ends(class_ostream * _this) +{ + FIXME("(%p)->() stub\n", _this); + return _this; +} + +/****************************************************************** + * ?str(a)strstreambuf@@QAEPADXZ (MSVCRTI.@) + * class strstreambuf & __thiscall strstreambuf::str(class strstreambuf &) + */ +DEFINE_THISCALL_WRAPPER(MSVCIRT_str_sl_void,4) +char * __stdcall MSVCIRT_str_sl_void(class_strstreambuf * _this) +{ + FIXME("(%p)->() stub\n", _this); + return 0; +} + BOOL WINAPI DllMain( HINSTANCE inst, DWORD reason, LPVOID reserved ) { switch (reason) diff --git a/dlls/msvcirt/msvcirt.spec b/dlls/msvcirt/msvcirt.spec index 0efae20..d3618b2 100644 --- a/dlls/msvcirt/msvcirt.spec +++ b/dlls/msvcirt/msvcirt.spec @@ -47,7 +47,7 @@ @ stub ??0ostream_withassign@@QAE(a)XZ # __thiscall ostream_withassign::ostream_withassign(void) @ stub ??0ostrstream@@QAE(a)ABV0@@Z # __thiscall ostrstream::ostrstream(class ostrstream const &) @ stub ??0ostrstream@@QAE(a)PADHH@Z # __thiscall ostrstream::ostrstream(char *,int,int) -@ stub ??0ostrstream@@QAE(a)XZ # __thiscall ostrstream::ostrstream(void) +@ cdecl -i386 -norelay ??0ostrstream@@QAE(a)XZ(ptr) __thiscall_MSVCIRT_ostrstream_sl_void # __thiscall ostrstream::ostrstream(void) @ stub ??0stdiobuf@@QAE(a)ABV0@@Z # __thiscall stdiobuf::stdiobuf(class stdiobuf const &) @ stub ??0stdiobuf@@QAE(a)PAU_iobuf@@@Z # __thiscall stdiobuf::stdiobuf(struct _iobuf *) @ stub ??0stdiostream@@QAE(a)ABV0@@Z # __thiscall stdiostream::stdiostream(class stdiostream const &) @@ -69,7 +69,7 @@ @ stub ??1filebuf@@UAE(a)XZ # virtual __thiscall filebuf::~filebuf(void) @ stub ??1fstream@@UAE(a)XZ # virtual __thiscall fstream::~fstream(void) @ stub ??1ifstream@@UAE(a)XZ # virtual __thiscall ifstream::~ifstream(void) -@ stub ??1ios@@UAE(a)XZ # virtual __thiscall ios::~ios(void) +@ cdecl -i386 -norelay ??1ios@@UAE(a)XZ(ptr) __thiscall_MSVCIRT_ios_sl_void # virtual __thiscall ios::~ios(void) @ stub ??1iostream@@UAE(a)XZ # virtual __thiscall iostream::~iostream(void) @ stub ??1istream@@UAE(a)XZ # virtual __thiscall istream::~istream(void) @ stub ??1istream_withassign@@UAE(a)XZ # virtual __thiscall istream_withassign::~istream_withassign(void) @@ -78,7 +78,7 @@ @ stub ??1ofstream@@UAE(a)XZ # virtual __thiscall ofstream::~ofstream(void) @ stub ??1ostream@@UAE(a)XZ # virtual __thiscall ostream::~ostream(void) @ stub ??1ostream_withassign@@UAE(a)XZ # virtual __thiscall ostream_withassign::~ostream_withassign(void) -@ stub ??1ostrstream@@UAE(a)XZ # virtual __thiscall ostrstream::~ostrstream(void) +@ cdecl -i386 -norelay ??1ostrstream@@UAE(a)XZ(ptr) __thiscall_MSVCIRT_ostrstream_sl_void # virtual __thiscall ostrstream::~ostrstream(void) @ stub ??1stdiobuf@@UAE(a)XZ # virtual __thiscall stdiobuf::~stdiobuf(void) @ stub ??1stdiostream@@UAE(a)XZ # virtual __thiscall stdiostream::~stdiostream(void) @ stub ??1streambuf@@UAE(a)XZ # virtual __thiscall streambuf::~streambuf(void) @@ -131,7 +131,7 @@ @ stub ??5istream@@QAEAAV0(a)PAVstreambuf@@@Z # class istream & __thiscall istream::operator>>(class streambuf *) @ stub ??6ostream@@QAEAAV0(a)C@Z # class ostream & __thiscall ostream::operator<<(signed char) @ stub ??6ostream@@QAEAAV0(a)D@Z # class ostream & __thiscall ostream::operator<<(char) -@ stub ??6ostream@@QAEAAV0(a)E@Z # class ostream & __thiscall ostream::operator<<(unsigned char) +@ cdecl -i386 -norelay ??6ostream@@QAEAAV0(a)E@Z(ptr long) __thiscall_MSVCIRT_operator_sl_uchar # class ostream & __thiscall ostream::operator<<(unsigned char) @ stub ??6ostream@@QAEAAV0(a)F@Z # class ostream & __thiscall ostream::operator<<(short) @ stub ??6ostream@@QAEAAV0(a)G@Z # class ostream & __thiscall ostream::operator<<(unsigned short) @ cdecl -i386 -norelay ??6ostream@@QAEAAV0(a)H@Z(ptr long) __thiscall_MSVCIRT_operator_sl_int # class ostream & __thiscall ostream::operator<<(int) @@ -269,7 +269,7 @@ @ stub ?ebuf(a)streambuf@@IBEPADXZ # char * __thiscall streambuf::ebuf(void)const @ stub ?egptr(a)streambuf@@IBEPADXZ # char * __thiscall streambuf::egptr(void)const @ cdecl ?endl@@YAAAVostream@@AAV1@@Z(ptr) MSVCIRT_endl # class ostream & __cdecl endl(class ostream &) -@ stub ?ends@@YAAAVostream@@AAV1@@Z # class ostream & __cdecl ends(class ostream &) +@ cdecl ?ends@@YAAAVostream@@AAV1@@Z(ptr) MSVCIRT_ends # class ostream & __cdecl ends(class ostream &) @ stub ?eof(a)ios@@QBEHXZ # int __thiscall ios::eof(void)const @ stub ?epptr(a)streambuf@@IBEPADXZ # char * __thiscall streambuf::epptr(void)const # @ extern ?fLockcInit(a)ios@@0HA # static int ios::fLockcInit @@ -402,7 +402,7 @@ @ stub ?str(a)istrstream@@QAEPADXZ # char * __thiscall istrstream::str(void) @ stub ?str(a)ostrstream@@QAEPADXZ # char * __thiscall ostrstream::str(void) @ stub ?str(a)strstream@@QAEPADXZ # char * __thiscall strstream::str(void) -@ stub ?str(a)strstreambuf@@QAEPADXZ # char * __thiscall strstreambuf::str(void) +@ cdecl -i386 -norelay ?str(a)strstreambuf@@QAEPADXZ(ptr) __thiscall_MSVCIRT_str_sl_void # char * __thiscall strstreambuf::str(void) # @ extern ?sunk_with_stdio(a)ios@@0HA # static int ios::sunk_with_stdio @ stub ?sync(a)filebuf@@UAEHXZ # virtual int __thiscall filebuf::sync(void) @ stub ?sync(a)istream@@QAEHXZ # int __thiscall istream::sync(void)

1 0

David Hedberg : explorerframe/tests: Add initial NamespaceTreeControl tests .
by Alexandre Julliard Aug. 2, 2010

Aug. 2, 2010

Module: wine Branch: master Commit: 87212d510582d5889122b05438075e287235a3a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=87212d510582d5889122b0543… Author: David Hedberg <david.hedberg(a)gmail.com> Date: Sat Jul 31 20:02:49 2010 +0200 explorerframe/tests: Add initial NamespaceTreeControl tests. --- configure | 1 + configure.ac | 1 + dlls/explorerframe/tests/Makefile.in | 11 +++++ dlls/explorerframe/tests/nstc.c | 81 ++++++++++++++++++++++++++++++++++ 4 files changed, 94 insertions(+), 0 deletions(-) diff --git a/configure b/configure index 6dd4a36..3a5b7b6 100755 --- a/configure +++ b/configure @@ -14504,6 +14504,7 @@ wine_fn_config_dll dxgi enable_dxgi dxgi wine_fn_config_test dlls/dxgi/tests dxgi_test wine_fn_config_lib dxguid wine_fn_config_dll explorerframe enable_explorerframe +wine_fn_config_test dlls/explorerframe/tests explorerframe_test wine_fn_config_dll faultrep enable_faultrep wine_fn_config_dll fltlib enable_fltlib wine_fn_config_dll fusion enable_fusion diff --git a/configure.ac b/configure.ac index aac7a82..37b0cf0 100644 --- a/configure.ac +++ b/configure.ac @@ -2360,6 +2360,7 @@ WINE_CONFIG_DLL(dxgi,,[dxgi]) WINE_CONFIG_TEST(dlls/dxgi/tests) WINE_CONFIG_LIB(dxguid) WINE_CONFIG_DLL(explorerframe) +WINE_CONFIG_TEST(dlls/explorerframe/tests) WINE_CONFIG_DLL(faultrep) WINE_CONFIG_DLL(fltlib) WINE_CONFIG_DLL(fusion) diff --git a/dlls/explorerframe/tests/Makefile.in b/dlls/explorerframe/tests/Makefile.in new file mode 100644 index 0000000..880d19a --- /dev/null +++ b/dlls/explorerframe/tests/Makefile.in @@ -0,0 +1,11 @@ +TOPSRCDIR = @top_srcdir@ +TOPOBJDIR = ../../.. +SRCDIR = @srcdir@ +VPATH = @srcdir@ +TESTDLL = explorerframe.dll +IMPORTS = uuid user32 ole32 + +C_SRCS = \ + nstc.c + +(a)MAKE_TEST_RULES@ diff --git a/dlls/explorerframe/tests/nstc.c b/dlls/explorerframe/tests/nstc.c new file mode 100644 index 0000000..bd0caf1 --- /dev/null +++ b/dlls/explorerframe/tests/nstc.c @@ -0,0 +1,81 @@ +/* + * Unit tests for the NamespaceTree Control + * + * Copyright 2010 David Hedberg + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdio.h> + +#define COBJMACROS + +#include "shlobj.h" +#include "wine/test.h" + +static HWND hwnd; + +/* "Intended for internal use" */ +#define TVS_EX_NOSINGLECOLLAPSE 0x1 + +/* Returns FALSE if the NamespaceTreeControl failed to be instantiated. */ +static BOOL test_initialization(void) +{ + INameSpaceTreeControl *pnstc; + HRESULT hr; + + hr = CoCreateInstance(&CLSID_NamespaceTreeControl, NULL, CLSCTX_INPROC_SERVER, + &IID_INameSpaceTreeControl, (void**)&pnstc); + ok(hr == S_OK || hr == REGDB_E_CLASSNOTREG, "Got 0x%08x\n", hr); + if(FAILED(hr)) + { + return FALSE; + } + + INameSpaceTreeControl_Release(pnstc); + + return TRUE; +} + +static void setup_window(void) +{ + WNDCLASSA wc; + static const char nstctest_wnd_name[] = "nstctest_wnd"; + + ZeroMemory(&wc, sizeof(WNDCLASSA)); + wc.lpfnWndProc = DefWindowProcA; + wc.lpszClassName = nstctest_wnd_name; + RegisterClassA(&wc); + hwnd = CreateWindowA(nstctest_wnd_name, NULL, WS_TABSTOP, + 0, 0, 200, 200, NULL, 0, 0, NULL); + ok(hwnd != NULL, "Failed to create window for test (lasterror: %d).\n", + GetLastError()); +} + +static void destroy_window(void) +{ + DestroyWindow(hwnd); +} + +START_TEST(nstc) +{ + OleInitialize(NULL); + setup_window(); + + test_initialization(); + + destroy_window(); + OleUninitialize(); +}

1 0

David Hedberg : explorerframe: Add some infrastructure to register the NamespaceTreeControl CLSID.
by Alexandre Julliard Aug. 2, 2010

Aug. 2, 2010

Module: wine Branch: master Commit: d6db3732da14708210e30c03039f0eba51cf4bdc URL: http://source.winehq.org/git/wine.git/?a=commit;h=d6db3732da14708210e30c030… Author: David Hedberg <david.hedberg(a)gmail.com> Date: Sat Jul 31 20:02:50 2010 +0200 explorerframe: Add some infrastructure to register the NamespaceTreeControl CLSID. --- dlls/explorerframe/Makefile.in | 1 + dlls/explorerframe/eframe.rc | 22 ++++++++ dlls/explorerframe/explorerframe.inf | 17 +++++++ dlls/explorerframe/explorerframe.spec | 2 + dlls/explorerframe/explorerframe_main.c | 81 +++++++++++++++++++++++++++++++ tools/wine.inf.in | 1 + 6 files changed, 124 insertions(+), 0 deletions(-) diff --git a/dlls/explorerframe/Makefile.in b/dlls/explorerframe/Makefile.in index dad33b1..3d17fcd 100644 --- a/dlls/explorerframe/Makefile.in +++ b/dlls/explorerframe/Makefile.in @@ -11,6 +11,7 @@ C_SRCS = \ nstc.c RC_SRCS = \ + eframe.rc \ version.rc @MAKE_DLL_RULES@ diff --git a/dlls/explorerframe/eframe.rc b/dlls/explorerframe/eframe.rc new file mode 100644 index 0000000..25619de --- /dev/null +++ b/dlls/explorerframe/eframe.rc @@ -0,0 +1,22 @@ +/* + * ExplorerFrame main resource file + * + * Copyright 2010 David Hedberg + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +/* @makedep: explorerframe.inf */ +REGINST REGINST explorerframe.inf diff --git a/dlls/explorerframe/explorerframe.inf b/dlls/explorerframe/explorerframe.inf new file mode 100644 index 0000000..7d6ba63 --- /dev/null +++ b/dlls/explorerframe/explorerframe.inf @@ -0,0 +1,17 @@ +[version] +Signature="$CHICAGO$" + +[RegisterDll] +AddReg=Classes.Reg + +[UnregisterDll] +DelReg=Classes.Reg + +[Classes.Reg] +; For some reason called "ListView" in the registry. +HKCR,"CLSID\%CLSID_NamespaceTreeControl%",,,"Shell Name Space ListView" +HKCR,"CLSID\%CLSID_NamespaceTreeControl%\InProcServer32",,,"%MODULE%" +HKCR,"CLSID\%CLSID_NamespaceTreeControl%\InProcServer32","ThreadingModel",,"Apartment" + +[Strings] +MODULE="explorerframe.dll" diff --git a/dlls/explorerframe/explorerframe.spec b/dlls/explorerframe/explorerframe.spec index 9ef2684..0e644a3 100644 --- a/dlls/explorerframe/explorerframe.spec +++ b/dlls/explorerframe/explorerframe.spec @@ -5,3 +5,5 @@ @ stdcall -private DllCanUnloadNow() @ stdcall -private DllGetClassObject(ptr ptr ptr) @ stdcall -private DllGetVersion(ptr) +@ stdcall -private DllRegisterServer() +@ stdcall -private DllUnregisterServer() diff --git a/dlls/explorerframe/explorerframe_main.c b/dlls/explorerframe/explorerframe_main.c index fd958ef..dd3c0cf 100644 --- a/dlls/explorerframe/explorerframe_main.c +++ b/dlls/explorerframe/explorerframe_main.c @@ -19,6 +19,7 @@ */ #include <stdarg.h> +#include <stdio.h> #define COBJMACROS #define NONAMELESSUNION @@ -26,8 +27,11 @@ #include "windef.h" #include "winbase.h" +#include "winuser.h" #include "winreg.h" #include "shlwapi.h" +#include "advpub.h" +#include "shobjidl.h" #include "wine/debug.h" @@ -203,3 +207,80 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, void **ppv) return CLASS_E_CLASSNOTAVAILABLE; } + +/************************************************************************* + * Register/Unregister DLL, based on shdocvw/factory.c + */ +static HRESULT reg_install(LPCSTR section, STRTABLEA *strtable) +{ + HRESULT (WINAPI *pRegInstall)(HMODULE hm, LPCSTR pszSection, const STRTABLEA* pstTable); + HMODULE hadvpack; + HRESULT hres; + + static const WCHAR advpackW[] = {'a','d','v','p','a','c','k','.','d','l','l',0}; + + hadvpack = LoadLibraryW(advpackW); + pRegInstall = (void *)GetProcAddress(hadvpack, "RegInstall"); + + hres = pRegInstall(explorerframe_hinstance, section, strtable); + + FreeLibrary(hadvpack); + return hres; +} + +#define INF_SET_CLSID(clsid) \ + do \ + { \ + static CHAR name[] = "CLSID_" #clsid; \ + \ + pse[i].pszName = name; \ + clsids[i++] = &CLSID_ ## clsid; \ + } while (0) + +static HRESULT register_server(BOOL doregister) +{ + STRTABLEA strtable; + STRENTRYA pse[1]; + static CLSID const *clsids[1]; + unsigned int i = 0; + HRESULT hres; + + INF_SET_CLSID(NamespaceTreeControl); + + for(i = 0; i < sizeof(pse)/sizeof(pse[0]); i++) + { + pse[i].pszValue = HeapAlloc(GetProcessHeap(), 0, 39); + sprintf(pse[i].pszValue, "{%08X-%04X-%04X-%02X%02X-%02X%02X%02X%02X%02X%02X}", + clsids[i]->Data1, clsids[i]->Data2, clsids[i]->Data3, clsids[i]->Data4[0], + clsids[i]->Data4[1], clsids[i]->Data4[2], clsids[i]->Data4[3], clsids[i]->Data4[4], + clsids[i]->Data4[5], clsids[i]->Data4[6], clsids[i]->Data4[7]); + } + + strtable.cEntries = sizeof(pse)/sizeof(pse[0]); + strtable.pse = pse; + + hres = reg_install(doregister ? "RegisterDll" : "UnregisterDll", &strtable); + + for(i=0; i < sizeof(pse)/sizeof(pse[0]); i++) + HeapFree(GetProcessHeap(), 0, pse[i].pszValue); + + return hres; +} + +#undef INF_SET_CLSID + +/************************************************************************* + * DllRegisterServer (ExplorerFrame.@) + */ +HRESULT WINAPI DllRegisterServer(void) +{ + return register_server(TRUE); +} + +/************************************************************************* + * DllUnregisterServer (ExplorerFrame.@) + */ +HRESULT WINAPI DllUnregisterServer(void) +{ + return register_server(FALSE); +} diff --git a/tools/wine.inf.in b/tools/wine.inf.in index aa7b4f0..ff5c7b2 100644 --- a/tools/wine.inf.in +++ b/tools/wine.inf.in @@ -2507,6 +2507,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 11,,dsound.dll,1 11,,dswave.dll,1 11,,dxdiagn.dll,1 +11,,explorerframe.dll,1 11,,gameux.dll,1 11,,hhctrl.ocx,1 11,,hlink.dll,1

1 0

David Hedberg : shell32: Replace some checks with calls to _ILIsEmpty().
by Alexandre Julliard Aug. 2, 2010

Aug. 2, 2010

Module: wine Branch: master Commit: a690db9f1e78219d09d4a0771556bed3483fda6c URL: http://source.winehq.org/git/wine.git/?a=commit;h=a690db9f1e78219d09d4a0771… Author: David Hedberg <david.hedberg(a)gmail.com> Date: Mon Aug 2 14:33:40 2010 +0200 shell32: Replace some checks with calls to _ILIsEmpty(). --- dlls/shell32/brsfolder.c | 4 ++-- dlls/shell32/pidl.c | 4 ++-- dlls/shell32/shfldr_unixfs.c | 12 ++++++------ dlls/shell32/shlfolder.c | 2 +- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/shell32/brsfolder.c b/dlls/shell32/brsfolder.c index 83ed1dd..77c55c8 100644 --- a/dlls/shell32/brsfolder.c +++ b/dlls/shell32/brsfolder.c @@ -239,7 +239,7 @@ static void InitializeTreeView( browse_info *info ) return; } - if (pidlChild && pidlChild->mkid.cb) { + if (!_ILIsEmpty(pidlChild)) { hr = IShellFolder_BindToObject(lpsfParent, pidlChild, 0, &IID_IShellFolder, (LPVOID*)&lpsfRoot); } else { lpsfRoot = lpsfParent; @@ -519,7 +519,7 @@ static LRESULT BrsFolder_Treeview_Expand( browse_info *info, NMTREEVIEWW *pnmtv if ((pnmtv->itemNew.state & TVIS_EXPANDEDONCE)) return 0; - if (lptvid->lpi && lptvid->lpi->mkid.cb) { + if (!_ILIsEmpty(lptvid->lpi)) { r = IShellFolder_BindToObject( lptvid->lpsfParent, lptvid->lpi, 0, &IID_IShellFolder, (LPVOID *)&lpsf2 ); } else { diff --git a/dlls/shell32/pidl.c b/dlls/shell32/pidl.c index a596ebf..1c9cf22 100644 --- a/dlls/shell32/pidl.c +++ b/dlls/shell32/pidl.c @@ -217,7 +217,7 @@ BOOL WINAPI ILRemoveLastID(LPITEMIDLIST pidl) { TRACE_(shell)("pidl=%p\n",pidl); - if (!pidl || !pidl->mkid.cb) + if (_ILIsEmpty(pidl)) return FALSE; ILFindLastID(pidl)->mkid.cb = 0; return TRUE; @@ -2062,7 +2062,7 @@ DWORD _ILSimpleGetTextW (LPCITEMIDLIST pidl, LPWSTR szOut, UINT uOutSize) */ LPPIDLDATA _ILGetDataPointer(LPCITEMIDLIST pidl) { - if(pidl && pidl->mkid.cb != 0x00) + if(!_ILIsEmpty(pidl)) return (LPPIDLDATA)pidl->mkid.abID; return NULL; } diff --git a/dlls/shell32/shfldr_unixfs.c b/dlls/shell32/shfldr_unixfs.c index 9ae030f..35eb8e3 100644 --- a/dlls/shell32/shfldr_unixfs.c +++ b/dlls/shell32/shfldr_unixfs.c @@ -716,7 +716,7 @@ static HRESULT UNIXFS_initialize_target_folder(UnixFolder *This, const char *szB WCHAR *dos_name; /* Determine the path's length bytes */ - while (current && current->mkid.cb) { + while (!_ILIsEmpty(current)) { dwPathLen += UNIXFS_filename_from_shitemid(current, NULL) + 1; /* For the '/' */ current = ILGetNext(current); }; @@ -734,7 +734,7 @@ static HRESULT UNIXFS_initialize_target_folder(UnixFolder *This, const char *szB pNextDir += strlen(szBasePath); if (This->m_dwPathMode == PATHMODE_UNIX || IsEqualCLSID(&CLSID_MyDocuments, This->m_pCLSID)) This->m_dwAttributes |= SFGAO_FILESYSTEM; - while (current && current->mkid.cb) { + while (!_ILIsEmpty(current)) { pNextDir += UNIXFS_filename_from_shitemid(current, pNextDir); *pNextDir++ = '/'; current = ILGetNext(current); @@ -948,7 +948,7 @@ static HRESULT WINAPI UnixFolder_IShellFolder2_BindToObject(IShellFolder2* iface TRACE("(iface=%p, pidl=%p, pbcReserver=%p, riid=%p, ppvOut=%p)\n", iface, pidl, pbcReserved, riid, ppvOut); - if (!pidl || !pidl->mkid.cb) + if (_ILIsEmpty(pidl)) return E_INVALIDARG; if (IsEqualCLSID(This->m_pCLSID, &CLSID_FolderShortcut)) { @@ -993,8 +993,8 @@ static HRESULT WINAPI UnixFolder_IShellFolder2_CompareIDs(IShellFolder2* iface, TRACE("(iface=%p, lParam=%ld, pidl1=%p, pidl2=%p)\n", iface, lParam, pidl1, pidl2); - isEmpty1 = !pidl1 || !pidl1->mkid.cb; - isEmpty2 = !pidl2 || !pidl2->mkid.cb; + isEmpty1 = _ILIsEmpty(pidl1); + isEmpty2 = _ILIsEmpty(pidl2); if (isEmpty1 && isEmpty2) return MAKE_HRESULT(SEVERITY_SUCCESS, 0, 0); @@ -1160,7 +1160,7 @@ static HRESULT WINAPI UnixFolder_IShellFolder2_GetDisplayNameOf(IShellFolder2* i if ((GET_SHGDN_FOR(uFlags) & SHGDN_FORPARSING) && (GET_SHGDN_RELATION(uFlags) != SHGDN_INFOLDER)) { - if (!pidl || !pidl->mkid.cb) { + if (_ILIsEmpty(pidl)) { lpName->uType = STRRET_WSTR; if (This->m_dwPathMode == PATHMODE_UNIX) { UINT len = MultiByteToWideChar(CP_UNIXCP, 0, This->m_pszPath, -1, NULL, 0); diff --git a/dlls/shell32/shlfolder.c b/dlls/shell32/shlfolder.c index 230d7c6..9ab34a9 100644 --- a/dlls/shell32/shlfolder.c +++ b/dlls/shell32/shlfolder.c @@ -271,7 +271,7 @@ HRESULT SHELL32_BindToChild (LPCITEMIDLIST pidlRoot, TRACE("(%p %s %p %s %p)\n", pidlRoot, debugstr_w(pathRoot), pidlComplete, debugstr_guid(riid), ppvOut); - if (!pidlRoot || !ppvOut || !pidlComplete || !pidlComplete->mkid.cb) + if (!pidlRoot || !ppvOut || _ILIsEmpty(pidlComplete)) return E_INVALIDARG; *ppvOut = NULL;

1 0