July 2010 - Wine-Commits - list.winehq.org

Hwang YunSong : shdocvw: New Korean resource.
by Alexandre Julliard July 26, 2010

July 26, 2010

Module: wine Branch: master Commit: e1a6ba3a29fe6698450a2995226f4729c334d757 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e1a6ba3a29fe6698450a29952… Author: Hwang YunSong <hys545(a)dreamwiz.com> Date: Mon Jul 26 10:45:47 2010 +0900 shdocvw: New Korean resource. --- dlls/shdocvw/Ko.rc | 60 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/shdocvw/Makefile.in | 1 + 2 files changed, 61 insertions(+), 0 deletions(-) diff --git a/dlls/shdocvw/Ko.rc b/dlls/shdocvw/Ko.rc new file mode 100644 index 0000000..a612609 --- /dev/null +++ b/dlls/shdocvw/Ko.rc @@ -0,0 +1,60 @@ +/* + * Copyright 2010 Alexander N. Sørnes <alex(a)thehandofagony.com> + * Copyright 2010 YunSOng Hwang + * + * 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 "resource.h" + +#pragma code_page(65001) + +LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT + +IDD_BROWSE_OPEN DIALOG 10, 10, 200, 70 +STYLE DS_MODALFRAME | WS_CAPTION +CAPTION "URL 열기" +FONT 8, "MS Shell Dlg" +{ + LTEXT "인터넷 익스플로어로 열 URL 지정",-1,25, 5, 150,15 + LTEXT "열기:", -1, 2, 32, 20, 15 + EDITTEXT IDC_BROWSE_OPEN_URL, 25, 30, 160, 13 + DEFPUSHBUTTON "확인(&O)", IDOK, 25, 50, 50, 15 + PUSHBUTTON "취소(&C)", IDCANCEL, 85, 50, 50, 15 +} + +IDR_BROWSE_MAIN_MENU MENU +{ + POPUP "파일(&F)" + { + POPUP "새 작업(&N)" + { + MENUITEM "창(&W)" ID_BROWSE_NEW_WINDOW + } + MENUITEM "열기(&O)...", ID_BROWSE_OPEN + MENUITEM "저장(&S)", ID_BROWSE_SAVE + MENUITEM "다른 이름으로 저장(&A)...", ID_BROWSE_SAVE_AS + MENUITEM SEPARATOR + MENUITEM "인쇄 형식(&F)...", ID_BROWSE_PRINT_FORMAT + MENUITEM "인쇄(&I)...", ID_BROWSE_PRINT + MENUITEM "인쇄 미리보기(&W)...", ID_BROWSE_PRINT_PREVIEW + MENUITEM SEPARATOR + MENUITEM "속성(&P)...", ID_BROWSE_PROPERTIES + } + POPUP "도움말(&H)" + { + MENUITEM "인터넷 익스플로어 정보(&A)...", ID_BROWSE_ABOUT + } +} diff --git a/dlls/shdocvw/Makefile.in b/dlls/shdocvw/Makefile.in index 182aa01..bff1a3d 100644 --- a/dlls/shdocvw/Makefile.in +++ b/dlls/shdocvw/Makefile.in @@ -31,6 +31,7 @@ C_SRCS = \ RC_SRCS = \ De.rc \ En.rc \ + Ko.rc \ Lt.rc \ Nl.rc \ Uk.rc \

1 0

Aurimas Fišeras : shdocvw: Add Lithuanian translation.
by Alexandre Julliard July 26, 2010

July 26, 2010

Module: wine Branch: master Commit: 5ffa1dae363d0c339a033e97e0c9b5ed88227341 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ffa1dae363d0c339a033e97e… Author: Aurimas Fišeras <aurimas(a)gmail.com> Date: Sun Jul 25 19:20:50 2010 +0300 shdocvw: Add Lithuanian translation. --- dlls/shdocvw/Lt.rc | 60 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/shdocvw/Makefile.in | 1 + 2 files changed, 61 insertions(+), 0 deletions(-) diff --git a/dlls/shdocvw/Lt.rc b/dlls/shdocvw/Lt.rc new file mode 100644 index 0000000..e35a2d8 --- /dev/null +++ b/dlls/shdocvw/Lt.rc @@ -0,0 +1,60 @@ +/* + * Copyright 2010 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 "resource.h" + +/* UTF-8 */ +#pragma code_page(65001) + +LANGUAGE LANG_LITHUANIAN, SUBLANG_NEUTRAL + +IDD_BROWSE_OPEN DIALOG 10, 10, 200, 70 +STYLE DS_MODALFRAME | WS_CAPTION +CAPTION "Atverti URL" +FONT 8, "MS Shell Dlg" +{ + LTEXT "Nurodykite URL, kurį norite atverti su Internet Explorer",-1,30, 5, 150,15 + LTEXT "Atverti:", -1, 2, 32, 25, 15 + EDITTEXT IDC_BROWSE_OPEN_URL, 30, 30, 160, 13 + DEFPUSHBUTTON "&Gerai", IDOK, 30, 50, 50, 15 + PUSHBUTTON "&Atsisakyti", IDCANCEL, 90, 50, 50, 15 +} + +IDR_BROWSE_MAIN_MENU MENU +{ + POPUP "&Failas" + { + POPUP "&Naujas" + { + MENUITEM "&Langas" ID_BROWSE_NEW_WINDOW + } + MENUITEM "&Atverti...", ID_BROWSE_OPEN + MENUITEM "&Išsaugoti", ID_BROWSE_SAVE + MENUITEM "Išsaugoti &kaip...", ID_BROWSE_SAVE_AS + MENUITEM SEPARATOR + MENUITEM "Spaudinio &formatas...", ID_BROWSE_PRINT_FORMAT + MENUITEM "S&pausdinti...", ID_BROWSE_PRINT + MENUITEM "Spaudinio pe&ržiūra...", ID_BROWSE_PRINT_PREVIEW + MENUITEM SEPARATOR + MENUITEM "&Savybės...", ID_BROWSE_PROPERTIES + } + POPUP "&Žinynas" + { + MENUITEM "&Apie Internet Explorer...", ID_BROWSE_ABOUT + } +} diff --git a/dlls/shdocvw/Makefile.in b/dlls/shdocvw/Makefile.in index 18f9a88..182aa01 100644 --- a/dlls/shdocvw/Makefile.in +++ b/dlls/shdocvw/Makefile.in @@ -31,6 +31,7 @@ C_SRCS = \ RC_SRCS = \ De.rc \ En.rc \ + Lt.rc \ Nl.rc \ Uk.rc \ shdocvw.rc

