March 2009 - Wine-commits - list.winehq.org

Aurimas Fischer : comctl32: Add Lithuanian translation.
by Alexandre Julliard 02 Mar '09

02 Mar '09

Module: wine Branch: master Commit: c5d0ff8370ef75d655de52fb6086b3a68f9d02de URL: http://source.winehq.org/git/wine.git/?a=commit;h=c5d0ff8370ef75d655de52fb6… Author: Aurimas Fischer <aurimas(a)gmail.com> Date: Thu Feb 26 17:27:09 2009 +0200 comctl32: Add Lithuanian translation. --- dlls/comctl32/comctl_Lt.rc | 92 ++++++++++++++++++++++++++++++++++++++++++++ dlls/comctl32/rsrc.rc | 1 + 2 files changed, 93 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/comctl_Lt.rc b/dlls/comctl32/comctl_Lt.rc new file mode 100644 index 0000000..bfe0986 --- /dev/null +++ b/dlls/comctl32/comctl_Lt.rc @@ -0,0 +1,92 @@ +/* + * Copyright 2009 Aurimas Fišeras <aurimas(a)gmail.com> + * + * 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 + */ + +/* UTF-8 */ +#pragma code_page(65001) + +LANGUAGE LANG_LITHUANIAN, SUBLANG_NEUTRAL + +IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140 +STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE +CAPTION "%s savybės" +FONT 8, "MS Shell Dlg" +BEGIN + DEFPUSHBUTTON "Gerai", IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP + PUSHBUTTON "Atsisakyti", IDCANCEL,58,122,50,14 + PUSHBUTTON "&Vykdyti", IDC_APPLY_BUTTON,112,122,50,14,WS_DISABLED + PUSHBUTTON "Žinynas", 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 +END + + +IDD_WIZARD DIALOG DISCARDABLE 0, 0, 290, 159 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE +CAPTION "Vediklis" +FONT 8, "MS Shell Dlg" +BEGIN + PUSHBUTTON "< &Atgal", IDC_BACK_BUTTON,71,138,50,14 + DEFPUSHBUTTON "&Toliau >", IDC_NEXT_BUTTON,121,138,50,14 + DEFPUSHBUTTON "Baigti", IDC_FINISH_BUTTON,121,138,50,14 + PUSHBUTTON "Atsisakyti", IDCANCEL,178,138,50,14 + PUSHBUTTON "Žinynas", 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 + LTEXT "", IDC_SUNKEN_LINEHEADER,0,35,290,1,SS_LEFT | SS_SUNKEN | WS_CHILD | WS_VISIBLE +END + + +IDD_TBCUSTOMIZE DIALOG DISCARDABLE 10, 20, 357, 125 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Tinkinti mygtukų juostą" +FONT 8, "MS Shell Dlg" +BEGIN + DEFPUSHBUTTON "&Užverti", IDCANCEL,308,6,44,14 + PUSHBUTTON "A&tstatyti", IDC_RESET_BTN,308,23,44,14 + PUSHBUTTON "&Žinynas", IDC_HELP_BTN,308,40,44,14 + PUSHBUTTON "P&akelti", IDC_MOVEUP_BTN,308,74,44,14 + PUSHBUTTON "&Nuleisti", IDC_MOVEDN_BTN,308,91,44,14 + LTEXT "P&rieinami mygtukai:", -1,4,5,84,10 + LISTBOX IDC_AVAILBTN_LBOX,4,17,120,100, LBS_NOTIFY | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP + PUSHBUTTON "&Pridėti ->", IDOK, 131, 42, 44, 14 + PUSHBUTTON "<- Ša&linti", IDC_REMOVE_BTN,131,62,44,14 + LTEXT "&Mygtukų juostos turinys:", -1,182,5,84,10 + LISTBOX IDC_TOOLBARBTN_LBOX, 182,17,120,100,LBS_NOTIFY | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP +END + +STRINGTABLE DISCARDABLE +{ + IDS_CLOSE "Užverti" +} + +STRINGTABLE DISCARDABLE +{ + IDM_TODAY "Šiandien:" + IDM_GOTODAY "Eiti į šiandien" +} + +STRINGTABLE DISCARDABLE +{ + IDS_SEPARATOR "Skirtukas" +} + +STRINGTABLE DISCARDABLE +{ + HKY_NONE "Joks" +} + +#pragma code_page(default) diff --git a/dlls/comctl32/rsrc.rc b/dlls/comctl32/rsrc.rc index 1d1edb5..1fac6d9 100644 --- a/dlls/comctl32/rsrc.rc +++ b/dlls/comctl32/rsrc.rc @@ -102,6 +102,7 @@ IDI_TT_ERROR_SM ICON LOADONCALL DISCARDABLE idi_tt_error_sm.ico #include "comctl_It.rc" #include "comctl_Ja.rc" #include "comctl_Ko.rc" +#include "comctl_Lt.rc" #include "comctl_Nl.rc" #include "comctl_No.rc" #include "comctl_Pl.rc"

1 0

Aurimas Fischer : shell32: Update Lithuanian translation.
by Alexandre Julliard 02 Mar '09

02 Mar '09

