January 2011 - Wine-Commits

Huw Davies : ole32: Store the ole advise sinks in a STATDATA array.
by Alexandre Julliard Jan. 5, 2011

Jan. 5, 2011

Module: wine Branch: master Commit: 62cd56ce811e753b7b8c49ec996367b0a373a6c0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=62cd56ce811e753b7b8c49ec9… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Jan 5 11:20:11 2011 +0000 ole32: Store the ole advise sinks in a STATDATA array. --- dlls/ole32/oleobj.c | 131 ++++++++++++++------------------------------------- 1 files changed, 36 insertions(+), 95 deletions(-) diff --git a/dlls/ole32/oleobj.c b/dlls/ole32/oleobj.c index 2495f9a..6a84681 100644 --- a/dlls/ole32/oleobj.c +++ b/dlls/ole32/oleobj.c @@ -243,8 +243,8 @@ typedef struct LONG ref; - DWORD maxSinks; - IAdviseSink** arrayOfSinks; + DWORD max_cons; + STATDATA *connections; } OleAdviseHolderImpl; static inline OleAdviseHolderImpl *impl_from_IOleAdviseHolder(IOleAdviseHolder *iface) @@ -255,28 +255,19 @@ static inline OleAdviseHolderImpl *impl_from_IOleAdviseHolder(IOleAdviseHolder * /************************************************************************** * OleAdviseHolderImpl_Destructor */ -static void OleAdviseHolderImpl_Destructor(OleAdviseHolderImpl* ptrToDestroy) +static void OleAdviseHolderImpl_Destructor(OleAdviseHolderImpl *This) { - DWORD index; - TRACE("%p\n", ptrToDestroy); + DWORD index; + TRACE("%p\n", This); - for (index = 0; index < ptrToDestroy->maxSinks; index++) - { - if (ptrToDestroy->arrayOfSinks[index]!=0) + for (index = 0; index < This->max_cons; index++) { - IAdviseSink_Release(ptrToDestroy->arrayOfSinks[index]); - ptrToDestroy->arrayOfSinks[index] = NULL; + if (This->connections[index].pAdvSink != NULL) + release_statdata(This->connections + index); } - } - HeapFree(GetProcessHeap(), - 0, - ptrToDestroy->arrayOfSinks); - - - HeapFree(GetProcessHeap(), - 0, - ptrToDestroy); + HeapFree(GetProcessHeap(), 0, This->connections); + HeapFree(GetProcessHeap(), 0, This); } /************************************************************************** @@ -344,6 +335,8 @@ static HRESULT WINAPI OleAdviseHolderImpl_Advise(IOleAdviseHolder *iface, { DWORD index; OleAdviseHolderImpl *This = impl_from_IOleAdviseHolder(iface); + STATDATA new_conn; + static const FORMATETC empty_fmtetc = {0, NULL, 0, -1, 0}; TRACE("(%p)->(%p, %p)\n", This, pAdvise, pdwConnection); @@ -352,38 +345,27 @@ static HRESULT WINAPI OleAdviseHolderImpl_Advise(IOleAdviseHolder *iface, *pdwConnection = 0; - for (index = 0; index < This->maxSinks; index++) + for (index = 0; index < This->max_cons; index++) { - if (This->arrayOfSinks[index]==NULL) + if (This->connections[index].pAdvSink == NULL) break; } - if (index == This->maxSinks) + if (index == This->max_cons) { - DWORD i; - - This->maxSinks+=INITIAL_SINKS; - - This->arrayOfSinks = HeapReAlloc(GetProcessHeap(), - 0, - This->arrayOfSinks, - This->maxSinks*sizeof(IAdviseSink*)); - - for (i=index;i < This->maxSinks; i++) - This->arrayOfSinks[i]=0; + This->max_cons += INITIAL_SINKS; + This->connections = HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, This->connections, + This->max_cons * sizeof(*This->connections)); } - This->arrayOfSinks[index] = pAdvise; + new_conn.pAdvSink = pAdvise; + new_conn.advf = 0; + new_conn.formatetc = empty_fmtetc; + new_conn.dwConnection = index + 1; /* 0 is not a valid cookie, so increment the index */ - if (This->arrayOfSinks[index]!=NULL) - IAdviseSink_AddRef(This->arrayOfSinks[index]); + copy_statdata(This->connections + index, &new_conn); - /* - * Return the index as the cookie. - * Since 0 is not a valid cookie, we will increment by - * 1 the index in the table. - */ - *pdwConnection = index+1; + *pdwConnection = new_conn.dwConnection; return S_OK; } @@ -395,30 +377,17 @@ static HRESULT WINAPI OleAdviseHolderImpl_Unadvise(IOleAdviseHolder *iface, DWORD dwConnection) { OleAdviseHolderImpl *This = impl_from_IOleAdviseHolder(iface); + DWORD index; TRACE("(%p)->(%u)\n", This, dwConnection); - /* - * So we don't return 0 as a cookie, the index was - * incremented by 1 in OleAdviseHolderImpl_Advise - * we have to compensate. - */ - dwConnection--; - - /* - * Check for invalid cookies. - */ - if (dwConnection >= This->maxSinks) - return OLE_E_NOCONNECTION; + /* The connection number is 1 more than the index, see OleAdviseHolder_Advise */ + index = dwConnection - 1; - if (This->arrayOfSinks[dwConnection] == NULL) - return OLE_E_NOCONNECTION; + if (index >= This->max_cons || This->connections[index].pAdvSink == NULL) + return OLE_E_NOCONNECTION; - /* - * Release the sink and mark the spot in the list as free. - */ - IAdviseSink_Release(This->arrayOfSinks[dwConnection]); - This->arrayOfSinks[dwConnection] = NULL; + release_statdata(This->connections + index); return S_OK; } @@ -426,40 +395,17 @@ static HRESULT WINAPI OleAdviseHolderImpl_Unadvise(IOleAdviseHolder *iface, /****************************************************************************** * OleAdviseHolderImpl_EnumAdvise */ -static HRESULT WINAPI OleAdviseHolderImpl_EnumAdvise(IOleAdviseHolder *iface, IEnumSTATDATA **ppenumAdvise) +static HRESULT WINAPI OleAdviseHolderImpl_EnumAdvise(IOleAdviseHolder *iface, IEnumSTATDATA **enum_advise) { OleAdviseHolderImpl *This = impl_from_IOleAdviseHolder(iface); IUnknown *unk; - DWORD i, count; - STATDATA *data; - static const FORMATETC empty_fmtetc = {0, NULL, 0, -1, 0}; HRESULT hr; - TRACE("(%p)->(%p)\n", This, ppenumAdvise); - - *ppenumAdvise = NULL; - - /* Build an array of STATDATA structures */ - data = HeapAlloc(GetProcessHeap(), 0, This->maxSinks * sizeof(*data)); - if(!data) return E_OUTOFMEMORY; - - for(i = 0, count = 0; i < This->maxSinks; i++) - { - if(This->arrayOfSinks[i]) - { - data[count].formatetc = empty_fmtetc; - data[count].advf = 0; - data[count].pAdvSink = This->arrayOfSinks[i]; /* The constructor will take a ref. */ - data[count].dwConnection = i; - count++; - } - } + TRACE("(%p)->(%p)\n", This, enum_advise); IOleAdviseHolder_QueryInterface(iface, &IID_IUnknown, (void**)&unk); - hr = EnumSTATDATA_Construct(unk, 0, count, data, ppenumAdvise); + hr = EnumSTATDATA_Construct(unk, 0, This->max_cons, This->connections, enum_advise); IUnknown_Release(unk); - HeapFree(GetProcessHeap(), 0, data); - return hr; } @@ -564,19 +510,14 @@ static const IOleAdviseHolderVtbl oahvt = static IOleAdviseHolder *OleAdviseHolderImpl_Constructor(void) { OleAdviseHolderImpl* lpoah; - DWORD index; lpoah = HeapAlloc(GetProcessHeap(), 0, sizeof(OleAdviseHolderImpl)); lpoah->IOleAdviseHolder_iface.lpVtbl = &oahvt; lpoah->ref = 1; - lpoah->maxSinks = INITIAL_SINKS; - lpoah->arrayOfSinks = HeapAlloc(GetProcessHeap(), - 0, - lpoah->maxSinks * sizeof(IAdviseSink*)); - - for (index = 0; index < lpoah->maxSinks; index++) - lpoah->arrayOfSinks[index]=0; + lpoah->max_cons = INITIAL_SINKS; + lpoah->connections = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, + lpoah->max_cons * sizeof(*lpoah->connections)); TRACE("returning %p\n", &lpoah->IOleAdviseHolder_iface); return &lpoah->IOleAdviseHolder_iface;

1 0

Huw Davies : wrc: Initialise variable.
by Alexandre Julliard Jan. 5, 2011

Jan. 5, 2011

Module: wine Branch: master Commit: d5c66bc23d8bd9c4750fa5f20ed442dc05e8408c URL: http://source.winehq.org/git/wine.git/?a=commit;h=d5c66bc23d8bd9c4750fa5f20… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Jan 5 14:55:02 2011 +0000 wrc: Initialise variable. --- tools/wrc/po.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/wrc/po.c b/tools/wrc/po.c index 2b7ed6d..6cfb5b4 100644 --- a/tools/wrc/po.c +++ b/tools/wrc/po.c @@ -469,7 +469,7 @@ static char *get_po_file_name( const language_t *lang ) static unsigned int flush_po_files( const char *output_name ) { struct po_file_lang *po_file, *next; - unsigned int count; + unsigned int count = 0; LIST_FOR_EACH_ENTRY_SAFE( po_file, next, &po_file_langs, struct po_file_lang, entry ) {

1 0

Austin English : winex11.drv: Use consistent formatting in a TRACE().
by Alexandre Julliard Jan. 5, 2011

Jan. 5, 2011

Module: wine Branch: master Commit: 8ec262ef0def3e0f224a7e9217e157e4fe0ef8bc URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ec262ef0def3e0f224a7e921… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Jan 5 02:42:49 2011 +0000 winex11.drv: Use consistent formatting in a TRACE(). --- dlls/winex11.drv/keyboard.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winex11.drv/keyboard.c b/dlls/winex11.drv/keyboard.c index d6054d6..313ff3a 100644 --- a/dlls/winex11.drv/keyboard.c +++ b/dlls/winex11.drv/keyboard.c @@ -1297,7 +1297,7 @@ static inline void KEYBOARD_UpdateOneState ( WORD vkey, WORD scan, int state, DW if (!state) flags |= KEYEVENTF_KEYUP; - TRACE("Adjusting state for vkey %#.2X. State before %#.2x\n", + TRACE("Adjusting state for vkey %#.2x. State before %#.2x\n", vkey, key_state_table[vkey & 0xff]); /* Fake key being pressed inside wine */

1 0

Hwang YunSong : wineboot: Update Korean resource.
by Alexandre Julliard Jan. 5, 2011

Jan. 5, 2011

Module: wine Branch: master Commit: 183b89b689f499fa2fbb1321261e43a41571f1e1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=183b89b689f499fa2fbb13212… Author: Hwang YunSong <hys545(a)dreamwiz.com> Date: Wed Jan 5 10:31:53 2011 +0900 wineboot: Update Korean resource. --- programs/wineboot/wineboot_Ko.rc | 16 +++++++++------- 1 files changed, 9 insertions(+), 7 deletions(-) diff --git a/programs/wineboot/wineboot_Ko.rc b/programs/wineboot/wineboot_Ko.rc index b792fbe..f153ccd 100644 --- a/programs/wineboot/wineboot_Ko.rc +++ b/programs/wineboot/wineboot_Ko.rc @@ -2,7 +2,7 @@ * WineBoot Korean resources * * Copyright (C) 2007 Robert Shearman for CodeWeavers - * Copyright (C) 2007 YunSong Hwang(hys545(a)dreamwiz.com, Ȳ��) + * Copyright (C) 2007,2011 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,19 +22,21 @@ #include "resource.h" +#pragma code_page(65001) + LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT IDD_ENDTASK DIALOG 0, 0, 186, 71 STYLE DS_MODALFRAME | DS_NOIDLEMSG | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "��α׷� ��" +CAPTION "프로그램 대기중" FONT 9, "MS Shell Dlg" BEGIN - DEFPUSHBUTTON "��",IDCANCEL,129,49,50,15 - PUSHBUTTON "��μ�� ",IDOK,51,49,71,15 - LTEXT "�� μ�� α� �� Ḧ �õ��, �� α׷�� ƹ�� ϴ�.", + DEFPUSHBUTTON "취소",IDCANCEL,129,49,50,15 + PUSHBUTTON "프로세스 끝내기",IDOK,51,49,71,15 + LTEXT "이 프로세스에 로그 오프나 종료를 시도했으나, 이 프로그램은 아무런 반응이 없습니다.", IDC_STATIC,7,5,172,26 - LTEXT "�� μ�� ٸ� �� ͸� �Ҿ�� Դϴ�.", + LTEXT "만약 당신이 이 프로세스를 끝낸다면 저장 하지 않은 모든 데이터를 잃어버릴 것입니다.", IDC_STATIC,7,28,172,21 END @@ -44,6 +46,6 @@ CAPTION "Wine" FONT 8, "MS Shell Dlg" BEGIN ICON "", IDC_WAITICON, 3, 3, 10, 10 - LTEXT "Wine �� %s �� Ʈ�Ǵ� ��Դϴ�, ��ø� ��ٷ��ֽñ� �ٶ��ϴ�...", + LTEXT "Wine 설정 %s 이 업데이트되는 중입니다, 잠시만 기다려주시기 바랍니다...", IDC_WAITTEXT, 40, 5, 150, 40, SS_NOPREFIX END

1 0

Hwang YunSong : wineconsole: Update Korean resource.
by Alexandre Julliard Jan. 5, 2011

Jan. 5, 2011

Module: wine Branch: master Commit: d6f14fd638b98839a716a4d4360c24572cfadb2e URL: http://source.winehq.org/git/wine.git/?a=commit;h=d6f14fd638b98839a716a4d43… Author: Hwang YunSong <hys545(a)dreamwiz.com> Date: Wed Jan 5 10:33:36 2011 +0900 wineconsole: Update Korean resource. --- programs/wineconsole/wineconsole_Ko.rc | 132 ++++++++++++++++---------------- 1 files changed, 67 insertions(+), 65 deletions(-) diff --git a/programs/wineconsole/wineconsole_Ko.rc b/programs/wineconsole/wineconsole_Ko.rc index fc30271..cb6a40f 100644 --- a/programs/wineconsole/wineconsole_Ko.rc +++ b/programs/wineconsole/wineconsole_Ko.rc @@ -1,6 +1,6 @@ /* * Copyright 2001 Eric Pouech - * Copyright 2005,2007 YunSong Hwang + * Copyright 2005,2007,2011 YunSong Hwang * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -19,118 +19,120 @@ #include "wineconsole_res.h" +#pragma code_page(65001) + LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT STRINGTABLE BEGIN -IDS_EDIT, "��(&E)" -IDS_DEFAULT, "�⺻�� (&D)" -IDS_PROPERTIES, "�Ӽ�(&P)" +IDS_EDIT, "편집(&E)" +IDS_DEFAULT, "기본으로 설정(&D)" +IDS_PROPERTIES, "속성(&P)" IDS_MARK, "&Mark" -IDS_COPY, "��(&C)" -IDS_PASTE, "�ٿ��ֱ�(&P)" -IDS_SELECTALL, "�� (&S)" -IDS_SCROLL, "��ũ��(&R)" -IDS_SEARCH, "ã��(&E)" -IDS_FNT_DISPLAY, "�� ڴ� %ld �ȼ� �ʺ� %ld �ȼ� ��̸� ��ϴ�" -IDS_FNT_PREVIEW, "�̰�� ׽�Ʈ�Դϴ�" -IDS_DLG_TIT_DEFAULT, "��ġ - �⺻ ��" -IDS_DLG_TIT_CURRENT, "��ġ - �� " -IDS_DLG_TIT_ERROR, "�� " -IDS_DLG_ERR_SBWINSIZE, "��ũ�� ũ�� ݵ�� â�� ų� Ŀ��մϴ�." - -IDS_CMD_INVALID_EVENT_ID "wineconsole: �̺�Ʈ id�� ٿ� �� ϴ�\n" -IDS_CMD_INVALID_BACKEND "wineconsole: �ùٸ�� 鿣��\n" -IDS_CMD_INVALID_OPTION "wineconsole: ��Ҽ� �� ɼ�\n" -IDS_CMD_ABOUT "Wine �ֿܼ�� α׷� ��\n" -IDS_CMD_LAUNCH_FAILED "wineconsole: Ǯ�׸� %s �� .\n"\ - "�� ùٸ�� ʽ��ϴ�.\n" - -IDS_USAGE_HEADER "\n��:\n wineconsole [�ɼ�] <��>\n\n�ɼ�:\n" -IDS_USAGE_BACKEND " --backend={user|curses} ��ڰ� �� â�� ,\n"\ - " curses�� Wine �ܼ�ó�� ͹̳ο� ��Ÿ�� \n" -IDS_USAGE_COMMAND " <��> The Wine ��α׷�� ܼ�� ؼ� ��۵�\n" -IDS_USAGE_FOOTER "\n��:\n wineconsole cmd\nWine �ֿܼ�� Wine �� Ʈ ��\n\n" +IDS_COPY, "복사(&C)" +IDS_PASTE, "붙여넣기(&P)" +IDS_SELECTALL, "모두 선택(&S)" +IDS_SCROLL, "스크롤(&R)" +IDS_SEARCH, "찾기(&E)" +IDS_FNT_DISPLAY, "각각의 글자는 %ld 픽셀 너비에 %ld 픽셀 높이를 가집니다" +IDS_FNT_PREVIEW, "이것은 테스트입니다" +IDS_DLG_TIT_DEFAULT, "설치 - 기본 설정" +IDS_DLG_TIT_CURRENT, "설치 - 현재 설정" +IDS_DLG_TIT_ERROR, "설정 에러" +IDS_DLG_ERR_SBWINSIZE, "스크린 버퍼 크기는 반드시 창보다 같거나 커야합니다." + +IDS_CMD_INVALID_EVENT_ID "wineconsole: 이벤트 id를 붙여 넣을 수 없습니다\n" +IDS_CMD_INVALID_BACKEND "wineconsole: 올바르지 않은 백엔드\n" +IDS_CMD_INVALID_OPTION "wineconsole: 이해할수 없는 명령 라인 옵션\n" +IDS_CMD_ABOUT "Wine 콘솔에서 프로그램 시작\n" +IDS_CMD_LAUNCH_FAILED "wineconsole: 풀그림 %s 시작 실패.\n"\ + "이 명령은 올바르지 않습니다.\n" + +IDS_USAGE_HEADER "\n사용법:\n wineconsole [옵션] <명령>\n\n옵션:\n" +IDS_USAGE_BACKEND " --backend={user|curses} 사용자가 새 창을 열 것인지,\n"\ + " curses가 Wine 콘솔처럼 현재 터미널에 나타낼 것인지 선택\n" +IDS_USAGE_COMMAND " <명령> The Wine 프로그램은 콘솔을 통해서 시작됨\n" +IDS_USAGE_FOOTER "\n예:\n wineconsole cmd\nWine 콘솔에서 Wine 명령 프롬프트 시작\n\n" END -IDD_OPTION DIALOG 36, 24, 140, 105 +IDD_OPTION DIALOG 36, 24, 208, 105 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION " �ɼ� " +CAPTION " 옵션 " FONT 9, "MS Shell Dlg" { - GROUPBOX "Ŀ�� ũ��", -1, 10, 11, 60, 44, BS_GROUPBOX - AUTORADIOBUTTON "�۰�(&S)", IDC_OPT_CURSOR_SMALL, 14, 23, 44, 10, WS_TABSTOP - AUTORADIOBUTTON "�߰�(&M)", IDC_OPT_CURSOR_MEDIUM, 14, 33, 44, 10, WS_TABSTOP - AUTORADIOBUTTON "ũ��(&L)", IDC_OPT_CURSOR_LARGE, 14, 43, 44, 10, WS_TABSTOP - - GROUPBOX "��Ʈ��", -1, 75, 11, 125, 44, BS_GROUPBOX - LTEXT "�˾� �޴�", -1, 79, 23, 40, 10 - AUTOCHECKBOX "��Ʈ��(&C)", IDC_OPT_CONF_CTRL, 129, 23, 60, 10, WS_TABSTOP - AUTOCHECKBOX "��Ʈ(&H)", IDC_OPT_CONF_SHIFT, 129, 33, 60, 10, WS_TABSTOP - LTEXT "�� ", -1, 79, 43, 50, 10 - AUTOCHECKBOX "��(&E)", IDC_OPT_QUICK_EDIT, 129, 43, 60, 10, WS_TABSTOP - - GROUPBOX "�� 丮", -1, 10, 57, 190, 35, BS_GROUPBOX - LTEXT "�ٽ� �θ�� (&N):", -1, 14, 67, 78, 18 + GROUPBOX "커서 크기", -1, 10, 11, 60, 44, BS_GROUPBOX + AUTORADIOBUTTON "작게(&S)", IDC_OPT_CURSOR_SMALL, 14, 23, 44, 10, WS_TABSTOP + AUTORADIOBUTTON "중간(&M)", IDC_OPT_CURSOR_MEDIUM, 14, 33, 44, 10, WS_TABSTOP + AUTORADIOBUTTON "크게(&L)", IDC_OPT_CURSOR_LARGE, 14, 43, 44, 10, WS_TABSTOP + + GROUPBOX "컨트롤", -1, 75, 11, 125, 44, BS_GROUPBOX + LTEXT "팝업 메뉴", -1, 79, 23, 40, 10 + AUTOCHECKBOX "컨트롤(&C)", IDC_OPT_CONF_CTRL, 129, 23, 60, 10, WS_TABSTOP + AUTOCHECKBOX "쉬프트(&H)", IDC_OPT_CONF_SHIFT, 129, 33, 60, 10, WS_TABSTOP + LTEXT "빠른 편집", -1, 79, 43, 50, 10 + AUTOCHECKBOX "가능(&E)", IDC_OPT_QUICK_EDIT, 129, 43, 60, 10, WS_TABSTOP + + GROUPBOX "명령 히스토리", -1, 10, 57, 190, 35, BS_GROUPBOX + LTEXT "다시 부르는 명령의 갯수(&N):", -1, 14, 67, 78, 18 EDITTEXT IDC_OPT_HIST_SIZE, 92, 69, 31, 12, WS_TABSTOP|WS_BORDER|ES_NUMBER CONTROL "", IDC_OPT_HIST_SIZE_UD, "msctls_updown32", UDS_SETBUDDYINT|UDS_ALIGNRIGHT|UDS_AUTOBUDDY|UDS_ARROWKEYS|UDS_NOTHOUSANDS, 0, 0, 0, 0 - AUTOCHECKBOX "�ι� ��(&R)", IDC_OPT_HIST_NODOUBLE, 130, 67, 50, 18, WS_TABSTOP|BS_MULTILINE + AUTOCHECKBOX "두번 제거(&R)", IDC_OPT_HIST_NODOUBLE, 130, 67, 50, 18, WS_TABSTOP|BS_MULTILINE } IDD_FONT DIALOG 36, 24, 140, 105 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION " �۲� " +CAPTION " 글꼴 " FONT 9, "MS Shell Dlg" { - LTEXT "�۲�(&F)", -1, 5, 5, 24, 8 + LTEXT "글꼴(&F)", -1, 5, 5, 24, 8 LISTBOX IDC_FNT_LIST_FONT, 5, 18, 90, 42, LBS_SORT|WS_VSCROLL - LTEXT "��(&C)", -1, 100, 5, 50, 8 + LTEXT "색상(&C)", -1, 100, 5, 50, 8 CONTROL "", IDC_FNT_COLOR_FG, "WineConColorPreview", 0L, 100, 18, 48, 16 CONTROL "", IDC_FNT_COLOR_BK, "WineConColorPreview", 0L, 100, 40, 48, 16 - LTEXT "ũ��;(&S)", -1, 158, 5, 40, 8 + LTEXT "크기;(&S)", -1, 158, 5, 40, 8 LISTBOX IDC_FNT_LIST_SIZE, 158, 18, 40, 60, WS_VSCROLL CONTROL "", IDC_FNT_PREVIEW, "WineConFontPreview", 0L, 5, 60, 109, 40 LTEXT "", IDC_FNT_FONT_INFO, 128, 76, 80, 18 } -IDD_CONFIG DIALOG 36, 24, 140, 105 +IDD_CONFIG DIALOG 36, 24, 206, 105 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION " �� " +CAPTION " 설정 " FONT 9, "MS Shell Dlg" { - GROUPBOX "�� ", -1, 10, 11, 100, 42, BS_GROUPBOX - LTEXT "�ʺ�(&W) :", -1, 14, 25, 54, 9 + GROUPBOX "버퍼 존", -1, 10, 11, 100, 42, BS_GROUPBOX + LTEXT "너비(&W) :", -1, 14, 25, 54, 9 EDITTEXT IDC_CNF_SB_WIDTH, 68, 23, 36, 12, WS_TABSTOP|WS_BORDER|ES_NUMBER CONTROL "", IDC_CNF_SB_WIDTH_UD, "msctls_updown32", UDS_SETBUDDYINT|UDS_ALIGNRIGHT|UDS_AUTOBUDDY|UDS_ARROWKEYS|UDS_NOTHOUSANDS, 0, 0, 0, 0 - LTEXT "��(&H) :", -1, 14, 39, 54, 9 + LTEXT "높이(&H) :", -1, 14, 39, 54, 9 EDITTEXT IDC_CNF_SB_HEIGHT, 68, 37, 36, 12, WS_TABSTOP|WS_BORDER|ES_NUMBER CONTROL "", IDC_CNF_SB_HEIGHT_UD, "msctls_updown32", UDS_SETBUDDYINT|UDS_ALIGNRIGHT|UDS_AUTOBUDDY|UDS_ARROWKEYS|UDS_NOTHOUSANDS, 0, 0, 0, 0 - GROUPBOX "â ũ��", -1, 10, 55, 100, 42 - LTEXT "�ʺ�(&I) :", -1, 14, 69, 54, 9 + GROUPBOX "창 크기", -1, 10, 55, 100, 42 + LTEXT "너비(&I) :", -1, 14, 69, 54, 9 EDITTEXT IDC_CNF_WIN_WIDTH, 68, 67, 36, 12, WS_TABSTOP|WS_BORDER|ES_NUMBER CONTROL "", IDC_CNF_WIN_WIDTH_UD, "msctls_updown32", UDS_SETBUDDYINT|UDS_ALIGNRIGHT|UDS_AUTOBUDDY|UDS_ARROWKEYS|UDS_NOTHOUSANDS, 0, 0, 0, 0 - LTEXT "��(&E) :", -1, 14, 83, 54, 9 + LTEXT "높이(&E) :", -1, 14, 83, 54, 9 EDITTEXT IDC_CNF_WIN_HEIGHT, 68, 81, 36, 12, WS_TABSTOP|WS_BORDER|ES_NUMBER CONTROL "", IDC_CNF_WIN_HEIGHT_UD, "msctls_updown32", UDS_SETBUDDYINT|UDS_ALIGNRIGHT|UDS_AUTOBUDDY|UDS_ARROWKEYS|UDS_NOTHOUSANDS, 0, 0, 0, 0 - GROUPBOX "Ǯ�׸�� ", -1, 115, 11, 80, 42, BS_GROUPBOX - AUTOCHECKBOX "�ܼ� �ݱ�(&C)", IDC_CNF_CLOSE_EXIT, 119, 25, 72, 20, WS_TABSTOP + GROUPBOX "풀그림의 끝", -1, 115, 11, 80, 42, BS_GROUPBOX + AUTOCHECKBOX "콘솔 닫기(&C)", IDC_CNF_CLOSE_EXIT, 119, 25, 72, 20, WS_TABSTOP - GROUPBOX "��", -1, 115, 55, 80, 42 + GROUPBOX "에디션", -1, 115, 55, 80, 42 COMBOBOX IDC_CNF_EDITION_MODE, 119, 69, 72, 20, CBS_DROPDOWNLIST|WS_VSCROLL|WS_TABSTOP } IDD_SAVE_SETTINGS DIALOG 20, 20, 170, 60 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION -CAPTION " �ܼ� �Ű��" +CAPTION " 콘솔 매개변수" FONT 9, "MS Shell Dlg" { GROUPBOX "", -1, 10, 10, 150, 31, BS_GROUPBOX - AUTORADIOBUTTON "�� ", IDC_SAV_SAVE, 14, 15, 140, 10, WS_TABSTOP - AUTORADIOBUTTON "�� Ǹ� ��", IDC_SAV_SESSION, 14, 27, 140, 10, WS_TABSTOP + AUTORADIOBUTTON "나중의 세션을 위해 설정 보존", IDC_SAV_SAVE, 14, 15, 140, 10, WS_TABSTOP + AUTORADIOBUTTON "오직 현재의 세션만 변경", IDC_SAV_SESSION, 14, 27, 140, 10, WS_TABSTOP - PUSHBUTTON "Ȯ��", IDOK, 35, 45, 35, 12 - PUSHBUTTON "��", IDCANCEL, 80, 45, 35, 12 + PUSHBUTTON "확인", IDOK, 35, 45, 35, 12 + PUSHBUTTON "취소", IDCANCEL, 80, 45, 35, 12 }

1 0

Michael Stefaniuc : windowscodecs: Use an iface instead of a vtbl pointer in BmpFrameEncode.
by Alexandre Julliard Jan. 5, 2011

Jan. 5, 2011

Module: wine Branch: master Commit: 5cce70ddeb7d089ccfb124cc9e609af3af151fd5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5cce70ddeb7d089ccfb124cc9… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Jan 5 00:46:15 2011 +0100 windowscodecs: Use an iface instead of a vtbl pointer in BmpFrameEncode. --- dlls/windowscodecs/bmpencode.c | 33 +++++++++++++++++++-------------- 1 files changed, 19 insertions(+), 14 deletions(-) diff --git a/dlls/windowscodecs/bmpencode.c b/dlls/windowscodecs/bmpencode.c index 4b3b9ea..410c646 100644 --- a/dlls/windowscodecs/bmpencode.c +++ b/dlls/windowscodecs/bmpencode.c @@ -58,7 +58,7 @@ static const struct bmp_pixelformat formats[] = { }; typedef struct BmpFrameEncode { - const IWICBitmapFrameEncodeVtbl *lpVtbl; + IWICBitmapFrameEncode IWICBitmapFrameEncode_iface; LONG ref; IStream *stream; BOOL initialized; @@ -71,10 +71,15 @@ typedef struct BmpFrameEncode { BOOL committed; } BmpFrameEncode; +static inline BmpFrameEncode *impl_from_IWICBitmapFrameEncode(IWICBitmapFrameEncode *iface) +{ + return CONTAINING_RECORD(iface, BmpFrameEncode, IWICBitmapFrameEncode_iface); +} + static HRESULT WINAPI BmpFrameEncode_QueryInterface(IWICBitmapFrameEncode *iface, REFIID iid, void **ppv) { - BmpFrameEncode *This = (BmpFrameEncode*)iface; + BmpFrameEncode *This = impl_from_IWICBitmapFrameEncode(iface); TRACE("(%p,%s,%p)\n", iface, debugstr_guid(iid), ppv); if (!ppv) return E_INVALIDARG; @@ -96,7 +101,7 @@ static HRESULT WINAPI BmpFrameEncode_QueryInterface(IWICBitmapFrameEncode *iface static ULONG WINAPI BmpFrameEncode_AddRef(IWICBitmapFrameEncode *iface) { - BmpFrameEncode *This = (BmpFrameEncode*)iface; + BmpFrameEncode *This = impl_from_IWICBitmapFrameEncode(iface); ULONG ref = InterlockedIncrement(&This->ref); TRACE("(%p) refcount=%u\n", iface, ref); @@ -106,7 +111,7 @@ static ULONG WINAPI BmpFrameEncode_AddRef(IWICBitmapFrameEncode *iface) static ULONG WINAPI BmpFrameEncode_Release(IWICBitmapFrameEncode *iface) { - BmpFrameEncode *This = (BmpFrameEncode*)iface; + BmpFrameEncode *This = impl_from_IWICBitmapFrameEncode(iface); ULONG ref = InterlockedDecrement(&This->ref); TRACE("(%p) refcount=%u\n", iface, ref); @@ -124,7 +129,7 @@ static ULONG WINAPI BmpFrameEncode_Release(IWICBitmapFrameEncode *iface) static HRESULT WINAPI BmpFrameEncode_Initialize(IWICBitmapFrameEncode *iface, IPropertyBag2 *pIEncoderOptions) { - BmpFrameEncode *This = (BmpFrameEncode*)iface; + BmpFrameEncode *This = impl_from_IWICBitmapFrameEncode(iface); TRACE("(%p,%p)\n", iface, pIEncoderOptions); if (This->initialized) return WINCODEC_ERR_WRONGSTATE; @@ -137,7 +142,7 @@ static HRESULT WINAPI BmpFrameEncode_Initialize(IWICBitmapFrameEncode *iface, static HRESULT WINAPI BmpFrameEncode_SetSize(IWICBitmapFrameEncode *iface, UINT uiWidth, UINT uiHeight) { - BmpFrameEncode *This = (BmpFrameEncode*)iface; + BmpFrameEncode *This = impl_from_IWICBitmapFrameEncode(iface); TRACE("(%p,%u,%u)\n", iface, uiWidth, uiHeight); if (!This->initialized || This->bits) return WINCODEC_ERR_WRONGSTATE; @@ -151,7 +156,7 @@ static HRESULT WINAPI BmpFrameEncode_SetSize(IWICBitmapFrameEncode *iface, static HRESULT WINAPI BmpFrameEncode_SetResolution(IWICBitmapFrameEncode *iface, double dpiX, double dpiY) { - BmpFrameEncode *This = (BmpFrameEncode*)iface; + BmpFrameEncode *This = impl_from_IWICBitmapFrameEncode(iface); TRACE("(%p,%0.2f,%0.2f)\n", iface, dpiX, dpiY); if (!This->initialized || This->bits) return WINCODEC_ERR_WRONGSTATE; @@ -165,7 +170,7 @@ static HRESULT WINAPI BmpFrameEncode_SetResolution(IWICBitmapFrameEncode *iface, static HRESULT WINAPI BmpFrameEncode_SetPixelFormat(IWICBitmapFrameEncode *iface, WICPixelFormatGUID *pPixelFormat) { - BmpFrameEncode *This = (BmpFrameEncode*)iface; + BmpFrameEncode *This = impl_from_IWICBitmapFrameEncode(iface); int i; TRACE("(%p,%s)\n", iface, debugstr_guid(pPixelFormat)); @@ -224,7 +229,7 @@ static HRESULT BmpFrameEncode_AllocateBits(BmpFrameEncode *This) static HRESULT WINAPI BmpFrameEncode_WritePixels(IWICBitmapFrameEncode *iface, UINT lineCount, UINT cbStride, UINT cbBufferSize, BYTE *pbPixels) { - BmpFrameEncode *This = (BmpFrameEncode*)iface; + BmpFrameEncode *This = impl_from_IWICBitmapFrameEncode(iface); HRESULT hr; WICRect rc; TRACE("(%p,%u,%u,%u,%p)\n", iface, lineCount, cbStride, cbBufferSize, pbPixels); @@ -253,7 +258,7 @@ static HRESULT WINAPI BmpFrameEncode_WritePixels(IWICBitmapFrameEncode *iface, static HRESULT WINAPI BmpFrameEncode_WriteSource(IWICBitmapFrameEncode *iface, IWICBitmapSource *pIBitmapSource, WICRect *prc) { - BmpFrameEncode *This = (BmpFrameEncode*)iface; + BmpFrameEncode *This = impl_from_IWICBitmapFrameEncode(iface); HRESULT hr; WICRect rc; WICPixelFormatGUID guid; @@ -316,7 +321,7 @@ static HRESULT WINAPI BmpFrameEncode_WriteSource(IWICBitmapFrameEncode *iface, static HRESULT WINAPI BmpFrameEncode_Commit(IWICBitmapFrameEncode *iface) { - BmpFrameEncode *This = (BmpFrameEncode*)iface; + BmpFrameEncode *This = impl_from_IWICBitmapFrameEncode(iface); BITMAPFILEHEADER bfh; BITMAPV5HEADER bih; UINT info_size; @@ -456,7 +461,7 @@ static ULONG WINAPI BmpEncoder_Release(IWICBitmapEncoder *iface) if (ref == 0) { if (This->stream) IStream_Release(This->stream); - if (This->frame) IWICBitmapFrameEncode_Release((IWICBitmapFrameEncode*)This->frame); + if (This->frame) IWICBitmapFrameEncode_Release(&This->frame->IWICBitmapFrameEncode_iface); HeapFree(GetProcessHeap(), 0, This); } @@ -538,7 +543,7 @@ static HRESULT WINAPI BmpEncoder_CreateNewFrame(IWICBitmapEncoder *iface, *ppIEncoderOptions = NULL; return E_OUTOFMEMORY; } - encode->lpVtbl = &BmpFrameEncode_Vtbl; + encode->IWICBitmapFrameEncode_iface.lpVtbl = &BmpFrameEncode_Vtbl; encode->ref = 2; IStream_AddRef(This->stream); encode->stream = This->stream; @@ -552,7 +557,7 @@ static HRESULT WINAPI BmpEncoder_CreateNewFrame(IWICBitmapEncoder *iface, encode->lineswritten = 0; encode->committed = FALSE; - *ppIFrameEncode = (IWICBitmapFrameEncode*)encode; + *ppIFrameEncode = &encode->IWICBitmapFrameEncode_iface; This->frame = encode; return S_OK;

1 0

Vincent Povirk : windowscodecs: Store an impl pointer instead of an iface pointer.
by Alexandre Julliard Jan. 5, 2011

Jan. 5, 2011

Module: wine Branch: master Commit: 5fd834fc956f9b54bbe653b651747f8c28809478 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5fd834fc956f9b54bbe653b65… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Jan 4 14:01:45 2011 -0600 windowscodecs: Store an impl pointer instead of an iface pointer. --- dlls/windowscodecs/bmpencode.c | 9 ++++----- 1 files changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/windowscodecs/bmpencode.c b/dlls/windowscodecs/bmpencode.c index b79a19b..4b3b9ea 100644 --- a/dlls/windowscodecs/bmpencode.c +++ b/dlls/windowscodecs/bmpencode.c @@ -410,7 +410,7 @@ typedef struct BmpEncoder { const IWICBitmapEncoderVtbl *lpVtbl; LONG ref; IStream *stream; - IWICBitmapFrameEncode *frame; + BmpFrameEncode *frame; } BmpEncoder; static HRESULT WINAPI BmpEncoder_QueryInterface(IWICBitmapEncoder *iface, REFIID iid, @@ -456,7 +456,7 @@ static ULONG WINAPI BmpEncoder_Release(IWICBitmapEncoder *iface) if (ref == 0) { if (This->stream) IStream_Release(This->stream); - if (This->frame) IWICBitmapFrameEncode_Release(This->frame); + if (This->frame) IWICBitmapFrameEncode_Release((IWICBitmapFrameEncode*)This->frame); HeapFree(GetProcessHeap(), 0, This); } @@ -553,7 +553,7 @@ static HRESULT WINAPI BmpEncoder_CreateNewFrame(IWICBitmapEncoder *iface, encode->committed = FALSE; *ppIFrameEncode = (IWICBitmapFrameEncode*)encode; - This->frame = (IWICBitmapFrameEncode*)encode; + This->frame = encode; return S_OK; } @@ -561,10 +561,9 @@ static HRESULT WINAPI BmpEncoder_CreateNewFrame(IWICBitmapEncoder *iface, static HRESULT WINAPI BmpEncoder_Commit(IWICBitmapEncoder *iface) { BmpEncoder *This = (BmpEncoder*)iface; - BmpFrameEncode *frame = (BmpFrameEncode*)This->frame; TRACE("(%p)\n", iface); - if (!frame || !frame->committed) return WINCODEC_ERR_WRONGSTATE; + if (!This->frame || !This->frame->committed) return WINCODEC_ERR_WRONGSTATE; return S_OK; }

1 0

André Hentschel : winemaker: Add def file support.
by Alexandre Julliard Jan. 5, 2011

Jan. 5, 2011

Module: wine Branch: master Commit: 564c7a571889699fdead758642ef93d636a3a547 URL: http://source.winehq.org/git/wine.git/?a=commit;h=564c7a571889699fdead75864… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Jan 4 22:43:01 2011 +0100 winemaker: Add def file support. --- tools/winemaker | 36 ++++++++++++++++++++++++++++-------- 1 files changed, 28 insertions(+), 8 deletions(-) diff --git a/tools/winemaker b/tools/winemaker index 7e98d77..a0d525b 100755 --- a/tools/winemaker +++ b/tools/winemaker @@ -3,7 +3,7 @@ use strict; # Copyright 2000-2004 Francois Gouget for CodeWeavers # Copyright 2004 Dimitrie O. Paun -# Copyright 2009 André Hentschel +# Copyright 2009-2011 André Hentschel # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -20,7 +20,7 @@ use strict; # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA # -my $version="0.7.5"; +my $version="0.7.6"; use Cwd; use File::Basename; @@ -266,6 +266,10 @@ my $TF_NODLLS=16; my $TF_NOMSVCRT=32; ## +# This target has a def file (only use it with TT_DLL) +my $TF_HASDEF=64; + +## # Initialize a target: # - set the target type to TT_SETTINGS, i.e. no real target will # be generated. @@ -800,6 +804,8 @@ sub source_scan_project_file($$$) } } elsif ($sfilet =~ /\.rc$/i) { push @sources_rc,$sfilet; + } elsif ($sfilet =~ /\.def$/i) { + @$project_settings[$T_FLAGS]|=$TF_HASDEF; } elsif ($sfilet =~ /\.(h|hxx|hpp|inl|rc2|dlg)$/i) { push @sources_misc,$sfilet; if ($sfilet =~ /^stdafx.h$/i && !(@$project_settings[$T_FLAGS] & $TF_NOMFC)) { @@ -889,6 +895,8 @@ sub source_scan_project_file($$$) } } elsif ($sfilet =~ /\.rc$/i) { push @sources_rc,$sfilet; + } elsif ($sfilet =~ /\.def$/i) { + @$project_settings[$T_FLAGS]|=$TF_HASDEF; } elsif ($sfilet =~ /\.(h|hxx|hpp|inl|rc2|dlg)$/i) { push @sources_misc,$sfilet; if ($sfilet =~ /^stdafx.h$/i && !(@$project_settings[$T_FLAGS] & $TF_NOMFC)) { @@ -1012,7 +1020,11 @@ sub source_scan_project_file($$$) push @local_depends,"$prj_name.so"; push @local_dlls,$prj_name; my $canon=canonize($prj_name); - push @{@$target[$T_LDFLAGS]},("-shared","\$(${canon}_MODULE:.dll=.spec)"); + if (@$project_settings[$T_FLAGS] & $TF_HASDEF) { + push @{@$target[$T_LDFLAGS]},("-shared","\$(${canon}_MODULE:.dll=.def)"); + } else { + push @{@$target[$T_LDFLAGS]},("-shared","\$(${canon}_MODULE:.dll=.spec)"); + } } @$target[$T_NAME]=$prj_name; @@ -1295,6 +1307,8 @@ sub source_scan_directory($$$$) } } elsif ($dentry =~ /\.rc$/i) { push @sources_rc,"$dentry"; + } elsif ($dentry =~ /\.def$/i) { + @$project_settings[$T_FLAGS]|=$TF_HASDEF; } elsif ($dentry =~ /\.(h|hxx|hpp|inl|rc2|dlg)$/i) { $has_headers=1; push @sources_misc,"$dentry"; @@ -1507,7 +1521,11 @@ sub source_scan_directory($$$$) push @local_depends,"$target_name.so"; push @local_dlls,$target_name; my $canon=canonize($target_name); - push @{@$target[$T_LDFLAGS]},("-shared","\$(${canon}_MODULE:.dll=.spec)"); + if (@$project_settings[$T_FLAGS] & $TF_HASDEF) { + push @{@$target[$T_LDFLAGS]},("-shared","\$(${canon}_MODULE:.dll=.def)"); + } else { + push @{@$target[$T_LDFLAGS]},("-shared","\$(${canon}_MODULE:.dll=.spec)"); + } } else { @$target[$T_TYPE]=$opt_target_type; push @exe_list,$target; @@ -1736,7 +1754,7 @@ sub fix_file_and_directory_names($) `head -n 1 "$dirname/$dentry"` =~ /Generated by Winemaker/); # Leave non-source files alone - next if ($new_name !~ /(^makefile|\.(c|cpp|h|rc))$/i); + next if ($new_name !~ /(^makefile|\.(c|cpp|h|rc|spec|def))$/i); # Only all lowercase extensions are supported (because of # rules like '.c.o:'). @@ -2480,7 +2498,9 @@ sub generate_project_files($) my $canon=canonize("@$target[$T_NAME]"); $canon =~ s/_so$//; - if (@$target[$T_TYPE] == $TT_DLL) { + if (@$target[$T_TYPE] == $TT_DLL && (@$project_settings[$T_FLAGS] & $TF_HASDEF)) { + print FILEO "\$(${canon}_MODULE).so: \$(${canon}_OBJS) \$(${canon}_MODULE:.dll=.def)\n"; + } elsif (@$target[$T_TYPE] == $TT_DLL) { print FILEO "\$(${canon}_MODULE).so: \$(${canon}_OBJS) \$(${canon}_MODULE:.dll=.spec)\n"; } else { print FILEO "\$(${canon}_MODULE).so: \$(${canon}_OBJS)\n"; @@ -2553,9 +2573,9 @@ $opt_no_banner=0; sub print_banner() { print "Winemaker $version\n"; - print "Copyright 2000 Francois Gouget <fgouget\(a)codeweavers.com> for CodeWeavers\n"; + print "Copyright 2000-2004 Francois Gouget <fgouget\(a)codeweavers.com> for CodeWeavers\n"; print "Copyright 2004 Dimitrie O. Paun\n"; - print "Copyright 2009 André Hentschel\n"; + print "Copyright 2009-2011 André Hentschel\n"; } sub usage()

1 0

Michael Stefaniuc : mshtml: COM cleanup for the IHTMLEmbedElement iface.
by Alexandre Julliard Jan. 5, 2011

Jan. 5, 2011

Module: wine Branch: master Commit: 1503a1ff4039a62fa4d1ebf78f9100850236959a URL: http://source.winehq.org/git/wine.git/?a=commit;h=1503a1ff4039a62fa4d1ebf78… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Jan 5 00:35:12 2011 +0100 mshtml: COM cleanup for the IHTMLEmbedElement iface. --- dlls/mshtml/htmlembed.c | 61 +++++++++++++++++++++++------------------------ 1 files changed, 30 insertions(+), 31 deletions(-) diff --git a/dlls/mshtml/htmlembed.c b/dlls/mshtml/htmlembed.c index a3ea1cc..aa1d249 100644 --- a/dlls/mshtml/htmlembed.c +++ b/dlls/mshtml/htmlembed.c @@ -35,45 +35,46 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml); typedef struct { HTMLElement element; - const IHTMLEmbedElementVtbl *lpIHTMLEmbedElementVtbl; + IHTMLEmbedElement IHTMLEmbedElement_iface; } HTMLEmbedElement; -#define HTMLEMBED(x) (&(x)->lpIHTMLEmbedElementVtbl) - -#define HTMLEMBED_THIS(iface) DEFINE_THIS(HTMLEmbedElement, IHTMLEmbedElement, iface) +static inline HTMLEmbedElement *impl_from_IHTMLEmbedElement(IHTMLEmbedElement *iface) +{ + return CONTAINING_RECORD(iface, HTMLEmbedElement, IHTMLEmbedElement_iface); +} static HRESULT WINAPI HTMLEmbedElement_QueryInterface(IHTMLEmbedElement *iface, REFIID riid, void **ppv) { - HTMLEmbedElement *This = HTMLEMBED_THIS(iface); + HTMLEmbedElement *This = impl_from_IHTMLEmbedElement(iface); return IHTMLDOMNode_QueryInterface(&This->element.node.IHTMLDOMNode_iface, riid, ppv); } static ULONG WINAPI HTMLEmbedElement_AddRef(IHTMLEmbedElement *iface) { - HTMLEmbedElement *This = HTMLEMBED_THIS(iface); + HTMLEmbedElement *This = impl_from_IHTMLEmbedElement(iface); return IHTMLDOMNode_AddRef(&This->element.node.IHTMLDOMNode_iface); } static ULONG WINAPI HTMLEmbedElement_Release(IHTMLEmbedElement *iface) { - HTMLEmbedElement *This = HTMLEMBED_THIS(iface); + HTMLEmbedElement *This = impl_from_IHTMLEmbedElement(iface); return IHTMLDOMNode_Release(&This->element.node.IHTMLDOMNode_iface); } static HRESULT WINAPI HTMLEmbedElement_GetTypeInfoCount(IHTMLEmbedElement *iface, UINT *pctinfo) { - HTMLEmbedElement *This = HTMLEMBED_THIS(iface); + HTMLEmbedElement *This = impl_from_IHTMLEmbedElement(iface); return IDispatchEx_GetTypeInfoCount(&This->element.node.dispex.IDispatchEx_iface, pctinfo); } static HRESULT WINAPI HTMLEmbedElement_GetTypeInfo(IHTMLEmbedElement *iface, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo) { - HTMLEmbedElement *This = HTMLEMBED_THIS(iface); + HTMLEmbedElement *This = impl_from_IHTMLEmbedElement(iface); return IDispatchEx_GetTypeInfo(&This->element.node.dispex.IDispatchEx_iface, iTInfo, lcid, ppTInfo); } @@ -81,7 +82,7 @@ static HRESULT WINAPI HTMLEmbedElement_GetTypeInfo(IHTMLEmbedElement *iface, UIN static HRESULT WINAPI HTMLEmbedElement_GetIDsOfNames(IHTMLEmbedElement *iface, REFIID riid, LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId) { - HTMLEmbedElement *This = HTMLEMBED_THIS(iface); + HTMLEmbedElement *This = impl_from_IHTMLEmbedElement(iface); return IDispatchEx_GetIDsOfNames(&This->element.node.dispex.IDispatchEx_iface, riid, rgszNames, cNames, lcid, rgDispId); } @@ -90,111 +91,109 @@ static HRESULT WINAPI HTMLEmbedElement_Invoke(IHTMLEmbedElement *iface, DISPID d REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) { - HTMLEmbedElement *This = HTMLEMBED_THIS(iface); + HTMLEmbedElement *This = impl_from_IHTMLEmbedElement(iface); return IDispatchEx_Invoke(&This->element.node.dispex.IDispatchEx_iface, dispIdMember, riid, lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); } static HRESULT WINAPI HTMLEmbedElement_put_hidden(IHTMLEmbedElement *iface, BSTR v) { - HTMLEmbedElement *This = HTMLEMBED_THIS(iface); + HTMLEmbedElement *This = impl_from_IHTMLEmbedElement(iface); FIXME("(%p)->(%s)\n", This, debugstr_w(v)); return E_NOTIMPL; } static HRESULT WINAPI HTMLEmbedElement_get_hidden(IHTMLEmbedElement *iface, BSTR *p) { - HTMLEmbedElement *This = HTMLEMBED_THIS(iface); + HTMLEmbedElement *This = impl_from_IHTMLEmbedElement(iface); FIXME("(%p)->(%p)\n", This, p); return E_NOTIMPL; } static HRESULT WINAPI HTMLEmbedElement_get_palete(IHTMLEmbedElement *iface, BSTR *p) { - HTMLEmbedElement *This = HTMLEMBED_THIS(iface); + HTMLEmbedElement *This = impl_from_IHTMLEmbedElement(iface); FIXME("(%p)->(%p)\n", This, p); return E_NOTIMPL; } static HRESULT WINAPI HTMLEmbedElement_get_pluginspage(IHTMLEmbedElement *iface, BSTR *p) { - HTMLEmbedElement *This = HTMLEMBED_THIS(iface); + HTMLEmbedElement *This = impl_from_IHTMLEmbedElement(iface); FIXME("(%p)->(%p)\n", This, p); return E_NOTIMPL; } static HRESULT WINAPI HTMLEmbedElement_put_src(IHTMLEmbedElement *iface, BSTR v) { - HTMLEmbedElement *This = HTMLEMBED_THIS(iface); + HTMLEmbedElement *This = impl_from_IHTMLEmbedElement(iface); FIXME("(%p)->(%s)\n", This, debugstr_w(v)); return E_NOTIMPL; } static HRESULT WINAPI HTMLEmbedElement_get_src(IHTMLEmbedElement *iface, BSTR *p) { - HTMLEmbedElement *This = HTMLEMBED_THIS(iface); + HTMLEmbedElement *This = impl_from_IHTMLEmbedElement(iface); FIXME("(%p)->(%p)\n", This, p); return E_NOTIMPL; } static HRESULT WINAPI HTMLEmbedElement_put_units(IHTMLEmbedElement *iface, BSTR v) { - HTMLEmbedElement *This = HTMLEMBED_THIS(iface); + HTMLEmbedElement *This = impl_from_IHTMLEmbedElement(iface); FIXME("(%p)->(%s)\n", This, debugstr_w(v)); return E_NOTIMPL; } static HRESULT WINAPI HTMLEmbedElement_get_units(IHTMLEmbedElement *iface, BSTR *p) { - HTMLEmbedElement *This = HTMLEMBED_THIS(iface); + HTMLEmbedElement *This = impl_from_IHTMLEmbedElement(iface); FIXME("(%p)->(%p)\n", This, p); return E_NOTIMPL; } static HRESULT WINAPI HTMLEmbedElement_put_name(IHTMLEmbedElement *iface, BSTR v) { - HTMLEmbedElement *This = HTMLEMBED_THIS(iface); + HTMLEmbedElement *This = impl_from_IHTMLEmbedElement(iface); FIXME("(%p)->(%s)\n", This, debugstr_w(v)); return E_NOTIMPL; } static HRESULT WINAPI HTMLEmbedElement_get_name(IHTMLEmbedElement *iface, BSTR *p) { - HTMLEmbedElement *This = HTMLEMBED_THIS(iface); + HTMLEmbedElement *This = impl_from_IHTMLEmbedElement(iface); FIXME("(%p)->(%p)\n", This, p); return E_NOTIMPL; } static HRESULT WINAPI HTMLEmbedElement_put_width(IHTMLEmbedElement *iface, VARIANT v) { - HTMLEmbedElement *This = HTMLEMBED_THIS(iface); + HTMLEmbedElement *This = impl_from_IHTMLEmbedElement(iface); FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); return E_NOTIMPL; } static HRESULT WINAPI HTMLEmbedElement_get_width(IHTMLEmbedElement *iface, VARIANT *p) { - HTMLEmbedElement *This = HTMLEMBED_THIS(iface); + HTMLEmbedElement *This = impl_from_IHTMLEmbedElement(iface); FIXME("(%p)->(%p)\n", This, p); return E_NOTIMPL; } static HRESULT WINAPI HTMLEmbedElement_put_height(IHTMLEmbedElement *iface, VARIANT v) { - HTMLEmbedElement *This = HTMLEMBED_THIS(iface); + HTMLEmbedElement *This = impl_from_IHTMLEmbedElement(iface); FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); return E_NOTIMPL; } static HRESULT WINAPI HTMLEmbedElement_get_height(IHTMLEmbedElement *iface, VARIANT *p) { - HTMLEmbedElement *This = HTMLEMBED_THIS(iface); + HTMLEmbedElement *This = impl_from_IHTMLEmbedElement(iface); FIXME("(%p)->(%p)\n", This, p); return E_NOTIMPL; } -#undef HTMLEMBED_THIS - static const IHTMLEmbedElementVtbl HTMLEmbedElementVtbl = { HTMLEmbedElement_QueryInterface, HTMLEmbedElement_AddRef, @@ -230,13 +229,13 @@ static HRESULT HTMLEmbedElement_QI(HTMLDOMNode *iface, REFIID riid, void **ppv) if(IsEqualGUID(&IID_IUnknown, riid)) { TRACE("(%p)->(IID_IUnknown %p)\n", This, ppv); - *ppv = HTMLEMBED(This); + *ppv = &This->IHTMLEmbedElement_iface; }else if(IsEqualGUID(&IID_IDispatch, riid)) { TRACE("(%p)->(IID_IDispatch %p)\n", This, ppv); - *ppv = HTMLEMBED(This); + *ppv = &This->IHTMLEmbedElement_iface; }else if(IsEqualGUID(&IID_IHTMLEmbedElement, riid)) { TRACE("(%p)->(IID_IHTMLEmbedElement %p)\n", This, ppv); - *ppv = HTMLEMBED(This); + *ppv = &This->IHTMLEmbedElement_iface; }else { return HTMLElement_QI(&This->element.node, riid, ppv); } @@ -278,7 +277,7 @@ HRESULT HTMLEmbedElement_Create(HTMLDocumentNode *doc, nsIDOMHTMLElement *nselem if(!ret) return E_OUTOFMEMORY; - ret->lpIHTMLEmbedElementVtbl = &HTMLEmbedElementVtbl; + ret->IHTMLEmbedElement_iface.lpVtbl = &HTMLEmbedElementVtbl; ret->element.node.vtbl = &HTMLEmbedElementImplVtbl; HTMLElement_Init(&ret->element, doc, nselem, &HTMLEmbedElement_dispex);

1 0

Michael Stefaniuc : hlink: Use ifaces instead of vtbl pointers in ExtensionService.
by Alexandre Julliard Jan. 5, 2011

Jan. 5, 2011

Module: wine Branch: master Commit: 4a6c525659a8a372e0780c76dcaf7db132c208c6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a6c525659a8a372e0780c76d… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Jan 5 00:36:48 2011 +0100 hlink: Use ifaces instead of vtbl pointers in ExtensionService. --- dlls/hlink/extserv.c | 103 ++++++++++++++++++++++++------------------------- 1 files changed, 50 insertions(+), 53 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4a6c525659a8a372e0780…

1 0