May 2006 - Wine-Commits - list.winehq.org

Mikołaj Zalewski : comctl32: header: Don' t modify the user supplied HDITEM during Set/InsertItem.
by Alexandre Julliard May 15, 2006

May 15, 2006

Module: wine Branch: refs/heads/master Commit: 16fefcd6d9cb8d364c472d797a64ae08cd246620 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=16fefcd6d9cb8d364c472d7… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Sat May 13 21:14:43 2006 +0200 comctl32: header: Don't modify the user supplied HDITEM during Set/InsertItem. --- dlls/comctl32/header.c | 15 +++++++-------- 1 files changed, 7 insertions(+), 8 deletions(-) diff --git a/dlls/comctl32/header.c b/dlls/comctl32/header.c index 99c19d0..7d0aeb5 100644 --- a/dlls/comctl32/header.c +++ b/dlls/comctl32/header.c @@ -131,22 +131,21 @@ static void HEADER_StoreHDItemInHeader(H if (phdi->mask & HDI_TEXT) { - if (!phdi->pszText) phdi->pszText = emptyString; /* null pointer check */ if (phdi->pszText != LPSTR_TEXTCALLBACKW) /* covers != TEXTCALLBACKA too */ { + LPWSTR pszText; if (lpItem->pszText) { if (lpItem->pszText != emptyString && lpItem->pszText != LPSTR_TEXTCALLBACKW) Free(lpItem->pszText); lpItem->pszText = NULL; } - if (phdi->pszText) - { - if (fUnicode) - Str_SetPtrW(&lpItem->pszText, phdi->pszText); - else - Str_SetPtrAtoW(&lpItem->pszText, (LPSTR)phdi->pszText); - } + + pszText = (phdi->pszText != NULL ? phdi->pszText : emptyString); + if (fUnicode) + Str_SetPtrW(&lpItem->pszText, pszText); + else + Str_SetPtrAtoW(&lpItem->pszText, (LPSTR)pszText); } else {

1 0

Mikołaj Zalewski : comctl32: header: Move common code from SetItemT/InsertItemT into a new function.
by Alexandre Julliard May 15, 2006

May 15, 2006

