August 2014 - Wine-Commits - list.winehq.org

André Hentschel : wpcap: Implement pcap_datalink_name_to_val.
by Alexandre Julliard Aug. 19, 2014

Aug. 19, 2014

Module: wine Branch: master Commit: ea18520e6c1ecd06336ab1e59c3e78a965790451 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea18520e6c1ecd06336ab1e59… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Aug 18 23:55:47 2014 +0200 wpcap: Implement pcap_datalink_name_to_val. --- dlls/wpcap/wpcap.c | 6 ++++++ dlls/wpcap/wpcap.spec | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/wpcap/wpcap.c b/dlls/wpcap/wpcap.c index be58102..19f79e3 100644 --- a/dlls/wpcap/wpcap.c +++ b/dlls/wpcap/wpcap.c @@ -51,6 +51,12 @@ int CDECL wine_pcap_datalink(pcap_t *p) return pcap_datalink(p); } +int CDECL wine_pcap_datalink_name_to_val(const char *name) +{ + TRACE("(%s)\n", debugstr_a(name)); + return pcap_datalink_name_to_val(name); +} + const char* CDECL wine_pcap_datalink_val_to_name(int dlt) { TRACE("(%i)\n", dlt); diff --git a/dlls/wpcap/wpcap.spec b/dlls/wpcap/wpcap.spec index 835550a..de90658 100644 --- a/dlls/wpcap/wpcap.spec +++ b/dlls/wpcap/wpcap.spec @@ -12,7 +12,7 @@ @ stub pcap_compile_nopcap @ stub pcap_createsrcstr @ cdecl pcap_datalink(ptr) wine_pcap_datalink -@ stub pcap_datalink_name_to_val +@ cdecl pcap_datalink_name_to_val(str) wine_pcap_datalink_name_to_val @ stub pcap_datalink_val_to_description @ cdecl pcap_datalink_val_to_name(long) wine_pcap_datalink_val_to_name @ cdecl pcap_dispatch(ptr long ptr ptr) wine_pcap_dispatch

1 0

André Hentschel : wpcap: Implement pcap_close.
by Alexandre Julliard Aug. 19, 2014

Aug. 19, 2014

Module: wine Branch: master Commit: 235bbd0f306228569b0145c1252e964d224b86ca URL: http://source.winehq.org/git/wine.git/?a=commit;h=235bbd0f306228569b0145c12… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Aug 18 23:55:15 2014 +0200 wpcap: Implement pcap_close. --- dlls/wpcap/wpcap.c | 6 ++++++ dlls/wpcap/wpcap.spec | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/wpcap/wpcap.c b/dlls/wpcap/wpcap.c index 333079e..be58102 100644 --- a/dlls/wpcap/wpcap.c +++ b/dlls/wpcap/wpcap.c @@ -32,6 +32,12 @@ void CDECL wine_pcap_breakloop(pcap_t *p) return pcap_breakloop(p); } +void CDECL wine_pcap_close(pcap_t *p) +{ + TRACE("(%p)\n", p); + pcap_close(p); +} + int CDECL wine_pcap_compile(pcap_t *p, struct bpf_program *program, const char *buf, int optimize, unsigned int mask) { diff --git a/dlls/wpcap/wpcap.spec b/dlls/wpcap/wpcap.spec index 04f309f..835550a 100644 --- a/dlls/wpcap/wpcap.spec +++ b/dlls/wpcap/wpcap.spec @@ -7,7 +7,7 @@ @ stub getservent @ stub install_bpf_program @ cdecl pcap_breakloop(ptr) wine_pcap_breakloop -@ stub pcap_close +@ cdecl pcap_close(ptr) wine_pcap_close @ cdecl pcap_compile(ptr ptr str long long) wine_pcap_compile @ stub pcap_compile_nopcap @ stub pcap_createsrcstr

1 0

André Hentschel : wpcap: Implement pcap_get_airpcap_handle.
by Alexandre Julliard Aug. 19, 2014

Aug. 19, 2014

Module: wine Branch: master Commit: 2b9cade4b857efe97f8a6e1c2e428ebd0eb6e085 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b9cade4b857efe97f8a6e1c2… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Aug 18 23:57:52 2014 +0200 wpcap: Implement pcap_get_airpcap_handle. --- dlls/wpcap/wpcap.c | 7 +++++++ dlls/wpcap/wpcap.spec | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/wpcap/wpcap.c b/dlls/wpcap/wpcap.c index b4ece2b..fb36326 100644 --- a/dlls/wpcap/wpcap.c +++ b/dlls/wpcap/wpcap.c @@ -127,6 +127,13 @@ void CDECL wine_pcap_freecode(struct bpf_program *fp) return pcap_freecode(fp); } +typedef struct _AirpcapHandle *PAirpcapHandle; +PAirpcapHandle CDECL wine_pcap_get_airpcap_handle(pcap_t *p) +{ + TRACE("(%p)\n", p); + return NULL; +} + char* CDECL wine_pcap_geterr(pcap_t *p) { TRACE("(%p)\n", p); diff --git a/dlls/wpcap/wpcap.spec b/dlls/wpcap/wpcap.spec index 9694949..718d0fe 100644 --- a/dlls/wpcap/wpcap.spec +++ b/dlls/wpcap/wpcap.spec @@ -28,7 +28,7 @@ @ stub pcap_findalldevs_ex @ cdecl pcap_freealldevs(ptr) wine_pcap_freealldevs @ cdecl pcap_freecode(ptr) wine_pcap_freecode -@ stub pcap_get_airpcap_handle +@ cdecl pcap_get_airpcap_handle(ptr) wine_pcap_get_airpcap_handle @ cdecl pcap_geterr(ptr) wine_pcap_geterr @ stub pcap_getevent @ stub pcap_getnonblock

1 0

André Hentschel : wpcap: Implement pcap_list_datalinks.
by Alexandre Julliard Aug. 19, 2014

Aug. 19, 2014

Module: wine Branch: master Commit: d6c4ed0878d497756d75c9b8c4151ade7039f1b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d6c4ed0878d497756d75c9b8c… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Aug 18 23:56:15 2014 +0200 wpcap: Implement pcap_list_datalinks. --- dlls/wpcap/wpcap.c | 6 ++++++ dlls/wpcap/wpcap.spec | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/wpcap/wpcap.c b/dlls/wpcap/wpcap.c index 19f79e3..5e94c08 100644 --- a/dlls/wpcap/wpcap.c +++ b/dlls/wpcap/wpcap.c @@ -134,6 +134,12 @@ const char* CDECL wine_pcap_lib_version(void) return ret; } +int CDECL wine_pcap_list_datalinks(pcap_t *p, int **dlt_buffer) +{ + TRACE("(%p %p)\n", p, dlt_buffer); + return pcap_list_datalinks(p, dlt_buffer); +} + char* CDECL wine_pcap_lookupdev(char *errbuf) { TRACE("(%p)\n", errbuf); diff --git a/dlls/wpcap/wpcap.spec b/dlls/wpcap/wpcap.spec index de90658..2fc8b4d 100644 --- a/dlls/wpcap/wpcap.spec +++ b/dlls/wpcap/wpcap.spec @@ -34,7 +34,7 @@ @ stub pcap_getnonblock @ stub pcap_is_swapped @ cdecl pcap_lib_version() wine_pcap_lib_version -@ stub pcap_list_datalinks +@ cdecl pcap_list_datalinks(ptr ptr) wine_pcap_list_datalinks @ stub pcap_live_dump @ stub pcap_live_dump_ended @ cdecl pcap_lookupdev(ptr) wine_pcap_lookupdev

1 0

Stefan Dösinger : ddraw: Clear application-passed lpSurface pointers.
by Alexandre Julliard Aug. 19, 2014

Aug. 19, 2014

Module: wine Branch: master Commit: 61ee3323ad5eb9b01dc5415374d12d990b5ba500 URL: http://source.winehq.org/git/wine.git/?a=commit;h=61ee3323ad5eb9b01dc541537… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Aug 19 14:20:28 2014 +0200 ddraw: Clear application-passed lpSurface pointers. --- dlls/ddraw/surface.c | 1 + dlls/ddraw/tests/ddraw1.c | 1 + dlls/ddraw/tests/ddraw2.c | 1 + dlls/ddraw/tests/ddraw4.c | 1 + dlls/ddraw/tests/ddraw7.c | 1 + 5 files changed, 5 insertions(+) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index fd2c1a4..afd98a1 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -6224,6 +6224,7 @@ HRESULT ddraw_surface_init(struct ddraw_surface *surface, struct ddraw *ddraw, s desc->u1.lPitch = wined3d_surface_get_pitch(wined3d_surface); } } + desc->lpSurface = NULL; wined3d_surface_incref(wined3d_surface); surface->wined3d_surface = wined3d_surface; diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index ad60606..ccb65ac 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -4576,6 +4576,7 @@ static void test_create_surface_pitch(void) ok(U1(surface_desc).lPitch == test_data[i].pitch_out32, "Test %u: Got unexpected pitch %u, expected %u.\n", i, U1(surface_desc).lPitch, test_data[i].pitch_out32); + ok(!surface_desc.lpSurface, "Test %u: Got unexpected lpSurface %p.\n", i, surface_desc.lpSurface); IDirectDrawSurface_Release(surface); } diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index 7e0e925..d8be62f 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -5652,6 +5652,7 @@ static void test_create_surface_pitch(void) ok(U1(surface_desc).lPitch == test_data[i].pitch_out32, "Test %u: Got unexpected pitch %u, expected %u.\n", i, U1(surface_desc).lPitch, test_data[i].pitch_out32); + ok(!surface_desc.lpSurface, "Test %u: Got unexpected lpSurface %p.\n", i, surface_desc.lpSurface); IDirectDrawSurface_Release(surface); } diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index b96330c..9bcebc5 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -6649,6 +6649,7 @@ static void test_create_surface_pitch(void) ok(U1(surface_desc).lPitch == test_data[i].pitch_out32, "Test %u: Got unexpected pitch %u, expected %u.\n", i, U1(surface_desc).lPitch, test_data[i].pitch_out32); + ok(!surface_desc.lpSurface, "Test %u: Got unexpected lpSurface %p.\n", i, surface_desc.lpSurface); IDirectDrawSurface4_Release(surface); } diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 3e29164..4625b0f 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -6472,6 +6472,7 @@ static void test_create_surface_pitch(void) ok(U1(surface_desc).lPitch == test_data[i].pitch_out32, "Test %u: Got unexpected pitch %u, expected %u.\n", i, U1(surface_desc).lPitch, test_data[i].pitch_out32); + ok(!surface_desc.lpSurface, "Test %u: Got unexpected lpSurface %p.\n", i, surface_desc.lpSurface); IDirectDrawSurface7_Release(surface); }

1 0

Zhenbo Li : mshtml: Added IHTMLStyle:: backgroundAttachment property implementation.
by Alexandre Julliard Aug. 19, 2014

Aug. 19, 2014

Module: wine Branch: master Commit: 87e1172953e4ffcf24f59bbd0a6d6521c6cf15f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=87e1172953e4ffcf24f59bbd0… Author: Zhenbo Li <litimetal(a)gmail.com> Date: Mon Aug 18 23:31:01 2014 +0800 mshtml: Added IHTMLStyle::backgroundAttachment property implementation. --- dlls/mshtml/htmlstyle.c | 15 +++++++++++---- dlls/mshtml/htmlstyle.h | 1 + dlls/mshtml/tests/style.c | 10 ++++++++++ 3 files changed, 22 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index 420c687..9c9c96e 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -37,6 +37,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml); static const WCHAR attrBackground[] = {'b','a','c','k','g','r','o','u','n','d',0}; +static const WCHAR attrBackgroundAttachment[] = + {'b','a','c','k','g','r','o','u','n','d','-','a','t','t','a','c','h','m','e','n','t',0}; static const WCHAR attrBackgroundColor[] = {'b','a','c','k','g','r','o','u','n','d','-','c','o','l','o','r',0}; static const WCHAR attrBackgroundImage[] = @@ -205,6 +207,7 @@ typedef struct { static const style_tbl_entry_t style_tbl[] = { {attrBackground, DISPID_IHTMLSTYLE_BACKGROUND}, + {attrBackgroundAttachment, DISPID_IHTMLSTYLE_BACKGROUNDATTACHMENT}, {attrBackgroundColor, DISPID_IHTMLSTYLE_BACKGROUNDCOLOR}, {attrBackgroundImage, DISPID_IHTMLSTYLE_BACKGROUNDIMAGE}, {attrBackgroundPosition, DISPID_IHTMLSTYLE_BACKGROUNDPOSITION}, @@ -1077,15 +1080,19 @@ static HRESULT WINAPI HTMLStyle_get_backgroundRepeat(IHTMLStyle *iface, BSTR *p) static HRESULT WINAPI HTMLStyle_put_backgroundAttachment(IHTMLStyle *iface, BSTR v) { HTMLStyle *This = impl_from_IHTMLStyle(iface); - FIXME("(%p)->(%s)\n", This, debugstr_w(v)); - return E_NOTIMPL; + + TRACE("(%p)->(%s)\n", This, debugstr_w(v)); + + return set_style_attr(This, STYLEID_BACKGROUND_ATTACHMENT, v, 0); } static HRESULT WINAPI HTMLStyle_get_backgroundAttachment(IHTMLStyle *iface, BSTR *p) { HTMLStyle *This = impl_from_IHTMLStyle(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + return get_style_attr(This, STYLEID_BACKGROUND_ATTACHMENT, p); } static HRESULT WINAPI HTMLStyle_put_backgroundPosition(IHTMLStyle *iface, BSTR v) diff --git a/dlls/mshtml/htmlstyle.h b/dlls/mshtml/htmlstyle.h index c9f2156..9b44a30 100644 --- a/dlls/mshtml/htmlstyle.h +++ b/dlls/mshtml/htmlstyle.h @@ -34,6 +34,7 @@ struct HTMLStyle { /* NOTE: Make sure to keep in sync with style_tbl in htmlstyle.c */ typedef enum { STYLEID_BACKGROUND, + STYLEID_BACKGROUND_ATTACHMENT, STYLEID_BACKGROUND_COLOR, STYLEID_BACKGROUND_IMAGE, STYLEID_BACKGROUND_POSITION, diff --git a/dlls/mshtml/tests/style.c b/dlls/mshtml/tests/style.c index f279fb3..94226e1 100644 --- a/dlls/mshtml/tests/style.c +++ b/dlls/mshtml/tests/style.c @@ -1545,6 +1545,16 @@ static void test_body_style(IHTMLStyle *style) ok(!strcmp_wa(V_BSTR(&v), "red"), "str=%s\n", wine_dbgstr_w(V_BSTR(&v))); VariantClear(&v); + str = a2bstr("fixed"); + hres = IHTMLStyle_put_backgroundAttachment(style, str); + ok(hres == S_OK, "put_backgroundAttachment failed: %08x\n", hres); + SysFreeString(str); + + hres = IHTMLStyle_get_backgroundAttachment(style, &str); + ok(hres == S_OK, "get_backgroundAttachment failed: %08x\n", hres); + ok(!strcmp_wa(str, "fixed"), "ret = %s\n", wine_dbgstr_w(str)); + SysFreeString(str); + /* padding */ hres = IHTMLStyle_get_padding(style, &str); ok(hres == S_OK, "get_padding failed: %08x\n", hres);

1 0

André Hentschel : wpcap: Implement pcap_datalink_val_to_name.
by Alexandre Julliard Aug. 19, 2014

Aug. 19, 2014

Module: wine Branch: master Commit: 6284a3e2021f13122c83ad8c89917039b5fbf3cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=6284a3e2021f13122c83ad8c8… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Aug 18 23:55:01 2014 +0200 wpcap: Implement pcap_datalink_val_to_name. --- dlls/wpcap/wpcap.c | 6 ++++++ dlls/wpcap/wpcap.spec | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/wpcap/wpcap.c b/dlls/wpcap/wpcap.c index 81ff958..333079e 100644 --- a/dlls/wpcap/wpcap.c +++ b/dlls/wpcap/wpcap.c @@ -45,6 +45,12 @@ int CDECL wine_pcap_datalink(pcap_t *p) return pcap_datalink(p); } +const char* CDECL wine_pcap_datalink_val_to_name(int dlt) +{ + TRACE("(%i)\n", dlt); + return pcap_datalink_val_to_name(dlt); +} + typedef struct { void (CALLBACK *pfn_cb)(u_char *, const struct pcap_pkthdr *, const u_char *); diff --git a/dlls/wpcap/wpcap.spec b/dlls/wpcap/wpcap.spec index 2cdc6cd..04f309f 100644 --- a/dlls/wpcap/wpcap.spec +++ b/dlls/wpcap/wpcap.spec @@ -14,7 +14,7 @@ @ cdecl pcap_datalink(ptr) wine_pcap_datalink @ stub pcap_datalink_name_to_val @ stub pcap_datalink_val_to_description -@ stub pcap_datalink_val_to_name +@ cdecl pcap_datalink_val_to_name(long) wine_pcap_datalink_val_to_name @ cdecl pcap_dispatch(ptr long ptr ptr) wine_pcap_dispatch @ stub pcap_dump @ stub pcap_dump_close

1 0

Stefan Dösinger : ddraw: Do not set lpSurface in GetSurfaceDesc.
by Alexandre Julliard Aug. 19, 2014

Aug. 19, 2014

Module: wine Branch: master Commit: 9bb5b00dd5ee0c49fafeac044a31b86602804825 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9bb5b00dd5ee0c49fafeac044… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Aug 19 14:20:29 2014 +0200 ddraw: Do not set lpSurface in GetSurfaceDesc. This reverts a5c484cbf3948ec824e990503f798d3333ff55fb. The test included in a5c484cb is wrong and contains a typo that leads to incorrect assumptions. The Dungeon Keeper 2 crash that was the reason for patch a5c484cb is fixed properly by the previous patch. --- dlls/ddraw/surface.c | 15 ++++-------- dlls/ddraw/tests/ddraw1.c | 57 +++++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw2.c | 57 +++++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw4.c | 57 +++++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw7.c | 57 +++++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/dsurface.c | 16 +------------ 6 files changed, 233 insertions(+), 26 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9bb5b00dd5ee0c49fafea…

1 0

Piotr Caban : oleaut32: Add support for VAR_TIMEVALUEONLY and VAR_DATEVALUEONLY flags in VarDateFromUdateEx.
by Alexandre Julliard Aug. 19, 2014

Aug. 19, 2014

Module: wine Branch: master Commit: fc6ec997e2dcc96a8e68f1ba6df61e3cbc69e8df URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc6ec997e2dcc96a8e68f1ba6… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Aug 19 11:55:14 2014 +0200 oleaut32: Add support for VAR_TIMEVALUEONLY and VAR_DATEVALUEONLY flags in VarDateFromUdateEx. --- dlls/oleaut32/tests/vartest.c | 6 ++++++ dlls/oleaut32/variant.c | 21 +++++++++++++-------- 2 files changed, 19 insertions(+), 8 deletions(-) diff --git a/dlls/oleaut32/tests/vartest.c b/dlls/oleaut32/tests/vartest.c index 6acd4e2..224dad3 100644 --- a/dlls/oleaut32/tests/vartest.c +++ b/dlls/oleaut32/tests/vartest.c @@ -1934,6 +1934,12 @@ static void test_VarDateFromUdate(void) /* for DATE values 0.0 < x < 1.0, x and -x represent the same datetime */ /* but when converting to DATE, prefer the positive versions */ UD2T(30,12,1899,6,0,0,0,6,364,0,S_OK,0.25); + + UD2T(1,1,1980,18,1,16,0,2,1,VAR_TIMEVALUEONLY,S_OK,0.7508796296296296); + UD2T(1,1,1980,18,1,16,0,2,1,VAR_DATEVALUEONLY,S_OK,29221.0); + UD2T(25,12,1899,6,0,0,0,1,359,VAR_TIMEVALUEONLY,S_OK,0.25); + UD2T(25,12,1899,6,0,0,0,1,359,VAR_DATEVALUEONLY,S_OK,-5.0); + UD2T(1,-1,1980,18,1,16,0,0,0,VAR_TIMEVALUEONLY|VAR_DATEVALUEONLY,S_OK,0.7508796296296296); } static void test_st2dt(int line, WORD d, WORD m, WORD y, WORD h, WORD mn, diff --git a/dlls/oleaut32/variant.c b/dlls/oleaut32/variant.c index a00e16f..e391a90 100644 --- a/dlls/oleaut32/variant.c +++ b/dlls/oleaut32/variant.c @@ -1350,7 +1350,7 @@ INT WINAPI VariantTimeToSystemTime(double dateIn, LPSYSTEMTIME lpSt) HRESULT WINAPI VarDateFromUdateEx(UDATE *pUdateIn, LCID lcid, ULONG dwFlags, DATE *pDateOut) { UDATE ud; - double dateVal, dateSign; + double dateVal = 0; TRACE("(%p->%d/%d/%d %d:%d:%d:%d %d %d,0x%08x,0x%08x,%p)\n", pUdateIn, pUdateIn->st.wMonth, pUdateIn->st.wDay, pUdateIn->st.wYear, @@ -1360,6 +1360,8 @@ HRESULT WINAPI VarDateFromUdateEx(UDATE *pUdateIn, LCID lcid, ULONG dwFlags, DAT if (lcid != MAKELCID(MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_US), SORT_DEFAULT)) FIXME("lcid possibly not handled, treating as en-us\n"); + if (dwFlags & ~(VAR_TIMEVALUEONLY|VAR_DATEVALUEONLY)) + FIXME("unsupported flags: %x\n", dwFlags); ud = *pUdateIn; @@ -1370,15 +1372,18 @@ HRESULT WINAPI VarDateFromUdateEx(UDATE *pUdateIn, LCID lcid, ULONG dwFlags, DAT return E_INVALIDARG; /* Date */ - dateVal = VARIANT_DateFromJulian(VARIANT_JulianFromDMY(ud.st.wYear, ud.st.wMonth, ud.st.wDay)); + if (!(dwFlags & VAR_TIMEVALUEONLY)) + dateVal = VARIANT_DateFromJulian(VARIANT_JulianFromDMY(ud.st.wYear, ud.st.wMonth, ud.st.wDay)); - /* Sign */ - dateSign = (dateVal < 0.0) ? -1.0 : 1.0; + if ((dwFlags & VAR_TIMEVALUEONLY) || !(dwFlags & VAR_DATEVALUEONLY)) + { + double dateSign = (dateVal < 0.0) ? -1.0 : 1.0; - /* Time */ - dateVal += ud.st.wHour / 24.0 * dateSign; - dateVal += ud.st.wMinute / 1440.0 * dateSign; - dateVal += ud.st.wSecond / 86400.0 * dateSign; + /* Time */ + dateVal += ud.st.wHour / 24.0 * dateSign; + dateVal += ud.st.wMinute / 1440.0 * dateSign; + dateVal += ud.st.wSecond / 86400.0 * dateSign; + } TRACE("Returning %g\n", dateVal); *pDateOut = dateVal;

1 0

Henri Verbeet : wined3d: Move the "map_binding" field from struct wined3d_surface to struct wined3d_resource.
by Alexandre Julliard Aug. 19, 2014

Aug. 19, 2014

Module: wine Branch: master Commit: 694cdcc41cc74eff8c1d96ac0e18895862b22476 URL: http://source.winehq.org/git/wine.git/?a=commit;h=694cdcc41cc74eff8c1d96ac0… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Aug 19 09:22:28 2014 +0200 wined3d: Move the "map_binding" field from struct wined3d_surface to struct wined3d_resource. Like "draw_binding". --- dlls/wined3d/surface.c | 74 +++++++++++++++++++++--------------------- dlls/wined3d/texture.c | 4 +-- dlls/wined3d/wined3d_private.h | 2 +- 3 files changed, 40 insertions(+), 40 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=694cdcc41cc74eff8c1d9…

1 0