January 2009 - Wine-Commits

Michael Stefaniuc : include: Use ULONG in rpcdcep.h for Win64 compatibility .
by Alexandre Julliard Jan. 12, 2009

Jan. 12, 2009

Module: wine Branch: master Commit: c171379f47683d1d10c5dd298f7059dda5671c9b URL: http://source.winehq.org/git/wine.git/?a=commit;h=c171379f47683d1d10c5dd298… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Jan 11 00:17:01 2009 +0100 include: Use ULONG in rpcdcep.h for Win64 compatibility. --- dlls/rpcrt4/tests/ndr_marshall.c | 4 ++-- include/rpcdcep.h | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/rpcrt4/tests/ndr_marshall.c b/dlls/rpcrt4/tests/ndr_marshall.c index de49848..83a80d9 100644 --- a/dlls/rpcrt4/tests/ndr_marshall.c +++ b/dlls/rpcrt4/tests/ndr_marshall.c @@ -1143,7 +1143,7 @@ static void test_client_init(void) /* Note: ReservedForRuntime not tested */ TEST_POINTER_UNSET(ManagerEpv); TEST_POINTER_UNSET(ImportContext); - ok(rpcMsg.RpcFlags == 0, "rpcMsg.RpcFlags should have been 0 instead of 0x%lx\n", rpcMsg.RpcFlags); + ok(rpcMsg.RpcFlags == 0, "rpcMsg.RpcFlags should have been 0 instead of 0x%x\n", rpcMsg.RpcFlags); #undef TEST_POINTER_UNSET #define TEST_ZERO(field, fmt) ok(stubMsg.field == 0, #field " should have been set to zero instead of " fmt "\n", stubMsg.field) @@ -1978,7 +1978,7 @@ static void test_ndr_buffer(void) ok(RpcMessage.BufferLength == 10 || broken(RpcMessage.BufferLength == 12), /* win2k */ "RpcMessage.BufferLength should have been 10 instead of %d\n", RpcMessage.BufferLength); - ok(RpcMessage.RpcFlags == 0, "RpcMessage.RpcFlags should have been 0x0 instead of 0x%lx\n", RpcMessage.RpcFlags); + ok(RpcMessage.RpcFlags == 0, "RpcMessage.RpcFlags should have been 0x0 instead of 0x%x\n", RpcMessage.RpcFlags); ok(StubMsg.Buffer != NULL, "Buffer should not have been NULL\n"); ok(!StubMsg.BufferStart, "BufferStart should have been NULL instead of %p\n", StubMsg.BufferStart); ok(!StubMsg.BufferEnd, "BufferEnd should have been NULL instead of %p\n", StubMsg.BufferEnd); diff --git a/include/rpcdcep.h b/include/rpcdcep.h index 1bdfb47..0169586 100644 --- a/include/rpcdcep.h +++ b/include/rpcdcep.h @@ -36,7 +36,7 @@ typedef struct _RPC_SYNTAX_IDENTIFIER { typedef struct _RPC_MESSAGE { RPC_BINDING_HANDLE Handle; - unsigned long DataRepresentation; + ULONG DataRepresentation; void* Buffer; unsigned int BufferLength; unsigned int ProcNum; @@ -45,7 +45,7 @@ typedef struct _RPC_MESSAGE void* ReservedForRuntime; RPC_MGR_EPV* ManagerEpv; void* ImportContext; - unsigned long RpcFlags; + ULONG RpcFlags; } RPC_MESSAGE, *PRPC_MESSAGE; /* or'ed with ProcNum */ @@ -202,13 +202,13 @@ RPCRTAPI RPC_STATUS RPC_ENTRY typedef RPC_STATUS (*RPC_BLOCKING_FN)(void* hWnd, void* Context, void* hSyncEvent); RPCRTAPI RPC_STATUS RPC_ENTRY - I_RpcBindingSetAsync( RPC_BINDING_HANDLE Binding, RPC_BLOCKING_FN BlockingFn, unsigned long ServerTid ); + I_RpcBindingSetAsync( RPC_BINDING_HANDLE Binding, RPC_BLOCKING_FN BlockingFn, ULONG ServerTid ); RPCRTAPI RPC_STATUS RPC_ENTRY I_RpcSetThreadParams( int fClientFree, void* Context, void* hWndClient ); RPCRTAPI UINT RPC_ENTRY - I_RpcWindowProc( void* hWnd, unsigned int Message, unsigned int wParam, unsigned long lParam ); + I_RpcWindowProc( void* hWnd, unsigned int Message, unsigned int wParam, ULONG lParam ); #endif

1 0

Michael Stefaniuc : msvfw32: Remove superfluous pointer casts.
by Alexandre Julliard Jan. 12, 2009

Jan. 12, 2009

