wine-commits October 2012

wine-commits@winehq.org

2 participants
960 discussions

Alexandre Julliard : gdi32/tests: Avoid deleting invalid objects.
by Alexandre Julliard 19 Oct '12

19 Oct '12

Module: wine Branch: master Commit: 446bff7897a44d498b5c4025d8232cc436e3de80 URL: http://source.winehq.org/git/wine.git/?a=commit;h=446bff7897a44d498b5c4025d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 18 20:19:26 2012 +0200 gdi32/tests: Avoid deleting invalid objects. --- dlls/gdi32/tests/bitmap.c | 9 +++------ dlls/gdi32/tests/dib.c | 2 +- dlls/gdi32/tests/metafile.c | 1 - 3 files changed, 4 insertions(+), 8 deletions(-) diff --git a/dlls/gdi32/tests/bitmap.c b/dlls/gdi32/tests/bitmap.c index a620361..04c93c1 100644 --- a/dlls/gdi32/tests/bitmap.c +++ b/dlls/gdi32/tests/bitmap.c @@ -3523,7 +3523,6 @@ static void test_GdiAlphaBlend(void) HDC hdcNull; HDC hdcDst; HBITMAP bmpDst; - HBITMAP oldDst; BITMAPINFO *bmi; HDC hdcSrc; HBITMAP bmpSrc; @@ -3553,7 +3552,7 @@ static void test_GdiAlphaBlend(void) bmpSrc = CreateDIBSection(hdcDst, bmi, DIB_RGB_COLORS, &bits, NULL, 0); ok(bmpSrc != NULL, "Couldn't create source bitmap\n"); - oldDst = SelectObject(hdcDst, bmpDst); + SelectObject(hdcDst, bmpDst); oldSrc = SelectObject(hdcSrc, bmpSrc); blend.BlendOp = AC_SRC_OVER; @@ -3736,12 +3735,10 @@ static void test_GdiAlphaBlend(void) ok( !ret, "GdiAlphaBlend succeeded\n" ); ok( GetLastError() == ERROR_INVALID_PARAMETER, "wrong error %u\n", GetLastError() ); - SelectObject(hdcDst, oldDst); - SelectObject(hdcSrc, oldSrc); - DeleteObject(bmpSrc); - DeleteObject(bmpDst); DeleteDC(hdcDst); DeleteDC(hdcSrc); + DeleteObject(bmpSrc); + DeleteObject(bmpDst); ReleaseDC(NULL, hdcNull); diff --git a/dlls/gdi32/tests/dib.c b/dlls/gdi32/tests/dib.c index b431add..f4ed8e1 100644 --- a/dlls/gdi32/tests/dib.c +++ b/dlls/gdi32/tests/dib.c @@ -1904,6 +1904,7 @@ static void draw_graphics(HDC hdc, BITMAPINFO *bmi, BYTE *bits) DeleteObject(bmp); SelectObject(hdc, orig_brush); + DeleteObject( dib_brush ); SetBrushOrgEx(hdc, 0, 0, NULL); SetTextColor(hdc, old_text); SetBkColor(hdc, old_bkgnd); @@ -2656,7 +2657,6 @@ static void draw_graphics(HDC hdc, BITMAPINFO *bmi, BYTE *bits) SelectObject(hdc, orig_brush); SelectObject(hdc, orig_pen); - DeleteObject(dib_brush); DeleteObject(solid_brush); DeleteObject(wide_pen); DeleteObject(dashed_pen); diff --git a/dlls/gdi32/tests/metafile.c b/dlls/gdi32/tests/metafile.c index e6bab5d..e4413db 100644 --- a/dlls/gdi32/tests/metafile.c +++ b/dlls/gdi32/tests/metafile.c @@ -2489,7 +2489,6 @@ todo_wine hemf = CloseEnhMetaFile(hdc); DeleteEnhMetaFile(hemf); DeleteObject(hrgn); - DeleteDC(hdc); } static const unsigned char MF_CLIP_BITS[] = {

1 0

Alexandre Julliard : oleaut32/tests: Delete the correct object in the icon test.
by Alexandre Julliard 19 Oct '12

19 Oct '12

