February 2008 - Wine-Commits

Frans Kool : regedit: Added Dutch translations.
by Alexandre Julliard Feb. 13, 2008

Feb. 13, 2008

Module: wine Branch: master Commit: 98b8699b2241a7cca7e23277c0843113227037f2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=98b8699b2241a7cca7e23277c… Author: Frans Kool <Frans.Kool(a)gmail.com> Date: Tue Feb 12 23:00:27 2008 +0100 regedit: Added Dutch translations. --- programs/regedit/Nl.rc | 19 ++++++++++++++++++- 1 files changed, 18 insertions(+), 1 deletions(-) diff --git a/programs/regedit/Nl.rc b/programs/regedit/Nl.rc index 71c8b15..8d135a1 100644 --- a/programs/regedit/Nl.rc +++ b/programs/regedit/Nl.rc @@ -20,6 +20,7 @@ LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL + /* * Menu */ @@ -61,6 +62,7 @@ BEGIN MENUITEM "&Tekenreekswaarde", ID_EDIT_NEW_STRINGVALUE MENUITEM "&Binaire waarde", ID_EDIT_NEW_BINARYVALUE MENUITEM "&DWORD-waarde", ID_EDIT_NEW_DWORDVALUE + MENUITEM "&Multi-Tekenreekswaarde", ID_EDIT_NEW_MULTI_STRINGVALUE END MENUITEM SEPARATOR MENUITEM "&Verwijderen\tDel", ID_EDIT_DELETE @@ -111,6 +113,7 @@ BEGIN MENUITEM "&Tekenreekswaarde", ID_EDIT_NEW_STRINGVALUE MENUITEM "&Binaire waarde", ID_EDIT_NEW_BINARYVALUE MENUITEM "&DWORD waarde", ID_EDIT_NEW_DWORDVALUE + MENUITEM "&Multi-Tekenreekswaarde",ID_EDIT_NEW_MULTI_STRINGVALUE END MENUITEM SEPARATOR MENUITEM "&Verwijderen\tDel", ID_EDIT_DELETE @@ -218,6 +221,19 @@ BEGIN PUSHBUTTON "Annuleren",IDCANCEL,165,80,40,11,WS_GROUP END +IDD_EDIT_MULTI_STRING DIALOG DISCARDABLE 22, 17, 210, 175 +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +CAPTION "Multi-tekenreeks bewerken" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "waardename:",IDC_STATIC,5,5,119,8 + EDITTEXT IDC_VALUE_NAME,5,15,200,12, WS_BORDER | WS_TABSTOP | ES_AUTOHSCROLL| WS_DISABLED + LTEXT "waardegegevens:",IDC_STATIC,5,30,119,8 + EDITTEXT IDC_VALUE_DATA,5,40,200,112, WS_BORDER | WS_TABSTOP | WS_HSCROLL | WS_VSCROLL | ES_MULTILINE | ES_WANTRETURN + DEFPUSHBUTTON "OK",IDOK,140,160,30,11,WS_GROUP + PUSHBUTTON "Annuleren",IDCANCEL,175,160,30,11,WS_GROUP +END + /* * String Table */ @@ -253,6 +269,7 @@ BEGIN ID_EDIT_NEW_STRINGVALUE "Een nieuwe tekenreekswaarde toevoegen" ID_EDIT_NEW_BINARYVALUE "Een nieuwe binaire waarde toevoegen" ID_EDIT_NEW_DWORDVALUE "Een nieuwe DWORD-waarde toevoegen" + ID_EDIT_NEW_MULTI_STRINGVALUE "Een nieuwe multi-tekenreekswaarde toevoegen" ID_REGISTRY_IMPORTREGISTRYFILE "Een tekstbestand in het register importeren" ID_REGISTRY_EXPORTREGISTRYFILE "Het register of een gedeelte ervan naar een tekstbestand exporteren" @@ -261,7 +278,7 @@ BEGIN ID_REGISTRY_DISCONNECTNETWORKREGISTRY "De verbinding met het register van een externe computer verbreken" ID_REGISTRY_PRINT "Het register of een gedeelte ervan afdrukken" - ID_HELP_HELPTOPICS "Help voor de Register-editor openen" +/* ID_HELP_HELPTOPICS "Help voor de Register-editor openen" */ ID_HELP_ABOUT "Programmagegevens, versienummer en copyrightgegevens weergeven" END

1 0

Dmitry Timoshkov : user32: Add a couple of tests for WS_EX_TOPMOST.
by Alexandre Julliard Feb. 12, 2008

Feb. 12, 2008

