March 2016 - Wine-commits - list.winehq.org

Stefan Dösinger : wined3d: Merge surface_prepare_buffer() and wined3d_volume_prepare_pbo().
by Alexandre Julliard 03 Mar '16

03 Mar '16

Module: wine Branch: master Commit: 87143e60ed5708b976754da872f7643ce0982172 URL: http://source.winehq.org/git/wine.git/?a=commit;h=87143e60ed5708b976754da87… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Mar 2 19:24:20 2016 +0100 wined3d: Merge surface_prepare_buffer() and wined3d_volume_prepare_pbo(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 44 ++++++++---------------------------------- dlls/wined3d/texture.c | 21 ++++++++++++++++++++ dlls/wined3d/volume.c | 20 +------------------ dlls/wined3d/wined3d_private.h | 2 ++ 4 files changed, 32 insertions(+), 55 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 208c254..3cd3782 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -489,40 +489,6 @@ static void surface_get_memory(const struct wined3d_surface *surface, struct win data->buffer_object = 0; } -static void surface_prepare_buffer(struct wined3d_surface *surface) -{ - struct wined3d_context *context; - GLuint *buffer_object; - GLenum error; - const struct wined3d_gl_info *gl_info; - - buffer_object = &surface->container->sub_resources[surface_get_sub_resource_idx(surface)].buffer_object; - if (*buffer_object) - return; - - context = context_acquire(surface->resource.device, NULL); - gl_info = context->gl_info; - - GL_EXTCALL(glGenBuffers(1, buffer_object)); - error = gl_info->gl_ops.gl.p_glGetError(); - if (!*buffer_object || error != GL_NO_ERROR) - ERR("Failed to create a PBO with error %s (%#x).\n", debug_glerror(error), error); - - TRACE("Binding PBO %u.\n", *buffer_object); - - GL_EXTCALL(glBindBuffer(GL_PIXEL_UNPACK_BUFFER, *buffer_object)); - checkGLcall("glBindBuffer"); - - GL_EXTCALL(glBufferData(GL_PIXEL_UNPACK_BUFFER, surface->resource.size + 4, - NULL, GL_STREAM_DRAW)); - checkGLcall("glBufferData"); - - GL_EXTCALL(glBindBuffer(GL_PIXEL_UNPACK_BUFFER, 0)); - checkGLcall("glBindBuffer"); - - context_release(context); -} - static void surface_prepare_system_memory(struct wined3d_surface *surface) { TRACE("surface %p.\n", surface); @@ -541,6 +507,9 @@ static void surface_prepare_system_memory(struct wined3d_surface *surface) void surface_prepare_map_memory(struct wined3d_surface *surface) { + struct wined3d_texture *texture = surface->container; + struct wined3d_context *context; + switch (surface->resource.map_binding) { case WINED3D_LOCATION_SYSMEM: @@ -548,7 +517,7 @@ void surface_prepare_map_memory(struct wined3d_surface *surface) break; case WINED3D_LOCATION_USER_MEMORY: - if (!surface->container->user_memory) + if (!texture->user_memory) ERR("Map binding is set to WINED3D_LOCATION_USER_MEMORY but surface->user_memory is NULL.\n"); break; @@ -558,7 +527,10 @@ void surface_prepare_map_memory(struct wined3d_surface *surface) break; case WINED3D_LOCATION_BUFFER: - surface_prepare_buffer(surface); + context = context_acquire(texture->resource.device, NULL); + wined3d_texture_prepare_buffer_object(texture, + surface_get_sub_resource_idx(surface), context->gl_info); + context_release(context); break; default: diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index a8e9194..9846f07 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -690,6 +690,27 @@ HRESULT CDECL wined3d_texture_update_desc(struct wined3d_texture *texture, UINT return wined3d_surface_update_desc(surface, gl_info); } +/* Context activation is done by the caller. */ +void wined3d_texture_prepare_buffer_object(struct wined3d_texture *texture, + unsigned int sub_resource_idx, const struct wined3d_gl_info *gl_info) +{ + GLuint *buffer_object; + + buffer_object = &texture->sub_resources[sub_resource_idx].buffer_object; + if (*buffer_object) + return; + + GL_EXTCALL(glGenBuffers(1, buffer_object)); + GL_EXTCALL(glBindBuffer(GL_PIXEL_UNPACK_BUFFER, *buffer_object)); + GL_EXTCALL(glBufferData(GL_PIXEL_UNPACK_BUFFER, + texture->sub_resources[sub_resource_idx].resource->size, NULL, GL_STREAM_DRAW)); + GL_EXTCALL(glBindBuffer(GL_PIXEL_UNPACK_BUFFER, 0)); + checkGLcall("Create buffer object"); + + TRACE("Created buffer object %u for texture %p, sub-resource %u.\n", + *buffer_object, texture, sub_resource_idx); +} + void wined3d_texture_prepare_texture(struct wined3d_texture *texture, struct wined3d_context *context, BOOL srgb) { DWORD alloc_flag = srgb ? WINED3D_TEXTURE_SRGB_ALLOCATED : WINED3D_TEXTURE_RGB_ALLOCATED; diff --git a/dlls/wined3d/volume.c b/dlls/wined3d/volume.c index ef0d69b..fcadd39 100644 --- a/dlls/wined3d/volume.c +++ b/dlls/wined3d/volume.c @@ -362,24 +362,6 @@ void wined3d_volume_load(struct wined3d_volume *volume, struct wined3d_context * srgb_mode ? WINED3D_LOCATION_TEXTURE_SRGB : WINED3D_LOCATION_TEXTURE_RGB); } -/* Context activation is done by the caller. */ -static void wined3d_volume_prepare_pbo(struct wined3d_volume *volume, struct wined3d_context *context) -{ - GLuint *buffer_object = &volume->container->sub_resources[volume->texture_level].buffer_object; - const struct wined3d_gl_info *gl_info = context->gl_info; - - if (*buffer_object) - return; - - GL_EXTCALL(glGenBuffers(1, buffer_object)); - GL_EXTCALL(glBindBuffer(GL_PIXEL_UNPACK_BUFFER, *buffer_object)); - GL_EXTCALL(glBufferData(GL_PIXEL_UNPACK_BUFFER, volume->resource.size, NULL, GL_STREAM_DRAW)); - GL_EXTCALL(glBindBuffer(GL_PIXEL_UNPACK_BUFFER, 0)); - checkGLcall("Create PBO"); - - TRACE("Created PBO %u for volume %p.\n", *buffer_object, volume); -} - static void wined3d_volume_free_pbo(struct wined3d_volume *volume) { GLuint *buffer_object = &volume->container->sub_resources[volume->texture_level].buffer_object; @@ -506,7 +488,7 @@ HRESULT wined3d_volume_map(struct wined3d_volume *volume, context = context_acquire(device, NULL); gl_info = context->gl_info; - wined3d_volume_prepare_pbo(volume, context); + wined3d_texture_prepare_buffer_object(texture, volume->texture_level, gl_info); if (flags & WINED3D_MAP_DISCARD) wined3d_volume_validate_location(volume, WINED3D_LOCATION_BUFFER); else diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 468ff11..28121b7 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2420,6 +2420,8 @@ struct wined3d_resource *wined3d_texture_get_sub_resource(const struct wined3d_t UINT sub_resource_idx) DECLSPEC_HIDDEN; void wined3d_texture_load(struct wined3d_texture *texture, struct wined3d_context *context, BOOL srgb) DECLSPEC_HIDDEN; +void wined3d_texture_prepare_buffer_object(struct wined3d_texture *texture, + unsigned int sub_resource_idx, const struct wined3d_gl_info *gl_info) DECLSPEC_HIDDEN; void wined3d_texture_prepare_texture(struct wined3d_texture *texture, struct wined3d_context *context, BOOL srgb) DECLSPEC_HIDDEN; void wined3d_texture_set_dirty(struct wined3d_texture *texture) DECLSPEC_HIDDEN;

1 0

Stefan Dösinger : wined3d: Merge surface_remove_pbo() and wined3d_volume_free_pbo().
by Alexandre Julliard 03 Mar '16

03 Mar '16

