October 2011 - Wine-commits

Andrew Eikum : winecfg: Allow user to select default audio devices.
by Alexandre Julliard 05 Oct '11

05 Oct '11

1 0

Frédéric Delanoy : cmd: Avoid dead assignments ( Clang).
by Alexandre Julliard 05 Oct '11

05 Oct '11

Module: wine Branch: master Commit: e2fd09c2e7b199f94171f3b3cce793a1ac81717d URL: http://source.winehq.org/git/wine.git/?a=commit;h=e2fd09c2e7b199f94171f3b3c… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed Oct 5 10:16:30 2011 +0200 cmd: Avoid dead assignments (Clang). --- programs/cmd/builtins.c | 75 ++++++++++++++++++++--------------------------- 1 files changed, 32 insertions(+), 43 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 0df123a..d9eae31 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -1587,7 +1587,10 @@ void WCMD_move (void) { WCMD_splitpath(input, drive, dir, fname, ext); hff = FindFirstFileW(input, &fd); - while (hff != INVALID_HANDLE_VALUE) { + if (hff == INVALID_HANDLE_VALUE) + return; + + do { WCHAR dest[MAX_PATH]; WCHAR src[MAX_PATH]; DWORD attribs; @@ -1674,14 +1677,9 @@ void WCMD_move (void) { WCMD_print_error (); errorlevel = 1; } + } while (FindNextFileW(hff, &fd) != 0); - /* Step on to next match */ - if (FindNextFileW(hff, &fd) == 0) { - FindClose(hff); - hff = INVALID_HANDLE_VALUE; - break; - } - } + FindClose(hff); } /**************************************************************************** @@ -1810,7 +1808,10 @@ void WCMD_rename (void) { WCMD_splitpath(input, drive, dir, fname, ext); hff = FindFirstFileW(input, &fd); - while (hff != INVALID_HANDLE_VALUE) { + if (hff == INVALID_HANDLE_VALUE) + return; + + do { WCHAR dest[MAX_PATH]; WCHAR src[MAX_PATH]; WCHAR *dotSrc = NULL; @@ -1866,14 +1867,9 @@ void WCMD_rename (void) { WCMD_print_error (); errorlevel = 1; } + } while (FindNextFileW(hff, &fd) != 0); - /* Step on to next match */ - if (FindNextFileW(hff, &fd) == 0) { - FindClose(hff); - hff = INVALID_HANDLE_VALUE; - break; - } - } + FindClose(hff); } /***************************************************************************** @@ -2058,33 +2054,26 @@ void WCMD_setshow_default (const WCHAR *command) { /* Search for appropriate directory */ WINE_TRACE("Looking for directory '%s'\n", wine_dbgstr_w(string)); hff = FindFirstFileW(string, &fd); - while (hff != INVALID_HANDLE_VALUE) { - if (fd.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) { - WCHAR fpath[MAX_PATH]; - WCHAR drive[10]; - WCHAR dir[MAX_PATH]; - WCHAR fname[MAX_PATH]; - WCHAR ext[MAX_PATH]; - static const WCHAR fmt[] = {'%','s','%','s','%','s','\0'}; - - /* Convert path into actual directory spec */ - GetFullPathNameW(string, sizeof(fpath)/sizeof(WCHAR), fpath, NULL); - WCMD_splitpath(fpath, drive, dir, fname, ext); - - /* Rebuild path */ - wsprintfW(string, fmt, drive, dir, fd.cFileName); - - FindClose(hff); - hff = INVALID_HANDLE_VALUE; - break; - } - - /* Step on to next match */ - if (FindNextFileW(hff, &fd) == 0) { - FindClose(hff); - hff = INVALID_HANDLE_VALUE; - break; - } + if (hff != INVALID_HANDLE_VALUE) { + do { + if (fd.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) { + WCHAR fpath[MAX_PATH]; + WCHAR drive[10]; + WCHAR dir[MAX_PATH]; + WCHAR fname[MAX_PATH]; + WCHAR ext[MAX_PATH]; + static const WCHAR fmt[] = {'%','s','%','s','%','s','\0'}; + + /* Convert path into actual directory spec */ + GetFullPathNameW(string, sizeof(fpath)/sizeof(WCHAR), fpath, NULL); + WCMD_splitpath(fpath, drive, dir, fname, ext); + + /* Rebuild path */ + wsprintfW(string, fmt, drive, dir, fd.cFileName); + break; + } + } while (FindNextFileW(hff, &fd) != 0); + FindClose(hff); } /* Change to that directory */

