wine-commits June 2009

wine-commits@winehq.org

5 participants
1115 discussions

Huw Davies : gdi32: Implement GetTransform for the other valid transform types.
by Alexandre Julliard 24 Jun '09

24 Jun '09

Module: wine Branch: master Commit: 6260af2a7cceb77ce240d48b7b9eec44f2ec39cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=6260af2a7cceb77ce240d48b7… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Jun 24 11:42:51 2009 +0100 gdi32: Implement GetTransform for the other valid transform types. --- dlls/gdi32/dc.c | 75 +++++++++++++++++++++++++++++++++++++++++++----------- 1 files changed, 59 insertions(+), 16 deletions(-) diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index 30bd7a4..db8a91b 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -284,6 +284,20 @@ static BOOL DC_InvertXform( const XFORM *xformSrc, XFORM *xformDest ) return TRUE; } +/* Construct a transformation to do the window-to-viewport conversion */ +static void construct_window_to_viewport(DC *dc, XFORM *xform) +{ + double scaleX, scaleY; + scaleX = (double)dc->vportExtX / (double)dc->wndExtX; + scaleY = (double)dc->vportExtY / (double)dc->wndExtY; + + xform->eM11 = scaleX; + xform->eM12 = 0.0; + xform->eM21 = 0.0; + xform->eM22 = scaleY; + xform->eDx = (double)dc->vportOrgX - scaleX * (double)dc->wndOrgX; + xform->eDy = (double)dc->vportOrgY - scaleY * (double)dc->wndOrgY; +} /*********************************************************************** * DC_UpdateXforms @@ -298,19 +312,8 @@ static BOOL DC_InvertXform( const XFORM *xformSrc, XFORM *xformDest ) void DC_UpdateXforms( DC *dc ) { XFORM xformWnd2Vport, oldworld2vport; - double scaleX, scaleY; - /* Construct a transformation to do the window-to-viewport conversion */ - scaleX = (double)dc->vportExtX / (double)dc->wndExtX; - scaleY = (double)dc->vportExtY / (double)dc->wndExtY; - xformWnd2Vport.eM11 = scaleX; - xformWnd2Vport.eM12 = 0.0; - xformWnd2Vport.eM21 = 0.0; - xformWnd2Vport.eM22 = scaleY; - xformWnd2Vport.eDx = (double)dc->vportOrgX - - scaleX * (double)dc->wndOrgX; - xformWnd2Vport.eDy = (double)dc->vportOrgY - - scaleY * (double)dc->wndOrgY; + construct_window_to_viewport(dc, &xformWnd2Vport); oldworld2vport = dc->xformWorld2Vport; /* Combine with the world transformation */ @@ -1164,12 +1167,52 @@ BOOL WINAPI GetWorldTransform( HDC hdc, LPXFORM xform ) /*********************************************************************** * GetTransform (GDI32.@) + * + * Undocumented + * + * Returns one of the co-ordinate space transforms + * + * PARAMS + * hdc [I] Device context. + * which [I] Which xform to return: + * 0x203 World -> Page transform (that set by SetWorldTransform). + * 0x304 Page -> Device transform (the mapping mode transform). + * 0x204 World -> Device transform (the combination of the above two). + * 0x402 Device -> World transform (the inversion of the above). + * xform [O] The xform. + * */ -BOOL WINAPI GetTransform( HDC hdc, DWORD unknown, LPXFORM xform ) +BOOL WINAPI GetTransform( HDC hdc, DWORD which, XFORM *xform ) { - if (unknown == 0x0203) return GetWorldTransform( hdc, xform ); - FIXME("stub: don't know what to do for code %x\n", unknown ); - return FALSE; + BOOL ret = TRUE; + DC *dc = get_dc_ptr( hdc ); + if (!dc) return FALSE; + + switch(which) + { + case 0x203: + *xform = dc->xformWorld2Wnd; + break; + + case 0x304: + construct_window_to_viewport(dc, xform); + break; + + case 0x204: + *xform = dc->xformWorld2Vport; + break; + + case 0x402: + *xform = dc->xformVport2World; + break; + + default: + FIXME("Unknown code %x\n", which); + ret = FALSE; + } + + release_dc_ptr( dc ); + return ret; }

1 0

Aurimas Fišeras : clock: Add Lithuanian translation.
by Alexandre Julliard 24 Jun '09

24 Jun '09

