June 2010 - Wine-Commits - list.winehq.org

Alexandre Julliard : Wine release 1.2-rc4
by Alexandre Julliard June 18, 2010

June 18, 2010

Module: website Branch: master Commit: 18931d2a917b2c9e2805ea77aabc6061296c035b URL: http://source.winehq.org/git/website.git/?a=commit;h=18931d2a917b2c9e2805ea… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 18 19:46:05 2010 +0200 Wine release 1.2-rc4 --- news/en/2010061801.xml | 13 +++++++++++++ 1 files changed, 13 insertions(+), 0 deletions(-) diff --git a/news/en/2010061801.xml b/news/en/2010061801.xml new file mode 100644 index 0000000..b628402 --- /dev/null +++ b/news/en/2010061801.xml @@ -0,0 +1,13 @@ +<news> +<date>June 18, 2010</date> +<title>Wine 1.2-rc4 Released</title> +<body> + The Wine development release 1.2-rc4 is now available. + <a href="{$root}/announce/1.2-rc4">What's new</a> in this release: +<ul> + <li>Many translation updates.</li> + <li>A lot of bug fixes.</li> +</ul> +The source is <a href="http://prdownloads.sourceforge.net/wine/wine-1.2-rc4.tar.bz2">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Alexandre Julliard : Release 1.2-rc4.
by Alexandre Julliard June 18, 2010

June 18, 2010

Module: wine Branch: master Commit: ffdbc65a1c0c7f38b1613255c0a38bd11d8f4711 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ffdbc65a1c0c7f38b1613255c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 18 19:36:58 2010 +0200 Release 1.2-rc4. --- ANNOUNCE | 769 ++++++++++++++++++++----------------------------------------- VERSION | 2 +- configure | 18 +- 3 files changed, 261 insertions(+), 528 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ffdbc65a1c0c7f38b1613…

1 0

Tag wine-1.2-rc4 : Alexandre Julliard : Release 1.2-rc4
by Alexandre Julliard June 18, 2010

June 18, 2010

Module: wine Branch: refs/tags/wine-1.2-rc4 Tag: 6ecd9fc5c7c884e6f0e0cac39d4d82cfb83441c4 URL: http://source.winehq.org/git/wine.git/?a=tag;h=6ecd9fc5c7c884e6f0e0cac39d4d… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 18 19:36:58 2010 +0200 Release 1.2-rc4

1 0

Henri Verbeet : ddraw: Register / unregister the ddraw window class from DllMain().
by Alexandre Julliard June 18, 2010

June 18, 2010

