February 2012 - Wine-Commits

Nikolay Sivov : comctl32: More tests for Toolbar window style handling.
by Alexandre Julliard Feb. 1, 2012

Feb. 1, 2012

Module: wine Branch: master Commit: 1c1b1c0073c3dea34ff4096d749a459accf5e337 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c1b1c0073c3dea34ff4096d7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Feb 1 00:07:00 2012 +0300 comctl32: More tests for Toolbar window style handling. --- dlls/comctl32/tests/toolbar.c | 147 +++++++++++++++++++++++++++++++++++++++++ dlls/comctl32/toolbar.c | 2 +- 2 files changed, 148 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/tests/toolbar.c b/dlls/comctl32/tests/toolbar.c index 5049ef6..f1579b7 100644 --- a/dlls/comctl32/tests/toolbar.c +++ b/dlls/comctl32/tests/toolbar.c @@ -54,6 +54,24 @@ static const struct message ttgetdispinfo_parent_seq[] = { { 0 } }; +#define DEFINE_EXPECT(func) \ + static BOOL expect_ ## func = FALSE, called_ ## func = FALSE + +#define CHECK_EXPECT2(func) \ + do { \ + ok(expect_ ##func, "unexpected call " #func "\n"); \ + called_ ## func = TRUE; \ + }while(0) + +#define CHECK_CALLED(func) \ + do { \ + ok(called_ ## func, "expected " #func "\n"); \ + expect_ ## func = called_ ## func = FALSE; \ + }while(0) + +#define SET_EXPECT(func) \ + expect_ ## func = TRUE + #define expect(EXPECTED,GOT) ok((GOT)==(EXPECTED), "Expected %d, got %d\n", (EXPECTED), (GOT)) #define check_rect(name, val, exp, ...) ok(val.top == exp.top && val.bottom == exp.bottom && \ @@ -1610,6 +1628,7 @@ static void test_tooltip(void) {0, 21, TBSTATE_ENABLED, 0, {0, }, 0, -1}, }; NMTTDISPINFOW nmtti; + HWND tooltip; rebuild_toolbar(&hToolbar); @@ -1632,6 +1651,13 @@ static void test_tooltip(void) g_ResetDispTextPtr = FALSE; DestroyWindow(hToolbar); + + /* TBSTYLE_TOOLTIPS */ + hToolbar = CreateWindowExA(0, TOOLBARCLASSNAME, NULL, WS_CHILD | WS_VISIBLE, 0, 0, 0, 0, + hMainWnd, (HMENU)5, GetModuleHandle(NULL), NULL); + tooltip = (HWND)SendMessageA(hToolbar, TB_GETTOOLTIPS, 0, 0); + ok(tooltip == NULL, "got %p\n", tooltip); + DestroyWindow(hToolbar); } static void test_get_set_style(void) @@ -1658,6 +1684,7 @@ static void test_get_set_style(void) style = SendMessageA(hToolbar, TB_GETSTYLE, 0, 0); style2 = GetWindowLongA(hToolbar, GWL_STYLE); +todo_wine ok(style == style2, "got 0x%08x, expected 0x%08x\n", style, style2); /* try to alter common window bits */ @@ -1681,6 +1708,125 @@ static void test_get_set_style(void) DestroyWindow(hToolbar); } +static HHOOK g_tbhook; +static HWND g_toolbar; + +DEFINE_EXPECT(g_hook_create); +DEFINE_EXPECT(g_hook_WM_NCCREATE); +DEFINE_EXPECT(g_hook_WM_CREATE); + +static LRESULT WINAPI toolbar_subclass_proc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) +{ + WNDPROC oldproc = (WNDPROC)GetWindowLongPtrA(hwnd, GWLP_USERDATA); + LRESULT ret; + DWORD style; + + if (msg == WM_NCCREATE) + { + if (g_toolbar == hwnd) + { + CHECK_EXPECT2(g_hook_WM_NCCREATE); + g_toolbar = hwnd; + ret = CallWindowProcA(oldproc, hwnd, msg, wParam, lParam); + + /* control is already set up */ + style = SendMessageA(hwnd, TB_GETSTYLE, 0, 0); + ok(style != 0, "got %x\n", style); + + style = GetWindowLongA(hwnd, GWL_STYLE); + ok((style & TBSTYLE_TOOLTIPS) == 0, "got 0x%08x\n", style); + SetWindowLongA(hwnd, GWL_STYLE, style|TBSTYLE_TOOLTIPS); + style = GetWindowLongA(hwnd, GWL_STYLE); + ok((style & TBSTYLE_TOOLTIPS) == TBSTYLE_TOOLTIPS, "got 0x%08x\n", style); + + return ret; + } + } + else if (msg == WM_CREATE) + { + CREATESTRUCTA *cs = (CREATESTRUCTA*)lParam; + + if (g_toolbar == hwnd) + { + CHECK_EXPECT2(g_hook_WM_CREATE); + + style = GetWindowLongA(hwnd, GWL_STYLE); + ok((style & TBSTYLE_TOOLTIPS) == TBSTYLE_TOOLTIPS, "got 0x%08x\n", style); + + /* test if toolbar-specific messages are already working before WM_CREATE */ + style = SendMessageA(hwnd, TB_GETSTYLE, 0, 0); + ok(style != 0, "got %x\n", style); + ok((style & TBSTYLE_TOOLTIPS) == TBSTYLE_TOOLTIPS, "got 0x%x\n", style); + ok((cs->style & TBSTYLE_TOOLTIPS) == 0, "0x%08x\n", cs->style); + + ret = CallWindowProcA(oldproc, hwnd, msg, wParam, lParam); + + style = GetWindowLongA(hwnd, GWL_STYLE); + ok((style & TBSTYLE_TOOLTIPS) == TBSTYLE_TOOLTIPS, "got 0x%08x\n", style); + + /* test if toolbar-specific messages are already working before WM_CREATE */ + style = SendMessageA(hwnd, TB_GETSTYLE, 0, 0); + ok(style != 0, "got %x\n", style); + ok((style & TBSTYLE_TOOLTIPS) == TBSTYLE_TOOLTIPS, "got 0x%x\n", style); + + return ret; + } + } + + return CallWindowProcA(oldproc, hwnd, msg, wParam, lParam); +} + +LRESULT CALLBACK cbt_hook_proc(int code, WPARAM wParam, LPARAM lParam) +{ + if (code == HCBT_CREATEWND) + { + HWND hwnd = (HWND)wParam; + + if (!g_toolbar) + { + WNDPROC oldproc; + + CHECK_EXPECT2(g_hook_create); + g_toolbar = hwnd; + /* subclass */ + oldproc = (WNDPROC)SetWindowLongPtrA(hwnd, GWLP_WNDPROC, (LONG_PTR)toolbar_subclass_proc); + SetWindowLongPtrA(hwnd, GWLP_USERDATA, (LONG_PTR)oldproc); + } + return 0; + } + + return CallNextHookEx(g_tbhook, code, wParam, lParam); +} + +static void test_create(void) +{ + HWND hwnd, tooltip; + DWORD style; + + g_tbhook = SetWindowsHookA(WH_CBT, cbt_hook_proc); + + SET_EXPECT(g_hook_create); + SET_EXPECT(g_hook_WM_NCCREATE); + SET_EXPECT(g_hook_WM_CREATE); + + hwnd = CreateWindowExA(0, TOOLBARCLASSNAME, NULL, WS_CHILD | WS_VISIBLE, 0, 0, 0, 0, + hMainWnd, (HMENU)5, GetModuleHandle(NULL), NULL); + + CHECK_CALLED(g_hook_create); + CHECK_CALLED(g_hook_WM_NCCREATE); + CHECK_CALLED(g_hook_WM_CREATE); + + style = GetWindowLongA(hwnd, GWL_STYLE); + ok((style & TBSTYLE_TOOLTIPS) == TBSTYLE_TOOLTIPS, "got 0x%08x\n", style); + + tooltip = (HWND)SendMessageA(hwnd, TB_GETTOOLTIPS, 0, 0); + ok(tooltip != NULL, "got %p\n", tooltip); + ok(GetParent(tooltip) == hMainWnd, "got %p, %p\n", hMainWnd, hwnd); + + DestroyWindow(hwnd); + UnhookWindowsHook(WH_CBT, cbt_hook_proc); +} + START_TEST(toolbar) { WNDCLASSA wc; @@ -1721,6 +1867,7 @@ START_TEST(toolbar) test_getstring(); test_tooltip(); test_get_set_style(); + test_create(); PostQuitMessage(0); while(GetMessageA(&msg,0,0,0)) { diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c index bd35533..7c1815c 100644 --- a/dlls/comctl32/toolbar.c +++ b/dlls/comctl32/toolbar.c @@ -5155,7 +5155,7 @@ TOOLBAR_Create (HWND hwnd, const CREATESTRUCTW *lpcs) TRACE("hwnd = %p, style=0x%08x\n", hwnd, lpcs->style); - infoPtr->dwStyle = lpcs->style; + infoPtr->dwStyle = GetWindowLongW(hwnd, GWL_STYLE); GetClientRect(hwnd, &infoPtr->client_rect); infoPtr->bUnicode = infoPtr->hwndNotify && (NFR_UNICODE == SendMessageW(hwnd, WM_NOTIFYFORMAT, (WPARAM)hwnd, NF_REQUERY));

