October 2015 - Wine-Commits

Nikolay Sivov : shell32: Properly handle SHGetPathFromIDListW failure ( PVS-Studio).
by Alexandre Julliard Oct. 20, 2015

Oct. 20, 2015

Module: wine Branch: master Commit: 186bed3d168089b00c794ab5c32e808e15b6b742 URL: http://source.winehq.org/git/wine.git/?a=commit;h=186bed3d168089b00c794ab5c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Oct 20 16:44:49 2015 +0300 shell32: Properly handle SHGetPathFromIDListW failure (PVS-Studio). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/brsfolder.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/brsfolder.c b/dlls/shell32/brsfolder.c index 1a2716e..4040407 100644 --- a/dlls/shell32/brsfolder.c +++ b/dlls/shell32/brsfolder.c @@ -757,9 +757,10 @@ static HRESULT BrsFolder_NewFolder(browse_info *info) if(FAILED(hr)) return hr; - hr = SHGetPathFromIDListW(info->pidlRet, name); - if(FAILED(hr)) + if(!SHGetPathFromIDListW(info->pidlRet, name)) { + hr = E_FAIL; goto cleanup; + } len = strlenW(name); if(len<MAX_PATH)

1 0

Nikolay Sivov : xmllite: Don't use HRESULT codes for BOOL retval ( PVS-Studio).
by Alexandre Julliard Oct. 20, 2015

Oct. 20, 2015

Module: wine Branch: master Commit: dc72103a1df686d40bd333d9f8e6b26f59884a5a URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc72103a1df686d40bd333d9f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Oct 20 15:59:30 2015 +0300 xmllite: Don't use HRESULT codes for BOOL retval (PVS-Studio). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xmllite/reader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index 525b4f7..8a078a4 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -2855,7 +2855,7 @@ static HRESULT WINAPI xmlreader_GetDepth(IXmlReader* iface, UINT *depth) static BOOL WINAPI xmlreader_IsEOF(IXmlReader* iface) { FIXME("(%p): stub\n", iface); - return E_NOTIMPL; + return FALSE; } static const struct IXmlReaderVtbl xmlreader_vtbl =

1 0

Nikolay Sivov : ole32/tests: Use BOOL variables for BOOL return type ( PVS-Studio).
by Alexandre Julliard Oct. 20, 2015

Oct. 20, 2015