Module: wine Branch: master Commit: c87200f6a74fb9fa4f7f726dc48bc6945b833795 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c87200f6a74fb9fa4f7f726dc… Author: Aurimas Fišeras <aurimas(a)gmail.com> Date: Sat Jun 13 10:45:07 2009 +0300 clock: Add Lithuanian translation. --- programs/clock/Lt.rc | 79 ++++++++++++++++++++++++++++++++++++++++++++ programs/clock/Makefile.in | 1 + 2 files changed, 80 insertions(+), 0 deletions(-) diff --git a/programs/clock/Lt.rc b/programs/clock/Lt.rc new file mode 100644 index 0000000..e516f4a --- /dev/null +++ b/programs/clock/Lt.rc @@ -0,0 +1,79 @@ +/* + * Clock (Lithuanian resources) + * + * 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 + */ + +#include "clock_res.h" + +/* UTF-8 */ +#pragma code_page(65001) + +LANGUAGE LANG_LITHUANIAN, SUBLANG_NEUTRAL + +MAIN_MENU MENU +{ + POPUP "&Savybės" { + MENUITEM "Ana&loginis", IDM_ANALOG + MENUITEM "Skai&tmeninis", IDM_DIGITAL + MENUITEM SEPARATOR + MENUITEM "&Šriftas...", IDM_FONT + MENUITEM SEPARATOR + MENUITEM "&Be lango antraštės juostos", IDM_NOTITLE + MENUITEM SEPARATOR + MENUITEM "S&ekundės", IDM_SECONDS + MENUITEM "&Data", IDM_DATE + MENUITEM SEPARATOR + MENUITEM "&Visada viršuje", IDM_ONTOP + } + POPUP "&Informacija" { + MENUITEM "&Licencija...", IDM_LICENSE + MENUITEM "JOKIŲ &GARANTIJŲ...", IDM_NOWARRANTY + MENUITEM "&Apie laikrodį...", IDM_ABOUT + } +} + +STRINGTABLE DISCARDABLE +{ +IDS_CLOCK, "Laikrodis" +} + +STRINGTABLE DISCARDABLE +{ +IDS_LICENSE_CAPTION, "LICENCIJA" +IDS_LICENSE, +"Ši programa yra laisva programinė įranga; galite ją platinti ir/ar \ +modifikuoti GNU laisvosios bendrosios viešosios licencijos (LGPL) \ +sąlygomis, kurios paskelbtos Laisvosios programinės įrangos fondo \ +(FSF); 2.1-osios arba (Jūsų pasirinkimu) bet kurios vėlesnės \ +licencijos versijos sąlygomis.\n\ +Ši programa yra platinama tikintis, kad ji bus naudinga, bet BE JOKIŲ \ +GARANTIJŲ; net be numanomų PERKAMUMO ar TINKAMUMO KONKREČIAI \ +UŽDUOČIAI garantijų. Išsamią informaciją rasite GNU laisvojoje \ +bendrojoje viešojoje licencijoje.\n\ +Jūs turėjote gauti GNU laisvosios bendrosios viešosios licencijos \ +kopiją kartu su Wine; jei negavote, rašykite adresu \ +Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, \ +Boston, MA 02110-1301, USA." + +IDS_WARRANTY_CAPTION, "JOKIŲ GARANTIJŲ" +IDS_WARRANTY, +"Ši programa yra platinama tikintis, kad ji bus naudinga, bet BE JOKIŲ \ +GARANTIJŲ; net be numanomų PERKAMUMO ar TINKAMUMO KONKREČIAI \ +UŽDUOČIAI garantijų. Išsamią informaciją rasite GNU laisvojoje \ +bendrojoje viešojoje licencijoje." +} diff --git a/programs/clock/Makefile.in b/programs/clock/Makefile.in index 36cd884..1667416 100644 --- a/programs/clock/Makefile.in +++ b/programs/clock/Makefile.in @@ -23,6 +23,7 @@ RC_SRCS = \ It.rc \ Ja.rc \ Ko.rc \ + Lt.rc \ Nl.rc \ No.rc \ Pl.rc \

1 0

Aurimas Fišeras : oledlg: Add Lithuanian translation.
by Alexandre Julliard 24 Jun '09

24 Jun '09

