February 2015 - Wine-Commits

Michael Stefaniuc : rsaenh: Remove an always false conditional subexpression (PVS-Studio).
by Alexandre Julliard Feb. 23, 2015

Feb. 23, 2015

Module: wine Branch: master Commit: 17e565dbf91c3de8570d1581790aeb85aec5a971 URL: http://source.winehq.org/git/wine.git/?a=commit;h=17e565dbf91c3de8570d15817… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sat Feb 21 18:22:26 2015 +0100 rsaenh: Remove an always false conditional subexpression (PVS-Studio). --- dlls/rsaenh/mpi.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/rsaenh/mpi.c b/dlls/rsaenh/mpi.c index e964676..f75d89f 100644 --- a/dlls/rsaenh/mpi.c +++ b/dlls/rsaenh/mpi.c @@ -1955,8 +1955,8 @@ int mp_exptmod (const mp_int * G, const mp_int * X, mp_int * P, mp_int * Y) dr = 0; - /* if the modulus is odd or dr != 0 use the fast method */ - if (mp_isodd (P) == 1 || dr != 0) { + /* if the modulus is odd use the fast method */ + if (mp_isodd (P) == 1) { return mp_exptmod_fast (G, X, P, Y, dr); } else { /* otherwise use the generic Barrett reduction technique */

1 0

Michael Stefaniuc : d3d8/tests: Test the return value of CreateVolumeTexture (PVS-Studio).
by Alexandre Julliard Feb. 23, 2015

Feb. 23, 2015

