November 2006 - Wine-Commits

Vitaliy Margolen : winecfg: Update Russian translation.
by Alexandre Julliard Nov. 21, 2006

Nov. 21, 2006

Module: wine Branch: master Commit: 05777166b8b70fe4606b9f8ada4fc8ebbc77f076 URL: http://source.winehq.org/git/wine.git/?a=commit;h=05777166b8b70fe4606b9f8ad… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Sun Nov 19 19:22:59 2006 -0700 winecfg: Update Russian translation. --- programs/winecfg/Ru.rc | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/programs/winecfg/Ru.rc b/programs/winecfg/Ru.rc index 2991b4c..73fbf70 100644 --- a/programs/winecfg/Ru.rc +++ b/programs/winecfg/Ru.rc @@ -68,11 +68,10 @@ BEGIN CONTROL "�� DirectX �� ",IDC_DX_MOUSE_GRAB,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,14,235,8 CONTROL "�� ",IDC_DOUBLE_BUFFER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,24,230,8 - CONTROL "�� ",IDC_ENABLE_MANAGED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,34,230,8 + CONTROL "�� Wine",IDC_ENABLE_MANAGED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,34,230,8 - /* FIXME: the wording of this explanation could be a lot better */ - LTEXT "�� , �� '�� ', �� , �� .", - IDC_STATIC,15,125,228,28 + LTEXT "�� , �� '�� ' �� . �� , �� , �� .", + IDC_STATIC,15,117,228,36 LTEXT "�� :",IDC_DESKTOP_SIZE,15,167,44,8,WS_DISABLED LTEXT "X",IDC_DESKTOP_BY,108,167,8,8,WS_DISABLED CONTROL "�� ",IDC_ENABLE_DESKTOP,"Button", @@ -214,13 +213,14 @@ BEGIN IDS_SHOW_ADVANCED "�� " IDS_NOTHEME "(�� )" IDS_TAB_GRAPHICS "��" - IDS_TAB_DESKTOP_INTEGRATION "Desktop Integration" + IDS_TAB_DESKTOP_INTEGRATION "�� " IDS_TAB_AUDIO "��" IDS_TAB_ABOUT "� ��" IDS_WINECFG_TITLE "�� Wine" IDS_WINECFG_TITLE_APP "�� Wine �� %s" IDS_THEMEFILE "�� " IDS_THEMEFILE_SELECT "�� " + IDS_AUDIO_MISSING "�� .\n\n�� . �� , �� .\n\n�� ." IDS_SHELL_FOLDER "�� " IDS_LINKS_TO "�� " END

1 0

Matthew Kehrer : mshtml: Add basic support for ITimer interface.
by Alexandre Julliard Nov. 21, 2006

Nov. 21, 2006

