June 2011 - Wine-commits - list.winehq.org

Louis Lenders : netapi32/tests: Add small conformance test for NetGetJoinInformation.
by Alexandre Julliard 10 Jun '11

10 Jun '11

Module: wine Branch: master Commit: 6f08c7e97916684450e642a6c5e2207f296e7a4d URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f08c7e97916684450e642a6c… Author: Louis Lenders <xerox_xerox2000(a)yahoo.co.uk> Date: Fri Jun 10 10:41:50 2011 +0200 netapi32/tests: Add small conformance test for NetGetJoinInformation. --- dlls/netapi32/tests/wksta.c | 26 ++++++++++++++++++++++++++ 1 files changed, 26 insertions(+), 0 deletions(-) diff --git a/dlls/netapi32/tests/wksta.c b/dlls/netapi32/tests/wksta.c index fff5b48..54c25e5 100644 --- a/dlls/netapi32/tests/wksta.c +++ b/dlls/netapi32/tests/wksta.c @@ -31,6 +31,7 @@ #include "lmerr.h" #include "lmwksta.h" #include "lmapibuf.h" +#include "lmjoin.h" static NET_API_STATUS (WINAPI *pNetApiBufferFree)(LPVOID)=NULL; static NET_API_STATUS (WINAPI *pNetApiBufferSize)(LPVOID,LPDWORD)=NULL; @@ -38,6 +39,7 @@ static NET_API_STATUS (WINAPI *pNetpGetComputerName)(LPWSTR*)=NULL; static NET_API_STATUS (WINAPI *pNetWkstaUserGetInfo)(LPWSTR,DWORD,PBYTE*)=NULL; static NET_API_STATUS (WINAPI *pNetWkstaTransportEnum)(LPWSTR,DWORD,LPBYTE*, DWORD,LPDWORD,LPDWORD,LPDWORD)=NULL; +static NET_API_STATUS (WINAPI *pNetGetJoinInformation)(LPCWSTR,LPWSTR*,PNETSETUP_JOIN_STATUS); static WCHAR user_name[UNLEN + 1]; static WCHAR computer_name[MAX_COMPUTERNAME_LENGTH + 1]; @@ -179,6 +181,28 @@ static void run_wkstatransportenum_tests(void) } } +static void run_wkstajoininfo_tests(void) +{ + NET_API_STATUS ret; + LPWSTR buffer = NULL; + NETSETUP_JOIN_STATUS buffertype = 0xdada; + /* NT4 doesn't have this function */ + if (!pNetGetJoinInformation) { + win_skip("NetGetJoinInformation not available\n"); + return; + } + + ret = pNetGetJoinInformation(NULL, NULL, NULL); + ok(ret == ERROR_INVALID_PARAMETER, "NetJoinGetInformation returned unexpected 0x%08x\n", ret); + ok(buffertype == 0xdada, "buffertype set to unexpected value %d\n", buffertype); + + ret = pNetGetJoinInformation(NULL, &buffer, &buffertype); + ok(ret == NERR_Success, "NetJoinGetInformation returned unexpected 0x%08x\n", ret); + ok(buffertype != 0xdada && buffertype != NetSetupUnknownStatus, "buffertype set to unexpected value %d\n", buffertype); + trace("workstation joined to %s with status %d\n", wine_dbgstr_w(buffer), buffertype); + pNetApiBufferFree(buffer); +} + START_TEST(wksta) { HMODULE hnetapi32=LoadLibraryA("netapi32.dll"); @@ -188,6 +212,7 @@ START_TEST(wksta) pNetpGetComputerName=(void*)GetProcAddress(hnetapi32,"NetpGetComputerName"); pNetWkstaUserGetInfo=(void*)GetProcAddress(hnetapi32,"NetWkstaUserGetInfo"); pNetWkstaTransportEnum=(void*)GetProcAddress(hnetapi32,"NetWkstaTransportEnum"); + pNetGetJoinInformation=(void*)GetProcAddress(hnetapi32,"NetGetJoinInformation"); /* These functions were introduced with NT. It's safe to assume that * if one is not available, none are. @@ -205,6 +230,7 @@ START_TEST(wksta) win_skip("Function NetpGetComputerName not available\n"); run_wkstausergetinfo_tests(); run_wkstatransportenum_tests(); + run_wkstajoininfo_tests(); } FreeLibrary(hnetapi32);

