wine-commits October 2013

wine-commits@winehq.org

2 participants
757 discussions

Ken Thomases : winemac: Add registry settings to make Option keys send Alt rather than accessing additional characters from the keyboard layout .
by Alexandre Julliard 10 Oct '13

10 Oct '13

Module: wine Branch: master Commit: 79d45585bcd7b884fb195ce59bc8b5dada9ad4f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=79d45585bcd7b884fb195ce59… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Oct 9 16:30:59 2013 -0500 winemac: Add registry settings to make Option keys send Alt rather than accessing additional characters from the keyboard layout. --- dlls/winemac.drv/cocoa_window.m | 22 ++++++++++++++++++++-- dlls/winemac.drv/macdrv_cocoa.h | 2 ++ dlls/winemac.drv/macdrv_main.c | 7 +++++++ 3 files changed, 29 insertions(+), 2 deletions(-) diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index 7371cbc..2bb9aef 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -117,6 +117,24 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers) *modifiers &= ~NX_ALTERNATEMASK; } +static inline NSUInteger adjusted_modifiers_for_option_behavior(NSUInteger modifiers) +{ + fix_device_modifiers_by_generic(&modifiers); + if (left_option_is_alt && (modifiers & NX_DEVICELALTKEYMASK)) + { + modifiers |= NX_DEVICELCMDKEYMASK; + modifiers &= ~NX_DEVICELALTKEYMASK; + } + if (right_option_is_alt && (modifiers & NX_DEVICERALTKEYMASK)) + { + modifiers |= NX_DEVICERCMDKEYMASK; + modifiers &= ~NX_DEVICERALTKEYMASK; + } + fix_generic_modifiers_by_device(&modifiers); + + return modifiers; +} + @interface WineContentView : NSView <NSTextInputClient> { @@ -1253,7 +1271,7 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers) [self flagsChanged:theEvent]; [self postKey:[theEvent keyCode] pressed:[theEvent type] == NSKeyDown - modifiers:[theEvent modifierFlags] + modifiers:adjusted_modifiers_for_option_behavior([theEvent modifierFlags]) event:theEvent]; } @@ -1416,7 +1434,7 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers) { NX_DEVICERCMDKEYMASK, kVK_RightCommand }, }; - NSUInteger modifierFlags = [theEvent modifierFlags]; + NSUInteger modifierFlags = adjusted_modifiers_for_option_behavior([theEvent modifierFlags]); NSUInteger changed; int i, last_changed; diff --git a/dlls/winemac.drv/macdrv_cocoa.h b/dlls/winemac.drv/macdrv_cocoa.h index 1a38b56..1c2d140 100644 --- a/dlls/winemac.drv/macdrv_cocoa.h +++ b/dlls/winemac.drv/macdrv_cocoa.h @@ -143,6 +143,8 @@ struct macdrv_display { extern int macdrv_err_on; extern int topmost_float_inactive DECLSPEC_HIDDEN; extern int capture_displays_for_fullscreen DECLSPEC_HIDDEN; +extern int left_option_is_alt DECLSPEC_HIDDEN; +extern int right_option_is_alt DECLSPEC_HIDDEN; extern int macdrv_start_cocoa_app(unsigned long long tickcount) DECLSPEC_HIDDEN; extern void macdrv_window_rejected_focus(const struct macdrv_event *event) DECLSPEC_HIDDEN; diff --git a/dlls/winemac.drv/macdrv_main.c b/dlls/winemac.drv/macdrv_main.c index dd032f3..d27ce94 100644 --- a/dlls/winemac.drv/macdrv_main.c +++ b/dlls/winemac.drv/macdrv_main.c @@ -50,6 +50,8 @@ int capture_displays_for_fullscreen = 0; BOOL skip_single_buffer_flushes = FALSE; BOOL allow_vsync = TRUE; BOOL allow_set_gamma = TRUE; +int left_option_is_alt = 0; +int right_option_is_alt = 0; /************************************************************************** @@ -168,6 +170,11 @@ static void setup_options(void) if (!get_config_key(hkey, appkey, "AllowSetGamma", buffer, sizeof(buffer))) allow_set_gamma = IS_OPTION_TRUE(buffer[0]); + if (!get_config_key(hkey, appkey, "LeftOptionIsAlt", buffer, sizeof(buffer))) + left_option_is_alt = IS_OPTION_TRUE(buffer[0]); + if (!get_config_key(hkey, appkey, "RightOptionIsAlt", buffer, sizeof(buffer))) + right_option_is_alt = IS_OPTION_TRUE(buffer[0]); + if (appkey) RegCloseKey(appkey); if (hkey) RegCloseKey(hkey); }

1 0

Ken Thomases : winemac: Make sure the same housekeeping is done when closing a window as is done when hiding it .
by Alexandre Julliard 10 Oct '13

10 Oct '13

Module: wine Branch: master Commit: 05e3d0e5cc4211d408210e4ef3969a1446f9c0fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=05e3d0e5cc4211d408210e4ef… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Oct 9 16:30:53 2013 -0500 winemac: Make sure the same housekeeping is done when closing a window as is done when hiding it. --- dlls/winemac.drv/cocoa_window.m | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index a48b691..7371cbc 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -1801,8 +1801,11 @@ void macdrv_destroy_cocoa_window(macdrv_window w) NSAutoreleasePool* pool = [[NSAutoreleasePool alloc] init]; WineWindow* window = (WineWindow*)w; + OnMainThread(^{ + [window doOrderOut]; + [window close]; + }); [window.queue discardEventsMatchingMask:-1 forWindow:window]; - [window close]; [window release]; [pool release];

1 0

Henri Verbeet : d3drm: Get rid of the IDirect3DRMVisualArrayImpl typedef.
by Alexandre Julliard 10 Oct '13

10 Oct '13

Module: wine Branch: master Commit: 3ffd998c4682656c521bf2848c0b9f77ead60e01 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ffd998c4682656c521bf2848… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Oct 9 22:57:49 2013 +0200 d3drm: Get rid of the IDirect3DRMVisualArrayImpl typedef. --- dlls/d3drm/frame.c | 128 ++++++++++++++++++++++++---------------------------- 1 files changed, 59 insertions(+), 69 deletions(-) diff --git a/dlls/d3drm/frame.c b/dlls/d3drm/frame.c index 09ce724..67ac6c5 100644 --- a/dlls/d3drm/frame.c +++ b/dlls/d3drm/frame.c @@ -65,12 +65,13 @@ typedef struct { IDirect3DRMFrame **frames; } IDirect3DRMFrameArrayImpl; -typedef struct { +struct d3drm_visual_array +{ IDirect3DRMVisualArray IDirect3DRMVisualArray_iface; LONG ref; ULONG size; IDirect3DRMVisual **visuals; -} IDirect3DRMVisualArrayImpl; +}; struct d3drm_light_array { @@ -97,9 +98,9 @@ static inline IDirect3DRMFrameArrayImpl *impl_from_IDirect3DRMFrameArray(IDirect return CONTAINING_RECORD(iface, IDirect3DRMFrameArrayImpl, IDirect3DRMFrameArray_iface); } -static inline IDirect3DRMVisualArrayImpl *impl_from_IDirect3DRMVisualArray(IDirect3DRMVisualArray *iface) +static inline struct d3drm_visual_array *impl_from_IDirect3DRMVisualArray(IDirect3DRMVisualArray *iface) { - return CONTAINING_RECORD(iface, IDirect3DRMVisualArrayImpl, IDirect3DRMVisualArray_iface); + return CONTAINING_RECORD(iface, struct d3drm_visual_array, IDirect3DRMVisualArray_iface); } static inline struct d3drm_light_array *impl_from_IDirect3DRMLightArray(IDirect3DRMLightArray *iface) @@ -218,7 +219,7 @@ static HRESULT Direct3DRMFrameArray_create(IDirect3DRMFrameArray** obj) return S_OK; } -static HRESULT WINAPI IDirect3DRMVisualArrayImpl_QueryInterface(IDirect3DRMVisualArray *iface, REFIID riid, void **out) +static HRESULT WINAPI d3drm_visual_array_QueryInterface(IDirect3DRMVisualArray *iface, REFIID riid, void **out) { TRACE("iface %p, riid %s, out %p.\n", iface, debugstr_guid(riid), out); @@ -236,97 +237,88 @@ static HRESULT WINAPI IDirect3DRMVisualArrayImpl_QueryInterface(IDirect3DRMVisua return E_NOINTERFACE; } -static ULONG WINAPI IDirect3DRMVisualArrayImpl_AddRef(IDirect3DRMVisualArray* iface) +static ULONG WINAPI d3drm_visual_array_AddRef(IDirect3DRMVisualArray *iface) { - IDirect3DRMVisualArrayImpl *This = impl_from_IDirect3DRMVisualArray(iface); - ULONG ref = InterlockedIncrement(&This->ref); + struct d3drm_visual_array *array = impl_from_IDirect3DRMVisualArray(iface); + ULONG refcount = InterlockedIncrement(&array->ref); - TRACE("(%p)->(): new ref = %u\n", iface, ref); + TRACE("%p increasing refcount to %u.\n", iface, refcount); - return ref; + return refcount; } -static ULONG WINAPI IDirect3DRMVisualArrayImpl_Release(IDirect3DRMVisualArray* iface) +static ULONG WINAPI d3drm_visual_array_Release(IDirect3DRMVisualArray *iface) { - IDirect3DRMVisualArrayImpl *This = impl_from_IDirect3DRMVisualArray(iface); - ULONG ref = InterlockedDecrement(&This->ref); + struct d3drm_visual_array *array = impl_from_IDirect3DRMVisualArray(iface); + ULONG refcount = InterlockedDecrement(&array->ref); ULONG i; - TRACE("(%p)->(): new ref = %u\n", iface, ref); + TRACE("%p decreasing refcount to %u.\n", iface, refcount); - if (!ref) + if (!refcount) { - for (i = 0; i < This->size; i++) - IDirect3DRMVisual_Release(This->visuals[i]); - HeapFree(GetProcessHeap(), 0, This->visuals); - HeapFree(GetProcessHeap(), 0, This); + for (i = 0; i < array->size; ++i) + { + IDirect3DRMVisual_Release(array->visuals[i]); + } + HeapFree(GetProcessHeap(), 0, array->visuals); + HeapFree(GetProcessHeap(), 0, array); } - return ref; + return refcount; } -/*** IDirect3DRMArray methods ***/ -static DWORD WINAPI IDirect3DRMVisualArrayImpl_GetSize(IDirect3DRMVisualArray* iface) +static DWORD WINAPI d3drm_visual_array_GetSize(IDirect3DRMVisualArray *iface) { - IDirect3DRMVisualArrayImpl *This = impl_from_IDirect3DRMVisualArray(iface); + struct d3drm_visual_array *array = impl_from_IDirect3DRMVisualArray(iface); - TRACE("(%p)->() = %d\n", iface, This->size); + TRACE("iface %p.\n", iface); - return This->size; + return array->size; } -/*** IDirect3DRMVisualArray methods ***/ -static HRESULT WINAPI IDirect3DRMVisualArrayImpl_GetElement(IDirect3DRMVisualArray *iface, +static HRESULT WINAPI d3drm_visual_array_GetElement(IDirect3DRMVisualArray *iface, DWORD index, IDirect3DRMVisual **visual) { - IDirect3DRMVisualArrayImpl *This = impl_from_IDirect3DRMVisualArray(iface); + struct d3drm_visual_array *array = impl_from_IDirect3DRMVisualArray(iface); - TRACE("(%p)->(%u, %p)\n", iface, index, visual); + TRACE("iface %p, index %u, visual %p.\n", iface, index, visual); if (!visual) return D3DRMERR_BADVALUE; - *visual = NULL; - - if (index >= This->size) + if (index >= array->size) + { + *visual = NULL; return D3DRMERR_BADVALUE; + } - IDirect3DRMVisual_AddRef(This->visuals[index]); - *visual = This->visuals[index]; + IDirect3DRMVisual_AddRef(array->visuals[index]); + *visual = array->visuals[index]; return D3DRM_OK; } -static const struct IDirect3DRMVisualArrayVtbl Direct3DRMVisualArray_Vtbl = +static const struct IDirect3DRMVisualArrayVtbl d3drm_visual_array_vtbl = { - /*** IUnknown methods ***/ - IDirect3DRMVisualArrayImpl_QueryInterface, - IDirect3DRMVisualArrayImpl_AddRef, - IDirect3DRMVisualArrayImpl_Release, - /*** IDirect3DRMArray methods ***/ - IDirect3DRMVisualArrayImpl_GetSize, - /*** IDirect3DRMVisualArray methods ***/ - IDirect3DRMVisualArrayImpl_GetElement + d3drm_visual_array_QueryInterface, + d3drm_visual_array_AddRef, + d3drm_visual_array_Release, + d3drm_visual_array_GetSize, + d3drm_visual_array_GetElement, }; -static HRESULT Direct3DRMVisualArray_create(IDirect3DRMVisualArray** ret_iface) +static struct d3drm_visual_array *d3drm_visual_array_create(void) { - IDirect3DRMVisualArrayImpl* object; + struct d3drm_visual_array *array; - TRACE("(%p)\n", ret_iface); - - *ret_iface = NULL; - - object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirect3DRMVisualArrayImpl)); - if (!object) - return E_OUTOFMEMORY; - - object->IDirect3DRMVisualArray_iface.lpVtbl = &Direct3DRMVisualArray_Vtbl; - object->ref = 1; + if (!(array = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*array)))) + return NULL; - *ret_iface = &object->IDirect3DRMVisualArray_iface; + array->IDirect3DRMVisualArray_iface.lpVtbl = &d3drm_visual_array_vtbl; + array->ref = 1; - return S_OK; + return array; } static HRESULT WINAPI d3drm_light_array_QueryInterface(IDirect3DRMLightArray *iface, REFIID riid, void **out) @@ -789,34 +781,32 @@ static HRESULT WINAPI IDirect3DRMFrame2Impl_GetOrientation(IDirect3DRMFrame2 *if static HRESULT WINAPI IDirect3DRMFrame2Impl_GetVisuals(IDirect3DRMFrame2 *iface, IDirect3DRMVisualArray **visuals) { IDirect3DRMFrameImpl *This = impl_from_IDirect3DRMFrame2(iface); - IDirect3DRMVisualArrayImpl* obj; - HRESULT hr; + struct d3drm_visual_array *array; - TRACE("(%p/%p)->(%p)\n", iface, This, visuals); + TRACE("iface %p, visuals %p.\n", iface, visuals); if (!visuals) return D3DRMERR_BADVALUE; - hr = Direct3DRMVisualArray_create(visuals); - - if (hr != D3DRM_OK) - return hr; - - obj = (IDirect3DRMVisualArrayImpl*)*visuals; + if (!(array = d3drm_visual_array_create())) + return E_OUTOFMEMORY; - obj->size = This->nb_visuals; + array->size = This->nb_visuals; if (This->nb_visuals) { ULONG i; - if (!(obj->visuals = HeapAlloc(GetProcessHeap(), 0, This->nb_visuals * sizeof(*obj->visuals)))) + + if (!(array->visuals = HeapAlloc(GetProcessHeap(), 0, This->nb_visuals * sizeof(*array->visuals)))) return E_OUTOFMEMORY; for (i = 0; i < This->nb_visuals; i++) { - obj->visuals[i] = This->visuals[i]; + array->visuals[i] = This->visuals[i]; IDirect3DRMVisual_AddRef(This->visuals[i]); } } + *visuals = &array->IDirect3DRMVisualArray_iface; + return D3DRM_OK; }

1 0

Henri Verbeet : d3drm: Introduce impl_from_IDirect3DRMFrameArray().
by Alexandre Julliard 10 Oct '13

10 Oct '13

Module: wine Branch: master Commit: cb49cff060a745673bbaac343ff2e1876e26e735 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb49cff060a745673bbaac343… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Oct 9 22:57:48 2013 +0200 d3drm: Introduce impl_from_IDirect3DRMFrameArray(). --- dlls/d3drm/frame.c | 42 ++++++++++++++++++++---------------------- 1 files changed, 20 insertions(+), 22 deletions(-) diff --git a/dlls/d3drm/frame.c b/dlls/d3drm/frame.c index 7523eab..09ce724 100644 --- a/dlls/d3drm/frame.c +++ b/dlls/d3drm/frame.c @@ -92,6 +92,11 @@ static inline IDirect3DRMFrameImpl *impl_from_IDirect3DRMFrame3(IDirect3DRMFrame static inline IDirect3DRMFrameImpl *unsafe_impl_from_IDirect3DRMFrame3(IDirect3DRMFrame3 *iface); +static inline IDirect3DRMFrameArrayImpl *impl_from_IDirect3DRMFrameArray(IDirect3DRMFrameArray *iface) +{ + return CONTAINING_RECORD(iface, IDirect3DRMFrameArrayImpl, IDirect3DRMFrameArray_iface); +} + static inline IDirect3DRMVisualArrayImpl *impl_from_IDirect3DRMVisualArray(IDirect3DRMVisualArray *iface) { return CONTAINING_RECORD(iface, IDirect3DRMVisualArrayImpl, IDirect3DRMVisualArray_iface); @@ -102,34 +107,27 @@ static inline struct d3drm_light_array *impl_from_IDirect3DRMLightArray(IDirect3 return CONTAINING_RECORD(iface, struct d3drm_light_array, IDirect3DRMLightArray_iface); } -/*** IUnknown methods ***/ -static HRESULT WINAPI IDirect3DRMFrameArrayImpl_QueryInterface(IDirect3DRMFrameArray* iface, - REFIID riid, void** object) +static HRESULT WINAPI IDirect3DRMFrameArrayImpl_QueryInterface(IDirect3DRMFrameArray *iface, REFIID riid, void **out) { - IDirect3DRMFrameArrayImpl *This = (IDirect3DRMFrameArrayImpl*)iface; - - TRACE("(%p/%p)->(%s, %p)\n", iface, This, debugstr_guid(riid), object); - - *object = NULL; + TRACE("iface %p, riid %s, out %p.\n", iface, debugstr_guid(riid), out); - if (IsEqualGUID(riid, &IID_IUnknown) || - IsEqualGUID(riid, &IID_IDirect3DRMFrameArray)) - { - *object = &This->IDirect3DRMFrameArray_iface; - } - else + if (IsEqualGUID(riid, &IID_IDirect3DRMFrameArray) + || IsEqualGUID(riid, &IID_IUnknown)) { - FIXME("interface %s not implemented\n", debugstr_guid(riid)); - return E_NOINTERFACE; + IDirect3DRMFrameArray_AddRef(iface); + *out = iface; + return S_OK; } - IDirect3DRMFrameArray_AddRef(iface); - return S_OK; + WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(riid)); + + *out = NULL; + return E_NOINTERFACE; } static ULONG WINAPI IDirect3DRMFrameArrayImpl_AddRef(IDirect3DRMFrameArray* iface) { - IDirect3DRMFrameArrayImpl *This = (IDirect3DRMFrameArrayImpl*)iface; + IDirect3DRMFrameArrayImpl *This = impl_from_IDirect3DRMFrameArray(iface); ULONG ref = InterlockedIncrement(&This->ref); TRACE("(%p)->(): new ref = %u\n", This, ref); @@ -139,7 +137,7 @@ static ULONG WINAPI IDirect3DRMFrameArrayImpl_AddRef(IDirect3DRMFrameArray* ifac static ULONG WINAPI IDirect3DRMFrameArrayImpl_Release(IDirect3DRMFrameArray* iface) { - IDirect3DRMFrameArrayImpl *This = (IDirect3DRMFrameArrayImpl*)iface; + IDirect3DRMFrameArrayImpl *This = impl_from_IDirect3DRMFrameArray(iface); ULONG ref = InterlockedDecrement(&This->ref); ULONG i; @@ -159,7 +157,7 @@ static ULONG WINAPI IDirect3DRMFrameArrayImpl_Release(IDirect3DRMFrameArray* ifa /*** IDirect3DRMArray methods ***/ static DWORD WINAPI IDirect3DRMFrameArrayImpl_GetSize(IDirect3DRMFrameArray* iface) { - IDirect3DRMFrameArrayImpl *This = (IDirect3DRMFrameArrayImpl*)iface; + IDirect3DRMFrameArrayImpl *This = impl_from_IDirect3DRMFrameArray(iface); TRACE("(%p)->() = %d\n", This, This->size); @@ -170,7 +168,7 @@ static DWORD WINAPI IDirect3DRMFrameArrayImpl_GetSize(IDirect3DRMFrameArray* ifa static HRESULT WINAPI IDirect3DRMFrameArrayImpl_GetElement(IDirect3DRMFrameArray *iface, DWORD index, IDirect3DRMFrame **frame) { - IDirect3DRMFrameArrayImpl *This = (IDirect3DRMFrameArrayImpl*)iface; + IDirect3DRMFrameArrayImpl *This = impl_from_IDirect3DRMFrameArray(iface); TRACE("(%p)->(%u, %p)\n", This, index, frame);

1 0

Henri Verbeet : wined3d: Unify sampler binding points.
by Alexandre Julliard 10 Oct '13

10 Oct '13

Module: wine Branch: master Commit: 392a65fe09ac92cf9d6491b3100819defa0c9d60 URL: http://source.winehq.org/git/wine.git/?a=commit;h=392a65fe09ac92cf9d6491b31… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Oct 9 22:57:47 2013 +0200 wined3d: Unify sampler binding points. --- dlls/wined3d/device.c | 54 ++++++++++++---------------------------- dlls/wined3d/stateblock.c | 30 ++++----------------- dlls/wined3d/wined3d_private.h | 5 +--- 3 files changed, 23 insertions(+), 66 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 55c54f0..93aef9f 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2144,20 +2144,19 @@ struct wined3d_buffer * CDECL wined3d_device_get_vs_cb(const struct wined3d_devi return device->state.cb[WINED3D_SHADER_TYPE_VERTEX][idx]; } -void CDECL wined3d_device_set_vs_sampler(struct wined3d_device *device, UINT idx, struct wined3d_sampler *sampler) +static void wined3d_device_set_sampler(struct wined3d_device *device, + enum wined3d_shader_type type, 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->update_state->vs_sampler[idx]; - device->update_state->vs_sampler[idx] = sampler; + prev = device->update_state->sampler[type][idx]; + device->update_state->sampler[type][idx] = sampler; if (sampler) wined3d_sampler_incref(sampler); @@ -2165,6 +2164,13 @@ void CDECL wined3d_device_set_vs_sampler(struct wined3d_device *device, UINT idx wined3d_sampler_decref(prev); } +void CDECL wined3d_device_set_vs_sampler(struct wined3d_device *device, UINT idx, struct wined3d_sampler *sampler) +{ + TRACE("device %p, idx %u, sampler %p.\n", device, idx, sampler); + + wined3d_device_set_sampler(device, WINED3D_SHADER_TYPE_VERTEX, idx, sampler); +} + struct wined3d_sampler * CDECL wined3d_device_get_vs_sampler(const struct wined3d_device *device, UINT idx) { TRACE("device %p, idx %u.\n", device, idx); @@ -2175,7 +2181,7 @@ struct wined3d_sampler * CDECL wined3d_device_get_vs_sampler(const struct wined3 return NULL; } - return device->state.vs_sampler[idx]; + return device->state.sampler[WINED3D_SHADER_TYPE_VERTEX][idx]; } static void device_invalidate_shader_constants(const struct wined3d_device *device, DWORD mask) @@ -2382,23 +2388,9 @@ struct wined3d_buffer * CDECL wined3d_device_get_ps_cb(const struct wined3d_devi void CDECL wined3d_device_set_ps_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->update_state->ps_sampler[idx]; - device->update_state->ps_sampler[idx] = sampler; - - if (sampler) - wined3d_sampler_incref(sampler); - if (prev) - wined3d_sampler_decref(prev); + wined3d_device_set_sampler(device, WINED3D_SHADER_TYPE_PIXEL, idx, sampler); } struct wined3d_sampler * CDECL wined3d_device_get_ps_sampler(const struct wined3d_device *device, UINT idx) @@ -2411,7 +2403,7 @@ struct wined3d_sampler * CDECL wined3d_device_get_ps_sampler(const struct wined3 return NULL; } - return device->state.ps_sampler[idx]; + return device->state.sampler[WINED3D_SHADER_TYPE_PIXEL][idx]; } HRESULT CDECL wined3d_device_set_ps_consts_b(struct wined3d_device *device, @@ -2603,23 +2595,9 @@ struct wined3d_buffer * CDECL wined3d_device_get_gs_cb(const struct wined3d_devi 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->update_state->gs_sampler[idx]; - device->update_state->gs_sampler[idx] = sampler; - - if (sampler) - wined3d_sampler_incref(sampler); - if (prev) - wined3d_sampler_decref(prev); + wined3d_device_set_sampler(device, WINED3D_SHADER_TYPE_GEOMETRY, idx, sampler); } struct wined3d_sampler * CDECL wined3d_device_get_gs_sampler(const struct wined3d_device *device, UINT idx) @@ -2632,7 +2610,7 @@ struct wined3d_sampler * CDECL wined3d_device_get_gs_sampler(const struct wined3 return NULL; } - return device->state.gs_sampler[idx]; + return device->state.sampler[WINED3D_SHADER_TYPE_GEOMETRY][idx]; } /* Context activation is done by the caller. */ diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index d88d51d..f991362 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -520,32 +520,14 @@ void state_unbind_resources(struct wined3d_state *state) wined3d_buffer_decref(buffer); } } - } - - for (i = 0; i < MAX_SAMPLER_OBJECTS; ++i) - { - if ((sampler = state->vs_sampler[i])) - { - state->vs_sampler[i] = NULL; - wined3d_sampler_decref(sampler); - } - } - - for (i = 0; i < MAX_SAMPLER_OBJECTS; ++i) - { - if ((sampler = state->gs_sampler[i])) - { - state->gs_sampler[i] = NULL; - wined3d_sampler_decref(sampler); - } - } - for (i = 0; i < MAX_SAMPLER_OBJECTS; ++i) - { - if ((sampler = state->ps_sampler[i])) + for (j = 0; j < MAX_SAMPLER_OBJECTS; ++j) { - state->ps_sampler[i] = NULL; - wined3d_sampler_decref(sampler); + if ((sampler = state->sampler[i][j])) + { + state->sampler[i][j] = NULL; + wined3d_sampler_decref(sampler); + } } } } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 11c1864..bfd9995 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1819,15 +1819,12 @@ struct wined3d_state struct wined3d_shader *shader[WINED3D_SHADER_TYPE_COUNT]; struct wined3d_buffer *cb[WINED3D_SHADER_TYPE_COUNT][MAX_CONSTANT_BUFFERS]; + struct wined3d_sampler *sampler[WINED3D_SHADER_TYPE_COUNT][MAX_SAMPLER_OBJECTS]; - struct wined3d_sampler *vs_sampler[MAX_SAMPLER_OBJECTS]; BOOL vs_consts_b[MAX_CONST_B]; INT vs_consts_i[MAX_CONST_I * 4]; float *vs_consts_f; - struct wined3d_sampler *gs_sampler[MAX_SAMPLER_OBJECTS]; - - struct wined3d_sampler *ps_sampler[MAX_SAMPLER_OBJECTS]; BOOL ps_consts_b[MAX_CONST_B]; INT ps_consts_i[MAX_CONST_I * 4]; float *ps_consts_f;

1 0

Henri Verbeet : wined3d: Unify constant buffer binding points.
by Alexandre Julliard 10 Oct '13

10 Oct '13

Module: wine Branch: master Commit: 3caefc8337cd618cbf77ef76d8242c00e43bb1ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=3caefc8337cd618cbf77ef76d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Oct 9 22:57:46 2013 +0200 wined3d: Unify constant buffer binding points. --- dlls/wined3d/device.c | 90 +++++++-------------------------------- dlls/wined3d/stateblock.c | 32 +++----------- dlls/wined3d/wined3d_private.h | 4 +- 3 files changed, 24 insertions(+), 102 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 166c84b..55c54f0 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2086,20 +2086,19 @@ struct wined3d_shader * CDECL wined3d_device_get_vertex_shader(const struct wine return device->state.shader[WINED3D_SHADER_TYPE_VERTEX]; } -void CDECL wined3d_device_set_vs_cb(struct wined3d_device *device, UINT idx, struct wined3d_buffer *buffer) +static void wined3d_device_set_constant_buffer(struct wined3d_device *device, + enum wined3d_shader_type type, UINT idx, struct wined3d_buffer *buffer) { struct wined3d_buffer *prev; - TRACE("device %p, idx %u, buffer %p.\n", device, idx, buffer); - if (idx >= MAX_CONSTANT_BUFFERS) { WARN("Invalid constant buffer index %u.\n", idx); return; } - prev = device->update_state->vs_cb[idx]; - device->update_state->vs_cb[idx] = buffer; + prev = device->update_state->cb[type][idx]; + device->update_state->cb[type][idx] = buffer; if (device->recording) { @@ -2125,6 +2124,13 @@ void CDECL wined3d_device_set_vs_cb(struct wined3d_device *device, UINT idx, str } } +void CDECL wined3d_device_set_vs_cb(struct wined3d_device *device, UINT idx, struct wined3d_buffer *buffer) +{ + TRACE("device %p, idx %u, buffer %p.\n", device, idx, buffer); + + wined3d_device_set_constant_buffer(device, WINED3D_SHADER_TYPE_VERTEX, idx, buffer); +} + struct wined3d_buffer * CDECL wined3d_device_get_vs_cb(const struct wined3d_device *device, UINT idx) { TRACE("device %p, idx %u.\n", device, idx); @@ -2135,7 +2141,7 @@ struct wined3d_buffer * CDECL wined3d_device_get_vs_cb(const struct wined3d_devi return NULL; } - return device->state.vs_cb[idx]; + return device->state.cb[WINED3D_SHADER_TYPE_VERTEX][idx]; } void CDECL wined3d_device_set_vs_sampler(struct wined3d_device *device, UINT idx, struct wined3d_sampler *sampler) @@ -2356,41 +2362,9 @@ struct wined3d_shader * CDECL wined3d_device_get_pixel_shader(const struct wined void CDECL wined3d_device_set_ps_cb(struct wined3d_device *device, UINT idx, struct wined3d_buffer *buffer) { - struct wined3d_buffer *prev; - TRACE("device %p, idx %u, buffer %p.\n", device, idx, buffer); - if (idx >= MAX_CONSTANT_BUFFERS) - { - WARN("Invalid constant buffer index %u.\n", idx); - return; - } - - prev = device->update_state->ps_cb[idx]; - device->update_state->ps_cb[idx] = buffer; - - if (device->recording) - { - if (buffer) - wined3d_buffer_incref(buffer); - if (prev) - wined3d_buffer_decref(prev); - return; - } - - if (prev != buffer) - { - if (buffer) - { - InterlockedIncrement(&buffer->resource.bind_count); - wined3d_buffer_incref(buffer); - } - if (prev) - { - InterlockedDecrement(&prev->resource.bind_count); - wined3d_buffer_decref(prev); - } - } + wined3d_device_set_constant_buffer(device, WINED3D_SHADER_TYPE_PIXEL, idx, buffer); } struct wined3d_buffer * CDECL wined3d_device_get_ps_cb(const struct wined3d_device *device, UINT idx) @@ -2403,7 +2377,7 @@ struct wined3d_buffer * CDECL wined3d_device_get_ps_cb(const struct wined3d_devi return NULL; } - return device->state.ps_cb[idx]; + return device->state.cb[WINED3D_SHADER_TYPE_PIXEL][idx]; } void CDECL wined3d_device_set_ps_sampler(struct wined3d_device *device, UINT idx, struct wined3d_sampler *sampler) @@ -2609,41 +2583,9 @@ struct wined3d_shader * CDECL wined3d_device_get_geometry_shader(const struct wi void CDECL wined3d_device_set_gs_cb(struct wined3d_device *device, UINT idx, struct wined3d_buffer *buffer) { - struct wined3d_buffer *prev; - TRACE("device %p, idx %u, buffer %p.\n", device, idx, buffer); - if (idx >= MAX_CONSTANT_BUFFERS) - { - WARN("Invalid constant buffer index %u.\n", idx); - return; - } - - prev = device->update_state->gs_cb[idx]; - device->update_state->gs_cb[idx] = buffer; - - if (device->recording) - { - if (buffer) - wined3d_buffer_incref(buffer); - if (prev) - wined3d_buffer_decref(prev); - return; - } - - if (prev != buffer) - { - if (buffer) - { - InterlockedIncrement(&buffer->resource.bind_count); - wined3d_buffer_incref(buffer); - } - if (prev) - { - InterlockedDecrement(&prev->resource.bind_count); - wined3d_buffer_decref(prev); - } - } + wined3d_device_set_constant_buffer(device, WINED3D_SHADER_TYPE_GEOMETRY, idx, buffer); } struct wined3d_buffer * CDECL wined3d_device_get_gs_cb(const struct wined3d_device *device, UINT idx) @@ -2656,7 +2598,7 @@ struct wined3d_buffer * CDECL wined3d_device_get_gs_cb(const struct wined3d_devi return NULL; } - return device->state.gs_cb[idx]; + return device->state.cb[WINED3D_SHADER_TYPE_GEOMETRY][idx]; } void CDECL wined3d_device_set_gs_sampler(struct wined3d_device *device, UINT idx, struct wined3d_sampler *sampler) diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index b2aacb3..d88d51d 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -463,7 +463,7 @@ void state_unbind_resources(struct wined3d_state *state) struct wined3d_texture *texture; struct wined3d_buffer *buffer; struct wined3d_shader *shader; - unsigned int i; + unsigned int i, j; if ((decl = state->vertex_declaration)) { @@ -511,14 +511,14 @@ void state_unbind_resources(struct wined3d_state *state) state->shader[i] = NULL; wined3d_shader_decref(shader); } - } - for (i = 0; i < MAX_CONSTANT_BUFFERS; ++i) - { - if ((buffer = state->vs_cb[i])) + for (j = 0; j < MAX_CONSTANT_BUFFERS; ++j) { - state->vs_cb[i] = NULL; - wined3d_buffer_decref(buffer); + if ((buffer = state->cb[i][j])) + { + state->cb[i][j] = NULL; + wined3d_buffer_decref(buffer); + } } } @@ -531,15 +531,6 @@ void state_unbind_resources(struct wined3d_state *state) } } - for (i = 0; i < MAX_CONSTANT_BUFFERS; ++i) - { - if ((buffer = state->gs_cb[i])) - { - state->gs_cb[i] = NULL; - wined3d_buffer_decref(buffer); - } - } - for (i = 0; i < MAX_SAMPLER_OBJECTS; ++i) { if ((sampler = state->gs_sampler[i])) @@ -557,15 +548,6 @@ void state_unbind_resources(struct wined3d_state *state) wined3d_sampler_decref(sampler); } } - - for (i = 0; i < MAX_CONSTANT_BUFFERS; ++i) - { - if ((buffer = state->ps_cb[i])) - { - state->ps_cb[i] = NULL; - wined3d_buffer_decref(buffer); - } - } } void state_cleanup(struct wined3d_state *state) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 60dce76..11c1864 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1818,17 +1818,15 @@ struct wined3d_state GLenum gl_primitive_type; struct wined3d_shader *shader[WINED3D_SHADER_TYPE_COUNT]; + struct wined3d_buffer *cb[WINED3D_SHADER_TYPE_COUNT][MAX_CONSTANT_BUFFERS]; - struct wined3d_buffer *vs_cb[MAX_CONSTANT_BUFFERS]; struct wined3d_sampler *vs_sampler[MAX_SAMPLER_OBJECTS]; BOOL vs_consts_b[MAX_CONST_B]; INT vs_consts_i[MAX_CONST_I * 4]; float *vs_consts_f; - struct wined3d_buffer *gs_cb[MAX_CONSTANT_BUFFERS]; struct wined3d_sampler *gs_sampler[MAX_SAMPLER_OBJECTS]; - struct wined3d_buffer *ps_cb[MAX_CONSTANT_BUFFERS]; struct wined3d_sampler *ps_sampler[MAX_SAMPLER_OBJECTS]; BOOL ps_consts_b[MAX_CONST_B]; INT ps_consts_i[MAX_CONST_I * 4];

1 0

Henri Verbeet : wined3d: Unify shader binding points.
by Alexandre Julliard 10 Oct '13

10 Oct '13

Module: wine Branch: master Commit: c228ffbaf0206e2563ec6167e5d6a3beb2617f8c URL: http://source.winehq.org/git/wine.git/?a=commit;h=c228ffbaf0206e2563ec6167e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Oct 9 22:57:45 2013 +0200 wined3d: Unify shader binding points. --- dlls/wined3d/arb_program_shader.c | 16 ++++++---- dlls/wined3d/context.c | 21 ++++++------- dlls/wined3d/cs.c | 58 ++++++------------------------------- dlls/wined3d/device.c | 30 +++++++++--------- dlls/wined3d/glsl_shader.c | 16 +++++----- dlls/wined3d/shader.c | 2 +- dlls/wined3d/state.c | 6 ++-- dlls/wined3d/stateblock.c | 54 +++++++++++++++------------------- dlls/wined3d/wined3d_private.h | 14 ++++----- 9 files changed, 84 insertions(+), 133 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c228ffbaf0206e2563ec6…

1 0

Frédéric Delanoy : wininet: Use BOOL type where appropriate.
by Alexandre Julliard 10 Oct '13

10 Oct '13

Module: wine Branch: master Commit: b4e4831d1ba34416230fc5bc516877efea2c93b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b4e4831d1ba34416230fc5bc5… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed Oct 9 22:36:49 2013 +0200 wininet: Use BOOL type where appropriate. --- dlls/wininet/ftp.c | 4 ++-- dlls/wininet/http.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wininet/ftp.c b/dlls/wininet/ftp.c index db64a17..837fcad 100644 --- a/dlls/wininet/ftp.c +++ b/dlls/wininet/ftp.c @@ -531,7 +531,7 @@ static BOOL FTP_FtpSetCurrentDirectoryW(ftp_session_t *lpwfs, LPCWSTR lpszDirect { INT nResCode; appinfo_t *hIC = NULL; - DWORD bSuccess = FALSE; + BOOL bSuccess = FALSE; TRACE("lpszDirectory(%s)\n", debugstr_w(lpszDirectory)); @@ -1046,7 +1046,7 @@ static BOOL FTP_FtpGetCurrentDirectoryW(ftp_session_t *lpwfs, LPWSTR lpszCurrent { INT nResCode; appinfo_t *hIC = NULL; - DWORD bSuccess = FALSE; + BOOL bSuccess = FALSE; /* Clear any error information */ INTERNET_SetLastError(0); diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index ec746cd..f7d6650 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -1451,7 +1451,7 @@ HINTERNET WINAPI HttpOpenRequestA(HINTERNET hHttpSession, { LPWSTR szVerb = NULL, szObjectName = NULL; LPWSTR szVersion = NULL, szReferrer = NULL, *szAcceptTypes = NULL; - HINTERNET rc = FALSE; + HINTERNET rc = NULL; TRACE("(%p, %s, %s, %s, %s, %p, %08x, %08lx)\n", hHttpSession, debugstr_a(lpszVerb), debugstr_a(lpszObjectName),

1 0

Frédéric Delanoy : gdi32: Use BOOL type where appropriate.
by Alexandre Julliard 10 Oct '13

10 Oct '13

Module: wine Branch: master Commit: 98e4c98eff99ce8bde5df4bffa909b5960f44586 URL: http://source.winehq.org/git/wine.git/?a=commit;h=98e4c98eff99ce8bde5df4bff… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed Oct 9 22:36:48 2013 +0200 gdi32: Use BOOL type where appropriate. --- dlls/gdi32/mapping.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/gdi32/mapping.c b/dlls/gdi32/mapping.c index 4220658..2699ca1 100644 --- a/dlls/gdi32/mapping.c +++ b/dlls/gdi32/mapping.c @@ -377,7 +377,7 @@ INT WINAPI SetMapMode( HDC hdc, INT mode ) */ BOOL WINAPI SetViewportExtEx( HDC hdc, INT x, INT y, LPSIZE size ) { - INT ret = FALSE; + BOOL ret = FALSE; DC * dc = get_dc_ptr( hdc ); if (dc) @@ -395,7 +395,7 @@ BOOL WINAPI SetViewportExtEx( HDC hdc, INT x, INT y, LPSIZE size ) */ BOOL WINAPI SetViewportOrgEx( HDC hdc, INT x, INT y, LPPOINT pt ) { - INT ret = FALSE; + BOOL ret = FALSE; DC * dc = get_dc_ptr( hdc ); if (dc) @@ -413,7 +413,7 @@ BOOL WINAPI SetViewportOrgEx( HDC hdc, INT x, INT y, LPPOINT pt ) */ BOOL WINAPI SetWindowExtEx( HDC hdc, INT x, INT y, LPSIZE size ) { - INT ret = FALSE; + BOOL ret = FALSE; DC * dc = get_dc_ptr( hdc ); if (dc) @@ -431,7 +431,7 @@ BOOL WINAPI SetWindowExtEx( HDC hdc, INT x, INT y, LPSIZE size ) */ BOOL WINAPI SetWindowOrgEx( HDC hdc, INT x, INT y, LPPOINT pt ) { - INT ret = FALSE; + BOOL ret = FALSE; DC * dc = get_dc_ptr( hdc ); if (dc) @@ -449,7 +449,7 @@ BOOL WINAPI SetWindowOrgEx( HDC hdc, INT x, INT y, LPPOINT pt ) */ BOOL WINAPI OffsetViewportOrgEx( HDC hdc, INT x, INT y, LPPOINT pt) { - INT ret = FALSE; + BOOL ret = FALSE; DC * dc = get_dc_ptr( hdc ); if (dc) @@ -467,7 +467,7 @@ BOOL WINAPI OffsetViewportOrgEx( HDC hdc, INT x, INT y, LPPOINT pt) */ BOOL WINAPI OffsetWindowOrgEx( HDC hdc, INT x, INT y, LPPOINT pt ) { - INT ret = FALSE; + BOOL ret = FALSE; DC * dc = get_dc_ptr( hdc ); if (dc) @@ -486,7 +486,7 @@ BOOL WINAPI OffsetWindowOrgEx( HDC hdc, INT x, INT y, LPPOINT pt ) BOOL WINAPI ScaleViewportExtEx( HDC hdc, INT xNum, INT xDenom, INT yNum, INT yDenom, LPSIZE size ) { - INT ret = FALSE; + BOOL ret = FALSE; DC * dc = get_dc_ptr( hdc ); if (dc) @@ -505,7 +505,7 @@ BOOL WINAPI ScaleViewportExtEx( HDC hdc, INT xNum, INT xDenom, BOOL WINAPI ScaleWindowExtEx( HDC hdc, INT xNum, INT xDenom, INT yNum, INT yDenom, LPSIZE size ) { - INT ret = FALSE; + BOOL ret = FALSE; DC * dc = get_dc_ptr( hdc ); if (dc)

1 0

Frédéric Delanoy : ddraw/tests: Use BOOL type where appropriate.
by Alexandre Julliard 10 Oct '13

10 Oct '13

Module: wine Branch: master Commit: 3d30fb881a2808df0113ad6899ae5871d920b0c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d30fb881a2808df0113ad689… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed Oct 9 22:36:47 2013 +0200 ddraw/tests: Use BOOL type where appropriate. --- dlls/ddraw/tests/d3d.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ddraw/tests/d3d.c b/dlls/ddraw/tests/d3d.c index 042d2d8..fcd72ee 100644 --- a/dlls/ddraw/tests/d3d.c +++ b/dlls/ddraw/tests/d3d.c @@ -1138,7 +1138,7 @@ static void Direct3D1Test(void) struct v_out out[sizeof(testverts) / sizeof(testverts[0])]; D3DHVERTEX outH[sizeof(testverts) / sizeof(testverts[0])]; D3DTRANSFORMDATA transformdata; - DWORD i = FALSE; + DWORD i = 0; /* Interface consistency check. */ hr = IDirect3DDevice_GetDirect3D(Direct3DDevice1, &Direct3D_alt);

1 0

← Newer
1
...
50
51
52
53
54
55
56
...
76
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 2013