wine-commits January 2010

wine-commits@winehq.org

3 participants
615 discussions

Henri Verbeet : avifil32: Don't leak the buffer on HeapReAlloc() failure in AVISaveOptionsFmtChoose().
by Alexandre Julliard 06 Jan '10

06 Jan '10

Module: wine Branch: master Commit: d34aba2a1c4b3aa781f3bba822f02748adca8f76 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d34aba2a1c4b3aa781f3bba82… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jan 5 21:29:03 2010 +0100 avifil32: Don't leak the buffer on HeapReAlloc() failure in AVISaveOptionsFmtChoose(). --- dlls/avifil32/api.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/avifil32/api.c b/dlls/avifil32/api.c index 8107b47..c3dc72f 100644 --- a/dlls/avifil32/api.c +++ b/dlls/avifil32/api.c @@ -1225,13 +1225,14 @@ static BOOL AVISaveOptionsFmtChoose(HWND hWnd) acmMetrics(NULL, ACM_METRIC_MAX_SIZE_FORMAT, &size); if ((pOptions->cbFormat == 0 || pOptions->lpFormat == NULL) && size != 0) { pOptions->lpFormat = HeapAlloc(GetProcessHeap(), 0, size); + if (!pOptions->lpFormat) return FALSE; pOptions->cbFormat = size; } else if (pOptions->cbFormat < (DWORD)size) { - pOptions->lpFormat = HeapReAlloc(GetProcessHeap(), 0, pOptions->lpFormat, size); + void *new_buffer = HeapReAlloc(GetProcessHeap(), 0, pOptions->lpFormat, size); + if (!new_buffer) return FALSE; + pOptions->lpFormat = new_buffer; pOptions->cbFormat = size; } - if (pOptions->lpFormat == NULL) - return FALSE; afmtc.pwfx = pOptions->lpFormat; afmtc.cbwfx = pOptions->cbFormat;

1 0

Henri Verbeet : avifil32: Don't leak the buffer on HeapReAlloc() failure in AVIFILE_AddFrame().
by Alexandre Julliard 06 Jan '10

06 Jan '10

Module: wine Branch: master Commit: 7ab71039465505db5d68b830da1648f87e7bdb88 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7ab71039465505db5d68b830d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jan 5 21:29:02 2010 +0100 avifil32: Don't leak the buffer on HeapReAlloc() failure in AVIFILE_AddFrame(). Perhaps the code should also just double the buffer. I can send another patch for that if needed. --- dlls/avifil32/avifile.c | 22 +++++++++++++--------- 1 files changed, 13 insertions(+), 9 deletions(-) diff --git a/dlls/avifil32/avifile.c b/dlls/avifil32/avifile.c index ea6d6b1..57ebb11 100644 --- a/dlls/avifil32/avifile.c +++ b/dlls/avifil32/avifile.c @@ -1383,16 +1383,20 @@ static HRESULT AVIFILE_AddFrame(IAVIStreamImpl *This, DWORD ckid, DWORD size, DW } if (This->idxFmtChanges == NULL || This->nIdxFmtChanges <= This->sInfo.dwFormatChangeCount) { - This->nIdxFmtChanges += 16; - if (This->idxFmtChanges == NULL) - This->idxFmtChanges = - HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, This->nIdxFmtChanges * sizeof(AVIINDEXENTRY)); - else + DWORD new_count = This->nIdxFmtChanges + 16; + void *new_buffer; + + if (This->idxFmtChanges == NULL) { This->idxFmtChanges = - HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, This->idxFmtChanges, - This->nIdxFmtChanges * sizeof(AVIINDEXENTRY)); - if (This->idxFmtChanges == NULL) - return AVIERR_MEMORY; + HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, new_count * sizeof(AVIINDEXENTRY)); + if (!This->idxFmtChanges) return AVIERR_MEMORY; + } else { + new_buffer = HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, This->idxFmtChanges, + new_count * sizeof(AVIINDEXENTRY)); + if (!new_buffer) return AVIERR_MEMORY; + This->idxFmtChanges = new_buffer; + } + This->nIdxFmtChanges = new_count; } This->sInfo.dwFlags |= AVISTREAMINFO_FORMATCHANGES;

1 0

