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

Francois Gouget : shell32: Add a trailing '\n' to Wine trace calls.
by Alexandre Julliard July 14, 2011

July 14, 2011

Module: wine Branch: master Commit: e5de59b625fc5c3273f1f7541bb6d6c815afed27 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e5de59b625fc5c3273f1f7541… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Jul 14 13:14:13 2011 +0200 shell32: Add a trailing '\n' to Wine trace calls. --- dlls/shell32/recyclebin.c | 2 +- dlls/shell32/tests/recyclebin.c | 4 ++-- dlls/shell32/trash.c | 12 ++++++------ 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/shell32/recyclebin.c b/dlls/shell32/recyclebin.c index f840bf1..4be6421 100644 --- a/dlls/shell32/recyclebin.c +++ b/dlls/shell32/recyclebin.c @@ -173,7 +173,7 @@ static HRESULT WINAPI RecycleBinMenu_QueryContextMenu(IContextMenu2 *iface, return E_NOTIMPL; else{ UINT idMax = Shell_MergeMenus(hmenu,GetSubMenu(menures,0),indexMenu,idCmdFirst,idCmdLast,MM_SUBMENUSHAVEIDS); - TRACE("Added %d id(s)",idMax-idCmdFirst); + TRACE("Added %d id(s)\n",idMax-idCmdFirst); return MAKE_HRESULT(SEVERITY_SUCCESS, FACILITY_NULL, idMax-idCmdFirst+1); } } diff --git a/dlls/shell32/tests/recyclebin.c b/dlls/shell32/tests/recyclebin.c index ce101a6..2fa4d3e 100644 --- a/dlls/shell32/tests/recyclebin.c +++ b/dlls/shell32/tests/recyclebin.c @@ -59,12 +59,12 @@ static void test_query_recyclebin(void) CHAR buf[MAX_PATH+strlen(name)+2]; if(!pSHQueryRecycleBinA) { - skip("SHQueryRecycleBinA does not exist"); + skip("SHQueryRecycleBinA does not exist\n"); return; } if(!pSHFileOperationA) { - skip("SHFileOperationA does not exist"); + skip("SHFileOperationA does not exist\n"); return; } GetCurrentDirectoryA(MAX_PATH, buf); diff --git a/dlls/shell32/trash.c b/dlls/shell32/trash.c index c64e203..3a6234a 100644 --- a/dlls/shell32/trash.c +++ b/dlls/shell32/trash.c @@ -553,10 +553,10 @@ HRESULT TRASH_RestoreItem(LPCITEMIDLIST pidl){ WIN32_FIND_DATAW data; char *file_path; - TRACE("(%p)",pidl); + TRACE("(%p)\n",pidl); if(strcmp(filename+strlen(filename)-suffix_length,trashinfo_suffix)) { - ERR("pidl at %p is not a valid recycle bin entry",pidl); + ERR("pidl at %p is not a valid recycle bin entry\n",pidl); return E_INVALIDARG; } TRASH_UnpackItemID(id,&data); @@ -568,7 +568,7 @@ HRESULT TRASH_RestoreItem(LPCITEMIDLIST pidl){ { sprintf(file_path,"%s%s",home_trash->info_dir,filename); if(unlink(file_path)) - WARN("failed to delete the trashinfo file %s",filename); + WARN("failed to delete the trashinfo file %s\n",filename); } else WARN("could not erase %s from the trash (errno=%i)\n",filename,errno); @@ -586,16 +586,16 @@ HRESULT TRASH_EraseItem(LPCITEMIDLIST pidl) const char *filename = (const char*)(id->abID+1+sizeof(WIN32_FIND_DATAW)+strlen(bucket_name)+1); char *file_path; - TRACE("(%p)",pidl); + TRACE("(%p)\n",pidl); if(strcmp(filename+strlen(filename)-suffix_length,trashinfo_suffix)) { - ERR("pidl at %p is not a valid recycle bin entry",pidl); + ERR("pidl at %p is not a valid recycle bin entry\n",pidl); return E_INVALIDARG; } file_path = SHAlloc(max(strlen(home_trash->files_dir),strlen(home_trash->info_dir))+strlen(filename)+1); sprintf(file_path,"%s%s",home_trash->info_dir,filename); if(unlink(file_path)) - WARN("failed to delete the trashinfo file %s",filename); + WARN("failed to delete the trashinfo file %s\n",filename); sprintf(file_path,"%s%s",home_trash->files_dir,filename); file_path[strlen(home_trash->files_dir)+strlen(filename)-suffix_length] = '\0'; if(unlink(file_path))

1 0

Francois Gouget : wineps.drv: Make some DC functions static.
by Alexandre Julliard July 14, 2011

July 14, 2011

Module: wine Branch: master Commit: e33e31a7d6b0b4e8df5b2be3d62f8d1aebebbab9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e33e31a7d6b0b4e8df5b2be3d… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Jul 14 13:14:20 2011 +0200 wineps.drv: Make some DC functions static. --- dlls/wineps.drv/init.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wineps.drv/init.c b/dlls/wineps.drv/init.c index 84d4b45..5a1af9c 100644 --- a/dlls/wineps.drv/init.c +++ b/dlls/wineps.drv/init.c @@ -301,7 +301,7 @@ static LPDEVMODEA DEVMODEdupWtoA(HANDLE heap, const DEVMODEW *dmW) /********************************************************************** * PSDRV_CreateDC */ -BOOL PSDRV_CreateDC( HDC hdc, PHYSDEV *pdev, LPCWSTR driver, LPCWSTR device, +static BOOL PSDRV_CreateDC( HDC hdc, PHYSDEV *pdev, LPCWSTR driver, LPCWSTR device, LPCWSTR output, const DEVMODEW* initData ) { PSDRV_PDEVICE *physDev; @@ -380,7 +380,7 @@ BOOL PSDRV_CreateDC( HDC hdc, PHYSDEV *pdev, LPCWSTR driver, LPCWSTR device, /********************************************************************** * PSDRV_DeleteDC */ -BOOL PSDRV_DeleteDC( PHYSDEV dev ) +static BOOL PSDRV_DeleteDC( PHYSDEV dev ) { PSDRV_PDEVICE *physDev = get_psdrv_dev( dev ); @@ -397,7 +397,7 @@ BOOL PSDRV_DeleteDC( PHYSDEV dev ) /********************************************************************** * ResetDC (WINEPS.@) */ -HDC PSDRV_ResetDC( PHYSDEV dev, const DEVMODEW *lpInitData ) +static HDC PSDRV_ResetDC( PHYSDEV dev, const DEVMODEW *lpInitData ) { PSDRV_PDEVICE *physDev = get_psdrv_dev( dev ); @@ -413,7 +413,7 @@ HDC PSDRV_ResetDC( PHYSDEV dev, const DEVMODEW *lpInitData ) /*********************************************************************** * GetDeviceCaps (WINEPS.@) */ -INT PSDRV_GetDeviceCaps( PHYSDEV dev, INT cap ) +static INT PSDRV_GetDeviceCaps( PHYSDEV dev, INT cap ) { PSDRV_PDEVICE *physDev = get_psdrv_dev( dev );

1 0

Francois Gouget : shell32: Make erase_items() static.
by Alexandre Julliard July 14, 2011

July 14, 2011

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 : winex11.drv: Make some DC functions static.
by Alexandre Julliard July 14, 2011

July 14, 2011

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

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

July 14, 2011

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

Owen Rudge : winemapi: Escape subject and body before building mailto URL.
by Alexandre Julliard July 14, 2011

July 14, 2011

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

André Hentschel : usp10: Fix possible crashes (clang).
by Alexandre Julliard July 14, 2011

July 14, 2011

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

André Hentschel : progman: Remove idempotent operation (clang).
by Alexandre Julliard July 14, 2011

July 14, 2011

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 : oledlg: Remove dead assignment ( clang).
by Alexandre Julliard July 14, 2011

July 14, 2011

Module: wine Branch: master Commit: f06ab42ab8b22842d1cba34466b7fa4e341a764a URL: http://source.winehq.org/git/wine.git/?a=commit;h=f06ab42ab8b22842d1cba3446… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Jul 13 20:35:49 2011 +0200 oledlg: Remove dead assignment (clang). --- dlls/oledlg/pastespl.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/oledlg/pastespl.c b/dlls/oledlg/pastespl.c index ae5e2f2..a487db7 100644 --- a/dlls/oledlg/pastespl.c +++ b/dlls/oledlg/pastespl.c @@ -313,7 +313,6 @@ static void update_display_list(HWND hdlg, UINT src_list_id) SendMessageW(display_list, LB_INSERTSTRING, i, (LPARAM)txt); SendMessageW(display_list, LB_SETITEMDATA, i, item_data); } - old_pos = max(old_pos, count); SendMessageW(display_list, LB_SETCURSEL, 0, 0); SendMessageW(display_list, WM_SETREDRAW, 1, 0); if(GetForegroundWindow() == hdlg)

1 0

Andrew Eikum : winmm: Implement waveIn* on top of MMDevAPI.
by Alexandre Julliard July 14, 2011

July 14, 2011

Module: wine Branch: master Commit: 8cd5f12e6b09ac31667448ca063182cc444a0f1c URL: http://source.winehq.org/git/wine.git/?a=commit;h=8cd5f12e6b09ac31667448ca0… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Jul 13 14:20:35 2011 -0500 winmm: Implement waveIn* on top of MMDevAPI. --- dlls/winmm/waveform.c | 659 ++++++++++++++++++++++++++++++++++++++++++++----- 1 files changed, 602 insertions(+), 57 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8cd5f12e6b09ac3166744…

1 0