January 2007 - Wine-Devel - list.winehq.org

winebuild/DLLSPEC question
by Andrew Talbot Jan. 6, 2007

Jan. 6, 2007

I was looking at Coverity bug report #CID294, and that has led me to ask about the "base" and "limit" values of the DLLSPEC structure. In winebuild/utils.c, we have: spec->base = MAX_ORDINALS; spec->limit = 0; Is that the correct way round? Thanks, -- Andy.

1 0

are trace timestamps possible?
by Robert Reif Jan. 6, 2007

Jan. 6, 2007

Is there a way to get a time stamp in trace output kind of like we do now for thread id?

2 1

quartz help needed
by Robert Reif Jan. 6, 2007

Jan. 6, 2007

I'm trying to get Windows Media Player 6.4 working again and am running into problems. At first it was crashing while trying to read wave files. I found 2 bugs that were preventing it from working: some minor memory corruption for questionable wave files and using a pointer before it was initialized. With these fixed (patch attached) you can now play files once but the program gets confused at the end of the file. There are a lot of fixmes and unimplemented stuff. This program was rated gold at one point so I'm not sure my fixes are completely correct. I have written dshow filters and programs in the past at work and it was an extremely frustrating experience so I would appreciate and help getting quarts working again. Index: dlls/quartz/waveparser.c =================================================================== RCS file: /home/wine/wine/dlls/quartz/waveparser.c,v retrieving revision 1.5 diff -p -u -r1.5 waveparser.c --- dlls/quartz/waveparser.c 13 Oct 2006 10:27:23 -0000 1.5 +++ dlls/quartz/waveparser.c 6 Jan 2007 13:09:25 -0000 @@ -63,6 +63,7 @@ static HRESULT WAVEParser_Sample(LPVOID long cbDstStream; long chunk_remaining_bytes = 0; long offset_src = 0; + TRACE("(%p)->(%p)\n", iface, pSample); hr = IMediaSample_GetPointer(pSample, &pbSrcStream); @@ -202,6 +203,8 @@ static HRESULT WAVEParser_Sample(LPVOID static HRESULT WAVEParser_QueryAccept(LPVOID iface, const AM_MEDIA_TYPE * pmt) { + TRACE("(%p)->(%p)\n", iface, pmt); + if (!IsEqualIID(&pmt->majortype, &MEDIATYPE_Stream)) return S_FALSE; if (IsEqualIID(&pmt->subtype, &MEDIASUBTYPE_WAVE)) @@ -220,17 +223,21 @@ static HRESULT WAVEParser_InputPin_PreCo LONGLONG pos = 0; /* in bytes */ PIN_INFO piOutput; ALLOCATOR_PROPERTIES props; - AM_MEDIA_TYPE amt; + AM_MEDIA_TYPE * pmt; float fSamplesPerSec = 0.0f; DWORD dwSampleSize = 0; DWORD dwLength = 0; WAVEParserImpl * pWAVEParser = (WAVEParserImpl *)This->pin.pinInfo.pFilter; + LPWAVEFORMATEX pwfx; + TRACE("(%p)->(%p)\n", iface, pConnectPin); piOutput.dir = PINDIR_OUTPUT; piOutput.pFilter = (IBaseFilter *)This; lstrcpynW(piOutput.achName, wcsOutputPinName, sizeof(piOutput.achName) / sizeof(piOutput.achName[0])); hr = IAsyncReader_SyncRead(This->pReader, pos, sizeof(list), (BYTE *)&list); + if (hr != S_OK) + return E_FAIL; pos += sizeof(list); if (list.fcc != ckidRIFF) @@ -250,6 +257,8 @@ static HRESULT WAVEParser_InputPin_PreCo } hr = IAsyncReader_SyncRead(This->pReader, pos, sizeof(chunk), (BYTE *)&chunk); + if (hr != S_OK) + return E_FAIL; pos += sizeof(chunk); if (chunk.fcc != mmioFOURCC('f','m','t',' ')) { @@ -257,52 +266,79 @@ static HRESULT WAVEParser_InputPin_PreCo return E_FAIL; } - memcpy(&amt.majortype, &MEDIATYPE_Audio, sizeof(GUID)); - memcpy(&amt.formattype, &FORMAT_WaveFormatEx, sizeof(GUID)); - amt.cbFormat = chunk.cb; - amt.pbFormat = CoTaskMemAlloc(amt.cbFormat); - amt.pUnk = NULL; - hr = IAsyncReader_SyncRead(This->pReader, pos, amt.cbFormat, amt.pbFormat); - memcpy(&amt.subtype, &MEDIATYPE_Audio, sizeof(GUID)); - amt.subtype.Data1 = ((WAVEFORMATEX*)amt.pbFormat)->wFormatTag; - /* CopyMediaType(&((OutputPin*)pWAVEParser->ppPins[1])->pin.mtCurrent, &amt); */ - ((Parser_OutputPin*)pWAVEParser->Parser.ppPins[1])->pmt = (AM_MEDIA_TYPE*) CoTaskMemAlloc(sizeof(AM_MEDIA_TYPE)); - - CopyMediaType(((Parser_OutputPin*)pWAVEParser->Parser.ppPins[1])->pmt, &amt); - - /* Update buffer alignment of media samples in output */ - ((Parser_OutputPin*)pWAVEParser->Parser.ppPins[1])->pin.allocProps.cbAlign = ((WAVEFORMATEX*)amt.pbFormat)->nBlockAlign; + pwfx = (LPWAVEFORMATEX)CoTaskMemAlloc(max(chunk.cb, sizeof(WAVEFORMATEX))); + if (!pwfx) + return E_FAIL; + hr = IAsyncReader_SyncRead(This->pReader, pos, chunk.cb, (BYTE *)pwfx); + if (hr != S_OK) { + CoTaskMemFree(pwfx); + return E_FAIL; + } pos += chunk.cb; + + if (pwfx->wFormatTag == WAVE_FORMAT_PCM) + pwfx->cbSize = 0; + + fSamplesPerSec = pwfx->nSamplesPerSec; + dwSampleSize = pwfx->nBlockAlign; + dwLength = 4096; + hr = IAsyncReader_SyncRead(This->pReader, pos, sizeof(chunk), (BYTE *)&chunk); + if (hr != S_OK) + { + CoTaskMemFree(pwfx); + return E_FAIL; + } if (chunk.fcc == mmioFOURCC('f','a','c','t')) { FIXME("'fact' chunk not supported yet\n"); pos += sizeof(chunk) + chunk.cb; hr = IAsyncReader_SyncRead(This->pReader, pos, sizeof(chunk), (BYTE *)&chunk); + if (hr != S_OK) + { + CoTaskMemFree(pwfx); + return E_FAIL; + } } if (chunk.fcc != mmioFOURCC('d','a','t','a')) { ERR("Expected 'data' chunk, but got %.04s\n", (LPSTR)&chunk.fcc); + CoTaskMemFree(pwfx); return E_FAIL; } - if (hr == S_OK) + pmt = CoTaskMemAlloc(sizeof(*pmt)); + if (!pmt) { - pWAVEParser->StartOfFile = MEDIATIME_FROM_BYTES(pos + sizeof(RIFFCHUNK)); - pWAVEParser->EndOfFile = MEDIATIME_FROM_BYTES(pos + chunk.cb + sizeof(RIFFCHUNK)); + CoTaskMemFree(pwfx); + return E_FAIL; } - if (hr != S_OK) - return E_FAIL; + memcpy(&pmt->majortype, &MEDIATYPE_Audio, sizeof(GUID)); + memcpy(&pmt->subtype, &MEDIATYPE_Audio, sizeof(GUID)); + pmt->subtype.Data1 = pwfx->wFormatTag; + pmt->bFixedSizeSamples = TRUE; + pmt->bTemporalCompression = FALSE; + pmt->lSampleSize = pwfx->nBlockAlign; + memcpy(&pmt->formattype, &FORMAT_WaveFormatEx, sizeof(GUID)); + pmt->pUnk = NULL; + pmt->cbFormat = sizeof(*pwfx) + pwfx->cbSize; + pmt->pbFormat = (BYTE *)pwfx; + + pWAVEParser->StartOfFile = MEDIATIME_FROM_BYTES(pos + sizeof(RIFFCHUNK)); + pWAVEParser->EndOfFile = MEDIATIME_FROM_BYTES(pos + chunk.cb + sizeof(RIFFCHUNK)); props.cbAlign = 1; props.cbPrefix = 0; props.cbBuffer = 4096; props.cBuffers = 2; - hr = Parser_AddPin(&(pWAVEParser->Parser), &piOutput, &props, &amt, fSamplesPerSec, dwSampleSize, dwLength); - + hr = Parser_AddPin(&(pWAVEParser->Parser), &piOutput, &props, pmt, fSamplesPerSec, dwSampleSize, dwLength); + + /* Update buffer alignment of media samples in output */ + ((Parser_OutputPin*)pWAVEParser->Parser.ppPins[1])->pin.allocProps.cbAlign = pwfx->nBlockAlign; + TRACE("WAVE File ok\n"); return hr;

2 1

Re: ole32: OLE clipboard functions should fail if OLE hasn't been initialised.
by Alexandre Julliard Jan. 6, 2007

Jan. 6, 2007

Robert Shearman <rob(a)codeweavers.com> writes: > Add a field to the TLS data to determine whether OLE has been > initialised for the current thread and use it in the OLE clipboard > functions. This breaks the richedit tests: ../../../tools/runtest -q -P wine -M riched20.dll -T ../../.. -p riched20_test.exe.so editor.c && touch editor.ok err:ole:OleSetClipboard OLE not initialised err:ole:OleSetClipboard OLE not initialised err:ole:OleSetClipboard OLE not initialised editor.c:860: Test failed: EM_SETUNDOLIMIT didn't allow the first undo with UNDOLIMIT set to 2 editor.c:863: Test failed: EM_SETUNDOLIMIT didn't allow a second undo with UNDOLIMIT set to 2 err:ole:OleSetClipboard OLE not initialised editor.c:1256: Test failed: EM_GETMODIFY returned zero, instead of non-zero when pasting identical text err:ole:OleSetClipboard OLE not initialised editor.c:1266: Test failed: EM_GETMODIFY returned zero, instead of non-zero when pasting different text err:ole:OleFlushClipboard OLE not initialised make: *** [editor.ok] Error 4 -- Alexandre Julliard julliard(a)winehq.org

2 1

[2/8] WineD3D: Catch NOP vertex declaration changes
by Christoph Bumiller Jan. 6, 2007

Jan. 6, 2007

Yet the application (NFS:MW) page faults right at startup at the address of pDecl + 4 so something's amiss ... maybe this will get fixed automatically in one of the next patches or is due to some other weird thing that affects my sources (eh?) ... as long as no one else complains, lets leave it at this. Just look again at the SetPixelShader function, this is how it looks in my current GIT (I didn't touch this one) : 3758 /* Handle recording of state blocks */ 3759 if (This->isRecordingState) { 3760 TRACE("Recording... not performing anything\n"); 3761 } 3762 3763 if (NULL != pShader) { 3764 IWineD3DPixelShader_AddRef(pShader); 3765 } 3766 if (NULL != oldShader) { 3767 IWineD3DPixelShader_Release(oldShader); 3768 } 3769 3770 if (This->isRecordingState) { 3771 TRACE("Recording... not performing anything\n"); 3772 return WINED3D_OK; 3773 } 3774 3775 if(pShader == oldShader) { 3776 TRACE("App is setting the old pixel shader over, nothing to do\n"); 3777 return WINED3D_OK; 3778 }

2 2

re: Instructions for creating the tests directory
by Dan Kegel Jan. 6, 2007

Jan. 6, 2007

Bill wrote: > Is there any documentation on how to set up the tests directory for an > existing dll? Good question. Last time this came up, the answer was recorded here: http://kerneltraffic.osmirror.nl/wine/wn20021011_139.html#3 I don't know if that's correct still, but it's a start. Can you update the doc once you get it worked out? Thanks, Dan

4 3

Re: msacm32: Fix greater than vs. less than typo in comparison. (Coverity)
by Alex Villacís Lasso Jan. 6, 2007

Jan. 6, 2007

Kai Blin escribió: > --- > dlls/msacm32/driver.c | 2 +- > 1 files changed, 1 insertions(+), 1 deletions(-) > > ------------------------------------------------------------------------ > > diff --git a/dlls/msacm32/driver.c b/dlls/msacm32/driver.c > index d4ad644..06e6614 100644 > --- a/dlls/msacm32/driver.c > +++ b/dlls/msacm32/driver.c > @@ -430,7 +430,7 @@ LRESULT WINAPI acmDriverMessage(HACMDRIV > /* This verification is required because DRVCONFIGINFO is 12 bytes > long, yet native msacm reports a 16-byte structure to codecs. > */ > - if (iStructSize < sizeof(DRVCONFIGINFO)) iStructSize = sizeof(DRVCONFIGINFO); > + if (iStructSize > sizeof(DRVCONFIGINFO)) iStructSize = sizeof(DRVCONFIGINFO); > pConfigInfo = HeapAlloc(MSACM_hHeap, 0, iStructSize); > if (!pConfigInfo) { > ERR("OOM while supplying DRVCONFIGINFO for DRV_CONFIGURE, using NULL\n"); > > ------------------------------------------------------------------------ > > > This is not a typo, but rather an unnecessary verification, from when I didn't know the true size of a DRVCONFIGINFO. The struct size should be *exactly 16 bytes*, even though only the first 12 bytes are used. This patch might even introduce a bug, where the struct info assumed by the codec to be 16 bytes when only 12 are allocated, and some smart-ass codec tries to use the last 4 bytes of the struct for its own purposes, which with this patch are now past the end of the allocated array. A more correct patch would fix the comment to indicate that exactly 16 bytes are allocated for a 12-byte struct, and remove the conditional assignment altogether. Alex Villacís Lasso -- perl -e '$x = 2.4; print sprintf("%.0f + %.0f = %.0f\n", $x, $x, $x + $x);'

2 1

Is Evolution the pile of .... it seems to be!
by Bill Medland Jan. 6, 2007

Jan. 6, 2007

Does anyone doing OSS use evolution? I'm trying to submit a patch but can I get Evolution to not wrap it? No. I swapped from kmail to Evolution on the basis that it seemed to be being pushed as the 'real' linux mail program but I just keep being infuriated by the basic things it doesn't do and its refusal to let me have any control. Is it just me or is it the program? (and can anyone tell me how to stop it wrapping and if not then the patch will have to wait until monday :-( ) -- Bill Medland <billmedland(a)shaw.ca>

3 2

Re: appdb rating inflation
by Remco Jan. 5, 2007

Jan. 5, 2007

What about a checklist of problems it doesn't have, and basing the rating on that. Something like: Installation: (_) Installs correctly. (_) No installation nessecary to run. (_) Preinstalled on Windows. (x) Doesn't install. [_] Works without an unofficially patched Wine. [_] Works without a compatibility mode different from XP. [_] Works without a registry setting. [_] Works without a crack. [_] Works without a setting in winecfg. (_) Works without glitches. (_) Has minor graphical glitches. (_) Minor Functional problems (_) Doesn't work as expected. Execution: [_] Works without an unofficially patched Wine. [_] Works without a compatibility mode different from XP. [_] Works without a registry setting. [_] Works without a crack. [_] Works without a setting in winecfg. (_) Works without glitches. (_) Has minor graphical glitches. (_) Minor Functional problems (x) Doesn't work as expected. If any isn't answered satisfactorily, it isn't Platina anymore. It is set up so that if you don't take the time to read it through, it will rate as Garbage. __________________________________________________ Do You Yahoo!? Tired of spam? Yahoo! Mail has the best spam protection around http://mail.yahoo.com

1 0

Instructions for creating the tests directory
by Bill Medland Jan. 5, 2007

Jan. 5, 2007

Is there any documentation on how to set up the tests directory for an existing dll? I couldn't see anything about the tests directory in the wiki and the stuff in the developer's guide presupposes that the test directory exists. I would rather follow instructions than have to reverse-engineer the process. -- Bill Medland <billmedland(a)shaw.ca>

3 2

mcicda: How can we get STATUS_XXX in GetLastError()?
by Francois Gouget Jan. 5, 2007

Jan. 5, 2007

In dlls/mcicda/mcicda.c we have: if (!DeviceIoControl(wmcda->handle, IOCTL_CDROM_READ_Q_CHANNEL, &fmt, sizeof(fmt), &data, sizeof(data), &br, NULL)) { if (GetLastError() == STATUS_NO_MEDIA_IN_DEVICE) mode = MCI_MODE_OPEN; However DeviceIoControl() does the following: if (status) SetLastError( RtlNtStatusToDosError(status) ); return !status; } And RtlNtStatusToDosError() converts STATUS_NO_MEDIA_IN_DEVICE to ERROR_NOT_READY. So GetLastError() cannot return STATUS_NO_MEDIA_IN_DEVICE. Or did I miss something? Maybe the right thing would be to check the return value of DeviceIoControl() rather than GetLastError()? However, in MCICDA_GetError() we have a similar check: static int MCICDA_GetError(WINE_MCICDAUDIO* wmcda) { switch (GetLastError()) { case STATUS_NO_MEDIA_IN_DEVICE: return MCIERR_DEVICE_NOT_READY; case STATUS_IO_DEVICE_ERROR: return MCIERR_HARDWARE; default: FIXME("Unknown mode %x\n", GetLastError()); } Again, as far as I can see, GetLastError() cannot return these two STATUS_XXX values so this check seems wrong. -- Francois Gouget <fgouget(a)free.fr> http://fgouget.free.fr/ Advice is what we ask for when we already know the answer but wish we didn't -- Eric Jong

3 2

rpc issues
by Matthew Edlefsen Jan. 5, 2007

Jan. 5, 2007

Hi, I've been trying to get a program that uses rpc to work on wine and I've been having some problems (my understanding is that isn't surprising). The goal is to be able to run a rpc server that sits and waits for connections over tcp/ip (It's for doing distributed computing). My first problem was that I was using RpcServerUseProtseq which after looking at the code noticed will always fail with tcp/ip since it passes RpcServerUseProtseqEp NULL for the endpoint which eventually causes rpcrt4_protseq_ncacn_ip_tcp_open_endpoint to call getaddrinfo with NULL for both the ip and port which I guess isn't allowed. Anyways I altered my code to use a given endpoint instead and now it tells me: fixme:rpc:RpcMgmtWaitServerListen not waiting for server calls to finish Does this mean the function just doesn't work? Is there any way around it? I assume if it was easy to implement it would have already but just in case what exactly needs to be done to get it working? I was also confused by the differences between the online git tree and the LXR/what actually gets downloaded to my computer. To be honest I'm pretty new to wine and linux in general but it would be absolutely wonderful to get this working. Thanks in advance - Matt Edlefsen

3 6

Re: winegcc: Fix memory leaks (Coverity)
by Alexandre Julliard Jan. 5, 2007

Jan. 5, 2007

Andrew Talbot <Andrew.Talbot(a)talbotville.com> writes: > Changelog: > winegcc: Fix memory leaks (Coverity). There is no reason to add a lot of complexity to fix leaks in short-lived apps like winegcc. -- Alexandre Julliard julliard(a)winehq.org

2 1

Re: ole32: Remove redundant NULL check. (Coverity)
by Kai Blin Jan. 5, 2007

Jan. 5, 2007

On Friday 05 January 2007 12:00, Kai Blin wrote: > --- > dlls/ole32/ole2.c | 10 +--------- > 1 files changed, 1 insertions(+), 9 deletions(-) Please ignore this one, winehq being down and git-format-patches played a trick on me. :) Kai -- Kai Blin, <kai Dot blin At gmail Dot com> WorldForge developer http://www.worldforge.org/ Wine developer http://wiki.winehq.org/KaiBlin/ -- Will code for cotton.

1 1

IDropTarget code location
by Jeff L Jan. 5, 2007

Jan. 5, 2007

Can anyone point me the location of the code that implements the IDropTarget class used by OLE2? Jeff

2 1

Winelib over Solaris/SPARC
by Keyur Pujara Jan. 5, 2007

Jan. 5, 2007

Greetings! I am contemplating to port a complex windows application using winelib over Solaris/SPARC. In one of the emails in wine-devel list, I saw that there may be following issues in the process: * byte endianness * alignment issues * pointer size * must not use x86 assembly Could someone kindly advise on whether above issues *exists* in current version of wine? How do I identify and resolve them? Thanks in advance. Keyur __________________________________________________ Do You Yahoo!? Tired of spam? Yahoo! Mail has the best spam protection around http://mail.yahoo.com

2 1

RFC: wininet: Inconsistent use of INTERNET_SetLastError()
by Francois Gouget Jan. 5, 2007

Jan. 5, 2007

wininet has an INTERNET_SetLastError() which calls SetLastError() and does some extra tricks (see dlls/wininet/internet.c:3041). The problem is that while most functions use it, some call SetLastError() directly, seemingly without pattern or reason. Some functions even call one or the other depending on the error condition! So I propose the following patch to systematically call INTERNET_SetLastError(). However I have left the functions in cookie.c and urlcache.c unchanged as none of them calls INTERNET_SetLastError(). I have no idea if that's right or not. If I get no objection I will submit this patch to wine-patches in a few days. Otherwise I would be happy if someone could straighten this out the right way, and add explanatory comments in the places where SetLastError() should be called instead of INTERNET_SetLastError(). --- dlls/wininet/ftp.c | 2 +- dlls/wininet/http.c | 8 ++++---- dlls/wininet/internet.c | 40 ++++++++++++++++++++-------------------- 3 files changed, 25 insertions(+), 25 deletions(-) diff --git a/dlls/wininet/ftp.c b/dlls/wininet/ftp.c index 358c038..980687d 100644 --- a/dlls/wininet/ftp.c +++ b/dlls/wininet/ftp.c @@ -370,7 +370,7 @@ BOOL WINAPI FtpSetCurrentDirectoryW(HINTERNET hConnect, LPCWSTR lpszDirectory) if (!lpszDirectory) { - SetLastError(ERROR_INVALID_PARAMETER); + INTERNET_SetLastError(ERROR_INVALID_PARAMETER); goto lend; } diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index ef19a27..650b824 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -1463,7 +1463,7 @@ static BOOL WINAPI HTTP_HttpQueryInfoW( LPWININETHTTPREQW lpwhr, DWORD dwInfoLev ((dwInfoLevel & HTTP_QUERY_FLAG_REQUEST_HEADERS) && (~lphttpHdr->wFlags & HDR_ISREQUEST))) { - SetLastError(ERROR_HTTP_HEADER_NOT_FOUND); + INTERNET_SetLastError(ERROR_HTTP_HEADER_NOT_FOUND); return bSuccess; } @@ -1753,7 +1753,7 @@ BOOL WINAPI HttpSendRequestExA(HINTERNET hRequest, header = HeapAlloc(GetProcessHeap(),0,headerlen*sizeof(WCHAR)); if (!(BuffersInW.lpcszHeader = header)) { - SetLastError(ERROR_OUTOFMEMORY); + INTERNET_SetLastError(ERROR_OUTOFMEMORY); return FALSE; } BuffersInW.dwHeadersLength = MultiByteToWideChar(CP_ACP, 0, @@ -1847,7 +1847,7 @@ BOOL WINAPI HttpSendRequestExW(HINTERNET hRequest, /* * This is from windows. */ - SetLastError(ERROR_IO_PENDING); + INTERNET_SetLastError(ERROR_IO_PENDING); ret = FALSE; } else @@ -1929,7 +1929,7 @@ BOOL WINAPI HttpSendRequestW(HINTERNET hHttpRequest, LPCWSTR lpszHeaders, /* * This is from windows. */ - SetLastError(ERROR_IO_PENDING); + INTERNET_SetLastError(ERROR_IO_PENDING); r = FALSE; } else diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index de84c59..a4c3224 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -769,7 +769,7 @@ HINTERNET WINAPI InternetConnectW(HINTERNET hInternet, if (!lpszServerName) { - SetLastError(ERROR_INVALID_PARAMETER); + INTERNET_SetLastError(ERROR_INVALID_PARAMETER); return NULL; } @@ -778,7 +778,7 @@ HINTERNET WINAPI InternetConnectW(HINTERNET hInternet, hIC = (LPWININETAPPINFOW) WININET_GetObject( hInternet ); if ( (hIC == NULL) || (hIC->hdr.htype != WH_HINIT) ) { - SetLastError(ERROR_INVALID_HANDLE); + INTERNET_SetLastError(ERROR_INVALID_HANDLE); goto lend; } @@ -1219,7 +1219,7 @@ BOOL WINAPI InternetCrackUrlW(LPCWSTR lpszUrl_orig, DWORD dwUrlLength_orig, DWOR if (!lpszUrl_orig || !*lpszUrl_orig) { - SetLastError(ERROR_INVALID_PARAMETER); + INTERNET_SetLastError(ERROR_INVALID_PARAMETER); return FALSE; } @@ -1777,7 +1777,7 @@ BOOL WINAPI InternetReadFile(HINTERNET hFile, LPVOID lpBuffer, lpwh = WININET_GetObject( hFile ); if (!lpwh) { - SetLastError(ERROR_INVALID_HANDLE); + INTERNET_SetLastError(ERROR_INVALID_HANDLE); return FALSE; } @@ -1839,14 +1839,14 @@ BOOL WINAPI InternetReadFileExA(HINTERNET hFile, LPINTERNET_BUFFERSA lpBuffersOu if (lpBuffersOut->dwStructSize != sizeof(*lpBuffersOut)) { - SetLastError(ERROR_INVALID_PARAMETER); + INTERNET_SetLastError(ERROR_INVALID_PARAMETER); return FALSE; } lpwh = (LPWININETHANDLEHEADER) WININET_GetObject( hFile ); if (!lpwh) { - SetLastError(ERROR_INVALID_HANDLE); + INTERNET_SetLastError(ERROR_INVALID_HANDLE); return FALSE; } @@ -1868,7 +1868,7 @@ BOOL WINAPI InternetReadFileExA(HINTERNET hFile, LPINTERNET_BUFFERSA lpBuffersOu retval = INTERNET_AsyncCall(&workRequest); if (!retval) return FALSE; - SetLastError(ERROR_IO_PENDING); + INTERNET_SetLastError(ERROR_IO_PENDING); return FALSE; } @@ -1923,7 +1923,7 @@ static BOOL INET_QueryOptionHelper(BOOL bIsUnicode, HINTERNET hInternet, DWORD d lpwhh = (LPWININETHANDLEHEADER) WININET_GetObject( hInternet ); if (!lpwhh) { - SetLastError(ERROR_INVALID_PARAMETER); + INTERNET_SetLastError(ERROR_INVALID_PARAMETER); return FALSE; } @@ -1936,7 +1936,7 @@ static BOOL INET_QueryOptionHelper(BOOL bIsUnicode, HINTERNET hInternet, DWORD d if (!lpwhh) { WARN("Invalid hInternet handle\n"); - SetLastError(ERROR_INVALID_HANDLE); + INTERNET_SetLastError(ERROR_INVALID_HANDLE); return FALSE; } @@ -1976,7 +1976,7 @@ static BOOL INET_QueryOptionHelper(BOOL bIsUnicode, HINTERNET hInternet, DWORD d if (!lpwhh) { WARN("Invalid hInternet handle\n"); - SetLastError(ERROR_INVALID_HANDLE); + INTERNET_SetLastError(ERROR_INVALID_HANDLE); return FALSE; } if (lpwhh->htype == WH_HHTTPREQ) @@ -2519,7 +2519,7 @@ BOOL WINAPI InternetSetOptionExW(HINTERNET hInternet, DWORD dwOption, FIXME("Flags %08x ignored\n", dwFlags); if( dwFlags & ~ISO_VALID_FLAGS ) { - SetLastError( ERROR_INVALID_PARAMETER ); + INTERNET_SetLastError( ERROR_INVALID_PARAMETER ); return FALSE; } return InternetSetOptionW( hInternet, dwOption, lpBuffer, dwBufferLength ); @@ -2760,7 +2760,7 @@ End: HeapFree( GetProcessHeap(), 0, command ); if (rc == FALSE) - SetLastError(ERROR_NOT_CONNECTED); + INTERNET_SetLastError(ERROR_NOT_CONNECTED); return rc; } @@ -2919,7 +2919,7 @@ HINTERNET WINAPI InternetOpenUrlW(HINTERNET hInternet, LPCWSTR lpszUrl, if (!lpszUrl) { - SetLastError(ERROR_INVALID_PARAMETER); + INTERNET_SetLastError(ERROR_INVALID_PARAMETER); goto lend; } @@ -2949,7 +2949,7 @@ HINTERNET WINAPI InternetOpenUrlW(HINTERNET hInternet, LPCWSTR lpszUrl, /* * This is from windows. */ - SetLastError(ERROR_IO_PENDING); + INTERNET_SetLastError(ERROR_IO_PENDING); } else { ret = INTERNET_InternetOpenUrlW(hIC, lpszUrl, lpszHeaders, dwHeadersLength, dwFlags, dwContext); } @@ -3227,7 +3227,7 @@ BOOL WINAPI InternetQueryDataAvailable( HINTERNET hFile, lpwhr = (LPWININETHTTPREQW) WININET_GetObject( hFile ); if (NULL == lpwhr) { - SetLastError(ERROR_NO_MORE_FILES); + INTERNET_SetLastError(ERROR_NO_MORE_FILES); return FALSE; } @@ -3240,7 +3240,7 @@ BOOL WINAPI InternetQueryDataAvailable( HINTERNET hFile, min(sizeof(buffer), lpwhr->dwContentLength - lpwhr->dwContentRead), MSG_PEEK, (int *)lpdwNumberOfBytesAvailble)) { - SetLastError(ERROR_NO_MORE_FILES); + INTERNET_SetLastError(ERROR_NO_MORE_FILES); retval = FALSE; } else @@ -3459,7 +3459,7 @@ static BOOL calc_url_length(LPURL_COMPONENTSW lpUrlComponents, { if (lpUrlComponents->lpszPassword) { - SetLastError(ERROR_INVALID_PARAMETER); + INTERNET_SetLastError(ERROR_INVALID_PARAMETER); return FALSE; } } @@ -3577,7 +3577,7 @@ BOOL WINAPI InternetCreateUrlA(LPURL_COMPONENTSA lpUrlComponents, DWORD dwFlags, if (lpUrlComponents->dwStructSize != sizeof(URL_COMPONENTSW) || !lpdwUrlLength) { - SetLastError(ERROR_INVALID_PARAMETER); + INTERNET_SetLastError(ERROR_INVALID_PARAMETER); return FALSE; } @@ -3647,7 +3647,7 @@ BOOL WINAPI InternetCreateUrlW(LPURL_COMPONENTSW lpUrlComponents, DWORD dwFlags, if (lpUrlComponents->dwStructSize != sizeof(URL_COMPONENTSW) || !lpdwUrlLength) { - SetLastError(ERROR_INVALID_PARAMETER); + INTERNET_SetLastError(ERROR_INVALID_PARAMETER); return FALSE; } @@ -3657,7 +3657,7 @@ BOOL WINAPI InternetCreateUrlW(LPURL_COMPONENTSW lpUrlComponents, DWORD dwFlags, if (!lpszUrl || *lpdwUrlLength < dwLen) { *lpdwUrlLength = (dwLen + 1) * sizeof(WCHAR); - SetLastError(ERROR_INSUFFICIENT_BUFFER); + INTERNET_SetLastError(ERROR_INSUFFICIENT_BUFFER); return FALSE; } -- 1.4.4.2

1 0

Winelib over Solaris/SPARC
by Keyur Pujara Jan. 5, 2007

Jan. 5, 2007

Greetings! I am contemplating to port a complex windows application using winelib over Solaris/SPARC. In one of the emails in wine-devel list, I saw that there may be following issues in the process: * byte endianness * alignment issues * pointer size * must not use x86 assembly Could someone kindly advise on whether above issues *exists* in current version of wine? How do I identify and resolve them? Thanks in advance. Keyur __________________________________________________ Do You Yahoo!? Tired of spam? Yahoo! Mail has the best spam protection around http://mail.yahoo.com

2 1

(Cross)Compile failure for ole32/tests/marshal.c
by Paul Vriens Jan. 5, 2007

Jan. 5, 2007

Hi, when running the 'make crosstest' in ole32/tests, I get: [paul(a)penguin tests]$ make crosstest i386-mingw32-gcc clipboard.cross.o compobj.cross.o hglobalstream.cross.o marshal.cross.o moniker.cross.o ole2.cross.o propvariant.cross.o stg_prop.cross.o storage32.cross.o usrmarshal.cross.o testlist.cross.o -o ole32_crosstest.exe -loleaut32 -lole32 -luser32 -lgdi32 -ladvapi32 -lkernel32 -luuid marshal.cross.o:marshal.c:(.text+0x7a97): undefined reference to `_IID_IChannelHook' collect2: ld returned 1 exit status make: *** [ole32_crosstest.exe] Error 1 When looking at our objidl.h, I see: DEFINE_GUID(IID_IChannelHook, 0x1008c4a0, 0x7613, 0x11cf, 0x9a,0xf1, 0x00,0x20,0xaf,0x6e,0x72,0xf4); whereas the objidl.h in the SDK shows: EXTERN_C const IID IID_IChannelHook; and the 'real' definition seems to be placed in comdef.h If I add the definition to marshal.c the cross-compile succeeds, but that's obviously not the solution. Can somebody more knowledgeable have a look? Cheers, Paul.

3 2

Re: wininet: Remove the custom thread pool implementation and use QueueUserWorkItem instead.
by Jacek Caban Jan. 4, 2007

Jan. 4, 2007

Hi Rob, Robert Shearman wrote: > --- > dlls/wininet/internet.c | 184 > +++++------------------------------------------ > dlls/wininet/internet.h | 3 - > 2 files changed, 19 insertions(+), 168 deletions(-) > > This also fixes a bug in the old code where starting a new > asynchronous operation with more than 10 asynchronous operations in > progress would fail. ... > - LPWORKREQUEST lpRequest = NULL; > + LPWORKREQUEST lpRequest = lpvParam; > + WORKREQUEST workRequest; > > TRACE("\n"); > > - EnterCriticalSection(&csQueue); > + memcpy(&workRequest, lpRequest, sizeof(WORKREQUEST)); > + HeapFree(GetProcessHeap(), 0, lpRequest); > > - if (lpHeadWorkQueue) > - { > - lpRequest = lpHeadWorkQueue; > - lpHeadWorkQueue = lpHeadWorkQueue->prev; > - if (lpRequest == lpWorkQueueTail) > - lpWorkQueueTail = lpHeadWorkQueue; > - } > - > - LeaveCriticalSection(&csQueue); > - > - if (lpRequest) > - { > - memcpy(lpWorkRequest, lpRequest, sizeof(WORKREQUEST)); > - HeapFree(GetProcessHeap(), 0, lpRequest); > - bSuccess = TRUE; > - InterlockedDecrement(&dwNumJobs); > - } > + workRequest.asyncproc(&workRequest); > > - return bSuccess; > + WININET_Release( workRequest.hdr ); > + return TRUE; > } > Why do you copy lpRequest to workRequest? You could use lpRequest in asyncproc and WININET_Release and call HeapFree before return. Then workRequest may be removed. Thanks, Jacek

2 2

Application Database todo updated and open call for new developers
by Chris Morgan Jan. 4, 2007

Jan. 4, 2007

I've updated the Application Database todo and sorted the list according to each item's difficulty. You can find the todo list at http://wiki.winehq.org/AppdbInfo This list is by no means complete so if you have an idea for a new entry feel free to email it to the AppDB mailing list at appdb(a)winehq.org or just update the wiki page. I also wanted ask that people interested in hacking on the AppDB take a look at the todo list if they might be interested in getting involved with AppDB development. The php code that runs the AppDB is available from the winehq cvs server and I'm available to mentor anyone interested in getting started hacking on the code. We've had some new developers and I wanted to thank Alexander Sørnes for his recent contributions to improve several areas of the AppDB that users see most. And of course thanks to all of the other contributors that have helped to develop the AppDB and the AppDB administrators that process all of the new submissions that come in each day. Chris

1 0

[2/8] WineD3D: Catch NOP vertex declaration changes
by Christoph Bumiller Jan. 4, 2007

Jan. 4, 2007

Not performing the following: if (NULL != pDecl) { IWineD3DVertexDeclaration_AddRef(pDecl); } in IWineD3DDeviceImpl_SetVertexDeclaration(...) when state is being recorded (note the return that was added), seems to cause a page fault, at least in NFS: Most Wanted. Is it possible that not adding a reference here causes the declaration object to be deallocated to early, when it is still used by the application ?

3 2

Re: [PATCH] StgOpenStorage patch
by Mike McCormack Jan. 4, 2007

Jan. 4, 2007

> This is the first time I've submitted a patch, so let me know if this > method of submission is incorrect. See description in the attachment. It's best to put the description in the body of the mail, and write a descriptive subject like "ole32: fix StgOpenStorage conformance test failure" or something like that. > This patch stops StgOpenStorage from creating a file when it does not > already exist. According to Microsoft's description, StgOpenStorage opens > an _existing_ root storage object... To create a new file, use the > StorageCreateStorageEx function. > > This fixes a bug in Orcad Capture (http://bugs.winehq.org/show_bug.cgi?id=7025) > > The conformance test file has also been modified to pass this test (before it > it was passing in Wine and failing in Windows). Your patch makes the conformance tests pass on Windows 2000 for me. The failing test was added some time ago: http://www.winehq.org/pipermail/wine-patches/2006-September/030808.html Maybe Andrey could comment on which version of Windows he was using? Mike

2 1

Re:dinput: Declare a function static
by Vitaliy Margolen Jan. 4, 2007

Jan. 4, 2007

Andrew Talbot wrote: > Note: This is in addition to those submitted yesterday. > > -- Andy. > --- > Changelog: > dinput: Declare a function static. > > diff -urN a/dlls/dinput/device.c b/dlls/dinput/device.c > --- a/dlls/dinput/device.c 2007-01-04 11:22:23.000000000 +0000 > +++ b/dlls/dinput/device.c 2007-01-04 13:38:38.000000000 +0000 > @@ -294,7 +294,7 @@ > format->user_df = NULL; > } > > -inline LPDIOBJECTDATAFORMAT dataformat_to_odf(LPCDIDATAFORMAT df, int idx) > +static inline LPDIOBJECTDATAFORMAT dataformat_to_odf(LPCDIDATAFORMAT df, int idx) > { > if (idx < 0 || idx >= df->dwNumObjs) return NULL; > return (LPDIOBJECTDATAFORMAT)((LPBYTE)df->rgodf + idx * df->dwObjSize); > Please don't commit this one. It's a "work in progress" and I will need this function in other places. Vitaliy

1 0

iTunes installer success
by Dan Kegel Jan. 4, 2007

Jan. 4, 2007

iTunes 6.5.2 seems to install ok now, so I marked http://bugs.winehq.org/show_bug.cgi?id=3335 as fixed. Yay Rob... iTunes 7 even seems to install, though its installer tries to run several vbscript custom actions, which of course don't work; wine cheerfully blows past those problems, no idea if they do anything important. ( Apple even has a help page for itunes vbscript install problems on windows, http://docs.info.apple.com/article.html?artnum=304405 ) I wonder if we can convince them to stop using vbscript for their next release... probably not, but it'd be nice if someone who knows them would ask. - Dan -- Wine for Windows ISVs: http://kegel.com/wine/isv

2 1