June 2009 - Wine-commits - list.winehq.org

Jonathan Ernst : reg: Updated French translation.
by Alexandre Julliard 09 Jun '09

09 Jun '09

Module: wine Branch: master Commit: 686119d89c50db8b4a1c4913dc13a67ef1146f29 URL: http://source.winehq.org/git/wine.git/?a=commit;h=686119d89c50db8b4a1c4913d… Author: Jonathan Ernst <jonathan(a)ernstfamily.ch> Date: Mon Jun 8 22:08:24 2009 +0200 reg: Updated French translation. --- programs/reg/Fr.rc | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/programs/reg/Fr.rc b/programs/reg/Fr.rc index 448f3da..671ebf6 100644 --- a/programs/reg/Fr.rc +++ b/programs/reg/Fr.rc @@ -3,6 +3,7 @@ * French language support * * Copyright 2008 Francois Gouget + * Copyright 2009 Jonathan Ernst * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -27,4 +28,9 @@ STRINGTABLE STRING_ADD_USAGE, "REG ADD nom_de_cl� [/v nom_de_valeur | /ve] [/t type] [/s s�parateur] [/d donn�e] [/f]\n" STRING_DELETE_USAGE, "REG DELETE nom_de_cl� [/v nom_de_valeur | /ve | /va] [/f]\n" STRING_QUERY_USAGE, "REG QUERY nom_de_cl� [/v nom_de_valeur | /ve] [/s]\n" + STRING_SUCCESS, "L'op�ration s'est termin�e avec succ�s\n" + STRING_INVALID_KEY, "Erreur�: Nom de cl� non valable\n" + STRING_INVALID_CMDLINE, "Erreur�: Param�tre de ligne de commande non valable\n" + STRING_NO_REMOTE, "Erreur�: Impossible d'ajouter des cl�s � une machine distante\n" + STRING_CANNOT_FIND, "Erreur�: Le syst�me n'a pas �t� en mesure de trouver la cl� ou la valeur de registre sp�cifi�e\n" }

1 0

Jonathan Ernst : shell32: Updated French translation.
by Alexandre Julliard 09 Jun '09

09 Jun '09

Module: wine Branch: master Commit: c7c3a2e37692110deb90d4d90916c367c291f6f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c7c3a2e37692110deb90d4d90… Author: Jonathan Ernst <jonathan(a)ernstfamily.ch> Date: Mon Jun 8 22:08:12 2009 +0200 shell32: Updated French translation. --- dlls/shell32/shell32_Fr.rc | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/shell32/shell32_Fr.rc b/dlls/shell32/shell32_Fr.rc index b8308fd..e4fc4bb 100644 --- a/dlls/shell32/shell32_Fr.rc +++ b/dlls/shell32/shell32_Fr.rc @@ -3,7 +3,7 @@ * French language support * * Copyright 1998 Juergen Schmied - * Copyright 2006-2008 Jonathan Ernst + * Copyright 2006-2009 Jonathan Ernst * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -288,6 +288,8 @@ STRINGTABLE IDS_CPANEL_TITLE "Wine Control Panel" IDS_CPANEL_NAME "Name" IDS_CPANEL_DESCRIPTION "Description" + + IDS_SHLEXEC_NOASSOC "Il n'y a aucun programme Windows configuré pour ouvrir ce type de fichier." } STRINGTABLE

1 0

Nikolay Sivov : comctl32/listview: Fix item count tests to be dpi aware.
by Alexandre Julliard 09 Jun '09

09 Jun '09

