February 2008 - Wine-commits

Alexandre Julliard : winex11: Correctly initialize the cursor in a newly-created thread.
by Alexandre Julliard 25 Feb '08

25 Feb '08

Module: wine Branch: master Commit: 30f068a0b3e69b86dabc014276b70d7d56f9f845 URL: http://source.winehq.org/git/wine.git/?a=commit;h=30f068a0b3e69b86dabc01427… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 25 13:32:45 2008 +0100 winex11: Correctly initialize the cursor in a newly-created thread. --- dlls/winex11.drv/x11drv.h | 1 + dlls/winex11.drv/x11drv_main.c | 1 + 2 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 97d1a27..de77925 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -711,6 +711,7 @@ extern int X11DRV_AcquireClipboard(HWND hWndClipWindow); extern void X11DRV_ResetSelectionOwner(void); extern void X11DRV_SetFocus( HWND hwnd ); extern Cursor X11DRV_GetCursor( Display *display, struct tagCURSORICONINFO *ptr ); +extern void X11DRV_SetCursor( struct tagCURSORICONINFO *lpCursor ); extern BOOL X11DRV_ClipCursor( LPCRECT clip ); extern void X11DRV_InitKeyboard( Display *display ); extern void X11DRV_send_keyboard_input( WORD wVk, WORD wScan, DWORD dwFlags, DWORD time, diff --git a/dlls/winex11.drv/x11drv_main.c b/dlls/winex11.drv/x11drv_main.c index f4f5f06..32f6437 100644 --- a/dlls/winex11.drv/x11drv_main.c +++ b/dlls/winex11.drv/x11drv_main.c @@ -659,6 +659,7 @@ struct x11drv_thread_data *x11drv_init_thread_data(void) data->last_focus = 0; data->selection_wnd = 0; TlsSetValue( thread_data_tls_index, data ); + X11DRV_SetCursor( NULL ); return data; }

1 0

Rob Shearman : kernel32: Fix the number of characters passed to GetAtomNameW in test_local_get_atom_name .
by Alexandre Julliard 25 Feb '08

25 Feb '08

Module: wine Branch: master Commit: 492be1b5e34467d21ea547ffc1c2128ceda65d3e URL: http://source.winehq.org/git/wine.git/?a=commit;h=492be1b5e34467d21ea547ffc… Author: Rob Shearman <rob(a)codeweavers.com> Date: Mon Feb 25 09:02:03 2008 +0000 kernel32: Fix the number of characters passed to GetAtomNameW in test_local_get_atom_name. --- dlls/kernel32/tests/atom.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/tests/atom.c b/dlls/kernel32/tests/atom.c index f21b2b1..2977416 100644 --- a/dlls/kernel32/tests/atom.c +++ b/dlls/kernel32/tests/atom.c @@ -566,7 +566,7 @@ static void test_local_get_atom_name(void) do_initW(inW, "abcdefghij", 255); atom = AddAtomW(inW); ok(atom, "couldn't add atom for %s\n", in); - len = GetAtomNameW(atom, outW, sizeof(outW)); + len = GetAtomNameW(atom, outW, sizeof(outW)/sizeof(outW[0])); ok(len == 255, "length mismatch (%u instead of 255)\n", len); for (i = 0; i < 255; i++) {

1 0

Rob Shearman : shell32: Fix the character count passed to SearchPathW in SHELL_execute.
by Alexandre Julliard 25 Feb '08

25 Feb '08

