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

André Hentschel : Wine 1.3.0 freigegeben
by Jeremy Newman July 30, 2010

July 30, 2010

Module: website Branch: master Commit: d9d041cab6e0db898a8e3407d5dce088822a73e4 URL: http://source.winehq.org/git/website.git/?a=commit;h=d9d041cab6e0db898a8e34… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Jul 30 20:56:26 2010 +0200 Wine 1.3.0 freigegeben --- news/de/2010073001.xml | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/news/de/2010073001.xml b/news/de/2010073001.xml new file mode 100644 index 0000000..201ed96 --- /dev/null +++ b/news/de/2010073001.xml @@ -0,0 +1,17 @@ +<news> +<date>30. Juli 2010</date> +<title>Wine 1.3.0 Freigegeben</title> +<body> + Die Entwicklungsversion 1.3.0 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/1.3.0">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Anfänge einer Benutzeroberfläche für den eigenen Internet Explorer.</li> + <li>Unterstützung für Prozessübergreifendes OLE drag & drop.</li> + <li>wscript.exe (Windows Script Host) Marke Eigenbau.</li> + <li>Öffnen und Speichern Dialoge merken sich den zuletzt benutzten Ordner.</li> + <li>Einige Übersetzungen.</li> + <li>Verschiedenste Fehlerbehebungen.</li> +</ul> +Der Quellcode ist jetzt <a href="http://prdownloads.sourceforge.net/wine/wine-1.3.0.tar.bz2">verfügbar</a>. +Binär-Downloads werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Download-Seiten</a> zur Verfügung. +</body></news>

1 0

Alexandre Julliard : Wine release 1.3.0
by Alexandre Julliard July 30, 2010

July 30, 2010

Module: website Branch: master Commit: 0f6b19136bfbf530aa6b10e11a55ec0d83d4d09a URL: http://source.winehq.org/git/website.git/?a=commit;h=0f6b19136bfbf530aa6b10… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 30 19:53:19 2010 +0200 Wine release 1.3.0 --- news/en/2010073001.xml | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/news/en/2010073001.xml b/news/en/2010073001.xml new file mode 100644 index 0000000..d209196 --- /dev/null +++ b/news/en/2010073001.xml @@ -0,0 +1,17 @@ +<news> +<date>July 30, 2010</date> +<title>Wine 1.3.0 Released</title> +<body> + The Wine development release 1.3.0 is now available. + <a href="{$root}/announce/1.3.0">What's new</a> in this release: +<ul> + <li>Beginnings of a user interface for the builtin Internet Explorer.</li> + <li>Support for cross-process OLE drag & drop.</li> + <li>New builtin wscript.exe (Windows Script Host) program.</li> + <li>Open/save dialogs remember the last used directory.</li> + <li>Translation updates.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="http://prdownloads.sourceforge.net/wine/wine-1.3.0.tar.bz2">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Alexandre Julliard : Release 1.3.0.
by Alexandre Julliard July 30, 2010

July 30, 2010

Module: wine Branch: master Commit: 8b2a403a7dc32febc3b554961606c2b1e3ffe6da URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b2a403a7dc32febc3b554961… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 30 19:43:56 2010 +0200 Release 1.3.0. --- ANNOUNCE | 1390 ++++++++++++++++++++++++++++++++++++++++--------------------- VERSION | 2 +- configure | 18 +- 3 files changed, 923 insertions(+), 487 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8b2a403a7dc32febc3b55…

1 0

Tag wine-1.3.0 : Alexandre Julliard : Release 1.3.0
by Alexandre Julliard July 30, 2010

July 30, 2010

Module: wine Branch: refs/tags/wine-1.3.0 Tag: 3cb29d622988f90c260d1851af75807b0ac7b337 URL: http://source.winehq.org/git/wine.git/?a=tag;h=3cb29d622988f90c260d1851af75… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 30 19:43:59 2010 +0200 Release 1.3.0

1 0

Alexander Nicolaysen Sørnes : shdocvw: Add support for setting the statusbar text in IE.
by Alexandre Julliard July 30, 2010

July 30, 2010

