May 2010 - Wine-Commits - list.winehq.org

Piotr Caban : msvcrt: Added _mbstrlen_l implementation.
by Alexandre Julliard May 6, 2010

May 6, 2010

Module: wine Branch: master Commit: d367314b463e47aa24dea801f0789f459b3dcf4d URL: http://source.winehq.org/git/wine.git/?a=commit;h=d367314b463e47aa24dea801f… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu May 6 14:27:22 2010 +0200 msvcrt: Added _mbstrlen_l implementation. --- dlls/msvcrt/mbcs.c | 41 ++++++++++++++++++++++++----------------- dlls/msvcrt/msvcrt.spec | 2 +- 2 files changed, 25 insertions(+), 18 deletions(-) diff --git a/dlls/msvcrt/mbcs.c b/dlls/msvcrt/mbcs.c index e558808..c562234 100644 --- a/dlls/msvcrt/mbcs.c +++ b/dlls/msvcrt/mbcs.c @@ -1689,25 +1689,32 @@ int CDECL MSVCRT_mblen(const char* str, MSVCRT_size_t size) } /********************************************************************* + * _mbstrlen_l(MSVCRT.@) + */ +MSVCRT_size_t CDECL _mbstrlen_l(const char* str, MSVCRT__locale_t locale) +{ + if(!locale) + locale = get_locale(); + + if(locale->locinfo->mb_cur_max > 1) { + MSVCRT_size_t len = 0; + while(*str) { + /* FIXME: According to the documentation we are supposed to test for + * multi-byte character validity. Whatever that means + */ + str += MSVCRT_isleadbyte(*str) ? 2 : 1; + len++; + } + return len; + } + + return strlen(str); +} + +/********************************************************************* * _mbstrlen(MSVCRT.@) - * REMARKS - * Unlike most of the multibyte string functions this function uses - * the locale codepage, not the codepage set by _setmbcp */ MSVCRT_size_t CDECL _mbstrlen(const char* str) { - if(get_locale()->locinfo->mb_cur_max > 1) - { - MSVCRT_size_t len = 0; - while(*str) - { - /* FIXME: According to the documentation we are supposed to test for - * multi-byte character validity. Whatever that means - */ - str += MSVCRT_isleadbyte(*str) ? 2 : 1; - len++; - } - return len; - } - return strlen(str); /* ASCII CP */ + return _mbstrlen_l(str, NULL); } diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 4334b85..3437442 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -734,7 +734,7 @@ # stub _mbstowcs_l # stub _mbstowcs_s_l @ cdecl _mbstrlen(str) -# stub _mbstrlen_l +@ cdecl _mbstrlen_l(str ptr) # stub _mbstrnlen # stub _mbstrnlen_l @ cdecl _mbsupr(str)

1 0

Matteo Bruni : d3dx9: Add relative addressing support to the shader assembler.
by Alexandre Julliard May 6, 2010

May 6, 2010

Module: wine Branch: master Commit: 399bde576ef9e456c9b8cc22cb89b66ce2431f73 URL: http://source.winehq.org/git/wine.git/?a=commit;h=399bde576ef9e456c9b8cc22c… Author: Matteo Bruni <matteo.mystral(a)gmail.com> Date: Wed May 5 19:55:26 2010 +0200 d3dx9: Add relative addressing support to the shader assembler. --- dlls/d3dx9_36/asmshader.l | 9 ++++ dlls/d3dx9_36/asmshader.y | 87 +++++++++++++++++++++++++++++++++++++++- dlls/d3dx9_36/asmutils.c | 30 +++++++++++-- dlls/d3dx9_36/bytecodewriter.c | 42 +++++++++++++++++++ dlls/d3dx9_36/tests/asm.c | 12 +++--- 5 files changed, 168 insertions(+), 12 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=399bde576ef9e456c9b8c…

1 0

Gerald Pfeifer : wined3d: Fix the handling of the blue channel inIWineGDISurfaceImpl_SaveSnapshot. ( take 2).
by Alexandre Julliard May 6, 2010

