November 2007 - Wine-Commits

Rob Shearman : rpcrt4: Fix an integer overflow in NdrConformantStructMarshall and NdrConformantStructUnmarshall .
by Alexandre Julliard Nov. 29, 2007

Nov. 29, 2007

Module: wine Branch: master Commit: 8668369b4f27dba9011493d8e8d40e4851743394 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8668369b4f27dba9011493d8e… Author: Rob Shearman <rob(a)codeweavers.com> Date: Wed Nov 28 15:02:39 2007 +0000 rpcrt4: Fix an integer overflow in NdrConformantStructMarshall and NdrConformantStructUnmarshall. --- dlls/rpcrt4/ndr_marshall.c | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/dlls/rpcrt4/ndr_marshall.c b/dlls/rpcrt4/ndr_marshall.c index cbb766d..35028b4 100644 --- a/dlls/rpcrt4/ndr_marshall.c +++ b/dlls/rpcrt4/ndr_marshall.c @@ -3399,6 +3399,12 @@ unsigned char * WINAPI NdrConformantStructMarshall(PMIDL_STUB_MESSAGE pStubMsg, TRACE("memory_size = %d\n", pCStructFormat->memory_size); bufsize = safe_multiply(esize, pStubMsg->MaxCount); + if (pCStructFormat->memory_size + bufsize < pCStructFormat->memory_size) /* integer overflow */ + { + ERR("integer overflow of memory_size %u with bufsize %u\n", + pCStructFormat->memory_size, bufsize); + RpcRaiseException(RPC_X_BAD_STUB_DATA); + } /* copy constant sized part of struct */ pStubMsg->BufferMark = pStubMsg->Buffer; safe_copy_to_buffer(pStubMsg, pMemory, pCStructFormat->memory_size + bufsize); @@ -3447,6 +3453,12 @@ unsigned char * WINAPI NdrConformantStructUnmarshall(PMIDL_STUB_MESSAGE pStubMs TRACE("memory_size = %d\n", pCStructFormat->memory_size); bufsize = safe_multiply(esize, pStubMsg->MaxCount); + if (pCStructFormat->memory_size + bufsize < pCStructFormat->memory_size) /* integer overflow */ + { + ERR("integer overflow of memory_size %u with bufsize %u\n", + pCStructFormat->memory_size, bufsize); + RpcRaiseException(RPC_X_BAD_STUB_DATA); + } /* work out how much memory to allocate if we need to do so */ if (!*ppMemory || fMustAlloc) {

1 0

Rob Shearman : rpcrt4: Check there is enough space in the buffer and that the size doesn' t cause an overflow when copying data to it.
by Alexandre Julliard Nov. 29, 2007

Nov. 29, 2007

Module: wine Branch: master Commit: 5a3c34eb89bb349a74209741a717cb91fb9a3150 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5a3c34eb89bb349a74209741a… Author: Rob Shearman <rob(a)codeweavers.com> Date: Wed Nov 28 15:02:06 2007 +0000 rpcrt4: Check there is enough space in the buffer and that the size doesn't cause an overflow when copying data to it. --- dlls/rpcrt4/ndr_marshall.c | 96 +++++++++++++++++-------------------------- 1 files changed, 38 insertions(+), 58 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5a3c34eb89bb349a74209…

1 0

Rob Shearman : rpcrt4: Check for integer overflows when increasing the buffer length.
by Alexandre Julliard Nov. 29, 2007

Nov. 29, 2007

Module: wine Branch: master Commit: d0223ecc0eab2e7cd00ea834a764f2885a5efa8f URL: http://source.winehq.org/git/wine.git/?a=commit;h=d0223ecc0eab2e7cd00ea834a… Author: Rob Shearman <rob(a)codeweavers.com> Date: Wed Nov 28 15:01:53 2007 +0000 rpcrt4: Check for integer overflows when increasing the buffer length. Rename safe_buffer_copy to safe_copy_from_buffer. --- dlls/rpcrt4/ndr_marshall.c | 97 ++++++++++++++++++++++++------------------- 1 files changed, 54 insertions(+), 43 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d0223ecc0eab2e7cd00ea…

1 0

Rob Shearman : rpcrt4: Fix some more potential buffer overflows.
by Alexandre Julliard Nov. 29, 2007

Nov. 29, 2007

Module: wine Branch: master Commit: 074898ba2b31ce103bac6dc12d46a14a27f97d38 URL: http://source.winehq.org/git/wine.git/?a=commit;h=074898ba2b31ce103bac6dc12… Author: Rob Shearman <rob(a)codeweavers.com> Date: Wed Nov 28 15:02:21 2007 +0000 rpcrt4: Fix some more potential buffer overflows. --- dlls/rpcrt4/ndr_marshall.c | 110 +++++++++++++++++++++++++++++++------------- 1 files changed, 78 insertions(+), 32 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=074898ba2b31ce103bac6…

1 0

Lionel Debroux : msvcrt: Test more offsets for _aligned_offset_realloc ( especially offset > alignment).
by Alexandre Julliard Nov. 28, 2007

Nov. 28, 2007

Module: wine Branch: master Commit: 51d6a08d57931dc0cd122b655fe1fe400488e0aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=51d6a08d57931dc0cd122b655… Author: Lionel Debroux <lionel_debroux(a)yahoo.fr> Date: Sun Nov 25 09:56:22 2007 +0100 msvcrt: Test more offsets for _aligned_offset_realloc (especially offset > alignment). --- dlls/msvcrt/tests/heap.c | 78 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 78 insertions(+), 0 deletions(-) diff --git a/dlls/msvcrt/tests/heap.c b/dlls/msvcrt/tests/heap.c index 2cd4fb2..ae98e3b 100644 --- a/dlls/msvcrt/tests/heap.c +++ b/dlls/msvcrt/tests/heap.c @@ -334,6 +334,84 @@ static void test_aligned(void) test_aligned_offset_realloc(256, 128, 32, 4); test_aligned_offset_realloc(256, 512, 64, 4); test_aligned_offset_realloc(256, 128, 64, 4); + + test_aligned_offset_realloc(256, 512, 0, 8); + test_aligned_offset_realloc(256, 128, 0, 8); + test_aligned_offset_realloc(256, 512, 4, 8); + test_aligned_offset_realloc(256, 128, 4, 8); + test_aligned_offset_realloc(256, 512, 8, 8); + test_aligned_offset_realloc(256, 128, 8, 8); + test_aligned_offset_realloc(256, 512, 16, 8); + test_aligned_offset_realloc(256, 128, 16, 8); + test_aligned_offset_realloc(256, 512, 32, 8); + test_aligned_offset_realloc(256, 128, 32, 8); + test_aligned_offset_realloc(256, 512, 64, 8); + test_aligned_offset_realloc(256, 128, 64, 8); + + test_aligned_offset_realloc(256, 512, 0, 16); + test_aligned_offset_realloc(256, 128, 0, 16); + test_aligned_offset_realloc(256, 512, 4, 16); + test_aligned_offset_realloc(256, 128, 4, 16); + test_aligned_offset_realloc(256, 512, 8, 16); + test_aligned_offset_realloc(256, 128, 8, 16); + test_aligned_offset_realloc(256, 512, 16, 16); + test_aligned_offset_realloc(256, 128, 16, 16); + test_aligned_offset_realloc(256, 512, 32, 16); + test_aligned_offset_realloc(256, 128, 32, 16); + test_aligned_offset_realloc(256, 512, 64, 16); + test_aligned_offset_realloc(256, 128, 64, 16); + + test_aligned_offset_realloc(256, 512, 0, 32); + test_aligned_offset_realloc(256, 128, 0, 32); + test_aligned_offset_realloc(256, 512, 4, 32); + test_aligned_offset_realloc(256, 128, 4, 32); + test_aligned_offset_realloc(256, 512, 8, 32); + test_aligned_offset_realloc(256, 128, 8, 32); + test_aligned_offset_realloc(256, 512, 16, 32); + test_aligned_offset_realloc(256, 128, 16, 32); + test_aligned_offset_realloc(256, 512, 32, 32); + test_aligned_offset_realloc(256, 128, 32, 32); + test_aligned_offset_realloc(256, 512, 64, 32); + test_aligned_offset_realloc(256, 128, 64, 32); + + test_aligned_offset_realloc(256, 512, 0, 64); + test_aligned_offset_realloc(256, 128, 0, 64); + test_aligned_offset_realloc(256, 512, 4, 64); + test_aligned_offset_realloc(256, 128, 4, 64); + test_aligned_offset_realloc(256, 512, 8, 64); + test_aligned_offset_realloc(256, 128, 8, 64); + test_aligned_offset_realloc(256, 512, 16, 64); + test_aligned_offset_realloc(256, 128, 16, 64); + test_aligned_offset_realloc(256, 512, 32, 64); + test_aligned_offset_realloc(256, 128, 32, 64); + test_aligned_offset_realloc(256, 512, 64, 64); + test_aligned_offset_realloc(256, 128, 64, 64); + + test_aligned_offset_realloc(256, 512, 0, 96); + test_aligned_offset_realloc(256, 128, 0, 96); + test_aligned_offset_realloc(256, 512, 4, 96); + test_aligned_offset_realloc(256, 128, 4, 96); + test_aligned_offset_realloc(256, 512, 8, 96); + test_aligned_offset_realloc(256, 128, 8, 96); + test_aligned_offset_realloc(256, 512, 16, 96); + test_aligned_offset_realloc(256, 128, 16, 96); + test_aligned_offset_realloc(256, 512, 32, 96); + test_aligned_offset_realloc(256, 128, 32, 96); + test_aligned_offset_realloc(256, 512, 64, 96); + test_aligned_offset_realloc(256, 128, 64, 96); + + test_aligned_offset_realloc(256, 512, 0, 112); + test_aligned_offset_realloc(256, 128, 0, 112); + test_aligned_offset_realloc(256, 512, 4, 112); + test_aligned_offset_realloc(256, 128, 4, 112); + test_aligned_offset_realloc(256, 512, 8, 112); + test_aligned_offset_realloc(256, 128, 8, 112); + test_aligned_offset_realloc(256, 512, 16, 112); + test_aligned_offset_realloc(256, 128, 16, 112); + test_aligned_offset_realloc(256, 512, 32, 112); + test_aligned_offset_realloc(256, 128, 32, 112); + test_aligned_offset_realloc(256, 512, 64, 112); + test_aligned_offset_realloc(256, 128, 64, 112); } START_TEST(heap)

1 0

Lionel Debroux : msvcrt: Fix _Aligned_offset_realloc ( move correct block of memory); add a comment to explain why.
by Alexandre Julliard Nov. 28, 2007

Nov. 28, 2007

Module: wine Branch: master Commit: 3e9fbd89d2084a81c9009e60a942b88db90f2a45 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3e9fbd89d2084a81c9009e60a… Author: Lionel Debroux <lionel_debroux(a)yahoo.fr> Date: Wed Nov 28 11:47:18 2007 +0100 msvcrt: Fix _Aligned_offset_realloc (move correct block of memory); add a comment to explain why. --- dlls/msvcrt/heap.c | 56 ++++++++++++++++++++++++++++++++++++++++++++++----- 1 files changed, 50 insertions(+), 6 deletions(-) diff --git a/dlls/msvcrt/heap.c b/dlls/msvcrt/heap.c index 78739d5..06c9d56 100644 --- a/dlls/msvcrt/heap.c +++ b/dlls/msvcrt/heap.c @@ -396,7 +396,7 @@ void * CDECL _aligned_offset_realloc(void *memblock, MSVCRT_size_t size, MSVCRT_size_t alignment, MSVCRT_size_t offset) { void * temp, **saved; - MSVCRT_size_t old_padding, new_padding; + MSVCRT_size_t old_padding, new_padding, old_size; TRACE("(%p, %u, %u, %u)\n", memblock, size, alignment, offset); if (!memblock) @@ -434,7 +434,22 @@ void * CDECL _aligned_offset_realloc(void *memblock, MSVCRT_size_t size, return NULL; } - old_padding = (char *)*saved - (char *)memblock; + old_padding = (char *)memblock - (char *)*saved; + + /* Get previous size of block */ + old_size = _msize(*saved); + if (old_size == -1) + { + /* It seems this function was called with an invalid pointer. Bail out. */ + return NULL; + } + /* Adjust old_size to get amount of actual data in old block. */ + old_size -= old_padding; + if (old_size < 0) + { + /* Shouldn't happen. Something's weird, so bail out. */ + return NULL; + } temp = MSVCRT_realloc(*saved, size + alignment + sizeof(void *)); @@ -448,11 +463,40 @@ void * CDECL _aligned_offset_realloc(void *memblock, MSVCRT_size_t size, /* so it can be found later to free. */ saved = SAVED_PTR(memblock); - /* a new start address may require different padding to get the */ - /* proper alignment */ - new_padding = (char *)temp - (char *)memblock; + new_padding = (char *)memblock - (char *)temp; + +/* + Memory layout of old block is as follows: + +-------+---------------------+-+--------------------------+-----------+ + | ... | "old_padding" bytes | | ... "old_size" bytes ... | ... | + +-------+---------------------+-+--------------------------+-----------+ + ^ ^ ^ + | | | + *saved saved memblock + + Memory layout of new block is as follows: + +-------+-----------------------------+-+----------------------+-------+ + | ... | "new_padding" bytes | | ... "size" bytes ... | ... | + +-------+-----------------------------+-+----------------------+-------+ + ^ ^ ^ + | | | + temp saved memblock + + However, in the new block, actual data is still written as follows + (because it was copied by MSVCRT_realloc): + +-------+---------------------+--------------------------------+-------+ + | ... | "old_padding" bytes | ... "old_size" bytes ... | ... | + +-------+---------------------+--------------------------------+-------+ + ^ ^ ^ + | | | + temp saved memblock + + Therefore, min(old_size,size) bytes of actual data have to be moved + from the offset they were at in the old block (temp + old_padding), + to the offset they have to be in the new block (temp + new_padding == memblock). +*/ if (new_padding != old_padding) - memmove((char *)memblock + old_padding, (char *)memblock + new_padding, size); + memmove((char *)memblock, (char *)temp + old_padding, (old_size < size) ? old_size : size); *saved = temp;

1 0

Divan Burger : user32, wine.inf: Enable title bar gradients and match colours with win2k.
by Alexandre Julliard Nov. 28, 2007

Nov. 28, 2007

Module: wine Branch: master Commit: 1aff3528cf0a7760758274766c1d4021b7ffa0c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1aff3528cf0a7760758274766… Author: Divan Burger <divan.burger(a)gmail.com> Date: Thu Nov 22 07:13:08 2007 +0200 user32, wine.inf: Enable title bar gradients and match colours with win2k. --- dlls/user32/sysparams.c | 8 ++++---- tools/wine.inf | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index d5acd0b..dba5dd6 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -88,8 +88,8 @@ enum spi_index static const char * const DefSysColors[] = { "Scrollbar", "212 208 200", /* COLOR_SCROLLBAR */ - "Background", "58 110 165", /* COLOR_BACKGROUND */ - "ActiveTitle", "0 0 128", /* COLOR_ACTIVECAPTION */ + "Background", "58 110 165", /* COLOR_BACKGROUND */ + "ActiveTitle", "10 36 106", /* COLOR_ACTIVECAPTION */ "InactiveTitle", "128 128 128", /* COLOR_INACTIVECAPTION */ "Menu", "212 208 200", /* COLOR_MENU */ "Window", "255 255 255", /* COLOR_WINDOW */ @@ -114,8 +114,8 @@ static const char * const DefSysColors[] = "InfoWindow", "255 255 225", /* COLOR_INFOBK */ "ButtonAlternateFace", "180 180 180", /* COLOR_ALTERNATEBTNFACE */ "HotTrackingColor", "0 0 255", /* COLOR_HOTLIGHT */ - "GradientActiveTitle", "16 132 208", /* COLOR_GRADIENTACTIVECAPTION */ - "GradientInactiveTitle", "181 181 181", /* COLOR_GRADIENTINACTIVECAPTION */ + "GradientActiveTitle", "166 202 240", /* COLOR_GRADIENTACTIVECAPTION */ + "GradientInactiveTitle", "192 192 192", /* COLOR_GRADIENTINACTIVECAPTION */ "MenuHilight", "0 0 0", /* COLOR_MENUHILIGHT */ "MenuBar", "212 208 200" /* COLOR_MENUBAR */ }; diff --git a/tools/wine.inf b/tools/wine.inf index e4afa30..d4b2bed 100644 --- a/tools/wine.inf +++ b/tools/wine.inf @@ -206,7 +206,7 @@ HKCU,Software\Wine\Debug,"RelayFromExclude",2,"winex11.drv;user32;gdi32;advapi32 HKCU,%Desktop%,"FontSmoothing",2,"0" HKCU,%Desktop%,"DragFullWindows",2,"0" HKCU,%Desktop%,"SmoothScroll",3,00,00,00,00 -HKCU,%Desktop%,"UserPreferencemask",3,00,00,00,00 +HKCU,%Desktop%,"UserPreferencemask",3,10,00,00,00 HKCU,%Desktop%,"LowPowerActive",,"0" [Metrics]

1 0

Alistair Leslie-Hughes : urlmon: The callback parameter can be null, check pointer before using.
by Alexandre Julliard Nov. 28, 2007

Nov. 28, 2007

Module: wine Branch: master Commit: 9c6fca1ff7c364bb8293b09b507d2e7330891454 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c6fca1ff7c364bb8293b09b5… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Nov 28 22:20:14 2007 +1100 urlmon: The callback parameter can be null, check pointer before using. --- dlls/urlmon/umstream.c | 48 ++++++++++++++++++++++++++++++++++++++++-------- 1 files changed, 40 insertions(+), 8 deletions(-) diff --git a/dlls/urlmon/umstream.c b/dlls/urlmon/umstream.c index ac5c94e..eeb1570 100644 --- a/dlls/urlmon/umstream.c +++ b/dlls/urlmon/umstream.c @@ -410,54 +410,86 @@ static HRESULT WINAPI ProxyBindStatusCallback_OnStartBinding(IBindStatusCallback IBinding *pib) { ProxyBindStatusCallback *This = (ProxyBindStatusCallback *)iface; - return IBindStatusCallback_OnStartBinding(This->pBSC, dwReserved, pib); + + if(This->pBSC) + return IBindStatusCallback_OnStartBinding(This->pBSC, dwReserved, pib); + + return S_OK; } static HRESULT WINAPI ProxyBindStatusCallback_GetPriority(IBindStatusCallback *iface, LONG *pnPriority) { ProxyBindStatusCallback *This = (ProxyBindStatusCallback *)iface; - return IBindStatusCallback_GetPriority(This->pBSC, pnPriority); + + if(This->pBSC) + return IBindStatusCallback_GetPriority(This->pBSC, pnPriority); + + return S_OK; } static HRESULT WINAPI ProxyBindStatusCallback_OnLowResource(IBindStatusCallback *iface, DWORD reserved) { ProxyBindStatusCallback *This = (ProxyBindStatusCallback *)iface; - return IBindStatusCallback_OnLowResource(This->pBSC, reserved); + + if(This->pBSC) + return IBindStatusCallback_OnLowResource(This->pBSC, reserved); + + return S_OK; } static HRESULT WINAPI ProxyBindStatusCallback_OnProgress(IBindStatusCallback *iface, ULONG ulProgress, ULONG ulProgressMax, ULONG ulStatusCode, LPCWSTR szStatusText) { ProxyBindStatusCallback *This = (ProxyBindStatusCallback *)iface; - return IBindStatusCallback_OnProgress(This->pBSC, ulProgress, + + if(This->pBSC) + return IBindStatusCallback_OnProgress(This->pBSC, ulProgress, ulProgressMax, ulStatusCode, szStatusText); + + return S_OK; } static HRESULT WINAPI ProxyBindStatusCallback_OnStopBinding(IBindStatusCallback *iface, HRESULT hresult, LPCWSTR szError) { ProxyBindStatusCallback *This = (ProxyBindStatusCallback *)iface; - return IBindStatusCallback_OnStopBinding(This->pBSC, hresult, szError); + + if(This->pBSC) + return IBindStatusCallback_OnStopBinding(This->pBSC, hresult, szError); + + return S_OK; } static HRESULT WINAPI ProxyBindStatusCallback_GetBindInfo(IBindStatusCallback *iface, DWORD *grfBINDF, BINDINFO *pbindinfo) { ProxyBindStatusCallback *This = (ProxyBindStatusCallback *)iface; - return IBindStatusCallback_GetBindInfo(This->pBSC, grfBINDF, pbindinfo); + + if(This->pBSC) + return IBindStatusCallback_GetBindInfo(This->pBSC, grfBINDF, pbindinfo); + + return E_INVALIDARG; } static HRESULT WINAPI ProxyBindStatusCallback_OnDataAvailable(IBindStatusCallback *iface, DWORD grfBSCF, DWORD dwSize, FORMATETC* pformatetc, STGMEDIUM* pstgmed) { ProxyBindStatusCallback *This = (ProxyBindStatusCallback *)iface; - return IBindStatusCallback_OnDataAvailable(This->pBSC, grfBSCF, dwSize, + + if(This->pBSC) + return IBindStatusCallback_OnDataAvailable(This->pBSC, grfBSCF, dwSize, pformatetc, pstgmed); + + return S_OK; } static HRESULT WINAPI ProxyBindStatusCallback_OnObjectAvailable(IBindStatusCallback *iface, REFIID riid, IUnknown *punk) { ProxyBindStatusCallback *This = (ProxyBindStatusCallback *)iface; - return IBindStatusCallback_OnObjectAvailable(This->pBSC, riid, punk); + + if(This->pBSC) + return IBindStatusCallback_OnObjectAvailable(This->pBSC, riid, punk); + + return S_OK; } static HRESULT WINAPI BlockingBindStatusCallback_OnDataAvailable(IBindStatusCallback *iface, DWORD grfBSCF,

1 0

Aric Stewart : winecoreaudio: Implement WIDM_GETPOS.
by Alexandre Julliard Nov. 28, 2007

Nov. 28, 2007

Module: wine Branch: master Commit: fd812bdc1acf25eef7d6b129d0a92cb9c8f6d836 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd812bdc1acf25eef7d6b129d… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Nov 28 19:37:58 2007 +0900 winecoreaudio: Implement WIDM_GETPOS. --- dlls/winecoreaudio.drv/audio.c | 24 ++++++++++++++++++++++++ 1 files changed, 24 insertions(+), 0 deletions(-) diff --git a/dlls/winecoreaudio.drv/audio.c b/dlls/winecoreaudio.drv/audio.c index a831bf7..ee089ab 100644 --- a/dlls/winecoreaudio.drv/audio.c +++ b/dlls/winecoreaudio.drv/audio.c @@ -2129,6 +2129,29 @@ static DWORD widStop(WORD wDevID) return ret; } +/************************************************************************** + * widGetPos [internal] + */ +static DWORD widGetPos(WORD wDevID, LPMMTIME lpTime, UINT size) +{ + DWORD val; + WINE_WAVEIN* wwi; + + TRACE("(%u);\n", wDevID); + if (wDevID >= MAX_WAVEINDRV) + { + WARN("invalid device ID\n"); + return MMSYSERR_INVALHANDLE; + } + + wwi = &WInDev[wDevID]; + + OSSpinLockLock(&WInDev[wDevID].lock); + val = wwi->dwTotalRecorded; + OSSpinLockUnlock(&WInDev[wDevID].lock); + + return bytes_to_mmtime(lpTime, val, &wwi->format); +} /************************************************************************** * widReset [internal] @@ -2283,6 +2306,7 @@ DWORD WINAPI CoreAudio_widMessage(WORD wDevID, WORD wMsg, DWORD dwUser, case WIDM_RESET: return widReset (wDevID); case WIDM_START: return widStart (wDevID); case WIDM_STOP: return widStop (wDevID); + case WIDM_GETPOS: return widGetPos (wDevID, (LPMMTIME)dwParam1, (UINT)dwParam2 ); case DRV_QUERYDEVICEINTERFACESIZE: return widDevInterfaceSize (wDevID, (LPDWORD)dwParam1); case DRV_QUERYDEVICEINTERFACE: return widDevInterface (wDevID, (PWCHAR)dwParam1, dwParam2); case DRV_QUERYDSOUNDIFACE: return widDsCreate (wDevID, (PIDSCDRIVER*)dwParam1);

1 0

Alexandre Julliard : wined3d: Add printf format checking to the shader_addline function and fix resulting warnings .
by Alexandre Julliard Nov. 28, 2007

Nov. 28, 2007

Module: wine Branch: master Commit: 57d1548b5162822d6d5cf9e0b26714abc6b93e84 URL: http://source.winehq.org/git/wine.git/?a=commit;h=57d1548b5162822d6d5cf9e0b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 28 12:55:11 2007 +0100 wined3d: Add printf format checking to the shader_addline function and fix resulting warnings. --- dlls/wined3d/arb_program_shader.c | 8 ++++---- dlls/wined3d/glsl_shader.c | 34 +++++++++++++++++----------------- dlls/wined3d/wined3d_private.h | 8 +++++++- 3 files changed, 28 insertions(+), 22 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index b044f31..a228f64 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -1020,8 +1020,8 @@ void pshader_hw_texkill(SHADER_OPCODE_ARG* arg) { * copy the register into our general purpose TMP variable, overwrite .w and pass TMP to KIL */ shader_addline(buffer, "MOV TMP, %s;\n", reg_dest); - shader_addline(buffer, "MOV TMP.w, one.w;\n", reg_dest); - shader_addline(buffer, "KIL TMP;\n", reg_dest); + shader_addline(buffer, "MOV TMP.w, one.w;\n"); + shader_addline(buffer, "KIL TMP;\n"); } } @@ -1374,8 +1374,8 @@ void pshader_hw_texdepth(SHADER_OPCODE_ARG* arg) { */ shader_addline(buffer, "RCP %s.g, %s.g;\n", dst_name, dst_name); shader_addline(buffer, "MUL TMP.x, %s.r, %s.g;\n", dst_name, dst_name); - shader_addline(buffer, "MIN TMP.x, TMP.x, one.r;\n", dst_name, dst_name); - shader_addline(buffer, "MAX result.depth, TMP.x, 0.0;\n", dst_name, dst_name); + shader_addline(buffer, "MIN TMP.x, TMP.x, one.r;\n"); + shader_addline(buffer, "MAX result.depth, TMP.x, 0.0;\n"); } /** Process the WINED3DSIO_TEXDP3TEX instruction in ARB: diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 0dd306f..1ba609f 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -478,7 +478,7 @@ void shader_generate_glsl_declarations( /* Prototype the subroutines */ for (i = 0; i < This->baseShader.limits.label; i++) { if (reg_maps->labels[i]) - shader_addline(buffer, "void subroutine%lu();\n", i); + shader_addline(buffer, "void subroutine%u();\n", i); } /* Declare the constants (aka uniforms) */ @@ -573,19 +573,19 @@ void shader_generate_glsl_declarations( switch (stype) { case WINED3DSTT_1D: - shader_addline(buffer, "uniform sampler1D %csampler%lu;\n", prefix, i); + shader_addline(buffer, "uniform sampler1D %csampler%u;\n", prefix, i); break; case WINED3DSTT_2D: - shader_addline(buffer, "uniform sampler2D %csampler%lu;\n", prefix, i); + shader_addline(buffer, "uniform sampler2D %csampler%u;\n", prefix, i); break; case WINED3DSTT_CUBE: - shader_addline(buffer, "uniform samplerCube %csampler%lu;\n", prefix, i); + shader_addline(buffer, "uniform samplerCube %csampler%u;\n", prefix, i); break; case WINED3DSTT_VOLUME: - shader_addline(buffer, "uniform sampler3D %csampler%lu;\n", prefix, i); + shader_addline(buffer, "uniform sampler3D %csampler%u;\n", prefix, i); break; default: - shader_addline(buffer, "uniform unsupported_sampler %csampler%lu;\n", prefix, i); + shader_addline(buffer, "uniform unsupported_sampler %csampler%u;\n", prefix, i); FIXME("Unrecognized sampler type: %#x\n", stype); break; } @@ -601,7 +601,7 @@ void shader_generate_glsl_declarations( /* Declare texture coordinate temporaries and initialize them */ for (i = 0; i < This->baseShader.limits.texcoord; i++) { if (reg_maps->texcoord[i]) - shader_addline(buffer, "vec4 T%lu = gl_TexCoord[%lu];\n", i, i); + shader_addline(buffer, "vec4 T%u = gl_TexCoord[%u];\n", i, i); } /* Declare input register varyings. Only pixel shader, vertex shaders have that declared in the @@ -609,25 +609,25 @@ void shader_generate_glsl_declarations( */ if(pshader && This->baseShader.hex_version >= WINED3DVS_VERSION(3, 0)) { if(use_vs(device)) { - shader_addline(buffer, "varying vec4 IN[%lu];\n", GL_LIMITS(glsl_varyings) / 4); + shader_addline(buffer, "varying vec4 IN[%u];\n", GL_LIMITS(glsl_varyings) / 4); } else { /* TODO: Write a replacement shader for the fixed function vertex pipeline, so this isn't needed. * For fixed function vertex processing + 3.0 pixel shader we need a separate function in the * pixel shader that reads the fixed function color into the packed input registers. */ - shader_addline(buffer, "vec4 IN[%lu];\n", GL_LIMITS(glsl_varyings) / 4); + shader_addline(buffer, "vec4 IN[%u];\n", GL_LIMITS(glsl_varyings) / 4); } } /* Declare output register temporaries */ if(This->baseShader.limits.packed_output) { - shader_addline(buffer, "vec4 OUT[%lu];\n", This->baseShader.limits.packed_output); + shader_addline(buffer, "vec4 OUT[%u];\n", This->baseShader.limits.packed_output); } /* Declare temporary variables */ for(i = 0; i < This->baseShader.limits.temporary; i++) { if (reg_maps->temporary[i]) - shader_addline(buffer, "vec4 R%lu;\n", i); + shader_addline(buffer, "vec4 R%u;\n", i); } /* Declare attributes */ @@ -2009,12 +2009,12 @@ void shader_glsl_label(SHADER_OPCODE_ARG* arg) { DWORD snum = (arg->src[0]) & WINED3DSP_REGNUM_MASK; shader_addline(arg->buffer, "}\n"); - shader_addline(arg->buffer, "void subroutine%lu () {\n", snum); + shader_addline(arg->buffer, "void subroutine%u () {\n", snum); } void shader_glsl_call(SHADER_OPCODE_ARG* arg) { DWORD snum = (arg->src[0]) & WINED3DSP_REGNUM_MASK; - shader_addline(arg->buffer, "subroutine%lu();\n", snum); + shader_addline(arg->buffer, "subroutine%u();\n", snum); } void shader_glsl_callnz(SHADER_OPCODE_ARG* arg) { @@ -2022,7 +2022,7 @@ void shader_glsl_callnz(SHADER_OPCODE_ARG* arg) { DWORD snum = (arg->src[0]) & WINED3DSP_REGNUM_MASK; shader_glsl_add_src_param(arg, arg->src[1], arg->src_addr[1], WINED3DSP_WRITEMASK_0, &src1_param); - shader_addline(arg->buffer, "if (%s) subroutine%lu();\n", src1_param.param_str, snum); + shader_addline(arg->buffer, "if (%s) subroutine%u();\n", src1_param.param_str, snum); } /********************************************* @@ -2273,7 +2273,7 @@ void pshader_glsl_texdepth(SHADER_OPCODE_ARG* arg) { * too is irrelevant, since if x = 0, any y value < 1.0 (and > 1.0 is not allowed) results in a result * >= 1.0 or < 0.0 */ - shader_addline(arg->buffer, "gl_FragDepth = clamp((%s.x / min(%s.y, 1.0)), 0.0, 1.0);\n", dst_param.reg_name, dst_param.reg_name, dst_param.reg_name); + shader_addline(arg->buffer, "gl_FragDepth = clamp((%s.x / min(%s.y, 1.0)), 0.0, 1.0);\n", dst_param.reg_name, dst_param.reg_name); } /** Process the WINED3DSIO_TEXM3X2DEPTH instruction in GLSL: @@ -2901,7 +2901,7 @@ static GLhandleARB generate_param_reorder_function(IWineD3DVertexShader *vertexs semantics_in = ps->semantics_in; /* This one is tricky: a 3.0 pixel shader reads from a 3.0 vertex shader */ - shader_addline(&buffer, "varying vec4 IN[%lu];\n", GL_LIMITS(glsl_varyings) / 4); + shader_addline(&buffer, "varying vec4 IN[%u];\n", GL_LIMITS(glsl_varyings) / 4); shader_addline(&buffer, "void order_ps_input(in vec4 OUT[%u]) {\n", MAX_REG_OUTPUT); /* First, sort out position and point size. Those are not passed to the pixel shader */ @@ -2935,7 +2935,7 @@ static GLhandleARB generate_param_reorder_function(IWineD3DVertexShader *vertexs } else if(ps_major >= 3 && vs_major < 3) { semantics_in = ps->semantics_in; - shader_addline(&buffer, "varying vec4 IN[%lu];\n", GL_LIMITS(glsl_varyings) / 4); + shader_addline(&buffer, "varying vec4 IN[%u];\n", GL_LIMITS(glsl_varyings) / 4); shader_addline(&buffer, "void order_ps_input() {\n"); /* The vertex shader wrote to the builtin varyings. There is no need to figure out position and * point size, but we depend on the optimizers kindness to find out that the pixel shader doesn't diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 37908a7..f1a4287 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1745,11 +1745,17 @@ typedef struct SHADER_PARSE_STATE { DWORD texcoord_w[2]; } SHADER_PARSE_STATE; +#ifdef __GNUC__ +#define PRINTF_ATTR(fmt,args) __attribute__((format (printf,fmt,args))) +#else +#define PRINTF_ATTR(fmt,args) +#endif + /* Base Shader utility functions. * (may move callers into the same file in the future) */ extern int shader_addline( SHADER_BUFFER* buffer, - const char* fmt, ...); + const char* fmt, ...) PRINTF_ATTR(2,3); extern const SHADER_OPCODE* shader_get_opcode( IWineD3DBaseShader *iface,

1 0