January 2013 - Wine-Commits

Hans Leidekker : wbemprox: Implement Win32_DiskDrive.DeviceId.
by Alexandre Julliard Jan. 21, 2013

Jan. 21, 2013

Module: wine Branch: master Commit: 99c1b557275ef59c00e16f690789f60d4f6a7b8a URL: http://source.winehq.org/git/wine.git/?a=commit;h=99c1b557275ef59c00e16f690… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Jan 21 16:29:00 2013 +0100 wbemprox: Implement Win32_DiskDrive.DeviceId. --- dlls/wbemprox/builtin.c | 6 +++++- dlls/wbemprox/tests/query.c | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 4375d75..09da3f6 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -215,6 +215,7 @@ static const struct column col_compsys[] = }; static const struct column col_diskdrive[] = { + { prop_deviceidW, CIM_STRING|COL_FLAG_KEY }, { prop_manufacturerW, CIM_STRING }, { prop_modelW, CIM_STRING }, { prop_serialnumberW, CIM_STRING } @@ -345,6 +346,8 @@ static const WCHAR compsys_manufacturerW[] = {'T','h','e',' ','W','i','n','e',' ','P','r','o','j','e','c','t',0}; static const WCHAR compsys_modelW[] = {'W','i','n','e',0}; +static const WCHAR diskdrive_deviceidW[] = + {'\\','\\','\\','\\','.','\\','\\','P','H','Y','S','I','C','A','L','D','R','I','V','E','0',0}; static const WCHAR diskdrive_modelW[] = {'W','i','n','e',' ','D','i','s','k',' ','D','r','i','v','e',0}; static const WCHAR diskdrive_manufacturerW[] = @@ -399,6 +402,7 @@ struct record_computersystem }; struct record_diskdrive { + const WCHAR *device_id; const WCHAR *manufacturer; const WCHAR *name; const WCHAR *serialnumber; @@ -518,7 +522,7 @@ static const struct record_cdromdrive data_cdromdrive[] = }; static const struct record_diskdrive data_diskdrive[] = { - { diskdrive_manufacturerW, diskdrive_modelW } + { diskdrive_deviceidW, diskdrive_manufacturerW, diskdrive_modelW } }; static const struct record_params data_params[] = { diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index 1096caa..04c87b7 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -91,7 +91,11 @@ static void test_select( IWbemServices *services ) {'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ','W','i','n','3','2','_', 'P','r','o','c','e','s','s',' ','W','H','E','R','E',' ','C','a','p','t','i','o','n',' ', 'L','I','K','E',' ','\'','%','%','R','E','G','E','D','I','T','%','\'',0}; - static const WCHAR *test[] = { query1, query2, query3, query4, query5, query6, query7 }; + static const WCHAR query8[] = + {'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ','W','i','n','3','2','_', + 'D','i','s','k','D','r','i','v','e',' ','W','H','E','R','E',' ','D','e','v','i','c','e','I','D','=', + '\"','\\','\\','\\','\\','.','\\','\\','P','H','Y','S','I','C','A','L','D','R','I','V','E','0','\"',0}; + static const WCHAR *test[] = { query1, query2, query3, query4, query5, query6, query7, query8 }; HRESULT hr; IEnumWbemClassObject *result; BSTR wql = SysAllocString( wqlW );

1 0

Nikolay Sivov : xmllite: Handle empty elements and transition to content/ misc part, update depth on push.
by Alexandre Julliard Jan. 21, 2013

Jan. 21, 2013