Module: wine Branch: master Commit: 4afda020ae2185855bd296cce3083a10a3de6f17 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4afda020ae2185855bd296cce… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Oct 20 15:16:58 2015 +0300 ole32/tests: Use BOOL variables for BOOL return type (PVS-Studio). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/tests/storage32.c | 59 ++++++++++++++++++++++++++------------------ 1 file changed, 35 insertions(+), 24 deletions(-) diff --git a/dlls/ole32/tests/storage32.c b/dlls/ole32/tests/storage32.c index fe5ddbc..edd0b3f 100644 --- a/dlls/ole32/tests/storage32.c +++ b/dlls/ole32/tests/storage32.c @@ -513,6 +513,7 @@ static void test_storage_stream(void) ULARGE_INTEGER p; unsigned char buffer[0x100]; IUnknown *unk; + BOOL ret; DeleteFileA(filenameA); @@ -691,8 +692,8 @@ static void test_storage_stream(void) IStorage_Release(stg); } - r = DeleteFileA(filenameA); - ok(r, "file should exist\n"); + ret = DeleteFileA(filenameA); + ok(ret, "file should exist\n"); } static BOOL touch_file(LPCSTR filename) @@ -739,6 +740,7 @@ static void test_open_storage(void) IStorage *stg = NULL, *stg2 = NULL; HRESULT r; DWORD stgm; + BOOL ret; /* try opening a zero length file - it should stay zero length */ DeleteFileA(filenameA); @@ -898,8 +900,8 @@ static void test_open_storage(void) r = StgOpenStorage( filename, NULL, STGM_NOSNAPSHOT | STGM_PRIORITY, NULL, 0, &stg); ok(r == STG_E_INVALIDFLAG, "should fail\n"); - r = DeleteFileA(filenameA); - ok(r, "file didn't exist\n"); + ret = DeleteFileA(filenameA); + ok(ret, "file didn't exist\n"); } static void test_storage_suminfo(void) @@ -1397,6 +1399,7 @@ static void test_transact(void) static const WCHAR stmname2[] = { 'F','O','O',0 }; static const WCHAR stgname[] = { 'P','E','R','M','S','T','G',0 }; static const WCHAR stgname2[] = { 'T','E','M','P','S','T','G',0 }; + BOOL ret; DeleteFileA(filenameA); @@ -1517,8 +1520,8 @@ static void test_transact(void) IStorage_Release(stg); - r = DeleteFileA(filenameA); - ok( r == TRUE, "deleted file\n"); + ret = DeleteFileA(filenameA); + ok(ret, "deleted file\n"); } static void test_substorage_share(void) @@ -1529,6 +1532,7 @@ static void test_substorage_share(void) static const WCHAR stgname[] = { 'P','E','R','M','S','T','G',0 }; static const WCHAR stmname[] = { 'C','O','N','T','E','N','T','S',0 }; static const WCHAR othername[] = { 'N','E','W','N','A','M','E',0 }; + BOOL ret; DeleteFileA(filenameA); @@ -1608,8 +1612,8 @@ static void test_substorage_share(void) IStorage_Release(stg); - r = DeleteFileA(filenameA); - ok( r == TRUE, "deleted file\n"); + ret = DeleteFileA(filenameA); + ok(ret, "deleted file\n"); } static void test_revert(void) @@ -1622,6 +1626,7 @@ static void test_revert(void) static const WCHAR stgname[] = { 'P','E','R','M','S','T','G',0 }; static const WCHAR stgname2[] = { 'T','E','M','P','S','T','G',0 }; STATSTG statstg; + BOOL ret; DeleteFileA(filenameA); @@ -1739,8 +1744,8 @@ static void test_revert(void) IStorage_Release(stg); - r = DeleteFileA(filenameA); - ok( r == TRUE, "deleted file\n"); + ret = DeleteFileA(filenameA); + ok(ret, "deleted file\n"); /* Revert only invalidates objects in transacted mode */ r = StgCreateDocfile( filename, STGM_CREATE | STGM_SHARE_EXCLUSIVE | @@ -1759,8 +1764,8 @@ static void test_revert(void) IStream_Release(stm); IStorage_Release(stg); - r = DeleteFileA(filenameA); - ok( r == TRUE, "deleted file\n"); + ret = DeleteFileA(filenameA); + ok(ret, "deleted file\n"); } static void test_parent_free(void) @@ -1772,6 +1777,7 @@ static void test_parent_free(void) static const WCHAR stgname[] = { 'P','E','R','M','S','T','G',0 }; ULONG ref; STATSTG statstg; + BOOL ret; DeleteFileA(filenameA); @@ -1821,8 +1827,8 @@ static void test_parent_free(void) IStorage_Release(stg); - r = DeleteFileA(filenameA); - ok( r == TRUE, "deleted file\n"); + ret = DeleteFileA(filenameA); + ok(ret, "deleted file\n"); } static void test_nonroot_transacted(void) @@ -1833,6 +1839,7 @@ static void test_nonroot_transacted(void) static const WCHAR stgname[] = { 'P','E','R','M','S','T','G',0 }; static const WCHAR stmname[] = { 'C','O','N','T','E','N','T','S',0 }; static const WCHAR stmname2[] = { 'F','O','O',0 }; + BOOL ret; DeleteFileA(filenameA); @@ -1941,8 +1948,8 @@ static void test_nonroot_transacted(void) IStorage_Release(stg); - r = DeleteFileA(filenameA); - ok( r == TRUE, "deleted file\n"); + ret = DeleteFileA(filenameA); + ok(ret, "deleted file\n"); } static void test_ReadClassStm(void) @@ -2925,6 +2932,7 @@ static void test_rename(void) static const WCHAR stgname2[] = { 'S','T','G',0 }; static const WCHAR stmname[] = { 'C','O','N','T','E','N','T','S',0 }; static const WCHAR stmname2[] = { 'E','N','T','S',0 }; + BOOL ret; DeleteFileA(filenameA); @@ -2981,8 +2989,8 @@ static void test_rename(void) IStorage_Release(stg); - r = DeleteFileA(filenameA); - ok( r == TRUE, "deleted file\n"); + ret = DeleteFileA(filenameA); + ok(ret, "deleted file\n"); } static void test_toplevel_stat(void) @@ -3068,6 +3076,7 @@ static void test_substorage_enum(void) HRESULT r; ULONG ref; static const WCHAR stgname[] = { 'P','E','R','M','S','T','G',0 }; + BOOL ret; DeleteFileA(filenameA); @@ -3103,8 +3112,8 @@ static void test_substorage_enum(void) IStorage_Release(stg); - r = DeleteFileA(filenameA); - ok( r == TRUE, "deleted file\n"); + ret = DeleteFileA(filenameA); + ok(ret, "deleted file\n"); } static void test_copyto_locking(void) @@ -3115,6 +3124,7 @@ static void test_copyto_locking(void) static const WCHAR stgname[] = { 'S','T','G','1',0 }; static const WCHAR stgname2[] = { 'S','T','G','2',0 }; static const WCHAR stmname[] = { 'C','O','N','T','E','N','T','S',0 }; + BOOL ret; DeleteFileA(filenameA); @@ -3154,8 +3164,8 @@ static void test_copyto_locking(void) IStorage_Release(stg2); IStorage_Release(stg); - r = DeleteFileA(filenameA); - ok( r == TRUE, "deleted file\n"); + ret = DeleteFileA(filenameA); + ok(ret, "deleted file\n"); } static void test_copyto_recursive(void) @@ -3164,6 +3174,7 @@ static void test_copyto_recursive(void) HRESULT r; static const WCHAR stgname[] = { 'S','T','G','1',0 }; static const WCHAR stgname2[] = { 'S','T','G','2',0 }; + BOOL ret; DeleteFileA(filenameA); @@ -3205,8 +3216,8 @@ static void test_copyto_recursive(void) IStorage_Release(stg2); IStorage_Release(stg); - r = DeleteFileA(filenameA); - ok( r == TRUE, "deleted file\n"); + ret = DeleteFileA(filenameA); + ok(ret, "deleted file\n"); } static void test_hglobal_storage_creation(void)

