January 2011 - Wine-commits

André Hentschel : libwine: Implemented the call_on_stack function for Sparc.
by Alexandre Julliard 17 Jan '11

17 Jan '11

Module: wine Branch: master Commit: 30063b5439dfa127d638324f7142656d73bac9cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=30063b5439dfa127d638324f7… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Jan 14 21:46:26 2011 +0100 libwine: Implemented the call_on_stack function for Sparc. --- libs/wine/port.c | 13 +++++++++++++ 1 files changed, 13 insertions(+), 0 deletions(-) diff --git a/libs/wine/port.c b/libs/wine/port.c index 3562afa..32b819b 100644 --- a/libs/wine/port.c +++ b/libs/wine/port.c @@ -182,6 +182,19 @@ __ASM_GLOBAL_FUNC( wine_call_on_stack, "mov PC, r2\n\t" /* call func */ "mov sp, r4\n\t" /* restore old sp from local var */ "pop {r4,PC}") /* fetch return address into pc */ +#elif defined(__sparc__) && defined(__GNUC__) +__ASM_GLOBAL_FUNC( wine_call_on_stack, + "save %sp, -96, %sp\n\t" /* push: change register window */ + "mov %sp, %l2\n\t" /* store old sp in local var */ + "mov %i0, %l0\n\t" /* func */ + "mov %i1, %l1\n\t" /* arg */ + "sub %i2, 96, %sp\n\t" /* stack */ + "call %l0, 0\n\t" /* call func */ + "mov %l1, %o0\n\t" /* delay slot: arg for func */ + "mov %l2, %sp\n\t" /* restore old sp from local var */ + "mov %o0, %i0\n\t" /* move return value to right register window */ + "ret\n\t" /* return */ + "restore\n\t") /* delay slot: pop */ #else #error You must implement wine_switch_to_stack for your platform #endif

1 0

Alexandre Julliard : po: Unify the spelling of some menu entries across programs.
by Alexandre Julliard 14 Jan '11

14 Jan '11

Module: wine Branch: master Commit: baeb0d971f1a2bb52e493778491d6bdfe334990a URL: http://source.winehq.org/git/wine.git/?a=commit;h=baeb0d971f1a2bb52e4937784… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 14 17:56:12 2011 +0100 po: Unify the spelling of some menu entries across programs. --- po/ar.po | 38 ++++++++------------------------------ po/bg.po | 37 ++++++++----------------------------- po/ca.po | 35 ++++++++--------------------------- po/cs.po | 34 +++++++--------------------------- po/da.po | 32 +++++++------------------------- po/de.po | 32 +++++++------------------------- po/el.po | 31 ++++++------------------------- po/en.po | 37 ++++++++----------------------------- po/en_US.po | 32 +++++++------------------------- po/eo.po | 38 ++++++++------------------------------ po/es.po | 34 +++++++--------------------------- po/fa.po | 38 ++++++++------------------------------ po/fi.po | 38 ++++++++------------------------------ po/fr.po | 32 +++++++------------------------- po/he.po | 32 +++++++------------------------- po/hi.po | 32 ++++++-------------------------- po/hu.po | 33 +++++++-------------------------- po/it.po | 32 +++++++------------------------- po/ja.po | 34 +++++++--------------------------- po/ko.po | 32 +++++++------------------------- po/lt.po | 32 +++++++------------------------- po/ml.po | 32 ++++++-------------------------- po/nb_NO.po | 32 +++++++------------------------- po/nl.po | 32 +++++++------------------------- po/or.po | 32 ++++++-------------------------- po/pa.po | 32 ++++++-------------------------- po/pl.po | 32 +++++++------------------------- po/pt_BR.po | 32 +++++++------------------------- po/pt_PT.po | 32 +++++++------------------------- po/rm.po | 34 ++++++---------------------------- po/ro.po | 32 +++++++------------------------- po/ru.po | 32 +++++++------------------------- po/sk.po | 33 ++++++--------------------------- po/sl.po | 32 +++++++------------------------- po/sr_RS(a)cyrillic.po | 39 ++++++++------------------------------- po/sr_RS(a)latin.po | 38 ++++++++------------------------------ po/sv.po | 32 +++++++------------------------- po/te.po | 32 ++++++-------------------------- po/th.po | 39 ++++++++------------------------------- po/tr.po | 32 +++++++------------------------- po/uk.po | 33 +++++++-------------------------- po/wa.po | 38 ++++++++------------------------------ po/wine.pot | 31 ++++++------------------------- po/zh_CN.po | 32 +++++++------------------------- po/zh_TW.po | 32 +++++++------------------------- programs/progman/progman.rc | 4 ++-- programs/taskmgr/taskmgr.rc | 4 ++-- programs/winefile/winefile.rc | 2 +- programs/winhlp32/winhlp32.rc | 2 +- programs/wordpad/wordpad.rc | 2 +- 50 files changed, 324 insertions(+), 1202 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=baeb0d971f1a2bb52e493…

