January 2006 - Wine-Commits

Robert Shearman : kernel32: Check for the correct error return value from open.
by Alexandre Julliard Jan. 5, 2006

Jan. 5, 2006

Module: wine Branch: refs/heads/master Commit: 1191249fc96d60d07cc4ba74528c0fe2b383732e URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=1191249fc96d60d07cc4ba7… Author: Robert Shearman <rob(a)codeweavers.com> Date: Thu Jan 5 12:18:29 2006 +0100 kernel32: Check for the correct error return value from open. --- dlls/kernel/oldconfig.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/kernel/oldconfig.c b/dlls/kernel/oldconfig.c index eb73f78..47e249f 100644 --- a/dlls/kernel/oldconfig.c +++ b/dlls/kernel/oldconfig.c @@ -161,12 +161,11 @@ static void create_scsi_entry( PSCSI_ADD int fd, dma; fd = open(lpUnixDeviceName, O_RDONLY|O_NONBLOCK); - if (fd) + if (fd != -1) { if (ioctl(fd, HDIO_GET_DMA, &dma) != -1) value = dma; close(fd); - }else - ERR("Can't open %s", buffer); + } #endif RtlCreateUnicodeStringFromAsciiz( &nameW, "DMAEnabled" ); NtSetValueKey( portKey,&nameW, 0, REG_DWORD, (BYTE *)&value, sizeof(DWORD));

1 0

Jacek Caban : urlmon: Code clean up.
by Alexandre Julliard Jan. 5, 2006

Jan. 5, 2006