1 0

Dmitry Timoshkov : ole32: PropVariantCopy should return DISP_E_BADVARTYPE in case of bad source variant type.
by Alexandre Julliard Oct. 20, 2015

Oct. 20, 2015

Module: wine Branch: master Commit: f9bc636d357221dfc036aacf84858257f045a1fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=f9bc636d357221dfc036aacf8… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Oct 19 10:28:10 2015 +0800 ole32: PropVariantCopy should return DISP_E_BADVARTYPE in case of bad source variant type. In some rare (notably for some VT_VECTOR) cases Windows implementation returns STG_E_INVALIDPARAMETER, but returning DISP_E_BADVARTYPE should cover most of cases. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/ole2.c | 2 +- dlls/ole32/tests/propvariant.c | 25 +++++++++++++++---------- 2 files changed, 16 insertions(+), 11 deletions(-) diff --git a/dlls/ole32/ole2.c b/dlls/ole32/ole2.c index 09cbccf..40f7238 100644 --- a/dlls/ole32/ole2.c +++ b/dlls/ole32/ole2.c @@ -3041,7 +3041,7 @@ HRESULT WINAPI PropVariantCopy(PROPVARIANT *pvarDest, /* [out] */ hr = PROPVARIANT_ValidateType(pvarSrc->vt); if (FAILED(hr)) - return hr; + return DISP_E_BADVARTYPE; /* this will deal with most cases */ *pvarDest = *pvarSrc; diff --git a/dlls/ole32/tests/propvariant.c b/dlls/ole32/tests/propvariant.c index c45ca2a..0786a8e 100644 --- a/dlls/ole32/tests/propvariant.c +++ b/dlls/ole32/tests/propvariant.c @@ -130,7 +130,7 @@ static const char* wine_vtypes[VT_CLSID+1] = }; -static void expect(HRESULT hr, VARTYPE vt, BOOL copy) +static void expect(HRESULT hr, VARTYPE vt, BOOL copy, int line) { int idx = vt & VT_TYPEMASK; BYTE flags; @@ -158,7 +158,12 @@ static void expect(HRESULT hr, VARTYPE vt, BOOL copy) } if(flags == PROP_INV) - ok(hr == copy ? DISP_E_BADVARTYPE : STG_E_INVALIDPARAMETER, "%s (%s): got %08x\n", wine_vtypes[idx], modifier, hr); + { + if (copy && (vt & VT_VECTOR)) + ok(hr == DISP_E_BADVARTYPE || hr == STG_E_INVALIDPARAMETER, "%s (%s): got %08x (line %d)\n", wine_vtypes[idx], modifier, hr, line); + else + ok(hr == (copy ? DISP_E_BADVARTYPE : STG_E_INVALIDPARAMETER), "%s (%s): got %08x (line %d)\n", wine_vtypes[idx], modifier, hr, line); + } else if(flags == PROP_V0) ok(hr == S_OK, "%s (%s): got %08x\n", wine_vtypes[idx], modifier, hr); else if(flags & PROP_TODO) @@ -210,7 +215,7 @@ static void test_validtypes(void) vt = propvar.vt = i; memset(&copy, 0x77, sizeof(copy)); hr = PropVariantCopy(&copy, &propvar); - expect(hr, vt, TRUE); + expect(hr, vt, TRUE, __LINE__); if (hr == S_OK) { ok(copy.vt == propvar.vt, "expected %d, got %d\n", propvar.vt, copy.vt); @@ -224,7 +229,7 @@ static void test_validtypes(void) ok(!ret || broken(ret) /* win2000 */, "%d: copy should stay unchanged\n", i); } hr = PropVariantClear(&propvar); - expect(hr, vt, FALSE); + expect(hr, vt, FALSE, __LINE__); ok(propvar.vt == 0, "expected 0, got %d\n", propvar.vt); ok(U(propvar).uhVal.QuadPart == 0, "%u: expected 0, got %#x/%#x\n", i, U(propvar).uhVal.u.LowPart, U(propvar).uhVal.u.HighPart); @@ -234,7 +239,7 @@ static void test_validtypes(void) vt = propvar.vt = i | VT_ARRAY; memset(&copy, 0x77, sizeof(copy)); hr = PropVariantCopy(&copy, &propvar); - expect(hr, vt, TRUE); + expect(hr, vt, TRUE, __LINE__); if (hr == S_OK) { ok(copy.vt == propvar.vt, "expected %d, got %d\n", propvar.vt, copy.vt); @@ -247,7 +252,7 @@ static void test_validtypes(void) ok(!ret || broken(ret) /* win2000 */, "%d: copy should stay unchanged\n", i); } hr = PropVariantClear(&propvar); - expect(hr, vt, FALSE); + expect(hr, vt, FALSE, __LINE__); ok(propvar.vt == 0, "expected 0, got %d\n", propvar.vt); ok(U(propvar).uhVal.QuadPart == 0, "%u: expected 0, got %#x/%#x\n", i, U(propvar).uhVal.u.LowPart, U(propvar).uhVal.u.HighPart); @@ -258,7 +263,7 @@ static void test_validtypes(void) vt = propvar.vt = i | VT_VECTOR; memset(&copy, 0x77, sizeof(copy)); hr = PropVariantCopy(&copy, &propvar); - expect(hr, vt, TRUE); + expect(hr, vt, TRUE, __LINE__); if (hr == S_OK) { ok(copy.vt == propvar.vt, "expected %d, got %d\n", propvar.vt, copy.vt); @@ -271,7 +276,7 @@ static void test_validtypes(void) ok(!ret || broken(ret) /* win2000 */, "%d: copy should stay unchanged\n", i); } hr = PropVariantClear(&propvar); - expect(hr, vt, FALSE); + expect(hr, vt, FALSE, __LINE__); ok(propvar.vt == 0, "expected 0, got %d\n", propvar.vt); ok(U(propvar).uhVal.QuadPart == 0, "%u: expected 0, got %#x/%#x\n", i, U(propvar).uhVal.u.LowPart, U(propvar).uhVal.u.HighPart); @@ -281,7 +286,7 @@ static void test_validtypes(void) vt = propvar.vt = i | VT_BYREF; memset(&copy, 0x77, sizeof(copy)); hr = PropVariantCopy(&copy, &propvar); - expect(hr, vt, TRUE); + expect(hr, vt, TRUE, __LINE__); if (hr == S_OK) { ok(copy.vt == propvar.vt, "expected %d, got %d\n", propvar.vt, copy.vt); @@ -295,7 +300,7 @@ static void test_validtypes(void) ok(!ret || broken(ret) /* win2000 */, "%d: copy should stay unchanged\n", i); } hr = PropVariantClear(&propvar); - expect(hr, vt, FALSE); + expect(hr, vt, FALSE, __LINE__); ok(propvar.vt == 0, "expected 0, got %d\n", propvar.vt); ok(U(propvar).uhVal.QuadPart == 0, "%u: expected 0, got %#x/%#x\n", i, U(propvar).uhVal.u.LowPart, U(propvar).uhVal.u.HighPart);

