wine-commits April 2010

wine-commits@winehq.org

2 participants
898 discussions

Alexandre Julliard : appwiz.cpl: Use the fancy new icon.
by Alexandre Julliard 16 Apr '10

16 Apr '10

Module: wine Branch: master Commit: 20f899e78971ff8195ac7ca5e0a85e6d92a2615b URL: http://source.winehq.org/git/wine.git/?a=commit;h=20f899e78971ff8195ac7ca5e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 16 16:24:28 2010 +0200 appwiz.cpl: Use the fancy new icon. --- dlls/appwiz.cpl/appwiz.c | 17 ++++++++++++++--- 1 files changed, 14 insertions(+), 3 deletions(-) diff --git a/dlls/appwiz.cpl/appwiz.c b/dlls/appwiz.cpl/appwiz.c index 98b1019..2b68ee7 100644 --- a/dlls/appwiz.cpl/appwiz.c +++ b/dlls/appwiz.cpl/appwiz.c @@ -899,6 +899,17 @@ static BOOL CALLBACK MainDlgProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lPar return FALSE; } +static int CALLBACK propsheet_callback( HWND hwnd, UINT msg, LPARAM lparam ) +{ + switch (msg) + { + case PSCB_INITIALIZED: + SendMessageW( hwnd, WM_SETICON, ICON_BIG, (LPARAM)LoadIconW( hInst, MAKEINTRESOURCEW(ICO_MAIN) )); + break; + } + return 0; +} + /****************************************************************************** * Name : StartApplet * Description: Main routine for applet @@ -928,14 +939,14 @@ static void StartApplet(HWND hWnd) /* Fill out the PROPSHEETHEADER */ psh.dwSize = sizeof (PROPSHEETHEADERW); - psh.dwFlags = PSH_PROPSHEETPAGE | PSH_USEICONID; + psh.dwFlags = PSH_PROPSHEETPAGE | PSH_USEICONID | PSH_USECALLBACK; psh.hwndParent = hWnd; psh.hInstance = hInst; - psh.u.pszIcon = NULL; + psh.u.pszIcon = MAKEINTRESOURCEW(ICO_MAIN); psh.pszCaption = app_title; psh.nPages = 1; psh.u3.ppsp = &psp; - psh.pfnCallback = NULL; + psh.pfnCallback = propsheet_callback; psh.u2.nStartPage = 0; /* Display the property sheet */

1 0

Alexandre Julliard : winex11: Fix 16-bpp cursor conversions.
by Alexandre Julliard 16 Apr '10

16 Apr '10

Module: wine Branch: master Commit: 6ef5ccb90e84dcfbfff9e645e5c24e40542b1888 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ef5ccb90e84dcfbfff9e645e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 16 16:23:59 2010 +0200 winex11: Fix 16-bpp cursor conversions. --- dlls/winex11.drv/mouse.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index 60351e5..211edfb 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -538,7 +538,7 @@ static XcursorImage *create_cursor_image( CURSORICONINFO *ptr ) tmp = (*xor_ptr++ & 0xe0) >> 5; tmp |= (*xor_ptr & 0x07) << 3; *pixel_ptr |= convert_6to8[tmp] << 16; - *pixel_ptr |= convert_5to8[*xor_ptr & 0xf8] << 24; + *pixel_ptr |= convert_5to8[*xor_ptr++ >> 3] << 24; break; case 1:

1 0

Alexandre Julliard : winex11: Set the NET_WM_ICON hint for 32-bpp icons.
by Alexandre Julliard 16 Apr '10

16 Apr '10

