October 2007 - Wine-commits

Louis Lenders : d3dx8: Update spec file.
by Alexandre Julliard 04 Oct '07

04 Oct '07

Module: wine Branch: master Commit: 514db0a59d07b999c83de8e2275e6166398b7b3b URL: http://source.winehq.org/git/wine.git/?a=commit;h=514db0a59d07b999c83de8e22… Author: Louis Lenders <xerox_xerox2000(a)yahoo.co.uk> Date: Thu Oct 4 09:11:14 2007 +0100 d3dx8: Update spec file. --- dlls/d3dx8/d3dx8.spec | 153 ++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 150 insertions(+), 3 deletions(-) diff --git a/dlls/d3dx8/d3dx8.spec b/dlls/d3dx8/d3dx8.spec index c41a39a..3293614 100644 --- a/dlls/d3dx8/d3dx8.spec +++ b/dlls/d3dx8/d3dx8.spec @@ -1,6 +1,153 @@ -@ stdcall D3DXAssembleShader(ptr long long ptr ptr ptr) +@ stub D3DXVec2Normalize +@ stub D3DXVec2Hermite +@ stub D3DXVec2CatmullRom +@ stub D3DXVec2BaryCentric +@ stub D3DXVec2Transform +@ stub D3DXVec2TransformCoord +@ stub D3DXVec2TransformNormal +@ stub D3DXVec3Normalize +@ stub D3DXVec3Hermite +@ stub D3DXVec3CatmullRom +@ stub D3DXVec3BaryCentric +@ stub D3DXVec3Transform +@ stub D3DXVec3TransformCoord +@ stub D3DXVec3TransformNormal +@ stub D3DXVec3Project +@ stub D3DXVec3Unproject +@ stub D3DXVec4Cross +@ stub D3DXVec4Normalize +@ stub D3DXVec4Hermite +@ stub D3DXVec4CatmullRom +@ stub D3DXVec4BaryCentric +@ stub D3DXVec4Transform +@ stub D3DXMatrixfDeterminant +@ stub D3DXMatrixMultiply +@ stub D3DXMatrixTranspose +@ stub D3DXMatrixInverse +@ stub D3DXMatrixScaling +@ stub D3DXMatrixTranslation +@ stub D3DXMatrixRotationX +@ stub D3DXMatrixRotationY +@ stub D3DXMatrixRotationZ +@ stub D3DXMatrixRotationAxis +@ stub D3DXMatrixRotationQuaternion +@ stub D3DXMatrixRotationYawPitchRoll +@ stub D3DXMatrixTransformation +@ stub D3DXMatrixAffineTransformation +@ stub D3DXMatrixLookAtRH +@ stub D3DXMatrixLookAtLH +@ stub D3DXMatrixPerspectiveRH +@ stub D3DXMatrixPerspectiveLH +@ stub D3DXMatrixPerspectiveFovRH +@ stub D3DXMatrixPerspectiveFovLH +@ stub D3DXMatrixPerspectiveOffCenterRH +@ stub D3DXMatrixPerspectiveOffCenterLH +@ stub D3DXMatrixOrthoRH +@ stub D3DXMatrixOrthoLH +@ stub D3DXMatrixOrthoOffCenterRH +@ stub D3DXMatrixOrthoOffCenterLH +@ stub D3DXMatrixShadow +@ stub D3DXMatrixReflect +@ stub D3DXQuaternionToAxisAngle +@ stub D3DXQuaternionRotationMatrix +@ stub D3DXQuaternionRotationAxis +@ stub D3DXQuaternionRotationYawPitchRoll +@ stub D3DXQuaternionMultiply +@ stub D3DXQuaternionNormalize +@ stub D3DXQuaternionInverse +@ stub D3DXQuaternionLn +@ stub D3DXQuaternionExp +@ stub D3DXQuaternionSlerp +@ stub D3DXQuaternionSquad +@ stub D3DXQuaternionBaryCentric +@ stub D3DXPlaneNormalize +@ stub D3DXPlaneIntersectLine +@ stub D3DXPlaneFromPointNormal +@ stub D3DXPlaneFromPoints +@ stub D3DXPlaneTransform +@ stub D3DXColorAdjustSaturation +@ stub D3DXColorAdjustContrast +@ stub D3DXCreateMatrixStack +@ stdcall D3DXCreateFont(ptr ptr ptr) +@ stub D3DXCreateFontIndirect +@ stub D3DXCreateSprite +@ stub D3DXCreateRenderToSurface +@ stub D3DXCreateRenderToEnvMap @ stdcall D3DXAssembleShaderFromFileA(ptr long ptr ptr ptr) @ stdcall D3DXAssembleShaderFromFileW(ptr long ptr ptr ptr) -@ stdcall D3DXCreateBuffer(long ptr) -@ stdcall D3DXCreateFont(ptr ptr ptr) @ stdcall D3DXGetFVFVertexSize(long) +@ stub D3DXGetErrorStringA +@ stub D3DXGetErrorStringW +@ stdcall D3DXAssembleShader(ptr long long ptr ptr ptr) +@ stub D3DXCompileEffectFromFileA +@ stub D3DXCompileEffectFromFileW +@ stub D3DXCompileEffect +@ stub D3DXCreateEffect +@ stub D3DXCreateMesh +@ stub D3DXCreateMeshFVF +@ stub D3DXCreateSPMesh +@ stub D3DXCleanMesh +@ stub D3DXValidMesh +@ stub D3DXGeneratePMesh +@ stub D3DXSimplifyMesh +@ stub D3DXComputeBoundingSphere +@ stub D3DXComputeBoundingBox +@ stub D3DXComputeNormals +@ stdcall D3DXCreateBuffer(long ptr) +@ stub D3DXLoadMeshFromX +@ stub D3DXSaveMeshToX +@ stub D3DXCreatePMeshFromStream +@ stub D3DXCreateSkinMesh +@ stub D3DXCreateSkinMeshFVF +@ stub D3DXCreateSkinMeshFromMesh +@ stub D3DXLoadMeshFromXof +@ stub D3DXLoadSkinMeshFromXof +@ stub D3DXTesselateMesh +@ stub D3DXDeclaratorFromFVF +@ stub D3DXFVFFromDeclarator +@ stub D3DXWeldVertices +@ stub D3DXIntersect +@ stub D3DXSphereBoundProbe +@ stub D3DXBoxBoundProbe +@ stub D3DXCreatePolygon +@ stub D3DXCreateBox +@ stub D3DXCreateCylinder +@ stub D3DXCreateSphere +@ stub D3DXCreateTorus +@ stub D3DXCreateTeapot +@ stub D3DXCreateTextA +@ stub D3DXCreateTextW +@ stub D3DXLoadSurfaceFromFileA +@ stub D3DXLoadSurfaceFromFileW +@ stub D3DXLoadSurfaceFromResourceA +@ stub D3DXLoadSurfaceFromResourceW +@ stub D3DXLoadSurfaceFromFileInMemory +@ stub D3DXLoadSurfaceFromSurface +@ stub D3DXLoadSurfaceFromMemory +@ stub D3DXLoadVolumeFromVolume +@ stub D3DXLoadVolumeFromMemory +@ stub D3DXCheckTextureRequirements +@ stub D3DXCreateTexture +@ stub D3DXCreateTextureFromFileA +@ stub D3DXCreateTextureFromFileW +@ stub D3DXCreateTextureFromResourceA +@ stub D3DXCreateTextureFromResourceW +@ stub D3DXCreateTextureFromFileExA +@ stub D3DXCreateTextureFromFileExW +@ stub D3DXCreateTextureFromResourceExA +@ stub D3DXCreateTextureFromResourceExW +@ stub D3DXCreateTextureFromFileInMemory +@ stub D3DXCreateTextureFromFileInMemoryEx +@ stub D3DXFilterTexture +@ stub D3DXCheckCubeTextureRequirements +@ stub D3DXCreateCubeTexture +@ stub D3DXCreateCubeTextureFromFileA +@ stub D3DXCreateCubeTextureFromFileW +@ stub D3DXCreateCubeTextureFromFileExA +@ stub D3DXCreateCubeTextureFromFileExW +@ stub D3DXCreateCubeTextureFromFileInMemory +@ stub D3DXCreateCubeTextureFromFileInMemoryEx +@ stub D3DXFilterCubeTexture +@ stub D3DXCheckVolumeTextureRequirements +@ stub D3DXCreateVolumeTexture +@ stub D3DXFilterVolumeTexture

