March 2007 - Wine-Commits - list.winehq.org

Stefan Dösinger : wined3d: Implement bem shader instruction.
by Alexandre Julliard March 27, 2007

March 27, 2007

Module: wine Branch: master Commit: bee084503b47d0bf15797c1dc75e3a9a4bfbcede URL: http://source.winehq.org/git/wine.git/?a=commit;h=bee084503b47d0bf15797c1dc… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Mar 26 23:34:32 2007 +0200 wined3d: Implement bem shader instruction. --- dlls/wined3d/arb_program_shader.c | 32 ++++++++++++++++++++++++++++++-- dlls/wined3d/baseshader.c | 14 ++++++++++++-- dlls/wined3d/glsl_shader.c | 15 +++++++++++++-- dlls/wined3d/pixelshader.c | 2 +- dlls/wined3d/wined3d_private.h | 2 ++ 5 files changed, 58 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index e6106cd..7faf45c 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -177,7 +177,7 @@ void shader_generate_arb_declarations( shader_addline(buffer, "MOV T%u, fragment.texcoord[%u];\n", i, i); } - if(reg_maps->bumpmat /* Only a pshader can use texbem */) { + if(reg_maps->bumpmat != -1 /* Only a pshader can use texbem */) { /* If the shader does not use all available constants, use the next free constant to load the bump mapping environment matrix from * the stateblock into the shader. If no constant is available don't load, texbem will then just sample the texture without applying * bump mapping. @@ -510,6 +510,34 @@ static inline void pshader_gen_output_modifier_line( regstr, write_mask, regstr, shift_tab[shift]); } +void pshader_hw_bem(SHADER_OPCODE_ARG* arg) { + IWineD3DPixelShaderImpl* This = (IWineD3DPixelShaderImpl*) arg->shader; + + SHADER_BUFFER* buffer = arg->buffer; + char dst_name[50]; + char src_name[2][50]; + char dst_wmask[20]; + + pshader_get_register_name(arg->dst, dst_name); + shader_arb_get_write_mask(arg->dst, dst_wmask); + strcat(dst_name, dst_wmask); + + pshader_gen_input_modifier_line(buffer, arg->src[0], 0, src_name[0]); + pshader_gen_input_modifier_line(buffer, arg->src[1], 1, src_name[1]); + + if(This->bumpenvmatconst != -1) { + /* Sampling the perturbation map in Tsrc was done already, including the signedness correction if needed */ + shader_addline(buffer, "SWZ TMP2, bumpenvmat, x, z, 0, 0;\n"); + shader_addline(buffer, "DP3 TMP.r, TMP2, %s;\n", src_name[1]); + shader_addline(buffer, "SWZ TMP2, bumpenvmat, y, w, 0, 0;\n"); + shader_addline(buffer, "DP3 TMP.g, TMP2, %s;\n", src_name[1]); + + shader_addline(buffer, "ADD %s, %s, TMP;\n", dst_name, src_name[0]); + } else { + shader_addline(buffer, "MOV %s, %s;\n", dst_name, src_name[0]); + } +} + void pshader_hw_cnd(SHADER_OPCODE_ARG* arg) { SHADER_BUFFER* buffer = arg->buffer; @@ -723,7 +751,7 @@ void pshader_hw_texbem(SHADER_OPCODE_ARG* arg) { /* Can directly use the name because texbem is only valid for <= 1.3 shaders */ pshader_get_register_name(dst, reg_coord); - if(This->bumpenvmatconst) { + if(This->bumpenvmatconst != -1) { /* Sampling the perturbation map in Tsrc was done already, including the signedness correction if needed */ shader_addline(buffer, "SWZ TMP2, bumpenvmat, x, z, 0, 0;\n"); diff --git a/dlls/wined3d/baseshader.c b/dlls/wined3d/baseshader.c index 3508835..3446570 100644 --- a/dlls/wined3d/baseshader.c +++ b/dlls/wined3d/baseshader.c @@ -197,6 +197,8 @@ HRESULT shader_get_registers_used( /* There are some minor differences between pixel and vertex shaders */ char pshader = shader_is_pshader_version(This->baseShader.hex_version); + reg_maps->bumpmat = -1; + if (pToken == NULL) return WINED3D_OK; @@ -295,7 +297,15 @@ HRESULT shader_get_registers_used( DWORD snum = *pToken & WINED3DSP_REGNUM_MASK; reg_maps->labels[snum] = 1; pToken += curOpcode->num_params; - + + } else if(WINED3DSIO_BEM == curOpcode->opcode) { + DWORD regnum = *pToken & WINED3DSP_REGNUM_MASK; + if(reg_maps->bumpmat != -1 && reg_maps->bumpmat != regnum) { + FIXME("Pixel shader uses bem or texbem instruction on more than 1 sampler\n"); + } else { + reg_maps->bumpmat = regnum; + } + /* Set texture, address, temporary registers */ } else { int i, limit; @@ -347,7 +357,7 @@ HRESULT shader_get_registers_used( /* texbem is only valid with < 1.4 pixel shaders */ if(WINED3DSIO_TEXBEM == curOpcode->opcode) { - if(reg_maps->bumpmat != 0 && reg_maps->bumpmat != sampler_code) { + if(reg_maps->bumpmat != -1 && reg_maps->bumpmat != sampler_code) { FIXME("Pixel shader uses texbem instruction on more than 1 sampler\n"); } else { reg_maps->bumpmat = sampler_code; diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 598f589..2508eaa 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -355,7 +355,7 @@ void shader_glsl_load_constants( /* Upload the environment bump map matrix if needed. The needsbumpmat member specifies the texture stage to load the matrix from. * It can't be 0 for a valid texbem instruction. */ - if(((IWineD3DPixelShaderImpl *) pshader)->needsbumpmat != 0) { + if(((IWineD3DPixelShaderImpl *) pshader)->needsbumpmat != -1) { float *data = (float *) &stateBlock->textureState[(int) ((IWineD3DPixelShaderImpl *) pshader)->needsbumpmat][WINED3DTSS_BUMPENVMAT00]; pos = GL_EXTCALL(glGetUniformLocationARB(programId, "bumpenvmat")); checkGLcall("glGetUniformLocationARB"); @@ -400,7 +400,7 @@ void shader_generate_glsl_declarations( if(!pshader) shader_addline(buffer, "uniform vec4 posFixup;\n"); - else if(reg_maps->bumpmat) + else if(reg_maps->bumpmat != -1) shader_addline(buffer, "uniform mat2 bumpenvmat;\n"); /* Declare texture samplers */ @@ -1824,6 +1824,17 @@ void pshader_glsl_texbem(SHADER_OPCODE_ARG* arg) { sample_function.name, sampler_idx, sampler_idx, coord_mask, coord_param.param_str, coord_mask, dst_swizzle); } +void pshader_glsl_bem(SHADER_OPCODE_ARG* arg) { + glsl_src_param_t src0_param, src1_param; + + shader_glsl_add_src_param(arg, arg->src[0], arg->src_addr[0], WINED3DSP_WRITEMASK_0|WINED3DSP_WRITEMASK_1, &src0_param); + shader_glsl_add_src_param(arg, arg->src[1], arg->src_addr[1], WINED3DSP_WRITEMASK_0|WINED3DSP_WRITEMASK_1, &src1_param); + + shader_glsl_append_dst(arg->buffer, arg); + shader_addline(arg->buffer, "%s + bumpenvmat * %s);\n", + src0_param.param_str, src1_param.param_str); +} + /** Process the WINED3DSIO_TEXREG2AR instruction in GLSL * Sample 2D texture at dst using the alpha & red (wx) components of src as texture coordinates */ void pshader_glsl_texreg2ar(SHADER_OPCODE_ARG* arg) { diff --git a/dlls/wined3d/pixelshader.c b/dlls/wined3d/pixelshader.c index b74734d..962b3d5 100644 --- a/dlls/wined3d/pixelshader.c +++ b/dlls/wined3d/pixelshader.c @@ -239,7 +239,7 @@ CONST SHADER_OPCODE IWineD3DPixelShaderImpl_shader_ins[] = { {WINED3DSIO_TEXDP3, "texdp3", GLNAME_REQUIRE_GLSL, 1, 2, NULL, pshader_glsl_texdp3, WINED3DPS_VERSION(1,2), WINED3DPS_VERSION(1,3)}, {WINED3DSIO_TEXM3x3, "texm3x3", GLNAME_REQUIRE_GLSL, 1, 2, NULL, pshader_glsl_texm3x3, WINED3DPS_VERSION(1,2), WINED3DPS_VERSION(1,3)}, {WINED3DSIO_TEXDEPTH, "texdepth", GLNAME_REQUIRE_GLSL, 1, 1, NULL, pshader_glsl_texdepth, WINED3DPS_VERSION(1,4), WINED3DPS_VERSION(1,4)}, - {WINED3DSIO_BEM, "bem", GLNAME_REQUIRE_GLSL, 1, 3, NULL, NULL, WINED3DPS_VERSION(1,4), WINED3DPS_VERSION(1,4)}, + {WINED3DSIO_BEM, "bem", "undefined", 1, 3, pshader_hw_bem, pshader_glsl_bem, WINED3DPS_VERSION(1,4), WINED3DPS_VERSION(1,4)}, {WINED3DSIO_DSX, "dsx", GLNAME_REQUIRE_GLSL, 1, 2, NULL, NULL, 0, 0}, {WINED3DSIO_DSY, "dsy", GLNAME_REQUIRE_GLSL, 1, 2, NULL, NULL, 0, 0}, {WINED3DSIO_TEXLDD, "texldd", GLNAME_REQUIRE_GLSL, 1, 5, NULL, NULL, WINED3DPS_VERSION(2,1), -1}, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 74a6b42..3f69171 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1625,6 +1625,7 @@ extern void shader_arb_load_constants( extern void shader_hw_def(SHADER_OPCODE_ARG *arg); /* ARB pixel shader prototypes */ +extern void pshader_hw_bem(SHADER_OPCODE_ARG* arg); extern void pshader_hw_cnd(SHADER_OPCODE_ARG* arg); extern void pshader_hw_cmp(SHADER_OPCODE_ARG* arg); extern void pshader_hw_map2gl(SHADER_OPCODE_ARG* arg); @@ -1700,6 +1701,7 @@ extern void pshader_glsl_texm3x3spec(SHADER_OPCODE_ARG* arg); extern void pshader_glsl_texm3x3vspec(SHADER_OPCODE_ARG* arg); extern void pshader_glsl_texkill(SHADER_OPCODE_ARG* arg); extern void pshader_glsl_texbem(SHADER_OPCODE_ARG* arg); +extern void pshader_glsl_bem(SHADER_OPCODE_ARG* arg); extern void pshader_glsl_texreg2ar(SHADER_OPCODE_ARG* arg); extern void pshader_glsl_texreg2gb(SHADER_OPCODE_ARG* arg); extern void pshader_glsl_texreg2rgb(SHADER_OPCODE_ARG* arg);

