wine-commits February 2013

wine-commits@winehq.org

2 participants
459 discussions

Dmitry Timoshkov : gdi32: OffsetClipRgn should update actual clipping region for a EMF DC.
by Alexandre Julliard 14 Feb '13

14 Feb '13

Module: wine Branch: master Commit: 756736ae42bb6939d9d744a5f2c8e3e2318e45ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=756736ae42bb6939d9d744a5f… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Feb 14 13:37:38 2013 +0800 gdi32: OffsetClipRgn should update actual clipping region for a EMF DC. --- dlls/gdi32/enhmfdrv/dc.c | 6 +++++- dlls/gdi32/tests/metafile.c | 2 -- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/gdi32/enhmfdrv/dc.c b/dlls/gdi32/enhmfdrv/dc.c index 44dc741..f4c4a43 100644 --- a/dlls/gdi32/enhmfdrv/dc.c +++ b/dlls/gdi32/enhmfdrv/dc.c @@ -181,12 +181,16 @@ INT EMFDRV_IntersectClipRect( PHYSDEV dev, INT left, INT top, INT right, INT bot INT EMFDRV_OffsetClipRgn( PHYSDEV dev, INT x, INT y ) { + PHYSDEV next = GET_NEXT_PHYSDEV( dev, pOffsetClipRgn ); EMROFFSETCLIPRGN emr; + BOOL ret; + emr.emr.iType = EMR_OFFSETCLIPRGN; emr.emr.nSize = sizeof(emr); emr.ptlOffset.x = x; emr.ptlOffset.y = y; - return EMFDRV_WriteRecord( dev, &emr.emr ); + ret = EMFDRV_WriteRecord( dev, &emr.emr ); + return ret ? next->funcs->pOffsetClipRgn( next, x, y ) : ERROR; } INT EMFDRV_ExtSelectClipRgn( PHYSDEV dev, HRGN hrgn, INT mode ) diff --git a/dlls/gdi32/tests/metafile.c b/dlls/gdi32/tests/metafile.c index 115db07..e969c47 100644 --- a/dlls/gdi32/tests/metafile.c +++ b/dlls/gdi32/tests/metafile.c @@ -2501,12 +2501,10 @@ static void test_emf_clipping(void) OffsetRect(&rc_sclip, -100, -100); ret = OffsetClipRgn(hdc, -100, -100); -todo_wine ok(ret == SIMPLEREGION, "got %d\n", ret); SetRect(&rc_res, -1, -1, -1, -1); ret = GetClipBox(hdc, &rc_res); ok(ret == SIMPLEREGION, "got %d\n", ret); -todo_wine ok(EqualRect(&rc_res, &rc_sclip), "expected (%d,%d)-(%d,%d), got (%d,%d)-(%d,%d)\n", rc_sclip.left, rc_sclip.top, rc_sclip.right, rc_sclip.bottom,

1 0

Dmitry Timoshkov : gdi32: Add more EMF clipping tests.
by Alexandre Julliard 14 Feb '13

14 Feb '13

Module: wine Branch: master Commit: 498b18f25fd1055060279427b9cca80c7a7fdb6f URL: http://source.winehq.org/git/wine.git/?a=commit;h=498b18f25fd1055060279427b… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Feb 14 13:37:11 2013 +0800 gdi32: Add more EMF clipping tests. --- dlls/gdi32/tests/metafile.c | 70 ++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 69 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/tests/metafile.c b/dlls/gdi32/tests/metafile.c index 2623847..115db07 100644 --- a/dlls/gdi32/tests/metafile.c +++ b/dlls/gdi32/tests/metafile.c @@ -60,6 +60,20 @@ static void init_function_pointers(void) GDI_GET_PROC(SetDCPenColor); } +static DWORD rgn_rect_count(HRGN hrgn) +{ + DWORD size; + RGNDATA *data; + + if (!hrgn) return 0; + if (!(size = GetRegionData(hrgn, 0, NULL))) return 0; + if (!(data = HeapAlloc(GetProcessHeap(), 0, size))) return 0; + GetRegionData(hrgn, size, data); + size = data->rdh.nCount; + HeapFree(GetProcessHeap(), 0, data); + return size; +} + static int CALLBACK eto_emf_enum_proc(HDC hdc, HANDLETABLE *handle_table, const ENHMETARECORD *emr, int n_objs, LPARAM param) { @@ -2481,10 +2495,64 @@ static void test_emf_clipping(void) ret = GetClipBox(hdc, &rc_res); ok(ret == SIMPLEREGION, "got %d\n", ret); ok(EqualRect(&rc_res, &rc_sclip), - "expected rc_res (%d,%d)-(%d,%d), got (%d,%d)-(%d,%d)\n", + "expected (%d,%d)-(%d,%d), got (%d,%d)-(%d,%d)\n", + rc_sclip.left, rc_sclip.top, rc_sclip.right, rc_sclip.bottom, + rc_res.left, rc_res.top, rc_res.right, rc_res.bottom); + + OffsetRect(&rc_sclip, -100, -100); + ret = OffsetClipRgn(hdc, -100, -100); +todo_wine + ok(ret == SIMPLEREGION, "got %d\n", ret); + SetRect(&rc_res, -1, -1, -1, -1); + ret = GetClipBox(hdc, &rc_res); + ok(ret == SIMPLEREGION, "got %d\n", ret); +todo_wine + ok(EqualRect(&rc_res, &rc_sclip), + "expected (%d,%d)-(%d,%d), got (%d,%d)-(%d,%d)\n", rc_sclip.left, rc_sclip.top, rc_sclip.right, rc_sclip.bottom, rc_res.left, rc_res.top, rc_res.right, rc_res.bottom); + ret = IntersectClipRect(hdc, 0, 0, 100, 100); +todo_wine + ok(ret == SIMPLEREGION || broken(ret == COMPLEXREGION) /* XP */, "got %d\n", ret); + if (ret == COMPLEXREGION) + { + /* XP returns COMPLEXREGION although region contains only 1 rect */ + ret = GetClipRgn(hdc, hrgn); + ok(ret == 1, "expected 1, got %d\n", ret); + ret = rgn_rect_count(hrgn); + ok(ret == 1, "expected 1, got %d\n", ret); + } + SetRect(&rc_res, -1, -1, -1, -1); + ret = GetClipBox(hdc, &rc_res); + ok(ret == SIMPLEREGION, "got %d\n", ret); +todo_wine + ok(EqualRect(&rc_res, &rc), + "expected (%d,%d)-(%d,%d), got (%d,%d)-(%d,%d)\n", + rc.left, rc.top, rc.right, rc.bottom, + rc_res.left, rc_res.top, rc_res.right, rc_res.bottom); + + SetRect(&rc_sclip, 0, 0, 100, 50); + ret = ExcludeClipRect(hdc, 0, 50, 100, 100); +todo_wine + ok(ret == SIMPLEREGION || broken(ret == COMPLEXREGION) /* XP */, "got %d\n", ret); + if (ret == COMPLEXREGION) + { + /* XP returns COMPLEXREGION although region contains only 1 rect */ + ret = GetClipRgn(hdc, hrgn); + ok(ret == 1, "expected 1, got %d\n", ret); + ret = rgn_rect_count(hrgn); + ok(ret == 1, "expected 1, got %d\n", ret); + } + SetRect(&rc_res, -1, -1, -1, -1); + ret = GetClipBox(hdc, &rc_res); + ok(ret == SIMPLEREGION, "got %d\n", ret); +todo_wine + ok(EqualRect(&rc_res, &rc_sclip), + "expected (%d,%d)-(%d,%d), got (%d,%d)-(%d,%d)\n", + rc.left, rc.top, rc.right, rc.bottom, + rc_res.left, rc_res.top, rc_res.right, rc_res.bottom); + hemf = CloseEnhMetaFile(hdc); DeleteEnhMetaFile(hemf); DeleteObject(hrgn);

1 0

Michael Stefaniuc : wineoss.drv: Use offsetof to calculate the size of a struct with variable length array.
by Alexandre Julliard 14 Feb '13

14 Feb '13

Module: wine Branch: master Commit: f12855143939e28d9912991674a58129dfb8f884 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f12855143939e28d991299167… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Feb 13 23:44:39 2013 +0100 wineoss.drv: Use offsetof to calculate the size of a struct with variable length array. --- dlls/wineoss.drv/midi.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/wineoss.drv/midi.c b/dlls/wineoss.drv/midi.c index 0bf5d87..11b7c91 100644 --- a/dlls/wineoss.drv/midi.c +++ b/dlls/wineoss.drv/midi.c @@ -1115,8 +1115,7 @@ static DWORD modOpen(WORD wDevID, LPMIDIOPENDESC lpDesc, DWORD dwFlags) void* extra; extra = HeapAlloc(GetProcessHeap(), 0, - sizeof(struct sFMextra) + - sizeof(struct sVoice) * (MidiOutDev[wDevID].caps.wVoices - 1)); + offsetof(struct sFMextra, voice[MidiOutDev[wDevID].caps.wVoices])); if (extra == 0) { WARN("can't alloc extra data !\n");

1 0

Andrew Talbot : msctf: Avoid signed-unsigned integer comparisons.
by Alexandre Julliard 14 Feb '13

14 Feb '13

Module: wine Branch: master Commit: 1a1577d791e446fb59845390a0b64f0cea0f0278 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a1577d791e446fb59845390a… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Wed Feb 13 21:06:41 2013 +0000 msctf: Avoid signed-unsigned integer comparisons. --- dlls/msctf/categorymgr.c | 2 +- dlls/msctf/context.c | 2 +- dlls/msctf/msctf.c | 10 +++++----- dlls/msctf/threadmgr.c | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/msctf/categorymgr.c b/dlls/msctf/categorymgr.c index 167e059..c1596c2 100644 --- a/dlls/msctf/categorymgr.c +++ b/dlls/msctf/categorymgr.c @@ -241,7 +241,7 @@ static HRESULT WINAPI CategoryMgr_FindClosestCategory ( ITfCategoryMgr *iface, if (ulCount) { - int j; + ULONG j; BOOL found = FALSE; for (j = 0; j < ulCount; j++) if (IsEqualGUID(&guid, ppcatidList[j])) diff --git a/dlls/msctf/context.c b/dlls/msctf/context.c index c8d3ac4..147805c 100644 --- a/dlls/msctf/context.c +++ b/dlls/msctf/context.c @@ -369,7 +369,7 @@ static HRESULT WINAPI Context_SetSelection (ITfContext *iface, { TS_SELECTION_ACP *acp; Context *This = (Context *)iface; - INT i; + ULONG i; HRESULT hr; TRACE("(%p) %i %i %p\n",This,ec,ulCount,pSelection); diff --git a/dlls/msctf/msctf.c b/dlls/msctf/msctf.c index bc12a29..109c3ab 100644 --- a/dlls/msctf/msctf.c +++ b/dlls/msctf/msctf.c @@ -198,7 +198,7 @@ static HRESULT ClassFactory_Constructor(LPFNCONSTRUCTOR ctor, LPVOID *ppvOut) */ DWORD generate_Cookie(DWORD magic, LPVOID data) { - int i; + UINT i; /* try to reuse IDs if possible */ for (i = 0; i < id_last; i++) @@ -282,7 +282,7 @@ LPVOID remove_Cookie(DWORD id) DWORD enumerate_Cookie(DWORD magic, DWORD *index) { - int i; + unsigned int i; for (i = *index; i < id_last; i++) if (cookies[i].id != 0 && cookies[i].magic == magic) { @@ -614,12 +614,12 @@ HRESULT WINAPI SetInputScopes(HWND hwnd, const INT *pInputScopes, UINT cInputScopes, WCHAR **ppszPhraseList, UINT cPhrases, WCHAR *pszRegExp, WCHAR *pszSRGS) { - int i; + UINT i; FIXME("STUB: %p ... %s %s\n",hwnd, debugstr_w(pszRegExp), debugstr_w(pszSRGS)); for (i = 0; i < cInputScopes; i++) - TRACE("\tScope[%i] = %i\n",i,pInputScopes[i]); + TRACE("\tScope[%u] = %i\n",i,pInputScopes[i]); for (i = 0; i < cPhrases; i++) - TRACE("\tPhrase[%i] = %s\n",i,debugstr_w(ppszPhraseList[i])); + TRACE("\tPhrase[%u] = %s\n",i,debugstr_w(ppszPhraseList[i])); return S_OK; } diff --git a/dlls/msctf/threadmgr.c b/dlls/msctf/threadmgr.c index 5a18b39..63c7ba0 100644 --- a/dlls/msctf/threadmgr.c +++ b/dlls/msctf/threadmgr.c @@ -1392,7 +1392,7 @@ static HRESULT WINAPI EnumTfDocumentMgr_Next(IEnumTfDocumentMgrs *iface, static HRESULT WINAPI EnumTfDocumentMgr_Skip( IEnumTfDocumentMgrs* iface, ULONG celt) { - INT i; + ULONG i; EnumTfDocumentMgr *This = (EnumTfDocumentMgr *)iface; TRACE("(%p)\n",This); for(i = 0; i < celt && This->index != NULL; i++)

1 0

Andrew Talbot : msdaps: Avoid signed-unsigned integer comparisons.
by Alexandre Julliard 14 Feb '13

14 Feb '13

Module: wine Branch: master Commit: 78d9ee8a1a286dbb9b92ae3a7b417937b8ab14da URL: http://source.winehq.org/git/wine.git/?a=commit;h=78d9ee8a1a286dbb9b92ae3a7… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Wed Feb 13 21:06:47 2013 +0000 msdaps: Avoid signed-unsigned integer comparisons. --- dlls/msdaps/usrmarshal.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msdaps/usrmarshal.c b/dlls/msdaps/usrmarshal.c index 7b983f3..3f2b9e6 100644 --- a/dlls/msdaps/usrmarshal.c +++ b/dlls/msdaps/usrmarshal.c @@ -695,10 +695,10 @@ HRESULT CALLBACK IRowsetInfo_GetProperties_Proxy(IRowsetInfo* This, const ULONG for(i = 0; i < cPropertyIDSets; i++) { - int j; + unsigned int j; TRACE("%d: %s %d props\n", i, debugstr_guid(&rgPropertyIDSets[i].guidPropertySet), rgPropertyIDSets[i].cPropertyIDs); for(j = 0; j < rgPropertyIDSets[i].cPropertyIDs; j++) - TRACE("\t%d: prop id %d\n", j, rgPropertyIDSets[i].rgPropertyIDs[j]); + TRACE("\t%u: prop id %d\n", j, rgPropertyIDSets[i].rgPropertyIDs[j]); } hr = IRowsetInfo_RemoteGetProperties_Proxy(This, cPropertyIDSets, rgPropertyIDSets, pcPropertySets, prgPropertySets, &error);

1 0

Roman Dadkov : mpr/tests: Test to check the return values of WNetGetUniversalNameA.
by Alexandre Julliard 13 Feb '13

13 Feb '13

Module: wine Branch: master Commit: b8d081b0a88c55e142e0c3419326365b119a377f URL: http://source.winehq.org/git/wine.git/?a=commit;h=b8d081b0a88c55e142e0c3419… Author: Roman Dadkov <romand(a)etersoft.ru> Date: Tue Feb 12 18:26:00 2013 +0400 mpr/tests: Test to check the return values of WNetGetUniversalNameA. --- dlls/mpr/tests/mpr.c | 96 ++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 94 insertions(+), 2 deletions(-) diff --git a/dlls/mpr/tests/mpr.c b/dlls/mpr/tests/mpr.c index 8ccce78..90e1aec 100644 --- a/dlls/mpr/tests/mpr.c +++ b/dlls/mpr/tests/mpr.c @@ -28,11 +28,12 @@ static void test_WNetGetUniversalName(void) { DWORD ret; char buffer[1024]; - DWORD drive_type, info_size; + DWORD drive_type, info_size, fail_size; char driveA[] = "A:\\"; + char driveandpathA[] = "A:\\file.txt"; WCHAR driveW[] = {'A',':','\\',0}; - for(; *driveA <= 'Z'; ++*driveA, ++*driveW){ + for(; *driveA <= 'Z'; ++*driveA, ++*driveandpathA, ++*driveW){ drive_type = GetDriveTypeW(driveW); info_size = sizeof(buffer); @@ -50,6 +51,25 @@ static void test_WNetGetUniversalName(void) ok(info_size == sizeof(buffer), "Got wrong size: %u\n", info_size); + fail_size = 0; + ret = WNetGetUniversalNameA(driveA, UNIVERSAL_NAME_INFO_LEVEL, + buffer, &fail_size); + if(drive_type == DRIVE_REMOTE) + todo_wine ok(ret == WN_BAD_VALUE, "WNetGetUniversalNameA failed: %08x\n", ret); + else + ok(ret == ERROR_NOT_CONNECTED, "WNetGetUniversalNameA gave wrong error: %08x\n", ret); + + fail_size = sizeof(driveA) / sizeof(char) - 1; + ret = WNetGetUniversalNameA(driveA, UNIVERSAL_NAME_INFO_LEVEL, + buffer, &fail_size); + if(drive_type == DRIVE_REMOTE) + ok(ret == WN_MORE_DATA, "WNetGetUniversalNameA failed: %08x\n", ret); + + ret = WNetGetUniversalNameA(driveandpathA, UNIVERSAL_NAME_INFO_LEVEL, + buffer, &info_size); + if(drive_type == DRIVE_REMOTE) + todo_wine ok(ret == WN_NO_ERROR, "WNetGetUniversalNameA failed: %08x\n", ret); + info_size = sizeof(buffer); ret = WNetGetUniversalNameW(driveW, UNIVERSAL_NAME_INFO_LEVEL, buffer, &info_size); @@ -60,7 +80,78 @@ static void test_WNetGetUniversalName(void) ok((ret == WN_NOT_CONNECTED) || (ret == WN_NO_NET_OR_BAD_PATH), "WNetGetUniversalNameW(%s, ...) returned %u (drive_type: %u)\n", wine_dbgstr_w(driveW), ret, drive_type); + if(drive_type != DRIVE_REMOTE) + ok(info_size == sizeof(buffer), "Got wrong size: %u\n", info_size); + } +} +static void test_WNetGetRemoteName(void) +{ + DWORD ret; + char buffer[1024]; + DWORD drive_type, info_size, fail_size; + char driveA[] = "A:\\"; + char driveandpathA[] = "A:\\file.txt"; + WCHAR driveW[] = {'A',':','\\',0}; + + for(; *driveA <= 'Z'; ++*driveA, ++*driveandpathA, ++*driveW){ + drive_type = GetDriveTypeW(driveW); + + info_size = sizeof(buffer); + ret = WNetGetUniversalNameA(driveA, REMOTE_NAME_INFO_LEVEL, + buffer, &info_size); + todo_wine{ + if(drive_type == DRIVE_REMOTE) + ok(ret == WN_NO_ERROR, "WNetGetUniversalNameA failed: %08x\n", ret); + else + ok(ret == ERROR_NOT_CONNECTED, "WNetGetUniversalNameA gave wrong error: %08x\n", ret); + } + ok(info_size == sizeof(buffer), "Got wrong size: %u\n", info_size); + + fail_size = 0; + ret = WNetGetUniversalNameA(driveA, REMOTE_NAME_INFO_LEVEL, + buffer, &fail_size); + todo_wine{ + if(drive_type == DRIVE_REMOTE) + ok(ret == WN_BAD_VALUE, "WNetGetUniversalNameA failed: %08x\n", ret); + else + ok(ret == ERROR_NOT_CONNECTED, "WNetGetUniversalNameA gave wrong error: %08x\n", ret); + } + ret = WNetGetUniversalNameA(driveA, REMOTE_NAME_INFO_LEVEL, + buffer, NULL); + todo_wine ok(ret == WN_BAD_POINTER, "WNetGetUniversalNameA failed: %08x\n", ret); + + ret = WNetGetUniversalNameA(driveA, REMOTE_NAME_INFO_LEVEL, + NULL, &info_size); + + todo_wine{ + if(((GetVersion() & 0x8000ffff) == 0x00000004) || /* NT40 */ + (drive_type == DRIVE_REMOTE)) + ok(ret == WN_BAD_POINTER, "WNetGetUniversalNameA failed: %08x\n", ret); + else + ok(ret == ERROR_NOT_CONNECTED, "WNetGetUniversalNameA failed: %08x\n", ret); + } + + fail_size = sizeof(driveA) / sizeof(char) - 1; + ret = WNetGetUniversalNameA(driveA, REMOTE_NAME_INFO_LEVEL, + buffer, &fail_size); + if(drive_type == DRIVE_REMOTE) + todo_wine ok(ret == WN_MORE_DATA, "WNetGetUniversalNameA failed: %08x\n", ret); + + ret = WNetGetUniversalNameA(driveandpathA, REMOTE_NAME_INFO_LEVEL, + buffer, &info_size); + if(drive_type == DRIVE_REMOTE) + todo_wine ok(ret == WN_NO_ERROR, "WNetGetUniversalNameA failed: %08x\n", ret); + + info_size = sizeof(buffer); + ret = WNetGetUniversalNameW(driveW, REMOTE_NAME_INFO_LEVEL, + buffer, &info_size); + todo_wine{ + if(drive_type == DRIVE_REMOTE) + ok(ret == WN_NO_ERROR, "WNetGetUniversalNameW failed: %08x\n", ret); + else + ok(ret == ERROR_NOT_CONNECTED, "WNetGetUniversalNameW gave wrong error: %08x\n", ret); + } ok(info_size == sizeof(buffer), "Got wrong size: %u\n", info_size); } } @@ -68,4 +159,5 @@ static void test_WNetGetUniversalName(void) START_TEST(mpr) { test_WNetGetUniversalName(); + test_WNetGetRemoteName(); }

1 0

Roman Dadkov : ole32/tests: Add test for SetClientSite.
by Alexandre Julliard 13 Feb '13

13 Feb '13

Module: wine Branch: master Commit: 8a4557ac8b84177d9718f9c83f792840902fe84d URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a4557ac8b84177d9718f9c83… Author: Roman Dadkov <romand(a)etersoft.ru> Date: Wed Feb 13 17:27:15 2013 +0400 ole32/tests: Add test for SetClientSite. --- dlls/ole32/tests/ole2.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/ole32/tests/ole2.c b/dlls/ole32/tests/ole2.c index 27653c1..4ef6638 100644 --- a/dlls/ole32/tests/ole2.c +++ b/dlls/ole32/tests/ole2.c @@ -1701,6 +1701,9 @@ static void test_default_handler(void) hr = IOleObject_GetClientSite(pObject, &pClientSite); ok_ole_success(hr, "IOleObject_GetClientSite"); + hr = IOleObject_SetClientSite(pObject, pClientSite); + ok_ole_success(hr, "IOleObject_SetClientSite"); + hr = IOleObject_GetClipboardData(pObject, 0, &pDataObject); ok(hr == OLE_E_NOTRUNNING, "IOleObject_GetClipboardData should have returned OLE_E_NOTRUNNING instead of 0x%08x\n",

1 0

Jacek Caban : oleaut32: Added some SysFreeString tests.
by Alexandre Julliard 13 Feb '13

13 Feb '13

Module: wine Branch: master Commit: 16d1b3b0261eed9e8881890783c26a214185dd0c URL: http://source.winehq.org/git/wine.git/?a=commit;h=16d1b3b0261eed9e888189078… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Feb 13 18:57:38 2013 +0100 oleaut32: Added some SysFreeString tests. --- dlls/oleaut32/tests/vartype.c | 43 +++++++++++++++++++++++++++++++++++++++++ 1 files changed, 43 insertions(+), 0 deletions(-) diff --git a/dlls/oleaut32/tests/vartype.c b/dlls/oleaut32/tests/vartype.c index 58b30b1..8ad549e 100644 --- a/dlls/oleaut32/tests/vartype.c +++ b/dlls/oleaut32/tests/vartype.c @@ -6072,6 +6072,47 @@ static void test_ChangeType_keep_dst(void) SysFreeString(bstr); } +/* This tests assumes an empty cache, so it needs to be ran early in the test. */ +static void test_bstr_cache(void) +{ + BSTR str, str2, strs[20]; + unsigned i; + + static const WCHAR testW[] = {'t','e','s','t',0}; + + str = SysAllocString(testW); + /* This should put the string into cache */ + SysFreeString(str); + /* The string is in cache, this won't touch it */ + SysFreeString(str); + + ok(SysStringLen(str) == 4, "unexpected len\n"); + ok(!lstrcmpW(str, testW), "string changed\n"); + + str2 = SysAllocString(testW); + ok(str == str2, "str != str2\n"); + SysFreeString(str2); + + /* Fill the bucket with cached entries. */ + for(i=0; i < sizeof(strs)/sizeof(*strs); i++) + strs[i] = SysAllocStringLen(NULL, 24); + for(i=0; i < sizeof(strs)/sizeof(*strs); i++) + SysFreeString(strs[i]); + + /* Following allocation will be made from cache */ + str = SysAllocStringLen(NULL, 24); + ok(str == strs[0], "str != strs[0]\n"); + + /* Smaller buffers may also use larget cached buffers */ + str2 = SysAllocStringLen(NULL, 16); + ok(str2 == strs[1], "str2 != strs[1]\n"); + + SysFreeString(str); + SysFreeString(str2); + SysFreeString(str); + SysFreeString(str2); +} + START_TEST(vartype) { hOleaut32 = GetModuleHandleA("oleaut32.dll"); @@ -6079,6 +6120,8 @@ START_TEST(vartype) trace("LCIDs: System=0x%08x, User=0x%08x\n", GetSystemDefaultLCID(), GetUserDefaultLCID()); + test_bstr_cache(); + test_VarI1FromI2(); test_VarI1FromI4(); test_VarI1FromI8();

1 0

Jacek Caban : oleaut32: Don't free a string in SysFreeString if it' s already in cache.
by Alexandre Julliard 13 Feb '13

13 Feb '13

Module: wine Branch: master Commit: ed9d78d2b96dd4c97a6402ff0d30ada47a352a6f URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed9d78d2b96dd4c97a6402ff0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Feb 13 18:57:21 2013 +0100 oleaut32: Don't free a string in SysFreeString if it's already in cache. --- dlls/oleaut32/oleaut.c | 25 +++++++++++++++++++------ 1 files changed, 19 insertions(+), 6 deletions(-) diff --git a/dlls/oleaut32/oleaut.c b/dlls/oleaut32/oleaut.c index 250a812..df9216b 100644 --- a/dlls/oleaut32/oleaut.c +++ b/dlls/oleaut32/oleaut.c @@ -90,14 +90,15 @@ typedef struct { } u; } bstr_t; +#define BUCKET_SIZE 16 +#define BUCKET_BUFFER_SIZE 6 + typedef struct { unsigned short head; unsigned short cnt; - bstr_t *buf[6]; + bstr_t *buf[BUCKET_BUFFER_SIZE]; } bstr_cache_entry_t; -#define BUCKET_SIZE 16 - #define ARENA_INUSE_FILLER 0x55 #define ARENA_TAIL_FILLER 0xab #define ARENA_FREE_FILLER 0xfeeefeee @@ -138,7 +139,7 @@ static bstr_t *alloc_bstr(size_t size) if(cache_entry) { ret = cache_entry->buf[cache_entry->head++]; - cache_entry->head %= sizeof(cache_entry->buf)/sizeof(*cache_entry->buf); + cache_entry->head %= BUCKET_BUFFER_SIZE; cache_entry->cnt--; } @@ -257,14 +258,26 @@ void WINAPI SysFreeString(BSTR str) bstr = bstr_from_str(str); cache_entry = get_cache_entry(bstr->size+sizeof(WCHAR)); if(cache_entry) { + unsigned i; + EnterCriticalSection(&cs_bstr_cache); + /* According to tests, freeing a string that's already in cache doesn't corrupt anything. + * For that to work we need to search the cache. */ + for(i=0; i < cache_entry->cnt; i++) { + if(cache_entry->buf[(cache_entry->head+cache_entry->cnt) % BUCKET_BUFFER_SIZE] == bstr) { + WARN_(heap)("String already is in cache!\n"); + LeaveCriticalSection(&cs_bstr_cache); + return; + } + } + if(cache_entry->cnt < sizeof(cache_entry->buf)/sizeof(*cache_entry->buf)) { - cache_entry->buf[(cache_entry->head+cache_entry->cnt)%((sizeof(cache_entry->buf)/sizeof(*cache_entry->buf)))] = bstr; + cache_entry->buf[(cache_entry->head+cache_entry->cnt) % BUCKET_BUFFER_SIZE] = bstr; cache_entry->cnt++; if(WARN_ON(heap)) { - unsigned i, n = bstr_alloc_size(bstr->size) / sizeof(DWORD) - 1; + unsigned n = bstr_alloc_size(bstr->size) / sizeof(DWORD) - 1; bstr->size = ARENA_FREE_FILLER; for(i=0; i<n; i++) bstr->u.dwptr[i] = ARENA_FREE_FILLER;

1 0

André Hentschel : ntdll: Implement RtlUnwind for ARM.
by Alexandre Julliard 13 Feb '13

13 Feb '13

Module: wine Branch: master Commit: 22c39932263a32989d80c5efa145ba12d722d048 URL: http://source.winehq.org/git/wine.git/?a=commit;h=22c39932263a32989d80c5efa… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Feb 13 16:36:41 2013 +0100 ntdll: Implement RtlUnwind for ARM. --- dlls/ntdll/signal_arm.c | 55 +++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 53 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/signal_arm.c b/dlls/ntdll/signal_arm.c index 6abd76b..bf94b17 100644 --- a/dlls/ntdll/signal_arm.c +++ b/dlls/ntdll/signal_arm.c @@ -916,9 +916,60 @@ void __wine_enter_vm86( CONTEXT *context ) /*********************************************************************** * RtlUnwind (NTDLL.@) */ -void WINAPI RtlUnwind( PVOID pEndFrame, PVOID targetIp, PEXCEPTION_RECORD pRecord, PVOID retval ) +void WINAPI RtlUnwind( void *endframe, void *target_ip, EXCEPTION_RECORD *rec, void *retval ) { - FIXME( "Not implemented on ARM\n" ); + CONTEXT context; + EXCEPTION_RECORD record; + EXCEPTION_REGISTRATION_RECORD *frame, *dispatch; + DWORD res; + + RtlCaptureContext( &context ); + context.R0 = (DWORD)retval; + + /* build an exception record, if we do not have one */ + if (!rec) + { + record.ExceptionCode = STATUS_UNWIND; + record.ExceptionFlags = 0; + record.ExceptionRecord = NULL; + record.ExceptionAddress = (void *)context.Pc; + record.NumberParameters = 0; + rec = &record; + } + + rec->ExceptionFlags |= EH_UNWINDING | (endframe ? 0 : EH_EXIT_UNWIND); + + TRACE( "code=%x flags=%x\n", rec->ExceptionCode, rec->ExceptionFlags ); + + /* get chain of exception frames */ + frame = NtCurrentTeb()->Tib.ExceptionList; + while ((frame != (EXCEPTION_REGISTRATION_RECORD*)~0UL) && (frame != endframe)) + { + /* Check frame address */ + if (endframe && ((void*)frame > endframe)) + raise_status( STATUS_INVALID_UNWIND_TARGET, rec ); + + if (!is_valid_frame( frame )) raise_status( STATUS_BAD_STACK, rec ); + + /* Call handler */ + TRACE( "calling handler at %p code=%x flags=%x\n", + frame->Handler, rec->ExceptionCode, rec->ExceptionFlags ); + res = frame->Handler(rec, frame, &context, &dispatch); + TRACE( "handler at %p returned %x\n", frame->Handler, res ); + + switch(res) + { + case ExceptionContinueSearch: + break; + case ExceptionCollidedUnwind: + frame = dispatch; + break; + default: + raise_status( STATUS_INVALID_DISPOSITION, rec ); + break; + } + frame = __wine_pop_frame( frame ); + } } /*******************************************************************

1 0

← Newer
1
...
27
28
29
30
31
32
33
...
46
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 February 2013