wine-commits February 2008

wine-commits@winehq.org

3 participants
999 discussions

James Hawkins : msi: Add more tests for MsiSourceListGetInfo.
by Alexandre Julliard 25 Feb '08

25 Feb '08

Module: wine Branch: master Commit: 868de4d56b64de7ee9e84b73e9379f9eb6279016 URL: http://source.winehq.org/git/wine.git/?a=commit;h=868de4d56b64de7ee9e84b73e… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Sun Feb 24 20:02:35 2008 -0600 msi: Add more tests for MsiSourceListGetInfo. --- dlls/msi/tests/source.c | 154 ++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 153 insertions(+), 1 deletions(-) diff --git a/dlls/msi/tests/source.c b/dlls/msi/tests/source.c index b489795..4d2b925 100644 --- a/dlls/msi/tests/source.c +++ b/dlls/msi/tests/source.c @@ -160,7 +160,7 @@ static void test_MsiSourceListGetInfo(void) LPCSTR data; LONG res; UINT r; - HKEY userkey, hkey; + HKEY userkey, hkey, media; DWORD size; if (!pMsiSourceListGetInfoA) @@ -332,6 +332,158 @@ static void test_MsiSourceListGetInfo(void) ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); ok(size == 11, "Expected 11, got %d\n", size); + res = RegCreateKeyA(hkey, "Media", &media); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + + data = "path"; + res = RegSetValueExA(media, "MediaPackage", 0, REG_SZ, + (const BYTE *)data, lstrlenA(data) + 1); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + + /* INSTALLPROPERTY_MEDIAPACKAGEPATH */ + size = MAX_PATH; + r = pMsiSourceListGetInfoA(prodcode, usersid, MSIINSTALLCONTEXT_USERUNMANAGED, + MSICODE_PRODUCT, INSTALLPROPERTY_MEDIAPACKAGEPATH, + value, &size); + todo_wine + { + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + ok(!lstrcmpA(value, "path"), "Expected \"path\", got \"%s\"\n", value); + ok(size == 4, "Expected 4, got %d\n", size); + } + + /* INSTALLPROPERTY_DISKPROMPT */ + data = "prompt"; + res = RegSetValueExA(media, "DiskPrompt", 0, REG_SZ, + (const BYTE *)data, lstrlenA(data) + 1); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + + size = MAX_PATH; + r = pMsiSourceListGetInfoA(prodcode, usersid, MSIINSTALLCONTEXT_USERUNMANAGED, + MSICODE_PRODUCT, INSTALLPROPERTY_DISKPROMPT, + value, &size); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + ok(!lstrcmpA(value, "prompt"), "Expected \"prompt\", got \"%s\"\n", value); + ok(size == 6, "Expected 6, got %d\n", size); + + data = "source"; + res = RegSetValueExA(hkey, "LastUsedSource", 0, REG_SZ, + (const BYTE *)data, lstrlenA(data) + 1); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + + /* INSTALLPROPERTY_LASTUSEDSOURCE */ + size = MAX_PATH; + r = pMsiSourceListGetInfoA(prodcode, usersid, MSIINSTALLCONTEXT_USERUNMANAGED, + MSICODE_PRODUCT, INSTALLPROPERTY_LASTUSEDSOURCE, + value, &size); + todo_wine + { + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + ok(!lstrcmpA(value, "source"), "Expected \"source\", got \"%s\"\n", value); + ok(size == 6, "Expected 6, got %d\n", size); + } + + /* INSTALLPROPERTY_LASTUSEDTYPE, invalid source format */ + size = MAX_PATH; + r = pMsiSourceListGetInfoA(prodcode, usersid, MSIINSTALLCONTEXT_USERUNMANAGED, + MSICODE_PRODUCT, INSTALLPROPERTY_LASTUSEDTYPE, + value, &size); + todo_wine + { + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + ok(!lstrcmpA(value, ""), "Expected \"\", got \"%s\"\n", value); + ok(size == 0, "Expected 0, got %d\n", size); + } + + data = "x;y;z"; + res = RegSetValueExA(hkey, "LastUsedSource", 0, REG_SZ, + (const BYTE *)data, lstrlenA(data) + 1); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + + /* INSTALLPROPERTY_LASTUSEDTYPE, invalid source format */ + size = MAX_PATH; + r = pMsiSourceListGetInfoA(prodcode, usersid, MSIINSTALLCONTEXT_USERUNMANAGED, + MSICODE_PRODUCT, INSTALLPROPERTY_LASTUSEDTYPE, + value, &size); + todo_wine + { + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + ok(!lstrcmpA(value, ""), "Expected \"\", got \"%s\"\n", value); + ok(size == 0, "Expected 0, got %d\n", size); + } + + data = "n;y;z"; + res = RegSetValueExA(hkey, "LastUsedSource", 0, REG_SZ, + (const BYTE *)data, lstrlenA(data) + 1); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + + /* INSTALLPROPERTY_LASTUSEDTYPE */ + size = MAX_PATH; + r = pMsiSourceListGetInfoA(prodcode, usersid, MSIINSTALLCONTEXT_USERUNMANAGED, + MSICODE_PRODUCT, INSTALLPROPERTY_LASTUSEDTYPE, + value, &size); + todo_wine + { + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + ok(!lstrcmpA(value, "n"), "Expected \"n\", got \"%s\"\n", value); + ok(size == 1, "Expected 1, got %d\n", size); + } + + data = "negatory"; + res = RegSetValueExA(hkey, "LastUsedSource", 0, REG_SZ, + (const BYTE *)data, lstrlenA(data) + 1); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + + /* INSTALLPROPERTY_LASTUSEDTYPE */ + size = MAX_PATH; + r = pMsiSourceListGetInfoA(prodcode, usersid, MSIINSTALLCONTEXT_USERUNMANAGED, + MSICODE_PRODUCT, INSTALLPROPERTY_LASTUSEDTYPE, + value, &size); + todo_wine + { + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + ok(!lstrcmpA(value, "n"), "Expected \"n\", got \"%s\"\n", value); + ok(size == 1, "Expected 1, got %d\n", size); + } + + data = "megatron"; + res = RegSetValueExA(hkey, "LastUsedSource", 0, REG_SZ, + (const BYTE *)data, lstrlenA(data) + 1); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + + /* INSTALLPROPERTY_LASTUSEDTYPE */ + size = MAX_PATH; + r = pMsiSourceListGetInfoA(prodcode, usersid, MSIINSTALLCONTEXT_USERUNMANAGED, + MSICODE_PRODUCT, INSTALLPROPERTY_LASTUSEDTYPE, + value, &size); + todo_wine + { + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + ok(!lstrcmpA(value, "m"), "Expected \"m\", got \"%s\"\n", value); + ok(size == 1, "Expected 1, got %d\n", size); + } + + data = "useless"; + res = RegSetValueExA(hkey, "LastUsedSource", 0, REG_SZ, + (const BYTE *)data, lstrlenA(data) + 1); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + + /* INSTALLPROPERTY_LASTUSEDTYPE */ + size = MAX_PATH; + r = pMsiSourceListGetInfoA(prodcode, usersid, MSIINSTALLCONTEXT_USERUNMANAGED, + MSICODE_PRODUCT, INSTALLPROPERTY_LASTUSEDTYPE, + value, &size); + todo_wine + { + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + ok(!lstrcmpA(value, "u"), "Expected \"u\", got \"%s\"\n", value); + ok(size == 1, "Expected 1, got %d\n", size); + } + + RegDeleteValueA(media, "MediaPackage"); + RegDeleteValueA(media, "DiskPrompt"); + RegDeleteKeyA(media, ""); + RegDeleteValueA(hkey, "LastUsedSource"); RegDeleteValueA(hkey, "nonexistent"); RegDeleteValueA(hkey, "PackageName"); RegDeleteKeyA(hkey, "");