Module: wine Branch: master Commit: f531271d707bd0e5ce922fb68d2b105bf751b725 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f531271d707bd0e5ce922fb68… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Mon Jun 8 22:54:56 2009 +0400 comctl32/listview: Fix item count tests to be dpi aware. --- dlls/comctl32/tests/listview.c | 18 ++++++++++++++++++ 1 files changed, 18 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 8e87651..ca72fa5 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -1570,6 +1570,11 @@ static void test_item_count(void) HWND hwnd; DWORD r; + HDC hdc; + HFONT hOldFont; + TEXTMETRICA tm; + RECT rect; + INT height; LVITEM item0; LVITEM item1; @@ -1581,6 +1586,19 @@ static void test_item_count(void) hwnd = create_listview_control(0); ok(hwnd != NULL, "failed to create a listview window\n"); + /* resize in dpiaware manner to fit all 3 items added */ + hdc = GetDC(0); + hOldFont = SelectObject(hdc, GetStockObject(SYSTEM_FONT)); + GetTextMetricsA(hdc, &tm); + /* 2 extra pixels for bounds and header border */ + height = tm.tmHeight + 2; + SelectObject(hdc, hOldFont); + ReleaseDC(0, hdc); + + GetWindowRect(hwnd, &rect); + /* 3 items + 1 header + 1 to be sure */ + MoveWindow(hwnd, 0, 0, rect.right - rect.left, 5 * height, FALSE); + flush_sequences(sequences, NUM_MSG_SEQUENCES); trace("test item count\n");

1 0

Nikolay Sivov : comctl32/listview: Remove outdated todo entries.
by Alexandre Julliard 09 Jun '09

09 Jun '09

Module: wine Branch: master Commit: 0bca442f25b7b643ebb41a17c72ee7bb932416e9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0bca442f25b7b643ebb41a17c… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Mon Jun 8 23:40:26 2009 +0400 comctl32/listview: Remove outdated todo entries. --- dlls/comctl32/listview.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 38f7152..df07384 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -81,7 +81,6 @@ * -- LVS_NOLABELWRAP * -- LVS_NOSCROLL (see Q137520) * -- LVS_ALIGNTOP - * -- LVS_TYPESTYLEMASK * * Extended Styles * -- LVS_EX_BORDERSELECT @@ -120,7 +119,6 @@ * -- LVM_GETISEARCHSTRINGW, LVM_GETISEARCHSTRINGA * -- LVM_GETTILEINFO, LVM_SETTILEINFO * -- LVM_GETTILEVIEWINFO, LVM_SETTILEVIEWINFO - * -- LVM_GETUNICODEFORMAT, LVM_SETUNICODEFORMAT * -- LVM_GETWORKAREAS, LVM_SETWORKAREAS * -- LVM_HASGROUP, LVM_INSERTGROUP, LVM_REMOVEGROUP, LVM_REMOVEALLGROUPS * -- LVM_INSERTGROUPSORTED @@ -137,7 +135,6 @@ * -- ListView_GetHoverTime, ListView_SetHoverTime * -- ListView_GetISearchString * -- ListView_GetNumberOfWorkAreas - * -- ListView_GetUnicodeFormat, ListView_SetUnicodeFormat * -- ListView_GetWorkAreas, ListView_SetWorkAreas * * Functions:

1 0

Vincent Povirk : kernel32/tests: Test waiting on a disconnected client pipe .
by Alexandre Julliard 09 Jun '09

09 Jun '09

Module: wine Branch: master Commit: b210eeb1adf66f6cbfa04e0f6b94b3914b5a523c URL: http://source.winehq.org/git/wine.git/?a=commit;h=b210eeb1adf66f6cbfa04e0f6… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Jun 8 16:23:36 2009 -0500 kernel32/tests: Test waiting on a disconnected client pipe. --- dlls/kernel32/tests/pipe.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/tests/pipe.c b/dlls/kernel32/tests/pipe.c index a1080fa..948c704 100644 --- a/dlls/kernel32/tests/pipe.c +++ b/dlls/kernel32/tests/pipe.c @@ -836,6 +836,7 @@ static int test_DisconnectNamedPipe(void) char ibuf[32]; DWORD written; DWORD readden; + DWORD ret; SetLastError(0xdeadbeef); hnp = CreateNamedPipe(PIPENAME, PIPE_ACCESS_DUPLEX, PIPE_TYPE_BYTE | PIPE_WAIT, @@ -876,6 +877,8 @@ static int test_DisconnectNamedPipe(void) "ReadFile from disconnected pipe with bytes waiting\n"); ok(!DisconnectNamedPipe(hnp) && GetLastError() == ERROR_PIPE_NOT_CONNECTED, "DisconnectNamedPipe worked twice\n"); + ret = WaitForSingleObject(hFile, 0); + ok(ret == WAIT_TIMEOUT, "WaitForSingleObject returned %X\n", ret); ok(CloseHandle(hFile), "CloseHandle\n"); }