1 0

Alexandre Julliard : wineconsole: Accept a too large font if we can' t find one that fits the screen.
by Alexandre Julliard Oct. 20, 2015

Oct. 20, 2015

Module: wine Branch: master Commit: 8e77d6a24da3823fca7c718e4a104242d4cb351f URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e77d6a24da3823fca7c718e4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 20 16:47:35 2015 +0900 wineconsole: Accept a too large font if we can't find one that fits the screen. --- programs/wineconsole/dialog.c | 4 ++-- programs/wineconsole/user.c | 16 +++++++++++----- programs/wineconsole/winecon_user.h | 4 ++-- 3 files changed, 15 insertions(+), 9 deletions(-) diff --git a/programs/wineconsole/dialog.c b/programs/wineconsole/dialog.c index 493990d..4f73a3a 100644 --- a/programs/wineconsole/dialog.c +++ b/programs/wineconsole/dialog.c @@ -300,7 +300,7 @@ static int CALLBACK font_enum_size2(const LOGFONTW* lf, const TEXTMETRICW* tm, struct dialog_info* di = (struct dialog_info*)lParam; WCUSER_DumpTextMetric(tm, FontType); - if (WCUSER_ValidateFontMetric(di->data, tm, FontType)) + if (WCUSER_ValidateFontMetric(di->data, tm, FontType, TRUE)) { di->nFont++; } @@ -372,7 +372,7 @@ static int CALLBACK font_enum_size(const LOGFONTW* lf, const TEXTMETRICW* tm, return 0; } - if (WCUSER_ValidateFontMetric(di->data, tm, FontType)) + if (WCUSER_ValidateFontMetric(di->data, tm, FontType, TRUE)) { int idx = 0; diff --git a/programs/wineconsole/user.c b/programs/wineconsole/user.c index 879529c..e723745 100644 --- a/programs/wineconsole/user.c +++ b/programs/wineconsole/user.c @@ -333,7 +333,8 @@ static BOOL WCUSER_AreFontsEqual(const struct config_data* config, const LOGFONT struct font_chooser { struct inner_data* data; - int done; + BOOL check_screen_size; + BOOL done; }; /****************************************************************** @@ -341,11 +342,12 @@ struct font_chooser * * Returns true if the font described in tm is usable as a font for the renderer */ -BOOL WCUSER_ValidateFontMetric(const struct inner_data* data, const TEXTMETRICW* tm, DWORD fontType) +BOOL WCUSER_ValidateFontMetric(const struct inner_data* data, const TEXTMETRICW* tm, + DWORD type, BOOL check_screen_size) { BOOL ret = TRUE; - if (fontType & RASTER_FONTTYPE) + if (check_screen_size && (type & RASTER_FONTTYPE)) ret = (tm->tmMaxCharWidth * data->curcfg.win_width < GetSystemMetrics(SM_CXSCREEN) && tm->tmHeight * data->curcfg.win_height < GetSystemMetrics(SM_CYSCREEN)); return ret && !tm->tmItalic && !tm->tmUnderlined && !tm->tmStruckOut && @@ -377,7 +379,7 @@ static int CALLBACK get_first_font_enum_2(const LOGFONTW* lf, const TEXTMETRICW* struct font_chooser* fc = (struct font_chooser*)lParam; WCUSER_DumpTextMetric(tm, FontType); - if (WCUSER_ValidateFontMetric(fc->data, tm, FontType)) + if (WCUSER_ValidateFontMetric(fc->data, tm, FontType, fc->check_screen_size)) { LOGFONTW mlf = *lf; @@ -535,7 +537,11 @@ static void WCUSER_SetFontPmt(struct inner_data* data, const WCHAR* font, /* try to find an acceptable font */ WINE_WARN("Couldn't match the font from registry... trying to find one\n"); fc.data = data; - fc.done = 0; + fc.check_screen_size = TRUE; + fc.done = FALSE; + EnumFontFamiliesW(PRIVATE(data)->hMemDC, NULL, get_first_font_enum, (LPARAM)&fc); + if (fc.done) return; + fc.check_screen_size = FALSE; EnumFontFamiliesW(PRIVATE(data)->hMemDC, NULL, get_first_font_enum, (LPARAM)&fc); if (!fc.done) WINECON_Fatal("Couldn't find a decent font, aborting\n"); } diff --git a/programs/wineconsole/winecon_user.h b/programs/wineconsole/winecon_user.h index 73a7701..7c5174f 100644 --- a/programs/wineconsole/winecon_user.h +++ b/programs/wineconsole/winecon_user.h @@ -46,8 +46,8 @@ struct inner_data_user { extern const COLORREF WCUSER_ColorMap[16]; extern BOOL WCUSER_GetProperties(struct inner_data*, BOOL); extern BOOL WCUSER_ValidateFont(const struct inner_data* data, const LOGFONTW* lf); -extern BOOL WCUSER_ValidateFontMetric(const struct inner_data* data, - const TEXTMETRICW* tm, DWORD fontType); +extern BOOL WCUSER_ValidateFontMetric(const struct inner_data* data, const TEXTMETRICW* tm, + DWORD type, BOOL check_screen_size); extern HFONT WCUSER_CopyFont(struct config_data* config, HWND hWnd, const LOGFONTW* lf, LONG* el); extern void WCUSER_FillLogFont(LOGFONTW* lf, const WCHAR* name,