1 0

Jacek Caban : mshtml: Added IHTMLBodyElement::aLink implementation.
by Alexandre Julliard 25 Feb '08

25 Feb '08

Module: wine Branch: master Commit: 28cf008c3b580d183ef0943dff8c7392514f3795 URL: http://source.winehq.org/git/wine.git/?a=commit;h=28cf008c3b580d183ef0943df… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Feb 24 22:18:47 2008 +0100 mshtml: Added IHTMLBodyElement::aLink implementation. --- dlls/mshtml/htmlbody.c | 32 ++++++++++++++++++++++++++++---- 1 files changed, 28 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmlbody.c b/dlls/mshtml/htmlbody.c index dd2c044..6ad26ee 100644 --- a/dlls/mshtml/htmlbody.c +++ b/dlls/mshtml/htmlbody.c @@ -369,15 +369,39 @@ static HRESULT WINAPI HTMLBodyElement_get_vLink(IHTMLBodyElement *iface, VARIANT static HRESULT WINAPI HTMLBodyElement_put_aLink(IHTMLBodyElement *iface, VARIANT v) { HTMLBodyElement *This = HTMLBODY_THIS(iface); - FIXME("(%p)->()\n", This); - return E_NOTIMPL; + nsAString alink_str; + nsresult nsres; + + TRACE("(%p)->(v%d)\n", This, V_VT(&v)); + + if(!variant_to_nscolor(&v, &alink_str)) + return S_OK; + + nsres = nsIDOMHTMLBodyElement_SetALink(This->nsbody, &alink_str); + nsAString_Finish(&alink_str); + if(NS_FAILED(nsres)) + ERR("SetALink failed: %08x\n", nsres); + + return S_OK; } static HRESULT WINAPI HTMLBodyElement_get_aLink(IHTMLBodyElement *iface, VARIANT *p) { HTMLBodyElement *This = HTMLBODY_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + nsAString alink_str; + nsresult nsres; + + TRACE("(%p)->(%p)\n", This, p); + + nsAString_Init(&alink_str, NULL); + nsres = nsIDOMHTMLBodyElement_GetALink(This->nsbody, &alink_str); + if(NS_FAILED(nsres)) + ERR("GetALink failed: %08x\n", nsres); + + nscolor_to_variant(&alink_str, p); + nsAString_Finish(&alink_str); + + return S_OK; } static HRESULT WINAPI HTMLBodyElement_put_onload(IHTMLBodyElement *iface, VARIANT v)