1 0

Marko Nikolic : advapi32: Removed sign comparison warning.
by Alexandre Julliard July 26, 2010

July 26, 2010

Module: wine Branch: master Commit: da2750384dd21868395d8d43807bef7c300c3cfa URL: http://source.winehq.org/git/wine.git/?a=commit;h=da2750384dd21868395d8d438… Author: Marko Nikolic <grkoma(a)gmail.com> Date: Sat Jul 24 17:21:22 2010 +0200 advapi32: Removed sign comparison warning. --- dlls/advapi32/cred.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/cred.c b/dlls/advapi32/cred.c index 03d7622..0afbb63 100644 --- a/dlls/advapi32/cred.c +++ b/dlls/advapi32/cred.c @@ -925,7 +925,7 @@ static DWORD mac_delete_credential(LPCWSTR TargetName) * */ -static INT convert_PCREDENTIALW_to_PCREDENTIALA(const CREDENTIALW *CredentialW, PCREDENTIALA CredentialA, INT len) +static INT convert_PCREDENTIALW_to_PCREDENTIALA(const CREDENTIALW *CredentialW, PCREDENTIALA CredentialA, DWORD len) { char *buffer; INT string_len; @@ -1582,7 +1582,8 @@ BOOL WINAPI CredReadDomainCredentialsA(PCREDENTIAL_TARGET_INFORMATIONA TargetInf DWORD Flags, DWORD *Size, PCREDENTIALA **Credentials) { PCREDENTIAL_TARGET_INFORMATIONW TargetInformationW; - INT len, i; + INT len; + DWORD i; WCHAR *buffer, *end; BOOL ret; PCREDENTIALW* CredentialsW;

