April 2007 - Wine-Commits - list.winehq.org

Hans Leidekker : msi: Install translators in the InstallODBC custom action.
by Alexandre Julliard April 23, 2007

April 23, 2007

Module: wine Branch: master Commit: 33c025b7f24c7194a1bc510f8ccd0dee950d5e99 URL: http://source.winehq.org/git/wine.git/?a=commit;h=33c025b7f24c7194a1bc510f8… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Sun Apr 22 11:37:51 2007 +0200 msi: Install translators in the InstallODBC custom action. --- dlls/msi/action.c | 75 +++++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 73 insertions(+), 2 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index c3e65d2..f0387b1 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -4423,22 +4423,93 @@ static UINT ITERATE_InstallODBCDriver( MSIRECORD *rec, LPVOID param ) return r; } +static UINT ITERATE_InstallODBCTranslator( MSIRECORD *rec, LPVOID param ) +{ + MSIPACKAGE *package = (MSIPACKAGE*)param; + LPWSTR translator, translator_path, ptr; + WCHAR outpath[MAX_PATH]; + MSIFILE *translator_file, *setup_file; + LPCWSTR desc; + DWORD len, usage; + UINT r = ERROR_SUCCESS; + + static const WCHAR translator_fmt[] = { + 'T','r','a','n','s','l','a','t','o','r','=','%','s',0}; + static const WCHAR setup_fmt[] = { + 'S','e','t','u','p','=','%','s',0}; + + desc = MSI_RecordGetString(rec, 3); + + translator_file = msi_find_file(package, MSI_RecordGetString(rec, 4)); + setup_file = msi_find_file(package, MSI_RecordGetString(rec, 5)); + + if (!translator_file || !setup_file) + { + ERR("ODBC Translator entry not found!\n"); + return ERROR_FUNCTION_FAILED; + } + + len = lstrlenW(desc) + lstrlenW(translator_fmt) + lstrlenW(translator_file->FileName) + + lstrlenW(setup_fmt) + lstrlenW(setup_file->FileName) + 1; + translator = msi_alloc(len * sizeof(WCHAR)); + if (!translator) + return ERROR_OUTOFMEMORY; + + ptr = translator; + lstrcpyW(ptr, desc); + ptr += lstrlenW(ptr) + 1; + + sprintfW(ptr, translator_fmt, translator_file->FileName); + ptr += lstrlenW(ptr) + 1; + + sprintfW(ptr, setup_fmt, setup_file->FileName); + ptr += lstrlenW(ptr) + 1; + *ptr = '\0'; + + translator_path = strdupW(translator_file->TargetPath); + ptr = strrchrW(translator_path, '\\'); + if (ptr) *ptr = '\0'; + + if (!SQLInstallTranslatorExW(translator, translator_path, outpath, MAX_PATH, + NULL, ODBC_INSTALL_COMPLETE, &usage)) + { + ERR("Failed to install SQL translator!\n"); + r = ERROR_FUNCTION_FAILED; + } + + msi_free(translator); + msi_free(translator_path); + + return r; +} + static UINT ACTION_InstallODBC( MSIPACKAGE *package ) { UINT rc; MSIQUERY *view; - static const WCHAR query[] = { + static const WCHAR driver_query[] = { 'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ', 'O','D','B','C','D','r','i','v','e','r',0 }; - rc = MSI_DatabaseOpenViewW(package->db, query, &view); + static const WCHAR translator_query[] = { + 'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ', + 'O','D','B','C','T','r','a','n','s','l','a','t','o','r',0 }; + + rc = MSI_DatabaseOpenViewW(package->db, driver_query, &view); if (rc != ERROR_SUCCESS) return ERROR_SUCCESS; rc = MSI_IterateRecords(view, NULL, ITERATE_InstallODBCDriver, package); msiobj_release(&view->hdr); + rc = MSI_DatabaseOpenViewW(package->db, translator_query, &view); + if (rc != ERROR_SUCCESS) + return ERROR_SUCCESS; + + rc = MSI_IterateRecords(view, NULL, ITERATE_InstallODBCTranslator, package); + msiobj_release(&view->hdr); + return rc; }

1 0

James Hawkins : msi: Return MSICONDITION_NONE in MsiDatabaseIsTablePersistent if the table doesn 't exist.
by Alexandre Julliard April 23, 2007

April 23, 2007

