wine-commits June 2011

wine-commits@winehq.org

2 participants
809 discussions

Mariusz Pluciński : shell32/tests: Add test of IKnownFolderManager::Register/UnregisterFolder.
by Alexandre Julliard 14 Jun '11

14 Jun '11

Module: wine Branch: master Commit: 70bbfa7ed82af09719101d81cd96468c4a8dcd47 URL: http://source.winehq.org/git/wine.git/?a=commit;h=70bbfa7ed82af09719101d81c… Author: Mariusz Pluciński <vshader(a)gmail.com> Date: Tue Jun 14 13:09:14 2011 +0200 shell32/tests: Add test of IKnownFolderManager::Register/UnregisterFolder. --- dlls/shell32/tests/shellpath.c | 61 +++++++++++++++++++++++++++++++++++++++- 1 files changed, 60 insertions(+), 1 deletions(-) diff --git a/dlls/shell32/tests/shellpath.c b/dlls/shell32/tests/shellpath.c index 72868db..a506488 100644 --- a/dlls/shell32/tests/shellpath.c +++ b/dlls/shell32/tests/shellpath.c @@ -1038,6 +1038,8 @@ static void check_known_folder(IKnownFolderManager *mgr, KNOWNFOLDERID *folderId static void test_knownFolders(void) { static const WCHAR sWindows[] = {'W','i','n','d','o','w','s',0}; + static const WCHAR sExample[] = {'E','x','a','m','p','l','e',0}; + static const KNOWNFOLDERID newFolderId = {0x01234567, 0x89AB, 0xCDEF, {0xFE, 0xDC, 0xBA, 0x98, 0x76, 0x54, 0x32, 0x01} }; HRESULT hr; IKnownFolderManager *mgr = NULL; IKnownFolder *folder = NULL; @@ -1048,10 +1050,14 @@ static void test_knownFolders(void) UINT nCount = 0; LPWSTR folderPath; KF_REDIRECTION_CAPABILITIES redirectionCapabilities = 1; - WCHAR sWinDir[MAX_PATH]; + WCHAR sWinDir[MAX_PATH], sExamplePath[MAX_PATH]; + BOOL bRes; GetWindowsDirectoryW( sWinDir, MAX_PATH ); + GetTempPathW(sizeof(sExamplePath)/sizeof(sExamplePath[0]), sExamplePath); + lstrcatW(sExamplePath, sExample); + CoInitialize(NULL); hr = CoCreateInstance(&CLSID_KnownFolderManager, NULL, CLSCTX_INPROC_SERVER, @@ -1136,6 +1142,59 @@ static void test_knownFolders(void) CoTaskMemFree(folders); + /* test of registering new known folders */ + bRes = CreateDirectoryW(sExamplePath, NULL); + ok(bRes, "cannot create example directory: %s\n", wine_dbgstr_w(sExamplePath)); + + ZeroMemory(&kfDefinition, sizeof(kfDefinition)); + kfDefinition.category = KF_CATEGORY_PERUSER; + kfDefinition.pszName = CoTaskMemAlloc(sizeof(sExample)); + lstrcpyW(kfDefinition.pszName, sExample); + kfDefinition.pszDescription = CoTaskMemAlloc(sizeof(sExample)); + lstrcpyW(kfDefinition.pszDescription, sExample); + kfDefinition.pszRelativePath = CoTaskMemAlloc(sizeof(sExamplePath)); + lstrcpyW(kfDefinition.pszRelativePath, sExamplePath); + + hr = IKnownFolderManager_RegisterFolder(mgr, &newFolderId, &kfDefinition); + if(hr == HRESULT_FROM_WIN32(ERROR_ACCESS_DENIED)) + win_skip("No permissions required to register custom known folder\n"); + else + { + todo_wine + ok(hr == S_OK, "failed to register known folder: 0x%08x\n", hr); + if(SUCCEEDED(hr)) + { + hr = IKnownFolderManager_GetFolder(mgr, &newFolderId, &folder); + todo_wine + ok(hr == S_OK, "failed to get known folder: 0x%08x\n", hr); + if(SUCCEEDED(hr)) + { + hr = IKnownFolder_GetId(folder, &folderId); + todo_wine + ok(hr == S_OK, "failed to get folder id: 0x%08x\n", hr); + todo_wine + ok(IsEqualGUID(&folderId, &newFolderId)==TRUE, "invalid KNOWNFOLDERID returned\n"); + + hr = IKnownFolder_GetPath(folder, 0, &folderPath); + todo_wine + ok(hr == S_OK, "failed to get path from known folder: 0x%08x\n", hr); + todo_wine + ok(lstrcmpiW(folderPath, sExamplePath)==0, "invalid known folder path retreived: \"%s\" when \"%s\" was expected\n", wine_dbgstr_w(folderPath), wine_dbgstr_w(sExamplePath)); + CoTaskMemFree(folderPath); + + hr = IKnownFolder_Release(folder); + ok(hr == S_OK, "failed to release KnownFolder instance: 0x%08x\n", hr); + } + + hr = IKnownFolderManager_UnregisterFolder(mgr, &newFolderId); + todo_wine + ok(hr == S_OK, "failed to unregister folder: 0x%08x\n", hr); + } + } + FreeKnownFolderDefinitionFields(&kfDefinition); + + RemoveDirectoryW(sExamplePath); + hr = IKnownFolderManager_Release(mgr); ok(hr == S_OK, "failed to release KnownFolderManager instance: 0x%08x\n", hr); }

1 0

Mariusz Pluciński : shell32/tests: Verify known folders available in system.
by Alexandre Julliard 14 Jun '11

14 Jun '11

