January 2012 - Wine-Commits

Francois Gouget : crypt32: Remove some strings that don' t need to be translated from the resources.
by Alexandre Julliard Jan. 18, 2012

Jan. 18, 2012

Module: wine Branch: master Commit: 069f9f8e604fbbd1f5e80b7024018e4ecf731347 URL: http://source.winehq.org/git/wine.git/?a=commit;h=069f9f8e604fbbd1f5e80b702… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Jan 17 22:54:03 2012 +0100 crypt32: Remove some strings that don't need to be translated from the resources. --- dlls/crypt32/crypt32.rc | 3 - dlls/crypt32/cryptres.h | 3 - dlls/crypt32/oid.c | 9 +- po/ar.po | 334 +++++++++++++++++++++++------------------------ po/bg.po | 334 +++++++++++++++++++++++------------------------ po/ca.po | 334 +++++++++++++++++++++++------------------------ po/cs.po | 334 +++++++++++++++++++++++------------------------ po/da.po | 334 +++++++++++++++++++++++------------------------ po/de.po | 334 +++++++++++++++++++++++------------------------ po/el.po | 334 +++++++++++++++++++++++------------------------ po/en.po | 334 +++++++++++++++++++++++------------------------ po/en_US.po | 334 +++++++++++++++++++++++------------------------ po/eo.po | 334 +++++++++++++++++++++++------------------------ po/es.po | 334 +++++++++++++++++++++++------------------------ po/fa.po | 334 +++++++++++++++++++++++------------------------ po/fi.po | 334 +++++++++++++++++++++++------------------------ po/fr.po | 334 +++++++++++++++++++++++------------------------ po/he.po | 334 +++++++++++++++++++++++------------------------ po/hi.po | 334 +++++++++++++++++++++++------------------------ po/hu.po | 334 +++++++++++++++++++++++------------------------ po/it.po | 334 +++++++++++++++++++++++------------------------ po/ja.po | 334 +++++++++++++++++++++++------------------------ po/ko.po | 334 +++++++++++++++++++++++------------------------ po/lt.po | 334 +++++++++++++++++++++++------------------------ po/ml.po | 334 +++++++++++++++++++++++------------------------ po/nb_NO.po | 334 +++++++++++++++++++++++------------------------ po/nl.po | 334 +++++++++++++++++++++++------------------------ po/or.po | 334 +++++++++++++++++++++++------------------------ po/pa.po | 334 +++++++++++++++++++++++------------------------ po/pl.po | 334 +++++++++++++++++++++++------------------------ po/pt_BR.po | 334 +++++++++++++++++++++++------------------------ po/pt_PT.po | 334 +++++++++++++++++++++++------------------------ po/rm.po | 334 +++++++++++++++++++++++------------------------ po/ro.po | 334 +++++++++++++++++++++++------------------------ po/ru.po | 334 +++++++++++++++++++++++------------------------ po/sk.po | 334 +++++++++++++++++++++++------------------------ po/sl.po | 334 +++++++++++++++++++++++------------------------ po/sr_RS(a)cyrillic.po | 334 +++++++++++++++++++++++------------------------ po/sr_RS(a)latin.po | 334 +++++++++++++++++++++++------------------------ po/sv.po | 334 +++++++++++++++++++++++------------------------ po/te.po | 334 +++++++++++++++++++++++------------------------ po/th.po | 334 +++++++++++++++++++++++------------------------ po/tr.po | 334 +++++++++++++++++++++++------------------------ po/uk.po | 334 +++++++++++++++++++++++------------------------ po/wa.po | 334 +++++++++++++++++++++++------------------------ po/wine.pot | 334 +++++++++++++++++++++++------------------------ po/zh_CN.po | 334 +++++++++++++++++++++++------------------------ po/zh_TW.po | 334 +++++++++++++++++++++++------------------------ 48 files changed, 7251 insertions(+), 7794 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=069f9f8e604fbbd1f5e80…

1 0

Ričardas Barkauskas : ws2_32/tests: Test AcceptEx behaviour more.
by Alexandre Julliard Jan. 18, 2012

Jan. 18, 2012

Module: wine Branch: master Commit: 01195b2dd7509505d418208a58860fe662d51505 URL: http://source.winehq.org/git/wine.git/?a=commit;h=01195b2dd7509505d418208a5… Author: Ričardas Barkauskas <rbarkauskas(a)codeweavers.com> Date: Wed Jan 18 16:15:00 2012 +0200 ws2_32/tests: Test AcceptEx behaviour more. --- dlls/ws2_32/tests/sock.c | 292 +++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 291 insertions(+), 1 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=01195b2dd7509505d4182…

1 0

André Hentschel : d3drm: Add IDirect3DRMViewport2 interface.
by Alexandre Julliard Jan. 18, 2012

Jan. 18, 2012

Module: wine Branch: master Commit: 3935124d4443d615e25e9c51336c0b35d73af0ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=3935124d4443d615e25e9c513… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Jan 17 23:00:50 2012 +0100 d3drm: Add IDirect3DRMViewport2 interface. --- dlls/d3drm/d3drm.c | 10 +- dlls/d3drm/d3drm_private.h | 2 +- dlls/d3drm/viewport.c | 482 +++++++++++++++++++++++++++++++++++++++++++- 3 files changed, 481 insertions(+), 13 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3935124d4443d615e25e9…

1 0

Nikolay Sivov : msxml3: Implemented IXMLHttpRequest::get_statusText().
by Alexandre Julliard Jan. 18, 2012

Jan. 18, 2012