1 0

Piotr Caban : mshtml: Make cookie parameter optional in ConnectionPoint_Advise.
by Alexandre Julliard Feb. 1, 2012

Feb. 1, 2012

Module: wine Branch: master Commit: 43b38e1420801cb34ed6a6ca98af95bf658bb8af URL: http://source.winehq.org/git/wine.git/?a=commit;h=43b38e1420801cb34ed6a6ca9… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Feb 1 10:41:58 2012 +0100 mshtml: Make cookie parameter optional in ConnectionPoint_Advise. --- dlls/mshtml/conpoint.c | 3 ++- dlls/mshtml/tests/htmldoc.c | 4 ++++ 2 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/conpoint.c b/dlls/mshtml/conpoint.c index ca45524..691a8c9 100644 --- a/dlls/mshtml/conpoint.c +++ b/dlls/mshtml/conpoint.c @@ -158,7 +158,8 @@ static HRESULT WINAPI ConnectionPoint_Advise(IConnectionPoint *iface, IUnknown * } This->sinks[i].unk = sink; - *pdwCookie = i+1; + if(pdwCookie) + *pdwCookie = i+1; if(!i && This->data && This->data->on_advise) This->data->on_advise(This->container->outer, This->data); diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index 3f356e4..53e463a 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -4790,6 +4790,10 @@ static void test_ConnectionPoint(IConnectionPointContainer *container, REFIID ri if(IsEqualGUID(&IID_IPropertyNotifySink, riid)) { hres = IConnectionPoint_Advise(cp, (IUnknown*)&PropertyNotifySink, &cookie); ok(hres == S_OK, "Advise failed: %08x\n", hres); + hres = IConnectionPoint_Unadvise(cp, cookie); + ok(hres == S_OK, "Unadvise failed: %08x\n", hres); + hres = IConnectionPoint_Advise(cp, (IUnknown*)&PropertyNotifySink, NULL); + ok(hres == S_OK, "Advise failed: %08x\n", hres); } else if(IsEqualGUID(&IID_IDispatch, riid)) { hres = IConnectionPoint_Advise(cp, (IUnknown*)&EventDispatch, &cookie); ok(hres == S_OK, "Advise failed: %08x\n", hres);