Module: wine Branch: master Commit: 26ad1c99b6d8dfac733a2ad0952c956aa8ead8a7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=26ad1c99b6d8dfac733a2ad09… Author: Aurimas Fischer <aurimas(a)gmail.com> Date: Thu Feb 26 17:36:46 2009 +0200 shell32: Update Lithuanian translation. --- dlls/shell32/shell32_Lt.rc | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/shell32/shell32_Lt.rc b/dlls/shell32/shell32_Lt.rc index bd2a059..411bbe6 100644 --- a/dlls/shell32/shell32_Lt.rc +++ b/dlls/shell32/shell32_Lt.rc @@ -285,6 +285,8 @@ STRINGTABLE IDS_CPANEL_TITLE "Wine valdymo skydelis" IDS_CPANEL_NAME "Pavadinimas" IDS_CPANEL_DESCRIPTION "Aprašas" + + IDS_SHLEXEC_NOASSOC "Jokia Windows programa nėra sukonfigūruota atidaryti šio tipo failų." } STRINGTABLE

1 0

Anders Jonsson : README: Swedish translation.
by Alexandre Julliard 02 Mar '09

02 Mar '09

Module: wine Branch: master Commit: 88d9210dd763bcb9db203daa89f24efc7d5872d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=88d9210dd763bcb9db203daa8… Author: Anders Jonsson <anders.jonsson(a)norsjonet.se> Date: Fri Feb 27 23:52:49 2009 +0100 README: Swedish translation. --- documentation/README.sv | 187 +++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 187 insertions(+), 0 deletions(-) diff --git a/documentation/README.sv b/documentation/README.sv new file mode 100644 index 0000000..7fea59d --- /dev/null +++ b/documentation/README.sv @@ -0,0 +1,187 @@ +1. INLEDNING + +Wine �r ett program som g�r det m�jligt att k�ra Windows-program +(inkluderat DOS, Windows 3.x och Win32) i Unix. Det best�r av en +programstartare som startar och k�r Windows-programfiler, samt ett +bibliotek (kallat Winelib) som implementerar Windows API-anrop med hj�lp +av deras Unix- eller X11-motsvarigheter. Biblioteket kan ocks� anv�ndas +till att porta Win32-kod till vanliga Unix-program. + +Wine �r fri programvara, utgett under villk�ren i GNU LGPL; se +filen LICENSE f�r detaljer. + +2. KOM IG�NG + +N�r du bygger Wine fr�n k�llkod s� rekommenderas du anv�nda Wines +installationsprogram. K�r f�ljande i rotkatalogen f�r Wines k�llkod: + +./tools/wineinstall + +K�r program med "wine [val] program". Se resten av denna fil, +Wines man-sidor samt sist men inte minst http://www.winehq.org/ f�r mer +information och tips om hur problem kan l�sas. + + +3. SYSTEMKRAV + +F�r att kompilera och k�ra Wine kr�vs ett av f�ljande: + + Linux version 2.0.36 eller senare + FreeBSD 6.3 eller senare + Solaris x86 9 eller senare + NetBSD-current + Mac OS X 10.4 eller senare + +Wine kr�ver st�d f�r tr�dar p� kernelniv�, och d�rf�r �r det bara +operativsystemen ovan som st�ds. Andra operativsystem som +st�der kerneltr�dar kommer eventuellt att st�djas i framtiden. + +Information f�r Linux + �ven om Linux 2.2.x antagligen fortfarande fungerar, och Linux 2.0.x kanske + fungerar (tidiga 2.0.x-versioner uppvisade tr�drelaterade problem), s� �r + det b�st att ha en nuvarande kernel som 2.4.x eller 2.6.x. + +Information f�r FreeBSD + Wine kommer i regel inte fungera p� FreeBSD-versioner �ldre �n 6.3 eller 7.0. + FreeBSD 6.3 kan uppdateras for att st�dja Wine. Se + <http://wiki.freebsd.org/Wine> f�r mer information. + +Information f�r Solaris + Wine m�ste antagligen byggas med GNU toolchain (gcc, gas etc.). + Varning: �ven om gas installeras s� �r det inte s�kert att det anv�nds av + gcc. Det s�gs att det �r n�dv�ndigt att antingen bygga gcc p� nytt, eller + skapa symboliska l�nkar fr�n "cc", "as" och "ld" till GNU toolchain. + +Information f�r NetBSD + USER_LDT, SYSVSHM, SYSVSEM och SYSVMSG m�ste vara aktiverade i kerneln. + +Information f�r Mac OS X: + Du beh�ver Xcode 2.4 eller senare f�r att korrekt kunna bygga Wine p� x86. + + +St�dda filsystem + Wine kan k�ra p� de flesta filsystem, men det har rapporterats problem vad + g�ller kompatibilitet d� samba anv�nds f�r att ansluta till filer. NTFS + tillhandah�ller inte heller alla filsystemsfunktioner som beh�vs av alla + program. Det rekommenderas att anv�nda ett Linux-filsystem som exempelvis + ext3. + +Grundl�ggande krav: + Utvecklingsfilerna f�r X11 m�ste vara installerade (de kallas xlib6g-dev i + Debian och XFree86-devel i Red Hat). + + Du m�ste givetvis ocks� ha "make" (mest troligt "GNU make"). + + Det �r ocks� n�dv�ndigt att ha flex 2.5 eller senare samt bison. + +Valfria st�dbibliotek: + configure-skriptet visar varningar n�r valfria bibliotek inte hittats. + Se http://wiki.winehq.org/Recommended_Packages f�r information om + vilka paket du b�r installera. + + P� 64 bit-system m�ste du s�kerst�lla att 32 bit-versionerna av + ovann�mnda bibliotek installerats; se + http://wiki.winehq.org/WineOn64bit f�r n�rmare detaljer. + +4. KOMPILERING + +K�r f�ljande kommandon f�r att bygga Wine om du inte anv�nder wineinstall: + +./configure +make depend +make + +Detta bygger programmet "wine" och diverse st�dbibliotek/programfiler. +Programfilen "wine" laddar och k�r Windows-program. +Biblioteket "libwine" ("Winelib") kan anv�ndas till att bygga och l�nka +Windows-k�llkod i Unix. + +K�r './configure --help' f�r att se inst�llningar och val vid kompilering. + +G�r f�ljande f�r att uppgradera till en ny utg�va med hj�lp av en +uppdateringsfil: +G� in i utg�vans rotkatalog och k�r kommandot "make clean". +D�refter uppdaterar du utg�van med + + bunzip -c uppdateringsfil | patch -p1 + +d�r "uppdateringsfil" �r namnet p� uppdateringsfilen (n�got i stil med +wine-1.0.x.diff.bz2). D�refter kan du k�ra "./configure" och +"make depend && make". + + +5. INSTALLATION + +N�r Wine �r byggt kan du k�ra "make install" f�r att installera det; +detta installerar ocks� man-sidorna och n�gra fler n�dv�ndiga filer. + +Gl�m inte att f�rst avinstallera gamla Wine-versioner. Pr�va antingen +"dpkg -r wine", "rpm -e wine" eller "make uninstall" f�re installationen. + +N�r Wine �r installerat kan du anv�nda inst�llningsprogrammet "winecfg". +Se hj�lpavdelningen p� http://www.winehq.org/ f�r tips om inst�llningar. + + +6. K�RNING AV PROGRAM + +N�r du anv�nder Wine kan du uppge hela s�kv�gen till programfilen, eller +enbart ett filnamn. + +Exempel: f�r att k�ra Notepad: + + wine notepad (anv�nder s�kv�gen angiven i Wines + wine notepad.exe konfigurationsfil f�r att finna filen) + + wine c:\\windows\\notepad.exe (anv�ndning av DOS-filnamnssyntax) + + wine ~/.wine/drive_c/windows/notepad.exe (anv�ndning av Unix-filv�gar) + + wine notepad.exe /parameter1 -parameter2 parameter3 + (k�ra program med parametrar) + +Wine �r inte �nnu f�rdigutvecklat, s� det �r m�jligt att �tskilliga program +kraschar. I s� fall �ppnas Wines fels�kare, d�r du kan unders�ka och fixa +problemet. L�s delen "debugging" i Wines utvecklarmanual f�r mer information +om hur detta kan g�ras. + + +7. MER INFORMATION + +Internet: Mycket information om Wine finns samlat p� WineHQ p� + http://www.winehq.org/ : diverse guider, en programdatabas samt + felsp�rning. Detta �r antagligen det b�sta st�llet att b�rja. + +Fr�gor: Fr�gor och svar om Wine finns samlade p� http://www.winehq.org/FAQ + +Usenet: Du kan diskutera problem med Wine och f� hj�lp p� + comp.emulators.ms-windows.wine. + +Fel: Rapportera fel till Wines Bugzilla p� http://bugs.winehq.org + S�k i Bugzilla-databasen f�r att se om problemet redan finns + rapporterat innan du s�nder en felrapport. Du kan ocks� rapportera + fel till comp.emulators.ms-windows.wine. + +IRC: Hj�lp finns tillg�nglig online p� kanalen #WineHQ p� + irc.freenode.net. + +GIT: Wines nuvarande utvecklingsversion finns tillg�nglig genom GIT. + G� till http://www.winehq.org/git f�r mer information. + +E-postlistor: + Det finns flera e-postlistor f�r Wine-utvecklare; se + http://www.winehq.org/forums f�r mer information. + +Wiki: Wines Wiki finns p� http://wiki.winehq.org + +Om du l�gger till n�got eller fixar ett fel, �r det bra om du s�nder +en patch (i 'diff -u'-format) till listan wine-patches(a)winehq.org f�r +inkludering i n�sta utg�va av Wine. + +-- +Originalet till denna fil skrevs av +Alexandre Julliard +julliard(a)winehq.org + +�versatt till svenska av +Anders Jonsson +anders.jonsson(a)norsjonet.se