Module: wine Branch: master Commit: 3df02ab51540e6c3544072767f12491d60bc122f URL: http://source.winehq.org/git/wine.git/?a=commit;h=3df02ab51540e6c3544072767… Author: Aurimas Fišeras <aurimas(a)gmail.com> Date: Wed Jun 24 13:47:22 2009 +0300 oledlg: Add Lithuanian translation. --- dlls/oledlg/oledlg_Lt.rc | 100 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/oledlg/rsrc.rc | 1 + 2 files changed, 101 insertions(+), 0 deletions(-) diff --git a/dlls/oledlg/oledlg_Lt.rc b/dlls/oledlg/oledlg_Lt.rc new file mode 100644 index 0000000..d2e239b --- /dev/null +++ b/dlls/oledlg/oledlg_Lt.rc @@ -0,0 +1,100 @@ +/* + * 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 + +UIINSERTOBJECT DIALOG DISCARDABLE 0, 0, 294, 151 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Įterpti objektą" +FONT 8, "MS Shell Dlg" +BEGIN + LISTBOX IDC_OBJTYPELIST,82,19,131,66,LBS_SORT | + LBS_NOINTEGRALHEIGHT | WS_VISIBLE | WS_VSCROLL | + WS_TABSTOP + LTEXT "Objekto tipas:",IDC_OBJTYPELBL,82,7,53,8,WS_VISIBLE + DEFPUSHBUTTON "Gerai",IDOK,221,7,66,14 + PUSHBUTTON "Atsisakyti",IDCANCEL,221,24,66,14 + GROUPBOX "Rezultatas",IDC_RESULT,7,103,208,41 + CONTROL "Sukurti naują",IDC_CREATENEW,"Button",BS_AUTORADIOBUTTON | + WS_GROUP,7,20,62,10 + CONTROL "Sukurti valdiklį",IDC_CREATECONTROL,"Button", + BS_AUTORADIOBUTTON | NOT WS_VISIBLE,7,54,62,10 + CONTROL "Sukurti iš failo",IDC_CREATEFROMFILE,"Button", + BS_AUTORADIOBUTTON,7,37,67,10 + LTEXT "",IDC_RESULTDESC,49,112,159,23 + PUSHBUTTON "&Pridėti valdiklį...",IDC_ADDCONTROL,81,88,63,14,NOT WS_VISIBLE + CONTROL "Rodyti kaip piktogramą",IDC_ASICON,"Button",BS_AUTOCHECKBOX | + BS_MULTILINE | WS_TABSTOP | NOT WS_VISIBLE,223,58,64,20 + PUSHBUTTON "Parinkti...",IDC_BROWSE,83,53,50,14,NOT WS_VISIBLE + LTEXT "Failas:",IDC_FILELBL,83,27,20,8, NOT WS_VISIBLE + EDITTEXT IDC_FILE,83,37,132,13,ES_AUTOHSCROLL | NOT WS_VISIBLE +END + +STRINGTABLE DISCARDABLE +{ + IDS_RESULTOBJDESC "Įterpia naują objektą '%s' į jūsų dokumentą" + IDS_RESULTFILEOBJDESC "Įterpia failo turinį kaip objektą į jūsų dokumentą, kad galėtumėte jį aktyvuoti naudodami programą, kuri jį sukūrė." + IDS_BROWSE "Parinkti" + IDS_NOTOLEMOD "Panašu, kad failas nėra galiojantis OLE modulis. Nepavyko užregistruoti OLE valdiklio." + IDS_NOTOLEMODCAPTION "Pridėti valdiklį" +} + +IDD_PASTESPECIAL4 DIALOG DISCARDABLE 3, 15, 293, 140 +STYLE DS_MODALFRAME | DS_SETFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Įdėti kaip" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Šaltinis:", -1, 6, 9, 30, 8, WS_VISIBLE | WS_GROUP + CONTROL "Į&dėti", IDC_PS_PASTE, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_GROUP | WS_VISIBLE, + 6, 38, 55, 10 + CONTROL "Įdėti &saitą", IDC_PS_PASTELINK, "Button", BS_AUTORADIOBUTTON | WS_VISIBLE, + 6, 63, 55, 10 + LTEXT "&Kaip:", -1, 65, 25, 16, 8, WS_VISIBLE | WS_GROUP + LISTBOX IDC_PS_PASTELIST, 65, 36, 153, 57, LBS_NOTIFY | LBS_USETABSTOPS | WS_VSCROLL | WS_BORDER | NOT WS_VISIBLE + LISTBOX IDC_PS_PASTELINKLIST, 65, 36, 153, 57, LBS_NOTIFY | LBS_USETABSTOPS | WS_VSCROLL | WS_BORDER | NOT WS_VISIBLE + LISTBOX IDC_PS_DISPLAYLIST, 65, 36, 153, 57, LBS_NOTIFY | LBS_USETABSTOPS | WS_VSCROLL | WS_BORDER | WS_VISIBLE + CONTROL "Gerai", IDOK, "Button", BS_DEFPUSHBUTTON | WS_TABSTOP | WS_GROUP | WS_VISIBLE, 224, 6, 66, 14 + CONTROL "Atsisakyti", IDCANCEL, "Button", BS_PUSHBUTTON | WS_TABSTOP | WS_VISIBLE, 224, 23, 66, 14 + CONTROL "&Žinynas", IDC_OLEUIHELP, "Button", BS_PUSHBUTTON | WS_TABSTOP | WS_VISIBLE, 224, 42, 66, 14 + CONTROL "&Rodyti kaip piktogramą", IDC_PS_DISPLAYASICON, "Button", BS_AUTOCHECKBOX | BS_MULTILINE | WS_TABSTOP | WS_VISIBLE, 224, 59, 66, 20 + CONTROL "", IDC_PS_ICONDISPLAY, "Static", SS_ICON | WS_VISIBLE, 224, 81, 66, 44 + CONTROL "Keisti &piktogramą...", IDC_PS_CHANGEICON, "Button", BS_PUSHBUTTON | WS_TABSTOP | WS_VISIBLE, 224, 123, 66, 14 + CONTROL "", IDC_PS_RESULTIMAGE, "Static", SS_ICON | WS_VISIBLE, 8, 101, 42, 34 + CONTROL "<< čia pateikiamas rezultato tekstas >>", IDC_PS_RESULTTEXT, "Static", SS_NOPREFIX | WS_VISIBLE, 54, 100, 159, 35 + CONTROL "Rezultatas", -1, "Button", BS_GROUPBOX | WS_GROUP | WS_VISIBLE, 6, 90, 212, 48 + CONTROL "", IDC_PS_SOURCETEXT, "Edit", ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE, 37, 9, 180, 8 +END + +STRINGTABLE DISCARDABLE +{ + IDS_PS_PASTE_DATA "Įterpia iškarpinės turinį į jūsų dokumentą kaip %s." + IDS_PS_PASTE_OBJECT "Įterpia iškarpinės turinį į jūsų dokumentą, kad galėtumėte jį aktyvuoti naudodami %s." + IDS_PS_PASTE_OBJECT_AS_ICON "Įterpia iškarpinės turinį į jūsų dokumentą, kad galėtumėte jį aktyvuoti naudodami %s. Jis bus rodomas kaip piktograma." + IDS_PS_PASTE_LINK_DATA "Įterpia iškarpinės turinį į jūsų dokumentą kaip %s. Duomenys yra susieti su šaltinio failu, todėl failo pakeitimai bus atspindėti jūsų dokumente." + IDS_PS_PASTE_LINK_OBJECT "Įterpia iškarpinės turinio paveikslą į jūsų dokumentą. Paveikslas yra susietas su šaltinio failu, todėl failo pakeitimai bus atspindėti jūsų dokumente." + IDS_PS_PASTE_LINK_OBJECT_AS_ICON "Įterpia nuorodą, kuri rodo į iškarpinės turinį. Nuoroda yra susieta su šaltinio failu, todėl failo pakeitimai bus atspindėti jūsų dokumente." + IDS_PS_NON_OLE "Įterpia iškarpinės turinį į jūsų dokumentą." + IDS_PS_UNKNOWN_TYPE "Nežinomas tipas" + IDS_PS_UNKNOWN_SRC "Nežinomas šaltinis" + IDS_PS_UNKNOWN_APP "programa, kuri jį sukūrė" +} + +#pragma code_page(default) diff --git a/dlls/oledlg/rsrc.rc b/dlls/oledlg/rsrc.rc index 6379efc..ee433af 100644 --- a/dlls/oledlg/rsrc.rc +++ b/dlls/oledlg/rsrc.rc @@ -43,6 +43,7 @@ #include "oledlg_It.rc" #include "oledlg_Ja.rc" #include "oledlg_Ko.rc" +#include "oledlg_Lt.rc" #include "oledlg_Nl.rc" #include "oledlg_No.rc" #include "oledlg_Pl.rc"

