February 2008 - Wine-Commits

Hans Leidekker : mscms: Implement AssociateColorProfileWithDevice and DisassociateColorProfileFromDevice .
by Alexandre Julliard Feb. 25, 2008

Feb. 25, 2008

Module: wine Branch: master Commit: 88ba6a66584c0270a02dd0690f2c5f02e17b5e6c URL: http://source.winehq.org/git/wine.git/?a=commit;h=88ba6a66584c0270a02dd0690… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Fri Feb 22 14:24:46 2008 +0100 mscms: Implement AssociateColorProfileWithDevice and DisassociateColorProfileFromDevice. --- dlls/mscms/Makefile.in | 2 +- dlls/mscms/profile.c | 168 +++++++++++++++++++++++++++++++++++++++++++++++- dlls/mscms/stub.c | 28 -------- 3 files changed, 168 insertions(+), 30 deletions(-) diff --git a/dlls/mscms/Makefile.in b/dlls/mscms/Makefile.in index e59ec6c..19bf1f8 100644 --- a/dlls/mscms/Makefile.in +++ b/dlls/mscms/Makefile.in @@ -4,7 +4,7 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = mscms.dll IMPORTLIB = libmscms.$(IMPLIBEXT) -IMPORTS = kernel32 +IMPORTS = advapi32 kernel32 EXTRALIBS = @LCMSLIBS@ C_SRCS = \ diff --git a/dlls/mscms/profile.c b/dlls/mscms/profile.c index 3f0a50d..d7e8c76 100644 --- a/dlls/mscms/profile.c +++ b/dlls/mscms/profile.c @@ -1,7 +1,7 @@ /* * MSCMS - Color Management System for Wine * - * Copyright 2004, 2005, 2006 Hans Leidekker + * Copyright 2004, 2005, 2006, 2008 Hans Leidekker * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -20,6 +20,7 @@ #include "config.h" #include "wine/debug.h" +#include "wine/unicode.h" #include <stdarg.h> @@ -28,6 +29,7 @@ #include "winnls.h" #include "wingdi.h" #include "winuser.h" +#include "winreg.h" #include "icm.h" #include "mscms_priv.h" @@ -63,6 +65,170 @@ static const char *MSCMS_dbgstr_tag( DWORD tag ) WINE_DEFAULT_DEBUG_CHANNEL(mscms); /****************************************************************************** + * AssociateColorProfileWithDeviceA [MSCMS.@] + */ +BOOL WINAPI AssociateColorProfileWithDeviceA( PCSTR machine, PCSTR profile, PCSTR device ) +{ + int len; + BOOL ret = FALSE; + WCHAR *profileW, *deviceW; + + TRACE( "( %s, %s, %s )\n", debugstr_a(machine), debugstr_a(profile), debugstr_a(device) ); + + if (!profile || !device) + { + SetLastError( ERROR_INVALID_PARAMETER ); + return FALSE; + } + if (machine) + { + SetLastError( ERROR_NOT_SUPPORTED ); + return FALSE; + } + + len = MultiByteToWideChar( CP_ACP, 0, profile, -1, NULL, 0 ); + if (!(profileW = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) ))) return FALSE; + + MultiByteToWideChar( CP_ACP, 0, profile, -1, profileW, len ); + + len = MultiByteToWideChar( CP_ACP, 0, device, -1, NULL, 0 ); + if ((deviceW = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) ))) + { + MultiByteToWideChar( CP_ACP, 0, device, -1, deviceW, len ); + ret = AssociateColorProfileWithDeviceW( NULL, profileW, deviceW ); + } + + HeapFree( GetProcessHeap(), 0, profileW ); + HeapFree( GetProcessHeap(), 0, deviceW ); + return ret; +} + +static BOOL set_profile_device_key( PCWSTR file, const BYTE *value, DWORD size ) +{ + static const WCHAR fmtW[] = {'%','c','%','c','%','c','%','c',0}; + static const WCHAR icmW[] = {'S','o','f','t','w','a','r','e','\\', + 'M','i','c','r','o','s','o','f','t','\\', + 'W','i','n','d','o','w','s',' ','N','T','\\', + 'C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\', + 'I','C','M',0}; + PROFILEHEADER header; + PROFILE profile; + HPROFILE handle; + HKEY icm_key, class_key; + WCHAR basenameW[MAX_PATH], classW[5]; + + profile.dwType = PROFILE_FILENAME; + profile.pProfileData = (PVOID)file; + profile.cbDataSize = (lstrlenW( file ) + 1) * sizeof(WCHAR); + + /* FIXME is the profile installed? */ + if (!(handle = OpenColorProfileW( &profile, PROFILE_READ, 0, OPEN_EXISTING ))) + { + SetLastError( ERROR_INVALID_PROFILE ); + return FALSE; + } + + RegCreateKeyExW( HKEY_LOCAL_MACHINE, icmW, 0, NULL, 0, KEY_ALL_ACCESS, NULL, &icm_key, NULL ); + GetColorProfileHeader( handle, &header ); + + MSCMS_basename( file, basenameW ); + sprintfW( classW, fmtW, (header.phClass >> 24) & 0xff, (header.phClass >> 16) & 0xff, + (header.phClass >> 8) & 0xff, header.phClass & 0xff ); + + RegCreateKeyExW( icm_key, classW, 0, NULL, 0, KEY_ALL_ACCESS, NULL, &class_key, NULL ); + if (value) RegSetValueExW( class_key, basenameW, 0, REG_BINARY, value, size ); + else RegDeleteValueW( class_key, basenameW ); + + RegCloseKey( class_key ); + RegCloseKey( icm_key ); + CloseColorProfile( handle ); + return TRUE; +} + +/****************************************************************************** + * AssociateColorProfileWithDeviceW [MSCMS.@] + */ +BOOL WINAPI AssociateColorProfileWithDeviceW( PCWSTR machine, PCWSTR profile, PCWSTR device ) +{ + static const BYTE dummy_value[12]; + + TRACE( "( %s, %s, %s )\n", debugstr_w(machine), debugstr_w(profile), debugstr_w(device) ); + + if (!profile || !device) + { + SetLastError( ERROR_INVALID_PARAMETER ); + return FALSE; + } + if (machine) + { + SetLastError( ERROR_NOT_SUPPORTED ); + return FALSE; + } + + return set_profile_device_key( profile, dummy_value, sizeof(dummy_value) ); +} + +/****************************************************************************** + * DisassociateColorProfileFromDeviceA [MSCMS.@] + */ +BOOL WINAPI DisassociateColorProfileFromDeviceA( PCSTR machine, PCSTR profile, PCSTR device ) +{ + int len; + BOOL ret = FALSE; + WCHAR *profileW, *deviceW; + + TRACE( "( %s, %s, %s )\n", debugstr_a(machine), debugstr_a(profile), debugstr_a(device) ); + + if (!profile || !device) + { + SetLastError( ERROR_INVALID_PARAMETER ); + return FALSE; + } + if (machine) + { + SetLastError( ERROR_NOT_SUPPORTED ); + return FALSE; + } + + len = MultiByteToWideChar( CP_ACP, 0, profile, -1, NULL, 0 ); + if (!(profileW = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) ))) return FALSE; + + MultiByteToWideChar( CP_ACP, 0, profile, -1, profileW, len ); + + len = MultiByteToWideChar( CP_ACP, 0, device, -1, NULL, 0 ); + if ((deviceW = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) ))) + { + MultiByteToWideChar( CP_ACP, 0, device, -1, deviceW, len ); + ret = DisassociateColorProfileFromDeviceW( NULL, profileW, deviceW ); + } + + HeapFree( GetProcessHeap(), 0, profileW ); + HeapFree( GetProcessHeap(), 0, deviceW ); + return ret; +} + +/****************************************************************************** + * DisassociateColorProfileFromDeviceW [MSCMS.@] + */ +BOOL WINAPI DisassociateColorProfileFromDeviceW( PCWSTR machine, PCWSTR profile, PCWSTR device ) +{ + TRACE( "( %s, %s, %s )\n", debugstr_w(machine), debugstr_w(profile), debugstr_w(device) ); + + if (!profile || !device) + { + SetLastError( ERROR_INVALID_PARAMETER ); + return FALSE; + } + if (machine) + { + SetLastError( ERROR_NOT_SUPPORTED ); + return FALSE; + } + + return set_profile_device_key( profile, NULL, 0 ); +} + +/****************************************************************************** * GetColorDirectoryA [MSCMS.@] * * See GetColorDirectoryW. diff --git a/dlls/mscms/stub.c b/dlls/mscms/stub.c index 4d7a6d1..0e5f443 100644 --- a/dlls/mscms/stub.c +++ b/dlls/mscms/stub.c @@ -31,20 +31,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(mscms); -BOOL WINAPI AssociateColorProfileWithDeviceA( PCSTR machine, PCSTR profile, PCSTR device ) -{ - FIXME( "( %p, %p, %p ) stub\n", machine, profile, device ); - - return TRUE; -} - -BOOL WINAPI AssociateColorProfileWithDeviceW( PCWSTR machine, PCWSTR profile, PCWSTR device ) -{ - FIXME( "( %p, %p, %p ) stub\n", machine, profile, device ); - - return TRUE; -} - BOOL WINAPI CheckBitmapBits( HTRANSFORM transform, PVOID srcbits, BMFORMAT format, DWORD width, DWORD height, DWORD stride, PBYTE result, PBMCALLBACKFN callback, LPARAM data ) @@ -100,20 +86,6 @@ BOOL WINAPI CreateProfileFromLogColorSpaceW( LPLOGCOLORSPACEW space, PBYTE *buff return FALSE; } -BOOL WINAPI DisassociateColorProfileFromDeviceA( PCSTR machine, PCSTR profile, PCSTR device ) -{ - FIXME( "( %p, %p, %p ) stub\n", machine, profile, device ); - - return TRUE; -} - -BOOL WINAPI DisassociateColorProfileFromDeviceW( PCWSTR machine, PCWSTR profile, PCWSTR device ) -{ - FIXME( "( %p, %p, %p ) stub\n", machine, profile, device ); - - return TRUE; -} - DWORD WINAPI GenerateCopyFilePaths( LPCWSTR printer, LPCWSTR directory, LPBYTE clientinfo, DWORD level, LPWSTR sourcedir, LPDWORD sourcedirsize, LPWSTR targetdir, LPDWORD targetdirsize, DWORD flags )

