December 2009 - Wine-Commits

Aurimas Fišeras : mapi32: Add Lithunian translation.
by Alexandre Julliard Dec. 18, 2009

Dec. 18, 2009

Module: wine Branch: master Commit: e05267dd143ba4f28867fe77f81da3e77e8962be URL: http://source.winehq.org/git/wine.git/?a=commit;h=e05267dd143ba4f28867fe77f… Author: Aurimas Fišeras <aurimas(a)gmail.com> Date: Thu Dec 17 22:01:28 2009 +0200 mapi32: Add Lithunian translation. --- dlls/mapi32/Lt.rc | 33 +++++++++++++++++++++++++++++++++ dlls/mapi32/Makefile.in | 1 + 2 files changed, 34 insertions(+), 0 deletions(-) diff --git a/dlls/mapi32/Lt.rc b/dlls/mapi32/Lt.rc new file mode 100644 index 0000000..b66bf3d --- /dev/null +++ b/dlls/mapi32/Lt.rc @@ -0,0 +1,33 @@ +/* +* MAPI32 Lithuanian resources +* + * Copyright 2009 Aurimas Fišeras <aurimas(a)gmail.com> +* +* 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_LITHUANIAN, SUBLANG_NEUTRAL + +STRINGTABLE +{ + IDS_NO_MAPI_CLIENT, "Nepavyko išsiųsti laiškų, nes neturite įdiegto MAPI pašto kliento." + IDS_SEND_MAIL, "Laiškų siuntimas" +} diff --git a/dlls/mapi32/Makefile.in b/dlls/mapi32/Makefile.in index 4f2ca15..8a9233b 100644 --- a/dlls/mapi32/Makefile.in +++ b/dlls/mapi32/Makefile.in @@ -16,6 +16,7 @@ C_SRCS = \ RC_SRCS = \ De.rc \ En.rc \ + Lt.rc \ version.rc @MAKE_DLL_RULES@

1 0

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

Dec. 18, 2009

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

Piotr Caban : urlmon: Remove some CoInternetParseUrl tests.
by Alexandre Julliard Dec. 18, 2009

Dec. 18, 2009

