wine-commits January 2011

wine-commits@winehq.org

2 participants
879 discussions

Ken Thomases : windowscodecs: Disable ICNS support when building for Mac OS X 10.4 Tiger.
by Alexandre Julliard 21 Jan '11

21 Jan '11

Module: wine Branch: master Commit: 677c1e578d45aafc6886691eebce7ea33ead44c5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=677c1e578d45aafc6886691ee… Author: Ken Thomases <ken(a)codeweavers.com> Date: Thu Jan 20 18:58:57 2011 -0600 windowscodecs: Disable ICNS support when building for Mac OS X 10.4 Tiger. --- dlls/windowscodecs/icnsformat.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/icnsformat.c b/dlls/windowscodecs/icnsformat.c index fa5a71d..de38715 100644 --- a/dlls/windowscodecs/icnsformat.c +++ b/dlls/windowscodecs/icnsformat.c @@ -68,7 +68,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(wincodecs); -#ifdef HAVE_APPLICATIONSERVICES_APPLICATIONSERVICES_H +#if defined(HAVE_APPLICATIONSERVICES_APPLICATIONSERVICES_H) && \ + MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_4 typedef struct IcnsEncoder { IWICBitmapEncoder IWICBitmapEncoder_iface; @@ -752,7 +753,8 @@ HRESULT IcnsEncoder_CreateInstance(IUnknown *pUnkOuter, REFIID iid, void** ppv) return ret; } -#else /* !defined(HAVE_APPLICATIONSERVICES_APPLICATIONSERVICES_H) */ +#else /* !defined(HAVE_APPLICATIONSERVICES_APPLICATIONSERVICES_H) || + MAC_OS_X_VERSION_MAX_ALLOWED <= MAC_OS_X_VERSION_10_4 */ HRESULT IcnsEncoder_CreateInstance(IUnknown *pUnkOuter, REFIID iid, void** ppv) {

1 0

Anders Jonsson : po: Update Swedish translation.
by Alexandre Julliard 21 Jan '11

21 Jan '11

Module: wine Branch: master Commit: 9c66f68f55beca6fc92315d40a73b41f12865353 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c66f68f55beca6fc92315d40… Author: Anders Jonsson <anders.jonsson(a)norsjonet.se> Date: Thu Jan 20 21:02:23 2011 +0100 po: Update Swedish translation. --- po/sv.po | 349 +++++++++++++------------------------------------------------- 1 files changed, 72 insertions(+), 277 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9c66f68f55beca6fc9231…

1 0

Hwang YunSong : po: Update Korean translation.
by Alexandre Julliard 21 Jan '11

21 Jan '11

Module: wine Branch: master Commit: 94aa08d2ecec362e9d98a0f3bbb6d75f686c4db5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=94aa08d2ecec362e9d98a0f3b… Author: Hwang YunSong <hys545(a)dreamwiz.com> Date: Thu Jan 20 17:04:18 2011 +0900 po: Update Korean translation. --- po/ko.po | 433 ++++++++++++++------------------------------------------------ 1 files changed, 98 insertions(+), 335 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=94aa08d2ecec362e9d98a…

1 0

Erich Hoover : hhctrl.ocx: Add some private toolbar bitmaps ( copied from shdocvw).
by Alexandre Julliard 21 Jan '11

21 Jan '11

Module: wine Branch: master Commit: 1115e320700cca5a2b523ad033da36d931d98e00 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1115e320700cca5a2b523ad03… Author: Erich Hoover <ehoover(a)mines.edu> Date: Thu Jan 20 11:01:03 2011 -0700 hhctrl.ocx: Add some private toolbar bitmaps (copied from shdocvw). --- dlls/hhctrl.ocx/Makefile.in | 2 + dlls/hhctrl.ocx/help.c | 15 ++- dlls/hhctrl.ocx/hhctrl.rc | 3 + dlls/hhctrl.ocx/hhtoolbar.bmp | Bin 0 -> 7034 bytes dlls/hhctrl.ocx/hhtoolbar.svg | 185 +++++++++++++++++++++++++++++++++++++++++ dlls/hhctrl.ocx/resource.h | 6 ++ 6 files changed, 206 insertions(+), 5 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1115e320700cca5a2b523…

1 0

Erich Hoover : hhctrl.ocx: Add better bitmaps for some toolbar buttons.
by Alexandre Julliard 21 Jan '11

21 Jan '11

