January 2012 - Wine-commits

Nikolay Sivov : shell32: Use S_OK as successful return code name.
by Alexandre Julliard 09 Jan '12

09 Jan '12

Module: wine Branch: master Commit: a4dd8fb6a8a1424d356aa3194030e1c5dd751db2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a4dd8fb6a8a1424d356aa3194… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jan 8 03:31:54 2012 +0300 shell32: Use S_OK as successful return code name. --- dlls/shell32/folders.c | 2 +- dlls/shell32/pidl.c | 4 ++-- dlls/shell32/shell32_main.c | 2 +- dlls/shell32/shelllink.c | 12 ++++++------ dlls/shell32/shellole.c | 2 +- dlls/shell32/shellord.c | 2 +- dlls/shell32/shellpath.c | 2 +- dlls/shell32/shlfsbind.c | 4 ++-- dlls/shell32/shlmenu.c | 2 +- dlls/shell32/shlview.c | 4 ++-- dlls/shell32/shv_bg_cmenu.c | 4 ++-- dlls/shell32/shv_item_cmenu.c | 8 ++++---- 12 files changed, 24 insertions(+), 24 deletions(-) diff --git a/dlls/shell32/folders.c b/dlls/shell32/folders.c index 379ffde..6f49a3d 100644 --- a/dlls/shell32/folders.c +++ b/dlls/shell32/folders.c @@ -381,7 +381,7 @@ static HRESULT WINAPI IExtractIconW_fnGetIconLocation( } TRACE("-- %s %x\n", debugstr_w(szIconFile), *piIndex); - return NOERROR; + return S_OK; } /************************************************************************** diff --git a/dlls/shell32/pidl.c b/dlls/shell32/pidl.c index c394e5b..2130b49 100644 --- a/dlls/shell32/pidl.c +++ b/dlls/shell32/pidl.c @@ -1140,7 +1140,7 @@ HRESULT WINAPI SHGetDataFromIDListA(LPSHELLFOLDER psf, LPCITEMIDLIST pidl, lstrcpynA(pfd->cAlternateFileName, shortname, sizeof(pfd->cAlternateFileName)); else pfd->cAlternateFileName[0] = '\0'; - return NOERROR; + return S_OK; case SHGDFIL_NETRESOURCE: case SHGDFIL_DESCRIPTIONID: @@ -1199,7 +1199,7 @@ HRESULT WINAPI SHGetDataFromIDListW(LPSHELLFOLDER psf, LPCITEMIDLIST pidl, pfd->cAlternateFileName[0] = '\0'; else if (!MultiByteToWideChar(CP_ACP, 0, shortname, -1, pfd->cAlternateFileName, 14)) pfd->cAlternateFileName[13] = 0; - return NOERROR; + return S_OK; case SHGDFIL_NETRESOURCE: case SHGDFIL_DESCRIPTIONID: diff --git a/dlls/shell32/shell32_main.c b/dlls/shell32/shell32_main.c index 2561f8c..5370b99 100644 --- a/dlls/shell32/shell32_main.c +++ b/dlls/shell32/shell32_main.c @@ -932,7 +932,7 @@ HRESULT WINAPI SHLoadInProc (REFCLSID rclsid) { IUnknown * pUnk = ptr; IUnknown_Release(pUnk); - return NOERROR; + return S_OK; } return DISP_E_MEMBERNOTFOUND; } diff --git a/dlls/shell32/shelllink.c b/dlls/shell32/shelllink.c index 1fb3fbd..e325e2e 100644 --- a/dlls/shell32/shelllink.c +++ b/dlls/shell32/shelllink.c @@ -509,11 +509,11 @@ static HRESULT WINAPI IPersistFile_fnSave(IPersistFile* iface, LPCOLESTR pszFile return r; } -static HRESULT WINAPI IPersistFile_fnSaveCompleted(IPersistFile* iface, LPCOLESTR pszFileName) +static HRESULT WINAPI IPersistFile_fnSaveCompleted(IPersistFile* iface, LPCOLESTR filename) { - IShellLinkImpl *This = impl_from_IPersistFile(iface); - FIXME("(%p)->(%s)\n",This,debugstr_w(pszFileName)); - return NOERROR; + IShellLinkImpl *This = impl_from_IPersistFile(iface); + FIXME("(%p)->(%s): stub\n", This, debugstr_w(filename)); + return S_OK; } static HRESULT WINAPI IPersistFile_fnGetCurFile(IPersistFile* iface, LPOLESTR *filename) @@ -1597,7 +1597,7 @@ static HRESULT WINAPI IShellLinkA_fnSetShowCmd(IShellLinkA *iface, INT iShowCmd) This->iShowCmd = iShowCmd; This->bDirty = TRUE; - return NOERROR; + return S_OK; } static HRESULT WINAPI IShellLinkA_fnGetIconLocation(IShellLinkA *iface, LPSTR pszIconPath, @@ -1866,7 +1866,7 @@ static HRESULT WINAPI IShellLinkW_fnGetArguments(IShellLinkW * iface, LPWSTR psz if( This->sArgs ) lstrcpynW( pszArgs, This->sArgs, cchMaxPath ); - return NOERROR; + return S_OK; } static HRESULT WINAPI IShellLinkW_fnSetArguments(IShellLinkW * iface, LPCWSTR pszArgs) diff --git a/dlls/shell32/shellole.c b/dlls/shell32/shellole.c index 49491a0..fbf917d 100644 --- a/dlls/shell32/shellole.c +++ b/dlls/shell32/shellole.c @@ -507,7 +507,7 @@ HRESULT WINAPI SHCreateDefClassObject( if (! IsEqualCLSID(riid, &IID_IClassFactory) ) return E_NOINTERFACE; if (! (pcf = IDefClF_fnConstructor(lpfnCI, (PLONG)pcRefDll, riidInst))) return E_OUTOFMEMORY; *ppv = pcf; - return NOERROR; + return S_OK; } /************************************************************************* diff --git a/dlls/shell32/shellord.c b/dlls/shell32/shellord.c index 5b74c37..05105c5 100644 --- a/dlls/shell32/shellord.c +++ b/dlls/shell32/shellord.c @@ -1162,7 +1162,7 @@ HRESULT WINAPI SHGetInstanceExplorer (IUnknown **lpUnknown) return E_FAIL; IUnknown_AddRef(SHELL32_IExplorerInterface); - return NOERROR; + return S_OK; } /************************************************************************* * SHFreeUnusedLibraries [SHELL32.123] diff --git a/dlls/shell32/shellpath.c b/dlls/shell32/shellpath.c index f3490c1..71d82c8 100644 --- a/dlls/shell32/shellpath.c +++ b/dlls/shell32/shellpath.c @@ -2961,7 +2961,7 @@ HRESULT WINAPI SHGetFolderLocation( } } if(*ppidl) - hr = NOERROR; + hr = S_OK; TRACE("-- (new pidl %p)\n",*ppidl); return hr; diff --git a/dlls/shell32/shlfsbind.c b/dlls/shell32/shlfsbind.c index ff13013..5988290 100644 --- a/dlls/shell32/shlfsbind.c +++ b/dlls/shell32/shlfsbind.c @@ -166,7 +166,7 @@ static HRESULT WINAPI IFileSystemBindData_fnGetFindData( return E_INVALIDARG; *pfd = This->findFile; - return NOERROR; + return S_OK; } static HRESULT WINAPI IFileSystemBindData_fnSetFindData( @@ -179,5 +179,5 @@ static HRESULT WINAPI IFileSystemBindData_fnSetFindData( This->findFile = *pfd; else memset(&This->findFile, 0, sizeof(WIN32_FIND_DATAW)); - return NOERROR; + return S_OK; } diff --git a/dlls/shell32/shlmenu.c b/dlls/shell32/shlmenu.c index 4006807..476cbec 100644 --- a/dlls/shell32/shlmenu.c +++ b/dlls/shell32/shlmenu.c @@ -184,7 +184,7 @@ static int FM_InitMenuPopup(HMENU hmenu, LPCITEMIDLIST pAlternatePidl) LPITEMIDLIST pidlTemp = NULL; ULONG ulFetched; - while ((!bAbortInit) && (NOERROR == IEnumIDList_Next(lpe,1,&pidlTemp,&ulFetched))) + while ((!bAbortInit) && (S_OK == IEnumIDList_Next(lpe,1,&pidlTemp,&ulFetched))) { if (SUCCEEDED (IShellFolder_GetAttributesOf(lpsf, 1, (LPCITEMIDLIST*)&pidlTemp, &ulItemAttr))) { diff --git a/dlls/shell32/shlview.c b/dlls/shell32/shlview.c index 787a1b7..191dfb1 100644 --- a/dlls/shell32/shlview.c +++ b/dlls/shell32/shlview.c @@ -1998,7 +1998,7 @@ static HRESULT WINAPI IShellView_fnGetCurrentInfo(IShellView2 *iface, LPFOLDERSE if (!lpfs) return E_INVALIDARG; *lpfs = This->FolderSettings; - return NOERROR; + return S_OK; } static HRESULT WINAPI IShellView_fnAddPropertySheetPages(IShellView2 *iface, DWORD dwReserved, @@ -2559,7 +2559,7 @@ static HRESULT WINAPI ISVDropSource_QueryContinueDrag( else if (!(grfKeyState & MK_LBUTTON) && !(grfKeyState & MK_RBUTTON)) return DRAGDROP_S_DROP; else - return NOERROR; + return S_OK; } static HRESULT WINAPI ISVDropSource_GiveFeedback( diff --git a/dlls/shell32/shv_bg_cmenu.c b/dlls/shell32/shv_bg_cmenu.c index b8f16b3..c2c6f08 100644 --- a/dlls/shell32/shv_bg_cmenu.c +++ b/dlls/shell32/shv_bg_cmenu.c @@ -372,7 +372,7 @@ static HRESULT WINAPI ISVBgCm_fnInvokeCommand( if (lpSV) IShellView_Release(lpSV); /* QueryActiveShellView does AddRef */ - return NOERROR; + return S_OK; } /************************************************************************** @@ -401,7 +401,7 @@ static HRESULT WINAPI ISVBgCm_fnGetCommandString( !strcmp((LPSTR)idCommand, CMDSTR_VIEWDETAILSA) || !strcmp((LPSTR)idCommand, CMDSTR_NEWFOLDERA)) { - return NOERROR; + return S_OK; } } } diff --git a/dlls/shell32/shv_item_cmenu.c b/dlls/shell32/shv_item_cmenu.c index f1a96cf..4c05460 100644 --- a/dlls/shell32/shv_item_cmenu.c +++ b/dlls/shell32/shv_item_cmenu.c @@ -535,7 +535,7 @@ static HRESULT WINAPI ISvItemCm_fnInvokeCommand( return E_FAIL; } } - return NOERROR; + return S_OK; } /************************************************************************** @@ -567,7 +567,7 @@ static HRESULT WINAPI ISvItemCm_fnGetCommandString( { case FCIDM_SHVIEW_RENAME: strcpy(lpszName, "rename"); - hr = NOERROR; + hr = S_OK; break; } break; @@ -579,14 +579,14 @@ static HRESULT WINAPI ISvItemCm_fnGetCommandString( { case FCIDM_SHVIEW_RENAME: MultiByteToWideChar( CP_ACP, 0, "rename", -1, (LPWSTR)lpszName, uMaxNameLen ); - hr = NOERROR; + hr = S_OK; break; } break; case GCS_VALIDATEA: case GCS_VALIDATEW: - hr = NOERROR; + hr = S_OK; break; } TRACE("-- (%p)->(name=%s)\n",This, lpszName);

1 0

Francois Gouget : ddraw/tests: Fix compilation on systems that don' t support nameless unions.
by Alexandre Julliard 09 Jan '12

09 Jan '12

Module: wine Branch: master Commit: adcd8637ac81a02dcb4100ceaa64a01704c6eefa URL: http://source.winehq.org/git/wine.git/?a=commit;h=adcd8637ac81a02dcb4100cea… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Jan 9 09:27:56 2012 +0100 ddraw/tests: Fix compilation on systems that don't support nameless unions. --- dlls/ddraw/tests/ddraw4.c | 12 ++++++------ dlls/ddraw/tests/ddraw7.c | 12 ++++++------ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index 68448d1..3f195b7 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -566,12 +566,12 @@ static void test_clipper_blt(void) surface_desc.ddsCaps.dwCaps = DDSCAPS_OFFSCREENPLAIN; surface_desc.dwWidth = 640; surface_desc.dwHeight = 480; - surface_desc.ddpfPixelFormat.dwSize = sizeof(surface_desc.ddpfPixelFormat); - surface_desc.ddpfPixelFormat.dwFlags = DDPF_RGB; - U1(surface_desc.ddpfPixelFormat).dwRGBBitCount = 32; - U2(surface_desc.ddpfPixelFormat).dwRBitMask = 0x00ff0000; - U3(surface_desc.ddpfPixelFormat).dwGBitMask = 0x0000ff00; - U4(surface_desc.ddpfPixelFormat).dwBBitMask = 0x000000ff; + U4(surface_desc).ddpfPixelFormat.dwSize = sizeof(U4(surface_desc).ddpfPixelFormat); + U4(surface_desc).ddpfPixelFormat.dwFlags = DDPF_RGB; + U1(U4(surface_desc).ddpfPixelFormat).dwRGBBitCount = 32; + U2(U4(surface_desc).ddpfPixelFormat).dwRBitMask = 0x00ff0000; + U3(U4(surface_desc).ddpfPixelFormat).dwGBitMask = 0x0000ff00; + U4(U4(surface_desc).ddpfPixelFormat).dwBBitMask = 0x000000ff; hr = IDirectDraw4_CreateSurface(ddraw, &surface_desc, &src_surface, NULL); ok(SUCCEEDED(hr), "Failed to create source surface, hr %#x.\n", hr); diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index d434c94..6075009 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -559,12 +559,12 @@ static void test_clipper_blt(void) surface_desc.ddsCaps.dwCaps = DDSCAPS_OFFSCREENPLAIN; surface_desc.dwWidth = 640; surface_desc.dwHeight = 480; - surface_desc.ddpfPixelFormat.dwSize = sizeof(surface_desc.ddpfPixelFormat); - surface_desc.ddpfPixelFormat.dwFlags = DDPF_RGB; - U1(surface_desc.ddpfPixelFormat).dwRGBBitCount = 32; - U2(surface_desc.ddpfPixelFormat).dwRBitMask = 0x00ff0000; - U3(surface_desc.ddpfPixelFormat).dwGBitMask = 0x0000ff00; - U4(surface_desc.ddpfPixelFormat).dwBBitMask = 0x000000ff; + U4(surface_desc).ddpfPixelFormat.dwSize = sizeof(U4(surface_desc).ddpfPixelFormat); + U4(surface_desc).ddpfPixelFormat.dwFlags = DDPF_RGB; + U1(U4(surface_desc).ddpfPixelFormat).dwRGBBitCount = 32; + U2(U4(surface_desc).ddpfPixelFormat).dwRBitMask = 0x00ff0000; + U3(U4(surface_desc).ddpfPixelFormat).dwGBitMask = 0x0000ff00; + U4(U4(surface_desc).ddpfPixelFormat).dwBBitMask = 0x000000ff; hr = IDirectDraw7_CreateSurface(ddraw, &surface_desc, &src_surface, NULL); ok(SUCCEEDED(hr), "Failed to create source surface, hr %#x.\n", hr);

1 0

Francois Gouget : wshom.ocx: Make debugstr_variant() static.
by Alexandre Julliard 09 Jan '12

09 Jan '12

Module: wine Branch: master Commit: 528c7bef6f6a5402990fbf67155ada46e6753ed3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=528c7bef6f6a5402990fbf671… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Jan 9 09:27:50 2012 +0100 wshom.ocx: Make debugstr_variant() static. --- dlls/wshom.ocx/shell.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wshom.ocx/shell.c b/dlls/wshom.ocx/shell.c index 4d0c266..204f91d 100644 --- a/dlls/wshom.ocx/shell.c +++ b/dlls/wshom.ocx/shell.c @@ -26,7 +26,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(wshom); -const char *debugstr_variant(const VARIANT *v) +static const char *debugstr_variant(const VARIANT *v) { if(!v) return "(null)";

1 0

Francois Gouget : jscript: Make some engine functions static.
by Alexandre Julliard 09 Jan '12

09 Jan '12

Module: wine Branch: master Commit: ee2111b5d5c12635b13374414eb5d87ffd8758e4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee2111b5d5c12635b13374414… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Jan 9 09:33:13 2012 +0100 jscript: Make some engine functions static. --- dlls/jscript/engine.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index af546ad..77fabe3 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -641,7 +641,7 @@ static HRESULT interp_forin(exec_ctx_t *ctx) } /* ECMA-262 3rd Edition 12.10 */ -HRESULT interp_push_scope(exec_ctx_t *ctx) +static HRESULT interp_push_scope(exec_ctx_t *ctx) { IDispatch *disp; jsdisp_t *obj; @@ -669,7 +669,7 @@ HRESULT interp_push_scope(exec_ctx_t *ctx) } /* ECMA-262 3rd Edition 12.10 */ -HRESULT interp_pop_scope(exec_ctx_t *ctx) +static HRESULT interp_pop_scope(exec_ctx_t *ctx) { TRACE("\n"); @@ -678,7 +678,7 @@ HRESULT interp_pop_scope(exec_ctx_t *ctx) } /* ECMA-262 3rd Edition 12.12 */ -HRESULT interp_label(exec_ctx_t *ctx) +static HRESULT interp_label(exec_ctx_t *ctx) { FIXME("\n"); return E_NOTIMPL; @@ -1241,7 +1241,7 @@ static HRESULT interp_carray(exec_ctx_t *ctx) } /* ECMA-262 3rd Edition 11.1.5 */ -HRESULT interp_new_obj(exec_ctx_t *ctx) +static HRESULT interp_new_obj(exec_ctx_t *ctx) { jsdisp_t *obj; VARIANT v; @@ -1258,7 +1258,7 @@ HRESULT interp_new_obj(exec_ctx_t *ctx) } /* ECMA-262 3rd Edition 11.1.5 */ -HRESULT interp_obj_prop(exec_ctx_t *ctx) +static HRESULT interp_obj_prop(exec_ctx_t *ctx) { const BSTR name = ctx->parser->code->instrs[ctx->ip].arg1.bstr; jsdisp_t *obj;

1 0

Francois Gouget : ddraw: Make ddraw_reset_enum_callback() and ddraw_surface_destroy() static.
by Alexandre Julliard 09 Jan '12

09 Jan '12

Module: wine Branch: master Commit: daeb4d6d29ed5608fc7a0671f5d0789d9c57381e URL: http://source.winehq.org/git/wine.git/?a=commit;h=daeb4d6d29ed5608fc7a0671f… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Jan 9 09:33:34 2012 +0100 ddraw: Make ddraw_reset_enum_callback() and ddraw_surface_destroy() static. --- dlls/ddraw/ddraw.c | 2 +- dlls/ddraw/ddraw_private.h | 1 - dlls/ddraw/surface.c | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index b6beb6b..c54f878 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -2649,7 +2649,7 @@ CreateAdditionalSurfaces(IDirectDrawImpl *This, return DD_OK; } -HRESULT CDECL ddraw_reset_enum_callback(struct wined3d_resource *resource) +static HRESULT CDECL ddraw_reset_enum_callback(struct wined3d_resource *resource) { return DD_OK; } diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index 38541cd..c23007e 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -200,7 +200,6 @@ struct IDirectDrawSurfaceImpl }; HRESULT ddraw_surface_create_texture(IDirectDrawSurfaceImpl *surface) DECLSPEC_HIDDEN; -void ddraw_surface_destroy(IDirectDrawSurfaceImpl *surface) DECLSPEC_HIDDEN; HRESULT ddraw_surface_init(IDirectDrawSurfaceImpl *surface, IDirectDrawImpl *ddraw, DDSURFACEDESC2 *desc, UINT mip_level, UINT version) DECLSPEC_HIDDEN; ULONG ddraw_surface_release_iface(IDirectDrawSurfaceImpl *This) DECLSPEC_HIDDEN; diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 0caad37..0d6e398 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -429,7 +429,7 @@ static ULONG WINAPI d3d_texture1_AddRef(IDirect3DTexture *iface) * This: Surface to free * *****************************************************************************/ -void ddraw_surface_destroy(IDirectDrawSurfaceImpl *This) +static void ddraw_surface_destroy(IDirectDrawSurfaceImpl *This) { TRACE("surface %p.\n", This);

1 0

Francois Gouget : oleaut32/tests: Use win_skip() when detecting an API is missing.
by Alexandre Julliard 09 Jan '12

09 Jan '12

Module: wine Branch: master Commit: 559cdbfc7c8b1a88771d7e2149446086b5c60e1f URL: http://source.winehq.org/git/wine.git/?a=commit;h=559cdbfc7c8b1a88771d7e214… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Jan 9 09:57:30 2012 +0100 oleaut32/tests: Use win_skip() when detecting an API is missing. --- dlls/oleaut32/tests/varformat.c | 2 +- dlls/oleaut32/tests/vartest.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/oleaut32/tests/varformat.c b/dlls/oleaut32/tests/varformat.c index d520137..398bcf5 100644 --- a/dlls/oleaut32/tests/varformat.c +++ b/dlls/oleaut32/tests/varformat.c @@ -51,7 +51,7 @@ static HRESULT (WINAPI *pVarWeekdayName)(int,int,int,ULONG,BSTR*); /* Get a conversion function ptr, return if function not available */ #define CHECKPTR(func) p##func = (void*)GetProcAddress(hOleaut32, #func); \ - if (!p##func) { trace("function " # func " not available, not testing it\n"); return; } + if (!p##func) { win_skip("function " # func " not available, not testing it\n"); return; } static inline int strcmpW( const WCHAR *str1, const WCHAR *str2 ) { diff --git a/dlls/oleaut32/tests/vartest.c b/dlls/oleaut32/tests/vartest.c index 7a6394a..393caf5 100644 --- a/dlls/oleaut32/tests/vartest.c +++ b/dlls/oleaut32/tests/vartest.c @@ -55,7 +55,7 @@ static WCHAR sz12_true[32]; /* Get a conversion function ptr, return if function not available */ #define CHECKPTR(func) p##func = (void*)GetProcAddress(hOleaut32, #func); \ - if (!p##func) { trace("function " # func " not available, not testing it\n"); return; } + if (!p##func) { win_skip("function " # func " not available, not testing it\n"); return; } /* Have IRecordInfo data type? */ static int HAVE_OLEAUT32_RECORD = 0;

1 0

Francois Gouget : oleaut32/tests: Fix the olepicture START_TEST() indentation.
by Alexandre Julliard 09 Jan '12

09 Jan '12

Module: wine Branch: master Commit: b682e3b965d70a87fc15c187bc011201ac1be140 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b682e3b965d70a87fc15c187b… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Jan 9 09:59:55 2012 +0100 oleaut32/tests: Fix the olepicture START_TEST() indentation. --- dlls/oleaut32/tests/olepicture.c | 40 +++++++++++++++++++------------------- 1 files changed, 20 insertions(+), 20 deletions(-) diff --git a/dlls/oleaut32/tests/olepicture.c b/dlls/oleaut32/tests/olepicture.c index 54de1cb..9471da6 100644 --- a/dlls/oleaut32/tests/olepicture.c +++ b/dlls/oleaut32/tests/olepicture.c @@ -967,27 +967,27 @@ static void test_himetric(void) START_TEST(olepicture) { - hOleaut32 = GetModuleHandleA("oleaut32.dll"); - pOleLoadPicture = (void*)GetProcAddress(hOleaut32, "OleLoadPicture"); - pOleCreatePictureIndirect = (void*)GetProcAddress(hOleaut32, "OleCreatePictureIndirect"); - if (!pOleLoadPicture) - { - win_skip("OleLoadPicture is not available\n"); - return; - } + hOleaut32 = GetModuleHandleA("oleaut32.dll"); + pOleLoadPicture = (void*)GetProcAddress(hOleaut32, "OleLoadPicture"); + pOleCreatePictureIndirect = (void*)GetProcAddress(hOleaut32, "OleCreatePictureIndirect"); + if (!pOleLoadPicture) + { + win_skip("OleLoadPicture is not available\n"); + return; + } - /* Test regular 1x1 pixel images of gif, jpg, bmp type */ - test_pic(gifimage, sizeof(gifimage)); - test_pic(jpgimage, sizeof(jpgimage)); - test_pic(bmpimage, sizeof(bmpimage)); - test_pic(gif4pixel, sizeof(gif4pixel)); - /* FIXME: No PNG support in Windows... */ - if (0) test_pic(pngimage, sizeof(pngimage)); - test_empty_image(); - test_empty_image_2(); - test_apm(); - test_metafile(); - test_enhmetafile(); + /* Test regular 1x1 pixel images of gif, jpg, bmp type */ + test_pic(gifimage, sizeof(gifimage)); + test_pic(jpgimage, sizeof(jpgimage)); + test_pic(bmpimage, sizeof(bmpimage)); + test_pic(gif4pixel, sizeof(gif4pixel)); + /* FIXME: No PNG support in Windows... */ + if (0) test_pic(pngimage, sizeof(pngimage)); + test_empty_image(); + test_empty_image_2(); + test_apm(); + test_metafile(); + test_enhmetafile(); test_Invoke(); test_OleCreatePictureIndirect();

1 0

Francois Gouget : oleaut32/tests: Skip some tests when OleLoadPictureEx() is not available.
by Alexandre Julliard 09 Jan '12

09 Jan '12

Module: wine Branch: master Commit: 6717f5445c71838646d03ac0f57906da40b3bb48 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6717f5445c71838646d03ac0f… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Jan 9 10:01:37 2012 +0100 oleaut32/tests: Skip some tests when OleLoadPictureEx() is not available. For the early NT4 releases. --- dlls/oleaut32/tests/olepicture.c | 20 +++++++++++++------- 1 files changed, 13 insertions(+), 7 deletions(-) diff --git a/dlls/oleaut32/tests/olepicture.c b/dlls/oleaut32/tests/olepicture.c index 9471da6..7f4d647 100644 --- a/dlls/oleaut32/tests/olepicture.c +++ b/dlls/oleaut32/tests/olepicture.c @@ -54,6 +54,7 @@ static HMODULE hOleaut32; static HRESULT (WINAPI *pOleLoadPicture)(LPSTREAM,LONG,BOOL,REFIID,LPVOID*); +static HRESULT (WINAPI *pOleLoadPictureEx)(LPSTREAM,LONG,BOOL,REFIID,DWORD,DWORD,DWORD,LPVOID*); static HRESULT (WINAPI *pOleCreatePictureIndirect)(PICTDESC*,REFIID,BOOL,LPVOID*); #define ok_ole_success(hr, func) ok(hr == S_OK, func " failed with error 0x%08x\n", hr) @@ -531,7 +532,7 @@ static void test_apm(void) memcpy(data, apmdata, sizeof(apmdata)); ole_check(CreateStreamOnHGlobal(hglob, TRUE, &stream)); - ole_check(OleLoadPictureEx(stream, sizeof(apmdata), TRUE, &IID_IPicture, 100, 100, 0, (LPVOID *)&pict)); + ole_check(pOleLoadPictureEx(stream, sizeof(apmdata), TRUE, &IID_IPicture, 100, 100, 0, (LPVOID *)&pict)); ole_check(IPicture_get_Handle(pict, &handle)); ok(handle != 0, "handle is null\n"); @@ -566,7 +567,7 @@ static void test_metafile(void) ole_check(CreateStreamOnHGlobal(hglob, TRUE, &stream)); /* Windows does not load simple metafiles */ - ole_expect(OleLoadPictureEx(stream, sizeof(metafile), TRUE, &IID_IPicture, 100, 100, 0, (LPVOID *)&pict), E_FAIL); + ole_expect(pOleLoadPictureEx(stream, sizeof(metafile), TRUE, &IID_IPicture, 100, 100, 0, (LPVOID *)&pict), E_FAIL); IStream_Release(stream); } @@ -587,7 +588,7 @@ static void test_enhmetafile(void) memcpy(data, enhmetafile, sizeof(enhmetafile)); ole_check(CreateStreamOnHGlobal(hglob, TRUE, &stream)); - ole_check(OleLoadPictureEx(stream, sizeof(enhmetafile), TRUE, &IID_IPicture, 10, 10, 0, (LPVOID *)&pict)); + ole_check(pOleLoadPictureEx(stream, sizeof(enhmetafile), TRUE, &IID_IPicture, 10, 10, 0, (LPVOID *)&pict)); ole_check(IPicture_get_Handle(pict, &handle)); ok(handle != 0, "handle is null\n"); @@ -969,6 +970,7 @@ START_TEST(olepicture) { hOleaut32 = GetModuleHandleA("oleaut32.dll"); pOleLoadPicture = (void*)GetProcAddress(hOleaut32, "OleLoadPicture"); + pOleLoadPictureEx = (void*)GetProcAddress(hOleaut32, "OleLoadPictureEx"); pOleCreatePictureIndirect = (void*)GetProcAddress(hOleaut32, "OleCreatePictureIndirect"); if (!pOleLoadPicture) { @@ -985,10 +987,14 @@ START_TEST(olepicture) if (0) test_pic(pngimage, sizeof(pngimage)); test_empty_image(); test_empty_image_2(); - test_apm(); - test_metafile(); - test_enhmetafile(); - + if (pOleLoadPictureEx) + { + test_apm(); + test_metafile(); + test_enhmetafile(); + } + else + win_skip("OleLoadPictureEx is not available\n"); test_Invoke(); test_OleCreatePictureIndirect(); test_Render();

1 0

Francois Gouget : oleaut32/tests: Once we have a function pointer, use it consistently.
by Alexandre Julliard 09 Jan '12

09 Jan '12

Module: wine Branch: master Commit: 4f0104f8879d6493266861e0daec42cd825d7047 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f0104f8879d6493266861e0d… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Jan 9 10:02:29 2012 +0100 oleaut32/tests: Once we have a function pointer, use it consistently. --- dlls/oleaut32/tests/vartest.c | 28 ++++++++++++++-------------- 1 files changed, 14 insertions(+), 14 deletions(-) diff --git a/dlls/oleaut32/tests/vartest.c b/dlls/oleaut32/tests/vartest.c index 393caf5..3ff54f8 100644 --- a/dlls/oleaut32/tests/vartest.c +++ b/dlls/oleaut32/tests/vartest.c @@ -2312,7 +2312,7 @@ static void test_VarSub(void) V_BSTR(&left) = lbstr; V_VT(&right) = VT_BSTR; V_BSTR(&right) = rbstr; - hres = VarSub(&left, &right, &result); + hres = pVarSub(&left, &right, &result); ok(hres == S_OK && V_VT(&result) == VT_R8, "VarSub: expected coerced type VT_R8, got %s!\n", vtstr(V_VT(&result))); ok(hres == S_OK && EQ_DOUBLE(V_R8(&result), 0), @@ -2332,14 +2332,14 @@ static void test_VarSub(void) V_VT(&right) = VT_UI1; V_UI1(&right) = 9; - hres = VarSub(&cy, &right, &result); + hres = pVarSub(&cy, &right, &result); ok(hres == S_OK && V_VT(&result) == VT_CY, "VarSub: expected coerced type VT_CY, got %s!\n", vtstr(V_VT(&result))); hres = VarR8FromCy(V_CY(&result), &r); ok(hres == S_OK && EQ_DOUBLE(r, 4702), "VarSub: CY value %f, expected %f\n", r, (double)4720); - hres = VarSub(&left, &dec, &result); + hres = pVarSub(&left, &dec, &result); ok(hres == S_OK && V_VT(&result) == VT_DECIMAL, "VarSub: expected coerced type VT_DECIMAL, got %s!\n", vtstr(V_VT(&result))); hres = VarR8FromDec(&V_DECIMAL(&result), &r); @@ -5120,12 +5120,12 @@ static void test_VarMul(void) V_VT(&right) = VT_UI1; V_UI1(&right) = 9; - hres = VarMul(&cy, &right, &result); + hres = pVarMul(&cy, &right, &result); ok(hres == S_OK && V_VT(&result) == VT_CY, "VarMul: expected coerced type VT_CY, got %s!\n", vtstr(V_VT(&result))); hres = VarR8FromCy(V_CY(&result), &r); ok(hres == S_OK && EQ_DOUBLE(r, 42399), "VarMul: CY value %f, expected %f\n", r, (double)42399); - hres = VarMul(&left, &dec, &result); + hres = pVarMul(&left, &dec, &result); ok(hres == S_OK && V_VT(&result) == VT_DECIMAL, "VarMul: expected coerced type VT_DECIMAL, got %s!\n", vtstr(V_VT(&result))); hres = VarR8FromDec(&V_DECIMAL(&result), &r); ok(hres == S_OK && EQ_DOUBLE(r, 46.2), "VarMul: DECIMAL value %f, expected %f\n", r, (double)46.2); @@ -5291,7 +5291,7 @@ static void test_VarAdd(void) V_BSTR(&left) = lbstr; V_VT(&right) = VT_BSTR; V_BSTR(&right) = rbstr; - hres = VarAdd(&left, &right, &result); + hres = pVarAdd(&left, &right, &result); ok(hres == S_OK && V_VT(&result) == VT_BSTR, "VarAdd: expected coerced type VT_BSTR, got %s!\n", vtstr(V_VT(&result))); hres = VarR8FromStr(V_BSTR(&result), 0, 0, &r); ok(hres == S_OK && EQ_DOUBLE(r, 1212), "VarAdd: BSTR value %f, expected %f\n", r, (double)1212); @@ -5311,12 +5311,12 @@ static void test_VarAdd(void) V_VT(&right) = VT_UI1; V_UI1(&right) = 9; - hres = VarAdd(&cy, &right, &result); + hres = pVarAdd(&cy, &right, &result); ok(hres == S_OK && V_VT(&result) == VT_CY, "VarAdd: expected coerced type VT_CY, got %s!\n", vtstr(V_VT(&result))); hres = VarR8FromCy(V_CY(&result), &r); ok(hres == S_OK && EQ_DOUBLE(r, 4720), "VarAdd: CY value %f, expected %f\n", r, (double)4720); - hres = VarAdd(&left, &dec, &result); + hres = pVarAdd(&left, &dec, &result); ok(hres == S_OK && V_VT(&result) == VT_DECIMAL, "VarAdd: expected coerced type VT_DECIMAL, got %s!\n", vtstr(V_VT(&result))); hres = VarR8FromDec(&V_DECIMAL(&result), &r); ok(hres == S_OK && EQ_DOUBLE(r, -15.2), "VarAdd: DECIMAL value %f, expected %f\n", r, (double)-15.2); @@ -8036,7 +8036,7 @@ static void test_VarIdiv(void) V_VT(&right) = VT_I8; V_UI1(&right) = 2; - hres = VarIdiv(&cy, &cy, &result); + hres = pVarIdiv(&cy, &cy, &result); ok(hres == S_OK && V_VT(&result) == VT_I4, "VARIDIV: expected coerced hres 0x%X type VT_I4, got hres 0x%X type %s!\n", S_OK, hres, vtstr(V_VT(&result))); @@ -8045,7 +8045,7 @@ static void test_VarIdiv(void) if (HAVE_OLEAUT32_I8) { - hres = VarIdiv(&cy, &right, &result); + hres = pVarIdiv(&cy, &right, &result); ok(hres == S_OK && V_VT(&result) == VT_I8, "VARIDIV: expected coerced hres 0x%X type VT_I8, got hres 0x%X type %s!\n", S_OK, hres, vtstr(V_VT(&result))); @@ -8054,21 +8054,21 @@ static void test_VarIdiv(void) (DWORD)(V_I8(&result) >>32), (DWORD)V_I8(&result), 5000); } - hres = VarIdiv(&left, &cy, &result); + hres = pVarIdiv(&left, &cy, &result); ok(hres == S_OK && V_VT(&result) == VT_I4, "VARIDIV: expected coerced hres 0x%X type VT_I4, got hres 0x%X type %s!\n", S_OK, hres, vtstr(V_VT(&result))); ok(hres == S_OK && V_I4(&result) == 0, "VARIDIV: CY value %d, expected %d\n", V_I4(&result), 0); - hres = VarIdiv(&left, &dec, &result); + hres = pVarIdiv(&left, &dec, &result); ok(hres == S_OK && V_VT(&result) == VT_I4, "VARIDIV: expected coerced hres 0x%X type VT_I4, got hres 0x%X type %s!\n", S_OK, hres, vtstr(V_VT(&result))); ok(hres == S_OK && V_I4(&result) == 50, "VARIDIV: DECIMAL value %d, expected %d\n", V_I4(&result), 50); - hres = VarIdiv(&dec, &dec, &result); + hres = pVarIdiv(&dec, &dec, &result); ok(hres == S_OK && V_VT(&result) == VT_I4, "VARIDIV: expected coerced hres 0x%X type VT_I4, got hres 0x%X type %s!\n", S_OK, hres, vtstr(V_VT(&result))); @@ -8077,7 +8077,7 @@ static void test_VarIdiv(void) if (HAVE_OLEAUT32_I8) { - hres = VarIdiv(&dec, &right, &result); + hres = pVarIdiv(&dec, &right, &result); ok(hres == S_OK && V_VT(&result) == VT_I8, "VARIDIV: expected coerced hres 0x%X type VT_I8, got hres 0x%X type %s!\n", S_OK, hres, vtstr(V_VT(&result)));

1 0

Francois Gouget : oleaut32/tests: Skip the VarBstrCat() tests when that API is not available.
by Alexandre Julliard 09 Jan '12

09 Jan '12

Module: wine Branch: master Commit: af3114a5c4c9d69fa34a7dec80fe4e6c3d05e9b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=af3114a5c4c9d69fa34a7dec8… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Jan 9 10:02:58 2012 +0100 oleaut32/tests: Skip the VarBstrCat() tests when that API is not available. For the early NT4 releases. --- dlls/oleaut32/tests/vartype.c | 19 +++++++++++-------- 1 files changed, 11 insertions(+), 8 deletions(-) diff --git a/dlls/oleaut32/tests/vartype.c b/dlls/oleaut32/tests/vartype.c index dd32f8a..58b30b1 100644 --- a/dlls/oleaut32/tests/vartype.c +++ b/dlls/oleaut32/tests/vartype.c @@ -504,6 +504,7 @@ static HRESULT (WINAPI *pVarBstrFromDate)(DATE,LCID,ULONG,BSTR*); static HRESULT (WINAPI *pVarBstrFromCy)(CY,LCID,ULONG,BSTR*); static HRESULT (WINAPI *pVarBstrFromDec)(DECIMAL*,LCID,ULONG,BSTR*); static HRESULT (WINAPI *pVarBstrCmp)(BSTR,BSTR,LCID,ULONG); +static HRESULT (WINAPI *pVarBstrCat)(BSTR,BSTR,BSTR*); static INT (WINAPI *pSystemTimeToVariantTime)(LPSYSTEMTIME,double*); static void (WINAPI *pClearCustData)(LPCUSTDATA); @@ -5493,14 +5494,16 @@ static void test_VarBstrCat(void) BSTR str1, str2, res; UINT len; + CHECKPTR(VarBstrCat); + if (0) { /* Crash */ - VarBstrCat(NULL, NULL, NULL); + pVarBstrCat(NULL, NULL, NULL); } /* Concatenation of two NULL strings works */ - ret = VarBstrCat(NULL, NULL, &res); + ret = pVarBstrCat(NULL, NULL, &res); ok(ret == S_OK, "VarBstrCat failed: %08x\n", ret); ok(res != NULL, "Expected a string\n"); ok(SysStringLen(res) == 0, "Expected a 0-length string\n"); @@ -5509,13 +5512,13 @@ if (0) str1 = SysAllocString(sz1); /* Concatenation with one NULL arg */ - ret = VarBstrCat(NULL, str1, &res); + ret = pVarBstrCat(NULL, str1, &res); ok(ret == S_OK, "VarBstrCat failed: %08x\n", ret); ok(res != NULL, "Expected a string\n"); ok(SysStringLen(res) == SysStringLen(str1), "Unexpected length\n"); ok(!memcmp(res, sz1, SysStringLen(str1)), "Unexpected value\n"); SysFreeString(res); - ret = VarBstrCat(str1, NULL, &res); + ret = pVarBstrCat(str1, NULL, &res); ok(ret == S_OK, "VarBstrCat failed: %08x\n", ret); ok(res != NULL, "Expected a string\n"); ok(SysStringLen(res) == SysStringLen(str1), "Unexpected length\n"); @@ -5524,7 +5527,7 @@ if (0) /* Concatenation of two zero-terminated strings */ str2 = SysAllocString(sz2); - ret = VarBstrCat(str1, str2, &res); + ret = pVarBstrCat(str1, str2, &res); ok(ret == S_OK, "VarBstrCat failed: %08x\n", ret); ok(res != NULL, "Expected a string\n"); ok(SysStringLen(res) == sizeof(sz1sz2) / sizeof(WCHAR) - 1, @@ -5539,7 +5542,7 @@ if (0) str1 = SysAllocStringLen(s1, sizeof(s1) / sizeof(WCHAR)); str2 = SysAllocStringLen(s2, sizeof(s2) / sizeof(WCHAR)); - ret = VarBstrCat(str1, str2, &res); + ret = pVarBstrCat(str1, str2, &res); ok(ret == S_OK, "VarBstrCat failed: %08x\n", ret); ok(res != NULL, "Expected a string\n"); ok(SysStringLen(res) == sizeof(s1s2) / sizeof(WCHAR), @@ -5558,7 +5561,7 @@ if (0) len = SysStringLen(str2); ok(len == (sizeof(str2A)-1)/sizeof(WCHAR), "got length %u\n", len); - ret = VarBstrCat(str1, str2, &res); + ret = pVarBstrCat(str1, str2, &res); ok(ret == S_OK, "VarBstrCat failed: %08x\n", ret); ok(res != NULL, "Expected a string\n"); len = (sizeof(str1A) + sizeof(str2A) - 2)/sizeof(WCHAR); @@ -5577,7 +5580,7 @@ if (0) len = SysStringLen(str2); ok(len == 0, "got length %u\n", len); - ret = VarBstrCat(str1, str2, &res); + ret = pVarBstrCat(str1, str2, &res); ok(ret == S_OK, "VarBstrCat failed: %08x\n", ret); ok(res != NULL, "Expected a string\n"); ok(SysStringLen(res) == 1, "got %d, expected 1\n", SysStringLen(res));

1 0