January 2008 - Wine-Commits

Roderick Colenbrander : wined3d: Fix glBlendColorEXT for use on RivaTNT.
by Alexandre Julliard Jan. 14, 2008

Jan. 14, 2008

Module: wine Branch: master Commit: 916b56391d6d8e7516a6584db8105f3702ac9d50 URL: http://source.winehq.org/git/wine.git/?a=commit;h=916b56391d6d8e7516a6584db… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Sat Jan 12 23:32:24 2008 +0000 wined3d: Fix glBlendColorEXT for use on RivaTNT. --- dlls/wined3d/directx.c | 13 +++++++++---- dlls/wined3d/state.c | 5 +++++ include/wine/wined3d_gl.h | 3 ++- 3 files changed, 16 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 1386a76..aac3c7b 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -83,6 +83,7 @@ static const struct { {"GL_ARB_shader_objects", ARB_SHADER_OBJECTS, 0 }, /* EXT */ + {"GL_EXT_blend_color", EXT_BLEND_COLOR, 0 }, {"GL_EXT_blend_minmax", EXT_BLEND_MINMAX, 0 }, {"GL_EXT_fog_coord", EXT_FOG_COORD, 0 }, {"GL_EXT_framebuffer_blit", EXT_FRAMEBUFFER_BLIT, 0 }, @@ -2224,8 +2225,7 @@ static HRESULT WINAPI IWineD3DImpl_GetDeviceCaps(IWineD3D *iface, UINT Adapter, WINED3DPCMPCAPS_NEVER | WINED3DPCMPCAPS_NOTEQUAL; - *pCaps->SrcBlendCaps = WINED3DPBLENDCAPS_BLENDFACTOR | - WINED3DPBLENDCAPS_BOTHINVSRCALPHA | + *pCaps->SrcBlendCaps = WINED3DPBLENDCAPS_BOTHINVSRCALPHA | WINED3DPBLENDCAPS_BOTHSRCALPHA | WINED3DPBLENDCAPS_DESTALPHA | WINED3DPBLENDCAPS_DESTCOLOR | @@ -2239,8 +2239,7 @@ static HRESULT WINAPI IWineD3DImpl_GetDeviceCaps(IWineD3D *iface, UINT Adapter, WINED3DPBLENDCAPS_SRCCOLOR | WINED3DPBLENDCAPS_ZERO; - *pCaps->DestBlendCaps = WINED3DPBLENDCAPS_BLENDFACTOR | - WINED3DPBLENDCAPS_DESTALPHA | + *pCaps->DestBlendCaps = WINED3DPBLENDCAPS_DESTALPHA | WINED3DPBLENDCAPS_DESTCOLOR | WINED3DPBLENDCAPS_INVDESTALPHA | WINED3DPBLENDCAPS_INVDESTCOLOR | @@ -2257,6 +2256,12 @@ static HRESULT WINAPI IWineD3DImpl_GetDeviceCaps(IWineD3D *iface, UINT Adapter, * legacy settings for srcblend only */ + if( GL_SUPPORT(EXT_BLEND_COLOR)) { + *pCaps->SrcBlendCaps |= WINED3DPBLENDCAPS_BLENDFACTOR; + *pCaps->DestBlendCaps |= WINED3DPBLENDCAPS_BLENDFACTOR; + } + + *pCaps->AlphaCmpCaps = WINED3DPCMPCAPS_ALWAYS | WINED3DPCMPCAPS_EQUAL | WINED3DPCMPCAPS_GREATER | diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 59ff3d4..46aa6e4 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -356,6 +356,11 @@ static void state_blend(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3D static void state_blendfactor(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DContext *context) { float col[4]; + if(!GL_SUPPORT(EXT_BLEND_COLOR)) { + WARN("Unsupported in local OpenGL implementation: glBlendColorEXT\n"); + return; + } + TRACE("Setting BlendFactor to %d\n", stateblock->renderState[WINED3DRS_BLENDFACTOR]); D3DCOLORTOGLFLOAT4(stateblock->renderState[WINED3DRS_BLENDFACTOR], col); GL_EXTCALL(glBlendColorEXT (col[0],col[1],col[2],col[3])); diff --git a/include/wine/wined3d_gl.h b/include/wine/wined3d_gl.h index f51a4e6..4379039 100644 --- a/include/wine/wined3d_gl.h +++ b/include/wine/wined3d_gl.h @@ -3188,6 +3188,7 @@ typedef enum _GL_SupportedExt { ARB_VERTEX_SHADER, ARB_SHADER_OBJECTS, /* EXT */ + EXT_BLEND_COLOR, EXT_BLEND_MINMAX, EXT_FOG_COORD, EXT_FRAMEBUFFER_OBJECT, @@ -3257,7 +3258,7 @@ typedef enum _GL_SupportedExt { /* GL_ARB_draw_buffers */ \ USE_GL_FUNC(PGLFNDRAWBUFFERSARBPROC, glDrawBuffersARB, ARB_DRAW_BUFFERS, NULL );\ /* GL_ARB_imaging, GL_EXT_blend_minmax */ \ - USE_GL_FUNC(PGLFNBLENDCOLORPROC, glBlendColorEXT, EXT_BLEND_MINMAX, NULL );\ + USE_GL_FUNC(PGLFNBLENDCOLORPROC, glBlendColorEXT, EXT_BLEND_COLOR, NULL );\ USE_GL_FUNC(PGLFNBLENDEQUATIONPROC, glBlendEquationEXT, EXT_BLEND_MINMAX, NULL );\ /* GL_ARB_multisample */ \ USE_GL_FUNC(WINED3D_PFNGLSAMPLECOVERAGEARBPROC, glSampleCoverageARB, ARB_MULTISAMPLE, NULL );\