1 0

Stefan Dösinger : wined3d: Disable texture coordinate arrays on the correct unit.
by Alexandre Julliard March 27, 2007

March 27, 2007

Module: wine Branch: master Commit: 5e405d3b263b1d19b52d9959f86f2a70680f5aef URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e405d3b263b1d19b52d9959f… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Mar 24 16:05:34 2007 +0100 wined3d: Disable texture coordinate arrays on the correct unit. --- dlls/wined3d/state.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index bba49ee..e4d10e2 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -2848,6 +2848,7 @@ static void loadVertexData(IWineD3DStateBlockImpl *stateblock, WineDirect3DVerte glEnableClientState(GL_TEXTURE_COORD_ARRAY); } } else if (!GL_SUPPORT(NV_REGISTER_COMBINERS)) { + GL_EXTCALL(glClientActiveTextureARB(GL_TEXTURE0_ARB + textureNo)); glDisableClientState(GL_TEXTURE_COORD_ARRAY); GL_EXTCALL(glMultiTexCoord4fARB(GL_TEXTURE0_ARB + textureNo, 0, 0, 0, 1)); }

1 0

Stefan Dösinger : wined3d: Handle input modifiers in texcrd with arb shaders.
by Alexandre Julliard March 27, 2007

March 27, 2007