Module: wine Branch: master Commit: 066c60eb312609737b4b66e69c91750612364b05 URL: http://source.winehq.org/git/wine.git/?a=commit;h=066c60eb312609737b4b66e69… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Thu Feb 7 23:03:39 2008 +0800 user32: Add a couple of tests for WS_EX_TOPMOST. --- dlls/user32/tests/win.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index d0a9673..7e4c98c 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -1857,6 +1857,14 @@ static void test_SetWindowPos(HWND hwnd) SetWindowPos(hwnd, 0, orig_win_rc.left, orig_win_rc.top, orig_win_rc.right, orig_win_rc.bottom, 0); + + ok(!(GetWindowLong(hwnd, GWL_EXSTYLE) & WS_EX_TOPMOST), "WS_EX_TOPMOST should not be set\n"); + SetWindowPos(hwnd, HWND_TOPMOST, 0, 0, 0, 0, SWP_NOSIZE|SWP_NOMOVE); + ok(GetWindowLong(hwnd, GWL_EXSTYLE) & WS_EX_TOPMOST, "WS_EX_TOPMOST should be set\n"); + SetWindowPos(hwnd, HWND_TOP, 0, 0, 0, 0, SWP_NOSIZE|SWP_NOMOVE); + ok(GetWindowLong(hwnd, GWL_EXSTYLE) & WS_EX_TOPMOST, "WS_EX_TOPMOST should be set\n"); + SetWindowPos(hwnd, HWND_NOTOPMOST, 0, 0, 0, 0, SWP_NOSIZE|SWP_NOMOVE); + ok(!(GetWindowLong(hwnd, GWL_EXSTYLE) & WS_EX_TOPMOST), "WS_EX_TOPMOST should not be set\n"); } static void test_SetMenu(HWND parent)

1 0

Erich Hoover : kernel32: Implement ReplaceFileA.
by Alexandre Julliard Feb. 12, 2008

Feb. 12, 2008

Module: wine Branch: master Commit: 06a3c3a281f4af6f6d37caf97a9234e183a5338f URL: http://source.winehq.org/git/wine.git/?a=commit;h=06a3c3a281f4af6f6d37caf97… Author: Erich Hoover <ehoover(a)mines.edu> Date: Tue Feb 12 23:02:34 2008 +0100 kernel32: Implement ReplaceFileA. --- dlls/kernel32/file.c | 35 +++++++++++++++++++++++++++++++---- 1 files changed, 31 insertions(+), 4 deletions(-) diff --git a/dlls/kernel32/file.c b/dlls/kernel32/file.c index 4e05c28..acc762b 100644 --- a/dlls/kernel32/file.c +++ b/dlls/kernel32/file.c @@ -1542,10 +1542,37 @@ BOOL WINAPI ReplaceFileA(LPCSTR lpReplacedFileName,LPCSTR lpReplacementFileName, LPCSTR lpBackupFileName, DWORD dwReplaceFlags, LPVOID lpExclude, LPVOID lpReserved) { - FIXME("(%s,%s,%s,%08x,%p,%p) stub\n",lpReplacedFileName,lpReplacementFileName, - lpBackupFileName,dwReplaceFlags,lpExclude,lpReserved); - SetLastError(ERROR_UNABLE_TO_MOVE_REPLACEMENT); - return FALSE; + WCHAR *replacedW, *replacementW, *backupW = NULL; + BOOL ret; + + /* This function only makes sense when the first two parameters are defined */ + if (!lpReplacedFileName || !(replacedW = FILE_name_AtoW( lpReplacedFileName, TRUE ))) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + if (!lpReplacementFileName || !(replacementW = FILE_name_AtoW( lpReplacementFileName, TRUE ))) + { + HeapFree( GetProcessHeap(), 0, replacedW ); + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + /* The backup parameter, however, is optional */ + if (lpBackupFileName) + { + if (!(backupW = FILE_name_AtoW( lpBackupFileName, TRUE ))) + { + HeapFree( GetProcessHeap(), 0, replacedW ); + HeapFree( GetProcessHeap(), 0, replacementW ); + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + } + ret = ReplaceFileW( replacedW, replacementW, backupW, dwReplaceFlags, lpExclude, lpReserved ); + HeapFree( GetProcessHeap(), 0, replacedW ); + HeapFree( GetProcessHeap(), 0, replacementW ); + HeapFree( GetProcessHeap(), 0, backupW ); + return ret; }

1 0

Rob Shearman : kernel32: Implement ReplaceFileW.
by Alexandre Julliard Feb. 12, 2008

Feb. 12, 2008