May 6, 2010

Module: wine Branch: master Commit: da628001fef259c4533fe940e8da43f7d4177208 URL: http://source.winehq.org/git/wine.git/?a=commit;h=da628001fef259c4533fe940e… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Thu May 6 00:10:18 2010 +0200 wined3d: Fix the handling of the blue channel inIWineGDISurfaceImpl_SaveSnapshot. (take 2). --- dlls/wined3d/surface_gdi.c | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/surface_gdi.c b/dlls/wined3d/surface_gdi.c index eec9b84..580c88a 100644 --- a/dlls/wined3d/surface_gdi.c +++ b/dlls/wined3d/surface_gdi.c @@ -341,14 +341,13 @@ const char* filename) fwrite(output, 3 * This->pow2Width, 1, f); } } else { - int red_shift, green_shift, blue_shift, pix_width, alpha_shift; + int red_shift, green_shift, blue_shift, pix_width; pix_width = format_desc->byte_count; red_shift = get_shift(format_desc->red_mask); green_shift = get_shift(format_desc->green_mask); blue_shift = get_shift(format_desc->blue_mask); - alpha_shift = get_shift(format_desc->alpha_mask); for (y = 0; y < This->pow2Height; y++) { const unsigned char *src = This->resource.allocatedMemory + (y * 1 * IWineD3DSurface_GetPitch(iface)); @@ -367,8 +366,8 @@ const char* filename) output[3 * x + 0] = red_shift > 0 ? comp >> red_shift : comp << -red_shift; comp = color & format_desc->green_mask; output[3 * x + 1] = green_shift > 0 ? comp >> green_shift : comp << -green_shift; - comp = color & format_desc->alpha_mask; - output[3 * x + 2] = alpha_shift > 0 ? comp >> alpha_shift : comp << -alpha_shift; + comp = color & format_desc->blue_mask; + output[3 * x + 2] = blue_shift > 0 ? comp >> blue_shift : comp << -blue_shift; } fwrite(output, 3 * This->pow2Width, 1, f); }

1 0

Joel Holdsworth : user32: Fixed some minor glitches in oic_winlogo.ico.
by Alexandre Julliard May 6, 2010

May 6, 2010

Module: wine Branch: master Commit: 83d5035bbe038b691dd78918ab2a89a344543a92 URL: http://source.winehq.org/git/wine.git/?a=commit;h=83d5035bbe038b691dd78918a… Author: Joel Holdsworth <joel(a)airwebreathe.org.uk> Date: Wed May 5 19:48:28 2010 +0100 user32: Fixed some minor glitches in oic_winlogo.ico. --- dlls/user32/resources/oic_winlogo.ico | Bin 25214 -> 25214 bytes dlls/user32/resources/oic_winlogo.svg | 222 +++++++++++++++++---------------- 2 files changed, 114 insertions(+), 108 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=83d5035bbe038b691dd78…

1 0

Damjan Jovanovic : winemenubuilder: Make desktop files executable.
by Alexandre Julliard May 6, 2010

May 6, 2010

Module: wine Branch: master Commit: ac7a24ba3530264ceae03033e5ac96387fb73e8f URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac7a24ba3530264ceae03033e… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Wed May 5 22:53:57 2010 +0200 winemenubuilder: Make desktop files executable. --- programs/winemenubuilder/winemenubuilder.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/programs/winemenubuilder/winemenubuilder.c b/programs/winemenubuilder/winemenubuilder.c index 201f9ac..4884d7e 100644 --- a/programs/winemenubuilder/winemenubuilder.c +++ b/programs/winemenubuilder/winemenubuilder.c @@ -2334,6 +2334,8 @@ static BOOL InvokeShellLinker( IShellLinkW *sl, LPCWSTR link, BOOL bWait ) if (location) { r = !write_desktop_entry(NULL, location, lastEntry, escaped_path, escaped_args, escaped_description, work_dir, icon_name); + if (r == 0) + chmod(location, 0755); HeapFree(GetProcessHeap(), 0, location); } } @@ -2425,6 +2427,8 @@ static BOOL InvokeShellLinkerForURL( IUniformResourceLocatorW *url, LPCWSTR link if (location) { r = !write_desktop_entry(NULL, location, lastEntry, "winebrowser", escaped_urlPath, NULL, NULL, NULL); + if (r == 0) + chmod(location, 0755); HeapFree(GetProcessHeap(), 0, location); } }

