wine-commits August 2015

wine-commits@winehq.org

2 participants
503 discussions

Philippe Groarke : wine.inf: Add UTC Time Zone.
by Alexandre Julliard 05 Aug '15

05 Aug '15

Module: wine Branch: master Commit: 07e4d4bd044ac3c9f46526b210205216d8bfeb45 URL: http://source.winehq.org/git/wine.git/?a=commit;h=07e4d4bd044ac3c9f46526b21… Author: Philippe Groarke <philippe.groarke(a)gmail.com> Date: Mon Aug 3 21:05:25 2015 -0400 wine.inf: Add UTC Time Zone. --- loader/wine.inf.in | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index 29b0c83..2025d9e 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -3079,6 +3079,10 @@ HKLM,%CurrentVersionNT%\Time Zones\US Mountain Standard Time,"Display",,"America HKLM,%CurrentVersionNT%\Time Zones\US Mountain Standard Time,"Dlt",,"US Mountain Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\US Mountain Standard Time,"Std",,"US Mountain Standard Time" HKLM,%CurrentVersionNT%\Time Zones\US Mountain Standard Time,"TZI",1,a4,01,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\UTC,"Display",,"Etc/UTC" +HKLM,%CurrentVersionNT%\Time Zones\UTC,"Dlt",,"Coordinated Universal Time" +HKLM,%CurrentVersionNT%\Time Zones\UTC,"Std",,"Coordinated Universal Time" +HKLM,%CurrentVersionNT%\Time Zones\UTC,"TZI",1,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Venezuela Standard Time,"Display",,"America/Caracas" HKLM,%CurrentVersionNT%\Time Zones\Venezuela Standard Time,"Dlt",,"Venezuela Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\Venezuela Standard Time,"Std",,"Venezuela Standard Time"

1 0

Alex Henrie : mshtml: Stub out HTMLAreaElement.
by Alexandre Julliard 05 Aug '15

05 Aug '15

Module: wine Branch: master Commit: f36d761650fd9ab2cfbc6f1b13952a8498ddf70f URL: http://source.winehq.org/git/wine.git/?a=commit;h=f36d761650fd9ab2cfbc6f1b1… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Aug 4 08:59:39 2015 -0600 mshtml: Stub out HTMLAreaElement. --- dlls/mshtml/Makefile.in | 1 + dlls/mshtml/htmlarea.c | 446 +++++++++++++++++++++++++++++++++++++++++++ dlls/mshtml/htmlelem.c | 2 + dlls/mshtml/mshtml_private.h | 3 + dlls/mshtml/nsiface.idl | 38 ++++ 5 files changed, 490 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f36d761650fd9ab2cfbc6…

1 0

Alex Henrie : include: Add IHTMLAreaElement and DispHTMLAreaElement.
by Alexandre Julliard 05 Aug '15

05 Aug '15

