January 2011 - Wine-commits

Yaron Shahrabani : po: Hebrew update.
by Alexandre Julliard 20 Jan '11

20 Jan '11

Module: wine Branch: master Commit: 7571fb5456cba62a5e2cb8d62d84c5afbb3c3448 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7571fb5456cba62a5e2cb8d62… Author: Yaron Shahrabani <sh.yaron(a)gmail.com> Date: Thu Jan 20 17:17:05 2011 +0200 po: Hebrew update. --- po/he.po | 1079 +++++++++++++++++++++++++++++++++++--------------------------- 1 files changed, 612 insertions(+), 467 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7571fb5456cba62a5e2cb…

1 0

Owen Rudge : dsound: Add support for 32-bit IEEE float buffers.
by Alexandre Julliard 20 Jan '11

20 Jan '11

Module: wine Branch: master Commit: d6f3ca958901d4caff78fd19517ed69cc3ad1c3c URL: http://source.winehq.org/git/wine.git/?a=commit;h=d6f3ca958901d4caff78fd195… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Thu Jan 20 15:41:04 2011 +0000 dsound: Add support for 32-bit IEEE float buffers. --- dlls/dsound/dsound.c | 4 +- dlls/dsound/dsound_convert.c | 113 +++++++++++++++++++++++++++++++++++++++++- dlls/dsound/dsound_private.h | 2 +- dlls/dsound/mixer.c | 20 +++++++- include/mmreg.h | 1 + 5 files changed, 134 insertions(+), 6 deletions(-) diff --git a/dlls/dsound/dsound.c b/dlls/dsound/dsound.c index 83636c2..8c1b812 100644 --- a/dlls/dsound/dsound.c +++ b/dlls/dsound/dsound.c @@ -1591,14 +1591,14 @@ HRESULT DirectSoundDevice_CreateSoundBuffer( /* cbSize should be 22 bytes, with one possible exception */ if (pwfxe->Format.cbSize > (sizeof(WAVEFORMATEXTENSIBLE) - sizeof(WAVEFORMATEX)) && - !(IsEqualGUID(&pwfxe->SubFormat, &KSDATAFORMAT_SUBTYPE_PCM) && + !((IsEqualGUID(&pwfxe->SubFormat, &KSDATAFORMAT_SUBTYPE_PCM) || IsEqualGUID(&pwfxe->SubFormat, &KSDATAFORMAT_SUBTYPE_IEEE_FLOAT)) && pwfxe->Format.cbSize == sizeof(WAVEFORMATEXTENSIBLE))) { WARN("Too big a cbSize %u\n", pwfxe->Format.cbSize); return DSERR_CONTROLUNAVAIL; } - if (!IsEqualGUID(&pwfxe->SubFormat, &KSDATAFORMAT_SUBTYPE_PCM)) + if ((!IsEqualGUID(&pwfxe->SubFormat, &KSDATAFORMAT_SUBTYPE_PCM)) && (!IsEqualGUID(&pwfxe->SubFormat, &KSDATAFORMAT_SUBTYPE_IEEE_FLOAT))) { if (!IsEqualGUID(&pwfxe->SubFormat, &GUID_NULL)) FIXME("SubFormat %s not supported right now.\n", debugstr_guid(&pwfxe->SubFormat)); diff --git a/dlls/dsound/dsound_convert.c b/dlls/dsound/dsound_convert.c index 0a6e474..057ae16 100644 --- a/dlls/dsound/dsound_convert.c +++ b/dlls/dsound/dsound_convert.c @@ -1,6 +1,7 @@ /* DirectSound format conversion and mixing routines * * Copyright 2007 Maarten Lankhorst + * Copyright 2011 Owen Rudge for CodeWeavers * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -295,11 +296,121 @@ static void convert_32_to_32 (const void *src, void *dst, UINT src_stride, } } -const bitsconvertfunc convertbpp[4][4] = { +static void convert_ieee_32_to_8 (const void *src, void *dst, UINT src_stride, + UINT dst_stride, INT count, UINT freqAcc, UINT adj) +{ + while (count > 0) + { + DWORD src_le = le32(*(DWORD *) src); + float v = *((float *) &src_le); + INT8 d = 0; + + if (v < -1.0f) + d = -128; + else if (v > 1.0f) + d = 127; + else + d = v * 127.5f - 0.5f; + + *(BYTE *) dst = d ^ 0x80; + + dst = (char *)dst + dst_stride; + src_advance(&src, src_stride, &count, &freqAcc, adj); + } +} + +static void convert_ieee_32_to_16 (const void *src, void *dst, UINT src_stride, + UINT dst_stride, INT count, UINT freqAcc, UINT adj) +{ + while (count > 0) + { + DWORD src_le = le32(*(DWORD *) src); + float v = *((float *) &src_le); + + INT16 *d = (INT16 *) dst; + + if (v < -1.0f) + *d = -32768; + else if (v > 1.0f) + *d = 32767; + else + *d = v * 32767.5f - 0.5f; + + *d = le16(*d); + + dst = (char *)dst + dst_stride; + src_advance(&src, src_stride, &count, &freqAcc, adj); + } +} + +static void convert_ieee_32_to_24 (const void *src, void *dst, UINT src_stride, + UINT dst_stride, INT count, UINT freqAcc, UINT adj) +{ + while (count > 0) + { + DWORD src_le = le32(*(DWORD *) src); + float v = *((float *) &src_le); + BYTE *dest24 = dst; + + if (v < -1.0f) + { + dest24[0] = 0; + dest24[1] = 0; + dest24[2] = 0x80; + } + else if (v > 1.0f) + { + dest24[0] = 0xff; + dest24[1] = 0xff; + dest24[2] = 0x7f; + } + else if (v < 0.0f) + { + dest24[0] = v * 8388608.0f; + dest24[1] = v * 32768.0f; + dest24[2] = v * 128.0f; + } + else if (v >= 0.0f) + { + dest24[0] = v * 8388608.0f; + dest24[1] = v * 32768.0f; + dest24[2] = v * 127.0f; + } + + dst = (char *)dst + dst_stride; + src_advance(&src, src_stride, &count, &freqAcc, adj); + } +} + +static void convert_ieee_32_to_32 (const void *src, void *dst, UINT src_stride, + UINT dst_stride, INT count, UINT freqAcc, UINT adj) +{ + while (count > 0) + { + DWORD src_le = le32(*(DWORD *) src); + float v = *((float *) &src_le); + INT32 *d = (INT32 *) dst; + + if (v < -1.0f) + *d = -2147483647 - 1; /* silence warning */ + else if (v > 1.0f) + *d = 2147483647; + else + *d = v * 2147483647.5f - 0.5f; + + *d = le32(*d); + + dst = (char *)dst + dst_stride; + src_advance(&src, src_stride, &count, &freqAcc, adj); + } +} + +const bitsconvertfunc convertbpp[5][4] = { { convert_8_to_8, convert_8_to_16, convert_8_to_24, convert_8_to_32 }, { convert_16_to_8, convert_16_to_16, convert_16_to_24, convert_16_to_32 }, { convert_24_to_8, convert_24_to_16, convert_24_to_24, convert_24_to_32 }, { convert_32_to_8, convert_32_to_16, convert_32_to_24, convert_32_to_32 }, + { convert_ieee_32_to_8, convert_ieee_32_to_16, convert_ieee_32_to_24, convert_ieee_32_to_32 }, }; static void mix8(signed char *src, INT *dst, unsigned len) diff --git a/dlls/dsound/dsound_private.h b/dlls/dsound/dsound_private.h index 1b25ddd..542b997 100644 --- a/dlls/dsound/dsound_private.h +++ b/dlls/dsound/dsound_private.h @@ -65,7 +65,7 @@ typedef struct DirectSoundCaptureDevice DirectSoundCaptureDevice; /* dsound_convert.h */ typedef void (*bitsconvertfunc)(const void *, void *, UINT, UINT, INT, UINT, UINT); -extern const bitsconvertfunc convertbpp[4][4]; +extern const bitsconvertfunc convertbpp[5][4]; typedef void (*mixfunc)(const void *, void *, unsigned); extern const mixfunc mixfunctions[4]; typedef void (*normfunc)(const void *, void *, unsigned); diff --git a/dlls/dsound/mixer.c b/dlls/dsound/mixer.c index 185df6e..e08cbca 100644 --- a/dlls/dsound/mixer.c +++ b/dlls/dsound/mixer.c @@ -5,6 +5,7 @@ * Copyright 2000-2002 TransGaming Technologies, Inc. * Copyright 2007 Peter Dons Tychsen * Copyright 2007 Maarten Lankhorst + * Copyright 2011 Owen Rudge for CodeWeavers * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -30,9 +31,13 @@ #include "windef.h" #include "winbase.h" #include "mmsystem.h" +#include "wingdi.h" +#include "mmreg.h" #include "winternl.h" #include "wine/debug.h" #include "dsound.h" +#include "ks.h" +#include "ksmedia.h" #include "dsdriver.h" #include "dsound_private.h" @@ -177,21 +182,32 @@ void DSOUND_RecalcFormat(IDirectSoundBufferImpl *dsb) { BOOL needremix = TRUE, needresample = (dsb->freq != dsb->device->pwfx->nSamplesPerSec); DWORD bAlign = dsb->pwfx->nBlockAlign, pAlign = dsb->device->pwfx->nBlockAlign; + WAVEFORMATEXTENSIBLE *pwfxe; + BOOL ieee = FALSE; TRACE("(%p)\n",dsb); + pwfxe = (WAVEFORMATEXTENSIBLE *) dsb->pwfx; + + if ((pwfxe->Format.wFormatTag == WAVE_FORMAT_IEEE_FLOAT) || ((pwfxe->Format.wFormatTag == WAVE_FORMAT_EXTENSIBLE) + && (IsEqualGUID(&pwfxe->SubFormat, &KSDATAFORMAT_SUBTYPE_IEEE_FLOAT)))) + ieee = TRUE; + /* calculate the 10ms write lead */ dsb->writelead = (dsb->freq / 100) * dsb->pwfx->nBlockAlign; if ((dsb->pwfx->wBitsPerSample == dsb->device->pwfx->wBitsPerSample) && - (dsb->pwfx->nChannels == dsb->device->pwfx->nChannels) && !needresample) + (dsb->pwfx->nChannels == dsb->device->pwfx->nChannels) && !needresample && !ieee) needremix = FALSE; HeapFree(GetProcessHeap(), 0, dsb->tmp_buffer); dsb->tmp_buffer = NULL; dsb->max_buffer_len = dsb->freqAcc = dsb->freqAccNext = 0; dsb->freqneeded = needresample; - dsb->convert = convertbpp[dsb->pwfx->wBitsPerSample/8 - 1][dsb->device->pwfx->wBitsPerSample/8 - 1]; + if (ieee) + dsb->convert = convertbpp[4][dsb->device->pwfx->wBitsPerSample/8 - 1]; + else + dsb->convert = convertbpp[dsb->pwfx->wBitsPerSample/8 - 1][dsb->device->pwfx->wBitsPerSample/8 - 1]; dsb->resampleinmixer = FALSE; diff --git a/include/mmreg.h b/include/mmreg.h index dca8b58..64a3991 100644 --- a/include/mmreg.h +++ b/include/mmreg.h @@ -74,6 +74,7 @@ typedef struct _WAVEFORMATEX { /* WAVE form wFormatTag IDs */ #define WAVE_FORMAT_UNKNOWN 0x0000 /* Microsoft Corporation */ #define WAVE_FORMAT_ADPCM 0x0002 /* Microsoft Corporation */ +#define WAVE_FORMAT_IEEE_FLOAT 0x0003 /* Microsoft Corporation */ #define WAVE_FORMAT_IBM_CVSD 0x0005 /* IBM Corporation */ #define WAVE_FORMAT_ALAW 0x0006 /* Microsoft Corporation */ #define WAVE_FORMAT_MULAW 0x0007 /* Microsoft Corporation */