Module: wine Branch: master Commit: 25fd65e4f0c43559f759af58e8ebaeceb10edc1f URL: http://source.winehq.org/git/wine.git/?a=commit;h=25fd65e4f0c43559f759af58e… Author: Mariusz Pluciński <vshader(a)gmail.com> Date: Tue Jun 14 13:08:59 2011 +0200 shell32/tests: Verify known folders available in system. --- dlls/shell32/tests/shellpath.c | 164 +++++++++++++++++++++++++++++++++++++++- 1 files changed, 162 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/tests/shellpath.c b/dlls/shell32/tests/shellpath.c index add59db..72868db 100644 --- a/dlls/shell32/tests/shellpath.c +++ b/dlls/shell32/tests/shellpath.c @@ -883,16 +883,169 @@ if (0) { /* crashes */ ok(hr == S_OK, "expected S_OK, got 0x%08x\n", hr); } +/* Standard CSIDL values (and their flags) uses only two less-significant bytes */ +#define NO_CSIDL 0x10000 +#define CSIDL_TODO_WINE 0x20000 +#define KNOWN_FOLDER(id, csidl) \ + { &id, # id, csidl, # csidl, __LINE__ } + +struct knownFolderDef { + const KNOWNFOLDERID *folderId; + const char *sFolderId; + const int csidl; + const char *sCsidl; + const int line; +}; + +static const struct knownFolderDef known_folders[] = { + KNOWN_FOLDER(FOLDERID_AddNewPrograms, NO_CSIDL), + KNOWN_FOLDER(FOLDERID_AddNewPrograms, NO_CSIDL), + KNOWN_FOLDER(FOLDERID_AdminTools, CSIDL_ADMINTOOLS), + KNOWN_FOLDER(FOLDERID_AppUpdates, NO_CSIDL), + KNOWN_FOLDER(FOLDERID_CDBurning, CSIDL_CDBURN_AREA), + KNOWN_FOLDER(FOLDERID_ChangeRemovePrograms, NO_CSIDL), + KNOWN_FOLDER(FOLDERID_CommonAdminTools, CSIDL_COMMON_ADMINTOOLS), + KNOWN_FOLDER(FOLDERID_CommonOEMLinks, CSIDL_COMMON_OEM_LINKS), + KNOWN_FOLDER(FOLDERID_CommonPrograms, CSIDL_COMMON_PROGRAMS), + KNOWN_FOLDER(FOLDERID_CommonStartMenu, CSIDL_COMMON_STARTMENU), + KNOWN_FOLDER(FOLDERID_CommonStartup, CSIDL_COMMON_STARTUP), + KNOWN_FOLDER(FOLDERID_CommonTemplates, CSIDL_COMMON_TEMPLATES), + KNOWN_FOLDER(FOLDERID_ComputerFolder, CSIDL_DRIVES), + KNOWN_FOLDER(FOLDERID_ConflictFolder, NO_CSIDL), + KNOWN_FOLDER(FOLDERID_ConnectionsFolder, CSIDL_CONNECTIONS), + KNOWN_FOLDER(FOLDERID_Contacts, NO_CSIDL), + KNOWN_FOLDER(FOLDERID_ControlPanelFolder, CSIDL_CONTROLS), + KNOWN_FOLDER(FOLDERID_Cookies, CSIDL_COOKIES), + KNOWN_FOLDER(FOLDERID_Desktop, CSIDL_DESKTOP), + KNOWN_FOLDER(FOLDERID_DeviceMetadataStore, NO_CSIDL), + KNOWN_FOLDER(FOLDERID_Documents, CSIDL_MYDOCUMENTS | CSIDL_TODO_WINE), + KNOWN_FOLDER(FOLDERID_DocumentsLibrary, NO_CSIDL), + KNOWN_FOLDER(FOLDERID_Downloads, NO_CSIDL), + KNOWN_FOLDER(FOLDERID_Favorites, CSIDL_FAVORITES), + KNOWN_FOLDER(FOLDERID_Fonts, CSIDL_FONTS), + KNOWN_FOLDER(FOLDERID_Games, NO_CSIDL), + KNOWN_FOLDER(FOLDERID_GameTasks, NO_CSIDL), + KNOWN_FOLDER(FOLDERID_History, CSIDL_HISTORY), + KNOWN_FOLDER(FOLDERID_HomeGroup, NO_CSIDL), + KNOWN_FOLDER(FOLDERID_ImplicitAppShortcuts, NO_CSIDL), + KNOWN_FOLDER(FOLDERID_InternetCache, CSIDL_INTERNET_CACHE), + KNOWN_FOLDER(FOLDERID_InternetFolder, CSIDL_INTERNET), + KNOWN_FOLDER(FOLDERID_Libraries, NO_CSIDL), + KNOWN_FOLDER(FOLDERID_Links, NO_CSIDL), + KNOWN_FOLDER(FOLDERID_LocalAppData, CSIDL_LOCAL_APPDATA), + KNOWN_FOLDER(FOLDERID_LocalAppDataLow, NO_CSIDL), + KNOWN_FOLDER(FOLDERID_LocalizedResourcesDir, CSIDL_RESOURCES_LOCALIZED), + KNOWN_FOLDER(FOLDERID_Music, CSIDL_MYMUSIC), + KNOWN_FOLDER(FOLDERID_MusicLibrary, NO_CSIDL), + KNOWN_FOLDER(FOLDERID_NetHood, CSIDL_NETHOOD), + KNOWN_FOLDER(FOLDERID_NetworkFolder, CSIDL_NETWORK), + KNOWN_FOLDER(FOLDERID_OriginalImages, NO_CSIDL), + KNOWN_FOLDER(FOLDERID_PhotoAlbums, NO_CSIDL), + KNOWN_FOLDER(FOLDERID_Pictures, CSIDL_MYPICTURES), + KNOWN_FOLDER(FOLDERID_PicturesLibrary, NO_CSIDL), + KNOWN_FOLDER(FOLDERID_Playlists, NO_CSIDL), + KNOWN_FOLDER(FOLDERID_PrintersFolder, CSIDL_PRINTERS), + KNOWN_FOLDER(FOLDERID_PrintHood, CSIDL_PRINTHOOD), + KNOWN_FOLDER(FOLDERID_Profile, CSIDL_PROFILE), + KNOWN_FOLDER(FOLDERID_ProgramData, CSIDL_COMMON_APPDATA), + KNOWN_FOLDER(FOLDERID_ProgramFiles, CSIDL_PROGRAM_FILES), + KNOWN_FOLDER(FOLDERID_ProgramFilesCommon, CSIDL_PROGRAM_FILES_COMMON), + KNOWN_FOLDER(FOLDERID_ProgramFilesCommonX86, NO_CSIDL), + KNOWN_FOLDER(FOLDERID_ProgramFilesX86, CSIDL_PROGRAM_FILESX86), + KNOWN_FOLDER(FOLDERID_Programs, CSIDL_PROGRAMS), + KNOWN_FOLDER(FOLDERID_Public, NO_CSIDL), + KNOWN_FOLDER(FOLDERID_PublicDesktop, CSIDL_COMMON_DESKTOPDIRECTORY), + KNOWN_FOLDER(FOLDERID_PublicDocuments, CSIDL_COMMON_DOCUMENTS), + KNOWN_FOLDER(FOLDERID_PublicDownloads, NO_CSIDL), + KNOWN_FOLDER(FOLDERID_PublicGameTasks, NO_CSIDL), + KNOWN_FOLDER(FOLDERID_PublicLibraries, NO_CSIDL), + KNOWN_FOLDER(FOLDERID_PublicMusic, CSIDL_COMMON_MUSIC), + KNOWN_FOLDER(FOLDERID_PublicPictures, CSIDL_COMMON_PICTURES), + KNOWN_FOLDER(FOLDERID_PublicRingtones, NO_CSIDL), + KNOWN_FOLDER(FOLDERID_PublicVideos, CSIDL_COMMON_VIDEO), + KNOWN_FOLDER(FOLDERID_QuickLaunch, NO_CSIDL), + KNOWN_FOLDER(FOLDERID_Recent, CSIDL_RECENT), + KNOWN_FOLDER(FOLDERID_RecordedTVLibrary, NO_CSIDL), + KNOWN_FOLDER(FOLDERID_RecycleBinFolder, CSIDL_BITBUCKET), + KNOWN_FOLDER(FOLDERID_ResourceDir, CSIDL_RESOURCES), + KNOWN_FOLDER(FOLDERID_Ringtones, NO_CSIDL), + KNOWN_FOLDER(FOLDERID_RoamingAppData, CSIDL_APPDATA), + KNOWN_FOLDER(FOLDERID_SampleMusic, NO_CSIDL), + KNOWN_FOLDER(FOLDERID_SamplePictures, NO_CSIDL), + KNOWN_FOLDER(FOLDERID_SamplePlaylists, NO_CSIDL), + KNOWN_FOLDER(FOLDERID_SampleVideos, NO_CSIDL), + KNOWN_FOLDER(FOLDERID_SavedGames, NO_CSIDL), + KNOWN_FOLDER(FOLDERID_SavedSearches, NO_CSIDL), + KNOWN_FOLDER(FOLDERID_SEARCH_CSC, NO_CSIDL), + KNOWN_FOLDER(FOLDERID_SearchHome, NO_CSIDL), + KNOWN_FOLDER(FOLDERID_SEARCH_MAPI, NO_CSIDL), + KNOWN_FOLDER(FOLDERID_SendTo, CSIDL_SENDTO), + KNOWN_FOLDER(FOLDERID_SidebarDefaultParts, NO_CSIDL), + KNOWN_FOLDER(FOLDERID_SidebarParts, NO_CSIDL), + KNOWN_FOLDER(FOLDERID_StartMenu, CSIDL_STARTMENU), + KNOWN_FOLDER(FOLDERID_Startup, CSIDL_STARTUP), + KNOWN_FOLDER(FOLDERID_SyncManagerFolder, NO_CSIDL), + KNOWN_FOLDER(FOLDERID_SyncResultsFolder, NO_CSIDL), + KNOWN_FOLDER(FOLDERID_SyncSetupFolder, NO_CSIDL), + KNOWN_FOLDER(FOLDERID_System, CSIDL_SYSTEM), + KNOWN_FOLDER(FOLDERID_SystemX86, CSIDL_SYSTEMX86), + KNOWN_FOLDER(FOLDERID_Templates, CSIDL_TEMPLATES), + KNOWN_FOLDER(FOLDERID_UserPinned, NO_CSIDL), + KNOWN_FOLDER(FOLDERID_UserProfiles, NO_CSIDL), + KNOWN_FOLDER(FOLDERID_UserProgramFiles, NO_CSIDL), + KNOWN_FOLDER(FOLDERID_UserProgramFilesCommon, NO_CSIDL), + KNOWN_FOLDER(FOLDERID_UsersFiles, NO_CSIDL), + KNOWN_FOLDER(FOLDERID_UsersLibraries, NO_CSIDL), + KNOWN_FOLDER(FOLDERID_Videos, CSIDL_MYVIDEO), + KNOWN_FOLDER(FOLDERID_VideosLibrary, NO_CSIDL), + KNOWN_FOLDER(FOLDERID_Windows, CSIDL_WINDOWS), + { NULL, NULL, 0, NULL } +}; +#undef KNOWN_FOLDER + +static void check_known_folder(IKnownFolderManager *mgr, KNOWNFOLDERID *folderId) +{ + HRESULT hr; + const struct knownFolderDef *known_folder = &known_folders[0]; + int csidl, expectedCsidl; + + while(known_folder->folderId != NULL) + { + if(IsEqualGUID(known_folder->folderId, folderId)) + { + /* verify CSIDL */ + if(known_folder->csidl != NO_CSIDL) + { + expectedCsidl = known_folder->csidl & (~CSIDL_TODO_WINE); + + hr = IKnownFolderManager_FolderIdToCsidl(mgr, folderId, &csidl); + ok_(__FILE__, known_folder->line)(hr == S_OK, "cannot retrieve CSIDL for folder %s\n", known_folder->sFolderId); + + if(known_folder->csidl & CSIDL_TODO_WINE) + todo_wine ok_(__FILE__, known_folder->line)(csidl == expectedCsidl, "invalid CSIDL retrieved for folder %s. %d (%s) expected, but %d found\n", known_folder->sFolderId, expectedCsidl, known_folder->sCsidl, csidl); + else + ok_(__FILE__, known_folder->line)(csidl == expectedCsidl, "invalid CSIDL retrieved for folder %s. %d (%s) expected, but %d found\n", known_folder->sFolderId, expectedCsidl, known_folder->sCsidl, csidl); + } + + break; + } + known_folder++; + } +} +#undef NO_CSIDL +#undef CSIDL_TODO_WINE + static void test_knownFolders(void) { static const WCHAR sWindows[] = {'W','i','n','d','o','w','s',0}; HRESULT hr; IKnownFolderManager *mgr = NULL; IKnownFolder *folder = NULL; - KNOWNFOLDERID folderId; + KNOWNFOLDERID folderId, *folders; KF_CATEGORY cat = 0; KNOWNFOLDER_DEFINITION kfDefinition; - int csidl; + int csidl, i; + UINT nCount = 0; LPWSTR folderPath; KF_REDIRECTION_CAPABILITIES redirectionCapabilities = 1; WCHAR sWinDir[MAX_PATH]; @@ -976,6 +1129,13 @@ static void test_knownFolders(void) ok(hr == S_OK, "failed to release KnownFolder instance: 0x%08x\n", hr); } + hr = IKnownFolderManager_GetFolderIds(mgr, &folders, &nCount); + ok(hr == S_OK, "failed to get known folders: 0x%08x\n", hr); + for(i=0;i<nCount;++i) + check_known_folder(mgr, &folders[i]); + + CoTaskMemFree(folders); + hr = IKnownFolderManager_Release(mgr); ok(hr == S_OK, "failed to release KnownFolderManager instance: 0x%08x\n", hr); }

