April 2006 - Wine-Commits - list.winehq.org

Hans Leidekker : dnsapi: Implement DnsNameCompare_{A,W}.
by Alexandre Julliard April 10, 2006

April 10, 2006

Module: wine Branch: refs/heads/master Commit: 486e3b32e2532b45f37f1c62225268b423af8bf7 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=486e3b32e2532b45f37f1c6… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Sun Apr 9 18:35:48 2006 +0200 dnsapi: Implement DnsNameCompare_{A,W}. --- dlls/dnsapi/Makefile.in | 3 +- dlls/dnsapi/dnsapi.h | 42 ++++++++++++++++++++++ dlls/dnsapi/dnsapi.spec | 4 +- dlls/dnsapi/name.c | 89 +++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 135 insertions(+), 3 deletions(-) create mode 100644 dlls/dnsapi/dnsapi.h create mode 100644 dlls/dnsapi/name.c diff --git a/dlls/dnsapi/Makefile.in b/dlls/dnsapi/Makefile.in index 6564117..4a2ecad 100644 --- a/dlls/dnsapi/Makefile.in +++ b/dlls/dnsapi/Makefile.in @@ -8,7 +8,8 @@ IMPORTS = kernel32 EXTRALIBS = $(LIBUNICODE) C_SRCS = \ - main.c + main.c \ + name.c @MAKE_DLL_RULES@ diff --git a/dlls/dnsapi/dnsapi.h b/dlls/dnsapi/dnsapi.h new file mode 100644 index 0000000..7eecc30 --- /dev/null +++ b/dlls/dnsapi/dnsapi.h @@ -0,0 +1,42 @@ +/* + * DNS support + * + * Copyright 2006 Hans Leidekker + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + + +static inline void *dns_alloc( SIZE_T size ) +{ + return HeapAlloc( GetProcessHeap(), 0, size ); +} + +static inline void dns_free( LPVOID mem ) +{ + HeapFree( GetProcessHeap(), 0, mem ); +} + +static inline LPWSTR dns_strdup_aw( LPCSTR str ) +{ + LPWSTR ret = NULL; + if (str) + { + DWORD len = MultiByteToWideChar( CP_ACP, 0, str, -1, NULL, 0 ); + if ((ret = dns_alloc( len * sizeof(WCHAR) ))) + MultiByteToWideChar( CP_ACP, 0, str, -1, ret, len ); + } + return ret; +} diff --git a/dlls/dnsapi/dnsapi.spec b/dlls/dnsapi/dnsapi.spec index 0951705..b80b48f 100644 --- a/dlls/dnsapi/dnsapi.spec +++ b/dlls/dnsapi/dnsapi.spec @@ -68,11 +68,11 @@ @ stub DnsModifyRecordsInSet_A @ stub DnsModifyRecordsInSet_UTF8 @ stub DnsModifyRecordsInSet_W -@ stub DnsNameCompare_A +@ stdcall DnsNameCompare_A(str str) @ stub DnsNameCompareEx_A @ stub DnsNameCompareEx_UTF8 @ stub DnsNameCompareEx_W -@ stub DnsNameCompare_W +@ stdcall DnsNameCompare_W(wstr wstr) @ stub DnsNameCopy @ stub DnsNameCopyAllocate @ stub DnsNotifyResolver diff --git a/dlls/dnsapi/name.c b/dlls/dnsapi/name.c new file mode 100644 index 0000000..c4da728 --- /dev/null +++ b/dlls/dnsapi/name.c @@ -0,0 +1,89 @@ +/* + * DNS support + * + * Copyright (C) 2006 Matthew Kehrer + * Copyright (C) 2006 Hans Leidekker + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#include "wine/debug.h" +#include "wine/unicode.h" + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "winerror.h" +#include "winnls.h" +#include "windns.h" + +#include "dnsapi.h" + +WINE_DEFAULT_DEBUG_CHANNEL(dnsapi); + +/****************************************************************************** + * DnsNameCompare_A [DNSAPI.@] + * + */ +BOOL WINAPI DnsNameCompare_A( LPSTR name1, LPSTR name2 ) +{ + BOOL ret; + LPWSTR name1W, name2W; + + TRACE( "(%s,%s)\n", debugstr_a(name1), debugstr_a(name2) ); + + name1W = dns_strdup_aw( name1 ); + name2W = dns_strdup_aw( name2 ); + + ret = DnsNameCompare_W( name1W, name2W ); + + dns_free( name1W ); + dns_free( name2W ); + + return ret; +} + +/****************************************************************************** + * DnsNameCompare_W [DNSAPI.@] + * + */ +BOOL WINAPI DnsNameCompare_W( LPWSTR name1, LPWSTR name2 ) +{ + WCHAR *p, *q; + + TRACE( "(%s,%s)\n", debugstr_w(name1), debugstr_w(name2) ); + + if (!name1 && !name2) return TRUE; + if (!name1 || !name2) return FALSE; + + p = name1 + lstrlenW( name1 ) - 1; + q = name2 + lstrlenW( name2 ) - 1; + + while (*p == '.' && p >= name1) p--; + while (*q == '.' && q >= name2) q--; + + if (p - name1 != q - name2) return FALSE; + + while (name1 <= p) + { + if (toupperW( *name1 ) != toupperW( *name2 )) + return FALSE; + + name1++; + name2++; + } + return TRUE; +}