Module: wine Branch: master Commit: 5141c082caabd0f18698fe611b57e885adf25fe7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5141c082caabd0f18698fe611… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Mar 2 19:24:21 2016 +0100 wined3d: Merge surface_remove_pbo() and wined3d_volume_free_pbo(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 19 +------------------ dlls/wined3d/texture.c | 27 +++++++++++++++++++++++++++ dlls/wined3d/volume.c | 22 ---------------------- dlls/wined3d/wined3d_private.h | 2 ++ 4 files changed, 30 insertions(+), 40 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 3cd3782..469a493 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -996,19 +996,6 @@ static HRESULT wined3d_surface_depth_blt(struct wined3d_surface *src_surface, DW return WINED3D_OK; } -/* Context activation is done by the caller. */ -static void surface_remove_pbo(struct wined3d_surface *surface, const struct wined3d_gl_info *gl_info) -{ - GLuint *buffer_object; - - buffer_object = &surface->container->sub_resources[surface_get_sub_resource_idx(surface)].buffer_object; - GL_EXTCALL(glDeleteBuffers(1, buffer_object)); - checkGLcall("glDeleteBuffers(1, buffer_object)"); - - *buffer_object = 0; - surface_invalidate_location(surface, WINED3D_LOCATION_BUFFER); -} - static ULONG surface_resource_incref(struct wined3d_resource *resource) { struct wined3d_surface *surface = surface_from_resource(resource); @@ -1071,10 +1058,6 @@ static void surface_unload(struct wined3d_resource *resource) surface_invalidate_location(surface, ~surface->resource.map_binding); } - /* Destroy PBOs, but load them into real sysmem before */ - if (surface->container->sub_resources[surface_get_sub_resource_idx(surface)].buffer_object) - surface_remove_pbo(surface, gl_info); - /* Destroy fbo render buffers. This is needed for implicit render targets, for * all application-created targets the application has to release the surface * before calling _Reset @@ -3681,7 +3664,7 @@ static HRESULT surface_load_texture(struct wined3d_surface *surface, surface_prepare_map_memory(surface); surface_load_location(surface, context, surface->resource.map_binding); - surface_remove_pbo(surface, gl_info); + wined3d_texture_remove_buffer_object(texture, surface_get_sub_resource_idx(surface), gl_info); } surface_get_memory(surface, &data, surface->locations); diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 9846f07..90a3978 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -74,6 +74,23 @@ static HRESULT wined3d_texture_init(struct wined3d_texture *texture, const struc return WINED3D_OK; } +/* Context activation is done by the caller. */ +void wined3d_texture_remove_buffer_object(struct wined3d_texture *texture, + unsigned int sub_resource_idx, const struct wined3d_gl_info *gl_info) +{ + GLuint *buffer_object; + + buffer_object = &texture->sub_resources[sub_resource_idx].buffer_object; + GL_EXTCALL(glDeleteBuffers(1, buffer_object)); + checkGLcall("glDeleteBuffers"); + texture->texture_ops->texture_sub_resource_invalidate_location( + texture->sub_resources[sub_resource_idx].resource, WINED3D_LOCATION_BUFFER); + *buffer_object = 0; + + TRACE("Deleted buffer object %u for texture %p, sub-resource %u.\n", + *buffer_object, texture, sub_resource_idx); +} + /* A GL context is provided by the caller */ static void gltexture_delete(struct wined3d_device *device, const struct wined3d_gl_info *gl_info, struct gl_texture *tex) @@ -979,6 +996,7 @@ static void wined3d_texture_unload(struct wined3d_resource *resource) { struct wined3d_texture *texture = wined3d_texture_from_resource(resource); UINT sub_count = texture->level_count * texture->layer_count; + struct wined3d_context *context = NULL; UINT i; TRACE("texture %p.\n", texture); @@ -988,7 +1006,16 @@ static void wined3d_texture_unload(struct wined3d_resource *resource) struct wined3d_resource *sub_resource = texture->sub_resources[i].resource; sub_resource->resource_ops->resource_unload(sub_resource); + + if (texture->sub_resources[i].buffer_object) + { + if (!context) + context = context_acquire(texture->resource.device, NULL); + wined3d_texture_remove_buffer_object(texture, i, context->gl_info); + } } + if (context) + context_release(context); wined3d_texture_force_reload(texture); wined3d_texture_unload_gl_texture(texture); diff --git a/dlls/wined3d/volume.c b/dlls/wined3d/volume.c index fcadd39..2d88af6 100644 --- a/dlls/wined3d/volume.c +++ b/dlls/wined3d/volume.c @@ -362,19 +362,6 @@ void wined3d_volume_load(struct wined3d_volume *volume, struct wined3d_context * srgb_mode ? WINED3D_LOCATION_TEXTURE_SRGB : WINED3D_LOCATION_TEXTURE_RGB); } -static void wined3d_volume_free_pbo(struct wined3d_volume *volume) -{ - GLuint *buffer_object = &volume->container->sub_resources[volume->texture_level].buffer_object; - struct wined3d_context *context = context_acquire(volume->resource.device, NULL); - const struct wined3d_gl_info *gl_info = context->gl_info; - - TRACE("Deleting PBO %u belonging to volume %p.\n", *buffer_object, volume); - GL_EXTCALL(glDeleteBuffers(1, buffer_object)); - checkGLcall("glDeleteBuffers"); - *buffer_object = 0; - context_release(context); -} - void wined3d_volume_cleanup(struct wined3d_volume *volume) { TRACE("volume %p.\n", volume); @@ -407,15 +394,6 @@ static void volume_unload(struct wined3d_resource *resource) wined3d_volume_invalidate_location(volume, ~WINED3D_LOCATION_DISCARDED); } - if (volume->container->sub_resources[volume->texture_level].buffer_object) - { - /* Should not happen because only dynamic default pool volumes - * have a buffer, and those are not evicted by device_evit_managed_resources - * and must be freed before a non-ex device reset. */ - ERR("Unloading a volume with a buffer\n"); - wined3d_volume_free_pbo(volume); - } - /* The texture name is managed by the container. */ resource_unload(resource); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 28121b7..da36985 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2424,6 +2424,8 @@ void wined3d_texture_prepare_buffer_object(struct wined3d_texture *texture, unsigned int sub_resource_idx, const struct wined3d_gl_info *gl_info) DECLSPEC_HIDDEN; void wined3d_texture_prepare_texture(struct wined3d_texture *texture, struct wined3d_context *context, BOOL srgb) DECLSPEC_HIDDEN; +void wined3d_texture_remove_buffer_object(struct wined3d_texture *texture, + unsigned int sub_resource_idx, const struct wined3d_gl_info *gl_info) DECLSPEC_HIDDEN; void wined3d_texture_set_dirty(struct wined3d_texture *texture) DECLSPEC_HIDDEN; void wined3d_texture_set_swapchain(struct wined3d_texture *texture, struct wined3d_swapchain *swapchain) DECLSPEC_HIDDEN;

1 0

Jacek Caban : user32: Use proper window as dialog owner.
by Alexandre Julliard 03 Mar '16

03 Mar '16

