wine-commits March 2012

wine-commits@winehq.org

3 participants
710 discussions

Alistair Leslie-Hughes : mscoree: Allow capital for version number.
by Alexandre Julliard 27 Mar '12

27 Mar '12

Module: wine Branch: master Commit: d08e89a8d61bf3224503327b7f40ef65cab7b038 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d08e89a8d61bf3224503327b7… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Mar 15 22:40:25 2012 +1100 mscoree: Allow capital for version number. --- dlls/mscoree/metahost.c | 2 +- dlls/mscoree/mscoree_main.c | 3 +++ dlls/mscoree/tests/mscoree.c | 6 ++++++ 3 files changed, 10 insertions(+), 1 deletions(-) diff --git a/dlls/mscoree/metahost.c b/dlls/mscoree/metahost.c index f915d73..f877b1e 100644 --- a/dlls/mscoree/metahost.c +++ b/dlls/mscoree/metahost.c @@ -988,7 +988,7 @@ static BOOL parse_runtime_version(LPCWSTR version, DWORD *major, DWORD *minor, D *minor = 0; *build = 0; - if (version[0] == 'v') + if (version[0] == 'v' || version[0] == 'V') { version++; if (!isdigit(*version)) diff --git a/dlls/mscoree/mscoree_main.c b/dlls/mscoree/mscoree_main.c index 0ebc813..1e06909 100644 --- a/dlls/mscoree/mscoree_main.c +++ b/dlls/mscoree/mscoree_main.c @@ -347,6 +347,9 @@ HRESULT WINAPI GetRequestedRuntimeInfo(LPCWSTR pExe, LPCWSTR pwszVersion, LPCWST if (SUCCEEDED(ret)) { + if(pwszVersion) + pVersion[0] = pwszVersion[0]; + *dwDirectoryLength = dwDirectory; ret = ICLRRuntimeInfo_GetRuntimeDirectory(info, pDirectory, dwDirectoryLength); } diff --git a/dlls/mscoree/tests/mscoree.c b/dlls/mscoree/tests/mscoree.c index 9b115c0..f8de6fa 100644 --- a/dlls/mscoree/tests/mscoree.c +++ b/dlls/mscoree/tests/mscoree.c @@ -61,6 +61,7 @@ static BOOL init_functionpointers(void) static void test_versioninfo(void) { const WCHAR v9_0[] = {'v','9','.','0','.','3','0','3','1','9',0}; + const WCHAR v2_0cap[] = {'V','2','.','0','.','5','0','7','2','7',0}; const WCHAR v2_0[] = {'v','2','.','0','.','5','0','7','2','7',0}; const WCHAR v2_0_0[] = {'v','2','.','0','.','0',0}; const WCHAR v1_1[] = {'v','1','.','1','.','4','3','2','2',0}; @@ -147,6 +148,11 @@ static void test_versioninfo(void) ok(hr == S_OK, "GetRequestedRuntimeInfo returned %08x\n", hr); ok(!winetest_strcmpW(version, v2_0), "version is %s , expected %s\n", wine_dbgstr_w(version), wine_dbgstr_w(v2_0)); + memset(version, 0, sizeof(version)); + hr = pGetRequestedRuntimeInfo( NULL, v2_0cap, NULL, 0, 0, path, MAX_PATH, &path_len, version, MAX_PATH, NULL); + ok(hr == S_OK, "GetRequestedRuntimeInfo returned %08x\n", hr); + ok(!winetest_strcmpW(version, v2_0cap), "version is %s , expected %s\n", wine_dbgstr_w(version), wine_dbgstr_w(v2_0cap)); + /* Invalid Version and RUNTIME_INFO_UPGRADE_VERSION flag*/ memset(version, 0, sizeof(version)); hr = pGetRequestedRuntimeInfo( NULL, v1_1, NULL, 0, RUNTIME_INFO_UPGRADE_VERSION, path, MAX_PATH, &path_len, version, MAX_PATH, NULL);

1 0

Jacek Caban : mshtml: Use jscript. dll for JavaScript for all zones except untrusted.
by Alexandre Julliard 27 Mar '12

27 Mar '12

Module: wine Branch: master Commit: 6c6744f80066f0aa46939a2d4c0af9c34f932e8b URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c6744f80066f0aa46939a2d4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 27 13:40:01 2012 +0200 mshtml: Use jscript.dll for JavaScript for all zones except untrusted. --- dlls/mshtml/persist.c | 8 ++------ 1 files changed, 2 insertions(+), 6 deletions(-) diff --git a/dlls/mshtml/persist.c b/dlls/mshtml/persist.c index 2e69902..667a2f6 100644 --- a/dlls/mshtml/persist.c +++ b/dlls/mshtml/persist.c @@ -56,7 +56,7 @@ typedef struct { static BOOL use_gecko_script(HTMLWindow *window) { - DWORD zone, scheme; + DWORD zone; HRESULT hres; hres = IInternetSecurityManager_MapUrlToZone(window->secmgr, window->url, &zone, 0); @@ -66,11 +66,7 @@ static BOOL use_gecko_script(HTMLWindow *window) } TRACE("zone %d\n", zone); - if(zone == URLZONE_LOCAL_MACHINE || zone == URLZONE_TRUSTED || !window->uri) - return FALSE; - - hres = IUri_GetScheme(window->uri, &scheme); - return FAILED(hres) || scheme != URL_SCHEME_ABOUT; + return zone == URLZONE_UNTRUSTED; } static void notify_travellog_update(HTMLDocumentObj *doc)

1 0

Jacek Caban : mshtml: Forward common getters from IHTMLObjectElement to IHTMLObjectElement2.
by Alexandre Julliard 27 Mar '12

27 Mar '12

Module: wine Branch: master Commit: e405e4ccb9ec6313672be48ce9992e5682a7feb7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e405e4ccb9ec6313672be48ce… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 27 13:39:35 2012 +0200 mshtml: Forward common getters from IHTMLObjectElement to IHTMLObjectElement2. --- dlls/mshtml/htmlobject.c | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmlobject.c b/dlls/mshtml/htmlobject.c index 362cb01..6f171c6 100644 --- a/dlls/mshtml/htmlobject.c +++ b/dlls/mshtml/htmlobject.c @@ -115,15 +115,19 @@ static HRESULT WINAPI HTMLObjectElement_get_object(IHTMLObjectElement *iface, ID static HRESULT WINAPI HTMLObjectElement_get_classid(IHTMLObjectElement *iface, BSTR *p) { HTMLObjectElement *This = impl_from_IHTMLObjectElement(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + return IHTMLObjectElement2_get_classid(&This->IHTMLObjectElement_iface, p); } static HRESULT WINAPI HTMLObjectElement_get_data(IHTMLObjectElement *iface, BSTR *p) { HTMLObjectElement *This = impl_from_IHTMLObjectElement(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + return IHTMLObjectElement2_get_data(&This->IHTMLObjectElement_iface, p); } static HRESULT WINAPI HTMLObjectElement_put_recordset(IHTMLObjectElement *iface, IDispatch *v)

1 0

Jacek Caban : mshtml: Added IHTMLObjectElement2 stub implementation.
by Alexandre Julliard 27 Mar '12

27 Mar '12

Module: wine Branch: master Commit: 6c116b2b92f10b7160e4b712a55fad80d88b06bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c116b2b92f10b7160e4b712a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 27 13:39:21 2012 +0200 mshtml: Added IHTMLObjectElement2 stub implementation. --- dlls/mshtml/htmlobject.c | 117 ++++++++++++++++++++++++++++++++++++++++++ dlls/mshtml/mshtml_private.h | 1 + dlls/mshtml/tests/dom.c | 1 + 3 files changed, 119 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/htmlobject.c b/dlls/mshtml/htmlobject.c index 70d5f7e..362cb01 100644 --- a/dlls/mshtml/htmlobject.c +++ b/dlls/mshtml/htmlobject.c @@ -37,6 +37,7 @@ typedef struct { HTMLPluginContainer plugin_container; IHTMLObjectElement IHTMLObjectElement_iface; + IHTMLObjectElement2 IHTMLObjectElement2_iface; nsIDOMHTMLObjectElement *nsobject; } HTMLObjectElement; @@ -397,6 +398,117 @@ static const IHTMLObjectElementVtbl HTMLObjectElementVtbl = { HTMLObjectElement_get_hspace }; +static inline HTMLObjectElement *impl_from_IHTMLObjectElement2(IHTMLObjectElement2 *iface) +{ + return CONTAINING_RECORD(iface, HTMLObjectElement, IHTMLObjectElement2_iface); +} + +static HRESULT WINAPI HTMLObjectElement2_QueryInterface(IHTMLObjectElement2 *iface, + REFIID riid, void **ppv) +{ + HTMLObjectElement *This = impl_from_IHTMLObjectElement2(iface); + + return IHTMLDOMNode_QueryInterface(&This->plugin_container.element.node.IHTMLDOMNode_iface, + riid, ppv); +} + +static ULONG WINAPI HTMLObjectElement2_AddRef(IHTMLObjectElement2 *iface) +{ + HTMLObjectElement *This = impl_from_IHTMLObjectElement2(iface); + + return IHTMLDOMNode_AddRef(&This->plugin_container.element.node.IHTMLDOMNode_iface); +} + +static ULONG WINAPI HTMLObjectElement2_Release(IHTMLObjectElement2 *iface) +{ + HTMLObjectElement *This = impl_from_IHTMLObjectElement2(iface); + + return IHTMLDOMNode_Release(&This->plugin_container.element.node.IHTMLDOMNode_iface); +} + +static HRESULT WINAPI HTMLObjectElement2_GetTypeInfoCount(IHTMLObjectElement2 *iface, UINT *pctinfo) +{ + HTMLObjectElement *This = impl_from_IHTMLObjectElement2(iface); + return IDispatchEx_GetTypeInfoCount(&This->plugin_container.element.node.dispex.IDispatchEx_iface, + pctinfo); +} + +static HRESULT WINAPI HTMLObjectElement2_GetTypeInfo(IHTMLObjectElement2 *iface, UINT iTInfo, + LCID lcid, ITypeInfo **ppTInfo) +{ + HTMLObjectElement *This = impl_from_IHTMLObjectElement2(iface); + return IDispatchEx_GetTypeInfo(&This->plugin_container.element.node.dispex.IDispatchEx_iface, + iTInfo, lcid, ppTInfo); +} + +static HRESULT WINAPI HTMLObjectElement2_GetIDsOfNames(IHTMLObjectElement2 *iface, REFIID riid, + LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId) +{ + HTMLObjectElement *This = impl_from_IHTMLObjectElement2(iface); + return IDispatchEx_GetIDsOfNames(&This->plugin_container.element.node.dispex.IDispatchEx_iface, + riid, rgszNames, cNames, lcid, rgDispId); +} + +static HRESULT WINAPI HTMLObjectElement2_Invoke(IHTMLObjectElement2 *iface, DISPID dispIdMember, + REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, VARIANT *pVarResult, + EXCEPINFO *pExcepInfo, UINT *puArgErr) +{ + HTMLObjectElement *This = impl_from_IHTMLObjectElement2(iface); + return IDispatchEx_Invoke(&This->plugin_container.element.node.dispex.IDispatchEx_iface, + dispIdMember, riid, lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); +} + +static HRESULT WINAPI HTMLObjectElement2_namedRecordset(IHTMLObjectElement2 *iface, BSTR dataMember, + VARIANT *hierarchy, IDispatch **ppRecordset) +{ + HTMLObjectElement *This = impl_from_IHTMLObjectElement2(iface); + FIXME("(%p)->(%s %p %p)\n", This, debugstr_w(dataMember), hierarchy, ppRecordset); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLObjectElement2_put_classid(IHTMLObjectElement2 *iface, BSTR v) +{ + HTMLObjectElement *This = impl_from_IHTMLObjectElement2(iface); + FIXME("(%p)->(%s)\n", This, debugstr_w(v)); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLObjectElement2_get_classid(IHTMLObjectElement2 *iface, BSTR *p) +{ + HTMLObjectElement *This = impl_from_IHTMLObjectElement2(iface); + FIXME("(%p)->(%p)\n", This, p); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLObjectElement2_put_data(IHTMLObjectElement2 *iface, BSTR v) +{ + HTMLObjectElement *This = impl_from_IHTMLObjectElement2(iface); + FIXME("(%p)->(%s)\n", This, debugstr_w(v)); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLObjectElement2_get_data(IHTMLObjectElement2 *iface, BSTR *p) +{ + HTMLObjectElement *This = impl_from_IHTMLObjectElement2(iface); + FIXME("(%p)->(%p)\n", This, p); + return E_NOTIMPL; +} + +static const IHTMLObjectElement2Vtbl HTMLObjectElement2Vtbl = { + HTMLObjectElement2_QueryInterface, + HTMLObjectElement2_AddRef, + HTMLObjectElement2_Release, + HTMLObjectElement2_GetTypeInfoCount, + HTMLObjectElement2_GetTypeInfo, + HTMLObjectElement2_GetIDsOfNames, + HTMLObjectElement2_Invoke, + HTMLObjectElement2_namedRecordset, + HTMLObjectElement2_put_classid, + HTMLObjectElement2_get_classid, + HTMLObjectElement2_put_data, + HTMLObjectElement2_get_data +}; + static inline HTMLObjectElement *impl_from_HTMLDOMNode(HTMLDOMNode *iface) { return CONTAINING_RECORD(iface, HTMLObjectElement, plugin_container.element.node); @@ -415,6 +527,9 @@ static HRESULT HTMLObjectElement_QI(HTMLDOMNode *iface, REFIID riid, void **ppv) }else if(IsEqualGUID(&IID_IHTMLObjectElement, riid)) { TRACE("(%p)->(IID_IHTMLObjectElement %p)\n", This, ppv); *ppv = &This->IHTMLObjectElement_iface; + }else if(IsEqualGUID(&IID_IHTMLObjectElement2, riid)) { + TRACE("(%p)->(IID_IHTMLObjectElement2 %p)\n", This, ppv); + *ppv = &This->IHTMLObjectElement2_iface; }else if(IsEqualGUID(&IID_HTMLPluginContainer, riid)) { TRACE("(%p)->(IID_HTMLPluginContainer %p)\n", This, ppv); *ppv = &This->plugin_container; @@ -504,6 +619,7 @@ static const NodeImplVtbl HTMLObjectElementImplVtbl = { static const tid_t HTMLObjectElement_iface_tids[] = { HTMLELEMENT_TIDS, IHTMLObjectElement_tid, + IHTMLObjectElement2_tid, 0 }; static dispex_static_data_t HTMLObjectElement_dispex = { @@ -523,6 +639,7 @@ HRESULT HTMLObjectElement_Create(HTMLDocumentNode *doc, nsIDOMHTMLElement *nsele return E_OUTOFMEMORY; ret->IHTMLObjectElement_iface.lpVtbl = &HTMLObjectElementVtbl; + ret->IHTMLObjectElement2_iface.lpVtbl = &HTMLObjectElement2Vtbl; ret->plugin_container.element.node.vtbl = &HTMLObjectElementImplVtbl; nsres = nsIDOMHTMLElement_QueryInterface(nselem, &IID_nsIDOMHTMLObjectElement, (void**)&ret->nsobject); diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 9e30464..697dcf3 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -149,6 +149,7 @@ typedef struct event_target_t event_target_t; XIID(IHTMLLocation) \ XIID(IHTMLMimeTypesCollection) \ XIID(IHTMLObjectElement) \ + XIID(IHTMLObjectElement2) \ XIID(IHTMLOptionElement) \ XIID(IHTMLPluginsCollection) \ XIID(IHTMLRect) \ diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 674d0a3..a8d0f13 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -309,6 +309,7 @@ static const IID * const title_iids[] = { static const IID * const object_iids[] = { ELEM_IFACES, &IID_IHTMLObjectElement, + &IID_IHTMLObjectElement2, /* FIXME: No IConnectionPointContainer */ NULL };

1 0

Christian Costa : cmd/tests: If we rewind to the beginning of the line, don 't increment line number.
by Alexandre Julliard 27 Mar '12

27 Mar '12

Module: wine Branch: master Commit: 6533168089ab98759562999618c7fbbe540038eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=6533168089ab9875956299961… Author: Christian Costa <titan.costa(a)gmail.com> Date: Mon Mar 26 10:13:44 2012 +0200 cmd/tests: If we rewind to the beginning of the line, don't increment line number. --- programs/cmd/tests/batch.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/programs/cmd/tests/batch.c b/programs/cmd/tests/batch.c index 8236352..6cf740b 100644 --- a/programs/cmd/tests/batch.c +++ b/programs/cmd/tests/batch.c @@ -315,7 +315,11 @@ static void test_output(const char *out_data, DWORD out_size, const char *exp_da if(is_todo_wine) winetest_end_todo("wine"); if (is_exp_resync && err && is_todo_wine) + { exp_ptr -= sizeof(todo_wine_cmd); + /* If we rewind to the beginning of the line, don't increment line number */ + line--; + } else if (!is_exp_resync || (is_exp_resync && !err)) { exp_ptr = exp_nl+1;

1 0

Christian Costa : attrib: Dislay attribute flags in the right order.
by Alexandre Julliard 27 Mar '12

27 Mar '12

Module: wine Branch: master Commit: 6520f19181fc6853a9b2a6ec35acb759cc87e7fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=6520f19181fc6853a9b2a6ec3… Author: Christian Costa <titan.costa(a)gmail.com> Date: Mon Mar 26 22:06:17 2012 +0200 attrib: Dislay attribute flags in the right order. --- programs/attrib/attrib.c | 10 +++++----- programs/cmd/tests/test_builtins.cmd.exp | 6 +++--- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/programs/attrib/attrib.c b/programs/attrib/attrib.c index a00e104..ca15980 100644 --- a/programs/attrib/attrib.c +++ b/programs/attrib/attrib.c @@ -199,22 +199,22 @@ int wmain(int argc, WCHAR *argv[]) } else { static const WCHAR fmt[] = {'%','1',' ',' ',' ',' ',' ','%','2','\n','\0'}; if (fd.dwFileAttributes & FILE_ATTRIBUTE_HIDDEN) { - flags[0] = 'H'; + flags[4] = 'H'; } if (fd.dwFileAttributes & FILE_ATTRIBUTE_SYSTEM) { flags[1] = 'S'; } if (fd.dwFileAttributes & FILE_ATTRIBUTE_ARCHIVE) { - flags[2] = 'A'; + flags[0] = 'A'; } if (fd.dwFileAttributes & FILE_ATTRIBUTE_READONLY) { - flags[3] = 'R'; + flags[5] = 'R'; } if (fd.dwFileAttributes & FILE_ATTRIBUTE_TEMPORARY) { - flags[4] = 'T'; + flags[6] = 'T'; } if (fd.dwFileAttributes & FILE_ATTRIBUTE_COMPRESSED) { - flags[5] = 'C'; + flags[7] = 'C'; } strcpyW(name, curdir); strcatW(name, fd.cFileName); diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index 0b8e172..bb75515 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -696,9 +696,9 @@ bar\baz removed @pwd@\foobar @pwd@ ------------ Testing attrib ------------ -@todo_wine@A @pwd@\foobar\foo@or_broken@A @pwd@\foobar\foo@or_broken@A I @pwd@\foobar\foo +A @pwd@\foobar\foo@or_broken@A @pwd@\foobar\foo@or_broken@A I @pwd@\foobar\foo --- read-only attribute -@todo_wine@A R @pwd@\foobar\foo@or_broken@A R @pwd@\foobar\foo@or_broken@A R I @pwd@\foobar\foo +A R @pwd@\foobar\foo@or_broken@A R @pwd@\foobar\foo@or_broken@A R I @pwd@\foobar\foo foo foo original contents Read-only file not deleted @@ -707,7 +707,7 @@ Read-only file forcibly deleted @todo_wine@A @pwd@\foobar\baz\level2@or_broken@A @pwd@\foobar\baz\level2@or_broken@A I @pwd@\foobar\baz\level2 @todo_wine@A R @pwd@\foobar\level1@or_broken@A R @pwd@\foobar\level1@or_broken@A R I @pwd@\foobar\level1 @todo_wine@A R @pwd@\foobar\baz\level2@or_broken@A R @pwd@\foobar\baz\level2@or_broken@A R I @pwd@\foobar\baz\level2 -@todo_wine@A @pwd@\foobar\bar@or_broken@A @pwd@\foobar\bar@or_broken@A I @pwd@\foobar\bar +A @pwd@\foobar\bar@or_broken@A @pwd@\foobar\bar@or_broken@A I @pwd@\foobar\bar --- folders processing @pwd@\foobar@or_broken@ @pwd@\foobar@or_broken@ I @pwd@\foobar @todo_wine@ R @pwd@\foobar\baz@or_broken@ R @pwd@\foobar\baz@or_broken@ @pwd@\foobar\baz@or_broken@ R I @pwd@\foobar\baz

1 0

Christian Costa : attrib: Do not hardcode number of characters in flags array.
by Alexandre Julliard 27 Mar '12

27 Mar '12

Module: wine Branch: master Commit: 5d57fc998aa835928b08b995d6c11a115fc6c353 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5d57fc998aa835928b08b995d… Author: Christian Costa <titan.costa(a)gmail.com> Date: Mon Mar 26 22:06:09 2012 +0200 attrib: Do not hardcode number of characters in flags array. --- programs/attrib/attrib.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/attrib/attrib.c b/programs/attrib/attrib.c index 1bf4f47..a00e104 100644 --- a/programs/attrib/attrib.c +++ b/programs/attrib/attrib.c @@ -219,7 +219,7 @@ int wmain(int argc, WCHAR *argv[]) strcpyW(name, curdir); strcatW(name, fd.cFileName); ATTRIB_wprintf(fmt, flags, name); - for (count=0; count < 8; count++) flags[count] = ' '; + for (count = 0; count < (sizeof(flags)/sizeof(WCHAR) - 1); count++) flags[count] = ' '; } } while (FindNextFileW(hff, &fd) != 0); }

1 0

Christian Costa : attrib: Add 2 missing spaces between attribute flags and filename.
by Alexandre Julliard 27 Mar '12

27 Mar '12

Module: wine Branch: master Commit: a4e2f1d42a4eb72b383cb335a745213f76930abb URL: http://source.winehq.org/git/wine.git/?a=commit;h=a4e2f1d42a4eb72b383cb335a… Author: Christian Costa <titan.costa(a)gmail.com> Date: Mon Mar 26 22:06:01 2012 +0200 attrib: Add 2 missing spaces between attribute flags and filename. --- programs/attrib/attrib.c | 2 +- programs/cmd/tests/test_builtins.cmd.exp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/attrib/attrib.c b/programs/attrib/attrib.c index 1238cb3..1bf4f47 100644 --- a/programs/attrib/attrib.c +++ b/programs/attrib/attrib.c @@ -197,7 +197,7 @@ int wmain(int argc, WCHAR *argv[]) fd.dwFileAttributes |= FILE_ATTRIBUTE_NORMAL; SetFileAttributesW(name, fd.dwFileAttributes); } else { - static const WCHAR fmt[] = {'%','1',' ',' ',' ','%','2','\n','\0'}; + static const WCHAR fmt[] = {'%','1',' ',' ',' ',' ',' ','%','2','\n','\0'}; if (fd.dwFileAttributes & FILE_ATTRIBUTE_HIDDEN) { flags[0] = 'H'; } diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index 7537ebc..0b8e172 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -709,7 +709,7 @@ Read-only file forcibly deleted @todo_wine@A R @pwd@\foobar\baz\level2@or_broken@A R @pwd@\foobar\baz\level2@or_broken@A R I @pwd@\foobar\baz\level2 @todo_wine@A @pwd@\foobar\bar@or_broken@A @pwd@\foobar\bar@or_broken@A I @pwd@\foobar\bar --- folders processing -@todo_wine@ @pwd@\foobar@or_broken@ @pwd@\foobar@or_broken@ I @pwd@\foobar + @pwd@\foobar@or_broken@ @pwd@\foobar@or_broken@ I @pwd@\foobar @todo_wine@ R @pwd@\foobar\baz@or_broken@ R @pwd@\foobar\baz@or_broken@ @pwd@\foobar\baz@or_broken@ R I @pwd@\foobar\baz @todo_wine@A @pwd@\foobar\baz\toto@or_broken@A @pwd@\foobar\baz\toto@or_broken@A I @pwd@\foobar\baz\toto toto

1 0

Christian Costa : attrib: Display filenames with absolute path as in native .
by Alexandre Julliard 27 Mar '12

27 Mar '12

Module: wine Branch: master Commit: 1ed66392f2f21a75f6f21491245facd8cf3c3c95 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ed66392f2f21a75f6f214912… Author: Christian Costa <titan.costa(a)gmail.com> Date: Mon Mar 26 22:05:53 2012 +0200 attrib: Display filenames with absolute path as in native. --- programs/attrib/attrib.c | 16 +++++++++++----- 1 files changed, 11 insertions(+), 5 deletions(-) diff --git a/programs/attrib/attrib.c b/programs/attrib/attrib.c index 865f59c..1238cb3 100644 --- a/programs/attrib/attrib.c +++ b/programs/attrib/attrib.c @@ -128,11 +128,13 @@ int wmain(int argc, WCHAR *argv[]) HANDLE hff; WIN32_FIND_DATAW fd; WCHAR flags[] = {' ',' ',' ',' ',' ',' ',' ',' ','\0'}; - WCHAR name[128]; + WCHAR name[MAX_PATH]; + WCHAR curdir[MAX_PATH]; DWORD attrib_set = 0; DWORD attrib_clear = 0; const WCHAR help_option[] = {'/','?','\0'}; - const WCHAR slashStarW[] = {'\\','*','\0'}; + const WCHAR slash[] = {'\\','\0'}; + const WCHAR start[] = {'*','\0'}; int i = 1; if ((argc >= 2) && !strcmpW(argv[1], help_option)) { @@ -141,8 +143,10 @@ int wmain(int argc, WCHAR *argv[]) } /* By default all files from current directory are taken into account */ - GetCurrentDirectoryW(sizeof(name)/sizeof(WCHAR), name); - strcatW (name, slashStarW); + GetCurrentDirectoryW(sizeof(curdir)/sizeof(WCHAR), curdir); + strcatW(curdir, slash); + strcpyW(name, curdir); + strcatW(name, start); while (i < argc) { WCHAR *param = argv[i++]; @@ -212,7 +216,9 @@ int wmain(int argc, WCHAR *argv[]) if (fd.dwFileAttributes & FILE_ATTRIBUTE_COMPRESSED) { flags[5] = 'C'; } - ATTRIB_wprintf(fmt, flags, fd.cFileName); + strcpyW(name, curdir); + strcatW(name, fd.cFileName); + ATTRIB_wprintf(fmt, flags, name); for (count=0; count < 8; count++) flags[count] = ' '; } } while (FindNextFileW(hff, &fd) != 0);

1 0

Christian Costa : attrib: Skip processing of . and .. entries.
by Alexandre Julliard 27 Mar '12

27 Mar '12

Module: wine Branch: master Commit: a575c6d93a698f558d85f6de298dc24e602e4dfc URL: http://source.winehq.org/git/wine.git/?a=commit;h=a575c6d93a698f558d85f6de2… Author: Christian Costa <titan.costa(a)gmail.com> Date: Mon Mar 26 22:05:45 2012 +0200 attrib: Skip processing of . and .. entries. --- programs/attrib/attrib.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/programs/attrib/attrib.c b/programs/attrib/attrib.c index 34b8592..865f59c 100644 --- a/programs/attrib/attrib.c +++ b/programs/attrib/attrib.c @@ -180,6 +180,12 @@ int wmain(int argc, WCHAR *argv[]) } else { do { + const WCHAR dot[] = {'.', 0}; + const WCHAR dotdot[] = {'.', '.', 0}; + + if (!strcmpW(fd.cFileName, dot) || !strcmpW(fd.cFileName, dotdot)) + continue; + if (attrib_set || attrib_clear) { fd.dwFileAttributes &= ~attrib_clear; fd.dwFileAttributes |= attrib_set;

1 0

← Newer
1
...
11
12
13
14
15
16
17
...
71
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits March 2012