1 0

Jacek Caban : mshtml: Properly handle GetScheme failure.
by Alexandre Julliard Feb. 1, 2012

Feb. 1, 2012

Module: wine Branch: master Commit: 90f7c8f848f492fc38d0dca8987c821ac61cf49b URL: http://source.winehq.org/git/wine.git/?a=commit;h=90f7c8f848f492fc38d0dca89… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Feb 1 13:58:42 2012 +0100 mshtml: Properly handle GetScheme failure. --- dlls/mshtml/navigate.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index 9950511..e5262ef 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -1941,8 +1941,7 @@ HRESULT super_navigate(HTMLWindow *window, IUri *uri, const WCHAR *headers, BYTE prepare_for_binding(&window->doc_obj->basedoc, mon, TRUE); hres = IUri_GetScheme(uri, &scheme); - - if(scheme != URL_SCHEME_JAVASCRIPT) { + if(SUCCEEDED(hres) && scheme != URL_SCHEME_JAVASCRIPT) { navigate_task_t *task; task = heap_alloc(sizeof(*task));

1 0

Alexandre Julliard : winex11: Don't give focus to zero-size windows.
by Alexandre Julliard Feb. 1, 2012

Feb. 1, 2012

Module: wine Branch: master Commit: 002f85a275c81e0797ffd244942c938643ececf6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=002f85a275c81e0797ffd2449… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 1 15:33:51 2012 +0100 winex11: Don't give focus to zero-size windows. --- dlls/winex11.drv/event.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c index 1b3478d..99c47c8 100644 --- a/dlls/winex11.drv/event.c +++ b/dlls/winex11.drv/event.c @@ -520,12 +520,15 @@ DWORD EVENT_x11_time_to_win32_time(Time time) */ static inline BOOL can_activate_window( HWND hwnd ) { + struct x11drv_win_data *data = X11DRV_get_win_data( hwnd ); LONG style = GetWindowLongW( hwnd, GWL_STYLE ); + if (!(style & WS_VISIBLE)) return FALSE; if ((style & (WS_POPUP|WS_CHILD)) == WS_CHILD) return FALSE; if (style & WS_MINIMIZE) return FALSE; if (GetWindowLongW( hwnd, GWL_EXSTYLE ) & WS_EX_NOACTIVATE) return FALSE; if (hwnd == GetDesktopWindow()) return FALSE; + if (data && IsRectEmpty( &data->window_rect )) return FALSE; return !(style & WS_DISABLED); }

1 0

Alexandre Julliard : winex11: Move the window resizing support to mouse.c.
by Alexandre Julliard Feb. 1, 2012

Feb. 1, 2012