Module: wine Branch: master Commit: 0d7116b968edae3f5912112bda436df8924911fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d7116b968edae3f5912112bd… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 2 15:04:24 2016 +0100 user32: Use proper window as dialog owner. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/dialog.c | 74 +++++++++++++++++++--------------------------------- 1 file changed, 27 insertions(+), 47 deletions(-) diff --git a/dlls/user32/dialog.c b/dlls/user32/dialog.c index f3c8289..180ab3d 100644 --- a/dlls/user32/dialog.c +++ b/dlls/user32/dialog.c @@ -104,43 +104,6 @@ const struct builtin_class_descr DIALOG_builtin_class = /*********************************************************************** - * DIALOG_EnableOwner - * - * Helper function for modal dialogs to enable again the - * owner of the dialog box. - */ -static void DIALOG_EnableOwner( HWND hOwner ) -{ - /* Owner must be a top-level window */ - if (hOwner) - hOwner = GetAncestor( hOwner, GA_ROOT ); - if (!hOwner) return; - EnableWindow( hOwner, TRUE ); -} - - -/*********************************************************************** - * DIALOG_DisableOwner - * - * Helper function for modal dialogs to disable the - * owner of the dialog box. Returns TRUE if owner was enabled. - */ -static BOOL DIALOG_DisableOwner( HWND hOwner ) -{ - /* Owner must be a top-level window */ - if (hOwner) - hOwner = GetAncestor( hOwner, GA_ROOT ); - if (!hOwner) return FALSE; - if (IsWindowEnabled( hOwner )) - { - EnableWindow( hOwner, FALSE ); - return TRUE; - } - else - return FALSE; -} - -/*********************************************************************** * DIALOG_GetControl32 * * Return the class and text of the control pointed to by ptr, @@ -491,7 +454,7 @@ static HWND DIALOG_CreateIndirect( HINSTANCE hInst, LPCVOID dlgTemplate, DLG_TEMPLATE template; DIALOGINFO * dlgInfo; DWORD units = GetDialogBaseUnits(); - BOOL ownerEnabled = TRUE; + HWND disabled_owner = NULL; HMENU hMenu = 0; HFONT hUserFont = 0; UINT flags = 0; @@ -621,10 +584,27 @@ static HWND DIALOG_CreateIndirect( HINSTANCE hInst, LPCVOID dlgTemplate, } } - if (modal) + if (modal && owner) { - ownerEnabled = DIALOG_DisableOwner( owner ); - if (ownerEnabled) flags |= DF_OWNERENABLED; + HWND parent; + disabled_owner = owner; + /* + * Owner needs to be top level window. We need to duplicate the logic from server, + * because we need to disable it before creating dialog window. + */ + while ((GetWindowLongW( disabled_owner, GWL_STYLE ) & (WS_POPUP|WS_CHILD)) == WS_CHILD) + { + parent = GetParent( disabled_owner ); + if (!parent || parent == GetDesktopWindow()) break; + disabled_owner = parent; + } + if (IsWindowEnabled( disabled_owner )) + { + flags |= DF_OWNERENABLED; + EnableWindow( disabled_owner, FALSE ); + } + else + disabled_owner = NULL; } if (unicode) @@ -665,7 +645,7 @@ static HWND DIALOG_CreateIndirect( HINSTANCE hInst, LPCVOID dlgTemplate, { if (hUserFont) DeleteObject( hUserFont ); if (hMenu) DestroyMenu( hMenu ); - if (modal && (flags & DF_OWNERENABLED)) DIALOG_EnableOwner(owner); + if (disabled_owner) EnableWindow( disabled_owner, TRUE ); return 0; } @@ -721,7 +701,7 @@ static HWND DIALOG_CreateIndirect( HINSTANCE hInst, LPCVOID dlgTemplate, } return hwnd; } - if (modal && ownerEnabled) DIALOG_EnableOwner(owner); + if (disabled_owner) EnableWindow( disabled_owner, TRUE ); if( IsWindow(hwnd) ) DestroyWindow( hwnd ); return 0; } @@ -794,9 +774,9 @@ INT DIALOG_DoDialogBox( HWND hwnd, HWND owner ) DIALOGINFO * dlgInfo; MSG msg; INT retval; - HWND ownerMsg = GetAncestor( owner, GA_ROOT ); BOOL bFirstEmpty; + owner = GetWindow( hwnd, GW_OWNER ); if (!(dlgInfo = DIALOG_get_info( hwnd, FALSE ))) return -1; bFirstEmpty = TRUE; @@ -815,7 +795,7 @@ INT DIALOG_DoDialogBox( HWND hwnd, HWND owner ) if (!(GetWindowLongW( hwnd, GWL_STYLE ) & DS_NOIDLEMSG)) { /* No message present -> send ENTERIDLE and wait */ - SendMessageW( ownerMsg, WM_ENTERIDLE, MSGF_DIALOGBOX, (LPARAM)hwnd ); + SendMessageW( owner, WM_ENTERIDLE, MSGF_DIALOGBOX, (LPARAM)hwnd ); } GetMessageW( &msg, 0, 0, 0 ); } @@ -842,7 +822,7 @@ INT DIALOG_DoDialogBox( HWND hwnd, HWND owner ) } } } - if (dlgInfo->flags & DF_OWNERENABLED) DIALOG_EnableOwner( owner ); + if (dlgInfo->flags & DF_OWNERENABLED) EnableWindow( owner, TRUE ); retval = dlgInfo->idResult; DestroyWindow( hwnd ); return retval; @@ -936,7 +916,7 @@ BOOL WINAPI EndDialog( HWND hwnd, INT_PTR retval ) owner = GetWindow( hwnd, GW_OWNER ); if (owner) - DIALOG_EnableOwner( owner ); + EnableWindow( owner, TRUE ); /* Windows sets the focus to the dialog itself in EndDialog */

1 0

Jacek Caban : user32/tests: Added more dialog owner tests.
by Alexandre Julliard 03 Mar '16

03 Mar '16