1 0

Gerald Pfeifer : widl: Include <unistd.h> for prototype of unlink().
by Alexandre Julliard Feb. 25, 2008

Feb. 25, 2008

Module: wine Branch: master Commit: 92015ee4ed4185996cf8889b9d47134815a8443a URL: http://source.winehq.org/git/wine.git/?a=commit;h=92015ee4ed4185996cf8889b9… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Fri Feb 22 11:24:27 2008 +0100 widl: Include <unistd.h> for prototype of unlink(). --- tools/widl/parser.l | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/tools/widl/parser.l b/tools/widl/parser.l index af9445b..94eec0d 100644 --- a/tools/widl/parser.l +++ b/tools/widl/parser.l @@ -45,7 +45,9 @@ double [0-9]+\.[0-9]+([eE][+-]?[0-9]+)* #include <ctype.h> #include <assert.h> -#ifndef HAVE_UNISTD_H +#ifdef HAVE_UNISTD_H +#include <unistd.h> +#else #define YY_NO_UNISTD_H #endif

1 0

Jacek Caban : shdocvw: Added WebBrowser::TheaterMode implementation.
by Alexandre Julliard Feb. 25, 2008

Feb. 25, 2008

Module: wine Branch: master Commit: 71d07da2d30201b03903acbe89eb45d8b9554a52 URL: http://source.winehq.org/git/wine.git/?a=commit;h=71d07da2d30201b03903acbe8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Feb 22 11:34:06 2008 +0100 shdocvw: Added WebBrowser::TheaterMode implementation. --- dlls/shdocvw/shdocvw.h | 1 + dlls/shdocvw/tests/webbrowser.c | 35 +++++++++++++++++++++++++++++++++++ dlls/shdocvw/webbrowser.c | 25 +++++++++++++++++++++---- 3 files changed, 57 insertions(+), 4 deletions(-) diff --git a/dlls/shdocvw/shdocvw.h b/dlls/shdocvw/shdocvw.h index bc4c2a1..af647a1 100644 --- a/dlls/shdocvw/shdocvw.h +++ b/dlls/shdocvw/shdocvw.h @@ -144,6 +144,7 @@ struct WebBrowser { VARIANT_BOOL status_bar; VARIANT_BOOL tool_bar; VARIANT_BOOL full_screen; + VARIANT_BOOL theater_mode; DocHost doc_host; }; diff --git a/dlls/shdocvw/tests/webbrowser.c b/dlls/shdocvw/tests/webbrowser.c index 1ec3de3..0f337ed 100644 --- a/dlls/shdocvw/tests/webbrowser.c +++ b/dlls/shdocvw/tests/webbrowser.c @@ -89,6 +89,7 @@ DEFINE_EXPECT(Invoke_ONADDRESSBAR); DEFINE_EXPECT(Invoke_ONSTATUSBAR); DEFINE_EXPECT(Invoke_ONTOOLBAR); DEFINE_EXPECT(Invoke_ONFULLSCREEN); +DEFINE_EXPECT(Invoke_ONTHEATERMODE); DEFINE_EXPECT(Invoke_WINDOWSETRESIZABLE); DEFINE_EXPECT(EnableModeless_TRUE); DEFINE_EXPECT(EnableModeless_FALSE); @@ -620,6 +621,11 @@ static HRESULT WINAPI WebBrowserEvents2_Invoke(IDispatch *iface, DISPID dispIdMe test_invoke_bool(pDispParams); break; + case DISPID_ONTHEATERMODE: + CHECK_EXPECT(Invoke_ONTHEATERMODE); + test_invoke_bool(pDispParams); + break; + case DISPID_WINDOWSETRESIZABLE: CHECK_EXPECT(Invoke_WINDOWSETRESIZABLE); test_invoke_bool(pDispParams); @@ -1575,6 +1581,35 @@ static void test_ie_funcs(IUnknown *unk) ok(hres == S_OK, "put_FullScreen failed: %08x\n", hres); CHECK_CALLED(Invoke_ONFULLSCREEN); + /* TheaterMode */ + + hres = IWebBrowser2_get_TheaterMode(wb, &b); + ok(hres == S_OK, "get_TheaterMode failed: %08x\n", hres); + ok(b == VARIANT_FALSE, "b=%x\n", b); + + SET_EXPECT(Invoke_ONTHEATERMODE); + hres = IWebBrowser2_put_TheaterMode(wb, (exvb = VARIANT_TRUE)); + ok(hres == S_OK, "put_TheaterMode failed: %08x\n", hres); + CHECK_CALLED(Invoke_ONTHEATERMODE); + + hres = IWebBrowser2_get_TheaterMode(wb, &b); + ok(hres == S_OK, "get_TheaterMode failed: %08x\n", hres); + ok(b == VARIANT_TRUE, "b=%x\n", b); + + SET_EXPECT(Invoke_ONTHEATERMODE); + hres = IWebBrowser2_put_TheaterMode(wb, (exvb = 100)); + ok(hres == S_OK, "put_TheaterMode failed: %08x\n", hres); + CHECK_CALLED(Invoke_ONTHEATERMODE); + + hres = IWebBrowser2_get_TheaterMode(wb, &b); + ok(hres == S_OK, "get_TheaterMode failed: %08x\n", hres); + ok(b == VARIANT_TRUE, "b=%x\n", b); + + SET_EXPECT(Invoke_ONTHEATERMODE); + hres = IWebBrowser2_put_TheaterMode(wb, (exvb = VARIANT_FALSE)); + ok(hres == S_OK, "put_TheaterMode failed: %08x\n", hres); + CHECK_CALLED(Invoke_ONTHEATERMODE); + /* Resizable */ b = 0x100; diff --git a/dlls/shdocvw/webbrowser.c b/dlls/shdocvw/webbrowser.c index 2c4d36d..95586f0 100644 --- a/dlls/shdocvw/webbrowser.c +++ b/dlls/shdocvw/webbrowser.c @@ -817,15 +817,31 @@ static HRESULT WINAPI WebBrowser_put_RegisterAsDropTarget(IWebBrowser2 *iface, static HRESULT WINAPI WebBrowser_get_TheaterMode(IWebBrowser2 *iface, VARIANT_BOOL *pbRegister) { WebBrowser *This = WEBBROWSER_THIS(iface); - FIXME("(%p)->(%p)\n", This, pbRegister); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, pbRegister); + + *pbRegister = This->theater_mode; + return S_OK; } static HRESULT WINAPI WebBrowser_put_TheaterMode(IWebBrowser2 *iface, VARIANT_BOOL bRegister) { WebBrowser *This = WEBBROWSER_THIS(iface); - FIXME("(%p)->(%x)\n", This, bRegister); - return E_NOTIMPL; + VARIANTARG arg; + DISPPARAMS dispparams = {&arg, NULL, 1, 0}; + + TRACE("(%p)->(%x)\n", This, bRegister); + + This->theater_mode = bRegister ? VARIANT_TRUE : VARIANT_FALSE; + + /* In opposition to InternetExplorer, all we should do here is + * inform the embedder about the theater mode change. */ + + V_VT(&arg) = VT_BOOL; + V_BOOL(&arg) = bRegister; + call_sink(This->doc_host.cps.wbe2, DISPID_ONTHEATERMODE, &dispparams); + + return S_OK; } static HRESULT WINAPI WebBrowser_get_AddressBar(IWebBrowser2 *iface, VARIANT_BOOL *Value) @@ -984,6 +1000,7 @@ static HRESULT WebBrowser_Create(INT version, IUnknown *pOuter, REFIID riid, voi ret->status_bar = VARIANT_TRUE; ret->tool_bar = VARIANT_TRUE; ret->full_screen = VARIANT_FALSE; + ret->theater_mode = VARIANT_FALSE; WebBrowser_OleObject_Init(ret); WebBrowser_ViewObject_Init(ret);

