January 2012 - Wine-Commits

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard Jan. 26, 2012

Jan. 26, 2012

Module: wine Branch: master Commit: ad1a3d3cfcb938d45f977efe0229e2a9afdc5095 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ad1a3d3cfcb938d45f977efe0… Author: Aurimas Fišeras <aurimas(a)gmail.com> Date: Thu Jan 26 20:29:02 2012 +0200 po: Update Lithuanian translation. --- po/lt.po | 8 +++----- 1 files changed, 3 insertions(+), 5 deletions(-) diff --git a/po/lt.po b/po/lt.po index d5de1de..c79ff10 100644 --- a/po/lt.po +++ b/po/lt.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2012-01-24 22:52+0300\n" +"PO-Revision-Date: 2012-01-26 20:28+0300\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: komp_lt(a)konf.lt\n" "Language: Lithuanian\n" @@ -9920,9 +9920,8 @@ msgstr "" "\n" #: cmd.rc:318 -#, fuzzy msgid "Volume label (11 characters, <Enter> for none)?" -msgstr "Tomo vardas (11 simbolių, ĮVESTI – bevardis)?" +msgstr "Tomo vardas (11 simbolių, <Įvesti> – bevardis)?" #: cmd.rc:319 msgid "PATH not found\n" @@ -14054,9 +14053,8 @@ msgid "Invalid parameter '%1' - Use xcopy /? for help\n" msgstr "Neteisingas parametras „%1“ – pagalba: xcopy /?\n" #: xcopy.rc:29 -#, fuzzy msgid "Press <Enter> to begin copying\n" -msgstr "Spauskite <įvesti> kopijavimui pradėti\n" +msgstr "Spauskite <Įvesti> kopijavimui pradėti\n" #: xcopy.rc:30 msgid "%1!d! file(s) would be copied\n"

1 0

Alexandre Julliard : fonts: Add some missing glyphs in the Courier font.
by Alexandre Julliard Jan. 26, 2012

Jan. 26, 2012

Module: wine Branch: master Commit: a926bfdb061ffcdc3c6f88b29fca614f9f12fa78 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a926bfdb061ffcdc3c6f88b29… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jan 25 19:16:25 2012 +0100 fonts: Add some missing glyphs in the Courier font. --- fonts/courier.sfd | 977 ++++++++++++++++++++++++++++++++++++++++++++++++++++- fonts/courier.ttf | Bin 14288 -> 17300 bytes 2 files changed, 972 insertions(+), 5 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a926bfdb061ffcdc3c6f8…

1 0

Jörg Höhle : mmdevapi/tests: Add a worst-case XAudio2 fragment-size writes scenario.
by Alexandre Julliard Jan. 26, 2012

Jan. 26, 2012