1 0

Andrew Talbot : comctl32: Constify some variables.
by Alexandre Julliard 09 Jun '09

09 Jun '09

Module: wine Branch: master Commit: 9064506f768031e4dffbbc2459b477c506ef9963 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9064506f768031e4dffbbc245… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Mon Jun 8 23:07:41 2009 +0100 comctl32: Constify some variables. --- dlls/comctl32/tooltips.c | 22 +++++++++++----------- 1 files changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/comctl32/tooltips.c b/dlls/comctl32/tooltips.c index 9d7c327..54600e8 100644 --- a/dlls/comctl32/tooltips.c +++ b/dlls/comctl32/tooltips.c @@ -1020,7 +1020,7 @@ TOOLTIPS_Activate (TOOLTIPS_INFO *infoPtr, BOOL activate) static LRESULT -TOOLTIPS_AddToolA (TOOLTIPS_INFO *infoPtr, LPTTTOOLINFOA lpToolInfo) +TOOLTIPS_AddToolA (TOOLTIPS_INFO *infoPtr, const TTTOOLINFOA *lpToolInfo) { TTTOOL_INFO *toolPtr; INT nResult; @@ -1109,7 +1109,7 @@ TOOLTIPS_AddToolA (TOOLTIPS_INFO *infoPtr, LPTTTOOLINFOA lpToolInfo) static LRESULT -TOOLTIPS_AddToolW (TOOLTIPS_INFO *infoPtr, LPTTTOOLINFOW lpToolInfo) +TOOLTIPS_AddToolW (TOOLTIPS_INFO *infoPtr, const TTTOOLINFOW *lpToolInfo) { TTTOOL_INFO *toolPtr; INT nResult; @@ -1376,7 +1376,7 @@ TOOLTIPS_EnumToolsW (const TOOLTIPS_INFO *infoPtr, UINT uIndex, LPTTTOOLINFOW lp } static LRESULT -TOOLTIPS_GetBubbleSize (const TOOLTIPS_INFO *infoPtr, LPTTTOOLINFOW lpToolInfo) +TOOLTIPS_GetBubbleSize (const TOOLTIPS_INFO *infoPtr, const TTTOOLINFOW *lpToolInfo) { INT nTool; SIZE size; @@ -1711,7 +1711,7 @@ TOOLTIPS_HitTestW (const TOOLTIPS_INFO *infoPtr, LPTTHITTESTINFOW lptthit) static LRESULT -TOOLTIPS_NewToolRectA (TOOLTIPS_INFO *infoPtr, LPTTTOOLINFOA lpti) +TOOLTIPS_NewToolRectA (TOOLTIPS_INFO *infoPtr, const TTTOOLINFOA *lpti) { INT nTool; @@ -1733,7 +1733,7 @@ TOOLTIPS_NewToolRectA (TOOLTIPS_INFO *infoPtr, LPTTTOOLINFOA lpti) static LRESULT -TOOLTIPS_NewToolRectW (TOOLTIPS_INFO *infoPtr, LPTTTOOLINFOW lpti) +TOOLTIPS_NewToolRectW (TOOLTIPS_INFO *infoPtr, const TTTOOLINFOW *lpti) { INT nTool; @@ -1867,7 +1867,7 @@ TOOLTIPS_SetDelayTime (TOOLTIPS_INFO *infoPtr, DWORD duration, INT nTime) static LRESULT -TOOLTIPS_SetMargin (TOOLTIPS_INFO *infoPtr, LPRECT lpRect) +TOOLTIPS_SetMargin (TOOLTIPS_INFO *infoPtr, const RECT *lpRect) { infoPtr->rcMargin.left = lpRect->left; infoPtr->rcMargin.right = lpRect->right; @@ -1970,7 +1970,7 @@ TOOLTIPS_SetTitleW (TOOLTIPS_INFO *infoPtr, UINT_PTR uTitleIcon, LPCWSTR pszTitl static LRESULT -TOOLTIPS_SetToolInfoA (TOOLTIPS_INFO *infoPtr, LPTTTOOLINFOA lpToolInfo) +TOOLTIPS_SetToolInfoA (TOOLTIPS_INFO *infoPtr, const TTTOOLINFOA *lpToolInfo) { TTTOOL_INFO *toolPtr; INT nTool; @@ -2026,7 +2026,7 @@ TOOLTIPS_SetToolInfoA (TOOLTIPS_INFO *infoPtr, LPTTTOOLINFOA lpToolInfo) static LRESULT -TOOLTIPS_SetToolInfoW (TOOLTIPS_INFO *infoPtr, LPTTTOOLINFOW lpToolInfo) +TOOLTIPS_SetToolInfoW (TOOLTIPS_INFO *infoPtr, const TTTOOLINFOW *lpToolInfo) { TTTOOL_INFO *toolPtr; INT nTool; @@ -2090,7 +2090,7 @@ TOOLTIPS_SetToolInfoW (TOOLTIPS_INFO *infoPtr, LPTTTOOLINFOW lpToolInfo) static LRESULT -TOOLTIPS_TrackActivate (TOOLTIPS_INFO *infoPtr, BOOL track_activate, LPTTTOOLINFOA lpToolInfo) +TOOLTIPS_TrackActivate (TOOLTIPS_INFO *infoPtr, BOOL track_activate, const TTTOOLINFOA *lpToolInfo) { if (track_activate) { @@ -2149,7 +2149,7 @@ TOOLTIPS_Update (TOOLTIPS_INFO *infoPtr) static LRESULT -TOOLTIPS_UpdateTipTextA (TOOLTIPS_INFO *infoPtr, LPTTTOOLINFOA lpToolInfo) +TOOLTIPS_UpdateTipTextA (TOOLTIPS_INFO *infoPtr, const TTTOOLINFOA *lpToolInfo) { TTTOOL_INFO *toolPtr; INT nTool; @@ -2204,7 +2204,7 @@ TOOLTIPS_UpdateTipTextA (TOOLTIPS_INFO *infoPtr, LPTTTOOLINFOA lpToolInfo) static LRESULT -TOOLTIPS_UpdateTipTextW (TOOLTIPS_INFO *infoPtr, LPTTTOOLINFOW lpToolInfo) +TOOLTIPS_UpdateTipTextW (TOOLTIPS_INFO *infoPtr, const TTTOOLINFOW *lpToolInfo) { TTTOOL_INFO *toolPtr; INT nTool;

1 0

Detlef Riekenberg : mlang/tests: Fix a failure on win98 with mlang 4.72.
by Alexandre Julliard 09 Jun '09

09 Jun '09

Module: wine Branch: master Commit: 0e1d18eaf579f5ddc59adaf974acfd51aea67d36 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0e1d18eaf579f5ddc59adaf97… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Mon Jun 8 23:53:34 2009 +0200 mlang/tests: Fix a failure on win98 with mlang 4.72. --- dlls/mlang/tests/mlang.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/mlang/tests/mlang.c b/dlls/mlang/tests/mlang.c index 08be7a8..ab190b9 100644 --- a/dlls/mlang/tests/mlang.c +++ b/dlls/mlang/tests/mlang.c @@ -88,7 +88,7 @@ static const lcid_table_entry lcid_table[] = { {"fr-ca", 0x0c0c, S_OK}, {"fr-ch", 0x100c, S_OK}, {"fr-lu", 0x140c, S_OK}, - {"fr-mc", 0x180c, S_OK, 0x040c}, + {"fr-mc", 0x180c, S_OK, 0x040c, "fr"}, {"it", 0x0410, S_OK}, {"it-ch", 0x0810, S_OK}, @@ -1113,6 +1113,7 @@ static void test_LcidToRfc1766(void) lstrlenA(lcid_table[i].rfc1766) + 1, expected, MAX_RFC1766_NAME); /* IE <6.0 return "x-kok" for LCID 0x457 ("kok") */ + /* IE <5.0 return "fr" for LCID 0x180c ("fr-mc") */ ok( (!lstrcmpA(buffer, expected)) || broken(!lstrcmpA(buffer, lcid_table[i].broken_rfc)), "#%02d: got '%s' (expected '%s')\n", i, buffer, expected);

1 0

Alexandre Julliard : user32: Disable assert() for the mingw build since mingw gets confused trying to import MessageBoxA .
by Alexandre Julliard 09 Jun '09

09 Jun '09

Module: wine Branch: master Commit: 031c73af3078b0c7fc45d0aa94c3852097940c65 URL: http://source.winehq.org/git/wine.git/?a=commit;h=031c73af3078b0c7fc45d0aa9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 8 16:45:54 2009 +0200 user32: Disable assert() for the mingw build since mingw gets confused trying to import MessageBoxA. --- dlls/user32/user_private.h | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/user32/user_private.h b/dlls/user32/user_private.h index f1a6585..1ff6ef4 100644 --- a/dlls/user32/user_private.h +++ b/dlls/user32/user_private.h @@ -354,4 +354,10 @@ typedef struct extern void CURSORICON_FreeModuleIcons( HMODULE16 hModule ) DECLSPEC_HIDDEN; +/* Mingw's assert() imports MessageBoxA and gets confused by user32 exporting it */ +#ifdef __MINGW32__ +#undef assert +#define assert(expr) ((void)0) +#endif + #endif /* __WINE_USER_PRIVATE_H */

1 0

Alexandre Julliard : kernel32: Fix handling of %ws format for Unicode.
by Alexandre Julliard 09 Jun '09

09 Jun '09

Module: wine Branch: master Commit: b4a9c99abcfc267af6caa0d0bd802ac27fcca39e URL: http://source.winehq.org/git/wine.git/?a=commit;h=b4a9c99abcfc267af6caa0d0b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 8 18:13:13 2009 +0200 kernel32: Fix handling of %ws format for Unicode. --- dlls/kernel32/format_msg.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/format_msg.c b/dlls/kernel32/format_msg.c index f4baaae..e8f9fbc 100644 --- a/dlls/kernel32/format_msg.c +++ b/dlls/kernel32/format_msg.c @@ -485,7 +485,10 @@ DWORD WINAPI FormatMessageW( if (fmtstr[strlenW(fmtstr)-1]=='s' && argliststart[0]) { DWORD xarr[3]; + WCHAR *fmt_end = fmtstr + strlenW(fmtstr) - 1; + /* remap %ws to %ls */ + if (fmt_end > fmtstr && (fmt_end[-1] == 'w')) fmt_end[-1] = 'l'; xarr[0]=*(argliststart+0); /* possible invalid pointers */ xarr[1]=*(argliststart+1);

1 0

Alexandre Julliard : comctl32: Avoid repainting a NULL link.
by Alexandre Julliard 09 Jun '09

09 Jun '09

Module: wine Branch: master Commit: 6d7ad663157fc4d1446e723bc3ce5e6e3d8e80ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d7ad663157fc4d1446e723bc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 8 18:13:22 2009 +0200 comctl32: Avoid repainting a NULL link. --- dlls/comctl32/syslink.c | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/syslink.c b/dlls/comctl32/syslink.c index 1b89bc7..f361779 100644 --- a/dlls/comctl32/syslink.c +++ b/dlls/comctl32/syslink.c @@ -1329,10 +1329,8 @@ static LRESULT SYSLINK_SetFocus (SYSLINK_INFO *infoPtr) if(Focus != NULL) { SYSLINK_SetFocusLink(infoPtr, Focus); + SYSLINK_RepaintLink(infoPtr, Focus); } - - SYSLINK_RepaintLink(infoPtr, Focus); - return 0; } @@ -1476,7 +1474,7 @@ static BOOL SYSKEY_SelectNextPrevLink (const SYSLINK_INFO *infoPtr, BOOL Prev) { OldFocus = SYSLINK_SetFocusLink(infoPtr, NewFocus); - if(OldFocus != NewFocus) + if(OldFocus && OldFocus != NewFocus) { SYSLINK_RepaintLink(infoPtr, OldFocus); }

1 0