wine-commits October 2011

wine-commits@winehq.org

3 participants
783 discussions

Andrew Talbot : mapi32: Mark some fall-throughs in a switch statement.
by Alexandre Julliard 04 Oct '11

04 Oct '11

Module: wine Branch: master Commit: 203085dcee5c9af56f32d7d13a460fb10b342b34 URL: http://source.winehq.org/git/wine.git/?a=commit;h=203085dcee5c9af56f32d7d13… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Tue Oct 4 22:48:33 2011 +0100 mapi32: Mark some fall-throughs in a switch statement. --- dlls/mapi32/prop.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/dlls/mapi32/prop.c b/dlls/mapi32/prop.c index 75c1b1e..5173412 100644 --- a/dlls/mapi32/prop.c +++ b/dlls/mapi32/prop.c @@ -221,31 +221,39 @@ ULONG WINAPI UlPropSize(LPSPropValue lpProp) switch (PROP_TYPE(lpProp->ulPropTag)) { case PT_MV_I2: ulRet = lpProp->Value.MVi.cValues; + /* fall through */ case PT_BOOLEAN: case PT_I2: ulRet *= sizeof(USHORT); break; case PT_MV_I4: ulRet = lpProp->Value.MVl.cValues; + /* fall through */ case PT_ERROR: case PT_I4: ulRet *= sizeof(LONG); break; case PT_MV_I8: ulRet = lpProp->Value.MVli.cValues; + /* fall through */ case PT_I8: ulRet *= sizeof(LONG64); break; case PT_MV_R4: ulRet = lpProp->Value.MVflt.cValues; + /* fall through */ case PT_R4: ulRet *= sizeof(float); break; case PT_MV_APPTIME: case PT_MV_R8: ulRet = lpProp->Value.MVdbl.cValues; + /* fall through */ case PT_APPTIME: case PT_R8: ulRet *= sizeof(double); break; case PT_MV_CURRENCY: ulRet = lpProp->Value.MVcur.cValues; + /* fall through */ case PT_CURRENCY: ulRet *= sizeof(CY); break; case PT_MV_SYSTIME: ulRet = lpProp->Value.MVft.cValues; + /* fall through */ case PT_SYSTIME: ulRet *= sizeof(FILETIME); break; case PT_MV_CLSID: ulRet = lpProp->Value.MVguid.cValues; + /* fall through */ case PT_CLSID: ulRet *= sizeof(GUID); break; case PT_MV_STRING8: ulRet = 0u;

1 0

Nikolay Sivov : msxml3: Accept disabling of external entities loading.
by Alexandre Julliard 04 Oct '11

04 Oct '11

Module: wine Branch: master Commit: ad336be675ed9a1c95fa4f441040c95c92bc5b68 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ad336be675ed9a1c95fa4f441… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Oct 4 16:27:39 2011 -0500 msxml3: Accept disabling of external entities loading. --- dlls/msxml3/saxreader.c | 48 ++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 45 insertions(+), 3 deletions(-) diff --git a/dlls/msxml3/saxreader.c b/dlls/msxml3/saxreader.c index fca390a..0460533 100644 --- a/dlls/msxml3/saxreader.c +++ b/dlls/msxml3/saxreader.c @@ -49,6 +49,24 @@ WINE_DEFAULT_DEBUG_CHANNEL(msxml); #ifdef HAVE_LIBXML2 +enum ReaderFeatures +{ + ExhaustiveErrors = 1 << 1, + ExternalGeneralEntities = 1 << 2, + ExternalParameterEntities = 1 << 3, + ForcedResync = 1 << 4, + NamespacePrefixes = 1 << 5, + Namespace = 1 << 6, + ParameterEntities = 1 << 7, + PreserveSystemIndentifiers = 1 << 8, + ProhibitDTD = 1 << 9, + SchemaValidation = 1 << 10, + ServerHttpRequest = 1 << 11, + SuppressValidationfatalError = 1 << 12, + UseInlineSchema = 1 << 13, + UseSchemaLocation = 1 << 14 +}; + struct bstrpool { BSTR *pool; @@ -72,6 +90,7 @@ typedef struct _saxreader xmlSAXHandler sax; BOOL isParsing; struct bstrpool pool; + enum ReaderFeatures features; } saxreader; typedef struct _saxlocator @@ -180,6 +199,23 @@ static const WCHAR PropertyXMLDeclVersionW[] = { 'x','m','l','d','e','c','l','-','v','e','r','s','i','o','n',0 }; +/* feature names */ +static const WCHAR FeatureExternalGeneralEntitiesW[] = { + 'h','t','t','p',':','/','/','x','m','l','.','o','r','g','/','s','a','x','/', + 'f','e','a','t','u','r','e','s','/','e','x','t','e','r','n','a','l','-','g','e','n','e','r','a','l', + '-','e','n','t','i','t','i','e','s',0 +}; + +static inline HRESULT set_feature_value(saxreader *reader, enum ReaderFeatures feature, VARIANT_BOOL value) +{ + if (value == VARIANT_TRUE) + reader->features |= feature; + else + reader->features &= ~feature; + + return S_OK; +} + static inline BOOL has_content_handler(const saxlocator *locator) { return (locator->vbInterface && locator->saxreader->vbcontentHandler) || @@ -2568,12 +2604,17 @@ static HRESULT WINAPI saxxmlreader_getFeature( static HRESULT WINAPI saxxmlreader_putFeature( IVBSAXXMLReader* iface, - const WCHAR *pFeature, - VARIANT_BOOL vfValue) + const WCHAR *feature, + VARIANT_BOOL value) { saxreader *This = impl_from_IVBSAXXMLReader( iface ); - FIXME("(%p)->(%s %x) stub\n", This, debugstr_w(pFeature), vfValue); + TRACE("(%p)->(%s %x)\n", This, debugstr_w(feature), value); + + if (!strcmpW(FeatureExternalGeneralEntitiesW, feature) && value == VARIANT_FALSE) + return set_feature_value(This, ExternalGeneralEntities, value); + + FIXME("(%p)->(%s %x) stub\n", This, debugstr_w(feature), value); return E_NOTIMPL; } @@ -2964,6 +3005,7 @@ HRESULT SAXXMLReader_create(IUnknown *pUnkOuter, LPVOID *ppObj) reader->pool.pool = NULL; reader->pool.index = 0; reader->pool.len = 0; + reader->features = 0; memset(&reader->sax, 0, sizeof(xmlSAXHandler)); reader->sax.initialized = XML_SAX2_MAGIC;

