wine-commits January 2013

wine-commits@winehq.org

2 participants
736 discussions

André Hentschel : libwine: Implemented the wine_call_on_stack function for ARM64.
by Alexandre Julliard 16 Jan '13

16 Jan '13

Module: wine Branch: master Commit: 16954b3a821f9585f88ce807a2b15d650ec982e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=16954b3a821f9585f88ce807a… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Jan 16 00:41:58 2013 +0100 libwine: Implemented the wine_call_on_stack function for ARM64. --- libs/wine/port.c | 13 +++++++++++++ 1 files changed, 13 insertions(+), 0 deletions(-) diff --git a/libs/wine/port.c b/libs/wine/port.c index 8e8caf8..87e5833 100644 --- a/libs/wine/port.c +++ b/libs/wine/port.c @@ -156,6 +156,19 @@ __ASM_GLOBAL_FUNC( wine_call_on_stack, "blx r2\n\t" /* call func */ "mov sp, r4\n\t" /* restore old sp from local var */ "pop {r4,PC}") /* fetch return address into pc */ +#elif defined(__aarch64__) && defined(__GNUC__) +__ASM_GLOBAL_FUNC( wine_call_on_stack, + "stp x29, x30, [sp,#-32]!\n\t" /* save return address on stack */ + "str x19, [sp,#16]\n\t" /* save register on stack */ + "mov x19, sp\n\t" /* store old sp in local var */ + "mov sp, x2\n\t" /* stack */ + "mov x2, x0\n\t" /* func -> scratch register */ + "mov x0, x1\n\t" /* arg */ + "blr x2\n\t" /* call func */ + "mov sp, x19\n\t" /* restore old sp from local var */ + "ldr x19, [sp,#16]\n\t" /* restore register from stack */ + "ldp x29, x30, [sp],#32\n\t" /* restore return address */ + "ret") /* return */ #elif defined(__sparc__) && defined(__GNUC__) __ASM_GLOBAL_FUNC( wine_call_on_stack, "save %sp, -96, %sp\n\t" /* push: change register window */

1 0

André Hentschel : include: Add ARM64 endianness.
by Alexandre Julliard 16 Jan '13

16 Jan '13

Module: wine Branch: master Commit: f9727320dae5057ae2a5bd53e684009ad529f70a URL: http://source.winehq.org/git/wine.git/?a=commit;h=f9727320dae5057ae2a5bd53e… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Jan 16 00:41:16 2013 +0100 include: Add ARM64 endianness. --- include/basetsd.h | 10 +++++++++- 1 files changed, 9 insertions(+), 1 deletions(-) diff --git a/include/basetsd.h b/include/basetsd.h index 4a59897..f855352 100644 --- a/include/basetsd.h +++ b/include/basetsd.h @@ -36,7 +36,7 @@ extern "C" { * 64-bit. */ -#if (defined(__x86_64__) || defined(__powerpc64__) || defined(__sparc64__)) && !defined(_WIN64) +#if (defined(__x86_64__) || defined(__powerpc64__) || defined(__sparc64__) || defined(__aarch64__)) && !defined(_WIN64) #define _WIN64 #endif @@ -297,6 +297,14 @@ typedef ULONG_PTR KAFFINITY, *PKAFFINITY; # undef WORDS_BIGENDIAN # undef BITFIELDS_BIGENDIAN # undef ALLOW_UNALIGNED_ACCESS +#elif defined(__AARCH64EB__) +# define WORDS_BIGENDIAN +# define BITFIELDS_BIGENDIAN +# undef ALLOW_UNALIGNED_ACCESS +#elif defined(__AARCH64EL__) || defined(__aarch64__) +# undef WORDS_BIGENDIAN +# undef BITFIELDS_BIGENDIAN +# undef ALLOW_UNALIGNED_ACCESS #elif defined(__MIPSEB__) # define WORDS_BIGENDIAN # define BITFIELDS_BIGENDIAN

1 0

Hans Leidekker : wmiutils: Implement IWbemPath::SetServer.
by Alexandre Julliard 16 Jan '13

16 Jan '13

