March 2013 - Wine-commits - list.winehq.org

Francois Gouget : msxml3/tests: Make test_xmlns_attribute() static.
by Alexandre Julliard 12 Mar '13

12 Mar '13

Module: wine Branch: master Commit: 78a52bd8670331186ec1bcbd428118310c3c753f URL: http://source.winehq.org/git/wine.git/?a=commit;h=78a52bd8670331186ec1bcbd4… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Mar 12 11:34:43 2013 +0100 msxml3/tests: Make test_xmlns_attribute() static. --- dlls/msxml3/tests/domdoc.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 8775312..d5f2413 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -10754,7 +10754,7 @@ static void test_nodeValue(void) IXMLDOMDocument_Release(doc); } -void test_xmlns_attribute(void) +static void test_xmlns_attribute(void) { BSTR str; IXMLDOMDocument *doc;

1 0

Jörg Höhle : winmm: Fix GetPosition when using MSACM codecs.
by Alexandre Julliard 12 Mar '13

12 Mar '13

Module: wine Branch: master Commit: 2722f2cbfcd5f45a3f53e5b818439fba1de2c14f URL: http://source.winehq.org/git/wine.git/?a=commit;h=2722f2cbfcd5f45a3f53e5b81… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Sun Mar 10 14:43:51 2013 +0100 winmm: Fix GetPosition when using MSACM codecs. --- dlls/winmm/waveform.c | 11 +++++------ 1 files changed, 5 insertions(+), 6 deletions(-) diff --git a/dlls/winmm/waveform.c b/dlls/winmm/waveform.c index 0368790..594d82c 100644 --- a/dlls/winmm/waveform.c +++ b/dlls/winmm/waveform.c @@ -2035,7 +2035,7 @@ static LRESULT WINMM_Reset(HWAVE hwave) } static MMRESULT WINMM_FramesToMMTime(MMTIME *time, UINT32 played_frames, - UINT32 sample_rate, UINT32 bytes_per_frame) + UINT32 sample_rate, UINT32 bytes_per_sec) { switch(time->wType){ case TIME_SAMPLES: @@ -2058,7 +2058,7 @@ static MMRESULT WINMM_FramesToMMTime(MMTIME *time, UINT32 played_frames, time->wType = TIME_BYTES; /* fall through */ case TIME_BYTES: - time->u.cb = played_frames * bytes_per_frame; + time->u.cb = MulDiv(played_frames, bytes_per_sec, sample_rate); return MMSYSERR_NOERROR; } } @@ -2066,7 +2066,7 @@ static MMRESULT WINMM_FramesToMMTime(MMTIME *time, UINT32 played_frames, static LRESULT WINMM_GetPosition(HWAVE hwave, MMTIME *time) { WINMM_Device *device = WINMM_GetDeviceFromHWAVE(hwave); - UINT32 played_frames, sample_rate, bytes_per_frame; + UINT32 played_frames, sample_rate, bytes_per_sec; TRACE("(%p, %p)\n", hwave, time); @@ -2075,12 +2075,11 @@ static LRESULT WINMM_GetPosition(HWAVE hwave, MMTIME *time) played_frames = device->played_frames; sample_rate = device->orig_fmt->nSamplesPerSec; - bytes_per_frame = device->orig_fmt->nBlockAlign; + bytes_per_sec = device->orig_fmt->nAvgBytesPerSec; LeaveCriticalSection(&device->lock); - return WINMM_FramesToMMTime(time, played_frames, sample_rate, - bytes_per_frame); + return WINMM_FramesToMMTime(time, played_frames, sample_rate, bytes_per_sec); } static WINMM_MMDevice *WINMM_GetMixerMMDevice(HMIXEROBJ hmix, DWORD flags,

1 0

Stefan Leichter : msvcr110: Add VS2012 C/C++ runtime.
by Alexandre Julliard 12 Mar '13

12 Mar '13

Module: wine Branch: master Commit: 0e7f39439da99ac7900fa32786b0cd81463573fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=0e7f39439da99ac7900fa3278… Author: Stefan Leichter <Stefan.Leichter(a)camline.com> Date: Sun Mar 10 11:35:03 2013 +0100 msvcr110: Add VS2012 C/C++ runtime. --- configure | 1 + configure.ac | 1 + dlls/msvcr110/Makefile.in | 9 + dlls/msvcr110/msvcr110.c | 44 + dlls/msvcr110/msvcr110.spec | 2248 +++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 2303 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0e7f39439da99ac7900fa…

1 0

Stefan Dösinger : ddraw/tests: Use a TnLHal device only if supported in ddraw7 tests.
by Alexandre Julliard 12 Mar '13

12 Mar '13