Module: wine Branch: master Commit: d127f0087a93384aef10daf45b33e3a46fadd90a URL: http://source.winehq.org/git/wine.git/?a=commit;h=d127f0087a93384aef10daf45… Author: Erich Hoover <ehoover(a)mines.edu> Date: Thu Jan 20 10:56:24 2011 -0700 hhctrl.ocx: Add better bitmaps for some toolbar buttons. --- dlls/hhctrl.ocx/help.c | 56 +++++++++++++++++++++++++---------------------- 1 files changed, 30 insertions(+), 26 deletions(-) diff --git a/dlls/hhctrl.ocx/help.c b/dlls/hhctrl.ocx/help.c index 4a0f78b..c75be78 100644 --- a/dlls/hhctrl.ocx/help.c +++ b/dlls/hhctrl.ocx/help.c @@ -761,10 +761,9 @@ static void TB_OnClick(HWND hWnd, DWORD dwID) } } -static void TB_AddButton(TBBUTTON *pButtons, DWORD dwIndex, DWORD dwID) +static void TB_AddButton(TBBUTTON *pButtons, DWORD dwIndex, DWORD dwID, DWORD dwBitmap) { - /* FIXME: Load the correct button bitmaps */ - pButtons[dwIndex].iBitmap = STD_PRINT; + pButtons[dwIndex].iBitmap = dwBitmap; pButtons[dwIndex].idCommand = dwID; pButtons[dwIndex].fsState = TBSTATE_ENABLED; pButtons[dwIndex].fsStyle = BTNS_BUTTON; @@ -774,12 +773,22 @@ static void TB_AddButton(TBBUTTON *pButtons, DWORD dwIndex, DWORD dwID) static void TB_AddButtonsFromFlags(HHInfo *pHHInfo, TBBUTTON *pButtons, DWORD dwButtonFlags, LPDWORD pdwNumButtons) { + HWND hToolbar = pHHInfo->WinType.hwndToolBar; + int nHistBitmaps = 0, nStdBitmaps = 0; + TBADDBITMAP tbAB; + + tbAB.hInst = HINST_COMMCTRL; + tbAB.nID = IDB_HIST_LARGE_COLOR; + nHistBitmaps = SendMessageW(hToolbar, TB_ADDBITMAP, 0, (LPARAM)&tbAB); + tbAB.nID = IDB_STD_LARGE_COLOR; + nStdBitmaps = SendMessageW(hToolbar, TB_ADDBITMAP, 0, (LPARAM)&tbAB); + *pdwNumButtons = 0; if (dwButtonFlags & HHWIN_BUTTON_EXPAND) { - TB_AddButton(pButtons, (*pdwNumButtons)++, IDTB_EXPAND); - TB_AddButton(pButtons, (*pdwNumButtons)++, IDTB_CONTRACT); + TB_AddButton(pButtons, (*pdwNumButtons)++, IDTB_EXPAND, nHistBitmaps + HIST_VIEWTREE); + TB_AddButton(pButtons, (*pdwNumButtons)++, IDTB_CONTRACT, nHistBitmaps + HIST_VIEWTREE); if (pHHInfo->WinType.fNotExpanded) pButtons[1].fsState |= TBSTATE_HIDDEN; @@ -788,43 +797,44 @@ static void TB_AddButtonsFromFlags(HHInfo *pHHInfo, TBBUTTON *pButtons, DWORD dw } if (dwButtonFlags & HHWIN_BUTTON_BACK) - TB_AddButton(pButtons, (*pdwNumButtons)++, IDTB_BACK); + TB_AddButton(pButtons, (*pdwNumButtons)++, IDTB_BACK, nHistBitmaps + HIST_BACK); if (dwButtonFlags & HHWIN_BUTTON_FORWARD) - TB_AddButton(pButtons, (*pdwNumButtons)++, IDTB_FORWARD); + TB_AddButton(pButtons, (*pdwNumButtons)++, IDTB_FORWARD, nHistBitmaps + HIST_FORWARD); + /* FIXME: Load the correct button bitmaps */ if (dwButtonFlags & HHWIN_BUTTON_STOP) - TB_AddButton(pButtons, (*pdwNumButtons)++, IDTB_STOP); + TB_AddButton(pButtons, (*pdwNumButtons)++, IDTB_STOP, nStdBitmaps + STD_PRINT); if (dwButtonFlags & HHWIN_BUTTON_REFRESH) - TB_AddButton(pButtons, (*pdwNumButtons)++, IDTB_REFRESH); + TB_AddButton(pButtons, (*pdwNumButtons)++, IDTB_REFRESH, nStdBitmaps + STD_PRINT); if (dwButtonFlags & HHWIN_BUTTON_HOME) - TB_AddButton(pButtons, (*pdwNumButtons)++, IDTB_HOME); + TB_AddButton(pButtons, (*pdwNumButtons)++, IDTB_HOME, nStdBitmaps + STD_PRINT); if (dwButtonFlags & HHWIN_BUTTON_SYNC) - TB_AddButton(pButtons, (*pdwNumButtons)++, IDTB_SYNC); + TB_AddButton(pButtons, (*pdwNumButtons)++, IDTB_SYNC, nStdBitmaps + STD_PRINT); if (dwButtonFlags & HHWIN_BUTTON_OPTIONS) - TB_AddButton(pButtons, (*pdwNumButtons)++, IDTB_OPTIONS); + TB_AddButton(pButtons, (*pdwNumButtons)++, IDTB_OPTIONS, nStdBitmaps + STD_PRINT); if (dwButtonFlags & HHWIN_BUTTON_PRINT) - TB_AddButton(pButtons, (*pdwNumButtons)++, IDTB_PRINT); + TB_AddButton(pButtons, (*pdwNumButtons)++, IDTB_PRINT, nStdBitmaps + STD_PRINT); if (dwButtonFlags & HHWIN_BUTTON_JUMP1) - TB_AddButton(pButtons, (*pdwNumButtons)++, IDTB_JUMP1); + TB_AddButton(pButtons, (*pdwNumButtons)++, IDTB_JUMP1, nStdBitmaps + STD_PRINT); if (dwButtonFlags & HHWIN_BUTTON_JUMP2) - TB_AddButton(pButtons,(*pdwNumButtons)++, IDTB_JUMP2); + TB_AddButton(pButtons,(*pdwNumButtons)++, IDTB_JUMP2, nStdBitmaps + STD_PRINT); if (dwButtonFlags & HHWIN_BUTTON_ZOOM) - TB_AddButton(pButtons, (*pdwNumButtons)++, IDTB_ZOOM); + TB_AddButton(pButtons, (*pdwNumButtons)++, IDTB_ZOOM, nStdBitmaps + STD_PRINT); if (dwButtonFlags & HHWIN_BUTTON_TOC_NEXT) - TB_AddButton(pButtons, (*pdwNumButtons)++, IDTB_TOC_NEXT); + TB_AddButton(pButtons, (*pdwNumButtons)++, IDTB_TOC_NEXT, nStdBitmaps + STD_PRINT); if (dwButtonFlags & HHWIN_BUTTON_TOC_PREV) - TB_AddButton(pButtons, (*pdwNumButtons)++, IDTB_TOC_PREV); + TB_AddButton(pButtons, (*pdwNumButtons)++, IDTB_TOC_PREV, nStdBitmaps + STD_PRINT); } static BOOL HH_AddToolbar(HHInfo *pHHInfo) @@ -833,7 +843,6 @@ static BOOL HH_AddToolbar(HHInfo *pHHInfo) HWND hwndParent = pHHInfo->WinType.hwndHelp; DWORD toolbarFlags; TBBUTTON buttons[IDTB_TOC_PREV - IDTB_EXPAND]; - TBADDBITMAP tbAB; DWORD dwStyles, dwExStyles; DWORD dwNumButtons, dwIndex; @@ -842,8 +851,6 @@ static BOOL HH_AddToolbar(HHInfo *pHHInfo) else toolbarFlags = HHWIN_DEF_BUTTONS; - TB_AddButtonsFromFlags(pHHInfo, buttons, toolbarFlags, &dwNumButtons); - dwStyles = WS_CHILDWINDOW | WS_VISIBLE | TBSTYLE_FLAT | TBSTYLE_WRAPABLE | TBSTYLE_TOOLTIPS | CCS_NODIVIDER; dwExStyles = WS_EX_LEFT | WS_EX_LTRREADING | WS_EX_RIGHTSCROLLBAR; @@ -853,15 +860,13 @@ static BOOL HH_AddToolbar(HHInfo *pHHInfo) hhctrl_hinstance, NULL); if (!hToolbar) return FALSE; + pHHInfo->WinType.hwndToolBar = hToolbar; SendMessageW(hToolbar, TB_SETBITMAPSIZE, 0, MAKELONG(ICON_SIZE, ICON_SIZE)); SendMessageW(hToolbar, TB_BUTTONSTRUCTSIZE, sizeof(TBBUTTON), 0); SendMessageW(hToolbar, WM_SETFONT, (WPARAM)pHHInfo->hFont, TRUE); - /* FIXME: Load correct icons for all buttons */ - tbAB.hInst = HINST_COMMCTRL; - tbAB.nID = IDB_STD_LARGE_COLOR; - SendMessageW(hToolbar, TB_ADDBITMAP, 0, (LPARAM)&tbAB); + TB_AddButtonsFromFlags(pHHInfo, buttons, toolbarFlags, &dwNumButtons); for (dwIndex = 0; dwIndex < dwNumButtons; dwIndex++) { @@ -877,7 +882,6 @@ static BOOL HH_AddToolbar(HHInfo *pHHInfo) SendMessageW(hToolbar, TB_AUTOSIZE, 0, 0); ShowWindow(hToolbar, SW_SHOW); - pHHInfo->WinType.hwndToolBar = hToolbar; return TRUE; }

