September 2007 - Wine-commits

lostwages/wwn wn20070526_332.xml
by Jeremy Newman 10 Sep '07

10 Sep '07

ChangeSet ID: 31368 CVSROOT: /opt/cvs-commit Module name: lostwages Changes by: jnewman(a)winehq.org 2007/09/10 12:18:31 Modified files: wwn : wn20070526_332.xml Log message: Francois Gouget <fgouget(a)free.fr> WWN 332 fixes Patch: http://cvs.winehq.org/patch.py?id=31368 Old revision New revision Changes Path 1.1 1.2 +37 -37 lostwages/wwn/wn20070526_332.xml Index: lostwages/wwn/wn20070526_332.xml diff -u -p lostwages/wwn/wn20070526_332.xml:1.1 lostwages/wwn/wn20070526_332.xml:1.2 --- lostwages/wwn/wn20070526_332.xml:1.1 10 Sep 2007 17:18:31 -0000 +++ lostwages/wwn/wn20070526_332.xml 10 Sep 2007 17:18:31 -0000 @@ -577,50 +577,50 @@ The following applications where mention On IRC from the #winehq channel: <code> -Mai 23 05:27:14 --> noerrorsfound_ (n=nicholas at h10.66.119.64.ip.alltel.net) has joined #winehq -[unrelated stuff deleted] -Mai 23 06:21:37 --- noerrorsfound_ is now known as molle-molle-moll -Mai 23 06:21:41 <molle-molle-moll> molle molle molle +Mai 23 05:27:14 --> noerrorsfound_ (n=nicholas at h10.66.119.64.ip.alltel.net) has joined #winehq +[unrelated stuff deleted] +Mai 23 06:21:37 --- noerrorsfound_ is now known as molle-molle-moll +Mai 23 06:21:41 <molle-molle-moll> molle molle molle Mai 23 06:22:18 <-- Amorphous has kicked molle-molle-moll from #winehq (Amorphous)</code> /whois output: <code> -[06:22:38] --- [molle-molle-moll] (n=nicholas at h10.66.119.64.ip.alltel.net) : Nicholas -[06:22:38] --- [whoismolle-molle-moll] irc.freenode.net :http://freenode.net/ +[06:22:38] --- [molle-molle-moll] (n=nicholas at h10.66.119.64.ip.alltel.net) : Nicholas +[06:22:38] --- [whoismolle-molle-moll] irc.freenode.net :http://freenode.net/ [06:22:38] --- [molle-molle-moll] End of WHOIS list.</code> <code> -2007-05-23T06:50:15+0200 $ whois 64.119.66.10 -OrgName: Windstream Communications Inc -OrgID: WINDS-6 -Address: 4001 Rodney Parham Rd -City: Little Rock -StateProv: AR -PostalCode: 72212 -Country: US - -NetRange: 64.119.64.0 - 64.119.79.255 -CIDR: 64.119.64.0/20 -NetName: WINDSTREAM-COMMUNICATIONS -NetHandle: NET-64-119-64-0-1 -Parent: NET-64-0-0-0-0 -NetType: Direct Allocation -NameServer: NS1-AUTH.WINDSTREAM.NET -NameServer: NS2-AUTH.WINDSTREAM.NET -NameServer: NS3-AUTH.WINDSTREAM.NET -NameServer: NS4-AUTH.WINDSTREAM.NET -Comment: ADDRESSES WITHIN THIS BLOCK ARE NON-PORTABLE -RegDate: 2001-08-24 -Updated: 2007-02-26 - -OrgAbuseHandle: WINDS1-ARIN -OrgAbuseName: Windstream Abuse -OrgAbusePhone: +1-888-292-3827 -OrgAbuseEmail: abuse at windstream.net - -OrgTechHandle: WINDS-ARIN -OrgTechName: Windstream Communications Inc -OrgTechPhone: +1-800-990-4449 +2007-05-23T06:50:15+0200 $ whois 64.119.66.10 +OrgName: Windstream Communications Inc +OrgID: WINDS-6 +Address: 4001 Rodney Parham Rd +City: Little Rock +StateProv: AR +PostalCode: 72212 +Country: US + +NetRange: 64.119.64.0 - 64.119.79.255 +CIDR: 64.119.64.0/20 +NetName: WINDSTREAM-COMMUNICATIONS +NetHandle: NET-64-119-64-0-1 +Parent: NET-64-0-0-0-0 +NetType: Direct Allocation +NameServer: NS1-AUTH.WINDSTREAM.NET +NameServer: NS2-AUTH.WINDSTREAM.NET +NameServer: NS3-AUTH.WINDSTREAM.NET +NameServer: NS4-AUTH.WINDSTREAM.NET +Comment: ADDRESSES WITHIN THIS BLOCK ARE NON-PORTABLE +RegDate: 2001-08-24 +Updated: 2007-02-26 + +OrgAbuseHandle: WINDS1-ARIN +OrgAbuseName: Windstream Abuse +OrgAbusePhone: +1-888-292-3827 +OrgAbuseEmail: abuse at windstream.net + +OrgTechHandle: WINDS-ARIN +OrgTechName: Windstream Communications Inc +OrgTechPhone: +1-800-990-4449 OrgTechEmail: ipadmin at windstream.net</code></quote> Chris Morgan gave an update after things were restored:

1 0

lostwages/wwn wn20070416_329.xml
by Jeremy Newman 10 Sep '07

10 Sep '07

ChangeSet ID: 31367 CVSROOT: /opt/cvs-commit Module name: lostwages Changes by: jnewman(a)winehq.org 2007/09/10 12:17:50 Modified files: wwn : wn20070416_329.xml Log message: Francois Gouget <fgouget(a)free.fr> WWN329 -tag fixes. Patch: http://cvs.winehq.org/patch.py?id=31367 Old revision New revision Changes Path 1.1 1.2 +2 -2 lostwages/wwn/wn20070416_329.xml Index: lostwages/wwn/wn20070416_329.xml diff -u -p lostwages/wwn/wn20070416_329.xml:1.1 lostwages/wwn/wn20070416_329.xml:1.2 --- lostwages/wwn/wn20070416_329.xml:1.1 10 Sep 2007 17:17:50 -0000 +++ lostwages/wwn/wn20070416_329.xml 10 Sep 2007 17:17:50 -0000 @@ -252,7 +252,7 @@ gave an excellent description of the cha This is an updated version of the child window patch from Chris Robinson. I have added some fixes to it which were found by testing it with lots of programs. - + Windowed OpenGL Several options have been discussed over the years for solving the windowed OpenGL issues. The lazy option was to use pixmaps but you would lose hardware @@ -273,7 +273,7 @@ implementations as it doesn't require sp require the patching of OpenGL calls. OpenGL pixelformats -Next to the windowed OpenGL issues, there's the pixelformat limitation in Wine. +Next to the windowed OpenGL issues, there's the pixelformat limitation in Wine. Right now only one pixelformat can be used. Most programs use ChoosePixelFormat using which you can request a pixelformat but the call isn't guaranteed to give you back what you want. For this reason most programs aren't very critical.

1 0

lostwages/ templates/en/fun_projects.template ...
by Jeremy Newman 10 Sep '07

10 Sep '07

