May 2010 - Wine-commits - list.winehq.org

Sven Baars : avifil32: Fix Dutch translation.
by Alexandre Julliard 05 May '10

05 May '10

Module: wine Branch: master Commit: 2da433feb6d7a16f887bc5cef6649ba4316ef3d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2da433feb6d7a16f887bc5cef… Author: Sven Baars <sven.wine(a)gmail.com> Date: Wed May 5 14:56:53 2010 +0200 avifil32: Fix Dutch translation. --- dlls/avifil32/avifile_Nl.rc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/avifil32/avifile_Nl.rc b/dlls/avifil32/avifile_Nl.rc index b2546a0..29ddd17 100644 --- a/dlls/avifil32/avifile_Nl.rc +++ b/dlls/avifil32/avifile_Nl.rc @@ -33,7 +33,7 @@ BEGIN PUSHBUTTON "&Opties...",IDC_OPTIONS,170,17,50,14 AUTOCHECKBOX "&Interleave alle",IDC_INTERLEAVE,3,42,85,11,WS_TABSTOP EDITTEXT IDC_INTERLEAVEEVERY,91,41,32,12,ES_AUTOHSCROLL - LTEXT "Losse frames",-1,129,43,36,9 + LTEXT "frames",-1,129,43,36,9 LTEXT "Huidig formaat:",-1,3,56,73,9 LTEXT "This space for rent",IDC_FORMATTEXT,75,56,90,26 DEFPUSHBUTTON "OK",IDOK,170,42,50,14

1 0

Sven Baars : comctl32: Fix Dutch translation.
by Alexandre Julliard 05 May '10

05 May '10

Module: wine Branch: master Commit: fbd8722856e8565273b23eb59d791c5f7a83c548 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fbd8722856e8565273b23eb59… Author: Sven Baars <sven.wine(a)gmail.com> Date: Wed May 5 15:06:00 2010 +0200 comctl32: Fix Dutch translation. --- dlls/comctl32/comctl_Nl.rc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/comctl_Nl.rc b/dlls/comctl32/comctl_Nl.rc index c89403d..fe2bf7a 100644 --- a/dlls/comctl32/comctl_Nl.rc +++ b/dlls/comctl32/comctl_Nl.rc @@ -77,7 +77,7 @@ STRINGTABLE DISCARDABLE STRINGTABLE DISCARDABLE { IDM_TODAY "Vandaag:" - IDM_GOTODAY "Ga vandaag naar" + IDM_GOTODAY "Ga naar vandaag" } STRINGTABLE DISCARDABLE

1 0

Sven Baars : comdlg32: Fix some alignment issues in the Dutch translation.
by Alexandre Julliard 05 May '10

05 May '10

Module: wine Branch: master Commit: 6b21d0c66338f8c7416bcae40340ee9aef00f34c URL: http://source.winehq.org/git/wine.git/?a=commit;h=6b21d0c66338f8c7416bcae40… Author: Sven Baars <sven.wine(a)gmail.com> Date: Wed May 5 15:15:54 2010 +0200 comdlg32: Fix some alignment issues in the Dutch translation. --- dlls/comdlg32/cdlg_Nl.rc | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/comdlg32/cdlg_Nl.rc b/dlls/comdlg32/cdlg_Nl.rc index cd04bf8..dfd5d4e 100644 --- a/dlls/comdlg32/cdlg_Nl.rc +++ b/dlls/comdlg32/cdlg_Nl.rc @@ -44,7 +44,7 @@ FONT 8, "MS Shell Dlg" DEFPUSHBUTTON "&Openen", IDOK, 208, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP PUSHBUTTON "Annuleren", IDCANCEL, 208, 24, 56, 14, WS_GROUP | WS_TABSTOP PUSHBUTTON "&Help", 1038, 208, 46, 56, 14, WS_GROUP | WS_TABSTOP - CHECKBOX "Alleen &Lezen", 1040, 208, 68, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + CHECKBOX "Alleen &Lezen", 1040, 208, 68, 55, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP } @@ -66,7 +66,7 @@ FONT 8, "MS Shell Dlg" DEFPUSHBUTTON "&Opslaan als", IDOK, 208, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP PUSHBUTTON "Annuleren", IDCANCEL, 208, 24, 56, 14, WS_GROUP | WS_TABSTOP PUSHBUTTON "&Help", 1038, 208, 46, 56, 14, WS_GROUP | WS_TABSTOP - CHECKBOX "Alleen &Lezen", 1040, 208, 68, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + CHECKBOX "Alleen &Lezen", 1040, 208, 68, 55, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP } @@ -139,7 +139,7 @@ FONT 8, "MS Shell Dlg" PUSHBUTTON "&Help" , 1038,218,57,40,14,WS_GROUP | WS_TABSTOP GROUPBOX "Effecten",1072,6,72,84,34,WS_GROUP CHECKBOX "&Doorhalen", 1040, 10,82,50,10, BS_AUTOCHECKBOX | WS_TABSTOP - CHECKBOX "&Onderstrepen", 1041, 10,94,50,10, BS_AUTOCHECKBOX + CHECKBOX "&Onderstrepen", 1041, 10,94,60,10, BS_AUTOCHECKBOX LTEXT "&Kleur:", 1091 ,6,110,30,9 COMBOBOX cmb4,6,120,84,100,CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP

1 0

Huw Davies : gdi32: Fix ExtTextOutA -> W forwarding when ETO_PDY is set.
by Alexandre Julliard 05 May '10

05 May '10

Module: wine Branch: master Commit: 9bee50f6d9c4d4055752239af432664a57923403 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9bee50f6d9c4d4055752239af… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed May 5 14:59:07 2010 +0100 gdi32: Fix ExtTextOutA -> W forwarding when ETO_PDY is set. --- dlls/gdi32/font.c | 26 +++++++++++++++++++++----- 1 files changed, 21 insertions(+), 5 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index eea53fd..c21036d 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -1586,13 +1586,29 @@ BOOL WINAPI ExtTextOutA( HDC hdc, INT x, INT y, UINT flags, if (lpDx) { unsigned int i = 0, j = 0; - lpDxW = HeapAlloc( GetProcessHeap(), 0, wlen*sizeof(INT)); + /* allocate enough for a ETO_PDY */ + lpDxW = HeapAlloc( GetProcessHeap(), 0, 2*wlen*sizeof(INT)); while(i < count) { - if(IsDBCSLeadByteEx(codepage, str[i])) { - lpDxW[j++] = lpDx[i] + lpDx[i+1]; + if(IsDBCSLeadByteEx(codepage, str[i])) + { + if(flags & ETO_PDY) + { + lpDxW[j++] = lpDx[i * 2] + lpDx[(i + 1) * 2]; + lpDxW[j++] = lpDx[i * 2 + 1] + lpDx[(i + 1) * 2 + 1]; + } + else + lpDxW[j++] = lpDx[i] + lpDx[i + 1]; i = i + 2; - } else { - lpDxW[j++] = lpDx[i]; + } + else + { + if(flags & ETO_PDY) + { + lpDxW[j++] = lpDx[i * 2]; + lpDxW[j++] = lpDx[i * 2 + 1]; + } + else + lpDxW[j++] = lpDx[i]; i = i + 1; } }

1 0

Huw Davies : comctl32: Silence a few compiler warnings.
by Alexandre Julliard 05 May '10

05 May '10

Module: wine Branch: master Commit: 1af17844301c4924dd8324cbf2f9c3c1ef0394b2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1af17844301c4924dd8324cbf… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue May 4 14:05:13 2010 +0100 comctl32: Silence a few compiler warnings. --- dlls/comctl32/datetime.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/datetime.c b/dlls/comctl32/datetime.c index dc2dd12..2418950 100644 --- a/dlls/comctl32/datetime.c +++ b/dlls/comctl32/datetime.c @@ -614,7 +614,7 @@ DATETIME_ReturnFieldWidth (const DATETIME_INFO *infoPtr, HDC hdc, int count, SHO lctype = LOCALE_SABBREVMONTHNAME1; max_count = 12; break; - case FULLMONTH: + default: /* FULLMONTH */ fall = fld_mon; lctype = LOCALE_SMONTHNAME1; max_count = 12;

1 0

Gerald Pfeifer : winex11.drv: Remove variable bits which is not really used from X11DRV_DIB_GetImageBits_4 .
by Alexandre Julliard 05 May '10

05 May '10

Module: wine Branch: master Commit: c5bc2a5d2faf1723ed4c08708f5d5337baa188ff URL: http://source.winehq.org/git/wine.git/?a=commit;h=c5bc2a5d2faf1723ed4c08708… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Wed May 5 00:24:24 2010 +0200 winex11.drv: Remove variable bits which is not really used from X11DRV_DIB_GetImageBits_4. --- dlls/winex11.drv/dib.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/dlls/winex11.drv/dib.c b/dlls/winex11.drv/dib.c index 4b9c52b..ec97f2d 100644 --- a/dlls/winex11.drv/dib.c +++ b/dlls/winex11.drv/dib.c @@ -970,7 +970,6 @@ static void X11DRV_DIB_GetImageBits_4( int lines, BYTE *dstbits, { DWORD x; int h, width = min(srcwidth, dstwidth); - BYTE *bits; if (lines < 0 ) { @@ -979,8 +978,6 @@ static void X11DRV_DIB_GetImageBits_4( int lines, BYTE *dstbits, linebytes = -linebytes; } - bits = dstbits; - switch (bmpImage->depth) { case 1: case 4:

1 0

Gerald Pfeifer : ntdll/tests: Remove variable len which is not really used from create_file_test.
by Alexandre Julliard 05 May '10

05 May '10

Module: wine Branch: master Commit: b8ee1459927fdb34df2838d0fb333f8c0f25e072 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b8ee1459927fdb34df2838d0f… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Wed May 5 00:24:46 2010 +0200 ntdll/tests: Remove variable len which is not really used from create_file_test. --- dlls/ntdll/tests/file.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index 708803f..2828794 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -163,9 +163,8 @@ static void create_file_test(void) OBJECT_ATTRIBUTES attr; IO_STATUS_BLOCK io; UNICODE_STRING nameW; - UINT len; - len = GetCurrentDirectoryW( MAX_PATH, path ); + GetCurrentDirectoryW( MAX_PATH, path ); pRtlDosPathNameToNtPathName_U( path, &nameW, NULL, NULL ); attr.Length = sizeof(attr); attr.RootDirectory = 0;

1 0

Gerald Pfeifer : cryptdlg: Remove variable headingSep which is not really used from CRYPT_FormatCPS.
by Alexandre Julliard 05 May '10

05 May '10

Module: wine Branch: master Commit: f215784edc8a9c4e8d89080c908d50dd3445538c URL: http://source.winehq.org/git/wine.git/?a=commit;h=f215784edc8a9c4e8d89080c9… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Wed May 5 00:24:27 2010 +0200 cryptdlg: Remove variable headingSep which is not really used from CRYPT_FormatCPS. --- dlls/cryptdlg/main.c | 8 +------- 1 files changed, 1 insertions(+), 7 deletions(-) diff --git a/dlls/cryptdlg/main.c b/dlls/cryptdlg/main.c index f6653ec..04311fd 100644 --- a/dlls/cryptdlg/main.c +++ b/dlls/cryptdlg/main.c @@ -534,19 +534,13 @@ static BOOL CRYPT_FormatCPS(DWORD dwCertEncodingType, if ((ret = CryptDecodeObjectEx(dwCertEncodingType, X509_UNICODE_ANY_STRING, pbEncoded, cbEncoded, CRYPT_DECODE_ALLOC_FLAG, NULL, &cpsValue, &size))) { - LPCWSTR headingSep, sep; + LPCWSTR sep; DWORD sepLen; if (dwFormatStrType & CRYPT_FORMAT_STR_MULTI_LINE) - { - headingSep = colonCrlf; sep = crlf; - } else - { - headingSep = colonSpace; sep = commaSep; - } sepLen = strlenW(sep);

1 0

Gerald Pfeifer : cmd: Remove variable useinput which is not really used from WCMD_more.
by Alexandre Julliard 05 May '10

05 May '10

Module: wine Branch: master Commit: 5b0de0d569f9621967fc38bf8b686f4ae9d0962a URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b0de0d569f9621967fc38bf8… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Wed May 5 00:24:38 2010 +0200 cmd: Remove variable useinput which is not really used from WCMD_more. --- programs/cmd/builtins.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index b75c0c4..0573114 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -2353,7 +2353,6 @@ void WCMD_more (WCHAR *command) { int argno = 0; WCHAR *argN = command; - BOOL useinput = FALSE; WCHAR moreStr[100]; WCHAR moreStrPage[100]; WCHAR buffer[512]; @@ -2385,7 +2384,6 @@ void WCMD_more (WCHAR *command) { /* Warning: No easy way of ending the stream (ctrl+z on windows) so once you get in this bit unless due to a pipe, its going to end badly... */ - useinput = TRUE; wsprintfW(moreStrPage, moreFmt, moreStr); WCMD_enter_paged_mode(moreStrPage);

1 0

Gerald Pfeifer : taskmgr: Remove variable pnmv which is not really used from ProcessPageOnNotify.
by Alexandre Julliard 05 May '10

05 May '10

Module: wine Branch: master Commit: 34db2df2cc1ff45477dbbe7fe6456319ed3acc93 URL: http://source.winehq.org/git/wine.git/?a=commit;h=34db2df2cc1ff45477dbbe7fe… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Wed May 5 00:24:30 2010 +0200 taskmgr: Remove variable pnmv which is not really used from ProcessPageOnNotify. --- programs/taskmgr/procpage.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/programs/taskmgr/procpage.c b/programs/taskmgr/procpage.c index 7f91114..beccfbf 100644 --- a/programs/taskmgr/procpage.c +++ b/programs/taskmgr/procpage.c @@ -151,7 +151,6 @@ static void ProcessPageShowContextMenu(DWORD dwProcessId) static void ProcessPageOnNotify(LPARAM lParam) { LPNMHDR pnmh; - LPNMLISTVIEW pnmv; NMLVDISPINFOW* pnmdi; LVITEM lvitem; ULONG Index; @@ -163,7 +162,6 @@ static void ProcessPageOnNotify(LPARAM lParam) static const WCHAR wszUnitK[] = {' ','K',0}; pnmh = (LPNMHDR) lParam; - pnmv = (LPNMLISTVIEW) lParam; pnmdi = (NMLVDISPINFOW*) lParam; if (pnmh->hwndFrom == hProcessPageListCtrl)

1 0