Module: wine Branch: master Commit: 9351867e6aa3ae96a6d6de97445409697219813f URL: http://source.winehq.org/git/wine.git/?a=commit;h=9351867e6aa3ae96a6d6de974… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 18 20:18:47 2012 +0200 oleaut32/tests: Delete the correct object in the icon test. --- dlls/oleaut32/tests/olepicture.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/oleaut32/tests/olepicture.c b/dlls/oleaut32/tests/olepicture.c index b214d76..696f8cd 100644 --- a/dlls/oleaut32/tests/olepicture.c +++ b/dlls/oleaut32/tests/olepicture.c @@ -1055,7 +1055,7 @@ todo_wine GlobalUnlock(hmem); GlobalFree(hmem); - DeleteObject(desc.u.bmp.hbitmap); + DestroyIcon(desc.u.icon.hicon); IPicture_Release(pic); }

1 0

Alexandre Julliard : comctl32/tests: Don't delete the global font object.
by Alexandre Julliard 19 Oct '12

19 Oct '12

Module: wine Branch: master Commit: c4bae8fab01877ab67037c451d840e7daf2dc14f URL: http://source.winehq.org/git/wine.git/?a=commit;h=c4bae8fab01877ab67037c451… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 18 20:17:56 2012 +0200 comctl32/tests: Don't delete the global font object. --- dlls/comctl32/tests/tab.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/tests/tab.c b/dlls/comctl32/tests/tab.c index a2937ef..51a8a91 100644 --- a/dlls/comctl32/tests/tab.c +++ b/dlls/comctl32/tests/tab.c @@ -657,7 +657,6 @@ static void test_tab(INT nMinTabWidth) DestroyWindow (hwTab); ImageList_Destroy(himl); - DeleteObject(hFont); } static void test_width(void)

1 0

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

18 Oct '12

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@_Locimp@locale@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@std@@QAEAAV01@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@locale@std@@MEAA@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@std@@QAEAAV01@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@locale@std@@MEAA@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@std@@QAEAAV01@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@_Locimp@locale@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@std@@QAEAAV01@ABV01@@Z */

1 0

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

18 Oct '12

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

Maarten Lankhorst : mmdevapi: Fix a broken test.
by Alexandre Julliard 18 Oct '12

18 Oct '12

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

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

18 Oct '12

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

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

18 Oct '12

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

Jacek Caban : jscript: Use jsstr_t for passing strings to regexp matching functions.
by Alexandre Julliard 18 Oct '12

18 Oct '12

