July 2006 - Wine-commits - list.winehq.org

Karsten Elfenbein : rsaenh: Fix the case when the CPEncrypt function is asked for the needed buffer size .
by Alexandre Julliard 26 Jul '06

26 Jul '06

Module: wine Branch: refs/heads/master Commit: bf1ad6c324c5837cba5035747107423931f7352c URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=bf1ad6c324c5837cba50357… Author: Karsten Elfenbein <kelfe(a)gmx.de> Date: Tue Jul 25 20:57:34 2006 +0200 rsaenh: Fix the case when the CPEncrypt function is asked for the needed buffer size. --- dlls/rsaenh/rsaenh.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/rsaenh/rsaenh.c b/dlls/rsaenh/rsaenh.c index cd474c6..7c9dcfb 100644 --- a/dlls/rsaenh/rsaenh.c +++ b/dlls/rsaenh/rsaenh.c @@ -1889,6 +1889,12 @@ BOOL WINAPI RSAENH_CPEncrypt(HCRYPTPROV } dwEncryptedLen = (*pdwDataLen/pCryptKey->dwBlockLen+(Final?1:0))*pCryptKey->dwBlockLen; + + if (pbData == NULL) { + *pdwDataLen = dwEncryptedLen; + return TRUE; + } + for (i=*pdwDataLen; i<dwEncryptedLen && i<dwBufLen; i++) pbData[i] = dwEncryptedLen - *pdwDataLen; *pdwDataLen = dwEncryptedLen;

1 0

Andrew Talbot : winspool.drv/tests: Write-strings warnings fix.
by Alexandre Julliard 26 Jul '06

26 Jul '06

Module: wine Branch: refs/heads/master Commit: 4b792c6d56112bec8c9e3c59be00fd20e06b5593 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=4b792c6d56112bec8c9e3c5… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Tue Jul 25 21:53:32 2006 +0100 winspool.drv/tests: Write-strings warnings fix. --- dlls/winspool.drv/tests/info.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winspool.drv/tests/info.c b/dlls/winspool.drv/tests/info.c index 0420464..85a3353 100644 --- a/dlls/winspool.drv/tests/info.c +++ b/dlls/winspool.drv/tests/info.c @@ -42,7 +42,7 @@ static FARPROC pSetDefaultPrinterA; struct monitor_entry { LPSTR env; - LPSTR dllname; + CHAR dllname[32]; }; /* report common behavior only once */

1 0

Jason Green : wined3d: Fix crash caused by bad TRACE.
by Alexandre Julliard 26 Jul '06

26 Jul '06

Module: wine Branch: refs/heads/master Commit: f6b88b93ad8732c29a26d85fb6b9c32d14ad966b URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=f6b88b93ad8732c29a26d85… Author: Jason Green <jave27(a)gmail.com> Date: Wed Jul 26 02:25:07 2006 -0400 wined3d: Fix crash caused by bad TRACE. --- dlls/wined3d/drawprim.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index bb48982..a7dd644 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -1145,7 +1145,6 @@ #endif if (This->stateBlock->textures[textureNo] != NULL) { int coordIdx = This->stateBlock->textureState[textureNo][D3DTSS_TEXCOORDINDEX]; - TRACE("Setting up texture %u, idx %d, cordindx %u, data %p\n", textureNo, texture_idx, coordIdx, sd->u.s.texCoords[coordIdx].lpData); if (coordIdx >= MAX_TEXTURES) { VTRACE(("tex: %d - Skip tex coords, as being system generated\n", textureNo)); @@ -1158,6 +1157,8 @@ #endif GL_EXTCALL(glMultiTexCoord4fARB(GL_TEXTURE0_ARB + texture_idx, 0, 0, 0, 1)); } else { + TRACE("Setting up texture %u, idx %d, cordindx %u, data %p\n", + textureNo, texture_idx, coordIdx, sd->u.s.texCoords[coordIdx].lpData); if(curVBO != sd->u.s.texCoords[coordIdx].VBO) { GL_EXTCALL(glBindBufferARB(GL_ARRAY_BUFFER_ARB, sd->u.s.texCoords[coordIdx].VBO)); checkGLcall("glBindBufferARB");

1 0

Stefan Dösinger : wined3d: Enable all bump mapping formats.
by Alexandre Julliard 26 Jul '06

26 Jul '06