1 0

Piotr Caban : msvcrt: Fix wcsncpy_s implementation.
by Alexandre Julliard 04 Oct '11

04 Oct '11

Module: wine Branch: master Commit: 8df606fea4c12f9e48626fd9bd5aef1e19be666a URL: http://source.winehq.org/git/wine.git/?a=commit;h=8df606fea4c12f9e48626fd9b… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Oct 4 23:03:03 2011 +0200 msvcrt: Fix wcsncpy_s implementation. --- dlls/msvcrt/tests/string.c | 37 ++++++++++++++++++++++++++++++++++++- dlls/msvcrt/wcs.c | 2 +- 2 files changed, 37 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index 6eaa74a..979f874 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -61,6 +61,7 @@ static int (__cdecl *pstrcat_s)(char *dst, size_t len, const char *src); static int (__cdecl *p_mbsnbcat_s)(unsigned char *dst, size_t size, const unsigned char *src, size_t count); static int (__cdecl *p_mbsnbcpy_s)(unsigned char * dst, size_t size, const unsigned char * src, size_t count); static int (__cdecl *p_wcscpy_s)(wchar_t *wcDest, size_t size, const wchar_t *wcSrc); +static int (__cdecl *p_wcsncpy_s)(wchar_t *wcDest, size_t size, const wchar_t *wcSrc, size_t count); static int (__cdecl *p_wcsncat_s)(wchar_t *dst, size_t elem, const wchar_t *src, size_t count); static int (__cdecl *p_wcsupr_s)(wchar_t *str, size_t size); static size_t (__cdecl *p_strnlen)(const char *, size_t); @@ -615,7 +616,7 @@ static void test_wcscpy_s(void) if(!p_wcscpy_s) { - skip("wcscpy_s not found\n"); + win_skip("wcscpy_s not found\n"); return; } @@ -648,6 +649,39 @@ static void test_wcscpy_s(void) ret = p_wcscpy_s(szDestShort, 8, szLongText); ok(ret == ERANGE || ret == EINVAL, "expected ERANGE/EINVAL got %d\n", ret); ok(szDestShort[0] == 0, "szDestShort[0] not 0\n"); + + if(!p_wcsncpy_s) + { + win_skip("wcsncpy_s not found\n"); + return; + } + + ret = p_wcsncpy_s(NULL, 18, szLongText, sizeof(szLongText)/sizeof(WCHAR)); + ok(ret == EINVAL, "p_wcsncpy_s expect EINVAL got %d\n", ret); + + szDest[0] = 'A'; + ret = p_wcsncpy_s(szDest, 18, NULL, 1); + ok(ret == EINVAL, "expected EINVAL got %d\n", ret); + ok(szDest[0] == 0, "szDest[0] not 0\n"); + + szDest[0] = 'A'; + ret = p_wcsncpy_s(szDest, 18, NULL, 0); + ok(ret == 0, "expected ERROR_SUCCESS got %d\n", ret); + ok(szDest[0] == 0, "szDest[0] not 0\n"); + + szDest[0] = 'A'; + ret = p_wcsncpy_s(szDest, 0, szLongText, sizeof(szLongText)/sizeof(WCHAR)); + ok(ret == ERANGE || ret == EINVAL, "expected ERANGE/EINVAL got %d\n", ret); + ok(szDest[0] == 0 || ret == EINVAL, "szDest[0] not 0\n"); + + ret = p_wcsncpy_s(szDest, 18, szLongText, sizeof(szLongText)/sizeof(WCHAR)); + ok(ret == 0, "expected 0 got %d\n", ret); + ok(lstrcmpW(szDest, szLongText) == 0, "szDest != szLongText\n"); + + szDest[0] = 'A'; + ret = p_wcsncpy_s(szDestShort, 8, szLongText, sizeof(szLongText)/sizeof(WCHAR)); + ok(ret == ERANGE || ret == EINVAL, "expected ERANGE/EINVAL got %d\n", ret); + ok(szDestShort[0] == 0, "szDestShort[0] not 0\n"); } static void test__wcsupr_s(void) @@ -2027,6 +2061,7 @@ START_TEST(string) p_mbsnbcat_s = (void *)GetProcAddress( hMsvcrt,"_mbsnbcat_s" ); p_mbsnbcpy_s = (void *)GetProcAddress( hMsvcrt,"_mbsnbcpy_s" ); p_wcscpy_s = (void *)GetProcAddress( hMsvcrt,"wcscpy_s" ); + p_wcsncpy_s = (void *)GetProcAddress( hMsvcrt,"wcsncpy_s" ); p_wcsncat_s = (void *)GetProcAddress( hMsvcrt,"wcsncat_s" ); p_wcsupr_s = (void *)GetProcAddress( hMsvcrt,"_wcsupr_s" ); p_strnlen = (void *)GetProcAddress( hMsvcrt,"strnlen" ); diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index 0327ccb..ed0536a 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -1210,7 +1210,7 @@ INT CDECL MSVCRT_wcsncpy_s( MSVCRT_wchar_t* wcDest, MSVCRT_size_t numElement, co if (!wcSrc) { - return MSVCRT_EINVAL; + return count ? MSVCRT_EINVAL : 0; } size = min(strlenW(wcSrc), count);

