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

Andrew Talbot : krnl386.exe16: Constify a variable.
by Alexandre Julliard 01 Apr '13

01 Apr '13

Module: wine Branch: master Commit: 08254df3168e376394f137c79414d6419e827d95 URL: http://source.winehq.org/git/wine.git/?a=commit;h=08254df3168e376394f137c79… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat Mar 30 22:41:53 2013 +0000 krnl386.exe16: Constify a variable. --- dlls/krnl386.exe16/dosexe.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/krnl386.exe16/dosexe.c b/dlls/krnl386.exe16/dosexe.c index 9797c86..ff96554 100644 --- a/dlls/krnl386.exe16/dosexe.c +++ b/dlls/krnl386.exe16/dosexe.c @@ -238,7 +238,7 @@ static BOOL MZ_DoLoadImage( HANDLE hFile, LPCSTR filename, OverlayBlock *oblk, W if ( !ReadFile(hFile,&mz_header,sizeof(mz_header),&len,NULL) || len != sizeof(mz_header) || mz_header.e_magic != IMAGE_DOS_SIGNATURE) { - char *p = strrchr( filename, '.' ); + const char *p = strrchr( filename, '.' ); if (!p || strcasecmp( p, ".com" )) /* check for .COM extension */ { SetLastError(ERROR_BAD_FORMAT);

1 0

Jacek Caban : mshtml: Fixed builtin getter call with arguments.
by Alexandre Julliard 01 Apr '13

01 Apr '13