1 0

Jacek Caban : shdocvw: Silence more invalid QueryInterface FIXMEs.
by Alexandre Julliard Feb. 25, 2008

Feb. 25, 2008

Module: wine Branch: master Commit: 89069761ba647f02bf451bce31c345ec7534cd6c URL: http://source.winehq.org/git/wine.git/?a=commit;h=89069761ba647f02bf451bce3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Feb 22 11:35:24 2008 +0100 shdocvw: Silence more invalid QueryInterface FIXMEs. --- dlls/shdocvw/tests/webbrowser.c | 14 ++++++++++++-- dlls/shdocvw/webbrowser.c | 6 ++++++ 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/dlls/shdocvw/tests/webbrowser.c b/dlls/shdocvw/tests/webbrowser.c index 2dedbf3..1ec3de3 100644 --- a/dlls/shdocvw/tests/webbrowser.c +++ b/dlls/shdocvw/tests/webbrowser.c @@ -1929,7 +1929,9 @@ static void test_QueryInterface(IUnknown *unk) IQuickActivate *qa = (IQuickActivate*)0xdeadbeef; IRunnableObject *runnable = (IRunnableObject*)0xdeadbeef; IPerPropertyBrowsing *propbrowse = (void*)0xdeadbeef; + IOleInPlaceSite *inplace = (void*)0xdeadbeef; IOleCache *cache = (void*)0xdeadbeef; + IObjectWithSite *site = (void*)0xdeadbeef; HRESULT hres; hres = IUnknown_QueryInterface(unk, &IID_IQuickActivate, (void**)&qa); @@ -1942,11 +1944,19 @@ static void test_QueryInterface(IUnknown *unk) hres = IUnknown_QueryInterface(unk, &IID_IPerPropertyBrowsing, (void**)&propbrowse); ok(hres == E_NOINTERFACE, "QueryInterface returned %08x, expected E_NOINTERFACE\n", hres); - ok(runnable == NULL, "runnable=%p, ezpected NULL\n", runnable); + ok(propbrowse == NULL, "propbrowse=%p, ezpected NULL\n", runnable); hres = IUnknown_QueryInterface(unk, &IID_IOleCache, (void**)&cache); ok(hres == E_NOINTERFACE, "QueryInterface returned %08x, expected E_NOINTERFACE\n", hres); - ok(cache == NULL, "runnable=%p, ezpected NULL\n", runnable); + ok(cache == NULL, "cache=%p, ezpected NULL\n", runnable); + + hres = IUnknown_QueryInterface(unk, &IID_IOleInPlaceSite, (void**)&inplace); + ok(hres == E_NOINTERFACE, "QueryInterface returned %08x, expected E_NOINTERFACE\n", hres); + ok(inplace == NULL, "inplace=%p, ezpected NULL\n", runnable); + + hres = IUnknown_QueryInterface(unk, &IID_IObjectWithSite, (void**)&site); + ok(hres == E_NOINTERFACE, "QueryInterface returned %08x, expected E_NOINTERFACE\n", hres); + ok(site == NULL, "inplace=%p, ezpected NULL\n", runnable); } static void test_WebBrowser(void) diff --git a/dlls/shdocvw/webbrowser.c b/dlls/shdocvw/webbrowser.c index 41617a2..2c4d36d 100644 --- a/dlls/shdocvw/webbrowser.c +++ b/dlls/shdocvw/webbrowser.c @@ -114,6 +114,12 @@ static HRESULT WINAPI WebBrowser_QueryInterface(IWebBrowser2 *iface, REFIID riid }else if(IsEqualGUID(&IID_IOleCache, riid)) { TRACE("(%p)->(IID_IOleCache %p) returning NULL\n", This, ppv); return E_NOINTERFACE; + }else if(IsEqualGUID(&IID_IOleInPlaceSite, riid)) { + TRACE("(%p)->(IID_IOleInPlaceSite %p) returning NULL\n", This, ppv); + return E_NOINTERFACE; + }else if(IsEqualGUID(&IID_IObjectWithSite, riid)) { + TRACE("(%p)->(IID_IObjectWithSite %p) returning NULL\n", This, ppv); + return E_NOINTERFACE; } if(*ppv) {

