wine-commits June 2013

wine-commits@winehq.org

2 participants
411 discussions

Alexandre Rostovtsev : configure: In gnutls-3.2, gnutls_mac_get_key_size() moved to crypto.h.
by Alexandre Julliard 11 Jun '13

11 Jun '13

Module: wine Branch: master Commit: fee9cd3b243ed4eeb111417a472831bb364fc2fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=fee9cd3b243ed4eeb111417a4… Author: Alexandre Rostovtsev <tetromino(a)gentoo.org> Date: Tue Jun 11 01:01:56 2013 -0400 configure: In gnutls-3.2, gnutls_mac_get_key_size() moved to crypto.h. Based on a patch by Ben Kohler <bkohler(a)gmail.com>. --- configure | 1 + configure.ac | 3 ++- dlls/secur32/schannel_gnutls.c | 1 + 3 files changed, 4 insertions(+), 1 deletions(-) diff --git a/configure b/configure index 3006070..86eab07 100755 --- a/configure +++ b/configure @@ -10200,6 +10200,7 @@ if test "x$ac_cv_header_gnutls_gnutls_h" = xyes; then : cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <gnutls/gnutls.h> +#include <gnutls/crypto.h> int main () { diff --git a/configure.ac b/configure.ac index 680432c..a01b44c 100644 --- a/configure.ac +++ b/configure.ac @@ -1344,7 +1344,8 @@ then ac_save_CPPFLAGS="$CPPFLAGS" WINE_PACKAGE_FLAGS(GNUTLS,[gnutls]) AC_CHECK_HEADER(gnutls/gnutls.h, - [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <gnutls/gnutls.h>]], [[static typeof(gnutls_mac_get_key_size) *func; if (func) return 0;]])], + [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <gnutls/gnutls.h> +#include <gnutls/crypto.h>]], [[static typeof(gnutls_mac_get_key_size) *func; if (func) return 0;]])], [WINE_CHECK_SONAME(gnutls,gnutls_global_init,,[GNUTLS_CFLAGS=""],[$GNUTLS_LIBS])])], [GNUTLS_CFLAGS=""]) CPPFLAGS="$ac_save_CPPFLAGS" diff --git a/dlls/secur32/schannel_gnutls.c b/dlls/secur32/schannel_gnutls.c index 70b8276..cbe64e8 100644 --- a/dlls/secur32/schannel_gnutls.c +++ b/dlls/secur32/schannel_gnutls.c @@ -25,6 +25,7 @@ #include <stdarg.h> #ifdef SONAME_LIBGNUTLS #include <gnutls/gnutls.h> +#include <gnutls/crypto.h> #endif #include "windef.h"

1 0

Henri Verbeet : wined3d: Introduce a helper function for printing floats in GLSL shaders.
by Alexandre Julliard 11 Jun '13

11 Jun '13

