June 2012 - Wine-Commits - list.winehq.org

Jacek Caban : mshtml: Wine Gecko 1.6 release.
by Alexandre Julliard June 11, 2012

June 11, 2012

Module: wine Branch: master Commit: 9fa443dcd9d16265a2d2b41441cea17c3c07e782 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9fa443dcd9d16265a2d2b4144… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jun 11 15:32:18 2012 +0200 mshtml: Wine Gecko 1.6 release. --- dlls/appwiz.cpl/addons.c | 6 ++-- dlls/mshtml/htmlelem.c | 26 ++----------- dlls/mshtml/htmlnode.c | 2 +- dlls/mshtml/nsiface.idl | 90 ++++++++++++++++++++++----------------------- 4 files changed, 52 insertions(+), 72 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9fa443dcd9d16265a2d2b…

1 0

Nikolay Sivov : msxml3: Fix status text value parsing.
by Alexandre Julliard June 11, 2012

June 11, 2012

Module: wine Branch: master Commit: ad914986e8ed3c56c21c7a355d2279b7e075b4fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=ad914986e8ed3c56c21c7a355… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jun 10 00:48:09 2012 +0400 msxml3: Fix status text value parsing. --- dlls/msxml3/httprequest.c | 35 ++++++++++++++++++----------------- 1 files changed, 18 insertions(+), 17 deletions(-) diff --git a/dlls/msxml3/httprequest.c b/dlls/msxml3/httprequest.c index 0abe2ff..ea5fb14 100644 --- a/dlls/msxml3/httprequest.c +++ b/dlls/msxml3/httprequest.c @@ -540,31 +540,32 @@ static HRESULT WINAPI BSCHttpNegotiate_OnResponse(IHttpNegotiate *iface, DWORD c This->request->status_text = NULL; if (resp_headers) { - const WCHAR *ptr, *line; + const WCHAR *ptr, *line, *status_text; ptr = line = resp_headers; - /* skip status line */ - while (*ptr) + /* skip HTTP-Version */ + ptr = strchrW(ptr, ' '); + if (ptr) { - if (*ptr == '\r' && *(ptr+1) == '\n') + /* skip Status-Code */ + ptr = strchrW(++ptr, ' '); + if (ptr) { - const WCHAR *end = ptr-1; - line = ptr + 2; - /* scan back to get status phrase */ - while (ptr > resp_headers) + status_text = ++ptr; + /* now it supposed to end with CRLF */ + while (*ptr) { - if (*ptr == ' ') - { - This->request->status_text = SysAllocStringLen(ptr+1, end-ptr); - TRACE("status text %s\n", debugstr_w(This->request->status_text)); - break; - } - ptr--; + if (*ptr == '\r' && *(ptr+1) == '\n') + { + line = ptr + 2; + This->request->status_text = SysAllocStringLen(status_text, ptr-status_text); + TRACE("status text %s\n", debugstr_w(This->request->status_text)); + break; + } + ptr++; } - break; } - ptr++; } /* store as unparsed string for now */

1 0

Nikolay Sivov : msxml3: Reuse MXAttributes implementation for SAX reader attributes reporting.
by Alexandre Julliard June 11, 2012

June 11, 2012

Module: wine Branch: master Commit: c2c8b9e771a1eb80cab4b142a3bc3ed5434a4a47 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c2c8b9e771a1eb80cab4b142a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Jun 9 15:37:52 2012 +0400 msxml3: Reuse MXAttributes implementation for SAX reader attributes reporting. --- dlls/msxml3/saxreader.c | 532 +++++++++++------------------------------ dlls/msxml3/tests/saxreader.c | 1 - 2 files changed, 142 insertions(+), 391 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c2c8b9e771a1eb80cab4b…

1 0

Nikolay Sivov : comctl32/listview: Properly update selection mark on item state change.
by Alexandre Julliard June 11, 2012

June 11, 2012

Module: wine Branch: master Commit: 6560d881511bc2affba709803275d086e8d41249 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6560d881511bc2affba709803… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Jun 9 12:15:16 2012 +0400 comctl32/listview: Properly update selection mark on item state change. --- dlls/comctl32/listview.c | 6 ++- dlls/comctl32/tests/listview.c | 126 +++++++++++++++++++++++++++++++++++++++- 2 files changed, 130 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 7111560..27b2fd0 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -6,7 +6,7 @@ * Copyright 2000 Jason Mawdsley * Copyright 2001 CodeWeavers Inc. * Copyright 2002 Dimitrie O. Paun - * Copyright 2009-2011 Nikolay Sivov + * Copyright 2009-2012 Nikolay Sivov * Copyright 2009 Owen Rudge for CodeWeavers * * This library is free software; you can redistribute it and/or @@ -4276,6 +4276,10 @@ static BOOL set_main_item(LISTVIEW_INFO *infoPtr, const LVITEMW *lpLVItem, BOOL { if (lpLVItem->state & LVIS_FOCUSED) { + /* update selection mark */ + if (infoPtr->nFocusedItem == -1 && infoPtr->nSelectionMark == -1) + infoPtr->nSelectionMark = lpLVItem->iItem; + if (infoPtr->nFocusedItem != -1) { /* remove current focus */ diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index b96e85f..255ef50 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -2090,7 +2090,6 @@ static void test_multiselect(void) { "using VK_HOME", -1, VK_HOME, 1, -1 } }; - hwnd = create_listview_control(LVS_REPORT); for (i=0;i<items;i++) { @@ -2237,6 +2236,131 @@ static void test_multiselect(void) r = ListView_GetSelectedCount(hwnd); expect(0, r); + /* 1. selection mark is update when new focused item is set */ + style = GetWindowLongPtrA(hwnd, GWL_STYLE); + SetWindowLongPtrA(hwnd, GWL_STYLE, style & ~LVS_SINGLESEL); + + r = SendMessage(hwnd, LVM_SETSELECTIONMARK, 0, -1); + expect(-1, r); + + item.stateMask = LVIS_FOCUSED; + item.state = LVIS_FOCUSED; + r = SendMessage(hwnd, LVM_SETITEMSTATE, 0, (LPARAM)&item); + expect(TRUE, r); + + r = SendMessage(hwnd, LVM_GETSELECTIONMARK, 0, 0); + expect(0, r); + + /* it's not updated if already set */ + item.stateMask = LVIS_FOCUSED; + item.state = LVIS_FOCUSED; + r = SendMessage(hwnd, LVM_SETITEMSTATE, 1, (LPARAM)&item); + expect(TRUE, r); + + r = SendMessage(hwnd, LVM_GETSELECTIONMARK, 0, 0); + expect(0, r); + + r = SendMessage(hwnd, LVM_SETSELECTIONMARK, 0, -1); + expect(0, r); + + item.stateMask = LVIS_FOCUSED; + item.state = LVIS_FOCUSED; + r = SendMessage(hwnd, LVM_SETITEMSTATE, 1, (LPARAM)&item); + expect(TRUE, r); + + r = SendMessage(hwnd, LVM_GETSELECTIONMARK, 0, 0); + expect(-1, r); + + /* need to reset focused item first */ + item.stateMask = LVIS_FOCUSED; + item.state = 0; + r = SendMessage(hwnd, LVM_SETITEMSTATE, -1, (LPARAM)&item); + expect(TRUE, r); + + item.stateMask = LVIS_FOCUSED; + item.state = LVIS_FOCUSED; + r = SendMessage(hwnd, LVM_SETITEMSTATE, 2, (LPARAM)&item); + expect(TRUE, r); + + r = SendMessage(hwnd, LVM_GETSELECTIONMARK, 0, 0); + expect(2, r); + + item.stateMask = LVIS_FOCUSED; + item.state = 0; + r = SendMessage(hwnd, LVM_SETITEMSTATE, -1, (LPARAM)&item); + expect(TRUE, r); + + r = SendMessage(hwnd, LVM_GETSELECTIONMARK, 0, 0); + expect(2, r); + + /* 2. same tests, with LVM_SETITEM */ + style = GetWindowLongPtrA(hwnd, GWL_STYLE); + SetWindowLongPtrA(hwnd, GWL_STYLE, style & ~LVS_SINGLESEL); + + r = SendMessage(hwnd, LVM_SETSELECTIONMARK, 0, -1); + expect(2, r); + + item.stateMask = LVIS_FOCUSED; + item.state = LVIS_FOCUSED; + item.mask = LVIF_STATE; + item.iItem = item.iSubItem = 0; + r = SendMessage(hwnd, LVM_SETITEMA, 0, (LPARAM)&item); + expect(TRUE, r); + + r = SendMessage(hwnd, LVM_GETSELECTIONMARK, 0, 0); + expect(0, r); + + /* it's not updated if already set */ + item.stateMask = LVIS_FOCUSED; + item.state = LVIS_FOCUSED; + item.mask = LVIF_STATE; + item.iItem = 1; + item.iSubItem = 0; + r = SendMessage(hwnd, LVM_SETITEMA, 0, (LPARAM)&item); + expect(TRUE, r); + + r = SendMessage(hwnd, LVM_GETSELECTIONMARK, 0, 0); + expect(0, r); + + r = SendMessage(hwnd, LVM_SETSELECTIONMARK, 0, -1); + expect(0, r); + + item.stateMask = LVIS_FOCUSED; + item.state = LVIS_FOCUSED; + item.mask = LVIF_STATE; + item.iItem = 1; + item.iSubItem = 0; + r = SendMessage(hwnd, LVM_SETITEMA, 0, (LPARAM)&item); + expect(TRUE, r); + + r = SendMessage(hwnd, LVM_GETSELECTIONMARK, 0, 0); + expect(-1, r); + + /* need to reset focused item first */ + item.stateMask = LVIS_FOCUSED; + item.state = 0; + r = SendMessage(hwnd, LVM_SETITEMSTATE, -1, (LPARAM)&item); + expect(TRUE, r); + + item.stateMask = LVIS_FOCUSED; + item.state = LVIS_FOCUSED; + item.mask = LVIF_STATE; + item.iItem = 2; + item.iSubItem = 0; + r = SendMessage(hwnd, LVM_SETITEMA, 0, (LPARAM)&item); + expect(TRUE, r); + + r = SendMessage(hwnd, LVM_GETSELECTIONMARK, 0, 0); + expect(2, r); + + item.stateMask = LVIS_FOCUSED; + item.state = 0; + r = SendMessage(hwnd, LVM_SETITEMSTATE, -1, (LPARAM)&item); + expect(TRUE, r); + + r = SendMessage(hwnd, LVM_GETSELECTIONMARK, 0, 0); + expect(2, r); + DestroyWindow(hwnd); }

1 0

Thomas Faber : oleaut32: Fix build with MSVC.
by Alexandre Julliard June 11, 2012

June 11, 2012

Module: wine Branch: master Commit: 7f5714107896a8820f85b21852c4288607ecd7a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f5714107896a8820f85b2185… Author: Thomas Faber <thfabba(a)gmx.de> Date: Mon Jun 11 09:35:46 2012 +0200 oleaut32: Fix build with MSVC. --- dlls/oleaut32/typelib2.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/oleaut32/typelib2.c b/dlls/oleaut32/typelib2.c index fd4e547..bf45ce8 100644 --- a/dlls/oleaut32/typelib2.c +++ b/dlls/oleaut32/typelib2.c @@ -1987,7 +1987,7 @@ static HRESULT WINAPI ICreateTypeInfo2_fnAddFuncDesc( if(!insert) return E_OUTOFMEMORY; insert->u.data = heap_alloc(FIELD_OFFSET(MSFT_FuncRecord, HelpContext) + - sizeof(int[(num_defaults?4:3)])*pFuncDesc->cParams); + sizeof(int)*(num_defaults?4:3)*pFuncDesc->cParams); if(!insert->u.data) { heap_free(insert); return E_OUTOFMEMORY;

1 0

Hans Leidekker : msi: Ignore the value if a registry value name is special.
by Alexandre Julliard June 11, 2012

June 11, 2012

Module: wine Branch: master Commit: fd0c2dabdf1818efcd2e0fc05b70e628227145c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd0c2dabdf1818efcd2e0fc05… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Jun 11 15:36:22 2012 +0200 msi: Ignore the value if a registry value name is special. --- dlls/msi/action.c | 43 +++++++++++++++++++------------------------ 1 files changed, 19 insertions(+), 24 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 17e8696..5ba7ec3 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -2390,13 +2390,17 @@ static UINT ACTION_CostFinalize(MSIPACKAGE *package) return MSI_SetFeatureStates(package); } -/* OK this value is "interpreted" and then formatted based on the - first few characters */ -static LPSTR parse_value(MSIPACKAGE *package, LPCWSTR value, DWORD *type, - DWORD *size) +static LPSTR parse_value(MSIPACKAGE *package, LPCWSTR value, DWORD *type, DWORD *size) { LPSTR data = NULL; + if (!value) + { + data = (LPSTR)strdupW(szEmpty); + *size = sizeof(szEmpty); + *type = REG_SZ; + return data; + } if (value[0]=='#' && value[1]!='#' && value[1]!='%') { if (value[1]=='x') @@ -2578,19 +2582,19 @@ static WCHAR *get_keypath( MSICOMPONENT *comp, HKEY root, const WCHAR *path ) return strdupW( path ); } -static BOOL is_special_entry( const WCHAR *name, const WCHAR *value ) +static BOOL is_special_entry( const WCHAR *name ) { - return (name && (name[0] == '*' || name[0] == '+') && !name[1] && !value); + return (name && (name[0] == '*' || name[0] == '+') && !name[1]); } static UINT ITERATE_WriteRegistryValues(MSIRECORD *row, LPVOID param) { MSIPACKAGE *package = param; - LPSTR value_data = NULL; + LPSTR value; HKEY root_key, hkey; DWORD type,size; LPWSTR deformated, uikey, keypath; - LPCWSTR szRoot, component, name, key, value; + LPCWSTR szRoot, component, name, key; MSICOMPONENT *comp; MSIRECORD * uirow; INT root; @@ -2643,25 +2647,16 @@ static UINT ITERATE_WriteRegistryValues(MSIRECORD *row, LPVOID param) msi_free(keypath); return ERROR_SUCCESS; } - - value = MSI_RecordGetString(row,5); - if (value) - value_data = parse_value(package, value, &type, &size); - else - { - value_data = (LPSTR)strdupW(szEmpty); - size = sizeof(szEmpty); - type = REG_SZ; - } - + value = parse_value(package, MSI_RecordGetString(row, 5), &type, &size); deformat_string(package, name, &deformated); - if (!is_special_entry( name , value )) + + if (!is_special_entry( name )) { if (!check_first) { TRACE("Setting value %s of %s\n", debugstr_w(deformated), debugstr_w(uikey)); - RegSetValueExW(hkey, deformated, 0, type, (LPBYTE)value_data, size); + RegSetValueExW(hkey, deformated, 0, type, (LPBYTE)value, size); } else { @@ -2677,7 +2672,7 @@ static UINT ITERATE_WriteRegistryValues(MSIRECORD *row, LPVOID param) TRACE("Checked and setting value %s of %s\n", debugstr_w(deformated), debugstr_w(uikey)); if (deformated || size) - RegSetValueExW(hkey, deformated, 0, type, (LPBYTE)value_data, size); + RegSetValueExW(hkey, deformated, 0, type, (LPBYTE)value, size); } } } @@ -2687,11 +2682,11 @@ static UINT ITERATE_WriteRegistryValues(MSIRECORD *row, LPVOID param) MSI_RecordSetStringW(uirow,2,deformated); MSI_RecordSetStringW(uirow,1,uikey); if (type == REG_SZ || type == REG_EXPAND_SZ) - MSI_RecordSetStringW(uirow,3,(LPWSTR)value_data); + MSI_RecordSetStringW(uirow, 3, (LPWSTR)value); msi_ui_actiondata( package, szWriteRegistryValues, uirow ); msiobj_release( &uirow->hdr ); - msi_free(value_data); + msi_free(value); msi_free(deformated); msi_free(uikey); msi_free(keypath);

1 0

Christian Costa : d3drm: Free texture object when releasing mesh builder object.
by Alexandre Julliard June 11, 2012

June 11, 2012

Module: wine Branch: master Commit: a77fd778c2f3ead593f6a9d692a8032e0cb17699 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a77fd778c2f3ead593f6a9d69… Author: Christian Costa <titan.costa(a)gmail.com> Date: Fri Jun 8 15:38:43 2012 +0200 d3drm: Free texture object when releasing mesh builder object. --- dlls/d3drm/meshbuilder.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/d3drm/meshbuilder.c b/dlls/d3drm/meshbuilder.c index 56f53fd..043f395 100644 --- a/dlls/d3drm/meshbuilder.c +++ b/dlls/d3drm/meshbuilder.c @@ -367,6 +367,8 @@ static ULONG WINAPI IDirect3DRMMeshBuilder2Impl_Release(IDirect3DRMMeshBuilder2* { if (This->material) IDirect3DRMMaterial2_Release(This->material); + if (This->texture) + IDirect3DRMTexture3_Release(This->texture); HeapFree(GetProcessHeap(), 0, This->name); HeapFree(GetProcessHeap(), 0, This->pVertices); HeapFree(GetProcessHeap(), 0, This->pNormals);

1 0

Christian Costa : d3drm: Handle texture associated with the material when loading a mesh.
by Alexandre Julliard June 11, 2012

June 11, 2012

Module: wine Branch: master Commit: 0023ddf1174af71701f66bd609119117d52d6869 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0023ddf1174af71701f66bd60… Author: Christian Costa <titan.costa(a)gmail.com> Date: Fri Jun 8 15:38:34 2012 +0200 d3drm: Handle texture associated with the material when loading a mesh. --- dlls/d3drm/meshbuilder.c | 57 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 57 insertions(+), 0 deletions(-) diff --git a/dlls/d3drm/meshbuilder.c b/dlls/d3drm/meshbuilder.c index 1bb84c5..56f53fd 100644 --- a/dlls/d3drm/meshbuilder.c +++ b/dlls/d3drm/meshbuilder.c @@ -1248,6 +1248,7 @@ HRESULT load_mesh_data(IDirect3DRMMeshBuilder3* iface, LPDIRECTXFILEDATA pData) LPDIRECTXFILEDATA data; LPDIRECTXFILEDATAREFERENCE reference; LPDIRECT3DRMMATERIAL2 material; + LPDIRECTXFILEOBJECT material_child; hr = IDirectXFileObject_QueryInterface(child, &IID_IDirectXFileData, (void **)&data); if (FAILED(hr)) @@ -1290,6 +1291,62 @@ HRESULT load_mesh_data(IDirect3DRMMeshBuilder3* iface, LPDIRECTXFILEDATA pData) This->material = material; + hr = IDirectXFileData_GetNextObject(data, &material_child); + if (hr == S_OK) + { + LPDIRECTXFILEDATA data; + LPDIRECT3DRMTEXTURE3 texture; + char** filename; + + hr = IDirectXFileObject_QueryInterface(material_child, &IID_IDirectXFileData, (void **)&data); + if (FAILED(hr)) + { + LPDIRECTXFILEDATAREFERENCE reference; + + hr = IDirectXFileObject_QueryInterface(material_child, &IID_IDirectXFileDataReference, (void **)&reference); + if (FAILED(hr)) + goto end; + + hr = IDirectXFileDataReference_Resolve(reference, &data); + IDirectXFileDataReference_Release(reference); + if (FAILED(hr)) + goto end; + } + + hr = IDirectXFileData_GetType(data, &pGuid); + if (hr != DXFILE_OK) + goto end; + if (!IsEqualGUID(pGuid, &TID_D3DRMTextureFilename)) + { + WARN("Not a texture filename\n"); + goto end; + } + + size = 4; + hr = IDirectXFileData_GetData(data, NULL, &size, (void**)&filename); + if (SUCCEEDED(hr)) + { + HANDLE file; + + file = CreateFileA(*filename, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, NULL); + if (file != INVALID_HANDLE_VALUE) + { + hr = Direct3DRMTexture_create(&IID_IDirect3DRMTexture3, (LPUNKNOWN*)&texture); + if (FAILED(hr)) + { + IDirectXFileData_Release(data); + goto end; + } + This->texture = texture; + } + } + } + else if (hr != DXFILEERR_NOMOREOBJECTS) + { + goto end; + } + hr = S_OK; + IDirectXFileData_Release(data); i++; }

1 0

Christian Costa : d3drm: Fix vertex index test and print a warning when it is out of range.
by Alexandre Julliard June 11, 2012

June 11, 2012

Module: wine Branch: master Commit: 422d57e7d210f599f60c42de87c6759ef48323b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=422d57e7d210f599f60c42de8… Author: Christian Costa <titan.costa(a)gmail.com> Date: Fri Jun 8 15:38:25 2012 +0200 d3drm: Fix vertex index test and print a warning when it is out of range. --- dlls/d3drm/meshbuilder.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/d3drm/meshbuilder.c b/dlls/d3drm/meshbuilder.c index bdb5e00..1bb84c5 100644 --- a/dlls/d3drm/meshbuilder.c +++ b/dlls/d3drm/meshbuilder.c @@ -1366,8 +1366,11 @@ HRESULT load_mesh_data(IDirect3DRMMeshBuilder3* iface, LPDIRECTXFILEDATA pData) else { DWORD vertex_idx = *faces_vertex_idx_ptr; - if (vertex_idx > This->nb_vertices) + if (vertex_idx >= This->nb_vertices) + { + WARN("Found vertex index %u but only %u vertices available => use index 0\n", vertex_idx, This->nb_vertices); vertex_idx = 0; + } *(faces_data_ptr + faces_data_size++) = vertex_idx; /* Add face normal to vertex normal */ D3DRMVectorAdd(&This->pNormals[vertex_idx], &This->pNormals[vertex_idx], &face_normal);

1 0

Dan Kegel : ntdll: Avoid clobbering valgrind annotations during HeapReAlloc .
by Alexandre Julliard June 11, 2012

June 11, 2012

Module: wine Branch: master Commit: 9af12506b0395b9d6bc035b31e6a9f8dde451650 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9af12506b0395b9d6bc035b31… Author: Dan Kegel <dank(a)kegel.com> Date: Sat Jun 9 19:42:13 2012 -0700 ntdll: Avoid clobbering valgrind annotations during HeapReAlloc. --- dlls/ntdll/heap.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c index 6ca509a..a9044714 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -1892,8 +1892,8 @@ PVOID WINAPI RtlReAllocateHeap( HANDLE heap, ULONG flags, PVOID ptr, SIZE_T size } else { - HEAP_ShrinkBlock( subheap, pArena, rounded_size ); notify_realloc( pArena + 1, oldActualSize, size ); + HEAP_ShrinkBlock( subheap, pArena, rounded_size ); } pArena->unused_bytes = (pArena->size & ARENA_SIZE_MASK) - size;

1 0