September 2008 - Wine-commits

Marcus Meissner : winecfg: Fixed buffersize to GetPrivateProfileStringW.
by Alexandre Julliard 15 Sep '08

15 Sep '08

Module: wine Branch: master Commit: a24550aa821820f91d9365119bb91c58758d8ad4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a24550aa821820f91d9365119… Author: Marcus Meissner <meissner(a)suse.de> Date: Fri Sep 12 19:15:08 2008 +0200 winecfg: Fixed buffersize to GetPrivateProfileStringW. --- programs/winecfg/theme.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/winecfg/theme.c b/programs/winecfg/theme.c index cdab531..9b7e857 100644 --- a/programs/winecfg/theme.c +++ b/programs/winecfg/theme.c @@ -583,12 +583,12 @@ static void do_parse_theme(WCHAR *file) WINE_TRACE("%s\n", wine_dbgstr_w(file)); GetPrivateProfileStringW(colorSect, NULL, NULL, keyName, - MAX_PATH*sizeof(WCHAR), file); + MAX_PATH, file); keyNamePtr = keyName; while (*keyNamePtr!=0) { GetPrivateProfileStringW(colorSect, keyNamePtr, NULL, keyNameValue, - MAX_PATH*sizeof(WCHAR), file); + MAX_PATH, file); keyNameValueSize = WideCharToMultiByte(CP_ACP, 0, keyNameValue, -1, keyNameValueA, 0, NULL, NULL);

1 0

Alexandre Julliard : inetcomm: Avoid a compiler warning.
by Alexandre Julliard 15 Sep '08

15 Sep '08

