June 2011 - Wine-Commits - list.winehq.org

Dylan Smith : d3dxof: Factor out duplicated code for parsing X file header.
by Alexandre Julliard June 9, 2011

June 9, 2011

Module: wine Branch: master Commit: 18740e862362e9558cfb7cfb25a13500d05538fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=18740e862362e9558cfb7cfb2… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Wed Jun 8 15:38:58 2011 -0400 d3dxof: Factor out duplicated code for parsing X file header. --- dlls/d3dxof/d3dxof.c | 236 +++++------------------------------------- dlls/d3dxof/d3dxof_private.h | 1 + dlls/d3dxof/parsing.c | 101 ++++++++++++++++++ 3 files changed, 129 insertions(+), 209 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=18740e862362e9558cfb7…

1 0

Rico Schüller : d3dx9: Implement ID3DXBaseEffect:: GetBoolArray().
by Alexandre Julliard June 9, 2011

June 9, 2011

Module: wine Branch: master Commit: 90154979a0d8573f6533f89816bf926e435fddf0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=90154979a0d8573f6533f8981… Author: Rico Schüller <kgbricola(a)web.de> Date: Thu Jun 9 07:38:45 2011 +0200 d3dx9: Implement ID3DXBaseEffect::GetBoolArray(). --- dlls/d3dx9_36/effect.c | 23 +++++++++++++++++++++-- 1 files changed, 21 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 137293c..bbe21f0 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -1614,10 +1614,29 @@ static HRESULT WINAPI ID3DXBaseEffectImpl_SetBoolArray(ID3DXBaseEffect *iface, D static HRESULT WINAPI ID3DXBaseEffectImpl_GetBoolArray(ID3DXBaseEffect *iface, D3DXHANDLE parameter, BOOL *b, UINT count) { struct ID3DXBaseEffectImpl *This = impl_from_ID3DXBaseEffect(iface); + struct d3dx_parameter *param = is_valid_parameter(This, parameter); - FIXME("iface %p, parameter %p, b %p, count %u stub\n", This, parameter, b, count); + TRACE("iface %p, parameter %p, b %p, count %u\n", This, parameter, b, count); - return E_NOTIMPL; + if (!param) param = get_parameter_by_name(This, NULL, parameter); + + if (b && param && (param->class == D3DXPC_SCALAR + || param->class == D3DXPC_VECTOR + || param->class == D3DXPC_MATRIX_ROWS + || param->class == D3DXPC_MATRIX_COLUMNS)) + { + UINT i, size = min(count, param->bytes / sizeof(DWORD)); + + for (i = 0; i < size; ++i) + { + b[i] = get_bool((DWORD *)param->data + i); + } + return D3D_OK; + } + + WARN("Invalid argument specified\n"); + + return D3DERR_INVALIDCALL; } static HRESULT WINAPI ID3DXBaseEffectImpl_SetInt(ID3DXBaseEffect *iface, D3DXHANDLE parameter, INT n)

1 0

Jacek Caban : urlmon: Correctly handle empty files.
by Alexandre Julliard June 9, 2011

June 9, 2011

Module: wine Branch: master Commit: 66917c61d6e61c97941ff0f1d09b3855fcb1fd9e URL: http://source.winehq.org/git/wine.git/?a=commit;h=66917c61d6e61c97941ff0f1d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jun 9 14:03:13 2011 +0200 urlmon: Correctly handle empty files. --- dlls/urlmon/protocol.c | 15 ++++++++++++++- 1 files changed, 14 insertions(+), 1 deletions(-) diff --git a/dlls/urlmon/protocol.c b/dlls/urlmon/protocol.c index 326564b..94801ae 100644 --- a/dlls/urlmon/protocol.c +++ b/dlls/urlmon/protocol.c @@ -286,6 +286,7 @@ HRESULT protocol_start(Protocol *protocol, IInternetProtocol *prot, IUri *uri, HRESULT protocol_continue(Protocol *protocol, PROTOCOLDATA *data) { + BOOL is_start; HRESULT hres; if (!data) { @@ -293,6 +294,8 @@ HRESULT protocol_continue(Protocol *protocol, PROTOCOLDATA *data) return S_OK; } + is_start = data->pData == (LPVOID)BINDSTATUS_DOWNLOADINGDATA; + if(!protocol->request) { WARN("Expected request to be non-NULL\n"); return S_OK; @@ -312,7 +315,7 @@ HRESULT protocol_continue(Protocol *protocol, PROTOCOLDATA *data) if(protocol->post_stream) return write_post_stream(protocol); - if(data->pData == (LPVOID)BINDSTATUS_DOWNLOADINGDATA) { + if(is_start) { hres = protocol->vtbl->start_downloading(protocol); if(FAILED(hres)) { protocol_close_connection(protocol); @@ -344,6 +347,16 @@ HRESULT protocol_continue(Protocol *protocol, PROTOCOLDATA *data) protocol->flags &= ~FLAG_REQUEST_COMPLETE; res = InternetQueryDataAvailable(protocol->request, &protocol->available_bytes, 0, 0); if(res) { + if(!protocol->available_bytes) { + if(is_start) { + TRACE("empty file\n"); + all_data_read(protocol); + }else { + WARN("unexpected end of file?\n"); + report_result(protocol, INET_E_DOWNLOAD_FAILURE); + } + return S_OK; + } protocol->flags |= FLAG_REQUEST_COMPLETE; report_data(protocol); }else if(GetLastError() != ERROR_IO_PENDING) {

1 0

Jacek Caban : urlmon: Added empty file binding test.
by Alexandre Julliard June 9, 2011

June 9, 2011

Module: wine Branch: master Commit: 224db0d3544cdf6bd978bad44fdb542e039eb351 URL: http://source.winehq.org/git/wine.git/?a=commit;h=224db0d3544cdf6bd978bad44… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jun 9 14:04:00 2011 +0200 urlmon: Added empty file binding test. --- dlls/urlmon/tests/protocol.c | 36 +++++++++++++++++++++++++++++------- 1 files changed, 29 insertions(+), 7 deletions(-) diff --git a/dlls/urlmon/tests/protocol.c b/dlls/urlmon/tests/protocol.c index 4ca6da1..b547ad8 100644 --- a/dlls/urlmon/tests/protocol.c +++ b/dlls/urlmon/tests/protocol.c @@ -152,6 +152,7 @@ static PROTOCOLDATA protocoldata, *pdata, continue_protdata; static DWORD prot_read, pi, filter_state, http_post_test, thread_id; static BOOL security_problem, test_async_req, impl_protex; static BOOL async_read_pending, mimefilter_test, direct_read, wait_for_switch, emulate_prot, short_read, test_abort; +static BOOL empty_file; enum { STATE_CONNECTING, @@ -593,7 +594,7 @@ static void call_continue(PROTOCOLDATA *protocol_data) case STATE_STARTDOWNLOADING: if(tested_protocol == HTTP_TEST || tested_protocol == HTTPS_TEST) { SET_EXPECT(OnResponse); - if(tested_protocol == HTTPS_TEST || test_redirect || test_abort) + if(tested_protocol == HTTPS_TEST || test_redirect || test_abort || empty_file) SET_EXPECT(ReportProgress_ACCEPTRANGES); SET_EXPECT(ReportProgress_MIMETYPEAVAILABLE); if(bindf & BINDF_NEEDFILE) @@ -624,9 +625,9 @@ static void call_continue(PROTOCOLDATA *protocol_data) state = STATE_DOWNLOADING; if(tested_protocol == HTTP_TEST || tested_protocol == HTTPS_TEST) { CHECK_CALLED(OnResponse); - if(tested_protocol == HTTPS_TEST) + if(tested_protocol == HTTPS_TEST || empty_file) CHECK_CALLED(ReportProgress_ACCEPTRANGES); - else if(test_redirect) + else if(test_redirect || test_abort) CLEAR_CALLED(ReportProgress_ACCEPTRANGES); CHECK_CALLED(ReportProgress_MIMETYPEAVAILABLE); if(bindf & BINDF_NEEDFILE) @@ -705,6 +706,8 @@ static HRESULT WINAPI ProtocolSink_ReportProgress(IInternetProtocolSink *iface, ok(lstrlenW(text_plain) <= lstrlenW(szStatusText) && !memcmp(szStatusText, text_plain, lstrlenW(text_plain)*sizeof(WCHAR)), "szStatusText != text/plain\n"); + else if(empty_file) + ok(!strcmp_wa(szStatusText, "application/javascript"), "szStatusText = %s\n", wine_dbgstr_w(szStatusText)); else if(!mimefilter_test) ok(lstrlenW(text_htmlW) <= lstrlenW(szStatusText) && !memcmp(szStatusText, text_htmlW, lstrlenW(text_htmlW)*sizeof(WCHAR)), @@ -755,7 +758,7 @@ static HRESULT WINAPI ProtocolSink_ReportProgress(IInternetProtocolSink *iface, CHECK_EXPECT(ReportProgress_VERIFIEDMIMETYPEAVAILABLE); ok(szStatusText != NULL, "szStatusText == NULL\n"); if(szStatusText) - ok(!lstrcmpW(szStatusText, text_htmlW), "szStatusText != text/html\n"); + ok(!strcmp_wa(szStatusText, "text/html"), "szStatusText != text/html\n"); break; case BINDSTATUS_PROTOCOLCLASSID: CHECK_EXPECT(ReportProgress_PROTOCOLCLASSID); @@ -896,14 +899,25 @@ static HRESULT WINAPI ProtocolSink_ReportData(IInternetProtocolSink *iface, DWOR } }else if(!binding_test && (tested_protocol == HTTP_TEST || tested_protocol == HTTPS_TEST || tested_protocol == FTP_TEST)) { - if(!(grfBSCF & BSCF_LASTDATANOTIFICATION) || (grfBSCF & BSCF_DATAFULLYAVAILABLE)) + if(empty_file) + CHECK_EXPECT2(ReportData); + else if(!(grfBSCF & BSCF_LASTDATANOTIFICATION) || (grfBSCF & BSCF_DATAFULLYAVAILABLE)) CHECK_EXPECT(ReportData); else if (http_post_test) ok(ulProgress == 13, "Read %u bytes instead of 13\n", ulProgress); - ok(ulProgress, "ulProgress == 0\n"); + if(empty_file) { + ok(!ulProgress, "ulProgress = %d\n", ulProgress); + ok(!ulProgressMax, "ulProgressMax = %d\n", ulProgressMax); + }else { + ok(ulProgress, "ulProgress == 0\n"); + } - if(first_data_notif) { + if(empty_file) { + ok(grfBSCF == (BSCF_FIRSTDATANOTIFICATION|BSCF_LASTDATANOTIFICATION), + "grcfBSCF = %08x\n", grfBSCF); + first_data_notif = FALSE; + }else if(first_data_notif) { ok(grfBSCF == BSCF_FIRSTDATANOTIFICATION || grfBSCF == (BSCF_LASTDATANOTIFICATION|BSCF_DATAFULLYAVAILABLE), "grcfBSCF = %08x\n", grfBSCF); @@ -2169,6 +2183,7 @@ static IClassFactory mimefilter_cf = { &MimeFilterCFVtbl }; #define TEST_ASYNCREQ 0x0200 #define TEST_USEIURI 0x0400 #define TEST_IMPLPROTEX 0x0800 +#define TEST_EMPTY 0x1000 static void register_filter(BOOL do_register) { @@ -2220,6 +2235,7 @@ static void init_test(int prot, DWORD flags) test_redirect = (flags & TEST_REDIRECT) != 0; test_abort = (flags & TEST_ABORT) != 0; impl_protex = (flags & TEST_IMPLPROTEX) != 0; + empty_file = (flags & TEST_EMPTY) != 0; register_filter(mimefilter_test); } @@ -2872,6 +2888,9 @@ static void test_http_protocol(void) static const WCHAR winetest_url[] = {'h','t','t','p',':','/','/','t','e','s','t','.','w','i','n','e','h','q','.','o','r','g','/', 't','e','s','t','s','/','d','a','t','a','.','p','h','p',0}; + static const WCHAR empty_url[] = + {'h','t','t','p',':','/','/','t','e','s','t','.','w','i','n','e','h','q','.','o','r','g','/', + 't','e','s','t','s','/','e','m','p','t','y','.','j','s',0}; trace("Testing http protocol (not from urlmon)...\n"); bindf = BINDF_ASYNCHRONOUS | BINDF_ASYNCSTORAGE | BINDF_PULLDATA; @@ -2900,6 +2919,9 @@ static void test_http_protocol(void) bindf = BINDF_ASYNCHRONOUS | BINDF_ASYNCSTORAGE | BINDF_PULLDATA | BINDF_FROMURLMON; test_http_protocol_url(redirect_url, HTTP_TEST, TEST_REDIRECT, TYMED_NULL); + trace("Testing http protocol empty file...\n"); + test_http_protocol_url(empty_url, HTTP_TEST, TEST_EMPTY, TYMED_NULL); + trace("Testing http protocol abort...\n"); test_http_protocol_url(winetest_url, HTTP_TEST, TEST_ABORT, TYMED_NULL);

1 0

Aric Stewart : usp10: Sinhala vowels are not fully decomposed. The Kombuva is simply split off.
by Alexandre Julliard June 9, 2011

June 9, 2011

Module: wine Branch: master Commit: 428d3b025e4049ba5d48fb804e06d6a1b3ecd7d2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=428d3b025e4049ba5d48fb804… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Jun 8 14:05:10 2011 -0500 usp10: Sinhala vowels are not fully decomposed. The Kombuva is simply split off. --- dlls/usp10/shape.c | 14 ++++++++------ 1 files changed, 8 insertions(+), 6 deletions(-) diff --git a/dlls/usp10/shape.c b/dlls/usp10/shape.c index 5d0c3d4..f64dbd7 100644 --- a/dlls/usp10/shape.c +++ b/dlls/usp10/shape.c @@ -1806,6 +1806,8 @@ static void DecomposeVowels(HDC hdc, WCHAR *pwOutChars, INT *pcChars, const Vowe if (pwOutChars[cWalk] == vowels[i].base) { ReplaceInsertChars(hdc, cWalk, pcChars, pwOutChars, vowels[i].parts); + if (vowels[i].parts[1]) cWalk++; + if (vowels[i].parts[2]) cWalk++; break; } } @@ -2007,7 +2009,7 @@ static int sinhala_lex(WCHAR c) case 0x0DD9: case 0x0DDB: return lex_Matra_pre; case 0x0DDA: - case 0x0DDC: return lex_Composed_Vowel; + case 0x0DDC: return lex_Matra_post; case 0x200D: return lex_ZWJ; case 0x200C: return lex_ZWNJ; case 0x00A0: return lex_NBSP; @@ -2018,17 +2020,17 @@ static int sinhala_lex(WCHAR c) else if (c>=0x0DD0 && c <=0x0DD1) return lex_Matra_post; else if (c>=0x0DD2 && c <=0x0DD3) return lex_Matra_above; else if (c>=0x0DD4 && c <=0x0DD6) return lex_Matra_below; - else if (c>=0x0DDD && c <=0x0DDE) return lex_Composed_Vowel; + else if (c>=0x0DDD && c <=0x0DDE) return lex_Matra_post; else if (c>=0x0DF2 && c <=0x0DF3) return lex_Matra_post; else return lex_Generic; } } static const VowelComponents Sinhala_vowels[] = { - {0x0DDA, {0x0DD9,0x0DCA,0x0}}, - {0x0DDC, {0x0DD9,0x0DCF,0x0}}, - {0x0DDD, {0x0DD9,0x0DCF,0x0DCA}}, - {0x0DDE, {0x0DD9,0x0DDF,0x0}}, + {0x0DDA, {0x0DD9,0x0DDA,0x0}}, + {0x0DDC, {0x0DD9,0x0DDC,0x0}}, + {0x0DDD, {0x0DD9,0x0DDD,0x0}}, + {0x0DDE, {0x0DD9,0x0DDE,0x0}}, {0x0000, {0x0000,0x0000,0x0}}}; static void ContextualShape_Sinhala(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *psa, WCHAR* pwcChars, INT cChars, WORD* pwOutGlyphs, INT* pcGlyphs, INT cMaxGlyphs, WORD *pwLogClust)

