June 2010 - Wine-commits - list.winehq.org

Ricardo Filipe : mapi32: Add Portuguese Portugal translation.
by Alexandre Julliard 14 Jun '10

14 Jun '10

Module: wine Branch: master Commit: 579ebdb4cbeefec30d629f8cc0b4c2e112bac693 URL: http://source.winehq.org/git/wine.git/?a=commit;h=579ebdb4cbeefec30d629f8cc… Author: Ricardo Filipe <ricardojdfilipe(a)gmail.com> Date: Fri Jun 11 10:52:14 2010 -0700 mapi32: Add Portuguese Portugal translation. --- dlls/mapi32/Makefile.in | 1 + dlls/mapi32/Pt.rc | 30 ++++++++++++++++++++++++++++++ 2 files changed, 31 insertions(+), 0 deletions(-) diff --git a/dlls/mapi32/Makefile.in b/dlls/mapi32/Makefile.in index 9b3a07b..e8d0a71 100644 --- a/dlls/mapi32/Makefile.in +++ b/dlls/mapi32/Makefile.in @@ -23,6 +23,7 @@ RC_SRCS = \ Lt.rc \ Nl.rc \ Pl.rc \ + Pt.rc \ Ro.rc \ Ru.rc \ Si.rc \ diff --git a/dlls/mapi32/Pt.rc b/dlls/mapi32/Pt.rc new file mode 100644 index 0000000..4772bcf --- /dev/null +++ b/dlls/mapi32/Pt.rc @@ -0,0 +1,30 @@ +/* +* MAPI32 Portuguese resources +* +* Copyright 2010 Ricardo Filipe +* +* 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 "res.h" + +LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE + +STRINGTABLE +{ + IDS_NO_MAPI_CLIENT, "O envio de correio falhou porque não existe um cliente de correio MAPI instalado." + IDS_SEND_MAIL, "Enviar Correio" +}

1 0

Alexandre Julliard : atl: Fix parsing of extended dialog templates.
by Alexandre Julliard 14 Jun '10

14 Jun '10

