June 2009 - Wine-Commits - list.winehq.org

Paul Chitescu : avifil32: Romanian translation.
by Alexandre Julliard June 24, 2009

June 24, 2009

Module: wine Branch: master Commit: 508270b5332ea19b745185db556b3c10647424d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=508270b5332ea19b745185db5… Author: Paul Chitescu <paulc(a)voip.null.ro> Date: Wed Jun 24 15:08:18 2009 +0300 avifil32: Romanian translation. --- dlls/avifil32/avifile_Ro.rc | 57 +++++++++++++++++++++++++++++++++++++++++++ dlls/avifil32/rsrc.rc | 1 + 2 files changed, 58 insertions(+), 0 deletions(-) diff --git a/dlls/avifil32/avifile_Ro.rc b/dlls/avifil32/avifile_Ro.rc new file mode 100644 index 0000000..d46e3ea --- /dev/null +++ b/dlls/avifil32/avifile_Ro.rc @@ -0,0 +1,57 @@ +/* + * avifil32.dll (Romanian resources) + * + * Copyright 2009 Paul Chitescu + * + * 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_ROMANIAN, SUBLANG_NEUTRAL + +IDD_SAVEOPTIONS DIALOG FIXED IMPURE 43, 37, 226, 82 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Opțiuni de compresie" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&Alegeți un flux:",-1,2,5,154,10 + COMBOBOX IDC_STREAM,2,18,154,61,CBS_DROPDOWNLIST | WS_VSCROLL | + WS_TABSTOP + PUSHBUTTON "&Opțiuni...",IDC_OPTIONS,170,17,50,14 + AUTOCHECKBOX "Ȋ&ntrețese fiecare",IDC_INTERLEAVE,3,42,85,11,WS_TABSTOP + EDITTEXT IDC_INTERLEAVEEVERY,91,41,32,12,ES_AUTOHSCROLL + LTEXT "cadre",-1,129,43,36,9 + LTEXT "Formatul curent:",-1,3,56,73,9 + LTEXT "This space for rent",IDC_FORMATTEXT,75,56,90,26 + DEFPUSHBUTTON "OK",IDOK,170,42,50,14 + PUSHBUTTON "Renunță",IDCANCEL,170,61,50,14 +END + +STRINGTABLE DISCARDABLE +{ + IDS_WAVESTREAMFORMAT "Forma de undă: %s" + IDS_WAVEFILETYPE "Formă de undă" + IDS_ALLMULTIMEDIA "Toate fișierele multimedia" + IDS_ALLFILES "Toate fișierele (*.*)(a)*.*" + IDS_VIDEO "video" + IDS_AUDIO "audio" + IDS_AVISTREAMFORMAT "%s %s #%d" + IDS_AVIFILETYPE "Tratare implicită Wine pentru AVI" + IDS_UNCOMPRESSED "necomprimat" +} + +#pragma code_page(default) diff --git a/dlls/avifil32/rsrc.rc b/dlls/avifil32/rsrc.rc index 5eda656..e4363a7 100644 --- a/dlls/avifil32/rsrc.rc +++ b/dlls/avifil32/rsrc.rc @@ -53,6 +53,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL #include "avifile_No.rc" #include "avifile_Pl.rc" #include "avifile_Pt.rc" +#include "avifile_Ro.rc" #include "avifile_Ru.rc" #include "avifile_Si.rc" #include "avifile_Sv.rc"

1 0

Huw Davies : gdi32: Add tests for GetTransform.
by Alexandre Julliard June 24, 2009

June 24, 2009

Module: wine Branch: master Commit: 4b9c22d66bfcc884074b14f9a50030b405dac191 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b9c22d66bfcc884074b14f9a… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Jun 24 11:51:06 2009 +0100 gdi32: Add tests for GetTransform. --- dlls/gdi32/tests/mapping.c | 126 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 126 insertions(+), 0 deletions(-) diff --git a/dlls/gdi32/tests/mapping.c b/dlls/gdi32/tests/mapping.c index cb8160d..8c53e2f 100644 --- a/dlls/gdi32/tests/mapping.c +++ b/dlls/gdi32/tests/mapping.c @@ -433,10 +433,136 @@ static void test_setvirtualresolution(void) DeleteDC(hdc); } + +static inline void expect_identity(int line, XFORM *xf) +{ + ok(xf->eM11 == 1.0, "%d: got %f\n", line, xf->eM11); + ok(xf->eM12 == 0.0, "%d: got %f\n", line, xf->eM12); + ok(xf->eM21 == 0.0, "%d: got %f\n", line, xf->eM21); + ok(xf->eM22 == 1.0, "%d: got %f\n", line, xf->eM22); + ok(xf->eDx == 0.0, "%d: got %f\n", line, xf->eDx); + ok(xf->eDy == 0.0, "%d: got %f\n", line, xf->eDy); +} + +static inline void xform_near_match(int line, XFORM *got, XFORM *expect) +{ + ok(fabs(got->eM11 - expect->eM11) < 0.001, "%d: got %f expect %f\n", line, got->eM11, expect->eM11); + ok(fabs(got->eM12 - expect->eM12) < 0.001, "%d: got %f expect %f\n", line, got->eM12, expect->eM12); + ok(fabs(got->eM21 - expect->eM21) < 0.001, "%d: got %f expect %f\n", line, got->eM21, expect->eM21); + ok(fabs(got->eM22 - expect->eM22) < 0.001, "%d: got %f expect %f\n", line, got->eM22, expect->eM22); + ok(fabs(got->eDx - expect->eDx) < 0.001, "%d: got %f expect %f\n", line, got->eDx, expect->eDx); + ok(fabs(got->eDy - expect->eDy) < 0.001, "%d: got %f expect %f\n", line, got->eDy, expect->eDy); +} + + +static void test_gettransform(void) +{ + HDC hdc = CreateICA("DISPLAY", NULL, NULL, NULL); + BOOL (WINAPI *pGetTransform)(HDC, DWORD, XFORM *); + XFORM xform, expect; + BOOL r; + SIZE lometric_vp, lometric_wnd; + + pGetTransform = (void *)GetProcAddress(GetModuleHandleA("gdi32.dll"), "GetTransform"); + + if(!pGetTransform) + { + win_skip("Don't have GetTransform\n"); + return; + } + + r = pGetTransform(hdc, 0x203, &xform); /* World -> Page */ + ok(r == TRUE, "got %d\n", r); + expect_identity(__LINE__, &xform); + r = pGetTransform(hdc, 0x304, &xform); /* Page -> Device */ + ok(r == TRUE, "got %d\n", r); + expect_identity(__LINE__, &xform); + r = pGetTransform(hdc, 0x204, &xform); /* World -> Device */ + ok(r == TRUE, "got %d\n", r); + expect_identity(__LINE__, &xform); + r = pGetTransform(hdc, 0x402, &xform); /* Device -> World */ + ok(r == TRUE, "got %d\n", r); + expect_identity(__LINE__, &xform); + + SetMapMode(hdc, MM_LOMETRIC); + GetViewportExtEx(hdc, &lometric_vp); + GetWindowExtEx(hdc, &lometric_wnd); + + r = pGetTransform(hdc, 0x203, &xform); /* World -> Page */ + ok(r == TRUE, "got %d\n", r); + expect_identity(__LINE__, &xform); + + r = pGetTransform(hdc, 0x304, &xform); /* Page -> Device */ + ok(r == TRUE, "got %d\n", r); + expect.eM11 = (FLOAT) lometric_vp.cx / lometric_wnd.cx; + expect.eM12 = expect.eM21 = 0.0; + expect.eM22 = (FLOAT) lometric_vp.cy / lometric_wnd.cy; + expect.eDx = expect.eDy = 0.0; + xform_near_match(__LINE__, &xform, &expect); + + r = pGetTransform(hdc, 0x204, &xform); /* World -> Device */ + ok(r == TRUE, "got %d\n", r); + xform_near_match(__LINE__, &xform, &expect); + + r = pGetTransform(hdc, 0x402, &xform); /* Device -> World */ + ok(r == TRUE, "got %d\n", r); + expect.eM11 = (FLOAT) lometric_wnd.cx / lometric_vp.cx; + expect.eM22 = (FLOAT) lometric_wnd.cy / lometric_vp.cy; + xform_near_match(__LINE__, &xform, &expect); + + + SetGraphicsMode(hdc, GM_ADVANCED); + + expect.eM11 = 10.0; + expect.eM22 = 20.0; + SetWorldTransform(hdc, &expect); + r = pGetTransform(hdc, 0x203, &xform); /* World -> Page */ + ok(r == TRUE, "got %d\n", r); + xform_near_match(__LINE__, &xform, &expect); + + r = pGetTransform(hdc, 0x304, &xform); /* Page -> Device */ + ok(r == TRUE, "got %d\n", r); + expect.eM11 = (FLOAT) lometric_vp.cx / lometric_wnd.cx; + expect.eM22 = (FLOAT) lometric_vp.cy / lometric_wnd.cy; + xform_near_match(__LINE__, &xform, &expect); + + r = pGetTransform(hdc, 0x204, &xform); /* World -> Device */ + ok(r == TRUE, "got %d\n", r); + expect.eM11 *= 10.0; + expect.eM22 *= 20.0; + xform_near_match(__LINE__, &xform, &expect); + + r = pGetTransform(hdc, 0x402, &xform); /* Device -> World */ + ok(r == TRUE, "got %d\n", r); + expect.eM11 = 1 / expect.eM11; + expect.eM22 = 1 / expect.eM22; + xform_near_match(__LINE__, &xform, &expect); + + r = pGetTransform(hdc, 0x102, &xform); + ok(r == FALSE, "got %d\n", r); + r = pGetTransform(hdc, 0x103, &xform); + ok(r == FALSE, "got %d\n", r); + r = pGetTransform(hdc, 0x104, &xform); + ok(r == FALSE, "got %d\n", r); + r = pGetTransform(hdc, 0x202, &xform); + ok(r == FALSE, "got %d\n", r); + r = pGetTransform(hdc, 0x302, &xform); + ok(r == FALSE, "got %d\n", r); + r = pGetTransform(hdc, 0x303, &xform); + ok(r == FALSE, "got %d\n", r); + r = pGetTransform(hdc, 0x403, &xform); + ok(r == FALSE, "got %d\n", r); + r = pGetTransform(hdc, 0x404, &xform); + ok(r == FALSE, "got %d\n", r); + r = pGetTransform(hdc, 0xffff, &xform); + ok(r == FALSE, "got %d\n", r); +} + START_TEST(mapping) { test_modify_world_transform(); test_world_transform(); test_isotropic_mapping(); test_setvirtualresolution(); + test_gettransform(); }