Module: wine Branch: master Commit: ce2f1762751bf8c9f94660d1fff2a70b12a5e557 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce2f1762751bf8c9f94660d1f… Author: Matthew Kehrer <kehrermatt(a)gmail.com> Date: Sun Nov 19 16:59:43 2006 -0600 mshtml: Add basic support for ITimer interface. --- include/.gitignore | 1 + include/Makefile.in | 1 + include/ocmm.idl | 74 +++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 76 insertions(+), 0 deletions(-) diff --git a/include/.gitignore b/include/.gitignore index d3ee3d3..2229c5f 100644 --- a/include/.gitignore +++ b/include/.gitignore @@ -26,6 +26,7 @@ /objidl.h /objsafe.h /ocidl.h +/ocmm.h /oledb.h /oleidl.h /optary.h diff --git a/include/Makefile.in b/include/Makefile.in index 2dc8a68..cb1fe5c 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -32,6 +32,7 @@ WINDOWS_IDL_SRCS = \ objidl.idl \ objsafe.idl \ ocidl.idl \ + ocmm.idl \ oledb.idl \ oleidl.idl \ optary.idl \ diff --git a/include/ocmm.idl b/include/ocmm.idl new file mode 100644 index 0000000..57adf34 --- /dev/null +++ b/include/ocmm.idl @@ -0,0 +1,74 @@ +/* + * Copyright 2006 Matthew Kehrer + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +import "oaidl.idl"; +import "ocidl.idl"; + +cpp_quote("EXTERN_C const GUID NAMEDTIMER_DRAW;") + +[ + object, + uuid(3050F361-98B5-11CF-BB82-00AA00BDCE0B), + pointer_default(unique) +] +interface ITimerSink : IUnknown +{ + HRESULT OnTimer([in] VARIANT vtimeAdvise); +} + + +[ + object, + uuid(3050F360-98B5-11CF-BB82-00AA00BDCE0B), + pointer_default(unique) +] +interface ITimer : IUnknown +{ + HRESULT Advise([in] VARIANT vtimeMin, + [in] VARIANT vtimeMax, + [in] VARIANT vtimeInterval, + [in] DWORD dwFlags, + [in] ITimerSink *pTimerSink, + [out] DWORD *pdwCookie); + + HRESULT Unadvise([in] DWORD dwCookie); + + HRESULT Freeze([in] BOOL fFreeze); + + HRESULT GetTime([out] VARIANT *pvtime); +} + + +[ + object, + uuid(3050F35F-98B5-11CF-BB82-00AA00BDCE0B), + pointer_default(unique) +] +interface ITimerService : IUnknown +{ + HRESULT CreateTimer([in] ITimer *pReferenceTimer, + [out] ITimer **ppNewTimer); + + HRESULT GetNamedTimer([in] REFGUID rguidName, + [out] ITimer **ppTimer); + + HRESULT SetNamedTimerReference([in] REFGUID rguidName, + [in] ITimer *pReferenceTimer); +} + +cpp_quote("#define SID_STimerService IID_ITimerService")

1 0

Dmitry Timoshkov : user32: Add support for DdeEnableCallback(EC_DISABLE) command.
by Alexandre Julliard Nov. 21, 2006

Nov. 21, 2006

Module: wine Branch: master Commit: 3a7bd674795daca2dbf159fce2eb14c44754a68f URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a7bd674795daca2dbf159fce… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Tue Nov 21 14:43:48 2006 +0800 user32: Add support for DdeEnableCallback(EC_DISABLE) command. --- dlls/user32/dde_client.c | 70 +++++++++++++++++++++++++++++--------------- dlls/user32/dde_misc.c | 61 ++++++++++++++++++++++++++++++++++---- dlls/user32/dde_private.h | 3 ++ dlls/user32/dde_server.c | 7 ++++- 4 files changed, 109 insertions(+), 32 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3a7bd674795daca2dbf15…

1 0

Mike McCormack : riched20: Simplify an array size calculation.
by Alexandre Julliard Nov. 21, 2006

Nov. 21, 2006

Module: wine Branch: master Commit: 5b670b68f27ee347c46acb98e641b635ff0dc10c URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b670b68f27ee347c46acb98e… Author: Mike McCormack <mike(a)codeweavers.com> Date: Tue Nov 21 13:48:16 2006 +0900 riched20: Simplify an array size calculation. --- dlls/riched20/reader.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/riched20/reader.c b/dlls/riched20/reader.c index 67eac7c..99431e8 100644 --- a/dlls/riched20/reader.c +++ b/dlls/riched20/reader.c @@ -2325,7 +2325,7 @@ void LookupInit(void) { RTFKey *rp; - memset(rtfHashTable, 0, RTF_KEY_COUNT * 2 * sizeof(*rtfHashTable)); + memset(rtfHashTable, 0, sizeof rtfHashTable); for (rp = rtfKey; rp->rtfKStr != NULL; rp++) { int index;

1 0

Mike McCormack : msi: Fix use of integer fields in MsiFormatRecord.
by Alexandre Julliard Nov. 21, 2006

Nov. 21, 2006

Module: wine Branch: master Commit: 5b8fdad9209570bd2f525b9fe359752ebc2501d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b8fdad9209570bd2f525b9fe… Author: Mike McCormack <mike(a)codeweavers.com> Date: Tue Nov 21 16:40:14 2006 +0900 msi: Fix use of integer fields in MsiFormatRecord. --- dlls/msi/helpers.c | 27 +++++++++++++++++++++++++-- dlls/msi/tests/format.c | 4 ---- 2 files changed, 25 insertions(+), 6 deletions(-) diff --git a/dlls/msi/helpers.c b/dlls/msi/helpers.c index ebd0301..3da5a05 100644 --- a/dlls/msi/helpers.c +++ b/dlls/msi/helpers.c @@ -67,9 +67,32 @@ LPWSTR build_icon_path(MSIPACKAGE *packa return FilePath; } -LPWSTR msi_dup_record_field( MSIRECORD *row, INT index ) +LPWSTR msi_dup_record_field( MSIRECORD *rec, INT field ) { - return strdupW( MSI_RecordGetString(row,index) ); + DWORD sz = 0; + LPWSTR str; + UINT r; + + if (MSI_RecordIsNull( rec, field )) + return NULL; + + r = MSI_RecordGetStringW( rec, field, NULL, &sz ); + if (r != ERROR_SUCCESS) + return NULL; + + sz ++; + str = msi_alloc( sz * sizeof (WCHAR) ); + if (!str) + return str; + str[0] = 0; + r = MSI_RecordGetStringW( rec, field, str, &sz ); + if (r != ERROR_SUCCESS) + { + ERR("failed to get string!\n"); + msi_free( str ); + return NULL; + } + return str; } MSICOMPONENT* get_loaded_component( MSIPACKAGE* package, LPCWSTR Component ) diff --git a/dlls/msi/tests/format.c b/dlls/msi/tests/format.c index 308bd70..37a1c08 100644 --- a/dlls/msi/tests/format.c +++ b/dlls/msi/tests/format.c @@ -927,10 +927,8 @@ static void test_formatrecord(void) sz = sizeof buffer; r = MsiFormatRecord(0, hrec, buffer, &sz); ok( r == ERROR_SUCCESS, "format failed\n"); - todo_wine{ ok( sz == 6, "size wrong\n"); ok( 0 == strcmp(buffer,"123456"), "wrong output (%s)\n",buffer); - } r = MsiRecordSetString(hrec, 0, "[~]"); sz = sizeof buffer; @@ -1634,10 +1632,8 @@ static void test_formatrecord(void) MsiRecordSetString(hrec, 0, "[1] [2]"); r = MsiFormatRecord(0, hrec, buffer, &sz); ok( r == ERROR_SUCCESS, "format failed\n"); - todo_wine { ok( sz == 8, "size wrong(%i)\n",sz); ok( 0 == strcmp(buffer,"100 -100"), "wrong output (%s)\n",buffer); - } MsiCloseHandle( hrec ); }

1 0

Mike McCormack : msi: Test MsiRecordGetString on an integer record fields with a NULL output buffer .
by Alexandre Julliard Nov. 21, 2006

Nov. 21, 2006

Module: wine Branch: master Commit: 8f20756068f88f068a393a7342db8794d9f36bfb URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f20756068f88f068a393a734… Author: Mike McCormack <mike(a)codeweavers.com> Date: Tue Nov 21 15:21:27 2006 +0900 msi: Test MsiRecordGetString on an integer record fields with a NULL output buffer. --- dlls/msi/record.c | 11 +++++++---- dlls/msi/tests/record.c | 9 +++++++++ 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/dlls/msi/record.c b/dlls/msi/record.c index 6705a03..bf01b20 100644 --- a/dlls/msi/record.c +++ b/dlls/msi/record.c @@ -273,7 +273,7 @@ UINT MSI_RecordSetInteger( MSIRECORD *re if( iField > rec->count ) return ERROR_INVALID_PARAMETER; - + MSI_FreeField( &rec->fields[iField] ); rec->fields[iField].type = MSIFIELD_INT; rec->fields[iField].u.iVal = iVal; @@ -346,7 +346,8 @@ UINT MSI_RecordGetStringA(MSIRECORD *rec case MSIFIELD_INT: wsprintfA(buffer, "%d", rec->fields[iField].u.iVal); len = lstrlenA( buffer ); - lstrcpynA(szValue, buffer, *pcchValue); + if (szValue) + lstrcpynA(szValue, buffer, *pcchValue); break; case MSIFIELD_WSTR: len = WideCharToMultiByte( CP_ACP, 0, rec->fields[iField].u.szwVal, -1, @@ -421,11 +422,13 @@ UINT MSI_RecordGetStringW(MSIRECORD *rec case MSIFIELD_INT: wsprintfW(buffer, szFormat, rec->fields[iField].u.iVal); len = lstrlenW( buffer ); - lstrcpynW(szValue, buffer, *pcchValue); + if (szValue) + lstrcpynW(szValue, buffer, *pcchValue); break; case MSIFIELD_WSTR: len = lstrlenW( rec->fields[iField].u.szwVal ); - lstrcpynW(szValue, rec->fields[iField].u.szwVal, *pcchValue); + if (szValue) + lstrcpynW(szValue, rec->fields[iField].u.szwVal, *pcchValue); break; case MSIFIELD_NULL: len = 1; diff --git a/dlls/msi/tests/record.c b/dlls/msi/tests/record.c index 8bf6489..1f72d12 100644 --- a/dlls/msi/tests/record.c +++ b/dlls/msi/tests/record.c @@ -250,6 +250,10 @@ static void test_msirecord(void) /* same record, try converting integers to strings */ r = MsiRecordSetInteger(h, 0, 32); ok(r == ERROR_SUCCESS, "Failed to set integer at 0 to 32\n"); + sz = 1; + r = MsiRecordGetString(h, 0, NULL, &sz); + ok(r == ERROR_SUCCESS, "failed to get string from integer\n"); + ok(sz == 2, "length wrong\n"); buf[0]=0; sz = sizeof buf; r = MsiRecordGetString(h, 0, buf, &sz); @@ -258,10 +262,15 @@ static void test_msirecord(void) r = MsiRecordSetInteger(h, 0, -32); ok(r == ERROR_SUCCESS, "Failed to set integer at 0 to 32\n"); buf[0]=0; + sz = 1; + r = MsiRecordGetString(h, 0, NULL, &sz); + ok(r == ERROR_SUCCESS, "failed to get string from integer\n"); + ok(sz == 3, "length wrong\n"); sz = sizeof buf; r = MsiRecordGetString(h, 0, buf, &sz); ok(r == ERROR_SUCCESS, "failed to get string from integer\n"); ok(0==strcmp(buf,"-32"), "failed to get string from integer\n"); + buf[0]=0; /* same record, now try streams */ r = MsiRecordSetStream(h, 0, NULL);