Module: wine Branch: master Commit: dd2dbde6256e16792ff93307dd446cfd21969fe4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dd2dbde6256e16792ff93307d… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sat Feb 21 18:26:14 2015 +0100 d3d8/tests: Test the return value of CreateVolumeTexture (PVS-Studio). --- dlls/d3d8/tests/device.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index b75513e..e06b1a3 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -6125,6 +6125,7 @@ static void test_volume_blocks(void) hr = IDirect3DDevice8_CreateVolumeTexture(device, formats[i].block_width, formats[i].block_height, 2, 2, 0, formats[i].fmt, D3DPOOL_SCRATCH, &texture); + ok(SUCCEEDED(hr), "CreateVolumeTexture failed, hr %#x.\n", hr); hr = IDirect3DVolumeTexture8_LockBox(texture, 1, &locked_box, NULL, 0); ok(SUCCEEDED(hr), "Failed to lock volume texture mipmap, hr %#x.\n", hr); hr = IDirect3DVolumeTexture8_UnlockBox(texture, 1); @@ -6727,6 +6728,7 @@ static void test_resource_type(void) { hr = IDirect3DDevice8_CreateVolumeTexture(device, 2, 4, 8, 4, 0, D3DFMT_X8R8G8B8, D3DPOOL_SYSTEMMEM, &volume_texture); + ok(SUCCEEDED(hr), "CreateVolumeTexture failed, hr %#x.\n", hr); type = IDirect3DVolumeTexture8_GetType(volume_texture); ok(type == D3DRTYPE_VOLUMETEXTURE, "Expected type D3DRTYPE_VOLUMETEXTURE, got %u.\n", type);

1 0

Piotr Caban : winmm: Write user data after headers in mmioAdvance so IDiskOffset is updated correctly.
by Alexandre Julliard Feb. 23, 2015

Feb. 23, 2015

Module: wine Branch: master Commit: 193663e8d848358ac2a5996b95e9333e85345300 URL: http://source.winehq.org/git/wine.git/?a=commit;h=193663e8d848358ac2a5996b9… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Feb 20 15:41:03 2015 +0100 winmm: Write user data after headers in mmioAdvance so IDiskOffset is updated correctly. --- dlls/winmm/mmio.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winmm/mmio.c b/dlls/winmm/mmio.c index f2a04cf..16532bf 100644 --- a/dlls/winmm/mmio.c +++ b/dlls/winmm/mmio.c @@ -1023,6 +1023,8 @@ MMRESULT WINAPI mmioAdvance(HMMIO hmmio, MMIOINFO* lpmmioinfo, UINT uFlags) if (uFlags != MMIO_READ && uFlags != MMIO_WRITE) return MMSYSERR_INVALPARAM; + if (MMIO_Flush(wm, 0) != MMSYSERR_NOERROR) + return MMIOERR_CANNOTWRITE; if (uFlags == MMIO_WRITE && (lpmmioinfo->dwFlags & MMIO_DIRTY)) { send_message(wm->ioProc, &wm->info, MMIOM_SEEK, lpmmioinfo->lBufOffset, SEEK_SET, FALSE); @@ -1030,8 +1032,6 @@ MMRESULT WINAPI mmioAdvance(HMMIO hmmio, MMIOINFO* lpmmioinfo, UINT uFlags) lpmmioinfo->pchNext - lpmmioinfo->pchBuffer, FALSE); lpmmioinfo->dwFlags &= ~MMIO_DIRTY; } - if (MMIO_Flush(wm, 0) != MMSYSERR_NOERROR) - return MMIOERR_CANNOTWRITE; if (lpmmioinfo && lpmmioinfo->fccIOProc == FOURCC_DOS) { wm->dwFileSize = max(wm->dwFileSize, lpmmioinfo->lBufOffset +

1 0

Piotr Caban : winmm: Save data that was not yet written in mmioSetInfo.
by Alexandre Julliard Feb. 23, 2015

Feb. 23, 2015

Module: wine Branch: master Commit: 860618622e6d397f270005802557b758256970fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=860618622e6d397f270005802… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Feb 20 15:42:07 2015 +0100 winmm: Save data that was not yet written in mmioSetInfo. --- dlls/winmm/mmio.c | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/dlls/winmm/mmio.c b/dlls/winmm/mmio.c index 16532bf..ad73564 100644 --- a/dlls/winmm/mmio.c +++ b/dlls/winmm/mmio.c @@ -949,25 +949,23 @@ MMRESULT WINAPI mmioGetInfo(HMMIO hmmio, MMIOINFO* lpmmioinfo, UINT uFlags) */ MMRESULT WINAPI mmioSetInfo(HMMIO hmmio, const MMIOINFO* lpmmioinfo, UINT uFlags) { - LPWINE_MMIO wm; + LPWINE_MMIO wm; TRACE("(%p,%p,0x%08x)\n",hmmio,lpmmioinfo,uFlags); if ((wm = MMIO_Get(hmmio)) == NULL) - return MMSYSERR_INVALHANDLE; + return MMSYSERR_INVALHANDLE; /* check pointers coherence */ if (lpmmioinfo->pchNext < wm->info.pchBuffer || - lpmmioinfo->pchNext > wm->info.pchBuffer + wm->info.cchBuffer || - lpmmioinfo->pchEndRead < wm->info.pchBuffer || - lpmmioinfo->pchEndRead > wm->info.pchBuffer + wm->info.cchBuffer || - lpmmioinfo->pchEndWrite < wm->info.pchBuffer || - lpmmioinfo->pchEndWrite > wm->info.pchBuffer + wm->info.cchBuffer) - return MMSYSERR_INVALPARAM; - - wm->info.pchNext = lpmmioinfo->pchNext; - wm->info.pchEndRead = lpmmioinfo->pchEndRead; - + lpmmioinfo->pchNext > wm->info.pchBuffer + wm->info.cchBuffer || + lpmmioinfo->pchEndRead < wm->info.pchBuffer || + lpmmioinfo->pchEndRead > wm->info.pchBuffer + wm->info.cchBuffer || + lpmmioinfo->pchEndWrite < wm->info.pchBuffer || + lpmmioinfo->pchEndWrite > wm->info.pchBuffer + wm->info.cchBuffer) + return MMSYSERR_INVALPARAM; + + wm->info = *lpmmioinfo; return MMSYSERR_NOERROR; }

1 0

Nikolay Sivov : dwrite/tests: Test default colors of render target memory HDC.
by Alexandre Julliard Feb. 23, 2015

Feb. 23, 2015