Module: wine Branch: master Commit: a990dbfa223c7fb3ebe8830f1a5361159b567e37 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a990dbfa223c7fb3ebe8830f1… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Mar 12 07:20:31 2013 -0700 ddraw/tests: Use a TnLHal device only if supported in ddraw7 tests. Intel GPUs don't support d3d7 hardware vertexprocessing on Windows. In d3d8 and d3d9 it is available starting with i965 chips, but for some reason the driver does not expose this for d3d7. --- dlls/ddraw/tests/ddraw7.c | 21 +++++++++++++++++++-- 1 files changed, 19 insertions(+), 2 deletions(-) diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 6651687..90e666f 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -202,6 +202,17 @@ static IDirectDraw7 *create_ddraw(void) return ddraw; } +static HRESULT WINAPI enum_devtype_cb(char *desc_str, char *name, D3DDEVICEDESC7 *desc, void *ctx) +{ + BOOL *hal_ok = ctx; + if (IsEqualGUID(&desc->deviceGUID, &IID_IDirect3DTnLHalDevice)) + { + *hal_ok = TRUE; + return DDENUMRET_CANCEL; + } + return DDENUMRET_OK; +} + static IDirect3DDevice7 *create_device(HWND window, DWORD coop_level) { IDirectDrawSurface7 *surface, *ds; @@ -211,6 +222,8 @@ static IDirect3DDevice7 *create_device(HWND window, DWORD coop_level) IDirectDraw7 *ddraw; IDirect3D7 *d3d7; HRESULT hr; + BOOL hal_ok = FALSE; + const GUID *devtype = &IID_IDirect3DHALDevice; if (!(ddraw = create_ddraw())) return NULL; @@ -249,8 +262,12 @@ static IDirect3DDevice7 *create_device(HWND window, DWORD coop_level) return NULL; } + hr = IDirect3D7_EnumDevices(d3d7, enum_devtype_cb, &hal_ok); + ok(SUCCEEDED(hr), "Failed to enumerate devices, hr %#x.\n", hr); + if (hal_ok) devtype = &IID_IDirect3DTnLHalDevice; + memset(&z_fmt, 0, sizeof(z_fmt)); - hr = IDirect3D7_EnumZBufferFormats(d3d7, &IID_IDirect3DTnLHalDevice, enum_z_fmt, &z_fmt); + hr = IDirect3D7_EnumZBufferFormats(d3d7, devtype, enum_z_fmt, &z_fmt); if (FAILED(hr) || !z_fmt.dwSize) { IDirect3D7_Release(d3d7); @@ -284,7 +301,7 @@ static IDirect3DDevice7 *create_device(HWND window, DWORD coop_level) return NULL; } - hr = IDirect3D7_CreateDevice(d3d7, &IID_IDirect3DTnLHalDevice, surface, &device); + hr = IDirect3D7_CreateDevice(d3d7, devtype, surface, &device); IDirect3D7_Release(d3d7); IDirectDrawSurface7_Release(surface); if (FAILED(hr))

1 0

Stefan Dösinger : ddraw/tests: Use a software VP device in test_surface_interface_mismatch.
by Alexandre Julliard 12 Mar '13

12 Mar '13

Module: wine Branch: master Commit: f39443787ad4ca270078203abb5cf2e9ebc545ab URL: http://source.winehq.org/git/wine.git/?a=commit;h=f39443787ad4ca270078203ab… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Mar 12 07:20:32 2013 -0700 ddraw/tests: Use a software VP device in test_surface_interface_mismatch. --- dlls/ddraw/tests/ddraw7.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 90e666f..027e03a 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -940,7 +940,7 @@ static void test_surface_interface_mismatch(void) } memset(&z_fmt, 0, sizeof(z_fmt)); - hr = IDirect3D7_EnumZBufferFormats(d3d, &IID_IDirect3DTnLHalDevice, enum_z_fmt, &z_fmt); + hr = IDirect3D7_EnumZBufferFormats(d3d, &IID_IDirect3DHALDevice, enum_z_fmt, &z_fmt); if (FAILED(hr) || !z_fmt.dwSize) { skip("No depth buffer formats available, skipping test.\n"); @@ -968,7 +968,7 @@ static void test_surface_interface_mismatch(void) goto cleanup; /* Here too */ - hr = IDirect3D7_CreateDevice(d3d, &IID_IDirect3DTnLHalDevice, (IDirectDrawSurface7 *)surface3, &device); + hr = IDirect3D7_CreateDevice(d3d, &IID_IDirect3DHALDevice, (IDirectDrawSurface7 *)surface3, &device); ok(SUCCEEDED(hr), "Failed to create d3d device.\n"); if (FAILED(hr)) goto cleanup;

1 0

Stefan Dösinger : ddraw/tests: Use hardware VP only if available in the visual tests.
by Alexandre Julliard 12 Mar '13

12 Mar '13