1 0

Hans Leidekker : mspatcha: Forward ApplyPatchToFileA to ApplyPatchToFileW.
by Alexandre Julliard 04 Oct '11

04 Oct '11

Module: wine Branch: master Commit: 50110d4bbde7589155284880a57a6ffdb283b233 URL: http://source.winehq.org/git/wine.git/?a=commit;h=50110d4bbde7589155284880a… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Oct 4 14:59:41 2011 -0500 mspatcha: Forward ApplyPatchToFileA to ApplyPatchToFileW. --- dlls/mspatcha/mspatcha.spec | 2 +- dlls/mspatcha/mspatcha_main.c | 41 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 42 insertions(+), 1 deletions(-) diff --git a/dlls/mspatcha/mspatcha.spec b/dlls/mspatcha/mspatcha.spec index ca9bc7d..40feedf 100644 --- a/dlls/mspatcha/mspatcha.spec +++ b/dlls/mspatcha/mspatcha.spec @@ -1,4 +1,4 @@ -1 stub ApplyPatchToFileA +1 stdcall ApplyPatchToFileA(str str str long) 2 stub ApplyPatchToFileByHandles 3 stub ApplyPatchToFileByHandlesEx 4 stub ApplyPatchToFileExA diff --git a/dlls/mspatcha/mspatcha_main.c b/dlls/mspatcha/mspatcha_main.c index 0110a41..ed763c9 100644 --- a/dlls/mspatcha/mspatcha_main.c +++ b/dlls/mspatcha/mspatcha_main.c @@ -24,6 +24,8 @@ #include "windef.h" #include "winbase.h" +#include "winnls.h" +#include "patchapi.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(mspatcha); @@ -49,6 +51,45 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) return TRUE; } +static inline WCHAR *strdupAW( const char *src ) +{ + WCHAR *dst = NULL; + if (src) + { + int len = MultiByteToWideChar( CP_ACP, 0, src, -1, NULL, 0 ); + if ((dst = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) ))) + MultiByteToWideChar( CP_ACP, 0, src, -1, dst, len ); + } + return dst; +} + +/***************************************************** + * ApplyPatchToFileA (MSPATCHA.6) + */ +BOOL WINAPI ApplyPatchToFileA(LPCSTR patch_file, LPCSTR old_file, LPCSTR new_file, ULONG apply_flags) +{ + BOOL ret; + WCHAR *patch_fileW, *new_fileW, *old_fileW = NULL; + + if (!(patch_fileW = strdupAW( patch_file ))) return FALSE; + if (old_file && !(old_fileW = strdupAW( old_file ))) + { + HeapFree( GetProcessHeap(), 0, patch_fileW ); + return FALSE; + } + if (!(new_fileW = strdupAW( new_file ))) + { + HeapFree( GetProcessHeap(), 0, patch_fileW ); + HeapFree( GetProcessHeap(), 0, old_fileW ); + return FALSE; + } + ret = ApplyPatchToFileW( patch_fileW, old_fileW, new_fileW, apply_flags ); + HeapFree( GetProcessHeap(), 0, patch_fileW ); + HeapFree( GetProcessHeap(), 0, old_fileW ); + HeapFree( GetProcessHeap(), 0, new_fileW ); + return ret; +} + /***************************************************** * ApplyPatchToFileW (MSPATCHA.6) */

1 0

Hans Leidekker : include: Add patchapi.h.
by Alexandre Julliard 04 Oct '11

04 Oct '11

Module: wine Branch: master Commit: e5f1ea57999d4a5252bc03105ffe47921277ab24 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e5f1ea57999d4a5252bc03105… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Oct 4 14:59:25 2011 -0500 include: Add patchapi.h. --- include/Makefile.in | 1 + include/patchapi.h | 39 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 40 insertions(+), 0 deletions(-) diff --git a/include/Makefile.in b/include/Makefile.in index 1aac2c5..fc9c38a 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -422,6 +422,7 @@ SRCDIR_INCLUDES = \ oledberr.h \ oledlg.h \ opnrst.idl \ + patchapi.h \ pdh.h \ pdhmsg.h \ pktdef.h \ diff --git a/include/patchapi.h b/include/patchapi.h new file mode 100644 index 0000000..44a4a15 --- /dev/null +++ b/include/patchapi.h @@ -0,0 +1,39 @@ +/* + * Copyright 2011 Hans Leidekker for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef _PATCHAPI_H_ +#define _PATCHAPI_H_ + +#ifdef __cplusplus +extern "C" { +#endif + +#define APPLY_OPTION_FAIL_IF_EXACT 0x00000001 +#define APPLY_OPTION_FAIL_IF_CLOSE 0x00000002 +#define APPLY_OPTION_TEST_ONLY 0x00000004 +#define APPLY_OPTION_VALID_FLAGS 0x00000007 + +BOOL WINAPI ApplyPatchToFileA(LPCSTR,LPCSTR,LPCSTR,ULONG); +BOOL WINAPI ApplyPatchToFileW(LPCWSTR,LPCWSTR,LPCWSTR,ULONG); +#define ApplyPatchToFile WINELIB_NAME_AW(ApplyPatchToFile) + +#ifdef __cplusplus +} +#endif + +#endif /* _PATCHAPI_H_ */

