wine-commits October 2011

wine-commits@winehq.org

3 participants
783 discussions

Jacek Caban : vbscript: Pass arguments to 1-arg functions directly if they are VT_VARIANT|VT_BYREF .
by Alexandre Julliard 11 Oct '11

11 Oct '11

Module: wine Branch: master Commit: 1c936039ed716fd6fcda3b31262b898c30fff9d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c936039ed716fd6fcda3b312… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Oct 11 14:59:06 2011 +0200 vbscript: Pass arguments to 1-arg functions directly if they are VT_VARIANT|VT_BYREF. --- dlls/vbscript/vbdisp.c | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/dlls/vbscript/vbdisp.c b/dlls/vbscript/vbdisp.c index d083d74..e22e060 100644 --- a/dlls/vbscript/vbdisp.c +++ b/dlls/vbscript/vbdisp.c @@ -133,6 +133,8 @@ static HRESULT invoke_variant_prop(vbdisp_t *This, VARIANT *v, WORD flags, DISPP static HRESULT invoke_builtin(vbdisp_t *This, const builtin_prop_t *prop, WORD flags, DISPPARAMS *dp, VARIANT *res) { + VARIANT *args; + switch(flags) { case DISPATCH_PROPERTYGET: if(!(prop->flags & (BP_GET|BP_GETPUT))) { @@ -166,7 +168,12 @@ static HRESULT invoke_builtin(vbdisp_t *This, const builtin_prop_t *prop, WORD f return E_FAIL; } - return prop->proc(This, dp->rgvarg, dp->cArgs, res); + if(arg_cnt(dp) == 1 && V_VT(dp->rgvarg) == (VT_BYREF|VT_VARIANT)) + args = V_VARIANTREF(dp->rgvarg); + else + args = dp->rgvarg; + + return prop->proc(This, args, dp->cArgs, res); } static BOOL run_terminator(vbdisp_t *This)

1 0

Huw Davies : gdi32: Add a helper to retrieve the bounding rectangle.
by Alexandre Julliard 11 Oct '11

11 Oct '11

Module: wine Branch: master Commit: a7b5d8665589059a151da7505bde733a00b3c73f URL: http://source.winehq.org/git/wine.git/?a=commit;h=a7b5d8665589059a151da7505… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Oct 11 12:49:53 2011 +0100 gdi32: Add a helper to retrieve the bounding rectangle. --- dlls/gdi32/bitblt.c | 16 ++++++---------- dlls/gdi32/gdi_private.h | 20 ++++++++++++++++++++ 2 files changed, 26 insertions(+), 10 deletions(-) diff --git a/dlls/gdi32/bitblt.c b/dlls/gdi32/bitblt.c index c595a60..a2a7698 100644 --- a/dlls/gdi32/bitblt.c +++ b/dlls/gdi32/bitblt.c @@ -65,12 +65,10 @@ static BOOL get_vis_rectangles( DC *dc_dst, struct bitblt_coords *dst, dst->height = rect.bottom - rect.top; if (dst->layout & LAYOUT_RTL && dst->layout & LAYOUT_BITMAPORIENTATIONPRESERVED) { - swap_ints( &rect.left, &rect.right ); - dst->x = rect.left; - dst->width = rect.right - rect.left; + dst->x += dst->width; + dst->width = -dst->width; } - if (rect.left > rect.right) { swap_ints( &rect.left, &rect.right ); rect.left++; rect.right++; } - if (rect.top > rect.bottom) { swap_ints( &rect.top, &rect.bottom ); rect.top++; rect.bottom++; } + get_bounding_rect( &rect, dst->x, dst->y, dst->width, dst->height ); if (get_clip_box( dc_dst, &clip )) intersect_rect( &dst->visrect, &rect, &clip ); @@ -92,12 +90,10 @@ static BOOL get_vis_rectangles( DC *dc_dst, struct bitblt_coords *dst, src->height = rect.bottom - rect.top; if (src->layout & LAYOUT_RTL && src->layout & LAYOUT_BITMAPORIENTATIONPRESERVED) { - swap_ints( &rect.left, &rect.right ); - src->x = rect.left; - src->width = rect.right - rect.left; + src->x += src->width; + src->width = -src->width; } - if (rect.left > rect.right) { swap_ints( &rect.left, &rect.right ); rect.left++; rect.right++; } - if (rect.top > rect.bottom) { swap_ints( &rect.top, &rect.bottom ); rect.top++; rect.bottom++; } + get_bounding_rect( &rect, src->x, src->y, src->width, src->height ); /* source is not clipped */ if (dc_src->header.type == OBJ_MEMDC) diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index b3d027a..6a600a4 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -469,6 +469,26 @@ static inline void offset_rect( RECT *rect, int offset_x, int offset_y ) rect->bottom += offset_y; } +static inline void get_bounding_rect( RECT *rect, int x, int y, int width, int height ) +{ + rect->left = x; + rect->right = x + width; + rect->top = y; + rect->bottom = y + height; + if (rect->left > rect->right) + { + int tmp = rect->left; + rect->left = rect->right + 1; + rect->right = tmp + 1; + } + if (rect->top > rect->bottom) + { + int tmp = rect->top; + rect->top = rect->bottom + 1; + rect->bottom = tmp + 1; + } +} + static inline int get_bitmap_stride( int width, int bpp ) { return ((width * bpp + 15) >> 3) & ~1;

1 0

Alexandre Julliard : winex11: Get rid of the client-side DIB optimization in AlphaBlend.
by Alexandre Julliard 11 Oct '11

11 Oct '11

Module: wine Branch: master Commit: 125529fabecc0e7a92bd1a41078093f375955080 URL: http://source.winehq.org/git/wine.git/?a=commit;h=125529fabecc0e7a92bd1a410… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 11 15:24:15 2011 +0200 winex11: Get rid of the client-side DIB optimization in AlphaBlend. --- dlls/winex11.drv/xrender.c | 12 +----------- 1 files changed, 1 insertions(+), 11 deletions(-) diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c index cb0ec9b..1986fa3 100644 --- a/dlls/winex11.drv/xrender.c +++ b/dlls/winex11.drv/xrender.c @@ -2876,18 +2876,8 @@ static BOOL xrenderdrv_AlphaBlend( PHYSDEV dst_dev, struct bitblt_coords *dst, return FALSE; } - if (physdev_dst != physdev_src) - { - int status = X11DRV_LockDIBSection( physdev_src->x11dev, DIB_Status_None ); - if (status == DIB_Status_AppMod || status == DIB_Status_InSync) - { - X11DRV_UnlockDIBSection( physdev_src->x11dev, FALSE ); - dst_dev = GET_NEXT_PHYSDEV( dst_dev, pAlphaBlend ); - return dst_dev->funcs->pAlphaBlend( dst_dev, dst, src_dev, src, blendfn ); - } - X11DRV_CoerceDIBSection( physdev_src->x11dev, DIB_Status_GdiMod ); - } X11DRV_LockDIBSection( physdev_dst->x11dev, DIB_Status_GdiMod ); + if (physdev_dst != physdev_src) X11DRV_LockDIBSection( physdev_src->x11dev, DIB_Status_GdiMod ); dst_pict = get_xrender_picture( physdev_dst, 0, &dst->visrect );

1 0

Alexandre Julliard : gdi32: Add an AlphaBlend entry point in the DIB driver .
by Alexandre Julliard 11 Oct '11

11 Oct '11

Module: wine Branch: master Commit: 6c07876e87642feba0c18541b599be8fa64a58c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c07876e87642feba0c18541b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 11 15:23:04 2011 +0200 gdi32: Add an AlphaBlend entry point in the DIB driver. --- dlls/gdi32/dibdrv/bitblt.c | 16 ++++++++++++++++ dlls/gdi32/dibdrv/dc.c | 2 +- dlls/gdi32/dibdrv/dibdrv.h | 2 ++ 3 files changed, 19 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/dibdrv/bitblt.c b/dlls/gdi32/dibdrv/bitblt.c index 48afa8e..f78f9a2 100644 --- a/dlls/gdi32/dibdrv/bitblt.c +++ b/dlls/gdi32/dibdrv/bitblt.c @@ -1133,3 +1133,19 @@ BOOL dibdrv_StretchBlt( PHYSDEV dst_dev, struct bitblt_coords *dst, release_dc_ptr( dc_dst ); return ret; } + +/*********************************************************************** + * dibdrv_AlphaBlend + */ +BOOL dibdrv_AlphaBlend( PHYSDEV dst_dev, struct bitblt_coords *dst, + PHYSDEV src_dev, struct bitblt_coords *src, BLENDFUNCTION blend ) +{ + BOOL ret; + DC *dc_dst = get_dc_ptr( dst_dev->hdc ); + + if (!dc_dst) return FALSE; + + ret = dc_dst->nulldrv.funcs->pAlphaBlend( &dc_dst->nulldrv, dst, src_dev, src, blend ); + release_dc_ptr( dc_dst ); + return ret; +} diff --git a/dlls/gdi32/dibdrv/dc.c b/dlls/gdi32/dibdrv/dc.c index 9d8391a..f610390 100644 --- a/dlls/gdi32/dibdrv/dc.c +++ b/dlls/gdi32/dibdrv/dc.c @@ -501,7 +501,7 @@ const DC_FUNCTIONS dib_driver = { NULL, /* pAbortDoc */ NULL, /* pAbortPath */ - NULL, /* pAlphaBlend */ + dibdrv_AlphaBlend, /* pAlphaBlend */ NULL, /* pAngleArc */ NULL, /* pArc */ NULL, /* pArcTo */ diff --git a/dlls/gdi32/dibdrv/dibdrv.h b/dlls/gdi32/dibdrv/dibdrv.h index 5f9a31e..0be8ffa 100644 --- a/dlls/gdi32/dibdrv/dibdrv.h +++ b/dlls/gdi32/dibdrv/dibdrv.h @@ -100,6 +100,8 @@ typedef struct dibdrv_physdev #define DEFER_PEN 2 #define DEFER_BRUSH 4 +extern BOOL dibdrv_AlphaBlend( PHYSDEV dst_dev, struct bitblt_coords *dst, + PHYSDEV src_dev, struct bitblt_coords *src, BLENDFUNCTION blend ) DECLSPEC_HIDDEN; extern DWORD dibdrv_GetImage( PHYSDEV dev, HBITMAP hbitmap, BITMAPINFO *info, struct gdi_image_bits *bits, struct bitblt_coords *src ) DECLSPEC_HIDDEN; extern BOOL dibdrv_LineTo( PHYSDEV dev, INT x, INT y ) DECLSPEC_HIDDEN;

1 0

Hwang YunSong : po: Updated Korean translation.
by Alexandre Julliard 11 Oct '11

11 Oct '11

Module: wine Branch: master Commit: d3d3e37dfe3e356b50a8f7640af63e3f024d705d URL: http://source.winehq.org/git/wine.git/?a=commit;h=d3d3e37dfe3e356b50a8f7640… Author: Hwang YunSong <hys545(a)dreamwiz.com> Date: Mon Oct 10 20:14:06 2011 +0900 po: Updated Korean translation. --- po/ko.po | 31 +++++++++++++------------------ 1 files changed, 13 insertions(+), 18 deletions(-) diff --git a/po/ko.po b/po/ko.po index 378e2ec..ffa5952 100644 --- a/po/ko.po +++ b/po/ko.po @@ -7926,16 +7926,16 @@ msgstr "" "PATH %PATH%;c:\\temp\n" #: cmd.rc:128 -#, fuzzy msgid "" "PAUSE displays a message on the screen asking the user to press a key.\n" "\n" "It is mainly useful in batch files to allow the user to read the output\n" "of a previous command before it scrolls off the screen.\n" msgstr "" -"PAUSE는 'Press Return key to continue' 메세지를 화면에 보여주고\n" -"사용자가 리턴 키를 누를 때까지 기다림. 이것은 주로 배치파일에서 스크린을\n" -"넘치게 하는 이전 명령의 결과를 읽도록 한다\n" +"PAUSE 는 사용자가 아무 키나 누르라는 메세지를 화면에 보여줍니다.\n" +"\n" +"사용자가 화면에서 스크롤 하기 전에 이전 명령의 결과를 읽을 수 있도록\n" +"배치파일에서 주로 유용하게 사용합니다." #: cmd.rc:149 msgid "" @@ -8199,7 +8199,6 @@ msgstr "" "호출한 셀로 돌아갑니다.\n" #: cmd.rc:289 -#, fuzzy msgid "" "CMD built-in commands are:\n" "ASSOC\t\tShow or modify file extension associations\n" @@ -8259,6 +8258,7 @@ msgstr "" "MORE\t\t페이지 출력 보여주기\n" "MOVE\t\t파일 이나 여러 파일,그리고 디렉토리 구조 이동\n" "PATH\t\t탐색 경로 보여주거나 설정하기\n" +"PAUSE\t\t배치 파일에서 실행을 정지시킴\n" "POPD\t\tPUSHD로 마지막으로 저장했던 디렉토리로 돌아가기\n" "PROMPT\t\t명령 프롬프트 바꾸기\n" "PUSHD\t\t현재 디렉토리를 저장하고, 새 디렉토리로 바꾸기\n" @@ -8398,13 +8398,12 @@ msgid "PATH not found\n" msgstr "PATH를 찾을 수 없습니다\n" #: cmd.rc:321 -#, fuzzy msgid "Press any key to continue... " -msgstr "리턴 키를 누르면 계속: " +msgstr "아무 키나 누르면 진행함... " #: cmd.rc:322 msgid "Wine Command Prompt" -msgstr "Wine 명령 입력대기" +msgstr "Wine 명령 프롬프트" #: cmd.rc:323 msgid "CMD Version %s\n" @@ -8412,7 +8411,7 @@ msgstr "CMD 버젼 %s\n" #: cmd.rc:324 msgid "More? " -msgstr " 더? " +msgstr "더? " #: cmd.rc:325 msgid "The input line is too long.\n" @@ -9680,17 +9679,16 @@ msgid "Close message sent to top-level windows of process with PID %u.\n" msgstr "PID %u 의 프로세스의 최상위 창에 닫는 메세지 보냈습니다.\n" #: taskkill.rc:34 -#, fuzzy msgid "" "Close message sent to top-level windows of process \"%s\" with PID %u.\n" -msgstr "PID %u 의 프로세스 \"%s\"의 최상위 창에 닫는 메세지 보냈습니다.\n" +msgstr "" +"PID %u 의 프로세스 \"%s\"의 최상위 창에 닫으라는 메세지를 보냈습니다.\n" #: taskkill.rc:35 msgid "Process with PID %u was forcibly terminated.\n" msgstr "PID %u 의 프로세스는 강제로 종료되었습니다.\n" #: taskkill.rc:36 -#, fuzzy msgid "Process \"%s\" with PID %u was forcibly terminated.\n" msgstr "PID %u 의 프로세스 \"%s\" 는 강제로 종료되엇습니다.\n" @@ -9700,7 +9698,7 @@ msgstr "오류: 프로세스 \"%s\"를 찾을 수 없습니다.\n" #: taskkill.rc:38 msgid "Error: Unable to enumerate the process list.\n" -msgstr "오류: 프로세스 목록을 열거 할 수 업습니다.\n" +msgstr "오류: 프로세스 목록을 열거 할 수 없습니다.\n" #: taskkill.rc:39 msgid "Error: Unable to terminate process \"%s\".\n" @@ -10348,14 +10346,12 @@ msgid "(None)" msgstr "(없음)" #: winecfg.rc:89 -#, fuzzy msgid "Audio test failed!" -msgstr "하드디스크 재설정 실패\n" +msgstr "오디오 테스트 실패\n" #: winecfg.rc:91 -#, fuzzy msgid "(System default)" -msgstr "시스템 경로" +msgstr "(시스템 기본)" #: winecfg.rc:51 msgid "" @@ -11313,7 +11309,6 @@ msgid "Overwrite %s? (Yes|No|All)\n" msgstr "%s를 덮어쓰겠습니까? (예|아니오|모두)\n" #: xcopy.rc:37 -#, fuzzy msgid "Copying of '%s' to '%s' failed with r/c %d\n" msgstr " r/c %d로 '%s'를 '%s'로 복사 실패 \n"

1 0

Frédéric Delanoy : po: Update French translation.
by Alexandre Julliard 11 Oct '11

11 Oct '11

Module: wine Branch: master Commit: f4b91fca0f065412cbacbbee746a9fbf5095f9c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f4b91fca0f065412cbacbbee7… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Oct 11 11:47:36 2011 +0200 po: Update French translation. --- po/fr.po | 66 +++++++++++++++++++++++++++---------------------------------- 1 files changed, 29 insertions(+), 37 deletions(-) diff --git a/po/fr.po b/po/fr.po index ac0962a..9583c10 100644 --- a/po/fr.po +++ b/po/fr.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2011-09-06 22:11+0100\n" +"PO-Revision-Date: 2011-10-10 22:11+0100\n" "Last-Translator: Frédéric Delanoy <frederic.delanoy(a)gmail.com>\n" "Language-Team: none\n" "Language: French\n" @@ -7738,7 +7738,6 @@ msgid "%s: File Not Found\n" msgstr "%s : fichier non trouvé\n" #: attrib.rc:47 -#, fuzzy msgid "" "ATTRIB - Displays or changes file attributes.\n" "\n" @@ -7768,17 +7767,17 @@ msgstr "" "\n" "où\n" "\n" -"+ Définit un attribut.\n" -"- Supprime un attribut.\n" -"R Attribut de fichier en lecture seule.\n" -"A Attribut de fichier archive.\n" -"S Attribut de fichier système.\n" -"H Attribut de fichier caché.\n" -"[lecteur:][chemin][nomFichier]\n" -"Spécifie un ou plusieurs fichiers à faire traiter par attrib.\n" -"/S Traite les fichiers correspondants dans le dossier courant\n" -"et tous les sous-dossiers.\n" -"/D Traite également les dossiers.\n" +" + Définit un attribut.\n" +" - Supprime un attribut.\n" +" R Attribut de fichier en lecture seule.\n" +" A Attribut de fichier archive.\n" +" S Attribut de fichier système.\n" +" H Attribut de fichier caché.\n" +" [lecteur:][chemin][nomFichier]\n" +" Spécifie un ou plusieurs fichiers qu'attrib doit traiter.\n" +" /S Traite les fichiers correspondants dans le dossier courant\n" +" et tous les sous-dossiers.\n" +" /D Traite également les dossiers.\n" #: clock.rc:29 msgid "Ana&log" @@ -8031,18 +8030,19 @@ msgstr "" "PATH %PATH%;c:\\temp\n" #: cmd.rc:128 -#, fuzzy msgid "" "PAUSE displays a message on the screen asking the user to press a key.\n" "\n" "It is mainly useful in batch files to allow the user to read the output\n" "of a previous command before it scrolls off the screen.\n" msgstr "" -"PAUSE affiche un message sur l'écran : « Pressez Entrée pour continuer »\n" -"et attend que l'utilisateur presse la touche Entrée. PAUSE est surtout " -"utilisé dans\n" -"les fichiers batchs pour permettre à l'utilisateur de lire la sortie de\n" -"la dernière commande avant qu'elle ne disparaisse de l'écran.\n" +"PAUSE affiche un message à l'écran demandant à l'utilisateur d'appuyer sur " +"une touche.\n" +"\n" +"Principalement utilisé dans des fichiers batchs pour permettre à " +"l'utilisateur\n" +"de lire la sortie de la dernière commande avant qu'elle ne disparaisse de " +"l'écran.\n" #: cmd.rc:149 msgid "" @@ -8325,7 +8325,6 @@ msgstr "" "au système d'exploitation ou au shell où vous avez invoqué cmd.\n" #: cmd.rc:289 -#, fuzzy msgid "" "CMD built-in commands are:\n" "ASSOC\t\tShow or modify file extension associations\n" @@ -8387,6 +8386,7 @@ msgstr "" "MORE\t\tAffiche du texte par pages\n" "MOVE\t\tDéplace un fichier, un groupe de fichiers ou un répertoire\n" "PATH\t\tRègle ou affiche le chemin de recherche\n" +"PAUSE\t\tSuspend l'exécution d'un fichier batch\n" "POPD\t\tRemplace le répertoire courant par le dernier enregistré avec\n" "\t\tPUSHD\n" "PROMPT\t\tChange l'invite de commande\n" @@ -8529,9 +8529,8 @@ msgid "PATH not found\n" msgstr "PATH non trouvé\n" #: cmd.rc:321 -#, fuzzy msgid "Press any key to continue... " -msgstr "Appuyez sur ENTRÉE pour continuer : " +msgstr "Appuyez sur une touche pour continuer... " #: cmd.rc:322 msgid "Wine Command Prompt" @@ -9075,9 +9074,8 @@ msgid "version 1.0" msgstr "version 1.0" #: oleview.rc:100 -#, fuzzy msgid "TypeLib files (*.tlb; *.olb; *.dll; *.ocx; *.exe)" -msgstr "Fichiers TypeLib (*.tlb;*.olb;*.dll;*.ocx;*.exe)" +msgstr "Fichiers TypeLib (*.tlb ; *.olb ; *.dll ; *.ocx ; *.exe)" #: oleview.rc:103 msgid "Bind to file via a File Moniker" @@ -10519,22 +10517,19 @@ msgstr "Configuration de Wine pour %s" #: winecfg.rc:87 msgid "Selected driver: %s" -msgstr "" +msgstr "Pilote sélectionné : %s" #: winecfg.rc:88 -#, fuzzy msgid "(None)" -msgstr "Aucune" +msgstr "(Aucun)" #: winecfg.rc:89 -#, fuzzy msgid "Audio test failed!" -msgstr "Échec de réinitialisation du disque dur\n" +msgstr "Échec du test audio !\n" #: winecfg.rc:91 -#, fuzzy msgid "(System default)" -msgstr "Chemin système (path)" +msgstr "(Valeur par défaut du système)" #: winecfg.rc:51 msgid "" @@ -10573,9 +10568,8 @@ msgid "Default Settings" msgstr "Paramètres par défaut" #: winecfg.rc:59 -#, fuzzy msgid "Wine Programs (*.exe; *.exe.so)" -msgstr "Programmes de Wine (*.exe,*.exe.so)" +msgstr "Programmes de Wine (*.exe ; *.exe.so)" #: winecfg.rc:60 msgid "Use global settings" @@ -10998,9 +10992,8 @@ msgid "Tile &Vertically\tCtrl+F4" msgstr "Arranger &verticalement\tCtrl+F4" #: winefile.rc:87 -#, fuzzy msgid "&About Wine File Manager" -msgstr "Gestionnaire de fichiers de Wine" +msgstr "À &propos du gestionnaire de fichiers de Wine" #: winefile.rc:93 msgid "Applying font settings" @@ -11327,9 +11320,8 @@ msgid "Unicode text document" msgstr "Document texte Unicode" #: wordpad.rc:143 -#, fuzzy msgid "Printer files (*.prn)" -msgstr "Fichiers d'impression (*.PRN)" +msgstr "Fichiers d'impression (*.prn)" #: wordpad.rc:148 msgid "Left"

1 0

Huw Davies : gdi32: Now that we require a less ancient freetype, we can assume several other functions are also present.
by Alexandre Julliard 11 Oct '11

11 Oct '11

Module: wine Branch: master Commit: bb47bab3cd2e27574164c72885ad346039b3d9f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb47bab3cd2e27574164c7288… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Oct 11 10:14:56 2011 +0100 gdi32: Now that we require a less ancient freetype, we can assume several other functions are also present. --- dlls/gdi32/freetype.c | 48 ++++++++++++++---------------------------------- 1 files changed, 14 insertions(+), 34 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index e527490..fd00d0f 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -154,11 +154,15 @@ static void *ft_handle = NULL; #define MAKE_FUNCPTR(f) static typeof(f) * p##f = NULL MAKE_FUNCPTR(FT_Done_Face); MAKE_FUNCPTR(FT_Get_Char_Index); +MAKE_FUNCPTR(FT_Get_First_Char); MAKE_FUNCPTR(FT_Get_Module); +MAKE_FUNCPTR(FT_Get_Next_Char); MAKE_FUNCPTR(FT_Get_Sfnt_Name); MAKE_FUNCPTR(FT_Get_Sfnt_Name_Count); MAKE_FUNCPTR(FT_Get_Sfnt_Table); +MAKE_FUNCPTR(FT_Get_WinFNT_Header); MAKE_FUNCPTR(FT_Init_FreeType); +MAKE_FUNCPTR(FT_Library_Version); MAKE_FUNCPTR(FT_Load_Glyph); MAKE_FUNCPTR(FT_Load_Sfnt_Table); MAKE_FUNCPTR(FT_Matrix_Multiply); @@ -178,16 +182,10 @@ MAKE_FUNCPTR(FT_Set_Charmap); MAKE_FUNCPTR(FT_Set_Pixel_Sizes); MAKE_FUNCPTR(FT_Vector_Transform); MAKE_FUNCPTR(FT_Vector_Unit); -static void (*pFT_Library_Version)(FT_Library,FT_Int*,FT_Int*,FT_Int*); -static FT_ULong (*pFT_Get_First_Char)(FT_Face,FT_UInt*); -static FT_ULong (*pFT_Get_Next_Char)(FT_Face,FT_ULong,FT_UInt*); static FT_TrueTypeEngineType (*pFT_Get_TrueType_Engine_Type)(FT_Library); #ifdef HAVE_FREETYPE_FTLCDFIL_H static FT_Error (*pFT_Library_SetLcdFilter)(FT_Library, FT_LcdFilter); #endif -#ifdef HAVE_FREETYPE_FTWINFNT_H -MAKE_FUNCPTR(FT_Get_WinFNT_Header); -#endif #ifdef SONAME_LIBFONTCONFIG #include <fontconfig/fontconfig.h> @@ -1449,9 +1447,7 @@ static INT AddFontToList(const char *file, void *font_data_ptr, DWORD font_data_ struct list *family_elem_ptr, *face_elem_ptr; FT_Error err; FT_Long face_index = 0, num_faces; -#ifdef HAVE_FREETYPE_FTWINFNT_H FT_WinFNT_HeaderRec winfnt_header; -#endif int i, bitmap_num, internal_leading; FONTSIGNATURE fs; @@ -1632,14 +1628,13 @@ static INT AddFontToList(const char *file, void *font_data_ptr, DWORD font_data_ if(pOS2->version == 0) { FT_UInt dummy; - if(!pFT_Get_First_Char || (pFT_Get_First_Char( ft_face, &dummy ) < 0x100)) + if(pFT_Get_First_Char( ft_face, &dummy ) < 0x100) fs.fsCsb[0] |= FS_LATIN1; else fs.fsCsb[0] |= FS_SYMBOL; } } -#ifdef HAVE_FREETYPE_FTWINFNT_H - else if(pFT_Get_WinFNT_Header && !pFT_Get_WinFNT_Header(ft_face, &winfnt_header)) { + else if(!pFT_Get_WinFNT_Header(ft_face, &winfnt_header)) { CHARSETINFO csi; TRACE("pix_h %d charset %d dpi %dx%d pt %d\n", winfnt_header.pixel_height, winfnt_header.charset, winfnt_header.vertical_resolution,winfnt_header.horizontal_resolution, winfnt_header.nominal_point_size); @@ -1647,7 +1642,6 @@ static INT AddFontToList(const char *file, void *font_data_ptr, DWORD font_data_ fs = csi.fs; internal_leading = winfnt_header.internal_leading; } -#endif face_elem_ptr = list_head(&family->faces); while(face_elem_ptr) { @@ -2898,11 +2892,15 @@ static BOOL init_freetype(void) LOAD_FUNCPTR(FT_Done_Face) LOAD_FUNCPTR(FT_Get_Char_Index) + LOAD_FUNCPTR(FT_Get_First_Char) LOAD_FUNCPTR(FT_Get_Module) + LOAD_FUNCPTR(FT_Get_Next_Char) LOAD_FUNCPTR(FT_Get_Sfnt_Name) LOAD_FUNCPTR(FT_Get_Sfnt_Name_Count) LOAD_FUNCPTR(FT_Get_Sfnt_Table) + LOAD_FUNCPTR(FT_Get_WinFNT_Header) LOAD_FUNCPTR(FT_Init_FreeType) + LOAD_FUNCPTR(FT_Library_Version) LOAD_FUNCPTR(FT_Load_Glyph) LOAD_FUNCPTR(FT_Load_Sfnt_Table) LOAD_FUNCPTR(FT_Matrix_Multiply) @@ -2922,16 +2920,10 @@ static BOOL init_freetype(void) LOAD_FUNCPTR(FT_Vector_Unit) #undef LOAD_FUNCPTR /* Don't warn if these ones are missing */ - pFT_Library_Version = wine_dlsym(ft_handle, "FT_Library_Version", NULL, 0); - pFT_Get_First_Char = wine_dlsym(ft_handle, "FT_Get_First_Char", NULL, 0); - pFT_Get_Next_Char = wine_dlsym(ft_handle, "FT_Get_Next_Char", NULL, 0); pFT_Get_TrueType_Engine_Type = wine_dlsym(ft_handle, "FT_Get_TrueType_Engine_Type", NULL, 0); #ifdef HAVE_FREETYPE_FTLCDFIL_H pFT_Library_SetLcdFilter = wine_dlsym(ft_handle, "FT_Library_SetLcdFilter", NULL, 0); #endif -#ifdef HAVE_FREETYPE_FTWINFNT_H - pFT_Get_WinFNT_Header = wine_dlsym(ft_handle, "FT_Get_WinFNT_Header", NULL, 0); -#endif if(pFT_Init_FreeType(&library) != 0) { ERR("Can't init FreeType library\n"); @@ -2939,16 +2931,8 @@ static BOOL init_freetype(void) ft_handle = NULL; return FALSE; } - FT_Version.major = FT_Version.minor = FT_Version.patch = -1; - if (pFT_Library_Version) - pFT_Library_Version(library,&FT_Version.major,&FT_Version.minor,&FT_Version.patch); + pFT_Library_Version(library,&FT_Version.major,&FT_Version.minor,&FT_Version.patch); - if (FT_Version.major<=0) - { - FT_Version.major=2; - FT_Version.minor=0; - FT_Version.patch=5; - } TRACE("FreeType version is %d.%d.%d\n",FT_Version.major,FT_Version.minor,FT_Version.patch); FT_SimpleVersion = ((FT_Version.major << 16) & 0xff0000) | ((FT_Version.minor << 8) & 0x00ff00) | @@ -5661,16 +5645,13 @@ DWORD WineEngGetGlyphOutline(GdiFont *incoming_font, UINT glyph, UINT format, static BOOL get_bitmap_text_metrics(GdiFont *font) { FT_Face ft_face = font->ft_face; -#ifdef HAVE_FREETYPE_FTWINFNT_H FT_WinFNT_HeaderRec winfnt_header; -#endif const DWORD size = offsetof(OUTLINETEXTMETRICW, otmFiller); font->potm = HeapAlloc(GetProcessHeap(), 0, size); font->potm->otmSize = size; #define TM font->potm->otmTextMetrics -#ifdef HAVE_FREETYPE_FTWINFNT_H - if(pFT_Get_WinFNT_Header && !pFT_Get_WinFNT_Header(ft_face, &winfnt_header)) + if(!pFT_Get_WinFNT_Header(ft_face, &winfnt_header)) { TM.tmHeight = winfnt_header.pixel_height; TM.tmAscent = winfnt_header.ascent; @@ -5694,7 +5675,6 @@ static BOOL get_bitmap_text_metrics(GdiFont *font) TM.tmCharSet = winfnt_header.charset; } else -#endif { TM.tmAscent = ft_face->size->metrics.ascender >> 6; TM.tmDescent = -ft_face->size->metrics.descender >> 6; @@ -6561,7 +6541,7 @@ static DWORD get_font_unicode_ranges(FT_Face face, GLYPHSET *gs) { DWORD num_ranges = 0; - if (face->charmap->encoding == FT_ENCODING_UNICODE && pFT_Get_First_Char) + if (face->charmap->encoding == FT_ENCODING_UNICODE) { FT_UInt glyph_code; FT_ULong char_code, char_code_prev; @@ -6870,7 +6850,7 @@ DWORD WineEngGetKerningPairs(GdiFont *font, DWORD cPairs, KERNINGPAIR *kern_pair return 0; } - if (font->ft_face->charmap->encoding == FT_ENCODING_UNICODE && pFT_Get_First_Char) + if (font->ft_face->charmap->encoding == FT_ENCODING_UNICODE) { FT_UInt glyph_code; FT_ULong char_code;

1 0

Huw Davies : gdi32: Remove no longer needed include file.
by Alexandre Julliard 11 Oct '11

11 Oct '11

Module: wine Branch: master Commit: 6ee2eaeff2aff2acff06d00eb0a2fbe6e412d93a URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ee2eaeff2aff2acff06d00eb… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Oct 11 10:14:55 2011 +0100 gdi32: Remove no longer needed include file. --- configure | 18 +----------------- configure.ac | 8 +------- dlls/gdi32/freetype.c | 3 --- include/config.h.in | 6 ------ 4 files changed, 2 insertions(+), 33 deletions(-) diff --git a/configure b/configure index 0e968c2..3cf9675 100755 --- a/configure +++ b/configure @@ -10262,8 +10262,7 @@ fi freetype/ftoutln.h \ freetype/ftwinfnt.h \ freetype/ftmodapi.h \ - freetype/ftlcdfil.h \ - freetype/internal/sfnt.h + freetype/ftlcdfil.h do : as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "#ifdef HAVE_FT2BUILD_H @@ -10304,21 +10303,6 @@ _ACEOF fi - ac_save_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS $ac_freetype_libs" - for ac_func in FT_Load_Sfnt_Table -do : - ac_fn_c_check_func "$LINENO" "FT_Load_Sfnt_Table" "ac_cv_func_FT_Load_Sfnt_Table" -if test "x$ac_cv_func_FT_Load_Sfnt_Table" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_FT_LOAD_SFNT_TABLE 1 -_ACEOF - -fi -done - - CFLAGS="$ac_save_CFLAGS" - CPPFLAGS="$ac_save_CPPFLAGS" if test "$ac_cv_header_freetype_freetype_h" = "yes" -a "$wine_cv_fttrigon" = "yes" then diff --git a/configure.ac b/configure.ac index 1401072..5de420b 100644 --- a/configure.ac +++ b/configure.ac @@ -1373,8 +1373,7 @@ then freetype/ftoutln.h \ freetype/ftwinfnt.h \ freetype/ftmodapi.h \ - freetype/ftlcdfil.h \ - freetype/internal/sfnt.h,,, + freetype/ftlcdfil.h,,, [#ifdef HAVE_FT2BUILD_H # include <ft2build.h> #endif]) @@ -1383,11 +1382,6 @@ then [Define if you have the <freetype/fttrigon.h> header file.]) wine_cv_fttrigon=yes],[wine_cv_fttrigon=no]) AC_CHECK_TYPES(FT_TrueTypeEngineType,,,[#include <freetype/ftmodapi.h>]) - ac_save_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS $ac_freetype_libs" - AC_CHECK_FUNCS(FT_Load_Sfnt_Table) - CFLAGS="$ac_save_CFLAGS" - CPPFLAGS="$ac_save_CPPFLAGS" dnl Check that we have at least freetype/freetype.h if test "$ac_cv_header_freetype_freetype_h" = "yes" -a "$wine_cv_fttrigon" = "yes" then diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 9357766..e527490 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -117,9 +117,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(font); #ifdef HAVE_FREETYPE_FTOUTLN_H #include <freetype/ftoutln.h> #endif -#ifdef HAVE_FREETYPE_INTERNAL_SFNT_H -#include <freetype/internal/sfnt.h> -#endif #ifdef HAVE_FREETYPE_FTTRIGON_H #include <freetype/fttrigon.h> #endif diff --git a/include/config.h.in b/include/config.h.in index f0016c8..f70e354 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -152,9 +152,6 @@ /* Define to 1 if you have the <freetype/ftwinfnt.h> header file. */ #undef HAVE_FREETYPE_FTWINFNT_H -/* Define to 1 if you have the <freetype/internal/sfnt.h> header file. */ -#undef HAVE_FREETYPE_INTERNAL_SFNT_H - /* Define to 1 if you have the <freetype/ttnameid.h> header file. */ #undef HAVE_FREETYPE_TTNAMEID_H @@ -179,9 +176,6 @@ /* Define to 1 if you have the `ftruncate' function. */ #undef HAVE_FTRUNCATE -/* Define to 1 if you have the `FT_Load_Sfnt_Table' function. */ -#undef HAVE_FT_LOAD_SFNT_TABLE - /* Define to 1 if the system has the type `FT_TrueTypeEngineType'. */ #undef HAVE_FT_TRUETYPEENGINETYPE

1 0

Hans Leidekker : msi: Properly build the shortcut target path.
by Alexandre Julliard 11 Oct '11

11 Oct '11

Module: wine Branch: master Commit: e973115a798380fb5ebd87377492c04307afca22 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e973115a798380fb5ebd87377… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Oct 11 11:03:02 2011 +0200 msi: Properly build the shortcut target path. --- dlls/msi/action.c | 23 ++++++++++++++++++++--- 1 files changed, 20 insertions(+), 3 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 80bcfc8..72d431a 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -3611,9 +3611,26 @@ static UINT ITERATE_CreateShortcuts(MSIRECORD *row, LPVOID param) target = MSI_RecordGetString(row, 5); if (strchrW(target, '[')) { - deformat_string(package, target, &deformated); - IShellLinkW_SetPath(sl,deformated); - msi_free(deformated); + int len; + WCHAR *format_string, *p; + + if (!(p = strchrW( target, ']' ))) goto err; + len = p - target + 1; + format_string = msi_alloc( (len + 1) * sizeof(WCHAR) ); + memcpy( format_string, target, len * sizeof(WCHAR) ); + format_string[len] = 0; + deformat_string( package, format_string, &deformated ); + msi_free( format_string ); + + path = msi_alloc( (strlenW( deformated ) + strlenW( p + 1 ) + 2) * sizeof(WCHAR) ); + strcpyW( path, deformated ); + PathAddBackslashW( path ); + strcatW( path, p + 1 ); + TRACE("target path is %s\n", debugstr_w(path)); + + IShellLinkW_SetPath( sl, path ); + msi_free( deformated ); + msi_free( path ); } else {

1 0

Hans Leidekker : msi: Don' t attempt to patch files if the component action resolves to anything other than INSTALLSTATE_LOCAL .
by Alexandre Julliard 11 Oct '11

11 Oct '11

Module: wine Branch: master Commit: cda63b8a3820de7864c663ab79d47c431eb9038f URL: http://source.winehq.org/git/wine.git/?a=commit;h=cda63b8a3820de7864c663ab7… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Oct 11 11:02:41 2011 +0200 msi: Don't attempt to patch files if the component action resolves to anything other than INSTALLSTATE_LOCAL. --- dlls/msi/files.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/msi/files.c b/dlls/msi/files.c index 210e012..c6282f7 100644 --- a/dlls/msi/files.c +++ b/dlls/msi/files.c @@ -497,6 +497,7 @@ UINT ACTION_PatchFiles( MSIPACKAGE *package ) LIST_FOR_EACH_ENTRY( patch, &package->filepatches, MSIFILEPATCH, entry ) { MSIFILE *file = patch->File; + MSICOMPONENT *comp = file->Component; rc = msi_load_media_info( package, patch->Sequence, mi ); if (rc != ERROR_SUCCESS) @@ -504,7 +505,8 @@ UINT ACTION_PatchFiles( MSIPACKAGE *package ) ERR("Unable to load media info for %s (%u)\n", debugstr_w(file->File), rc); return ERROR_FUNCTION_FAILED; } - if (!file->Component->Enabled) continue; + comp->Action = msi_get_component_action( package, comp ); + if (!comp->Enabled || comp->Action != INSTALLSTATE_LOCAL) continue; if (!patch->IsApplied) {

1 0

← Newer
1
...
53
54
55
56
57
58
59
...
79
Older →

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 October 2011