July 2009 - Wine-commits - list.winehq.org

Jacek Caban : mshtml: Added support for VT_UINT name in IHTMLElementCollection::item.
by Alexandre Julliard 08 Jul '09

08 Jul '09

Module: wine Branch: master Commit: cf2e8619ef12295daa148c71085e67aa322739ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf2e8619ef12295daa148c710… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jul 7 21:01:19 2009 +0200 mshtml: Added support for VT_UINT name in IHTMLElementCollection::item. --- dlls/mshtml/htmlelemcol.c | 51 +++++++++++++++++++++++++------------------- dlls/mshtml/tests/dom.c | 18 ++++++++++++++- 2 files changed, 45 insertions(+), 24 deletions(-) diff --git a/dlls/mshtml/htmlelemcol.c b/dlls/mshtml/htmlelemcol.c index 049da58..4362890 100644 --- a/dlls/mshtml/htmlelemcol.c +++ b/dlls/mshtml/htmlelemcol.c @@ -236,39 +236,43 @@ static BOOL is_elem_name(HTMLElement *elem, LPCWSTR name) return ret; } +static HRESULT get_item_idx(HTMLElementCollection *This, UINT idx, IDispatch **ret) +{ + if(idx < This->len) { + *ret = (IDispatch*)This->elems[idx]; + IDispatch_AddRef(*ret); + } + + return S_OK; +} + static HRESULT WINAPI HTMLElementCollection_item(IHTMLElementCollection *iface, VARIANT name, VARIANT index, IDispatch **pdisp) { HTMLElementCollection *This = ELEMCOL_THIS(iface); + HRESULT hres = S_OK; - TRACE("(%p)->(v(%d) v(%d) %p)\n", This, V_VT(&name), V_VT(&index), pdisp); + TRACE("(%p)->(%s %s %p)\n", This, debugstr_variant(&name), debugstr_variant(&index), pdisp); *pdisp = NULL; - if(V_VT(&name) == VT_I4) { - TRACE("name is VT_I4: %d\n", V_I4(&name)); - + switch(V_VT(&name)) { + case VT_I4: if(V_I4(&name) < 0) return E_INVALIDARG; - if(V_I4(&name) >= This->len) - return S_OK; + hres = get_item_idx(This, V_I4(&name), pdisp); + break; - *pdisp = (IDispatch*)This->elems[V_I4(&name)]; - IDispatch_AddRef(*pdisp); - TRACE("Returning pdisp=%p\n", pdisp); - return S_OK; - } + case VT_UINT: + hres = get_item_idx(This, V_UINT(&name), pdisp); + break; - if(V_VT(&name) == VT_BSTR) { + case VT_BSTR: { DWORD i; - TRACE("name is VT_BSTR: %s\n", debugstr_w(V_BSTR(&name))); - if(V_VT(&index) == VT_I4) { LONG idx = V_I4(&index); - TRACE("index = %d\n", idx); - if(idx < 0) return E_INVALIDARG; @@ -281,8 +285,6 @@ static HRESULT WINAPI HTMLElementCollection_item(IHTMLElementCollection *iface, *pdisp = (IDispatch*)HTMLELEM(This->elems[i]); IDispatch_AddRef(*pdisp); } - - return S_OK; }else { elem_vector_t buf = {NULL, 0, 8}; @@ -304,13 +306,18 @@ static HRESULT WINAPI HTMLElementCollection_item(IHTMLElementCollection *iface, heap_free(buf.buf); } - - return S_OK; } + break; + } + + default: + FIXME("Unsupported name %s\n", debugstr_variant(&name)); + hres = E_NOTIMPL; } - FIXME("unsupported arguments\n"); - return E_INVALIDARG; + if(SUCCEEDED(hres)) + TRACE("returning %p\n", *pdisp); + return hres; } static HRESULT WINAPI HTMLElementCollection_tags(IHTMLElementCollection *iface, diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index cb25926..a153a14 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -1025,7 +1025,7 @@ static void _test_elem_collection(unsigned line, IUnknown *unk, LONG len; DWORD i; VARIANT name, index; - IDispatch *disp; + IDispatch *disp, *disp2; HRESULT hres; hres = IUnknown_QueryInterface(unk, &IID_IHTMLElementCollection, (void**)&col); @@ -1041,9 +1041,9 @@ static void _test_elem_collection(unsigned line, IUnknown *unk, len = exlen; V_VT(&index) = VT_EMPTY; - V_VT(&name) = VT_I4; for(i=0; i<len; i++) { + V_VT(&name) = VT_I4; V_I4(&name) = i; disp = (void*)0xdeadbeef; hres = IHTMLElementCollection_item(col, name, index, &disp); @@ -1053,15 +1053,29 @@ static void _test_elem_collection(unsigned line, IUnknown *unk, continue; _test_elem_type(line, (IUnknown*)disp, elem_types[i]); + + if(!i) { + V_VT(&name) = VT_UINT; + V_I4(&name) = 0; + disp2 = (void*)0xdeadbeef; + hres = IHTMLElementCollection_item(col, name, index, &disp2); + ok_(__FILE__,line) (hres == S_OK, "item(%d) failed: %08x\n", i, hres); + ok_(__FILE__,line) (iface_cmp((IUnknown*)disp, (IUnknown*)disp2), "disp != disp2\n"); + if(disp2) + IDispatch_Release(disp2); + } + IDispatch_Release(disp); } + V_VT(&name) = VT_I4; V_I4(&name) = len; disp = (void*)0xdeadbeef; hres = IHTMLElementCollection_item(col, name, index, &disp); ok_(__FILE__,line) (hres == S_OK, "item failed: %08x\n", hres); ok_(__FILE__,line) (disp == NULL, "disp != NULL\n"); + V_VT(&name) = VT_I4; V_I4(&name) = -1; disp = (void*)0xdeadbeef; hres = IHTMLElementCollection_item(col, name, index, &disp);

1 0

Jacek Caban : wininet: Rename WININETHANDLEHEADER to object_header_t.
by Alexandre Julliard 08 Jul '09

08 Jul '09

Module: wine Branch: master Commit: 44d633a9026621cc00b19c0db76016d7e634e511 URL: http://source.winehq.org/git/wine.git/?a=commit;h=44d633a9026621cc00b19c0db… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jul 7 21:46:09 2009 +0200 wininet: Rename WININETHANDLEHEADER to object_header_t. wininet struct names are very unreadable and I hope that patches renaming them will be accepted. --- dlls/wininet/ftp.c | 44 +++++++++++++++++++------------------- dlls/wininet/http.c | 28 ++++++++++++------------ dlls/wininet/internet.c | 54 +++++++++++++++++++++++----------------------- dlls/wininet/internet.h | 50 +++++++++++++++++++++--------------------- dlls/wininet/utility.c | 4 +- 5 files changed, 90 insertions(+), 90 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=44d633a9026621cc00b19…

1 0

Peter Oberndorfer : winemenubuilder: Use heap_printf to allocate the right amount of memory and not cause heap corruption .
by Alexandre Julliard 08 Jul '09

08 Jul '09

Module: wine Branch: master Commit: 08a8f935c4f8ff69dfa6df070caf45d68d2a3e3e URL: http://source.winehq.org/git/wine.git/?a=commit;h=08a8f935c4f8ff69dfa6df070… Author: Peter Oberndorfer <kumbayo84(a)arcor.de> Date: Tue Jul 7 22:01:59 2009 +0200 winemenubuilder: Use heap_printf to allocate the right amount of memory and not cause heap corruption. --- programs/winemenubuilder/winemenubuilder.c | 9 +++------ 1 files changed, 3 insertions(+), 6 deletions(-) diff --git a/programs/winemenubuilder/winemenubuilder.c b/programs/winemenubuilder/winemenubuilder.c index d9d7852..1eaa530 100644 --- a/programs/winemenubuilder/winemenubuilder.c +++ b/programs/winemenubuilder/winemenubuilder.c @@ -786,18 +786,15 @@ static char *extract_icon( LPCWSTR path, int index, const char *destFilename, BO /* Try to treat the source file as an exe */ if (destFilename) - xpm_path=HeapAlloc(GetProcessHeap(),0,strlen(iconsdir)+1+strlen(destFilename)+1+3); + xpm_path=heap_printf("%s/%s.png",iconsdir,destFilename); else - xpm_path=HeapAlloc(GetProcessHeap(), 0, strlen(iconsdir)+1+4+1+strlen(ico_name)+1+12+1+3); + xpm_path=heap_printf("%s/%04x_%s.%d.png",iconsdir,crc,ico_name,index); if (xpm_path == NULL) { WINE_ERR("could not extract icon %s, out of memory\n", wine_dbgstr_a(ico_name)); return NULL; } - if (destFilename) - sprintf(xpm_path,"%s/%s.png",iconsdir,destFilename); - else - sprintf(xpm_path,"%s/%04x_%s.%d.png",iconsdir,crc,ico_name,index); + if (ExtractFromEXEDLL( path, index, xpm_path )) goto end;

1 0

Paul Vriens : ws2_32/tests: Fix a test failure on NT4.
by Alexandre Julliard 08 Jul '09

08 Jul '09

Module: wine Branch: master Commit: b7e147331124bd8d9cfd01a18cbb7a533336a601 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b7e147331124bd8d9cfd01a18… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Tue Jul 7 17:08:04 2009 +0200 ws2_32/tests: Fix a test failure on NT4. --- dlls/ws2_32/tests/sock.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index b667008..c90111d 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -2620,8 +2620,10 @@ static void test_AcceptEx(void) bret = pAcceptEx(listener, acceptor, NULL, sizeof(buffer) - 2*(sizeof(struct sockaddr_in) + 16), sizeof(struct sockaddr_in) + 16, sizeof(struct sockaddr_in) + 16, &bytesReturned, &overlapped); - ok(bret == FALSE && WSAGetLastError() == WSAEINVAL, "AcceptEx on NULL buffer " - "returned %d + errno %d\n", bret, WSAGetLastError()); + ok(bret == FALSE && + (WSAGetLastError() == WSAEINVAL || + broken(WSAGetLastError() == WSAEFAULT)), /* NT4 */ + "AcceptEx on NULL buffer returned %d + errno %d\n", bret, WSAGetLastError()); bret = pAcceptEx(listener, acceptor, buffer, sizeof(buffer) - 2*(sizeof(struct sockaddr_in) + 16), sizeof(struct sockaddr_in) + 16, sizeof(struct sockaddr_in) + 16,

1 0

Frédéric Delanoy : crypt32: Update French translation.
by Alexandre Julliard 08 Jul '09

08 Jul '09

Module: wine Branch: master Commit: db4e9128782b033e18128fbc2ce639ae2caf25e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=db4e9128782b033e18128fbc2… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Jul 7 15:54:30 2009 +0200 crypt32: Update French translation. --- dlls/crypt32/crypt32_Fr.rc | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/crypt32_Fr.rc b/dlls/crypt32/crypt32_Fr.rc index 030a3a9..b98636d 100644 --- a/dlls/crypt32/crypt32_Fr.rc +++ b/dlls/crypt32/crypt32_Fr.rc @@ -177,6 +177,7 @@ STRINGTABLE DISCARDABLE IDS_LOCALIZEDNAME_CA "Autorités intermédiaires" IDS_LOCALIZEDNAME_ADDRESSBOOK "Autres personnes" IDS_LOCALIZEDNAME_TRUSTEDPUBLISHER "Éditeurs de confiance" + IDS_LOCALIZEDNAME_DISALLOWED "Certificats non autorisés" } STRINGTABLE DISCARDABLE

1 0

Ricardo Filipe : oledlg: Fix Portuguese translation.
by Alexandre Julliard 08 Jul '09

08 Jul '09

Module: wine Branch: master Commit: 04de5762665147b0a66c114f66f7e38aca0e55e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=04de5762665147b0a66c114f6… Author: Ricardo Filipe <ricardojdfilipe(a)gmail.com> Date: Tue Jul 7 07:28:05 2009 -0700 oledlg: Fix Portuguese translation. --- dlls/oledlg/oledlg_Pt.rc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/oledlg/oledlg_Pt.rc b/dlls/oledlg/oledlg_Pt.rc index 078d2c1..9ef209e 100644 --- a/dlls/oledlg/oledlg_Pt.rc +++ b/dlls/oledlg/oledlg_Pt.rc @@ -126,7 +126,7 @@ BEGIN CONTROL "", IDC_PS_RESULTIMAGE, "Static", SS_ICON | WS_VISIBLE, 8, 101, 42, 34 CONTROL "<< texto resultante fica aqui >>", IDC_PS_RESULTTEXT, "Static", SS_NOPREFIX | WS_VISIBLE, 54, 100, 159, 35 CONTROL "Resultado", -1, "Button", BS_GROUPBOX | WS_GROUP | WS_VISIBLE, 6, 90, 212, 48 - CONTROL "", IDC_PS_SOURCETEXT, "Editar", ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE, 37, 9, 180, 8 + CONTROL "", IDC_PS_SOURCETEXT, "Edit", ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE, 37, 9, 180, 8 END STRINGTABLE DISCARDABLE

1 0

Ricardo Filipe : progman: Update Portuguese translation and convert to UTF8 .
by Alexandre Julliard 08 Jul '09

08 Jul '09

Module: wine Branch: master Commit: 9ed4f647ee831c09fd4408b1212633da860ee663 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ed4f647ee831c09fd4408b12… Author: Ricardo Filipe <ricardojdfilipe(a)gmail.com> Date: Tue Jul 7 07:36:54 2009 -0700 progman: Update Portuguese translation and convert to UTF8. --- programs/progman/Pt.rc | 106 ++++++++++++++++++++++++++++++------------------ 1 files changed, 66 insertions(+), 40 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9ed4f647ee831c09fd440…

1 0

Ricardo Filipe : regedit: Update Portuguese translation and convert to UTF8 .
by Alexandre Julliard 08 Jul '09

08 Jul '09

Module: wine Branch: master Commit: 3591c44e5504220cc8c457e4737931e9c6b74f82 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3591c44e5504220cc8c457e47… Author: Ricardo Filipe <ricardojdfilipe(a)gmail.com> Date: Tue Jul 7 09:02:11 2009 -0700 regedit: Update Portuguese translation and convert to UTF8. --- programs/regedit/Pt.rc | 196 ++++++++++++++++++++++++++++++++++------------- 1 files changed, 142 insertions(+), 54 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3591c44e5504220cc8c45…

1 0

Hib Eris : oleaut32: Prevent overflow in VarDecCmp.
by Alexandre Julliard 07 Jul '09

07 Jul '09

Module: wine Branch: master Commit: 3e5159e169492bdaf95301794eeebd7af7e865a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3e5159e169492bdaf95301794… Author: Hib Eris <hib(a)hiberis.nl> Date: Tue Jul 7 14:01:57 2009 +0200 oleaut32: Prevent overflow in VarDecCmp. --- dlls/oleaut32/tests/vartype.c | 24 ++++++++++++------------ dlls/oleaut32/vartype.c | 10 ++++++++++ 2 files changed, 22 insertions(+), 12 deletions(-) diff --git a/dlls/oleaut32/tests/vartype.c b/dlls/oleaut32/tests/vartype.c index c3ec180..419e027 100644 --- a/dlls/oleaut32/tests/vartype.c +++ b/dlls/oleaut32/tests/vartype.c @@ -4420,11 +4420,11 @@ static void test_VarDecCmp(void) SETDEC(l,0,0,0,1); SETDEC(out,0,DECIMAL_NEG,0,1); MATH1(VarDecCmp); EXPECT_GT; SETDEC(l,0,0,0,1); SETDEC(out,0,DECIMAL_NEG,0,0); MATH1(VarDecCmp); EXPECT_GT; - SETDEC(l,0,0,0,1); SETDEC(out,0,DECIMAL_NEG,-1,-1); MATH1(VarDecCmp); todo_wine EXPECT_GT; + SETDEC(l,0,0,0,1); SETDEC(out,0,DECIMAL_NEG,-1,-1); MATH1(VarDecCmp); EXPECT_GT; SETDEC(l,0,DECIMAL_NEG,0,1); SETDEC(out,0,0,0,1); MATH1(VarDecCmp); EXPECT_LT; SETDEC(l,0,DECIMAL_NEG,0,1); SETDEC(out,0,0,0,0); MATH1(VarDecCmp); EXPECT_LT; - SETDEC(l,0,DECIMAL_NEG,0,1); SETDEC(out,0,0,-1,-1); MATH1(VarDecCmp); todo_wine EXPECT_LT; + SETDEC(l,0,DECIMAL_NEG,0,1); SETDEC(out,0,0,-1,-1); MATH1(VarDecCmp); EXPECT_LT; SETDEC(l,0,DECIMAL_NEG,0,1); SETDEC(out,0,DECIMAL_NEG,0,1); MATH1(VarDecCmp); EXPECT_EQ; SETDEC(l,0,DECIMAL_NEG,0,1); SETDEC(out,0,DECIMAL_NEG,0,0); MATH1(VarDecCmp); EXPECT_LT; @@ -4450,13 +4450,13 @@ static void test_VarDecCmp(void) SETDEC(l,0,0,-1,-1); SETDEC(out,0,0,0,0); MATH1(VarDecCmp); EXPECT_GT; SETDEC(l,0,0,-1,-1); SETDEC(out,0,0,-1,-1); MATH1(VarDecCmp); EXPECT_EQ; - SETDEC(l,0,0,-1,-1); SETDEC(out,0,DECIMAL_NEG,0,1); MATH1(VarDecCmp); todo_wine EXPECT_GT; + SETDEC(l,0,0,-1,-1); SETDEC(out,0,DECIMAL_NEG,0,1); MATH1(VarDecCmp); EXPECT_GT; SETDEC(l,0,0,-1,-1); SETDEC(out,0,DECIMAL_NEG,0,0); MATH1(VarDecCmp); EXPECT_GT; - SETDEC(l,0,0,-1,-1); SETDEC(out,0,DECIMAL_NEG,-1,-1); MATH1(VarDecCmp); todo_wine EXPECT_GT; + SETDEC(l,0,0,-1,-1); SETDEC(out,0,DECIMAL_NEG,-1,-1); MATH1(VarDecCmp); EXPECT_GT; - SETDEC(l,0,DECIMAL_NEG,-1,-1); SETDEC(out,0,0,0,1); MATH1(VarDecCmp); todo_wine EXPECT_LT; + SETDEC(l,0,DECIMAL_NEG,-1,-1); SETDEC(out,0,0,0,1); MATH1(VarDecCmp); EXPECT_LT; SETDEC(l,0,DECIMAL_NEG,-1,-1); SETDEC(out,0,0,0,0); MATH1(VarDecCmp); EXPECT_LT; - SETDEC(l,0,DECIMAL_NEG,-1,-1); SETDEC(out,0,0,-1,-1); MATH1(VarDecCmp); todo_wine EXPECT_LT; + SETDEC(l,0,DECIMAL_NEG,-1,-1); SETDEC(out,0,0,-1,-1); MATH1(VarDecCmp); EXPECT_LT; SETDEC(l,0,DECIMAL_NEG,-1,-1); SETDEC(out,0,DECIMAL_NEG,0,1); MATH1(VarDecCmp); EXPECT_LT; SETDEC(l,0,DECIMAL_NEG,-1,-1); SETDEC(out,0,DECIMAL_NEG,0,0); MATH1(VarDecCmp); EXPECT_LT; @@ -4469,11 +4469,11 @@ static void test_VarDecCmp(void) SETDEC(out,0,0,0,1); SETDEC(l,0,DECIMAL_NEG,0,1); MATH1(VarDecCmp); EXPECT_LT; SETDEC(out,0,0,0,1); SETDEC(l,0,DECIMAL_NEG,0,0); MATH1(VarDecCmp); EXPECT_LT; - SETDEC(out,0,0,0,1); SETDEC(l,0,DECIMAL_NEG,-1,-1); MATH1(VarDecCmp); todo_wine EXPECT_LT; + SETDEC(out,0,0,0,1); SETDEC(l,0,DECIMAL_NEG,-1,-1); MATH1(VarDecCmp); EXPECT_LT; SETDEC(out,0,DECIMAL_NEG,0,1); SETDEC(l,0,0,0,1); MATH1(VarDecCmp); EXPECT_GT; SETDEC(out,0,DECIMAL_NEG,0,1); SETDEC(l,0,0,0,0); MATH1(VarDecCmp); EXPECT_GT; - SETDEC(out,0,DECIMAL_NEG,0,1); SETDEC(l,0,0,-1,-1); MATH1(VarDecCmp); todo_wine EXPECT_GT; + SETDEC(out,0,DECIMAL_NEG,0,1); SETDEC(l,0,0,-1,-1); MATH1(VarDecCmp); EXPECT_GT; SETDEC(out,0,DECIMAL_NEG,0,1); SETDEC(l,0,DECIMAL_NEG,0,1); MATH1(VarDecCmp); EXPECT_EQ; SETDEC(out,0,DECIMAL_NEG,0,1); SETDEC(l,0,DECIMAL_NEG,0,0); MATH1(VarDecCmp); EXPECT_GT; @@ -4499,13 +4499,13 @@ static void test_VarDecCmp(void) SETDEC(out,0,0,-1,-1); SETDEC(l,0,0,0,0); MATH1(VarDecCmp); EXPECT_LT; SETDEC(out,0,0,-1,-1); SETDEC(l,0,0,-1,-1); MATH1(VarDecCmp); EXPECT_EQ; - SETDEC(out,0,0,-1,-1); SETDEC(l,0,DECIMAL_NEG,0,1); MATH1(VarDecCmp); todo_wine EXPECT_LT; + SETDEC(out,0,0,-1,-1); SETDEC(l,0,DECIMAL_NEG,0,1); MATH1(VarDecCmp); EXPECT_LT; SETDEC(out,0,0,-1,-1); SETDEC(l,0,DECIMAL_NEG,0,0); MATH1(VarDecCmp); EXPECT_LT; - SETDEC(out,0,0,-1,-1); SETDEC(l,0,DECIMAL_NEG,-1,-1); MATH1(VarDecCmp); todo_wine EXPECT_LT; + SETDEC(out,0,0,-1,-1); SETDEC(l,0,DECIMAL_NEG,-1,-1); MATH1(VarDecCmp); EXPECT_LT; - SETDEC(out,0,DECIMAL_NEG,-1,-1); SETDEC(l,0,0,0,1); MATH1(VarDecCmp); todo_wine EXPECT_GT; + SETDEC(out,0,DECIMAL_NEG,-1,-1); SETDEC(l,0,0,0,1); MATH1(VarDecCmp); EXPECT_GT; SETDEC(out,0,DECIMAL_NEG,-1,-1); SETDEC(l,0,0,0,0); MATH1(VarDecCmp); EXPECT_GT; - SETDEC(out,0,DECIMAL_NEG,-1,-1); SETDEC(l,0,0,-1,-1); MATH1(VarDecCmp); todo_wine EXPECT_GT; + SETDEC(out,0,DECIMAL_NEG,-1,-1); SETDEC(l,0,0,-1,-1); MATH1(VarDecCmp); EXPECT_GT; SETDEC(out,0,DECIMAL_NEG,-1,-1); SETDEC(l,0,DECIMAL_NEG,0,1); MATH1(VarDecCmp); EXPECT_GT; SETDEC(out,0,DECIMAL_NEG,-1,-1); SETDEC(l,0,DECIMAL_NEG,0,0); MATH1(VarDecCmp); EXPECT_GT; diff --git a/dlls/oleaut32/vartype.c b/dlls/oleaut32/vartype.c index 2d5ae7d..7f53259 100644 --- a/dlls/oleaut32/vartype.c +++ b/dlls/oleaut32/vartype.c @@ -5788,6 +5788,16 @@ HRESULT WINAPI VarDecCmp(const DECIMAL* pDecLeft, const DECIMAL* pDecRight) HRESULT hRet; DECIMAL result; + if (!pDecLeft || !pDecRight) + return VARCMP_NULL; + + if ((!(DEC_SIGN(pDecLeft) & DECIMAL_NEG)) && (DEC_SIGN(pDecRight) & DECIMAL_NEG) && + (DEC_HI32(pDecLeft) | DEC_MID32(pDecLeft) | DEC_LO32(pDecLeft))) + return VARCMP_GT; + else if ((DEC_SIGN(pDecLeft) & DECIMAL_NEG) && (!(DEC_SIGN(pDecRight) & DECIMAL_NEG)) && + (DEC_HI32(pDecLeft) | DEC_MID32(pDecLeft) | DEC_LO32(pDecLeft))) + return VARCMP_LT; + /* Subtract right from left, and compare the result to 0 */ hRet = VarDecSub(pDecLeft, pDecRight, &result);

1 0

Huw Davies : hhctrl.ocx: Add English neutral translations.
by Alexandre Julliard 07 Jul '09

07 Jul '09

Module: wine Branch: master Commit: 0cb9a6ec01efba753d5b49fa42a105d742313b45 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0cb9a6ec01efba753d5b49fa4… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Jul 7 12:23:34 2009 +0100 hhctrl.ocx: Add English neutral translations. --- dlls/hhctrl.ocx/En.rc | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/dlls/hhctrl.ocx/En.rc b/dlls/hhctrl.ocx/En.rc index 95ccd51..b69383e 100644 --- a/dlls/hhctrl.ocx/En.rc +++ b/dlls/hhctrl.ocx/En.rc @@ -58,3 +58,13 @@ BEGIN IDTB_TOC_NEXT "IDTB_TOC_NEXT" IDTB_TOC_PREV "IDTB_TOC_PREV" END + +LANGUAGE LANG_ENGLISH, SUBLANG_NEUTRAL + +STRINGTABLE +BEGIN + IDS_CONTENTS "&Contents" + IDS_INDEX "I&ndex" + IDS_SEARCH "&Search" + IDS_FAVORITES "Favour&ites" +END

1 0