Module: wine Branch: master Commit: 06ec294260def36dcf8c7fc0d7f7460ed5453729 URL: http://source.winehq.org/git/wine.git/?a=commit;h=06ec294260def36dcf8c7fc0d… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Aug 4 08:36:46 2015 -0600 include: Add IHTMLAreaElement and DispHTMLAreaElement. --- include/mshtmdid.h | 25 ++++++ include/mshtml.idl | 227 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 252 insertions(+) diff --git a/include/mshtmdid.h b/include/mshtmdid.h index 722686a..7e010c6 100644 --- a/include/mshtmdid.h +++ b/include/mshtmdid.h @@ -2486,6 +2486,31 @@ #define DISPID_IHTMLANCHORELEMENT3_IE8_COORDS DISPID_IE8_ANCHOR+2 #define DISPID_IHTMLANCHORELEMENT3_IE8_HREF DISPID_IE8_ANCHOR+3 +/* IHTMLAreaElement */ +#define DISPID_IHTMLAREAELEMENT_SHAPE DISPID_AREA+1 +#define DISPID_IHTMLAREAELEMENT_COORDS DISPID_AREA+2 +#define DISPID_IHTMLAREAELEMENT_HREF DISPID_VALUE +#define DISPID_IHTMLAREAELEMENT_TARGET DISPID_AREA+4 +#define DISPID_IHTMLAREAELEMENT_ALT DISPID_AREA+5 +#define DISPID_IHTMLAREAELEMENT_NOHREF DISPID_AREA+6 +#define DISPID_IHTMLAREAELEMENT_HOST DISPID_AREA+7 +#define DISPID_IHTMLAREAELEMENT_HOSTNAME DISPID_AREA+8 +#define DISPID_IHTMLAREAELEMENT_PATHNAME DISPID_AREA+9 +#define DISPID_IHTMLAREAELEMENT_PORT DISPID_AREA+10 +#define DISPID_IHTMLAREAELEMENT_PROTOCOL DISPID_AREA+11 +#define DISPID_IHTMLAREAELEMENT_SEARCH DISPID_AREA+12 +#define DISPID_IHTMLAREAELEMENT_HASH DISPID_AREA+13 +#define DISPID_IHTMLAREAELEMENT_ONBLUR DISPID_EVPROP_ONBLUR +#define DISPID_IHTMLAREAELEMENT_ONFOCUS DISPID_EVPROP_ONFOCUS +#define DISPID_IHTMLAREAELEMENT_TABINDEX STDPROPID_XOBJ_TABINDEX +#define DISPID_IHTMLAREAELEMENT_FOCUS DISPID_SITE+0 +#define DISPID_IHTMLAREAELEMENT_BLUR DISPID_SITE+2 + +/* IHTMLAreaElement2 */ +#define DISPID_IHTMLAREAELEMENT2_IE8_SHAPE DISPID_IE8_AREA+1 +#define DISPID_IHTMLAREAELEMENT2_IE8_COORDS DISPID_IE8_AREA+2 +#define DISPID_IHTMLAREAELEMENT2_IE8_HREF DISPID_IE8_AREA+3 + /* IHTMLLabelElement */ #define DISPID_IHTMLLABELELEMENT_HTMLFOR DISPID_LABEL #define DISPID_IHTMLLABELELEMENT_ACCESSKEY DISPID_SITE+5 diff --git a/include/mshtml.idl b/include/mshtml.idl index d55a101..05f79ef 100644 --- a/include/mshtml.idl +++ b/include/mshtml.idl @@ -9158,6 +9158,233 @@ methods: } /***************************************************************************** + * IHTMLAreaElement interface + */ +[ + odl, + oleautomation, + dual, + uuid(3050f265-98b5-11cf-bb82-00aa00bdce0b) +] +interface IHTMLAreaElement : IDispatch +{ + [propput, id(DISPID_IHTMLAREAELEMENT_SHAPE)] + HRESULT shape([in] BSTR v); + + [propget, id(DISPID_IHTMLAREAELEMENT_SHAPE)] + HRESULT shape([retval, out] BSTR *p); + + [propput, id(DISPID_IHTMLAREAELEMENT_COORDS)] + HRESULT coords([in] BSTR v); + + [propget, id(DISPID_IHTMLAREAELEMENT_COORDS)] + HRESULT coords([retval, out] BSTR *p); + + [propput, id(DISPID_IHTMLAREAELEMENT_HREF)] + HRESULT href([in] BSTR v); + + [propget, id(DISPID_IHTMLAREAELEMENT_HREF)] + HRESULT href([retval, out] BSTR *p); + + [propput, id(DISPID_IHTMLAREAELEMENT_TARGET)] + HRESULT target([in] BSTR v); + + [propget, id(DISPID_IHTMLAREAELEMENT_TARGET)] + HRESULT target([retval, out] BSTR *p); + + [propput, id(DISPID_IHTMLAREAELEMENT_ALT)] + HRESULT alt([in] BSTR v); + + [propget, id(DISPID_IHTMLAREAELEMENT_ALT)] + HRESULT alt([retval, out] BSTR *p); + + [propput, id(DISPID_IHTMLAREAELEMENT_NOHREF)] + HRESULT noHref([in] VARIANT_BOOL v); + + [propget, id(DISPID_IHTMLAREAELEMENT_NOHREF)] + HRESULT noHref([retval, out] VARIANT_BOOL *p); + + [propput, id(DISPID_IHTMLAREAELEMENT_HOST)] + HRESULT host([in] BSTR v); + + [propget, id(DISPID_IHTMLAREAELEMENT_HOST)] + HRESULT host([retval, out] BSTR *p); + + [propput, id(DISPID_IHTMLAREAELEMENT_HOSTNAME)] + HRESULT hostname([in] BSTR v); + + [propget, id(DISPID_IHTMLAREAELEMENT_HOSTNAME)] + HRESULT hostname([retval, out] BSTR *p); + + [propput, id(DISPID_IHTMLAREAELEMENT_PATHNAME)] + HRESULT pathname([in] BSTR v); + + [propget, id(DISPID_IHTMLAREAELEMENT_PATHNAME)] + HRESULT pathname([retval, out] BSTR *p); + + [propput, id(DISPID_IHTMLAREAELEMENT_PORT)] + HRESULT port([in] BSTR v); + + [propget, id(DISPID_IHTMLAREAELEMENT_PORT)] + HRESULT port([retval, out] BSTR *p); + + [propput, id(DISPID_IHTMLAREAELEMENT_PROTOCOL)] + HRESULT protocol([in] BSTR v); + + [propget, id(DISPID_IHTMLAREAELEMENT_PROTOCOL)] + HRESULT protocol([retval, out] BSTR *p); + + [propput, id(DISPID_IHTMLAREAELEMENT_SEARCH)] + HRESULT search([in] BSTR v); + + [propget, id(DISPID_IHTMLAREAELEMENT_SEARCH)] + HRESULT search([retval, out] BSTR *p); + + [propput, id(DISPID_IHTMLAREAELEMENT_HASH)] + HRESULT hash([in] BSTR v); + + [propget, id(DISPID_IHTMLAREAELEMENT_HASH)] + HRESULT hash([retval, out] BSTR *p); + + [propput, id(DISPID_IHTMLAREAELEMENT_ONBLUR), displaybind, bindable] + HRESULT onblur([in] VARIANT v); + + [propget, id(DISPID_IHTMLAREAELEMENT_ONBLUR), displaybind, bindable] + HRESULT onblur([retval, out] VARIANT *p); + + [propput, id(DISPID_IHTMLAREAELEMENT_ONFOCUS), displaybind, bindable] + HRESULT onfocus([in] VARIANT v); + + [propget, id(DISPID_IHTMLAREAELEMENT_ONFOCUS), displaybind, bindable] + HRESULT onfocus([retval, out] VARIANT *p); + + [propput, id(DISPID_IHTMLAREAELEMENT_TABINDEX), displaybind, bindable] + HRESULT tabIndex([in] short v); + + [propget, id(DISPID_IHTMLAREAELEMENT_TABINDEX), displaybind, bindable] + HRESULT tabIndex([retval, out] short *p); + + [id(DISPID_IHTMLAREAELEMENT_FOCUS)] + HRESULT focus(); + + [id(DISPID_IHTMLAREAELEMENT_BLUR)] + HRESULT blur(); +} + +/***************************************************************************** + * DispHTMLAreaElement dispinterface + */ +[ + hidden, + uuid(3050f503-98b5-11cf-bb82-00aa00bdce0b) +] +dispinterface DispHTMLAreaElement +{ +properties: +methods: + WINE_HTMLDATAELEMENT_DISPINTERFACE_DECL; + + [propget, id(DISPID_IHTMLDOMCONSTRUCTOR_CONSTRUCTOR), hidden] + IDispatch* constructor(); + + [propput, id(DISPID_IHTMLAREAELEMENT_SHAPE)] + void shape(BSTR v); + + [propget, id(DISPID_IHTMLAREAELEMENT_SHAPE)] + BSTR shape(); + + [propput, id(DISPID_IHTMLAREAELEMENT_COORDS)] + void coords(BSTR v); + + [propget, id(DISPID_IHTMLAREAELEMENT_COORDS)] + BSTR coords(); + + [propput, id(DISPID_IHTMLAREAELEMENT_HREF)] + void href(BSTR v); + + [propget, id(DISPID_IHTMLAREAELEMENT_HREF)] + BSTR href(); + + [propput, id(DISPID_IHTMLAREAELEMENT_TARGET)] + void target(BSTR v); + + [propget, id(DISPID_IHTMLAREAELEMENT_TARGET)] + BSTR target(); + + [propput, id(DISPID_IHTMLAREAELEMENT_ALT)] + void alt(BSTR v); + + [propget, id(DISPID_IHTMLAREAELEMENT_ALT)] + BSTR alt(); + + [propput, id(DISPID_IHTMLAREAELEMENT_NOHREF)] + void noHref(VARIANT_BOOL v); + + [propget, id(DISPID_IHTMLAREAELEMENT_NOHREF)] + VARIANT_BOOL noHref(); + + [propput, id(DISPID_IHTMLAREAELEMENT_HOST)] + void host(BSTR v); + + [propget, id(DISPID_IHTMLAREAELEMENT_HOST)] + BSTR host(); + + [propput, id(DISPID_IHTMLAREAELEMENT_HOSTNAME)] + void hostname(BSTR v); + + [propget, id(DISPID_IHTMLAREAELEMENT_HOSTNAME)] + BSTR hostname(); + + [propput, id(DISPID_IHTMLAREAELEMENT_PATHNAME)] + void pathname(BSTR v); + + [propget, id(DISPID_IHTMLAREAELEMENT_PATHNAME)] + BSTR pathname(); + + [propput, id(DISPID_IHTMLAREAELEMENT_PORT)] + void port(BSTR v); + + [propget, id(DISPID_IHTMLAREAELEMENT_PORT)] + BSTR port(); + + [propput, id(DISPID_IHTMLAREAELEMENT_PROTOCOL)] + void protocol(BSTR v); + + [propget, id(DISPID_IHTMLAREAELEMENT_PROTOCOL)] + BSTR protocol(); + + [propput, id(DISPID_IHTMLAREAELEMENT_SEARCH)] + void search(BSTR v); + + [propget, id(DISPID_IHTMLAREAELEMENT_SEARCH)] + BSTR search(); + + [propput, id(DISPID_IHTMLAREAELEMENT_HASH)] + void hash(BSTR v); + + [propget, id(DISPID_IHTMLAREAELEMENT_HASH)] + BSTR hash(); + + [propput, id(DISPID_IHTMLAREAELEMENT2_IE8_SHAPE)] + void ie8_shape(BSTR v); + + [propget, id(DISPID_IHTMLAREAELEMENT2_IE8_SHAPE)] + BSTR ie8_shape(); + + [propput, id(DISPID_IHTMLAREAELEMENT2_IE8_COORDS)] + void ie8_coords(BSTR v); + + [propget, id(DISPID_IHTMLAREAELEMENT2_IE8_COORDS)] + BSTR ie8_coords(); + + [propput, id(DISPID_IHTMLAREAELEMENT2_IE8_HREF)] + void ie8_href(BSTR v); + + [propget, id(DISPID_IHTMLAREAELEMENT2_IE8_HREF)] + BSTR ie8_href(); +}; + +/***************************************************************************** * IHTMLLabelElement interface */ [

