wine-commits October 2009

wine-commits@winehq.org

3 participants
1207 discussions

Francois Gouget : crypt32: Fix compilation on systems that don' t support nameless unions.
by Alexandre Julliard 19 Oct '09

19 Oct '09

Module: wine Branch: master Commit: d2cc5380db296a2246e462334f6c68f12b4de614 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d2cc5380db296a2246e462334… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Oct 17 20:27:58 2009 +0200 crypt32: Fix compilation on systems that don't support nameless unions. --- dlls/crypt32/str.c | 31 +++++++++++++++++-------------- 1 files changed, 17 insertions(+), 14 deletions(-) diff --git a/dlls/crypt32/str.c b/dlls/crypt32/str.c index b0a3d25..758abc9 100644 --- a/dlls/crypt32/str.c +++ b/dlls/crypt32/str.c @@ -16,6 +16,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ #include <stdarg.h> + +#define NONAMELESSUNION + #include "windef.h" #include "winbase.h" #include "winnls.h" @@ -1017,11 +1020,11 @@ DWORD WINAPI CertGetNameStringW(PCCERT_CONTEXT pCertContext, DWORD dwType, if (entry) { if (!pszNameString) - ret = strlenW(entry->pwszRfc822Name) + 1; + ret = strlenW(entry->u.pwszRfc822Name) + 1; else if (cchNameString) { - ret = min(strlenW(entry->pwszRfc822Name), cchNameString - 1); - memcpy(pszNameString, entry->pwszRfc822Name, + ret = min(strlenW(entry->u.pwszRfc822Name), cchNameString - 1); + memcpy(pszNameString, entry->u.pwszRfc822Name, ret * sizeof(WCHAR)); pszNameString[ret++] = 0; } @@ -1045,7 +1048,7 @@ DWORD WINAPI CertGetNameStringW(PCCERT_CONTEXT pCertContext, DWORD dwType, if (entry) ret = CertNameToStrW(pCertContext->dwCertEncodingType, - &entry->DirectoryName, *(DWORD *)pvTypePara, pszNameString, + &entry->u.DirectoryName, *(DWORD *)pvTypePara, pszNameString, cchNameString); if (info) LocalFree(info); @@ -1062,7 +1065,7 @@ DWORD WINAPI CertGetNameStringW(PCCERT_CONTEXT pCertContext, DWORD dwType, if (entry) ret = cert_name_to_str_with_indent(X509_ASN_ENCODING, 0, - &entry->DirectoryName, 0, pszNameString, cchNameString); + &entry->u.DirectoryName, 0, pszNameString, cchNameString); if (altInfo) LocalFree(altInfo); } @@ -1102,12 +1105,12 @@ DWORD WINAPI CertGetNameStringW(PCCERT_CONTEXT pCertContext, DWORD dwType, if (entry) { if (!pszNameString) - ret = strlenW(entry->pwszRfc822Name) + 1; + ret = strlenW(entry->u.pwszRfc822Name) + 1; else if (cchNameString) { - ret = min(strlenW(entry->pwszRfc822Name), + ret = min(strlenW(entry->u.pwszRfc822Name), cchNameString - 1); - memcpy(pszNameString, entry->pwszRfc822Name, + memcpy(pszNameString, entry->u.pwszRfc822Name, ret * sizeof(WCHAR)); pszNameString[ret++] = 0; } @@ -1139,11 +1142,11 @@ DWORD WINAPI CertGetNameStringW(PCCERT_CONTEXT pCertContext, DWORD dwType, if (entry) { if (!pszNameString) - ret = strlenW(entry->pwszDNSName) + 1; + ret = strlenW(entry->u.pwszDNSName) + 1; else if (cchNameString) { - ret = min(strlenW(entry->pwszDNSName), cchNameString - 1); - memcpy(pszNameString, entry->pwszDNSName, ret * sizeof(WCHAR)); + ret = min(strlenW(entry->u.pwszDNSName), cchNameString - 1); + memcpy(pszNameString, entry->u.pwszDNSName, ret * sizeof(WCHAR)); pszNameString[ret++] = 0; } } @@ -1163,11 +1166,11 @@ DWORD WINAPI CertGetNameStringW(PCCERT_CONTEXT pCertContext, DWORD dwType, if (entry) { if (!pszNameString) - ret = strlenW(entry->pwszURL) + 1; + ret = strlenW(entry->u.pwszURL) + 1; else if (cchNameString) { - ret = min(strlenW(entry->pwszURL), cchNameString - 1); - memcpy(pszNameString, entry->pwszURL, ret * sizeof(WCHAR)); + ret = min(strlenW(entry->u.pwszURL), cchNameString - 1); + memcpy(pszNameString, entry->u.pwszURL, ret * sizeof(WCHAR)); pszNameString[ret++] = 0; } }

