February 2008 - Wine-Commits

Andrew Talbot : dswave: Assign to structs instead of using memcpy.
by Alexandre Julliard Feb. 27, 2008

Feb. 27, 2008

Module: wine Branch: master Commit: a5a11b7889d5b14c1fe6a6d8e2d766449ba1ac42 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a5a11b7889d5b14c1fe6a6d8e… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Tue Feb 26 20:20:15 2008 +0000 dswave: Assign to structs instead of using memcpy. --- dlls/dswave/dswave.c | 26 +++++++++++++------------- 1 files changed, 13 insertions(+), 13 deletions(-) diff --git a/dlls/dswave/dswave.c b/dlls/dswave/dswave.c index 0defaf5..7b1a33a 100644 --- a/dlls/dswave/dswave.c +++ b/dlls/dswave/dswave.c @@ -344,12 +344,12 @@ static HRESULT WINAPI IDirectMusicWaveImpl_IDirectMusicObject_GetDescriptor (LPD static HRESULT WINAPI IDirectMusicWaveImpl_IDirectMusicObject_SetDescriptor (LPDIRECTMUSICOBJECT iface, LPDMUS_OBJECTDESC pDesc) { ICOM_THIS_MULTI(IDirectMusicWaveImpl, ObjectVtbl, iface); TRACE("(%p, %p, %s): setting descriptor:\n", This, pDesc, debugstr_DMUS_OBJECTDESC(pDesc)); - + /* According to MSDN, we should copy only given values, not whole struct */ if (pDesc->dwValidData & DMUS_OBJ_OBJECT) - memcpy (&This->pDesc->guidObject, &pDesc->guidObject, sizeof (pDesc->guidObject)); + This->pDesc->guidObject = pDesc->guidObject; if (pDesc->dwValidData & DMUS_OBJ_CLASS) - memcpy (&This->pDesc->guidClass, &pDesc->guidClass, sizeof (pDesc->guidClass)); + This->pDesc->guidClass = pDesc->guidClass; if (pDesc->dwValidData & DMUS_OBJ_NAME) lstrcpynW (This->pDesc->wszName, pDesc->wszName, DMUS_MAX_NAME); if (pDesc->dwValidData & DMUS_OBJ_CATEGORY) @@ -357,9 +357,9 @@ static HRESULT WINAPI IDirectMusicWaveImpl_IDirectMusicObject_SetDescriptor (LPD if (pDesc->dwValidData & DMUS_OBJ_FILENAME) lstrcpynW (This->pDesc->wszFileName, pDesc->wszFileName, DMUS_MAX_FILENAME); if (pDesc->dwValidData & DMUS_OBJ_VERSION) - memcpy (&This->pDesc->vVersion, &pDesc->vVersion, sizeof (pDesc->vVersion)); + This->pDesc->vVersion = pDesc->vVersion; if (pDesc->dwValidData & DMUS_OBJ_DATE) - memcpy (&This->pDesc->ftDate, &pDesc->ftDate, sizeof (pDesc->ftDate)); + This->pDesc->ftDate = pDesc->ftDate; if (pDesc->dwValidData & DMUS_OBJ_MEMORY) { memcpy (&This->pDesc->llMemLength, &pDesc->llMemLength, sizeof (pDesc->llMemLength)); memcpy (This->pDesc->pbMemData, pDesc->pbMemData, sizeof (pDesc->pbMemData)); @@ -381,11 +381,11 @@ static HRESULT WINAPI IDirectMusicWaveImpl_IDirectMusicObject_ParseDescriptor (L LARGE_INTEGER liMove; /* used when skipping chunks */ TRACE("(%p, %p)\n", pStream, pDesc); - + /* FIXME: should this be determined from stream? */ pDesc->dwValidData |= DMUS_OBJ_CLASS; - memcpy (&pDesc->guidClass, &CLSID_DirectMusicSegment, sizeof(CLSID)); - + pDesc->guidClass = CLSID_DirectMusicSegment; + IStream_Read (pStream, &Chunk, sizeof(FOURCC)+sizeof(DWORD), NULL); TRACE_(dmfile)(": %s chunk (size = 0x%04x)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize); switch (Chunk.fccID) { @@ -563,11 +563,11 @@ static HRESULT WINAPI IDirectMusicWaveImpl_IPersistStream_Load (LPPERSISTSTREAM LARGE_INTEGER liMove; /* used when skipping chunks */ FIXME("(%p, %p): loading not implemented yet (only descriptor is loaded)\n", This, pStm); - + /* FIXME: should this be determined from stream? */ This->pDesc->dwValidData |= DMUS_OBJ_CLASS; - memcpy (&This->pDesc->guidClass, &CLSID_DirectMusicSegment, sizeof(CLSID)); - + This->pDesc->guidClass = CLSID_DirectMusicSegment; + IStream_Read (pStm, &Chunk, sizeof(FOURCC)+sizeof(DWORD), NULL); TRACE_(dmfile)(": %s chunk (size = 0x%04x)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize); switch (Chunk.fccID) { @@ -737,8 +737,8 @@ HRESULT WINAPI DMUSIC_CreateDirectMusicWaveImpl (LPCGUID lpcGUID, LPVOID* ppobj, obj->pDesc = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(DMUS_OBJECTDESC)); DM_STRUCT_INIT(obj->pDesc); obj->pDesc->dwValidData |= DMUS_OBJ_CLASS; - memcpy (&obj->pDesc->guidClass, &CLSID_DirectMusicSegment, sizeof (CLSID)); /* shown by tests */ + obj->pDesc->guidClass = CLSID_DirectMusicSegment; /* shown by tests */ obj->ref = 0; /* will be inited by QueryInterface */ - + return IDirectMusicWaveImpl_IUnknown_QueryInterface ((LPUNKNOWN)&obj->UnknownVtbl, lpcGUID, ppobj); }

1 0

Andrew Talbot : dplayx: Assign to struct instead of using memcpy.
by Alexandre Julliard Feb. 27, 2008

Feb. 27, 2008

Module: wine Branch: master Commit: 20c0c311dac337250d0cba8546fa639f34857347 URL: http://source.winehq.org/git/wine.git/?a=commit;h=20c0c311dac337250d0cba854… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Tue Feb 26 20:20:06 2008 +0000 dplayx: Assign to struct instead of using memcpy. --- dlls/dplayx/dplay.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/dplayx/dplay.c b/dlls/dplayx/dplay.c index 04044a7..abb71b2 100644 --- a/dlls/dplayx/dplay.c +++ b/dlls/dplayx/dplay.c @@ -3619,8 +3619,7 @@ BOOL WINAPI DP_BuildSPCompoundAddr( LPGUID lpcSpGuid, LPVOID* lplpAddrBuf, HRESULT hr; dpCompoundAddress.dwDataSize = sizeof( GUID ); - memcpy( &dpCompoundAddress.guidDataType, &DPAID_ServiceProvider, - sizeof( GUID ) ) ; + dpCompoundAddress.guidDataType = DPAID_ServiceProvider; dpCompoundAddress.lpData = lpcSpGuid; *lplpAddrBuf = NULL;

1 0

Jacek Caban : wininet: Use vtbl in InternetWriteFile implementation.
by Alexandre Julliard Feb. 27, 2008

Feb. 27, 2008

Module: wine Branch: master Commit: 1ffcfbce85cf89d364b99a2594661cc40850cf9c URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ffcfbce85cf89d364b99a259… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Feb 26 20:21:34 2008 +0100 wininet: Use vtbl in InternetWriteFile implementation. --- dlls/wininet/ftp.c | 18 ++++++++++++++++-- dlls/wininet/http.c | 11 ++++++++++- dlls/wininet/internet.c | 45 +++++++++++---------------------------------- dlls/wininet/internet.h | 4 +--- 4 files changed, 38 insertions(+), 40 deletions(-) diff --git a/dlls/wininet/ftp.c b/dlls/wininet/ftp.c index d56b732..0714777 100644 --- a/dlls/wininet/ftp.c +++ b/dlls/wininet/ftp.c @@ -1155,9 +1155,21 @@ static void FTPFILE_Destroy(WININETHANDLEHEADER *hdr) HeapFree(GetProcessHeap(), 0, lpwh); } +static BOOL FTPFILE_WriteFile(WININETHANDLEHEADER *hdr, const void *buffer, DWORD size, DWORD *written) +{ + LPWININETFTPFILE lpwh = (LPWININETFTPFILE) hdr; + int res; + + res = send(lpwh->nDataSocket, buffer, size, 0); + + *written = res>0 ? res : 0; + return res >= 0; +} + static const HANDLEHEADERVtbl FTPFILEVtbl = { FTPFILE_Destroy, - NULL + NULL, + FTPFILE_WriteFile }; /*********************************************************************** @@ -2073,7 +2085,8 @@ static void FTPSESSION_CloseConnection(WININETHANDLEHEADER *hdr) static const HANDLEHEADERVtbl FTPSESSIONVtbl = { FTPSESSION_Destroy, - FTPSESSION_CloseConnection + FTPSESSION_CloseConnection, + NULL }; @@ -3150,6 +3163,7 @@ static void FTPFINDNEXT_Destroy(WININETHANDLEHEADER *hdr) static const HANDLEHEADERVtbl FTPFINDNEXTVtbl = { FTPFINDNEXT_Destroy, + NULL, NULL }; diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 87194c4..bd219e6 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -1392,9 +1392,17 @@ static void HTTPREQ_CloseConnection(WININETHANDLEHEADER *hdr) INTERNET_STATUS_CONNECTION_CLOSED, 0, 0); } +static BOOL HTTPREQ_WriteFile(WININETHANDLEHEADER *hdr, const void *buffer, DWORD size, DWORD *written) +{ + LPWININETHTTPREQW lpwhr = (LPWININETHTTPREQW)hdr; + + return NETCON_send(&lpwhr->netConnection, buffer, size, 0, (LPINT)written); +} + static const HANDLEHEADERVtbl HTTPREQVtbl = { HTTPREQ_Destroy, - HTTPREQ_CloseConnection + HTTPREQ_CloseConnection, + HTTPREQ_WriteFile }; /*********************************************************************** @@ -2916,6 +2924,7 @@ static void HTTPSESSION_Destroy(WININETHANDLEHEADER *hdr) static const HANDLEHEADERVtbl HTTPSESSIONVtbl = { HTTPSESSION_Destroy, + NULL, NULL }; diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index 2554a31..472c183 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -473,6 +473,7 @@ static VOID APPINFO_Destroy(WININETHANDLEHEADER *hdr) static const HANDLEHEADERVtbl APPINFOVtbl = { APPINFO_Destroy, + NULL, NULL }; @@ -1692,48 +1693,24 @@ DWORD WINAPI InternetSetFilePointer(HINTERNET hFile, LONG lDistanceToMove, * FALSE on failure * */ -BOOL WINAPI InternetWriteFile(HINTERNET hFile, LPCVOID lpBuffer , +BOOL WINAPI InternetWriteFile(HINTERNET hFile, LPCVOID lpBuffer, DWORD dwNumOfBytesToWrite, LPDWORD lpdwNumOfBytesWritten) { - BOOL retval = FALSE; - int nSocket = -1; LPWININETHANDLEHEADER lpwh; + BOOL retval = FALSE; - TRACE("\n"); - lpwh = WININET_GetObject( hFile ); - if (NULL == lpwh) - return FALSE; - - switch (lpwh->htype) - { - case WH_HHTTPREQ: - { - LPWININETHTTPREQW lpwhr; - lpwhr = (LPWININETHTTPREQW)lpwh; - - TRACE("HTTPREQ %i\n",dwNumOfBytesToWrite); - retval = NETCON_send(&lpwhr->netConnection, lpBuffer, - dwNumOfBytesToWrite, 0, (LPINT)lpdwNumOfBytesWritten); + TRACE("(%p %p %d %p)\n", hFile, lpBuffer, dwNumOfBytesToWrite, lpdwNumOfBytesWritten); - WININET_Release( lpwh ); - return retval; - } - break; - - case WH_HFILE: - nSocket = ((LPWININETFTPFILE)lpwh)->nDataSocket; - break; + lpwh = WININET_GetObject( hFile ); - default: - break; + if(lpwh && lpwh->vtbl->WriteFile) { + retval = lpwh->vtbl->WriteFile(lpwh, lpBuffer, dwNumOfBytesToWrite, lpdwNumOfBytesWritten); + }else { + WARN("Invalid handle\n"); + SetLastError(ERROR_INVALID_HANDLE); + retval = FALSE; } - if (nSocket != -1) - { - int res = send(nSocket, lpBuffer, dwNumOfBytesToWrite, 0); - retval = (res >= 0); - *lpdwNumOfBytesWritten = retval ? res : 0; - } WININET_Release( lpwh ); return retval; diff --git a/dlls/wininet/internet.h b/dlls/wininet/internet.h index 5cf0b28..2389fe5 100644 --- a/dlls/wininet/internet.h +++ b/dlls/wininet/internet.h @@ -133,14 +133,12 @@ typedef enum #define INET_OPENURL 0x0001 #define INET_CALLBACKW 0x0002 -struct _WININETHANDLEHEADER; typedef struct _WININETHANDLEHEADER WININETHANDLEHEADER, *LPWININETHANDLEHEADER; -typedef void (*WININET_object_function)( LPWININETHANDLEHEADER ); - typedef struct { void (*Destroy)(WININETHANDLEHEADER*); void (*CloseConnection)(WININETHANDLEHEADER*); + BOOL (*WriteFile)(WININETHANDLEHEADER*,const void*,DWORD,DWORD*); } HANDLEHEADERVtbl; struct _WININETHANDLEHEADER

1 0

Jacek Caban : wininet: Use vtbl for InternetSetOption(INTERNET_OPTION_[ SEND|RECEIVE]_TIMEOUT) implementation.
by Alexandre Julliard Feb. 27, 2008

Feb. 27, 2008

Module: wine Branch: master Commit: 0e33eee9a24121436e40529003b227696b343510 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0e33eee9a24121436e4052900… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Feb 26 20:22:02 2008 +0100 wininet: Use vtbl for InternetSetOption(INTERNET_OPTION_[SEND|RECEIVE]_TIMEOUT) implementation. --- dlls/wininet/ftp.c | 3 ++ dlls/wininet/http.c | 21 +++++++++++++++++++ dlls/wininet/internet.c | 44 ++++++++++++++++++---------------------- dlls/wininet/internet.h | 3 +- dlls/wininet/netconnection.c | 9 +++---- dlls/wininet/tests/internet.c | 4 +++ 6 files changed, 54 insertions(+), 30 deletions(-) diff --git a/dlls/wininet/ftp.c b/dlls/wininet/ftp.c index 0714777..d81e242 100644 --- a/dlls/wininet/ftp.c +++ b/dlls/wininet/ftp.c @@ -1169,6 +1169,7 @@ static BOOL FTPFILE_WriteFile(WININETHANDLEHEADER *hdr, const void *buffer, DWOR static const HANDLEHEADERVtbl FTPFILEVtbl = { FTPFILE_Destroy, NULL, + NULL, FTPFILE_WriteFile }; @@ -2086,6 +2087,7 @@ static void FTPSESSION_CloseConnection(WININETHANDLEHEADER *hdr) static const HANDLEHEADERVtbl FTPSESSIONVtbl = { FTPSESSION_Destroy, FTPSESSION_CloseConnection, + NULL, NULL }; @@ -3164,6 +3166,7 @@ static void FTPFINDNEXT_Destroy(WININETHANDLEHEADER *hdr) static const HANDLEHEADERVtbl FTPFINDNEXTVtbl = { FTPFINDNEXT_Destroy, NULL, + NULL, NULL }; diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index bd219e6..f3c2afc 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -1392,6 +1392,25 @@ static void HTTPREQ_CloseConnection(WININETHANDLEHEADER *hdr) INTERNET_STATUS_CONNECTION_CLOSED, 0, 0); } +static DWORD HTTPREQ_SetOption(WININETHANDLEHEADER *hdr, DWORD option, void *buffer, DWORD size) +{ + WININETHTTPREQW *req = (WININETHTTPREQW*)hdr; + + switch(option) { + case INTERNET_OPTION_SEND_TIMEOUT: + case INTERNET_OPTION_RECEIVE_TIMEOUT: + TRACE("INTERNET_OPTION_SEND/RECEIVE_TIMEOUT\n"); + + if (size != sizeof(DWORD)) + return ERROR_INVALID_PARAMETER; + + return NETCON_set_timeout(&req->netConnection, option == INTERNET_OPTION_SEND_TIMEOUT, + *(DWORD*)buffer); + } + + return ERROR_INTERNET_INVALID_OPTION; +} + static BOOL HTTPREQ_WriteFile(WININETHANDLEHEADER *hdr, const void *buffer, DWORD size, DWORD *written) { LPWININETHTTPREQW lpwhr = (LPWININETHTTPREQW)hdr; @@ -1402,6 +1421,7 @@ static BOOL HTTPREQ_WriteFile(WININETHANDLEHEADER *hdr, const void *buffer, DWOR static const HANDLEHEADERVtbl HTTPREQVtbl = { HTTPREQ_Destroy, HTTPREQ_CloseConnection, + HTTPREQ_SetOption, HTTPREQ_WriteFile }; @@ -2925,6 +2945,7 @@ static void HTTPSESSION_Destroy(WININETHANDLEHEADER *hdr) static const HANDLEHEADERVtbl HTTPSESSIONVtbl = { HTTPSESSION_Destroy, NULL, + NULL, NULL }; diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index 472c183..1088519 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -474,6 +474,7 @@ static VOID APPINFO_Destroy(WININETHANDLEHEADER *hdr) static const HANDLEHEADERVtbl APPINFOVtbl = { APPINFO_Destroy, NULL, + NULL, NULL }; @@ -2477,11 +2478,22 @@ BOOL WINAPI InternetSetOptionW(HINTERNET hInternet, DWORD dwOption, LPWININETHANDLEHEADER lpwhh; BOOL ret = TRUE; - TRACE("0x%08x\n", dwOption); + TRACE("(%p %d %p %d)\n", hInternet, dwOption, lpBuffer, dwBufferLength); lpwhh = (LPWININETHANDLEHEADER) WININET_GetObject( hInternet ); - if( !lpwhh ) - return FALSE; + if(lpwhh && lpwhh->vtbl->SetOption) { + DWORD res; + + res = lpwhh->vtbl->SetOption(lpwhh, dwOption, lpBuffer, dwBufferLength); + if(res != ERROR_INTERNET_INVALID_OPTION) { + WININET_Release( lpwhh ); + + if(res != ERROR_SUCCESS) + SetLastError(res); + + return res == ERROR_SUCCESS; + } + } switch (dwOption) { @@ -2553,25 +2565,7 @@ BOOL WINAPI InternetSetOptionW(HINTERNET hInternet, DWORD dwOption, break; case INTERNET_OPTION_SEND_TIMEOUT: case INTERNET_OPTION_RECEIVE_TIMEOUT: - TRACE("INTERNET_OPTION_SEND/RECEIVE_TIMEOUT\n"); - if (dwBufferLength == sizeof(DWORD)) - { - if (lpwhh->htype == WH_HHTTPREQ) - ret = NETCON_set_timeout( - &((LPWININETHTTPREQW)lpwhh)->netConnection, - dwOption == INTERNET_OPTION_SEND_TIMEOUT, - *(DWORD *)lpBuffer); - else - { - FIXME("INTERNET_OPTION_SEND/RECEIVE_TIMEOUT not supported on protocol %d\n", - lpwhh->htype); - } - } - else - { - INTERNET_SetLastError(ERROR_INVALID_PARAMETER); - ret = FALSE; - } + FIXME("INTERNET_OPTION_SEND/RECEIVE_TIMEOUT\n"); break; case INTERNET_OPTION_CONNECT_RETRIES: FIXME("Option INTERNET_OPTION_CONNECT_RETRIES: STUB\n"); @@ -2584,11 +2578,13 @@ BOOL WINAPI InternetSetOptionW(HINTERNET hInternet, DWORD dwOption, break; default: FIXME("Option %d STUB\n",dwOption); - INTERNET_SetLastError(ERROR_INVALID_PARAMETER); + INTERNET_SetLastError(ERROR_INTERNET_INVALID_OPTION); ret = FALSE; break; } - WININET_Release( lpwhh ); + + if(lpwhh) + WININET_Release( lpwhh ); return ret; } diff --git a/dlls/wininet/internet.h b/dlls/wininet/internet.h index 2389fe5..c3321e1 100644 --- a/dlls/wininet/internet.h +++ b/dlls/wininet/internet.h @@ -138,6 +138,7 @@ typedef struct _WININETHANDLEHEADER WININETHANDLEHEADER, *LPWININETHANDLEHEADER; typedef struct { void (*Destroy)(WININETHANDLEHEADER*); void (*CloseConnection)(WININETHANDLEHEADER*); + DWORD (*SetOption)(WININETHANDLEHEADER*,DWORD,void*,DWORD); BOOL (*WriteFile)(WININETHANDLEHEADER*,const void*,DWORD,DWORD*); } HANDLEHEADERVtbl; @@ -475,7 +476,7 @@ BOOL NETCON_recv(WININET_NETCONNECTION *connection, void *buf, size_t len, int f BOOL NETCON_query_data_available(WININET_NETCONNECTION *connection, DWORD *available); BOOL NETCON_getNextLine(WININET_NETCONNECTION *connection, LPSTR lpszBuffer, LPDWORD dwBuffer); LPCVOID NETCON_GetCert(WININET_NETCONNECTION *connection); -BOOL NETCON_set_timeout(WININET_NETCONNECTION *connection, BOOL send, int value); +DWORD NETCON_set_timeout(WININET_NETCONNECTION *connection, BOOL send, int value); extern void URLCacheContainers_CreateDefaults(void); extern void URLCacheContainers_DeleteAll(void); diff --git a/dlls/wininet/netconnection.c b/dlls/wininet/netconnection.c index 4500a9f..8bf3c2a 100644 --- a/dlls/wininet/netconnection.c +++ b/dlls/wininet/netconnection.c @@ -745,7 +745,7 @@ LPCVOID NETCON_GetCert(WININET_NETCONNECTION *connection) #endif } -BOOL NETCON_set_timeout(WININET_NETCONNECTION *connection, BOOL send, int value) +DWORD NETCON_set_timeout(WININET_NETCONNECTION *connection, BOOL send, int value) { int result; struct timeval tv; @@ -753,7 +753,7 @@ BOOL NETCON_set_timeout(WININET_NETCONNECTION *connection, BOOL send, int value) /* FIXME: we should probably store the timeout in the connection to set * when we do connect */ if (!NETCON_connected(connection)) - return TRUE; + return ERROR_SUCCESS; /* value is in milliseconds, convert to struct timeval */ tv.tv_sec = value / 1000; @@ -766,9 +766,8 @@ BOOL NETCON_set_timeout(WININET_NETCONNECTION *connection, BOOL send, int value) if (result == -1) { WARN("setsockopt failed (%s)\n", strerror(errno)); - INTERNET_SetLastError(sock_get_error(errno)); - return FALSE; + return sock_get_error(errno); } - return TRUE; + return ERROR_SUCCESS; } diff --git a/dlls/wininet/tests/internet.c b/dlls/wininet/tests/internet.c index 259f563..d3adf91 100644 --- a/dlls/wininet/tests/internet.c +++ b/dlls/wininet/tests/internet.c @@ -113,6 +113,10 @@ static void test_InternetCanonicalizeUrlA(void) "got %u and %u with size %u for '%s' (%d)\n", res, GetLastError(), dwSize, buffer, lstrlenA(buffer)); + res = InternetSetOptionA(NULL, 0xdeadbeef, buffer, sizeof(buffer)); + ok(!res, "InternetSetOptionA succeeded\n"); + ok(GetLastError() == ERROR_INTERNET_INVALID_OPTION, + "InternetSetOptionA failed %u, expected ERROR_INTERNET_INVALID_OPTION\n", GetLastError()); } /* ############################### */

1 0

Jacek Caban : wininet: Moved handle destructor to vtbl.
by Alexandre Julliard Feb. 27, 2008

Feb. 27, 2008

Module: wine Branch: master Commit: 5a535d6b23b2f36a879e582475a237e44fc5de5b URL: http://source.winehq.org/git/wine.git/?a=commit;h=5a535d6b23b2f36a879e58247… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Feb 26 20:20:41 2008 +0100 wininet: Moved handle destructor to vtbl. --- dlls/wininet/ftp.c | 126 ++++++++++++++++++++++-------------------- dlls/wininet/http.c | 138 +++++++++++++++++++++++++---------------------- dlls/wininet/internet.c | 54 +++++++++--------- dlls/wininet/internet.h | 6 ++- 4 files changed, 171 insertions(+), 153 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5a535d6b23b2f36a879e5…

1 0

Jacek Caban : wininet: Moved close_connection to vtbl.
by Alexandre Julliard Feb. 27, 2008

Feb. 27, 2008

Module: wine Branch: master Commit: 7dc9bf677b052f21a98d3f16a1ed03d4aaddb9d2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7dc9bf677b052f21a98d3f16a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Feb 26 20:21:00 2008 +0100 wininet: Moved close_connection to vtbl. --- dlls/wininet/ftp.c | 67 +++++++++++++---------------- dlls/wininet/http.c | 106 ++++++++++++++++++++++------------------------- dlls/wininet/internet.c | 8 ++-- dlls/wininet/internet.h | 2 +- 4 files changed, 84 insertions(+), 99 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7dc9bf677b052f21a98d3…

1 0

Jacek Caban : wininet: Fixed version returned by INTERNET_OPTION_VERSION.
by Alexandre Julliard Feb. 27, 2008

Feb. 27, 2008

Module: wine Branch: master Commit: 928c9f0984c9e1354c01f04657ba2b1aff34bef4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=928c9f0984c9e1354c01f0465… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Feb 26 20:20:14 2008 +0100 wininet: Fixed version returned by INTERNET_OPTION_VERSION. --- dlls/wininet/internet.c | 2 +- dlls/wininet/tests/internet.c | 14 ++++++++++++++ 2 files changed, 15 insertions(+), 1 deletions(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index ba4501e..405371a 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -2393,7 +2393,7 @@ static BOOL INET_QueryOptionHelper(BOOL bIsUnicode, HINTERNET hInternet, DWORD d INTERNET_SetLastError(ERROR_INSUFFICIENT_BUFFER); else { - static const INTERNET_VERSION_INFO info = { 6, 0 }; + static const INTERNET_VERSION_INFO info = { 1, 2 }; memcpy(lpBuffer, &info, sizeof(info)); *lpdwBufferLength = sizeof(info); bSuccess = TRUE; diff --git a/dlls/wininet/tests/internet.c b/dlls/wininet/tests/internet.c index 8704f7d..259f563 100644 --- a/dlls/wininet/tests/internet.c +++ b/dlls/wininet/tests/internet.c @@ -321,6 +321,19 @@ static void test_null(void) ok(r == TRUE, "ret %d\n", r); } +static void test_version(void) +{ + INTERNET_VERSION_INFO version; + DWORD size; + BOOL res; + + size = sizeof(version); + res = InternetQueryOptionA(NULL, INTERNET_OPTION_VERSION, &version, &size); + ok(res, "Could not get version: %u\n", GetLastError()); + ok(version.dwMajorVersion == 1, "dwMajorVersion=%d, expected 1\n", version.dwMajorVersion); + ok(version.dwMinorVersion == 2, "dwMinorVersion=%d, expected 2\n", version.dwMinorVersion); +} + /* ############################### */ START_TEST(internet) @@ -328,5 +341,6 @@ START_TEST(internet) test_InternetCanonicalizeUrlA(); test_InternetQueryOptionA(); test_get_cookie(); + test_version(); test_null(); }

1 0

Jacek Caban : urlmon.idl: Added IInternet declaration.
by Alexandre Julliard Feb. 27, 2008

Feb. 27, 2008

Module: wine Branch: master Commit: 2823f1e8c09f1e49c592e293f7af16baa0954f79 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2823f1e8c09f1e49c592e293f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Feb 26 20:19:38 2008 +0100 urlmon.idl: Added IInternet declaration. --- include/urlmon.idl | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 deletions(-) diff --git a/include/urlmon.idl b/include/urlmon.idl index d1da02a..c0e0a77 100644 --- a/include/urlmon.idl +++ b/include/urlmon.idl @@ -25,6 +25,20 @@ import "msxml.idl"; interface IInternetProtocolSink; /***************************************************************************** + * IInternet interface + */ +[ + object, + uuid(79eac9e0-baf9-11ce-8c82-00aa004ba90b), + pointer_default(unique), + local +] +interface IInternet : IUnknown +{ + typedef [unique] IInternet *LPIINTERNET; +} + +/***************************************************************************** * IBinding interface */ [

1 0

Maarten Lankhorst : wininet: Fix retrieving raw headers.
by Alexandre Julliard Feb. 27, 2008

Feb. 27, 2008

Module: wine Branch: master Commit: 5132fb4469a4914f6459486d69280b0745e11808 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5132fb4469a4914f6459486d6… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Mon Feb 25 11:05:41 2008 -0800 wininet: Fix retrieving raw headers. --- dlls/wininet/http.c | 23 ++++++++++++++--------- 1 files changed, 14 insertions(+), 9 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 86154a5..478763e 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -3080,6 +3080,20 @@ static INT HTTP_GetResponseHeaders(LPWININETHTTPREQW lpwhr) } while (!strcmpW(status_code, szHundred)); /* ignore "100 Continue" responses */ + /* Add status code */ + HTTP_ProcessHeader(lpwhr, szStatus, status_code, + HTTP_ADDHDR_FLAG_REPLACE); + + HeapFree(GetProcessHeap(),0,lpwhr->lpszVersion); + HeapFree(GetProcessHeap(),0,lpwhr->lpszStatusText); + + lpwhr->lpszVersion= WININET_strdupW(buffer); + lpwhr->lpszStatusText = WININET_strdupW(status_text); + + /* Restore the spaces */ + *(status_code-1) = ' '; + *(status_text-1) = ' '; + /* regenerate raw headers */ while (cchRawHeaders + buflen + strlenW(szCrLf) > cchMaxRawHeaders) { @@ -3092,15 +3106,6 @@ static INT HTTP_GetResponseHeaders(LPWININETHTTPREQW lpwhr) cchRawHeaders += sizeof(szCrLf)/sizeof(szCrLf[0])-1; lpszRawHeaders[cchRawHeaders] = '\0'; - HTTP_ProcessHeader(lpwhr, szStatus, status_code, - HTTP_ADDHDR_FLAG_REPLACE); - - HeapFree(GetProcessHeap(),0,lpwhr->lpszVersion); - HeapFree(GetProcessHeap(),0,lpwhr->lpszStatusText); - - lpwhr->lpszVersion= WININET_strdupW(buffer); - lpwhr->lpszStatusText = WININET_strdupW(status_text); - /* Parse each response line */ do {

1 0

Rob Shearman : urlmon: Don't use typeof as it's not portable.
by Alexandre Julliard Feb. 27, 2008

Feb. 27, 2008

Module: wine Branch: master Commit: 4e5c1bf6fdb5ac41012c9d17503d53975fe68f87 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e5c1bf6fdb5ac41012c9d175… Author: Rob Shearman <rob(a)codeweavers.com> Date: Tue Feb 26 11:13:18 2008 +0000 urlmon: Don't use typeof as it's not portable. --- dlls/urlmon/regsvr.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/urlmon/regsvr.c b/dlls/urlmon/regsvr.c index 76e06ab..ece1915 100644 --- a/dlls/urlmon/regsvr.c +++ b/dlls/urlmon/regsvr.c @@ -522,7 +522,7 @@ static HRESULT register_inf(BOOL doregister) { HRESULT hres; HMODULE hAdvpack; - typeof(RegInstallA) *pRegInstall; + HRESULT (WINAPI *pRegInstall)(HMODULE hm, LPCSTR pszSection, const STRTABLEA* pstTable); STRTABLEA strtable; STRENTRYA pse[7]; static CLSID const *clsids[34]; @@ -550,7 +550,7 @@ static HRESULT register_inf(BOOL doregister) strtable.pse = pse; hAdvpack = LoadLibraryW(wszAdvpack); - pRegInstall = (typeof(RegInstallA)*)GetProcAddress(hAdvpack, "RegInstall"); + pRegInstall = (void *)GetProcAddress(hAdvpack, "RegInstall"); hres = pRegInstall(URLMON_hInstance, doregister ? "RegisterDll" : "UnregisterDll", &strtable);

1 0