1 0

Andrew Talbot : setupapi: Fix dead code (Coverity).
by Alexandre Julliard Jan. 14, 2008

Jan. 14, 2008

Module: wine Branch: master Commit: ac352615b1ddd51dc4db1a20bf4c817d523be375 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac352615b1ddd51dc4db1a20b… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat Jan 12 16:52:20 2008 +0000 setupapi: Fix dead code (Coverity). --- dlls/setupapi/devinst.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index 4819495..c24236c 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -3813,7 +3813,7 @@ BOOL WINAPI SetupDiDeleteDevRegKey( SetLastError(ERROR_INVALID_FLAGS); return FALSE; } - if (KeyType != DIREG_DEV && KeyType != DIREG_DRV) + if (KeyType != DIREG_DEV && KeyType != DIREG_DRV && KeyType != DIREG_BOTH) { SetLastError(ERROR_INVALID_FLAGS); return FALSE;

1 0

Gregor Münch : msxml3: Fix typo.
by Alexandre Julliard Jan. 14, 2008

Jan. 14, 2008

Module: wine Branch: master Commit: be853b6f4f27b0f1b3006164211a97ba6cea3b40 URL: http://source.winehq.org/git/wine.git/?a=commit;h=be853b6f4f27b0f1b30061642… Author: Gregor Münch <greg87(a)online.de> Date: Sat Jan 12 18:00:31 2008 +0100 msxml3: Fix typo. --- dlls/msxml3/text.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msxml3/text.c b/dlls/msxml3/text.c index a1e7d49..7c0f42e 100644 --- a/dlls/msxml3/text.c +++ b/dlls/msxml3/text.c @@ -71,7 +71,7 @@ static HRESULT WINAPI domtext_QueryInterface( } else { - FIXME("Unsupported inteferace %s\n", debugstr_guid(riid)); + FIXME("Unsupported interface %s\n", debugstr_guid(riid)); return E_NOINTERFACE; }

1 0

Hans Leidekker : license: Update copyright info for the new year.
by Alexandre Julliard Jan. 14, 2008

Jan. 14, 2008

Module: wine Branch: master Commit: 43324fafd9439b8ee00b901fb800d26df03b70bc URL: http://source.winehq.org/git/wine.git/?a=commit;h=43324fafd9439b8ee00b901fb… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Sun Jan 13 15:53:14 2008 +0100 license: Update copyright info for the new year. --- LICENSE | 2 +- include/wine/wine_common_ver.rc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/LICENSE b/LICENSE index e86077c..597f4c5 100644 --- a/LICENSE +++ b/LICENSE @@ -1,4 +1,4 @@ -Copyright (c) 1993-2007 the Wine project authors (see the file AUTHORS +Copyright (c) 1993-2008 the Wine project authors (see the file AUTHORS for a complete list) Wine is free software; you can redistribute it and/or modify it under diff --git a/include/wine/wine_common_ver.rc b/include/wine/wine_common_ver.rc index e7be2fc..8a4ae3b 100644 --- a/include/wine/wine_common_ver.rc +++ b/include/wine/wine_common_ver.rc @@ -84,7 +84,7 @@ FILESUBTYPE WINE_FILESUBTYPE VALUE "FileDescription", WINE_FILEDESCRIPTION_STR VALUE "FileVersion", WINE_FILEVERSION_STR VALUE "InternalName", WINE_FILENAME - VALUE "LegalCopyright", "Copyright (c) 1993-2007 the Wine project authors (see the file AUTHORS for a complete list)" + VALUE "LegalCopyright", "Copyright (c) 1993-2008 the Wine project authors (see the file AUTHORS for a complete list)" VALUE "OriginalFilename", WINE_FILENAME_STR VALUE "ProductName", WINE_PRODUCTNAME_STR VALUE "ProductVersion", WINE_PRODUCTVERSION_STR

1 0

Andrew Talbot : msvfw32: Remove unneeded casts.
by Alexandre Julliard Jan. 14, 2008

Jan. 14, 2008

Module: wine Branch: master Commit: 0f806dfd6bb3b62e08f412b01c97374fe0b0c4a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f806dfd6bb3b62e08f412b01… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat Jan 12 16:05:25 2008 +0000 msvfw32: Remove unneeded casts. --- dlls/msvfw32/drawdib.c | 6 +++--- dlls/msvfw32/msvideo_main.c | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/msvfw32/drawdib.c b/dlls/msvfw32/drawdib.c index 734f0e2..3b30823 100644 --- a/dlls/msvfw32/drawdib.c +++ b/dlls/msvfw32/drawdib.c @@ -183,7 +183,7 @@ BOOL VFWAPI DrawDibBegin(HDRAWDIB hdd, WINE_HDD *whdd; TRACE("(%p,%p,%d,%d,%p,%d,%d,0x%08x)\n", - hdd, hdc, dxDst, dyDst, lpbi, dxSrc, dySrc, (DWORD)wFlags); + hdd, hdc, dxDst, dyDst, lpbi, dxSrc, dySrc, wFlags); TRACE("lpbi: %d,%d/%d,%d,%d,%d,%d,%d,%d,%d,%d\n", lpbi->biSize, lpbi->biWidth, lpbi->biHeight, lpbi->biPlanes, @@ -305,7 +305,7 @@ BOOL VFWAPI DrawDibDraw(HDRAWDIB hdd, HDC hdc, BOOL ret = TRUE; TRACE("(%p,%p,%d,%d,%d,%d,%p,%p,%d,%d,%d,%d,0x%08x)\n", - hdd, hdc, xDst, yDst, dxDst, dyDst, lpbi, lpBits, xSrc, ySrc, dxSrc, dySrc, (DWORD)wFlags); + hdd, hdc, xDst, yDst, dxDst, dyDst, lpbi, lpBits, xSrc, ySrc, dxSrc, dySrc, wFlags); whdd = MSVIDEO_GetHddPtr(hdd); if (!whdd) return FALSE; @@ -313,7 +313,7 @@ BOOL VFWAPI DrawDibDraw(HDRAWDIB hdd, HDC hdc, TRACE("whdd=%p\n", whdd); if (wFlags & ~(DDF_SAME_HDC | DDF_SAME_DRAW | DDF_NOTKEYFRAME | DDF_UPDATE | DDF_DONTDRAW | DDF_BACKGROUNDPAL)) - FIXME("wFlags == 0x%08x not handled\n", (DWORD)wFlags); + FIXME("wFlags == 0x%08x not handled\n", wFlags); if (!lpBits) { diff --git a/dlls/msvfw32/msvideo_main.c b/dlls/msvfw32/msvideo_main.c index 1cad3bb..aaf8d0c 100644 --- a/dlls/msvfw32/msvideo_main.c +++ b/dlls/msvfw32/msvideo_main.c @@ -87,7 +87,7 @@ BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved ) { case DLL_PROCESS_ATTACH: DisableThreadLibraryCalls(hinst); - MSVFW32_hModule = (HMODULE)hinst; + MSVFW32_hModule = hinst; break; } return TRUE; @@ -1088,7 +1088,7 @@ LRESULT MSVIDEO_SendMessage(WINE_HIC* whic, UINT msg, DWORD_PTR lParam1, DWORD_P XX(ICM_DECOMPRESSEX_END); XX(ICM_SET_STATUS_PROC); default: - FIXME("(%p,0x%08x,0x%08lx,0x%08lx) unknown message\n",whic,(DWORD)msg,lParam1,lParam2); + FIXME("(%p,0x%08x,0x%08lx,0x%08lx) unknown message\n",whic,msg,lParam1,lParam2); } #undef XX @@ -1360,7 +1360,7 @@ err: GlobalFree(hMem); hMem = NULL; } - return (HANDLE)hMem; + return hMem; } /***********************************************************************

1 0

Andrew Talbot : netapi32: Remove unneeded cast.
by Alexandre Julliard Jan. 14, 2008

Jan. 14, 2008

Module: wine Branch: master Commit: 4e3671f70b100ca4ebb58b3cac5c7baaf3facfcd URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e3671f70b100ca4ebb58b3ca… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat Jan 12 16:05:42 2008 +0000 netapi32: Remove unneeded cast. --- dlls/netapi32/access.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/netapi32/access.c b/dlls/netapi32/access.c index 028c1ca..f793239 100644 --- a/dlls/netapi32/access.c +++ b/dlls/netapi32/access.c @@ -600,7 +600,7 @@ NetQueryDisplayInformation( NetApiBufferAllocate(dwSize + admin_size - sizeof(NET_DISPLAY_USER) + guest_size - sizeof(NET_DISPLAY_USER), - (LPVOID *) SortedBuffer); + SortedBuffer); inf = (PNET_DISPLAY_USER) *SortedBuffer; str = (LPWSTR) ((PBYTE) inf + sizeof(NET_DISPLAY_USER) * records); inf->usri1_name = str;

1 0

Andrew Talbot : msxml3: Remove unneeded cast.
by Alexandre Julliard Jan. 14, 2008

Jan. 14, 2008

Module: wine Branch: master Commit: d9cd7502d5aafff0de9363ca62818213d450cde7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d9cd7502d5aafff0de9363ca6… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat Jan 12 16:05:33 2008 +0000 msxml3: Remove unneeded cast. --- dlls/msxml3/nodemap.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msxml3/nodemap.c b/dlls/msxml3/nodemap.c index 53f2171..1a7d4dc 100644 --- a/dlls/msxml3/nodemap.c +++ b/dlls/msxml3/nodemap.c @@ -227,7 +227,7 @@ static HRESULT WINAPI xmlnodemap_setNamedItem( nodeNew = xmlAddChild(node, ThisNew->node); if(namedItem) - *namedItem = create_node( (xmlNodePtr) nodeNew ); + *namedItem = create_node( nodeNew ); IUnknown_Release(pAttr);

1 0

Andrew Talbot : ntdll: Remove unneeded casts.
by Alexandre Julliard Jan. 14, 2008

Jan. 14, 2008

Module: wine Branch: master Commit: 00981b580a24fa7711f176178f9781e2b496477c URL: http://source.winehq.org/git/wine.git/?a=commit;h=00981b580a24fa7711f176178… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat Jan 12 16:05:50 2008 +0000 ntdll: Remove unneeded casts. --- dlls/ntdll/critsection.c | 11 +++++------ dlls/ntdll/serial.c | 4 ++-- dlls/ntdll/threadpool.c | 10 +++++----- 3 files changed, 12 insertions(+), 13 deletions(-) diff --git a/dlls/ntdll/critsection.c b/dlls/ntdll/critsection.c index 3c0d549..0fa47c4 100644 --- a/dlls/ntdll/critsection.c +++ b/dlls/ntdll/critsection.c @@ -39,12 +39,12 @@ WINE_DECLARE_DEBUG_CHANNEL(relay); static inline LONG interlocked_inc( PLONG dest ) { - return interlocked_xchg_add( (int *)dest, 1 ) + 1; + return interlocked_xchg_add( dest, 1 ) + 1; } static inline LONG interlocked_dec( PLONG dest ) { - return interlocked_xchg_add( (int *)dest, -1 ) - 1; + return interlocked_xchg_add( dest, -1 ) - 1; } static inline void small_pause(void) @@ -208,8 +208,7 @@ static inline HANDLE get_semaphore( RTL_CRITICAL_SECTION *crit ) { HANDLE sem; if (NtCreateSemaphore( &sem, SEMAPHORE_ALL_ACCESS, NULL, 0, 1 )) return 0; - if (!(ret = (HANDLE)interlocked_cmpxchg_ptr( (PVOID *)&crit->LockSemaphore, - sem, 0 ))) + if (!(ret = interlocked_cmpxchg_ptr( &crit->LockSemaphore, sem, 0 ))) ret = sem; else NtClose(sem); /* somebody beat us to it */ @@ -490,7 +489,7 @@ NTSTATUS WINAPI RtlEnterCriticalSection( RTL_CRITICAL_SECTION *crit ) if (crit->LockCount > 0) break; /* more than one waiter, don't bother spinning */ if (crit->LockCount == -1) /* try again */ { - if (interlocked_cmpxchg( (int *)&crit->LockCount, 0, -1 ) == -1) goto done; + if (interlocked_cmpxchg( &crit->LockCount, 0, -1 ) == -1) goto done; } small_pause(); } @@ -534,7 +533,7 @@ done: BOOL WINAPI RtlTryEnterCriticalSection( RTL_CRITICAL_SECTION *crit ) { BOOL ret = FALSE; - if (interlocked_cmpxchg( (int *)&crit->LockCount, 0, -1 ) == -1) + if (interlocked_cmpxchg( &crit->LockCount, 0, -1 ) == -1) { crit->OwningThread = ULongToHandle(GetCurrentThreadId()); crit->RecursionCount = 1; diff --git a/dlls/ntdll/serial.c b/dlls/ntdll/serial.c index 1b05b6e..2ca604d 100644 --- a/dlls/ntdll/serial.c +++ b/dlls/ntdll/serial.c @@ -264,9 +264,9 @@ static NTSTATUS get_line_control(int fd, SERIAL_LINE_CONTROL* slc) case CS6: slc->WordLength = 6; break; case CS7: slc->WordLength = 7; break; case CS8: slc->WordLength = 8; break; - default: ERR("unknown size %x\n", (UINT)(port.c_cflag & CSIZE)); + default: ERR("unknown size %x\n", port.c_cflag & CSIZE); } - + if (port.c_cflag & CSTOPB) { if (slc->WordLength == 5) diff --git a/dlls/ntdll/threadpool.c b/dlls/ntdll/threadpool.c index 179b505..e054136 100644 --- a/dlls/ntdll/threadpool.c +++ b/dlls/ntdll/threadpool.c @@ -73,12 +73,12 @@ struct work_item static inline LONG interlocked_inc( PLONG dest ) { - return interlocked_xchg_add( (int *)dest, 1 ) + 1; + return interlocked_xchg_add( dest, 1 ) + 1; } static inline LONG interlocked_dec( PLONG dest ) { - return interlocked_xchg_add( (int *)dest, -1 ) - 1; + return interlocked_xchg_add( dest, -1 ) - 1; } static void WINAPI worker_thread_proc(void * param) @@ -148,7 +148,7 @@ static NTSTATUS add_work_item_to_queue(struct work_item *work_item) { HANDLE sem; status = NtCreateSemaphore(&sem, SEMAPHORE_ALL_ACCESS, NULL, 1, LONG_MAX); - if (interlocked_cmpxchg_ptr( (PVOID *)&work_item_event, sem, 0 )) + if (interlocked_cmpxchg_ptr( &work_item_event, sem, 0 )) NtClose(sem); /* somebody beat us to it */ } else @@ -486,14 +486,14 @@ NTSTATUS WINAPI RtlDeregisterWaitEx(HANDLE WaitHandle, HANDLE CompletionEvent) status = NtCreateEvent( &CompletionEvent, EVENT_ALL_ACCESS, NULL, TRUE, FALSE ); if (status != STATUS_SUCCESS) return status; - interlocked_xchg_ptr( (PVOID *)&wait_work_item->CompletionEvent, CompletionEvent ); + interlocked_xchg_ptr( &wait_work_item->CompletionEvent, CompletionEvent ); if (wait_work_item->CallbackInProgress) NtWaitForSingleObject( CompletionEvent, FALSE, NULL ); NtClose( CompletionEvent ); } else { - interlocked_xchg_ptr( (PVOID *)&wait_work_item->CompletionEvent, CompletionEvent ); + interlocked_xchg_ptr( &wait_work_item->CompletionEvent, CompletionEvent ); if (wait_work_item->CallbackInProgress) status = STATUS_PENDING; }

1 0

Rob Shearman : include: Flesh out winhttp.h with more function declarations , typedefs and defines.
by Alexandre Julliard Jan. 14, 2008

Jan. 14, 2008

Module: wine Branch: master Commit: 9cbdcbe5f27b972ade944f89a6c328b6ae708b98 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9cbdcbe5f27b972ade944f89a… Author: Rob Shearman <rob(a)codeweavers.com> Date: Fri Jan 11 17:09:29 2008 +0000 include: Flesh out winhttp.h with more function declarations, typedefs and defines. --- include/winhttp.h | 67 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 67 insertions(+), 0 deletions(-) diff --git a/include/winhttp.h b/include/winhttp.h index f971d76..c57563d 100644 --- a/include/winhttp.h +++ b/include/winhttp.h @@ -36,6 +36,30 @@ typedef INTERNET_PORT *LPINTERNET_PORT; #define INTERNET_SCHEME_HTTPS 2 typedef int INTERNET_SCHEME, *LPINTERNET_SCHEME; +/* flags for WinHttpOpen */ +#define WINHTTP_FLAG_ASYNC 0x10000000 + +/* flags for WinHttpOpenRequest */ +#define WINHTTP_FLAG_ESCAPE_PERCENT 0x00000004 +#define WINHTTP_FLAG_NULL_CODEPAGE 0x00000008 +#define WINHTTP_FLAG_ESCAPE_DISABLE 0x00000040 +#define WINHTTP_FLAG_ESCAPE_DISABLE_QUERY 0x00000080 +#define WINHTTP_FLAG_BYPASS_PROXY_CACHE 0x00000100 +#define WINHTTP_FLAG_REFRESH WINHTTP_FLAG_BYPASS_PROXY_CACHE +#define WINHTTP_FLAG_SECURE 0x00800000 + +#define WINHTTP_ACCESS_TYPE_DEFAULT_PROXY 0 +#define WINHTTP_ACCESS_TYPE_NO_PROXY 1 +#define WINHTTP_ACCESS_TYPE_NAMED_PROXY 3 + +#define WINHTTP_NO_PROXY_NAME NULL +#define WINHTTP_NO_PROXY_BYPASS NULL + +#define WINHTTP_NO_REFERER NULL +#define WINHTTP_DEFAULT_ACCEPT_TYPES NULL + +#define WINHTTP_ERROR_BASE 12000 + typedef struct { DWORD dwStructSize; @@ -92,13 +116,56 @@ typedef struct LPWSTR lpszProxyBypass; } WINHTTP_CURRENT_USER_IE_PROXY_CONFIG; +typedef VOID (CALLBACK *WINHTTP_STATUS_CALLBACK)(HINTERNET,DWORD_PTR,DWORD,LPVOID,DWORD); + +typedef struct +{ + DWORD dwFlags; + DWORD dwAutoDetectFlags; + LPCWSTR lpszAutoConfigUrl; + LPVOID lpvReserved; + DWORD dwReserved; + BOOL fAutoLogonIfChallenged; +} WINHTTP_AUTOPROXY_OPTIONS; + +typedef struct +{ + DWORD dwMajorVersion; + DWORD dwMinorVersion; +} HTTP_VERSION_INFO, *LPHTTP_VERSION_INFO; + #ifdef __cplusplus extern "C" { #endif +BOOL WINAPI WinHttpAddRequestHeaders(HINTERNET,LPCWSTR,DWORD,DWORD); +BOOL WINAPI WinHttpDetectAutoProxyConfigUrl(DWORD,LPWSTR*); BOOL WINAPI WinHttpCheckPlatform(void); +BOOL WINAPI WinHttpCloseHandle(HINTERNET); +HINTERNET WINAPI WinHttpConnect(HINTERNET,LPCWSTR,INTERNET_PORT,DWORD); +BOOL WINAPI WinHttpCrackUrl(LPCWSTR,DWORD,DWORD,LPURL_COMPONENTS); +BOOL WINAPI WinHttpCreateUrl(LPURL_COMPONENTS,DWORD,LPWSTR,LPDWORD); +BOOL WINAPI WinHttpGetDefaultProxyConfiguration(WINHTTP_PROXY_INFO*); BOOL WINAPI WinHttpGetIEProxyConfigForCurrentUser(WINHTTP_CURRENT_USER_IE_PROXY_CONFIG* config); +BOOL WINAPI WinHttpGetProxyForUrl(HINTERNET,LPCWSTR,WINHTTP_AUTOPROXY_OPTIONS*,WINHTTP_PROXY_INFO*); +HINTERNET WINAPI WinHttpOpen(LPCWSTR,DWORD,LPCWSTR,LPCWSTR,DWORD); +HINTERNET WINAPI WinHttpOpenRequest(HINTERNET,LPCWSTR,LPCWSTR,LPCWSTR,LPCWSTR,LPCWSTR,DWORD); +BOOL WINAPI WinHttpQueryAuthParams(HINTERNET,DWORD,LPVOID*); +BOOL WINAPI WinHttpQueryAuthSchemes(HINTERNET,LPDWORD,LPDWORD,LPDWORD); +BOOL WINAPI WinHttpQueryDataAvailable(HINTERNET,LPDWORD); +BOOL WINAPI WinHttpQueryHeaders(HINTERNET,DWORD,LPCWSTR,LPVOID,LPDWORD,LPDWORD); +BOOL WINAPI WinHttpReadData(HINTERNET,LPVOID,DWORD,LPDWORD); +BOOL WINAPI WinHttpReceiveResponse(HINTERNET,LPVOID); +BOOL WINAPI WinHttpSendRequest(HINTERNET,LPCWSTR,DWORD,LPVOID,DWORD,DWORD,DWORD_PTR); +BOOL WINAPI WinHttpSetDefaultProxyConfiguration(WINHTTP_PROXY_INFO*); +BOOL WINAPI WinHttpSetCredentials(HINTERNET,DWORD,DWORD,LPCWSTR,LPCWSTR,LPVOID); +BOOL WINAPI WinHttpSetOption(HINTERNET,DWORD,LPVOID,DWORD); +WINHTTP_STATUS_CALLBACK WINAPI WinHttpSetStatusCallback(HINTERNET,WINHTTP_STATUS_CALLBACK,DWORD,DWORD_PTR); +BOOL WINAPI WinHttpSetTimeouts(HINTERNET,int,int,int,int); +BOOL WINAPI WinHttpTimeFromSystemTime(CONST SYSTEMTIME *,LPWSTR); +BOOL WINAPI WinHttpTimeToSystemTime(LPCWSTR,SYSTEMTIME*); +BOOL WINAPI WinHttpWriteData(HINTERNET,LPCVOID,DWORD,LPDWORD); #ifdef __cplusplus }

1 0

Andrew Talbot : msvcrt: Remove unneeded casts.
by Alexandre Julliard Jan. 14, 2008

Jan. 14, 2008

Module: wine Branch: master Commit: a69418c52c1a944f9a1804b845f6400fa9ed2962 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a69418c52c1a944f9a1804b84… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat Jan 12 16:05:11 2008 +0000 msvcrt: Remove unneeded casts. --- dlls/msvcrt/dir.c | 8 ++++---- dlls/msvcrt/thread.c | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/msvcrt/dir.c b/dlls/msvcrt/dir.c index 3da6efa..2ca74a9 100644 --- a/dlls/msvcrt/dir.c +++ b/dlls/msvcrt/dir.c @@ -601,10 +601,10 @@ unsigned int CDECL MSVCRT__getdiskfree(unsigned int disk, struct MSVCRT__diskfre if (GetDiskFreeSpaceW(disk==0?NULL:drivespec,ret,ret+1,ret+2,ret+3)) { - d->sectors_per_cluster = (unsigned)ret[0]; - d->bytes_per_sector = (unsigned)ret[1]; - d->avail_clusters = (unsigned)ret[2]; - d->total_clusters = (unsigned)ret[3]; + d->sectors_per_cluster = ret[0]; + d->bytes_per_sector = ret[1]; + d->avail_clusters = ret[2]; + d->total_clusters = ret[3]; return 0; } err = GetLastError(); diff --git a/dlls/msvcrt/thread.c b/dlls/msvcrt/thread.c index 43b8901..dc6edcd 100644 --- a/dlls/msvcrt/thread.c +++ b/dlls/msvcrt/thread.c @@ -108,8 +108,8 @@ MSVCRT_uintptr_t CDECL _beginthreadex( /* FIXME */ return (MSVCRT_uintptr_t)CreateThread(security, stack_size, - (LPTHREAD_START_ROUTINE) start_address, - arglist, initflag, (LPDWORD) thrdaddr); + start_address, arglist, + initflag, thrdaddr); } /*********************************************************************

1 0