1 0

Ričardas Barkauskas : ddraw: Separate IDirectDrawSurface2 vtable.
by Alexandre Julliard 10 Jun '11

10 Jun '11

Module: wine Branch: master Commit: a8ee7c5e00d7de1060857ff8d779ee8480b30b16 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a8ee7c5e00d7de1060857ff8d… Author: Ričardas Barkauskas <rbarkauskas(a)codeweavers.com> Date: Thu Jun 9 17:35:15 2011 +0300 ddraw: Separate IDirectDrawSurface2 vtable. --- dlls/ddraw/ddraw_private.h | 7 + dlls/ddraw/surface.c | 446 +++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 452 insertions(+), 1 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a8ee7c5e00d7de1060857…

1 0

Ričardas Barkauskas : ddraw: Use unsafe_impl_from_IDirectDrawSurface() for application provided interfaces.
by Alexandre Julliard 10 Jun '11

10 Jun '11

Module: wine Branch: master Commit: 27063ffeaab30b00fd89038fe029b1a49ff36d9c URL: http://source.winehq.org/git/wine.git/?a=commit;h=27063ffeaab30b00fd89038fe… Author: Ričardas Barkauskas <rbarkauskas(a)codeweavers.com> Date: Thu Jun 9 17:40:19 2011 +0300 ddraw: Use unsafe_impl_from_IDirectDrawSurface() for application provided interfaces. --- dlls/ddraw/ddraw.c | 8 ++++---- dlls/ddraw/ddraw_private.h | 1 + dlls/ddraw/device.c | 2 +- dlls/ddraw/surface.c | 7 +++++++ 4 files changed, 13 insertions(+), 5 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index df74def..648c63d 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -4266,7 +4266,7 @@ static HRESULT WINAPI ddraw3_DuplicateSurface(IDirectDraw3 *iface, IDirectDrawSu IDirectDrawSurface **dst) { IDirectDrawImpl *This = impl_from_IDirectDraw3(iface); - IDirectDrawSurfaceImpl *src_impl = unsafe_impl_from_IDirectDrawSurface3((IDirectDrawSurface3 *)src); + IDirectDrawSurfaceImpl *src_impl = unsafe_impl_from_IDirectDrawSurface(src); IDirectDrawSurface7 *dst7; IDirectDrawSurfaceImpl *dst_impl; HRESULT hr; @@ -4286,7 +4286,7 @@ static HRESULT WINAPI ddraw2_DuplicateSurface(IDirectDraw2 *iface, IDirectDrawSurface *src, IDirectDrawSurface **dst) { IDirectDrawImpl *This = impl_from_IDirectDraw2(iface); - IDirectDrawSurfaceImpl *src_impl = unsafe_impl_from_IDirectDrawSurface3((IDirectDrawSurface3 *)src); + IDirectDrawSurfaceImpl *src_impl = unsafe_impl_from_IDirectDrawSurface(src); IDirectDrawSurface7 *dst7; IDirectDrawSurfaceImpl *dst_impl; HRESULT hr; @@ -4306,7 +4306,7 @@ static HRESULT WINAPI ddraw1_DuplicateSurface(IDirectDraw *iface, IDirectDrawSur IDirectDrawSurface **dst) { IDirectDrawImpl *This = impl_from_IDirectDraw(iface); - IDirectDrawSurfaceImpl *src_impl = unsafe_impl_from_IDirectDrawSurface3((IDirectDrawSurface3 *)src); + IDirectDrawSurfaceImpl *src_impl = unsafe_impl_from_IDirectDrawSurface(src); IDirectDrawSurface7 *dst7; IDirectDrawSurfaceImpl *dst_impl; HRESULT hr; @@ -4906,7 +4906,7 @@ static HRESULT WINAPI d3d2_CreateDevice(IDirect3D2 *iface, REFCLSID riid, IDirectDrawSurface *surface, IDirect3DDevice2 **device) { IDirectDrawImpl *This = impl_from_IDirect3D2(iface); - IDirectDrawSurfaceImpl *surface_impl = unsafe_impl_from_IDirectDrawSurface3((IDirectDrawSurface3 *)surface); + IDirectDrawSurfaceImpl *surface_impl = unsafe_impl_from_IDirectDrawSurface(surface); HRESULT hr; TRACE("iface %p, riid %s, surface %p, device %p.\n", diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index bce6368..160ae44 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -242,6 +242,7 @@ static inline IDirectDrawSurfaceImpl *impl_from_IDirectDrawSurface7(IDirectDrawS return CONTAINING_RECORD(iface, IDirectDrawSurfaceImpl, IDirectDrawSurface7_iface); } +IDirectDrawSurfaceImpl *unsafe_impl_from_IDirectDrawSurface(IDirectDrawSurface *iface) DECLSPEC_HIDDEN; IDirectDrawSurfaceImpl *unsafe_impl_from_IDirectDrawSurface2(IDirectDrawSurface2 *iface) DECLSPEC_HIDDEN; IDirectDrawSurfaceImpl *unsafe_impl_from_IDirectDrawSurface3(IDirectDrawSurface3 *iface) DECLSPEC_HIDDEN; IDirectDrawSurfaceImpl *unsafe_impl_from_IDirectDrawSurface4(IDirectDrawSurface4 *iface) DECLSPEC_HIDDEN; diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index f4e5664..c4ad855 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -1901,7 +1901,7 @@ static HRESULT WINAPI IDirect3DDeviceImpl_2_SetRenderTarget(IDirect3DDevice2 *if IDirectDrawSurface *NewRenderTarget, DWORD Flags) { IDirect3DDeviceImpl *This = device_from_device2(iface); - IDirectDrawSurfaceImpl *Target = unsafe_impl_from_IDirectDrawSurface3((IDirectDrawSurface3 *)NewRenderTarget); + IDirectDrawSurfaceImpl *Target = unsafe_impl_from_IDirectDrawSurface(NewRenderTarget); TRACE("iface %p, target %p, flags %#x.\n", iface, NewRenderTarget, Flags); diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index e877b9f..eb9dd29 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -4421,6 +4421,13 @@ IDirectDrawSurfaceImpl *unsafe_impl_from_IDirectDrawSurface2(IDirectDrawSurface2 return CONTAINING_RECORD(iface, IDirectDrawSurfaceImpl, IDirectDrawSurface2_iface); } +IDirectDrawSurfaceImpl *unsafe_impl_from_IDirectDrawSurface(IDirectDrawSurface *iface) +{ + if (!iface) return NULL; + assert(iface->lpVtbl == (struct IDirectDrawSurfaceVtbl *)&ddraw_surface3_vtbl); + return CONTAINING_RECORD(iface, IDirectDrawSurfaceImpl, IDirectDrawSurface3_iface); +} + static void STDMETHODCALLTYPE ddraw_surface_wined3d_object_destroyed(void *parent) { IDirectDrawSurfaceImpl *surface = parent;