Module: wine Branch: master Commit: c72de7bce2c4c5bda08caa61f140fb4a5358997f URL: http://source.winehq.org/git/wine.git/?a=commit;h=c72de7bce2c4c5bda08caa61f… Author: Rob Shearman <rob(a)codeweavers.com> Date: Thu Feb 7 12:43:25 2008 +0000 kernel32: Implement ReplaceFileW. Based on a patch by Erich Hoover. --- dlls/kernel32/file.c | 163 ++++++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 158 insertions(+), 5 deletions(-) diff --git a/dlls/kernel32/file.c b/dlls/kernel32/file.c index acc762b..a5da6c6 100644 --- a/dlls/kernel32/file.c +++ b/dlls/kernel32/file.c @@ -1524,14 +1524,167 @@ BOOL WINAPI DeleteFileA( LPCSTR path ) * ReplaceFileW (KERNEL32.@) * ReplaceFile (KERNEL32.@) */ -BOOL WINAPI ReplaceFileW(LPCWSTR lpReplacedFileName,LPCWSTR lpReplacementFileName, +BOOL WINAPI ReplaceFileW(LPCWSTR lpReplacedFileName, LPCWSTR lpReplacementFileName, LPCWSTR lpBackupFileName, DWORD dwReplaceFlags, LPVOID lpExclude, LPVOID lpReserved) { - FIXME("(%s,%s,%s,%08x,%p,%p) stub\n",debugstr_w(lpReplacedFileName),debugstr_w(lpReplacementFileName), - debugstr_w(lpBackupFileName),dwReplaceFlags,lpExclude,lpReserved); - SetLastError(ERROR_UNABLE_TO_MOVE_REPLACEMENT); - return FALSE; + UNICODE_STRING nt_replaced_name, nt_replacement_name; + ANSI_STRING unix_replaced_name, unix_replacement_name, unix_backup_name; + HANDLE hReplaced = NULL, hReplacement = NULL, hBackup = NULL; + DWORD error = ERROR_SUCCESS; + UINT replaced_flags; + BOOL ret = FALSE; + NTSTATUS status; + IO_STATUS_BLOCK io; + OBJECT_ATTRIBUTES attr; + + if (dwReplaceFlags) + FIXME("Ignoring flags %x\n", dwReplaceFlags); + + /* First two arguments are mandatory */ + if (!lpReplacedFileName || !lpReplacementFileName) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + unix_replaced_name.Buffer = NULL; + unix_replacement_name.Buffer = NULL; + unix_backup_name.Buffer = NULL; + + attr.Length = sizeof(attr); + attr.RootDirectory = 0; + attr.Attributes = OBJ_CASE_INSENSITIVE; + attr.ObjectName = NULL; + attr.SecurityDescriptor = NULL; + attr.SecurityQualityOfService = NULL; + + /* Open the "replaced" file for reading and writing */ + if (!(RtlDosPathNameToNtPathName_U(lpReplacedFileName, &nt_replaced_name, NULL, NULL))) + { + error = ERROR_PATH_NOT_FOUND; + goto fail; + } + replaced_flags = lpBackupFileName ? FILE_OPEN : FILE_OPEN_IF; + attr.ObjectName = &nt_replaced_name; + status = NtOpenFile(&hReplaced, GENERIC_READ|GENERIC_WRITE|DELETE|SYNCHRONIZE, + &attr, &io, + FILE_SHARE_READ|FILE_SHARE_WRITE|FILE_SHARE_DELETE, + FILE_SYNCHRONOUS_IO_NONALERT|FILE_NON_DIRECTORY_FILE); + if (status == STATUS_SUCCESS) + status = wine_nt_to_unix_file_name(&nt_replaced_name, &unix_replaced_name, replaced_flags, FALSE); + RtlFreeUnicodeString(&nt_replaced_name); + if (status != STATUS_SUCCESS) + { + if (status == STATUS_OBJECT_NAME_NOT_FOUND) + error = ERROR_FILE_NOT_FOUND; + else + error = ERROR_UNABLE_TO_REMOVE_REPLACED; + goto fail; + } + + /* + * Open the replacement file for reading, writing, and deleting + * (writing and deleting are needed when finished) + */ + if (!(RtlDosPathNameToNtPathName_U(lpReplacementFileName, &nt_replacement_name, NULL, NULL))) + { + error = ERROR_PATH_NOT_FOUND; + goto fail; + } + attr.ObjectName = &nt_replacement_name; + status = NtOpenFile(&hReplacement, + GENERIC_READ|GENERIC_WRITE|DELETE|WRITE_DAC|SYNCHRONIZE, + &attr, &io, 0, + FILE_SYNCHRONOUS_IO_NONALERT|FILE_NON_DIRECTORY_FILE); + if (status == STATUS_SUCCESS) + status = wine_nt_to_unix_file_name(&nt_replacement_name, &unix_replacement_name, FILE_OPEN, FALSE); + RtlFreeUnicodeString(&nt_replacement_name); + if (status != STATUS_SUCCESS) + { + error = RtlNtStatusToDosError(status); + goto fail; + } + + /* If the user wants a backup then that needs to be performed first */ + if (lpBackupFileName) + { + UNICODE_STRING nt_backup_name; + FILE_BASIC_INFORMATION replaced_info; + + /* Obtain the file attributes from the "replaced" file */ + status = NtQueryInformationFile(hReplaced, &io, &replaced_info, + sizeof(replaced_info), + FileBasicInformation); + if (status != STATUS_SUCCESS) + { + error = RtlNtStatusToDosError(status); + goto fail; + } + + if (!(RtlDosPathNameToNtPathName_U(lpBackupFileName, &nt_backup_name, NULL, NULL))) + { + error = ERROR_PATH_NOT_FOUND; + goto fail; + } + attr.ObjectName = &nt_backup_name; + /* Open the backup with permissions to write over it */ + status = NtCreateFile(&hBackup, GENERIC_WRITE, + &attr, &io, NULL, replaced_info.FileAttributes, + FILE_SHARE_WRITE, FILE_OPEN_IF, + FILE_SYNCHRONOUS_IO_NONALERT|FILE_NON_DIRECTORY_FILE, + NULL, 0); + if (status == STATUS_SUCCESS) + status = wine_nt_to_unix_file_name(&nt_backup_name, &unix_backup_name, FILE_OPEN_IF, FALSE); + if (status != STATUS_SUCCESS) + { + error = RtlNtStatusToDosError(status); + goto fail; + } + + /* If an existing backup exists then copy over it */ + if (rename(unix_replaced_name.Buffer, unix_backup_name.Buffer) == -1) + { + error = ERROR_UNABLE_TO_REMOVE_REPLACED; /* is this correct? */ + goto fail; + } + } + + /* + * Now that the backup has been performed (if requested), copy the replacement + * into place + */ + if (rename(unix_replacement_name.Buffer, unix_replaced_name.Buffer) == -1) + { + if (errno == EACCES) + { + /* Inappropriate permissions on "replaced", rename will fail */ + error = ERROR_UNABLE_TO_REMOVE_REPLACED; + goto fail; + } + /* on failure we need to indicate whether a backup was made */ + if (!lpBackupFileName) + error = ERROR_UNABLE_TO_MOVE_REPLACEMENT; + else + error = ERROR_UNABLE_TO_MOVE_REPLACEMENT_2; + goto fail; + } + /* Success! */ + ret = TRUE; + + /* Perform resource cleanup */ +fail: + if (hBackup) CloseHandle(hBackup); + if (hReplaced) CloseHandle(hReplaced); + if (hReplacement) CloseHandle(hReplacement); + RtlFreeAnsiString(&unix_backup_name); + RtlFreeAnsiString(&unix_replacement_name); + RtlFreeAnsiString(&unix_replaced_name); + + /* If there was an error, set the error code */ + if(!ret) + SetLastError(error); + return ret; }

