May 2010 - Wine-Commits - list.winehq.org

Gerald Pfeifer : ntdll/tests: Remove variable len which is not really used from create_file_test.
by Alexandre Julliard May 5, 2010

May 5, 2010

Module: wine Branch: master Commit: b8ee1459927fdb34df2838d0fb333f8c0f25e072 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b8ee1459927fdb34df2838d0f… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Wed May 5 00:24:46 2010 +0200 ntdll/tests: Remove variable len which is not really used from create_file_test. --- dlls/ntdll/tests/file.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index 708803f..2828794 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -163,9 +163,8 @@ static void create_file_test(void) OBJECT_ATTRIBUTES attr; IO_STATUS_BLOCK io; UNICODE_STRING nameW; - UINT len; - len = GetCurrentDirectoryW( MAX_PATH, path ); + GetCurrentDirectoryW( MAX_PATH, path ); pRtlDosPathNameToNtPathName_U( path, &nameW, NULL, NULL ); attr.Length = sizeof(attr); attr.RootDirectory = 0;

1 0

Gerald Pfeifer : cmd: Remove variable useinput which is not really used from WCMD_more.
by Alexandre Julliard May 5, 2010

May 5, 2010

Module: wine Branch: master Commit: 5b0de0d569f9621967fc38bf8b686f4ae9d0962a URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b0de0d569f9621967fc38bf8… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Wed May 5 00:24:38 2010 +0200 cmd: Remove variable useinput which is not really used from WCMD_more. --- programs/cmd/builtins.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index b75c0c4..0573114 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -2353,7 +2353,6 @@ void WCMD_more (WCHAR *command) { int argno = 0; WCHAR *argN = command; - BOOL useinput = FALSE; WCHAR moreStr[100]; WCHAR moreStrPage[100]; WCHAR buffer[512]; @@ -2385,7 +2384,6 @@ void WCMD_more (WCHAR *command) { /* Warning: No easy way of ending the stream (ctrl+z on windows) so once you get in this bit unless due to a pipe, its going to end badly... */ - useinput = TRUE; wsprintfW(moreStrPage, moreFmt, moreStr); WCMD_enter_paged_mode(moreStrPage);

1 0

Gerald Pfeifer : taskmgr: Remove variable pnmv which is not really used from ProcessPageOnNotify.
by Alexandre Julliard May 5, 2010

May 5, 2010

Module: wine Branch: master Commit: 34db2df2cc1ff45477dbbe7fe6456319ed3acc93 URL: http://source.winehq.org/git/wine.git/?a=commit;h=34db2df2cc1ff45477dbbe7fe… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Wed May 5 00:24:30 2010 +0200 taskmgr: Remove variable pnmv which is not really used from ProcessPageOnNotify. --- programs/taskmgr/procpage.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/programs/taskmgr/procpage.c b/programs/taskmgr/procpage.c index 7f91114..beccfbf 100644 --- a/programs/taskmgr/procpage.c +++ b/programs/taskmgr/procpage.c @@ -151,7 +151,6 @@ static void ProcessPageShowContextMenu(DWORD dwProcessId) static void ProcessPageOnNotify(LPARAM lParam) { LPNMHDR pnmh; - LPNMLISTVIEW pnmv; NMLVDISPINFOW* pnmdi; LVITEM lvitem; ULONG Index; @@ -163,7 +162,6 @@ static void ProcessPageOnNotify(LPARAM lParam) static const WCHAR wszUnitK[] = {' ','K',0}; pnmh = (LPNMHDR) lParam; - pnmv = (LPNMLISTVIEW) lParam; pnmdi = (NMLVDISPINFOW*) lParam; if (pnmh->hwndFrom == hProcessPageListCtrl)

1 0

Piotr Caban : msvcrt: Added _get_osplatform implementation.
by Alexandre Julliard May 5, 2010

May 5, 2010

Module: wine Branch: master Commit: 3f4eded5d4842880ee895f00f7e865e30f018482 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f4eded5d4842880ee895f00f… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed May 5 13:36:58 2010 +0200 msvcrt: Added _get_osplatform implementation. --- dlls/msvcr80/msvcr80.spec | 4 ++-- dlls/msvcrt/data.c | 17 +++++++++++++++++ dlls/msvcrt/msvcrt.spec | 4 ++-- dlls/msvcrt/tests/data.c | 9 +++++++-- 4 files changed, 28 insertions(+), 6 deletions(-) diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index f3d74c8..92db3f0 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -472,7 +472,7 @@ @ cdecl _get_heap_handle() msvcrt._get_heap_handle @ cdecl _get_invalid_parameter_handler() msvcrt._get_invalid_parameter_handler @ cdecl _get_osfhandle(long) msvcrt._get_osfhandle -@ stub _get_osplatform +@ cdecl _get_osplatform(ptr) msvcrt._get_osplatform @ stub _get_osver @ stub _get_output_format @ stub _get_pgmptr @@ -811,7 +811,7 @@ @ cdecl _onexit(ptr) msvcrt._onexit @ varargs _open(str long) msvcrt._open @ cdecl _open_osfhandle(long long) msvcrt._open_osfhandle -@ stub _osplatform +@ extern _osplatform msvcrt._osplatform @ extern _osver msvcrt._osver @ stub _outp @ stub _outpd diff --git a/dlls/msvcrt/data.c b/dlls/msvcrt/data.c index c91980d..54dda1c 100644 --- a/dlls/msvcrt/data.c +++ b/dlls/msvcrt/data.c @@ -39,6 +39,7 @@ unsigned int MSVCRT_osmajor = 0;/* FIXME: */ unsigned int MSVCRT_osminor = 0;/* FIXME: */ unsigned int MSVCRT_osmode = 0;/* FIXME: */ unsigned int MSVCRT__osver = 0; +unsigned int MSVCRT__osplatform = 0; unsigned int MSVCRT_osversion = 0; /* FIXME: */ unsigned int MSVCRT__winmajor = 0; unsigned int MSVCRT__winminor = 0; @@ -228,6 +229,21 @@ char*** CDECL __p___initenv(void) { return &MSVCRT___initenv; } */ MSVCRT_wchar_t*** CDECL __p___winitenv(void) { return &MSVCRT___winitenv; } +/********************************************************************* + * _get_osplatform (MSVCRT.@) + */ +int CDECL MSVCRT__get_osplatform(int *ret) +{ + if(!ret) { + MSVCRT__invalid_parameter(NULL, NULL, NULL, 0, 0); + *MSVCRT__errno() = MSVCRT_EINVAL; + return MSVCRT_EINVAL; + } + + *ret = MSVCRT__osplatform; + return 0; +} + /* INTERNAL: Create a wide string from an ascii string */ MSVCRT_wchar_t *msvcrt_wstrdupa(const char *str) { @@ -279,6 +295,7 @@ void msvcrt_init_args(void) MSVCRT__winmajor = osvi.dwMajorVersion; MSVCRT__winminor = osvi.dwMinorVersion; MSVCRT__osver = osvi.dwBuildNumber; + MSVCRT__osplatform = osvi.dwPlatformId; MSVCRT_osversion = MSVCRT__winver; MSVCRT_osmajor = MSVCRT__winmajor; MSVCRT_osminor = MSVCRT__winminor; diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index f35fdfd..6e581df 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -431,7 +431,7 @@ # stub _get_fmode @ cdecl _get_heap_handle() @ cdecl _get_osfhandle(long) -# stub _get_osplatform +@ cdecl _get_osplatform(ptr) MSVCRT__get_osplatform # stub _get_osver # stub _get_output_format # stub _get_pgmptr @@ -759,7 +759,7 @@ @ cdecl _onexit(ptr) MSVCRT__onexit @ varargs _open(str long) MSVCRT__open @ cdecl _open_osfhandle(long long) -# stub _osplatform +@ extern _osplatform MSVCRT__osplatform @ extern _osver MSVCRT__osver @ stub _outp #(long long) @ stub _outpd #(long long) diff --git a/dlls/msvcrt/tests/data.c b/dlls/msvcrt/tests/data.c index a27ca27..7061124 100644 --- a/dlls/msvcrt/tests/data.c +++ b/dlls/msvcrt/tests/data.c @@ -74,7 +74,8 @@ static void test_initvar( HMODULE hmsvcrt ) int *pp_winmajor = (int*)GetProcAddress(hmsvcrt, "_winmajor"); int *pp_winminor = (int*)GetProcAddress(hmsvcrt, "_winminor"); int *pp_osver = (int*)GetProcAddress(hmsvcrt, "_osver"); - unsigned int winver, winmajor, winminor, osver; + int *pp_osplatform = (int*)GetProcAddress(hmsvcrt, "_osplatform"); + unsigned int winver, winmajor, winminor, osver, osplatform; if( !( pp_winmajor && pp_winminor && pp_winver)) { win_skip("_winver variables are not available\n"); @@ -91,16 +92,20 @@ static void test_initvar( HMODULE hmsvcrt ) ok( winver == ((osvi.dwMajorVersion << 8) | osvi.dwMinorVersion), "Wrong value for _winver %02x expected %02x\n", winver, ((osvi.dwMajorVersion << 8) | osvi.dwMinorVersion)); - if( !pp_osver) { + if( !pp_osver || !pp_osplatform ) { win_skip("_osver variables are not available\n"); return; } osver = *pp_osver; + osplatform = *pp_osplatform; ok( osver == (osvi.dwBuildNumber & 0xffff) || ((osvi.dwBuildNumber >> 24) == osvi.dwMajorVersion && ((osvi.dwBuildNumber >> 16) & 0xff) == osvi.dwMinorVersion), /* 95/98/ME */ "Wrong value for _osver %04x expected %04x\n", osver, osvi.dwBuildNumber); + ok(osplatform == osvi.dwPlatformId, + "Wrong value for _osplatform %x exprected %x\n", + osplatform, osvi.dwPlatformId); } START_TEST(data)

1 0

Gerald Pfeifer : winex11.drv: Remove variable bits which is not really used from X11DRV_DIB_GetImageBits_4 .
by Alexandre Julliard May 5, 2010

May 5, 2010

Module: wine Branch: master Commit: c5bc2a5d2faf1723ed4c08708f5d5337baa188ff URL: http://source.winehq.org/git/wine.git/?a=commit;h=c5bc2a5d2faf1723ed4c08708… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Wed May 5 00:24:24 2010 +0200 winex11.drv: Remove variable bits which is not really used from X11DRV_DIB_GetImageBits_4. --- dlls/winex11.drv/dib.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/dlls/winex11.drv/dib.c b/dlls/winex11.drv/dib.c index 4b9c52b..ec97f2d 100644 --- a/dlls/winex11.drv/dib.c +++ b/dlls/winex11.drv/dib.c @@ -970,7 +970,6 @@ static void X11DRV_DIB_GetImageBits_4( int lines, BYTE *dstbits, { DWORD x; int h, width = min(srcwidth, dstwidth); - BYTE *bits; if (lines < 0 ) { @@ -979,8 +978,6 @@ static void X11DRV_DIB_GetImageBits_4( int lines, BYTE *dstbits, linebytes = -linebytes; } - bits = dstbits; - switch (bmpImage->depth) { case 1: case 4:

1 0

Gerald Pfeifer : cryptdlg: Remove variable headingSep which is not really used from CRYPT_FormatCPS.
by Alexandre Julliard May 5, 2010

May 5, 2010

Module: wine Branch: master Commit: f215784edc8a9c4e8d89080c908d50dd3445538c URL: http://source.winehq.org/git/wine.git/?a=commit;h=f215784edc8a9c4e8d89080c9… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Wed May 5 00:24:27 2010 +0200 cryptdlg: Remove variable headingSep which is not really used from CRYPT_FormatCPS. --- dlls/cryptdlg/main.c | 8 +------- 1 files changed, 1 insertions(+), 7 deletions(-) diff --git a/dlls/cryptdlg/main.c b/dlls/cryptdlg/main.c index f6653ec..04311fd 100644 --- a/dlls/cryptdlg/main.c +++ b/dlls/cryptdlg/main.c @@ -534,19 +534,13 @@ static BOOL CRYPT_FormatCPS(DWORD dwCertEncodingType, if ((ret = CryptDecodeObjectEx(dwCertEncodingType, X509_UNICODE_ANY_STRING, pbEncoded, cbEncoded, CRYPT_DECODE_ALLOC_FLAG, NULL, &cpsValue, &size))) { - LPCWSTR headingSep, sep; + LPCWSTR sep; DWORD sepLen; if (dwFormatStrType & CRYPT_FORMAT_STR_MULTI_LINE) - { - headingSep = colonCrlf; sep = crlf; - } else - { - headingSep = colonSpace; sep = commaSep; - } sepLen = strlenW(sep);

1 0

Gerald Pfeifer : crypt32/tests: Remove variable entry which is not really used from test_decodeCRLToBeSigned .
by Alexandre Julliard May 5, 2010

May 5, 2010

Module: wine Branch: master Commit: 52ead99288c810370adadf0342202ad9e26e3453 URL: http://source.winehq.org/git/wine.git/?a=commit;h=52ead99288c810370adadf034… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Wed May 5 00:24:19 2010 +0200 crypt32/tests: Remove variable entry which is not really used from test_decodeCRLToBeSigned. --- dlls/crypt32/tests/encode.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/crypt32/tests/encode.c b/dlls/crypt32/tests/encode.c index 1c33aee..d60843a 100644 --- a/dlls/crypt32/tests/encode.c +++ b/dlls/crypt32/tests/encode.c @@ -4595,13 +4595,11 @@ static void test_decodeCRLToBeSigned(DWORD dwEncoding) if (buf) { CRL_INFO *info = (CRL_INFO *)buf; - CRL_ENTRY *entry; ok(size >= sizeof(CRL_INFO), "Wrong size %d\n", size); ok(info->cCRLEntry == 3, "Expected 3 CRL entries, got %d\n", info->cCRLEntry); ok(info->rgCRLEntry != NULL, "Expected a valid CRL entry array\n"); - entry = info->rgCRLEntry; ok(info->cExtension == 2, "Expected 2 extensions, got %d\n", info->cExtension); LocalFree(buf);

1 0

Gerald Pfeifer : comctl32: Remove variable scrollRange which is not really used from PAGER_NCCalcSize .
by Alexandre Julliard May 5, 2010

May 5, 2010

Module: wine Branch: master Commit: 34f9b1bc6391261e8a0807901f23cb12c91daa1b URL: http://source.winehq.org/git/wine.git/?a=commit;h=34f9b1bc6391261e8a0807901… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Wed May 5 00:24:41 2010 +0200 comctl32: Remove variable scrollRange which is not really used from PAGER_NCCalcSize. --- dlls/comctl32/pager.c | 5 ----- 1 files changed, 0 insertions(+), 5 deletions(-) diff --git a/dlls/comctl32/pager.c b/dlls/comctl32/pager.c index fdf470c..f3461fd 100644 --- a/dlls/comctl32/pager.c +++ b/dlls/comctl32/pager.c @@ -841,7 +841,6 @@ static LRESULT PAGER_NCCalcSize(PAGER_INFO* infoPtr, WPARAM wParam, LPRECT lpRect) { RECT rcChild, rcWindow; - INT scrollRange; /* * lpRect points to a RECT struct. On entry, the struct @@ -863,8 +862,6 @@ PAGER_NCCalcSize(PAGER_INFO* infoPtr, WPARAM wParam, LPRECT lpRect) infoPtr->nWidth = lpRect->right - lpRect->left; PAGER_CalcSize (infoPtr, &infoPtr->nWidth, TRUE); - scrollRange = infoPtr->nWidth - (rcWindow.right - rcWindow.left); - if (infoPtr->TLbtnState && (lpRect->left + infoPtr->nButtonSize < lpRect->right)) lpRect->left += infoPtr->nButtonSize; if (infoPtr->BRbtnState && (lpRect->right - infoPtr->nButtonSize > lpRect->left)) @@ -875,8 +872,6 @@ PAGER_NCCalcSize(PAGER_INFO* infoPtr, WPARAM wParam, LPRECT lpRect) infoPtr->nHeight = lpRect->bottom - lpRect->top; PAGER_CalcSize (infoPtr, &infoPtr->nHeight, FALSE); - scrollRange = infoPtr->nHeight - (rcWindow.bottom - rcWindow.top); - if (infoPtr->TLbtnState && (lpRect->top + infoPtr->nButtonSize < lpRect->bottom)) lpRect->top += infoPtr->nButtonSize; if (infoPtr->BRbtnState && (lpRect->bottom - infoPtr->nButtonSize > lpRect->top))

1 0

Jörg Höhle : wineoss: MOD_MIDIPORT has 0 voices and notes and FFFF ChannelMask.
by Alexandre Julliard May 5, 2010

May 5, 2010

Module: wine Branch: master Commit: d531d229e5d2a857544a4e5f75c63d572fbf60fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=d531d229e5d2a857544a4e5f7… Author: Jörg Höhle <Joerg-Cyril.Hoehle(a)t-systems.com> Date: Tue May 4 15:44:05 2010 +0200 wineoss: MOD_MIDIPORT has 0 voices and notes and FFFF ChannelMask. --- dlls/wineoss.drv/midi.c | 91 ++++++++++++++++++++++------------------------ 1 files changed, 44 insertions(+), 47 deletions(-) diff --git a/dlls/wineoss.drv/midi.c b/dlls/wineoss.drv/midi.c index 20163b1..6f29dcc 100644 --- a/dlls/wineoss.drv/midi.c +++ b/dlls/wineoss.drv/midi.c @@ -217,58 +217,60 @@ static LRESULT OSS_MidiInit(void) MidiOutDev[i].caps.wPid = 0x0001; /* FIXME Product ID */ /* Product Version. We simply say "1" */ MidiOutDev[i].caps.vDriverVersion = 0x001; + /* The following are mandatory for MOD_MIDIPORT */ MidiOutDev[i].caps.wChannelMask = 0xFFFF; - - /* FIXME Do we have this information? - * Assuming the soundcards can handle - * MIDICAPS_VOLUME and MIDICAPS_LRVOLUME but - * not MIDICAPS_CACHE. - */ - MidiOutDev[i].caps.dwSupport = MIDICAPS_VOLUME|MIDICAPS_LRVOLUME; + MidiOutDev[i].caps.wVoices = 0; + MidiOutDev[i].caps.wNotes = 0; + MidiOutDev[i].caps.dwSupport = 0; sinfo.device = i; status = ioctl(midiSeqFD, SNDCTL_SYNTH_INFO, &sinfo); if (status == -1) { - static const WCHAR fmt[] = {'W','i','n','e',' ','O','S','S',' ','M','i','d','i',' ','O','u','t',' ','(','#','%','d',')',' ','d','i','s','a','b','l','e','d',0}; + static const WCHAR fmt[] = {'W','i','n','e',' ','O','S','S',' ','M','i','d','i',' ','O','u','t',' ','#','%','d',' ','d','i','s','a','b','l','e','d',0}; ERR("ioctl for synth info failed on %d, disabling it.\n", i); wsprintfW(MidiOutDev[i].caps.szPname, fmt, i); MidiOutDev[i].caps.wTechnology = MOD_MIDIPORT; - MidiOutDev[i].caps.wVoices = 16; - MidiOutDev[i].caps.wNotes = 16; MidiOutDev[i].bEnabled = FALSE; } else { MultiByteToWideChar( CP_UNIXCP, 0, sinfo.name, -1, MidiOutDev[i].caps.szPname, sizeof(MidiOutDev[i].caps.szPname)/sizeof(WCHAR) ); - MidiOutDev[i].caps.wTechnology = MIDI_UnixToWindowsDeviceType(sinfo.synth_type); - MidiOutDev[i].caps.wVoices = sinfo.nr_voices; - /* FIXME Is it possible to know the maximum - * number of simultaneous notes of a soundcard ? - * I believe we don't have this information, but - * it's probably equal or more than wVoices - */ - MidiOutDev[i].caps.wNotes = sinfo.nr_voices; + if (MOD_MIDIPORT != MidiOutDev[i].caps.wTechnology) { + /* FIXME Do we have this information? + * Assuming the soundcards can handle + * MIDICAPS_VOLUME and MIDICAPS_LRVOLUME but + * not MIDICAPS_CACHE. + */ + MidiOutDev[i].caps.dwSupport = MIDICAPS_VOLUME|MIDICAPS_LRVOLUME; + MidiOutDev[i].caps.wVoices = sinfo.nr_voices; + + /* FIXME Is it possible to know the maximum + * number of simultaneous notes of a soundcard ? + * I believe we don't have this information, but + * it's probably equal or more than wVoices + */ + MidiOutDev[i].caps.wNotes = sinfo.nr_voices; + } MidiOutDev[i].bEnabled = TRUE; - } - /* We also have the information sinfo.synth_subtype, not used here - */ - - if (sinfo.capabilities & SYNTH_CAP_INPUT) { - FIXME("Synthesizer supports MIDI in. Not yet supported.\n"); - } + /* We also have the information sinfo.synth_subtype, not used here + */ + if (sinfo.capabilities & SYNTH_CAP_INPUT) { + FIXME("Synthesizer supports MIDI in. Not yet supported.\n"); + } + TRACE("SynthOut[%d]\tOSS info: synth type=%d/%d capa=%lx\n", + i, sinfo.synth_type, sinfo.synth_subtype, (long)sinfo.capabilities); + } - TRACE("SynthOut[%d]\tname='%s' techn=%d voices=%d notes=%d chnMsk=%04x support=%d\n" - "\tOSS info: synth subtype=%d capa=%lx\n", + TRACE("SynthOut[%d]\tname='%s' techn=%d voices=%d notes=%d chnMsk=%04x support=%d\n", i, wine_dbgstr_w(MidiOutDev[i].caps.szPname), MidiOutDev[i].caps.wTechnology, MidiOutDev[i].caps.wVoices, MidiOutDev[i].caps.wNotes, - MidiOutDev[i].caps.wChannelMask, MidiOutDev[i].caps.dwSupport, - sinfo.synth_subtype, (long)sinfo.capabilities); + MidiOutDev[i].caps.wChannelMask, MidiOutDev[i].caps.dwSupport); } /* find how many MIDI devices are there in the system */ @@ -309,7 +311,7 @@ static LRESULT OSS_MidiInit(void) /* Product Version. We simply say "1" */ MidiOutDev[numsynthdevs + i].caps.vDriverVersion = 0x001; if (status == -1) { - static const WCHAR fmt[] = {'W','i','n','e',' ','O','S','S',' ','M','i','d','i',' ','O','u','t',' ','(','#','%','d',')',' ','d','i','s','a','b','l','e','d',0}; + static const WCHAR fmt[] = {'W','i','n','e',' ','O','S','S',' ','M','i','d','i',' ','O','u','t',' ','#','%','d',' ','d','i','s','a','b','l','e','d',0}; wsprintfW(MidiOutDev[numsynthdevs + i].caps.szPname, fmt, numsynthdevs + i); MidiOutDev[numsynthdevs + i].bEnabled = FALSE; } else { @@ -318,15 +320,11 @@ static LRESULT OSS_MidiInit(void) sizeof(MidiOutDev[numsynthdevs + i].caps.szPname) / sizeof(WCHAR)); MidiOutDev[numsynthdevs + i].bEnabled = TRUE; } - MidiOutDev[numsynthdevs + i].caps.wTechnology = MOD_MIDIPORT; /* FIXME Is this right? */ - /* Does it make any difference? */ - MidiOutDev[numsynthdevs + i].caps.wVoices = 16; - /* Does it make any difference? */ - MidiOutDev[numsynthdevs + i].caps.wNotes = 16; + MidiOutDev[numsynthdevs + i].caps.wTechnology = MOD_MIDIPORT; + MidiOutDev[numsynthdevs + i].caps.wVoices = 0; + MidiOutDev[numsynthdevs + i].caps.wNotes = 0; MidiOutDev[numsynthdevs + i].caps.wChannelMask= 0xFFFF; - - /* FIXME Does it make any difference? */ - MidiOutDev[numsynthdevs + i].caps.dwSupport = MIDICAPS_VOLUME|MIDICAPS_LRVOLUME; + MidiOutDev[numsynthdevs + i].caps.dwSupport = 0; /* This whole part is somewhat obscure to me. I'll keep trying to dig info about it. If you happen to know, please tell us. The very @@ -340,7 +338,7 @@ static LRESULT OSS_MidiInit(void) /* Product Version. We simply say "1" */ MidiInDev[i].caps.vDriverVersion = 0x001; if (status == -1) { - static const WCHAR fmt[] = {'W','i','n','e',' ','O','S','S',' ','M','i','d','i',' ','I','n',' ','(','#','%','d',')',' ','d','i','s','a','b','l','e','d',0}; + static const WCHAR fmt[] = {'W','i','n','e',' ','O','S','S',' ','M','i','d','i',' ','I','n',' ','#','%','d',' ','d','i','s','a','b','l','e','d',0}; wsprintfW(MidiInDev[i].caps.szPname, fmt, numsynthdevs + i); MidiInDev[i].state = -1; } else { @@ -349,18 +347,17 @@ static LRESULT OSS_MidiInit(void) sizeof(MidiInDev[i].caps.szPname) / sizeof(WCHAR)); MidiInDev[i].state = 0; } - /* FIXME : could we get better information than that ? */ - MidiInDev[i].caps.dwSupport = MIDICAPS_VOLUME|MIDICAPS_LRVOLUME; + MidiInDev[i].caps.dwSupport = 0; /* mandatory with MIDIINCAPS */ - TRACE("MidiOut[%d]\tname='%s' techn=%d voices=%d notes=%d chnMsk=%04x support=%d\n" - "MidiIn [%d]\tname='%s' support=%d\n" - "\tOSS info: midi dev-type=%d, capa=%lx\n", - i, wine_dbgstr_w(MidiOutDev[numsynthdevs + i].caps.szPname), + TRACE("OSS info: midi[%d] dev-type=%d capa=%lx\n" + "\tMidiOut[%d] name='%s' techn=%d voices=%d notes=%d chnMsk=%04x support=%d\n" + "\tMidiIn [%d] name='%s' support=%d\n", + i, minfo.dev_type, (long)minfo.capabilities, + numsynthdevs + i, wine_dbgstr_w(MidiOutDev[numsynthdevs + i].caps.szPname), MidiOutDev[numsynthdevs + i].caps.wTechnology, MidiOutDev[numsynthdevs + i].caps.wVoices, MidiOutDev[numsynthdevs + i].caps.wNotes, MidiOutDev[numsynthdevs + i].caps.wChannelMask, MidiOutDev[numsynthdevs + i].caps.dwSupport, - i, wine_dbgstr_w(MidiInDev[i].caps.szPname), MidiInDev[i].caps.dwSupport, - minfo.dev_type, (long)minfo.capabilities); + i, wine_dbgstr_w(MidiInDev[i].caps.szPname), MidiInDev[i].caps.dwSupport); } wrapup:

1 0

Charles Davis : ntdll: Implement IOCTL_SCSI_PASS_THROUGH(_DIRECT) on Mac OS .
by Alexandre Julliard May 5, 2010

May 5, 2010

Module: wine Branch: master Commit: 1e0cee6d3c343ad21e3a4d69cfa9d1d164943745 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e0cee6d3c343ad21e3a4d69c… Author: Charles Davis <cdavis(a)mymail.mines.edu> Date: Tue May 4 23:57:02 2010 -0600 ntdll: Implement IOCTL_SCSI_PASS_THROUGH(_DIRECT) on Mac OS. --- dlls/ntdll/cdrom.c | 145 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 145 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/cdrom.c b/dlls/ntdll/cdrom.c index 069ac01..ab68459 100644 --- a/dlls/ntdll/cdrom.c +++ b/dlls/ntdll/cdrom.c @@ -83,8 +83,28 @@ # include <IOKit/storage/IOMedia.h> # include <IOKit/storage/IOCDMediaBSDClient.h> # include <IOKit/storage/IODVDMediaBSDClient.h> +# include <IOKit/scsi/SCSITask.h> # include <IOKit/scsi/SCSICmds_REQUEST_SENSE_Defs.h> # define SENSEBUFLEN kSenseDefaultSize + +typedef struct +{ + uint32_t attribute; + uint32_t timeout; + uint32_t response; + uint32_t status; + uint8_t direction; + uint8_t cdbSize; + uint8_t reserved0144[2]; + uint8_t cdb[16]; + void* buffer; + uint64_t bufferSize; + void* sense; + uint64_t senseLen; +} dk_scsi_command_t; + +#define DKIOCSCSICOMMAND _IOWR('d', 253, dk_scsi_command_t) + #endif #define NONAMELESSUNION @@ -1649,6 +1669,9 @@ static NTSTATUS CDROM_ScsiPassThroughDirect(int fd, PSCSI_PASS_THROUGH_DIRECT pP #elif defined HAVE_SCSIREQ_T_CMD scsireq_t cmd; int io; +#elif defined __APPLE__ + dk_scsi_command_t cmd; + int io; #endif if (pPacket->Length < sizeof(SCSI_PASS_THROUGH_DIRECT)) @@ -1752,6 +1775,64 @@ static NTSTATUS CDROM_ScsiPassThroughDirect(int fd, PSCSI_PASS_THROUGH_DIRECT pP pPacket->ScsiStatus = cmd.status; ret = CDROM_GetStatusCode(io); + +#elif defined(__APPLE__) + + memset(&cmd, 0, sizeof(cmd)); + memcpy(cmd.cdb, pPacket->Cdb, pPacket->CdbLength); + + cmd.cdbSize = pPacket->CdbLength; + cmd.buffer = pPacket->DataBuffer; + cmd.bufferSize = pPacket->DataTransferLength; + cmd.sense = (char*)pPacket + pPacket->SenseInfoOffset; + cmd.senseLen = pPacket->SenseInfoLength; + cmd.timeout = pPacket->TimeOutValue*1000; /* in milliseconds */ + + switch (pPacket->DataIn) + { + case SCSI_IOCTL_DATA_OUT: + cmd.direction = kSCSIDataTransfer_FromInitiatorToTarget; + break; + case SCSI_IOCTL_DATA_IN: + cmd.direction = kSCSIDataTransfer_FromTargetToInitiator; + break; + case SCSI_IOCTL_DATA_UNSPECIFIED: + cmd.direction = kSCSIDataTransfer_NoDataTransfer; + break; + default: + return STATUS_INVALID_PARAMETER; + } + + io = ioctl(fd, DKIOCSCSICOMMAND, &cmd); + + if (cmd.response == kSCSIServiceResponse_SERVICE_DELIVERY_OR_TARGET_FAILURE) + { + /* Command failed */ + switch (cmd.status) + { + case kSCSITaskStatus_TaskTimeoutOccurred: return STATUS_TIMEOUT; + break; + case kSCSITaskStatus_ProtocolTimeoutOccurred: return STATUS_IO_TIMEOUT; + break; + case kSCSITaskStatus_DeviceNotResponding: return STATUS_DEVICE_BUSY; + break; + case kSCSITaskStatus_DeviceNotPresent: + return STATUS_NO_SUCH_DEVICE; + break; + case kSCSITaskStatus_DeliveryFailure: + return STATUS_DEVICE_PROTOCOL_ERROR; + break; + case kSCSITaskStatus_No_Status: + default: + return STATUS_UNSUCCESSFUL; + break; + } + } + + if (cmd.status != kSCSITaskStatus_No_Status) + pPacket->ScsiStatus = cmd.status; + + ret = CDROM_GetStatusCode(io); #endif return ret; } @@ -1770,6 +1851,9 @@ static NTSTATUS CDROM_ScsiPassThrough(int fd, PSCSI_PASS_THROUGH pPacket) #elif defined HAVE_SCSIREQ_T_CMD scsireq_t cmd; int io; +#elif defined __APPLE__ + dk_scsi_command_t cmd; + int io; #endif if (pPacket->Length < sizeof(SCSI_PASS_THROUGH)) @@ -1883,6 +1967,67 @@ static NTSTATUS CDROM_ScsiPassThrough(int fd, PSCSI_PASS_THROUGH pPacket) pPacket->ScsiStatus = cmd.status; ret = CDROM_GetStatusCode(io); + +#elif defined(__APPLE__) + + memset(&cmd, 0, sizeof(cmd)); + memcpy(cmd.cdb, pPacket->Cdb, pPacket->CdbLength); + + cmd.cdbSize = pPacket->CdbLength; + cmd.buffer = (char*)pPacket + pPacket->DataBufferOffset; + cmd.bufferSize = pPacket->DataTransferLength; + cmd.sense = (char*)pPacket + pPacket->SenseInfoOffset; + cmd.senseLen = pPacket->SenseInfoLength; + cmd.timeout = pPacket->TimeOutValue*1000; /* in milliseconds */ + + switch (pPacket->DataIn) + { + case SCSI_IOCTL_DATA_OUT: + cmd.direction = kSCSIDataTransfer_FromInitiatorToTarget; + break; + case SCSI_IOCTL_DATA_IN: + cmd.direction = kSCSIDataTransfer_FromTargetToInitiator; + break; + case SCSI_IOCTL_DATA_UNSPECIFIED: + cmd.direction = kSCSIDataTransfer_NoDataTransfer; + break; + default: + return STATUS_INVALID_PARAMETER; + } + + io = ioctl(fd, DKIOCSCSICOMMAND, &cmd); + + if (cmd.response == kSCSIServiceResponse_SERVICE_DELIVERY_OR_TARGET_FAILURE) + { + /* Command failed */ + switch (cmd.status) + { + case kSCSITaskStatus_TaskTimeoutOccurred: + return STATUS_TIMEOUT; + break; + case kSCSITaskStatus_ProtocolTimeoutOccurred: + return STATUS_IO_TIMEOUT; + break; + case kSCSITaskStatus_DeviceNotResponding: + return STATUS_DEVICE_BUSY; + break; + case kSCSITaskStatus_DeviceNotPresent: + return STATUS_NO_SUCH_DEVICE; + break; + case kSCSITaskStatus_DeliveryFailure: + return STATUS_DEVICE_PROTOCOL_ERROR; + break; + case kSCSITaskStatus_No_Status: + default: + return STATUS_UNSUCCESSFUL; + break; + } + } + + if (cmd.status != kSCSITaskStatus_No_Status) + pPacket->ScsiStatus = cmd.status; + + ret = CDROM_GetStatusCode(io); #endif return ret; }

1 0