May 2008 - Wine-Commits - list.winehq.org

Alexandre Julliard : user32: Invalidate the DCE in SetWindowPos before we attempt to move the window bits .
by Alexandre Julliard May 12, 2008

May 12, 2008

Module: wine Branch: master Commit: ad0e82e136c0505a67d730a5d2784b8eb83fa2bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=ad0e82e136c0505a67d730a5d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon May 12 13:37:49 2008 +0200 user32: Invalidate the DCE in SetWindowPos before we attempt to move the window bits. --- dlls/user32/winpos.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/user32/winpos.c b/dlls/user32/winpos.c index b325384..916cac5 100644 --- a/dlls/user32/winpos.c +++ b/dlls/user32/winpos.c @@ -1904,12 +1904,13 @@ BOOL set_window_pos( HWND hwnd, HWND insert_after, UINT swp_flags, if (ret) { - USER_Driver->pSetWindowPos( hwnd, insert_after, swp_flags, window_rect, - client_rect, &visible_rect, valid_rects ); - + /* FIXME: should update visible rect before invalidating DCE */ if (((swp_flags & SWP_AGG_NOPOSCHANGE) != SWP_AGG_NOPOSCHANGE) || (swp_flags & (SWP_HIDEWINDOW | SWP_SHOWWINDOW | SWP_STATECHANGED))) invalidate_dce( hwnd, &old_window_rect ); + + USER_Driver->pSetWindowPos( hwnd, insert_after, swp_flags, window_rect, + client_rect, &visible_rect, valid_rects ); } return ret; }

1 0

Alexander Dorofeyev : wined3d: Activate context for the right target in surface_blt_to_drawable.
by Alexandre Julliard May 12, 2008

May 12, 2008

Module: wine Branch: master Commit: a25651138a4cfd78fb5837e20127fabebdb0743f URL: http://source.winehq.org/git/wine.git/?a=commit;h=a25651138a4cfd78fb5837e20… Author: Alexander Dorofeyev <alexd4(a)inbox.lv> Date: Mon May 12 01:44:06 2008 +0300 wined3d: Activate context for the right target in surface_blt_to_drawable. --- 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 d40ad06..7a1a355 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3878,7 +3878,7 @@ static inline void surface_blt_to_drawable(IWineD3DSurfaceImpl *This, const RECT rect.bottom = This->currentDesc.Height; } - ActivateContext(device, device->render_targets[0], CTXUSAGE_BLIT); + ActivateContext(device, (IWineD3DSurface*)This, CTXUSAGE_BLIT); ENTER_GL(); if(This->glDescription.target == GL_TEXTURE_RECTANGLE_ARB) {

1 0

Alexander Dorofeyev : wined3d: glFlush when updating front buffer.
by Alexandre Julliard May 12, 2008

May 12, 2008

