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

Paul Vriens : wined3d: GetScissorRect should use zero-based scissorBox ( Coverity).
by Alexandre Julliard June 16, 2006

June 16, 2006

Module: wine Branch: refs/heads/master Commit: edaac6f69685a537c47038082ef0842f3b7b84ec URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=edaac6f69685a537c470380… Author: Paul Vriens <Paul.Vriens(a)xs4all.nl> Date: Fri Jun 16 13:02:18 2006 +0200 wined3d: GetScissorRect should use zero-based scissorBox (Coverity). --- dlls/wined3d/device.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 70b5e23..b45a1e8 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4456,10 +4456,10 @@ static HRESULT WINAPI IWineD3DDeviceImpl ENTER_GL(); /** FIXME: Windows uses a top,left origin openGL uses a bottom Right? **/ glGetIntegerv(GL_SCISSOR_BOX, scissorBox); - pRect->left = scissorBox[1]; - pRect->top = scissorBox[2]; - pRect->right = scissorBox[1] + scissorBox[3]; - pRect->bottom = scissorBox[2] + scissorBox[4]; + pRect->left = scissorBox[0]; + pRect->top = scissorBox[1]; + pRect->right = scissorBox[0] + scissorBox[2]; + pRect->bottom = scissorBox[1] + scissorBox[3]; TRACE("(%p)Returning a Scissor Rect of %ld:%ld-%ld:%ld\n", This, pRect->left, pRect->top, pRect->right, pRect->bottom); LEAVE_GL(); return WINED3D_OK;

1 0

Huw Davies : rpcrt4: Fix the argument size of conformant arrays.
by Alexandre Julliard June 16, 2006

June 16, 2006

Module: wine Branch: refs/heads/master Commit: 26c2953e58bc8f04ba0aa9933b286ad58041df0a URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=26c2953e58bc8f04ba0aa99… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Jun 16 10:32:27 2006 +0100 rpcrt4: Fix the argument size of conformant arrays. --- dlls/rpcrt4/ndr_stubless.c | 29 +++++++++++++++++++++++++++-- 1 files changed, 27 insertions(+), 2 deletions(-) diff --git a/dlls/rpcrt4/ndr_stubless.c b/dlls/rpcrt4/ndr_stubless.c index 189af5c..56e8eff 100644 --- a/dlls/rpcrt4/ndr_stubless.c +++ b/dlls/rpcrt4/ndr_stubless.c @@ -1014,6 +1014,26 @@ LONG_PTR __cdecl call_server_func(SERVER } #endif +static DWORD calc_arg_size(MIDL_STUB_MESSAGE *pStubMsg, PFORMAT_STRING pFormat) +{ + DWORD size; + switch(*pFormat) + { + case RPC_FC_CARRAY: + size = *(const WORD*)(pFormat + 2); + ComputeConformance(pStubMsg, NULL, pFormat + 4, 0); + size *= pStubMsg->MaxCount; + break; + default: + FIXME("Unhandled type %02x\n", *pFormat); + /* fallthrough */ + case RPC_FC_RP: + size = sizeof(void *); + break; + } + return size; +} + /* FIXME: need to free some stuff in here too */ long WINAPI NdrStubCall2( struct IRpcStubBuffer * pThis, @@ -1367,8 +1387,13 @@ #endif else if (pParam->param_attributes.IsOut && !pParam->param_attributes.IsByValue) { - *(void **)pArg = NdrAllocate(&stubMsg, sizeof(void *)); - **(void ***)pArg = 0; + DWORD size = calc_arg_size(&stubMsg, pTypeFormat); + + if(size) + { + *(void **)pArg = NdrAllocate(&stubMsg, size); + memset(*(void **)pArg, 0, size); + } } break; case STUBLESS_CALCSIZE:

1 0

Andrey Turkin : msi: Added tests for MsiSetTargetPath.
by Alexandre Julliard June 16, 2006

June 16, 2006

