December 2008 - Wine-Commits

Wolfgang Walter : wineps.drv: Fix freeing of not allocated memory in type42 .c.
by Alexandre Julliard Dec. 15, 2008

Dec. 15, 2008

Module: wine Branch: master Commit: d4b72f3e10e9a433a90ff7c665842e93038ee10f URL: http://source.winehq.org/git/wine.git/?a=commit;h=d4b72f3e10e9a433a90ff7c66… Author: Wolfgang Walter <wine(a)stwm.de> Date: Mon Dec 15 10:57:13 2008 +0100 wineps.drv: Fix freeing of not allocated memory in type42.c. --- dlls/wineps.drv/type42.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wineps.drv/type42.c b/dlls/wineps.drv/type42.c index 172072e..23f626c 100644 --- a/dlls/wineps.drv/type42.c +++ b/dlls/wineps.drv/type42.c @@ -166,7 +166,7 @@ TYPE42 *T42_download_header(PSDRV_PDEVICE *physDev, char *ps_name, "currentdict end dup /FontName get exch definefont pop\n"; - t42 = HeapAlloc(GetProcessHeap(), 0, sizeof(*t42)); + t42 = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*t42)); memcpy(t42->tables, tables_templ, sizeof(tables_templ)); t42->loca_tab = t42->glyf_tab = t42->head_tab = t42->hmtx_tab = -1; t42->emsize = emsize;

1 0

Dylan Smith : richedit: Missing capitalization on TxGetScrollBars.
by Alexandre Julliard Dec. 15, 2008

Dec. 15, 2008

