wine-commits December 2012

wine-commits@winehq.org

2 participants
549 discussions

Jacek Caban : msxml3: Added basic URL validation in safe mode.
by Alexandre Julliard 07 Dec '12

07 Dec '12

Module: wine Branch: master Commit: f49376bd083e37c9d00dc561407b297d7e201928 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f49376bd083e37c9d00dc5614… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Dec 7 11:53:26 2012 +0100 msxml3: Added basic URL validation in safe mode. --- dlls/msxml3/httprequest.c | 60 +++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 58 insertions(+), 2 deletions(-) diff --git a/dlls/msxml3/httprequest.c b/dlls/msxml3/httprequest.c index 848a470..d8ab1b9 100644 --- a/dlls/msxml3/httprequest.c +++ b/dlls/msxml3/httprequest.c @@ -758,6 +758,53 @@ static HRESULT BindStatusCallback_create(httprequest* This, BindStatusCallback * return hr; } +static HRESULT verify_uri(httprequest *This, IUri *uri) +{ + DWORD scheme, base_scheme; + BSTR host, base_host; + HRESULT hr; + + if(!(This->safeopt & INTERFACESAFE_FOR_UNTRUSTED_DATA)) + return S_OK; + + if(!This->base_uri) + return E_ACCESSDENIED; + + hr = IUri_GetScheme(uri, &scheme); + if(FAILED(hr)) + return hr; + + hr = IUri_GetScheme(This->base_uri, &base_scheme); + if(FAILED(hr)) + return hr; + + if(scheme != base_scheme) { + WARN("Schemes don't match\n"); + return E_ACCESSDENIED; + } + + if(scheme == INTERNET_SCHEME_UNKNOWN) { + FIXME("Unknown scheme\n"); + return E_ACCESSDENIED; + } + + hr = IUri_GetHost(uri, &host); + if(FAILED(hr)) + return hr; + + hr = IUri_GetHost(This->base_uri, &base_host); + if(SUCCEEDED(hr)) { + if(strcmpiW(host, base_host)) { + WARN("Hosts don't match\n"); + hr = E_ACCESSDENIED; + } + SysFreeString(base_host); + } + + SysFreeString(host); + return hr; +} + static HRESULT httprequest_open(httprequest *This, BSTR method, BSTR url, VARIANT async, VARIANT user, VARIANT password) { @@ -767,6 +814,7 @@ static HRESULT httprequest_open(httprequest *This, BSTR method, BSTR url, static const WCHAR MethodDeleteW[] = {'D','E','L','E','T','E',0}; static const WCHAR MethodPropFindW[] = {'P','R','O','P','F','I','N','D',0}; VARIANT str, is_async; + IUri *uri; HRESULT hr; if (!method || !url) return E_INVALIDARG; @@ -807,14 +855,22 @@ static HRESULT httprequest_open(httprequest *This, BSTR method, BSTR url, } if(This->base_uri) - hr = CoInternetCombineUrlEx(This->base_uri, url, 0, &This->uri, 0); + hr = CoInternetCombineUrlEx(This->base_uri, url, 0, &uri, 0); else - hr = CreateUri(url, 0, 0, &This->uri); + hr = CreateUri(url, 0, 0, &uri); if(FAILED(hr)) { WARN("Could not create IUri object: %08x\n", hr); return hr; } + hr = verify_uri(This, uri); + if(FAILED(hr)) { + IUri_Release(uri); + return hr; + } + + This->uri = uri; + VariantInit(&is_async); hr = VariantChangeType(&is_async, &async, 0, VT_BOOL); This->async = hr == S_OK && V_BOOL(&is_async);

1 0

Hans Leidekker : configure: Fix detection of fallocate on old glibc.
by Alexandre Julliard 07 Dec '12

07 Dec '12

Module: wine Branch: master Commit: 3244be050048e2ce5e60c2d4a5a5dac193e4b2a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3244be050048e2ce5e60c2d4a… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Dec 7 09:22:40 2012 +0100 configure: Fix detection of fallocate on old glibc. --- configure | 35 ++++++++++++++++++++++++++++++++++- configure.ac | 10 +++++++++- 2 files changed, 43 insertions(+), 2 deletions(-) diff --git a/configure b/configure index 2da5477..c1e10d7 100755 --- a/configure +++ b/configure @@ -12931,7 +12931,6 @@ for ac_func in \ chsize \ dlopen \ epoll_create \ - fallocate \ ffs \ finite \ fnmatch \ @@ -13494,6 +13493,40 @@ $as_echo "#define HAVE_SCHED_SETAFFINITY 1" >>confdefs.h fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for fallocate" >&5 +$as_echo_n "checking for fallocate... " >&6; } +if ${wine_cv_have_fallocate+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#define _GNU_SOURCE +#include <fcntl.h> +int +main () +{ +fallocate(-1, 0, 0, 0); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + wine_cv_have_fallocate=yes +else + wine_cv_have_fallocate=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $wine_cv_have_fallocate" >&5 +$as_echo "$wine_cv_have_fallocate" >&6; } +if test "$wine_cv_have_fallocate" = "yes" +then + +$as_echo "#define HAVE_FALLOCATE 1" >>confdefs.h + +fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for inline" >&5 $as_echo_n "checking for inline... " >&6; } diff --git a/configure.ac b/configure.ac index 4c7655a..01d84cd 100644 --- a/configure.ac +++ b/configure.ac @@ -1976,7 +1976,6 @@ AC_CHECK_FUNCS(\ chsize \ dlopen \ epoll_create \ - fallocate \ ffs \ finite \ fnmatch \ @@ -2117,6 +2116,15 @@ then AC_DEFINE(HAVE_SCHED_SETAFFINITY, 1, [Define to 1 if you have the `sched_setaffinity' function.]) fi +AC_CACHE_CHECK([for fallocate],wine_cv_have_fallocate, + AC_LINK_IFELSE([AC_LANG_PROGRAM( +[[#define _GNU_SOURCE +#include <fcntl.h>]], [[fallocate(-1, 0, 0, 0);]])],[wine_cv_have_fallocate=yes],[wine_cv_have_fallocate=no])) +if test "$wine_cv_have_fallocate" = "yes" +then + AC_DEFINE(HAVE_FALLOCATE, 1, [Define to 1 if you have the `fallocate' function.]) +fi + dnl **** Check for types **** AC_C_INLINE

1 0

André Hentschel : winedbg: Add load/ str multiple operators to Thumb2 disassembler.
by Alexandre Julliard 07 Dec '12

07 Dec '12

Module: wine Branch: master Commit: 8818e259544a6f28dcef4e298f1310a9e61ca965 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8818e259544a6f28dcef4e298… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Dec 7 00:27:27 2012 +0100 winedbg: Add load/str multiple operators to Thumb2 disassembler. --- programs/winedbg/be_arm.c | 30 ++++++++++++++++++++++++++++++ 1 files changed, 30 insertions(+), 0 deletions(-) diff --git a/programs/winedbg/be_arm.c b/programs/winedbg/be_arm.c index 85eb0ef..c3963c4 100644 --- a/programs/winedbg/be_arm.c +++ b/programs/winedbg/be_arm.c @@ -1118,6 +1118,35 @@ static UINT thumb2_disasm_coprocdatatrans(UINT inst, ADDRESS64 *addr) return 0; } +static UINT thumb2_disasm_ldrstrmul(UINT inst, ADDRESS64 *addr) +{ + short load = (inst >> 20) & 0x01; + short writeback = (inst >> 21) & 0x01; + short decbefore = (inst >> 24) & 0x01; + short i; + short last=15; + for (i=15;i>=0;i--) + if ((inst>>i) & 1) + { + last = i; + break; + } + + if (writeback && get_nibble(inst, 4) == 13) + dbg_printf("\n\t%s\t{", load ? "pop" : "push"); + else + dbg_printf("\n\t%s%s\t%s%s, {", load ? "ldm" : "stm", decbefore ? "db" : "ia", + tbl_regs[get_nibble(inst, 4)], writeback ? "!" : ""); + for (i=0;i<=15;i++) + if ((inst>>i) & 1) + { + if (i == last) dbg_printf("%s", tbl_regs[i]); + else dbg_printf("%s, ", tbl_regs[i]); + } + dbg_printf("}"); + return 0; +} + struct inst_arm { UINT mask; @@ -1196,6 +1225,7 @@ static const struct inst_arm tbl_thumb32[] = { { 0xef000010, 0xee000010, thumb2_disasm_coprocmov1 }, { 0xefe00000, 0xec400000, thumb2_disasm_coprocmov2 }, { 0xee000000, 0xec000000, thumb2_disasm_coprocdatatrans }, + { 0xfe402000, 0xe8000000, thumb2_disasm_ldrstrmul }, { 0x00000000, 0x00000000, NULL } };

1 0

Henri Verbeet : d3d10core: Implement d3d10_device_GSGetSamplers().
by Alexandre Julliard 07 Dec '12

07 Dec '12

Module: wine Branch: master Commit: 2c01e11ecab701c27c499c63859cb4b737b2f700 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c01e11ecab701c27c499c638… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Dec 7 00:07:08 2012 +0100 d3d10core: Implement d3d10_device_GSGetSamplers(). --- dlls/d3d10core/device.c | 21 ++++++++++++++++++++- dlls/wined3d/device.c | 13 +++++++++++++ dlls/wined3d/wined3d.spec | 1 + include/wine/wined3d.h | 1 + 4 files changed, 35 insertions(+), 1 deletions(-) diff --git a/dlls/d3d10core/device.c b/dlls/d3d10core/device.c index 0aa5f47..138f3e4 100644 --- a/dlls/d3d10core/device.c +++ b/dlls/d3d10core/device.c @@ -822,8 +822,27 @@ static void STDMETHODCALLTYPE d3d10_device_GSGetShaderResources(ID3D10Device *if static void STDMETHODCALLTYPE d3d10_device_GSGetSamplers(ID3D10Device *iface, UINT start_slot, UINT sampler_count, ID3D10SamplerState **samplers) { - FIXME("iface %p, start_slot %u, sampler_count %u, samplers %p stub!\n", + struct d3d10_device *device = impl_from_ID3D10Device(iface); + unsigned int i; + + TRACE("iface %p, start_slot %u, sampler_count %u, samplers %p.\n", iface, start_slot, sampler_count, samplers); + + for (i = 0; i < sampler_count; ++i) + { + struct d3d10_sampler_state *sampler_impl; + struct wined3d_sampler *wined3d_sampler; + + if (!(wined3d_sampler = wined3d_device_get_gs_sampler(device->wined3d_device, start_slot + i))) + { + samplers[i] = NULL; + continue; + } + + sampler_impl = wined3d_sampler_get_parent(wined3d_sampler); + samplers[i] = &sampler_impl->ID3D10SamplerState_iface; + ID3D10SamplerState_AddRef(samplers[i]); + } } static void STDMETHODCALLTYPE d3d10_device_OMGetRenderTargets(ID3D10Device *iface, diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index ed243cc..f9cd280 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3288,6 +3288,19 @@ void CDECL wined3d_device_set_gs_sampler(struct wined3d_device *device, UINT idx wined3d_sampler_decref(prev); } +struct wined3d_sampler * CDECL wined3d_device_get_gs_sampler(const struct wined3d_device *device, UINT idx) +{ + TRACE("device %p, idx %u.\n", device, idx); + + if (idx >= MAX_SAMPLER_OBJECTS) + { + WARN("Invalid sampler index %u.\n", idx); + return NULL; + } + + return device->stateBlock->state.gs_sampler[idx]; +} + /* Context activation is done by the caller. */ /* Do not call while under the GL lock. */ #define copy_and_next(dest, src, size) memcpy(dest, src, size); dest += (size) diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 1ac4bf5..8c58563 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -67,6 +67,7 @@ @ cdecl wined3d_device_get_gamma_ramp(ptr long ptr) @ cdecl wined3d_device_get_geometry_shader(ptr) @ cdecl wined3d_device_get_gs_cb(ptr long) +@ cdecl wined3d_device_get_gs_sampler(ptr long) @ cdecl wined3d_device_get_index_buffer(ptr ptr) @ cdecl wined3d_device_get_light(ptr long ptr) @ cdecl wined3d_device_get_light_enable(ptr long ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index eb48ceb..0e955ce 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2129,6 +2129,7 @@ void __cdecl wined3d_device_get_gamma_ramp(const struct wined3d_device *device, UINT swapchain_idx, struct wined3d_gamma_ramp *ramp); struct wined3d_shader * __cdecl wined3d_device_get_geometry_shader(const struct wined3d_device *device); struct wined3d_buffer * __cdecl wined3d_device_get_gs_cb(const struct wined3d_device *device, UINT idx); +struct wined3d_sampler * __cdecl wined3d_device_get_gs_sampler(const struct wined3d_device *device, UINT idx); struct wined3d_buffer * __cdecl wined3d_device_get_index_buffer(const struct wined3d_device *device, enum wined3d_format_id *format); HRESULT __cdecl wined3d_device_get_light(const struct wined3d_device *device,

1 0

Henri Verbeet : d3d10core: Implement d3d10_device_GSSetSamplers().
by Alexandre Julliard 07 Dec '12

07 Dec '12

Module: wine Branch: master Commit: 047d607e07df54be04a8c11511a14ccc7632130b URL: http://source.winehq.org/git/wine.git/?a=commit;h=047d607e07df54be04a8c1151… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Dec 7 00:07:07 2012 +0100 d3d10core: Implement d3d10_device_GSSetSamplers(). --- dlls/d3d10core/device.c | 13 ++++++++++++- dlls/wined3d/device.c | 21 +++++++++++++++++++++ dlls/wined3d/stateblock.c | 9 +++++++++ dlls/wined3d/wined3d.spec | 1 + dlls/wined3d/wined3d_private.h | 1 + include/wine/wined3d.h | 1 + 6 files changed, 45 insertions(+), 1 deletions(-) diff --git a/dlls/d3d10core/device.c b/dlls/d3d10core/device.c index ad07aee..0aa5f47 100644 --- a/dlls/d3d10core/device.c +++ b/dlls/d3d10core/device.c @@ -357,8 +357,19 @@ static void STDMETHODCALLTYPE d3d10_device_GSSetShaderResources(ID3D10Device *if static void STDMETHODCALLTYPE d3d10_device_GSSetSamplers(ID3D10Device *iface, UINT start_slot, UINT sampler_count, ID3D10SamplerState *const *samplers) { - FIXME("iface %p, start_slot %u, sampler_count %u, samplers %p stub!\n", + struct d3d10_device *device = impl_from_ID3D10Device(iface); + unsigned int i; + + TRACE("iface %p, start_slot %u, sampler_count %u, samplers %p.\n", iface, start_slot, sampler_count, samplers); + + for (i = 0; i < sampler_count; ++i) + { + struct d3d10_sampler_state *sampler = unsafe_impl_from_ID3D10SamplerState(samplers[i]); + + wined3d_device_set_gs_sampler(device->wined3d_device, start_slot + i, + sampler ? sampler->wined3d_sampler : NULL); + } } static void STDMETHODCALLTYPE d3d10_device_OMSetRenderTargets(ID3D10Device *iface, diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 24c6b4e..ed243cc 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3267,6 +3267,27 @@ struct wined3d_buffer * CDECL wined3d_device_get_gs_cb(const struct wined3d_devi return device->stateBlock->state.gs_cb[idx]; } +void CDECL wined3d_device_set_gs_sampler(struct wined3d_device *device, UINT idx, struct wined3d_sampler *sampler) +{ + struct wined3d_sampler *prev; + + TRACE("device %p, idx %u, sampler %p.\n", device, idx, sampler); + + if (idx >= MAX_SAMPLER_OBJECTS) + { + WARN("Invalid sampler index %u.\n", idx); + return; + } + + prev = device->updateStateBlock->state.gs_sampler[idx]; + device->updateStateBlock->state.gs_sampler[idx] = sampler; + + if (sampler) + wined3d_sampler_incref(sampler); + if (prev) + wined3d_sampler_decref(prev); +} + /* Context activation is done by the caller. */ /* Do not call while under the GL lock. */ #define copy_and_next(dest, src, size) memcpy(dest, src, size); dest += (size) diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 0b55f18..45118f4 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -555,6 +555,15 @@ void stateblock_unbind_resources(struct wined3d_stateblock *stateblock) } } + for (i = 0; i < MAX_SAMPLER_OBJECTS; ++i) + { + if ((sampler = state->gs_sampler[i])) + { + state->gs_sampler[i] = NULL; + wined3d_sampler_decref(sampler); + } + } + if ((shader = state->pixel_shader)) { state->pixel_shader = NULL; diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 0b87f10..1ac4bf5 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -120,6 +120,7 @@ @ cdecl wined3d_device_set_gamma_ramp(ptr long long ptr) @ cdecl wined3d_device_set_geometry_shader(ptr ptr) @ cdecl wined3d_device_set_gs_cb(ptr long ptr) +@ cdecl wined3d_device_set_gs_sampler(ptr long ptr) @ cdecl wined3d_device_set_index_buffer(ptr ptr long) @ cdecl wined3d_device_set_light(ptr long ptr) @ cdecl wined3d_device_set_light_enable(ptr long long) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index c347068..64da8e5 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2315,6 +2315,7 @@ struct wined3d_state struct wined3d_shader *geometry_shader; struct wined3d_buffer *gs_cb[MAX_CONSTANT_BUFFERS]; + struct wined3d_sampler *gs_sampler[MAX_SAMPLER_OBJECTS]; struct wined3d_shader *pixel_shader; struct wined3d_buffer *ps_cb[MAX_CONSTANT_BUFFERS]; diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index cc60893..eb48ceb 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2211,6 +2211,7 @@ void __cdecl wined3d_device_set_gamma_ramp(const struct wined3d_device *device, UINT swapchain_idx, DWORD flags, const struct wined3d_gamma_ramp *ramp); void __cdecl wined3d_device_set_geometry_shader(struct wined3d_device *device, struct wined3d_shader *shader); void __cdecl wined3d_device_set_gs_cb(struct wined3d_device *device, UINT idx, struct wined3d_buffer *buffer); +void __cdecl wined3d_device_set_gs_sampler(struct wined3d_device *device, UINT idx, struct wined3d_sampler *sampler); void __cdecl wined3d_device_set_index_buffer(struct wined3d_device *device, struct wined3d_buffer *index_buffer, enum wined3d_format_id format_id); HRESULT __cdecl wined3d_device_set_light(struct wined3d_device *device,

1 0

Henri Verbeet : ddraw: Avoid LPDDSURFACEDESC2.
by Alexandre Julliard 07 Dec '12

07 Dec '12

Module: wine Branch: master Commit: fb37ac56d9395fea24d8d13ec9c84087625df6ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=fb37ac56d9395fea24d8d13ec… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Dec 7 00:07:06 2012 +0100 ddraw: Avoid LPDDSURFACEDESC2. --- dlls/ddraw/ddraw.c | 2 +- include/ddraw.h | 30 +++++++++++++++++------------- include/ddrawi.h | 2 +- 3 files changed, 19 insertions(+), 15 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index e4e50df..97b071f 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -3078,7 +3078,7 @@ static HRESULT WINAPI ddraw2_CreateSurface(IDirectDraw2 *iface, if (TRACE_ON(ddraw)) { TRACE(" (%p) Requesting surface desc :\n", iface); - DDRAW_dump_surface_desc((LPDDSURFACEDESC2)surface_desc); + DDRAW_dump_surface_desc((DDSURFACEDESC2 *)surface_desc); } WARN("Application tried to create an explicit front or back buffer\n"); diff --git a/include/ddraw.h b/include/ddraw.h index e198ae4..0b8128f 100644 --- a/include/ddraw.h +++ b/include/ddraw.h @@ -1059,7 +1059,7 @@ typedef BOOL (CALLBACK *LPDDENUMCALLBACKW)(GUID *, LPWSTR, LPWSTR, LPVOID); DECL_WINELIB_TYPE_AW(LPDDENUMCALLBACK) typedef HRESULT (CALLBACK *LPDDENUMMODESCALLBACK)(DDSURFACEDESC *desc, void *ctx); -typedef HRESULT (CALLBACK *LPDDENUMMODESCALLBACK2)(LPDDSURFACEDESC2, LPVOID); +typedef HRESULT (CALLBACK *LPDDENUMMODESCALLBACK2)(DDSURFACEDESC2 *desc, void *ctx); typedef HRESULT (CALLBACK *LPDDENUMSURFACESCALLBACK)(struct IDirectDrawSurface *surface, DDSURFACEDESC *surface_desc, void *ctx); typedef HRESULT (CALLBACK *LPDDENUMSURFACESCALLBACK2)(struct IDirectDrawSurface4 *surface, @@ -1647,11 +1647,13 @@ DECLARE_INTERFACE_(IDirectDraw4,IUnknown) struct IDirectDrawSurface4 **surface, IUnknown *outer) PURE; /*1c*/ STDMETHOD(DuplicateSurface)(THIS_ struct IDirectDrawSurface4 *src_surface, struct IDirectDrawSurface4 **dst_surface) PURE; -/*20*/ STDMETHOD(EnumDisplayModes)(THIS_ DWORD dwFlags, LPDDSURFACEDESC2 lpDDSurfaceDesc, LPVOID lpContext, LPDDENUMMODESCALLBACK2 lpEnumModesCallback) PURE; -/*24*/ STDMETHOD(EnumSurfaces)(THIS_ DWORD dwFlags, LPDDSURFACEDESC2 lpDDSD, LPVOID lpContext, LPDDENUMSURFACESCALLBACK2 lpEnumSurfacesCallback) PURE; +/*20*/ STDMETHOD(EnumDisplayModes)(THIS_ DWORD flags, DDSURFACEDESC2 *surface_desc, + void *ctx, LPDDENUMMODESCALLBACK2 cb) PURE; +/*24*/ STDMETHOD(EnumSurfaces)(THIS_ DWORD flags, DDSURFACEDESC2 *surface_desc, + void *ctx, LPDDENUMSURFACESCALLBACK2 cb) PURE; /*28*/ STDMETHOD(FlipToGDISurface)(THIS) PURE; /*2c*/ STDMETHOD(GetCaps)(THIS_ DDCAPS *driver_caps, DDCAPS *hel_caps) PURE; -/*30*/ STDMETHOD(GetDisplayMode)(THIS_ LPDDSURFACEDESC2 lpDDSurfaceDesc) PURE; +/*30*/ STDMETHOD(GetDisplayMode)(THIS_ DDSURFACEDESC2 *surface_desc) PURE; /*34*/ STDMETHOD(GetFourCCCodes)(THIS_ LPDWORD lpNumCodes, LPDWORD lpCodes) PURE; /*38*/ STDMETHOD(GetGDISurface)(THIS_ struct IDirectDrawSurface4 **surface) PURE; /*3c*/ STDMETHOD(GetMonitorFrequency)(THIS_ LPDWORD lpdwFrequency) PURE; @@ -1763,11 +1765,13 @@ DECLARE_INTERFACE_(IDirectDraw7,IUnknown) struct IDirectDrawSurface7 **surface, IUnknown *outer) PURE; /*1c*/ STDMETHOD(DuplicateSurface)(THIS_ struct IDirectDrawSurface7 *src_surface, struct IDirectDrawSurface7 **dst_surface) PURE; -/*20*/ STDMETHOD(EnumDisplayModes)(THIS_ DWORD dwFlags, LPDDSURFACEDESC2 lpDDSurfaceDesc, LPVOID lpContext, LPDDENUMMODESCALLBACK2 lpEnumModesCallback) PURE; -/*24*/ STDMETHOD(EnumSurfaces)(THIS_ DWORD dwFlags, LPDDSURFACEDESC2 lpDDSD, LPVOID lpContext, LPDDENUMSURFACESCALLBACK7 lpEnumSurfacesCallback) PURE; +/*20*/ STDMETHOD(EnumDisplayModes)(THIS_ DWORD flags, DDSURFACEDESC2 *surface_desc, + void *ctx, LPDDENUMMODESCALLBACK2 cb) PURE; +/*24*/ STDMETHOD(EnumSurfaces)(THIS_ DWORD flags, DDSURFACEDESC2 *surface_desc, + void *ctx, LPDDENUMSURFACESCALLBACK7 cb) PURE; /*28*/ STDMETHOD(FlipToGDISurface)(THIS) PURE; /*2c*/ STDMETHOD(GetCaps)(THIS_ DDCAPS *driver_caps, DDCAPS *hel_caps) PURE; -/*30*/ STDMETHOD(GetDisplayMode)(THIS_ LPDDSURFACEDESC2 lpDDSurfaceDesc) PURE; +/*30*/ STDMETHOD(GetDisplayMode)(THIS_ DDSURFACEDESC2 *surface_desc) PURE; /*34*/ STDMETHOD(GetFourCCCodes)(THIS_ LPDWORD lpNumCodes, LPDWORD lpCodes) PURE; /*38*/ STDMETHOD(GetGDISurface)(THIS_ struct IDirectDrawSurface7 **surface) PURE; /*3c*/ STDMETHOD(GetMonitorFrequency)(THIS_ LPDWORD lpdwFrequency) PURE; @@ -2329,10 +2333,10 @@ DECLARE_INTERFACE_(IDirectDrawSurface4,IUnknown) STDMETHOD(GetOverlayPosition)(THIS_ LPLONG lplX, LPLONG lplY) PURE; STDMETHOD(GetPalette)(THIS_ IDirectDrawPalette **palette) PURE; STDMETHOD(GetPixelFormat)(THIS_ DDPIXELFORMAT *format) PURE; - STDMETHOD(GetSurfaceDesc)(THIS_ LPDDSURFACEDESC2 lpDDSurfaceDesc) PURE; + STDMETHOD(GetSurfaceDesc)(THIS_ DDSURFACEDESC2 *surface_desc) PURE; STDMETHOD(Initialize)(THIS_ IDirectDraw *ddraw, DDSURFACEDESC2 *surface_desc) PURE; STDMETHOD(IsLost)(THIS) PURE; - STDMETHOD(Lock)(THIS_ LPRECT lpDestRect, LPDDSURFACEDESC2 lpDDSurfaceDesc, DWORD dwFlags, HANDLE hEvent) PURE; + STDMETHOD(Lock)(THIS_ RECT *rect, DDSURFACEDESC2 *surface_desc, DWORD flags, HANDLE event) PURE; STDMETHOD(ReleaseDC)(THIS_ HDC hDC) PURE; STDMETHOD(Restore)(THIS) PURE; STDMETHOD(SetClipper)(THIS_ IDirectDrawClipper *clipper) PURE; @@ -2349,7 +2353,7 @@ DECLARE_INTERFACE_(IDirectDrawSurface4,IUnknown) STDMETHOD(PageLock)(THIS_ DWORD dwFlags) PURE; STDMETHOD(PageUnlock)(THIS_ DWORD dwFlags) PURE; /* added in v3 */ - STDMETHOD(SetSurfaceDesc)(THIS_ LPDDSURFACEDESC2 lpDDSD, DWORD dwFlags) PURE; + STDMETHOD(SetSurfaceDesc)(THIS_ DDSURFACEDESC2 *surface_desc, DWORD flags) PURE; /* added in v4 */ STDMETHOD(SetPrivateData)(THIS_ REFGUID tag, LPVOID pData, DWORD cbSize, DWORD dwFlags) PURE; STDMETHOD(GetPrivateData)(THIS_ REFGUID tag, LPVOID pBuffer, LPDWORD pcbBufferSize) PURE; @@ -2496,10 +2500,10 @@ DECLARE_INTERFACE_(IDirectDrawSurface7,IUnknown) STDMETHOD(GetOverlayPosition)(THIS_ LPLONG lplX, LPLONG lplY) PURE; STDMETHOD(GetPalette)(THIS_ IDirectDrawPalette **palette) PURE; STDMETHOD(GetPixelFormat)(THIS_ DDPIXELFORMAT *format) PURE; - STDMETHOD(GetSurfaceDesc)(THIS_ LPDDSURFACEDESC2 lpDDSurfaceDesc) PURE; + STDMETHOD(GetSurfaceDesc)(THIS_ DDSURFACEDESC2 *surface_desc) PURE; STDMETHOD(Initialize)(THIS_ IDirectDraw *ddraw, DDSURFACEDESC2 *surface_desc) PURE; STDMETHOD(IsLost)(THIS) PURE; - STDMETHOD(Lock)(THIS_ LPRECT lpDestRect, LPDDSURFACEDESC2 lpDDSurfaceDesc, DWORD dwFlags, HANDLE hEvent) PURE; + STDMETHOD(Lock)(THIS_ RECT *rect, DDSURFACEDESC2 *surface_desc, DWORD flags, HANDLE event) PURE; STDMETHOD(ReleaseDC)(THIS_ HDC hDC) PURE; STDMETHOD(Restore)(THIS) PURE; STDMETHOD(SetClipper)(THIS_ IDirectDrawClipper *clipper) PURE; @@ -2516,7 +2520,7 @@ DECLARE_INTERFACE_(IDirectDrawSurface7,IUnknown) STDMETHOD(PageLock)(THIS_ DWORD dwFlags) PURE; STDMETHOD(PageUnlock)(THIS_ DWORD dwFlags) PURE; /* added in v3 */ - STDMETHOD(SetSurfaceDesc)(THIS_ LPDDSURFACEDESC2 lpDDSD, DWORD dwFlags) PURE; + STDMETHOD(SetSurfaceDesc)(THIS_ DDSURFACEDESC2 *surface_desc, DWORD flags) PURE; /* added in v4 */ STDMETHOD(SetPrivateData)(THIS_ REFGUID tag, LPVOID pData, DWORD cbSize, DWORD dwFlags) PURE; STDMETHOD(GetPrivateData)(THIS_ REFGUID tag, LPVOID pBuffer, LPDWORD pcbBufferSize) PURE; diff --git a/include/ddrawi.h b/include/ddrawi.h index 37ff1b6..5422ed7 100644 --- a/include/ddrawi.h +++ b/include/ddrawi.h @@ -951,7 +951,7 @@ typedef struct _DDRAWI_DDRAWSURFACE_MORE { DWORD qwDDrawReserved8[2]; LPVOID lpDDrawReserved9; DWORD cSurfaces; - LPDDSURFACEDESC2 pCreatedDDSurfaceDesc2; + DDSURFACEDESC2 *pCreatedDDSurfaceDesc2; LPDDRAWI_DDRAWSURFACE_LCL *slist; DWORD dwFVF; LPVOID lpVB;

1 0

Henri Verbeet : ddraw: Avoid LPDDSURFACEDESC.
by Alexandre Julliard 07 Dec '12

07 Dec '12

Module: wine Branch: master Commit: b1186d71c2dfe287068563da3e59bfd6c05271a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b1186d71c2dfe287068563da3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Dec 7 00:07:05 2012 +0100 ddraw: Avoid LPDDSURFACEDESC. --- dlls/ddraw/tests/ddrawmodes.c | 10 +++++----- dlls/ddraw/tests/visual.c | 2 +- include/d3dtypes.h | 2 +- include/ddraw.h | 40 +++++++++++++++++++++++----------------- include/ddrawi.h | 4 ++-- 5 files changed, 32 insertions(+), 26 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b1186d71c2dfe28706856…

1 0

Henri Verbeet : ddraw: Avoid LPDDPIXELFORMAT.
by Alexandre Julliard 07 Dec '12

07 Dec '12

Module: wine Branch: master Commit: 9a7bb01a9590fd74fa1c5bb5785c64772a4cb59c URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a7bb01a9590fd74fa1c5bb57… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Dec 7 00:07:04 2012 +0100 ddraw: Avoid LPDDPIXELFORMAT. --- include/d3dtypes.h | 2 +- include/ddraw.h | 10 +++++----- include/ddrawi.h | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/include/d3dtypes.h b/include/d3dtypes.h index 256d99a..01752b7 100644 --- a/include/d3dtypes.h +++ b/include/d3dtypes.h @@ -73,7 +73,7 @@ typedef LONG D3DFIXED; typedef HRESULT (CALLBACK *LPD3DVALIDATECALLBACK)(LPVOID lpUserArg, DWORD dwOffset); typedef HRESULT (CALLBACK *LPD3DENUMTEXTUREFORMATSCALLBACK)(LPDDSURFACEDESC lpDdsd, LPVOID lpContext); -typedef HRESULT (CALLBACK *LPD3DENUMPIXELFORMATSCALLBACK)(LPDDPIXELFORMAT lpDDPixFmt, LPVOID lpContext); +typedef HRESULT (CALLBACK *LPD3DENUMPIXELFORMATSCALLBACK)(DDPIXELFORMAT *format, void *ctx); #ifndef DX_SHARED_DEFINES diff --git a/include/ddraw.h b/include/ddraw.h index 25ea77e..536a58e 100644 --- a/include/ddraw.h +++ b/include/ddraw.h @@ -1891,7 +1891,7 @@ DECLARE_INTERFACE_(IDirectDrawSurface,IUnknown) /*48*/ STDMETHOD(GetFlipStatus)(THIS_ DWORD dwFlags) PURE; /*4c*/ STDMETHOD(GetOverlayPosition)(THIS_ LPLONG lplX, LPLONG lplY) PURE; /*50*/ STDMETHOD(GetPalette)(THIS_ IDirectDrawPalette **palette) PURE; -/*54*/ STDMETHOD(GetPixelFormat)(THIS_ LPDDPIXELFORMAT lpDDPixelFormat) PURE; +/*54*/ STDMETHOD(GetPixelFormat)(THIS_ DDPIXELFORMAT *format) PURE; /*58*/ STDMETHOD(GetSurfaceDesc)(THIS_ LPDDSURFACEDESC lpDDSurfaceDesc) PURE; /*5c*/ STDMETHOD(Initialize)(THIS_ IDirectDraw *ddraw, DDSURFACEDESC *surface_desc) PURE; /*60*/ STDMETHOD(IsLost)(THIS) PURE; @@ -2025,7 +2025,7 @@ DECLARE_INTERFACE_(IDirectDrawSurface2,IUnknown) STDMETHOD(GetFlipStatus)(THIS_ DWORD dwFlags) PURE; STDMETHOD(GetOverlayPosition)(THIS_ LPLONG lplX, LPLONG lplY) PURE; STDMETHOD(GetPalette)(THIS_ IDirectDrawPalette **palette) PURE; - STDMETHOD(GetPixelFormat)(THIS_ LPDDPIXELFORMAT lpDDPixelFormat) PURE; + STDMETHOD(GetPixelFormat)(THIS_ DDPIXELFORMAT *format) PURE; STDMETHOD(GetSurfaceDesc)(THIS_ LPDDSURFACEDESC lpDDSurfaceDesc) PURE; STDMETHOD(Initialize)(THIS_ IDirectDraw *ddraw, DDSURFACEDESC *surface_desc) PURE; STDMETHOD(IsLost)(THIS) PURE; @@ -2171,7 +2171,7 @@ DECLARE_INTERFACE_(IDirectDrawSurface3,IUnknown) STDMETHOD(GetFlipStatus)(THIS_ DWORD dwFlags) PURE; STDMETHOD(GetOverlayPosition)(THIS_ LPLONG lplX, LPLONG lplY) PURE; STDMETHOD(GetPalette)(THIS_ IDirectDrawPalette **palette) PURE; - STDMETHOD(GetPixelFormat)(THIS_ LPDDPIXELFORMAT lpDDPixelFormat) PURE; + STDMETHOD(GetPixelFormat)(THIS_ DDPIXELFORMAT *format) PURE; STDMETHOD(GetSurfaceDesc)(THIS_ LPDDSURFACEDESC lpDDSurfaceDesc) PURE; STDMETHOD(Initialize)(THIS_ IDirectDraw *ddraw, DDSURFACEDESC *surface_desc) PURE; STDMETHOD(IsLost)(THIS) PURE; @@ -2322,7 +2322,7 @@ DECLARE_INTERFACE_(IDirectDrawSurface4,IUnknown) STDMETHOD(GetFlipStatus)(THIS_ DWORD dwFlags) PURE; STDMETHOD(GetOverlayPosition)(THIS_ LPLONG lplX, LPLONG lplY) PURE; STDMETHOD(GetPalette)(THIS_ IDirectDrawPalette **palette) PURE; - STDMETHOD(GetPixelFormat)(THIS_ LPDDPIXELFORMAT lpDDPixelFormat) PURE; + STDMETHOD(GetPixelFormat)(THIS_ DDPIXELFORMAT *format) PURE; STDMETHOD(GetSurfaceDesc)(THIS_ LPDDSURFACEDESC2 lpDDSurfaceDesc) PURE; STDMETHOD(Initialize)(THIS_ IDirectDraw *ddraw, DDSURFACEDESC2 *surface_desc) PURE; STDMETHOD(IsLost)(THIS) PURE; @@ -2489,7 +2489,7 @@ DECLARE_INTERFACE_(IDirectDrawSurface7,IUnknown) STDMETHOD(GetFlipStatus)(THIS_ DWORD dwFlags) PURE; STDMETHOD(GetOverlayPosition)(THIS_ LPLONG lplX, LPLONG lplY) PURE; STDMETHOD(GetPalette)(THIS_ IDirectDrawPalette **palette) PURE; - STDMETHOD(GetPixelFormat)(THIS_ LPDDPIXELFORMAT lpDDPixelFormat) PURE; + STDMETHOD(GetPixelFormat)(THIS_ DDPIXELFORMAT *format) PURE; STDMETHOD(GetSurfaceDesc)(THIS_ LPDDSURFACEDESC2 lpDDSurfaceDesc) PURE; STDMETHOD(Initialize)(THIS_ IDirectDraw *ddraw, DDSURFACEDESC2 *surface_desc) PURE; STDMETHOD(IsLost)(THIS) PURE; diff --git a/include/ddrawi.h b/include/ddrawi.h index a695a1c..1210d2c 100644 --- a/include/ddrawi.h +++ b/include/ddrawi.h @@ -820,7 +820,7 @@ typedef struct _DDRAWI_DIRECTDRAW_GBL { /* DirectX 6.0 */ ULONG_PTR lpD3DHALCallbacks3; DWORD dwNumZPixelFormats; - LPDDPIXELFORMAT lpZPixelFormats; + DDPIXELFORMAT *lpZPixelFormats; LPDDRAWI_DDMOTIONCOMP_INT mcList; DWORD hDDVxd; DDSCAPSEX ddsCapsMore;

1 0

Andrew Talbot : urlmon: Remove unneeded address-of operator from array name .
by Alexandre Julliard 07 Dec '12

07 Dec '12

Module: wine Branch: master Commit: c1c970e0906d3bc6b193d875b67633fff02e8f8e URL: http://source.winehq.org/git/wine.git/?a=commit;h=c1c970e0906d3bc6b193d875b… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Thu Dec 6 22:41:42 2012 +0000 urlmon: Remove unneeded address-of operator from array name. --- dlls/urlmon/uri.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/urlmon/uri.c b/dlls/urlmon/uri.c index 0a68b43..90113f2 100644 --- a/dlls/urlmon/uri.c +++ b/dlls/urlmon/uri.c @@ -5184,7 +5184,7 @@ static HRESULT WINAPI PersistStream_Load(IPersistStream *iface, IStream *pStm) data = heap_alloc(size); if(!data) return E_OUTOFMEMORY; - hr = IStream_Read(pStm, &data->unk1, size-sizeof(DWORD)-2, NULL); + hr = IStream_Read(pStm, data->unk1, size-sizeof(DWORD)-2, NULL); if(FAILED(hr)) { heap_free(data); return hr;

1 0

Andrew Talbot : user32: Remove unneeded address-of operator from array name .
by Alexandre Julliard 07 Dec '12

07 Dec '12

Module: wine Branch: master Commit: 51f936adc28187f0aaaacb8651b2dc3c68d3a137 URL: http://source.winehq.org/git/wine.git/?a=commit;h=51f936adc28187f0aaaacb865… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Thu Dec 6 22:41:45 2012 +0000 user32: Remove unneeded address-of operator from array name. --- dlls/user32/sysparams.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index 08098c0..f17db6e 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -1123,7 +1123,7 @@ static BOOL set_entry( void *ptr, UINT int_param, void *ptr_param, UINT flags ) #define BINARY_ENTRY(name,data) \ struct sysparam_binary_entry entry_##name = { { get_binary_entry, set_binary_entry, init_binary_entry, \ - name ##_VALNAME }, &(data), sizeof(data) } + name ##_VALNAME }, data, sizeof(data) } #define PATH_ENTRY(name) \ struct sysparam_binary_entry entry_##name = { { get_path_entry, set_path_entry, init_path_entry, \

1 0

← Newer
1
...
39
40
41
42
43
44
45
...
55
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 December 2012