Module: wine Branch: master Commit: e4a4065bbd7ea0ea4e06c26df5ac07974ee34bc2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e4a4065bbd7ea0ea4e06c26df… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jun 18 13:09:50 2010 +0200 ddraw: Register / unregister the ddraw window class from DllMain(). This avoids failing in DDRAW_Create() if a previous IDirectDrawImpl object with the same pointer value was imporperly cleaned up. The improper cleanup is of course the larger problem, but I don't believe that can be fixed without making more invasive changes to ddraw. --- dlls/ddraw/ddraw.c | 30 +++++++++++++---------- dlls/ddraw/ddraw_private.h | 7 +---- dlls/ddraw/main.c | 54 ++++++++++++++++++------------------------- 3 files changed, 42 insertions(+), 49 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index a8dbafa..7d6558d 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -275,9 +275,6 @@ IDirectDrawImpl_Destroy(IDirectDrawImpl *This) This->devicewindow = 0; } - /* Unregister the window class */ - UnregisterClassA(This->classname, 0); - EnterCriticalSection(&ddraw_cs); list_remove(&This->ddraw_list_entry); LeaveCriticalSection(&ddraw_cs); @@ -504,11 +501,15 @@ IDirectDrawImpl_SetCooperativeLevel(IDirectDraw7 *iface, /* Don't create a device window if a focus window is set */ if( !(This->focuswindow) ) { - HWND devicewindow = CreateWindowExA(0, This->classname, "DDraw device window", - WS_POPUP, 0, 0, - GetSystemMetrics(SM_CXSCREEN), - GetSystemMetrics(SM_CYSCREEN), - NULL, NULL, GetModuleHandleA(0), NULL); + HWND devicewindow = CreateWindowExA(0, DDRAW_WINDOW_CLASS_NAME, "DDraw device window", + WS_POPUP, 0, 0, GetSystemMetrics(SM_CXSCREEN), GetSystemMetrics(SM_CYSCREEN), + NULL, NULL, NULL, NULL); + if (!devicewindow) + { + ERR("Failed to create window, last error %#x.\n", GetLastError()); + LeaveCriticalSection(&ddraw_cs); + return E_FAIL; + } ShowWindow(devicewindow, SW_SHOW); /* Just to be sure */ TRACE("(%p) Created a DDraw device window. HWND=%p\n", This, devicewindow); @@ -2875,11 +2876,14 @@ IDirectDrawImpl_AttachD3DDevice(IDirectDrawImpl *This, /* If there's no window, create a hidden window. WineD3D needs it */ if(window == 0 || window == GetDesktopWindow()) { - window = CreateWindowExA(0, This->classname, "Hidden D3D Window", - WS_DISABLED, 0, 0, - GetSystemMetrics(SM_CXSCREEN), - GetSystemMetrics(SM_CYSCREEN), - NULL, NULL, GetModuleHandleA(0), NULL); + window = CreateWindowExA(0, DDRAW_WINDOW_CLASS_NAME, "Hidden D3D Window", + WS_DISABLED, 0, 0, GetSystemMetrics(SM_CXSCREEN), GetSystemMetrics(SM_CYSCREEN), + NULL, NULL, NULL, NULL); + if (!window) + { + ERR("Failed to create window, last error %#x.\n", GetLastError()); + return E_FAIL; + } ShowWindow(window, SW_HIDE); /* Just to be sure */ WARN("(%p) No window for the Direct3DDevice, created a hidden window. HWND=%p\n", This, window); diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index d6f4a57..1cb3070 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -143,11 +143,6 @@ struct IDirectDrawImpl /* The surface type to request */ WINED3DSURFTYPE ImplType; - - /* Our private window class */ - char classname[32]; - WNDCLASSA wnd_class; - /* Helpers for surface creation */ IDirectDrawSurfaceImpl *tex_root; BOOL depthstencil; @@ -165,6 +160,8 @@ struct IDirectDrawImpl UINT numConvertedDecls, declArraySize; }; +#define DDRAW_WINDOW_CLASS_NAME "ddraw_wc" + /* Declare the VTables. They can be found ddraw.c */ extern const IDirectDraw7Vtbl IDirectDraw7_Vtbl DECLSPEC_HIDDEN; extern const IDirectDraw4Vtbl IDirectDraw4_Vtbl DECLSPEC_HIDDEN; diff --git a/dlls/ddraw/main.c b/dlls/ddraw/main.c index 591f46c..45a156f 100644 --- a/dlls/ddraw/main.c +++ b/dlls/ddraw/main.c @@ -242,37 +242,6 @@ DDRAW_Create(const GUID *guid, This->wineD3DDevice = wineD3DDevice; TRACE("wineD3DDevice created at %p\n", This->wineD3DDevice); - /* Register the window class - * - * It is used to create a hidden window for D3D - * rendering, if the application didn't pass one. - * It can also be used for Creating a device window - * from SetCooperativeLevel - * - * The name: DDRAW_<address>. The classname is - * 32 bit long, so a 64 bit address will fit nicely - * (Will this be compiled for 64 bit anyway?) - * - */ - sprintf(This->classname, "DDRAW_%p", This); - - memset(&This->wnd_class, 0, sizeof(This->wnd_class)); - This->wnd_class.style = CS_HREDRAW | CS_VREDRAW; - This->wnd_class.lpfnWndProc = DefWindowProcA; - This->wnd_class.cbClsExtra = 0; - This->wnd_class.cbWndExtra = 0; - This->wnd_class.hInstance = GetModuleHandleA(0); - This->wnd_class.hIcon = 0; - This->wnd_class.hCursor = 0; - This->wnd_class.hbrBackground = GetStockObject(BLACK_BRUSH); - This->wnd_class.lpszMenuName = NULL; - This->wnd_class.lpszClassName = This->classname; - if(!RegisterClassA(&This->wnd_class)) - { - ERR("RegisterClassA failed!\n"); - goto err_out; - } - /* Get the amount of video memory */ This->total_vidmem = IWineD3DDevice_GetAvailableTextureMem(This->wineD3DDevice); @@ -817,8 +786,28 @@ DllMain(HINSTANCE hInstDLL, DWORD size = sizeof(buffer); HKEY hkey = 0; HKEY appkey = 0; + WNDCLASSA wc; DWORD len; + /* Register the window class. This is used to create a hidden window + * for D3D rendering, if the application didn't pass one. It can also + * be used for creating a device window from SetCooperativeLevel(). */ + wc.style = CS_HREDRAW | CS_VREDRAW; + wc.lpfnWndProc = DefWindowProcA; + wc.cbClsExtra = 0; + wc.cbWndExtra = 0; + wc.hInstance = hInstDLL; + wc.hIcon = 0; + wc.hCursor = 0; + wc.hbrBackground = GetStockObject(BLACK_BRUSH); + wc.lpszMenuName = NULL; + wc.lpszClassName = DDRAW_WINDOW_CLASS_NAME; + if (!RegisterClassA(&wc)) + { + ERR("Failed to register ddraw window class, last error %#x.\n", GetLastError()); + return FALSE; + } + /* @@ Wine registry key: HKCU\Software\Wine\Direct3D */ if ( RegOpenKeyA( HKEY_CURRENT_USER, "Software\\Wine\\Direct3D", &hkey ) ) hkey = 0; @@ -955,6 +944,9 @@ DllMain(HINSTANCE hInstDLL, while(IDirectDraw7_Release((IDirectDraw7 *)ddraw)); } } + + /* Unregister the window class. */ + UnregisterClassA(DDRAW_WINDOW_CLASS_NAME, hInstDLL); } return TRUE;

1 0

Roderick Colenbrander : wined3d: Add NPOT quirk for GeforceFX 5200.
by Alexandre Julliard June 18, 2010

June 18, 2010

Module: wine Branch: master Commit: eb0a032a8c78b996798dd075f18bc35fcee32dc4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb0a032a8c78b996798dd075f… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Mon Jun 14 23:22:52 2010 +0200 wined3d: Add NPOT quirk for GeforceFX 5200. --- dlls/wined3d/directx.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 424271b..268fee1 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -452,7 +452,9 @@ static BOOL match_geforce5(const struct wined3d_gl_info *gl_info, const char *gl { if (card_vendor == HW_VENDOR_NVIDIA) { - if (device == CARD_NVIDIA_GEFORCEFX_5800 || device == CARD_NVIDIA_GEFORCEFX_5600) + if (device == CARD_NVIDIA_GEFORCEFX_5200 || + device == CARD_NVIDIA_GEFORCEFX_5600 || + device == CARD_NVIDIA_GEFORCEFX_5800) { return TRUE; }

1 0

Paul Chitescu : user32: Use a safer method of freeing user handles to prevent zeroing out a newly allocated handle .
by Alexandre Julliard June 18, 2010

June 18, 2010

Module: wine Branch: master Commit: bb6769f4754d5bc8961b62219e20674058546fb3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb6769f4754d5bc8961b62219… Author: Paul Chitescu <paulc(a)voip.null.ro> Date: Fri Jun 18 14:09:38 2010 +0300 user32: Use a safer method of freeing user handles to prevent zeroing out a newly allocated handle. --- dlls/user32/win.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/user32/win.c b/dlls/user32/win.c index 4dd8962..cbc949c 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -107,7 +107,7 @@ HANDLE alloc_user_handle( struct user_object *ptr, enum user_obj_type type ) assert( index < NB_USER_HANDLES ); ptr->handle = handle; ptr->type = type; - user_handles[index] = ptr; + InterlockedExchangePointer( &user_handles[index], ptr ); } return handle; } @@ -161,8 +161,8 @@ void *free_user_handle( HANDLE handle, enum user_obj_type type ) SERVER_START_REQ( free_user_handle ) { req->handle = wine_server_user_handle( handle ); - if (!wine_server_call( req )) user_handles[index] = NULL; - else ptr = NULL; + if (wine_server_call( req )) ptr = NULL; + else InterlockedCompareExchangePointer( &user_handles[index], NULL, ptr ); } SERVER_END_REQ; release_user_handle_ptr( ptr ); @@ -243,7 +243,6 @@ static WND *create_window_handle( HWND parent, HWND owner, LPCWSTR name, index = USER_HANDLE_TO_INDEX(handle); assert( index < NB_USER_HANDLES ); - user_handles[index] = win; win->obj.handle = handle; win->obj.type = USER_WINDOW; win->parent = full_parent; @@ -251,6 +250,7 @@ static WND *create_window_handle( HWND parent, HWND owner, LPCWSTR name, win->class = class; win->winproc = get_class_winproc( class ); win->cbWndExtra = extra_bytes; + InterlockedExchangePointer( &user_handles[index], win ); if (WINPROC_IsUnicode( win->winproc, unicode )) win->flags |= WIN_ISUNICODE; return win; } @@ -271,8 +271,8 @@ static void free_window_handle( HWND hwnd ) SERVER_START_REQ( destroy_window ) { req->handle = wine_server_user_handle( hwnd ); - if (!wine_server_call_err( req )) user_handles[index] = NULL; - else ptr = NULL; + if (wine_server_call_err( req )) ptr = NULL; + else InterlockedCompareExchangePointer( &user_handles[index], NULL, ptr ); } SERVER_END_REQ; release_user_handle_ptr( ptr ); @@ -815,7 +815,7 @@ static void destroy_thread_window( HWND hwnd ) if ((wndPtr->dwStyle & (WS_CHILD | WS_POPUP)) != WS_CHILD) menu = (HMENU)wndPtr->wIDmenu; sys_menu = wndPtr->hSysMenu; free_dce( wndPtr->dce, hwnd ); - user_handles[index] = NULL; + InterlockedCompareExchangePointer( &user_handles[index], NULL, wndPtr ); } USER_Unlock();

1 0

Vitaly Lipatov : Update Russian translations.
by Alexandre Julliard June 18, 2010

June 18, 2010

Module: wine Branch: master Commit: b974852ce154bd0dfd6de6fe67c7ad653b22e545 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b974852ce154bd0dfd6de6fe6… Author: Vitaly Lipatov <lav(a)etersoft.ru> Date: Thu Jun 17 19:18:08 2010 +0400 Update Russian translations. --- dlls/avifil32/avifile_Ru.rc | 2 +- dlls/comdlg32/cdlg_Ru.rc | 10 +++++----- dlls/localui/ui_Ru.rc | 2 +- dlls/mshtml/Ru.rc | 2 +- dlls/oledlg/oledlg_Ru.rc | 2 +- dlls/sane.ds/sane_Ru.rc | 2 +- dlls/setupapi/Ru.rc | 2 +- dlls/user32/resources/user32_Ru.rc | 2 +- dlls/wineps.drv/wps_Ru.rc | 2 +- dlls/winmm/winmm_Ru.rc | 4 ++-- dlls/wldap32/wldap32_Ru.rc | 4 ++-- programs/cmd/Ru.rc | 4 ++-- programs/cmdlgtst/Ru.rc | 4 ++-- programs/notepad/Ru.rc | 4 ++-- programs/oleview/Ru.rc | 36 ++++++++++++++++++------------------ programs/progman/Ru.rc | 2 +- programs/regedit/Ru.rc | 2 +- programs/start/Ru.rc | 18 +++++++++--------- programs/taskmgr/Ru.rc | 14 +++++++------- programs/view/Ru.rc | 2 +- programs/wineboot/wineboot_Ru.rc | 2 +- programs/winecfg/Ru.rc | 10 +++++----- programs/winedbg/rsrc_Ru.rc | 2 +- programs/winefile/Ru.rc | 6 +++--- programs/winhlp32/Ru.rc | 2 +- programs/wordpad/Ru.rc | 30 +++++++++++++++--------------- programs/xcopy/Ru.rc | 2 +- 27 files changed, 87 insertions(+), 87 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b974852ce154bd0dfd6de…

1 0

Huw Davies : wineps.drv: Don't return an error for empty glyphs.
by Alexandre Julliard June 18, 2010

June 18, 2010

Module: wine Branch: master Commit: 25629eff96b62f7f38033cab1100fb8d1ed2f7e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=25629eff96b62f7f38033cab1… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Jun 18 11:50:52 2010 +0100 wineps.drv: Don't return an error for empty glyphs. --- dlls/wineps.drv/type1.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wineps.drv/type1.c b/dlls/wineps.drv/type1.c index bc33ef6..dbd2336 100644 --- a/dlls/wineps.drv/type1.c +++ b/dlls/wineps.drv/type1.c @@ -494,7 +494,7 @@ static BOOL append_glyph_outline(HDC hdc, DWORD index, glyph_outline *outline) SHORT num_conts; glyph_data = get_glyph_data(hdc, index); - if(!glyph_data) return FALSE; + if(!glyph_data) return TRUE; num_conts = get_be_word(glyph_data);

1 0

André Hentschel : winemaker: Avoid setting variable to an uninitialized value.
by Alexandre Julliard June 18, 2010

June 18, 2010

Module: wine Branch: master Commit: 1d33f8db9be0b71680161644d7d47b85178ff2c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d33f8db9be0b71680161644d… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Jun 17 21:10:01 2010 +0200 winemaker: Avoid setting variable to an uninitialized value. --- tools/winemaker | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/tools/winemaker b/tools/winemaker index 48e7bde..23f800f 100755 --- a/tools/winemaker +++ b/tools/winemaker @@ -2251,9 +2251,13 @@ sub generate_list($$$;$) foreach my $item (@$list) { my $value; if (defined $data) { - $value=&$data($item); + $value=&$data($item); } else { - $value=$item; + if (defined $item) { + $value=$item; + } else { + $value=""; + } } if ($value ne "") { if ($first) {

1 0

Michael Stefaniuc : jscript: Add the Romanian translation.
by Alexandre Julliard June 18, 2010

June 18, 2010

Module: wine Branch: master Commit: 97a6523bdcd58c60018585ad9555ba1132deabc9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=97a6523bdcd58c60018585ad9… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Jun 18 11:14:15 2010 +0200 jscript: Add the Romanian translation. Translation by Claudia Cotună. --- dlls/jscript/Makefile.in | 1 + dlls/jscript/jscript_Ro.rc | 51 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 52 insertions(+), 0 deletions(-) diff --git a/dlls/jscript/Makefile.in b/dlls/jscript/Makefile.in index 647412c..b22e15d 100644 --- a/dlls/jscript/Makefile.in +++ b/dlls/jscript/Makefile.in @@ -17,6 +17,7 @@ RC_SRCS = \ jscript_Nl.rc \ jscript_Pl.rc \ jscript_Pt.rc \ + jscript_Ro.rc \ jscript_Ru.rc \ jscript_Si.rc \ rsrc.rc diff --git a/dlls/jscript/jscript_Ro.rc b/dlls/jscript/jscript_Ro.rc new file mode 100644 index 0000000..066e200 --- /dev/null +++ b/dlls/jscript/jscript_Ro.rc @@ -0,0 +1,51 @@ +/* + * Copyright 2009 Piotr Caban + * Copyright 2010 Claudia Cotună + * Michael Stefaniuc + * + * 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 "resource.h" + +LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL + +#pragma code_page(65001) + +STRINGTABLE DISCARDABLE +{ + IDS_TO_PRIMITIVE "Eroare la convertirea obiectului la un tip primitiv" + IDS_INVALID_CALL_ARG "Apel de procedură sau argument nevalid" + IDS_CREATE_OBJ_ERROR "Serverul de automatizare nu poate crea obiectul" + IDS_NO_PROPERTY "Obiectul nu suportă această proprietate sau metodă" + IDS_ARG_NOT_OPT "Argumentul nu este opțional" + IDS_SYNTAX_ERROR "Eroare de sintaxă" + IDS_SEMICOLON "„;” presupus" + IDS_LBRACKET "„(” presupus" + IDS_RBRACKET "„)” presupus" + IDS_UNTERMINATED_STR "Constantă de șir nedeterminată" + IDS_NOT_FUNC "Funcție presupusă" + IDS_NOT_DATE "„[obiect]” nu este un obiect de tip dată" + IDS_NOT_NUM "Număr presupus" + IDS_OBJECT_EXPECTED "Obiect presupus" + IDS_ILLEGAL_ASSIGN "Atribuire ilegală" + IDS_UNDEFINED "„|” nu este definit" + IDS_NOT_BOOL "Obiect boolean presupus" + IDS_JSCRIPT_EXPECTED "Obiect JScript presupus" + IDS_REGEXP_SYNTAX_ERROR "Eroare de sintaxă în expresie rațională" + IDS_URI_INVALID_CHAR "URI care trebuie codificat conține caractere nevalide" + IDS_INVALID_LENGTH "Lungimea unei matrice trebuie să fie un număr întreg pozitiv" + IDS_ARRAY_EXPECTED "Obiect matrice presupus" +}

1 0