December 2010 - Wine-commits

Hwang YunSong : oleaut32: Update Korean resource.
by Alexandre Julliard 31 Dec '10

31 Dec '10

Module: wine Branch: master Commit: f08b1df355716086912b01c9c32307805a0c9221 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f08b1df355716086912b01c9c… Author: Hwang YunSong <hys545(a)dreamwiz.com> Date: Fri Dec 31 10:55:33 2010 +0900 oleaut32: Update Korean resource. --- dlls/oleaut32/oleaut32_Ko.rc | 18 ++++++++++-------- 1 files changed, 10 insertions(+), 8 deletions(-) diff --git a/dlls/oleaut32/oleaut32_Ko.rc b/dlls/oleaut32/oleaut32_Ko.rc index a91be61..318a8c5 100644 --- a/dlls/oleaut32/oleaut32_Ko.rc +++ b/dlls/oleaut32/oleaut32_Ko.rc @@ -1,8 +1,8 @@ /* * Korean resources for oleaut32 * - * - *Copyright 2005 YunSong Hwang(hys545(a)dreamwiz.com) + * Copyright 2005,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 * License as published by the Free Software Foundation; either @@ -20,14 +20,16 @@ #include "resource.h" +#pragma code_page(65001) + LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT STRINGTABLE { - IDS_TRUE "��" - IDS_FALSE "��" - IDS_YES "��" - IDS_NO "�ƴϿ�" - IDS_ON "�۵�" - IDS_OFF "��۵�" + IDS_TRUE "진실" + IDS_FALSE "거짓" + IDS_YES "예" + IDS_NO "아니오" + IDS_ON "작동" + IDS_OFF "비작동" }

1 0

Hwang YunSong : oledlg: Update Korean resource.
by Alexandre Julliard 31 Dec '10

31 Dec '10

Module: wine Branch: master Commit: 33410f8f402e957a1382fe4af81e007645de667d URL: http://source.winehq.org/git/wine.git/?a=commit;h=33410f8f402e957a1382fe4af… Author: Hwang YunSong <hys545(a)dreamwiz.com> Date: Fri Dec 31 10:56:23 2010 +0900 oledlg: Update Korean resource. --- dlls/oledlg/oledlg_Ko.rc | 80 +++++++++++++++++++++++---------------------- 1 files changed, 41 insertions(+), 39 deletions(-) diff --git a/dlls/oledlg/oledlg_Ko.rc b/dlls/oledlg/oledlg_Ko.rc index 2c313e4..6c228f9 100644 --- a/dlls/oledlg/oledlg_Ko.rc +++ b/dlls/oledlg/oledlg_Ko.rc @@ -19,80 +19,82 @@ #include "resource.h" +#pragma code_page(65001) + LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT UIINSERTOBJECT DIALOG 0, 0, 294, 151 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "��ü ��" +CAPTION "객체 삽입" FONT 9, "MS Shell Dlg" BEGIN LISTBOX IDC_OBJTYPELIST,82,19,131,66,LBS_SORT | LBS_NOINTEGRALHEIGHT | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP - LTEXT "��ü Ÿ��:",IDC_OBJTYPELBL,82,7,53,8,WS_VISIBLE - DEFPUSHBUTTON "Ȯ��",IDOK,221,7,66,14 - PUSHBUTTON "��",IDCANCEL,221,24,66,14 - GROUPBOX "��",IDC_RESULT,7,103,208,41 - CONTROL "�� ",IDC_CREATENEW,"Button",BS_AUTORADIOBUTTON | + LTEXT "객체 타입:",IDC_OBJTYPELBL,82,7,53,8,WS_VISIBLE + DEFPUSHBUTTON "확인",IDOK,221,7,66,14 + PUSHBUTTON "취소",IDCANCEL,221,24,66,14 + GROUPBOX "결과",IDC_RESULT,7,103,208,41 + CONTROL "새로 만들기",IDC_CREATENEW,"Button",BS_AUTORADIOBUTTON | WS_GROUP,7,20,62,10 - CONTROL "��Ʈ�� ",IDC_CREATECONTROL,"Button", + CONTROL "컨트롤 만들기",IDC_CREATECONTROL,"Button", BS_AUTORADIOBUTTON | NOT WS_VISIBLE,7,54,62,10 - CONTROL "��Ϸκ�� ",IDC_CREATEFROMFILE,"Button", + CONTROL "파일로부터 만들기",IDC_CREATEFROMFILE,"Button", BS_AUTORADIOBUTTON,7,37,67,10 LTEXT "",IDC_RESULTDESC,49,112,159,23 - PUSHBUTTON "��Ʈ�� ߰�(&A)...",IDC_ADDCONTROL,81,88,63,14,NOT WS_VISIBLE - CONTROL "�� ",IDC_ASICON,"Button",BS_AUTOCHECKBOX | + PUSHBUTTON "컨트롤 추가(&A)...",IDC_ADDCONTROL,81,88,63,14,NOT WS_VISIBLE + CONTROL "아이콘으로 보기",IDC_ASICON,"Button",BS_AUTOCHECKBOX | WS_TABSTOP | NOT WS_VISIBLE,223,58,64,10 - PUSHBUTTON "ã��...",IDC_BROWSE,155,88,50,14,NOT WS_VISIBLE - LTEXT "��:",IDC_FILELBL,58,21,20,8, NOT WS_VISIBLE + PUSHBUTTON "찾기...",IDC_BROWSE,155,88,50,14,NOT WS_VISIBLE + LTEXT "파일:",IDC_FILELBL,58,21,20,8, NOT WS_VISIBLE EDITTEXT IDC_FILE,83,37,132,13,ES_AUTOHSCROLL | NOT WS_VISIBLE END STRINGTABLE { - IDS_RESULTOBJDESC "�� %s ��ü�� " - IDS_RESULTFILEOBJDESC "�ۼ�� Ǯ�׸�� Ͽ� Ȱ��ȭ��ų�� ִ� ��ü�� Ͻÿ�." - IDS_BROWSE "ã��" - IDS_NOTOLEMOD "�� ùٸ� OLE�� ƴѰŷ� ��Դϴ�. OLE��Ʈ�� Ҽ� ��ϴ�." - IDS_NOTOLEMODCAPTION "��Ʈ�� ϱ�" + IDS_RESULTOBJDESC "새 %s 객체를 문서에 삽입" + IDS_RESULTFILEOBJDESC "작성한 풀그림을 사용하여 활성화시킬수 있는 객체를 문서파일 내용으로 삽입하시오." + IDS_BROWSE "찾기" + IDS_NOTOLEMOD "이 파일은 올바른 OLE모듈이 아닌거로 보입니다. OLE컨트롤을 등록할수 없습니다." + IDS_NOTOLEMODCAPTION "컨트롤 더하기" } IDD_PASTESPECIAL4 DIALOG 3, 15, 299, 140 STYLE DS_MODALFRAME | DS_SETFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Ư��ϰ� �ٿ��ֱ�" +CAPTION "특별하게 붙여넣기" FONT 9, "MS Shell Dlg" BEGIN - LTEXT "��:", -1, 6, 9, 30, 8, WS_VISIBLE | WS_GROUP - CONTROL "�ٿ��ֱ�(&P)", IDC_PS_PASTE, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_GROUP | WS_VISIBLE, + LTEXT "원본:", -1, 6, 9, 30, 8, WS_VISIBLE | WS_GROUP + CONTROL "붙여넣기(&P)", IDC_PS_PASTE, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_GROUP | WS_VISIBLE, 1, 44, 55, 10 - CONTROL "��ũ�� ٿ��ֱ�(&L)", IDC_PS_PASTELINK, "Button", BS_AUTORADIOBUTTON | WS_VISIBLE, + CONTROL "링크로 붙여넣기(&L)", IDC_PS_PASTELINK, "Button", BS_AUTORADIOBUTTON | WS_VISIBLE, 1, 61, 69, 10 - LTEXT "�ٸ� �̸��(&A):", -1, 73, 25, 59, 8, WS_VISIBLE | WS_GROUP + LTEXT "다른 이름으로(&A):", -1, 73, 25, 59, 8, WS_VISIBLE | WS_GROUP LISTBOX IDC_PS_PASTELIST, 73, 36, 150, 57, LBS_NOTIFY | LBS_USETABSTOPS | WS_VSCROLL | WS_BORDER | NOT WS_VISIBLE LISTBOX IDC_PS_PASTELINKLIST, 73, 36, 150, 57, LBS_NOTIFY | LBS_USETABSTOPS | WS_VSCROLL | WS_BORDER | NOT WS_VISIBLE LISTBOX IDC_PS_DISPLAYLIST, 73, 36, 150, 57, LBS_NOTIFY | LBS_USETABSTOPS | WS_VSCROLL | WS_BORDER | WS_VISIBLE - CONTROL "Ȯ��", IDOK, "Button", BS_DEFPUSHBUTTON | WS_TABSTOP | WS_GROUP | WS_VISIBLE, 226, 6, 66, 14 - CONTROL "��", IDCANCEL, "Button", BS_PUSHBUTTON | WS_TABSTOP | WS_VISIBLE, 226, 23, 66, 14 - CONTROL "��(&H)", IDC_OLEUIHELP, "Button", BS_PUSHBUTTON | WS_TABSTOP | WS_VISIBLE, 226, 42, 66, 14 - CONTROL "�� (&D)", IDC_PS_DISPLAYASICON, "Button", BS_AUTOCHECKBOX | WS_TABSTOP | WS_VISIBLE, 226, 59, 70, 14 + CONTROL "확인", IDOK, "Button", BS_DEFPUSHBUTTON | WS_TABSTOP | WS_GROUP | WS_VISIBLE, 226, 6, 66, 14 + CONTROL "취소", IDCANCEL, "Button", BS_PUSHBUTTON | WS_TABSTOP | WS_VISIBLE, 226, 23, 66, 14 + CONTROL "도움말(&H)", IDC_OLEUIHELP, "Button", BS_PUSHBUTTON | WS_TABSTOP | WS_VISIBLE, 226, 42, 66, 14 + CONTROL "아이콘으로 보기(&D)", IDC_PS_DISPLAYASICON, "Button", BS_AUTOCHECKBOX | WS_TABSTOP | WS_VISIBLE, 226, 59, 70, 14 CONTROL "", IDC_PS_ICONDISPLAY, "Static", SS_ICON | WS_VISIBLE, 224, 75, 66, 44 - CONTROL "�� ٲٱ�(&I)...", IDC_PS_CHANGEICON, "Button", BS_PUSHBUTTON | WS_TABSTOP | WS_VISIBLE, 224, 123, 66, 14 + CONTROL "아이콘 바꾸기(&I)...", IDC_PS_CHANGEICON, "Button", BS_PUSHBUTTON | WS_TABSTOP | WS_VISIBLE, 224, 123, 66, 14 CONTROL "", IDC_PS_RESULTIMAGE, "Static", SS_ICON | WS_VISIBLE, 8, 101, 42, 34 - CONTROL "<< �� ؽ�Ʈ�� ٰ� >>", IDC_PS_RESULTTEXT, "Static", SS_NOPREFIX | WS_VISIBLE, 54, 100, 159, 35 - CONTROL "��", -1, "Button", BS_GROUPBOX | WS_GROUP | WS_VISIBLE, 6, 90, 212, 48 + CONTROL "<< 결과 텍스트는 여기다가 >>", IDC_PS_RESULTTEXT, "Static", SS_NOPREFIX | WS_VISIBLE, 54, 100, 159, 35 + CONTROL "결과", -1, "Button", BS_GROUPBOX | WS_GROUP | WS_VISIBLE, 6, 90, 212, 48 CONTROL "", IDC_PS_SOURCETEXT, "Edit", ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE, 37, 9, 180, 8 END STRINGTABLE { - IDS_PS_PASTE_DATA "�� %s�� Ŭ�� ϱ�." - IDS_PS_PASTE_OBJECT "�� Ŭ�� ÷��ϸ� %s�� ؼ� �̰�� ֽ��ϴ�." - IDS_PS_PASTE_OBJECT_AS_ICON "�� Ŭ�� ÷��ϸ� %s�� ؼ� �̰�� ֽ��ϴ�. �̰�� Ÿ�� ̴ϴ�." - IDS_PS_PASTE_LINK_DATA "�� %s�� Ŭ�� ϱ�. �� ʹ� �� Ͽ� ��Ǿ� �־ �� ٲ�� ٲ�̴ϴ�." - IDS_PS_PASTE_LINK_OBJECT "�� Ŭ��忡 �ִ� �׸�� ֽ��ϴ�. �� ׸�� Ͽ� ��Ǿ� �־ �� ٲ�� ٲ�̴ϴ�." - IDS_PS_PASTE_LINK_OBJECT_AS_ICON "�� Ŭ��忡 �ִ� �� ֽ��ϴ�. �� Ͽ� ��Ǿ� �־ �� ٲ�� ٲ�̴ϴ�t." - IDS_PS_NON_OLE "�� Ŭ�� ϱ�." - IDS_PS_UNKNOWN_TYPE "�˼� �� " - IDS_PS_UNKNOWN_SRC "�˼� �� " - IDS_PS_UNKNOWN_APP "�� α׷�" + IDS_PS_PASTE_DATA "당신의 문서 %s에 클립보드의 내용 삽입하기." + IDS_PS_PASTE_OBJECT "당신의 문서에 클립보드의 내용들을 첨부하면 %s를 사용해서 이것을 실행할 수 있습니다." + IDS_PS_PASTE_OBJECT_AS_ICON "당신의 문서에 클립보드의 내용들을 첨부하면 %s를 사용해서 이것을 실행할 수 있습니다. 이것은 아이콘으로 나타내질 겁니다." + IDS_PS_PASTE_LINK_DATA "당신의 문서 %s에 클립보드의 내용 삽입하기. 이 데이터는 원본 파일에 연결되어 있어서 파일이 바뀌면 당신의 문서도 바뀔겁니다." + IDS_PS_PASTE_LINK_OBJECT "당신의 문서에 클립보드에 있는 그림을 집어넣습니다. 이 그림은 원본 파일에 연결되어 있어서 파일이 바뀌면 당신의 문서도 바뀔겁니다." + IDS_PS_PASTE_LINK_OBJECT_AS_ICON "당신의 문서에 클립보드에 있는 단축아이콘을 집어넣습니다. 이 단축아이콘은 원본 파일에 연결되어 있어서 파일이 바뀌면 당신의 문서도 바뀔겁니다t." + IDS_PS_NON_OLE "당신의 문서에 클립보드의 내용 삽입하기." + IDS_PS_UNKNOWN_TYPE "알수 없는 형식" + IDS_PS_UNKNOWN_SRC "알수 없는 원본" + IDS_PS_UNKNOWN_APP "내가 만든 프로그램" }

1 0

Dan Kegel : include: Remove extra semicolons after a macro that doesn' t need them.
by Alexandre Julliard 31 Dec '10

31 Dec '10

Module: wine Branch: master Commit: c6dbea01d6b58a06d678984a4a3e24e074238abf URL: http://source.winehq.org/git/wine.git/?a=commit;h=c6dbea01d6b58a06d678984a4… Author: Dan Kegel <dank(a)kegel.com> Date: Fri Dec 31 04:54:00 2010 +0000 include: Remove extra semicolons after a macro that doesn't need them. --- include/winuser.h | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/winuser.h b/include/winuser.h index 83c99cb..d95bfea 100644 --- a/include/winuser.h +++ b/include/winuser.h @@ -2134,8 +2134,8 @@ typedef struct _ICONINFOEXW WCHAR szResName[MAX_PATH]; } ICONINFOEXW, *PICONINFOEXW; -DECL_WINELIB_TYPE_AW(ICONINFOEX); -DECL_WINELIB_TYPE_AW(PICONINFOEX); +DECL_WINELIB_TYPE_AW(ICONINFOEX) +DECL_WINELIB_TYPE_AW(PICONINFOEX) typedef struct tagCURSORINFO {

1 0

Michael Stefaniuc : mshtml: COM cleanup for the IDispatchEx iface in HTMLDocument.
by Alexandre Julliard 31 Dec '10

31 Dec '10

Module: wine Branch: master Commit: 00eb02711de63ef14040e4758856a6fea00cc785 URL: http://source.winehq.org/git/wine.git/?a=commit;h=00eb02711de63ef14040e4758… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Dec 31 11:02:05 2010 +0100 mshtml: COM cleanup for the IDispatchEx iface in HTMLDocument. --- dlls/mshtml/htmldoc.c | 54 +++++++++++++++++++++-------------------- dlls/mshtml/htmldoc3.c | 22 +++++++++------- dlls/mshtml/htmldoc5.c | 22 +++++++++------- dlls/mshtml/mshtml_private.h | 2 +- 4 files changed, 53 insertions(+), 47 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=00eb02711de63ef14040e…

1 0

Michael Stefaniuc : mshtml: COM cleanup for the IDispatchEx iface in HTMLWindow.
by Alexandre Julliard 31 Dec '10

31 Dec '10

Module: wine Branch: master Commit: 2e2f88af906da2b7ee21820e22babb06cd021808 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e2f88af906da2b7ee21820e2… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Dec 31 11:03:45 2010 +0100 mshtml: COM cleanup for the IDispatchEx iface in HTMLWindow. --- dlls/mshtml/htmldoc.c | 4 +- dlls/mshtml/htmlframe.c | 3 +- dlls/mshtml/htmliframe.c | 3 +- dlls/mshtml/htmlwindow.c | 76 ++++++++++++++++++++++-------------------- dlls/mshtml/mshtml_private.h | 2 +- 5 files changed, 47 insertions(+), 41 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2e2f88af906da2b7ee218…

1 0

Michael Stefaniuc : mshtml: COM cleanup for the IDispatchEx iface in DispatchEx.
by Alexandre Julliard 31 Dec '10

31 Dec '10

Module: wine Branch: master Commit: 0b66169a05ad6a2ea44f5833f2362b8e1c1d16f2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0b66169a05ad6a2ea44f5833f… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Dec 31 11:07:33 2010 +0100 mshtml: COM cleanup for the IDispatchEx iface in DispatchEx. --- dlls/mshtml/dispex.c | 57 +++++++++++++++++++++-------------------- dlls/mshtml/htmlanchor.c | 12 +++++--- dlls/mshtml/htmlbody.c | 13 ++++++--- dlls/mshtml/htmlcomment.c | 12 +++++--- dlls/mshtml/htmlcurstyle.c | 9 +++--- dlls/mshtml/htmldoc.c | 4 +- dlls/mshtml/htmlelem.c | 32 +++++++++++----------- dlls/mshtml/htmlelem2.c | 18 +++++++------ dlls/mshtml/htmlelem3.c | 9 +++--- dlls/mshtml/htmlelemcol.c | 9 +++--- dlls/mshtml/htmlembed.c | 12 +++++--- dlls/mshtml/htmlevent.c | 9 +++--- dlls/mshtml/htmlform.c | 12 +++++--- dlls/mshtml/htmlframe.c | 13 ++++++--- dlls/mshtml/htmlframebase.c | 11 ++++--- dlls/mshtml/htmlgeneric.c | 12 +++++--- dlls/mshtml/htmliframe.c | 13 ++++++--- dlls/mshtml/htmlimg.c | 12 +++++--- dlls/mshtml/htmlinput.c | 23 +++++++++------- dlls/mshtml/htmllocation.c | 9 +++--- dlls/mshtml/htmlnode.c | 29 +++++++++++--------- dlls/mshtml/htmlobject.c | 13 ++++++--- dlls/mshtml/htmloption.c | 12 +++++--- dlls/mshtml/htmlscript.c | 12 +++++--- dlls/mshtml/htmlselect.c | 12 +++++--- dlls/mshtml/htmlstyle.c | 9 +++--- dlls/mshtml/htmlstyle2.c | 9 +++--- dlls/mshtml/htmlstyle3.c | 18 +++++++------ dlls/mshtml/htmlstyleelem.c | 12 +++++--- dlls/mshtml/htmlstylesheet.c | 9 +++--- dlls/mshtml/htmltable.c | 12 +++++--- dlls/mshtml/htmltablerow.c | 12 +++++--- dlls/mshtml/htmltextarea.c | 12 +++++--- dlls/mshtml/htmltextcont.c | 12 +++++--- dlls/mshtml/htmltextnode.c | 11 ++++--- dlls/mshtml/htmlwindow.c | 27 +++++++++++--------- dlls/mshtml/mshtml_private.h | 4 +-- dlls/mshtml/omnavigator.c | 18 +++++++------ 38 files changed, 304 insertions(+), 240 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0b66169a05ad6a2ea44f5…

1 0

Frédéric Delanoy : jscript: Update French translation.
by Alexandre Julliard 31 Dec '10

31 Dec '10

Module: wine Branch: master Commit: d0191cb1324bc802c14a34da01cdc27293ea7fed URL: http://source.winehq.org/git/wine.git/?a=commit;h=d0191cb1324bc802c14a34da0… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu Dec 30 22:33:57 2010 +0100 jscript: Update French translation. --- dlls/jscript/jscript_Fr.rc | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/jscript/jscript_Fr.rc b/dlls/jscript/jscript_Fr.rc index 3196655..d375fbe 100644 --- a/dlls/jscript/jscript_Fr.rc +++ b/dlls/jscript/jscript_Fr.rc @@ -39,6 +39,7 @@ STRINGTABLE IDS_LBRACKET "« ( » attendu" IDS_RBRACKET "« ) » attendu" IDS_UNTERMINATED_STR "Constante chaîne de caractères non clôturée" + IDS_DISABLED_CC "La compilation conditionnelle est désactivée" IDS_NOT_FUNC "Fonction attendue" IDS_NOT_DATE "« [objet] » n'est pas un objet de type date" IDS_NOT_NUM "Nombre attendu"

1 0

Jacek Caban : mshtml: Added moz-safe-about to the list of Gecko internal protocols.
by Alexandre Julliard 31 Dec '10

31 Dec '10

Module: wine Branch: master Commit: b7e78af4de0559b2802ff10ab0414799155ada77 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b7e78af4de0559b2802ff10ab… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Dec 30 23:29:11 2010 +0100 mshtml: Added moz-safe-about to the list of Gecko internal protocols. --- dlls/mshtml/nsio.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index 7f1cad0..30185dd 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -2677,7 +2677,7 @@ static nsresult NSAPI nsIOService_GetProtocolFlags(nsIIOService *iface, const ch static BOOL is_gecko_special_uri(const char *spec) { - static const char *special_schemes[] = {"chrome:", "jar:", "resource:", "javascript:", "wyciwyg:"}; + static const char *special_schemes[] = {"chrome:", "jar:", "moz-safe-about", "resource:", "javascript:", "wyciwyg:"}; int i; for(i=0; i < sizeof(special_schemes)/sizeof(*special_schemes); i++) {

1 0

Jacek Caban : mshtml: Make nsIIOService::NewURI IUri-based.
by Alexandre Julliard 31 Dec '10

31 Dec '10

Module: wine Branch: master Commit: 1fa5ddfad927c03ebf4e9bcbd28062fb316a1743 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1fa5ddfad927c03ebf4e9bcbd… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Dec 30 16:32:58 2010 -0600 mshtml: Make nsIIOService::NewURI IUri-based. --- dlls/mshtml/nsio.c | 73 ++++++++++++++++++++++------------------------------ 1 files changed, 31 insertions(+), 42 deletions(-) diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index 30185dd..e7f8a70 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -2699,13 +2699,13 @@ static nsresult NSAPI nsIOService_NewURI(nsIIOService *iface, const nsACString * const char *aOriginCharset, nsIURI *aBaseURI, nsIURI **_retval) { nsWineURI *wine_uri, *base_wine_uri = NULL; - const char *spec = NULL; + WCHAR new_spec[INTERNET_MAX_URL_LENGTH]; HTMLWindow *window = NULL; + const char *spec = NULL; nsIURI *uri = NULL; - LPCWSTR base_wine_url = NULL; - nsACString spec_str; + IUri *urlmon_uri; nsresult nsres; - + HRESULT hres; TRACE("(%s %s %p %p)\n", debugstr_nsacstr(aSpec), debugstr_a(aOriginCharset), aBaseURI, _retval); @@ -2718,60 +2718,49 @@ static nsresult NSAPI nsIOService_NewURI(nsIIOService *iface, const nsACString * spec += 5; if(aBaseURI) { - PARSEDURLA parsed_url = {sizeof(PARSEDURLA)}; - nsres = nsIURI_QueryInterface(aBaseURI, &IID_nsWineURI, (void**)&base_wine_uri); if(NS_SUCCEEDED(nsres)) { - base_wine_url = base_wine_uri->wine_url; - if(base_wine_uri->window_ref && base_wine_uri->window_ref->window) { + if(!ensure_uri(base_wine_uri)) + return NS_ERROR_UNEXPECTED; + if(base_wine_uri->window_ref) window = base_wine_uri->window_ref->window; - IHTMLWindow2_AddRef(&window->IHTMLWindow2_iface); - } - TRACE("base url: %s window: %p\n", debugstr_w(base_wine_url), window); - }else if(FAILED(ParseURLA(spec, &parsed_url))) { - TRACE("not wraping\n"); - return nsIIOService_NewURI(nsio, aSpec, aOriginCharset, aBaseURI, _retval); }else { WARN("Could not get base nsWineURI: %08x\n", nsres); } } - nsACString_InitDepend(&spec_str, spec); - nsres = nsIIOService_NewURI(nsio, &spec_str, aOriginCharset, aBaseURI, &uri); - nsACString_Finish(&spec_str); - if(NS_FAILED(nsres)) - TRACE("NewURI failed: %08x\n", nsres); - - nsres = create_uri(uri, window, NULL, &wine_uri); - *_retval = (nsIURI*)wine_uri; + MultiByteToWideChar(CP_ACP, 0, spec, -1, new_spec, sizeof(new_spec)/sizeof(WCHAR)); - if(window) - IHTMLWindow2_Release(&window->IHTMLWindow2_iface); - - if(base_wine_url) { - WCHAR url[INTERNET_MAX_URL_LENGTH], rel_url[INTERNET_MAX_URL_LENGTH]; - DWORD len; - HRESULT hres; - - MultiByteToWideChar(CP_ACP, 0, spec, -1, rel_url, sizeof(rel_url)/sizeof(WCHAR)); - - hres = CoInternetCombineUrl(base_wine_url, rel_url, - URL_ESCAPE_SPACES_ONLY|URL_DONT_ESCAPE_EXTRA_INFO, - url, sizeof(url)/sizeof(WCHAR), &len, 0); - if(SUCCEEDED(hres)) - set_wine_url(wine_uri, url); - else - WARN("CoCombineUrl failed: %08x\n", hres); + if(base_wine_uri) { + hres = CoInternetCombineUrlEx(base_wine_uri->uri, new_spec, URL_ESCAPE_SPACES_ONLY|URL_DONT_ESCAPE_EXTRA_INFO, + &urlmon_uri, 0); + if(FAILED(hres)) + WARN("CoInternetCombineUrlEx failed: %08x\n", hres); }else { - WCHAR url[INTERNET_MAX_URL_LENGTH]; + hres = CreateUri(new_spec, 0, 0, &urlmon_uri); + if(FAILED(hres)) + WARN("CreateUri failed: %08x\n", hres); + } - MultiByteToWideChar(CP_ACP, 0, spec, -1, url, sizeof(url)/sizeof(WCHAR)); - set_wine_url(wine_uri, url); + nsres = nsIIOService_NewURI(nsio, aSpec, aOriginCharset, aBaseURI, &uri); + if(NS_FAILED(nsres)) + TRACE("NewURI failed: %08x\n", nsres); + + if(FAILED(hres)) { + *_retval = uri; + return nsres; } + nsres = create_uri(uri, window, NULL, &wine_uri); if(base_wine_uri) nsIURI_Release(NSURI(base_wine_uri)); + if(NS_FAILED(nsres)) + return nsres; + wine_uri->uri = urlmon_uri; + + sync_wine_url(wine_uri); + *_retval = (nsIURI*)wine_uri; return nsres; }

1 0

Nikolay Sivov : oleaut32: Get function/ variable description size with a helper, remove a hardcoded size.
by Alexandre Julliard 31 Dec '10

31 Dec '10

Module: wine Branch: master Commit: 59cc0d5c2ecf5faeb077dd4a13b75ccec1f1228f URL: http://source.winehq.org/git/wine.git/?a=commit;h=59cc0d5c2ecf5faeb077dd4a1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Dec 30 22:12:52 2010 +0300 oleaut32: Get function/variable description size with a helper, remove a hardcoded size. --- dlls/oleaut32/typelib2.c | 28 ++++++++++++++++++---------- 1 files changed, 18 insertions(+), 10 deletions(-) diff --git a/dlls/oleaut32/typelib2.c b/dlls/oleaut32/typelib2.c index 14a6ade..504d442 100644 --- a/dlls/oleaut32/typelib2.c +++ b/dlls/oleaut32/typelib2.c @@ -240,6 +240,11 @@ static inline UINT cti2_get_func_count(const MSFT_TypeInfoBase *typeinfo) return typeinfo->cElement & 0xFFFF; } +static inline INT ctl2_get_record_size(const CyclicList *iter) +{ + return iter->u.data[0] & 0xFFFF; +} + /* NOTE: entry always assumed to be a function */ static inline INVOKEKIND ctl2_get_invokekind(const CyclicList *func) { @@ -2219,11 +2224,12 @@ static HRESULT WINAPI ICreateTypeInfo2_fnAddVarDesc( This->dual->typedata = This->typedata; } - /* allocate type data space for us */ insert = alloc_cyclic_list_item(CyclicListVar); if(!insert) return E_OUTOFMEMORY; - insert->u.data = HeapAlloc(GetProcessHeap(), 0, sizeof(int[5])); + + /* allocate whole structure, it's fixed size always */ + insert->u.data = HeapAlloc(GetProcessHeap(), 0, sizeof(MSFT_VarRecord)); if(!insert->u.data) { HeapFree(GetProcessHeap(), 0, insert); return E_OUTOFMEMORY; @@ -2236,11 +2242,13 @@ static HRESULT WINAPI ICreateTypeInfo2_fnAddVarDesc( if(This->dual) This->dual->typedata = This->typedata; - This->typedata->next->u.val += 0x14; + This->typedata->next->u.val += FIELD_OFFSET(MSFT_VarRecord, HelpContext); typedata = This->typedata->u.data; /* fill out the basic type information */ - typedata[0] = 0x14 | (index << 16); + + /* no optional fields initially */ + typedata[0] = FIELD_OFFSET(MSFT_VarRecord, HelpContext) | (index << 16); typedata[2] = pVarDesc->wVarFlags; typedata[3] = (sizeof(VARDESC) << 16) | pVarDesc->varkind; @@ -2363,7 +2371,7 @@ static HRESULT WINAPI ICreateTypeInfo2_fnSetFuncAndParamNames( if (*((INT*)namedata) == -1) *((INT *)namedata) = This->typelib->typelib_typeinfo_offsets[This->typeinfo->typekind >> 16]; - len = (iter->u.data[0]&0xFFFF)/4 - iter->u.data[5]*3; + len = ctl2_get_record_size(iter)/4 - iter->u.data[5]*3; for (i = 1; i < cNames; i++) { offset = ctl2_alloc_name(This->typelib, names[i]); @@ -2723,7 +2731,7 @@ static HRESULT WINAPI ICreateTypeInfo2_fnLayOut( typedata[i] = iter; - iter->u.data[0] = (iter->u.data[0]&0xffff) | (i<<16); + iter->u.data[0] = ctl2_get_record_size(iter) | (i<<16); if((iter->u.data[3]&1) != (user_vft&1)) { HeapFree(GetProcessHeap(), 0, typedata); @@ -3247,7 +3255,7 @@ static HRESULT WINAPI ITypeInfo2_fnGetFuncDesc( has_defaults = typedata[4] & 0x1000; tail = typedata[5] * (has_defaults ? 16 : 12); - hdr_len = ((typedata[0] & 0xFFFF) - tail) / sizeof(int); + hdr_len = (ctl2_get_record_size(desc) - tail) / sizeof(int); if ((*ppFuncDesc)->cParams > 0) { (*ppFuncDesc)->lprgelemdescParam = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, (*ppFuncDesc)->cParams * sizeof(ELEMDESC)); @@ -3458,7 +3466,7 @@ static HRESULT WINAPI ITypeInfo2_fnGetDocumentation( if (iter->indice == memid) { if (iter->type == CyclicListFunc) { const int *typedata = iter->u.data; - int size = (typedata[0]&0xFFFF) - typedata[5]*(typedata[4]&0x1000?16:12); + int size = ctl2_get_record_size(iter) - typedata[5]*(typedata[4]&0x1000?16:12); nameoffset = iter->name; /* FIXME implement this once SetFuncDocString is implemented */ @@ -4534,7 +4542,7 @@ static void ctl2_write_typeinfos(ICreateTypeLib2Impl *This, HANDLE hFile) iter = typeinfo->typedata->next; ctl2_write_chunk(hFile, &iter->u.val, sizeof(int)); for(iter=iter->next; iter!=typeinfo->typedata->next; iter=iter->next) - ctl2_write_chunk(hFile, iter->u.data, iter->u.data[0] & 0xffff); + ctl2_write_chunk(hFile, iter->u.data, ctl2_get_record_size(iter)); for(iter=typeinfo->typedata->next->next; iter!=typeinfo->typedata->next; iter=iter->next) ctl2_write_chunk(hFile, &iter->indice, sizeof(int)); @@ -4544,7 +4552,7 @@ static void ctl2_write_typeinfos(ICreateTypeLib2Impl *This, HANDLE hFile) for(iter=typeinfo->typedata->next->next; iter!=typeinfo->typedata->next; iter=iter->next) { ctl2_write_chunk(hFile, &offset, sizeof(int)); - offset += iter->u.data[0] & 0xffff; + offset += ctl2_get_record_size(iter); } } }

1 0