1 0

Jacek Caban : shdocvw: Added get_LocationURL implementation.
by Alexandre Julliard Feb. 25, 2008

Feb. 25, 2008

Module: wine Branch: master Commit: 20163e034a45eaf1327fc7f0f2e0f2a5d6ca0926 URL: http://source.winehq.org/git/wine.git/?a=commit;h=20163e034a45eaf1327fc7f0f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Feb 22 11:33:49 2008 +0100 shdocvw: Added get_LocationURL implementation. --- dlls/shdocvw/tests/webbrowser.c | 24 ++++++++++++++++++++++++ 1 files changed, 24 insertions(+), 0 deletions(-) diff --git a/dlls/shdocvw/tests/webbrowser.c b/dlls/shdocvw/tests/webbrowser.c index 80c09f2..2dedbf3 100644 --- a/dlls/shdocvw/tests/webbrowser.c +++ b/dlls/shdocvw/tests/webbrowser.c @@ -105,6 +105,7 @@ DEFINE_EXPECT(QueryStatus_SETPROGRESSTEXT); static const WCHAR wszItem[] = {'i','t','e','m',0}; static const WCHAR about_blankW[] = {'a','b','o','u','t',':','b','l','a','n','k',0}; +static const WCHAR emptyW[] = {0}; static VARIANT_BOOL exvb; static IWebBrowser2 *wb; @@ -132,6 +133,26 @@ static const char *debugstr_guid(REFIID riid) return buf; } +#define test_LocationURL(a,b) _test_LocationURL(__LINE__,a,b) +static void _test_LocationURL(unsigned line, IUnknown *unk, LPCWSTR exurl) +{ + IWebBrowser2 *wb; + BSTR url = (void*)0xdeadbeef; + HRESULT hres; + + hres = IUnknown_QueryInterface(unk, &IID_IWebBrowser2, (void**)&wb); + ok(hres == S_OK, "Could not get IWebBrowser2 interface: %08x\n", hres); + if(FAILED(hres)) + return; + + hres = IWebBrowser2_get_LocationURL(wb, &url); + ok_(__FILE__,line) (hres == (*exurl ? S_OK : S_FALSE), "get_LocationURL failed: %08x\n", hres); + ok_(__FILE__,line) (!lstrcmpW(url, exurl), "unexpected URL: %s\n", debugstr_w(url)); + + SysFreeString(url); + IWebBrowser2_Release(wb); +} + static HRESULT QueryInterface(REFIID,void**); static HRESULT WINAPI OleCommandTarget_QueryInterface(IOleCommandTarget *iface, @@ -1845,6 +1866,8 @@ static void test_Navigate2(IUnknown *unk) if(FAILED(hres)) return; + test_LocationURL(unk, emptyW); + V_VT(&url) = VT_BSTR; V_BSTR(&url) = SysAllocString(about_blankW); @@ -1943,6 +1966,7 @@ static void test_WebBrowser(void) test_QueryInterface(unk); test_ClassInfo(unk); + test_LocationURL(unk, emptyW); test_ConnectionPoint(unk, TRUE); test_ClientSite(unk, &ClientSite); test_Extent(unk);