Module: wine Branch: master Commit: 929116f23c0606a28d0b242b6cdd50e19bdf6532 URL: http://source.winehq.org/git/wine.git/?a=commit;h=929116f23c0606a28d0b242b6… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Mar 24 16:08:22 2007 +0100 wined3d: Handle input modifiers in texcrd with arb shaders. --- dlls/wined3d/arb_program_shader.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 2185455..e6106cd 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -663,7 +663,6 @@ void pshader_hw_texcoord(SHADER_OPCODE_ARG* arg) { IWineD3DPixelShaderImpl* This = (IWineD3DPixelShaderImpl*) arg->shader; DWORD dst = arg->dst; - DWORD* src = arg->src; SHADER_BUFFER* buffer = arg->buffer; DWORD hex_version = This->baseShader.hex_version; @@ -674,8 +673,10 @@ void pshader_hw_texcoord(SHADER_OPCODE_ARG* arg) { shader_addline(buffer, "MOV_SAT T%u%s, fragment.texcoord[%u];\n", reg, tmp, reg); } else { DWORD reg1 = dst & WINED3DSP_REGNUM_MASK; - DWORD reg2 = src[0] & WINED3DSP_REGNUM_MASK; - shader_addline(buffer, "MOV R%u%s, fragment.texcoord[%u];\n", reg1, tmp, reg2); + char reg_src[40]; + + pshader_gen_input_modifier_line(buffer, arg->src[0], 0, reg_src); + shader_addline(buffer, "MOV R%u%s, %s;\n", reg1, tmp, reg_src); } }

1 0

Alexandre Julliard : server: Always return STATUS_PENDING when an async I/ O operation has been queued.
by Alexandre Julliard March 27, 2007

March 27, 2007