1 0

Riccardo Bortolato : d3d9: Replace wined3d_surface_get_resource with wined3d_texture_get_sub_resource in d3d9_device_ColorFill.
by Alexandre Julliard Oct. 20, 2015

Oct. 20, 2015

Module: wine Branch: master Commit: f3c69e40dce9dc764d370d18bc6d957308dba00a URL: http://source.winehq.org/git/wine.git/?a=commit;h=f3c69e40dce9dc764d370d18b… Author: Riccardo Bortolato <rikyz619(a)gmail.com> Date: Mon Oct 19 19:07:33 2015 +0200 d3d9: Replace wined3d_surface_get_resource with wined3d_texture_get_sub_resource in d3d9_device_ColorFill. Signed-off-by: Riccardo Bortolato <rikyz619(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/device.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 7d9f735..821aa4f 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -1378,7 +1378,11 @@ static HRESULT WINAPI d3d9_device_ColorFill(IDirect3DDevice9Ex *iface, wined3d_mutex_lock(); - wined3d_resource = wined3d_surface_get_resource(surface_impl->wined3d_surface); + if (!(wined3d_resource = wined3d_texture_get_sub_resource(surface_impl->wined3d_texture, surface_impl->sub_resource_idx))) + { + wined3d_mutex_unlock(); + return D3DERR_INVALIDCALL; + } wined3d_resource_get_desc(wined3d_resource, &desc); if (desc.pool != WINED3D_POOL_DEFAULT)