Henri Verbeet : avifil32: Only modify the stream info after a succesful allocation in AVIFILE_AddFrame ().
by Alexandre Julliard 06 Jan '10

06 Jan '10

Module: wine Branch: master Commit: 63aa5418c1bec4992f75c984c54a8bee23b92fec URL: http://source.winehq.org/git/wine.git/?a=commit;h=63aa5418c1bec4992f75c984c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jan 5 21:29:01 2010 +0100 avifil32: Only modify the stream info after a succesful allocation in AVIFILE_AddFrame(). --- dlls/avifil32/avifile.c | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/avifil32/avifile.c b/dlls/avifil32/avifile.c index 48c3662..ea6d6b1 100644 --- a/dlls/avifil32/avifile.c +++ b/dlls/avifil32/avifile.c @@ -1381,10 +1381,8 @@ static HRESULT AVIFILE_AddFrame(IAVIStreamImpl *This, DWORD ckid, DWORD size, DW ERR(": found palette change in non-video stream!\n"); return AVIERR_BADFORMAT; } - This->sInfo.dwFlags |= AVISTREAMINFO_FORMATCHANGES; - This->sInfo.dwFormatChangeCount++; - if (This->idxFmtChanges == NULL || This->nIdxFmtChanges < This->sInfo.dwFormatChangeCount) { + if (This->idxFmtChanges == NULL || This->nIdxFmtChanges <= This->sInfo.dwFormatChangeCount) { This->nIdxFmtChanges += 16; if (This->idxFmtChanges == NULL) This->idxFmtChanges = @@ -1397,7 +1395,8 @@ static HRESULT AVIFILE_AddFrame(IAVIStreamImpl *This, DWORD ckid, DWORD size, DW return AVIERR_MEMORY; } - n = This->sInfo.dwFormatChangeCount; + This->sInfo.dwFlags |= AVISTREAMINFO_FORMATCHANGES; + n = ++This->sInfo.dwFormatChangeCount; This->idxFmtChanges[n].ckid = This->lLastFrame; This->idxFmtChanges[n].dwFlags = 0; This->idxFmtChanges[n].dwChunkOffset = offset;

1 0

Henri Verbeet : avifil32: Properly check the required buffer size in AVIFILE_AddFrame().
by Alexandre Julliard 06 Jan '10

06 Jan '10