Module: wine Branch: master Commit: eb2a4ec5f4c39f90c4febc6d5cac0046017c9b3f URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb2a4ec5f4c39f90c4febc6d5… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Feb 20 13:50:22 2015 +0300 dwrite/tests: Test default colors of render target memory HDC. --- dlls/dwrite/tests/font.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index 95ba5aa..532f8df 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -632,6 +632,7 @@ static void test_CreateBitmapRenderTarget(void) HBITMAP hbm, hbm2; DWRITE_MATRIX m; DIBSECTION ds; + COLORREF c; HRESULT hr; FLOAT pdip; SIZE size; @@ -689,6 +690,14 @@ if (0) /* crashes on native */ hdc = IDWriteBitmapRenderTarget_GetMemoryDC(target); ok(hdc != NULL, "got %p\n", hdc); + /* test context settings */ + c = GetTextColor(hdc); + ok(c == RGB(0, 0, 0), "got 0x%08x\n", c); + ret = GetBkMode(hdc); + ok(ret == OPAQUE, "got %d\n", ret); + c = GetBkColor(hdc); + ok(c == RGB(255, 255, 255), "got 0x%08x\n", c); + hbm = GetCurrentObject(hdc, OBJ_BITMAP); ok(hbm != NULL, "got %p\n", hbm);

1 0

Michael Stefaniuc : wcmd: Remove an unused variable (PVS-Studio).
by Alexandre Julliard Feb. 23, 2015

Feb. 23, 2015