Module: wine Branch: master Commit: abfed909b2d96f8b3fb2acfcb916b6395bb24e30 URL: http://source.winehq.org/git/wine.git/?a=commit;h=abfed909b2d96f8b3fb2acfcb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 1 15:46:52 2012 +0100 winex11: Move the window resizing support to mouse.c. --- dlls/winex11.drv/mouse.c | 42 ++++++++++++++++++++++++++++++++++++++++++ dlls/winex11.drv/window.c | 30 ++---------------------------- dlls/winex11.drv/x11drv.h | 1 + 3 files changed, 45 insertions(+), 28 deletions(-) diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index 85df63b..060b4c8 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -1327,6 +1327,48 @@ BOOL CDECL X11DRV_ClipCursor( LPCRECT clip ) } /*********************************************************************** + * move_resize_window + */ +void move_resize_window( Display *display, struct x11drv_win_data *data, int dir ) +{ + DWORD pt; + int x, y, button = 0; + XEvent xev; + + pt = GetMessagePos(); + x = (short)LOWORD( pt ); + y = (short)HIWORD( pt ); + + if (GetKeyState( VK_LBUTTON ) & 0x8000) button = 1; + else if (GetKeyState( VK_MBUTTON ) & 0x8000) button = 2; + else if (GetKeyState( VK_RBUTTON ) & 0x8000) button = 3; + + TRACE( "hwnd %p/%lx, x %d, y %d, dir %d, button %d\n", + data->hwnd, data->whole_window, x, y, dir, button ); + + xev.xclient.type = ClientMessage; + xev.xclient.window = data->whole_window; + xev.xclient.message_type = x11drv_atom(_NET_WM_MOVERESIZE); + xev.xclient.serial = 0; + xev.xclient.display = display; + xev.xclient.send_event = True; + xev.xclient.format = 32; + xev.xclient.data.l[0] = x - virtual_screen_rect.left; /* x coord */ + xev.xclient.data.l[1] = y - virtual_screen_rect.top; /* y coord */ + xev.xclient.data.l[2] = dir; /* direction */ + xev.xclient.data.l[3] = button; /* button */ + xev.xclient.data.l[4] = 0; /* unused */ + + /* need to ungrab the pointer that may have been automatically grabbed + * with a ButtonPress event */ + wine_tsx11_lock(); + XUngrabPointer( display, CurrentTime ); + XSendEvent(display, root_window, False, SubstructureNotifyMask | SubstructureRedirectMask, &xev); + wine_tsx11_unlock(); +} + + +/*********************************************************************** * X11DRV_ButtonPress */ void X11DRV_ButtonPress( HWND hwnd, XEvent *xev ) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index a172cd2..fa5022b 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -2779,9 +2779,7 @@ static BOOL is_netwm_supported( Display *display, Atom atom ) LRESULT CDECL X11DRV_SysCommand( HWND hwnd, WPARAM wparam, LPARAM lparam ) { WPARAM hittest = wparam & 0x0f; - DWORD dwPoint; - int x, y, dir; - XEvent xev; + int dir; Display *display = thread_display(); struct x11drv_win_data *data; @@ -2833,30 +2831,6 @@ LRESULT CDECL X11DRV_SysCommand( HWND hwnd, WPARAM wparam, LPARAM lparam ) return -1; } - dwPoint = GetMessagePos(); - x = (short)LOWORD(dwPoint); - y = (short)HIWORD(dwPoint); - - TRACE("hwnd %p, x %d, y %d, dir %d\n", hwnd, x, y, dir); - - xev.xclient.type = ClientMessage; - xev.xclient.window = X11DRV_get_whole_window(hwnd); - xev.xclient.message_type = x11drv_atom(_NET_WM_MOVERESIZE); - xev.xclient.serial = 0; - xev.xclient.display = display; - xev.xclient.send_event = True; - xev.xclient.format = 32; - xev.xclient.data.l[0] = x - virtual_screen_rect.left; /* x coord */ - xev.xclient.data.l[1] = y - virtual_screen_rect.top; /* y coord */ - xev.xclient.data.l[2] = dir; /* direction */ - xev.xclient.data.l[3] = 1; /* button */ - xev.xclient.data.l[4] = 0; /* unused */ - - /* need to ungrab the pointer that may have been automatically grabbed - * with a ButtonPress event */ - wine_tsx11_lock(); - XUngrabPointer( display, CurrentTime ); - XSendEvent(display, root_window, False, SubstructureNotifyMask | SubstructureRedirectMask, &xev); - wine_tsx11_unlock(); + move_resize_window( display, data, dir ); return 0; } diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 78e7cd0..15fac6f 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -674,6 +674,7 @@ extern LRESULT clip_cursor_notify( HWND hwnd, HWND new_clip_hwnd ) DECLSPEC_HIDD extern void ungrab_clipping_window(void) DECLSPEC_HIDDEN; extern void reset_clipping_window(void) DECLSPEC_HIDDEN; extern BOOL clip_fullscreen_window( HWND hwnd, BOOL reset ) DECLSPEC_HIDDEN; +extern void move_resize_window( Display *display, struct x11drv_win_data *data, int dir ) DECLSPEC_HIDDEN; extern void X11DRV_InitKeyboard( Display *display ) DECLSPEC_HIDDEN; extern DWORD CDECL X11DRV_MsgWaitForMultipleObjectsEx( DWORD count, const HANDLE *handles, DWORD timeout, DWORD mask, DWORD flags ) DECLSPEC_HIDDEN;

1 0

Hwang YunSong : po: Update Korean translation.
by Alexandre Julliard Feb. 1, 2012

Feb. 1, 2012

Module: wine Branch: master Commit: de192bbb6b91c8b2e5accc08eb397040f1ac9494 URL: http://source.winehq.org/git/wine.git/?a=commit;h=de192bbb6b91c8b2e5accc08e… Author: Hwang YunSong <hys545(a)dreamwiz.com> Date: Tue Jan 31 23:03:13 2012 +0900 po: Update Korean translation. --- po/ko.po | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/po/ko.po b/po/ko.po index bf9abf1..c97bd65 100644 --- a/po/ko.po +++ b/po/ko.po @@ -12412,7 +12412,7 @@ msgstr "화면 해상도 " #: winecfg.rc:175 msgid "This is a sample text using 10 point Tahoma" -msgstr "이것은 10 포인트 타호마 글꼴을 사용한 예제 글자입니다" +msgstr "" #: winecfg.rc:182 msgid "DLL overrides"

1 0

Gustavo Henrique Milaré : po: Update Brazilian Portuguese translation.
by Alexandre Julliard Feb. 1, 2012

Feb. 1, 2012

