September 2010 - Wine-commits

Henri Verbeet : wined3d: Pass a wined3d_state structure to set_tex_op_nvrc( ).
by Alexandre Julliard 23 Sep '10

23 Sep '10

Module: wine Branch: master Commit: 578df29b9fe9f015029703323d6433bdf01f531a URL: http://source.winehq.org/git/wine.git/?a=commit;h=578df29b9fe9f015029703323… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Sep 23 11:48:03 2010 +0200 wined3d: Pass a wined3d_state structure to set_tex_op_nvrc(). --- dlls/wined3d/nvidia_texture_shader.c | 10 +++++----- dlls/wined3d/state.c | 2 +- dlls/wined3d/wined3d_private.h | 5 +++-- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/nvidia_texture_shader.c b/dlls/wined3d/nvidia_texture_shader.c index cc25c42..6576e61 100644 --- a/dlls/wined3d/nvidia_texture_shader.c +++ b/dlls/wined3d/nvidia_texture_shader.c @@ -131,9 +131,9 @@ static void get_src_and_opr_nvrc(DWORD stage, DWORD arg, BOOL is_alpha, GLenum* *input = d3dta_to_combiner_input(arg & WINED3DTA_SELECTMASK, stage, texture_idx); } -void set_tex_op_nvrc(IWineD3DDevice *iface, BOOL is_alpha, int stage, WINED3DTEXTUREOP op, DWORD arg1, DWORD arg2, DWORD arg3, INT texture_idx, DWORD dst) { - IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl*)iface; - const struct wined3d_gl_info *gl_info = &This->adapter->gl_info; +void set_tex_op_nvrc(const struct wined3d_gl_info *gl_info, const struct wined3d_state *state, BOOL is_alpha, + int stage, WINED3DTEXTUREOP op, DWORD arg1, DWORD arg2, DWORD arg3, INT texture_idx, DWORD dst) +{ tex_op_args tex_op_args = {{0}, {0}, {0}}; GLenum portion = is_alpha ? GL_ALPHA : GL_RGB; GLenum target = GL_COMBINER0_NV + stage; @@ -144,7 +144,7 @@ void set_tex_op_nvrc(IWineD3DDevice *iface, BOOL is_alpha, int stage, WINED3DTEX /* If a texture stage references an invalid texture unit the stage just * passes through the result from the previous stage */ - if (is_invalid_op(&This->stateBlock->state, stage, op, arg1, arg2, arg3)) + if (is_invalid_op(state, stage, op, arg1, arg2, arg3)) { arg1 = WINED3DTA_CURRENT; op = WINED3DTOP_SELECTARG1; @@ -538,7 +538,7 @@ static void nvrc_colorop(DWORD state, IWineD3DStateBlockImpl *stateblock, struct } /* Set the texture combiners */ - set_tex_op_nvrc((IWineD3DDevice *)stateblock->device, FALSE, stage, + set_tex_op_nvrc(gl_info, &stateblock->state, FALSE, stage, stateblock->state.texture_states[stage][WINED3DTSS_COLOROP], stateblock->state.texture_states[stage][WINED3DTSS_COLORARG1], stateblock->state.texture_states[stage][WINED3DTSS_COLORARG2], diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 2d31fb4..d824005 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -3254,7 +3254,7 @@ void tex_alphaop(DWORD state, IWineD3DStateBlockImpl *stateblock, struct wined3d TRACE("Setting alpha op for stage %d\n", stage); if (gl_info->supported[NV_REGISTER_COMBINERS]) { - set_tex_op_nvrc((IWineD3DDevice *)stateblock->device, TRUE, stage, op, arg1, arg2, arg0, + set_tex_op_nvrc(gl_info, &stateblock->state, TRUE, stage, op, arg1, arg2, arg0, mapped_stage, stateblock->state.texture_states[stage][WINED3DTSS_RESULTARG]); } else diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 842923f..6685412 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2641,8 +2641,9 @@ GLenum StencilOp(DWORD op) DECLSPEC_HIDDEN; GLenum CompareFunc(DWORD func) DECLSPEC_HIDDEN; BOOL is_invalid_op(const struct wined3d_state *state, int stage, WINED3DTEXTUREOP op, DWORD arg1, DWORD arg2, DWORD arg3) DECLSPEC_HIDDEN; -void set_tex_op_nvrc(IWineD3DDevice *iface, BOOL is_alpha, int stage, WINED3DTEXTUREOP op, - DWORD arg1, DWORD arg2, DWORD arg3, INT texture_idx, DWORD dst) DECLSPEC_HIDDEN; +void set_tex_op_nvrc(const struct wined3d_gl_info *gl_info, const struct wined3d_state *state, + BOOL is_alpha, int stage, WINED3DTEXTUREOP op, DWORD arg1, DWORD arg2, DWORD arg3, + INT texture_idx, DWORD dst) DECLSPEC_HIDDEN; void set_texture_matrix(const float *smat, DWORD flags, BOOL calculatedCoords, BOOL transformed, enum wined3d_format_id coordtype, BOOL ffp_can_disable_proj) DECLSPEC_HIDDEN; void texture_activate_dimensions(DWORD stage, IWineD3DStateBlockImpl *stateblock,

