July 2011 - Wine-commits - list.winehq.org

Francois Gouget : winex11.drv: Make some DC functions static.
by Alexandre Julliard 14 Jul '11

14 Jul '11

Module: wine Branch: master Commit: 60ffc296f0e58d6a36ae806bfbc2a74dbbf7db3b URL: http://source.winehq.org/git/wine.git/?a=commit;h=60ffc296f0e58d6a36ae806bf… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Jul 14 13:14:36 2011 +0200 winex11.drv: Make some DC functions static. --- dlls/winex11.drv/init.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/winex11.drv/init.c b/dlls/winex11.drv/init.c index 5562fb9..2541df0 100644 --- a/dlls/winex11.drv/init.c +++ b/dlls/winex11.drv/init.c @@ -118,7 +118,7 @@ void X11DRV_GDI_Finalize(void) /********************************************************************** * X11DRV_CreateDC */ -BOOL X11DRV_CreateDC( HDC hdc, PHYSDEV *pdev, LPCWSTR driver, LPCWSTR device, +static BOOL X11DRV_CreateDC( HDC hdc, PHYSDEV *pdev, LPCWSTR driver, LPCWSTR device, LPCWSTR output, const DEVMODEW* initData ) { X11DRV_PDEVICE *physDev; @@ -166,7 +166,7 @@ BOOL X11DRV_CreateDC( HDC hdc, PHYSDEV *pdev, LPCWSTR driver, LPCWSTR device, /********************************************************************** * X11DRV_DeleteDC */ -BOOL X11DRV_DeleteDC( PHYSDEV dev ) +static BOOL X11DRV_DeleteDC( PHYSDEV dev ) { X11DRV_PDEVICE *physDev = get_x11drv_dev( dev ); @@ -184,7 +184,7 @@ BOOL X11DRV_DeleteDC( PHYSDEV dev ) /*********************************************************************** * GetDeviceCaps (X11DRV.@) */ -INT X11DRV_GetDeviceCaps( PHYSDEV dev, INT cap ) +static INT X11DRV_GetDeviceCaps( PHYSDEV dev, INT cap ) { switch(cap) { @@ -285,7 +285,7 @@ INT X11DRV_GetDeviceCaps( PHYSDEV dev, INT cap ) /********************************************************************** * ExtEscape (X11DRV.@) */ -INT X11DRV_ExtEscape( PHYSDEV dev, INT escape, INT in_count, LPCVOID in_data, +static INT X11DRV_ExtEscape( PHYSDEV dev, INT escape, INT in_count, LPCVOID in_data, INT out_count, LPVOID out_data ) { X11DRV_PDEVICE *physDev = get_x11drv_dev( dev );

1 0

Francois Gouget : shell32: Make erase_items() static.
by Alexandre Julliard 14 Jul '11

14 Jul '11

Module: wine Branch: master Commit: 17b386a689cdc3aa99b70dc46f8fb1918400e481 URL: http://source.winehq.org/git/wine.git/?a=commit;h=17b386a689cdc3aa99b70dc46… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Jul 14 13:14:25 2011 +0200 shell32: Make erase_items() static. --- dlls/shell32/recyclebin.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/shell32/recyclebin.c b/dlls/shell32/recyclebin.c index 4be6421..39b662a 100644 --- a/dlls/shell32/recyclebin.c +++ b/dlls/shell32/recyclebin.c @@ -771,7 +771,7 @@ static HRESULT WINAPI RecycleBin_AddFolder(ISFHelper * iface, HWND hwnd, return E_NOTIMPL; } -HRESULT erase_items(HWND parent,const LPCITEMIDLIST * apidl, UINT cidl, BOOL confirm) +static HRESULT erase_items(HWND parent,const LPCITEMIDLIST * apidl, UINT cidl, BOOL confirm) { UINT i=0; HRESULT ret = S_OK;

1 0

Francois Gouget : winmm: Make WINMM_DRVMessage() static.
by Alexandre Julliard 14 Jul '11

14 Jul '11

