February 2008 - Wine-commits

Huw Davies : inetcomm: Create a body tree for multipart messages.
by Alexandre Julliard 13 Feb '08

13 Feb '08

Module: wine Branch: master Commit: db4881cfb627350dad34dd0a2d2be166c5917b34 URL: http://source.winehq.org/git/wine.git/?a=commit;h=db4881cfb627350dad34dd0a2… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Feb 12 11:36:31 2008 +0000 inetcomm: Create a body tree for multipart messages. --- dlls/inetcomm/mimeole.c | 133 ++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 132 insertions(+), 1 deletions(-) diff --git a/dlls/inetcomm/mimeole.c b/dlls/inetcomm/mimeole.c index 707a1e0..bdce35b 100644 --- a/dlls/inetcomm/mimeole.c +++ b/dlls/inetcomm/mimeole.c @@ -1446,6 +1446,97 @@ static body_t *new_body_entry(IMimeBody *mime_body, HBODY hbody, body_t *parent) return body; } +typedef struct +{ + struct list entry; + BODYOFFSETS offsets; +} offset_entry_t; + +static HRESULT create_body_offset_list(IStream *stm, const char *boundary, struct list *body_offsets) +{ + HRESULT hr; + DWORD read; + int boundary_len = strlen(boundary); + char *buf, *nl_boundary, *ptr, *overlap; + DWORD total_read = 0; + DWORD start = 0, overlap_no; + offset_entry_t *cur_body = NULL; + ULARGE_INTEGER cur; + LARGE_INTEGER zero; + + list_init(body_offsets); + nl_boundary = HeapAlloc(GetProcessHeap(), 0, 4 + boundary_len + 1); + memcpy(nl_boundary, "\r\n--", 4); + memcpy(nl_boundary + 4, boundary, boundary_len + 1); + + overlap_no = boundary_len + 5; + + overlap = buf = HeapAlloc(GetProcessHeap(), 0, overlap_no + PARSER_BUF_SIZE + 1); + + zero.QuadPart = 0; + hr = IStream_Seek(stm, zero, STREAM_SEEK_CUR, &cur); + start = cur.LowPart; + + do { + hr = IStream_Read(stm, overlap, PARSER_BUF_SIZE, &read); + if(FAILED(hr)) goto end; + if(read == 0) break; + total_read += read; + overlap[read] = '\0'; + + ptr = buf; + do { + ptr = strstr(ptr, nl_boundary); + if(ptr) + { + DWORD boundary_start = start + ptr - buf; + char *end = ptr + boundary_len + 4; + + if(*end == '\0' || *(end + 1) == '\0') + break; + + if(*end == '\r' && *(end + 1) == '\n') + { + if(cur_body) + { + cur_body->offsets.cbBodyEnd = boundary_start; + list_add_tail(body_offsets, &cur_body->entry); + } + cur_body = HeapAlloc(GetProcessHeap(), 0, sizeof(*cur_body)); + cur_body->offsets.cbBoundaryStart = boundary_start + 2; /* doesn't including the leading \r\n */ + cur_body->offsets.cbHeaderStart = boundary_start + boundary_len + 6; + } + else if(*end == '-' && *(end + 1) == '-') + { + if(cur_body) + { + cur_body->offsets.cbBodyEnd = boundary_start; + list_add_tail(body_offsets, &cur_body->entry); + goto end; + } + } + ptr = end + 2; + } + } while(ptr); + + if(overlap == buf) /* 1st iteration */ + { + memcpy(buf, buf + PARSER_BUF_SIZE - overlap_no, overlap_no); + overlap = buf + overlap_no; + start += read - overlap_no; + } + else + { + memcpy(buf, buf + PARSER_BUF_SIZE, overlap_no); + start += read; + } + } while(1); + +end: + HeapFree(GetProcessHeap(), 0, buf); + return hr; +} + static body_t *create_sub_body(MimeMessage *msg, IStream *pStm, BODYOFFSETS *offset, body_t *parent) { IMimeBody *mime_body; @@ -1458,11 +1549,51 @@ static body_t *create_sub_body(MimeMessage *msg, IStream *pStm, BODYOFFSETS *off IMimeBody_Load(mime_body, pStm); zero.QuadPart = 0; hr = IStream_Seek(pStm, zero, STREAM_SEEK_CUR, &cur); - offset->cbBodyStart = cur.LowPart; + offset->cbBodyStart = cur.LowPart + offset->cbHeaderStart; + if(parent) MimeBody_set_offsets(impl_from_IMimeBody(mime_body), offset); IMimeBody_SetData(mime_body, IET_BINARY, NULL, NULL, &IID_IStream, pStm); body = new_body_entry(mime_body, msg->next_hbody, parent); msg->next_hbody = (HBODY)((DWORD)msg->next_hbody + 1); + if(IMimeBody_IsContentType(mime_body, "multipart", NULL) == S_OK) + { + MIMEPARAMINFO *param_info; + ULONG count, i; + IMimeAllocator *alloc; + + hr = IMimeBody_GetParameters(mime_body, "Content-Type", &count, &param_info); + if(hr != S_OK || count == 0) return body; + + MimeOleGetAllocator(&alloc); + + for(i = 0; i < count; i++) + { + if(!strcasecmp(param_info[i].pszName, "boundary")) + { + struct list offset_list; + offset_entry_t *cur, *cursor2; + hr = create_body_offset_list(pStm, param_info[i].pszData, &offset_list); + LIST_FOR_EACH_ENTRY_SAFE(cur, cursor2, &offset_list, offset_entry_t, entry) + { + body_t *sub_body; + IStream *sub_stream; + ULARGE_INTEGER start, length; + + start.LowPart = cur->offsets.cbHeaderStart; + length.LowPart = cur->offsets.cbBodyEnd - cur->offsets.cbHeaderStart; + create_sub_stream(pStm, start, length, &sub_stream); + sub_body = create_sub_body(msg, sub_stream, &cur->offsets, body); + IStream_Release(sub_stream); + list_add_tail(&body->children, &sub_body->entry); + list_remove(&cur->entry); + HeapFree(GetProcessHeap(), 0, cur); + } + break; + } + } + IMimeAllocator_FreeParamInfoArray(alloc, count, param_info, TRUE); + IMimeAllocator_Release(alloc); + } return body; }