Module: wine Branch: refs/heads/master Commit: 07edeb8394dc6f6370c7d60c0af55035aaab85ad URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=07edeb8394dc6f6370c7d60… Author: Andrey Turkin <pancha(a)mail.nnov.ru> Date: Fri Jun 16 01:07:59 2006 +0400 msi: Added tests for MsiSetTargetPath. --- dlls/msi/tests/package.c | 89 ++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 85 insertions(+), 4 deletions(-) diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index 48fde61..9e55caa 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -331,14 +331,59 @@ static void test_gettargetpath_bad(void) DeleteFile(msifile); } -static void test_settargetpath_bad(void) +static void test_settargetpath(void) { + char tempdir[MAX_PATH+8], buffer[MAX_PATH]; + DWORD sz; MSIHANDLE hpkg; UINT r; - - hpkg = package_from_db(create_package_db()); + MSIHANDLE hdb; + + hdb = create_package_db(); + ok ( hdb, "failed to create package database\n" ); + + r = add_directory_entry( hdb, "'TARGETDIR', '', 'SourceDir'" ); + ok( r == S_OK, "failed to add directory entry: %d\n" , r ); + + r = run_query( hdb, /* these tables required by Windows Installer for MsiSetTargetPath */ + "CREATE TABLE `Component` ( " + "`Component` CHAR(72) NOT NULL, " + "`ComponentId` CHAR(38), " + "`Directory_` CHAR(72) NOT NULL, " + "`Attributes` SHORT NOT NULL, " + "`Condition` CHAR(255), " + "`KeyPath` CHAR(72) " + "PRIMARY KEY `Component`)" ); + ok( r == S_OK, "cannot create Component table: %d\n", r ); + + r = run_query( hdb, + "INSERT INTO `Component` " + "(`Component`, `ComponentId`, `Directory_`, `Attributes`, `Condition`, `KeyPath`) " + "VALUES( 'WinWorkAround', '{83e2694d-0864-4124-9323-6d37630912a1}', 'TARGETDIR', 8, '', 'FL_dummycomponent')" ); + ok( r == S_OK, "cannot add dummy component: %d\n", r ); + + r = run_query( hdb, + "CREATE TABLE `Feature` ( " + "`Feature` CHAR(38) NOT NULL, " + "`Feature_Parent` CHAR(38), " + "`Title` CHAR(64), " + "`Description` CHAR(255), " + "`Display` SHORT NOT NULL, " + "`Level` SHORT NOT NULL, " + "`Directory_` CHAR(72), " + "`Attributes` SHORT NOT NULL " + "PRIMARY KEY `Feature`)" ); + ok( r == S_OK, "cannot create Feature table: %d\n", r ); + + hpkg = package_from_db( hdb ); ok( hpkg, "failed to create package\n"); + r = MsiDoAction( hpkg, "CostInitialize"); + ok( r == ERROR_SUCCESS, "cost init failed\n"); + + r = MsiDoAction( hpkg, "CostFinalize"); + ok( r == ERROR_SUCCESS, "cost finalize failed\n"); + r = MsiSetTargetPath( 0, NULL, NULL ); ok( r == ERROR_INVALID_PARAMETER, "wrong return val\n"); @@ -351,6 +396,42 @@ static void test_settargetpath_bad(void) r = MsiSetTargetPath( hpkg, "boo", "c:\\bogusx" ); ok( r == ERROR_DIRECTORY, "wrong return val\n"); + sz = sizeof tempdir - 1; + r = MsiGetTargetPath( hpkg, "TARGETDIR", tempdir, &sz ); + if ( r == S_OK ) + { + if ( GetTempFileName( tempdir, "_wt", 0, buffer ) ) + { + sprintf( tempdir, "%s\\subdir", buffer ); + r = MsiSetTargetPath( hpkg, "TARGETDIR", buffer ); + todo_wine { + ok( r == ERROR_SUCCESS, "MsiSetTargetPath on file returned %d\n", r ); + } + + r = MsiSetTargetPath( hpkg, "TARGETDIR", tempdir ); + todo_wine { + ok( r == ERROR_SUCCESS, "MsiSetTargetPath on 'subdir' of file returned %d\n", r ); + } + + DeleteFile( buffer ); + + r = MsiSetTargetPath( hpkg, "TARGETDIR", buffer ); + ok( r == ERROR_SUCCESS, "MsiSetTargetPath returned %d\n", r ); + + r = GetFileAttributes( buffer ); + ok ( r == INVALID_FILE_ATTRIBUTES, "file/directory exists after MsiSetTargetPath. Attributes: %08X\n", r ); + + r = MsiSetTargetPath( hpkg, "TARGETDIR", tempdir ); + todo_wine { + ok( r == ERROR_SUCCESS, "MsiSetTargetPath on subsubdir returned %d\n", r ); + } + } else { + trace("GetTempFileName failed, cannot do some tests\n"); + } + } else { + trace( "MsiGetTargetPath failed: %d\n", r ); + } + MsiCloseHandle( hpkg ); } @@ -1017,7 +1098,7 @@ START_TEST(package) test_getsourcepath(); test_doaction(); test_gettargetpath_bad(); - test_settargetpath_bad(); + test_settargetpath(); test_props(); test_condition(); test_msipackage();