1 0

Andrew Nguyen : dxdiag: Add code for XML information output.
by Alexandre Julliard 14 Jun '11

14 Jun '11

Module: wine Branch: master Commit: b14e164281067cfe9ff894b0b329e3feaa20fea5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b14e164281067cfe9ff894b0b… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Tue Jun 14 08:02:18 2011 -0500 dxdiag: Add code for XML information output. --- programs/dxdiag/output.c | 186 +++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 184 insertions(+), 2 deletions(-) diff --git a/programs/dxdiag/output.c b/programs/dxdiag/output.c index 5176f69..574b843 100644 --- a/programs/dxdiag/output.c +++ b/programs/dxdiag/output.c @@ -18,8 +18,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_LEAN_AND_MEAN +#define COBJMACROS +#include <initguid.h> #include <windows.h> +#include <msxml2.h> #include <assert.h> #include <stdio.h> @@ -33,6 +35,26 @@ WINE_DEFAULT_DEBUG_CHANNEL(dxdiag); static char output_buffer[1024]; static const char crlf[2] = "\r\n"; +static const WCHAR DxDiag[] = {'D','x','D','i','a','g',0}; + +static const WCHAR SystemInformation[] = {'S','y','s','t','e','m','I','n','f','o','r','m','a','t','i','o','n',0}; +static const WCHAR Time[] = {'T','i','m','e',0}; +static const WCHAR MachineName[] = {'M','a','c','h','i','n','e','N','a','m','e',0}; +static const WCHAR OperatingSystem[] = {'O','p','e','r','a','t','i','n','g','S','y','s','t','e','m',0}; +static const WCHAR Language[] = {'L','a','n','g','u','a','g','e',0}; +static const WCHAR SystemManufacturer[] = {'S','y','s','t','e','m','M','a','n','u','f','a','c','t','u','r','e','r',0}; +static const WCHAR SystemModel[] = {'S','y','s','t','e','m','M','o','d','e','l',0}; +static const WCHAR BIOS[] = {'B','I','O','S',0}; +static const WCHAR Processor[] = {'P','r','o','c','e','s','s','o','r',0}; +static const WCHAR Memory[] = {'M','e','m','o','r','y',0}; +static const WCHAR PageFile[] = {'P','a','g','e','F','i','l','e',0}; +static const WCHAR WindowsDir[] = {'W','i','n','d','o','w','s','D','i','r',0}; +static const WCHAR DirectXVersion[] = {'D','i','r','e','c','t','X','V','e','r','s','i','o','n',0}; +static const WCHAR DXSetupParameters[] = {'D','X','S','e','t','u','p','P','a','r','a','m','e','t','e','r','s',0}; +static const WCHAR DxDiagVersion[] = {'D','x','D','i','a','g','V','e','r','s','i','o','n',0}; +static const WCHAR DxDiagUnicode[] = {'D','x','D','i','a','g','U','n','i','c','o','d','e',0}; +static const WCHAR DxDiag64Bit[] = {'D','x','D','i','a','g','6','4','B','i','t',0}; + static BOOL output_text_header(HANDLE hFile, const char *caption) { DWORD len = strlen(caption); @@ -148,9 +170,169 @@ static BOOL output_text_information(struct dxdiag_information *dxdiag_info, cons return FALSE; } +static IXMLDOMElement *xml_create_element(IXMLDOMDocument *xmldoc, const WCHAR *name) +{ + BSTR bstr = SysAllocString(name); + IXMLDOMElement *ret; + HRESULT hr; + + if (!bstr) + return NULL; + + hr = IXMLDOMDocument_createElement(xmldoc, bstr, &ret); + SysFreeString(bstr); + + return SUCCEEDED(hr) ? ret : NULL; +} + +static HRESULT xml_put_element_text(IXMLDOMElement *element, const WCHAR *text) +{ + BSTR bstr = SysAllocString(text); + HRESULT hr; + + if (!bstr) + return E_OUTOFMEMORY; + + hr = IXMLDOMElement_put_text(element, bstr); + SysFreeString(bstr); + + return hr; +} + +static HRESULT save_xml_document(IXMLDOMDocument *xmldoc, const WCHAR *filename) +{ + BSTR bstr = SysAllocString(filename); + VARIANT destVar; + HRESULT hr; + + if (!bstr) + return E_OUTOFMEMORY; + + V_VT(&destVar) = VT_BSTR; + V_BSTR(&destVar) = bstr; + + hr = IXMLDOMDocument_save(xmldoc, destVar); + VariantClear(&destVar); + + return hr; +} + static BOOL output_xml_information(struct dxdiag_information *dxdiag_info, const WCHAR *filename) { - WINE_FIXME("XML information output is not implemented\n"); + static const WCHAR zeroW[] = {'0',0}; + static const WCHAR oneW[] = {'1',0}; + + const struct information_block + { + const WCHAR *tag_name; + struct information_field + { + const WCHAR *tag_name; + const WCHAR *value; + } fields[50]; + } output_table[] = + { + {SystemInformation, + { + {Time, dxdiag_info->system_info.szTimeEnglish}, + {MachineName, dxdiag_info->system_info.szMachineNameEnglish}, + {OperatingSystem, dxdiag_info->system_info.szOSExLongEnglish}, + {Language, dxdiag_info->system_info.szLanguagesEnglish}, + {SystemManufacturer, dxdiag_info->system_info.szSystemManufacturerEnglish}, + {SystemModel, dxdiag_info->system_info.szSystemManufacturerEnglish}, + {BIOS, dxdiag_info->system_info.szSystemManufacturerEnglish}, + {Processor, dxdiag_info->system_info.szProcessorEnglish}, + {Memory, dxdiag_info->system_info.szPhysicalMemoryEnglish}, + {PageFile, dxdiag_info->system_info.szPageFileEnglish}, + {WindowsDir, dxdiag_info->system_info.szWindowsDir}, + {DirectXVersion, dxdiag_info->system_info.szDirectXVersionLongEnglish}, + {DXSetupParameters, dxdiag_info->system_info.szSetupParamEnglish}, + {DxDiagVersion, dxdiag_info->system_info.szDxDiagVersion}, + {DxDiagUnicode, oneW}, + {DxDiag64Bit, dxdiag_info->system_info.win64 ? oneW : zeroW}, + {NULL, NULL}, + } + }, + }; + + IXMLDOMDocument *xmldoc = NULL; + IXMLDOMElement *dxdiag_element = NULL; + HRESULT hr; + size_t i; + + hr = CoCreateInstance(&CLSID_DOMDocument, NULL, CLSCTX_INPROC_SERVER, + &IID_IXMLDOMDocument, (void **)&xmldoc); + if (FAILED(hr)) + { + WINE_ERR("IXMLDOMDocument instance creation failed with 0x%08x\n", hr); + goto error; + } + + if (!(dxdiag_element = xml_create_element(xmldoc, DxDiag))) + goto error; + + hr = IXMLDOMDocument_appendChild(xmldoc, (IXMLDOMNode *)dxdiag_element, NULL); + if (FAILED(hr)) + goto error; + + for (i = 0; i < sizeof(output_table)/sizeof(output_table[0]); i++) + { + IXMLDOMElement *info_element = xml_create_element(xmldoc, output_table[i].tag_name); + const struct information_field *fields = output_table[i].fields; + unsigned int j = 0; + + if (!info_element) + goto error; + + hr = IXMLDOMElement_appendChild(dxdiag_element, (IXMLDOMNode *)info_element, NULL); + if (FAILED(hr)) + { + IXMLDOMElement_Release(info_element); + goto error; + } + + for (j = 0; fields[j].tag_name; j++) + { + IXMLDOMElement *field_element = xml_create_element(xmldoc, fields[j].tag_name); + + if (!field_element) + { + IXMLDOMElement_Release(info_element); + goto error; + } + + hr = xml_put_element_text(field_element, fields[j].value); + if (FAILED(hr)) + { + IXMLDOMElement_Release(field_element); + IXMLDOMElement_Release(info_element); + goto error; + } + + hr = IXMLDOMElement_appendChild(info_element, (IXMLDOMNode *)field_element, NULL); + if (FAILED(hr)) + { + IXMLDOMElement_Release(field_element); + IXMLDOMElement_Release(info_element); + goto error; + } + + IXMLDOMElement_Release(field_element); + } + + IXMLDOMElement_Release(info_element); + } + + hr = save_xml_document(xmldoc, filename); + if (FAILED(hr)) + goto error; + + IXMLDOMElement_Release(dxdiag_element); + IXMLDOMDocument_Release(xmldoc); + return TRUE; +error: + if (dxdiag_element) IXMLDOMElement_Release(dxdiag_element); + if (xmldoc) IXMLDOMDocument_Release(xmldoc); return FALSE; }