1 0

Rico Schüller : d3dx9: Implement ID3DXBaseEffect:: GetIntArray().
by Alexandre Julliard June 9, 2011

June 9, 2011

Module: wine Branch: master Commit: a93b40f0fc423c7a8157b4c78e54e4784da5b87f URL: http://source.winehq.org/git/wine.git/?a=commit;h=a93b40f0fc423c7a8157b4c78… Author: Rico Schüller <kgbricola(a)web.de> Date: Thu Jun 9 07:38:42 2011 +0200 d3dx9: Implement ID3DXBaseEffect::GetIntArray(). --- dlls/d3dx9_36/effect.c | 23 +++++++++++++++++++++-- 1 files changed, 21 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index ef5ad0b..137293c 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -1662,10 +1662,29 @@ static HRESULT WINAPI ID3DXBaseEffectImpl_SetIntArray(ID3DXBaseEffect *iface, D3 static HRESULT WINAPI ID3DXBaseEffectImpl_GetIntArray(ID3DXBaseEffect *iface, D3DXHANDLE parameter, INT *n, UINT count) { struct ID3DXBaseEffectImpl *This = impl_from_ID3DXBaseEffect(iface); + struct d3dx_parameter *param = is_valid_parameter(This, parameter); - FIXME("iface %p, parameter %p, n %p, count %u stub\n", This, parameter, n, count); + TRACE("iface %p, parameter %p, n %p, count %u\n", This, parameter, n, count); - return E_NOTIMPL; + if (!param) param = get_parameter_by_name(This, NULL, parameter); + + if (n && param && (param->class == D3DXPC_SCALAR + || param->class == D3DXPC_VECTOR + || param->class == D3DXPC_MATRIX_ROWS + || param->class == D3DXPC_MATRIX_COLUMNS)) + { + UINT i, size = min(count, param->bytes / sizeof(DWORD)); + + for (i = 0; i < size; ++i) + { + n[i] = get_int(param->type, (DWORD *)param->data + i); + } + return D3D_OK; + } + + WARN("Invalid argument specified\n"); + + return D3DERR_INVALIDCALL; } static HRESULT WINAPI ID3DXBaseEffectImpl_SetFloat(ID3DXBaseEffect *iface, D3DXHANDLE parameter, FLOAT f)