1 0

Jeremy Newman : add new Wine Forums link to WineHQ menu
by Jeremy Newman Feb. 22, 2008

Feb. 22, 2008

Module: website Branch: master Commit: 8b67f6c5592f746bfbe39d2c3e7caf97ffd08bd1 URL: http://source.winehq.org/git/website.git/?a=commit;h=8b67f6c5592f746bfbe39d… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Fri Feb 22 14:47:45 2008 -0600 add new Wine Forums link to WineHQ menu remove forum wording from Mailing list link --- include/config.php | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/include/config.php b/include/config.php index ccdc9fb..6cb0f0c 100644 --- a/include/config.php +++ b/include/config.php @@ -37,6 +37,7 @@ class config 'AppDB' => 'http://appdb.winehq.org', 'Bugzilla' => 'http://bugs.winehq.org/', 'Wine Wiki' => 'http://wiki.winehq.org', + 'Wine Forums' => 'http://forum.winehq.org/' ), 'About' => array( 'About' => '{$root}/site/about', @@ -63,7 +64,7 @@ class config 'Development' => array( 'Development' => '{$root}/site/development', 'Developers Guide' => '{$root}/site/docs/winedev-guide/index', - 'Mailing Lists/Forums' => '{$root}/site/forums', + 'Mailing Lists' => '{$root}/site/forums', 'GIT' => '{$root}/site/git', 'Sending Patches' => '{$root}/site/sending_patches', 'To Do Lists' => 'http://wiki.winehq.org/TodoList',