Module: wine Branch: master Commit: d182559161c2d5026c7fcc39533fd5a5f54e2981 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d182559161c2d5026c7fcc395… Author: Rob Shearman <rob(a)codeweavers.com> Date: Mon Feb 25 09:01:56 2008 +0000 shell32: Fix the character count passed to SearchPathW in SHELL_execute. --- dlls/shell32/shlexec.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/shell32/shlexec.c b/dlls/shell32/shlexec.c index 7cf0b03..f55e05c 100644 --- a/dlls/shell32/shlexec.c +++ b/dlls/shell32/shlexec.c @@ -1698,7 +1698,7 @@ BOOL SHELL_execute( LPSHELLEXECUTEINFOW sei, SHELL_ExecuteW32 execfunc ) buffer[idx] = '\0'; /*FIXME This finds directory paths if the targeted file name contains spaces. */ - if (SearchPathW(*sei_tmp.lpDirectory? sei_tmp.lpDirectory: NULL, buffer, wszExe, sizeof(xlpFile), xlpFile, NULL)) + if (SearchPathW(*sei_tmp.lpDirectory? sei_tmp.lpDirectory: NULL, buffer, wszExe, sizeof(xlpFile)/sizeof(xlpFile[0]), xlpFile, NULL)) { /* separate out command from parameter string */ LPCWSTR p = space + 1;

1 0

Rob Shearman : avifil32: Fix the character count passed into LoadStringW in AVIBuildFilterW and AVISaveOptionsUpdate .
by Alexandre Julliard 25 Feb '08

25 Feb '08

Module: wine Branch: master Commit: e7173dfa4e2424f7b522141a1645522ba9b7cd92 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e7173dfa4e2424f7b522141a1… Author: Rob Shearman <rob(a)codeweavers.com> Date: Mon Feb 25 09:01:39 2008 +0000 avifil32: Fix the character count passed into LoadStringW in AVIBuildFilterW and AVISaveOptionsUpdate. --- dlls/avifil32/api.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/avifil32/api.c b/dlls/avifil32/api.c index 47947b5..b7b21b9 100644 --- a/dlls/avifil32/api.c +++ b/dlls/avifil32/api.c @@ -1148,7 +1148,7 @@ HRESULT WINAPI AVIBuildFilterW(LPWSTR szFilter, LONG cbFilter, BOOL fSaving) /* add "All files" "*.*" filter if enough space left */ size = LoadStringW(AVIFILE_hModule, IDS_ALLFILES, - szAllFiles, sizeof(szAllFiles)) + 1; + szAllFiles, sizeof(szAllFiles)/sizeof(szAllFiles[0])) + 1; if (cbFilter > size) { int i; @@ -1336,7 +1336,8 @@ static void AVISaveOptionsUpdate(HWND hWnd) } } else { LoadStringW(AVIFILE_hModule, IDS_UNCOMPRESSED, - icinfo.szDescription, sizeof(icinfo.szDescription)); + icinfo.szDescription, + sizeof(icinfo.szDescription)/sizeof(icinfo.szDescription[0])); lstrcatW(szFormat, icinfo.szDescription); } } else if (sInfo.fccType == streamtypeAUDIO) {

1 0

Rob Shearman : winspool.drv: Fix the character count passed into RegEnumKeyExW in get_local_monitors.
by Alexandre Julliard 25 Feb '08

25 Feb '08

Module: wine Branch: master Commit: 18d891986d6aa62fd94e86699b5f9bfed232339e URL: http://source.winehq.org/git/wine.git/?a=commit;h=18d891986d6aa62fd94e86699… Author: Rob Shearman <rob(a)codeweavers.com> Date: Mon Feb 25 09:01:29 2008 +0000 winspool.drv: Fix the character count passed into RegEnumKeyExW in get_local_monitors. len is used in RegEnumKeyExW and this takes a character count for the key argument, not a byte count. --- dlls/winspool.drv/info.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index 17cd507..80b74a5 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -808,7 +808,7 @@ static DWORD get_local_monitors(DWORD level, LPBYTE pMonitors, DWORD cbBuf, LPDW } } index++; - len = sizeof(buffer); + len = sizeof(buffer)/sizeof(buffer[0]); buffer[0] = '\0'; } RegCloseKey(hroot);

1 0

Rob Shearman : dinput: Fix character count passed to GetKeyNameTextW in SysKeyboardWImpl_GetObjectInfo .
by Alexandre Julliard 25 Feb '08

25 Feb '08

Module: wine Branch: master Commit: fe75a8c616e25c76620856842a4911df15f286da URL: http://source.winehq.org/git/wine.git/?a=commit;h=fe75a8c616e25c76620856842… Author: Rob Shearman <rob(a)codeweavers.com> Date: Mon Feb 25 09:01:49 2008 +0000 dinput: Fix character count passed to GetKeyNameTextW in SysKeyboardWImpl_GetObjectInfo. --- dlls/dinput/keyboard.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/dinput/keyboard.c b/dlls/dinput/keyboard.c index ef66ed9..82e50c3 100644 --- a/dlls/dinput/keyboard.c +++ b/dlls/dinput/keyboard.c @@ -361,7 +361,8 @@ static HRESULT WINAPI SysKeyboardWImpl_GetObjectInfo(LPDIRECTINPUTDEVICE8W iface if (!GetKeyNameTextW((DIDFT_GETINSTANCE(pdidoi->dwType) & 0x80) << 17 | (DIDFT_GETINSTANCE(pdidoi->dwType) & 0x7f) << 16, - pdidoi->tszName, sizeof(pdidoi->tszName))) + pdidoi->tszName, + sizeof(pdidoi->tszName)/sizeof(pdidoi->tszName[0]))) return DIERR_OBJECTNOTFOUND; _dump_OBJECTINSTANCEW(pdidoi);

1 0

Rob Shearman : mciavi32: Fix the buffer length passed into strncat in MCIAVI_mciSet.
by Alexandre Julliard 25 Feb '08

25 Feb '08

Module: wine Branch: master Commit: 583818513307d8d750cc0232c5d604ef9905ec55 URL: http://source.winehq.org/git/wine.git/?a=commit;h=583818513307d8d750cc0232c… Author: Rob Shearman <rob(a)codeweavers.com> Date: Mon Feb 25 09:00:47 2008 +0000 mciavi32: Fix the buffer length passed into strncat in MCIAVI_mciSet. The number of remaining characters should be passed in, not the total buffer size. --- dlls/mciavi32/info.c | 22 +++++++++++----------- 1 files changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/mciavi32/info.c b/dlls/mciavi32/info.c index 7787fb2..0b5752a 100644 --- a/dlls/mciavi32/info.c +++ b/dlls/mciavi32/info.c @@ -230,22 +230,22 @@ DWORD MCIAVI_mciSet(UINT wDevID, DWORD dwFlags, LPMCI_DGV_SET_PARMS lpParms) strcpy(buffer, "MCI_SET_ON:"); if (dwFlags & MCI_SET_VIDEO) { - strncat(buffer, " video", sizeof(buffer)); + strncat(buffer, " video", sizeof(buffer)-sizeof("MCI_SET_ON:")); wma->dwSet |= 4; } if (dwFlags & MCI_SET_AUDIO) { - strncat(buffer, " audio", sizeof(buffer)); + strncat(buffer, " audio", sizeof(buffer)-sizeof("MCI_SET_ON:")); switch (lpParms->dwAudio) { case MCI_SET_AUDIO_ALL: - strncat(buffer, " all", sizeof(buffer)); + strncat(buffer, " all", sizeof(buffer)-sizeof("MCI_SET_ON:")); wma->dwSet |= 3; break; case MCI_SET_AUDIO_LEFT: - strncat(buffer, " left", sizeof(buffer)); + strncat(buffer, " left", sizeof(buffer)-sizeof("MCI_SET_ON:")); wma->dwSet |= 1; break; case MCI_SET_AUDIO_RIGHT: - strncat(buffer, " right", sizeof(buffer)); + strncat(buffer, " right", sizeof(buffer)-sizeof("MCI_SET_ON:")); wma->dwSet |= 2; break; default: @@ -264,22 +264,22 @@ DWORD MCIAVI_mciSet(UINT wDevID, DWORD dwFlags, LPMCI_DGV_SET_PARMS lpParms) strcpy(buffer, "MCI_SET_OFF:"); if (dwFlags & MCI_SET_VIDEO) { - strncat(buffer, " video", sizeof(buffer)); + strncat(buffer, " video", sizeof(buffer)-sizeof("MCI_SET_OFF:")); wma->dwSet &= ~4; } if (dwFlags & MCI_SET_AUDIO) { - strncat(buffer, " audio", sizeof(buffer)); + strncat(buffer, " audio", sizeof(buffer)-sizeof("MCI_SET_OFF:")); switch (lpParms->dwAudio) { case MCI_SET_AUDIO_ALL: - strncat(buffer, " all", sizeof(buffer)); + strncat(buffer, " all", sizeof(buffer)-sizeof("MCI_SET_OFF:")); wma->dwSet &= ~3; break; case MCI_SET_AUDIO_LEFT: - strncat(buffer, " left", sizeof(buffer)); + strncat(buffer, " left", sizeof(buffer)-sizeof("MCI_SET_OFF:")); wma->dwSet &= ~2; break; case MCI_SET_AUDIO_RIGHT: - strncat(buffer, " right", sizeof(buffer)); + strncat(buffer, " right", sizeof(buffer)-sizeof("MCI_SET_OFF:")); wma->dwSet &= ~2; break; default: @@ -288,7 +288,7 @@ DWORD MCIAVI_mciSet(UINT wDevID, DWORD dwFlags, LPMCI_DGV_SET_PARMS lpParms) } } if (dwFlags & MCI_DGV_SET_SEEK_EXACTLY) { - strncat(buffer, " seek_exactly", sizeof(buffer)); + strncat(buffer, " seek_exactly", sizeof(buffer)-strlen(buffer)-1); } FIXME("%s\n", buffer); }

1 0

Rob Shearman : wineboot: Fix thread handle leak in runCmd.
by Alexandre Julliard 25 Feb '08

25 Feb '08

Module: wine Branch: master Commit: 47c53cc72496aaf38b6ecc154fc9a7604773e13e URL: http://source.winehq.org/git/wine.git/?a=commit;h=47c53cc72496aaf38b6ecc154… Author: Rob Shearman <rob(a)codeweavers.com> Date: Mon Feb 25 09:00:25 2008 +0000 wineboot: Fix thread handle leak in runCmd. --- programs/wineboot/wineboot.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/programs/wineboot/wineboot.c b/programs/wineboot/wineboot.c index 3185963..54c3034 100644 --- a/programs/wineboot/wineboot.c +++ b/programs/wineboot/wineboot.c @@ -329,6 +329,7 @@ static DWORD runCmd(LPWSTR cmdline, LPCWSTR dir, BOOL wait, BOOL minimized) GetExitCodeProcess(info.hProcess, &exit_code); } + CloseHandle( info.hThread ); CloseHandle( info.hProcess ); return exit_code;

1 0

Rob Shearman : cmd: Fix character count passed to GetShortPathName in WCMD_HandleTildaModifiers .
by Alexandre Julliard 25 Feb '08

25 Feb '08

Module: wine Branch: master Commit: 1d6922b2e01fd08b618ace3c87e071dedf08cf6d URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d6922b2e01fd08b618ace3c8… Author: Rob Shearman <rob(a)codeweavers.com> Date: Mon Feb 25 09:00:14 2008 +0000 cmd: Fix character count passed to GetShortPathName in WCMD_HandleTildaModifiers. --- programs/cmd/batch.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/programs/cmd/batch.c b/programs/cmd/batch.c index 12c19ed..21e806a 100644 --- a/programs/cmd/batch.c +++ b/programs/cmd/batch.c @@ -506,7 +506,8 @@ void WCMD_HandleTildaModifiers(WCHAR **start, WCHAR *forVariable, WCHAR *forValu if (memchrW(firstModifier, 's', modifierLen) != NULL) { if (finaloutput[0] != 0x00) strcatW(finaloutput, space); /* Don't flag as doneModifier - %~s on its own is processed later */ - GetShortPathName(outputparam, outputparam, sizeof(outputparam)); + GetShortPathName(outputparam, outputparam, + sizeof(outputparam)/sizeof(outputparam[0])); } /* 5. Handle 'f' : Fully qualified path (File doesn't have to exist) */

1 0

Rob Shearman : comctl32: Fix possible use of uninitialised variable in REBAR_Paint.
by Alexandre Julliard 25 Feb '08

25 Feb '08

Module: wine Branch: master Commit: f3c40f925d39517a7068ce0c3d5231310f5f53d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f3c40f925d39517a7068ce0c3… Author: Rob Shearman <rob(a)codeweavers.com> Date: Mon Feb 25 08:59:51 2008 +0000 comctl32: Fix possible use of uninitialised variable in REBAR_Paint. In the case where an hdc is passed in via the wParam, ps.fErase could be uninitialised. Fix this by rearranging the code so that ps is only used when an hdc isn't passed in. --- dlls/comctl32/rebar.c | 29 ++++++++++++++--------------- 1 files changed, 14 insertions(+), 15 deletions(-) diff --git a/dlls/comctl32/rebar.c b/dlls/comctl32/rebar.c index 92c1922..0784e61 100644 --- a/dlls/comctl32/rebar.c +++ b/dlls/comctl32/rebar.c @@ -3197,24 +3197,23 @@ REBAR_NotifyFormat (REBAR_INFO *infoPtr, WPARAM wParam, LPARAM lParam) static LRESULT REBAR_Paint (const REBAR_INFO *infoPtr, WPARAM wParam, LPARAM lParam) { - HDC hdc; - PAINTSTRUCT ps; - RECT rc; - - GetClientRect(infoPtr->hwndSelf, &rc); - hdc = wParam==0 ? BeginPaint (infoPtr->hwndSelf, &ps) : (HDC)wParam; - - TRACE("painting (%s) client (%s)\n", - wine_dbgstr_rect(&ps.rcPaint), wine_dbgstr_rect(&rc)); + HDC hdc = (HDC)wParam; - if (ps.fErase) { - /* Erase area of paint if requested */ - REBAR_InternalEraseBkGnd (infoPtr, wParam, lParam, &ps.rcPaint); + if (hdc) { + TRACE("painting\n"); + REBAR_Refresh (infoPtr, hdc); + } else { + PAINTSTRUCT ps; + hdc = BeginPaint (infoPtr->hwndSelf, &ps); + TRACE("painting (%s)\n", wine_dbgstr_rect(&ps.rcPaint)); + if (ps.fErase) { + /* Erase area of paint if requested */ + REBAR_InternalEraseBkGnd (infoPtr, wParam, lParam, &ps.rcPaint); + } + REBAR_Refresh (infoPtr, hdc); + EndPaint (infoPtr->hwndSelf, &ps); } - REBAR_Refresh (infoPtr, hdc); - if (!wParam) - EndPaint (infoPtr->hwndSelf, &ps); return 0; }

1 0