November 2007 - Wine-commits

Andrew Talbot : gdi32: Fix a typo.
by Alexandre Julliard 27 Nov '07

27 Nov '07

Module: wine Branch: master Commit: 03bba1e6d4b8560ed0135e9cfa697c0b8e0f57da URL: http://source.winehq.org/git/wine.git/?a=commit;h=03bba1e6d4b8560ed0135e9cf… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Mon Nov 26 15:09:59 2007 +0000 gdi32: Fix a typo. --- dlls/gdi32/dc.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index 705d263..161e0df 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -472,7 +472,7 @@ void WINAPI SetDCState( HDC hdc, HDC hdcs ) release_dc_ptr( dc ); return; } - if (!dcs->flags & DC_SAVED) + if (!(dcs->flags & DC_SAVED)) { release_dc_ptr( dc ); release_dc_ptr( dcs );

1 0

Lauris Kaplinski : wined3d: Fixed potential reference of freed backBuffer array in IWineD3DDeviceImpl_SetFrontBackBuffers .
by Alexandre Julliard 27 Nov '07

27 Nov '07

Module: wine Branch: master Commit: 49ea085f118712b54dfef270391fa9b42bfefdec URL: http://source.winehq.org/git/wine.git/?a=commit;h=49ea085f118712b54dfef2703… Author: Lauris Kaplinski <lauris(a)kaplinski.com> Date: Sun Nov 25 23:07:24 2007 +0200 wined3d: Fixed potential reference of freed backBuffer array in IWineD3DDeviceImpl_SetFrontBackBuffers. --- dlls/wined3d/device.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 30ac0b7..8be3385 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -6047,6 +6047,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_SetFrontBackBuffers(IWineD3DDevice *ifa IWineD3DSurface_SetContainer(Swapchain->backBuffer[0], (IWineD3DBase *) Swapchain); } else { HeapFree(GetProcessHeap(), 0, Swapchain->backBuffer); + Swapchain->backBuffer = NULL; } }

1 0

Rob Shearman : advapi32: Add support for using the Mac Keychain services as a backend for the credential functions instead of the registry .
by Alexandre Julliard 27 Nov '07

27 Nov '07

Module: wine Branch: master Commit: 312a1db3ec28fe13cacc2719f782161ff6e224c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=312a1db3ec28fe13cacc2719f… Author: Rob Shearman <rob(a)codeweavers.com> Date: Mon Nov 26 22:57:35 2007 +0000 advapi32: Add support for using the Mac Keychain services as a backend for the credential functions instead of the registry. --- configure | 8 +- configure.ac | 1 + dlls/advapi32/Makefile.in | 1 + dlls/advapi32/cred.c | 540 ++++++++++++++++++++++++++++++++++++++++++++- 4 files changed, 543 insertions(+), 7 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=312a1db3ec28fe13cacc2…

1 0

Michael Stefaniuc : wininet/tests: Do not compare the return value of socket() with 0. Use INVALID_SOCKET instead.
by Alexandre Julliard 27 Nov '07

27 Nov '07

