October 2011 - Wine-Commits

Stefan Dösinger : d3d9: Remove the palette implementation methods.
by Alexandre Julliard Oct. 11, 2011

Oct. 11, 2011

Module: wine Branch: master Commit: 4365d2905c6d1b5f530b077bec0d152e327be23b URL: http://source.winehq.org/git/wine.git/?a=commit;h=4365d2905c6d1b5f530b077be… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Sep 27 09:17:18 2011 -0500 d3d9: Remove the palette implementation methods. --- dlls/d3d9/device.c | 44 ++++++++------------------------------------ 1 files changed, 8 insertions(+), 36 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 33c443a..8dc7334 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -1790,61 +1790,33 @@ static HRESULT WINAPI IDirect3DDevice9Impl_ValidateDevice(IDirect3DDevice9Ex *if static HRESULT WINAPI IDirect3DDevice9Impl_SetPaletteEntries(IDirect3DDevice9Ex *iface, UINT PaletteNumber, const PALETTEENTRY *pEntries) { - IDirect3DDevice9Impl *This = impl_from_IDirect3DDevice9Ex(iface); - HRESULT hr; + FIXME("iface %p, palette_idx %u, entries %p unimplemented.\n", iface, PaletteNumber, pEntries); - TRACE("iface %p, palette_idx %u, entries %p.\n", iface, PaletteNumber, pEntries); - - wined3d_mutex_lock(); - hr = wined3d_device_set_palette_entries(This->wined3d_device, PaletteNumber, pEntries); - wined3d_mutex_unlock(); - - return hr; + return D3DERR_INVALIDCALL; } static HRESULT WINAPI IDirect3DDevice9Impl_GetPaletteEntries(IDirect3DDevice9Ex *iface, UINT PaletteNumber, PALETTEENTRY *pEntries) { - IDirect3DDevice9Impl *This = impl_from_IDirect3DDevice9Ex(iface); - HRESULT hr; + FIXME("iface %p, palette_idx %u, entries %p unimplemented.\n", iface, PaletteNumber, pEntries); - TRACE("iface %p, palette_idx %u, entries %p.\n", iface, PaletteNumber, pEntries); - - wined3d_mutex_lock(); - hr = wined3d_device_get_palette_entries(This->wined3d_device, PaletteNumber, pEntries); - wined3d_mutex_unlock(); - - return hr; + return D3DERR_INVALIDCALL; } static HRESULT WINAPI IDirect3DDevice9Impl_SetCurrentTexturePalette(IDirect3DDevice9Ex *iface, UINT PaletteNumber) { - IDirect3DDevice9Impl *This = impl_from_IDirect3DDevice9Ex(iface); - HRESULT hr; + FIXME("iface %p, palette_idx %u unimplemented.\n", iface, PaletteNumber); - TRACE("iface %p, palette_idx %u.\n", iface, PaletteNumber); - - wined3d_mutex_lock(); - hr = wined3d_device_set_current_texture_palette(This->wined3d_device, PaletteNumber); - wined3d_mutex_unlock(); - - return hr; + return D3DERR_INVALIDCALL; } static HRESULT WINAPI IDirect3DDevice9Impl_GetCurrentTexturePalette(IDirect3DDevice9Ex *iface, UINT *PaletteNumber) { - IDirect3DDevice9Impl *This = impl_from_IDirect3DDevice9Ex(iface); - HRESULT hr; + FIXME("iface %p, palette_idx %p.\n", iface, PaletteNumber); - TRACE("iface %p, palette_idx %p.\n", iface, PaletteNumber); - - wined3d_mutex_lock(); - hr = wined3d_device_get_current_texture_palette(This->wined3d_device, PaletteNumber); - wined3d_mutex_unlock(); - - return hr; + return D3DERR_INVALIDCALL; } static HRESULT WINAPI IDirect3DDevice9Impl_SetScissorRect(IDirect3DDevice9Ex *iface,

1 0

Andrew Talbot : windowscodecs: Mark some fall-throughs in switch statements .
by Alexandre Julliard Oct. 11, 2011

Oct. 11, 2011

