December 2015 - Wine-commits

André Hentschel : winmm: Respect return value from joyGetPos (Coverity).
by Alexandre Julliard 24 Dec '15

24 Dec '15

Module: wine Branch: master Commit: 64f600fe2266f964c912eb4d08a6fc1247a47eb1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=64f600fe2266f964c912eb4d0… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Dec 22 23:18:52 2015 +0100 winmm: Respect return value from joyGetPos (Coverity). Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winmm/joystick.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/winmm/joystick.c b/dlls/winmm/joystick.c index 6ac67f4..8a52942 100644 --- a/dlls/winmm/joystick.c +++ b/dlls/winmm/joystick.c @@ -84,6 +84,7 @@ static void CALLBACK JOY_Timer(HWND hWnd, UINT wMsg, UINT_PTR wTimer, DWORD dwTi { int i; WINE_JOYSTICK* joy; + MMRESULT res; JOYINFO ji; LONG pos; unsigned buttonChange; @@ -93,7 +94,12 @@ static void CALLBACK JOY_Timer(HWND hWnd, UINT wMsg, UINT_PTR wTimer, DWORD dwTi if (joy->hCapture != hWnd) continue; - joyGetPos(i, &ji); + res = joyGetPos(i, &ji); + if (res != JOYERR_NOERROR) { + WARN("joyGetPos failed: %08x\n", res); + continue; + } + pos = MAKELONG(ji.wXpos, ji.wYpos); if (!joy->bChanged ||

1 0

André Hentschel : wininet: Return the correct error code (Clang).
by Alexandre Julliard 24 Dec '15

24 Dec '15

Module: wine Branch: master Commit: f3e3c895c7bed704796c9d500ff98b428ddd58c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f3e3c895c7bed704796c9d500… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Dec 22 22:00:36 2015 +0100 wininet: Return the correct error code (Clang). Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/cookie.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wininet/cookie.c b/dlls/wininet/cookie.c index 4784b33..36346d5 100644 --- a/dlls/wininet/cookie.c +++ b/dlls/wininet/cookie.c @@ -720,7 +720,7 @@ DWORD get_cookie_header(const WCHAR *host, const WCHAR *path, WCHAR **ret) } LeaveCriticalSection(&cookie_cs); - return ERROR_SUCCESS; + return res; } /***********************************************************************

1 0

André Hentschel : winmm: Remove a dead assignment ( Clang).
by Alexandre Julliard 22 Dec '15

22 Dec '15

Module: wine Branch: master Commit: 798fd5bf2715ec881fb8563aa22bf7dc765e2150 URL: http://source.winehq.org/git/wine.git/?a=commit;h=798fd5bf2715ec881fb8563aa… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Dec 22 19:29:29 2015 +0100 winmm: Remove a dead assignment (Clang). Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winmm/mmio.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/winmm/mmio.c b/dlls/winmm/mmio.c index bc69f9e..d8af787 100644 --- a/dlls/winmm/mmio.c +++ b/dlls/winmm/mmio.c @@ -814,7 +814,6 @@ LONG WINAPI mmioWrite(HMMIO hmmio, HPCSTR pch, LONG cch) if (wm->info.cchBuffer) { LONG bytesW = 0; - count = 0; while (cch) { if (wm->info.pchNext != wm->info.pchEndWrite) { count = wm->info.pchEndWrite - wm->info.pchNext;

1 0

André Hentschel : shell32: Minor cleanup of SHELL_execute (Clang).
by Alexandre Julliard 22 Dec '15

22 Dec '15

Module: wine Branch: master Commit: 2cff59ed5cc4ce1e76577e8e16398b75aacd7fb2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2cff59ed5cc4ce1e76577e8e1… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Dec 22 19:30:57 2015 +0100 shell32: Minor cleanup of SHELL_execute (Clang). Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shlexec.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/dlls/shell32/shlexec.c b/dlls/shell32/shlexec.c index ba83a57..5fcbe03 100644 --- a/dlls/shell32/shlexec.c +++ b/dlls/shell32/shlexec.c @@ -1565,7 +1565,6 @@ static BOOL SHELL_execute( LPSHELLEXECUTEINFOW sei, SHELL_ExecuteW32 execfunc ) WCHAR *wszApplicationName, *wszParameters, *wszDir, *wcmd; DWORD dwApplicationNameLen = MAX_PATH+2; DWORD parametersLen = sizeof(parametersBuffer) / sizeof(WCHAR); - DWORD dirLen = sizeof(dirBuffer) / sizeof(WCHAR); DWORD wcmdLen = sizeof(wcmdBuffer) / sizeof(WCHAR); DWORD len; SHELLEXECUTEINFOW sei_tmp; /* modifiable copy of SHELLEXECUTEINFO struct */ @@ -1625,11 +1624,8 @@ static BOOL SHELL_execute( LPSHELLEXECUTEINFOW sei, SHELL_ExecuteW32 execfunc ) if (sei_tmp.lpDirectory) { len = lstrlenW(sei_tmp.lpDirectory) + 1; - if (len > dirLen) - { + if (len > sizeof(dirBuffer) / sizeof(WCHAR)) wszDir = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); - dirLen = len; - } strcpyW(wszDir, sei_tmp.lpDirectory); } else

1 0

André Hentschel : xaudio2_7: Check return of IAudioClient_Start (Coverity).
by Alexandre Julliard 22 Dec '15

22 Dec '15

Module: wine Branch: master Commit: 35eebeef0fe0b3f03f44731f805c447b2342acfd URL: http://source.winehq.org/git/wine.git/?a=commit;h=35eebeef0fe0b3f03f44731f8… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Dec 22 19:34:57 2015 +0100 xaudio2_7: Check return of IAudioClient_Start (Coverity). Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xaudio2_7/xaudio_dll.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/xaudio2_7/xaudio_dll.c b/dlls/xaudio2_7/xaudio_dll.c index 04f975c..e7176b2 100644 --- a/dlls/xaudio2_7/xaudio_dll.c +++ b/dlls/xaudio2_7/xaudio_dll.c @@ -1689,7 +1689,13 @@ static HRESULT WINAPI IXAudio2Impl_CreateMasteringVoice(IXAudio2 *iface, goto exit; } - IAudioClient_Start(This->aclient); + hr = IAudioClient_Start(This->aclient); + if (FAILED(hr)) + { + WARN("Start(IAudioClient) failed: %08x\n", hr); + hr = COMPAT_E_DEVICE_INVALIDATED(This->version); + goto exit; + } if(This->version <= 20) *ppMasteringVoice = (IXAudio2MasteringVoice*)&This->IXAudio20MasteringVoice_iface;

1 0

Nikolay Sivov : comdlg32/fontdlg: Allow font sizes outside of defaults set.
by Alexandre Julliard 22 Dec '15

22 Dec '15

Module: wine Branch: master Commit: daaa083404a48acd55d1499d0ef6f024fd9a373d URL: http://source.winehq.org/git/wine.git/?a=commit;h=daaa083404a48acd55d1499d0… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Dec 22 01:19:31 2015 +0300 comdlg32/fontdlg: Allow font sizes outside of defaults set. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comdlg32/cdlg.h | 1 + dlls/comdlg32/comdlg32.rc | 1 + dlls/comdlg32/fontdlg.c | 75 ++++++++++++---- po/ar.po | 222 +++++++++++++++++++++++----------------------- po/bg.po | 222 +++++++++++++++++++++++----------------------- po/ca.po | 222 +++++++++++++++++++++++----------------------- po/cs.po | 222 +++++++++++++++++++++++----------------------- po/da.po | 222 +++++++++++++++++++++++----------------------- po/de.po | 222 +++++++++++++++++++++++----------------------- po/el.po | 222 +++++++++++++++++++++++----------------------- po/en.po | 222 +++++++++++++++++++++++----------------------- po/en_US.po | 222 +++++++++++++++++++++++----------------------- po/eo.po | 222 +++++++++++++++++++++++----------------------- po/es.po | 222 +++++++++++++++++++++++----------------------- po/fa.po | 222 +++++++++++++++++++++++----------------------- po/fi.po | 222 +++++++++++++++++++++++----------------------- po/fr.po | 222 +++++++++++++++++++++++----------------------- po/he.po | 222 +++++++++++++++++++++++----------------------- po/hi.po | 222 +++++++++++++++++++++++----------------------- po/hr.po | 222 +++++++++++++++++++++++----------------------- po/hu.po | 222 +++++++++++++++++++++++----------------------- po/it.po | 222 +++++++++++++++++++++++----------------------- po/ja.po | 222 +++++++++++++++++++++++----------------------- po/ko.po | 222 +++++++++++++++++++++++----------------------- po/lt.po | 222 +++++++++++++++++++++++----------------------- po/ml.po | 222 +++++++++++++++++++++++----------------------- po/nb_NO.po | 222 +++++++++++++++++++++++----------------------- po/nl.po | 222 +++++++++++++++++++++++----------------------- po/or.po | 222 +++++++++++++++++++++++----------------------- po/pa.po | 222 +++++++++++++++++++++++----------------------- po/pl.po | 222 +++++++++++++++++++++++----------------------- po/pt_BR.po | 222 +++++++++++++++++++++++----------------------- po/pt_PT.po | 222 +++++++++++++++++++++++----------------------- po/rm.po | 222 +++++++++++++++++++++++----------------------- po/ro.po | 222 +++++++++++++++++++++++----------------------- po/ru.po | 222 +++++++++++++++++++++++----------------------- po/sk.po | 222 +++++++++++++++++++++++----------------------- po/sl.po | 222 +++++++++++++++++++++++----------------------- po/sr_RS(a)cyrillic.po | 222 +++++++++++++++++++++++----------------------- po/sr_RS(a)latin.po | 222 +++++++++++++++++++++++----------------------- po/sv.po | 222 +++++++++++++++++++++++----------------------- po/te.po | 222 +++++++++++++++++++++++----------------------- po/th.po | 222 +++++++++++++++++++++++----------------------- po/tr.po | 222 +++++++++++++++++++++++----------------------- po/uk.po | 222 +++++++++++++++++++++++----------------------- po/wa.po | 222 +++++++++++++++++++++++----------------------- po/wine.pot | 222 +++++++++++++++++++++++----------------------- po/zh_CN.po | 222 +++++++++++++++++++++++----------------------- po/zh_TW.po | 222 +++++++++++++++++++++++----------------------- 49 files changed, 5259 insertions(+), 5030 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=daaa083404a48acd55d14…

1 0

Nikolay Sivov : comdlg32/fontdlg: Fix string format for sizes added to listbox.
by Alexandre Julliard 22 Dec '15

22 Dec '15

Module: wine Branch: master Commit: 9f5260300d382d9112409a3103cf351a5d72ad5d URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f5260300d382d9112409a310… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Dec 22 01:19:32 2015 +0300 comdlg32/fontdlg: Fix string format for sizes added to listbox. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comdlg32/fontdlg.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/comdlg32/fontdlg.c b/dlls/comdlg32/fontdlg.c index 245f150..37c82db 100644 --- a/dlls/comdlg32/fontdlg.c +++ b/dlls/comdlg32/fontdlg.c @@ -51,6 +51,7 @@ static const WCHAR strWineFontData[] = {'_','_','W','I','N','E','_','F','O','N', static const WCHAR strWineFontData_a[] = {'_','_','W','I','N','E','_','F','O','N','T','D','L','G','D','A','T','A','_','A',0}; static const WCHAR chooseFontW[] = {'C','H','O','O','S','E','_','F','O','N','T',0}; +static const WCHAR fontsizefmtW[] = {'%','d',0}; /* image list with TrueType bitmaps and more */ static HIMAGELIST himlTT = 0; @@ -417,16 +418,15 @@ static BOOL AddFontSizeToCombo3(HWND hwnd, UINT h, const CHOOSEFONTW *lpcf) { int j; WCHAR buffer[20]; - static const WCHAR strFormat[] = {'%','2','d',0}; if ( (!(lpcf->Flags & CF_LIMITSIZE)) || ((lpcf->Flags & CF_LIMITSIZE) && (h >= lpcf->nSizeMin) && (h <= lpcf->nSizeMax))) { - wsprintfW(buffer, strFormat, h); + sprintfW(buffer, fontsizefmtW, h); j=SendMessageW(hwnd, CB_FINDSTRINGEXACT, -1, (LPARAM)buffer); if (j==CB_ERR) { - j=SendMessageW(hwnd, CB_ADDSTRING, 0, (LPARAM)buffer); + j=SendMessageW(hwnd, CB_INSERTSTRING, -1, (LPARAM)buffer); if (j!=CB_ERR) j = SendMessageW(hwnd, CB_SETITEMDATA, j, h); if (j==CB_ERR) return TRUE; } @@ -534,7 +534,6 @@ static INT AddFontStyle( const ENUMLOGFONTEXW *lpElfex, const NEWTEXTMETRICEXW * static void CFn_FitFontSize( HWND hDlg, int points) { - static const WCHAR fmtW[] = {'%','d',0}; WCHAR buffW[16]; int i,n; @@ -554,7 +553,7 @@ static void CFn_FitFontSize( HWND hDlg, int points) } /* no default matching size, set text manually */ - sprintfW(buffW, fmtW, points); + sprintfW(buffW, fontsizefmtW, points); SetDlgItemTextW(hDlg, cmb3, buffW); }

1 0

Nikolay Sivov : comdlg32/fontdlg: Remove dead assignment (Coverity).
by Alexandre Julliard 22 Dec '15

22 Dec '15

Module: wine Branch: master Commit: 1a7121b3275fd549fd964dcfe4a8638cb5e03549 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a7121b3275fd549fd964dcfe… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Dec 22 01:19:33 2015 +0300 comdlg32/fontdlg: Remove dead assignment (Coverity). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comdlg32/fontdlg.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/comdlg32/fontdlg.c b/dlls/comdlg32/fontdlg.c index 37c82db..344a356 100644 --- a/dlls/comdlg32/fontdlg.c +++ b/dlls/comdlg32/fontdlg.c @@ -1011,7 +1011,7 @@ static LRESULT CFn_WMCommand(HWND hDlg, WPARAM wParam, LPARAM lParam, LPCHOOSEFO /* face name */ i=SendDlgItemMessageW(hDlg,cmb1,CB_GETCURSEL,0,0); if (i==CB_ERR) - i=GetDlgItemTextW( hDlg, cmb1, str, 256 ); + GetDlgItemTextW( hDlg, cmb1, str, sizeof(str)/sizeof(str[0]) ); else { SendDlgItemMessageW(hDlg,cmb1,CB_GETLBTEXT,i,

1 0

Austin English : iexplore: Sync registry and program resource values.
by Alexandre Julliard 22 Dec '15

22 Dec '15

Module: wine Branch: master Commit: bda46cc6fd5fa0f3c9db947108b685533662037a URL: http://source.winehq.org/git/wine.git/?a=commit;h=bda46cc6fd5fa0f3c9db94710… Author: Austin English <austinenglish(a)gmail.com> Date: Tue Dec 8 17:05:28 2015 -0600 iexplore: Sync registry and program resource values. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/iexplore/iexplore.rc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/programs/iexplore/iexplore.rc b/programs/iexplore/iexplore.rc index cd75781..3d6d50f 100644 --- a/programs/iexplore/iexplore.rc +++ b/programs/iexplore/iexplore.rc @@ -18,10 +18,10 @@ #define WINE_FILEDESCRIPTION_STR "Wine Internet Explorer" #define WINE_FILENAME_STR "iexplore.exe" -#define WINE_FILEVERSION 6,0,2900,2180 -#define WINE_FILEVERSION_STR "6.0.2900.2180" -#define WINE_PRODUCTVERSION 6,0,2900,2180 -#define WINE_PRODUCTVERSION_STR "6.0.2900.2180" +#define WINE_FILEVERSION 9,0,8112,16421 +#define WINE_FILEVERSION_STR "9.0.8112.16421" +#define WINE_PRODUCTVERSION 9,0,8112,16421 +#define WINE_PRODUCTVERSION_STR "9.0.8112.16421" #define WINE_EXTRAVALUES VALUE "OLESelfRegister","" #include "wine/wine_common_ver.rc"

1 0

Austin English : setupx.dll16: Add DiBuildDriverIndex stub.
by Alexandre Julliard 22 Dec '15

22 Dec '15

Module: wine Branch: master Commit: 296ac8cf320336353fc5f5da3897c808a65556e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=296ac8cf320336353fc5f5da3… Author: Austin English <austinenglish(a)gmail.com> Date: Tue Dec 15 11:48:35 2015 -0600 setupx.dll16: Add DiBuildDriverIndex stub. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupx.dll16/setupx.dll16.spec | 2 +- dlls/setupx.dll16/setupx_main.c | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/setupx.dll16/setupx.dll16.spec b/dlls/setupx.dll16/setupx.dll16.spec index 615e92f..34e6b68 100644 --- a/dlls/setupx.dll16/setupx.dll16.spec +++ b/dlls/setupx.dll16/setupx.dll16.spec @@ -205,7 +205,7 @@ 409 stub IPGETDRIVERVERSION 410 stub IpGetVersionString #(str str ptr word str) 411 pascal VcpExplain(ptr long) VcpExplain16 -412 stub DiBuildDriverIndex #(word) +412 pascal DiBuildDriverIndex(word) DiBuildDriverIndex16 413 stub DiAddSingleInfToDrvIdx #(str word word) 414 stub FCEGETFLAGS 450 stub UiMakeDlgNonBold #(word) diff --git a/dlls/setupx.dll16/setupx_main.c b/dlls/setupx.dll16/setupx_main.c index adc5900..db15cfe 100644 --- a/dlls/setupx.dll16/setupx_main.c +++ b/dlls/setupx.dll16/setupx_main.c @@ -628,3 +628,12 @@ RETERR16 WINAPI CtlSetLddPath16(LOGDISKID16 ldid, LPSTR szPath) ldd.pszPath = szPath; return CtlSetLdd16(&ldd); } + +/*********************************************************************** + * DiBuildDriverIndex (SETUPX.412) + */ +RETERR16 WINAPI DiBuildDriverIndex16( WORD w1 ) +{ + FIXME( "%x: stub\n", w1 ); + return 0; +}

1 0