1 0

Ričardas Barkauskas : ddraw: Separate IDirectDrawSurface vtable.
by Alexandre Julliard 10 Jun '11

10 Jun '11

Module: wine Branch: master Commit: f3ae1b99f637c7a22546a7528edb0f9df2d57678 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f3ae1b99f637c7a22546a7528… Author: Ričardas Barkauskas <rbarkauskas(a)codeweavers.com> Date: Thu Jun 9 18:29:36 2011 +0300 ddraw: Separate IDirectDrawSurface vtable. --- dlls/ddraw/ddraw.c | 24 ++-- dlls/ddraw/ddraw_private.h | 6 + dlls/ddraw/device.c | 2 +- dlls/ddraw/surface.c | 419 +++++++++++++++++++++++++++++++++++++++++++- 4 files changed, 432 insertions(+), 19 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f3ae1b99f637c7a22546a…

1 0

Jacek Caban : wininet: Moved INTERNET_STATUS_REQUEST_COMPLETE notifications sending to separated function .
by Alexandre Julliard 10 Jun '11

10 Jun '11

Module: wine Branch: master Commit: c0293df46a21c54aeec50ce10c5a85ad3e13fc0b URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0293df46a21c54aeec50ce10… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jun 10 14:47:04 2011 +0200 wininet: Moved INTERNET_STATUS_REQUEST_COMPLETE notifications sending to separated function. --- dlls/wininet/http.c | 68 ++++++++++++++++++-------------------------------- 1 files changed, 25 insertions(+), 43 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 559323d..21c4125 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -2627,10 +2627,20 @@ static DWORD set_content_length(http_request_t *request, DWORD status_code) return ERROR_SUCCESS; } -static void HTTP_ReceiveRequestData(http_request_t *req, BOOL first_notif) +static void send_request_complete(http_request_t *req, DWORD_PTR result, DWORD error) { INTERNET_ASYNC_RESULT iar; - DWORD res, read = 0; + + iar.dwResult = result; + iar.dwError = error; + + INTERNET_SendCallback(&req->hdr, req->hdr.dwContext, INTERNET_STATUS_REQUEST_COMPLETE, &iar, + sizeof(INTERNET_ASYNC_RESULT)); +} + +static void HTTP_ReceiveRequestData(http_request_t *req, BOOL first_notif) +{ + DWORD res, read = 0, avail = 0; read_mode_t mode; TRACE("%p\n", req); @@ -2639,13 +2649,8 @@ static void HTTP_ReceiveRequestData(http_request_t *req, BOOL first_notif) mode = first_notif && req->read_size ? READMODE_NOBLOCK : READMODE_ASYNC; res = refill_read_buffer(req, mode, &read); - if(res == ERROR_SUCCESS) { - iar.dwResult = (DWORD_PTR)req->hdr.hInternet; - iar.dwError = first_notif ? 0 : get_avail_data(req); - }else { - iar.dwResult = 0; - iar.dwError = res; - } + if(res == ERROR_SUCCESS && !first_notif) + avail = get_avail_data(req); LeaveCriticalSection( &req->read_section ); @@ -2654,8 +2659,10 @@ static void HTTP_ReceiveRequestData(http_request_t *req, BOOL first_notif) http_release_netconn(req, FALSE); } - INTERNET_SendCallback(&req->hdr, req->hdr.dwContext, INTERNET_STATUS_REQUEST_COMPLETE, &iar, - sizeof(INTERNET_ASYNC_RESULT)); + if(res == ERROR_SUCCESS) + send_request_complete(req, (DWORD_PTR)req->hdr.hInternet, avail); + else + send_request_complete(req, 0, res); } /* read data from the http connection (the read section must be held) */ @@ -2725,7 +2732,6 @@ static void HTTPREQ_AsyncReadFileExAProc(WORKREQUEST *workRequest) { struct WORKREQ_INTERNETREADFILEEXA const *data = &workRequest->u.InternetReadFileExA; http_request_t *req = (http_request_t*)workRequest->hdr; - INTERNET_ASYNC_RESULT iar; DWORD res; TRACE("INTERNETREADFILEEXA %p\n", workRequest->hdr); @@ -2733,12 +2739,7 @@ static void HTTPREQ_AsyncReadFileExAProc(WORKREQUEST *workRequest) res = HTTPREQ_Read(req, data->lpBuffersOut->lpvBuffer, data->lpBuffersOut->dwBufferLength, &data->lpBuffersOut->dwBufferLength, TRUE); - iar.dwResult = res == ERROR_SUCCESS; - iar.dwError = res; - - INTERNET_SendCallback(&req->hdr, req->hdr.dwContext, - INTERNET_STATUS_REQUEST_COMPLETE, &iar, - sizeof(INTERNET_ASYNC_RESULT)); + send_request_complete(req, res == ERROR_SUCCESS, res); } static DWORD HTTPREQ_ReadFileExA(object_header_t *hdr, INTERNET_BUFFERSA *buffers, @@ -2832,7 +2833,6 @@ static void HTTPREQ_AsyncReadFileExWProc(WORKREQUEST *workRequest) { struct WORKREQ_INTERNETREADFILEEXW const *data = &workRequest->u.InternetReadFileExW; http_request_t *req = (http_request_t*)workRequest->hdr; - INTERNET_ASYNC_RESULT iar; DWORD res; TRACE("INTERNETREADFILEEXW %p\n", workRequest->hdr); @@ -2840,12 +2840,7 @@ static void HTTPREQ_AsyncReadFileExWProc(WORKREQUEST *workRequest) res = HTTPREQ_Read(req, data->lpBuffersOut->lpvBuffer, data->lpBuffersOut->dwBufferLength, &data->lpBuffersOut->dwBufferLength, TRUE); - iar.dwResult = res == ERROR_SUCCESS; - iar.dwError = res; - - INTERNET_SendCallback(&req->hdr, req->hdr.dwContext, - INTERNET_STATUS_REQUEST_COMPLETE, &iar, - sizeof(INTERNET_ASYNC_RESULT)); + send_request_complete(req, res == ERROR_SUCCESS, res); } static DWORD HTTPREQ_ReadFileExW(object_header_t *hdr, INTERNET_BUFFERSW *buffers, @@ -4539,7 +4534,6 @@ static DWORD HTTP_HttpSendRequestW(http_request_t *request, LPCWSTR lpszHeaders, LPWSTR requestString = NULL; INT responseLen; BOOL loop_next; - INTERNET_ASYNC_RESULT iar; static const WCHAR szPost[] = { 'P','O','S','T',0 }; static const WCHAR szContentLength[] = { 'C','o','n','t','e','n','t','-','L','e','n','g','t','h',':',' ','%','l','i','\r','\n',0 }; @@ -4814,14 +4808,7 @@ lend: if (res == ERROR_SUCCESS && request->contentLength && request->bytesWritten == request->bytesToWrite) HTTP_ReceiveRequestData(request, TRUE); else - { - iar.dwResult = (res==ERROR_SUCCESS ? (DWORD_PTR)request->hdr.hInternet : 0); - iar.dwError = res; - - INTERNET_SendCallback(&request->hdr, request->hdr.dwContext, - INTERNET_STATUS_REQUEST_COMPLETE, &iar, - sizeof(INTERNET_ASYNC_RESULT)); - } + send_request_complete(request, res == ERROR_SUCCESS ? (DWORD_PTR)request->hdr.hInternet : 0, res); } TRACE("<--\n"); @@ -4912,15 +4899,10 @@ static DWORD HTTP_HttpEndRequestW(http_request_t *request, DWORD dwFlags, DWORD_ } } - if (res == ERROR_SUCCESS && request->contentLength) { + if (res == ERROR_SUCCESS && request->contentLength) HTTP_ReceiveRequestData(request, TRUE); - }else { - INTERNET_ASYNC_RESULT iar = {0, res}; - - INTERNET_SendCallback(&request->hdr, request->hdr.dwContext, - INTERNET_STATUS_REQUEST_COMPLETE, &iar, - sizeof(INTERNET_ASYNC_RESULT)); - } + else + send_request_complete(request, res == ERROR_SUCCESS ? (DWORD_PTR)request->hdr.hInternet : 0, res); return res; } @@ -4975,7 +4957,7 @@ BOOL WINAPI HttpEndRequestW(HINTERNET hRequest, http_request_t *request; DWORD res; - TRACE("-->\n"); + TRACE("%p %p %x %lx -->\n", hRequest, lpBuffersOut, dwFlags, dwContext); if (lpBuffersOut) {

1 0

Henri Verbeet : wined3d: Handle unpack row length inside surface_upload_data().
by Alexandre Julliard 10 Jun '11

10 Jun '11

Module: wine Branch: master Commit: 9f3e6a20e81546979e6a2fae41d15897ade9aa46 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f3e6a20e81546979e6a2fae4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jun 9 20:40:47 2011 +0200 wined3d: Handle unpack row length inside surface_upload_data(). --- dlls/wined3d/surface.c | 16 ++++++---------- 1 files changed, 6 insertions(+), 10 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index ad217fc..06f38b0 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2199,6 +2199,9 @@ static void surface_upload_data(struct wined3d_surface *surface, const struct wi data = NULL; } + /* Make sure the correct pitch is used */ + glPixelStorei(GL_UNPACK_ROW_LENGTH, width); + if (format->flags & WINED3DFMT_FLAG_COMPRESSED) { TRACE("Calling glCompressedTexSubImage2DARB.\n"); @@ -2216,6 +2219,9 @@ static void surface_upload_data(struct wined3d_surface *surface, const struct wi checkGLcall("glTexSubImage2D"); } + /* Restore the default pitch */ + glPixelStorei(GL_UNPACK_ROW_LENGTH, 0); + if (surface->flags & SFLAG_PBO) { GL_EXTCALL(glBindBufferARB(GL_PIXEL_UNPACK_BUFFER_ARB, 0)); @@ -6159,19 +6165,9 @@ HRESULT surface_load_location(struct wined3d_surface *surface, DWORD flag, const mem = surface->resource.allocatedMemory; } - /* Make sure the correct pitch is used */ - ENTER_GL(); - glPixelStorei(GL_UNPACK_ROW_LENGTH, width); - LEAVE_GL(); - if (mem || (surface->flags & SFLAG_PBO)) surface_upload_data(surface, gl_info, &format, srgb, mem); - /* Restore the default pitch */ - ENTER_GL(); - glPixelStorei(GL_UNPACK_ROW_LENGTH, 0); - LEAVE_GL(); - if (context) context_release(context); /* Don't delete PBO memory */

1 0

Henri Verbeet : wined3d: Get rid of a NULL check for surface_upload_data().
by Alexandre Julliard 10 Jun '11

10 Jun '11

Module: wine Branch: master Commit: a1b8f254b109ae92cbedc8acd39c395130369acc URL: http://source.winehq.org/git/wine.git/?a=commit;h=a1b8f254b109ae92cbedc8acd… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jun 9 20:40:48 2011 +0200 wined3d: Get rid of a NULL check for surface_upload_data(). --- dlls/wined3d/surface.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 06f38b0..25b99fd 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -6165,8 +6165,7 @@ HRESULT surface_load_location(struct wined3d_surface *surface, DWORD flag, const mem = surface->resource.allocatedMemory; } - if (mem || (surface->flags & SFLAG_PBO)) - surface_upload_data(surface, gl_info, &format, srgb, mem); + surface_upload_data(surface, gl_info, &format, srgb, mem); if (context) context_release(context);

1 0

Henri Verbeet : wined3d: Move PBO handling mostly out of surface_upload_data().
by Alexandre Julliard 10 Jun '11

10 Jun '11

Module: wine Branch: master Commit: 980c50a0875bb14016a7c8c6a5ba6ce1ec05bcbd URL: http://source.winehq.org/git/wine.git/?a=commit;h=980c50a0875bb14016a7c8c6a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jun 9 20:40:49 2011 +0200 wined3d: Move PBO handling mostly out of surface_upload_data(). Currently we essentially get half of the address from the caller and half from the destination surface. Since we'd like to use surface_upload_data() for wined3d_device_update_surface() as well, we should get all of it from the caller. --- dlls/wined3d/surface.c | 24 ++++++++++++------------ dlls/wined3d/wined3d_private.h | 6 ++++++ 2 files changed, 18 insertions(+), 12 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 25b99fd..77a4f2f 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2162,7 +2162,7 @@ static void surface_download_data(struct wined3d_surface *surface, const struct * correct texture. */ /* Context activation is done by the caller. */ static void surface_upload_data(struct wined3d_surface *surface, const struct wined3d_gl_info *gl_info, - const struct wined3d_format *format, BOOL srgb, const GLvoid *data) + const struct wined3d_format *format, BOOL srgb, const struct wined3d_bo_address *data) { GLsizei width = surface->resource.width; GLsizei height = surface->resource.height; @@ -2181,8 +2181,8 @@ static void surface_upload_data(struct wined3d_surface *surface, const struct wi internal = format->glInternal; } - TRACE("surface %p, internal %#x, width %d, height %d, format %#x, type %#x, data %p.\n", - surface, internal, width, height, format->glFormat, format->glType, data); + TRACE("surface %p, internal %#x, width %d, height %d, format %#x, type %#x, data {%#x:%p}.\n", + surface, internal, width, height, format->glFormat, format->glType, data->buffer_object, data->addr); TRACE("target %#x, level %u, resource size %u.\n", surface->texture_target, surface->texture_level, surface->resource.size); @@ -2190,13 +2190,10 @@ static void surface_upload_data(struct wined3d_surface *surface, const struct wi ENTER_GL(); - if (surface->flags & SFLAG_PBO) + if (data->buffer_object) { - GL_EXTCALL(glBindBufferARB(GL_PIXEL_UNPACK_BUFFER_ARB, surface->pbo)); + GL_EXTCALL(glBindBufferARB(GL_PIXEL_UNPACK_BUFFER_ARB, data->buffer_object)); checkGLcall("glBindBufferARB"); - - TRACE("(%p) pbo: %#x, data: %p.\n", surface, surface->pbo, data); - data = NULL; } /* Make sure the correct pitch is used */ @@ -2207,7 +2204,7 @@ static void surface_upload_data(struct wined3d_surface *surface, const struct wi TRACE("Calling glCompressedTexSubImage2DARB.\n"); GL_EXTCALL(glCompressedTexSubImage2DARB(surface->texture_target, surface->texture_level, - 0, 0, width, height, internal, surface->resource.size, data)); + 0, 0, width, height, internal, surface->resource.size, data->addr)); checkGLcall("glCompressedTexSubImage2DARB"); } else @@ -2215,14 +2212,14 @@ static void surface_upload_data(struct wined3d_surface *surface, const struct wi TRACE("Calling glTexSubImage2D.\n"); glTexSubImage2D(surface->texture_target, surface->texture_level, - 0, 0, width, height, format->glFormat, format->glType, data); + 0, 0, width, height, format->glFormat, format->glType, data->addr); checkGLcall("glTexSubImage2D"); } /* Restore the default pitch */ glPixelStorei(GL_UNPACK_ROW_LENGTH, 0); - if (surface->flags & SFLAG_PBO) + if (data->buffer_object) { GL_EXTCALL(glBindBufferARB(GL_PIXEL_UNPACK_BUFFER_ARB, 0)); checkGLcall("glBindBufferARB"); @@ -6072,6 +6069,7 @@ HRESULT surface_load_location(struct wined3d_surface *surface, DWORD flag, const /* Upload from system memory */ BOOL srgb = flag == SFLAG_INSRGBTEX; struct wined3d_context *context = NULL; + struct wined3d_bo_address data; d3dfmt_get_conv(surface, TRUE /* We need color keying */, TRUE /* We will use textures */, &format, &convert); @@ -6165,7 +6163,9 @@ HRESULT surface_load_location(struct wined3d_surface *surface, DWORD flag, const mem = surface->resource.allocatedMemory; } - surface_upload_data(surface, gl_info, &format, srgb, mem); + data.buffer_object = surface->flags & SFLAG_PBO ? surface->pbo : 0; + data.addr = mem; + surface_upload_data(surface, gl_info, &format, srgb, &data); if (context) context_release(context); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index d898654..44efb85 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -894,6 +894,12 @@ enum wined3d_ffp_emit_idx WINED3D_FFP_EMIT_COUNT = 17 }; +struct wined3d_bo_address +{ + GLuint buffer_object; + const BYTE *addr; +}; + struct wined3d_stream_info_element { const struct wined3d_format *format;

1 0

Stefan Dösinger : wined3d: Don' t check the FBO status if FIXMEs are off.
by Alexandre Julliard 10 Jun '11

10 Jun '11

Module: wine Branch: master Commit: 7b39005256d2179b74e1962b1ba6d6555112d206 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b39005256d2179b74e1962b1… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri May 27 16:17:25 2011 +0200 wined3d: Don't check the FBO status if FIXMEs are off. --- dlls/wined3d/context.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index b077c5f..3eb6c7d 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -304,6 +304,8 @@ void context_check_fbo_status(struct wined3d_context *context, GLenum target) const struct wined3d_gl_info *gl_info = context->gl_info; GLenum status; + if (!FIXME_ON(d3d)) return; + status = gl_info->fbo_ops.glCheckFramebufferStatus(target); if (status == GL_FRAMEBUFFER_COMPLETE) {

1 0

Stefan Dösinger : wined3d: Set last_was_blit to FALSE in the if condition that checks for it.
by Alexandre Julliard 10 Jun '11

10 Jun '11

Module: wine Branch: master Commit: 663fac5bcd9fd6242a9a3e879ecb37e93343fb0b URL: http://source.winehq.org/git/wine.git/?a=commit;h=663fac5bcd9fd6242a9a3e879… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Jun 2 19:54:37 2011 +0200 wined3d: Set last_was_blit to FALSE in the if condition that checks for it. --- dlls/wined3d/context.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 3eb6c7d..40b9cee 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -2221,6 +2221,7 @@ BOOL context_apply_clear_state(struct wined3d_context *context, struct wined3d_d if (context->last_was_blit) { device->frag_pipe->enable_extension(TRUE); + context->last_was_blit = FALSE; } /* Blending and clearing should be orthogonal, but tests on the nvidia @@ -2231,7 +2232,6 @@ BOOL context_apply_clear_state(struct wined3d_context *context, struct wined3d_d checkGLcall("glEnable GL_SCISSOR_TEST"); LEAVE_GL(); - context->last_was_blit = FALSE; context_invalidate_state(context, STATE_RENDER(WINED3DRS_ALPHABLENDENABLE), state_table); context_invalidate_state(context, STATE_RENDER(WINED3DRS_SCISSORTESTENABLE), state_table); context_invalidate_state(context, STATE_SCISSORRECT, state_table);

1 0