1 0

Andrew Nguyen : dxdiag: Add code for plain-text information output.
by Alexandre Julliard 14 Jun '11

14 Jun '11

Module: wine Branch: master Commit: 8d37cfed44fe95de7f26a9da8200d83a3b051f24 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d37cfed44fe95de7f26a9da8… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Tue Jun 14 08:02:12 2011 -0500 dxdiag: Add code for plain-text information output. --- programs/dxdiag/output.c | 136 +++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 134 insertions(+), 2 deletions(-) diff --git a/programs/dxdiag/output.c b/programs/dxdiag/output.c index effe2a2..5176f69 100644 --- a/programs/dxdiag/output.c +++ b/programs/dxdiag/output.c @@ -18,26 +18,157 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define WIN32_LEAN_AND_MEAN +#include <windows.h> #include <assert.h> +#include <stdio.h> #include "wine/debug.h" +#include "wine/unicode.h" #include "dxdiag_private.h" WINE_DEFAULT_DEBUG_CHANNEL(dxdiag); +static char output_buffer[1024]; +static const char crlf[2] = "\r\n"; + +static BOOL output_text_header(HANDLE hFile, const char *caption) +{ + DWORD len = strlen(caption); + DWORD total_len = 3 * (len + sizeof(crlf)); + char *ptr = output_buffer; + + assert(total_len <= sizeof(output_buffer)); + + memset(ptr, '-', len); + ptr += len; + + memcpy(ptr, crlf, sizeof(crlf)); + ptr += sizeof(crlf); + + memcpy(ptr, caption, len); + ptr += len; + + memcpy(ptr, crlf, sizeof(crlf)); + ptr += sizeof(crlf); + + memset(ptr, '-', len); + ptr += len; + + memcpy(ptr, crlf, sizeof(crlf)); + ptr += sizeof(crlf); + + return WriteFile(hFile, output_buffer, total_len, NULL, NULL); +} + +static BOOL output_text_field(HANDLE hFile, const char *field_name, DWORD field_width, const WCHAR *value) +{ + DWORD value_lenW = strlenW(value); + DWORD value_lenA = WideCharToMultiByte(CP_ACP, 0, value, value_lenW, NULL, 0, NULL, NULL); + DWORD total_len = field_width + sizeof(": ") - 1 + value_lenA + sizeof(crlf); + char sprintf_fmt[1 + 10 + 3 + 1]; + char *ptr = output_buffer; + + assert(total_len <= sizeof(output_buffer)); + + sprintf(sprintf_fmt, "%%%us: ", field_width); + ptr += sprintf(ptr, sprintf_fmt, field_name); + + ptr += WideCharToMultiByte(CP_ACP, 0, value, value_lenW, ptr, value_lenA, NULL, NULL); + + memcpy(ptr, crlf, sizeof(crlf)); + ptr += sizeof(crlf); + + return WriteFile(hFile, output_buffer, total_len, NULL, NULL); +} + +static BOOL output_crlf(HANDLE hFile) +{ + return WriteFile(hFile, crlf, sizeof(crlf), NULL, NULL); +} + +static BOOL output_text_information(struct dxdiag_information *dxdiag_info, const WCHAR *filename) +{ + const struct information_block + { + const char *caption; + size_t field_width; + struct information_field + { + const char *field_name; + const WCHAR *value; + } fields[50]; + } output_table[] = + { + {"System Information", 19, + { + {"Time of this report", dxdiag_info->system_info.szTimeEnglish}, + {"Machine name", dxdiag_info->system_info.szMachineNameEnglish}, + {"Operating System", dxdiag_info->system_info.szOSExLongEnglish}, + {"Language", dxdiag_info->system_info.szLanguagesEnglish}, + {"System Manufacturer", dxdiag_info->system_info.szSystemManufacturerEnglish}, + {"System Model", dxdiag_info->system_info.szSystemManufacturerEnglish}, + {"BIOS", dxdiag_info->system_info.szSystemManufacturerEnglish}, + {"Processor", dxdiag_info->system_info.szProcessorEnglish}, + {"Memory", dxdiag_info->system_info.szPhysicalMemoryEnglish}, + {"Page File", dxdiag_info->system_info.szPageFileEnglish}, + {"Windows Dir", dxdiag_info->system_info.szWindowsDir}, + {"DirectX Version", dxdiag_info->system_info.szDirectXVersionLongEnglish}, + {"DX Setup Parameters", dxdiag_info->system_info.szSetupParamEnglish}, + {"DxDiag Version", dxdiag_info->system_info.szDxDiagVersion}, + {NULL, NULL}, + } + }, + }; + + HANDLE hFile; + size_t i; + + hFile = CreateFileW(filename, GENERIC_WRITE, FILE_SHARE_READ | FILE_SHARE_WRITE, + NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); + if (hFile == INVALID_HANDLE_VALUE) + { + WINE_ERR("File creation failed, last error %u\n", GetLastError()); + return FALSE; + } + + for (i = 0; i < sizeof(output_table)/sizeof(output_table[0]); i++) + { + const struct information_field *fields = output_table[i].fields; + unsigned int j; + + output_text_header(hFile, output_table[i].caption); + for (j = 0; fields[j].field_name; j++) + output_text_field(hFile, fields[j].field_name, output_table[i].field_width, fields[j].value); + output_crlf(hFile); + } + + CloseHandle(hFile); + return FALSE; +} + +static BOOL output_xml_information(struct dxdiag_information *dxdiag_info, const WCHAR *filename) +{ + WINE_FIXME("XML information output is not implemented\n"); + return FALSE; +} + static struct output_backend { const WCHAR filename_ext[5]; + BOOL (*output_handler)(struct dxdiag_information *, const WCHAR *filename); } output_backends[] = { /* OUTPUT_TEXT */ { {'.','t','x','t',0}, + output_text_information, }, /* OUTPUT_XML */ { {'.','x','m','l',0}, + output_xml_information, }, }; @@ -50,6 +181,7 @@ const WCHAR *get_output_extension(enum output_type type) BOOL output_dxdiag_information(struct dxdiag_information *dxdiag_info, const WCHAR *filename, enum output_type type) { - WINE_FIXME("File information output is not implemented\n"); - return FALSE; + assert(type > OUTPUT_NONE && type <= sizeof(output_backends)/sizeof(output_backends[0])); + + return output_backends[type - 1].output_handler(dxdiag_info, filename); }