1 0

Alexandre Julliard : transl: Take into account the new naming of . mc output files.
by Alexandre Julliard 20 Jan '11

20 Jan '11

Module: tools Branch: master Commit: 85faaac69fcc79951699c865d183e5bb5f17ec79 URL: http://source.winehq.org/git/tools.git/?a=commit;h=85faaac69fcc79951699c865… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 20 12:07:37 2011 +0100 transl: Take into account the new naming of .mc output files. --- transl/parse_resfiles.php | 8 ++------ 1 files changed, 2 insertions(+), 6 deletions(-) diff --git a/transl/parse_resfiles.php b/transl/parse_resfiles.php index ac62342..23eb191 100644 --- a/transl/parse_resfiles.php +++ b/transl/parse_resfiles.php @@ -25,12 +25,8 @@ function create_resfiles($dir, $files) continue; } - if (preg_match("/.mc$/", $file)) - { - $file .= ".rc"; - } - $targets .= preg_replace("/\.rc$/", ".res", $file). " "; - $objs .= "$objdir/$dir/" . preg_replace("/\.rc$/", ".res", $file) . " "; + $targets .= preg_replace("/\.[mr]c$/", ".res", $file). " "; + $objs .= "$objdir/$dir/" . preg_replace("/\.[mr]c$/", ".res", $file) . " "; } if ($targets == "") return;