Module: wine Branch: master Commit: 95d8f6fc2c879947e68ea14e76d69822403c56b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=95d8f6fc2c879947e68ea14e7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jan 18 03:04:22 2012 +0300 msxml3: Implemented IXMLHttpRequest::get_statusText(). --- dlls/msxml3/httprequest.c | 32 +++++++++++++++++++++++++++----- dlls/msxml3/tests/domdoc.c | 11 +++++++++++ 2 files changed, 38 insertions(+), 5 deletions(-) diff --git a/dlls/msxml3/httprequest.c b/dlls/msxml3/httprequest.c index f2e8b5e..99b7672 100644 --- a/dlls/msxml3/httprequest.c +++ b/dlls/msxml3/httprequest.c @@ -98,6 +98,7 @@ typedef struct /* bind callback */ BindStatusCallback *bsc; LONG status; + BSTR status_text; /* IObjectWithSite*/ IUnknown *site; @@ -517,8 +518,10 @@ static HRESULT WINAPI BSCHttpNegotiate_OnResponse(IHttpNegotiate *iface, DWORD c debugstr_w(req_headers), add_reqheaders); This->request->status = code; - /* store headers */ + /* store headers and status text */ free_response_headers(This->request); + SysFreeString(This->request->status_text); + This->request->status_text = NULL; if (resp_headers) { const WCHAR *ptr, *line; @@ -530,7 +533,19 @@ static HRESULT WINAPI BSCHttpNegotiate_OnResponse(IHttpNegotiate *iface, DWORD c { if (*ptr == '\r' && *(ptr+1) == '\n') { - line = ++ptr+1; + const WCHAR *end = ptr-1; + line = ptr + 2; + /* scan back to get status phrase */ + while (ptr > resp_headers) + { + if (*ptr == ' ') + { + This->request->status_text = SysAllocStringLen(ptr+1, end-ptr); + TRACE("status text %s\n", debugstr_w(This->request->status_text)); + break; + } + ptr--; + } break; } ptr++; @@ -789,6 +804,7 @@ static ULONG WINAPI httprequest_Release(IXMLHTTPRequest *iface) } /* response headers */ free_response_headers(This); + SysFreeString(This->status_text); /* detach callback object */ BindStatusCallback_Detach(This->bsc); @@ -1093,13 +1109,18 @@ static HRESULT WINAPI httprequest_get_status(IXMLHTTPRequest *iface, LONG *statu return S_OK; } -static HRESULT WINAPI httprequest_get_statusText(IXMLHTTPRequest *iface, BSTR *pbstrStatus) +static HRESULT WINAPI httprequest_get_statusText(IXMLHTTPRequest *iface, BSTR *status) { httprequest *This = impl_from_IXMLHTTPRequest( iface ); - FIXME("stub %p %p\n", This, pbstrStatus); + TRACE("(%p)->(%p)\n", This, status); - return E_NOTIMPL; + if (!status) return E_INVALIDARG; + if (This->state != READYSTATE_COMPLETE) return E_FAIL; + + *status = SysAllocString(This->status_text); + + return S_OK; } static HRESULT WINAPI httprequest_get_responseXML(IXMLHTTPRequest *iface, IDispatch **body) @@ -1475,6 +1496,7 @@ HRESULT XMLHTTPRequest_create(IUnknown *pUnkOuter, void **ppObj) req->bsc = NULL; req->status = 0; + req->status_text = NULL; req->reqheader_size = 0; req->raw_respheaders = NULL; req->use_utf8_content = FALSE; diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 0041763..21809f8 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -4744,6 +4744,9 @@ static void test_XMLHTTP(void) ok(hr == E_FAIL || broken(hr == E_UNEXPECTED) /* win2k */, "got 0x%08x\n", hr); ok(status == 0xdeadbeef, "got %d\n", status); + hr = IXMLHttpRequest_get_statusText(xhr, &str); + ok(hr == E_FAIL, "got 0x%08x\n", hr); + /* invalid parameters */ hr = IXMLHttpRequest_open(xhr, NULL, NULL, async, dummy, dummy); EXPECT_HR(hr, E_INVALIDARG); @@ -4862,6 +4865,14 @@ static void test_XMLHTTP(void) EXPECT_HR(hr, S_OK); ok(status == 200, "got %d\n", status); + hr = IXMLHttpRequest_get_statusText(xhr, NULL); + EXPECT_HR(hr, E_INVALIDARG); + + hr = IXMLHttpRequest_get_statusText(xhr, &str); + EXPECT_HR(hr, S_OK); + ok(!lstrcmpW(str, _bstr_("OK")), "got status %s\n", wine_dbgstr_w(str)); + SysFreeString(str); + /* another ::send() after completed request */ V_VT(&varbody) = VT_BSTR; V_BSTR(&varbody) = _bstr_(bodyA);

1 0

Hans Leidekker : msi: Make sure target paths are normalized.
by Alexandre Julliard Jan. 18, 2012

Jan. 18, 2012

Module: wine Branch: master Commit: 9336c10619075d26dc8e6da5b0fb50bcfcd77bce URL: http://source.winehq.org/git/wine.git/?a=commit;h=9336c10619075d26dc8e6da5b… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jan 18 12:58:15 2012 +0100 msi: Make sure target paths are normalized. Fix for the Lotus Notes 6.5.1 installer. --- dlls/msi/action.c | 47 +++++++++++++++++++-------------------------- dlls/msi/install.c | 17 ++------------- dlls/msi/msipriv.h | 2 +- dlls/msi/tests/package.c | 16 +++++++++++++++ 4 files changed, 40 insertions(+), 42 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 5444dfc..baebdc2 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -2214,11 +2214,15 @@ static UINT calculate_file_cost( MSIPACKAGE *package ) return ERROR_SUCCESS; } -void msi_clean_path( WCHAR *p ) +WCHAR *msi_normalize_path( const WCHAR *in ) { - WCHAR *q = p; - int n, len = 0; + const WCHAR *p = in; + WCHAR *q, *ret; + int n, len = strlenW( in ) + 2; + if (!(q = ret = msi_alloc( len * sizeof(WCHAR) ))) return NULL; + + len = 0; while (1) { /* copy until the end of the string or a space */ @@ -2245,32 +2249,20 @@ void msi_clean_path( WCHAR *p ) else /* copy n spaces */ while (n && (*q++ = *p++)) n--; } -} - -static WCHAR *get_target_dir_property( MSIDATABASE *db ) -{ - int len; - WCHAR *path, *target_dir = msi_dup_property( db, szTargetDir ); - - if (!target_dir) return NULL; - - len = strlenW( target_dir ); - if (target_dir[len - 1] == '\\') return target_dir; - if ((path = msi_alloc( (len + 2) * sizeof(WCHAR) ))) + while (q - ret > 0 && q[-1] == ' ') q--; + if (q - ret > 0 && q[-1] != '\\') { - strcpyW( path, target_dir ); - path[len] = '\\'; - path[len + 1] = 0; + q[0] = '\\'; + q[1] = 0; } - msi_free( target_dir ); - return path; + return ret; } void msi_resolve_target_folder( MSIPACKAGE *package, const WCHAR *name, BOOL load_prop ) { FolderList *fl; MSIFOLDER *folder, *parent, *child; - WCHAR *path; + WCHAR *path, *normalized_path; TRACE("resolving %s\n", debugstr_w(name)); @@ -2278,7 +2270,7 @@ void msi_resolve_target_folder( MSIPACKAGE *package, const WCHAR *name, BOOL loa if (!strcmpW( folder->Directory, szTargetDir )) /* special resolving for target root dir */ { - if (!load_prop || !(path = get_target_dir_property( package->db ))) + if (!load_prop || !(path = msi_dup_property( package->db, szTargetDir ))) { path = msi_dup_property( package->db, szRootDrive ); } @@ -2293,16 +2285,17 @@ void msi_resolve_target_folder( MSIPACKAGE *package, const WCHAR *name, BOOL loa else path = msi_build_directory_name( 2, folder->TargetDefault, NULL ); } - msi_clean_path( path ); - if (folder->ResolvedTarget && !strcmpiW( path, folder->ResolvedTarget )) + normalized_path = msi_normalize_path( path ); + msi_free( path ); + if (folder->ResolvedTarget && !strcmpiW( normalized_path, folder->ResolvedTarget )) { TRACE("%s already resolved to %s\n", debugstr_w(name), debugstr_w(folder->ResolvedTarget)); - msi_free( path ); + msi_free( normalized_path ); return; } - msi_set_property( package->db, folder->Directory, path ); + msi_set_property( package->db, folder->Directory, normalized_path ); msi_free( folder->ResolvedTarget ); - folder->ResolvedTarget = path; + folder->ResolvedTarget = normalized_path; LIST_FOR_EACH_ENTRY( fl, &folder->children, FolderList, entry ) { diff --git a/dlls/msi/install.c b/dlls/msi/install.c index 2428ef5..83b8b7d 100644 --- a/dlls/msi/install.c +++ b/dlls/msi/install.c @@ -553,8 +553,7 @@ static void set_target_path( MSIPACKAGE *package, MSIFOLDER *folder, const WCHAR MSIFOLDER *child; WCHAR *target_path; - if (!(target_path = strdupW( path ))) return; - msi_clean_path( target_path ); + if (!(target_path = msi_normalize_path( path ))) return; if (strcmpW( target_path, folder->ResolvedTarget )) { msi_free( folder->ResolvedTarget ); @@ -572,7 +571,7 @@ static void set_target_path( MSIPACKAGE *package, MSIFOLDER *folder, const WCHAR UINT MSI_SetTargetPathW( MSIPACKAGE *package, LPCWSTR szFolder, LPCWSTR szFolderPath ) { - DWORD attrib, len; + DWORD attrib; MSIFOLDER *folder; MSIFILE *file; @@ -587,17 +586,7 @@ UINT MSI_SetTargetPathW( MSIPACKAGE *package, LPCWSTR szFolder, LPCWSTR szFolder } if (!(folder = msi_get_loaded_folder( package, szFolder ))) return ERROR_DIRECTORY; - len = strlenW( szFolderPath ); - if (len && szFolderPath[len - 1] != '\\') - { - WCHAR *path = msi_alloc( (len + 2) * sizeof(WCHAR) ); - memcpy( path, szFolderPath, len * sizeof(WCHAR) ); - path[len] = '\\'; - path[len + 1] = 0; - set_target_path( package, folder, path ); - msi_free( path ); - } - else set_target_path( package, folder, szFolderPath ); + set_target_path( package, folder, szFolderPath ); LIST_FOR_EACH_ENTRY( file, &package->files, MSIFILE, entry ) { diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index 589e4a1..2c9385a 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -998,7 +998,7 @@ extern UINT msi_get_property( MSIDATABASE *, LPCWSTR, LPWSTR, LPDWORD ) DECLSPEC extern int msi_get_property_int( MSIDATABASE *package, LPCWSTR prop, int def ) DECLSPEC_HIDDEN; extern WCHAR *msi_resolve_source_folder(MSIPACKAGE *package, const WCHAR *name, MSIFOLDER **folder) DECLSPEC_HIDDEN; extern void msi_resolve_target_folder(MSIPACKAGE *package, const WCHAR *name, BOOL load_prop) DECLSPEC_HIDDEN; -extern void msi_clean_path( WCHAR *p ) DECLSPEC_HIDDEN; +extern WCHAR *msi_normalize_path(const WCHAR *) DECLSPEC_HIDDEN; extern WCHAR *msi_resolve_file_source(MSIPACKAGE *package, MSIFILE *file) DECLSPEC_HIDDEN; extern const WCHAR *msi_get_target_folder(MSIPACKAGE *package, const WCHAR *name) DECLSPEC_HIDDEN; extern void msi_reset_folders( MSIPACKAGE *package, BOOL source ) DECLSPEC_HIDDEN; diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index 34d5eff..9808dfa 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -1134,6 +1134,7 @@ static void test_settargetpath(void) r = MsiSetTargetPath( hpkg, "TARGETDIR", tempdir ); ok( r == ERROR_SUCCESS, "MsiSetTargetPath on subsubdir returned %d\n", r ); + buffer[0] = 0; sz = sizeof buffer - 1; lstrcat( tempdir, "\\" ); r = MsiGetTargetPath( hpkg, "TARGETDIR", buffer, &sz ); @@ -1144,6 +1145,7 @@ static void test_settargetpath(void) query_file_path( hpkg, "[#RootFile]", buffer ); ok( !lstrcmp(buffer, file), "Expected %s, got %s\n", file, buffer); + buffer[0] = 0; sz = sizeof(buffer); r = MsiGetPropertyA( hpkg, "TestParent", buffer, &sz ); ok( r == ERROR_SUCCESS, "MsiGetProperty returned %u\n", r ); @@ -1153,16 +1155,19 @@ static void test_settargetpath(void) r = MsiSetTargetPath( hpkg, "TestParent", "C:\\one\\two" ); ok( r == ERROR_SUCCESS, "MsiSetTargetPath returned %d\n", r ); + buffer[0] = 0; sz = sizeof(buffer); r = MsiGetPropertyA( hpkg, "TestParent", buffer, &sz ); ok( r == ERROR_SUCCESS, "MsiGetProperty returned %u\n", r ); ok( lstrcmpi(buffer, "C:\\one\\two\\TestDir\\"), "Expected \"C:\\one\\two\\TestDir\\\", got \"%s\"\n", buffer ); + buffer[0] = 0; query_file_path( hpkg, "[#TestFile]", buffer ); ok( !lstrcmpi(buffer, "C:\\one\\two\\TestDir\\testfile.txt"), "Expected C:\\one\\two\\TestDir\\testfile.txt, got %s\n", buffer ); + buffer[0] = 0; sz = sizeof buffer - 1; r = MsiGetTargetPath( hpkg, "TestParent", buffer, &sz ); ok( r == ERROR_SUCCESS, "failed to get target path: %d\n", r); @@ -1171,6 +1176,7 @@ static void test_settargetpath(void) r = MsiSetTargetPath( hpkg, "TestParent", "C:\\one\\two\\three" ); ok( r == ERROR_SUCCESS, "MsiSetTargetPath returned %d\n", r ); + buffer[0] = 0; sz = sizeof buffer - 1; r = MsiGetTargetPath( hpkg, "TestParent", buffer, &sz ); ok( r == ERROR_SUCCESS, "failed to get target path: %d\n", r); @@ -1179,11 +1185,21 @@ static void test_settargetpath(void) r = MsiSetTargetPath( hpkg, "TestParent", "C:\\\\one\\\\two " ); ok( r == ERROR_SUCCESS, "MsiSetTargetPath returned %d\n", r ); + buffer[0] = 0; sz = sizeof buffer - 1; r = MsiGetTargetPath( hpkg, "TestParent", buffer, &sz ); ok( r == ERROR_SUCCESS, "failed to get target path: %d\n", r); ok( !lstrcmpi(buffer, "C:\\one\\two\\"), "Expected \"C:\\one\\two\\\", got %s\n", buffer); + r = MsiSetTargetPath( hpkg, "TestParent", "C:\\\\ Program Files \\\\ " ); + ok( r == ERROR_SUCCESS, "MsiSetTargetPath returned %d\n", r ); + + buffer[0] = 0; + sz = sizeof buffer - 1; + r = MsiGetTargetPath( hpkg, "TestParent", buffer, &sz ); + ok( r == ERROR_SUCCESS, "failed to get target path: %d\n", r); + ok( !lstrcmpi(buffer, "C:\\Program Files\\"), "Expected \"C:\\Program Files\\\", got %s\n", buffer); + MsiCloseHandle( hpkg ); }

1 0

Jacek Caban : jscript: Simplify identifier_eval function.
by Alexandre Julliard Jan. 18, 2012

Jan. 18, 2012

Module: wine Branch: master Commit: e5baa750344a255eeb457f8f535b31c3b620625e URL: http://source.winehq.org/git/wine.git/?a=commit;h=e5baa750344a255eeb457f8f5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jan 18 13:28:29 2012 +0100 jscript: Simplify identifier_eval function. --- dlls/jscript/engine.c | 29 +++++++++++++++-------------- 1 files changed, 15 insertions(+), 14 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index b1b7c69..11b434f 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -488,7 +488,7 @@ static BOOL lookup_global_members(script_ctx_t *ctx, BSTR identifier, exprval_t } /* ECMA-262 3rd Edition 10.1.4 */ -static HRESULT identifier_eval(script_ctx_t *ctx, BSTR identifier, DWORD flags, jsexcept_t *ei, exprval_t *ret) +static HRESULT identifier_eval(script_ctx_t *ctx, BSTR identifier, exprval_t *ret) { scope_chain_t *scope; named_item_t *item; @@ -545,15 +545,6 @@ static HRESULT identifier_eval(script_ctx_t *ctx, BSTR identifier, DWORD flags, if(lookup_global_members(ctx, identifier, ret)) return S_OK; - if(flags & fdexNameEnsure) { - hres = jsdisp_get_id(ctx->global, identifier, fdexNameEnsure, &id); - if(FAILED(hres)) - return hres; - - exprval_set_idref(ret, to_disp(ctx->global), id); - return S_OK; - } - ret->type = EXPRVAL_INVALID; return S_OK; } @@ -1083,7 +1074,7 @@ static HRESULT interp_ident(exec_ctx_t *ctx) TRACE("%s\n", debugstr_w(arg)); - hres = identifier_eval(ctx->parser->script, arg, 0, ctx->ei, &exprval); + hres = identifier_eval(ctx->parser->script, arg, &exprval); if(FAILED(hres)) return hres; @@ -1108,10 +1099,20 @@ static HRESULT interp_identid(exec_ctx_t *ctx) TRACE("%s %x\n", debugstr_w(arg), flags); - hres = identifier_eval(ctx->parser->script, arg, flags, ctx->ei, &exprval); + hres = identifier_eval(ctx->parser->script, arg, &exprval); if(FAILED(hres)) return hres; + if(exprval.type == EXPRVAL_INVALID && (flags & fdexNameEnsure)) { + DISPID id; + + hres = jsdisp_get_id(ctx->parser->script->global, arg, fdexNameEnsure, &id); + if(FAILED(hres)) + return hres; + + exprval_set_idref(&exprval, to_disp(ctx->parser->script->global), id); + } + if(exprval.type != EXPRVAL_IDREF) { WARN("invalid ref\n"); exprval_release(&exprval); @@ -1686,7 +1687,7 @@ static HRESULT interp_delete_ident(exec_ctx_t *ctx) TRACE("%s\n", debugstr_w(arg)); - hres = identifier_eval(ctx->parser->script, arg, 0, ctx->ei, &exprval); + hres = identifier_eval(ctx->parser->script, arg, &exprval); if(FAILED(hres)) return hres; @@ -1804,7 +1805,7 @@ static HRESULT interp_typeofident(exec_ctx_t *ctx) TRACE("%s\n", debugstr_w(arg)); - hres = identifier_eval(ctx->parser->script, arg, 0, ctx->ei, &exprval); + hres = identifier_eval(ctx->parser->script, arg, &exprval); if(FAILED(hres)) return hres;

1 0

Aric Stewart : amstream: Have the MediaStream Filter use strmbase.
by Alexandre Julliard Jan. 18, 2012

Jan. 18, 2012

Module: wine Branch: master Commit: 80c233b9ddf41872f604552a81bf156ef993b441 URL: http://source.winehq.org/git/wine.git/?a=commit;h=80c233b9ddf41872f604552a8… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Jan 18 07:49:45 2012 -0600 amstream: Have the MediaStream Filter use strmbase. --- dlls/amstream/Makefile.in | 2 +- dlls/amstream/mediastreamfilter.c | 81 ++++++++++++++++--------------------- 2 files changed, 36 insertions(+), 47 deletions(-) diff --git a/dlls/amstream/Makefile.in b/dlls/amstream/Makefile.in index 0418c05..3353a38 100644 --- a/dlls/amstream/Makefile.in +++ b/dlls/amstream/Makefile.in @@ -1,5 +1,5 @@ MODULE = amstream.dll -IMPORTS = strmiids uuid ole32 advapi32 +IMPORTS = strmiids strmbase uuid ole32 advapi32 C_SRCS = \ amstream.c \ diff --git a/dlls/amstream/mediastreamfilter.c b/dlls/amstream/mediastreamfilter.c index 0c72c77..d576b49 100644 --- a/dlls/amstream/mediastreamfilter.c +++ b/dlls/amstream/mediastreamfilter.c @@ -24,6 +24,9 @@ #include "winbase.h" #include "wingdi.h" +#include "dshow.h" + +#include "wine/strmbase.h" #include "amstream_private.h" #include "amstream.h" @@ -33,18 +36,13 @@ WINE_DEFAULT_DEBUG_CHANNEL(amstream); typedef struct { - IMediaStreamFilter IMediaStreamFilter_iface; - LONG ref; - CRITICAL_SECTION csFilter; - FILTER_STATE state; - REFERENCE_TIME rtStreamStart; - IReferenceClock * pClock; - FILTER_INFO filterInfo; + BaseFilter filter; + } IMediaStreamFilterImpl; static inline IMediaStreamFilterImpl *impl_from_IMediaStreamFilter(IMediaStreamFilter *iface) { - return CONTAINING_RECORD(iface, IMediaStreamFilterImpl, IMediaStreamFilter_iface); + return CONTAINING_RECORD(iface, IMediaStreamFilterImpl, filter); } /*** IUnknown methods ***/ @@ -80,18 +78,13 @@ static HRESULT WINAPI MediaStreamFilterImpl_QueryInterface(IMediaStreamFilter *i static ULONG WINAPI MediaStreamFilterImpl_AddRef(IMediaStreamFilter *iface) { - IMediaStreamFilterImpl *This = impl_from_IMediaStreamFilter(iface); - ULONG refCount = InterlockedIncrement(&This->ref); - - TRACE("(%p)->() AddRef from %d\n", iface, refCount - 1); - - return refCount; + return BaseFilterImpl_AddRef((IBaseFilter*)iface); } static ULONG WINAPI MediaStreamFilterImpl_Release(IMediaStreamFilter *iface) { IMediaStreamFilterImpl *This = impl_from_IMediaStreamFilter(iface); - ULONG refCount = InterlockedDecrement(&This->ref); + ULONG refCount = BaseFilterImpl_Release((IBaseFilter*)iface); TRACE("(%p)->() Release from %d\n", iface, refCount + 1); @@ -105,14 +98,10 @@ static ULONG WINAPI MediaStreamFilterImpl_Release(IMediaStreamFilter *iface) static HRESULT WINAPI MediaStreamFilterImpl_GetClassID(IMediaStreamFilter * iface, CLSID * pClsid) { - TRACE("(%p)->(%p)\n", iface, pClsid); - - *pClsid = CLSID_MediaStreamFilter; - - return S_OK; + return BaseFilterImpl_GetClassID((IBaseFilter*)iface, pClsid); } -/*** IMediaFilter methods ***/ +/*** IBaseFilter methods ***/ static HRESULT WINAPI MediaStreamFilterImpl_Stop(IMediaStreamFilter * iface) { @@ -137,32 +126,22 @@ static HRESULT WINAPI MediaStreamFilterImpl_Run(IMediaStreamFilter * iface, REFE static HRESULT WINAPI MediaStreamFilterImpl_GetState(IMediaStreamFilter * iface, DWORD dwMilliSecsTimeout, FILTER_STATE *pState) { - FIXME("(%p)->(%d,%p): Stub!\n", iface, dwMilliSecsTimeout, pState); - - return E_NOTIMPL; + return BaseFilterImpl_GetState((IBaseFilter*)iface, dwMilliSecsTimeout, pState); } static HRESULT WINAPI MediaStreamFilterImpl_SetSyncSource(IMediaStreamFilter * iface, IReferenceClock *pClock) { - TRACE("(%p)->(%p): Stub!\n", iface, pClock); - - return E_NOTIMPL; + return BaseFilterImpl_SetSyncSource((IBaseFilter*)iface, pClock); } static HRESULT WINAPI MediaStreamFilterImpl_GetSyncSource(IMediaStreamFilter * iface, IReferenceClock **ppClock) { - FIXME("(%p)->(%p): Stub!\n", iface, ppClock); - - return E_NOTIMPL; + return BaseFilterImpl_GetSyncSource((IBaseFilter*)iface, ppClock); } -/*** IBaseFilter methods ***/ - static HRESULT WINAPI MediaStreamFilterImpl_EnumPins(IMediaStreamFilter * iface, IEnumPins **ppEnum) { - FIXME("(%p)->(%p): Stub!\n", iface, ppEnum); - - return E_NOTIMPL; + return BaseFilterImpl_EnumPins((IBaseFilter*)iface, ppEnum); } static HRESULT WINAPI MediaStreamFilterImpl_FindPin(IMediaStreamFilter * iface, LPCWSTR Id, IPin **ppPin) @@ -174,23 +153,17 @@ static HRESULT WINAPI MediaStreamFilterImpl_FindPin(IMediaStreamFilter * iface, static HRESULT WINAPI MediaStreamFilterImpl_QueryFilterInfo(IMediaStreamFilter * iface, FILTER_INFO *pInfo) { - FIXME("(%p)->(%p): Stub!\n", iface, pInfo); - - return E_NOTIMPL; + return BaseFilterImpl_QueryFilterInfo((IBaseFilter*)iface, pInfo); } static HRESULT WINAPI MediaStreamFilterImpl_JoinFilterGraph(IMediaStreamFilter * iface, IFilterGraph *pGraph, LPCWSTR pName) { - FIXME("(%p)->(%p, %s): Stub!\n", iface, pGraph, debugstr_w(pName)); - - return E_NOTIMPL; + return BaseFilterImpl_JoinFilterGraph((IBaseFilter*)iface, pGraph, pName); } static HRESULT WINAPI MediaStreamFilterImpl_QueryVendorInfo(IMediaStreamFilter * iface, LPWSTR *pVendorInfo) { - FIXME("(%p)->(%p): Stub!\n", iface, pVendorInfo); - - return E_NOTIMPL; + return BaseFilterImpl_QueryVendorInfo((IBaseFilter*)iface, pVendorInfo); } /*** IMediaStreamFilter methods ***/ @@ -286,6 +259,23 @@ static const IMediaStreamFilterVtbl MediaStreamFilter_Vtbl = MediaStreamFilterImpl_EndOfStream }; +static IPin* WINAPI MediaStreamFilterImpl_GetPin(BaseFilter *iface, int pos) +{ + /* No pins */ + return NULL; +} + +static LONG WINAPI MediaStreamFilterImpl_GetPinCount(BaseFilter *iface) +{ + /* No pins */ + return 0; +} + +static const BaseFilterFuncTable BaseFuncTable = { + MediaStreamFilterImpl_GetPin, + MediaStreamFilterImpl_GetPinCount +}; + HRESULT MediaStreamFilter_create(IUnknown *pUnkOuter, void **ppObj) { IMediaStreamFilterImpl* object; @@ -302,8 +292,7 @@ HRESULT MediaStreamFilter_create(IUnknown *pUnkOuter, void **ppObj) return E_OUTOFMEMORY; } - object->IMediaStreamFilter_iface.lpVtbl = &MediaStreamFilter_Vtbl; - object->ref = 1; + BaseFilter_Init(&object->filter, (IBaseFilterVtbl*)&MediaStreamFilter_Vtbl, &CLSID_MediaStreamFilter, (DWORD_PTR)(__FILE__ ": MediaStreamFilterImpl.csFilter"), &BaseFuncTable); *ppObj = object;

1 0

Aric Stewart : wineqtdecoder: Add the framework for SourceSeeking to QTSplitter.
by Alexandre Julliard Jan. 18, 2012

Jan. 18, 2012

Module: wine Branch: master Commit: 8d25bfd524ca6b7896aa4623cb13ef05d0853a17 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d25bfd524ca6b7896aa4623c… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Jan 18 07:50:20 2012 -0600 wineqtdecoder: Add the framework for SourceSeeking to QTSplitter. --- dlls/wineqtdecoder/qtsplitter.c | 90 ++++++++++++++++++++++++++++++++++++++- 1 files changed, 88 insertions(+), 2 deletions(-) diff --git a/dlls/wineqtdecoder/qtsplitter.c b/dlls/wineqtdecoder/qtsplitter.c index c206b23..aab9fc1 100644 --- a/dlls/wineqtdecoder/qtsplitter.c +++ b/dlls/wineqtdecoder/qtsplitter.c @@ -165,15 +165,26 @@ typedef struct QTSplitter { FILTER_STATE state; CRITICAL_SECTION csReceive; + SourceSeeking sourceSeeking; } QTSplitter; static const IPinVtbl QT_OutputPin_Vtbl; static const IPinVtbl QT_InputPin_Vtbl; static const IBaseFilterVtbl QT_Vtbl; +static const IMediaSeekingVtbl QT_Seeking_Vtbl; static HRESULT QT_AddPin(QTSplitter *This, const PIN_INFO *piOutput, const AM_MEDIA_TYPE *amt, BOOL video); static HRESULT QT_RemoveOutputPins(QTSplitter *This); +static HRESULT WINAPI QTSplitter_ChangeStart(IMediaSeeking *iface); +static HRESULT WINAPI QTSplitter_ChangeStop(IMediaSeeking *iface); +static HRESULT WINAPI QTSplitter_ChangeRate(IMediaSeeking *iface); + +static inline QTSplitter *impl_from_IMediaSeeking( IMediaSeeking *iface ) +{ + return (QTSplitter *)((char*)iface - FIELD_OFFSET(QTSplitter, sourceSeeking.lpVtbl)); +} + /* * Base Filter */ @@ -256,6 +267,9 @@ IUnknown * CALLBACK QTSplitter_create(IUnknown *punkout, HRESULT *phr) This->pInputPin.pin.refCount = 1; This->pInputPin.pin.pConnectedTo = NULL; This->pInputPin.pin.pCritSec = &This->filter.csFilter; + + SourceSeeking_Init(&This->sourceSeeking, &QT_Seeking_Vtbl, QTSplitter_ChangeStop, QTSplitter_ChangeStart, QTSplitter_ChangeRate, &This->filter.csFilter); + *phr = S_OK; return obj; } @@ -315,6 +329,8 @@ static HRESULT WINAPI QT_QueryInterface(IBaseFilter *iface, REFIID riid, LPVOID *ppv = This; else if (IsEqualIID(riid, &IID_IBaseFilter)) *ppv = This; + else if (IsEqualIID(riid, &IID_IMediaSeeking)) + *ppv = &This->sourceSeeking; if (*ppv) { @@ -906,6 +922,8 @@ static HRESULT QT_Process_Movie(QTSplitter* filter) short id = 0; DWORD tid; HANDLE thread; + LONGLONG time; + TimeScale scale; TRACE("Trying movie connect\n"); @@ -944,6 +962,13 @@ static HRESULT QT_Process_Movie(QTSplitter* filter) if (trk) hr = QT_Process_Audio_Track(filter, trk); + time = GetMovieDuration(filter->pQTMovie); + scale = GetMovieTimeScale(filter->pQTMovie); + filter->sourceSeeking.llDuration = ((double)time / scale) * 10000000; + filter->sourceSeeking.llStop = filter->sourceSeeking.llDuration; + + TRACE("Movie duration is %s\n",wine_dbgstr_longlong(filter->sourceSeeking.llDuration)); + thread = CreateThread(NULL, 0, QTSplitter_thread, filter, 0, &tid); if (thread) { @@ -1126,9 +1151,7 @@ static HRESULT WINAPI QTInPin_QueryInterface(IPin * iface, REFIID riid, LPVOID * else if (IsEqualIID(riid, &IID_IPin)) *ppv = iface; else if (IsEqualIID(riid, &IID_IMediaSeeking)) - { return IBaseFilter_QueryInterface(This->pin.pinInfo.pFilter, &IID_IMediaSeeking, ppv); - } if (*ppv) { @@ -1338,3 +1361,66 @@ static HRESULT QT_AddPin(QTSplitter *This, const PIN_INFO *piOutput, const AM_ME ERR("Failed with error %x\n", hr); return hr; } + +static HRESULT WINAPI QTSplitter_ChangeStart(IMediaSeeking *iface) +{ + FIXME("(%p) filter hasn't implemented start position change!\n", iface); + return S_OK; +} + +static HRESULT WINAPI QTSplitter_ChangeStop(IMediaSeeking *iface) +{ + FIXME("(%p) filter hasn't implemented stop position change!\n", iface); + return S_OK; +} + +static HRESULT WINAPI QTSplitter_ChangeRate(IMediaSeeking *iface) +{ + FIXME("(%p) filter hasn't implemented rate change!\n", iface); + return S_OK; +} + +static HRESULT WINAPI QT_Seeking_QueryInterface(IMediaSeeking * iface, REFIID riid, LPVOID * ppv) +{ + QTSplitter *This = impl_from_IMediaSeeking(iface); + + return IUnknown_QueryInterface((IUnknown *)This, riid, ppv); +} + +static ULONG WINAPI QT_Seeking_AddRef(IMediaSeeking * iface) +{ + QTSplitter *This = impl_from_IMediaSeeking(iface); + + return IUnknown_AddRef((IUnknown *)This); +} + +static ULONG WINAPI QT_Seeking_Release(IMediaSeeking * iface) +{ + QTSplitter *This = impl_from_IMediaSeeking(iface); + + return IUnknown_Release((IUnknown *)This); +} + +static const IMediaSeekingVtbl QT_Seeking_Vtbl = +{ + QT_Seeking_QueryInterface, + QT_Seeking_AddRef, + QT_Seeking_Release, + SourceSeekingImpl_GetCapabilities, + SourceSeekingImpl_CheckCapabilities, + SourceSeekingImpl_IsFormatSupported, + SourceSeekingImpl_QueryPreferredFormat, + SourceSeekingImpl_GetTimeFormat, + SourceSeekingImpl_IsUsingTimeFormat, + SourceSeekingImpl_SetTimeFormat, + SourceSeekingImpl_GetDuration, + SourceSeekingImpl_GetStopPosition, + SourceSeekingImpl_GetCurrentPosition, + SourceSeekingImpl_ConvertTimeFormat, + SourceSeekingImpl_SetPositions, + SourceSeekingImpl_GetPositions, + SourceSeekingImpl_GetAvailable, + SourceSeekingImpl_SetRate, + SourceSeekingImpl_GetRate, + SourceSeekingImpl_GetPreroll +};

1 0

André Hentschel : d3drm: Reorder viewport creation function to avoid forward declarations.
by Alexandre Julliard Jan. 18, 2012

Jan. 18, 2012

Module: wine Branch: master Commit: c6bd4424465c8650638e36a26be3e2223245fddb URL: http://source.winehq.org/git/wine.git/?a=commit;h=c6bd4424465c8650638e36a26… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Jan 17 23:00:17 2012 +0100 d3drm: Reorder viewport creation function to avoid forward declarations. --- dlls/d3drm/viewport.c | 44 +++++++++++++++++++++----------------------- 1 files changed, 21 insertions(+), 23 deletions(-) diff --git a/dlls/d3drm/viewport.c b/dlls/d3drm/viewport.c index 4bfc5cc..2847069 100644 --- a/dlls/d3drm/viewport.c +++ b/dlls/d3drm/viewport.c @@ -37,34 +37,11 @@ typedef struct { LONG ref; } IDirect3DRMViewportImpl; -static const struct IDirect3DRMViewportVtbl Direct3DRMViewport_Vtbl; - static inline IDirect3DRMViewportImpl *impl_from_IDirect3DRMViewport(IDirect3DRMViewport *iface) { return CONTAINING_RECORD(iface, IDirect3DRMViewportImpl, IDirect3DRMViewport_iface); } -HRESULT Direct3DRMViewport_create(IUnknown** ppObj) -{ - IDirect3DRMViewportImpl* object; - - TRACE("(%p)\n", ppObj); - - object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirect3DRMViewportImpl)); - if (!object) - { - ERR("Out of memory\n"); - return E_OUTOFMEMORY; - } - - object->IDirect3DRMViewport_iface.lpVtbl = &Direct3DRMViewport_Vtbl; - object->ref = 1; - - *ppObj = (IUnknown*)object; - - return S_OK; -} - /*** IUnknown methods ***/ static HRESULT WINAPI IDirect3DRMViewportImpl_QueryInterface(IDirect3DRMViewport* iface, REFIID riid, void** object) @@ -506,3 +483,24 @@ static const struct IDirect3DRMViewportVtbl Direct3DRMViewport_Vtbl = IDirect3DRMViewportImpl_GetProjection, IDirect3DRMViewportImpl_GetDirect3DViewport }; + +HRESULT Direct3DRMViewport_create(IUnknown** ppObj) +{ + IDirect3DRMViewportImpl* object; + + TRACE("(%p)\n", ppObj); + + object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirect3DRMViewportImpl)); + if (!object) + { + ERR("Out of memory\n"); + return E_OUTOFMEMORY; + } + + object->IDirect3DRMViewport_iface.lpVtbl = &Direct3DRMViewport_Vtbl; + object->ref = 1; + + *ppObj = (IUnknown*)object; + + return S_OK; +}

1 0

Jacek Caban : mshtml: Return error in IInternetHostSecurityManager calls on detached documents.
by Alexandre Julliard Jan. 18, 2012

Jan. 18, 2012

Module: wine Branch: master Commit: 58aa5471a50a1e3606e0acf2192019d7b791cc79 URL: http://source.winehq.org/git/wine.git/?a=commit;h=58aa5471a50a1e3606e0acf21… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jan 18 13:40:43 2012 +0100 mshtml: Return error in IInternetHostSecurityManager calls on detached documents. --- dlls/mshtml/secmgr.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/secmgr.c b/dlls/mshtml/secmgr.c index a2005aa..ff349ac 100644 --- a/dlls/mshtml/secmgr.c +++ b/dlls/mshtml/secmgr.c @@ -80,6 +80,9 @@ static HRESULT WINAPI InternetHostSecurityManager_ProcessUrlAction(IInternetHost TRACE("(%p)->(%d %p %d %p %d %x %x)\n", This, dwAction, pPolicy, cbPolicy, pContext, cbContext, dwFlags, dwReserved); + if(!This->basedoc.window) + return E_UNEXPECTED; + url = This->basedoc.window->url ? This->basedoc.window->url : about_blankW; return IInternetSecurityManager_ProcessUrlAction(This->basedoc.window->secmgr, url, dwAction, pPolicy, cbPolicy, @@ -184,6 +187,9 @@ static HRESULT WINAPI InternetHostSecurityManager_QueryCustomPolicy(IInternetHos TRACE("(%p)->(%s %p %p %p %d %x)\n", This, debugstr_guid(guidKey), ppPolicy, pcbPolicy, pContext, cbContext, dwReserved); + if(!This->basedoc.window) + return E_UNEXPECTED; + url = This->basedoc.window->url ? This->basedoc.window->url : about_blankW; hres = IInternetSecurityManager_QueryCustomPolicy(This->basedoc.window->secmgr, url, guidKey, ppPolicy, pcbPolicy,

1 0