1 0

Rico Schüller : d3d10: Implement ID3D10Effect:: GetVariableBySemantic().
by Alexandre Julliard May 6, 2010

May 6, 2010

Module: wine Branch: master Commit: 337c5d2730a02ee94fb97aa0df011f791d6b3f06 URL: http://source.winehq.org/git/wine.git/?a=commit;h=337c5d2730a02ee94fb97aa0d… Author: Rico Schüller <kgbricola(a)web.de> Date: Wed May 5 19:01:54 2010 +0200 d3d10: Implement ID3D10Effect::GetVariableBySemantic(). --- dlls/d3d10/effect.c | 43 +++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 41 insertions(+), 2 deletions(-) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index c43f88a..016e842 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -2220,9 +2220,48 @@ static struct ID3D10EffectVariable * STDMETHODCALLTYPE d3d10_effect_GetVariableB static struct ID3D10EffectVariable * STDMETHODCALLTYPE d3d10_effect_GetVariableBySemantic(ID3D10Effect *iface, LPCSTR semantic) { - FIXME("iface %p, semantic %s stub!\n", iface, debugstr_a(semantic)); + struct d3d10_effect *This = (struct d3d10_effect *)iface; + unsigned int i; + + TRACE("iface %p, semantic %s\n", iface, debugstr_a(semantic)); + + if (!semantic) + { + WARN("Invalid semantic specified\n"); + return (ID3D10EffectVariable *)&null_variable; + } - return NULL; + for (i = 0; i < This->local_buffer_count; ++i) + { + struct d3d10_effect_variable *l = &This->local_buffers[i]; + unsigned int j; + + for (j = 0; j < l->type->member_count; ++j) + { + struct d3d10_effect_variable *v = &l->members[j]; + + if (!strcmp(v->semantic, semantic)) + { + TRACE("Returning variable %p.\n", v); + return (ID3D10EffectVariable *)v; + } + } + } + + for (i = 0; i < This->local_variable_count; ++i) + { + struct d3d10_effect_variable *v = &This->local_variables[i]; + + if (!strcmp(v->semantic, semantic)) + { + TRACE("Returning variable %p.\n", v); + return (ID3D10EffectVariable *)v; + } + } + + WARN("Invalid semantic specified\n"); + + return (ID3D10EffectVariable *)&null_variable; } static struct ID3D10EffectTechnique * STDMETHODCALLTYPE d3d10_effect_GetTechniqueByIndex(ID3D10Effect *iface,

1 0

Damjan Jovanovic : winex11.drv: Use unicode filenames for WM_DROPFILES.
by Alexandre Julliard May 6, 2010

May 6, 2010