1 0

Andrew Talbot : comctl32: Assign to structs instead of using memcpy.
by Alexandre Julliard Feb. 12, 2008

Feb. 12, 2008

Module: wine Branch: master Commit: 8d555e825b3b3e52269c673fadcef77f71b5883c URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d555e825b3b3e52269c673fa… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Tue Feb 12 21:13:06 2008 +0000 comctl32: Assign to structs instead of using memcpy. --- dlls/comctl32/comboex.c | 2 +- dlls/comctl32/rebar.c | 4 ++-- dlls/comctl32/toolbar.c | 8 ++++---- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/comctl32/comboex.c b/dlls/comctl32/comboex.c index 379d964..a98243d 100644 --- a/dlls/comctl32/comboex.c +++ b/dlls/comctl32/comboex.c @@ -243,7 +243,7 @@ static INT COMBOEX_NotifyEndEdit (COMBOEX_INFO *infoPtr, NMCBEENDEDITW *neew, LP } else { NMCBEENDEDITA neea; - memcpy (&neea.hdr, &neew->hdr, sizeof(NMHDR)); + neea.hdr = neew->hdr; neea.fChanged = neew->fChanged; neea.iNewSelection = neew->iNewSelection; WideCharToMultiByte (CP_ACP, 0, wstr, -1, neea.szText, CBEMAXSTRLEN, 0, 0); diff --git a/dlls/comctl32/rebar.c b/dlls/comctl32/rebar.c index fa3033a..92c1922 100644 --- a/dlls/comctl32/rebar.c +++ b/dlls/comctl32/rebar.c @@ -2423,7 +2423,7 @@ REBAR_MoveBand (REBAR_INFO *infoPtr, WPARAM wParam, LPARAM lParam) } /* save one to be moved */ - memcpy (&holder, &oldBands[uFrom], sizeof(REBAR_BAND)); + holder = oldBands[uFrom]; /* close up rest of bands (pseudo delete) */ if (uFrom < infoPtr->uNumBands - 1) { @@ -2442,7 +2442,7 @@ REBAR_MoveBand (REBAR_INFO *infoPtr, WPARAM wParam, LPARAM lParam) } /* set moved band */ - memcpy (&infoPtr->bands[uTo], &holder, sizeof(REBAR_BAND)); + infoPtr->bands[uTo] = holder; /* post copy */ if (uTo < infoPtr->uNumBands - 1) { diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c index 6d88461..b14b7a7 100644 --- a/dlls/comctl32/toolbar.c +++ b/dlls/comctl32/toolbar.c @@ -2087,7 +2087,7 @@ static void TOOLBAR_Cust_AddButton(const CUSTDLG_INFO *custInfo, HWND hwnd, INT /* duplicate 'separator' button */ btnNew = (PCUSTOMBUTTON)Alloc(sizeof(CUSTOMBUTTON)); - memcpy(btnNew, btnInfo, sizeof(CUSTOMBUTTON)); + *btnNew = *btnInfo; btnInfo = btnNew; } @@ -2370,7 +2370,7 @@ TOOLBAR_CustomizeDialogProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) IDC_TOOLBARBTN_LBOX, LB_GETITEMDATA, index, 0); } - memcpy (&btnInfo->btn, &nmtb.tbButton, sizeof(TBBUTTON)); + btnInfo->btn = nmtb.tbButton; if (!(nmtb.tbButton.fsStyle & BTNS_SEP)) { if (lstrlenW(nmtb.pszText)) @@ -6455,7 +6455,7 @@ TOOLBAR_Paint (HWND hwnd, WPARAM wParam) PAINTSTRUCT ps; /* fill ps.rcPaint with a default rect */ - memcpy(&(ps.rcPaint), &(infoPtr->rcBound), sizeof(infoPtr->rcBound)); + ps.rcPaint = infoPtr->rcBound; hdc = wParam==0 ? BeginPaint(hwnd, &ps) : (HDC)wParam; @@ -7179,7 +7179,7 @@ static BOOL TOOLBAR_GetButtonInfo(const TOOLBAR_INFO *infoPtr, NMTOOLBARW *nmtb) MultiByteToWideChar(CP_ACP, 0, (LPCSTR)nmtba.pszText, -1, nmtb->pszText, nmtb->cchText); - memcpy(&nmtb->tbButton, &nmtba.tbButton, sizeof(TBBUTTON)); + nmtb->tbButton = nmtba.tbButton; bRet = TRUE; }

