March 2014 - Wine-Commits - list.winehq.org

Jacek Caban : vbscript: Store required stack offset before doing jump.
by Alexandre Julliard March 25, 2014

March 25, 2014

Module: wine Branch: master Commit: f6d6238e935808298362bfbc02985d9b5cc4db14 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f6d6238e935808298362bfbc0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 25 14:58:41 2014 +0100 vbscript: Store required stack offset before doing jump. --- dlls/vbscript/interp.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index a9c8766..4be96a2 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -2124,9 +2124,8 @@ HRESULT exec_script(script_ctx_t *ctx, function_t *func, vbdisp_t *vbthis, DISPP TRACE("unwind jmp %d stack_off %d\n", exec.instr->arg1.uint, exec.instr->arg2.uint); - instr_jmp(&exec, exec.instr->arg1.uint); - stack_off = exec.instr->arg2.uint; + instr_jmp(&exec, exec.instr->arg1.uint); if(exec.top > stack_off) { stack_popn(&exec, exec.top-stack_off);

1 0

André Hentschel : setupapi: Don' t confuse ARM with ARM64.
by Alexandre Julliard March 25, 2014

March 25, 2014

Module: wine Branch: master Commit: 99c151a1468e9f7272ca0a772ce7f9368fef5243 URL: http://source.winehq.org/git/wine.git/?a=commit;h=99c151a1468e9f7272ca0a772… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Mar 25 19:46:04 2014 +0100 setupapi: Don't confuse ARM with ARM64. --- dlls/setupapi/fakedll.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/setupapi/fakedll.c b/dlls/setupapi/fakedll.c index e74a306..8e3dffb 100644 --- a/dlls/setupapi/fakedll.c +++ b/dlls/setupapi/fakedll.c @@ -278,9 +278,9 @@ static BOOL build_fake_dll( HANDLE file, const WCHAR *name ) #if defined __x86_64__ nt->FileHeader.Machine = IMAGE_FILE_MACHINE_AMD64; #elif defined __aarch64__ - nt->FileHeader.Machine = IMAGE_FILE_MACHINE_ARMNT; -#elif defined __arm__ nt->FileHeader.Machine = IMAGE_FILE_MACHINE_ARM64; +#elif defined __arm__ + nt->FileHeader.Machine = IMAGE_FILE_MACHINE_ARMNT; #elif defined __powerpc__ nt->FileHeader.Machine = IMAGE_FILE_MACHINE_POWERPC; #else

1 0

Thomas Faber : msxml3: Avoid a variable-length array.
by Alexandre Julliard March 25, 2014

March 25, 2014

Module: wine Branch: master Commit: 9d79ca78db237d2a420ad734304db991fc598863 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d79ca78db237d2a420ad7343… Author: Thomas Faber <thomas.faber(a)reactos.org> Date: Tue Mar 25 09:20:22 2014 +0100 msxml3: Avoid a variable-length array. --- dlls/msxml3/main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msxml3/main.c b/dlls/msxml3/main.c index 5967ac0..d67e4e0 100644 --- a/dlls/msxml3/main.c +++ b/dlls/msxml3/main.c @@ -63,9 +63,9 @@ HINSTANCE MSXML_hInstance = NULL; void wineXmlCallbackLog(char const* caller, xmlErrorLevel lvl, char const* msg, va_list ap) { - static const int max_size = 200; enum __wine_debug_class dbcl; - char buff[max_size]; + char buff[200]; + const int max_size = sizeof(buff) / sizeof(buff[0]); int len; switch (lvl)

1 0

Thomas Faber : shell32: Avoid a variable-length array.
by Alexandre Julliard March 25, 2014

March 25, 2014

Module: wine Branch: master Commit: b1b92046c241f637a6b600428fcbf89336eee59d URL: http://source.winehq.org/git/wine.git/?a=commit;h=b1b92046c241f637a6b600428… Author: Thomas Faber <thomas.faber(a)reactos.org> Date: Tue Mar 25 10:51:34 2014 +0100 shell32: Avoid a variable-length array. --- dlls/shell32/shlview_cmenu.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/shell32/shlview_cmenu.c b/dlls/shell32/shlview_cmenu.c index 0705948..8170011 100644 --- a/dlls/shell32/shlview_cmenu.c +++ b/dlls/shell32/shlview_cmenu.c @@ -285,9 +285,10 @@ static BOOL CALLBACK Properties_AddPropSheetCallback(HPROPSHEETPAGE hpage, LPARA return TRUE; } +#define MAX_PROP_PAGES 99 + static void DoOpenProperties(ContextMenu *This, HWND hwnd) { - static const UINT MAX_PROP_PAGES = 99; static const WCHAR wszFolder[] = {'F','o','l','d','e','r', 0}; static const WCHAR wszFiletypeAll[] = {'*',0}; LPSHELLFOLDER lpDesktopSF;

1 0

Hans Leidekker : shell32: Forward ShExtractIconsW to user32.PrivateExtractIconsW.
by Alexandre Julliard March 25, 2014

March 25, 2014

Module: wine Branch: master Commit: 86bd0603a26f74e3b16cd57da3904585ed7aec3a URL: http://source.winehq.org/git/wine.git/?a=commit;h=86bd0603a26f74e3b16cd57da… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Mar 25 12:53:27 2014 +0100 shell32: Forward ShExtractIconsW to user32.PrivateExtractIconsW. --- dlls/shell32/shell32.spec | 2 +- dlls/shell32/tests/shelllink.c | 60 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 61 insertions(+), 1 deletion(-) diff --git a/dlls/shell32/shell32.spec b/dlls/shell32/shell32.spec index c5405d4..d73dcbb 100644 --- a/dlls/shell32/shell32.spec +++ b/dlls/shell32/shell32.spec @@ -347,7 +347,7 @@ @ stdcall SHCreateShellItemArrayFromShellItem(ptr ptr ptr) @ stdcall SHEmptyRecycleBinA(long str long) @ stdcall SHEmptyRecycleBinW(long wstr long) -@ stub SHExtractIconsW +@ stdcall SHExtractIconsW(wstr long long long ptr ptr long long) user32.PrivateExtractIconsW @ stdcall SHFileOperation(ptr) SHFileOperationA @ stdcall SHFileOperationA(ptr) @ stdcall SHFileOperationW(ptr) diff --git a/dlls/shell32/tests/shelllink.c b/dlls/shell32/tests/shelllink.c index c62f575..0b2b7be 100644 --- a/dlls/shell32/tests/shelllink.c +++ b/dlls/shell32/tests/shelllink.c @@ -42,6 +42,7 @@ static HRESULT (WINAPI *pSHDefExtractIconA)(LPCSTR, int, UINT, HICON*, HICON*, U static HRESULT (WINAPI *pSHGetStockIconInfo)(SHSTOCKICONID, UINT, SHSTOCKICONINFO *); static DWORD (WINAPI *pGetLongPathNameA)(LPCSTR, LPSTR, DWORD); static DWORD (WINAPI *pGetShortPathNameA)(LPCSTR, LPSTR, DWORD); +static UINT (WINAPI *pSHExtractIconsW)(LPCWSTR, int, int, int, HICON *, UINT *, UINT, UINT); static const GUID _IID_IShellLinkDataList = { 0x45e2b4ae, 0xb1c3, 0x11d0, @@ -1095,6 +1096,63 @@ static void test_SHGetStockIconInfo(void) ok(hr == E_INVALIDARG, "NULL: got 0x%x\n", hr); } +static void test_SHExtractIcons(void) +{ + static const WCHAR notepadW[] = {'n','o','t','e','p','a','d','.','e','x','e',0}; + static const WCHAR shell32W[] = {'s','h','e','l','l','3','2','.','d','l','l',0}; + static const WCHAR emptyW[] = {0}; + UINT ret, ret2; + HICON icons[256]; + UINT ids[256], i; + + if (!pSHExtractIconsW) + { + win_skip("SHExtractIconsW not available\n"); + return; + } + + ret = pSHExtractIconsW(emptyW, 0, 16, 16, icons, ids, 1, 0); + ok(ret == ~0u, "got %u\n", ret); + + ret = pSHExtractIconsW(notepadW, 0, 16, 16, NULL, NULL, 1, 0); + ok(ret == 1 || broken(ret == 2) /* win2k */, "got %u\n", ret); + + icons[0] = (HICON)0xdeadbeef; + ret = pSHExtractIconsW(notepadW, 0, 16, 16, icons, NULL, 1, 0); + ok(ret == 1, "got %u\n", ret); + ok(icons[0] != (HICON)0xdeadbeef, "icon not set\n"); + DestroyIcon(icons[0]); + + icons[0] = (HICON)0xdeadbeef; + ids[0] = 0xdeadbeef; + ret = pSHExtractIconsW(notepadW, 0, 16, 16, icons, ids, 1, 0); + ok(ret == 1, "got %u\n", ret); + ok(icons[0] != (HICON)0xdeadbeef, "icon not set\n"); + ok(ids[0] != 0xdeadbeef, "id not set\n"); + DestroyIcon(icons[0]); + + ret = pSHExtractIconsW(shell32W, 0, 16, 16, NULL, NULL, 0, 0); + ret2 = pSHExtractIconsW(shell32W, 4, MAKELONG(32,16), MAKELONG(32,16), NULL, NULL, 256, 0); + ok(ret && ret == ret2, + "icon count should be independent of requested icon sizes and base icon index\n"); + + ret = pSHExtractIconsW(shell32W, 0, 16, 16, icons, ids, 0, 0); + ok(ret == ~0u || !ret /* < vista */, "got %u\n", ret); + + ret = pSHExtractIconsW(shell32W, 0, 16, 16, icons, ids, 3, 0); + ok(ret == 3, "got %u\n", ret); + for (i = 0; i < ret; i++) DestroyIcon(icons[i]); + + /* count must be a multiple of two when getting two sizes */ + ret = pSHExtractIconsW(shell32W, 0, MAKELONG(16,32), MAKELONG(16,32), icons, ids, 3, 0); + ok(!ret /* vista */ || ret == 4, "got %u\n", ret); + for (i = 0; i < ret; i++) DestroyIcon(icons[i]); + + ret = pSHExtractIconsW(shell32W, 0, MAKELONG(16,32), MAKELONG(16,32), icons, ids, 4, 0); + ok(ret == 4, "got %u\n", ret); + for (i = 0; i < ret; i++) DestroyIcon(icons[i]); +} + START_TEST(shelllink) { HRESULT r; @@ -1108,6 +1166,7 @@ START_TEST(shelllink) pSHGetStockIconInfo = (void *)GetProcAddress(hmod, "SHGetStockIconInfo"); pGetLongPathNameA = (void *)GetProcAddress(hkernel32, "GetLongPathNameA"); pGetShortPathNameA = (void *)GetProcAddress(hkernel32, "GetShortPathNameA"); + pSHExtractIconsW = (void *)GetProcAddress(hmod, "SHExtractIconsW"); r = CoInitialize(NULL); ok(r == S_OK, "CoInitialize failed (0x%08x)\n", r); @@ -1120,6 +1179,7 @@ START_TEST(shelllink) test_shdefextracticon(); test_GetIconLocation(); test_SHGetStockIconInfo(); + test_SHExtractIcons(); CoUninitialize(); }

1 0

Thomas Faber : gameux/tests: Avoid a variable-length array.
by Alexandre Julliard March 25, 2014

March 25, 2014

Module: wine Branch: master Commit: 20dcd96de3622322e7ba3840e14e7666dccdbb02 URL: http://source.winehq.org/git/wine.git/?a=commit;h=20dcd96de3622322e7ba3840e… Author: Thomas Faber <thomas.faber(a)reactos.org> Date: Tue Mar 25 08:37:17 2014 +0100 gameux/tests: Avoid a variable-length array. --- dlls/gameux/tests/gamestatistics.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/gameux/tests/gamestatistics.c b/dlls/gameux/tests/gamestatistics.c index 7d57b1f..f5dd2ab 100644 --- a/dlls/gameux/tests/gamestatistics.c +++ b/dlls/gameux/tests/gamestatistics.c @@ -130,15 +130,13 @@ static HRESULT _buildStatisticsFilePath(LPCGUID guidApplicationId, LPWSTR *lpSta 'l','o','r','e','r','\\','G','a','m','e','S','t','a','t','i','s', 't','i','c','s','\\',0}; static const WCHAR sDotGamestats[] = {'.','g','a','m','e','s','t','a','t','s',0}; - static const DWORD dwGuidLength = 49; - HRESULT hr; - WCHAR sGuid[dwGuidLength], sPath[MAX_PATH] = {0}; + WCHAR sGuid[49], sPath[MAX_PATH]; hr = pSHGetFolderPathW(NULL, CSIDL_LOCAL_APPDATA, NULL, SHGFP_TYPE_CURRENT, sPath); if(SUCCEEDED(hr)) - hr = (StringFromGUID2(guidApplicationId, sGuid, dwGuidLength)!=0 ? S_OK : E_FAIL); + hr = (StringFromGUID2(guidApplicationId, sGuid, sizeof(sGuid) / sizeof(sGuid[0])) != 0 ? S_OK : E_FAIL); if(SUCCEEDED(hr)) {

1 0

Thomas Faber : oleview: Avoid variable-length arrays.
by Alexandre Julliard March 25, 2014

March 25, 2014

Module: wine Branch: master Commit: 644bda381e8ea87248b2ea4590c6ae4fcf337399 URL: http://source.winehq.org/git/wine.git/?a=commit;h=644bda381e8ea87248b2ea459… Author: Thomas Faber <thomas.faber(a)reactos.org> Date: Tue Mar 25 11:27:12 2014 +0100 oleview: Avoid variable-length arrays. --- programs/oleview/details.c | 8 ++++---- programs/oleview/tree.c | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/programs/oleview/details.c b/programs/oleview/details.c index f7bb523..9fdd9f3 100644 --- a/programs/oleview/details.c +++ b/programs/oleview/details.c @@ -158,7 +158,7 @@ static void CreateRegRec(HKEY hKey, HTREEITEM parent, WCHAR *wszKeyName, BOOL ad RegCloseKey(hCurKey); - memmove(&wszData[6], wszData, sizeof(WCHAR[lenData])); + memmove(&wszData[6], wszData, lenData * sizeof(WCHAR)); memcpy(wszData, wszCLSID, sizeof(WCHAR[6])); wszData[5] = '\\'; @@ -187,7 +187,7 @@ static void CreateRegRec(HKEY hKey, HTREEITEM parent, WCHAR *wszKeyName, BOOL ad RegCloseKey(hCurKey); - memmove(&wszData[8], wszData, sizeof(WCHAR[lenData])); + memmove(&wszData[8], wszData, lenData * sizeof(WCHAR)); memcpy(wszData, wszTypeLib, sizeof(WCHAR[8])); wszData[7] = '\\'; RegOpenKeyW(HKEY_CLASSES_ROOT, wszData, &hCurKey); @@ -238,9 +238,9 @@ static void CreateReg(WCHAR *buffer) if(RegQueryValueW(hKey, NULL, wszTree, (LONG *)&lenTree) == ERROR_SUCCESS) { memmove(&wszTree[lenBuffer-lastLenBuffer+3], wszTree, - sizeof(WCHAR[lenTree])); + lenTree * sizeof(WCHAR)); memcpy(wszTree, &buffer[lastLenBuffer], - sizeof(WCHAR[lenBuffer-lastLenBuffer])); + (lenBuffer - lastLenBuffer) * sizeof(WCHAR)); if(lenTree == 1) wszTree[lenBuffer-lastLenBuffer] = '\0'; else diff --git a/programs/oleview/tree.c b/programs/oleview/tree.c index 241c32c..34021e7 100644 --- a/programs/oleview/tree.c +++ b/programs/oleview/tree.c @@ -225,7 +225,7 @@ BOOL CreateRegPath(HTREEITEM item, WCHAR *buffer, int bufSize) int bufLen; BOOL ret; - memset(buffer, 0, sizeof(WCHAR[bufSize])); + memset(buffer, 0, bufSize * sizeof(WCHAR)); memset(&tvi, 0, sizeof(TVITEMW)); tvi.hItem = item; @@ -239,8 +239,8 @@ BOOL CreateRegPath(HTREEITEM item, WCHAR *buffer, int bufSize) if(tvi.lParam && (((ITEM_INFO *)tvi.lParam)->cFlag & (REGPATH|REGTOP))) { bufLen = lstrlenW(((ITEM_INFO *)tvi.lParam)->info); - memmove(&buffer[bufLen], buffer, sizeof(WCHAR[bufSize-bufLen])); - memcpy(buffer, ((ITEM_INFO *)tvi.lParam)->info, sizeof(WCHAR[bufLen])); + memmove(&buffer[bufLen], buffer, (bufSize - bufLen) * sizeof(WCHAR)); + memcpy(buffer, ((ITEM_INFO *)tvi.lParam)->info, bufLen * sizeof(WCHAR)); } if(tvi.lParam && ((ITEM_INFO *)tvi.lParam)->cFlag & REGTOP) break;

1 0

Hans Leidekker : user32/tests: Add more tests for PrivateExtractIcons.
by Alexandre Julliard March 25, 2014

March 25, 2014

Module: wine Branch: master Commit: fb31e0fbe30f0d69058d3afa1b6f8f6af1d963f6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fb31e0fbe30f0d69058d3afa1… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Mar 25 12:52:03 2014 +0100 user32/tests: Add more tests for PrivateExtractIcons. --- dlls/user32/tests/resource.c | 29 ++++++++++++++++++++++++++--- 1 file changed, 26 insertions(+), 3 deletions(-) diff --git a/dlls/user32/tests/resource.c b/dlls/user32/tests/resource.c index 2313595..9cb7380 100644 --- a/dlls/user32/tests/resource.c +++ b/dlls/user32/tests/resource.c @@ -333,11 +333,30 @@ static void test_accel2(void) static void test_PrivateExtractIcons(void) { const CHAR szShell32Dll[] = "shell32.dll"; HICON ahIcon[256]; - UINT aIconId[256]; - UINT cIcons, cIcons2; + UINT i, aIconId[256], cIcons, cIcons2; if (!pPrivateExtractIconsA) return; - + + cIcons = pPrivateExtractIconsA("", 0, 16, 16, ahIcon, aIconId, 1, 0); + ok(cIcons == ~0u, "got %u\n", cIcons); + + cIcons = pPrivateExtractIconsA("notepad.exe", 0, 16, 16, NULL, NULL, 1, 0); + ok(cIcons == 1 || broken(cIcons == 2) /* win2k */, "got %u\n", cIcons); + + ahIcon[0] = (HICON)0xdeadbeef; + cIcons = pPrivateExtractIconsA("notepad.exe", 0, 16, 16, ahIcon, NULL, 1, 0); + ok(cIcons == 1, "got %u\n", cIcons); + ok(ahIcon[0] != (HICON)0xdeadbeef, "icon not set\n"); + DestroyIcon(ahIcon[0]); + + ahIcon[0] = (HICON)0xdeadbeef; + aIconId[0] = 0xdeadbeef; + cIcons = pPrivateExtractIconsA("notepad.exe", 0, 16, 16, ahIcon, aIconId, 1, 0); + ok(cIcons == 1, "got %u\n", cIcons); + ok(ahIcon[0] != (HICON)0xdeadbeef, "icon not set\n"); + ok(aIconId[0] != 0xdeadbeef, "id not set\n"); + DestroyIcon(ahIcon[0]); + cIcons = pPrivateExtractIconsA(szShell32Dll, 0, 16, 16, NULL, NULL, 0, 0); cIcons2 = pPrivateExtractIconsA(szShell32Dll, 4, MAKELONG(32,16), MAKELONG(32,16), NULL, NULL, 256, 0); @@ -350,14 +369,18 @@ static void test_PrivateExtractIcons(void) { cIcons = pPrivateExtractIconsA(szShell32Dll, 0, 16, 16, ahIcon, aIconId, 3, 0); ok(cIcons == 3, "Three icons requested got cIcons=%d\n", cIcons); + for (i = 0; i < cIcons; i++) DestroyIcon(ahIcon[i]); /* count must be a multiple of two when getting two sizes */ cIcons = pPrivateExtractIconsA(szShell32Dll, 0, MAKELONG(16,32), MAKELONG(16,32), ahIcon, aIconId, 3, 0); ok(cIcons == 0 /* vista */ || cIcons == 4, "Three icons requested got cIcons=%d\n", cIcons); + for (i = 0; i < cIcons; i++) DestroyIcon(ahIcon[i]); + cIcons = pPrivateExtractIconsA(szShell32Dll, 0, MAKELONG(16,32), MAKELONG(16,32), ahIcon, aIconId, 4, 0); ok(cIcons == 4, "Four icons requested got cIcons=%d\n", cIcons); + for (i = 0; i < cIcons; i++) DestroyIcon(ahIcon[i]); } static void test_LoadImage(void)

1 0

Thomas Faber : ws2_32: Avoid a variable-length array.
by Alexandre Julliard March 25, 2014

March 25, 2014

Module: wine Branch: master Commit: 626040b1acce87e40e0aa2f190bc020b9e2632fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=626040b1acce87e40e0aa2f19… Author: Thomas Faber <thomas.faber(a)reactos.org> Date: Tue Mar 25 16:49:12 2014 +0100 ws2_32: Avoid a variable-length array. --- dlls/ws2_32/socket.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 42044e6..cdcbb11 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -3337,12 +3337,13 @@ INT WINAPI WS_getsockopt(SOCKET s, INT level, #endif #ifdef HAS_IRDA +#define MAX_IRDA_DEVICES 10 + case WS_SOL_IRLMP: switch(optname) { case WS_IRLMP_ENUMDEVICES: { - static const int MAX_IRDA_DEVICES = 10; char buf[sizeof(struct irda_device_list) + (MAX_IRDA_DEVICES - 1) * sizeof(struct irda_device_info)]; int res; @@ -3402,6 +3403,7 @@ INT WINAPI WS_getsockopt(SOCKET s, INT level, return SOCKET_ERROR; } break; /* case WS_SOL_IRLMP */ +#undef MAX_IRDA_DEVICES #endif /* Levels WS_IPPROTO_TCP and WS_IPPROTO_IP convert directly */

1 0

Thomas Faber : gdi32: Avoid variable-length arrays.
by Alexandre Julliard March 25, 2014

March 25, 2014

Module: wine Branch: master Commit: ff3d728d7421fa898da9b78aedb4ddfdf8dc5e84 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff3d728d7421fa898da9b78ae… Author: Thomas Faber <thomas.faber(a)reactos.org> Date: Tue Mar 25 08:46:00 2014 +0100 gdi32: Avoid variable-length arrays. --- dlls/gdi32/bidi.c | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/bidi.c b/dlls/gdi32/bidi.c index 1d6be53..066eec3 100644 --- a/dlls/gdi32/bidi.c +++ b/dlls/gdi32/bidi.c @@ -596,10 +596,25 @@ BOOL BIDI_Reorder( if (lpGlyphs && doGlyphs) { - BYTE runOrder[maxItems]; - int visOrder[maxItems]; + BYTE *runOrder; + int *visOrder; SCRIPT_ITEM *curItem; + runOrder = HeapAlloc(GetProcessHeap(), 0, maxItems * sizeof(*runOrder)); + visOrder = HeapAlloc(GetProcessHeap(), 0, maxItems * sizeof(*visOrder)); + if (!runOrder || !visOrder) + { + WARN("Out of memory\n"); + HeapFree(GetProcessHeap(), 0, runOrder); + HeapFree(GetProcessHeap(), 0, visOrder); + HeapFree(GetProcessHeap(), 0, chartype); + HeapFree(GetProcessHeap(), 0, levels); + HeapFree(GetProcessHeap(), 0, pItems); + HeapFree(GetProcessHeap(), 0, psva); + HeapFree(GetProcessHeap(), 0, pwLogClust); + return FALSE; + } + for (j = 0; j < nItems; j++) runOrder[j] = pItems[j].a.s.uBidiLevel; @@ -621,6 +636,8 @@ BOOL BIDI_Reorder( if (!run_glyphs) { WARN("Out of memory\n"); + HeapFree(GetProcessHeap(), 0, runOrder); + HeapFree(GetProcessHeap(), 0, visOrder); HeapFree(GetProcessHeap(), 0, chartype); HeapFree(GetProcessHeap(), 0, levels); HeapFree(GetProcessHeap(), 0, pItems); @@ -655,6 +672,8 @@ BOOL BIDI_Reorder( glyph_i += cOutGlyphs; } } + HeapFree(GetProcessHeap(), 0, runOrder); + HeapFree(GetProcessHeap(), 0, visOrder); } done += i;

1 0