Module: wine Branch: master Commit: 265d2427eecc9874e0949d3bca1a04fafdc05d5e URL: http://source.winehq.org/git/wine.git/?a=commit;h=265d2427eecc9874e0949d3bc… Author: Gustavo Henrique Milaré <gugamilare(a)gmail.com> Date: Tue Jan 31 22:37:54 2012 -0200 po: Update Brazilian Portuguese translation. --- po/pt_BR.po | 233 ++++++++++++++++++++++------------------------------------- 1 files changed, 87 insertions(+), 146 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=265d2427eecc9874e0949…

1 0

Luca Bennati : po: Update Italian translation.
by Alexandre Julliard Feb. 1, 2012

Feb. 1, 2012

Module: wine Branch: master Commit: e5100bfa20582875f2aed19d3faf5a8102541350 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e5100bfa20582875f2aed19d3… Author: Luca Bennati <lucak3(a)gmail.com> Date: Wed Feb 1 15:16:20 2012 +0100 po: Update Italian translation. --- po/it.po | 38 +++++++++++++++++++------------------- 1 files changed, 19 insertions(+), 19 deletions(-) diff --git a/po/it.po b/po/it.po index 09b42f6..8256063 100644 --- a/po/it.po +++ b/po/it.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2012-01-27 20:51+0100\n" +"PO-Revision-Date: 2012-02-01 15:00+0100\n" "Last-Translator: Luca Bennati <lucak3(a)gmail.com>\n" "Language-Team: none\n" "Language: Italian\n" @@ -2086,11 +2086,11 @@ msgstr "&Stato del Certificato:" #: cryptui.rc:221 msgid "Disclaimer" -msgstr "Disclaimer" +msgstr "Liberatoria" #: cryptui.rc:228 msgid "More &Info" -msgstr "Più %Informazioni" +msgstr "Più &informazioni" #: cryptui.rc:236 msgid "&Friendly name:" @@ -3686,7 +3686,7 @@ msgstr "Errore generico\n" #: winerror.mc:186 msgid "Sharing violation\n" -msgstr "Viloazione di condivisione\n" +msgstr "Violazione di condivisione\n" #: winerror.mc:191 msgid "Lock violation\n" @@ -7299,7 +7299,7 @@ msgid "" "make sure the correct drive is selected below" msgstr "" "Inserisci il disco d'installazione del produttore, quindi\n" -"assicurati che l'unità giusta sia selezinata sotto" +"assicurati che l'unità giusta sia selezionata sotto" #: setupapi.rc:54 msgid "Copy manufacturer's files from:" @@ -7624,7 +7624,7 @@ msgstr "Icone &piccole" #: shell32.rc:29 shell32.rc:44 shell32.rc:121 shell32.rc:161 msgid "&List" -msgstr "&Lista" +msgstr "&Elenco" #: shell32.rc:30 shell32.rc:45 shell32.rc:122 shell32.rc:162 taskmgr.rc:67 #: taskmgr.rc:112 taskmgr.rc:254 @@ -8018,7 +8018,7 @@ msgstr "Sei sicuro di voler cancellare questi %1 elementi?" #: shell32.rc:178 msgid "Confirm file overwrite" -msgstr "Confermare la sovrascrizione del file" +msgstr "Confermare la sovrascrittura del file" #: shell32.rc:177 msgid "" @@ -8401,8 +8401,8 @@ msgid "" "The wave header was not prepared. Use the Prepare function to prepare the " "header, and then try again." msgstr "" -"L'header wave non è stato preparato. Usare la funzione Prepare per preparare " -"l'header e riprovare." +"L'intestazione del wave non è stata preparata. Usare la funzione Prepare per " +"preparare l'intestazione e riprovare." #: winmm.rc:45 msgid "" @@ -8417,8 +8417,8 @@ msgid "" "The MIDI header was not prepared. Use the Prepare function to prepare the " "header, and then try again." msgstr "" -"L'header MIDI non è stato preparato. Usare la funzione Prepare per preparare " -"l'header e riprovare." +"L'intestazione MIDI non è stata preparata. Usare la funzione Prepare per " +"preparare l'intestazione e riprovare." #: winmm.rc:50 msgid "" @@ -9716,7 +9716,7 @@ msgid "" msgstr "" "ASSOC mostra o modifica le associazioni con le estensioni dei file.\n" "\n" -"Sintassi: ASSOC [.ext[=[tipoFile]]]\n" +"Sintassi: ASSOC [.ext[=[tipo_file]]]\n" "\n" "ASSOC senza parametri mostra le attuali associazioni dei file.\n" "Se usato con solo un'estensione di file, mostra l'associazione attuale.\n" @@ -9738,13 +9738,13 @@ msgid "" msgstr "" "FTYPE mostra o modifica i comandi di apertura associati ai tipi di file.\n" "\n" -"Sintassi: FTYPE [tipoFile[=[comandoApertura]]]\n" +"Sintassi: FTYPE [tipo_file[=[comando_apertura]]]\n" "\n" "Senza parametri, mostra i tipi di file per i quali sono attualmente definiti " "comandi di apertura.\n" "Se usato con solo un tipo di file, mostra la stringa del comando di apertura " "associato, se esiste.\n" -"Non specifying alcun comando di apertura dopo il segno uguale rimuove il la " +"Non specificare alcun comando di apertura dopo il segno uguale rimuove la " "stringa di comando associata con il tipo di file specificato.\n" #: cmd.rc:243 @@ -11692,7 +11692,7 @@ msgstr "Termina la &famiglia dei processi" #: taskmgr.rc:152 winedbg.rc:29 msgid "&Debug" -msgstr "" +msgstr "Eseguire &debug" #: taskmgr.rc:154 msgid "Set &Priority" @@ -12015,11 +12015,11 @@ msgstr "Dimensione della memoria &virtuale" #: taskmgr.rc:555 msgid "Pa&ged Pool" -msgstr "Riserva di pa&ging" +msgstr "Riserva pa&ginata" #: taskmgr.rc:557 msgid "N&on-paged Pool" -msgstr "Riserva n&on di paging" +msgstr "Riserva n&on paginata" #: taskmgr.rc:559 msgid "Base P&riority" @@ -12297,7 +12297,7 @@ msgstr "Dimensione VM" #: taskmgr.rc:287 msgid "Paged Pool" -msgstr "Riserva paging" +msgstr "Riserva paginata" #: taskmgr.rc:288 msgid "NP Pool" @@ -12416,7 +12416,7 @@ msgstr "" #: view.rc:33 msgid "&Pan" -msgstr "&Pan" +msgstr "S&postamento" #: view.rc:35 msgid "&Scale to Window"