Module: wine Branch: master Commit: 650231516290b99cf0e9f1e0b5fe275f4ac4c3c6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=650231516290b99cf0e9f1e0b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Jun 12 12:08:07 2010 +0200 atl: Fix parsing of extended dialog templates. --- dlls/atl/atl_ax.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/atl/atl_ax.c b/dlls/atl/atl_ax.c index 616713c..cf654e1 100644 --- a/dlls/atl/atl_ax.c +++ b/dlls/atl/atl_ax.c @@ -1150,7 +1150,7 @@ static LPDLGTEMPLATEW AX_ConvertDialogTemplate(LPCDLGTEMPLATEW src_tmpl) tmp = src; if (ext) - src += 11; + src += 12; else src += 9; PUT_BLOCK(tmp, src-tmp); @@ -1236,7 +1236,7 @@ HWND WINAPI AtlAxCreateDialogW(HINSTANCE hInst, LPCWSTR name, HWND owner, DLGPRO LPDLGTEMPLATEW newptr; HWND res; - FIXME("(%p %s %p %p %lx) - not tested\n", hInst, debugstr_w(name), owner, dlgProc, param); + TRACE("(%p %s %p %p %lx)\n", hInst, debugstr_w(name), owner, dlgProc, param); hrsrc = FindResourceW( hInst, name, (LPWSTR)RT_DIALOG ); if ( !hrsrc )

1 0

Alexandre Julliard : atl: Implemented AtlCreateTargetDC.
by Alexandre Julliard 14 Jun '10

14 Jun '10

Module: wine Branch: master Commit: 40ac96d762f3315d050e66083aec3e59fa41d651 URL: http://source.winehq.org/git/wine.git/?a=commit;h=40ac96d762f3315d050e66083… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 14 14:13:52 2010 +0200 atl: Implemented AtlCreateTargetDC. --- dlls/atl/atl.spec | 2 +- dlls/atl/atl_main.c | 26 ++++++++++++++++++++++++++ 2 files changed, 27 insertions(+), 1 deletions(-) diff --git a/dlls/atl/atl.spec b/dlls/atl/atl.spec index 73d6ae6..1a0966d 100644 --- a/dlls/atl/atl.spec +++ b/dlls/atl/atl.spec @@ -18,7 +18,7 @@ 23 stdcall AtlModuleUpdateRegistryFromResourceD(ptr wstr long ptr ptr) 24 stub AtlWaitWithMessageLoop 25 stub AtlSetErrorInfo -26 stub AtlCreateTargetDC +26 stdcall AtlCreateTargetDC(long ptr) 27 stdcall AtlHiMetricToPixel(ptr ptr) 28 stdcall AtlPixelToHiMetric(ptr ptr) 29 stub AtlDevModeW2A diff --git a/dlls/atl/atl_main.c b/dlls/atl/atl_main.c index f168d54..fedfc1a 100644 --- a/dlls/atl/atl_main.c +++ b/dlls/atl/atl_main.c @@ -545,6 +545,32 @@ void WINAPI AtlPixelToHiMetric(const SIZEL* lpPix, SIZEL* lpHiMetric) } /*********************************************************************** + * AtlCreateTargetDC [ATL.@] + */ +HDC WINAPI AtlCreateTargetDC( HDC hdc, DVTARGETDEVICE *dv ) +{ + static const WCHAR displayW[] = {'d','i','s','p','l','a','y',0}; + const WCHAR *driver = NULL, *device = NULL, *port = NULL; + DEVMODEW *devmode = NULL; + + TRACE( "(%p, %p)\n", hdc, dv ); + + if (dv) + { + if (dv->tdDriverNameOffset) driver = (WCHAR *)((char *)dv + dv->tdDriverNameOffset); + if (dv->tdDeviceNameOffset) device = (WCHAR *)((char *)dv + dv->tdDeviceNameOffset); + if (dv->tdPortNameOffset) port = (WCHAR *)((char *)dv + dv->tdPortNameOffset); + if (dv->tdExtDevmodeOffset) devmode = (DEVMODEW *)((char *)dv + dv->tdExtDevmodeOffset); + } + else + { + if (hdc) return hdc; + driver = displayW; + } + return CreateDCW( driver, device, port, devmode ); +} + +/*********************************************************************** * AtlModuleAddCreateWndData [ATL.@] */ void WINAPI AtlModuleAddCreateWndData(_ATL_MODULEW *pM, _AtlCreateWndData *pData, void* pvObject)

1 0

Alexandre Julliard : krnl386: Defined the SMapLS/ UnMapLS_IP_EBP functions explicitly to make life easier for winapi_check.
by Alexandre Julliard 14 Jun '10

14 Jun '10

Module: wine Branch: master Commit: 86e2494f9b292a1d8ac49d5ca3da24303407d351 URL: http://source.winehq.org/git/wine.git/?a=commit;h=86e2494f9b292a1d8ac49d5ca… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Jun 12 12:08:45 2010 +0200 krnl386: Defined the SMapLS/UnMapLS_IP_EBP functions explicitly to make life easier for winapi_check. --- dlls/krnl386.exe16/selector.c | 202 ++++++++++++++++++++++++++++++++-------- 1 files changed, 161 insertions(+), 41 deletions(-) diff --git a/dlls/krnl386.exe16/selector.c b/dlls/krnl386.exe16/selector.c index 3d04d6e..ec9bb2a 100644 --- a/dlls/krnl386.exe16/selector.c +++ b/dlls/krnl386.exe16/selector.c @@ -553,65 +553,185 @@ __ASM_STDCALL_FUNC( SUnMapLS, 0, /*********************************************************************** * SMapLS_IP_EBP_8 (KERNEL32.@) + * + * These functions map linear pointers at [EBP+xxx] to segmented pointers + * and return them. + * Win95 uses some kind of alias structs, which it stores in [EBP+x] to + * unravel them at SUnMapLS. We just store the segmented pointer there. + */ +__ASM_STDCALL_FUNC( SMapLS_IP_EBP_8, 0, + "movl 8(%ebp),%eax\n\t" + "call " __ASM_NAME("SMapLS") __ASM_STDCALL(4) "\n\t" + "movl %edx,8(%ebp)\n\t" + "ret" ) + +/*********************************************************************** * SMapLS_IP_EBP_12 (KERNEL32.@) + */ +__ASM_STDCALL_FUNC( SMapLS_IP_EBP_12, 0, + "movl 12(%ebp),%eax\n\t" + "call " __ASM_NAME("SMapLS") __ASM_STDCALL(4) "\n\t" + "movl %edx,12(%ebp)\n\t" + "ret" ) + +/*********************************************************************** * SMapLS_IP_EBP_16 (KERNEL32.@) + */ +__ASM_STDCALL_FUNC( SMapLS_IP_EBP_16, 0, + "movl 16(%ebp),%eax\n\t" + "call " __ASM_NAME("SMapLS") __ASM_STDCALL(4) "\n\t" + "movl %edx,16(%ebp)\n\t" + "ret" ) + +/*********************************************************************** * SMapLS_IP_EBP_20 (KERNEL32.@) + */ +__ASM_STDCALL_FUNC( SMapLS_IP_EBP_20, 0, + "movl 20(%ebp),%eax\n\t" + "call " __ASM_NAME("SMapLS") __ASM_STDCALL(4) "\n\t" + "movl %edx,20(%ebp)\n\t" + "ret" ) + +/*********************************************************************** * SMapLS_IP_EBP_24 (KERNEL32.@) + */ +__ASM_STDCALL_FUNC( SMapLS_IP_EBP_24, 0, + "movl 24(%ebp),%eax\n\t" + "call " __ASM_NAME("SMapLS") __ASM_STDCALL(4) "\n\t" + "movl %edx,24(%ebp)\n\t" + "ret" ) + +/*********************************************************************** * SMapLS_IP_EBP_28 (KERNEL32.@) + */ +__ASM_STDCALL_FUNC( SMapLS_IP_EBP_28, 0, + "movl 28(%ebp),%eax\n\t" + "call " __ASM_NAME("SMapLS") __ASM_STDCALL(4) "\n\t" + "movl %edx,28(%ebp)\n\t" + "ret" ) + +/*********************************************************************** * SMapLS_IP_EBP_32 (KERNEL32.@) - * SMapLS_IP_EBP_36 (KERNEL32.@) - * SMapLS_IP_EBP_40 (KERNEL32.@) - * - * These functions map linear pointers at [EBP+xxx] to segmented pointers - * and return them. - * Win95 uses some kind of alias structs, which it stores in [EBP+x] to - * unravel them at SUnMapLS. We just store the segmented pointer there. */ -#define DEFINE_SMapLS(n) \ - __ASM_STDCALL_FUNC( SMapLS_IP_EBP_ ## n, 0, \ - "movl " #n "(%ebp),%eax\n\t" \ - "call " __ASM_NAME("SMapLS") __ASM_STDCALL(4) "\n\t" \ - "movl %edx," #n "(%ebp)\n\t" \ - "ret" ) +__ASM_STDCALL_FUNC( SMapLS_IP_EBP_32, 0, + "movl 32(%ebp),%eax\n\t" + "call " __ASM_NAME("SMapLS") __ASM_STDCALL(4) "\n\t" + "movl %edx,32(%ebp)\n\t" + "ret" ) -DEFINE_SMapLS(8) -DEFINE_SMapLS(12) -DEFINE_SMapLS(16) -DEFINE_SMapLS(20) -DEFINE_SMapLS(24) -DEFINE_SMapLS(28) -DEFINE_SMapLS(32) -DEFINE_SMapLS(36) -DEFINE_SMapLS(40) +/*********************************************************************** + * SMapLS_IP_EBP_36 (KERNEL32.@) + */ +__ASM_STDCALL_FUNC( SMapLS_IP_EBP_36, 0, + "movl 36(%ebp),%eax\n\t" + "call " __ASM_NAME("SMapLS") __ASM_STDCALL(4) "\n\t" + "movl %edx,36(%ebp)\n\t" + "ret" ) +/*********************************************************************** + * SMapLS_IP_EBP_40 (KERNEL32.@) + */ +__ASM_STDCALL_FUNC( SMapLS_IP_EBP_40, 0, + "movl 40(%ebp),%eax\n\t" + "call " __ASM_NAME("SMapLS") __ASM_STDCALL(4) "\n\t" + "movl %edx,40(%ebp)\n\t" + "ret" ) /*********************************************************************** * SUnMapLS_IP_EBP_8 (KERNEL32.@) + */ +__ASM_STDCALL_FUNC( SUnMapLS_IP_EBP_8, 0, + "pushl %eax\n\t" /* preserve eax */ + "pushl 8(%ebp)\n\t" + "call " __ASM_NAME("UnMapLS") __ASM_STDCALL(4) "\n\t" + "movl $0,8(%ebp)\n\t" + "popl %eax\n\t" + "ret" ) + +/*********************************************************************** * SUnMapLS_IP_EBP_12 (KERNEL32.@) + */ +__ASM_STDCALL_FUNC( SUnMapLS_IP_EBP_12, 0, + "pushl %eax\n\t" /* preserve eax */ + "pushl 12(%ebp)\n\t" + "call " __ASM_NAME("UnMapLS") __ASM_STDCALL(4) "\n\t" + "movl $0,12(%ebp)\n\t" + "popl %eax\n\t" + "ret" ) + +/*********************************************************************** * SUnMapLS_IP_EBP_16 (KERNEL32.@) + */ +__ASM_STDCALL_FUNC( SUnMapLS_IP_EBP_16, 0, + "pushl %eax\n\t" /* preserve eax */ + "pushl 16(%ebp)\n\t" + "call " __ASM_NAME("UnMapLS") __ASM_STDCALL(4) "\n\t" + "movl $0,16(%ebp)\n\t" + "popl %eax\n\t" + "ret" ) + +/*********************************************************************** * SUnMapLS_IP_EBP_20 (KERNEL32.@) + */ +__ASM_STDCALL_FUNC( SUnMapLS_IP_EBP_20, 0, + "pushl %eax\n\t" /* preserve eax */ + "pushl 20(%ebp)\n\t" + "call " __ASM_NAME("UnMapLS") __ASM_STDCALL(4) "\n\t" + "movl $0,20(%ebp)\n\t" + "popl %eax\n\t" + "ret" ) + +/*********************************************************************** * SUnMapLS_IP_EBP_24 (KERNEL32.@) + */ +__ASM_STDCALL_FUNC( SUnMapLS_IP_EBP_24, 0, + "pushl %eax\n\t" /* preserve eax */ + "pushl 24(%ebp)\n\t" + "call " __ASM_NAME("UnMapLS") __ASM_STDCALL(4) "\n\t" + "movl $0,24(%ebp)\n\t" + "popl %eax\n\t" + "ret" ) + +/*********************************************************************** * SUnMapLS_IP_EBP_28 (KERNEL32.@) + */ +__ASM_STDCALL_FUNC( SUnMapLS_IP_EBP_28, 0, + "pushl %eax\n\t" /* preserve eax */ + "pushl 28(%ebp)\n\t" + "call " __ASM_NAME("UnMapLS") __ASM_STDCALL(4) "\n\t" + "movl $0,28(%ebp)\n\t" + "popl %eax\n\t" + "ret" ) + +/*********************************************************************** * SUnMapLS_IP_EBP_32 (KERNEL32.@) + */ +__ASM_STDCALL_FUNC( SUnMapLS_IP_EBP_32, 0, + "pushl %eax\n\t" /* preserve eax */ + "pushl 32(%ebp)\n\t" + "call " __ASM_NAME("UnMapLS") __ASM_STDCALL(4) "\n\t" + "movl $0,32(%ebp)\n\t" + "popl %eax\n\t" + "ret" ) + +/*********************************************************************** * SUnMapLS_IP_EBP_36 (KERNEL32.@) - * SUnMapLS_IP_EBP_40 (KERNEL32.@) */ +__ASM_STDCALL_FUNC( SUnMapLS_IP_EBP_36, 0, + "pushl %eax\n\t" /* preserve eax */ + "pushl 36(%ebp)\n\t" + "call " __ASM_NAME("UnMapLS") __ASM_STDCALL(4) "\n\t" + "movl $0,36(%ebp)\n\t" + "popl %eax\n\t" + "ret" ) -#define DEFINE_SUnMapLS(n) \ - __ASM_STDCALL_FUNC( SUnMapLS_IP_EBP_ ## n, 0, \ - "pushl %eax\n\t" /* preserve eax */ \ - "pushl " #n "(%ebp)\n\t" \ - "call " __ASM_NAME("UnMapLS") __ASM_STDCALL(4) "\n\t" \ - "movl $0," #n "(%ebp)\n\t" \ - "popl %eax\n\t" \ - "ret" ) - -DEFINE_SUnMapLS(8) -DEFINE_SUnMapLS(12) -DEFINE_SUnMapLS(16) -DEFINE_SUnMapLS(20) -DEFINE_SUnMapLS(24) -DEFINE_SUnMapLS(28) -DEFINE_SUnMapLS(32) -DEFINE_SUnMapLS(36) -DEFINE_SUnMapLS(40) +/*********************************************************************** + * SUnMapLS_IP_EBP_40 (KERNEL32.@) + */ +__ASM_STDCALL_FUNC( SUnMapLS_IP_EBP_40, 0, + "pushl %eax\n\t" /* preserve eax */ + "pushl 40(%ebp)\n\t" + "call " __ASM_NAME("UnMapLS") __ASM_STDCALL(4) "\n\t" + "movl $0,40(%ebp)\n\t" + "popl %eax\n\t" + "ret" )

1 0

Alexandre Julliard : shell32: Create a 32-bpp image list to get alpha blended icons.
by Alexandre Julliard 14 Jun '10

14 Jun '10

Module: wine Branch: master Commit: 8932fe2a84832264cf7210f981a6034540d10d76 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8932fe2a84832264cf7210f98… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Jun 13 16:50:43 2010 +0200 shell32: Create a 32-bpp image list to get alpha blended icons. --- dlls/shell32/control.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/control.c b/dlls/shell32/control.c index b0d4089..aabe89e 100644 --- a/dlls/shell32/control.c +++ b/dlls/shell32/control.c @@ -216,9 +216,9 @@ static BOOL Control_CreateListView (CPanel *panel) /* Create image lists for list view */ panel->hImageListSmall = ImageList_Create(GetSystemMetrics(SM_CXSMICON), - GetSystemMetrics(SM_CYSMICON), ILC_MASK, 1, 1); + GetSystemMetrics(SM_CYSMICON), ILC_COLOR32 | ILC_MASK, 1, 1); panel->hImageListLarge = ImageList_Create(GetSystemMetrics(SM_CXICON), - GetSystemMetrics(SM_CYICON), ILC_MASK, 1, 1); + GetSystemMetrics(SM_CYICON), ILC_COLOR32 | ILC_MASK, 1, 1); SendMessageW(panel->hWndListView, LVM_SETIMAGELIST, LVSIL_SMALL, (LPARAM)panel->hImageListSmall); SendMessageW(panel->hWndListView, LVM_SETIMAGELIST, LVSIL_NORMAL, (LPARAM)panel->hImageListLarge);