1 0

Mike McCormack : msi: Add a test for formatting records with strings.
by Alexandre Julliard Nov. 21, 2006

Nov. 21, 2006

Module: wine Branch: master Commit: 99129d20a6927b707a89165a5351c9ed26e0af3c URL: http://source.winehq.org/git/wine.git/?a=commit;h=99129d20a6927b707a89165a5… Author: Mike McCormack <mike(a)codeweavers.com> Date: Tue Nov 21 15:21:13 2006 +0900 msi: Add a test for formatting records with strings. --- dlls/msi/tests/format.c | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/dlls/msi/tests/format.c b/dlls/msi/tests/format.c index f3ae027..308bd70 100644 --- a/dlls/msi/tests/format.c +++ b/dlls/msi/tests/format.c @@ -1628,6 +1628,17 @@ static void test_formatrecord(void) ok( 0 == strcmp(buffer,"}}"), "wrong output (%s)\n",buffer); } + sz = sizeof buffer; + MsiRecordSetInteger(hrec, 1, 100); + MsiRecordSetInteger(hrec, 2, -100); + MsiRecordSetString(hrec, 0, "[1] [2]"); + r = MsiFormatRecord(0, hrec, buffer, &sz); + ok( r == ERROR_SUCCESS, "format failed\n"); + todo_wine { + ok( sz == 8, "size wrong(%i)\n",sz); + ok( 0 == strcmp(buffer,"100 -100"), "wrong output (%s)\n",buffer); + } + MsiCloseHandle( hrec ); }

