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

Stefan Dösinger : wined3d: Avoid calculating 1 / ( fog_end - fog_start) in the shader.
by Alexandre Julliard 01 Aug '13

01 Aug '13

Module: wine Branch: master Commit: ba61730daa6a614ef07128a69a0bbca819e716b4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ba61730daa6a614ef07128a69… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Aug 1 12:25:55 2013 +0200 wined3d: Avoid calculating 1 / (fog_end - fog_start) in the shader. --- dlls/wined3d/glsl_shader.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index e1fe0ee..cbf2c60 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -4502,8 +4502,7 @@ static void shader_glsl_generate_fog_code(struct wined3d_shader_buffer *buffer, return; case WINED3D_FFP_PS_FOG_LINEAR: - /* Fog = (gl_Fog.end - gl_FogFragCoord) / (gl_Fog.end - gl_Fog.start) */ - shader_addline(buffer, "float Fog = (gl_Fog.end - gl_FogFragCoord) / (gl_Fog.end - gl_Fog.start);\n"); + shader_addline(buffer, "float Fog = (gl_Fog.end - gl_FogFragCoord) * gl_Fog.scale;\n"); break; case WINED3D_FFP_PS_FOG_EXP:

1 0

Stefan Dösinger : ddraw: Fix double to float conversion warnings.
by Alexandre Julliard 01 Aug '13

01 Aug '13

Module: wine Branch: master Commit: c0faf86fff1ebd052f9564a728bbcbd9af58fbd4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0faf86fff1ebd052f9564a72… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Aug 1 19:49:15 2013 +0200 ddraw: Fix double to float conversion warnings. --- dlls/ddraw/device.c | 2 +- dlls/ddraw/executebuffer.c | 18 ++++++++---------- dlls/ddraw/viewport.c | 8 ++++---- 3 files changed, 13 insertions(+), 15 deletions(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 09880dd..449b5b8 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -4391,7 +4391,7 @@ static DWORD in_plane(UINT plane, D3DVECTOR normal, D3DVALUE origin_plane, D3DVE { float distance, norm; - norm = sqrt( normal.u1.x * normal.u1.x + normal.u2.y * normal.u2.y + normal.u3.z * normal.u3.z ); + norm = sqrtf(normal.u1.x * normal.u1.x + normal.u2.y * normal.u2.y + normal.u3.z * normal.u3.z); distance = ( origin_plane + normal.u1.x * center.u1.x + normal.u2.y * center.u2.y + normal.u3.z * center.u3.z ) / norm; if ( fabs( distance ) < radius ) return D3DSTATUS_CLIPUNIONLEFT << plane; diff --git a/dlls/ddraw/executebuffer.c b/dlls/ddraw/executebuffer.c index 2925cfa..04ea257 100644 --- a/dlls/ddraw/executebuffer.c +++ b/dlls/ddraw/executebuffer.c @@ -381,11 +381,10 @@ HRESULT d3d_execute_buffer_execute(struct d3d_execute_buffer *buffer, dst->u7.tu = src->u7.tu; dst->u8.tv = src->u8.tv; - /* Now, the matrix multiplication */ - dst->u1.sx = (src->u1.x * mat._11) + (src->u2.y * mat._21) + (src->u3.z * mat._31) + (1.0 * mat._41); - dst->u2.sy = (src->u1.x * mat._12) + (src->u2.y * mat._22) + (src->u3.z * mat._32) + (1.0 * mat._42); - dst->u3.sz = (src->u1.x * mat._13) + (src->u2.y * mat._23) + (src->u3.z * mat._33) + (1.0 * mat._43); - dst->u4.rhw = (src->u1.x * mat._14) + (src->u2.y * mat._24) + (src->u3.z * mat._34) + (1.0 * mat._44); + dst->u1.sx = (src->u1.x * mat._11) + (src->u2.y * mat._21) + (src->u3.z * mat._31) + mat._41; + dst->u2.sy = (src->u1.x * mat._12) + (src->u2.y * mat._22) + (src->u3.z * mat._32) + mat._42; + dst->u3.sz = (src->u1.x * mat._13) + (src->u2.y * mat._23) + (src->u3.z * mat._33) + mat._43; + dst->u4.rhw = (src->u1.x * mat._14) + (src->u2.y * mat._24) + (src->u3.z * mat._34) + mat._44; dst->u1.sx = dst->u1.sx / dst->u4.rhw * Viewport->dvScaleX + Viewport->dwX + Viewport->dwWidth / 2; @@ -424,11 +423,10 @@ HRESULT d3d_execute_buffer_execute(struct d3d_execute_buffer *buffer, dst->u7.tu = src->u6.tu; dst->u8.tv = src->u7.tv; - /* Now, the matrix multiplication */ - dst->u1.sx = (src->u1.x * mat._11) + (src->u2.y * mat._21) + (src->u3.z * mat._31) + (1.0 * mat._41); - dst->u2.sy = (src->u1.x * mat._12) + (src->u2.y * mat._22) + (src->u3.z * mat._32) + (1.0 * mat._42); - dst->u3.sz = (src->u1.x * mat._13) + (src->u2.y * mat._23) + (src->u3.z * mat._33) + (1.0 * mat._43); - dst->u4.rhw = (src->u1.x * mat._14) + (src->u2.y * mat._24) + (src->u3.z * mat._34) + (1.0 * mat._44); + dst->u1.sx = (src->u1.x * mat._11) + (src->u2.y * mat._21) + (src->u3.z * mat._31) + mat._41; + dst->u2.sy = (src->u1.x * mat._12) + (src->u2.y * mat._22) + (src->u3.z * mat._32) + mat._42; + dst->u3.sz = (src->u1.x * mat._13) + (src->u2.y * mat._23) + (src->u3.z * mat._33) + mat._43; + dst->u4.rhw = (src->u1.x * mat._14) + (src->u2.y * mat._24) + (src->u3.z * mat._34) + mat._44; dst->u1.sx = dst->u1.sx / dst->u4.rhw * Viewport->dvScaleX + Viewport->dwX + Viewport->dwWidth / 2; diff --git a/dlls/ddraw/viewport.c b/dlls/ddraw/viewport.c index f9eddda..95df63f 100644 --- a/dlls/ddraw/viewport.c +++ b/dlls/ddraw/viewport.c @@ -428,10 +428,10 @@ static HRESULT WINAPI d3d_viewport_TransformVertices(IDirect3DViewport3 *iface, outH = lpData->lpHOut; for(i = 0; i < dwVertexCount; i++) { - x = (in[0] * mat._11) + (in[1] * mat._21) + (in[2] * mat._31) + (1.0 * mat._41); - y = (in[0] * mat._12) + (in[1] * mat._22) + (in[2] * mat._32) + (1.0 * mat._42); - z = (in[0] * mat._13) + (in[1] * mat._23) + (in[2] * mat._33) + (1.0 * mat._43); - w = (in[0] * mat._14) + (in[1] * mat._24) + (in[2] * mat._34) + (1.0 * mat._44); + x = (in[0] * mat._11) + (in[1] * mat._21) + (in[2] * mat._31) + mat._41; + y = (in[0] * mat._12) + (in[1] * mat._22) + (in[2] * mat._32) + mat._42; + z = (in[0] * mat._13) + (in[1] * mat._23) + (in[2] * mat._33) + mat._43; + w = (in[0] * mat._14) + (in[1] * mat._24) + (in[2] * mat._34) + mat._44; if(dwFlags & D3DTRANSFORM_CLIPPED) {

1 0

Qian Hong : imm32: Fixed ImmUnlockIMCC.
by Alexandre Julliard 01 Aug '13

01 Aug '13

Module: wine Branch: master Commit: 00289d5b91d7c5f63643a4d21996989f68678ef7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=00289d5b91d7c5f63643a4d21… Author: Qian Hong <qhong(a)codeweavers.com> Date: Thu Aug 1 14:32:54 2013 +0800 imm32: Fixed ImmUnlockIMCC. --- dlls/imm32/imm.c | 3 ++- dlls/imm32/tests/imm32.c | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index 284d49e..5aee6ea 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -2665,7 +2665,8 @@ BOOL WINAPI ImmUnlockIMCC(HIMCC imcc) IMCCInternal *internal; internal = imcc; - internal->dwLock --; + if (internal->dwLock) + internal->dwLock --; return (internal->dwLock!=0); } diff --git a/dlls/imm32/tests/imm32.c b/dlls/imm32/tests/imm32.c index 9d41cc7..26101a4 100644 --- a/dlls/imm32/tests/imm32.c +++ b/dlls/imm32/tests/imm32.c @@ -728,9 +728,9 @@ static void test_ImmGetIMCCLockCount(void) count = ImmGetIMCCLockCount(imcc); ok(count == 0, "expect 0, returned %d\n", count); ret = ImmUnlockIMCC(imcc); - todo_wine ok(ret == FALSE, "expect FALSE, ret %d\n", ret); + ok(ret == FALSE, "expect FALSE, ret %d\n", ret); count = ImmGetIMCCLockCount(imcc); - todo_wine ok(count == 0, "expect 0, returned %d\n", count); + ok(count == 0, "expect 0, returned %d\n", count); ImmDestroyIMCC(imcc); }

1 0

Ken Thomases : winemac: Make a file-scope variable static.
by Alexandre Julliard 01 Aug '13

01 Aug '13

Module: wine Branch: master Commit: 47337ed14c8d4b4fa18109eb9a6ad3b3c7cc9e3a URL: http://source.winehq.org/git/wine.git/?a=commit;h=47337ed14c8d4b4fa18109eb9… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Jul 31 15:10:49 2013 -0500 winemac: Make a file-scope variable static. --- dlls/winemac.drv/window.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winemac.drv/window.c b/dlls/winemac.drv/window.c index 5e03936..845fe01 100644 --- a/dlls/winemac.drv/window.c +++ b/dlls/winemac.drv/window.c @@ -42,7 +42,7 @@ static CRITICAL_SECTION win_data_section = { &critsect_debug, -1, 0, 0, 0, 0 }; static CFMutableDictionaryRef win_datas; -DWORD activate_on_focus_time; +static DWORD activate_on_focus_time; void CDECL macdrv_SetFocus(HWND hwnd);

1 0

Bruno Jesus : ws2_32/tests: Fix bad usage of WSAGetLastError() in tests.
by Alexandre Julliard 01 Aug '13

01 Aug '13

Module: wine Branch: master Commit: d7f216818f10077599dc17a5e2a43ca0f7d520a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d7f216818f10077599dc17a5e… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Wed Jul 31 18:32:26 2013 -0300 ws2_32/tests: Fix bad usage of WSAGetLastError() in tests. --- dlls/ws2_32/tests/sock.c | 14 ++++++++------ 1 files changed, 8 insertions(+), 6 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 1a75ffd..2ee81ae 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -1766,8 +1766,8 @@ todo_wine todo_wine { size = sizeof(socktype); socktype = 0xdead; - ok(!getsockopt(sock, SOL_SOCKET, SO_TYPE, (char *) &socktype, &size), "getsockopt failed with %d\n", - WSAGetLastError()); + err = getsockopt(sock, SOL_SOCKET, SO_TYPE, (char *) &socktype, &size); + ok(!err, "getsockopt failed with %d\n", WSAGetLastError()); ok(socktype == pi[0].iSocketType, "Wrong socket type, expected %d received %d\n", pi[0].iSocketType, socktype); } @@ -1783,9 +1783,9 @@ todo_wine size = sizeof(socktype); socktype = 0xdead; + err = getsockopt(sock, SOL_SOCKET, SO_TYPE, (char *) &socktype, &size); todo_wine - ok(!getsockopt(sock, SOL_SOCKET, SO_TYPE, (char *) &socktype, &size), "getsockopt failed with %d\n", - WSAGetLastError()); + ok(!err, "getsockopt failed with %d\n", WSAGetLastError()); for (j = 0; j < items; j++) { @@ -2508,14 +2508,16 @@ static void test_listen(void) ok (ret == WSAEINVAL, "expected 10022, received %d\n", ret); acceptc = 0xdead; - ok (!getsockopt(fdA, SOL_SOCKET, SO_ACCEPTCONN, (char*)&acceptc, &olen), "getsockopt failed\n"); + ret = getsockopt(fdA, SOL_SOCKET, SO_ACCEPTCONN, (char*)&acceptc, &olen); + ok (!ret, "getsockopt failed\n"); ok (acceptc == 0, "SO_ACCEPTCONN should be 0, received %d\n", acceptc); ok (!listen(fdA, 0), "listen failed\n"); ok (!listen(fdA, SOMAXCONN), "double listen failed\n"); acceptc = 0xdead; - ok (!getsockopt(fdA, SOL_SOCKET, SO_ACCEPTCONN, (char*)&acceptc, &olen), "getsockopt failed\n"); + ret = getsockopt(fdA, SOL_SOCKET, SO_ACCEPTCONN, (char*)&acceptc, &olen); + ok (!ret, "getsockopt failed\n"); ok (acceptc == 1, "SO_ACCEPTCONN should be 1, received %d\n", acceptc); SetLastError(0xdeadbeef);

1 0

Bruno Jesus : ws2_32/tests: Test the precedence of parameters while creating a socket in WSASocket().
by Alexandre Julliard 01 Aug '13

01 Aug '13

Module: wine Branch: master Commit: d5f7f74f7868667f4257ea251fee74569b162594 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d5f7f74f7868667f4257ea251… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Wed Jul 31 18:32:43 2013 -0300 ws2_32/tests: Test the precedence of parameters while creating a socket in WSASocket(). --- dlls/ws2_32/tests/sock.c | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 2ee81ae..7e70449 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -1733,7 +1733,21 @@ todo_wine FROM_PROTOCOL_INFO, &pi[0], 0, 0); ok(sock != INVALID_SOCKET, "Failed to create socket: %d\n", WSAGetLastError()); + closesocket(sock); + /* find what parameters are used first: plain parameters or protocol info struct */ + pi[0].iProtocol = IPPROTO_UDP; + pi[0].iSocketType = SOCK_DGRAM; + pi[0].iAddressFamily = AF_INET; + sock = WSASocketA(AF_INET, SOCK_STREAM, IPPROTO_TCP, &pi[0], 0, 0); + ok(sock != INVALID_SOCKET, "Failed to create socket: %d\n", + WSAGetLastError()); + size = sizeof(socktype); + socktype = 0xdead; + err = getsockopt(sock, SOL_SOCKET, SO_TYPE, (char *) &socktype, &size); + ok(!err,"getsockopt failed with %d\n", WSAGetLastError()); + ok(socktype == SOCK_STREAM, "Wrong socket type, expected %d received %d\n", + SOCK_STREAM, socktype); closesocket(sock); HeapFree(GetProcessHeap(), 0, pi);

1 0

Volkan Gezer : po: Updated Turkish translations.
by Alexandre Julliard 01 Aug '13

01 Aug '13

Module: wine Branch: master Commit: 5b17363adda159fab9e4726ea604fc32639bb564 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b17363adda159fab9e4726ea… Author: Volkan Gezer <volkangezer(a)gmail.com> Date: Wed Jul 31 22:10:09 2013 +0200 po: Updated Turkish translations. --- po/tr.po | 36 +++++++++++++++--------------------- 1 files changed, 15 insertions(+), 21 deletions(-) diff --git a/po/tr.po b/po/tr.po index c9e55f0..f0e624b 100644 --- a/po/tr.po +++ b/po/tr.po @@ -4420,7 +4420,7 @@ msgstr "Takas hatası.\n" #: winerror.mc:1021 msgid "Stack overflow.\n" -msgstr "" +msgstr "Yığın bellek taştı.\n" #: winerror.mc:1026 msgid "Invalid message.\n" @@ -4428,7 +4428,7 @@ msgstr "Geçersiz mesaj.\n" #: winerror.mc:1031 msgid "Cannot complete.\n" -msgstr "" +msgstr "Tamamlanamadı.\n" #: winerror.mc:1036 msgid "Invalid flags.\n" @@ -4456,7 +4456,7 @@ msgstr "Kayıt defteri bozuk.\n" #: winerror.mc:1066 msgid "Invalid key.\n" -msgstr "" +msgstr "Geçersiz anahtar.\n" #: winerror.mc:1071 msgid "Can't open registry key.\n" @@ -4476,23 +4476,23 @@ msgstr "Kayıt kurtarıldı.\n" #: winerror.mc:1091 msgid "Registry is corrupt.\n" -msgstr "" +msgstr "Kayıt defteri bozuk.\n" #: winerror.mc:1096 msgid "I/O to registry failed.\n" -msgstr "" +msgstr "Kayda G/Ç başarısız.\n" #: winerror.mc:1101 msgid "Not registry file.\n" -msgstr "" +msgstr "Kayıt dosyası değil.\n" #: winerror.mc:1106 msgid "Key deleted.\n" -msgstr "" +msgstr "Anahtar silindi.\n" #: winerror.mc:1111 msgid "No registry log space.\n" -msgstr "" +msgstr "Kayıt günlük boşluğu yok.\n" #: winerror.mc:1116 msgid "Registry key has subkeys.\n" @@ -4552,7 +4552,7 @@ msgstr "" #: winerror.mc:1186 msgid "Service not active.\n" -msgstr "" +msgstr "Hizmet etkin değil.\n" #: winerror.mc:1191 msgid "Service controller connect failed.\n" @@ -5844,15 +5844,15 @@ msgstr "Aygıt kaldırıldı.\n" #: winerror.mc:2811 msgid "Installation already running.\n" -msgstr "" +msgstr "Kurulum zaten çalışıyor.\n" #: winerror.mc:2816 msgid "Installation package failed to open.\n" -msgstr "" +msgstr "Kurulum paketi açılamadı.\n" #: winerror.mc:2821 msgid "Installation package is invalid.\n" -msgstr "" +msgstr "Kurulum paketi geçersiz.\n" #: winerror.mc:2826 msgid "Installer user interface failed.\n" @@ -13564,22 +13564,16 @@ msgid "Not yet implemented" msgstr "Henüz tamamlanmadı" #: winefile.rc:106 -#, fuzzy -#| msgid "Expiration Date" msgid "Creation date" -msgstr "Son Kullanma Tarihi" +msgstr "Oluşturma tarihi" #: winefile.rc:107 -#, fuzzy -#| msgid "Access denied.\n" msgid "Access date" -msgstr "Erişim engellendi.\n" +msgstr "Erişim tarihi" #: winefile.rc:108 -#, fuzzy -#| msgid "Certification Path" msgid "Modification date" -msgstr "Sertifika Yolu" +msgstr "Düzenlenme tarihi" #: winefile.rc:109 msgid "Index/Inode"

1 0

Alexandre Julliard : jscript: Use bison directives instead of defines to specify extra lexer parameters.
by Alexandre Julliard 01 Aug '13

01 Aug '13

Module: wine Branch: master Commit: ffbe1ca986bd299e1fc894440849914378adbf5c URL: http://source.winehq.org/git/wine.git/?a=commit;h=ffbe1ca986bd299e1fc894440… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Aug 1 11:59:12 2013 +0200 jscript: Use bison directives instead of defines to specify extra lexer parameters. --- dlls/jscript/parser.y | 11 +++++------ 1 files changed, 5 insertions(+), 6 deletions(-) diff --git a/dlls/jscript/parser.y b/dlls/jscript/parser.y index f5a2e72..327366a 100644 --- a/dlls/jscript/parser.y +++ b/dlls/jscript/parser.y @@ -25,10 +25,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(jscript); -#define YYLEX_PARAM ctx -#define YYPARSE_PARAM ctx - -static int parser_error(const char*); +static int parser_error(parser_ctx_t*,const char*); static void set_error(parser_ctx_t*,UINT); static BOOL explicit_error(parser_ctx_t*,void*,WCHAR); static BOOL allow_auto_semicolon(parser_ctx_t*); @@ -139,7 +136,9 @@ static source_elements_t *source_elements_add_statement(source_elements_t*,state %} -%pure_parser +%lex-param { parser_ctx_t *ctx } +%parse-param { parser_ctx_t *ctx } +%pure-parser %start Program %union { @@ -1386,7 +1385,7 @@ static expression_t *new_call_expression(parser_ctx_t *ctx, expression_t *expres return &ret->expr; } -static int parser_error(const char *str) +static int parser_error(parser_ctx_t *ctx, const char *str) { return 0; }

1 0

Alexandre Julliard : msi: Use bison directives instead of defines to specify extra lexer parameters.
by Alexandre Julliard 01 Aug '13

01 Aug '13

Module: wine Branch: master Commit: 3f98185fb8f88c181877e909ab1b6422fb9bca1e URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f98185fb8f88c181877e909a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Aug 1 12:00:04 2013 +0200 msi: Use bison directives instead of defines to specify extra lexer parameters. --- dlls/msi/cond.y | 10 ++++------ dlls/msi/query.h | 13 +++++++++++++ dlls/msi/sql.y | 23 ++++------------------- 3 files changed, 21 insertions(+), 25 deletions(-) diff --git a/dlls/msi/cond.y b/dlls/msi/cond.y index 97bb002..fa55825 100644 --- a/dlls/msi/cond.y +++ b/dlls/msi/cond.y @@ -42,11 +42,6 @@ #include "wine/unicode.h" #include "wine/list.h" -#define YYLEX_PARAM info -#define YYPARSE_PARAM info - -static int cond_error(const char *str); - WINE_DEFAULT_DEBUG_CHANNEL(msi); typedef struct tag_yyinput @@ -66,6 +61,7 @@ struct cond_str { static LPWSTR COND_GetString( COND_input *info, const struct cond_str *str ); static LPWSTR COND_GetLiteral( COND_input *info, const struct cond_str *str ); static int cond_lex( void *COND_lval, COND_input *info); +static int cond_error( COND_input *info, const char *str); static void *cond_alloc( COND_input *cond, unsigned int sz ); static void *cond_track_mem( COND_input *cond, void *ptr, unsigned int sz ); @@ -110,6 +106,8 @@ static BOOL num_from_prop( LPCWSTR p, INT *val ) %} +%lex-param { COND_input *info } +%parse-param { COND_input *info } %pure-parser %union @@ -798,7 +796,7 @@ static void cond_free( void *ptr ) } } -static int cond_error(const char *str) +static int cond_error( COND_input *info, const char *str ) { TRACE("%s\n", str ); return 0; diff --git a/dlls/msi/query.h b/dlls/msi/query.h index ca34b4c..063fbb9 100644 --- a/dlls/msi/query.h +++ b/dlls/msi/query.h @@ -96,6 +96,19 @@ struct expr } u; }; +typedef struct +{ + MSIDATABASE *db; + LPCWSTR command; + DWORD n, len; + UINT r; + MSIVIEW **view; /* View structure for the resulting query. This value + * tracks the view currently being created so we can free + * this view on syntax error. + */ + struct list *mem; +} SQL_input; + UINT MSI_ParseSQL( MSIDATABASE *db, LPCWSTR command, MSIVIEW **phview, struct list *mem ) DECLSPEC_HIDDEN; diff --git a/dlls/msi/sql.y b/dlls/msi/sql.y index ead7743..fa54741 100644 --- a/dlls/msi/sql.y +++ b/dlls/msi/sql.y @@ -34,29 +34,12 @@ #include "wine/debug.h" #include "wine/unicode.h" -#define YYLEX_PARAM info -#define YYPARSE_PARAM info - -static int sql_error(const char *str); - WINE_DEFAULT_DEBUG_CHANNEL(msi); -typedef struct tag_SQL_input -{ - MSIDATABASE *db; - LPCWSTR command; - DWORD n, len; - UINT r; - MSIVIEW **view; /* View structure for the resulting query. This value - * tracks the view currently being created so we can free - * this view on syntax error. - */ - struct list *mem; -} SQL_input; - static UINT SQL_getstring( void *info, const struct sql_str *strdata, LPWSTR *str ); static INT SQL_getint( void *info ); static int sql_lex( void *SQL_lval, SQL_input *info ); +static int sql_error( SQL_input *info, const char *str); static LPWSTR parser_add_table( void *info, LPCWSTR list, LPCWSTR table ); static void *parser_alloc( void *info, unsigned int sz ); @@ -77,6 +60,8 @@ static struct expr * EXPR_wildcard( void *info ); %} +%lex-param { SQL_input *info } +%parse-param { SQL_input *info } %pure-parser %union @@ -866,7 +851,7 @@ INT SQL_getint( void *info ) return r; } -static int sql_error( const char *str ) +static int sql_error( SQL_input *info, const char *str ) { return 0; }

1 0

Alexandre Julliard : vbscript: Use bison directives instead of defines to specify extra lexer parameters.
by Alexandre Julliard 01 Aug '13

01 Aug '13

Module: wine Branch: master Commit: f86c46f6403fe338a544ab134bdf563c5b0934ae URL: http://source.winehq.org/git/wine.git/?a=commit;h=f86c46f6403fe338a544ab134… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Aug 1 12:00:23 2013 +0200 vbscript: Use bison directives instead of defines to specify extra lexer parameters. --- dlls/vbscript/parser.y | 11 +++++------ 1 files changed, 5 insertions(+), 6 deletions(-) diff --git a/dlls/vbscript/parser.y b/dlls/vbscript/parser.y index 4b380ef..3c54fd8 100644 --- a/dlls/vbscript/parser.y +++ b/dlls/vbscript/parser.y @@ -25,10 +25,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(vbscript); -#define YYLEX_PARAM ctx -#define YYPARSE_PARAM ctx - -static int parser_error(const char*); +static int parser_error(parser_ctx_t *,const char*); static void parse_complete(parser_ctx_t*,BOOL); @@ -82,7 +79,9 @@ static const WCHAR propertyW[] = {'p','r','o','p','e','r','t','y',0}; %} -%pure_parser +%lex-param { parser_ctx_t *ctx } +%parse-param { parser_ctx_t *ctx } +%pure-parser %start Program %union { @@ -426,7 +425,7 @@ Identifier | tPROPERTY { $$ = propertyW; } %% -static int parser_error(const char *str) +static int parser_error(parser_ctx_t *ctx, const char *str) { return 0; }

1 0