1 0

Alexandre Julliard : appwiz.cpl: Create a 32-bpp image list to get alpha blended icons.
by Alexandre Julliard 14 Jun '10

14 Jun '10

Module: wine Branch: master Commit: 14d1b7a51dbbade26517beb84c489ec1ee615049 URL: http://source.winehq.org/git/wine.git/?a=commit;h=14d1b7a51dbbade26517beb84… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Jun 13 16:50:49 2010 +0200 appwiz.cpl: Create a 32-bpp image list to get alpha blended icons. --- dlls/appwiz.cpl/appwiz.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/appwiz.cpl/appwiz.c b/dlls/appwiz.cpl/appwiz.c index 2b68ee7..ffd2b24 100644 --- a/dlls/appwiz.cpl/appwiz.c +++ b/dlls/appwiz.cpl/appwiz.c @@ -745,7 +745,7 @@ static HIMAGELIST AddListViewImageList(HWND hWnd) HICON hDefaultIcon; hSmall = ImageList_Create(GetSystemMetrics(SM_CXSMICON), GetSystemMetrics(SM_CYSMICON), - ILC_MASK, 1, 1); + ILC_COLOR32 | ILC_MASK, 1, 1); /* Add default icon to image list */ hDefaultIcon = LoadIconW(hInst, MAKEINTRESOURCEW(ICO_MAIN));