1 0

Thomas Faber : gdi32/tests: Fix MSVC build in bitmap.c.
by Alexandre Julliard 04 Oct '11

04 Oct '11

Module: wine Branch: master Commit: 1354d15a056e1f77a735c1734ea497379155915d URL: http://source.winehq.org/git/wine.git/?a=commit;h=1354d15a056e1f77a735c1734… Author: Thomas Faber <thfabba(a)gmx.de> Date: Tue Oct 4 20:05:34 2011 +0200 gdi32/tests: Fix MSVC build in bitmap.c. --- dlls/gdi32/tests/bitmap.c | 64 ++++++++++++++++++++++++-------------------- 1 files changed, 35 insertions(+), 29 deletions(-) diff --git a/dlls/gdi32/tests/bitmap.c b/dlls/gdi32/tests/bitmap.c index bb4d43f..c5e8f59 100644 --- a/dlls/gdi32/tests/bitmap.c +++ b/dlls/gdi32/tests/bitmap.c @@ -816,8 +816,7 @@ static void test_dibsections(void) static void test_dib_formats(void) { - char buffer[FIELD_OFFSET( BITMAPINFO, bmiColors[256])]; - BITMAPINFO *bi = (BITMAPINFO *)buffer; + BITMAPINFO *bi; char data[256]; void *bits; int planes, bpp, compr; @@ -826,6 +825,7 @@ static void test_dib_formats(void) UINT ret; BOOL expect_ok, todo; + bi = HeapAlloc( GetProcessHeap(), 0, FIELD_OFFSET( BITMAPINFO, bmiColors[256] ) ); hdc = GetDC( 0 ); memdc = CreateCompatibleDC( 0 ); hbmp = CreateCompatibleBitmap( hdc, 10, 10 ); @@ -1123,6 +1123,7 @@ static void test_dib_formats(void) DeleteDC( memdc ); DeleteObject( hbmp ); ReleaseDC( 0, hdc ); + HeapFree( GetProcessHeap(), 0, bi ); } static void test_mono_dibsection(void) @@ -1448,10 +1449,8 @@ static void test_bmBits(void) static void test_GetDIBits_selected_DIB(UINT bpp) { HBITMAP dib; - char bmibuf[FIELD_OFFSET( BITMAPINFO, bmiColors[256] )]; - char bmibuf2[FIELD_OFFSET( BITMAPINFO, bmiColors[256] )]; - BITMAPINFO *info = (BITMAPINFO *)bmibuf; - BITMAPINFO *info2 = (BITMAPINFO *)bmibuf2; + BITMAPINFO *info; + BITMAPINFO *info2; void * bits; void * bits2; UINT dib_size, dib32_size; @@ -1461,6 +1460,9 @@ static void test_GetDIBits_selected_DIB(UINT bpp) UINT i; int res; + info = HeapAlloc(GetProcessHeap(), 0, FIELD_OFFSET(BITMAPINFO, bmiColors[256])); + info2 = HeapAlloc(GetProcessHeap(), 0, FIELD_OFFSET(BITMAPINFO, bmiColors[256])); + /* Create a DIB section with a color table */ info->bmiHeader.biSize = sizeof(info->bmiHeader); @@ -1549,15 +1551,15 @@ static void test_GetDIBits_selected_DIB(UINT bpp) SelectObject(dib_dc, old_bmp); DeleteDC(dib_dc); DeleteObject(dib); + HeapFree(GetProcessHeap(), 0, info2); + HeapFree(GetProcessHeap(), 0, info); } static void test_GetDIBits_selected_DDB(BOOL monochrome) { HBITMAP ddb; - char bmibuf[FIELD_OFFSET( BITMAPINFO, bmiColors[256] )]; - char bmibuf2[FIELD_OFFSET( BITMAPINFO, bmiColors[256] )]; - BITMAPINFO *info = (BITMAPINFO *)bmibuf; - BITMAPINFO *info2 = (BITMAPINFO *)bmibuf2; + BITMAPINFO *info; + BITMAPINFO *info2; void * bits; void * bits2; HDC ddb_dc, dc; @@ -1567,6 +1569,9 @@ static void test_GetDIBits_selected_DDB(BOOL monochrome) UINT i, j; int res; + info = HeapAlloc(GetProcessHeap(), 0, FIELD_OFFSET(BITMAPINFO, bmiColors[256])); + info2 = HeapAlloc(GetProcessHeap(), 0, FIELD_OFFSET(BITMAPINFO, bmiColors[256])); + width = height = 16; /* Create a DDB (device-dependent bitmap) */ @@ -1659,6 +1664,8 @@ static void test_GetDIBits_selected_DDB(BOOL monochrome) SelectObject(ddb_dc, old_bmp); DeleteDC(ddb_dc); DeleteObject(ddb); + HeapFree(GetProcessHeap(), 0, info2); + HeapFree(GetProcessHeap(), 0, info); } static void test_GetDIBits(void) @@ -3575,15 +3582,14 @@ static void test_GetSetDIBits_rtl(void) static void test_GetDIBits_scanlines(void) { - char bmi_buf[ FIELD_OFFSET( BITMAPINFO, bmiColors[256] ) ]; - BITMAPINFO *info = (BITMAPINFO *)bmi_buf; + BITMAPINFO *info; DWORD *dib_bits; HDC hdc = GetDC( NULL ); HBITMAP dib; DWORD data[128], inverted_bits[64]; int i, ret; - memset( info, 0, sizeof(bmi_buf) ); + info = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, FIELD_OFFSET( BITMAPINFO, bmiColors[256] ) ); info->bmiHeader.biSize = sizeof(info->bmiHeader); info->bmiHeader.biWidth = 8; @@ -3888,20 +3894,20 @@ static void test_GetDIBits_scanlines(void) DeleteObject( dib ); ReleaseDC( NULL, hdc ); + HeapFree( GetProcessHeap(), 0, info ); } static void test_SetDIBits(void) { - char bmi_buf[ FIELD_OFFSET( BITMAPINFO, bmiColors[256] ) ]; - BITMAPINFO *info = (BITMAPINFO *)bmi_buf; + BITMAPINFO *info; DWORD *dib_bits; HDC hdc = GetDC( NULL ); DWORD data[128], inverted_data[128]; HBITMAP dib; int i, ret; - memset( info, 0, sizeof(bmi_buf) ); + info = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, FIELD_OFFSET( BITMAPINFO, bmiColors[256] ) ); info->bmiHeader.biSize = sizeof(info->bmiHeader); info->bmiHeader.biWidth = 8; @@ -4064,12 +4070,12 @@ static void test_SetDIBits(void) DeleteObject( dib ); ReleaseDC( NULL, hdc ); + HeapFree( GetProcessHeap(), 0, info ); } static void test_SetDIBits_RLE4(void) { - char bmi_buf[ FIELD_OFFSET( BITMAPINFO, bmiColors[256] ) ]; - BITMAPINFO *info = (BITMAPINFO *)bmi_buf; + BITMAPINFO *info; DWORD *dib_bits; HDC hdc = GetDC( NULL ); BYTE rle4_data[26] = { 0x03, 0x52, 0x07, 0x68, 0x00, 0x00, /* 5, 2, 5, 6, 8, 6, 8, 6, (8, 6,) <eol> */ @@ -4088,7 +4094,7 @@ static void test_SetDIBits_RLE4(void) 0xaaaaaaaa, 0xaaaaaaaa, 0xaaaaaaaa, 0xaaaaaaaa, 0xaaaaaaaa, 0xaaaaaaaa, 0xaaaaaaaa, 0xaaaaaaaa, 0xaaaaaaaa, 0xaaaaaaaa, 0xaaaaaaaa, 0xaaaaaaaa, 0xaaaaaaaa, 0xaaaaaaaa, 0xaaaaaaaa, 0xaaaaaaaa }; - memset( info, 0, sizeof(bmi_buf) ); + info = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, FIELD_OFFSET( BITMAPINFO, bmiColors[256] ) ); info->bmiHeader.biSize = sizeof(info->bmiHeader); info->bmiHeader.biWidth = 8; @@ -4119,12 +4125,12 @@ static void test_SetDIBits_RLE4(void) DeleteObject( dib ); ReleaseDC( NULL, hdc ); + HeapFree( GetProcessHeap(), 0, info ); } static void test_SetDIBits_RLE8(void) { - char bmi_buf[ FIELD_OFFSET( BITMAPINFO, bmiColors[256] ) ]; - BITMAPINFO *info = (BITMAPINFO *)bmi_buf; + BITMAPINFO *info; DWORD *dib_bits; HDC hdc = GetDC( NULL ); BYTE rle8_data[20] = { 0x03, 0x02, 0x04, 0xf0, 0x00, 0x00, /* 2, 2, 2, f0, f0, f0, f0, <eol> */ @@ -4150,7 +4156,7 @@ static void test_SetDIBits_RLE8(void) 0x00040404, 0x00050505, 0x00060606, 0xaaaaaaaa, 0xaaaaaaaa, 0xaaaaaaaa, 0xaaaaaaaa, 0xaaaaaaaa, 0x00020202, 0x00020202, 0x00020202, 0x00f0f0f0, 0x00f0f0f0, 0x00f0f0f0, 0x00f0f0f0, 0xaaaaaaaa }; - memset( info, 0, sizeof(bmi_buf) ); + info = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, FIELD_OFFSET( BITMAPINFO, bmiColors[256] ) ); info->bmiHeader.biSize = sizeof(info->bmiHeader); info->bmiHeader.biWidth = 8; @@ -4268,21 +4274,20 @@ static void test_SetDIBits_RLE8(void) memset( dib_bits, 0xaa, 64 * 4 ); DeleteObject( dib ); - ReleaseDC( NULL, hdc ); + HeapFree( GetProcessHeap(), 0, info ); } static void test_SetDIBitsToDevice(void) { - char bmi_buf[ FIELD_OFFSET( BITMAPINFO, bmiColors[256] ) ]; - BITMAPINFO *info = (BITMAPINFO *)bmi_buf; + BITMAPINFO *info; DWORD *dib_bits; HDC hdc = CreateCompatibleDC( 0 ); DWORD data[128], inverted_data[128]; HBITMAP dib; int i, ret; - memset( info, 0, sizeof(bmi_buf) ); + info = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, FIELD_OFFSET( BITMAPINFO, bmiColors[256] ) ); info->bmiHeader.biSize = sizeof(info->bmiHeader); info->bmiHeader.biWidth = 8; @@ -4635,12 +4640,12 @@ static void test_SetDIBitsToDevice(void) DeleteDC( hdc ); DeleteObject( dib ); + HeapFree( GetProcessHeap(), 0, info ); } static void test_SetDIBitsToDevice_RLE8(void) { - char bmi_buf[ FIELD_OFFSET( BITMAPINFO, bmiColors[256] ) ]; - BITMAPINFO *info = (BITMAPINFO *)bmi_buf; + BITMAPINFO *info; DWORD *dib_bits; HDC hdc = CreateCompatibleDC( 0 ); BYTE rle8_data[20] = { 0x04, 0x02, 0x03, 0xf0, 0x00, 0x00, /* 2, 2, 2, 2, f0, f0, f0, <eol> */ @@ -4666,7 +4671,7 @@ static void test_SetDIBitsToDevice_RLE8(void) 0x00040404, 0x00050505, 0x00060606, 0xaaaaaaaa, 0xaaaaaaaa, 0xaaaaaaaa, 0xaaaaaaaa, 0xaaaaaaaa, 0x00020202, 0x00020202, 0x00020202, 0x00020202, 0x00f0f0f0, 0x00f0f0f0, 0x00f0f0f0, 0xaaaaaaaa }; - memset( info, 0, sizeof(bmi_buf) ); + info = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, FIELD_OFFSET( BITMAPINFO, bmiColors[256] ) ); info->bmiHeader.biSize = sizeof(info->bmiHeader); info->bmiHeader.biWidth = 8; @@ -4856,6 +4861,7 @@ static void test_SetDIBitsToDevice_RLE8(void) DeleteDC( hdc ); DeleteObject( dib ); + HeapFree( GetProcessHeap(), 0, info ); } START_TEST(bitmap)