Module: wine Branch: master Commit: ea1d71c7a4f8001df0221e67855d07744b14560d URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea1d71c7a4f8001df0221e678… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 16 16:23:33 2010 +0200 winex11: Set the NET_WM_ICON hint for 32-bpp icons. --- dlls/winex11.drv/window.c | 44 ++++++++++++++++++++++++++++++++++++--- dlls/winex11.drv/x11drv.h | 1 + dlls/winex11.drv/x11drv_main.c | 1 + 3 files changed, 42 insertions(+), 4 deletions(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index a9a3769..559f1d8 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -835,22 +835,58 @@ static void set_icon_hints( Display *display, struct x11drv_win_data *data, HICO { HBITMAP hbmOrig; RECT rcMask; - BITMAP bmMask; + BITMAP bm; ICONINFO ii; HDC hDC; GetIconInfo(hIcon, &ii); - GetObjectA(ii.hbmMask, sizeof(bmMask), &bmMask); + GetObjectW(ii.hbmMask, sizeof(bm), &bm); rcMask.top = 0; rcMask.left = 0; - rcMask.right = bmMask.bmWidth; - rcMask.bottom = bmMask.bmHeight; + rcMask.right = bm.bmWidth; + rcMask.bottom = bm.bmHeight; hDC = CreateCompatibleDC(0); hbmOrig = SelectObject(hDC, ii.hbmMask); InvertRect(hDC, &rcMask); SelectObject(hDC, ii.hbmColor); /* force the color bitmap to x11drv mode too */ + + GetObjectW(ii.hbmColor, sizeof(bm), &bm); + if (bm.bmBitsPixel == 32) /* FIXME: do this for other depths too */ + { + BITMAPINFO info; + unsigned int size, *bits; + + info.bmiHeader.biSize = sizeof(info); + info.bmiHeader.biWidth = bm.bmWidth; + info.bmiHeader.biHeight = -bm.bmHeight; + info.bmiHeader.biPlanes = 1; + info.bmiHeader.biBitCount = 32; + info.bmiHeader.biCompression = BI_RGB; + info.bmiHeader.biSizeImage = bm.bmWidth * bm.bmHeight * 4; + info.bmiHeader.biXPelsPerMeter = 0; + info.bmiHeader.biYPelsPerMeter = 0; + info.bmiHeader.biClrUsed = 0; + info.bmiHeader.biClrImportant = 0; + size = bm.bmWidth * bm.bmHeight + 2; + bits = HeapAlloc( GetProcessHeap(), 0, size * sizeof(long) ); + if (bits && GetDIBits( hDC, ii.hbmColor, 0, bm.bmHeight, bits + 2, &info, DIB_RGB_COLORS )) + { + bits[0] = bm.bmWidth; + bits[1] = bm.bmHeight; + if (sizeof(long) > sizeof(int)) /* convert to array of longs */ + { + int i = size; + while (--i >= 0) ((unsigned long *)bits)[i] = bits[i]; + } + wine_tsx11_lock(); + XChangeProperty( display, data->whole_window, x11drv_atom(_NET_WM_ICON), + XA_CARDINAL, 32, PropModeReplace, (unsigned char *)bits, size ); + wine_tsx11_unlock(); + } + HeapFree( GetProcessHeap(), 0, bits ); + } SelectObject(hDC, hbmOrig); DeleteDC(hDC); diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index ed6d3e0..a062e92 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -641,6 +641,7 @@ enum x11drv_atoms XATOM__NET_SUPPORTED, XATOM__NET_SYSTEM_TRAY_OPCODE, XATOM__NET_SYSTEM_TRAY_S0, + XATOM__NET_WM_ICON, XATOM__NET_WM_MOVERESIZE, XATOM__NET_WM_NAME, XATOM__NET_WM_PID, diff --git a/dlls/winex11.drv/x11drv_main.c b/dlls/winex11.drv/x11drv_main.c index a7f7ae0..7b4fb58 100644 --- a/dlls/winex11.drv/x11drv_main.c +++ b/dlls/winex11.drv/x11drv_main.c @@ -138,6 +138,7 @@ static const char * const atom_names[NB_XATOMS - FIRST_XATOM] = "_NET_SUPPORTED", "_NET_SYSTEM_TRAY_OPCODE", "_NET_SYSTEM_TRAY_S0", + "_NET_WM_ICON", "_NET_WM_MOVERESIZE", "_NET_WM_NAME", "_NET_WM_PID",

1 0

Maarten Lankhorst : mmdevapi: Fix wrong blacklist test.
by Alexandre Julliard 16 Apr '10

16 Apr '10

Module: wine Branch: master Commit: ab13ffa454807f9d1f3a5f0723aeb8e77756f66a URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab13ffa454807f9d1f3a5f072… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Fri Apr 16 10:20:36 2010 +0200 mmdevapi: Fix wrong blacklist test. --- dlls/mmdevapi/devenum.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mmdevapi/devenum.c b/dlls/mmdevapi/devenum.c index 41011e7..e778ab0 100644 --- a/dlls/mmdevapi/devenum.c +++ b/dlls/mmdevapi/devenum.c @@ -736,12 +736,12 @@ static int blacklist_pulse; static int blacklist(const char *dev) { #ifdef __linux__ - if (strncmp(dev, "OSS ", 4)) + if (!strncmp(dev, "OSS ", 4)) return 1; #endif if (blacklist_pulse && !strncmp(dev, "PulseAudio ", 11)) return 1; - if (strstr(dev, "ALSA") && strstr(dev, "hw:")) + if (!strncmp(dev, "ALSA ", 5) && strstr(dev, "hw:")) return 1; return 0; }

1 0

Joel Holdsworth : taskmgr: Replaced program icon with a Tango compliant icon.
by Alexandre Julliard 16 Apr '10

16 Apr '10

Module: wine Branch: master Commit: 1bf812106aeb7e661c322f1e50253ecc4aba90ca URL: http://source.winehq.org/git/wine.git/?a=commit;h=1bf812106aeb7e661c322f1e5… Author: Joel Holdsworth <joel(a)airwebreathe.org.uk> Date: Thu Apr 15 22:37:29 2010 +0100 taskmgr: Replaced program icon with a Tango compliant icon. --- programs/taskmgr/Makefile.in | 3 + programs/taskmgr/taskmgr.ico | Bin 1078 -> 25214 bytes programs/taskmgr/taskmgr.svg | 269 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 272 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1bf812106aeb7e661c322…

1 0

Joel Holdsworth : wordpad: Replaced program icon with a Tango compliant icon.
by Alexandre Julliard 16 Apr '10

16 Apr '10

Module: wine Branch: master Commit: 2e1eb896795ec64979857e143d06156d44f4fda3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e1eb896795ec64979857e143… Author: Joel Holdsworth <joel(a)airwebreathe.org.uk> Date: Thu Apr 15 22:37:23 2010 +0100 wordpad: Replaced program icon with a Tango compliant icon. --- programs/wordpad/wordpad.ico | Bin 15086 -> 25214 bytes programs/wordpad/wordpad.svg | 1269 ++++++++++++------------------------------ 2 files changed, 344 insertions(+), 925 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2e1eb896795ec64979857…

1 0

Joel Holdsworth : appwiz: Replaced program icon with a Tango compliant icon .
by Alexandre Julliard 16 Apr '10

16 Apr '10

Module: wine Branch: master Commit: 298ba2af2c42d00e6459de6b05c010b3791d2b09 URL: http://source.winehq.org/git/wine.git/?a=commit;h=298ba2af2c42d00e6459de6b0… Author: Joel Holdsworth <joel(a)airwebreathe.org.uk> Date: Thu Apr 15 22:37:18 2010 +0100 appwiz: Replaced program icon with a Tango compliant icon. --- dlls/appwiz.cpl/Makefile.in | 3 + dlls/appwiz.cpl/appwiz.ico | Bin 3262 -> 25214 bytes dlls/appwiz.cpl/appwiz.svg | 257 +++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 260 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=298ba2af2c42d00e6459d…

1 0

Dmitry Timoshkov : user32: Do not ask DrawFrameControl() to modify the passed in rectangle.
by Alexandre Julliard 16 Apr '10

16 Apr '10

Module: wine Branch: master Commit: c049f833082bf57f8364d433a3fa41b6756441c5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c049f833082bf57f8364d433a… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Fri Apr 16 18:59:24 2010 +0900 user32: Do not ask DrawFrameControl() to modify the passed in rectangle. This patch should fix the regression(s) caused by my recent button painting patches. The problem was that DrawFrameControl() was modifying the rectangle, and one of my patches stopped calling DrawFrameControl() in case of ODA_FOCUS action, so drawing an entire button and only focus started to differ, which was hidden by the custom clipping (that was removed by my last patch). --- dlls/user32/button.c | 10 ++++------ 1 files changed, 4 insertions(+), 6 deletions(-) diff --git a/dlls/user32/button.c b/dlls/user32/button.c index eacacbb..0aefe1b 100644 --- a/dlls/user32/button.c +++ b/dlls/user32/button.c @@ -769,7 +769,7 @@ static void BUTTON_DrawLabel(HWND hwnd, HDC hdc, UINT dtFlags, const RECT *rc) */ static void PB_Paint( HWND hwnd, HDC hDC, UINT action ) { - RECT rc, focus_rect, r; + RECT rc, r; UINT dtFlags, uState; HPEN hOldPen; HBRUSH hOldBrush; @@ -802,12 +802,10 @@ static void PB_Paint( HWND hwnd, HDC hDC, UINT action ) InflateRect( &rc, -1, -1 ); } - focus_rect = rc; - /* completely skip the drawing if only focus has changed */ if (action == ODA_FOCUS) goto draw_focus; - uState = DFCS_BUTTONPUSH | DFCS_ADJUSTRECT; + uState = DFCS_BUTTONPUSH; if (style & BS_FLAT) uState |= DFCS_MONO; @@ -844,8 +842,8 @@ draw_focus: if ((action == ODA_FOCUS) || ((action == ODA_DRAWENTIRE) && (state & BUTTON_HASFOCUS))) { - InflateRect( &focus_rect, -1, -1 ); - DrawFocusRect( hDC, &focus_rect ); + InflateRect( &rc, -2, -2 ); + DrawFocusRect( hDC, &rc ); } cleanup:

1 0

Nikolay Sivov : shell32: Add IPersistFolder2 stub for printers folder.
by Alexandre Julliard 16 Apr '10

16 Apr '10

Module: wine Branch: master Commit: 7a9ba819e795885dbab7fd568fca7df6969e7a6c URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a9ba819e795885dbab7fd568… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Apr 16 13:42:42 2010 +0400 shell32: Add IPersistFolder2 stub for printers folder. --- dlls/shell32/shfldr_printers.c | 71 +++++++++++++++++++++++++++++++++++++++- 1 files changed, 70 insertions(+), 1 deletions(-) diff --git a/dlls/shell32/shfldr_printers.c b/dlls/shell32/shfldr_printers.c index 29d0221..4c48a10 100644 --- a/dlls/shell32/shfldr_printers.c +++ b/dlls/shell32/shfldr_printers.c @@ -36,9 +36,15 @@ WINE_DEFAULT_DEBUG_CHANNEL (shell); typedef struct { const IShellFolder2Vtbl *lpVtbl; - LONG ref; + const IPersistFolder2Vtbl *lpvtblPersistFolder2; + LONG ref; } IPrintersFolderImpl; +static inline IPrintersFolderImpl *impl_from_IPersistFolder2(IPersistFolder2 *iface) +{ + return (IPrintersFolderImpl *)((char*)iface - FIELD_OFFSET(IPrintersFolderImpl, lpvtblPersistFolder2)); +} + static HRESULT WINAPI IShellFolder_Printers_fnQueryInterface(IShellFolder2 *iface, REFIID riid, LPVOID *ppvObj) { @@ -54,6 +60,12 @@ static HRESULT WINAPI IShellFolder_Printers_fnQueryInterface(IShellFolder2 *ifac { *ppvObj = This; } + else if (IsEqualIID (riid, &IID_IPersist) || + IsEqualIID (riid, &IID_IPersistFolder) || + IsEqualIID (riid, &IID_IPersistFolder2)) + { + *ppvObj = &This->lpvtblPersistFolder2; + } if (*ppvObj) { @@ -288,6 +300,62 @@ static const IShellFolder2Vtbl vtbl_ShellFolder2 = IShellFolder_Printers_fnMapColumnToSCID }; +/*** IPersistFolder2 ***/ +static HRESULT WINAPI IPersistFolder2_Printers_fnQueryInterface(IPersistFolder2 * iface, + REFIID iid, LPVOID * ppvObj) +{ + IPrintersFolderImpl *This = impl_from_IPersistFolder2(iface); + return IUnknown_QueryInterface( (IUnknown*) This, iid, ppvObj); +} + +static ULONG WINAPI IPersistFolder2_Printers_fnAddRef(IPersistFolder2 *iface) +{ + IPrintersFolderImpl *This = impl_from_IPersistFolder2(iface); + return IUnknown_AddRef( (IUnknown*) This); +} + +static ULONG WINAPI IPersistFolder2_Printers_fnRelease(IPersistFolder2 *iface) +{ + IPrintersFolderImpl *This = impl_from_IPersistFolder2(iface); + return IUnknown_Release( (IUnknown*) This); +} + +static HRESULT WINAPI IPersistFolder2_Printers_fnGetClassID(IPersistFolder2 *iface, CLSID *classId) +{ + IPrintersFolderImpl *This = impl_from_IPersistFolder2(iface); + + FIXME("(%p) stub\n", This); + + if (!classId) + return E_POINTER; + + return E_NOTIMPL; +} + +static HRESULT WINAPI IPersistFolder2_Printers_fnInitialize(IPersistFolder2 *iface, LPCITEMIDLIST pidl) +{ + IPrintersFolderImpl *This = impl_from_IPersistFolder2(iface); + FIXME("(%p) stub\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI IPersistFolder2_Printers_fnGetCurFolder(IPersistFolder2 *iface, LPITEMIDLIST *pidl) +{ + IPrintersFolderImpl *This = impl_from_IPersistFolder2(iface); + FIXME("(%p) stub\n", This); + return E_NOTIMPL; +} + +static const IPersistFolder2Vtbl vtbl_PersistFolder2 = +{ + IPersistFolder2_Printers_fnQueryInterface, + IPersistFolder2_Printers_fnAddRef, + IPersistFolder2_Printers_fnRelease, + IPersistFolder2_Printers_fnGetClassID, + IPersistFolder2_Printers_fnInitialize, + IPersistFolder2_Printers_fnGetCurFolder +}; + HRESULT WINAPI Printers_Constructor(IUnknown * pUnkOuter, REFIID riid, LPVOID * ppv) { IPrintersFolderImpl *sf; @@ -305,6 +373,7 @@ HRESULT WINAPI Printers_Constructor(IUnknown * pUnkOuter, REFIID riid, LPVOID * sf->ref = 0; sf->lpVtbl = &vtbl_ShellFolder2; + sf->lpvtblPersistFolder2 = &vtbl_PersistFolder2; if (IUnknown_QueryInterface((IShellFolder2 *)sf, riid, ppv) != S_OK) {

1 0

Jörg Höhle : winmm: MCI_SYSINFO dwRetSize counts characters, not bytes.
by Alexandre Julliard 16 Apr '10

16 Apr '10

Module: wine Branch: master Commit: c662c35edc09f56e732157a1ba822886bea624d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c662c35edc09f56e732157a1b… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Fri Apr 9 05:45:07 2010 +0200 winmm: MCI_SYSINFO dwRetSize counts characters, not bytes. MSDN says the contrary. --- dlls/winmm/mci.c | 17 ++++++----------- dlls/winmm/tests/mci.c | 39 ++++++++++++++++++++++++++++++++++++++- 2 files changed, 44 insertions(+), 12 deletions(-) diff --git a/dlls/winmm/mci.c b/dlls/winmm/mci.c index f9c65eb..8a66ab4 100644 --- a/dlls/winmm/mci.c +++ b/dlls/winmm/mci.c @@ -37,11 +37,6 @@ * - command table handling isn't thread safe */ -/* to be cross checked: - * - heapalloc for *sizeof(WCHAR) when needed - * - size of string in WCHAR or bytes? (#chars for MCI_INFO, #bytes for MCI_SYSINFO) - */ - #include "config.h" #include "wine/port.h" @@ -359,8 +354,9 @@ static int MCI_MapMsgAtoW(UINT msg, DWORD_PTR dwParam1, DWORD_PTR *dwParam2) if (dwParam1 & MCI_NOTIFY) mci_sysinfoW->dwCallback = mci_sysinfoA->dwCallback; + /* Size is measured in numbers of characters, despite what MSDN says. */ mci_sysinfoW->dwRetSize = mci_sysinfoA->dwRetSize; - mci_sysinfoW->lpstrReturn = HeapAlloc(GetProcessHeap(), 0, mci_sysinfoW->dwRetSize); + mci_sysinfoW->lpstrReturn = HeapAlloc(GetProcessHeap(), 0, mci_sysinfoW->dwRetSize * sizeof(WCHAR)); mci_sysinfoW->dwNumber = mci_sysinfoA->dwNumber; mci_sysinfoW->wDeviceType = mci_sysinfoA->wDeviceType; return 1; @@ -383,7 +379,7 @@ static int MCI_MapMsgAtoW(UINT msg, DWORD_PTR dwParam1, DWORD_PTR *dwParam2) mci_infoW->dwCallback = mci_infoA->dwCallback; /* Size is measured in numbers of characters. */ - mci_infoW->dwRetSize = mci_infoA->dwRetSize; /* it's not the same as SYSINFO !!! */ + mci_infoW->dwRetSize = mci_infoA->dwRetSize; mci_infoW->lpstrReturn = HeapAlloc(GetProcessHeap(), 0, mci_infoW->dwRetSize * sizeof(WCHAR)); return 1; } @@ -1726,7 +1722,6 @@ static DWORD MCI_WriteString(LPWSTR lpDstStr, DWORD dstSize, LPCWSTR lpSrcStr) DWORD ret = 0; if (lpSrcStr) { - dstSize /= sizeof(WCHAR); if (dstSize <= strlenW(lpSrcStr)) { lstrcpynW(lpDstStr, lpSrcStr, dstSize - 1); ret = MCIERR_PARAM_OVERFLOW; @@ -1830,7 +1825,7 @@ static DWORD MCI_SysInfo(UINT uDevID, DWORD dwFlags, LPMCI_SYSINFO_PARMSW lpParm } } LeaveCriticalSection(&WINMM_cs); - ret = s ? MCI_WriteString(lpParms->lpstrReturn, lpParms->dwRetSize / sizeof(WCHAR), s) : MCIERR_OUTOFRANGE; + ret = s ? MCI_WriteString(lpParms->lpstrReturn, lpParms->dwRetSize, s) : MCIERR_OUTOFRANGE; } else if (MCI_ALL_DEVICE_ID == uDevID) { TRACE("MCI_SYSINFO_NAME: device #%d\n", lpParms->dwNumber); if (RegOpenKeyExW( HKEY_LOCAL_MACHINE, wszHklmMci, 0, @@ -1856,7 +1851,7 @@ static DWORD MCI_SysInfo(UINT uDevID, DWORD dwFlags, LPMCI_SYSINFO_PARMSW lpParm } } } - ret = s ? MCI_WriteString(lpParms->lpstrReturn, lpParms->dwRetSize / sizeof(WCHAR), s) : MCIERR_OUTOFRANGE; + ret = s ? MCI_WriteString(lpParms->lpstrReturn, lpParms->dwRetSize, s) : MCIERR_OUTOFRANGE; } else { FIXME("MCI_SYSINFO_NAME: nth device of type %d\n", lpParms->wDeviceType); /* Cheating: what is asked for is the nth device from the registry. */ @@ -1865,7 +1860,7 @@ static DWORD MCI_SysInfo(UINT uDevID, DWORD dwFlags, LPMCI_SYSINFO_PARMSW lpParm ret = MCIERR_OUTOFRANGE; else { LoadStringW(hWinMM32Instance, LOWORD(lpParms->wDeviceType), - lpParms->lpstrReturn, lpParms->dwRetSize / sizeof(WCHAR)); + lpParms->lpstrReturn, lpParms->dwRetSize); ret = 0; } } diff --git a/dlls/winmm/tests/mci.c b/dlls/winmm/tests/mci.c index aa718d7..b064c0c 100644 --- a/dlls/winmm/tests/mci.c +++ b/dlls/winmm/tests/mci.c @@ -212,6 +212,7 @@ static void test_openCloseWAVE(HWND hwnd) else trace("locale-dependent time format: %s (ms)\n", buf); } + memset(buf, 0, sizeof(buf)); parm.sys.dwNumber = 1; parm.sys.wDeviceType = MCI_DEVTYPE_WAVEFORM_AUDIO; /* ignored */ parm.sys.lpstrReturn = buf; @@ -219,9 +220,45 @@ static void test_openCloseWAVE(HWND hwnd) parm.sys.dwCallback = (DWORD_PTR)hwnd; err = mciSendCommand(MCI_ALL_DEVICE_ID, MCI_SYSINFO, MCI_SYSINFO_NAME | MCI_SYSINFO_OPEN | MCI_NOTIFY, (DWORD_PTR)&parm); ok(!err,"mciCommand MCI_SYSINFO all name 1 open notify: %s\n", dbg_mcierr(err)); - if(!err) ok(!strcmp(buf,"mysound"),"sysinfo name returned %s\n", buf); + if(!err) ok(!strcmp(buf,"mysound"), "sysinfo name returned %s\n", buf); test_notification(hwnd, "SYSINFO name notify\n", MCI_NOTIFY_SUCCESSFUL); + memset(buf, 0, sizeof(buf)); + parm.sys.dwNumber = 1; + parm.sys.wDeviceType = MCI_DEVTYPE_WAVEFORM_AUDIO; /* ignored */ + parm.sys.lpstrReturn = buf; + parm.sys.dwRetSize = 8; /* mysound\0 */ + err = mciSendCommand(MCI_ALL_DEVICE_ID, MCI_SYSINFO, MCI_SYSINFO_NAME | MCI_SYSINFO_OPEN, (DWORD_PTR)&parm); + ok(!err,"mciCommand MCI_SYSINFO all name 1 open buffer[8]: %s\n", dbg_mcierr(err)); + if(!err) ok(!strcmp(buf,"mysound"), "sysinfo name returned %s\n", buf); + + /* dwRetSize counts characters, not bytes, despite what MSDN says. */ + parm.sys.dwNumber = 1; + parm.sys.wDeviceType = MCI_DEVTYPE_WAVEFORM_AUDIO; /* ignored */ + parm.sys.lpstrReturn = buf; + parm.sys.dwRetSize = 8; /* mysound\0 */ + /* MCI_..._PARMSA and PARMSW share the same layout, use one for both tests. */ + err = mciSendCommandW(MCI_ALL_DEVICE_ID, MCI_SYSINFO, MCI_SYSINFO_NAME | MCI_SYSINFO_OPEN, (DWORD_PTR)&parm); + ok(!err || broken(err==MMSYSERR_NOTSUPPORTED/* Win9x */), "mciCommandW MCI_SYSINFO all name 1 open buffer[8]: %s\n", dbg_mcierr(err)); + /* TODO strcmpW((LPWSTR)buf,"mysound") */ + + parm.sys.dwNumber = 1; + parm.sys.wDeviceType = MCI_DEVTYPE_WAVEFORM_AUDIO; /* ignored */ + parm.sys.lpstrReturn = buf; + parm.sys.dwRetSize = 7; /* too short for mysound\0 */ + err = mciSendCommandW(MCI_ALL_DEVICE_ID, MCI_SYSINFO, MCI_SYSINFO_NAME | MCI_SYSINFO_OPEN, (DWORD_PTR)&parm); + ok(err==MCIERR_PARAM_OVERFLOW || broken(err==MMSYSERR_NOTSUPPORTED/* Win9x */), "mciCommandW MCI_SYSINFO all name 1 open too small: %s\n", dbg_mcierr(err)); + + /* Win9x overwrites the tiny buffer and returns success, newer versions signal overflow. */ + memset(buf, 0, sizeof(buf)); + parm.sys.dwNumber = 1; + parm.sys.wDeviceType = MCI_DEVTYPE_WAVEFORM_AUDIO; /* ignored */ + parm.sys.lpstrReturn = buf; + parm.sys.dwRetSize = 2; /* too short for mysound\0 */ + err = mciSendCommand(MCI_ALL_DEVICE_ID, MCI_SYSINFO, MCI_SYSINFO_NAME | MCI_SYSINFO_OPEN, (DWORD_PTR)&parm); + ok(err==MCIERR_PARAM_OVERFLOW || broken(!err /* Win9x */),"mciCommand MCI_SYSINFO all name 1 open too small: %s\n", dbg_mcierr(err)); + if(!err) ok(!strcmp(buf,"mysound"), "sysinfo short name returned %s\n", buf); + err = mciGetDeviceID("all"); ok(MCI_ALL_DEVICE_ID==err || /* Win9x */(UINT16)MCI_ALL_DEVICE_ID==err,"mciGetDeviceID all returned %u, expected %d\n", err, MCI_ALL_DEVICE_ID);

1 0

← Newer
1
...
41
42
43
44
45
46
47
...
90
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 April 2010