1 0

Nikolay Sivov : gdi32: Add CreateFontIndirectEx implementation.
by Alexandre Julliard 14 Jun '10

14 Jun '10

Module: wine Branch: master Commit: cd43ff167bd85d39aeb31ab41b6ccef29e7dfafe URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd43ff167bd85d39aeb31ab41… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jun 11 19:39:40 2010 +0400 gdi32: Add CreateFontIndirectEx implementation. --- dlls/gdi32/font.c | 78 ++++++++++++++++++++++++++++++++++++++++------ dlls/gdi32/gdi32.spec | 4 +- dlls/gdi32/tests/font.c | 34 ++++++++++++++++++++ include/wingdi.h | 27 ++++++++++++++++ 4 files changed, 130 insertions(+), 13 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 17fb381..637c7d6 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -180,7 +180,7 @@ static void FONT_LogFontWToA( const LOGFONTW *fontW, LPLOGFONTA fontA ) static void FONT_EnumLogFontExWToA( const ENUMLOGFONTEXW *fontW, LPENUMLOGFONTEXA fontA ) { - FONT_LogFontWToA( (const LOGFONTW *)fontW, (LPLOGFONTA)fontA); + FONT_LogFontWToA( &fontW->elfLogFont, &fontA->elfLogFont ); WideCharToMultiByte( CP_ACP, 0, fontW->elfFullName, -1, (LPSTR) fontA->elfFullName, LF_FULLFACESIZE, NULL, NULL ); @@ -193,6 +193,21 @@ static void FONT_EnumLogFontExWToA( const ENUMLOGFONTEXW *fontW, LPENUMLOGFONTEX fontA->elfScript[LF_FACESIZE-1] = '\0'; } +static void FONT_EnumLogFontExAToW( const ENUMLOGFONTEXA *fontA, LPENUMLOGFONTEXW fontW ) +{ + FONT_LogFontAToW( &fontA->elfLogFont, &fontW->elfLogFont ); + + MultiByteToWideChar( CP_ACP, 0, (LPCSTR)fontA->elfFullName, -1, + fontW->elfFullName, LF_FULLFACESIZE ); + fontW->elfFullName[LF_FULLFACESIZE-1] = '\0'; + MultiByteToWideChar( CP_ACP, 0, (LPCSTR)fontA->elfStyle, -1, + fontW->elfStyle, LF_FACESIZE ); + fontW->elfStyle[LF_FACESIZE-1] = '\0'; + MultiByteToWideChar( CP_ACP, 0, (LPCSTR)fontA->elfScript, -1, + fontW->elfScript, LF_FACESIZE ); + fontW->elfScript[LF_FACESIZE-1] = '\0'; +} + /*********************************************************************** * TEXTMETRIC conversion functions. */ @@ -287,30 +302,42 @@ static LPWSTR FONT_mbtowc(HDC hdc, LPCSTR str, INT count, INT *plenW, UINT *pCP) return strW; } - /*********************************************************************** - * CreateFontIndirectA (GDI32.@) + * CreateFontIndirectExA (GDI32.@) */ -HFONT WINAPI CreateFontIndirectA( const LOGFONTA *plfA ) +HFONT WINAPI CreateFontIndirectExA( const ENUMLOGFONTEXDVA *penumexA ) { - LOGFONTW lfW; + ENUMLOGFONTEXDVW enumexW; - if (!plfA) return 0; + if (!penumexA) return 0; - FONT_LogFontAToW( plfA, &lfW ); - return CreateFontIndirectW( &lfW ); + FONT_EnumLogFontExAToW( &penumexA->elfEnumLogfontEx, &enumexW.elfEnumLogfontEx ); + enumexW.elfDesignVector = penumexA->elfDesignVector; + return CreateFontIndirectExW( &enumexW ); } /*********************************************************************** - * CreateFontIndirectW (GDI32.@) + * CreateFontIndirectExA (GDI32.@) */ -HFONT WINAPI CreateFontIndirectW( const LOGFONTW *plf ) +HFONT WINAPI CreateFontIndirectExW( const ENUMLOGFONTEXDVW *penumex ) { HFONT hFont; FONTOBJ *fontPtr; + const LOGFONTW *plf; - if (!plf) return 0; + if (!penumex) return 0; + + if (penumex->elfEnumLogfontEx.elfFullName[0] || + penumex->elfEnumLogfontEx.elfStyle[0] || + penumex->elfEnumLogfontEx.elfScript[0]) + { + FIXME("some fields ignored. fullname=%s, style=%s, script=%s\n", + debugstr_w(penumex->elfEnumLogfontEx.elfFullName), + debugstr_w(penumex->elfEnumLogfontEx.elfStyle), + debugstr_w(penumex->elfEnumLogfontEx.elfScript)); + } + plf = &penumex->elfEnumLogfontEx.elfLogFont; if (!(fontPtr = HeapAlloc( GetProcessHeap(), 0, sizeof(*fontPtr) ))) return 0; fontPtr->logfont = *plf; @@ -344,6 +371,35 @@ HFONT WINAPI CreateFontIndirectW( const LOGFONTW *plf ) return hFont; } +/*********************************************************************** + * CreateFontIndirectA (GDI32.@) + */ +HFONT WINAPI CreateFontIndirectA( const LOGFONTA *plfA ) +{ + LOGFONTW lfW; + + if (!plfA) return 0; + + FONT_LogFontAToW( plfA, &lfW ); + return CreateFontIndirectW( &lfW ); +} + +/*********************************************************************** + * CreateFontIndirectW (GDI32.@) + */ +HFONT WINAPI CreateFontIndirectW( const LOGFONTW *plf ) +{ + ENUMLOGFONTEXDVW exdv; + + if (!plf) return 0; + + exdv.elfEnumLogfontEx.elfLogFont = *plf; + exdv.elfEnumLogfontEx.elfFullName[0] = 0; + exdv.elfEnumLogfontEx.elfStyle[0] = 0; + exdv.elfEnumLogfontEx.elfScript[0] = 0; + return CreateFontIndirectExW( &exdv ); +} + /************************************************************************* * CreateFontA (GDI32.@) */ diff --git a/dlls/gdi32/gdi32.spec b/dlls/gdi32/gdi32.spec index e33a7ae..d3843e6 100644 --- a/dlls/gdi32/gdi32.spec +++ b/dlls/gdi32/gdi32.spec @@ -58,8 +58,8 @@ @ stdcall CreateEnhMetaFileW(long wstr ptr wstr) @ stdcall CreateFontA(long long long long long long long long long long long long long str) @ stdcall CreateFontIndirectA(ptr) -# @ stub CreateFontIndirectExA -# @ stub CreateFontIndirectExW +@ stdcall CreateFontIndirectExA(ptr) +@ stdcall CreateFontIndirectExW(ptr) @ stdcall CreateFontIndirectW(ptr) @ stdcall CreateFontW(long long long long long long long long long long long long long wstr) @ stdcall CreateHalftonePalette(long) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 6ef98c8..d89132d 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -43,6 +43,7 @@ DWORD (WINAPI *pGetFontUnicodeRanges)(HDC hdc, LPGLYPHSET lpgs); DWORD (WINAPI *pGetGlyphIndicesA)(HDC hdc, LPCSTR lpstr, INT count, LPWORD pgi, DWORD flags); DWORD (WINAPI *pGetGlyphIndicesW)(HDC hdc, LPCWSTR lpstr, INT count, LPWORD pgi, DWORD flags); BOOL (WINAPI *pGdiRealizationInfo)(HDC hdc, DWORD *); +HFONT (WINAPI *pCreateFontIndirectExA)(const ENUMLOGFONTEXDV *); static HMODULE hgdi32 = 0; @@ -57,6 +58,7 @@ static void init(void) pGetGlyphIndicesA = (void *)GetProcAddress(hgdi32, "GetGlyphIndicesA"); pGetGlyphIndicesW = (void *)GetProcAddress(hgdi32, "GetGlyphIndicesW"); pGdiRealizationInfo = (void *)GetProcAddress(hgdi32, "GdiRealizationInfo"); + pCreateFontIndirectExA = (void *)GetProcAddress(hgdi32, "CreateFontIndirectExA"); } static INT CALLBACK is_truetype_font_installed_proc(const LOGFONT *elf, const TEXTMETRIC *ntm, DWORD type, LPARAM lParam) @@ -3109,6 +3111,37 @@ static void test_CreateFontIndirect(void) } } +static void test_CreateFontIndirectEx(void) +{ + ENUMLOGFONTEXDVA lfex; + HFONT hfont; + + if (!pCreateFontIndirectExA) + { + win_skip("CreateFontIndirectExA is not available\n"); + return; + } + + if (!is_truetype_font_installed("Arial")) + { + skip("Arial is not installed\n"); + return; + } + + SetLastError(0xdeadbeef); + hfont = pCreateFontIndirectExA(NULL); + ok(hfont == NULL, "got %p\n", hfont); + ok(GetLastError() == 0xdeadbeef, "got error %d\n", GetLastError()); + + memset(&lfex, 0, sizeof(lfex)); + lstrcpyA(lfex.elfEnumLogfontEx.elfLogFont.lfFaceName, "Arial"); + hfont = pCreateFontIndirectExA(&lfex); + ok(hfont != 0, "CreateFontIndirectEx failed\n"); + if (hfont) + check_font("Arial", &lfex.elfEnumLogfontEx.elfLogFont, hfont); + DeleteObject(hfont); +} + START_TEST(font) { init(); @@ -3155,5 +3188,6 @@ START_TEST(font) test_GetTextMetrics2("Arial", -55); test_GetTextMetrics2("Arial", -110); test_CreateFontIndirect(); + test_CreateFontIndirectEx(); test_oemcharset(); } diff --git a/include/wingdi.h b/include/wingdi.h index 99fd2bc..e7aafb2 100644 --- a/include/wingdi.h +++ b/include/wingdi.h @@ -610,6 +610,30 @@ typedef struct DECL_WINELIB_TYPE_AW(ENUMLOGFONTEX) DECL_WINELIB_TYPE_AW(LPENUMLOGFONTEX) +#define MM_MAX_NUMAXES 16 + +typedef struct +{ + DWORD dvReserved; + DWORD dvNumAxes; + LONG dvValues[MM_MAX_NUMAXES]; +} DESIGNVECTOR, *PDESIGNVECTOR; + +typedef struct +{ + ENUMLOGFONTEXA elfEnumLogfontEx; + DESIGNVECTOR elfDesignVector; +} ENUMLOGFONTEXDVA, *PENUMLOGFONTEXDVA; + +typedef struct +{ + ENUMLOGFONTEXW elfEnumLogfontEx; + DESIGNVECTOR elfDesignVector; +} ENUMLOGFONTEXDVW, *PENUMLOGFONTEXDVW; + +DECL_WINELIB_TYPE_AW(ENUMLOGFONTEXDV) +DECL_WINELIB_TYPE_AW(PENUMLOGFONTEXDV) + /* * The FONTSIGNATURE tells which Unicode ranges and which code pages * have glyphs in a font. @@ -3356,6 +3380,9 @@ WINGDIAPI HFONT WINAPI CreateFontW(INT,INT,INT,INT,INT,DWORD,DWORD,DWORD,D WINGDIAPI HFONT WINAPI CreateFontIndirectA(const LOGFONTA*); WINGDIAPI HFONT WINAPI CreateFontIndirectW(const LOGFONTW*); #define CreateFontIndirect WINELIB_NAME_AW(CreateFontIndirect) +WINGDIAPI HFONT WINAPI CreateFontIndirectExA(const ENUMLOGFONTEXDVA*); +WINGDIAPI HFONT WINAPI CreateFontIndirectExW(const ENUMLOGFONTEXDVW*); +#define CreateFontIndirectEx WINELIB_NAME_AW(CreateFontIndirectEx) WINGDIAPI HPALETTE WINAPI CreateHalftonePalette(HDC); WINGDIAPI HBRUSH WINAPI CreateHatchBrush(INT,COLORREF); WINGDIAPI HDC WINAPI CreateICA(LPCSTR,LPCSTR,LPCSTR,const DEVMODEA*);