1 0

Thomas Faber : gdi32/tests: Fix MSVC build in icm.c.
by Alexandre Julliard 04 Oct '11

04 Oct '11

Module: wine Branch: master Commit: 412565136629687be09e754cb146a7e8b8b298bd URL: http://source.winehq.org/git/wine.git/?a=commit;h=412565136629687be09e754cb… Author: Thomas Faber <thfabba(a)gmx.de> Date: Tue Oct 4 16:47:02 2011 +0200 gdi32/tests: Fix MSVC build in icm.c. --- dlls/gdi32/tests/icm.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/tests/icm.c b/dlls/gdi32/tests/icm.c index 65ce208..4afae6b 100644 --- a/dlls/gdi32/tests/icm.c +++ b/dlls/gdi32/tests/icm.c @@ -170,7 +170,7 @@ static void test_SetICMMode( HDC dc ) DeleteDC( dc ); } -static CALLBACK INT enum_profiles_callbackA( LPSTR filename, LPARAM lparam ) +static INT CALLBACK enum_profiles_callbackA( LPSTR filename, LPARAM lparam ) { trace("%s\n", filename); return 1; @@ -191,7 +191,7 @@ static void test_EnumICMProfilesA( HDC dc ) ok(ret == -1 || broken(ret == 0) /* nt4 */, "expected -1, got %d\n", ret); } -static CALLBACK INT enum_profiles_callbackW( LPWSTR filename, LPARAM lparam ) +static INT CALLBACK enum_profiles_callbackW( LPWSTR filename, LPARAM lparam ) { return 1; }