Module: wine Branch: master Commit: d677bd7f3b43cd94fcf95bfed035b4e817fffd34 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d677bd7f3b43cd94fcf95bfed… Author: James Hawkins <truiken(a)gmail.com> Date: Sat Apr 21 02:33:10 2007 -0500 msi: Return MSICONDITION_NONE in MsiDatabaseIsTablePersistent if the table doesn't exist. --- dlls/msi/msipriv.h | 2 +- dlls/msi/table.c | 5 ++++- dlls/msi/tests/db.c | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index 55dd2fa..0aedbf2 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -563,7 +563,7 @@ extern const WCHAR *msi_string_lookup_id( string_table *st, UINT id ); extern UINT msi_string_get_codepage( string_table *st ); -extern BOOL TABLE_Exists( MSIDATABASE *db, LPWSTR name ); +extern BOOL TABLE_Exists( MSIDATABASE *db, LPCWSTR name ); extern MSICONDITION MSI_DatabaseIsTablePersistent( MSIDATABASE *db, LPCWSTR table ); extern UINT read_raw_stream_data( MSIDATABASE*, LPCWSTR stname, diff --git a/dlls/msi/table.c b/dlls/msi/table.c index 420519b..ce5df79 100644 --- a/dlls/msi/table.c +++ b/dlls/msi/table.c @@ -1027,7 +1027,7 @@ static UINT get_tablecolumns( MSIDATABASE *db, } /* try to find the table name in the _Tables table */ -BOOL TABLE_Exists( MSIDATABASE *db, LPWSTR name ) +BOOL TABLE_Exists( MSIDATABASE *db, LPCWSTR name ) { UINT r, table_id = 0, i, count; MSITABLE *table = NULL; @@ -1716,6 +1716,9 @@ MSICONDITION MSI_DatabaseIsTablePersistent( MSIDATABASE *db, LPCWSTR table ) if (!table) return MSICONDITION_ERROR; + if (!TABLE_Exists( db, table )) + return MSICONDITION_NONE; + return MSICONDITION_FALSE; } diff --git a/dlls/msi/tests/db.c b/dlls/msi/tests/db.c index dc5e42d..53599ed 100644 --- a/dlls/msi/tests/db.c +++ b/dlls/msi/tests/db.c @@ -2648,10 +2648,10 @@ static void test_temporary_table(void) cond = MsiDatabaseIsTablePersistent(hdb, "_Columns"); ok( cond == MSICONDITION_NONE, "wrong return condition\n"); + } cond = MsiDatabaseIsTablePersistent(hdb, "_Streams"); ok( cond == MSICONDITION_NONE, "wrong return condition\n"); - } query = "CREATE TABLE `P` ( `B` SHORT NOT NULL, `C` CHAR(255) PRIMARY KEY `C`)"; r = run_query(hdb, 0, query);

1 0

Hans Leidekker : urlmon: Add an implementation for CreateURLMonikerEx based on existing code for CreateURLMoniker .
by Alexandre Julliard April 23, 2007

April 23, 2007