1 0

Frédéric Delanoy : cmd: Improve handle type recognition in WCMD_ReadFile.
by Alexandre Julliard 05 Oct '11

05 Oct '11

Module: wine Branch: master Commit: 63e11558b67f25e9c8d253cf8effb7590948fba8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=63e11558b67f25e9c8d253cf8… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed Oct 5 14:02:43 2011 +0200 cmd: Improve handle type recognition in WCMD_ReadFile. --- programs/cmd/wcmdmain.c | 36 +++++++++++++++++------------------- 1 files changed, 17 insertions(+), 19 deletions(-) diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index eb57928..5611642 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -233,6 +233,11 @@ void WCMD_leave_paged_mode(void) pagedMessage = NULL; } +static inline BOOL is_console_handle(HANDLE h) +{ + return (((DWORD_PTR)h) & 3) == 3; +} + /*************************************************************************** * WCMD_Readfile * @@ -240,30 +245,23 @@ void WCMD_leave_paged_mode(void) */ BOOL WCMD_ReadFile(const HANDLE hIn, WCHAR *intoBuf, const DWORD maxChars, LPDWORD charsRead) { - BOOL res; - - /* Try to read from console as Unicode */ - res = ReadConsoleW(hIn, intoBuf, maxChars, charsRead, NULL); - - /* If reading from console has failed we assume its file - i/o so read in and convert from OEM codepage */ - if (!res) { + DWORD numRead; + char *buffer; - DWORD numRead; - char *buffer; + if (is_console_handle(hIn)) + /* Try to read from console as Unicode */ + return ReadConsoleW(hIn, intoBuf, maxChars, charsRead, NULL); - if (!(buffer = get_file_buffer())) - return FALSE; + /* We assume it's a file handle and read then convert from assumed OEM codepage */ + if (!(buffer = get_file_buffer())) + return FALSE; - /* Read from file (assume OEM codepage) */ - res = ReadFile(hIn, buffer, maxChars, &numRead, NULL); + if (!ReadFile(hIn, buffer, maxChars, &numRead, NULL)) + return FALSE; - /* Convert from OEM */ - *charsRead = MultiByteToWideChar(GetConsoleCP(), 0, buffer, numRead, - intoBuf, maxChars); + *charsRead = MultiByteToWideChar(GetConsoleCP(), 0, buffer, numRead, intoBuf, maxChars); - } - return res; + return TRUE; } /*******************************************************************

1 0

Frédéric Delanoy : cmd: Rename a parameter in WCMD_fgets.
by Alexandre Julliard 05 Oct '11

05 Oct '11

Module: wine Branch: master Commit: d25f614c513b1086ce13fa948f5357edf214645f URL: http://source.winehq.org/git/wine.git/?a=commit;h=d25f614c513b1086ce13fa948… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed Oct 5 14:02:44 2011 +0200 cmd: Rename a parameter in WCMD_fgets. --- programs/cmd/batch.c | 34 +++++++++++++++++----------------- programs/cmd/wcmd.h | 2 +- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/programs/cmd/batch.c b/programs/cmd/batch.c index 5f83c35..77a49c9 100644 --- a/programs/cmd/batch.c +++ b/programs/cmd/batch.c @@ -176,17 +176,17 @@ WCHAR *WCMD_parameter (WCHAR *s, int n, WCHAR **where, WCHAR **end) { /**************************************************************************** * WCMD_fgets * - * Gets one line from a file/console and puts it into buffer s - * Pre: s has size noChars + * Gets one line from a file/console and puts it into buffer buf + * Pre: buf has size noChars * 1 <= noChars <= MAXSTRING - * Post: s is filled with at most noChars-1 characters, and gets nul-terminated - s does not include EOL terminator + * Post: buf is filled with at most noChars-1 characters, and gets nul-terminated + buf does not include EOL terminator * Returns: - * s on success + * buf on success * NULL on error or EOF */ -WCHAR *WCMD_fgets(WCHAR *s, int noChars, HANDLE h, BOOL is_console_handle) +WCHAR *WCMD_fgets(WCHAR *buf, int noChars, HANDLE h, const BOOL is_console_handle) { DWORD bytes, charsRead; BOOL status; @@ -195,29 +195,29 @@ WCHAR *WCMD_fgets(WCHAR *s, int noChars, HANDLE h, BOOL is_console_handle) /* We can't use the native f* functions because of the filename syntax differences between DOS and Unix. Also need to lose the LF (or CRLF) from the line. */ - p = s; + p = buf; if (is_console_handle) { - status = ReadConsoleW(h, s, noChars, &charsRead, NULL); + status = ReadConsoleW(h, buf, noChars, &charsRead, NULL); if (!status) return NULL; - if (s[charsRead-2] == '\r') - s[charsRead-2] = '\0'; /* Strip \r\n */ + if (buf[charsRead-2] == '\r') + buf[charsRead-2] = '\0'; /* Strip \r\n */ else { /* Truncate */ - s[noChars-1] = '\0'; + buf[noChars-1] = '\0'; } return p; } /* TODO: More intelligent buffering for reading lines from files */ do { - status = WCMD_ReadFile(h, s, 1, &bytes); - if ((status == 0) || ((bytes == 0) && (s == p))) return NULL; - if (*s == '\n') bytes = 0; - else if (*s != '\r') { - s++; + status = WCMD_ReadFile(h, buf, 1, &bytes); + if ((status == 0) || ((bytes == 0) && (buf == p))) return NULL; + if (*buf == '\n') bytes = 0; + else if (*buf != '\r') { + buf++; noChars--; } - *s = '\0'; + *buf = '\0'; } while ((bytes == 1) && (noChars > 1)); return p; } diff --git a/programs/cmd/wcmd.h b/programs/cmd/wcmd.h index 98e1246..af75a5d 100644 --- a/programs/cmd/wcmd.h +++ b/programs/cmd/wcmd.h @@ -97,7 +97,7 @@ void WCMD_verify (const WCHAR *command); void WCMD_version (void); int WCMD_volume (BOOL set_label, const WCHAR *command); -WCHAR *WCMD_fgets (WCHAR *s, int n, HANDLE stream, const BOOL is_console_handle); +WCHAR *WCMD_fgets (WCHAR *buf, int n, HANDLE stream, const BOOL is_console_handle); WCHAR *WCMD_parameter (WCHAR *s, int n, WCHAR **where, WCHAR **end); WCHAR *WCMD_skip_leading_spaces (WCHAR *string); BOOL WCMD_keyword_ws_found(const WCHAR *keyword, int len, const WCHAR *ptr);

1 0

Henri Verbeet : secur32: Handle the schan_buffers limit field in schan_get_buffer() instead of schan_pull().
by Alexandre Julliard 05 Oct '11

05 Oct '11

Module: wine Branch: master Commit: 7bb7d08d1930dd56569dedf979660b6e26aeec64 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7bb7d08d1930dd56569dedf97… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Oct 5 16:51:19 2011 +0200 secur32: Handle the schan_buffers limit field in schan_get_buffer() instead of schan_pull(). Aside from being the right place, we depend on schan_get_buffer() not returning a buffer if there's no space left in schan_imp_recv() / schan_imp_send(). --- dlls/secur32/schannel.c | 17 ++++++++--------- 1 files changed, 8 insertions(+), 9 deletions(-) diff --git a/dlls/secur32/schannel.c b/dlls/secur32/schannel.c index 0355982..253e71a 100644 --- a/dlls/secur32/schannel.c +++ b/dlls/secur32/schannel.c @@ -433,7 +433,7 @@ static void init_schan_buffers(struct schan_buffers *s, const PSecBufferDesc des int (*get_next_buffer)(const struct schan_transport *, struct schan_buffers *)) { s->offset = 0; - s->limit = 0; + s->limit = ~0UL; s->desc = desc; s->current_buffer_idx = -1; s->allow_buffer_resize = FALSE; @@ -507,6 +507,8 @@ char *schan_get_buffer(const struct schan_transport *t, struct schan_buffers *s, schan_resize_current_buffer(s, s->offset + *count); max_count = buffer->cbBuffer - s->offset; + if (s->limit != ~0UL && s->limit < max_count) + max_count = s->limit; if (!max_count) { int buffer_idx; @@ -523,7 +525,11 @@ char *schan_get_buffer(const struct schan_transport *t, struct schan_buffers *s, return schan_get_buffer(t, s, count); } - if (*count > max_count) *count = max_count; + if (*count > max_count) + *count = max_count; + if (s->limit != ~0UL) + s->limit -= *count; + return (char *)buffer->pvBuffer + s->offset; } @@ -559,13 +565,6 @@ int schan_pull(struct schan_transport *t, void *buff, size_t *buff_len) if (!b) return EAGAIN; - if (t->in.limit != 0 && t->in.offset + local_len >= t->in.limit) - { - local_len = t->in.limit - t->in.offset; - if (local_len == 0) - return EAGAIN; - } - memcpy(buff, b, local_len); t->in.offset += local_len;

1 0

Nikolay Sivov : msxml3: Accept DTD prohibition feature.
by Alexandre Julliard 05 Oct '11

05 Oct '11

Module: wine Branch: master Commit: 165d1b5d70d44e2670e88e34f85c0aadab8fe25e URL: http://source.winehq.org/git/wine.git/?a=commit;h=165d1b5d70d44e2670e88e34f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Oct 5 11:09:28 2011 -0500 msxml3: Accept DTD prohibition feature. --- dlls/msxml3/saxreader.c | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/dlls/msxml3/saxreader.c b/dlls/msxml3/saxreader.c index b7cd432..8498b8d 100644 --- a/dlls/msxml3/saxreader.c +++ b/dlls/msxml3/saxreader.c @@ -217,6 +217,10 @@ static const WCHAR FeatureLexicalHandlerParEntitiesW[] = { '/','l','e','x','i','c','a','l','-','h','a','n','d','l','e','r','/','p','a','r','a','m','e','t','e','r','-','e','n','t','i','t','i','e','s',0 }; +static const WCHAR FeatureProhibitDTDW[] = { + 'p','r','o','h','i','b','i','t','-','d','t','d',0 +}; + static inline HRESULT set_feature_value(saxreader *reader, enum ReaderFeatures feature, VARIANT_BOOL value) { if (value == VARIANT_TRUE) @@ -2634,6 +2638,12 @@ static HRESULT WINAPI saxxmlreader_putFeature( return set_feature_value(This, LexicalHandlerParEntities, value); } + if (!strcmpW(FeatureProhibitDTDW, feature)) + { + FIXME("(%p)->(%s %x) stub\n", This, debugstr_w(feature), value); + return set_feature_value(This, ProhibitDTD, value); + } + FIXME("(%p)->(%s %x) stub\n", This, debugstr_w(feature), value); return E_NOTIMPL; }

1 0

Nikolay Sivov : msxml3: Support setting unlimited xml stream length for a reader.
by Alexandre Julliard 05 Oct '11

05 Oct '11

Module: wine Branch: master Commit: 393c232b053c829a477192734214393edc0f67dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=393c232b053c829a477192734… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Oct 5 11:19:43 2011 -0500 msxml3: Support setting unlimited xml stream length for a reader. --- dlls/msxml3/saxreader.c | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/msxml3/saxreader.c b/dlls/msxml3/saxreader.c index 8498b8d..857083a 100644 --- a/dlls/msxml3/saxreader.c +++ b/dlls/msxml3/saxreader.c @@ -2383,7 +2383,14 @@ static HRESULT internal_putProperty( return S_OK; } - FIXME("(%p)->(%s): unsupported property\n", This, debugstr_w(prop)); + if(!memcmp(prop, PropertyMaxXMLSizeW, sizeof(PropertyMaxXMLSizeW))) + { + if (V_VT(&value) == VT_I4 && V_I4(&value) == 0) return S_OK; + FIXME("(%p)->(%s): max-xml-size unsupported\n", This, debugstr_variant(&value)); + return E_NOTIMPL; + } + + FIXME("(%p)->(%s:%s): unsupported property\n", This, debugstr_w(prop), debugstr_variant(&value)); if(!memcmp(prop, PropertyCharsetW, sizeof(PropertyCharsetW))) return E_NOTIMPL; @@ -2397,9 +2404,6 @@ static HRESULT internal_putProperty( if(!memcmp(prop, PropertyMaxElementDepthW, sizeof(PropertyMaxElementDepthW))) return E_NOTIMPL; - if(!memcmp(prop, PropertyMaxXMLSizeW, sizeof(PropertyMaxXMLSizeW))) - return E_NOTIMPL; - if(!memcmp(prop, PropertySchemaDeclHandlerW, sizeof(PropertySchemaDeclHandlerW))) return E_NOTIMPL;

1 0

Nikolay Sivov : msxml3: Support setting unlimited nesting depth for a reader.
by Alexandre Julliard 05 Oct '11

05 Oct '11

Module: wine Branch: master Commit: 5f68f3710c90e65b4e6182bd3079c0cbc35a502b URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f68f3710c90e65b4e6182bd3… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Oct 5 11:23:56 2011 -0500 msxml3: Support setting unlimited nesting depth for a reader. --- dlls/msxml3/saxreader.c | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/msxml3/saxreader.c b/dlls/msxml3/saxreader.c index 857083a..b771802 100644 --- a/dlls/msxml3/saxreader.c +++ b/dlls/msxml3/saxreader.c @@ -2390,6 +2390,13 @@ static HRESULT internal_putProperty( return E_NOTIMPL; } + if(!memcmp(prop, PropertyMaxElementDepthW, sizeof(PropertyMaxElementDepthW))) + { + if (V_VT(&value) == VT_I4 && V_I4(&value) == 0) return S_OK; + FIXME("(%p)->(%s): max-element-depth unsupported\n", This, debugstr_variant(&value)); + return E_NOTIMPL; + } + FIXME("(%p)->(%s:%s): unsupported property\n", This, debugstr_w(prop), debugstr_variant(&value)); if(!memcmp(prop, PropertyCharsetW, sizeof(PropertyCharsetW))) @@ -2401,9 +2408,6 @@ static HRESULT internal_putProperty( if(!memcmp(prop, PropertyInputSourceW, sizeof(PropertyInputSourceW))) return E_NOTIMPL; - if(!memcmp(prop, PropertyMaxElementDepthW, sizeof(PropertyMaxElementDepthW))) - return E_NOTIMPL; - if(!memcmp(prop, PropertySchemaDeclHandlerW, sizeof(PropertySchemaDeclHandlerW))) return E_NOTIMPL;

1 0

Nikolay Sivov : msxml3: Support setting namespaces feature to default value .
by Alexandre Julliard 05 Oct '11

05 Oct '11

Module: wine Branch: master Commit: 3d3786c2fab1bada769801ab43dd8ae141caa9a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d3786c2fab1bada769801ab4… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Oct 5 13:29:37 2011 -0500 msxml3: Support setting namespaces feature to default value. --- dlls/msxml3/saxreader.c | 27 ++++++++++++++++++++---- dlls/msxml3/tests/saxreader.c | 45 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 67 insertions(+), 5 deletions(-) diff --git a/dlls/msxml3/saxreader.c b/dlls/msxml3/saxreader.c index b771802..d3f2ec0 100644 --- a/dlls/msxml3/saxreader.c +++ b/dlls/msxml3/saxreader.c @@ -56,7 +56,7 @@ enum ReaderFeatures ExternalParameterEntities = 1 << 3, ForcedResync = 1 << 4, NamespacePrefixes = 1 << 5, - Namespace = 1 << 6, + Namespaces = 1 << 6, ParameterEntities = 1 << 7, PreserveSystemIndentifiers = 1 << 8, ProhibitDTD = 1 << 9, @@ -221,6 +221,11 @@ static const WCHAR FeatureProhibitDTDW[] = { 'p','r','o','h','i','b','i','t','-','d','t','d',0 }; +static const WCHAR FeatureNamespacesW[] = { + 'h','t','t','p',':','/','/','x','m','l','.','o','r','g','/','s','a','x','/','f','e','a','t','u','r','e','s', + '/','n','a','m','e','s','p','a','c','e','s',0 +}; + static inline HRESULT set_feature_value(saxreader *reader, enum ReaderFeatures feature, VARIANT_BOOL value) { if (value == VARIANT_TRUE) @@ -231,6 +236,12 @@ static inline HRESULT set_feature_value(saxreader *reader, enum ReaderFeatures f return S_OK; } +static inline HRESULT get_feature_value(const saxreader *reader, enum ReaderFeatures feature, VARIANT_BOOL *value) +{ + *value = reader->features & feature ? VARIANT_TRUE : VARIANT_FALSE; + return S_OK; +} + static inline BOOL has_content_handler(const saxlocator *locator) { return (locator->vbInterface && locator->saxreader->vbcontentHandler) || @@ -2616,12 +2627,15 @@ static HRESULT WINAPI saxxmlreader_Invoke( /*** IVBSAXXMLReader methods ***/ static HRESULT WINAPI saxxmlreader_getFeature( IVBSAXXMLReader* iface, - const WCHAR *pFeature, - VARIANT_BOOL *pValue) + const WCHAR *feature, + VARIANT_BOOL *value) { saxreader *This = impl_from_IVBSAXXMLReader( iface ); - FIXME("(%p)->(%s %p) stub\n", This, debugstr_w(pFeature), pValue); + if (!strcmpW(FeatureNamespacesW, feature)) + return get_feature_value(This, Namespaces, value); + + FIXME("(%p)->(%s %p) stub\n", This, debugstr_w(feature), value); return E_NOTIMPL; } @@ -2652,6 +2666,9 @@ static HRESULT WINAPI saxxmlreader_putFeature( return set_feature_value(This, ProhibitDTD, value); } + if (!strcmpW(FeatureNamespacesW, feature) && value == VARIANT_TRUE) + return set_feature_value(This, Namespaces, value); + FIXME("(%p)->(%s %x) stub\n", This, debugstr_w(feature), value); return E_NOTIMPL; } @@ -3043,7 +3060,7 @@ HRESULT SAXXMLReader_create(IUnknown *pUnkOuter, LPVOID *ppObj) reader->pool.pool = NULL; reader->pool.index = 0; reader->pool.len = 0; - reader->features = 0; + reader->features = Namespaces; memset(&reader->sax, 0, sizeof(xmlSAXHandler)); reader->sax.initialized = XML_SAX2_MAGIC; diff --git a/dlls/msxml3/tests/saxreader.c b/dlls/msxml3/tests/saxreader.c index b5477d9..6493776 100644 --- a/dlls/msxml3/tests/saxreader.c +++ b/dlls/msxml3/tests/saxreader.c @@ -1267,6 +1267,50 @@ static void test_saxreader_properties(void) free_bstrs(); } +struct feature_ns_entry_t { + const GUID *guid; + const char *clsid; + VARIANT_BOOL value; +}; + +static const struct feature_ns_entry_t feature_ns_entry_data[] = { + { &CLSID_SAXXMLReader, "CLSID_SAXXMLReader", VARIANT_TRUE }, + { &CLSID_SAXXMLReader30, "CLSID_SAXXMLReader30", VARIANT_TRUE }, + { &CLSID_SAXXMLReader40, "CLSID_SAXXMLReader40", VARIANT_TRUE }, + { &CLSID_SAXXMLReader60, "CLSID_SAXXMLReader60", VARIANT_TRUE }, + { 0 } +}; + +static void test_saxreader_features(void) +{ + const struct feature_ns_entry_t *entry = feature_ns_entry_data; + ISAXXMLReader *reader; + + while (entry->guid) + { + VARIANT_BOOL value; + HRESULT hr; + + hr = CoCreateInstance(entry->guid, NULL, CLSCTX_INPROC_SERVER, &IID_ISAXXMLReader, (void**)&reader); + if (hr != S_OK) + { + win_skip("can't create %s instance\n", entry->clsid); + entry++; + continue; + } + + value = 0xc; + hr = ISAXXMLReader_getFeature(reader, _bstr_("http://xml.org/sax/features/namespaces"), &value); + EXPECT_HR(hr, S_OK); + + ok(entry->value == value, "%s: got wrong default value %x, expected %x\n", entry->clsid, value, entry->value); + + ISAXXMLReader_Release(reader); + + entry++; + } +} + /* UTF-8 data with UTF-8 BOM and UTF-16 in prolog */ static const CHAR UTF8BOMTest[] = "\xEF\xBB\xBF<?xml version = \"1.0\" encoding = \"UTF-16\"?>\n" @@ -2317,6 +2361,7 @@ START_TEST(saxreader) test_saxreader(); test_saxreader_properties(); + test_saxreader_features(); test_encoding(); /* MXXMLWriter tests */

1 0

Andrew Eikum : audio: Change winmm import to delayed import.
by Alexandre Julliard 05 Oct '11

05 Oct '11

Module: wine Branch: master Commit: 8410dd353c9a9d57f0b6892dc737621cf82d215a URL: http://source.winehq.org/git/wine.git/?a=commit;h=8410dd353c9a9d57f0b6892dc… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Oct 5 13:39:34 2011 -0500 audio: Change winmm import to delayed import. --- dlls/winealsa.drv/Makefile.in | 3 ++- dlls/winecoreaudio.drv/Makefile.in | 3 ++- dlls/wineoss.drv/Makefile.in | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/winealsa.drv/Makefile.in b/dlls/winealsa.drv/Makefile.in index c5f8cde..336da8b 100644 --- a/dlls/winealsa.drv/Makefile.in +++ b/dlls/winealsa.drv/Makefile.in @@ -1,5 +1,6 @@ MODULE = winealsa.drv -IMPORTS = uuid winmm ole32 +IMPORTS = uuid ole32 +DELAYIMPORTS = winmm EXTRALIBS = @ALSALIBS@ C_SRCS = \ diff --git a/dlls/winecoreaudio.drv/Makefile.in b/dlls/winecoreaudio.drv/Makefile.in index f0598aa..ff0a500 100644 --- a/dlls/winecoreaudio.drv/Makefile.in +++ b/dlls/winecoreaudio.drv/Makefile.in @@ -1,5 +1,6 @@ MODULE = winecoreaudio.drv -IMPORTS = uuid winmm ole32 user32 +IMPORTS = uuid ole32 user32 +DELAYIMPORTS = winmm EXTRALIBS = @COREAUDIO@ C_SRCS = \ diff --git a/dlls/wineoss.drv/Makefile.in b/dlls/wineoss.drv/Makefile.in index 61b466b..3edf9d3 100644 --- a/dlls/wineoss.drv/Makefile.in +++ b/dlls/wineoss.drv/Makefile.in @@ -1,5 +1,6 @@ MODULE = wineoss.drv -IMPORTS = uuid winmm ole32 user32 +IMPORTS = uuid ole32 user32 +DELAYIMPORTS = winmm EXTRAINCL = @OSS4INCL@ C_SRCS = \

1 0