1 0

Bruno Jesus : ws2_32: Fix UDP LINGER support in getsockopt.
by Alexandre Julliard 04 Oct '11

04 Oct '11

Module: wine Branch: master Commit: d278834dabc29e4f37027c39e1e6ca31ea961d5b URL: http://source.winehq.org/git/wine.git/?a=commit;h=d278834dabc29e4f37027c39e… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Tue Oct 4 00:10:25 2011 -0300 ws2_32: Fix UDP LINGER support in getsockopt. --- dlls/ws2_32/socket.c | 10 ++++++++-- dlls/ws2_32/tests/sock.c | 8 ++++---- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index f0313fc..7a1947f 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -2575,7 +2575,8 @@ INT WINAPI WS_getsockopt(SOCKET s, INT level, case WS_SO_LINGER: { struct linger lingval; - unsigned int len = sizeof(struct linger); + int so_type; + unsigned int len = sizeof(struct linger), slen = sizeof(int); /* struct linger and LINGER have different sizes */ if (!optlen || *optlen < sizeof(LINGER) || !optval) @@ -2586,7 +2587,12 @@ INT WINAPI WS_getsockopt(SOCKET s, INT level, if ( (fd = get_sock_fd( s, 0, NULL )) == -1) return SOCKET_ERROR; - if (getsockopt(fd, SOL_SOCKET, SO_LINGER, &lingval, &len) != 0 ) + if ((getsockopt(fd, SOL_SOCKET, SO_TYPE, &so_type, &slen) == 0 && so_type == SOCK_DGRAM)) + { + SetLastError(WSAENOPROTOOPT); + ret = SOCKET_ERROR; + } + else if (getsockopt(fd, SOL_SOCKET, SO_LINGER, &lingval, &len) != 0) { SetLastError((errno == EBADF) ? WSAENOTSOCK : wsaErrno()); ret = SOCKET_ERROR; diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index b358250..7a64e0e 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -2630,12 +2630,12 @@ static void test_extendedSocketOptions(void) "got %d with %d and optval: 0x%x/%d (expected SOCKET_ERROR with WSAEINVAL)\n", ret, WSAGetLastError(), optval, optval); + SetLastError(0xdeadbeef); optlen = sizeof(LINGER); ret = getsockopt(sock, SOL_SOCKET, SO_LINGER, (char *)&linger_val, &optlen); - todo_wine{ - ok(ret == SOCKET_ERROR, "getsockopt should fail for UDP sockets but return value is 0x%08x\n", ret); - } - + ok( (ret == SOCKET_ERROR) && (WSAGetLastError() == WSAENOPROTOOPT), + "getsockopt should fail for UDP sockets setting last error to WSAENOPROTOOPT, got %d with %d\n", + ret, WSAGetLastError()); closesocket(sock); if((sock = socket(PF_INET, SOCK_STREAM, IPPROTO_IP)) == INVALID_SOCKET) {