1 0

Andrew Nguyen : dxdiag: Add code to collect information from the DxDiag_SystemInfo container.
by Alexandre Julliard 14 Jun '11

14 Jun '11

Module: wine Branch: master Commit: 82024ee14f20d2240ed196c7521fa7736a530877 URL: http://source.winehq.org/git/wine.git/?a=commit;h=82024ee14f20d2240ed196c75… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Tue Jun 14 08:02:05 2011 -0500 dxdiag: Add code to collect information from the DxDiag_SystemInfo container. --- programs/dxdiag/Makefile.in | 2 +- programs/dxdiag/dxdiag_private.h | 28 +++++- programs/dxdiag/information.c | 204 +++++++++++++++++++++++++++++++++++++- programs/dxdiag/main.c | 6 + 4 files changed, 236 insertions(+), 4 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=82024ee14f20d2240ed19…

1 0

Andrew Nguyen : dxdiagn: Stub out some properties for dxdiag.exe.
by Alexandre Julliard 14 Jun '11

14 Jun '11

Module: wine Branch: master Commit: 7d3b78af95bda2f51f4279f08eee788704300753 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d3b78af95bda2f51f4279f08… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Tue Jun 14 08:01:58 2011 -0500 dxdiagn: Stub out some properties for dxdiag.exe. --- dlls/dxdiagn/provider.c | 35 ++++++++++++++++++++++++++++++++++- 1 files changed, 34 insertions(+), 1 deletions(-) diff --git a/dlls/dxdiagn/provider.c b/dlls/dxdiagn/provider.c index 1731b8f..9d19558 100644 --- a/dlls/dxdiagn/provider.c +++ b/dlls/dxdiagn/provider.c @@ -43,6 +43,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(dxdiag); +static const WCHAR szEmpty[] = {0}; + static HRESULT build_information_tree(IDxDiagContainerImpl_Container **pinfo_root); static void free_information_tree(IDxDiagContainerImpl_Container *node); @@ -570,6 +572,14 @@ static HRESULT build_systeminfo_tree(IDxDiagContainerImpl_Container *node) static const WCHAR szPageFileEnglish[] = {'s','z','P','a','g','e','F','i','l','e','E','n','g','l','i','s','h',0}; static const WCHAR szMachineNameLocalized[] = {'s','z','M','a','c','h','i','n','e','N','a','m','e','L','o','c','a','l','i','z','e','d',0}; static const WCHAR szMachineNameEnglish[] = {'s','z','M','a','c','h','i','n','e','N','a','m','e','E','n','g','l','i','s','h',0}; + static const WCHAR szSystemManufacturerEnglish[] = {'s','z','S','y','s','t','e','m','M','a','n','u','f','a','c','t','u','r','e','r','E','n','g','l','i','s','h',0}; + static const WCHAR szSystemModelEnglish[] = {'s','z','S','y','s','t','e','m','M','o','d','e','l','E','n','g','l','i','s','h',0}; + static const WCHAR szBIOSEnglish[] = {'s','z','B','I','O','S','E','n','g','l','i','s','h',0}; + static const WCHAR szProcessorEnglish[] = {'s','z','P','r','o','c','e','s','s','o','r','E','n','g','l','i','s','h',0}; + static const WCHAR szSetupParamEnglish[] = {'s','z','S','e','t','u','p','P','a','r','a','m','E','n','g','l','i','s','h',0}; + static const WCHAR szDxDiagVersion[] = {'s','z','D','x','D','i','a','g','V','e','r','s','i','o','n',0}; + + static const WCHAR notpresentW[] = {'N','o','t',' ','p','r','e','s','e','n','t',0}; static const WCHAR pagefile_fmtW[] = {'%','u','M','B',' ','u','s','e','d',',',' ','%','u','M','B',' ','a','v','a','i','l','a','b','l','e',0}; static const WCHAR physmem_fmtW[] = {'%','u','M','B',' ','R','A','M',0}; @@ -689,6 +699,30 @@ static HRESULT build_systeminfo_tree(IDxDiagContainerImpl_Container *node) if (FAILED(hr)) return hr; + hr = add_bstr_property(node, szSystemManufacturerEnglish, szEmpty); + if (FAILED(hr)) + return hr; + + hr = add_bstr_property(node, szSystemModelEnglish, szEmpty); + if (FAILED(hr)) + return hr; + + hr = add_bstr_property(node, szBIOSEnglish, szEmpty); + if (FAILED(hr)) + return hr; + + hr = add_bstr_property(node, szProcessorEnglish, szEmpty); + if (FAILED(hr)) + return hr; + + hr = add_bstr_property(node, szSetupParamEnglish, notpresentW); + if (FAILED(hr)) + return hr; + + hr = add_bstr_property(node, szDxDiagVersion, szEmpty); + if (FAILED(hr)) + return hr; + hr = fill_language_information(node); if (FAILED(hr)) return hr; @@ -720,7 +754,6 @@ static HRESULT build_displaydevices_tree(IDxDiagContainerImpl_Container *node) static const WCHAR szDisplayMemoryEnglish[] = {'s','z','D','i','s','p','l','a','y','M','e','m','o','r','y','E','n','g','l','i','s','h',0}; static const WCHAR szAdapterID[] = {'0',0}; - static const WCHAR szEmpty[] = {0}; IDxDiagContainerImpl_Container *display_adapter; HRESULT hr;

