October 2006 - Wine-Commits

Huw Davies : winex11.drv: Initialize data-> xim to NULL if xim has been disabled.
by Alexandre Julliard Oct. 24, 2006

Oct. 24, 2006

Module: wine Branch: master Commit: becf09f3f8450321b42fd1adc162aba0ed386204 URL: http://source.winehq.org/git/wine.git/?a=commit;h=becf09f3f8450321b42fd1adc… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Oct 23 18:00:06 2006 +0100 winex11.drv: Initialize data->xim to NULL if xim has been disabled. --- dlls/winex11.drv/x11drv_main.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/winex11.drv/x11drv_main.c b/dlls/winex11.drv/x11drv_main.c index 979b7f1..a33a374 100644 --- a/dlls/winex11.drv/x11drv_main.c +++ b/dlls/winex11.drv/x11drv_main.c @@ -534,7 +534,9 @@ #endif if (TRACE_ON(synchronous)) XSynchronize( data->display, True ); wine_tsx11_unlock(); - if (use_xim && !(data->xim = X11DRV_SetupXIM( data->display, input_style ))) + if (!use_xim) + data->xim = NULL; + else if (!(data->xim = X11DRV_SetupXIM( data->display, input_style ))) WARN("Input Method is not available\n"); if (wine_server_fd_to_handle( ConnectionNumber(data->display), GENERIC_READ | SYNCHRONIZE,

1 0

Paul Vriens : regedit: Initialize a variable (Coverity).
by Alexandre Julliard Oct. 24, 2006

Oct. 24, 2006