1 0

Jacek Caban : mshtml: Removed frozen status comments from nsiface.idl.
by Alexandre Julliard July 26, 2010

July 26, 2010

Module: wine Branch: master Commit: f6299c1bf865596943c877827adcecf52d016b80 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f6299c1bf865596943c877827… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jul 26 15:45:47 2010 +0200 mshtml: Removed frozen status comments from nsiface.idl. All interfaces were recently unfrozen for upcoming mozilla2 (Firefox 4) anyway. --- dlls/mshtml/nsiface.idl | 114 ----------------------------------------------- 1 files changed, 0 insertions(+), 114 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f6299c1bf865596943c87…

1 0

Ilya Basin : shell32/tests: CommandLineToArgvW("") shouldn' t truncate returned exe path.
by Alexandre Julliard July 26, 2010

July 26, 2010

Module: wine Branch: master Commit: 3b545300b85ca23c53dfb56478182b29e37c9beb URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b545300b85ca23c53dfb5647… Author: Ilya Basin <basinilya(a)gmail.com> Date: Sat Jul 24 20:42:15 2010 +0400 shell32/tests: CommandLineToArgvW("") shouldn't truncate returned exe path. --- dlls/shell32/tests/shlexec.c | 12 +++++++++++- 1 files changed, 11 insertions(+), 1 deletions(-) diff --git a/dlls/shell32/tests/shlexec.c b/dlls/shell32/tests/shlexec.c index b883d0b..47f640f 100644 --- a/dlls/shell32/tests/shlexec.c +++ b/dlls/shell32/tests/shlexec.c @@ -2118,8 +2118,9 @@ static void test_commandline(void) static const WCHAR chkfmt3[] = {'\\','\"','%','s','\"',0}; static const WCHAR chkfmt4[] = {'%','s','=','%','s','\"',' ','%','s','\"',0}; WCHAR cmdline[255]; - LPWSTR *args = (LPWSTR*)0xdeadcafe; + LPWSTR *args = (LPWSTR*)0xdeadcafe, pbuf; INT numargs = -1; + size_t buflen; wsprintfW(cmdline,fmt1,one,two,three,four); args=CommandLineToArgvW(cmdline,&numargs); @@ -2170,6 +2171,15 @@ static void test_commandline(void) wsprintfW(cmdline,fmt6); args=CommandLineToArgvW(cmdline,&numargs); ok(numargs == 1, "expected 1 args, got %i\n",numargs); + if (numargs == 1) { + buflen = max(lstrlenW(args[0])+1,256); + pbuf = HeapAlloc(GetProcessHeap(), 0, buflen*sizeof(pbuf[0])); + GetModuleFileNameW(NULL, pbuf, buflen); + pbuf[buflen-1] = 0; + /* check args[0] is module file name */ + ok(lstrcmpW(args[0],pbuf)==0, "wrong path to the current executable\n"); + HeapFree(GetProcessHeap(), 0, pbuf); + } } START_TEST(shlexec)

1 0

Ilya Basin : shell32: Fix CommandLineToArgvW("") truncating returned exe path.
by Alexandre Julliard July 26, 2010

July 26, 2010