1 0

Andrew Nguyen : dxdiag: Introduce the information collection infrastructure .
by Alexandre Julliard 14 Jun '11

14 Jun '11

Module: wine Branch: master Commit: c349a34e1694265da0f3b25c532278ab69362b54 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c349a34e1694265da0f3b25c5… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Tue Jun 14 08:01:51 2011 -0500 dxdiag: Introduce the information collection infrastructure. --- programs/dxdiag/Makefile.in | 1 + programs/dxdiag/dxdiag_private.h | 8 +++++++- programs/dxdiag/information.c | 36 ++++++++++++++++++++++++++++++++++++ programs/dxdiag/main.c | 12 +++++++++++- programs/dxdiag/output.c | 2 +- 5 files changed, 56 insertions(+), 3 deletions(-) diff --git a/programs/dxdiag/Makefile.in b/programs/dxdiag/Makefile.in index 6a43982..3a691b0 100644 --- a/programs/dxdiag/Makefile.in +++ b/programs/dxdiag/Makefile.in @@ -4,6 +4,7 @@ APPMODE = -mwindows -municode IMPORTS = user32 C_SRCS = \ + information.c \ main.c \ output.c diff --git a/programs/dxdiag/dxdiag_private.h b/programs/dxdiag/dxdiag_private.h index 6026a9d..cbd9f5d 100644 --- a/programs/dxdiag/dxdiag_private.h +++ b/programs/dxdiag/dxdiag_private.h @@ -26,6 +26,12 @@ #define STRING_DXDIAG_TOOL 101 #define STRING_USAGE 102 +/* Information collection definitions. */ +struct dxdiag_information; + +struct dxdiag_information *collect_dxdiag_information(BOOL whql_check); +void free_dxdiag_information(struct dxdiag_information *dxdiag_info); + /* Output backend definitions. */ enum output_type { @@ -50,4 +56,4 @@ static inline const char *debugstr_output_type(enum output_type type) } const WCHAR *get_output_extension(enum output_type type); -BOOL output_dxdiag_information(const WCHAR *filename, enum output_type type); +BOOL output_dxdiag_information(struct dxdiag_information *dxdiag_info, const WCHAR *filename, enum output_type type); diff --git a/programs/dxdiag/information.c b/programs/dxdiag/information.c new file mode 100644 index 0000000..ecdaa92 --- /dev/null +++ b/programs/dxdiag/information.c @@ -0,0 +1,36 @@ +/* + * DxDiag information collection + * + * Copyright 2011 Andrew Nguyen + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "wine/debug.h" + +#include "dxdiag_private.h" + +WINE_DEFAULT_DEBUG_CHANNEL(dxdiag); + +void free_dxdiag_information(struct dxdiag_information *system_info) +{ + /* Do nothing for now. */ +} + +struct dxdiag_information *collect_dxdiag_information(BOOL whql_check) +{ + WINE_FIXME("DxDiag information collection is not implemented\n"); + return NULL; +} diff --git a/programs/dxdiag/main.c b/programs/dxdiag/main.c index 5380548..f286db6 100644 --- a/programs/dxdiag/main.c +++ b/programs/dxdiag/main.c @@ -174,6 +174,7 @@ static BOOL process_command_line(const WCHAR *cmdline, struct command_line_info int WINAPI wWinMain(HINSTANCE hInst, HINSTANCE hPrevInst, LPWSTR cmdline, int cmdshow) { struct command_line_info info; + struct dxdiag_information *dxdiag_info; hInstance = hInst; @@ -185,10 +186,19 @@ int WINAPI wWinMain(HINSTANCE hInst, HINSTANCE hPrevInst, LPWSTR cmdline, int cm if (info.output_type != OUTPUT_NONE) WINE_TRACE("Output filename: %s\n", debugstr_output_type(info.output_type)); + dxdiag_info = collect_dxdiag_information(info.whql_check); + if (!dxdiag_info) + { + WINE_ERR("DxDiag information collection failed\n"); + return 1; + } + if (info.output_type != OUTPUT_NONE) - output_dxdiag_information(info.outfile, info.output_type); + output_dxdiag_information(dxdiag_info, info.outfile, info.output_type); else WINE_FIXME("Information dialog is not implemented\n"); + free_dxdiag_information(dxdiag_info); + return 0; } diff --git a/programs/dxdiag/output.c b/programs/dxdiag/output.c index c7b3060..effe2a2 100644 --- a/programs/dxdiag/output.c +++ b/programs/dxdiag/output.c @@ -48,7 +48,7 @@ const WCHAR *get_output_extension(enum output_type type) return output_backends[type - 1].filename_ext; } -BOOL output_dxdiag_information(const WCHAR *filename, enum output_type type) +BOOL output_dxdiag_information(struct dxdiag_information *dxdiag_info, const WCHAR *filename, enum output_type type) { WINE_FIXME("File information output is not implemented\n"); return FALSE;