Module: wine Branch: master Commit: 538b39c4cf4b20f636b0424536da6354c8991cab URL: http://source.winehq.org/git/wine.git/?a=commit;h=538b39c4cf4b20f636b042453… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Wed May 5 20:50:04 2010 +0200 winex11.drv: Use unicode filenames for WM_DROPFILES. --- dlls/winex11.drv/xdnd.c | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/winex11.drv/xdnd.c b/dlls/winex11.drv/xdnd.c index fe36e0c..9d209fc 100644 --- a/dlls/winex11.drv/xdnd.c +++ b/dlls/winex11.drv/xdnd.c @@ -367,7 +367,7 @@ static int X11DRV_XDND_DeconstructTextURIList(int property, void* data, int len) char *uri; WCHAR *path; - char *out = NULL; + WCHAR *out = NULL; int size = 0; int capacity = 4096; @@ -375,7 +375,7 @@ static int X11DRV_XDND_DeconstructTextURIList(int property, void* data, int len) int start = 0; int end = 0; - out = HeapAlloc(GetProcessHeap(), 0, capacity); + out = HeapAlloc(GetProcessHeap(), 0, capacity * sizeof(WCHAR)); if (out == NULL) return 0; @@ -403,11 +403,11 @@ static int X11DRV_XDND_DeconstructTextURIList(int property, void* data, int len) if (pathSize > capacity-size) { capacity = 2*capacity + pathSize; - out = HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, out, capacity + 1); + out = HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, out, (capacity + 1)*sizeof(WCHAR)); if (out == NULL) goto done; } - WideCharToMultiByte(CP_ACP, 0, path, -1, &out[size], pathSize, 0, 0); + memcpy(&out[size], path, pathSize * sizeof(WCHAR)); size += pathSize; done: HeapFree(GetProcessHeap(), 0, path); @@ -421,17 +421,17 @@ static int X11DRV_XDND_DeconstructTextURIList(int property, void* data, int len) if (out && end >= len) { DROPFILES *dropFiles; - dropFiles = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(DROPFILES) + size + 1); + dropFiles = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(DROPFILES) + (size + 1)*sizeof(WCHAR)); if (dropFiles) { dropFiles->pFiles = sizeof(DROPFILES); dropFiles->pt.x = XDNDxy.x; dropFiles->pt.y = XDNDxy.y; dropFiles->fNC = 0; - dropFiles->fWide = FALSE; + dropFiles->fWide = TRUE; out[size] = '\0'; - memcpy(((char*)dropFiles) + dropFiles->pFiles, out, size + 1); - X11DRV_XDND_InsertXDNDData(property, CF_HDROP, dropFiles, sizeof(DROPFILES) + size + 1); + memcpy(((char*)dropFiles) + dropFiles->pFiles, out, (size + 1)*sizeof(WCHAR)); + X11DRV_XDND_InsertXDNDData(property, CF_HDROP, dropFiles, sizeof(DROPFILES) + (size + 1)*sizeof(WCHAR)); count = 1; } } @@ -508,9 +508,9 @@ static void X11DRV_XDND_SendDropFiles(HWND hwnd) lpDrop->pt.y = XDNDxy.y; TRACE("Sending WM_DROPFILES: hWnd(0x%p) %p(%s)\n", hwnd, - ((char*)lpDrop) + lpDrop->pFiles, ((char*)lpDrop) + lpDrop->pFiles); + ((char*)lpDrop) + lpDrop->pFiles, debugstr_w((WCHAR*)(((char*)lpDrop) + lpDrop->pFiles))); - PostMessageA(hwnd, WM_DROPFILES, (WPARAM)lpDrop, 0L); + PostMessageW(hwnd, WM_DROPFILES, (WPARAM)lpDrop, 0L); } }

1 0

Nikolay Sivov : comctl32/rebar: Try to center child rectangle only if cyChild height is not zero.
by Alexandre Julliard May 6, 2010

May 6, 2010