Module: wine Branch: master Commit: 589ce2bb8d1b3c199d71dac7f07d98f49b6eae09 URL: http://source.winehq.org/git/wine.git/?a=commit;h=589ce2bb8d1b3c199d71dac7f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 26 19:13:21 2007 +0200 server: Always return STATUS_PENDING when an async I/O operation has been queued. --- dlls/ntdll/file.c | 13 ++++++------- dlls/ws2_32/socket.c | 20 ++++++++------------ server/fd.c | 5 ++--- server/serial.c | 1 + server/sock.c | 1 + 5 files changed, 18 insertions(+), 22 deletions(-) diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index 45786b0..6873e0e 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -282,14 +282,13 @@ static ULONG fileio_queue_async(async_fileio* fileio, IO_STATUS_BLOCK* iosb, } SERVER_END_REQ; - if ( status ) iosb->u.Status = status; - if ( iosb->u.Status != STATUS_PENDING ) + if (status != STATUS_PENDING) { + iosb->u.Status = status; (apc)( fileio, iosb, iosb->u.Status ); - return iosb->u.Status; } - NtCurrentTeb()->num_async_io++; - return STATUS_SUCCESS; + else NtCurrentTeb()->num_async_io++; + return status; } /*********************************************************************** @@ -531,7 +530,7 @@ NTSTATUS WINAPI NtReadFile(HANDLE hFile, HANDLE hEvent, io_status->u.Status = STATUS_PENDING; ret = fileio_queue_async(fileio, io_status, TRUE); - if (ret != STATUS_SUCCESS) + if (ret != STATUS_PENDING) { if (flags & FD_FLAG_TIMEOUT) NtClose(hEvent); return ret; @@ -762,7 +761,7 @@ NTSTATUS WINAPI NtWriteFile(HANDLE hFile, HANDLE hEvent, io_status->Information = 0; io_status->u.Status = STATUS_PENDING; ret = fileio_queue_async(fileio, io_status, FALSE); - if (ret != STATUS_SUCCESS) + if (ret != STATUS_PENDING) { if (flags & FD_FLAG_TIMEOUT) NtClose(hEvent); return ret; diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 4ad025e..ce57f7d 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -1150,6 +1150,7 @@ static ULONG ws2_queue_async(struct ws2_async* wsa, IO_STATUS_BLOCK* iosb) default: FIXME("Unknown internal mode (%d)\n", wsa->mode); return STATUS_INVALID_PARAMETER; } + iosb->u.Status = STATUS_PENDING; SERVER_START_REQ( register_async ) { req->handle = wsa->hSocket; @@ -1163,18 +1164,13 @@ static ULONG ws2_queue_async(struct ws2_async* wsa, IO_STATUS_BLOCK* iosb) } SERVER_END_REQ; - if ( status ) iosb->u.Status = status; - if ( iosb->u.Status != STATUS_PENDING ) + if (status != STATUS_PENDING) { - /* Note: we get here a non zero status when we couldn't queue the async - * in the server. Therefore, we simply terminate the async. - */ - status = iosb->u.Status; + iosb->u.Status = status; ws2_async_terminate(wsa, iosb); - return status; } - NtCurrentTeb()->num_async_io++; - return STATUS_SUCCESS; + else NtCurrentTeb()->num_async_io++; + return status; } /*********************************************************************** @@ -1500,7 +1496,7 @@ static int WS2_register_async_shutdown( SOCKET s, enum ws2_mode mode ) /* Hack: this will cause ws2_async_terminate() to free the overlapped structure */ wsa->user_overlapped = NULL; - if ( (ret = ws2_queue_async( wsa, iosb )) ) + if ((ret = ws2_queue_async( wsa, iosb )) != STATUS_PENDING) { err = NtStatusToWSAError( ret ); goto out; @@ -2843,7 +2839,7 @@ INT WINAPI WSASendTo( SOCKET s, LPWSABUF lpBuffers, DWORD dwBufferCount, goto err_free; } - if ( ( ret = ws2_queue_async( wsa, iosb ) ) ) + if ((ret = ws2_queue_async( wsa, iosb )) != STATUS_PENDING) { err = NtStatusToWSAError( ret ); @@ -4349,7 +4345,7 @@ INT WINAPI WSARecvFrom( SOCKET s, LPWSABUF lpBuffers, DWORD dwBufferCount, goto err_free; } - if ( ( ret = ws2_queue_async( wsa, iosb )) ) + if ((ret = ws2_queue_async( wsa, iosb )) != STATUS_PENDING) { err = NtStatusToWSAError( ret ); diff --git a/server/fd.c b/server/fd.c index fba6907..bf5f2e0 100644 --- a/server/fd.c +++ b/server/fd.c @@ -1742,6 +1742,7 @@ void fd_queue_async_timeout( struct fd *fd, const async_data_t *data, int type, } if (!create_async( current, timeout, queue, data )) return; + set_error( STATUS_PENDING ); /* Check if the new pending request can be served immediately */ events = check_fd_events( fd, fd->fd_ops->get_poll_events( fd ) ); @@ -1937,9 +1938,7 @@ DECL_HANDLER(register_async) * 3. Carry out any operations necessary to adjust the object's poll events * Usually: set_elect_events (obj, obj->ops->get_poll_events()). * 4. When the async request is triggered, then send back (with a proper APC) - * the trigger (STATUS_ALERTED) to the thread that posted the request. - * async_destroy() is to be called: it will both notify the sender about - * the trigger and destroy the request by itself + * the trigger (STATUS_ALERTED) to the thread that posted the request. * See also the implementations in file.c, serial.c, and sock.c. */ diff --git a/server/serial.c b/server/serial.c index d459426..7b92fac 100644 --- a/server/serial.c +++ b/server/serial.c @@ -273,6 +273,7 @@ static void serial_queue_async( struct fd *fd, const async_data_t *data, int typ add_timeout( &when, timeout ); if (!create_async( current, timeout ? &when : NULL, queue, data )) return; + set_error( STATUS_PENDING ); /* Check if the new pending request can be served immediately */ events = check_fd_events( fd, serial_get_poll_events( fd ) ); diff --git a/server/sock.c b/server/sock.c index f1b7255..009d37e 100644 --- a/server/sock.c +++ b/server/sock.c @@ -545,6 +545,7 @@ static void sock_queue_async( struct fd *fd, const async_data_t *data, int type, else { if (!create_async( current, NULL, queue, data )) return; + set_error( STATUS_PENDING ); } pollev = sock_reselect( sock );

1 0

Alexandre Julliard : kernel32: Don' t use the reserved argument of the APC routine callback.
by Alexandre Julliard March 27, 2007

March 27, 2007

Module: wine Branch: master Commit: 6746209d4ea450a03d03db8f5f736056f789dcca URL: http://source.winehq.org/git/wine.git/?a=commit;h=6746209d4ea450a03d03db8f5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 26 19:14:13 2007 +0200 kernel32: Don't use the reserved argument of the APC routine callback. --- dlls/kernel32/file.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/file.c b/dlls/kernel32/file.c index 71d5030..d0b84cf 100644 --- a/dlls/kernel32/file.c +++ b/dlls/kernel32/file.c @@ -345,11 +345,11 @@ static void FILE_InitProcessDosHandles( void ) /****************************************************************** * FILE_ReadWriteApc (internal) */ -static void WINAPI FILE_ReadWriteApc(void* apc_user, PIO_STATUS_BLOCK io_status, ULONG len) +static void WINAPI FILE_ReadWriteApc(void* apc_user, PIO_STATUS_BLOCK io_status, ULONG reserved) { LPOVERLAPPED_COMPLETION_ROUTINE cr = (LPOVERLAPPED_COMPLETION_ROUTINE)apc_user; - cr(RtlNtStatusToDosError(io_status->u.Status), len, (LPOVERLAPPED)io_status); + cr(RtlNtStatusToDosError(io_status->u.Status), io_status->Information, (LPOVERLAPPED)io_status); }