Module: wine Branch: master Commit: 1ae300d75303b3b1a496bf97c116abbb92f6044f URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ae300d75303b3b1a496bf97c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jan 21 01:03:23 2013 +0400 xmllite: Handle empty elements and transition to content/misc part, update depth on push. --- dlls/xmllite/reader.c | 75 ++++++++++++++++++++++++++++++++++++------- dlls/xmllite/tests/reader.c | 37 ++++++++++++++++++--- 2 files changed, 95 insertions(+), 17 deletions(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index c18dd41..e0e6542 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -52,7 +52,8 @@ typedef enum XmlReadInState_DTD, XmlReadInState_DTD_Misc, XmlReadInState_Element, - XmlReadInState_Content + XmlReadInState_Content, + XmlReadInState_MiscEnd } XmlReaderInternalState; typedef enum @@ -146,6 +147,7 @@ typedef struct UINT attr_count; struct list elements; strval strvalues[StringValue_Last]; + UINT depth; } xmlreader; struct input_buffer @@ -308,6 +310,13 @@ static void reader_clear_elements(xmlreader *reader) list_init(&reader->elements); } +static HRESULT reader_inc_depth(xmlreader *reader) +{ + /* FIXME: handle XmlReaderProperty_MaxElementDepth property */ + reader->depth++; + return S_OK; +} + static HRESULT reader_push_element(xmlreader *reader, strval *qname) { struct element *elem; @@ -319,6 +328,12 @@ static HRESULT reader_push_element(xmlreader *reader, strval *qname) hr = reader_strvaldup(reader, qname, &elem->qname); if (FAILED(hr)) return hr; + if (!list_empty(&reader->elements)) + { + hr = reader_inc_depth(reader); + if (FAILED(hr)) return hr; + } + list_add_head(&reader->elements, &elem->entry); return hr; } @@ -1447,7 +1462,7 @@ static HRESULT reader_parse_qname(xmlreader *reader, strval *prefix, strval *loc /* [12 NS] STag ::= '<' QName (S Attribute)* S? '>' [14 NS] EmptyElemTag ::= '<' QName (S Attribute)* S? '/>' */ -static HRESULT reader_parse_stag(xmlreader *reader, strval *prefix, strval *local, strval *qname) +static HRESULT reader_parse_stag(xmlreader *reader, strval *prefix, strval *local, strval *qname, int *empty) { static const WCHAR endW[] = {'/','>',0}; static const WCHAR gtW[] = {'>',0}; @@ -1461,11 +1476,16 @@ static HRESULT reader_parse_stag(xmlreader *reader, strval *prefix, strval *loca reader_skipspaces(reader); - if (!reader_cmp(reader, endW)) return S_OK; + /* empty element */ + if ((*empty = !reader_cmp(reader, endW))) return S_OK; /* got a start tag */ if (!reader_cmp(reader, gtW)) + { + /* skip '>' */ + reader_skipn(reader, 1); return reader_push_element(reader, qname); + } FIXME("only empty elements/start tags without attribute list supported\n"); return E_NOTIMPL; @@ -1477,27 +1497,55 @@ static HRESULT reader_parse_element(xmlreader *reader) static const WCHAR ltW[] = {'<',0}; strval qname, prefix, local; HRESULT hr; + int empty; /* check if we are really on element */ if (reader_cmp(reader, ltW)) return S_FALSE; reader_shrink(reader); /* this handles empty elements too */ - hr = reader_parse_stag(reader, &prefix, &local, &qname); + empty = 0; + hr = reader_parse_stag(reader, &prefix, &local, &qname, &empty); if (FAILED(hr)) return hr; /* FIXME: need to check for defined namespace to reject invalid prefix, currently reject all prefixes */ if (prefix.len) return NC_E_UNDECLAREDPREFIX; + /* if we got empty element and stack is empty go straight to Misc */ + if (empty && list_empty(&reader->elements)) + reader->instate = XmlReadInState_MiscEnd; + else + reader->instate = XmlReadInState_Content; + reader->nodetype = XmlNodeType_Element; reader_set_strvalue(reader, StringValue_LocalName, &local); reader_set_strvalue(reader, StringValue_QualifiedName, &qname); - FIXME("element content parsing not implemented\n"); return hr; } +/* [13 NS] ETag ::= '</' QName S? '>' */ +static HRESULT reader_parse_endtag(xmlreader *reader) +{ + FIXME("ETag parsing not implemented\n"); + return E_NOTIMPL; +} + +/* [43] content ::= CharData? ((element | Reference | CDSect | PI | Comment) CharData?)* */ +static HRESULT reader_parse_content(xmlreader *reader) +{ + static const WCHAR etagW[] = {'<','/',0}; + reader_shrink(reader); + + /* handle end tag */ + if (!reader_cmp(reader, etagW)) + return reader_parse_endtag(reader); + + /* FIXME: handle the rest of possible content nodes */ + return reader_parse_element(reader); +} + static HRESULT reader_parse_nextnode(xmlreader *reader) { HRESULT hr; @@ -1562,11 +1610,9 @@ static HRESULT reader_parse_nextnode(xmlreader *reader) return hr; break; case XmlReadInState_Element: - hr = reader_parse_element(reader); - if (FAILED(hr)) return hr; - - reader->instate = XmlReadInState_Content; - return hr; + return reader_parse_element(reader); + case XmlReadInState_Content: + return reader_parse_content(reader); default: FIXME("internal state %d not handled\n", reader->instate); return E_NOTIMPL; @@ -1642,6 +1688,8 @@ static HRESULT WINAPI xmlreader_SetInput(IXmlReader* iface, IUnknown *input) } This->line = This->pos = 0; + reader_clear_elements(This); + This->depth = 0; /* just reset current input */ if (!input) @@ -1912,8 +1960,10 @@ static HRESULT WINAPI xmlreader_GetAttributeCount(IXmlReader* iface, UINT *count static HRESULT WINAPI xmlreader_GetDepth(IXmlReader* iface, UINT *depth) { - FIXME("(%p %p): stub\n", iface, depth); - return E_NOTIMPL; + xmlreader *This = impl_from_IXmlReader(iface); + TRACE("(%p)->(%p)\n", This, depth); + *depth = This->depth; + return S_OK; } static BOOL WINAPI xmlreader_IsEOF(IXmlReader* iface) @@ -2044,6 +2094,7 @@ HRESULT WINAPI CreateXmlReader(REFIID riid, void **obj, IMalloc *imalloc) reader->attr_count = 0; reader->attr = NULL; list_init(&reader->elements); + reader->depth = 0; for (i = 0; i < StringValue_Last; i++) reader->strvalues[i] = strval_empty; diff --git a/dlls/xmllite/tests/reader.c b/dlls/xmllite/tests/reader.c index 2ef9b6a..8a1f3f7 100644 --- a/dlls/xmllite/tests/reader.c +++ b/dlls/xmllite/tests/reader.c @@ -687,10 +687,9 @@ static void test_read_xmldeclaration(void) ok(count == 3, "Expected 3, got %d\n", count); hr = IXmlReader_GetDepth(reader, &count); -todo_wine { ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); +todo_wine ok(count == 1, "Expected 1, got %d\n", count); -} hr = IXmlReader_MoveToElement(reader); ok(hr == S_OK, "got %08x\n", hr); @@ -1039,7 +1038,11 @@ static struct test_entry element_tests[] = { static void test_read_element(void) { struct test_entry *test = element_tests; + static const char stag[] = "<a><b>"; IXmlReader *reader; + XmlNodeType type; + IStream *stream; + UINT depth; HRESULT hr; hr = pCreateXmlReader(&IID_IXmlReader, (void**)&reader, NULL); @@ -1047,9 +1050,6 @@ static void test_read_element(void) while (test->xml) { - XmlNodeType type; - IStream *stream; - stream = create_stream_on_data(test->xml, strlen(test->xml)+1); hr = IXmlReader_SetInput(reader, (IUnknown*)stream); ok(hr == S_OK, "got %08x\n", hr); @@ -1090,6 +1090,33 @@ static void test_read_element(void) test++; } + stream = create_stream_on_data(stag, strlen(stag)+1); + hr = IXmlReader_SetInput(reader, (IUnknown*)stream); + ok(hr == S_OK, "got %08x\n", hr); + + depth = 1; + hr = IXmlReader_GetDepth(reader, &depth); + ok(hr == S_OK, "got %08x\n", hr); + ok(depth == 0, "got %d\n", depth); + + hr = IXmlReader_Read(reader, &type); + ok(hr == S_OK, "got %08x\n", hr); + + depth = 1; + hr = IXmlReader_GetDepth(reader, &depth); + ok(hr == S_OK, "got %08x\n", hr); + ok(depth == 0, "got %d\n", depth); + + hr = IXmlReader_Read(reader, &type); + ok(hr == S_OK, "got %08x\n", hr); + + depth = 0; + hr = IXmlReader_GetDepth(reader, &depth); + ok(hr == S_OK, "got %08x\n", hr); + ok(depth == 1, "got %d\n", depth); + + IStream_Release(stream); + IXmlReader_Release(reader); }

1 0

Hans Leidekker : msi: Execute concurrent installers in a separate process.
by Alexandre Julliard Jan. 21, 2013

Jan. 21, 2013

Module: wine Branch: master Commit: 5b642da8cbaae7093a4ce5c50e7c764e82c8e805 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b642da8cbaae7093a4ce5c50… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Jan 21 16:24:59 2013 +0100 msi: Execute concurrent installers in a separate process. --- dlls/msi/custom.c | 133 +++++++++++++++++----------------------------------- 1 files changed, 44 insertions(+), 89 deletions(-) diff --git a/dlls/msi/custom.c b/dlls/msi/custom.c index a33f19d..4366409 100644 --- a/dlls/msi/custom.c +++ b/dlls/msi/custom.c @@ -619,43 +619,6 @@ static DWORD WINAPI DllThread( LPVOID arg ) return rc; } -static DWORD ACTION_CAInstallPackage(const GUID *guid) -{ - msi_custom_action_info *info; - UINT r = ERROR_FUNCTION_FAILED; - INSTALLUILEVEL old_level; - - info = find_action_by_guid(guid); - if (!info) - { - ERR("failed to find action %s\n", debugstr_guid(guid)); - return r; - } - - old_level = MsiSetInternalUI(INSTALLUILEVEL_BASIC, NULL); - r = MsiInstallProductW(info->source, info->target); - MsiSetInternalUI(old_level, NULL); - - release_custom_action_data(info); - - return r; -} - -static DWORD WINAPI ConcurrentInstallThread(LPVOID arg) -{ - LPGUID guid = arg; - DWORD rc; - - TRACE("concurrent installation (%x) started\n", GetCurrentThreadId()); - - rc = ACTION_CAInstallPackage(guid); - - TRACE("concurrent installation (%x) returned %i\n", GetCurrentThreadId(), rc); - - MsiCloseAllHandles(); - return rc; -} - static msi_custom_action_info *do_msidbCustomActionTypeDll( MSIPACKAGE *package, INT type, LPCWSTR source, LPCWSTR target, LPCWSTR action ) { @@ -690,58 +653,6 @@ static msi_custom_action_info *do_msidbCustomActionTypeDll( return info; } -static msi_custom_action_info *do_msidbCAConcurrentInstall( - MSIPACKAGE *package, INT type, LPCWSTR source, LPCWSTR target, LPCWSTR action) -{ - msi_custom_action_info *info; - - info = msi_alloc( sizeof *info ); - if (!info) - return NULL; - - msiobj_addref( &package->hdr ); - info->refs = 2; /* 1 for our caller and 1 for thread we created */ - info->package = package; - info->type = type; - info->target = strdupW( target ); - info->source = strdupW( source ); - info->action = strdupW( action ); - CoCreateGuid( &info->guid ); - - EnterCriticalSection( &msi_custom_action_cs ); - list_add_tail( &msi_pending_custom_actions, &info->entry ); - LeaveCriticalSection( &msi_custom_action_cs ); - - info->handle = CreateThread( NULL, 0, ConcurrentInstallThread, &info->guid, 0, NULL ); - if (!info->handle) - { - /* release both references */ - release_custom_action_data( info ); - release_custom_action_data( info ); - return NULL; - } - - return info; -} - -static UINT HANDLE_CustomType23(MSIPACKAGE *package, LPCWSTR source, - LPCWSTR target, const INT type, LPCWSTR action) -{ - msi_custom_action_info *info; - WCHAR package_path[MAX_PATH]; - DWORD size; - - size = MAX_PATH; - msi_get_property(package->db, szSourceDir, package_path, &size); - lstrcatW(package_path, szBackSlash); - lstrcatW(package_path, source); - - TRACE("Installing package %s concurrently\n", debugstr_w(package_path)); - - info = do_msidbCAConcurrentInstall(package, type, package_path, target, action); - return wait_thread_handle(info); -} - static UINT HANDLE_CustomType1(MSIPACKAGE *package, LPCWSTR source, LPCWSTR target, const INT type, LPCWSTR action) { @@ -911,6 +822,50 @@ static UINT HANDLE_CustomType19(MSIPACKAGE *package, LPCWSTR source, return ERROR_INSTALL_FAILURE; } +static UINT HANDLE_CustomType23(MSIPACKAGE *package, LPCWSTR source, + LPCWSTR target, const INT type, LPCWSTR action) +{ + static const WCHAR msiexecW[] = {'m','s','i','e','x','e','c',0}; + static const WCHAR paramsW[] = {'/','q','b',' ','/','i',' '}; + WCHAR *dir, *arg, *p; + UINT len_src, len_dir, len_tgt, len = sizeof(paramsW)/sizeof(paramsW[0]); + HANDLE handle; + + if (!(dir = msi_dup_property( package->db, szOriginalDatabase ))) return ERROR_OUTOFMEMORY; + if (!(p = strrchrW( dir, '\\' )) && !(p = strrchrW( dir, '/' ))) + { + msi_free( dir ); + return ERROR_FUNCTION_FAILED; + } + *p = 0; + len_dir = p - dir; + len_src = strlenW( source ); + len_tgt = strlenW( target ); + if (!(arg = msi_alloc( (len + len_dir + len_src + len_tgt + 5) * sizeof(WCHAR) ))) + { + msi_free( dir ); + return ERROR_OUTOFMEMORY; + } + memcpy( arg, paramsW, sizeof(paramsW) ); + arg[len++] = '"'; + memcpy( arg + len, dir, len_dir * sizeof(WCHAR) ); + len += len_dir; + arg[len++] = '\\'; + memcpy( arg + len, source, len_src * sizeof(WCHAR) ); + len += len_src; + arg[len++] = '"'; + arg[len++] = ' '; + strcpyW( arg + len, target ); + + TRACE("installing %s concurrently\n", debugstr_w(source)); + + handle = execute_command( msiexecW, arg, dir ); + msi_free( dir ); + msi_free( arg ); + if (handle == INVALID_HANDLE_VALUE) return ERROR_SUCCESS; + return wait_process_handle( package, type, handle, action ); +} + static UINT HANDLE_CustomType50(MSIPACKAGE *package, LPCWSTR source, LPCWSTR target, const INT type, LPCWSTR action) {

1 0

Aric Stewart : usp10: Add locl and ccmp to Latin features.
by Alexandre Julliard Jan. 21, 2013

Jan. 21, 2013

Module: wine Branch: master Commit: ddf6b6e585b8fd0d91efc4b7e3bdb89e5eb897f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ddf6b6e585b8fd0d91efc4b7e… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Jan 21 09:23:04 2013 -0600 usp10: Add locl and ccmp to Latin features. --- dlls/usp10/shape.c | 14 ++++++++------ 1 files changed, 8 insertions(+), 6 deletions(-) diff --git a/dlls/usp10/shape.c b/dlls/usp10/shape.c index ac18b13..b504b3a 100644 --- a/dlls/usp10/shape.c +++ b/dlls/usp10/shape.c @@ -142,6 +142,8 @@ static OPENTYPE_FEATURE_RECORD standard_features[] = static OPENTYPE_FEATURE_RECORD latin_features[] = { + { MS_MAKE_TAG('l','o','c','l'), 1}, + { MS_MAKE_TAG('c','c','m','p'), 1}, { MS_MAKE_TAG('l','i','g','a'), 1}, { MS_MAKE_TAG('c','l','i','g'), 1}, }; @@ -451,11 +453,11 @@ typedef struct ScriptShapeDataTag { static const ScriptShapeData ShapingData[] = { {{ standard_features, 2}, {NULL, 0}, NULL, 0, NULL, NULL}, - {{ latin_features, 2}, {latin_gpos_features, 3}, NULL, 0, NULL, NULL}, - {{ latin_features, 2}, {latin_gpos_features, 3}, NULL, 0, NULL, NULL}, - {{ latin_features, 2}, {latin_gpos_features, 3}, NULL, 0, NULL, NULL}, + {{ latin_features, 4}, {latin_gpos_features, 3}, NULL, 0, NULL, NULL}, + {{ latin_features, 4}, {latin_gpos_features, 3}, NULL, 0, NULL, NULL}, + {{ latin_features, 4}, {latin_gpos_features, 3}, NULL, 0, NULL, NULL}, {{ standard_features, 2}, {NULL, 0}, NULL, 0, NULL, NULL}, - {{ latin_features, 2}, {latin_gpos_features, 3}, NULL, 0, NULL, NULL}, + {{ latin_features, 4}, {latin_gpos_features, 3}, NULL, 0, NULL, NULL}, {{ arabic_features, 6}, {arabic_gpos_features, 4}, required_arabic_features, 0, ContextualShape_Arabic, ShapeCharGlyphProp_Arabic}, {{ arabic_features, 6}, {arabic_gpos_features, 4}, required_arabic_features, 0, ContextualShape_Arabic, ShapeCharGlyphProp_Arabic}, {{ hebrew_features, 2}, {hebrew_gpos_features, 2}, NULL, 0, ContextualShape_Hebrew, ShapeCharGlyphProp_Hebrew}, @@ -495,7 +497,7 @@ static const ScriptShapeData ShapingData[] = {{ devanagari_features, 6}, {devanagari_gpos_features, 4}, required_telugu_features, MS_MAKE_TAG('m','l','m','2'), ContextualShape_Malayalam, ShapeCharGlyphProp_Malayalam}, {{ devanagari_features, 6}, {devanagari_gpos_features, 4}, required_telugu_features, MS_MAKE_TAG('m','l','m','2'), ContextualShape_Malayalam, NULL}, {{ standard_features, 2}, {NULL, 0}, NULL, 0, NULL, NULL}, - {{ latin_features, 2}, {latin_gpos_features, 3}, NULL, 0, NULL, NULL}, + {{ latin_features, 4}, {latin_gpos_features, 3}, NULL, 0, NULL, NULL}, {{ standard_features, 2}, {NULL, 0}, NULL, 0, NULL, NULL}, {{ myanmar_features, 2}, {NULL, 0}, NULL, 0, NULL, NULL}, {{ myanmar_features, 2}, {NULL, 0}, NULL, 0, NULL, NULL}, @@ -530,7 +532,7 @@ static const ScriptShapeData ShapingData[] = {{ NULL, 0}, {NULL, 0}, NULL, 0, NULL, NULL}, {{ NULL, 0}, {NULL, 0}, NULL, 0, NULL, NULL}, {{ hebrew_features, 2}, {hebrew_gpos_features, 2}, NULL, 0, ContextualShape_Hebrew, NULL}, - {{ latin_features, 2}, {latin_gpos_features, 3}, NULL, 0, NULL, NULL}, + {{ latin_features, 4}, {latin_gpos_features, 3}, NULL, 0, NULL, NULL}, {{ thai_features, 1}, {thai_gpos_features, 3}, NULL, 0, ContextualShape_Thai, ShapeCharGlyphProp_Thai}, };

1 0

Jacek Caban : secur32: Return a cert context with context store in SECPKG_ATTR_REMOTE_CERT_CONTEXT MacOSX implementation .
by Alexandre Julliard Jan. 21, 2013

Jan. 21, 2013

Module: wine Branch: master Commit: 303ec3ef91536baaab94501a2cd3db2bc666213e URL: http://source.winehq.org/git/wine.git/?a=commit;h=303ec3ef91536baaab94501a2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jan 21 15:03:50 2013 +0100 secur32: Return a cert context with context store in SECPKG_ATTR_REMOTE_CERT_CONTEXT MacOSX implementation. --- dlls/secur32/schannel_macosx.c | 76 +++++++++++++++++++++++---------------- 1 files changed, 45 insertions(+), 31 deletions(-) diff --git a/dlls/secur32/schannel_macosx.c b/dlls/secur32/schannel_macosx.c index 2d03d2a..aaf2532 100644 --- a/dlls/secur32/schannel_macosx.c +++ b/dlls/secur32/schannel_macosx.c @@ -706,53 +706,67 @@ static void schan_imp_cf_release(const void *arg, void *ctx) } #endif -SECURITY_STATUS schan_imp_get_session_peer_certificate(schan_imp_session session, HCERTSTORE cert_store, - PCCERT_CONTEXT *cert) +SECURITY_STATUS schan_imp_get_session_peer_certificate(schan_imp_session session, HCERTSTORE store, + PCCERT_CONTEXT *ret_cert) { struct mac_session* s = (struct mac_session*)session; - SECURITY_STATUS ret = SEC_E_INTERNAL_ERROR; - CFArrayRef certs; + SECURITY_STATUS ret = SEC_E_OK; + PCCERT_CONTEXT cert = NULL; + SecCertificateRef mac_cert; + CFArrayRef cert_array; OSStatus status; + CFIndex cnt, i; + CFDataRef data; + BOOL res; TRACE("(%p/%p, %p)\n", s, s->context, cert); #ifdef HAVE_SSLCOPYPEERCERTIFICATES - status = SSLCopyPeerCertificates(s->context, &certs); + status = SSLCopyPeerCertificates(s->context, &cert_array); #else - status = SSLGetPeerCertificates(s->context, &certs); + status = SSLGetPeerCertificates(s->context, &cert_array); #endif - if (status == noErr && certs) + if (status != noErr || !cert_array) { - SecCertificateRef mac_cert; - CFDataRef data; - if (CFArrayGetCount(certs) && - (mac_cert = (SecCertificateRef)CFArrayGetValueAtIndex(certs, 0)) && - (SecKeychainItemExport(mac_cert, kSecFormatX509Cert, 0, NULL, &data) == noErr)) + WARN("SSLCopyPeerCertificates failed: %ld\n", (long)status); + return SEC_E_INTERNAL_ERROR; + } + + cnt = CFArrayGetCount(cert_array); + for (i=0; i < cnt; i++) { + if (!(mac_cert = (SecCertificateRef)CFArrayGetValueAtIndex(cert_array, i)) || + (SecKeychainItemExport(mac_cert, kSecFormatX509Cert, 0, NULL, &data) != noErr)) { - *cert = CertCreateCertificateContext(X509_ASN_ENCODING, - CFDataGetBytePtr(data), CFDataGetLength(data)); - if (*cert) - ret = SEC_E_OK; - else - { - ret = GetLastError(); - WARN("CertCreateCertificateContext failed: %x\n", ret); - } - CFRelease(data); - } - else WARN("Couldn't extract certificate data\n"); + ret = SEC_E_INTERNAL_ERROR; + break; + } + + res = CertAddEncodedCertificateToStore(store, X509_ASN_ENCODING, CFDataGetBytePtr(data), CFDataGetLength(data), + CERT_STORE_ADD_REPLACE_EXISTING, i ? NULL : &cert); + CFRelease(data); + if (!res) + { + ret = GetLastError(); + WARN("CertAddEncodedCertificateToStore failed: %x\n", ret); + break; + } + } + #ifndef HAVE_SSLCOPYPEERCERTIFICATES - /* This is why SSLGetPeerCertificates was deprecated */ - CFArrayApplyFunction(certs, CFRangeMake(0, CFArrayGetCount(certs)), - schan_imp_cf_release, NULL); + /* This is why SSLGetPeerCertificates was deprecated */ + CFArrayApplyFunction(cert_array, CFRangeMake(0, CFArrayGetCount(cert_array)), + schan_imp_cf_release, NULL); #endif - CFRelease(certs); + CFRelease(cert_array); + if (ret != SEC_E_OK) { + if(cert) + CertFreeCertificateContext(cert); + return ret; } - else - WARN("SSLCopyPeerCertificates failed: %ld\n", (long)status); - return ret; + *ret_cert = cert; + return SEC_E_OK; } SECURITY_STATUS schan_imp_send(schan_imp_session session, const void *buffer,

1 0

Henri Verbeet : wined3d: Move "ffp_proj_control" to the fragment caps.
by Alexandre Julliard Jan. 21, 2013

Jan. 21, 2013

Module: wine Branch: master Commit: 0e0e3b76f5af48e4f67870fa1035537bf20964af URL: http://source.winehq.org/git/wine.git/?a=commit;h=0e0e3b76f5af48e4f67870fa1… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jan 21 09:08:36 2013 +0100 wined3d: Move "ffp_proj_control" to the fragment caps. --- dlls/wined3d/arb_program_shader.c | 11 ++++++++--- dlls/wined3d/ati_fragment_shader.c | 2 +- dlls/wined3d/glsl_shader.c | 8 ++++++-- dlls/wined3d/nvidia_texture_shader.c | 3 +-- dlls/wined3d/shader.c | 6 +++++- dlls/wined3d/state.c | 3 +-- dlls/wined3d/wined3d_private.h | 4 +++- 7 files changed, 25 insertions(+), 12 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0e0e3b76f5af48e4f6787…

1 0

Henri Verbeet : ddraw: Avoid LPD3DDRAWPRIMITIVESTRIDEDDATA.
by Alexandre Julliard Jan. 21, 2013

Jan. 21, 2013

Module: wine Branch: master Commit: ec1511ea0cdf7895483b1c0a828b9d2ff0213abe URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec1511ea0cdf7895483b1c0a8… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jan 21 09:08:34 2013 +0100 ddraw: Avoid LPD3DDRAWPRIMITIVESTRIDEDDATA. --- include/d3d.h | 14 ++++++++++---- 1 files changed, 10 insertions(+), 4 deletions(-) diff --git a/include/d3d.h b/include/d3d.h index 6158045..22dafa8 100644 --- a/include/d3d.h +++ b/include/d3d.h @@ -1177,8 +1177,11 @@ DECLARE_INTERFACE_(IDirect3DDevice3,IUnknown) STDMETHOD(DrawIndexedPrimitive)(THIS_ D3DPRIMITIVETYPE d3dptPrimitiveType, DWORD d3dvtVertexType, LPVOID lpvVertices, DWORD dwVertexCount, LPWORD dwIndices, DWORD dwIndexCount, DWORD dwFlags) PURE; STDMETHOD(SetClipStatus)(THIS_ D3DCLIPSTATUS *clip_status) PURE; STDMETHOD(GetClipStatus)(THIS_ D3DCLIPSTATUS *clip_status) PURE; - STDMETHOD(DrawPrimitiveStrided)(THIS_ D3DPRIMITIVETYPE d3dptPrimitiveType,DWORD dwVertexType,LPD3DDRAWPRIMITIVESTRIDEDDATA lpD3DDrawPrimStrideData,DWORD dwVertexCount,DWORD dwFlags) PURE; - STDMETHOD(DrawIndexedPrimitiveStrided)(THIS_ D3DPRIMITIVETYPE d3dptPrimitiveType,DWORD dwVertexType,LPD3DDRAWPRIMITIVESTRIDEDDATA lpD3DDrawPrimStrideData,DWORD dwVertexCount,LPWORD lpIndex,DWORD dwIndexCount,DWORD dwFlags) PURE; + STDMETHOD(DrawPrimitiveStrided)(THIS_ D3DPRIMITIVETYPE primitive_type, DWORD fvf, + D3DDRAWPRIMITIVESTRIDEDDATA *strided_data, DWORD vertex_count, DWORD flags) PURE; + STDMETHOD(DrawIndexedPrimitiveStrided)(THIS_ D3DPRIMITIVETYPE primitive_type, DWORD fvf, + D3DDRAWPRIMITIVESTRIDEDDATA *strided_data, DWORD vertex_count, WORD *indices, DWORD index_count, + DWORD flags) PURE; STDMETHOD(DrawPrimitiveVB)(THIS_ D3DPRIMITIVETYPE primitive_type, struct IDirect3DVertexBuffer *vb, DWORD start_vertex, DWORD vertex_count, DWORD flags) PURE; STDMETHOD(DrawIndexedPrimitiveVB)(THIS_ D3DPRIMITIVETYPE primitive_type, struct IDirect3DVertexBuffer *vb, @@ -1322,8 +1325,11 @@ DECLARE_INTERFACE_(IDirect3DDevice7,IUnknown) STDMETHOD(DrawIndexedPrimitive)(THIS_ D3DPRIMITIVETYPE d3dptPrimitiveType, DWORD d3dvtVertexType, LPVOID lpvVertices, DWORD dwVertexCount, LPWORD dwIndices, DWORD dwIndexCount, DWORD dwFlags) PURE; STDMETHOD(SetClipStatus)(THIS_ D3DCLIPSTATUS *clip_status) PURE; STDMETHOD(GetClipStatus)(THIS_ D3DCLIPSTATUS *clip_status) PURE; - STDMETHOD(DrawPrimitiveStrided)(THIS_ D3DPRIMITIVETYPE d3dptPrimitiveType,DWORD dwVertexType,LPD3DDRAWPRIMITIVESTRIDEDDATA lpD3DDrawPrimStrideData,DWORD dwVertexCount,DWORD dwFlags) PURE; - STDMETHOD(DrawIndexedPrimitiveStrided)(THIS_ D3DPRIMITIVETYPE d3dptPrimitiveType,DWORD dwVertexType,LPD3DDRAWPRIMITIVESTRIDEDDATA lpD3DDrawPrimStrideData,DWORD dwVertexCount,LPWORD lpIndex,DWORD dwIndexCount,DWORD dwFlags) PURE; + STDMETHOD(DrawPrimitiveStrided)(THIS_ D3DPRIMITIVETYPE primitive_type, DWORD fvf, + D3DDRAWPRIMITIVESTRIDEDDATA *strided_data, DWORD vertex_count, DWORD flags) PURE; + STDMETHOD(DrawIndexedPrimitiveStrided)(THIS_ D3DPRIMITIVETYPE primitive_type, DWORD fvf, + D3DDRAWPRIMITIVESTRIDEDDATA *strided_data, DWORD vertex_count, WORD *indices, DWORD index_count, + DWORD flags) PURE; STDMETHOD(DrawPrimitiveVB)(THIS_ D3DPRIMITIVETYPE primitive_type, struct IDirect3DVertexBuffer7 *vb, DWORD start_vertex, DWORD vertex_count, DWORD flags) PURE; STDMETHOD(DrawIndexedPrimitiveVB)(THIS_ D3DPRIMITIVETYPE primitive_type, struct IDirect3DVertexBuffer7 *vb,

1 0

Ken Thomases : winemac: Associate an event queue with each thread that creates windows and with each window .
by Alexandre Julliard Jan. 21, 2013

Jan. 21, 2013

Module: wine Branch: master Commit: 207c4d193f88b62bd951da8123a523130c49fe95 URL: http://source.winehq.org/git/wine.git/?a=commit;h=207c4d193f88b62bd951da812… Author: Ken Thomases <ken(a)codeweavers.com> Date: Mon Jan 21 00:07:58 2013 -0600 winemac: Associate an event queue with each thread that creates windows and with each window. --- dlls/winemac.drv/cocoa_window.h | 5 ++ dlls/winemac.drv/cocoa_window.m | 14 ++++- dlls/winemac.drv/macdrv.h | 15 +++++ dlls/winemac.drv/macdrv_cocoa.h | 3 +- dlls/winemac.drv/macdrv_main.c | 111 ++++++++++++++++++++++++++++++++++---- dlls/winemac.drv/window.c | 6 ++- 6 files changed, 137 insertions(+), 17 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=207c4d193f88b62bd951d…

1 0

Henri Verbeet : ddraw: Avoid LPD3DVERTEXBUFFERDESC.
by Alexandre Julliard Jan. 21, 2013

Jan. 21, 2013

Module: wine Branch: master Commit: 0b135993988534270b443f2975ba5d9654d00f62 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0b135993988534270b443f297… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jan 21 09:08:33 2013 +0100 ddraw: Avoid LPD3DVERTEXBUFFERDESC. --- include/d3d.h | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/d3d.h b/include/d3d.h index 692220a..6158045 100644 --- a/include/d3d.h +++ b/include/d3d.h @@ -1473,7 +1473,7 @@ DECLARE_INTERFACE_(IDirect3DVertexBuffer,IUnknown) STDMETHOD(ProcessVertices)(THIS_ DWORD vertex_op, DWORD dst_idx, DWORD count, IDirect3DVertexBuffer *src_buffer, DWORD src_idx, IDirect3DDevice3 *device, DWORD flags) PURE; - STDMETHOD(GetVertexBufferDesc)(THIS_ LPD3DVERTEXBUFFERDESC lpD3DVertexBufferDesc) PURE; + STDMETHOD(GetVertexBufferDesc)(THIS_ D3DVERTEXBUFFERDESC *desc) PURE; STDMETHOD(Optimize)(THIS_ IDirect3DDevice3 *device, DWORD flags) PURE; }; #undef INTERFACE @@ -1518,7 +1518,7 @@ DECLARE_INTERFACE_(IDirect3DVertexBuffer7,IUnknown) STDMETHOD(ProcessVertices)(THIS_ DWORD vertex_op, DWORD dst_idx, DWORD count, IDirect3DVertexBuffer7 *src_buffer, DWORD src_idx, IDirect3DDevice7 *device, DWORD flags) PURE; - STDMETHOD(GetVertexBufferDesc)(THIS_ LPD3DVERTEXBUFFERDESC lpD3DVertexBufferDesc) PURE; + STDMETHOD(GetVertexBufferDesc)(THIS_ D3DVERTEXBUFFERDESC *desc) PURE; STDMETHOD(Optimize)(THIS_ IDirect3DDevice7 *device, DWORD flags) PURE; STDMETHOD(ProcessVerticesStrided)(THIS_ DWORD vertex_op, DWORD dst_idx, DWORD count, D3DDRAWPRIMITIVESTRIDEDDATA *data, DWORD fvf, IDirect3DDevice7 *device, DWORD flags) PURE;

1 0

Christian Costa : d3dx9_36: Fill children info into ID3DXFileData object.
by Alexandre Julliard Jan. 21, 2013

Jan. 21, 2013

Module: wine Branch: master Commit: 5880ff01be8bdae02e8584a5e7744ef1e191f202 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5880ff01be8bdae02e8584a5e… Author: Christian Costa <titan.costa(a)gmail.com> Date: Mon Jan 21 08:41:02 2013 +0100 d3dx9_36: Fill children info into ID3DXFileData object. --- dlls/d3dx9_36/xfile.c | 67 +++++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 62 insertions(+), 5 deletions(-) diff --git a/dlls/d3dx9_36/xfile.c b/dlls/d3dx9_36/xfile.c index afc0def..8020467 100644 --- a/dlls/d3dx9_36/xfile.c +++ b/dlls/d3dx9_36/xfile.c @@ -60,7 +60,10 @@ typedef struct { typedef struct { ID3DXFileData ID3DXFileData_iface; LONG ref; + BOOL reference; IDirectXFileData *dxfile_data; + ULONG nb_children; + ID3DXFileData **children; } ID3DXFileDataImpl; @@ -117,6 +120,11 @@ static ULONG WINAPI ID3DXFileDataImpl_Release(ID3DXFileData *iface) if (!ref) { + ULONG i; + + for (i = 0; i < This->nb_children; i++) + (This->children[i])->lpVtbl->Release(This->children[i]); + HeapFree(GetProcessHeap(), 0, This->children); IDirectXFileData_Release(This->dxfile_data); HeapFree(GetProcessHeap(), 0, This); } @@ -266,21 +274,70 @@ static const ID3DXFileDataVtbl ID3DXFileData_Vtbl = }; -static HRESULT ID3DXFileDataImpl_Create(IDirectXFileData *dxfile_data, ID3DXFileData **ret_iface) +static HRESULT ID3DXFileDataImpl_Create(IDirectXFileObject *dxfile_object, ID3DXFileData **ret_iface) { ID3DXFileDataImpl *object; + IDirectXFileObject *data_object; + HRESULT ret; - TRACE("(%p, %p)\n", dxfile_data, ret_iface); + TRACE("(%p, %p)\n", dxfile_object, ret_iface); *ret_iface = NULL; - object = HeapAlloc(GetProcessHeap(), 0, sizeof(*object)); + object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); if (!object) return E_OUTOFMEMORY; object->ID3DXFileData_iface.lpVtbl = &ID3DXFileData_Vtbl; object->ref = 1; - object->dxfile_data = dxfile_data; + + ret = IDirectXFileObject_QueryInterface(dxfile_object, &IID_IDirectXFileData, (void **)&object->dxfile_data); + if (FAILED(ret)) + { + IDirectXFileDataReference *reference; + + ret = IDirectXFileObject_QueryInterface(dxfile_object, &IID_IDirectXFileDataReference, (void **)&reference); + if (SUCCEEDED(ret)) + { + ret = IDirectXFileDataReference_Resolve(reference, &object->dxfile_data); + if (FAILED(ret)) + { + HeapFree(GetProcessHeap(), 0, object); + return E_FAIL; + } + } + else + { + FIXME("Don't known what to do with binary object\n"); + HeapFree(GetProcessHeap(), 0, object); + return E_FAIL; + } + } + + while (SUCCEEDED(ret = IDirectXFileData_GetNextObject(object->dxfile_data, &data_object))) + { + if (object->children) + object->children = HeapReAlloc(GetProcessHeap(), 0, object->children, sizeof(ID3DXFileData*) * (object->nb_children + 1)); + else + object->children = HeapAlloc(GetProcessHeap(), 0, sizeof(ID3DXFileData*)); + if (!object->children) + { + ret = E_OUTOFMEMORY; + break; + } + ret = ID3DXFileDataImpl_Create(data_object, &object->children[object->nb_children]); + if (ret != S_OK) + break; + object->nb_children++; + } + + if (ret != DXFILEERR_NOMOREOBJECTS) + { + (&object->ID3DXFileData_iface)->lpVtbl->Release(&object->ID3DXFileData_iface); + return ret; + } + + TRACE("Found %u children\n", object->nb_children); *ret_iface = &object->ID3DXFileData_iface; @@ -534,7 +591,7 @@ static HRESULT WINAPI ID3DXFileImpl_CreateEnumObject(ID3DXFile *iface, const voi ret = E_OUTOFMEMORY; break; } - ret = ID3DXFileDataImpl_Create(data_object, &object->children[object->nb_children]); + ret = ID3DXFileDataImpl_Create((IDirectXFileObject*)data_object, &object->children[object->nb_children]); if (ret != S_OK) break; object->nb_children++;

1 0