1 0

Francois Gouget : Add trailing '\n's to ok() calls.
by Alexandre Julliard June 16, 2006

June 16, 2006

Module: wine Branch: refs/heads/master Commit: 9eb81363ad54839556cc12f78d78d1ada00ff8df URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=9eb81363ad54839556cc12f… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Jun 15 17:41:17 2006 +0200 Add trailing '\n's to ok() calls. Remove spaces before '\n'. --- dlls/d3d9/tests/stateblock.c | 2 +- dlls/riched20/tests/editor.c | 2 +- dlls/uxtheme/tests/system.c | 2 +- dlls/wined3d/device.c | 6 +++--- programs/cmdlgtst/cmdlgtst.c | 12 ++++++------ 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/d3d9/tests/stateblock.c b/dlls/d3d9/tests/stateblock.c index 8744c5d..178edf5 100644 --- a/dlls/d3d9/tests/stateblock.c +++ b/dlls/d3d9/tests/stateblock.c @@ -154,7 +154,7 @@ static void test_missing_light_recording hret = IDirect3DDevice9_GetLightEnable(device_ptr, 0, &result_light_enable); ok(hret == D3D_OK, "GetLightEnable returned: hret 0x%lx. Expected hret 0x%lx. Aborting.\n", hret, D3D_OK); if (hret != D3D_OK) goto cleanup; - ok(result_light_enable == 0, "Light enabled status was %u, instead of 0", result_light_enable); + ok(result_light_enable == 0, "Light enabled status was %u, instead of 0\n", result_light_enable); hret = IDirect3DDevice9_GetLight(device_ptr, 0, &result_light); ok(hret == D3D_OK, "GetLight returned: hret 0x%lx. Expected hret 0x%lx. Aborting.\n", hret, D3D_OK); diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index c2e3e04..c71ca7f 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -806,7 +806,7 @@ static void test_EM_SETUNDOLIMIT() SendMessage(hwndRichEdit,EM_EMPTYUNDOBUFFER, 0,0); result = SendMessage(hwndRichEdit, EM_SETUNDOLIMIT, -1, 0); ok (result == 100, - "EM_SETUNDOLIMIT returned %d when set to -1, instead of 100",result); + "EM_SETUNDOLIMIT returned %d when set to -1, instead of 100\n",result); DestroyWindow(hwndRichEdit); } diff --git a/dlls/uxtheme/tests/system.c b/dlls/uxtheme/tests/system.c index fe93660..fb0e9a2 100644 --- a/dlls/uxtheme/tests/system.c +++ b/dlls/uxtheme/tests/system.c @@ -189,7 +189,7 @@ static void test_CloseThemeData(void) SetLastError(0xdeadbeef); hRes = pCloseThemeData(NULL); - ok( hRes == E_HANDLE, "Expected E_HANDLE, got 0x%08lx", hRes); + ok( hRes == E_HANDLE, "Expected E_HANDLE, got 0x%08lx\n", hRes); ok( GetLastError() == 0xdeadbeef, "Expected 0xdeadbeef, got 0x%08lx\n", GetLastError()); diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 745eeb8..70b5e23 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4906,19 +4906,19 @@ process_vertices_strided(IWineD3DDeviceI D3DTS_WORLDMATRIX(0), &world_mat); - TRACE("View mat: \n"); + TRACE("View mat:\n"); TRACE("%f %f %f %f\n", view_mat.u.s._11, view_mat.u.s._12, view_mat.u.s._13, view_mat.u.s._14); \ TRACE("%f %f %f %f\n", view_mat.u.s._21, view_mat.u.s._22, view_mat.u.s._23, view_mat.u.s._24); \ TRACE("%f %f %f %f\n", view_mat.u.s._31, view_mat.u.s._32, view_mat.u.s._33, view_mat.u.s._34); \ TRACE("%f %f %f %f\n", view_mat.u.s._41, view_mat.u.s._42, view_mat.u.s._43, view_mat.u.s._44); \ - TRACE("Proj mat: \n"); + TRACE("Proj mat:\n"); TRACE("%f %f %f %f\n", proj_mat.u.s._11, proj_mat.u.s._12, proj_mat.u.s._13, proj_mat.u.s._14); \ TRACE("%f %f %f %f\n", proj_mat.u.s._21, proj_mat.u.s._22, proj_mat.u.s._23, proj_mat.u.s._24); \ TRACE("%f %f %f %f\n", proj_mat.u.s._31, proj_mat.u.s._32, proj_mat.u.s._33, proj_mat.u.s._34); \ TRACE("%f %f %f %f\n", proj_mat.u.s._41, proj_mat.u.s._42, proj_mat.u.s._43, proj_mat.u.s._44); \ - TRACE("World mat: \n"); + TRACE("World mat:\n"); TRACE("%f %f %f %f\n", world_mat.u.s._11, world_mat.u.s._12, world_mat.u.s._13, world_mat.u.s._14); \ TRACE("%f %f %f %f\n", world_mat.u.s._21, world_mat.u.s._22, world_mat.u.s._23, world_mat.u.s._24); \ TRACE("%f %f %f %f\n", world_mat.u.s._31, world_mat.u.s._32, world_mat.u.s._33, world_mat.u.s._34); \ diff --git a/programs/cmdlgtst/cmdlgtst.c b/programs/cmdlgtst/cmdlgtst.c index a8ce9ee..e4697ad 100644 --- a/programs/cmdlgtst/cmdlgtst.c +++ b/programs/cmdlgtst/cmdlgtst.c @@ -469,7 +469,7 @@ #endif #define OF(fn, fi, fl) \ if(dm->dmFields & fl){ \ - WINE_TRACE(" %s =%hd \n", (fn), dm->fi); \ + WINE_TRACE(" %s =%hd\n", (fn), dm->fi); \ } else \ WINE_TRACE(" %s NOT SET!\n", fn); @@ -488,11 +488,11 @@ static void mw_PageSetup(HWND hWnd) dm = GlobalLock(psd.hDevMode); if(dm) { WINE_TRACE("dm != NULL\nDEVMODEA struct:\n"); - WINE_TRACE(" dmDeviceName ='%s' \n", dm->dmDeviceName); - WINE_TRACE(" dmSpecVersion =%#x \n", dm->dmSpecVersion); - WINE_TRACE(" dmDriverVersion =%#x \n", dm->dmDriverVersion); - WINE_TRACE(" dmSize =%#x \n", dm->dmSize); - WINE_TRACE(" dmDriverExtra =%#x \n", dm->dmDriverExtra); + WINE_TRACE(" dmDeviceName ='%s'\n", dm->dmDeviceName); + WINE_TRACE(" dmSpecVersion =%#x\n", dm->dmSpecVersion); + WINE_TRACE(" dmDriverVersion =%#x\n", dm->dmDriverVersion); + WINE_TRACE(" dmSize =%#x\n", dm->dmSize); + WINE_TRACE(" dmDriverExtra =%#x\n", dm->dmDriverExtra); WINE_TRACE(" dmFields =%#lx\n", dm->dmFields); OF("dmOrientation", u1.s1.dmOrientation, DM_ORIENTATION) OF("dmPaperSize", u1.s1.dmPaperSize, DM_PAPERSIZE);