1 0

Huw Davies : include: Add some more internet options.
by Alexandre Julliard 20 Jan '11

20 Jan '11

Module: wine Branch: master Commit: 55f6f9ada43acef87b4ee10096997ac73e4e8e23 URL: http://source.winehq.org/git/wine.git/?a=commit;h=55f6f9ada43acef87b4ee1009… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Jan 20 13:23:52 2011 +0000 include: Add some more internet options. --- include/wininet.h | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/include/wininet.h b/include/wininet.h index 0c98aa4..0cf453e 100644 --- a/include/wininet.h +++ b/include/wininet.h @@ -591,9 +591,13 @@ BOOLAPI InternetUnlockRequestFile(HANDLE); #define INTERNET_OPTION_CODEPAGE_PATH 100 #define INTERNET_OPTION_CODEPAGE_EXTRA 101 #define INTERNET_OPTION_IDN 102 +#define INTERNET_OPTION_MAX_CONNS_PER_PROXY 103 +#define INTERNET_OPTION_SUPPRESS_SERVER_AUTH 104 +#define INTERNET_OPTION_SERVER_CERT_CHAIN_CONTEXT 105 + #define INTERNET_FIRST_OPTION INTERNET_OPTION_CALLBACK -#define INTERNET_LAST_OPTION INTERNET_OPTION_DATAFILE_EXT +#define INTERNET_LAST_OPTION INTERNET_OPTION_SERVER_CERT_CHAIN_CONTEXT #define INTERNET_PRIORITY_FOREGROUND 1000 #define INTERNET_HANDLE_TYPE_INTERNET 1

1 0

Owen Rudge : dsound/tests: Add IEEE float buffer tests for dsound8.
by Alexandre Julliard 20 Jan '11

20 Jan '11