Module: wine Branch: master Commit: ed6614107a443603efdfe2815198d784a4f984c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed6614107a443603efdfe2815… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 2 15:04:56 2016 +0100 user32/tests: Added more dialog owner tests. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/msg.c | 189 +++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 186 insertions(+), 3 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index bd02c89..47d754f 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -1394,6 +1394,33 @@ static const struct message WmModalDialogSeq[] = { { WM_NCDESTROY, sent }, { 0 } }; +static const struct message WmModalDialogSeq_2[] = { + { WM_CANCELMODE, sent }, + { HCBT_SETFOCUS, hook }, + { EVENT_OBJECT_FOCUS, winevent_hook|wparam|lparam, OBJID_CLIENT, 0 }, + { WM_KILLFOCUS, sent }, + { WM_IME_SETCONTEXT, sent|parent|wparam|optional, 0 }, + { EVENT_OBJECT_STATECHANGE, winevent_hook|wparam|lparam, 0, 0 }, + { WM_ENABLE, sent|wparam, 0 }, + { HCBT_CREATEWND, hook }, + { EVENT_OBJECT_REORDER, winevent_hook|wparam|lparam, 0, 0 }, + { EVENT_OBJECT_CREATE, winevent_hook|wparam|lparam, 0, 0 }, + { WM_SETFONT, sent }, + { WM_INITDIALOG, sent }, + { WM_CHANGEUISTATE, sent|optional }, + { WM_UPDATEUISTATE, sent|optional }, + { WM_ENABLE, sent|wparam, 1 }, + { WM_WINDOWPOSCHANGING, sent|wparam, SWP_HIDEWINDOW|SWP_NOSIZE|SWP_NOMOVE|SWP_NOACTIVATE }, + { EVENT_OBJECT_HIDE, winevent_hook|wparam|lparam, 0, 0 }, + { WM_CHANGEUISTATE, sent|optional }, + { WM_UPDATEUISTATE, sent|optional }, + { HCBT_DESTROYWND, hook }, + { 0x0090, sent|optional }, + { EVENT_OBJECT_DESTROY, winevent_hook|wparam|lparam, 0, 0 }, + { WM_DESTROY, sent }, + { WM_NCDESTROY, sent }, + { 0 } +}; /* SetMenu for NonVisible windows with size change*/ static const struct message WmSetMenuNonVisibleSizeChangeSeq[] = { { WM_WINDOWPOSCHANGING, sent|wparam, SWP_FRAMECHANGED|SWP_NOACTIVATE|SWP_NOSIZE|SWP_NOMOVE }, @@ -4037,6 +4064,36 @@ static INT_PTR CALLBACK TestModalDlgProcA(HWND hwnd, UINT message, WPARAM wParam return 0; } +static INT_PTR CALLBACK TestModalDlgProc2(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) +{ + struct recvd_message msg; + + if (ignore_message( message )) return 0; + + switch (message) + { + /* ignore */ + case WM_MOUSEMOVE: + case WM_NCMOUSEMOVE: + case WM_NCMOUSELEAVE: + case WM_SETCURSOR: + return 0; + case WM_NCHITTEST: + return HTCLIENT; + } + + msg.hwnd = hwnd; + msg.message = message; + msg.flags = sent|wparam|lparam; + msg.wParam = wParam; + msg.lParam = lParam; + msg.descr = "dialog"; + add_message(&msg); + + if (message == WM_INITDIALOG) EndDialog( hwnd, 0 ); + return 0; +} + static void test_hv_scroll_1(HWND hwnd, INT ctl, DWORD clear, DWORD set, INT min, INT max) { DWORD style, exstyle; @@ -12161,7 +12218,7 @@ static const struct message WmCreateDialogParamSeq_4[] = { static void test_dialog_messages(void) { WNDCLASSA cls; - HWND hdlg, hedit1, hedit2, hfocus; + HWND hdlg, hedit1, hedit2, hfocus, parent, child, child2; LRESULT ret; #define set_selection(hctl, start, end) \ @@ -12278,11 +12335,88 @@ static void test_dialog_messages(void) flush_sequence(); UnregisterClassA(cls.lpszClassName, cls.hInstance); + + parent = CreateWindowExA(0, "TestParentClass", "Test parent", + WS_OVERLAPPEDWINDOW | WS_VISIBLE, + 100, 100, 200, 200, 0, 0, 0, NULL); + ok (parent != 0, "Failed to create parent window\n"); + + /* This child has no parent set. We will later call SetParent on it, + * so that it will have a parent set, but no WS_CHILD style. */ + child = CreateWindowExA(0, "TestWindowClass", "Test child", + WS_OVERLAPPEDWINDOW | WS_VISIBLE, + 100, 100, 200, 200, 0, 0, 0, NULL); + ok (child != 0, "Failed to create child window\n"); + + /* This is a regular child window. When used as an owner, the other + * child window will be used. */ + child2 = CreateWindowExA(0, "SimpleWindowClass", "Test child2", + WS_OVERLAPPEDWINDOW | WS_VISIBLE | WS_CHILD, + 100, 100, 200, 200, child, 0, 0, NULL); + ok (child2 != 0, "Failed to create child window\n"); + + SetParent(child, parent); + SetFocus(child); + + flush_sequence(); + DialogBoxA( 0, "TEST_DIALOG", child2, TestModalDlgProc2 ); + ok_sequence(WmModalDialogSeq_2, "ModalDialog2", TRUE); + + DestroyWindow(child2); + DestroyWindow(child); + DestroyWindow(parent); + flush_sequence(); +} + +static void test_enddialog_seq(HWND dialog, HWND owner) +{ + const struct message seq[] = { + { WM_ENABLE, sent }, + { WM_WINDOWPOSCHANGING, sent|wparam, SWP_HIDEWINDOW|SWP_NOACTIVATE|SWP_NOSIZE|SWP_NOMOVE }, + { HCBT_ACTIVATE, hook|wparam, (WPARAM)owner }, + { WM_NCACTIVATE, sent|wparam|lparam, WA_INACTIVE, (LPARAM)owner }, + { WM_ACTIVATE, sent|wparam|lparam, WA_INACTIVE, (LPARAM)owner }, + /* FIXME: Following two are optional because Wine sends WM_QUERYNEWPALETTE instead of WM_WINDOWPOSCHANGING */ + { WM_WINDOWPOSCHANGING, sent|wparam|optional, SWP_NOSIZE|SWP_NOMOVE }, + { WM_QUERYNEWPALETTE, sent|optional }, + { WM_NCACTIVATE, sent|wparam|lparam, WA_ACTIVE, (LPARAM)dialog }, + { WM_GETTEXT, sent|optional|defwinproc }, + { WM_ACTIVATE, sent|wparam|lparam, WA_ACTIVE, (LPARAM)dialog }, + { HCBT_SETFOCUS, hook|wparam, (WPARAM)owner }, + { WM_KILLFOCUS, sent|wparam, (WPARAM)owner }, + { WM_SETFOCUS, sent|defwinproc|wparam, (WPARAM)dialog }, + { 0 } + }; + + flush_sequence(); + EndDialog(dialog, 0); + ok_sequence(seq, "EndDialog", FALSE); +} + +static void test_enddialog_seq2(HWND dialog, HWND owner) +{ + const struct message seq[] = { + { WM_ENABLE, parent|sent }, + { WM_WINDOWPOSCHANGING, sent|wparam, SWP_HIDEWINDOW|SWP_NOACTIVATE|SWP_NOSIZE|SWP_NOMOVE }, + { HCBT_ACTIVATE, hook|wparam, (WPARAM)owner }, + { WM_NCACTIVATE, sent|wparam|lparam, WA_INACTIVE, (LPARAM)owner }, + { WM_ACTIVATE, sent|wparam|lparam, WA_INACTIVE, (LPARAM)owner }, + { WM_WINDOWPOSCHANGING, sent|optional|wparam, SWP_NOACTIVATE|SWP_NOSIZE|SWP_NOMOVE }, + { WM_WINDOWPOSCHANGING, sent|optional|wparam, SWP_NOACTIVATE|SWP_NOSIZE|SWP_NOMOVE }, + { HCBT_SETFOCUS, hook|wparam, (WPARAM)owner }, + { WM_KILLFOCUS, sent|wparam, (WPARAM)owner }, + { WM_SETFOCUS, sent|parent|defwinproc|wparam, (WPARAM)dialog }, + { 0 } + }; + + flush_sequence(); + EndDialog(dialog, 0); + ok_sequence(seq, "EndDialog2", FALSE); } static void test_EndDialog(void) { - HWND hparent, hother, hactive, hdlg; + HWND hparent, hother, hactive, hdlg, hchild; WNDCLASSA cls; hparent = CreateWindowExA(0, "TestParentClass", "Test parent", @@ -12340,8 +12474,57 @@ static void test_EndDialog(void) DestroyWindow(hdlg); flush_sequence(); - DestroyWindow( hother ); DestroyWindow( hparent ); + + hparent = CreateWindowExA(0, "TestParentClass", "Test parent", + WS_POPUP | WS_VISIBLE | WS_DISABLED, + 100, 100, 200, 200, 0, 0, 0, NULL); + ok (hparent != 0, "Failed to create parent window\n"); + + hchild = CreateWindowExA(0, "TestWindowClass", "Test child", + WS_OVERLAPPEDWINDOW | WS_VISIBLE | WS_DISABLED, + 0, 0, 0, 0, 0, 0, 0, NULL); + ok (hchild != 0, "Failed to create child window\n"); + + SetParent(hchild, hparent); + + flush_sequence(); + SetForegroundWindow(hother); + hactive = GetForegroundWindow(); + ok(hother == hactive, "Wrong foreground window (%p != %p)\n", hother, hactive); + + hdlg = CreateDialogParamA(0, "CLASS_TEST_DIALOG_2", hchild, test_dlg_proc, 0); + ok(IsWindow(hdlg), "CreateDialogParam failed\n"); + + SetForegroundWindow(hdlg); + test_enddialog_seq(hdlg, hchild); + + hactive = GetForegroundWindow(); + ok(hactive == hchild, "Wrong foreground window (active: %p, parent: %p, dlg: %p, other: %p child: %p)\n", hactive, hparent, hdlg, hother, hchild); + + DestroyWindow(hdlg); + + /* Now set WS_CHILD style flag so that it's a real child and its parent will be dialog's owner. */ + SetWindowLongW(hchild, GWL_STYLE, GetWindowLongW(hchild, GWL_STYLE) | WS_CHILD); + + SetForegroundWindow(hother); + hactive = GetForegroundWindow(); + ok(hother == hactive, "Wrong foreground window (%p != %p)\n", hother, hactive); + + hdlg = CreateDialogParamA(0, "CLASS_TEST_DIALOG_2", hchild, test_dlg_proc, 0); + ok(IsWindow(hdlg), "CreateDialogParam failed\n"); + + SetForegroundWindow(hdlg); + test_enddialog_seq2(hdlg, hparent); + + hactive = GetForegroundWindow(); + ok(hactive == hparent, "Wrong foreground window (active: %p, parent: %p, dlg: %p, other: %p child: %p)\n", hactive, hparent, hdlg, hother, hchild); + DestroyWindow(hdlg); + DestroyWindow(hchild); + DestroyWindow(hparent); + DestroyWindow(hother); + flush_sequence(); + UnregisterClassA(cls.lpszClassName, cls.hInstance); }

1 0

Jacek Caban : user32: Removed unused owner argument.
by Alexandre Julliard 03 Mar '16

03 Mar '16

Module: wine Branch: master Commit: d75991d80e77ac9d93b85b8369c6fce39bd4fdb2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d75991d80e77ac9d93b85b836… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 2 15:05:10 2016 +0100 user32: Removed unused owner argument. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user.exe16/dialog.c | 4 ++-- dlls/user.exe16/user_private.h | 2 +- dlls/user32/controls.h | 4 ++-- dlls/user32/dialog.c | 10 +++++----- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/user.exe16/dialog.c b/dlls/user.exe16/dialog.c index fead42d..766a468 100644 --- a/dlls/user.exe16/dialog.c +++ b/dlls/user.exe16/dialog.c @@ -744,7 +744,7 @@ INT16 WINAPI DialogBoxParam16( HINSTANCE16 hInst, LPCSTR template, { HWND owner = WIN_Handle32(owner16); hwnd = DIALOG_CreateIndirect16( hInst, data, owner, dlgProc, param, TRUE ); - if (hwnd) ret = wow_handlers32.dialog_box_loop( hwnd, owner ); + if (hwnd) ret = wow_handlers32.dialog_box_loop( hwnd ); GlobalUnlock16( hmem ); } FreeResource16( hmem ); @@ -764,7 +764,7 @@ INT16 WINAPI DialogBoxIndirectParam16( HINSTANCE16 hInst, HANDLE16 dlgTemplate, if (!(ptr = GlobalLock16( dlgTemplate ))) return -1; hwnd = DIALOG_CreateIndirect16( hInst, ptr, owner, dlgProc, param, TRUE ); GlobalUnlock16( dlgTemplate ); - if (hwnd) return wow_handlers32.dialog_box_loop( hwnd, owner ); + if (hwnd) return wow_handlers32.dialog_box_loop( hwnd ); return -1; } diff --git a/dlls/user.exe16/user_private.h b/dlls/user.exe16/user_private.h index 7c91afb..3d97546 100644 --- a/dlls/user.exe16/user_private.h +++ b/dlls/user.exe16/user_private.h @@ -63,7 +63,7 @@ struct wow_handlers32 HWND (*get_win_handle)(HWND); WNDPROC (*alloc_winproc)(WNDPROC,BOOL); struct tagDIALOGINFO *(*get_dialog_info)(HWND,BOOL); - INT (*dialog_box_loop)(HWND,HWND); + INT (*dialog_box_loop)(HWND); ULONG_PTR (*get_icon_param)(HICON); ULONG_PTR (*set_icon_param)(HICON,ULONG_PTR); }; diff --git a/dlls/user32/controls.h b/dlls/user32/controls.h index 69bc94c..542bf39 100644 --- a/dlls/user32/controls.h +++ b/dlls/user32/controls.h @@ -121,7 +121,7 @@ struct wow_handlers32 HWND (*get_win_handle)(HWND); WNDPROC (*alloc_winproc)(WNDPROC,BOOL); struct tagDIALOGINFO *(*get_dialog_info)(HWND,BOOL); - INT (*dialog_box_loop)(HWND,HWND); + INT (*dialog_box_loop)(HWND); ULONG_PTR (*get_icon_param)(HICON); ULONG_PTR (*set_icon_param)(HICON,ULONG_PTR); }; @@ -244,7 +244,7 @@ typedef struct tagDIALOGINFO #define DF_OWNERENABLED 0x0002 extern DIALOGINFO *DIALOG_get_info( HWND hwnd, BOOL create ) DECLSPEC_HIDDEN; -extern INT DIALOG_DoDialogBox( HWND hwnd, HWND owner ) DECLSPEC_HIDDEN; +extern INT DIALOG_DoDialogBox( HWND hwnd ) DECLSPEC_HIDDEN; HRGN set_control_clipping( HDC hdc, const RECT *rect ) DECLSPEC_HIDDEN; diff --git a/dlls/user32/dialog.c b/dlls/user32/dialog.c index 180ab3d..3ea426d 100644 --- a/dlls/user32/dialog.c +++ b/dlls/user32/dialog.c @@ -769,14 +769,14 @@ HWND WINAPI CreateDialogIndirectParamW( HINSTANCE hInst, LPCDLGTEMPLATEW dlgTemp /*********************************************************************** * DIALOG_DoDialogBox */ -INT DIALOG_DoDialogBox( HWND hwnd, HWND owner ) +INT DIALOG_DoDialogBox( HWND hwnd ) { + HWND owner = GetWindow( hwnd, GW_OWNER ); DIALOGINFO * dlgInfo; MSG msg; INT retval; BOOL bFirstEmpty; - owner = GetWindow( hwnd, GW_OWNER ); if (!(dlgInfo = DIALOG_get_info( hwnd, FALSE ))) return -1; bFirstEmpty = TRUE; @@ -842,7 +842,7 @@ INT_PTR WINAPI DialogBoxParamA( HINSTANCE hInst, LPCSTR name, if (!(hrsrc = FindResourceA( hInst, name, (LPSTR)RT_DIALOG ))) return -1; if (!(ptr = LoadResource(hInst, hrsrc))) return -1; hwnd = DIALOG_CreateIndirect( hInst, ptr, owner, dlgProc, param, FALSE, TRUE ); - if (hwnd) return DIALOG_DoDialogBox( hwnd, owner ); + if (hwnd) return DIALOG_DoDialogBox( hwnd ); return 0; } @@ -860,7 +860,7 @@ INT_PTR WINAPI DialogBoxParamW( HINSTANCE hInst, LPCWSTR name, if (!(hrsrc = FindResourceW( hInst, name, (LPWSTR)RT_DIALOG ))) return -1; if (!(ptr = LoadResource(hInst, hrsrc))) return -1; hwnd = DIALOG_CreateIndirect( hInst, ptr, owner, dlgProc, param, TRUE, TRUE ); - if (hwnd) return DIALOG_DoDialogBox( hwnd, owner ); + if (hwnd) return DIALOG_DoDialogBox( hwnd ); return 0; } @@ -873,7 +873,7 @@ INT_PTR WINAPI DialogBoxIndirectParamAorW( HINSTANCE hInstance, LPCVOID template LPARAM param, DWORD flags ) { HWND hwnd = DIALOG_CreateIndirect( hInstance, template, owner, dlgProc, param, !flags, TRUE ); - if (hwnd) return DIALOG_DoDialogBox( hwnd, owner ); + if (hwnd) return DIALOG_DoDialogBox( hwnd ); return -1; }

1 0

Sebastian Lackner : advapi32: Fix RegDeleteTreeW when an empty string is passed.
by Alexandre Julliard 02 Mar '16

02 Mar '16

Module: wine Branch: master Commit: 2ddcd97bb13b22e369e168ed344215f7bb650501 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ddcd97bb13b22e369e168ed3… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Mar 2 07:37:27 2016 +0100 advapi32: Fix RegDeleteTreeW when an empty string is passed. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/registry.c | 6 +++--- dlls/advapi32/tests/registry.c | 14 ++++++++++++++ 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/dlls/advapi32/registry.c b/dlls/advapi32/registry.c index 172423b..aa451b1 100644 --- a/dlls/advapi32/registry.c +++ b/dlls/advapi32/registry.c @@ -3030,7 +3030,7 @@ LSTATUS WINAPI RegDeleteTreeW( HKEY hkey, const WCHAR *subkey ) TRACE( "(%p, %s)\n", hkey, debugstr_w(subkey) ); - if (subkey) + if (subkey && *subkey) { ret = RegOpenKeyExW( hkey, subkey, 0, KEY_READ, &hkey ); if (ret) return ret; @@ -3060,7 +3060,7 @@ LSTATUS WINAPI RegDeleteTreeW( HKEY hkey, const WCHAR *subkey ) } /* Delete the key itself */ - if (subkey) + if (subkey && *subkey) { ret = RegDeleteKeyW( hkey, emptyW ); goto cleanup; @@ -3081,7 +3081,7 @@ LSTATUS WINAPI RegDeleteTreeW( HKEY hkey, const WCHAR *subkey ) cleanup: heap_free( name_buf ); - if (subkey) + if (subkey && *subkey) RegCloseKey( hkey ); return ret; } diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c index d37042f..c2b0e12 100644 --- a/dlls/advapi32/tests/registry.c +++ b/dlls/advapi32/tests/registry.c @@ -2246,6 +2246,20 @@ static void test_reg_delete_tree(void) dwsize = MAX_PATH; ok(RegQueryValueExA(subkey, "value", NULL, &type, (BYTE *)buffer, &dwsize), "Value is still present\n"); + ret = RegCloseKey(subkey); + ok(ret == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", ret); + + ret = RegOpenKeyA(hkey_main, "subkey", &subkey); + ok(ret == ERROR_SUCCESS, "subkey was deleted\n"); + ret = pRegDeleteTreeA(subkey, ""); + ok(ret == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", ret); + ret = RegCloseKey(subkey); + ok(ret == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", ret); + + ret = RegOpenKeyA(hkey_main, "subkey", &subkey); + ok(ret == ERROR_SUCCESS, "subkey was deleted\n"); + ret = RegCloseKey(subkey); + ok(ret == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", ret); ret = pRegDeleteTreeA(hkey_main, "not-here"); ok(ret == ERROR_FILE_NOT_FOUND,

1 0

Michael Stefaniuc : winegstreamer: Avoid a FALSE: TRUE conditional expression.
by Alexandre Julliard 02 Mar '16

02 Mar '16

Module: wine Branch: master Commit: 8cbb680b449763ac4962e479c975f5bee3f1b8c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8cbb680b449763ac4962e479c… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Mar 2 11:17:14 2016 +0100 winegstreamer: Avoid a FALSE:TRUE conditional expression. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gsttffilter.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winegstreamer/gsttffilter.c b/dlls/winegstreamer/gsttffilter.c index 72eeda2..2209c5e 100644 --- a/dlls/winegstreamer/gsttffilter.c +++ b/dlls/winegstreamer/gsttffilter.c @@ -844,8 +844,8 @@ static HRESULT WINAPI Gstreamer_AudioConvert_SetMediaType(TransformFilter *tf, P if (inisfloat) format = inwfe->wBitsPerSample == 64 ? GST_AUDIO_FORMAT_F64LE : GST_AUDIO_FORMAT_F32LE; else - format = gst_audio_format_build_integer(inwfe->wBitsPerSample == 8 ? FALSE : TRUE, - G_LITTLE_ENDIAN, inwfe->wBitsPerSample, indepth); + format = gst_audio_format_build_integer(inwfe->wBitsPerSample != 8, G_LITTLE_ENDIAN, + inwfe->wBitsPerSample, indepth); capsin = gst_caps_new_simple("audio/x-raw", "format", G_TYPE_STRING, gst_audio_format_to_string(format),

1 0

Nikolay Sivov : d3drm: Implement SetAppData/GetAppData for a viewport.
by Alexandre Julliard 02 Mar '16

02 Mar '16

Module: wine Branch: master Commit: 7cf81baca446ae4677c759c179aa8ec12b57d0e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7cf81baca446ae4677c759c17… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Mar 1 19:45:29 2016 +0300 d3drm: Implement SetAppData/GetAppData for a viewport. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3drm/d3drm_private.h | 5 +++++ dlls/d3drm/tests/d3drm.c | 23 ++++++++++++++++++++++- dlls/d3drm/viewport.c | 33 +++++++++++++++++++++------------ 3 files changed, 48 insertions(+), 13 deletions(-) diff --git a/dlls/d3drm/d3drm_private.h b/dlls/d3drm/d3drm_private.h index 5df83a7..5703560 100644 --- a/dlls/d3drm/d3drm_private.h +++ b/dlls/d3drm/d3drm_private.h @@ -25,6 +25,11 @@ #include "dxfile.h" struct d3drm_device; +struct d3drm_object +{ + LONG ref; + DWORD appdata; +}; HRESULT d3drm_device_create(struct d3drm_device **out) DECLSPEC_HIDDEN; IDirect3DRMDevice *IDirect3DRMDevice_from_impl(struct d3drm_device *device) DECLSPEC_HIDDEN; diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index 4a1c180..16f0913 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -1220,10 +1220,11 @@ static void test_Viewport(void) IDirect3DRMDevice *device; IDirect3DRMFrame *frame; IDirect3DRMViewport *viewport; + IDirect3DRMViewport2 *viewport2; GUID driver; HWND window; RECT rc; - DWORD size; + DWORD size, data; CHAR cname[64] = {0}; window = CreateWindowA("static", "d3drm_test", WS_OVERLAPPEDWINDOW, 0, 0, 300, 200, 0, 0, 0, 0); @@ -1261,6 +1262,26 @@ static void test_Viewport(void) ok(size == sizeof("Viewport"), "wrong size: %u\n", size); ok(!strcmp(cname, "Viewport"), "Expected cname to be \"Viewport\", but got \"%s\"\n", cname); + /* AppData */ + hr = IDirect3DRMViewport_SetAppData(viewport, 0); + ok(hr == D3DRM_OK, "expected D3DRM_OK (hr = %x)\n", hr); + + hr = IDirect3DRMViewport_SetAppData(viewport, 0); + ok(hr == D3DRM_OK, "expected D3DRM_OK (hr = %x)\n", hr); + + hr = IDirect3DRMViewport_SetAppData(viewport, 1); + ok(hr == D3DRM_OK, "expected D3DRM_OK (hr = %x)\n", hr); + + hr = IDirect3DRMViewport_SetAppData(viewport, 1); + ok(hr == D3DRM_OK, "expected D3DRM_OK (hr = %x)\n", hr); + + hr = IDirect3DRMViewport_QueryInterface(viewport, &IID_IDirect3DRMViewport2, (void**)&viewport2); + ok(hr == D3DRM_OK, "expected D3DRM_OK (hr = %x)\n", hr); + + data = IDirect3DRMViewport2_GetAppData(viewport2); + ok(data == 1, "got %x\n", data); + IDirect3DRMViewport2_Release(viewport2); + IDirect3DRMViewport_Release(viewport); IDirect3DRMFrame_Release(frame); IDirect3DRMDevice_Release(device); diff --git a/dlls/d3drm/viewport.c b/dlls/d3drm/viewport.c index 58de085..34c6fb4 100644 --- a/dlls/d3drm/viewport.c +++ b/dlls/d3drm/viewport.c @@ -31,9 +31,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3drm); struct d3drm_viewport { + struct d3drm_object obj; IDirect3DRMViewport IDirect3DRMViewport_iface; IDirect3DRMViewport2 IDirect3DRMViewport2_iface; - LONG ref; D3DVALUE back; D3DVALUE front; D3DVALUE field; @@ -79,7 +79,7 @@ static HRESULT WINAPI d3drm_viewport1_QueryInterface(IDirect3DRMViewport *iface, static ULONG WINAPI d3drm_viewport1_AddRef(IDirect3DRMViewport *iface) { struct d3drm_viewport *viewport = impl_from_IDirect3DRMViewport(iface); - ULONG refcount = InterlockedIncrement(&viewport->ref); + ULONG refcount = InterlockedIncrement(&viewport->obj.ref); TRACE("%p increasing refcount to %u.\n", iface, refcount); @@ -89,7 +89,7 @@ static ULONG WINAPI d3drm_viewport1_AddRef(IDirect3DRMViewport *iface) static ULONG WINAPI d3drm_viewport1_Release(IDirect3DRMViewport *iface) { struct d3drm_viewport *viewport = impl_from_IDirect3DRMViewport(iface); - ULONG refcount = InterlockedDecrement(&viewport->ref); + ULONG refcount = InterlockedDecrement(&viewport->obj.ref); TRACE("%p decreasing refcount to %u.\n", iface, refcount); @@ -125,16 +125,20 @@ static HRESULT WINAPI d3drm_viewport1_DeleteDestroyCallback(IDirect3DRMViewport static HRESULT WINAPI d3drm_viewport1_SetAppData(IDirect3DRMViewport *iface, DWORD data) { - FIXME("iface %p, data %#x stub!\n", iface, data); + struct d3drm_viewport *viewport = impl_from_IDirect3DRMViewport(iface); - return E_NOTIMPL; + TRACE("iface %p, data %#x\n", iface, data); + + return IDirect3DRMViewport2_SetAppData(&viewport->IDirect3DRMViewport2_iface, data); } static DWORD WINAPI d3drm_viewport1_GetAppData(IDirect3DRMViewport *iface) { - FIXME("iface %p.\n", iface); + struct d3drm_viewport *viewport = impl_from_IDirect3DRMViewport(iface); + + TRACE("iface %p.\n", iface); - return 0; + return IDirect3DRMViewport2_GetAppData(&viewport->IDirect3DRMViewport2_iface); } static HRESULT WINAPI d3drm_viewport1_SetName(IDirect3DRMViewport *iface, const char *name) @@ -478,16 +482,21 @@ static HRESULT WINAPI d3drm_viewport2_DeleteDestroyCallback(IDirect3DRMViewport2 static HRESULT WINAPI d3drm_viewport2_SetAppData(IDirect3DRMViewport2 *iface, DWORD data) { - FIXME("iface %p, data %#x stub!\n", iface, data); + struct d3drm_viewport *viewport = impl_from_IDirect3DRMViewport2(iface); - return E_NOTIMPL; + TRACE("iface %p, data %#x\n", iface, data); + + viewport->obj.appdata = data; + return S_OK; } static DWORD WINAPI d3drm_viewport2_GetAppData(IDirect3DRMViewport2 *iface) { - FIXME("iface %p stub!\n", iface); + struct d3drm_viewport *viewport = impl_from_IDirect3DRMViewport2(iface); + + TRACE("iface %p\n", iface); - return 0; + return viewport->obj.appdata; } static HRESULT WINAPI d3drm_viewport2_SetName(IDirect3DRMViewport2 *iface, const char *name) @@ -819,7 +828,7 @@ HRESULT Direct3DRMViewport_create(REFIID riid, IUnknown **out) object->IDirect3DRMViewport_iface.lpVtbl = &d3drm_viewport1_vtbl; object->IDirect3DRMViewport2_iface.lpVtbl = &d3drm_viewport2_vtbl; - object->ref = 1; + object->obj.ref = 1; if (IsEqualGUID(riid, &IID_IDirect3DRMViewport2)) *out = (IUnknown *)&object->IDirect3DRMViewport2_iface;

1 0

Józef Kucia : wined3d: Fix SM4 pixel shader output registers mapping.
by Alexandre Julliard 02 Mar '16

02 Mar '16

Module: wine Branch: master Commit: b77dd8813def9afb3c120a021cd2758d47fb980c URL: http://source.winehq.org/git/wine.git/?a=commit;h=b77dd8813def9afb3c120a021… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Mar 1 22:19:59 2016 +0100 wined3d: Fix SM4 pixel shader output registers mapping. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/shader_sm4.c | 42 +++++------------------------------------- include/wine/wined3d.h | 10 ---------- 2 files changed, 5 insertions(+), 47 deletions(-) diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index 45bd9f0..a741f66 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -266,11 +266,7 @@ struct wined3d_sm4_data struct wined3d_shader_version shader_version; const DWORD *end; - struct - { - enum wined3d_shader_register_type register_type; - UINT register_idx; - } output_map[MAX_REG_OUTPUT]; + unsigned int output_map[MAX_REG_OUTPUT]; struct wined3d_shader_src_param src_param[5]; struct wined3d_shader_dst_param dst_param[2]; @@ -287,13 +283,6 @@ struct wined3d_sm4_opcode_info const char *src_info; }; -struct sysval_map -{ - enum wined3d_sysval_semantic sysval; - enum wined3d_shader_register_type register_type; - UINT register_idx; -}; - /* * F -> WINED3D_DATA_FLOAT * I -> WINED3D_DATA_INT @@ -429,19 +418,6 @@ static const enum wined3d_primitive_type input_primitive_type_table[] = /* WINED3D_SM4_INPUT_PT_TRIANGLEADJ */ WINED3D_PT_TRIANGLELIST_ADJ, }; -static const struct sysval_map sysval_map[] = -{ - {WINED3D_SV_DEPTH, WINED3DSPR_DEPTHOUT, 0}, - {WINED3D_SV_TARGET0, WINED3DSPR_COLOROUT, 0}, - {WINED3D_SV_TARGET1, WINED3DSPR_COLOROUT, 1}, - {WINED3D_SV_TARGET2, WINED3DSPR_COLOROUT, 2}, - {WINED3D_SV_TARGET3, WINED3DSPR_COLOROUT, 3}, - {WINED3D_SV_TARGET4, WINED3DSPR_COLOROUT, 4}, - {WINED3D_SV_TARGET5, WINED3DSPR_COLOROUT, 5}, - {WINED3D_SV_TARGET6, WINED3DSPR_COLOROUT, 6}, - {WINED3D_SV_TARGET7, WINED3DSPR_COLOROUT, 7}, -}; - static const enum wined3d_shader_resource_type resource_type_table[] = { /* 0 */ WINED3D_SHADER_RESOURCE_NONE, @@ -496,8 +472,8 @@ static void map_register(const struct wined3d_sm4_data *priv, struct wined3d_sha break; } - reg->type = priv->output_map[reg_idx].register_type; - reg->idx[0].offset = priv->output_map[reg_idx].register_idx; + reg->type = WINED3DSPR_COLOROUT; + reg->idx[0].offset = priv->output_map[reg_idx]; } break; @@ -529,7 +505,7 @@ static enum wined3d_data_type map_data_type(char t) static void *shader_sm4_init(const DWORD *byte_code, const struct wined3d_shader_signature *output_signature) { struct wined3d_sm4_data *priv; - unsigned int i, j; + unsigned int i; if (!(priv = HeapAlloc(GetProcessHeap(), 0, sizeof(*priv)))) { @@ -548,15 +524,7 @@ static void *shader_sm4_init(const DWORD *byte_code, const struct wined3d_shader continue; } - for (j = 0; j < ARRAY_SIZE(sysval_map); ++j) - { - if (e->sysval_semantic == sysval_map[j].sysval) - { - priv->output_map[e->register_idx].register_type = sysval_map[j].register_type; - priv->output_map[e->register_idx].register_idx = sysval_map[j].register_idx; - break; - } - } + priv->output_map[e->register_idx] = e->semantic_idx; } list_init(&priv->src_free); diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 1af0d52..a4b2a30 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -752,16 +752,6 @@ enum wined3d_sysval_semantic WINED3D_SV_INSTANCEID = 8, WINED3D_SV_ISFRONTFACE = 9, WINED3D_SV_SAMPLEINDEX = 10, - - WINED3D_SV_DEPTH = 0xffffffff, - WINED3D_SV_TARGET0 = 0, - WINED3D_SV_TARGET1 = 1, - WINED3D_SV_TARGET2 = 2, - WINED3D_SV_TARGET3 = 3, - WINED3D_SV_TARGET4 = 4, - WINED3D_SV_TARGET5 = 5, - WINED3D_SV_TARGET6 = 6, - WINED3D_SV_TARGET7 = 7, }; enum wined3d_scanline_ordering

1 0

Józef Kucia : d3d11/tests: Add test for multiple render targets.
by Alexandre Julliard 02 Mar '16

02 Mar '16

Module: wine Branch: master Commit: 25f9fbcc6d263b10e773553fd0ef6b1594079f4d URL: http://source.winehq.org/git/wine.git/?a=commit;h=25f9fbcc6d263b10e773553fd… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Mar 1 22:20:00 2016 +0100 d3d11/tests: Add test for multiple render targets. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 192 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 192 insertions(+) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 00b3d18..4054b2a 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -3564,6 +3564,197 @@ static void test_texture(void) DestroyWindow(window); } +static void test_multiple_render_targets(void) +{ + D3D11_SUBRESOURCE_DATA resource_data; + D3D11_TEXTURE2D_DESC texture_desc; + ID3D11InputLayout *input_layout; + unsigned int stride, offset, i; + ID3D11RenderTargetView *rtv[4]; + D3D11_BUFFER_DESC buffer_desc; + ID3D11DeviceContext *context; + ID3D11Texture2D *rt[4]; + ID3D11VertexShader *vs; + ID3D11PixelShader *ps; + ID3D11Device *device; + D3D11_VIEWPORT vp; + ID3D11Buffer *vb; + ULONG refcount; + DWORD color; + HRESULT hr; + + static const D3D11_INPUT_ELEMENT_DESC layout_desc[] = + { + {"POSITION", 0, DXGI_FORMAT_R32G32_FLOAT, 0, 0, D3D11_INPUT_PER_VERTEX_DATA, 0}, + }; + static const DWORD vs_code[] = + { +#if 0 + float4 main(float4 position : POSITION) : SV_POSITION + { + return position; + } +#endif + 0x43425844, 0xa7a2f22d, 0x83ff2560, 0xe61638bd, 0x87e3ce90, 0x00000001, 0x000000d8, 0x00000003, + 0x0000002c, 0x00000060, 0x00000094, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, + 0x00000000, 0x00000000, 0x00000003, 0x00000000, 0x00000f0f, 0x49534f50, 0x4e4f4954, 0xababab00, + 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000001, 0x00000003, + 0x00000000, 0x0000000f, 0x505f5653, 0x5449534f, 0x004e4f49, 0x52444853, 0x0000003c, 0x00010040, + 0x0000000f, 0x0300005f, 0x001010f2, 0x00000000, 0x04000067, 0x001020f2, 0x00000000, 0x00000001, + 0x05000036, 0x001020f2, 0x00000000, 0x00101e46, 0x00000000, 0x0100003e, + }; + static const DWORD ps_code[] = + { +#if 0 + struct output + { + float4 t1 : SV_TARGET0; + float4 t2 : SV_Target1; + float4 t3 : SV_TARGET2; + float4 t4 : SV_Target3; + }; + + output main(float4 position : SV_POSITION) + { + struct output o; + o.t1 = (float4)1.0f; + o.t2 = (float4)0.5f; + o.t3 = (float4)0.2f; + o.t4 = float4(0.0f, 0.2f, 0.5f, 1.0f); + return o; + } +#endif + 0x43425844, 0x8701ad18, 0xe3d5291d, 0x7b4288a6, 0x01917515, 0x00000001, 0x000001a8, 0x00000003, + 0x0000002c, 0x00000060, 0x000000e4, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, + 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x0000000f, 0x505f5653, 0x5449534f, 0x004e4f49, + 0x4e47534f, 0x0000007c, 0x00000004, 0x00000008, 0x00000068, 0x00000000, 0x00000000, 0x00000003, + 0x00000000, 0x0000000f, 0x00000072, 0x00000001, 0x00000000, 0x00000003, 0x00000001, 0x0000000f, + 0x00000068, 0x00000002, 0x00000000, 0x00000003, 0x00000002, 0x0000000f, 0x00000072, 0x00000003, + 0x00000000, 0x00000003, 0x00000003, 0x0000000f, 0x545f5653, 0x45475241, 0x56530054, 0x7261545f, + 0x00746567, 0x52444853, 0x000000bc, 0x00000040, 0x0000002f, 0x03000065, 0x001020f2, 0x00000000, + 0x03000065, 0x001020f2, 0x00000001, 0x03000065, 0x001020f2, 0x00000002, 0x03000065, 0x001020f2, + 0x00000003, 0x08000036, 0x001020f2, 0x00000000, 0x00004002, 0x3f800000, 0x3f800000, 0x3f800000, + 0x3f800000, 0x08000036, 0x001020f2, 0x00000001, 0x00004002, 0x3f000000, 0x3f000000, 0x3f000000, + 0x3f000000, 0x08000036, 0x001020f2, 0x00000002, 0x00004002, 0x3e4ccccd, 0x3e4ccccd, 0x3e4ccccd, + 0x3e4ccccd, 0x08000036, 0x001020f2, 0x00000003, 0x00004002, 0x00000000, 0x3e4ccccd, 0x3f000000, + 0x3f800000, 0x0100003e, + }; + static const struct + { + struct vec2 position; + } + quad[] = + { + {{-1.0f, -1.0f}}, + {{-1.0f, 1.0f}}, + {{ 1.0f, -1.0f}}, + {{ 1.0f, 1.0f}}, + }; + static const float red[] = {1.0f, 0.0f, 0.0f, 1.0f}; + + if (!(device = create_device(NULL))) + { + skip("Failed to create device.\n"); + return; + } + + if (ID3D11Device_GetFeatureLevel(device) < D3D_FEATURE_LEVEL_9_3) + { + skip("Feature level 9_3 or higher is required.\n"); + ID3D11Device_Release(device); + return; + } + + hr = ID3D11Device_CreateInputLayout(device, layout_desc, sizeof(layout_desc) / sizeof(*layout_desc), + vs_code, sizeof(vs_code), &input_layout); + ok(SUCCEEDED(hr), "Failed to create input layout, hr %#x.\n", hr); + + buffer_desc.ByteWidth = sizeof(quad); + buffer_desc.Usage = D3D11_USAGE_DEFAULT; + buffer_desc.BindFlags = D3D11_BIND_VERTEX_BUFFER; + buffer_desc.CPUAccessFlags = 0; + buffer_desc.MiscFlags = 0; + buffer_desc.StructureByteStride = 0; + + resource_data.pSysMem = quad; + resource_data.SysMemPitch = 0; + resource_data.SysMemSlicePitch = 0; + + hr = ID3D11Device_CreateBuffer(device, &buffer_desc, &resource_data, &vb); + ok(SUCCEEDED(hr), "Failed to create vertex buffer, hr %#x.\n", hr); + + texture_desc.Width = 640; + texture_desc.Height = 480; + texture_desc.MipLevels = 1; + texture_desc.ArraySize = 1; + texture_desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; + texture_desc.SampleDesc.Count = 1; + texture_desc.SampleDesc.Quality = 0; + texture_desc.Usage = D3D11_USAGE_DEFAULT; + texture_desc.BindFlags = D3D11_BIND_RENDER_TARGET; + texture_desc.CPUAccessFlags = 0; + texture_desc.MiscFlags = 0; + + for (i = 0; i < sizeof(rt) / sizeof(*rt); ++i) + { + hr = ID3D11Device_CreateTexture2D(device, &texture_desc, NULL, &rt[i]); + ok(SUCCEEDED(hr), "Failed to create texture %u, hr %#x.\n", i, hr); + + hr = ID3D11Device_CreateRenderTargetView(device, (ID3D11Resource *)rt[i], NULL, &rtv[i]); + ok(SUCCEEDED(hr), "Failed to create rendertarget view %u, hr %#x.\n", i, hr); + } + + hr = ID3D11Device_CreateVertexShader(device, vs_code, sizeof(vs_code), NULL, &vs); + ok(SUCCEEDED(hr), "Failed to create vertex shader, hr %#x.\n", hr); + hr = ID3D11Device_CreatePixelShader(device, ps_code, sizeof(ps_code), NULL, &ps); + ok(SUCCEEDED(hr), "Failed to create pixel shader, hr %#x.\n", hr); + + ID3D11Device_GetImmediateContext(device, &context); + + ID3D11DeviceContext_OMSetRenderTargets(context, 4, rtv, NULL); + ID3D11DeviceContext_IASetInputLayout(context, input_layout); + ID3D11DeviceContext_IASetPrimitiveTopology(context, D3D11_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP); + stride = sizeof(*quad); + offset = 0; + ID3D11DeviceContext_IASetVertexBuffers(context, 0, 1, &vb, &stride, &offset); + ID3D11DeviceContext_VSSetShader(context, vs, NULL, 0); + ID3D11DeviceContext_PSSetShader(context, ps, NULL, 0); + + vp.TopLeftX = 0.0f; + vp.TopLeftY = 0.0f; + vp.Width = 640.0f; + vp.Height = 480.0f; + vp.MinDepth = 0.0f; + vp.MaxDepth = 1.0f; + ID3D11DeviceContext_RSSetViewports(context, 1, &vp); + + for (i = 0; i < sizeof(rtv) / sizeof(*rtv); ++i) + ID3D11DeviceContext_ClearRenderTargetView(context, rtv[i], red); + + ID3D11DeviceContext_Draw(context, 4, 0); + + color = get_texture_color(rt[0], 320, 240); + ok(compare_color(color, 0xffffffff, 2), "Got unexpected color 0x%08x.\n", color); + color = get_texture_color(rt[1], 320, 240); + ok(compare_color(color, 0x7f7f7f7f, 2), "Got unexpected color 0x%08x.\n", color); + color = get_texture_color(rt[2], 320, 240); + ok(compare_color(color, 0x33333333, 2), "Got unexpected color 0x%08x.\n", color); + color = get_texture_color(rt[3], 320, 240); + ok(compare_color(color, 0xff7f3300, 2), "Got unexpected color 0x%08x.\n", color); + + ID3D11Buffer_Release(vb); + ID3D11PixelShader_Release(ps); + ID3D11VertexShader_Release(vs); + ID3D11InputLayout_Release(input_layout); + for (i = 0; i < sizeof(rtv) / sizeof(*rtv); ++i) + ID3D11RenderTargetView_Release(rtv[i]); + for (i = 0; i < sizeof(rt) / sizeof(*rt); ++i) + ID3D11Texture2D_Release(rt[i]); + ID3D11DeviceContext_Release(context); + refcount = ID3D11Device_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); +} + static void test_scissor(void) { ID3D11DeviceContext *immediate_context; @@ -5205,6 +5396,7 @@ START_TEST(d3d11) test_private_data(); test_blend(); test_texture(); + test_multiple_render_targets(); test_scissor(); test_il_append_aligned(); test_fragment_coords();

1 0