Module: wine Branch: master Commit: 691b0a3d68a329139ad2bc8d0b954b722b603b40 URL: http://source.winehq.org/git/wine.git/?a=commit;h=691b0a3d68a329139ad2bc8d0… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Sun Apr 22 11:38:15 2007 +0200 urlmon: Add an implementation for CreateURLMonikerEx based on existing code for CreateURLMoniker. --- dlls/urlmon/umon.c | 29 ++++++++++++++++++++++++++--- dlls/urlmon/urlmon.spec | 1 + include/urlmon.idl | 2 ++ 3 files changed, 29 insertions(+), 3 deletions(-) diff --git a/dlls/urlmon/umon.c b/dlls/urlmon/umon.c index 03289ff..7765f27 100644 --- a/dlls/urlmon/umon.c +++ b/dlls/urlmon/umon.c @@ -1149,7 +1149,7 @@ HRESULT WINAPI CreateAsyncBindCtxEx(IBindCtx *ibind, DWORD options, /*********************************************************************** - * CreateURLMoniker (URLMON.@) + * CreateURLMonikerEx (URLMON.@) * * Create a url moniker. * @@ -1157,19 +1157,22 @@ HRESULT WINAPI CreateAsyncBindCtxEx(IBindCtx *ibind, DWORD options, * pmkContext [I] Context * szURL [I] Url to create the moniker for * ppmk [O] Destination for created moniker. + * dwFlags [I] Flags. * * RETURNS * Success: S_OK. ppmk contains the created IMoniker object. * Failure: MK_E_SYNTAX if szURL is not a valid url, or * E_OUTOFMEMORY if memory allocation fails. */ -HRESULT WINAPI CreateURLMoniker(IMoniker *pmkContext, LPCWSTR szURL, IMoniker **ppmk) +HRESULT WINAPI CreateURLMonikerEx(IMoniker *pmkContext, LPCWSTR szURL, IMoniker **ppmk, DWORD dwFlags) { URLMonikerImpl *obj; HRESULT hres; LPOLESTR lefturl = NULL; - TRACE("(%p, %s, %p)\n", pmkContext, debugstr_w(szURL), ppmk); + TRACE("(%p, %s, %p, %08x)\n", pmkContext, debugstr_w(szURL), ppmk, dwFlags); + + if (dwFlags & URL_MK_UNIFORM) FIXME("ignoring flag URL_MK_UNIFORM\n"); if(!(obj = HeapAlloc(GetProcessHeap(), 0, sizeof(*obj)))) return E_OUTOFMEMORY; @@ -1194,6 +1197,26 @@ HRESULT WINAPI CreateURLMoniker(IMoniker *pmkContext, LPCWSTR szURL, IMoniker ** return hres; } +/********************************************************************** + * CreateURLMoniker (URLMON.@) + * + * Create a url moniker. + * + * PARAMS + * pmkContext [I] Context + * szURL [I] Url to create the moniker for + * ppmk [O] Destination for created moniker. + * + * RETURNS + * Success: S_OK. ppmk contains the created IMoniker object. + * Failure: MK_E_SYNTAX if szURL is not a valid url, or + * E_OUTOFMEMORY if memory allocation fails. + */ +HRESULT WINAPI CreateURLMoniker(IMoniker *pmkContext, LPCWSTR szURL, IMoniker **ppmk) +{ + return CreateURLMonikerEx(pmkContext, szURL, ppmk, URL_MK_LEGACY); +} + /*********************************************************************** * CoInternetQueryInfo (URLMON.@) * diff --git a/dlls/urlmon/urlmon.spec b/dlls/urlmon/urlmon.spec index 7821486..c72c0eb 100644 --- a/dlls/urlmon/urlmon.spec +++ b/dlls/urlmon/urlmon.spec @@ -26,6 +26,7 @@ @ stdcall CreateAsyncBindCtxEx(ptr long ptr ptr ptr long) @ stdcall CreateFormatEnumerator(long ptr ptr) @ stdcall CreateURLMoniker(ptr wstr ptr) +@ stdcall CreateURLMonikerEx(ptr wstr ptr long) @ stdcall -private DllCanUnloadNow() @ stdcall -private DllGetClassObject(ptr ptr ptr) @ stdcall -private DllInstall(long wstr) diff --git a/include/urlmon.idl b/include/urlmon.idl index da06868..5f64086 100644 --- a/include/urlmon.idl +++ b/include/urlmon.idl @@ -1284,3 +1284,5 @@ cpp_quote("#define OInetCompareUrl CoInternetCompareUrl") cpp_quote("#define OInetGetSession CoInternetGetSession") cpp_quote("#define MKSYS_URLMONIKER 6") +cpp_quote("#define URL_MK_LEGACY 0") +cpp_quote("#define URL_MK_UNIFORM 1")

1 0

Maarten Lankhorst : dsound: Make sure we' re holding the lock on Drop And Stop.
by Alexandre Julliard April 23, 2007

April 23, 2007

Module: wine Branch: master Commit: 836776ae4f33fb3d554b8b2d2330eda294297dae URL: http://source.winehq.org/git/wine.git/?a=commit;h=836776ae4f33fb3d554b8b2d2… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Fri Apr 20 22:10:23 2007 +0200 dsound: Make sure we're holding the lock on Drop And Stop. --- dlls/dsound/primary.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/dsound/primary.c b/dlls/dsound/primary.c index 9a3498d..0725bd2 100644 --- a/dlls/dsound/primary.c +++ b/dlls/dsound/primary.c @@ -213,6 +213,8 @@ HRESULT DSOUND_PrimaryDestroy(DirectSoundDevice *device) { TRACE("(%p)\n", device); + EnterCriticalSection(&(device->mixlock)); + DSOUND_PrimaryClose(device); if (device->driver) { if (device->hwbuf) { @@ -227,6 +229,7 @@ HRESULT DSOUND_PrimaryDestroy(DirectSoundDevice *device) } HeapFree(GetProcessHeap(),0,device->pwfx); device->pwfx=NULL; + LeaveCriticalSection(&(device->mixlock)); return DS_OK; } @@ -253,6 +256,7 @@ HRESULT DSOUND_PrimaryStop(DirectSoundDevice *device) HRESULT err = DS_OK; TRACE("(%p)\n", device); + EnterCriticalSection(&(device->mixlock)); if (device->hwbuf) { err = IDsDriverBuffer_Stop(device->hwbuf); if (err == DSERR_BUFFERLOST) { @@ -285,6 +289,7 @@ HRESULT DSOUND_PrimaryStop(DirectSoundDevice *device) if (err != DS_OK) WARN("waveOutPause failed\n"); } + LeaveCriticalSection(&(device->mixlock)); return err; }