Module: wine Branch: master Commit: 0cf2010f7b3b0075913060e588bdd96357ea0ff5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0cf2010f7b3b0075913060e58… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Mon Oct 23 21:30:58 2006 +0200 regedit: Initialize a variable (Coverity). --- programs/regedit/edit.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/regedit/edit.c b/programs/regedit/edit.c index 1741672..a834966 100644 --- a/programs/regedit/edit.c +++ b/programs/regedit/edit.c @@ -246,7 +246,7 @@ BOOL CreateKey(HWND hwnd, HKEY hKeyRoot, { BOOL result = FALSE; LONG lRet = ERROR_SUCCESS; - HKEY retKey; + HKEY retKey = NULL; TCHAR newKey[MAX_NEW_KEY_LEN - 4]; int keyNum; HKEY hKey;

1 0

Michael Stefaniuc : comctl32/tests: Specify type of function argument and remove unused arguments.
by Alexandre Julliard Oct. 24, 2006

Oct. 24, 2006

Module: wine Branch: master Commit: 962e97dbf315474e53341bf93d76499b7287d381 URL: http://source.winehq.org/git/wine.git/?a=commit;h=962e97dbf315474e53341bf93… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Oct 23 15:32:38 2006 +0200 comctl32/tests: Specify type of function argument and remove unused arguments. --- dlls/comctl32/tests/toolbar.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/tests/toolbar.c b/dlls/comctl32/tests/toolbar.c index 217874d..7b9697e 100644 --- a/dlls/comctl32/tests/toolbar.c +++ b/dlls/comctl32/tests/toolbar.c @@ -48,7 +48,7 @@ static void MakeButton(TBBUTTON *p, int p->iString = nString; } -LRESULT MyWnd_Notify(hWnd, wParam, lParam) +static LRESULT MyWnd_Notify(LPARAM lParam) { NMHDR *hdr = (NMHDR *)lParam; NMTBHOTITEM *nmhi; @@ -74,7 +74,7 @@ static LRESULT CALLBACK MyWndProc(HWND h switch (msg) { case WM_NOTIFY: - return MyWnd_Notify(hWnd, wParam, lParam); + return MyWnd_Notify(lParam); } return DefWindowProcA(hWnd, msg, wParam, lParam); }

1 0

Eric Pouech : netapi32: Fix the size of allocation for the string returned from NetpGetComputerName .
by Alexandre Julliard Oct. 24, 2006

Oct. 24, 2006

Module: wine Branch: master Commit: a8e5179d8e59697896c4e39cf848fa4077372beb URL: http://source.winehq.org/git/wine.git/?a=commit;h=a8e5179d8e59697896c4e39cf… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Sun Oct 22 21:48:45 2006 +0200 netapi32: Fix the size of allocation for the string returned from NetpGetComputerName. --- dlls/netapi32/wksta.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/netapi32/wksta.c b/dlls/netapi32/wksta.c index 1d22fc6..d89cd1a 100644 --- a/dlls/netapi32/wksta.c +++ b/dlls/netapi32/wksta.c @@ -445,7 +445,7 @@ NET_API_STATUS WINAPI NetpGetComputerNam if (GetComputerNameW(*Buffer, &dwSize)) { NetApiBufferReallocate( - *Buffer, dwSize * sizeof(WCHAR), + *Buffer, (dwSize + 1) * sizeof(WCHAR), (LPVOID *) Buffer); return NERR_Success; }

1 0

Eric Pouech : ole32: Fixed some wrong conditions in OleFlushClipboard.
by Alexandre Julliard Oct. 24, 2006

Oct. 24, 2006

Module: wine Branch: master Commit: a79fa502806b5855d20ac73c823e012f0d77c8cd URL: http://source.winehq.org/git/wine.git/?a=commit;h=a79fa502806b5855d20ac73c8… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Sun Oct 22 21:48:49 2006 +0200 ole32: Fixed some wrong conditions in OleFlushClipboard. --- dlls/ole32/clipboard.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/ole32/clipboard.c b/dlls/ole32/clipboard.c index 73627b3..89ecfd5 100644 --- a/dlls/ole32/clipboard.c +++ b/dlls/ole32/clipboard.c @@ -914,7 +914,8 @@ static HRESULT OLEClipbrd_RenderFormat(I ILockBytes *ptrILockBytes = 0; HGLOBAL hStorage = 0; - GetClipboardFormatNameA(pFormatetc->cfFormat, szFmtName, MAX_CLIPFORMAT_NAME); + if (!GetClipboardFormatNameA(pFormatetc->cfFormat, szFmtName, MAX_CLIPFORMAT_NAME)) + szFmtName[0] = '\0'; /* If embed source */ if (!strcmp(szFmtName, CF_EMBEDSOURCE))

1 0

Eric Pouech : ole32: CoUninitialize: No longer access an object after it' s been freed.
by Alexandre Julliard Oct. 24, 2006

Oct. 24, 2006

Module: wine Branch: master Commit: 5c0f35a2aa4c09736aa1a6c920c513bc1282c446 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c0f35a2aa4c09736aa1a6c92… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Sun Oct 22 21:48:52 2006 +0200 ole32: CoUninitialize: No longer access an object after it's been freed. --- dlls/ole32/compobj.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index 1887cf6..db76dbc 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -365,8 +365,8 @@ DWORD apartment_release(struct apartment struct registered_psclsid *registered_psclsid = LIST_ENTRY(cursor, struct registered_psclsid, entry); - HeapFree(GetProcessHeap(), 0, registered_psclsid); list_remove(&registered_psclsid->entry); + HeapFree(GetProcessHeap(), 0, registered_psclsid); } /* if this assert fires, then another thread took a reference to a

1 0

Eric Pouech : gdi32: Better error handling in enhanced metafile.
by Alexandre Julliard Oct. 24, 2006

Oct. 24, 2006

Module: wine Branch: master Commit: bc7df7ad80af9822a7d22d77289d9a13a63bc588 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc7df7ad80af9822a7d22d772… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Sun Oct 22 21:48:19 2006 +0200 gdi32: Better error handling in enhanced metafile. --- dlls/gdi32/enhmfdrv/graphics.c | 16 +++++++++------- 1 files changed, 9 insertions(+), 7 deletions(-) diff --git a/dlls/gdi32/enhmfdrv/graphics.c b/dlls/gdi32/enhmfdrv/graphics.c index 13b4a06..cf4603b 100644 --- a/dlls/gdi32/enhmfdrv/graphics.c +++ b/dlls/gdi32/enhmfdrv/graphics.c @@ -756,18 +756,19 @@ BOOL EMFDRV_ExtTextOut( PHYSDEV dev, INT for (i = 0; i < count; i++) { textWidth += lpDx[i]; } - GetTextExtentPoint32W(physDev->hdc, str, count, &strSize); - textHeight = strSize.cy; + if (GetTextExtentPoint32W(physDev->hdc, str, count, &strSize)) + textHeight = strSize.cy; } else { UINT i; INT *dx = (INT *)((char*)pemr + pemr->emrtext.offDx); SIZE charSize; for (i = 0; i < count; i++) { - GetTextExtentPoint32W(physDev->hdc, str + i, 1, &charSize); - dx[i] = charSize.cx; - textWidth += charSize.cx; - textHeight = max(textHeight, charSize.cy); + if (GetTextExtentPoint32W(physDev->hdc, str + i, 1, &charSize)) { + dx[i] = charSize.cx; + textWidth += charSize.cx; + textHeight = max(textHeight, charSize.cy); + } } } @@ -791,7 +792,8 @@ BOOL EMFDRV_ExtTextOut( PHYSDEV dev, INT switch (textAlign & (TA_TOP | TA_BOTTOM | TA_BASELINE)) { case TA_BASELINE: { TEXTMETRICW tm; - GetTextMetricsW(physDev->hdc, &tm); + if (!GetTextMetricsW(physDev->hdc, &tm)) + tm.tmDescent = 0; /* Play safe here... it's better to have a bounding box */ /* that is too big than too small. */ pemr->rclBounds.top = y - textHeight - 1;

1 0

Eric Pouech : winex11.drv: As the min keycode is always greater or equal to 8, we
by Alexandre Julliard Oct. 24, 2006

Oct. 24, 2006

Module: wine Branch: master Commit: 54ac76a387142ee1f0003bffc1f3efd053db84cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=54ac76a387142ee1f0003bffc… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Sun Oct 22 21:48:07 2006 +0200 winex11.drv: As the min keycode is always greater or equal to 8, we don't need to scan XKeymapEvent.key_vector from 0 but from 8. --- dlls/winex11.drv/keyboard.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/winex11.drv/keyboard.c b/dlls/winex11.drv/keyboard.c index 534e197..7768151 100644 --- a/dlls/winex11.drv/keyboard.c +++ b/dlls/winex11.drv/keyboard.c @@ -1283,7 +1283,10 @@ void X11DRV_KeymapNotify( HWND hwnd, XEv DWORD time = GetCurrentTime(); alt = control = shift = 0; - for (i = 0; i < 32; i++) + /* the minimum keycode is always greater or equal to 8, so we can + * skip the first 8 values, hence start at 1 + */ + for (i = 1; i < 32; i++) { if (!event->xkeymap.key_vector[i]) continue; for (j = 0; j < 8; j++)

1 0

Eric Pouech : msxml: Fixed list walking in xmlnodelist_get_length.
by Alexandre Julliard Oct. 24, 2006

Oct. 24, 2006

Module: wine Branch: master Commit: 858bebc7c882d54abd79c16b166227bc2e80a2ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=858bebc7c882d54abd79c16b1… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Sun Oct 22 21:48:42 2006 +0200 msxml: Fixed list walking in xmlnodelist_get_length. --- dlls/msxml3/nodelist.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/msxml3/nodelist.c b/dlls/msxml3/nodelist.c index 6dd2d21..a1b4306 100644 --- a/dlls/msxml3/nodelist.c +++ b/dlls/msxml3/nodelist.c @@ -334,17 +334,20 @@ static HRESULT WINAPI xmlnodelist_get_le return S_OK; } + curr = This->node; + if(This->enum_children) { tmp = curr; top_level_node = &tmp; } - for(curr = This->node; curr; curr = get_next_node(&This->xinfo, curr, top_level_node)) + while (curr) { r = xslt_next_match( &This->xinfo, &curr, top_level_node ); if(FAILED(r) || !curr) break; nodeCount++; + curr = get_next_node(&This->xinfo, curr, top_level_node); } *listLength = nodeCount;

1 0

Marcus Meissner : wineoss: On non-OSS systems define MidiExit too.
by Alexandre Julliard Oct. 24, 2006

Oct. 24, 2006

Module: wine Branch: master Commit: d1b2282a9bf001342537be1e5d4765823c0b9a6d URL: http://source.winehq.org/git/wine.git/?a=commit;h=d1b2282a9bf001342537be1e5… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sun Oct 22 21:58:47 2006 +0200 wineoss: On non-OSS systems define MidiExit too. --- dlls/winmm/wineoss/midi.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/dlls/winmm/wineoss/midi.c b/dlls/winmm/wineoss/midi.c index 66601e0..6b9cdf8 100644 --- a/dlls/winmm/wineoss/midi.c +++ b/dlls/winmm/wineoss/midi.c @@ -1678,9 +1678,17 @@ #else /* HAVE_OSS_MIDI */ LRESULT OSS_MidiInit(void) { + TRACE("()\n"); return FALSE; } +LRESULT OSS_MidiExit(void) +{ + TRACE("()\n"); + return 0; +} + + #endif /* HAVE_OSS_MIDI */ /*======================================================================*

1 0