1 0

Hans Leidekker : dnsapi: Add a stub implementation of dnsapi.dll.
by Alexandre Julliard April 10, 2006

April 10, 2006

Module: wine Branch: refs/heads/master Commit: 6b1dded3b5c6bb78fd5f8d2244357bbe1736d6e8 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=6b1dded3b5c6bb78fd5f8d2… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Sun Apr 9 18:35:43 2006 +0200 dnsapi: Add a stub implementation of dnsapi.dll. --- configure | 3 + configure.ac | 1 dlls/Makefile.in | 5 ++ dlls/dnsapi/.gitignore | 2 + dlls/dnsapi/Makefile.in | 15 +++++ dlls/dnsapi/dnsapi.spec | 129 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/dnsapi/main.c | 49 ++++++++++++++++++ 7 files changed, 203 insertions(+), 1 deletions(-) create mode 100644 dlls/dnsapi/.gitignore create mode 100644 dlls/dnsapi/Makefile.in create mode 100644 dlls/dnsapi/dnsapi.spec create mode 100644 dlls/dnsapi/main.c Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=6b1dded3b5c6bb78fd5…

1 0

Hans Leidekker : dnsapi: Add windns.h.
by Alexandre Julliard April 10, 2006

April 10, 2006

Module: wine Branch: refs/heads/master Commit: 79dc3eb0953876b9c8576f71fa32edafedc354b3 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=79dc3eb0953876b9c8576f7… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Sun Apr 9 18:35:36 2006 +0200 dnsapi: Add windns.h. Based on a patch sent by Matthew Kehrer a while ago. --- include/Makefile.in | 1 include/windns.h | 605 +++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 606 insertions(+), 0 deletions(-) create mode 100644 include/windns.h Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=79dc3eb0953876b9c85…

1 0

Stefan Dösinger : ddraw: Add a test for IDirect3DVertexBuffer7::ProcessVertices.
by Alexandre Julliard April 10, 2006

April 10, 2006

Module: wine Branch: refs/heads/master Commit: dbdc8c2f6515d7082acede3b510f333d4accc236 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=dbdc8c2f6515d7082acede3… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun Apr 9 17:10:38 2006 +0200 ddraw: Add a test for IDirect3DVertexBuffer7::ProcessVertices. --- dlls/ddraw/tests/d3d.c | 364 +++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 359 insertions(+), 5 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=dbdc8c2f6515d7082ac…

1 0

James Hawkins : advpack: Add initial implementation of SetPerUserSecValues.
by Alexandre Julliard April 10, 2006

April 10, 2006