1 0

Mike McCormack : msi: Don' t access the list of controls after the dialog is destroyed.
by Alexandre Julliard Nov. 21, 2006

Nov. 21, 2006

Module: wine Branch: master Commit: ed663fe216e1d566fadea0cf7cfeea646667eb9c URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed663fe216e1d566fadea0cf7… Author: Mike McCormack <mike(a)codeweavers.com> Date: Tue Nov 21 13:48:07 2006 +0900 msi: Don't access the list of controls after the dialog is destroyed. --- dlls/msi/dialog.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/msi/dialog.c b/dlls/msi/dialog.c index c13bcc4..b050497 100644 --- a/dlls/msi/dialog.c +++ b/dlls/msi/dialog.c @@ -175,6 +175,8 @@ static msi_control *msi_dialog_find_cont if( !name ) return NULL; + if( !dialog->hwnd ) + return NULL; LIST_FOR_EACH_ENTRY( control, &dialog->controls, msi_control, entry ) if( !strcmpW( control->name, name ) ) /* FIXME: case sensitive? */ return control; @@ -187,6 +189,8 @@ static msi_control *msi_dialog_find_cont if( !type ) return NULL; + if( !dialog->hwnd ) + return NULL; LIST_FOR_EACH_ENTRY( control, &dialog->controls, msi_control, entry ) if( !strcmpW( control->type, type ) ) /* FIXME: case sensitive? */ return control; @@ -197,6 +201,8 @@ static msi_control *msi_dialog_find_cont { msi_control *control; + if( !dialog->hwnd ) + return NULL; LIST_FOR_EACH_ENTRY( control, &dialog->controls, msi_control, entry ) if( hwnd == control->hwnd ) return control;