1 0

Henri Verbeet : wininet: Check URLCache_LocalFileNameToPathW() return values in CreateUrlCacheEntryW().
by Alexandre Julliard 23 Sep '10

23 Sep '10

Module: wine Branch: master Commit: 7782e8188795ddc4cbdb51d81e1d5aa7200f6a33 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7782e8188795ddc4cbdb51d81… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Sep 23 11:48:04 2010 +0200 wininet: Check URLCache_LocalFileNameToPathW() return values in CreateUrlCacheEntryW(). It would be unfortunate if a long file name would cause us to open a file based on mostly uninitialized data and write the contents of some random webpage into it. --- dlls/wininet/urlcache.c | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/dlls/wininet/urlcache.c b/dlls/wininet/urlcache.c index 2fe488a..a220e33 100644 --- a/dlls/wininet/urlcache.c +++ b/dlls/wininet/urlcache.c @@ -2330,7 +2330,13 @@ BOOL WINAPI CreateUrlCacheEntryW( CacheDir = (BYTE)(rand() % pHeader->DirectoryCount); lBufferSize = MAX_PATH * sizeof(WCHAR); - URLCache_LocalFileNameToPathW(pContainer, pHeader, szFile, CacheDir, lpszFileName, &lBufferSize); + if (!URLCache_LocalFileNameToPathW(pContainer, pHeader, szFile, CacheDir, lpszFileName, &lBufferSize)) + { + WARN("Failed to get full path for filename %s, needed %u bytes.\n", + debugstr_a(szFile), lBufferSize); + URLCacheContainer_UnlockIndex(pContainer, pHeader); + return FALSE; + } URLCacheContainer_UnlockIndex(pContainer, pHeader);

1 0

Alexandre Julliard : user32: Add support for RTL window layouts in MapWindowPoints.
by Alexandre Julliard 22 Sep '10

22 Sep '10

Module: wine Branch: master Commit: 5702324b375e97682cb3d7f7643a78251064df90 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5702324b375e97682cb3d7f76… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Sep 22 20:27:52 2010 +0200 user32: Add support for RTL window layouts in MapWindowPoints. --- dlls/user32/tests/win.c | 39 +++++++++++++++++ dlls/user32/winpos.c | 93 +++++++++++++++++++++++----------------- include/wine/server_protocol.h | 4 +- server/protocol.def | 1 + server/request.h | 3 +- server/trace.c | 1 + server/window.c | 13 ++++++ 7 files changed, 113 insertions(+), 41 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5702324b375e97682cb3d…

1 0

Alexandre Julliard : user32: Add support for RTL window layouts in WIN_GetRectangles.
by Alexandre Julliard 22 Sep '10

22 Sep '10

Module: wine Branch: master Commit: 3f026cafa5d2fa76d31e379ca1cd3e7809907594 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f026cafa5d2fa76d31e379ca… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Sep 22 20:28:11 2010 +0200 user32: Add support for RTL window layouts in WIN_GetRectangles. --- dlls/user32/win.c | 28 ++++++++++++++++++++++++++++ server/window.c | 26 ++++++++++++++++++++++++++ 2 files changed, 54 insertions(+), 0 deletions(-) diff --git a/dlls/user32/win.c b/dlls/user32/win.c index d691676..17925e9 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -44,6 +44,14 @@ static DWORD process_layout; /**********************************************************************/ +static inline void mirror_rect( const RECT *window_rect, RECT *rect ) +{ + int width = window_rect->right - window_rect->left; + int tmp = rect->left; + rect->left = width - rect->right; + rect->right = width - tmp; +} + /* helper for Get/SetWindowLong */ static inline LONG_PTR get_win_data( const void *ptr, UINT size ) { @@ -689,12 +697,32 @@ BOOL WIN_GetRectangles( HWND hwnd, enum coords_relative relative, RECT *rectWind case COORDS_CLIENT: OffsetRect( &window_rect, -win->rectClient.left, -win->rectClient.top ); OffsetRect( &client_rect, -win->rectClient.left, -win->rectClient.top ); + if (win->dwExStyle & WS_EX_LAYOUTRTL) + mirror_rect( &win->rectClient, &window_rect ); break; case COORDS_WINDOW: OffsetRect( &window_rect, -win->rectWindow.left, -win->rectWindow.top ); OffsetRect( &client_rect, -win->rectWindow.left, -win->rectWindow.top ); + if (win->dwExStyle & WS_EX_LAYOUTRTL) + mirror_rect( &win->rectWindow, &client_rect ); break; case COORDS_PARENT: + if (win->parent) + { + WND *parent = WIN_GetPtr( win->parent ); + if (parent == WND_DESKTOP) break; + if (!parent || parent == WND_OTHER_PROCESS) + { + WIN_ReleasePtr( win ); + goto other_process; + } + if (parent->dwExStyle & WS_EX_LAYOUTRTL) + { + mirror_rect( &parent->rectClient, &window_rect ); + mirror_rect( &parent->rectClient, &client_rect ); + } + WIN_ReleasePtr( parent ); + } break; case COORDS_SCREEN: while (win->parent) diff --git a/server/window.c b/server/window.c index 8129912..ebcb5bf 100644 --- a/server/window.c +++ b/server/window.c @@ -905,6 +905,16 @@ static inline void offset_rect( rectangle_t *rect, int offset_x, int offset_y ) } +/* mirror a rectangle respective to the window client area */ +static inline void mirror_rect( const rectangle_t *window_rect, rectangle_t *rect ) +{ + int width = window_rect->right - window_rect->left; + int tmp = rect->left; + rect->left = width - rect->right; + rect->right = width - tmp; +} + + /* 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 ) { @@ -2134,13 +2144,29 @@ DECL_HANDLER(get_window_rectangles) offset_rect( &reply->window, -win->client_rect.left, -win->client_rect.top ); offset_rect( &reply->visible, -win->client_rect.left, -win->client_rect.top ); offset_rect( &reply->client, -win->client_rect.left, -win->client_rect.top ); + if (win->ex_style & WS_EX_LAYOUTRTL) + { + mirror_rect( &win->client_rect, &reply->window ); + mirror_rect( &win->client_rect, &reply->visible ); + } break; case COORDS_WINDOW: offset_rect( &reply->window, -win->window_rect.left, -win->window_rect.top ); offset_rect( &reply->visible, -win->window_rect.left, -win->window_rect.top ); offset_rect( &reply->client, -win->window_rect.left, -win->window_rect.top ); + if (win->ex_style & WS_EX_LAYOUTRTL) + { + mirror_rect( &win->window_rect, &reply->visible ); + mirror_rect( &win->window_rect, &reply->client ); + } break; case COORDS_PARENT: + if (win->parent && win->parent->ex_style & WS_EX_LAYOUTRTL) + { + mirror_rect( &win->parent->client_rect, &reply->window ); + mirror_rect( &win->parent->client_rect, &reply->visible ); + mirror_rect( &win->parent->client_rect, &reply->client ); + } break; case COORDS_SCREEN: client_to_screen_rect( win->parent, &reply->window );

1 0

Alexandre Julliard : user32: Add support for right-to-left menus.
by Alexandre Julliard 22 Sep '10

22 Sep '10

Module: wine Branch: master Commit: 5c6a1f776a7a6a3c723721cdd46462e7bfcb3295 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c6a1f776a7a6a3c723721cdd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Sep 22 20:31:52 2010 +0200 user32: Add support for right-to-left menus. --- dlls/user32/menu.c | 27 ++++++++++++++++++++++----- dlls/user32/nonclient.c | 3 ++- 2 files changed, 24 insertions(+), 6 deletions(-) diff --git a/dlls/user32/menu.c b/dlls/user32/menu.c index e4dc607..4d2edf8 100644 --- a/dlls/user32/menu.c +++ b/dlls/user32/menu.c @@ -727,7 +727,8 @@ static MENUITEM *MENU_FindItemByCoords( const POPUPMENU *menu, RECT rect; if (!GetWindowRect(menu->hWnd, &rect)) return NULL; - pt.x -= rect.left; + if (GetWindowLongW( menu->hWnd, GWL_EXSTYLE ) & WS_EX_LAYOUTRTL) pt.x = rect.right - 1 - pt.x; + else pt.x -= rect.left; pt.y -= rect.top; item = menu->items; for (i = 0; i < menu->nItems; i++, item++) @@ -1834,6 +1835,7 @@ static BOOL MENU_ShowPopup( HWND hwndOwner, HMENU hmenu, UINT id, UINT flags, POINT pt; HMONITOR monitor; MONITORINFO info; + DWORD ex_style = 0; TRACE("owner=%p hmenu=%p id=0x%04x x=0x%04x y=0x%04x xa=0x%04x ya=0x%04x\n", hwndOwner, hmenu, id, x, y, xanchor, yanchor); @@ -1863,6 +1865,12 @@ static BOOL MENU_ShowPopup( HWND hwndOwner, HMENU hmenu, UINT id, UINT flags, info.cbSize = sizeof(info); GetMonitorInfoW( monitor, &info ); + if (flags & TPM_LAYOUTRTL) + { + ex_style = WS_EX_LAYOUTRTL; + flags ^= TPM_RIGHTALIGN; + } + if( flags & TPM_RIGHTALIGN ) x -= width; if( flags & TPM_CENTERALIGN ) x -= width / 2; @@ -1890,7 +1898,7 @@ static BOOL MENU_ShowPopup( HWND hwndOwner, HMENU hmenu, UINT id, UINT flags, if( y < info.rcWork.top ) y = info.rcWork.top; /* NOTE: In Windows, top menu popup is not owned. */ - menu->hWnd = CreateWindowExW( 0, (LPCWSTR)POPUPMENU_CLASS_ATOM, NULL, + menu->hWnd = CreateWindowExW( ex_style, (LPCWSTR)POPUPMENU_CLASS_ATOM, NULL, WS_POPUP, x, y, width, height, hwndOwner, 0, (HINSTANCE)GetWindowLongPtrW(hwndOwner, GWLP_HINSTANCE), (LPVOID)hmenu ); @@ -2339,6 +2347,7 @@ static HMENU MENU_ShowSubPopup( HWND hwndOwner, HMENU hmenu, GetClassLongW( menu->hWnd, GCL_STYLE)); NC_GetSysPopupPos( menu->hWnd, &rect ); + if (wFlags & TPM_LAYOUTRTL) rect.left = rect.right; rect.top = rect.bottom; rect.right = GetSystemMetrics(SM_CXSIZE); rect.bottom = GetSystemMetrics(SM_CYSIZE); @@ -2354,7 +2363,10 @@ static HMENU MENU_ShowSubPopup( HWND hwndOwner, HMENU hmenu, /* The first item in the popup menu has to be at the same y position as the focused menu item */ - rect.left += rc.right - GetSystemMetrics(SM_CXBORDER); + if (wFlags & TPM_LAYOUTRTL) + rect.left += GetSystemMetrics(SM_CXBORDER); + else + rect.left += rc.right - GetSystemMetrics(SM_CXBORDER); rect.top += rc.top - MENU_TOP_MARGIN; rect.right = rc.left - rc.right + GetSystemMetrics(SM_CXBORDER); rect.bottom = rc.top - rc.bottom - MENU_TOP_MARGIN @@ -2362,14 +2374,17 @@ static HMENU MENU_ShowSubPopup( HWND hwndOwner, HMENU hmenu, } else { - rect.left += item->rect.left; + if (wFlags & TPM_LAYOUTRTL) + rect.left = rect.right - item->rect.left; + else + rect.left += item->rect.left; rect.top += item->rect.bottom; rect.right = item->rect.right - item->rect.left; rect.bottom = item->rect.bottom - item->rect.top; } } - MENU_ShowPopup( hwndOwner, item->hSubMenu, menu->FocusedItem, 0, + MENU_ShowPopup( hwndOwner, item->hSubMenu, menu->FocusedItem, wFlags, rect.left, rect.top, rect.right, rect.bottom ); if (selectFirst) MENU_MoveSelection( hwndOwner, item->hSubMenu, ITEM_NEXT ); @@ -3319,6 +3334,7 @@ void MENU_TrackMouseMenuBar( HWND hWnd, INT ht, POINT pt ) TRACE("wnd=%p ht=0x%04x %s\n", hWnd, ht, wine_dbgstr_point( &pt)); + if (GetWindowLongW( hWnd, GWL_EXSTYLE ) & WS_EX_LAYOUTRTL) wFlags |= TPM_LAYOUTRTL; if (IsMenu(hMenu)) { MENU_InitTracking( hWnd, hMenu, FALSE, wFlags ); @@ -3356,6 +3372,7 @@ void MENU_TrackKbdMenuBar( HWND hwnd, UINT wParam, WCHAR wChar) uItem = 0; wParam |= HTSYSMENU; /* prevent item lookup */ } + if (GetWindowLongW( hwnd, GWL_EXSTYLE ) & WS_EX_LAYOUTRTL) wFlags |= TPM_LAYOUTRTL; if (!IsMenu( hTrackMenu )) return; diff --git a/dlls/user32/nonclient.c b/dlls/user32/nonclient.c index 051041c..f385445 100644 --- a/dlls/user32/nonclient.c +++ b/dlls/user32/nonclient.c @@ -1185,9 +1185,10 @@ void NC_GetSysPopupPos( HWND hwnd, RECT* rect ) DWORD style = GetWindowLongW( hwnd, GWL_STYLE ); DWORD ex_style = GetWindowLongW( hwnd, GWL_EXSTYLE ); - NC_GetInsideRect( hwnd, COORDS_SCREEN, rect, style, ex_style ); + NC_GetInsideRect( hwnd, COORDS_CLIENT, rect, style, ex_style ); rect->right = rect->left + GetSystemMetrics(SM_CYCAPTION) - 1; rect->bottom = rect->top + GetSystemMetrics(SM_CYCAPTION) - 1; + MapWindowPoints( hwnd, 0, (POINT *)rect, 2 ); } }

1 0

Vincent Povirk : windowscodecs: Make it possible for the BMP decoder to read packed DIBs.
by Alexandre Julliard 22 Sep '10

22 Sep '10

Module: wine Branch: master Commit: 870afcdd196962a18cac65e13dfc81b83ee34404 URL: http://source.winehq.org/git/wine.git/?a=commit;h=870afcdd196962a18cac65e13… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Sep 16 13:40:55 2010 -0500 windowscodecs: Make it possible for the BMP decoder to read packed DIBs. --- dlls/windowscodecs/bmpdecode.c | 111 ++++++++++++++++++++++++++++---- dlls/windowscodecs/wincodecs_private.h | 5 ++ 2 files changed, 103 insertions(+), 13 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=870afcdd196962a18cac6…

1 0

Vincent Povirk : windowscodecs: Use the BMP decoder to decode ICO frames.
by Alexandre Julliard 22 Sep '10

22 Sep '10

Module: wine Branch: master Commit: 4d55359faf707be373ad9394a97075a82aca05be URL: http://source.winehq.org/git/wine.git/?a=commit;h=4d55359faf707be373ad9394a… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Sep 16 13:41:43 2010 -0500 windowscodecs: Use the BMP decoder to decode ICO frames. --- dlls/windowscodecs/icoformat.c | 559 +++++++++++----------------------- dlls/windowscodecs/tests/icoformat.c | 2 +- 2 files changed, 186 insertions(+), 375 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4d55359faf707be373ad9…

1 0

Sven Baars : taskkill: Add the Dutch translation.
by Alexandre Julliard 22 Sep '10

22 Sep '10

Module: wine Branch: master Commit: bb0cefd5c78cfb76da62608a44c8a127e85314ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb0cefd5c78cfb76da62608a4… Author: Sven Baars <sven.wine(a)gmail.com> Date: Wed Sep 22 20:55:41 2010 +0200 taskkill: Add the Dutch translation. --- programs/taskkill/Makefile.in | 1 + programs/taskkill/Nl.rc | 43 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 44 insertions(+), 0 deletions(-) diff --git a/programs/taskkill/Makefile.in b/programs/taskkill/Makefile.in index 65004e2..8493b0f 100644 --- a/programs/taskkill/Makefile.in +++ b/programs/taskkill/Makefile.in @@ -11,6 +11,7 @@ RC_SRCS = \ Fr.rc \ It.rc \ Lt.rc \ + Nl.rc \ Sv.rc @MAKE_PROG_RULES@ diff --git a/programs/taskkill/Nl.rc b/programs/taskkill/Nl.rc new file mode 100644 index 0000000..3ac642b --- /dev/null +++ b/programs/taskkill/Nl.rc @@ -0,0 +1,43 @@ +/* + * Task termination utility + * Dutch language support + * + * Copyright 2010 Sven Baars + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "taskkill.h" + +#pragma code_page(65001) + +LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL + +STRINGTABLE +{ + STRING_USAGE, "Gebruik: taskkill [/?] [/f] [/im ProcesNaam | /pid ProcesID]\n" + STRING_INVALID_OPTION, "Fout: Onbekende of ongeldige commandoregeloptie gespecificeerd.\n" + STRING_INVALID_PARAM, "Fout: Ongeldige commandoregelparameter gespecificeerd.\n" + STRING_MISSING_OPTION, "Fout: Eén van de opties /im of /pid moet zijn gespecificeerd.\n" + STRING_MISSING_PARAM, "Fout: Optie %s verwacht een commandoregelparameter.\n" + STRING_MUTUAL_EXCLUSIVE, "Fout: Opties /im en /pid spreken elkaar tegen.\n" + STRING_CLOSE_PID_SEARCH, "Bericht om te sluiten verzonden naar top-level vensters van het proces met PID %u.\n" + STRING_CLOSE_PROC_SRCH, "Bericht om te sluiten verzonden naar top-level vensters van het proces \"%s\" met PID %u.\n" + STRING_TERM_PID_SEARCH, "Proces met PID %u is geforceerd beëindigd.\n" + STRING_TERM_PROC_SEARCH, "Proces \"%s\" met PID %u is geforceerd beëindigd.\n" + STRING_SEARCH_FAILED, "Fout: Kon proces \"%s\" niet vinden.\n" + STRING_ENUM_FAILED, "Fout: Kon de proceslijst niet opsommen.\n" + STRING_TERMINATE_FAILED, "Fout: Kon het proces \"%s\" niet beëindigen.\n" +}

1 0

Damjan Jovanovic : winex11.drv: Translate the drop point to the virtual screen.
by Alexandre Julliard 22 Sep '10

22 Sep '10

Module: wine Branch: master Commit: a4f3cabb5f7438a338154f5fcbf9cb4454486feb URL: http://source.winehq.org/git/wine.git/?a=commit;h=a4f3cabb5f7438a338154f5fc… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Wed Sep 22 15:29:42 2010 +0200 winex11.drv: Translate the drop point to the virtual screen. --- dlls/winex11.drv/xdnd.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/winex11.drv/xdnd.c b/dlls/winex11.drv/xdnd.c index de689fd..f503884 100644 --- a/dlls/winex11.drv/xdnd.c +++ b/dlls/winex11.drv/xdnd.c @@ -284,6 +284,8 @@ void X11DRV_XDND_PositionEvent( HWND hWnd, XClientMessageEvent *event ) XDNDxy.x = event->data.l[2] >> 16; XDNDxy.y = event->data.l[2] & 0xFFFF; + XDNDxy.x += virtual_screen_rect.left; + XDNDxy.y += virtual_screen_rect.top; targetWindow = WindowFromPoint(XDNDxy); pointl.x = XDNDxy.x;

1 0

Lauri Kenttä : wined3d: Add check for Intel GM965/ GL960 with Mesa driver.
by Alexandre Julliard 22 Sep '10

22 Sep '10

Module: wine Branch: master Commit: 0d27b6ca705a3961af132e06d43516f6cc65ea86 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d27b6ca705a3961af132e06d… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Wed Sep 22 18:06:28 2010 +0300 wined3d: Add check for Intel GM965/GL960 with Mesa driver. --- dlls/wined3d/directx.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index e8bbe77..326c64b 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1829,7 +1829,7 @@ static enum wined3d_pci_device select_card_ati_binary(const struct wined3d_gl_in static enum wined3d_pci_device select_card_intel(const struct wined3d_gl_info *gl_info, const char *gl_renderer) { - if (strstr(gl_renderer, "X3100")) + if (strstr(gl_renderer, "X3100") || strstr(gl_renderer, "965GM")) { /* MacOS calls the card GMA X3100, otherwise known as GM965/GL960 */ return CARD_INTEL_X3100;

1 0