diff --git a/dlls/ddraw/d3ddevice/main.c b/dlls/ddraw/d3ddevice/main.c index fe6627206c3d43a0e306b835f03638e7c5bf1fa9..21bfc3d3e2395b1fb68c5b4fb9bc4375487532ef 100644 --- a/dlls/ddraw/d3ddevice/main.c +++ b/dlls/ddraw/d3ddevice/main.c @@ -490,7 +490,7 @@ HRESULT WINAPI IDirect3DDeviceImpl_Execute( /* Put this as the default context */ /* Execute... */ - ((IDirect3DExecuteBufferImpl*)lpDirect3DExecuteBuffer)->execute(lpDirect3DExecuteBuffer, iface, lpDirect3DViewport); + ((IDirect3DExecuteBufferImpl*)lpDirect3DExecuteBuffer)->execute(lpDirect3DExecuteBuffer, iface, (IDirect3DViewport2*)lpDirect3DViewport); return DD_OK; } diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 35e68d0bb403877744350b63c6432b80e536714b..5cee68598e30ad674eb74eeedc13a91db0ec2a5b 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -7,6 +7,8 @@ * */ +#include "config.h" + #include "windows.h" #include "wininet.h" #include "debugtools.h" @@ -16,7 +18,9 @@ #include "winsock.h" #include <sys/types.h> -#include <sys/socket.h> +#ifdef HAVE_SYS_SOCKET_H +# include <sys/socket.h> +#endif #include <netdb.h> #include <stdio.h> #include <stdlib.h> @@ -721,7 +725,7 @@ HINTERNET HTTP_Connect(HINTERNET hInternet, LPCSTR lpszServerName, if (hIC->lpfnStatusCB) hIC->lpfnStatusCB(hInternet, dwContext, INTERNET_STATUS_RESOLVING_NAME, - lpszServerName, strlen(lpszServerName)); + (LPVOID)lpszServerName, strlen(lpszServerName)); if (nServerPort == INTERNET_INVALID_PORT_NUMBER) nServerPort = INTERNET_DEFAULT_HTTP_PORT; @@ -734,7 +738,7 @@ HINTERNET HTTP_Connect(HINTERNET hInternet, LPCSTR lpszServerName, if (hIC->lpfnStatusCB) hIC->lpfnStatusCB(hInternet, dwContext, INTERNET_STATUS_NAME_RESOLVED, - lpszServerName, strlen(lpszServerName)); + (LPVOID)lpszServerName, strlen(lpszServerName)); lpwhs->hdr.htype = WH_HHTTPSESSION; lpwhs->hdr.lpwhparent = (LPWININETHANDLEHEADER)hInternet; @@ -1033,8 +1037,8 @@ BOOL HTTP_ProcessHeader(LPWININETHTTPREQA lpwhr, LPCSTR field, LPCSTR value, DWO { HTTPHEADERA hdr; - hdr.lpszField = field; - hdr.lpszValue = value; + hdr.lpszField = (LPSTR)field; + hdr.lpszValue = (LPSTR)value; hdr.wFlags = hdr.wCount = 0; if (dwModifier & HTTP_ADDHDR_FLAG_REQ) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index 2b2f8c0606bec55e3220bb1fb71dde8ebd2a6990..cb67dc64963da69bd2cd0c8a3776d146d408fb92 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -465,7 +465,7 @@ BOOL SetUrlComponentValue(LPSTR* lppszComponent, LPDWORD dwComponentLen, LPCSTR { if (*lppszComponent == NULL) { - *lppszComponent = lpszStart; + *lppszComponent = (LPSTR)lpszStart; *dwComponentLen = len; } else @@ -523,7 +523,7 @@ BOOL WINAPI InternetCrackUrlA(LPCSTR lpszUrl, DWORD dwUrlLength, DWORD dwFlags, } else { - lpszcp = lpszUrl; /* Relative url */ + lpszcp = (LPSTR)lpszUrl; /* Relative url */ } break;