1 0

Francois Gouget : comctl32/monthcal: Fix compilation on systems that don' t support nameless unions.
by Alexandre Julliard 19 Oct '09

19 Oct '09

Module: wine Branch: master Commit: 5a45951f3ed3434509485803adf7eec19da4d245 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5a45951f3ed3434509485803a… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Oct 17 20:27:44 2009 +0200 comctl32/monthcal: Fix compilation on systems that don't support nameless unions. --- dlls/comctl32/monthcal.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/comctl32/monthcal.c b/dlls/comctl32/monthcal.c index 1c06d23..2c98331 100644 --- a/dlls/comctl32/monthcal.c +++ b/dlls/comctl32/monthcal.c @@ -368,10 +368,10 @@ static BOOL MONTHCAL_IsSelRangeValid(const MONTHCAL_INFO *infoPtr, SystemTimeToFileTime(range0, &ft_range0); SystemTimeToFileTime(range1, &ft_range1); - ul_range0.LowPart = ft_range0.dwLowDateTime; - ul_range0.HighPart = ft_range0.dwHighDateTime; - ul_range1.LowPart = ft_range1.dwLowDateTime; - ul_range1.HighPart = ft_range1.dwHighDateTime; + ul_range0.u.LowPart = ft_range0.dwLowDateTime; + ul_range0.u.HighPart = ft_range0.dwHighDateTime; + ul_range1.u.LowPart = ft_range1.dwLowDateTime; + ul_range1.u.HighPart = ft_range1.dwHighDateTime; cmp = CompareFileTime(&ft_range0, &ft_range1); @@ -388,8 +388,8 @@ static BOOL MONTHCAL_IsSelRangeValid(const MONTHCAL_INFO *infoPtr, else ul_range0.QuadPart = ul_range1.QuadPart - DAYSTO100NSECS(infoPtr->maxSelCount - 1); - ft_range0.dwLowDateTime = ul_range0.LowPart; - ft_range0.dwHighDateTime = ul_range0.HighPart; + ft_range0.dwLowDateTime = ul_range0.u.LowPart; + ft_range0.dwHighDateTime = ul_range0.u.HighPart; FileTimeToSystemTime(&ft_range0, adjust); }

1 0

Ričardas Barkauskas : comctl32/propsheet: Test and fix for crash processing PSM_INDEXTOHWND with no longer valid handle .
by Alexandre Julliard 19 Oct '09

19 Oct '09