ChangeSet ID: 31366 CVSROOT: /opt/cvs-commit Module name: lostwages Changes by: jnewman(a)winehq.org 2007/09/10 12:17:08 Modified files: templates/en : fun_projects.template myths.template wwn : wn19991101_15.xml wn19991129_19.xml wn20000103_24.xml wn20000410_38.xml wn20000717_52.xml wn20001016_65.xml wn20010212_82.xml wn20010219_83.xml wn20010326_88.xml wn20010816_102.xml wn20010912_103.xml wn20011007_105.xml wn20011125_109.xml wn20011212_110.xml wn20020105_112.xml wn20020224_116.xml wn20020325_118.xml wn20020530_124.xml wn20020613_126.xml wn20020913_135.xml wn20021025_141.xml wn20021213_148.xml wn20021220_149.xml wn20030516_170.xml wn20031010_191.xml wn20031205_199.xml wn20040203_208.xml wn20040220_211.xml wn20041015_244.xml wn20041224_254.xml wn20050503_272.xml wn20050506_273.xml wn20050610_278.xml wn20050617_279.xml wn20051025_296.xml wn20051125_299.xml wn20051211_301.xml wn20060129_304.xml wn20060305_307.xml wn20060428_312.xml wn20060526_314.xml wwn/interviews : interview_10.xml Log message: Francois Gouget <fgouget(a)free.fr> Assorted spelling fixes. Patch: http://cvs.winehq.org/patch.py?id=31366 Old revision New revision Changes Path 1.32 1.33 +1 -1 lostwages/templates/en/fun_projects.template 1.13 1.14 +3 -3 lostwages/templates/en/myths.template 1.2 1.3 +1 -1 lostwages/wwn/wn19991101_15.xml 1.3 1.4 +1 -1 lostwages/wwn/wn19991129_19.xml 1.2 1.3 +1 -1 lostwages/wwn/wn20000103_24.xml 1.4 1.5 +1 -1 lostwages/wwn/wn20000410_38.xml 1.7 1.8 +1 -1 lostwages/wwn/wn20000717_52.xml 1.6 1.7 +1 -1 lostwages/wwn/wn20001016_65.xml 1.4 1.5 +1 -1 lostwages/wwn/wn20010212_82.xml 1.5 1.6 +1 -1 lostwages/wwn/wn20010219_83.xml 1.4 1.5 +1 -1 lostwages/wwn/wn20010326_88.xml 1.10 1.11 +1 -1 lostwages/wwn/wn20010816_102.xml 1.9 1.10 +2 -2 lostwages/wwn/wn20010912_103.xml 1.7 1.8 +1 -1 lostwages/wwn/wn20011007_105.xml 1.11 1.12 +1 -1 lostwages/wwn/wn20011125_109.xml 1.11 1.12 +1 -1 lostwages/wwn/wn20011212_110.xml 1.7 1.8 +1 -1 lostwages/wwn/wn20020105_112.xml 1.11 1.12 +1 -1 lostwages/wwn/wn20020224_116.xml 1.10 1.11 +1 -1 lostwages/wwn/wn20020325_118.xml 1.9 1.10 +1 -1 lostwages/wwn/wn20020530_124.xml 1.7 1.8 +1 -1 lostwages/wwn/wn20020613_126.xml 1.13 1.14 +3 -3 lostwages/wwn/wn20020913_135.xml 1.12 1.13 +1 -1 lostwages/wwn/wn20021025_141.xml 1.9 1.10 +1 -1 lostwages/wwn/wn20021213_148.xml 1.9 1.10 +1 -1 lostwages/wwn/wn20021220_149.xml 1.10 1.11 +1 -1 lostwages/wwn/wn20030516_170.xml 1.8 1.9 +1 -1 lostwages/wwn/wn20031010_191.xml 1.6 1.7 +1 -1 lostwages/wwn/wn20031205_199.xml 1.5 1.6 +1 -1 lostwages/wwn/wn20040203_208.xml 1.2 1.3 +1 -1 lostwages/wwn/wn20040220_211.xml 1.7 1.8 +1 -1 lostwages/wwn/wn20041015_244.xml 1.3 1.4 +1 -1 lostwages/wwn/wn20041224_254.xml 1.4 1.5 +1 -1 lostwages/wwn/wn20050503_272.xml 1.3 1.4 +1 -1 lostwages/wwn/wn20050506_273.xml 1.2 1.3 +1 -1 lostwages/wwn/wn20050610_278.xml 1.2 1.3 +7 -7 lostwages/wwn/wn20050617_279.xml 1.9 1.10 +1 -1 lostwages/wwn/wn20051025_296.xml 1.4 1.5 +4 -4 lostwages/wwn/wn20051125_299.xml 1.6 1.7 +4 -4 lostwages/wwn/wn20051211_301.xml 1.4 1.5 +1 -1 lostwages/wwn/wn20060129_304.xml 1.3 1.4 +1 -1 lostwages/wwn/wn20060305_307.xml 1.3 1.4 +1 -1 lostwages/wwn/wn20060428_312.xml 1.5 1.6 +1 -1 lostwages/wwn/wn20060526_314.xml 1.6 1.7 +2 -2 lostwages/wwn/interviews/interview_10.xml

1 0

Stefan Leichter : dplayx: Remove 'recursive registry key delete' function.
by Alexandre Julliard 10 Sep '07

10 Sep '07