1 0

Aurimas Fišeras : clock: Add Lithuanian translation.
by Alexandre Julliard June 24, 2009

June 24, 2009

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

Tony Wasserka : d3dx9: Implement ID3DXFont_GetTextMetrics.
by Alexandre Julliard June 24, 2009

June 24, 2009

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_GetDesc.
by Alexandre Julliard June 24, 2009

June 24, 2009

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

June 24, 2009

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: Implement ID3DXFont_GetDC.
by Alexandre Julliard June 24, 2009

June 24, 2009

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: Add tests for basic ID3DXFont functions.
by Alexandre Julliard June 24, 2009

June 24, 2009

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

Nikolay Sivov : comctl32/listview: Initialize string pointers on notification conversion routine.
by Alexandre Julliard June 24, 2009

June 24, 2009

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

Paul Chitescu : shell32: Add missing Romanian translation for IDS_SHLEXEC_NOASSOC.
by Alexandre Julliard June 24, 2009

June 24, 2009

Module: wine Branch: master Commit: b647b56984f22837ddfe127814f8aca15779ceca URL: http://source.winehq.org/git/wine.git/?a=commit;h=b647b56984f22837ddfe12781… Author: Paul Chitescu <paulc(a)voip.null.ro> Date: Wed Jun 24 11:55:37 2009 +0300 shell32: Add missing Romanian translation for IDS_SHLEXEC_NOASSOC. --- dlls/shell32/shell32_Ro.rc | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/shell32/shell32_Ro.rc b/dlls/shell32/shell32_Ro.rc index 48a9259..cdec0a6 100644 --- a/dlls/shell32/shell32_Ro.rc +++ b/dlls/shell32/shell32_Ro.rc @@ -284,6 +284,8 @@ STRINGTABLE IDS_CPANEL_TITLE "Panoul de control al Wine" IDS_CPANEL_NAME "Nume" IDS_CPANEL_DESCRIPTION "Descriere" + + IDS_SHLEXEC_NOASSOC "Nici un program Windows nu este configurat să deschidă fișiere de acest tip." } STRINGTABLE

1 0