1 0

Andrew Nguyen : dxdiag: Display a usage message box when unknown options are requested.
by Alexandre Julliard 14 Jun '11

14 Jun '11

1 0

Andrew Nguyen : dxdiag: Introduce the file output infrastructure.
by Alexandre Julliard 14 Jun '11

14 Jun '11

Module: wine Branch: master Commit: 9678907d34ceec9c0eab2b9a4b798b7b5e8b5883 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9678907d34ceec9c0eab2b9a4… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Tue Jun 14 08:01:37 2011 -0500 dxdiag: Introduce the file output infrastructure. --- programs/dxdiag/Makefile.in | 3 +- programs/dxdiag/dxdiag_private.h | 45 +++++++++++++++++++++++++++++++ programs/dxdiag/main.c | 39 ++++++++++++++++++++++++--- programs/dxdiag/output.c | 55 ++++++++++++++++++++++++++++++++++++++ 4 files changed, 137 insertions(+), 5 deletions(-) diff --git a/programs/dxdiag/Makefile.in b/programs/dxdiag/Makefile.in index 941d2c7..608790a 100644 --- a/programs/dxdiag/Makefile.in +++ b/programs/dxdiag/Makefile.in @@ -3,6 +3,7 @@ MODULE = dxdiag.exe APPMODE = -mwindows -municode C_SRCS = \ - main.c + main.c \ + output.c @MAKE_PROG_RULES@ diff --git a/programs/dxdiag/dxdiag_private.h b/programs/dxdiag/dxdiag_private.h new file mode 100644 index 0000000..48b4c4d --- /dev/null +++ b/programs/dxdiag/dxdiag_private.h @@ -0,0 +1,45 @@ +/* + * Private definitions for the DirectX Diagnostic Tool + * + * Copyright 2011 Andrew Nguyen + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +/* Output backend definitions. */ +enum output_type +{ + OUTPUT_NONE, + OUTPUT_TEXT, + OUTPUT_XML, +}; + +static inline const char *debugstr_output_type(enum output_type type) +{ + switch (type) + { + case OUTPUT_NONE: + return "(none)"; + case OUTPUT_TEXT: + return "Plain-text output"; + case OUTPUT_XML: + return "XML output"; + default: + return "(unknown)"; + } +} + +const WCHAR *get_output_extension(enum output_type type); +BOOL output_dxdiag_information(const WCHAR *filename, enum output_type type); diff --git a/programs/dxdiag/main.c b/programs/dxdiag/main.c index 3b89b19..6e4042c 100644 --- a/programs/dxdiag/main.c +++ b/programs/dxdiag/main.c @@ -23,11 +23,14 @@ #include "wine/debug.h" #include "wine/unicode.h" +#include "dxdiag_private.h" + WINE_DEFAULT_DEBUG_CHANNEL(dxdiag); struct command_line_info { WCHAR outfile[MAX_PATH]; + enum output_type output_type; BOOL whql_check; }; @@ -37,7 +40,7 @@ static void usage(void) ExitProcess(0); } -static BOOL process_file_name(const WCHAR *cmdline, WCHAR *filename, size_t filename_len) +static BOOL process_file_name(const WCHAR *cmdline, enum output_type output_type, WCHAR *filename, size_t filename_len) { const WCHAR *endptr; size_t len; @@ -65,6 +68,17 @@ static BOOL process_file_name(const WCHAR *cmdline, WCHAR *filename, size_t file memcpy(filename, cmdline, len * sizeof(WCHAR)); filename[len] = '\0'; + /* Append an extension appropriate for the output type if the filename does not have one. */ + if (!(endptr = strrchrW(filename, '.'))) + { + const WCHAR *filename_ext = get_output_extension(output_type); + + if (len + strlenW(filename_ext) >= filename_len) + return FALSE; + + strcatW(filename, filename_ext); + } + return TRUE; } @@ -87,6 +101,7 @@ static BOOL process_command_line(const WCHAR *cmdline, struct command_line_info static const WCHAR onW[] = {'o','n',0}; info->whql_check = FALSE; + info->output_type = OUTPUT_NONE; while (*cmdline) { @@ -96,7 +111,11 @@ static BOOL process_command_line(const WCHAR *cmdline, struct command_line_info /* If no option is specified, treat the command line as a filename. */ if (*cmdline != '-' && *cmdline != '/') - return process_file_name(cmdline, info->outfile, sizeof(info->outfile)/sizeof(WCHAR)); + { + info->output_type = OUTPUT_TEXT; + return process_file_name(cmdline, OUTPUT_TEXT, info->outfile, + sizeof(info->outfile)/sizeof(WCHAR)); + } cmdline++; @@ -104,10 +123,14 @@ static BOOL process_command_line(const WCHAR *cmdline, struct command_line_info { case 'T': case 't': - return process_file_name(cmdline + 1, info->outfile, sizeof(info->outfile)/sizeof(WCHAR)); + info->output_type = OUTPUT_TEXT; + return process_file_name(cmdline + 1, OUTPUT_TEXT, info->outfile, + sizeof(info->outfile)/sizeof(WCHAR)); case 'X': case 'x': - return process_file_name(cmdline + 1, info->outfile, sizeof(info->outfile)/sizeof(WCHAR)); + info->output_type = OUTPUT_XML; + return process_file_name(cmdline + 1, OUTPUT_XML, info->outfile, + sizeof(info->outfile)/sizeof(WCHAR)); case 'W': case 'w': if (strncmpiW(cmdline, whql_colonW, 5)) @@ -147,6 +170,14 @@ int WINAPI wWinMain(HINSTANCE hInst, HINSTANCE hPrevInst, LPWSTR cmdline, int cm usage(); WINE_TRACE("WHQL check: %s\n", info.whql_check ? "TRUE" : "FALSE"); + WINE_TRACE("Output type: %d\n", info.output_type); + if (info.output_type != OUTPUT_NONE) + WINE_TRACE("Output filename: %s\n", debugstr_output_type(info.output_type)); + + if (info.output_type != OUTPUT_NONE) + output_dxdiag_information(info.outfile, info.output_type); + else + WINE_FIXME("Information dialog is not implemented\n"); return 0; } diff --git a/programs/dxdiag/output.c b/programs/dxdiag/output.c new file mode 100644 index 0000000..c7b3060 --- /dev/null +++ b/programs/dxdiag/output.c @@ -0,0 +1,55 @@ +/* + * DxDiag file information output + * + * Copyright 2011 Andrew Nguyen + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <assert.h> + +#include "wine/debug.h" + +#include "dxdiag_private.h" + +WINE_DEFAULT_DEBUG_CHANNEL(dxdiag); + +static struct output_backend +{ + const WCHAR filename_ext[5]; +} output_backends[] = +{ + /* OUTPUT_TEXT */ + { + {'.','t','x','t',0}, + }, + /* OUTPUT_XML */ + { + {'.','x','m','l',0}, + }, +}; + +const WCHAR *get_output_extension(enum output_type type) +{ + assert(type > OUTPUT_NONE && type <= sizeof(output_backends)/sizeof(output_backends[0])); + + return output_backends[type - 1].filename_ext; +} + +BOOL output_dxdiag_information(const WCHAR *filename, enum output_type type) +{ + WINE_FIXME("File information output is not implemented\n"); + return FALSE; +}

