wine-commits December 2010

wine-commits@winehq.org

2 participants
1099 discussions

Michael Stefaniuc : shell32/tests: Standardize the COM usage in shlview.c.
by Alexandre Julliard 08 Dec '10

08 Dec '10

Module: wine Branch: master Commit: 2a2020d997cc9572ce3e82089d75e0c399aafa4d URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a2020d997cc9572ce3e82089… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Dec 8 13:15:20 2010 +0100 shell32/tests: Standardize the COM usage in shlview.c. --- dlls/shell32/tests/shlview.c | 34 ++++++++++++++++++++++------------ 1 files changed, 22 insertions(+), 12 deletions(-) diff --git a/dlls/shell32/tests/shlview.c b/dlls/shell32/tests/shlview.c index 271f9bc..6534970 100644 --- a/dlls/shell32/tests/shlview.c +++ b/dlls/shell32/tests/shlview.c @@ -136,26 +136,31 @@ static void verify_msgs_in_(struct msg_sequence *seq, const UINT *msgs, /* dummy IDataObject implementation */ typedef struct { - const IDataObjectVtbl *lpVtbl; + IDataObject IDataObject_iface; LONG ref; } IDataObjectImpl; static const IDataObjectVtbl IDataObjectImpl_Vtbl; +static inline IDataObjectImpl *impl_from_IDataObject(IDataObject *iface) +{ + return CONTAINING_RECORD(iface, IDataObjectImpl, IDataObject_iface); +} + static IDataObject* IDataObjectImpl_Construct(void) { IDataObjectImpl *obj; obj = HeapAlloc(GetProcessHeap(), 0, sizeof(*obj)); - obj->lpVtbl = &IDataObjectImpl_Vtbl; + obj->IDataObject_iface.lpVtbl = &IDataObjectImpl_Vtbl; obj->ref = 1; - return (IDataObject*)obj; + return &obj->IDataObject_iface; } static HRESULT WINAPI IDataObjectImpl_QueryInterface(IDataObject *iface, REFIID riid, void **ppvObj) { - IDataObjectImpl *This = (IDataObjectImpl *)iface; + IDataObjectImpl *This = impl_from_IDataObject(iface); if (IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IDataObject)) @@ -174,13 +179,13 @@ static HRESULT WINAPI IDataObjectImpl_QueryInterface(IDataObject *iface, REFIID static ULONG WINAPI IDataObjectImpl_AddRef(IDataObject * iface) { - IDataObjectImpl *This = (IDataObjectImpl *)iface; + IDataObjectImpl *This = impl_from_IDataObject(iface); return InterlockedIncrement(&This->ref); } static ULONG WINAPI IDataObjectImpl_Release(IDataObject * iface) { - IDataObjectImpl *This = (IDataObjectImpl *)iface; + IDataObjectImpl *This = impl_from_IDataObject(iface); ULONG ref = InterlockedDecrement(&This->ref); if (!ref) @@ -258,28 +263,33 @@ static const IDataObjectVtbl IDataObjectImpl_Vtbl = /* dummy IShellBrowser implementation */ typedef struct { - const IShellBrowserVtbl *lpVtbl; + IShellBrowser IShellBrowser_iface; LONG ref; } IShellBrowserImpl; static const IShellBrowserVtbl IShellBrowserImpl_Vtbl; +static inline IShellBrowserImpl *impl_from_IShellBrowser(IShellBrowser *iface) +{ + return CONTAINING_RECORD(iface, IShellBrowserImpl, IShellBrowser_iface); +} + static IShellBrowser* IShellBrowserImpl_Construct(void) { IShellBrowserImpl *browser; browser = HeapAlloc(GetProcessHeap(), 0, sizeof(*browser)); - browser->lpVtbl = &IShellBrowserImpl_Vtbl; + browser->IShellBrowser_iface.lpVtbl = &IShellBrowserImpl_Vtbl; browser->ref = 1; - return (IShellBrowser*)browser; + return &browser->IShellBrowser_iface; } static HRESULT WINAPI IShellBrowserImpl_QueryInterface(IShellBrowser *iface, REFIID riid, LPVOID *ppvObj) { - IShellBrowserImpl *This = (IShellBrowserImpl *)iface; + IShellBrowserImpl *This = impl_from_IShellBrowser(iface); *ppvObj = NULL; @@ -301,13 +311,13 @@ static HRESULT WINAPI IShellBrowserImpl_QueryInterface(IShellBrowser *iface, static ULONG WINAPI IShellBrowserImpl_AddRef(IShellBrowser * iface) { - IShellBrowserImpl *This = (IShellBrowserImpl *)iface; + IShellBrowserImpl *This = impl_from_IShellBrowser(iface); return InterlockedIncrement(&This->ref); } static ULONG WINAPI IShellBrowserImpl_Release(IShellBrowser * iface) { - IShellBrowserImpl *This = (IShellBrowserImpl *)iface; + IShellBrowserImpl *This = impl_from_IShellBrowser(iface); ULONG ref = InterlockedDecrement(&This->ref); if (!ref)

1 0

Michael Stefaniuc : ole32: Use an iface instead of a vtbl pointer in PropertyStorage_impl.
by Alexandre Julliard 08 Dec '10

08 Dec '10

Module: wine Branch: master Commit: e13f9ff300ed23fafb8bb505d9b6ba0360c7dfe0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e13f9ff300ed23fafb8bb505d… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Dec 8 13:15:12 2010 +0100 ole32: Use an iface instead of a vtbl pointer in PropertyStorage_impl. --- dlls/ole32/stg_prop.c | 41 +++++++++++++++++++++++------------------ 1 files changed, 23 insertions(+), 18 deletions(-) diff --git a/dlls/ole32/stg_prop.c b/dlls/ole32/stg_prop.c index 65b4b2e..cc29c0e 100644 --- a/dlls/ole32/stg_prop.c +++ b/dlls/ole32/stg_prop.c @@ -152,7 +152,7 @@ static HRESULT create_EnumSTATPROPSTG(PropertyStorage_impl *, IEnumSTATPROPSTG** */ struct tagPropertyStorage_impl { - const IPropertyStorageVtbl *vtbl; + IPropertyStorage IPropertyStorage_iface; LONG ref; CRITICAL_SECTION cs; IStream *stm; @@ -171,6 +171,11 @@ struct tagPropertyStorage_impl struct dictionary *propid_to_prop; }; +static inline PropertyStorage_impl *impl_from_IPropertyStorage(IPropertyStorage *iface) +{ + return CONTAINING_RECORD(iface, PropertyStorage_impl, IPropertyStorage_iface); +} + /************************************************************************ * IPropertyStorage_fnQueryInterface (IPropertyStorage) */ @@ -179,7 +184,7 @@ static HRESULT WINAPI IPropertyStorage_fnQueryInterface( REFIID riid, void** ppvObject) { - PropertyStorage_impl *This = (PropertyStorage_impl *)iface; + PropertyStorage_impl *This = impl_from_IPropertyStorage(iface); TRACE("(%p, %s, %p)\n", This, debugstr_guid(riid), ppvObject); @@ -205,7 +210,7 @@ static HRESULT WINAPI IPropertyStorage_fnQueryInterface( static ULONG WINAPI IPropertyStorage_fnAddRef( IPropertyStorage *iface) { - PropertyStorage_impl *This = (PropertyStorage_impl *)iface; + PropertyStorage_impl *This = impl_from_IPropertyStorage(iface); return InterlockedIncrement(&This->ref); } @@ -215,7 +220,7 @@ static ULONG WINAPI IPropertyStorage_fnAddRef( static ULONG WINAPI IPropertyStorage_fnRelease( IPropertyStorage *iface) { - PropertyStorage_impl *This = (PropertyStorage_impl *)iface; + PropertyStorage_impl *This = impl_from_IPropertyStorage(iface); ULONG ref; ref = InterlockedDecrement(&This->ref); @@ -293,7 +298,7 @@ static HRESULT WINAPI IPropertyStorage_fnReadMultiple( const PROPSPEC rgpspec[], PROPVARIANT rgpropvar[]) { - PropertyStorage_impl *This = (PropertyStorage_impl *)iface; + PropertyStorage_impl *This = impl_from_IPropertyStorage(iface); HRESULT hr = S_OK; ULONG i; @@ -551,7 +556,7 @@ static HRESULT WINAPI IPropertyStorage_fnWriteMultiple( const PROPVARIANT rgpropvar[], PROPID propidNameFirst) { - PropertyStorage_impl *This = (PropertyStorage_impl *)iface; + PropertyStorage_impl *This = impl_from_IPropertyStorage(iface); HRESULT hr = S_OK; ULONG i; @@ -650,7 +655,7 @@ static HRESULT WINAPI IPropertyStorage_fnDeleteMultiple( ULONG cpspec, const PROPSPEC rgpspec[]) { - PropertyStorage_impl *This = (PropertyStorage_impl *)iface; + PropertyStorage_impl *This = impl_from_IPropertyStorage(iface); ULONG i; HRESULT hr; @@ -696,7 +701,7 @@ static HRESULT WINAPI IPropertyStorage_fnReadPropertyNames( const PROPID rgpropid[], LPOLESTR rglpwstrName[]) { - PropertyStorage_impl *This = (PropertyStorage_impl *)iface; + PropertyStorage_impl *This = impl_from_IPropertyStorage(iface); ULONG i; HRESULT hr = S_FALSE; @@ -736,7 +741,7 @@ static HRESULT WINAPI IPropertyStorage_fnWritePropertyNames( const PROPID rgpropid[], const LPOLESTR rglpwstrName[]) { - PropertyStorage_impl *This = (PropertyStorage_impl *)iface; + PropertyStorage_impl *This = impl_from_IPropertyStorage(iface); ULONG i; HRESULT hr; @@ -769,7 +774,7 @@ static HRESULT WINAPI IPropertyStorage_fnDeletePropertyNames( ULONG cpropid, const PROPID rgpropid[]) { - PropertyStorage_impl *This = (PropertyStorage_impl *)iface; + PropertyStorage_impl *This = impl_from_IPropertyStorage(iface); ULONG i; HRESULT hr; @@ -805,7 +810,7 @@ static HRESULT WINAPI IPropertyStorage_fnCommit( IPropertyStorage* iface, DWORD grfCommitFlags) { - PropertyStorage_impl *This = (PropertyStorage_impl *)iface; + PropertyStorage_impl *This = impl_from_IPropertyStorage(iface); HRESULT hr; TRACE("(%p, 0x%08x)\n", iface, grfCommitFlags); @@ -828,7 +833,7 @@ static HRESULT WINAPI IPropertyStorage_fnRevert( IPropertyStorage* iface) { HRESULT hr; - PropertyStorage_impl *This = (PropertyStorage_impl *)iface; + PropertyStorage_impl *This = impl_from_IPropertyStorage(iface); TRACE("%p\n", iface); @@ -853,7 +858,7 @@ static HRESULT WINAPI IPropertyStorage_fnEnum( IPropertyStorage* iface, IEnumSTATPROPSTG** ppenum) { - PropertyStorage_impl *This = (PropertyStorage_impl *)iface; + PropertyStorage_impl *This = impl_from_IPropertyStorage(iface); return create_EnumSTATPROPSTG(This, ppenum); } @@ -877,7 +882,7 @@ static HRESULT WINAPI IPropertyStorage_fnSetClass( IPropertyStorage* iface, REFCLSID clsid) { - PropertyStorage_impl *This = (PropertyStorage_impl *)iface; + PropertyStorage_impl *This = impl_from_IPropertyStorage(iface); TRACE("%p, %s\n", iface, debugstr_guid(clsid)); @@ -899,7 +904,7 @@ static HRESULT WINAPI IPropertyStorage_fnStat( IPropertyStorage* iface, STATPROPSETSTG* statpsstg) { - PropertyStorage_impl *This = (PropertyStorage_impl *)iface; + PropertyStorage_impl *This = impl_from_IPropertyStorage(iface); STATSTG stat; HRESULT hr; @@ -1979,7 +1984,7 @@ static HRESULT PropertyStorage_BaseConstruct(IStream *stm, if (!*pps) return E_OUTOFMEMORY; - (*pps)->vtbl = &IPropertyStorage_Vtbl; + (*pps)->IPropertyStorage_iface.lpVtbl = &IPropertyStorage_Vtbl; (*pps)->ref = 1; InitializeCriticalSection(&(*pps)->cs); (*pps)->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": PropertyStorage_impl.cs"); @@ -2013,7 +2018,7 @@ static HRESULT PropertyStorage_ConstructFromStream(IStream *stm, hr = PropertyStorage_ReadFromStream(ps); if (SUCCEEDED(hr)) { - *pps = (IPropertyStorage *)ps; + *pps = &ps->IPropertyStorage_iface; TRACE("PropertyStorage %p constructed\n", ps); hr = S_OK; } @@ -2047,7 +2052,7 @@ static HRESULT PropertyStorage_ConstructEmpty(IStream *stm, ps->codePage = CP_UNICODE; ps->locale = LOCALE_SYSTEM_DEFAULT; TRACE("Code page is %d, locale is %d\n", ps->codePage, ps->locale); - *pps = (IPropertyStorage *)ps; + *pps = &ps->IPropertyStorage_iface; TRACE("PropertyStorage %p constructed\n", ps); hr = S_OK; }

1 0

Hwang YunSong : appwiz.cpl: Update Korean resource.
by Alexandre Julliard 08 Dec '10

08 Dec '10

Module: wine Branch: master Commit: 792051baaf1e8df173e2e0cfea0bb440645c67a7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=792051baaf1e8df173e2e0cfe… Author: Hwang YunSong <hys545(a)dreamwiz.com> Date: Wed Dec 8 17:27:01 2010 +0900 appwiz.cpl: Update Korean resource. --- dlls/appwiz.cpl/Ko.rc | 83 +++++++++++++++++++++++++++++++----------------- 1 files changed, 53 insertions(+), 30 deletions(-) diff --git a/dlls/appwiz.cpl/Ko.rc b/dlls/appwiz.cpl/Ko.rc index d76bb97..711d7a3 100644 --- a/dlls/appwiz.cpl/Ko.rc +++ b/dlls/appwiz.cpl/Ko.rc @@ -2,7 +2,7 @@ * Add/Remove Programs Korean resources * * Copyright 2001-2002, 2008 Owen Rudge -* Copyright 2005,2006,2007,2008 YunSong Hwang +* Copyright 2005,2006,2007,2008,2010 YunSong Hwang * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -22,57 +22,65 @@ #include "res.h" +#pragma code_page(65001) + LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT STRINGTABLE { - IDS_CPL_TITLE, "��α׷� �߰�/��" - IDS_CPL_DESC, "�� Ʈ�� ��ġ�ϰų�,�̹� ��ġ�� Ʈ�� �� ǻ�Ϳ�� ֽ��ϴ�." - IDS_TAB1_TITLE, "��α׷�" + IDS_CPL_TITLE, "프로그램 추가/삭제" + IDS_CPL_DESC, "새 소프트웨어를 설치하거나,이미 설치된 소프트웨어를 당신의 컴퓨터에서 삭제 할 수 있습니다." + IDS_TAB1_TITLE, "프로그램" + + IDS_UNINSTALL_FAILED, "언인스톨러를 실행할 수 없습니다, '%s'. 당신은 이 프로그램의 언인스톨 정보를 레지스트리에서 지우겠습니까?" + IDS_NOT_SPECIFIED, "지정되지 않음" + IDS_COLUMN_NAME, "이름" + IDS_COLUMN_PUBLISHER, "제작사" + IDS_COLUMN_VERSION, "버젼" + IDS_INSTALL_FILTER, "설치 프로그램0*instal*.exe;*setup*.exe;*.msi\0프로그램 (*.exe)\0*.exe\0모든 파일들 (*.*)\0*.*\0\0" - IDS_UNINSTALL_FAILED, "��ν��緯�� ϴ�, '%s'. �� α׷�� ν�� Ʈ�� ڽ��ϱ�?" - IDS_NOT_SPECIFIED, "�� " - IDS_COLUMN_NAME, "�̸�" - IDS_COLUMN_PUBLISHER, "��ۻ�" - IDS_COLUMN_VERSION, "��" - IDS_INSTALL_FILTER, "��ġ ��α׷�0*instal*.exe;*setup*.exe;*.msi\0��α׷� (*.exe)\0*.exe\0�� ϵ� (*.*)\0*.*\0\0" + IDS_REMOVE, "제거(&R)..." + IDS_MODIFY_REMOVE, "고치기(&M)/제거..." +} - IDS_REMOVE, "��(&R)..." - IDS_MODIFY_REMOVE, "��ġ��(&M)/��..." +STRINGTABLE +{ + IDS_DOWNLOADING "다운로드중..." + IDS_INSTALLING "설치하는 중..." } IDD_MAIN DIALOG 0, 0, 320, 220 STYLE DS_MODALFRAME | DS_3DLOOK | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "��ġ/��" +CAPTION "설치/삭제" FONT 9, "MS Shell Dlg" { - CONTROL "�÷�� ũ�� õ��̳� ,�ϵ��ũ�� α׷�� ġ�Ϸ�� [��ġ]�� Ŭ��Ͻʽÿ�.", 1000, "STATIC", SS_LEFT | WS_CHILD | WS_VISIBLE | WS_GROUP, 40, 7, 270, 20 - CONTROL "��ġ(&I)...", IDC_INSTALL, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 246, 26, 64, 14 + CONTROL "플로피 디스크나 시디롬이나 ,하드디스크에서 새 프로그램을 설치하려면 [설치]를 클릭하십시오.", 1000, "STATIC", SS_LEFT | WS_CHILD | WS_VISIBLE | WS_GROUP, 40, 7, 270, 20 + CONTROL "설치(&I)...", IDC_INSTALL, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 246, 26, 64, 14 CONTROL "", -1, "STATIC", SS_LEFT | SS_SUNKEN | WS_CHILD | WS_VISIBLE, 7, 46, 303, 1 CONTROL 2, 1001, "STATIC", SS_ICON | WS_CHILD | WS_VISIBLE, 7, 7, 21, 20 - CONTROL "�� Ʈ�� ڵ�� Ǿ�� ֽ��ϴ�.��ġ�� Ҹ� ��ġ�ų� ��α׷�� , �߰�/�� Ͽ�� Ͻʽÿ�..", 1002, "STATIC", SS_LEFT | WS_CHILD | WS_VISIBLE | WS_GROUP, 40, 57, 270, 36 + CONTROL "이 소프트웨어는 자동으로 삭제되었을 수도 있습니다.설치된 구성요소를 고치거나 프로그램을 지우려면 , 추가/삭제 목록에서 선택하십시오..", 1002, "STATIC", SS_LEFT | WS_CHILD | WS_VISIBLE | WS_GROUP, 40, 57, 270, 36 CONTROL "", IDL_PROGRAMS, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SORTASCENDING | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 7, 90, 303, 100 - CONTROL "�� (&S)...", IDC_SUPPORT_INFO, "button", BS_PUSHBUTTON | BS_CENTER | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 104, 198, 64, 14 - CONTROL "��ġ��(&M)...", IDC_MODIFY, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 172, 198, 68, 14 - CONTROL "��(&R)...", IDC_ADDREMOVE, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 244, 198, 68, 14 + CONTROL "지원 정보(&S)...", IDC_SUPPORT_INFO, "button", BS_PUSHBUTTON | BS_CENTER | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 104, 198, 64, 14 + CONTROL "고치기(&M)...", IDC_MODIFY, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 172, 198, 68, 14 + CONTROL "지우기(&R)...", IDC_ADDREMOVE, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 244, 198, 68, 14 CONTROL 3, 1003, "STATIC", SS_ICON | WS_CHILD | WS_VISIBLE, 7, 57, 21, 20 } IDD_INFO DIALOG 0, 0, 256, 138 STYLE DS_MODALFRAME | DS_3DLOOK | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "�� " +CAPTION "지원 정보" FONT 9, "MS Shell Dlg" { - CONTROL "Ȯ��", IDOK, "BUTTON", BS_DEFPUSHBUTTON | BS_CENTER | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 103, 116, 50, 14 - CONTROL "�� %s: �� ޱ� �� ˴ϴ�", IDC_INFO_LABEL, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 12, 9, 228, 19 - CONTROL "��ۻ�:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 30, 60, 8 - CONTROL "��:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 40, 60, 8 - CONTROL "��ó:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 50, 60, 8 - CONTROL "�� :", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 60, 64, 8 - CONTROL "�� ȭ:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 70, 68, 8 - CONTROL "��ǻ��:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 80, 60, 8 - CONTROL "��ǰ ��Ʈ:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 90, 60, 8 - CONTROL "��:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 100, 60, 8 + CONTROL "확인", IDOK, "BUTTON", BS_DEFPUSHBUTTON | BS_CENTER | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 103, 116, 50, 14 + CONTROL "이 정보는 %s: 에서 기술 지원을 받기 위해 사용됩니다", IDC_INFO_LABEL, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 12, 9, 228, 19 + CONTROL "제작사:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 30, 60, 8 + CONTROL "버젼:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 40, 60, 8 + CONTROL "연락처:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 50, 60, 8 + CONTROL "지원 정보:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 60, 64, 8 + CONTROL "지원 전화:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 70, 68, 8 + CONTROL "주의사항:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 80, 60, 8 + CONTROL "제품 업데이트:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 90, 60, 8 + CONTROL "설명:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 100, 60, 8 CONTROL "", IDC_INFO_PUBLISHER, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 104, 30, 136, 8 CONTROL "", IDC_INFO_VERSION, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 104, 40, 136, 8 CONTROL "", IDC_INFO_CONTACT, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 104, 50, 136, 8 @@ -82,3 +90,18 @@ FONT 9, "MS Shell Dlg" CONTROL "", IDC_INFO_UPDATES, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 104, 90, 136, 8 CONTROL "", IDC_INFO_COMMENTS, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 104, 100, 136, 8 } + +ID_DWL_DIALOG DIALOG 0, 0, 260, 95 +STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Wine Gecko 설치관리자" +FONT 8, "MS Shell Dlg" +{ + LTEXT "Wine은 HTML 임베딩 프로그램이 정상적으로 작동하기 위해서 " \ + "필요로 하는 Gecko 패키지를 찾을 수 없습니다. WIne은 당신을 위해 자동으로 다운로드하고 설치할 것입니다.\n\n\n" \ + "주위:당신의 배포판의 패키지를 대신 사용하는 것을 추천합니다. " \ + "자세한 것은 http://wiki.winehq.org/Gecko를 보십시오.", + ID_DWL_STATUS, 10, 10, 240, 60, SS_LEFT + CONTROL "진행상황", ID_DWL_PROGRESS, PROGRESS_CLASSA, WS_BORDER|PBS_SMOOTH, 10, 40, 240, 12 + DEFPUSHBUTTON "설치(&I)", ID_DWL_INSTALL, 200, 70, 50, 15, WS_GROUP | WS_TABSTOP + PUSHBUTTON "취소(&C)", IDCANCEL, 140, 70, 50, 15, WS_GROUP | WS_TABSTOP +}

1 0

Alexandre Julliard : ws2_32: Fix a compile failure when control messages are not supported.
by Alexandre Julliard 08 Dec '10

08 Dec '10

Module: wine Branch: master Commit: 58a1c0d50d446e34428cd0946a5ec998994888f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=58a1c0d50d446e34428cd0946… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 8 16:24:23 2010 +0100 ws2_32: Fix a compile failure when control messages are not supported. --- dlls/ws2_32/socket.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index f1c689e..3d85bad 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -1525,7 +1525,7 @@ static int WS2_recv( int fd, struct ws2_async *wsa ) if (wsa->control) { ERR("Message control headers cannot be properly supported on this system.\n"); - control->len = 0; + wsa->control->len = 0; } #else if (wsa->control && !convert_control_headers(&hdr, wsa->control))

1 0

Alexandre Julliard : msxml6: Convert dll registration to the IRegistrar mechanism.
by Alexandre Julliard 08 Dec '10

08 Dec '10

Module: wine Branch: master Commit: 33763656bdd6991868bc0e1a17ab33209a9a6641 URL: http://source.winehq.org/git/wine.git/?a=commit;h=33763656bdd6991868bc0e1a1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 8 15:21:04 2010 +0100 msxml6: Convert dll registration to the IRegistrar mechanism. --- dlls/msxml6/Makefile.in | 4 +- dlls/msxml6/main.c | 25 +++- dlls/msxml6/regsvr.c | 476 ----------------------------------------------- include/msxml6.idl | 33 ++++ 4 files changed, 58 insertions(+), 480 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=33763656bdd6991868bc0…

1 0

Alexandre Julliard : widl: Improve registration of coclasses contained in typelibs.
by Alexandre Julliard 08 Dec '10

08 Dec '10

Module: wine Branch: master Commit: 2dc85894a73544e834ddef01d4c45bbc91c4fd1f URL: http://source.winehq.org/git/wine.git/?a=commit;h=2dc85894a73544e834ddef01d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 8 14:54:08 2010 +0100 widl: Improve registration of coclasses contained in typelibs. --- tools/widl/register.c | 23 ++++++++++++++--------- 1 files changed, 14 insertions(+), 9 deletions(-) diff --git a/tools/widl/register.c b/tools/widl/register.c index e3d3875..736ec2c 100644 --- a/tools/widl/register.c +++ b/tools/widl/register.c @@ -90,15 +90,13 @@ static int write_interfaces( const statement_list_t *stmts ) if (stmts) LIST_FOR_EACH_ENTRY( stmt, stmts, const statement_t, entry ) { - if (stmt->type == STMT_LIBRARY) - count += write_interfaces( stmt->u.lib->stmts ); - else if (stmt->type == STMT_TYPE && type_get_type( stmt->u.type ) == TYPE_INTERFACE) + if (stmt->type == STMT_TYPE && type_get_type( stmt->u.type ) == TYPE_INTERFACE) count += write_interface( stmt->u.type ); } return count; } -static int write_coclass( const type_t *class ) +static int write_coclass( const type_t *class, const typelib_t *typelib ) { const UUID *uuid = get_attrp( class->attrs, ATTR_UUID ); const char *descr = get_attrp( class->attrs, ATTR_HELPSTRING ); @@ -107,20 +105,27 @@ static int write_coclass( const type_t *class ) const char *threading = get_coclass_threading( class ); if (!uuid) return 0; + if (typelib && !threading) return 0; if (!descr) descr = class->name; put_str( indent, "ForceRemove '%s' = s '%s'\n", format_uuid( uuid ), descr ); put_str( indent++, "{\n" ); if (threading) put_str( indent, "InprocServer32 = s '%%MODULE%%' { val ThreadingModel = s '%s' }\n", threading ); - if (progid || vi_progid) put_str( indent, "CLSID = s '%s'\n", descr ); if (progid) put_str( indent, "ProgId = s '%s'\n", progid ); + if (typelib) + { + const UUID *typelib_uuid = get_attrp( typelib->attrs, ATTR_UUID ); + const unsigned int version = get_attrv( typelib->attrs, ATTR_VERSION ); + put_str( indent, "TypeLib = s '%s'\n", format_uuid( typelib_uuid )); + put_str( indent, "Version = s '%u.%u'\n", MAJORVERSION(version), MINORVERSION(version) ); + } if (vi_progid) put_str( indent, "VersionIndependentProgId = s '%s'\n", vi_progid ); put_str( --indent, "}\n" ); return 1; } -static void write_coclasses( const statement_list_t *stmts, const UUID *typelib_uuid ) +static void write_coclasses( const statement_list_t *stmts, const typelib_t *typelib ) { const statement_t *stmt; @@ -129,12 +134,12 @@ static void write_coclasses( const statement_list_t *stmts, const UUID *typelib_ if (stmt->type == STMT_TYPE) { const type_t *type = stmt->u.type; - if (type_get_type(type) == TYPE_COCLASS) write_coclass( type ); + if (type_get_type(type) == TYPE_COCLASS) write_coclass( type, typelib ); } else if (stmt->type == STMT_LIBRARY) { - const UUID *uuid = get_attrp( stmt->u.lib->attrs, ATTR_UUID ); - write_coclasses( stmt->u.lib->stmts, uuid ); + const typelib_t *lib = stmt->u.lib; + write_coclasses( lib->stmts, lib ); } } }

1 0

Alexandre Julliard : winecrt0: Automatically register typelib resources too .
by Alexandre Julliard 08 Dec '10

08 Dec '10

Module: wine Branch: master Commit: a54692834a3667298d0a7adb67a2913a6b28edca URL: http://source.winehq.org/git/wine.git/?a=commit;h=a54692834a3667298d0a7adb6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 8 13:18:45 2010 +0100 winecrt0: Automatically register typelib resources too. --- dlls/winecrt0/register.c | 47 ++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 45 insertions(+), 2 deletions(-) diff --git a/dlls/winecrt0/register.c b/dlls/winecrt0/register.c index b1e1d17..28ce3c5 100644 --- a/dlls/winecrt0/register.c +++ b/dlls/winecrt0/register.c @@ -26,14 +26,16 @@ #include "windef.h" #include "winbase.h" #include "winnls.h" -#include "objbase.h" +#include "ole2.h" #include "rpcproxy.h" #include "atliface.h" static const WCHAR ole32W[] = {'o','l','e','3','2','.','d','l','l',0}; +static const WCHAR oleaut32W[] = {'o','l','e','a','u','t','3','2','.','d','l','l',0}; static const WCHAR regtypeW[] = {'W','I','N','E','_','R','E','G','I','S','T','R','Y',0}; static const WCHAR moduleW[] = {'M','O','D','U','L','E',0}; static const WCHAR clsidW[] = {'C','L','S','I','D','_','P','S','F','a','c','t','o','r','y','B','u','f','f','e','r',0}; +static const WCHAR typelibW[] = {'T','Y','P','E','L','I','B',0}; struct reg_info { @@ -45,14 +47,17 @@ struct reg_info }; static HMODULE ole32; +static HMODULE oleaut32; static HRESULT (WINAPI *pCoInitialize)(LPVOID); static void (WINAPI *pCoUninitialize)(void); static HRESULT (WINAPI *pCoCreateInstance)(REFCLSID,LPUNKNOWN,DWORD,REFIID,LPVOID*); static INT (WINAPI *pStringFromGUID2)(REFGUID,LPOLESTR,INT); +static HRESULT (WINAPI *pLoadTypeLibEx)(LPCOLESTR,REGKIND,ITypeLib**); +static HRESULT (WINAPI *pUnRegisterTypeLib)(REFGUID,WORD,WORD,LCID,SYSKIND); static IRegistrar *create_registrar( HMODULE inst, struct reg_info *info ) { - if (!ole32) + if (!pStringFromGUID2) { if (!(ole32 = LoadLibraryW( ole32W )) || !(pCoInitialize = (void *)GetProcAddress( ole32, "CoInitialize" )) || @@ -111,6 +116,40 @@ static BOOL CALLBACK register_resource( HMODULE module, LPCWSTR type, LPWSTR nam return SUCCEEDED(info->result); } +static HRESULT register_typelib( HMODULE module, BOOL do_register ) +{ + WCHAR name[MAX_PATH]; + ITypeLib *typelib; + HRESULT ret; + + if (!pUnRegisterTypeLib) + { + if (!(oleaut32 = LoadLibraryW( oleaut32W )) || + !(pLoadTypeLibEx = (void *)GetProcAddress( oleaut32, "LoadTypeLibEx" )) || + !(pUnRegisterTypeLib = (void *)GetProcAddress( oleaut32, "UnRegisterTypeLib" ))) + return E_FAIL; + } + GetModuleFileNameW( module, name, MAX_PATH ); + if (do_register) + { + ret = pLoadTypeLibEx( name, REGKIND_REGISTER, &typelib ); + } + else + { + ret = pLoadTypeLibEx( name, REGKIND_NONE, &typelib ); + if (SUCCEEDED( ret )) + { + TLIBATTR *attr; + ITypeLib_GetLibAttr( typelib, &attr ); + ret = pUnRegisterTypeLib( &attr->guid, attr->wMajorVerNum, attr->wMinorVerNum, + attr->lcid, attr->syskind ); + ITypeLib_ReleaseTLibAttr( typelib, attr ); + } + } + if (SUCCEEDED( ret )) ITypeLib_Release( typelib ); + return ret; +} + HRESULT __wine_register_resources( HMODULE module, const CLSID *clsid ) { struct reg_info info; @@ -122,6 +161,8 @@ HRESULT __wine_register_resources( HMODULE module, const CLSID *clsid ) info.result = S_OK; EnumResourceNamesW( module, regtypeW, register_resource, (LONG_PTR)&info ); if (info.registrar) IRegistrar_Release( info.registrar ); + if (SUCCEEDED(info.result) && FindResourceW( module, MAKEINTRESOURCEW(1), typelibW )) + info.result = register_typelib( module, TRUE ); if (info.uninit) pCoUninitialize(); return info.result; } @@ -137,6 +178,8 @@ HRESULT __wine_unregister_resources( HMODULE module, const CLSID *clsid ) info.result = S_OK; EnumResourceNamesW( module, regtypeW, register_resource, (LONG_PTR)&info ); if (info.registrar) IRegistrar_Release( info.registrar ); + if (SUCCEEDED(info.result) && FindResourceW( module, MAKEINTRESOURCEW(1), typelibW )) + info.result = register_typelib( module, FALSE ); if (info.uninit) pCoUninitialize(); return info.result; }

1 0

Alexandre Julliard : qedit: Convert dll registration to the IRegistrar mechanism.
by Alexandre Julliard 08 Dec '10

08 Dec '10

Module: wine Branch: master Commit: 143746938ff6efad750505da73287d688085109d URL: http://source.winehq.org/git/wine.git/?a=commit;h=143746938ff6efad750505da7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 8 12:14:21 2010 +0100 qedit: Convert dll registration to the IRegistrar mechanism. --- dlls/qedit/Makefile.in | 3 +- dlls/qedit/main.c | 20 +++ dlls/qedit/qedit_classes.idl | 32 ++++ dlls/qedit/regsvr.c | 330 ------------------------------------------ 4 files changed, 54 insertions(+), 331 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=143746938ff6efad75050…

1 0

Alexandre Julliard : msctf: Convert dll registration to the IRegistrar mechanism.
by Alexandre Julliard 08 Dec '10

08 Dec '10

Module: wine Branch: master Commit: 1c18430aad80a13d9e818180f376c8d25af9b349 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c18430aad80a13d9e818180f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 8 12:08:29 2010 +0100 msctf: Convert dll registration to the IRegistrar mechanism. --- dlls/msctf/Makefile.in | 3 +- dlls/msctf/msctf.c | 17 ++ dlls/msctf/msctf_classes.idl | 49 ++++ dlls/msctf/regsvr.c | 518 ------------------------------------------ 4 files changed, 68 insertions(+), 519 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1c18430aad80a13d9e818…

1 0

Alexandre Julliard : browseui: Convert dll registration to the IRegistrar mechanism.
by Alexandre Julliard 08 Dec '10

08 Dec '10

Module: wine Branch: master Commit: 2164dee76a73ddbd1d8770988cecf1af52ed7f1f URL: http://source.winehq.org/git/wine.git/?a=commit;h=2164dee76a73ddbd1d8770988… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 8 12:01:31 2010 +0100 browseui: Convert dll registration to the IRegistrar mechanism. --- dlls/browseui/Makefile.in | 5 +- dlls/browseui/browseui_classes.idl | 47 ++++ dlls/browseui/browseui_main.c | 17 ++ dlls/browseui/regsvr.c | 512 ------------------------------------ 4 files changed, 67 insertions(+), 514 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2164dee76a73ddbd1d877…

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits December 2010