1 0

Jacek Caban : mshtml: Added IHTMLBodyElement::vLink implementation.
by Alexandre Julliard 25 Feb '08

25 Feb '08

Module: wine Branch: master Commit: a81fb4ca0ca461ee0fe8a8a427263323ed5a98ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=a81fb4ca0ca461ee0fe8a8a42… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Feb 24 22:18:24 2008 +0100 mshtml: Added IHTMLBodyElement::vLink implementation. --- dlls/mshtml/htmlbody.c | 32 ++++++++++++++++++++++++++++---- 1 files changed, 28 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmlbody.c b/dlls/mshtml/htmlbody.c index d0ee45a..dd2c044 100644 --- a/dlls/mshtml/htmlbody.c +++ b/dlls/mshtml/htmlbody.c @@ -331,15 +331,39 @@ static HRESULT WINAPI HTMLBodyElement_get_link(IHTMLBodyElement *iface, VARIANT static HRESULT WINAPI HTMLBodyElement_put_vLink(IHTMLBodyElement *iface, VARIANT v) { HTMLBodyElement *This = HTMLBODY_THIS(iface); - FIXME("(%p)->()\n", This); - return E_NOTIMPL; + nsAString vlink_str; + nsresult nsres; + + TRACE("(%p)->(v%d)\n", This, V_VT(&v)); + + if(!variant_to_nscolor(&v, &vlink_str)) + return S_OK; + + nsres = nsIDOMHTMLBodyElement_SetVLink(This->nsbody, &vlink_str); + nsAString_Finish(&vlink_str); + if(NS_FAILED(nsres)) + ERR("SetLink failed: %08x\n", nsres); + + return S_OK; } static HRESULT WINAPI HTMLBodyElement_get_vLink(IHTMLBodyElement *iface, VARIANT *p) { HTMLBodyElement *This = HTMLBODY_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + nsAString vlink_str; + nsresult nsres; + + TRACE("(%p)->(%p)\n", This, p); + + nsAString_Init(&vlink_str, NULL); + nsres = nsIDOMHTMLBodyElement_GetVLink(This->nsbody, &vlink_str); + if(NS_FAILED(nsres)) + ERR("GetLink failed: %08x\n", nsres); + + nscolor_to_variant(&vlink_str, p); + nsAString_Finish(&vlink_str); + + return S_OK; } static HRESULT WINAPI HTMLBodyElement_put_aLink(IHTMLBodyElement *iface, VARIANT v)

1 0

Jacek Caban : mshtml: Added IHTMLBodyElement::get_link implementation.
by Alexandre Julliard 25 Feb '08

25 Feb '08

Module: wine Branch: master Commit: 8d7e1922d834c1591f2d9a432023262adcb8b899 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d7e1922d834c1591f2d9a432… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Feb 24 22:17:55 2008 +0100 mshtml: Added IHTMLBodyElement::get_link implementation. --- dlls/mshtml/htmlbody.c | 31 +++++++++++++++++++++++++++++-- 1 files changed, 29 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlbody.c b/dlls/mshtml/htmlbody.c index 8bd60e2..d0ee45a 100644 --- a/dlls/mshtml/htmlbody.c +++ b/dlls/mshtml/htmlbody.c @@ -71,6 +71,21 @@ static BOOL variant_to_nscolor(const VARIANT *v, nsAString *nsstr) } +static void nscolor_to_variant(const nsAString *nsstr, VARIANT *p) +{ + const PRUnichar *color; + + nsAString_GetData(nsstr, &color); + + if(*color == '#') { + V_VT(p) = VT_I4; + V_I4(p) = strtolW(color+1, NULL, 16); + }else { + V_VT(p) = VT_BSTR; + V_BSTR(p) = SysAllocString(color); + } +} + #define HTMLBODY_THIS(iface) DEFINE_THIS(HTMLBodyElement, HTMLBodyElement, iface) static HRESULT WINAPI HTMLBodyElement_QueryInterface(IHTMLBodyElement *iface, @@ -297,8 +312,20 @@ static HRESULT WINAPI HTMLBodyElement_put_link(IHTMLBodyElement *iface, VARIANT static HRESULT WINAPI HTMLBodyElement_get_link(IHTMLBodyElement *iface, VARIANT *p) { HTMLBodyElement *This = HTMLBODY_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + nsAString link_str; + nsresult nsres; + + TRACE("(%p)->(%p)\n", This, p); + + nsAString_Init(&link_str, NULL); + nsres = nsIDOMHTMLBodyElement_GetLink(This->nsbody, &link_str); + if(NS_FAILED(nsres)) + ERR("GetLink failed: %08x\n", nsres); + + nscolor_to_variant(&link_str, p); + nsAString_Finish(&link_str); + + return S_OK; } static HRESULT WINAPI HTMLBodyElement_put_vLink(IHTMLBodyElement *iface, VARIANT v)