Module: wine Branch: master Commit: 2d962d03954e7c768b14cb98b25ae2af601d3b2a URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d962d03954e7c768b14cb98b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 18 17:45:23 2012 +0200 jscript: Use jsstr_t for passing strings to regexp matching functions. --- dlls/jscript/jscript.h | 2 +- dlls/jscript/regexp.c | 50 +++++++++++++++++++---------------------------- dlls/jscript/string.c | 6 ++-- 3 files changed, 24 insertions(+), 34 deletions(-) diff --git a/dlls/jscript/jscript.h b/dlls/jscript/jscript.h index d779c7b..2630ff0 100644 --- a/dlls/jscript/jscript.h +++ b/dlls/jscript/jscript.h @@ -416,7 +416,7 @@ HRESULT create_jscaller(script_ctx_t*) DECLSPEC_HIDDEN; #define REM_CHECK_GLOBAL 0x0001 #define REM_RESET_INDEX 0x0002 #define REM_NO_CTX_UPDATE 0x0004 -HRESULT regexp_match_next(script_ctx_t*,jsdisp_t*,DWORD,const WCHAR*,DWORD,const WCHAR**,match_result_t**, +HRESULT regexp_match_next(script_ctx_t*,jsdisp_t*,DWORD,jsstr_t*,const WCHAR**,match_result_t**, DWORD*,DWORD*,match_result_t*) DECLSPEC_HIDDEN; HRESULT parse_regexp_flags(const WCHAR*,DWORD,DWORD*) DECLSPEC_HIDDEN; HRESULT regexp_string_match(script_ctx_t*,jsdisp_t*,jsstr_t*,jsval_t*) DECLSPEC_HIDDEN; diff --git a/dlls/jscript/regexp.c b/dlls/jscript/regexp.c index bdff445..4d29390 100644 --- a/dlls/jscript/regexp.c +++ b/dlls/jscript/regexp.c @@ -3323,16 +3323,16 @@ static void set_last_index(RegExpInstance *This, DWORD last_index) } static HRESULT do_regexp_match_next(script_ctx_t *ctx, RegExpInstance *regexp, DWORD rem_flags, - const WCHAR *str, DWORD len, const WCHAR **cp, match_result_t **parens, DWORD *parens_size, + jsstr_t *str, const WCHAR **cp, match_result_t **parens, DWORD *parens_size, DWORD *parens_cnt, match_result_t *ret) { REMatchState *x, *result; REGlobalData gData; DWORD matchlen; - gData.cpbegin = str; - gData.cpend = str + len; - gData.start = *cp-str; + gData.cpbegin = str->str; + gData.cpend = str->str + jsstr_length(str); + gData.start = *cp-str->str; gData.skipped = 0; gData.pool = &ctx->tmp_heap; @@ -3370,16 +3370,9 @@ static HRESULT do_regexp_match_next(script_ctx_t *ctx, RegExpInstance *regexp, D } } - /* FIXME: We often already have a copy of input string that we could use to store last match */ - if(!(rem_flags & REM_NO_CTX_UPDATE) && - (!ctx->last_match || len != jsstr_length(ctx->last_match) || strncmpW(ctx->last_match->str, str, len))) { - jsstr_t *last_match; - - last_match = jsstr_alloc_len(str, len); - if(!last_match) - return E_OUTOFMEMORY; + if(!(rem_flags & REM_NO_CTX_UPDATE) && ctx->last_match != str) { jsstr_release(ctx->last_match); - ctx->last_match = last_match; + ctx->last_match = jsstr_addref(str); } if(parens) { @@ -3392,7 +3385,7 @@ static HRESULT do_regexp_match_next(script_ctx_t *ctx, RegExpInstance *regexp, D (*parens)[i].str = NULL; (*parens)[i].len = 0; }else { - (*parens)[i].str = str + result->parens[i].index; + (*parens)[i].str = str->str + result->parens[i].index; (*parens)[i].len = result->parens[i].length; } } @@ -3419,18 +3412,18 @@ static HRESULT do_regexp_match_next(script_ctx_t *ctx, RegExpInstance *regexp, D *cp = result->cp; ret->str = result->cp-matchlen; ret->len = matchlen; - set_last_index(regexp, result->cp-str); + set_last_index(regexp, result->cp-str->str); if(!(rem_flags & REM_NO_CTX_UPDATE)) { - ctx->last_match_index = ret->str-str; + ctx->last_match_index = ret->str-str->str; ctx->last_match_length = matchlen; } return S_OK; } -HRESULT regexp_match_next(script_ctx_t *ctx, jsdisp_t *dispex, DWORD rem_flags, const WCHAR *str, - DWORD len, const WCHAR **cp, match_result_t **parens, DWORD *parens_size, DWORD *parens_cnt, +HRESULT regexp_match_next(script_ctx_t *ctx, jsdisp_t *dispex, DWORD rem_flags, jsstr_t *str, + const WCHAR **cp, match_result_t **parens, DWORD *parens_size, DWORD *parens_cnt, match_result_t *ret) { RegExpInstance *regexp = (RegExpInstance*)dispex; @@ -3442,18 +3435,18 @@ HRESULT regexp_match_next(script_ctx_t *ctx, jsdisp_t *dispex, DWORD rem_flags, mark = jsheap_mark(&ctx->tmp_heap); - hres = do_regexp_match_next(ctx, regexp, rem_flags, str, len, cp, parens, parens_size, parens_cnt, ret); + hres = do_regexp_match_next(ctx, regexp, rem_flags, str, cp, parens, parens_size, parens_cnt, ret); jsheap_clear(mark); return hres; } -static HRESULT regexp_match(script_ctx_t *ctx, jsdisp_t *dispex, const WCHAR *str, DWORD len, BOOL gflag, +static HRESULT regexp_match(script_ctx_t *ctx, jsdisp_t *dispex, jsstr_t *str, BOOL gflag, match_result_t **match_result, DWORD *result_cnt) { RegExpInstance *This = (RegExpInstance*)dispex; match_result_t *ret = NULL, cres; - const WCHAR *cp = str; + const WCHAR *cp = str->str; DWORD i=0, ret_size = 0; jsheap_t *mark; HRESULT hres; @@ -3461,7 +3454,7 @@ static HRESULT regexp_match(script_ctx_t *ctx, jsdisp_t *dispex, const WCHAR *st mark = jsheap_mark(&ctx->tmp_heap); while(1) { - hres = do_regexp_match_next(ctx, This, 0, str, len, &cp, NULL, NULL, NULL, &cres); + hres = do_regexp_match_next(ctx, This, 0, str, &cp, NULL, NULL, NULL, &cres); if(hres == S_FALSE) { hres = S_OK; break; @@ -3658,7 +3651,7 @@ static HRESULT run_exec(script_ctx_t *ctx, vdisp_t *jsthis, jsval_t arg, jsstr_t match_result_t *match, match_result_t **parens, DWORD *parens_cnt, BOOL *ret) { RegExpInstance *regexp; - DWORD parens_size = 0, last_index = 0, length; + DWORD parens_size = 0, last_index = 0; const WCHAR *cp; jsstr_t *string; HRESULT hres; @@ -3673,7 +3666,6 @@ static HRESULT run_exec(script_ctx_t *ctx, vdisp_t *jsthis, jsval_t arg, jsstr_t hres = to_string(ctx, arg, &string); if(FAILED(hres)) return hres; - length = jsstr_length(string); if(regexp->jsregexp->flags & JSREG_GLOB) { if(regexp->last_index < 0) { @@ -3689,7 +3681,7 @@ static HRESULT run_exec(script_ctx_t *ctx, vdisp_t *jsthis, jsval_t arg, jsstr_t } cp = string->str + last_index; - hres = regexp_match_next(ctx, &regexp->dispex, REM_RESET_INDEX, string->str, length, &cp, parens, + hres = regexp_match_next(ctx, &regexp->dispex, REM_RESET_INDEX, string, &cp, parens, parens ? &parens_size : NULL, parens_cnt, match); if(FAILED(hres)) { jsstr_release(string); @@ -3929,18 +3921,16 @@ HRESULT regexp_string_match(script_ctx_t *ctx, jsdisp_t *re, jsstr_t *str, jsval RegExpInstance *regexp = (RegExpInstance*)re; match_result_t *match_result; - unsigned match_cnt, i, length; + unsigned match_cnt, i; jsdisp_t *array; HRESULT hres; - length = jsstr_length(str); - if(!(regexp->jsregexp->flags & JSREG_GLOB)) { match_result_t match, *parens = NULL; DWORD parens_cnt, parens_size = 0; const WCHAR *cp = str->str; - hres = regexp_match_next(ctx, &regexp->dispex, 0, str->str, length, &cp, &parens, &parens_size, &parens_cnt, &match); + hres = regexp_match_next(ctx, &regexp->dispex, 0, str, &cp, &parens, &parens_size, &parens_cnt, &match); if(FAILED(hres)) return hres; @@ -3960,7 +3950,7 @@ HRESULT regexp_string_match(script_ctx_t *ctx, jsdisp_t *re, jsstr_t *str, jsval return S_OK; } - hres = regexp_match(ctx, &regexp->dispex, str->str, length, FALSE, &match_result, &match_cnt); + hres = regexp_match(ctx, &regexp->dispex, str, FALSE, &match_result, &match_cnt); if(FAILED(hres)) return hres; diff --git a/dlls/jscript/string.c b/dlls/jscript/string.c index 5972061..c7aaf64 100644 --- a/dlls/jscript/string.c +++ b/dlls/jscript/string.c @@ -745,7 +745,7 @@ static HRESULT String_replace(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, un while(1) { if(regexp) { - hres = regexp_match_next(ctx, regexp, re_flags, str->str, jsstr_length(str), &cp, parens_ptr, + hres = regexp_match_next(ctx, regexp, re_flags, str, &cp, parens_ptr, &parens_size, &parens_cnt, &match); re_flags |= REM_CHECK_GLOBAL; @@ -933,7 +933,7 @@ static HRESULT String_search(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, uns } cp = str->str; - hres = regexp_match_next(ctx, regexp, REM_RESET_INDEX, str->str, jsstr_length(str), &cp, NULL, NULL, NULL, &match); + hres = regexp_match_next(ctx, regexp, REM_RESET_INDEX, str, &cp, NULL, NULL, NULL, &match); jsstr_release(str); jsdisp_release(regexp); if(FAILED(hres)) @@ -1090,7 +1090,7 @@ static HRESULT String_split(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsi ptr = cp = str->str; for(i=0; i<limit; i++) { if(regexp) { - hres = regexp_match_next(ctx, regexp, 0, str->str, length, &cp, NULL, NULL, NULL, &match_result); + hres = regexp_match_next(ctx, regexp, 0, str, &cp, NULL, NULL, NULL, &match_result); if(hres != S_OK) break; ptr2 = match_result.str;