Module: wine Branch: master Commit: 77ae1d0fb77a14bb12f2660622b7b760af2fa643 URL: http://source.winehq.org/git/wine.git/?a=commit;h=77ae1d0fb77a14bb12f266062… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jan 16 10:57:30 2013 +0100 wmiutils: Implement IWbemPath::SetServer. --- dlls/wmiutils/path.c | 33 +++++++++++++++++++++----- dlls/wmiutils/tests/path.c | 54 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 80 insertions(+), 7 deletions(-) diff --git a/dlls/wmiutils/path.c b/dlls/wmiutils/path.c index f02c9c6..e706372 100644 --- a/dlls/wmiutils/path.c +++ b/dlls/wmiutils/path.c @@ -441,10 +441,29 @@ static HRESULT WINAPI path_GetInfo( static HRESULT WINAPI path_SetServer( IWbemPath *iface, - LPCWSTR Name) + LPCWSTR name) { - FIXME("%p, %s\n", iface, debugstr_w(Name)); - return E_NOTIMPL; + struct path *path = impl_from_IWbemPath( iface ); + static const ULONGLONG flags = + WBEMPATH_INFO_PATH_HAD_SERVER | WBEMPATH_INFO_V1_COMPLIANT | + WBEMPATH_INFO_V2_COMPLIANT | WBEMPATH_INFO_CIM_COMPLIANT; + + TRACE("%p, %s\n", iface, debugstr_w(name)); + + heap_free( path->server ); + if (name) + { + if (!(path->server = strdupW( name ))) return WBEM_E_OUT_OF_MEMORY; + path->len_server = strlenW( path->server ); + path->flags |= flags; + } + else + { + path->server = NULL; + path->len_server = 0; + path->flags &= ~flags; + } + return S_OK; } static HRESULT WINAPI path_GetServer( @@ -457,7 +476,7 @@ static HRESULT WINAPI path_GetServer( TRACE("%p, %p, %p\n", iface, len, name); if (!len || (*len && !name)) return WBEM_E_INVALID_PARAMETER; - if (!path->class) return WBEM_E_NOT_AVAILABLE; + if (!path->server) return WBEM_E_NOT_AVAILABLE; if (*len > path->len_server) strcpyW( name, path->server ); *len = path->len_server + 1; return S_OK; @@ -504,15 +523,15 @@ static HRESULT WINAPI path_RemoveNamespaceAt( } static HRESULT WINAPI path_RemoveAllNamespaces( - IWbemPath *iface) + IWbemPath *iface) { FIXME("%p\n", iface); return E_NOTIMPL; } static HRESULT WINAPI path_GetScopeCount( - IWbemPath *iface, - ULONG *puCount) + IWbemPath *iface, + ULONG *puCount) { FIXME("%p, %p\n", iface, puCount); return E_NOTIMPL; diff --git a/dlls/wmiutils/tests/path.c b/dlls/wmiutils/tests/path.c index 3367690..947defa 100644 --- a/dlls/wmiutils/tests/path.c +++ b/dlls/wmiutils/tests/path.c @@ -314,6 +314,7 @@ static void test_IWbemPath_GetClassName(void) ok( hr == WBEM_E_INVALID_PARAMETER, "got %08x\n", hr ); ok( len == sizeof(buf) / sizeof(buf[0]), "unexpected length %u\n", len ); + buf[0] = 0; len = sizeof(buf) / sizeof(buf[0]); hr = IWbemPath_GetClassName( path, &len, buf ); ok( hr == S_OK, "got %08x\n", hr ); @@ -361,6 +362,7 @@ static void test_IWbemPath_GetServer(void) ok( hr == WBEM_E_INVALID_PARAMETER, "got %08x\n", hr ); ok( len == sizeof(buf) / sizeof(buf[0]), "unexpected length %u\n", len ); + buf[0] = 0; len = sizeof(buf) / sizeof(buf[0]); hr = IWbemPath_GetServer( path, &len, buf ); ok( hr == S_OK, "got %08x\n", hr ); @@ -433,6 +435,57 @@ static void test_IWbemPath_GetInfo(void) IWbemPath_Release( path ); } +static void test_IWbemPath_SetServer(void) +{ + static const WCHAR serverW[] = {'s','e','r','v','e','r',0}; + IWbemPath *path; + WCHAR buf[16]; + ULONG len; + ULONGLONG flags; + HRESULT hr; + + if (!(path = create_path())) return; + + hr = IWbemPath_SetServer( path, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + len = sizeof(buf) / sizeof(buf[0]); + hr = IWbemPath_GetServer( path, &len, buf ); + ok( hr == WBEM_E_NOT_AVAILABLE, "got %08x\n", hr ); + + hr = IWbemPath_SetServer( path, serverW ); + ok( hr == S_OK, "got %08x\n", hr ); + + buf[0] = 0; + len = sizeof(buf) / sizeof(buf[0]); + hr = IWbemPath_GetServer( path, &len, buf ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( !lstrcmpW( buf, serverW ), "unexpected buffer contents %s\n", wine_dbgstr_w(buf) ); + + flags = 0; + hr = IWbemPath_GetInfo( path, 0, &flags ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( flags == (WBEMPATH_INFO_HAS_MACHINE_NAME | WBEMPATH_INFO_V1_COMPLIANT | + WBEMPATH_INFO_V2_COMPLIANT | WBEMPATH_INFO_CIM_COMPLIANT | + WBEMPATH_INFO_SERVER_NAMESPACE_ONLY | WBEMPATH_INFO_PATH_HAD_SERVER), + "got %lx%08lx\n", (unsigned long)(flags >> 32), (unsigned long)flags ); + + hr = IWbemPath_SetServer( path, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + len = sizeof(buf) / sizeof(buf[0]); + hr = IWbemPath_GetServer( path, &len, buf ); + ok( hr == WBEM_E_NOT_AVAILABLE, "got %08x\n", hr ); + + flags = 0; + hr = IWbemPath_GetInfo( path, 0, &flags ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( flags == (WBEMPATH_INFO_ANON_LOCAL_MACHINE | WBEMPATH_INFO_SERVER_NAMESPACE_ONLY), + "got %lx%08lx\n", (unsigned long)(flags >> 32), (unsigned long)flags ); + + IWbemPath_Release( path ); +} + START_TEST (path) { CoInitialize( NULL ); @@ -442,6 +495,7 @@ START_TEST (path) test_IWbemPath_GetClassName(); test_IWbemPath_GetServer(); test_IWbemPath_GetInfo(); + test_IWbemPath_SetServer(); CoUninitialize(); }

1 0

Hans Leidekker : advapi32: Improve the stub for CreateRestrictedToken.
by Alexandre Julliard 16 Jan '13

16 Jan '13

