wine-commits October 2009

wine-commits@winehq.org

3 participants
1207 discussions

Hans Leidekker : winhttp: Implement WinHttpQueryHeaders( WINHTTP_QUERY_VERSION).
by Alexandre Julliard 29 Oct '09

29 Oct '09

Module: wine Branch: master Commit: 846cc2b157cba07d33416276fd1f4c2faa301374 URL: http://source.winehq.org/git/wine.git/?a=commit;h=846cc2b157cba07d33416276f… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Oct 29 11:12:45 2009 +0100 winhttp: Implement WinHttpQueryHeaders(WINHTTP_QUERY_VERSION). --- dlls/winhttp/request.c | 18 ++++++++++++++++++ dlls/winhttp/tests/winhttp.c | 16 +++++++++++++++- 2 files changed, 33 insertions(+), 1 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index d504ea5..4d5be84 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -652,6 +652,24 @@ static BOOL query_headers( request_t *request, DWORD level, LPCWSTR name, LPVOID if (request_only) heap_free( headers ); return ret; } + case WINHTTP_QUERY_VERSION: + { + DWORD len = (strlenW( request->version ) + 1) * sizeof(WCHAR); + if (len > *buflen) + { + set_last_error( ERROR_INSUFFICIENT_BUFFER ); + *buflen = len; + return FALSE; + } + else if (buffer) + { + strcpyW( buffer, request->version ); + TRACE("returning string: %s\n", debugstr_w(buffer)); + ret = TRUE; + } + *buflen = len - sizeof(WCHAR); + return ret; + } default: { if (attr >= sizeof(attribute_table)/sizeof(attribute_table[0]) || !attribute_table[attr]) diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index 2f842f2..fe9bb05 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -816,7 +816,8 @@ static void test_request_parameter_defaults(void) static const WCHAR codeweavers[] = {'c','o','d','e','w','e','a','v','e','r','s','.','c','o','m',0}; HANDLE ses, con, req; - DWORD size, status; + DWORD size, status, error; + WCHAR *version; BOOL ret; ses = WinHttpOpen(test_useragent, 0, NULL, NULL, 0); @@ -850,6 +851,19 @@ static void test_request_parameter_defaults(void) ret = WinHttpReceiveResponse(req, NULL); ok(ret, "failed to receive response %u\n", GetLastError()); + size = 0; + SetLastError(0xdeadbeef); + ret = WinHttpQueryHeaders(req, WINHTTP_QUERY_VERSION, NULL, NULL, &size, NULL); + error = GetLastError(); + ok(!ret, "succeeded unexpectedly\n"); + ok(error == ERROR_INSUFFICIENT_BUFFER, "expected ERROR_INSUFFICIENT_BUFFER, got %u\n", error); + + version = HeapAlloc(GetProcessHeap(), 0, size); + ret = WinHttpQueryHeaders(req, WINHTTP_QUERY_VERSION, NULL, version, &size, NULL); + ok(ret, "failed unexpectedly %u\n", GetLastError()); + ok(lstrlenW(version) == size / sizeof(WCHAR), "unexpected size %u\n", size); + HeapFree(GetProcessHeap(), 0, version); + size = sizeof(status); ret = WinHttpQueryHeaders(req, WINHTTP_QUERY_STATUS_CODE | WINHTTP_QUERY_FLAG_NUMBER, NULL, &status, &size, NULL); ok(ret, "failed unexpectedly %u\n", GetLastError());

1 0

Hans Leidekker : winhttp: Accept empty headers parameter in WinHttpSendRequest.
by Alexandre Julliard 29 Oct '09

29 Oct '09