Module: wine Branch: master Commit: 8cb25a4e2d297ef476ae7fd22e3eb5e30fb1b167 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8cb25a4e2d297ef476ae7fd22… Author: Stefan Leichter <Stefan.Leichter(a)camline.com> Date: Fri Sep 7 21:18:59 2007 +0200 dplayx: Remove 'recursive registry key delete' function. --- dlls/dplayx/regsvr.c | 79 +++++-------------------------------------------- 1 files changed, 8 insertions(+), 71 deletions(-) diff --git a/dlls/dplayx/regsvr.c b/dlls/dplayx/regsvr.c index e22c609..cb5a5d2 100644 --- a/dlls/dplayx/regsvr.c +++ b/dlls/dplayx/regsvr.c @@ -115,9 +115,6 @@ static LONG register_key_defvalueA(HKEY base, WCHAR const *name, static LONG register_progid(WCHAR const *clsid, char const *progid, char const *curver_progid, char const *name, char const *extra); -static LONG recursive_delete_key(HKEY key); -static LONG recursive_delete_keyA(HKEY base, char const *name); -static LONG recursive_delete_keyW(HKEY base, WCHAR const *name); /*********************************************************************** * register_interfaces @@ -206,7 +203,8 @@ static HRESULT unregister_interfaces(struct regsvr_interface const *list) WCHAR buf[39]; StringFromGUID2(list->iid, buf, 39); - res = recursive_delete_keyW(interface_key, buf); + res = RegDeleteTreeW(interface_key, buf); + if (res == ERROR_FILE_NOT_FOUND) res = ERROR_SUCCESS; } RegCloseKey(interface_key); @@ -313,16 +311,19 @@ static HRESULT unregister_coclasses(struct regsvr_coclass const *list) WCHAR buf[39]; StringFromGUID2(list->clsid, buf, 39); - res = recursive_delete_keyW(coclass_key, buf); + res = RegDeleteTreeW(coclass_key, buf); + if (res == ERROR_FILE_NOT_FOUND) res = ERROR_SUCCESS; if (res != ERROR_SUCCESS) goto error_close_coclass_key; if (list->progid) { - res = recursive_delete_keyA(HKEY_CLASSES_ROOT, list->progid); + res = RegDeleteTreeA(HKEY_CLASSES_ROOT, list->progid); + if (res == ERROR_FILE_NOT_FOUND) res = ERROR_SUCCESS; if (res != ERROR_SUCCESS) goto error_close_coclass_key; } if (list->viprogid) { - res = recursive_delete_keyA(HKEY_CLASSES_ROOT, list->viprogid); + res = RegDeleteTreeA(HKEY_CLASSES_ROOT, list->viprogid); + if (res == ERROR_FILE_NOT_FOUND) res = ERROR_SUCCESS; if (res != ERROR_SUCCESS) goto error_close_coclass_key; } } @@ -435,70 +436,6 @@ error_close_progid_key: } /*********************************************************************** - * recursive_delete_key - */ -static LONG recursive_delete_key(HKEY key) -{ - LONG res; - WCHAR subkey_name[MAX_PATH]; - DWORD cName; - HKEY subkey; - - for (;;) { - cName = sizeof(subkey_name) / sizeof(WCHAR); - res = RegEnumKeyExW(key, 0, subkey_name, &cName, - NULL, NULL, NULL, NULL); - if (res != ERROR_SUCCESS && res != ERROR_MORE_DATA) { - res = ERROR_SUCCESS; /* presumably we're done enumerating */ - break; - } - res = RegOpenKeyExW(key, subkey_name, 0, - KEY_READ | KEY_WRITE, &subkey); - if (res == ERROR_FILE_NOT_FOUND) continue; - if (res != ERROR_SUCCESS) break; - - res = recursive_delete_key(subkey); - RegCloseKey(subkey); - if (res != ERROR_SUCCESS) break; - } - - if (res == ERROR_SUCCESS) res = RegDeleteKeyW(key, 0); - return res; -} - -/*********************************************************************** - * recursive_delete_keyA - */ -static LONG recursive_delete_keyA(HKEY base, char const *name) -{ - LONG res; - HKEY key; - - res = RegOpenKeyExA(base, name, 0, KEY_READ | KEY_WRITE, &key); - if (res == ERROR_FILE_NOT_FOUND) return ERROR_SUCCESS; - if (res != ERROR_SUCCESS) return res; - res = recursive_delete_key(key); - RegCloseKey(key); - return res; -} - -/*********************************************************************** - * recursive_delete_keyW - */ -static LONG recursive_delete_keyW(HKEY base, WCHAR const *name) -{ - LONG res; - HKEY key; - - res = RegOpenKeyExW(base, name, 0, KEY_READ | KEY_WRITE, &key); - if (res == ERROR_FILE_NOT_FOUND) return ERROR_SUCCESS; - if (res != ERROR_SUCCESS) return res; - res = recursive_delete_key(key); - RegCloseKey(key); - return res; -} - -/*********************************************************************** * coclass list */ static struct regsvr_coclass const coclass_list[] = {

1 0

Roderick Colenbrander : wined3d: Fix ddraw-opengl surface free bug.
by Alexandre Julliard 10 Sep '07

10 Sep '07

Module: wine Branch: master Commit: 63c06b4b38e704c460cf128134c66989ed7dfad7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=63c06b4b38e704c460cf12813… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Mon Sep 10 12:18:15 2007 +0200 wined3d: Fix ddraw-opengl surface free bug. --- dlls/wined3d/surface.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 49c2218..2acd068 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -366,7 +366,7 @@ ULONG WINAPI IWineD3DSurfaceImpl_Release(IWineD3DSurface *iface) { * the primary render target exists. Otherwise lastActiveRenderTarget is garbage, see above. * When destroying the primary rt, Uninit3D will activate a context before doing anything */ - if(device->render_targets[0]) { + if(device->render_targets && device->render_targets[0]) { ActivateContext(device, device->lastActiveRenderTarget, CTXUSAGE_RESOURCELOAD); }

1 0

Jacek Caban : shdocvw: Better iexplore.exe command line handling.
by Alexandre Julliard 10 Sep '07

10 Sep '07

Module: wine Branch: master Commit: 735bf5a6f783e12336ee5e80e83cc8b11abb565e URL: http://source.winehq.org/git/wine.git/?a=commit;h=735bf5a6f783e12336ee5e80e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Sep 9 20:19:03 2007 +0200 shdocvw: Better iexplore.exe command line handling. --- dlls/shdocvw/iexplore.c | 46 +++++++++++++++++++++------------------------- 1 files changed, 21 insertions(+), 25 deletions(-) diff --git a/dlls/shdocvw/iexplore.c b/dlls/shdocvw/iexplore.c index 3ab39ee..adcaeee 100644 --- a/dlls/shdocvw/iexplore.c +++ b/dlls/shdocvw/iexplore.c @@ -120,10 +120,9 @@ static void create_frame_hwnd(InternetExplorer *This) NULL, NULL /* FIXME */, shdocvw_hinstance, This); } -static IWebBrowser2 *create_ie_window(LPCWSTR url) +static IWebBrowser2 *create_ie_window(LPCSTR cmdline) { IWebBrowser2 *wb = NULL; - VARIANT var_url; InternetExplorer_Create(NULL, &IID_IWebBrowser2, (void**)&wb); if(!wb) @@ -131,13 +130,26 @@ static IWebBrowser2 *create_ie_window(LPCWSTR url) IWebBrowser2_put_Visible(wb, VARIANT_TRUE); - V_VT(&var_url) = VT_BSTR; - V_BSTR(&var_url) = SysAllocString(url); + if(!*cmdline) { + IWebBrowser2_GoHome(wb); + }else { + VARIANT var_url; + DWORD len; + + if(!strncasecmp(cmdline, "-nohome", 7)) + cmdline += 7; + + V_VT(&var_url) = VT_BSTR; - /* navigate to the first page */ - IWebBrowser2_Navigate2(wb, &var_url, NULL, NULL, NULL, NULL); + len = MultiByteToWideChar(CP_ACP, 0, cmdline, -1, NULL, 0); + V_BSTR(&var_url) = SysAllocStringLen(NULL, len); + MultiByteToWideChar(CP_ACP, 0, cmdline, -1, V_BSTR(&var_url), len); - SysFreeString(V_BSTR(&var_url)); + /* navigate to the first page */ + IWebBrowser2_Navigate2(wb, &var_url, NULL, NULL, NULL, NULL); + + SysFreeString(V_BSTR(&var_url)); + } return wb; } @@ -190,24 +202,8 @@ DWORD WINAPI IEWinMain(LPSTR szCommandLine, int nShowWindow) ExitProcess(1); } - /* FIXME: there are lots of other commandline options we need to parse */ - if(!strncasecmp(szCommandLine, "-nohome", 7)) { - FIXME("skipping -nohome option\n"); - szCommandLine += 8; - } - - if(strcmp(szCommandLine, "-Embedding")) { - LPWSTR url; - DWORD len; - - len = MultiByteToWideChar(CP_ACP, 0, szCommandLine, -1, NULL, 0); - url = shdocvw_alloc(len*sizeof(WCHAR)); - MultiByteToWideChar(CP_ACP, 0, szCommandLine, -1, url, len); - - wb = create_ie_window(url); - - shdocvw_free(url); - } + if(strcasecmp(szCommandLine, "-embedding")) + wb = create_ie_window(szCommandLine); /* run the message loop for this thread */ while (GetMessageW(&msg, 0, 0, 0))

1 0

Chris Robinson : wined3d: Add X4R4G4B4 and A4R4G4B4 to formats allowed in getColorBits.
by Alexandre Julliard 10 Sep '07

10 Sep '07

Module: wine Branch: master Commit: 8d32a490a18b3b8764f1bce3e98d0027551e27a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d32a490a18b3b8764f1bce3e… Author: Chris Robinson <chris.kcat(a)gmail.com> Date: Wed Sep 5 22:15:40 2007 -0700 wined3d: Add X4R4G4B4 and A4R4G4B4 to formats allowed in getColorBits. --- dlls/wined3d/utils.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 9417055..6ac8e54 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -2534,6 +2534,8 @@ BOOL getColorBits(WINED3DFORMAT fmt, short *redSize, short *greenSize, short *bl case WINED3DFMT_X1R5G5B5: case WINED3DFMT_A1R5G5B5: case WINED3DFMT_R5G6B5: + case WINED3DFMT_X4R4G4B4: + case WINED3DFMT_A4R4G4B4: case WINED3DFMT_R3G3B2: case WINED3DFMT_A8P8: case WINED3DFMT_P8:

1 0

David Hedberg : ddraw: Enumerate additional devices in IDirect3D7_EnumDevices.
by Alexandre Julliard 10 Sep '07

10 Sep '07

Module: wine Branch: master Commit: 019cc506a8a87b03fb8ec93d16e4c71cb6c3e0ad URL: http://source.winehq.org/git/wine.git/?a=commit;h=019cc506a8a87b03fb8ec93d1… Author: David Hedberg <david.hedberg(a)gmail.com> Date: Fri Sep 7 13:15:26 2007 +0200 ddraw: Enumerate additional devices in IDirect3D7_EnumDevices. --- dlls/ddraw/direct3d.c | 18 ++++++++++++--- dlls/ddraw/tests/d3d.c | 54 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 68 insertions(+), 4 deletions(-) diff --git a/dlls/ddraw/direct3d.c b/dlls/ddraw/direct3d.c index f0c3516..ef31046 100644 --- a/dlls/ddraw/direct3d.c +++ b/dlls/ddraw/direct3d.c @@ -230,7 +230,7 @@ IDirect3DImpl_1_Initialize(IDirect3D *iface, * IDirect3D7::EnumDevices * * The EnumDevices method for IDirect3D7. It enumerates all supported - * D3D7 devices. Currently there's only one. + * D3D7 devices. Currently the T&L, HAL and RGB devices are enumerated. * * Params: * Callback: Function to call for each enumerated device @@ -246,8 +246,12 @@ IDirect3DImpl_7_EnumDevices(IDirect3D7 *iface, void *Context) { ICOM_THIS_FROM(IDirectDrawImpl, IDirect3D7, iface); - char interface_name[] = "WINE Direct3D7 using WineD3D"; - char device_name[] = "Wine D3D7 device"; + char interface_name_tnl[] = "WINE Direct3D7 Hardware Transform and Lighting acceleration using WineD3D"; + char device_name_tnl[] = "Wine D3D7 T&L HAL"; + char interface_name_hal[] = "WINE Direct3D7 Hardware acceleration using WineD3D"; + char device_name_hal[] = "Wine D3D7 HAL"; + char interface_name_rgb[] = "WINE Direct3D7 RGB Software Emulation using WineD3D"; + char device_name_rgb[] = "Wine D3D7 RGB"; D3DDEVICEDESC7 ddesc; D3DDEVICEDESC oldDesc; HRESULT hr; @@ -262,7 +266,13 @@ IDirect3DImpl_7_EnumDevices(IDirect3D7 *iface, LeaveCriticalSection(&ddraw_cs); return hr; } - Callback(interface_name, device_name, &ddesc, Context); + Callback(interface_name_tnl, device_name_tnl, &ddesc, Context); + + ddesc.deviceGUID = IID_IDirect3DHALDevice; + Callback(interface_name_hal, device_name_hal, &ddesc, Context); + + ddesc.deviceGUID = IID_IDirect3DRGBDevice; + Callback(interface_name_rgb, device_name_rgb, &ddesc, Context); TRACE("(%p) End of enumeration\n", This); LeaveCriticalSection(&ddraw_cs); diff --git a/dlls/ddraw/tests/d3d.c b/dlls/ddraw/tests/d3d.c index 054df51..f154a3a 100644 --- a/dlls/ddraw/tests/d3d.c +++ b/dlls/ddraw/tests/d3d.c @@ -33,6 +33,14 @@ static LPDIRECT3DVERTEXBUFFER7 lpVBufSrc = NULL; static LPDIRECT3DVERTEXBUFFER7 lpVBufDest1 = NULL; static LPDIRECT3DVERTEXBUFFER7 lpVBufDest2 = NULL; +typedef struct { + int total; + int rgb; + int hal; + int tnlhal; + int unk; +} D3D7ETest; + /* To compare bad floating point numbers. Not the ideal way to do it, * but it should be enough for here */ #define comparefloat(a, b) ( (((a) - (b)) < 0.0001) && (((a) - (b)) > -0.0001) ) @@ -789,6 +797,51 @@ static HRESULT WINAPI enumDevicesCallback(GUID *Guid,LPSTR DeviceDescription,LPS return DDENUMRET_OK; } +static HRESULT WINAPI enumDevicesCallbackTest7(LPSTR DeviceDescription, LPSTR DeviceName, LPD3DDEVICEDESC7 lpdd7, LPVOID Context) +{ + D3D7ETest *d3d7et = (D3D7ETest*)Context; + if(IsEqualGUID(&lpdd7->deviceGUID, &IID_IDirect3DRGBDevice)) + d3d7et->rgb++; + else if(IsEqualGUID(&lpdd7->deviceGUID, &IID_IDirect3DHALDevice)) + d3d7et->hal++; + else if(IsEqualGUID(&lpdd7->deviceGUID, &IID_IDirect3DTnLHalDevice)) + d3d7et->tnlhal++; + else + d3d7et->unk++; + + d3d7et->total++; + + return DDENUMRET_OK; +} + + +/* Check the deviceGUID of devices enumerated by + IDirect3D7_EnumDevices. */ +static void D3D7EnumTest(void) +{ + D3D7ETest d3d7et; + + if (!lpD3D) { + skip("No Direct3D7 interface.\n"); + return; + } + + memset(&d3d7et, 0, sizeof(d3d7et)); + IDirect3D7_EnumDevices(lpD3D, enumDevicesCallbackTest7, (LPVOID) &d3d7et); + + + /* A couple of games (Delta Force LW and TFD) rely on this behaviour */ + ok(d3d7et.tnlhal < d3d7et.total, "TnLHal device enumerated as only device.\n"); + + /* We make two additional assumptions. */ + ok(d3d7et.rgb, "No RGB Device enumerated.\n"); + + if(d3d7et.tnlhal) + ok(d3d7et.hal, "TnLHal device enumerated, but no Hal device found.\n"); + + return; +} + static void CapsTest(void) { IDirect3D3 *d3d3; @@ -1221,6 +1274,7 @@ START_TEST(d3d) StateTest(); SceneTest(); LimitTest(); + D3D7EnumTest(); CapsTest(); ReleaseDirect3D(); Direct3D1Test();

1 0

Jacek Caban : winex11: Fixed GetClipboardFormatName spec entry.
by Alexandre Julliard 10 Sep '07

10 Sep '07

Module: wine Branch: master Commit: b5c0573dd8fc1faf372cdf24136f881b6754f52b URL: http://source.winehq.org/git/wine.git/?a=commit;h=b5c0573dd8fc1faf372cdf241… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Sep 9 20:11:52 2007 +0200 winex11: Fixed GetClipboardFormatName spec entry. --- dlls/winex11.drv/winex11.drv.spec | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winex11.drv/winex11.drv.spec b/dlls/winex11.drv/winex11.drv.spec index 6a6c173..ad9c989 100644 --- a/dlls/winex11.drv/winex11.drv.spec +++ b/dlls/winex11.drv/winex11.drv.spec @@ -95,7 +95,7 @@ @ cdecl EndClipboardUpdate() X11DRV_EndClipboardUpdate @ cdecl EnumClipboardFormats(long) X11DRV_EnumClipboardFormats @ cdecl GetClipboardData(long ptr ptr) X11DRV_GetClipboardData -@ cdecl GetClipboardFormatName(long str long) X11DRV_GetClipboardFormatName +@ cdecl GetClipboardFormatName(long ptr long) X11DRV_GetClipboardFormatName @ cdecl GetDCEx(long long long) X11DRV_GetDCEx @ cdecl IsClipboardFormatAvailable(long) X11DRV_IsClipboardFormatAvailable @ cdecl MsgWaitForMultipleObjectsEx(long ptr long long long) X11DRV_MsgWaitForMultipleObjectsEx

1 0

Jacek Caban : urlmon: Added FIXME about unsupported pmkToLeft to BindToStorage.
by Alexandre Julliard 10 Sep '07

10 Sep '07

Module: wine Branch: master Commit: c89551a1c507c4b6e79477c7eb8da1fb1b73cc0e URL: http://source.winehq.org/git/wine.git/?a=commit;h=c89551a1c507c4b6e79477c7e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Sep 9 20:12:21 2007 +0200 urlmon: Added FIXME about unsupported pmkToLeft to BindToStorage. --- dlls/urlmon/umon.c | 13 +++++-------- 1 files changed, 5 insertions(+), 8 deletions(-) diff --git a/dlls/urlmon/umon.c b/dlls/urlmon/umon.c index 3fafbd6..db42f7e 100644 --- a/dlls/urlmon/umon.c +++ b/dlls/urlmon/umon.c @@ -500,7 +500,6 @@ static HRESULT WINAPI URLMonikerImpl_BindToObject(IMoniker* iface, ******************************************************************************/ static HRESULT URLMonikerImpl_BindToStorage_hack(LPCWSTR URLName, IBindCtx* pbc, - IMoniker* pmkToLeft, REFIID riid, VOID** ppvObject) { @@ -511,13 +510,8 @@ static HRESULT URLMonikerImpl_BindToStorage_hack(LPCWSTR URLName, Binding *bind; int len; - WARN("(%s %p %p %s %p)\n", debugstr_w(URLName), pbc, pmkToLeft, debugstr_guid(riid), - ppvObject); + WARN("(%s %p %s %p)\n", debugstr_w(URLName), pbc, debugstr_guid(riid), ppvObject); - if(pmkToLeft) { - FIXME("pmkToLeft != NULL\n"); - return E_NOTIMPL; - } if(!IsEqualIID(&IID_IStream, riid)) { FIXME("unsupported iid\n"); return E_NOTIMPL; @@ -743,6 +737,9 @@ static HRESULT WINAPI URLMonikerImpl_BindToStorage(IMoniker* iface, URL_COMPONENTSW url = {sizeof(URL_COMPONENTSW), schema, sizeof(schema)/sizeof(WCHAR), 0, NULL, 0, 0, NULL, 0, NULL, 0, NULL, 0, NULL, 0}; + if(pmkToLeft) + FIXME("Unsupported pmkToLeft\n"); + bret = InternetCrackUrlW(This->URLName, 0, ICU_ESCAPE, &url); if(!bret) { ERR("InternetCrackUrl failed: %u\n", GetLastError()); @@ -752,7 +749,7 @@ static HRESULT WINAPI URLMonikerImpl_BindToStorage(IMoniker* iface, if(url.nScheme== INTERNET_SCHEME_HTTPS || url.nScheme== INTERNET_SCHEME_FTP || url.nScheme == INTERNET_SCHEME_GOPHER) - return URLMonikerImpl_BindToStorage_hack(This->URLName, pbc, pmkToLeft, riid, ppvObject); + return URLMonikerImpl_BindToStorage_hack(This->URLName, pbc, riid, ppvObject); TRACE("(%p)->(%p %p %s %p)\n", This, pbc, pmkToLeft, debugstr_guid(riid), ppvObject);

1 0