1 0

Owen Rudge : dsound/tests: Add IEEE float buffer tests.
by Alexandre Julliard 20 Jan '11

20 Jan '11

Module: wine Branch: master Commit: c3a01501e80978c86df51e6afe3caccbdb0b3be2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c3a01501e80978c86df51e6af… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Thu Jan 20 15:41:11 2011 +0000 dsound/tests: Add IEEE float buffer tests. --- dlls/dsound/tests/ds3d.c | 38 ++++++++++++++++++++++++++++---------- dlls/dsound/tests/ds3d8.c | 2 +- dlls/dsound/tests/dsound.c | 35 ++++++++++++++++++++++++----------- dlls/dsound/tests/dsound_test.h | 8 +++++++- 4 files changed, 60 insertions(+), 23 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c3a01501e80978c86df51…

1 0

Greg Geldorp : comctl32/tests: Fix failures for 120DPI display.
by Alexandre Julliard 20 Jan '11

20 Jan '11

Module: wine Branch: master Commit: 50a25a8ebbf6eb889bb7a11acc01d7fd7c706951 URL: http://source.winehq.org/git/wine.git/?a=commit;h=50a25a8ebbf6eb889bb7a11ac… Author: Greg Geldorp <ggeldorp(a)vmware.com> Date: Thu Jan 20 11:40:17 2011 +0100 comctl32/tests: Fix failures for 120DPI display. --- dlls/comctl32/tests/listview.c | 4 ++-- dlls/comctl32/tests/rebar.c | 2 +- dlls/comctl32/tests/treeview.c | 4 ++++ 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 89619f7..5e71a6b 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -3309,7 +3309,7 @@ static void test_getitemrect(void) expect(0, rect.left); expect(0, rect.top); hdc = GetDC(hwnd); - todo_wine expect(GetDeviceCaps(hdc, LOGPIXELSX), rect.right); + todo_wine expect(((GetDeviceCaps(hdc, LOGPIXELSX) + 15) / 16) * 16, rect.right); ReleaseDC(hwnd, hdc); DestroyWindow(hwnd); @@ -4163,7 +4163,7 @@ static void test_getcolumnwidth(void) SendMessage(hwnd, LVM_INSERTITEMA, 0, (LPARAM)&itema); ret = SendMessage(hwnd, LVM_GETCOLUMNWIDTH, 0, 0); hdc = GetDC(hwnd); - todo_wine expect(GetDeviceCaps(hdc, LOGPIXELSX), ret); + todo_wine expect(((GetDeviceCaps(hdc, LOGPIXELSX) + 15) / 16) * 16, ret); ReleaseDC(hwnd, hdc); DestroyWindow(hwnd); } diff --git a/dlls/comctl32/tests/rebar.c b/dlls/comctl32/tests/rebar.c index 3a01756..d9ceb71 100644 --- a/dlls/comctl32/tests/rebar.c +++ b/dlls/comctl32/tests/rebar.c @@ -924,7 +924,7 @@ static void expect_band_content_(int line, HWND hRebar, UINT uBand, INT fStyle, expect_eq(line, rb.cyIntegral, cyIntegral, int, "%x"); expect_eq(line, rb.cxIdeal, cxIdeal, int, "%d"); expect_eq(line, rb.lParam, lParam, LPARAM, "%ld"); - ok(rb.cxHeader == cxHeader || broken(rb.cxHeader == cxHeader_broken), + ok(rb.cxHeader == cxHeader || rb.cxHeader == cxHeader + 1 || broken(rb.cxHeader == cxHeader_broken), "expected %d for %d from line %d\n", cxHeader, rb.cxHeader, line); } diff --git a/dlls/comctl32/tests/treeview.c b/dlls/comctl32/tests/treeview.c index ffc0e3e..457dd70 100644 --- a/dlls/comctl32/tests/treeview.c +++ b/dlls/comctl32/tests/treeview.c @@ -91,6 +91,10 @@ static const struct message focus_seq[] = { { WM_NCCALCSIZE, sent|wparam|defwinproc, TRUE }, { WM_WINDOWPOSCHANGED, sent|defwinproc }, { WM_SIZE, sent|defwinproc }, + { WM_WINDOWPOSCHANGING, sent|defwinproc|optional }, + { WM_NCCALCSIZE, sent|wparam|defwinproc|optional, TRUE }, + { WM_WINDOWPOSCHANGED, sent|defwinproc|optional }, + { WM_SIZE, sent|defwinproc|optional }, { WM_PAINT, sent|defwinproc }, { WM_NCPAINT, sent|wparam|defwinproc, 1 }, { WM_ERASEBKGND, sent|defwinproc },