Module: wine Branch: refs/heads/master Commit: e3467de964aae8a503997b109ee5f35b5ea89509 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=e3467de964aae8a503997b1… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Sat May 13 21:11:21 2006 +0200 comctl32: header: Move common code from SetItemT/InsertItemT into a new function. --- dlls/comctl32/header.c | 123 +++++++++++++++++++----------------------------- 1 files changed, 48 insertions(+), 75 deletions(-) diff --git a/dlls/comctl32/header.c b/dlls/comctl32/header.c index bf8581d..99c19d0 100644 --- a/dlls/comctl32/header.c +++ b/dlls/comctl32/header.c @@ -110,6 +110,51 @@ static void HEADER_DisposeItem(HEADER_IT } } +static void HEADER_StoreHDItemInHeader(HEADER_ITEM *lpItem, HDITEMW *phdi, BOOL fUnicode) +{ + if (phdi->mask & HDI_BITMAP) + lpItem->hbm = phdi->hbm; + + if (phdi->mask & HDI_FORMAT) + lpItem->fmt = phdi->fmt; + + if (phdi->mask & HDI_LPARAM) + lpItem->lParam = phdi->lParam; + + if (phdi->mask & HDI_WIDTH) + lpItem->cxy = phdi->cxy; + + if (phdi->mask & HDI_IMAGE) + { + lpItem->iImage = phdi->iImage; + } + + if (phdi->mask & HDI_TEXT) + { + if (!phdi->pszText) phdi->pszText = emptyString; /* null pointer check */ + if (phdi->pszText != LPSTR_TEXTCALLBACKW) /* covers != TEXTCALLBACKA too */ + { + if (lpItem->pszText) + { + if (lpItem->pszText != emptyString && lpItem->pszText != LPSTR_TEXTCALLBACKW) + Free(lpItem->pszText); + lpItem->pszText = NULL; + } + if (phdi->pszText) + { + if (fUnicode) + Str_SetPtrW(&lpItem->pszText, phdi->pszText); + else + Str_SetPtrAtoW(&lpItem->pszText, (LPSTR)phdi->pszText); + } + } + else + { + lpItem->pszText = phdi->pszText; + } + } +} + inline static LRESULT HEADER_IndexToOrder (HWND hwnd, INT iItem) { @@ -1085,44 +1130,11 @@ HEADER_InsertItemT (HWND hwnd, INT nItem } lpItem = &infoPtr->items[nItem]; - lpItem->bDown = FALSE; - - if (phdi->mask & HDI_WIDTH) - lpItem->cxy = phdi->cxy; - - if (phdi->mask & HDI_FORMAT) - lpItem->fmt = phdi->fmt; - - if (lpItem->fmt == 0) - lpItem->fmt = HDF_LEFT; - - if (phdi->mask & HDI_BITMAP) - lpItem->hbm = phdi->hbm; - - if (phdi->mask & HDI_LPARAM) - lpItem->lParam = phdi->lParam; - - if (phdi->mask & HDI_IMAGE) - { - lpItem->iImage = phdi->iImage; - } + ZeroMemory(lpItem, sizeof(HEADER_ITEM)); + HEADER_StoreHDItemInHeader(lpItem, phdi, bUnicode); if (phdi->mask & HDI_TEXT) - { - if (!phdi->pszText) phdi->pszText = emptyString; /* null pointer check */ - if (phdi->pszText != LPSTR_TEXTCALLBACKW) /* covers != TEXTCALLBACKA too */ - { - if (bUnicode) - Str_SetPtrW(&lpItem->pszText, phdi->pszText); - else - Str_SetPtrAtoW(&lpItem->pszText, (LPSTR)phdi->pszText); - } - else - { - lpItem->pszText = phdi->pszText; - } lpItem->fmt |= HDF_STRING; - } lpItem->iOrder = iOrder; @@ -1221,46 +1233,7 @@ HEADER_SetItemT (HWND hwnd, INT nItem, L } lpItem = &infoPtr->items[nItem]; - if (phdi->mask & HDI_BITMAP) - lpItem->hbm = phdi->hbm; - - if (phdi->mask & HDI_FORMAT) - lpItem->fmt = phdi->fmt; - - if (phdi->mask & HDI_LPARAM) - lpItem->lParam = phdi->lParam; - - if (phdi->mask & HDI_WIDTH) - lpItem->cxy = phdi->cxy; - - if (phdi->mask & HDI_IMAGE) - { - lpItem->iImage = phdi->iImage; - } - - if (phdi->mask & HDI_TEXT) - { - if (phdi->pszText != LPSTR_TEXTCALLBACKW) /* covers != TEXTCALLBACKA too */ - { - if (lpItem->pszText) - { - if (lpItem->pszText != emptyString && lpItem->pszText != LPSTR_TEXTCALLBACKW) - Free(lpItem->pszText); - lpItem->pszText = NULL; - } - if (phdi->pszText) - { - if (bUnicode) - Str_SetPtrW(&lpItem->pszText, phdi->pszText); - else - Str_SetPtrAtoW(&lpItem->pszText, (LPSTR)phdi->pszText); - } - } - else - { - lpItem->pszText = phdi->pszText; - } - } + HEADER_StoreHDItemInHeader(lpItem, phdi, bUnicode); if (phdi->mask & HDI_ORDER) {

1 0

Mikołaj Zalewski : comctl32: header: Don' t send HDN_GETDISPINFO during HDM_SET/INSERTITEM.
by Alexandre Julliard May 15, 2006

May 15, 2006

Module: wine Branch: refs/heads/master Commit: 15e71a0a86745282be91d1b80a12b64b7b0866e1 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=15e71a0a86745282be91d1b… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Sat May 13 21:09:53 2006 +0200 comctl32: header: Don't send HDN_GETDISPINFO during HDM_SET/INSERTITEM. --- dlls/comctl32/header.c | 22 ++-------------------- 1 files changed, 2 insertions(+), 20 deletions(-) diff --git a/dlls/comctl32/header.c b/dlls/comctl32/header.c index cab8cc7..bf8581d 100644 --- a/dlls/comctl32/header.c +++ b/dlls/comctl32/header.c @@ -1104,15 +1104,7 @@ HEADER_InsertItemT (HWND hwnd, INT nItem if (phdi->mask & HDI_IMAGE) { - if (phdi->iImage != I_IMAGECALLBACK) - { - lpItem->iImage = phdi->iImage; - } - else - { - lpItem->iImage = phdi->iImage; - HEADER_SendHeaderDispInfoNotify(hwnd, nItem, HDI_IMAGE, NULL, lpItem, bUnicode); - } + lpItem->iImage = phdi->iImage; } if (phdi->mask & HDI_TEXT) @@ -1128,7 +1120,6 @@ HEADER_InsertItemT (HWND hwnd, INT nItem else { lpItem->pszText = phdi->pszText; - HEADER_SendHeaderDispInfoNotify(hwnd, nItem, HDI_TEXT, NULL, lpItem, bUnicode); } lpItem->fmt |= HDF_STRING; } @@ -1244,15 +1235,7 @@ HEADER_SetItemT (HWND hwnd, INT nItem, L if (phdi->mask & HDI_IMAGE) { - if (phdi->iImage != I_IMAGECALLBACK) - { - lpItem->iImage = phdi->iImage; - } - else - { - lpItem->iImage = phdi->iImage; - HEADER_SendHeaderDispInfoNotify(hwnd, nItem, HDI_IMAGE, NULL, lpItem, bUnicode); - } + lpItem->iImage = phdi->iImage; } if (phdi->mask & HDI_TEXT) @@ -1276,7 +1259,6 @@ HEADER_SetItemT (HWND hwnd, INT nItem, L else { lpItem->pszText = phdi->pszText; - HEADER_SendHeaderDispInfoNotify(hwnd, nItem, HDI_TEXT, NULL, lpItem, bUnicode); } }

1 0

Mikołaj Zalewski : comctl32: header: Don' t check lpItem for NULL in GetItemT.
by Alexandre Julliard May 15, 2006

May 15, 2006

Module: wine Branch: refs/heads/master Commit: 98658699020ab3bb04da2a2d2959c7cd709fa7a4 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=98658699020ab3bb04da2a2… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Sat May 13 21:07:54 2006 +0200 comctl32: header: Don't check lpItem for NULL in GetItemT. --- dlls/comctl32/header.c | 15 +++++++-------- 1 files changed, 7 insertions(+), 8 deletions(-) diff --git a/dlls/comctl32/header.c b/dlls/comctl32/header.c index cddf740..cab8cc7 100644 --- a/dlls/comctl32/header.c +++ b/dlls/comctl32/header.c @@ -892,20 +892,20 @@ HEADER_GetItemT (HWND hwnd, INT nItem, L lpItem = &infoPtr->items[nItem]; if (phdi->mask & HDI_BITMAP) - phdi->hbm = (lpItem != NULL) ? lpItem->hbm : 0; + phdi->hbm = lpItem->hbm; if (phdi->mask & HDI_FORMAT) - phdi->fmt = (lpItem != NULL) ? lpItem->fmt : 0; + phdi->fmt = lpItem->fmt; if (phdi->mask & HDI_WIDTH) - phdi->cxy = (lpItem != NULL) ? lpItem->cxy : 0; + phdi->cxy = lpItem->cxy; if (phdi->mask & HDI_LPARAM) - phdi->lParam = (lpItem != NULL) ? lpItem->lParam : 0; + phdi->lParam = lpItem->lParam; if (phdi->mask & HDI_IMAGE) { - phdi->iImage = (lpItem != NULL) ? lpItem->iImage : 0; + phdi->iImage = lpItem->iImage; if (lpItem->iImage == I_IMAGECALLBACK) { HEADER_SendHeaderDispInfoNotify(hwnd, nItem, HDI_IMAGE, phdi, lpItem, bUnicode); @@ -913,12 +913,11 @@ HEADER_GetItemT (HWND hwnd, INT nItem, L } if (phdi->mask & HDI_ORDER) - phdi->iOrder = (lpItem != NULL) ? lpItem->iOrder : 0; + phdi->iOrder = lpItem->iOrder; if (phdi->mask & HDI_TEXT) { - if (lpItem == NULL) *phdi->pszText = 0; /* null pointer check */ - else if (lpItem->pszText == LPSTR_TEXTCALLBACKW) /* covers == TEXTCALLBACKA too */ + if (lpItem->pszText == LPSTR_TEXTCALLBACKW) /* covers == TEXTCALLBACKA too */ { HEADER_SendHeaderDispInfoNotify(hwnd, nItem, HDI_TEXT, phdi, lpItem, bUnicode); }

1 0

Jacek Caban : shdocvw: Wrap Heap* finctions by inline functions.
by Alexandre Julliard May 15, 2006

May 15, 2006

Module: wine Branch: refs/heads/master Commit: e718939ebdce7e077636e6bee5dfc6dfaf4cdab4 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=e718939ebdce7e077636e6b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu May 11 06:45:43 2006 +0200 shdocvw: Wrap Heap* finctions by inline functions. --- dlls/shdocvw/events.c | 12 ++++++------ dlls/shdocvw/ie.c | 2 +- dlls/shdocvw/iexplore.c | 8 ++++---- dlls/shdocvw/navigate.c | 8 ++++---- dlls/shdocvw/shdocvw.h | 17 +++++++++++++++++ dlls/shdocvw/shdocvw_main.c | 4 ++-- dlls/shdocvw/shlinstobj.c | 14 +++++++------- dlls/shdocvw/webbrowser.c | 6 +++--- 8 files changed, 44 insertions(+), 27 deletions(-) diff --git a/dlls/shdocvw/events.c b/dlls/shdocvw/events.c index e6541f9..8d35728 100644 --- a/dlls/shdocvw/events.c +++ b/dlls/shdocvw/events.c @@ -206,10 +206,10 @@ static HRESULT WINAPI ConnectionPoint_Ad } if(i == This->sinks_size) - This->sinks = HeapReAlloc(GetProcessHeap(), 0, This->sinks, - (++This->sinks_size)*sizeof(*This->sinks)); + This->sinks = shdocvw_realloc(This->sinks, + (++This->sinks_size)*sizeof(*This->sinks)); }else { - This->sinks = HeapAlloc(GetProcessHeap(), 0, sizeof(*This->sinks)); + This->sinks = shdocvw_alloc(sizeof(*This->sinks)); This->sinks_size = 1; i = 0; } @@ -270,7 +270,7 @@ void call_sink(ConnectionPoint *This, DI static void ConnectionPoint_Create(DocHost *doc_host, REFIID riid, ConnectionPoint **cp) { - ConnectionPoint *ret = HeapAlloc(GetProcessHeap(), 0, sizeof(ConnectionPoint)); + ConnectionPoint *ret = shdocvw_alloc(sizeof(ConnectionPoint)); ret->lpConnectionPointVtbl = &ConnectionPointVtbl; @@ -293,8 +293,8 @@ static void ConnectionPoint_Destroy(Conn IDispatch_Release(This->sinks[i]); } - HeapFree(GetProcessHeap(), 0, This->sinks); - HeapFree(GetProcessHeap(), 0, This); + shdocvw_free(This->sinks); + shdocvw_free(This); } void DocHost_Events_Init(DocHost *This) diff --git a/dlls/shdocvw/ie.c b/dlls/shdocvw/ie.c index 857241f..354ad3c 100644 --- a/dlls/shdocvw/ie.c +++ b/dlls/shdocvw/ie.c @@ -72,7 +72,7 @@ static ULONG WINAPI InternetExplorer_Rel if(!ref) { DocHost_Release(&This->doc_host); - HeapFree(GetProcessHeap(), 0, This); + shdocvw_free(This); } return ref; diff --git a/dlls/shdocvw/iexplore.c b/dlls/shdocvw/iexplore.c index 91548fd..a78255e 100644 --- a/dlls/shdocvw/iexplore.c +++ b/dlls/shdocvw/iexplore.c @@ -149,7 +149,7 @@ HRESULT InternetExplorer_Create(IUnknown TRACE("(%p %s %p)\n", pOuter, debugstr_guid(riid), ppv); - ret = HeapAlloc(GetProcessHeap(), 0, sizeof(InternetExplorer)); + ret = shdocvw_alloc(sizeof(InternetExplorer)); ret->ref = 0; ret->doc_host.disp = (IDispatch*)WEBBROWSER2(ret); @@ -162,7 +162,7 @@ HRESULT InternetExplorer_Create(IUnknown hres = IWebBrowser2_QueryInterface(WEBBROWSER2(ret), riid, ppv); if(FAILED(hres)) { - HeapFree(GetProcessHeap(), 0, ret); + shdocvw_free(ret); return hres; } @@ -195,12 +195,12 @@ DWORD WINAPI IEWinMain(LPSTR szCommandLi DWORD len; len = MultiByteToWideChar(CP_ACP, 0, szCommandLine, -1, NULL, 0); - url = HeapAlloc(GetProcessHeap(),0,len*sizeof(WCHAR)); + url = shdocvw_alloc(len*sizeof(WCHAR)); MultiByteToWideChar(CP_ACP, 0, szCommandLine, -1, url, len); wb = create_ie_window(url); - HeapFree(GetProcessHeap(), 0, url); + shdocvw_free(url); } /* run the message loop for this thread */ diff --git a/dlls/shdocvw/navigate.c b/dlls/shdocvw/navigate.c index 5798ead..9998624 100644 --- a/dlls/shdocvw/navigate.c +++ b/dlls/shdocvw/navigate.c @@ -137,8 +137,8 @@ static ULONG WINAPI BindStatusCallback_R if(!ref) { if(This->post_data) GlobalFree(This->post_data); - HeapFree(GetProcessHeap(), 0, This->headers); - HeapFree(GetProcessHeap(), 0, This); + shdocvw_free(This->headers); + shdocvw_free(This); } return ref; @@ -293,7 +293,7 @@ static const IHttpNegotiateVtbl HttpNego static IBindStatusCallback *create_callback(DocHost *This, PBYTE post_data, ULONG post_data_len, LPWSTR headers, VARIANT_BOOL *cancel) { - BindStatusCallback *ret = HeapAlloc(GetProcessHeap(), 0, sizeof(BindStatusCallback)); + BindStatusCallback *ret = shdocvw_alloc(sizeof(BindStatusCallback)); ret->lpBindStatusCallbackVtbl = &BindStatusCallbackVtbl; ret->lpHttpNegotiateVtbl = &HttpNegotiateVtbl; @@ -310,7 +310,7 @@ static IBindStatusCallback *create_callb if(headers) { int size = (strlenW(headers)+1)*sizeof(WCHAR); - ret->headers = HeapAlloc(GetProcessHeap(), 0, size); + ret->headers = shdocvw_alloc(size); memcpy(ret->headers, headers, size); } diff --git a/dlls/shdocvw/shdocvw.h b/dlls/shdocvw/shdocvw.h index 49fb9cb..0279aca 100644 --- a/dlls/shdocvw/shdocvw.h +++ b/dlls/shdocvw/shdocvw.h @@ -207,4 +207,21 @@ extern void unregister_iewindow_class(vo HRESULT register_class_object(BOOL); +/* memory allocation functions */ + +static inline void *shdocvw_alloc(size_t len) +{ + return HeapAlloc(GetProcessHeap(), 0, len); +} + +static inline void *shdocvw_realloc(void *mem, size_t len) +{ + return HeapReAlloc(GetProcessHeap(), 0, mem, len); +} + +static inline BOOL shdocvw_free(void *mem) +{ + return HeapFree(GetProcessHeap(), 0, mem); +} + #endif /* __WINE_SHDOCVW_H */ diff --git a/dlls/shdocvw/shdocvw_main.c b/dlls/shdocvw/shdocvw_main.c index 0093243..206f457 100644 --- a/dlls/shdocvw/shdocvw_main.c +++ b/dlls/shdocvw/shdocvw_main.c @@ -180,7 +180,7 @@ static ULONG WINAPI dlRelease( IBindStat if( !ref ) { DestroyWindow( This->hDialog ); - HeapFree( GetProcessHeap(), 0, This ); + shdocvw_free(This); } SHDOCVW_UnlockModule(); @@ -285,7 +285,7 @@ static IBindStatusCallback* create_dl(HW { IBindStatusCallbackImpl *This; - This = HeapAlloc( GetProcessHeap(), 0, sizeof *This ); + This = shdocvw_alloc(sizeof(*This)); This->vtbl = &dlVtbl; This->ref = 1; This->hDialog = dlg; diff --git a/dlls/shdocvw/shlinstobj.c b/dlls/shdocvw/shlinstobj.c index 19ba3b8..09f31dd 100644 --- a/dlls/shdocvw/shlinstobj.c +++ b/dlls/shdocvw/shlinstobj.c @@ -60,7 +60,7 @@ static void RegistryPropertyBag_Destroy( TRACE("This=%p)\n", This); RegCloseKey(This->m_hInitPropertyBagKey); - HeapFree(GetProcessHeap(), 0, This); + shdocvw_free(This); } static HRESULT WINAPI RegistryPropertyBag_IPropertyBag_QueryInterface(IPropertyBag *iface, @@ -131,20 +131,20 @@ static HRESULT WINAPI RegistryPropertyBa if (res != ERROR_SUCCESS) return E_INVALIDARG; - pwszValue = HeapAlloc(GetProcessHeap(), 0, cbData); + pwszValue = shdocvw_alloc(cbData); if (!pwszValue) return E_OUTOFMEMORY; res = RegQueryValueExW(This->m_hInitPropertyBagKey, pwszPropName, NULL, &dwType, (LPBYTE)pwszValue, &cbData); if (res != ERROR_SUCCESS) { - HeapFree(GetProcessHeap(), 0, pwszValue); + shdocvw_free(pwszValue); return E_INVALIDARG; } V_VT(pVar) = VT_BSTR; V_BSTR(pVar) = SysAllocString(pwszValue); - HeapFree(GetProcessHeap(), 0, pwszValue); + shdocvw_free(pwszValue); if (vtDst != VT_BSTR) { hr = VariantChangeTypeEx(pVar, pVar, LOCALE_SYSTEM_DEFAULT, 0, vtDst); @@ -177,7 +177,7 @@ HRESULT RegistryPropertyBag_Constructor( TRACE("(hInitPropertyBagKey=%p, riid=%s, ppvObject=%p)\n", hInitPropertyBagKey, debugstr_guid(riid), ppvObject); - pRegistryPropertyBag = HeapAlloc(GetProcessHeap(), 0, sizeof(RegistryPropertyBag)); + pRegistryPropertyBag = shdocvw_alloc(sizeof(RegistryPropertyBag)); if (pRegistryPropertyBag) { pRegistryPropertyBag->lpIPropertyBagVtbl = &RegistryPropertyBag_IPropertyBagVtbl; pRegistryPropertyBag->m_cRef = 0; @@ -207,7 +207,7 @@ typedef struct _InstanceObjectFactory { static void InstanceObjectFactory_Destroy(InstanceObjectFactory *This) { IPropertyBag_Release(This->m_pPropertyBag); - HeapFree(GetProcessHeap(), 0, This); + shdocvw_free(This); } static HRESULT WINAPI InstanceObjectFactory_IClassFactory_QueryInterface(IClassFactory *iface, @@ -323,7 +323,7 @@ HRESULT InstanceObjectFactory_Constructo TRACE("(RegistryPropertyBag=%p, riid=%s, ppvObject=%p)\n", pPropertyBag, debugstr_guid(riid), ppvObject); - pInstanceObjectFactory = HeapAlloc(GetProcessHeap(), 0, sizeof(InstanceObjectFactory)); + pInstanceObjectFactory = shdocvw_alloc(sizeof(InstanceObjectFactory)); if (pInstanceObjectFactory) { pInstanceObjectFactory->lpIClassFactoryVtbl = &InstanceObjectFactory_IClassFactoryVtbl; pInstanceObjectFactory->m_cRef = 0; diff --git a/dlls/shdocvw/webbrowser.c b/dlls/shdocvw/webbrowser.c index d50bbf3..3b319de 100644 --- a/dlls/shdocvw/webbrowser.c +++ b/dlls/shdocvw/webbrowser.c @@ -133,7 +133,7 @@ static ULONG WINAPI WebBrowser_Release(I WebBrowser_OleObject_Destroy(This); - HeapFree(GetProcessHeap(), 0, This); + shdocvw_free(This); SHDOCVW_UnlockModule(); } @@ -925,7 +925,7 @@ HRESULT WebBrowser_Create(IUnknown *pOut TRACE("(%p %s %p)\n", pOuter, debugstr_guid(riid), ppv); - ret = HeapAlloc(GetProcessHeap(), 0, sizeof(WebBrowser)); + ret = shdocvw_alloc(sizeof(WebBrowser)); ret->lpWebBrowser2Vtbl = &WebBrowser2Vtbl; ret->ref = 0; @@ -949,7 +949,7 @@ HRESULT WebBrowser_Create(IUnknown *pOut if(SUCCEEDED(hres)) { SHDOCVW_LockModule(); }else { - HeapFree(GetProcessHeap(), 0, ret); + shdocvw_free(ret); return hres; }

1 0

Huw Davies : oleaut32: Update the marshal state buffer size when resizing ( Doh!).
by Alexandre Julliard May 15, 2006

May 15, 2006

Module: wine Branch: refs/heads/master Commit: 3dce323d695f69964791ff0b54786823c66f8d69 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=3dce323d695f69964791ff0… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon May 15 10:02:48 2006 +0100 oleaut32: Update the marshal state buffer size when resizing (Doh!). --- dlls/oleaut32/tmarshal.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/oleaut32/tmarshal.c b/dlls/oleaut32/tmarshal.c index b25cc4d..b4c099d 100644 --- a/dlls/oleaut32/tmarshal.c +++ b/dlls/oleaut32/tmarshal.c @@ -86,6 +86,7 @@ xbuf_resize(marshal_state *buf, DWORD ne if(!buf->base) return E_OUTOFMEMORY; } + buf->size = newsize; return S_OK; }

1 0

Vitaliy Margolen : msvcrt: Fix times tests to pass on windows.
by Alexandre Julliard May 15, 2006

May 15, 2006

Module: wine Branch: refs/heads/master Commit: 99cfc8bdf8ae2557832cc7914f29c79278da3d8e URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=99cfc8bdf8ae2557832cc79… Author: Vitaliy Margolen <wine-patch(a)kievinfo.com> Date: Sun May 14 22:12:33 2006 -0600 msvcrt: Fix times tests to pass on windows. Add more tests for daylight-time savings. --- dlls/msvcrt/tests/time.c | 29 ++++++++++++++++++----------- 1 files changed, 18 insertions(+), 11 deletions(-) diff --git a/dlls/msvcrt/tests/time.c b/dlls/msvcrt/tests/time.c index 1d54787..66122e9 100644 --- a/dlls/msvcrt/tests/time.c +++ b/dlls/msvcrt/tests/time.c @@ -59,9 +59,7 @@ static void test_mktime(void) ok (res != TIME_ZONE_ID_INVALID, "GetTimeZoneInformation failed\n"); /* Bias may be positive or negative, to use offset of one day */ - secs= SECSPERDAY - (tzinfo.Bias + - ( res == TIME_ZONE_ID_STANDARD ? tzinfo.StandardBias : - ( res == TIME_ZONE_ID_DAYLIGHT ? tzinfo.DaylightBias : 0 ))) * SECSPERMIN; + secs= SECSPERDAY - tzinfo.Bias * SECSPERMIN; my_tm.tm_mday = 1 + secs/SECSPERDAY; secs = secs % SECSPERDAY; my_tm.tm_hour = secs / SECSPERHOUR; @@ -150,9 +148,7 @@ static void test_localtime(void) { TIME_ZONE_INFORMATION tzinfo; DWORD res = GetTimeZoneInformation(&tzinfo); - time_t gmt = (time_t)(SECSPERDAY + (tzinfo.Bias + - ( res == TIME_ZONE_ID_STANDARD ? tzinfo.StandardBias : - ( res == TIME_ZONE_ID_DAYLIGHT ? tzinfo.DaylightBias : 0 ))) * SECSPERMIN); + time_t gmt = (time_t)(SECSPERDAY + tzinfo.Bias * SECSPERMIN); char TZ_env[256]; struct tm* lt; @@ -161,9 +157,8 @@ static void test_localtime(void) lt = localtime(&gmt); ok(((lt->tm_year == 70) && (lt->tm_mon == 0) && (lt->tm_yday == 1) && (lt->tm_mday == 2) && (lt->tm_wday == 5) && (lt->tm_hour == 0) && - (lt->tm_min == 0) && (lt->tm_sec == 0) && (lt->tm_isdst == - (res == TIME_ZONE_ID_DAYLIGHT))), - "Wrong date:Year %4d mon %2d yday %3d mday %2d wday %1d hour%2d min %2d sec %2d dst %2d\n", + (lt->tm_min == 0) && (lt->tm_sec == 0) && (lt->tm_isdst == 0)), + "Wrong date:Year %4d mon %2d yday %3d mday %2d wday %1d hour %2d min %2d sec %2d dst %2d\n", lt->tm_year, lt->tm_mon, lt->tm_yday, lt->tm_mday, lt->tm_wday, lt->tm_hour, lt->tm_min, lt->tm_sec, lt->tm_isdst); @@ -172,12 +167,24 @@ static void test_localtime(void) lt = localtime(&gmt); ok(((lt->tm_year == 70) && (lt->tm_mon == 0) && (lt->tm_yday == 1) && (lt->tm_mday == 2) && (lt->tm_wday == 5) && (lt->tm_hour == 0) && + (lt->tm_min == 0) && (lt->tm_sec == 0) && (lt->tm_isdst == 0)), + "Wrong date:Year %4d mon %2d yday %3d mday %2d wday %1d hour %2d min %2d sec %2d dst %2d\n", + lt->tm_year, lt->tm_mon, lt->tm_yday, lt->tm_mday, lt->tm_wday, lt->tm_hour, + lt->tm_min, lt->tm_sec, lt->tm_isdst); + putenv(TZ_env); + + /* June 22 */ + gmt += 201 * SECSPERDAY + + ( res == TIME_ZONE_ID_STANDARD ? tzinfo.StandardBias : + ( res == TIME_ZONE_ID_DAYLIGHT ? tzinfo.DaylightBias : 0 )) * SECSPERMIN; + lt = localtime(&gmt); + ok(((lt->tm_year == 70) && (lt->tm_mon == 6) && (lt->tm_yday == 202) && + (lt->tm_mday == 22) && (lt->tm_wday == 3) && (lt->tm_hour == 0) && (lt->tm_min == 0) && (lt->tm_sec == 0) && (lt->tm_isdst == (res == TIME_ZONE_ID_DAYLIGHT))), - "Wrong date:Year %4d mon %2d yday %3d mday %2d wday %1d hour%2d min %2d sec %2d dst %2d\n", + "Wrong date:Year %4d mon %2d yday %3d mday %2d wday %1d hour %2d min %2d sec %2d dst %2d\n", lt->tm_year, lt->tm_mon, lt->tm_yday, lt->tm_mday, lt->tm_wday, lt->tm_hour, lt->tm_min, lt->tm_sec, lt->tm_isdst); - putenv(TZ_env); } static void test_strdate(void) {

1 0

Robert Shearman : server: Retrieve the groups for a token from the server.
by Alexandre Julliard May 15, 2006

May 15, 2006

Module: wine Branch: refs/heads/master Commit: 3396a66ee7270c24cd2c50193afb68f6e49b4c92 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=3396a66ee7270c24cd2c501… Author: Robert Shearman <rob(a)codeweavers.com> Date: Sat May 13 16:58:19 2006 +0100 server: Retrieve the groups for a token from the server. --- dlls/ntdll/nt.c | 73 ++++++++++++++++++++++++++++++------- include/wine/server_protocol.h | 24 ++++++++++++ server/protocol.def | 14 +++++++ server/request.h | 2 + server/token.c | 80 +++++++++++++++++++++++++++++++++++----- server/trace.c | 52 ++++++++++++++++++++++++++ 6 files changed, 220 insertions(+), 25 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=3396a66ee7270c24cd2…

1 0

Robert Shearman : rpcrt4: The arm type mask should be comparing the highest byte against 0x80, as documented on MSDN.
by Alexandre Julliard May 15, 2006

May 15, 2006

Module: wine Branch: refs/heads/master Commit: 07d032b24ba76512cd7bed8a0d712571d37511ab URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=07d032b24ba76512cd7bed8… Author: Robert Shearman <rob(a)codeweavers.com> Date: Sat May 13 17:00:27 2006 +0100 rpcrt4: The arm type mask should be comparing the highest byte against 0x80, as documented on MSDN. Fix base type arm handling on little-endian machines, as the current code would always pass in the address to the format char of 0x80 instead of the base type format char. --- dlls/rpcrt4/ndr_marshall.c | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/rpcrt4/ndr_marshall.c b/dlls/rpcrt4/ndr_marshall.c index 18c1874..0fbf0f3 100644 --- a/dlls/rpcrt4/ndr_marshall.c +++ b/dlls/rpcrt4/ndr_marshall.c @@ -3074,10 +3074,10 @@ unsigned char * WINAPI NdrNonEncapsulat return NULL; type = *(const unsigned short*)pFormat; - if(type & 0x8000) + if((type & 0xff00) == 0x8000) { - pFormat++; - return NdrBaseTypeMarshall(pStubMsg, pMemory, pFormat); + unsigned char basetype = LOBYTE(type); + return NdrBaseTypeMarshall(pStubMsg, pMemory, &basetype); } else { @@ -3171,10 +3171,10 @@ unsigned char * WINAPI NdrNonEncapsulat *ppMemory = NdrAllocate(pStubMsg, size); type = *(const unsigned short*)pFormat; - if(type & 0x8000) + if((type & 0xff00) == 0x8000) { - pFormat++; - return NdrBaseTypeUnmarshall(pStubMsg, ppMemory, pFormat, fMustAlloc); + unsigned char basetype = LOBYTE(type); + return NdrBaseTypeUnmarshall(pStubMsg, ppMemory, &basetype, fMustAlloc); } else { @@ -3218,10 +3218,10 @@ void WINAPI NdrNonEncapsulatedUnionBuffe return; type = *(const unsigned short*)pFormat; - if(type & 0x8000) + if((type & 0xff00) == 0x8000) { - pFormat++; - NdrBaseTypeBufferSize(pStubMsg, pMemory, pFormat); + unsigned char basetype = LOBYTE(type); + NdrBaseTypeBufferSize(pStubMsg, pMemory, &basetype); } else {

1 0

Robert Shearman : rpcrt4: Make ComplexStructSize increment the buffer.
by Alexandre Julliard May 15, 2006

May 15, 2006

Module: wine Branch: refs/heads/master Commit: 5cdfeeeed3a0d1b369c1688f8c04cc7a00386ac0 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=5cdfeeeed3a0d1b369c1688… Author: Robert Shearman <rob(a)codeweavers.com> Date: Sat May 13 17:00:09 2006 +0100 rpcrt4: Make ComplexStructSize increment the buffer. --- dlls/rpcrt4/ndr_marshall.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/rpcrt4/ndr_marshall.c b/dlls/rpcrt4/ndr_marshall.c index a868173..18c1874 100644 --- a/dlls/rpcrt4/ndr_marshall.c +++ b/dlls/rpcrt4/ndr_marshall.c @@ -1778,22 +1778,28 @@ unsigned long WINAPI ComplexStructSize(P case RPC_FC_SHORT: case RPC_FC_USHORT: size += 2; + pStubMsg->Buffer += 2; break; case RPC_FC_LONG: case RPC_FC_ULONG: size += 4; + pStubMsg->Buffer += 4; break; case RPC_FC_POINTER: size += 4; + pStubMsg->Buffer += 4; break; case RPC_FC_ALIGNM4: ALIGN_LENGTH(size, 4); + ALIGN_POINTER(pStubMsg->Buffer, 4); break; case RPC_FC_ALIGNM8: ALIGN_LENGTH(size, 8); + ALIGN_POINTER(pStubMsg->Buffer, 8); break; case RPC_FC_STRUCTPAD2: size += 2; + pStubMsg->Buffer += 2; break; case RPC_FC_EMBEDDED_COMPLEX: size += pFormat[1];

1 0