December 2013 - Wine-commits

Frédéric Delanoy : mshtml: Avoid memory leaks ( Coverity).
by Alexandre Julliard 02 Dec '13

02 Dec '13

Module: wine Branch: master Commit: 60a592b77a2f0c5339a68cfc3d0da3105b1c81c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=60a592b77a2f0c5339a68cfc3… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Nov 30 20:17:31 2013 +0100 mshtml: Avoid memory leaks (Coverity). --- dlls/mshtml/htmlbody.c | 15 ++++++++++----- 1 files changed, 10 insertions(+), 5 deletions(-) diff --git a/dlls/mshtml/htmlbody.c b/dlls/mshtml/htmlbody.c index fcd8766..6c2bb7a 100644 --- a/dlls/mshtml/htmlbody.c +++ b/dlls/mshtml/htmlbody.c @@ -635,7 +635,7 @@ static HRESULT WINAPI HTMLBodyElement_put_scroll(IHTMLBodyElement *iface, BSTR v static HRESULT WINAPI HTMLBodyElement_get_scroll(IHTMLBodyElement *iface, BSTR *p) { HTMLBodyElement *This = impl_from_IHTMLBodyElement(iface); - const WCHAR *ret; + const WCHAR *ret = NULL; BSTR overflow; HRESULT hres; @@ -648,7 +648,7 @@ static HRESULT WINAPI HTMLBodyElement_get_scroll(IHTMLBodyElement *iface, BSTR * if(!overflow || !*overflow) { *p = NULL; - return S_OK; + hres = S_OK; }else if(!strcmpW(overflow, visibleW) || !strcmpW(overflow, autoW)) { ret = autoW; }else if(!strcmpW(overflow, scrollW)) { @@ -658,11 +658,16 @@ static HRESULT WINAPI HTMLBodyElement_get_scroll(IHTMLBodyElement *iface, BSTR * }else { TRACE("Defaulting %s to NULL\n", debugstr_w(overflow)); *p = NULL; - return S_OK; + hres = S_OK; } - *p = SysAllocString(ret); - return *p ? S_OK : E_OUTOFMEMORY; + SysFreeString(overflow); + if(ret) { + *p = SysAllocString(ret); + hres = *p ? S_OK : E_OUTOFMEMORY; + } + + return hres; } static HRESULT WINAPI HTMLBodyElement_put_onselect(IHTMLBodyElement *iface, VARIANT v)

1 0

Alexandre Julliard : configure: Update FreeType configure checks for the changed headers location.
by Alexandre Julliard 02 Dec '13

02 Dec '13

Module: wine Branch: master Commit: 67f9b6e3c5d2397446d39ab454f691c1ee46d2c0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=67f9b6e3c5d2397446d39ab45… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Nov 30 11:22:25 2013 +0100 configure: Update FreeType configure checks for the changed headers location. --- configure | 78 ++++++++++++++---------------------------------- configure.ac | 40 ++++++------------------- dlls/gdi32/freetype.c | 62 +++++++++++++------------------------- include/config.h.in | 33 -------------------- 4 files changed, 54 insertions(+), 159 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=67f9b6e3c5d2397446d39…

1 0

Alexandre Julliard : makefiles: Include AUTHORS file directly from the top-level directory.
by Alexandre Julliard 02 Dec '13

02 Dec '13

Module: wine Branch: master Commit: bc9650392ab72551c583c89afe464a94837e9a7e URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc9650392ab72551c583c89af… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Nov 30 12:43:20 2013 +0100 makefiles: Include AUTHORS file directly from the top-level directory. --- .gitignore | 1 - configure | 3 --- configure.ac | 1 - dlls/shell32/Makefile.in | 2 ++ tools/make_makefiles | 1 - 5 files changed, 2 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 7cd10bb..63eba1c 100644 --- a/.gitignore +++ b/.gitignore @@ -126,7 +126,6 @@ dlls/rpcrt4/tests/server_c.c dlls/rpcrt4/tests/server_s.c dlls/scrrun/scrrun.h dlls/scrrun/tests/scrrun.h -dlls/shell32/AUTHORS dlls/sti/sti_wia.h dlls/sti/sti_wia_p.c dlls/urlmon/urlmon_urlmon.h diff --git a/configure b/configure index 9b2f2c2..23eeb92 100755 --- a/configure +++ b/configure @@ -16679,8 +16679,6 @@ all: Makefile Makefile: Makefile.in Make.vars.in Make.rules config.status @./config.status Make.tmp Makefile" -ac_config_links="$ac_config_links dlls/shell32/AUTHORS:AUTHORS" -wine_fn_config_symlink -d dlls/shell32 dlls/shell32/AUTHORS if test "x$enable_fonts" != xno; then ac_config_links="$ac_config_links fonts/marlett.ttf:fonts/marlett.ttf" ac_config_links="$ac_config_links fonts/symbol.ttf:fonts/symbol.ttf" @@ -18286,7 +18284,6 @@ do case $ac_config_target in "include/config.h") CONFIG_HEADERS="$CONFIG_HEADERS include/config.h" ;; "include/stamp-h") CONFIG_COMMANDS="$CONFIG_COMMANDS include/stamp-h" ;; - "dlls/shell32/AUTHORS") CONFIG_LINKS="$CONFIG_LINKS dlls/shell32/AUTHORS:AUTHORS" ;; "fonts/marlett.ttf") CONFIG_LINKS="$CONFIG_LINKS fonts/marlett.ttf:fonts/marlett.ttf" ;; "fonts/symbol.ttf") CONFIG_LINKS="$CONFIG_LINKS fonts/symbol.ttf:fonts/symbol.ttf" ;; "fonts/tahoma.ttf") CONFIG_LINKS="$CONFIG_LINKS fonts/tahoma.ttf:fonts/tahoma.ttf" ;; diff --git a/configure.ac b/configure.ac index c4021b4..d091370 100644 --- a/configure.ac +++ b/configure.ac @@ -2669,7 +2669,6 @@ all: Makefile Makefile: Makefile.in Make.vars.in Make.rules config.status @./config.status Make.tmp Makefile]) -WINE_CONFIG_SYMLINK(dlls/shell32,,[AUTHORS]) WINE_CONFIG_SYMLINK(fonts,fonts,[marlett.ttf,symbol.ttf,tahoma.ttf,tahomabd.ttf],enable_fonts) WINE_CONFIG_SYMLINK(loader,loader,[l_intl.nls]) WINE_CONFIG_SYMLINK(po,po,[LINGUAS]) diff --git a/dlls/shell32/Makefile.in b/dlls/shell32/Makefile.in index fb9b2c7..1303a10 100644 --- a/dlls/shell32/Makefile.in +++ b/dlls/shell32/Makefile.in @@ -4,6 +4,8 @@ IMPORTLIB = shell32 IMPORTS = uuid shlwapi user32 gdi32 advapi32 DELAYIMPORTS = ole32 oleaut32 shdocvw version comctl32 EXTRALIBS = @CORESERVICESLIB@ +# AUTHORS file is in the top-level directory +EXTRAINCL = -I$(top_srcdir) C_SRCS = \ appbar.c \ diff --git a/tools/make_makefiles b/tools/make_makefiles index 0057c1d..d24dffc 100755 --- a/tools/make_makefiles +++ b/tools/make_makefiles @@ -87,7 +87,6 @@ my @ignores = ( "Makefile", "dlldata.c", "dlls/*/*.def", - "dlls/shell32/AUTHORS", "*/*/tests/testlist.c", "include/config.h", "include/stamp-h",

1 0

Alexandre Julliard : makedep: Don' t look for header files in the build directories.
by Alexandre Julliard 02 Dec '13

02 Dec '13

Module: wine Branch: master Commit: 202d046d685802640675651b3c039bf800e9732b URL: http://source.winehq.org/git/wine.git/?a=commit;h=202d046d685802640675651b3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Nov 30 12:50:30 2013 +0100 makedep: Don't look for header files in the build directories. --- tools/makedep.c | 62 ++++++++++++++++++++++++++++++++++-------------------- 1 files changed, 39 insertions(+), 23 deletions(-) diff --git a/tools/makedep.c b/tools/makedep.c index 692ee58..164b7e4 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -88,7 +88,7 @@ struct strarray const char **str; }; -static struct strarray paths; +static struct strarray include_args; static struct strarray object_extensions; static const char *src_dir; @@ -574,20 +574,13 @@ static FILE *open_include_file( struct incl_file *pFile ) free( filename ); } - /* first try name as is */ - if ((file = fopen( pFile->name, "r" ))) - { - pFile->filename = xstrdup( pFile->name ); - return file; - } - /* now try in source dir */ if (src_dir) - { filename = strmake( "%s/%s", src_dir, pFile->name ); - if ((file = fopen( filename, "r" ))) goto found; - free( filename ); - } + else + filename = xstrdup( pFile->name ); + if ((file = fopen( filename, "r" ))) goto found; + free( filename ); /* now try in parent source dir */ if (parent_dir) @@ -621,6 +614,27 @@ static FILE *open_include_file( struct incl_file *pFile ) free( filename ); } + /* check for corresponding .in file in global includes (for config.h.in) */ + + if (strendswith( pFile->name, ".h" )) + { + filename = replace_extension( pFile->name, 2, ".h.in" ); + if (top_src_dir) + filename = strmake( "%s/include/%s", top_src_dir, filename ); + else if (top_obj_dir) + filename = strmake( "%s/include/%s", top_obj_dir, filename ); + else + filename = NULL; + + if (filename && (file = fopen( filename, "r" ))) + { + pFile->sourcename = filename; + pFile->filename = strmake( "%s/include/%s", top_obj_dir, pFile->name ); + return file; + } + free( filename ); + } + /* check for corresponding .x file in global includes */ if (strendswith( pFile->name, "tmpl.h" )) @@ -643,16 +657,17 @@ static FILE *open_include_file( struct incl_file *pFile ) } /* now search in include paths */ - for (i = 0; i < paths.count; i++) + for (i = 0; i < include_args.count; i++) { - if (paths.str[i][0] == '/') + const char *dir = include_args.str[i] + 2; /* skip -I */ + if (*dir == '/') { /* ignore absolute paths that don't point into the source dir */ if (!top_src_dir) continue; - if (strncmp( paths.str[i], top_src_dir, strlen(top_src_dir) )) continue; - if (paths.str[i][strlen(top_src_dir)] != '/') continue; + if (strncmp( dir, top_src_dir, strlen(top_src_dir) )) continue; + if (dir[strlen(top_src_dir)] != '/') continue; } - filename = strmake( "%s/%s", paths.str[i], pFile->name ); + filename = strmake( "%s/%s", dir, pFile->name ); if ((file = fopen( filename, "r" ))) goto found; free( filename ); } @@ -1155,7 +1170,8 @@ static void output_sources(void) if (src_dir) output_filename( strmake( "-I%s/%s", src_dir, parent_dir ), &column ); else output_filename( strmake( "-I%s", parent_dir ), &column ); } - for (i = 0; i < paths.count; i++) output_filename( strmake( "-I%s", paths.str[i] ), &column ); + if (top_src_dir && top_obj_dir) output_filename( strmake( "-I%s/include", top_obj_dir ), &column ); + for (i = 0; i < include_args.count; i++) output_filename( include_args.str[i], &column ); output( "\n" ); LIST_FOR_EACH_ENTRY( source, &sources, struct incl_file, entry ) @@ -1436,7 +1452,7 @@ static void output_dependencies(void) } fclose( output_file ); output_file = tmp_file; - if (!found && list_head(&sources)) output( "\n%s\n", Separator ); + if (!found && !list_empty(&sources)) output( "\n%s\n", Separator ); } else { @@ -1444,7 +1460,7 @@ static void output_dependencies(void) fatal_perror( "%s", OutputFileName ); } - output_sources(); + if (!list_empty( &sources )) output_sources(); fclose( output_file ); output_file = NULL; @@ -1476,7 +1492,7 @@ static void parse_option( const char *opt ) switch(opt[1]) { case 'I': - if (opt[2]) strarray_add( &paths, xstrdup( opt + 2 )); + if (opt[2]) strarray_add( &include_args, opt ); break; case 'C': src_dir = opt + 2; @@ -1548,8 +1564,8 @@ int main( int argc, char *argv[] ) if (src_dir && !strcmp( src_dir, "." )) src_dir = NULL; if (top_src_dir && top_obj_dir && !strcmp( top_src_dir, top_obj_dir )) top_src_dir = NULL; - if (top_src_dir) strarray_insert( &paths, 0, strmake( "%s/include", top_src_dir )); - if (top_obj_dir) strarray_insert( &paths, 0, strmake( "%s/include", top_obj_dir )); + if (top_src_dir) strarray_insert( &include_args, 0, strmake( "-I%s/include", top_src_dir )); + else if (top_obj_dir) strarray_insert( &include_args, 0, strmake( "-I%s/include", top_obj_dir )); /* set the default extension list for object files */ if (!object_extensions.count) strarray_add( &object_extensions, "o" );

1 0

Francois Gouget : comctl32: TTM_ADDTOOLW must refuse to set a tooltip text to NULL.
by Alexandre Julliard 02 Dec '13

02 Dec '13

Module: wine Branch: master Commit: 542652deab875c3966424dc831e0fea010ed0f9d URL: http://source.winehq.org/git/wine.git/?a=commit;h=542652deab875c3966424dc83… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Nov 29 18:55:36 2013 +0100 comctl32: TTM_ADDTOOLW must refuse to set a tooltip text to NULL. --- dlls/comctl32/status.c | 2 + dlls/comctl32/tests/tooltips.c | 2 +- dlls/comctl32/tooltips.c | 47 ++++++++++++++++++++++----------------- dlls/comctl32/trackbar.c | 4 ++- 4 files changed, 32 insertions(+), 23 deletions(-) diff --git a/dlls/comctl32/status.c b/dlls/comctl32/status.c index c4efedb..4528e24 100644 --- a/dlls/comctl32/status.c +++ b/dlls/comctl32/status.c @@ -700,10 +700,12 @@ STATUSBAR_SetParts (STATUS_INFO *infoPtr, INT count, LPINT parts) if (infoPtr->hwndToolTip) { INT nTipCount; TTTOOLINFOW ti; + WCHAR wEmpty = 0; ZeroMemory (&ti, sizeof(TTTOOLINFOW)); ti.cbSize = sizeof(TTTOOLINFOW); ti.hwnd = infoPtr->Self; + ti.lpszText = &wEmpty; nTipCount = SendMessageW (infoPtr->hwndToolTip, TTM_GETTOOLCOUNT, 0, 0); if (nTipCount < infoPtr->numParts) { diff --git a/dlls/comctl32/tests/tooltips.c b/dlls/comctl32/tests/tooltips.c index d5f97b3..63436e0 100644 --- a/dlls/comctl32/tests/tooltips.c +++ b/dlls/comctl32/tests/tooltips.c @@ -420,7 +420,7 @@ static void test_gettext(void) toolinfoW.lParam = 0xdeadbeef; GetClientRect(hwnd, &toolinfoW.rect); r = SendMessageW(hwnd, TTM_ADDTOOLW, 0, (LPARAM)&toolinfoW); - todo_wine ok(!r, "Adding the tool to the tooltip failed\n"); + ok(!r, "Adding the tool to the tooltip succeeded!\n"); if (0) /* crashes on NT4 */ { diff --git a/dlls/comctl32/tooltips.c b/dlls/comctl32/tooltips.c index a325bcc..f74ea65 100644 --- a/dlls/comctl32/tooltips.c +++ b/dlls/comctl32/tooltips.c @@ -1037,6 +1037,9 @@ TOOLTIPS_AddToolT (TOOLTIPS_INFO *infoPtr, const TTTOOLINFOW *ti, BOOL isW) infoPtr->hwndSelf, ti->hwnd, ti->uId, (ti->uFlags & TTF_IDISHWND) ? " TTF_IDISHWND" : ""); + if (ti->cbSize >= TTTOOLINFOW_V2_SIZE && !ti->lpszText && isW) + return FALSE; + if (infoPtr->uNumTools == 0) { infoPtr->tools = Alloc (sizeof(TTTOOL_INFO)); toolPtr = infoPtr->tools; @@ -1060,27 +1063,29 @@ TOOLTIPS_AddToolT (TOOLTIPS_INFO *infoPtr, const TTTOOLINFOW *ti, BOOL isW) toolPtr->rect = ti->rect; toolPtr->hinst = ti->hinst; - if (IS_INTRESOURCE(ti->lpszText)) { - TRACE("add string id %x\n", LOWORD(ti->lpszText)); - toolPtr->lpszText = ti->lpszText; - } - else if (ti->lpszText) { - if (TOOLTIPS_IsCallbackString(ti->lpszText, isW)) { - TRACE("add CALLBACK!\n"); - toolPtr->lpszText = LPSTR_TEXTCALLBACKW; - } - else if (isW) { - INT len = lstrlenW (ti->lpszText); - TRACE("add text %s!\n", debugstr_w(ti->lpszText)); - toolPtr->lpszText = Alloc ((len + 1)*sizeof(WCHAR)); - strcpyW (toolPtr->lpszText, ti->lpszText); - } - else { - INT len = MultiByteToWideChar(CP_ACP, 0, (LPSTR)ti->lpszText, -1, NULL, 0); - TRACE("add text \"%s\"!\n", (LPSTR)ti->lpszText); - toolPtr->lpszText = Alloc (len * sizeof(WCHAR)); - MultiByteToWideChar(CP_ACP, 0, (LPSTR)ti->lpszText, -1, toolPtr->lpszText, len); - } + if (ti->cbSize >= TTTOOLINFOW_V1_SIZE) { + if (IS_INTRESOURCE(ti->lpszText)) { + TRACE("add string id %x\n", LOWORD(ti->lpszText)); + toolPtr->lpszText = ti->lpszText; + } + else if (ti->lpszText) { + if (TOOLTIPS_IsCallbackString(ti->lpszText, isW)) { + TRACE("add CALLBACK!\n"); + toolPtr->lpszText = LPSTR_TEXTCALLBACKW; + } + else if (isW) { + INT len = lstrlenW (ti->lpszText); + TRACE("add text %s!\n", debugstr_w(ti->lpszText)); + toolPtr->lpszText = Alloc ((len + 1)*sizeof(WCHAR)); + strcpyW (toolPtr->lpszText, ti->lpszText); + } + else { + INT len = MultiByteToWideChar(CP_ACP, 0, (LPSTR)ti->lpszText, -1, NULL, 0); + TRACE("add text \"%s\"!\n", (LPSTR)ti->lpszText); + toolPtr->lpszText = Alloc (len * sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, (LPSTR)ti->lpszText, -1, toolPtr->lpszText, len); + } + } } if (ti->cbSize >= TTTOOLINFOW_V2_SIZE) diff --git a/dlls/comctl32/trackbar.c b/dlls/comctl32/trackbar.c index 9673771..6d092a3 100644 --- a/dlls/comctl32/trackbar.c +++ b/dlls/comctl32/trackbar.c @@ -1525,11 +1525,13 @@ TRACKBAR_Create (HWND hwnd, const CREATESTRUCTW *lpcs) hwnd, 0, 0, 0); if (infoPtr->hwndToolTip) { - TTTOOLINFOW ti; + TTTOOLINFOW ti; + WCHAR wEmpty = 0; ZeroMemory (&ti, sizeof(ti)); ti.cbSize = sizeof(ti); ti.uFlags = TTF_IDISHWND | TTF_TRACK | TTF_ABSOLUTE; ti.hwnd = hwnd; + ti.lpszText = &wEmpty; SendMessageW (infoPtr->hwndToolTip, TTM_ADDTOOLW, 0, (LPARAM)&ti); }

1 0

Vincent Povirk : windowscodecs: Don't treat S_FALSE as failure.
by Alexandre Julliard 02 Dec '13

02 Dec '13

Module: wine Branch: master Commit: 7a728d1813e4d887023c457def4a876ce9f97932 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a728d1813e4d887023c457de… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Nov 29 12:43:41 2013 -0600 windowscodecs: Don't treat S_FALSE as failure. --- dlls/windowscodecs/gifformat.c | 2 +- dlls/windowscodecs/jpegformat.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/gifformat.c b/dlls/windowscodecs/gifformat.c index 39de709..64386d5 100644 --- a/dlls/windowscodecs/gifformat.c +++ b/dlls/windowscodecs/gifformat.c @@ -1094,7 +1094,7 @@ static int _gif_inputfunc(GifFileType *gif, GifByteType *data, int len) { } hr = IStream_Read(stream, data, len, &bytesread); - if (hr != S_OK) bytesread = 0; + if (FAILED(hr)) bytesread = 0; return bytesread; } diff --git a/dlls/windowscodecs/jpegformat.c b/dlls/windowscodecs/jpegformat.c index 5ce8fa0..b8895ee 100644 --- a/dlls/windowscodecs/jpegformat.c +++ b/dlls/windowscodecs/jpegformat.c @@ -250,7 +250,7 @@ static jpeg_boolean source_mgr_fill_input_buffer(j_decompress_ptr cinfo) hr = IStream_Read(This->stream, This->source_buffer, 1024, &bytesread); - if (hr != S_OK || bytesread == 0) + if (FAILED(hr) || bytesread == 0) { return FALSE; }

1 0

Nikolay Sivov : qmgr/tests: Fixed some test failures on older windows versions.
by Alexandre Julliard 02 Dec '13

02 Dec '13

Module: wine Branch: master Commit: 202e71769e82b3b3a537d5a0a61bb8c82cc47e71 URL: http://source.winehq.org/git/wine.git/?a=commit;h=202e71769e82b3b3a537d5a0a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Nov 30 14:47:19 2013 +0400 qmgr/tests: Fixed some test failures on older windows versions. --- dlls/qmgr/tests/enum_files.c | 43 +++++++++++++++++++++++++++++++++++- dlls/qmgr/tests/file.c | 50 ++++++++++++++++++++++++++--------------- 2 files changed, 74 insertions(+), 19 deletions(-) diff --git a/dlls/qmgr/tests/enum_files.c b/dlls/qmgr/tests/enum_files.c index 7e2ab1e..0b05920 100644 --- a/dlls/qmgr/tests/enum_files.c +++ b/dlls/qmgr/tests/enum_files.c @@ -56,7 +56,40 @@ static HRESULT addFileHelper(IBackgroundCopyJob* job, urlSize = MAX_PATH; UrlCreateFromPathW(remoteFile, remoteUrl, &urlSize, 0); UrlUnescapeW(remoteUrl, NULL, &urlSize, URL_UNESCAPE_INPLACE); - return IBackgroundCopyJob_AddFile(test_job, remoteUrl, localFile); + return IBackgroundCopyJob_AddFile(job, remoteUrl, localFile); +} + +static HRESULT test_create_manager(void) +{ + HRESULT hres; + IBackgroundCopyManager *manager = NULL; + + /* Creating BITS instance */ + hres = CoCreateInstance(&CLSID_BackgroundCopyManager, NULL, CLSCTX_LOCAL_SERVER, + &IID_IBackgroundCopyManager, (void **) &manager); + + if(hres == HRESULT_FROM_WIN32(ERROR_SERVICE_DISABLED)) { + win_skip("Needed Service is disabled\n"); + return hres; + } + + if (hres == S_OK) + { + IBackgroundCopyJob *job; + GUID jobId; + + hres = IBackgroundCopyManager_CreateJob(manager, test_displayName, BG_JOB_TYPE_DOWNLOAD, &jobId, &job); + if (hres == S_OK) + { + hres = addFileHelper(job, test_localNameA, test_remoteNameA); + if (hres != S_OK) + win_skip("AddFile() with file:// protocol failed. Tests will be skipped.\n"); + IBackgroundCopyJob_Release(job); + } + IBackgroundCopyManager_Release(manager); + } + + return hres; } /* Generic test setup */ @@ -251,6 +284,14 @@ START_TEST(enum_files) int i; CoInitialize(NULL); + + if (FAILED(test_create_manager())) + { + CoUninitialize(); + win_skip("Failed to create Manager instance, skipping tests\n"); + return; + } + for (test = tests, i = 0; *test; ++test, ++i) { /* Keep state separate between tests. */ diff --git a/dlls/qmgr/tests/file.c b/dlls/qmgr/tests/file.c index f14ad3a..afe4b53 100644 --- a/dlls/qmgr/tests/file.c +++ b/dlls/qmgr/tests/file.c @@ -40,6 +40,25 @@ static IBackgroundCopyManager *test_manager; static IEnumBackgroundCopyFiles *test_enumFiles; static IBackgroundCopyFile *test_file; +/* Helper function to add a file to a job. The helper function takes base + file name and creates properly formed path and URL strings for creation of + the file. */ +static HRESULT addFileHelper(IBackgroundCopyJob* job, + const WCHAR *localName, const WCHAR *remoteName) +{ + DWORD urlSize; + + GetCurrentDirectoryW(MAX_PATH, test_localFile); + PathAppendW(test_localFile, localName); + GetCurrentDirectoryW(MAX_PATH, test_remoteUrl); + PathAppendW(test_remoteUrl, remoteName); + urlSize = MAX_PATH; + UrlCreateFromPathW(test_remoteUrl, test_remoteUrl, &urlSize, 0); + UrlUnescapeW(test_remoteUrl, NULL, &urlSize, URL_UNESCAPE_INPLACE); + + return IBackgroundCopyJob_AddFile(job, test_remoteUrl, test_localFile); +} + static HRESULT test_create_manager(void) { HRESULT hres; @@ -55,29 +74,24 @@ static HRESULT test_create_manager(void) } if (hres == S_OK) + { + IBackgroundCopyJob *job; + GUID jobId; + + hres = IBackgroundCopyManager_CreateJob(manager, test_displayName, BG_JOB_TYPE_DOWNLOAD, &jobId, &job); + if (hres == S_OK) + { + hres = addFileHelper(job, test_localName, test_remoteName); + if (hres != S_OK) + win_skip("AddFile() with file:// protocol failed. Tests will be skipped.\n"); + IBackgroundCopyJob_Release(job); + } IBackgroundCopyManager_Release(manager); + } return hres; } -/* Helper function to add a file to a job. The helper function takes base - file name and creates properly formed path and URL strings for creation of - the file. */ -static HRESULT addFileHelper(IBackgroundCopyJob* job, - const WCHAR *localName, const WCHAR *remoteName) -{ - DWORD urlSize; - - GetCurrentDirectoryW(MAX_PATH, test_localFile); - PathAppendW(test_localFile, localName); - GetCurrentDirectoryW(MAX_PATH, test_remoteUrl); - PathAppendW(test_remoteUrl, remoteName); - urlSize = MAX_PATH; - UrlCreateFromPathW(test_remoteUrl, test_remoteUrl, &urlSize, 0); - UrlUnescapeW(test_remoteUrl, NULL, &urlSize, URL_UNESCAPE_INPLACE); - return IBackgroundCopyJob_AddFile(test_job, test_remoteUrl, test_localFile); -} - /* Generic test setup */ static BOOL setup(void) {

1 0

Francois Gouget : msvcrt: Standardize on using a comparison operator to ensure we return 0 or 1.
by Alexandre Julliard 02 Dec '13

02 Dec '13

Module: wine Branch: master Commit: 0b5b54e9f4b0b5d11e463000d92db7a981290f5e URL: http://source.winehq.org/git/wine.git/?a=commit;h=0b5b54e9f4b0b5d11e463000d… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Dec 1 16:26:14 2013 +0100 msvcrt: Standardize on using a comparison operator to ensure we return 0 or 1. --- dlls/msvcrt/math.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 4ec225c..6bcc2b7 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -1217,7 +1217,7 @@ double CDECL MSVCRT__copysign(double num, double sign) */ int CDECL MSVCRT__finite(double num) { - return (isfinite(num)?1:0); /* See comment for _isnan() */ + return isfinite(num) != 0; /* See comment for _isnan() */ } /********************************************************************* @@ -1246,7 +1246,7 @@ INT CDECL MSVCRT__isnan(double num) /* Some implementations return -1 for true(glibc), msvcrt/crtdll return 1. * Do the same, as the result may be used in calculations */ - return isnan(num) ? 1 : 0; + return isnan(num) != 0; } /*********************************************************************

1 0

Stefan Leichter : dbghelp: Add a null check for optional output parameter for function SymFromAddr.
by Alexandre Julliard 02 Dec '13

02 Dec '13

Module: wine Branch: master Commit: 89832cde4eb2e8d2dc9570cf4840fcaff19b8429 URL: http://source.winehq.org/git/wine.git/?a=commit;h=89832cde4eb2e8d2dc9570cf4… Author: Stefan Leichter <Stefan.Leichter(a)camline.com> Date: Sun Dec 1 22:07:20 2013 +0100 dbghelp: Add a null check for optional output parameter for function SymFromAddr. --- dlls/dbghelp/symbol.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/dbghelp/symbol.c b/dlls/dbghelp/symbol.c index e6401a9..8c482c7 100644 --- a/dlls/dbghelp/symbol.c +++ b/dlls/dbghelp/symbol.c @@ -1229,7 +1229,8 @@ BOOL WINAPI SymFromAddr(HANDLE hProcess, DWORD64 Address, if ((sym = symt_find_nearest(pair.effective, Address)) == NULL) return FALSE; symt_fill_sym_info(&pair, NULL, &sym->symt, Symbol); - *Displacement = Address - Symbol->Address; + if (Displacement) + *Displacement = Address - Symbol->Address; return TRUE; }

1 0

Michael Stefaniuc : comctl32/tests: Make monthcal. c compile with -D__WINESRC__.
by Alexandre Julliard 02 Dec '13

02 Dec '13

Module: wine Branch: master Commit: 4b59a4266a6c04f28594dff7667149e851986d7f URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b59a4266a6c04f28594dff76… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Dec 1 22:33:53 2013 +0100 comctl32/tests: Make monthcal.c compile with -D__WINESRC__. --- dlls/comctl32/tests/monthcal.c | 415 ++++++++++++++++++++-------------------- 1 files changed, 209 insertions(+), 206 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4b59a4266a6c04f28594d…

1 0