January 2013 - Wine-Commits

Piotr Caban : jscript: Fixed a leak in do_regexp_match_next function.
by Alexandre Julliard Jan. 25, 2013

Jan. 25, 2013

Module: wine Branch: master Commit: 1548d0ef7b9a029fc35cb58cba3abb2906ea7894 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1548d0ef7b9a029fc35cb58cb… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Jan 25 16:47:57 2013 +0100 jscript: Fixed a leak in do_regexp_match_next function. --- dlls/jscript/regexp.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/regexp.c b/dlls/jscript/regexp.c index 4d29390..a06550d 100644 --- a/dlls/jscript/regexp.c +++ b/dlls/jscript/regexp.c @@ -3708,8 +3708,10 @@ static HRESULT RegExp_exec(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsig TRACE("\n"); hres = run_exec(ctx, jsthis, argc ? argv[0] : jsval_string(jsstr_empty()), &string, &match, &parens, &parens_cnt, &b); - if(FAILED(hres)) + if(FAILED(hres)) { + heap_free(parens); return hres; + } if(r) { if(b) { @@ -3931,8 +3933,10 @@ HRESULT regexp_string_match(script_ctx_t *ctx, jsdisp_t *re, jsstr_t *str, jsval const WCHAR *cp = str->str; hres = regexp_match_next(ctx, &regexp->dispex, 0, str, &cp, &parens, &parens_size, &parens_cnt, &match); - if(FAILED(hres)) + if(FAILED(hres)) { + heap_free(parens); return hres; + } if(r) { if(hres == S_OK) {

1 0

Jacek Caban : atl100: Added AtlGetPerUserRegistration stub implementation.
by Alexandre Julliard Jan. 25, 2013

Jan. 25, 2013

Module: wine Branch: master Commit: 0333b758b2a16ed7091da6c51f0e3ad41ee1aa99 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0333b758b2a16ed7091da6c51… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jan 25 13:12:02 2013 +0100 atl100: Added AtlGetPerUserRegistration stub implementation. --- dlls/atl100/atl.c | 12 ++++++++++++ dlls/atl100/atl100.spec | 2 +- dlls/atl100/tests/atl.c | 6 ++++++ include/atlbase.h | 1 + 4 files changed, 20 insertions(+), 1 deletions(-) diff --git a/dlls/atl100/atl.c b/dlls/atl100/atl.c index c4867aa..ce35b38 100644 --- a/dlls/atl100/atl.c +++ b/dlls/atl100/atl.c @@ -26,6 +26,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(atl100); +typedef unsigned char cpp_bool; + static inline void *heap_alloc(size_t len) { return HeapAlloc(GetProcessHeap(), 0, len); @@ -709,6 +711,16 @@ HRESULT WINAPI AtlGetObjectSourceInterface(IUnknown *unk, GUID *libid, IID *iid, } /*********************************************************************** + * AtlGetPerUserRegistration [atl100.68] + */ +HRESULT WINAPI AtlGetPerUserRegistration(cpp_bool *pbEnabled) +{ + FIXME("stub: returning false\n"); + *pbEnabled = 0; + return S_OK; +} + +/*********************************************************************** * AtlGetVersion [atl100.@] */ DWORD WINAPI AtlGetVersion(void *pReserved) diff --git a/dlls/atl100/atl100.spec b/dlls/atl100/atl100.spec index 1732052..c959a29 100644 --- a/dlls/atl100/atl100.spec +++ b/dlls/atl100/atl100.spec @@ -49,4 +49,4 @@ 65 stdcall AtlWinModuleInit(ptr) 66 stub AtlWinModuleTerm 67 stub AtlSetPerUserRegistration -68 stub AtlGetPerUserRegistration +68 stdcall AtlGetPerUserRegistration(ptr) diff --git a/dlls/atl100/tests/atl.c b/dlls/atl100/tests/atl.c index 8aea90a..e7c3703 100644 --- a/dlls/atl100/tests/atl.c +++ b/dlls/atl100/tests/atl.c @@ -150,6 +150,7 @@ static void _test_key_not_exists(unsigned line, HKEY root, const char *key_name) static void test_regcat(void) { + unsigned char b; HRESULT hres; const struct _ATL_CATMAP_ENTRY catmap[] = { @@ -178,6 +179,11 @@ static void test_regcat(void) ok(hres == S_OK, "AtlRegisterClassCategoriesHelper failed: %08x\n", hres); test_key_not_exists(HKEY_CLASSES_ROOT, "CLSID\\{" CLSID_TEST_STR "}"); + + b = 10; + hres = AtlGetPerUserRegistration(&b); + ok(hres == S_OK, "AtlGetPerUserRegistration failed: %08x\n", hres); + ok(!b, "AtlGetPerUserRegistration returned %x\n", b); } static void test_typelib(void) diff --git a/include/atlbase.h b/include/atlbase.h index 8bacb97..7d18d81 100644 --- a/include/atlbase.h +++ b/include/atlbase.h @@ -258,5 +258,6 @@ HRESULT WINAPI AtlComModuleGetClassObject(_ATL_COM_MODULE*,REFCLSID,REFIID,void* HRESULT WINAPI AtlComModuleUnregisterServer(_ATL_COM_MODULE*,BOOL,const CLSID*); BOOL WINAPI AtlWaitWithMessageLoop(HANDLE); HRESULT WINAPI AtlGetObjectSourceInterface(IUnknown*,GUID*,IID*,unsigned short*,unsigned short*); +HRESULT WINAPI AtlGetPerUserRegistration(unsigned char /*bool*/ *); #endif /* __WINE_ATLBASE_H__ */

1 0

Hans Leidekker : wbemprox: Check the result count instead of the result pointer in get_propval.
by Alexandre Julliard Jan. 25, 2013

Jan. 25, 2013

Module: wine Branch: master Commit: d74cf43fbec6359c0d04493838791d763da92b6e URL: http://source.winehq.org/git/wine.git/?a=commit;h=d74cf43fbec6359c0d0449383… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jan 25 17:33:24 2013 +0100 wbemprox: Check the result count instead of the result pointer in get_propval. --- dlls/wbemprox/query.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wbemprox/query.c b/dlls/wbemprox/query.c index 1123159..2d416ef 100644 --- a/dlls/wbemprox/query.c +++ b/dlls/wbemprox/query.c @@ -650,7 +650,7 @@ HRESULT get_propval( const struct view *view, UINT index, const WCHAR *name, VAR LONGLONG val; if (is_system_prop( name )) return get_system_propval( view, index, name, ret, type, flavor ); - if (!view->result || !is_selected_prop( view, name )) return WBEM_E_NOT_FOUND; + if (!view->count || !is_selected_prop( view, name )) return WBEM_E_NOT_FOUND; hr = get_column_index( view->table, name, &column ); if (hr != S_OK || is_method( view->table, column )) return WBEM_E_NOT_FOUND;

1 0

Piotr Caban : msvcrt: Fixed _Gettnames test on Win8.
by Alexandre Julliard Jan. 25, 2013

Jan. 25, 2013

Module: wine Branch: master Commit: 97782484414ff5a32b26c8bcaccd22cc6b8bc2af URL: http://source.winehq.org/git/wine.git/?a=commit;h=97782484414ff5a32b26c8bca… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Jan 25 15:07:37 2013 +0100 msvcrt: Fixed _Gettnames test on Win8. --- dlls/msvcrt/tests/locale.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/msvcrt/tests/locale.c b/dlls/msvcrt/tests/locale.c index 3bb7fdc..257e3c8 100644 --- a/dlls/msvcrt/tests/locale.c +++ b/dlls/msvcrt/tests/locale.c @@ -656,6 +656,7 @@ static void test__Gettnames(void) char data[1]; } *ret; int size; + char buf[64]; if(!setlocale(LC_ALL, "english")) return; @@ -712,7 +713,9 @@ static void test__Gettnames(void) ok(!strcmp(ret->str[39], "PM"), "ret->str[39] = %s\n", ret->str[39]); ok(!strcmp(ret->str[40], "M/d/yyyy") || broken(!strcmp(ret->str[40], "M/d/yy"))/*NT*/, "ret->str[40] = %s\n", ret->str[40]); - ok(!strcmp(ret->str[41], "dddd, MMMM dd, yyyy"), "ret->str[41] = %s\n", ret->str[41]); + ok(GetLocaleInfoA(MAKELCID(LANG_ENGLISH, SORT_DEFAULT), LOCALE_SLONGDATE|LOCALE_NOUSEROVERRIDE, + buf, sizeof(buf)) != 0, "GetLocaleInfo failed: %x\n", GetLastError()); + ok(!strcmp(ret->str[41], buf), "ret->str[41] = %s, expected %s\n", ret->str[41], buf); free(ret); if(!setlocale(LC_TIME, "german"))

1 0

Stefan Dösinger : d3d: Remove high level patch support .
by Alexandre Julliard Jan. 25, 2013

Jan. 25, 2013

Module: wine Branch: master Commit: 149a85c2e7b5b11daf8efcd169f6980350c955e4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=149a85c2e7b5b11daf8efcd16… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Jan 24 00:39:12 2013 +0100 d3d: Remove high level patch support. No Windows driver ever exposed this, and no game uses this. The only application that used this feature is a DirectX 8 SDK sample. --- dlls/d3d8/device.c | 38 +---- dlls/d3d9/device.c | 38 +---- dlls/wined3d/device.c | 149 --------------- dlls/wined3d/directx.c | 3 +- dlls/wined3d/drawprim.c | 400 ---------------------------------------- dlls/wined3d/wined3d.spec | 3 - dlls/wined3d/wined3d_private.h | 21 -- include/wine/wined3d.h | 5 - 8 files changed, 13 insertions(+), 644 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=149a85c2e7b5b11daf8ef…

1 0

Piotr Caban : msvcp90: Added std::norm(complex) and std::polar(complex) implementation.
by Alexandre Julliard Jan. 25, 2013

Jan. 25, 2013

Module: wine Branch: master Commit: 2350e48f2029ab60fe60b2782005a0e34ac0a3f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2350e48f2029ab60fe60b2782… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Jan 25 10:37:24 2013 +0100 msvcp90: Added std::norm(complex) and std::polar(complex) implementation. --- dlls/msvcp90/math.c | 56 +++++++++++++++++++++++++++++++++++++++++++++ dlls/msvcp90/msvcp90.spec | 36 ++++++++++++++-------------- 2 files changed, 74 insertions(+), 18 deletions(-) diff --git a/dlls/msvcp90/math.c b/dlls/msvcp90/math.c index aca11f1..7cd605a 100644 --- a/dlls/msvcp90/math.c +++ b/dlls/msvcp90/math.c @@ -1402,6 +1402,31 @@ complex_float* __cdecl complex_float_log10(complex_float *ret, const complex_flo return ret; } +/* ??$norm(a)M@std@@YAMABV?$complex(a)M@0@@Z */ +/* ??$norm(a)M@std@@YAMAEBV?$complex(a)M@0@@Z */ +float __cdecl complex_float_norm(const complex_float *c) +{ + return c->real*c->real + c->imag*c->imag; +} + +/* ??$polar(a)M@std@@YA?AV?$complex(a)M@0(a)ABM0@Z */ +/* ??$polar(a)M@std@@YA?AV?$complex(a)M@0(a)AEBM0@Z */ +complex_float* __cdecl complex_float_polar_theta(complex_float *ret, const float *mod, const float *theta) +{ + ret->real = *mod * cos(*theta); + ret->imag = *mod * sin(*theta); + return ret; +} + +/* ??$polar(a)M@std@@YA?AV?$complex(a)M@0(a)ABM@Z */ +/* ??$polar(a)M@std@@YA?AV?$complex(a)M@0(a)AEBM@Z */ +complex_float* __cdecl complex_float_polar(complex_float *ret, const float *mod) +{ + ret->real = *mod; + ret->imag = 0; + return ret; +} + /* ??0?$_Complex_base(a)NU_C_double_complex@@@std@@QAE(a)ABN0@Z */ /* ??0?$_Complex_base(a)NU_C_double_complex@@@std@@QEAA(a)AEBN0@Z */ /* ??0?$_Complex_base(a)OU_C_ldouble_complex@@@std@@QAE(a)ABO0@Z */ @@ -2017,3 +2042,34 @@ complex_double* __cdecl complex_double_log10(complex_double *ret, const complex_ ret->imag *= M_LOG10E; return ret; } + +/* ??$norm(a)N@std@@YANABV?$complex(a)N@0@@Z */ +/* ??$norm(a)N@std@@YANAEBV?$complex(a)N@0@@Z */ +/* ??$norm(a)O@std@@YAOABV?$complex(a)O@0@@Z */ +/* ??$norm(a)O@std@@YAOAEBV?$complex(a)O@0@@Z */ +double __cdecl complex_double_norm(const complex_double *c) +{ + return c->real*c->real + c->imag*c->imag; +} + +/* ??$polar(a)N@std@@YA?AV?$complex(a)N@0(a)ABN0@Z */ +/* ??$polar(a)N@std@@YA?AV?$complex(a)N@0(a)AEBN0@Z */ +/* ??$polar(a)O@std@@YA?AV?$complex(a)O@0(a)ABO0@Z */ +/* ??$polar(a)O@std@@YA?AV?$complex(a)O@0(a)AEBO0@Z */ +complex_double* __cdecl complex_double_polar_theta(complex_double *ret, const double *mod, const double *theta) +{ + ret->real = *mod * cos(*theta); + ret->imag = *mod * sin(*theta); + return ret; +} + +/* ??$polar(a)N@std@@YA?AV?$complex(a)N@0(a)ABN@Z */ +/* ??$polar(a)N@std@@YA?AV?$complex(a)N@0(a)AEBN@Z */ +/* ??$polar(a)O@std@@YA?AV?$complex(a)O@0(a)ABO@Z */ +/* ??$polar(a)O@std@@YA?AV?$complex(a)O@0(a)AEBO@Z */ +complex_double* __cdecl complex_double_polar(complex_double *ret, const double *mod) +{ + ret->real = *mod; + ret->imag = 0; + return ret; +} diff --git a/dlls/msvcp90/msvcp90.spec b/dlls/msvcp90/msvcp90.spec index 61a4651..c1351d5 100644 --- a/dlls/msvcp90/msvcp90.spec +++ b/dlls/msvcp90/msvcp90.spec @@ -416,24 +416,24 @@ @ cdecl -arch=win64 ??$log(a)N@std@@YA?AV?$complex(a)N@0(a)AEBV10@@Z(ptr ptr) complex_double_log @ cdecl -arch=win32 ??$log(a)O@std@@YA?AV?$complex(a)O@0(a)ABV10@@Z(ptr ptr) complex_double_log @ cdecl -arch=win64 ??$log(a)O@std@@YA?AV?$complex(a)O@0(a)AEBV10@@Z(ptr ptr) complex_double_log -@ stub -arch=win32 ??$norm(a)M@std@@YAMABV?$complex(a)M@0@@Z -@ stub -arch=win64 ??$norm(a)M@std@@YAMAEBV?$complex(a)M@0@@Z -@ stub -arch=win32 ??$norm(a)N@std@@YANABV?$complex(a)N@0@@Z -@ stub -arch=win64 ??$norm(a)N@std@@YANAEBV?$complex(a)N@0@@Z -@ stub -arch=win32 ??$norm(a)O@std@@YAOABV?$complex(a)O@0@@Z -@ stub -arch=win64 ??$norm(a)O@std@@YAOAEBV?$complex(a)O@0@@Z -@ stub -arch=win32 ??$polar(a)M@std@@YA?AV?$complex(a)M@0(a)ABM0@Z -@ stub -arch=win64 ??$polar(a)M@std@@YA?AV?$complex(a)M@0(a)AEBM0@Z -@ stub -arch=win32 ??$polar(a)M@std@@YA?AV?$complex(a)M@0(a)ABM@Z -@ stub -arch=win64 ??$polar(a)M@std@@YA?AV?$complex(a)M@0(a)AEBM@Z -@ stub -arch=win32 ??$polar(a)N@std@@YA?AV?$complex(a)N@0(a)ABN0@Z -@ stub -arch=win64 ??$polar(a)N@std@@YA?AV?$complex(a)N@0(a)AEBN0@Z -@ stub -arch=win32 ??$polar(a)N@std@@YA?AV?$complex(a)N@0(a)ABN@Z -@ stub -arch=win64 ??$polar(a)N@std@@YA?AV?$complex(a)N@0(a)AEBN@Z -@ stub -arch=win32 ??$polar(a)O@std@@YA?AV?$complex(a)O@0(a)ABO0@Z -@ stub -arch=win64 ??$polar(a)O@std@@YA?AV?$complex(a)O@0(a)AEBO0@Z -@ stub -arch=win32 ??$polar(a)O@std@@YA?AV?$complex(a)O@0(a)ABO@Z -@ stub -arch=win64 ??$polar(a)O@std@@YA?AV?$complex(a)O@0(a)AEBO@Z +@ cdecl -arch=win32 ??$norm(a)M@std@@YAMABV?$complex(a)M@0@@Z(ptr) complex_float_norm +@ cdecl -arch=win64 ??$norm(a)M@std@@YAMAEBV?$complex(a)M@0@@Z(ptr) complex_float_norm +@ cdecl -arch=win32 ??$norm(a)N@std@@YANABV?$complex(a)N@0@@Z(ptr) complex_double_norm +@ cdecl -arch=win64 ??$norm(a)N@std@@YANAEBV?$complex(a)N@0@@Z(ptr) complex_double_norm +@ cdecl -arch=win32 ??$norm(a)O@std@@YAOABV?$complex(a)O@0@@Z(ptr) complex_double_norm +@ cdecl -arch=win64 ??$norm(a)O@std@@YAOAEBV?$complex(a)O@0@@Z(ptr) complex_double_norm +@ cdecl -arch=win32 ??$polar(a)M@std@@YA?AV?$complex(a)M@0(a)ABM0@Z(ptr ptr ptr) complex_float_polar_theta +@ cdecl -arch=win64 ??$polar(a)M@std@@YA?AV?$complex(a)M@0(a)AEBM0@Z(ptr ptr ptr) complex_float_polar_theta +@ cdecl -arch=win32 ??$polar(a)M@std@@YA?AV?$complex(a)M@0(a)ABM@Z(ptr ptr) complex_float_polar +@ cdecl -arch=win64 ??$polar(a)M@std@@YA?AV?$complex(a)M@0(a)AEBM@Z(ptr ptr) complex_float_polar +@ cdecl -arch=win32 ??$polar(a)N@std@@YA?AV?$complex(a)N@0(a)ABN0@Z(ptr ptr ptr) complex_double_polar_theta +@ cdecl -arch=win64 ??$polar(a)N@std@@YA?AV?$complex(a)N@0(a)AEBN0@Z(ptr ptr ptr) complex_double_polar_theta +@ cdecl -arch=win32 ??$polar(a)N@std@@YA?AV?$complex(a)N@0(a)ABN@Z(ptr ptr) complex_double_polar +@ cdecl -arch=win64 ??$polar(a)N@std@@YA?AV?$complex(a)N@0(a)AEBN@Z(ptr ptr) complex_double_polar +@ cdecl -arch=win32 ??$polar(a)O@std@@YA?AV?$complex(a)O@0(a)ABO0@Z(ptr ptr ptr) complex_double_polar_theta +@ cdecl -arch=win64 ??$polar(a)O@std@@YA?AV?$complex(a)O@0(a)AEBO0@Z(ptr ptr ptr) complex_double_polar_theta +@ cdecl -arch=win32 ??$polar(a)O@std@@YA?AV?$complex(a)O@0(a)ABO@Z(ptr ptr) complex_double_polar +@ cdecl -arch=win64 ??$polar(a)O@std@@YA?AV?$complex(a)O@0(a)AEBO@Z(ptr ptr) complex_double_polar @ stub -arch=win32 ??$pow(a)M@std@@YA?AV?$complex(a)M@0(a)ABMABV10@@Z @ stub -arch=win64 ??$pow(a)M@std@@YA?AV?$complex(a)M@0(a)AEBMAEBV10@@Z @ stub -arch=win32 ??$pow(a)M@std@@YA?AV?$complex(a)M@0(a)ABV10@0(a)Z

1 0

Henri Verbeet : wined3d: Get rid of a superfluous texture copy in check_fbo_compat().
by Alexandre Julliard Jan. 25, 2013

Jan. 25, 2013

Module: wine Branch: master Commit: 6c6565dea034327e325b0a03cbed908d37e88df6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c6565dea034327e325b0a03c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jan 25 10:57:20 2013 +0100 wined3d: Get rid of a superfluous texture copy in check_fbo_compat(). --- dlls/wined3d/utils.c | 8 +------- 1 files changed, 1 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index c1f6125..985fc18 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -1068,10 +1068,10 @@ static void check_fbo_compat(const struct wined3d_gl_info *gl_info, struct wined && format->glFormat != GL_LUMINANCE && format->glFormat != GL_LUMINANCE_ALPHA && (format->red_size || format->alpha_size)) { - GLuint rb, tex2; DWORD readback[16 * 16], color, r_range, a_range; BYTE r, a; BOOL match = TRUE; + GLuint rb; if (gl_info->supported[ARB_FRAMEBUFFER_OBJECT] || gl_info->supported[EXT_PACKED_DEPTH_STENCIL]) @@ -1125,10 +1125,7 @@ static void check_fbo_compat(const struct wined3d_gl_info *gl_info, struct wined gl_info->gl_ops.gl.p_glEnd(); gl_info->gl_ops.gl.p_glDisable(GL_BLEND); - gl_info->gl_ops.gl.p_glGenTextures(1, &tex2); - gl_info->gl_ops.gl.p_glBindTexture(GL_TEXTURE_2D, tex2); - gl_info->gl_ops.gl.p_glCopyTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA8, 0, 0, 16, 16, 0); gl_info->gl_ops.gl.p_glGetTexImage(GL_TEXTURE_2D, 0, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, readback); checkGLcall("Post-pixelshader blending check"); @@ -1154,9 +1151,6 @@ static void check_fbo_compat(const struct wined3d_gl_info *gl_info, struct wined TRACE("Color output: %#x\n", color); format->flags |= WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING; } - - gl_info->gl_ops.gl.p_glBindTexture(GL_TEXTURE_2D, tex); - gl_info->gl_ops.gl.p_glDeleteTextures(1, &tex2); } if (gl_info->supported[ARB_FRAMEBUFFER_OBJECT]

1 0

Henri Verbeet : wined3d: Support all fixups in shader_none_color_fixup_supported().
by Alexandre Julliard Jan. 25, 2013

Jan. 25, 2013

Module: wine Branch: master Commit: 6f04922de00228f209646f74016dfaa136d49714 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f04922de00228f209646f740… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jan 25 10:57:18 2013 +0100 wined3d: Support all fixups in shader_none_color_fixup_supported(). --- dlls/wined3d/shader.c | 19 +++---------------- 1 files changed, 3 insertions(+), 16 deletions(-) diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 2bb5f21..44f67cc 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -32,7 +32,6 @@ #include "wined3d_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d_shader); -WINE_DECLARE_DEBUG_CHANNEL(d3d); static const char * const shader_opcode_names[] = { @@ -1554,21 +1553,9 @@ static void shader_none_get_caps(const struct wined3d_gl_info *gl_info, struct s static BOOL shader_none_color_fixup_supported(struct color_fixup_desc fixup) { - if (TRACE_ON(d3d_shader) && TRACE_ON(d3d)) - { - TRACE("Checking support for fixup:\n"); - dump_color_fixup_desc(fixup); - } - - /* Faked to make some apps happy. */ - if (!is_complex_fixup(fixup)) - { - TRACE("[OK]\n"); - return TRUE; - } - - TRACE("[FAILED]\n"); - return FALSE; + /* We "support" every possible fixup, since we don't support any shader + * model, and will never have to actually sample a texture. */ + return TRUE; } static BOOL shader_none_has_ffp_proj_control(void *shader_priv)

1 0

Jacek Caban : d3dcompiler.h: Added D3DCOMPILER_DLL macro.
by Alexandre Julliard Jan. 25, 2013

Jan. 25, 2013

Module: wine Branch: master Commit: e3c13943d49a1edfe16bdf1dcea7b86ddea6e311 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e3c13943d49a1edfe16bdf1dc… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jan 25 11:25:03 2013 +0100 d3dcompiler.h: Added D3DCOMPILER_DLL macro. --- include/d3dcompiler.h | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/include/d3dcompiler.h b/include/d3dcompiler.h index 047c1ea..7ce83be 100644 --- a/include/d3dcompiler.h +++ b/include/d3dcompiler.h @@ -25,6 +25,17 @@ extern "C" { #endif +#if defined(__GNUC__) +#define D3DCOMPILER_DLL_W (const WCHAR[]){'d','3','d','c','o','m','p','i','l','e','r','_','4','3','.','d','l','l',0}; +#elif defined(_MSV_VER) +#define D3DCOMPILER_DLL_W L"d3dcompiler_43.dll" +#else +static const WCHAR D3DCOMPILER_DLL_W[] = {'d','3','d','c','o','m','p','i','l','e','r','_','4','3','.','d','l','l',0}; +#endif + +#define D3DCOMPILER_DLL_A "d3dcompiler_43.dll" +#define D3DCOMPILER_DLL WINELIB_NAME_AW(D3DCOMPILER_DLL_) + #define D3DCOMPILE_DEBUG 0x00000001 #define D3DCOMPILE_SKIP_VALIDATION 0x00000002 #define D3DCOMPILE_SKIP_OPTIMIZATION 0x00000004

1 0

Piotr Caban : msvcp90: Added std::sqrt(complex) tests.
by Alexandre Julliard Jan. 25, 2013

Jan. 25, 2013

Module: wine Branch: master Commit: 67a2fb01ce87a680c1c913efa46739fa1600074d URL: http://source.winehq.org/git/wine.git/?a=commit;h=67a2fb01ce87a680c1c913efa… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Jan 25 10:37:53 2013 +0100 msvcp90: Added std::sqrt(complex) tests. --- dlls/msvcp90/tests/misc.c | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/dlls/msvcp90/tests/misc.c b/dlls/msvcp90/tests/misc.c index 9e456f8..dc099d3 100644 --- a/dlls/msvcp90/tests/misc.c +++ b/dlls/msvcp90/tests/misc.c @@ -115,6 +115,7 @@ static float (__cdecl *p_complex_float__Fabs)(const complex_float*, int*); static complex_float* (__cdecl *p_complex_float_tan)(complex_float*, const complex_float*); static complex_float* (__cdecl *p_complex_float_tanh)(complex_float*, const complex_float*); static complex_float* (__cdecl *p_complex_float_log10)(complex_float*, const complex_float*); +static complex_float* (__cdecl *p_complex_float_sqrt)(complex_float*, const complex_float*); static int invalid_parameter = 0; static void __cdecl test_invalid_parameter_handler(const wchar_t *expression, @@ -261,6 +262,8 @@ static BOOL init(void) "??$tanh(a)M@std@@YA?AV?$complex(a)M@0(a)AEBV10@@Z"); SET(p_complex_float_log10, "??$log10(a)M@std@@YA?AV?$complex(a)M@0(a)AEBV10@@Z"); + SET(p_complex_float_sqrt, + "??$sqrt(a)M@std@@YA?AV?$complex(a)M@0(a)AEBV10@@Z"); } else { SET(p_char_assign, "?assign@?$char_traits(a)D@std@@SAXAADABD(a)Z"); SET(p_wchar_assign, "?assign@?$char_traits(a)_W@std@@SAXAA_WAB_W(a)Z"); @@ -313,6 +316,8 @@ static BOOL init(void) "??$tanh(a)M@std@@YA?AV?$complex(a)M@0(a)ABV10@@Z"); SET(p_complex_float_log10, "??$log10(a)M@std@@YA?AV?$complex(a)M@0(a)ABV10@@Z"); + SET(p_complex_float_sqrt, + "??$sqrt(a)M@std@@YA?AV?$complex(a)M@0(a)ABV10@@Z"); } init_thiscall_thunk(); @@ -732,6 +737,9 @@ static void test_complex(void) p_complex_float_log10(&c2, &c1); ok(c2.real < -FLT_MAX /* c2.real == -inf */, "c2.real = %f\n", c2.real); ok(c2.imag == 0, "c2.imag = %g\n", c2.imag); + p_complex_float_sqrt(&c2, &c1); + ok(c2.real == 0, "c2.real = %f\n", c2.real); + ok(c2.imag == 0, "c2.imag = %f\n", c2.imag); c1.real = 3.14159/2; c1.imag = 0; @@ -744,6 +752,9 @@ static void test_complex(void) p_complex_float_log10(&c2, &c1); ok(almost_eq(c2.real, 0.196120), "c2.real = %f\n", c2.real); ok(c2.imag == 0, "c2.imag = %g\n", c2.imag); + p_complex_float_sqrt(&c2, &c1); + ok(almost_eq(c2.real, 1.253314), "c2.real = %f\n", c2.real); + ok(c2.imag == 0, "c2.imag = %g\n", c2.imag); c1.real = 7.12; c1.imag = 0.17; @@ -756,6 +767,9 @@ static void test_complex(void) p_complex_float_log10(&c2, &c1); ok(almost_eq(c2.real, 0.852604), "c2.real = %f\n", c2.real); ok(almost_eq(c2.imag, 0.0103674), "c2.imag = %g\n", c2.imag); + p_complex_float_sqrt(&c2, &c1); + ok(almost_eq(c2.real, 2.668523), "c2.real = %f\n", c2.real); + ok(almost_eq(c2.imag, 0.0318528), "c2.imag = %g\n", c2.imag); c1.real = 0.14; c1.imag = 0.19; @@ -768,6 +782,9 @@ static void test_complex(void) p_complex_float_log10(&c2, &c1); ok(almost_eq(c2.real, -0.627072), "c2.real = %f\n", c2.real); ok(almost_eq(c2.imag, 0.4064), "c2.imag = %g\n", c2.imag); + p_complex_float_sqrt(&c2, &c1); + ok(almost_eq(c2.real, 0.433595), "c2.real = %f\n", c2.real); + ok(almost_eq(c2.imag, 0.219099), "c2.imag = %g\n", c2.imag); } START_TEST(misc)

1 0