March 2008 - Wine-commits - list.winehq.org

Francois Gouget : winetest: Simplify the legacy missing dll handling.
by Alexandre Julliard 27 Mar '08

27 Mar '08

Module: tools Branch: master Commit: 108e9ada67ab0e4b338a4653b06ddef6a8175443 URL: http://source.winehq.org/git/tools.git/?a=commit;h=108e9ada67ab0e4b338a4653… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Mar 26 23:34:40 2008 +0100 winetest: Simplify the legacy missing dll handling. --- winetest/gather | 10 +++------- 1 files changed, 3 insertions(+), 7 deletions(-) diff --git a/winetest/gather b/winetest/gather index ee49f4a..8cfd1ab 100755 --- a/winetest/gather +++ b/winetest/gather @@ -134,17 +134,13 @@ foreach my $file (glob "$datadir/$build/*/summary.txt") { $source, $rev) = split; my $testname = "$dll:$unit"; # Leave this in for older type reports - if ($unit =~ /_dll_missing/) { + if ($unit =~ /_dll_missing/ or + ($count eq "0" and exists $report->{dllmissing}->{$dll})) { # Mark the dll as missing on this system $report->{dllmissing}->{$dll} = 1; next; } - if ($count eq "0" and exists $report->{dllmissing}->{$dll}) { - # Mark this test as missing because of a missing dll - $report->{results}->{$testname} = ["dll missing", "-", "-", "-"]; - } else { - $report->{results}->{$testname} = [$count, $todo, $error, $skipped]; - } + $report->{results}->{$testname} = [$count, $todo, $error, $skipped]; if ($rev =~ /\./) { $alltests{$testname} = "http://cvs.winehq.org/cvsweb/wine/$source" . ($rev ne "-"?"#rev$rev":"") unless exists $alltests{$testname};

1 0

Hin-Tak Leung : hhctrl.ocx: Implement more navigation of chm to TOC, default topic and specific title.
by Alexandre Julliard 27 Mar '08

27 Mar '08

Module: wine Branch: master Commit: cf5e6bcec9e0fba7ecfee1951be666569bd8e628 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf5e6bcec9e0fba7ecfee1951… Author: Hin-Tak Leung <Hin-Tak(a)localhost.localdomain> Date: Tue Mar 25 20:55:07 2008 +0000 hhctrl.ocx: Implement more navigation of chm to TOC, default topic and specific title. --- dlls/hhctrl.ocx/chm.c | 33 ++++++++++++++++++++++++++++++++- dlls/hhctrl.ocx/hhctrl.c | 1 + dlls/hhctrl.ocx/hhctrl.h | 25 ++++++++++++++++++++++--- 3 files changed, 55 insertions(+), 4 deletions(-) diff --git a/dlls/hhctrl.ocx/chm.c b/dlls/hhctrl.ocx/chm.c index 710013e..ece05f0 100644 --- a/dlls/hhctrl.ocx/chm.c +++ b/dlls/hhctrl.ocx/chm.c @@ -113,11 +113,20 @@ static BOOL ReadChmSystem(CHMInfo *chm) break; switch(entry.code) { + case 0x0: + TRACE("TOC is %s\n", debugstr_an(buf, entry.len)); + heap_free(chm->defToc); + chm->defToc = strdupnAtoW(buf, entry.len); + break; case 0x2: TRACE("Default topic is %s\n", debugstr_an(buf, entry.len)); + heap_free(chm->defTopic); + chm->defTopic = strdupnAtoW(buf, entry.len); break; case 0x3: TRACE("Title is %s\n", debugstr_an(buf, entry.len)); + heap_free(chm->defTitle); + chm->defTitle = strdupnAtoW(buf, entry.len); break; case 0x5: TRACE("Default window is %s\n", debugstr_an(buf, entry.len)); @@ -212,7 +221,26 @@ BOOL LoadWinTypeFromCHM(HHInfo *info) hr = IStorage_OpenStream(pStorage, windowsW, NULL, STGM_READ, 0, &pStream); if (FAILED(hr)) - return FALSE; + { + /* no defined window types so use (hopefully) sane defaults */ + static const WCHAR defaultwinW[] = {'d','e','f','a','u','l','t','w','i','n','\0'}; + static const WCHAR null[] = {0}; + memset((void*)&(info->WinType), 0, sizeof(info->WinType)); + info->WinType.cbStruct=sizeof(info->WinType); + info->WinType.fUniCodeStrings=TRUE; + info->WinType.pszType=strdupW(defaultwinW); + info->WinType.pszToc = strdupW(info->pCHMInfo->defToc); + info->WinType.pszIndex = strdupW(null); + info->WinType.fsValidMembers=0; + info->WinType.fsWinProperties=HHWIN_PROP_TRI_PANE; + info->WinType.pszCaption=strdupW(info->pCHMInfo->defTitle); + info->WinType.dwStyles=WS_POPUP; + info->WinType.dwExStyles=0; + info->WinType.nShowState=SW_SHOW; + info->WinType.pszFile=strdupW(info->pCHMInfo->defTopic); + info->WinType.curNavType=HHWIN_NAVTYPE_TOC; + return TRUE; + } /* jump past the #WINDOWS header */ liOffset.QuadPart = sizeof(DWORD) * 2; @@ -393,6 +421,9 @@ CHMInfo *CloseCHM(CHMInfo *chm) } heap_free(chm->strings); + heap_free(chm->defTitle); + heap_free(chm->defTopic); + heap_free(chm->defToc); heap_free(chm); return NULL; diff --git a/dlls/hhctrl.ocx/hhctrl.c b/dlls/hhctrl.ocx/hhctrl.c index f8b5c99..472b7cf 100644 --- a/dlls/hhctrl.ocx/hhctrl.c +++ b/dlls/hhctrl.ocx/hhctrl.c @@ -114,6 +114,7 @@ HWND WINAPI HtmlHelpW(HWND caller, LPCWSTR filename, UINT command, DWORD_PTR dat memcpy(chm_file, filename, (index-filename)*sizeof(WCHAR)); chm_file[index-filename] = 0; filename = chm_file; + index += 2; /* advance beyond "::" for calling NavigateToChm() later */ } else { diff --git a/dlls/hhctrl.ocx/hhctrl.h b/dlls/hhctrl.ocx/hhctrl.h index 26c9d4d..6f7c96b 100644 --- a/dlls/hhctrl.ocx/hhctrl.h +++ b/dlls/hhctrl.ocx/hhctrl.h @@ -74,6 +74,10 @@ typedef struct CHMInfo IStream *strings_stream; char **strings; DWORD strings_size; + + WCHAR *defTopic; + WCHAR *defTitle; + WCHAR *defToc; } CHMInfo; #define TAB_CONTENTS 0 @@ -177,7 +181,7 @@ static inline LPWSTR strdupW(LPCWSTR str) return ret; } -static inline LPWSTR strdupAtoW(LPCSTR str) +static inline LPWSTR strdupnAtoW(LPCSTR str, LONG lenA) { LPWSTR ret; DWORD len; @@ -185,13 +189,28 @@ static inline LPWSTR strdupAtoW(LPCSTR str) if(!str) return NULL; - len = MultiByteToWideChar(CP_ACP, 0, str, -1, NULL, 0); + if (lenA > 0) + { + /* find length of string */ + LPCSTR eos = memchr(str, 0, lenA); + if (eos) lenA = eos - str; + } + + len = MultiByteToWideChar(CP_ACP, 0, str, lenA, NULL, 0)+1; /* +1 for null pad */ ret = heap_alloc(len*sizeof(WCHAR)); - MultiByteToWideChar(CP_ACP, 0, str, -1, ret, len); + MultiByteToWideChar(CP_ACP, 0, str, lenA, ret, len); + ret[len-1] = 0; return ret; } +static inline LPWSTR strdupAtoW(LPCSTR str) +{ + return strdupnAtoW(str, -1); +} + + + extern HINSTANCE hhctrl_hinstance; extern BOOL hh_process;