Module: wine Branch: master Commit: 9099c212d13a86f741359058a3101c869648f7bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=9099c212d13a86f741359058a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 12 17:09:07 2008 +0200 inetcomm: Avoid a compiler warning. --- dlls/inetcomm/mimeintl.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/inetcomm/mimeintl.c b/dlls/inetcomm/mimeintl.c index 5215f66..626ad62 100644 --- a/dlls/inetcomm/mimeintl.c +++ b/dlls/inetcomm/mimeintl.c @@ -168,9 +168,6 @@ static HRESULT WINAPI MimeInternat_GetCodePageCharset(IMimeInternational *iface, *phCharset = NULL; - if(ctCsetType < CHARSET_BODY || ctCsetType > CHARSET_WEB) - return MIME_E_INVALID_CHARSET_TYPE; - hr = mlang_getcodepageinfo(cpiCodePage, &mlang_cp_info); if(SUCCEEDED(hr)) { @@ -189,6 +186,8 @@ static HRESULT WINAPI MimeInternat_GetCodePageCharset(IMimeInternational *iface, case CHARSET_WEB: charset_nameW = mlang_cp_info.wszWebCharset; break; + default: + return MIME_E_INVALID_CHARSET_TYPE; } len = WideCharToMultiByte(CP_ACP, 0, charset_nameW, -1, NULL, 0, NULL, NULL); charset_name = HeapAlloc(GetProcessHeap(), 0, len);

1 0

Rob Shearman : advpack: Add explicit "!= S_OK" to expressions that use HRESULTs as booleans.
by Alexandre Julliard 15 Sep '08

15 Sep '08

Module: wine Branch: master Commit: 6bfead8421efa68231dbe4a13de69f19673db124 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6bfead8421efa68231dbe4a13… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Fri Sep 12 13:00:55 2008 +0100 advpack: Add explicit "!= S_OK" to expressions that use HRESULTs as booleans. --- dlls/advpack/files.c | 2 +- dlls/advpack/install.c | 6 +++--- dlls/advpack/reg.c | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/advpack/files.c b/dlls/advpack/files.c index 3aabc08..63f4080 100644 --- a/dlls/advpack/files.c +++ b/dlls/advpack/files.c @@ -627,7 +627,7 @@ static DWORD fill_file_list(SESSION *session, LPCSTR szCabName, LPCSTR szFileLis struct FILELIST *pNode; session->Operation |= EXTRACT_FILLFILELIST; - if (pExtract(session, szCabName)) + if (pExtract(session, szCabName) != S_OK) { session->Operation &= ~EXTRACT_FILLFILELIST; return -1; diff --git a/dlls/advpack/install.c b/dlls/advpack/install.c index 0ec5ceb..129ea82 100644 --- a/dlls/advpack/install.c +++ b/dlls/advpack/install.c @@ -91,7 +91,7 @@ static HRESULT del_dirs_callback(HINF hinf, PCWSTR field, const void *arg) MAX_INF_STRING_LENGTH, &size)) continue; - if (DelNodeW(directory, ADN_DEL_IF_EMPTY)) + if (DelNodeW(directory, ADN_DEL_IF_EMPTY) != S_OK) hr = E_FAIL; } @@ -161,7 +161,7 @@ static HRESULT register_ocxs_callback(HINF hinf, PCWSTR field, const void *arg) hm = LoadLibraryExW(buffer, NULL, LOAD_WITH_ALTERED_SEARCH_PATH); if (hm) { - if (do_ocx_reg(hm, TRUE)) + if (do_ocx_reg(hm, TRUE) != S_OK) hr = E_FAIL; FreeLibrary(hm); @@ -196,7 +196,7 @@ static HRESULT run_setup_commands_callback(HINF hinf, PCWSTR field, const void * MAX_INF_STRING_LENGTH, &size)) continue; - if (launch_exe(buffer, info->working_dir, NULL)) + if (launch_exe(buffer, info->working_dir, NULL) != S_OK) hr = E_FAIL; } diff --git a/dlls/advpack/reg.c b/dlls/advpack/reg.c index bcb6cb9..9a43015 100644 --- a/dlls/advpack/reg.c +++ b/dlls/advpack/reg.c @@ -230,7 +230,7 @@ HRESULT WINAPI RegInstallW(HMODULE hm, LPCWSTR pszSection, const STRTABLEW* pstT if(!create_tmp_ini_file(hm, tmp_ini_path)) return E_FAIL; - if (write_predefined_strings(hm, tmp_ini_path)) + if (write_predefined_strings(hm, tmp_ini_path) != S_OK) goto done; /* Write the additional string table */

1 0

Huw Davies : inetcomm: Fix some more idl.
by Alexandre Julliard 15 Sep '08

15 Sep '08

Module: wine Branch: master Commit: bba2221426e8b59f01a79b5edfbeb23f8dd26708 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bba2221426e8b59f01a79b5ed… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Sep 12 14:49:05 2008 +0100 inetcomm: Fix some more idl. --- dlls/inetcomm/mimeintl.c | 2 +- include/mimeole.idl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/inetcomm/mimeintl.c b/dlls/inetcomm/mimeintl.c index 92df2fb..5215f66 100644 --- a/dlls/inetcomm/mimeintl.c +++ b/dlls/inetcomm/mimeintl.c @@ -383,7 +383,7 @@ static HRESULT WINAPI MimeInternat_MLANG_ConvertInetString(IMimeInternational *i } static HRESULT WINAPI MimeInternat_Rfc1522Decode(IMimeInternational *iface, LPCSTR pszValue, - LPCSTR pszCharset, + LPSTR pszCharset, ULONG cchmax, LPSTR *ppszDecoded) { diff --git a/include/mimeole.idl b/include/mimeole.idl index f4cffda..b94163d 100644 --- a/include/mimeole.idl +++ b/include/mimeole.idl @@ -286,7 +286,7 @@ library MIMEOLE [in] int *pnDstSize); HRESULT Rfc1522Decode( [in] LPCSTR pszValue, - [in,ref] LPCSTR pszCharset, + [in,ref] LPSTR pszCharset, [in] ULONG cchmax, [out] LPSTR *ppszDecoded); HRESULT Rfc1522Encode(

1 0

Rob Shearman : dsound: Add explicit "!= S_OK" to expressions that use HRESULTs as booleans.
by Alexandre Julliard 15 Sep '08

15 Sep '08

Module: wine Branch: master Commit: 7af7e8ece5755e06fc90b0607b4beaf7868d51f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7af7e8ece5755e06fc90b0607… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Fri Sep 12 13:01:45 2008 +0100 dsound: Add explicit "!= S_OK" to expressions that use HRESULTs as booleans. --- dlls/dsound/primary.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/dsound/primary.c b/dlls/dsound/primary.c index 7ad561f..4e80778 100644 --- a/dlls/dsound/primary.c +++ b/dlls/dsound/primary.c @@ -408,7 +408,7 @@ HRESULT DSOUND_PrimaryGetPosition(DirectSoundDevice *device, LPDWORD playpos, LP if (device->hwbuf) { HRESULT err=IDsDriverBuffer_GetPosition(device->hwbuf,playpos,writepos); - if (err) { + if (err != S_OK) { WARN("IDsDriverBuffer_GetPosition failed\n"); return err; }

1 0

Rob Shearman : wintrust: Add explicit "!= NO_ERROR" to expressions that use variables containing error codes as booleans.
by Alexandre Julliard 15 Sep '08

15 Sep '08

Module: wine Branch: master Commit: 19e9b665c6570c36dc5e7517e19aa0c0a45b9c35 URL: http://source.winehq.org/git/wine.git/?a=commit;h=19e9b665c6570c36dc5e7517e… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Fri Sep 12 13:01:20 2008 +0100 wintrust: Add explicit "!= NO_ERROR" to expressions that use variables containing error codes as booleans. --- dlls/wintrust/softpub.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wintrust/softpub.c b/dlls/wintrust/softpub.c index c2eb1eb..f8bf69e 100644 --- a/dlls/wintrust/softpub.c +++ b/dlls/wintrust/softpub.c @@ -849,14 +849,14 @@ HRESULT WINAPI GenericChainFinalProv(CRYPT_PROVIDER_DATA *data) else err = ERROR_OUTOFMEMORY; } - if (!err) + if (err == NO_ERROR) err = policyCallback(data, TRUSTERROR_STEP_FINAL_POLICYPROV, data->dwRegPolicySettings, data->csSigners, signers, policyArg); data->psPfns->pfnFree(signers); } - if (err) + if (err != NO_ERROR) data->padwTrustStepErrors[TRUSTERROR_STEP_FINAL_POLICYPROV] = err; - TRACE("returning %d (%08x)\n", !err ? S_OK : S_FALSE, + TRACE("returning %d (%08x)\n", err == NO_ERROR ? S_OK : S_FALSE, data->padwTrustStepErrors[TRUSTERROR_STEP_FINAL_POLICYPROV]); return err == NO_ERROR ? S_OK : S_FALSE; }

1 0

Rob Shearman : winedos: Fix the type of res in VGA_DoSetMode.
by Alexandre Julliard 15 Sep '08

15 Sep '08

Module: wine Branch: master Commit: c4179cf64e63c4b7e12d51db412bc1ac4886f5b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c4179cf64e63c4b7e12d51db4… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Fri Sep 12 13:01:09 2008 +0100 winedos: Fix the type of res in VGA_DoSetMode. It should be HRESULT instead of LRESULT. Add explicit "!= S_OK" to expressions that use HRESULTs as booleans. --- dlls/winedos/vga.c | 25 ++++++++++++++----------- 1 files changed, 14 insertions(+), 11 deletions(-) diff --git a/dlls/winedos/vga.c b/dlls/winedos/vga.c index 9afbc4c..288f867 100644 --- a/dlls/winedos/vga.c +++ b/dlls/winedos/vga.c @@ -405,7 +405,7 @@ static void WINAPI VGA_DoExit(ULONG_PTR arg) static void WINAPI VGA_DoSetMode(ULONG_PTR arg) { - LRESULT res; + HRESULT res; ModeSet *par = (ModeSet *)arg; par->ret=1; @@ -422,7 +422,7 @@ static void WINAPI VGA_DoSetMode(ULONG_PTR arg) } res = pDirectDrawCreate(NULL,&lpddraw,NULL); if (!lpddraw) { - ERR("DirectDraw is not available (res = %lx)\n",res); + ERR("DirectDraw is not available (res = 0x%x)\n",res); return; } if (!vga_hwnd) { @@ -439,33 +439,36 @@ static void WINAPI VGA_DoSetMode(ULONG_PTR arg) else SetWindowPos(vga_hwnd,0,0,0,par->Xres,par->Yres,SWP_NOMOVE|SWP_NOZORDER); - if ((res=IDirectDraw_SetCooperativeLevel(lpddraw,vga_hwnd,DDSCL_FULLSCREEN|DDSCL_EXCLUSIVE))) { - ERR("Could not set cooperative level to exclusive (%lx)\n",res); + res=IDirectDraw_SetCooperativeLevel(lpddraw,vga_hwnd,DDSCL_FULLSCREEN|DDSCL_EXCLUSIVE); + if (res != S_OK) { + ERR("Could not set cooperative level to exclusive (0x%x)\n",res); } - if ((res=IDirectDraw_SetDisplayMode(lpddraw,par->Xres,par->Yres,par->Depth))) { - ERR("DirectDraw does not support requested display mode (%dx%dx%d), res = %lx!\n",par->Xres,par->Yres,par->Depth,res); + res=IDirectDraw_SetDisplayMode(lpddraw,par->Xres,par->Yres,par->Depth); + if (res != S_OK) { + ERR("DirectDraw does not support requested display mode (%dx%dx%d), res = 0x%x!\n",par->Xres,par->Yres,par->Depth,res); IDirectDraw_Release(lpddraw); lpddraw=NULL; return; } res=IDirectDraw_CreatePalette(lpddraw,DDPCAPS_8BIT,NULL,&lpddpal,NULL); - if (res) { - ERR("Could not create palette (res = %lx)\n",res); + if (res != S_OK) { + ERR("Could not create palette (res = 0x%x)\n",res); IDirectDraw_Release(lpddraw); lpddraw=NULL; return; } if ((res=IDirectDrawPalette_SetEntries(lpddpal,0,0,256,vga_def_palette))) { - ERR("Could not set default palette entries (res = %lx)\n", res); + ERR("Could not set default palette entries (res = 0x%x)\n", res); } memset(&sdesc,0,sizeof(sdesc)); sdesc.dwSize=sizeof(sdesc); sdesc.dwFlags = DDSD_CAPS; sdesc.ddsCaps.dwCaps = DDSCAPS_PRIMARYSURFACE; - if (IDirectDraw_CreateSurface(lpddraw,&sdesc,&lpddsurf,NULL)||(!lpddsurf)) { + res=IDirectDraw_CreateSurface(lpddraw,&sdesc,&lpddsurf,NULL); + if (res != S_OK || !lpddsurf) { ERR("DirectDraw surface is not available\n"); IDirectDraw_Release(lpddraw); lpddraw=NULL; @@ -600,7 +603,7 @@ static LPSTR VGA_Lock(unsigned*Pitch,unsigned*Height,unsigned*Width,unsigned*Dep { if (!lpddraw) return NULL; if (!lpddsurf) return NULL; - if (IDirectDrawSurface_Lock(lpddsurf,NULL,&sdesc,0,0)) { + if (IDirectDrawSurface_Lock(lpddsurf,NULL,&sdesc,0,0) != S_OK) { ERR("could not lock surface!\n"); return NULL; }

1 0

Rob Shearman : usp10: Add explicit "!= S_OK" to expressions that use HRESULTs as booleans.
by Alexandre Julliard 15 Sep '08

15 Sep '08

Module: wine Branch: master Commit: 89a3ad7626140c946bc322fde512a999b35b3137 URL: http://source.winehq.org/git/wine.git/?a=commit;h=89a3ad7626140c946bc322fde… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Fri Sep 12 13:02:12 2008 +0100 usp10: Add explicit "!= S_OK" to expressions that use HRESULTs as booleans. --- dlls/usp10/usp10.c | 28 ++++++++++++++++++++-------- 1 files changed, 20 insertions(+), 8 deletions(-) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index 57e6611..28ba2bc 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -225,7 +225,8 @@ static HRESULT get_script_cache(const HDC hdc, SCRIPT_CACHE *psc) if (!hdc) return E_PENDING; if (!(sc = heap_alloc_zero(sizeof(ScriptCache)))) return E_OUTOFMEMORY; - if ((ret = init_script_cache(hdc, sc))) + ret = init_script_cache(hdc, sc); + if (ret != S_OK) { heap_free(sc); return ret; @@ -337,7 +338,10 @@ HRESULT WINAPI ScriptGetFontProperties(HDC hdc, SCRIPT_CACHE *psc, SCRIPT_FONTPR TRACE("%p,%p,%p\n", hdc, psc, sfp); if (!sfp) return E_INVALIDARG; - if ((hr = get_script_cache(hdc, psc))) return hr; + + hr = get_script_cache(hdc, psc); + if (hr != S_OK) + return hr; if (sfp->cBytes != sizeof(SCRIPT_FONTPROPERTIES)) return E_INVALIDARG; @@ -625,7 +629,7 @@ HRESULT WINAPI ScriptStringAnalyse(HDC hdc, const void *pString, int cString, hr = ScriptItemize(pString, cString, num_items, psControl, psState, analysis->pItem, &analysis->numItems); } - if (hr) goto error; + if (hr != S_OK) goto error; if ((analysis->logattrs = heap_alloc(sizeof(SCRIPT_LOGATTR) * cString))) ScriptBreak(pString, cString, (SCRIPT_STRING_ANALYSIS)analysis, analysis->logattrs); @@ -1248,7 +1252,9 @@ HRESULT WINAPI ScriptShape(HDC hdc, SCRIPT_CACHE *psc, const WCHAR *pwcChars, if (!psva || !pcGlyphs) return E_INVALIDARG; if (cChars > cMaxGlyphs) return E_OUTOFMEMORY; - if ((hr = get_script_cache(hdc, psc))) return hr; + + hr = get_script_cache(hdc, psc); + if (hr != S_OK) return hr; *pcGlyphs = cChars; @@ -1315,7 +1321,9 @@ HRESULT WINAPI ScriptPlace(HDC hdc, SCRIPT_CACHE *psc, const WORD *pwGlyphs, debugstr_wn(pwGlyphs, cGlyphs), cGlyphs, psva, psa, piAdvance); if (!psva) return E_INVALIDARG; - if ((hr = get_script_cache(hdc, psc))) return hr; + + hr = get_script_cache(hdc, psc); + if (hr != S_OK) return hr; hfont = select_cached_font(psc); @@ -1388,7 +1396,8 @@ HRESULT WINAPI ScriptGetCMap(HDC hdc, SCRIPT_CACHE *psc, const WCHAR *pwcInChars TRACE("(%p,%p,%s,%d,0x%x,%p)\n", hdc, psc, debugstr_wn(pwcInChars, cChars), cChars, dwFlags, pwOutGlyphs); - if ((hr = get_script_cache(hdc, psc))) return hr; + hr = get_script_cache(hdc, psc); + if (hr != S_OK) return hr; hfont = select_cached_font(psc); if (GetGlyphIndicesW(get_cache_hdc(psc), pwcInChars, cChars, pwOutGlyphs, 0) == GDI_ERROR) @@ -1447,7 +1456,9 @@ HRESULT WINAPI ScriptCacheGetHeight(HDC hdc, SCRIPT_CACHE *psc, LONG *height) TRACE("(%p, %p, %p)\n", hdc, psc, height); if (!height) return E_INVALIDARG; - if ((hr = get_script_cache(hdc, psc))) return hr; + + hr = get_script_cache(hdc, psc); + if (hr != S_OK) return hr; *height = get_cache_height(psc); return S_OK; @@ -1475,7 +1486,8 @@ HRESULT WINAPI ScriptGetGlyphABCWidth(HDC hdc, SCRIPT_CACHE *psc, WORD glyph, AB TRACE("(%p, %p, 0x%04x, %p)\n", hdc, psc, glyph, abc); - if ((hr = get_script_cache(hdc, psc))) return hr; + hr = get_script_cache(hdc, psc); + if (hr != S_OK) return hr; hfont = select_cached_font(psc); if (!GetCharABCWidthsI(get_cache_hdc(psc), 0, 1, &glyph, abc)) hr = E_HANDLE;

1 0

Rob Shearman : urlmon: Add explicit "!= S_OK" to expressions that use HRESULTs as booleans.
by Alexandre Julliard 15 Sep '08

15 Sep '08

Module: wine Branch: master Commit: d5614bfff4a6d149b45cefc68a92babd3598bae1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d5614bfff4a6d149b45cefc68… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Fri Sep 12 13:02:02 2008 +0100 urlmon: Add explicit "!= S_OK" to expressions that use HRESULTs as booleans. --- dlls/urlmon/umstream.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/urlmon/umstream.c b/dlls/urlmon/umstream.c index 7523781..48cc769 100644 --- a/dlls/urlmon/umstream.c +++ b/dlls/urlmon/umstream.c @@ -61,11 +61,11 @@ HRESULT UMCreateStreamOnCacheFile(LPCWSTR pszURL, if(!CreateUrlCacheEntryW(url, dwSize, ext, pszFileName, 0)) hr = HRESULT_FROM_WIN32(GetLastError()); else - hr = 0; + hr = S_OK; heap_free(url); - if (hr) + if (hr != S_OK) return hr; TRACE("Opening %s\n", debugstr_w(pszFileName) );

1 0

Rob Shearman : avifil32: Add explicit "!= S_OK" to expressions that use HRESULTs as booleans.
by Alexandre Julliard 15 Sep '08

15 Sep '08

Module: wine Branch: master Commit: 7496db0fa83fb313e8a0f54a3c9110586af12094 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7496db0fa83fb313e8a0f54a3… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Fri Sep 12 13:01:37 2008 +0100 avifil32: Add explicit "!= S_OK" to expressions that use HRESULTs as booleans. --- dlls/avifil32/editstream.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/avifil32/editstream.c b/dlls/avifil32/editstream.c index e69d036..de6f2e9 100644 --- a/dlls/avifil32/editstream.c +++ b/dlls/avifil32/editstream.c @@ -261,7 +261,7 @@ static LPVOID AVIFILE_ReadFrame(IAVIEditStreamImpl* const This, if (pg == NULL) return NULL; if (This->pg != NULL) { - if (IGetFrame_SetFormat(pg, This->lpFrame, NULL, 0, 0, -1, -1)) { + if (IGetFrame_SetFormat(pg, This->lpFrame, NULL, 0, 0, -1, -1) != S_OK) { AVIStreamGetFrameClose(pg); ERR(": IGetFrame_SetFormat failed\n"); return NULL; @@ -896,7 +896,7 @@ static LONG WINAPI IEditAVIStream_fnFindSample(IAVIStream*iface,LONG pos, /* map our position to a stream and position in it */ if (AVIFILE_FindStreamInTable(This, pos, &stream, &streamPos, - &streamNr, TRUE)) + &streamNr, TRUE) != S_OK) return -1; /* doesn't exist */ if (This->bDecompress) {

1 0