1 0

Jeremy Newman : disable fuzzy search for the time being as the query might be causing issues with mysql
by Jeremy Newman Feb. 22, 2008

Feb. 22, 2008

Module: appdb Branch: master Commit: 42bb1eb9ea8d798c95dfcd46407c8b390837ec64 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=42bb1eb9ea8d798c95dfcd46… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Fri Feb 22 14:35:54 2008 -0600 disable fuzzy search for the time being as the query might be causing issues with mysql Patch Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> --- include/application_queue.php | 2 - include/util.php | 67 ----------------------------------------- 2 files changed, 0 insertions(+), 69 deletions(-) diff --git a/include/application_queue.php b/include/application_queue.php index 5727a28..4a4d4bf 100644 --- a/include/application_queue.php +++ b/include/application_queue.php @@ -278,8 +278,6 @@ class application_queue { echo "Like matches\n"; $this->displayDuplicateTable(searchForApplication($this->oApp->sName)); - echo " Fuzzy matches\n"; - $this->displayDuplicateTable(searchForApplicationFuzzy($this->oApp->sName, 60)); } function displayDuplicateTable($hResult) diff --git a/include/util.php b/include/util.php index 0822b3c..94da5f2 100644 --- a/include/util.php +++ b/include/util.php @@ -441,68 +441,6 @@ function searchForApplication($search_words) return $hResult; } -function searchForApplicationFuzzy($search_words, $minMatchingPercent) -{ - /* cleanup search words */ - $search_words = cleanupSearchWords($search_words); - - $foundAValue = false; - $excludeAppIdArray = array(); - $appIdArray = array(); - - /* add on all of the like matches that we can find */ - $hResult = searchForApplication($search_words); - while($oRow = query_fetch_object($hResult)) - { - array_push($excludeAppIdArray, $oRow->appId); - } - - /* add on all of the fuzzy matches we can find */ - $sQuery = "SELECT appName, appId FROM appFamily WHERE state = 'accepted'"; - foreach ($excludeAppIdArray as $key=>$value) - { - $sQuery.=" AND appId != '".query_escape_string($value)."'"; - } - $sQuery.=";"; - - /* capitalize the search words */ - $search_words = strtoupper($search_words); - - $hResult = query_appdb($sQuery); - while($oRow = query_fetch_object($hResult)) - { - $oRow->appName = strtoupper($oRow->appName); /* convert the appname to upper case */ - similar_text($oRow->appName, $search_words, $similarity_pst); - if(number_format($similarity_pst, 0) > $minMatchingPercent) - { - $foundAValue = true; - array_push($appIdArray, $oRow->appId); - } - } - - if($foundAValue == false) - return null; - - $sQuery = "SELECT * from appFamily WHERE "; - - $firstEntry = true; - foreach ($appIdArray as $key=>$value) - { - if($firstEntry == true) - { - $sQuery.="appId='".query_escape_string($value)."'"; - $firstEntry = false; - } else - { - $sQuery.=" OR appId='".query_escape_string($value)."'"; - } - } - $sQuery.=" ORDER BY appName;"; - - $hResult = query_appdb($sQuery); - return $hResult; -} - function outputSearchTableForhResult($search_words, $hResult) { if(($hResult == null) || (query_num_rows($hResult) == 0)) @@ -584,11 +522,6 @@ function perform_search_and_output_results($search_words) echo "<center>Like matches</center>"; $hResult = searchForApplication($search_words); outputSearchTableForhResult($search_words, $hResult); - - $minMatchingPercent = 60; - echo "<center>Fuzzy matches - minimum ".$minMatchingPercent."% match</center>"; - $hResult = searchForApplicationFuzzy($search_words, $minMatchingPercent); - outputSearchTableForhResult($search_words, $hResult); } function display_page_range($iCurrentPage=1, $iPageRange=1, $iTotalPages=1, $sLinkurl=NULL)

