winehq.org
Sign In
Sign Up
Sign In
Sign Up
Manage this list
×
Keyboard Shortcuts
Thread View
j
: Next unread message
k
: Previous unread message
j a
: Jump to all threads
j l
: Jump to MailingList overview
2025
February
January
2024
December
November
October
September
August
July
June
May
April
March
February
January
2023
December
November
October
September
August
July
June
May
April
March
February
January
2022
December
November
October
September
August
July
June
May
April
March
February
January
2021
December
November
October
September
August
July
June
May
April
March
February
January
2020
December
November
October
September
August
July
June
May
April
March
February
January
2019
December
November
October
September
August
July
June
May
April
March
February
January
2018
December
November
October
September
August
July
June
May
April
March
February
January
2017
December
November
October
September
August
July
June
May
April
March
February
January
2016
December
November
October
September
August
July
June
May
April
March
February
January
2015
December
November
October
September
August
July
June
May
April
March
February
January
2014
December
November
October
September
August
July
June
May
April
March
February
January
2013
December
November
October
September
August
July
June
May
April
March
February
January
2012
December
November
October
September
August
July
June
May
April
March
February
January
2011
December
November
October
September
August
July
June
May
April
March
February
January
2010
December
November
October
September
August
July
June
May
April
March
February
January
2009
December
November
October
September
August
July
June
May
April
March
February
January
2008
December
November
October
September
August
July
June
May
April
March
February
January
2007
December
November
October
September
August
July
June
May
April
March
February
January
2006
December
November
October
September
August
July
June
May
April
March
February
January
2005
December
November
October
September
August
July
June
May
April
March
February
January
2004
December
November
October
September
August
July
June
May
April
March
February
January
2003
December
November
October
September
August
July
June
May
April
March
February
January
2002
December
November
October
September
August
July
June
May
April
March
February
January
2001
December
November
October
September
August
July
June
May
April
March
February
List overview
wine-commits
April 2007
----- 2025 -----
February 2025
January 2025
----- 2024 -----
December 2024
November 2024
October 2024
September 2024
August 2024
July 2024
June 2024
May 2024
April 2024
March 2024
February 2024
January 2024
----- 2023 -----
December 2023
November 2023
October 2023
September 2023
August 2023
July 2023
June 2023
May 2023
April 2023
March 2023
February 2023
January 2023
----- 2022 -----
December 2022
November 2022
October 2022
September 2022
August 2022
July 2022
June 2022
May 2022
April 2022
March 2022
February 2022
January 2022
----- 2021 -----
December 2021
November 2021
October 2021
September 2021
August 2021
July 2021
June 2021
May 2021
April 2021
March 2021
February 2021
January 2021
----- 2020 -----
December 2020
November 2020
October 2020
September 2020
August 2020
July 2020
June 2020
May 2020
April 2020
March 2020
February 2020
January 2020
----- 2019 -----
December 2019
November 2019
October 2019
September 2019
August 2019
July 2019
June 2019
May 2019
April 2019
March 2019
February 2019
January 2019
----- 2018 -----
December 2018
November 2018
October 2018
September 2018
August 2018
July 2018
June 2018
May 2018
April 2018
March 2018
February 2018
January 2018
----- 2017 -----
December 2017
November 2017
October 2017
September 2017
August 2017
July 2017
June 2017
May 2017
April 2017
March 2017
February 2017
January 2017
----- 2016 -----
December 2016
November 2016
October 2016
September 2016
August 2016
July 2016
June 2016
May 2016
April 2016
March 2016
February 2016
January 2016
----- 2015 -----
December 2015
November 2015
October 2015
September 2015
August 2015
July 2015
June 2015
May 2015
April 2015
March 2015
February 2015
January 2015
----- 2014 -----
December 2014
November 2014
October 2014
September 2014
August 2014
July 2014
June 2014
May 2014
April 2014
March 2014
February 2014
January 2014
----- 2013 -----
December 2013
November 2013
October 2013
September 2013
August 2013
July 2013
June 2013
May 2013
April 2013
March 2013
February 2013
January 2013
----- 2012 -----
December 2012
November 2012
October 2012
September 2012
August 2012
July 2012
June 2012
May 2012
April 2012
March 2012
February 2012
January 2012
----- 2011 -----
December 2011
November 2011
October 2011
September 2011
August 2011
July 2011
June 2011
May 2011
April 2011
March 2011
February 2011
January 2011
----- 2010 -----
December 2010
November 2010
October 2010
September 2010
August 2010
July 2010
June 2010
May 2010
April 2010
March 2010
February 2010
January 2010
----- 2009 -----
December 2009
November 2009
October 2009
September 2009
August 2009
July 2009
June 2009
May 2009
April 2009
March 2009
February 2009
January 2009
----- 2008 -----
December 2008
November 2008
October 2008
September 2008
August 2008
July 2008
June 2008
May 2008
April 2008
March 2008
February 2008
January 2008
----- 2007 -----
December 2007
November 2007
October 2007
September 2007
August 2007
July 2007
June 2007
May 2007
April 2007
March 2007
February 2007
January 2007
----- 2006 -----
December 2006
November 2006
October 2006
September 2006
August 2006
July 2006
June 2006
May 2006
April 2006
March 2006
February 2006
January 2006
----- 2005 -----
December 2005
November 2005
October 2005
September 2005
August 2005
July 2005
June 2005
May 2005
April 2005
March 2005
February 2005
January 2005
----- 2004 -----
December 2004
November 2004
October 2004
September 2004
August 2004
July 2004
June 2004
May 2004
April 2004
March 2004
February 2004
January 2004
----- 2003 -----
December 2003
November 2003
October 2003
September 2003
August 2003
July 2003
June 2003
May 2003
April 2003
March 2003
February 2003
January 2003
----- 2002 -----
December 2002
November 2002
October 2002
September 2002
August 2002
July 2002
June 2002
May 2002
April 2002
March 2002
February 2002
January 2002
----- 2001 -----
December 2001
November 2001
October 2001
September 2001
August 2001
July 2001
June 2001
May 2001
April 2001
March 2001
February 2001
wine-commits@winehq.org
4 participants
687 discussions
Start a n
N
ew thread
Hans Leidekker : shell32: Add a stub implementation for SHMapIDListToImageListIndexAsync.
by Alexandre Julliard
26 Apr '07
26 Apr '07
Module: wine Branch: master Commit: bab2ddb77ed55dd711101deff1f20dbb5cee792d URL:
http://source.winehq.org/git/wine.git/?a=commit;h=bab2ddb77ed55dd711101deff…
Author: Hans Leidekker <hans(a)it.vu.nl> Date: Wed Apr 25 20:49:56 2007 +0200 shell32: Add a stub implementation for SHMapIDListToImageListIndexAsync. --- dlls/shell32/iconcache.c | 13 +++++++++++++ dlls/shell32/shell32.spec | 1 + 2 files changed, 14 insertions(+), 0 deletions(-) diff --git a/dlls/shell32/iconcache.c b/dlls/shell32/iconcache.c index 0a7eb6c..6645761 100644 --- a/dlls/shell32/iconcache.c +++ b/dlls/shell32/iconcache.c @@ -617,6 +617,19 @@ int WINAPI SHMapPIDLToSystemImageListIndex( } /************************************************************************* + * SHMapIDListToImageListIndexAsync [SHELL32.148] + */ +HRESULT WINAPI SHMapIDListToImageListIndexAsync(IUnknown *pts, IShellFolder *psf, + LPCITEMIDLIST pidl, UINT flags, + void *pfn, void *pvData, void *pvHint, + int *piIndex, int *piIndexSel) +{ + FIXME("(%p, %p, %p, 0x%08x, %p, %p, %p, %p, %p)\n", + pts, psf, pidl, flags, pfn, pvData, pvHint, piIndex, piIndexSel); + return E_FAIL; +} + +/************************************************************************* * Shell_GetCachedImageIndex [SHELL32.72] * */ diff --git a/dlls/shell32/shell32.spec b/dlls/shell32/shell32.spec index 415fe95..2bf62dc 100644 --- a/dlls/shell32/shell32.spec +++ b/dlls/shell32/shell32.spec @@ -136,6 +136,7 @@ 145 stdcall -noname PathFindOnPath(ptr ptr) PathFindOnPathAW 146 stdcall -noname RLBuildListOfPaths() 147 stdcall -noname SHCLSIDFromString(long long) SHCLSIDFromStringAW + 148 stdcall -noname SHMapIDListToImageListIndexAsync(ptr ptr ptr long ptr ptr ptr ptr ptr) 149 stdcall -noname SHFind_InitMenuPopup(long long long long) 151 stdcall -noname SHLoadOLE(long)
1
0
0
0
Jacek Caban : hhctrl.ocx: Don' t insert content item that could not be merged.
by Alexandre Julliard
26 Apr '07
26 Apr '07
Module: wine Branch: master Commit: b2aae66f1ab495480861f0e0b559739654d8f171 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=b2aae66f1ab495480861f0e0b…
Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Apr 25 15:37:36 2007 +0200 hhctrl.ocx: Don't insert content item that could not be merged. --- dlls/hhctrl.ocx/content.c | 44 ++++++++++++++++++++++++++------------------ 1 files changed, 26 insertions(+), 18 deletions(-) diff --git a/dlls/hhctrl.ocx/content.c b/dlls/hhctrl.ocx/content.c index c572baf..a34c853 100644 --- a/dlls/hhctrl.ocx/content.c +++ b/dlls/hhctrl.ocx/content.c @@ -32,6 +32,24 @@ typedef enum { INSERT_CHILD } insert_type_t; +static void free_content_item(ContentItem *item) +{ + ContentItem *next; + + while(item) { + next = item->next; + + free_content_item(item->child); + + hhctrl_free(item->name); + hhctrl_free(item->local); + hhctrl_free(item->merge.chm_file); + hhctrl_free(item->merge.chm_index); + + item = next; + } +} + typedef struct { char *buf; int size; @@ -207,6 +225,9 @@ static ContentItem *insert_item(ContentItem *item, ContentItem *new_item, insert if(!item) return new_item; + if(!new_item) + return item; + switch(insert_type) { case INSERT_NEXT: item->next = new_item; @@ -265,6 +286,11 @@ static ContentItem *parse_sitemap_object(HHInfo *info, stream_t *stream, Content }else { WARN("Could not get %s::%s stream\n", debugstr_w(item->merge.chm_file), debugstr_w(item->merge.chm_file)); + + if(!item->name) { + free_content_item(item); + item = NULL; + } } } @@ -411,24 +437,6 @@ void InitContent(HHInfo *info) fill_content_tree(info->tabs[TAB_CONTENTS].hwnd, NULL, info->content); } -static void free_content_item(ContentItem *item) -{ - ContentItem *next; - - while(item) { - next = item->next; - - free_content_item(item->child); - - hhctrl_free(item->name); - hhctrl_free(item->local); - hhctrl_free(item->merge.chm_file); - hhctrl_free(item->merge.chm_index); - - item = next; - } -} - void ReleaseContent(HHInfo *info) { free_content_item(info->content);
1
0
0
0
appdb/include testData.php
by WineHQ
26 Apr '07
26 Apr '07
ChangeSet ID: 31107 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/04/25 19:17:42 Modified files: include : testData.php Log message: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Fix loading of 'Runs?' value in the testData form, otherwise the value is displayed as though no value is set Patch:
http://cvs.winehq.org/patch.py?id=31107
Old revision New revision Changes Path 1.49 1.50 +1 -1 appdb/include/testData.php Index: appdb/include/testData.php diff -u -p appdb/include/testData.php:1.49 appdb/include/testData.php:1.50 --- appdb/include/testData.php:1.49 26 Apr 2007 0:17:42 -0000 +++ appdb/include/testData.php 26 Apr 2007 0:17:42 -0000 @@ -719,7 +719,7 @@ class testData{ { echo "<select name='$sVarname'>\n"; echo "<option value=\"\">Choose ...</option>\n"; - $aRating = array("Yes", "No", "Not Installable"); + $aRating = array("Yes", "No", "Not installable"); $iMax = count($aRating); for($i=0; $i < $iMax; $i++)
1
0
0
0
Paul Vriens : setupapi/tests: SetupDiCreateDeviceInfoListExW is not implemented on win98.
by Alexandre Julliard
25 Apr '07
25 Apr '07
Module: wine Branch: master Commit: ce3fa8e861ef05ce08d27cf6c1fe016a38474845 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=ce3fa8e861ef05ce08d27cf6c…
Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Wed Apr 25 13:28:44 2007 +0200 setupapi/tests: SetupDiCreateDeviceInfoListExW is not implemented on win98. --- dlls/setupapi/tests/devinst.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/setupapi/tests/devinst.c b/dlls/setupapi/tests/devinst.c index c47cd75..d0756b7 100644 --- a/dlls/setupapi/tests/devinst.c +++ b/dlls/setupapi/tests/devinst.c @@ -62,6 +62,11 @@ static void test_SetupDiCreateDeviceInfoListEx(void) devlist = pSetupDiCreateDeviceInfoListExW(NULL, NULL, NULL, notnull); error = GetLastError(); + if (error == ERROR_CALL_NOT_IMPLEMENTED) + { + skip("SetupDiCreateDeviceInfoListExW is not implemented\n"); + return; + } ok(devlist == INVALID_HANDLE_VALUE, "SetupDiCreateDeviceInfoListExW failed : %p %d (expected %p)\n", devlist, error, INVALID_HANDLE_VALUE); ok(error == ERROR_INVALID_PARAMETER, "GetLastError returned wrong value : %d, (expected %d)\n", error, ERROR_INVALID_PARAMETER);
1
0
0
0
Paul Vriens : kernel32/tests: GetLongPathNameW is not implemented on win98.
by Alexandre Julliard
25 Apr '07
25 Apr '07
Module: wine Branch: master Commit: 67c26f4ec30886fc1279d72bdab6524983ce9343 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=67c26f4ec30886fc1279d72bd…
Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Wed Apr 25 13:21:19 2007 +0200 kernel32/tests: GetLongPathNameW is not implemented on win98. --- dlls/kernel32/tests/path.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/tests/path.c b/dlls/kernel32/tests/path.c index 9212165..33fcf6f 100644 --- a/dlls/kernel32/tests/path.c +++ b/dlls/kernel32/tests/path.c @@ -941,6 +941,11 @@ static void test_GetLongPathNameW(void) { SetLastError(0xdeadbeef); length = pGetLongPathNameW(NULL,NULL,0); + if (GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) + { + skip("GetLongPathNameW is not implemented\n"); + return; + } ok(0==length,"GetLongPathNameW returned %d but expected 0\n",length); ok(GetLastError()==ERROR_INVALID_PARAMETER,"GetLastError returned %d but expected ERROR_INVALID_PARAMETER\n",GetLastError());
1
0
0
0
Paul Vriens : kernel32/tests: GetComputerNameW is not implemented on win98.
by Alexandre Julliard
25 Apr '07
25 Apr '07
Module: wine Branch: master Commit: c1f6501808ca8ca8b03984f6218b905d095fb9c9 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=c1f6501808ca8ca8b03984f62…
Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Wed Apr 25 13:16:37 2007 +0200 kernel32/tests: GetComputerNameW is not implemented on win98. --- dlls/kernel32/tests/environ.c | 22 ++++++++++++++-------- 1 files changed, 14 insertions(+), 8 deletions(-) diff --git a/dlls/kernel32/tests/environ.c b/dlls/kernel32/tests/environ.c index dab57f7..b53a4b4 100644 --- a/dlls/kernel32/tests/environ.c +++ b/dlls/kernel32/tests/environ.c @@ -265,16 +265,22 @@ static void test_GetComputerName(void) HeapFree(GetProcessHeap(), 0, name); size = 0; + SetLastError(0xdeadbeef); ret = GetComputerNameW((LPWSTR)0xdeadbeef, &size); error = GetLastError(); - todo_wine - ok(!ret && error == ERROR_BUFFER_OVERFLOW, "GetComputerNameW should have failed with ERROR_BUFFER_OVERFLOW instead of %d\n", error); - size++; /* nul terminating character */ - nameW = HeapAlloc(GetProcessHeap(), 0, size * sizeof(nameW[0])); - ok(nameW != NULL, "HeapAlloc failed with error %d\n", GetLastError()); - ret = GetComputerNameW(nameW, &size); - ok(ret, "GetComputerNameW failed with error %d\n", GetLastError()); - HeapFree(GetProcessHeap(), 0, nameW); + if (error == ERROR_CALL_NOT_IMPLEMENTED) + skip("GetComputerNameW is not implemented\n"); + else + { + todo_wine + ok(!ret && error == ERROR_BUFFER_OVERFLOW, "GetComputerNameW should have failed with ERROR_BUFFER_OVERFLOW instead of %d\n", error); + size++; /* nul terminating character */ + nameW = HeapAlloc(GetProcessHeap(), 0, size * sizeof(nameW[0])); + ok(nameW != NULL, "HeapAlloc failed with error %d\n", GetLastError()); + ret = GetComputerNameW(nameW, &size); + ok(ret, "GetComputerNameW failed with error %d\n", GetLastError()); + HeapFree(GetProcessHeap(), 0, nameW); + } pGetComputerNameExA = GetProcAddress(GetModuleHandle("kernel32.dll"), "GetComputerNameExA"); if (!pGetComputerNameExA)
1
0
0
0
Paul Vriens : kernel32/tests: CreateRemoteThread is not implemented on win98.
by Alexandre Julliard
25 Apr '07
25 Apr '07
Module: wine Branch: master Commit: 9dafa1fc11d6951fc354849860cf48ecdf8d9641 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=9dafa1fc11d6951fc35484986…
Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Wed Apr 25 13:04:03 2007 +0200 kernel32/tests: CreateRemoteThread is not implemented on win98. --- dlls/kernel32/tests/thread.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/tests/thread.c b/dlls/kernel32/tests/thread.c index 69861de..bbda00e 100644 --- a/dlls/kernel32/tests/thread.c +++ b/dlls/kernel32/tests/thread.c @@ -241,8 +241,14 @@ static VOID test_CreateRemoteThread(void) ok(ret != 0, "DuplicateHandle failed, err=%u\n", GetLastError()); /* create suspended remote thread with entry point SetEvent() */ + SetLastError(0xdeadbeef); hThread = CreateRemoteThread(hProcess, NULL, 0, threadFunc_SetEvent, hRemoteEvent, CREATE_SUSPENDED, &tid); + if (GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) + { + skip("CreateRemoteThread is not implemented\n"); + goto cleanup; + } ok(hThread != NULL, "CreateRemoteThread failed, err=%u\n", GetLastError()); ok(tid != 0, "null tid\n"); ret = SuspendThread(hThread); @@ -291,6 +297,7 @@ static VOID test_CreateRemoteThread(void) if (ret) ok(exitcode == 0, "SetEvent succeeded, expected to fail\n"); CloseHandle(hThread); +cleanup: TerminateProcess(hProcess, 0); CloseHandle(hEvent); CloseHandle(hProcess);
1
0
0
0
Emmanuel Maillard : winecoreaudio: Implement MIDIOut_Reset.
by Alexandre Julliard
25 Apr '07
25 Apr '07
Module: wine Branch: master Commit: 0a202679b86521d0f6d206ab8f74a263527aa7c1 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=0a202679b86521d0f6d206ab8…
Author: Emmanuel Maillard <mahanuu(a)free.fr> Date: Wed Apr 25 01:17:45 2007 +0200 winecoreaudio: Implement MIDIOut_Reset. --- dlls/winecoreaudio.drv/midi.c | 26 ++++++++++++++++++++++++++ 1 files changed, 26 insertions(+), 0 deletions(-) diff --git a/dlls/winecoreaudio.drv/midi.c b/dlls/winecoreaudio.drv/midi.c index 7cbddcf..fd00cb3 100644 --- a/dlls/winecoreaudio.drv/midi.c +++ b/dlls/winecoreaudio.drv/midi.c @@ -499,6 +499,31 @@ static DWORD MIDIOut_SetVolume(WORD wDevID, DWORD dwVolume) return MMSYSERR_NOTSUPPORTED; } +static DWORD MIDIOut_Reset(WORD wDevID) +{ + unsigned chn; + + TRACE("%d\n", wDevID); + + if (wDevID >= MIDIOut_NumDevs) { + WARN("bad device ID : %d\n", wDevID); + return MMSYSERR_BADDEVICEID; + } + if (destinations[wDevID].caps.wTechnology == MOD_SYNTH) + { + for (chn = 0; chn < 16; chn++) { + /* turn off every note */ + MusicDeviceMIDIEvent(destinations[wDevID].synth, 0xB0 | chn, 0x7B, 0, 0); + /* remove sustain on channel */ + MusicDeviceMIDIEvent(destinations[wDevID].synth, 0xB0 | chn, 0x40, 0, 0); + } + } + else FIXME("MOD_MIDIPORT\n"); + + /* FIXME: the LongData buffers must also be returned to the app */ + return MMSYSERR_NOERROR; +} + /************************************************************************** * modMessage */ @@ -533,6 +558,7 @@ DWORD WINAPI CoreAudio_modMessage(UINT wDevID, UINT wMsg, DWORD dwUser, DWORD dw case MODM_SETVOLUME: return MIDIOut_SetVolume(wDevID, dwParam1); case MODM_RESET: + return MIDIOut_Reset(wDevID); default: TRACE("Unsupported message (08%x)\n", wMsg); }
1
0
0
0
Emmanuel Maillard : winecoreaudio: Implement MIDIOut_GetVolume and MIDIOut_SetVolume.
by Alexandre Julliard
25 Apr '07
25 Apr '07
Module: wine Branch: master Commit: 9aa9cde8416a251d8ed6fcba05d533d792b91541 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=9aa9cde8416a251d8ed6fcba0…
Author: Emmanuel Maillard <mahanuu(a)free.fr> Date: Wed Apr 25 01:16:44 2007 +0200 winecoreaudio: Implement MIDIOut_GetVolume and MIDIOut_SetVolume. --- dlls/winecoreaudio.drv/coremidi.h | 3 ++ dlls/winecoreaudio.drv/midi.c | 52 +++++++++++++++++++++++++++++++++++++ 2 files changed, 55 insertions(+), 0 deletions(-) diff --git a/dlls/winecoreaudio.drv/coremidi.h b/dlls/winecoreaudio.drv/coremidi.h index 2a02003..69fd4ce 100644 --- a/dlls/winecoreaudio.drv/coremidi.h +++ b/dlls/winecoreaudio.drv/coremidi.h @@ -55,6 +55,9 @@ typedef void *AUGraph; extern OSStatus MusicDeviceMIDIEvent(AudioUnit au, UInt32 inStatus, UInt32 inData1, UInt32 inData2, UInt32 inOffsetSampleFrame); extern OSStatus MusicDeviceSysEx(AudioUnit au, const UInt8 *inData, UInt32 inLength); +/* audiounit.c */ +extern int AudioUnit_SetVolume(AudioUnit au, float left, float right); +extern int AudioUnit_GetVolume(AudioUnit au, float *left, float *right); #endif /* coremidi.c */ diff --git a/dlls/winecoreaudio.drv/midi.c b/dlls/winecoreaudio.drv/midi.c index 6bca11e..7cbddcf 100644 --- a/dlls/winecoreaudio.drv/midi.c +++ b/dlls/winecoreaudio.drv/midi.c @@ -449,6 +449,56 @@ static DWORD MIDIOut_GetNumDevs(void) return MIDIOut_NumDevs; } +static DWORD MIDIOut_GetVolume(WORD wDevID, DWORD *lpdwVolume) +{ + TRACE("%d\n", wDevID); + + if (wDevID >= MIDIOut_NumDevs) { + WARN("bad device ID : %d\n", wDevID); + return MMSYSERR_BADDEVICEID; + } + if (lpdwVolume == NULL) { + WARN("Invalid Parameter\n"); + return MMSYSERR_INVALPARAM; + } + + if (destinations[wDevID].caps.wTechnology == MOD_SYNTH) + { + float left; + float right; + AudioUnit_GetVolume(destinations[wDevID].synth, &left, &right); + + *lpdwVolume = ((WORD) left * 0xFFFFl) + (((WORD) right * 0xFFFFl) << 16); + + return MMSYSERR_NOERROR; + } + + return MMSYSERR_NOTSUPPORTED; +} + +static DWORD MIDIOut_SetVolume(WORD wDevID, DWORD dwVolume) +{ + TRACE("%d\n", wDevID); + + if (wDevID >= MIDIOut_NumDevs) { + WARN("bad device ID : %d\n", wDevID); + return MMSYSERR_BADDEVICEID; + } + if (destinations[wDevID].caps.wTechnology == MOD_SYNTH) + { + float left; + float right; + + left = LOWORD(dwVolume) / 65535.0f; + right = HIWORD(dwVolume) / 65535.0f; + AudioUnit_SetVolume(destinations[wDevID].synth, left, right); + + return MMSYSERR_NOERROR; + } + + return MMSYSERR_NOTSUPPORTED; +} + /************************************************************************** * modMessage */ @@ -479,7 +529,9 @@ DWORD WINAPI CoreAudio_modMessage(UINT wDevID, UINT wMsg, DWORD dwUser, DWORD dw case MODM_GETNUMDEVS: return MIDIOut_GetNumDevs(); case MODM_GETVOLUME: + return MIDIOut_GetVolume(wDevID, (DWORD*)dwParam1); case MODM_SETVOLUME: + return MIDIOut_SetVolume(wDevID, dwParam1); case MODM_RESET: default: TRACE("Unsupported message (08%x)\n", wMsg);
1
0
0
0
Emmanuel Maillard : winecoreaudio: Implement MIDIOut_LongData.
by Alexandre Julliard
25 Apr '07
25 Apr '07
Module: wine Branch: master Commit: 97d5a029877a1c28ffadd9e85607b70291db54ae URL:
http://source.winehq.org/git/wine.git/?a=commit;h=97d5a029877a1c28ffadd9e85…
Author: Emmanuel Maillard <mahanuu(a)free.fr> Date: Wed Apr 25 01:08:05 2007 +0200 winecoreaudio: Implement MIDIOut_LongData. --- dlls/winecoreaudio.drv/midi.c | 82 ++++++++++++++++++++++++++++++++++++++++- 1 files changed, 80 insertions(+), 2 deletions(-) diff --git a/dlls/winecoreaudio.drv/midi.c b/dlls/winecoreaudio.drv/midi.c index 250f523..6bca11e 100644 --- a/dlls/winecoreaudio.drv/midi.c +++ b/dlls/winecoreaudio.drv/midi.c @@ -296,6 +296,85 @@ static DWORD MIDIOut_Data(WORD wDevID, DWORD dwParam) return MMSYSERR_NOERROR; } +static DWORD MIDIOut_LongData(WORD wDevID, LPMIDIHDR lpMidiHdr, DWORD dwSize) +{ + LPBYTE lpData; + OSStatus err = noErr; + + TRACE("wDevID=%d lpMidiHdr=%p dwSize=%d\n", wDevID, lpMidiHdr, dwSize); + + /* Note: MS doc does not say much about the dwBytesRecorded member of the MIDIHDR structure + * but it seems to be used only for midi input. + * Taking a look at the WAVEHDR structure (which is quite similar) confirms this assumption. + */ + + if (wDevID >= MIDIOut_NumDevs) { + WARN("bad device ID : %d\n", wDevID); + return MMSYSERR_BADDEVICEID; + } + + if (lpMidiHdr == NULL) { + WARN("Invalid Parameter\n"); + return MMSYSERR_INVALPARAM; + } + + lpData = (LPBYTE) lpMidiHdr->lpData; + + if (lpData == NULL) + return MIDIERR_UNPREPARED; + if (!(lpMidiHdr->dwFlags & MHDR_PREPARED)) + return MIDIERR_UNPREPARED; + if (lpMidiHdr->dwFlags & MHDR_INQUEUE) + return MIDIERR_STILLPLAYING; + lpMidiHdr->dwFlags &= ~MHDR_DONE; + lpMidiHdr->dwFlags |= MHDR_INQUEUE; + + /* FIXME: MS doc is not 100% clear. Will lpData only contain system exclusive + * data, or can it also contain raw MIDI data, to be split up and sent to + * modShortData() ? + * If the latest is true, then the following WARNing will fire up + */ + if (lpData[0] != 0xF0 || lpData[lpMidiHdr->dwBufferLength - 1] != 0xF7) { + WARN("Alledged system exclusive buffer is not correct\n\tPlease report with MIDI file\n"); + } + + TRACE("dwBufferLength=%u !\n", lpMidiHdr->dwBufferLength); + TRACE(" %02X %02X %02X ... %02X %02X %02X\n", + lpData[0], lpData[1], lpData[2], lpData[lpMidiHdr->dwBufferLength-3], + lpData[lpMidiHdr->dwBufferLength-2], lpData[lpMidiHdr->dwBufferLength-1]); + + + if (lpData[0] != 0xF0) { + /* System Exclusive */ + ERR("Add missing 0xF0 marker at the beginning of system exclusive byte stream\n"); + } + if (lpData[lpMidiHdr->dwBufferLength - 1] != 0xF7) { + /* Send end of System Exclusive */ + ERR("Add missing 0xF7 marker at the end of system exclusive byte stream\n"); + } + if (destinations[wDevID].caps.wTechnology == MOD_SYNTH) /* FIXME */ + { + err = MusicDeviceSysEx(destinations[wDevID].synth, (const UInt8 *) lpData, lpMidiHdr->dwBufferLength); + if (err != noErr) + { + ERR("MusicDeviceSysEx(%p, %p, %d) return %c%c%c%c\n", destinations[wDevID].synth, lpData, lpMidiHdr->dwBufferLength, (char) (err >> 24), (char) (err >> 16), (char) (err >> 8), (char) err); + return MMSYSERR_ERROR; + } + } + else + { + FIXME("MOD_MIDIPORT\n"); + } + + lpMidiHdr->dwFlags &= ~MHDR_INQUEUE; + lpMidiHdr->dwFlags |= MHDR_DONE; + if (MIDI_NotifyClient(wDevID, MOM_DONE, (DWORD)lpMidiHdr, 0L) != MMSYSERR_NOERROR) { + WARN("can't notify client !\n"); + return MMSYSERR_INVALPARAM; + } + return MMSYSERR_NOERROR; +} + /************************************************************************** * MIDIOut_Prepare [internal] */ @@ -390,8 +469,7 @@ DWORD WINAPI CoreAudio_modMessage(UINT wDevID, UINT wMsg, DWORD dwUser, DWORD dw case MODM_DATA: return MIDIOut_Data(wDevID, dwParam1); case MODM_LONGDATA: - TRACE("Unsupported message (08%x)\n", wMsg); - return MMSYSERR_NOTSUPPORTED; + return MIDIOut_LongData(wDevID, (LPMIDIHDR)dwParam1, dwParam2); case MODM_PREPARE: return MIDIOut_Prepare(wDevID, (LPMIDIHDR)dwParam1, dwParam2); case MODM_UNPREPARE:
1
0
0
0
← Newer
1
...
8
9
10
11
12
13
14
...
69
Older →
Jump to page:
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
Results per page:
10
25
50
100
200