Module: wine Branch: master Commit: ca8d5a7922e7ecc4a6a74a24b340c918aab62250 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca8d5a7922e7ecc4a6a74a24b… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Jan 11 00:16:25 2009 +0100 msvfw32: Remove superfluous pointer casts. --- dlls/msvfw32/mciwnd.c | 2 +- dlls/msvfw32/msvideo16.c | 2 +- dlls/msvfw32/msvideo_main.c | 12 ++++++------ 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/msvfw32/mciwnd.c b/dlls/msvfw32/mciwnd.c index f6ca6cd..61b13aa 100644 --- a/dlls/msvfw32/mciwnd.c +++ b/dlls/msvfw32/mciwnd.c @@ -309,7 +309,7 @@ static LRESULT MCIWND_Create(HWND hWnd, LPCREATESTRUCTW cs) /* MCI wnd class is prepared to be embedded as an MDI child window */ if (cs->dwExStyle & WS_EX_MDICHILD) { - MDICREATESTRUCTW *mdics = (MDICREATESTRUCTW *)cs->lpCreateParams; + MDICREATESTRUCTW *mdics = cs->lpCreateParams; lParam = mdics->lParam; } else diff --git a/dlls/msvfw32/msvideo16.c b/dlls/msvfw32/msvideo16.c index 221542c..c873da5 100644 --- a/dlls/msvfw32/msvideo16.c +++ b/dlls/msvfw32/msvideo16.c @@ -602,7 +602,7 @@ static void MSVIDEO_UnmapMsg16To32(UINT msg, LPVOID data16, LPDWORD lParam1, LPD case ICM_GETINFO: { ICINFO *ici = (ICINFO*)(*lParam1); - ICINFO16 *ici16 = (ICINFO16*)data16; + ICINFO16 *ici16 = data16; UNCOPY(ici, fccType); UNCOPY(ici, fccHandler); diff --git a/dlls/msvfw32/msvideo_main.c b/dlls/msvfw32/msvideo_main.c index 247c00e..7483218 100644 --- a/dlls/msvfw32/msvideo_main.c +++ b/dlls/msvfw32/msvideo_main.c @@ -175,7 +175,7 @@ DWORD WINAPI VideoForWindowsVersion(void) static BOOL ICInfo_enum_handler(const char *drv, unsigned int nr, void *param) { - ICINFO *lpicinfo = (ICINFO *)param; + ICINFO *lpicinfo = param; DWORD fccHandler = mmioStringToFOURCCA(drv + 5, 0); /* exact match of fccHandler or nth driver found */ @@ -521,7 +521,7 @@ static HIC try_driver(driver_info_t *info) static BOOL ICLocate_enum_handler(const char *drv, unsigned int nr, void *param) { - driver_info_t *info = (driver_info_t *)param; + driver_info_t *info = param; info->fccHandler = mmioStringToFOURCCA(drv + 5, 0); info->hic = try_driver(info); return info->hic != 0; @@ -1299,7 +1299,7 @@ HANDLE VFWAPI ICImageDecompress( pHdr = HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,cbHdr+sizeof(RGBQUAD)*256); if ( pHdr == NULL ) goto err; - if ( ICDecompressGetFormat( hic, lpbiIn, (BITMAPINFO*)pHdr ) != ICERR_OK ) + if ( ICDecompressGetFormat( hic, lpbiIn, pHdr ) != ICERR_OK ) goto err; lpbiOut = (BITMAPINFO*)pHdr; if ( lpbiOut->bmiHeader.biBitCount <= 8 && @@ -1337,7 +1337,7 @@ HANDLE VFWAPI ICImageDecompress( WARN( "out of memory\n" ); goto err; } - pMem = (BYTE*)GlobalLock( hMem ); + pMem = GlobalLock( hMem ); if ( pMem == NULL ) goto err; memcpy( pMem, lpbiOut, cbHdr ); @@ -1368,7 +1368,7 @@ err: */ LPVOID VFWAPI ICSeqCompressFrame(PCOMPVARS pc, UINT uiFlags, LPVOID lpBits, BOOL *pfKey, LONG *plSize) { - ICCOMPRESS* icComp = (ICCOMPRESS *)pc->lpState; + ICCOMPRESS* icComp = pc->lpState; DWORD ret; TRACE("(%p, 0x%08x, %p, %p, %p)\n", pc, uiFlags, lpBits, pfKey, plSize); @@ -1490,7 +1490,7 @@ BOOL VFWAPI ICSeqCompressFrameStart(PCOMPVARS pc, LPBITMAPINFO lpbiIn) TRACE(" -- %x\n", ret); if (ret == ICERR_OK) { - ICCOMPRESS* icComp = (ICCOMPRESS *)pc->lpState; + ICCOMPRESS* icComp = pc->lpState; /* Initialise some variables */ pc->lFrame = 0; pc->lKeyCount = 0;

1 0

Michael Stefaniuc : dsound: Remove superfluous pointer casts.
by Alexandre Julliard Jan. 12, 2009

Jan. 12, 2009

Module: wine Branch: master Commit: c91aa7a96de2f8c208894103de7121c1756d2715 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c91aa7a96de2f8c208894103d… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Jan 11 00:15:53 2009 +0100 dsound: Remove superfluous pointer casts. --- dlls/dsound/capture.c | 2 +- dlls/dsound/propset.c | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/dsound/capture.c b/dlls/dsound/capture.c index cd051b6..6fefcfa 100644 --- a/dlls/dsound/capture.c +++ b/dlls/dsound/capture.c @@ -801,7 +801,7 @@ IDirectSoundCaptureBufferImpl_QueryInterface( } } - *ppobj = (LPVOID)This->notify; + *ppobj = This->notify; return DS_OK; } diff --git a/dlls/dsound/propset.c b/dlls/dsound/propset.c index 4437222..43caa63 100644 --- a/dlls/dsound/propset.c +++ b/dlls/dsound/propset.c @@ -283,7 +283,7 @@ static HRESULT DSPROPERTY_WaveDeviceMappingA( TRACE("(pPropData=%p,cbPropData=%d,pcbReturned=%p)\n", pPropData,cbPropData,pcbReturned); - ppd = (PDSPROPERTY_DIRECTSOUNDDEVICE_WAVEDEVICEMAPPING_A_DATA) pPropData; + ppd = pPropData; if (!ppd) { WARN("invalid parameter: pPropData\n"); @@ -346,7 +346,7 @@ static HRESULT DSPROPERTY_WaveDeviceMappingW( TRACE("(pPropData=%p,cbPropData=%d,pcbReturned=%p)\n", pPropData,cbPropData,pcbReturned); - ppd = (PDSPROPERTY_DIRECTSOUNDDEVICE_WAVEDEVICEMAPPING_W_DATA) pPropData; + ppd = pPropData; if (!ppd) { WARN("invalid parameter: pPropData\n"); @@ -584,7 +584,7 @@ static HRESULT DSPROPERTY_DescriptionA( ULONG cbPropData, PULONG pcbReturned ) { - PDSPROPERTY_DIRECTSOUNDDEVICE_DESCRIPTION_A_DATA ppd = (PDSPROPERTY_DIRECTSOUNDDEVICE_DESCRIPTION_A_DATA) pPropData; + PDSPROPERTY_DIRECTSOUNDDEVICE_DESCRIPTION_A_DATA ppd = pPropData; HRESULT err; GUID dev_guid; TRACE("(pPropData=%p,cbPropData=%d,pcbReturned=%p)\n", @@ -824,7 +824,7 @@ static HRESULT DSPROPERTY_DescriptionW( ULONG cbPropData, PULONG pcbReturned ) { - PDSPROPERTY_DIRECTSOUNDDEVICE_DESCRIPTION_W_DATA ppd = (PDSPROPERTY_DIRECTSOUNDDEVICE_DESCRIPTION_W_DATA) pPropData; + PDSPROPERTY_DIRECTSOUNDDEVICE_DESCRIPTION_W_DATA ppd = pPropData; HRESULT err; GUID dev_guid; TRACE("pPropData=%p,cbPropData=%d,pcbReturned=%p)\n", @@ -1147,7 +1147,7 @@ static HRESULT DSPROPERTY_EnumerateA( ULONG cbPropData, PULONG pcbReturned ) { - PDSPROPERTY_DIRECTSOUNDDEVICE_ENUMERATE_A_DATA ppd = (PDSPROPERTY_DIRECTSOUNDDEVICE_ENUMERATE_A_DATA) pPropData; + PDSPROPERTY_DIRECTSOUNDDEVICE_ENUMERATE_A_DATA ppd = pPropData; HRESULT err; TRACE("(pPropData=%p,cbPropData=%d,pcbReturned=%p)\n", pPropData,cbPropData,pcbReturned); @@ -1257,7 +1257,7 @@ static HRESULT DSPROPERTY_EnumerateW( ULONG cbPropData, PULONG pcbReturned ) { - PDSPROPERTY_DIRECTSOUNDDEVICE_ENUMERATE_W_DATA ppd = (PDSPROPERTY_DIRECTSOUNDDEVICE_ENUMERATE_W_DATA) pPropData; + PDSPROPERTY_DIRECTSOUNDDEVICE_ENUMERATE_W_DATA ppd = pPropData; HRESULT err; TRACE("(pPropData=%p,cbPropData=%d,pcbReturned=%p)\n", pPropData,cbPropData,pcbReturned);

1 0

Michael Stefaniuc : mpr: Remove superfluous pointer casts.
by Alexandre Julliard Jan. 12, 2009

Jan. 12, 2009

Module: wine Branch: master Commit: f927cfd26b0362cf355bb9ac29bc334479310a7c URL: http://source.winehq.org/git/wine.git/?a=commit;h=f927cfd26b0362cf355bb9ac2… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Jan 11 00:16:11 2009 +0100 mpr: Remove superfluous pointer casts. --- dlls/mpr/wnet.c | 29 +++++++++++++---------------- 1 files changed, 13 insertions(+), 16 deletions(-) diff --git a/dlls/mpr/wnet.c b/dlls/mpr/wnet.c index b2599e1..241ea2f 100644 --- a/dlls/mpr/wnet.c +++ b/dlls/mpr/wnet.c @@ -749,8 +749,7 @@ DWORD WINAPI WNetOpenEnumW( DWORD dwScope, DWORD dwType, DWORD dwUsage, dwScope, dwType, dwUsage, lpNet, &handle); if (ret == WN_SUCCESS) { - *lphEnum = - (HANDLE)_createProviderEnumerator( + *lphEnum = _createProviderEnumerator( dwScope, dwType, dwUsage, index, handle); ret = *lphEnum ? WN_SUCCESS : WN_OUT_OF_MEMORY; @@ -764,7 +763,7 @@ DWORD WINAPI WNetOpenEnumW( DWORD dwScope, DWORD dwType, DWORD dwUsage, } else if (lpNet->lpRemoteName) { - *lphEnum = (HANDLE)_createGlobalEnumeratorW(dwScope, + *lphEnum = _createGlobalEnumeratorW(dwScope, dwType, dwUsage, lpNet); ret = *lphEnum ? WN_SUCCESS : WN_OUT_OF_MEMORY; } @@ -776,13 +775,13 @@ DWORD WINAPI WNetOpenEnumW( DWORD dwScope, DWORD dwType, DWORD dwUsage, /* comment matches the "Entire Network", enumerate * global scope of every provider */ - *lphEnum = (HANDLE)_createGlobalEnumeratorW(dwScope, + *lphEnum = _createGlobalEnumeratorW(dwScope, dwType, dwUsage, lpNet); } else { /* this is the same as not having passed lpNet */ - *lphEnum = (HANDLE)_createGlobalEnumeratorW(dwScope, + *lphEnum = _createGlobalEnumeratorW(dwScope, dwType, dwUsage, NULL); } ret = *lphEnum ? WN_SUCCESS : WN_OUT_OF_MEMORY; @@ -790,19 +789,18 @@ DWORD WINAPI WNetOpenEnumW( DWORD dwScope, DWORD dwType, DWORD dwUsage, } else { - *lphEnum = (HANDLE)_createGlobalEnumeratorW(dwScope, dwType, + *lphEnum = _createGlobalEnumeratorW(dwScope, dwType, dwUsage, lpNet); ret = *lphEnum ? WN_SUCCESS : WN_OUT_OF_MEMORY; } break; case RESOURCE_CONTEXT: - *lphEnum = (HANDLE)_createContextEnumerator(dwScope, dwType, - dwUsage); + *lphEnum = _createContextEnumerator(dwScope, dwType, dwUsage); ret = *lphEnum ? WN_SUCCESS : WN_OUT_OF_MEMORY; break; case RESOURCE_REMEMBERED: case RESOURCE_CONNECTED: - *lphEnum = (HANDLE)_createNullEnumerator(); + *lphEnum = _createNullEnumerator(); ret = *lphEnum ? WN_SUCCESS : WN_OUT_OF_MEMORY; break; default: @@ -856,8 +854,8 @@ DWORD WINAPI WNetEnumResourceA( HANDLE hEnum, LPDWORD lpcCount, * size is the appropriate usage of this function, so * hopefully it won't be an issue. */ - ret = _thunkNetResourceArrayWToA((LPNETRESOURCEW)localBuffer, - &localCount, lpBuffer, lpBufferSize); + ret = _thunkNetResourceArrayWToA(localBuffer, &localCount, + lpBuffer, lpBufferSize); *lpcCount = localCount; } HeapFree(GetProcessHeap(), 0, localBuffer); @@ -926,8 +924,7 @@ static DWORD _enumerateProvidersW(PWNetEnumerator enumerator, LPDWORD lpcCount, } } strNext = (LPWSTR)((LPBYTE)lpBuffer + count * sizeof(NETRESOURCEW)); - for (i = 0, resource = (LPNETRESOURCEW)lpBuffer; i < count; - i++, resource++) + for (i = 0, resource = lpBuffer; i < count; i++, resource++) { resource->dwScope = RESOURCE_GLOBALNET; resource->dwType = RESOURCETYPE_ANY; @@ -1139,7 +1136,7 @@ static DWORD _enumerateContextW(PWNetEnumerator enumerator, LPDWORD lpcCount, } else { - LPNETRESOURCEW lpNet = (LPNETRESOURCEW)lpBuffer; + LPNETRESOURCEW lpNet = lpBuffer; lpNet->dwScope = RESOURCE_GLOBALNET; lpNet->dwType = enumerator->dwType; @@ -1887,7 +1884,7 @@ DWORD WINAPI WNetGetUniversalNameA ( LPCSTR lpLocalPath, DWORD dwInfoLevel, { case UNIVERSAL_NAME_INFO_LEVEL: { - LPUNIVERSAL_NAME_INFOA info = (LPUNIVERSAL_NAME_INFOA)lpBuffer; + LPUNIVERSAL_NAME_INFOA info = lpBuffer; size = sizeof(*info) + lstrlenA(lpLocalPath) + 1; if (*lpBufferSize < size) @@ -1929,7 +1926,7 @@ DWORD WINAPI WNetGetUniversalNameW ( LPCWSTR lpLocalPath, DWORD dwInfoLevel, { case UNIVERSAL_NAME_INFO_LEVEL: { - LPUNIVERSAL_NAME_INFOW info = (LPUNIVERSAL_NAME_INFOW)lpBuffer; + LPUNIVERSAL_NAME_INFOW info = lpBuffer; size = sizeof(*info) + (lstrlenW(lpLocalPath) + 1) * sizeof(WCHAR); if (*lpBufferSize < size)

1 0

Anders Jonsson : winebrowser: Fix typo.
by Alexandre Julliard Jan. 12, 2009

Jan. 12, 2009

Module: wine Branch: master Commit: ec479ebdb672d55485225ad3eb12f8503ef7e94b URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec479ebdb672d55485225ad3e… Author: Anders Jonsson <anders.jonsson(a)norsjonet.se> Date: Sat Jan 10 23:12:20 2009 +0100 winebrowser: Fix typo. --- programs/winebrowser/main.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/winebrowser/main.c b/programs/winebrowser/main.c index 9e56cf5..d551c20 100644 --- a/programs/winebrowser/main.c +++ b/programs/winebrowser/main.c @@ -296,7 +296,7 @@ static WCHAR *get_url_from_dde(void) WCHAR *endquote = strchrW(ddeString + 1, '"'); if (!endquote) { - WINE_ERR("Unabled to retrieve URL from string %s\n", wine_dbgstr_w(ddeString)); + WINE_ERR("Unable to retrieve URL from string %s\n", wine_dbgstr_w(ddeString)); goto done; } *endquote = 0;

1 0

Michael Stefaniuc : crypt32/tests: Remove some superfluous pointer casts.
by Alexandre Julliard Jan. 12, 2009

Jan. 12, 2009

Module: wine Branch: master Commit: e1797a73675db1e5ebec0aa5f5d1feee599ba502 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e1797a73675db1e5ebec0aa5f… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Jan 11 00:15:27 2009 +0100 crypt32/tests: Remove some superfluous pointer casts. There is no need to cast the pointers passed to the penultimate argument of the CryptDecodeObjectEx and CryptEncodeObjectEx functions as those expect void pointers. --- dlls/crypt32/tests/cert.c | 2 +- dlls/crypt32/tests/encode.c | 578 +++++++++++++++++++++---------------------- 2 files changed, 281 insertions(+), 299 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e1797a73675db1e5ebec0…

1 0

Stefan Dösinger : wined3d: Move fogdensity and fogcolor to the fragment pipeline.
by Alexandre Julliard Jan. 12, 2009

Jan. 12, 2009

Module: wine Branch: master Commit: 2dd18635c923f2af92d4c43c393438144cc6763f URL: http://source.winehq.org/git/wine.git/?a=commit;h=2dd18635c923f2af92d4c43c3… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun Dec 14 17:16:36 2008 +0100 wined3d: Move fogdensity and fogcolor to the fragment pipeline. --- dlls/wined3d/arb_program_shader.c | 2 ++ dlls/wined3d/ati_fragment_shader.c | 2 ++ dlls/wined3d/nvidia_texture_shader.c | 2 ++ dlls/wined3d/state.c | 8 ++++---- dlls/wined3d/wined3d_private.h | 2 ++ 5 files changed, 12 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 902c9d3..270a912 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -3191,6 +3191,8 @@ static const struct StateEntryTemplate arbfp_fragmentstate_template[] = { { STATE_RENDER(WINED3DRS_FOGTABLEMODE), { STATE_RENDER(WINED3DRS_FOGENABLE), state_arbfp_fog }, 0 }, { STATE_RENDER(WINED3DRS_FOGVERTEXMODE), { STATE_RENDER(WINED3DRS_FOGENABLE), state_arbfp_fog }, 0 }, { STATE_RENDER(WINED3DRS_SRGBWRITEENABLE), { STATE_PIXELSHADER, fragment_prog_arbfp }, 0 }, + { STATE_RENDER(WINED3DRS_FOGCOLOR), { STATE_RENDER(WINED3DRS_FOGCOLOR), state_fogcolor }, 0 }, + { STATE_RENDER(WINED3DRS_FOGDENSITY), { STATE_RENDER(WINED3DRS_FOGDENSITY), state_fogdensity }, 0 }, {STATE_TEXTURESTAGE(0,WINED3DTSS_TEXTURETRANSFORMFLAGS),{STATE_TEXTURESTAGE(0, WINED3DTSS_TEXTURETRANSFORMFLAGS), textransform }, 0 }, {STATE_TEXTURESTAGE(1,WINED3DTSS_TEXTURETRANSFORMFLAGS),{STATE_TEXTURESTAGE(1, WINED3DTSS_TEXTURETRANSFORMFLAGS), textransform }, 0 }, {STATE_TEXTURESTAGE(2,WINED3DTSS_TEXTURETRANSFORMFLAGS),{STATE_TEXTURESTAGE(2, WINED3DTSS_TEXTURETRANSFORMFLAGS), textransform }, 0 }, diff --git a/dlls/wined3d/ati_fragment_shader.c b/dlls/wined3d/ati_fragment_shader.c index 8b20f9b..7152a85 100644 --- a/dlls/wined3d/ati_fragment_shader.c +++ b/dlls/wined3d/ati_fragment_shader.c @@ -909,6 +909,8 @@ static void atifs_apply_pixelshader(DWORD state, IWineD3DStateBlockImpl *statebl static const struct StateEntryTemplate atifs_fragmentstate_template[] = { {STATE_RENDER(WINED3DRS_TEXTUREFACTOR), { STATE_RENDER(WINED3DRS_TEXTUREFACTOR), state_texfactor_atifs }, 0 }, + { STATE_RENDER(WINED3DRS_FOGCOLOR), { STATE_RENDER(WINED3DRS_FOGCOLOR), state_fogcolor }, 0 }, + { STATE_RENDER(WINED3DRS_FOGDENSITY), { STATE_RENDER(WINED3DRS_FOGDENSITY), state_fogdensity }, 0 }, {STATE_TEXTURESTAGE(0, WINED3DTSS_COLOROP), { STATE_TEXTURESTAGE(0, WINED3DTSS_COLOROP), set_tex_op_atifs }, 0 }, {STATE_TEXTURESTAGE(0, WINED3DTSS_COLORARG1), { STATE_TEXTURESTAGE(0, WINED3DTSS_COLOROP), set_tex_op_atifs }, 0 }, {STATE_TEXTURESTAGE(0, WINED3DTSS_COLORARG2), { STATE_TEXTURESTAGE(0, WINED3DTSS_COLOROP), set_tex_op_atifs }, 0 }, diff --git a/dlls/wined3d/nvidia_texture_shader.c b/dlls/wined3d/nvidia_texture_shader.c index 1da6a0c..bd7fc9d 100644 --- a/dlls/wined3d/nvidia_texture_shader.c +++ b/dlls/wined3d/nvidia_texture_shader.c @@ -792,6 +792,8 @@ static const struct StateEntryTemplate nvrc_fragmentstate_template[] = { { STATE_PIXELSHADER, { STATE_PIXELSHADER, apply_pixelshader }, 0 }, { STATE_RENDER(WINED3DRS_SRGBWRITEENABLE), { STATE_PIXELSHADER, apply_pixelshader }, 0 }, { STATE_RENDER(WINED3DRS_TEXTUREFACTOR), { STATE_RENDER(WINED3DRS_TEXTUREFACTOR), nvrc_texfactor }, 0 }, + { STATE_RENDER(WINED3DRS_FOGCOLOR), { STATE_RENDER(WINED3DRS_FOGCOLOR), state_fogcolor }, 0 }, + { STATE_RENDER(WINED3DRS_FOGDENSITY), { STATE_RENDER(WINED3DRS_FOGDENSITY), state_fogdensity }, 0 }, { STATE_SAMPLER(0), { STATE_SAMPLER(0), nvts_texdim }, NV_TEXTURE_SHADER2 }, { STATE_SAMPLER(0), { STATE_SAMPLER(0), sampler_texdim }, 0 }, { STATE_SAMPLER(1), { STATE_SAMPLER(1), nvts_texdim }, NV_TEXTURE_SHADER2 }, diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index d05ed21..60ab923 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -1117,14 +1117,14 @@ static void state_rangefog(DWORD state, IWineD3DStateBlockImpl *stateblock, Wine } } -static void state_fogcolor(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DContext *context) { +void state_fogcolor(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DContext *context) { float col[4]; D3DCOLORTOGLFLOAT4(stateblock->renderState[WINED3DRS_FOGCOLOR], col); glFogfv(GL_FOG_COLOR, &col[0]); checkGLcall("glFog GL_FOG_COLOR"); } -static void state_fogdensity(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DContext *context) { +void state_fogdensity(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DContext *context) { union { DWORD d; float f; @@ -5180,8 +5180,6 @@ const struct StateEntryTemplate ffp_vertexstate_template[] = { { STATE_RENDER(WINED3DRS_FOGSTART), { STATE_RENDER(WINED3DRS_FOGENABLE), state_fog }, 0 }, { STATE_RENDER(WINED3DRS_FOGEND), { STATE_RENDER(WINED3DRS_FOGENABLE), state_fog }, 0 }, { STATE_RENDER(WINED3DRS_FOGVERTEXMODE), { STATE_RENDER(WINED3DRS_FOGENABLE), state_fog }, 0 }, - { STATE_RENDER(WINED3DRS_FOGCOLOR), { STATE_RENDER(WINED3DRS_FOGCOLOR), state_fogcolor }, 0 }, - { STATE_RENDER(WINED3DRS_FOGDENSITY), { STATE_RENDER(WINED3DRS_FOGDENSITY), state_fogdensity }, 0 }, { STATE_RENDER(WINED3DRS_RANGEFOGENABLE), { STATE_RENDER(WINED3DRS_RANGEFOGENABLE), state_rangefog }, NV_FOG_DISTANCE }, { STATE_RENDER(WINED3DRS_RANGEFOGENABLE), { STATE_RENDER(WINED3DRS_RANGEFOGENABLE), state_rangefog_w }, 0 }, { STATE_RENDER(WINED3DRS_CLIPPING), { STATE_RENDER(WINED3DRS_CLIPPING), state_clipping }, 0 }, @@ -5328,6 +5326,8 @@ static const struct StateEntryTemplate ffp_fragmentstate_template[] = { { STATE_RENDER(WINED3DRS_SRGBWRITEENABLE), { STATE_PIXELSHADER, apply_pixelshader }, 0 }, { STATE_RENDER(WINED3DRS_BORDERCOLOR), { STATE_RENDER(WINED3DRS_BORDERCOLOR), state_bordercolor }, 0 }, { STATE_RENDER(WINED3DRS_TEXTUREFACTOR), { STATE_RENDER(WINED3DRS_TEXTUREFACTOR), state_texfactor }, 0 }, + { STATE_RENDER(WINED3DRS_FOGCOLOR), { STATE_RENDER(WINED3DRS_FOGCOLOR), state_fogcolor }, 0 }, + { STATE_RENDER(WINED3DRS_FOGDENSITY), { STATE_RENDER(WINED3DRS_FOGDENSITY), state_fogdensity }, 0 }, { STATE_SAMPLER(0), { STATE_SAMPLER(0), sampler_texdim }, 0 }, { STATE_SAMPLER(1), { STATE_SAMPLER(1), sampler_texdim }, 0 }, { STATE_SAMPLER(2), { STATE_SAMPLER(2), sampler_texdim }, 0 }, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 11b8680..887deaf 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2021,6 +2021,8 @@ void texture_activate_dimensions(DWORD stage, IWineD3DStateBlockImpl *stateblock void sampler_texdim(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DContext *context); void tex_alphaop(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DContext *context); void apply_pixelshader(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DContext *context); +void state_fogcolor(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DContext *context); +void state_fogdensity(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DContext *context); void surface_force_reload(IWineD3DSurface *iface); GLenum surface_get_gl_buffer(IWineD3DSurface *iface, IWineD3DSwapChain *swapchain);

1 0

Stefan Dösinger : wined3d: Split the remains of state_fog.
by Alexandre Julliard Jan. 12, 2009

Jan. 12, 2009

Module: wine Branch: master Commit: 1deafcb5a758ba7c88e498718a3186d6b526fe71 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1deafcb5a758ba7c88e498718… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Dec 15 19:37:36 2008 +0100 wined3d: Split the remains of state_fog. --- dlls/wined3d/arb_program_shader.c | 29 +++++ dlls/wined3d/ati_fragment_shader.c | 9 +- dlls/wined3d/nvidia_texture_shader.c | 5 + dlls/wined3d/state.c | 200 +++++++++++++++++++--------------- dlls/wined3d/wined3d_private.h | 9 ++ 5 files changed, 161 insertions(+), 91 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1deafcb5a758ba7c88e49…

1 0

Stefan Dösinger : wined3d: Avoid hooking non-fog glEnable/glDisable calls.
by Alexandre Julliard Jan. 12, 2009

Jan. 12, 2009

Module: wine Branch: master Commit: 365e1f3b075a044328784d12a3a992dc493e8d71 URL: http://source.winehq.org/git/wine.git/?a=commit;h=365e1f3b075a044328784d12a… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Dec 15 19:38:48 2008 +0100 wined3d: Avoid hooking non-fog glEnable/glDisable calls. This prevents fallout from the GL_EXT_fog_coord emulation. glEnable and glDisable calls other than those that change GL_FOG are not hooked. The glEnableWINE and glDisableWINE functions can be used to add other hooks too if ever needed. --- dlls/wined3d/context.c | 2 +- dlls/wined3d/directx.c | 3 +++ dlls/wined3d/gl_compat.c | 8 ++++---- dlls/wined3d/state.c | 4 ++-- dlls/wined3d/wined3d_gl.h | 2 ++ 5 files changed, 12 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index c0d65ba..da3053a 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1142,7 +1142,7 @@ static inline void SetupForBlit(IWineD3DDeviceImpl *This, WineD3DContext *contex glDisable(GL_DEPTH_TEST); checkGLcall("glDisable GL_DEPTH_TEST"); Context_MarkStateDirty(context, STATE_RENDER(WINED3DRS_ZENABLE), StateTable); - glDisable(GL_FOG); + glDisableWINE(GL_FOG); checkGLcall("glDisable GL_FOG"); Context_MarkStateDirty(context, STATE_RENDER(WINED3DRS_FOGENABLE), StateTable); glDisable(GL_BLEND); diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index b9a63ab..940bb6d 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -4215,6 +4215,9 @@ BOOL InitAdapters(void) { glFlush = (void*)pwglGetProcAddress("wglFlush"); #endif + glEnableWINE = glEnable; + glDisableWINE = glDisable; + /* For now only one default adapter */ { int iPixelFormat; diff --git a/dlls/wined3d/gl_compat.c b/dlls/wined3d/gl_compat.c index 466b003..1fc48cc 100644 --- a/dlls/wined3d/gl_compat.c +++ b/dlls/wined3d/gl_compat.c @@ -439,14 +439,14 @@ void add_gl_compat_wrappers(WineD3D_GL_Info *gl_info) { if(old_fogcoord_glEnable) { FIXME("GL_EXT_fogcoord glEnable hook already applied\n"); } else { - old_fogcoord_glEnable = glEnable; - glEnable = wine_glEnable; + old_fogcoord_glEnable = glEnableWINE; + glEnableWINE = wine_glEnable; } if(old_fogcoord_glDisable) { FIXME("GL_EXT_fogcoord glDisable hook already applied\n"); } else { - old_fogcoord_glDisable = glDisable; - glDisable = wine_glDisable; + old_fogcoord_glDisable = glDisableWINE; + glDisableWINE = wine_glDisable; } if(old_fogcoord_glVertex4f) { diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index ae9bad4..0c84a50 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -983,7 +983,7 @@ void state_fog_fragpart(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3D if (!stateblock->renderState[WINED3DRS_FOGENABLE]) { /* No fog? Disable it, and we're done :-) */ - glDisable(GL_FOG); + glDisableWINE(GL_FOG); checkGLcall("glDisable GL_FOG"); return; } @@ -1112,7 +1112,7 @@ void state_fog_fragpart(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3D } } - glEnable(GL_FOG); + glEnableWINE(GL_FOG); checkGLcall("glEnable GL_FOG"); if(new_source != context->fog_source) { context->fog_source = new_source; diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index 09080a4..07ca0d5 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -866,6 +866,7 @@ void (WINE_GLAPI *glDepthFunc) (GLenum func); void (WINE_GLAPI *glDepthMask) (GLboolean flag); void (WINE_GLAPI *glDepthRange) (GLclampd nearParam, GLclampd farParam); void (WINE_GLAPI *glDisable) (GLenum cap); +void (WINE_GLAPI *glDisableWINE) (GLenum cap); void (WINE_GLAPI *glDisableClientState) (GLenum array); void (WINE_GLAPI *glDrawArrays) (GLenum mode, GLint first, GLsizei count); void (WINE_GLAPI *glDrawBuffer) (GLenum mode); @@ -875,6 +876,7 @@ void (WINE_GLAPI *glEdgeFlag) (GLboolean flag); void (WINE_GLAPI *glEdgeFlagPointer) (GLsizei stride, const GLvoid* pointer); void (WINE_GLAPI *glEdgeFlagv) (const GLboolean* flag); void (WINE_GLAPI *glEnable) (GLenum cap); +void (WINE_GLAPI *glEnableWINE) (GLenum cap); void (WINE_GLAPI *glEnableClientState) (GLenum array); void (WINE_GLAPI *glEnd) (); void (WINE_GLAPI *glEndList) ();

1 0

Stefan Dösinger : wined3d: Remove the apply_pshader_fog state handler.
by Alexandre Julliard Jan. 12, 2009

Jan. 12, 2009

Module: wine Branch: master Commit: 061087811f14c708dcba87925bc2fbd2b4302afb URL: http://source.winehq.org/git/wine.git/?a=commit;h=061087811f14c708dcba87925… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun Dec 14 17:51:32 2008 +0100 wined3d: Remove the apply_pshader_fog state handler. The fog doesn't depend on pixel shaders any longer(but still vice versa), so we don't need this state any more. --- dlls/wined3d/state.c | 17 ----------------- 1 files changed, 0 insertions(+), 17 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 60ab923..650141d 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -3370,21 +3370,6 @@ static void sampler(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DCont } } -static void apply_pshader_fog(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DContext *context) { - if (use_ps(stateblock)) - { - if(!context->last_was_pshader) { - state_fog(state, stateblock, context); - } - context->last_was_pshader = TRUE; - } else { - if(context->last_was_pshader) { - state_fog(state, stateblock, context); - } - context->last_was_pshader = FALSE; - } -} - void apply_pixelshader(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DContext *context) { IWineD3DDeviceImpl *device = stateblock->wineD3DDevice; BOOL use_pshader = use_ps(stateblock); @@ -5208,8 +5193,6 @@ const struct StateEntryTemplate ffp_vertexstate_template[] = { { STATE_RENDER(WINED3DRS_POINTSIZE_MAX), { STATE_RENDER(WINED3DRS_POINTSIZE_MIN), state_psizemin_arb }, ARB_POINT_PARAMETERS }, { STATE_RENDER(WINED3DRS_POINTSIZE_MAX), { STATE_RENDER(WINED3DRS_POINTSIZE_MIN), state_psizemin_ext }, EXT_POINT_PARAMETERS }, { STATE_RENDER(WINED3DRS_POINTSIZE_MAX), { STATE_RENDER(WINED3DRS_POINTSIZE_MIN), state_psizemin_w }, 0 }, - /* pixel shaders need a different fog input */ - { STATE_PIXELSHADER, { STATE_PIXELSHADER, apply_pshader_fog }, 0 }, /* Samplers for NP2 texture matrix adjustions. They are not needed if GL_ARB_texture_non_power_of_two is supported, * so register a NULL state handler in that case to get the vertex part of sampler() skipped(VTF is handled in the misc states. * otherwise, register sampler_texmatrix, which takes care of updating the texture matrix

1 0