Module: wine Branch: master Commit: 3eb6045325e007270c5ce3a1cc068655887c7064 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3eb6045325e007270c5ce3a1c… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Mar 12 07:20:33 2013 -0700 ddraw/tests: Use hardware VP only if available in the visual tests. --- dlls/ddraw/tests/visual.c | 21 +++++++++++++++++++-- 1 files changed, 19 insertions(+), 2 deletions(-) diff --git a/dlls/ddraw/tests/visual.c b/dlls/ddraw/tests/visual.c index 02ba913..b8a4b76 100644 --- a/dlls/ddraw/tests/visual.c +++ b/dlls/ddraw/tests/visual.c @@ -64,6 +64,17 @@ static HRESULT WINAPI enum_z_fmt(DDPIXELFORMAT *fmt, void *ctx) return DDENUMRET_OK; } +static HRESULT WINAPI enum_devtype_cb(char *desc_str, char *name, D3DDEVICEDESC7 *desc, void *ctx) +{ + BOOL *hal_ok = ctx; + if (IsEqualGUID(&desc->deviceGUID, &IID_IDirect3DTnLHalDevice)) + { + *hal_ok = TRUE; + return DDENUMRET_CANCEL; + } + return DDENUMRET_OK; +} + static BOOL createObjects(void) { HRESULT hr; @@ -71,6 +82,8 @@ static BOOL createObjects(void) WNDCLASS wc = {0}; DDSURFACEDESC2 ddsd; DDPIXELFORMAT zfmt; + BOOL hal_ok = FALSE; + const GUID *devtype = &IID_IDirect3DHALDevice; if(!hmod) return FALSE; pDirectDrawCreateEx = (void*)GetProcAddress(hmod, "DirectDrawCreateEx"); @@ -116,8 +129,12 @@ static BOOL createObjects(void) hr = IDirectDraw7_CreateSurface(DirectDraw, &ddsd, &Surface, NULL); if(FAILED(hr)) goto err; + hr = IDirect3D7_EnumDevices(Direct3D, enum_devtype_cb, &hal_ok); + ok(SUCCEEDED(hr), "Failed to enumerate devices, hr %#x.\n", hr); + if (hal_ok) devtype = &IID_IDirect3DTnLHalDevice; + memset(&zfmt, 0, sizeof(zfmt)); - hr = IDirect3D7_EnumZBufferFormats(Direct3D, &IID_IDirect3DTnLHalDevice, enum_z_fmt, &zfmt); + hr = IDirect3D7_EnumZBufferFormats(Direct3D, devtype, enum_z_fmt, &zfmt); if (FAILED(hr)) goto err; if (zfmt.dwSize == 0) goto err; @@ -136,7 +153,7 @@ static BOOL createObjects(void) ok(SUCCEEDED(hr), "AddAttachedSurface failed, hr %#x.\n", hr); if (FAILED(hr)) goto err; - hr = IDirect3D7_CreateDevice(Direct3D, &IID_IDirect3DTnLHalDevice, Surface, &Direct3DDevice); + hr = IDirect3D7_CreateDevice(Direct3D, devtype, Surface, &Direct3DDevice); if (FAILED(hr) || !Direct3DDevice) goto err; return TRUE;

1 0

Nikolay Sivov : msxml3: Added a simple test for CDATA processing with SAX reader.
by Alexandre Julliard 12 Mar '13

12 Mar '13

Module: wine Branch: master Commit: 2321f8b06f2ad184b4c663f4e2fe8891334add2c URL: http://source.winehq.org/git/wine.git/?a=commit;h=2321f8b06f2ad184b4c663f4e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Mar 12 12:45:54 2013 +0400 msxml3: Added a simple test for CDATA processing with SAX reader. --- dlls/msxml3/tests/saxreader.c | 103 ++++++++++++++++++++++++++++++++++++---- 1 files changed, 92 insertions(+), 11 deletions(-) diff --git a/dlls/msxml3/tests/saxreader.c b/dlls/msxml3/tests/saxreader.c index 06fd56a..da662bb 100644 --- a/dlls/msxml3/tests/saxreader.c +++ b/dlls/msxml3/tests/saxreader.c @@ -168,9 +168,11 @@ typedef enum _CH { CH_IGNORABLEWHITESPACE, CH_PROCESSINGINSTRUCTION, CH_SKIPPEDENTITY, + LH_STARTCDATA, + LH_ENDCDATA, EH_ERROR, EH_FATALERROR, - EG_IGNORABLEWARNING, + EH_IGNORABLEWARNING, EVENT_LAST } CH; @@ -187,6 +189,8 @@ static const char *event_names[EVENT_LAST] = { "ignorableWhitespace", "processingInstruction", "skippedEntity", + "startCDATA", + "endCDATA", "error", "fatalError", "ignorableWarning" @@ -410,6 +414,8 @@ static void ok_sequence_(struct call_sequence **seq, int sequence_index, case CH_PUTDOCUMENTLOCATOR: case CH_STARTDOCUMENT: case CH_ENDDOCUMENT: + case LH_STARTCDATA: + case LH_ENDCDATA: break; case CH_STARTPREFIXMAPPING: /* prefix, uri */ @@ -459,7 +465,7 @@ static void ok_sequence_(struct call_sequence **seq, int sequence_index, context, get_event_name(actual->id), expected->ret, actual->ret); break; case EH_ERROR: - case EG_IGNORABLEWARNING: + case EH_IGNORABLEWARNING: default: ok(0, "%s: callback not handled, %s\n", context, get_event_name(actual->id)); } @@ -570,6 +576,10 @@ static const char test_attributes[] = "<node1 xmlns:p=\"test\" />" "</document>\n"; +static const char test_cdata_xml[] = +"<?xml version=\"1.0\" ?>" +"<a><![CDATA[Some \r\ntext\n\rdata\n]]></a>"; + static struct call_entry content_handler_test1[] = { { CH_PUTDOCUMENTLOCATOR, 0, 0, S_OK }, { CH_STARTDOCUMENT, 0, 0, S_OK }, @@ -894,6 +904,37 @@ static struct call_entry attribute_norm_alt[] = { { CH_ENDTEST } }; +static struct call_entry cdata_test[] = { + { CH_PUTDOCUMENTLOCATOR, 0, 0, S_OK }, + { CH_STARTDOCUMENT, 0, 0, S_OK }, + { CH_STARTELEMENT, 1, 26, S_OK, "", "a", "a" }, + { LH_STARTCDATA, 1, 35, S_OK }, + { CH_CHARACTERS, 1, 35, S_OK, "Some \n" }, + { CH_CHARACTERS, 1, 42, S_OK, "text\n\n" }, + { CH_CHARACTERS, 4, 1, S_OK, "data\n" }, + { LH_ENDCDATA, 4, 1, S_OK }, + { CH_ENDELEMENT, 4, 6, S_OK, "", "a", "a" }, + { CH_ENDDOCUMENT, 0, 0, S_OK }, + { CH_ENDTEST } +}; + +/* this is what MSXML6 does */ +static struct call_entry cdata_test_alt[] = { + { CH_PUTDOCUMENTLOCATOR, 1, 0, S_OK }, + { CH_STARTDOCUMENT, 1, 22, S_OK }, + { CH_STARTELEMENT, 1, 25, S_OK, "", "a", "a" }, + { LH_STARTCDATA, 1, 34, S_OK }, + { CH_CHARACTERS, 1, 40, S_OK, "Some " }, + { CH_CHARACTERS, 2, 0, S_OK, "\n" }, + { CH_CHARACTERS, 3, 1, S_OK, "text\n" }, + { CH_CHARACTERS, 4, 0, S_OK, "\n" }, + { CH_CHARACTERS, 5, 3, S_OK, "data\n" }, + { LH_ENDCDATA, 5, 3, S_OK }, + { CH_ENDELEMENT, 5, 7, S_OK, "", "a", "a" }, + { CH_ENDDOCUMENT, 5, 7, S_OK }, + { CH_ENDTEST } +}; + static const char xmlspace_attr[] = "<?xml version=\"1.0\" encoding=\"UTF-16\"?>" "<a xml:space=\"preserve\"> Some text data </a>"; @@ -1275,7 +1316,7 @@ static HRESULT WINAPI isaxerrorHandler_fatalError( return S_OK; } -static HRESULT WINAPI isaxerrorHanddler_ignorableWarning( +static HRESULT WINAPI isaxerrorHandler_ignorableWarning( ISAXErrorHandler* iface, ISAXLocator *pLocator, const WCHAR *pErrorMessage, @@ -1292,7 +1333,7 @@ static const ISAXErrorHandlerVtbl errorHandlerVtbl = isaxerrorHandler_Release, isaxerrorHandler_error, isaxerrorHandler_fatalError, - isaxerrorHanddler_ignorableWarning + isaxerrorHandler_ignorableWarning }; static ISAXErrorHandler errorHandler = { &errorHandlerVtbl }; @@ -1583,14 +1624,24 @@ static HRESULT WINAPI isaxlexical_endEntity(ISAXLexicalHandler *iface, static HRESULT WINAPI isaxlexical_startCDATA(ISAXLexicalHandler *iface) { - ok(0, "call not expected\n"); - return E_NOTIMPL; + struct call_entry call; + + init_call_entry(locator, &call); + call.id = LH_STARTCDATA; + add_call(sequences, CONTENT_HANDLER_INDEX, &call); + + return get_expected_ret(); } static HRESULT WINAPI isaxlexical_endCDATA(ISAXLexicalHandler *iface) { - ok(0, "call not expected\n"); - return E_NOTIMPL; + struct call_entry call; + + init_call_entry(locator, &call); + call.id = LH_ENDCDATA; + add_call(sequences, CONTENT_HANDLER_INDEX, &call); + + return get_expected_ret(); } static HRESULT WINAPI isaxlexical_comment(ISAXLexicalHandler *iface, @@ -1880,6 +1931,9 @@ static struct msxmlsupported_data_t reader_support_data[] = { NULL } }; +static struct saxlexicalhandler lexicalhandler; +static struct saxdeclhandler declhandler; + static void test_saxreader(void) { const struct msxmlsupported_data_t *table = reader_support_data; @@ -2230,6 +2284,36 @@ static void test_saxreader(void) hr = ISAXXMLReader_putEntityResolver(reader, NULL); ok(hr == S_OK || broken(hr == E_FAIL), "got 0x%08x\n", hr); + /* CDATA sections */ + CreateStreamOnHGlobal(NULL, TRUE, &stream); + size.QuadPart = strlen(test_cdata_xml); + IStream_SetSize(stream, size); + IStream_Write(stream, test_cdata_xml, strlen(test_cdata_xml), &written); + pos.QuadPart = 0; + IStream_Seek(stream, pos, STREAM_SEEK_SET, NULL); + + init_saxlexicalhandler(&lexicalhandler, S_OK); + + V_VT(&var) = VT_UNKNOWN; + V_UNKNOWN(&var) = (IUnknown*)&lexicalhandler.ISAXLexicalHandler_iface; + hr = ISAXXMLReader_putProperty(reader, _bstr_("http://xml.org/sax/properties/lexical-handler"), var); + ok(hr == S_OK, "got 0x%08x\n", hr); + + V_VT(&var) = VT_UNKNOWN; + V_UNKNOWN(&var) = (IUnknown*)stream; + + if (IsEqualGUID(table->clsid, &CLSID_SAXXMLReader60)) + test_seq = cdata_test_alt; + else + test_seq = cdata_test; + + set_expected_seq(test_seq); + hr = ISAXXMLReader_parse(reader, var); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok_sequence(sequences, CONTENT_HANDLER_INDEX, test_seq, "cdata test", TRUE); + + IStream_Release(stream); + ISAXXMLReader_Release(reader); table++; } @@ -2243,9 +2327,6 @@ struct saxreader_props_test_t IUnknown *iface; }; -static struct saxlexicalhandler lexicalhandler; -static struct saxdeclhandler declhandler; - static const struct saxreader_props_test_t props_test_data[] = { { "http://xml.org/sax/properties/lexical-handler", (IUnknown*)&lexicalhandler.ISAXLexicalHandler_iface }, { "http://xml.org/sax/properties/declaration-handler", (IUnknown*)&declhandler.ISAXDeclHandler_iface },

1 0

Nikolay Sivov : msxml3: Fix some test failures on Windows 8.
by Alexandre Julliard 12 Mar '13

12 Mar '13

Module: wine Branch: master Commit: 40d30cf39955c501201239c4774398a2215b99b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=40d30cf39955c501201239c47… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Mar 12 12:58:31 2013 +0400 msxml3: Fix some test failures on Windows 8. --- dlls/msxml3/httprequest.c | 16 ++++++++-------- dlls/msxml3/tests/httpreq.c | 16 ++++++++-------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/dlls/msxml3/httprequest.c b/dlls/msxml3/httprequest.c index f9db1cd..c67177b 100644 --- a/dlls/msxml3/httprequest.c +++ b/dlls/msxml3/httprequest.c @@ -948,7 +948,8 @@ static HRESULT httprequest_getResponseHeader(httprequest *This, BSTR header, BST { struct httpheader *entry; - if (!header || !value) return E_INVALIDARG; + if (!header) return E_INVALIDARG; + if (!value) return E_POINTER; if (This->raw_respheaders && list_empty(&This->respheaders)) { @@ -982,7 +983,7 @@ static HRESULT httprequest_getResponseHeader(httprequest *This, BSTR header, BST static HRESULT httprequest_getAllResponseHeaders(httprequest *This, BSTR *respheaders) { - if (!respheaders) return E_INVALIDARG; + if (!respheaders) return E_POINTER; *respheaders = SysAllocString(This->raw_respheaders); @@ -1015,17 +1016,16 @@ static HRESULT httprequest_abort(httprequest *This) static HRESULT httprequest_get_status(httprequest *This, LONG *status) { - if (!status) return E_INVALIDARG; - if (This->state != READYSTATE_COMPLETE) return E_FAIL; + if (!status) return E_POINTER; *status = This->status; - return S_OK; + return This->state == READYSTATE_COMPLETE ? S_OK : E_FAIL; } static HRESULT httprequest_get_statusText(httprequest *This, BSTR *status) { - if (!status) return E_INVALIDARG; + if (!status) return E_POINTER; if (This->state != READYSTATE_COMPLETE) return E_FAIL; *status = SysAllocString(This->status_text); @@ -1038,7 +1038,7 @@ static HRESULT httprequest_get_responseText(httprequest *This, BSTR *body) HGLOBAL hglobal; HRESULT hr; - if (!body) return E_INVALIDARG; + if (!body) return E_POINTER; if (This->state != READYSTATE_COMPLETE) return E_FAIL; hr = GetHGlobalFromStream(This->bsc->stream, &hglobal); @@ -1184,7 +1184,7 @@ static HRESULT httprequest_get_responseStream(httprequest *This, VARIANT *body) static HRESULT httprequest_get_readyState(httprequest *This, LONG *state) { - if (!state) return E_INVALIDARG; + if (!state) return E_POINTER; *state = This->state; return S_OK; diff --git a/dlls/msxml3/tests/httpreq.c b/dlls/msxml3/tests/httpreq.c index 6744657..5c62772 100644 --- a/dlls/msxml3/tests/httpreq.c +++ b/dlls/msxml3/tests/httpreq.c @@ -1469,12 +1469,12 @@ static void test_XMLHTTP(void) /* initial status code */ hr = IXMLHttpRequest_get_status(xhr, NULL); - EXPECT_HR(hr, E_INVALIDARG); + ok(hr == E_POINTER || broken(hr == E_INVALIDARG) /* <win8 */, "got 0x%08x\n", hr); status = 0xdeadbeef; hr = IXMLHttpRequest_get_status(xhr, &status); ok(hr == E_FAIL || broken(hr == E_UNEXPECTED) /* win2k */, "got 0x%08x\n", hr); - ok(status == 0xdeadbeef, "got %d\n", status); + ok(status == READYSTATE_UNINITIALIZED || broken(status == 0xdeadbeef) /* <win8 */, "got %d\n", status); hr = IXMLHttpRequest_get_statusText(xhr, &str); ok(hr == E_FAIL, "got 0x%08x\n", hr); @@ -1497,7 +1497,7 @@ static void test_XMLHTTP(void) ok(hr == E_FAIL || broken(hr == E_UNEXPECTED) /* win2k */, "got 0x%08x\n", hr); hr = IXMLHttpRequest_get_readyState(xhr, NULL); - EXPECT_HR(hr, E_INVALIDARG); + ok(hr == E_POINTER || broken(hr == E_INVALIDARG) /* <win8 */, "got 0x%08x\n", hr); state = -1; hr = IXMLHttpRequest_get_readyState(xhr, &state); @@ -1523,7 +1523,7 @@ static void test_XMLHTTP(void) status = 0xdeadbeef; hr = IXMLHttpRequest_get_status(xhr, &status); ok(hr == E_FAIL || broken(hr == E_UNEXPECTED) /* win2k */, "got 0x%08x\n", hr); - ok(status == 0xdeadbeef, "got %d\n", status); + ok(status == READYSTATE_UNINITIALIZED || broken(status == 0xdeadbeef) /* <win8 */, "got %d\n", status); state = -1; hr = IXMLHttpRequest_get_readyState(xhr, &state); @@ -1564,7 +1564,7 @@ static void test_XMLHTTP(void) /* response headers */ hr = IXMLHttpRequest_getAllResponseHeaders(xhr, NULL); - EXPECT_HR(hr, E_INVALIDARG); + ok(hr == E_POINTER || broken(hr == E_INVALIDARG) /* <win8 */, "got 0x%08x\n", hr); hr = IXMLHttpRequest_getAllResponseHeaders(xhr, &str); EXPECT_HR(hr, S_OK); /* status line is stripped already */ @@ -1579,7 +1579,7 @@ static void test_XMLHTTP(void) hr = IXMLHttpRequest_getResponseHeader(xhr, NULL, NULL); EXPECT_HR(hr, E_INVALIDARG); hr = IXMLHttpRequest_getResponseHeader(xhr, _bstr_("Date"), NULL); - EXPECT_HR(hr, E_INVALIDARG); + ok(hr == E_POINTER || broken(hr == E_INVALIDARG) /* <win8 */, "got 0x%08x\n", hr); hr = IXMLHttpRequest_getResponseHeader(xhr, _bstr_("Date"), &str); EXPECT_HR(hr, S_OK); ok(*str != ' ', "got leading space in header %s\n", wine_dbgstr_w(str)); @@ -1592,7 +1592,7 @@ static void test_XMLHTTP(void) ok(status == 200, "got %d\n", status); hr = IXMLHttpRequest_get_statusText(xhr, NULL); - EXPECT_HR(hr, E_INVALIDARG); + ok(hr == E_POINTER || broken(hr == E_INVALIDARG) /* <win8 */, "got 0x%08x\n", hr); hr = IXMLHttpRequest_get_statusText(xhr, &str); EXPECT_HR(hr, S_OK); @@ -1640,7 +1640,7 @@ static void test_XMLHTTP(void) EXPECT_HR(hr, S_OK); hr = IXMLHttpRequest_get_responseText(xhr, NULL); - EXPECT_HR(hr, E_INVALIDARG); + ok(hr == E_POINTER || broken(hr == E_INVALIDARG) /* <win8 */, "got 0x%08x\n", hr); hr = IXMLHttpRequest_get_responseText(xhr, &bstrResponse); EXPECT_HR(hr, S_OK);

1 0

André Hentschel : winegcc: Remove SPARC support.
by Alexandre Julliard 11 Mar '13

11 Mar '13

Module: wine Branch: master Commit: ee7ffdcb53e6541a1000fdc92958a84f465714ca URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee7ffdcb53e6541a1000fdc92… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Mar 8 21:34:33 2013 +0100 winegcc: Remove SPARC support. --- tools/winegcc/utils.h | 2 +- tools/winegcc/winegcc.c | 3 --- 2 files changed, 1 insertions(+), 4 deletions(-) diff --git a/tools/winegcc/utils.h b/tools/winegcc/utils.h index a75b3cc..7d20c62 100644 --- a/tools/winegcc/utils.h +++ b/tools/winegcc/utils.h @@ -37,7 +37,7 @@ enum target_cpu { - CPU_x86, CPU_x86_64, CPU_SPARC, CPU_POWERPC, CPU_ARM, CPU_ARM64 + CPU_x86, CPU_x86_64, CPU_POWERPC, CPU_ARM, CPU_ARM64 }; enum target_platform diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index 7d528e0..06aa200 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -158,7 +158,6 @@ static const struct { "i786", CPU_x86 }, { "amd64", CPU_x86_64 }, { "x86_64", CPU_x86_64 }, - { "sparc", CPU_SPARC }, { "powerpc", CPU_POWERPC }, { "arm", CPU_ARM }, { "aarch64", CPU_ARM64 } @@ -218,8 +217,6 @@ struct options static const enum target_cpu build_cpu = CPU_x86; #elif defined(__x86_64__) static const enum target_cpu build_cpu = CPU_x86_64; -#elif defined(__sparc__) -static const enum target_cpu build_cpu = CPU_SPARC; #elif defined(__powerpc__) static const enum target_cpu build_cpu = CPU_POWERPC; #elif defined(__arm__)

1 0

André Hentschel : winebuild: Remove SPARC support.
by Alexandre Julliard 11 Mar '13

11 Mar '13

Module: wine Branch: master Commit: 0ee8e2b5b1f633d51cbcc55d46cfe968665b683e URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ee8e2b5b1f633d51cbcc55d4… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Mar 8 21:35:13 2013 +0100 winebuild: Remove SPARC support. --- tools/winebuild/build.h | 2 +- tools/winebuild/import.c | 34 ---------------------------------- tools/winebuild/main.c | 2 -- tools/winebuild/spec32.c | 11 +---------- tools/winebuild/utils.c | 4 ---- 5 files changed, 2 insertions(+), 51 deletions(-) diff --git a/tools/winebuild/build.h b/tools/winebuild/build.h index 359428f..fd56c8c 100644 --- a/tools/winebuild/build.h +++ b/tools/winebuild/build.h @@ -140,7 +140,7 @@ typedef struct enum target_cpu { - CPU_x86, CPU_x86_64, CPU_SPARC, CPU_POWERPC, CPU_ARM, CPU_ARM64, CPU_LAST = CPU_ARM64 + CPU_x86, CPU_x86_64, CPU_POWERPC, CPU_ARM, CPU_ARM64, CPU_LAST = CPU_ARM64 }; enum target_platform diff --git a/tools/winebuild/import.c b/tools/winebuild/import.c index 81325e9..fab4158 100644 --- a/tools/winebuild/import.c +++ b/tools/winebuild/import.c @@ -648,28 +648,6 @@ static void output_import_thunk( const char *name, const char *table, int pos ) case CPU_x86_64: output( "\tjmpq *%s+%d(%%rip)\n", table, pos ); break; - case CPU_SPARC: - if ( !UsePIC ) - { - output( "\tsethi %%hi(%s+%d), %%g1\n", table, pos ); - output( "\tld [%%g1+%%lo(%s+%d)], %%g1\n", table, pos ); - output( "\tjmp %%g1\n" ); - output( "\tnop\n" ); - } - else - { - /* Hmpf. Stupid sparc assembler always interprets global variable - names as GOT offsets, so we have to do it the long way ... */ - output( "\tsave %%sp, -96, %%sp\n" ); - output( "0:\tcall 1f\n" ); - output( "\tnop\n" ); - output( "1:\tsethi %%hi(%s+%d-0b), %%g1\n", table, pos ); - output( "\tor %%g1, %%lo(%s+%d-0b), %%g1\n", table, pos ); - output( "\tld [%%g1+%%o7], %%g1\n" ); - output( "\tjmp %%g1\n" ); - output( "\trestore\n" ); - } - break; case CPU_ARM: output( "\tldr IP,[PC,#0]\n"); output( "\tldr PC,[IP,#%d]\n", pos); @@ -987,13 +965,6 @@ static void output_delayed_import_thunks( const DLLSPEC *spec ) output_cfi( ".cfi_adjust_cfa_offset -88" ); output( "\tjmp *%%rax\n" ); break; - case CPU_SPARC: - output( "\tsave %%sp, -96, %%sp\n" ); - output( "\tcall %s\n", asm_name("__wine_spec_delay_load") ); - output( "\tmov %%g1, %%o0\n" ); - output( "\tjmp %%o0\n" ); - output( "\trestore\n" ); - break; case CPU_ARM: output( "\tstmfd SP!, {r4-r10,FP,LR}\n" ); output( "\tmov LR,PC\n"); @@ -1094,11 +1065,6 @@ static void output_delayed_import_thunks( const DLLSPEC *spec ) output( "\tmovq $%d,%%rax\n", (idx << 16) | j ); output( "\tjmp %s\n", asm_name("__wine_delay_load_asm") ); break; - case CPU_SPARC: - output( "\tset %d, %%g1\n", (idx << 16) | j ); - output( "\tb,a %s\n", asm_name("__wine_delay_load_asm") ); - output( "\tnop\n" ); - break; case CPU_ARM: output( "\tstmfd SP!, {r0-r3}\n" ); output( "\tmov r0, #%d\n", idx ); diff --git a/tools/winebuild/main.c b/tools/winebuild/main.c index 39dbe62..16b4165 100644 --- a/tools/winebuild/main.c +++ b/tools/winebuild/main.c @@ -52,8 +52,6 @@ int unwind_tables = 0; enum target_cpu target_cpu = CPU_x86; #elif defined(__x86_64__) enum target_cpu target_cpu = CPU_x86_64; -#elif defined(__sparc__) -enum target_cpu target_cpu = CPU_SPARC; #elif defined(__powerpc__) enum target_cpu target_cpu = CPU_POWERPC; #elif defined(__arm__) diff --git a/tools/winebuild/spec32.c b/tools/winebuild/spec32.c index f6c8cd2..ab69797 100644 --- a/tools/winebuild/spec32.c +++ b/tools/winebuild/spec32.c @@ -38,7 +38,6 @@ #define IMAGE_FILE_MACHINE_AMD64 0x8664 #define IMAGE_FILE_MACHINE_ARMNT 0x01C4 /* Wine extension */ -#define IMAGE_FILE_MACHINE_SPARC 0x2000 #define IMAGE_FILE_MACHINE_ARM64 0x01C5 #define IMAGE_SIZEOF_NT_OPTIONAL32_HEADER 224 @@ -439,11 +438,6 @@ static void output_asm_constructor( const char *constructor ) output( "\n\t.section \".init\",\"ax\"\n" ); output( "\tcall %s\n", asm_name(constructor) ); break; - case CPU_SPARC: - output( "\n\t.section \".init\",\"ax\"\n" ); - output( "\tcall %s\n", asm_name(constructor) ); - output( "\tnop\n" ); - break; case CPU_ARM: output( "\n\t.section \".text\",\"ax\"\n" ); output( "\tblx %s\n", asm_name(constructor) ); @@ -488,7 +482,6 @@ void output_module( DLLSPEC *spec ) { case CPU_x86: case CPU_x86_64: - case CPU_SPARC: output( "\n\t.section \".init\",\"ax\"\n" ); output( "\tjmp 1f\n" ); break; @@ -520,10 +513,9 @@ void output_module( DLLSPEC *spec ) { case CPU_x86: machine = IMAGE_FILE_MACHINE_I386; break; case CPU_x86_64: machine = IMAGE_FILE_MACHINE_AMD64; break; + case CPU_POWERPC: machine = IMAGE_FILE_MACHINE_POWERPC; break; case CPU_ARM: machine = IMAGE_FILE_MACHINE_ARMNT; break; case CPU_ARM64: machine = IMAGE_FILE_MACHINE_ARM64; break; - case CPU_POWERPC: machine = IMAGE_FILE_MACHINE_POWERPC; break; - case CPU_SPARC: machine = IMAGE_FILE_MACHINE_SPARC; break; } output( "\t%s 0x%04x\n", /* Machine */ get_asm_short_keyword(), machine ); @@ -709,7 +701,6 @@ void output_fake_module( DLLSPEC *spec ) case CPU_x86: put_word( IMAGE_FILE_MACHINE_I386 ); break; case CPU_x86_64: put_word( IMAGE_FILE_MACHINE_AMD64 ); break; case CPU_POWERPC: put_word( IMAGE_FILE_MACHINE_POWERPC ); break; - case CPU_SPARC: put_word( IMAGE_FILE_MACHINE_SPARC ); break; case CPU_ARM: put_word( IMAGE_FILE_MACHINE_ARMNT ); break; case CPU_ARM64: put_word( IMAGE_FILE_MACHINE_ARM64 ); break; } diff --git a/tools/winebuild/utils.c b/tools/winebuild/utils.c index bab2b85..44bd92d 100644 --- a/tools/winebuild/utils.c +++ b/tools/winebuild/utils.c @@ -56,7 +56,6 @@ static const struct { "i786", CPU_x86 }, { "amd64", CPU_x86_64 }, { "x86_64", CPU_x86_64 }, - { "sparc", CPU_SPARC }, { "powerpc", CPU_POWERPC }, { "arm", CPU_ARM }, { "arm64", CPU_ARM64 }, @@ -892,7 +891,6 @@ unsigned int get_alignment(unsigned int align) { case CPU_x86: case CPU_x86_64: - case CPU_SPARC: if (target_platform != PLATFORM_APPLE) return align; /* fall through */ case CPU_POWERPC: @@ -917,7 +915,6 @@ unsigned int get_page_size(void) case CPU_POWERPC: return 4096; case CPU_ARM: return 4096; case CPU_ARM64: return 4096; - case CPU_SPARC: return 8192; } /* unreached */ assert(0); @@ -931,7 +928,6 @@ unsigned int get_ptr_size(void) { case CPU_x86: case CPU_POWERPC: - case CPU_SPARC: case CPU_ARM: return 4; case CPU_x86_64:

1 0