1 0

Grazvydas Ignotas : include: Use fabsf implementation when available.
by Alexandre Julliard Oct. 20, 2015

Oct. 20, 2015

Module: wine Branch: master Commit: cc902bce5bddca44f2583a00a12541dfd0d89d45 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cc902bce5bddca44f2583a00a… Author: Grazvydas Ignotas <notasas(a)gmail.com> Date: Sun Oct 18 02:31:04 2015 +0300 include: Use fabsf implementation when available. Signed-off-by: Grazvydas Ignotas <notasas(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/msvcrt/math.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/msvcrt/math.h b/include/msvcrt/math.h index a7cbcc0..4f69b88 100644 --- a/include/msvcrt/math.h +++ b/include/msvcrt/math.h @@ -120,13 +120,13 @@ float __cdecl fmodf(float, float); #define sqrtf(x) ((float)sqrt((double)(x))) #define ceilf(x) ((float)ceil((double)(x))) #define floorf(x) ((float)floor((double)(x))) +#define fabsf(x) ((float)fabs((double)(x))) #define frexpf(x) ((float)frexp((double)(x))) #define modff(x,y) ((float)modf((double)(x), (double*)(y))) #define fmodf(x,y) ((float)fmod((double)(x), (double)(y))) #endif -#define fabsf(x) ((float)fabs((double)(x))) #define ldexpf(x,y) ((float)ldexp((double)(x),(y))) float __cdecl _hypotf(float, float);

1 0

Nikolay Sivov : shell32: Cleanup ReadCabinetState exports.
by Alexandre Julliard Oct. 20, 2015

Oct. 20, 2015

Module: wine Branch: master Commit: 4ee4c06410214e418d35cee3671460e2924059ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ee4c06410214e418d35cee36… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Oct 20 16:16:54 2015 +0300 shell32: Cleanup ReadCabinetState exports. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shell32.spec | 6 +++--- dlls/shell32/shellord.c | 15 --------------- 2 files changed, 3 insertions(+), 18 deletions(-) diff --git a/dlls/shell32/shell32.spec b/dlls/shell32/shell32.spec index 91a4138..93fd449 100644 --- a/dlls/shell32/shell32.spec +++ b/dlls/shell32/shell32.spec @@ -245,10 +245,10 @@ 650 stdcall -noname PathIsSameRoot(ptr ptr) PathIsSameRootAW - 651 stdcall -noname ReadCabinetState(long long) # OldReadCabinetState - 652 stdcall -noname WriteCabinetState(long) + 651 stdcall -noname @(ptr long) ReadCabinetState # OldReadCabinetState + 652 stdcall -noname WriteCabinetState(ptr) 653 stdcall -noname PathProcessCommand(long long long long) PathProcessCommandAW - 654 stdcall @(long long) shell32_654 # ReadCabinetState(a)8 + 654 stdcall ReadCabinetState(ptr long) 660 stdcall -noname FileIconInit(long) 680 stdcall IsUserAnAdmin() diff --git a/dlls/shell32/shellord.c b/dlls/shell32/shellord.c index 7387520..60492de 100644 --- a/dlls/shell32/shellord.c +++ b/dlls/shell32/shellord.c @@ -1555,21 +1555,6 @@ BOOL WINAPI SHWaitForFileToOpen( } /************************************************************************ - * @ [SHELL32.654] - * - * NOTES - * first parameter seems to be a pointer (same as passed to WriteCabinetState) - * second one could be a size (0x0c). The size is the same as the structure saved to - * HCU\Software\Microsoft\Windows\CurrentVersion\Explorer\CabinetState - * I'm (js) guessing: this one is just ReadCabinetState ;-) - */ -HRESULT WINAPI shell32_654 (CABINETSTATE *cs, int length) -{ - TRACE("%p %d\n",cs,length); - return ReadCabinetState(cs,length); -} - -/************************************************************************ * RLBuildListOfPaths [SHELL32.146] * * NOTES

1 0

Nikolay Sivov : usp10/tests: Use BOOL variable for BOOL retval (PVS-Studio ).
by Alexandre Julliard Oct. 20, 2015

Oct. 20, 2015

Module: wine Branch: master Commit: 9cede2f0a6e1d22d4cb5e4f9e9f0ea0d359a8fda URL: http://source.winehq.org/git/wine.git/?a=commit;h=9cede2f0a6e1d22d4cb5e4f9e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Oct 20 15:57:36 2015 +0300 usp10/tests: Use BOOL variable for BOOL retval (PVS-Studio). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/usp10/tests/usp10.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c index bfd84d4..7e33ecc 100644 --- a/dlls/usp10/tests/usp10.c +++ b/dlls/usp10/tests/usp10.c @@ -2267,15 +2267,17 @@ static void test_ScriptTextOut2(HDC hdc) ok (hr == S_OK, "ScriptShape should return S_OK not (%08x)\n", hr); ok (psc != NULL, "psc should not be null and have SCRIPT_CACHE buffer address\n"); ok (pcGlyphs == cChars, "Chars in (%d) should equal Glyphs out (%d)\n", cChars, pcGlyphs); - if (hr ==0) { + if (hr == S_OK) { + BOOL ret; + /* Note hdc is needed as glyph info is not yet in psc */ hr = ScriptPlace(hdc2, &psc, pwOutGlyphs1, pcGlyphs, psva, &pItem[0].a, piAdvance, pGoffset, pABC); ok (hr == S_OK, "Should return S_OK not (%08x)\n", hr); /* key part!!! cached dc is being deleted */ - hr = DeleteDC(hdc2); - ok(hr == 1, "DeleteDC should return 1 not %08x\n", hr); + ret = DeleteDC(hdc2); + ok(ret, "DeleteDC should return 1 not %d\n", ret); /* At this point the cached hdc (hdc2) has been destroyed, * however, we are passing in a *real* hdc (the original hdc).

1 0

Nikolay Sivov : shell32: Remove another recurring return code check ( PVS-Studio).
by Alexandre Julliard Oct. 20, 2015

Oct. 20, 2015

Module: wine Branch: master Commit: 95ecc29a50ae47107f59b35ce9d4702f620b4bb3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=95ecc29a50ae47107f59b35ce… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Oct 20 13:59:37 2015 +0300 shell32: Remove another recurring return code check (PVS-Studio). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shellpath.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/dlls/shell32/shellpath.c b/dlls/shell32/shellpath.c index 9440563..cb79d6f 100644 --- a/dlls/shell32/shellpath.c +++ b/dlls/shell32/shellpath.c @@ -5589,10 +5589,7 @@ static HRESULT register_folder(const KNOWNFOLDERID *rfid, const KNOWNFOLDER_DEFI } if(SUCCEEDED(hr) && pKFD->category != KF_CATEGORY_VIRTUAL && pKFD->pszRelativePath) - { - if(SUCCEEDED(hr)) - hr = HRESULT_FROM_WIN32(RegSetValueExW(hKey, szRelativePath, 0, REG_SZ, (LPBYTE)pKFD->pszRelativePath, (lstrlenW(pKFD->pszRelativePath)+1)*sizeof(WCHAR) )); - } + hr = HRESULT_FROM_WIN32(RegSetValueExW(hKey, szRelativePath, 0, REG_SZ, (LPBYTE)pKFD->pszRelativePath, (lstrlenW(pKFD->pszRelativePath)+1)*sizeof(WCHAR) )); RegCloseKey(hKey);

1 0