April 2008 - Wine-Commits - list.winehq.org

Michael Stefaniuc : wrc: Sync the codepage mapping to the LANG_* identifiers from include/winnt.h.
by Alexandre Julliard April 2, 2008

April 2, 2008

Module: wine Branch: master Commit: fae9640f4d7ca559fe9ab41a22f29a3beba24153 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fae9640f4d7ca559fe9ab41a2… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Apr 2 00:17:10 2008 +0200 wrc: Sync the codepage mapping to the LANG_* identifiers from include/winnt.h. --- tools/wrc/utils.c | 63 +++++++++++++++++++++++++++++++++++++++++++++------- 1 files changed, 54 insertions(+), 9 deletions(-) diff --git a/tools/wrc/utils.c b/tools/wrc/utils.c index 58d6124..eb079ee 100644 --- a/tools/wrc/utils.c +++ b/tools/wrc/utils.c @@ -342,26 +342,33 @@ static const struct lang2cp lang2cps[] = { { LANG_AFRIKAANS, SUBLANG_NEUTRAL, 1252 }, { LANG_ALBANIAN, SUBLANG_NEUTRAL, 1250 }, + { LANG_ALSATIAN, SUBLANG_NEUTRAL, 1252 }, + { LANG_AMHARIC, SUBLANG_NEUTRAL, 0 }, { LANG_ARABIC, SUBLANG_NEUTRAL, 1256 }, { LANG_ARMENIAN, SUBLANG_NEUTRAL, 0 }, + { LANG_ASSAMESE, SUBLANG_NEUTRAL, 0 }, { LANG_AZERI, SUBLANG_NEUTRAL, 1254 }, { LANG_AZERI, SUBLANG_AZERI_CYRILLIC, 1251 }, + { LANG_BASHKIR, SUBLANG_NEUTRAL, 1251 }, { LANG_BASQUE, SUBLANG_NEUTRAL, 1252 }, { LANG_BELARUSIAN, SUBLANG_NEUTRAL, 1251 }, -#ifdef LANG_BRETON + { LANG_BENGALI, SUBLANG_NEUTRAL, 0 }, + { LANG_BOSNIAN, SUBLANG_NEUTRAL, 1250 }, + { LANG_BOSNIAN, SUBLANG_BOSNIAN_BOSNIA_HERZEGOVINA_CYRILLIC, 1251 }, { LANG_BRETON, SUBLANG_NEUTRAL, 1252 }, -#endif /* LANG_BRETON */ { LANG_BULGARIAN, SUBLANG_NEUTRAL, 1251 }, { LANG_CATALAN, SUBLANG_NEUTRAL, 1252 }, { LANG_CHINESE, SUBLANG_NEUTRAL, 950 }, - { LANG_CHINESE, SUBLANG_CHINESE_SINGAPORE, 936 }, { LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED, 936 }, + { LANG_CHINESE, SUBLANG_CHINESE_SINGAPORE, 936 }, #ifdef LANG_CORNISH { LANG_CORNISH, SUBLANG_NEUTRAL, 1252 }, #endif /* LANG_CORNISH */ + { LANG_CORSICAN, SUBLANG_NEUTRAL, 1252 }, { LANG_CROATIAN, SUBLANG_NEUTRAL, 1250 }, { LANG_CZECH, SUBLANG_NEUTRAL, 1250 }, { LANG_DANISH, SUBLANG_NEUTRAL, 1252 }, + { LANG_DARI, SUBLANG_NEUTRAL, 1256 }, { LANG_DIVEHI, SUBLANG_NEUTRAL, 0 }, { LANG_DUTCH, SUBLANG_NEUTRAL, 1252 }, { LANG_ENGLISH, SUBLANG_NEUTRAL, 1252 }, @@ -370,9 +377,10 @@ static const struct lang2cp lang2cps[] = #endif /* LANG_ESPERANTO */ { LANG_ESTONIAN, SUBLANG_NEUTRAL, 1257 }, { LANG_FAEROESE, SUBLANG_NEUTRAL, 1252 }, - { LANG_FARSI, SUBLANG_NEUTRAL, 1256 }, + { LANG_FILIPINO, SUBLANG_NEUTRAL, 1252 }, { LANG_FINNISH, SUBLANG_NEUTRAL, 1252 }, { LANG_FRENCH, SUBLANG_NEUTRAL, 1252 }, + { LANG_FRISIAN, SUBLANG_NEUTRAL, 1252 }, #ifdef LANG_GAELIC { LANG_GAELIC, SUBLANG_NEUTRAL, 1252 }, #endif /* LANG_GAELIC */ @@ -380,58 +388,95 @@ static const struct lang2cp lang2cps[] = { LANG_GEORGIAN, SUBLANG_NEUTRAL, 0 }, { LANG_GERMAN, SUBLANG_NEUTRAL, 1252 }, { LANG_GREEK, SUBLANG_NEUTRAL, 1253 }, + { LANG_GREENLANDIC, SUBLANG_NEUTRAL, 1252 }, { LANG_GUJARATI, SUBLANG_NEUTRAL, 0 }, + { LANG_HAUSA, SUBLANG_NEUTRAL, 1252 }, { LANG_HEBREW, SUBLANG_NEUTRAL, 1255 }, { LANG_HINDI, SUBLANG_NEUTRAL, 0 }, { LANG_HUNGARIAN, SUBLANG_NEUTRAL, 1250 }, { LANG_ICELANDIC, SUBLANG_NEUTRAL, 1252 }, + { LANG_IGBO, SUBLANG_NEUTRAL, 1252 }, { LANG_INDONESIAN, SUBLANG_NEUTRAL, 1252 }, + { LANG_INUKTITUT, SUBLANG_NEUTRAL, 0 }, + { LANG_INUKTITUT, SUBLANG_INUKTITUT_CANADA_LATIN, 0 }, + { LANG_IRISH, SUBLANG_NEUTRAL, 1252 }, { LANG_ITALIAN, SUBLANG_NEUTRAL, 1252 }, { LANG_JAPANESE, SUBLANG_NEUTRAL, 932 }, { LANG_KANNADA, SUBLANG_NEUTRAL, 0 }, { LANG_KAZAK, SUBLANG_NEUTRAL, 1251 }, + { LANG_KHMER, SUBLANG_NEUTRAL, 0 }, + { LANG_KICHE, SUBLANG_NEUTRAL, 1252 }, + { LANG_KINYARWANDA, SUBLANG_NEUTRAL, 1252 }, { LANG_KONKANI, SUBLANG_NEUTRAL, 0 }, { LANG_KOREAN, SUBLANG_NEUTRAL, 949 }, { LANG_KYRGYZ, SUBLANG_NEUTRAL, 1251 }, + { LANG_LAO, SUBLANG_NEUTRAL, 0 }, { LANG_LATVIAN, SUBLANG_NEUTRAL, 1257 }, { LANG_LITHUANIAN, SUBLANG_NEUTRAL, 1257 }, + { LANG_LOWER_SORBIAN, SUBLANG_NEUTRAL, 1252 }, + { LANG_LUXEMBOURGISH, SUBLANG_NEUTRAL, 1252 }, { LANG_MACEDONIAN, SUBLANG_NEUTRAL, 1251 }, { LANG_MALAY, SUBLANG_NEUTRAL, 1252 }, + { LANG_MALAYALAM, SUBLANG_NEUTRAL, 0 }, + { LANG_MALTESE, SUBLANG_NEUTRAL, 0 }, + { LANG_MAORI, SUBLANG_NEUTRAL, 0 }, + { LANG_MAPUDUNGUN, SUBLANG_NEUTRAL, 1252 }, { LANG_MARATHI, SUBLANG_NEUTRAL, 0 }, + { LANG_MOHAWK, SUBLANG_NEUTRAL, 1252 }, { LANG_MONGOLIAN, SUBLANG_NEUTRAL, 1251 }, + { LANG_NEPALI, SUBLANG_NEUTRAL, 0 }, { LANG_NEUTRAL, SUBLANG_NEUTRAL, 1252 }, { LANG_NORWEGIAN, SUBLANG_NEUTRAL, 1252 }, + { LANG_OCCITAN, SUBLANG_NEUTRAL, 1252 }, + { LANG_ORIYA, SUBLANG_NEUTRAL, 0 }, + { LANG_PASHTO, SUBLANG_NEUTRAL, 0 }, + { LANG_PERSIAN, SUBLANG_NEUTRAL, 1256 }, { LANG_POLISH, SUBLANG_NEUTRAL, 1250 }, { LANG_PORTUGUESE, SUBLANG_NEUTRAL, 1252 }, { LANG_PUNJABI, SUBLANG_NEUTRAL, 0 }, + { LANG_QUECHUA, SUBLANG_NEUTRAL, 1252 }, { LANG_ROMANIAN, SUBLANG_NEUTRAL, 1250 }, { LANG_ROMANSH, SUBLANG_NEUTRAL, 1252 }, { LANG_RUSSIAN, SUBLANG_NEUTRAL, 1251 }, + { LANG_SAMI, SUBLANG_NEUTRAL, 1252 }, { LANG_SANSKRIT, SUBLANG_NEUTRAL, 0 }, { LANG_SERBIAN, SUBLANG_NEUTRAL, 1250 }, { LANG_SERBIAN, SUBLANG_SERBIAN_CYRILLIC, 1251 }, + { LANG_SINHALESE, SUBLANG_NEUTRAL, 0 }, { LANG_SLOVAK, SUBLANG_NEUTRAL, 1250 }, { LANG_SLOVENIAN, SUBLANG_NEUTRAL, 1250 }, + { LANG_SOTHO, SUBLANG_NEUTRAL, 1252 }, { LANG_SPANISH, SUBLANG_NEUTRAL, 1252 }, { LANG_SWAHILI, SUBLANG_NEUTRAL, 1252 }, { LANG_SWEDISH, SUBLANG_NEUTRAL, 1252 }, { LANG_SYRIAC, SUBLANG_NEUTRAL, 0 }, + { LANG_TAJIK, SUBLANG_NEUTRAL, 1251 }, + { LANG_TAMAZIGHT, SUBLANG_NEUTRAL, 1252 }, { LANG_TAMIL, SUBLANG_NEUTRAL, 0 }, { LANG_TATAR, SUBLANG_NEUTRAL, 1251 }, { LANG_TELUGU, SUBLANG_NEUTRAL, 0 }, { LANG_THAI, SUBLANG_NEUTRAL, 874 }, + { LANG_TIBETAN, SUBLANG_NEUTRAL, 0 }, + { LANG_TSWANA, SUBLANG_NEUTRAL, 1252 }, { LANG_TURKISH, SUBLANG_NEUTRAL, 1254 }, + { LANG_TURKMEN, SUBLANG_NEUTRAL, 1250 }, + { LANG_UIGHUR, SUBLANG_NEUTRAL, 1256 }, { LANG_UKRAINIAN, SUBLANG_NEUTRAL, 1251 }, + { LANG_UPPER_SORBIAN, SUBLANG_NEUTRAL, 1252 }, { LANG_URDU, SUBLANG_NEUTRAL, 1256 }, { LANG_UZBEK, SUBLANG_NEUTRAL, 1254 }, { LANG_UZBEK, SUBLANG_UZBEK_CYRILLIC, 1251 }, - { LANG_VIETNAMESE, SUBLANG_NEUTRAL, 1258 } + { LANG_VIETNAMESE, SUBLANG_NEUTRAL, 1258 }, #ifdef LANG_WALON - , { LANG_WALON, SUBLANG_NEUTRAL, 1252 } + { LANG_WALON, SUBLANG_NEUTRAL, 1252 }, #endif /* LANG_WALON */ -#ifdef LANG_WELSH - , { LANG_WELSH, SUBLANG_NEUTRAL, 1252 } -#endif /* LANG_WELSH */ + { LANG_WELSH, SUBLANG_NEUTRAL, 1252 }, + { LANG_WOLOF, SUBLANG_NEUTRAL, 1252 }, + { LANG_XHOSA, SUBLANG_NEUTRAL, 1252 }, + { LANG_YAKUT, SUBLANG_NEUTRAL, 1251 }, + { LANG_YI, SUBLANG_NEUTRAL, 0 }, + { LANG_YORUBA, SUBLANG_NEUTRAL, 1252 }, + { LANG_ZULU, SUBLANG_NEUTRAL, 1252 } }; int get_language_codepage( unsigned short lang, unsigned short sublang )

1 0

Aric Stewart : imm: Implement GetCompositionFont.
by Alexandre Julliard April 1, 2008

April 1, 2008

Module: wine Branch: master Commit: fd8829fb09276f8eaa7d224c484b357516af7a7f URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd8829fb09276f8eaa7d224c4… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Apr 1 11:13:36 2008 -0500 imm: Implement GetCompositionFont. --- dlls/imm32/imm.c | 29 +++++++++++++++++++++++------ 1 files changed, 23 insertions(+), 6 deletions(-) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index 866c3e3..ab57bce 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -917,9 +917,19 @@ BOOL WINAPI ImmGetCandidateWindow( */ BOOL WINAPI ImmGetCompositionFontA(HIMC hIMC, LPLOGFONTA lplf) { - FIXME("(%p, %p): stub\n", hIMC, lplf); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; + LOGFONTW lfW; + BOOL rc; + + TRACE("(%p, %p):\n", hIMC, lplf); + + rc = ImmGetCompositionFontW(hIMC,&lfW); + if (rc) + { + memcpy(lplf,&lfW,sizeof(LOGFONTA)); + WideCharToMultiByte(CP_ACP, 0, lfW.lfFaceName, -1, lplf->lfFaceName, + LF_FACESIZE, NULL, NULL); + } + return rc; } /*********************************************************************** @@ -927,9 +937,16 @@ BOOL WINAPI ImmGetCompositionFontA(HIMC hIMC, LPLOGFONTA lplf) */ BOOL WINAPI ImmGetCompositionFontW(HIMC hIMC, LPLOGFONTW lplf) { - FIXME("(%p, %p): stub\n", hIMC, lplf); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; + InputContextData *data = (InputContextData*)hIMC; + + TRACE("(%p, %p):\n", hIMC, lplf); + + if (!data) + return FALSE; + + *lplf = data->IMC.lfFont.W; + + return TRUE; } /***********************************************************************

1 0

Apostolos Alexiadis : comctl32: Greek translation update.
by Alexandre Julliard April 1, 2008

April 1, 2008

Module: wine Branch: master Commit: 8f0d80ef8e2039515f9388811da0ea848c9bf4bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f0d80ef8e2039515f9388811… Author: Apostolos Alexiadis <djapal(a)gmail.com> Date: Tue Apr 1 19:07:51 2008 +0300 comctl32: Greek translation update. --- dlls/comctl32/comctl_El.rc | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/comctl_El.rc b/dlls/comctl32/comctl_El.rc index a226e37..2e15156 100644 --- a/dlls/comctl32/comctl_El.rc +++ b/dlls/comctl32/comctl_El.rc @@ -24,7 +24,7 @@ CAPTION " FONT 8, "MS Shell Dlg" BEGIN DEFPUSHBUTTON "OK", IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP - PUSHBUTTON "��", IDCANCEL,58,122,50,14 + PUSHBUTTON "��", IDCANCEL,58,122,50,14 PUSHBUTTON "&��", IDC_APPLY_BUTTON,112,122,50,14,WS_DISABLED PUSHBUTTON "��", IDHELP,166,122,50,14,WS_TABSTOP|WS_GROUP CONTROL "Tab", IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS|WS_GROUP|WS_TABSTOP|TCS_MULTILINE,4,4,212,114 @@ -36,10 +36,10 @@ STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE CAPTION "��" FONT 8, "MS Shell Dlg" BEGIN - PUSHBUTTON "< &��", IDC_BACK_BUTTON,71,138,50,14 - DEFPUSHBUTTON "&�� >", IDC_NEXT_BUTTON,121,138,50,14 + PUSHBUTTON "< &��", IDC_BACK_BUTTON,66,138,55,14 + DEFPUSHBUTTON "&�� >", IDC_NEXT_BUTTON,121,138,55,14 DEFPUSHBUTTON "��", IDC_FINISH_BUTTON,121,138,50,14 - PUSHBUTTON "��", IDCANCEL,178,138,50,14 + PUSHBUTTON "��", IDCANCEL,178,138,50,14 PUSHBUTTON "��", IDHELP,235,138,50,14,WS_GROUP LTEXT "", IDC_SUNKEN_LINE,7,129,278,1,SS_SUNKEN CONTROL "Tab", IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS | WS_DISABLED,7,7,258,5

1 0

Apostolos Alexiadis : comdlg32: Added Greek translation.
by Alexandre Julliard April 1, 2008

April 1, 2008

Module: wine Branch: master Commit: e6c2dcbc7949645784f68e30ce1fcf86d7a572ff URL: http://source.winehq.org/git/wine.git/?a=commit;h=e6c2dcbc7949645784f68e30c… Author: Apostolos Alexiadis <djapal(a)gmail.com> Date: Tue Apr 1 19:08:43 2008 +0300 comdlg32: Added Greek translation. --- dlls/comdlg32/cdlg_El.rc | 481 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/comdlg32/rsrc.rc | 1 + 2 files changed, 482 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e6c2dcbc7949645784f68…

1 0

Apostolos Alexiadis : hhctrl: Added Greek translation.
by Alexandre Julliard April 1, 2008

April 1, 2008

Module: wine Branch: master Commit: 0a8d2ba37a59531ae7a58c3d693e65dbe901a72a URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a8d2ba37a59531ae7a58c3d6… Author: Apostolos Alexiadis <djapal(a)gmail.com> Date: Tue Apr 1 19:09:31 2008 +0300 hhctrl: Added Greek translation. --- dlls/hhctrl.ocx/El.rc | 58 +++++++++++++++++++++++++++++++++++++++++++++ dlls/hhctrl.ocx/hhctrl.rc | 1 + 2 files changed, 59 insertions(+), 0 deletions(-) diff --git a/dlls/hhctrl.ocx/El.rc b/dlls/hhctrl.ocx/El.rc new file mode 100644 index 0000000..dd81eb6 --- /dev/null +++ b/dlls/hhctrl.ocx/El.rc @@ -0,0 +1,58 @@ +/* + * HTML Help resources + * Greek Language Support + * + * Copyright 2008 Apostolos Alexiadis + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +LANGUAGE LANG_GREEK, SUBLANG_DEFAULT + +STRINGTABLE +BEGIN + IDS_CONTENTS "&��" + IDS_INDEX "I&ndex" + IDS_SEARCH "&��" + IDS_FAVORITES "�&��" +END + +STRINGTABLE +BEGIN + IDTB_EXPAND "��" + IDTB_CONTRACT "��" + IDTB_STOP "��" + IDTB_REFRESH "��" + IDTB_BACK "��" + IDTB_HOME "Home" + IDTB_SYNC "Sync" + IDTB_PRINT "��" + IDTB_OPTIONS "��" + IDTB_FORWARD "Forward" + IDTB_NOTES "IDTB_NOTES" + IDTB_BROWSE_FWD "IDTB_BROWSE_FWD" + IDTB_BROWSE_BACK "IDT_BROWSE_BACK" + IDTB_CONTENTS "IDTB_CONTENTS" + IDTB_INDEX "IDTB_INDEX" + IDTB_SEARCH "IDTB_SEARCH" + IDTB_HISTORY "IDTB_HISTORY" + IDTB_FAVORITES "IDTB_FAVORITES" + IDTB_JUMP1 "Jump1" + IDTB_JUMP2 "Jump2" + IDTB_CUSTOMIZE "Customize" + IDTB_ZOOM "Zoom" + IDTB_TOC_NEXT "IDTB_TOC_NEXT" + IDTB_TOC_PREV "IDTB_TOC_PREV" +END diff --git a/dlls/hhctrl.ocx/hhctrl.rc b/dlls/hhctrl.ocx/hhctrl.rc index 5fca97b..2c195d4 100644 --- a/dlls/hhctrl.ocx/hhctrl.rc +++ b/dlls/hhctrl.ocx/hhctrl.rc @@ -31,6 +31,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL #include "Cs.rc" #include "De.rc" +#include "El.rc" #include "En.rc" #include "Fr.rc" #include "Fi.rc"

1 0

Maarten Lankhorst : quartz: Small mpeg splitter fixes.
by Alexandre Julliard April 1, 2008

April 1, 2008

Module: wine Branch: master Commit: 6fd90f16259fd91743ca6bb7869c5e2d15a43f45 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6fd90f16259fd91743ca6bb78… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Sun Mar 30 21:18:49 2008 -0700 quartz: Small mpeg splitter fixes. Just to be cautious, since it reads 4 bytes it should stop trying at EOF-3. Also be more strict with the return values. --- dlls/quartz/mpegsplit.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/quartz/mpegsplit.c b/dlls/quartz/mpegsplit.c index dca0042..0ecafc8 100644 --- a/dlls/quartz/mpegsplit.c +++ b/dlls/quartz/mpegsplit.c @@ -651,16 +651,18 @@ static HRESULT MPEGSplitter_pre_connect(IPin *iface, IPin *pConnectPin) This->EndOfFile -= 128; /* http://mpgedit.org/mpgedit/mpeg_format/mpeghdr.htm has a whole readup on audio headers */ - while (pos < This->EndOfFile && SUCCEEDED(hr)) + while (pos + 3 < This->EndOfFile) { LONGLONG length = 0; hr = IAsyncReader_SyncRead(pPin->pReader, pos, 4, header); + if (hr != S_OK) + break; while (parse_header(header, &length, &duration)) { /* No valid header yet; shift by a byte and check again */ memmove(header, header+1, 3); hr = IAsyncReader_SyncRead(pPin->pReader, pos++, 1, header + 3); - if (FAILED(hr)) + if (hr != S_OK || This->EndOfFile - pos < 4) break; } pos += length;

1 0

Maarten Lankhorst : quartz: Implement graph MediaSeeking GetPositions.
by Alexandre Julliard April 1, 2008

April 1, 2008

Module: wine Branch: master Commit: c56389ea3cd4ab211c5770b01530d7bd9b86df18 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c56389ea3cd4ab211c5770b01… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Fri Mar 28 15:16:58 2008 -0700 quartz: Implement graph MediaSeeking GetPositions. --- dlls/quartz/filtergraph.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index 4371a36..4f8eebb 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -2025,10 +2025,14 @@ static HRESULT WINAPI MediaSeeking_GetPositions(IMediaSeeking *iface, LONGLONG *pCurrent, LONGLONG *pStop) { ICOM_THIS_MULTI(IFilterGraphImpl, IMediaSeeking_vtbl, iface); + HRESULT hr; - FIXME("(%p/%p)->(%p, %p): stub !!!\n", This, iface, pCurrent, pStop); + TRACE("(%p/%p)->(%p, %p)\n", This, iface, pCurrent, pStop); + hr = IMediaSeeking_GetCurrentPosition(iface, pCurrent); + if (SUCCEEDED(hr)) + hr = IMediaSeeking_GetStopPosition(iface, pStop); - return S_OK; + return hr; } static HRESULT WINAPI MediaSeeking_GetAvailable(IMediaSeeking *iface,

1 0

Maarten Lankhorst : quartz: Allow parser filters to implement their own seeking methods.
by Alexandre Julliard April 1, 2008

April 1, 2008

Module: wine Branch: master Commit: 1544e5239723522ede0054f033cf2067d9f59971 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1544e5239723522ede0054f03… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Tue Mar 25 16:11:22 2008 -0700 quartz: Allow parser filters to implement their own seeking methods. --- dlls/quartz/avisplit.c | 2 +- dlls/quartz/mpegsplit.c | 2 +- dlls/quartz/parser.c | 23 ++++++++++++++++------- dlls/quartz/parser.h | 2 +- dlls/quartz/waveparser.c | 2 +- 5 files changed, 20 insertions(+), 11 deletions(-) diff --git a/dlls/quartz/avisplit.c b/dlls/quartz/avisplit.c index 140b0df..0d9aed7 100644 --- a/dlls/quartz/avisplit.c +++ b/dlls/quartz/avisplit.c @@ -622,7 +622,7 @@ HRESULT AVISplitter_create(IUnknown * pUnkOuter, LPVOID * ppv) This->pCurrentSample = NULL; This->streams = NULL; - hr = Parser_Create(&(This->Parser), &CLSID_AviSplitter, AVISplitter_Sample, AVISplitter_QueryAccept, AVISplitter_InputPin_PreConnect, AVISplitter_Cleanup); + hr = Parser_Create(&(This->Parser), &CLSID_AviSplitter, AVISplitter_Sample, AVISplitter_QueryAccept, AVISplitter_InputPin_PreConnect, AVISplitter_Cleanup, NULL, NULL, NULL); if (FAILED(hr)) return hr; diff --git a/dlls/quartz/mpegsplit.c b/dlls/quartz/mpegsplit.c index 0ecafc8..0dbc3c5 100644 --- a/dlls/quartz/mpegsplit.c +++ b/dlls/quartz/mpegsplit.c @@ -721,7 +721,7 @@ HRESULT MPEGSplitter_create(IUnknown * pUnkOuter, LPVOID * ppv) return E_OUTOFMEMORY; ZeroMemory(This, sizeof(MPEGSplitterImpl)); - hr = Parser_Create(&(This->Parser), &CLSID_MPEG1Splitter, MPEGSplitter_process_sample, MPEGSplitter_query_accept, MPEGSplitter_pre_connect, MPEGSplitter_cleanup); + hr = Parser_Create(&(This->Parser), &CLSID_MPEG1Splitter, MPEGSplitter_process_sample, MPEGSplitter_query_accept, MPEGSplitter_pre_connect, MPEGSplitter_cleanup, NULL, NULL, NULL); if (FAILED(hr)) { CoTaskMemFree(This); diff --git a/dlls/quartz/parser.c b/dlls/quartz/parser.c index 8fdf939..b7bb270 100644 --- a/dlls/quartz/parser.c +++ b/dlls/quartz/parser.c @@ -43,7 +43,7 @@ static const IPinVtbl Parser_OutputPin_Vtbl; static const IPinVtbl Parser_InputPin_Vtbl; static HRESULT Parser_OutputPin_QueryAccept(LPVOID iface, const AM_MEDIA_TYPE * pmt); -static HRESULT Parser_ChangeStart(IBaseFilter *iface); +static HRESULT Parser_ChangeCurrent(IBaseFilter *iface); static HRESULT Parser_ChangeStop(IBaseFilter *iface); static HRESULT Parser_ChangeRate(IBaseFilter *iface); @@ -55,7 +55,7 @@ static inline ParserImpl *impl_from_IMediaSeeking( IMediaSeeking *iface ) } -HRESULT Parser_Create(ParserImpl* pParser, const CLSID* pClsid, PFN_PROCESS_SAMPLE fnProcessSample, PFN_QUERY_ACCEPT fnQueryAccept, PFN_PRE_CONNECT fnPreConnect, PFN_CLEANUP fnCleanup) +HRESULT Parser_Create(ParserImpl* pParser, const CLSID* pClsid, PFN_PROCESS_SAMPLE fnProcessSample, PFN_QUERY_ACCEPT fnQueryAccept, PFN_PRE_CONNECT fnPreConnect, PFN_CLEANUP fnCleanup, CHANGEPROC stop, CHANGEPROC current, CHANGEPROC rate) { HRESULT hr; PIN_INFO piInput; @@ -80,7 +80,16 @@ HRESULT Parser_Create(ParserImpl* pParser, const CLSID* pClsid, PFN_PROCESS_SAMP piInput.pFilter = (IBaseFilter *)pParser; lstrcpynW(piInput.achName, wcsInputPinName, sizeof(piInput.achName) / sizeof(piInput.achName[0])); - MediaSeekingImpl_Init((IBaseFilter*)pParser, Parser_ChangeStop, Parser_ChangeStart, Parser_ChangeRate, &pParser->mediaSeeking, &pParser->csFilter); + if (!current) + current = Parser_ChangeCurrent; + + if (!stop) + stop = Parser_ChangeStop; + + if (!rate) + rate = Parser_ChangeRate; + + MediaSeekingImpl_Init((IBaseFilter*)pParser, stop, current, rate, &pParser->mediaSeeking, &pParser->csFilter); pParser->mediaSeeking.lpVtbl = &Parser_Seeking_Vtbl; hr = Parser_InputPin_Construct(&piInput, fnProcessSample, (LPVOID)pParser, fnQueryAccept, &pParser->csFilter, (IPin **)&pParser->pInputPin); @@ -551,21 +560,21 @@ static HRESULT Parser_RemoveOutputPins(ParserImpl * This) return S_OK; } -static HRESULT Parser_ChangeStart(IBaseFilter *iface) +static HRESULT Parser_ChangeCurrent(IBaseFilter *iface) { - FIXME("(%p)\n", iface); + FIXME("(%p) filter hasn't implemented current position change!\n", iface); return S_OK; } static HRESULT Parser_ChangeStop(IBaseFilter *iface) { - FIXME("(%p)\n", iface); + FIXME("(%p) filter hasn't implemented stop position change!\n", iface); return S_OK; } static HRESULT Parser_ChangeRate(IBaseFilter *iface) { - FIXME("(%p)\n", iface); + FIXME("(%p) filter hasn't implemented rate change!\n", iface); return S_OK; } diff --git a/dlls/quartz/parser.h b/dlls/quartz/parser.h index 876f0fc..0bba062 100644 --- a/dlls/quartz/parser.h +++ b/dlls/quartz/parser.h @@ -54,4 +54,4 @@ typedef struct Parser_OutputPin HRESULT Parser_AddPin(ParserImpl * This, const PIN_INFO * piOutput, ALLOCATOR_PROPERTIES * props, const AM_MEDIA_TYPE * amt); -HRESULT Parser_Create(ParserImpl*, const CLSID*, PFN_PROCESS_SAMPLE, PFN_QUERY_ACCEPT, PFN_PRE_CONNECT, PFN_CLEANUP); +HRESULT Parser_Create(ParserImpl*, const CLSID*, PFN_PROCESS_SAMPLE, PFN_QUERY_ACCEPT, PFN_PRE_CONNECT, PFN_CLEANUP, CHANGEPROC stop, CHANGEPROC current, CHANGEPROC rate); diff --git a/dlls/quartz/waveparser.c b/dlls/quartz/waveparser.c index 3d4bd74..55fad4c 100644 --- a/dlls/quartz/waveparser.c +++ b/dlls/quartz/waveparser.c @@ -334,7 +334,7 @@ HRESULT WAVEParser_create(IUnknown * pUnkOuter, LPVOID * ppv) This->pCurrentSample = NULL; - hr = Parser_Create(&(This->Parser), &CLSID_WAVEParser, WAVEParser_Sample, WAVEParser_QueryAccept, WAVEParser_InputPin_PreConnect, WAVEParser_Cleanup); + hr = Parser_Create(&(This->Parser), &CLSID_WAVEParser, WAVEParser_Sample, WAVEParser_QueryAccept, WAVEParser_InputPin_PreConnect, WAVEParser_Cleanup, NULL, NULL, NULL); if (FAILED(hr)) return hr;

1 0

Maarten Lankhorst : winemp3: Replace fprintf with wine debugging facilities .
by Alexandre Julliard April 1, 2008

April 1, 2008

Module: wine Branch: master Commit: 0faee4af8504eef86a5b86b279a0afca4a1b32c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0faee4af8504eef86a5b86b27… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Mon Mar 31 11:19:58 2008 -0700 winemp3: Replace fprintf with wine debugging facilities. --- dlls/winemp3.acm/common.c | 19 +++++++++++-------- dlls/winemp3.acm/interface.c | 2 ++ dlls/winemp3.acm/layer3.c | 22 ++++++++++++---------- 3 files changed, 25 insertions(+), 18 deletions(-) diff --git a/dlls/winemp3.acm/common.c b/dlls/winemp3.acm/common.c index de329f1..5a02c13 100644 --- a/dlls/winemp3.acm/common.c +++ b/dlls/winemp3.acm/common.c @@ -28,6 +28,9 @@ #include <fcntl.h> #include "mpg123.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(mpeg3); const struct parameter param = { 1 , 1 , 0 , 0 }; @@ -109,7 +112,7 @@ int decode_header(struct frame *fr,unsigned long newhead) if(!fr->bitrate_index) { - fprintf(stderr,"Free format not supported.\n"); + FIXME("Free format not supported.\n"); return (0); } @@ -125,7 +128,7 @@ int decode_header(struct frame *fr,unsigned long newhead) fr->framesize /= freqs[fr->sampling_frequency]; fr->framesize = ((fr->framesize+fr->padding)<<2)-4; #else - fprintf(stderr,"Not supported!\n"); + FIXME("Layer 1 not supported!\n"); #endif break; case 2: @@ -138,7 +141,7 @@ int decode_header(struct frame *fr,unsigned long newhead) fr->framesize /= freqs[fr->sampling_frequency]; fr->framesize += fr->padding - 4; #else - fprintf(stderr,"Not supported!\n"); + FIXME("Layer 2 not supported!\n"); #endif break; case 3: @@ -159,7 +162,7 @@ int decode_header(struct frame *fr,unsigned long newhead) fr->framesize = fr->framesize + fr->padding - 4; break; default: - fprintf(stderr,"Sorry, unknown layer type.\n"); + FIXME("Unknown layer type: %d\n", fr->lay); return (0); } return 1; @@ -171,15 +174,15 @@ void print_header(struct frame *fr) static const char * const modes[4] = { "Stereo", "Joint-Stereo", "Dual-Channel", "Single-Channel" }; static const char * const layers[4] = { "Unknown" , "I", "II", "III" }; - fprintf(stderr,"MPEG %s, Layer: %s, Freq: %ld, mode: %s, modext: %d, BPF : %d\n", + FIXME("MPEG %s, Layer: %s, Freq: %ld, mode: %s, modext: %d, BPF : %d\n", fr->mpeg25 ? "2.5" : (fr->lsf ? "2.0" : "1.0"), layers[fr->lay],freqs[fr->sampling_frequency], modes[fr->mode],fr->mode_ext,fr->framesize+4); - fprintf(stderr,"Channels: %d, copyright: %s, original: %s, CRC: %s, emphasis: %d.\n", + FIXME("Channels: %d, copyright: %s, original: %s, CRC: %s, emphasis: %d.\n", fr->stereo,fr->copyright?"Yes":"No", fr->original?"Yes":"No",fr->error_protection?"Yes":"No", fr->emphasis); - fprintf(stderr,"Bitrate: %d Kbits/s, Extension value: %d\n", + FIXME("Bitrate: %d Kbits/s, Extension value: %d\n", tabsel_123[fr->lsf][fr->lay-1][fr->bitrate_index],fr->extension); } @@ -188,7 +191,7 @@ void print_header_compact(struct frame *fr) static const char * const modes[4] = { "stereo", "joint-stereo", "dual-channel", "mono" }; static const char * const layers[4] = { "Unknown" , "I", "II", "III" }; - fprintf(stderr,"MPEG %s layer %s, %d kbit/s, %ld Hz %s\n", + FIXME("MPEG %s layer %s, %d kbit/s, %ld Hz %s\n", fr->mpeg25 ? "2.5" : (fr->lsf ? "2.0" : "1.0"), layers[fr->lay], tabsel_123[fr->lsf][fr->lay-1][fr->bitrate_index], diff --git a/dlls/winemp3.acm/interface.c b/dlls/winemp3.acm/interface.c index 6ed8562..775c001 100644 --- a/dlls/winemp3.acm/interface.c +++ b/dlls/winemp3.acm/interface.c @@ -16,9 +16,11 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "config.h" #include <stdlib.h> #include <stdio.h> +#include "wine/debug.h" #include "mpg123.h" #include "mpglib.h" diff --git a/dlls/winemp3.acm/layer3.c b/dlls/winemp3.acm/layer3.c index abee543..963fc96 100644 --- a/dlls/winemp3.acm/layer3.c +++ b/dlls/winemp3.acm/layer3.c @@ -20,13 +20,15 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "config.h" #include <stdlib.h> +#include "wine/debug.h" #include "mpg123.h" #include "mpglib.h" #include "huffman.h" #define MPEG1 - +WINE_DEFAULT_DEBUG_CHANNEL(mpeg3); static real ispow[8207]; static real aa_ca[8],aa_cs[8]; @@ -333,7 +335,7 @@ static int III_get_side_info_1(struct III_sideinfo *si,int stereo, gr_info->part2_3_length = getbits(12); gr_info->big_values = getbits_fast(9); if(gr_info->big_values > 288) { - fprintf(stderr,"big_values too large!\n"); + FIXME("big_values (%d) too large!\n", gr_info->big_values); gr_info->big_values = 288; } gr_info->pow2gain = gainpow2+256 - getbits_fast(8) + powdiff; @@ -357,7 +359,7 @@ static int III_get_side_info_1(struct III_sideinfo *si,int stereo, gr_info->full_gain[i] = gr_info->pow2gain + (getbits_fast(3)<<3); if(gr_info->block_type == 0) { - fprintf(stderr,"Blocktype == 0 and window-switching == 1 not allowed.\n"); + FIXME("Blocktype == 0 and window-switching == 1 not allowed.\n"); return 0; } /* region_count/start parameters are implicit in this case. */ @@ -407,7 +409,7 @@ static int III_get_side_info_2(struct III_sideinfo *si,int stereo, gr_info->part2_3_length = getbits(12); gr_info->big_values = getbits_fast(9); if(gr_info->big_values > 288) { - fprintf(stderr,"big_values too large!\n"); + FIXME("big_values(%d) too large!\n", gr_info->big_values); gr_info->big_values = 288; } gr_info->pow2gain = gainpow2+256 - getbits_fast(8) + powdiff; @@ -431,7 +433,7 @@ static int III_get_side_info_2(struct III_sideinfo *si,int stereo, gr_info->full_gain[i] = gr_info->pow2gain + (getbits_fast(3)<<3); if(gr_info->block_type == 0) { - fprintf(stderr,"Blocktype == 0 and window-switching == 1 not allowed.\n"); + FIXME("Blocktype == 0 and window-switching == 1 not allowed.\n"); return 0; } /* region_count/start parameters are implicit in this case. */ @@ -968,7 +970,7 @@ static int III_dequantize_sample(real xr[SBLIMIT][SSLIMIT],int *scf, if(part2remain > 0) getbits(part2remain); else if(part2remain < 0) { - fprintf(stderr,"mpg123: Can't rewind stream by %d bits!\n",-part2remain); + FIXME("mpg123: Can't rewind stream by %d bits!\n",-part2remain); return 1; /* -> error */ } return 0; @@ -1379,7 +1381,7 @@ static int III_dequantize_sample_ms(real xr[2][SBLIMIT][SSLIMIT],int *scf, if(part2remain > 0 ) getbits(part2remain); else if(part2remain < 0) { - fprintf(stderr,"mpg123_ms: Can't rewind stream by %d bits!\n",-part2remain); + FIXME("mpg123_ms: Can't rewind stream by %d bits!\n",-part2remain); return 1; /* -> error */ } return 0; @@ -1917,7 +1919,7 @@ int do_layer3(struct frame *fr,unsigned char *pcm_sample,int *pcm_point) if(!III_get_side_info_1(&sideinfo,stereo,ms_stereo,sfreq,single)) return -1; #else - fprintf(stderr,"Not supported\n"); + FIXME("Not supported\n"); #endif } @@ -1938,7 +1940,7 @@ int do_layer3(struct frame *fr,unsigned char *pcm_sample,int *pcm_point) #ifdef MPEG1 part2bits = III_get_scale_factors_1(scalefacs[0],gr_info); #else - fprintf(stderr,"Not supported\n"); + FIXME("Not supported\n"); #endif } if(III_dequantize_sample(hybridIn[0], scalefacs[0],gr_info,sfreq,part2bits)) @@ -1953,7 +1955,7 @@ int do_layer3(struct frame *fr,unsigned char *pcm_sample,int *pcm_point) #ifdef MPEG1 part2bits = III_get_scale_factors_1(scalefacs[1],gr_info); #else - fprintf(stderr,"Not supported\n"); + FIXME("Not supported\n"); #endif }

1 0

Stefan Dösinger : wined3d: Catch D3DUSAGE_AUTOGENMIPMAP and D3DUSAGE_RENDERTARGET combos.
by Alexandre Julliard April 1, 2008

April 1, 2008

Module: wine Branch: master Commit: ab86a4e963ac30e56d9b6f21a3cd1b1be92fc7e1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab86a4e963ac30e56d9b6f21a… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Mar 28 23:46:38 2008 +0100 wined3d: Catch D3DUSAGE_AUTOGENMIPMAP and D3DUSAGE_RENDERTARGET combos. --- dlls/d3d9/tests/texture.c | 4 ++-- dlls/wined3d/device.c | 13 ++++++++++++- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/dlls/d3d9/tests/texture.c b/dlls/d3d9/tests/texture.c index 0b2e406..72a0561 100644 --- a/dlls/d3d9/tests/texture.c +++ b/dlls/d3d9/tests/texture.c @@ -137,7 +137,7 @@ static void test_cube_texture_mipmap_gen(IDirect3DDevice9 *device_ptr) hr = IDirect3DDevice9_CreateCubeTexture(device_ptr, 64, 0, (D3DUSAGE_RENDERTARGET | D3DUSAGE_AUTOGENMIPMAP), D3DFMT_X8R8G8B8, D3DPOOL_MANAGED, &texture_ptr, 0); - todo_wine ok(hr == D3DERR_INVALIDCALL, "IDirect3DDevice9_CreateTexture returned 0x%08x, expected 0x%08x\n", + ok(hr == D3DERR_INVALIDCALL, "IDirect3DDevice9_CreateTexture returned 0x%08x, expected 0x%08x\n", hr, D3DERR_INVALIDCALL); if (texture_ptr) IDirect3DCubeTexture9_Release(texture_ptr); texture_ptr = NULL; @@ -186,7 +186,7 @@ static void test_mipmap_gen(IDirect3DDevice9 *device) hr = IDirect3DDevice9_CreateTexture(device, 64, 64, 0, (D3DUSAGE_RENDERTARGET | D3DUSAGE_AUTOGENMIPMAP), D3DFMT_X8R8G8B8, D3DPOOL_MANAGED, &texture, 0); - todo_wine ok(hr == D3DERR_INVALIDCALL, "IDirect3DDevice9_CreateTexture returned 0x%08x, expected 0x%08x\n", + ok(hr == D3DERR_INVALIDCALL, "IDirect3DDevice9_CreateTexture returned 0x%08x, expected 0x%08x\n", hr, D3DERR_INVALIDCALL); if (texture) IDirect3DTexture9_Release(texture); texture = NULL; diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 57b6045..1c1da5a 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -768,11 +768,16 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateTexture(IWineD3DDevice *iface, U const GlPixelFormatDesc *glDesc; getFormatDescEntry(Format, &GLINFO_LOCATION, &glDesc); - TRACE("(%p) : Width %d, Height %d, Levels %d, Usage %#x\n", This, Width, Height, Levels, Usage); TRACE("Format %#x (%s), Pool %#x, ppTexture %p, pSharedHandle %p, parent %p\n", Format, debug_d3dformat(Format), Pool, ppTexture, pSharedHandle, parent); + if((Usage & (WINED3DUSAGE_AUTOGENMIPMAP | WINED3DUSAGE_RENDERTARGET)) == + (WINED3DUSAGE_AUTOGENMIPMAP | WINED3DUSAGE_RENDERTARGET)) { + WARN("Application requests both D3DUSAGE_AUTOGENMIPMAP and D3DUSAGE_RENDERTARGET, which are mutually exclusive\n"); + return WINED3DERR_INVALIDCALL; + } + /* TODO: It should only be possible to create textures for formats that are reported as supported */ if (WINED3DFMT_UNKNOWN >= Format) { @@ -1039,6 +1044,12 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateCubeTexture(IWineD3DDevice *iface const GlPixelFormatDesc *glDesc; getFormatDescEntry(Format, &GLINFO_LOCATION, &glDesc); + if((Usage & (WINED3DUSAGE_AUTOGENMIPMAP | WINED3DUSAGE_RENDERTARGET)) == + (WINED3DUSAGE_AUTOGENMIPMAP | WINED3DUSAGE_RENDERTARGET)) { + WARN("Application requests both D3DUSAGE_AUTOGENMIPMAP and D3DUSAGE_RENDERTARGET, which are mutually exclusive\n"); + return WINED3DERR_INVALIDCALL; + } + /* TODO: It should only be possible to create textures for formats that are reported as supported */ if (WINED3DFMT_UNKNOWN >= Format) {

1 0