1 0

Mike McCormack : msi: Create a function to free control data.
by Alexandre Julliard Nov. 21, 2006

Nov. 21, 2006

Module: wine Branch: master Commit: 6a2fb054514ac56c8d330466d96cc11f05eed821 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a2fb054514ac56c8d330466d… Author: Mike McCormack <mike(a)codeweavers.com> Date: Tue Nov 21 13:47:58 2006 +0900 msi: Create a function to free control data. --- dlls/msi/dialog.c | 41 ++++++++++++++++++++++++----------------- 1 files changed, 24 insertions(+), 17 deletions(-) diff --git a/dlls/msi/dialog.c b/dlls/msi/dialog.c index 44c56f6..c13bcc4 100644 --- a/dlls/msi/dialog.c +++ b/dlls/msi/dialog.c @@ -373,6 +373,23 @@ static UINT msi_dialog_build_font_list( return r; } +static void msi_destroy_control( msi_control *t ) +{ + list_remove( &t->entry ); + /* leave dialog->hwnd - destroying parent destroys child windows */ + msi_free( t->property ); + msi_free( t->value ); + if( t->hBitmap ) + DeleteObject( t->hBitmap ); + if( t->hIcon ) + DestroyIcon( t->hIcon ); + msi_free( t->tabnext ); + msi_free( t->type ); + if (t->hDll) + FreeLibrary( t->hDll ); + msi_free( t ); +} + static msi_control *msi_dialog_create_window( msi_dialog *dialog, MSIRECORD *rec, DWORD exstyle, LPCWSTR szCls, LPCWSTR name, LPCWSTR text, DWORD style, HWND parent ) @@ -3150,7 +3167,7 @@ static LRESULT WINAPI MSIDialog_WndProc( dialog->package->center_x = LOWORD(lParam) + dialog->size.cx / 2.0; dialog->package->center_y = HIWORD(lParam) + dialog->size.cy / 2.0; break; - + case WM_CREATE: return msi_dialog_oncreate( hwnd, (LPCREATESTRUCTW)lParam ); @@ -3370,28 +3387,18 @@ void msi_dialog_destroy( msi_dialog *dia if( dialog->hwnd ) ShowWindow( dialog->hwnd, SW_HIDE ); - + if( dialog->hwnd ) DestroyWindow( dialog->hwnd ); /* destroy the list of controls */ while( !list_empty( &dialog->controls ) ) { - msi_control *t = LIST_ENTRY( list_head( &dialog->controls ), - msi_control, entry ); - list_remove( &t->entry ); - /* leave dialog->hwnd - destroying parent destroys child windows */ - msi_free( t->property ); - msi_free( t->value ); - if( t->hBitmap ) - DeleteObject( t->hBitmap ); - if( t->hIcon ) - DestroyIcon( t->hIcon ); - msi_free( t->tabnext ); - msi_free( t->type ); - if (t->hDll) - FreeLibrary( t->hDll ); - msi_free( t ); + msi_control *t; + + t = LIST_ENTRY( list_head( &dialog->controls ), + msi_control, entry ); + msi_destroy_control( t ); } /* destroy the list of fonts */

1 0

Mike McCormack : msi: Fix an access after freeing memory.
by Alexandre Julliard Nov. 21, 2006

Nov. 21, 2006

Module: wine Branch: master Commit: fbfc221a7734238e49d66a2ec4eefd0ac3ab03f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fbfc221a7734238e49d66a2ec… Author: Mike McCormack <mike(a)codeweavers.com> Date: Tue Nov 21 13:47:42 2006 +0900 msi: Fix an access after freeing memory. --- dlls/msi/dialog.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msi/dialog.c b/dlls/msi/dialog.c index 9fe5b8e..44c56f6 100644 --- a/dlls/msi/dialog.c +++ b/dlls/msi/dialog.c @@ -3389,9 +3389,9 @@ void msi_dialog_destroy( msi_dialog *dia DestroyIcon( t->hIcon ); msi_free( t->tabnext ); msi_free( t->type ); - msi_free( t ); if (t->hDll) FreeLibrary( t->hDll ); + msi_free( t ); } /* destroy the list of fonts */

1 0