1 0

Erich Hoover : kernel32: Add tests for ReplaceFileA and ReplaceFileW.
by Alexandre Julliard Feb. 12, 2008

Feb. 12, 2008

Module: wine Branch: master Commit: 664c68a2c95eb28bb26f56294402a1e281ab1b96 URL: http://source.winehq.org/git/wine.git/?a=commit;h=664c68a2c95eb28bb26f56294… Author: Erich Hoover <ehoover(a)mines.edu> Date: Tue Feb 12 23:03:37 2008 +0100 kernel32: Add tests for ReplaceFileA and ReplaceFileW. --- dlls/kernel32/tests/file.c | 252 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 252 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=664c68a2c95eb28bb26f5…

1 0

Eric Pouech : dbghelp: Fix erroneous access to dwarf symbol cache.
by Alexandre Julliard Feb. 12, 2008

Feb. 12, 2008

Module: wine Branch: master Commit: 4823663957b9cc92e5387e614ea4478d6501d0af URL: http://source.winehq.org/git/wine.git/?a=commit;h=4823663957b9cc92e5387e614… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Tue Feb 12 21:25:33 2008 +0100 dbghelp: Fix erroneous access to dwarf symbol cache. (Spotted by Dan Kegel with valgrind). --- dlls/dbghelp/dwarf.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index aee3dea..81f3c7f 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -980,7 +980,7 @@ static struct symt* dwarf2_parse_base_type(dwarf2_parse_context_t* ctx, break; default: break; } - if (!ctx->symt_cache[cache_idx]) + if (cache_idx != -1 && !ctx->symt_cache[cache_idx]) ctx->symt_cache[cache_idx] = di->symt; if (di->abbrev->have_child) FIXME("Unsupported children\n");