Module: wine Branch: master Commit: e0494afa007a1d1ba2f4b649beedca27cb20808e URL: http://source.winehq.org/git/wine.git/?a=commit;h=e0494afa007a1d1ba2f4b649b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jun 11 10:21:28 2013 +0200 wined3d: Introduce a helper function for printing floats in GLSL shaders. --- dlls/wined3d/arb_program_shader.c | 7 ++ dlls/wined3d/glsl_shader.c | 120 ++++++++++++++++++++++++++++++------- dlls/wined3d/wined3d_private.h | 7 -- 3 files changed, 105 insertions(+), 29 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index ef75a2f..fd2df68 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -39,6 +39,13 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d_shader); WINE_DECLARE_DEBUG_CHANNEL(d3d_constants); WINE_DECLARE_DEBUG_CHANNEL(d3d); +/* sRGB correction constants */ +static const float srgb_cmp = 0.0031308f; +static const float srgb_mul_low = 12.92f; +static const float srgb_pow = 0.41666f; +static const float srgb_mul_high = 1.055f; +static const float srgb_sub_high = 0.055f; + static BOOL shader_is_pshader_version(enum wined3d_shader_type type) { return type == WINED3D_SHADER_TYPE_PIXEL; diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 0379729..ffe4d25 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -47,6 +47,9 @@ WINE_DECLARE_DEBUG_CHANNEL(winediag); #define WINED3D_GLSL_SAMPLE_LOD 0x4 #define WINED3D_GLSL_SAMPLE_GRAD 0x8 +static const float srgb_const0[] = {0.41666f, 1.055f, 0.055f, 12.92f}; /* pow, mul_high, sub_high, mul_low */ +static const float srgb_const1[] = {0.0031308f, 0.0f, 0.0f, 0.0f}; /* cmp */ + struct glsl_dst_param { char reg_name[150]; @@ -242,6 +245,64 @@ static const char *shader_glsl_get_prefix(enum wined3d_shader_type type) } } +/* This should be equivalent to using the %.8e format specifier, but always + * using '.' as decimal separator. This doesn't handle +/-INF or NAN, since + * the GLSL parser wouldn't be able to handle those anyway. */ +static void shader_glsl_ftoa(float value, char *s) +{ + int x, frac, exponent; + const char *sign = ""; + double d; + + d = value; + if (copysignf(1.0f, value) < 0.0f) + { + d = -d; + sign = "-"; + } + + if (d == 0.0f) + { + x = 0; + frac = 0; + exponent = 0; + } + else + { + double t, diff; + + exponent = floorf(log10f(d)); + d /= pow(10.0, exponent); + + x = d; + t = (d - x) * 100000000; + frac = t; + diff = t - frac; + + if ((diff > 0.5) || (diff == 0.5 && (frac & 1))) + { + if (++frac >= 100000000) + { + frac = 0; + ++x; + } + } + } + + sprintf(s, "%s%d.%08de%+03d", sign, x, frac, exponent); +} + +static void shader_glsl_append_imm_vec4(struct wined3d_shader_buffer *buffer, const float *values) +{ + char str[4][16]; + + shader_glsl_ftoa(values[0], str[0]); + shader_glsl_ftoa(values[1], str[1]); + shader_glsl_ftoa(values[2], str[2]); + shader_glsl_ftoa(values[3], str[3]); + shader_addline(buffer, "vec4(%s, %s, %s, %s)", str[0], str[1], str[2], str[3]); +} + /* Extract a line from the info log. * Note that this modifies the source string. */ static char *get_info_log_line(char **ptr) @@ -1206,10 +1267,12 @@ static void shader_generate_glsl_declarations(const struct wined3d_context *cont if (ps_args->srgb_correction) { - shader_addline(buffer, "const vec4 srgb_const0 = vec4(%.8e, %.8e, %.8e, %.8e);\n", - srgb_pow, srgb_mul_high, srgb_sub_high, srgb_mul_low); - shader_addline(buffer, "const vec4 srgb_const1 = vec4(%.8e, 0.0, 0.0, 0.0);\n", - srgb_cmp); + shader_addline(buffer, "const vec4 srgb_const0 = "); + shader_glsl_append_imm_vec4(buffer, srgb_const0); + shader_addline(buffer, ";\n"); + shader_addline(buffer, "const vec4 srgb_const1 = "); + shader_glsl_append_imm_vec4(buffer, srgb_const1); + shader_addline(buffer, ";\n"); } if (reg_maps->vpos || reg_maps->usesdsy) { @@ -1221,13 +1284,21 @@ static void shader_generate_glsl_declarations(const struct wined3d_context *cont } else { - /* This happens because we do not have proper tracking of the constant registers that are - * actually used, only the max limit of the shader version - */ + float ycorrection[] = + { + context->render_offscreen ? 0.0f : fb->render_targets[0]->resource.height, + context->render_offscreen ? 1.0f : -1.0f, + 0.0f, + 0.0f, + }; + + /* This happens because we do not have proper tracking of the + * constant registers that are actually used, only the max + * limit of the shader version. */ FIXME("Cannot find a free uniform for vpos correction params\n"); - shader_addline(buffer, "const vec4 ycorrection = vec4(%f, %f, 0.0, 0.0);\n", - context->render_offscreen ? 0.0f : fb->render_targets[0]->resource.height, - context->render_offscreen ? 1.0f : -1.0f); + shader_addline(buffer, "const vec4 ycorrection = "); + shader_glsl_append_imm_vec4(buffer, ycorrection); + shader_addline(buffer, ";\n"); } shader_addline(buffer, "vec4 vpos;\n"); } @@ -1261,10 +1332,9 @@ static void shader_generate_glsl_declarations(const struct wined3d_context *cont { LIST_FOR_EACH_ENTRY(lconst, &shader->constantsF, struct wined3d_shader_lconst, entry) { - const float *value; - value = (const float *)lconst->value; - shader_addline(buffer, "const vec4 %s_lc%u = vec4(%.8e, %.8e, %.8e, %.8e);\n", - prefix, lconst->idx, value[0], value[1], value[2], value[3]); + shader_addline(buffer, "const vec4 %s_lc%u = ", prefix, lconst->idx); + shader_glsl_append_imm_vec4(buffer, (const float *)lconst->value); + shader_addline(buffer, ";\n"); } } @@ -1388,6 +1458,7 @@ static void shader_glsl_get_register_name(const struct wined3d_shader_register * const struct wined3d_gl_info *gl_info = ins->ctx->gl_info; const char *prefix = shader_glsl_get_prefix(version->type); struct glsl_src_param rel_param0, rel_param1; + char imm_str[4][16]; if (reg->idx[0].offset != ~0U && reg->idx[0].rel_addr) shader_glsl_add_src_param(ins, reg->idx[0].rel_addr, WINED3DSP_WRITEMASK_0, &rel_param0); @@ -1583,7 +1654,7 @@ static void shader_glsl_get_register_name(const struct wined3d_shader_register * switch (reg->data_type) { case WINED3D_DATA_FLOAT: - sprintf(register_name, "%.8e", *(const float *)reg->immconst_data); + shader_glsl_ftoa(*(const float *)reg->immconst_data, register_name); break; case WINED3D_DATA_INT: sprintf(register_name, "%#x", reg->immconst_data[0]); @@ -1603,9 +1674,12 @@ static void shader_glsl_get_register_name(const struct wined3d_shader_register * switch (reg->data_type) { case WINED3D_DATA_FLOAT: - sprintf(register_name, "vec4(%.8e, %.8e, %.8e, %.8e)", - *(const float *)&reg->immconst_data[0], *(const float *)&reg->immconst_data[1], - *(const float *)&reg->immconst_data[2], *(const float *)&reg->immconst_data[3]); + shader_glsl_ftoa(*(const float *)&reg->immconst_data[0], imm_str[0]); + shader_glsl_ftoa(*(const float *)&reg->immconst_data[1], imm_str[1]); + shader_glsl_ftoa(*(const float *)&reg->immconst_data[2], imm_str[2]); + shader_glsl_ftoa(*(const float *)&reg->immconst_data[3], imm_str[3]); + sprintf(register_name, "vec4(%s, %s, %s, %s)", + imm_str[0], imm_str[1], imm_str[2], imm_str[3]); break; case WINED3D_DATA_INT: sprintf(register_name, "ivec4(%#x, %#x, %#x, %#x)", @@ -5399,10 +5473,12 @@ static GLuint shader_glsl_generate_ffp_fragment_shader(struct wined3d_shader_buf if (settings->sRGB_write) { - shader_addline(buffer, "const vec4 srgb_const0 = vec4(%.8e, %.8e, %.8e, %.8e);\n", - srgb_pow, srgb_mul_high, srgb_sub_high, srgb_mul_low); - shader_addline(buffer, "const vec4 srgb_const1 = vec4(%.8e, 0.0, 0.0, 0.0);\n", - srgb_cmp); + shader_addline(buffer, "const vec4 srgb_const0 = "); + shader_glsl_append_imm_vec4(buffer, srgb_const0); + shader_addline(buffer, ";\n"); + shader_addline(buffer, "const vec4 srgb_const1 = "); + shader_glsl_append_imm_vec4(buffer, srgb_const1); + shader_addline(buffer, ";\n"); } shader_addline(buffer, "void main()\n{\n"); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 6539548..4ac9098 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2854,13 +2854,6 @@ struct ps_np2fixup_info { WORD num_consts; }; -/* sRGB correction constants */ -static const float srgb_cmp = 0.0031308f; -static const float srgb_mul_low = 12.92f; -static const float srgb_pow = 0.41666f; -static const float srgb_mul_high = 1.055f; -static const float srgb_sub_high = 0.055f; - struct wined3d_palette { LONG ref;