1 0

Rob Shearman : server: Add get_sd and set_sd object operations to allow the security descriptor to be stored somewhere other than server memory , such as on disk.
by Alexandre Julliard 04 Oct '07

04 Oct '07

1 0

Rob Shearman : server: Add primitive support for setting and getting the security descriptor of files based on their Unix permissions .
by Alexandre Julliard 04 Oct '07

04 Oct '07

Module: wine Branch: master Commit: cb124c9b1281a15a8c776b65a1cb309490b4c9b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb124c9b1281a15a8c776b65a… Author: Rob Shearman <rob(a)codeweavers.com> Date: Wed Oct 3 20:19:05 2007 +0100 server: Add primitive support for setting and getting the security descriptor of files based on their Unix permissions. --- server/file.c | 251 ++++++++++++++++++++++++++++++++++++++++++++++++++++- server/security.h | 13 +++ server/token.c | 15 +--- 3 files changed, 264 insertions(+), 15 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=cb124c9b1281a15a8c776…

1 0

Louis Lenders : d3dx8: Add DllMain.
by Alexandre Julliard 04 Oct '07

04 Oct '07

Module: wine Branch: master Commit: 547d4067192e593664c9314b073c6bac3d75aa24 URL: http://source.winehq.org/git/wine.git/?a=commit;h=547d4067192e593664c9314b0… Author: Louis Lenders <xerox_xerox2000(a)yahoo.co.uk> Date: Thu Oct 4 08:50:36 2007 +0100 d3dx8: Add DllMain. --- dlls/d3dx8/d3dx8_main.c | 18 ++++++++++++++++++ 1 files changed, 18 insertions(+), 0 deletions(-) diff --git a/dlls/d3dx8/d3dx8_main.c b/dlls/d3dx8/d3dx8_main.c index 958ef9b..9221221 100644 --- a/dlls/d3dx8/d3dx8_main.c +++ b/dlls/d3dx8/d3dx8_main.c @@ -90,3 +90,21 @@ HRESULT WINAPI D3DXAssembleShaderFromFileW(LPSTR pSrcFile, DWORD Flags, FIXME("(void): stub\n"); return D3D_OK; } + +/*********************************************************************** + * DllMain. + */ +BOOL WINAPI DllMain(HINSTANCE inst, DWORD reason, LPVOID reserved) +{ + switch(reason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(inst); + break; + case DLL_PROCESS_DETACH: + break; + } + return TRUE; +}