Module: wine Branch: master Commit: 8c0c09e4c707b41b4e5fd5492adfae41d577f7c5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c0c09e4c707b41b4e5fd5492… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Apr 1 11:50:29 2013 +0200 mshtml: Fixed builtin getter call with arguments. --- dlls/mshtml/dispex.c | 4 ++-- dlls/mshtml/tests/jstest.html | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/dispex.c b/dlls/mshtml/dispex.c index 38d9df4..d70ae2d 100644 --- a/dlls/mshtml/dispex.c +++ b/dlls/mshtml/dispex.c @@ -1216,7 +1216,7 @@ static HRESULT invoke_builtin_prop(DispatchEx *This, DISPID id, LCID lcid, WORD if(FAILED(hres)) return hres; - if(flags != (DISPATCH_PROPERTYGET|DISPATCH_METHOD)) { + if(flags != (DISPATCH_PROPERTYGET|DISPATCH_METHOD) || dp->cArgs) { if(V_VT(&v) != VT_DISPATCH) { FIXME("Not a function %s\n", debugstr_variant(&v)); VariantClear(&v); @@ -1228,7 +1228,7 @@ static HRESULT invoke_builtin_prop(DispatchEx *This, DISPID id, LCID lcid, WORD }else if(res) { *res = v; }else { - IDispatch_Release(V_DISPATCH(&v)); + VariantClear(&v); } } } diff --git a/dlls/mshtml/tests/jstest.html b/dlls/mshtml/tests/jstest.html index ebf2861..4185112 100644 --- a/dlls/mshtml/tests/jstest.html +++ b/dlls/mshtml/tests/jstest.html @@ -137,6 +137,8 @@ function test_getter_call() { e.onmousedown = function(x) { this.onmousedown_called = x; }; e.onmousedown("test"); ok(e.onmousedown_called === "test", "e.onmousedown_called = " + e.onmousedown_called); + + ok(document.all("divid").tagName === "DIV", "document.all('divid').tagName = " + document.all("divid").tagName); } function test_arg_conv() {

1 0

Dmitry Timoshkov : wineps.drv: Add support for TrueType composite glyph transforms.
by Alexandre Julliard 01 Apr '13

01 Apr '13

Module: wine Branch: master Commit: a0b4ce601730a43f67de149fd9c66464a6f9ad1e URL: http://source.winehq.org/git/wine.git/?a=commit;h=a0b4ce601730a43f67de149fd… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Apr 1 19:47:01 2013 +0900 wineps.drv: Add support for TrueType composite glyph transforms. --- dlls/wineps.drv/type1.c | 33 ++++++++++++++++++++------------- 1 files changed, 20 insertions(+), 13 deletions(-) diff --git a/dlls/wineps.drv/type1.c b/dlls/wineps.drv/type1.c index 01c9c7e..6855019 100644 --- a/dlls/wineps.drv/type1.c +++ b/dlls/wineps.drv/type1.c @@ -423,7 +423,7 @@ static BOOL append_complex_glyph(HDC hdc, const BYTE *data, glyph_outline *outli const BYTE *ptr = data; WORD flags, index; short arg1, arg2; - WORD scale_xx = 1 << 14, scale_xy = 0, scale_yx = 0, scale_yy = 1 << 14; + FLOAT scale_xx = 1, scale_xy = 0, scale_yx = 0, scale_yy = 1; WORD start_pt, end_pt; ptr += 10; @@ -447,37 +447,44 @@ static BOOL append_complex_glyph(HDC hdc, const BYTE *data, glyph_outline *outli } if(flags & WE_HAVE_A_SCALE) { - scale_xx = scale_yy = get_be_word(ptr); + scale_xx = scale_yy = (FLOAT)(short)get_be_word(ptr) / 0x4000; ptr += 2; } else if(flags & WE_HAVE_AN_X_AND_Y_SCALE) { - scale_xx = get_be_word(ptr); + scale_xx = (FLOAT)(short)get_be_word(ptr) / 0x4000; ptr += 2; - scale_yy = get_be_word(ptr); + scale_yy = (FLOAT)(short)get_be_word(ptr) / 0x4000; ptr += 2; } else if(flags & WE_HAVE_A_TWO_BY_TWO) { - scale_xx = get_be_word(ptr); + scale_xx = (FLOAT)(short)get_be_word(ptr) / 0x4000; ptr += 2; - scale_xy = get_be_word(ptr); + scale_xy = (FLOAT)(short)get_be_word(ptr) / 0x4000; ptr += 2; - scale_yx = get_be_word(ptr); + scale_yx = (FLOAT)(short)get_be_word(ptr) / 0x4000; ptr += 2; - scale_yy = get_be_word(ptr); + scale_yy = (FLOAT)(short)get_be_word(ptr) / 0x4000; ptr += 2; } - if ((flags & (WE_HAVE_A_SCALE | WE_HAVE_AN_X_AND_Y_SCALE | WE_HAVE_A_TWO_BY_TWO)) && - (scale_xx != 1 << 14 || scale_yy != 1 << 14 || scale_xy || scale_yx)) - FIXME( "unhandled scaling %x,%x,%x,%x of glyph %x\n", - scale_xx, scale_xy, scale_yx, scale_yy, index ); - start_pt = pts_in_outline(outline); append_glyph_outline(hdc, index, outline); end_pt = pts_in_outline(outline); + if (flags & (WE_HAVE_A_SCALE | WE_HAVE_AN_X_AND_Y_SCALE | WE_HAVE_A_TWO_BY_TWO)) + { + WORD i; + TRACE("transform %f,%f,%f,%f of glyph %x\n", scale_xx, scale_xy, scale_yx, scale_yy, index); + for (i = start_pt; i < end_pt; i++) + { + LONG x = outline->pts[i].x, y = outline->pts[i].y; + outline->pts[i].x = x * scale_xx + y * scale_yx; + outline->pts[i].y = x * scale_xy + y * scale_yy; + } + } + if((flags & ARGS_ARE_XY_VALUES) == 0) { WORD orig_pt = arg1, new_pt = arg2;

1 0

Michael Stefaniuc : dplayx: Remove AddRef hacks for the parent DirectPlay object.
by Alexandre Julliard 01 Apr '13

01 Apr '13

Module: wine Branch: master Commit: 6f370dff7f598a0ae9c0f1ca8f0a7b704243bf1e URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f370dff7f598a0ae9c0f1ca8… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Mar 29 16:47:39 2013 +0100 dplayx: Remove AddRef hacks for the parent DirectPlay object. --- dlls/dplayx/dplaysp.c | 23 ----------------------- dlls/dplayx/lobbysp.c | 16 ---------------- dlls/dplayx/tests/dplayx.c | 4 ++-- 3 files changed, 2 insertions(+), 41 deletions(-) diff --git a/dlls/dplayx/dplaysp.c b/dlls/dplayx/dplaysp.c index bd3e2c1..9ce6910 100644 --- a/dlls/dplayx/dplaysp.c +++ b/dlls/dplayx/dplaysp.c @@ -173,21 +173,6 @@ static BOOL DPSP_CreateDirectPlaySP( LPVOID lpSP, IDirectPlay2Impl* dp ) This->sp->dplay = dp; - /* Normally we should be keeping a reference, but since only the dplay - * interface that created us can destroy us, we do not keep a reference - * to it (ie we'd be stuck with always having one reference to the dplay - * object, and hence us, around). - * NOTE: The dp object does reference count us. - * - * FIXME: This is a kludge to get around a problem where a queryinterface - * is used to get a new interface and then is closed. We will then - * reference garbage. However, with this we will never deallocate - * the interface we store. The correct fix is to require all - * DP internal interfaces to use the This->dp2 interface which - * should be changed to This->dp - */ - IDirectPlayX_AddRef( (LPDIRECTPLAY2)dp ); - return TRUE; } @@ -195,14 +180,6 @@ static BOOL DPSP_DestroyDirectPlaySP( LPVOID lpSP ) { IDirectPlaySPImpl *This = lpSP; - /* Normally we should be keeping a reference, but since only the dplay - * interface that created us can destroy us, we do not keep a reference - * to it (ie we'd be stuck with always having one reference to the dplay - * object, and hence us, around). - * NOTE: The dp object does reference count us. - */ - /*IDirectPlayX_Release( (LPDIRECTPLAY2)This->sp->dplay ); */ - HeapFree( GetProcessHeap(), 0, This->sp->lpSpRemoteData ); HeapFree( GetProcessHeap(), 0, This->sp->lpSpLocalData ); diff --git a/dlls/dplayx/lobbysp.c b/dlls/dplayx/lobbysp.c index 3f545c1..737cb3f 100644 --- a/dlls/dplayx/lobbysp.c +++ b/dlls/dplayx/lobbysp.c @@ -148,22 +148,6 @@ static BOOL DPLSP_CreateDPLobbySP( LPVOID lpSP, IDirectPlay2Impl* dp ) This->sp->dplay = dp; - /* Normally we should be keeping a reference, but since only the dplay - * interface that created us can destroy us, we do not keep a reference - * to it (ie we'd be stuck with always having one reference to the dplay - * object, and hence us, around). - * NOTE: The dp object does reference count us. - * - * FIXME: This is a kludge to get around a problem where a queryinterface - * is used to get a new interface and then is closed. We will then - * reference garbage. However, with this we will never deallocate - * the interface we store. The correct fix is to require all - * DP internal interfaces to use the This->dp2 interface which - * should be changed to This->dp - */ - IDirectPlayX_AddRef( (LPDIRECTPLAY2)dp ); - - return TRUE; } diff --git a/dlls/dplayx/tests/dplayx.c b/dlls/dplayx/tests/dplayx.c index c8ec54d..b7bbac3 100644 --- a/dlls/dplayx/tests/dplayx.c +++ b/dlls/dplayx/tests/dplayx.c @@ -6394,7 +6394,7 @@ static void test_COM(void) (void**)&dp4); ok(hr == S_OK, "DirectPlay create failed: %08x, expected S_OK\n", hr); refcount = IDirectPlayX_AddRef(dp4); - todo_wine ok(refcount == 2, "refcount == %u, expected 2\n", refcount); + ok(refcount == 2, "refcount == %u, expected 2\n", refcount); hr = IDirectPlayX_QueryInterface(dp4, &IID_IDirectPlay2A, (void**)&dp2A); ok(hr == S_OK, "QueryInterface for IID_IDirectPlay2A failed: %08x\n", hr); @@ -6441,7 +6441,7 @@ static void test_COM(void) IDirectPlay2_Release(dp2A); IDirectPlayX_Release(dp4); refcount = IDirectPlayX_Release(dp4); - todo_wine ok(refcount == 0, "refcount == %u, expected 0\n", refcount); + ok(refcount == 0, "refcount == %u, expected 0\n", refcount); }

