December 2009 - Wine-commits

Alexandre Julliard : user32: Fix the string style check for comboboxes.
by Alexandre Julliard 21 Dec '09

21 Dec '09

Module: wine Branch: master Commit: 8e1bd0c8931efe617586aef5a412d8e4e107685b URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e1bd0c8931efe617586aef5a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 21 11:29:14 2009 +0100 user32: Fix the string style check for comboboxes. --- dlls/user32/msg16.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/dlls/user32/msg16.c b/dlls/user32/msg16.c index 5304a9d..b1cc938 100644 --- a/dlls/user32/msg16.c +++ b/dlls/user32/msg16.c @@ -2039,9 +2039,13 @@ static LRESULT combo_proc16( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam, wParam = (INT)(INT16)wParam; /* fall through */ case CB_ADDSTRING16: - if (GetWindowLongW( hwnd, GWL_STYLE ) & CBS_HASSTRINGS) lParam = (LPARAM)MapSL(lParam); + { + DWORD style = GetWindowLongW( hwnd, GWL_STYLE ); + if ((style & CBS_HASSTRINGS) || !(style & (CBS_OWNERDRAWFIXED | CBS_OWNERDRAWVARIABLE))) + lParam = (LPARAM)MapSL(lParam); msg -= msg16_offset; break; + } case CB_SETITEMHEIGHT16: case CB_GETITEMHEIGHT16: case CB_SETCURSEL16:

1 0

Henri Verbeet : wined3d: NULL vertex declarations are captured, but not applied.
by Alexandre Julliard 21 Dec '09

21 Dec '09

Module: wine Branch: master Commit: 79a20453958b4e7521970b3eb0f4eac17151d87e URL: http://source.winehq.org/git/wine.git/?a=commit;h=79a20453958b4e7521970b3eb… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Dec 18 16:21:37 2009 +0100 wined3d: NULL vertex declarations are captured, but not applied. --- dlls/d3d9/tests/stateblock.c | 170 ++++++++++++++++++++++++++++++++++++++++++ dlls/wined3d/stateblock.c | 6 +- 2 files changed, 172 insertions(+), 4 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=79a20453958b4e7521970…

1 0

Juan Lang : crypt32: Don' t get confused matching URLs with a colon in the userinfo portion (e.g. user:password@domain).
by Alexandre Julliard 21 Dec '09

21 Dec '09

Module: wine Branch: master Commit: 4e18ac601f9ea1adebc1c2d36af6d75054e0ca6d URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e18ac601f9ea1adebc1c2d36… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Dec 18 10:34:25 2009 -0800 crypt32: Don't get confused matching URLs with a colon in the userinfo portion (e.g. user:password(a)domain). --- dlls/crypt32/chain.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/crypt32/chain.c b/dlls/crypt32/chain.c index 28a2206..b2160f3 100644 --- a/dlls/crypt32/chain.c +++ b/dlls/crypt32/chain.c @@ -686,8 +686,12 @@ static BOOL url_matches(LPCWSTR constraint, LPCWSTR name, authority_end = strchrW(name, '?'); if (!authority_end) authority_end = name + strlenW(name); - /* Remove any port number from the authority */ - for (colon = authority_end; colon >= name && *colon != ':'; colon--) + /* Remove any port number from the authority. The userinfo portion + * of an authority may contain a colon, so stop if a userinfo portion + * is found (indicated by '@'). + */ + for (colon = authority_end; colon >= name && *colon != ':' && + *colon != '@'; colon--) ; if (*colon == ':') authority_end = colon;

1 0

Frédéric Delanoy : mapi32: Add French translation .
by Alexandre Julliard 21 Dec '09

21 Dec '09

Module: wine Branch: master Commit: 5dbbe5a7f1ac1c250d0f084f28a517fb60fce2b4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5dbbe5a7f1ac1c250d0f084f2… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri Dec 18 23:23:49 2009 +0100 mapi32: Add French translation. --- dlls/mapi32/Fr.rc | 33 +++++++++++++++++++++++++++++++++ dlls/mapi32/Makefile.in | 1 + 2 files changed, 34 insertions(+), 0 deletions(-) diff --git a/dlls/mapi32/Fr.rc b/dlls/mapi32/Fr.rc new file mode 100644 index 0000000..ab14e4a --- /dev/null +++ b/dlls/mapi32/Fr.rc @@ -0,0 +1,33 @@ +/* +* MAPI32 French resources +* +* Copyright 2009 Frédéric Delanoy +* +* 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 "res.h" + +/* UTF-8 */ +#pragma code_page(65001) + +LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL + +STRINGTABLE +{ + IDS_NO_MAPI_CLIENT, "L'envoi de courriel a échoué car aucun client mail MAPI n'est installé." + IDS_SEND_MAIL, "Envoyer un courriel" +} diff --git a/dlls/mapi32/Makefile.in b/dlls/mapi32/Makefile.in index 8a9233b..eecd69c 100644 --- a/dlls/mapi32/Makefile.in +++ b/dlls/mapi32/Makefile.in @@ -16,6 +16,7 @@ C_SRCS = \ RC_SRCS = \ De.rc \ En.rc \ + Fr.rc \ Lt.rc \ version.rc

1 0

Vincent Povirk : gdiplus: Add traces for values of newly-created brushes.
by Alexandre Julliard 21 Dec '09

21 Dec '09

Module: wine Branch: master Commit: f1417780033a008ad8ce72dbac931ed4c723bc0e URL: http://source.winehq.org/git/wine.git/?a=commit;h=f1417780033a008ad8ce72dba… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Dec 18 14:58:28 2009 -0600 gdiplus: Add traces for values of newly-created brushes. --- dlls/gdiplus/brush.c | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/dlls/gdiplus/brush.c b/dlls/gdiplus/brush.c index 3bce1d3..49e9e0e 100644 --- a/dlls/gdiplus/brush.c +++ b/dlls/gdiplus/brush.c @@ -174,6 +174,7 @@ GpStatus WINGDIPAPI GdipCloneBrush(GpBrush *brush, GpBrush **clone) return NotImplemented; } + TRACE("<-- %p\n", *clone); return Ok; } @@ -290,6 +291,7 @@ GpStatus WINGDIPAPI GdipCreateHatchBrush(HatchStyle hatchstyle, ARGB forecol, AR (*brush)->forecol = forecol; (*brush)->backcol = backcol; (*brush)->hatchstyle = hatchstyle; + TRACE("<-- %p\n", *brush); } else { @@ -370,6 +372,8 @@ GpStatus WINGDIPAPI GdipCreateLineBrush(GDIPCONST GpPointF* startpoint, (*line)->pblendpos = NULL; (*line)->pblendcount = 0; + TRACE("<-- %p\n", *line); + return Ok; } @@ -544,6 +548,8 @@ GpStatus WINGDIPAPI GdipCreatePathGradient(GDIPCONST GpPointF* points, (*grad)->focus.X = 0.0; (*grad)->focus.Y = 0.0; + TRACE("<-- %p\n", *grad); + return Ok; } @@ -634,6 +640,8 @@ GpStatus WINGDIPAPI GdipCreatePathGradientFromPath(GDIPCONST GpPath* path, (*grad)->focus.X = 0.0; (*grad)->focus.Y = 0.0; + TRACE("<-- %p\n", *grad); + return Ok; } @@ -660,6 +668,8 @@ GpStatus WINGDIPAPI GdipCreateSolidFill(ARGB color, GpSolidFill **sf) (*sf)->color = color; (*sf)->bmp = ARGB2BMP(color); + TRACE("<-- %p\n", *sf); + return Ok; } @@ -854,6 +864,8 @@ GpStatus WINGDIPAPI GdipCreateTextureIA(GpImage *image, GdipFree(dibits); GdipFree(buff); + TRACE("<-- %p\n", *texture); + return Ok; }

1 0

Alexandre Julliard : Wine release 1.1.35
by Alexandre Julliard 18 Dec '09

18 Dec '09

Module: website Branch: master Commit: b31f16b8a080318160cb9c691df4618bd8a8ce1e URL: http://source.winehq.org/git/website.git/?a=commit;h=b31f16b8a080318160cb9c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 18 20:07:23 2009 +0100 Wine release 1.1.35 --- news/en/2009121801.xml | 18 ++++++++++++++++++ 1 files changed, 18 insertions(+), 0 deletions(-) diff --git a/news/en/2009121801.xml b/news/en/2009121801.xml new file mode 100644 index 0000000..824676b --- /dev/null +++ b/news/en/2009121801.xml @@ -0,0 +1,18 @@ +<news> +<date>December 18, 2009</date> +<title>Wine 1.1.35 Released</title> +<body> + The Wine development release 1.1.35 is now available. + <a href="{$root}/announce/1.1.35">What's new</a> in this release: +<ul> + <li>Support for OLE transacted storage.</li> + <li>Better certificate checking on secure connections.</li> + <li>More progress on the 16-bit separation.</li> + <li>Left 4 Dead 2 DRM really supported now.</li> + <li>MSI performance improvements.</li> + <li>64-bit fixes in debugger support.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="http://prdownloads.sourceforge.net/wine/wine-1.1.35.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.1.35.
by Alexandre Julliard 18 Dec '09

18 Dec '09

Module: wine Branch: master Commit: 59af9ad142120fdda8d37b095936eb765a2e6fda URL: http://source.winehq.org/git/wine.git/?a=commit;h=59af9ad142120fdda8d37b095… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 18 19:56:02 2009 +0100 Release 1.1.35. --- ANNOUNCE | 1735 ++++++++++++++++++++++++++++--------------------------------- VERSION | 2 +- configure | 18 +- 3 files changed, 807 insertions(+), 948 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=59af9ad142120fdda8d37…

1 0

Tag wine-1.1.35 : Alexandre Julliard : Release 1.1.35
by Alexandre Julliard 18 Dec '09

18 Dec '09

Module: wine Branch: refs/tags/wine-1.1.35 Tag: cb7cdd482c3a82fdae4a845a4c2e2590d775ce05 URL: http://source.winehq.org/git/wine.git/?a=tag;h=cb7cdd482c3a82fdae4a845a4c2e… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 18 19:56:03 2009 +0100 Release 1.1.35

1 0

Alexandre Julliard : progman: Don' t try to access the internals of an icon object.
by Alexandre Julliard 18 Dec '09

18 Dec '09

Module: wine Branch: master Commit: 99cb916de642bbd19ff99bd63729581606961e7a URL: http://source.winehq.org/git/wine.git/?a=commit;h=99cb916de642bbd19ff99bd63… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 17 20:22:27 2009 +0100 progman: Don't try to access the internals of an icon object. --- programs/progman/grpfile.c | 64 ++++++++++++++++++++++---------------------- 1 files changed, 32 insertions(+), 32 deletions(-) diff --git a/programs/progman/grpfile.c b/programs/progman/grpfile.c index e26c215..1d31400 100644 --- a/programs/progman/grpfile.c +++ b/programs/progman/grpfile.c @@ -22,7 +22,6 @@ #define WIN32_LEAN_AND_MEAN #include "windows.h" -#include "wine/winuser16.h" #include "progman.h" #include "mmsystem.h" @@ -242,7 +241,7 @@ static HLOCAL GRPFILE_ScanProgram(LPCSTR buffer, INT size, LPCSTR iconinfo_ptr, iconANDbits_ptr, iconXORbits_ptr; INT x, y, nIconIndex, iconANDsize, iconXORsize; INT nHotKey, nCmdShow; - CURSORICONINFO iconinfo; + UINT width, height, planes, bpp; x = GET_SHORT(program_ptr, 0); y = GET_SHORT(program_ptr, 2); @@ -261,13 +260,10 @@ static HLOCAL GRPFILE_ScanProgram(LPCSTR buffer, INT size, iconinfo_ptr = buffer + GET_USHORT(program_ptr, 12); iconXORbits_ptr = buffer + GET_USHORT(program_ptr, 14); iconANDbits_ptr = buffer + GET_USHORT(program_ptr, 16); - iconinfo.ptHotSpot.x = GET_USHORT(iconinfo_ptr, 0); - iconinfo.ptHotSpot.y = GET_USHORT(iconinfo_ptr, 2); - iconinfo.nWidth = GET_USHORT(iconinfo_ptr, 4); - iconinfo.nHeight = GET_USHORT(iconinfo_ptr, 6); - iconinfo.nWidthBytes = GET_USHORT(iconinfo_ptr, 8); - iconinfo.bPlanes = GET_USHORT(iconinfo_ptr, 10); - iconinfo.bBitsPerPixel = GET_USHORT(iconinfo_ptr, 11); + width = GET_USHORT(iconinfo_ptr, 4); + height = GET_USHORT(iconinfo_ptr, 6); + planes = GET_USHORT(iconinfo_ptr, 10); + bpp = GET_USHORT(iconinfo_ptr, 11); break; case 0x000c: iconANDsize = GET_USHORT(program_ptr, 8); @@ -275,21 +271,16 @@ static HLOCAL GRPFILE_ScanProgram(LPCSTR buffer, INT size, iconinfo_ptr = buffer + GET_USHORT(program_ptr, 12); iconANDbits_ptr = buffer + GET_USHORT(program_ptr, 14); iconXORbits_ptr = buffer + GET_USHORT(program_ptr, 16); - iconinfo.ptHotSpot.x = GET_USHORT(iconinfo_ptr, 0); - iconinfo.ptHotSpot.y = GET_USHORT(iconinfo_ptr, 2); - iconinfo.nWidth = GET_USHORT(iconinfo_ptr, 4); - iconinfo.nHeight = GET_USHORT(iconinfo_ptr, 6); - iconinfo.nWidthBytes = GET_USHORT(iconinfo_ptr, 8) * 8; - iconinfo.bPlanes = GET_USHORT(iconinfo_ptr, 10); - iconinfo.bBitsPerPixel = GET_USHORT(iconinfo_ptr, 11); + width = GET_USHORT(iconinfo_ptr, 4); + height = GET_USHORT(iconinfo_ptr, 6); + planes = GET_USHORT(iconinfo_ptr, 10); + bpp = GET_USHORT(iconinfo_ptr, 11); } if (iconANDbits_ptr + iconANDsize > buffer + size || iconXORbits_ptr + iconXORsize > buffer + size) return(0); - hIcon = CreateIcon( Globals.hInstance, iconinfo.nWidth, iconinfo.nHeight, - iconinfo.bPlanes, iconinfo.bBitsPerPixel, - iconANDbits_ptr, iconXORbits_ptr ); + hIcon = CreateIcon( Globals.hInstance, width, height, planes, bpp, iconANDbits_ptr, iconXORbits_ptr ); lpszName = buffer + GET_USHORT(program_ptr, 18); lpszCmdLine = buffer + GET_USHORT(program_ptr, 20); @@ -419,12 +410,19 @@ BOOL GRPFILE_WriteGroupFile(HLOCAL hGroup) * GRPFILE_CalculateSizes */ -static VOID GRPFILE_CalculateSizes(PROGRAM *program, - INT *Progs, INT *Icons) +static VOID GRPFILE_CalculateSizes(PROGRAM *program, INT *Progs, INT *Icons, + UINT *sizeAnd, UINT *sizeXor) { - CURSORICONINFO *iconinfo = LocalLock(program->hIcon); - INT sizeXor = iconinfo->nHeight * iconinfo->nWidthBytes; - INT sizeAnd = iconinfo->nHeight * ((iconinfo->nWidth + 15) / 16 * 2); + ICONINFO info; + BITMAP bmp; + + GetIconInfo( program->hIcon, &info ); + GetObjectW( info.hbmMask, sizeof(bmp), &bmp ); + *sizeAnd = bmp.bmHeight * ((bmp.bmWidth + 15) / 16 * 2); + GetObjectW( info.hbmColor, sizeof(bmp), &bmp ); + *sizeXor = bmp.bmHeight * bmp.bmWidthBytes; + DeleteObject( info.hbmMask ); + DeleteObject( info.hbmColor ); *Progs += 24; *Progs += lstrlen(LocalLock(program->hName)) + 1; @@ -432,8 +430,8 @@ static VOID GRPFILE_CalculateSizes(PROGRAM *program, *Progs += lstrlen(LocalLock(program->hIconFile)) + 1; *Icons += 12; /* IconInfo */ - *Icons += sizeAnd; - *Icons += sizeXor; + *Icons += *sizeAnd; + *Icons += *sizeXor; } /***********************************************************************/ @@ -513,6 +511,7 @@ static BOOL GRPFILE_DoWriteGroupFile(HFILE file, PROGGROUP *group) HLOCAL hProgram; INT NumProg, Title, Progs, Icons, Extension; INT CurrProg, CurrIcon, nCmdShow, ptr, seqnum; + DWORD sizeAnd, sizeXor; BOOL need_extension; LPCSTR lpszTitle = LocalLock(group->hName); @@ -532,7 +531,7 @@ static BOOL GRPFILE_DoWriteGroupFile(HFILE file, PROGGROUP *group) LPCSTR lpszWorkDir = LocalLock(program->hWorkDir); NumProg++; - GRPFILE_CalculateSizes(program, &Icons, &Extension); + GRPFILE_CalculateSizes(program, &Icons, &Extension, &sizeAnd, &sizeXor); /* Set a flag if an extension is needed */ if (lpszWorkDir[0] || program->nHotKey || @@ -585,7 +584,7 @@ static BOOL GRPFILE_DoWriteGroupFile(HFILE file, PROGGROUP *group) if ((UINT)HFILE_ERROR == GRPFILE_WriteWithChecksum(file, buffer, 2)) return FALSE; - GRPFILE_CalculateSizes(program, &CurrProg, &CurrIcon); + GRPFILE_CalculateSizes(program, &CurrProg, &CurrIcon, &sizeAnd, &sizeXor); hProgram = program->hNext; } @@ -601,13 +600,13 @@ static BOOL GRPFILE_DoWriteGroupFile(HFILE file, PROGGROUP *group) while(hProgram) { PROGRAM *program = LocalLock(hProgram); - CURSORICONINFO *iconinfo = LocalLock(program->hIcon); LPCSTR Name = LocalLock(program->hName); LPCSTR CmdLine = LocalLock(program->hCmdLine); LPCSTR IconFile = LocalLock(program->hIconFile); - INT sizeXor = iconinfo->nHeight * iconinfo->nWidthBytes; - INT sizeAnd = iconinfo->nHeight * ((iconinfo->nWidth + 15) / 16 * 2); + INT next_prog = CurrProg; + INT next_icon = CurrIcon; + GRPFILE_CalculateSizes(program, &next_prog, &next_icon, &sizeAnd, &sizeXor); PUT_SHORT(buffer, 0, program->x); PUT_SHORT(buffer, 2, program->y); PUT_SHORT(buffer, 4, program->nIconIndex); @@ -630,7 +629,8 @@ static BOOL GRPFILE_DoWriteGroupFile(HFILE file, PROGGROUP *group) (UINT)HFILE_ERROR == GRPFILE_WriteWithChecksum(file, IconFile, lstrlen(IconFile) + 1)) return FALSE; - GRPFILE_CalculateSizes(program, &CurrProg, &CurrIcon); + CurrProg = next_prog; + CurrIcon = next_icon; hProgram = program->hNext; }

1 0

Amine Khaldi : mciseq: Remove unneeded assignments.
by Alexandre Julliard 18 Dec '09

18 Dec '09

Module: wine Branch: master Commit: 1d7318a436575b12a0dab7754c10152ca82c2951 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d7318a436575b12a0dab7754… Author: Amine Khaldi <amine48rz(a)gmail.com> Date: Thu Dec 17 20:51:01 2009 +0100 mciseq: Remove unneeded assignments. --- dlls/mciseq/mcimidi.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mciseq/mcimidi.c b/dlls/mciseq/mcimidi.c index 47cb792..402b8d5 100644 --- a/dlls/mciseq/mcimidi.c +++ b/dlls/mciseq/mcimidi.c @@ -412,7 +412,7 @@ static DWORD MIDI_mciReadMTrk(WINE_MCIMIDI* wmm, MCI_MIDITRACK* mmt) } else { len = MultiByteToWideChar( CP_ACP, 0, buf, -1, NULL, 0 ); wmm->lpstrCopyright = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) ); - len = MultiByteToWideChar( CP_ACP, 0, buf, -1, wmm->lpstrCopyright, len ); + MultiByteToWideChar( CP_ACP, 0, buf, -1, wmm->lpstrCopyright, len ); } break; case 0x03: @@ -421,7 +421,7 @@ static DWORD MIDI_mciReadMTrk(WINE_MCIMIDI* wmm, MCI_MIDITRACK* mmt) } else { len = MultiByteToWideChar( CP_ACP, 0, buf, -1, NULL, 0 ); wmm->lpstrName = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) ); - len = MultiByteToWideChar( CP_ACP, 0, buf, -1, wmm->lpstrName, len ); + MultiByteToWideChar( CP_ACP, 0, buf, -1, wmm->lpstrName, len ); } break; }

1 0