1 0

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

12 Feb '08

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: Implement ReplaceFileA.
by Alexandre Julliard 12 Feb '08

12 Feb '08

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 12 Feb '08

12 Feb '08

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

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

12 Feb '08

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

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

12 Feb '08

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

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

12 Feb '08

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: Reimplement MsiGetProductInfo.
by Alexandre Julliard 12 Feb '08

12 Feb '08

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

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

12 Feb '08

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: Use MsiViewModify instead of building a SQL query when adding rows to the table .
by Alexandre Julliard 12 Feb '08

12 Feb '08

Module: wine Branch: master Commit: 00cfd2899b7b8bf41c437170883ab0435b583eff URL: http://source.winehq.org/git/wine.git/?a=commit;h=00cfd2899b7b8bf41c4371708… Author: James Hawkins <truiken(a)gmail.com> Date: Tue Feb 12 01:37:14 2008 -0600 msi: Use MsiViewModify instead of building a SQL query when adding rows to the table. --- dlls/msi/database.c | 176 +++++++++++++++++---------------------------------- dlls/msi/tests/db.c | 24 ++----- 2 files changed, 63 insertions(+), 137 deletions(-) diff --git a/dlls/msi/database.c b/dlls/msi/database.c index 65db00b..a7dc285 100644 --- a/dlls/msi/database.c +++ b/dlls/msi/database.c @@ -509,156 +509,88 @@ static UINT msi_add_table_to_db(MSIDATABASE *db, LPWSTR *columns, LPWSTR *types, return r; } -static LPWSTR msi_build_insertsql_prelude(LPWSTR table) +static UINT construct_record(DWORD num_columns, LPWSTR *types, + LPWSTR *data, MSIRECORD **rec) { - LPWSTR prelude; - DWORD size; - - static const WCHAR insert_fmt[] = {'I','N','S','E','R','T',' ','I','N','T','O',' ','`','%','s','`',' ','(',' ',0}; - - size = sizeof(insert_fmt) + lstrlenW(table) - 2; - prelude = msi_alloc(size * sizeof(WCHAR)); - if (!prelude) - return NULL; - - sprintfW(prelude, insert_fmt, table); - return prelude; -} + UINT i; -static LPWSTR msi_build_insertsql_columns(LPWSTR *columns_data, LPWSTR *types, DWORD num_columns) -{ - LPWSTR columns, p; - DWORD sql_size = 1, i; - WCHAR expanded[128]; - - static const WCHAR column_fmt[] = {'`','%','s','`',',',' ',0}; - - columns = msi_alloc_zero(sql_size * sizeof(WCHAR)); - if (!columns) - return NULL; - - for (i = 0; i < num_columns; i++) - { - sprintfW(expanded, column_fmt, columns_data[i]); - sql_size += lstrlenW(expanded); - - if (i == num_columns - 1) - { - sql_size -= 2; - expanded[lstrlenW(expanded) - 2] = '\0'; - } - - p = msi_realloc(columns, sql_size * sizeof(WCHAR)); - if (!p) - { - msi_free(columns); - return NULL; - } - columns = p; - - lstrcatW(columns, expanded); - } - - return columns; -} - -static LPWSTR msi_build_insertsql_data(LPWSTR **records, LPWSTR *types, DWORD num_columns, DWORD irec) -{ - LPWSTR columns, temp_columns; - DWORD sql_size = 1, i; - WCHAR expanded[128]; - - static const WCHAR str_fmt[] = {'\'','%','s','\'',',',' ',0}; - static const WCHAR int_fmt[] = {'%','s',',',' ',0}; - static const WCHAR empty[] = {'\'','\'',',',' ',0}; - - columns = msi_alloc_zero(sql_size * sizeof(WCHAR)); - if (!columns) - return NULL; + *rec = MSI_CreateRecord(num_columns); + if (!*rec) + return ERROR_OUTOFMEMORY; for (i = 0; i < num_columns; i++) { switch (types[i][0]) { case 'L': case 'l': case 'S': case 's': - sprintfW(expanded, str_fmt, records[irec][i]); + MSI_RecordSetStringW(*rec, i + 1, data[i]); break; case 'I': case 'i': - if (*records[0][i]) - sprintfW(expanded, int_fmt, records[irec][i]); - else - lstrcpyW(expanded, empty); + if (*data[i]) + MSI_RecordSetInteger(*rec, i + 1, atoiW(data[i])); break; default: - HeapFree( GetProcessHeap(), 0, columns ); - return NULL; - } - - if (i == num_columns - 1) - expanded[lstrlenW(expanded) - 2] = '\0'; - - sql_size += lstrlenW(expanded); - temp_columns = msi_realloc(columns, sql_size * sizeof(WCHAR)); - if (!temp_columns) - { - HeapFree( GetProcessHeap(), 0, columns); - return NULL; + ERR("Unhandled column type: %c\n", types[i][0]); + msiobj_release(&(*rec)->hdr); + return ERROR_FUNCTION_FAILED; } - columns = temp_columns; - - lstrcatW(columns, expanded); } - return columns; + return ERROR_SUCCESS; } static UINT msi_add_records_to_table(MSIDATABASE *db, LPWSTR *columns, LPWSTR *types, LPWSTR *labels, LPWSTR **records, int num_columns, int num_records) { + UINT r; + DWORD i, size; MSIQUERY *view; - LPWSTR insert_sql; - DWORD size, i; - UINT r = ERROR_SUCCESS; + MSIRECORD *rec; + LPWSTR query; - static const WCHAR mid[] = {' ',')',' ','V','A','L','U','E','S',' ','(',' ',0}; - static const WCHAR end[] = {' ',')',0}; + static const WCHAR select[] = { + 'S','E','L','E','C','T',' ','*',' ', + 'F','R','O','M',' ','`','%','s','`',0 + }; - LPWSTR prelude = msi_build_insertsql_prelude(labels[0]); - LPWSTR columns_sql = msi_build_insertsql_columns(columns, types, num_columns); - - for (i = 0; i < num_records; i++) - { - LPWSTR data = msi_build_insertsql_data(records, types, num_columns, i); + size = lstrlenW(select) + lstrlenW(labels[0]) - 1; + query = msi_alloc(size * sizeof(WCHAR)); + if (!query) + return ERROR_OUTOFMEMORY; - size = lstrlenW(prelude) + lstrlenW(columns_sql) + sizeof(mid) + lstrlenW(data) + sizeof(end) - 1; - insert_sql = msi_alloc(size * sizeof(WCHAR)); - if (!insert_sql) - return ERROR_OUTOFMEMORY; - - lstrcpyW(insert_sql, prelude); - lstrcatW(insert_sql, columns_sql); - lstrcatW(insert_sql, mid); - lstrcatW(insert_sql, data); - lstrcatW(insert_sql, end); + sprintfW(query, select, labels[0]); - msi_free(data); + r = MSI_DatabaseOpenViewW(db, query, &view); + msi_free(query); + if (r != ERROR_SUCCESS) + return r; - r = MSI_DatabaseOpenViewW( db, insert_sql, &view ); - msi_free(insert_sql); + while (MSI_ViewFetch(view, &rec) != ERROR_NO_MORE_ITEMS) + { + r = MSI_ViewModify(view, MSIMODIFY_DELETE, rec); + if (r != ERROR_SUCCESS) + goto done; + } + for (i = 0; i < num_records; i++) + { + r = construct_record(num_columns, types, records[i], &rec); if (r != ERROR_SUCCESS) goto done; - r = MSI_ViewExecute(view, NULL); - MSI_ViewClose(view); - msiobj_release(&view->hdr); + r = MSI_ViewModify(view, MSIMODIFY_INSERT, rec); + if (r != ERROR_SUCCESS) + { + msiobj_release(&rec->hdr); + goto done; + } + + msiobj_release(&rec->hdr); } done: - msi_free(prelude); - msi_free(columns_sql); - + msiobj_release(&view->hdr); return r; } @@ -718,9 +650,15 @@ UINT MSI_DatabaseImport(MSIDATABASE *db, LPCWSTR folder, LPCWSTR file) records = temp_records; } - r = msi_add_table_to_db( db, columns, types, labels, num_labels, num_columns ); - if (r != ERROR_SUCCESS) - goto done; + if (!TABLE_Exists(db, labels[0])) + { + r = msi_add_table_to_db( db, columns, types, labels, num_labels, num_columns ); + if (r != ERROR_SUCCESS) + { + r = ERROR_FUNCTION_FAILED; + goto done; + } + } r = msi_add_records_to_table( db, columns, types, labels, records, num_columns, num_records ); diff --git a/dlls/msi/tests/db.c b/dlls/msi/tests/db.c index 468f486..684379e 100644 --- a/dlls/msi/tests/db.c +++ b/dlls/msi/tests/db.c @@ -1649,11 +1649,8 @@ static void test_msiimport(void) } r = add_table_to_db(hdb, endlines2); - todo_wine - { - ok(r == ERROR_FUNCTION_FAILED, - "Expected ERROR_FUNCTION_FAILED, got %d\n", r); - } + ok(r == ERROR_FUNCTION_FAILED, + "Expected ERROR_FUNCTION_FAILED, got %d\n", r); query = "SELECT * FROM `TestTable`"; r = MsiDatabaseOpenView(hdb, query, &view); @@ -5255,10 +5252,7 @@ static void test_quotes(void) write_file("import.idt", import_dat, (sizeof(import_dat) - 1) * sizeof(char)); r = MsiDatabaseImportA(hdb, CURR_DIR, "import.idt"); - todo_wine - { - ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); - } + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); DeleteFileA("import.idt"); @@ -5275,19 +5269,13 @@ static void test_quotes(void) size = MAX_PATH; r = MsiRecordGetString(hrec, 1, buf, &size); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); - todo_wine - { - ok(!lstrcmp(buf, "This is a new 'string' ok"), - "Expected \"This is a new 'string' ok\", got %s\n", buf); - } + ok(!lstrcmp(buf, "This is a new 'string' ok"), + "Expected \"This is a new 'string' ok\", got %s\n", buf); MsiCloseHandle(hrec); r = MsiViewFetch(hview, &hrec); - 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); MsiCloseHandle(hview);

1 0