Module: wine Branch: master Commit: c72a7d471ad442c0f900801ca7c9247250de8e05 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c72a7d471ad442c0f900801ca… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Dec 18 01:56:54 2009 +0100 urlmon: Remove some CoInternetParseUrl tests. Some tests with PARSE_DOMAIN flag fails on older urlmon. --- dlls/urlmon/tests/misc.c | 15 +++++++++------ 1 files changed, 9 insertions(+), 6 deletions(-) diff --git a/dlls/urlmon/tests/misc.c b/dlls/urlmon/tests/misc.c index f9c2de9..dd6ba6d 100644 --- a/dlls/urlmon/tests/misc.c +++ b/dlls/urlmon/tests/misc.c @@ -340,12 +340,15 @@ static void test_CoInternetParseUrl(void) ok(size == lstrlenW(parse_tests[i].schema), "[%d] wrong size\n", i); ok(!lstrcmpW(parse_tests[i].schema, buf), "[%d] wrong schema\n", i); - memset(buf, 0xf0, sizeof(buf)); - hres = CoInternetParseUrl(parse_tests[i].url, PARSE_DOMAIN, 0, buf, - sizeof(buf)/sizeof(WCHAR), &size, 0); - ok(hres == parse_tests[i].domain_hres, "[%d] domain failed: %08x\n", i, hres); - if(parse_tests[i].domain) - ok(!lstrcmpW(parse_tests[i].domain, buf), "[%d] wrong domain, received %s\n", i, wine_dbgstr_w(buf)); + if(memcmp(parse_tests[i].url, wszRes, 3*sizeof(WCHAR)) + && memcmp(parse_tests[i].url, wszAbout, 5*sizeof(WCHAR))) { + memset(buf, 0xf0, sizeof(buf)); + hres = CoInternetParseUrl(parse_tests[i].url, PARSE_DOMAIN, 0, buf, + sizeof(buf)/sizeof(WCHAR), &size, 0); + ok(hres == parse_tests[i].domain_hres, "[%d] domain failed: %08x\n", i, hres); + if(parse_tests[i].domain) + ok(!lstrcmpW(parse_tests[i].domain, buf), "[%d] wrong domain, received %s\n", i, wine_dbgstr_w(buf)); + } memset(buf, 0xf0, sizeof(buf)); hres = CoInternetParseUrl(parse_tests[i].url, PARSE_ROOTDOCUMENT, 0, buf,

1 0

Jörg Höhle : mciavi: Complete MCI GetDevCaps/ capability.
by Alexandre Julliard Dec. 18, 2009

Dec. 18, 2009

Module: wine Branch: master Commit: e03b59c6a1097f13f3ff249c5131d294cf443f31 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e03b59c6a1097f13f3ff249c5… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Sat Nov 28 07:09:56 2009 +0100 mciavi: Complete MCI GetDevCaps/capability. The FIXME comments indicate flags where Wine differs from native w2k. The returned results are consistent with what Wine implements. --- dlls/mciavi32/info.c | 47 +++++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 43 insertions(+), 4 deletions(-) diff --git a/dlls/mciavi32/info.c b/dlls/mciavi32/info.c index 64d51eb..e10bfd0 100644 --- a/dlls/mciavi32/info.c +++ b/dlls/mciavi32/info.c @@ -80,6 +80,7 @@ DWORD MCIAVI_mciGetDevCaps(UINT wDevID, DWORD dwFlags, LPMCI_GETDEVCAPS_PARMS l if (lpParms == NULL) return MCIERR_NULL_PARAMETER_BLOCK; if (wma == NULL) return MCIERR_INVALID_DEVICE_ID; + if (!(dwFlags & MCI_GETDEVCAPS_ITEM)) return MCIERR_MISSING_PARAMETER; EnterCriticalSection(&wma->cs); @@ -130,14 +131,52 @@ DWORD MCIAVI_mciGetDevCaps(UINT wDevID, DWORD dwFlags, LPMCI_GETDEVCAPS_PARMS l lpParms->dwReturn = MAKEMCIRESOURCE(FALSE, MCI_FALSE); ret = MCI_RESOURCE_RETURNED; break; + case MCI_DGV_GETDEVCAPS_CAN_REVERSE: + TRACE("MCI_DGV_GETDEVCAPS_CAN_REVERSE !\n"); + lpParms->dwReturn = MAKEMCIRESOURCE(FALSE, MCI_FALSE); /* FIXME */ + ret = MCI_RESOURCE_RETURNED; + break; + case MCI_DGV_GETDEVCAPS_CAN_STRETCH: + TRACE("MCI_DGV_GETDEVCAPS_CAN_STRETCH !\n"); + lpParms->dwReturn = MAKEMCIRESOURCE(FALSE, MCI_FALSE); /* FIXME */ + ret = MCI_RESOURCE_RETURNED; + break; + case MCI_DGV_GETDEVCAPS_CAN_LOCK: + TRACE("MCI_DGV_GETDEVCAPS_CAN_LOCK !\n"); + lpParms->dwReturn = MAKEMCIRESOURCE(FALSE, MCI_FALSE); + ret = MCI_RESOURCE_RETURNED; + break; + case MCI_DGV_GETDEVCAPS_CAN_FREEZE: + TRACE("MCI_DGV_GETDEVCAPS_CAN_FREEZE !\n"); + lpParms->dwReturn = MAKEMCIRESOURCE(FALSE, MCI_FALSE); + ret = MCI_RESOURCE_RETURNED; + break; + case MCI_DGV_GETDEVCAPS_CAN_STR_IN: + TRACE("MCI_DGV_GETDEVCAPS_CAN_STRETCH_INPUT !\n"); + lpParms->dwReturn = MAKEMCIRESOURCE(FALSE, MCI_FALSE); + ret = MCI_RESOURCE_RETURNED; + break; + case MCI_DGV_GETDEVCAPS_HAS_STILL: + TRACE("MCI_DGV_GETDEVCAPS_HAS_STILL !\n"); + lpParms->dwReturn = MAKEMCIRESOURCE(FALSE, MCI_FALSE); + ret = MCI_RESOURCE_RETURNED; + break; + case MCI_DGV_GETDEVCAPS_CAN_TEST: + TRACE("MCI_DGV_GETDEVCAPS_CAN_TEST !\n"); + lpParms->dwReturn = MAKEMCIRESOURCE(FALSE, MCI_FALSE); /* FIXME */ + ret = MCI_RESOURCE_RETURNED; + break; + case MCI_DGV_GETDEVCAPS_PALETTES: + TRACE("MCI_DGV_GETDEVCAPS_PALETTES !\n"); + lpParms->dwReturn = MAKEMCIRESOURCE(FALSE, MCI_FALSE); /* FIXME */ + ret = MCI_RESOURCE_RETURNED; + break; + /* w2k does not know MAX_WINDOWS or MAX/MINIMUM_RATE */ default: FIXME("Unknown capability (%08x) !\n", lpParms->dwItem); - ret = MCIERR_UNRECOGNIZED_COMMAND; + ret = MCIERR_UNSUPPORTED_FUNCTION; break; } - } else { - WARN("No GetDevCaps-Item !\n"); - ret = MCIERR_UNRECOGNIZED_COMMAND; } LeaveCriticalSection(&wma->cs);

1 0

Jörg Höhle : mciwave: MCI Capability returns number of wave devices.
by Alexandre Julliard Dec. 18, 2009

Dec. 18, 2009

Module: wine Branch: master Commit: 95970bb53175d214b598e632f339c7fc526df25a URL: http://source.winehq.org/git/wine.git/?a=commit;h=95970bb53175d214b598e632f… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Sat Nov 21 11:04:09 2009 +0100 mciwave: MCI Capability returns number of wave devices. --- dlls/mciwave/mciwave.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mciwave/mciwave.c b/dlls/mciwave/mciwave.c index 456936c..24e75ee 100644 --- a/dlls/mciwave/mciwave.c +++ b/dlls/mciwave/mciwave.c @@ -1609,10 +1609,10 @@ static DWORD WAVE_mciGetDevCaps(MCIDEVICEID wDevID, DWORD dwFlags, ret = MCI_RESOURCE_RETURNED; break; case MCI_WAVE_GETDEVCAPS_INPUTS: - lpParms->dwReturn = 1; + lpParms->dwReturn = waveInGetNumDevs(); break; case MCI_WAVE_GETDEVCAPS_OUTPUTS: - lpParms->dwReturn = 1; + lpParms->dwReturn = waveOutGetNumDevs(); break; default: FIXME("Unknown capability (%08x) !\n", lpParms->dwItem);

1 0

Nikolay Sivov : kernel32: Fix typo in a comment.
by Alexandre Julliard Dec. 18, 2009

Dec. 18, 2009

Module: wine Branch: master Commit: 1402e954ab1948424245376ce457e8730b054523 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1402e954ab1948424245376ce… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Thu Dec 17 23:57:23 2009 +0300 kernel32: Fix typo in a comment. --- dlls/kernel32/actctx.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/actctx.c b/dlls/kernel32/actctx.c index c708373..abd6459 100644 --- a/dlls/kernel32/actctx.c +++ b/dlls/kernel32/actctx.c @@ -213,7 +213,7 @@ BOOL WINAPI ZombifyActCtx(HANDLE hActCtx) /*********************************************************************** * FindActCtxSectionStringA (KERNEL32.@) * - * Find information about a GUID in an activation context. + * Find information about a string in an activation context. */ BOOL WINAPI FindActCtxSectionStringA(DWORD dwFlags, const GUID* lpExtGuid, ULONG ulId, LPCSTR lpSearchStr, @@ -245,7 +245,7 @@ BOOL WINAPI FindActCtxSectionStringA(DWORD dwFlags, const GUID* lpExtGuid, /*********************************************************************** * FindActCtxSectionStringW (KERNEL32.@) * - * Find information about a GUID in an activation context. + * Find information about a string in an activation context. */ BOOL WINAPI FindActCtxSectionStringW(DWORD dwFlags, const GUID* lpExtGuid, ULONG ulId, LPCWSTR lpSearchStr,

1 0

Eric van Beurden : dbghelp: Fix a minidump crash by using the correct variable.
by Alexandre Julliard Dec. 18, 2009

Dec. 18, 2009

Module: wine Branch: master Commit: fefd0cfda788c16534ef81122fc65604f5c3e9d6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fefd0cfda788c16534ef81122… Author: Eric van Beurden <ericvb(a)transgaming.com> Date: Thu Dec 17 15:24:58 2009 -0500 dbghelp: Fix a minidump crash by using the correct variable. --- dlls/dbghelp/minidump.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/dbghelp/minidump.c b/dlls/dbghelp/minidump.c index b026d32..1dc7dc3 100644 --- a/dlls/dbghelp/minidump.c +++ b/dlls/dbghelp/minidump.c @@ -230,7 +230,7 @@ static BOOL fetch_thread_info(struct dump_context* dc, int thd_idx, ReadProcessMemory(dc->hProcess, except->ExceptionPointers, &ep, sizeof(ep), NULL); ReadProcessMemory(dc->hProcess, ep.ContextRecord, - &ctx, sizeof(ctx), NULL); + &lctx, sizeof(lctx), NULL); pctx = &lctx; } else pctx = except->ExceptionPointers->ContextRecord;

1 0

Amine Khaldi : mapi32: Remove an unneeded assignment.
by Alexandre Julliard Dec. 18, 2009

Dec. 18, 2009

Module: wine Branch: master Commit: 5ce4caf8f35530df0b7bfe052e36b635e13fb651 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ce4caf8f35530df0b7bfe052… Author: Amine Khaldi <amine48rz(a)gmail.com> Date: Thu Dec 17 20:42:14 2009 +0100 mapi32: Remove an unneeded assignment. --- dlls/mapi32/prop.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mapi32/prop.c b/dlls/mapi32/prop.c index 1a157da..5a7e8db 100644 --- a/dlls/mapi32/prop.c +++ b/dlls/mapi32/prop.c @@ -1835,7 +1835,7 @@ IMAPIProp_fnSetProps(LPMAPIPROP iface, ULONG ulValues, else { /* Add new value */ - if (!(item = IMAPIPROP_AddValue(This, &lpProps[i]))) + if (!IMAPIPROP_AddValue(This, &lpProps[i])) hRet = MAPI_E_NOT_ENOUGH_MEMORY; } }

1 0

Amine Khaldi : mciseq: Remove unneeded assignments.
by Alexandre Julliard Dec. 18, 2009

Dec. 18, 2009

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

Alexandre Julliard : user32: Make WINPROC_AllocProc take a unicode flag for consistency with the other winproc functions .
by Alexandre Julliard Dec. 18, 2009

Dec. 18, 2009

Module: wine Branch: master Commit: 77ab4354025cd5477c4f91a299deff5ff70bf8d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=77ab4354025cd5477c4f91a29… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 18 12:41:59 2009 +0100 user32: Make WINPROC_AllocProc take a unicode flag for consistency with the other winproc functions. --- dlls/user32/class.c | 7 +++---- dlls/user32/controls.h | 2 +- dlls/user32/message.c | 4 ++-- dlls/user32/msg16.c | 5 +---- dlls/user32/user_private.h | 2 +- dlls/user32/win.c | 6 ++---- dlls/user32/winproc.c | 34 ++++++++++++++++------------------ 7 files changed, 26 insertions(+), 34 deletions(-) diff --git a/dlls/user32/class.c b/dlls/user32/class.c index 040f3c1..f7e0f25 100644 --- a/dlls/user32/class.c +++ b/dlls/user32/class.c @@ -551,7 +551,7 @@ ATOM WINAPI RegisterClassExA( const WNDCLASSEXA* wc ) classPtr->hIconSm = wc->hIconSm; classPtr->hCursor = wc->hCursor; classPtr->hbrBackground = wc->hbrBackground; - classPtr->winproc = WINPROC_AllocProc( wc->lpfnWndProc, NULL ); + classPtr->winproc = WINPROC_AllocProc( wc->lpfnWndProc, FALSE ); CLASS_SetMenuNameA( classPtr, wc->lpszMenuName ); release_class_ptr( classPtr ); return atom; @@ -589,7 +589,7 @@ ATOM WINAPI RegisterClassExW( const WNDCLASSEXW* wc ) classPtr->hIconSm = wc->hIconSm; classPtr->hCursor = wc->hCursor; classPtr->hbrBackground = wc->hbrBackground; - classPtr->winproc = WINPROC_AllocProc( NULL, wc->lpfnWndProc ); + classPtr->winproc = WINPROC_AllocProc( wc->lpfnWndProc, TRUE ); CLASS_SetMenuNameW( classPtr, wc->lpszMenuName ); release_class_ptr( classPtr ); return atom; @@ -903,8 +903,7 @@ static ULONG_PTR CLASS_SetClassLong( HWND hwnd, INT offset, LONG_PTR newval, break; case GCLP_WNDPROC: retval = (ULONG_PTR)WINPROC_GetProc( class->winproc, unicode ); - class->winproc = WINPROC_AllocProc( unicode ? NULL : (WNDPROC)newval, - unicode ? (WNDPROC)newval : NULL ); + class->winproc = WINPROC_AllocProc( (WNDPROC)newval, unicode ); break; case GCLP_HBRBACKGROUND: retval = (ULONG_PTR)class->hbrBackground; diff --git a/dlls/user32/controls.h b/dlls/user32/controls.h index f9a17e8..3bde456 100644 --- a/dlls/user32/controls.h +++ b/dlls/user32/controls.h @@ -110,7 +110,7 @@ struct wow_handlers32 LRESULT (*scrollbar_proc)(HWND,UINT,WPARAM,LPARAM,BOOL); LRESULT (*static_proc)(HWND,UINT,WPARAM,LPARAM,BOOL); HWND (*create_window)(CREATESTRUCTW*,LPCWSTR,HINSTANCE,UINT); - WNDPROC (*alloc_winproc)(WNDPROC,WNDPROC); + WNDPROC (*alloc_winproc)(WNDPROC,BOOL); }; extern struct wow_handlers16 wow_handlers DECLSPEC_HIDDEN; diff --git a/dlls/user32/message.c b/dlls/user32/message.c index ffe7f76..d6fd5af 100644 --- a/dlls/user32/message.c +++ b/dlls/user32/message.c @@ -3589,7 +3589,7 @@ UINT_PTR WINAPI SetTimer( HWND hwnd, UINT_PTR id, UINT timeout, TIMERPROC proc ) UINT_PTR ret; WNDPROC winproc = 0; - if (proc) winproc = WINPROC_AllocProc( (WNDPROC)proc, NULL ); + if (proc) winproc = WINPROC_AllocProc( (WNDPROC)proc, FALSE ); SERVER_START_REQ( set_win_timer ) { @@ -3620,7 +3620,7 @@ UINT_PTR WINAPI SetSystemTimer( HWND hwnd, UINT_PTR id, UINT timeout, TIMERPROC UINT_PTR ret; WNDPROC winproc = 0; - if (proc) winproc = WINPROC_AllocProc( (WNDPROC)proc, NULL ); + if (proc) winproc = WINPROC_AllocProc( (WNDPROC)proc, FALSE ); SERVER_START_REQ( set_win_timer ) { diff --git a/dlls/user32/msg16.c b/dlls/user32/msg16.c index 0e57988..c3365e8 100644 --- a/dlls/user32/msg16.c +++ b/dlls/user32/msg16.c @@ -231,10 +231,7 @@ done: */ WNDPROC16 WINPROC_GetProc16( WNDPROC proc, BOOL unicode ) { - WNDPROC winproc; - - if (unicode) winproc = wow_handlers32.alloc_winproc( NULL, proc ); - else winproc = wow_handlers32.alloc_winproc( proc, NULL ); + WNDPROC winproc = wow_handlers32.alloc_winproc( proc, unicode ); if ((ULONG_PTR)winproc >> 16 != WINPROC_HANDLE) return (WNDPROC16)winproc; return alloc_win16_thunk( winproc ); diff --git a/dlls/user32/user_private.h b/dlls/user32/user_private.h index e5db691..fc92f25 100644 --- a/dlls/user32/user_private.h +++ b/dlls/user32/user_private.h @@ -239,7 +239,7 @@ typedef LRESULT (*winproc_callback16_t)( HWND16 hwnd, UINT16 msg, WPARAM16 wp, L extern WNDPROC16 WINPROC_GetProc16( WNDPROC proc, BOOL unicode ) DECLSPEC_HIDDEN; extern WNDPROC WINPROC_AllocProc16( WNDPROC16 func ) DECLSPEC_HIDDEN; extern WNDPROC WINPROC_GetProc( WNDPROC proc, BOOL unicode ) DECLSPEC_HIDDEN; -extern WNDPROC WINPROC_AllocProc( WNDPROC funcA, WNDPROC funcW ) DECLSPEC_HIDDEN; +extern WNDPROC WINPROC_AllocProc( WNDPROC func, BOOL unicode ) DECLSPEC_HIDDEN; extern BOOL WINPROC_IsUnicode( WNDPROC proc, BOOL def_val ) DECLSPEC_HIDDEN; extern LRESULT WINPROC_CallProcAtoW( winproc_callback_t callback, HWND hwnd, UINT msg, diff --git a/dlls/user32/win.c b/dlls/user32/win.c index 9712beb..7834501 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -2099,8 +2099,7 @@ LONG_PTR WIN_SetWindowLong( HWND hwnd, INT offset, UINT size, LONG_PTR newval, B WNDPROC proc; UINT old_flags = wndPtr->flags; retval = WIN_GetWindowLong( hwnd, offset, size, unicode ); - if (unicode) proc = WINPROC_AllocProc( NULL, (WNDPROC)newval ); - else proc = WINPROC_AllocProc( (WNDPROC)newval, NULL ); + proc = WINPROC_AllocProc( (WNDPROC)newval, unicode ); if (proc) wndPtr->winproc = proc; if (WINPROC_IsUnicode( proc, unicode )) wndPtr->flags |= WIN_ISUNICODE; else wndPtr->flags &= ~WIN_ISUNICODE; @@ -2122,8 +2121,7 @@ LONG_PTR WIN_SetWindowLong( HWND hwnd, INT offset, UINT size, LONG_PTR newval, B { WNDPROC *ptr = (WNDPROC *)((char *)wndPtr->wExtra + DWLP_DLGPROC); retval = (ULONG_PTR)WINPROC_GetProc( *ptr, unicode ); - if (unicode) *ptr = WINPROC_AllocProc( NULL, (WNDPROC)newval ); - else *ptr = WINPROC_AllocProc( (WNDPROC)newval, NULL ); + *ptr = WINPROC_AllocProc( (WNDPROC)newval, unicode ); WIN_ReleasePtr( wndPtr ); return retval; } diff --git a/dlls/user32/winproc.c b/dlls/user32/winproc.c index 7bdb91d..36f8279 100644 --- a/dlls/user32/winproc.c +++ b/dlls/user32/winproc.c @@ -104,21 +104,20 @@ static inline void free_buffer( void *static_buffer, void *buffer ) /* find an existing winproc for a given function and type */ /* FIXME: probably should do something more clever than a linear search */ -static inline WINDOWPROC *find_winproc( WNDPROC funcA, WNDPROC funcW ) +static inline WINDOWPROC *find_winproc( WNDPROC func, BOOL unicode ) { unsigned int i; for (i = 0; i < NB_BUILTIN_AW_WINPROCS; i++) { /* match either proc, some apps confuse A and W */ - if (funcA && winproc_array[i].procA != funcA && winproc_array[i].procW != funcA) continue; - if (funcW && winproc_array[i].procA != funcW && winproc_array[i].procW != funcW) continue; + if (winproc_array[i].procA != func && winproc_array[i].procW != func) continue; return &winproc_array[i]; } for (i = NB_BUILTIN_AW_WINPROCS; i < winproc_used; i++) { - if (funcA && winproc_array[i].procA != funcA) continue; - if (funcW && winproc_array[i].procW != funcW) continue; + if (!unicode && winproc_array[i].procA != func) continue; + if (unicode && winproc_array[i].procW != func) continue; return &winproc_array[i]; } return NULL; @@ -142,32 +141,31 @@ static inline WNDPROC proc_to_handle( WINDOWPROC *proc ) } /* allocate and initialize a new winproc */ -static inline WINDOWPROC *alloc_winproc( WNDPROC funcA, WNDPROC funcW ) +static inline WINDOWPROC *alloc_winproc( WNDPROC func, BOOL unicode ) { WINDOWPROC *proc; /* check if the function is already a win proc */ - if (funcA && (proc = handle_to_proc( funcA ))) return proc; - if (funcW && (proc = handle_to_proc( funcW ))) return proc; - if (!funcA && !funcW) return NULL; + if (!func) return NULL; + if ((proc = handle_to_proc( func ))) return proc; EnterCriticalSection( &winproc_cs ); /* check if we already have a winproc for that function */ - if (!(proc = find_winproc( funcA, funcW ))) + if (!(proc = find_winproc( func, unicode ))) { if (winproc_used < MAX_WINPROCS) { proc = &winproc_array[winproc_used++]; - proc->procA = funcA; - proc->procW = funcW; + if (unicode) proc->procW = func; + else proc->procA = func; TRACE( "allocated %p for %c %p (%d/%d used)\n", - proc_to_handle(proc), funcA ? 'A' : 'W', funcA ? funcA : funcW, + proc_to_handle(proc), unicode ? 'W' : 'A', func, winproc_used, MAX_WINPROCS ); } - else FIXME( "too many winprocs, cannot allocate one for %p/%p\n", funcA, funcW ); + else FIXME( "too many winprocs, cannot allocate one for %p\n", func ); } - else TRACE( "reusing %p for %p/%p\n", proc_to_handle(proc), funcA, funcW ); + else TRACE( "reusing %p for %p\n", proc_to_handle(proc), func ); LeaveCriticalSection( &winproc_cs ); return proc; @@ -304,12 +302,12 @@ WNDPROC WINPROC_GetProc( WNDPROC proc, BOOL unicode ) * lot of windows, it will usually only have a limited number of window procedures, so the * array won't grow too large, and this way we avoid the need to track allocations per window. */ -WNDPROC WINPROC_AllocProc( WNDPROC funcA, WNDPROC funcW ) +WNDPROC WINPROC_AllocProc( WNDPROC func, BOOL unicode ) { WINDOWPROC *proc; - if (!(proc = alloc_winproc( funcA, funcW ))) return NULL; - if (proc == WINPROC_PROC16) return funcA ? funcA : funcW; + if (!(proc = alloc_winproc( func, unicode ))) return NULL; + if (proc == WINPROC_PROC16) return func; return proc_to_handle( proc ); }

1 0