1 0

Jacek Caban : secur32: Pass enabled protocols to GnuTLS.
by Alexandre Julliard 01 Apr '13

01 Apr '13

Module: wine Branch: master Commit: 66f80b57a47394bd1a3b05fea74acb8f23a84a9f URL: http://source.winehq.org/git/wine.git/?a=commit;h=66f80b57a47394bd1a3b05fea… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Mar 30 16:25:30 2013 +0100 secur32: Pass enabled protocols to GnuTLS. --- dlls/secur32/schannel_gnutls.c | 30 +++++++++++++++++++++++++----- 1 files changed, 25 insertions(+), 5 deletions(-) diff --git a/dlls/secur32/schannel_gnutls.c b/dlls/secur32/schannel_gnutls.c index b460505..70b8276 100644 --- a/dlls/secur32/schannel_gnutls.c +++ b/dlls/secur32/schannel_gnutls.c @@ -61,7 +61,7 @@ MAKE_FUNCPTR(gnutls_mac_get); MAKE_FUNCPTR(gnutls_mac_get_key_size); MAKE_FUNCPTR(gnutls_perror); MAKE_FUNCPTR(gnutls_protocol_get_version); -MAKE_FUNCPTR(gnutls_set_default_priority); +MAKE_FUNCPTR(gnutls_priority_set_direct); MAKE_FUNCPTR(gnutls_record_get_max_size); MAKE_FUNCPTR(gnutls_record_recv); MAKE_FUNCPTR(gnutls_record_send); @@ -106,6 +106,17 @@ static ssize_t schan_push_adapter(gnutls_transport_ptr_t transport, return buff_len; } +static const struct { + DWORD enable_flag; + const char *gnutls_flag; +} protocol_priority_flags[] = { + {SP_PROT_TLS1_2_CLIENT, "VERS-TLS1.2"}, + {SP_PROT_TLS1_1_CLIENT, "VERS-TLS1.1"}, + {SP_PROT_TLS1_0_CLIENT, "VERS-TLS1.0"}, + {SP_PROT_SSL3_CLIENT, "VERS-SSL3.0"} + /* {SP_PROT_SSL2_CLIENT} is not supported by GnuTLS */ +}; + DWORD schan_imp_enabled_protocols(void) { /* NOTE: No support for SSL 2.0 */ @@ -115,6 +126,8 @@ DWORD schan_imp_enabled_protocols(void) BOOL schan_imp_create_session(schan_imp_session *session, schan_credentials *cred) { gnutls_session_t *s = (gnutls_session_t*)session; + char priority[64] = "NORMAL", *p; + unsigned i; int err = pgnutls_init(s, cred->credential_use == SECPKG_CRED_INBOUND ? GNUTLS_SERVER : GNUTLS_CLIENT); if (err != GNUTLS_E_SUCCESS) @@ -123,9 +136,16 @@ BOOL schan_imp_create_session(schan_imp_session *session, schan_credentials *cre return FALSE; } - /* FIXME: We should be using the information from the credentials here. */ - FIXME("Using hardcoded \"NORMAL\" priority\n"); - err = pgnutls_set_default_priority(*s); + p = priority + strlen(priority); + for(i=0; i < sizeof(protocol_priority_flags)/sizeof(*protocol_priority_flags); i++) { + *p++ = ':'; + *p++ = (cred->enabled_protocols & protocol_priority_flags[i].enable_flag) ? '+' : '-'; + strcpy(p, protocol_priority_flags[i].gnutls_flag); + p += strlen(p); + } + + TRACE("Using %s priority\n", debugstr_a(priority)); + err = pgnutls_priority_set_direct(*s, priority, NULL); if (err != GNUTLS_E_SUCCESS) { pgnutls_perror(err); @@ -466,7 +486,7 @@ BOOL schan_imp_init(void) LOAD_FUNCPTR(gnutls_mac_get_key_size) LOAD_FUNCPTR(gnutls_perror) LOAD_FUNCPTR(gnutls_protocol_get_version) - LOAD_FUNCPTR(gnutls_set_default_priority) + LOAD_FUNCPTR(gnutls_priority_set_direct) LOAD_FUNCPTR(gnutls_record_get_max_size); LOAD_FUNCPTR(gnutls_record_recv); LOAD_FUNCPTR(gnutls_record_send);