1 0

Dmitry Timoshkov : ole32/tests: Make sure that key "Software\\Classes" exists under HKEY_CURRENT_USER.
by Alexandre Julliard 11 Jun '13

11 Jun '13

Module: wine Branch: master Commit: b02951dfa7ff416f54205dab17ae3bb98e53ce7c URL: http://source.winehq.org/git/wine.git/?a=commit;h=b02951dfa7ff416f54205dab1… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Jun 11 14:47:51 2013 +0900 ole32/tests: Make sure that key "Software\\Classes" exists under HKEY_CURRENT_USER. --- dlls/ole32/tests/compobj.c | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/ole32/tests/compobj.c b/dlls/ole32/tests/compobj.c index f2cdf6d..470adbd 100644 --- a/dlls/ole32/tests/compobj.c +++ b/dlls/ole32/tests/compobj.c @@ -444,8 +444,9 @@ static void test_CoGetClassObject(void) { IUnknown_Release(pUnk); - res = RegOpenKeyExA(HKEY_CURRENT_USER, "Software\\Classes", 0, KEY_ALL_ACCESS, &hkey); - ok(!res, "RegOpenKeyExA returned %d\n", res); + res = RegCreateKeyEx(HKEY_CURRENT_USER, "Software\\Classes", 0, NULL, 0, + KEY_ALL_ACCESS, NULL, &hkey, NULL); + ok(!res, "RegCreateKeyEx returned %d\n", res); res = pRegOverridePredefKey(HKEY_CLASSES_ROOT, hkey); ok(!res, "RegOverridePredefKey returned %d\n", res); @@ -780,8 +781,9 @@ static void test_CoGetPSClsid(void) hr = CoGetPSClsid(&IID_IClassFactory, &clsid); ok_ole_success(hr, "CoGetPSClsid"); - res = RegOpenKeyExA(HKEY_CURRENT_USER, "Software\\Classes", 0, KEY_ALL_ACCESS, &hkey); - ok(!res, "RegOpenKeyExA returned %d\n", res); + res = RegCreateKeyEx(HKEY_CURRENT_USER, "Software\\Classes", 0, NULL, 0, + KEY_ALL_ACCESS, NULL, &hkey, NULL); + ok(!res, "RegCreateKeyEx returned %d\n", res); res = pRegOverridePredefKey(HKEY_CLASSES_ROOT, hkey); ok(!res, "RegOverridePredefKey returned %d\n", res);