1 0

Ričardas Barkauskas : ddraw: Use unsafe_impl_from_IDirect3DViewport2 for application provided interfaces .
by Alexandre Julliard 04 Oct '11

04 Oct '11

Module: wine Branch: master Commit: 38982ddf114aceff064afff88a3d73250be61c80 URL: http://source.winehq.org/git/wine.git/?a=commit;h=38982ddf114aceff064afff88… Author: Ričardas Barkauskas <miegalius(a)gmail.com> Date: Mon Oct 3 17:14:59 2011 -0500 ddraw: Use unsafe_impl_from_IDirect3DViewport2 for application provided interfaces. --- dlls/ddraw/ddraw_private.h | 1 + dlls/ddraw/device.c | 8 ++++---- dlls/ddraw/viewport.c | 8 ++++++++ 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index b50c0bc..e75acc0 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -470,6 +470,7 @@ struct IDirect3DViewportImpl }; IDirect3DViewportImpl *unsafe_impl_from_IDirect3DViewport3(IDirect3DViewport3 *iface) DECLSPEC_HIDDEN; +IDirect3DViewportImpl *unsafe_impl_from_IDirect3DViewport2(IDirect3DViewport2 *iface) DECLSPEC_HIDDEN; IDirect3DViewportImpl *unsafe_impl_from_IDirect3DViewport(IDirect3DViewport *iface) DECLSPEC_HIDDEN; /* Helper functions */ diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index a2e27ac..8cfeac1 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -771,7 +771,7 @@ static HRESULT WINAPI IDirect3DDeviceImpl_2_AddViewport(IDirect3DDevice2 *iface, IDirect3DViewport2 *Direct3DViewport2) { IDirect3DDeviceImpl *This = device_from_device2(iface); - IDirect3DViewportImpl *vp = (IDirect3DViewportImpl *)Direct3DViewport2; + IDirect3DViewportImpl *vp = unsafe_impl_from_IDirect3DViewport2(Direct3DViewport2); TRACE("iface %p, viewport %p.\n", iface, Direct3DViewport2); @@ -832,7 +832,7 @@ static HRESULT WINAPI IDirect3DDeviceImpl_2_DeleteViewport(IDirect3DDevice2 *ifa IDirect3DViewport2 *Direct3DViewport2) { IDirect3DDeviceImpl *This = device_from_device2(iface); - IDirect3DViewportImpl *vp = (IDirect3DViewportImpl *)Direct3DViewport2; + IDirect3DViewportImpl *vp = unsafe_impl_from_IDirect3DViewport2(Direct3DViewport2); TRACE("iface %p, viewport %p.\n", iface, Direct3DViewport2); @@ -927,7 +927,7 @@ static HRESULT WINAPI IDirect3DDeviceImpl_2_NextViewport(IDirect3DDevice2 *iface IDirect3DViewport2 *Viewport2, IDirect3DViewport2 **lplpDirect3DViewport2, DWORD Flags) { IDirect3DDeviceImpl *This = device_from_device2(iface); - IDirect3DViewportImpl *vp = (IDirect3DViewportImpl *)Viewport2; + IDirect3DViewportImpl *vp = unsafe_impl_from_IDirect3DViewport2(Viewport2); IDirect3DViewport3 *res; HRESULT hr; @@ -1749,7 +1749,7 @@ static HRESULT WINAPI IDirect3DDeviceImpl_2_SetCurrentViewport(IDirect3DDevice2 IDirect3DViewport2 *Direct3DViewport2) { IDirect3DDeviceImpl *This = device_from_device2(iface); - IDirect3DViewportImpl *vp = (IDirect3DViewportImpl *)Direct3DViewport2; + IDirect3DViewportImpl *vp = unsafe_impl_from_IDirect3DViewport2(Direct3DViewport2); TRACE("iface %p, viewport %p.\n", iface, Direct3DViewport2); diff --git a/dlls/ddraw/viewport.c b/dlls/ddraw/viewport.c index bbff45b..1becbc7 100644 --- a/dlls/ddraw/viewport.c +++ b/dlls/ddraw/viewport.c @@ -1127,6 +1127,14 @@ IDirect3DViewportImpl *unsafe_impl_from_IDirect3DViewport3(IDirect3DViewport3 *i return CONTAINING_RECORD(iface, IDirect3DViewportImpl, IDirect3DViewport3_iface); } +IDirect3DViewportImpl *unsafe_impl_from_IDirect3DViewport2(IDirect3DViewport2 *iface) +{ + /* IDirect3DViewport and IDirect3DViewport3 use the same iface. */ + if (!iface) return NULL; + assert(iface->lpVtbl == (IDirect3DViewport2Vtbl *)&d3d_viewport_vtbl); + return CONTAINING_RECORD(iface, IDirect3DViewportImpl, IDirect3DViewport3_iface); +} + IDirect3DViewportImpl *unsafe_impl_from_IDirect3DViewport(IDirect3DViewport *iface) { /* IDirect3DViewport and IDirect3DViewport3 use the same iface. */