Module: wine Branch: master Commit: e1c60caa42a028f5a13c1dacbb2003ab0bb7fd13 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e1c60caa42a028f5a13c1dacb… Author: Alexander Dorofeyev <alexd4(a)inbox.lv> Date: Mon May 12 01:44:08 2008 +0300 wined3d: glFlush when updating front buffer. Fixes screen not updating or getting updated inconsistently when apps blit to front buffer or lock it when RenderTargetLockMode=readtex, as happens in e.g. Red Alert 2 and also in p8_primary_test in ddraw tests. --- dlls/wined3d/surface.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 40626d6..d40ad06 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3397,7 +3397,7 @@ static HRESULT IWineD3DSurfaceImpl_BltOverride(IWineD3DSurfaceImpl *This, RECT * } /* Flush in case the drawable is used by multiple GL contexts */ - if(dstSwapchain && (dstSwapchain->num_contexts >= 2)) + if(dstSwapchain && (This == (IWineD3DSurfaceImpl *) dstSwapchain->frontBuffer || dstSwapchain->num_contexts >= 2)) glFlush(); glBindTexture(Src->glDescription.target, 0); @@ -4020,7 +4020,8 @@ static inline void surface_blt_to_drawable(IWineD3DSurfaceImpl *This, const RECT hr = IWineD3DSurface_GetContainer((IWineD3DSurface*)This, &IID_IWineD3DSwapChain, (void **) &swapchain); if(hr == WINED3D_OK && swapchain) { /* Make sure to flush the buffers. This is needed in apps like Red Alert II and Tiberian SUN that use multiple WGL contexts. */ - if(((IWineD3DSwapChainImpl*)swapchain)->num_contexts >= 2) + if(((IWineD3DSwapChainImpl*)swapchain)->frontBuffer == (IWineD3DSurface*)This || + ((IWineD3DSwapChainImpl*)swapchain)->num_contexts >= 2) glFlush(); IWineD3DSwapChain_Release(swapchain);

1 0

Alexandre Julliard : server: Also crop the update region of children when moving a window.
by Alexandre Julliard May 12, 2008

May 12, 2008

Module: wine Branch: master Commit: bc25119c6ecb5e733be2a32b56cd24cfd78d3d06 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc25119c6ecb5e733be2a32b5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon May 12 12:28:57 2008 +0200 server: Also crop the update region of children when moving a window. --- dlls/user32/tests/msg.c | 13 ++++++++++++ server/window.c | 50 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 63 insertions(+), 0 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 3499f69..da353f9 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -5811,6 +5811,19 @@ static void test_paint_messages(void) SetRectRgn( hrgn, 10, 10, 40, 40 ); check_update_rgn( hchild, hrgn ); + /* moving parent off-screen does too */ + SetRect( &rect, 0, 0, 100, 100 ); + RedrawWindow( hparent, &rect, 0, RDW_INVALIDATE | RDW_ERASE | RDW_NOCHILDREN ); + SetRectRgn( hrgn, 0, 0, 100, 100 ); + check_update_rgn( hparent, hrgn ); + SetRectRgn( hrgn, 10, 10, 40, 40 ); + check_update_rgn( hchild, hrgn ); + MoveWindow( hparent, -20, -20, 200, 200, FALSE ); + SetRectRgn( hrgn, 20, 20, 100, 100 ); + check_update_rgn( hparent, hrgn ); + SetRectRgn( hrgn, 30, 30, 40, 40 ); + check_update_rgn( hchild, hrgn ); + DestroyWindow( hparent ); ok(!IsWindow(hchild), "child must be destroyed with its parent\n"); flush_sequence(); diff --git a/server/window.c b/server/window.c index 4c3b3ba..3a67b8d 100644 --- a/server/window.c +++ b/server/window.c @@ -1097,6 +1097,45 @@ static int add_update_region( struct window *win, struct region *region ) } +/* crop the update region of children to the specified rectangle, in client coords */ +static void crop_children_update_region( struct window *win, rectangle_t *rect ) +{ + struct window *child; + struct region *tmp = create_empty_region(); + rectangle_t child_rect; + + LIST_FOR_EACH_ENTRY( child, &win->children, struct window, entry ) + { + if (!(child->style & WS_VISIBLE)) continue; + if (!rect) /* crop everything out */ + { + crop_children_update_region( child, NULL ); + set_update_region( child, NULL ); + continue; + } + + /* nothing to do if child is completely inside rect */ + if (child->window_rect.left >= rect->left && + child->window_rect.top >= rect->top && + child->window_rect.right <= rect->right && + child->window_rect.bottom <= rect->bottom) continue; + + /* map to child client coords and crop grand-children */ + child_rect = *rect; + offset_rect( &child_rect, -child->client_rect.left, -child->client_rect.top ); + crop_children_update_region( child, &child_rect ); + + /* now crop the child itself */ + if (!child->update_region) continue; + if (!(tmp = create_empty_region())) continue; + set_region_rect( tmp, rect ); + offset_region( tmp, -child->window_rect.left, -child->window_rect.top ); + if (intersect_region( tmp, child->update_region, tmp )) set_update_region( child, tmp ); + else free_region( tmp ); + } +} + + /* validate the non client area of a window */ static void validate_non_client( struct window *win ) { @@ -1521,6 +1560,17 @@ static void set_window_pos( struct window *win, struct window *previous, else set_update_region( win, NULL ); /* visible rect is empty */ } + /* crop children regions to the new window rect */ + + if (get_window_visible_rect( win, &rect, 0 )) + { + /* map to client coords */ + offset_rect( &rect, win->window_rect.left - win->client_rect.left, + win->window_rect.top - win->client_rect.top ); + crop_children_update_region( win, &rect ); + } + else crop_children_update_region( win, NULL ); + if (swp_flags & SWP_NOREDRAW) goto done; /* do not repaint anything */ /* expose the whole non-client area if it changed in any way */

1 0

Alexandre Julliard : server: Crop the invalidate region against the rectangles of all parents.
by Alexandre Julliard May 12, 2008

May 12, 2008

Module: wine Branch: master Commit: 30c0639b5a2623072e0b93932d196f37976951b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=30c0639b5a2623072e0b93932… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon May 12 12:29:56 2008 +0200 server: Crop the invalidate region against the rectangles of all parents. --- dlls/user32/tests/msg.c | 6 ++++++ server/window.c | 30 +++++++++++++++++------------- 2 files changed, 23 insertions(+), 13 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index da353f9..fe4264e 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -5824,6 +5824,12 @@ static void test_paint_messages(void) SetRectRgn( hrgn, 30, 30, 40, 40 ); check_update_rgn( hchild, hrgn ); + /* invalidated region is cropped by the parent rects */ + SetRect( &rect, 0, 0, 50, 50 ); + RedrawWindow( hchild, &rect, 0, RDW_INVALIDATE | RDW_ERASE ); + SetRectRgn( hrgn, 30, 30, 50, 50 ); + check_update_rgn( hchild, hrgn ); + DestroyWindow( hparent ); ok(!IsWindow(hchild), "child must be destroyed with its parent\n"); flush_sequence(); diff --git a/server/window.c b/server/window.c index 3a67b8d..9530c61 100644 --- a/server/window.c +++ b/server/window.c @@ -1036,23 +1036,27 @@ static int get_window_visible_rect( struct window *win, rectangle_t *rect, int f /* and converted from client to window coordinates. Helper for (in)validate_window. */ static struct region *crop_region_to_win_rect( struct window *win, struct region *region, int frame ) { - struct region *tmp = create_empty_region(); + rectangle_t rect; + struct region *tmp; - if (!tmp) return NULL; + if (!get_window_visible_rect( win, &rect, frame )) return NULL; + if (!(tmp = create_empty_region())) return NULL; + set_region_rect( tmp, &rect ); - /* get bounding rect in client coords */ - if (frame) set_region_rect( tmp, &win->window_rect ); - else set_region_client_rect( tmp, win ); - if (!is_desktop_window(win)) - offset_region( tmp, -win->client_rect.left, -win->client_rect.top ); + if (region) + { + /* map it to client coords */ + offset_region( tmp, win->window_rect.left - win->client_rect.left, + win->window_rect.top - win->client_rect.top ); - /* intersect specified region with bounding rect */ - if (region && !intersect_region( tmp, region, tmp )) goto done; - if (is_region_empty( tmp )) goto done; + /* intersect specified region with bounding rect */ + if (!intersect_region( tmp, region, tmp )) goto done; + if (is_region_empty( tmp )) goto done; - /* map it to window coords */ - offset_region( tmp, win->client_rect.left - win->window_rect.left, - win->client_rect.top - win->window_rect.top ); + /* map it back to window coords */ + offset_region( tmp, win->client_rect.left - win->window_rect.left, + win->client_rect.top - win->window_rect.top ); + } return tmp; done:

1 0

Alexandre Julliard : server: When moving/ resizing a window crop the update region against the new rectangle of the parents .
by Alexandre Julliard May 12, 2008

May 12, 2008

Module: wine Branch: master Commit: e02969ddf091e5e7cb1db02efc291a6bc308e1a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e02969ddf091e5e7cb1db02ef… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon May 12 12:26:26 2008 +0200 server: When moving/resizing a window crop the update region against the new rectangle of the parents. --- dlls/user32/tests/msg.c | 32 ++++++++++++++++++++++ server/window.c | 67 ++++++++++++++++++++++++++++++++++++++-------- 2 files changed, 87 insertions(+), 12 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 6d1acb1..3499f69 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -5783,6 +5783,38 @@ static void test_paint_messages(void) DestroyWindow( hparent ); ok(!IsWindow(hchild), "child must be destroyed with its parent\n"); + /* tests for moving windows off-screen (needs simple WS_POPUP windows) */ + + hparent = CreateWindowExA(0, "TestParentClass", "Test parent", WS_POPUP | WS_VISIBLE, + 100, 100, 200, 200, 0, 0, 0, NULL); + ok (hparent != 0, "Failed to create parent window\n"); + + hchild = CreateWindowExA(0, "TestWindowClass", "Test child", WS_CHILD | WS_VISIBLE, + 10, 10, 100, 100, hparent, 0, 0, NULL); + ok (hchild != 0, "Failed to create child window\n"); + + ShowWindow( hparent, SW_SHOW ); + UpdateWindow( hparent ); + UpdateWindow( hchild ); + flush_events(); + flush_sequence(); + + /* moving child outside of parent boundaries changes update region */ + SetRect( &rect, 0, 0, 40, 40 ); + RedrawWindow( hchild, &rect, 0, RDW_INVALIDATE | RDW_ERASE ); + SetRectRgn( hrgn, 0, 0, 40, 40 ); + check_update_rgn( hchild, hrgn ); + MoveWindow( hchild, -10, 10, 100, 100, FALSE ); + SetRectRgn( hrgn, 10, 0, 40, 40 ); + check_update_rgn( hchild, hrgn ); + MoveWindow( hchild, -10, -10, 100, 100, FALSE ); + SetRectRgn( hrgn, 10, 10, 40, 40 ); + check_update_rgn( hchild, hrgn ); + + DestroyWindow( hparent ); + ok(!IsWindow(hchild), "child must be destroyed with its parent\n"); + flush_sequence(); + DeleteObject( hrgn ); DeleteObject( hrgn2 ); } diff --git a/server/window.c b/server/window.c index e10f9a7..4c3b3ba 100644 --- a/server/window.c +++ b/server/window.c @@ -876,6 +876,16 @@ static inline int intersect_rect( rectangle_t *dst, const rectangle_t *src1, con } +/* offset the coordinates of a rectangle */ +static inline void offset_rect( rectangle_t *rect, int offset_x, int offset_y ) +{ + rect->left += offset_x; + rect->top += offset_y; + rect->right += offset_x; + rect->bottom += offset_y; +} + + /* set the region to the client rect clipped by the window rect, in parent-relative coordinates */ static void set_region_client_rect( struct region *region, struct window *win ) { @@ -990,6 +1000,38 @@ struct window_class* get_window_class( user_handle_t window ) return win->class; } +/* determine the window visible rectangle, i.e. window or client rect cropped by parent rects */ +/* the returned rectangle is in window coordinates; return 0 if rectangle is empty */ +static int get_window_visible_rect( struct window *win, rectangle_t *rect, int frame ) +{ + int offset_x = 0, offset_y = 0; + + if (!(win->style & WS_VISIBLE)) return 0; + + *rect = frame ? win->window_rect : win->client_rect; + if (!is_desktop_window(win)) + { + offset_x = win->window_rect.left; + offset_y = win->window_rect.top; + } + + while (win->parent) + { + win = win->parent; + if (!(win->style & WS_VISIBLE) || win->style & WS_MINIMIZE) return 0; + if (!is_desktop_window(win)) + { + offset_x += win->client_rect.left; + offset_y += win->client_rect.top; + offset_rect( rect, win->client_rect.left, win->client_rect.top ); + } + if (!intersect_rect( rect, rect, &win->client_rect )) return 0; + if (!intersect_rect( rect, rect, &win->window_rect )) return 0; + } + offset_rect( rect, -offset_x, -offset_y ); + return 1; +} + /* return a copy of the specified region cropped to the window client or frame rectangle, */ /* and converted from client to window coordinates. Helper for (in)validate_window. */ static struct region *crop_region_to_win_rect( struct window *win, struct region *region, int frame ) @@ -1413,6 +1455,7 @@ static void set_window_pos( struct window *win, struct window *previous, struct region *old_vis_rgn = NULL, *exposed_rgn = NULL; const rectangle_t old_window_rect = win->window_rect; const rectangle_t old_client_rect = win->client_rect; + rectangle_t rect; int client_changed, frame_changed; int visible = (win->style & WS_VISIBLE) || (swp_flags & SWP_SHOWWINDOW); @@ -1461,21 +1504,21 @@ static void set_window_pos( struct window *win, struct window *previous, /* crop update region to the new window rect */ - if (win->update_region && - (window_rect->right - window_rect->left < old_window_rect.right - old_window_rect.left || - window_rect->bottom - window_rect->top < old_window_rect.bottom - old_window_rect.top)) + if (win->update_region) { - struct region *tmp = create_empty_region(); - if (tmp) + if (get_window_visible_rect( win, &rect, 1 )) { - set_region_rect( tmp, window_rect ); - if (!is_desktop_window(win)) - offset_region( tmp, -window_rect->left, -window_rect->top ); - if (intersect_region( tmp, win->update_region, tmp )) - set_update_region( win, tmp ); - else - free_region( tmp ); + struct region *tmp = create_empty_region(); + if (tmp) + { + set_region_rect( tmp, &rect ); + if (intersect_region( tmp, win->update_region, tmp )) + set_update_region( win, tmp ); + else + free_region( tmp ); + } } + else set_update_region( win, NULL ); /* visible rect is empty */ } if (swp_flags & SWP_NOREDRAW) goto done; /* do not repaint anything */

1 0

Alexandre Julliard : winedos: Don' t disable long filename functions on NT versions.
by Alexandre Julliard May 12, 2008

May 12, 2008

Module: wine Branch: master Commit: f8f8e7ef514a7de694801ab0e9085dee6e20157f URL: http://source.winehq.org/git/wine.git/?a=commit;h=f8f8e7ef514a7de694801ab0e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon May 12 11:44:19 2008 +0200 winedos: Don't disable long filename functions on NT versions. --- dlls/winedos/int21.c | 8 -------- 1 files changed, 0 insertions(+), 8 deletions(-) diff --git a/dlls/winedos/int21.c b/dlls/winedos/int21.c index 3b60719..33032d4 100644 --- a/dlls/winedos/int21.c +++ b/dlls/winedos/int21.c @@ -3055,14 +3055,6 @@ static void INT21_LongFilename( CONTEXT86 *context ) WCHAR pathW[MAX_PATH]; char* pathA; - if (HIBYTE(HIWORD(GetVersion16())) < 0x07) - { - TRACE( "LONG FILENAME - functions supported only under DOS7\n" ); - SET_CFLAG( context ); - SET_AL( context, 0 ); - return; - } - switch (AL_reg(context)) { case 0x0d: /* RESET DRIVE */

1 0

Hwang YunSong(황윤성) : shell32: Updated Korean Resource.
by Alexandre Julliard May 12, 2008

May 12, 2008

Module: wine Branch: master Commit: 49099ba0e5a2e4d23960e927892476bad8c3309f URL: http://source.winehq.org/git/wine.git/?a=commit;h=49099ba0e5a2e4d23960e9278… Author: Hwang YunSong(황윤성) <hys545(a)dreamwiz.com> Date: Mon May 12 10:28:50 2008 +0900 shell32: Updated Korean Resource. --- dlls/shell32/shell32_Ko.rc | 38 +++++++++++++++++++------------------- 1 files changed, 19 insertions(+), 19 deletions(-) diff --git a/dlls/shell32/shell32_Ko.rc b/dlls/shell32/shell32_Ko.rc index e410bd9..e6e45bc 100644 --- a/dlls/shell32/shell32_Ko.rc +++ b/dlls/shell32/shell32_Ko.rc @@ -222,35 +222,35 @@ IDS_SHUTDOWN_TITLE " IDS_SHUTDOWN_PROMPT "�� Wine �� ڽ��ϱ�?" /* shell folder path default values */ -IDS_PROGRAMS "Start Menu\\Programs" -IDS_PERSONAL "My Documents" -IDS_FAVORITES "Favorites" -IDS_STARTUP "Start Menu\\Programs\\StartUp" -IDS_RECENT "Recent" -IDS_SENDTO "SendTo" -IDS_STARTMENU "Start Menu" -IDS_MYMUSIC "My Music" -IDS_MYVIDEO "My Video" -IDS_DESKTOPDIRECTORY "Desktop" -IDS_NETHOOD "NetHood" +IDS_PROGRAMS "�� ޴�\\��α׷�" +IDS_PERSONAL "�� " +IDS_FAVORITES "��ã��" +IDS_STARTUP "�� ޴�\\��α׷�\\�� α׷�" +IDS_RECENT "�ֱ� ��" +IDS_SENDTO "��" +IDS_STARTMENU "�� ޴�" +IDS_MYMUSIC "�� " +IDS_MYVIDEO "�� " +IDS_DESKTOPDIRECTORY "��ũž" +IDS_NETHOOD "��Ʈ��ũ ȯ��" IDS_TEMPLATES "Templates" IDS_APPDATA "Application Data" -IDS_PRINTHOOD "PrintHood" +IDS_PRINTHOOD "��Ʈ��ũ ȯ��" IDS_LOCAL_APPDATA "Local Settings\\Application Data" IDS_INTERNET_CACHE "Local Settings\\Temporary Internet Files" IDS_COOKIES "Cookies" IDS_HISTORY "Local Settings\\History" IDS_PROGRAM_FILES "Program Files" -IDS_MYPICTURES "My Pictures" +IDS_MYPICTURES "�� ׸�" IDS_PROGRAM_FILES_COMMON "Program Files\\Common Files" -IDS_COMMON_DOCUMENTS "Documents" -IDS_ADMINTOOLS "Start Menu\\Programs\\Administrative Tools" -IDS_COMMON_MUSIC "Documents\\My Music" -IDS_COMMON_PICTURES "Documents\\My Pictures" -IDS_COMMON_VIDEO "Documents\\My Video" +IDS_COMMON_DOCUMENTS "��" +IDS_ADMINTOOLS "��۸޴�\\��α׷�\\�� " +IDS_COMMON_MUSIC "��\\�� " +IDS_COMMON_PICTURES "��\\�� ׸�" +IDS_COMMON_VIDEO "��\\�� " IDS_CDBURN_AREA "Local Settings\\Application Data\\Microsoft\\CD Burning" -IDS_NEWFOLDER "�� r" +IDS_NEWFOLDER "�� " } STRINGTABLE

1 0

Vitaliy Margolen : dinput: Implement GetDeviceStatus.
by Alexandre Julliard May 12, 2008

May 12, 2008

Module: wine Branch: master Commit: a37c60b0f7069ca16fab9762328fe93ea1258544 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a37c60b0f7069ca16fab97623… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Sun May 11 13:33:17 2008 -0600 dinput: Implement GetDeviceStatus. --- dlls/dinput/dinput_main.c | 9 ++++++++- dlls/dinput/tests/device.c | 21 ++++++++++++++++++--- 2 files changed, 26 insertions(+), 4 deletions(-) diff --git a/dlls/dinput/dinput_main.c b/dlls/dinput/dinput_main.c index 5fa21f0..f28fe25 100644 --- a/dlls/dinput/dinput_main.c +++ b/dlls/dinput/dinput_main.c @@ -417,8 +417,15 @@ static HRESULT WINAPI IDirectInputWImpl_Initialize(LPDIRECTINPUT7W iface, HINSTA static HRESULT WINAPI IDirectInputAImpl_GetDeviceStatus(LPDIRECTINPUT7A iface, REFGUID rguid) { IDirectInputImpl *This = (IDirectInputImpl *)iface; + HRESULT hr; + LPDIRECTINPUTDEVICEA device; - FIXME( "(%p)->(%s): stub\n", This, debugstr_guid(rguid) ); + TRACE( "(%p)->(%s)\n", This, debugstr_guid(rguid) ); + + hr = IDirectInput_CreateDevice( iface, rguid, &device, NULL ); + if (hr != DI_OK) return DI_NOTATTACHED; + + IUnknown_Release( device ); return DI_OK; } diff --git a/dlls/dinput/tests/device.c b/dlls/dinput/tests/device.c index 0088d5b..3659530 100644 --- a/dlls/dinput/tests/device.c +++ b/dlls/dinput/tests/device.c @@ -124,10 +124,13 @@ static BOOL CALLBACK enum_devices(LPCDIDEVICEINSTANCE lpddi, LPVOID pvRef) LPDIRECTINPUTDEVICE device; HRESULT hr; - hr = IDirectInput_CreateDevice(data->pDI, &lpddi->guidInstance, &device, NULL); - ok(SUCCEEDED(hr), "IDirectInput_CreateDevice() failed: %s\n", DXGetErrorString8(hr)); - if (SUCCEEDED(hr)) + hr = IDirectInput_GetDeviceStatus(data->pDI, &lpddi->guidInstance); + ok(hr == DI_OK, "IDirectInput_GetDeviceStatus() failed: %s\n", DXGetErrorString8(hr)); + + if (hr == DI_OK) { + hr = IDirectInput_CreateDevice(data->pDI, &lpddi->guidInstance, &device, NULL); + ok(SUCCEEDED(hr), "IDirectInput_CreateDevice() failed: %s\n", DXGetErrorString8(hr)); trace("Testing device \"%s\"\n", lpddi->tszInstanceName); test_object_info(device, data->hwnd); IUnknown_Release(device); @@ -164,6 +167,18 @@ static void device_tests(void) hr = IDirectInput_EnumDevices(pDI, 0, enum_devices, &data, DIEDFL_ALLDEVICES); ok(SUCCEEDED(hr), "IDirectInput_EnumDevices() failed: %s\n", DXGetErrorString8(hr)); + + /* If GetDeviceStatus returns DI_OK the device must exist */ + hr = IDirectInput_GetDeviceStatus(pDI, &GUID_Joystick); + if (hr == DI_OK) + { + LPDIRECTINPUTDEVICE device = NULL; + + hr = IDirectInput_CreateDevice(pDI, &GUID_Joystick, &device, NULL); + ok(SUCCEEDED(hr), "IDirectInput_CreateDevice() failed: %s\n", DXGetErrorString8(hr)); + if (device) IUnknown_Release(device); + } + DestroyWindow(hwnd); } if (pDI) IUnknown_Release(pDI);

1 0

Vitaliy Margolen : dxdiagn: Update dx version to 9.0c.
by Alexandre Julliard May 12, 2008

May 12, 2008

Module: wine Branch: master Commit: d7b98841ab4c4ab938d5ac71614f004ab29f46bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=d7b98841ab4c4ab938d5ac716… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Sun May 11 13:35:28 2008 -0600 dxdiagn: Update dx version to 9.0c. --- dlls/dxdiagn/version.rc | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/dxdiagn/version.rc b/dlls/dxdiagn/version.rc index c811225..8de3f18 100644 --- a/dlls/dxdiagn/version.rc +++ b/dlls/dxdiagn/version.rc @@ -18,9 +18,9 @@ #define WINE_FILEDESCRIPTION_STR "Wine DxDiag 8" #define WINE_FILENAME_STR "dxdiagn.dll" -#define WINE_FILEVERSION 5,3,1,902 -#define WINE_FILEVERSION_STR "5.3.1.902" -#define WINE_PRODUCTVERSION 5,3,1,902 -#define WINE_PRODUCTVERSION_STR "5.3" +#define WINE_FILEVERSION 5,3,1,904 +#define WINE_FILEVERSION_STR "5.3.1.904" +#define WINE_PRODUCTVERSION 5,3,1,904 +#define WINE_PRODUCTVERSION_STR "5.3.1.904" #include "wine/wine_common_ver.rc"

1 0