wine-devel January 2007

wine-devel@winehq.org

137 participants
274 discussions

mcicda: How can we get STATUS_XXX in GetLastError()?
by Francois Gouget 05 Jan '07

05 Jan '07

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 05 Jan '07

05 Jan '07

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 05 Jan '07

05 Jan '07

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 05 Jan '07

05 Jan '07

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 05 Jan '07

05 Jan '07

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 05 Jan '07

05 Jan '07

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 05 Jan '07

05 Jan '07

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 05 Jan '07

05 Jan '07

2 1

(Cross)Compile failure for ole32/tests/marshal.c
by Paul Vriens 05 Jan '07

05 Jan '07

Hi, when running the 'make crosstest' in ole32/tests, I get: [paul@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 04 Jan '07

04 Jan '07

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

← Newer
1
...
19
20
21
22
23
24
25
...
28
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-devel January 2007