1 0

Iván Matellanes : msvcrt: _setmode should check if file descriptor is valid.
by Alexandre Julliard 05 Aug '15

05 Aug '15

Module: wine Branch: master Commit: ea2798f1ce9847938ffefba2c5ded4ba2fd46cd8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea2798f1ce9847938ffefba2c… Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Mon Aug 3 21:32:53 2015 +0200 msvcrt: _setmode should check if file descriptor is valid. --- dlls/msvcrt/file.c | 5 +++++ dlls/msvcrt/tests/file.c | 10 ++++++++++ 2 files changed, 15 insertions(+) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 44aa32e..68d4d54 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -2833,6 +2833,11 @@ int CDECL MSVCRT__setmode(int fd,int mode) return -1; } + if(info == &MSVCRT___badioinfo) { + *MSVCRT__errno() = MSVCRT_EBADF; + return -1; + } + if(mode == MSVCRT__O_BINARY) { info->wxflag &= ~WX_TEXT; info->exflag &= ~(EF_UTF8|EF_UTF16); diff --git a/dlls/msvcrt/tests/file.c b/dlls/msvcrt/tests/file.c index c4d8fa1..ba8c3e3 100644 --- a/dlls/msvcrt/tests/file.c +++ b/dlls/msvcrt/tests/file.c @@ -1789,6 +1789,16 @@ static void test_setmode(void) return; } + errno = 0xdeadbeef; + ret = _setmode(-2, 0); + ok(ret == -1, "_setmode returned %x, expected -1\n", ret); + ok(errno == EINVAL, "errno = %d\n", errno); + + errno = 0xdeadbeef; + ret = _setmode(-2, _O_TEXT); + ok(ret == -1, "_setmode returned %x, expected -1\n", ret); + ok(errno == EBADF, "errno = %d\n", errno); + fd = _open(name, _O_CREAT|_O_WRONLY, _S_IWRITE); ok(fd != -1, "failed to open file\n");

1 0

Iván Matellanes : msvcirt: Implement filebuf::attach.
by Alexandre Julliard 05 Aug '15

05 Aug '15

Module: wine Branch: master Commit: e2659db4541fa6e07b9a22f93c82341fafa453b2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e2659db4541fa6e07b9a22f93… Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Mon Aug 3 16:49:01 2015 +0200 msvcirt: Implement filebuf::attach. --- dlls/msvcirt/msvcirt.c | 11 ++++++-- dlls/msvcirt/tests/msvcirt.c | 65 +++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 73 insertions(+), 3 deletions(-) diff --git a/dlls/msvcirt/msvcirt.c b/dlls/msvcirt/msvcirt.c index 8e9f93a..0fd9123 100644 --- a/dlls/msvcirt/msvcirt.c +++ b/dlls/msvcirt/msvcirt.c @@ -868,8 +868,15 @@ filebuf* __thiscall filebuf_scalar_dtor(filebuf *this, unsigned int flags) DEFINE_THISCALL_WRAPPER(filebuf_attach, 8) filebuf* __thiscall filebuf_attach(filebuf *this, filedesc fd) { - FIXME("(%p %d) stub\n", this, fd); - return NULL; + TRACE("(%p %d)\n", this, fd); + if (this->fd != -1) + return NULL; + + streambuf_lock(&this->base); + this->fd = fd; + streambuf_allocate(&this->base); + streambuf_unlock(&this->base); + return this; } /* ?close@filebuf@@QAEPAV1@XZ */ diff --git a/dlls/msvcirt/tests/msvcirt.c b/dlls/msvcirt/tests/msvcirt.c index 8437e9c..b1d49a6 100644 --- a/dlls/msvcirt/tests/msvcirt.c +++ b/dlls/msvcirt/tests/msvcirt.c @@ -134,6 +134,7 @@ static filebuf* (*__thiscall p_filebuf_fd_ctor)(filebuf*, int); static filebuf* (*__thiscall p_filebuf_fd_reserve_ctor)(filebuf*, int, char*, int); static filebuf* (*__thiscall p_filebuf_ctor)(filebuf*); static void (*__thiscall p_filebuf_dtor)(filebuf*); +static filebuf* (*__thiscall p_filebuf_attach)(filebuf*, filedesc); /* ios */ static ios* (*__thiscall p_ios_copy_ctor)(ios*, const ios*); @@ -269,6 +270,7 @@ static BOOL init(void) SET(p_filebuf_fd_reserve_ctor, "??0filebuf@@QEAA@HPEADH@Z"); SET(p_filebuf_ctor, "??0filebuf@@QEAA@XZ"); SET(p_filebuf_dtor, "??1filebuf@@UEAA@XZ"); + SET(p_filebuf_attach, "?attach@filebuf@@QEAAPEAV1@H@Z"); SET(p_ios_copy_ctor, "??0ios@@IEAA@AEBV0@@Z"); SET(p_ios_ctor, "??0ios@@IEAA@XZ"); @@ -324,6 +326,7 @@ static BOOL init(void) SET(p_filebuf_fd_reserve_ctor, "??0filebuf@@QAE@HPADH@Z"); SET(p_filebuf_ctor, "??0filebuf@@QAE@XZ"); SET(p_filebuf_dtor, "??1filebuf@@UAE@XZ"); + SET(p_filebuf_attach, "?attach@filebuf@@QAEPAV1@H@Z"); SET(p_ios_copy_ctor, "??0ios@@IAE@ABV0@@Z"); SET(p_ios_ctor, "??0ios@@IAE@XZ"); @@ -901,9 +904,32 @@ static void test_streambuf(void) CloseHandle(thread); } +struct filebuf_lock_arg +{ + filebuf *fb1, *fb2, *fb3; + HANDLE lock; + HANDLE test; +}; + +static DWORD WINAPI lock_filebuf(void *arg) +{ + struct filebuf_lock_arg *lock_arg = arg; + call_func1(p_streambuf_lock, &lock_arg->fb1->base); + call_func1(p_streambuf_lock, &lock_arg->fb2->base); + call_func1(p_streambuf_lock, &lock_arg->fb3->base); + SetEvent(lock_arg->lock); + WaitForSingleObject(lock_arg->test, INFINITE); + call_func1(p_streambuf_unlock, &lock_arg->fb1->base); + call_func1(p_streambuf_unlock, &lock_arg->fb2->base); + call_func1(p_streambuf_unlock, &lock_arg->fb3->base); + return 0; +} + static void test_filebuf(void) { - filebuf fb1, fb2, fb3; + filebuf fb1, fb2, fb3, *pret; + struct filebuf_lock_arg lock_arg; + HANDLE thread; memset(&fb1, 0xab, sizeof(filebuf)); memset(&fb2, 0xab, sizeof(filebuf)); @@ -926,10 +952,47 @@ static void test_filebuf(void) ok(fb3.fd == -1, "wrong fd, expected -1 got %d\n", fb3.fd); ok(fb3.close == 0, "wrong value, expected 0 got %d\n", fb3.close); + lock_arg.fb1 = &fb1; + lock_arg.fb2 = &fb2; + lock_arg.fb3 = &fb3; + lock_arg.lock = CreateEventW(NULL, FALSE, FALSE, NULL); + ok(lock_arg.lock != NULL, "CreateEventW failed\n"); + lock_arg.test = CreateEventW(NULL, FALSE, FALSE, NULL); + ok(lock_arg.test != NULL, "CreateEventW failed\n"); + thread = CreateThread(NULL, 0, lock_filebuf, (void*)&lock_arg, 0, NULL); + ok(thread != NULL, "CreateThread failed\n"); + WaitForSingleObject(lock_arg.lock, INFINITE); + + /* attach */ + pret = (filebuf*) call_func2(p_filebuf_attach, &fb1, 2); + ok(pret == NULL, "wrong return, expected %p got %p\n", NULL, pret); + ok(fb1.base.allocated == 0, "wrong allocate value, expected 0 got %d\n", fb1.base.allocated); + ok(fb1.fd == 1, "wrong fd, expected 1 got %d\n", fb1.fd); + fb2.fd = -1; + fb2.base.do_lock = 0; + pret = (filebuf*) call_func2(p_filebuf_attach, &fb2, 3); + ok(pret == &fb2, "wrong return, expected %p got %p\n", &fb2, pret); + ok(fb2.base.allocated == 0, "wrong allocate value, expected 0 got %d\n", fb2.base.allocated); + ok(fb2.fd == 3, "wrong fd, expected 3 got %d\n", fb2.fd); + fb2.base.do_lock = -1; + fb3.base.do_lock = 0; + pret = (filebuf*) call_func2(p_filebuf_attach, &fb3, 2); + ok(pret == &fb3, "wrong return, expected %p got %p\n", &fb3, pret); + ok(fb3.base.allocated == 1, "wrong allocate value, expected 1 got %d\n", fb3.base.allocated); + ok(fb3.fd == 2, "wrong fd, expected 2 got %d\n", fb3.fd); + fb3.base.do_lock = -1; + + SetEvent(lock_arg.test); + WaitForSingleObject(thread, INFINITE); + /* destructor */ call_func1(p_filebuf_dtor, &fb1); call_func1(p_filebuf_dtor, &fb2); call_func1(p_filebuf_dtor, &fb3); + + CloseHandle(lock_arg.lock); + CloseHandle(lock_arg.test); + CloseHandle(thread); } struct ios_lock_arg