1 0

Dmitry Timoshkov : ole32/tests: Test remaining class, object and server reference counts at server exit.
by Alexandre Julliard 11 Jun '13

11 Jun '13

Module: wine Branch: master Commit: ac13aa28ad7e67330b26c163bc8e4190f50d196e URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac13aa28ad7e67330b26c163b… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Jun 11 12:42:49 2013 +0900 ole32/tests: Test remaining class, object and server reference counts at server exit. --- dlls/ole32/tests/ole_server.c | 19 +++++++++++++++++-- 1 files changed, 17 insertions(+), 2 deletions(-) diff --git a/dlls/ole32/tests/ole_server.c b/dlls/ole32/tests/ole_server.c index 9cff693..9c901ee 100644 --- a/dlls/ole32/tests/ole_server.c +++ b/dlls/ole32/tests/ole_server.c @@ -61,6 +61,8 @@ static const struct #undef GUID_NAME }; +static LONG obj_ref, class_ref, server_locks; + static const char *debugstr_guid(const GUID *guid) { static char buf[50]; @@ -118,6 +120,8 @@ static ULONG WINAPI UnknownImpl_AddRef(IUnknown *iface) UnknownImpl *This = impl_from_IUnknown(iface); ULONG ref = InterlockedIncrement(&This->ref); + InterlockedIncrement(&obj_ref); + trace("server: unknown_AddRef: %p, ref %u\n", iface, ref); return ref; } @@ -127,6 +131,8 @@ static ULONG WINAPI UnknownImpl_Release(IUnknown *iface) UnknownImpl *This = impl_from_IUnknown(iface); ULONG ref = InterlockedDecrement(&This->ref); + InterlockedDecrement(&obj_ref); + trace("server: unknown_Release: %p, ref %u\n", iface, ref); if (ref == 0) HeapFree(GetProcessHeap(), 0, This); return ref; @@ -176,6 +182,8 @@ static ULONG WINAPI ClassFactoryImpl_AddRef(IClassFactory *iface) ClassFactoryImpl *This = impl_from_IClassFactory(iface); ULONG ref = InterlockedIncrement(&This->ref); + InterlockedIncrement(&class_ref); + trace("server: factory_AddRef: %p, ref %u\n", iface, ref); return ref; } @@ -185,6 +193,8 @@ static ULONG WINAPI ClassFactoryImpl_Release(IClassFactory *iface) ClassFactoryImpl *This = impl_from_IClassFactory(iface); ULONG ref = InterlockedDecrement(&This->ref); + InterlockedDecrement(&class_ref); + trace("server: factory_Release: %p, ref %u\n", iface, ref); return ref; } @@ -203,7 +213,8 @@ static HRESULT WINAPI ClassFactoryImpl_CreateInstance(IClassFactory *iface, if (!unknown) return E_OUTOFMEMORY; unknown->IUnknown_iface.lpVtbl = &UnknownImpl_Vtbl; - unknown->ref = 1; + unknown->ref = 0; + IUnknown_AddRef(&unknown->IUnknown_iface); hr = IUnknown_QueryInterface(&unknown->IUnknown_iface, iid, ppv); IUnknown_Release(&unknown->IUnknown_iface); @@ -213,7 +224,6 @@ static HRESULT WINAPI ClassFactoryImpl_CreateInstance(IClassFactory *iface, static HRESULT WINAPI ClassFactoryImpl_LockServer(IClassFactory *iface, BOOL lock) { - static LONG server_locks; ULONG ref = lock ? InterlockedIncrement(&server_locks) : InterlockedDecrement(&server_locks); trace("server: factory_LockServer: %p,%d, ref %u\n", iface, lock, ref); @@ -258,6 +268,11 @@ static void ole_server(void) trace("server: waiting for requests\n"); WaitForSingleObject(done_event, INFINITE); + /* 1 remainining class ref is supposed to be cleared by CoRevokeClassObject */ + ok(class_ref == 1, "expected 1 class refs, got %d\n", class_ref); + ok(!obj_ref, "expected 0 object refs, got %d\n", obj_ref); + ok(!server_locks, "expected 0 server locks, got %d\n", server_locks); + CloseHandle(done_event); CloseHandle(init_done_event); if (0)