1 0

Hans Leidekker : advapi32: Only require a domain in the username for CRED_PERSIST_ENTERPRISE credentials .
by Alexandre Julliard 18 Oct '12

18 Oct '12

Module: wine Branch: master Commit: 860c335b2297d36830a85d4d659d5a8358a445ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=860c335b2297d36830a85d4d6… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Oct 18 15:10:05 2012 +0200 advapi32: Only require a domain in the username for CRED_PERSIST_ENTERPRISE credentials. --- dlls/advapi32/cred.c | 8 +++++++- dlls/advapi32/tests/cred.c | 41 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 48 insertions(+), 1 deletions(-) diff --git a/dlls/advapi32/cred.c b/dlls/advapi32/cred.c index 98c4ba7..b2597b6 100644 --- a/dlls/advapi32/cred.c +++ b/dlls/advapi32/cred.c @@ -1804,13 +1804,19 @@ BOOL WINAPI CredWriteW(PCREDENTIALW Credential, DWORD Flags) return FALSE; } + TRACE("Credential->Flags = 0x%08x\n", Credential->Flags); + TRACE("Credential->Type = %u\n", Credential->Type); TRACE("Credential->TargetName = %s\n", debugstr_w(Credential->TargetName)); + TRACE("Credential->Comment = %s\n", debugstr_w(Credential->Comment)); + TRACE("Credential->Persist = %u\n", Credential->Persist); + TRACE("Credential->TargetAlias = %s\n", debugstr_w(Credential->TargetAlias)); TRACE("Credential->UserName = %s\n", debugstr_w(Credential->UserName)); if (Credential->Type == CRED_TYPE_DOMAIN_PASSWORD) { if (!Credential->UserName || - (!strchrW(Credential->UserName, '\\') && !strchrW(Credential->UserName, '@'))) + (Credential->Persist == CRED_PERSIST_ENTERPRISE && + (!strchrW(Credential->UserName, '\\') && !strchrW(Credential->UserName, '@')))) { ERR("bad username %s\n", debugstr_w(Credential->UserName)); SetLastError(ERROR_BAD_USERNAME); diff --git a/dlls/advapi32/tests/cred.c b/dlls/advapi32/tests/cred.c index 5762f1b..3d37a3c 100644 --- a/dlls/advapi32/tests/cred.c +++ b/dlls/advapi32/tests/cred.c @@ -121,6 +121,47 @@ static void test_CredWriteA(void) ok(!ret && GetLastError() == ERROR_BAD_USERNAME, "CredWriteA with NULL username should have failed with ERROR_BAD_USERNAME instead of %d\n", GetLastError()); + + new_cred.UserName = (char *)"winetest"; + new_cred.Persist = CRED_PERSIST_LOCAL_MACHINE; + SetLastError(0xdeadbeef); + ret = pCredWriteA(&new_cred, 0); + ok(ret || broken(!ret), "CredWriteA failed with error %u\n", GetLastError()); + if (ret) + { + ret = pCredDeleteA(TEST_TARGET_NAME, CRED_TYPE_DOMAIN_PASSWORD, 0); + ok(ret, "CredDeleteA failed with error %u\n", GetLastError()); + } + new_cred.Type = CRED_TYPE_GENERIC; + SetLastError(0xdeadbeef); + ret = pCredWriteA(&new_cred, 0); + ok(ret || broken(!ret), "CredWriteA failed with error %u\n", GetLastError()); + if (ret) + { + ret = pCredDeleteA(TEST_TARGET_NAME, CRED_TYPE_GENERIC, 0); + ok(ret, "CredDeleteA failed with error %u\n", GetLastError()); + } + new_cred.Persist = CRED_PERSIST_SESSION; + ret = pCredWriteA(&new_cred, 0); + ok(ret, "CredWriteA failed with error %u\n", GetLastError()); + + ret = pCredDeleteA(TEST_TARGET_NAME, CRED_TYPE_GENERIC, 0); + ok(ret, "CredDeleteA failed with error %u\n", GetLastError()); + + new_cred.Type = CRED_TYPE_DOMAIN_PASSWORD; + SetLastError(0xdeadbeef); + ret = pCredWriteA(&new_cred, 0); + ok(ret || broken(!ret), "CredWriteA failed with error %u\n", GetLastError()); + if (ret) + { + ret = pCredDeleteA(TEST_TARGET_NAME, CRED_TYPE_DOMAIN_PASSWORD, 0); + ok(ret, "CredDeleteA failed with error %u\n", GetLastError()); + } + new_cred.UserName = NULL; + SetLastError(0xdeadbeef); + ret = pCredWriteA(&new_cred, 0); + ok(!ret, "CredWriteA succeeded\n"); + ok(GetLastError() == ERROR_BAD_USERNAME, "got %u\n", GetLastError()); } static void test_CredDeleteA(void)

1 0

← Newer
1
...
35
36
37
38
39
40
41
...
96
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 October 2012