1 0

Nikolay Sivov : comctl32/listview: Initialize string pointers on notification conversion routine.
by Alexandre Julliard 24 Jun '09

24 Jun '09

Module: wine Branch: master Commit: 2551ea05681ba89acc011f52efddd361a25d3d76 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2551ea05681ba89acc011f52e… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Wed Jun 24 00:20:11 2009 +0400 comctl32/listview: Initialize string pointers on notification conversion routine. --- dlls/comctl32/listview.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index b84600a..7099227 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -759,6 +759,7 @@ static LRESULT notify_forward_header(const LISTVIEW_INFO *infoPtr, const NMHEADE /* convert item text */ if (lpnmh->pitem->mask & HDI_TEXT) { + hditema.pszText = NULL; Str_SetPtrWtoA(&hditema.pszText, lpnmh->pitem->pszText); text = hditema.pszText; } @@ -768,6 +769,7 @@ static LRESULT notify_forward_header(const LISTVIEW_INFO *infoPtr, const NMHEADE { hditema.pvFilter = &textfilter; textfilter = *(HD_TEXTFILTERA*)(lpnmh->pitem->pvFilter); + textfilter.pszText = NULL; Str_SetPtrWtoA(&textfilter.pszText, ((HD_TEXTFILTERW*)lpnmh->pitem->pvFilter)->pszText); filter = textfilter.pszText; }

1 0

Tony Wasserka : d3dx9: Add tests for basic ID3DXFont functions.
by Alexandre Julliard 24 Jun '09

24 Jun '09

Module: wine Branch: master Commit: 0ac20c4bd3b4bb1a751059d34e84542ca81f56d2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ac20c4bd3b4bb1a751059d34… Author: Tony Wasserka <tony.wasserka(a)freenet.de> Date: Fri Jun 5 15:14:21 2009 +0200 d3dx9: Add tests for basic ID3DXFont functions. --- dlls/d3dx9_36/tests/Makefile.in | 2 +- dlls/d3dx9_36/tests/core.c | 146 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 147 insertions(+), 1 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0ac20c4bd3b4bb1a75105…

1 0

Tony Wasserka : d3dx9: Implement ID3DXFont_GetTextMetrics.
by Alexandre Julliard 24 Jun '09

24 Jun '09

Module: wine Branch: master Commit: 5dd637134513d009d02af5b33e986685d1016066 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5dd637134513d009d02af5b33… Author: Tony Wasserka <tony.wasserka(a)freenet.de> Date: Fri Jun 5 13:57:23 2009 +0200 d3dx9: Implement ID3DXFont_GetTextMetrics. --- dlls/d3dx9_36/d3dx9_36_private.h | 1 + dlls/d3dx9_36/font.c | 18 ++++++++++++++---- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/dlls/d3dx9_36/d3dx9_36_private.h b/dlls/d3dx9_36/d3dx9_36_private.h index 4d73e76..cf3e176 100644 --- a/dlls/d3dx9_36/d3dx9_36_private.h +++ b/dlls/d3dx9_36/d3dx9_36_private.h @@ -45,6 +45,7 @@ typedef struct ID3DXFontImpl D3DXFONT_DESCW desc; HDC hdc; + HFONT hfont; } ID3DXFontImpl; diff --git a/dlls/d3dx9_36/font.c b/dlls/d3dx9_36/font.c index 034ae93..98b4fe9 100644 --- a/dlls/d3dx9_36/font.c +++ b/dlls/d3dx9_36/font.c @@ -55,6 +55,7 @@ static ULONG WINAPI ID3DXFontImpl_Release(LPD3DXFONT iface) TRACE("(%p): ReleaseRef to %d\n", This, ref); if(ref==0) { + DeleteObject(This->hfont); DeleteDC(This->hdc); IDirect3DDevice9_Release(This->device); HeapFree(GetProcessHeap(), 0, This); @@ -100,15 +101,15 @@ static HRESULT WINAPI ID3DXFontImpl_GetDescW(LPD3DXFONT iface, D3DXFONT_DESCW *d static BOOL WINAPI ID3DXFontImpl_GetTextMetricsA(LPD3DXFONT iface, TEXTMETRICA *metrics) { ID3DXFontImpl *This=(ID3DXFontImpl*)iface; - FIXME("(%p): stub\n", This); - return FALSE; + TRACE("(%p)\n", This); + return GetTextMetricsA(This->hdc, metrics); } static BOOL WINAPI ID3DXFontImpl_GetTextMetricsW(LPD3DXFONT iface, TEXTMETRICW *metrics) { ID3DXFontImpl *This=(ID3DXFontImpl*)iface; - FIXME("(%p): stub\n", This); - return FALSE; + TRACE("(%p)\n", This); + return GetTextMetricsW(This->hdc, metrics); } static HDC WINAPI ID3DXFontImpl_GetDC(LPD3DXFONT iface) @@ -307,6 +308,15 @@ HRESULT WINAPI D3DXCreateFontIndirectW(LPDIRECT3DDEVICE9 device, CONST D3DXFONT_ return D3DXERR_INVALIDDATA; } + object->hfont = CreateFontW(desc->Height, desc->Width, 0, 0, desc->Weight, desc->Italic, FALSE, FALSE, desc->CharSet, + desc->OutputPrecision, CLIP_DEFAULT_PRECIS, desc->Quality, desc->PitchAndFamily, desc->FaceName); + if( !object->hfont ) { + DeleteDC(object->hdc); + HeapFree(GetProcessHeap(), 0, object); + return D3DXERR_INVALIDDATA; + } + SelectObject(object->hdc, object->hfont); + IDirect3DDevice9_AddRef(device); *font=(LPD3DXFONT)object;

1 0

Tony Wasserka : d3dx9: Implement ID3DXFont_GetDC.
by Alexandre Julliard 24 Jun '09

24 Jun '09

Module: wine Branch: master Commit: 9733856f90ac01807b59f5ba6eb185e6164ce8a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9733856f90ac01807b59f5ba6… Author: Tony Wasserka <tony.wasserka(a)freenet.de> Date: Fri Jun 5 13:45:12 2009 +0200 d3dx9: Implement ID3DXFont_GetDC. --- dlls/d3dx9_36/Makefile.in | 2 +- dlls/d3dx9_36/d3dx9_36_private.h | 2 ++ dlls/d3dx9_36/font.c | 11 +++++++++-- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/dlls/d3dx9_36/Makefile.in b/dlls/d3dx9_36/Makefile.in index c094071..f5fa278 100644 --- a/dlls/d3dx9_36/Makefile.in +++ b/dlls/d3dx9_36/Makefile.in @@ -4,7 +4,7 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = d3dx9_36.dll IMPORTLIB = d3dx9 -IMPORTS = d3d9 d3dx8 kernel32 +IMPORTS = d3d9 d3dx8 gdi32 kernel32 C_SRCS = \ d3dx9_36_main.c \ diff --git a/dlls/d3dx9_36/d3dx9_36_private.h b/dlls/d3dx9_36/d3dx9_36_private.h index 5d3d329..4d73e76 100644 --- a/dlls/d3dx9_36/d3dx9_36_private.h +++ b/dlls/d3dx9_36/d3dx9_36_private.h @@ -43,6 +43,8 @@ typedef struct ID3DXFontImpl /* ID3DXFont fields */ IDirect3DDevice9 *device; D3DXFONT_DESCW desc; + + HDC hdc; } ID3DXFontImpl; diff --git a/dlls/d3dx9_36/font.c b/dlls/d3dx9_36/font.c index 1de0634..034ae93 100644 --- a/dlls/d3dx9_36/font.c +++ b/dlls/d3dx9_36/font.c @@ -55,6 +55,7 @@ static ULONG WINAPI ID3DXFontImpl_Release(LPD3DXFONT iface) TRACE("(%p): ReleaseRef to %d\n", This, ref); if(ref==0) { + DeleteDC(This->hdc); IDirect3DDevice9_Release(This->device); HeapFree(GetProcessHeap(), 0, This); } @@ -113,8 +114,8 @@ static BOOL WINAPI ID3DXFontImpl_GetTextMetricsW(LPD3DXFONT iface, TEXTMETRICW * static HDC WINAPI ID3DXFontImpl_GetDC(LPD3DXFONT iface) { ID3DXFontImpl *This=(ID3DXFontImpl*)iface; - FIXME("(%p): stub\n", This); - return NULL; + TRACE("(%p)\n", This); + return This->hdc; } static HRESULT WINAPI ID3DXFontImpl_GetGlyphData(LPD3DXFONT iface, UINT glyph, LPDIRECT3DTEXTURE9 *texture, RECT *blackbox, POINT *cellinc) @@ -300,6 +301,12 @@ HRESULT WINAPI D3DXCreateFontIndirectW(LPDIRECT3DDEVICE9 device, CONST D3DXFONT_ object->device=device; object->desc=*desc; + object->hdc = CreateCompatibleDC(NULL); + if( !object->hdc ) { + HeapFree(GetProcessHeap(), 0, object); + return D3DXERR_INVALIDDATA; + } + IDirect3DDevice9_AddRef(device); *font=(LPD3DXFONT)object;

1 0

Tony Wasserka : d3dx9: Implement ID3DXFont_GetDesc.
by Alexandre Julliard 24 Jun '09

24 Jun '09

Module: wine Branch: master Commit: 05843d47707a8224a1f8470337cb24173d1eee29 URL: http://source.winehq.org/git/wine.git/?a=commit;h=05843d47707a8224a1f847033… Author: Tony Wasserka <tony.wasserka(a)freenet.de> Date: Fri Jun 5 13:26:11 2009 +0200 d3dx9: Implement ID3DXFont_GetDesc. --- dlls/d3dx9_36/d3dx9_36_private.h | 1 + dlls/d3dx9_36/font.c | 14 ++++++++++++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/d3dx9_36_private.h b/dlls/d3dx9_36/d3dx9_36_private.h index 5891794..5d3d329 100644 --- a/dlls/d3dx9_36/d3dx9_36_private.h +++ b/dlls/d3dx9_36/d3dx9_36_private.h @@ -42,6 +42,7 @@ typedef struct ID3DXFontImpl /* ID3DXFont fields */ IDirect3DDevice9 *device; + D3DXFONT_DESCW desc; } ID3DXFontImpl; diff --git a/dlls/d3dx9_36/font.c b/dlls/d3dx9_36/font.c index e7f770c..1de0634 100644 --- a/dlls/d3dx9_36/font.c +++ b/dlls/d3dx9_36/font.c @@ -76,14 +76,23 @@ static HRESULT WINAPI ID3DXFontImpl_GetDevice(LPD3DXFONT iface, LPDIRECT3DDEVICE static HRESULT WINAPI ID3DXFontImpl_GetDescA(LPD3DXFONT iface, D3DXFONT_DESCA *desc) { ID3DXFontImpl *This=(ID3DXFontImpl*)iface; - FIXME("(%p): stub\n", This); + TRACE("(%p)\n", This); + + if( !desc ) return D3DERR_INVALIDCALL; + memcpy(desc, &This->desc, FIELD_OFFSET(D3DXFONT_DESCA, FaceName)); + WideCharToMultiByte(CP_ACP, 0, This->desc.FaceName, -1, desc->FaceName, sizeof(desc->FaceName) / sizeof(CHAR), NULL, NULL); + return D3D_OK; } static HRESULT WINAPI ID3DXFontImpl_GetDescW(LPD3DXFONT iface, D3DXFONT_DESCW *desc) { ID3DXFontImpl *This=(ID3DXFontImpl*)iface; - FIXME("(%p): stub\n", This); + TRACE("(%p)\n", This); + + if( !desc ) return D3DERR_INVALIDCALL; + *desc = This->desc; + return D3D_OK; } @@ -289,6 +298,7 @@ HRESULT WINAPI D3DXCreateFontIndirectW(LPDIRECT3DDEVICE9 device, CONST D3DXFONT_ object->lpVtbl=&D3DXFont_Vtbl; object->ref=1; object->device=device; + object->desc=*desc; IDirect3DDevice9_AddRef(device); *font=(LPD3DXFONT)object;

1 0

Tony Wasserka : d3dx9: Implement ID3DXFont_GetDevice.
by Alexandre Julliard 24 Jun '09

24 Jun '09

Module: wine Branch: master Commit: e36028b4df36d3984dc70a97f93ccd95e8b19c3b URL: http://source.winehq.org/git/wine.git/?a=commit;h=e36028b4df36d3984dc70a97f… Author: Tony Wasserka <tony.wasserka(a)freenet.de> Date: Fri Jun 5 13:15:44 2009 +0200 d3dx9: Implement ID3DXFont_GetDevice. --- dlls/d3dx9_36/d3dx9_36_private.h | 1 + dlls/d3dx9_36/font.c | 10 +++++++++- 2 files changed, 10 insertions(+), 1 deletions(-) diff --git a/dlls/d3dx9_36/d3dx9_36_private.h b/dlls/d3dx9_36/d3dx9_36_private.h index a2b0698..5891794 100644 --- a/dlls/d3dx9_36/d3dx9_36_private.h +++ b/dlls/d3dx9_36/d3dx9_36_private.h @@ -41,6 +41,7 @@ typedef struct ID3DXFontImpl LONG ref; /* ID3DXFont fields */ + IDirect3DDevice9 *device; } ID3DXFontImpl; diff --git a/dlls/d3dx9_36/font.c b/dlls/d3dx9_36/font.c index e5e6569..e7f770c 100644 --- a/dlls/d3dx9_36/font.c +++ b/dlls/d3dx9_36/font.c @@ -55,6 +55,7 @@ static ULONG WINAPI ID3DXFontImpl_Release(LPD3DXFONT iface) TRACE("(%p): ReleaseRef to %d\n", This, ref); if(ref==0) { + IDirect3DDevice9_Release(This->device); HeapFree(GetProcessHeap(), 0, This); } return ref; @@ -63,7 +64,12 @@ static ULONG WINAPI ID3DXFontImpl_Release(LPD3DXFONT iface) static HRESULT WINAPI ID3DXFontImpl_GetDevice(LPD3DXFONT iface, LPDIRECT3DDEVICE9 *device) { ID3DXFontImpl *This=(ID3DXFontImpl*)iface; - FIXME("(%p): stub\n", This); + TRACE("(%p)\n", This); + + if( !device ) return D3DERR_INVALIDCALL; + *device = This->device; + IDirect3DDevice9_AddRef(This->device); + return D3D_OK; } @@ -282,7 +288,9 @@ HRESULT WINAPI D3DXCreateFontIndirectW(LPDIRECT3DDEVICE9 device, CONST D3DXFONT_ } object->lpVtbl=&D3DXFont_Vtbl; object->ref=1; + object->device=device; + IDirect3DDevice9_AddRef(device); *font=(LPD3DXFONT)object; return D3D_OK;

1 0

Tony Wasserka : d3dx9: Improve parameter validation in D3DXCreateFont and D3DXCreateFontIndirect.
by Alexandre Julliard 24 Jun '09

24 Jun '09

Module: wine Branch: master Commit: 823ec93b39373ddb9312157c9156aff636282f6a URL: http://source.winehq.org/git/wine.git/?a=commit;h=823ec93b39373ddb9312157c9… Author: Tony Wasserka <tony.wasserka(a)freenet.de> Date: Fri Jun 5 13:06:25 2009 +0200 d3dx9: Improve parameter validation in D3DXCreateFont and D3DXCreateFontIndirect. --- dlls/d3dx9_36/font.c | 31 +++++++++++++++++++++++-------- 1 files changed, 23 insertions(+), 8 deletions(-) diff --git a/dlls/d3dx9_36/font.c b/dlls/d3dx9_36/font.c index 46d0fde..e5e6569 100644 --- a/dlls/d3dx9_36/font.c +++ b/dlls/d3dx9_36/font.c @@ -194,7 +194,7 @@ HRESULT WINAPI D3DXCreateFontA(LPDIRECT3DDEVICE9 device, INT height, UINT width, { D3DXFONT_DESCA desc; - if(!facename) return D3DXERR_INVALIDDATA; + if( !device || !font ) return D3DERR_INVALIDCALL; desc.Height=height; desc.Width=width; @@ -205,7 +205,8 @@ HRESULT WINAPI D3DXCreateFontA(LPDIRECT3DDEVICE9 device, INT height, UINT width, desc.OutputPrecision=precision; desc.Quality=quality; desc.PitchAndFamily=pitchandfamily; - lstrcpyA(desc.FaceName, facename); + if(facename != NULL) lstrcpyA(desc.FaceName, facename); + else desc.FaceName[0] = '\0'; return D3DXCreateFontIndirectA(device, &desc, font); } @@ -215,7 +216,7 @@ HRESULT WINAPI D3DXCreateFontW(LPDIRECT3DDEVICE9 device, INT height, UINT width, { D3DXFONT_DESCW desc; - if(!facename) return D3DXERR_INVALIDDATA; + if( !device || !font ) return D3DERR_INVALIDCALL; desc.Height=height; desc.Width=width; @@ -226,7 +227,8 @@ HRESULT WINAPI D3DXCreateFontW(LPDIRECT3DDEVICE9 device, INT height, UINT width, desc.OutputPrecision=precision; desc.Quality=quality; desc.PitchAndFamily=pitchandfamily; - strcpyW(desc.FaceName, facename); + if(facename != NULL) strcpyW(desc.FaceName, facename); + else desc.FaceName[0] = '\0'; return D3DXCreateFontIndirectW(device, &desc, font); } @@ -238,8 +240,7 @@ HRESULT WINAPI D3DXCreateFontIndirectA(LPDIRECT3DDEVICE9 device, CONST D3DXFONT_ { D3DXFONT_DESCW widedesc; - if(!desc) return D3DERR_INVALIDCALL; - if(!desc->FaceName) return D3DERR_INVALIDCALL; + if( !device || !desc || !font ) return D3DERR_INVALIDCALL; /* Copy everything but the last structure member. This requires the two D3DXFONT_DESC structures to be equal until the FaceName member */ @@ -254,11 +255,25 @@ HRESULT WINAPI D3DXCreateFontIndirectA(LPDIRECT3DDEVICE9 device, CONST D3DXFONT_ */ HRESULT WINAPI D3DXCreateFontIndirectW(LPDIRECT3DDEVICE9 device, CONST D3DXFONT_DESCW *desc, LPD3DXFONT *font) { + D3DDEVICE_CREATION_PARAMETERS cpars; + D3DDISPLAYMODE mode; ID3DXFontImpl *object; - + IDirect3D9 *d3d; + HRESULT hr; FIXME("stub\n"); - if(!desc) return D3DERR_INVALIDCALL; + if( !device || !desc || !font ) return D3DERR_INVALIDCALL; + + /* the device MUST support D3DFMT_A8R8G8B8 */ + IDirect3DDevice9_GetDirect3D(device, &d3d); + IDirect3DDevice9_GetCreationParameters(device, &cpars); + IDirect3DDevice9_GetDisplayMode(device, 0, &mode); + hr = IDirect3D9_CheckDeviceFormat(d3d, cpars.AdapterOrdinal, cpars.DeviceType, mode.Format, 0, D3DRTYPE_TEXTURE, D3DFMT_A8R8G8B8); + if(FAILED(hr)) { + IDirect3D9_Release(d3d); + return D3DXERR_INVALIDDATA; + } + IDirect3D9_Release(d3d); object=HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(ID3DXFontImpl)); if(object==NULL) {

1 0

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 June 2009