1 0

Greg Geldorp : imm32/tests: Windows does post WM_IME_COMPOSITION messages sometimes.
by Alexandre Julliard 20 Jan '11

20 Jan '11

Module: wine Branch: master Commit: 2309d9f06a46e8f029997bfab354e0167d26cd35 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2309d9f06a46e8f029997bfab… Author: Greg Geldorp <ggeldorp(a)vmware.com> Date: Thu Jan 20 11:41:11 2011 +0100 imm32/tests: Windows does post WM_IME_COMPOSITION messages sometimes. --- dlls/imm32/tests/imm32.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/dlls/imm32/tests/imm32.c b/dlls/imm32/tests/imm32.c index 8b8db90..9f40953 100644 --- a/dlls/imm32/tests/imm32.c +++ b/dlls/imm32/tests/imm32.c @@ -223,9 +223,7 @@ static void test_ImmNotifyIME(void) { msg_spy_flush_msgs(); ImmNotifyIME(imc, NI_COMPOSITIONSTR, CPS_CANCEL, 0); - ok(!msg_spy_find_msg(WM_IME_COMPOSITION), "Windows does not post " - "WM_IME_COMPOSITION in response to NI_COMPOSITIONSTR / CPS_CANCEL, if " - "the composition string being canceled is non empty.\n"); + msg_spy_flush_msgs(); /* behavior differs between win9x and NT */ ret = ImmGetCompositionString(imc, GCS_COMPSTR, resstr, sizeof(resstr));

1 0

Jacek Caban : mshtml: Fixed leaks (valgrind).
by Alexandre Julliard 20 Jan '11

20 Jan '11

Module: wine Branch: master Commit: 60d8c481320c2ee05eaa95db15d61bfdb6306715 URL: http://source.winehq.org/git/wine.git/?a=commit;h=60d8c481320c2ee05eaa95db1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jan 20 11:48:56 2011 +0100 mshtml: Fixed leaks (valgrind). --- dlls/mshtml/htmlform.c | 39 +++------------------------------------ dlls/mshtml/nsio.c | 1 + 2 files changed, 4 insertions(+), 36 deletions(-) diff --git a/dlls/mshtml/htmlform.c b/dlls/mshtml/htmlform.c index b51cf61..3dff376 100644 --- a/dlls/mshtml/htmlform.c +++ b/dlls/mshtml/htmlform.c @@ -228,17 +228,7 @@ static HRESULT WINAPI HTMLFormElement_get_encoding(IHTMLFormElement *iface, BSTR nsAString_Init(&encoding_str, NULL); nsres = nsIDOMHTMLFormElement_GetEnctype(This->nsform, &encoding_str); - if(NS_SUCCEEDED(nsres)) { - const PRUnichar *encoding; - nsAString_GetData(&encoding_str, &encoding); - - *p = SysAllocString(encoding); - if(!*p) - return E_OUTOFMEMORY; - }else - return E_FAIL; - - return S_OK; + return return_nsstr(nsres, &encoding_str, p); } static HRESULT WINAPI HTMLFormElement_put_method(IHTMLFormElement *iface, BSTR v) @@ -276,17 +266,7 @@ static HRESULT WINAPI HTMLFormElement_get_method(IHTMLFormElement *iface, BSTR * nsAString_Init(&method_str, NULL); nsres = nsIDOMHTMLFormElement_GetMethod(This->nsform, &method_str); - if(NS_SUCCEEDED(nsres)) { - const PRUnichar *method; - nsAString_GetData(&method_str, &method); - - *p = SysAllocString(method); - if(!*p) - return E_OUTOFMEMORY; - }else - return E_FAIL; - - return S_OK; + return return_nsstr(nsres, &method_str, p); } static HRESULT WINAPI HTMLFormElement_get_elements(IHTMLFormElement *iface, IDispatch **p) @@ -337,20 +317,7 @@ static HRESULT WINAPI HTMLFormElement_get_name(IHTMLFormElement *iface, BSTR *p) nsAString_Init(&name_str, NULL); nsres = nsIDOMHTMLFormElement_GetName(This->nsform, &name_str); - if(NS_SUCCEEDED(nsres)) { - const PRUnichar *name; - nsAString_GetData(&name_str, &name); - - if(*name) { - *p = SysAllocString(name); - if(!*p) - return E_OUTOFMEMORY; - }else - *p = NULL; - }else - return E_FAIL; - - return S_OK; + return return_nsstr(nsres, &name_str, p); } static HRESULT WINAPI HTMLFormElement_put_onsubmit(IHTMLFormElement *iface, VARIANT v) diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index 617b3f3..b6887fa 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -2007,6 +2007,7 @@ static nsresult NSAPI nsURI_SchemeIs(nsIURL *iface, const char *scheme, PRBool * MultiByteToWideChar(CP_ACP, 0, scheme, -1, buf, sizeof(buf)/sizeof(WCHAR)); *_retval = !strcmpW(scheme_name, buf); + SysFreeString(scheme_name); return NS_OK; }

1 0

Jacek Caban : mshtml: Fixed some leaks in tests (valgrind).
by Alexandre Julliard 20 Jan '11

20 Jan '11

Module: wine Branch: master Commit: 103ef913d175d9d29a751fb1a7d17b4cf9012c99 URL: http://source.winehq.org/git/wine.git/?a=commit;h=103ef913d175d9d29a751fb1a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jan 20 11:49:12 2011 +0100 mshtml: Fixed some leaks in tests (valgrind). --- dlls/mshtml/tests/activex.c | 1 + dlls/mshtml/tests/dom.c | 2 ++ dlls/mshtml/tests/events.c | 1 + 3 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/tests/activex.c b/dlls/mshtml/tests/activex.c index d3cbb9d..bf3e2e9 100644 --- a/dlls/mshtml/tests/activex.c +++ b/dlls/mshtml/tests/activex.c @@ -471,6 +471,7 @@ static HRESULT WINAPI PersistPropertyBag_Load(IPersistPropertyBag *face, IProper ok(hres == S_OK, "Read failed: %08x\n", hres); ok(V_VT(&v) == VT_BSTR, "V_VT(&v) = %d\n", V_VT(&v)); ok(!strcmp_wa(V_BSTR(&v), "3"), "V_BSTR(v) = %s\n", wine_dbgstr_w(V_BSTR(&v))); + SysFreeString(V_BSTR(&v)); V_VT(&v) = VT_I4; V_I4(&v) = 0xdeadbeef; diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index f753b14..c883a70 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -2909,6 +2909,7 @@ static IHTMLElement *_test_create_elem(unsigned line, IHTMLDocument2 *doc, const hres = IHTMLDocument2_createElement(doc, tmp, &elem); ok_(__FILE__,line) (hres == S_OK, "createElement failed: %08x\n", hres); ok_(__FILE__,line) (elem != NULL, "elem == NULL\n"); + SysFreeString(tmp); return elem; } @@ -2927,6 +2928,7 @@ static IHTMLDOMNode *_test_create_text(unsigned line, IHTMLDocument2 *doc, const tmp = a2bstr(text); hres = IHTMLDocument3_createTextNode(doc3, tmp, &node); IHTMLDocument3_Release(doc3); + SysFreeString(tmp); ok_(__FILE__,line) (hres == S_OK, "createElement failed: %08x\n", hres); ok_(__FILE__,line) (node != NULL, "node == NULL\n"); diff --git a/dlls/mshtml/tests/events.c b/dlls/mshtml/tests/events.c index 7d69dd5..4be0212 100644 --- a/dlls/mshtml/tests/events.c +++ b/dlls/mshtml/tests/events.c @@ -986,6 +986,7 @@ static HRESULT WINAPI iframe_onreadystatechange(IDispatchEx *iface, DISPID id, L else ok(0, "unexpected state %s\n", wine_dbgstr_w(str)); + SysFreeString(str); IHTMLDocument2_Release(iframe_doc); IHTMLFrameBase2_Release(iframe); return S_OK;

1 0

Nikolay Sivov : msvcrt: Partially implement _set_abort_behavior.
by Alexandre Julliard 20 Jan '11

20 Jan '11

Module: wine Branch: master Commit: 03ca06e79151301e808202cf137c1841453f3ff7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=03ca06e79151301e808202cf1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jan 20 01:21:11 2011 +0300 msvcrt: Partially implement _set_abort_behavior. --- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcr90/tests/msvcr90.c | 27 +++++++++++++++++++++++++++ dlls/msvcrt/exit.c | 31 +++++++++++++++++++++++++++---- dlls/msvcrt/msvcrt.h | 4 ++++ dlls/msvcrt/msvcrt.spec | 1 + dlls/msvcrt/tests/headers.c | 2 ++ include/msvcrt/stdlib.h | 3 +++ 9 files changed, 67 insertions(+), 7 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index a07400e..c103916 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1068,7 +1068,7 @@ @ stub _seh_longjmp_unwind4 @ stdcall -i386 _seh_longjmp_unwind(ptr) msvcrt._seh_longjmp_unwind @ cdecl _set_SSE2_enable(long) msvcrt._set_SSE2_enable -@ stub _set_abort_behavior +@ cdecl _set_abort_behavior(long long) msvcrt._set_abort_behavior @ stub _set_controlfp @ cdecl _set_doserrno(long) msvcrt._set_doserrno @ cdecl _set_errno(long) msvcrt._set_errno diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index f983944..4879e13 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -920,7 +920,7 @@ @ stub _seh_longjmp_unwind4 @ stdcall -i386 _seh_longjmp_unwind(ptr) msvcrt._seh_longjmp_unwind @ cdecl _set_SSE2_enable(long) msvcrt._set_SSE2_enable -@ stub _set_abort_behavior +@ cdecl _set_abort_behavior(long long) msvcrt._set_abort_behavior @ stub _set_amblksiz @ stub _set_controlfp @ cdecl _set_doserrno(long) msvcrt._set_doserrno diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index fb9073d..aa0f981 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -906,7 +906,7 @@ @ stub _seh_longjmp_unwind4 @ stdcall -i386 _seh_longjmp_unwind(ptr) msvcrt._seh_longjmp_unwind @ cdecl _set_SSE2_enable(long) msvcrt._set_SSE2_enable -@ stub _set_abort_behavior +@ cdecl _set_abort_behavior(long long) msvcrt._set_abort_behavior @ stub _set_amblksiz @ stub _set_controlfp @ cdecl _set_doserrno(long) msvcrt._set_doserrno diff --git a/dlls/msvcr90/tests/msvcr90.c b/dlls/msvcr90/tests/msvcr90.c index 40caa05..dcf893d 100644 --- a/dlls/msvcr90/tests/msvcr90.c +++ b/dlls/msvcr90/tests/msvcr90.c @@ -69,6 +69,7 @@ static int (__cdecl *p_wcsncat_s)(wchar_t *dst, size_t elem, const wchar_t *src, static void (__cdecl *p_qsort_s)(void *, size_t, size_t, int (__cdecl *)(void *, const void *, const void *), void *); static int (__cdecl *p_controlfp_s)(unsigned int *, unsigned int, unsigned int); static int (__cdecl *p_atoflt)(_CRT_FLOAT *, char *); +static unsigned int (__cdecl *p_set_abort_behavior)(unsigned int, unsigned int); static void* (WINAPI *pEncodePointer)(void *); @@ -680,6 +681,30 @@ if (0) } } +static void test__set_abort_behavior(void) +{ + unsigned int res; + + if (!p_set_abort_behavior) + { + win_skip("_set_abort_behavior not found\n"); + return; + } + + /* default is _WRITE_ABORT_MSG | _CALL_REPORTFAULT */ + res = p_set_abort_behavior(0, 0); + ok (res == (_WRITE_ABORT_MSG | _CALL_REPORTFAULT), + "got 0x%x (expected 0x%x)\n", res, _WRITE_ABORT_MSG | _CALL_REPORTFAULT); + + /* no internal mask */ + p_set_abort_behavior(0xffffffff, 0xffffffff); + res = p_set_abort_behavior(0, 0); + ok (res == 0xffffffff, "got 0x%x (expected 0x%x)\n", res, 0xffffffff); + + /* set to default value */ + p_set_abort_behavior(_WRITE_ABORT_MSG | _CALL_REPORTFAULT, 0xffffffff); +} + START_TEST(msvcr90) { HMODULE hcrt; @@ -712,6 +737,7 @@ START_TEST(msvcr90) p_qsort_s = (void *) GetProcAddress(hcrt, "qsort_s"); p_controlfp_s = (void *) GetProcAddress(hcrt, "_controlfp_s"); p_atoflt = (void* )GetProcAddress(hcrt, "_atoflt"); + p_set_abort_behavior = (void *) GetProcAddress(hcrt, "_set_abort_behavior"); hkernel32 = GetModuleHandleA("kernel32.dll"); pEncodePointer = (void *) GetProcAddress(hkernel32, "EncodePointer"); @@ -725,4 +751,5 @@ START_TEST(msvcr90) test_qsort_s(); test_controlfp_s(); test__atoflt(); + test__set_abort_behavior(); } diff --git a/dlls/msvcrt/exit.c b/dlls/msvcrt/exit.c index 80749fc..ac7e9b3 100644 --- a/dlls/msvcrt/exit.c +++ b/dlls/msvcrt/exit.c @@ -39,6 +39,8 @@ static const char szMsgBoxTitle[] = "Wine C++ Runtime Library"; extern int MSVCRT_app_type; extern char *MSVCRT__pgmptr; +static unsigned int MSVCRT_abort_behavior = MSVCRT__WRITE_ABORT_MSG | MSVCRT__CALL_REPORTFAULT; + void (*CDECL _aexit_rtn)(int) = MSVCRT__exit; /* INTERNAL: call atexit functions */ @@ -150,18 +152,39 @@ void CDECL _amsg_exit(int errnum) void CDECL MSVCRT_abort(void) { TRACE("()\n"); - if (MSVCRT_app_type == 2) + + if (MSVCRT_abort_behavior & MSVCRT__WRITE_ABORT_MSG) { - DoMessageBox("Runtime error!", "abnormal program termination"); + if (MSVCRT_app_type == 2) + { + DoMessageBox("Runtime error!", "abnormal program termination"); + } + else + _cputs("\nabnormal program termination\n"); } - else - _cputs("\nabnormal program termination\n"); MSVCRT_raise(MSVCRT_SIGABRT); /* in case raise() returns */ MSVCRT__exit(3); } /********************************************************************* + * _set_abort_behavior (MSVCRT.@) + * + * Not exported by native msvcrt, added in msvcr80 + */ +unsigned int CDECL MSVCRT__set_abort_behavior(unsigned int flags, unsigned int mask) +{ + unsigned int old = MSVCRT_abort_behavior; + + TRACE("%x, %x\n", flags, mask); + if (mask & MSVCRT__CALL_REPORTFAULT) + FIXME("_WRITE_CALL_REPORTFAULT unhandled\n"); + + MSVCRT_abort_behavior = (MSVCRT_abort_behavior & ~mask) | (flags & mask); + return old; +} + +/********************************************************************* * _assert (MSVCRT.@) */ void CDECL MSVCRT__assert(const char* str, const char* file, unsigned int line) diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index 9e29d31..d2292e4 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -732,6 +732,10 @@ typedef void (__cdecl *MSVCRT___sighandler_t)(int); #define _MAX__TIME64_T (((MSVCRT___time64_t)0x00000007 << 32) | 0x93406FFF) +/* _set_abort_behavior codes */ +#define MSVCRT__WRITE_ABORT_MSG 1 +#define MSVCRT__CALL_REPORTFAULT 2 + void __cdecl MSVCRT_free(void*); void* __cdecl MSVCRT_malloc(MSVCRT_size_t); void* __cdecl MSVCRT_calloc(MSVCRT_size_t,MSVCRT_size_t); diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index a6160a4..85334d3 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -1475,6 +1475,7 @@ @ varargs wscanf_s(wstr) MSVCRT_wscanf_s # Functions not exported in native dll: +@ cdecl _set_abort_behavior(long long) MSVCRT__set_abort_behavior @ cdecl _get_invalid_parameter_handler() @ cdecl _set_invalid_parameter_handler(ptr) @ cdecl _create_locale(long str) MSVCRT__create_locale diff --git a/dlls/msvcrt/tests/headers.c b/dlls/msvcrt/tests/headers.c index 829fe47..f02b61f 100644 --- a/dlls/msvcrt/tests/headers.c +++ b/dlls/msvcrt/tests/headers.c @@ -453,6 +453,8 @@ static void test_defines(void) CHECK_DEF(_EM_AMBIGUOUS); CHECK_DEF(_OVERFLOW); CHECK_DEF(_UNDERFLOW); + CHECK_DEF(_WRITE_ABORT_MSG); + CHECK_DEF(_CALL_REPORTFAULT); } #endif /* __WINE_USE_MSVCRT */ diff --git a/include/msvcrt/stdlib.h b/include/msvcrt/stdlib.h index d30e483..6a6398d 100644 --- a/include/msvcrt/stdlib.h +++ b/include/msvcrt/stdlib.h @@ -73,6 +73,9 @@ typedef struct _ldiv_t { #define _OUT_TO_MSGBOX 2 #define _REPORT_ERRMODE 3 +/* _set_abort_behavior codes */ +#define _WRITE_ABORT_MSG 1 +#define _CALL_REPORTFAULT 2 #ifdef __cplusplus extern "C" {

