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

Juan Lang : rsaenh: Public keys should be exported with the CALG_RSA_KEYX alg_id.
by Alexandre Julliard 27 Jul '06

27 Jul '06

Module: wine Branch: refs/heads/master Commit: c562957375b733873dfbb7b35c65454c64d91dbc URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=c562957375b733873dfbb7b… Author: Juan Lang <juan_lang(a)yahoo.com> Date: Wed Jul 26 10:20:09 2006 -0700 rsaenh: Public keys should be exported with the CALG_RSA_KEYX alg_id. --- dlls/rsaenh/rsaenh.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/rsaenh/rsaenh.c b/dlls/rsaenh/rsaenh.c index d42face..5a4ce2f 100644 --- a/dlls/rsaenh/rsaenh.c +++ b/dlls/rsaenh/rsaenh.c @@ -2195,6 +2195,8 @@ BOOL WINAPI RSAENH_CPExportKey(HCRYPTPRO pBlobHeader->bVersion = CUR_BLOB_VERSION; pBlobHeader->reserved = 0; pBlobHeader->aiKeyAlg = pCryptKey->aiAlgid; + if (pBlobHeader->aiKeyAlg == CALG_RSA_SIGN) + pBlobHeader->aiKeyAlg = CALG_RSA_KEYX; pRSAPubKey->magic = RSAENH_MAGIC_RSA1; pRSAPubKey->bitlen = pCryptKey->dwKeyLen << 3;

1 0

Andrew Talbot : regedit: Write-strings warning fix.
by Alexandre Julliard 27 Jul '06

27 Jul '06

Module: wine Branch: refs/heads/master Commit: 510b6d3b470585196f471e7a2a3d7bb6d32d88a9 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=510b6d3b470585196f471e7… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Wed Jul 26 19:32:29 2006 +0100 regedit: Write-strings warning fix. --- programs/regedit/listview.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/regedit/listview.c b/programs/regedit/listview.c index 64c54f0..7b74ac4 100644 --- a/programs/regedit/listview.c +++ b/programs/regedit/listview.c @@ -158,14 +158,14 @@ #endif index = ListView_InsertItem(hwndLV, &item); if (index != -1) { /* LPTSTR pszText = NULL; */ - LPTSTR pszText = _T("(cannot display value)"); + static TCHAR pszText[] = {'(','c','a','n','n','o','t',' ','d','i','s','p','l','a','y',' ','v','a','l','u','e',')',0}; switch (dwValType) { case REG_SZ: case REG_EXPAND_SZ: if (ValBuf) { ListView_SetItemText(hwndLV, index, 2, ValBuf); } else { - TCHAR textT[] = {'(','n','o','t',' ','s','e','t',')',0}; + static TCHAR textT[] = {'(','n','o','t',' ','s','e','t',')',0}; ListView_SetItemText(hwndLV, index, 2, textT); } break;

1 0

Roderick Colenbrander : wined3d: BltFast/BltOverride color keying.
by Alexandre Julliard 27 Jul '06

27 Jul '06

Module: wine Branch: refs/heads/master Commit: 3127d6401a789c7db5675a1682feb845016835b2 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=3127d6401a789c7db5675a1… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Wed Jul 26 23:19:04 2006 +0200 wined3d: BltFast/BltOverride color keying. --- dlls/wined3d/surface.c | 40 +++++++++++++++++++++++++++++++++------- 1 files changed, 33 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 8a5a8a8..00d68c2 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1635,13 +1635,13 @@ static HRESULT WINAPI IWineD3DSurfaceImp if (This->Flags & SFLAG_DIRTY) { TRACE("Reloading because surface is dirty\n"); } else if(/* Reload: gl texture has ck, now no ckey is set OR */ - (This->Flags & SFLAG_GLCKEY && !(This->CKeyFlags & DDSD_CKSRCBLT)) || + ((This->Flags & SFLAG_GLCKEY) && (!(This->CKeyFlags & DDSD_CKSRCBLT))) || /* Reload: vice versa OR */ - (!(This->Flags & SFLAG_GLCKEY) && !This->CKeyFlags & DDSD_CKSRCBLT) || + ((!(This->Flags & SFLAG_GLCKEY)) && (This->CKeyFlags & DDSD_CKSRCBLT)) || /* Also reload: Color key is active AND the color key has changed */ - (This->CKeyFlags & DDSD_CKSRCBLT) && ( - This->glCKey.dwColorSpaceLowValue != This->SrcBltCKey.dwColorSpaceLowValue || - This->glCKey.dwColorSpaceHighValue != This->SrcBltCKey.dwColorSpaceHighValue)) { + ((This->CKeyFlags & DDSD_CKSRCBLT) && ( + (This->glCKey.dwColorSpaceLowValue != This->SrcBltCKey.dwColorSpaceLowValue) || + (This->glCKey.dwColorSpaceHighValue != This->SrcBltCKey.dwColorSpaceHighValue)))) { TRACE("Reloading because of color keying\n"); } else { TRACE("surface isn't dirty\n"); @@ -2304,6 +2304,7 @@ static HRESULT IWineD3DSurfaceImpl_BltOv ( swapchain->backBuffer && (IWineD3DSurface *) Src != swapchain->backBuffer[0]) ) ) { float glTexCoord[4]; DWORD oldCKey; + DDCOLORKEY oldBltCKey = {0,0}; GLint oldLight, oldFog, oldDepth, oldBlend, oldCull, oldAlpha; GLint alphafunc; GLclampf alpharef; @@ -2345,6 +2346,16 @@ static HRESULT IWineD3DSurfaceImpl_BltOv Src->CKeyFlags &= ~DDSD_CKSRCBLT; } + /* Color keying */ + if(Flags & DDBLT_KEYDEST) { + oldBltCKey = This->SrcBltCKey; + /* Temporary replace the source color key with the destination one. We do this because the color conversion code which + * is in the end called from LoadTexture works with the source color. At the end of this function we restore the color key. + */ + This->SrcBltCKey = This->DestBltCKey; + } else if (Flags & DDBLT_KEYSRC) + oldBltCKey = This->SrcBltCKey; + /* Now load the surface */ IWineD3DSurface_PreLoad((IWineD3DSurface *) Src); @@ -2506,11 +2517,15 @@ static HRESULT IWineD3DSurfaceImpl_BltOv glDrawBuffer(oldDraw); } - /* Restore the color key */ + /* Restore the color key flags */ if(oldCKey != Src->CKeyFlags) { Src->CKeyFlags = oldCKey; } + /* Restore the old color key */ + if (Flags & (DDBLT_KEYSRC | DDBLT_KEYDEST)) + This->SrcBltCKey = oldBltCKey; + LEAVE_GL(); /* TODO: If the surface is locked often, perform the Blt in software on the memory instead */ @@ -2759,6 +2774,7 @@ HRESULT WINAPI IWineD3DSurfaceImpl_BltFa ( srcImpl && (srcImpl->resource.usage & WINED3DUSAGE_RENDERTARGET) )) { RECT SrcRect, DstRect; + DWORD Flags=0; if(rsrc) { SrcRect.left = rsrc->left; @@ -2777,7 +2793,17 @@ HRESULT WINAPI IWineD3DSurfaceImpl_BltFa DstRect.right = dstx + SrcRect.right - SrcRect.left; DstRect.bottom = dsty + SrcRect.bottom - SrcRect.top; - if(IWineD3DSurfaceImpl_BltOverride(This, &DstRect, Source, &SrcRect, 0, NULL) == WINED3D_OK) return WINED3D_OK; + /* Convert BltFast flags into Btl ones because it is called from SurfaceImpl_Blt aswell */ + if(trans & DDBLTFAST_SRCCOLORKEY) + Flags |= DDBLT_KEYSRC; + if(trans & DDBLTFAST_DESTCOLORKEY) + Flags |= DDBLT_KEYDEST; + if(trans & DDBLTFAST_WAIT) + Flags |= DDBLT_WAIT; + if(trans & DDBLTFAST_DONOTWAIT) + Flags |= DDBLT_DONOTWAIT; + + if(IWineD3DSurfaceImpl_BltOverride(This, &DstRect, Source, &SrcRect, Flags, NULL) == WINED3D_OK) return WINED3D_OK; }

1 0

Jason Green : wined3d: Fix some upside-down rendering issues for shaders.
by Alexandre Julliard 27 Jul '06

27 Jul '06

Module: wine Branch: refs/heads/master Commit: 46c4b88ba5214ef036f929463aeacd1f790db375 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=46c4b88ba5214ef036f9294… Author: Jason Green <jave27(a)gmail.com> Date: Wed Jul 26 22:13:32 2006 -0400 wined3d: Fix some upside-down rendering issues for shaders. --- dlls/wined3d/arb_program_shader.c | 6 +++++- dlls/wined3d/directx.c | 6 ++++-- dlls/wined3d/drawprim.c | 3 --- dlls/wined3d/vertexshader.c | 11 +++++++++++ 4 files changed, 20 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index ee56e9c..a2b07db 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -144,6 +144,9 @@ void shader_generate_arb_declarations( unsigned max_constantsF = min(This->baseShader.limits.constant_float, (pshader ? GL_LIMITS(pshader_constantsF) : GL_LIMITS(vshader_constantsF))); + /* Temporary Output register */ + shader_addline(buffer, "TEMP TMP_OUT;\n"); + for(i = 0; i < This->baseShader.limits.temporary; i++) { if (reg_maps->temporary[i]) shader_addline(buffer, "TEMP R%lu;\n", i); @@ -168,6 +171,7 @@ void shader_generate_arb_declarations( /* Need to PARAM the environment parameters (constants) so we can use relative addressing */ shader_addline(buffer, "PARAM C[%d] = { program.env[0..%d] };\n", max_constantsF, max_constantsF - 1); + shader_addline(buffer, "PARAM PROJECTION = state.matrix.projection.row[1];\n"); } static const char* shift_tab[] = { @@ -344,7 +348,7 @@ static void vshader_program_add_param(SH IWineD3DVertexShaderImpl* This = (IWineD3DVertexShaderImpl*) arg->shader; /* oPos, oFog and oPts in D3D */ - static const char* hwrastout_reg_names[] = { "result.position", "TMP_FOG", "result.pointsize" }; + static const char* hwrastout_reg_names[] = { "TMP_OUT", "TMP_FOG", "result.pointsize" }; DWORD reg = param & D3DSP_REGNUM_MASK; DWORD regtype = shader_get_regtype(param); diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 51d41e7..5b35494 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -247,8 +247,10 @@ void select_shader_max_constants(WineD3D gl_info->max_vshader_constantsF = gl_info->vs_glsl_constantsF - MAX_CONST_B - MAX_CONST_I; break; case SHADER_ARB: - /* ARB shaders seem to have an implicit PARAM when fog is used, so we need to subtract 1 from the total available */ - gl_info->max_vshader_constantsF = gl_info->vs_arb_constantsF - 1; + /* We have to subtract any other PARAMs that we might use in our shader programs. + * ATI seems to count 2 implicit PARAMs when we use fog and NVIDIA counts 1, + * and we reference one row of the PROJECTION matrix which counts as 1 PARAM. */ + gl_info->max_vshader_constantsF = gl_info->vs_arb_constantsF - 3; break; case SHADER_SW: gl_info->max_vshader_constantsF = 96; /* TODO: Fixup software shaders */ diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index a7dd644..ab6162c 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -304,9 +304,6 @@ static void primitiveInitState( } /* Vertex Shader output is already transformed, so set up identity matrices */ - /* FIXME: Actually, only true for software emulated ones, so when h/w ones - come along this needs to take into account whether s/w ones were - requested or not */ if (useVS) { glMatrixMode(GL_MODELVIEW); checkGLcall("glMatrixMode"); diff --git a/dlls/wined3d/vertexshader.c b/dlls/wined3d/vertexshader.c index c0ee399..923f953 100644 --- a/dlls/wined3d/vertexshader.c +++ b/dlls/wined3d/vertexshader.c @@ -718,6 +718,11 @@ #endif This->usesFog = 1; shader_addline(&buffer, "gl_FogFragCoord = clamp(gl_FogFragCoord, 0.0, 1.0);\n"); } + + /* Write the final position. + * Account for any inverted textures (render to texture case) by reversing the y coordinate + * (this is handled in drawPrim() when it sets the MODELVIEW and PROJECTION matrices) */ + shader_addline(&buffer, "gl_Position.y = gl_Position.y * gl_ProjectionMatrix[1][1];\n"); shader_addline(&buffer, "}\n\0"); @@ -754,6 +759,12 @@ #endif if (reg_maps->fog) shader_addline(&buffer, "MAX result.fogcoord, TMP_FOG, 0.0;\n"); + /* Write the final position. + * Account for any inverted textures (render to texture case) by reversing the y coordinate + * (this is handled in drawPrim() when it sets the MODELVIEW and PROJECTION matrices) */ + shader_addline(&buffer, "MOV result.position, TMP_OUT;\n"); + shader_addline(&buffer, "MUL result.position.y, TMP_OUT.y, state.matrix.projection.row[1].y;\n"); + shader_addline(&buffer, "END\n\0"); /* TODO: change to resource.glObjectHandle or something like that */

1 0

Stefan Dösinger : wined3d: Blacklist WINED3DFMT_R8G8B8 .
by Alexandre Julliard 27 Jul '06

27 Jul '06

Module: wine Branch: refs/heads/master Commit: 3588067b907b19b4dd338375528770a697f553b4 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=3588067b907b19b4dd33837… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Jul 27 00:56:09 2006 +0200 wined3d: Blacklist WINED3DFMT_R8G8B8. --- dlls/wined3d/directx.c | 14 +++++++++++++- 1 files changed, 13 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index d804f93..51d41e7 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1494,12 +1494,24 @@ static HRESULT WINAPI IWineD3DImpl_Check } } + /* This format is nothing special and it is supported perfectly. + * However, ati and nvidia driver on windows do not mark this format + * supported(tested with the dxCapsViewer) and pretending to + * support this format uncovers a bug in Battlefield 1942(fonts are missing) + * So do the same as Windows drivers and pretend not to support it on dx8 and 9 + * Enable it on dx7. It will need additional checking on dx10 when we support it. + */ + if(This->dxVersion > 7 && CheckFormat == WINED3DFMT_R8G8B8) { + TRACE_(d3d_caps)("[FAILED]\n"); + return WINED3DERR_NOTAVAILABLE; + } + switch (CheckFormat) { /***** * supported: RGB(A) formats */ - case WINED3DFMT_R8G8B8: + case WINED3DFMT_R8G8B8: /* Enable for dx7, blacklisted for 8 and 9 above */ case WINED3DFMT_A8R8G8B8: case WINED3DFMT_X8R8G8B8: case WINED3DFMT_R5G6B5:

1 0

Mike McCormack : comctl32: Fix a typo.
by Alexandre Julliard 27 Jul '06

27 Jul '06

Module: wine Branch: refs/heads/master Commit: b618e03b268b67b1d2e76b4d74648a0624398e40 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=b618e03b268b67b1d2e76b4… Author: Mike McCormack <mike(a)codeweavers.com> Date: Thu Jul 27 11:05:24 2006 +0900 comctl32: Fix a typo. --- include/commctrl.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/commctrl.h b/include/commctrl.h index 1d7421a..86d7bfd 100644 --- a/include/commctrl.h +++ b/include/commctrl.h @@ -1427,7 +1427,7 @@ typedef struct tagNMTBGETINFOTIPW LPARAM lParam; } NMTBGETINFOTIPW, *LPNMTBGETINFOTIPW; -#define NMTBGETINFOTIP WINELIB_NAME_AW(NMTBGETINFOFTIP) +#define NMTBGETINFOTIP WINELIB_NAME_AW(NMTBGETINFOTIP) #define LPNMTBGETINFOTIP WINELIB_NAME_AW(LPNMTBGETINFOTIP) typedef struct

1 0

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

27 Jul '06

Module: wine Branch: refs/heads/master Commit: 0b5a6cd11b0e7a36d4ece6628ac0da781059875f URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=0b5a6cd11b0e7a36d4ece66… Author: Hwang YunSong(황윤성) <hys545(a)dreamwiz.com> Date: Thu Jul 27 08:48:58 2006 +0900 wineconsole: Updated Korean resource. --- programs/wineconsole/wineconsole_Ko.rc | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/programs/wineconsole/wineconsole_Ko.rc b/programs/wineconsole/wineconsole_Ko.rc index c39ba1c..c05fc03 100644 --- a/programs/wineconsole/wineconsole_Ko.rc +++ b/programs/wineconsole/wineconsole_Ko.rc @@ -28,10 +28,10 @@ IDS_MARK, "&Mark" IDS_COPY, "��(&C)" IDS_PASTE, "�ٿ��ֱ�(&P)" IDS_SELECTALL, "�� (&S)" -IDS_SCROLL, "��ũ��(&r)" -IDS_SEARCH, "ã��(&e)" +IDS_SCROLL, "��ũ��(&R)" +IDS_SEARCH, "ã��(&E)" IDS_FNT_DISPLAY, "�� ڴ� %ld �ȼ� �ʺ� %ld �ȼ� ��̸� ��ϴ�" -IDS_FNT_PREVIEW_1, "�̰�� " +IDS_FNT_PREVIEW_1, "�̰�� ׽�Ʈ�Դϴ�" IDS_FNT_PREVIEW_2, "" IDS_DLG_TIT_DEFAULT, "��ġ - �⺻ ��" IDS_DLG_TIT_CURRENT, "��ġ - �� " @@ -52,9 +52,9 @@ FONT 8, "MS Shell Dlg" GROUPBOX "��Ʈ��", -1, 75, 11, 125, 44, BS_GROUPBOX LTEXT "�˾� �޴�", -1, 79, 23, 40, 10 AUTOCHECKBOX "��Ʈ��(&C)", IDC_OPT_CONF_CTRL, 129, 23, 60, 10, WS_TABSTOP - AUTOCHECKBOX "��Ʈ(&h)", IDC_OPT_CONF_SHIFT, 129, 33, 60, 10, WS_TABSTOP + AUTOCHECKBOX "��Ʈ(&H)", IDC_OPT_CONF_SHIFT, 129, 33, 60, 10, WS_TABSTOP LTEXT "�� ", -1, 79, 43, 50, 10 - AUTOCHECKBOX "��(&e)", IDC_OPT_QUICK_EDIT, 129, 43, 60, 10, WS_TABSTOP + AUTOCHECKBOX "��(&E)", IDC_OPT_QUICK_EDIT, 129, 43, 60, 10, WS_TABSTOP GROUPBOX "�� 丮", -1, 10, 57, 190, 35, BS_GROUPBOX LTEXT "�ٽ� �δ� �� (&N) :", -1, 14, 67, 78, 18 @@ -93,10 +93,10 @@ FONT 8, "MS Shell Dlg" CONTROL "", IDC_CNF_SB_HEIGHT_UD, "msctls_updown32", UDS_SETBUDDYINT|UDS_ALIGNRIGHT|UDS_AUTOBUDDY|UDS_ARROWKEYS|UDS_NOTHOUSANDS, 0, 0, 0, 0 GROUPBOX "â ũ��", -1, 10, 55, 100, 42 - LTEXT "�ʺ�(&i) :", -1, 14, 69, 54, 9 + LTEXT "�ʺ�(&I) :", -1, 14, 69, 54, 9 EDITTEXT IDC_CNF_WIN_WIDTH, 68, 67, 36, 12, WS_TABSTOP|WS_BORDER|ES_NUMBER CONTROL "", IDC_CNF_WIN_WIDTH_UD, "msctls_updown32", UDS_SETBUDDYINT|UDS_ALIGNRIGHT|UDS_AUTOBUDDY|UDS_ARROWKEYS|UDS_NOTHOUSANDS, 0, 0, 0, 0 - LTEXT "��(&e) :", -1, 14, 83, 54, 9 + LTEXT "��(&E) :", -1, 14, 83, 54, 9 EDITTEXT IDC_CNF_WIN_HEIGHT, 68, 81, 36, 12, WS_TABSTOP|WS_BORDER|ES_NUMBER CONTROL "", IDC_CNF_WIN_HEIGHT_UD, "msctls_updown32", UDS_SETBUDDYINT|UDS_ALIGNRIGHT|UDS_AUTOBUDDY|UDS_ARROWKEYS|UDS_NOTHOUSANDS, 0, 0, 0, 0

1 0

Mike McCormack : msi: Remember to free a handle.
by Alexandre Julliard 27 Jul '06

27 Jul '06

Module: wine Branch: refs/heads/master Commit: e12f2b36a31b17c6eb625e6671d2406442967ad2 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=e12f2b36a31b17c6eb625e6… Author: Mike McCormack <mike(a)codeweavers.com> Date: Thu Jul 27 11:23:54 2006 +0900 msi: Remember to free a handle. --- dlls/msi/tests/format.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/msi/tests/format.c b/dlls/msi/tests/format.c index e776fa6..1ea9ee3 100644 --- a/dlls/msi/tests/format.c +++ b/dlls/msi/tests/format.c @@ -1181,6 +1181,8 @@ static void test_formatrecord(void) ok( sz == 12, "size wrong\n"); ok( 0 == strcmp(buffer,"{foo[-1]foo}"), "wrong output %s\n",buffer); ok( r == ERROR_SUCCESS, "format failed\n"); + + MsiCloseHandle( hrec ); } static void test_formatrecord_package(void)

1 0

Mike McCormack : msi: Fix the value of LONG integers in records ( suggested by James Hawkins).
by Alexandre Julliard 27 Jul '06

27 Jul '06

Module: wine Branch: refs/heads/master Commit: 65d12c342d95d15320c127f8192fe08f1ef8a670 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=65d12c342d95d15320c127f… Author: Mike McCormack <mike(a)codeweavers.com> Date: Thu Jul 27 12:34:20 2006 +0900 msi: Fix the value of LONG integers in records (suggested by James Hawkins). --- dlls/msi/table.c | 2 ++ dlls/msi/tests/db.c | 8 ++++++++ dlls/msi/where.c | 2 +- 3 files changed, 11 insertions(+), 1 deletions(-) diff --git a/dlls/msi/table.c b/dlls/msi/table.c index 39dfc4e..1a3ccb2 100644 --- a/dlls/msi/table.c +++ b/dlls/msi/table.c @@ -1308,6 +1308,8 @@ static UINT msi_table_modify_row( MSITAB val = MSI_RecordGetInteger( rec, i+1 ); if ( 2 == bytes_per_column( &tv->columns[i] ) ) val ^= 0x8000; + else + val ^= 0x80000000; } r = TABLE_set_int( &tv->view, row, i+1, val ); if( r ) diff --git a/dlls/msi/tests/db.c b/dlls/msi/tests/db.c index 8f0b75f..baf5635 100644 --- a/dlls/msi/tests/db.c +++ b/dlls/msi/tests/db.c @@ -1026,12 +1026,20 @@ static void test_where(void) r = do_query(hdb, query, &rec); ok(r == ERROR_SUCCESS, "MsiViewFetch failed: %d\n", r); ok( check_record( rec, 4, "zero.cab"), "wrong cabinet\n"); + MsiCloseHandle( rec ); query = "SELECT * FROM `Media` WHERE `LastSequence` >= 1"; r = do_query(hdb, query, &rec); ok(r == ERROR_SUCCESS, "MsiViewFetch failed: %d\n", r); ok( check_record( rec, 4, "one.cab"), "wrong cabinet\n"); + r = MsiRecordGetInteger(rec, 1); + ok( 2 == r, "field wrong\n"); + r = MsiRecordGetInteger(rec, 2); + ok( 1 == r, "field wrong\n"); + + MsiCloseHandle( rec ); + MsiCloseHandle( hdb ); DeleteFile(msifile); } diff --git a/dlls/msi/where.c b/dlls/msi/where.c index 7670bfd..d01510b 100644 --- a/dlls/msi/where.c +++ b/dlls/msi/where.c @@ -197,7 +197,7 @@ static UINT WHERE_evaluate( MSIDATABASE case EXPR_COL_NUMBER32: r = table->ops->fetch_int( table, row, cond->u.col_number, &tval ); - *val = tval; + *val = tval - 0x80000000; return r; case EXPR_UVAL:

1 0

James Hawkins : msi: Test the column types of MSI packages.
by Alexandre Julliard 27 Jul '06

27 Jul '06

Module: wine Branch: refs/heads/master Commit: 75c866ed58c5fcab66dc826249bb6f096bcb8608 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=75c866ed58c5fcab66dc826… Author: James Hawkins <truiken(a)gmail.com> Date: Wed Jul 26 14:53:09 2006 -0700 msi: Test the column types of MSI packages. --- dlls/msi/tests/install.c | 69 +++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 68 insertions(+), 1 deletions(-) diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index 8792629..609fafa 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -126,7 +126,7 @@ static const CHAR install_exec_seq_dat[] "WriteRegistryValues\t\t5000"; static const CHAR media_dat[] = "DiskId\tLastSequence\tDiskPrompt\tCabinet\tVolumeLabel\tSource\n" - "i2\ti2\tL64\tS255\tS32\tS72\n" + "i2\ti4\tL64\tS255\tS32\tS72\n" "Media\tDiskId\n" "1\t3\t\t\tDISK1\t\n" "2\t5\t\tmsitest.cab\tDISK2\t\n"; @@ -316,6 +316,17 @@ static int fci_delete(char *pszFile, int return 0; } +static BOOL check_record(MSIHANDLE rec, UINT field, LPSTR val) +{ + CHAR buffer[0x20]; + UINT r; + DWORD sz; + + sz = sizeof buffer; + r = MsiRecordGetString(rec, field, buffer, &sz); + return (r == ERROR_SUCCESS ) && !strcmp(val, buffer); +} + static BOOL get_temp_file(char *pszTempName, int cbTempName, void *pv) { LPSTR tempname; @@ -679,6 +690,61 @@ static void test_MsiSetComponentState(vo CoUninitialize(); } +static void test_packagecoltypes(void) +{ + MSIHANDLE hdb, view, rec; + char path[MAX_PATH]; + LPSTR query; + UINT r, count; + + CoInitialize(NULL); + + lstrcpy(path, CURR_DIR); + lstrcat(path, "\\"); + lstrcat(path, msifile); + + r = MsiOpenDatabase(path, MSIDBOPEN_READONLY, &hdb); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + + query = "SELECT * FROM `Media`"; + r = MsiDatabaseOpenView( hdb, query, &view ); + todo_wine + { + ok(r == ERROR_SUCCESS, "MsiDatabaseOpenView failed\n"); + } + + r = MsiViewGetColumnInfo( view, MSICOLINFO_NAMES, &rec ); + count = MsiRecordGetFieldCount( rec ); + todo_wine + { + ok(r == ERROR_SUCCESS, "MsiViewGetColumnInfo failed\n"); + ok(count == 6, "Expected 6, got %d\n", count); + ok(check_record(rec, 1, "DiskId"), "wrong column label\n"); + ok(check_record(rec, 2, "LastSequence"), "wrong column label\n"); + ok(check_record(rec, 3, "DiskPrompt"), "wrong column label\n"); + ok(check_record(rec, 4, "Cabinet"), "wrong column label\n"); + ok(check_record(rec, 5, "VolumeLabel"), "wrong column label\n"); + ok(check_record(rec, 6, "Source"), "wrong column label\n"); + } + + r = MsiViewGetColumnInfo( view, MSICOLINFO_TYPES, &rec ); + count = MsiRecordGetFieldCount( rec ); + todo_wine + { + ok(r == ERROR_SUCCESS, "MsiViewGetColumnInfo failed\n"); + ok(count == 6, "Expected 6, got %d\n", count); + ok(check_record(rec, 1, "i2"), "wrong column label\n"); + ok(check_record(rec, 2, "i4"), "wrong column label\n"); + ok(check_record(rec, 3, "L64"), "wrong column label\n"); + ok(check_record(rec, 4, "S255"), "wrong column label\n"); + ok(check_record(rec, 5, "S32"), "wrong column label\n"); + ok(check_record(rec, 6, "S72"), "wrong column label\n"); + } + + MsiCloseHandle(hdb); + DeleteFile(msifile); +} + START_TEST(install) { if (!init_function_pointers()) @@ -689,6 +755,7 @@ START_TEST(install) test_MsiInstallProduct(); test_MsiSetComponentState(); + test_packagecoltypes(); delete_test_files(); }

1 0