February 2007 - Wine-Commits

Chris Robinson : quartz: Stop and free the dsound buffer when needed.
by Alexandre Julliard Feb. 19, 2007

Feb. 19, 2007

Module: wine Branch: master Commit: 7605dc0d7450dd60de2403bd05b257178c4cf4c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7605dc0d7450dd60de2403bd0… Author: Chris Robinson <chris.kcat(a)gmail.com> Date: Sun Feb 18 09:59:41 2007 -0800 quartz: Stop and free the dsound buffer when needed. --- dlls/quartz/dsoundrender.c | 18 ++++++++++++++++++ 1 files changed, 18 insertions(+), 0 deletions(-) diff --git a/dlls/quartz/dsoundrender.c b/dlls/quartz/dsoundrender.c index 693d355..ee19148 100644 --- a/dlls/quartz/dsoundrender.c +++ b/dlls/quartz/dsoundrender.c @@ -166,6 +166,17 @@ static HRESULT DSoundRender_SendSampleData(DSoundRenderImpl* This, LPBYTE data, DWORD size2; DWORD play_pos,buf_free; + if (This->state != State_Running) { + DWORD state; + if (SUCCEEDED(IDirectSoundBuffer_GetStatus(This->dsbuffer, &state))) { + if (state & DSBSTATUS_PLAYING) { + IDirectSoundBuffer_Stop(This->dsbuffer); + This->started = FALSE; + } + } + return S_OK; + } + while (1) { hr = IDirectSoundBuffer_GetCurrentPosition(This->dsbuffer, &play_pos, NULL); @@ -390,6 +401,13 @@ static ULONG WINAPI DSoundRender_Release(IBaseFilter * iface) DeleteCriticalSection(&This->csFilter); if (This->pClock) IReferenceClock_Release(This->pClock); + + if (This->dsbuffer) + IDirectSoundBuffer_Release(This->dsbuffer); + This->dsbuffer = NULL; + if (This->dsound) + IDirectSound_Release(This->dsound); + This->dsound = NULL; IPin_Release(This->ppPins[0]);

1 0

Marcus Meissner : shell32/tests: Fixed potential overflow.
by Alexandre Julliard Feb. 19, 2007

Feb. 19, 2007

Module: wine Branch: master Commit: 3b5b23311c7b77f97c919b58dc058456c4fab4cd URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b5b23311c7b77f97c919b58d… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sun Feb 18 15:59:59 2007 +0100 shell32/tests: Fixed potential overflow. --- dlls/shell32/tests/shlfileop.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/tests/shlfileop.c b/dlls/shell32/tests/shlfileop.c index c952bae..801dbf4 100644 --- a/dlls/shell32/tests/shlfileop.c +++ b/dlls/shell32/tests/shlfileop.c @@ -32,7 +32,7 @@ #define FOF_NORECURSION 0x1000 #endif -CHAR CURR_DIR[MAX_PATH]; +static CHAR CURR_DIR[MAX_PATH]; static HMODULE hshell32; static int (WINAPI *pSHCreateDirectoryExA)(HWND, LPCSTR, LPSECURITY_ATTRIBUTES); @@ -235,7 +235,7 @@ static void test_delete(void) { SHFILEOPSTRUCTA shfo; DWORD ret; - CHAR buf[MAX_PATH]; + CHAR buf[sizeof(CURR_DIR)+sizeof("/test?.txt")+1]; sprintf(buf, "%s\\%s", CURR_DIR, "test?.txt"); buf[strlen(buf) + 1] = '\0';

1 0

Marcus Meissner : dbghelp: Return when not finding the name.
by Alexandre Julliard Feb. 19, 2007

Feb. 19, 2007

Module: wine Branch: master Commit: e37ff84eff7d9ecdc5409ef9cbf884d3a42b1b05 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e37ff84eff7d9ecdc5409ef9c… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sun Feb 18 12:15:37 2007 +0100 dbghelp: Return when not finding the name. --- dlls/dbghelp/dwarf.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index 6ff33f2..75d545a 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -1203,7 +1203,7 @@ static void dwarf2_parse_enumerator(dwarf2_parse_context_t* ctx, TRACE("%s, for %s\n", dwarf2_debug_ctx(ctx), dwarf2_debug_di(di)); - if (!dwarf2_find_attribute(ctx, di, DW_AT_name, &name)) name.u.string = NULL; + if (!dwarf2_find_attribute(ctx, di, DW_AT_name, &name)) return; if (!dwarf2_find_attribute(ctx, di, DW_AT_const_value, &value)) value.u.svalue = 0; symt_add_enum_element(ctx->module, parent, name.u.string, value.u.svalue); @@ -1278,8 +1278,10 @@ static void dwarf2_parse_variable(dwarf2_subprogram_t* subpgm, is_pmt = !block && di->abbrev->tag == DW_TAG_formal_parameter; param_type = dwarf2_lookup_type(subpgm->ctx, di); - if (!dwarf2_find_attribute(subpgm->ctx, di, DW_AT_name, &name)) - name.u.string = NULL; + if (!dwarf2_find_attribute(subpgm->ctx, di, DW_AT_name, &name)) { + /* cannot do much without the name, the functions below won't like it. */ + return; + } if (dwarf2_compute_location_attr(subpgm->ctx, di, DW_AT_location, &loc, &subpgm->frame)) {

1 0

Marcus Meissner : comctl32: Fixed new header test.
by Alexandre Julliard Feb. 19, 2007

Feb. 19, 2007

Module: wine Branch: master Commit: abe1ede385b89dc91127bcc77bd838792151682e URL: http://source.winehq.org/git/wine.git/?a=commit;h=abe1ede385b89dc91127bcc77… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sun Feb 18 12:05:34 2007 +0100 comctl32: Fixed new header test. --- dlls/comctl32/tests/header.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/tests/header.c b/dlls/comctl32/tests/header.c index 87e0bf5..5f65f95 100644 --- a/dlls/comctl32/tests/header.c +++ b/dlls/comctl32/tests/header.c @@ -596,9 +596,9 @@ static void test_hdm_sethotdivider (void) static void test_hdm_imageMessages (void) { - HIMAGELIST hImageList; + HIMAGELIST hImageList = ImageList_Create (4, 4, 0, 1, 0); HIMAGELIST hImageListRetVal; - hImageListRetVal = (HIMAGELIST) SendMessage(hWndHeader, HDM_SETIMAGELIST, 0, (LPARAM) &hImageList); + hImageListRetVal = (HIMAGELIST) SendMessage(hWndHeader, HDM_SETIMAGELIST, 0, (LPARAM) hImageList); ok(hImageListRetVal == NULL, "Expected NULL, got %d\n", (int) hImageListRetVal); hImageListRetVal = (HIMAGELIST) SendMessage(hWndHeader, HDM_GETIMAGELIST, 0, 0); ok(hImageListRetVal != NULL, "Expected non-NULL handle, got %d\n", (int) hImageListRetVal);

1 0

Marcus Meissner : winedump: Added a missing free().
by Alexandre Julliard Feb. 19, 2007

Feb. 19, 2007

Module: wine Branch: master Commit: 82026ecd652d179f842baa7d362c024241c18bfa URL: http://source.winehq.org/git/wine.git/?a=commit;h=82026ecd652d179f842baa7d3… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Fri Feb 16 17:28:59 2007 +0100 winedump: Added a missing free(). --- tools/winedump/msmangle.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/tools/winedump/msmangle.c b/tools/winedump/msmangle.c index 574a3b5..fc3f12b 100644 --- a/tools/winedump/msmangle.c +++ b/tools/winedump/msmangle.c @@ -349,8 +349,10 @@ int symbol_demangle (parsed_symbol *sym) else { INIT_CT (ct); - if (!demangle_datatype (&name, &ct, sym)) + if (!demangle_datatype (&name, &ct, sym)) { + free (function_name); return -1; + } sym->return_text = ct.expression; sym->return_type = get_type_constant(ct.dest_type, ct.flags); ct.expression = NULL;

1 0

Marcus Meissner : winex11.drv: Small fixes.
by Alexandre Julliard Feb. 19, 2007

Feb. 19, 2007

Module: wine Branch: master Commit: f4d7b4444ce432956439fb11ac8676536d3777e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f4d7b4444ce432956439fb11a… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sun Feb 18 11:56:49 2007 +0100 winex11.drv: Small fixes. --- dlls/winex11.drv/opengl.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index dbbd972..fdb92ae 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -825,8 +825,9 @@ BOOL get_fbconfig_from_visualid(Display *display, Visual *visual, int *fmt_id, i int tmp_vis_id; VisualID visualid; - if(!display || !display) { + if(!display || !visual) { ERR("Invalid display or visual\n"); + return FALSE; } visualid = XVisualIDFromVisual(visual); @@ -835,7 +836,7 @@ BOOL get_fbconfig_from_visualid(Display *display, Visual *visual, int *fmt_id, i if (NULL == cfgs || 0 == nCfgs) { ERR("glXChooseFBConfig returns NULL\n"); if(cfgs != NULL) XFree(cfgs); - return 0; + return FALSE; } /* Find the requested offscreen format and count the number of offscreen formats */

1 0

Vitaly Lipatov : winspool: Constify some parameters in some functions.
by Alexandre Julliard Feb. 19, 2007

Feb. 19, 2007

Module: wine Branch: master Commit: c9d78fc52044d63fee6c52bb457ab7cc0e891af3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c9d78fc52044d63fee6c52bb4… Author: Vitaly Lipatov <lav(a)etersoft.ru> Date: Sun Feb 18 13:51:09 2007 +0300 winspool: Constify some parameters in some functions. --- dlls/winspool.drv/info.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index f730be2..891d661 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -410,7 +410,7 @@ static int multi_sz_lenA(const char *str) } static void -WINSPOOL_SetDefaultPrinter(const char *devname, const char *name,BOOL force) { +WINSPOOL_SetDefaultPrinter(const char *devname, const char *name, BOOL force) { char qbuf[200]; /* If forcing, or no profile string entry for device yet, set the entry @@ -435,7 +435,7 @@ WINSPOOL_SetDefaultPrinter(const char *devname, const char *name,BOOL force) { } } -static BOOL add_printer_driver(char *name) +static BOOL add_printer_driver(const char *name) { DRIVER_INFO_3A di3a; @@ -2775,7 +2775,7 @@ BOOL WINAPI GetPrintProcessorDirectoryW(LPWSTR server, LPWSTR env, * the opened hkey on success * NULL on error */ -static HKEY WINSPOOL_OpenDriverReg( LPVOID pEnvironment, BOOL unicode) +static HKEY WINSPOOL_OpenDriverReg( LPCVOID pEnvironment, BOOL unicode) { HKEY retval = NULL; LPWSTR buffer; @@ -4416,7 +4416,7 @@ static BOOL WINSPOOL_GetDriverInfoFromReg( /***************************************************************************** * WINSPOOL_GetPrinterDriver */ -static BOOL WINSPOOL_GetPrinterDriver(HANDLE hPrinter, LPWSTR pEnvironment, +static BOOL WINSPOOL_GetPrinterDriver(HANDLE hPrinter, LPCWSTR pEnvironment, DWORD Level, LPBYTE pDriverInfo, DWORD cbBuf, LPDWORD pcbNeeded, BOOL unicode) @@ -4903,7 +4903,7 @@ BOOL WINAPI EnumJobsW(HANDLE hPrinter, DWORD FirstJob, DWORD NoJobs, * BUGS * - only implemented for localhost, foreign hosts will return an error */ -static BOOL WINSPOOL_EnumPrinterDrivers(LPWSTR pName, LPWSTR pEnvironment, +static BOOL WINSPOOL_EnumPrinterDrivers(LPWSTR pName, LPCWSTR pEnvironment, DWORD Level, LPBYTE pDriverInfo, DWORD cbBuf, LPDWORD pcbNeeded, LPDWORD pcReturned, BOOL unicode)

1 0

Roderick Colenbrander : opengl32: Add new extensions.
by Alexandre Julliard Feb. 19, 2007

Feb. 19, 2007

Module: wine Branch: master Commit: 3e63a9f123d083f5bd1cbf233f12e57879cfc266 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3e63a9f123d083f5bd1cbf233… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Sun Feb 18 00:10:38 2007 +0100 opengl32: Add new extensions. --- dlls/opengl32/make_opengl | 15 + dlls/opengl32/opengl_ext.c | 3041 ++++++++++++++++++++++++++++---------------- 2 files changed, 1950 insertions(+), 1106 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3e63a9f123d083f5bd1cb…

1 0

Rob Shearman : comctl32: Don' t free user32 objects with a gdi32 function in imagelist test.
by Alexandre Julliard Feb. 19, 2007

Feb. 19, 2007

Module: wine Branch: master Commit: 4ef244260837d61156054b4e5d5b3793cdb21bb6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ef244260837d61156054b4e5… Author: Rob Shearman <rob(a)codeweavers.com> Date: Sat Feb 17 20:18:58 2007 +0000 comctl32: Don't free user32 objects with a gdi32 function in imagelist test. Use DestroyIcon for releasing the resources associated with created icons. --- dlls/comctl32/tests/imagelist.c | 16 +++++++--------- 1 files changed, 7 insertions(+), 9 deletions(-) diff --git a/dlls/comctl32/tests/imagelist.c b/dlls/comctl32/tests/imagelist.c index f863455..1f9e2e6 100644 --- a/dlls/comctl32/tests/imagelist.c +++ b/dlls/comctl32/tests/imagelist.c @@ -340,10 +340,9 @@ static BOOL DoTest1(void) /* destroy it */ ok(ImageList_Destroy(himl),"destroy imagelist failed\n"); - /* icons should be deleted by the imagelist */ - ok(!DeleteObject(hicon1),"icon 1 wasn't deleted\n"); - ok(!DeleteObject(hicon2),"icon 2 wasn't deleted\n"); - ok(!DeleteObject(hicon3),"icon 3 wasn't deleted\n"); + ok(DestroyIcon(hicon1),"icon 1 wasn't deleted\n"); + ok(DestroyIcon(hicon2),"icon 2 wasn't deleted\n"); + ok(DestroyIcon(hicon3),"icon 3 wasn't deleted\n"); return TRUE; } @@ -376,10 +375,9 @@ static BOOL DoTest2(void) /* destroy it */ ok(ImageList_Destroy(himl),"destroy imagelist failed\n"); - /* icons should be deleted by the imagelist */ - ok(!DeleteObject(hicon1),"icon 1 wasn't deleted\n"); - ok(!DeleteObject(hicon2),"icon 2 wasn't deleted\n"); - ok(!DeleteObject(hicon3),"icon 3 wasn't deleted\n"); + ok(DestroyIcon(hicon1),"icon 1 wasn't deleted\n"); + ok(DestroyIcon(hicon2),"icon 2 wasn't deleted\n"); + ok(DestroyIcon(hicon3),"icon 3 wasn't deleted\n"); return TRUE; } @@ -551,7 +549,7 @@ static void testMerge(void) ImageList_Destroy(himl1); ImageList_Destroy(himl2); - DeleteObject(hicon1); + DestroyIcon(hicon1); DestroyWindow(hwnd); }

1 0

Rob Shearman : include: Add macro for ListView_GetOrigin to commctrl.h.
by Alexandre Julliard Feb. 19, 2007

Feb. 19, 2007

Module: wine Branch: master Commit: 06f0e7238c631052763a52568b1c7c1f8eec184a URL: http://source.winehq.org/git/wine.git/?a=commit;h=06f0e7238c631052763a52568… Author: Rob Shearman <rob(a)codeweavers.com> Date: Sat Feb 17 20:20:54 2007 +0000 include: Add macro for ListView_GetOrigin to commctrl.h. (Reported by David Saez Padros.) --- include/commctrl.h | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/include/commctrl.h b/include/commctrl.h index 7a931f8..1415a30 100644 --- a/include/commctrl.h +++ b/include/commctrl.h @@ -3743,6 +3743,8 @@ typedef struct NMLVSCROLL #define ListView_GetItemW(hwnd,pitem) \ (BOOL)SNDMSGW((hwnd),LVM_GETITEMW,0,(LPARAM)(LVITEMW *)(pitem)) #define ListView_GetItem WINELIB_NAME_AW(ListView_GetItem) +#define ListView_GetOrigin(hwnd,ppt) \ + (BOOL)SNDMSGW((hwnd),LVM_GETORIGIN,0,(LPARAM)(POINT *)(ppt)) #define ListView_HitTest(hwnd,pinfo) \ (INT)SNDMSGA((hwnd),LVM_HITTEST,0,(LPARAM)(LPLVHITTESTINFO)(pinfo))

1 0