1 0

Tony Wasserka : d3dx9: ID3DXSprite: Move vdecl creation to ID3DXSprite_Begin.
by Alexandre Julliard 02 Mar '09

02 Mar '09

Module: wine Branch: master Commit: ceac557f592681e1f82bdca5019396be3961d090 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ceac557f592681e1f82bdca50… Author: Tony Wasserka <tony.wasserka(a)freenet.de> Date: Sat Nov 15 12:48:51 2008 +0100 d3dx9: ID3DXSprite: Move vdecl creation to ID3DXSprite_Begin. --- dlls/d3dx9_36/sprite.c | 21 ++++++++++++--------- 1 files changed, 12 insertions(+), 9 deletions(-) diff --git a/dlls/d3dx9_36/sprite.c b/dlls/d3dx9_36/sprite.c index 3924bba..3699508 100644 --- a/dlls/d3dx9_36/sprite.c +++ b/dlls/d3dx9_36/sprite.c @@ -225,6 +225,17 @@ D3DXSPRITE_SORT_TEXTURE: sort by texture (so that it doesn't change too often) D3DXSPRITE_DO_NOT_ADDREF_TEXTURE: don't call AddRef/Release on every Draw/Flush call D3DXSPRITE_DONOTSAVESTATE: don't restore the current device state on ID3DXSprite_End */ + if(This->vdecl==NULL) { + static const D3DVERTEXELEMENT9 elements[] = + { + { 0, 0, D3DDECLTYPE_FLOAT3, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_POSITION, 0 }, + { 0, 12, D3DDECLTYPE_D3DCOLOR, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_COLOR, 0 }, + { 0, 16, D3DDECLTYPE_FLOAT2, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_TEXCOORD, 0 }, + D3DDECL_END() + }; + IDirect3DDevice9_CreateVertexDeclaration(This->device, elements, &This->vdecl); + } + if(This->stateblock==NULL) { /* Tell our state block what it must store */ hr=IDirect3DDevice9_BeginStateBlock(This->device); @@ -434,14 +445,6 @@ HRESULT WINAPI D3DXCreateSprite(LPDIRECT3DDEVICE9 device, LPD3DXSPRITE *sprite) { ID3DXSpriteImpl *object; D3DCAPS9 caps; - static const D3DVERTEXELEMENT9 elements[] = - { - { 0, 0, D3DDECLTYPE_FLOAT3, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_POSITION, 0 }, - { 0, 12, D3DDECLTYPE_D3DCOLOR, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_COLOR, 0 }, - { 0, 16, D3DDECLTYPE_FLOAT2, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_TEXCOORD, 0 }, - D3DDECL_END() - }; - TRACE("(void): relay\n"); if(device==NULL || sprite==NULL) return D3DERR_INVALIDCALL; @@ -456,7 +459,7 @@ HRESULT WINAPI D3DXCreateSprite(LPDIRECT3DDEVICE9 device, LPD3DXSPRITE *sprite) object->device=device; IUnknown_AddRef(device); - IDirect3DDevice9_CreateVertexDeclaration(object->device, elements, &object->vdecl); + object->vdecl=NULL; object->stateblock=NULL; D3DXMatrixIdentity(&object->transform);

1 0

Rein Klazes : user32: MENU_TrackMenu, called from TrackPopupMenu(), should send WM_ENTERIDLE message with the menu window handle as lparam with test .
by Alexandre Julliard 02 Mar '09

02 Mar '09

Module: wine Branch: master Commit: 5c130c813a5d070a92a9de9330382b47b44380ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c130c813a5d070a92a9de933… Author: Rein Klazes <wijn(a)online.nl> Date: Fri Feb 27 17:34:46 2009 +0100 user32: MENU_TrackMenu, called from TrackPopupMenu(), should send WM_ENTERIDLE message with the menu window handle as lparam with test. --- dlls/user32/menu.c | 7 +++---- dlls/user32/tests/menu.c | 1 + 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/user32/menu.c b/dlls/user32/menu.c index ef2b37e..8bcd235 100644 --- a/dlls/user32/menu.c +++ b/dlls/user32/menu.c @@ -137,7 +137,6 @@ typedef struct /* Internal MENU_TrackMenu() flags */ #define TPM_INTERNAL 0xF0000000 -#define TPM_ENTERIDLEEX 0x80000000 /* set owner window for WM_ENTERIDLE */ #define TPM_BUTTONDOWN 0x40000000 /* menu was clicked before tracking */ #define TPM_POPUPMENU 0x20000000 /* menu is a popup menu */ @@ -3084,7 +3083,7 @@ static BOOL MENU_TrackMenu( HMENU hmenu, UINT wFlags, INT x, INT y, { if (!enterIdleSent) { - HWND win = (wFlags & TPM_ENTERIDLEEX && menu->wFlags & MF_POPUP) ? menu->hWnd : 0; + HWND win = menu->wFlags & MF_POPUP ? menu->hWnd : 0; enterIdleSent = TRUE; SendMessageW( mt.hOwnerWnd, WM_ENTERIDLE, MSGF_MENU, (LPARAM)win ); } @@ -3375,7 +3374,7 @@ static BOOL MENU_ExitTracking(HWND hWnd) void MENU_TrackMouseMenuBar( HWND hWnd, INT ht, POINT pt ) { HMENU hMenu = (ht == HTSYSMENU) ? get_win_sys_menu( hWnd ) : GetMenu( hWnd ); - UINT wFlags = TPM_ENTERIDLEEX | TPM_BUTTONDOWN | TPM_LEFTALIGN | TPM_LEFTBUTTON; + UINT wFlags = TPM_BUTTONDOWN | TPM_LEFTALIGN | TPM_LEFTBUTTON; TRACE("wnd=%p ht=0x%04x %s\n", hWnd, ht, wine_dbgstr_point( &pt)); @@ -3397,7 +3396,7 @@ void MENU_TrackKbdMenuBar( HWND hwnd, UINT wParam, WCHAR wChar) { UINT uItem = NO_SELECTED_ITEM; HMENU hTrackMenu; - UINT wFlags = TPM_ENTERIDLEEX | TPM_LEFTALIGN | TPM_LEFTBUTTON; + UINT wFlags = TPM_LEFTALIGN | TPM_LEFTBUTTON; TRACE("hwnd %p wParam 0x%04x wChar 0x%04x\n", hwnd, wParam, wChar); diff --git a/dlls/user32/tests/menu.c b/dlls/user32/tests/menu.c index a79c540..921aade 100644 --- a/dlls/user32/tests/menu.c +++ b/dlls/user32/tests/menu.c @@ -211,6 +211,7 @@ static LRESULT WINAPI menu_ownerdraw_wnd_proc(HWND hwnd, UINT msg, } case WM_ENTERIDLE: { + ok( lparam, "Menu window handle is NULL!\n"); PostMessage(hwnd, WM_CANCELMODE, 0, 0); return TRUE; }

1 0

Stefano Guidoni : imaadp32: block align the adpcm extra data.
by Alexandre Julliard 02 Mar '09

02 Mar '09

Module: wine Branch: master Commit: c7fb665a927270f86ae2efc2ed130265b45cf903 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c7fb665a927270f86ae2efc2e… Author: Stefano Guidoni <s.guidoni(a)tin.it> Date: Fri Feb 27 19:59:11 2009 +0100 imaadp32: block align the adpcm extra data. --- dlls/imaadp32.acm/imaadp32.c | 32 ++++++++++++++++++++++++-------- 1 files changed, 24 insertions(+), 8 deletions(-) diff --git a/dlls/imaadp32.acm/imaadp32.c b/dlls/imaadp32.acm/imaadp32.c index dd3cc5d..4a8e3cb 100644 --- a/dlls/imaadp32.acm/imaadp32.c +++ b/dlls/imaadp32.acm/imaadp32.c @@ -775,6 +775,8 @@ static LRESULT ADPCM_StreamClose(PACMDRVSTREAMINSTANCE adsi) */ static LRESULT ADPCM_StreamSize(const ACMDRVSTREAMINSTANCE *adsi, PACMDRVSTREAMSIZE adss) { + DWORD nblocks; + switch (adss->fdwSize) { case ACM_STREAMSIZEF_DESTINATION: @@ -782,14 +784,18 @@ static LRESULT ADPCM_StreamSize(const ACMDRVSTREAMINSTANCE *adsi, PACMDRVSTREAMS if (adsi->pwfxSrc->wFormatTag == WAVE_FORMAT_PCM && adsi->pwfxDst->wFormatTag == WAVE_FORMAT_IMA_ADPCM) { - /* don't take block overhead into account, doesn't matter too much */ - adss->cbSrcLength = adss->cbDstLength * 4; + nblocks = adss->cbDstLength / adsi->pwfxDst->nBlockAlign; + if (nblocks == 0) + return ACMERR_NOTPOSSIBLE; + adss->cbSrcLength = nblocks * adsi->pwfxSrc->nBlockAlign * ((IMAADPCMWAVEFORMAT*)adsi->pwfxDst)->wSamplesPerBlock; } else if (adsi->pwfxSrc->wFormatTag == WAVE_FORMAT_IMA_ADPCM && adsi->pwfxDst->wFormatTag == WAVE_FORMAT_PCM) { - FIXME("misses the block header overhead\n"); - adss->cbSrcLength = 256 + adss->cbDstLength / 4; + nblocks = adss->cbDstLength / (adsi->pwfxDst->nBlockAlign * ((IMAADPCMWAVEFORMAT*)adsi->pwfxSrc)->wSamplesPerBlock); + if (nblocks == 0) + return ACMERR_NOTPOSSIBLE; + adss->cbSrcLength = nblocks * adsi->pwfxSrc->nBlockAlign; } else { @@ -801,14 +807,24 @@ static LRESULT ADPCM_StreamSize(const ACMDRVSTREAMINSTANCE *adsi, PACMDRVSTREAMS if (adsi->pwfxSrc->wFormatTag == WAVE_FORMAT_PCM && adsi->pwfxDst->wFormatTag == WAVE_FORMAT_IMA_ADPCM) { - FIXME("misses the block header overhead\n"); - adss->cbDstLength = 256 + adss->cbSrcLength / 4; + nblocks = adss->cbSrcLength / (adsi->pwfxSrc->nBlockAlign * ((IMAADPCMWAVEFORMAT*)adsi->pwfxDst)->wSamplesPerBlock); + if (nblocks == 0) + return ACMERR_NOTPOSSIBLE; + if (adss->cbSrcLength % (adsi->pwfxSrc->nBlockAlign * ((IMAADPCMWAVEFORMAT*)adsi->pwfxDst)->wSamplesPerBlock)) + /* Round block count up. */ + nblocks++; + adss->cbDstLength = nblocks * adsi->pwfxDst->nBlockAlign; } else if (adsi->pwfxSrc->wFormatTag == WAVE_FORMAT_IMA_ADPCM && adsi->pwfxDst->wFormatTag == WAVE_FORMAT_PCM) { - /* don't take block overhead into account, doesn't matter too much */ - adss->cbDstLength = adss->cbSrcLength * 4; + nblocks = adss->cbSrcLength / adsi->pwfxSrc->nBlockAlign; + if (nblocks == 0) + return ACMERR_NOTPOSSIBLE; + if (adss->cbSrcLength % adsi->pwfxSrc->nBlockAlign) + /* Round block count up. */ + nblocks++; + adss->cbDstLength = nblocks * adsi->pwfxDst->nBlockAlign * ((IMAADPCMWAVEFORMAT*)adsi->pwfxSrc)->wSamplesPerBlock; } else {

1 0

Stefano Guidoni : imaadp32: Fixed adpcm_FormatSuggest.
by Alexandre Julliard 02 Mar '09

02 Mar '09

Module: wine Branch: master Commit: fdb7d53fbb54549539f09f572c25be1b0445bc78 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fdb7d53fbb54549539f09f572… Author: Stefano Guidoni <s.guidoni(a)tin.it> Date: Sun Mar 1 00:10:15 2009 +0100 imaadp32: Fixed adpcm_FormatSuggest. --- dlls/imaadp32.acm/imaadp32.c | 36 ++++++++++++++++++++++++++++++------ 1 files changed, 30 insertions(+), 6 deletions(-) diff --git a/dlls/imaadp32.acm/imaadp32.c b/dlls/imaadp32.acm/imaadp32.c index 4a8e3cb..9ad577e 100644 --- a/dlls/imaadp32.acm/imaadp32.c +++ b/dlls/imaadp32.acm/imaadp32.c @@ -123,6 +123,30 @@ static DWORD ADPCM_GetFormatIndex(const WAVEFORMATEX *wfx) return 0xFFFFFFFF; } +static void init_wfx_ima_adpcm(IMAADPCMWAVEFORMAT* awfx/*, DWORD nba*/) +{ + register WAVEFORMATEX* pwfx = &awfx->wfx; + + /* we assume wFormatTag, nChannels, nSamplesPerSec and wBitsPerSample + * have been initialized... */ + + if (pwfx->wFormatTag != WAVE_FORMAT_IMA_ADPCM) {FIXME("wrong FT\n"); return;} + if (ADPCM_GetFormatIndex(pwfx) == 0xFFFFFFFF) {FIXME("wrong fmt\n"); return;} + + switch (pwfx->nSamplesPerSec) + { + case 8000: pwfx->nBlockAlign = 256 * pwfx->nChannels; break; + case 11025: pwfx->nBlockAlign = 256 * pwfx->nChannels; break; + case 22050: pwfx->nBlockAlign = 512 * pwfx->nChannels; break; + case 44100: pwfx->nBlockAlign = 1024 * pwfx->nChannels; break; + default: /*pwfx->nBlockAlign = nba;*/ break; + } + pwfx->cbSize = sizeof(WORD); + + awfx->wSamplesPerBlock = (pwfx->nBlockAlign - (4 * pwfx->nChannels) * 2) / pwfx->nChannels + 1; + pwfx->nAvgBytesPerSec = (pwfx->nSamplesPerSec * pwfx->nBlockAlign) / awfx->wSamplesPerBlock; +} + /*********************************************************************** * R16 * @@ -612,6 +636,7 @@ static LRESULT ADPCM_FormatSuggest(PACMDRVFORMATSUGGEST adfs) /* some tests ... */ if (adfs->cbwfxSrc < sizeof(PCMWAVEFORMAT) || adfs->cbwfxDst < sizeof(PCMWAVEFORMAT) || + adfs->pwfxSrc->wFormatTag == adfs->pwfxDst->wFormatTag || ADPCM_GetFormatIndex(adfs->pwfxSrc) == 0xFFFFFFFF) return ACMERR_NOTPOSSIBLE; /* FIXME: should do those tests against the real size (according to format tag */ @@ -636,22 +661,21 @@ static LRESULT ADPCM_FormatSuggest(PACMDRVFORMATSUGGEST adfs) adfs->pwfxDst->wFormatTag = WAVE_FORMAT_PCM; } - /* check if result is ok */ - if (ADPCM_GetFormatIndex(adfs->pwfxDst) == 0xFFFFFFFF) return ACMERR_NOTPOSSIBLE; - /* recompute other values */ switch (adfs->pwfxDst->wFormatTag) { case WAVE_FORMAT_PCM: adfs->pwfxDst->nBlockAlign = (adfs->pwfxDst->nChannels * adfs->pwfxDst->wBitsPerSample) / 8; adfs->pwfxDst->nAvgBytesPerSec = adfs->pwfxDst->nSamplesPerSec * adfs->pwfxDst->nBlockAlign; + /* check if result is ok */ + if (ADPCM_GetFormatIndex(adfs->pwfxDst) == 0xFFFFFFFF) return ACMERR_NOTPOSSIBLE; break; case WAVE_FORMAT_IMA_ADPCM: - adfs->pwfxDst->nBlockAlign = 1024; + init_wfx_ima_adpcm((IMAADPCMWAVEFORMAT*)adfs->pwfxDst); /* FIXME: not handling header overhead */ - adfs->pwfxDst->nAvgBytesPerSec = ((adfs->pwfxDst->nSamplesPerSec * 4) / 8) * adfs->pwfxSrc->nChannels; - ((IMAADPCMWAVEFORMAT*)adfs->pwfxDst)->wSamplesPerBlock = (1024 - 4 * adfs->pwfxSrc->nChannels) * (2 / adfs->pwfxSrc->nChannels) + 1; TRACE("setting spb=%u\n", ((IMAADPCMWAVEFORMAT*)adfs->pwfxDst)->wSamplesPerBlock); + /* check if result is ok */ + if (ADPCM_GetFormatIndex(adfs->pwfxDst) == 0xFFFFFFFF) return ACMERR_NOTPOSSIBLE; break; default: FIXME("\n");

1 0

Stefano Guidoni : imaadp32: Support for non-standard formats.
by Alexandre Julliard 02 Mar '09

02 Mar '09

Module: wine Branch: master Commit: b7d766d94c9f2340a8a359a0cc7dae4b0408afec URL: http://source.winehq.org/git/wine.git/?a=commit;h=b7d766d94c9f2340a8a359a0c… Author: Stefano Guidoni <s.guidoni(a)tin.it> Date: Fri Feb 27 20:11:04 2009 +0100 imaadp32: Support for non-standard formats. --- dlls/imaadp32.acm/imaadp32.c | 19 +++++++++++++++++++ 1 files changed, 19 insertions(+), 0 deletions(-) diff --git a/dlls/imaadp32.acm/imaadp32.c b/dlls/imaadp32.acm/imaadp32.c index 9ad577e..6174c85 100644 --- a/dlls/imaadp32.acm/imaadp32.c +++ b/dlls/imaadp32.acm/imaadp32.c @@ -120,6 +120,25 @@ static DWORD ADPCM_GetFormatIndex(const WAVEFORMATEX *wfx) return i; } + switch (wfx->wFormatTag) + { + case WAVE_FORMAT_PCM: + if(3 > wfx->nChannels && + wfx->nChannels > 0 && + wfx->nAvgBytesPerSec == 2 * wfx->nSamplesPerSec * wfx->nChannels && + wfx->nBlockAlign == 2 * wfx->nChannels && + wfx->wBitsPerSample == 16) + return hi; + break; + case WAVE_FORMAT_IMA_ADPCM: + if(3 > wfx->nChannels && + wfx->nChannels > 0 && + wfx->wBitsPerSample == 4 && + wfx->cbSize == 2) + return hi; + break; + } + return 0xFFFFFFFF; }

1 0

Alistair Leslie-Hughes : mshtml: Implement IHTMLStyle get/ put textDecorationNone.
by Alexandre Julliard 02 Mar '09

02 Mar '09

Module: wine Branch: master Commit: c9f4c2298ab3535dae8f91f45d11c58a5c0eb3ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=c9f4c2298ab3535dae8f91f45… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sun Mar 1 16:53:52 2009 +1100 mshtml: Implement IHTMLStyle get/put textDecorationNone. --- dlls/mshtml/htmlstyle.c | 15 ++++++++++----- dlls/mshtml/tests/dom.c | 16 ++++++++++++++++ 2 files changed, 26 insertions(+), 5 deletions(-) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index ce5dba2..293ddf0 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -156,6 +156,8 @@ static const WCHAR valUnderline[] = {'u','n','d','e','r','l','i','n','e',0}; static const WCHAR szNormal[] = {'n','o','r','m','a','l',0}; +static const WCHAR styleNone[] = + {'n','o','n','e',0}; static const WCHAR px_formatW[] = {'%','d','p','x',0}; static const WCHAR emptyW[] = {0}; @@ -436,7 +438,6 @@ static HRESULT get_nsstyle_pos(HTMLStyle *This, styleid_t sid, float *p) static BOOL is_valid_border_style(BSTR v) { - static const WCHAR styleNone[] = {'n','o','n','e',0}; static const WCHAR styleDotted[] = {'d','o','t','t','e','d',0}; static const WCHAR styleDashed[] = {'d','a','s','h','e','d',0}; static const WCHAR styleSolid[] = {'s','o','l','i','d',0}; @@ -935,15 +936,19 @@ static HRESULT WINAPI HTMLStyle_get_textDecoration(IHTMLStyle *iface, BSTR *p) static HRESULT WINAPI HTMLStyle_put_textDecorationNone(IHTMLStyle *iface, VARIANT_BOOL v) { HTMLStyle *This = HTMLSTYLE_THIS(iface); - FIXME("(%p)->(%x)\n", This, v); - return E_NOTIMPL; + + TRACE("(%p)->(%x)\n", This, v); + + return set_style_attr(This, STYLEID_TEXT_DECORATION, v ? styleNone : emptyW, 0); } static HRESULT WINAPI HTMLStyle_get_textDecorationNone(IHTMLStyle *iface, VARIANT_BOOL *p) { HTMLStyle *This = HTMLSTYLE_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + return check_style_attr_value(This, STYLEID_TEXT_DECORATION, styleNone, p); } static HRESULT WINAPI HTMLStyle_put_textDecorationUnderline(IHTMLStyle *iface, VARIANT_BOOL v) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 37cc549..86c25b0 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -2750,6 +2750,22 @@ static void test_default_style(IHTMLStyle *style) hres = IHTMLStyle_put_textDecorationLineThrough(style, VARIANT_FALSE); ok(hres == S_OK, "put_textDecorationLineThrough failed: %08x\n", hres); + b = 0xfefe; + hres = IHTMLStyle_get_textDecorationNone(style, &b); + ok(hres == S_OK, "get_textDecorationNone failed: %08x\n", hres); + ok(b == VARIANT_FALSE, "textDecorationNone = %x\n", b); + + hres = IHTMLStyle_put_textDecorationNone(style, VARIANT_TRUE); + ok(hres == S_OK, "put_textDecorationNone failed: %08x\n", hres); + ok(b == VARIANT_FALSE, "textDecorationNone = %x\n", b); + + hres = IHTMLStyle_get_textDecorationNone(style, &b); + ok(hres == S_OK, "get_textDecorationNone failed: %08x\n", hres); + ok(b == VARIANT_TRUE, "textDecorationNone = %x\n", b); + + hres = IHTMLStyle_put_textDecorationNone(style, VARIANT_FALSE); + ok(hres == S_OK, "put_textDecorationNone failed: %08x\n", hres); + hres = IHTMLStyle_get_posWidth(style, NULL); ok(hres == E_POINTER, "get_posWidth failed: %08x\n", hres);

1 0

Alistair Leslie-Hughes : mshtml: Implement IHTMLStyle get/ put textDecorationOverline.
by Alexandre Julliard 02 Mar '09

02 Mar '09

Module: wine Branch: master Commit: cbbdc41bdfe9ce27ed82eb2d82394a9ced3443d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cbbdc41bdfe9ce27ed82eb2d8… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sun Mar 1 19:57:37 2009 +1100 mshtml: Implement IHTMLStyle get/put textDecorationOverline. --- dlls/mshtml/htmlstyle.c | 14 ++++++++++---- dlls/mshtml/tests/dom.c | 16 ++++++++++++++++ 2 files changed, 26 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index 293ddf0..14de764 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -158,6 +158,8 @@ static const WCHAR szNormal[] = {'n','o','r','m','a','l',0}; static const WCHAR styleNone[] = {'n','o','n','e',0}; +static const WCHAR valOverline[] = + {'o','v','e','r','l','i','n','e',0}; static const WCHAR px_formatW[] = {'%','d','p','x',0}; static const WCHAR emptyW[] = {0}; @@ -972,15 +974,19 @@ static HRESULT WINAPI HTMLStyle_get_textDecorationUnderline(IHTMLStyle *iface, V static HRESULT WINAPI HTMLStyle_put_textDecorationOverline(IHTMLStyle *iface, VARIANT_BOOL v) { HTMLStyle *This = HTMLSTYLE_THIS(iface); - FIXME("(%p)->(%x)\n", This, v); - return E_NOTIMPL; + + TRACE("(%p)->(%x)\n", This, v); + + return set_style_attr(This, STYLEID_TEXT_DECORATION, v ? valOverline : emptyW, 0); } static HRESULT WINAPI HTMLStyle_get_textDecorationOverline(IHTMLStyle *iface, VARIANT_BOOL *p) { HTMLStyle *This = HTMLSTYLE_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + return check_style_attr_value(This, STYLEID_TEXT_DECORATION, valOverline, p); } static HRESULT WINAPI HTMLStyle_put_textDecorationLineThrough(IHTMLStyle *iface, VARIANT_BOOL v) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 86c25b0..bf37cfc 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -2766,6 +2766,22 @@ static void test_default_style(IHTMLStyle *style) hres = IHTMLStyle_put_textDecorationNone(style, VARIANT_FALSE); ok(hres == S_OK, "put_textDecorationNone failed: %08x\n", hres); + b = 0xfefe; + hres = IHTMLStyle_get_textDecorationOverline(style, &b); + ok(hres == S_OK, "get_textDecorationOverline failed: %08x\n", hres); + ok(b == VARIANT_FALSE, "textDecorationOverline = %x\n", b); + + hres = IHTMLStyle_put_textDecorationOverline(style, VARIANT_TRUE); + ok(hres == S_OK, "put_textDecorationOverline failed: %08x\n", hres); + ok(b == VARIANT_FALSE, "textDecorationOverline = %x\n", b); + + hres = IHTMLStyle_get_textDecorationOverline(style, &b); + ok(hres == S_OK, "get_textDecorationOverline failed: %08x\n", hres); + ok(b == VARIANT_TRUE, "textDecorationOverline = %x\n", b); + + hres = IHTMLStyle_put_textDecorationOverline(style, VARIANT_FALSE); + ok(hres == S_OK, "put_textDecorationOverline failed: %08x\n", hres); + hres = IHTMLStyle_get_posWidth(style, NULL); ok(hres == E_POINTER, "get_posWidth failed: %08x\n", hres);

1 0