Module: wine Branch: master Commit: 5eedf51df69219ab44e2878ddacf6e002cdb08dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=5eedf51df69219ab44e2878dd… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu May 6 00:15:05 2010 +0400 comctl32/rebar: Try to center child rectangle only if cyChild height is not zero. --- dlls/comctl32/rebar.c | 26 +++++++++++++++++++------- 1 files changed, 19 insertions(+), 7 deletions(-) diff --git a/dlls/comctl32/rebar.c b/dlls/comctl32/rebar.c index cc06425..cd3abad 100644 --- a/dlls/comctl32/rebar.c +++ b/dlls/comctl32/rebar.c @@ -707,7 +707,7 @@ REBAR_CalcHorzBand (const REBAR_INFO *infoPtr, UINT rstart, UINT rend) /* *** Supports only Horizontal bars. *** */ { REBAR_BAND *lpBand; - UINT i, xoff, yoff; + UINT i, xoff; RECT work; for(i=rstart; i<rend; i++){ @@ -770,12 +770,24 @@ REBAR_CalcHorzBand (const REBAR_INFO *infoPtr, UINT rstart, UINT rend) } /* set initial child window rectangle if there is a child */ - if (lpBand->hwndChild != NULL) { - int cyBand = lpBand->rcBand.bottom - lpBand->rcBand.top; - yoff = (cyBand - lpBand->cyChild) / 2; - SetRect (&lpBand->rcChild, - lpBand->rcBand.left + lpBand->cxHeader, lpBand->rcBand.top + yoff, - lpBand->rcBand.right - REBAR_POST_CHILD, lpBand->rcBand.top + yoff + lpBand->cyChild); + if (lpBand->hwndChild) { + + lpBand->rcChild.left = lpBand->rcBand.left + lpBand->cxHeader; + lpBand->rcChild.right = lpBand->rcBand.right - REBAR_POST_CHILD; + + if (lpBand->cyChild > 0) { + + UINT yoff = (lpBand->rcBand.bottom - lpBand->rcBand.top - lpBand->cyChild) / 2; + + /* center child if height is known */ + lpBand->rcChild.top = lpBand->rcBand.top + yoff; + lpBand->rcChild.bottom = lpBand->rcBand.top + yoff + lpBand->cyChild; + } + else { + lpBand->rcChild.top = lpBand->rcBand.top; + lpBand->rcChild.bottom = lpBand->rcBand.bottom; + } + if ((lpBand->fStyle & RBBS_USECHEVRON) && (lpBand->rcChild.right - lpBand->rcChild.left < lpBand->cxIdeal)) { lpBand->rcChild.right -= CHEVRON_WIDTH;

1 0

Rico Schüller : d3d10/tests: Add ID3D10Effect:: GetVariableBy*() test.
by Alexandre Julliard May 6, 2010

May 6, 2010

Module: wine Branch: master Commit: 89b0c8437516786e8713cfe0fb6786f65f6a1425 URL: http://source.winehq.org/git/wine.git/?a=commit;h=89b0c8437516786e8713cfe0f… Author: Rico Schüller <kgbricola(a)web.de> Date: Wed May 5 19:02:02 2010 +0200 d3d10/tests: Add ID3D10Effect::GetVariableBy*() test. --- dlls/d3d10/tests/effect.c | 126 +++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 126 insertions(+), 0 deletions(-) diff --git a/dlls/d3d10/tests/effect.c b/dlls/d3d10/tests/effect.c index ee96fb9..f37f945 100644 --- a/dlls/d3d10/tests/effect.c +++ b/dlls/d3d10/tests/effect.c @@ -3441,6 +3441,131 @@ static void test_effect_local_shader(ID3D10Device *device) effect->lpVtbl->Release(effect); } +/* + * test_effect_get_variable_by + */ +#if 0 +cbuffer cb +{ + float f1 : SV_POSITION; + float f2 : COLOR0; +}; +cbuffer cb2 +{ + float f3 : SV_POSITION; + float f4 : COLOR1; +}; +Texture1D tex1 : COLOR2; +Texture1D tex2 : COLOR1; +#endif +static DWORD fx_test_egvb[] = { +0x43425844, 0x63d60ede, 0xf75a09d1, 0x47da5604, 0x7ef6e331, 0x00000001, 0x000001ca, 0x00000001, +0x00000024, 0x30315846, 0x0000019e, 0xfeff1001, 0x00000002, 0x00000004, 0x00000002, 0x00000000, +0x00000000, 0x00000000, 0x00000000, 0x0000008a, 0x00000000, 0x00000002, 0x00000000, 0x00000000, +0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x66006263, +0x74616f6c, 0x00000700, 0x00000100, 0x00000000, 0x00000400, 0x00001000, 0x00000400, 0x00090900, +0x00316600, 0x505f5653, 0x5449534f, 0x004e4f49, 0x43003266, 0x524f4c4f, 0x62630030, 0x33660032, +0x00346600, 0x4f4c4f43, 0x54003152, 0x75747865, 0x44316572, 0x00005300, 0x00000200, 0x00000000, +0x00000000, 0x00000000, 0x00000000, 0x00000a00, 0x78657400, 0x4f430031, 0x32524f4c, 0x78657400, +0x00040032, 0x00100000, 0x00000000, 0x00020000, 0xffff0000, 0x0000ffff, 0x00290000, 0x000d0000, +0x002c0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00380000, 0x000d0000, 0x003b0000, +0x00040000, 0x00000000, 0x00000000, 0x00000000, 0x00420000, 0x00100000, 0x00000000, 0x00020000, +0xffff0000, 0x0000ffff, 0x00460000, 0x000d0000, 0x002c0000, 0x00000000, 0x00000000, 0x00000000, +0x00000000, 0x00490000, 0x000d0000, 0x004c0000, 0x00040000, 0x00000000, 0x00000000, 0x00000000, +0x00790000, 0x005d0000, 0x007e0000, 0xffff0000, 0x0000ffff, 0x00850000, 0x005d0000, 0x004c0000, +0xffff0000, 0x0000ffff, 0x00000000, +}; + +static void test_effect_get_variable_by(ID3D10Device *device) +{ + ID3D10Effect *effect; + ID3D10EffectVariable *variable_by_index, *variable, *null_variable; + HRESULT hr; + + hr = create_effect(fx_test_egvb, 0, device, NULL, &effect); + ok(SUCCEEDED(hr), "D3D10CreateEffectFromMemory failed (%x)\n", hr); + + /* get the null variable */ + null_variable = effect->lpVtbl->GetVariableByIndex(effect, 0xffffffff); + + /* check for invalid arguments */ + variable = effect->lpVtbl->GetVariableByName(effect, NULL); + ok(null_variable == variable, "GetVariableByName got %p, expected %p\n", variable, null_variable); + + variable = effect->lpVtbl->GetVariableBySemantic(effect, NULL); + ok(null_variable == variable, "GetVariableBySemantic got %p, expected %p\n", variable, null_variable); + + variable = effect->lpVtbl->GetVariableByName(effect, "invalid"); + ok(null_variable == variable, "GetVariableByName got %p, expected %p\n", variable, null_variable); + + variable = effect->lpVtbl->GetVariableBySemantic(effect, "invalid"); + ok(null_variable == variable, "GetVariableBySemantic got %p, expected %p\n", variable, null_variable); + + /* variable f1 */ + variable_by_index = effect->lpVtbl->GetVariableByIndex(effect, 0); + ok(null_variable != variable_by_index, "GetVariableByIndex failed %p", variable_by_index); + + variable = effect->lpVtbl->GetVariableByName(effect, "f1"); + ok(variable_by_index == variable, "GetVariableByName got %p, expected %p\n", variable, variable_by_index); + + variable = effect->lpVtbl->GetVariableBySemantic(effect, "SV_POSITION"); + ok(variable_by_index == variable, "GetVariableBySemantic got %p, expected %p\n", variable, variable_by_index); + + /* variable f2 */ + variable_by_index = effect->lpVtbl->GetVariableByIndex(effect, 1); + ok(null_variable != variable_by_index, "GetVariableByIndex failed %p", variable_by_index); + + variable = effect->lpVtbl->GetVariableByName(effect, "f2"); + ok(variable_by_index == variable, "GetVariableByName got %p, expected %p\n", variable, variable_by_index); + + variable = effect->lpVtbl->GetVariableBySemantic(effect, "COLOR0"); + ok(variable_by_index == variable, "GetVariableBySemantic got %p, expected %p\n", variable, variable_by_index); + + /* variable f3 */ + variable_by_index = effect->lpVtbl->GetVariableByIndex(effect, 2); + ok(null_variable != variable_by_index, "GetVariableByIndex failed %p", variable_by_index); + + variable = effect->lpVtbl->GetVariableByName(effect, "f3"); + ok(variable_by_index == variable, "GetVariableByName got %p, expected %p\n", variable, variable_by_index); + + variable = effect->lpVtbl->GetVariableBySemantic(effect, "SV_POSITION"); + ok(variable != null_variable, "GetVariableBySemantic failed %p", variable); + ok(variable != variable_by_index, "GetVariableBySemantic failed %p", variable); + + /* variable f4 */ + variable_by_index = effect->lpVtbl->GetVariableByIndex(effect, 3); + ok(null_variable != variable_by_index, "GetVariableByIndex failed %p", variable_by_index); + + variable = effect->lpVtbl->GetVariableByName(effect, "f4"); + ok(variable_by_index == variable, "GetVariableByName got %p, expected %p\n", variable, variable_by_index); + + variable = effect->lpVtbl->GetVariableBySemantic(effect, "COLOR1"); + ok(variable_by_index == variable, "GetVariableBySemantic got %p, expected %p\n", variable, variable_by_index); + + /* variable tex1 */ + variable_by_index = effect->lpVtbl->GetVariableByIndex(effect, 4); + ok(null_variable != variable_by_index, "GetVariableByIndex failed %p", variable_by_index); + + variable = effect->lpVtbl->GetVariableByName(effect, "tex1"); + ok(variable_by_index == variable, "GetVariableByName got %p, expected %p\n", variable, variable_by_index); + + variable = effect->lpVtbl->GetVariableBySemantic(effect, "COLOR2"); + ok(variable_by_index == variable, "GetVariableBySemantic got %p, expected %p\n", variable, variable_by_index); + + /* variable tex2 */ + variable_by_index = effect->lpVtbl->GetVariableByIndex(effect, 5); + ok(null_variable != variable_by_index, "GetVariableByIndex failed %p", variable_by_index); + + variable = effect->lpVtbl->GetVariableByName(effect, "tex2"); + ok(variable_by_index == variable, "GetVariableByName got %p, expected %p\n", variable, variable_by_index); + + variable = effect->lpVtbl->GetVariableBySemantic(effect, "COLOR1"); + ok(variable != null_variable, "GetVariableBySemantic failed %p", variable); + ok(variable != variable_by_index, "GetVariableBySemantic failed %p", variable); + + effect->lpVtbl->Release(effect); +} + START_TEST(effect) { ID3D10Device *device; @@ -3460,6 +3585,7 @@ START_TEST(effect) test_effect_variable_type_class(device); test_effect_constant_buffer_stride(device); test_effect_local_shader(device); + test_effect_get_variable_by(device); refcount = ID3D10Device_Release(device); ok(!refcount, "Device has %u references left\n", refcount);

1 0

Rico Schüller : d3d10: Add argument check in ID3D10Effect::GetVariableByName().
by Alexandre Julliard May 6, 2010

May 6, 2010

Module: wine Branch: master Commit: b0b9897f9fcca9c276bf3ffa520b608c5e34dbac URL: http://source.winehq.org/git/wine.git/?a=commit;h=b0b9897f9fcca9c276bf3ffa5… Author: Rico Schüller <kgbricola(a)web.de> Date: Wed May 5 19:01:59 2010 +0200 d3d10: Add argument check in ID3D10Effect::GetVariableByName(). --- dlls/d3d10/effect.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 016e842..9a6c843 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -2184,6 +2184,12 @@ static struct ID3D10EffectVariable * STDMETHODCALLTYPE d3d10_effect_GetVariableB TRACE("iface %p, name %s.\n", iface, debugstr_a(name)); + if (!name) + { + WARN("Invalid name specified\n"); + return (ID3D10EffectVariable *)&null_variable; + } + for (i = 0; i < This->local_buffer_count; ++i) { struct d3d10_effect_variable *l = &This->local_buffers[i];

1 0