1 0

Jacek Caban : mshtml: Added IHTMLBodyElement::put_link implementation.
by Alexandre Julliard 25 Feb '08

25 Feb '08

Module: wine Branch: master Commit: a7ba7647adf6ac2f25a8fa9c097bfd20537fd392 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a7ba7647adf6ac2f25a8fa9c0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Feb 24 22:17:32 2008 +0100 mshtml: Added IHTMLBodyElement::put_link implementation. --- dlls/mshtml/htmlbody.c | 40 ++++++++++++++++++++++++++++++++++++++-- 1 files changed, 38 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlbody.c b/dlls/mshtml/htmlbody.c index d3bbfd0..8bd60e2 100644 --- a/dlls/mshtml/htmlbody.c +++ b/dlls/mshtml/htmlbody.c @@ -47,6 +47,30 @@ typedef struct { #define HTMLBODY(x) ((IHTMLBodyElement*) &(x)->lpHTMLBodyElementVtbl) +static BOOL variant_to_nscolor(const VARIANT *v, nsAString *nsstr) +{ + switch(V_VT(v)) { + case VT_BSTR: + nsAString_Init(nsstr, V_BSTR(v)); + return TRUE; + + case VT_I4: { + PRUnichar buf[10]; + static const WCHAR formatW[] = {'#','%','x',0}; + + wsprintfW(buf, formatW, V_I4(v)); + nsAString_Init(nsstr, buf); + return TRUE; + } + + default: + FIXME("invalid vt=%d\n", V_VT(v)); + } + + return FALSE; + +} + #define HTMLBODY_THIS(iface) DEFINE_THIS(HTMLBodyElement, HTMLBodyElement, iface) static HRESULT WINAPI HTMLBodyElement_QueryInterface(IHTMLBodyElement *iface, @@ -254,8 +278,20 @@ static HRESULT WINAPI HTMLBodyElement_get_text(IHTMLBodyElement *iface, VARIANT static HRESULT WINAPI HTMLBodyElement_put_link(IHTMLBodyElement *iface, VARIANT v) { HTMLBodyElement *This = HTMLBODY_THIS(iface); - FIXME("(%p)->()\n", This); - return E_NOTIMPL; + nsAString link_str; + nsresult nsres; + + TRACE("(%p)->(v%d)\n", This, V_VT(&v)); + + if(!variant_to_nscolor(&v, &link_str)) + return S_OK; + + nsres = nsIDOMHTMLBodyElement_SetLink(This->nsbody, &link_str); + nsAString_Finish(&link_str); + if(NS_FAILED(nsres)) + ERR("SetLink failed: %08x\n", nsres); + + return S_OK; } static HRESULT WINAPI HTMLBodyElement_get_link(IHTMLBodyElement *iface, VARIANT *p)

1 0

Steven Edwards : winecfg: Up the default desktop resolution to 800x600.
by Alexandre Julliard 25 Feb '08

25 Feb '08

Module: wine Branch: master Commit: 9af30c7987b0e4bff382854f2d9a77a2ad1eaacb URL: http://source.winehq.org/git/wine.git/?a=commit;h=9af30c7987b0e4bff382854f2… Author: Steven Edwards <steven(a)codeweavers.com> Date: Sun Feb 24 06:09:36 2008 -0500 winecfg: Up the default desktop resolution to 800x600. --- programs/winecfg/x11drvdlg.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/programs/winecfg/x11drvdlg.c b/programs/winecfg/x11drvdlg.c index 0a4e597..51098e4 100644 --- a/programs/winecfg/x11drvdlg.c +++ b/programs/winecfg/x11drvdlg.c @@ -78,7 +78,7 @@ static void update_gui_for_desktop_mode(HWND dialog) { char* buf, *bufindex; CheckDlgButton(dialog, IDC_ENABLE_DESKTOP, BST_CHECKED); - buf = get_reg_key(config_key, keypath("X11 Driver"), "Desktop", "640x480"); + buf = get_reg_key(config_key, keypath("X11 Driver"), "Desktop", "800x600"); /* note: this test must match the one in x11drv */ if( buf[0] != 'n' && buf[0] != 'N' && buf[0] != 'F' && buf[0] != 'f' && buf[0] != '0') { @@ -96,8 +96,8 @@ static void update_gui_for_desktop_mode(HWND dialog) { SetWindowText(GetDlgItem(dialog, IDC_DESKTOP_HEIGHT), bufindex); } else { WINE_TRACE("Desktop registry entry is malformed\n"); - SetWindowText(GetDlgItem(dialog, IDC_DESKTOP_WIDTH), "640"); - SetWindowText(GetDlgItem(dialog, IDC_DESKTOP_HEIGHT), "480"); + SetWindowText(GetDlgItem(dialog, IDC_DESKTOP_WIDTH), "800"); + SetWindowText(GetDlgItem(dialog, IDC_DESKTOP_HEIGHT), "600"); } } HeapFree(GetProcessHeap(), 0, buf); @@ -183,12 +183,12 @@ static void set_from_desktop_edits(HWND dialog) { if (width == NULL || strcmp(width, "") == 0) { HeapFree(GetProcessHeap(), 0, width); - width = strdupA("640"); + width = strdupA("800"); } if (height == NULL || strcmp(height, "") == 0) { HeapFree(GetProcessHeap(), 0, height); - height = strdupA("480"); + height = strdupA("600"); } new = HeapAlloc(GetProcessHeap(), 0, strlen(width) + strlen(height) + 2 /* x + terminator */);

1 0

Alexandre Julliard : qmgr: Ignore errors when registering the service.
by Alexandre Julliard 25 Feb '08

25 Feb '08

Module: wine Branch: master Commit: 84cf9caa7578c821a2e65518f2e6b4033e55e9bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=84cf9caa7578c821a2e65518f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 25 12:17:40 2008 +0100 qmgr: Ignore errors when registering the service. --- dlls/qmgr/qmgr_main.c | 15 ++++++--------- 1 files changed, 6 insertions(+), 9 deletions(-) diff --git a/dlls/qmgr/qmgr_main.c b/dlls/qmgr/qmgr_main.c index 0af2007..2a21a28 100644 --- a/dlls/qmgr/qmgr_main.c +++ b/dlls/qmgr/qmgr_main.c @@ -113,7 +113,6 @@ static HRESULT register_service(BOOL do_register) static const WCHAR path[] = { 's','v','c','h','o','s','t','.','e','x','e', ' ','-','k',' ','n','e','t','s','v','c','s', 0 }; SC_HANDLE scm, service; - HRESULT hr = S_OK; scm = OpenSCManagerW(NULL, NULL, SC_MANAGER_ALL_ACCESS); if (!scm) @@ -129,14 +128,12 @@ static HRESULT register_service(BOOL do_register) CloseServiceHandle(scm); - if (!service) - return SELFREG_E_CLASS; - - if (!do_register) - hr = DeleteService(service) ? S_OK : SELFREG_E_CLASS; - - CloseServiceHandle(service); - return hr; + if (service) + { + if (!do_register) DeleteService(service); + CloseServiceHandle(service); + } + return S_OK; } /* Use an INF file to register or unregister the DLL */