Module: wine Branch: master Commit: 9a4c3649540e9c62b6e45e7a88556892736f4b6f URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a4c3649540e9c62b6e45e7a8… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Thu Jul 29 13:45:17 2010 +0200 shdocvw: Add support for setting the statusbar text in IE. --- dlls/shdocvw/ie.c | 6 ++++-- dlls/shdocvw/iexplore.c | 15 ++++++++++++--- dlls/shdocvw/shdocvw.h | 4 +++- 3 files changed, 19 insertions(+), 6 deletions(-) diff --git a/dlls/shdocvw/ie.c b/dlls/shdocvw/ie.c index a484de5..43afd31 100644 --- a/dlls/shdocvw/ie.c +++ b/dlls/shdocvw/ie.c @@ -396,8 +396,10 @@ static HRESULT WINAPI InternetExplorer_get_StatusText(IWebBrowser2 *iface, BSTR static HRESULT WINAPI InternetExplorer_put_StatusText(IWebBrowser2 *iface, BSTR StatusText) { InternetExplorer *This = WEBBROWSER_THIS(iface); - FIXME("(%p)->(%s)\n", This, debugstr_w(StatusText)); - return E_NOTIMPL; + + TRACE("(%p)->(%s)\n", This, debugstr_w(StatusText)); + + return update_ie_statustext(This, StatusText); } static HRESULT WINAPI InternetExplorer_get_ToolBar(IWebBrowser2 *iface, int *Value) diff --git a/dlls/shdocvw/iexplore.c b/dlls/shdocvw/iexplore.c index 52cde1b..2f15987 100644 --- a/dlls/shdocvw/iexplore.c +++ b/dlls/shdocvw/iexplore.c @@ -41,12 +41,22 @@ WINE_DEFAULT_DEBUG_CHANNEL(shdocvw); #define IDI_APPICON 1 +#define DOCHOST_THIS(iface) DEFINE_THIS2(InternetExplorer,doc_host,iface) + static const WCHAR szIEWinFrame[] = { 'I','E','F','r','a','m','e',0 }; /* Windows uses "Microsoft Internet Explorer" */ static const WCHAR wszWineInternetExplorer[] = {'W','i','n','e',' ','I','n','t','e','r','n','e','t',' ','E','x','p','l','o','r','e','r',0}; +HRESULT update_ie_statustext(InternetExplorer* This, LPCWSTR text) +{ + if(!SendMessageW(This->status_hwnd, SB_SETTEXTW, MAKEWORD(SB_SIMPLEID, 0), (LPARAM)text)) + return E_FAIL; + + return S_OK; +} + void adjust_ie_docobj_rect(HWND frame, RECT* rc) { HWND hwndRebar = GetDlgItem(frame, IDC_BROWSE_REBAR); @@ -378,9 +388,8 @@ static void WINAPI DocHostContainer_GetDocObjRect(DocHost* This, RECT* rc) static HRESULT WINAPI DocHostContainer_SetStatusText(DocHost* This, LPCWSTR text) { - FIXME("(%p)->(%s)\n", This, debugstr_w(text)); - - return E_NOTIMPL; + InternetExplorer* ie = DOCHOST_THIS(This); + return update_ie_statustext(ie, text); } static void WINAPI DocHostContainer_SetURL(DocHost* This, LPCWSTR url) diff --git a/dlls/shdocvw/shdocvw.h b/dlls/shdocvw/shdocvw.h index 151b48b..d20e834 100644 --- a/dlls/shdocvw/shdocvw.h +++ b/dlls/shdocvw/shdocvw.h @@ -270,7 +270,8 @@ HRESULT InternetShortcut_Create(IUnknown*,REFIID,void**); HRESULT TaskbarList_Create(IUnknown*,REFIID,void**); -#define DEFINE_THIS(cls,ifc,iface) ((cls*)((BYTE*)(iface)-offsetof(cls,lp ## ifc ## Vtbl))) +#define DEFINE_THIS2(cls,ifc,iface) ((cls*)((BYTE*)(iface)-offsetof(cls,ifc))) +#define DEFINE_THIS(cls,ifc,iface) DEFINE_THIS2(cls,lp ## ifc ## Vtbl,iface) /********************************************************************** * Dll lifetime tracking declaration for shdocvw.dll @@ -283,6 +284,7 @@ extern HINSTANCE shdocvw_hinstance; extern void register_iewindow_class(void); extern void unregister_iewindow_class(void); extern void adjust_ie_docobj_rect(HWND, RECT*); +extern HRESULT update_ie_statustext(InternetExplorer*, LPCWSTR); HRESULT register_class_object(BOOL); HRESULT get_typeinfo(ITypeInfo**);

1 0

Andrew Nguyen : oleaut32/tests: Test typelib registration in the user registry.
by Alexandre Julliard July 30, 2010

July 30, 2010

Module: wine Branch: master Commit: ce8c450d83a0b2e32290effd58ca69cd9f0572be URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce8c450d83a0b2e32290effd5… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Fri Jul 30 07:44:19 2010 -0500 oleaut32/tests: Test typelib registration in the user registry. --- dlls/oleaut32/tests/typelib.c | 44 +++++++++++++++++++++++++++++++++++++--- 1 files changed, 40 insertions(+), 4 deletions(-) diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c index 8a1fccb..9843327 100644 --- a/dlls/oleaut32/tests/typelib.c +++ b/dlls/oleaut32/tests/typelib.c @@ -55,8 +55,19 @@ #define ok_ole_success(hr, func) ok(hr == S_OK, #func " failed with error 0x%08x\n", hr) +static HRESULT WINAPI (*pRegisterTypeLibForUser)(ITypeLib*,OLECHAR*,OLECHAR*); +static HRESULT WINAPI (*pUnRegisterTypeLibForUser)(REFGUID,WORD,WORD,LCID,SYSKIND); + static const WCHAR wszStdOle2[] = {'s','t','d','o','l','e','2','.','t','l','b',0}; +static void init_function_pointers(void) +{ + HMODULE hmod = GetModuleHandleA("oleaut32.dll"); + + pRegisterTypeLibForUser = (void *)GetProcAddress(hmod, "RegisterTypeLibForUser"); + pUnRegisterTypeLibForUser = (void *)GetProcAddress(hmod, "UnRegisterTypeLibForUser"); +} + static void ref_count_test(LPCWSTR type_lib) { ITypeLib *iface; @@ -2173,7 +2184,7 @@ static void test_create_typelibs(void) } -static void test_register_typelib(void) +static void test_register_typelib(BOOL system_registration) { HRESULT hr; WCHAR filename[MAX_PATH]; @@ -2203,13 +2214,32 @@ static void test_register_typelib(void) { TKIND_DISPATCH, TYPEFLAG_FDISPATCHABLE } }; + trace("Starting %s typelib registration tests\n", + system_registration ? "system" : "user"); + + if (!system_registration && (!pRegisterTypeLibForUser || !pUnRegisterTypeLibForUser)) + { + win_skip("User typelib registration functions are not available\n"); + return; + } + filenameA = create_test_typelib(3); MultiByteToWideChar(CP_ACP, 0, filenameA, -1, filename, MAX_PATH); hr = LoadTypeLibEx(filename, REGKIND_NONE, &typelib); ok(SUCCEEDED(hr), "got %08x\n", hr); - hr = RegisterTypeLib(typelib, filename, NULL); + if (system_registration) + hr = RegisterTypeLib(typelib, filename, NULL); + else + hr = pRegisterTypeLibForUser(typelib, filename, NULL); + if (hr == TYPE_E_REGISTRYACCESS) + { + win_skip("Insufficient privileges to register typelib in the registry\n"); + ITypeLib_Release(typelib); + DeleteFileA(filenameA); + return; + } ok(SUCCEEDED(hr), "got %08x\n", hr); count = ITypeLib_GetTypeInfoCount(typelib); @@ -2272,7 +2302,10 @@ static void test_register_typelib(void) ITypeInfo_Release(typeinfo); } - hr = UnRegisterTypeLib(&LIBID_register_test, 1, 0, LOCALE_NEUTRAL, sizeof(void*) == 8 ? SYS_WIN64 : SYS_WIN32); + if (system_registration) + hr = UnRegisterTypeLib(&LIBID_register_test, 1, 0, LOCALE_NEUTRAL, sizeof(void*) == 8 ? SYS_WIN64 : SYS_WIN32); + else + hr = pUnRegisterTypeLibForUser(&LIBID_register_test, 1, 0, LOCALE_NEUTRAL, sizeof(void*) == 8 ? SYS_WIN64 : SYS_WIN32); ok(SUCCEEDED(hr), "got %08x\n", hr); ITypeLib_Release(typelib); @@ -2283,6 +2316,8 @@ START_TEST(typelib) { const char *filename; + init_function_pointers(); + ref_count_test(wszStdOle2); test_TypeComp(); test_CreateDispTypeInfo(); @@ -2297,7 +2332,8 @@ START_TEST(typelib) DeleteFile( filename ); } - test_register_typelib(); + test_register_typelib(TRUE); + test_register_typelib(FALSE); test_create_typelibs(); }

1 0

Andrew Nguyen : oleaut32: Partially implement RegisterTypeLibForUser.
by Alexandre Julliard July 30, 2010

July 30, 2010

Module: wine Branch: master Commit: f4fa417be95f584863c64fc886cb027d84f7496e URL: http://source.winehq.org/git/wine.git/?a=commit;h=f4fa417be95f584863c64fc88… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Fri Jul 30 07:43:50 2010 -0500 oleaut32: Partially implement RegisterTypeLibForUser. --- dlls/oleaut32/oleaut32.spec | 1 + dlls/oleaut32/typelib.c | 23 +++++++++++++++++++++++ include/oleauto.h | 1 + 3 files changed, 25 insertions(+), 0 deletions(-) diff --git a/dlls/oleaut32/oleaut32.spec b/dlls/oleaut32/oleaut32.spec index 7b764ef..239b022 100644 --- a/dlls/oleaut32/oleaut32.spec +++ b/dlls/oleaut32/oleaut32.spec @@ -410,6 +410,7 @@ 439 stdcall VarUI8FromUI2(long ptr) 440 stdcall VarUI8FromUI4(long ptr) 441 stdcall VarUI8FromDec(long ptr) +442 stdcall RegisterTypeLibForUser(ptr wstr wstr) @ stdcall -private DllCanUnloadNow() @ stdcall -private DllGetClassObject(ptr ptr ptr) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 81d0ae0..e168953 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -903,6 +903,29 @@ end: return result; } +/****************************************************************************** + * RegisterTypeLibForUser [OLEAUT32.442] + * Adds information about a type library to the user registry + * NOTES + * Docs: ITypeLib FAR * ptlib + * Docs: OLECHAR FAR* szFullPath + * Docs: OLECHAR FAR* szHelpDir + * + * RETURNS + * Success: S_OK + * Failure: Status + */ +HRESULT WINAPI RegisterTypeLibForUser( + ITypeLib * ptlib, /* [in] Pointer to the library*/ + OLECHAR * szFullPath, /* [in] full Path of the library*/ + OLECHAR * szHelpDir) /* [in] dir to the helpfile for the library, + may be NULL*/ +{ + FIXME("(%p, %s, %s) registering the typelib system-wide\n", ptlib, + debugstr_w(szFullPath), debugstr_w(szHelpDir)); + return RegisterTypeLib(ptlib, szFullPath, szHelpDir); +} + /*======================= ITypeLib implementation =======================*/ typedef struct tagTLBCustData diff --git a/include/oleauto.h b/include/oleauto.h index 98e8dbf..573f5cc 100644 --- a/include/oleauto.h +++ b/include/oleauto.h @@ -750,6 +750,7 @@ HRESULT WINAPI LoadTypeLibEx(LPCOLESTR,REGKIND,ITypeLib**); HRESULT WINAPI QueryPathOfRegTypeLib(REFGUID,WORD,WORD,LCID,LPBSTR); HRESULT WINAPI RegisterTypeLib(ITypeLib*,OLECHAR*,OLECHAR*); HRESULT WINAPI UnRegisterTypeLib(REFGUID,WORD,WORD,LCID,SYSKIND); +HRESULT WINAPI RegisterTypeLibForUser(ITypeLib*,OLECHAR*,OLECHAR*); VOID WINAPI ClearCustData(LPCUSTDATA);

1 0

Andrew Nguyen : comdlg32: Avoid a NULL dereference when changing the file type selection of a Unicode Win3 .1-style dialog.
by Alexandre Julliard July 30, 2010

July 30, 2010

Module: wine Branch: master Commit: 10356abd8ae768357209b5dcee20933ec398e8d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=10356abd8ae768357209b5dce… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Fri Jul 30 07:43:24 2010 -0500 comdlg32: Avoid a NULL dereference when changing the file type selection of a Unicode Win3.1-style dialog. --- dlls/comdlg32/filedlg31.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/comdlg32/filedlg31.c b/dlls/comdlg32/filedlg31.c index fd2ef36..89ef0e3 100644 --- a/dlls/comdlg32/filedlg31.c +++ b/dlls/comdlg32/filedlg31.c @@ -630,7 +630,8 @@ static LRESULT FD31_FileTypeChange( const FD31_DATA *lfs ) if (lRet == LB_ERR) return TRUE; lfs->ofnW->nFilterIndex = lRet + 1; - lfs->ofnA->nFilterIndex = lRet + 1; + if (lfs->ofnA) + lfs->ofnA->nFilterIndex = lRet + 1; pstr = (LPWSTR)SendDlgItemMessageW(lfs->hwnd, cmb1, CB_GETITEMDATA, lRet, 0); TRACE("Selected filter : %s\n", debugstr_w(pstr));

1 0

Andrew Nguyen : oleaut32: Partially implement UnRegisterTypeLibForUser.
by Alexandre Julliard July 30, 2010

July 30, 2010

Module: wine Branch: master Commit: f2610a61093a8fb0b75ee043a524f07a1418c249 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f2610a61093a8fb0b75ee043a… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Fri Jul 30 07:44:05 2010 -0500 oleaut32: Partially implement UnRegisterTypeLibForUser. --- dlls/oleaut32/oleaut32.spec | 1 + dlls/oleaut32/typelib.c | 20 ++++++++++++++++++++ include/oleauto.h | 1 + 3 files changed, 22 insertions(+), 0 deletions(-) diff --git a/dlls/oleaut32/oleaut32.spec b/dlls/oleaut32/oleaut32.spec index 239b022..a86486f 100644 --- a/dlls/oleaut32/oleaut32.spec +++ b/dlls/oleaut32/oleaut32.spec @@ -411,6 +411,7 @@ 440 stdcall VarUI8FromUI4(long ptr) 441 stdcall VarUI8FromDec(long ptr) 442 stdcall RegisterTypeLibForUser(ptr wstr wstr) +443 stdcall UnRegisterTypeLibForUser(ptr long long long long) @ stdcall -private DllCanUnloadNow() @ stdcall -private DllGetClassObject(ptr ptr ptr) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index e168953..46c0d28 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -926,6 +926,26 @@ HRESULT WINAPI RegisterTypeLibForUser( return RegisterTypeLib(ptlib, szFullPath, szHelpDir); } +/****************************************************************************** + * UnRegisterTypeLibForUser [OLEAUT32.443] + * Removes information about a type library from the user registry + * + * RETURNS + * Success: S_OK + * Failure: Status + */ +HRESULT WINAPI UnRegisterTypeLibForUser( + REFGUID libid, /* [in] GUID of the library */ + WORD wVerMajor, /* [in] major version */ + WORD wVerMinor, /* [in] minor version */ + LCID lcid, /* [in] locale id */ + SYSKIND syskind) +{ + FIXME("(%s, %u, %u, %u, %u) unregistering the typelib system-wide\n", + debugstr_guid(libid), wVerMajor, wVerMinor, lcid, syskind); + return UnRegisterTypeLib(libid, wVerMajor, wVerMinor, lcid, syskind); +} + /*======================= ITypeLib implementation =======================*/ typedef struct tagTLBCustData diff --git a/include/oleauto.h b/include/oleauto.h index 573f5cc..f9862e7 100644 --- a/include/oleauto.h +++ b/include/oleauto.h @@ -751,6 +751,7 @@ HRESULT WINAPI QueryPathOfRegTypeLib(REFGUID,WORD,WORD,LCID,LPBSTR); HRESULT WINAPI RegisterTypeLib(ITypeLib*,OLECHAR*,OLECHAR*); HRESULT WINAPI UnRegisterTypeLib(REFGUID,WORD,WORD,LCID,SYSKIND); HRESULT WINAPI RegisterTypeLibForUser(ITypeLib*,OLECHAR*,OLECHAR*); +HRESULT WINAPI UnRegisterTypeLibForUser(REFGUID,WORD,WORD,LCID,SYSKIND); VOID WINAPI ClearCustData(LPCUSTDATA);

1 0

Jacek Caban : mshtml: Pass processed URI to NewURI.
by Alexandre Julliard July 30, 2010

July 30, 2010

Module: wine Branch: master Commit: a0af1dc4cf23baf1270a144b51bc5b1b7cae7aa3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a0af1dc4cf23baf1270a144b5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jul 30 15:37:26 2010 +0200 mshtml: Pass processed URI to NewURI. --- dlls/mshtml/nsio.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index d9e822d..9129a55 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -2488,7 +2488,7 @@ static nsresult NSAPI nsIOService_NewURI(nsIIOService *iface, const nsACString * } nsACString_InitDepend(&spec_str, spec); - nsres = nsIIOService_NewURI(nsio, aSpec, aOriginCharset, aBaseURI, &uri); + nsres = nsIIOService_NewURI(nsio, &spec_str, aOriginCharset, aBaseURI, &uri); nsACString_Finish(&spec_str); if(NS_FAILED(nsres)) TRACE("NewURI failed: %08x\n", nsres);

1 0