1 0

Gerald Pfeifer : configure: Add -lXau to NASLIBS if applicable to obtain XauGetBestAuthByAddr and XauDisposeAuth .
by Alexandre Julliard March 26, 2007

March 26, 2007

Module: wine Branch: master Commit: 575d89445c5fbadf055d0910a52cc9bf4eaca962 URL: http://source.winehq.org/git/wine.git/?a=commit;h=575d89445c5fbadf055d0910a… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sun Mar 25 00:44:50 2007 +0100 configure: Add -lXau to NASLIBS if applicable to obtain XauGetBestAuthByAddr and XauDisposeAuth. --- configure | 69 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++- configure.ac | 6 ++++- 2 files changed, 73 insertions(+), 2 deletions(-) diff --git a/configure b/configure index 09acfea..17705e0 100755 --- a/configure +++ b/configure @@ -8746,7 +8746,74 @@ cat >>confdefs.h <<\_ACEOF #define HAVE_NAS 1 _ACEOF - NASLIBS="-laudio -lXt $X_LIBS -lXext -lX11 $X_EXTRA_LIBS" + { echo "$as_me:$LINENO: checking for XauGetBestAuthByAddr in -lXau" >&5 +echo $ECHO_N "checking for XauGetBestAuthByAddr in -lXau... $ECHO_C" >&6; } +if test "${ac_cv_lib_Xau_XauGetBestAuthByAddr+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lXau $X_LIBS $LIBS" +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char XauGetBestAuthByAddr (); +int +main () +{ +return XauGetBestAuthByAddr (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + ac_cv_lib_Xau_XauGetBestAuthByAddr=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_lib_Xau_XauGetBestAuthByAddr=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ echo "$as_me:$LINENO: result: $ac_cv_lib_Xau_XauGetBestAuthByAddr" >&5 +echo "${ECHO_T}$ac_cv_lib_Xau_XauGetBestAuthByAddr" >&6; } +if test $ac_cv_lib_Xau_XauGetBestAuthByAddr = yes; then + NASLIBS="-lXau -laudio -lXt $X_LIBS -lXext -lX11 $X_EXTRA_LIBS" +else + NASLIBS="-laudio -lXt $X_LIBS -lXext -lX11 $X_EXTRA_LIBS" +fi + + fi fi diff --git a/configure.ac b/configure.ac index d38e84e..5d8cb52 100644 --- a/configure.ac +++ b/configure.ac @@ -457,7 +457,11 @@ then [AC_CHECK_HEADERS(audio/soundlib.h,,,[#include <audio/audiolib.h>]) AC_CHECK_LIB(audio,AuCreateFlow, [AC_DEFINE(HAVE_NAS,1,[Define if you have NAS including devel headers]) - NASLIBS="-laudio -lXt $X_LIBS -lXext -lX11 $X_EXTRA_LIBS"],, + AC_CHECK_LIB(Xau,XauGetBestAuthByAddr, + [NASLIBS="-lXau -laudio -lXt $X_LIBS -lXext -lX11 $X_EXTRA_LIBS"], + [NASLIBS="-laudio -lXt $X_LIBS -lXext -lX11 $X_EXTRA_LIBS"], + [$X_LIBS]) + ],, [-lXt $X_LIBS -lXext -lX11 $X_EXTRA_LIBS])]) CPPFLAGS="$ac_save_CPPFLAGS"

1 0

Gabriel Gambetta : ntdll: Add Uruguayan Summer Time timezone.
by Alexandre Julliard March 26, 2007

March 26, 2007

Module: wine Branch: master Commit: cc578af7b164916a41bbb1f3eacc14ae045a1e3f URL: http://source.winehq.org/git/wine.git/?a=commit;h=cc578af7b164916a41bbb1f3e… Author: Gabriel Gambetta <ggambett(a)adinet.com.uy> Date: Sun Mar 25 14:33:20 2007 -0300 ntdll: Add Uruguayan Summer Time timezone. --- dlls/ntdll/time.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/time.c b/dlls/ntdll/time.c index f34e43f..ffec919 100644 --- a/dlls/ntdll/time.c +++ b/dlls/ntdll/time.c @@ -394,6 +394,9 @@ static const struct tagTZ_INFO TZ_INFO[] = ' ','T','i','m','e','\0'}, -480, 0}, {"UYT", {'U','r','u','g','u','a','y','a','n',' ','T','i','m','e','\0'}, 180, 0}, + {"UYST", + {'U','r','u','g','u','a','y','a','n',' ','S','u','m','m','e','r',' ','T', + 'i','m','e','\0'}, 120, 1}, {"MYT", {'M','a','l','a','y','s','i','a','n',' ','T','i','m','e','\0'}, -480, 0}, {"PHT",

1 0

Alessandro Pignotti : dplayx: Fixes the order of GUID initialization and storage.
by Alexandre Julliard March 26, 2007

March 26, 2007