Module: wine Branch: master Commit: 15d5311804bd65b1b6f94357a229ab0496797738 URL: http://source.winehq.org/git/wine.git/?a=commit;h=15d5311804bd65b1b6f94357a… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Thu Jan 20 15:41:59 2011 +0000 dsound/tests: Add IEEE float buffer tests for dsound8. --- dlls/dsound/tests/ds3d8.c | 7 ++++++- dlls/dsound/tests/dsound8.c | 33 +++++++++++++++++++++++---------- 2 files changed, 29 insertions(+), 11 deletions(-) diff --git a/dlls/dsound/tests/ds3d8.c b/dlls/dsound/tests/ds3d8.c index 7855fb3..aa72648 100644 --- a/dlls/dsound/tests/ds3d8.c +++ b/dlls/dsound/tests/ds3d8.c @@ -30,6 +30,8 @@ #include "wine/test.h" #include "dsound.h" #include "mmreg.h" +#include "ks.h" +#include "ksmedia.h" #include "dsound_test.h" static HRESULT (WINAPI *pDirectSoundEnumerateA)(LPDSENUMCALLBACKA,LPVOID)=NULL; @@ -181,6 +183,7 @@ void test_buffer8(LPDIRECTSOUND8 dso, LPDIRECTSOUNDBUFFER * dsbo, DSBCAPS dsbcaps; WAVEFORMATEX wfx,wfx2; DWORD size,status,freq; + BOOL ieee = FALSE; int ref; /* DSOUND: Error: Invalid caps pointer */ @@ -214,10 +217,12 @@ void test_buffer8(LPDIRECTSOUND8 dso, LPDIRECTSOUNDBUFFER * dsbo, if (size == sizeof(WAVEFORMATEX)) { rc=IDirectSoundBuffer_GetFormat(*dsbo,&wfx,size,NULL); + ieee = (wfx.wFormatTag == WAVE_FORMAT_IEEE_FLOAT); } else if (size == sizeof(WAVEFORMATEXTENSIBLE)) { WAVEFORMATEXTENSIBLE wfxe; rc=IDirectSoundBuffer_GetFormat(*dsbo,(WAVEFORMATEX*)&wfxe,size,NULL); wfx = wfxe.Format; + ieee = IsEqualGUID(&wfxe.SubFormat, &KSDATAFORMAT_SUBTYPE_IEEE_FLOAT); } ok(rc==DS_OK,"IDirectSoundBuffer_GetFormat() failed: %08x\n", rc); if (rc==DS_OK && winetest_debug > 1) { @@ -447,7 +452,7 @@ void test_buffer8(LPDIRECTSOUND8 dso, LPDIRECTSOUNDBUFFER * dsbo, ok(rc==DSERR_INVALIDPARAM, "IDirectSoundBuffer_Lock() should have " "returned DSERR_INVALIDPARAM, returned %08x\n", rc); - state.wave=wave_generate_la(&wfx,duration,&state.wave_len,FALSE); + state.wave=wave_generate_la(&wfx,duration,&state.wave_len,ieee); state.dsbo=*dsbo; state.wfx=&wfx; diff --git a/dlls/dsound/tests/dsound8.c b/dlls/dsound/tests/dsound8.c index 5eb7c05..5561051 100644 --- a/dlls/dsound/tests/dsound8.c +++ b/dlls/dsound/tests/dsound8.c @@ -534,7 +534,7 @@ static HRESULT test_primary_secondary8(LPGUID lpGuid) DSCAPS dscaps; WAVEFORMATEX wfx, wfx2; int ref; - unsigned int f; + unsigned int f, tag; /* Create the DirectSound object */ rc=pDirectSoundCreate8(lpGuid,&dso,NULL); @@ -568,6 +568,11 @@ static HRESULT test_primary_secondary8(LPGUID lpGuid) if (rc==DS_OK && primary!=NULL) { for (f=0;f<NB_FORMATS;f++) { + for (tag=0;tag<NB_TAGS;tag++) { + /* if float, we only want to test 32-bit */ + if ((format_tags[tag] == WAVE_FORMAT_IEEE_FLOAT) && (formats[f][1] != 32)) + continue; + /* We must call SetCooperativeLevel to be allowed to call * SetFormat */ /* DSOUND: Setting DirectSound cooperative level to @@ -577,7 +582,7 @@ static HRESULT test_primary_secondary8(LPGUID lpGuid) if (rc!=DS_OK) goto EXIT; - init_format(&wfx,WAVE_FORMAT_PCM,formats[f][0],formats[f][1], + init_format(&wfx,format_tags[tag],formats[f][0],formats[f][1], formats[f][2]); wfx2=wfx; rc=IDirectSoundBuffer_SetFormat(primary,&wfx); @@ -621,9 +626,9 @@ static HRESULT test_primary_secondary8(LPGUID lpGuid) wfx.nBlockAlign); bufdesc.lpwfxFormat=&wfx2; if (winetest_interactive) { - trace(" Testing a primary buffer at %dx%dx%d with a " + trace(" Testing a primary buffer at %dx%dx%d (fmt=%d) with a " "secondary buffer at %dx%dx%d\n", - wfx.nSamplesPerSec,wfx.wBitsPerSample,wfx.nChannels, + wfx.nSamplesPerSec,wfx.wBitsPerSample,wfx.nChannels,format_tags[tag], wfx2.nSamplesPerSec,wfx2.wBitsPerSample,wfx2.nChannels); } rc=IDirectSound_CreateSoundBuffer(dso,&bufdesc,&secondary,NULL); @@ -639,6 +644,7 @@ static HRESULT test_primary_secondary8(LPGUID lpGuid) ok(ref==0,"IDirectSoundBuffer_Release() has %d references, " "should have 0\n",ref); } + } } ref=IDirectSoundBuffer_Release(primary); @@ -668,7 +674,7 @@ static HRESULT test_secondary8(LPGUID lpGuid) DSBUFFERDESC bufdesc; DSCAPS dscaps; WAVEFORMATEX wfx, wfx1; - DWORD f; + DWORD f, tag; int ref; /* Create the DirectSound object */ @@ -708,8 +714,14 @@ static HRESULT test_secondary8(LPGUID lpGuid) goto EXIT1; for (f=0;f<NB_FORMATS;f++) { + for (tag=0;tag<NB_TAGS;tag++) { WAVEFORMATEXTENSIBLE wfxe; - init_format(&wfx,WAVE_FORMAT_PCM,formats[f][0],formats[f][1], + + /* if float, we only want to test 32-bit */ + if ((format_tags[tag] == WAVE_FORMAT_IEEE_FLOAT) && (formats[f][1] != 32)) + continue; + + init_format(&wfx,format_tags[tag],formats[f][0],formats[f][1], formats[f][2]); secondary=NULL; ZeroMemory(&bufdesc, sizeof(bufdesc)); @@ -748,7 +760,7 @@ static HRESULT test_secondary8(LPGUID lpGuid) bufdesc.lpwfxFormat=(WAVEFORMATEX*)&wfxe; wfxe.Format = wfx; wfxe.Format.wFormatTag = WAVE_FORMAT_EXTENSIBLE; - wfxe.SubFormat = KSDATAFORMAT_SUBTYPE_PCM; + wfxe.SubFormat = (format_tags[tag] == WAVE_FORMAT_PCM ? KSDATAFORMAT_SUBTYPE_PCM : KSDATAFORMAT_SUBTYPE_IEEE_FLOAT); wfxe.Format.cbSize = 1; wfxe.Samples.wValidBitsPerSample = wfx.wBitsPerSample; wfxe.dwChannelMask = (wfx.nChannels == 1 ? KSAUDIO_SPEAKER_MONO : KSAUDIO_SPEAKER_STEREO); @@ -799,7 +811,7 @@ static HRESULT test_secondary8(LPGUID lpGuid) secondary=NULL; } - wfxe.SubFormat = KSDATAFORMAT_SUBTYPE_PCM; + wfxe.SubFormat = (format_tags[tag] == WAVE_FORMAT_PCM ? KSDATAFORMAT_SUBTYPE_PCM : KSDATAFORMAT_SUBTYPE_IEEE_FLOAT); rc=IDirectSound_CreateSoundBuffer(dso,&bufdesc,&secondary,NULL); ok(rc==DS_OK && secondary, "IDirectSound_CreateSoundBuffer() returned: %08x %p\n", @@ -854,9 +866,9 @@ static HRESULT test_secondary8(LPGUID lpGuid) if (rc==DS_OK && secondary!=NULL) { if (winetest_interactive) { - trace(" Testing a secondary buffer at %dx%dx%d " + trace(" Testing a secondary buffer at %dx%dx%d (fmt=%d) " "with a primary buffer at %dx%dx%d\n", - wfx.nSamplesPerSec,wfx.wBitsPerSample,wfx.nChannels, + wfx.nSamplesPerSec,wfx.wBitsPerSample,wfx.nChannels,format_tags[tag], wfx1.nSamplesPerSec,wfx1.wBitsPerSample,wfx1.nChannels); } test_buffer8(dso,&secondary,0,FALSE,0,FALSE,0, @@ -866,6 +878,7 @@ static HRESULT test_secondary8(LPGUID lpGuid) ok(ref==0,"IDirectSoundBuffer_Release() has %d references, " "should have 0\n",ref); } + } } EXIT1: ref=IDirectSoundBuffer_Release(primary);