1 0

James Hawkins : msi: Add the _Property table back, with tests.
by Alexandre Julliard April 23, 2007

April 23, 2007

Module: wine Branch: master Commit: b4bb6e5b5d5b85f0bc4bbbad2b6a8ec3872a5759 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b4bb6e5b5d5b85f0bc4bbbad2… Author: James Hawkins <truiken(a)gmail.com> Date: Sat Apr 21 02:37:51 2007 -0500 msi: Add the _Property table back, with tests. --- dlls/msi/msipriv.h | 4 - dlls/msi/package.c | 328 ++++++++++++++++++++++++---------------------- dlls/msi/tests/format.c | 7 +- dlls/msi/tests/package.c | 16 +++ 4 files changed, 189 insertions(+), 166 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b4bb6e5b5d5b85f0bc4bb…

1 0

Maarten Lankhorst : dsound: Don't deadlock in capture because of callback.
by Alexandre Julliard April 23, 2007

April 23, 2007

Module: wine Branch: master Commit: 364e65a87260c8963b150a04b11af7d5aff0d912 URL: http://source.winehq.org/git/wine.git/?a=commit;h=364e65a87260c8963b150a04b… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Sat Apr 21 20:37:26 2007 +0200 dsound: Don't deadlock in capture because of callback. --- dlls/dsound/capture.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/dsound/capture.c b/dlls/dsound/capture.c index 1e14acd..240138f 100644 --- a/dlls/dsound/capture.c +++ b/dlls/dsound/capture.c @@ -895,7 +895,6 @@ IDirectSoundCaptureBufferImpl_GetCurrentPosition( if (hres != DS_OK) WARN("IDsCaptureDriverBuffer_GetPosition failed\n"); } else if (This->device->hwi) { - EnterCriticalSection(&(This->device->lock)); TRACE("old This->device->state=%s\n",captureStateString[This->device->state]); if (lpdwCapturePosition) { MMTIME mtime; @@ -907,6 +906,7 @@ IDirectSoundCaptureBufferImpl_GetCurrentPosition( *lpdwCapturePosition = mtime.u.cb; } + EnterCriticalSection(&(This->device->lock)); if (lpdwReadPosition) { if (This->device->state == STATE_STARTING) { if (lpdwCapturePosition)

1 0

Hwang YunSong(황윤성) : cmd: Updated Korean resource.
by Alexandre Julliard April 23, 2007

April 23, 2007

Module: wine Branch: master Commit: 68401a151ae9b6598982ad77bba40c99de00f75d URL: http://source.winehq.org/git/wine.git/?a=commit;h=68401a151ae9b6598982ad77b… Author: Hwang YunSong(황윤성) <hys545(a)dreamwiz.com> Date: Mon Apr 23 08:15:59 2007 +0900 cmd: Updated Korean resource. --- programs/cmd/Ko.rc | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/programs/cmd/Ko.rc b/programs/cmd/Ko.rc index 138d93b..ebad6ce 100644 --- a/programs/cmd/Ko.rc +++ b/programs/cmd/Ko.rc @@ -194,7 +194,7 @@ verify �÷��״� Wine��  �ϵ� ��մϴ�.\n" WCMD_POPD, "POPD�� 丮�� PUSH�� ߴ� �� ٲ۴�.\n" - WCMD_MORE, "MORE displays output of files or piped input in pages.\n" + WCMD_MORE, "MORE�� ְų� �� ε� �� Է�� ش�.\n" WCMD_EXIT, "EXIT�� ߴܽ�Ű�� ü�� ư��ų� cmd��\n\ @@ -213,7 +213,7 @@ DIR\t\t��丮 �� ֱ�\n\ ECHO\t\t��ڸ� �ٷ� ȭ�� \n\ HELP\t\t �� ©�� ׸� ��\n\ MD (MKDIR)\t�� 丮 ��\n\ -MORE\t\tDisplay output in pages\n\ +MORE\t\t�� ֱ�\n\ MOVE\t\t�� ̳� �� ,�׸�� 丮 �� ̵�\n\ PATH\t\tŽ�� ְų� ��ϱ�\n\ POPD\t\tPUSHD�� ߴ� ��丮�� ư��\n\ @@ -236,5 +236,5 @@ HELP <��>�� ġ�� \n" WCMD_NOASSOC, "�� Ȯ�� %s�� Ǯ�׸�� ϴ�. \n" WCMD_NOFTYPE, "�� '%s'�� �� ɵ� ��ϴ�.'\n" WCMD_OVERWRITE, "����" - WCMD_MORESTR, "More..." + WCMD_MORESTR, "�� ..." }