Module: wine Branch: master Commit: bbb29e9d4c1b55f24c60a6449903a6ffb149ccc1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bbb29e9d4c1b55f24c60a6449… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jan 16 10:56:47 2013 +0100 advapi32: Improve the stub for CreateRestrictedToken. --- dlls/advapi32/security.c | 16 ++++++++++++++-- dlls/advapi32/tests/security.c | 20 ++++++++++++++++---- 2 files changed, 30 insertions(+), 6 deletions(-) diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index 5a74783..954a1c5 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -801,13 +801,25 @@ BOOL WINAPI CreateRestrictedToken( PSID_AND_ATTRIBUTES restrictSids, PHANDLE newToken) { + TOKEN_TYPE type; + SECURITY_IMPERSONATION_LEVEL level = TokenImpersonationLevel; + DWORD size; + FIXME("(%p, 0x%x, %u, %p, %u, %p, %u, %p, %p): stub\n", baseToken, flags, nDisableSids, disableSids, nDeletePrivs, deletePrivs, nRestrictSids, restrictSids, newToken); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; + + size = sizeof(type); + if (!GetTokenInformation( baseToken, TokenType, &type, size, &size )) return FALSE; + if (type == TokenImpersonation) + { + size = sizeof(level); + if (!GetTokenInformation( baseToken, TokenImpersonationLevel, &level, size, &size )) + return FALSE; + } + return DuplicateTokenEx( baseToken, MAXIMUM_ALLOWED, NULL, level, type, newToken ); } /* ############################## diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 1a19d02..0e0730f 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -4076,6 +4076,8 @@ static void test_CreateRestrictedToken(void) HANDLE process_token, token, r_token; PTOKEN_GROUPS token_groups, groups2; SID_AND_ATTRIBUTES sattr; + SECURITY_IMPERSONATION_LEVEL level; + TOKEN_TYPE type; BOOL is_member; DWORD size; BOOL ret; @@ -4126,7 +4128,7 @@ static void test_CreateRestrictedToken(void) sattr.Attributes = 0; r_token = NULL; ret = pCreateRestrictedToken(token, 0, 1, &sattr, 0, NULL, 0, NULL, &r_token); - todo_wine ok(ret, "got error %d\n", GetLastError()); + ok(ret, "got error %d\n", GetLastError()); if (ret) { @@ -4134,7 +4136,7 @@ static void test_CreateRestrictedToken(void) is_member = TRUE; ret = pCheckTokenMembership(r_token, token_groups->Groups[i].Sid, &is_member); ok(ret, "got error %d\n", GetLastError()); - ok(!is_member, "not a member\n"); + todo_wine ok(!is_member, "not a member\n"); ret = GetTokenInformation(r_token, TokenGroups, NULL, 0, &size); ok(!ret && GetLastError() == ERROR_INSUFFICIENT_BUFFER, "got %d with error %d\n", @@ -4149,12 +4151,22 @@ static void test_CreateRestrictedToken(void) break; } - ok(groups2->Groups[j].Attributes & SE_GROUP_USE_FOR_DENY_ONLY, + todo_wine ok(groups2->Groups[j].Attributes & SE_GROUP_USE_FOR_DENY_ONLY, "got wrong attributes\n"); - ok((groups2->Groups[j].Attributes & SE_GROUP_ENABLED) == 0, + todo_wine ok((groups2->Groups[j].Attributes & SE_GROUP_ENABLED) == 0, "got wrong attributes\n"); HeapFree(GetProcessHeap(), 0, groups2); + + size = sizeof(type); + ret = GetTokenInformation(r_token, TokenType, &type, size, &size); + ok(ret, "got error %d\n", GetLastError()); + ok(type == TokenImpersonation, "got type %u\n", type); + + size = sizeof(level); + ret = GetTokenInformation(r_token, TokenImpersonationLevel, &level, size, &size); + ok(ret, "got error %d\n", GetLastError()); + ok(level == SecurityImpersonation, "got level %u\n", type); } HeapFree(GetProcessHeap(), 0, token_groups);

1 0

Dmitry Timoshkov : gdiplus: Avoid not necessary memory allocation in GdipCreateBitmapFromHICON.
by Alexandre Julliard 16 Jan '13

16 Jan '13

Module: wine Branch: master Commit: 0d0f05e523d37e9cc8d625455335868522b79aad URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d0f05e523d37e9cc8d625455… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Jan 16 17:18:30 2013 +0800 gdiplus: Avoid not necessary memory allocation in GdipCreateBitmapFromHICON. --- dlls/gdiplus/image.c | 45 ++++++++++++--------------------------------- 1 files changed, 12 insertions(+), 33 deletions(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index b182405..bb555a8 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -1628,13 +1628,12 @@ GpStatus WINGDIPAPI GdipCreateBitmapFromHICON(HICON hicon, GpBitmap** bitmap) ICONINFO iinfo; BITMAP bm; int ret; - UINT width, height; + UINT width, height, stride; GpRect rect; BitmapData lockeddata; HDC screendc; BOOL has_alpha; int x, y; - BYTE *bits; BITMAPINFOHEADER bih; DWORD *src; BYTE *dst_row; @@ -1654,24 +1653,13 @@ GpStatus WINGDIPAPI GdipCreateBitmapFromHICON(HICON hicon, GpBitmap** bitmap) } width = bm.bmWidth; + height = iinfo.hbmColor ? abs(bm.bmHeight) : abs(bm.bmHeight) / 2; + stride = width * 4; - if (iinfo.hbmColor) - height = abs(bm.bmHeight); - else /* combined bitmap + mask */ - height = abs(bm.bmHeight) / 2; - - bits = HeapAlloc(GetProcessHeap(), 0, 4*width*height); - if (!bits) { - DeleteObject(iinfo.hbmColor); - DeleteObject(iinfo.hbmMask); - return OutOfMemory; - } - - stat = GdipCreateBitmapFromScan0(width, height, 0, PixelFormat32bppARGB, NULL, bitmap); + stat = GdipCreateBitmapFromScan0(width, height, stride, PixelFormat32bppARGB, NULL, bitmap); if (stat != Ok) { DeleteObject(iinfo.hbmColor); DeleteObject(iinfo.hbmMask); - HeapFree(GetProcessHeap(), 0, bits); return stat; } @@ -1684,7 +1672,6 @@ GpStatus WINGDIPAPI GdipCreateBitmapFromHICON(HICON hicon, GpBitmap** bitmap) if (stat != Ok) { DeleteObject(iinfo.hbmColor); DeleteObject(iinfo.hbmMask); - HeapFree(GetProcessHeap(), 0, bits); GdipDisposeImage((GpImage*)*bitmap); return stat; } @@ -1704,14 +1691,14 @@ GpStatus WINGDIPAPI GdipCreateBitmapFromHICON(HICON hicon, GpBitmap** bitmap) screendc = GetDC(0); if (iinfo.hbmColor) { - GetDIBits(screendc, iinfo.hbmColor, 0, height, bits, (BITMAPINFO*)&bih, DIB_RGB_COLORS); + GetDIBits(screendc, iinfo.hbmColor, 0, height, lockeddata.Scan0, (BITMAPINFO*)&bih, DIB_RGB_COLORS); if (bm.bmBitsPixel == 32) { has_alpha = FALSE; /* If any pixel has a non-zero alpha, ignore hbmMask */ - src = (DWORD*)bits; + src = (DWORD*)lockeddata.Scan0; for (x=0; x<width && !has_alpha; x++) for (y=0; y<height && !has_alpha; y++) if ((*src++ & 0xff000000) != 0) @@ -1721,24 +1708,16 @@ GpStatus WINGDIPAPI GdipCreateBitmapFromHICON(HICON hicon, GpBitmap** bitmap) } else { - GetDIBits(screendc, iinfo.hbmMask, 0, height, bits, (BITMAPINFO*)&bih, DIB_RGB_COLORS); + GetDIBits(screendc, iinfo.hbmMask, 0, height, lockeddata.Scan0, (BITMAPINFO*)&bih, DIB_RGB_COLORS); has_alpha = FALSE; } - /* copy the image data to the Bitmap */ - src = (DWORD*)bits; - dst_row = lockeddata.Scan0; - for (y=0; y<height; y++) - { - memcpy(dst_row, src, width*4); - src += width; - dst_row += lockeddata.Stride; - } - if (!has_alpha) { if (iinfo.hbmMask) { + BYTE *bits = HeapAlloc(GetProcessHeap(), 0, height * stride); + /* read alpha data from the mask */ if (iinfo.hbmColor) GetDIBits(screendc, iinfo.hbmMask, 0, height, bits, (BITMAPINFO*)&bih, DIB_RGB_COLORS); @@ -1760,11 +1739,13 @@ GpStatus WINGDIPAPI GdipCreateBitmapFromHICON(HICON hicon, GpBitmap** bitmap) } dst_row += lockeddata.Stride; } + + HeapFree(GetProcessHeap(), 0, bits); } else { /* set constant alpha of 255 */ - dst_row = bits; + dst_row = lockeddata.Scan0; for (y=0; y<height; y++) { dst = (DWORD*)dst_row; @@ -1782,8 +1763,6 @@ GpStatus WINGDIPAPI GdipCreateBitmapFromHICON(HICON hicon, GpBitmap** bitmap) GdipBitmapUnlockBits(*bitmap, &lockeddata); - HeapFree(GetProcessHeap(), 0, bits); - return Ok; }

1 0

Henri Verbeet : wined3d: Get rid of the surface_type parameter to wined3d_swapchain_create().
by Alexandre Julliard 16 Jan '13

16 Jan '13

Module: wine Branch: master Commit: 31e89769109d058622517e181ba49adab59d6bd3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=31e89769109d058622517e181… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jan 16 08:51:49 2013 +0100 wined3d: Get rid of the surface_type parameter to wined3d_swapchain_create(). --- dlls/d3d8/swapchain.c | 5 ++--- dlls/d3d9/swapchain.c | 5 ++--- dlls/ddraw/ddraw.c | 5 ++--- dlls/dxgi/swapchain.c | 6 ++---- dlls/wined3d/swapchain.c | 41 ++++++++++++++--------------------------- dlls/wined3d/wined3d.spec | 2 +- include/wine/wined3d.h | 5 ++--- 7 files changed, 25 insertions(+), 44 deletions(-) diff --git a/dlls/d3d8/swapchain.c b/dlls/d3d8/swapchain.c index 580b6a9..6686c0f 100644 --- a/dlls/d3d8/swapchain.c +++ b/dlls/d3d8/swapchain.c @@ -160,9 +160,8 @@ static HRESULT swapchain_init(struct d3d8_swapchain *swapchain, struct d3d8_devi swapchain->IDirect3DSwapChain8_iface.lpVtbl = &d3d8_swapchain_vtbl; wined3d_mutex_lock(); - hr = wined3d_swapchain_create(device->wined3d_device, desc, - WINED3D_SURFACE_TYPE_OPENGL, swapchain, &d3d8_swapchain_wined3d_parent_ops, - &swapchain->wined3d_swapchain); + hr = wined3d_swapchain_create(device->wined3d_device, desc, swapchain, + &d3d8_swapchain_wined3d_parent_ops, &swapchain->wined3d_swapchain); wined3d_mutex_unlock(); if (FAILED(hr)) diff --git a/dlls/d3d9/swapchain.c b/dlls/d3d9/swapchain.c index 57d355a..3b32346 100644 --- a/dlls/d3d9/swapchain.c +++ b/dlls/d3d9/swapchain.c @@ -255,9 +255,8 @@ static HRESULT swapchain_init(struct d3d9_swapchain *swapchain, struct d3d9_devi swapchain->IDirect3DSwapChain9_iface.lpVtbl = &d3d9_swapchain_vtbl; wined3d_mutex_lock(); - hr = wined3d_swapchain_create(device->wined3d_device, desc, - WINED3D_SURFACE_TYPE_OPENGL, swapchain, &d3d9_swapchain_wined3d_parent_ops, - &swapchain->wined3d_swapchain); + hr = wined3d_swapchain_create(device->wined3d_device, desc, swapchain, + &d3d9_swapchain_wined3d_parent_ops, &swapchain->wined3d_swapchain); wined3d_mutex_unlock(); if (FAILED(hr)) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 32f9c5a..4a8af6d 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -5223,9 +5223,8 @@ static HRESULT CDECL device_parent_create_swapchain(struct wined3d_device_parent return E_FAIL; } - hr = wined3d_swapchain_create(ddraw->wined3d_device, desc, - DefaultSurfaceType, NULL, &ddraw_null_wined3d_parent_ops, swapchain); - if (FAILED(hr)) + if (FAILED(hr = wined3d_swapchain_create(ddraw->wined3d_device, desc, NULL, + &ddraw_null_wined3d_parent_ops, swapchain))) WARN("Failed to create swapchain, hr %#x.\n", hr); return hr; diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index 65b89c2..0c27007 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -304,10 +304,8 @@ HRESULT dxgi_swapchain_init(struct dxgi_swapchain *swapchain, struct dxgi_device swapchain->IDXGISwapChain_iface.lpVtbl = &dxgi_swapchain_vtbl; swapchain->refcount = 1; - hr = wined3d_swapchain_create(device->wined3d_device, desc, - WINED3D_SURFACE_TYPE_OPENGL, swapchain, &dxgi_swapchain_wined3d_parent_ops, - &swapchain->wined3d_swapchain); - if (FAILED(hr)) + if (FAILED(hr = wined3d_swapchain_create(device->wined3d_device, desc, swapchain, + &dxgi_swapchain_wined3d_parent_ops, &swapchain->wined3d_swapchain))) { WARN("Failed to create wined3d swapchain, hr %#x.\n", hr); return hr; diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index db30723..cf1914a 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -815,9 +815,8 @@ void swapchain_update_render_to_fbo(struct wined3d_swapchain *swapchain) } /* Do not call while under the GL lock. */ -static HRESULT swapchain_init(struct wined3d_swapchain *swapchain, enum wined3d_surface_type surface_type, - struct wined3d_device *device, struct wined3d_swapchain_desc *desc, - void *parent, const struct wined3d_parent_ops *parent_ops) +static HRESULT swapchain_init(struct wined3d_swapchain *swapchain, struct wined3d_device *device, + struct wined3d_swapchain_desc *desc, void *parent, const struct wined3d_parent_ops *parent_ops) { const struct wined3d_adapter *adapter = device->adapter; const struct wined3d_format *format; @@ -841,20 +840,10 @@ static HRESULT swapchain_init(struct wined3d_swapchain *swapchain, enum wined3d_ "Please configure the application to use double buffering (1 back buffer) if possible.\n"); } - switch (surface_type) - { - case WINED3D_SURFACE_TYPE_GDI: - swapchain->swapchain_ops = &swapchain_gdi_ops; - break; - - case WINED3D_SURFACE_TYPE_OPENGL: - swapchain->swapchain_ops = &swapchain_gl_ops; - break; - - default: - ERR("Invalid surface type %#x.\n", surface_type); - return WINED3DERR_INVALIDCALL; - } + if (device->wined3d->flags & WINED3D_NO3D) + swapchain->swapchain_ops = &swapchain_gdi_ops; + else + swapchain->swapchain_ops = &swapchain_gl_ops; window = desc->device_window ? desc->device_window : device->create_parms.focus_window; @@ -911,7 +900,7 @@ static HRESULT swapchain_init(struct wined3d_swapchain *swapchain, enum wined3d_ if (swapchain->front_buffer->container.type == WINED3D_CONTAINER_NONE) surface_set_container(swapchain->front_buffer, WINED3D_CONTAINER_SWAPCHAIN, swapchain); - if (surface_type == WINED3D_SURFACE_TYPE_OPENGL) + if (!(device->wined3d->flags & WINED3D_NO3D)) surface_modify_location(swapchain->front_buffer, SFLAG_INDRAWABLE, TRUE); /* MSDN says we're only allowed a single fullscreen swapchain per device, @@ -937,7 +926,7 @@ static HRESULT swapchain_init(struct wined3d_swapchain *swapchain, enum wined3d_ displaymode_set = TRUE; } - if (surface_type == WINED3D_SURFACE_TYPE_OPENGL) + if (!(device->wined3d->flags & WINED3D_NO3D)) { static const enum wined3d_format_id formats[] = { @@ -1024,7 +1013,7 @@ static HRESULT swapchain_init(struct wined3d_swapchain *swapchain, enum wined3d_ } /* Swapchains share the depth/stencil buffer, so only create a single depthstencil surface. */ - if (desc->enable_auto_depth_stencil && surface_type == WINED3D_SURFACE_TYPE_OPENGL) + if (desc->enable_auto_depth_stencil && !(device->wined3d->flags & WINED3D_NO3D)) { TRACE("Creating depth/stencil buffer.\n"); if (!device->auto_depth_stencil) @@ -1098,16 +1087,14 @@ err: } /* Do not call while under the GL lock. */ -HRESULT CDECL wined3d_swapchain_create(struct wined3d_device *device, - struct wined3d_swapchain_desc *desc, enum wined3d_surface_type surface_type, - void *parent, const struct wined3d_parent_ops *parent_ops, - struct wined3d_swapchain **swapchain) +HRESULT CDECL wined3d_swapchain_create(struct wined3d_device *device, struct wined3d_swapchain_desc *desc, + void *parent, const struct wined3d_parent_ops *parent_ops, struct wined3d_swapchain **swapchain) { struct wined3d_swapchain *object; HRESULT hr; - TRACE("device %p, desc %p, swapchain %p, parent %p, surface_type %#x.\n", - device, desc, swapchain, parent, surface_type); + TRACE("device %p, desc %p, parent %p, parent_ops %p, swapchain %p.\n", + device, desc, parent, parent_ops, swapchain); object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); if (!object) @@ -1116,7 +1103,7 @@ HRESULT CDECL wined3d_swapchain_create(struct wined3d_device *device, return E_OUTOFMEMORY; } - hr = swapchain_init(object, surface_type, device, desc, parent, parent_ops); + hr = swapchain_init(object, device, desc, parent, parent_ops); if (FAILED(hr)) { WARN("Failed to initialize swapchain, hr %#x.\n", hr); diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 5322be8..19dd249 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -240,7 +240,7 @@ @ cdecl wined3d_surface_update_overlay(ptr ptr ptr ptr long ptr) @ cdecl wined3d_surface_update_overlay_z_order(ptr long ptr) -@ cdecl wined3d_swapchain_create(ptr ptr long ptr ptr ptr) +@ cdecl wined3d_swapchain_create(ptr ptr ptr ptr ptr) @ cdecl wined3d_swapchain_decref(ptr) @ cdecl wined3d_swapchain_get_back_buffer(ptr long long) @ cdecl wined3d_swapchain_get_device(ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 7aa9651..70f6b0f 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2378,9 +2378,8 @@ HRESULT __cdecl wined3d_surface_update_overlay(struct wined3d_surface *surface, HRESULT __cdecl wined3d_surface_update_overlay_z_order(struct wined3d_surface *surface, DWORD flags, struct wined3d_surface *ref); -HRESULT __cdecl wined3d_swapchain_create(struct wined3d_device *device, - struct wined3d_swapchain_desc *desc, enum wined3d_surface_type surface_type, void *parent, - const struct wined3d_parent_ops *parent_ops, struct wined3d_swapchain **swapchain); +HRESULT __cdecl wined3d_swapchain_create(struct wined3d_device *device, struct wined3d_swapchain_desc *desc, + void *parent, const struct wined3d_parent_ops *parent_ops, struct wined3d_swapchain **swapchain); ULONG __cdecl wined3d_swapchain_decref(struct wined3d_swapchain *swapchain); struct wined3d_surface * __cdecl wined3d_swapchain_get_back_buffer(const struct wined3d_swapchain *swapchain, UINT backbuffer_idx, enum wined3d_backbuffer_type backbuffer_type);

1 0

Henri Verbeet : ddraw: Update DefaultSurfaceType if we had to fallback to a wined3d object without 3D support .
by Alexandre Julliard 16 Jan '13

16 Jan '13

Module: wine Branch: master Commit: 56b256cb774efb3842cc15e945f878b63da5288e URL: http://source.winehq.org/git/wine.git/?a=commit;h=56b256cb774efb3842cc15e94… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jan 16 08:51:48 2013 +0100 ddraw: Update DefaultSurfaceType if we had to fallback to a wined3d object without 3D support. --- dlls/ddraw/ddraw.c | 10 ++++++++-- dlls/ddraw/main.c | 10 ++++++++-- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index a04de34..32f9c5a 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -5243,6 +5243,7 @@ static const struct wined3d_device_parent_ops ddraw_wined3d_device_parent_ops = HRESULT ddraw_init(struct ddraw *ddraw, enum wined3d_device_type device_type) { + DWORD flags; HRESULT hr; ddraw->IDirectDraw7_iface.lpVtbl = &ddraw7_vtbl; @@ -5257,15 +5258,20 @@ HRESULT ddraw_init(struct ddraw *ddraw, enum wined3d_device_type device_type) ddraw->numIfaces = 1; ddraw->ref7 = 1; - if (!(ddraw->wined3d = wined3d_create(7, WINED3D_LEGACY_DEPTH_BIAS))) + flags = WINED3D_LEGACY_DEPTH_BIAS; + if (DefaultSurfaceType != WINED3D_SURFACE_TYPE_OPENGL) + flags |= WINED3D_NO3D; + + if (!(ddraw->wined3d = wined3d_create(7, flags))) { - if (!(ddraw->wined3d = wined3d_create(7, WINED3D_LEGACY_DEPTH_BIAS | WINED3D_NO3D))) + if ((flags & WINED3D_NO3D) || !(ddraw->wined3d = wined3d_create(7, flags | WINED3D_NO3D))) { WARN("Failed to create a wined3d object.\n"); return E_FAIL; } WARN("Created a wined3d object without 3D support.\n"); + DefaultSurfaceType = WINED3D_SURFACE_TYPE_GDI; } hr = wined3d_device_create(ddraw->wined3d, WINED3DADAPTER_DEFAULT, device_type, diff --git a/dlls/ddraw/main.c b/dlls/ddraw/main.c index e79b471..819dc7f 100644 --- a/dlls/ddraw/main.c +++ b/dlls/ddraw/main.c @@ -371,6 +371,7 @@ HRESULT WINAPI DirectDrawEnumerateA(LPDDENUMCALLBACKA callback, void *context) HRESULT WINAPI DirectDrawEnumerateExA(LPDDENUMCALLBACKEXA callback, void *context, DWORD flags) { struct wined3d *wined3d; + DWORD wined3d_flags; TRACE("callback %p, context %p, flags %#x.\n", callback, context, flags); @@ -382,16 +383,21 @@ HRESULT WINAPI DirectDrawEnumerateExA(LPDDENUMCALLBACKEXA callback, void *contex if (flags) FIXME("flags 0x%08x not handled\n", flags); + wined3d_flags = WINED3D_LEGACY_DEPTH_BIAS; + if (DefaultSurfaceType != WINED3D_SURFACE_TYPE_OPENGL) + wined3d_flags |= WINED3D_NO3D; + TRACE("Enumerating ddraw interfaces\n"); - if (!(wined3d = wined3d_create(7, WINED3D_LEGACY_DEPTH_BIAS))) + if (!(wined3d = wined3d_create(7, wined3d_flags))) { - if (!(wined3d = wined3d_create(7, WINED3D_LEGACY_DEPTH_BIAS | WINED3D_NO3D))) + if ((wined3d_flags & WINED3D_NO3D) || !(wined3d = wined3d_create(7, wined3d_flags | WINED3D_NO3D))) { WARN("Failed to create a wined3d object.\n"); return E_FAIL; } WARN("Created a wined3d object without 3D support.\n"); + DefaultSurfaceType = WINED3D_SURFACE_TYPE_GDI; } __TRY

1 0

Henri Verbeet : wined3d: Initialize the various backends in wined3d_adapter_init_nogl() as well.
by Alexandre Julliard 16 Jan '13

16 Jan '13

Module: wine Branch: master Commit: f3dbbba48e5a4ca75b9d69178fefd493d677aa31 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f3dbbba48e5a4ca75b9d69178… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jan 16 08:51:47 2013 +0100 wined3d: Initialize the various backends in wined3d_adapter_init_nogl() as well. --- dlls/wined3d/device.c | 39 +++++++++++++++++---------------------- dlls/wined3d/directx.c | 4 ++++ dlls/wined3d/state.c | 30 ++++++++++++++++++++++++++++++ dlls/wined3d/wined3d_private.h | 1 + 4 files changed, 52 insertions(+), 22 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index d718b04..487c270 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5654,32 +5654,27 @@ HRESULT device_init(struct wined3d_device *device, struct wined3d *wined3d, select_shader_mode(&adapter->gl_info, &device->ps_selected_mode, &device->vs_selected_mode); device->shader_backend = adapter->shader_backend; + device->shader_backend->shader_get_caps(&adapter->gl_info, &shader_caps); + device->vs_version = shader_caps.vs_version; + device->gs_version = shader_caps.gs_version; + device->ps_version = shader_caps.ps_version; + device->d3d_vshader_constantF = shader_caps.vs_uniform_count; + device->d3d_pshader_constantF = shader_caps.ps_uniform_count; + device->vs_clipping = shader_caps.vs_clipping; - if (device->shader_backend) - { - device->shader_backend->shader_get_caps(&adapter->gl_info, &shader_caps); - device->vs_version = shader_caps.vs_version; - device->gs_version = shader_caps.gs_version; - device->ps_version = shader_caps.ps_version; - device->d3d_vshader_constantF = shader_caps.vs_uniform_count; - device->d3d_pshader_constantF = shader_caps.ps_uniform_count; - device->vs_clipping = shader_caps.vs_clipping; - } fragment_pipeline = adapter->fragment_pipe; - if (fragment_pipeline) - { - fragment_pipeline->get_caps(&adapter->gl_info, &ffp_caps); - device->max_ffp_textures = ffp_caps.MaxSimultaneousTextures; + fragment_pipeline->get_caps(&adapter->gl_info, &ffp_caps); + device->max_ffp_textures = ffp_caps.MaxSimultaneousTextures; - hr = compile_state_table(device->StateTable, device->multistate_funcs, &adapter->gl_info, - ffp_vertexstate_template, fragment_pipeline, misc_state_template); - if (FAILED(hr)) - { - ERR("Failed to compile state table, hr %#x.\n", hr); - wined3d_decref(device->wined3d); - return hr; - } + if (fragment_pipeline->states + && FAILED(hr = compile_state_table(device->StateTable, device->multistate_funcs, + &adapter->gl_info, ffp_vertexstate_template, fragment_pipeline, misc_state_template))) + { + ERR("Failed to compile state table, hr %#x.\n", hr); + wined3d_decref(device->wined3d); + return hr; } + device->blitter = adapter->blitter; hr = wined3d_stateblock_create(device, WINED3D_SBT_INIT, &device->stateBlock); diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 2190689..adce77e 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -5626,6 +5626,10 @@ static void wined3d_adapter_init_nogl(struct wined3d_adapter *adapter, UINT ordi adapter->TextureRam = 128 * 1024 * 1024; initPixelFormatsNoGL(&adapter->gl_info); + + adapter->fragment_pipe = &none_fragment_pipe; + adapter->shader_backend = &none_shader_backend; + adapter->blitter = &cpu_blit; } static void STDMETHODCALLTYPE wined3d_null_wined3d_object_destroyed(void *parent) {} diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 6d97981..afb0d39 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -5735,6 +5735,36 @@ const struct fragment_pipeline ffp_fragment_pipeline = { FALSE /* we cannot disable projected textures. The vertex pipe has to do it */ }; +static void fp_none_enable(const struct wined3d_gl_info *gl_info, BOOL enable) {} + +static void fp_none_get_caps(const struct wined3d_gl_info *gl_info, struct fragment_caps *caps) +{ + memset(caps, 0, sizeof(*caps)); +} + +static void *fp_none_alloc(const struct wined3d_shader_backend_ops *shader_backend, void *shader_priv) +{ + return shader_priv; +} + +static void fp_none_free(struct wined3d_device *device) {} + +static BOOL fp_none_color_fixup_supported(struct color_fixup_desc fixup) +{ + return is_identity_fixup(fixup); +} + +const struct fragment_pipeline none_fragment_pipe = +{ + fp_none_enable, + fp_none_get_caps, + fp_none_alloc, + fp_none_free, + fp_none_color_fixup_supported, + NULL, + FALSE, +}; + static unsigned int num_handlers(const APPLYSTATEFUNC *funcs) { unsigned int i; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index a045f7a..a6dd97c 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1193,6 +1193,7 @@ struct fragment_pipeline extern const struct StateEntryTemplate misc_state_template[] DECLSPEC_HIDDEN; extern const struct StateEntryTemplate ffp_vertexstate_template[] DECLSPEC_HIDDEN; +extern const struct fragment_pipeline none_fragment_pipe DECLSPEC_HIDDEN; extern const struct fragment_pipeline ffp_fragment_pipeline DECLSPEC_HIDDEN; extern const struct fragment_pipeline atifs_fragment_pipeline DECLSPEC_HIDDEN; extern const struct fragment_pipeline arbfp_fragment_pipeline DECLSPEC_HIDDEN;

1 0

Henri Verbeet : ddraw: Avoid LPD3DBRANCH.
by Alexandre Julliard 16 Jan '13

16 Jan '13

Module: wine Branch: master Commit: 1bb17316ffca2c01968164caefbd94205a18ee41 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1bb17316ffca2c01968164cae… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jan 16 08:51:46 2013 +0100 ddraw: Avoid LPD3DBRANCH. --- dlls/ddraw/executebuffer.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/ddraw/executebuffer.c b/dlls/ddraw/executebuffer.c index 8646c54..b86495f 100644 --- a/dlls/ddraw/executebuffer.c +++ b/dlls/ddraw/executebuffer.c @@ -474,8 +474,9 @@ HRESULT d3d_execute_buffer_execute(struct d3d_execute_buffer *buffer, DWORD i; TRACE("BRANCHFORWARD (%d)\n", count); - for (i = 0; i < count; i++) { - LPD3DBRANCH ci = (LPD3DBRANCH) instr; + for (i = 0; i < count; ++i) + { + D3DBRANCH *ci = (D3DBRANCH *)instr; if ((buffer->data.dsStatus.dwStatus & ci->dwMask) == ci->dwValue) {

1 0

Henri Verbeet : ddraw: Avoid LPD3DTRIANGLE.
by Alexandre Julliard 16 Jan '13

16 Jan '13

Module: wine Branch: master Commit: 1ed6a0842da21a8ae9f7f638d521db00b463f810 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ed6a0842da21a8ae9f7f638d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jan 16 08:51:45 2013 +0100 ddraw: Avoid LPD3DTRIANGLE. --- dlls/ddraw/executebuffer.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/ddraw/executebuffer.c b/dlls/ddraw/executebuffer.c index 1673cac..8646c54 100644 --- a/dlls/ddraw/executebuffer.c +++ b/dlls/ddraw/executebuffer.c @@ -104,8 +104,9 @@ HRESULT d3d_execute_buffer_execute(struct d3d_execute_buffer *buffer, buffer->indices = HeapAlloc(GetProcessHeap(), 0, sizeof(*buffer->indices) * buffer->nb_indices); } - for (i = 0; i < count; i++) { - LPD3DTRIANGLE ci = (LPD3DTRIANGLE) instr; + for (i = 0; i < count; ++i) + { + D3DTRIANGLE *ci = (D3DTRIANGLE *)instr; TRACE(" v1: %d v2: %d v3: %d\n",ci->u1.v1, ci->u2.v2, ci->u3.v3); TRACE(" Flags : "); if (TRACE_ON(ddraw))

1 0

← Newer
1
...
36
37
38
39
40
41
42
...
74
Older →

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 January 2013