Module: wine Branch: master Commit: 6406a203c86ee4bd2fd91f4f38bcf8da5713ba35 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6406a203c86ee4bd2fd91f4f3… Author: Alessandro Pignotti <alex.pigna(a)inventati.org> Date: Sun Mar 25 04:02:00 2007 +0200 dplayx: Fixes the order of GUID initialization and storage. --- dlls/dplayx/dplay.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/dplayx/dplay.c b/dlls/dplayx/dplay.c index ed58ddf..d446f51 100644 --- a/dlls/dplayx/dplay.c +++ b/dlls/dplayx/dplay.c @@ -3253,14 +3253,13 @@ static HRESULT WINAPI DP_SetSessionDesc HeapFree( GetProcessHeap(), 0, This->dp2->lpSessionDesc ); This->dp2->lpSessionDesc = lpTempSessDesc; + /* Set the new */ + DP_CopySessionDesc( This->dp2->lpSessionDesc, lpSessDesc, bAnsi ); if( bInitial ) { /*Initializing session GUID*/ CoCreateGuid( &(This->dp2->lpSessionDesc->guidInstance) ); } - /* Set the new */ - DP_CopySessionDesc( This->dp2->lpSessionDesc, lpSessDesc, bAnsi ); - /* If this is an external invocation of the interface, we should be * letting everyone know that things have changed. Otherwise this is * just an initialization and it doesn't need to be propagated.

1 0

Laurent Vromman : gdi32: WidenPath partial implementation.
by Alexandre Julliard March 26, 2007

March 26, 2007

Module: wine Branch: master Commit: aaf74d9f647fce6c0fda4e7e473fdb8d5fe4d5f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aaf74d9f647fce6c0fda4e7e4… Author: Laurent Vromman <laurent(a)vromman.org> Date: Sat Mar 24 19:19:33 2007 +0100 gdi32: WidenPath partial implementation. --- dlls/gdi32/path.c | 172 ++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 169 insertions(+), 3 deletions(-) diff --git a/dlls/gdi32/path.c b/dlls/gdi32/path.c index edce62c..59b4da9 100644 --- a/dlls/gdi32/path.c +++ b/dlls/gdi32/path.c @@ -1768,6 +1768,171 @@ static BOOL PATH_StrokePath(DC *dc, GdiPath *pPath) } +static BOOL PATH_WidenPath(DC *dc) +{ + INT i, j, numStrokes, nLinePts, penWidth, penWidthIn, penWidthOut, size; + BOOL ret = FALSE; + GdiPath *pPath, *pNewPath, **pStrokes, *pUpPath, *pDownPath; + EXTLOGPEN *elp; + FLOAT fCos, fSin, nPente; + + pPath = &dc->path; + + PATH_FlattenPath(pPath); + + if(pPath->state != PATH_Closed) { + ERR("Path Closed\n"); + return FALSE; + } + + size = GetObjectW( dc->hPen, 0, NULL ); + if (!size) return FALSE; + + elp = HeapAlloc( GetProcessHeap(), 0, size ); + + GetObjectW( dc->hPen, size, elp ); + /* FIXME: add support for user style pens */ + penWidth = elp->elpWidth; + HeapFree( GetProcessHeap(), 0, elp ); + + /* FIXME : If extPen, use the shape on corners */ + penWidthIn = penWidth / 2; + penWidthOut = penWidth / 2; + if(penWidthIn + penWidthOut < penWidth) + penWidthOut++; + + numStrokes = 0; + nLinePts = 0; + + pStrokes = HeapAlloc(GetProcessHeap(), 0, numStrokes * sizeof(GdiPath*)); + pStrokes[0] = HeapAlloc(GetProcessHeap(), 0, sizeof(GdiPath)); + PATH_InitGdiPath(pStrokes[0]); + pStrokes[0]->pFlags = HeapAlloc(GetProcessHeap(), 0, pPath->numEntriesUsed * sizeof(INT)); + pStrokes[0]->pPoints = HeapAlloc(GetProcessHeap(), 0, pPath->numEntriesUsed * sizeof(POINT)); + pStrokes[0]->numEntriesUsed = 0; + + for(i = 0, j = 0; i < pPath->numEntriesUsed; i++, j++) { + if((i == 0 || (pPath->pFlags[i-1] & PT_CLOSEFIGURE)) && + (pPath->pFlags[i] != PT_MOVETO)) { + ERR("Expected PT_MOVETO %s, got path flag %c\n", + i == 0 ? "as first point" : "after PT_CLOSEFIGURE", + pPath->pFlags[i]); + return FALSE; + } + switch(pPath->pFlags[i]) { + case PT_MOVETO: + numStrokes++; + j = 0; + pStrokes = HeapReAlloc(GetProcessHeap(), 0, pStrokes, numStrokes * sizeof(GdiPath*)); + pStrokes[numStrokes - 1] = HeapAlloc(GetProcessHeap(), 0, sizeof(GdiPath)); + PATH_InitGdiPath(pStrokes[numStrokes - 1]); + pStrokes[numStrokes - 1]->pFlags = HeapAlloc(GetProcessHeap(), 0, pPath->numEntriesUsed * sizeof(INT)); + pStrokes[numStrokes - 1]->pPoints = HeapAlloc(GetProcessHeap(), 0, pPath->numEntriesUsed * sizeof(POINT)); + pStrokes[numStrokes - 1]->numEntriesUsed = 0; + + pStrokes[numStrokes - 1]->pFlags[j] = pPath->pFlags[i]; + pStrokes[numStrokes - 1]->pPoints[j].x = pPath->pPoints[i].x; + pStrokes[numStrokes - 1]->pPoints[j].y = pPath->pPoints[i].y; + pStrokes[numStrokes - 1]->numEntriesUsed++; + + break; + case PT_LINETO: + case (PT_LINETO | PT_CLOSEFIGURE): + pStrokes[numStrokes - 1]->pFlags[j] = pPath->pFlags[i]; + pStrokes[numStrokes - 1]->pPoints[j].x = pPath->pPoints[i].x; + pStrokes[numStrokes - 1]->pPoints[j].y = pPath->pPoints[i].y; + pStrokes[numStrokes - 1]->numEntriesUsed++; + break; + case PT_BEZIERTO: + /* should never happen because of the FlattenPath call */ + ERR("Should never happen \n"); + break; + default: + ERR("Got path flag %c\n", pPath->pFlags[i]); + return FALSE; + } + } + + pNewPath = HeapAlloc(GetProcessHeap(), 0, sizeof(GdiPath)); + PATH_InitGdiPath(pNewPath); + pNewPath->pFlags = HeapAlloc(GetProcessHeap(), 0, 4 * pPath->numEntriesUsed * sizeof(INT)); + pNewPath->pPoints = HeapAlloc(GetProcessHeap(), 0, 4 * pPath->numEntriesUsed * sizeof(POINT)); + pNewPath->numEntriesUsed = 0; + pNewPath->numEntriesAllocated = 4 * pPath->numEntriesUsed; + + for(i = 0; i < numStrokes; i++) { + pUpPath = HeapAlloc(GetProcessHeap(), 0, sizeof(GdiPath)); + PATH_InitGdiPath(pUpPath); + pUpPath->pFlags = HeapAlloc(GetProcessHeap(), 0, 2 * pStrokes[i]->numEntriesUsed * sizeof(INT)); + pUpPath->pPoints = HeapAlloc(GetProcessHeap(), 0, 2 * pStrokes[i]->numEntriesUsed * sizeof(POINT)); + pUpPath->numEntriesUsed = 0; + pDownPath = HeapAlloc(GetProcessHeap(), 0, sizeof(GdiPath)); + PATH_InitGdiPath(pDownPath); + pDownPath->pFlags = HeapAlloc(GetProcessHeap(), 0, 2 * pStrokes[i]->numEntriesUsed * sizeof(INT)); + pDownPath->pPoints = HeapAlloc(GetProcessHeap(), 0, 2 * pStrokes[i]->numEntriesUsed * sizeof(POINT)); + pDownPath->numEntriesUsed = 0; + for(j = 0; j < pStrokes[i]->numEntriesUsed - 1; j++) { + if(pStrokes[i]->pPoints[j+1].x != pStrokes[i]->pPoints[j].x) { + nPente = (pStrokes[i]->pPoints[j+1].y - pStrokes[i]->pPoints[j].y) / (pStrokes[i]->pPoints[j+1].x - pStrokes[i]->pPoints[j].x); + fCos = cos(atan(nPente)); + fSin = sin(atan(nPente)); + } + else if(pStrokes[i]->pPoints[j+1].y > pStrokes[i]->pPoints[j].y) { + fCos = 0; + fSin = -1; + } + else { + fCos = 0; + fSin = 1; + } + + /* FIXME : Improve corners */ + pUpPath->pPoints[2 * j].x = pStrokes[i]->pPoints[j].x + penWidthOut * fSin; + pUpPath->pPoints[2 * j].y = pStrokes[i]->pPoints[j].y + penWidthOut * fCos; + pUpPath->pFlags[2 * j] = pStrokes[i]->pFlags[j]; + pUpPath->pPoints[2 * j + 1] .x = pStrokes[i]->pPoints[j+1].x + penWidthOut * fSin; + pUpPath->pPoints[2 * j + 1] .y = pStrokes[i]->pPoints[j+1].y + penWidthOut * fCos; + pUpPath->pFlags[2 * j + 1] = PT_LINETO; + pUpPath->numEntriesUsed = pUpPath->numEntriesUsed + 2; + + pDownPath->pPoints[2 * j].x = pStrokes[i]->pPoints[j].x - penWidthIn * fSin; + pDownPath->pPoints[2 * j].y = pStrokes[i]->pPoints[j].y - penWidthIn * fCos; + pDownPath->pFlags[2 * j] = PT_LINETO; + pDownPath->pPoints[2 * j + 1] .x = pStrokes[i]->pPoints[j+1].x - penWidthIn * fSin; + pDownPath->pPoints[2 * j + 1] .y = pStrokes[i]->pPoints[j+1].y - penWidthIn * fCos; + pDownPath->pFlags[2 * j + 1] = PT_LINETO; + pDownPath->numEntriesUsed = pUpPath->numEntriesUsed; + } + + for(j = 0; j < pUpPath->numEntriesUsed; j++) { + pNewPath->pPoints[pNewPath->numEntriesUsed + j].x = pUpPath->pPoints[j].x; + pNewPath->pPoints[pNewPath->numEntriesUsed + j].y = pUpPath->pPoints[j].y; + pNewPath->pFlags[pNewPath->numEntriesUsed + j] = pUpPath->pFlags[j]; + pNewPath->pPoints[pNewPath->numEntriesUsed + pUpPath->numEntriesUsed + j].x = pDownPath->pPoints[pUpPath->numEntriesUsed - j - 1].x; + pNewPath->pPoints[pNewPath->numEntriesUsed + pUpPath->numEntriesUsed + j].y = pDownPath->pPoints[pUpPath->numEntriesUsed - j - 1].y; + pNewPath->pFlags[pNewPath->numEntriesUsed + pUpPath->numEntriesUsed + j] = pDownPath->pFlags[pUpPath->numEntriesUsed - j - 1]; + } + pNewPath->numEntriesUsed += 2 * pUpPath->numEntriesUsed; + pNewPath->pFlags[pNewPath->numEntriesUsed - 1] = PT_CLOSEFIGURE | PT_LINETO; + + PATH_DestroyGdiPath(pStrokes[i]); + HeapFree(GetProcessHeap(), 0, pStrokes[i]); + PATH_DestroyGdiPath(pUpPath); + HeapFree(GetProcessHeap(), 0, pUpPath); + PATH_DestroyGdiPath(pDownPath); + HeapFree(GetProcessHeap(), 0, pDownPath); + } + HeapFree(GetProcessHeap(), 0, pStrokes); + + pNewPath->state = PATH_Closed; + if (!(ret = PATH_AssignGdiPath(pPath, pNewPath))) + ERR("Assign path failed\n"); + PATH_DestroyGdiPath(pNewPath); + HeapFree(GetProcessHeap(), 0, pNewPath); + return ret; +} + + /******************************************************************* * StrokeAndFillPath [GDI32.@] * @@ -1833,9 +1998,10 @@ BOOL WINAPI WidenPath(HDC hdc) if(!dc) return FALSE; if(dc->funcs->pWidenPath) - ret = dc->funcs->pWidenPath(dc->physDev); - - FIXME("stub\n"); + ret = dc->funcs->pWidenPath(dc->physDev); + else + ret = PATH_WidenPath(dc); GDI_ReleaseObj( hdc ); + FIXME("partially implemented\n"); return ret; }

1 0

Kai Blin : netapi32: Implement NetUserChangePassword.
by Alexandre Julliard March 26, 2007

March 26, 2007

Module: wine Branch: master Commit: 1daf9a1e51b394748f55527080bf9520f0ecfbc4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1daf9a1e51b394748f5552708… Author: Kai Blin <kai.blin(a)gmail.com> Date: Sat Mar 24 09:02:04 2007 +0100 netapi32: Implement NetUserChangePassword. --- dlls/netapi32/access.c | 21 +++++++++++++++++++-- dlls/netapi32/tests/access.c | 22 +++++++++++++++++++++- 2 files changed, 40 insertions(+), 3 deletions(-) diff --git a/dlls/netapi32/access.c b/dlls/netapi32/access.c index 8cc3cad..ea2ddd8 100644 --- a/dlls/netapi32/access.c +++ b/dlls/netapi32/access.c @@ -813,6 +813,23 @@ NET_API_STATUS WINAPI NetUserModalsGet( NET_API_STATUS WINAPI NetUserChangePassword(LPCWSTR domainname, LPCWSTR username, LPCWSTR oldpassword, LPCWSTR newpassword) { - FIXME("(%s, %s, ..., ...)\n", debugstr_w(domainname), debugstr_w(username)); - return NERR_InternalError; + struct sam_user *user; + + TRACE("(%s, %s, ..., ...)\n", debugstr_w(domainname), debugstr_w(username)); + + if(domainname) + FIXME("Ignoring domainname %s.\n", debugstr_w(domainname)); + + if((user = NETAPI_FindUser(username)) == NULL) + return NERR_UserNotFound; + + if(lstrcmpW(user->user_password, oldpassword) != 0) + return ERROR_INVALID_PASSWORD; + + if(lstrlenW(newpassword) > PWLEN) + return ERROR_PASSWORD_RESTRICTION; + + lstrcpyW(user->user_password, newpassword); + + return NERR_Success; } diff --git a/dlls/netapi32/tests/access.c b/dlls/netapi32/tests/access.c index 4922ed6..e06681e 100644 --- a/dlls/netapi32/tests/access.c +++ b/dlls/netapi32/tests/access.c @@ -254,9 +254,29 @@ static void run_userhandling_tests(void) if(ret != NERR_Success) return; + ret = pNetUserChangePassword(NULL, sNonexistentUser, sTestUserOldPass, + sTestUserNewPass); + ok(ret == NERR_UserNotFound, + "Changing password for nonexistent user returned 0x%08x.\n", ret); + + ret = pNetUserChangePassword(NULL, sTestUserName, sTestUserOldPass, + sTestUserOldPass); + ok(ret == NERR_Success, + "Changing old password to old password returned 0x%08x.\n", ret); + + ret = pNetUserChangePassword(NULL, sTestUserName, sTestUserNewPass, + sTestUserOldPass); + ok(ret == ERROR_INVALID_PASSWORD, + "Trying to change password giving an invalid password returned 0x%08x.\n", ret); + + ret = pNetUserChangePassword(NULL, sTestUserName, sTestUserOldPass, + sTooLongPassword); + ok(ret == ERROR_PASSWORD_RESTRICTION, + "Changing to a password that's too long returned 0x%08x.\n", ret); + ret = pNetUserChangePassword(NULL, sTestUserName, sTestUserOldPass, sTestUserNewPass); - todo_wine ok(ret == NERR_Success, "Changing the password failed.\n"); + ok(ret == NERR_Success, "Changing the password correctly returned 0x%08x.\n", ret); ret = pNetUserDel(NULL, sTestUserName); ok(ret == NERR_Success, "Deleting the user failed.\n");

1 0