October 2012 - Wine-Commits

Daniel Lehman : msvcp: Sync num_put<> put_double.
by Alexandre Julliard Oct. 19, 2012

Oct. 19, 2012

Module: wine Branch: master Commit: 9fb5f9e96535e3f51bea34b402f1bdbb6f938081 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9fb5f9e96535e3f51bea34b40… Author: Daniel Lehman <dlehman(a)esri.com> Date: Thu Oct 18 14:27:01 2012 -0700 msvcp: Sync num_put<> put_double. --- dlls/msvcp100/locale.c | 17 +++++++++++++---- dlls/msvcp60/locale.c | 17 +++++++++++++---- dlls/msvcp71/locale.c | 17 +++++++++++++---- 3 files changed, 39 insertions(+), 12 deletions(-) diff --git a/dlls/msvcp100/locale.c b/dlls/msvcp100/locale.c index 5c2d05c..2ae74e0 100644 --- a/dlls/msvcp100/locale.c +++ b/dlls/msvcp100/locale.c @@ -6071,6 +6071,11 @@ ostreambuf_iterator_char* __thiscall num_put_char_put_ulong(const num_put *this, return call_num_put_char_do_put_ulong(this, ret, dest, base, fill, v); } +static inline streamsize get_precision(const ios_base *base) +{ + return base->prec <= 0 && !(base->fmtfl & FMTFLAG_fixed) ? 6 : base->prec; +} + /* ?do_put@?$num_put(a)DV?$ostreambuf_iterator(a)DU?$char_traits(a)D@std@@@std@@@std@@MBE?AV?$ostreambuf_iterator(a)DU?$char_traits(a)D@std@@@2(a)V32@AAVios_base(a)2@DN(a)Z */ /* ?do_put@?$num_put(a)DV?$ostreambuf_iterator(a)DU?$char_traits(a)D@std@@@std@@@std@@MEBA?AV?$ostreambuf_iterator(a)DU?$char_traits(a)D@std@@@2(a)V32@AEAVios_base(a)2@DN(a)Z */ /* ?do_put@?$num_put(a)DV?$ostreambuf_iterator(a)DU?$char_traits(a)D@std@@@std@@@std@@MBE?AV?$ostreambuf_iterator(a)DU?$char_traits(a)D@std@@@2(a)V32@AAVios_base(a)2@DO(a)Z */ @@ -6088,11 +6093,13 @@ ostreambuf_iterator_char* __thiscall num_put_char_do_put_double(const num_put *t char *tmp; char fmt[8]; /* strlen("%+#.*lg")+1 */ int size; + streamsize prec; TRACE("(%p %p %p %d %lf)\n", this, ret, base, fill, v); num_put_char__Ffmt(this, fmt, '\0', base->fmtfl); - size = _scprintf(fmt, base->prec, v); + prec = get_precision(base); + size = _scprintf(fmt, prec, v); /* TODO: don't use dynamic allocation */ tmp = MSVCRT_operator_new(size*2); @@ -6100,7 +6107,7 @@ ostreambuf_iterator_char* __thiscall num_put_char_do_put_double(const num_put *t ERR("Out of memory\n"); throw_exception(EXCEPTION_BAD_ALLOC, NULL); } - num_put_char_fput(this, ret, dest, base, fill, tmp, sprintf(tmp, fmt, base->prec, v)); + num_put_char_fput(this, ret, dest, base, fill, tmp, sprintf(tmp, fmt, prec, v)); MSVCRT_operator_delete(tmp); return ret; } @@ -6907,11 +6914,13 @@ ostreambuf_iterator_wchar* __thiscall num_put_short_do_put_double(const num_put char *tmp; char fmt[8]; /* strlen("%+#.*lg")+1 */ int size; + streamsize prec; TRACE("(%p %p %p %d %lf)\n", this, ret, base, fill, v); num_put_wchar__Ffmt(this, fmt, '\0', base->fmtfl); - size = _scprintf(fmt, base->prec, v); + prec = get_precision(base); + size = _scprintf(fmt, prec, v); /* TODO: don't use dynamic allocation */ tmp = MSVCRT_operator_new(size*2); @@ -6919,7 +6928,7 @@ ostreambuf_iterator_wchar* __thiscall num_put_short_do_put_double(const num_put ERR("Out of memory\n"); throw_exception(EXCEPTION_BAD_ALLOC, NULL); } - num_put__fput(this, ret, dest, base, fill, tmp, sprintf(tmp, fmt, base->prec, v), + num_put__fput(this, ret, dest, base, fill, tmp, sprintf(tmp, fmt, prec, v), numpunct_short_use_facet(base->loc)); MSVCRT_operator_delete(tmp); return ret; diff --git a/dlls/msvcp60/locale.c b/dlls/msvcp60/locale.c index 2fc9bd0..72b994b 100644 --- a/dlls/msvcp60/locale.c +++ b/dlls/msvcp60/locale.c @@ -6136,6 +6136,11 @@ ostreambuf_iterator_char* __thiscall num_put_char_put_ulong(const num_put *this, return call_num_put_char_do_put_ulong(this, ret, dest, base, fill, v); } +static inline streamsize get_precision(const ios_base *base) +{ + return base->prec <= 0 && !(base->fmtfl & FMTFLAG_fixed) ? 6 : base->prec; +} + /* ?do_put@?$num_put(a)DV?$ostreambuf_iterator(a)DU?$char_traits(a)D@std@@@std@@@std@@MBE?AV?$ostreambuf_iterator(a)DU?$char_traits(a)D@std@@@2(a)V32@AAVios_base(a)2@DN(a)Z */ /* ?do_put@?$num_put(a)DV?$ostreambuf_iterator(a)DU?$char_traits(a)D@std@@@std@@@std@@MEBA?AV?$ostreambuf_iterator(a)DU?$char_traits(a)D@std@@@2(a)V32@AEAVios_base(a)2@DN(a)Z */ /* ?do_put@?$num_put(a)DV?$ostreambuf_iterator(a)DU?$char_traits(a)D@std@@@std@@@std@@MBE?AV?$ostreambuf_iterator(a)DU?$char_traits(a)D@std@@@2(a)V32@AAVios_base(a)2@DO(a)Z */ @@ -6153,11 +6158,13 @@ ostreambuf_iterator_char* __thiscall num_put_char_do_put_double(const num_put *t char *tmp; char fmt[8]; /* strlen("%+#.*lg")+1 */ int size; + streamsize prec; TRACE("(%p %p %p %d %lf)\n", this, ret, base, fill, v); num_put_char__Ffmt(this, fmt, '\0', base->fmtfl); - size = _scprintf(fmt, base->prec, v); + prec = get_precision(base); + size = _scprintf(fmt, prec, v); /* TODO: don't use dynamic allocation */ tmp = MSVCRT_operator_new(size*2); @@ -6165,7 +6172,7 @@ ostreambuf_iterator_char* __thiscall num_put_char_do_put_double(const num_put *t ERR("Out of memory\n"); throw_exception(EXCEPTION_BAD_ALLOC, NULL); } - num_put_char_fput(this, ret, dest, base, fill, tmp, sprintf(tmp, fmt, base->prec, v)); + num_put_char_fput(this, ret, dest, base, fill, tmp, sprintf(tmp, fmt, prec, v)); MSVCRT_operator_delete(tmp); return ret; } @@ -6928,11 +6935,13 @@ ostreambuf_iterator_wchar* __thiscall num_put_short_do_put_double(const num_put char *tmp; char fmt[8]; /* strlen("%+#.*lg")+1 */ int size; + streamsize prec; TRACE("(%p %p %p %d %lf)\n", this, ret, base, fill, v); num_put_wchar__Ffmt(this, fmt, '\0', base->fmtfl); - size = _scprintf(fmt, base->prec, v); + prec = get_precision(base); + size = _scprintf(fmt, prec, v); /* TODO: don't use dynamic allocation */ tmp = MSVCRT_operator_new(size*2); @@ -6940,7 +6949,7 @@ ostreambuf_iterator_wchar* __thiscall num_put_short_do_put_double(const num_put ERR("Out of memory\n"); throw_exception(EXCEPTION_BAD_ALLOC, NULL); } - num_put__fput(this, ret, dest, base, fill, tmp, sprintf(tmp, fmt, base->prec, v), + num_put__fput(this, ret, dest, base, fill, tmp, sprintf(tmp, fmt, prec, v), numpunct_short_use_facet(base->loc)); MSVCRT_operator_delete(tmp); return ret; diff --git a/dlls/msvcp71/locale.c b/dlls/msvcp71/locale.c index 658cdb8..01abd55 100644 --- a/dlls/msvcp71/locale.c +++ b/dlls/msvcp71/locale.c @@ -6465,6 +6465,11 @@ ostreambuf_iterator_char* __thiscall num_put_char_put_ulong(const num_put *this, return call_num_put_char_do_put_ulong(this, ret, dest, base, fill, v); } +static inline streamsize get_precision(const ios_base *base) +{ + return base->prec <= 0 && !(base->fmtfl & FMTFLAG_fixed) ? 6 : base->prec; +} + /* ?do_put@?$num_put(a)DV?$ostreambuf_iterator(a)DU?$char_traits(a)D@std@@@std@@@std@@MBE?AV?$ostreambuf_iterator(a)DU?$char_traits(a)D@std@@@2(a)V32@AAVios_base(a)2@DN(a)Z */ /* ?do_put@?$num_put(a)DV?$ostreambuf_iterator(a)DU?$char_traits(a)D@std@@@std@@@std@@MEBA?AV?$ostreambuf_iterator(a)DU?$char_traits(a)D@std@@@2(a)V32@AEAVios_base(a)2@DN(a)Z */ /* ?do_put@?$num_put(a)DV?$ostreambuf_iterator(a)DU?$char_traits(a)D@std@@@std@@@std@@MBE?AV?$ostreambuf_iterator(a)DU?$char_traits(a)D@std@@@2(a)V32@AAVios_base(a)2@DO(a)Z */ @@ -6482,11 +6487,13 @@ ostreambuf_iterator_char* __thiscall num_put_char_do_put_double(const num_put *t char *tmp; char fmt[8]; /* strlen("%+#.*lg")+1 */ int size; + streamsize prec; TRACE("(%p %p %p %d %lf)\n", this, ret, base, fill, v); num_put_char__Ffmt(this, fmt, '\0', base->fmtfl); - size = _scprintf(fmt, base->prec, v); + prec = get_precision(base); + size = _scprintf(fmt, prec, v); /* TODO: don't use dynamic allocation */ tmp = MSVCRT_operator_new(size*2); @@ -6494,7 +6501,7 @@ ostreambuf_iterator_char* __thiscall num_put_char_do_put_double(const num_put *t ERR("Out of memory\n"); throw_exception(EXCEPTION_BAD_ALLOC, NULL); } - num_put_char_fput(this, ret, dest, base, fill, tmp, sprintf(tmp, fmt, base->prec, v)); + num_put_char_fput(this, ret, dest, base, fill, tmp, sprintf(tmp, fmt, prec, v)); MSVCRT_operator_delete(tmp); return ret; } @@ -7301,11 +7308,13 @@ ostreambuf_iterator_wchar* __thiscall num_put_short_do_put_double(const num_put char *tmp; char fmt[8]; /* strlen("%+#.*lg")+1 */ int size; + streamsize prec; TRACE("(%p %p %p %d %lf)\n", this, ret, base, fill, v); num_put_wchar__Ffmt(this, fmt, '\0', base->fmtfl); - size = _scprintf(fmt, base->prec, v); + prec = get_precision(base); + size = _scprintf(fmt, prec, v); /* TODO: don't use dynamic allocation */ tmp = MSVCRT_operator_new(size*2); @@ -7313,7 +7322,7 @@ ostreambuf_iterator_wchar* __thiscall num_put_short_do_put_double(const num_put ERR("Out of memory\n"); throw_exception(EXCEPTION_BAD_ALLOC, NULL); } - num_put__fput(this, ret, dest, base, fill, tmp, sprintf(tmp, fmt, base->prec, v), + num_put__fput(this, ret, dest, base, fill, tmp, sprintf(tmp, fmt, prec, v), numpunct_short_use_facet(base->loc)); MSVCRT_operator_delete(tmp); return ret;

1 0

Qian Hong : gdi32/tests: Fixed broken bitmap font metrics test on CJK locales.
by Alexandre Julliard Oct. 19, 2012

Oct. 19, 2012

Module: wine Branch: master Commit: ec9166b1ac4bb3e3f2a2df1f82e95cfa14ddb272 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec9166b1ac4bb3e3f2a2df1f8… Author: Qian Hong <fracting(a)gmail.com> Date: Fri Oct 19 02:11:04 2012 +0800 gdi32/tests: Fixed broken bitmap font metrics test on CJK locales. --- dlls/gdi32/tests/font.c | 11 ++++++++++- 1 files changed, 10 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 3961578..fef38e9 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -668,6 +668,12 @@ static INT CALLBACK find_font_proc(const LOGFONT *elf, const TEXTMETRIC *ntm, DW return 1; /* continue enumeration */ } +static BOOL is_CJK(void) +{ + WORD system_lang_id = PRIMARYLANGID(GetSystemDefaultLangID()); + return (system_lang_id == LANG_CHINESE || system_lang_id == LANG_JAPANESE || system_lang_id == LANG_KOREAN); +} + #define FH_SCALE 0x80000000 static void test_bitmap_font_metrics(void) { @@ -933,7 +939,10 @@ static void test_bitmap_font_metrics(void) SetLastError(0xdeadbeef); ret = GetTextCharset(hdc); - ok(ret == expected_cs, "got charset %d, expected %d\n", ret, expected_cs); + if (is_CJK() && lf.lfCharSet == ANSI_CHARSET) + ok(ret == ANSI_CHARSET, "got charset %d, expected ANSI_CHARSETd\n", ret); + else + ok(ret == expected_cs, "got charset %d, expected %d\n", ret, expected_cs); trace("created %s, height %d charset %x dpi %d\n", face_name, tm.tmHeight, tm.tmCharSet, tm.tmDigitizedAspectX); trace("expected %s, height %d scaled_hight %d, dpi %d\n", fd[i].face_name, height, fd[i].scaled_height, fd[i].dpi);

1 0

Henri Verbeet : user32: Implement GetRawInputDeviceInfoW().
by Alexandre Julliard Oct. 19, 2012

Oct. 19, 2012

Module: wine Branch: master Commit: 30f1a611776f5bd94c34c440bd4e6bfd202b3b4b URL: http://source.winehq.org/git/wine.git/?a=commit;h=30f1a611776f5bd94c34c440b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Oct 18 22:12:53 2012 +0200 user32: Implement GetRawInputDeviceInfoW(). --- dlls/user32/input.c | 68 ++++++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 65 insertions(+), 3 deletions(-) diff --git a/dlls/user32/input.c b/dlls/user32/input.c index 76c05df..9fdc124 100644 --- a/dlls/user32/input.c +++ b/dlls/user32/input.c @@ -617,11 +617,73 @@ UINT WINAPI GetRawInputDeviceInfoA(HANDLE hDevice, UINT uiCommand, LPVOID pData, /****************************************************************** * GetRawInputDeviceInfoW (USER32.@) */ -UINT WINAPI GetRawInputDeviceInfoW(HANDLE hDevice, UINT uiCommand, LPVOID pData, PUINT pcbSize) +UINT WINAPI GetRawInputDeviceInfoW(HANDLE device, UINT command, void *data, UINT *data_size) { - FIXME("(hDevice=%p, uiCommand=%d, pData=%p, pcbSize=%p) stub!\n", hDevice, uiCommand, pData, pcbSize); + /* FIXME: Most of this is made up. */ + static const WCHAR keyboard_name[] = {'\\','\\','?','\\','W','I','N','E','_','K','E','Y','B','O','A','R','D',0}; + static const WCHAR mouse_name[] = {'\\','\\','?','\\','W','I','N','E','_','M','O','U','S','E',0}; + static const RID_DEVICE_INFO_KEYBOARD keyboard_info = {0, 0, 1, 12, 3, 101}; + static const RID_DEVICE_INFO_MOUSE mouse_info = {1, 5, 0, FALSE}; + const WCHAR *name = NULL; + RID_DEVICE_INFO *info; + UINT s; - return 0; + TRACE("device %p, command %u, data %p, data_size %p.\n", device, command, data, data_size); + + if (!data_size || (device != WINE_MOUSE_HANDLE && device != WINE_KEYBOARD_HANDLE)) return ~0U; + + switch (command) + { + case RIDI_DEVICENAME: + if (device == WINE_MOUSE_HANDLE) + { + s = sizeof(mouse_name); + name = mouse_name; + } + else + { + s = sizeof(keyboard_name); + name = keyboard_name; + } + break; + case RIDI_DEVICEINFO: + s = sizeof(*info); + break; + default: + return ~0U; + } + + if (!data) + { + *data_size = s; + return 0; + } + + if (*data_size < s) + { + *data_size = s; + return ~0U; + } + + if (command == RIDI_DEVICENAME) + { + memcpy(data, name, s); + return s; + } + + info = data; + info->cbSize = sizeof(*info); + if (device == WINE_MOUSE_HANDLE) + { + info->dwType = RIM_TYPEMOUSE; + info->u.mouse = mouse_info; + } + else + { + info->dwType = RIM_TYPEKEYBOARD; + info->u.keyboard = keyboard_info; + } + return s; }

1 0

Maarten Lankhorst : ntdll: Set SO_PASSCRED before connecting to eliminate a race condition in obtaining server_pid .
by Alexandre Julliard Oct. 18, 2012

Oct. 18, 2012

Module: wine Branch: master Commit: 7457f37e4a69ce7c778c41559e0d39246b12d812 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7457f37e4a69ce7c778c41559… Author: Maarten Lankhorst <maarten.lankhorst(a)canonical.com> Date: Tue Oct 16 14:11:45 2012 +0200 ntdll: Set SO_PASSCRED before connecting to eliminate a race condition in obtaining server_pid. --- dlls/kernel32/process.c | 7 +++++++ dlls/ntdll/server.c | 18 +++++++++++------- 2 files changed, 18 insertions(+), 7 deletions(-) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 1b10f9e..3a88aaa 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -1919,6 +1919,13 @@ static BOOL create_process( HANDLE hFile, LPCWSTR filename, LPWSTR cmd_line, LPW SetLastError( ERROR_TOO_MANY_OPEN_FILES ); return FALSE; } +#ifdef SO_PASSCRED + else + { + int enable = 1; + setsockopt( socketfd[0], SOL_SOCKET, SO_PASSCRED, &enable, sizeof(enable) ); + } +#endif if (exec_only) /* things are much simpler in this case */ { diff --git a/dlls/ntdll/server.c b/dlls/ntdll/server.c index 218c6eb..2fe7877 100644 --- a/dlls/ntdll/server.c +++ b/dlls/ntdll/server.c @@ -881,6 +881,13 @@ static int server_connect(void) addr.sun_len = slen; #endif if ((s = socket( AF_UNIX, SOCK_STREAM, 0 )) == -1) fatal_perror( "socket" ); +#ifdef SO_PASSCRED + else + { + int enable = 1; + setsockopt( s, SOL_SOCKET, SO_PASSCRED, &enable, sizeof(enable) ); + } +#endif if (connect( s, (struct sockaddr *)&addr, slen ) != -1) { /* switch back to the starting directory */ @@ -1004,18 +1011,15 @@ void server_init_process(void) pthread_sigmask( SIG_BLOCK, &server_block_set, NULL ); /* receive the first thread request fd on the main socket */ + ntdll_get_thread_data()->request_fd = receive_fd( &version ); + #ifdef SO_PASSCRED - if (server_pid == -1) + /* now that we hopefully received the server_pid, disable SO_PASSCRED */ { - int enable = 1; - setsockopt( fd_socket, SOL_SOCKET, SO_PASSCRED, &enable, sizeof(enable) ); - ntdll_get_thread_data()->request_fd = receive_fd( &version ); - enable = 0; + int enable = 0; setsockopt( fd_socket, SOL_SOCKET, SO_PASSCRED, &enable, sizeof(enable) ); } - else #endif - ntdll_get_thread_data()->request_fd = receive_fd( &version ); if (version != SERVER_PROTOCOL_VERSION) server_protocol_error( "version mismatch %d/%d.\n"

1 0

Maarten Lankhorst : mmdevapi: Fix a broken test.
by Alexandre Julliard Oct. 18, 2012

Oct. 18, 2012

Module: wine Branch: master Commit: d814eca3ba9a294a74b77b9423067775150f8af7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d814eca3ba9a294a74b77b942… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Tue Oct 16 14:08:27 2012 +0200 mmdevapi: Fix a broken test. --- dlls/mmdevapi/tests/render.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/mmdevapi/tests/render.c b/dlls/mmdevapi/tests/render.c index 940d111..9d9478a 100644 --- a/dlls/mmdevapi/tests/render.c +++ b/dlls/mmdevapi/tests/render.c @@ -2094,6 +2094,8 @@ static void test_worst_case(void) hr = IAudioRenderClient_ReleaseBuffer(arc, fragment, AUDCLNT_BUFFERFLAGS_SILENT); ok(hr == S_OK, "ReleaseBuffer failed: %08x\n", hr); + if(hr == S_OK) + sum += fragment; } hr = IAudioClient_Start(ac);

1 0

Rico Schüller : d3dx9: Fix calculation when in and out overlap in D3DXSHRotateZ().
by Alexandre Julliard Oct. 18, 2012

Oct. 18, 2012

Module: wine Branch: master Commit: e74a99b71a357d4afa25f342751e05644aa7857b URL: http://source.winehq.org/git/wine.git/?a=commit;h=e74a99b71a357d4afa25f3427… Author: Rico Schüller <kgbricola(a)web.de> Date: Thu Oct 18 11:33:29 2012 +0200 d3dx9: Fix calculation when in and out overlap in D3DXSHRotateZ(). --- dlls/d3dx9_36/math.c | 88 +++++++++++++++++++------------------------------- 1 files changed, 33 insertions(+), 55 deletions(-) diff --git a/dlls/d3dx9_36/math.c b/dlls/d3dx9_36/math.c index 73bca45..5342bc9 100644 --- a/dlls/d3dx9_36/math.c +++ b/dlls/d3dx9_36/math.c @@ -2811,70 +2811,48 @@ FLOAT* WINAPI D3DXSHRotate(FLOAT *out, UINT order, CONST D3DXMATRIX *matrix, CON return out; } -FLOAT * WINAPI D3DXSHRotateZ(FLOAT *out, UINT order, FLOAT angle, CONST FLOAT *in) +FLOAT * WINAPI D3DXSHRotateZ(FLOAT *out, UINT order, FLOAT angle, const FLOAT *in) { - FLOAT c1a, c2a, c3a, c4a, c5a, s1a, s2a, s3a, s4a, s5a; + UINT i, sum = 0; + FLOAT c[5], s[5]; TRACE("out %p, order %u, angle %f, in %p\n", out, order, angle, in); - c1a = cosf(angle); - s1a = sinf(angle); + order = min(max(order, D3DXSH_MINORDER), D3DXSH_MAXORDER); + out[0] = in[0]; - out[1] = c1a * in[1] + s1a * in[3]; - out[2] = in[2]; - out[3] = c1a * in[3] - s1a * in[1]; - if (order <= D3DXSH_MINORDER) - return out; - c2a = cosf(2.0f * angle); - s2a = sinf(2.0f * angle); - out[4] = c2a * in[4] + s2a * in[8]; - out[5] = c1a * in[5] + s1a * in[7]; - out[6] = in[6]; - out[7] = c1a * in[7] - s1a * in[5]; - out[8] = c2a * in[8] - s2a * in[4]; - if (order == 3) - return out; + for (i = 1; i < order; i++) + { + UINT j; - c3a = cosf(3.0f * angle); - s3a = sinf(3.0f * angle); - out[9] = c3a * in[9] + s3a * in[15]; - out[10] = c2a * in[10] + s2a * in[14]; - out[11] = c1a * in[11] + s1a * in[13]; - out[12] = in[12]; - out[13] = c1a * in[13] - s1a * in[11]; - out[14] = c2a * in[14] - s2a * in[10]; - out[15] = c3a * in[15] - s3a * in[9]; - if (order == 4) - return out; + c[i - 1] = cosf(i * angle); + s[i - 1] = sinf(i * angle); + sum += i * 2; - c4a = cosf(4.0f * angle); - s4a = sinf(4.0f * angle); - out[16] = c4a * in[16] + s4a * in[24]; - out[17] = c3a * in[17] + s3a * in[23]; - out[18] = c2a * in[18] + s2a * in[22]; - out[19] = c1a * in[19] + s1a * in[21]; - out[20] = in[20]; - out[21] = c1a * in[21] - s1a * in[19]; - out[22] = c2a * in[22] - s2a * in[18]; - out[23] = c3a * in[23] - s3a * in[17]; - out[24] = c4a * in[24] - s4a * in[16]; - if (order == 5) - return out; + out[sum - i] = c[i - 1] * in[sum - i]; + out[sum - i] += s[i - 1] * in[sum + i]; + for (j = i - 1; j > 0; j--) + { + out[sum - j] = 0.0f; + out[sum - j] = c[j - 1] * in[sum - j]; + out[sum - j] += s[j - 1] * in[sum + j]; + } + + if (in == out) + out[sum] = 0.0f; + else + out[sum] = in[sum]; - c5a = cosf(5.0f * angle); - s5a = sinf(5.0f * angle); - out[25] = c5a * in[25] + s5a * in[35]; - out[26] = c4a * in[26] + s4a * in[34]; - out[27] = c3a * in[27] + s3a * in[33]; - out[28] = c2a * in[28] + s2a * in[32]; - out[29] = c1a * in[29] + s1a * in[31]; - out[30] = in[30]; - out[31] = c1a * in[31] - s1a * in[29]; - out[32] = c2a * in[32] - s2a * in[28]; - out[33] = c3a * in[33] - s3a * in[27]; - out[34] = c4a * in[34] - s4a * in[26]; - out[35] = c5a * in[35] - s5a * in[25]; + for (j = 1; j < i; j++) + { + out[sum + j] = 0.0f; + out[sum + j] = -s[j - 1] * in[sum - j]; + out[sum + j] += c[j - 1] * in[sum + j]; + } + out[sum + i] = -s[i - 1] * in[sum - i]; + out[sum + i] += c[i - 1] * in[sum + i]; + } return out; }

1 0

Daniel Lehman : msvcp: Free facet and _Locimp in Locimp dtor.
by Alexandre Julliard Oct. 18, 2012

Oct. 18, 2012

Module: wine Branch: master Commit: 415d3a2425a037b1ec458106cff1efd3f2e2c857 URL: http://source.winehq.org/git/wine.git/?a=commit;h=415d3a2425a037b1ec458106c… Author: Daniel Lehman <dlehman(a)esri.com> Date: Wed Oct 17 12:52:50 2012 -0700 msvcp: Free facet and _Locimp in Locimp dtor. --- dlls/msvcp100/locale.c | 22 ++++++++++++---------- dlls/msvcp60/locale.c | 22 ++++++++++++---------- dlls/msvcp71/locale.c | 22 ++++++++++++---------- dlls/msvcp90/locale.c | 23 +++++++++++++---------- 4 files changed, 49 insertions(+), 40 deletions(-) diff --git a/dlls/msvcp100/locale.c b/dlls/msvcp100/locale.c index 1d03964..5c2d05c 100644 --- a/dlls/msvcp100/locale.c +++ b/dlls/msvcp100/locale.c @@ -7230,17 +7230,17 @@ locale__Locimp* __cdecl locale__Locimp__Locimp_ctor(locale__Locimp *this, const DEFINE_THISCALL_WRAPPER(locale__Locimp_dtor, 4) void __thiscall locale__Locimp_dtor(locale__Locimp *this) { + MSVCP_size_t i; + TRACE("(%p)\n", this); - if(locale_facet__Decref(&this->facet)) { - MSVCP_size_t i; - for(i=0; i<this->facet_cnt; i++) - if(this->facetvec[i] && locale_facet__Decref(this->facetvec[i])) - call_locale_facet_vector_dtor(this->facetvec[i], 0); + locale_facet_dtor(&this->facet); + for(i=0; i<this->facet_cnt; i++) + if(this->facetvec[i] && locale_facet__Decref(this->facetvec[i])) + call_locale_facet_vector_dtor(this->facetvec[i], 1); - MSVCRT_operator_delete(this->facetvec); - _Yarn_char_dtor(&this->name); - } + MSVCRT_operator_delete(this->facetvec); + _Yarn_char_dtor(&this->name); } /* ?_Locimp_dtor(a)_Locimp@locale(a)std@@CAXPAV123@@Z */ @@ -7302,7 +7302,7 @@ void __cdecl locale__Locimp__Locimp_Addfac(locale__Locimp *locimp, locale_facet } if(locimp->facetvec[id] && locale_facet__Decref(locimp->facetvec[id])) - call_locale_facet_vector_dtor(locimp->facetvec[id], 0); + call_locale_facet_vector_dtor(locimp->facetvec[id], 1); locimp->facetvec[id] = facet; if(facet) @@ -7678,8 +7678,10 @@ locale* locale_ctor(locale *this) void locale_dtor(locale *this) { TRACE("(%p)\n", this); - if(this->ptr) + if(this->ptr && locale_facet__Decref(&this->ptr->facet)) { locale__Locimp_dtor(this->ptr); + MSVCRT_operator_delete(this->ptr); + } } /* ??4locale(a)std@@QAEAAV01(a)ABV01@@Z */ diff --git a/dlls/msvcp60/locale.c b/dlls/msvcp60/locale.c index 54e717c..2fc9bd0 100644 --- a/dlls/msvcp60/locale.c +++ b/dlls/msvcp60/locale.c @@ -7240,17 +7240,17 @@ static locale__Locimp* locale__Locimp_copy_ctor(locale__Locimp *this, const loca /* ??1_Locimp(a)locale@std@@MEAA(a)XZ */ static void locale__Locimp_dtor(locale__Locimp *this) { + MSVCP_size_t i; + TRACE("(%p)\n", this); - if(locale_facet__Decref(&this->facet)) { - MSVCP_size_t i; - for(i=0; i<this->facet_cnt; i++) - if(this->facetvec[i] && locale_facet__Decref(this->facetvec[i])) - call_locale_facet_vector_dtor(this->facetvec[i], 0); + locale_facet_dtor(&this->facet); + for(i=0; i<this->facet_cnt; i++) + if(this->facetvec[i] && locale_facet__Decref(this->facetvec[i])) + call_locale_facet_vector_dtor(this->facetvec[i], 1); - MSVCRT_operator_delete(this->facetvec); - basic_string_char_dtor(&this->name); - } + MSVCRT_operator_delete(this->facetvec); + basic_string_char_dtor(&this->name); } DEFINE_THISCALL_WRAPPER(locale__Locimp_vector_dtor, 8) @@ -7305,7 +7305,7 @@ static void locale__Locimp__Locimp_Addfac(locale__Locimp *locimp, locale_facet * } if(locimp->facetvec[id] && locale_facet__Decref(locimp->facetvec[id])) - call_locale_facet_vector_dtor(locimp->facetvec[id], 0); + call_locale_facet_vector_dtor(locimp->facetvec[id], 1); locimp->facetvec[id] = facet; if(facet) @@ -7758,8 +7758,10 @@ DEFINE_THISCALL_WRAPPER(locale_dtor, 4) void __thiscall locale_dtor(locale *this) { TRACE("(%p)\n", this); - if(this->ptr) + if(this->ptr && locale_facet__Decref(&this->ptr->facet)) { locale__Locimp_dtor(this->ptr); + MSVCRT_operator_delete(this); + } } /* ??4locale(a)std@@QAEAAV01(a)ABV01@@Z */ diff --git a/dlls/msvcp71/locale.c b/dlls/msvcp71/locale.c index 75570c8..658cdb8 100644 --- a/dlls/msvcp71/locale.c +++ b/dlls/msvcp71/locale.c @@ -7614,17 +7614,17 @@ locale__Locimp* __thiscall locale__Locimp_copy_ctor(locale__Locimp *this, const /* ??1_Locimp(a)locale@std@@MEAA(a)XZ */ static void locale__Locimp_dtor(locale__Locimp *this) { + MSVCP_size_t i; + TRACE("(%p)\n", this); - if(locale_facet__Decref(&this->facet)) { - MSVCP_size_t i; - for(i=0; i<this->facet_cnt; i++) - if(this->facetvec[i] && locale_facet__Decref(this->facetvec[i])) - call_locale_facet_vector_dtor(this->facetvec[i], 0); + locale_facet_dtor(&this->facet); + for(i=0; i<this->facet_cnt; i++) + if(this->facetvec[i] && locale_facet__Decref(this->facetvec[i])) + call_locale_facet_vector_dtor(this->facetvec[i], 1); - MSVCRT_operator_delete(this->facetvec); - MSVCP_basic_string_char_dtor(&this->name); - } + MSVCRT_operator_delete(this->facetvec); + MSVCP_basic_string_char_dtor(&this->name); } DEFINE_THISCALL_WRAPPER(locale__Locimp_vector_dtor, 8) @@ -7679,7 +7679,7 @@ static void locale__Locimp__Locimp_Addfac(locale__Locimp *locimp, locale_facet * } if(locimp->facetvec[id] && locale_facet__Decref(locimp->facetvec[id])) - call_locale_facet_vector_dtor(locimp->facetvec[id], 0); + call_locale_facet_vector_dtor(locimp->facetvec[id], 1); locimp->facetvec[id] = facet; if(facet) @@ -8133,8 +8133,10 @@ DEFINE_THISCALL_WRAPPER(locale_dtor, 4) void __thiscall locale_dtor(locale *this) { TRACE("(%p)\n", this); - if(this->ptr) + if(this->ptr && locale_facet__Decref(&this->ptr->facet)) { locale__Locimp_dtor(this->ptr); + MSVCRT_operator_delete(this); + } } /* ??4locale(a)std@@QAEAAV01(a)ABV01@@Z */ diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index 1725900..c581d9c 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -7846,17 +7846,17 @@ locale__Locimp* __cdecl locale__Locimp__Locimp_ctor(locale__Locimp *this, const DEFINE_THISCALL_WRAPPER(locale__Locimp_dtor, 4) void __thiscall locale__Locimp_dtor(locale__Locimp *this) { + MSVCP_size_t i; + TRACE("(%p)\n", this); - if(locale_facet__Decref(&this->facet)) { - MSVCP_size_t i; - for(i=0; i<this->facet_cnt; i++) - if(this->facetvec[i] && locale_facet__Decref(this->facetvec[i])) - call_locale_facet_vector_dtor(this->facetvec[i], 0); + locale_facet_dtor(&this->facet); + for(i=0; i<this->facet_cnt; i++) + if(this->facetvec[i] && locale_facet__Decref(this->facetvec[i])) + call_locale_facet_vector_dtor(this->facetvec[i], 1); - MSVCRT_operator_delete(this->facetvec); - MSVCP_basic_string_char_dtor(&this->name); - } + MSVCRT_operator_delete(this->facetvec); + MSVCP_basic_string_char_dtor(&this->name); } /* ?_Locimp_dtor(a)_Locimp@locale(a)std@@CAXPAV123@@Z */ @@ -7918,7 +7918,7 @@ void __cdecl locale__Locimp__Locimp_Addfac(locale__Locimp *locimp, locale_facet } if(locimp->facetvec[id] && locale_facet__Decref(locimp->facetvec[id])) - call_locale_facet_vector_dtor(locimp->facetvec[id], 0); + call_locale_facet_vector_dtor(locimp->facetvec[id], 1); locimp->facetvec[id] = facet; if(facet) @@ -8380,8 +8380,11 @@ DEFINE_THISCALL_WRAPPER(locale_dtor, 4) void __thiscall locale_dtor(locale *this) { TRACE("(%p)\n", this); - if(this->ptr) + if(this->ptr && locale_facet__Decref(&this->ptr->facet)) + { locale__Locimp_dtor(this->ptr); + MSVCRT_operator_delete(this->ptr); + } } /* ??4locale(a)std@@QAEAAV01(a)ABV01@@Z */

1 0

Huw Davies : fonts: 10-pixel strikes for Tahoma.
by Alexandre Julliard Oct. 18, 2012

Oct. 18, 2012

Module: wine Branch: master Commit: 679385fd1cd2c405ac0d3745863d827293a3b445 URL: http://source.winehq.org/git/wine.git/?a=commit;h=679385fd1cd2c405ac0d37458… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Oct 18 15:40:25 2012 +0100 fonts: 10-pixel strikes for Tahoma. --- fonts/tahoma.sfd | 902 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ fonts/tahoma.ttf | Bin 94740 -> 101036 bytes 2 files changed, 902 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=679385fd1cd2c405ac0d3…

1 0

Hans Leidekker : credui: Don' t show a dialog if existing credentials can be found.
by Alexandre Julliard Oct. 18, 2012

Oct. 18, 2012

Module: wine Branch: master Commit: 9d95d33118dceca36252745302485d7268934c33 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d95d33118dceca3625274530… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Oct 18 14:16:52 2012 +0200 credui: Don't show a dialog if existing credentials can be found. --- dlls/credui/credui_main.c | 37 +++++++++++++++++++++++++++++++++++++ 1 files changed, 37 insertions(+), 0 deletions(-) diff --git a/dlls/credui/credui_main.c b/dlls/credui/credui_main.c index b470928..6e8d452 100644 --- a/dlls/credui/credui_main.c +++ b/dlls/credui/credui_main.c @@ -548,6 +548,38 @@ static INT_PTR CALLBACK CredDialogProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, } } +static BOOL find_existing_credential(const WCHAR *target, WCHAR *username, ULONG len_username, + WCHAR *password, ULONG len_password) +{ + DWORD count, i; + CREDENTIALW **credentials; + + if (!CredEnumerateW(target, 0, &count, &credentials)) return FALSE; + for (i = 0; i < count; i++) + { + if (credentials[i]->Type != CRED_TYPE_DOMAIN_PASSWORD) + { + FIXME("no support for type %u credentials\n", credentials[i]->Type); + continue; + } + if ((!*username || !strcmpW(username, credentials[i]->UserName)) && + strlenW(credentials[i]->UserName) < len_username && + credentials[i]->CredentialBlobSize / sizeof(WCHAR) < len_password) + { + TRACE("found existing credential for %s\n", debugstr_w(credentials[i]->UserName)); + + strcpyW(username, credentials[i]->UserName); + memcpy(password, credentials[i]->CredentialBlob, credentials[i]->CredentialBlobSize); + password[credentials[i]->CredentialBlobSize / sizeof(WCHAR)] = 0; + + CredFree(credentials); + return TRUE; + } + } + CredFree(credentials); + return FALSE; +} + /****************************************************************************** * CredUIPromptForCredentialsW [CREDUI.@] */ @@ -578,6 +610,11 @@ DWORD WINAPI CredUIPromptForCredentialsW(PCREDUI_INFOW pUIInfo, if ((dwFlags & CREDUI_FLAGS_SHOW_SAVE_CHECK_BOX) && !pfSave) return ERROR_INVALID_PARAMETER; + if (!(dwFlags & CREDUI_FLAGS_ALWAYS_SHOW_UI) && + !(dwFlags & CREDUI_FLAGS_INCORRECT_PASSWORD) && + find_existing_credential(pszTargetName, pszUsername, ulUsernameMaxChars, pszPassword, ulPasswordMaxChars)) + return ERROR_SUCCESS; + params.pszTargetName = pszTargetName; if (pUIInfo) {

1 0

Henri Verbeet : wined3d: Implement WINED3DSIH_UDIV in the GLSL shader backend.
by Alexandre Julliard Oct. 18, 2012

Oct. 18, 2012

Module: wine Branch: master Commit: 5ca5409b8165e6d8a0914bce969d5044e51ed8de URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ca5409b8165e6d8a0914bce9… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Oct 17 23:08:01 2012 +0200 wined3d: Implement WINED3DSIH_UDIV in the GLSL shader backend. --- dlls/wined3d/glsl_shader.c | 46 +++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 45 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index b8218ae..7269212 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -2305,6 +2305,50 @@ static void shader_glsl_imul(const struct wined3d_shader_instruction *ins) } } +static void shader_glsl_udiv(const struct wined3d_shader_instruction *ins) +{ + struct wined3d_shader_buffer *buffer = ins->ctx->buffer; + struct glsl_src_param src0_param, src1_param; + DWORD write_mask; + + if (ins->dst[0].reg.type != WINED3DSPR_NULL) + { + + if (ins->dst[1].reg.type != WINED3DSPR_NULL) + { + char dst_mask[6]; + + write_mask = shader_glsl_get_write_mask(&ins->dst[0], dst_mask); + shader_glsl_add_src_param(ins, &ins->src[0], write_mask, &src0_param); + shader_glsl_add_src_param(ins, &ins->src[1], write_mask, &src1_param); + shader_addline(buffer, "tmp0%s = %s / %s;\n", + dst_mask, src0_param.param_str, src1_param.param_str); + + write_mask = shader_glsl_append_dst_ext(buffer, ins, &ins->dst[1]); + shader_glsl_add_src_param(ins, &ins->src[0], write_mask, &src0_param); + shader_glsl_add_src_param(ins, &ins->src[1], write_mask, &src1_param); + shader_addline(buffer, "%s %% %s));\n", src0_param.param_str, src1_param.param_str); + + shader_glsl_append_dst_ext(buffer, ins, &ins->dst[0]); + shader_addline(buffer, "tmp0%s);\n", dst_mask); + } + else + { + write_mask = shader_glsl_append_dst_ext(buffer, ins, &ins->dst[0]); + shader_glsl_add_src_param(ins, &ins->src[0], write_mask, &src0_param); + shader_glsl_add_src_param(ins, &ins->src[1], write_mask, &src1_param); + shader_addline(buffer, "%s / %s);\n", src0_param.param_str, src1_param.param_str); + } + } + else if (ins->dst[1].reg.type != WINED3DSPR_NULL) + { + write_mask = shader_glsl_append_dst_ext(buffer, ins, &ins->dst[1]); + shader_glsl_add_src_param(ins, &ins->src[0], write_mask, &src0_param); + shader_glsl_add_src_param(ins, &ins->src[1], write_mask, &src1_param); + shader_addline(buffer, "%s %% %s);\n", src0_param.param_str, src1_param.param_str); + } +} + /* Process the WINED3DSIO_MOV opcode using GLSL (dst = src) */ static void shader_glsl_mov(const struct wined3d_shader_instruction *ins) { @@ -5421,7 +5465,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_TEXREG2AR */ shader_glsl_texreg2ar, /* WINED3DSIH_TEXREG2GB */ shader_glsl_texreg2gb, /* WINED3DSIH_TEXREG2RGB */ shader_glsl_texreg2rgb, - /* WINED3DSIH_UDIV */ NULL, + /* WINED3DSIH_UDIV */ shader_glsl_udiv, /* WINED3DSIH_USHR */ NULL, /* WINED3DSIH_UTOF */ shader_glsl_to_float, /* WINED3DSIH_XOR */ shader_glsl_binop,

1 0