1 0

Aric Stewart : usp10: Implement SSA_LINK flag.
by Alexandre Julliard Feb. 1, 2012

Feb. 1, 2012

Module: wine Branch: master Commit: 3ae30a676adecf6c22f6a4b6f76d50f8b1244948 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ae30a676adecf6c22f6a4b6f… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Jan 31 13:11:36 2012 -0600 usp10: Implement SSA_LINK flag. --- dlls/usp10/usp10.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index 1342303..1f2b863 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -1856,6 +1856,9 @@ HRESULT WINAPI ScriptStringAnalyse(HDC hdc, const void *pString, int cString, } } + if ((dwFlags & SSA_LINK) && !analysis->glyphs[i].fallbackFont && !scriptInformation[analysis->pItem[i].a.eScript].props.fComplex) + analysis->pItem[i].a.fNoGlyphIndex = TRUE; + hr = ScriptShape(hdc, sc, &pStr[analysis->pItem[i].iCharPos], cChar, numGlyphs, &analysis->pItem[i].a, glyphs, pwLogClust, psva, &numGlyphsReturned);

1 0

Łukasz Wojniłowicz : Polish translation for release 1.4-rc1
by Jeremy Newman Feb. 1, 2012

Feb. 1, 2012

Module: website Branch: master Commit: c40e3bbf1e22261efb4fc483e6e50e00b139cc2a URL: http://source.winehq.org/git/website.git/?a=commit;h=c40e3bbf1e22261efb4fc4… Author: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> Date: Sat Jan 28 19:29:44 2012 +0100 Polish translation for release 1.4-rc1 --- news/pl/2012012701.xml | 18 ++++++++++++++++++ 1 files changed, 18 insertions(+), 0 deletions(-) diff --git a/news/pl/2012012701.xml b/news/pl/2012012701.xml new file mode 100644 index 0000000..cfff0ac --- /dev/null +++ b/news/pl/2012012701.xml @@ -0,0 +1,18 @@ +<news> +<date>Styczeń 27, 2012</date> +<title>Wydano Wine 1.4-rc1</title> +<body> + Wydanie rozwojowe Wine 1.4-rc1 jest już dostępne. + To pierwszy kandydat do wydania na Wine 1.4. Rozpoczyna on okres zamrożenia kodu. Proszę o porządne przetestowanie tego wydania, tak abyśmy mogli stworzyć wersję 1.4 tak dobrą jak to tylko możliwe. + <a href="{$root}/announce/1.4-rc1">Co nowego</a> w tym wydaniu: +<ul> + <li>Ulepszone okno dialogowe awarii z obsługą zapisu śladu awarii.</li> + <li>Wsparcie dla przycisku 'Wstecz' we wbudowanym Internet Explorer.</li> + <li>Skróty klawiaturowe mogą teraz być tłumaczone przez pliki po.</li> + <li>Kilka poprawek do instalatorów.</li> + <li>Wiele uaktualnień tłumaczeń i nowych ustawień.</li> + <li>Rozmaite poprawki błędów.</li> +</ul> +Źródło jest <a href="http://prdownloads.sourceforge.net/wine/wine-1.4-rc1.tar.bz2">już dostępne</a>. +Paczki binarne są w trakcie budowy i ukażą się wkrótce w przeznaczonych dla nich <a href="{$root}/download">pobieralniach</a>. +</body></news>

1 0

André Hentschel : Wine 1.4-rc1 freigegeben
by Jeremy Newman Feb. 1, 2012

Feb. 1, 2012