Module: wine Branch: master Commit: 9dee1b24eea47a8fc9dafdad4558bfe33e9ca0bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=9dee1b24eea47a8fc9dafdad4… Author: Ilya Basin <basinilya(a)gmail.com> Date: Sat Jul 24 20:42:10 2010 +0400 shell32: Fix CommandLineToArgvW("") truncating returned exe path. --- dlls/shell32/shell32_main.c | 14 ++++++++------ 1 files changed, 8 insertions(+), 6 deletions(-) diff --git a/dlls/shell32/shell32_main.c b/dlls/shell32/shell32_main.c index f906a24..a166150 100644 --- a/dlls/shell32/shell32_main.c +++ b/dlls/shell32/shell32_main.c @@ -94,20 +94,22 @@ LPWSTR* WINAPI CommandLineToArgvW(LPCWSTR lpCmdline, int* numargs) if (*lpCmdline==0) { /* Return the path to the executable */ - DWORD len, size=16; + DWORD len, deslen=MAX_PATH, size; - argv=LocalAlloc(LMEM_FIXED, size); + size = sizeof(LPWSTR) + deslen*sizeof(WCHAR) + sizeof(LPWSTR); for (;;) { - len = GetModuleFileNameW(0, (LPWSTR)(argv+1), (size-sizeof(LPWSTR))/sizeof(WCHAR)); + if (!(argv = LocalAlloc(LMEM_FIXED, size))) return NULL; + len = GetModuleFileNameW(0, (LPWSTR)(argv+1), deslen); if (!len) { LocalFree(argv); return NULL; } - if (len < size) break; - size*=2; - argv=LocalReAlloc(argv, size, 0); + if (len < deslen) break; + deslen*=2; + size = sizeof(LPWSTR) + deslen*sizeof(WCHAR) + sizeof(LPWSTR); + LocalFree( argv ); } argv[0]=(LPWSTR)(argv+1); if (numargs)

1 0

Marko Nikolic : libwine: Removed sign comparison warning.
by Alexandre Julliard July 26, 2010

July 26, 2010

Module: wine Branch: master Commit: 0ffb137d4a2d1ae5f291a03971ade5ba49ed0d6b URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ffb137d4a2d1ae5f291a0397… Author: Marko Nikolic <grkoma(a)gmail.com> Date: Sat Jul 24 17:21:21 2010 +0200 libwine: Removed sign comparison warning. --- libs/wine/config.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/libs/wine/config.c b/libs/wine/config.c index 6bb87b0..93dc7e0 100644 --- a/libs/wine/config.c +++ b/libs/wine/config.c @@ -141,7 +141,7 @@ static char *get_runtime_libdir(void) static char *get_runtime_bindir( const char *argv0 ) { char *p, *bindir, *cwd; - size_t len, size; + int len, size; #ifdef linux for (size = 256; ; size *= 2)

1 0

Alexandre Julliard : gdi32: Get rid of the GetDCOrgEx driver entry point, GDI can implement this itself now.
by Alexandre Julliard July 26, 2010

July 26, 2010

Module: wine Branch: master Commit: f57c1b77dd5b9e56e6e103d632f26c0ddea6009b URL: http://source.winehq.org/git/wine.git/?a=commit;h=f57c1b77dd5b9e56e6e103d63… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 26 15:36:01 2010 +0200 gdi32: Get rid of the GetDCOrgEx driver entry point, GDI can implement this itself now. --- dlls/gdi32/clipping.c | 7 ++----- dlls/gdi32/dc.c | 5 ++--- dlls/gdi32/driver.c | 1 - dlls/gdi32/enhmfdrv/init.c | 1 - dlls/gdi32/gdi_private.h | 1 - dlls/gdi32/mfdrv/init.c | 1 - dlls/winex11.drv/graphics.c | 10 ---------- dlls/winex11.drv/winex11.drv.spec | 1 - dlls/winex11.drv/x11drv.h | 1 - 9 files changed, 4 insertions(+), 24 deletions(-) diff --git a/dlls/gdi32/clipping.c b/dlls/gdi32/clipping.c index 142c520..dfbc0ca 100644 --- a/dlls/gdi32/clipping.c +++ b/dlls/gdi32/clipping.c @@ -463,11 +463,8 @@ INT WINAPI GetRandomRgn(HDC hDC, HRGN hRgn, INT iCode) /* On Windows NT/2000, the SYSRGN returned is in screen coordinates */ if (iCode == SYSRGN && !(GetVersion() & 0x80000000)) - { - POINT org; - GetDCOrgEx( hDC, &org ); - OffsetRgn( hRgn, org.x, org.y ); - } + OffsetRgn( hRgn, dc->vis_rect.left, dc->vis_rect.top ); + return (rgn != 0); } diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index 738e42e..d122aae 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -1068,9 +1068,8 @@ BOOL WINAPI GetDCOrgEx( HDC hDC, LPPOINT lpp ) if (!lpp) return FALSE; if (!(dc = get_dc_ptr( hDC ))) return FALSE; - - lpp->x = lpp->y = 0; - if (dc->funcs->pGetDCOrgEx) dc->funcs->pGetDCOrgEx( dc->physDev, lpp ); + lpp->x = dc->vis_rect.left; + lpp->y = dc->vis_rect.top; release_dc_ptr( dc ); return TRUE; } diff --git a/dlls/gdi32/driver.c b/dlls/gdi32/driver.c index e6713ea..65eb048 100644 --- a/dlls/gdi32/driver.c +++ b/dlls/gdi32/driver.c @@ -109,7 +109,6 @@ static struct graphics_driver *create_driver( HMODULE module ) GET_FUNC(GdiComment); GET_FUNC(GetBitmapBits); GET_FUNC(GetCharWidth); - GET_FUNC(GetDCOrgEx); GET_FUNC(GetDIBColorTable); GET_FUNC(GetDIBits); GET_FUNC(GetDeviceCaps); diff --git a/dlls/gdi32/enhmfdrv/init.c b/dlls/gdi32/enhmfdrv/init.c index 115bb39..7e1c9b8 100644 --- a/dlls/gdi32/enhmfdrv/init.c +++ b/dlls/gdi32/enhmfdrv/init.c @@ -71,7 +71,6 @@ static const DC_FUNCTIONS EMFDRV_Funcs = EMFDRV_GdiComment, /* pGdiComment */ NULL, /* pGetBitmapBits */ NULL, /* pGetCharWidth */ - NULL, /* pGetDCOrgEx */ NULL, /* pGetDIBColorTable */ NULL, /* pGetDIBits */ EMFDRV_GetDeviceCaps, /* pGetDeviceCaps */ diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 8ac78ef..e09cf2b 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -113,7 +113,6 @@ typedef struct tagDC_FUNCS BOOL (CDECL *pGdiComment)(PHYSDEV,UINT,CONST BYTE*); LONG (CDECL *pGetBitmapBits)(HBITMAP,void*,LONG); BOOL (CDECL *pGetCharWidth)(PHYSDEV,UINT,UINT,LPINT); - BOOL (CDECL *pGetDCOrgEx)(PHYSDEV,LPPOINT); UINT (CDECL *pGetDIBColorTable)(PHYSDEV,UINT,UINT,RGBQUAD*); INT (CDECL *pGetDIBits)(PHYSDEV,HBITMAP,UINT,UINT,LPVOID,BITMAPINFO*,UINT); INT (CDECL *pGetDeviceCaps)(PHYSDEV,INT); diff --git a/dlls/gdi32/mfdrv/init.c b/dlls/gdi32/mfdrv/init.c index f515bcf..810bd27 100644 --- a/dlls/gdi32/mfdrv/init.c +++ b/dlls/gdi32/mfdrv/init.c @@ -69,7 +69,6 @@ static const DC_FUNCTIONS MFDRV_Funcs = NULL, /* pGdiComment */ NULL, /* pGetBitmapBits */ NULL, /* pGetCharWidth */ - NULL, /* pGetDCOrgEx */ NULL, /* pGetDIBColorTable */ NULL, /* pGetDIBits */ MFDRV_GetDeviceCaps, /* pGetDeviceCaps */ diff --git a/dlls/winex11.drv/graphics.c b/dlls/winex11.drv/graphics.c index 53cbab4..9cb509a 100644 --- a/dlls/winex11.drv/graphics.c +++ b/dlls/winex11.drv/graphics.c @@ -1466,16 +1466,6 @@ X11DRV_SetTextColor( X11DRV_PDEVICE *physDev, COLORREF color ) return color; } -/*********************************************************************** - * GetDCOrgEx (X11DRV.@) - */ -BOOL CDECL X11DRV_GetDCOrgEx( X11DRV_PDEVICE *physDev, LPPOINT lpp ) -{ - lpp->x = physDev->dc_rect.left + physDev->drawable_rect.left; - lpp->y = physDev->dc_rect.top + physDev->drawable_rect.top; - return TRUE; -} - static unsigned char *get_icm_profile( unsigned long *size ) { diff --git a/dlls/winex11.drv/winex11.drv.spec b/dlls/winex11.drv/winex11.drv.spec index ab61f54..ffd90ad 100644 --- a/dlls/winex11.drv/winex11.drv.spec +++ b/dlls/winex11.drv/winex11.drv.spec @@ -17,7 +17,6 @@ @ cdecl ExtTextOut(ptr long long long ptr ptr long ptr) X11DRV_ExtTextOut @ cdecl GetBitmapBits(long ptr long) X11DRV_GetBitmapBits @ cdecl GetCharWidth(ptr long long ptr) X11DRV_GetCharWidth -@ cdecl GetDCOrgEx(ptr ptr) X11DRV_GetDCOrgEx @ cdecl GetDIBits(ptr long long long ptr ptr long) X11DRV_GetDIBits @ cdecl GetDeviceCaps(ptr long) X11DRV_GetDeviceCaps @ cdecl GetDeviceGammaRamp(ptr ptr) X11DRV_GetDeviceGammaRamp diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 1cd610d..b8362fa 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -193,7 +193,6 @@ extern BOOL CDECL X11DRV_EnumDeviceFonts( X11DRV_PDEVICE *physDev, LPLOGFONTW pl extern LONG CDECL X11DRV_GetBitmapBits( HBITMAP hbitmap, void *bits, LONG count ); extern BOOL CDECL X11DRV_GetCharWidth( X11DRV_PDEVICE *physDev, UINT firstChar, UINT lastChar, LPINT buffer ); -extern BOOL CDECL X11DRV_GetDCOrgEx( X11DRV_PDEVICE *physDev, LPPOINT lpp ); extern BOOL CDECL X11DRV_GetTextExtentExPoint( X11DRV_PDEVICE *physDev, LPCWSTR str, INT count, INT maxExt, LPINT lpnFit, LPINT alpDx, LPSIZE size ); extern BOOL CDECL X11DRV_GetTextMetrics(X11DRV_PDEVICE *physDev, TEXTMETRICW *metrics);

1 0

Alexandre Julliard : gdi32: Replace the SelectVisRgn Wine-specific export by a private entry point.
by Alexandre Julliard July 26, 2010

July 26, 2010

Module: wine Branch: master Commit: 1472f35e823f84721d867494148f721d72f9dc7d URL: http://source.winehq.org/git/wine.git/?a=commit;h=1472f35e823f84721d8674941… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 26 15:28:02 2010 +0200 gdi32: Replace the SelectVisRgn Wine-specific export by a private entry point. --- dlls/gdi32/clipping.c | 20 +++++++++----------- dlls/gdi32/gdi32.spec | 2 +- dlls/user32/painting.c | 5 +---- dlls/user32/sysparams.c | 2 -- include/wingdi.h | 5 ++++- 5 files changed, 15 insertions(+), 19 deletions(-) diff --git a/dlls/gdi32/clipping.c b/dlls/gdi32/clipping.c index a942fe1..e865656 100644 --- a/dlls/gdi32/clipping.c +++ b/dlls/gdi32/clipping.c @@ -156,26 +156,24 @@ INT WINAPI ExtSelectClipRgn( HDC hdc, HRGN hrgn, INT fnMode ) } /*********************************************************************** - * SelectVisRgn (GDI32.@) - * - * Note: not exported on Windows, only the 16-bit version is exported. + * __wine_set_visible_region (GDI32.@) */ -INT WINAPI SelectVisRgn( HDC hdc, HRGN hrgn ) +void CDECL __wine_set_visible_region( HDC hdc, HRGN hrgn, const RECT *vis_rect ) { - int retval; DC * dc; - if (!hrgn) return ERROR; - if (!(dc = get_dc_ptr( hdc ))) return ERROR; + if (!(dc = get_dc_ptr( hdc ))) return; - TRACE("%p %p\n", hdc, hrgn ); + TRACE( "%p %p %s\n", hdc, hrgn, wine_dbgstr_rect(vis_rect) ); - dc->dirty = 0; + /* map region to DC coordinates */ + OffsetRgn( hrgn, -vis_rect->left, -vis_rect->top ); - retval = CombineRgn( dc->hVisRgn, hrgn, 0, RGN_COPY ); + DeleteObject( dc->hVisRgn ); + dc->dirty = 0; + dc->hVisRgn = hrgn; CLIPPING_UpdateGCRegion( dc ); release_dc_ptr( dc ); - return retval; } diff --git a/dlls/gdi32/gdi32.spec b/dlls/gdi32/gdi32.spec index d3843e6..f66e7d5 100644 --- a/dlls/gdi32/gdi32.spec +++ b/dlls/gdi32/gdi32.spec @@ -514,7 +514,6 @@ # Wine extensions: Win16 functions that are needed by other dlls # @ stdcall GetDCHook(long ptr) -@ stdcall SelectVisRgn(long long) @ stdcall SetDCHook(long ptr long) @ stdcall SetHookFlags(long long) @@ -526,3 +525,4 @@ # GDI objects @ cdecl __wine_make_gdi_object_system(long long) +@ cdecl __wine_set_visible_region(long long ptr) diff --git a/dlls/user32/painting.c b/dlls/user32/painting.c index cd096cd..969c63e 100644 --- a/dlls/user32/painting.c +++ b/dlls/user32/painting.c @@ -160,10 +160,7 @@ static void update_visible_region( struct dce *dce ) if (dce->clip_rgn) CombineRgn( vis_rgn, vis_rgn, dce->clip_rgn, (flags & DCX_INTERSECTRGN) ? RGN_AND : RGN_DIFF ); - /* map region to DC coordinates */ - OffsetRgn( vis_rgn, -win_rect.left, -win_rect.top ); - SelectVisRgn( dce->hdc, vis_rgn ); - DeleteObject( vis_rgn ); + __wine_set_visible_region( dce->hdc, vis_rgn, &win_rect ); } diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index 3d4075f..8c6367e 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -384,8 +384,6 @@ static const WORD wPattern55AA[] = { 0x5555, 0xaaaa, 0x5555, 0xaaaa, 0x5555, 0xa HBRUSH SYSCOLOR_55AABrush = 0; -extern void CDECL __wine_make_gdi_object_system( HGDIOBJ handle, BOOL set ); - static void SYSPARAMS_LogFont16To32W( const LOGFONT16 *font16, LPLOGFONTW font32 ) { diff --git a/include/wingdi.h b/include/wingdi.h index 53db856..3f5058f 100644 --- a/include/wingdi.h +++ b/include/wingdi.h @@ -3790,7 +3790,10 @@ typedef BOOL (CALLBACK *DCHOOKPROC)(HDC,WORD,DWORD_PTR,LPARAM); WINGDIAPI DWORD_PTR WINAPI GetDCHook(HDC,DCHOOKPROC*); WINGDIAPI BOOL WINAPI SetDCHook(HDC,DCHOOKPROC,DWORD_PTR); WINGDIAPI WORD WINAPI SetHookFlags(HDC,WORD); -WINGDIAPI INT WINAPI SelectVisRgn(HDC,HRGN); + +extern void CDECL __wine_make_gdi_object_system( HGDIOBJ handle, BOOL set ); +extern void CDECL __wine_set_visible_region( HDC hdc, HRGN hrgn, const RECT *vis_rect ); + #endif /* __WINESRC__ */ #ifdef __cplusplus

1 0

Alexandre Julliard : gdi32: Store the total visible rectangle in the DC.
by Alexandre Julliard July 26, 2010

July 26, 2010

Module: wine Branch: master Commit: 69c8f0b67d445493a83dc932aaacefc26bb42c09 URL: http://source.winehq.org/git/wine.git/?a=commit;h=69c8f0b67d445493a83dc932a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 26 15:30:26 2010 +0200 gdi32: Store the total visible rectangle in the DC. --- dlls/gdi32/bitmap.c | 4 ++++ dlls/gdi32/clipping.c | 1 + dlls/gdi32/dc.c | 19 +++++++++++++++---- dlls/gdi32/gdi_private.h | 1 + 4 files changed, 21 insertions(+), 4 deletions(-) diff --git a/dlls/gdi32/bitmap.c b/dlls/gdi32/bitmap.c index 937a67d..e5a02be 100644 --- a/dlls/gdi32/bitmap.c +++ b/dlls/gdi32/bitmap.c @@ -611,6 +611,10 @@ static HGDIOBJ BITMAP_SelectObject( HGDIOBJ handle, HDC hdc ) dc->hBitmap = handle; GDI_inc_ref_count( handle ); dc->dirty = 0; + dc->vis_rect.left = 0; + dc->vis_rect.top = 0; + dc->vis_rect.right = bitmap->bitmap.bmWidth; + dc->vis_rect.bottom = bitmap->bitmap.bmHeight; SetRectRgn( dc->hVisRgn, 0, 0, bitmap->bitmap.bmWidth, bitmap->bitmap.bmHeight); GDI_ReleaseObj( handle ); DC_InitDC( dc ); diff --git a/dlls/gdi32/clipping.c b/dlls/gdi32/clipping.c index e865656..142c520 100644 --- a/dlls/gdi32/clipping.c +++ b/dlls/gdi32/clipping.c @@ -171,6 +171,7 @@ void CDECL __wine_set_visible_region( HDC hdc, HRGN hrgn, const RECT *vis_rect ) DeleteObject( dc->hVisRgn ); dc->dirty = 0; + dc->vis_rect = *vis_rect; dc->hVisRgn = hrgn; CLIPPING_UpdateGCRegion( dc ); release_dc_ptr( dc ); diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index 7c86d34..738e42e 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -666,8 +666,11 @@ HDC WINAPI CreateDCW( LPCWSTR driver, LPCWSTR device, LPCWSTR output, goto error; } - SetRectRgn( dc->hVisRgn, 0, 0, - GetDeviceCaps( hdc, DESKTOPHORZRES ), GetDeviceCaps( hdc, DESKTOPVERTRES ) ); + dc->vis_rect.left = 0; + dc->vis_rect.top = 0; + dc->vis_rect.right = GetDeviceCaps( hdc, DESKTOPHORZRES ); + dc->vis_rect.bottom = GetDeviceCaps( hdc, DESKTOPVERTRES ); + SetRectRgn(dc->hVisRgn, dc->vis_rect.left, dc->vis_rect.top, dc->vis_rect.right, dc->vis_rect.bottom); DC_InitDC( dc ); release_dc_ptr( dc ); @@ -768,6 +771,10 @@ HDC WINAPI CreateCompatibleDC( HDC hdc ) TRACE("(%p): returning %p\n", hdc, dc->hSelf ); dc->hBitmap = GDI_inc_ref_count( GetStockObject( DEFAULT_BITMAP )); + dc->vis_rect.left = 0; + dc->vis_rect.top = 0; + dc->vis_rect.right = 1; + dc->vis_rect.bottom = 1; if (!(dc->hVisRgn = CreateRectRgn( 0, 0, 1, 1 ))) goto error; /* default bitmap is 1x1 */ /* Copy the driver-specific physical device info into @@ -860,8 +867,12 @@ HDC WINAPI ResetDCW( HDC hdc, const DEVMODEW *devmode ) if (ret) /* reset the visible region */ { dc->dirty = 0; - SetRectRgn( dc->hVisRgn, 0, 0, GetDeviceCaps( hdc, DESKTOPHORZRES ), - GetDeviceCaps( hdc, DESKTOPVERTRES ) ); + dc->vis_rect.left = 0; + dc->vis_rect.top = 0; + dc->vis_rect.right = GetDeviceCaps( hdc, DESKTOPHORZRES ); + dc->vis_rect.bottom = GetDeviceCaps( hdc, DESKTOPVERTRES ); + SetRectRgn( dc->hVisRgn, dc->vis_rect.left, dc->vis_rect.top, + dc->vis_rect.right, dc->vis_rect.bottom ); CLIPPING_UpdateGCRegion( dc ); } } diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index d1cb66b..8ac78ef 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -261,6 +261,7 @@ typedef struct tagDC INT vportExtY; SIZE virtual_res; /* Initially HORZRES,VERTRES. Changed by SetVirtualResolution */ SIZE virtual_size; /* Initially HORZSIZE,VERTSIZE. Changed by SetVirtualResolution */ + RECT vis_rect; /* visible rectangle in screen coords */ FLOAT miterLimit; int flags;

1 0