Module: wine Branch: refs/heads/master Commit: a5142837c6bc2777ae7262c1ba1fb773b6551634 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=a5142837c6bc2777ae7262c… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Tue Jul 25 21:10:01 2006 +0200 wined3d: Enable all bump mapping formats. --- dlls/wined3d/directx.c | 7 ++----- 1 files changed, 2 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 067fe4e..d804f93 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1540,16 +1540,13 @@ static HRESULT WINAPI IWineD3DImpl_Check */ case WINED3DFMT_V8U8: case WINED3DFMT_V16U16: - WARN_(d3d_caps)("[Not supported, but pretended to do]\n"); - return WINED3D_OK; - case WINED3DFMT_L6V5U5: case WINED3DFMT_X8L8V8U8: case WINED3DFMT_Q8W8V8U8: case WINED3DFMT_W11V11U10: case WINED3DFMT_A2W10V10U10: - TRACE_(d3d_caps)("[FAILED]\n"); - return D3DERR_NOTAVAILABLE; + WARN_(d3d_caps)("[Not supported, but pretended to do]\n"); + return WINED3D_OK; /***** * DXTN Formats: Handled above

1 0

Juan Lang : crypt32: Implement file stores.
by Alexandre Julliard 26 Jul '06

26 Jul '06

Module: wine Branch: refs/heads/master Commit: 6e23b4a25dd57a54dda8486aa1e88b4765404945 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=6e23b4a25dd57a54dda8486… Author: Juan Lang <juan_lang(a)yahoo.com> Date: Tue Jul 25 16:29:50 2006 -0700 crypt32: Implement file stores. --- dlls/crypt32/crypt32_private.h | 8 + dlls/crypt32/serialize.c | 336 ++++++++++++++++++++++++++++++-------- dlls/crypt32/store.c | 245 +++++++++++++++++++++++++-- dlls/crypt32/tests/store.c | 357 ++++++++++++++++++++++++++++++++++++++++ include/wincrypt.h | 9 + 5 files changed, 866 insertions(+), 89 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=6e23b4a25dd57a54dda…

1 0

Samuel Lidén Borell : dmime: Accept IDirectMusicPerformance2 in QueryInterface.
by Alexandre Julliard 26 Jul '06

26 Jul '06

Module: wine Branch: refs/heads/master Commit: 5d67651a71d36ee8c5dc6ea9be279954fb89bcd7 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=5d67651a71d36ee8c5dc6ea… Author: Samuel Lidén Borell <samuellb(a)bredband.net> Date: Tue Jul 25 23:48:28 2006 +0200 dmime: Accept IDirectMusicPerformance2 in QueryInterface. --- dlls/dmime/performance.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/dmime/performance.c b/dlls/dmime/performance.c index 9489be1..df1d23e 100644 --- a/dlls/dmime/performance.c +++ b/dlls/dmime/performance.c @@ -170,6 +170,7 @@ static HRESULT WINAPI IDirectMusicPerfor if (IsEqualIID (riid, &IID_IUnknown) || IsEqualIID (riid, &IID_IDirectMusicPerformance) || + IsEqualIID (riid, &IID_IDirectMusicPerformance2) || IsEqualIID (riid, &IID_IDirectMusicPerformance8)) { IUnknown_AddRef(iface); *ppobj = This;

1 0

Hwang YunSong(황윤성) : winefile: Updated Korean resource.
by Alexandre Julliard 26 Jul '06

26 Jul '06

Module: wine Branch: refs/heads/master Commit: d337991fb5de207b3e57a0d83435006b20058be6 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=d337991fb5de207b3e57a0d… Author: Hwang YunSong(황윤성) <hys545(a)dreamwiz.com> Date: Wed Jul 26 08:47:32 2006 +0900 winefile: Updated Korean resource. --- programs/winefile/Ko.rc | 47 ++++++++++++++++++++++++++++++++++++----------- 1 files changed, 36 insertions(+), 11 deletions(-) diff --git a/programs/winefile/Ko.rc b/programs/winefile/Ko.rc index 08be016..1518986 100644 --- a/programs/winefile/Ko.rc +++ b/programs/winefile/Ko.rc @@ -34,18 +34,18 @@ IDM_WINEFILE MENU FIXED IMPURE MENUITEM "��(&C)...\tF8", ID_FILE_COPY MENUITEM "Ŭ��(&I)...\tF9", 118 MENUITEM "��(&D)\tDel", ID_FILE_DELETE - MENUITEM "�̸��ٲٱ�(&n)...", 109 - MENUITEM "�Ӽ�(&i)...\tAlt+Enter", ID_EDIT_PROPERTIES + MENUITEM "�̸��ٲٱ�(&N)...", 109 + MENUITEM "�Ӽ�(&I)...\tAlt+Enter", ID_EDIT_PROPERTIES MENUITEM SEPARATOR - MENUITEM "��(&o)...", 119 - MENUITEM "�� Ǯ��(&o)...", 120 + MENUITEM "��(&O)...", 119 + MENUITEM "�� Ǯ��(&O)...", 120 MENUITEM SEPARATOR MENUITEM "��(&R)...", ID_EXECUTE MENUITEM "�μ�(&P)...", 102 MENUITEM "��...", 103 MENUITEM SEPARATOR - MENUITEM "��丮 ��(&e)...", 111 - MENUITEM "ã��(&h)...", 104 + MENUITEM "��丮 ��(&E)...", 111 + MENUITEM "ã��(&H)...", 104 MENUITEM "�� (&S)...", 116 MENUITEM SEPARATOR #ifndef _NO_EXTENSIONS @@ -73,10 +73,10 @@ #endif MENUITEM "��̺� ��(&S)...", 251 } - POPUP "��丮(&r)" { + POPUP "��丮(&R)" { MENUITEM "�� ܰ�(&N)\t+", 301 MENUITEM "Ʈ�� Ȯ��(&T)\t*", 302 - MENUITEM "�� Ȯ��(&a)\tStrg+*", 303 + MENUITEM "�� Ȯ��(&A)\tStrg+*", 303 MENUITEM "Ʈ�� (&T)\t-", 304 MENUITEM SEPARATOR MENUITEM "�� üũ(&M)", 505 @@ -188,7 +188,7 @@ BEGIN BS_AUTOCHECKBOX | WS_TABSTOP,13,32,70,10 CONTROL "Ǯ�׸�(&P)",IDC_VIEW_TYPE_PROGRAMS,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,13,43,70,10 - CONTROL "��(&m)",IDC_VIEW_TYPE_DOCUMENTS,"Button", + CONTROL "��(&M)",IDC_VIEW_TYPE_DOCUMENTS,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,13,54,70,10 CONTROL "�ٸ� ��(&O)",IDC_VIEW_TYPE_OTHERS,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,13,65,70,10 @@ -213,13 +213,13 @@ BEGIN EDITTEXT IDC_STATIC_PROP_LASTCHANGE,71,29,120,9,ES_READONLY | NOT WS_BORDER | WS_TABSTOP LTEXT "��:",-1,7,40,59,9 EDITTEXT IDC_STATIC_PROP_VERSION,71,40,120,9,ES_READONLY | NOT WS_BORDER | WS_TABSTOP - LTEXT "��۱�(&y):",-1,7,51,59,9 + LTEXT "��۱�(&Y):",-1,7,51,59,9 EDITTEXT IDC_STATIC_PROP_COPYRIGHT,71,51,120,9,ES_READONLY | NOT WS_BORDER | WS_TABSTOP LTEXT "ũ��:",-1,7,62,59,9 EDITTEXT IDC_STATIC_PROP_SIZE,71,62,120,9,ES_READONLY | NOT WS_BORDER | WS_TABSTOP GROUPBOX "�Ӽ�",-1,7,79,158,46 CONTROL "�б� ��(&R)",IDC_CHECK_READONLY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,91,68,9 - CONTROL "��(&i)",IDC_CHECK_HIDDEN,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,92,91,68,9 + CONTROL "��(&I)",IDC_CHECK_HIDDEN,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,92,91,68,9 CONTROL "��ī�̺�(&A)",IDC_CHECK_ARCHIVE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,101,68,9 CONTROL "�ý��(&S)",IDC_CHECK_SYSTEM,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,92,101,68,9 CONTROL "��(&C)",IDC_CHECK_COMPRESSED,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,17,111,68,9 @@ -263,3 +263,28 @@ STRINGTABLE IDS_FREE_SPACE_FMT "%s of %s ��밡��" } + + +STRINGTABLE +{ +IDS_LICENSE_CAPTION, "��̼�" +IDS_LICENSE, +"This library is free software; you can redistribute it and/or \ +modify it under the terms of the GNU Lesser General Public \ +License as published by the Free Software Foundation; either \ +version 2.1 of the License, or (at your option) any later version.\n\ +This library is distributed in the hope that it will be useful, \ +but WITHOUT ANY WARRANTY; without even the implied warranty of \ +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU \ +Lesser General Public License for more details.\n\ +You should have received a copy of the GNU Lesser General Public \ +License along with this library; if not, write to the Free Software \ +Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA" + +IDS_WARRANTY_CAPTION, "�� " +IDS_WARRANTY, +"This library is distributed in the hope that it will be useful, \ +but WITHOUT ANY WARRANTY; without even the implied warranty of \ +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU \ +Lesser General Public License for more details." +}

1 0

Mike McCormack : msi: Add a FIXME for join queries.
by Alexandre Julliard 26 Jul '06

26 Jul '06

Module: wine Branch: refs/heads/master Commit: 328298b64f16eaa9a10e3afcebc09d190c099141 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=328298b64f16eaa9a10e3af… Author: Mike McCormack <mike(a)codeweavers.com> Date: Wed Jul 26 11:17:26 2006 +0900 msi: Add a FIXME for join queries. --- dlls/msi/sql.y | 14 ++++++++++++-- 1 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/msi/sql.y b/dlls/msi/sql.y index 86ebe30..d6aecd5 100644 --- a/dlls/msi/sql.y +++ b/dlls/msi/sql.y @@ -126,7 +126,7 @@ static struct expr * EXPR_wildcard( void %type <string> table id %type <column_list> selcollist column column_and_type column_def table_def %type <column_list> column_assignment update_assign_list constlist -%type <query> query from fromtable selectfrom unorderedsel +%type <query> query multifrom from fromtable selectfrom unorderedsel %type <query> oneupdate onedelete oneselect onequery onecreate oneinsert %type <expr> expr val column_val const_val %type <column_type> column_type data_type data_type_l data_count @@ -369,7 +369,7 @@ unorderedsel: ; selectfrom: - selcollist from + selcollist multifrom { SQL_input* sql = (SQL_input*) info; UINT r; @@ -401,6 +401,16 @@ selcollist: } ; +multifrom: + from + | TK_FROM table TK_COMMA table TK_WHERE expr + { + SQL_input* sql = (SQL_input*) info; + FIXME("join query %s\n", debugstr_w(sql->command)); + YYABORT; + } + ; + from: fromtable | fromtable TK_WHERE expr

1 0

Dan Hipschman : widl: Allow trailing commas in attribute lists.
by Alexandre Julliard 26 Jul '06

26 Jul '06

Module: wine Branch: refs/heads/master Commit: 3b3632a1cd0e8c4633f00ac97325e583ebadaf60 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=3b3632a1cd0e8c4633f00ac… Author: Dan Hipschman <dsh(a)linux.ucla.edu> Date: Tue Jul 25 12:00:49 2006 -0700 widl: Allow trailing commas in attribute lists. --- tools/widl/parser.y | 17 ++++++++++++----- 1 files changed, 12 insertions(+), 5 deletions(-) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index a7b1269..1790985 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -343,16 +343,23 @@ m_attributes: { $$ = NULL; } ; attributes: - '[' attrib_list ']' { $$ = $2; } + '[' attrib_list ']' { $$ = $2; + if (!$$) + yyerror("empty attribute lists unsupported"); + } ; attrib_list: attribute - | attrib_list ',' attribute { LINK($3, $1); $$ = $3; } - | attrib_list ']' '[' attribute { LINK($4, $1); $$ = $4; } + | attrib_list ',' attribute { if ($3) { LINK($3, $1); $$ = $3; } + else { $$ = $1; } + } + | attrib_list ']' '[' attribute { if ($4) { LINK($4, $1); $$ = $4; } + else { $$ = $1; } + } ; -attribute: - tAGGREGATABLE { $$ = make_attr(ATTR_AGGREGATABLE); } +attribute: { $$ = NULL; } + | tAGGREGATABLE { $$ = make_attr(ATTR_AGGREGATABLE); } | tAPPOBJECT { $$ = make_attr(ATTR_APPOBJECT); } | tASYNC { $$ = make_attr(ATTR_ASYNC); } | tAUTOHANDLE { $$ = make_attr(ATTR_AUTO_HANDLE); }

1 0

Michael Stefaniuc : wined3d: Remove superfluous breaks.
by Alexandre Julliard 26 Jul '06

26 Jul '06

Module: wine Branch: refs/heads/master Commit: 5ca9f8266171e93b67bf625601ee56ad4eeaaf80 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=5ca9f8266171e93b67bf625… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jul 25 23:32:29 2006 +0200 wined3d: Remove superfluous breaks. --- dlls/wined3d/glsl_shader.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 4aa8b5b..b3ae5cb 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -1417,7 +1417,7 @@ void pshader_glsl_texm3x3tex(SHADER_OPCO case D3DSTT_CUBE: strcpy(dimensions, "Cube"); break; case D3DSTT_VOLUME: strcpy(dimensions, "3D"); break; default: - strcpy(dimensions, ""); break; + strcpy(dimensions, ""); FIXME("Unrecognized sampler type: %#lx\n", stype); break; } @@ -1447,7 +1447,7 @@ void pshader_glsl_texm3x3spec(SHADER_OPC case D3DSTT_CUBE: strcpy(dimensions, "Cube"); break; case D3DSTT_VOLUME: strcpy(dimensions, "3D"); break; default: - strcpy(dimensions, ""); break; + strcpy(dimensions, ""); FIXME("Unrecognized sampler type: %#lx\n", stype); break; } @@ -1568,7 +1568,7 @@ void pshader_glsl_texreg2rgb(SHADER_OPCO case D3DSTT_CUBE: strcpy(dimensions, "Cube"); break; case D3DSTT_VOLUME: strcpy(dimensions, "3D"); break; default: - strcpy(dimensions, ""); break; + strcpy(dimensions, ""); FIXME("Unrecognized sampler type: %#lx\n", stype); break; }

1 0