1 0

Roderick Colenbrander : wined3d: Request aux buffers when using backbuffer rendering.
by Alexandre Julliard 25 Feb '08

25 Feb '08

Module: wine Branch: master Commit: e5bef99fbea6e5b7938511a0527f0b669546624b URL: http://source.winehq.org/git/wine.git/?a=commit;h=e5bef99fbea6e5b7938511a05… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Sat Feb 23 15:15:11 2008 +0000 wined3d: Request aux buffers when using backbuffer rendering. --- dlls/wined3d/context.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 769949a..cc9574b 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -231,6 +231,9 @@ WineD3DContext *CreateContext(IWineD3DDeviceImpl *This, IWineD3DSurfaceImpl *tar fmt = WINED3DFMT_A4R4G4B4; else if(target->resource.format == WINED3DFMT_X8R8G8B8) fmt = WINED3DFMT_A8R8G8B8; + + /* We like to have two aux buffers in backbuffer mode */ + PUSH2(WGL_AUX_BUFFERS_ARB, 2); } if(!getColorBits(fmt, &redBits, &greenBits, &blueBits, &alphaBits, &colorBits)) {

1 0

Roderick Colenbrander : wgl: Add aux buffers support to DescribePixelFormat .
by Alexandre Julliard 25 Feb '08