1 0

Stefan Dösinger : wined3d: Nested loop support.
by Alexandre Julliard 04 Oct '07

04 Oct '07

Module: wine Branch: master Commit: 3f16f029405f7a243b4b42c81d617463b252b81e URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f16f029405f7a243b4b42c81… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Sep 14 13:21:52 2007 +0200 wined3d: Nested loop support. --- dlls/wined3d/baseshader.c | 12 ++++++++++-- dlls/wined3d/glsl_shader.c | 40 ++++++++++++++++++++++++++++++---------- dlls/wined3d/wined3d_private.h | 5 +++-- 3 files changed, 43 insertions(+), 14 deletions(-) diff --git a/dlls/wined3d/baseshader.c b/dlls/wined3d/baseshader.c index 67888b2..cba756e 100644 --- a/dlls/wined3d/baseshader.c +++ b/dlls/wined3d/baseshader.c @@ -193,6 +193,7 @@ HRESULT shader_get_registers_used( IWineD3DStateBlockImpl *stateBlock) { IWineD3DBaseShaderImpl* This = (IWineD3DBaseShaderImpl*) iface; + unsigned int cur_loop_depth = 0, max_loop_depth = 0; /* There are some minor differences between pixel and vertex shaders */ char pshader = shader_is_pshader_version(This->baseShader.hex_version); @@ -305,9 +306,15 @@ HRESULT shader_get_registers_used( /* If there's a loop in the shader */ } else if (WINED3DSIO_LOOP == curOpcode->opcode || WINED3DSIO_REP == curOpcode->opcode) { - reg_maps->loop = 1; + cur_loop_depth++; + if(cur_loop_depth > max_loop_depth) + max_loop_depth = cur_loop_depth; pToken += curOpcode->num_params; - + + } else if (WINED3DSIO_ENDLOOP == curOpcode->opcode || + WINED3DSIO_ENDREP == curOpcode->opcode) { + cur_loop_depth--; + /* For subroutine prototypes */ } else if (WINED3DSIO_LABEL == curOpcode->opcode) { @@ -424,6 +431,7 @@ HRESULT shader_get_registers_used( } } } + reg_maps->loop_depth = max_loop_depth; return WINED3D_OK; } diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index f05cd72..8a0603b 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -640,12 +640,12 @@ void shader_generate_glsl_declarations( shader_addline(buffer, "attribute vec4 attrib%i;\n", i); } - /* Declare loop register aL */ - if (reg_maps->loop) { - shader_addline(buffer, "int aL;\n"); - shader_addline(buffer, "int tmpInt;\n"); + /* Declare loop registers aLx */ + for (i = 0; i < reg_maps->loop_depth; i++) { + shader_addline(buffer, "int aL%u;\n", i); + shader_addline(buffer, "int tmpInt%u;\n", i); } - + /* Temporary variables for matrix operations */ shader_addline(buffer, "vec4 tmp0;\n"); shader_addline(buffer, "vec4 tmp1;\n"); @@ -829,7 +829,7 @@ static void shader_glsl_get_register_name( } break; case WINED3DSPR_LOOP: - sprintf(tmpStr, "aL"); + sprintf(tmpStr, "aL%u", This->baseShader.cur_loop_regno - 1); break; case WINED3DSPR_SAMPLER: if (pshader) @@ -1817,22 +1817,42 @@ void shader_glsl_sincos(SHADER_OPCODE_ARG* arg) { /* FIXME: I don't think nested loops will work correctly this way. */ void shader_glsl_loop(SHADER_OPCODE_ARG* arg) { glsl_src_param_t src1_param; + IWineD3DBaseShaderImpl* shader = (IWineD3DBaseShaderImpl*) arg->shader; shader_glsl_add_src_param(arg, arg->src[1], arg->src_addr[1], WINED3DSP_WRITEMASK_ALL, &src1_param); - - shader_addline(arg->buffer, "for (tmpInt = 0, aL = %s.y; tmpInt < %s.x; tmpInt++, aL += %s.z) {\n", - src1_param.reg_name, src1_param.reg_name, src1_param.reg_name); + + shader_addline(arg->buffer, "for (tmpInt%u = 0, aL%u = %s.y; tmpInt%u < %s.x; tmpInt%u++, aL%u += %s.z) {\n", + shader->baseShader.cur_loop_depth, shader->baseShader.cur_loop_regno, + src1_param.reg_name, shader->baseShader.cur_loop_depth, src1_param.reg_name, + shader->baseShader.cur_loop_depth, shader->baseShader.cur_loop_regno, src1_param.reg_name); + + shader->baseShader.cur_loop_depth++; + shader->baseShader.cur_loop_regno++; } void shader_glsl_end(SHADER_OPCODE_ARG* arg) { + IWineD3DBaseShaderImpl* shader = (IWineD3DBaseShaderImpl*) arg->shader; + shader_addline(arg->buffer, "}\n"); + + if(arg->opcode->opcode == WINED3DSIO_ENDLOOP) { + shader->baseShader.cur_loop_depth--; + shader->baseShader.cur_loop_regno--; + } + if(arg->opcode->opcode == WINED3DSIO_ENDREP) { + shader->baseShader.cur_loop_depth--; + } } void shader_glsl_rep(SHADER_OPCODE_ARG* arg) { + IWineD3DBaseShaderImpl* shader = (IWineD3DBaseShaderImpl*) arg->shader; glsl_src_param_t src0_param; shader_glsl_add_src_param(arg, arg->src[0], arg->src_addr[0], WINED3DSP_WRITEMASK_0, &src0_param); - shader_addline(arg->buffer, "for (tmpInt = 0; tmpInt < %s; tmpInt++) {\n", src0_param.param_str); + shader_addline(arg->buffer, "for (tmpInt%d = 0; tmpInt%d < %s; tmpInt%d++) {\n", + shader->baseShader.cur_loop_depth, shader->baseShader.cur_loop_depth, + src0_param.param_str, shader->baseShader.cur_loop_depth); + shader->baseShader.cur_loop_depth++; } void shader_glsl_if(SHADER_OPCODE_ARG* arg) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index da4a90c..431160d 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1654,8 +1654,8 @@ typedef struct shader_reg_maps { char bumpmat, luminanceparams; char usesnrm, vpos; - /* Whether or not a loop is used in this shader */ - char loop; + /* Whether or not loops are used in this shader, and nesting depth */ + unsigned loop_depth; /* Whether or not this shader uses fog */ char fog; @@ -1885,6 +1885,7 @@ typedef struct IWineD3DBaseShaderClass UINT functionLength; GLuint prgId; BOOL is_compiled; + UINT cur_loop_depth, cur_loop_regno; /* Type of shader backend */ int shader_mode;

1 0

Rob Shearman : server: Add a simple mapping from Unix uids to NT SIDs.
by Alexandre Julliard 04 Oct '07

04 Oct '07

Module: wine Branch: master Commit: 8184bcc91a506a16923a9b98578ee8ebbb82e412 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8184bcc91a506a16923a9b985… Author: Rob Shearman <rob(a)codeweavers.com> Date: Wed Oct 3 13:09:33 2007 +0100 server: Add a simple mapping from Unix uids to NT SIDs. --- server/security.h | 1 + server/token.c | 15 ++++++++++++--- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/server/security.h b/server/security.h index 88b437d..74ff2bb 100644 --- a/server/security.h +++ b/server/security.h @@ -55,6 +55,7 @@ extern const SID *token_get_user( struct token *token ); extern const SID *token_get_primary_group( struct token *token ); extern void security_set_thread_token( struct thread *thread, obj_handle_t handle ); +extern const SID *security_unix_uid_to_sid( uid_t uid ); extern int check_object_access( struct object *obj, unsigned int *access ); static inline int thread_single_check_privilege( struct thread *thread, const LUID *priv) diff --git a/server/token.c b/server/token.c index 00cd6db..892fbab 100644 --- a/server/token.c +++ b/server/token.c @@ -26,6 +26,7 @@ #include <stdio.h> #include <stdlib.h> #include <stdarg.h> +#include <unistd.h> #include "ntstatus.h" #define WIN32_NO_STATUS @@ -66,6 +67,7 @@ const LUID SeCreateGlobalPrivilege = { 30, 0 }; static const SID world_sid = { SID_REVISION, 1, { SECURITY_WORLD_SID_AUTHORITY }, { SECURITY_WORLD_RID } }; static const SID local_sid = { SID_REVISION, 1, { SECURITY_LOCAL_SID_AUTHORITY }, { SECURITY_LOCAL_RID } }; static const SID interactive_sid = { SID_REVISION, 1, { SECURITY_NT_AUTHORITY }, { SECURITY_INTERACTIVE_RID } }; +static const SID anonymous_logon_sid = { SID_REVISION, 1, { SECURITY_NT_AUTHORITY }, { SECURITY_ANONYMOUS_LOGON_RID } }; static const SID authenticated_user_sid = { SID_REVISION, 1, { SECURITY_NT_AUTHORITY }, { SECURITY_AUTHENTICATED_USER_RID } }; static const SID local_system_sid = { SID_REVISION, 1, { SECURITY_NT_AUTHORITY }, { SECURITY_LOCAL_SYSTEM_RID } }; static const PSID security_world_sid = (PSID)&world_sid; @@ -196,6 +198,15 @@ static const ACE_HEADER *ace_next( const ACE_HEADER *ace ) return (const ACE_HEADER *)((const char *)ace + ace->AceSize); } +const SID *security_unix_uid_to_sid( uid_t uid ) +{ + /* very simple mapping: either the current user or not the current user */ + if (uid == getuid()) + return &interactive_sid; + else + return &anonymous_logon_sid; +} + static int acl_is_valid( const ACL *acl, data_size_t size ) { ULONG i; @@ -639,9 +650,7 @@ struct token *token_create_admin( void ) { logon_sid, SE_GROUP_ENABLED|SE_GROUP_ENABLED_BY_DEFAULT|SE_GROUP_MANDATORY|SE_GROUP_LOGON_ID }, }; static const TOKEN_SOURCE admin_source = {"SeMgr", {0, 0}}; - /* note: we just set the user sid to be the interactive builtin sid - - * we should really translate the UNIX user id to a sid */ - token = create_token( TRUE, &interactive_sid, + token = create_token( TRUE, security_unix_uid_to_sid( getuid() ), admin_groups, sizeof(admin_groups)/sizeof(admin_groups[0]), admin_privs, sizeof(admin_privs)/sizeof(admin_privs[0]), default_dacl, admin_source, NULL, -1 );

1 0

Stefan Dösinger : wined3d: Implement the vFace register.
by Alexandre Julliard 04 Oct '07

04 Oct '07

Module: wine Branch: master Commit: 3c6d97278f2d46ce141a3f06075f2b9fe6a23c96 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c6d97278f2d46ce141a3f060… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Oct 4 08:24:03 2007 +0200 wined3d: Implement the vFace register. --- dlls/wined3d/glsl_shader.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 90062b8..f05cd72 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -871,10 +871,12 @@ static void shader_glsl_get_register_name( if (reg == 0) { /* vPos */ sprintf(tmpStr, "vpos"); + } else if (reg == 1){ + /* Note that gl_FrontFacing is a bool, while vFace is + * a float for which the sign determines front/back + */ + sprintf(tmpStr, "(gl_FrontFacing ? 1.0 : -1.0)"); } else { - /* gl_FrontFacing could be used for vFace, but note that - * gl_FrontFacing is a bool, while vFace is a float for - * which the sign determines front/back */ FIXME("Unhandled misctype register %d\n", reg); sprintf(tmpStr, "unrecognized_register"); }

1 0

Damjan Jovanovic : ws2_32: Silently ignore WS_IP_DONTFRAGMENT.
by Alexandre Julliard 04 Oct '07

04 Oct '07

Module: wine Branch: master Commit: 5591c969a61b03dab2b0aa379d1b321c4762b85a URL: http://source.winehq.org/git/wine.git/?a=commit;h=5591c969a61b03dab2b0aa379… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Thu Oct 4 08:48:57 2007 +0200 ws2_32: Silently ignore WS_IP_DONTFRAGMENT. --- dlls/ws2_32/socket.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index c517f7e..2e5e558 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -1924,6 +1924,10 @@ INT WINAPI WS_getsockopt(SOCKET s, INT level, } release_sock_fd( s, fd ); return ret; + case WS_IP_DONTFRAGMENT: + FIXME("WS_IP_DONTFRAGMENT is always false!\n"); + *(BOOL*)optval = FALSE; + return 0; } FIXME("Unknown IPPROTO_IP optname 0x%08x\n", optname); return SOCKET_ERROR; @@ -3008,6 +3012,9 @@ int WINAPI WS_setsockopt(SOCKET s, int level, int optname, case WS_IP_TTL: convert_sockopt(&level, &optname); break; + case WS_IP_DONTFRAGMENT: + FIXME("IP_DONTFRAGMENT is silently ignored!\n"); + return 0; default: FIXME("Unknown IPPROTO_IP optname 0x%08x\n", optname); return SOCKET_ERROR;

1 0

James Hawkins : user32: Test the ddeml client interface.
by Alexandre Julliard 04 Oct '07

04 Oct '07

Module: wine Branch: master Commit: 58639cc814a61e0b9ed0917446a61acb119a833c URL: http://source.winehq.org/git/wine.git/?a=commit;h=58639cc814a61e0b9ed091744… Author: James Hawkins <truiken(a)gmail.com> Date: Thu Oct 4 00:28:45 2007 -0500 user32: Test the ddeml client interface. --- dlls/user32/tests/dde.c | 585 ++++++++++++++++++++++++++++++++++++++++++++++- include/ddeml.h | 1 + 2 files changed, 578 insertions(+), 8 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=58639cc814a61e0b9ed09…

1 0

Mikolaj Zalewski : oleaut32: olepicture: Support loading Aldus Placable Metafiles.
by Alexandre Julliard 04 Oct '07

04 Oct '07

Module: wine Branch: master Commit: 8e7e2c25aae54c73bf01e521010a3a9e85509859 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e7e2c25aae54c73bf01e5210… Author: Mikolaj Zalewski <mikolajz(a)google.com> Date: Wed Oct 3 16:56:53 2007 -0700 oleaut32: olepicture: Support loading Aldus Placable Metafiles. --- dlls/oleaut32/olepicture.c | 40 +++++++++++++++++++++++++- dlls/oleaut32/tests/olepicture.c | 59 +++++++++++++++++++++++++++++++++++++- 2 files changed, 97 insertions(+), 2 deletions(-) diff --git a/dlls/oleaut32/olepicture.c b/dlls/oleaut32/olepicture.c index d8f01db..6608fa2 100644 --- a/dlls/oleaut32/olepicture.c +++ b/dlls/oleaut32/olepicture.c @@ -90,6 +90,20 @@ WINE_DEFAULT_DEBUG_CHANNEL(ole); #include "pshpack1.h" +/* Header for Aldus Placable Metafiles - a standard metafile follows */ +typedef struct _APM_HEADER +{ + DWORD key; + WORD handle; + SHORT left; + SHORT top; + SHORT right; + SHORT bottom; + WORD inch; + DWORD reserved; + WORD checksum; +} APM_HEADER; + typedef struct { BYTE bWidth; BYTE bHeight; @@ -554,8 +568,10 @@ static HRESULT WINAPI OLEPictureImpl_get_hPal(IPicture *iface, *phandle = (OLE_HANDLE)This->desc.u.bmp.hpal; hres = S_OK; break; - case PICTYPE_ICON: case PICTYPE_METAFILE: + hres = E_FAIL; + break; + case PICTYPE_ICON: case PICTYPE_ENHMETAFILE: default: FIXME("unimplemented for type %d. Returning 0 palette.\n", @@ -1690,6 +1706,25 @@ static HRESULT OLEPictureImpl_LoadMetafile(OLEPictureImpl *This, return S_OK; } +static HRESULT OLEPictureImpl_LoadAPM(OLEPictureImpl *This, + const BYTE *data, ULONG size) +{ + APM_HEADER *header = (APM_HEADER *)data; + HRESULT hr; + + if (size < sizeof(APM_HEADER)) + return E_FAIL; + if (header->key != 0x9ac6cdd7) + return E_FAIL; + + if ((hr = OLEPictureImpl_LoadMetafile(This, data + sizeof(APM_HEADER), size - sizeof(*header))) != S_OK) + return hr; + + This->himetricWidth = MulDiv((INT)header->right - header->left, 2540, header->inch); + This->himetricHeight = MulDiv((INT)header->bottom - header->top, 2540, header->inch); + return S_OK; +} + /************************************************************************ * OLEPictureImpl_IPersistStream_Load (IUnknown) * @@ -1848,6 +1883,9 @@ static HRESULT WINAPI OLEPictureImpl_Load(IPersistStream* iface,IStream*pStm) { case 0x5089: /* PNG */ hr = OLEPictureImpl_LoadPNG(This, xbuf, xread); break; + case 0xcdd7: /* APM */ + hr = OLEPictureImpl_LoadAPM(This, xbuf, xread); + break; case 0x0000: { /* ICON , first word is dwReserved */ hr = OLEPictureImpl_LoadIcon(This, xbuf, xread); break; diff --git a/dlls/oleaut32/tests/olepicture.c b/dlls/oleaut32/tests/olepicture.c index 99cefd2..c0d0de9 100644 --- a/dlls/oleaut32/tests/olepicture.c +++ b/dlls/oleaut32/tests/olepicture.c @@ -27,7 +27,7 @@ #define COBJMACROS -#include <wine/test.h> +#include "wine/test.h" #include <windef.h> #include <winbase.h> #include <winuser.h> @@ -40,6 +40,15 @@ #include <olectl.h> #include <objidl.h> +#define expect_eq(expr, value, type, format) { type ret = (expr); ok((value) == ret, #expr " expected " format " got " format "\n", value, ret); } + +#define ole_expect(expr, expect) { \ + HRESULT r = expr; \ + ok(r == (expect), #expr " returned %x, expected %s (%x)\n", r, #expect, expect); \ +} + +#define ole_check(expr) ole_expect(expr, S_OK); + static HMODULE hOleaut32; static HRESULT (WINAPI *pOleLoadPicture)(LPSTREAM,LONG,BOOL,REFIID,LPVOID*); @@ -103,6 +112,15 @@ static const unsigned char gif4pixel[42] = { 0x02,0x00,0x00,0x02,0x03,0x14,0x16,0x05,0x00,0x3b }; +/* APM with an empty metafile with some padding zeros - looks like under Window the + * metafile data should be at least 20 bytes */ +static const unsigned char apmdata[] = { +0xd7,0xcd,0xc6,0x9a, 0x00,0x00,0x00,0x00, 0x00,0x00,0xee,0x02, 0xb1,0x03,0xa0,0x05, +0x00,0x00,0x00,0x00, 0xee,0x53,0x01,0x00, 0x09,0x00,0x00,0x03, 0x13,0x00,0x00,0x00, +0x01,0x00,0x05,0x00, 0x00,0x00,0x00,0x00, 0x03,0x00,0x00,0x00, 0x00,0x00,0x00,0x00, +0x00,0x00,0x00,0x00, 0x00,0x00,0x00,0x00, 0x00,0x00,0x00,0x00 +}; + struct NoStatStreamImpl { const IStreamVtbl *lpVtbl; @@ -424,6 +442,44 @@ static void test_OleCreatePictureIndirect(void) IPicture_Release(pict); } +static void test_apm() +{ + OLE_HANDLE handle; + LPSTREAM stream; + IPicture *pict; + HGLOBAL hglob; + LPBYTE *data; + LONG cxy; + BOOL keep; + short type; + + hglob = GlobalAlloc (0, sizeof(apmdata)); + data = GlobalLock(hglob); + memcpy(data, apmdata, sizeof(apmdata)); + + ole_check(CreateStreamOnHGlobal(hglob, TRUE, &stream)); + ole_check(OleLoadPictureEx(stream, sizeof(apmdata), TRUE, &IID_IPicture, 100, 100, 0, (LPVOID *)&pict)); + + ole_check(IPicture_get_Handle(pict, &handle)); + ok(handle != 0, "handle is null\n"); + + ole_check(IPicture_get_Type(pict, &type)); + expect_eq(type, PICTYPE_METAFILE, short, "%d"); + + ole_check(IPicture_get_Height(pict, &cxy)); + expect_eq(cxy, 1667, LONG, "%d"); + + ole_check(IPicture_get_Width(pict, &cxy)); + expect_eq(cxy, 1323, LONG, "%d"); + + ole_check(IPicture_get_KeepOriginalFormat(pict, &keep)); + todo_wine expect_eq(keep, FALSE, LONG, "%d"); + + ole_expect(IPicture_get_hPal(pict, &handle), E_FAIL); + IPicture_Release(pict); + IStream_Release(stream); +} + START_TEST(olepicture) { hOleaut32 = GetModuleHandleA("oleaut32.dll"); @@ -444,6 +500,7 @@ START_TEST(olepicture) if (0) test_pic(pngimage, sizeof(pngimage)); test_empty_image(); test_empty_image_2(); + test_apm(); test_Invoke(); test_OleCreatePictureIndirect();

1 0