Module: website Branch: master Commit: e6f7058a9c8f7affec27cdf1b021232bf67f4984 URL: http://source.winehq.org/git/website.git/?a=commit;h=e6f7058a9c8f7affec27cd… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat Jan 28 13:36:53 2012 +0100 Wine 1.4-rc1 freigegeben --- news/de/2012012701.xml | 18 ++++++++++++++++++ 1 files changed, 18 insertions(+), 0 deletions(-) diff --git a/news/de/2012012701.xml b/news/de/2012012701.xml new file mode 100644 index 0000000..38d51af --- /dev/null +++ b/news/de/2012012701.xml @@ -0,0 +1,18 @@ +<news> +<date>27. Januar 2012</date> +<title>Wine 1.4-rc1 freigegeben</title> +<body> + Die Entwicklungsversion 1.4-rc1 von Wine ist jetzt verfügbar. + Das ist der erste Release Candidate für Wine 1.4. Es läutet den Anfang des Code-Freeze ein. Bitte testet das Release gut durch um uns zu helfen 1.4 so gut wie möglich zu machen. + <a href="{$root}/announce/1.4-rc1">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Verbesserter Crash Dialog mit der Möglichkeit den Backtrace zu speichern.</li> + <li>Unterstützung für den Zurück-Knopf im eigenen Internet Explorer.</li> + <li>Tastenkombination können nun mit po-Dateien übersetzt werden.</li> + <li>Einige Installer Fehlerbehebungen.</li> + <li>Viele Überstetzungsupdates und -Optimierungen.</li> + <li>Verschiedene Fehlerbehebungen.</li> +</ul> +Der Quellcode ist jetzt <a href="http://prdownloads.sourceforge.net/wine/wine-1.4-rc1.tar.bz2">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Download-Seiten</a> zur Verfügung. +</body></news>

1 0

Frédéric Delanoy : French translation for release 1.4-rc1
by Jeremy Newman Feb. 1, 2012

Feb. 1, 2012

Module: website Branch: master Commit: 63a6b478339bf0c2204f0f5c563c5ed7ab796d9c URL: http://source.winehq.org/git/website.git/?a=commit;h=63a6b478339bf0c2204f0f… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Jan 28 03:04:30 2012 +0100 French translation for release 1.4-rc1 --- news/fr/2012012701.xml | 24 ++++++++++++++++++++++++ 1 files changed, 24 insertions(+), 0 deletions(-) diff --git a/news/fr/2012012701.xml b/news/fr/2012012701.xml new file mode 100644 index 0000000..2d876d8 --- /dev/null +++ b/news/fr/2012012701.xml @@ -0,0 +1,24 @@ +<news> +<date>27 janvier 2012</date> +<title>Sortie de Wine 1.4-rc1</title> +<body> + La version de développement 1.4-rc1 de Wine est disponible. + C'est la première version candidate du prochain Wine 1.4. Elle marque le début de la période de +gel du code. Merci de tester adéquatement cette version afin que la version 1.4 soit la meilleure +possible. + <a href="{$root}/announce/1.4-rc1">Nouveautés</a> de cette version : +<ul> + <li>Boîte de dialogue de plantage améliorée avec possibilité d'enregistrement de la pile +d'appels.</li> + <li>Prise en charge du bouton Précédent dans l'Internet Explorer intégré.</li> + <li>Raccourcis clavier traduisibles au travers des fichiers po.</li> + <li>Plusieurs correctifs pour les programmes d'installation.</li> + <li>Moult mises à jour et ajustements de traduction.</li> + <li>Diverses corrections de bogues.</li> +</ul> +Le <a +href="http://prdownloads.sourceforge.net/wine/wine-1.4-rc1.tar.bz2">code +source</a> est disponible dès à présent. +Les paquets binaires sont en cours de construction, et apparaîtront sous peu +sur leurs <a href="{$root}/download">sites de téléchargement</a> respectifs. +</body></news>

1 0

André Hentschel : Fix a typo in the German translation
by Jeremy Newman Feb. 1, 2012

Feb. 1, 2012

Module: website Branch: master Commit: 0dff11892ef90f53e0125b0eb4e18d89a35b1d71 URL: http://source.winehq.org/git/website.git/?a=commit;h=0dff11892ef90f53e0125b… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat Jan 28 13:36:47 2012 +0100 Fix a typo in the German translation --- news/de/2012011301.xml | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/news/de/2012011301.xml b/news/de/2012011301.xml index 6f29aa4..aaea1e5 100644 --- a/news/de/2012011301.xml +++ b/news/de/2012011301.xml @@ -12,6 +12,6 @@ <li>Einige Fehlerbehebungen am eigenen Internet Explorer.</li> <li>Verschiedene Fehlerbehebungen.</li> </ul> -Der Quellcode ist jetzt <a href="http://prdownloads.sourceforge.net/wine/wine-1.3.36.tar.bz2">verfügbar</a>. +Der Quellcode ist jetzt <a href="http://prdownloads.sourceforge.net/wine/wine-1.3.37.tar.bz2">verfügbar</a>. Binär-Downloads werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Download-Seiten</a> zur Verfügung. </body></news>

1 0

André Hentschel : winelib: Update the spec file section.
by Alexandre Julliard Feb. 1, 2012

Feb. 1, 2012

Module: docs Branch: master Commit: 995d0e9801e6c1b482a95625ec9224f131ab1ee6 URL: http://source.winehq.org/git/docs.git/?a=commit;h=995d0e9801e6c1b482a95625e… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Jan 29 20:31:32 2012 +0100 winelib: Update the spec file section. --- en/winelib-toolkit.sgml | 281 +++++++++++------------------------------------ 1 files changed, 63 insertions(+), 218 deletions(-) Diff: http://source.winehq.org/git/docs.git/?a=commitdiff;h=995d0e9801e6c1b482a95…

