September 2007 - Wine-commits

Jacek Caban : mshtml: Make HTMLBodyElement child object of HTMLTextContainer.
by Alexandre Julliard 17 Sep '07

17 Sep '07

Module: wine Branch: master Commit: ea52235f8f3d4ba501ab9eb56921cbd25a62a893 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea52235f8f3d4ba501ab9eb56… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Sep 15 16:07:52 2007 +0200 mshtml: Make HTMLBodyElement child object of HTMLTextContainer. --- dlls/mshtml/htmlbody.c | 24 ++++++++++++------------ dlls/mshtml/htmltextcont.c | 17 ++++++++--------- dlls/mshtml/mshtml_private.h | 7 +++---- 3 files changed, 23 insertions(+), 25 deletions(-) diff --git a/dlls/mshtml/htmlbody.c b/dlls/mshtml/htmlbody.c index bb616cd..35be04f 100644 --- a/dlls/mshtml/htmlbody.c +++ b/dlls/mshtml/htmlbody.c @@ -36,7 +36,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml); typedef struct { - HTMLElement element; + HTMLTextContainer textcont; const IHTMLBodyElementVtbl *lpHTMLBodyElementVtbl; @@ -83,7 +83,7 @@ static HRESULT WINAPI HTMLBodyElement_QueryInterface(IHTMLBodyElement *iface, return S_OK; } - hres = HTMLElement_QI(&This->element, riid, ppv); + hres = HTMLElement_QI(&This->textcont.element, riid, ppv); if(FAILED(hres)) WARN("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppv); @@ -96,7 +96,7 @@ static ULONG WINAPI HTMLBodyElement_AddRef(IHTMLBodyElement *iface) TRACE("(%p)\n", This); - return IHTMLDocument2_AddRef(HTMLDOC(This->element.node.doc)); + return IHTMLDocument2_AddRef(HTMLDOC(This->textcont.element.node.doc)); } static ULONG WINAPI HTMLBodyElement_Release(IHTMLBodyElement *iface) @@ -105,7 +105,7 @@ static ULONG WINAPI HTMLBodyElement_Release(IHTMLBodyElement *iface) TRACE("(%p)\n", This); - return IHTMLDocument2_Release(HTMLDOC(This->element.node.doc)); + return IHTMLDocument2_Release(HTMLDOC(This->textcont.element.node.doc)); } static HRESULT WINAPI HTMLBodyElement_GetTypeInfoCount(IHTMLBodyElement *iface, UINT *pctinfo) @@ -407,18 +407,18 @@ static HRESULT WINAPI HTMLBodyElement_createTextRange(IHTMLBodyElement *iface, I TRACE("(%p)->(%p)\n", This, range); - if(This->element.node.doc->nscontainer) { + if(This->textcont.element.node.doc->nscontainer) { nsIDOMDocument *nsdoc; nsIDOMDocumentRange *nsdocrange; nsresult nsres; - nsIWebNavigation_GetDocument(This->element.node.doc->nscontainer->navigation, &nsdoc); + nsIWebNavigation_GetDocument(This->textcont.element.node.doc->nscontainer->navigation, &nsdoc); nsIDOMDocument_QueryInterface(nsdoc, &IID_nsIDOMDocumentRange, (void**)&nsdocrange); nsIDOMDocument_Release(nsdoc); nsres = nsIDOMDocumentRange_CreateRange(nsdocrange, &nsrange); if(NS_SUCCEEDED(nsres)) { - nsres = nsIDOMRange_SelectNodeContents(nsrange, This->element.node.nsnode); + nsres = nsIDOMRange_SelectNodeContents(nsrange, This->textcont.element.node.nsnode); if(NS_FAILED(nsres)) ERR("SelectNodeContents failed: %08x\n", nsres); }else { @@ -428,7 +428,7 @@ static HRESULT WINAPI HTMLBodyElement_createTextRange(IHTMLBodyElement *iface, I nsIDOMDocumentRange_Release(nsdocrange); } - *range = HTMLTxtRange_Create(This->element.node.doc, nsrange); + *range = HTMLTxtRange_Create(This->textcont.element.node.doc, nsrange); return S_OK; } @@ -493,7 +493,7 @@ HTMLElement *HTMLBodyElement_Create(nsIDOMHTMLElement *nselem) ret->lpHTMLBodyElementVtbl = &HTMLBodyElementVtbl; - HTMLTextContainer_Init(&ret->text_container, &ret->element); + HTMLTextContainer_Init(&ret->text_container); ConnectionPoint_Init(&ret->cp_propnotif, CONPTCONT(&ret->cp_container), &IID_IPropertyNotifySink, NULL); @@ -506,8 +506,8 @@ HTMLElement *HTMLBodyElement_Create(nsIDOMHTMLElement *nselem) if(NS_FAILED(nsres)) ERR("Could not get nsDOMHTMLBodyElement: %08x\n", nsres); - ret->element.impl = (IUnknown*)HTMLBODY(ret); - ret->element.destructor = HTMLBodyElement_destructor; + ret->textcont.element.impl = (IUnknown*)HTMLBODY(ret); + ret->textcont.element.destructor = HTMLBodyElement_destructor; - return &ret->element; + return &ret->textcont.element; } diff --git a/dlls/mshtml/htmltextcont.c b/dlls/mshtml/htmltextcont.c index e67e668..20bdeab 100644 --- a/dlls/mshtml/htmltextcont.c +++ b/dlls/mshtml/htmltextcont.c @@ -40,19 +40,19 @@ static HRESULT WINAPI HTMLTextContainer_QueryInterface(IHTMLTextContainer *iface REFIID riid, void **ppv) { HTMLTextContainer *This = HTMLTEXTCONT_THIS(iface); - return IHTMLElement_QueryInterface(HTMLELEM(This->element), riid, ppv); + return IHTMLElement_QueryInterface(HTMLELEM(&This->element), riid, ppv); } static ULONG WINAPI HTMLTextContainer_AddRef(IHTMLTextContainer *iface) { HTMLTextContainer *This = HTMLTEXTCONT_THIS(iface); - return IHTMLElement_AddRef(HTMLELEM(This->element)); + return IHTMLElement_AddRef(HTMLELEM(&This->element)); } static ULONG WINAPI HTMLTextContainer_Release(IHTMLTextContainer *iface) { HTMLTextContainer *This = HTMLTEXTCONT_THIS(iface); - return IHTMLElement_Release(HTMLELEM(This->element)); + return IHTMLElement_Release(HTMLELEM(&This->element)); } static HRESULT WINAPI HTMLTextContainer_GetTypeInfoCount(IHTMLTextContainer *iface, UINT *pctinfo) @@ -107,7 +107,7 @@ static HRESULT WINAPI HTMLTextContainer_get_scrollHeight(IHTMLTextContainer *ifa TRACE("(%p)->(%p)\n", This, p); - nsres = nsIDOMElement_QueryInterface(This->element->nselem, &IID_nsIDOMNSHTMLElement, (void**)&nselem); + nsres = nsIDOMElement_QueryInterface(This->element.nselem, &IID_nsIDOMNSHTMLElement, (void**)&nselem); if(NS_SUCCEEDED(nsres)) { nsIDOMNSHTMLElement_GetScrollHeight(nselem, &height); nsIDOMNSHTMLElement_Release(nselem); @@ -130,7 +130,7 @@ static HRESULT WINAPI HTMLTextContainer_get_scrollWidth(IHTMLTextContainer *ifac TRACE("(%p)->(%p)\n", This, p); - nsres = nsIDOMElement_QueryInterface(This->element->nselem, &IID_nsIDOMNSHTMLElement, (void**)&nselem); + nsres = nsIDOMElement_QueryInterface(This->element.nselem, &IID_nsIDOMNSHTMLElement, (void**)&nselem); if(NS_SUCCEEDED(nsres)) { nsIDOMNSHTMLElement_GetScrollWidth(nselem, &width); nsIDOMNSHTMLElement_Release(nselem); @@ -152,7 +152,7 @@ static HRESULT WINAPI HTMLTextContainer_put_scrollTop(IHTMLTextContainer *iface, TRACE("(%p)->(%ld)\n", This, v); - nsres = nsIDOMHTMLElement_QueryInterface(This->element->nselem, &IID_nsIDOMNSHTMLElement, + nsres = nsIDOMHTMLElement_QueryInterface(This->element.nselem, &IID_nsIDOMNSHTMLElement, (void**)&nselem); if(NS_SUCCEEDED(nsres)) { nsIDOMNSHTMLElement_SetScrollTop(nselem, v); @@ -179,7 +179,7 @@ static HRESULT WINAPI HTMLTextContainer_put_scrollLeft(IHTMLTextContainer *iface TRACE("(%p)->(%ld)\n", This, v); - nsres = nsIDOMHTMLElement_QueryInterface(This->element->nselem, &IID_nsIDOMNSHTMLElement, + nsres = nsIDOMHTMLElement_QueryInterface(This->element.nselem, &IID_nsIDOMNSHTMLElement, (void**)&nselem); if(NS_SUCCEEDED(nsres)) { nsIDOMNSHTMLElement_SetScrollLeft(nselem, v); @@ -233,8 +233,7 @@ static const IHTMLTextContainerVtbl HTMLTextContainerVtbl = { HTMLTextContainer_get_onscroll }; -void HTMLTextContainer_Init(HTMLTextContainer *This, HTMLElement *elem) +void HTMLTextContainer_Init(HTMLTextContainer *This) { This->lpHTMLTextContainerVtbl = &HTMLTextContainerVtbl; - This->element = elem; } diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index e39b2e8..408dc52 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -284,9 +284,9 @@ typedef struct { } HTMLElement; typedef struct { - const IHTMLTextContainerVtbl *lpHTMLTextContainerVtbl; + HTMLElement element; - HTMLElement *element; + const IHTMLTextContainerVtbl *lpHTMLTextContainerVtbl; } HTMLTextContainer; #define HTMLWINDOW2(x) ((IHTMLWindow2*) &(x)->lpHTMLWindow2Vtbl) @@ -423,8 +423,7 @@ HTMLElement *HTMLSelectElement_Create(nsIDOMHTMLElement*); HTMLElement *HTMLTextAreaElement_Create(nsIDOMHTMLElement*); void HTMLElement2_Init(HTMLElement*); - -void HTMLTextContainer_Init(HTMLTextContainer*,HTMLElement*); +void HTMLTextContainer_Init(HTMLTextContainer*); HRESULT HTMLDOMNode_QI(HTMLDOMNode*,REFIID,void**); HRESULT HTMLElement_QI(HTMLElement*,REFIID,void**);

1 0

Roderick Colenbrander : wined3d: Don' t create a pbo for system memory surfaces.
by Alexandre Julliard 17 Sep '07

17 Sep '07

Module: wine Branch: master Commit: f9002c26287e6aedfbe8a930d20af9f23f87ca51 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f9002c26287e6aedfbe8a930d… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Sat Sep 15 21:51:27 2007 +0200 wined3d: Don't create a pbo for system memory surfaces. --- dlls/wined3d/surface.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index d9a4e29..948b9bd 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -758,10 +758,10 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_LockRect(IWineD3DSurface *iface, WINED This->Flags &= ~SFLAG_INSYSMEM; /* This is the marker that surface data has to be downloaded */ } - /* Create a PBO for dynamicly locked surfaces but don't do it for converted or non-pow2 surfaces */ - if(GL_SUPPORT(ARB_PIXEL_BUFFER_OBJECT) && (This->Flags & SFLAG_DYNLOCK) && !(This->Flags & (SFLAG_PBO | SFLAG_CONVERTED | SFLAG_NONPOW2))) { + /* Create a PBO for dynamicly locked surfaces but don't do it for converted or non-pow2 surfaces. + * Also don't create a PBO for systemmem surfaces. */ + if(GL_SUPPORT(ARB_PIXEL_BUFFER_OBJECT) && (This->Flags & SFLAG_DYNLOCK) && !(This->Flags & (SFLAG_PBO | SFLAG_CONVERTED | SFLAG_NONPOW2)) && (This->resource.pool != WINED3DPOOL_SYSTEMMEM)) { GLenum error; - ENTER_GL(); GL_EXTCALL(glGenBuffersARB(1, &This->pbo));

1 0

Stefan Dösinger : wined3d: Do not allocate memory if there's a pbo.
by Alexandre Julliard 17 Sep '07

17 Sep '07

Module: wine Branch: master Commit: f42f228621b1216be4bf25389d21651530103168 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f42f228621b1216be4bf25389… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Fri Sep 14 17:44:09 2007 +0200 wined3d: Do not allocate memory if there's a pbo. --- dlls/wined3d/surface.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index de7beae..fd0a94b 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -36,7 +36,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d_surface); HRESULT d3dfmt_convert_surface(BYTE *src, BYTE *dst, UINT pitch, UINT width, UINT height, UINT outpitch, CONVERT_TYPES convert, IWineD3DSurfaceImpl *surf); static void surface_download_data(IWineD3DSurfaceImpl *This) { - if (!This->resource.allocatedMemory) This->resource.allocatedMemory = HeapAlloc(GetProcessHeap(), 0, This->resource.size + 4); + if (!(This->resource.allocatedMemory || This->Flags & SFLAG_PBO)) This->resource.allocatedMemory = HeapAlloc(GetProcessHeap(), 0, This->resource.size + 4); if (This->resource.format == WINED3DFMT_DXT1 || This->resource.format == WINED3DFMT_DXT2 || This->resource.format == WINED3DFMT_DXT3 || This->resource.format == WINED3DFMT_DXT4 || This->resource.format == WINED3DFMT_DXT5) {

1 0

Stefan Dösinger : wined3d: Do not invalidate the sysmem copy if a pbo exists.
by Alexandre Julliard 17 Sep '07

17 Sep '07

Module: wine Branch: master Commit: 3961491d15f64f10f583a974c2672a669c6f541a URL: http://source.winehq.org/git/wine.git/?a=commit;h=3961491d15f64f10f583a974c… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Fri Sep 14 17:46:19 2007 +0200 wined3d: Do not invalidate the sysmem copy if a pbo exists. --- dlls/wined3d/surface.c | 11 +++++------ 1 files changed, 5 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index fd0a94b..d9a4e29 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -750,12 +750,11 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_LockRect(IWineD3DSurface *iface, WINED /* Mark the surface locked */ This->Flags |= SFLAG_LOCKED; - /* Whatever surface we have, make sure that there is memory allocated for the downloaded copy */ - if(!This->resource.allocatedMemory) { - /* In case of PBOs allocatedMemory should be zero. */ - if(!(This->Flags & SFLAG_PBO)) - This->resource.allocatedMemory = HeapAlloc(GetProcessHeap() ,0 , This->resource.size + 4); - + /* Whatever surface we have, make sure that there is memory allocated for the downloaded copy, + * or a pbo to map + */ + if(!(This->resource.allocatedMemory || This->Flags & SFLAG_PBO)) { + This->resource.allocatedMemory = HeapAlloc(GetProcessHeap() ,0 , This->resource.size + 4); This->Flags &= ~SFLAG_INSYSMEM; /* This is the marker that surface data has to be downloaded */ }

1 0

Michael Stefaniuc : mshtml: Move 'inline' to the beginning of the declaration directly after the storage specifier.
by Alexandre Julliard 17 Sep '07

17 Sep '07

Module: wine Branch: master Commit: 5d96659b3a3aa48ff904452f5adbd91fa023c7d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5d96659b3a3aa48ff904452f5… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Sep 14 18:03:44 2007 +0200 mshtml: Move 'inline' to the beginning of the declaration directly after the storage specifier. --- dlls/mshtml/txtrange.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/mshtml/txtrange.c b/dlls/mshtml/txtrange.c index bbf7d24..b7c04f9 100644 --- a/dlls/mshtml/txtrange.c +++ b/dlls/mshtml/txtrange.c @@ -155,7 +155,7 @@ static BOOL is_br_node(nsIDOMNode *node) return ret; } -static void inline wstrbuf_init(wstrbuf_t *buf) +static inline void wstrbuf_init(wstrbuf_t *buf) { buf->len = 0; buf->size = 16; @@ -163,7 +163,7 @@ static void inline wstrbuf_init(wstrbuf_t *buf) *buf->buf = 0; } -static void inline wstrbuf_finish(wstrbuf_t *buf) +static inline void wstrbuf_finish(wstrbuf_t *buf) { mshtml_free(buf->buf); } @@ -180,7 +180,7 @@ static void wstrbuf_append_len(wstrbuf_t *buf, LPCWSTR str, int len) buf->buf[buf->len] = 0; } -static void inline wstrbuf_append(wstrbuf_t *buf, LPCWSTR str) +static inline void wstrbuf_append(wstrbuf_t *buf, LPCWSTR str) { wstrbuf_append_len(buf, str, strlenW(str)); } @@ -395,7 +395,7 @@ static void set_range_pos(HTMLTxtRange *This, BOOL start, dompos_t *pos) ERR("failed: %p %08x\n", pos->node, nsres); } -static void inline dompos_release(dompos_t *pos) +static inline void dompos_release(dompos_t *pos) { if(pos->node) nsIDOMNode_Release(pos->node); @@ -404,7 +404,7 @@ static void inline dompos_release(dompos_t *pos) nsAString_Finish(&pos->str); } -static void inline dompos_addref(dompos_t *pos) +static inline void dompos_addref(dompos_t *pos) { if(pos->node) nsIDOMNode_AddRef(pos->node);

1 0

Hwang YunSong(황윤성) : mshtml: Updated Korean resource.
by Alexandre Julliard 17 Sep '07

17 Sep '07

Module: wine Branch: master Commit: deaa3d646eca78f257dd78ccfb0ce6581a61b907 URL: http://source.winehq.org/git/wine.git/?a=commit;h=deaa3d646eca78f257dd78ccf… Author: Hwang YunSong(황윤성) <hys545(a)dreamwiz.com> Date: Fri Sep 14 09:32:31 2007 +0900 mshtml: Updated Korean resource. --- dlls/mshtml/Ko.rc | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/Ko.rc b/dlls/mshtml/Ko.rc index a5ec9e5..da34092 100644 --- a/dlls/mshtml/Ko.rc +++ b/dlls/mshtml/Ko.rc @@ -40,3 +40,17 @@ FONT 8, "MS Shell Dlg" DEFPUSHBUTTON "��ġ(&I)", ID_DWL_INSTALL, 200, 60, 50, 15, WS_GROUP | WS_TABSTOP PUSHBUTTON "��(&C)", IDCANCEL, 140, 60, 50, 15, WS_GROUP | WS_TABSTOP } + +IDD_HYPERLINK DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 250, 65 +STYLE DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "��۸�ũ" +FONT 8, "MS Shell Dlg" +{ + GROUPBOX "��۸�ũ ��", IDC_STATIC, 5, 5, 190, 55 + LTEXT "��(&T):", IDC_STATIC, 10, 22, 20, 10 + COMBOBOX IDC_TYPE, 35, 20, 45, 100, WS_TABSTOP | WS_GROUP | WS_VSCROLL | CBS_DROPDOWNLIST | CBS_HASSTRINGS + LTEXT "�ּ�(&U):", IDC_STATIC, 10, 42, 20, 10 + EDITTEXT IDC_URL, 35, 40, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP + PUSHBUTTON "Ȯ��", IDOK, 200, 10, 45, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP + PUSHBUTTON "��", IDCANCEL, 200, 28, 45, 14, WS_GROUP | WS_TABSTOP +}

1 0

Hwang YunSong(황윤성) : wordpad: Updated Korean resource.
by Alexandre Julliard 17 Sep '07

17 Sep '07

Module: wine Branch: master Commit: 754569f608a81d6d8fa82a977e27f615c9c72fba URL: http://source.winehq.org/git/wine.git/?a=commit;h=754569f608a81d6d8fa82a977… Author: Hwang YunSong(황윤성) <hys545(a)dreamwiz.com> Date: Fri Sep 14 09:33:09 2007 +0900 wordpad: Updated Korean resource. --- programs/wordpad/Ko.rc | 92 ++++++++++++++++++++++++------------------------ 1 files changed, 46 insertions(+), 46 deletions(-) diff --git a/programs/wordpad/Ko.rc b/programs/wordpad/Ko.rc index 571dbfb..7ec919e 100644 --- a/programs/wordpad/Ko.rc +++ b/programs/wordpad/Ko.rc @@ -28,9 +28,9 @@ BEGIN MENUITEM "��(&S)\tCtrl+S", ID_FILE_SAVE MENUITEM "�ٸ� �̸�� (&A)...", ID_FILE_SAVEAS MENUITEM SEPARATOR - MENUITEM "&Print . . .\tCtrl+P", ID_PRINT - MENUITEM "Print previe&w . . .", ID_PREVIEW - MENUITEM "Pag&e setup . . .", ID_PRINTSETUP + MENUITEM "�μ�(&P) . . .\tCtrl+P", ID_PRINT + MENUITEM "�μ� �̸��(&W) . . .", ID_PREVIEW + MENUITEM " �μ� ��(&E) . . .", ID_PRINTSETUP MENUITEM SEPARATOR MENUITEM "��(&X)", ID_FILE_EXIT END @@ -47,7 +47,7 @@ BEGIN MENUITEM SEPARATOR MENUITEM "ã��(&F). . .\tCrtl+F", ID_FIND MENUITEM "�� ã��(&N)\tF3", ID_FIND_NEXT - MENUITEM "&Replace . . .\tCtrl+H", ID_REPLACE + MENUITEM " �ٲٱ�(&R) . . .\tCtrl+H", ID_REPLACE MENUITEM SEPARATOR MENUITEM "�б� ��(&O)", ID_EDIT_READONLY MENUITEM "�� (&M)", ID_EDIT_MODIFIED @@ -67,7 +67,7 @@ BEGIN MENUITEM "��Ĺ�(&F)", ID_TOGGLE_FORMATBAR MENUITEM "��¹�(&S)", ID_TOGGLE_STATUSBAR MENUITEM SEPARATOR - MENUITEM "&Options . . .", ID_VIEWPROPERTIES + MENUITEM " �ɼ�(&O) . . .", ID_VIEWPROPERTIES END POPUP "��ֱ�(&I)" BEGIN @@ -75,19 +75,19 @@ BEGIN END POPUP "��(&O)" BEGIN + MENUITEM "�۲�(&F) . . .", ID_FONTSETTINGS MENUITEM " �� (&U)" ID_BULLET - MENUITEM "&Font . . .", ID_FONTSETTINGS - MENUITEM "&Paragraph . . ." ID_PARAFORMAT - MENUITEM "&Tabs . . ." ID_TABSTOPS + MENUITEM "�ܶ�(&P) . . ." ID_PARAFORMAT + MENUITEM "��(&T) . . ." ID_TABSTOPS POPUP "��(&B)" BEGIN MENUITEM "�ý��(&S)\tCtrl+1", ID_BACK_1 MENUITEM "��(&P)\tCtrl+2", ID_BACK_2 END END - POPUP "&Help" + POPUP "��(&H)" BEGIN - MENUITEM "&About Wine Wordpad" ID_ABOUT + MENUITEM "��е� ��(&A)" ID_ABOUT END END @@ -99,8 +99,8 @@ BEGIN MENUITEM "��(&C)", ID_EDIT_COPY MENUITEM "�ٿ��ֱ�(&P)", ID_EDIT_PASTE MENUITEM SEPARATOR - MENUITEM "&Bullet points" ID_BULLET - MENUITEM "&Paragraph . . ." ID_PARAFORMAT + MENUITEM "��(&B)" ID_BULLET + MENUITEM "�ܶ�(&P) . . ." ID_PARAFORMAT END END @@ -128,34 +128,34 @@ END IDD_PARAFORMAT DIALOG DISCARDABLE 30, 20, 200, 110 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU -Caption "Paragraph format" +Caption "�ܶ� ��" FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "Indentation", 0, 10, 10, 120, 68 - LTEXT "Left", 0, 15, 22, 40, 13 + GROUPBOX "�鿩��", 0, 10, 10, 120, 68 + LTEXT "��", 0, 15, 22, 40, 13 EDITTEXT IDC_PARA_LEFT, 55, 20, 60, 13 - LTEXT "Right", 0, 15, 40, 40, 13 + LTEXT "��", 0, 15, 40, 40, 13 EDITTEXT IDC_PARA_RIGHT, 55, 38, 60, 13 - LTEXT "First line", 0, 15, 58, 40, 13 + LTEXT "ù° ��", 0, 15, 58, 40, 13 EDITTEXT IDC_PARA_FIRST, 55, 56, 60, 13 - LTEXT "Alignment", 0, 15, 87, 40, 13 + LTEXT "��", 0, 15, 87, 40, 13 COMBOBOX IDC_PARA_ALIGN, 55, 85, 60, 13, CBS_DROPDOWNLIST - PUSHBUTTON "&OK", IDOK, 137, 15, 50, 15 - PUSHBUTTON "&Cancel", IDCANCEL, 137, 33, 50, 15 + PUSHBUTTON "Ȯ��(&O)", IDOK, 137, 15, 50, 15 + PUSHBUTTON "��(&C)", IDCANCEL, 137, 33, 50, 15 END IDD_TABSTOPS DIALOG DISCARDABLE 30, 20, 200, 110 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU -Caption "Tabs" +Caption "��" FONT 8, "MS SHell DLg" BEGIN - GROUPBOX "Tab stops", 0, 10, 10, 120, 90 + GROUPBOX "�� ", 0, 10, 10, 120, 90 COMBOBOX IDC_TABSTOPS, 20, 20, 100, 60, CBS_SIMPLE | CBS_SORT - DEFPUSHBUTTON "&Add", ID_TAB_ADD, 20, 80, 45, 15 - PUSHBUTTON "&Remove", ID_TAB_DEL, 72, 80, 45, 15 - PUSHBUTTON "&OK", IDOK, 137, 15, 50, 15 - PUSHBUTTON "&Cancel", IDCANCEL, 137, 33, 50, 15 - PUSHBUTTON "Remove al&l", ID_TAB_EMPTY, 137, 51, 50, 15 + DEFPUSHBUTTON "��ϱ�(&A)", ID_TAB_ADD, 20, 80, 45, 15 + PUSHBUTTON "��(&R)", ID_TAB_DEL, 72, 80, 45, 15 + PUSHBUTTON "Ȯ��(&O)", IDOK, 137, 15, 50, 15 + PUSHBUTTON "��(&C)", IDCANCEL, 137, 33, 50, 15 + PUSHBUTTON "�� (&L)", ID_TAB_EMPTY, 137, 51, 50, 15 END IDD_FORMATOPTS DIALOG DISCARDABLE 0, 0, 280, 110 @@ -163,13 +163,13 @@ STYLE DS_SYSMODAL Caption "" FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "Line wrapping", 0, 10, 10, 130, 85 - RADIOBUTTON "Wrap text by the &window border", IDC_PAGEFMT_WW, 18, 25, 117, 15 - RADIOBUTTON "Wrap text by the &margin", IDC_PAGEFMT_WM, 18, 45, 117, 15 - GROUPBOX "Toolbars", 0, 150, 10, 120, 85 - CHECKBOX "&Toolbar", IDC_PAGEFMT_TB, 160, 20, 80, 15 - CHECKBOX "&Formatbar", IDC_PAGEFMT_FB, 160, 38, 80, 15 - CHECKBOX "&Statusbar", IDC_PAGEFMT_SB, 160, 56, 80, 15 + GROUPBOX "�� ѱ��", 0, 10, 10, 130, 85 + RADIOBUTTON "â ��ڸ�� ѱ��(&W)", IDC_PAGEFMT_WW, 18, 25, 117, 15 + RADIOBUTTON "��ڸ�� ѱ��(&M)", IDC_PAGEFMT_WM, 18, 45, 117, 15 + GROUPBOX " ��", 0, 150, 10, 120, 85 + CHECKBOX "��(&T)", IDC_PAGEFMT_TB, 160, 20, 80, 15 + CHECKBOX "��Ĺ�(&F)", IDC_PAGEFMT_FB, 160, 38, 80, 15 + CHECKBOX "��¹�(&S)", IDC_PAGEFMT_SB, 160, 56, 80, 15 LTEXT "", IDC_PAGEFMT_ID, 0,0,0,0 END @@ -183,29 +183,29 @@ END STRINGTABLE DISCARDABLE BEGIN - STRING_ALIGN_LEFT, "Left" - STRING_ALIGN_RIGHT, "Right" - STRING_ALIGN_CENTER, "Center" + STRING_ALIGN_LEFT, "��" + STRING_ALIGN_RIGHT, "��" + STRING_ALIGN_CENTER, "��" END STRINGTABLE DISCARDABLE BEGIN - STRING_PRINTER_FILES_PRN, "Printer files (*.PRN)" + STRING_PRINTER_FILES_PRN, "�� (*.PRN)" END STRINGTABLE DISCARDABLE BEGIN - STRING_VIEWPROPS_TITLE, "Options" - STRING_VIEWPROPS_TEXT, "Text" - STRING_VIEWPROPS_RICHTEXT, "Rich text" + STRING_VIEWPROPS_TITLE, "�ɼ�" + STRING_VIEWPROPS_TEXT, "�ؽ�Ʈ" + STRING_VIEWPROPS_RICHTEXT, "��ġ �ؽ�Ʈ" END STRINGTABLE DISCARDABLE BEGIN - STRING_PREVIEW_PRINT, "Print" - STRING_PREVIEW_NEXTPAGE, "Next page" - STRING_PREVIEW_PREVPAGE, "Previous page" - STRING_PREVIEW_CLOSE, "Close" + STRING_PREVIEW_PRINT, "�μ�" + STRING_PREVIEW_NEXTPAGE, "�� " + STRING_PREVIEW_PREVPAGE, "�� " + STRING_PREVIEW_CLOSE, "�ݱ�" END STRINGTABLE DISCARDABLE @@ -222,5 +222,5 @@ BEGIN STRING_SAVE_LOSEFORMATTING, "�� ؽ�Ʈ �� ϱ⸦ ��߽��ϴ�, " \ "�̰�� Ư�� ٹ�� Դϴ�. " \ "�� ϱ⸦ ��մϱ�?" - STRING_INVALID_NUMBER, "Invalid number format" + STRING_INVALID_NUMBER, "�ùٸ�� " END

1 0

Jacek Caban : mshtml: Store HTMLElement struct instead of pointer in HTMLAnchorElement.
by Alexandre Julliard 17 Sep '07

17 Sep '07

Module: wine Branch: master Commit: f68e24a6dc8ec3eb1101a37bc025177c163efa7e URL: http://source.winehq.org/git/wine.git/?a=commit;h=f68e24a6dc8ec3eb1101a37bc… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Sep 15 16:04:57 2007 +0200 mshtml: Store HTMLElement struct instead of pointer in HTMLAnchorElement. --- dlls/mshtml/htmlanchor.c | 19 ++++++++------- dlls/mshtml/htmlelem.c | 51 +++++++++++++++++++++++------------------ dlls/mshtml/mshtml_private.h | 2 +- 3 files changed, 40 insertions(+), 32 deletions(-) diff --git a/dlls/mshtml/htmlanchor.c b/dlls/mshtml/htmlanchor.c index 1b01f42..3bd08fc 100644 --- a/dlls/mshtml/htmlanchor.c +++ b/dlls/mshtml/htmlanchor.c @@ -36,9 +36,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml); typedef struct { - const IHTMLAnchorElementVtbl *lpHTMLAnchorElementVtbl; + HTMLElement element; - HTMLElement *element; + const IHTMLAnchorElementVtbl *lpHTMLAnchorElementVtbl; } HTMLAnchorElement; #define HTMLANCHOR(x) ((IHTMLAnchorElement*) &(x)->lpHTMLAnchorElementVtbl) @@ -69,7 +69,7 @@ static HRESULT WINAPI HTMLAnchorElement_QueryInterface(IHTMLAnchorElement *iface return S_OK; } - hres = HTMLElement_QI(This->element, riid, ppv); + hres = HTMLElement_QI(&This->element, riid, ppv); if(FAILED(hres)) WARN("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppv); @@ -82,7 +82,7 @@ static ULONG WINAPI HTMLAnchorElement_AddRef(IHTMLAnchorElement *iface) TRACE("(%p)\n", This); - return IHTMLDocument2_AddRef(HTMLDOC(This->element->node.doc)); + return IHTMLDocument2_AddRef(HTMLDOC(This->element.node.doc)); } static ULONG WINAPI HTMLAnchorElement_Release(IHTMLAnchorElement *iface) @@ -91,7 +91,7 @@ static ULONG WINAPI HTMLAnchorElement_Release(IHTMLAnchorElement *iface) TRACE("(%p)\n", This); - return IHTMLDocument2_Release(HTMLDOC(This->element->node.doc)); + return IHTMLDocument2_Release(HTMLDOC(This->element.node.doc)); } static HRESULT WINAPI HTMLAnchorElement_GetTypeInfoCount(IHTMLAnchorElement *iface, UINT *pctinfo) @@ -473,13 +473,14 @@ static const IHTMLAnchorElementVtbl HTMLAnchorElementVtbl = { HTMLAnchorElement_blur }; -void HTMLAnchorElement_Create(HTMLElement *element) +HTMLElement *HTMLAnchorElement_Create(nsIDOMHTMLElement *nselem) { HTMLAnchorElement *ret = mshtml_alloc(sizeof(HTMLAnchorElement)); ret->lpHTMLAnchorElementVtbl = &HTMLAnchorElementVtbl; - ret->element = element; - element->impl = (IUnknown*)HTMLANCHOR(ret); - element->destructor = HTMLAnchorElement_destructor; + ret->element.impl = (IUnknown*)HTMLANCHOR(ret); + ret->element.destructor = HTMLAnchorElement_destructor; + + return &ret->element; } diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index a1df0d4..9b4d47d 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -1273,6 +1273,7 @@ HRESULT HTMLElement_QI(HTMLElement *This, REFIID riid, void **ppv) HTMLElement *HTMLElement_Create(nsIDOMNode *nsnode) { + nsIDOMHTMLElement *nselem; HTMLElement *ret; nsAString class_name_str; const PRUnichar *class_name; @@ -1284,39 +1285,45 @@ HTMLElement *HTMLElement_Create(nsIDOMNode *nsnode) static const WCHAR wszSELECT[] = {'S','E','L','E','C','T',0}; static const WCHAR wszTEXTAREA[] = {'T','E','X','T','A','R','E','A',0}; - ret = mshtml_alloc(sizeof(HTMLElement)); - ret->lpHTMLElementVtbl = &HTMLElementVtbl; - ret->impl = NULL; - ret->destructor = NULL; - - ret->node.node_type = NT_HTMLELEM; - ret->node.impl.elem = HTMLELEM(ret); - ret->node.destructor = HTMLElement_destructor; - - HTMLElement2_Init(ret); - - nsres = nsIDOMNode_QueryInterface(nsnode, &IID_nsIDOMHTMLElement, (void**)&ret->nselem); + nsres = nsIDOMNode_QueryInterface(nsnode, &IID_nsIDOMHTMLElement, (void**)&nselem); if(NS_FAILED(nsres)) return NULL; nsAString_Init(&class_name_str, NULL); - nsIDOMHTMLElement_GetTagName(ret->nselem, &class_name_str); + nsIDOMHTMLElement_GetTagName(nselem, &class_name_str); nsAString_GetData(&class_name_str, &class_name, NULL); if(!strcmpW(class_name, wszA)) - HTMLAnchorElement_Create(ret); - else if(!strcmpW(class_name, wszBODY)) - HTMLBodyElement_Create(ret); - else if(!strcmpW(class_name, wszINPUT)) - HTMLInputElement_Create(ret); - else if(!strcmpW(class_name, wszSELECT)) - HTMLSelectElement_Create(ret); - else if(!strcmpW(class_name, wszTEXTAREA)) - HTMLTextAreaElement_Create(ret); + ret = HTMLAnchorElement_Create(nselem); + else { + ret = mshtml_alloc(sizeof(HTMLElement)); + + ret->impl = NULL; + ret->destructor = NULL; + ret->nselem = nselem; + + if(!strcmpW(class_name, wszBODY)) + HTMLBodyElement_Create(ret); + else if(!strcmpW(class_name, wszINPUT)) + HTMLInputElement_Create(ret); + else if(!strcmpW(class_name, wszSELECT)) + HTMLSelectElement_Create(ret); + else if(!strcmpW(class_name, wszTEXTAREA)) + HTMLTextAreaElement_Create(ret); + } nsAString_Finish(&class_name_str); + ret->lpHTMLElementVtbl = &HTMLElementVtbl; + ret->nselem = nselem; + + HTMLElement2_Init(ret); + + ret->node.node_type = NT_HTMLELEM; + ret->node.impl.elem = HTMLELEM(ret); + ret->node.destructor = HTMLElement_destructor; + return ret; } diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 5ef90d6..ecfbbc9 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -416,7 +416,7 @@ void detach_selection(HTMLDocument*); void detach_ranges(HTMLDocument*); HTMLElement *HTMLElement_Create(nsIDOMNode*); -void HTMLAnchorElement_Create(HTMLElement*); +HTMLElement *HTMLAnchorElement_Create(nsIDOMHTMLElement*); void HTMLBodyElement_Create(HTMLElement*); void HTMLInputElement_Create(HTMLElement*); void HTMLSelectElement_Create(HTMLElement*);

1 0

Stefan Dösinger : wined3d: Add D3DSI_TEXLD_PROJECT and BIAS to d3d9types.h.
by Alexandre Julliard 17 Sep '07

17 Sep '07

Module: wine Branch: master Commit: 43af9aec19535cb5faf854fcd373379cb8ddf542 URL: http://source.winehq.org/git/wine.git/?a=commit;h=43af9aec19535cb5faf854fcd… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Tue Sep 11 00:35:54 2007 +0200 wined3d: Add D3DSI_TEXLD_PROJECT and BIAS to d3d9types.h. --- include/d3d9types.h | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/include/d3d9types.h b/include/d3d9types.h index e99e134..1a0ebec 100644 --- a/include/d3d9types.h +++ b/include/d3d9types.h @@ -452,6 +452,9 @@ typedef enum _D3DSHADER_INSTRUCTION_OPCODE_TYPE { #define D3DSHADER_INSTRUCTION_PREDICATED (1 << 28) +#define D3DSI_TEXLD_PROJECT 0x00010000 +#define D3DSI_TEXLD_BIAS 0x00020000 + /** for parallelism */ #define D3DSI_COISSUE 0x40000000

1 0

Stefan Dösinger : wined3d: Add a fixme for D3DCMP_NOTEQUAL and D3DCMP_EQUAL.
by Alexandre Julliard 17 Sep '07

17 Sep '07

Module: wine Branch: master Commit: 9e340f0fdb5286f1c9e5ce198083f4faf60c3a4a URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e340f0fdb5286f1c9e5ce198… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Tue Sep 11 15:33:14 2007 +0200 wined3d: Add a fixme for D3DCMP_NOTEQUAL and D3DCMP_EQUAL. --- dlls/wined3d/state.c | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 9737f2b..493be88 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -216,6 +216,16 @@ static void state_zfunc(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3D int glParm = CompareFunc(stateblock->renderState[WINED3DRS_ZFUNC]); if(glParm) { + if(glParm == GL_EQUAL || glParm == GL_NOTEQUAL) { + /* There are a few issues with this: First, our inability to + * select a proper Z depth, most of the time we're stuck with + * D24S8, even if the app selects D32 or D16. There seem to be + * some other precision problems which have to be debugged to + * make NOTEQUAL and EQUAL work properly + */ + FIXME("D3DCMP_NOTEQUAL and D3DCMP_EQUAL do not work correctly yet\n"); + } + glDepthFunc(glParm); checkGLcall("glDepthFunc"); }

1 0