Module: wine Branch: master Commit: 2e27be37c3b8c8bd09e4c1779be925505df2728f URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e27be37c3b8c8bd09e4c1779… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Mon Oct 10 22:47:15 2011 +0100 windowscodecs: Mark some fall-throughs in switch statements. --- dlls/windowscodecs/pngformat.c | 1 + dlls/windowscodecs/tiffformat.c | 1 + 2 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/windowscodecs/pngformat.c b/dlls/windowscodecs/pngformat.c index b3d92fd..c7c3cab 100644 --- a/dlls/windowscodecs/pngformat.c +++ b/dlls/windowscodecs/pngformat.c @@ -364,6 +364,7 @@ static HRESULT WINAPI PngDecoder_Initialize(IWICBitmapDecoder *iface, IStream *p case PNG_COLOR_TYPE_GRAY_ALPHA: /* WIC does not support grayscale alpha formats so use RGBA */ ppng_set_gray_to_rgb(This->png_ptr); + /* fall through */ case PNG_COLOR_TYPE_RGB_ALPHA: This->bpp = bit_depth * 4; switch (bit_depth) diff --git a/dlls/windowscodecs/tiffformat.c b/dlls/windowscodecs/tiffformat.c index 6422b62..79e5c60 100644 --- a/dlls/windowscodecs/tiffformat.c +++ b/dlls/windowscodecs/tiffformat.c @@ -295,6 +295,7 @@ static HRESULT tiff_get_decode_info(TIFF *tiff, tiff_decode_info *decode_info) { case 0: /* WhiteIsZero */ decode_info->invert_grayscale = 1; + /* fall through */ case 1: /* BlackIsZero */ if (samples != 1) {

1 0

Charles Davis : ntdll: Also set CPU_FEATURE_HTT on Mac OS.
by Alexandre Julliard Oct. 11, 2011

Oct. 11, 2011

Module: wine Branch: master Commit: fe6140e0fd6418e13ce515a1c788d7856d2528c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fe6140e0fd6418e13ce515a1c… Author: Charles Davis <cdavis(a)mymail.mines.edu> Date: Mon Oct 10 15:34:55 2011 -0600 ntdll: Also set CPU_FEATURE_HTT on Mac OS. --- dlls/ntdll/nt.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c index 000c62a..6a919aa 100644 --- a/dlls/ntdll/nt.c +++ b/dlls/ntdll/nt.c @@ -1280,6 +1280,7 @@ void fill_cpu_info(void) if (strstr(buffer, "SSE2")) user_shared_data->ProcessorFeatures[PF_XMMI64_INSTRUCTIONS_AVAILABLE] = TRUE; if (strstr(buffer, "SSE3")) user_shared_data->ProcessorFeatures[PF_SSE3_INSTRUCTIONS_AVAILABLE] = TRUE; if (strstr(buffer, "PAE")) user_shared_data->ProcessorFeatures[PF_PAE_ENABLED] = TRUE; + if (strstr(buffer, "HTT")) cached_sci.FeatureSet |= CPU_FEATURE_HTT; } break; /* CPU_TYPE_I386 */ default: break;

1 0

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

Oct. 11, 2011

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 Oct. 11, 2011

Oct. 11, 2011

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 Oct. 11, 2011

Oct. 11, 2011

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

Michael Stefaniuc : urlmon: Remove a redundant NULL check before free ( Smatch).
by Alexandre Julliard Oct. 11, 2011

Oct. 11, 2011

Module: wine Branch: master Commit: 036db280d2efb9c36b8ac4cf0dadabe349385bda URL: http://source.winehq.org/git/wine.git/?a=commit;h=036db280d2efb9c36b8ac4cf0… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Oct 11 00:03:42 2011 +0200 urlmon: Remove a redundant NULL check before free (Smatch). --- dlls/urlmon/http.c | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/urlmon/http.c b/dlls/urlmon/http.c index 5a606ca..a081ad0 100644 --- a/dlls/urlmon/http.c +++ b/dlls/urlmon/http.c @@ -528,10 +528,8 @@ static void HttpProtocol_close_connection(Protocol *prot) This->http_negotiate = NULL; } - if(This->full_header) { - heap_free(This->full_header); - This->full_header = NULL; - } + heap_free(This->full_header); + This->full_header = NULL; } static void HttpProtocol_on_error(Protocol *prot, DWORD error)

1 0

Michael Stefaniuc : msi: Remove a redundant NULL check before free (Smatch) .
by Alexandre Julliard Oct. 11, 2011

Oct. 11, 2011

Module: wine Branch: master Commit: 78ebd8f7cf5fc3bbf00cf0770ef85b81fb4d9bca URL: http://source.winehq.org/git/wine.git/?a=commit;h=78ebd8f7cf5fc3bbf00cf0770… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Oct 11 00:03:35 2011 +0200 msi: Remove a redundant NULL check before free (Smatch). --- dlls/msi/where.c | 7 ++----- 1 files changed, 2 insertions(+), 5 deletions(-) diff --git a/dlls/msi/where.c b/dlls/msi/where.c index 2d9241f..8272301 100644 --- a/dlls/msi/where.c +++ b/dlls/msi/where.c @@ -919,11 +919,8 @@ static UINT WHERE_delete( struct tagMSIVIEW *view ) free_reorder(wv); - if (wv->order_info) - { - msi_free(wv->order_info); - wv->order_info = NULL; - } + msi_free(wv->order_info); + wv->order_info = NULL; msiobj_release( &wv->db->hdr ); msi_free( wv );

1 0

Stefan Dösinger : d3d8: Remove the palette implementation methods.
by Alexandre Julliard Oct. 11, 2011

Oct. 11, 2011

Module: wine Branch: master Commit: 054ec0b42b31d6eb15b150c965ca889a124c2572 URL: http://source.winehq.org/git/wine.git/?a=commit;h=054ec0b42b31d6eb15b150c96… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Sep 27 08:34:51 2011 -0500 d3d8: Remove the palette implementation methods. --- dlls/d3d8/device.c | 45 ++++++++++----------------------------------- 1 files changed, 10 insertions(+), 35 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 8aeca94..1c8829f 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -1838,61 +1838,36 @@ static HRESULT WINAPI IDirect3DDevice8Impl_GetInfo(IDirect3DDevice8 *iface, static HRESULT WINAPI IDirect3DDevice8Impl_SetPaletteEntries(IDirect3DDevice8 *iface, UINT PaletteNumber, const PALETTEENTRY *pEntries) { - IDirect3DDevice8Impl *This = impl_from_IDirect3DDevice8(iface); - HRESULT hr; + FIXME("iface %p, palette_idx %u, entries %p unimplemented\n", iface, PaletteNumber, pEntries); - TRACE("iface %p, palette_idx %u, entries %p.\n", iface, PaletteNumber, pEntries); + /* GPUs stopped supporting palettized textures with the Shader Model 1 generation. Wined3d + * does not have a d3d8/9-style palette API */ - wined3d_mutex_lock(); - hr = wined3d_device_set_palette_entries(This->wined3d_device, PaletteNumber, pEntries); - wined3d_mutex_unlock(); - - return hr; + return D3DERR_INVALIDCALL; } static HRESULT WINAPI IDirect3DDevice8Impl_GetPaletteEntries(IDirect3DDevice8 *iface, UINT PaletteNumber, PALETTEENTRY *pEntries) { - IDirect3DDevice8Impl *This = impl_from_IDirect3DDevice8(iface); - HRESULT hr; - - TRACE("iface %p, palette_idx %u, entries %p.\n", iface, PaletteNumber, pEntries); + FIXME("iface %p, palette_idx %u, entries %p unimplemented.\n", iface, PaletteNumber, pEntries); - wined3d_mutex_lock(); - hr = wined3d_device_get_palette_entries(This->wined3d_device, PaletteNumber, pEntries); - wined3d_mutex_unlock(); - - return hr; + return D3DERR_INVALIDCALL; } static HRESULT WINAPI IDirect3DDevice8Impl_SetCurrentTexturePalette(IDirect3DDevice8 *iface, UINT PaletteNumber) { - IDirect3DDevice8Impl *This = impl_from_IDirect3DDevice8(iface); - HRESULT hr; - - TRACE("iface %p, palette_idx %u.\n", iface, PaletteNumber); + FIXME("iface %p, palette_idx %u unimplemented.\n", iface, PaletteNumber); - wined3d_mutex_lock(); - hr = wined3d_device_set_current_texture_palette(This->wined3d_device, PaletteNumber); - wined3d_mutex_unlock(); - - return hr; + return D3DERR_INVALIDCALL; } static HRESULT WINAPI IDirect3DDevice8Impl_GetCurrentTexturePalette(IDirect3DDevice8 *iface, UINT *PaletteNumber) { - IDirect3DDevice8Impl *This = impl_from_IDirect3DDevice8(iface); - HRESULT hr; - - TRACE("iface %p, palette_idx %p.\n", iface, PaletteNumber); - - wined3d_mutex_lock(); - hr = wined3d_device_get_current_texture_palette(This->wined3d_device, PaletteNumber); - wined3d_mutex_unlock(); + FIXME("iface %p, palette_idx %p unimplemented.\n", iface, PaletteNumber); - return hr; + return D3DERR_INVALIDCALL; } static HRESULT WINAPI IDirect3DDevice8Impl_DrawPrimitive(IDirect3DDevice8 *iface,

1 0

Michael Stefaniuc : msi: Move a TRACE before the continue (Smatch).
by Alexandre Julliard Oct. 11, 2011

Oct. 11, 2011

Module: wine Branch: master Commit: 0c5f83040a72bffebe04caae076104c0552e0e92 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c5f83040a72bffebe04caae0… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Oct 10 23:58:59 2011 +0200 msi: Move a TRACE before the continue (Smatch). --- dlls/msi/upgrade.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msi/upgrade.c b/dlls/msi/upgrade.c index 8e843aa..9480661 100644 --- a/dlls/msi/upgrade.c +++ b/dlls/msi/upgrade.c @@ -185,8 +185,8 @@ static UINT ITERATE_FindRelatedProducts(MSIRECORD *rec, LPVOID param) if (!check_language(check, language, attributes)) { index ++; - continue; TRACE("language doesn't match\n"); + continue; } TRACE("found related product\n");

1 0