Module: wine Branch: master Commit: 39b1dbed7a9f60f9a85be08d153926173019f7ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=39b1dbed7a9f60f9a85be08d1… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Oct 29 11:12:22 2009 +0100 winhttp: Accept empty headers parameter in WinHttpSendRequest. --- dlls/winhttp/request.c | 1 + dlls/winhttp/tests/winhttp.c | 25 +++++++++++++++++++++++++ 2 files changed, 26 insertions(+), 0 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index ea0ecda..d504ea5 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -411,6 +411,7 @@ BOOL add_request_headers( request_t *request, LPCWSTR headers, DWORD len, DWORD header_t *header; if (len == ~0u) len = strlenW( headers ); + if (!len) return TRUE; if (!(buffer = heap_alloc( (len + 1) * sizeof(WCHAR) ))) return FALSE; strcpyW( buffer, headers ); diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index 24bdbb8..2f842f2 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -221,6 +221,30 @@ static void test_OpenRequest (void) } +static void test_empty_headers_param(void) +{ + static const WCHAR winehq[] = {'w','i','n','e','h','q','.','o','r','g',0}; + static const WCHAR empty[] = {0}; + HANDLE ses, con, req; + BOOL ret; + + ses = WinHttpOpen(test_useragent, 0, NULL, NULL, 0); + ok(ses != NULL, "failed to open session %u\n", GetLastError()); + + con = WinHttpConnect(ses, winehq, 80, 0); + ok(con != NULL, "failed to open a connection %u\n", GetLastError()); + + req = WinHttpOpenRequest(con, NULL, NULL, NULL, NULL, NULL, 0); + ok(req != NULL, "failed to open a request %u\n", GetLastError()); + + ret = WinHttpSendRequest(req, empty, 0, NULL, 0, 0, 0); + ok(ret, "failed to send request %u\n", GetLastError()); + + WinHttpCloseHandle(req); + WinHttpCloseHandle(con); + WinHttpCloseHandle(ses); +} + static void test_SendRequest (void) { HINTERNET session, request, connection; @@ -978,4 +1002,5 @@ START_TEST (winhttp) test_request_parameter_defaults(); test_QueryOption(); test_set_default_proxy_config(); + test_empty_headers_param(); }

1 0

Hans Leidekker : ws2_32: Add a test for GetAddrInfoW.
by Alexandre Julliard 29 Oct '09

29 Oct '09

