March 2009 - Wine-commits - list.winehq.org

Huw Davies : ole32: Simplify some of the error handling.
by Alexandre Julliard 31 Mar '09

31 Mar '09

Module: wine Branch: master Commit: 2c6be9521b04522750f208d4db1b218d517ee306 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c6be9521b04522750f208d4d… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Mar 30 15:33:28 2009 +0100 ole32: Simplify some of the error handling. --- dlls/ole32/clipboard.c | 62 +++++++++++++---------------------------------- 1 files changed, 17 insertions(+), 45 deletions(-) diff --git a/dlls/ole32/clipboard.c b/dlls/ole32/clipboard.c index 66f620a..281bafc 100644 --- a/dlls/ole32/clipboard.c +++ b/dlls/ole32/clipboard.c @@ -821,8 +821,6 @@ static HRESULT WINAPI OLEClipbrd_IDataObject_GetData( STGMEDIUM* pmedium) { HANDLE hData = 0; - BOOL bClipboardOpen = FALSE; - HRESULT hr = S_OK; LPVOID src; ole_clipbrd *This = impl_from_IDataObject(iface); @@ -855,8 +853,7 @@ static HRESULT WINAPI OLEClipbrd_IDataObject_GetData( /* * Otherwise, get the data from the windows clipboard using GetClipboardData */ - if ( !(bClipboardOpen = OpenClipboard(theOleClipboard->hWndClipboard)) ) - HANDLE_ERROR( CLIPBRD_E_CANT_OPEN ); + if ( !OpenClipboard(theOleClipboard->hWndClipboard)) return CLIPBRD_E_CANT_OPEN; hData = GetClipboardData(pformatetcIn->cfFormat); @@ -886,17 +883,8 @@ static HRESULT WINAPI OLEClipbrd_IDataObject_GetData( pmedium->u.hGlobal = hData; pmedium->pUnkForRelease = NULL; - hr = S_OK; + if ( !CloseClipboard() ) return CLIPBRD_E_CANT_CLOSE; -CLEANUP: - /* - * Close Windows clipboard - */ - if ( bClipboardOpen && !CloseClipboard() ) - hr = CLIPBRD_E_CANT_CLOSE; - - if ( FAILED(hr) ) - return hr; return (hData == 0) ? DV_E_FORMATETC : S_OK; } @@ -1356,7 +1344,6 @@ static HRESULT set_dataobject_format(HWND hwnd) HRESULT WINAPI OleSetClipboard(IDataObject* pDataObj) { HRESULT hr = S_OK; - BOOL bClipboardOpen = FALSE; struct oletls *info = COM_CurrentInfo(); TRACE("(%p)\n", pDataObj); @@ -1367,9 +1354,6 @@ HRESULT WINAPI OleSetClipboard(IDataObject* pDataObj) if(!info->ole_inits) return CO_E_NOTINITIALIZED; - /* - * Make sure we have a clipboard object - */ OLEClipbrd_Initialize(); /* @@ -1378,21 +1362,19 @@ HRESULT WINAPI OleSetClipboard(IDataObject* pDataObj) if ( !theOleClipboard->hWndClipboard ) theOleClipboard->hWndClipboard = OLEClipbrd_CreateWindow(); - if ( !theOleClipboard->hWndClipboard ) /* sanity check */ - HANDLE_ERROR( E_FAIL ); + if ( !theOleClipboard->hWndClipboard ) return E_FAIL; - /* - * Open the Windows clipboard, associating it with our hidden window - */ - if ( !(bClipboardOpen = OpenClipboard(theOleClipboard->hWndClipboard)) ) - HANDLE_ERROR( CLIPBRD_E_CANT_OPEN ); + if ( !OpenClipboard(theOleClipboard->hWndClipboard) ) return CLIPBRD_E_CANT_OPEN; /* * Empty the current clipboard and make our window the clipboard owner * NOTE: This will trigger a WM_DESTROYCLIPBOARD message */ if ( !EmptyClipboard() ) - HANDLE_ERROR( CLIPBRD_E_CANT_EMPTY ); + { + hr = CLIPBRD_E_CANT_EMPTY; + goto end; + } /* * If we are already holding on to an IDataObject first release that. @@ -1409,22 +1391,15 @@ HRESULT WINAPI OleSetClipboard(IDataObject* pDataObj) { IDataObject_AddRef(theOleClipboard->pIDataObjectSrc); hr = set_clipboard_formats(pDataObj); - if(FAILED(hr)) goto CLEANUP; + if(FAILED(hr)) goto end; } hr = set_dataobject_format(theOleClipboard->hWndClipboard); -CLEANUP: +end: - /* - * Close Windows clipboard (It remains associated with our window) - */ - if ( bClipboardOpen && !CloseClipboard() ) - hr = CLIPBRD_E_CANT_CLOSE; + if ( !CloseClipboard() ) hr = CLIPBRD_E_CANT_CLOSE; - /* - * Release the source IDataObject if something failed - */ if ( FAILED(hr) ) { if (theOleClipboard->pIDataObjectSrc) @@ -1477,7 +1452,6 @@ HRESULT WINAPI OleFlushClipboard(void) IEnumFORMATETC* penumFormatetc = NULL; FORMATETC rgelt; HRESULT hr = S_OK; - BOOL bClipboardOpen = FALSE; TRACE("()\n"); @@ -1489,8 +1463,8 @@ HRESULT WINAPI OleFlushClipboard(void) if (!theOleClipboard->pIDataObjectSrc) return S_OK; - if ( !(bClipboardOpen = OpenClipboard(theOleClipboard->hWndClipboard)) ) - HANDLE_ERROR( CLIPBRD_E_CANT_OPEN ); + if (!OpenClipboard(theOleClipboard->hWndClipboard)) + return CLIPBRD_E_CANT_OPEN; /* * Render all HGLOBAL formats supported by the source into @@ -1499,9 +1473,8 @@ HRESULT WINAPI OleFlushClipboard(void) if ( FAILED( hr = IDataObject_EnumFormatEtc( theOleClipboard->pIDataObjectSrc, DATADIR_GET, &penumFormatetc) )) - { - HANDLE_ERROR( hr ); - } + goto end; + while ( S_OK == IEnumFORMATETC_Next(penumFormatetc, 1, &rgelt, NULL) ) { @@ -1524,10 +1497,9 @@ HRESULT WINAPI OleFlushClipboard(void) IDataObject_Release(theOleClipboard->pIDataObjectSrc); theOleClipboard->pIDataObjectSrc = NULL; -CLEANUP: +end: - if ( bClipboardOpen && !CloseClipboard() ) - hr = CLIPBRD_E_CANT_CLOSE; + if ( !CloseClipboard() ) hr = CLIPBRD_E_CANT_CLOSE; return hr; }

1 0

Huw Davies : ole32/tests: On win9x GetClipboardData returns a new handle.
by Alexandre Julliard 31 Mar '09

31 Mar '09

Module: wine Branch: master Commit: 5492fd2b0d062586e848373238827e0f12f86c83 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5492fd2b0d062586e84837323… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Mar 31 10:11:46 2009 +0100 ole32/tests: On win9x GetClipboardData returns a new handle. --- dlls/ole32/tests/clipboard.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/ole32/tests/clipboard.c b/dlls/ole32/tests/clipboard.c index 7e18549..8b16a5f 100644 --- a/dlls/ole32/tests/clipboard.c +++ b/dlls/ole32/tests/clipboard.c @@ -746,7 +746,9 @@ static void test_set_clipboard(void) h = SetClipboardData(cf_onemore, hblob); ok(h == hblob, "got %p\n", h); h = GetClipboardData(cf_onemore); - ok(h == hblob, "got %p\n", h); + ok(h == hblob || + broken(h != NULL), /* win9x */ + "got %p\n", h); CloseClipboard(); hr = OleFlushClipboard(); @@ -761,7 +763,9 @@ static void test_set_clipboard(void) /* format should survive the flush */ OpenClipboard(NULL); h = GetClipboardData(cf_onemore); - ok(h == hblob, "got %p\n", h); + ok(h == hblob || + broken(h != NULL), /* win9x */ + "got %p\n", h); CloseClipboard(); test_cf_dataobject(NULL);

1 0

Huw Davies : ole32/tests: Add broken return value for win98.
by Alexandre Julliard 31 Mar '09

31 Mar '09

Module: wine Branch: master Commit: d28d731b615d89ad683ac3e719da5f45afb04da9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d28d731b615d89ad683ac3e71… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Mar 31 10:18:13 2009 +0100 ole32/tests: Add broken return value for win98. --- dlls/ole32/tests/clipboard.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/ole32/tests/clipboard.c b/dlls/ole32/tests/clipboard.c index 8b16a5f..f0296ac 100644 --- a/dlls/ole32/tests/clipboard.c +++ b/dlls/ole32/tests/clipboard.c @@ -517,7 +517,9 @@ static void test_enum_fmtetc(IDataObject *src) ok(hr == S_OK, "OleGetClipboard failed with error 0x%08x\n", hr); hr = IDataObject_EnumFormatEtc(data, DATADIR_SET, &enum_fmt); - ok(hr == E_NOTIMPL, "got %08x\n", hr); + ok(hr == E_NOTIMPL || + broken(hr == E_INVALIDARG), /* win98 (not win98SE) */ + "got %08x\n", hr); DataObjectImpl_EnumFormatEtc_calls = 0; hr = IDataObject_EnumFormatEtc(data, DATADIR_GET, &enum_fmt);

1 0

Huw Davies : ole32/tests: Add some tests for stream data.
by Alexandre Julliard 31 Mar '09

31 Mar '09

Module: wine Branch: master Commit: 61fa9bb06148ec5e256b676323499b45cf901920 URL: http://source.winehq.org/git/wine.git/?a=commit;h=61fa9bb06148ec5e256b67632… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Mar 31 12:07:14 2009 +0100 ole32/tests: Add some tests for stream data. --- dlls/ole32/tests/clipboard.c | 75 +++++++++++++++++++++++++++++++++++------ 1 files changed, 64 insertions(+), 11 deletions(-) diff --git a/dlls/ole32/tests/clipboard.c b/dlls/ole32/tests/clipboard.c index f0296ac..1918b2c 100644 --- a/dlls/ole32/tests/clipboard.c +++ b/dlls/ole32/tests/clipboard.c @@ -21,6 +21,7 @@ #define COBJMACROS #include <stdarg.h> +#include <stdio.h> #include "windef.h" #include "winbase.h" @@ -37,6 +38,15 @@ (fe).lindex=-1;\ }; +static inline char *dump_fmtetc(FORMATETC *fmt) +{ + static char buf[100]; + + snprintf(buf, sizeof(buf), "cf %04x ptd %p aspect %x lindex %d tymed %x", + fmt->cfFormat, fmt->ptd, fmt->dwAspect, fmt->lindex, fmt->tymed); + return buf; +} + typedef struct DataObjectImpl { const IDataObjectVtbl *lpVtbl; LONG ref; @@ -61,9 +71,10 @@ typedef struct EnumFormatImpl { static BOOL expect_DataObjectImpl_QueryGetData = TRUE; static ULONG DataObjectImpl_GetData_calls = 0; +static ULONG DataObjectImpl_GetDataHere_calls = 0; static ULONG DataObjectImpl_EnumFormatEtc_calls = 0; -static UINT cf_stream, cf_storage, cf_another, cf_onemore; +static UINT cf_stream, cf_storage, cf_global, cf_another, cf_onemore; static HRESULT EnumFormatImpl_Create(FORMATETC *fmtetc, UINT size, LPENUMFORMATETC *lplpformatetc); @@ -216,6 +227,8 @@ static HRESULT WINAPI DataObjectImpl_GetData(IDataObject* iface, FORMATETC *pfor UINT i; BOOL foundFormat = FALSE; + trace("getdata: %s\n", dump_fmtetc(pformatetc)); + DataObjectImpl_GetData_calls++; if(pformatetc->lindex != -1) @@ -231,7 +244,7 @@ static HRESULT WINAPI DataObjectImpl_GetData(IDataObject* iface, FORMATETC *pfor pmedium->pUnkForRelease = (LPUNKNOWN)iface; IUnknown_AddRef(pmedium->pUnkForRelease); - if(pformatetc->cfFormat == CF_TEXT) + if(pformatetc->cfFormat == CF_TEXT || pformatetc->cfFormat == cf_global) U(*pmedium).hGlobal = This->text; else if(pformatetc->cfFormat == cf_stream) U(*pmedium).pstm = This->stm; @@ -247,7 +260,9 @@ static HRESULT WINAPI DataObjectImpl_GetData(IDataObject* iface, FORMATETC *pfor static HRESULT WINAPI DataObjectImpl_GetDataHere(IDataObject* iface, FORMATETC *pformatetc, STGMEDIUM *pmedium) { - ok(0, "unexpected call\n"); + trace("getdatahere: %s\n", dump_fmtetc(pformatetc)); + DataObjectImpl_GetDataHere_calls++; + return E_NOTIMPL; } @@ -257,6 +272,7 @@ static HRESULT WINAPI DataObjectImpl_QueryGetData(IDataObject* iface, FORMATETC UINT i; BOOL foundFormat = FALSE; + trace("querygetdata: %s\n", dump_fmtetc(pformatetc)); if (!expect_DataObjectImpl_QueryGetData) ok(0, "unexpected call to DataObjectImpl_QueryGetData\n"); @@ -357,11 +373,12 @@ static HRESULT DataObjectImpl_CreateText(LPCSTR text, LPDATAOBJECT *lplpdataobj) return S_OK; } +const char *cmpl_stm_data = "complex stream"; +const char *cmpl_text_data = "complex text"; + static HRESULT DataObjectImpl_CreateComplex(LPDATAOBJECT *lplpdataobj) { DataObjectImpl *obj; - const char *stm_data = "complex stream"; - const char *text_data = "complex text"; ILockBytes *lbs; static const WCHAR devname[] = {'m','y','d','e','v',0}; DEVMODEW dm; @@ -369,17 +386,17 @@ static HRESULT DataObjectImpl_CreateComplex(LPDATAOBJECT *lplpdataobj) obj = HeapAlloc(GetProcessHeap(), 0, sizeof(DataObjectImpl)); obj->lpVtbl = &VT_DataObjectImpl; obj->ref = 1; - obj->text = GlobalAlloc(GMEM_MOVEABLE, strlen(text_data) + 1); - strcpy(GlobalLock(obj->text), text_data); + obj->text = GlobalAlloc(GMEM_MOVEABLE, strlen(cmpl_text_data) + 1); + strcpy(GlobalLock(obj->text), cmpl_text_data); GlobalUnlock(obj->text); CreateStreamOnHGlobal(NULL, TRUE, &obj->stm); - IStream_Write(obj->stm, stm_data, strlen(stm_data), NULL); + IStream_Write(obj->stm, cmpl_stm_data, strlen(cmpl_stm_data), NULL); CreateILockBytesOnHGlobal(NULL, TRUE, &lbs); StgCreateDocfileOnILockBytes(lbs, STGM_CREATE|STGM_SHARE_EXCLUSIVE|STGM_READWRITE, 0, &obj->stg); ILockBytes_Release(lbs); - obj->fmtetc_cnt = 5; + obj->fmtetc_cnt = 8; /* zeroing here since FORMATETC has a hole in it, and it's confusing to have this uninitialised. */ obj->fmtetc = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, obj->fmtetc_cnt*sizeof(FORMATETC)); InitFormatEtc(obj->fmtetc[0], CF_TEXT, TYMED_HGLOBAL); @@ -399,8 +416,11 @@ static HRESULT DataObjectImpl_CreateComplex(LPDATAOBJECT *lplpdataobj) lstrcpyW((WCHAR*)obj->fmtetc[3].ptd->tdData, devname); memcpy(obj->fmtetc[3].ptd->tdData + sizeof(devname), &dm, dm.dmSize + dm.dmDriverExtra); - InitFormatEtc(obj->fmtetc[4], cf_stream, 0xfffff); - obj->fmtetc[4].dwAspect = DVASPECT_ICON; + InitFormatEtc(obj->fmtetc[4], cf_global, TYMED_HGLOBAL); + InitFormatEtc(obj->fmtetc[5], cf_another, TYMED_HGLOBAL); + InitFormatEtc(obj->fmtetc[6], cf_another, 0xfffff); + InitFormatEtc(obj->fmtetc[7], cf_another, 0xfffff); + obj->fmtetc[7].dwAspect = DVASPECT_ICON; *lplpdataobj = (LPDATAOBJECT)obj; return S_OK; @@ -533,6 +553,7 @@ static void test_enum_fmtetc(IDataObject *src) ok(src != NULL, "shouldn't be here\n"); hr = IEnumFORMATETC_Next(src_enum, 1, &src_fmt, NULL); ok(hr == S_OK, "%d: got %08x\n", count, hr); + trace("%d: cf %04x aspect %x tymed %x\n", count, fmt.cfFormat, fmt.dwAspect, fmt.tymed); ok(fmt.cfFormat == src_fmt.cfFormat, "%d: %04x %04x\n", count, fmt.cfFormat, src_fmt.cfFormat); ok(fmt.dwAspect == src_fmt.dwAspect, "%d: %08x %08x\n", count, fmt.dwAspect, src_fmt.dwAspect); ok(fmt.lindex == src_fmt.lindex, "%d: %08x %08x\n", count, fmt.lindex, src_fmt.lindex); @@ -673,6 +694,36 @@ static void test_cf_dataobject(IDataObject *data) } } } + else if(cf == cf_stream) + { + HGLOBAL h; + void *ptr; + DWORD size; + + DataObjectImpl_GetDataHere_calls = 0; + h = GetClipboardData(cf); + ok(DataObjectImpl_GetDataHere_calls == 1, "got %d\n", DataObjectImpl_GetDataHere_calls); + ptr = GlobalLock(h); + size = GlobalSize(h); + ok(size == strlen(cmpl_stm_data), "expected %d got %d\n", strlen(cmpl_stm_data), size); + ok(!memcmp(ptr, cmpl_stm_data, size), "mismatch\n"); + GlobalUnlock(h); + } + else if(cf == cf_global) + { + HGLOBAL h; + void *ptr; + DWORD size; + + DataObjectImpl_GetDataHere_calls = 0; + h = GetClipboardData(cf); + ok(DataObjectImpl_GetDataHere_calls == 0, "got %d\n", DataObjectImpl_GetDataHere_calls); + ptr = GlobalLock(h); + size = GlobalSize(h); + ok(size == strlen(cmpl_text_data) + 1, "expected %d got %d\n", strlen(cmpl_text_data) + 1, size); + ok(!memcmp(ptr, cmpl_text_data, size), "mismatch\n"); + GlobalUnlock(h); + } } while(cf); CloseClipboard(); ok(found_dataobject, "didn't find cf_dataobject\n"); @@ -688,6 +739,7 @@ static void test_set_clipboard(void) cf_stream = RegisterClipboardFormatA("stream format"); cf_storage = RegisterClipboardFormatA("storage format"); + cf_global = RegisterClipboardFormatA("global format"); cf_another = RegisterClipboardFormatA("another format"); cf_onemore = RegisterClipboardFormatA("one more format"); @@ -779,6 +831,7 @@ static void test_set_clipboard(void) ok(h == NULL, "got %p\n", h); CloseClipboard(); + trace("setting complex\n"); hr = OleSetClipboard(data_cmpl); ok(hr == S_OK, "failed to set clipboard to complex data, hr = 0x%08x\n", hr); test_cf_dataobject(data_cmpl);

1 0

Alexandre Julliard : winecrt0: Don' t bother passing the environment to the _init function.
by Alexandre Julliard 31 Mar '09

31 Mar '09

Module: wine Branch: master Commit: 2ef9411434d9865ea703b322e30265ee7b196207 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ef9411434d9865ea703b322e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 31 16:06:11 2009 +0200 winecrt0: Don't bother passing the environment to the _init function. We'd have to use the Windows environment anyway, not the Unix one. --- dlls/winecrt0/dll_entry.c | 2 +- dlls/winecrt0/drv_entry.c | 2 +- dlls/winecrt0/exe_entry.c | 2 +- dlls/winecrt0/exe_wentry.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/winecrt0/dll_entry.c b/dlls/winecrt0/dll_entry.c index c739ea2..9bbe8c4 100644 --- a/dlls/winecrt0/dll_entry.c +++ b/dlls/winecrt0/dll_entry.c @@ -34,7 +34,7 @@ BOOL WINAPI DECLSPEC_HIDDEN __wine_spec_dll_entry( HINSTANCE inst, DWORD reason, if (reason == DLL_PROCESS_ATTACH && __wine_spec_init_state != CONSTRUCTORS_DONE) { call_fini = TRUE; - _init( __wine_main_argc, __wine_main_argv, __wine_main_environ ); + _init( __wine_main_argc, __wine_main_argv, NULL ); } ret = DllMain( inst, reason, reserved ); diff --git a/dlls/winecrt0/drv_entry.c b/dlls/winecrt0/drv_entry.c index a55f81d..32a87ee 100644 --- a/dlls/winecrt0/drv_entry.c +++ b/dlls/winecrt0/drv_entry.c @@ -31,7 +31,7 @@ NTSTATUS DECLSPEC_HIDDEN WINAPI __wine_spec_drv_entry( struct _DRIVER_OBJECT *ob { BOOL needs_init = (__wine_spec_init_state != CONSTRUCTORS_DONE); - if (needs_init) _init( __wine_main_argc, __wine_main_argv, __wine_main_environ ); + if (needs_init) _init( __wine_main_argc, __wine_main_argv, NULL ); return DriverEntry( obj, path ); /* there is no detach routine so we can't call destructors */ } diff --git a/dlls/winecrt0/exe_entry.c b/dlls/winecrt0/exe_entry.c index 4722da3..4165651 100644 --- a/dlls/winecrt0/exe_entry.c +++ b/dlls/winecrt0/exe_entry.c @@ -32,7 +32,7 @@ DWORD WINAPI DECLSPEC_HIDDEN __wine_spec_exe_entry( PEB *peb ) BOOL needs_init = (__wine_spec_init_state != CONSTRUCTORS_DONE); DWORD ret; - if (needs_init) _init( __wine_main_argc, __wine_main_argv, __wine_main_environ ); + if (needs_init) _init( __wine_main_argc, __wine_main_argv, NULL ); ret = main( __wine_main_argc, __wine_main_argv ); if (needs_init) _fini(); ExitProcess( ret ); diff --git a/dlls/winecrt0/exe_wentry.c b/dlls/winecrt0/exe_wentry.c index b267c2f..11cff89 100644 --- a/dlls/winecrt0/exe_wentry.c +++ b/dlls/winecrt0/exe_wentry.c @@ -32,7 +32,7 @@ DWORD WINAPI DECLSPEC_HIDDEN __wine_spec_exe_wentry( PEB *peb ) BOOL needs_init = (__wine_spec_init_state != CONSTRUCTORS_DONE); DWORD ret; - if (needs_init) _init( __wine_main_argc, __wine_main_argv, __wine_main_environ ); + if (needs_init) _init( __wine_main_argc, __wine_main_argv, NULL ); ret = wmain( __wine_main_argc, __wine_main_wargv ); if (needs_init) _fini(); ExitProcess( ret );

1 0

Rob Shearman : include: Move some declarations in ws2tcpip. h to where they belong in new ws2ipdef.h header.
by Alexandre Julliard 31 Mar '09

31 Mar '09

Module: wine Branch: master Commit: 76fdd19476e809012cb5b0752764f052b8389a9c URL: http://source.winehq.org/git/wine.git/?a=commit;h=76fdd19476e809012cb5b0752… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Tue Mar 31 13:37:49 2009 +0100 include: Move some declarations in ws2tcpip.h to where they belong in new ws2ipdef.h header. --- include/Makefile.in | 1 + include/ws2ipdef.h | 151 +++++++++++++++++++++++++++++++++++++++++++++++++++ include/ws2tcpip.h | 115 +-------------------------------------- 3 files changed, 153 insertions(+), 114 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=76fdd19476e809012cb5b…

1 0

Rob Shearman : include: Add TCP and IPv6 option defines to ws2ipdef.h.
by Alexandre Julliard 31 Mar '09

31 Mar '09

Module: wine Branch: master Commit: b4ee082d8a211a2f921aa0f00ac6ec148d54ece3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b4ee082d8a211a2f921aa0f00… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Tue Mar 31 13:37:58 2009 +0100 include: Add TCP and IPv6 option defines to ws2ipdef.h. Add more IP option defines. Add defines for address string lengths for IPv4 and IPv6. --- include/ws2ipdef.h | 117 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 117 insertions(+), 0 deletions(-) diff --git a/include/ws2ipdef.h b/include/ws2ipdef.h index 588fefc..1fcfd27 100644 --- a/include/ws2ipdef.h +++ b/include/ws2ipdef.h @@ -91,7 +91,16 @@ typedef struct _INTERFACE_INFO #define IP_BLOCK_SOURCE 17 #define IP_UNBLOCK_SOURCE 18 #define IP_PKTINFO 19 +#define IP_HOPLIMIT 21 #define IP_RECEIVE_BROADCAST 22 +#define IP_RECVIF 24 +#define IP_RECVDSTADDR 25 +#define IP_IFLIST 28 +#define IP_ADD_IFLIST 29 +#define IP_DEL_IFLIST 30 +#define IP_UNICAST_IF 31 +#define IP_RTHDR 32 +#define IP_RECVRTHDR 38 #else #define WS_IP_OPTIONS 1 #define WS_IP_HDRINCL 2 @@ -108,7 +117,16 @@ typedef struct _INTERFACE_INFO #define WS_IP_BLOCK_SOURCE 17 #define WS_IP_UNBLOCK_SOURCE 18 #define WS_IP_PKTINFO 19 +#define WS_IP_HOPLIMIT 21 #define WS_IP_RECEIVE_BROADCAST 22 +#define WS_IP_RECVIF 24 +#define WS_IP_RECVDSTADDR 25 +#define WS_IP_IFLIST 28 +#define WS_IP_ADD_IFLIST 29 +#define WS_IP_DEL_IFLIST 30 +#define WS_IP_UNICAST_IF 31 +#define WS_IP_RTHDR 32 +#define WS_IP_RECVRTHDR 38 #endif /* USE_WS_PREFIX */ typedef struct WS(sockaddr_in6) @@ -144,6 +162,105 @@ struct WS(ip_msfilter) { struct WS(in_addr) imsf_slist[1]; } WS(IP_MSFILTER), *WS(PIP_MSFILTER); +#ifndef USE_WS_PREFIX +#define IPV6_OPTIONS 1 +#define IPV6_HDRINCL 2 +#define IPV6_UNICAST_HOPS 4 +#define IPV6_MULTICAST_IF 9 +#define IPV6_MULTICAST_HOPS 10 +#define IPV6_MULTICAST_LOOP 11 +#define IPV6_ADD_MEMBERSHIP 12 +#define IPV6_JOIN_GROUP IPV6_ADD_MEMBERSHIP +#define IPV6_DROP_MEMBERSHIP 13 +#define IPV6_LEAVE_GROUP IPV6_DROP_MEMBERSHIP +#define IPV6_DONTFRAG 14 +#define IPV6_PKTINFO 19 +#define IPV6_HOPLIMIT 21 +#define IPV6_PROTECTION_LEVEL 23 +#define IPV6_RECVIF 24 +#define IPV6_RECVDSTADDR 25 +#define IPV6_CHECKSUM 26 +#define IPV6_V6ONLY 27 +#define IPV6_IFLIST 28 +#define IPV6_ADD_IFLIST 29 +#define IPV6_DEL_IFLIST 30 +#define IPV6_UNICAST_IF 31 +#define IPV6_RTHDR 32 +#define IPV6_RECVRTHDR 38 +#else +#define WS_IPV6_OPTIONS 1 +#define WS_IPV6_HDRINCL 2 +#define WS_IPV6_UNICAST_HOPS 4 +#define WS_IPV6_MULTICAST_IF 9 +#define WS_IPV6_MULTICAST_HOPS 10 +#define WS_IPV6_MULTICAST_LOOP 11 +#define WS_IPV6_ADD_MEMBERSHIP 12 +#define WS_IPV6_DROP_MEMBERSHIP 13 +#define WS_IPV6_LEAVE_GROUP WS_IPV6_DROP_MEMBERSHIP +#define WS_IPV6_DONTFRAG 14 +#define WS_IPV6_PKTINFO 19 +#define WS_IPV6_HOPLIMIT 21 +#define WS_IPV6_PROTECTION_LEVEL 23 +#define WS_IPV6_RECVIF 24 +#define WS_IPV6_RECVDSTADDR 25 +#define WS_IPV6_CHECKSUM 26 +#define WS_IPV6_V6ONLY 27 +#define WS_IPV6_IFLIST 28 +#define WS_IPV6_ADD_IFLIST 29 +#define WS_IPV6_DEL_IFLIST 30 +#define WS_IPV6_UNICAST_IF 31 +#define WS_IPV6_RTHDR 32 +#define WS_IPV6_RECVRTHDR 38 +#endif /* USE_WS_PREFIX */ + +#ifndef USE_WS_PREFIX +#define TCP_OFFLOAD_NO_PREFERENCE 0 +#define TCP_OFFLOAD_NOT_PREFERRED 1 +#define TCP_OFFLOAD_PREFERRED 2 +#else +#define WS_TCP_OFFLOAD_NO_PREFERENCE 0 +#define WS_TCP_OFFLOAD_NOT_PREFERRED 1 +#define WS_TCP_OFFLOAD_PREFERRED 2 +#endif /* USE_WS_PREFIX */ + +#ifndef USE_WS_PREFIX +/* TCP_NODELAY is defined elsewhere */ +#define TCP_EXPEDITED_1122 2 +#define TCP_KEEPALIVE 3 +#define TCP_MAXSEG 4 +#define TCP_MAXRT 5 +#define TCP_STDURG 6 +#define TCP_NOURG 7 +#define TCP_ATMARK 8 +#define TCP_NOSYNRETRIES 9 +#define TCP_TIMESTAMPS 10 +#define TCP_OFFLOAD_PREFERENCE 11 +#define TCP_CONGESTION_ALGORITHM 12 +#define TCP_DELAY_FIN_ACK 13 +#else +/* WS_TCP_NODELAY is defined elsewhere */ +#define WS_TCP_EXPEDITED_1122 2 +#define WS_TCP_KEEPALIVE 3 +#define WS_TCP_MAXSEG 4 +#define WS_TCP_MAXRT 5 +#define WS_TCP_STDURG 6 +#define WS_TCP_NOURG 7 +#define WS_TCP_ATMARK 8 +#define WS_TCP_NOSYNRETRIES 9 +#define WS_TCP_TIMESTAMPS 10 +#define WS_TCP_OFFLOAD_PREFERENCE 11 +#define WS_TCP_CONGESTION_ALGORITHM 12 +#define WS_TCP_DELAY_FIN_ACK 13 +#endif /* USE_WS_PREFIX */ + +#ifndef USE_WS_PREFIX +#define INET_ADDRSTRLEN 22 +#define INET6_ADDRSTRLEN 65 +#else +#define WS_INET_ADDRSTRLEN 22 +#define WS_INET6_ADDRSTRLEN 65 +#endif /* USE_WS_PREFIX */ + #ifdef __cplusplus } #endif

1 0

Rob Shearman : include: Add a stub implementation of gai_strerror{A, W}.
by Alexandre Julliard 31 Mar '09

31 Mar '09

Module: wine Branch: master Commit: fc10ba8fc75c89f11c716201c86f49f4ae00d1d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc10ba8fc75c89f11c716201c… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Tue Mar 31 13:38:04 2009 +0100 include: Add a stub implementation of gai_strerror{A,W}. --- include/ws2tcpip.h | 32 ++++++++++++++++++++++++++++++++ 1 files changed, 32 insertions(+), 0 deletions(-) diff --git a/include/ws2tcpip.h b/include/ws2tcpip.h index 07b357b..8084170 100644 --- a/include/ws2tcpip.h +++ b/include/ws2tcpip.h @@ -112,6 +112,38 @@ typedef ADDRINFOA ADDRINFO, *LPADDRINFO; extern "C" { #endif +#define GAI_STRERROR_BUFFER_SIZE 1024 + +static inline char *gai_strerrorA(int errcode) +{ + static char buffer[GAI_STRERROR_BUFFER_SIZE + 1]; + + /* FIXME: should format message from system, ignoring inserts in neutral + * language */ + buffer[0] = '\0'; + + return buffer; +} + +static inline WCHAR *gai_strerrorW(int errcode) +{ + static WCHAR buffer[GAI_STRERROR_BUFFER_SIZE + 1]; + + /* FIXME: should format message from system, ignoring inserts in neutral + * language */ + buffer[0] = '\0'; + + return buffer; +} + +#ifdef USE_WS_PREFIX +# define WS_gai_strerror WINELIB_NAME_AW(gai_strerror) +#elif defined(WINE_NO_UNICODE_MACROS) +# define gai_strerror gai_strerrorA +#else +# define gai_strerror WINELIB_NAME_AW(gai_strerror) +#endif + void WINAPI WS(freeaddrinfo)(LPADDRINFO); #define FreeAddrInfoA WS(freeaddrinfo) void WINAPI FreeAddrInfoW(PADDRINFOW);

1 0

Massimo Del Fedele : gdi32/tests: Add test for GetGlyphOutlineW() requesting buffer size for space char.
by Alexandre Julliard 31 Mar '09

31 Mar '09

Module: wine Branch: master Commit: 97e81bc3bdc49456ceb479a76e39ece84133e912 URL: http://source.winehq.org/git/wine.git/?a=commit;h=97e81bc3bdc49456ceb479a76… Author: Massimo Del Fedele <max(a)veneto.com> Date: Mon Mar 30 19:47:29 2009 +0200 gdi32/tests: Add test for GetGlyphOutlineW() requesting buffer size for space char. --- dlls/gdi32/tests/font.c | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index cc5e3f5..c10d6e8 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -2887,6 +2887,23 @@ static void test_GetGlyphOutline(void) ok(GetLastError() == 0xdeadbeef, "expected 0xdeadbeef, got %u\n", GetLastError()); } + /* test for needed buffer size request on space char */ + memset(&gm, 0, sizeof(gm)); + SetLastError(0xdeadbeef); + ret = GetGlyphOutlineW(hdc, ' ', GGO_NATIVE, &gm, 0, NULL, &mat); + if (GetLastError() != ERROR_CALL_NOT_IMPLEMENTED) + ok(ret == 0, "GetGlyphOutlineW should return 0 buffer size for space char\n"); + + /* requesting buffer size for space char + error */ + memset(&gm, 0, sizeof(gm)); + SetLastError(0xdeadbeef); + ret = GetGlyphOutlineW(0, ' ', GGO_NATIVE, &gm, 0, NULL, NULL); + if (GetLastError() != ERROR_CALL_NOT_IMPLEMENTED) + { + ok(ret == GDI_ERROR, "GetGlyphOutlineW should return GDI_ERROR\n"); + ok(GetLastError() == 0xdeadbeef, "expected 0xdeadbeef, got %u\n", GetLastError()); + } + SelectObject(hdc, old_hfont); DeleteObject(hfont); DeleteDC(hdc);

1 0

Massimo Del Fedele : gdi32: Correctly handle space char on Path_ExtTextOut( ).
by Alexandre Julliard 31 Mar '09

31 Mar '09

Module: wine Branch: master Commit: 23acdb7143569e2c0839f6f88c4462f2ed98068b URL: http://source.winehq.org/git/wine.git/?a=commit;h=23acdb7143569e2c0839f6f88… Author: Massimo Del Fedele <max(a)veneto.com> Date: Mon Mar 30 19:49:04 2009 +0200 gdi32: Correctly handle space char on Path_ExtTextOut(). --- dlls/gdi32/path.c | 16 ++++++++++------ 1 files changed, 10 insertions(+), 6 deletions(-) diff --git a/dlls/gdi32/path.c b/dlls/gdi32/path.c index 3ad551e..195f413 100644 --- a/dlls/gdi32/path.c +++ b/dlls/gdi32/path.c @@ -1460,16 +1460,20 @@ BOOL PATH_ExtTextOut(DC *dc, INT x, INT y, UINT flags, const RECT *lprc, void *outline; dwSize = GetGlyphOutlineW(hdc, str[idx], GGO_GLYPH_INDEX | GGO_NATIVE, &gm, 0, NULL, &identity); - if (!dwSize) return FALSE; + if (dwSize == GDI_ERROR) return FALSE; - outline = HeapAlloc(GetProcessHeap(), 0, dwSize); - if (!outline) return FALSE; + /* add outline only if char is printable */ + if(dwSize) + { + outline = HeapAlloc(GetProcessHeap(), 0, dwSize); + if (!outline) return FALSE; - GetGlyphOutlineW(hdc, str[idx], GGO_GLYPH_INDEX | GGO_NATIVE, &gm, dwSize, outline, &identity); + GetGlyphOutlineW(hdc, str[idx], GGO_GLYPH_INDEX | GGO_NATIVE, &gm, dwSize, outline, &identity); - PATH_add_outline(dc, org.x + x + xoff, org.x + y + yoff, outline, dwSize); + PATH_add_outline(dc, org.x + x + xoff, org.x + y + yoff, outline, dwSize); - HeapFree(GetProcessHeap(), 0, outline); + HeapFree(GetProcessHeap(), 0, outline); + } if (dx) {

1 0