Module: wine Branch: master Commit: 6fa7b49825dd5c0021b9972edc4ddfb553476563 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6fa7b49825dd5c0021b9972ed… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Mon Dec 15 04:31:33 2008 -0500 richedit: Missing capitalization on TxGetScrollBars. --- dlls/riched20/tests/txtsrv.c | 6 +++--- include/textserv.h | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/riched20/tests/txtsrv.c b/dlls/riched20/tests/txtsrv.c index 3d47490..8d7fa74 100644 --- a/dlls/riched20/tests/txtsrv.c +++ b/dlls/riched20/tests/txtsrv.c @@ -349,11 +349,11 @@ static HRESULT WINAPI ITextHostImpl_TxGetMaxLength(ITextHost *iface, return E_NOTIMPL; } -static HRESULT WINAPI ITextHostImpl_TxGetScrollbars(ITextHost *iface, +static HRESULT WINAPI ITextHostImpl_TxGetScrollBars(ITextHost *iface, DWORD *pdwScrollBar) { ITextHostTestImpl *This = (ITextHostTestImpl *)iface; - TRACECALL("Call to TxGetScrollbars(%p, pdwScrollBar=%p)\n", + TRACECALL("Call to TxGetScrollBars(%p, pdwScrollBar=%p)\n", This, pdwScrollBar); return E_NOTIMPL; } @@ -475,7 +475,7 @@ static ITextHostVtbl itextHostVtbl = { ITextHostImpl_TxGetSysColor, ITextHostImpl_TxGetBackStyle, ITextHostImpl_TxGetMaxLength, - ITextHostImpl_TxGetScrollbars, + ITextHostImpl_TxGetScrollBars, ITextHostImpl_TxGetPasswordChar, ITextHostImpl_TxGetAcceleratorPos, ITextHostImpl_TxGetExtent, diff --git a/include/textserv.h b/include/textserv.h index 977b742..e9ff4da 100644 --- a/include/textserv.h +++ b/include/textserv.h @@ -315,7 +315,7 @@ DECLARE_INTERFACE_(ITextHost,IUnknown) STDMETHOD(TxGetMaxLength)( THIS_ DWORD* plength) PURE; - STDMETHOD(TxGetScrollbars)( THIS_ + STDMETHOD(TxGetScrollBars)( THIS_ DWORD* pdwScrollBar) PURE; STDMETHOD(TxGetPasswordChar)( THIS_ @@ -386,7 +386,7 @@ DECLARE_INTERFACE_(ITextHost,IUnknown) #define ITextHost_TxGetSysColor(p,a) (p)->lpVtbl->TxGetSysColor(p,a) #define ITextHost_TxGetBackStyle(p,a) (p)->lpVtbl->TxGetBackStyle(p,a) #define ITextHost_TxGetMaxLength(p,a) (p)->lpVtbl->TxGetMaxLength(p,a) -#define ITextHost_TxGetScrollbars(p,a) (p)->lpVtbl->TxGetScrollbars(p,a) +#define ITextHost_TxGetScrollBars(p,a) (p)->lpVtbl->TxGetScrollBars(p,a) #define ITextHost_TxGetPasswordChar(p,a) (p)->lpVtbl->TxGetPasswordChar(p,a) #define ITextHost_TxGetAcceleratorPos(p,a) (p)->lpVtbl->TxGetAcceleratorPos(p,a) #define ITextHost_TxGetExtent(p,a) (p)->lpVtbl->TxGetExtent(p,a)

1 0

Dylan Smith : richedit: Compare editor rather than hWnd in ME_CalculateClickCount.
by Alexandre Julliard Dec. 15, 2008

Dec. 15, 2008

Module: wine Branch: master Commit: 0c8e4b6d02b0cd9faf835f7eaa4efacfe547e585 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c8e4b6d02b0cd9faf835f7ea… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Mon Dec 15 04:32:01 2008 -0500 richedit: Compare editor rather than hWnd in ME_CalculateClickCount. Comparing the editor as apposed to the handle to the window will work just as well right now, but will also work when there is no window handle to make a comparison with, which will be the case with windowless richedit controls. --- dlls/riched20/editor.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 49f5740..0d3010a 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -2182,7 +2182,7 @@ ME_KeyDown(ME_TextEditor *editor, WORD nKey) /* Process the message and calculate the new click count. * * returns: The click count if it is mouse down event, else returns 0. */ -static int ME_CalculateClickCount(HWND hWnd, UINT msg, WPARAM wParam, +static int ME_CalculateClickCount(ME_TextEditor *editor, UINT msg, WPARAM wParam, LPARAM lParam) { static int clickNum = 0; @@ -2204,7 +2204,9 @@ static int ME_CalculateClickCount(HWND hWnd, UINT msg, WPARAM wParam, { static MSG prevClickMsg; MSG clickMsg; - clickMsg.hwnd = hWnd; + /* Compare the editor instead of the hwnd so that the this + * can still be done for windowless richedit controls. */ + clickMsg.hwnd = (HWND)editor; clickMsg.message = msg; clickMsg.wParam = wParam; clickMsg.lParam = lParam; @@ -3596,7 +3598,7 @@ static LRESULT RichEditWndProc_common(HWND hWnd, UINT msg, WPARAM wParam, return 0; SetFocus(hWnd); ME_LButtonDown(editor, (short)LOWORD(lParam), (short)HIWORD(lParam), - ME_CalculateClickCount(hWnd, msg, wParam, lParam)); + ME_CalculateClickCount(editor, msg, wParam, lParam)); SetCapture(hWnd); ME_LinkNotify(editor,msg,wParam,lParam); if (!ME_SetCursor(editor)) goto do_default;

1 0

Dylan Smith : richedit: Removed unused hwndEdit variable for the RTF parser .
by Alexandre Julliard Dec. 15, 2008

Dec. 15, 2008

Module: wine Branch: master Commit: 7e94a230e1e6afc3cd7d41865b8d6eeda8d86580 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e94a230e1e6afc3cd7d41865… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Mon Dec 15 04:31:52 2008 -0500 richedit: Removed unused hwndEdit variable for the RTF parser. There is no reason for the rich text format parser to need a handle to the window, and even if there were it has a handle to the editor which contains a handle to the window. It is better to remove this considering we need to cut down on the use of window handles to implement windowless richedit controls. --- dlls/riched20/editor.c | 1 - dlls/riched20/rtf.h | 3 --- 2 files changed, 0 insertions(+), 4 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 16f2771..55bc9b8 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -1470,7 +1470,6 @@ static LRESULT ME_StreamIn(ME_TextEditor *editor, DWORD format, EDITSTREAM *stre memset(&parser, 0, sizeof parser); RTFSetEditStream(&parser, &inStream); parser.rtfFormat = format&(SF_TEXT|SF_RTF); - parser.hwndEdit = editor->hWnd; parser.editor = editor; parser.style = style; WriterInit(&parser); diff --git a/dlls/riched20/rtf.h b/dlls/riched20/rtf.h index 8fc8abc..a276b7c 100644 --- a/dlls/riched20/rtf.h +++ b/dlls/riched20/rtf.h @@ -1157,9 +1157,6 @@ struct _RTF_Info { ME_InStream *stream; - /* edit window to output to */ - HWND hwndEdit; - ME_TextEditor *editor; ME_Style *style;

1 0

Dylan Smith : richedit: Removed an unnecessary call to GetScrollInfo.
by Alexandre Julliard Dec. 15, 2008

Dec. 15, 2008

Module: wine Branch: master Commit: 8ab0570d0247de4e24596cf2dea5962e51139cf2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ab0570d0247de4e24596cf2d… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Mon Dec 15 04:31:25 2008 -0500 richedit: Removed an unnecessary call to GetScrollInfo. The vertical scrollbar state is stored internally within the control, so should be used when possible. This will become more necessary when windowless richedit controls are implemented, and there will no hWnd to pass to GetScrollInfo. --- dlls/riched20/editor.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 0d3010a..16f2771 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -3545,9 +3545,7 @@ static LRESULT RichEditWndProc_common(HWND hWnd, UINT msg, WPARAM wParam, pt.x += editor->selofs; pt.x++; /* for some reason native offsets x by one */ - si.cbSize = sizeof(si); - si.fMask = SIF_POS; - if (GetScrollInfo(editor->hWnd, SB_VERT, &si)) pt.y -= si.nPos; + pt.y -= editor->vert_si.nPos; si.cbSize = sizeof(si); si.fMask = SIF_POS; if (GetScrollInfo(editor->hWnd, SB_HORZ, &si)) pt.x -= si.nPos;

1 0

Dylan Smith : richedit: Use ME_EnsureVisible to implement EM_SCROLLCARET.
by Alexandre Julliard Dec. 15, 2008

Dec. 15, 2008

Module: wine Branch: master Commit: 6901e0cec7331c768af6b8c11509067b58372a01 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6901e0cec7331c768af6b8c11… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Mon Dec 15 04:31:43 2008 -0500 richedit: Use ME_EnsureVisible to implement EM_SCROLLCARET. The code for the ME_EnsureVisible function does exactly what EM_SCROLLCARET does, yet this code is duplicated in order to handle this message. It is simpler to just use the existing function to implement the message, and avoid internally sending the EM_SCROLLCARET when this function is available. --- dlls/riched20/caret.c | 12 +++--------- dlls/riched20/editor.c | 17 +---------------- 2 files changed, 4 insertions(+), 25 deletions(-) diff --git a/dlls/riched20/caret.c b/dlls/riched20/caret.c index 1780bc0..4a3ec8c 100644 --- a/dlls/riched20/caret.c +++ b/dlls/riched20/caret.c @@ -1177,16 +1177,10 @@ void ME_MouseMove(ME_TextEditor *editor, int x, int y) memcmp(&editor->pCursors[1], &editor->pCursors[3], sizeof(ME_Cursor))) { /* The scroll the cursor towards the other end, since it was the one - * extended by ME_ExtendAnchorSelection - */ - ME_Cursor tmpCursor = editor->pCursors[0]; - editor->pCursors[0] = editor->pCursors[1]; - editor->pCursors[1] = tmpCursor; - SendMessageW(editor->hWnd, EM_SCROLLCARET, 0, 0); - editor->pCursors[1] = editor->pCursors[0]; - editor->pCursors[0] = tmpCursor; + * extended by ME_ExtendAnchorSelection */ + ME_EnsureVisible(editor, editor->pCursors[1].pRun); } else { - SendMessageW(editor->hWnd, EM_SCROLLCARET, 0, 0); + ME_EnsureVisible(editor, editor->pCursors[0].pRun); } ME_InvalidateSelection(editor); diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 33310a1..49f5740 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -3064,23 +3064,8 @@ static LRESULT RichEditWndProc_common(HWND hWnd, UINT msg, WPARAM wParam, return len; } case EM_SCROLLCARET: - { - int top, bottom; /* row's edges relative to document top */ - int nPos; - ME_DisplayItem *para, *row; - - nPos = ME_GetYScrollPos(editor); - row = ME_RowStart(editor->pCursors[0].pRun); - para = ME_GetParagraph(row); - top = para->member.para.pt.y + row->member.row.pt.y; - bottom = top + row->member.row.nHeight; - - if (top < nPos) /* caret above window */ - ME_ScrollAbs(editor, top); - else if (nPos + editor->sizeWindow.cy < bottom) /*below*/ - ME_ScrollAbs(editor, bottom - editor->sizeWindow.cy); + ME_EnsureVisible(editor, editor->pCursors[0].pRun); return 0; - } case WM_SETFONT: { LOGFONTW lf;

1 0

Paul Vriens : gdi32/tests: Fix a few failures on Win9x.
by Alexandre Julliard Dec. 15, 2008

Dec. 15, 2008

Module: wine Branch: master Commit: 098f2f231dd058a109aefb7d7ed898f85a37760d URL: http://source.winehq.org/git/wine.git/?a=commit;h=098f2f231dd058a109aefb7d7… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Fri Dec 12 17:07:54 2008 +0100 gdi32/tests: Fix a few failures on Win9x. --- dlls/gdi32/tests/bitmap.c | 16 +++++++++++----- 1 files changed, 11 insertions(+), 5 deletions(-) diff --git a/dlls/gdi32/tests/bitmap.c b/dlls/gdi32/tests/bitmap.c index 7683d35..3f8a674 100644 --- a/dlls/gdi32/tests/bitmap.c +++ b/dlls/gdi32/tests/bitmap.c @@ -1018,9 +1018,12 @@ static void test_bitmap(void) SetLastError(0xdeadbeef); hbmp = CreateBitmap(0x7ffffff + 1, 1, 1, 1, NULL); - ok(!hbmp, "CreateBitmap should fail\n"); - ok(GetLastError() == ERROR_INVALID_PARAMETER, - "expected ERROR_INVALID_PARAMETER, got %u\n", GetLastError()); + ok(!hbmp || broken(hbmp != NULL /* Win9x */), "CreateBitmap should fail\n"); + if (!hbmp) + ok(GetLastError() == ERROR_INVALID_PARAMETER, + "expected ERROR_INVALID_PARAMETER, got %u\n", GetLastError()); + else + DeleteObject(hbmp); hbmp = CreateBitmap(15, 15, 1, 1, NULL); assert(hbmp != NULL); @@ -1040,7 +1043,8 @@ static void test_bitmap(void) assert(sizeof(buf) == sizeof(buf_cmp)); ret = GetBitmapBits(hbmp, 0, NULL); - ok(ret == bm.bmWidthBytes * bm.bmHeight, "%d != %d\n", ret, bm.bmWidthBytes * bm.bmHeight); + ok(ret == bm.bmWidthBytes * bm.bmHeight || broken(ret == 0 /* Win9x */), + "%d != %d\n", ret, bm.bmWidthBytes * bm.bmHeight); memset(buf_cmp, 0xAA, sizeof(buf_cmp)); memset(buf_cmp, 0, bm.bmWidthBytes * bm.bmHeight); @@ -1323,6 +1327,8 @@ static void test_GetDIBits_selected_DDB(BOOL monochrome) /* Get the palette indices */ res = GetDIBits(dc, ddb, 0, 0, NULL, info2, DIB_PAL_COLORS); + if (res == 0 && GetLastError() == ERROR_INVALID_PARAMETER) /* Win9x */ + res = GetDIBits(dc, ddb, 0, height, NULL, info2, DIB_PAL_COLORS); ok(res, "GetDIBits failed\n"); for (i=0;i < 1 << info->bmiHeader.biSizeImage; i++) @@ -1465,7 +1471,7 @@ static void test_GetDIBits(void) ok(!bm.bmBits, "wrong bmBits %p\n", bm.bmBits); bytes = GetBitmapBits(hbmp, 0, NULL); - ok(bytes == sizeof(bmp_bits_1), "expected 16*2 got %d bytes\n", bytes); + ok(bytes == sizeof(bmp_bits_1) || broken(bytes == 0 /* Win9x */), "expected 16*2 got %d bytes\n", bytes); bytes = GetBitmapBits(hbmp, sizeof(buf), buf); ok(bytes == sizeof(bmp_bits_1), "expected 16*2 got %d bytes\n", bytes); ok(!memcmp(buf, bmp_bits_1, sizeof(bmp_bits_1)), "bitmap bits don't match\n");

1 0

James Hawkins : msi: Add tests for MsiGetPatchInfo.
by Alexandre Julliard Dec. 15, 2008

Dec. 15, 2008

Module: wine Branch: master Commit: 0ccb714470cb5c7f0c8692f9a07c295d2cf4c648 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ccb714470cb5c7f0c8692f9a… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Sun Dec 14 21:07:20 2008 -0600 msi: Add tests for MsiGetPatchInfo. --- dlls/msi/tests/msi.c | 1018 +++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 1017 insertions(+), 1 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0ccb714470cb5c7f0c869…

1 0

James Hawkins : msi: Publish the patch information.
by Alexandre Julliard Dec. 15, 2008

Dec. 15, 2008

Module: wine Branch: master Commit: 01eb93000549a3ec93d0a23d1a970311ec204dee URL: http://source.winehq.org/git/wine.git/?a=commit;h=01eb93000549a3ec93d0a23d1… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Sun Dec 14 21:07:23 2008 -0600 msi: Publish the patch information. --- dlls/msi/action.c | 61 +++++++++++++++++++++++++++++++++++++++++++++++---- dlls/msi/helpers.c | 7 ++++++ dlls/msi/msipriv.h | 7 ++++++ dlls/msi/package.c | 1 + 4 files changed, 71 insertions(+), 5 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index fdb2aff..481c547 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -490,18 +490,29 @@ static UINT msi_parse_patch_summary( MSIPACKAGE *package, MSIDATABASE *patch_db if (!si) return ERROR_FUNCTION_FAILED; - msi_check_patch_applicable( package, si ); + if (msi_check_patch_applicable( package, si ) != ERROR_SUCCESS) + { + TRACE("Patch not applicable\n"); + return ERROR_SUCCESS; + } + + package->patch = msi_alloc(sizeof(MSIPATCHINFO)); + if (!package->patch) + return ERROR_OUTOFMEMORY; + + package->patch->patchcode = msi_suminfo_dup_string(si, PID_REVNUMBER); + if (!package->patch->patchcode) + return ERROR_OUTOFMEMORY; /* enumerate the substorage */ str = msi_suminfo_dup_string( si, PID_LASTAUTHOR ); + package->patch->transforms = str; + substorage = msi_split_string( str, ';' ); for ( i = 0; substorage && substorage[i] && r == ERROR_SUCCESS; i++ ) r = msi_apply_substorage_transform( package, patch_db, substorage[i] ); - msi_free( substorage ); - msi_free( str ); - - /* FIXME: parse the sources in PID_REVNUMBER and do something with them... */ + msi_free( substorage ); msiobj_release( &si->hdr ); return r; @@ -3568,6 +3579,39 @@ static BOOL msi_check_unpublish(MSIPACKAGE *package) return TRUE; } +static UINT msi_publish_patch(MSIPACKAGE *package, HKEY prodkey, HKEY hudkey) +{ + WCHAR patch_squashed[GUID_SIZE]; + HKEY patches; + LONG res; + UINT r = ERROR_FUNCTION_FAILED; + + static const WCHAR szPatches[] = {'P','a','t','c','h','e','s',0}; + + res = RegCreateKeyExW(prodkey, szPatches, 0, NULL, 0, KEY_ALL_ACCESS, NULL, + &patches, NULL); + if (res != ERROR_SUCCESS) + return ERROR_FUNCTION_FAILED; + + squash_guid(package->patch->patchcode, patch_squashed); + + res = RegSetValueExW(patches, szPatches, 0, REG_MULTI_SZ, + (const BYTE *)patch_squashed, + (lstrlenW(patch_squashed) + 1) * sizeof(WCHAR)); + if (res != ERROR_SUCCESS) + goto done; + + res = RegSetValueExW(patches, patch_squashed, 0, REG_SZ, + (const BYTE *)package->patch->transforms, + (lstrlenW(package->patch->transforms) + 1) * sizeof(WCHAR)); + if (res == ERROR_SUCCESS) + r = ERROR_SUCCESS; + +done: + RegCloseKey(patches); + return r; +} + /* * 99% of the work done here is only done for * advertised installs. However this is where the @@ -3598,6 +3642,13 @@ static UINT ACTION_PublishProduct(MSIPACKAGE *package) if (rc != ERROR_SUCCESS) goto end; + if (package->patch) + { + rc = msi_publish_patch(package, hukey, hudkey); + if (rc != ERROR_SUCCESS) + goto end; + } + rc = msi_publish_product_properties(package, hukey); if (rc != ERROR_SUCCESS) goto end; diff --git a/dlls/msi/helpers.c b/dlls/msi/helpers.c index 5c9dfd0..ea36b3d 100644 --- a/dlls/msi/helpers.c +++ b/dlls/msi/helpers.c @@ -661,6 +661,13 @@ void ACTION_free_package_structures( MSIPACKAGE* package) msi_free(package->script); } + if (package->patch) + { + msi_free(package->patch->patchcode); + msi_free(package->patch->transforms); + msi_free(package->patch); + } + msi_free(package->BaseURL); msi_free(package->PackagePath); msi_free(package->ProductCode); diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index fe9dbb0..7c788d4 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -144,6 +144,12 @@ typedef struct tagMSIMEDIAINFO WCHAR source[MAX_PATH]; } MSIMEDIAINFO; +typedef struct tagMSIPATCHINFO +{ + LPWSTR patchcode; + LPWSTR transforms; +} MSIPATCHINFO; + typedef struct _column_info { LPCWSTR table; @@ -294,6 +300,7 @@ typedef struct tagMSIPACKAGE { MSIOBJECTHDR hdr; MSIDATABASE *db; + MSIPATCHINFO *patch; struct list components; struct list features; struct list files; diff --git a/dlls/msi/package.c b/dlls/msi/package.c index f6ef199..018389a 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -731,6 +731,7 @@ static MSIPACKAGE *msi_alloc_package( void ) list_init( &package->sourcelist_info ); list_init( &package->sourcelist_media ); + package->patch = NULL; package->ActionFormat = NULL; package->LastAction = NULL; package->dialog = NULL;

1 0

James Hawkins : msi: Set the property specified by the Source attribute of the Media table when applying a patch .
by Alexandre Julliard Dec. 15, 2008

Dec. 15, 2008

Module: wine Branch: master Commit: c059ceb5b0dd13c9aa077aaede8de680479dd874 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c059ceb5b0dd13c9aa077aaed… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Sun Dec 14 21:07:28 2008 -0600 msi: Set the property specified by the Source attribute of the Media table when applying a patch. --- dlls/msi/action.c | 40 ++++++++++++++++++++++++++++++++++++++++ 1 files changed, 40 insertions(+), 0 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 481c547..3a32a06 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -480,6 +480,44 @@ static UINT msi_check_patch_applicable( MSIPACKAGE *package, MSISUMMARYINFO *si return ret; } +static UINT msi_set_media_source_prop(MSIPACKAGE *package) +{ + MSIQUERY *view; + MSIRECORD *rec = NULL; + LPWSTR patch; + LPCWSTR prop; + UINT r; + + static const WCHAR szPatch[] = {'P','A','T','C','H',0}; + static const WCHAR query[] = {'S','E','L','E','C','T',' ', + '`','S','o','u','r','c','e','`',' ','F','R','O','M',' ', + '`','M','e','d','i','a','`',' ','W','H','E','R','E',' ', + '`','S','o','u','r','c','e','`',' ','I','S',' ', + 'N','O','T',' ','N','U','L','L',0}; + + r = MSI_DatabaseOpenViewW(package->db, query, &view); + if (r != ERROR_SUCCESS) + return r; + + r = MSI_ViewExecute(view, 0); + if (r != ERROR_SUCCESS) + goto done; + + if (MSI_ViewFetch(view, &rec) == ERROR_SUCCESS) + { + prop = MSI_RecordGetString(rec, 1); + patch = msi_dup_property(package, szPatch); + MSI_SetPropertyW(package, prop, patch); + msi_free(patch); + } + +done: + if (rec) msiobj_release(&rec->hdr); + msiobj_release(&view->hdr); + + return r; +} + static UINT msi_parse_patch_summary( MSIPACKAGE *package, MSIDATABASE *patch_db ) { MSISUMMARYINFO *si; @@ -515,6 +553,8 @@ static UINT msi_parse_patch_summary( MSIPACKAGE *package, MSIDATABASE *patch_db msi_free( substorage ); msiobj_release( &si->hdr ); + msi_set_media_source_prop(package); + return r; }

1 0