1 0

Iván Matellanes : msvcirt: Implement filebuf constructors and destructor.
by Alexandre Julliard 05 Aug '15

05 Aug '15

Module: wine Branch: master Commit: 2f702e3dd6ab73fd87a8b3f6ce0cf7dc949bbf49 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f702e3dd6ab73fd87a8b3f6c… Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Mon Aug 3 16:48:53 2015 +0200 msvcirt: Implement filebuf constructors and destructor. --- dlls/msvcirt/msvcirt.c | 39 +++++++++++++++++------------- dlls/msvcirt/tests/msvcirt.c | 56 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 79 insertions(+), 16 deletions(-) diff --git a/dlls/msvcirt/msvcirt.c b/dlls/msvcirt/msvcirt.c index f860c95..8e9f93a 100644 --- a/dlls/msvcirt/msvcirt.c +++ b/dlls/msvcirt/msvcirt.c @@ -778,16 +778,9 @@ void __thiscall streambuf_dbp(streambuf *this) DEFINE_THISCALL_WRAPPER(filebuf_copy_ctor, 8) filebuf* __thiscall filebuf_copy_ctor(filebuf* this, const filebuf *copy) { - FIXME("(%p %p) stub\n", this, copy); - return this; -} - -/* ??0filebuf@@QAE@H@Z */ -/* ??0filebuf@@QEAA@H@Z */ -DEFINE_THISCALL_WRAPPER(filebuf_fd_ctor, 8) -filebuf* __thiscall filebuf_fd_ctor(filebuf* this, filedesc fd) -{ - FIXME("(%p %d) stub\n", this, fd); + TRACE("(%p %p)\n", this, copy); + *this = *copy; + this->base.vtable = &MSVCP_filebuf_vtable; return this; } @@ -796,7 +789,21 @@ filebuf* __thiscall filebuf_fd_ctor(filebuf* this, filedesc fd) DEFINE_THISCALL_WRAPPER(filebuf_fd_reserve_ctor, 16) filebuf* __thiscall filebuf_fd_reserve_ctor(filebuf* this, filedesc fd, char *buffer, int length) { - FIXME("(%p %d %p %d) stub\n", this, fd, buffer, length); + TRACE("(%p %d %p %d)\n", this, fd, buffer, length); + streambuf_reserve_ctor(&this->base, buffer, length); + this->base.vtable = &MSVCP_filebuf_vtable; + this->fd = fd; + this->close = 0; + return this; +} + +/* ??0filebuf@@QAE@H@Z */ +/* ??0filebuf@@QEAA@H@Z */ +DEFINE_THISCALL_WRAPPER(filebuf_fd_ctor, 8) +filebuf* __thiscall filebuf_fd_ctor(filebuf* this, filedesc fd) +{ + filebuf_fd_reserve_ctor(this, fd, NULL, 0); + this->base.unbuffered = 0; return this; } @@ -805,8 +812,7 @@ filebuf* __thiscall filebuf_fd_reserve_ctor(filebuf* this, filedesc fd, char *bu DEFINE_THISCALL_WRAPPER(filebuf_ctor, 4) filebuf* __thiscall filebuf_ctor(filebuf* this) { - FIXME("(%p) stub\n", this); - return this; + return filebuf_fd_ctor(this, -1); } /* ??1filebuf@@UAE@XZ */ @@ -814,7 +820,8 @@ filebuf* __thiscall filebuf_ctor(filebuf* this) DEFINE_THISCALL_WRAPPER(filebuf_dtor, 4) void __thiscall filebuf_dtor(filebuf* this) { - FIXME("(%p) stub\n", this); + TRACE("(%p)\n", this); + streambuf_dtor(&this->base); } /* ??4filebuf@@QAEAAV0@ABV0@@Z */ @@ -822,8 +829,8 @@ void __thiscall filebuf_dtor(filebuf* this) DEFINE_THISCALL_WRAPPER(filebuf_assign, 8) filebuf* __thiscall filebuf_assign(filebuf* this, const filebuf *rhs) { - FIXME("(%p %p) stub\n", this, rhs); - return this; + filebuf_dtor(this); + return filebuf_copy_ctor(this, rhs); } /* ??_Efilebuf@@UAEPAXI@Z */ diff --git a/dlls/msvcirt/tests/msvcirt.c b/dlls/msvcirt/tests/msvcirt.c index 30941d5..8437e9c 100644 --- a/dlls/msvcirt/tests/msvcirt.c +++ b/dlls/msvcirt/tests/msvcirt.c @@ -22,6 +22,7 @@ #include "wine/test.h" typedef void (*vtable_ptr)(void); +typedef int filedesc; typedef enum { IOSTATE_goodbit = 0x0, @@ -66,6 +67,13 @@ typedef struct { CRITICAL_SECTION lock; } streambuf; +/* class filebuf */ +typedef struct { + streambuf base; + filedesc fd; + int close; +} filebuf; + /* class ios */ struct _ostream; typedef struct { @@ -121,6 +129,12 @@ static void (*__thiscall p_streambuf_unlock)(streambuf*); static int (*__thiscall p_streambuf_xsgetn)(streambuf*, char*, int); static int (*__thiscall p_streambuf_xsputn)(streambuf*, const char*, int); +/* filebuf */ +static filebuf* (*__thiscall p_filebuf_fd_ctor)(filebuf*, int); +static filebuf* (*__thiscall p_filebuf_fd_reserve_ctor)(filebuf*, int, char*, int); +static filebuf* (*__thiscall p_filebuf_ctor)(filebuf*); +static void (*__thiscall p_filebuf_dtor)(filebuf*); + /* ios */ static ios* (*__thiscall p_ios_copy_ctor)(ios*, const ios*); static ios* (*__thiscall p_ios_ctor)(ios*); @@ -251,6 +265,11 @@ static BOOL init(void) SET(p_streambuf_xsgetn, "?xsgetn@streambuf@@UEAAHPEADH@Z"); SET(p_streambuf_xsputn, "?xsputn@streambuf@@UEAAHPEBDH@Z"); + SET(p_filebuf_fd_ctor, "??0filebuf@@QEAA@H@Z"); + SET(p_filebuf_fd_reserve_ctor, "??0filebuf@@QEAA@HPEADH@Z"); + SET(p_filebuf_ctor, "??0filebuf@@QEAA@XZ"); + SET(p_filebuf_dtor, "??1filebuf@@UEAA@XZ"); + SET(p_ios_copy_ctor, "??0ios@@IEAA@AEBV0@@Z"); SET(p_ios_ctor, "??0ios@@IEAA@XZ"); SET(p_ios_sb_ctor, "??0ios@@QEAA@PEAVstreambuf@@@Z"); @@ -301,6 +320,11 @@ static BOOL init(void) SET(p_streambuf_xsgetn, "?xsgetn@streambuf@@UAEHPADH@Z"); SET(p_streambuf_xsputn, "?xsputn@streambuf@@UAEHPBDH@Z"); + SET(p_filebuf_fd_ctor, "??0filebuf@@QAE@H@Z"); + SET(p_filebuf_fd_reserve_ctor, "??0filebuf@@QAE@HPADH@Z"); + SET(p_filebuf_ctor, "??0filebuf@@QAE@XZ"); + SET(p_filebuf_dtor, "??1filebuf@@UAE@XZ"); + SET(p_ios_copy_ctor, "??0ios@@IAE@ABV0@@Z"); SET(p_ios_ctor, "??0ios@@IAE@XZ"); SET(p_ios_sb_ctor, "??0ios@@QAE@PAVstreambuf@@@Z"); @@ -877,6 +901,37 @@ static void test_streambuf(void) CloseHandle(thread); } +static void test_filebuf(void) +{ + filebuf fb1, fb2, fb3; + + memset(&fb1, 0xab, sizeof(filebuf)); + memset(&fb2, 0xab, sizeof(filebuf)); + memset(&fb3, 0xab, sizeof(filebuf)); + + /* constructors */ + call_func2(p_filebuf_fd_ctor, &fb1, 1); + ok(fb1.base.allocated == 0, "wrong allocate value, expected 0 got %d\n", fb1.base.allocated); + ok(fb1.base.unbuffered == 0, "wrong unbuffered value, expected 0 got %d\n", fb1.base.unbuffered); + ok(fb1.fd == 1, "wrong fd, expected 1 got %d\n", fb1.fd); + ok(fb1.close == 0, "wrong value, expected 0 got %d\n", fb1.close); + call_func4(p_filebuf_fd_reserve_ctor, &fb2, 4, NULL, 0); + ok(fb2.base.allocated == 0, "wrong allocate value, expected 0 got %d\n", fb2.base.allocated); + ok(fb2.base.unbuffered == 1, "wrong unbuffered value, expected 1 got %d\n", fb2.base.unbuffered); + ok(fb2.fd == 4, "wrong fd, expected 4 got %d\n", fb2.fd); + ok(fb2.close == 0, "wrong value, expected 0 got %d\n", fb2.close); + call_func1(p_filebuf_ctor, &fb3); + ok(fb3.base.allocated == 0, "wrong allocate value, expected 0 got %d\n", fb3.base.allocated); + ok(fb3.base.unbuffered == 0, "wrong unbuffered value, expected 0 got %d\n", fb3.base.unbuffered); + ok(fb3.fd == -1, "wrong fd, expected -1 got %d\n", fb3.fd); + ok(fb3.close == 0, "wrong value, expected 0 got %d\n", fb3.close); + + /* destructor */ + call_func1(p_filebuf_dtor, &fb1); + call_func1(p_filebuf_dtor, &fb2); + call_func1(p_filebuf_dtor, &fb3); +} + struct ios_lock_arg { ios *ios_obj; @@ -1160,6 +1215,7 @@ START_TEST(msvcirt) return; test_streambuf(); + test_filebuf(); test_ios(); FreeLibrary(msvcrt);

1 0

Iván Matellanes : msvcirt: Add filebuf static fields.
by Alexandre Julliard 05 Aug '15

05 Aug '15

Module: wine Branch: master Commit: 30e33a406c80ccc5f8ab69b2d9592e018ec1ec94 URL: http://source.winehq.org/git/wine.git/?a=commit;h=30e33a406c80ccc5f8ab69b2d… Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Mon Aug 3 16:48:43 2015 +0200 msvcirt: Add filebuf static fields. --- dlls/msvcirt/msvcirt.c | 13 +++++++++++++ dlls/msvcirt/msvcirt.spec | 12 ++++++------ dlls/msvcrt20/msvcrt20.spec | 12 ++++++------ dlls/msvcrt40/msvcrt40.spec | 12 ++++++------ 4 files changed, 31 insertions(+), 18 deletions(-) diff --git a/dlls/msvcirt/msvcirt.c b/dlls/msvcirt/msvcirt.c index 9a39b1a..f860c95 100644 --- a/dlls/msvcirt/msvcirt.c +++ b/dlls/msvcirt/msvcirt.c @@ -32,6 +32,19 @@ WINE_DEFAULT_DEBUG_CHANNEL(msvcirt); #define RESERVE_SIZE 512 #define STATEBUF_SIZE 8 +/* ?sh_none@filebuf@@2HB */ +const int filebuf_sh_none = 0x800; +/* ?sh_read@filebuf@@2HB */ +const int filebuf_sh_read = 0xa00; +/* ?sh_write@filebuf@@2HB */ +const int filebuf_sh_write = 0xc00; +/* ?openprot@filebuf@@2HB */ +const int filebuf_openprot = 420; +/* ?binary@filebuf@@2HB */ +const int filebuf_binary = 0x8000; +/* ?text@filebuf@@2HB */ +const int filebuf_text = 0x4000; + /* ?adjustfield@ios@@2JB */ const LONG ios_adjustfield = FLAGS_left | FLAGS_right | FLAGS_internal; /* ?basefield@ios@@2JB */ diff --git a/dlls/msvcirt/msvcirt.spec b/dlls/msvcirt/msvcirt.spec index 249ee91..ffb6f21 100644 --- a/dlls/msvcirt/msvcirt.spec +++ b/dlls/msvcirt/msvcirt.spec @@ -415,7 +415,7 @@ @ thiscall -arch=win32 ?base@streambuf@@IBEPADXZ(ptr) streambuf_base @ cdecl -arch=win64 ?base@streambuf@@IEBAPEADXZ(ptr) streambuf_base @ extern ?basefield@ios@@2JB ios_basefield -# @ extern ?binary@filebuf@@2HB # static int const filebuf::binary +@ extern ?binary@filebuf@@2HB filebuf_binary @ cdecl ?bitalloc@ios@@SAJXZ() ios_bitalloc @ thiscall -arch=win32 ?blen@streambuf@@IBEHXZ(ptr) streambuf_blen @ cdecl -arch=win64 ?blen@streambuf@@IEBAHXZ(ptr) streambuf_blen @@ -570,7 +570,7 @@ @ stub -arch=win64 ?open@ifstream@@QEAAXPEBDHH@Z @ stub -arch=win32 ?open@ofstream@@QAEXPBDHH@Z # void __thiscall ofstream::open(char const *,int,int) @ stub -arch=win64 ?open@ofstream@@QEAAXPEBDHH@Z -# @ extern ?openprot@filebuf@@2HB # static int const filebuf::openprot +@ extern ?openprot@filebuf@@2HB filebuf_openprot @ stub -arch=win32 ?opfx@ostream@@QAEHXZ # int __thiscall ostream::opfx(void) @ stub -arch=win64 ?opfx@ostream@@QEAAHXZ @ stub -arch=win32 ?osfx@ostream@@QAEXXZ # void __thiscall ostream::osfx(void) @@ -697,9 +697,9 @@ @ cdecl -arch=win64 ?sgetc@streambuf@@QEAAHXZ(ptr) streambuf_sgetc @ thiscall -arch=win32 ?sgetn@streambuf@@QAEHPADH@Z(ptr ptr long) streambuf_sgetn @ cdecl -arch=win64 ?sgetn@streambuf@@QEAAHPEADH@Z(ptr ptr long) streambuf_sgetn -# @ extern ?sh_none@filebuf@@2HB # static int const filebuf::sh_none -# @ extern ?sh_read@filebuf@@2HB # static int const filebuf::sh_read -# @ extern ?sh_write@filebuf@@2HB # static int const filebuf::sh_write +@ extern ?sh_none@filebuf@@2HB filebuf_sh_none +@ extern ?sh_read@filebuf@@2HB filebuf_sh_read +@ extern ?sh_write@filebuf@@2HB filebuf_sh_write @ thiscall -arch=win32 ?snextc@streambuf@@QAEHXZ(ptr) streambuf_snextc @ cdecl -arch=win64 ?snextc@streambuf@@QEAAHXZ(ptr) streambuf_snextc @ thiscall -arch=win32 ?sputbackc@streambuf@@QAEHD@Z(ptr long) streambuf_sputbackc @@ -736,7 +736,7 @@ @ stub -arch=win64 ?tellg@istream@@QEAAJXZ @ stub -arch=win32 ?tellp@ostream@@QAEJXZ # long __thiscall ostream::tellp(void) @ stub -arch=win64 ?tellp@ostream@@QEAAJXZ -# @ extern ?text@filebuf@@2HB # static int const filebuf::text +@ extern ?text@filebuf@@2HB filebuf_text @ thiscall -arch=win32 ?tie@ios@@QAEPAVostream@@PAV2@@Z(ptr ptr) ios_tie_set @ cdecl -arch=win64 ?tie@ios@@QEAAPEAVostream@@PEAV2@@Z(ptr ptr) ios_tie_set @ thiscall -arch=win32 ?tie@ios@@QBEPAVostream@@XZ(ptr) ios_tie_get diff --git a/dlls/msvcrt20/msvcrt20.spec b/dlls/msvcrt20/msvcrt20.spec index ab59dde..ade81ae 100644 --- a/dlls/msvcrt20/msvcrt20.spec +++ b/dlls/msvcrt20/msvcrt20.spec @@ -403,7 +403,7 @@ @ thiscall -arch=win32 ?base@streambuf@@IBEPADXZ(ptr) msvcirt.?base@streambuf@@IBEPADXZ @ cdecl -arch=win64 ?base@streambuf@@IEBAPEADXZ(ptr) msvcirt.?base@streambuf@@IEBAPEADXZ @ extern ?basefield@ios@@2JB msvcirt.?basefield@ios@@2JB -# @ extern ?binary@filebuf@@2HB +@ extern ?binary@filebuf@@2HB msvcirt.?binary@filebuf@@2HB @ cdecl ?bitalloc@ios@@SAJXZ() msvcirt.?bitalloc@ios@@SAJXZ @ thiscall -arch=win32 ?blen@streambuf@@IBEHXZ(ptr) msvcirt.?blen@streambuf@@IBEHXZ @ cdecl -arch=win64 ?blen@streambuf@@IEBAHXZ(ptr) msvcirt.?blen@streambuf@@IEBAHXZ @@ -556,7 +556,7 @@ @ stub -arch=win64 ?open@ifstream@@QEAAXPEBDHH@Z @ stub -arch=win32 ?open@ofstream@@QAEXPBDHH@Z @ stub -arch=win64 ?open@ofstream@@QEAAXPEBDHH@Z -# @ extern ?openprot@filebuf@@2HB +@ extern ?openprot@filebuf@@2HB msvcirt.?openprot@filebuf@@2HB @ stub -arch=win32 ?opfx@ostream@@QAEHXZ @ stub -arch=win64 ?opfx@ostream@@QEAAHXZ @ stub -arch=win32 ?osfx@ostream@@QAEXXZ @@ -685,9 +685,9 @@ @ cdecl -arch=win64 ?sgetc@streambuf@@QEAAHXZ(ptr) msvcirt.?sgetc@streambuf@@QEAAHXZ @ thiscall -arch=win32 ?sgetn@streambuf@@QAEHPADH@Z(ptr ptr long) msvcirt.?sgetn@streambuf@@QAEHPADH@Z @ cdecl -arch=win64 ?sgetn@streambuf@@QEAAHPEADH@Z(ptr ptr long) msvcirt.?sgetn@streambuf@@QEAAHPEADH@Z -# @ extern ?sh_none@filebuf@@2HB -# @ extern ?sh_read@filebuf@@2HB -# @ extern ?sh_write@filebuf@@2HB +@ extern ?sh_none@filebuf@@2HB msvcirt.?sh_none@filebuf@@2HB +@ extern ?sh_read@filebuf@@2HB msvcirt.?sh_read@filebuf@@2HB +@ extern ?sh_write@filebuf@@2HB msvcirt.?sh_write@filebuf@@2HB @ thiscall -arch=win32 ?snextc@streambuf@@QAEHXZ(ptr) msvcirt.?snextc@streambuf@@QAEHXZ @ cdecl -arch=win64 ?snextc@streambuf@@QEAAHXZ(ptr) msvcirt.?snextc@streambuf@@QEAAHXZ @ thiscall -arch=win32 ?sputbackc@streambuf@@QAEHD@Z(ptr long) msvcirt.?sputbackc@streambuf@@QAEHD@Z @@ -725,7 +725,7 @@ @ stub -arch=win32 ?tellp@ostream@@QAEJXZ @ stub -arch=win64 ?tellp@ostream@@QEAAJXZ @ cdecl ?terminate@@YAXXZ() msvcrt.?terminate@@YAXXZ -# @ extern ?text@filebuf@@2HB +@ extern ?text@filebuf@@2HB msvcirt.?text@filebuf@@2HB @ thiscall -arch=win32 ?tie@ios@@QAEPAVostream@@PAV2@@Z(ptr ptr) msvcirt.?tie@ios@@QAEPAVostream@@PAV2@@Z @ cdecl -arch=win64 ?tie@ios@@QEAAPEAVostream@@PEAV2@@Z(ptr ptr) msvcirt.?tie@ios@@QEAAPEAVostream@@PEAV2@@Z @ thiscall -arch=win32 ?tie@ios@@QBEPAVostream@@XZ(ptr) msvcirt.?tie@ios@@QBEPAVostream@@XZ diff --git a/dlls/msvcrt40/msvcrt40.spec b/dlls/msvcrt40/msvcrt40.spec index 0f5811a..33e4f16 100644 --- a/dlls/msvcrt40/msvcrt40.spec +++ b/dlls/msvcrt40/msvcrt40.spec @@ -468,7 +468,7 @@ @ extern ?basefield@ios@@2JB msvcirt.?basefield@ios@@2JB @ thiscall -arch=i386 ?before@type_info@@QBEHABV1@@Z(ptr ptr) msvcrt.?before@type_info@@QBEHABV1@@Z @ cdecl -arch=win64 ?before@type_info@@QEBAHAEBV1@@Z(ptr ptr) msvcrt.?before@type_info@@QEBAHAEBV1@@Z -# @ extern ?binary@filebuf@@2HB +@ extern ?binary@filebuf@@2HB msvcirt.?binary@filebuf@@2HB @ cdecl ?bitalloc@ios@@SAJXZ() msvcirt.?bitalloc@ios@@SAJXZ @ thiscall -arch=win32 ?blen@streambuf@@IBEHXZ(ptr) msvcirt.?blen@streambuf@@IBEHXZ @ cdecl -arch=win64 ?blen@streambuf@@IEBAHXZ(ptr) msvcirt.?blen@streambuf@@IEBAHXZ @@ -625,7 +625,7 @@ @ stub -arch=win64 ?open@ifstream@@QEAAXPEBDHH@Z @ stub -arch=win32 ?open@ofstream@@QAEXPBDHH@Z @ stub -arch=win64 ?open@ofstream@@QEAAXPEBDHH@Z -# @ extern ?openprot@filebuf@@2HB +@ extern ?openprot@filebuf@@2HB msvcirt.?openprot@filebuf@@2HB @ stub -arch=win32 ?opfx@ostream@@QAEHXZ @ stub -arch=win64 ?opfx@ostream@@QEAAHXZ @ stub -arch=win32 ?osfx@ostream@@QAEXXZ @@ -757,9 +757,9 @@ @ cdecl -arch=win64 ?sgetc@streambuf@@QEAAHXZ(ptr) msvcirt.?sgetc@streambuf@@QEAAHXZ @ thiscall -arch=win32 ?sgetn@streambuf@@QAEHPADH@Z(ptr ptr long) msvcirt.?sgetn@streambuf@@QAEHPADH@Z @ cdecl -arch=win64 ?sgetn@streambuf@@QEAAHPEADH@Z(ptr ptr long) msvcirt.?sgetn@streambuf@@QEAAHPEADH@Z -# @ extern ?sh_none@filebuf@@2HB -# @ extern ?sh_read@filebuf@@2HB -# @ extern ?sh_write@filebuf@@2HB +@ extern ?sh_none@filebuf@@2HB msvcirt.?sh_none@filebuf@@2HB +@ extern ?sh_read@filebuf@@2HB msvcirt.?sh_read@filebuf@@2HB +@ extern ?sh_write@filebuf@@2HB msvcirt.?sh_write@filebuf@@2HB @ thiscall -arch=win32 ?snextc@streambuf@@QAEHXZ(ptr) msvcirt.?snextc@streambuf@@QAEHXZ @ cdecl -arch=win64 ?snextc@streambuf@@QEAAHXZ(ptr) msvcirt.?snextc@streambuf@@QEAAHXZ @ thiscall -arch=win32 ?sputbackc@streambuf@@QAEHD@Z(ptr long) msvcirt.?sputbackc@streambuf@@QAEHD@Z @@ -797,7 +797,7 @@ @ stub -arch=win32 ?tellp@ostream@@QAEJXZ @ stub -arch=win64 ?tellp@ostream@@QEAAJXZ @ cdecl ?terminate@@YAXXZ() msvcrt.?terminate@@YAXXZ -# @ extern ?text@filebuf@@2HB +@ extern ?text@filebuf@@2HB msvcirt.?text@filebuf@@2HB @ thiscall -arch=win32 ?tie@ios@@QAEPAVostream@@PAV2@@Z(ptr ptr) msvcirt.?tie@ios@@QAEPAVostream@@PAV2@@Z @ cdecl -arch=win64 ?tie@ios@@QEAAPEAVostream@@PEAV2@@Z(ptr ptr) msvcirt.?tie@ios@@QEAAPEAVostream@@PEAV2@@Z @ thiscall -arch=win32 ?tie@ios@@QBEPAVostream@@XZ(ptr) msvcirt.?tie@ios@@QBEPAVostream@@XZ

1 0

Iván Matellanes : msvcirt: Add stub of class filebuf.
by Alexandre Julliard 05 Aug '15

05 Aug '15

Module: wine Branch: master Commit: aa11357dfa529ccbddf31d21395e75a25794caf0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aa11357dfa529ccbddf31d213… Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Mon Aug 3 16:48:37 2015 +0200 msvcirt: Add stub of class filebuf. --- dlls/msvcirt/msvcirt.c | 205 ++++++++++++++++++++++++++++++++++++++++++++ dlls/msvcirt/msvcirt.h | 12 +++ dlls/msvcirt/msvcirt.spec | 74 ++++++++-------- dlls/msvcrt20/msvcrt20.spec | 74 ++++++++-------- dlls/msvcrt40/msvcrt40.spec | 74 ++++++++-------- 5 files changed, 328 insertions(+), 111 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=aa11357dfa529ccbddf31…

1 0

YongHao Hu : msvcp120/tests: Fix error test case of tr2_sys_Copy_file in FAT filesystem.
by Alexandre Julliard 05 Aug '15

05 Aug '15

Module: wine Branch: master Commit: be3e9884c4d5eed52eec05d9ff4d397797b57bb4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=be3e9884c4d5eed52eec05d9f… Author: YongHao Hu <christopherwuy(a)gmail.com> Date: Sun Aug 2 11:24:44 2015 +0800 msvcp120/tests: Fix error test case of tr2_sys_Copy_file in FAT filesystem. --- dlls/msvcp120/tests/msvcp120.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/msvcp120/tests/msvcp120.c b/dlls/msvcp120/tests/msvcp120.c index bc7c69b..84eb096 100644 --- a/dlls/msvcp120/tests/msvcp120.c +++ b/dlls/msvcp120/tests/msvcp120.c @@ -564,7 +564,6 @@ static void test_tr2_sys__Copy_file(void) { "f1", "tr2_test_dir\\f1_copy", TRUE, ERROR_SUCCESS, FALSE }, { "f1", "tr2_test_dir\\f1_copy", TRUE, ERROR_FILE_EXISTS, FALSE }, { "f1", "tr2_test_dir\\f1_copy", FALSE, ERROR_SUCCESS, FALSE }, - { "f1", "tr2_test_dir", TRUE, ERROR_ACCESS_DENIED, TRUE }, { "tr2_test_dir", "f1", TRUE, ERROR_ACCESS_DENIED, FALSE }, { "tr2_test_dir", "tr2_test_dir_copy", TRUE, ERROR_ACCESS_DENIED, FALSE }, { NULL, "f1", TRUE, ERROR_INVALID_PARAMETER, TRUE }, @@ -594,6 +593,9 @@ static void test_tr2_sys__Copy_file(void) ok(p_tr2_sys__File_size(tests[i].source) == p_tr2_sys__File_size(tests[i].dest), "test_tr2_sys__Copy_file(): test %d failed, two files' size are not equal\n", i+1); } + ret = p_tr2_sys__Copy_file("f1", "tr2_test_dir", TRUE); + ok(ret==ERROR_ACCESS_DENIED || ret==ERROR_FILE_EXISTS, + "test_tr2_sys__Copy_file(): expect: ERROR_ACCESS_DENIED or ERROR_FILE_EXISTS, got %d\n", ret); ok(DeleteFileA("f1"), "expect f1 to exist\n"); ok(DeleteFileA("f1_copy"), "expect f1_copy to exist\n");