25 Feb '08

Module: wine Branch: master Commit: 5374d623ce6ee7ab6913a3453ef64c3ac55320d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5374d623ce6ee7ab6913a3453… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Sat Feb 23 15:00:54 2008 +0000 wgl: Add aux buffers support to DescribePixelFormat. --- dlls/winex11.drv/opengl.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index 1d0ada0..fa6fac8 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -1367,6 +1367,10 @@ int X11DRV_DescribePixelFormat(X11DRV_PDEVICE *physDev, ppfd->cAccumBlueBits = bb; ppfd->cAccumAlphaBits = ab; + /* Aux bits */ + pglXGetFBConfigAttrib(gdi_display, fmt->fbconfig, GLX_AUX_BUFFERS, &value); + ppfd->cAuxBuffers = value; + /* Depth bits */ pglXGetFBConfigAttrib(gdi_display, fmt->fbconfig, GLX_DEPTH_SIZE, &value); ppfd->cDepthBits = value; @@ -1377,8 +1381,6 @@ int X11DRV_DescribePixelFormat(X11DRV_PDEVICE *physDev, wine_tsx11_unlock(); - /* Aux : to do ... */ - ppfd->iLayerType = PFD_MAIN_PLANE; if (TRACE_ON(opengl)) {

1 0

Roderick Colenbrander : wgl: Remove unneeded opengl initialisation code at wine startup.
by Alexandre Julliard 25 Feb '08

25 Feb '08

Module: wine Branch: master Commit: 220163ee9d698543fe34257969a88e5976d378de URL: http://source.winehq.org/git/wine.git/?a=commit;h=220163ee9d698543fe3425796… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Fri Feb 22 20:55:02 2008 +0000 wgl: Remove unneeded opengl initialisation code at wine startup. --- dlls/winex11.drv/opengl.c | 46 ---------------------------------------- dlls/winex11.drv/x11drv.h | 1 - dlls/winex11.drv/x11drv_main.c | 10 -------- 3 files changed, 0 insertions(+), 57 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index d685b94..1d0ada0 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -3364,47 +3364,6 @@ BOOL X11DRV_SwapBuffers(X11DRV_PDEVICE *physDev) return TRUE; } -/*********************************************************************** - * X11DRV_setup_opengl_visual - * - * Setup the default visual used for OpenGL and Direct3D, and the desktop - * window (if it exists). If OpenGL isn't available, the visual is simply - * set to the default visual for the display - */ -XVisualInfo *X11DRV_setup_opengl_visual( Display *display ) -{ - XVisualInfo *visual = NULL; - int i; - - /* In order to support OpenGL or D3D, we require a double-buffered visual and stencil buffer support, - * D3D and some applications can make use of aux buffers. - */ - int visualProperties[][11] = { - { GLX_RGBA, GLX_DOUBLEBUFFER, GLX_DEPTH_SIZE, 24, GLX_STENCIL_SIZE, 8, GLX_ALPHA_SIZE, 8, GLX_AUX_BUFFERS, 1, None }, - { GLX_RGBA, GLX_DOUBLEBUFFER, GLX_DEPTH_SIZE, 24, GLX_STENCIL_SIZE, 8, GLX_ALPHA_SIZE, 8, None }, - { GLX_RGBA, GLX_DOUBLEBUFFER, GLX_DEPTH_SIZE, 16, GLX_STENCIL_SIZE, 8, None }, - { GLX_RGBA, GLX_DOUBLEBUFFER, GLX_DEPTH_SIZE, 16, None }, - }; - - if (!has_opengl()) - return NULL; - - wine_tsx11_lock(); - for (i = 0; i < sizeof(visualProperties)/sizeof(visualProperties[0]); ++i) { - visual = pglXChooseVisual(display, DefaultScreen(display), visualProperties[i]); - if (visual) - break; - } - wine_tsx11_unlock(); - - if (visual) - TRACE("Visual ID %lx Chosen\n", visual->visualid); - else - WARN("No suitable visual found\n"); - - return visual; -} - XVisualInfo *visual_from_fbconfig_id( XID fbconfig_id ) { WineGLPixelFormat *fmt; @@ -3579,11 +3538,6 @@ BOOL X11DRV_wglUseFontBitmapsW(X11DRV_PDEVICE *physDev, DWORD first, DWORD count return FALSE; } -XVisualInfo *X11DRV_setup_opengl_visual( Display *display ) -{ - return NULL; -} - Drawable get_glxdrawable(X11DRV_PDEVICE *physDev) { return 0; diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index ee2cac7..97d1a27 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -270,7 +270,6 @@ extern BOOL X11DRV_XRender_ExtTextOut(X11DRV_PDEVICE *physDev, INT x, INT y, UIN UINT count, const INT *lpDx); extern void X11DRV_XRender_UpdateDrawable(X11DRV_PDEVICE *physDev); -extern XVisualInfo *X11DRV_setup_opengl_visual(Display *display); extern Drawable get_glxdrawable(X11DRV_PDEVICE *physDev); extern BOOL destroy_glxpixmap(Display *display, XID glxpixmap); diff --git a/dlls/winex11.drv/x11drv_main.c b/dlls/winex11.drv/x11drv_main.c index 444754b..f4f5f06 100644 --- a/dlls/winex11.drv/x11drv_main.c +++ b/dlls/winex11.drv/x11drv_main.c @@ -476,7 +476,6 @@ sym_not_found: static BOOL process_attach(void) { Display *display; - XVisualInfo *desktop_vi = NULL; const char *env; setup_options(); @@ -513,15 +512,6 @@ static BOOL process_attach(void) } } if (!screen_depth) screen_depth = DefaultDepthOfScreen( screen ); - - /* If OpenGL is available, change the default visual, etc as necessary */ - if ((desktop_vi = X11DRV_setup_opengl_visual( display ))) - { - visual = desktop_vi->visual; - screen = ScreenOfDisplay(display, desktop_vi->screen); - screen_depth = desktop_vi->depth; - XFree(desktop_vi); - } screen_bpp = depth_to_bpp( screen_depth ); XInternAtoms( display, (char **)atom_names, NB_XATOMS - FIRST_XATOM, False, X11DRV_Atoms );

1 0

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 February 2008