1 0

Dylan Smith : d3dxof: Factor out parse template loops into a function.
by Alexandre Julliard June 9, 2011

June 9, 2011

Module: wine Branch: master Commit: 80705f5a91cd7b9e2483fb8625c5b5323fe50334 URL: http://source.winehq.org/git/wine.git/?a=commit;h=80705f5a91cd7b9e2483fb862… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Wed Jun 8 15:39:05 2011 -0400 d3dxof: Factor out parse template loops into a function. --- dlls/d3dxof/d3dxof.c | 51 +++++++---------------------------------- dlls/d3dxof/d3dxof_private.h | 4 +-- dlls/d3dxof/parsing.c | 25 ++++++++++++++++++-- 3 files changed, 32 insertions(+), 48 deletions(-) diff --git a/dlls/d3dxof/d3dxof.c b/dlls/d3dxof/d3dxof.c index 031f780..b353020 100644 --- a/dlls/d3dxof/d3dxof.c +++ b/dlls/d3dxof/d3dxof.c @@ -225,20 +225,9 @@ static HRESULT WINAPI IDirectXFileImpl_CreateEnumObject(IDirectXFile* iface, LPV if (FAILED(hr)) goto error; - while (object->buf.rem_bytes && is_template_available(&object->buf)) - { - if (!parse_template(&object->buf)) - { - WARN("Template is not correct\n"); - hr = DXFILEERR_BADVALUE; - goto error; - } - else - { - TRACE("Template successfully parsed:\n"); - if (TRACE_ON(d3dxof)) - dump_template(This->xtemplates, &This->xtemplates[This->nb_xtemplates - 1]); - } + if (!parse_templates(&object->buf)) { + hr = DXFILEERR_BADVALUE; + goto error; } if (TRACE_ON(d3dxof)) @@ -299,20 +288,9 @@ static HRESULT WINAPI IDirectXFileImpl_RegisterTemplates(IDirectXFile* iface, LP if (FAILED(hr)) goto cleanup; - while (buf.rem_bytes && is_template_available(&buf)) - { - if (!parse_template(&buf)) - { - WARN("Template is not correct\n"); - hr = DXFILEERR_BADVALUE; - goto cleanup; - } - else - { - TRACE("Template successfully parsed:\n"); - if (TRACE_ON(d3dxof)) - dump_template(This->xtemplates, &This->xtemplates[This->nb_xtemplates - 1]); - } + if (!parse_templates(&buf)) { + hr = DXFILEERR_BADVALUE; + goto cleanup; } if (TRACE_ON(d3dxof)) @@ -970,20 +948,9 @@ static HRESULT WINAPI IDirectXFileEnumObjectImpl_GetNextDataObject(IDirectXFileE } /* Check if there are templates defined before the object */ - while (This->buf.rem_bytes && is_template_available(&This->buf)) - { - if (!parse_template(&This->buf)) - { - WARN("Template is not correct\n"); - hr = DXFILEERR_BADVALUE; - goto error; - } - else - { - TRACE("Template successfully parsed:\n"); - if (TRACE_ON(d3dxof)) - dump_template(This->pDirectXFile->xtemplates, &This->pDirectXFile->xtemplates[This->pDirectXFile->nb_xtemplates - 1]); - } + if (!parse_templates(&This->buf)) { + hr = DXFILEERR_BADVALUE; + goto error; } if (!This->buf.rem_bytes) diff --git a/dlls/d3dxof/d3dxof_private.h b/dlls/d3dxof/d3dxof_private.h index 15dca52..40870ac 100644 --- a/dlls/d3dxof/d3dxof_private.h +++ b/dlls/d3dxof/d3dxof_private.h @@ -164,10 +164,8 @@ HRESULT IDirectXFileImpl_Create(IUnknown *pUnkOuter, LPVOID *ppObj) DECLSPEC_HID BOOL read_bytes(parse_buffer * buf, LPVOID data, DWORD size) DECLSPEC_HIDDEN; HRESULT parse_header(parse_buffer *buf, BYTE **decomp_buffer_ptr) DECLSPEC_HIDDEN; -BOOL parse_template(parse_buffer * buf) DECLSPEC_HIDDEN; -void dump_template(xtemplate* templates_array, xtemplate* ptemplate) DECLSPEC_HIDDEN; -BOOL is_template_available(parse_buffer * buf) DECLSPEC_HIDDEN; BOOL parse_object(parse_buffer * buf) DECLSPEC_HIDDEN; +BOOL parse_templates(parse_buffer * buf) DECLSPEC_HIDDEN; int mszip_decompress(int inlen, int outlen, char* inbuffer, char* outbuffer) DECLSPEC_HIDDEN; diff --git a/dlls/d3dxof/parsing.c b/dlls/d3dxof/parsing.c index 7682dfe..4d72219 100644 --- a/dlls/d3dxof/parsing.c +++ b/dlls/d3dxof/parsing.c @@ -125,7 +125,7 @@ static const char* get_primitive_string(WORD token) return NULL; } -void dump_template(xtemplate* templates_array, xtemplate* ptemplate) +static void dump_template(xtemplate* templates_array, xtemplate* ptemplate) { int j, k; GUID* clsid; @@ -858,7 +858,7 @@ static WORD check_TOKEN(parse_buffer * buf) return buf->current_token; } -BOOL is_template_available(parse_buffer * buf) +static BOOL is_template_available(parse_buffer * buf) { return check_TOKEN(buf) == TOKEN_TEMPLATE; } @@ -1076,7 +1076,7 @@ static void go_to_next_definition(parse_buffer * buf) } } -BOOL parse_template(parse_buffer * buf) +static BOOL parse_template(parse_buffer * buf) { if (get_TOKEN(buf) != TOKEN_TEMPLATE) return FALSE; @@ -1104,6 +1104,25 @@ BOOL parse_template(parse_buffer * buf) return TRUE; } +BOOL parse_templates(parse_buffer * buf) +{ + while (buf->rem_bytes && is_template_available(buf)) + { + if (!parse_template(buf)) + { + WARN("Template is not correct\n"); + return FALSE; + } + else + { + TRACE("Template successfully parsed:\n"); + if (TRACE_ON(d3dxof_parsing)) + dump_template(buf->pdxf->xtemplates, &buf->pdxf->xtemplates[buf->pdxf->nb_xtemplates - 1]); + } + } + return TRUE; +} + static BOOL check_buffer(parse_buffer * buf, ULONG size) { if ((buf->cur_pos_data + size) > buf->capacity)