1 0

Marcus Meissner : oleview: Remove superflous NULL check (Coverity).
by Alexandre Julliard 14 Jun '11

14 Jun '11

Module: wine Branch: master Commit: 024ab0c5371c85eecc1a3e80b654da5afff95d12 URL: http://source.winehq.org/git/wine.git/?a=commit;h=024ab0c5371c85eecc1a3e80b… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Tue Jun 14 13:41:45 2011 +0200 oleview: Remove superflous NULL check (Coverity). --- programs/oleview/typelib.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/oleview/typelib.c b/programs/oleview/typelib.c index d2d6d00..b28dd90 100644 --- a/programs/oleview/typelib.c +++ b/programs/oleview/typelib.c @@ -482,7 +482,7 @@ static int EnumEnums(ITypeInfo *pTypeInfo, int cVars, HTREEITEM hParent) AddToStrW(wszText, wszSpace); AddToStrW(wszText, bstrName); AddToStrW(wszText, wszAfter); - if (bstrName) AddToTLDataStrW(tld, bstrName); + AddToTLDataStrW(tld, bstrName); AddToTLDataStrW(tld, wszAfter); if (i<cVars-1) AddToTLDataStrW(tld, wszComa);

1 0

← Newer
1
...
42
43
44
45
46
47
48
...
81
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 June 2011