Module: wine Branch: master Commit: 6d8c2d744b7bba19e1d25a11dfb0f976828f2bb6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d8c2d744b7bba19e1d25a11d… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Nov 26 23:07:34 2007 +0100 wininet/tests: Do not compare the return value of socket() with 0. Use INVALID_SOCKET instead. --- dlls/wininet/tests/http.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index 4a28db9..ec2df72 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -1228,7 +1228,8 @@ struct server_info { static DWORD CALLBACK server_thread(LPVOID param) { struct server_info *si = param; - int r, s, c, i, on; + int r, c, i, on; + SOCKET s; struct sockaddr_in sa; char buffer[0x100]; WSADATA wsaData; @@ -1237,7 +1238,7 @@ static DWORD CALLBACK server_thread(LPVOID param) WSAStartup(MAKEWORD(1,1), &wsaData); s = socket(AF_INET, SOCK_STREAM, 0); - if (s<0) + if (s == INVALID_SOCKET) return 1; on = 1;

1 0

Michael Stefaniuc : rpcrt4: socket() returns -1 on error so check the return value against that.
by Alexandre Julliard 27 Nov '07

27 Nov '07

Module: wine Branch: master Commit: 61ed0c99e6e4bd85a68381396e2f7e0b5337fe19 URL: http://source.winehq.org/git/wine.git/?a=commit;h=61ed0c99e6e4bd85a68381396… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Nov 26 23:09:28 2007 +0100 rpcrt4: socket() returns -1 on error so check the return value against that. --- dlls/rpcrt4/rpc_transport.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/rpcrt4/rpc_transport.c b/dlls/rpcrt4/rpc_transport.c index dfb7ece..40cc613 100644 --- a/dlls/rpcrt4/rpc_transport.c +++ b/dlls/rpcrt4/rpc_transport.c @@ -773,7 +773,7 @@ static RPC_STATUS rpcrt4_ncacn_ip_tcp_open(RpcConnection* Connection) } sock = socket(ai_cur->ai_family, ai_cur->ai_socktype, ai_cur->ai_protocol); - if (sock < 0) + if (sock == -1) { WARN("socket() failed: %s\n", strerror(errno)); continue; @@ -850,7 +850,7 @@ static RPC_STATUS rpcrt4_protseq_ncacn_ip_tcp_open_endpoint(RpcServerProtseq *pr } sock = socket(ai_cur->ai_family, ai_cur->ai_socktype, ai_cur->ai_protocol); - if (sock < 0) + if (sock == -1) { WARN("socket() failed: %s\n", strerror(errno)); status = RPC_S_CANT_CREATE_ENDPOINT;

1 0

Andrew Talbot : dinput: Use bitwise NOT not logical NOT.
by Alexandre Julliard 27 Nov '07

27 Nov '07

Module: wine Branch: master Commit: 1067f56ca5cea4ea863d107f892aaa52aa80cae7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1067f56ca5cea4ea863d107f8… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Mon Nov 26 15:09:55 2007 +0000 dinput: Use bitwise NOT not logical NOT. --- dlls/dinput/effect_linuxinput.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/dinput/effect_linuxinput.c b/dlls/dinput/effect_linuxinput.c index f5851fc..37af31f 100644 --- a/dlls/dinput/effect_linuxinput.c +++ b/dlls/dinput/effect_linuxinput.c @@ -540,7 +540,7 @@ static HRESULT WINAPI LinuxInputEffectImpl_SetParameters( _dump_DIEFFECT(peff, &This->guid); - if ((dwFlags & !DIEP_NORESTART & !DIEP_NODOWNLOAD & !DIEP_START) == 0) { + if ((dwFlags & ~DIEP_NORESTART & ~DIEP_NODOWNLOAD & ~DIEP_START) == 0) { /* set everything */ dwFlags = DIEP_AXES | DIEP_DIRECTION | DIEP_DURATION | DIEP_ENVELOPE | DIEP_GAIN | DIEP_SAMPLEPERIOD | DIEP_STARTDELAY | DIEP_TRIGGERBUTTON |

1 0

Huw Davies : inetcomm: Implement IMimeBody:[G|S]etCurrentEncoding.
by Alexandre Julliard 27 Nov '07

27 Nov '07

Module: wine Branch: master Commit: dd66f04c218052f7fde5366c92289118f8b41512 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dd66f04c218052f7fde5366c9… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Nov 26 12:04:08 2007 +0000 inetcomm: Implement IMimeBody:[G|S]etCurrentEncoding. --- dlls/inetcomm/mimeole.c | 18 ++++++++++++++---- dlls/inetcomm/tests/mimeole.c | 5 +++++ 2 files changed, 19 insertions(+), 4 deletions(-) diff --git a/dlls/inetcomm/mimeole.c b/dlls/inetcomm/mimeole.c index dea1597..685356c 100644 --- a/dlls/inetcomm/mimeole.c +++ b/dlls/inetcomm/mimeole.c @@ -103,6 +103,7 @@ typedef struct MimeBody DWORD next_prop_id; char *content_pri_type; char *content_sub_type; + ENCODINGTYPE encoding; } MimeBody; static inline MimeBody *impl_from_IMimeBody( IMimeBody *iface ) @@ -762,16 +763,24 @@ static HRESULT WINAPI MimeBody_GetCurrentEncoding( IMimeBody* iface, ENCODINGTYPE* pietEncoding) { - FIXME("stub\n"); - return E_NOTIMPL; + MimeBody *This = impl_from_IMimeBody(iface); + + TRACE("(%p)->(%p)\n", This, pietEncoding); + + *pietEncoding = This->encoding; + return S_OK; } static HRESULT WINAPI MimeBody_SetCurrentEncoding( IMimeBody* iface, ENCODINGTYPE ietEncoding) { - FIXME("stub\n"); - return E_NOTIMPL; + MimeBody *This = impl_from_IMimeBody(iface); + + TRACE("(%p)->(%d)\n", This, ietEncoding); + + This->encoding = ietEncoding; + return S_OK; } static HRESULT WINAPI MimeBody_GetEstimatedSize( @@ -924,6 +933,7 @@ HRESULT MimeBody_create(IUnknown *outer, void **obj) This->next_prop_id = FIRST_CUSTOM_PROP_ID; This->content_pri_type = NULL; This->content_sub_type = NULL; + This->encoding = IET_7BIT; *obj = (IMimeBody *)&This->lpVtbl; return S_OK; diff --git a/dlls/inetcomm/tests/mimeole.c b/dlls/inetcomm/tests/mimeole.c index 2c814d2..32dec5c 100644 --- a/dlls/inetcomm/tests/mimeole.c +++ b/dlls/inetcomm/tests/mimeole.c @@ -89,6 +89,7 @@ static void test_CreateBody(void) IStream *in; LARGE_INTEGER off; ULARGE_INTEGER pos; + ENCODINGTYPE enc; hr = CoCreateInstance(&CLSID_IMimeBody, NULL, CLSCTX_INPROC_SERVER, &IID_IMimeBody, (void**)&body); ok(hr == S_OK, "ret %08x\n", hr); @@ -107,6 +108,10 @@ static void test_CreateBody(void) hr = IMimeBody_InitNew(body); ok(hr == S_OK, "ret %08x\n", hr); + hr = IMimeBody_GetCurrentEncoding(body, &enc); + ok(hr == S_OK, "ret %08x\n", hr); + ok(enc == IET_7BIT, "encoding %d\n", enc); + hr = IMimeBody_Load(body, in); ok(hr == S_OK, "ret %08x\n", hr); off.QuadPart = 0;

1 0

Huw Davies : inetcomm: Implement IMimeBody:SetData.
by Alexandre Julliard 27 Nov '07

27 Nov '07

Module: wine Branch: master Commit: ef59756ace4f21f496f029d7c5f9ccf4c0d3db0f URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef59756ace4f21f496f029d7c… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Nov 26 12:04:51 2007 +0000 inetcomm: Implement IMimeBody:SetData. --- dlls/inetcomm/mimeole.c | 44 +++++++++++++++++++++++++++++++++++++- dlls/inetcomm/regsvr.c | 4 ++- dlls/inetcomm/tests/Makefile.in | 2 +- dlls/inetcomm/tests/mimeole.c | 9 ++++++++ 4 files changed, 55 insertions(+), 4 deletions(-) diff --git a/dlls/inetcomm/mimeole.c b/dlls/inetcomm/mimeole.c index 685356c..16fe3f4 100644 --- a/dlls/inetcomm/mimeole.c +++ b/dlls/inetcomm/mimeole.c @@ -104,6 +104,8 @@ typedef struct MimeBody char *content_pri_type; char *content_sub_type; ENCODINGTYPE encoding; + void *data; + IID data_iid; } MimeBody; static inline MimeBody *impl_from_IMimeBody( IMimeBody *iface ) @@ -431,6 +433,16 @@ static void empty_new_prop_list(struct list *list) } } +static void release_data(REFIID riid, void *data) +{ + if(!data) return; + + if(IsEqualIID(riid, &IID_IStream)) + IStream_Release((IStream *)data); + else + FIXME("Unhandled data format %s\n", debugstr_guid(riid)); +} + static HRESULT WINAPI MimeBody_QueryInterface(IMimeBody* iface, REFIID riid, void** ppvObject) @@ -480,6 +492,9 @@ static ULONG WINAPI MimeBody_Release(IMimeBody* iface) HeapFree(GetProcessHeap(), 0, This->content_pri_type); HeapFree(GetProcessHeap(), 0, This->content_sub_type); + + release_data(&This->data_iid, This->data); + HeapFree(GetProcessHeap(), 0, This); } @@ -818,8 +833,31 @@ static HRESULT WINAPI MimeBody_SetData( REFIID riid, LPVOID pvObject) { - FIXME("stub\n"); - return E_NOTIMPL; + MimeBody *This = impl_from_IMimeBody(iface); + TRACE("(%p)->(%d, %s, %s, %s %p)\n", This, ietEncoding, debugstr_a(pszPriType), debugstr_a(pszSubType), + debugstr_guid(riid), pvObject); + + if(IsEqualIID(riid, &IID_IStream)) + IStream_AddRef((IStream *)pvObject); + else + { + FIXME("Unhandled object type %s\n", debugstr_guid(riid)); + return E_INVALIDARG; + } + + if(This->data) + FIXME("release old data\n"); + + This->data_iid = *riid; + This->data = pvObject; + + IMimeBody_SetCurrentEncoding(iface, ietEncoding); + + /* FIXME: Update the content type. + If pszPriType == NULL use 'application' + If pszSubType == NULL use 'octet-stream' */ + + return S_OK; } static HRESULT WINAPI MimeBody_EmptyData( @@ -934,6 +972,8 @@ HRESULT MimeBody_create(IUnknown *outer, void **obj) This->content_pri_type = NULL; This->content_sub_type = NULL; This->encoding = IET_7BIT; + This->data = NULL; + This->data_iid = IID_NULL; *obj = (IMimeBody *)&This->lpVtbl; return S_OK; diff --git a/dlls/inetcomm/regsvr.c b/dlls/inetcomm/regsvr.c index 9bd9930..97759fc 100644 --- a/dlls/inetcomm/regsvr.c +++ b/dlls/inetcomm/regsvr.c @@ -18,7 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define INITGUID #include <stdarg.h> #include <string.h> @@ -28,7 +27,10 @@ #include "winuser.h" #include "winreg.h" #include "winerror.h" +#include "objbase.h" +#include "ocidl.h" +#include "initguid.h" #include "inetcomm_private.h" #include "mimeole.h" diff --git a/dlls/inetcomm/tests/Makefile.in b/dlls/inetcomm/tests/Makefile.in index 93e8b3b..9c001cc 100644 --- a/dlls/inetcomm/tests/Makefile.in +++ b/dlls/inetcomm/tests/Makefile.in @@ -4,7 +4,7 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ TESTDLL = inetcomm.dll IMPORTS = inetcomm ole32 kernel32 -EXTRALIBS = +EXTRALIBS = -luuid CTESTS = \ mimeole.c diff --git a/dlls/inetcomm/tests/mimeole.c b/dlls/inetcomm/tests/mimeole.c index 32dec5c..c425c21 100644 --- a/dlls/inetcomm/tests/mimeole.c +++ b/dlls/inetcomm/tests/mimeole.c @@ -125,6 +125,15 @@ static void test_CreateBody(void) hr = IMimeBody_IsContentType(body, NULL, "mixed"); ok(hr == S_OK, "ret %08x\n", hr); + hr = IMimeBody_SetData(body, IET_8BIT, "text", "plain", &IID_IStream, in); + ok(hr == S_OK, "ret %08x\n", hr); + hr = IMimeBody_IsContentType(body, "text", "plain"); + todo_wine + ok(hr == S_OK, "ret %08x\n", hr); + hr = IMimeBody_GetCurrentEncoding(body, &enc); + ok(hr == S_OK, "ret %08x\n", hr); + ok(enc == IET_8BIT, "encoding %d\n", enc); + IMimeBody_Release(body); }

1 0

Rob Shearman : advapi32: Move credential registry reading code to separate functions.
by Alexandre Julliard 27 Nov '07

27 Nov '07

Module: wine Branch: master Commit: ca83f61d2ef7ca4472a8be25104d7819d8f534ce URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca83f61d2ef7ca4472a8be251… Author: Rob Shearman <rob(a)codeweavers.com> Date: Mon Nov 26 19:40:51 2007 +0000 advapi32: Move credential registry reading code to separate functions. --- dlls/advapi32/cred.c | 220 ++++++++++++++++++++++++-------------------------- 1 files changed, 106 insertions(+), 114 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ca83f61d2ef7ca4472a8b…

1 0

Rob Shearman : advapi32: Fix a typo in CredEnumerateW.
by Alexandre Julliard 27 Nov '07

27 Nov '07

Module: wine Branch: master Commit: 50532d8b4d257f8eb9126f4914d1a638b36eddcf URL: http://source.winehq.org/git/wine.git/?a=commit;h=50532d8b4d257f8eb9126f491… Author: Rob Shearman <rob(a)codeweavers.com> Date: Mon Nov 26 19:41:00 2007 +0000 advapi32: Fix a typo in CredEnumerateW. --- dlls/advapi32/cred.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/advapi32/cred.c b/dlls/advapi32/cred.c index e9bd3e8..3712329 100644 --- a/dlls/advapi32/cred.c +++ b/dlls/advapi32/cred.c @@ -832,7 +832,7 @@ BOOL WINAPI CredEnumerateW(LPCWSTR Filter, DWORD Flags, DWORD *Count, SetLastError(ret); return FALSE; } - len += *Count + sizeof(PCREDENTIALW); + len += *Count * sizeof(PCREDENTIALW); if (ret == ERROR_SUCCESS) {

1 0