1 0

Jacek Caban : secur32: Pass enabled protocols to Mac Secure Transport.
by Alexandre Julliard 01 Apr '13

01 Apr '13

Module: wine Branch: master Commit: 8036bd14f9115fe793a96b756d5f29ac1a7c5479 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8036bd14f9115fe793a96b756… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Mar 30 16:25:44 2013 +0100 secur32: Pass enabled protocols to Mac Secure Transport. --- dlls/secur32/schannel_macosx.c | 40 +++++++++++++++++++++++++++++++++------- 1 files changed, 33 insertions(+), 7 deletions(-) diff --git a/dlls/secur32/schannel_macosx.c b/dlls/secur32/schannel_macosx.c index c562a98..5ec06cf 100644 --- a/dlls/secur32/schannel_macosx.c +++ b/dlls/secur32/schannel_macosx.c @@ -630,15 +630,28 @@ static OSStatus schan_push_adapter(SSLConnectionRef transport, const void *buff, return ret; } +static const struct { + DWORD enable_flag; + SSLProtocol mac_version; +} protocol_priority_flags[] = { + {SP_PROT_TLS1_2_CLIENT, kTLSProtocol12}, + {SP_PROT_TLS1_1_CLIENT, kTLSProtocol11}, + {SP_PROT_TLS1_0_CLIENT, kTLSProtocol1}, + {SP_PROT_SSL3_CLIENT, kSSLProtocol3}, + {SP_PROT_SSL2_CLIENT, kSSLProtocol2} +}; + +static DWORD supported_protocols; + DWORD schan_imp_enabled_protocols(void) { - /* NOTE: No support for TLS 1.1 and TLS 1.2 */ - return SP_PROT_SSL2_CLIENT | SP_PROT_SSL3_CLIENT | SP_PROT_TLS1_0_CLIENT; + return supported_protocols; } BOOL schan_imp_create_session(schan_imp_session *session, schan_credentials *cred) { struct mac_session *s; + unsigned i; OSStatus status; TRACE("(%p)\n", session); @@ -668,11 +681,17 @@ BOOL schan_imp_create_session(schan_imp_session *session, schan_credentials *cre goto fail; } - status = SSLSetProtocolVersionEnabled(s->context, kSSLProtocol2, FALSE); - if (status != noErr) - { - ERR("Failed to disable SSL version 2: %ld\n", (long)status); - goto fail; + for(i=0; i < sizeof(protocol_priority_flags)/sizeof(*protocol_priority_flags); i++) { + if(!(protocol_priority_flags[i].enable_flag & supported_protocols)) + continue; + + status = SSLSetProtocolVersionEnabled(s->context, protocol_priority_flags[i].mac_version, + (cred->enabled_protocols & protocol_priority_flags[i].enable_flag) != 0); + if (status != noErr) + { + ERR("Failed to set SSL version %d: %ld\n", protocol_priority_flags[i].mac_version, (long)status); + goto fail; + } } status = SSLSetIOFuncs(s->context, schan_pull_adapter, schan_push_adapter); @@ -984,6 +1003,13 @@ void schan_imp_free_certificate_credentials(schan_credentials *c) BOOL schan_imp_init(void) { TRACE("()\n"); + + supported_protocols = SP_PROT_SSL2_CLIENT | SP_PROT_SSL3_CLIENT | SP_PROT_TLS1_0_CLIENT; + +#if MAC_OS_X_VERSION_MAX_ALLOWED >= 1080 + /* FIXME: Test max allowed version for TLS 1.1 and TLS 1.2 */ +#endif + return TRUE; }

1 0

Jacek Caban : secur32: Disable SSL2 protocol in default settings.
by Alexandre Julliard 01 Apr '13

01 Apr '13

Module: wine Branch: master Commit: 194cc70fbef13d4f3d724d8abbe2810f4fb1a53b URL: http://source.winehq.org/git/wine.git/?a=commit;h=194cc70fbef13d4f3d724d8ab… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Mar 30 16:25:58 2013 +0100 secur32: Disable SSL2 protocol in default settings. --- dlls/secur32/schannel.c | 4 ++-- tools/wine.inf.in | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/secur32/schannel.c b/dlls/secur32/schannel.c index df75b67..ecc189d 100644 --- a/dlls/secur32/schannel.c +++ b/dlls/secur32/schannel.c @@ -178,7 +178,7 @@ static void read_config(void) BOOL enabled; /* If no config is present, enable the protocol */ BOOL disabled_by_default; /* Disable if caller asks for default protocol set */ } protocol_config_keys[] = { - {{'S','S','L',' ','2','.','0',0}, SP_PROT_SSL2_CLIENT, TRUE, TRUE}, + {{'S','S','L',' ','2','.','0',0}, SP_PROT_SSL2_CLIENT, FALSE, TRUE}, /* NOTE: TRUE, TRUE on Windows */ {{'S','S','L',' ','3','.','0',0}, SP_PROT_SSL3_CLIENT, TRUE, FALSE}, {{'T','L','S',' ','1','.','0',0}, SP_PROT_TLS1_0_CLIENT, TRUE, FALSE}, {{'T','L','S',' ','1','.','1',0}, SP_PROT_TLS1_1_CLIENT, TRUE, FALSE /* NOTE: not enabled by default on Windows */ }, @@ -220,7 +220,7 @@ static void read_config(void) if(type != REG_DWORD || value) default_disabled |= protocol_config_keys[i].prot_client_flag; }else if(protocol_config_keys[i].disabled_by_default) { - default_disabled |= protocol_config_keys[i].prot_client_flag; + default_disabled |= protocol_config_keys[i].prot_client_flag; } RegCloseKey(key); diff --git a/tools/wine.inf.in b/tools/wine.inf.in index e7cc5c7..84e40d2 100644 --- a/tools/wine.inf.in +++ b/tools/wine.inf.in @@ -639,6 +639,7 @@ HKLM,Software\Microsoft\Transaction Server,,16 HKLM,Software\Policies,,16 HKLM,Software\Registered Applications,,16 HKLM,System\CurrentControlSet\Control\Lsa,,16 +HKLM,System\CurrentControlSet\Control\SecurityProviders\Schannel\Protocols\SSL 2.0\Client,"DisabledByDefault",0x10003,1 HKLM,System\CurrentControlSet\Control\TimeZoneInformation,"StandardName",2,"" HKLM,System\CurrentControlSet\Control\TimeZoneInformation,"TimeZoneKeyName",2,"" HKLM,System\CurrentControlSet\Control\VirtualDeviceDrivers,,16

1 0

Jacek Caban : jscript: Use helpers to access string buffers in jsregexp.c.
by Alexandre Julliard 01 Apr '13

01 Apr '13

Module: wine Branch: master Commit: c3cf79ac25d0f2be51572e8a9bf8589340127203 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c3cf79ac25d0f2be51572e8a9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Mar 30 18:00:06 2013 +0100 jscript: Use helpers to access string buffers in jsregexp.c. --- dlls/jscript/jsregexp.c | 112 ++++++++++++++++++++++++++++++----------------- 1 files changed, 72 insertions(+), 40 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c3cf79ac25d0f2be51572…

1 0

Jacek Caban : jscript: Use helpers to access string buffer in string.c.
by Alexandre Julliard 01 Apr '13

01 Apr '13

Module: wine Branch: master Commit: c79180a9788501b7f139b019e258b09c7ccad602 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c79180a9788501b7f139b019e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Mar 30 18:00:20 2013 +0100 jscript: Use helpers to access string buffer in string.c. --- dlls/jscript/string.c | 166 +++++++++++++++++++++++++++--------------------- 1 files changed, 93 insertions(+), 73 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c79180a9788501b7f139b…

1 0

Jacek Caban : jscript: Moved string buffer to separated struct from jsstr_t .
by Alexandre Julliard 01 Apr '13

01 Apr '13

Module: wine Branch: master Commit: 29d9d668f7e72ae8ddab0669c982602c00e61177 URL: http://source.winehq.org/git/wine.git/?a=commit;h=29d9d668f7e72ae8ddab0669c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Mar 30 18:00:31 2013 +0100 jscript: Moved string buffer to separated struct from jsstr_t. --- dlls/jscript/jsstr.c | 18 +++++++++--------- dlls/jscript/jsstr.h | 19 ++++++++++++++----- 2 files changed, 23 insertions(+), 14 deletions(-) diff --git a/dlls/jscript/jsstr.c b/dlls/jscript/jsstr.c index 20e6760..a9dfc49 100644 --- a/dlls/jscript/jsstr.c +++ b/dlls/jscript/jsstr.c @@ -22,25 +22,25 @@ const char *debugstr_jsstr(jsstr_t *str) { - return debugstr_wn(str->str, jsstr_length(str)); + return debugstr_wn(jsstr_as_inline(str)->buf, jsstr_length(str)); } WCHAR *jsstr_alloc_buf(unsigned len, jsstr_t **r) { - jsstr_t *ret; + jsstr_inline_t *ret; if(len > JSSTR_MAX_LENGTH) return NULL; - ret = heap_alloc(FIELD_OFFSET(jsstr_t, str[len+1])); + ret = heap_alloc(FIELD_OFFSET(jsstr_inline_t, buf[len+1])); if(!ret) return NULL; - ret->length_flags = len << JSSTR_LENGTH_SHIFT; - ret->ref = 1; - ret->str[len] = 0; - *r = ret; - return ret->str; + ret->str.length_flags = len << JSSTR_LENGTH_SHIFT; + ret->str.ref = 1; + ret->buf[len] = 0; + *r = &ret->str; + return ret->buf; } jsstr_t *jsstr_alloc_len(const WCHAR *buf, unsigned len) @@ -61,7 +61,7 @@ int jsstr_cmp(jsstr_t *str1, jsstr_t *str2) int len2 = jsstr_length(str2); int ret; - ret = memcmp(str1->str, str2->str, min(len1, len2)*sizeof(WCHAR)); + ret = memcmp(jsstr_as_inline(str1)->buf, jsstr_as_inline(str2)->buf, min(len1, len2)*sizeof(WCHAR)); if(!ret) ret = len1 - len2; diff --git a/dlls/jscript/jsstr.h b/dlls/jscript/jsstr.h index 28742ac..4d005dc 100644 --- a/dlls/jscript/jsstr.h +++ b/dlls/jscript/jsstr.h @@ -19,7 +19,6 @@ struct _jsstr_t { unsigned length_flags; unsigned ref; - WCHAR str[1]; }; #define JSSTR_LENGTH_SHIFT 4 @@ -33,6 +32,11 @@ static inline unsigned jsstr_length(jsstr_t *str) return str->length_flags >> JSSTR_LENGTH_SHIFT; } +typedef struct { + jsstr_t str; + WCHAR buf[1]; +} jsstr_inline_t; + jsstr_t *jsstr_alloc_len(const WCHAR*,unsigned) DECLSPEC_HIDDEN; WCHAR *jsstr_alloc_buf(unsigned,jsstr_t**) DECLSPEC_HIDDEN; @@ -53,27 +57,32 @@ static inline jsstr_t *jsstr_addref(jsstr_t *str) return str; } +static inline jsstr_inline_t *jsstr_as_inline(jsstr_t *str) +{ + return CONTAINING_RECORD(str, jsstr_inline_t, str); +} + /* This will be failable in the future. */ static inline const WCHAR *jsstr_flatten(jsstr_t *str) { - return str->str; + return jsstr_as_inline(str)->buf; } static inline BOOL jsstr_eq(jsstr_t *str1, jsstr_t *str2) { unsigned len = jsstr_length(str1); - return len == jsstr_length(str2) && !memcmp(str1->str, str2->str, len*sizeof(WCHAR)); + return len == jsstr_length(str2) && !memcmp(jsstr_as_inline(str1)->buf, jsstr_as_inline(str2)->buf, len*sizeof(WCHAR)); } static inline void jsstr_extract(jsstr_t *str, unsigned off, unsigned len, WCHAR *buf) { - memcpy(buf, str->str+off, len*sizeof(WCHAR)); + memcpy(buf, jsstr_as_inline(str)->buf+off, len*sizeof(WCHAR)); } static inline unsigned jsstr_flush(jsstr_t *str, WCHAR *buf) { unsigned len = jsstr_length(str); - memcpy(buf, str->str, len*sizeof(WCHAR)); + memcpy(buf, jsstr_as_inline(str)->buf, len*sizeof(WCHAR)); return len; }

1 0