1 0

Francois Gouget : Assorted spelling fixes.
by Alexandre Julliard June 16, 2006

June 16, 2006

Module: wine Branch: refs/heads/master Commit: 11ae0f63861027796aec636a6225cc1628fc9feb URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=11ae0f63861027796aec636… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Jun 15 17:38:04 2006 +0200 Assorted spelling fixes. --- dlls/comctl32/tests/header.c | 2 +- dlls/d3d9/tests/device.c | 6 +++--- dlls/riched20/editor.c | 2 +- dlls/wined3d/device.c | 2 +- dlls/wined3d/directx.c | 2 +- dlls/wined3d/glsl_shader.c | 2 +- server/token.c | 2 +- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/comctl32/tests/header.c b/dlls/comctl32/tests/header.c index 178eac1..65038ce 100644 --- a/dlls/comctl32/tests/header.c +++ b/dlls/comctl32/tests/header.c @@ -225,7 +225,7 @@ static void check_auto_format(void) /* Windows implicitly sets some format bits in INSERTITEM */ - /* HDF_STRING is automaticaly set and cleared for no text */ + /* HDF_STRING is automatically set and cleared for no text */ hdiCreate.mask = HDI_TEXT|HDI_WIDTH|HDI_FORMAT; hdiCreate.pszText = text; hdiCreate.cxy = 100; diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index a01b2b5..9175d27 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -152,7 +152,7 @@ static void test_swapchain(void) /* Try to get a nonexistant swapchain */ hr = IDirect3DDevice9_GetSwapChain(pDevice, 1, &swapchainX); - ok(hr == D3DERR_INVALIDCALL, "GetSwapChain on an non-existant swapchain returned (%s)\n", DXGetErrorString9(hr)); + ok(hr == D3DERR_INVALIDCALL, "GetSwapChain on an nonexistent swapchain returned (%s)\n", DXGetErrorString9(hr)); ok(swapchainX == NULL, "Swapchain 1 is %p\n", swapchainX); if(swapchainX) IDirect3DSwapChain9_Release(swapchainX); @@ -233,7 +233,7 @@ static void test_swapchain(void) */ swapchainX = (void *) 0xdeadbeef; hr = IDirect3DDevice9_GetSwapChain(pDevice, 1, &swapchainX); - ok(hr == D3DERR_INVALIDCALL, "Failed to get the secound swapchain (%s)\n", DXGetErrorString9(hr)); + ok(hr == D3DERR_INVALIDCALL, "Failed to get the second swapchain (%s)\n", DXGetErrorString9(hr)); ok(swapchainX == NULL, "The swapchain pointer is %p\n", swapchainX); if(swapchainX && swapchainX != (void *) 0xdeadbeef ) IDirect3DSwapChain9_Release(swapchainX); @@ -384,7 +384,7 @@ cleanup: CHECK_RELEASE(pStateBlock, pDevice, --refcount); CHECK_RELEASE(pSwapChain, pDevice, --refcount); CHECK_RELEASE(pQuery, pDevice, --refcount); - /* This will destroy device - can not check the refcount here */ + /* This will destroy device - cannot check the refcount here */ if (pStateBlock1) IUnknown_Release( pStateBlock1 ); if (pD3d) IUnknown_Release( pD3d ); diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index ac1bf39..21f951e 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -1490,7 +1490,7 @@ LRESULT WINAPI RichEditANSIWndProc(HWND editor->nUndoLimit = min(wParam, STACK_SIZE_MAX); /* Setting a max stack size keeps wine from getting killed for hogging memory. Windows allocates all this memory at once, so - no program would realisticly set a value above our maxiumum. */ + no program would realistically set a value above our maxiumum. */ return editor->nUndoLimit; } case EM_CANUNDO: diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 1feb072..745eeb8 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4977,7 +4977,7 @@ process_vertices_strided(IWineD3DDeviceI ( rhw > eps ) ) ) { /* "Normal" viewport transformation (not clipped) - * 1) The values are divided trough rhw + * 1) The values are divided by rhw * 2) The y axis is negative, so multiply it with -1 * 3) Screen coordinates go from -(Width/2) to +(Width/2) and * -(Height/2) to +(Height/2). The z range is MinZ to MaxZ diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index f7f461c..68c1131 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1739,7 +1739,7 @@ #endif if (wined3d_settings.ps_mode == PS_HW && wined3d_settings.shader_mode == SHADER_GLSL && DeviceType != WINED3DDEVTYPE_REF) { *pCaps->PixelShaderVersion = D3DPS_VERSION(3,0); - /* FIXME: The following line is card dependant. -1.0 to 1.0 is a safe default clamp range for now */ + /* FIXME: The following line is card dependent. -1.0 to 1.0 is a safe default clamp range for now */ *pCaps->PixelShader1xMaxValue = 1.0; TRACE_(d3d_caps)("Hardware pixel shader versions 2.0+ enabled\n"); } else if (wined3d_settings.ps_mode == PS_HW diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index e99a2a2..54e311d 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -413,7 +413,7 @@ void shader_glsl_add_instruction_modifie * ****************************************************************************/ -/* Generate GLSL arithmatic functions (dst = src1 + src2) */ +/* Generate GLSL arithmetic functions (dst = src1 + src2) */ void shader_glsl_arith(SHADER_OPCODE_ARG* arg) { CONST SHADER_OPCODE* curOpcode = arg->opcode; diff --git a/server/token.c b/server/token.c index 4b15a30..983d751 100644 --- a/server/token.c +++ b/server/token.c @@ -1132,7 +1132,7 @@ DECL_HANDLER(access_check) } } -/* retrives the SID of the user that the token represents */ +/* retrieves the SID of the user that the token represents */ DECL_HANDLER(get_token_user) { struct token *token;

1 0

Francois Gouget : shell32: Remove dead code in SHELL_FindExecutable().
by Alexandre Julliard June 16, 2006

June 16, 2006

Module: wine Branch: refs/heads/master Commit: 2d7ef72cf03b59c02c10a47997fc4beea0370d1d URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=2d7ef72cf03b59c02c10a47… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Jun 15 18:29:29 2006 +0200 shell32: Remove dead code in SHELL_FindExecutable(). --- dlls/shell32/shlexec.c | 35 +++-------------------------------- 1 files changed, 3 insertions(+), 32 deletions(-) diff --git a/dlls/shell32/shlexec.c b/dlls/shell32/shlexec.c index 39f1de7..f626b1d 100644 --- a/dlls/shell32/shlexec.c +++ b/dlls/shell32/shlexec.c @@ -607,38 +607,9 @@ UINT SHELL_FindExecutable(LPCWSTR lpPath if (*filetype) { - if (lpOperation) - { - /* pass the operation string to SHELL_FindExecutableByOperation() */ - filetype[filetypelen] = '\0'; - retval = SHELL_FindExecutableByOperation(lpPath, lpFile, lpOperation, key, filetype, command, sizeof(command)); - } - else - { - WCHAR operation[MAX_PATH]; - HKEY hkey; - - /* Looking for ...buffer\shell\<operation>\command */ - strcatW(filetype, wszShell); - - /* enumerate the operation subkeys in the registry and search for one with an associated command */ - if (RegOpenKeyW(HKEY_CLASSES_ROOT, filetype, &hkey) == ERROR_SUCCESS) - { - int idx = 0; - for(;; ++idx) - { - if (RegEnumKeyW(hkey, idx, operation, MAX_PATH) != ERROR_SUCCESS) - break; - - filetype[filetypelen] = '\0'; - retval = SHELL_FindExecutableByOperation(lpPath, lpFile, operation, key, filetype, command, sizeof(command)); - - if (retval > 32) - break; - } - RegCloseKey(hkey); - } - } + /* pass the operation string to SHELL_FindExecutableByOperation() */ + filetype[filetypelen] = '\0'; + retval = SHELL_FindExecutableByOperation(lpPath, lpFile, lpOperation, key, filetype, command, sizeof(command)); if (retval > 32) {

1 0

Francois Gouget : ntdll: Use page_size instead of page_mask+1.
by Alexandre Julliard June 16, 2006

June 16, 2006

Module: wine Branch: refs/heads/master Commit: f248440dd4b10ac994658ee4bfacf8bc046dcdcb URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=f248440dd4b10ac994658ee… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Jun 15 17:50:15 2006 +0200 ntdll: Use page_size instead of page_mask+1. --- dlls/ntdll/virtual.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index 8f6296f..6a94e68 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -1203,7 +1203,7 @@ NTSTATUS VIRTUAL_HandleFault( LPCVOID ad BYTE vprot = view->prot[((const char *)page - (const char *)view->base) >> page_shift]; if (vprot & VPROT_GUARD) { - VIRTUAL_SetProt( view, page, page_mask + 1, vprot & ~VPROT_GUARD ); + VIRTUAL_SetProt( view, page, page_size, vprot & ~VPROT_GUARD ); ret = STATUS_GUARD_PAGE_VIOLATION; } } @@ -1597,7 +1597,7 @@ NTSTATUS WINAPI NtQueryVirtualMemory( HA if (view->protect & VPROT_IMAGE) info->Type = MEM_IMAGE; else if (view->flags & VFLAG_VALLOC) info->Type = MEM_PRIVATE; else info->Type = MEM_MAPPED; - for (size = base - alloc_base; size < view->size; size += page_mask+1) + for (size = base - alloc_base; size < view->size; size += page_size) if (view->prot[size >> page_shift] != vprot) break; } RtlLeaveCriticalSection(&csVirtual);

1 0

Kai Blin : secur32: Implement QueryContextAttributes. Add tests.
by Alexandre Julliard June 16, 2006

June 16, 2006

Module: wine Branch: refs/heads/master Commit: 9d5e09d748c9558142f4b6ce3680f33adc65635b URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=9d5e09d748c9558142f4b6c… Author: Kai Blin <kai.blin(a)gmail.com> Date: Fri Jun 16 06:59:48 2006 +0000 secur32: Implement QueryContextAttributes. Add tests. --- dlls/secur32/ntlm.c | 48 ++++++++++++++++++++++++++++++++------------- dlls/secur32/tests/main.c | 29 ++++++++++++++++++++++++++- 2 files changed, 62 insertions(+), 15 deletions(-) diff --git a/dlls/secur32/ntlm.c b/dlls/secur32/ntlm.c index 3554f67..07beb39 100644 --- a/dlls/secur32/ntlm.c +++ b/dlls/secur32/ntlm.c @@ -31,7 +31,7 @@ #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(secur32); -#define NTLM_MAX_BUF 2010 +#define NTLM_MAX_BUF 1904 /*********************************************************************** @@ -935,22 +935,42 @@ static SECURITY_STATUS SEC_ENTRY ntlm_De static SECURITY_STATUS SEC_ENTRY ntlm_QueryContextAttributesW(PCtxtHandle phContext, unsigned long ulAttribute, void *pBuffer) { - SECURITY_STATUS ret; - - /* FIXME: From reading wrapper.h, I think the dwUpper part of a context is - * the SecurePackage part and the dwLower part is the actual context - * handle. It should be easy to extract the context attributes from that. - */ TRACE("%p %ld %p\n", phContext, ulAttribute, pBuffer); - if (phContext) - { - ret = SEC_E_UNSUPPORTED_FUNCTION; - } - else + if (!phContext) + return SEC_E_INVALID_HANDLE; + + switch(ulAttribute) { - ret = SEC_E_INVALID_HANDLE; +#define _x(x) case (x) : FIXME(#x" stub\n"); break + _x(SECPKG_ATTR_ACCESS_TOKEN); + _x(SECPKG_ATTR_AUTHORITY); + _x(SECPKG_ATTR_DCE_INFO); + _x(SECPKG_ATTR_FLAGS); + _x(SECPKG_ATTR_KEY_INFO); + _x(SECPKG_ATTR_LIFESPAN); + _x(SECPKG_ATTR_NAMES); + _x(SECPKG_ATTR_NATIVE_NAMES); + _x(SECPKG_ATTR_NEGOTIATION_INFO); + _x(SECPKG_ATTR_PACKAGE_INFO); + _x(SECPKG_ATTR_PASSWORD_EXPIRY); + _x(SECPKG_ATTR_SESSION_KEY); + case SECPKG_ATTR_SIZES: + { + PSecPkgContext_Sizes spcs = (PSecPkgContext_Sizes)pBuffer; + spcs->cbMaxToken = NTLM_MAX_BUF; + spcs->cbMaxSignature = 16; + spcs->cbBlockSize = 1; + spcs->cbSecurityTrailer = 16; + return SEC_E_OK; + } + _x(SECPKG_ATTR_STREAM_SIZES); + _x(SECPKG_ATTR_TARGET_INFORMATION); +#undef _x + default: + TRACE("Unknown value %ld passed for ulAttribute\n", ulAttribute); } - return ret; + + return SEC_E_UNSUPPORTED_FUNCTION; } /*********************************************************************** diff --git a/dlls/secur32/tests/main.c b/dlls/secur32/tests/main.c index a673b73..0a00610 100644 --- a/dlls/secur32/tests/main.c +++ b/dlls/secur32/tests/main.c @@ -46,6 +46,7 @@ static SECURITY_STATUS (SEC_ENTRY * pAcc PULONG, PTimeStamp); static SECURITY_STATUS (SEC_ENTRY * pFreeCredentialsHandle)(PCredHandle); static SECURITY_STATUS (SEC_ENTRY * pDeleteSecurityContext)(PCtxtHandle); +static SECURITY_STATUS (SEC_ENTRY * pQueryContextAttributesA)(PCtxtHandle, ULONG, PVOID); typedef struct _SspiData { PCredHandle cred; @@ -77,6 +78,7 @@ void InitFunctionPtrs(void) pAcceptSecurityContext = (PVOID)GetProcAddress(secdll, "AcceptSecurityContext"); pFreeCredentialsHandle = (PVOID)GetProcAddress(secdll, "FreeCredentialsHandle"); pDeleteSecurityContext = (PVOID)GetProcAddress(secdll, "DeleteSecurityContext"); + pQueryContextAttributesA = (PVOID)GetProcAddress(secdll, "QueryContextAttributesA"); } } @@ -554,6 +556,7 @@ void testAuth(SEC_CHAR* sec_pkg_name, UL BOOL first = TRUE; SspiData client, server; SEC_WINNT_AUTH_IDENTITY id; + SecPkgContext_Sizes ctxt_sizes; if(setupPackageA(sec_pkg_name, &pkg_info) == SEC_E_OK) { @@ -611,7 +614,31 @@ void testAuth(SEC_CHAR* sec_pkg_name, UL trace("Looping\n"); first = FALSE; } - + + if(!strcmp(sec_pkg_name, "NTLM")) + { + sec_status = pQueryContextAttributesA(server.ctxt, + SECPKG_ATTR_SIZES, &ctxt_sizes); + + ok(sec_status == SEC_E_OK, + "pQueryContextAttributesA(SECPKG_ATTR_SIZES) returned %s\n", + getSecError(sec_status)); + ok(ctxt_sizes.cbMaxToken == 1904, + "cbMaxToken should be 1904 but is %lu\n", + ctxt_sizes.cbMaxToken); + ok(ctxt_sizes.cbMaxSignature == 16, + "cbMaxSignature should be 16 but is %lu\n", + ctxt_sizes.cbMaxSignature); + ok(ctxt_sizes.cbSecurityTrailer == 16, + "cbSecurityTrailer should be 16 but is %lu\n", + ctxt_sizes.cbSecurityTrailer); + ok(ctxt_sizes.cbBlockSize == 1, + "cbBlockSize should be 1 but is %lu\n", + ctxt_sizes.cbBlockSize); + } + else + trace("Unknown sec package %s\n", sec_pkg_name); + cleanupBuffers(&client); cleanupBuffers(&server);

1 0

Marcus Meissner : avifil32: Corrected destination size in MultiByteToWideChar.
by Alexandre Julliard June 16, 2006

June 16, 2006

Module: wine Branch: refs/heads/master Commit: f1b1fe63f623cb78263ad109d3ab4146be65eb56 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=f1b1fe63f623cb78263ad10… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Thu Jun 15 20:07:46 2006 +0200 avifil32: Corrected destination size in MultiByteToWideChar. --- dlls/avifil32/api.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/avifil32/api.c b/dlls/avifil32/api.c index 03cb983..182e72f 100644 --- a/dlls/avifil32/api.c +++ b/dlls/avifil32/api.c @@ -2189,7 +2189,7 @@ HRESULT WINAPI EditStreamSetInfoA(PAVIST memcpy(&asiw, asi, sizeof(asiw) - sizeof(asiw.szName)); MultiByteToWideChar(CP_ACP, 0, asi->szName, -1, - asiw.szName, sizeof(asiw.szName)); + asiw.szName, sizeof(asiw.szName)/sizeof(WCHAR)); return EditStreamSetInfoW(pstream, &asiw, sizeof(asiw)); }

1 0

Louis. Lenders : d3d9: Remove ValidatePixel/VertexShader.
by Alexandre Julliard June 16, 2006

June 16, 2006

Module: wine Branch: refs/heads/master Commit: 3c688e93454c1087e9e6a36cfa8e281722d022e3 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=3c688e93454c1087e9e6a36… Author: Louis. Lenders <xerox_xerox2000(a)yahoo.co.uk> Date: Thu Jun 15 18:49:46 2006 +0100 d3d9: Remove ValidatePixel/VertexShader. --- dlls/d3d9/d3d9.spec | 2 -- dlls/d3d9/d3d9_main.c | 24 ------------------------ 2 files changed, 0 insertions(+), 26 deletions(-) diff --git a/dlls/d3d9/d3d9.spec b/dlls/d3d9/d3d9.spec index 24e3ce6..0e6e5d2 100644 --- a/dlls/d3d9/d3d9.spec +++ b/dlls/d3d9/d3d9.spec @@ -1,6 +1,4 @@ @ stdcall D3D9GetSWInfo() @ stdcall DebugSetMute() @ stdcall Direct3DCreate9(long) -@ stdcall ValidatePixelShader(ptr long long ptr) -@ stdcall ValidateVertexShader(ptr long long ptr) @ stdcall D3DPERF_SetOptions(long) diff --git a/dlls/d3d9/d3d9_main.c b/dlls/d3d9/d3d9_main.c index 3ef5441..b64f50e 100644 --- a/dlls/d3d9/d3d9_main.c +++ b/dlls/d3d9/d3d9_main.c @@ -71,30 +71,6 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, } /*********************************************************************** - * ValidateVertexShader (D3D9.@) - * - * PARAMS - * toto result? - */ -BOOL WINAPI ValidateVertexShader(LPVOID pFunction, int param1, int param2, LPVOID toto) -{ - FIXME("(%p %d %d %p): stub\n", pFunction, param1, param2, toto); - return TRUE; -} - -/*********************************************************************** - * ValidatePixelShader (D3D9.@) - * - * PARAMS - * toto result? - */ -BOOL WINAPI ValidatePixelShader(LPVOID pFunction, int param1, int param2, LPVOID toto) -{ - FIXME("(%p %d %d %p): stub\n", pFunction, param1, param2, toto); - return TRUE; -} - -/*********************************************************************** * D3DPERF_SetOptions (D3D9.@) * */

1 0