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

Aric Stewart : usp10: Always use a SCRIPT_STATE and SCRIPT_CONTROL structure in ScriptStringAnalyse .
by Alexandre Julliard 24 Aug '11

24 Aug '11

Module: wine Branch: master Commit: 1ad1474be5705528a081295e461d3a39931ae96c URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ad1474be5705528a081295e4… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Aug 23 12:55:49 2011 -0500 usp10: Always use a SCRIPT_STATE and SCRIPT_CONTROL structure in ScriptStringAnalyse. --- dlls/usp10/usp10.c | 14 +++++++++++++- 1 files changed, 13 insertions(+), 1 deletions(-) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index 50de8bf..e6933bc 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -907,6 +907,8 @@ HRESULT WINAPI ScriptStringAnalyse(HDC hdc, const void *pString, int cString, { HRESULT hr = E_OUTOFMEMORY; StringAnalysis *analysis = NULL; + SCRIPT_CONTROL sControl; + SCRIPT_STATE sState; int i, num_items = 255; TRACE("(%p,%p,%d,%d,%d,0x%x,%d,%p,%p,%p,%p,%p,%p)\n", @@ -928,7 +930,17 @@ HRESULT WINAPI ScriptStringAnalyse(HDC hdc, const void *pString, int cString, analysis->clip_len = cString; analysis->hdc = hdc; - hr = ScriptItemize(pString, cString, num_items, psControl, psState, analysis->pItem, + if (psState) + sState = *psState; + else + memset(&sState, 0, sizeof(SCRIPT_STATE)); + + if (psControl) + sControl = *psControl; + else + memset(&sControl, 0, sizeof(SCRIPT_CONTROL)); + + hr = ScriptItemize(pString, cString, num_items, &sControl, &sState, analysis->pItem, &analysis->numItems); while (hr == E_OUTOFMEMORY)

1 0

Henri Verbeet : wined3d: Don't get rid of the user memory unless we' re actually called with NULL in surface_set_mem().
by Alexandre Julliard 24 Aug '11

24 Aug '11

Module: wine Branch: master Commit: 4b1ba0e02d62399298fcad276b7c6d9377937b1f URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b1ba0e02d62399298fcad276… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Aug 23 20:08:05 2011 +0200 wined3d: Don't get rid of the user memory unless we're actually called with NULL in surface_set_mem(). In particular, some applications will call surface_set_mem() with the same pointer to notify us the contents have changed. --- dlls/wined3d/surface.c | 16 ++++++++++------ 1 files changed, 10 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 1cafe03..17edbdc 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1783,17 +1783,21 @@ static HRESULT surface_set_mem(struct wined3d_surface *surface, void *mem) } else if (surface->flags & SFLAG_USERPTR) { - /* Map and GetDC will re-create the dib section and allocated memory. */ - surface->resource.allocatedMemory = NULL; /* HeapMemory should be NULL already. */ if (surface->resource.heapMemory) ERR("User pointer surface has heap memory allocated.\n"); - surface->flags &= ~(SFLAG_USERPTR | SFLAG_INSYSMEM); - if (surface->flags & SFLAG_CLIENT) - surface_release_client_storage(surface); + if (!mem) + { + surface->resource.allocatedMemory = NULL; + surface->flags &= ~(SFLAG_USERPTR | SFLAG_INSYSMEM); + + if (surface->flags & SFLAG_CLIENT) + surface_release_client_storage(surface); + + surface_prepare_system_memory(surface); + } - surface_prepare_system_memory(surface); surface_modify_location(surface, SFLAG_INSYSMEM, TRUE); }

1 0

Henri Verbeet : wined3d: Add a registry key to disable rendering swapchains onscreen.
by Alexandre Julliard 24 Aug '11

24 Aug '11

Module: wine Branch: master Commit: 620c81dc767004d3e7b84e6377facd5d451ed790 URL: http://source.winehq.org/git/wine.git/?a=commit;h=620c81dc767004d3e7b84e637… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Aug 23 20:08:06 2011 +0200 wined3d: Add a registry key to disable rendering swapchains onscreen. We'll probably want to make this default to TRUE at some point, but at least for the moment there still seem to be some performance advantages to rendering onscreen in most cases. --- dlls/wined3d/swapchain.c | 3 ++- dlls/wined3d/wined3d_main.c | 7 +++++++ dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 10 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 80e1f4c..6edb043 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -824,7 +824,8 @@ void swapchain_update_render_to_fbo(struct wined3d_swapchain *swapchain) swapchain->presentParms.BackBufferHeight, client_rect.right, client_rect.bottom); - if (swapchain->presentParms.BackBufferWidth == client_rect.right + if (!wined3d_settings.always_offscreen + && swapchain->presentParms.BackBufferWidth == client_rect.right && swapchain->presentParms.BackBufferHeight == client_rect.bottom) { TRACE("Backbuffer dimensions match window dimensions, rendering onscreen.\n"); diff --git a/dlls/wined3d/wined3d_main.c b/dlls/wined3d/wined3d_main.c index 7a0d4b6..06af5b1 100644 --- a/dlls/wined3d/wined3d_main.c +++ b/dlls/wined3d/wined3d_main.c @@ -86,6 +86,7 @@ struct wined3d_settings wined3d_settings = NULL, /* No wine logo by default */ FALSE, /* Disable multisampling for now due to Nvidia driver bugs which happens for some users */ FALSE, /* No strict draw ordering. */ + FALSE, /* Try to render onscreen by default. */ }; /* Do not call while under the GL lock. */ @@ -340,6 +341,12 @@ static BOOL wined3d_dll_init(HINSTANCE hInstDLL) TRACE("Enforcing strict draw ordering.\n"); wined3d_settings.strict_draw_ordering = TRUE; } + if (!get_config_key(hkey, appkey, "AlwaysOffscreen", buffer, size) + && !strcmp(buffer,"enabled")) + { + TRACE("Always rendering backbuffers offscreen.\n"); + wined3d_settings.always_offscreen = TRUE; + } } if (wined3d_settings.vs_mode == VS_HW) TRACE("Allow HW vertex shaders\n"); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 813b1ea..80517e3 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -271,6 +271,7 @@ struct wined3d_settings char *logo; int allow_multisampling; BOOL strict_draw_ordering; + BOOL always_offscreen; }; extern struct wined3d_settings wined3d_settings DECLSPEC_HIDDEN;

1 0

Henri Verbeet : wined3d: Set the current location to SFLAG_INTEXTURE instead of SFLAG_INDRAWABLE in wined3d_surface_depth_blt ().
by Alexandre Julliard 24 Aug '11

24 Aug '11

Module: wine Branch: master Commit: f73593c572088972f4e82b82d3849dfc0c288e4a URL: http://source.winehq.org/git/wine.git/?a=commit;h=f73593c572088972f4e82b82d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Aug 23 20:08:07 2011 +0200 wined3d: Set the current location to SFLAG_INTEXTURE instead of SFLAG_INDRAWABLE in wined3d_surface_depth_blt(). These currently end up being the same thing, but that will change soon. --- dlls/wined3d/surface.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 17edbdc..3cd424e 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1461,7 +1461,7 @@ static HRESULT wined3d_surface_depth_blt(struct wined3d_surface *src_surface, co surface_modify_ds_location(dst_surface, SFLAG_DS_OFFSCREEN, dst_surface->ds_current_size.cx, dst_surface->ds_current_size.cy); - surface_modify_location(dst_surface, SFLAG_INDRAWABLE, TRUE); + surface_modify_location(dst_surface, SFLAG_INTEXTURE, TRUE); return WINED3D_OK; }

1 0

Henri Verbeet : wined3d: Keep track of a surface's "draw location".
by Alexandre Julliard 24 Aug '11

24 Aug '11

Module: wine Branch: master Commit: e57b20c21508140f75fb9b791659cb066d3010bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=e57b20c21508140f75fb9b791… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Aug 23 20:08:08 2011 +0200 wined3d: Keep track of a surface's "draw location". --- dlls/wined3d/context.c | 1 + dlls/wined3d/device.c | 1 + dlls/wined3d/drawprim.c | 6 +++--- dlls/wined3d/surface.c | 9 +++++++++ dlls/wined3d/swapchain.c | 13 +++++++++++++ dlls/wined3d/wined3d_private.h | 3 +++ 6 files changed, 30 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 9a67536..42d26bc 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1930,6 +1930,7 @@ static void context_validate_onscreen_formats(struct wined3d_context *context, /* The currently active context is the necessary context to access the swapchain's onscreen buffers */ surface_load_location(context->current_rt, SFLAG_INTEXTURE, NULL); swapchain->render_to_fbo = TRUE; + swapchain_update_draw_bindings(swapchain); context_set_render_offscreen(context, TRUE); } diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 39219bf..cdc1827 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5880,6 +5880,7 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, stateblock_init_default_state(device->stateBlock); swapchain_update_render_to_fbo(swapchain); + swapchain_update_draw_bindings(swapchain); hr = create_primary_opengl_context(device, swapchain); wined3d_swapchain_decref(swapchain); diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index 5f2198e..ea2dd8f 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -591,8 +591,8 @@ void drawPrimitive(struct wined3d_device *device, UINT index_count, UINT StartId struct wined3d_surface *target = device->fb.render_targets[i]; if (target) { - surface_load_location(target, SFLAG_INDRAWABLE, NULL); - surface_modify_location(target, SFLAG_INDRAWABLE, TRUE); + surface_load_location(target, target->draw_binding, NULL); + surface_modify_location(target, target->draw_binding, TRUE); } } } @@ -638,7 +638,7 @@ void drawPrimitive(struct wined3d_device *device, UINT index_count, UINT StartId if (state->render_states[WINED3DRS_ZWRITEENABLE]) { surface_modify_ds_location(ds, location, ds->ds_current_size.cx, ds->ds_current_size.cy); - surface_modify_location(ds, SFLAG_INDRAWABLE, TRUE); + surface_modify_location(ds, ds->draw_binding, TRUE); } } } diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 3cd424e..cc581d2 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -100,6 +100,14 @@ static void surface_cleanup(struct wined3d_surface *surface) resource_cleanup(&surface->resource); } +void surface_update_draw_binding(struct wined3d_surface *surface) +{ + if (!surface_is_offscreen(surface) || wined3d_settings.offscreen_rendering_mode != ORM_FBO) + surface->draw_binding = SFLAG_INDRAWABLE; + else + surface->draw_binding = SFLAG_INTEXTURE; +} + void surface_set_container(struct wined3d_surface *surface, enum wined3d_container_type type, void *container) { TRACE("surface %p, container %p.\n", surface, container); @@ -131,6 +139,7 @@ void surface_set_container(struct wined3d_surface *surface, enum wined3d_contain surface->container.type = type; surface->container.u.base = container; + surface_update_draw_binding(surface); } struct blt_info diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 6edb043..20c2323 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -518,6 +518,7 @@ static HRESULT swapchain_gl_present(struct wined3d_swapchain *swapchain, const R surface_load_location(swapchain->back_buffers[0], SFLAG_INTEXTURE, NULL); surface_modify_location(swapchain->back_buffers[0], SFLAG_INDRAWABLE, FALSE); swapchain->render_to_fbo = TRUE; + swapchain_update_draw_bindings(swapchain); } if (swapchain->render_to_fbo) @@ -1245,3 +1246,15 @@ HDC swapchain_get_backup_dc(struct wined3d_swapchain *swapchain) return swapchain->backup_dc; } + +void swapchain_update_draw_bindings(struct wined3d_swapchain *swapchain) +{ + UINT i; + + surface_update_draw_binding(swapchain->front_buffer); + + for (i = 0; i < swapchain->presentParms.BackBufferCount; ++i) + { + surface_update_draw_binding(swapchain->back_buffers[i]); + } +} diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 80517e3..754d49e 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1996,6 +1996,7 @@ struct wined3d_surface struct wined3d_subresource_container container; struct wined3d_palette *palette; /* D3D7 style palette handling */ PALETTEENTRY *palette9; /* D3D8/9 style palette handling */ + DWORD draw_binding; DWORD flags; @@ -2080,6 +2081,7 @@ void surface_set_container(struct wined3d_surface *surface, void surface_set_texture_name(struct wined3d_surface *surface, GLuint name, BOOL srgb_name) DECLSPEC_HIDDEN; void surface_set_texture_target(struct wined3d_surface *surface, GLenum target) DECLSPEC_HIDDEN; void surface_translate_drawable_coords(const struct wined3d_surface *surface, HWND window, RECT *rect) DECLSPEC_HIDDEN; +void surface_update_draw_binding(struct wined3d_surface *surface) DECLSPEC_HIDDEN; void surface_upload_data(const struct wined3d_surface *surface, const struct wined3d_gl_info *gl_info, const struct wined3d_format *format, const RECT *src_rect, UINT src_w, const POINT *dst_point, BOOL srgb, const struct wined3d_bo_address *data) DECLSPEC_HIDDEN; @@ -2442,6 +2444,7 @@ void x11_copy_to_screen(const struct wined3d_swapchain *swapchain, const RECT *r struct wined3d_context *swapchain_get_context(struct wined3d_swapchain *swapchain) DECLSPEC_HIDDEN; void swapchain_destroy_contexts(struct wined3d_swapchain *swapchain) DECLSPEC_HIDDEN; HDC swapchain_get_backup_dc(struct wined3d_swapchain *swapchain) DECLSPEC_HIDDEN; +void swapchain_update_draw_bindings(struct wined3d_swapchain *swapchain) DECLSPEC_HIDDEN; void swapchain_update_render_to_fbo(struct wined3d_swapchain *swapchain) DECLSPEC_HIDDEN; #define DEFAULT_REFRESH_RATE 0

1 0

Lucas Fialho Zawacki : dinput: In BuildActionMap, don' t assign objects to actions mapped by an user.
by Alexandre Julliard 24 Aug '11

24 Aug '11

Module: wine Branch: master Commit: 4a2033934628a501347e5addf781503036f9056b URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a2033934628a501347e5addf… Author: Lucas Fialho Zawacki <lfzawacki(a)gmail.com> Date: Tue Aug 23 23:42:51 2011 -0300 dinput: In BuildActionMap, don't assign objects to actions mapped by an user. --- dlls/dinput/device.c | 3 +++ dlls/dinput/joystick.c | 3 +++ 2 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c index a2412b8..d2de525 100644 --- a/dlls/dinput/device.c +++ b/dlls/dinput/device.c @@ -605,6 +605,9 @@ HRESULT _build_action_map(LPDIRECTINPUTDEVICE8W iface, LPDIACTIONFORMATW lpdiaf, for (i=0; i < lpdiaf->dwNumActions; i++) { + /* Don't touch an user configured action */ + if (lpdiaf->rgoAction[i].dwHow == DIAH_USERCONFIG) continue; + if ((lpdiaf->rgoAction[i].dwSemantic & devMask) == devMask) { DWORD obj_id = semantic_to_obj_id(This, lpdiaf->rgoAction[i].dwSemantic); diff --git a/dlls/dinput/joystick.c b/dlls/dinput/joystick.c index c6bae98..779472d 100644 --- a/dlls/dinput/joystick.c +++ b/dlls/dinput/joystick.c @@ -445,6 +445,9 @@ HRESULT WINAPI JoystickWGenericImpl_BuildActionMap(LPDIRECTINPUTDEVICE8W iface, DWORD type = 0x000000ff & (lpdiaf->rgoAction[i].dwSemantic >> 8); DWORD genre = 0xff000000 & lpdiaf->rgoAction[i].dwSemantic; + /* Don't touch an user configured action */ + if (lpdiaf->rgoAction[i].dwHow == DIAH_USERCONFIG) continue; + /* Only consider actions of the right genre */ if (lpdiaf->dwGenre != genre && genre != DIGENRE_ANY) continue;

1 0

Lucas Fialho Zawacki : dinput: Free previous action map in SetActionMap.
by Alexandre Julliard 24 Aug '11

24 Aug '11

Module: wine Branch: master Commit: 7e3d51b7c61871eac8e7406c00d42793a3b1beec URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e3d51b7c61871eac8e7406c0… Author: Lucas Fialho Zawacki <lfzawacki(a)gmail.com> Date: Tue Aug 23 23:42:52 2011 -0300 dinput: Free previous action map in SetActionMap. --- dlls/dinput/device.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c index d2de525..ead1052 100644 --- a/dlls/dinput/device.c +++ b/dlls/dinput/device.c @@ -674,6 +674,7 @@ HRESULT _set_action_map(LPDIRECTINPUTDEVICE8W iface, LPDIACTIONFORMATW lpdiaf, L data_format.rgodf = (LPDIOBJECTDATAFORMAT)obj_df; data_format.dwNumObjs = num_actions; + HeapFree(GetProcessHeap(), 0, This->action_map); This->action_map = HeapAlloc(GetProcessHeap(), 0, sizeof(ActionMap)*num_actions); for (i = 0; i < lpdiaf->dwNumActions; i++)

1 0

Lucas Fialho Zawacki : dinput: Proper conversion of username parameters for Set and BuildActionMap.
by Alexandre Julliard 24 Aug '11

24 Aug '11

Module: wine Branch: master Commit: 64c1f4778c339f8cb77f4ba03a99465b0f983715 URL: http://source.winehq.org/git/wine.git/?a=commit;h=64c1f4778c339f8cb77f4ba03… Author: Lucas Fialho Zawacki <lfzawacki(a)gmail.com> Date: Tue Aug 23 23:42:53 2011 -0300 dinput: Proper conversion of username parameters for Set and BuildActionMap. --- dlls/dinput/joystick.c | 24 ++++++++++++++++++++++-- dlls/dinput/keyboard.c | 24 ++++++++++++++++++++++-- dlls/dinput/mouse.c | 24 ++++++++++++++++++++++-- 3 files changed, 66 insertions(+), 6 deletions(-) diff --git a/dlls/dinput/joystick.c b/dlls/dinput/joystick.c index 779472d..8dd1566 100644 --- a/dlls/dinput/joystick.c +++ b/dlls/dinput/joystick.c @@ -486,14 +486,24 @@ HRESULT WINAPI JoystickAGenericImpl_BuildActionMap(LPDIRECTINPUTDEVICE8A iface, JoystickGenericImpl *This = impl_from_IDirectInputDevice8A(iface); DIACTIONFORMATW diafW; HRESULT hr; + WCHAR *lpszUserNameW = NULL; + int username_size; diafW.rgoAction = HeapAlloc(GetProcessHeap(), 0, sizeof(DIACTIONW)*lpdiaf->dwNumActions); _copy_diactionformatAtoW(&diafW, lpdiaf); - hr = JoystickWGenericImpl_BuildActionMap(&This->base.IDirectInputDevice8W_iface, &diafW, NULL, dwFlags); + if (lpszUserName != NULL) + { + username_size = MultiByteToWideChar(CP_ACP, 0, lpszUserName, -1, NULL, 0); + lpszUserNameW = HeapAlloc(GetProcessHeap(), 0, sizeof(WCHAR)*username_size); + MultiByteToWideChar(CP_ACP, 0, lpszUserName, -1, lpszUserNameW, username_size); + } + + hr = JoystickWGenericImpl_BuildActionMap(&This->base.IDirectInputDevice8W_iface, &diafW, lpszUserNameW, dwFlags); _copy_diactionformatWtoA(lpdiaf, &diafW); HeapFree(GetProcessHeap(), 0, diafW.rgoAction); + HeapFree(GetProcessHeap(), 0, lpszUserNameW); return hr; } @@ -518,13 +528,23 @@ HRESULT WINAPI JoystickAGenericImpl_SetActionMap(LPDIRECTINPUTDEVICE8A iface, JoystickGenericImpl *This = impl_from_IDirectInputDevice8A(iface); DIACTIONFORMATW diafW; HRESULT hr; + WCHAR *lpszUserNameW = NULL; + int username_size; diafW.rgoAction = HeapAlloc(GetProcessHeap(), 0, sizeof(DIACTIONW)*lpdiaf->dwNumActions); _copy_diactionformatAtoW(&diafW, lpdiaf); - hr = JoystickWGenericImpl_SetActionMap(&This->base.IDirectInputDevice8W_iface, &diafW, NULL, dwFlags); + if (lpszUserName != NULL) + { + username_size = MultiByteToWideChar(CP_ACP, 0, lpszUserName, -1, NULL, 0); + lpszUserNameW = HeapAlloc(GetProcessHeap(), 0, sizeof(WCHAR)*username_size); + MultiByteToWideChar(CP_ACP, 0, lpszUserName, -1, lpszUserNameW, username_size); + } + + hr = JoystickWGenericImpl_SetActionMap(&This->base.IDirectInputDevice8W_iface, &diafW, lpszUserNameW, dwFlags); HeapFree(GetProcessHeap(), 0, diafW.rgoAction); + HeapFree(GetProcessHeap(), 0, lpszUserNameW); return hr; } diff --git a/dlls/dinput/keyboard.c b/dlls/dinput/keyboard.c index cade73f..4de8692 100644 --- a/dlls/dinput/keyboard.c +++ b/dlls/dinput/keyboard.c @@ -542,14 +542,24 @@ static HRESULT WINAPI SysKeyboardAImpl_BuildActionMap(LPDIRECTINPUTDEVICE8A ifac SysKeyboardImpl *This = impl_from_IDirectInputDevice8A(iface); DIACTIONFORMATW diafW; HRESULT hr; + WCHAR *lpszUserNameW = NULL; + int username_size; diafW.rgoAction = HeapAlloc(GetProcessHeap(), 0, sizeof(DIACTIONW)*lpdiaf->dwNumActions); _copy_diactionformatAtoW(&diafW, lpdiaf); - hr = SysKeyboardWImpl_BuildActionMap(&This->base.IDirectInputDevice8W_iface, &diafW, NULL, dwFlags); + if (lpszUserName != NULL) + { + username_size = MultiByteToWideChar(CP_ACP, 0, lpszUserName, -1, NULL, 0); + lpszUserNameW = HeapAlloc(GetProcessHeap(), 0, sizeof(WCHAR)*username_size); + MultiByteToWideChar(CP_ACP, 0, lpszUserName, -1, lpszUserNameW, username_size); + } + + hr = SysKeyboardWImpl_BuildActionMap(&This->base.IDirectInputDevice8W_iface, &diafW, lpszUserNameW, dwFlags); _copy_diactionformatWtoA(lpdiaf, &diafW); HeapFree(GetProcessHeap(), 0, diafW.rgoAction); + HeapFree(GetProcessHeap(), 0, lpszUserNameW); return hr; } @@ -572,13 +582,23 @@ static HRESULT WINAPI SysKeyboardAImpl_SetActionMap(LPDIRECTINPUTDEVICE8A iface, SysKeyboardImpl *This = impl_from_IDirectInputDevice8A(iface); DIACTIONFORMATW diafW; HRESULT hr; + WCHAR *lpszUserNameW = NULL; + int username_size; diafW.rgoAction = HeapAlloc(GetProcessHeap(), 0, sizeof(DIACTIONW)*lpdiaf->dwNumActions); _copy_diactionformatAtoW(&diafW, lpdiaf); - hr = SysKeyboardWImpl_SetActionMap(&This->base.IDirectInputDevice8W_iface, &diafW, NULL, dwFlags); + if (lpszUserName != NULL) + { + username_size = MultiByteToWideChar(CP_ACP, 0, lpszUserName, -1, NULL, 0); + lpszUserNameW = HeapAlloc(GetProcessHeap(), 0, sizeof(WCHAR)*username_size); + MultiByteToWideChar(CP_ACP, 0, lpszUserName, -1, lpszUserNameW, username_size); + } + + hr = SysKeyboardWImpl_SetActionMap(&This->base.IDirectInputDevice8W_iface, &diafW, lpszUserNameW, dwFlags); HeapFree(GetProcessHeap(), 0, diafW.rgoAction); + HeapFree(GetProcessHeap(), 0, lpszUserNameW); return hr; } diff --git a/dlls/dinput/mouse.c b/dlls/dinput/mouse.c index c362c3d..011deb0 100644 --- a/dlls/dinput/mouse.c +++ b/dlls/dinput/mouse.c @@ -791,14 +791,24 @@ static HRESULT WINAPI SysMouseAImpl_BuildActionMap(LPDIRECTINPUTDEVICE8A iface, SysMouseImpl *This = impl_from_IDirectInputDevice8A(iface); DIACTIONFORMATW diafW; HRESULT hr; + WCHAR *lpszUserNameW = NULL; + int username_size; diafW.rgoAction = HeapAlloc(GetProcessHeap(), 0, sizeof(DIACTIONW)*lpdiaf->dwNumActions); _copy_diactionformatAtoW(&diafW, lpdiaf); - hr = SysMouseWImpl_BuildActionMap(&This->base.IDirectInputDevice8W_iface, &diafW, NULL, dwFlags); + if (lpszUserName != NULL) + { + username_size = MultiByteToWideChar(CP_ACP, 0, lpszUserName, -1, NULL, 0); + lpszUserNameW = HeapAlloc(GetProcessHeap(), 0, sizeof(WCHAR)*username_size); + MultiByteToWideChar(CP_ACP, 0, lpszUserName, -1, lpszUserNameW, username_size); + } + + hr = SysMouseWImpl_BuildActionMap(&This->base.IDirectInputDevice8W_iface, &diafW, lpszUserNameW, dwFlags); _copy_diactionformatWtoA(lpdiaf, &diafW); HeapFree(GetProcessHeap(), 0, diafW.rgoAction); + HeapFree(GetProcessHeap(), 0, lpszUserNameW); return hr; } @@ -821,13 +831,23 @@ static HRESULT WINAPI SysMouseAImpl_SetActionMap(LPDIRECTINPUTDEVICE8A iface, SysMouseImpl *This = impl_from_IDirectInputDevice8A(iface); DIACTIONFORMATW diafW; HRESULT hr; + WCHAR *lpszUserNameW = NULL; + int username_size; diafW.rgoAction = HeapAlloc(GetProcessHeap(), 0, sizeof(DIACTIONW)*lpdiaf->dwNumActions); _copy_diactionformatAtoW(&diafW, lpdiaf); - hr = SysMouseWImpl_SetActionMap(&This->base.IDirectInputDevice8W_iface, &diafW, NULL, dwFlags); + if (lpszUserName != NULL) + { + username_size = MultiByteToWideChar(CP_ACP, 0, lpszUserName, -1, NULL, 0); + lpszUserNameW = HeapAlloc(GetProcessHeap(), 0, sizeof(WCHAR)*username_size); + MultiByteToWideChar(CP_ACP, 0, lpszUserName, -1, lpszUserNameW, username_size); + } + + hr = SysMouseWImpl_SetActionMap(&This->base.IDirectInputDevice8W_iface, &diafW, lpszUserNameW, dwFlags); HeapFree(GetProcessHeap(), 0, diafW.rgoAction); + HeapFree(GetProcessHeap(), 0, lpszUserNameW); return hr; }

1 0

Jörg Höhle : mmdevapi: After GetBuffer, refuse Reset, but Start/Stop is ok.
by Alexandre Julliard 24 Aug '11

24 Aug '11

Module: wine Branch: master Commit: 541075c3db2829031d783e54aaa1b639fb23155b URL: http://source.winehq.org/git/wine.git/?a=commit;h=541075c3db2829031d783e54a… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Wed Aug 10 18:07:51 2011 +0200 mmdevapi: After GetBuffer, refuse Reset, but Start/Stop is ok. --- dlls/winealsa.drv/mmdevdrv.c | 5 +++++ dlls/winecoreaudio.drv/mmdevdrv.c | 5 +++++ dlls/wineoss.drv/mmdevdrv.c | 5 +++++ 3 files changed, 15 insertions(+), 0 deletions(-) diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index 8ea2f09..01fe4fd 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -1753,6 +1753,11 @@ static HRESULT WINAPI AudioClient_Reset(IAudioClient *iface) return AUDCLNT_E_NOT_STOPPED; } + if(This->buf_state != NOT_LOCKED){ + LeaveCriticalSection(&This->lock); + return AUDCLNT_E_BUFFER_OPERATION_PENDING; + } + This->held_frames = 0; This->written_frames = 0; This->lcl_offs_frames = 0; diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c index fcb337d..8311a29 100644 --- a/dlls/winecoreaudio.drv/mmdevdrv.c +++ b/dlls/winecoreaudio.drv/mmdevdrv.c @@ -1391,6 +1391,11 @@ static HRESULT WINAPI AudioClient_Reset(IAudioClient *iface) return AUDCLNT_E_NOT_STOPPED; } + if(This->getbuf_last){ + OSSpinLockUnlock(&This->lock); + return AUDCLNT_E_BUFFER_OPERATION_PENDING; + } + This->written_frames = 0; hr = AudioClock_GetPosition_nolock(This, &This->last_time, NULL, TRUE); diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index f962f8a..0e44842 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -1379,6 +1379,11 @@ static HRESULT WINAPI AudioClient_Reset(IAudioClient *iface) return AUDCLNT_E_NOT_STOPPED; } + if(This->buf_state != NOT_LOCKED){ + LeaveCriticalSection(&This->lock); + return AUDCLNT_E_BUFFER_OPERATION_PENDING; + } + This->written_frames = 0; This->inbuf_frames = 0; This->held_frames = 0;

1 0

Stefan Dösinger : wined3d: Call glFlush after updating a buffer.
by Alexandre Julliard 24 Aug '11

24 Aug '11

Module: wine Branch: master Commit: 5d1d07abcf3deab4397a0008ae8c44493a721c6a URL: http://source.winehq.org/git/wine.git/?a=commit;h=5d1d07abcf3deab4397a0008a… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun Aug 7 23:43:13 2011 +0200 wined3d: Call glFlush after updating a buffer. --- dlls/wined3d/buffer.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index ae04138..45518cc 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -1166,6 +1166,7 @@ void CDECL wined3d_buffer_unmap(struct wined3d_buffer *buffer) GL_EXTCALL(glUnmapBufferARB(buffer->buffer_type_hint)); LEAVE_GL(); + if (wined3d_settings.strict_draw_ordering) wglFlush(); /* Flush to ensure ordering across contexts. */ context_release(context); buffer->resource.allocatedMemory = NULL;

1 0