Module: wine Branch: refs/heads/master Commit: 6053d265bcddb813a891c797b42a36d5bde6223f URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=6053d265bcddb813a891c79… Author: James Hawkins <truiken(a)gmail.com> Date: Sat Apr 8 01:03:30 2006 -0500 advpack: Add initial implementation of SetPerUserSecValues. --- dlls/advpack/advpack.c | 75 +++++++++++++++++++++++++++++++++++++++--- dlls/advpack/tests/advpack.c | 59 +++++++++++++-------------------- 2 files changed, 94 insertions(+), 40 deletions(-) diff --git a/dlls/advpack/advpack.c b/dlls/advpack/advpack.c index da86f75..e9fbc07 100644 --- a/dlls/advpack/advpack.c +++ b/dlls/advpack/advpack.c @@ -469,15 +469,80 @@ HRESULT WINAPI SetPerUserSecValuesA(PERU * RETURNS * Success: S_OK. * Failure: E_FAIL. - * - * BUGS - * Unimplemented. */ HRESULT WINAPI SetPerUserSecValuesW(PERUSERSECTIONW* pPerUser) { - FIXME("(%p) stub\n", pPerUser); + HKEY setup, guid; - return E_FAIL; + static const WCHAR setup_key[] = { + 'S','O','F','T','W','A','R','E','\\', + 'M','i','c','r','o','s','o','f','t','\\', + 'A','c','t','i','v','e',' ','S','e','t','u','p','\\', + 'I','n','s','t','a','l','l','e','d',' ', + 'C','o','m','p','o','n','e','n','t','s',0 + }; + + static const WCHAR stub_path[] = {'S','t','u','b','P','a','t','h',0}; + static const WCHAR version[] = {'V','e','r','s','i','o','n',0}; + static const WCHAR locale[] = {'L','o','c','a','l','e',0}; + static const WCHAR compid[] = {'C','o','m','p','o','n','e','n','t','I','D',0}; + static const WCHAR isinstalled[] = {'I','s','I','n','s','t','a','l','l','e','d',0}; + + TRACE("(%p)\n", pPerUser); + + if (!pPerUser || !*pPerUser->szGUID) + return S_OK; + + if (RegCreateKeyExW(HKEY_LOCAL_MACHINE, setup_key, 0, NULL, 0, KEY_WRITE, + NULL, &setup, NULL)) + { + return E_FAIL; + } + + if (RegCreateKeyExW(setup, pPerUser->szGUID, 0, NULL, 0, KEY_ALL_ACCESS, + NULL, &guid, NULL)) + { + RegCloseKey(setup); + return E_FAIL; + } + + if (*pPerUser->szStub) + { + RegSetValueExW(guid, stub_path, 0, REG_SZ, (LPBYTE)pPerUser->szStub, + (lstrlenW(pPerUser->szStub) + 1) * sizeof(WCHAR)); + } + + if (*pPerUser->szVersion) + { + RegSetValueExW(guid, version, 0, REG_SZ, (LPBYTE)pPerUser->szVersion, + (lstrlenW(pPerUser->szVersion) + 1) * sizeof(WCHAR)); + } + + if (*pPerUser->szLocale) + { + RegSetValueExW(guid, locale, 0, REG_SZ, (LPBYTE)pPerUser->szLocale, + (lstrlenW(pPerUser->szLocale) + 1) * sizeof(WCHAR)); + } + + if (*pPerUser->szCompID) + { + RegSetValueExW(guid, compid, 0, REG_SZ, (LPBYTE)pPerUser->szCompID, + (lstrlenW(pPerUser->szCompID) + 1) * sizeof(WCHAR)); + } + + if (*pPerUser->szDispName) + { + RegSetValueExW(guid, NULL, 0, REG_SZ, (LPBYTE)pPerUser->szDispName, + (lstrlenW(pPerUser->szDispName) + 1) * sizeof(WCHAR)); + } + + RegSetValueExW(guid, isinstalled, 0, REG_DWORD, + (LPBYTE)&pPerUser->dwIsInstalled, sizeof(DWORD)); + + RegCloseKey(guid); + RegCloseKey(setup); + + return S_OK; } /*********************************************************************** diff --git a/dlls/advpack/tests/advpack.c b/dlls/advpack/tests/advpack.c index 0ff8bb9..a79f924 100644 --- a/dlls/advpack/tests/advpack.c +++ b/dlls/advpack/tests/advpack.c @@ -436,34 +436,26 @@ static void setperusersecvalues_test() /* try a NULL pPerUser */ hr = pSetPerUserSecValues(NULL); todo_wine - { - ok(hr == S_OK, "Expected S_OK, got %ld\n", hr); - } + ok(hr == S_OK, "Expected S_OK, got %ld\n", hr); ok(!OPEN_GUID_KEY(), "Expected guid key to not exist\n"); /* at the very least, szGUID must be valid */ peruser.szGUID[0] = '\0'; hr = pSetPerUserSecValues(&peruser); - todo_wine - { - ok(hr == S_OK, "Expected S_OK, got %ld\n", hr); - } + ok(hr == S_OK, "Expected S_OK, got %ld\n", hr); ok(!OPEN_GUID_KEY(), "Expected guid key to not exist\n"); /* set initial values */ lstrcpy(peruser.szGUID, "guid"); hr = pSetPerUserSecValues(&peruser); - todo_wine - { - ok(hr == S_OK, "Expected S_OK, got %ld\n", hr); - ok(OPEN_GUID_KEY(), "Expected guid key to exist\n"); - ok(check_reg_str(guid, NULL, "displayname"), "Expected displayname\n"); - ok(check_reg_str(guid, "ComponentID", "compid"), "Expected compid\n"); - ok(check_reg_str(guid, "Locale", "locale"), "Expected locale\n"); - ok(check_reg_str(guid, "StubPath", "stub"), "Expected stub\n"); - ok(check_reg_str(guid, "Version", "1,1,1,1"), "Expected 1,1,1,1\n"); - ok(check_reg_dword(guid, "IsInstalled", 1), "Expected 1\n"); - } + ok(hr == S_OK, "Expected S_OK, got %ld\n", hr); + ok(OPEN_GUID_KEY(), "Expected guid key to exist\n"); + ok(check_reg_str(guid, NULL, "displayname"), "Expected displayname\n"); + ok(check_reg_str(guid, "ComponentID", "compid"), "Expected compid\n"); + ok(check_reg_str(guid, "Locale", "locale"), "Expected locale\n"); + ok(check_reg_str(guid, "StubPath", "stub"), "Expected stub\n"); + ok(check_reg_str(guid, "Version", "1,1,1,1"), "Expected 1,1,1,1\n"); + ok(check_reg_dword(guid, "IsInstalled", 1), "Expected 1\n"); ok(!REG_VAL_EXISTS(guid, "OldDisplayName"), "Expected OldDisplayName to not exist\n"); ok(!REG_VAL_EXISTS(guid, "OldLocale"), "Expected OldLocale to not exist\n"); ok(!REG_VAL_EXISTS(guid, "OldStubPath"), "Expected OldStubPath to not exist\n"); @@ -473,16 +465,13 @@ static void setperusersecvalues_test() /* raise the version, but bRollback is FALSE, so vals not saved */ lstrcpy(peruser.szVersion, "2,1,1,1"); hr = pSetPerUserSecValues(&peruser); - todo_wine - { - ok(hr == S_OK, "Expected S_OK, got %ld\n", hr); - ok(check_reg_str(guid, NULL, "displayname"), "Expected displayname\n"); - ok(check_reg_str(guid, "ComponentID", "compid"), "Expected compid\n"); - ok(check_reg_str(guid, "Locale", "locale"), "Expected locale\n"); - ok(check_reg_str(guid, "StubPath", "stub"), "Expected stub\n"); - ok(check_reg_str(guid, "Version", "2,1,1,1"), "Expected 2,1,1,1\n"); - ok(check_reg_dword(guid, "IsInstalled", 1), "Expected 1\n"); - } + ok(hr == S_OK, "Expected S_OK, got %ld\n", hr); + ok(check_reg_str(guid, NULL, "displayname"), "Expected displayname\n"); + ok(check_reg_str(guid, "ComponentID", "compid"), "Expected compid\n"); + ok(check_reg_str(guid, "Locale", "locale"), "Expected locale\n"); + ok(check_reg_str(guid, "StubPath", "stub"), "Expected stub\n"); + ok(check_reg_str(guid, "Version", "2,1,1,1"), "Expected 2,1,1,1\n"); + ok(check_reg_dword(guid, "IsInstalled", 1), "Expected 1\n"); ok(!REG_VAL_EXISTS(guid, "OldDisplayName"), "Expected OldDisplayName to not exist\n"); ok(!REG_VAL_EXISTS(guid, "OldLocale"), "Expected OldLocale to not exist\n"); ok(!REG_VAL_EXISTS(guid, "OldStubPath"), "Expected OldStubPath to not exist\n"); @@ -490,16 +479,17 @@ static void setperusersecvalues_test() ok(!REG_VAL_EXISTS(guid, "RealStubPath"), "Expected RealStubPath to not exist\n"); /* raise the version again, bRollback is TRUE so vals are saved */ - peruser.bRollback = 1; + peruser.bRollback = TRUE; lstrcpy(peruser.szVersion, "3,1,1,1"); hr = pSetPerUserSecValues(&peruser); + ok(hr == S_OK, "Expected S_OK, got %ld\n", hr); + ok(check_reg_str(guid, NULL, "displayname"), "Expected displayname\n"); + ok(check_reg_str(guid, "ComponentID", "compid"), "Expected compid\n"); + ok(check_reg_str(guid, "Locale", "locale"), "Expected locale\n"); + ok(check_reg_dword(guid, "IsInstalled", 1), "Expected 1\n"); + ok(check_reg_str(guid, "Version", "3,1,1,1"), "Expected 3,1,1,1\n"); todo_wine { - ok(hr == S_OK, "Expected S_OK, got %ld\n", hr); - ok(check_reg_str(guid, NULL, "displayname"), "Expected displayname\n"); - ok(check_reg_str(guid, "ComponentID", "compid"), "Expected compid\n"); - ok(check_reg_str(guid, "Locale", "locale"), "Expected locale\n"); - ok(check_reg_dword(guid, "IsInstalled", 1), "Expected 1\n"); ok(check_reg_str(guid, "OldDisplayName", "displayname"), "Expected displayname\n"); ok(check_reg_str(guid, "OldLocale", "locale"), "Expected locale\n"); ok(check_reg_str(guid, "RealStubPath", "stub"), "Expected stub\n"); @@ -508,7 +498,6 @@ static void setperusersecvalues_test() ok(check_reg_str(guid, "StubPath", "rundll32.exe advpack.dll,UserInstStubWrapper guid"), "Expected real stub\n"); - ok(check_reg_str(guid, "Version", "3,1,1,1"), "Expected 3,1,1,1\n"); } RegDeleteKey(HKEY_LOCAL_MACHINE, GUID_KEY);

1 0

Eric Pouech : wine.inf: Added dbghelp & imagehlp as fake DLLs.
by Alexandre Julliard April 10, 2006

April 10, 2006

Module: wine Branch: refs/heads/master Commit: eb834b39fa3c24b1531ca1f53a666040f3769009 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=eb834b39fa3c24b1531ca1f… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Mon Apr 10 11:39:27 2006 +0200 wine.inf: Added dbghelp & imagehlp as fake DLLs. --- tools/wine.inf | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/tools/wine.inf b/tools/wine.inf index 0f952ae..5fb165e 100644 --- a/tools/wine.inf +++ b/tools/wine.inf @@ -2115,8 +2115,10 @@ HKLM,%CurrentVersion%\Telephony\Country 11,,comdlg32.dll 11,,control.exe 11,,crypt32.dll +11,,dbghelp.dll 11,,ddraw.dll 11,,gdi32.dll +11,,imagehlp.dll 11,,help.exe,winhelp.exe 11,,hhctrl.ocx 11,,kernel32.dll

1 0

Ivan Gyurdiev : wined3d: Print all errors in checkGLcall.
by Alexandre Julliard April 10, 2006

April 10, 2006

Module: wine Branch: refs/heads/master Commit: 634698cb192f87cfe9eea89ca0b9ac3e252a0b59 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=634698cb192f87cfe9eea89… Author: Ivan Gyurdiev <ivg2(a)cornell.edu> Date: Mon Apr 10 00:39:07 2006 -0400 wined3d: Print all errors in checkGLcall. --- dlls/wined3d/wined3d_private.h | 39 +++++++++++++++++++++++---------------- 1 files changed, 23 insertions(+), 16 deletions(-) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index efaeea2..d5d5cce 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -233,15 +233,18 @@ extern int num_lock; /* Checking of API calls */ /* --------------------- */ -#define checkGLcall(A) \ -{ \ - GLint err = glGetError(); \ - if (err != GL_NO_ERROR) { \ - FIXME(">>>>>>>>>>>>>>>>> %x from %s @ %s / %d\n", err, A, __FILE__, __LINE__); \ - } else { \ - TRACE("%s call ok %s / %d\n", A, __FILE__, __LINE__); \ - } \ -} +#define checkGLcall(A) \ +{ \ + GLint err = glGetError(); \ + if (err == GL_NO_ERROR) { \ + TRACE("%s call ok %s / %d\n", A, __FILE__, __LINE__); \ + \ + } else do { \ + FIXME(">>>>>>>>>>>>>>>>> %x from %s @ %s / %d\n", \ + err, A, __FILE__, __LINE__); \ + err = glGetError(); \ + } while (err != GL_NO_ERROR); \ +} /* Trace routines / diagnostics */ /* ---------------------------- */ @@ -312,14 +315,18 @@ extern const float identity[16]; #endif /* Checking of per-vertex related GL calls */ -#define vcheckGLcall(A) \ -{ \ - GLint err = glGetError(); \ - if (err != GL_NO_ERROR) { \ - FIXME(">>>>>>>>>>>>>>>>> %x from %s @ %s / %d\n", err, A, __FILE__, __LINE__); \ - } else { \ +/* --------------------- */ +#define vcheckGLcall(A) \ +{ \ + GLint err = glGetError(); \ + if (err == GL_NO_ERROR) { \ VTRACE(("%s call ok %s / %d\n", A, __FILE__, __LINE__)); \ - } \ + \ + } else do { \ + FIXME(">>>>>>>>>>>>>>>>> %x from %s @ %s / %d\n", \ + err, A, __FILE__, __LINE__); \ + err = glGetError(); \ + } while (err != GL_NO_ERROR); \ } /* TODO: Confirm each of these works when wined3d move completed */

1 0

Ivan Gyurdiev : wined3d: Downgrade some FIXMEs.
by Alexandre Julliard April 10, 2006

April 10, 2006

Module: wine Branch: refs/heads/master Commit: 88a7c9e94825de73ee8b653692b8dc11136e052f URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=88a7c9e94825de73ee8b653… Author: Ivan Gyurdiev <ivg2(a)cornell.edu> Date: Mon Apr 10 00:58:49 2006 -0400 wined3d: Downgrade some FIXMEs. --- dlls/d3d9/pixelshader.c | 2 +- dlls/wined3d/pixelshader.c | 2 +- dlls/wined3d/vertexshader.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/d3d9/pixelshader.c b/dlls/d3d9/pixelshader.c index 3963ff1..6c9b75c 100644 --- a/dlls/d3d9/pixelshader.c +++ b/dlls/d3d9/pixelshader.c @@ -100,7 +100,7 @@ HRESULT WINAPI IDirect3DDevice9Impl_Crea IDirect3DPixelShader9Impl *object; HRESULT hrc = D3D_OK; - FIXME("(%p) Relay (disabled)\n", This); + TRACE("(%p) Relay \n", This); if (ppShader == NULL) { TRACE("(%p) Invalid call\n", This); diff --git a/dlls/wined3d/pixelshader.c b/dlls/wined3d/pixelshader.c index d35e6ec..2f898e3 100644 --- a/dlls/wined3d/pixelshader.c +++ b/dlls/wined3d/pixelshader.c @@ -1081,7 +1081,7 @@ inline static VOID IWineD3DPixelShaderIm if (pshader_is_comment_token(*pToken)) { /** comment */ DWORD comment_len = (*pToken & D3DSI_COMMENTSIZE_MASK) >> D3DSI_COMMENTSIZE_SHIFT; ++pToken; - FIXME("#%s\n", (char*)pToken); + TRACE("#%s\n", (char*)pToken); pToken += comment_len; continue; } diff --git a/dlls/wined3d/vertexshader.c b/dlls/wined3d/vertexshader.c index ad7291f..88648b5 100644 --- a/dlls/wined3d/vertexshader.c +++ b/dlls/wined3d/vertexshader.c @@ -1482,7 +1482,7 @@ inline static VOID IWineD3DVertexShaderI if (vshader_is_comment_token(*pToken)) { /** comment */ DWORD comment_len = (*pToken & D3DSI_COMMENTSIZE_MASK) >> D3DSI_COMMENTSIZE_SHIFT; ++pToken; - FIXME("#%s\n", (char*)pToken); + TRACE("#%s\n", (char*)pToken); pToken += comment_len; continue; }

1 0

Ivan Gyurdiev : wined3d: Map D3DFMT_L16, D3DFMT_A16B16G16R16 to OpenGL formats.
by Alexandre Julliard April 10, 2006

April 10, 2006

Module: wine Branch: refs/heads/master Commit: 5c12c043df3798cfeb42851170664b935b2e6881 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=5c12c043df3798cfeb42851… Author: Ivan Gyurdiev <ivg2(a)cornell.edu> Date: Mon Apr 10 05:13:17 2006 -0400 wined3d: Map D3DFMT_L16, D3DFMT_A16B16G16R16 to OpenGL formats. Map: D3DFMT_L16 -> GL_LUMINANCE16_EXT D3DFMT_A16B16G16R16 -> GL_RGBA16_EXT as Raphael suggested. Also increase the returned Bpp for unknown and unhandled formats from 4 to 8 bytes - this part fixes segfault in the F.E.A.R demo. It now shows some flashy graphics before it dies again :) --- dlls/wined3d/utils.c | 13 ++++++++++--- 1 files changed, 10 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index ba1eb81..c1eb03e 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -1634,6 +1634,7 @@ GLint D3DFmt2GLIntFmt(IWineD3DDeviceImpl case WINED3DFMT_A8P8: retVal = GL_COLOR_INDEX8_EXT; break; /* Luminance */ case WINED3DFMT_L8: retVal = GL_LUMINANCE8; break; + case WINED3DFMT_L16: retVal = GL_LUMINANCE16_EXT; break; case WINED3DFMT_A8L8: retVal = GL_LUMINANCE8_ALPHA8; break; case WINED3DFMT_A4L4: retVal = GL_LUMINANCE4_ALPHA4; break; /* Bump */ @@ -1655,6 +1656,7 @@ GLint D3DFmt2GLIntFmt(IWineD3DDeviceImpl case WINED3DFMT_A8B8G8R8: retVal = GL_RGBA8; break; case WINED3DFMT_A2R10G10B10: retVal = GL_RGBA8; break; case WINED3DFMT_X8R8G8B8: retVal = GL_RGB; break; + case WINED3DFMT_A16B16G16R16: retVal = GL_RGBA16_EXT; break; /* to see */ case WINED3DFMT_A8: retVal = GL_ALPHA8; break; @@ -1700,6 +1702,7 @@ GLenum D3DFmt2GLFmt(IWineD3DDeviceImpl* case WINED3DFMT_A8P8: retVal = GL_COLOR_INDEX; break; /* Luminance */ case WINED3DFMT_L8: retVal = GL_LUMINANCE; break; + case WINED3DFMT_L16: retVal = GL_LUMINANCE; break; case WINED3DFMT_A8L8: retVal = GL_LUMINANCE_ALPHA; break; case WINED3DFMT_A4L4: retVal = GL_LUMINANCE_ALPHA; break; /* Bump */ @@ -1721,6 +1724,7 @@ GLenum D3DFmt2GLFmt(IWineD3DDeviceImpl* case WINED3DFMT_A8B8G8R8: retVal = GL_RGBA; break; case WINED3DFMT_A2R10G10B10: retVal = GL_BGRA; break; case WINED3DFMT_X8R8G8B8: retVal = GL_BGRA; break; + case WINED3DFMT_A16B16G16R16: retVal = GL_RGBA; break; /* to see */ case WINED3DFMT_A8: retVal = GL_ALPHA; break; /* Depth + Stencil */ @@ -1765,6 +1769,7 @@ GLenum D3DFmt2GLType(IWineD3DDeviceImpl* case WINED3DFMT_A8P8: retVal = GL_UNSIGNED_BYTE; break; /* Luminance */ case WINED3DFMT_L8: retVal = GL_UNSIGNED_BYTE; break; + case WINED3DFMT_L16: retVal = GL_UNSIGNED_BYTE; break; case WINED3DFMT_A8L8: retVal = GL_UNSIGNED_BYTE; break; case WINED3DFMT_A4L4: retVal = GL_UNSIGNED_BYTE; break; /* Bump */ @@ -1828,6 +1833,7 @@ SHORT D3DFmtGetBpp(IWineD3DDeviceImpl* T case WINED3DFMT_A8B8G8R8: retVal = 4; break; case WINED3DFMT_A2R10G10B10: retVal = 4; break; case WINED3DFMT_X8R8G8B8: retVal = 4; break; + case WINED3DFMT_A16B16G16R16: retVal = 8; break; /* Paletted */ case WINED3DFMT_P8: retVal = 1; break; case WINED3DFMT_A8P8: retVal = 2; break; @@ -1842,6 +1848,7 @@ SHORT D3DFmtGetBpp(IWineD3DDeviceImpl* T case WINED3DFMT_D24X8: retVal = 4; break; /* Luminance */ case WINED3DFMT_L8: retVal = 1; break; + case WINED3DFMT_L16: retVal = 2; break; case WINED3DFMT_A4L4: retVal = 1; break; case WINED3DFMT_A8L8: retVal = 2; break; /* Bump */ @@ -1862,13 +1869,13 @@ SHORT D3DFmtGetBpp(IWineD3DDeviceImpl* T /* unknown */ case WINED3DFMT_UNKNOWN: /* Guess at the highest value of the above */ - TRACE("WINED3DFMT_UNKNOWN - Guessing at 4 bytes/pixel %u\n", fmt); - retVal = 4; + TRACE("WINED3DFMT_UNKNOWN - Guessing at 8 bytes/pixel %u\n", fmt); + retVal = 8; break; default: FIXME("Unhandled fmt(%u,%s)\n", fmt, debug_d3dformat(fmt)); - retVal = 4; + retVal = 8; } TRACE("bytes/Pxl for fmt(%u,%s) = %d\n", fmt, debug_d3dformat(fmt), retVal); return retVal;

1 0

Dmitry Timoshkov : shdocvw: Constify IExplore OLE vtables.
by Alexandre Julliard April 10, 2006

April 10, 2006

Module: wine Branch: refs/heads/master Commit: 09a1a3fd7cd3aeb9f24f2fa1cc919accc8fb59cc URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=09a1a3fd7cd3aeb9f24f2fa… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Mon Apr 10 15:30:46 2006 +0900 shdocvw: Constify IExplore OLE vtables. --- dlls/shdocvw/iexplore.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/shdocvw/iexplore.c b/dlls/shdocvw/iexplore.c index a07fa88..f9186b7 100644 --- a/dlls/shdocvw/iexplore.c +++ b/dlls/shdocvw/iexplore.c @@ -37,7 +37,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(shdocvw); typedef struct tag_ieoc { - IOleContainerVtbl *lpVtbl; + const IOleContainerVtbl *lpVtbl; LONG ref; } ieoc; @@ -99,7 +99,7 @@ static HRESULT WINAPI ic_LockContainer(I return E_NOTIMPL; } -static IOleContainerVtbl ocVtbl = +static const IOleContainerVtbl ocVtbl = { ic_QueryInterface, ic_AddRef, @@ -128,8 +128,8 @@ static IOleContainer * get_container(voi /**********************/ typedef struct tag_iecs { - IOleClientSiteVtbl *lpVtbl; - IOleInPlaceSiteVtbl *lpInPlaceVtbl; + const IOleClientSiteVtbl *lpVtbl; + const IOleInPlaceSiteVtbl *lpInPlaceVtbl; LONG ref; IOleContainer *container; HWND hwnd; @@ -248,7 +248,7 @@ static HRESULT WINAPI cs_RequestNewObjec return E_NOTIMPL; } -struct IOleClientSiteVtbl csVtbl = +static const IOleClientSiteVtbl csVtbl = { cs_QueryInterface, cs_AddRef, @@ -362,7 +362,7 @@ static HRESULT WINAPI is_DiscardUndoStat return E_NOTIMPL; } -struct IOleInPlaceSiteVtbl isVtbl = +static const IOleInPlaceSiteVtbl isVtbl = { is_QueryInterface, is_AddRef, @@ -383,7 +383,7 @@ static const WCHAR szIEWinFrame[] = { 'I static LRESULT iewnd_OnCreate(HWND hwnd, LPCREATESTRUCTW lpcs) { - SetWindowLongPtrW(hwnd, 0, (LONG) lpcs->lpCreateParams); + SetWindowLongPtrW(hwnd, 0, (LONG_PTR) lpcs->lpCreateParams); return 0; }

1 0