October 2011 - Wine-Commits

Huw Davies : gdi32: Require that we have freetype' s FT_Load_Sfnt_Table function and remove the hacky fallback.
by Alexandre Julliard Oct. 10, 2011

Oct. 10, 2011

Module: wine Branch: master Commit: 570e68b82200bdd9981b2cd8fe9e68d35bad3cb9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=570e68b82200bdd9981b2cd8f… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Oct 10 14:15:56 2011 +0100 gdi32: Require that we have freetype's FT_Load_Sfnt_Table function and remove the hacky fallback. --- dlls/gdi32/freetype.c | 80 +++++++------------------------------------------ 1 files changed, 11 insertions(+), 69 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 8a687f4..9357766 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -155,7 +155,6 @@ static DWORD FT_SimpleVersion; static void *ft_handle = NULL; #define MAKE_FUNCPTR(f) static typeof(f) * p##f = NULL -MAKE_FUNCPTR(FT_Vector_Unit); MAKE_FUNCPTR(FT_Done_Face); MAKE_FUNCPTR(FT_Get_Char_Index); MAKE_FUNCPTR(FT_Get_Module); @@ -164,6 +163,7 @@ MAKE_FUNCPTR(FT_Get_Sfnt_Name_Count); MAKE_FUNCPTR(FT_Get_Sfnt_Table); MAKE_FUNCPTR(FT_Init_FreeType); MAKE_FUNCPTR(FT_Load_Glyph); +MAKE_FUNCPTR(FT_Load_Sfnt_Table); MAKE_FUNCPTR(FT_Matrix_Multiply); #ifdef FT_MULFIX_INLINED #define pFT_MulFix FT_MULFIX_INLINED @@ -175,13 +175,13 @@ MAKE_FUNCPTR(FT_New_Memory_Face); MAKE_FUNCPTR(FT_Outline_Get_Bitmap); MAKE_FUNCPTR(FT_Outline_Transform); MAKE_FUNCPTR(FT_Outline_Translate); +MAKE_FUNCPTR(FT_Render_Glyph); MAKE_FUNCPTR(FT_Select_Charmap); MAKE_FUNCPTR(FT_Set_Charmap); MAKE_FUNCPTR(FT_Set_Pixel_Sizes); MAKE_FUNCPTR(FT_Vector_Transform); -MAKE_FUNCPTR(FT_Render_Glyph); +MAKE_FUNCPTR(FT_Vector_Unit); static void (*pFT_Library_Version)(FT_Library,FT_Int*,FT_Int*,FT_Int*); -static FT_Error (*pFT_Load_Sfnt_Table)(FT_Face,FT_ULong,FT_Long,FT_Byte*,FT_ULong*); 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); @@ -1397,57 +1397,6 @@ static void add_face_to_cache(Face *face) RegCloseKey(hkey_font_cache); } -/***************************************************************** - * load_sfnt_table - * - * Wrapper around FT_Load_Sfnt_Table to cope with older versions - * of FreeType that don't export this function. - * - */ -static FT_Error load_sfnt_table(FT_Face ft_face, FT_ULong table, FT_Long offset, FT_Byte *buf, FT_ULong *len) -{ - - FT_Error err; - - /* If the FT_Load_Sfnt_Table function is there we'll use it */ - if(pFT_Load_Sfnt_Table) - { - err = pFT_Load_Sfnt_Table(ft_face, table, offset, buf, len); - } -#ifdef HAVE_FREETYPE_INTERNAL_SFNT_H - else /* Do it the hard way */ - { - TT_Face tt_face = (TT_Face) ft_face; - SFNT_Interface *sfnt; - if (FT_Version.major==2 && FT_Version.minor==0) - { - /* 2.0.x */ - sfnt = *(SFNT_Interface**)((char*)tt_face + 528); - } - else - { - /* A field was added in the middle of the structure in 2.1.x */ - sfnt = *(SFNT_Interface**)((char*)tt_face + 532); - } - err = sfnt->load_any(tt_face, table, offset, buf, len); - } -#else - else - { - static int msg; - if(!msg) - { - MESSAGE("This version of Wine was compiled with freetype headers later than 2.2.0\n" - "but is being run with a freetype library without the FT_Load_Sfnt_Table function.\n" - "Please upgrade your freetype library.\n"); - msg++; - } - err = FT_Err_Unimplemented_Feature; - } -#endif - return err; -} - static inline int TestStyles(DWORD flags, DWORD styles) { return (flags & styles) == styles; @@ -1582,7 +1531,7 @@ static INT AddFontToList(const char *file, void *font_data_ptr, DWORD font_data_ { FT_ULong len = 0; - if(!load_sfnt_table(ft_face, FT_MAKE_TAG('E','B','S','C'), 0, NULL, &len)) + if(!pFT_Load_Sfnt_Table(ft_face, FT_MAKE_TAG('E','B','S','C'), 0, NULL, &len)) { TRACE("Skipping Wine bitmap-only TrueType font %s\n", debugstr_a(file)); pFT_Done_Face(ft_face); @@ -1782,7 +1731,7 @@ static INT AddFontToList(const char *file, void *font_data_ptr, DWORD font_data_ /* check for the presence of the 'CFF ' table to check if the font is Type1 */ tmp_size = 0; - if (pFT_Load_Sfnt_Table && !pFT_Load_Sfnt_Table(ft_face, FT_MAKE_TAG('C','F','F',' '), 0, NULL, &tmp_size)) + if (!pFT_Load_Sfnt_Table(ft_face, FT_MAKE_TAG('C','F','F',' '), 0, NULL, &tmp_size)) { TRACE("Font %s/%p is OTF Type1\n", wine_dbgstr_a(file), font_data_ptr); face->ntmFlags |= NTM_PS_OPENTYPE; @@ -2950,7 +2899,6 @@ static BOOL init_freetype(void) #define LOAD_FUNCPTR(f) if((p##f = wine_dlsym(ft_handle, #f, NULL, 0)) == NULL){WARN("Can't find symbol %s\n", #f); goto sym_not_found;} - LOAD_FUNCPTR(FT_Vector_Unit) LOAD_FUNCPTR(FT_Done_Face) LOAD_FUNCPTR(FT_Get_Char_Index) LOAD_FUNCPTR(FT_Get_Module) @@ -2959,6 +2907,7 @@ static BOOL init_freetype(void) LOAD_FUNCPTR(FT_Get_Sfnt_Table) LOAD_FUNCPTR(FT_Init_FreeType) LOAD_FUNCPTR(FT_Load_Glyph) + LOAD_FUNCPTR(FT_Load_Sfnt_Table) LOAD_FUNCPTR(FT_Matrix_Multiply) #ifndef FT_MULFIX_INLINED LOAD_FUNCPTR(FT_MulFix) @@ -2968,16 +2917,15 @@ static BOOL init_freetype(void) LOAD_FUNCPTR(FT_Outline_Get_Bitmap) LOAD_FUNCPTR(FT_Outline_Transform) LOAD_FUNCPTR(FT_Outline_Translate) + LOAD_FUNCPTR(FT_Render_Glyph) LOAD_FUNCPTR(FT_Select_Charmap) LOAD_FUNCPTR(FT_Set_Charmap) LOAD_FUNCPTR(FT_Set_Pixel_Sizes) LOAD_FUNCPTR(FT_Vector_Transform) - LOAD_FUNCPTR(FT_Render_Glyph) - + 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_Load_Sfnt_Table = wine_dlsym(ft_handle, "FT_Load_Sfnt_Table", 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); @@ -2987,12 +2935,6 @@ static BOOL init_freetype(void) #ifdef HAVE_FREETYPE_FTWINFNT_H pFT_Get_WinFNT_Header = wine_dlsym(ft_handle, "FT_Get_WinFNT_Header", NULL, 0); #endif - if(!wine_dlsym(ft_handle, "FT_Get_Postscript_Name", NULL, 0) && - !wine_dlsym(ft_handle, "FT_Sqrt64", NULL, 0)) { - /* try to avoid 2.0.4: >= 2.0.5 has FT_Get_Postscript_Name and - <= 2.0.3 has FT_Sqrt64 */ - goto sym_not_found; - } if(pFT_Init_FreeType(&library) != 0) { ERR("Can't init FreeType library\n"); @@ -3021,7 +2963,7 @@ sym_not_found: WINE_MESSAGE( "Wine cannot find certain functions that it needs inside the FreeType\n" "font library. To enable Wine to use TrueType fonts please upgrade\n" - "FreeType to at least version 2.0.5.\n" + "FreeType to at least version 2.1.4.\n" "http://www.freetype.org\n"); wine_dlclose(ft_handle, NULL, 0); ft_handle = NULL; @@ -6558,10 +6500,10 @@ DWORD WineEngGetFontData(GdiFont *font, DWORD table, DWORD offset, LPVOID buf, if(buf && len) { FT_ULong needed = 0; - err = load_sfnt_table(ft_face, table, offset, NULL, &needed); + err = pFT_Load_Sfnt_Table(ft_face, table, offset, NULL, &needed); if( !err && needed < len) len = needed; } - err = load_sfnt_table(ft_face, table, offset, buf, &len); + err = pFT_Load_Sfnt_Table(ft_face, table, offset, buf, &len); if(err) { TRACE("Can't find table %c%c%c%c\n",

1 0

Michael Stefaniuc : shell32: Avoid an unsafe iface to object cast in AddToEnumList().
by Alexandre Julliard Oct. 10, 2011

Oct. 10, 2011

Module: wine Branch: master Commit: 28d8819b63220dd7786c68a04bc626e4607428d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=28d8819b63220dd7786c68a04… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Oct 10 01:04:37 2011 +0200 shell32: Avoid an unsafe iface to object cast in AddToEnumList(). --- dlls/shell32/cpanelfolder.c | 27 ++++++++++++++------------- dlls/shell32/enumidlist.c | 13 +++---------- dlls/shell32/recyclebin.c | 2 +- dlls/shell32/shell32_main.h | 4 ++-- dlls/shell32/shfldr_desktop.c | 4 ++-- dlls/shell32/shfldr_fs.c | 2 +- dlls/shell32/shfldr_mycomp.c | 4 ++-- 7 files changed, 25 insertions(+), 31 deletions(-) diff --git a/dlls/shell32/cpanelfolder.c b/dlls/shell32/cpanelfolder.c index 15ad067..b006632 100644 --- a/dlls/shell32/cpanelfolder.c +++ b/dlls/shell32/cpanelfolder.c @@ -286,7 +286,7 @@ static PIDLCPanelStruct* _ILGetCPanelPointer(LPCITEMIDLIST pidl) /************************************************************************** * ISF_ControlPanel_fnEnumObjects */ -static BOOL SHELL_RegisterCPanelApp(IEnumIDList* list, LPCSTR path) +static BOOL SHELL_RegisterCPanelApp(IEnumIDListImpl *list, LPCSTR path) { LPITEMIDLIST pidl; CPlApplet* applet; @@ -329,7 +329,7 @@ static BOOL SHELL_RegisterCPanelApp(IEnumIDList* list, LPCSTR path) return TRUE; } -static int SHELL_RegisterRegistryCPanelApps(IEnumIDList* list, HKEY hkey_root, LPCSTR szRepPath) +static int SHELL_RegisterRegistryCPanelApps(IEnumIDListImpl *list, HKEY hkey_root, LPCSTR szRepPath) { char name[MAX_PATH]; char value[MAX_PATH]; @@ -358,7 +358,7 @@ static int SHELL_RegisterRegistryCPanelApps(IEnumIDList* list, HKEY hkey_root, L return cnt; } -static int SHELL_RegisterCPanelFolders(IEnumIDList* list, HKEY hkey_root, LPCSTR szRepPath) +static int SHELL_RegisterCPanelFolders(IEnumIDListImpl *list, HKEY hkey_root, LPCSTR szRepPath) { char name[MAX_PATH]; HKEY hkey; @@ -391,19 +391,18 @@ static int SHELL_RegisterCPanelFolders(IEnumIDList* list, HKEY hkey_root, LPCSTR /************************************************************************** * CreateCPanelEnumList() */ -static BOOL CreateCPanelEnumList( - IEnumIDList * iface, - DWORD dwFlags) +static BOOL CreateCPanelEnumList(IEnumIDListImpl *list, DWORD dwFlags) { CHAR szPath[MAX_PATH]; WIN32_FIND_DATAA wfd; HANDLE hFile; - TRACE("(%p)->(flags=0x%08x)\n", iface, dwFlags); + TRACE("(%p)->(flags=0x%08x)\n", list, dwFlags); /* enumerate control panel folders */ if (dwFlags & SHCONTF_FOLDERS) - SHELL_RegisterCPanelFolders(iface, HKEY_LOCAL_MACHINE, "SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Explorer\\ControlPanel\\NameSpace"); + SHELL_RegisterCPanelFolders(list, HKEY_LOCAL_MACHINE, + "SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Explorer\\ControlPanel\\NameSpace"); /* enumerate the control panel applets */ if (dwFlags & SHCONTF_NONFOLDERS) @@ -414,7 +413,7 @@ static BOOL CreateCPanelEnumList( p = PathAddBackslashA(szPath); strcpy(p, "*.cpl"); - TRACE("-- (%p)-> enumerate SHCONTF_NONFOLDERS of %s\n",iface,debugstr_a(szPath)); + TRACE("-- (%p)-> enumerate SHCONTF_NONFOLDERS of %s\n", list, debugstr_a(szPath)); hFile = FindFirstFileA(szPath, &wfd); if (hFile != INVALID_HANDLE_VALUE) @@ -426,14 +425,16 @@ static BOOL CreateCPanelEnumList( if (!(wfd.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)) { strcpy(p, wfd.cFileName); - SHELL_RegisterCPanelApp(iface, szPath); + SHELL_RegisterCPanelApp(list, szPath); } } while(FindNextFileA(hFile, &wfd)); FindClose(hFile); } - SHELL_RegisterRegistryCPanelApps(iface, HKEY_LOCAL_MACHINE, "SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Control Panel\\Cpls"); - SHELL_RegisterRegistryCPanelApps(iface, HKEY_CURRENT_USER, "SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Control Panel\\Cpls"); + SHELL_RegisterRegistryCPanelApps(list, HKEY_LOCAL_MACHINE, + "SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Control Panel\\Cpls"); + SHELL_RegisterRegistryCPanelApps(list, HKEY_CURRENT_USER, + "SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Control Panel\\Cpls"); } return TRUE; } @@ -451,8 +452,8 @@ static HRESULT WINAPI ISF_ControlPanel_fnEnumObjects(IShellFolder2 *iface, HWND if (!(list = IEnumIDList_Constructor())) return E_OUTOFMEMORY; + CreateCPanelEnumList(list, dwFlags); *ppEnumIDList = &list->IEnumIDList_iface; - CreateCPanelEnumList(*ppEnumIDList, dwFlags); TRACE("--(%p)->(new ID List: %p)\n", This, *ppEnumIDList); diff --git a/dlls/shell32/enumidlist.c b/dlls/shell32/enumidlist.c index 9e43ed4..8ee789b 100644 --- a/dlls/shell32/enumidlist.c +++ b/dlls/shell32/enumidlist.c @@ -39,17 +39,13 @@ WINE_DEFAULT_DEBUG_CHANNEL(shell); /************************************************************************** * AddToEnumList() */ -BOOL AddToEnumList( - IEnumIDList * iface, - LPITEMIDLIST pidl) +BOOL AddToEnumList(IEnumIDListImpl *This, LPITEMIDLIST pidl) { - IEnumIDListImpl *This = (IEnumIDListImpl *)iface; - struct enumlist *pNew; TRACE("(%p)->(pidl=%p)\n",This,pidl); - if (!iface || !pidl) + if (!This || !pidl) return FALSE; pNew = SHAlloc(sizeof(*pNew)); @@ -83,10 +79,7 @@ BOOL AddToEnumList( /************************************************************************** * CreateFolderEnumList() */ -BOOL CreateFolderEnumList( - IEnumIDList *list, - LPCWSTR lpszPath, - DWORD dwFlags) +BOOL CreateFolderEnumList(IEnumIDListImpl *list, LPCWSTR lpszPath, DWORD dwFlags) { LPITEMIDLIST pidl=NULL; WIN32_FIND_DATAW stffile; diff --git a/dlls/shell32/recyclebin.c b/dlls/shell32/recyclebin.c index 715be87..6b7d4aa 100644 --- a/dlls/shell32/recyclebin.c +++ b/dlls/shell32/recyclebin.c @@ -426,7 +426,7 @@ static HRESULT WINAPI RecycleBin_EnumObjects(IShellFolder2 *iface, HWND hwnd, SH if (FAILED(ret = TRASH_EnumItems(&pidls, &pidls_count))) goto failed; for (i=0; i<pidls_count; i++) - if (!AddToEnumList(&list->IEnumIDList_iface, pidls[i])) + if (!AddToEnumList(list, pidls[i])) goto failed; } diff --git a/dlls/shell32/shell32_main.h b/dlls/shell32/shell32_main.h index 18ddf71..dd5f1ab 100644 --- a/dlls/shell32/shell32_main.h +++ b/dlls/shell32/shell32_main.h @@ -223,11 +223,11 @@ typedef struct /* Creates an IEnumIDList; add LPITEMIDLISTs to it with AddToEnumList. */ IEnumIDListImpl *IEnumIDList_Constructor(void) DECLSPEC_HIDDEN; -BOOL AddToEnumList(IEnumIDList *list, LPITEMIDLIST pidl) DECLSPEC_HIDDEN; +BOOL AddToEnumList(IEnumIDListImpl *list, LPITEMIDLIST pidl) DECLSPEC_HIDDEN; /* Enumerates the folders and/or files (depending on dwFlags) in lpszPath and * adds them to the already-created list. */ -BOOL CreateFolderEnumList(IEnumIDList *list, LPCWSTR lpszPath, DWORD dwFlags) DECLSPEC_HIDDEN; +BOOL CreateFolderEnumList(IEnumIDListImpl *list, LPCWSTR lpszPath, DWORD dwFlags) DECLSPEC_HIDDEN; #endif diff --git a/dlls/shell32/shfldr_desktop.c b/dlls/shell32/shfldr_desktop.c index 2ea5244..5b90260 100644 --- a/dlls/shell32/shfldr_desktop.c +++ b/dlls/shell32/shfldr_desktop.c @@ -286,7 +286,7 @@ static const WCHAR Desktop_NameSpaceW[] = { 'S','O','F','T','W','A','R','E', 'o','r','e','r','\\','D','e','s','k','t','o','p','\\','N','a','m','e','s','p', 'a','c','e','\0' }; -static BOOL CreateDesktopEnumList(IEnumIDList *list, DWORD dwFlags) +static BOOL CreateDesktopEnumList(IEnumIDListImpl *list, DWORD dwFlags) { BOOL ret = TRUE; WCHAR szPath[MAX_PATH]; @@ -352,8 +352,8 @@ static HRESULT WINAPI ISF_Desktop_fnEnumObjects (IShellFolder2 * iface, if (!(list = IEnumIDList_Constructor())) return E_OUTOFMEMORY; + CreateDesktopEnumList(list, dwFlags); *ppEnumIDList = &list->IEnumIDList_iface; - CreateDesktopEnumList(*ppEnumIDList, dwFlags); TRACE ("-- (%p)->(new ID List: %p)\n", This, *ppEnumIDList); diff --git a/dlls/shell32/shfldr_fs.c b/dlls/shell32/shfldr_fs.c index 3556a62..b591533 100644 --- a/dlls/shell32/shfldr_fs.c +++ b/dlls/shell32/shfldr_fs.c @@ -455,8 +455,8 @@ IShellFolder_fnEnumObjects (IShellFolder2 * iface, HWND hwndOwner, if (!(list = IEnumIDList_Constructor())) return E_OUTOFMEMORY; + CreateFolderEnumList(list, This->sPathTarget, dwFlags); *ppEnumIDList = &list->IEnumIDList_iface; - CreateFolderEnumList(*ppEnumIDList, This->sPathTarget, dwFlags); TRACE ("-- (%p)->(new ID List: %p)\n", This, *ppEnumIDList); diff --git a/dlls/shell32/shfldr_mycomp.c b/dlls/shell32/shfldr_mycomp.c index 9afb4d8..d32f975 100644 --- a/dlls/shell32/shfldr_mycomp.c +++ b/dlls/shell32/shfldr_mycomp.c @@ -292,7 +292,7 @@ static const WCHAR MyComputer_NameSpaceW[] = { 'S','O','F','T','W','A','R','E', 'o','r','e','r','\\','M','y','C','o','m','p','u','t','e','r','\\','N','a','m', 'e','s','p','a','c','e','\0' }; -static BOOL CreateMyCompEnumList(IEnumIDList *list, DWORD dwFlags) +static BOOL CreateMyCompEnumList(IEnumIDListImpl *list, DWORD dwFlags) { BOOL ret = TRUE; @@ -362,8 +362,8 @@ static HRESULT WINAPI ISF_MyComputer_fnEnumObjects (IShellFolder2 *iface, if (!(list = IEnumIDList_Constructor())) return E_OUTOFMEMORY; + CreateMyCompEnumList(list, dwFlags); *ppEnumIDList = &list->IEnumIDList_iface; - CreateMyCompEnumList(*ppEnumIDList, dwFlags); TRACE ("-- (%p)->(new ID List: %p)\n", This, *ppEnumIDList);

1 0

Dmitry Timoshkov : user32: Fix the logic deciding when to write to the destination structure.
by Alexandre Julliard Oct. 10, 2011

Oct. 10, 2011

Module: wine Branch: master Commit: 197f867feff0bddaca0c2d2470fbaa04acd6e3b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=197f867feff0bddaca0c2d247… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Oct 10 12:05:14 2011 +0900 user32: Fix the logic deciding when to write to the destination structure. --- dlls/user32/sysparams.c | 22 ++++++++++++++-------- 1 files changed, 14 insertions(+), 8 deletions(-) diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index 15838ed..afa15a2 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -463,10 +463,13 @@ static void SYSPARAMS_NonClientMetrics32WTo32A( const NONCLIENTMETRICSW* lpnm32W SYSPARAMS_LogFont32WTo32A( &lpnm32W->lfMenuFont, &lpnm32A->lfMenuFont ); SYSPARAMS_LogFont32WTo32A( &lpnm32W->lfStatusFont, &lpnm32A->lfStatusFont ); SYSPARAMS_LogFont32WTo32A( &lpnm32W->lfMessageFont, &lpnm32A->lfMessageFont ); - if (lpnm32A->cbSize == sizeof(NONCLIENTMETRICSA) && lpnm32W->cbSize == sizeof(NONCLIENTMETRICSW)) - lpnm32A->iPaddedBorderWidth = lpnm32W->iPaddedBorderWidth; - else - lpnm32A->iPaddedBorderWidth = 0; + if (lpnm32A->cbSize > FIELD_OFFSET(NONCLIENTMETRICSA, iPaddedBorderWidth)) + { + if (lpnm32W->cbSize > FIELD_OFFSET(NONCLIENTMETRICSW, iPaddedBorderWidth)) + lpnm32A->iPaddedBorderWidth = lpnm32W->iPaddedBorderWidth; + else + lpnm32A->iPaddedBorderWidth = 0; + } } static void SYSPARAMS_NonClientMetrics32ATo32W( const NONCLIENTMETRICSA* lpnm32A, LPNONCLIENTMETRICSW lpnm32W ) @@ -485,10 +488,13 @@ static void SYSPARAMS_NonClientMetrics32ATo32W( const NONCLIENTMETRICSA* lpnm32A SYSPARAMS_LogFont32ATo32W( &lpnm32A->lfMenuFont, &lpnm32W->lfMenuFont ); SYSPARAMS_LogFont32ATo32W( &lpnm32A->lfStatusFont, &lpnm32W->lfStatusFont ); SYSPARAMS_LogFont32ATo32W( &lpnm32A->lfMessageFont, &lpnm32W->lfMessageFont ); - if (lpnm32A->cbSize == sizeof(NONCLIENTMETRICSA) && lpnm32W->cbSize == sizeof(NONCLIENTMETRICSW)) - lpnm32W->iPaddedBorderWidth = lpnm32A->iPaddedBorderWidth; - else - lpnm32W->iPaddedBorderWidth = 0; + if (lpnm32W->cbSize > FIELD_OFFSET(NONCLIENTMETRICSW, iPaddedBorderWidth)) + { + if (lpnm32A->cbSize > FIELD_OFFSET(NONCLIENTMETRICSA, iPaddedBorderWidth)) + lpnm32W->iPaddedBorderWidth = lpnm32A->iPaddedBorderWidth; + else + lpnm32W->iPaddedBorderWidth = 0; + } }

1 0

Huw Davies : wineps: The truetype metrics should now be obtained from gdi32 , so remove obsolete code.
by Alexandre Julliard Oct. 10, 2011

Oct. 10, 2011

Module: wine Branch: master Commit: f24b0a80f391a80de506407513aea8c9c244eb54 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f24b0a80f391a80de50640751… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Oct 10 15:13:34 2011 +0100 wineps: The truetype metrics should now be obtained from gdi32, so remove obsolete code. --- dlls/wineps.drv/Makefile.in | 3 +- dlls/wineps.drv/afm.c | 5 - dlls/wineps.drv/psdrv.h | 1 - dlls/wineps.drv/truetype.c | 669 ------------------------------------------- 4 files changed, 1 insertions(+), 677 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f24b0a80f391a80de5064…

1 0

Michael Stefaniuc : shell32: Simplify RecycleBin_EnumObjects() a little.
by Alexandre Julliard Oct. 10, 2011

Oct. 10, 2011

Module: wine Branch: master Commit: 27b284d4c9501047c77d79beb0c2740397c5f5c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=27b284d4c9501047c77d79beb… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Oct 10 01:00:46 2011 +0200 shell32: Simplify RecycleBin_EnumObjects() a little. --- dlls/shell32/recyclebin.c | 24 +++++++++--------------- 1 files changed, 9 insertions(+), 15 deletions(-) diff --git a/dlls/shell32/recyclebin.c b/dlls/shell32/recyclebin.c index 44e99fc..9e75c30 100644 --- a/dlls/shell32/recyclebin.c +++ b/dlls/shell32/recyclebin.c @@ -410,33 +410,27 @@ static HRESULT WINAPI RecycleBin_EnumObjects(IShellFolder2 *iface, HWND hwnd, SH RecycleBin *This = impl_from_IShellFolder2(iface); IEnumIDList *list; LPITEMIDLIST *pidls; - HRESULT ret; + HRESULT ret = E_OUTOFMEMORY; int pidls_count; int i=0; TRACE("(%p, %p, %x, %p)\n", This, hwnd, grfFlags, ppenumIDList); + *ppenumIDList = NULL; + list = IEnumIDList_Constructor(); + if (!list) + return E_OUTOFMEMORY; + if (grfFlags & SHCONTF_NONFOLDERS) { - *ppenumIDList = NULL; if (FAILED(ret = TRASH_EnumItems(&pidls, &pidls_count))) - return ret; - - list = IEnumIDList_Constructor(); - if (list == NULL) goto failed; for (i=0; i<pidls_count; i++) if (!AddToEnumList(list, pidls[i])) goto failed; - *ppenumIDList = list; } - else - { - *ppenumIDList = IEnumIDList_Constructor(); - if (*ppenumIDList == NULL) - return E_OUTOFMEMORY; - } - + + *ppenumIDList = list; return S_OK; failed: @@ -445,7 +439,7 @@ failed: for (; i<pidls_count; i++) ILFree(pidls[i]); SHFree(pidls); - return E_OUTOFMEMORY; + return ret; } static HRESULT WINAPI RecycleBin_BindToObject(IShellFolder2 *This, LPCITEMIDLIST pidl, LPBC pbc, REFIID riid, void **ppv)

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard Oct. 10, 2011

Oct. 10, 2011

Module: wine Branch: master Commit: 37bdf8c8e7d2f3038f675f9c6ff9c0a710e960e9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=37bdf8c8e7d2f3038f675f9c6… Author: Aurimas Fišeras <aurimas(a)gmail.com> Date: Thu Sep 8 19:21:55 2011 +0300 po: Update Lithuanian translation. --- po/lt.po | 37 ++++++++++++++++--------------------- 1 files changed, 16 insertions(+), 21 deletions(-) diff --git a/po/lt.po b/po/lt.po index a894935..86d843e 100644 --- a/po/lt.po +++ b/po/lt.po @@ -6,7 +6,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-14 18:03+0300\n" +"PO-Revision-Date: 2011-10-09 11:54+0300\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: komp_lt(a)konf.lt\n" "Language: Lithuanian\n" @@ -7975,17 +7975,16 @@ msgstr "" "PATH %PATH%;c:\\laikinas\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 ekrane parodo pranešimą „Norėdami tęsti spauskite įvedimo klavišą“\n" -"ir laukia kol naudotojas paspaus įvedimo klavišą. Ši komanda naudingiausia\n" -"komandų failuose, kad leistų naudotojui perskaityti ankstesnės komandos\n" -"rezultatą kol jis nepasislinko už ekrano ribų.\n" +"PAUSE ekrane parodo pranešimą, kuriuo prašo naudotojo paspausti klavišą.\n" +"\n" +"Ši komanda naudingiausia komandų failuose, kad leistų naudotojui perskaityti " +"ankstesnės komandos rezultatą kol jis nepasislinko už ekrano ribų.\n" #: cmd.rc:149 msgid "" @@ -8247,7 +8246,6 @@ msgstr "" "ar apvalkalą iš kur CMD buvo iškviestas.\n" #: cmd.rc:289 -#, fuzzy msgid "" "CMD built-in commands are:\n" "ASSOC\t\tShow or modify file extension associations\n" @@ -8291,21 +8289,21 @@ msgstr "" "ASSOC\t\tRodyti ar modifikuoti failų prievardžių sąsajas\n" "ATTRIB\t\tRodyti ar keisti DOS failo požymius\n" "CALL\t\tKviesti komandų failą iš kito komandų failo\n" -"CD (CHDIR)\tPakeisti dabartinį numatytą katalogą\n" +"CD (CHDIR)\tPakeisti dabartinį numatytąjį katalogą\n" "CHOICE\t\tLaukti klavišo paspaudimo iš pasirinkimų sąrašo\n" "CLS\t\tIšvalyti pulto ekraną\n" "COPY\t\tKopijuoti failą\n" "CTTY\t\tPakeisti įvedimo/išvedimo įrenginį\n" "DATE\t\tRodyti ar keisti sistemos datą\n" -"DEL (ERASE)\tŠalinti failą ar failų aibę\n" +"DEL (ERASE)\tŠalinti failą ar failų rinkinį\n" "DIR\t\tPateikti katalogo turinį\n" "ECHO\t\tKopijuoti tekstą tiesiai į pulto išvedimą\n" -"ENDLOCAL\tBaigia aplinkos pakeitimų lokalizavimą komandų faile\n" +"ENDLOCAL\tBaigti aplinkos pakeitimų lokalizavimą komandų faile\n" "FTYPE\t\tRodyti ar modifikuoti atvėrimo komandas susietas su failų tipais\n" "HELP\t\tParodyti trumpą pagalbą apie temą\n" "MD (MKDIR)\tSukurti pakatalogį\n" "MORE\t\tRodyti išvedimą puslapiais\n" -"MOVE\t\tPerkelti failą, failų aibę ar katalogų medį\n" +"MOVE\t\tPerkelti failą, failų rinkinį ar katalogų medį\n" "PATH\t\tNustatyti ar parodyti paieškos kelią\n" "POPD\t\tAtstato katalogą į paskutinį išsaugotą su PUSHD\n" "PROMPT\t\tKeičia komandos raginimą\n" @@ -8313,14 +8311,14 @@ msgstr "" "REN (RENAME)\tPervadinti failą\n" "RD (RMDIR)\tŠalinti pakatalogį\n" "SET\t\tNustatyti ar parodyti aplinkos kintamuosius\n" -"SETLOCAL\tPradeda aplinkos pakeitimų lokalizavimą komandų faile\n" +"SETLOCAL\tPradėti aplinkos pakeitimų lokalizavimą komandų faile\n" "TIME\t\tNustatyti ar parodyti dabartinį sistemos laiką\n" "TITLE\t\tNustatyti CMD seanso lango antraštę\n" "TYPE\t\tIšvesti tekstinio failo turinį\n" "VER\t\tParodyti dabartinę CMD versiją\n" -"VOL\t\tParodyti tomo vardą\n" -"XCOPY\t\tKopijuoja šaltinio failus ar katalogų medį į paskirtį\n" -"EXIT\t\tUžveria CMD\n" +"VOL\t\tParodyti diskų įtaiso tomo vardą\n" +"XCOPY\t\tKopijuoti šaltinio failus ar katalogų medžius į paskirtį\n" +"EXIT\t\tUžverti CMD\n" "\n" "Įveskite HELP <komanda> platesnei informacijai apie išvardintas komandas " "gauti.\n" @@ -8447,9 +8445,8 @@ msgid "PATH not found\n" msgstr "KELIAS nerastas\n" #: cmd.rc:321 -#, fuzzy msgid "Press any key to continue... " -msgstr "Norėdami tęsti spauskite įvedimo klavišą: " +msgstr "Norėdami tęsti spauskite bet kurį klavišą... " #: cmd.rc:322 msgid "Wine Command Prompt" @@ -10416,14 +10413,12 @@ msgid "(None)" msgstr "(jokia)" #: winecfg.rc:89 -#, fuzzy msgid "Audio test failed!" -msgstr "Nepavyko paleisti standžiojo disko iš naujo\n" +msgstr "Garso testas nepavyko!" #: winecfg.rc:91 -#, fuzzy msgid "(System default)" -msgstr "Sistemos kelias" +msgstr "(Sistemos numatytasis)" #: winecfg.rc:51 msgid ""

1 0

Henri Verbeet : wined3d: Return WINED3DERR_NOTFOUND if the render target is NULL in wined3d_device_get_render_target ().
by Alexandre Julliard Oct. 10, 2011

Oct. 10, 2011

Module: wine Branch: master Commit: 739a9d980503dfcbfa8856d7458539283c776a4d URL: http://source.winehq.org/git/wine.git/?a=commit;h=739a9d980503dfcbfa8856d74… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Oct 9 19:01:18 2011 +0200 wined3d: Return WINED3DERR_NOTFOUND if the render target is NULL in wined3d_device_get_render_target(). This is similar to how wined3d_device_get_depth_stencil() works. --- dlls/d3d9/device.c | 19 +++++++------------ dlls/wined3d/device.c | 8 +++++--- 2 files changed, 12 insertions(+), 15 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 2c67391..33c443a 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -1142,24 +1142,19 @@ static HRESULT WINAPI IDirect3DDevice9Impl_GetRenderTarget(IDirect3DDevice9Ex *i } wined3d_mutex_lock(); - hr = wined3d_device_get_render_target(This->wined3d_device, RenderTargetIndex, &wined3d_surface); - - if (FAILED(hr)) - { - FIXME("Call to IWineD3DDevice_GetRenderTarget failed, hr %#x\n", hr); - } - else if (!wined3d_surface) - { - *ppRenderTarget = NULL; - } - else + if (SUCCEEDED(hr)) { *ppRenderTarget = wined3d_surface_get_parent(wined3d_surface); IDirect3DSurface9_AddRef(*ppRenderTarget); wined3d_surface_decref(wined3d_surface); } - + else + { + if (hr != WINED3DERR_NOTFOUND) + WARN("Failed to get render target %u, hr %#x.\n", RenderTargetIndex, hr); + *ppRenderTarget = NULL; + } wined3d_mutex_unlock(); return hr; diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 8e4d827..f291a7a 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5119,11 +5119,13 @@ HRESULT CDECL wined3d_device_get_render_target(struct wined3d_device *device, } *render_target = device->fb.render_targets[render_target_idx]; - if (*render_target) - wined3d_surface_incref(*render_target); - TRACE("Returning render target %p.\n", *render_target); + if (!*render_target) + return WINED3DERR_NOTFOUND; + + wined3d_surface_incref(*render_target); + return WINED3D_OK; }

1 0

Bernhard Loos : server: If a debugger is attached to a process, child processes shouldn't get debugged.
by Alexandre Julliard Oct. 10, 2011

Oct. 10, 2011

Module: wine Branch: master Commit: e7ec00d22cfcaedbccad499f503c50efc8125117 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e7ec00d22cfcaedbccad499f5… Author: Bernhard Loos <bernhardloos(a)googlemail.com> Date: Sun Oct 9 23:26:03 2011 +0200 server: If a debugger is attached to a process, child processes shouldn't get debugged. --- server/debugger.c | 1 + server/process.c | 6 +++--- server/process.h | 4 ++-- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/server/debugger.c b/server/debugger.c index 35cb3e3..5c0e2c8 100644 --- a/server/debugger.c +++ b/server/debugger.c @@ -485,6 +485,7 @@ int debugger_detach( struct process *process, struct thread *debugger ) /* remove relationships between process and its debugger */ process->debugger = NULL; + process->debug_children = 0; if (!set_process_debug_flag( process, 0 )) clear_error(); /* ignore error */ /* from this function */ diff --git a/server/process.c b/server/process.c index c88c89b..de3b594 100644 --- a/server/process.c +++ b/server/process.c @@ -322,7 +322,7 @@ struct thread *create_process( int fd, struct thread *parent_thread, int inherit process->priority = PROCESS_PRIOCLASS_NORMAL; process->suspend = 0; process->is_system = 0; - process->create_flags = 0; + process->debug_children = 0; process->console = NULL; process->startup_state = STARTUP_IN_PROGRESS; process->startup_info = NULL; @@ -937,7 +937,7 @@ DECL_HANDLER(new_process) if (!(thread = create_process( socket_fd, current, req->inherit_all ))) goto done; process = thread->process; - process->create_flags = req->create_flags; + process->debug_children = !(req->create_flags & DEBUG_ONLY_THIS_PROCESS); process->startup_info = (struct startup_info *)grab_object( info ); /* connect to the window station */ @@ -972,7 +972,7 @@ DECL_HANDLER(new_process) /* attach to the debugger if requested */ if (req->create_flags & (DEBUG_PROCESS | DEBUG_ONLY_THIS_PROCESS)) set_process_debugger( process, current ); - else if (parent->debugger && !(parent->create_flags & DEBUG_ONLY_THIS_PROCESS)) + else if (parent->debugger && parent->debug_children) set_process_debugger( process, parent->debugger ); if (!(req->create_flags & CREATE_NEW_PROCESS_GROUP)) diff --git a/server/process.h b/server/process.h index da51a0e..93ec6c7 100644 --- a/server/process.h +++ b/server/process.h @@ -66,8 +66,8 @@ struct process affinity_t affinity; /* process affinity mask */ int priority; /* priority class */ int suspend; /* global process suspend count */ - int is_system; /* is it a system process? */ - unsigned int create_flags; /* process creation flags */ + unsigned int is_system:1; /* is it a system process? */ + unsigned int debug_children:1;/* also debug all child processes */ struct list locks; /* list of file locks owned by the process */ struct list classes; /* window classes owned by the process */ struct console_input*console; /* console input */

1 0

Francois Gouget : ntdll: ETIME is not defined on FreeBSD.
by Alexandre Julliard Oct. 10, 2011

Oct. 10, 2011

Module: wine Branch: master Commit: 5feb7b9b33513289b0f0e64e345f2385085b15d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5feb7b9b33513289b0f0e64e3… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Oct 9 15:29:28 2011 +0200 ntdll: ETIME is not defined on FreeBSD. --- dlls/ntdll/file.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index 85fc858..744e09f 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -347,7 +347,9 @@ NTSTATUS FILE_GetNtStatus(void) case ECONNRESET:return STATUS_PIPE_DISCONNECTED; case EFAULT: return STATUS_ACCESS_VIOLATION; case ESPIPE: return STATUS_ILLEGAL_FUNCTION; +#ifdef ETIME /* Missing on FreeBSD */ case ETIME: return STATUS_IO_TIMEOUT; +#endif case ENOEXEC: /* ?? */ case EEXIST: /* ?? */ default:

1 0

Aurimas Fišeras : winecfg: Update Lithuanian translation.
by Alexandre Julliard Oct. 10, 2011

Oct. 10, 2011

Module: wine Branch: master Commit: 7f1b339a883ad9f25eb79e4532143cf18d94c978 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f1b339a883ad9f25eb79e453… Author: Aurimas Fišeras <aurimas(a)gmail.com> Date: Sun Oct 9 12:03:22 2011 +0300 winecfg: Update Lithuanian translation. --- programs/winecfg/Lt.rc | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/programs/winecfg/Lt.rc b/programs/winecfg/Lt.rc index d9ffd81..6ecc37b 100644 --- a/programs/winecfg/Lt.rc +++ b/programs/winecfg/Lt.rc @@ -167,11 +167,11 @@ FONT 8, "MS Shell Dlg" BEGIN GROUPBOX " Tvarkyklės diagnostika ",IDC_STATIC,8,4,244,27 LTEXT "",IDC_AUDIO_DRIVER,18,16,230,8 - GROUPBOX " Defaults ",IDC_STATIC,8,33,244,76 - LTEXT "Output device:",IDC_STATIC,18,45,230,8 - LTEXT "Voice output device:",IDC_STATIC,18,61,230,8 - LTEXT "Input device:",IDC_STATIC,18,77,230,8 - LTEXT "Voice input device:",IDC_STATIC,18,93,230,8 + GROUPBOX " Numatytosios reikšmės ",IDC_STATIC,8,33,244,76 + LTEXT "Išvedimo įtaisas:",IDC_STATIC,18,45,230,8 + LTEXT "Balso išvedimo įtaisas:",IDC_STATIC,18,61,230,8 + LTEXT "Įvedimo įtaisas:",IDC_STATIC,18,77,230,8 + LTEXT "Balso įvedimo įtaisas:",IDC_STATIC,18,93,230,8 COMBOBOX IDC_AUDIOOUT_DEVICE,110,43,135,14,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP COMBOBOX IDC_VOICEOUT_DEVICE,110,59,135,14,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP COMBOBOX IDC_AUDIOIN_DEVICE,110,75,135,14,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP

1 0