1 0

Jacek Caban : msxml3: Fixed memory leak (valgrind).
by Alexandre Julliard 14 Jan '11

14 Jan '11

Module: wine Branch: master Commit: 4c6f8989eb27165c1ae90cd01b6ec65e65a027e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c6f8989eb27165c1ae90cd01… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jan 14 14:01:57 2011 +0100 msxml3: Fixed memory leak (valgrind). --- dlls/msxml3/httprequest.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/msxml3/httprequest.c b/dlls/msxml3/httprequest.c index 23bc227..4dd4de8 100644 --- a/dlls/msxml3/httprequest.c +++ b/dlls/msxml3/httprequest.c @@ -543,6 +543,7 @@ static ULONG WINAPI httprequest_Release(IXMLHTTPRequest *iface) list_remove(&header->entry); SysFreeString(header->header); SysFreeString(header->value); + heap_free(header); } /* detach callback object */

1 0

Greg Geldorp : ddraw/tests: Remove some outdated tests.
by Alexandre Julliard 14 Jan '11

14 Jan '11

Module: wine Branch: master Commit: 1e7c80ba9afb8b442ff2148cd364c149f107cbb1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e7c80ba9afb8b442ff2148cd… Author: Greg Geldorp <ggeldorp(a)vmware.com> Date: Fri Jan 14 15:02:34 2011 +0100 ddraw/tests: Remove some outdated tests. --- dlls/ddraw/tests/d3d.c | 14 +++----------- 1 files changed, 3 insertions(+), 11 deletions(-) diff --git a/dlls/ddraw/tests/d3d.c b/dlls/ddraw/tests/d3d.c index a8535a3..1b312b5 100644 --- a/dlls/ddraw/tests/d3d.c +++ b/dlls/ddraw/tests/d3d.c @@ -766,16 +766,7 @@ static HRESULT WINAPI enumDevicesCallback(GUID *Guid,LPSTR DeviceDescription,LPS } else if(IsEqualGUID(&IID_IDirect3DHALDevice, Guid)) { - /* pow2 is hardware dependent */ - - ok(hal->dpcLineCaps.dwTextureCaps & D3DPTEXTURECAPS_PERSPECTIVE, - "HAL Device %d hal line caps does not have D3DPTEXTURECAPS_PERSPECTIVE set\n", ver); - ok(hal->dpcTriCaps.dwTextureCaps & D3DPTEXTURECAPS_PERSPECTIVE, - "HAL Device %d hal tri caps does not have D3DPTEXTURECAPS_PERSPECTIVE set\n", ver); - ok((hel->dpcLineCaps.dwTextureCaps & D3DPTEXTURECAPS_PERSPECTIVE) == 0, - "HAL Device %d hel line caps has D3DPTEXTURECAPS_PERSPECTIVE set\n", ver); - ok((hel->dpcTriCaps.dwTextureCaps & D3DPTEXTURECAPS_PERSPECTIVE) == 0, - "HAL Device %d hel tri caps has D3DPTEXTURECAPS_PERSPECTIVE set\n", ver); + trace("HAL Device %d\n", ver); } else if(IsEqualGUID(&IID_IDirect3DRefDevice, Guid)) { @@ -3622,7 +3613,8 @@ static void FindDevice(void) /* Currently Wine only supports the creation of one Direct3D device * for a given DirectDraw instance. */ todo_wine - ok(SUCCEEDED(hr), "Expected IDirectDrawSurface::QueryInterface to succeed, got 0x%08x\n", hr); + ok(SUCCEEDED(hr) || broken(hr == DDERR_INVALIDPIXELFORMAT) /* XP/Win2003 Wow64 on VMware */, + "Expected IDirectDrawSurface::QueryInterface to succeed, got 0x%08x\n", hr); if (SUCCEEDED(hr)) IDirect3DDevice_Release(d3dhal);

1 0

Jörg Höhle : winmm: PlaySound ignores SND_NOWAIT.
by Alexandre Julliard 14 Jan '11

14 Jan '11

Module: wine Branch: master Commit: 0a81f12ce10f88a06e1a95523c1e4da7587fa3e9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a81f12ce10f88a06e1a95523… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Tue Jan 11 23:30:34 2011 +0100 winmm: PlaySound ignores SND_NOWAIT. --- dlls/winmm/playsound.c | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/winmm/playsound.c b/dlls/winmm/playsound.c index 7b6c946..f6416ed 100644 --- a/dlls/winmm/playsound.c +++ b/dlls/winmm/playsound.c @@ -472,10 +472,8 @@ static BOOL MULTIMEDIA_PlaySound(const void* pszSound, HMODULE hmod, DWORD fdwSo TRACE("pszSound='%p' hmod=%p fdwSound=%08X\n", pszSound, hmod, fdwSound); - /* FIXME? I see no difference between SND_NOWAIT and SND_NOSTOP ! - * there could be one if several sounds can be played at once... - */ - if ((fdwSound & (SND_NOWAIT | SND_NOSTOP)) && PlaySoundList != NULL) + /* SND_NOWAIT is ignored in w95/2k/xp. */ + if ((fdwSound & SND_NOSTOP) && PlaySoundList != NULL) return FALSE; /* alloc internal structure, if we need to play something */

1 0

Erich Hoover : urlmon: Update MK protocol handling to IInternetProtocolEx.
by Alexandre Julliard 14 Jan '11

14 Jan '11

Module: wine Branch: master Commit: 1678a4a673b8dde13754eddf51a08d98f086ba01 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1678a4a673b8dde13754eddf5… Author: Erich Hoover <ehoover(a)mines.edu> Date: Tue Jan 11 12:03:38 2011 -0700 urlmon: Update MK protocol handling to IInternetProtocolEx. --- dlls/urlmon/mk.c | 275 +++++++++++++++++++++++++++++++----------------------- 1 files changed, 159 insertions(+), 116 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1678a4a673b8dde13754e…

1 0

Erich Hoover : urlmon: Fix MK protocol handling of escaped characters.
by Alexandre Julliard 14 Jan '11

14 Jan '11

Module: wine Branch: master Commit: aaa9fa711260da7272dc7d2330e6c366fac04904 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aaa9fa711260da7272dc7d233… Author: Erich Hoover <ehoover(a)mines.edu> Date: Tue Jan 11 12:04:25 2011 -0700 urlmon: Fix MK protocol handling of escaped characters. --- dlls/urlmon/mk.c | 16 ++++++++++++---- 1 files changed, 12 insertions(+), 4 deletions(-) diff --git a/dlls/urlmon/mk.c b/dlls/urlmon/mk.c index bfee8e9..46b4ddc 100644 --- a/dlls/urlmon/mk.c +++ b/dlls/urlmon/mk.c @@ -205,8 +205,8 @@ static HRESULT WINAPI MkProtocol_StartEx(IInternetProtocolEx *iface, IUri *pUri, LPWSTR mime, progid, display_name, colon_ptr; DWORD path_size = INTERNET_MAX_URL_LENGTH; DWORD bindf=0, eaten=0, scheme=0, len; + BSTR url, path_tmp, path = NULL; IParseDisplayName *pdn; - BSTR url, path = NULL; BINDINFO bindinfo; STATSTG statstg; IMoniker *mon; @@ -244,14 +244,22 @@ static HRESULT WINAPI MkProtocol_StartEx(IInternetProtocolEx *iface, IUri *pUri, CoTaskMemFree(mime); } - hres = IUri_GetPath(pUri, &path); + hres = IUri_GetPath(pUri, &path_tmp); if(FAILED(hres)) return hres; + path = heap_alloc(path_size); + hres = UrlUnescapeW((LPWSTR)path_tmp, path, &path_size, 0); + SysFreeString(path_tmp); + if (FAILED(hres)) + { + heap_free(path); + return report_result(pOIProtSink, INET_E_RESOURCE_NOT_FOUND, ERROR_INVALID_PARAMETER); + } progid = path+1; /* skip '@' symbol */ colon_ptr = strchrW(path, ':'); if(!colon_ptr) { - SysFreeString(path); + heap_free(path); return report_result(pOIProtSink, INET_E_RESOURCE_NOT_FOUND, ERROR_INVALID_PARAMETER); } @@ -261,7 +269,7 @@ static HRESULT WINAPI MkProtocol_StartEx(IInternetProtocolEx *iface, IUri *pUri, progid[colon_ptr-progid] = 0; /* overwrite ':' with NULL terminator */ hres = CLSIDFromProgID(progid, &clsid); - SysFreeString(path); + heap_free(path); if(FAILED(hres)) { heap_free(display_name);

1 0

Juan Lang : mswsock.h: Fix typo.
by Alexandre Julliard 14 Jan '11

14 Jan '11

Module: wine Branch: master Commit: 7d21d9361ca99d2870cf73f49bfe8847a89e5baa URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d21d9361ca99d2870cf73f49… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Jan 14 07:59:17 2011 -0800 mswsock.h: Fix typo. --- include/mswsock.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/mswsock.h b/include/mswsock.h index 1447a8d..610dd2c 100644 --- a/include/mswsock.h +++ b/include/mswsock.h @@ -87,7 +87,7 @@ extern "C" { #define SIO_SET_COMPATIBILITY_MODE _WSAIOW(IOC_VENDOR,300) #else #define WS_SIO_UDP_CONNRESET _WSAIOW(WS_IOC_VENDOR,12) -#define WS_SIO_SET_COMPATIBILITY_MODE _WSAIOW(IOC_VENDOR,300) +#define WS_SIO_SET_COMPATIBILITY_MODE _WSAIOW(WS_IOC_VENDOR,300) #endif #define DE_REUSE_SOCKET TF_REUSE_SOCKET

1 0

Alexander Kochetkov : wineps.drv: Disable world transform for fonts in GM_COMPATIBLE mode.
by Alexandre Julliard 14 Jan '11

14 Jan '11

Module: wine Branch: master Commit: 69f88da1879cc850113e5f55d0cb85fd13ea2701 URL: http://source.winehq.org/git/wine.git/?a=commit;h=69f88da1879cc850113e5f55d… Author: Alexander Kochetkov <al.kochet(a)gmail.com> Date: Fri Jan 14 03:18:19 2011 +0300 wineps.drv: Disable world transform for fonts in GM_COMPATIBLE mode. --- dlls/wineps.drv/download.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/dlls/wineps.drv/download.c b/dlls/wineps.drv/download.c index 9ad8a2c..52de752 100644 --- a/dlls/wineps.drv/download.c +++ b/dlls/wineps.drv/download.c @@ -20,6 +20,7 @@ #include <string.h> #include <stdlib.h> #include <assert.h> +#include <math.h> #include <stdarg.h> #include <stdio.h> @@ -271,6 +272,12 @@ BOOL PSDRV_WriteSetDownloadFont(PSDRV_PDEVICE *physDev) /* Retrieve the world -> device transform */ GetTransform(physDev->hdc, 0x204, &xform); + if(GetGraphicsMode(physDev->hdc) == GM_COMPATIBLE) + { + xform.eM11 = xform.eM22 = fabs(xform.eM22); + xform.eM21 = xform.eM12 = 0; + } + physDev->font.size.xx = ps_round(ppem * xform.eM11); physDev->font.size.xy = ps_round(ppem * xform.eM12); physDev->font.size.yx = ps_round(ppem * xform.eM21);

1 0

Juan Lang : rsaenh: Move check for CRYPT_IPSEC_HMAC_KEY to each key import function.
by Alexandre Julliard 14 Jan '11

14 Jan '11

Module: wine Branch: master Commit: 5ccf2bd9982bc7b7cb8e8ce93e3b48fb24b63a21 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ccf2bd9982bc7b7cb8e8ce93… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Jan 13 09:10:47 2011 -0800 rsaenh: Move check for CRYPT_IPSEC_HMAC_KEY to each key import function. --- dlls/rsaenh/rsaenh.c | 30 ++++++++++++++++++++++++------ 1 files changed, 24 insertions(+), 6 deletions(-) diff --git a/dlls/rsaenh/rsaenh.c b/dlls/rsaenh/rsaenh.c index 46a0920..0f9959d 100644 --- a/dlls/rsaenh/rsaenh.c +++ b/dlls/rsaenh/rsaenh.c @@ -2694,6 +2694,12 @@ static BOOL import_private_key(HCRYPTPROV hProv, CONST BYTE *pbData, DWORD dwDat CONST RSAPUBKEY *pRSAPubKey = (CONST RSAPUBKEY*)(pBlobHeader+1); BOOL ret; + if (dwFlags & CRYPT_IPSEC_HMAC_KEY) + { + FIXME("unimplemented for CRYPT_IPSEC_HMAC_KEY\n"); + SetLastError(NTE_BAD_FLAGS); + return FALSE; + } if (!lookup_handle(&handle_table, hProv, RSAENH_MAGIC_CONTAINER, (OBJECTHDR**)&pKeyContainer)) { @@ -2770,6 +2776,12 @@ static BOOL import_public_key(HCRYPTPROV hProv, CONST BYTE *pbData, DWORD dwData ALG_ID algID; BOOL ret; + if (dwFlags & CRYPT_IPSEC_HMAC_KEY) + { + FIXME("unimplemented for CRYPT_IPSEC_HMAC_KEY\n"); + SetLastError(NTE_BAD_FLAGS); + return FALSE; + } if (!lookup_handle(&handle_table, hProv, RSAENH_MAGIC_CONTAINER, (OBJECTHDR**)&pKeyContainer)) { @@ -2844,6 +2856,12 @@ static BOOL import_symmetric_key(HCRYPTPROV hProv, CONST BYTE *pbData, BYTE *pbDecrypted; DWORD dwKeyLen; + if (dwFlags & CRYPT_IPSEC_HMAC_KEY) + { + FIXME("unimplemented for CRYPT_IPSEC_HMAC_KEY\n"); + SetLastError(NTE_BAD_FLAGS); + return FALSE; + } if (!lookup_handle(&handle_table, hPubKey, RSAENH_MAGIC_KEY, (OBJECTHDR**)&pPubKey) || pPubKey->aiAlgid != CALG_RSA_KEYX) { @@ -2913,6 +2931,12 @@ static BOOL import_plaintext_key(HCRYPTPROV hProv, CONST BYTE *pbData, CONST DWORD *pKeyLen = (CONST DWORD *)(pBlobHeader + 1); CONST BYTE *pbKeyStream = (CONST BYTE*)(pKeyLen + 1); + if (dwFlags & CRYPT_IPSEC_HMAC_KEY) + { + FIXME("unimplemented for CRYPT_IPSEC_HMAC_KEY\n"); + SetLastError(NTE_BAD_FLAGS); + return FALSE; + } if (dwDataLen < sizeof(BLOBHEADER)+sizeof(DWORD)+*pKeyLen) { SetLastError(NTE_BAD_DATA); /* FIXME: error code */ @@ -3026,12 +3050,6 @@ BOOL WINAPI RSAENH_CPImportKey(HCRYPTPROV hProv, CONST BYTE *pbData, DWORD dwDat TRACE("(hProv=%08lx, pbData=%p, dwDataLen=%d, hPubKey=%08lx, dwFlags=%08x, phKey=%p)\n", hProv, pbData, dwDataLen, hPubKey, dwFlags, phKey); - if (dwFlags & CRYPT_IPSEC_HMAC_KEY) - { - FIXME("unimplemented for CRYPT_IPSEC_HMAC_KEY\n"); - SetLastError(NTE_BAD_FLAGS); - return FALSE; - } return import_key(hProv, pbData, dwDataLen, hPubKey, dwFlags, TRUE, phKey); }

1 0