1 0

Eric Pouech : winhelp: Fix trailing space in window name for JumpID macro.
by Alexandre Julliard 14 Jun '10

14 Jun '10

Module: wine Branch: master Commit: 2d20a1aa536aefc09f96ec90827efeb63fa5ac7b URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d20a1aa536aefc09f96ec908… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sat Jun 12 21:54:59 2010 +0200 winhelp: Fix trailing space in window name for JumpID macro. --- programs/winhlp32/macro.c | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-) diff --git a/programs/winhlp32/macro.c b/programs/winhlp32/macro.c index cd497ef..f75b63d 100644 --- a/programs/winhlp32/macro.c +++ b/programs/winhlp32/macro.c @@ -575,13 +575,17 @@ static void CALLBACK MACRO_JumpID(LPCSTR lpszPathWindow, LPCSTR topic_id) if ((ptr = strchr(lpszPathWindow, '>')) != NULL) { LPSTR tmp; - size_t sz = ptr - lpszPathWindow; + size_t sz; - tmp = HeapAlloc(GetProcessHeap(), 0, sz + 1); + tmp = HeapAlloc(GetProcessHeap(), 0, strlen(lpszPathWindow) + 1); if (tmp) { - memcpy(tmp, lpszPathWindow, sz); - tmp[sz] = '\0'; + strcpy(tmp, lpszPathWindow); + tmp[ptr - lpszPathWindow] = '\0'; + ptr += tmp - lpszPathWindow; /* ptr now points to '>' in tmp buffer */ + /* in some cases, we have a trailing space that we need to get rid of */ + /* FIXME: check if it has to be done in lexer rather than here */ + for (sz = strlen(ptr + 1); sz >= 1 && ptr[sz] == ' '; sz--) ptr[sz] = '\0'; MACRO_JumpHash(tmp, ptr + 1, HLPFILE_Hash(topic_id)); HeapFree(GetProcessHeap(), 0, tmp); }

1 0

Eric Pouech : winhelp: Avoid accessing a window in global window list after it has been freed.
by Alexandre Julliard 14 Jun '10

14 Jun '10

Module: wine Branch: master Commit: 3b07c851f84792689f97fc9036a08d40c4d1d3c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b07c851f84792689f97fc903… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sat Jun 12 21:55:05 2010 +0200 winhelp: Avoid accessing a window in global window list after it has been freed. --- programs/winhlp32/macro.c | 12 ++++++++++-- 1 files changed, 10 insertions(+), 2 deletions(-) diff --git a/programs/winhlp32/macro.c b/programs/winhlp32/macro.c index f75b63d..ca0fc8c 100644 --- a/programs/winhlp32/macro.c +++ b/programs/winhlp32/macro.c @@ -281,24 +281,32 @@ static void CALLBACK MACRO_CheckItem(LPCSTR str) static void CALLBACK MACRO_CloseSecondarys(void) { WINHELP_WINDOW *win; + WINHELP_WINDOW *next; WINE_TRACE("()\n"); - for (win = Globals.win_list; win; win = win->next) + for (win = Globals.win_list; win; win = next) + { + next = win->next; if (lstrcmpi(win->info->name, "main")) WINHELP_ReleaseWindow(win); + } } static void CALLBACK MACRO_CloseWindow(LPCSTR lpszWindow) { WINHELP_WINDOW *win; + WINHELP_WINDOW *next; WINE_TRACE("(\"%s\")\n", lpszWindow); if (!lpszWindow || !lpszWindow[0]) lpszWindow = "main"; - for (win = Globals.win_list; win; win = win->next) + for (win = Globals.win_list; win; win = next) + { + next = win->next; if (!lstrcmpi(win->info->name, lpszWindow)) WINHELP_ReleaseWindow(win); + } } static void CALLBACK MACRO_Compare(LPCSTR str)

1 0

Sven Baars : wldap32: Fix Dutch translation.
by Alexandre Julliard 14 Jun '10

14 Jun '10

Module: wine Branch: master Commit: 307aa290aaa4643df042d8c0278fa0b443568cfe URL: http://source.winehq.org/git/wine.git/?a=commit;h=307aa290aaa4643df042d8c02… Author: Sven Baars <sven.wine(a)gmail.com> Date: Fri Jun 11 19:22:45 2010 +0200 wldap32: Fix Dutch translation. --- dlls/wldap32/wldap32_Nl.rc | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/wldap32/wldap32_Nl.rc b/dlls/wldap32/wldap32_Nl.rc index 58ac2ef..7de79d2 100644 --- a/dlls/wldap32/wldap32_Nl.rc +++ b/dlls/wldap32/wldap32_Nl.rc @@ -41,7 +41,7 @@ STRINGTABLE DISCARDABLE 14 "" 15 "" 16 "Attribuut bestaat niet" - 17 "Ongedefini�erd type" + 17 "Ongedefinieerd type" 18 "Foutieve vergelijking" 19 "Schending van restrictie" 20 "Attribuut of waarde bestaat" @@ -58,7 +58,7 @@ STRINGTABLE DISCARDABLE 31 "" 32 "Object bestaat niet" 33 "Aliasprobleem" - 34 "Ongeldige DN syntax" + 34 "Ongeldige DN-syntax" 35 "Eindknoop" 36 "Alias volgprobleem" 37 "" @@ -78,7 +78,7 @@ STRINGTABLE DISCARDABLE 51 "Bezig" 52 "Niet beschikbaar" 53 "Uitvoering geweigerd" - 54 "Cirkel gedetecteerd" + 54 "Lus gedetecteerd" 55 "" 56 "" 57 "" @@ -95,7 +95,7 @@ STRINGTABLE DISCARDABLE 68 "Bestaat reeds" 69 "Geen objectklassemodificaties" 70 "Resultaten te groot" - 71 "Betreft meerdere DSAs" + 71 "Betreft meerdere DSA's" 72 "" 73 "" 74 "" @@ -120,6 +120,6 @@ STRINGTABLE DISCARDABLE 93 "Opgegeven besturingselement niet gevonden in bericht" 94 "Geen resultaat aanwezig in bericht" 95 "Meer resultaten teruggekregen" - 96 "Cirkel gevonden bij het verwerken van verwijzingen" + 96 "Lus gevonden bij het verwerken van verwijzingen" 97 "Overschrijding van limiet op verwijzingen" }

1 0