1 0

André Hentschel : winelib: Update example winemaker usage.
by Alexandre Julliard Feb. 1, 2012

Feb. 1, 2012

Module: docs Branch: master Commit: 95e448fc7584c340dec1e85580541dca82f03e3d URL: http://source.winehq.org/git/docs.git/?a=commit;h=95e448fc7584c340dec1e8558… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Jan 29 20:31:24 2012 +0100 winelib: Update example winemaker usage. --- en/winelib-intro.sgml | 13 ++----------- 1 files changed, 2 insertions(+), 11 deletions(-) diff --git a/en/winelib-intro.sgml b/en/winelib-intro.sgml index 9148336..c5ef38a 100644 --- a/en/winelib-intro.sgml +++ b/en/winelib-intro.sgml @@ -176,22 +176,13 @@ these libraries prefixed by <literal>-i</literal>: </para> <programlisting> - $ winemaker --lower-uppercase -icomdlg32 -ishell32 -ishlwapi -iuser32 -igdi32 -iadvapi32 -ikernel32 . - $ make - </programlisting> - - <para> - Now you're ready to continue at the same point the first - <command>make</command> failed. Return to the notepad2 - directory and type: - </para> - <programlisting> + $ winemaker --lower-uppercase -icomdlg32 -ishell32 -ishlwapi -iuser32 -igdi32 -iadvapi32 . $ make </programlisting> <para> You are done! Now you can start the application as - <command>wine notepad2.exe.so</command>. + <command>wine notepad2.exe.so</command> or <command>./notepad2.exe</command>. </para> <para> If you come across problems preparing and building this application

1 0

André Hentschel : winedev: Update the documentation for make_opengl.
by Alexandre Julliard Feb. 1, 2012

Feb. 1, 2012

Module: docs Branch: master Commit: a574e6da2ebd0b3ede5be67204831448d14180d7 URL: http://source.winehq.org/git/docs.git/?a=commit;h=a574e6da2ebd0b3ede5be6720… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Jan 29 20:31:41 2012 +0100 winedev: Update the documentation for make_opengl. --- en/winedev-opengl.sgml | 42 +++++++----------------------------------- 1 files changed, 7 insertions(+), 35 deletions(-) diff --git a/en/winedev-opengl.sgml b/en/winedev-opengl.sgml index 82e140a..d26b742 100644 --- a/en/winedev-opengl.sgml +++ b/en/winedev-opengl.sgml @@ -166,42 +166,14 @@ <para> The script is located in <filename>dlls/opengl32</filename> and is called <command>make_opengl</command>. It requires - Perl5 to work and takes two arguments : + Perl5 to work and takes an OpenGL version as argument. + It's the version to 'simulate'. This fixes the list of functions + that the Windows application can link directly to without having + to query them from the OpenGL driver. + </para> + <para> + This option can be 1.0 to 1.5. The default is 1.1. </para> - - <orderedlist> - <listitem> - <para> - The first is the path to the OpenGL registry. Now, you - will all ask 'but what is the OpenGL registry ?' :-) - Well, it's part of the OpenGL sample implementation - source tree from SGI (more information at this URL : - <ulink url="http://oss.sgi.com/projects/ogl-sample/"> - http://oss.sgi.com/projects/ogl-sample/</ulink>. - </para> - <para> - To summarize, these files contain human-readable but - easily parsed information on ALL OpenGL core functions - and ALL registered extensions (for example the - prototype, the OpenGL version, ...). - </para> - </listitem> - <listitem> - <para> - the second is the OpenGL version to 'simulate'. This - fixes the list of functions that the Windows application - can link directly to without having to query them from - the OpenGL driver. Windows is based, for now, on OpenGL - 1.1, but the thunks that are in the Git tree are - generated for OpenGL 1.2. - </para> - <para> - This option can have three values: - <literal>1.0</literal>, <literal>1.1</literal> and - <literal>1.2</literal>. - </para> - </listitem> - </orderedlist> <para> This script generates three files :

1 0

André Hentschel : winelib: Update documentation on how to resolve c library calls to msvcrt.
by Alexandre Julliard Feb. 1, 2012

Feb. 1, 2012

Module: docs Branch: master Commit: 9752d5f68cc074d0ea49024082b24041cbe2b7e9 URL: http://source.winehq.org/git/docs.git/?a=commit;h=9752d5f68cc074d0ea4902408… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Jan 29 20:30:22 2012 +0100 winelib: Update documentation on how to resolve c library calls to msvcrt. --- en/winelib-porting.sgml | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/en/winelib-porting.sgml b/en/winelib-porting.sgml index 7a523cf..d19af01 100644 --- a/en/winelib-porting.sgml +++ b/en/winelib-porting.sgml @@ -73,10 +73,8 @@ calls. </para> - <programlisting>import msvcrt.dll</programlisting> - <para> - to your applications <filename>.spec</filename> file. This + Add <option>-mno-cygwin</option> to your compiler flags. This will cause <command>winebuild</command> to resolve your c library calls to <filename>msvcrt.dll</filename>. Many simple calls which behave the same have been specified as

1 0