Module: wine Branch: master Commit: a8f89a2ffa7065e59be39f0b5e32c1ece63cd340 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a8f89a2ffa7065e59be39f0b5… Author: Ričardas Barkauskas <miegalius(a)gmail.com> Date: Sat Oct 17 19:11:29 2009 +0300 comctl32/propsheet: Test and fix for crash processing PSM_INDEXTOHWND with no longer valid handle. --- dlls/comctl32/propsheet.c | 2 ++ dlls/comctl32/tests/propsheet.c | 8 +++++++- 2 files changed, 9 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/propsheet.c b/dlls/comctl32/propsheet.c index 4759d4c..5aef0e1 100644 --- a/dlls/comctl32/propsheet.c +++ b/dlls/comctl32/propsheet.c @@ -2553,6 +2553,8 @@ static LRESULT PROPSHEET_IndexToHwnd(HWND hwndDlg, int iPageIndex) { PropSheetInfo * psInfo = GetPropW(hwndDlg, PropSheetInfoStr); TRACE("(%p, %d)\n", hwndDlg, iPageIndex); + if (!psInfo) + return 0; if (iPageIndex<0 || iPageIndex>=psInfo->nPages) { WARN("%d out of range.\n", iPageIndex); return 0; diff --git a/dlls/comctl32/tests/propsheet.c b/dlls/comctl32/tests/propsheet.c index 0eebe33..a61fa0b 100644 --- a/dlls/comctl32/tests/propsheet.c +++ b/dlls/comctl32/tests/propsheet.c @@ -26,6 +26,7 @@ #include "wine/test.h" static HWND parent; +static HWND sheethwnd; static LONG active_page = -1; @@ -40,12 +41,13 @@ static int CALLBACK sheet_callback(HWND hwnd, UINT msg, LPARAM lparam) char caption[256]; GetWindowTextA(hwnd, caption, sizeof(caption)); ok(!strcmp(caption,"test caption"), "caption: %s\n", caption); + sheethwnd = hwnd; return 0; } } return 0; } - + static INT_PTR CALLBACK page_dlg_proc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) { @@ -71,6 +73,10 @@ static INT_PTR CALLBACK page_dlg_proc(HWND hwnd, UINT msg, WPARAM wparam, return FALSE; } } + case WM_NCDESTROY: + ok(!SendMessageA(sheethwnd, PSM_INDEXTOHWND, 400, 0),"Should always be 0\n"); + return TRUE; + default: return FALSE; }

1 0

Marcus Meissner : localspl: Check for NULL return from HeapAlloc.
by Alexandre Julliard 19 Oct '09

19 Oct '09

Module: wine Branch: master Commit: 1aee3595423a8aa15e3560d764001129263bce10 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1aee3595423a8aa15e3560d76… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sat Oct 17 12:40:42 2009 +0200 localspl: Check for NULL return from HeapAlloc. --- dlls/localspl/provider.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/localspl/provider.c b/dlls/localspl/provider.c index e032a8e..8c6a940 100644 --- a/dlls/localspl/provider.c +++ b/dlls/localspl/provider.c @@ -193,7 +193,7 @@ static LPWSTR strdupW(LPCWSTR p) if(!p) return NULL; len = (lstrlenW(p) + 1) * sizeof(WCHAR); ret = heap_alloc(len); - memcpy(ret, p, len); + if (ret) memcpy(ret, p, len); return ret; }

1 0

Juan Lang : ws2_32: Don't overwrite address length before checking it.
by Alexandre Julliard 19 Oct '09

19 Oct '09

Module: wine Branch: master Commit: d1963ee2f19c931cbd6d7c039081440d08cb9011 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d1963ee2f19c931cbd6d7c039… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Oct 16 16:53:53 2009 -0700 ws2_32: Don't overwrite address length before checking it. --- dlls/ws2_32/socket.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index a8d3efc..35f7b07 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -1219,13 +1219,16 @@ static int ws_sockaddr_u2ws(const struct sockaddr* uaddr, struct WS_sockaddr* ws win6old->sin6_port = uin6->sin6_port; win6old->sin6_flowinfo = uin6->sin6_flowinfo; memcpy(&win6old->sin6_addr,&uin6->sin6_addr,16); /* 16 bytes = 128 address bits */ - *wsaddrlen = sizeof(struct WS_sockaddr_in6_old); #ifdef HAVE_STRUCT_SOCKADDR_IN6_SIN6_SCOPE_ID if (*wsaddrlen >= sizeof(struct WS_sockaddr_in6)) { struct WS_sockaddr_in6* win6 = (struct WS_sockaddr_in6*)wsaddr; win6->sin6_scope_id = uin6->sin6_scope_id; *wsaddrlen = sizeof(struct WS_sockaddr_in6); } + else + *wsaddrlen = sizeof(struct WS_sockaddr_in6_old); +#else + *wsaddrlen = sizeof(struct WS_sockaddr_in6_old); #endif return 0; }

1 0

Henri Verbeet : d3d8: Add traces.
by Alexandre Julliard 19 Oct '09

19 Oct '09

Module: wine Branch: master Commit: f8bd01a315f4f38e6267cf3c9aaf853094da27cd URL: http://source.winehq.org/git/wine.git/?a=commit;h=f8bd01a315f4f38e6267cf3c9… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Oct 19 10:12:20 2009 +0200 d3d8: Add traces. --- dlls/d3d8/cubetexture.c | 56 ++++++--- dlls/d3d8/device.c | 289 +++++++++++++++++++++++++++-------------- dlls/d3d8/directx.c | 55 ++++++--- dlls/d3d8/indexbuffer.c | 45 +++++-- dlls/d3d8/pixelshader.c | 6 +- dlls/d3d8/stateblock.c | 12 +- dlls/d3d8/surface.c | 40 ++++-- dlls/d3d8/swapchain.c | 13 ++- dlls/d3d8/texture.c | 57 ++++++--- dlls/d3d8/vertexbuffer.c | 45 +++++-- dlls/d3d8/vertexdeclaration.c | 10 +- dlls/d3d8/vertexshader.c | 6 +- dlls/d3d8/volume.c | 37 ++++-- dlls/d3d8/volumetexture.c | 55 ++++++--- 14 files changed, 487 insertions(+), 239 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f8bd01a315f4f38e6267c…

1 0

Henri Verbeet : wined3d: Cleanup IWineD3DDeviceImpl_UpdateTexture().
by Alexandre Julliard 19 Oct '09

19 Oct '09

Module: wine Branch: master Commit: adf5bb5f6aa51d59aab3813b9c8f063b15def1ca URL: http://source.winehq.org/git/wine.git/?a=commit;h=adf5bb5f6aa51d59aab3813b9… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Oct 19 10:12:19 2009 +0200 wined3d: Cleanup IWineD3DDeviceImpl_UpdateTexture(). The root problem here is that with the original error handling a NULL dereference occurs (IWineD3DBaseTexture_GetType()) when either the source or destination texture is NULL. Rewriting the error handling changes the indentation of almost the entire function though, so this patch ends up rewriting the entire function. --- dlls/wined3d/device.c | 185 ++++++++++++++++++++++++------------------------- 1 files changed, 90 insertions(+), 95 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=adf5bb5f6aa51d59aab38…

1 0

Henri Verbeet : ddraw/tests: Remove some leftover debug code.
by Alexandre Julliard 19 Oct '09

19 Oct '09

Module: wine Branch: master Commit: 02772641b2528d666b2d487ce99056346cf23191 URL: http://source.winehq.org/git/wine.git/?a=commit;h=02772641b2528d666b2d487ce… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Oct 19 10:12:18 2009 +0200 ddraw/tests: Remove some leftover debug code. --- dlls/ddraw/tests/dsurface.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/ddraw/tests/dsurface.c b/dlls/ddraw/tests/dsurface.c index 44be603..1a6023f 100644 --- a/dlls/ddraw/tests/dsurface.c +++ b/dlls/ddraw/tests/dsurface.c @@ -3224,7 +3224,6 @@ static void GetDCFormatTest(void) ddsd.ddsCaps.dwCaps = DDSCAPS_OFFSCREENPLAIN; hr = IDirectDraw7_CreateSurface(dd7, &ddsd, &surface, NULL); - hr = E_FAIL; if(FAILED(hr)) { ddsd.ddsCaps.dwCaps = DDSCAPS_TEXTURE;

1 0

Henri Verbeet : d3d9/tests: Remove an unused color result.
by Alexandre Julliard 19 Oct '09

19 Oct '09

Module: wine Branch: master Commit: d17cd37d3bab46ca79f46bfb1bd67cf16fdbcbe0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d17cd37d3bab46ca79f46bfb1… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Oct 19 10:12:17 2009 +0200 d3d9/tests: Remove an unused color result. --- dlls/d3d9/tests/visual.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index fa2d604..22d512e 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -6411,7 +6411,6 @@ static void test_vshader_input(IDirect3DDevice9 *device) */ ok(color == 0x000000FF || color == 0x00808080 || color == 0x00000000, "Input test: Quad 2(different colors) returned color 0x%08x, expected 0x000000FF, 0x00808080 or 0x00000000\n", color); - color = getPixelColor(device, 160, 120); IDirect3DDevice9_SetVertexShader(device, NULL); IDirect3DDevice9_SetVertexDeclaration(device, NULL);

1 0

Henri Verbeet : d3d9: Fix some IDirect3DDevice9Ex methods.
by Alexandre Julliard 19 Oct '09

19 Oct '09

Module: wine Branch: master Commit: 44aead2e1c638a2a57fda43a763821a1b2e1247d URL: http://source.winehq.org/git/wine.git/?a=commit;h=44aead2e1c638a2a57fda43a7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Oct 19 10:12:16 2009 +0200 d3d9: Fix some IDirect3DDevice9Ex methods. --- dlls/d3d9/device.c | 44 ++++++++++++++++++++++++++++++-------------- include/d3d9.h | 12 ++++++++---- 2 files changed, 38 insertions(+), 18 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 7dcff3d..79990bb 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -2039,9 +2039,15 @@ static HRESULT WINAPI IDirect3DDevice9ExImpl_SetConvolutionMonoKernel(LPDIRECT return WINED3DERR_INVALIDCALL; } -static HRESULT WINAPI IDirect3DDevice9ExImpl_ComposeRects(LPDIRECT3DDEVICE9EX iface, IDirect3DSurface9 *pSrc, IDirect3DDevice9 *pDst, IDirect3DVertexBuffer9 *pSrcRectDescs, UINT NumRects, IDirect3DVertexBuffer9 *pDstRectDescs, D3DCOMPOSERECTSOP Operation, int Xoffset, int Yoffset) { - IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *) iface; - FIXME("(%p)->(%p, %p, %p, %d, %p, %d, %d, %d) Stub!\n", This, pSrc, pDst, pSrcRectDescs, NumRects, pDstRectDescs, Operation, Xoffset, Yoffset); +static HRESULT WINAPI IDirect3DDevice9ExImpl_ComposeRects(IDirect3DDevice9Ex *iface, + IDirect3DSurface9 *src_surface, IDirect3DSurface9 *dst_surface, IDirect3DVertexBuffer9 *src_descs, + UINT rect_count, IDirect3DVertexBuffer9 *dst_descs, D3DCOMPOSERECTSOP operation, INT offset_x, INT offset_y) +{ + FIXME("iface %p, src_surface %p, dst_surface %p, src_descs %p, rect_count %u,\n" + "dst_descs %p, operation %#x, offset_x %u, offset_y %u stub!\n", + iface, src_surface, dst_surface, src_descs, rect_count, + dst_descs, operation, offset_x, offset_y); + return WINED3DERR_INVALIDCALL; } @@ -2069,9 +2075,12 @@ static HRESULT WINAPI IDirect3DDevice9ExImpl_WaitForVBlank(LPDIRECT3DDEVICE9EX return WINED3DERR_INVALIDCALL; } -static HRESULT WINAPI IDirect3DDevice9ExImpl_CheckresourceResidency(LPDIRECT3DDEVICE9EX iface, IDirect3DResource9 ** pResourceArray, UINT32 Numresources) { - IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *) iface; - FIXME("(%p)->(%p, %d) Stub!\n", This, pResourceArray, Numresources); +static HRESULT WINAPI IDirect3DDevice9ExImpl_CheckResourceResidency(IDirect3DDevice9Ex *iface, + IDirect3DResource9 **resources, UINT32 resource_count) +{ + FIXME("iface %p, resources %p, resource_count %u stub!\n", + iface, resources, resource_count); + return WINED3DERR_INVALIDCALL; } @@ -2088,9 +2097,10 @@ static HRESULT WINAPI IDirect3DDevice9ExImpl_GetMaximumFrameLatency(LPDIRECT3D return WINED3DERR_INVALIDCALL; } -static HRESULT WINAPI IDirect3DDevice9ExImpl_CheckdeviceState(LPDIRECT3DDEVICE9EX iface, HWND hDestinationWindow) { - IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *) iface; - FIXME("(%p)->(%p) Stub!\n", This, hDestinationWindow); +static HRESULT WINAPI IDirect3DDevice9ExImpl_CheckDeviceState(IDirect3DDevice9Ex *iface, HWND dst_window) +{ + FIXME("iface %p, dst_window %p stub!\n", iface, dst_window); + return WINED3DERR_INVALIDCALL; } @@ -2106,9 +2116,15 @@ static HRESULT WINAPI IDirect3DDevice9ExImpl_CreateOffscreenPlainSurfaceEx(LPD return WINED3DERR_INVALIDCALL; } -static HRESULT WINAPI IDirect3DDevice9ExImpl_CreateDepthStencilSurfaceEx(LPDIRECT3DDEVICE9EX iface, UINT Width, UINT Height, D3DFORMAT Format, D3DMULTISAMPLE_TYPE MultiSample, DWORD MultiSampleQuality, BOOL Discard, IDirect3DSurface9 **ppSurface, HANDLE *pSharedHandle, DWORD Usage) { - IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *) iface; - FIXME("(%p)->(%d, %d, %d, %d, %d, %s, %p, %p, 0x%08x) Stub!\n", This, Width, Height, Format, MultiSample, MultiSampleQuality, Discard ? "true" : "false", ppSurface, pSharedHandle, Usage); +static HRESULT WINAPI IDirect3DDevice9ExImpl_CreateDepthStencilSurfaceEx(IDirect3DDevice9Ex *iface, + UINT width, UINT height, D3DFORMAT format, D3DMULTISAMPLE_TYPE multisample_type, DWORD multisample_quality, + BOOL discard, IDirect3DSurface9 **surface, HANDLE *shared_handle, DWORD usage) +{ + FIXME("iface %p, width %u, height %u, format %#x, multisample_type %#x, multisample_quality %u,\n" + "discard %#x, surface %p, shared_handle %p, usage %#x stub!\n", + iface, width, height, format, multisample_type, multisample_quality, + discard, surface, shared_handle, usage); + return WINED3DERR_INVALIDCALL; } @@ -2254,10 +2270,10 @@ const IDirect3DDevice9ExVtbl Direct3DDevice9_Vtbl = IDirect3DDevice9ExImpl_GetGPUThreadPriority, IDirect3DDevice9ExImpl_SetGPUThreadPriority, IDirect3DDevice9ExImpl_WaitForVBlank, - IDirect3DDevice9ExImpl_CheckresourceResidency, + IDirect3DDevice9ExImpl_CheckResourceResidency, IDirect3DDevice9ExImpl_SetMaximumFrameLatency, IDirect3DDevice9ExImpl_GetMaximumFrameLatency, - IDirect3DDevice9ExImpl_CheckdeviceState, + IDirect3DDevice9ExImpl_CheckDeviceState, IDirect3DDevice9ExImpl_CreateRenderTargetEx, IDirect3DDevice9ExImpl_CreateOffscreenPlainSurfaceEx, IDirect3DDevice9ExImpl_CreateDepthStencilSurfaceEx, diff --git a/include/d3d9.h b/include/d3d9.h index dfd2acc..09ce3d0 100644 --- a/include/d3d9.h +++ b/include/d3d9.h @@ -1708,18 +1708,22 @@ DECLARE_INTERFACE_(IDirect3DDevice9Ex,IDirect3DDevice9) STDMETHOD(CreateQuery)(THIS_ D3DQUERYTYPE Type, IDirect3DQuery9** ppQuery) PURE; /* IDirect3DDevice9Ex methods */ STDMETHOD(SetConvolutionMonoKernel)(THIS_ UINT width, UINT height, float *rows, float *columns) PURE; - STDMETHOD(ComposeRects)(THIS_ IDirect3DSurface9 *pSrc, IDirect3DDevice9 *pDst, IDirect3DVertexBuffer9 *pSrcRectDescs, UINT NumRects, IDirect3DVertexBuffer9 *pDstRectDescs, D3DCOMPOSERECTSOP Operation, int Xoffset, int Yoffset) PURE; + STDMETHOD(ComposeRects)(THIS_ IDirect3DSurface9 *src_surface, IDirect3DSurface9 *dst_surface, + IDirect3DVertexBuffer9 *src_descs, UINT rect_count, IDirect3DVertexBuffer9 *dst_descs, + D3DCOMPOSERECTSOP operation, INT offset_x, INT offset_y) PURE; STDMETHOD(PresentEx)(THIS_ CONST RECT *pSourceRect, CONST RECT *pDestRect, HWND hDestWindowOverride, CONST RGNDATA *pDirtyRegion, DWORD dwFlags) PURE; STDMETHOD(GetGPUThreadPriority)(THIS_ INT *pPriority) PURE; STDMETHOD(SetGPUThreadPriority)(THIS_ INT Priority) PURE; STDMETHOD(WaitForVBlank)(THIS_ UINT iSwapChain) PURE; - STDMETHOD(CheckresourceResidency)(THIS_ IDirect3DResource9 ** pResourceArray, UINT32 Numresources) PURE; + STDMETHOD(CheckResourceResidency)(THIS_ IDirect3DResource9 **resources, UINT32 resource_count) PURE; STDMETHOD(SetMaximumFrameLatency)(THIS_ UINT MaxLatency) PURE; STDMETHOD(GetMaximumFrameLatency)(THIS_ UINT *pMaxLatenxy) PURE; - STDMETHOD(CheckdeviceState)(THIS_ HWND hDestinationWindow) PURE; + STDMETHOD(CheckDeviceState)(THIS_ HWND dst_window) PURE; STDMETHOD(CreateRenderTargetEx)(THIS_ UINT Width, UINT Height, D3DFORMAT Format, D3DMULTISAMPLE_TYPE MultiSample, DWORD MultiSampleQuality, BOOL Lockable, IDirect3DSurface9 ** ppSurface, HANDLE *pSharedHandle, DWORD Usage) PURE; STDMETHOD(CreateOffscreenPlainSurfaceEx)(THIS_ UINT Width, UINT Height, D3DFORMAT Format, D3DPOOL Pool, IDirect3DSurface9 **ppSurface, HANDLE *pSharedHandle, DWORD Usage) PURE; - STDMETHOD(CreateDepthStencilSurfaceEx)(THIS_ UINT Width, UINT Height, D3DFORMAT Format, D3DMULTISAMPLE_TYPE MultiSample, DWORD MultiSampleQuality, BOOL Discard, IDirect3DSurface9 **ppSurfface, HANDLE *pSharedHandle, DWORD Usage) PURE; + STDMETHOD(CreateDepthStencilSurfaceEx)(THIS_ UINT width, UINT height, D3DFORMAT format, + D3DMULTISAMPLE_TYPE multisample_type, DWORD multisample_quality, BOOL discard, + IDirect3DSurface9 **surface, HANDLE *shared_handle, DWORD usage) PURE; STDMETHOD(ResetEx)(THIS_ D3DPRESENT_PARAMETERS *pPresentationParameters, D3DDISPLAYMODEEX *pFullscreenDisplayMode) PURE; STDMETHOD(GetDisplayModeEx)(THIS_ UINT iSwapChain, D3DDISPLAYMODEEX *pMode, D3DDISPLAYROTATION *pRotation) PURE; };

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits October 2009