Module: wine Branch: master Commit: b7c8b62bbf632fe26db0a19bfe40cb51ac69d0f2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b7c8b62bbf632fe26db0a19bf… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sat Feb 21 18:23:01 2015 +0100 wcmd: Remove an unused variable (PVS-Studio). --- programs/cmd/wcmdmain.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index e5865e6..bc9b216 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -1046,7 +1046,6 @@ void WCMD_run_program (WCHAR *command, BOOL called) WCHAR pathext[MAXSTRING]; WCHAR *firstParam; BOOL extensionsupplied = FALSE; - BOOL launched = FALSE; BOOL status; DWORD len; static const WCHAR envPath[] = {'P','A','T','H','\0'}; @@ -1098,8 +1097,7 @@ void WCMD_run_program (WCHAR *command, BOOL called) pathposn = pathtosearch; WINE_TRACE("Searching in '%s' for '%s'\n", wine_dbgstr_w(pathtosearch), wine_dbgstr_w(stemofsearch)); - while (!launched && pathposn) { - + while (pathposn) { WCHAR thisDir[MAX_PATH] = {'\0'}; WCHAR *pos = NULL; BOOL found = FALSE;

1 0

Michael Stefaniuc : oleaut32/tests: Remove an always true conditional subexpression (PVS-Studio).
by Alexandre Julliard Feb. 23, 2015

Feb. 23, 2015

Module: wine Branch: master Commit: 724ee1d4fcf5807c490e60c2a99926de6a2ce34c URL: http://source.winehq.org/git/wine.git/?a=commit;h=724ee1d4fcf5807c490e60c2a… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sat Feb 21 18:06:16 2015 +0100 oleaut32/tests: Remove an always true conditional subexpression (PVS-Studio). --- dlls/oleaut32/tests/vartest.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/oleaut32/tests/vartest.c b/dlls/oleaut32/tests/vartest.c index 7ed4fd4..cf9e101 100644 --- a/dlls/oleaut32/tests/vartest.c +++ b/dlls/oleaut32/tests/vartest.c @@ -7548,7 +7548,7 @@ static void test_VarDiv(void) } /* Determine return type */ - if (!(rightvt == VT_EMPTY)) + if (rightvt != VT_EMPTY) { if (leftvt == VT_NULL || rightvt == VT_NULL) resvt = VT_NULL; @@ -7577,7 +7577,7 @@ static void test_VarDiv(void) else if (leftvt == VT_R4 || rightvt == VT_R4) resvt = VT_R4; } - else if (leftvt == VT_NULL && rightvt == VT_EMPTY) + else if (leftvt == VT_NULL) resvt = VT_NULL; else bFail = TRUE;

1 0

André Hentschel : oleaut32: Remove unused macros.
by Alexandre Julliard Feb. 23, 2015

Feb. 23, 2015

Module: wine Branch: master Commit: bedd444a3616fea54a060e07c27a137f29052fc9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bedd444a3616fea54a060e07c… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat Feb 21 14:58:35 2015 +0100 oleaut32: Remove unused macros. --- dlls/oleaut32/varformat.c | 2 -- dlls/oleaut32/vartype.c | 2 -- 2 files changed, 4 deletions(-) diff --git a/dlls/oleaut32/varformat.c b/dlls/oleaut32/varformat.c index ec52a1e..27bedce 100644 --- a/dlls/oleaut32/varformat.c +++ b/dlls/oleaut32/varformat.c @@ -284,8 +284,6 @@ typedef struct tagFMT_DATE_HEADER #define FMT_NUM_ON_OFF 0x3F /* Convert to "On" or "Off" */ #define FMT_STR_COPY_SPACE 0x40 /* Copy len chars with space if no char */ #define FMT_STR_COPY_SKIP 0x41 /* Copy len chars or skip if no char */ -/* Wine additions */ -#define FMT_WINE_HOURS_12 0x81 /* Hours using 12 hour clock */ /* Named Formats and their tokenised values */ static const WCHAR szGeneralDate[] = { 'G','e','n','e','r','a','l',' ','D','a','t','e','\0' }; diff --git a/dlls/oleaut32/vartype.c b/dlls/oleaut32/vartype.c index e9b45ff..607d1a2 100644 --- a/dlls/oleaut32/vartype.c +++ b/dlls/oleaut32/vartype.c @@ -4148,8 +4148,6 @@ HRESULT WINAPI VarDecFromI4(LONG lIn, DECIMAL* pDecOut) return S_OK; } -#define LOCALE_EN_US (MAKELCID(MAKELANGID(LANG_ENGLISH,SUBLANG_ENGLISH_US),SORT_DEFAULT)) - /* internal representation of the value stored in a DECIMAL. The bytes are stored from LSB at index 0 to MSB at index 11 */

1 0

Michael Stefaniuc : setupapi: RT_MANIFEST is already an int resource ( PVS-Studio).
by Alexandre Julliard Feb. 23, 2015

Feb. 23, 2015

Module: wine Branch: master Commit: d0dfa75ba4983ff594407d6415f5c822adb2c46f URL: http://source.winehq.org/git/wine.git/?a=commit;h=d0dfa75ba4983ff594407d641… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sat Feb 21 18:01:52 2015 +0100 setupapi: RT_MANIFEST is already an int resource (PVS-Studio). --- dlls/setupapi/fakedll.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/setupapi/fakedll.c b/dlls/setupapi/fakedll.c index 8e3dffb..b543ade 100644 --- a/dlls/setupapi/fakedll.c +++ b/dlls/setupapi/fakedll.c @@ -791,7 +791,7 @@ static void register_fake_dll( const WCHAR *name, const void *data, size_t size HMODULE module = (HMODULE)((ULONG_PTR)data | 1); HRSRC rsrc; - if ((rsrc = FindResourceW( module, manifestW, MAKEINTRESOURCEW(RT_MANIFEST) ))) + if ((rsrc = FindResourceW( module, manifestW, (LPWSTR)RT_MANIFEST ))) { char *manifest = LoadResource( module, rsrc ); register_manifest( name, manifest, SizeofResource( module, rsrc ), data, size );

1 0

Vincent Povirk : xmllite: Fix reader_cmp for multiple characters.
by Alexandre Julliard Feb. 23, 2015

Feb. 23, 2015

Module: wine Branch: master Commit: 8615365945d631df5a3983528963bb2c7a05ff33 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8615365945d631df5a3983528… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Feb 20 12:54:32 2015 -0600 xmllite: Fix reader_cmp for multiple characters. --- dlls/xmllite/reader.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index cf89fb7..2aa9d95 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -900,8 +900,20 @@ static inline WCHAR *reader_get_ptr(xmlreader *reader) static int reader_cmp(xmlreader *reader, const WCHAR *str) { + int i=0; const WCHAR *ptr = reader_get_ptr(reader); - return strncmpW(str, ptr, strlenW(str)); + while (str[i]) + { + if (!ptr[i]) + { + reader_more(reader); + ptr = reader_get_ptr(reader); + } + if (str[i] != ptr[i]) + return ptr[i] - str[i]; + i++; + } + return 0; } /* moves cursor n WCHARs forward */

1 0