1 0

James Hawkins : msi: Read the language info from the file.
by Alexandre Julliard Feb. 12, 2008

Feb. 12, 2008

Module: wine Branch: master Commit: 4cc569cce6cdbf7c2053e1eee979b9e8e6619b42 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4cc569cce6cdbf7c2053e1eee… Author: James Hawkins <truiken(a)gmail.com> Date: Tue Feb 12 01:36:34 2008 -0600 msi: Read the language info from the file. --- dlls/msi/msi.c | 26 ++++++++++++++++++-------- 1 files changed, 18 insertions(+), 8 deletions(-) diff --git a/dlls/msi/msi.c b/dlls/msi/msi.c index bee273d..7840a4c 100644 --- a/dlls/msi/msi.c +++ b/dlls/msi/msi.c @@ -1622,11 +1622,15 @@ UINT WINAPI MsiGetFileVersionW(LPCWSTR szFilePath, LPWSTR lpVersionBuf, static const WCHAR szVersionResource[] = {'\\',0}; static const WCHAR szVersionFormat[] = { '%','d','.','%','d','.','%','d','.','%','d',0}; + static const WCHAR szLangResource[] = { + '\\','V','a','r','F','i','l','e','I','n','f','o','\\', + 'T','r','a','n','s','l','a','t','i','o','n',0}; static const WCHAR szLangFormat[] = {'%','d',0}; UINT ret = 0; DWORD dwVerLen, gle; LPVOID lpVer = NULL; VS_FIXEDFILEINFO *ffi; + USHORT *lang; UINT puLen; WCHAR tmp[32]; @@ -1687,16 +1691,22 @@ UINT WINAPI MsiGetFileVersionW(LPCWSTR szFilePath, LPWSTR lpVersionBuf, if (pcchLangBuf) { - DWORD lang = GetUserDefaultLangID(); - - FIXME("Retrieve language from file\n"); - wsprintfW(tmp, szLangFormat, lang); - if (lpLangBuf) lstrcpynW(lpLangBuf, tmp, *pcchLangBuf); + if (VerQueryValueW(lpVer, szLangResource, (LPVOID*)&lang, &puLen) && + (puLen > 0)) + { + wsprintfW(tmp, szLangFormat, *lang); + if (lpLangBuf) lstrcpynW(lpLangBuf, tmp, *pcchLangBuf); - if (lstrlenW(tmp) >= *pcchLangBuf) - ret = ERROR_MORE_DATA; + if (lstrlenW(tmp) >= *pcchLangBuf) + ret = ERROR_MORE_DATA; - *pcchLangBuf = lstrlenW(tmp); + *pcchLangBuf = lstrlenW(tmp); + } + else + { + if (lpLangBuf) *lpLangBuf = 0; + *pcchLangBuf = 0; + } } end:

1 0

James Hawkins : msi: Handle carriage returns in MsiDatabaseImport.
by Alexandre Julliard Feb. 12, 2008

Feb. 12, 2008

Module: wine Branch: master Commit: ec086f77e3261dacb501b0f03265cd68cbaaa44e URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec086f77e3261dacb501b0f03… Author: James Hawkins <truiken(a)gmail.com> Date: Tue Feb 12 01:37:56 2008 -0600 msi: Handle carriage returns in MsiDatabaseImport. --- dlls/msi/database.c | 22 +++++++-- dlls/msi/tests/automation.c | 1 + dlls/msi/tests/db.c | 98 ++++++++++++++++--------------------------- 3 files changed, 54 insertions(+), 67 deletions(-) diff --git a/dlls/msi/database.c b/dlls/msi/database.c index a7dc285..425486e 100644 --- a/dlls/msi/database.c +++ b/dlls/msi/database.c @@ -317,12 +317,18 @@ static void msi_parse_line(LPWSTR *line, LPWSTR **entries, DWORD *num_entries) /* store pointers into the data */ for (i = 0, ptr = *line; i < count; i++) { + while (*ptr && *ptr == '\r') ptr++; save = ptr; - while (*ptr && *ptr != '\t' && *ptr != '\n') ptr++; + while (*ptr && *ptr != '\t' && *ptr != '\n' && *ptr != '\r') ptr++; /* NULL-separate the data */ - if (*ptr) + if (*ptr == '\n' || *ptr == '\r') + { + while (*ptr == '\n' || *ptr == '\r') + *(ptr++) = '\0'; + } + else if (*ptr) *ptr++ = '\0'; (*entries)[i] = save; @@ -598,11 +604,11 @@ UINT MSI_DatabaseImport(MSIDATABASE *db, LPCWSTR folder, LPCWSTR file) { UINT r; DWORD len, i; - DWORD num_labels; + DWORD num_labels, num_types; DWORD num_columns, num_records = 0; LPWSTR *columns, *types, *labels; LPWSTR path, ptr, data; - LPWSTR **records; + LPWSTR **records = NULL; LPWSTR **temp_records; static const WCHAR backslash[] = {'\\',0}; @@ -625,9 +631,15 @@ UINT MSI_DatabaseImport(MSIDATABASE *db, LPCWSTR folder, LPCWSTR file) ptr = data; msi_parse_line( &ptr, &columns, &num_columns ); - msi_parse_line( &ptr, &types, NULL ); + msi_parse_line( &ptr, &types, &num_types ); msi_parse_line( &ptr, &labels, &num_labels ); + if (num_columns != num_types) + { + r = ERROR_FUNCTION_FAILED; + goto done; + } + records = msi_alloc(sizeof(LPWSTR *)); if (!records) { diff --git a/dlls/msi/tests/automation.c b/dlls/msi/tests/automation.c index 3ae4a7b..8cf764e 100644 --- a/dlls/msi/tests/automation.c +++ b/dlls/msi/tests/automation.c @@ -272,6 +272,7 @@ static void create_database(const CHAR *name, const msi_table *tables, int num_t write_file(table->filename, table->data, (table->size - 1) * sizeof(char)); + printf("table->filename: %s\n", table->filename); r = MsiDatabaseImportA(db, CURR_DIR, table->filename); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); diff --git a/dlls/msi/tests/db.c b/dlls/msi/tests/db.c index 684379e..fa3b55b 100644 --- a/dlls/msi/tests/db.c +++ b/dlls/msi/tests/db.c @@ -1643,10 +1643,7 @@ static void test_msiimport(void) ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); r = add_table_to_db(hdb, endlines1); - todo_wine - { - ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); - } + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); r = add_table_to_db(hdb, endlines2); ok(r == ERROR_FUNCTION_FAILED, @@ -1749,7 +1746,8 @@ static void test_msiimport(void) MsiCloseHandle(rec); r = MsiViewFetch(view, &rec); - ok(r == ERROR_NO_MORE_ITEMS, "Expected ERROR_NO_MORE_ITEMS, got %d\n", r); + ok(r == ERROR_NO_MORE_ITEMS, + "Expected ERROR_NO_MORE_ITEMS, got %d\n", r); r = MsiViewClose(view); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); @@ -1758,37 +1756,28 @@ static void test_msiimport(void) query = "SELECT * FROM `Table`"; r = MsiDatabaseOpenView(hdb, query, &view); - todo_wine - { - ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); - } + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); r = MsiViewGetColumnInfo(view, MSICOLINFO_NAMES, &rec); count = MsiRecordGetFieldCount(rec); - todo_wine - { - ok(count == 6, "Expected 6, got %d\n", count); - ok(check_record(rec, 1, "A"), "Expected A\n"); - ok(check_record(rec, 2, "B"), "Expected B\n"); - ok(check_record(rec, 3, "C"), "Expected C\n"); - ok(check_record(rec, 4, "D"), "Expected D\n"); - ok(check_record(rec, 5, "E"), "Expected E\n"); - ok(check_record(rec, 6, "F"), "Expected F\n"); - } + ok(count == 6, "Expected 6, got %d\n", count); + ok(check_record(rec, 1, "A"), "Expected A\n"); + ok(check_record(rec, 2, "B"), "Expected B\n"); + ok(check_record(rec, 3, "C"), "Expected C\n"); + ok(check_record(rec, 4, "D"), "Expected D\n"); + ok(check_record(rec, 5, "E"), "Expected E\n"); + ok(check_record(rec, 6, "F"), "Expected F\n"); MsiCloseHandle(rec); r = MsiViewGetColumnInfo(view, MSICOLINFO_TYPES, &rec); count = MsiRecordGetFieldCount(rec); - todo_wine - { - ok(count == 6, "Expected 6, got %d\n", count); - ok(check_record(rec, 1, "s72"), "Expected s72\n"); - ok(check_record(rec, 2, "s72"), "Expected s72\n"); - ok(check_record(rec, 3, "s72"), "Expected s72\n"); - ok(check_record(rec, 4, "s72"), "Expected s72\n"); - ok(check_record(rec, 5, "s72"), "Expected s72\n"); - ok(check_record(rec, 6, "s72"), "Expected s72\n"); - } + ok(count == 6, "Expected 6, got %d\n", count); + ok(check_record(rec, 1, "s72"), "Expected s72\n"); + ok(check_record(rec, 2, "s72"), "Expected s72\n"); + ok(check_record(rec, 3, "s72"), "Expected s72\n"); + ok(check_record(rec, 4, "s72"), "Expected s72\n"); + ok(check_record(rec, 5, "s72"), "Expected s72\n"); + ok(check_record(rec, 6, "s72"), "Expected s72\n"); MsiCloseHandle(rec); MsiViewClose(view); @@ -1796,51 +1785,36 @@ static void test_msiimport(void) query = "SELECT * FROM `Table`"; r = MsiDatabaseOpenView(hdb, query, &view); - todo_wine - { - ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); - } + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); r = MsiViewExecute(view, 0); - todo_wine - { - ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); - } + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); r = MsiViewFetch(view, &rec); - todo_wine - { - ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); - ok(check_record(rec, 1, "a"), "Expected 'a'\n"); - ok(check_record(rec, 2, "b"), "Expected 'b'\n"); - ok(check_record(rec, 3, "c"), "Expected 'c'\n"); - ok(check_record(rec, 4, "d"), "Expected 'd'\n"); - ok(check_record(rec, 5, "e"), "Expected 'e'\n"); - ok(check_record(rec, 6, "f"), "Expected 'f'\n"); - } + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + ok(check_record(rec, 1, "a"), "Expected 'a'\n"); + ok(check_record(rec, 2, "b"), "Expected 'b'\n"); + ok(check_record(rec, 3, "c"), "Expected 'c'\n"); + ok(check_record(rec, 4, "d"), "Expected 'd'\n"); + ok(check_record(rec, 5, "e"), "Expected 'e'\n"); + ok(check_record(rec, 6, "f"), "Expected 'f'\n"); MsiCloseHandle(rec); r = MsiViewFetch(view, &rec); - todo_wine - { - ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); - ok(check_record(rec, 1, "g"), "Expected 'g'\n"); - ok(check_record(rec, 2, "h"), "Expected 'h'\n"); - ok(check_record(rec, 3, "i"), "Expected 'i'\n"); - ok(check_record(rec, 4, "j"), "Expected 'j'\n"); - ok(check_record(rec, 5, "k"), "Expected 'k'\n"); - ok(check_record(rec, 6, "l"), "Expected 'l'\n"); - } + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + ok(check_record(rec, 1, "g"), "Expected 'g'\n"); + ok(check_record(rec, 2, "h"), "Expected 'h'\n"); + ok(check_record(rec, 3, "i"), "Expected 'i'\n"); + ok(check_record(rec, 4, "j"), "Expected 'j'\n"); + ok(check_record(rec, 5, "k"), "Expected 'k'\n"); + ok(check_record(rec, 6, "l"), "Expected 'l'\n"); MsiCloseHandle(rec); r = MsiViewFetch(view, &rec); - todo_wine - { - ok(r == ERROR_NO_MORE_ITEMS, - "Expected ERROR_NO_MORE_ITEMS, got %d\n", r); - } + ok(r == ERROR_NO_MORE_ITEMS, + "Expected ERROR_NO_MORE_ITEMS, got %d\n", r); MsiViewClose(view); MsiCloseHandle(view);

1 0

James Hawkins : msi: Reimplement MsiGetProductInfo.
by Alexandre Julliard Feb. 12, 2008

Feb. 12, 2008

Module: wine Branch: master Commit: 1f3d6a974412d756ddbde0d241db199bc70a165b URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f3d6a974412d756ddbde0d24… Author: James Hawkins <truiken(a)gmail.com> Date: Tue Feb 12 01:35:46 2008 -0600 msi: Reimplement MsiGetProductInfo. --- dlls/msi/msi.c | 193 ++++++++++++------- dlls/msi/msipriv.h | 1 + dlls/msi/registry.c | 2 - dlls/msi/tests/automation.c | 9 +- dlls/msi/tests/msi.c | 454 ++++++++++++++----------------------------- 5 files changed, 274 insertions(+), 385 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1f3d6a974412d756ddbde…

1 0