1 0

Ričardas Barkauskas : ddraw: Use unsafe_impl_from_IDirect3DViewport for application provided interfaces .
by Alexandre Julliard 04 Oct '11

04 Oct '11

Module: wine Branch: master Commit: 25bf0e914cf20fda2984953b32d673d9cd68238b URL: http://source.winehq.org/git/wine.git/?a=commit;h=25bf0e914cf20fda2984953b3… Author: Ričardas Barkauskas <miegalius(a)gmail.com> Date: Mon Oct 3 17:14:54 2011 -0500 ddraw: Use unsafe_impl_from_IDirect3DViewport for application provided interfaces. --- dlls/ddraw/ddraw_private.h | 1 + dlls/ddraw/device.c | 8 ++++---- dlls/ddraw/viewport.c | 8 ++++++++ 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index a8f384f..b50c0bc 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -470,6 +470,7 @@ struct IDirect3DViewportImpl }; IDirect3DViewportImpl *unsafe_impl_from_IDirect3DViewport3(IDirect3DViewport3 *iface) DECLSPEC_HIDDEN; +IDirect3DViewportImpl *unsafe_impl_from_IDirect3DViewport(IDirect3DViewport *iface) DECLSPEC_HIDDEN; /* Helper functions */ void viewport_activate(IDirect3DViewportImpl* This, BOOL ignore_lights) DECLSPEC_HIDDEN; diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 4ca94f6..a2e27ac 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -712,7 +712,7 @@ static HRESULT WINAPI IDirect3DDeviceImpl_1_Execute(IDirect3DDevice *iface, { IDirect3DDeviceImpl *This = device_from_device1(iface); IDirect3DExecuteBufferImpl *buffer = unsafe_impl_from_IDirect3DExecuteBuffer(ExecuteBuffer); - IDirect3DViewportImpl *Direct3DViewportImpl = (IDirect3DViewportImpl *)Viewport; + IDirect3DViewportImpl *Direct3DViewportImpl = unsafe_impl_from_IDirect3DViewport(Viewport); HRESULT hr; TRACE("iface %p, buffer %p, viewport %p, flags %#x.\n", iface, ExecuteBuffer, Viewport, Flags); @@ -782,7 +782,7 @@ static HRESULT WINAPI IDirect3DDeviceImpl_1_AddViewport(IDirect3DDevice *iface, IDirect3DViewport *Direct3DViewport) { IDirect3DDeviceImpl *This = device_from_device1(iface); - IDirect3DViewportImpl *vp = (IDirect3DViewportImpl *)Direct3DViewport; + IDirect3DViewportImpl *vp = unsafe_impl_from_IDirect3DViewport(Direct3DViewport); TRACE("iface %p, viewport %p.\n", iface, Direct3DViewport); @@ -843,7 +843,7 @@ static HRESULT WINAPI IDirect3DDeviceImpl_1_DeleteViewport(IDirect3DDevice *ifac IDirect3DViewport *Direct3DViewport) { IDirect3DDeviceImpl *This = device_from_device1(iface); - IDirect3DViewportImpl *vp = (IDirect3DViewportImpl *)Direct3DViewport; + IDirect3DViewportImpl *vp = unsafe_impl_from_IDirect3DViewport(Direct3DViewport); TRACE("iface %p, viewport %p.\n", iface, Direct3DViewport); @@ -944,7 +944,7 @@ static HRESULT WINAPI IDirect3DDeviceImpl_1_NextViewport(IDirect3DDevice *iface, IDirect3DViewport *Viewport, IDirect3DViewport **lplpDirect3DViewport, DWORD Flags) { IDirect3DDeviceImpl *This = device_from_device1(iface); - IDirect3DViewportImpl *vp = (IDirect3DViewportImpl *)Viewport; + IDirect3DViewportImpl *vp = unsafe_impl_from_IDirect3DViewport(Viewport); IDirect3DViewport3 *res; HRESULT hr; diff --git a/dlls/ddraw/viewport.c b/dlls/ddraw/viewport.c index 6024aae..bbff45b 100644 --- a/dlls/ddraw/viewport.c +++ b/dlls/ddraw/viewport.c @@ -1127,6 +1127,14 @@ IDirect3DViewportImpl *unsafe_impl_from_IDirect3DViewport3(IDirect3DViewport3 *i return CONTAINING_RECORD(iface, IDirect3DViewportImpl, IDirect3DViewport3_iface); } +IDirect3DViewportImpl *unsafe_impl_from_IDirect3DViewport(IDirect3DViewport *iface) +{ + /* IDirect3DViewport and IDirect3DViewport3 use the same iface. */ + if (!iface) return NULL; + assert(iface->lpVtbl == (IDirect3DViewportVtbl *)&d3d_viewport_vtbl); + return CONTAINING_RECORD(iface, IDirect3DViewportImpl, IDirect3DViewport3_iface); +} + void d3d_viewport_init(IDirect3DViewportImpl *viewport, IDirectDrawImpl *ddraw) { viewport->IDirect3DViewport3_iface.lpVtbl = &d3d_viewport_vtbl;

1 0

← Newer
1
...
69
70
71
72
73
74
75
...
79
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits October 2011