1 0

Rob Shearman : widl: Support using context handles as the binding handle in client functions.
by Alexandre Julliard 27 Mar '08

27 Mar '08

Module: wine Branch: master Commit: 4194daf10835066494e17015b170d83f6c6cebe7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4194daf10835066494e17015b… Author: Rob Shearman <rob(a)codeweavers.com> Date: Wed Mar 26 13:47:30 2008 +0000 widl: Support using context handles as the binding handle in client functions. --- tools/widl/client.c | 30 +++++++++++++++++++++++++++--- 1 files changed, 27 insertions(+), 3 deletions(-) diff --git a/tools/widl/client.c b/tools/widl/client.c index 7747f11..eb65d83 100644 --- a/tools/widl/client.c +++ b/tools/widl/client.c @@ -70,6 +70,20 @@ static void check_pointers(const func_t *func) } } +const var_t* get_context_handle_var(const func_t* func) +{ + const var_t* var; + + if (!func->args) + return NULL; + + LIST_FOR_EACH_ENTRY( var, func->args, const var_t, entry ) + if (is_attr(var->attrs, ATTR_IN) && is_context_handle(var->type)) + return var; + + return NULL; +} + static void write_function_stubs(type_t *iface, unsigned int *proc_offset) { const func_t *func; @@ -85,13 +99,16 @@ static void write_function_stubs(type_t *iface, unsigned int *proc_offset) { const var_t *def = func->def; const var_t* explicit_handle_var; + const var_t* context_handle_var = NULL; int has_full_pointer = is_full_pointer_function(func); /* check for a defined binding handle */ explicit_handle_var = get_explicit_handle_var(func); + if (!explicit_handle_var) + context_handle_var = get_context_handle_var(func); if (explicit_handle) { - if (!explicit_handle_var) + if (!explicit_handle_var || !context_handle_var) { error("%s() does not define an explicit binding handle!\n", def->name); return; @@ -131,7 +148,7 @@ static void write_function_stubs(type_t *iface, unsigned int *proc_offset) fprintf(client, " _RetVal;\n"); } - if (implicit_handle || explicit_handle_var) + if (implicit_handle || explicit_handle_var || context_handle_var) print_client("RPC_BINDING_HANDLE _Handle = 0;\n"); print_client("RPC_MESSAGE _RpcMessage;\n"); @@ -172,6 +189,13 @@ static void write_function_stubs(type_t *iface, unsigned int *proc_offset) print_client("_Handle = %s;\n", explicit_handle_var->name); fprintf(client, "\n"); } + else if (context_handle_var) + { + print_client("if (%s%s != 0)\n", is_ptr(context_handle_var->type) ? "*" : "", context_handle_var->name); + indent++; + print_client("_Handle = NDRCContextBinding(%s%s);\n", is_ptr(context_handle_var->type) ? "*" : "", context_handle_var->name); + indent--; + } write_remoting_arguments(client, indent, func, PASS_IN, PHASE_BUFFERSIZE); @@ -179,7 +203,7 @@ static void write_function_stubs(type_t *iface, unsigned int *proc_offset) indent++; print_client("(PMIDL_STUB_MESSAGE)&_StubMsg,\n"); print_client("_StubMsg.BufferLength,\n"); - if (implicit_handle || explicit_handle_var) + if (implicit_handle || explicit_handle_var || context_handle_var) print_client("_Handle);\n"); else print_client("%s__MIDL_AutoBindHandle);\n", iface->name);

1 0

Ge van Geldorp : shell32: Support getting the shell folder path for users other than the current user and the default user .
by Alexandre Julliard 27 Mar '08

27 Mar '08

Module: wine Branch: master Commit: 35d7f7061247158b34ec46e7c8ec6ffb75e45a57 URL: http://source.winehq.org/git/wine.git/?a=commit;h=35d7f7061247158b34ec46e7c… Author: Ge van Geldorp <ge(a)thinstall.com> Date: Thu Mar 27 00:34:42 2008 +0100 shell32: Support getting the shell folder path for users other than the current user and the default user. --- dlls/shell32/shellpath.c | 70 ++++++++++++++++++++++++++++++++++++---------- 1 files changed, 55 insertions(+), 15 deletions(-) diff --git a/dlls/shell32/shellpath.c b/dlls/shell32/shellpath.c index 738e9e3..c4ae688 100644 --- a/dlls/shell32/shellpath.c +++ b/dlls/shell32/shellpath.c @@ -47,6 +47,7 @@ #include "wine/unicode.h" #include "shlwapi.h" #include "xdg.h" +#include "sddl.h" WINE_DEFAULT_DEBUG_CHANNEL(shell); @@ -1356,6 +1357,39 @@ static HRESULT _SHGetCurrentVersionPath(DWORD dwFlags, BYTE folder, return hr; } +static LPWSTR _GetUserSidStringFromToken(HANDLE Token) +{ + char InfoBuffer[64]; + PTOKEN_USER UserInfo; + DWORD InfoSize; + LPWSTR SidStr; + + UserInfo = (PTOKEN_USER) InfoBuffer; + if (! GetTokenInformation(Token, TokenUser, InfoBuffer, sizeof(InfoBuffer), + &InfoSize)) + { + if (GetLastError() != ERROR_INSUFFICIENT_BUFFER) + return NULL; + UserInfo = HeapAlloc(GetProcessHeap(), 0, InfoSize); + if (UserInfo == NULL) + return NULL; + if (! GetTokenInformation(Token, TokenUser, UserInfo, InfoSize, + &InfoSize)) + { + HeapFree(GetProcessHeap(), 0, UserInfo); + return NULL; + } + } + + if (! ConvertSidToStringSidW(UserInfo->User.Sid, &SidStr)) + SidStr = NULL; + + if (UserInfo != (PTOKEN_USER) InfoBuffer) + HeapFree(GetProcessHeap(), 0, UserInfo); + + return SidStr; +} + /* Gets the user's path (unexpanded) for the CSIDL with index folder: * If SHGFP_TYPE_DEFAULT is set, calls _SHGetDefaultValue for it. Otherwise * calls _SHGetUserShellFolderPath for it. Where it looks depends on hToken: @@ -1378,22 +1412,15 @@ static HRESULT _SHGetUserProfilePath(HANDLE hToken, DWORD dwFlags, BYTE folder, if (!pszPath) return E_INVALIDARG; - /* Only the current user and the default user are supported right now - * I'm afraid. - * FIXME: should be able to call GetTokenInformation on the token, - * then call ConvertSidToStringSidW on it to get the user prefix. - * But Wine's registry doesn't store user info by sid, it stores it - * by user name (and I don't know how to convert from a token to a - * user name). - */ - if (hToken != NULL && hToken != (HANDLE)-1) - { - FIXME("unsupported for user other than current or default\n"); - return E_FAIL; - } - if (dwFlags & SHGFP_TYPE_DEFAULT) + { + if (hToken != NULL && hToken != (HANDLE)-1) + { + FIXME("unsupported for user other than current or default\n"); + return E_FAIL; + } hr = _SHGetDefaultValue(folder, pszPath); + } else { LPCWSTR userPrefix = NULL; @@ -1404,8 +1431,18 @@ static HRESULT _SHGetUserProfilePath(HANDLE hToken, DWORD dwFlags, BYTE folder, hRootKey = HKEY_USERS; userPrefix = DefaultW; } - else /* hToken == NULL, other values disallowed above */ + else if (hToken == NULL) hRootKey = HKEY_CURRENT_USER; + else + { + hRootKey = HKEY_USERS; + userPrefix = _GetUserSidStringFromToken(hToken); + if (userPrefix == NULL) + { + hr = E_FAIL; + goto error; + } + } hr = _SHGetUserShellFolderPath(hRootKey, userPrefix, CSIDL_Data[folder].szValueName, pszPath); if (FAILED(hr) && hRootKey != HKEY_LOCAL_MACHINE) @@ -1413,7 +1450,10 @@ static HRESULT _SHGetUserProfilePath(HANDLE hToken, DWORD dwFlags, BYTE folder, CSIDL_Data[folder].szValueName, pszPath); if (FAILED(hr)) hr = _SHGetDefaultValue(folder, pszPath); + if (userPrefix != NULL && userPrefix != DefaultW) + LocalFree((HLOCAL) userPrefix); } +error: TRACE("returning 0x%08x (output path is %s)\n", hr, debugstr_w(pszPath)); return hr; }

1 0

Stefan Dösinger : wined3d: Free heapMemory, not allocatedMemory when adjusting the surface.
by Alexandre Julliard 27 Mar '08

27 Mar '08

Module: wine Branch: master Commit: f761b908013698ee4e015ea03f48ce5d170fb666 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f761b908013698ee4e015ea03… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun Mar 23 16:14:05 2008 +0100 wined3d: Free heapMemory, not allocatedMemory when adjusting the surface. --- dlls/wined3d/device.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 74d3bf7..ee27abf 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -6950,7 +6950,9 @@ static void updateSurfaceDesc(IWineD3DSurfaceImpl *surface, WINED3DPRESENT_PARAM } else { surface->Flags &= ~SFLAG_NONPOW2; } - HeapFree(GetProcessHeap(), 0, surface->resource.allocatedMemory); + HeapFree(GetProcessHeap(), 0, surface->resource.heapMemory); + surface->resource.allocatedMemory = NULL; + surface->resource.heapMemory = NULL; surface->resource.size = IWineD3DSurface_GetPitch((IWineD3DSurface *) surface) * surface->pow2Width; }

1 0

Stefan Dösinger : d3d9: Add a basic test for multiple rendertargets.
by Alexandre Julliard 27 Mar '08

27 Mar '08

Module: wine Branch: master Commit: 82d25338aa37cdb96397a51a349b862c3b71946a URL: http://source.winehq.org/git/wine.git/?a=commit;h=82d25338aa37cdb96397a51a3… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Feb 26 12:21:55 2008 +0100 d3d9: Add a basic test for multiple rendertargets. --- dlls/d3d9/tests/visual.c | 115 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 115 insertions(+), 0 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 22c36c5..7f21dc2 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -7587,6 +7587,120 @@ static void pointsize_test(IDirect3DDevice9 *device) ok(hr == D3D_OK, "IDirect3DDevice9_SetTransform failed, hr=%s\n", DXGetErrorString9(hr)); } +static void multiple_rendertargets_test(IDirect3DDevice9 *device) +{ + HRESULT hr; + IDirect3DPixelShader9 *ps; + IDirect3DTexture9 *tex1, *tex2; + IDirect3DSurface9 *surf1, *surf2, *backbuf; + D3DCAPS9 caps; + DWORD color; + DWORD shader_code[] = { + 0xffff0300, /* ps_3_0 */ + 0x05000051, 0xa00f0000, 0x00000000, 0x3f800000, 0x00000000, 0x00000000, /* def c0, 0, 1, 0, 0 */ + 0x05000051, 0xa00f0001, 0x00000000, 0x00000000, 0x3f800000, 0x00000000, /* def c1, 0, 0, 1, 0 */ + 0x02000001, 0x800f0800, 0xa0e40000, /* mov oC0, c0 */ + 0x02000001, 0x800f0801, 0xa0e40001, /* mov oC1, c1 */ + 0x0000ffff /* END */ + }; + float quad[] = { + -1.0, -1.0, 0.1, + 1.0, -1.0, 0.1, + -1.0, 1.0, 0.1, + 1.0, 1.0, 0.1, + }; + float texquad[] = { + -1.0, -1.0, 0.1, 0.0, 0.0, + 0.0, -1.0, 0.1, 1.0, 0.0, + -1.0, 1.0, 0.1, 0.0, 1.0, + 0.0, 1.0, 0.1, 1.0, 1.0, + + 0.0, -1.0, 0.1, 0.0, 0.0, + 1.0, -1.0, 0.1, 1.0, 0.0, + 0.0, 1.0, 0.1, 0.0, 1.0, + 1.0, 1.0, 0.1, 1.0, 1.0, + }; + + memset(&caps, 0, sizeof(caps)); + hr = IDirect3DDevice9_GetDeviceCaps(device, &caps); + ok(hr == D3D_OK, "IDirect3DDevice9_GetCaps failed, hr=%s\n", DXGetErrorString9(hr)); + if(caps.NumSimultaneousRTs < 2) { + skip("Only 1 simultaneous render target supported, skipping MRT test\n"); + return; + } + + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET | D3DCLEAR_ZBUFFER, 0xffff0000, 0.0, 0); + ok(hr == D3D_OK, "IDirect3DDevice9_Clear failed, hr=%s\n", DXGetErrorString9(hr)); + + hr = IDirect3DDevice9_CreateTexture(device, 16, 16, 1, D3DUSAGE_RENDERTARGET, D3DFMT_X8R8G8B8, D3DPOOL_DEFAULT, &tex1, NULL); + ok(hr == D3D_OK, "IDirect3DDevice9_CreateTexture failed, hr=%s\n", DXGetErrorString9(hr)); + hr = IDirect3DDevice9_CreateTexture(device, 16, 16, 1, D3DUSAGE_RENDERTARGET, D3DFMT_X8R8G8B8, D3DPOOL_DEFAULT, &tex2, NULL); + ok(hr == D3D_OK, "IDirect3DDevice9_CreateTexture failed, hr=%s\n", DXGetErrorString9(hr)); + hr = IDirect3DDevice9_CreatePixelShader(device, shader_code, &ps); + ok(hr == D3D_OK, "IDirect3DDevice9_CreatePixelShader failed, hr=%s\n", DXGetErrorString9(hr)); + + hr = IDirect3DDevice9_GetRenderTarget(device, 0, &backbuf); + ok(hr == D3D_OK, "IDirect3DDevice9_GetRenderTarget failed, hr=%s\n", DXGetErrorString9(hr)); + hr = IDirect3DTexture9_GetSurfaceLevel(tex1, 0, &surf1); + ok(hr == D3D_OK, "IDirect3DTexture9_GetSurfaceLevel failed, hr=%s\n", DXGetErrorString9(hr)); + hr = IDirect3DTexture9_GetSurfaceLevel(tex2, 0, &surf2); + ok(hr == D3D_OK, "IDirect3DTexture9_GetSurfaceLevel failed, hr=%s\n", DXGetErrorString9(hr)); + + hr = IDirect3DDevice9_SetPixelShader(device, ps); + ok(hr == D3D_OK, "IDirect3DDevice9_SetPixelShader failed, hr=%s\n", DXGetErrorString9(hr)); + hr = IDirect3DDevice9_SetRenderTarget(device, 0, surf1); + ok(hr == D3D_OK, "IDirect3DDevice9_SetRenderTarget failed, hr=%s\n", DXGetErrorString9(hr)); + hr = IDirect3DDevice9_SetRenderTarget(device, 1, surf2); + ok(hr == D3D_OK, "IDirect3DDevice9_SetRenderTarget failed, hr=%s\n", DXGetErrorString9(hr)); + hr = IDirect3DDevice9_SetFVF(device, D3DFVF_XYZ); + ok(hr == D3D_OK, "IDirect3DDevice9_SetFVF failed, hr=%s\n", DXGetErrorString9(hr)); + + hr = IDirect3DDevice9_BeginScene(device); + ok(hr == D3D_OK, "IDirect3DDevice9_BeginScene failed, hr=%s\n", DXGetErrorString9(hr)); + if(SUCCEEDED(hr)) { + hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad, 3 * sizeof(float)); + ok(hr == D3D_OK, "IDirect3DDevice9_DrawPrimitiveUP failed, hr=%s\n", DXGetErrorString9(hr)); + + hr = IDirect3DDevice9_SetPixelShader(device, NULL); + ok(hr == D3D_OK, "IDirect3DDevice9_SetPixelShader failed, hr=%s\n", DXGetErrorString9(hr)); + hr = IDirect3DDevice9_SetRenderTarget(device, 0, backbuf); + ok(hr == D3D_OK, "IDirect3DDevice9_SetRenderTarget failed, hr=%s\n", DXGetErrorString9(hr)); + hr = IDirect3DDevice9_SetRenderTarget(device, 1, NULL); + ok(hr == D3D_OK, "IDirect3DDevice9_SetRenderTarget failed, hr=%s\n", DXGetErrorString9(hr)); + hr = IDirect3DDevice9_SetFVF(device, D3DFVF_XYZ | D3DFVF_TEX1); + ok(hr == D3D_OK, "IDirect3DDevice9_SetFVF failed, hr=%s\n", DXGetErrorString9(hr)); + + hr = IDirect3DDevice9_SetTexture(device, 0, (IDirect3DBaseTexture9 *) tex1); + ok(hr == D3D_OK, "IDirect3DDevice9_SetTexture failed, hr=%s\n", DXGetErrorString9(hr)); + hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, &texquad[0], 5 * sizeof(float)); + ok(hr == D3D_OK, "IDirect3DDevice9_DrawPrimitiveUP failed, hr=%s\n", DXGetErrorString9(hr)); + + hr = IDirect3DDevice9_SetTexture(device, 0, (IDirect3DBaseTexture9 *) tex2); + ok(hr == D3D_OK, "IDirect3DDevice9_SetTexture failed, hr=%s\n", DXGetErrorString9(hr)); + hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, &texquad[20], 5 * sizeof(float)); + ok(hr == D3D_OK, "IDirect3DDevice9_DrawPrimitiveUP failed, hr=%s\n", DXGetErrorString9(hr)); + + hr = IDirect3DDevice9_SetTexture(device, 0, NULL); + ok(hr == D3D_OK, "IDirect3DDevice9_SetTexture failed, hr=%s\n", DXGetErrorString9(hr)); + + hr = IDirect3DDevice9_EndScene(device); + ok(hr == D3D_OK, "IDirect3DDevice9_EndScene failed, hr=%s\n", DXGetErrorString9(hr)); + } + + IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); + color = getPixelColor(device, 160, 240); + ok(color == 0x0000ff00, "Texture 1(output color 1) has color 0x%08x, expected 0x0000ff00\n", color); + color = getPixelColor(device, 480, 240); + ok(color == 0x000000ff, "Texture 2(output color 2) has color 0x%08x, expected 0x000000ff\n", color); + + IDirect3DPixelShader9_Release(ps); + IDirect3DTexture9_Release(tex1); + IDirect3DTexture9_Release(tex2); + IDirect3DSurface9_Release(surf1); + IDirect3DSurface9_Release(surf2); + IDirect3DSurface9_Release(backbuf); +} + START_TEST(visual) { IDirect3DDevice9 *device_ptr; @@ -7719,6 +7833,7 @@ START_TEST(visual) fixed_function_varying_test(device_ptr); vFace_register_test(device_ptr); vpos_register_test(device_ptr); + multiple_rendertargets_test(device_ptr); if(caps.VertexShaderVersion >= D3DVS_VERSION(3, 0)) { vshader_version_varying_test(device_ptr); pshader_version_varying_test(device_ptr);

1 0

Stefan Dösinger : ddraw: Some EnumZBufferFormat fixes.
by Alexandre Julliard 27 Mar '08

27 Mar '08

Module: wine Branch: master Commit: ee13cc4903285c764cd27e3a2650b3815d2eee3f URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee13cc4903285c764cd27e3a2… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Mar 21 23:33:37 2008 +0100 ddraw: Some EnumZBufferFormat fixes. --- dlls/ddraw/direct3d.c | 52 ++++++++++++++++++++++++++++++++++++++++-------- 1 files changed, 43 insertions(+), 9 deletions(-) diff --git a/dlls/ddraw/direct3d.c b/dlls/ddraw/direct3d.c index 34e14d3..730fcf6 100644 --- a/dlls/ddraw/direct3d.c +++ b/dlls/ddraw/direct3d.c @@ -1132,6 +1132,7 @@ IDirect3DImpl_7_EnumZBufferFormats(IDirect3D7 *iface, HRESULT hr; int i; WINED3DDISPLAYMODE d3ddm; + WINED3DDEVTYPE type; /* Order matters. Specifically, BattleZone II (full version) expects the * 16-bit depth formats to be listed before the 24 and 32 ones. */ @@ -1146,23 +1147,56 @@ IDirect3DImpl_7_EnumZBufferFormats(IDirect3D7 *iface, TRACE("(%p)->(%s,%p,%p): Relay\n", iface, debugstr_guid(refiidDevice), Callback, Context); - if(IWineD3D_GetAdapterDisplayMode(This->wineD3D, WINED3DADAPTER_DEFAULT, &d3ddm ) != WINED3D_OK) { - ERR("Unable to retrieve a default display mode for quering the z-buffer formats!\n"); - return DDERR_INVALIDPARAMS; - } - if(!Callback) return DDERR_INVALIDPARAMS; + if(IsEqualGUID(refiidDevice, &IID_IDirect3DHALDevice) || + IsEqualGUID(refiidDevice, &IID_IDirect3DTnLHalDevice) || + IsEqualGUID(refiidDevice, &IID_D3DDEVICE_WineD3D)) + { + TRACE("Asked for HAL device\n"); + type = WINED3DDEVTYPE_HAL; + } + else if(IsEqualGUID(refiidDevice, &IID_IDirect3DRGBDevice) || + IsEqualGUID(refiidDevice, &IID_IDirect3DMMXDevice)) + { + TRACE("Asked for SW device\n"); + type = WINED3DDEVTYPE_SW; + } + else if(IsEqualGUID(refiidDevice, &IID_IDirect3DRefDevice)) + { + TRACE("Asked for REF device\n"); + type = WINED3DDEVTYPE_REF; + } + else if(IsEqualGUID(refiidDevice, &IID_IDirect3DNullDevice)) + { + TRACE("Asked for NULLREF device\n"); + type = WINED3DDEVTYPE_NULLREF; + } + else + { + FIXME("Unexpected device GUID %s\n", debugstr_guid(refiidDevice)); + type = WINED3DDEVTYPE_HAL; + } + EnterCriticalSection(&ddraw_cs); - for(i = 0; i < sizeof(FormatList) / sizeof(WINED3DFORMAT); i++) + /* We need an adapter format from somewhere to please wined3d and WGL. Use the current display mode. + * So far all cards offer the same depth stencil format for all modes, but if some do not and apps + * do not like that we'll have to find some workaround, like iterating over all imaginable formats + * and collecting all the depth stencil formats we can get + */ + hr = IWineD3DDevice_GetDisplayMode(This->wineD3DDevice, + 0 /* swapchain 0 */, + &d3ddm); + + for(i = 0; i < (sizeof(FormatList) / sizeof(FormatList[0])); i++) { hr = IWineD3D_CheckDeviceFormat(This->wineD3D, - 0 /* Adapter */, - 0 /* DeviceType */, + WINED3DADAPTER_DEFAULT /* Adapter */, + type /* DeviceType */, d3ddm.Format /* AdapterFormat */, WINED3DUSAGE_DEPTHSTENCIL /* Usage */, - WINED3DRTYPE_SURFACE /* ResourceType */, + WINED3DRTYPE_SURFACE, FormatList[i]); if(hr == D3D_OK) {

1 0

Stefan Dösinger : ddraw: Fix some Z buffer formats.
by Alexandre Julliard 27 Mar '08

27 Mar '08

Module: wine Branch: master Commit: 8662bd7555593fe010b02e0f2f0bd80fd858ed41 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8662bd7555593fe010b02e0f2… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Mar 21 19:16:20 2008 +0100 ddraw: Fix some Z buffer formats. --- dlls/ddraw/utils.c | 49 +++++++++++++++++++++++++++---------------------- 1 files changed, 27 insertions(+), 22 deletions(-) diff --git a/dlls/ddraw/utils.c b/dlls/ddraw/utils.c index cddc2fd..2c08328 100644 --- a/dlls/ddraw/utils.c +++ b/dlls/ddraw/utils.c @@ -192,7 +192,7 @@ PixelFormat_WineD3DtoDD(DDPIXELFORMAT *DDPixelFormat, DDPixelFormat->u2.dwStencilBitDepth = 0; DDPixelFormat->u3.dwZBitMask = 0x0000FFFF; DDPixelFormat->u4.dwStencilBitMask = 0x0; - DDPixelFormat->u5.dwRGBZBitMask = 0x0000FFFF; + DDPixelFormat->u5.dwRGBZBitMask = 0x00000000; break; case WINED3DFMT_D32: @@ -202,17 +202,17 @@ PixelFormat_WineD3DtoDD(DDPIXELFORMAT *DDPixelFormat, DDPixelFormat->u2.dwStencilBitDepth = 0; DDPixelFormat->u3.dwZBitMask = 0xFFFFFFFF; DDPixelFormat->u4.dwStencilBitMask = 0x0; - DDPixelFormat->u5.dwRGBZBitMask = 0xFFFFFFFF; + DDPixelFormat->u5.dwRGBZBitMask = 0x00000000; break; case WINED3DFMT_D24X4S4: DDPixelFormat->dwFlags = DDPF_ZBUFFER | DDPF_STENCILBUFFER; DDPixelFormat->dwFourCC = 0; /* Should I set dwZBufferBitDepth to 32 here? */ - DDPixelFormat->u1.dwZBufferBitDepth = 24; + DDPixelFormat->u1.dwZBufferBitDepth = 32; DDPixelFormat->u2.dwStencilBitDepth = 4; - DDPixelFormat->u3.dwZBitMask = 0x0; - DDPixelFormat->u4.dwStencilBitMask = 0x0; + DDPixelFormat->u3.dwZBitMask = 0x00FFFFFF; + DDPixelFormat->u4.dwStencilBitMask = 0x0F000000; DDPixelFormat->u5.dwRGBAlphaBitMask = 0x0; break; @@ -220,31 +220,30 @@ PixelFormat_WineD3DtoDD(DDPIXELFORMAT *DDPixelFormat, DDPixelFormat->dwFlags = DDPF_ZBUFFER | DDPF_STENCILBUFFER; DDPixelFormat->dwFourCC = 0; /* Should I set dwZBufferBitDepth to 32 here? */ - DDPixelFormat->u1.dwZBufferBitDepth = 24; + DDPixelFormat->u1.dwZBufferBitDepth = 32; DDPixelFormat->u2.dwStencilBitDepth = 8; - DDPixelFormat->u3.dwZBitMask = 0x0; - DDPixelFormat->u4.dwStencilBitMask = 0x0; + DDPixelFormat->u3.dwZBitMask = 0x00FFFFFFFF; + DDPixelFormat->u4.dwStencilBitMask = 0xFF000000; DDPixelFormat->u5.dwRGBAlphaBitMask = 0x0; break; case WINED3DFMT_D24X8: DDPixelFormat->dwFlags = DDPF_ZBUFFER; DDPixelFormat->dwFourCC = 0; - DDPixelFormat->u1.dwZBufferBitDepth = 24; - DDPixelFormat->u2.dwStencilBitDepth = 8; - DDPixelFormat->u3.dwZBitMask = 0x0; - DDPixelFormat->u4.dwStencilBitMask = 0x0; + DDPixelFormat->u1.dwZBufferBitDepth = 32; + DDPixelFormat->u2.dwStencilBitDepth = 0; + DDPixelFormat->u3.dwZBitMask = 0x00FFFFFFFF; + DDPixelFormat->u4.dwStencilBitMask = 0x00000000; DDPixelFormat->u5.dwRGBAlphaBitMask = 0x0; break; case WINED3DFMT_D15S1: DDPixelFormat->dwFlags = DDPF_ZBUFFER | DDPF_STENCILBUFFER; DDPixelFormat->dwFourCC = 0; - /* Should I set dwZBufferBitDepth to 16 here? */ - DDPixelFormat->u1.dwZBufferBitDepth = 15; + DDPixelFormat->u1.dwZBufferBitDepth = 16; DDPixelFormat->u2.dwStencilBitDepth = 1; - DDPixelFormat->u3.dwZBitMask = 0x0; - DDPixelFormat->u4.dwStencilBitMask = 0x0; + DDPixelFormat->u3.dwZBitMask = 0x7fff; + DDPixelFormat->u4.dwStencilBitMask = 0x8000; DDPixelFormat->u5.dwRGBAlphaBitMask = 0x0; break; @@ -495,19 +494,20 @@ PixelFormat_DD2WineD3D(const DDPIXELFORMAT *DDPixelFormat) switch(DDPixelFormat->u1.dwZBufferBitDepth) { case 8: - ERR("8 Bits Z+Stencil buffer pixelformat is not supported. Returning WINED3DFMT_UNKNOWN\n"); + FIXME("8 Bits Z+Stencil buffer pixelformat is not supported. Returning WINED3DFMT_UNKNOWN\n"); return WINED3DFMT_UNKNOWN; case 15: + FIXME("15 bit depth buffer not handled yet, assuming 16 bit\n"); case 16: if(DDPixelFormat->u2.dwStencilBitDepth == 1) return WINED3DFMT_D15S1; - ERR("Don't know how to handle a 16 bit Z buffer with %d bit stencil buffer pixelformat\n", DDPixelFormat->u2.dwStencilBitDepth); + FIXME("Don't know how to handle a 16 bit Z buffer with %d bit stencil buffer pixelformat\n", DDPixelFormat->u2.dwStencilBitDepth); return WINED3DFMT_UNKNOWN; case 24: - ERR("Don't know how to handle a 24 bit depth buffer with stencil bits\n"); + FIXME("Don't know how to handle a 24 bit depth buffer with stencil bits\n"); return WINED3DFMT_D24S8; case 32: @@ -533,10 +533,15 @@ PixelFormat_DD2WineD3D(const DDPIXELFORMAT *DDPixelFormat) return WINED3DFMT_D16; case 24: - return WINED3DFMT_D24X8; - + FIXME("24 Bit depth buffer, treating like a 32 bit one\n"); case 32: - return WINED3DFMT_D32; + if(DDPixelFormat->u3.dwZBitMask == 0x00FFFFFF) { + return WINED3DFMT_D24X8; + } else if(DDPixelFormat->u3.dwZBitMask == 0xFFFFFFFF) { + return WINED3DFMT_D32; + } + FIXME("Unhandled 32 bit depth buffer bitmasks, returning WINED3DFMT_D24X8\n"); + return WINED3DFMT_D24X8; /* That's most likely to make games happy */ default: ERR("Unsupported Z buffer depth %d\n", DDPixelFormat->u1.dwZBufferBitDepth);

1 0

Austin English : Spelling fixes.
by Alexandre Julliard 27 Mar '08

27 Mar '08

Module: wine Branch: master Commit: 4777f26d61b0fdef23d05ff0fa7e788a427f28c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4777f26d61b0fdef23d05ff0f… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Mar 26 16:23:36 2008 -0500 Spelling fixes. --- dlls/d3d8/d3d8_private.h | 2 +- dlls/d3d8/device.c | 4 ++-- dlls/d3d8/directx.c | 2 +- dlls/d3d8/stateblock.c | 2 +- dlls/d3d8/tests/device.c | 4 ++-- dlls/d3d8/tests/surface.c | 2 +- dlls/d3d8/tests/visual.c | 2 +- dlls/d3d9/d3d9_private.h | 2 +- dlls/d3d9/stateblock.c | 2 +- dlls/d3d9/tests/device.c | 6 +++--- dlls/d3d9/tests/surface.c | 2 +- dlls/d3d9/tests/visual.c | 10 +++++----- dlls/d3dx8/tests/math.c | 2 +- 13 files changed, 21 insertions(+), 21 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4777f26d61b0fdef23d05…

1 0

Alexander Dorofeyev : d3d9/tests: Test that GOURAUD and PHONG modes are equal.
by Alexandre Julliard 27 Mar '08

27 Mar '08

Module: wine Branch: master Commit: 7bb58929b7d5a97739db4d74ca44578f325e5a6b URL: http://source.winehq.org/git/wine.git/?a=commit;h=7bb58929b7d5a97739db4d74c… Author: Alexander Dorofeyev <alexd4(a)inbox.lv> Date: Thu Mar 27 00:23:10 2008 +0200 d3d9/tests: Test that GOURAUD and PHONG modes are equal. --- dlls/d3d9/tests/visual.c | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 1e8d9c3..e73e59c 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -5642,6 +5642,7 @@ static void shademode_test(IDirect3DDevice9 *device) /* Render a quad and try all of the different fixed function shading models. */ HRESULT hr; DWORD color0, color1; + DWORD color0_gouraud = 0, color1_gouraud = 0; BYTE r, g, b; DWORD shademode = D3DSHADE_FLAT; DWORD primtype = D3DPT_TRIANGLESTRIP; @@ -5748,6 +5749,10 @@ static void shademode_test(IDirect3DDevice9 *device) b = (color1 & 0x000000ff); ok(r == 0x0d && g >= 0x44 && g <= 0x45 && b >= 0xc7 && b <= 0xc8, "GOURAUD shading has color1 %08x, expected 0x000d45c7\n", color1); + + color0_gouraud = color0; + color1_gouraud = color1; + shademode = D3DSHADE_PHONG; break; case D3DSHADE_PHONG: @@ -5762,6 +5767,11 @@ static void shademode_test(IDirect3DDevice9 *device) b = (color1 & 0x000000ff); ok(r == 0x0d && g >= 0x44 && g <= 0x45 && b >= 0xc7 && b <= 0xc8, "PHONG shading has color1 %08x, expected 0x000d45c7\n", color1); + + ok(color0 == color0_gouraud, "difference between GOURAUD and PHONG shading detected: %08x %08x\n", + color0_gouraud, color0); + ok(color1 == color1_gouraud, "difference between GOURAUD and PHONG shading detected: %08x %08x\n", + color1_gouraud, color1); break; } }

1 0