1 0

Owen Rudge : dsound/tests: Add IEEE float buffer tests.
by Alexandre Julliard 20 Jan '11

20 Jan '11

Module: wine Branch: master Commit: c3a01501e80978c86df51e6afe3caccbdb0b3be2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c3a01501e80978c86df51e6af… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Thu Jan 20 15:41:11 2011 +0000 dsound/tests: Add IEEE float buffer tests. --- dlls/dsound/tests/ds3d.c | 38 ++++++++++++++++++++++++++++---------- dlls/dsound/tests/ds3d8.c | 2 +- dlls/dsound/tests/dsound.c | 35 ++++++++++++++++++++++++----------- dlls/dsound/tests/dsound_test.h | 8 +++++++- 4 files changed, 60 insertions(+), 23 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c3a01501e80978c86df51…

1 0

Owen Rudge : dsound: Add support for 32-bit IEEE float buffers.
by Alexandre Julliard 20 Jan '11

20 Jan '11

Module: wine Branch: master Commit: d6f3ca958901d4caff78fd19517ed69cc3ad1c3c URL: http://source.winehq.org/git/wine.git/?a=commit;h=d6f3ca958901d4caff78fd195… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Thu Jan 20 15:41:04 2011 +0000 dsound: Add support for 32-bit IEEE float buffers. --- dlls/dsound/dsound.c | 4 +- dlls/dsound/dsound_convert.c | 113 +++++++++++++++++++++++++++++++++++++++++- dlls/dsound/dsound_private.h | 2 +- dlls/dsound/mixer.c | 20 +++++++- include/mmreg.h | 1 + 5 files changed, 134 insertions(+), 6 deletions(-) diff --git a/dlls/dsound/dsound.c b/dlls/dsound/dsound.c index 83636c2..8c1b812 100644 --- a/dlls/dsound/dsound.c +++ b/dlls/dsound/dsound.c @@ -1591,14 +1591,14 @@ HRESULT DirectSoundDevice_CreateSoundBuffer( /* cbSize should be 22 bytes, with one possible exception */ if (pwfxe->Format.cbSize > (sizeof(WAVEFORMATEXTENSIBLE) - sizeof(WAVEFORMATEX)) && - !(IsEqualGUID(&pwfxe->SubFormat, &KSDATAFORMAT_SUBTYPE_PCM) && + !((IsEqualGUID(&pwfxe->SubFormat, &KSDATAFORMAT_SUBTYPE_PCM) || IsEqualGUID(&pwfxe->SubFormat, &KSDATAFORMAT_SUBTYPE_IEEE_FLOAT)) && pwfxe->Format.cbSize == sizeof(WAVEFORMATEXTENSIBLE))) { WARN("Too big a cbSize %u\n", pwfxe->Format.cbSize); return DSERR_CONTROLUNAVAIL; } - if (!IsEqualGUID(&pwfxe->SubFormat, &KSDATAFORMAT_SUBTYPE_PCM)) + if ((!IsEqualGUID(&pwfxe->SubFormat, &KSDATAFORMAT_SUBTYPE_PCM)) && (!IsEqualGUID(&pwfxe->SubFormat, &KSDATAFORMAT_SUBTYPE_IEEE_FLOAT))) { if (!IsEqualGUID(&pwfxe->SubFormat, &GUID_NULL)) FIXME("SubFormat %s not supported right now.\n", debugstr_guid(&pwfxe->SubFormat)); diff --git a/dlls/dsound/dsound_convert.c b/dlls/dsound/dsound_convert.c index 0a6e474..057ae16 100644 --- a/dlls/dsound/dsound_convert.c +++ b/dlls/dsound/dsound_convert.c @@ -1,6 +1,7 @@ /* DirectSound format conversion and mixing routines * * Copyright 2007 Maarten Lankhorst + * Copyright 2011 Owen Rudge for CodeWeavers * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -295,11 +296,121 @@ static void convert_32_to_32 (const void *src, void *dst, UINT src_stride, } } -const bitsconvertfunc convertbpp[4][4] = { +static void convert_ieee_32_to_8 (const void *src, void *dst, UINT src_stride, + UINT dst_stride, INT count, UINT freqAcc, UINT adj) +{ + while (count > 0) + { + DWORD src_le = le32(*(DWORD *) src); + float v = *((float *) &src_le); + INT8 d = 0; + + if (v < -1.0f) + d = -128; + else if (v > 1.0f) + d = 127; + else + d = v * 127.5f - 0.5f; + + *(BYTE *) dst = d ^ 0x80; + + dst = (char *)dst + dst_stride; + src_advance(&src, src_stride, &count, &freqAcc, adj); + } +} + +static void convert_ieee_32_to_16 (const void *src, void *dst, UINT src_stride, + UINT dst_stride, INT count, UINT freqAcc, UINT adj) +{ + while (count > 0) + { + DWORD src_le = le32(*(DWORD *) src); + float v = *((float *) &src_le); + + INT16 *d = (INT16 *) dst; + + if (v < -1.0f) + *d = -32768; + else if (v > 1.0f) + *d = 32767; + else + *d = v * 32767.5f - 0.5f; + + *d = le16(*d); + + dst = (char *)dst + dst_stride; + src_advance(&src, src_stride, &count, &freqAcc, adj); + } +} + +static void convert_ieee_32_to_24 (const void *src, void *dst, UINT src_stride, + UINT dst_stride, INT count, UINT freqAcc, UINT adj) +{ + while (count > 0) + { + DWORD src_le = le32(*(DWORD *) src); + float v = *((float *) &src_le); + BYTE *dest24 = dst; + + if (v < -1.0f) + { + dest24[0] = 0; + dest24[1] = 0; + dest24[2] = 0x80; + } + else if (v > 1.0f) + { + dest24[0] = 0xff; + dest24[1] = 0xff; + dest24[2] = 0x7f; + } + else if (v < 0.0f) + { + dest24[0] = v * 8388608.0f; + dest24[1] = v * 32768.0f; + dest24[2] = v * 128.0f; + } + else if (v >= 0.0f) + { + dest24[0] = v * 8388608.0f; + dest24[1] = v * 32768.0f; + dest24[2] = v * 127.0f; + } + + dst = (char *)dst + dst_stride; + src_advance(&src, src_stride, &count, &freqAcc, adj); + } +} + +static void convert_ieee_32_to_32 (const void *src, void *dst, UINT src_stride, + UINT dst_stride, INT count, UINT freqAcc, UINT adj) +{ + while (count > 0) + { + DWORD src_le = le32(*(DWORD *) src); + float v = *((float *) &src_le); + INT32 *d = (INT32 *) dst; + + if (v < -1.0f) + *d = -2147483647 - 1; /* silence warning */ + else if (v > 1.0f) + *d = 2147483647; + else + *d = v * 2147483647.5f - 0.5f; + + *d = le32(*d); + + dst = (char *)dst + dst_stride; + src_advance(&src, src_stride, &count, &freqAcc, adj); + } +} + +const bitsconvertfunc convertbpp[5][4] = { { convert_8_to_8, convert_8_to_16, convert_8_to_24, convert_8_to_32 }, { convert_16_to_8, convert_16_to_16, convert_16_to_24, convert_16_to_32 }, { convert_24_to_8, convert_24_to_16, convert_24_to_24, convert_24_to_32 }, { convert_32_to_8, convert_32_to_16, convert_32_to_24, convert_32_to_32 }, + { convert_ieee_32_to_8, convert_ieee_32_to_16, convert_ieee_32_to_24, convert_ieee_32_to_32 }, }; static void mix8(signed char *src, INT *dst, unsigned len) diff --git a/dlls/dsound/dsound_private.h b/dlls/dsound/dsound_private.h index 1b25ddd..542b997 100644 --- a/dlls/dsound/dsound_private.h +++ b/dlls/dsound/dsound_private.h @@ -65,7 +65,7 @@ typedef struct DirectSoundCaptureDevice DirectSoundCaptureDevice; /* dsound_convert.h */ typedef void (*bitsconvertfunc)(const void *, void *, UINT, UINT, INT, UINT, UINT); -extern const bitsconvertfunc convertbpp[4][4]; +extern const bitsconvertfunc convertbpp[5][4]; typedef void (*mixfunc)(const void *, void *, unsigned); extern const mixfunc mixfunctions[4]; typedef void (*normfunc)(const void *, void *, unsigned); diff --git a/dlls/dsound/mixer.c b/dlls/dsound/mixer.c index 185df6e..e08cbca 100644 --- a/dlls/dsound/mixer.c +++ b/dlls/dsound/mixer.c @@ -5,6 +5,7 @@ * Copyright 2000-2002 TransGaming Technologies, Inc. * Copyright 2007 Peter Dons Tychsen * Copyright 2007 Maarten Lankhorst + * Copyright 2011 Owen Rudge for CodeWeavers * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -30,9 +31,13 @@ #include "windef.h" #include "winbase.h" #include "mmsystem.h" +#include "wingdi.h" +#include "mmreg.h" #include "winternl.h" #include "wine/debug.h" #include "dsound.h" +#include "ks.h" +#include "ksmedia.h" #include "dsdriver.h" #include "dsound_private.h" @@ -177,21 +182,32 @@ void DSOUND_RecalcFormat(IDirectSoundBufferImpl *dsb) { BOOL needremix = TRUE, needresample = (dsb->freq != dsb->device->pwfx->nSamplesPerSec); DWORD bAlign = dsb->pwfx->nBlockAlign, pAlign = dsb->device->pwfx->nBlockAlign; + WAVEFORMATEXTENSIBLE *pwfxe; + BOOL ieee = FALSE; TRACE("(%p)\n",dsb); + pwfxe = (WAVEFORMATEXTENSIBLE *) dsb->pwfx; + + if ((pwfxe->Format.wFormatTag == WAVE_FORMAT_IEEE_FLOAT) || ((pwfxe->Format.wFormatTag == WAVE_FORMAT_EXTENSIBLE) + && (IsEqualGUID(&pwfxe->SubFormat, &KSDATAFORMAT_SUBTYPE_IEEE_FLOAT)))) + ieee = TRUE; + /* calculate the 10ms write lead */ dsb->writelead = (dsb->freq / 100) * dsb->pwfx->nBlockAlign; if ((dsb->pwfx->wBitsPerSample == dsb->device->pwfx->wBitsPerSample) && - (dsb->pwfx->nChannels == dsb->device->pwfx->nChannels) && !needresample) + (dsb->pwfx->nChannels == dsb->device->pwfx->nChannels) && !needresample && !ieee) needremix = FALSE; HeapFree(GetProcessHeap(), 0, dsb->tmp_buffer); dsb->tmp_buffer = NULL; dsb->max_buffer_len = dsb->freqAcc = dsb->freqAccNext = 0; dsb->freqneeded = needresample; - dsb->convert = convertbpp[dsb->pwfx->wBitsPerSample/8 - 1][dsb->device->pwfx->wBitsPerSample/8 - 1]; + if (ieee) + dsb->convert = convertbpp[4][dsb->device->pwfx->wBitsPerSample/8 - 1]; + else + dsb->convert = convertbpp[dsb->pwfx->wBitsPerSample/8 - 1][dsb->device->pwfx->wBitsPerSample/8 - 1]; dsb->resampleinmixer = FALSE; diff --git a/include/mmreg.h b/include/mmreg.h index dca8b58..64a3991 100644 --- a/include/mmreg.h +++ b/include/mmreg.h @@ -74,6 +74,7 @@ typedef struct _WAVEFORMATEX { /* WAVE form wFormatTag IDs */ #define WAVE_FORMAT_UNKNOWN 0x0000 /* Microsoft Corporation */ #define WAVE_FORMAT_ADPCM 0x0002 /* Microsoft Corporation */ +#define WAVE_FORMAT_IEEE_FLOAT 0x0003 /* Microsoft Corporation */ #define WAVE_FORMAT_IBM_CVSD 0x0005 /* IBM Corporation */ #define WAVE_FORMAT_ALAW 0x0006 /* Microsoft Corporation */ #define WAVE_FORMAT_MULAW 0x0007 /* Microsoft Corporation */

1 0

← Newer
1
...
24
25
26
27
28
29
30
...
88
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 January 2011