1 0

Dmitry Timoshkov : comctl32: Fix an off by one error in ImageList_Remove.
by Alexandre Julliard April 23, 2007

April 23, 2007

Module: wine Branch: master Commit: e0195ca4ef6a04bb324b6684de092e68bf9604f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e0195ca4ef6a04bb324b6684d… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Mon Apr 23 20:39:00 2007 +0900 comctl32: Fix an off by one error in ImageList_Remove. --- dlls/comctl32/imagelist.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/imagelist.c b/dlls/comctl32/imagelist.c index 0e314dd..df1f920 100644 --- a/dlls/comctl32/imagelist.c +++ b/dlls/comctl32/imagelist.c @@ -2126,13 +2126,13 @@ ImageList_Remove (HIMAGELIST himl, INT i) TRACE("Post image copy!\n"); SelectObject (hdcBmp, hbmNewImage); - imagelist_copy_images( himl, himl->hdcImage, hdcBmp, i, - (himl->cCurImage - i - 1), i - 1 ); + imagelist_copy_images( himl, himl->hdcImage, hdcBmp, i + 1, + (himl->cCurImage - i), i ); if (himl->hbmMask) { SelectObject (hdcBmp, hbmNewMask); - imagelist_copy_images( himl, himl->hdcMask, hdcBmp, i, - (himl->cCurImage - i - 1), i - 1 ); + imagelist_copy_images( himl, himl->hdcMask, hdcBmp, i + 1, + (himl->cCurImage - i), i ); } }

1 0

Dmitry Timoshkov : comctl32: Add an image list storage test, make it pass under Wine.
by Alexandre Julliard April 23, 2007

April 23, 2007

Module: wine Branch: master Commit: 8c5cf0cbaed7106c89c09d19cc40af183fd461f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c5cf0cbaed7106c89c09d19c… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Mon Apr 23 20:39:18 2007 +0900 comctl32: Add an image list storage test, make it pass under Wine. --- dlls/comctl32/imagelist.c | 24 +-- dlls/comctl32/tests/imagelist.c | 403 ++++++++++++++++++++++++++++++++++++++- 2 files changed, 410 insertions(+), 17 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8c5cf0cbaed7106c89c09…

1 0

Dmitry Timoshkov : comctl32: Use packing only for public ILHEAD structure, 2 bytes packing is enough.
by Alexandre Julliard April 23, 2007

April 23, 2007

Module: wine Branch: master Commit: 43bca2384021d27cf98d441e5eed8d546fdbbf45 URL: http://source.winehq.org/git/wine.git/?a=commit;h=43bca2384021d27cf98d441e5… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Sat Apr 21 18:16:04 2007 +0900 comctl32: Use packing only for public ILHEAD structure, 2 bytes packing is enough. --- dlls/comctl32/imagelist.h | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/imagelist.h b/dlls/comctl32/imagelist.h index a3c0b1e..cd72f38 100644 --- a/dlls/comctl32/imagelist.h +++ b/dlls/comctl32/imagelist.h @@ -27,8 +27,6 @@ #include "winbase.h" #include "wingdi.h" -#include "pshpack1.h" - /* the ones with offsets at the end are the same as in Windows */ struct _IMAGELIST { @@ -60,6 +58,7 @@ struct _IMAGELIST #define IMAGELIST_MAGIC 0x53414D58 /* Header used by ImageList_Read() and ImageList_Write() */ +#include "pshpack2.h" typedef struct _ILHEAD { USHORT usMagic; @@ -73,6 +72,6 @@ typedef struct _ILHEAD WORD flags; SHORT ovls[4]; } ILHEAD; - #include "poppack.h" + #endif /* __WINE_IMAGELIST_H */

1 0