1 0

Michael Stefaniuc : ddraw: Drop "Thunk_" from the names of the IDirect3DDevice3 methods.
by Alexandre Julliard 20 Jan '11

20 Jan '11

Module: wine Branch: master Commit: 4a2ac6c8bdaa6c71e458696c67a3beaeae76126a URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a2ac6c8bdaa6c71e458696c6… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jan 20 02:06:25 2011 +0100 ddraw: Drop "Thunk_" from the names of the IDirect3DDevice3 methods. --- dlls/ddraw/device.c | 209 ++++++++++++++++++--------------------------------- 1 files changed, 74 insertions(+), 135 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4a2ac6c8bdaa6c71e4586…

1 0

Hans Leidekker : msi: Search all contexts in ACTION_GetComponentInstallStates.
by Alexandre Julliard 20 Jan '11

20 Jan '11

Module: wine Branch: master Commit: 8933013b6266fbd092cca1852371b0ac84bb2a4c URL: http://source.winehq.org/git/wine.git/?a=commit;h=8933013b6266fbd092cca1852… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Jan 20 09:06:19 2011 +0100 msi: Search all contexts in ACTION_GetComponentInstallStates. --- dlls/msi/action.c | 18 ++++++++++++------ 1 files changed, 12 insertions(+), 6 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 8cf80bf..4bd5157 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -1834,11 +1834,9 @@ static UINT ACTION_FileCost(MSIPACKAGE *package) static void ACTION_GetComponentInstallStates(MSIPACKAGE *package) { MSICOMPONENT *comp; - INSTALLSTATE state; + INSTALLSTATE state = MsiQueryProductStateW( package->ProductCode ); UINT r; - state = MsiQueryProductStateW(package->ProductCode); - LIST_FOR_EACH_ENTRY(comp, &package->components, MSICOMPONENT, entry) { if (!comp->ComponentId) continue; @@ -1847,9 +1845,17 @@ static void ACTION_GetComponentInstallStates(MSIPACKAGE *package) comp->Installed = INSTALLSTATE_ABSENT; else { - r = MsiQueryComponentStateW(package->ProductCode, NULL, - package->Context, comp->ComponentId, - &comp->Installed); + r = MsiQueryComponentStateW( package->ProductCode, NULL, + MSIINSTALLCONTEXT_USERMANAGED, comp->ComponentId, + &comp->Installed ); + if (r != ERROR_SUCCESS) + r = MsiQueryComponentStateW( package->ProductCode, NULL, + MSIINSTALLCONTEXT_USERUNMANAGED, comp->ComponentId, + &comp->Installed ); + if (r != ERROR_SUCCESS) + r = MsiQueryComponentStateW( package->ProductCode, NULL, + MSIINSTALLCONTEXT_MACHINE, comp->ComponentId, + &comp->Installed ); if (r != ERROR_SUCCESS) comp->Installed = INSTALLSTATE_ABSENT; }

1 0