Module: wine Branch: master Commit: ebe6dabe2789dd9b3214c730b686befcd54895f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ebe6dabe2789dd9b3214c730b… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Oct 29 11:12:00 2009 +0100 ws2_32: Add a test for GetAddrInfoW. --- dlls/ws2_32/tests/sock.c | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 56ae78f..518ab4a 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -2764,6 +2764,7 @@ static void test_WSASendTo(void) static void test_GetAddrInfoW(void) { static const WCHAR port[] = {'8','0',0}; + static const WCHAR empty[] = {0}; static const WCHAR localhost[] = {'l','o','c','a','l','h','o','s','t',0}; int ret; @@ -2780,6 +2781,15 @@ static void test_GetAddrInfoW(void) ret = pGetAddrInfoW(NULL, NULL, NULL, &result); ok(ret == WSAHOST_NOT_FOUND, "got %d expected WSAHOST_NOT_FOUND\n", ret); + result = NULL; + ret = pGetAddrInfoW(empty, NULL, NULL, &result); + todo_wine + { + ok(!ret, "GetAddrInfoW failed with %d\n", WSAGetLastError()); + ok(result != NULL, "GetAddrInfoW failed\n"); + } + pFreeAddrInfoW(result); + ret = pGetAddrInfoW(localhost, NULL, NULL, &result); ok(!ret, "GetAddrInfoW failed with %d\n", WSAGetLastError()); pFreeAddrInfoW(result);

1 0

Hans Leidekker : ws2_32: Avoid accessing uninitialized memory in GetAddrInfoW.
by Alexandre Julliard 29 Oct '09

29 Oct '09

Module: wine Branch: master Commit: 140eede67d595e8df034a2265f3c2670b3d69422 URL: http://source.winehq.org/git/wine.git/?a=commit;h=140eede67d595e8df034a2265… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Oct 29 11:11:38 2009 +0100 ws2_32: Avoid accessing uninitialized memory in GetAddrInfoW. Found by valgrind. --- dlls/ws2_32/socket.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 7cf4b96..df9c37d 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -3962,6 +3962,8 @@ int WINAPI GetAddrInfoW(LPCWSTR nodename, LPCWSTR servname, const ADDRINFOW *hin char *nodenameA, *servnameA = NULL; struct WS_addrinfo *resA, *hintsA = NULL; + if (!nodename) return WSAHOST_NOT_FOUND; + len = WideCharToMultiByte(CP_ACP, 0, nodename, -1, NULL, 0, NULL, NULL); if (!(nodenameA = HeapAlloc(GetProcessHeap(), 0, len))) return EAI_MEMORY; WideCharToMultiByte(CP_ACP, 0, nodename, -1, nodenameA, len, NULL, NULL);

1 0

Austin English : configure: preloader is Linux specific, don' t build it elsewhere.
by Alexandre Julliard 29 Oct '09

29 Oct '09

Module: wine Branch: master Commit: 5e18596fc58e972ea350b96555f1c4e0287a0147 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e18596fc58e972ea350b9655… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Oct 28 19:51:17 2009 -0500 configure: preloader is Linux specific, don't build it elsewhere. --- configure | 2 +- configure.ac | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configure b/configure index 937d1ae..2e5c038 100755 --- a/configure +++ b/configure @@ -12059,7 +12059,7 @@ test -z "$with_wine64" || MAIN_BINARY="wine32" case $host_cpu in *i[3456789]86*) case $host_os in - linux* | k*bsd*-gnu) + linux*) EXTRA_BINARIES="wine-preloader" ;; esac diff --git a/configure.ac b/configure.ac index a6daf78..f6ac893 100644 --- a/configure.ac +++ b/configure.ac @@ -1659,7 +1659,7 @@ test -z "$with_wine64" || MAIN_BINARY="wine32" case $host_cpu in *i[[3456789]]86*) case $host_os in - linux* | k*bsd*-gnu) + linux*) AC_SUBST(EXTRA_BINARIES,"wine-preloader") ;; esac ;;

1 0

Henri Verbeet : wined3d: directly pass gl_info to stream_info_element_from_strided().
by Alexandre Julliard 29 Oct '09

29 Oct '09

Module: wine Branch: master Commit: be8026adf648305a958eb55c8647d3a6a2302f07 URL: http://source.winehq.org/git/wine.git/?a=commit;h=be8026adf648305a958eb55c8… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Oct 29 10:37:12 2009 +0100 wined3d: directly pass gl_info to stream_info_element_from_strided(). --- dlls/wined3d/device.c | 18 +++++++++--------- dlls/wined3d/state.c | 2 +- dlls/wined3d/wined3d_private.h | 2 +- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 3929348..a1b8944 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -321,10 +321,10 @@ void device_stream_info_from_declaration(IWineD3DDeviceImpl *This, } } -static void stream_info_element_from_strided(IWineD3DDeviceImpl *This, +static void stream_info_element_from_strided(const struct wined3d_gl_info *gl_info, const struct WineDirect3DStridedData *strided, struct wined3d_stream_info_element *e) { - const struct GlPixelFormatDesc *format_desc = getFormatDescEntry(strided->format, &This->adapter->gl_info); + const struct GlPixelFormatDesc *format_desc = getFormatDescEntry(strided->format, gl_info); e->format_desc = format_desc; e->stride = strided->dwStride; e->data = strided->lpData; @@ -332,7 +332,7 @@ static void stream_info_element_from_strided(IWineD3DDeviceImpl *This, e->buffer_object = 0; } -void device_stream_info_from_strided(IWineD3DDeviceImpl *This, +void device_stream_info_from_strided(const struct wined3d_gl_info *gl_info, const struct WineDirect3DVertexStridedData *strided, struct wined3d_stream_info *stream_info) { unsigned int i; @@ -340,18 +340,18 @@ void device_stream_info_from_strided(IWineD3DDeviceImpl *This, memset(stream_info, 0, sizeof(*stream_info)); if (strided->position.lpData) - stream_info_element_from_strided(This, &strided->position, &stream_info->elements[WINED3D_FFP_POSITION]); + stream_info_element_from_strided(gl_info, &strided->position, &stream_info->elements[WINED3D_FFP_POSITION]); if (strided->normal.lpData) - stream_info_element_from_strided(This, &strided->normal, &stream_info->elements[WINED3D_FFP_NORMAL]); + stream_info_element_from_strided(gl_info, &strided->normal, &stream_info->elements[WINED3D_FFP_NORMAL]); if (strided->diffuse.lpData) - stream_info_element_from_strided(This, &strided->diffuse, &stream_info->elements[WINED3D_FFP_DIFFUSE]); + stream_info_element_from_strided(gl_info, &strided->diffuse, &stream_info->elements[WINED3D_FFP_DIFFUSE]); if (strided->specular.lpData) - stream_info_element_from_strided(This, &strided->specular, &stream_info->elements[WINED3D_FFP_SPECULAR]); + stream_info_element_from_strided(gl_info, &strided->specular, &stream_info->elements[WINED3D_FFP_SPECULAR]); for (i = 0; i < WINED3DDP_MAXTEXCOORD; ++i) { if (strided->texCoords[i].lpData) - stream_info_element_from_strided(This, &strided->texCoords[i], + stream_info_element_from_strided(gl_info, &strided->texCoords[i], &stream_info->elements[WINED3D_FFP_TEXCOORD0 + i]); } @@ -361,7 +361,7 @@ void device_stream_info_from_strided(IWineD3DDeviceImpl *This, { if (!stream_info->elements[i].format_desc) continue; - if (!This->adapter->gl_info.supported[EXT_VERTEX_ARRAY_BGRA] + if (!gl_info->supported[EXT_VERTEX_ARRAY_BGRA] && stream_info->elements[i].format_desc->format == WINED3DFMT_B8G8R8A8_UNORM) { stream_info->swizzle_map |= 1 << i; diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index e7b64d9..94fe19e 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -4484,7 +4484,7 @@ static void streamsrc(DWORD state, IWineD3DStateBlockImpl *stateblock, struct wi if(device->up_strided) { /* Note: this is a ddraw fixed-function code path */ TRACE("================ Strided Input ===================\n"); - device_stream_info_from_strided(device, device->up_strided, dataLocations); + device_stream_info_from_strided(context->gl_info, device->up_strided, dataLocations); if(TRACE_ON(d3d)) { drawPrimitiveTraceDataLocations(dataLocations); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index d1400aa..3af2703 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1591,7 +1591,7 @@ void device_resource_add(IWineD3DDeviceImpl *This, IWineD3DResource *resource) D void device_resource_released(IWineD3DDeviceImpl *This, IWineD3DResource *resource) DECLSPEC_HIDDEN; void device_stream_info_from_declaration(IWineD3DDeviceImpl *This, BOOL use_vshader, struct wined3d_stream_info *stream_info, BOOL *fixup) DECLSPEC_HIDDEN; -void device_stream_info_from_strided(IWineD3DDeviceImpl *This, +void device_stream_info_from_strided(const struct wined3d_gl_info *gl_info, const struct WineDirect3DVertexStridedData *strided, struct wined3d_stream_info *stream_info) DECLSPEC_HIDDEN; HRESULT IWineD3DDeviceImpl_ClearSurface(IWineD3DDeviceImpl *This, IWineD3DSurfaceImpl *target, DWORD Count, const WINED3DRECT *pRects, DWORD Flags, WINED3DCOLOR Color, float Z, DWORD Stencil) DECLSPEC_HIDDEN;

1 0

Henri Verbeet : wined3d: Don' t depend on uninitialized data in the CreateSurface() thunks (Valgrind).
by Alexandre Julliard 29 Oct '09

29 Oct '09

Module: wine Branch: master Commit: 052d955567864a7e0c9c51d726abb6ff6ebb0b95 URL: http://source.winehq.org/git/wine.git/?a=commit;h=052d955567864a7e0c9c51d72… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Oct 29 10:37:13 2009 +0100 wined3d: Don't depend on uninitialized data in the CreateSurface() thunks (Valgrind). Perhaps IDirectDraw7_CreateSurface() should also always set "pSurface7" to NULL on failure, but at least for our internal functions that's a silly thing to rely on. --- dlls/ddraw/ddraw_thunks.c | 62 ++++++++++++++++++++------------------------ 1 files changed, 28 insertions(+), 34 deletions(-) diff --git a/dlls/ddraw/ddraw_thunks.c b/dlls/ddraw/ddraw_thunks.c index 8c79cbf..278d720 100644 --- a/dlls/ddraw/ddraw_thunks.c +++ b/dlls/ddraw/ddraw_thunks.c @@ -347,20 +347,18 @@ IDirectDrawImpl_CreateSurface(LPDIRECTDRAW This, LPDDSURFACEDESC pSDesc, * since the data layout is the same */ hr = IDirectDraw7_CreateSurface((IDirectDraw7 *)ddraw_from_ddraw1(This), (LPDDSURFACEDESC2)pSDesc, &pSurface7, pUnkOuter); - - /* This coercion is safe, since the IDirectDrawSurface3 vtable has the - * IDirectDrawSurface vtable layout at the beginning */ - *ppSurface = pSurface7 ? - (IDirectDrawSurface *)&((IDirectDrawSurfaceImpl *)pSurface7)->IDirectDrawSurface3_vtbl : NULL; - - impl = (IDirectDrawSurfaceImpl *)pSurface7; - if(SUCCEEDED(hr) && impl) + if (FAILED(hr)) { - set_surf_version(impl, 1); - IDirectDraw7_Release((IDirectDraw7 *)ddraw_from_ddraw1(This)); - impl->ifaceToRelease = NULL; + *ppSurface = NULL; + return hr; } + impl = (IDirectDrawSurfaceImpl *)pSurface7; + *ppSurface = (IDirectDrawSurface *)&impl->IDirectDrawSurface3_vtbl; + set_surf_version(impl, 1); + IDirectDraw7_Release((IDirectDraw7 *)ddraw_from_ddraw1(This)); + impl->ifaceToRelease = NULL; + return hr; } @@ -375,20 +373,18 @@ IDirectDraw2Impl_CreateSurface(LPDIRECTDRAW2 This, LPDDSURFACEDESC pSDesc, hr = IDirectDraw7_CreateSurface((IDirectDraw7 *)ddraw_from_ddraw2(This), (LPDDSURFACEDESC2)pSDesc, &pSurface7, pUnkOuter); - - /* This coercion is safe, since the IDirectDrawSurface3 vtable has the - * IDirectDrawSurface vtable layout at the beginning */ - *ppSurface = pSurface7 ? - (IDirectDrawSurface *)&((IDirectDrawSurfaceImpl *)pSurface7)->IDirectDrawSurface3_vtbl : NULL; - - impl = (IDirectDrawSurfaceImpl *)pSurface7; - if(SUCCEEDED(hr) && impl) + if (FAILED(hr)) { - set_surf_version(impl, 2); - IDirectDraw7_Release((IDirectDraw7 *)ddraw_from_ddraw2(This)); - impl->ifaceToRelease = NULL; + *ppSurface = NULL; + return hr; } + impl = (IDirectDrawSurfaceImpl *)pSurface7; + *ppSurface = (IDirectDrawSurface *)&impl->IDirectDrawSurface3_vtbl; + set_surf_version(impl, 2); + IDirectDraw7_Release((IDirectDraw7 *)ddraw_from_ddraw2(This)); + impl->ifaceToRelease = NULL; + return hr; } @@ -403,21 +399,19 @@ IDirectDraw3Impl_CreateSurface(LPDIRECTDRAW3 This, LPDDSURFACEDESC pSDesc, hr = IDirectDraw7_CreateSurface((IDirectDraw7 *)ddraw_from_ddraw3(This), (LPDDSURFACEDESC2)pSDesc, &pSurface7, pUnkOuter); - - /* This coercion is safe, since the IDirectDrawSurface3 vtable has the - * IDirectDrawSurface vtable layout at the beginning */ - *ppSurface = pSurface7 ? - (IDirectDrawSurface *)&((IDirectDrawSurfaceImpl *)pSurface7)->IDirectDrawSurface3_vtbl : NULL; - - impl = (IDirectDrawSurfaceImpl *)pSurface7; - if(SUCCEEDED(hr) && impl) + if (FAILED(hr)) { - set_surf_version(impl, 3); - IDirectDraw7_Release((IDirectDraw7 *)ddraw_from_ddraw3(This)); - IDirectDraw3_AddRef(This); - impl->ifaceToRelease = (IUnknown *) This; + *ppSurface = NULL; + return hr; } + impl = (IDirectDrawSurfaceImpl *)pSurface7; + *ppSurface = (IDirectDrawSurface *)&impl->IDirectDrawSurface3_vtbl; + set_surf_version(impl, 3); + IDirectDraw7_Release((IDirectDraw7 *)ddraw_from_ddraw3(This)); + IDirectDraw3_AddRef(This); + impl->ifaceToRelease = (IUnknown *) This; + return hr; }

1 0

Henri Verbeet : wined3d: Get rid of the GL_SUPPORT macro.
by Alexandre Julliard 29 Oct '09

29 Oct '09

Module: wine Branch: master Commit: 111307dfbae2216549a9e47af2221121d55e8893 URL: http://source.winehq.org/git/wine.git/?a=commit;h=111307dfbae2216549a9e47af… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Oct 29 10:37:11 2009 +0100 wined3d: Get rid of the GL_SUPPORT macro. --- dlls/wined3d/arb_program_shader.c | 71 +++++++++----- dlls/wined3d/basetexture.c | 6 +- dlls/wined3d/buffer.c | 8 +- dlls/wined3d/context.c | 66 ++++++++----- dlls/wined3d/device.c | 54 +++++++---- dlls/wined3d/directx.c | 171 +++++++++++++++++++++++----------- dlls/wined3d/drawprim.c | 29 ++++-- dlls/wined3d/gl_compat.c | 15 ++- dlls/wined3d/glsl_shader.c | 19 +++- dlls/wined3d/nvidia_texture_shader.c | 33 ++++--- dlls/wined3d/query.c | 16 ++- dlls/wined3d/state.c | 166 +++++++++++++++++++++------------ dlls/wined3d/surface.c | 85 +++++++++++------ dlls/wined3d/swapchain.c | 4 +- dlls/wined3d/utils.c | 52 ++++++----- dlls/wined3d/volume.c | 4 +- dlls/wined3d/volumetexture.c | 6 +- dlls/wined3d/wined3d_private.h | 1 - 18 files changed, 514 insertions(+), 292 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=111307dfbae2216549a9e…

1 0

Henri Verbeet : wined3d: Introduce a separate structure for various OpenGL implementation limits.
by Alexandre Julliard 29 Oct '09

29 Oct '09

Module: wine Branch: master Commit: 48e03bc18954f5d8b337df479c9474975dbaf5ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=48e03bc18954f5d8b337df479… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Oct 29 10:37:10 2009 +0100 wined3d: Introduce a separate structure for various OpenGL implementation limits. --- dlls/wined3d/arb_program_shader.c | 34 +++--- dlls/wined3d/ati_fragment_shader.c | 8 +- dlls/wined3d/context.c | 28 ++-- dlls/wined3d/device.c | 28 ++-- dlls/wined3d/directx.c | 216 ++++++++++++++++++---------------- dlls/wined3d/drawprim.c | 6 +- dlls/wined3d/glsl_shader.c | 49 ++++---- dlls/wined3d/nvidia_texture_shader.c | 12 +- dlls/wined3d/pixelshader.c | 6 +- dlls/wined3d/state.c | 74 ++++++------ dlls/wined3d/stateblock.c | 4 +- dlls/wined3d/surface.c | 2 +- dlls/wined3d/utils.c | 13 +- dlls/wined3d/wined3d_gl.h | 69 ++++++----- 14 files changed, 284 insertions(+), 265 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=48e03bc18954f5d8b337d…

1 0

Henri Verbeet : wined3d: Remove some unused GLINFO_LOCATION definitions.
by Alexandre Julliard 29 Oct '09

29 Oct '09

Module: wine Branch: master Commit: d7b087618b3fdf48d0539d82310f18530c2397b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d7b087618b3fdf48d0539d823… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Oct 29 10:37:09 2009 +0100 wined3d: Remove some unused GLINFO_LOCATION definitions. --- dlls/wined3d/baseshader.c | 3 +-- dlls/wined3d/cubetexture.c | 6 ------ dlls/wined3d/pixelshader.c | 2 -- dlls/wined3d/stateblock.c | 1 - dlls/wined3d/texture.c | 6 ------ dlls/wined3d/vertexdeclaration.c | 2 -- dlls/wined3d/vertexshader.c | 2 -- dlls/wined3d/volumetexture.c | 2 -- 8 files changed, 1 insertions(+), 23 deletions(-) diff --git a/dlls/wined3d/baseshader.c b/dlls/wined3d/baseshader.c index a6bea57..bb94a5a 100644 --- a/dlls/wined3d/baseshader.c +++ b/dlls/wined3d/baseshader.c @@ -1391,7 +1391,6 @@ static HRESULT shader_none_alloc(IWineD3DDevice *iface) {return WINED3D_OK;} static void shader_none_free(IWineD3DDevice *iface) {} static BOOL shader_none_dirty_const(IWineD3DDevice *iface) {return FALSE;} -#define GLINFO_LOCATION (*gl_info) static void shader_none_get_caps(WINED3DDEVTYPE devtype, const struct wined3d_gl_info *gl_info, struct shader_caps *pCaps) { @@ -1400,7 +1399,7 @@ static void shader_none_get_caps(WINED3DDEVTYPE devtype, pCaps->PixelShaderVersion = 0; pCaps->PixelShader1xMaxValue = 0.0f; } -#undef GLINFO_LOCATION + static BOOL shader_none_color_fixup_supported(struct color_fixup_desc fixup) { if (TRACE_ON(d3d_shader) && TRACE_ON(d3d)) diff --git a/dlls/wined3d/cubetexture.c b/dlls/wined3d/cubetexture.c index ade200f..f22845b 100644 --- a/dlls/wined3d/cubetexture.c +++ b/dlls/wined3d/cubetexture.c @@ -27,8 +27,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d_texture); -#define GLINFO_LOCATION (*gl_info) - static void cubetexture_internal_preload(IWineD3DBaseTexture *iface, enum WINED3DSRGB srgb) { /* Override the IWineD3DResource Preload method. */ @@ -141,14 +139,10 @@ static void cubetexture_cleanup(IWineD3DCubeTextureImpl *This) basetexture_cleanup((IWineD3DBaseTexture *)This); } -#undef GLINFO_LOCATION - /* ******************************************* IWineD3DCubeTexture IUnknown parts follow ******************************************* */ -#define GLINFO_LOCATION This->resource.wineD3DDevice->adapter->gl_info - static HRESULT WINAPI IWineD3DCubeTextureImpl_QueryInterface(IWineD3DCubeTexture *iface, REFIID riid, LPVOID *ppobj) { IWineD3DCubeTextureImpl *This = (IWineD3DCubeTextureImpl *)iface; diff --git a/dlls/wined3d/pixelshader.c b/dlls/wined3d/pixelshader.c index c82faa5..09fbe24 100644 --- a/dlls/wined3d/pixelshader.c +++ b/dlls/wined3d/pixelshader.c @@ -33,8 +33,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d_shader); -#define GLINFO_LOCATION ((IWineD3DDeviceImpl *) This->baseShader.device)->adapter->gl_info - static HRESULT WINAPI IWineD3DPixelShaderImpl_QueryInterface(IWineD3DPixelShader *iface, REFIID riid, LPVOID *ppobj) { TRACE("iface %p, riid %s, ppobj %p\n", iface, debugstr_guid(riid), ppobj); diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 892ac89..2ab1fd9 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -26,7 +26,6 @@ #include "wined3d_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d); -#define GLINFO_LOCATION This->wineD3DDevice->adapter->gl_info static const DWORD pixel_states_render[] = { diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index eae78c0..b568005 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -27,8 +27,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d_texture); -#define GLINFO_LOCATION (*gl_info) - static void texture_internal_preload(IWineD3DBaseTexture *iface, enum WINED3DSRGB srgb) { /* Override the IWineD3DResource PreLoad method. */ @@ -128,14 +126,10 @@ static void texture_cleanup(IWineD3DTextureImpl *This) basetexture_cleanup((IWineD3DBaseTexture *)This); } -#undef GLINFO_LOCATION - /* ******************************************* IWineD3DTexture IUnknown parts follow ******************************************* */ -#define GLINFO_LOCATION This->resource.wineD3DDevice->adapter->gl_info - static HRESULT WINAPI IWineD3DTextureImpl_QueryInterface(IWineD3DTexture *iface, REFIID riid, LPVOID *ppobj) { IWineD3DTextureImpl *This = (IWineD3DTextureImpl *)iface; diff --git a/dlls/wined3d/vertexdeclaration.c b/dlls/wined3d/vertexdeclaration.c index 6d617ed..88b3f27 100644 --- a/dlls/wined3d/vertexdeclaration.c +++ b/dlls/wined3d/vertexdeclaration.c @@ -27,8 +27,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d_decl); -#define GLINFO_LOCATION This->wineD3DDevice->adapter->gl_info - static void dump_wined3dvertexelement(const WINED3DVERTEXELEMENT *element) { TRACE(" format: %s (%#x)\n", debug_d3dformat(element->format), element->format); TRACE(" input_slot: %u\n", element->input_slot); diff --git a/dlls/wined3d/vertexshader.c b/dlls/wined3d/vertexshader.c index 3712bee..14779a5 100644 --- a/dlls/wined3d/vertexshader.c +++ b/dlls/wined3d/vertexshader.c @@ -33,8 +33,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d_shader); -#define GLINFO_LOCATION ((IWineD3DDeviceImpl *)This->baseShader.device)->adapter->gl_info - static void vshader_set_limits(IWineD3DVertexShaderImpl *This) { DWORD shader_version = WINED3D_SHADER_VERSION(This->baseShader.reg_maps.shader_version.major, diff --git a/dlls/wined3d/volumetexture.c b/dlls/wined3d/volumetexture.c index cad7360..a21211d 100644 --- a/dlls/wined3d/volumetexture.c +++ b/dlls/wined3d/volumetexture.c @@ -103,8 +103,6 @@ static void volumetexture_cleanup(IWineD3DVolumeTextureImpl *This) IWineD3DTexture IUnknown parts follow ******************************************* */ -#define GLINFO_LOCATION This->resource.wineD3DDevice->adapter->gl_info - static HRESULT WINAPI IWineD3DVolumeTextureImpl_QueryInterface(IWineD3DVolumeTexture *iface, REFIID riid, LPVOID *ppobj) { IWineD3DVolumeTextureImpl *This = (IWineD3DVolumeTextureImpl *)iface;

1 0

← Newer
1
...
4
5
6
7
8
9
10
...
121
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 October 2009