Module: wine Branch: master Commit: 4e323ec618ec57c11e9e9f345ca6a0e36a609b3a URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e323ec618ec57c11e9e9f345… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Tue Jan 24 20:54:40 2012 +0100 mmdevapi/tests: Add a worst-case XAudio2 fragment-size writes scenario. --- dlls/mmdevapi/tests/render.c | 116 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 116 insertions(+), 0 deletions(-) diff --git a/dlls/mmdevapi/tests/render.c b/dlls/mmdevapi/tests/render.c index f918460..2427be7 100644 --- a/dlls/mmdevapi/tests/render.c +++ b/dlls/mmdevapi/tests/render.c @@ -1532,6 +1532,121 @@ static void test_session_creation(void) IAudioClient_Release(ac); } +static void test_worst_case(void) +{ + HANDLE event; + HRESULT hr; + IAudioClient *ac; + IAudioRenderClient *arc; + IAudioClock *acl; + WAVEFORMATEX *pwfx; + REFERENCE_TIME defp; + UINT64 freq, pos, pcpos0, pcpos; + BYTE *data; + DWORD r; + UINT32 pad, fragment, sum; + int i,j; + + hr = IMMDevice_Activate(dev, &IID_IAudioClient, CLSCTX_INPROC_SERVER, + NULL, (void**)&ac); + ok(hr == S_OK, "Activation failed with %08x\n", hr); + if(hr != S_OK) + return; + + hr = IAudioClient_GetMixFormat(ac, &pwfx); + ok(hr == S_OK, "GetMixFormat failed: %08x\n", hr); + + hr = IAudioClient_Initialize(ac, AUDCLNT_SHAREMODE_SHARED, + AUDCLNT_STREAMFLAGS_EVENTCALLBACK, 500000, 0, pwfx, NULL); + ok(hr == S_OK, "Initialize failed: %08x\n", hr); + if(hr != S_OK) + return; + + hr = IAudioClient_GetDevicePeriod(ac, &defp, NULL); + ok(hr == S_OK, "GetDevicePeriod failed: %08x\n", hr); + + fragment = MulDiv(defp, pwfx->nSamplesPerSec, 10000000); + + event = CreateEventW(NULL, FALSE, FALSE, NULL); + ok(event != NULL, "CreateEvent failed\n"); + + hr = IAudioClient_SetEventHandle(ac, event); + ok(hr == S_OK, "SetEventHandle failed: %08x\n", hr); + + hr = IAudioClient_GetService(ac, &IID_IAudioRenderClient, (void**)&arc); + ok(hr == S_OK, "GetService(IAudioRenderClient) failed: %08x\n", hr); + + hr = IAudioClient_GetService(ac, &IID_IAudioClock, (void**)&acl); + ok(hr == S_OK, "GetService(IAudioClock) failed: %08x\n", hr); + + hr = IAudioClock_GetFrequency(acl, &freq); + ok(hr == S_OK, "GetFrequency failed: %08x\n", hr); + + for(j = 0; j <= (winetest_interactive ? 9 : 2); j++){ + sum = 0; + trace("Should play %ums continuous tone with fragment size %u.\n", + (ULONG)(defp/100), fragment); + + hr = IAudioClock_GetPosition(acl, &pos, &pcpos0); + ok(hr == S_OK, "GetPosition failed: %08x\n", hr); + + /* XAudio2 prefills one period, we don't */ + hr = IAudioClient_Start(ac); + ok(hr == S_OK, "Start failed: %08x\n", hr); + + for(i = 0; i <= 99; i++){ /* 100 x 10ms = 1 second */ + r = WaitForSingleObject(event, 70); + ok(r == WAIT_OBJECT_0, "Wait gave %x\n", r); + + /* the app has nearly one period time to feed data */ + Sleep((i % 10) * defp / 120000); + + hr = IAudioClient_GetCurrentPadding(ac, &pad); + ok(hr == S_OK, "GetCurrentPadding failed: %08x\n", hr); + + /* XAudio2 writes only when there's little data left */ + if(pad <= fragment){ + hr = IAudioRenderClient_GetBuffer(arc, fragment, &data); + ok(hr == S_OK, "GetBuffer failed: %08x\n", hr); + + /* fixme: produce audible output */ + 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_Stop(ac); + ok(hr == S_OK, "Stop failed: %08x\n", hr); + + hr = IAudioClient_GetCurrentPadding(ac, &pad); + ok(hr == S_OK, "GetCurrentPadding failed: %08x\n", hr); + + hr = IAudioClock_GetPosition(acl, &pos, &pcpos); + ok(hr == S_OK, "GetPosition failed: %08x\n", hr); + + Sleep(100); + + trace("Released %u=%ux%u -%u frames at %u worth %ums in %ums\n", + sum, sum/fragment, fragment, pad, + pwfx->nSamplesPerSec, MulDiv(sum-pad, 1000, pwfx->nSamplesPerSec), + (ULONG)((pcpos-pcpos0)/10000)); + + ok(pos * pwfx->nSamplesPerSec == (sum-pad) * freq, + "Position %u at end vs. %u-%u submitted frames\n", (UINT)pos, sum, pad); + + hr = IAudioClient_Reset(ac); + ok(hr == S_OK, "Reset failed: %08x\n", hr); + + Sleep(250); + } + + CoTaskMemFree(pwfx); + IAudioClient_Release(ac); + IAudioRenderClient_Release(arc); +} + START_TEST(render) { HRESULT hr; @@ -1568,6 +1683,7 @@ START_TEST(render) test_simplevolume(); test_volume_dependence(); test_session_creation(); + test_worst_case(); IMMDevice_Release(dev);

1 0

Jörg Höhle : mmdevapi/tests: Perform capture protocol tests in shared mode.
by Alexandre Julliard Jan. 26, 2012

Jan. 26, 2012

Module: wine Branch: master Commit: f24b31fcf2047e8b4d0d8b910c54c0815c54d1cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=f24b31fcf2047e8b4d0d8b910… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Thu Jan 12 22:36:31 2012 +0100 mmdevapi/tests: Perform capture protocol tests in shared mode. --- dlls/mmdevapi/tests/capture.c | 327 +++++++++++++++++++++++++++++++++++++--- 1 files changed, 302 insertions(+), 25 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f24b31fcf2047e8b4d0d8…

1 0

Alex Henrie : po: Update Catalan translation.
by Alexandre Julliard Jan. 26, 2012

Jan. 26, 2012

Module: wine Branch: master Commit: e79644e6a96eae419082ec78ce8ff3294888d05d URL: http://source.winehq.org/git/wine.git/?a=commit;h=e79644e6a96eae419082ec78c… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Jan 26 13:28:33 2012 -0700 po: Update Catalan translation. --- po/ca.po | 735 +++++++++++++++++++++++++++----------------------------------- 1 files changed, 321 insertions(+), 414 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e79644e6a96eae419082e…

1 0

Jörg Höhle : winealsa: Initialize can fail with AUDCLNT_E_ENDPOINT_CREATE_FAILED.
by Alexandre Julliard Jan. 26, 2012

Jan. 26, 2012

Module: wine Branch: master Commit: 4bbdc31d4ff30b6611dbcf29dbaddd0dce3b87ca URL: http://source.winehq.org/git/wine.git/?a=commit;h=4bbdc31d4ff30b6611dbcf29d… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Tue Aug 23 19:27:05 2011 +0200 winealsa: Initialize can fail with AUDCLNT_E_ENDPOINT_CREATE_FAILED. --- dlls/winealsa.drv/mmdevdrv.c | 28 ++++++++++++++-------------- 1 files changed, 14 insertions(+), 14 deletions(-) diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index bcbe06c..af94add 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -901,14 +901,14 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient *iface, if((err = snd_pcm_hw_params_any(This->pcm_handle, This->hw_params)) < 0){ WARN("Unable to get hw_params: %d (%s)\n", err, snd_strerror(err)); - hr = E_FAIL; + hr = AUDCLNT_E_ENDPOINT_CREATE_FAILED; goto exit; } if((err = snd_pcm_hw_params_set_access(This->pcm_handle, This->hw_params, SND_PCM_ACCESS_RW_INTERLEAVED)) < 0){ WARN("Unable to set access: %d (%s)\n", err, snd_strerror(err)); - hr = E_FAIL; + hr = AUDCLNT_E_ENDPOINT_CREATE_FAILED; goto exit; } @@ -922,7 +922,7 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient *iface, format)) < 0){ WARN("Unable to set ALSA format to %u: %d (%s)\n", format, err, snd_strerror(err)); - hr = E_FAIL; + hr = AUDCLNT_E_UNSUPPORTED_FORMAT; goto exit; } @@ -933,7 +933,7 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient *iface, &rate, NULL)) < 0){ WARN("Unable to set rate to %u: %d (%s)\n", rate, err, snd_strerror(err)); - hr = E_FAIL; + hr = AUDCLNT_E_UNSUPPORTED_FORMAT; goto exit; } @@ -941,7 +941,7 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient *iface, fmt->nChannels)) < 0){ WARN("Unable to set channels to %u: %d (%s)\n", fmt->nChannels, err, snd_strerror(err)); - hr = E_FAIL; + hr = AUDCLNT_E_UNSUPPORTED_FORMAT; goto exit; } @@ -972,21 +972,21 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient *iface, if((err = snd_pcm_hw_params(This->pcm_handle, This->hw_params)) < 0){ WARN("Unable to set hw params: %d (%s)\n", err, snd_strerror(err)); - hr = E_FAIL; + hr = AUDCLNT_E_ENDPOINT_CREATE_FAILED; goto exit; } if((err = snd_pcm_hw_params_get_period_size(This->hw_params, &This->alsa_period_frames, NULL)) < 0){ WARN("Unable to get period size: %d (%s)\n", err, snd_strerror(err)); - hr = E_FAIL; + hr = AUDCLNT_E_ENDPOINT_CREATE_FAILED; goto exit; } if((err = snd_pcm_hw_params_get_buffer_size(This->hw_params, &This->alsa_bufsize_frames)) < 0){ WARN("Unable to get buffer size: %d (%s)\n", err, snd_strerror(err)); - hr = E_FAIL; + hr = AUDCLNT_E_ENDPOINT_CREATE_FAILED; goto exit; } @@ -998,14 +998,14 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient *iface, if((err = snd_pcm_sw_params_current(This->pcm_handle, sw_params)) < 0){ WARN("Unable to get sw_params: %d (%s)\n", err, snd_strerror(err)); - hr = E_FAIL; + hr = AUDCLNT_E_ENDPOINT_CREATE_FAILED; goto exit; } if((err = snd_pcm_sw_params_set_start_threshold(This->pcm_handle, sw_params, 1)) < 0){ WARN("Unable set start threshold to 0: %d (%s)\n", err, snd_strerror(err)); - hr = E_FAIL; + hr = AUDCLNT_E_ENDPOINT_CREATE_FAILED; goto exit; } @@ -1013,19 +1013,19 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient *iface, sw_params, This->alsa_bufsize_frames)) < 0){ WARN("Unable set stop threshold to %lu: %d (%s)\n", This->alsa_bufsize_frames, err, snd_strerror(err)); - hr = E_FAIL; + hr = AUDCLNT_E_ENDPOINT_CREATE_FAILED; goto exit; } if((err = snd_pcm_sw_params(This->pcm_handle, sw_params)) < 0){ - WARN("Unable set sw params: %d (%s)\n", err, snd_strerror(err)); - hr = E_FAIL; + WARN("Unable to set sw params: %d (%s)\n", err, snd_strerror(err)); + hr = AUDCLNT_E_ENDPOINT_CREATE_FAILED; goto exit; } if((err = snd_pcm_prepare(This->pcm_handle)) < 0){ WARN("Unable to prepare device: %d (%s)\n", err, snd_strerror(err)); - hr = E_FAIL; + hr = AUDCLNT_E_ENDPOINT_CREATE_FAILED; goto exit; }

1 0

Nikolay Sivov : oleaut32: Some tests for ITypeLib::FindName(), corrected parameter validation.
by Alexandre Julliard Jan. 26, 2012

Jan. 26, 2012

Module: wine Branch: master Commit: a23dbc5dc559764bb3ab49d4e0745022cf322eff URL: http://source.winehq.org/git/wine.git/?a=commit;h=a23dbc5dc559764bb3ab49d4e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jan 26 13:42:35 2012 +0300 oleaut32: Some tests for ITypeLib::FindName(), corrected parameter validation. --- dlls/oleaut32/tests/typelib.c | 78 +++++++++++++++++++++++++++++++++++++++- dlls/oleaut32/typelib.c | 45 ++++++++++++++--------- 2 files changed, 103 insertions(+), 20 deletions(-) diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c index c7c0f93..631f6d8 100644 --- a/dlls/oleaut32/tests/typelib.c +++ b/dlls/oleaut32/tests/typelib.c @@ -59,6 +59,8 @@ static HRESULT WINAPI (*pRegisterTypeLibForUser)(ITypeLib*,OLECHAR*,OLECHAR*); static HRESULT WINAPI (*pUnRegisterTypeLibForUser)(REFGUID,WORD,WORD,LCID,SYSKIND); static const WCHAR wszStdOle2[] = {'s','t','d','o','l','e','2','.','t','l','b',0}; +static WCHAR wszGUID[] = {'G','U','I','D',0}; +static WCHAR wszguid[] = {'g','u','i','d',0}; static const int is_win64 = sizeof(void *) > sizeof(int); @@ -116,8 +118,6 @@ static void test_TypeComp(void) static WCHAR wszUnchecked[] = {'U','n','c','h','e','c','k','e','d',0}; static WCHAR wszIUnknown[] = {'I','U','n','k','n','o','w','n',0}; static WCHAR wszFont[] = {'F','o','n','t',0}; - static WCHAR wszGUID[] = {'G','U','I','D',0}; - static WCHAR wszguid[] = {'g','u','i','d',0}; static WCHAR wszStdPicture[] = {'S','t','d','P','i','c','t','u','r','e',0}; static WCHAR wszOLE_COLOR[] = {'O','L','E','_','C','O','L','O','R',0}; static WCHAR wszClone[] = {'C','l','o','n','e',0}; @@ -3112,6 +3112,79 @@ static void test_SetVarDocString(void) DeleteFileA(filenameA); } +static void test_FindName(void) +{ + static const WCHAR invalidW[] = {'i','n','v','a','l','i','d',0}; + WCHAR buffW[100]; + MEMBERID memid; + ITypeInfo *ti; + ITypeLib *tl; + HRESULT hr; + UINT16 c; + + hr = LoadTypeLib(wszStdOle2, &tl); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = ITypeLib_FindName(tl, NULL, 0, NULL, NULL, NULL); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + + lstrcpyW(buffW, wszGUID); + hr = ITypeLib_FindName(tl, buffW, 0, NULL, NULL, NULL); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + + c = 0; + ti = (void*)0xdeadbeef; + hr = ITypeLib_FindName(tl, buffW, 0, &ti, NULL, &c); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + ok(c == 0, "got %d\n", c); + ok(ti == (void*)0xdeadbeef, "got %p\n", ti); + + c = 1; + ti = (void*)0xdeadbeef; + hr = ITypeLib_FindName(tl, buffW, 0, &ti, NULL, &c); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + ok(c == 1, "got %d\n", c); + ok(ti == (void*)0xdeadbeef, "got %p\n", ti); + + c = 1; + memid = 0; + ti = (void*)0xdeadbeef; + hr = ITypeLib_FindName(tl, buffW, 0, &ti, &memid, &c); + ok(hr == S_OK, "got 0x%08x\n", hr); +todo_wine + ok(memid == -1, "got %d\n", memid); + ok(!lstrcmpW(buffW, wszGUID), "got %s\n", wine_dbgstr_w(buffW)); + ok(c == 1, "got %d\n", c); + ITypeInfo_Release(ti); + + c = 1; + memid = 0; + lstrcpyW(buffW, wszguid); + ti = (void*)0xdeadbeef; + hr = ITypeLib_FindName(tl, buffW, 0, &ti, &memid, &c); + ok(hr == S_OK, "got 0x%08x\n", hr); +todo_wine { + ok(memid == -1, "got %d\n", memid); + ok(!lstrcmpW(buffW, wszGUID), "got %s\n", wine_dbgstr_w(buffW)); + ok(c == 1, "got %d\n", c); +} + if (c == 1) + ITypeInfo_Release(ti); + + c = 1; + memid = -1; + lstrcpyW(buffW, invalidW); + ti = (void*)0xdeadbeef; + hr = ITypeLib_FindName(tl, buffW, 0, &ti, &memid, &c); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(memid == -1, "got %d\n", memid); + ok(!lstrcmpW(buffW, invalidW), "got %s\n", wine_dbgstr_w(buffW)); + ok(c == 0, "got %d\n", c); + ok(ti == (void*)0xdeadbeef, "got %p\n", ti); + + ITypeLib_Release(tl); +} + START_TEST(typelib) { const char *filename; @@ -3131,6 +3204,7 @@ START_TEST(typelib) test_SetVarHelpContext(); test_SetFuncAndParamNames(); test_SetVarDocString(); + test_FindName(); if ((filename = create_test_typelib(2))) { diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 1cab886..07e294b 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -4587,31 +4587,41 @@ ITypeLib2_fnIsName_exit: */ static HRESULT WINAPI ITypeLib2_fnFindName( ITypeLib2 *iface, - LPOLESTR szNameBuf, - ULONG lHashVal, + LPOLESTR name, + ULONG hash, ITypeInfo **ppTInfo, - MEMBERID *rgMemId, - UINT16 *pcFound) + MEMBERID *memid, + UINT16 *found) { ITypeLibImpl *This = (ITypeLibImpl *)iface; - TLBVarDesc *pVInfo; - UINT tic, fdc, pc, count = 0; - UINT nNameBufLen = (lstrlenW(szNameBuf)+1)*sizeof(WCHAR); + UINT tic, count = 0; + UINT len; - for(tic = 0; tic < This->TypeInfoCount; ++tic){ + TRACE("(%p)->(%s %u %p %p %p)\n", This, debugstr_w(name), hash, ppTInfo, memid, found); + + if ((!name && hash == 0) || !ppTInfo || !memid || !found) + return E_INVALIDARG; + + len = (lstrlenW(name) + 1)*sizeof(WCHAR); + for(tic = 0; tic < This->TypeInfoCount; ++tic) { ITypeInfoImpl *pTInfo = This->typeinfos[tic]; - if(!memcmp(szNameBuf,pTInfo->Name, nNameBufLen)) goto ITypeLib2_fnFindName_exit; + TLBVarDesc *var; + UINT fdc; + + if(!memcmp(name, pTInfo->Name, len)) goto ITypeLib2_fnFindName_exit; for(fdc = 0; fdc < pTInfo->TypeAttr.cFuncs; ++fdc) { - TLBFuncDesc *pFInfo = &pTInfo->funcdescs[fdc]; - if(!memcmp(szNameBuf,pFInfo->Name,nNameBufLen)) goto ITypeLib2_fnFindName_exit; - for(pc = 0;pc < pFInfo->funcdesc.cParams; pc++) { - if(!memcmp(szNameBuf,pFInfo->pParamDesc[pc].Name,nNameBufLen)) + TLBFuncDesc *func = &pTInfo->funcdescs[fdc]; + UINT pc; + + if(!memcmp(name, func->Name, len)) goto ITypeLib2_fnFindName_exit; + for(pc = 0; pc < func->funcdesc.cParams; pc++) { + if(!memcmp(name, func->pParamDesc[pc].Name, len)) goto ITypeLib2_fnFindName_exit; } } - pVInfo = TLB_get_vardesc_by_name(pTInfo->vardescs, pTInfo->TypeAttr.cVars, szNameBuf); - if(pVInfo) + var = TLB_get_vardesc_by_name(pTInfo->vardescs, pTInfo->TypeAttr.cVars, name); + if (var) goto ITypeLib2_fnFindName_exit; continue; @@ -4620,10 +4630,9 @@ ITypeLib2_fnFindName_exit: ppTInfo[count]=(LPTYPEINFO)pTInfo; count++; } - TRACE("(%p)slow! search for %d with %s: found %d TypeInfos!\n", - This, *pcFound, debugstr_w(szNameBuf), count); + TRACE("found %d typeinfos\n", count); - *pcFound = count; + *found = count; return S_OK; }

1 0

Austin English : wer: Add a stub for WerReportSetUIOption.
by Alexandre Julliard Jan. 26, 2012

Jan. 26, 2012

Module: wine Branch: master Commit: 8842cd13a1e9068ac719b03730fb1f1276550ccd URL: http://source.winehq.org/git/wine.git/?a=commit;h=8842cd13a1e9068ac719b0373… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Jan 25 14:56:35 2012 -0800 wer: Add a stub for WerReportSetUIOption. --- dlls/wer/main.c | 9 +++++++++ dlls/wer/wer.spec | 2 +- include/werapi.h | 17 +++++++++++++++++ 3 files changed, 27 insertions(+), 1 deletions(-) diff --git a/dlls/wer/main.c b/dlls/wer/main.c index d68d652..ae9ab26 100644 --- a/dlls/wer/main.c +++ b/dlls/wer/main.c @@ -348,3 +348,12 @@ HRESULT WINAPI WerReportSubmit(HREPORT hreport, WER_CONSENT consent, DWORD flags *presult = WerDisabled; return E_NOTIMPL; } + +/*********************************************************************** + * WerReportSetUIOption (wer.@) + */ +HRESULT WINAPI WerReportSetUIOption(HREPORT hreport, WER_REPORT_UI uitype, PCWSTR value) +{ + FIXME("(%p, %d, %s) :stub\n", hreport, uitype, debugstr_w(value)); + return E_NOTIMPL; +} diff --git a/dlls/wer/wer.spec b/dlls/wer/wer.spec index bfc39e4..fe9fad7 100644 --- a/dlls/wer/wer.spec +++ b/dlls/wer/wer.spec @@ -68,7 +68,7 @@ @ stdcall WerReportCloseHandle(ptr) @ stdcall WerReportCreate(wstr long ptr ptr) @ stdcall WerReportSetParameter(ptr long wstr wstr) -@ stub WerReportSetUIOption +@ stdcall WerReportSetUIOption(ptr long wstr) @ stdcall WerReportSubmit(ptr long long ptr) @ stub WerpGetReportConsent @ stub WerpIsDisabled diff --git a/include/werapi.h b/include/werapi.h index e8ec487..c709dad 100644 --- a/include/werapi.h +++ b/include/werapi.h @@ -121,6 +121,22 @@ typedef enum _WER_DUMP_TYPE WerDumpTypeMax } WER_DUMP_TYPE; +typedef enum _WER_REPORT_UI +{ + WerUIAdditionalDataDlgHeader = 1, + WerUIIconFilePath = 2, + WerUIConsentDlgHeader = 3, + WerUIConsentDlgBody = 4, + WerUIOnlineSolutionCheckText = 5, + WerUIOfflineSolutionCheckText = 6, + WerUICloseText = 7, + WerUICloseDlgHeader = 8, + WerUICloseDlgBody = 9, + WerUICloseDlgButtonText = 10, + WerUICustomActionButtonText = 11, + WerUIMax +} WER_REPORT_UI; + /* #### */ typedef struct _WER_DUMP_CUSTOM_OPTIONS @@ -153,6 +169,7 @@ HRESULT WINAPI WerRemoveExcludedApplication(PCWSTR, BOOL); HRESULT WINAPI WerReportCloseHandle(HREPORT); HRESULT WINAPI WerReportCreate(PCWSTR, WER_REPORT_TYPE, PWER_REPORT_INFORMATION, HREPORT*); HRESULT WINAPI WerReportSetParameter(HREPORT, DWORD, PCWSTR, PCWSTR); +HRESULT WINAPI WerReportSetUIOption(HREPORT, WER_REPORT_UI, PCWSTR); HRESULT WINAPI WerReportSubmit(HREPORT, WER_CONSENT, DWORD, PWER_SUBMIT_RESULT); #ifdef __cplusplus

1 0

Henri Verbeet : crypt32: Use a larger temporary buffer in CRYPT_AsnDecodeOidIgnoreTag().
by Alexandre Julliard Jan. 26, 2012

Jan. 26, 2012

Module: wine Branch: master Commit: db156752804b2a21280472b3ce092b73206451c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=db156752804b2a21280472b3c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jan 26 00:21:19 2012 +0100 crypt32: Use a larger temporary buffer in CRYPT_AsnDecodeOidIgnoreTag(). --- dlls/crypt32/decode.c | 11 +++-------- 1 files changed, 3 insertions(+), 8 deletions(-) diff --git a/dlls/crypt32/decode.c b/dlls/crypt32/decode.c index 4a22533..bdcb744 100644 --- a/dlls/crypt32/decode.c +++ b/dlls/crypt32/decode.c @@ -1310,22 +1310,17 @@ static BOOL CRYPT_AsnDecodeOidIgnoreTag(const BYTE *pbEncoded, DWORD cbEncoded, if (dataLen) { - /* The largest possible string for the first two components - * is 2.175 (= 2 * 40 + 175 = 255), so this is big enough. - */ - char firstTwo[6]; const BYTE *ptr; + char str[32]; - snprintf(firstTwo, sizeof(firstTwo), "%d.%d", + snprintf(str, sizeof(str), "%d.%d", pbEncoded[1 + lenBytes] / 40, pbEncoded[1 + lenBytes] - (pbEncoded[1 + lenBytes] / 40) * 40); - bytesNeeded += strlen(firstTwo) + 1; + bytesNeeded += strlen(str) + 1; for (ptr = pbEncoded + 2 + lenBytes; ret && ptr - pbEncoded - 1 - lenBytes < dataLen; ) { - /* large enough for ".4000000" */ - char str[9]; int val = 0; while (ptr - pbEncoded - 1 - lenBytes < dataLen &&

1 0

Jacek Caban : mshtml: Use set_nsstyle_attr_var helper in IHTMLStyle:: put_marginLeft implementation.
by Alexandre Julliard Jan. 26, 2012

Jan. 26, 2012

Module: wine Branch: master Commit: 7d18377ba4b216509d1b1f86f358b77c2bde0923 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d18377ba4b216509d1b1f86f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jan 26 14:33:38 2012 +0100 mshtml: Use set_nsstyle_attr_var helper in IHTMLStyle::put_marginLeft implementation. --- dlls/mshtml/htmlstyle.c | 21 ++------------------- dlls/mshtml/tests/style.c | 11 +++++++++++ 2 files changed, 13 insertions(+), 19 deletions(-) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index 77b7da1..523fc8f 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -1523,26 +1523,9 @@ static HRESULT WINAPI HTMLStyle_put_marginLeft(IHTMLStyle *iface, VARIANT v) { HTMLStyle *This = impl_from_IHTMLStyle(iface); - switch(V_VT(&v)) { - case VT_NULL: - TRACE("(%p)->(NULL)\n", This); - return set_style_attr(This, STYLEID_MARGIN_LEFT, emptyW, 0); - case VT_I4: { - WCHAR buf[14]; - - TRACE("(%p)->(%d)\n", This, V_I4(&v)); - - wsprintfW(buf, px_formatW, V_I4(&v)); - return set_style_attr(This, STYLEID_MARGIN_LEFT, buf, 0); - } - case VT_BSTR: - TRACE("(%p)->(%s)\n", This, debugstr_w(V_BSTR(&v))); - return set_style_attr(This, STYLEID_MARGIN_LEFT, V_BSTR(&v), 0); - default: - FIXME("Unsupported vt=%d\n", V_VT(&v)); - } + TRACE("(%p)->(v%d)\n", This, V_VT(&v)); - return E_NOTIMPL; + return set_nsstyle_attr_var(This->nsstyle, STYLEID_MARGIN_LEFT, &v, ATTR_FIX_PX); } static HRESULT WINAPI HTMLStyle_put_margin(IHTMLStyle *iface, BSTR v) diff --git a/dlls/mshtml/tests/style.c b/dlls/mshtml/tests/style.c index 9033c8c..e950f83 100644 --- a/dlls/mshtml/tests/style.c +++ b/dlls/mshtml/tests/style.c @@ -404,6 +404,17 @@ static void test_body_style(IHTMLStyle *style) ok(V_VT(&v) == VT_BSTR, "V_VT(marginLeft) = %d\n", V_VT(&v)); ok(!V_BSTR(&v), "V_BSTR(marginLeft) = %s\n", wine_dbgstr_w(V_BSTR(&v))); + V_VT(&v) = VT_I4; + V_I4(&v) = 6; + hres = IHTMLStyle_put_marginLeft(style, v); + ok(hres == S_OK, "put_marginLeft failed: %08x\n", hres); + + V_VT(&v) = VT_NULL; + hres = IHTMLStyle_get_marginLeft(style, &v); + ok(hres == S_OK, "get_marginLeft failed: %08x\n", hres); + ok(V_VT(&v) == VT_BSTR, "V_VT(marginLeft) = %d\n", V_VT(&v)); + ok(!strcmp_wa(V_BSTR(&v), "6px"), "V_BSTR(marginLeft) = %s\n", wine_dbgstr_w(V_BSTR(&v))); + str = (void*)0xdeadbeef; hres = IHTMLStyle_get_fontFamily(style, &str); ok(hres == S_OK, "get_fontFamily failed: %08x\n", hres);

1 0