Module: wine Branch: master Commit: c2051d33d65514eed5ca5116450fe41210663dd6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c2051d33d65514eed5ca51164… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jan 5 21:29:00 2010 +0100 avifil32: Properly check the required buffer size in AVIFILE_AddFrame(). --- dlls/avifil32/avifile.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/avifil32/avifile.c b/dlls/avifil32/avifile.c index 57f8294..48c3662 100644 --- a/dlls/avifil32/avifile.c +++ b/dlls/avifil32/avifile.c @@ -1384,7 +1384,7 @@ static HRESULT AVIFILE_AddFrame(IAVIStreamImpl *This, DWORD ckid, DWORD size, DW This->sInfo.dwFlags |= AVISTREAMINFO_FORMATCHANGES; This->sInfo.dwFormatChangeCount++; - if (This->idxFmtChanges == NULL || This->sInfo.dwFormatChangeCount < This->nIdxFmtChanges) { + if (This->idxFmtChanges == NULL || This->nIdxFmtChanges < This->sInfo.dwFormatChangeCount) { This->nIdxFmtChanges += 16; if (This->idxFmtChanges == NULL) This->idxFmtChanges =

1 0

Henri Verbeet : avifil32: Always add the format change frame to the buffer in AVIFILE_AddFrame().
by Alexandre Julliard 06 Jan '10

06 Jan '10

Module: wine Branch: master Commit: 32c3adbbaabacf8bdc84a01ed68794c5dc5f7981 URL: http://source.winehq.org/git/wine.git/?a=commit;h=32c3adbbaabacf8bdc84a01ed… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jan 5 21:28:59 2010 +0100 avifil32: Always add the format change frame to the buffer in AVIFILE_AddFrame(). It doesn't make sense to only do this when the buffer is resized. --- dlls/avifil32/avifile.c | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/avifil32/avifile.c b/dlls/avifil32/avifile.c index c4f191a..57f8294 100644 --- a/dlls/avifil32/avifile.c +++ b/dlls/avifil32/avifile.c @@ -1362,6 +1362,8 @@ static HRESULT WINAPI IAVIStream_fnSetInfo(IAVIStream *iface, static HRESULT AVIFILE_AddFrame(IAVIStreamImpl *This, DWORD ckid, DWORD size, DWORD offset, DWORD flags) { + UINT n; + /* pre-conditions */ assert(This != NULL); @@ -1383,8 +1385,6 @@ static HRESULT AVIFILE_AddFrame(IAVIStreamImpl *This, DWORD ckid, DWORD size, DW This->sInfo.dwFormatChangeCount++; if (This->idxFmtChanges == NULL || This->sInfo.dwFormatChangeCount < This->nIdxFmtChanges) { - UINT n = This->sInfo.dwFormatChangeCount; - This->nIdxFmtChanges += 16; if (This->idxFmtChanges == NULL) This->idxFmtChanges = @@ -1395,15 +1395,15 @@ static HRESULT AVIFILE_AddFrame(IAVIStreamImpl *This, DWORD ckid, DWORD size, DW This->nIdxFmtChanges * sizeof(AVIINDEXENTRY)); if (This->idxFmtChanges == NULL) return AVIERR_MEMORY; + } - This->idxFmtChanges[n].ckid = This->lLastFrame; - This->idxFmtChanges[n].dwFlags = 0; - This->idxFmtChanges[n].dwChunkOffset = offset; - This->idxFmtChanges[n].dwChunkLength = size; + n = This->sInfo.dwFormatChangeCount; + This->idxFmtChanges[n].ckid = This->lLastFrame; + This->idxFmtChanges[n].dwFlags = 0; + This->idxFmtChanges[n].dwChunkOffset = offset; + This->idxFmtChanges[n].dwChunkLength = size; - return AVIERR_OK; - } - break; + return AVIERR_OK; case cktypeWAVEbytes: if (This->paf->fInfo.dwFlags & AVIFILEINFO_TRUSTCKTYPE) flags |= AVIIF_KEYFRAME;

1 0

André Hentschel : msi/tests: Remove dead url.
by Alexandre Julliard 06 Jan '10

06 Jan '10

Module: wine Branch: master Commit: 2e339c471e82029263fab04f19aa9b5179c5d471 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e339c471e82029263fab04f1… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Jan 5 20:43:09 2010 +0100 msi/tests: Remove dead url. --- dlls/msi/tests/record.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/msi/tests/record.c b/dlls/msi/tests/record.c index 369c855..0b80779 100644 --- a/dlls/msi/tests/record.c +++ b/dlls/msi/tests/record.c @@ -334,7 +334,6 @@ static void test_msirecord(void) ok(r == ERROR_SUCCESS, "failed to add stream to record\n"); r = MsiRecordReadStream(h, 1, buf, NULL); ok(r == ERROR_INVALID_PARAMETER, "should return error\n"); - /* http://test.winehq.org/data/200503181000/98_jmelgarejo98casa/msi:record.txt */ DeleteFile(filename); /* Windows 98 doesn't like this at all, so don't check return. */ r = MsiRecordReadStream(h, 1, NULL, NULL); ok(r == ERROR_INVALID_PARAMETER, "should return error\n");

1 0

André Hentschel : dbghelp: Fix typo in url.
by Alexandre Julliard 06 Jan '10

06 Jan '10

Module: wine Branch: master Commit: 2f5ba0d8c0996430e35188ab8e6e0f873d95ea63 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f5ba0d8c0996430e35188ab8… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Jan 5 20:42:30 2010 +0100 dbghelp: Fix typo in url. --- dlls/dbghelp/stabs.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/dbghelp/stabs.c b/dlls/dbghelp/stabs.c index bc5b674..837e213 100644 --- a/dlls/dbghelp/stabs.c +++ b/dlls/dbghelp/stabs.c @@ -26,7 +26,7 @@ * The "stabs" debug format * by Julia Menapace, Jim Kingdon, David Mackenzie * of Cygnus Support - * available (hopefully) from http:\\sources.redhat.com\gdb\onlinedocs + * available (hopefully) from http://sources.redhat.com/gdb/onlinedocs */ #include "config.h"

1 0

André Hentschel : winedbg: Update link.
by Alexandre Julliard 06 Jan '10

06 Jan '10

Module: wine Branch: master Commit: 76c518539f3a62516770d3eafcc5b112f8ee9e0a URL: http://source.winehq.org/git/wine.git/?a=commit;h=76c518539f3a62516770d3eaf… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Jan 5 20:42:19 2010 +0100 winedbg: Update link. --- programs/winedbg/gdbproxy.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/winedbg/gdbproxy.c b/programs/winedbg/gdbproxy.c index ceae777..c1dac01 100644 --- a/programs/winedbg/gdbproxy.c +++ b/programs/winedbg/gdbproxy.c @@ -21,7 +21,7 @@ */ /* Protocol specification can be found here: - * http://sources.redhat.com/gdb/onlinedocs/gdb_32.html + * http://sources.redhat.com/gdb/onlinedocs/gdb/Maintenance-Commands.html */ #include "config.h"

1 0

Andrew Eikum : msi: Implement recursive INSTALLSTATE updates for msi treeview selector.
by Alexandre Julliard 06 Jan '10

06 Jan '10

Module: wine Branch: master Commit: d1a916a614b83ff14af82632aa49840bddcf8e45 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d1a916a614b83ff14af82632a… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Tue Jan 5 11:42:09 2010 -0600 msi: Implement recursive INSTALLSTATE updates for msi treeview selector. --- dlls/msi/dialog.c | 55 ++++++++++++++++++++++++++++++++++++++++++++-------- 1 files changed, 46 insertions(+), 9 deletions(-) diff --git a/dlls/msi/dialog.c b/dlls/msi/dialog.c index a22091f..5fd4bbd 100644 --- a/dlls/msi/dialog.c +++ b/dlls/msi/dialog.c @@ -166,6 +166,8 @@ static MSIFEATURE *msi_seltree_get_selected_feature( msi_control *control ); #define WM_MSI_DIALOG_CREATE (WM_USER+0x100) #define WM_MSI_DIALOG_DESTROY (WM_USER+0x101) +#define USER_INSTALLSTATE_ALL 0x1000 + static DWORD uiThreadId; static HWND hMsiHiddenWindow; @@ -1876,7 +1878,7 @@ msi_seltree_popup_menu( HWND hwnd, INT x, INT y ) /* FIXME: load strings from resources */ AppendMenuA( hMenu, MF_ENABLED, INSTALLSTATE_LOCAL, "Install feature locally"); - AppendMenuA( hMenu, MF_GRAYED, 0x1000, "Install entire feature"); + AppendMenuA( hMenu, MF_ENABLED, USER_INSTALLSTATE_ALL, "Install entire feature"); AppendMenuA( hMenu, MF_ENABLED, INSTALLSTATE_ADVERTISED, "Install on demand"); AppendMenuA( hMenu, MF_ENABLED, INSTALLSTATE_ABSENT, "Don't install"); r = TrackPopupMenu( hMenu, TPM_LEFTALIGN | TPM_TOPALIGN | TPM_RETURNCMD, @@ -1899,6 +1901,37 @@ msi_seltree_feature_from_item( HWND hwnd, HTREEITEM hItem ) return (MSIFEATURE*) tvi.lParam; } +static void +msi_seltree_update_feature_installstate( HWND hwnd, HTREEITEM hItem, + MSIPACKAGE *package, MSIFEATURE *feature, INSTALLSTATE state ) +{ + msi_feature_set_state( package, feature, state ); + msi_seltree_sync_item_state( hwnd, feature, hItem ); + ACTION_UpdateComponentStates( package, feature->Feature ); +} + +static void +msi_seltree_update_siblings_and_children_installstate( HWND hwnd, HTREEITEM curr, + MSIPACKAGE *package, INSTALLSTATE state) +{ + /* update all siblings */ + do + { + MSIFEATURE *feature; + HTREEITEM child; + + feature = msi_seltree_feature_from_item( hwnd, curr ); + msi_seltree_update_feature_installstate( hwnd, curr, package, feature, state ); + + /* update this sibling's children */ + child = (HTREEITEM)SendMessageW( hwnd, TVM_GETNEXTITEM, (WPARAM)TVGN_CHILD, (LPARAM)curr ); + if (child) + msi_seltree_update_siblings_and_children_installstate( hwnd, child, + package, state ); + } + while ((curr = (HTREEITEM)SendMessageW( hwnd, TVM_GETNEXTITEM, (WPARAM)TVGN_NEXT, (LPARAM)curr ))); +} + static LRESULT msi_seltree_menu( HWND hwnd, HTREEITEM hItem ) { @@ -1931,19 +1964,23 @@ msi_seltree_menu( HWND hwnd, HTREEITEM hItem ) switch (r) { - case INSTALLSTATE_LOCAL: + case USER_INSTALLSTATE_ALL: + r = INSTALLSTATE_LOCAL; + /* fall-through */ case INSTALLSTATE_ADVERTISED: case INSTALLSTATE_ABSENT: - msi_feature_set_state(package, feature, r); + { + HTREEITEM child; + child = (HTREEITEM)SendMessageW( hwnd, TVM_GETNEXTITEM, (WPARAM)TVGN_CHILD, (LPARAM)hItem ); + if (child) + msi_seltree_update_siblings_and_children_installstate( hwnd, child, package, r ); + } + /* fall-through */ + case INSTALLSTATE_LOCAL: + msi_seltree_update_feature_installstate( hwnd, hItem, package, feature, r ); break; - default: - FIXME("select feature and all children\n"); } - /* update */ - msi_seltree_sync_item_state( hwnd, feature, hItem ); - ACTION_UpdateComponentStates( package, feature->Feature ); - return 0; }

1 0

Detlef Riekenberg : user32: Move a comment about HLOCAL16 to user.exe.
by Alexandre Julliard 05 Jan '10

05 Jan '10

Module: wine Branch: master Commit: 2f529c39fda88a9c5803bd5ff3bf9c63ad0247ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f529c39fda88a9c5803bd5ff… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Tue Jan 5 15:58:01 2010 +0100 user32: Move a comment about HLOCAL16 to user.exe. --- dlls/user.exe16/message.c | 11 +++++++++++ dlls/user32/edit.c | 14 +------------- 2 files changed, 12 insertions(+), 13 deletions(-) diff --git a/dlls/user.exe16/message.c b/dlls/user.exe16/message.c index 011e5c4..1ff58a7 100644 --- a/dlls/user.exe16/message.c +++ b/dlls/user.exe16/message.c @@ -2094,6 +2094,17 @@ static LRESULT combo_proc16( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam, return wow_handlers32.combo_proc( hwnd, msg, wParam, lParam, FALSE ); } +/********************************************************************* + * edit_lock_buffer (internal) + * + * A 16 bit application might send an EM_GETHANDLE message and expect a HLOCAL16 + * (16 bit SEG:OFF handler). From that moment on we have to keep using this + * 16 bit memory handler, because it is supposed to be valid at all times after + * EM_GETHANDLE. + * We create a HLOCAL16 buffer in edit_get_handle and copy the text from the + * HLOCAL buffer, when needed + * + */ #define GWW_HANDLE16 sizeof(void*) diff --git a/dlls/user32/edit.c b/dlls/user32/edit.c index d7ab5b4..20a853e 100644 --- a/dlls/user32/edit.c +++ b/dlls/user32/edit.c @@ -1088,19 +1088,7 @@ static inline void text_buffer_changed(EDITSTATE *es) } /********************************************************************* - * - * EDIT_LockBuffer - * - * This acts as a LocalLock16(), but it locks only once. This way - * you can call it whenever you like, without unlocking. - * - * Initially the edit control allocates a HLOCAL32 buffer - * (32 bit linear memory handler). However, 16 bit application - * might send an EM_GETHANDLE message and expect a HLOCAL16 (16 bit SEG:OFF - * handler). From that moment on we have to keep using this 16 bit memory - * handler, because it is supposed to be valid at all times after EM_GETHANDLE. - * What we do is create a HLOCAL16 buffer, copy the text, and do pointer - * conversion. + * EDIT_LockBuffer * */ static void EDIT_LockBuffer(EDITSTATE *es)

1 0

← Newer
1
...
51
52
53
54
55
56
57
...
62
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 January 2010