1 0

Jacek Caban : widl: Added support for -ns_prefix option.
by Alexandre Julliard 05 Aug '15

05 Aug '15

Module: wine Branch: master Commit: 21740b5e156e98ae12239a7720113c4d557d7b9a URL: http://source.winehq.org/git/wine.git/?a=commit;h=21740b5e156e98ae12239a772… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Aug 5 12:52:15 2015 +0200 widl: Added support for -ns_prefix option. --- include/windows.foundation.idl | 2 +- tools/widl/header.c | 10 ++++++++-- tools/widl/parser.l | 7 +++++++ tools/widl/typetree.c | 12 ++++++++++-- tools/widl/widl.c | 7 +++++++ tools/widl/widl.h | 1 + tools/widl/widl.man.in | 2 ++ 7 files changed, 36 insertions(+), 5 deletions(-) diff --git a/include/windows.foundation.idl b/include/windows.foundation.idl index f926202..6d66070 100644 --- a/include/windows.foundation.idl +++ b/include/windows.foundation.idl @@ -17,7 +17,7 @@ */ #ifdef __WIDL__ -#pragma winrt +#pragma winrt ns_prefix #endif import "inspectable.idl"; diff --git a/tools/widl/header.c b/tools/widl/header.c index 76f7ed0..866e3c1 100644 --- a/tools/widl/header.c +++ b/tools/widl/header.c @@ -155,8 +155,11 @@ static const char *uuid_string(const UUID *uuid) static void write_namespace_start(FILE *header, struct namespace *namespace) { - if(is_global_namespace(namespace)) + if(is_global_namespace(namespace)) { + if(use_abi_namespace) + write_line(header, 1, "namespace ABI {"); return; + } write_namespace_start(header, namespace->parent); write_line(header, 1, "namespace %s {", namespace->name); @@ -164,8 +167,11 @@ static void write_namespace_start(FILE *header, struct namespace *namespace) static void write_namespace_end(FILE *header, struct namespace *namespace) { - if(is_global_namespace(namespace)) + if(is_global_namespace(namespace)) { + if(use_abi_namespace) + write_line(header, -1, "}", namespace->name); return; + } write_line(header, -1, "}", namespace->name); write_namespace_end(header, namespace->parent); diff --git a/tools/widl/parser.l b/tools/widl/parser.l index c95277c..5c2dcab 100644 --- a/tools/widl/parser.l +++ b/tools/widl/parser.l @@ -152,7 +152,14 @@ UUID *parse_uuid(const char *u) if(!winrt_mode) error_loc("winrt IDL file imported in non-winrt mode\n"); }else { + const char *ptr = yytext+5; + winrt_mode = TRUE; + + while(isspace(*ptr)) + ptr++; + if(!strncmp(ptr, "ns_prefix", 9) && (!*(ptr += 9) || isspace(*ptr))) + use_abi_namespace = TRUE; } yy_pop_state(); } diff --git a/tools/widl/typetree.c b/tools/widl/typetree.c index d27a92a..15b7c73 100644 --- a/tools/widl/typetree.c +++ b/tools/widl/typetree.c @@ -80,8 +80,13 @@ static const var_t *find_arg(const var_list_t *args, const char *name) static char *append_namespace(char *ptr, struct namespace *namespace, const char *separator) { - if(is_global_namespace(namespace)) - return ptr; + if(is_global_namespace(namespace)) { + if(!use_abi_namespace) + return ptr; + strcpy(ptr, "ABI"); + strcat(ptr, separator); + return ptr + strlen(ptr); + } ptr = append_namespace(ptr, namespace->parent, separator); strcpy(ptr, namespace->name); @@ -96,6 +101,9 @@ char *format_namespace(struct namespace *namespace, const char *prefix, const ch struct namespace *iter; char *ret, *ptr; + if(use_abi_namespace && !is_global_namespace(namespace)) + len += 3 /* strlen("ABI") */ + sep_len; + for(iter = namespace; !is_global_namespace(iter); iter = iter->parent) len += strlen(iter->name) + sep_len; diff --git a/tools/widl/widl.c b/tools/widl/widl.c index 788c45e..a38f917 100644 --- a/tools/widl/widl.c +++ b/tools/widl/widl.c @@ -73,6 +73,7 @@ static const char usage[] = " --prefix-server=p Prefix names of server functions with 'p'\n" " -r Generate registration script\n" " --winrt Enable Windows Runtime mode\n" +" --ns_prefix Prefix namespaces with ABI namespace\n" " -s Generate server stub\n" " -t Generate typelib\n" " -u Generate interface identifiers file\n" @@ -115,6 +116,7 @@ int do_win64 = 1; int win32_packing = 8; int win64_packing = 8; int winrt_mode = 0; +int use_abi_namespace = 0; static enum stub_mode stub_mode = MODE_Os; char *input_name; @@ -155,6 +157,7 @@ enum { PREFIX_CLIENT_OPTION, PREFIX_SERVER_OPTION, PRINT_HELP, + RT_NS_PREFIX, RT_OPTION, WIN32_OPTION, WIN64_OPTION, @@ -170,6 +173,7 @@ static const struct option long_options[] = { { "dlldata-only", 0, NULL, DLLDATA_ONLY_OPTION }, { "help", 0, NULL, PRINT_HELP }, { "local-stubs", 1, NULL, LOCAL_STUBS_OPTION }, + { "ns_prefix", 0, NULL, RT_NS_PREFIX }, { "oldnames", 0, NULL, OLDNAMES_OPTION }, { "output", 0, NULL, 'o' }, { "prefix-all", 1, NULL, PREFIX_ALL_OPTION }, @@ -580,6 +584,9 @@ int main(int argc,char *argv[]) case RT_OPTION: winrt_mode = 1; break; + case RT_NS_PREFIX: + use_abi_namespace = 1; + break; case WIN32_OPTION: do_win32 = 1; do_win64 = 0; diff --git a/tools/widl/widl.h b/tools/widl/widl.h index d046f28..09e7871 100644 --- a/tools/widl/widl.h +++ b/tools/widl/widl.h @@ -50,6 +50,7 @@ extern int do_win64; extern int win32_packing; extern int win64_packing; extern int winrt_mode; +extern int use_abi_namespace; extern char *input_name; extern char *input_idl_name; diff --git a/tools/widl/widl.man.in b/tools/widl/widl.man.in index 179ffba..9259afd 100644 --- a/tools/widl/widl.man.in +++ b/tools/widl/widl.man.in @@ -85,6 +85,8 @@ file). .PP .IP "\fB--winrt\fR" Enable Windows Runtime mode. +.IP "\fB--ns_prefix\fR" +Prefix namespaces with ABI namespace. .PP .B Registration script options: .IP "\fB-r\fR"

1 0

← Newer
1
...
43
44
45
46
47
48
49
50
51
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits August 2015