Module: wine Branch: refs/heads/master Commit: 089435d43baa1a76e9fc929c778859cfb0880ca9 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=089435d43baa1a76e9fc929… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jan 5 12:18:06 2006 +0100 urlmon: Code clean up. --- dlls/urlmon/tests/url.c | 90 +++++++++++------------------------------------ 1 files changed, 22 insertions(+), 68 deletions(-) diff --git a/dlls/urlmon/tests/url.c b/dlls/urlmon/tests/url.c index 3b3f363..f97aad8 100644 --- a/dlls/urlmon/tests/url.c +++ b/dlls/urlmon/tests/url.c @@ -327,18 +327,15 @@ static const IInternetProtocolVtbl Proto static IInternetProtocol Protocol = { &ProtocolVtbl }; -typedef struct { - const IBindStatusCallbackVtbl *lpVtbl; - LONG ref; - IBinding *pbind; - IStream *pstr; -} statusclb; - static HRESULT WINAPI statusclb_QueryInterface(IBindStatusCallback *iface, REFIID riid, void **ppv) { - if(emulate_protocol && IsEqualGUID(&IID_IInternetProtocol, riid)) { - *ppv = &Protocol; - return S_OK; + if(IsEqualGUID(&IID_IInternetProtocol, riid)) { + if(emulate_protocol) { + *ppv = &Protocol; + return S_OK; + }else { + return E_NOINTERFACE; + } } return E_NOINTERFACE; @@ -346,32 +343,23 @@ static HRESULT WINAPI statusclb_QueryInt static ULONG WINAPI statusclb_AddRef(IBindStatusCallback *iface) { - return InterlockedIncrement(&((statusclb*)iface)->ref); + return 2; } static ULONG WINAPI statusclb_Release(IBindStatusCallback *iface) { - statusclb *This = (statusclb*)iface; - ULONG ref; - ref = InterlockedDecrement(&This->ref); - if(!ref) - HeapFree(GetProcessHeap(), 0, This); - return ref; + return 1; } static HRESULT WINAPI statusclb_OnStartBinding(IBindStatusCallback *iface, DWORD dwReserved, IBinding *pib) { - statusclb *This = (statusclb*)iface; HRESULT hres; IMoniker *mon; CHECK_EXPECT(OnStartBinding); - This->pbind = pib; ok(pib != NULL, "pib should not be NULL\n"); - if(pib) - IBinding_AddRef(pib); hres = IBinding_QueryInterface(pib, &IID_IMoniker, (void**)&mon); ok(hres == E_NOINTERFACE, "IBinding should not have IMoniker interface\n"); @@ -437,17 +425,11 @@ static HRESULT WINAPI statusclb_OnProgre static HRESULT WINAPI statusclb_OnStopBinding(IBindStatusCallback *iface, HRESULT hresult, LPCWSTR szError) { - statusclb *This = (statusclb*)iface; - CHECK_EXPECT(OnStopBinding); ok(SUCCEEDED(hresult), "Download failed: %08lx\n", hresult); ok(szError == NULL, "szError should be NULL\n"); stopped_binding = TRUE; - IBinding_Release(This->pbind); - ok(This->pstr != NULL, "pstr should not be NULL here\n"); - if(This->pstr) - IStream_Release(This->pstr); return S_OK; } @@ -469,24 +451,18 @@ static HRESULT WINAPI statusclb_GetBindI static HRESULT WINAPI statusclb_OnDataAvailable(IBindStatusCallback *iface, DWORD grfBSCF, DWORD dwSize, FORMATETC* pformatetc, STGMEDIUM* pstgmed) { - statusclb *This = (statusclb*)iface; HRESULT hres; DWORD readed; BYTE buf[512]; CHECK_EXPECT2(OnDataAvailable); - if(!This->pstr) { - ok(grfBSCF & BSCF_FIRSTDATANOTIFICATION, "pstr should be set when BSCF_FIRSTDATANOTIFICATION\n"); - This->pstr = U(*pstgmed).pstm; - IStream_AddRef(This->pstr); - ok(This->pstr != NULL, "pstr should not be NULL here\n"); + if(U(*pstgmed).pstm) { + do hres = IStream_Read(U(*pstgmed).pstm, buf, 512, &readed); + while(hres == S_OK); + ok(hres == S_FALSE || hres == E_PENDING, "IStream_Read returned %08lx\n", hres); } - do hres = IStream_Read(This->pstr, buf, 512, &readed); - while(hres == S_OK); - ok(hres == S_FALSE || hres == E_PENDING, "IStream_Read returned %08lx\n", hres); - return S_OK; } @@ -496,7 +472,7 @@ static HRESULT WINAPI statusclb_OnObject return E_NOTIMPL; } -static const IBindStatusCallbackVtbl statusclbVtbl = { +static const IBindStatusCallbackVtbl BindStatusCallbackVtbl = { statusclb_QueryInterface, statusclb_AddRef, statusclb_Release, @@ -510,15 +486,7 @@ static const IBindStatusCallbackVtbl sta statusclb_OnObjectAvailable }; -static IBindStatusCallback* statusclb_create(void) -{ - statusclb *ret = HeapAlloc(GetProcessHeap(), 0, sizeof(statusclb)); - ret->lpVtbl = &statusclbVtbl; - ret->ref = 1; - ret->pbind = NULL; - ret->pstr = NULL; - return (IBindStatusCallback*)ret; -} +static IBindStatusCallback bsc = { &BindStatusCallbackVtbl }; static void test_CreateAsyncBindCtx(void) { @@ -526,7 +494,6 @@ static void test_CreateAsyncBindCtx(void HRESULT hres; ULONG ref; BIND_OPTS bindopts; - IBindStatusCallback *bsc = statusclb_create(); hres = CreateAsyncBindCtx(0, NULL, NULL, &bctx); ok(hres == E_INVALIDARG, "CreateAsyncBindCtx failed. expected: E_INVALIDARG, got: %08lx\n", hres); @@ -535,12 +502,8 @@ static void test_CreateAsyncBindCtx(void hres = CreateAsyncBindCtx(0, NULL, NULL, NULL); ok(hres == E_INVALIDARG, "CreateAsyncBindCtx failed. expected: E_INVALIDARG, got: %08lx\n", hres); - hres = CreateAsyncBindCtx(0, bsc, NULL, &bctx); + hres = CreateAsyncBindCtx(0, &bsc, NULL, &bctx); ok(SUCCEEDED(hres), "CreateAsyncBindCtx failed: %08lx\n", hres); - if(FAILED(hres)) { - IBindStatusCallback_Release(bsc); - return; - } bindopts.cbStruct = sizeof(bindopts); hres = IBindCtx_GetBindOptions(bctx, &bindopts); @@ -555,14 +518,11 @@ static void test_CreateAsyncBindCtx(void ref = IBindCtx_Release(bctx); ok(ref == 0, "bctx should be destroyed here\n"); - ref = IBindStatusCallback_Release(bsc); - ok(ref == 0, "bsc should be destroyed here\n"); } static void test_CreateAsyncBindCtxEx(void) { IBindCtx *bctx = NULL, *bctx_arg = NULL; - IBindStatusCallback *bsc = statusclb_create(); BIND_OPTS bindopts; HRESULT hres; @@ -608,13 +568,11 @@ static void test_CreateAsyncBindCtxEx(vo IBindCtx_Release(bctx_arg); - hres = CreateAsyncBindCtxEx(NULL, 0, bsc, NULL, &bctx, 0); + hres = CreateAsyncBindCtxEx(NULL, 0, &bsc, NULL, &bctx, 0); ok(hres == S_OK, "CreateAsyncBindCtxEx failed: %08lx\n", hres); if(SUCCEEDED(hres)) IBindCtx_Release(bctx); - - IBindStatusCallback_Release(bsc); } static void test_BindToStorage(void) @@ -624,27 +582,24 @@ static void test_BindToStorage(void) LPOLESTR display_name; IBindCtx *bctx; MSG msg; - IBindStatusCallback *previousclb, *sclb = statusclb_create(); + IBindStatusCallback *previousclb; IUnknown *unk = (IUnknown*)0x00ff00ff; IBinding *bind; - hres = CreateAsyncBindCtx(0, sclb, NULL, &bctx); + hres = CreateAsyncBindCtx(0, &bsc, NULL, &bctx); ok(SUCCEEDED(hres), "CreateAsyncBindCtx failed: %08lx\n\n", hres); - if(FAILED(hres)) { - IBindStatusCallback_Release(sclb); + if(FAILED(hres)) return; - } - hres = RegisterBindStatusCallback(bctx, sclb, &previousclb, 0); + hres = RegisterBindStatusCallback(bctx, &bsc, &previousclb, 0); ok(SUCCEEDED(hres), "RegisterBindStatusCallback failed: %08lx\n", hres); - ok(previousclb == sclb, "previousclb(%p) != sclb(%p)\n", previousclb, sclb); + ok(previousclb == &bsc, "previousclb(%p) != sclb(%p)\n", previousclb, &bsc); if(previousclb) IBindStatusCallback_Release(previousclb); hres = CreateURLMoniker(NULL, urls[test_protocol], &mon); ok(SUCCEEDED(hres), "failed to create moniker: %08lx\n", hres); if(FAILED(hres)) { - IBindStatusCallback_Release(sclb); IBindCtx_Release(bctx); return; } @@ -727,7 +682,6 @@ static void test_BindToStorage(void) ok(IMoniker_Release(mon) == 0, "mon should be destroyed here\n"); ok(IBindCtx_Release(bctx) == 0, "bctx should be destroyed here\n"); - ok(IBindStatusCallback_Release(sclb) == 0, "scbl should be destroyed here\n"); } static void set_file_url(void)

1 0

Jacek Caban : urlmon: Added GetBindInfoString implementation.
by Alexandre Julliard Jan. 5, 2006

Jan. 5, 2006

Module: wine Branch: refs/heads/master Commit: c448968bfa45ea74c647a99a76505c193dee3d8a URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=c448968bfa45ea74c647a99… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jan 5 12:17:59 2006 +0100 urlmon: Added GetBindInfoString implementation. --- dlls/urlmon/binding.c | 34 +++++++++++++++++++++++++++++++++- 1 files changed, 33 insertions(+), 1 deletions(-) diff --git a/dlls/urlmon/binding.c b/dlls/urlmon/binding.c index 40b838b..c590717 100644 --- a/dlls/urlmon/binding.c +++ b/dlls/urlmon/binding.c @@ -351,7 +351,39 @@ static HRESULT WINAPI InternetBindInfo_G ULONG ulStringType, LPOLESTR *ppwzStr, ULONG cEl, ULONG *pcElFetched) { Binding *This = BINDINF_THIS(iface); - FIXME("(%p)->(%ld %p %ld %p)\n", This, ulStringType, ppwzStr, cEl, pcElFetched); + + TRACE("(%p)->(%ld %p %ld %p)\n", This, ulStringType, ppwzStr, cEl, pcElFetched); + + switch(ulStringType) { + case BINDSTRING_ACCEPT_MIMES: { + static const WCHAR wszMimes[] = {'*','/','*',0}; + + if(!ppwzStr || !pcElFetched) + return E_INVALIDARG; + + ppwzStr[0] = CoTaskMemAlloc(sizeof(wszMimes)); + memcpy(ppwzStr[0], wszMimes, sizeof(wszMimes)); + *pcElFetched = 1; + return S_OK; + } + case BINDSTRING_USER_AGENT: { + IInternetBindInfo *bindinfo = NULL; + HRESULT hres; + + hres = IBindStatusCallback_QueryInterface(This->callback, &IID_IInternetBindInfo, + (void**)&bindinfo); + if(FAILED(hres)) + return hres; + + hres = IInternetBindInfo_GetBindString(bindinfo, ulStringType, ppwzStr, + cEl, pcElFetched); + IInternetBindInfo_Release(bindinfo); + + return hres; + } + } + + FIXME("not supported string type %ld\n", ulStringType); return E_NOTIMPL; }

1 0

lostwages/ templates/en/download.template imag ...
by Jeremy Newman Jan. 4, 2006

Jan. 4, 2006

ChangeSet ID: 22093 CVSROOT: /opt/cvs-commit Module name: lostwages Changes by: jnewman(a)winehq.org 2006/01/04 15:52:47 Modified files: templates/en : download.template Added files: images/distro : sun.png Log message: Tom Wickline <twickline(a)gmail.com> add Solaris to the download page Patch: http://cvs.winehq.org/patch.py?id=22093 Old revision New revision Changes Path Added 1.1 +0 -0 lostwages/images/distro/sun.png 1.71 1.72 +13 -1 lostwages/templates/en/download.template Index: lostwages/templates/en/download.template diff -u -p lostwages/templates/en/download.template:1.71 lostwages/templates/en/download.template:1.72 --- lostwages/templates/en/download.template:1.71 4 Jan 2006 21:52:47 -0000 +++ lostwages/templates/en/download.template 4 Jan 2006 21:52:47 -0000 @@ -78,9 +78,21 @@ for post-installation instructions.< <td align=center><a href="http://www.freshports.org/emulators/wine/"> <img src="{$root}/images/distro/freebsd.png" width="50" height="54" alt="FreeBSD" border="0"></a> </td> - <td> <a href="http://www.freshports.org/emulators/wine/">FreeBSD</a> source for FreeBSD 5.3 or later</td> + <td> <a href="http://www.freshports.org/emulators/wine/">FreeBSD</a> + source for FreeBSD 5.3 or later</td> <td><a href="mailto:gerald(a)pfeifer.com">Gerald Pfeifer</a></td> </tr> + + <tr bgcolor="#ffffff"> + <td align=center><a href="http://www.blastwave.org/wine/"> + <img src="{$root}/images/distro/sun.png" width="50" height="50" alt="Sun Solaris" border="0"></a> + </td> + <td> <a href="http://www.blastwave.org/wine/">Solaris</a> + binary and source for Solaris 9 and 10</td> + <td><a href="mailto:solaris.wine(a)optusnet.com.au">Robert Lunnon</a></td> + </tr> + + <tr bgcolor="#ffffff"> <td align=center><a href="http://sourceforge.net/project/showfiles.php?group_id=6241&package_id=1…"> <img src="{$root}/images/distro/windows.png" width="50" height="54" alt="Windows" border="0"></a>

1 0

lostwages/templates/en acknowledgement.template
by Jeremy Newman Jan. 4, 2006

Jan. 4, 2006

ChangeSet ID: 22092 CVSROOT: /opt/cvs-commit Module name: lostwages Changes by: jnewman(a)winehq.org 2006/01/04 15:51:35 Modified files: templates/en : acknowledgement.template Log message: Tom Wickline <twickline(a)gmail.com> small fix to our acknowledgement page Patch: http://cvs.winehq.org/patch.py?id=22092 Old revision New revision Changes Path 1.6 1.7 +1 -1 lostwages/templates/en/acknowledgement.template Index: lostwages/templates/en/acknowledgement.template diff -u -p lostwages/templates/en/acknowledgement.template:1.6 lostwages/templates/en/acknowledgement.template:1.7 --- lostwages/templates/en/acknowledgement.template:1.6 4 Jan 2006 21:51:35 -0000 +++ lostwages/templates/en/acknowledgement.template 4 Jan 2006 21:51:35 -0000 @@ -157,7 +157,7 @@ nail down any particular area of focus. <tr><td>Chris Morgan</td> <td>Application Database/misc</td> <td>1999-2006</td></tr> <tr><td>Filip Navara</td> <td>controls</td> <td>2003-2006</td></tr> <tr><td>Dustin Navea</td> <td>documentation</td> <td>2002</td></tr> -<tr><td>Felix Nawothnig</td> <td>misc</td> <td>2003-2005</td></tr> +<tr><td>Felix Nawothnig</td> <td>misc</td> <td>2003-2006</td></tr> <tr><td>Jeremy Newman</td> <td>webmaster</td> <td>2000-2006</td></tr> <tr><td>Thuy Nguyen</td> <td>controls</td> <td>1998-2000</td></tr> <tr><td>Andriy Palamarchuk</td> <td>misc</td> <td>2001-2002</td></tr>

1 0

Tag wine-0.9.5 : Alexandre Julliard : Release 0.9.5
by Alexandre Julliard Jan. 4, 2006

Jan. 4, 2006

Module: wine Branch: refs/tags/wine-0.9.5 Tag: a8ee59b3d34052de55cc9794fe207f43213ca43c URL: http://source.winehq.org/git/?p=wine.git;a=tag;h=a8ee59b3d34052de55cc9794fe… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jan 4 17:04:35 2006 +0100 Release 0.9.5

1 0

Alexandre Julliard : Release 0.9.5.
by Alexandre Julliard Jan. 4, 2006

Jan. 4, 2006

Module: wine Branch: refs/heads/master Commit: d8e98fe62f80072792b2a8d138e5f45f29ae2704 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=d8e98fe62f80072792b2a8d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jan 4 17:04:35 2006 +0100 Release 0.9.5. --- ANNOUNCE | 15 - ChangeLog | 612 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ VERSION | 2 configure | 18 +- 4 files changed, 627 insertions(+), 20 deletions(-)

1 0

Alex Villacís Lasso : msacm: Initialize some ACMSTREAMHEADER fields for the sake of native codecs.
by Alexandre Julliard Jan. 4, 2006

Jan. 4, 2006

Module: wine Branch: refs/heads/master Commit: f21c9028a541840f90cf0b95d467e9e87a8399ba URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=f21c9028a541840f90cf0b9… Author: Alex Villacís Lasso <a_villacis(a)palosanto.com> Date: Wed Jan 4 15:27:35 2006 +0100 msacm: Initialize some ACMSTREAMHEADER fields for the sake of native codecs. Initialize cb[Src|Dst]LengthUsed to 0 before calling into codec, required by (some?) native codecs. --- dlls/msacm/stream.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/msacm/stream.c b/dlls/msacm/stream.c index 35604fc..cde8e4d 100644 --- a/dlls/msacm/stream.c +++ b/dlls/msacm/stream.c @@ -99,6 +99,9 @@ MMRESULT WINAPI acmStreamConvert(HACMSTR return ACMERR_UNPREPARED; } + pash->cbSrcLengthUsed = 0; + pash->cbDstLengthUsed = 0; + /* Note: the ACMSTREAMHEADER and ACMDRVSTREAMHEADER structs are of same * size. some fields are private to msacm internals, and are exposed * in ACMSTREAMHEADER in the dwReservedDriver array

1 0

Vitaliy Margolen : wine.inf: Add a few keys to HKLM\Hardware.
by Alexandre Julliard Jan. 4, 2006

Jan. 4, 2006

Module: wine Branch: refs/heads/master Commit: a48e3eb494fbb9d35cd1b7c7f802be50cbe6f701 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=a48e3eb494fbb9d35cd1b7c… Author: Vitaliy Margolen <wine-patch(a)kievinfo.com> Date: Wed Jan 4 15:27:22 2006 +0100 wine.inf: Add a few keys to HKLM\Hardware. --- tools/wine.inf | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/tools/wine.inf b/tools/wine.inf index 83874ce..97d0a2e 100644 --- a/tools/wine.inf +++ b/tools/wine.inf @@ -278,6 +278,8 @@ HKLM,System\CurrentControlSet\Control\Se HKLM,System\CurrentControlSet\Control\VMM32Files,,,"" HKLM,System\CurrentControlSet\Services\VxD\MSTCP,,,"" HKCU,Software\Wine\shdocvw,"MozillaUrl",,"http://source.winehq.org/mozactivex" +HKLM,HARDWARE\DEVICEMAP\PARALLEL PORTS,,,"" +HKLM,HARDWARE\DEVICEMAP\SERIALCOMM,,,"" [Nls] HKLM,System\CurrentControlSet\Control\Nls\Codepage,"37",,""

1 0

Marcus Meissner : winsock: Map wildcards for socket type and protocol in getaddrinfo().
by Alexandre Julliard Jan. 4, 2006

Jan. 4, 2006

Module: wine Branch: refs/heads/master Commit: 5ddf98affead140b32c9f739d38f5a28a12ef2d9 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=5ddf98affead140b32c9f73… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Wed Jan 4 15:07:34 2006 +0100 winsock: Map wildcards for socket type and protocol in getaddrinfo(). --- dlls/winsock/socket.c | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/winsock/socket.c b/dlls/winsock/socket.c index e47b182..6df1c4d 100644 --- a/dlls/winsock/socket.c +++ b/dlls/winsock/socket.c @@ -3161,8 +3161,14 @@ int WINAPI WS_getaddrinfo(LPCSTR nodenam memset(&unixhints, 0, sizeof(unixhints)); punixhints->ai_flags = convert_aiflag_w2u(hints->ai_flags); punixhints->ai_family = convert_af_w2u(hints->ai_family); - punixhints->ai_socktype = convert_socktype_w2u(hints->ai_socktype); - punixhints->ai_protocol = convert_proto_w2u(hints->ai_protocol); + if (hints->ai_socktype == 0) /* wildcard, specific to getaddrinfo() */ + punixhints->ai_socktype = 0; + else + punixhints->ai_socktype = convert_socktype_w2u(hints->ai_socktype); + if (hints->ai_protocol == 0) /* wildcard, specific to getaddrinfo() */ + punixhints->ai_protocol = 0; + else + punixhints->ai_protocol = convert_proto_w2u(hints->ai_protocol); } /* getaddrinfo(3) is thread safe, no need to wrap in CS */

1 0