1 0

Alexandre Julliard : Wine release 0.9.56
by Alexandre Julliard Feb. 22, 2008

Feb. 22, 2008

Module: website Branch: master Commit: b70a590681d3becfa0fc6eb6cba16ffa190bfd96 URL: http://source.winehq.org/git/website.git/?a=commit;h=b70a590681d3becfa0fc6e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 22 17:15:49 2008 +0100 Wine release 0.9.56 --- news/2008022201.xml | 26 ++++++++++++++++++++++++++ 1 files changed, 26 insertions(+), 0 deletions(-) diff --git a/news/2008022201.xml b/news/2008022201.xml new file mode 100644 index 0000000..6822201 --- /dev/null +++ b/news/2008022201.xml @@ -0,0 +1,26 @@ +<news> +<date>February 22, 2008</date> +<title>Wine 0.9.56 Released</title> +<body> +Wine 0.9.56 was released today, with the following main changes: + +<ul> +<li>Proper handling of OpenGL/Direct3D windows with menu bars.</li> +<li>Stubs for all the d3dx9_xx dlls.</li> +<li>Several graphics optimizations.</li> +<li>Many installer fixes.</li> +<li>Improved MIME message support.</li> +<li>Lots of bug fixes.</li> +</ul> + + +Binary packages are in the process of being built and it may take a +few days for them to appear, but the source is +<a href="http://prdownloads.sourceforge.net/wine/wine-0.9.56.tar.bz2">available now</a>. +You can find out more about this release in the +<a href="?announce=0.9.56">announcement</a>. Check out our +<a href="/site/download">download page</a> for packages for your +distribution. + +</body> +</news>

1 0

Tag wine-0.9.56 : Alexandre Julliard : Release 0.9.56
by Alexandre Julliard Feb. 22, 2008

Feb. 22, 2008

Module: wine Branch: refs/tags/wine-0.9.56 Tag: f0cafc988825d5e1612012bd4c1503d2d1f4c84f URL: http://source.winehq.org/git/wine.git/?a=tag;h=f0cafc988825d5e1612012bd4c15… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 22 17:04:30 2008 +0100 Release 0.9.56

1 0

Alexandre Julliard : Release 0.9.56.
by Alexandre Julliard Feb. 22, 2008

Feb. 22, 2008

Module: wine Branch: master Commit: 14991a42d1d28ae114f8f06f5e3ca209aefd87a7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=14991a42d1d28ae114f8f06f5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 22 17:04:30 2008 +0100 Release 0.9.56. --- ANNOUNCE | 871 +++++++++++++++++---------- ChangeLog | 2043 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ VERSION | 2 +- configure | 18 +- 4 files changed, 2600 insertions(+), 334 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=14991a42d1d28ae114f8f…

1 0