Module: wine Branch: master Commit: 70730f9168456f65b77a3d45930d3dc74610f1d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=70730f9168456f65b77a3d459… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Jul 14 13:14:30 2011 +0200 winmm: Make WINMM_DRVMessage() static. --- dlls/winmm/waveform.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winmm/waveform.c b/dlls/winmm/waveform.c index 037ed11..48faf0f 100644 --- a/dlls/winmm/waveform.c +++ b/dlls/winmm/waveform.c @@ -2543,7 +2543,7 @@ static UINT WINMM_QueryInstanceID(UINT device, WCHAR *str, DWORD_PTR len, return MMSYSERR_NOERROR; } -UINT WINMM_DRVMessage(UINT dev, UINT message, DWORD_PTR param1, +static UINT WINMM_DRVMessage(UINT dev, UINT message, DWORD_PTR param1, DWORD_PTR param2, BOOL is_out) { WINE_MLD *wmld;

1 0

Alistair Leslie-Hughes : xmllite: Implement CreateXmlWriter.
by Alexandre Julliard 14 Jul '11

14 Jul '11

Module: wine Branch: master Commit: b32ed46bdaea9298ac21beedb573931e36682542 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b32ed46bdaea9298ac21beedb… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Jun 23 05:05:01 2011 +1000 xmllite: Implement CreateXmlWriter. --- dlls/xmllite/Makefile.in | 1 + dlls/xmllite/tests/Makefile.in | 3 +- dlls/xmllite/tests/writer.c | 87 +++++++++ dlls/xmllite/writer.c | 413 ++++++++++++++++++++++++++++++++++++++++ dlls/xmllite/xmllite.spec | 2 +- 5 files changed, 504 insertions(+), 2 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b32ed46bdaea9298ac21b…

1 0

André Hentschel : progman: Remove idempotent operation (clang).
by Alexandre Julliard 14 Jul '11

14 Jul '11

Module: wine Branch: master Commit: 17100138785805d8103415be0031f276adbfc8b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=17100138785805d8103415be0… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Jul 13 20:36:07 2011 +0200 progman: Remove idempotent operation (clang). --- programs/progman/grpfile.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/progman/grpfile.c b/programs/progman/grpfile.c index 1d31400..75cdc7d 100644 --- a/programs/progman/grpfile.c +++ b/programs/progman/grpfile.c @@ -113,7 +113,7 @@ static BOOL GRPFILE_ReadFileToBuffer(LPCSTR path, HLOCAL *phBuffer, if (file == HFILE_ERROR) return FALSE; size = 0; - hBuffer = LocalAlloc(LMEM_FIXED, size + MALLOCHUNK + 1); + hBuffer = LocalAlloc(LMEM_FIXED, MALLOCHUNK + 1); if (!hBuffer) return FALSE; buffer = LocalLock(hBuffer);

1 0

André Hentschel : version: Don' t initialize the variable twice (clang).
by Alexandre Julliard 14 Jul '11

14 Jul '11

Module: wine Branch: master Commit: 89beac471971f0e6bb74c263a413552f863f01c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=89beac471971f0e6bb74c263a… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Jul 13 20:46:04 2011 +0200 version: Don't initialize the variable twice (clang). --- dlls/version/version.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/version/version.c b/dlls/version/version.c index b31efd3..1e581ee 100644 --- a/dlls/version/version.c +++ b/dlls/version/version.c @@ -1413,7 +1413,6 @@ DWORD WINAPI VerInstallFileA( } } } - xret = 0; if (!(flags & VIFF_FORCEINSTALL)) { VS_FIXEDFILEINFO *destvffi,*tmpvffi; buf1 = _fetch_versioninfo(destfn,&destvffi);

1 0

André Hentschel : usp10: Fix possible crashes (clang).
by Alexandre Julliard 14 Jul '11

14 Jul '11

Module: wine Branch: master Commit: a6a7bceb1ad48316db7fb59dd4d4ee63c67fbcab URL: http://source.winehq.org/git/wine.git/?a=commit;h=a6a7bceb1ad48316db7fb59dd… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Jul 13 20:46:42 2011 +0200 usp10: Fix possible crashes (clang). --- dlls/usp10/usp10.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index afc4e72..50de8bf 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -1612,7 +1612,7 @@ HRESULT WINAPI ScriptShapeOpenType( HDC hdc, SCRIPT_CACHE *psc, if (cRanges) FIXME("Ranges not supported yet\n"); - rtl = (!psa->fLogicalOrder && psa->fRTL); + rtl = (psa && !psa->fLogicalOrder && psa->fRTL); *pcGlyphs = cChars; if ((hr = init_script_cache(hdc, psc)) != S_OK) return hr; @@ -1640,7 +1640,7 @@ HRESULT WINAPI ScriptShapeOpenType( HDC hdc, SCRIPT_CACHE *psc, pwLogClust[i] = idx; } - if (!psa->fNoGlyphIndex) + if (psa && !psa->fNoGlyphIndex) { WCHAR *rChars; if ((hr = SHAPE_CheckFontForRequiredFeatures(hdc, (ScriptCache *)*psc, psa)) != S_OK) return hr;

1 0

Owen Rudge : winemapi: Escape subject and body before building mailto URL.
by Alexandre Julliard 14 Jul '11

14 Jul '11

Module: wine Branch: master Commit: ec23aeb58e5a347a73a252651c3709ea710a72e9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec23aeb58e5a347a73a252651… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Thu Jul 14 11:39:17 2011 +0100 winemapi: Escape subject and body before building mailto URL. --- dlls/winemapi/sendmail.c | 46 ++++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 42 insertions(+), 4 deletions(-) diff --git a/dlls/winemapi/sendmail.c b/dlls/winemapi/sendmail.c index 93f0569..e017e2c 100644 --- a/dlls/winemapi/sendmail.c +++ b/dlls/winemapi/sendmail.c @@ -38,6 +38,37 @@ WINE_DEFAULT_DEBUG_CHANNEL(winemapi); +/* Escapes a string for use in mailto: URL */ +static char *escape_string(char *in, char *empty_string) +{ + HRESULT res; + DWORD size; + char *escaped = NULL; + + if (!in) + return empty_string; + + size = 1; + res = UrlEscapeA(in, empty_string, &size, URL_ESCAPE_PERCENT | URL_ESCAPE_SEGMENT_ONLY); + + if (res == E_POINTER) + { + escaped = HeapAlloc(GetProcessHeap(), 0, size); + + if (!escaped) + return in; + + /* If for some reason UrlEscape fails, just send the original text */ + if (UrlEscapeA(in, escaped, &size, URL_ESCAPE_PERCENT | URL_ESCAPE_SEGMENT_ONLY) != S_OK) + { + HeapFree(GetProcessHeap(), 0, escaped); + escaped = in; + } + } + + return escaped ? escaped : empty_string; +} + /************************************************************************** * MAPISendMail * @@ -62,8 +93,8 @@ ULONG WINAPI MAPISendMail(LHANDLE session, ULONG_PTR uiparam, unsigned int i, to_count = 0, cc_count = 0, bcc_count = 0; unsigned int to_size = 0, cc_size = 0, bcc_size = 0, subj_size, body_size; - char *to = NULL, *cc = NULL, *bcc = NULL; - const char *address, *subject, *body; + char *to = NULL, *cc = NULL, *bcc = NULL, *subject = NULL, *body = NULL; + const char *address; static const char format[] = "mailto:\"%s\"?subject=\"%s\"&cc=\"%s\"&bcc=\"%s\"&body=\"%s\""; static const char smtp[] = "smtp:"; @@ -126,8 +157,9 @@ ULONG WINAPI MAPISendMail(LHANDLE session, ULONG_PTR uiparam, if (message->nFileCount) FIXME("Ignoring attachments\n"); - subject = message->lpszSubject ? message->lpszSubject : ""; - body = message->lpszNoteText ? message->lpszNoteText : ""; + /* Escape subject and body */ + subject = escape_string(message->lpszSubject, empty_string); + body = escape_string(message->lpszNoteText, empty_string); TRACE("Subject: %s\n", debugstr_a(subject)); TRACE("Body: %s\n", debugstr_a(body)); @@ -245,6 +277,12 @@ exit: HeapFree(GetProcessHeap(), 0, mailto); HeapFree(GetProcessHeap(), 0, escape); + if (subject != empty_string) + HeapFree(GetProcessHeap(), 0, subject); + + if (body != empty_string) + HeapFree(GetProcessHeap(), 0, body); + return ret; }

1 0

Andrew Eikum : dsound: Request that WinMM perform audio conversion if the hardware doesn' t support the requested format.
by Alexandre Julliard 14 Jul '11

14 Jul '11

Module: wine Branch: master Commit: ca4ee7f60fef3c620c66dfa5cb3773b4073143f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca4ee7f60fef3c620c66dfa5c… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Jul 13 14:20:25 2011 -0500 dsound: Request that WinMM perform audio conversion if the hardware doesn't support the requested format. --- dlls/dsound/capture.c | 2 +- dlls/dsound/primary.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dsound/capture.c b/dlls/dsound/capture.c index f089313..174355a 100644 --- a/dlls/dsound/capture.c +++ b/dlls/dsound/capture.c @@ -942,7 +942,7 @@ static HRESULT IDirectSoundCaptureBufferImpl_Create( return err; } } else { - DWORD flags = CALLBACK_FUNCTION; + DWORD flags = CALLBACK_FUNCTION | WAVE_MAPPED; err = mmErr(waveInOpen(&(device->hwi), device->drvdesc.dnDevNode, device->pwfx, (DWORD_PTR)DSOUND_capture_callback, (DWORD_PTR)device, flags)); diff --git a/dlls/dsound/primary.c b/dlls/dsound/primary.c index aa8450f..8a87c96 100644 --- a/dlls/dsound/primary.c +++ b/dlls/dsound/primary.c @@ -125,7 +125,7 @@ HRESULT DSOUND_ReopenDevice(DirectSoundDevice *device, BOOL forcewave) if (device->drvdesc.dwFlags & DSDDESC_DOMMSYSTEMOPEN) { - DWORD flags = CALLBACK_FUNCTION; + DWORD flags = CALLBACK_FUNCTION | WAVE_MAPPED; if (device->driver) flags |= WAVE_DIRECTSOUND;

1 0

Andrew Eikum : winmm: Support WAVE_MAPPED flag in waveOut*.
by Alexandre Julliard 14 Jul '11

14 Jul '11

Module: wine Branch: master Commit: 58bd405778b19097679a23394817d53485c7bc0d URL: http://source.winehq.org/git/wine.git/?a=commit;h=58bd405778b19097679a23394… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Jul 13 14:20:28 2011 -0500 winmm: Support WAVE_MAPPED flag in waveOut*. --- dlls/winmm/waveform.c | 44 +++++++++++++++++++++++++++++++------------- 1 files changed, 31 insertions(+), 13 deletions(-) diff --git a/dlls/winmm/waveform.c b/dlls/winmm/waveform.c index 254bf21..57c6add 100644 --- a/dlls/winmm/waveform.c +++ b/dlls/winmm/waveform.c @@ -615,6 +615,11 @@ static UINT WAVE_Open(HANDLE* lphndl, UINT uDeviceID, UINT uType, return dwRet; } +static inline BOOL WINMM_IsMapper(UINT device) +{ + return (device == WAVE_MAPPER || device == (UINT16)WAVE_MAPPER); +} + static MMRESULT WINMM_TryDeviceMapping(WINMM_OpenInfo *info, WORD channels, DWORD freq, DWORD bits_per_samp, BOOL is_out) { @@ -644,15 +649,24 @@ static MMRESULT WINMM_TryDeviceMapping(WINMM_OpenInfo *info, WORD channels, /* ACM can convert from src->dst, so try to find a device * that supports dst */ - for(i = 0; i < g_outmmdevices_count; ++i){ + if(WINMM_IsMapper(info->req_device)){ + for(i = 0; i < g_outmmdevices_count; ++i){ + WINMM_OpenInfo l_info = *info; + l_info.req_device = i; + l_info.format = &target; + mr = WOD_Open(&l_info); + if(mr == MMSYSERR_NOERROR){ + info->handle = l_info.handle; + break; + } + } + }else{ WINMM_OpenInfo l_info = *info; - l_info.req_device = i; + l_info.flags &= ~WAVE_MAPPED; l_info.format = &target; mr = WOD_Open(&l_info); - if(mr == MMSYSERR_NOERROR){ + if(mr == MMSYSERR_NOERROR) info->handle = l_info.handle; - break; - } } if(mr != MMSYSERR_NOERROR) return WAVERR_BADFORMAT; @@ -684,8 +698,17 @@ static MMRESULT WINMM_MapDevice(WINMM_OpenInfo *info, BOOL is_out) /* try to find a direct match */ if(is_out){ WINMM_OpenInfo l_info = *info; - for(i = 0; i < g_outmmdevices_count; ++i){ - l_info.req_device = i; + if(WINMM_IsMapper(info->req_device)){ + for(i = 0; i < g_outmmdevices_count; ++i){ + l_info.req_device = i; + mr = WOD_Open(&l_info); + if(mr == MMSYSERR_NOERROR){ + info->handle = l_info.handle; + return mr; + } + } + }else{ + l_info.flags &= ~WAVE_MAPPED; mr = WOD_Open(&l_info); if(mr == MMSYSERR_NOERROR){ info->handle = l_info.handle; @@ -940,11 +963,6 @@ error: return ret; } -static inline BOOL WINMM_IsMapper(UINT device) -{ - return (device == WAVE_MAPPER || device == (UINT16)WAVE_MAPPER); -} - static LRESULT WOD_Open(WINMM_OpenInfo *info) { WINMM_MMDevice *mmdevice; @@ -955,7 +973,7 @@ static LRESULT WOD_Open(WINMM_OpenInfo *info) TRACE("(%u, %p, %08x)\n", info->req_device, info, info->flags); - if(WINMM_IsMapper(info->req_device)) + if(WINMM_IsMapper(info->req_device) || (info->flags & WAVE_MAPPED)) return WINMM_MapDevice(info, TRUE); if(info->req_device >= g_outmmdevices_count)

1 0