1 0

Alexandre Julliard : widl: Add a helper function for generating a stub that uses NdrClientCall.
by Alexandre Julliard June 9, 2011

June 9, 2011

Module: wine Branch: master Commit: 9f99d74a2037524ae8502de071564da3396eb3ab URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f99d74a2037524ae8502de07… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 9 10:12:48 2011 +0200 widl: Add a helper function for generating a stub that uses NdrClientCall. --- tools/widl/client.c | 32 +------------------------------- tools/widl/proxy.c | 26 +------------------------- tools/widl/typegen.c | 42 ++++++++++++++++++++++++++++++++++++++++++ tools/widl/typegen.h | 2 ++ 4 files changed, 46 insertions(+), 56 deletions(-) diff --git a/tools/widl/client.c b/tools/widl/client.c index 0ea8cbc..30f24b3 100644 --- a/tools/widl/client.c +++ b/tools/widl/client.c @@ -97,43 +97,13 @@ static void write_function_stub( const type_t *iface, const var_t *func, unsigned char explicit_fc, implicit_fc; int has_full_pointer = is_full_pointer_function(func); type_t *rettype = type_function_get_rettype(func->type); - const var_list_t *args = type_get_function_args(func->type); const var_t *handle_var = get_func_handle_var( iface, func, &explicit_fc, &implicit_fc ); int has_ret = !is_void(rettype); if (is_interpreted_func( iface, func )) { write_client_func_decl( iface, func ); - fprintf(client, "{\n"); - indent++; - if (has_ret) print_client( "%s", "CLIENT_CALL_RETURN _RetVal;\n\n" ); - print_client( "%s%s( &%s_StubDesc, &__MIDL_ProcFormatString.Format[%u]", - has_ret ? "_RetVal = " : "", - get_stub_mode() == MODE_Oif ? "NdrClientCall2" : "NdrClientCall", - iface->name, proc_offset ); - if (args) - { - const var_t *arg; - if (pointer_size == 8) - { - LIST_FOR_EACH_ENTRY( arg, args, const var_t, entry ) - fprintf( client, ",\n%*s%s", 4 * indent + 16, "", arg->name ); - } - else - { - arg = LIST_ENTRY( list_head(args), const var_t, entry ); - fprintf( client, ", &%s", arg->name ); - } - } - fprintf( client, " );\n" ); - if (has_ret) - { - print_client( "return (" ); - write_type_decl_left(client, rettype); - fprintf( client, ")*(LONG_PTR *)&_RetVal;\n" ); - } - indent--; - print_client( "}\n\n"); + write_client_call_routine( client, iface, func, iface->name, proc_offset ); return; } diff --git a/tools/widl/proxy.c b/tools/widl/proxy.c index 549bfaa..0043e6a 100644 --- a/tools/widl/proxy.c +++ b/tools/widl/proxy.c @@ -266,31 +266,7 @@ static void gen_proxy(type_t *iface, const var_t *func, int idx, print_proxy( " %s %s_%s_Proxy(\n", callconv, iface->name, get_name(func)); write_args(proxy, args, iface->name, 1, TRUE); print_proxy( ")\n"); - print_proxy( "{\n"); - indent++; - if (has_ret) print_proxy( "%s", "CLIENT_CALL_RETURN _RetVal;\n\n" ); - print_proxy( "%s%s( &Object_StubDesc, &__MIDL_ProcFormatString.Format[%u],", - has_ret ? "_RetVal = " : "", - get_stub_mode() == MODE_Oif ? "NdrClientCall2" : "NdrClientCall", - proc_offset ); - if (pointer_size == 8) - { - const var_t *arg; - fprintf( proxy, "\n%*sThis", 4 * indent + 16, "" ); - if (args) - LIST_FOR_EACH_ENTRY( arg, args, const var_t, entry ) - fprintf( proxy, ",\n%*s%s", 4 * indent + 16, "", arg->name ); - } - else fprintf( proxy, " &This" ); - fprintf( proxy, " );\n" ); - if (has_ret) - { - print_proxy( "return (" ); - write_type_decl_left(proxy, rettype); - fprintf( proxy, ")*(LONG_PTR *)&_RetVal;\n" ); - } - indent--; - print_proxy( "}\n\n"); + write_client_call_routine( proxy, iface, func, "Object", proc_offset ); return; } print_proxy( "static void __finally_%s_%s_Proxy( struct __proxy_frame *__frame )\n", diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 59de872..abe84d9 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -4806,6 +4806,48 @@ error: error("Invalid endpoint syntax '%s'\n", endpoint->str); } +void write_client_call_routine( FILE *file, const type_t *iface, const var_t *func, + const char *prefix, unsigned int proc_offset ) +{ + type_t *rettype = type_function_get_rettype( func->type ); + int has_ret = !is_void( rettype ); + const var_list_t *args = type_get_function_args( func->type ); + const var_t *arg; + int len; + + print_file( file, 0, "{\n"); + if (has_ret) print_file( file, 1, "%s", "CLIENT_CALL_RETURN _RetVal;\n\n" ); + len = fprintf( file, " %s%s( ", + has_ret ? "_RetVal = " : "", + get_stub_mode() == MODE_Oif ? "NdrClientCall2" : "NdrClientCall" ); + fprintf( file, "&%s_StubDesc,", prefix ); + fprintf( file, "\n%*s&__MIDL_ProcFormatString.Format[%u]", len, "", proc_offset ); + if (pointer_size == 8) + { + if (is_object( iface )) fprintf( file, ",\n%*sThis", len, "" ); + if (args) + LIST_FOR_EACH_ENTRY( arg, args, const var_t, entry ) + fprintf( file, ",\n%*s%s", len, "", arg->name ); + } + else + { + if (is_object( iface )) fprintf( file, ",\n%*s&This", len, "" ); + else if (args) + { + arg = LIST_ENTRY( list_head(args), const var_t, entry ); + fprintf( file, ",\n%*s&%s", len, "", arg->name ); + } + } + fprintf( file, " );\n" ); + if (has_ret) + { + print_file( file, 1, "return (" ); + write_type_decl_left(file, rettype); + fprintf( file, ")%s;\n", pointer_size == 8 ? "_RetVal.Simple" : "*(LONG_PTR *)&_RetVal" ); + } + print_file( file, 0, "}\n\n"); +} + void write_exceptions( FILE *file ) { fprintf( file, "#ifndef USE_COMPILER_EXCEPTIONS\n"); diff --git a/tools/widl/typegen.h b/tools/widl/typegen.h index 7f3aed1..6c7242e 100644 --- a/tools/widl/typegen.h +++ b/tools/widl/typegen.h @@ -80,6 +80,8 @@ int write_expr_eval_routines(FILE *file, const char *iface); void write_expr_eval_routine_list(FILE *file, const char *iface); void write_user_quad_list(FILE *file); void write_endpoints( FILE *f, const char *prefix, const str_list_t *list ); +void write_client_call_routine( FILE *file, const type_t *iface, const var_t *func, + const char *prefix, unsigned int proc_offset ); void write_exceptions( FILE *file ); unsigned int type_memsize(const type_t *t); int decl_indirect(const type_t *t);

1 0

Alexandre Julliard : widl: Pass a structure containing the parameters to NdrClientCall instead of accessing the stack .
by Alexandre Julliard June 9, 2011

June 9, 2011

Module: wine Branch: master Commit: 59171bd9f5ae3b8a32d9b2c62635ad0eb14b0dfd URL: http://source.winehq.org/git/wine.git/?a=commit;h=59171bd9f5ae3b8a32d9b2c62… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 9 11:42:21 2011 +0200 widl: Pass a structure containing the parameters to NdrClientCall instead of accessing the stack. --- tools/widl/proxy.c | 3 ++- tools/widl/typegen.c | 41 ++++++++++++++++++++++++++++++++--------- tools/widl/typegen.h | 3 ++- 3 files changed, 36 insertions(+), 11 deletions(-) diff --git a/tools/widl/proxy.c b/tools/widl/proxy.c index 0043e6a..7bc7753 100644 --- a/tools/widl/proxy.c +++ b/tools/widl/proxy.c @@ -502,7 +502,8 @@ static void gen_stub_thunk( type_t *iface, const var_t *func, unsigned int proc_ iface->name, get_name(func) ); print_proxy( "{\n"); indent++; - write_func_param_struct( proxy, iface, func->type, "pParamStruct" ); + write_func_param_struct( proxy, iface, func->type, + "*pParamStruct = (struct _PARAM_STRUCT *)pStubMsg->StackTop", has_ret ); print_proxy( "%s%s_%s_Stub( pParamStruct->This", has_ret ? "pParamStruct->_RetVal = " : "", iface->name, callas->name ); indent++; diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index abe84d9..04e014a 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -4661,8 +4661,10 @@ void assign_stub_out_args( FILE *file, int indent, const var_t *func, const char } -void write_func_param_struct( FILE *file, const type_t *iface, const type_t *func, const char *var_name ) +void write_func_param_struct( FILE *file, const type_t *iface, const type_t *func, + const char *var_decl, int add_retval ) { + type_t *rettype = type_function_get_rettype( func ); const var_list_t *args = type_get_function_args( func ); const var_t *arg; @@ -4682,13 +4684,16 @@ void write_func_param_struct( FILE *file, const type_t *iface, const type_t *fun else fprintf( file, "%s DECLSPEC_ALIGN(%u);\n", arg->name, pointer_size ); } - if (!is_void( type_function_get_rettype( func ))) + if (add_retval && !is_void( rettype )) { print_file(file, 2, "%s", ""); - write_type_decl( file, type_function_get_rettype( func ), "_RetVal" ); - fprintf( file, ";\n" ); + write_type_decl( file, rettype, "_RetVal" ); + if (is_array( rettype ) || is_ptr( rettype ) || type_memsize( rettype ) == pointer_size) + fprintf( file, ";\n" ); + else + fprintf( file, " DECLSPEC_ALIGN(%u);\n", pointer_size ); } - print_file(file, 1, "} *%s = (struct _PARAM_STRUCT *)pStubMsg->StackTop;\n\n", var_name ); + print_file(file, 1, "} %s;\n\n", var_decl ); } int write_expr_eval_routines(FILE *file, const char *iface) @@ -4709,7 +4714,8 @@ int write_expr_eval_routines(FILE *file, const char *iface) print_file(file, 0, "{\n"); if (type_get_type( eval->cont_type ) == TYPE_FUNCTION) { - write_func_param_struct( file, eval->iface, eval->cont_type, "pS" ); + write_func_param_struct( file, eval->iface, eval->cont_type, + "*pS = (struct _PARAM_STRUCT *)pStubMsg->StackTop", FALSE ); } else { @@ -4813,16 +4819,33 @@ void write_client_call_routine( FILE *file, const type_t *iface, const var_t *fu int has_ret = !is_void( rettype ); const var_list_t *args = type_get_function_args( func->type ); const var_t *arg; - int len; + int len, needs_params = 0; + + /* we need a param structure if we have more than one arg */ + if (pointer_size == 4 && args) needs_params = is_object( iface ) || list_count( args ) > 1; print_file( file, 0, "{\n"); - if (has_ret) print_file( file, 1, "%s", "CLIENT_CALL_RETURN _RetVal;\n\n" ); + if (needs_params) + { + if (has_ret) print_file( file, 1, "%s", "CLIENT_CALL_RETURN _RetVal;\n" ); + write_func_param_struct( file, iface, func->type, "__params", FALSE ); + if (is_object( iface )) print_file( file, 1, "__params.This = This;\n" ); + if (args) + LIST_FOR_EACH_ENTRY( arg, args, const var_t, entry ) + print_file( file, 1, "__params.%s = %s;\n", arg->name, arg->name ); + } + else if (has_ret) print_file( file, 1, "%s", "CLIENT_CALL_RETURN _RetVal;\n\n" ); + len = fprintf( file, " %s%s( ", has_ret ? "_RetVal = " : "", get_stub_mode() == MODE_Oif ? "NdrClientCall2" : "NdrClientCall" ); fprintf( file, "&%s_StubDesc,", prefix ); fprintf( file, "\n%*s&__MIDL_ProcFormatString.Format[%u]", len, "", proc_offset ); - if (pointer_size == 8) + if (needs_params) + { + fprintf( file, ",\n%*s&__params", len, "" ); + } + else if (pointer_size == 8) { if (is_object( iface )) fprintf( file, ",\n%*sThis", len, "" ); if (args) diff --git a/tools/widl/typegen.h b/tools/widl/typegen.h index 6c7242e..3efd421 100644 --- a/tools/widl/typegen.h +++ b/tools/widl/typegen.h @@ -75,7 +75,8 @@ unsigned int get_size_procformatstring(const statement_list_t *stmts, type_pred_ unsigned int get_size_typeformatstring(const statement_list_t *stmts, type_pred_t pred); void assign_stub_out_args( FILE *file, int indent, const var_t *func, const char *local_var_prefix ); void declare_stub_args( FILE *file, int indent, const var_t *func ); -void write_func_param_struct( FILE *file, const type_t *iface, const type_t *func, const char *var_name ); +void write_func_param_struct( FILE *file, const type_t *iface, const type_t *func, + const char *var_decl, int add_retval ); int write_expr_eval_routines(FILE *file, const char *iface); void write_expr_eval_routine_list(FILE *file, const char *iface); void write_user_quad_list(FILE *file);

1 0

Alexandre Julliard : rpcrt4/tests: Add a few more marshalling tests.
by Alexandre Julliard June 9, 2011

June 9, 2011

Module: wine Branch: master Commit: 3c5688a80d9798a52bcbe73594104c2b533ba486 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c5688a80d9798a52bcbe7359… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 9 12:07:18 2011 +0200 rpcrt4/tests: Add a few more marshalling tests. --- dlls/rpcrt4/tests/server.c | 53 +++++++++++++++++++++++++++++++++++++++++- dlls/rpcrt4/tests/server.idl | 9 +++++- 2 files changed, 59 insertions(+), 3 deletions(-) diff --git a/dlls/rpcrt4/tests/server.c b/dlls/rpcrt4/tests/server.c index 1764718..f959d9d 100644 --- a/dlls/rpcrt4/tests/server.c +++ b/dlls/rpcrt4/tests/server.c @@ -106,6 +106,41 @@ s_sum(int x, int y) return x + y; } +signed char s_sum_char(signed char x, signed char y) +{ + return x + y; +} + +short s_sum_short(short x, short y) +{ + return x + y; +} + +int s_sum_float(float x, float y) +{ + return x + y; +} + +int s_sum_double_int(int x, double y) +{ + return x + y; +} + +hyper s_sum_hyper(hyper x, hyper y) +{ + return x + y; +} + +int s_sum_hyper_int(hyper x, hyper y) +{ + return x + y; +} + +int s_sum_char_hyper(signed char x, hyper y) +{ + return x + y; +} + void s_square_out(int x, int *y) { @@ -825,6 +860,7 @@ basic_tests(void) short h; char c; int x; + hyper y; str_struct_t ss = {string}; wstr_struct_t ws = {wstring}; str_t str; @@ -834,7 +870,22 @@ basic_tests(void) ok(int_return() == INT_CODE, "RPC int_return\n"); ok(square(7) == 49, "RPC square\n"); - ok(sum(23, -4) == 19, "RPC sum\n"); + x = sum(23, -4); + ok(x == 19, "RPC sum got %d\n", x); + c = sum_char(-23, 50); + ok(c == 27, "RPC sum_char got %d\n", (int)c); + h = sum_short(1122, -344); + ok(h == 778, "RPC sum_short got %d\n", (int)h); + x = sum_float(123.45, -32.2); + ok(x == 91, "RPC sum_float got %d\n", x); + x = sum_double_int(-78, 148.46); + ok(x == 70, "RPC sum_double_int got %d\n", x); + y = sum_hyper((hyper)0x12345678 << 16, (hyper)0x33557799 << 16); + ok(y == (hyper)0x4589ce11 << 16, "RPC hyper got %x%08x\n", (DWORD)(y >> 32), (DWORD)y); + x = sum_hyper_int((hyper)0x24242424 << 16, -((hyper)0x24241212 << 16)); + ok(x == 0x12120000, "RPC hyper_int got 0x%x\n", x); + x = sum_char_hyper( 12, ((hyper)0x42424242 << 32) | 0x33334444 ); + ok(x == 0x33334450, "RPC char_hyper got 0x%x\n", x); x = 0; square_out(11, &x); diff --git a/dlls/rpcrt4/tests/server.idl b/dlls/rpcrt4/tests/server.idl index 56bf1a5..3be3f33 100644 --- a/dlls/rpcrt4/tests/server.idl +++ b/dlls/rpcrt4/tests/server.idl @@ -31,9 +31,7 @@ typedef int fnprintf(const char *format, ...); [ uuid(00000000-4114-0704-2301-000000000000), -#ifndef __midl implicit_handle(handle_t IServer_IfHandle) -#endif ] interface IServer { @@ -81,6 +79,13 @@ cpp_quote("#endif") int int_return(void); int square(int x); int sum(int x, int y); + signed char sum_char(signed char x, signed char y); + short sum_short(short x, short y); + int sum_float(float x, float y); + int sum_double_int(int x, double y); + hyper sum_hyper(hyper x, hyper y); + int sum_hyper_int(hyper x, hyper y); + int sum_char_hyper(signed char x, hyper y); void square_out(int x, [out] int *y); void square_ref([in, out] int *x); int str_length([string] const char *s);

1 0