1 0

Hans Leidekker : msi/tests: Move some tests around to avoid timeouts on the testbot.
by Alexandre Julliard 10 Jun '13

10 Jun '13

Module: wine Branch: master Commit: b82a5ab27a19d605f1957be82808673aede809eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=b82a5ab27a19d605f1957be82… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Jun 10 18:58:30 2013 +0200 msi/tests: Move some tests around to avoid timeouts on the testbot. --- dlls/msi/tests/install.c | 565 +--------------------------- dlls/msi/tests/msi.c | 968 +++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 968 insertions(+), 565 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b82a5ab27a19d605f1957…

1 0

Hans Leidekker : winhttp/tests: Trace certificate errors.
by Alexandre Julliard 10 Jun '13

10 Jun '13

Module: wine Branch: master Commit: 4df4339f8ea82edf360dadb04b7cd2ab68d543c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4df4339f8ea82edf360dadb04… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Jun 10 14:24:25 2013 +0200 winhttp/tests: Trace certificate errors. --- dlls/winhttp/tests/winhttp.c | 22 ++++++++++++++++++++++ 1 files changed, 22 insertions(+), 0 deletions(-) diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index 03de012..1aff505 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -789,6 +789,26 @@ static void test_WinHttpAddHeaders(void) } +static void CALLBACK cert_error(HINTERNET handle, DWORD_PTR ctx, DWORD status, LPVOID buf, DWORD len) +{ + DWORD flags = *(DWORD *)buf; + + if (!flags) + { + trace("WINHTTP_CALLBACK_STATUS_FLAG_SECURITY_CHANNEL_ERROR\n"); + return; + } +#define X(x) if (flags & x) trace("%s\n", #x); + X(WINHTTP_CALLBACK_STATUS_FLAG_CERT_REV_FAILED) + X(WINHTTP_CALLBACK_STATUS_FLAG_INVALID_CERT) + X(WINHTTP_CALLBACK_STATUS_FLAG_CERT_REVOKED) + X(WINHTTP_CALLBACK_STATUS_FLAG_INVALID_CA) + X(WINHTTP_CALLBACK_STATUS_FLAG_CERT_CN_INVALID) + X(WINHTTP_CALLBACK_STATUS_FLAG_CERT_DATE_INVALID) + X(WINHTTP_CALLBACK_STATUS_FLAG_CERT_WRONG_USAGE) +#undef X +} + static void test_secure_connection(void) { static const WCHAR google[] = {'w','w','w','.','g','o','o','g','l','e','.','c','o','m',0}; @@ -834,6 +854,8 @@ static void test_secure_connection(void) req = WinHttpOpenRequest(con, NULL, NULL, NULL, NULL, NULL, WINHTTP_FLAG_SECURE); ok(req != NULL, "failed to open a request %u\n", GetLastError()); + WinHttpSetStatusCallback(req, cert_error, WINHTTP_CALLBACK_STATUS_SECURE_FAILURE, 0); + ret = WinHttpSendRequest(req, NULL, 0, NULL, 0, 0, 0); ok(ret, "failed to send request %u\n", GetLastError()); if (!ret)

1 0

Jacek Caban : d3d9.h: Make include guard compatible with PSDK headers.
by Alexandre Julliard 10 Jun '13

10 Jun '13

Module: wine Branch: master Commit: a8535c3b23b4d645ccc7b1de7a643f2707f978dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=a8535c3b23b4d645ccc7b1de7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jun 10 11:56:18 2013 +0200 d3d9.h: Make include guard compatible with PSDK headers. --- include/d3d9.h | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/d3d9.h b/include/d3d9.h index 0f52d09..382b241 100644 --- a/include/d3d9.h +++ b/include/d3d9.h @@ -17,8 +17,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#ifndef __WINE_D3D9_H -#define __WINE_D3D9_H +#ifndef _D3D9_H_ +#define _D3D9_H_ #ifndef DIRECT3D_VERSION #define DIRECT3D_VERSION 0x0900 @@ -2042,4 +2042,4 @@ IDirect3D9* WINAPI Direct3DCreate9(UINT SDKVersion); #endif /* defined(__cplusplus) */ -#endif /* __WINE_D3D9_H */ +#endif /* _D3D9_H_ */

1 0

Austin English : api-ms-win-core-processthreads-l1-1-0: Add stub dll.
by Alexandre Julliard 10 Jun '13

10 Jun '13

Module: wine Branch: master Commit: 936cb4ce7e14e9dbcdf1ff2fa8ca65ceed7b33ce URL: http://source.winehq.org/git/wine.git/?a=commit;h=936cb4ce7e14e9dbcdf1ff2fa… Author: Austin English <austinenglish(a)gmail.com> Date: Sat Jun 8 16:27:40 2013 -0500 api-ms-win-core-processthreads-l1-1-0: Add stub dll. --- configure | 1 + configure.ac | 1 + .../Makefile.in | 3 + .../api-ms-win-core-processthreads-l1-1-0.spec | 49 ++++++++++++++++++++ tools/make_specfiles | 1 + 5 files changed, 55 insertions(+), 0 deletions(-) diff --git a/configure b/configure index 3a551e8..3006070 100755 --- a/configure +++ b/configure @@ -15751,6 +15751,7 @@ wine_fn_config_test dlls/advpack/tests advpack_test wine_fn_config_dll amstream enable_amstream wine_fn_config_test dlls/amstream/tests amstream_test wine_fn_config_dll api-ms-win-core-localregistry-l1-1-0 enable_api_ms_win_core_localregistry_l1_1_0 +wine_fn_config_dll api-ms-win-core-processthreads-l1-1-0 enable_api_ms_win_core_processthreads_l1_1_0 wine_fn_config_dll api-ms-win-core-winrt-error-l1-1-0 enable_api_ms_win_core_winrt_error_l1_1_0 wine_fn_config_dll api-ms-win-core-winrt-string-l1-1-0 enable_api_ms_win_core_winrt_string_l1_1_0 wine_fn_config_dll api-ms-win-downlevel-advapi32-l1-1-0 enable_api_ms_win_downlevel_advapi32_l1_1_0 diff --git a/configure.ac b/configure.ac index 57d76d9..680432c 100644 --- a/configure.ac +++ b/configure.ac @@ -2575,6 +2575,7 @@ WINE_CONFIG_TEST(dlls/advpack/tests) WINE_CONFIG_DLL(amstream) WINE_CONFIG_TEST(dlls/amstream/tests) WINE_CONFIG_DLL(api-ms-win-core-localregistry-l1-1-0) +WINE_CONFIG_DLL(api-ms-win-core-processthreads-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-winrt-error-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-winrt-string-l1-1-0) WINE_CONFIG_DLL(api-ms-win-downlevel-advapi32-l1-1-0) diff --git a/dlls/api-ms-win-core-processthreads-l1-1-0/Makefile.in b/dlls/api-ms-win-core-processthreads-l1-1-0/Makefile.in new file mode 100644 index 0000000..e516731 --- /dev/null +++ b/dlls/api-ms-win-core-processthreads-l1-1-0/Makefile.in @@ -0,0 +1,3 @@ +MODULE = api-ms-win-core-processthreads-l1-1-0.dll + +@MAKE_DLL_RULES@ diff --git a/dlls/api-ms-win-core-processthreads-l1-1-0/api-ms-win-core-processthreads-l1-1-0.spec b/dlls/api-ms-win-core-processthreads-l1-1-0/api-ms-win-core-processthreads-l1-1-0.spec new file mode 100644 index 0000000..0b16649 --- /dev/null +++ b/dlls/api-ms-win-core-processthreads-l1-1-0/api-ms-win-core-processthreads-l1-1-0.spec @@ -0,0 +1,49 @@ +@ stdcall CreateProcessA(str str ptr ptr long long ptr str ptr ptr) kernel32.CreateProcessA +@ stub CreateProcessAsUserW +@ stdcall CreateProcessW(wstr wstr ptr ptr long long ptr wstr ptr ptr) kernel32.CreateProcessW +@ stdcall CreateRemoteThread(long ptr long ptr long long ptr) kernel32.CreateRemoteThread +@ stub CreateRemoteThreadEx +@ stdcall CreateThread(ptr long ptr long long ptr) kernel32.CreateThread +@ stub DeleteProcThreadAttributeList +@ stdcall ExitProcess(long) kernel32.ExitProcess +@ stdcall ExitThread(long) kernel32.ExitThread +@ stdcall FlushProcessWriteBuffers() kernel32.FlushProcessWriteBuffers +@ stdcall -norelay GetCurrentProcess() kernel32.GetCurrentProcess +@ stdcall -norelay GetCurrentProcessId() kernel32.GetCurrentProcessId +@ stdcall -norelay GetCurrentThread() kernel32.GetCurrentThread +@ stdcall -norelay GetCurrentThreadId() kernel32.GetCurrentThreadId +@ stdcall GetExitCodeProcess(long ptr) kernel32.GetExitCodeProcess +@ stdcall GetExitCodeThread(long ptr) kernel32.GetExitCodeThread +@ stdcall GetPriorityClass(long) kernel32.GetPriorityClass +@ stdcall GetProcessId(long) kernel32.GetProcessId +@ stub GetProcessIdOfThread +@ stdcall GetProcessTimes(long ptr ptr ptr ptr) kernel32.GetProcessTimes +@ stdcall GetProcessVersion(long) kernel32.GetProcessVersion +@ stdcall GetStartupInfoW(ptr) kernel32.GetStartupInfoW +@ stdcall GetThreadId(ptr) kernel32.GetThreadId +@ stdcall GetThreadPriority(long) kernel32.GetThreadPriority +@ stdcall GetThreadPriorityBoost(long ptr) kernel32.GetThreadPriorityBoost +@ stub InitializeProcThreadAttributeList +@ stub OpenProcessToken +@ stdcall OpenThread(long long long) kernel32.OpenThread +@ stub OpenThreadToken +@ stdcall ProcessIdToSessionId(long ptr) kernel32.ProcessIdToSessionId +@ stub QueryProcessAffinityUpdateMode +@ stdcall QueueUserAPC(ptr long long) kernel32.QueueUserAPC +@ stdcall ResumeThread(long) kernel32.ResumeThread +@ stdcall SetPriorityClass(long long) kernel32.SetPriorityClass +@ stub SetProcessAffinityUpdateMode +@ stdcall SetProcessShutdownParameters(long long) kernel32.SetProcessShutdownParameters +@ stdcall SetThreadPriority(long long) kernel32.SetThreadPriority +@ stdcall SetThreadPriorityBoost(long long) kernel32.SetThreadPriorityBoost +@ stdcall SetThreadStackGuarantee(ptr) kernel32.SetThreadStackGuarantee +@ stub SetThreadToken +@ stdcall SuspendThread(long) kernel32.SuspendThread +@ stdcall SwitchToThread() kernel32.SwitchToThread +@ stdcall TerminateProcess(long long) kernel32.TerminateProcess +@ stdcall TerminateThread(long long) kernel32.TerminateThread +@ stdcall TlsAlloc() kernel32.TlsAlloc +@ stdcall TlsFree(long) kernel32.TlsFree +@ stdcall TlsGetValue(long) kernel32.TlsGetValue +@ stdcall TlsSetValue(long ptr) kernel32.TlsSetValue +@ stub UpdateProcThreadAttribute diff --git a/tools/make_specfiles b/tools/make_specfiles index 002d252..1a57692 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -128,6 +128,7 @@ my @dll_groups = [ "kernel32", "api-ms-win-downlevel-normaliz-l1-1-0", + "api-ms-win-core-processthreads-l1-1-0", ], [ "ole32",

1 0

Nozomi Kodama : d3dx9: Fix the case output = input in D3DXVec3Cross.
by Alexandre Julliard 10 Jun '13

10 Jun '13

Module: wine Branch: master Commit: b3dff5b3543e13962f3dde5a59738933b63c7ec4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b3dff5b3543e13962f3dde5a5… Author: Nozomi Kodama <nozomi.kodama(a)yahoo.com> Date: Sat Jun 8 02:26:45 2013 -1000 d3dx9: Fix the case output = input in D3DXVec3Cross. --- dlls/d3dx9_36/tests/math.c | 3 +++ include/d3dx9math.inl | 9 ++++++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/dlls/d3dx9_36/tests/math.c b/dlls/d3dx9_36/tests/math.c index 9d90662..5f92729 100644 --- a/dlls/d3dx9_36/tests/math.c +++ b/dlls/d3dx9_36/tests/math.c @@ -1251,6 +1251,9 @@ static void D3DXVector3Test(void) expectedvec.x = -18.0f; expectedvec.y = 40.0f; expectedvec.z = -39.0f; D3DXVec3Cross(&gotvec,&u,&v); expect_vec3(expectedvec,gotvec); + expectedvec.x = -277.0f; expectedvec.y = -150.0f; expectedvec.z = -26.0f; + D3DXVec3Cross(&gotvec,&gotvec,&v); + expect_vec3(expectedvec,gotvec); /* Tests the case NULL */ funcpointer = D3DXVec3Cross(&gotvec,NULL,&v); ok(funcpointer == NULL, "Expected: %p, Got: %p\n", NULL, funcpointer); diff --git a/include/d3dx9math.inl b/include/d3dx9math.inl index 5ee9a75..84c0c62 100644 --- a/include/d3dx9math.inl +++ b/include/d3dx9math.inl @@ -1029,10 +1029,13 @@ static inline D3DXVECTOR3* D3DXVec3Add(D3DXVECTOR3 *pout, CONST D3DXVECTOR3 *pv1 static inline D3DXVECTOR3* D3DXVec3Cross(D3DXVECTOR3 *pout, CONST D3DXVECTOR3 *pv1, CONST D3DXVECTOR3 *pv2) { + D3DXVECTOR3 temp; + if ( !pout || !pv1 || !pv2) return NULL; - pout->x = (pv1->y) * (pv2->z) - (pv1->z) * (pv2->y); - pout->y = (pv1->z) * (pv2->x) - (pv1->x) * (pv2->z); - pout->z = (pv1->x) * (pv2->y) - (pv1->y) * (pv2->x); + temp.x = (pv1->y) * (pv2->z) - (pv1->z) * (pv2->y); + temp.y = (pv1->z) * (pv2->x) - (pv1->x) * (pv2->z); + temp.z = (pv1->x) * (pv2->y) - (pv1->y) * (pv2->x); + *pout = temp; return pout; }

1 0

Alexandre Julliard : oleaut32: Remove redundant declaration of CLSID_PSFactoryBuffer.
by Alexandre Julliard 10 Jun '13

10 Jun '13

Module: wine Branch: master Commit: 699eb85ce0128f12ca0e0cf26f755f03a6dc8e6c URL: http://source.winehq.org/git/wine.git/?a=commit;h=699eb85ce0128f12ca0e0cf26… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 10 14:24:11 2013 +0200 oleaut32: Remove redundant declaration of CLSID_PSFactoryBuffer. --- dlls/oleaut32/oleaut.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/oleaut32/oleaut.c b/dlls/oleaut32/oleaut.c index 56eea1a..5af6d18 100644 --- a/dlls/oleaut32/oleaut.c +++ b/dlls/oleaut32/oleaut.c @@ -739,7 +739,6 @@ extern HRESULT WINAPI OLEAUTPS_DllGetClassObject(REFCLSID, REFIID, LPVOID *) DEC extern BOOL WINAPI OLEAUTPS_DllMain(HINSTANCE, DWORD, LPVOID) DECLSPEC_HIDDEN; extern HRESULT WINAPI OLEAUTPS_DllRegisterServer(void) DECLSPEC_HIDDEN; extern HRESULT WINAPI OLEAUTPS_DllUnregisterServer(void) DECLSPEC_HIDDEN; -extern GUID const CLSID_PSFactoryBuffer DECLSPEC_HIDDEN; extern void _get_STDFONT_CF(LPVOID *); extern void _get_STDPIC_CF(LPVOID *);

1 0

← Newer
1
...
23
24
25
26
27
28
29
...
42
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits June 2013