November 2007 - Wine-commits

Juan Lang : wincrypt.h: Add values for KP_PADDING key param.
by Alexandre Julliard 29 Nov '07

29 Nov '07

Module: wine Branch: master Commit: f6705c67eba592f6e5560fa106bbf3e3a0be7b5a URL: http://source.winehq.org/git/wine.git/?a=commit;h=f6705c67eba592f6e5560fa10… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Nov 28 09:16:14 2007 -0800 wincrypt.h: Add values for KP_PADDING key param. --- include/wincrypt.h | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/include/wincrypt.h b/include/wincrypt.h index e7ea279..bf15b93 100644 --- a/include/wincrypt.h +++ b/include/wincrypt.h @@ -1930,6 +1930,11 @@ static const WCHAR MS_ENH_RSA_AES_PROV_W[] = { 'M','i','c','r','o','s' #define KP_HIGHEST_VERSION 41 #define KP_GET_USE_COUNT 42 +/* Values for KP_PADDING */ +#define PKCS5_PADDING 1 +#define RANDOM_PADDING 2 +#define ZERO_PADDING 3 + /* CryptSignHash/CryptVerifySignature */ #define CRYPT_NOHASHOID 0x00000001 #define CRYPT_TYPE2_FORMAT 0x00000002

1 0

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

29 Nov '07

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: 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 29 Nov '07

29 Nov '07

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: Fix some more potential buffer overflows.
by Alexandre Julliard 29 Nov '07

29 Nov '07

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 28 Nov '07

28 Nov '07

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 28 Nov '07

28 Nov '07

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 28 Nov '07

28 Nov '07

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

Aric Stewart : winecoreaudio: Implement WIDM_GETPOS.
by Alexandre Julliard 28 Nov '07

28 Nov '07

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

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

28 Nov '07

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

Stefan Dösinger : wined3d: Fix a sign mistake in the code creating the sorted attrib.
by Alexandre Julliard 28 Nov '07

28 Nov '07

Module: wine Branch: master Commit: 218de935d19c00750efa1ae0556c55d46d998b70 URL: http://source.winehq.org/git/wine.git/?a=commit;h=218de935d19c00750efa1ae05… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Nov 26 20:01:40 2007 +0100 wined3d: Fix a sign mistake in the code creating the sorted attrib. --- dlls/wined3d/vertexdeclaration.c | 2 +- dlls/wined3d/vertexshader.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/vertexdeclaration.c b/dlls/wined3d/vertexdeclaration.c index 924db6a..a62ac01 100644 --- a/dlls/wined3d/vertexdeclaration.c +++ b/dlls/wined3d/vertexdeclaration.c @@ -175,7 +175,7 @@ static HRESULT WINAPI IWineD3DVertexDeclarationImpl_SetDeclaration(IWineD3DVerte (This->swizzled_attribs[j].usage == This->pDeclarationWine[i].Usage && This->swizzled_attribs[j].idx > This->pDeclarationWine[i].UsageIndex)) { memmove(&This->swizzled_attribs[j + 1], &This->swizzled_attribs[j], - sizeof(This->swizzled_attribs) - (sizeof(This->swizzled_attribs[0]) * (j - 1))); + sizeof(This->swizzled_attribs) - (sizeof(This->swizzled_attribs[0]) * (j + 1))); break; } } diff --git a/dlls/wined3d/vertexshader.c b/dlls/wined3d/vertexshader.c index bd4c2c1..37a3705 100644 --- a/dlls/wined3d/vertexshader.c +++ b/dlls/wined3d/vertexshader.c @@ -336,7 +336,7 @@ static inline void find_swizzled_attribs(IWineD3DVertexDeclaration *declaration, oldswizzles[i].usage == This->swizzled_attribs[j].usage && oldswizzles[i].idx > This->swizzled_attribs[j].idx)) { memmove(&This->swizzled_attribs[j + 1], &This->swizzled_attribs[j], - sizeof(This->swizzled_attribs) - (sizeof(This->swizzled_attribs[0]) * (j - 1))); + sizeof(This->swizzled_attribs) - (sizeof(This->swizzled_attribs[0]) * (j + 1))); break; } }

1 0