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

Alexandre Julliard : kernel32: Don' t use the reserved argument of the APC routine callback.
by Alexandre Julliard 27 Mar '07

27 Mar '07

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

Stefan Dösinger : wined3d: Handle input modifiers in texcrd with arb shaders.
by Alexandre Julliard 27 Mar '07

27 Mar '07

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

Stefan Dösinger : wined3d: Implement bem shader instruction.
by Alexandre Julliard 27 Mar '07

27 Mar '07

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 27 Mar '07

27 Mar '07

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

Mikołaj Zalewski : shell32: autocomplete: Don' t use sel uninitialized.
by Alexandre Julliard 27 Mar '07

27 Mar '07

Module: wine Branch: master Commit: 3924e6b730850a5f42c5d907ea7c85565e013212 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3924e6b730850a5f42c5d907e… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Tue Mar 20 23:04:36 2007 +0100 shell32: autocomplete: Don't use sel uninitialized. --- dlls/shell32/autocomplete.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/shell32/autocomplete.c b/dlls/shell32/autocomplete.c index 2ffe0d6..ed32f44 100644 --- a/dlls/shell32/autocomplete.c +++ b/dlls/shell32/autocomplete.c @@ -624,7 +624,7 @@ static LRESULT APIENTRY ACLBoxSubclassProc(HWND hwnd, UINT uMsg, WPARAM wParam, { IAutoCompleteImpl *This = (IAutoCompleteImpl *)GetWindowLongPtrW(hwnd, GWLP_USERDATA); WCHAR *msg; - int sel = -1, len; + int sel, len; switch (uMsg) { case WM_MOUSEMOVE: @@ -632,9 +632,11 @@ static LRESULT APIENTRY ACLBoxSubclassProc(HWND hwnd, UINT uMsg, WPARAM wParam, SendMessageW(hwnd, LB_SETCURSEL, (WPARAM)sel, (LPARAM)0); break; case WM_LBUTTONDOWN: - len = SendMessageW(This->hwndListBox, LB_GETTEXTLEN, sel, (LPARAM)NULL); + sel = SendMessageW(hwnd, LB_GETCURSEL, 0, 0); + if (sel < 0) + break; + len = SendMessageW(This->hwndListBox, LB_GETTEXTLEN, sel, 0); msg = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, (len+1)*sizeof(WCHAR)); - sel = (INT)SendMessageW(hwnd, LB_GETCURSEL, 0, 0); SendMessageW(hwnd, LB_GETTEXT, sel, (LPARAM)msg); SendMessageW(This->hwndEdit, WM_SETTEXT, 0, (LPARAM)msg); SendMessageW(This->hwndEdit, EM_SETSEL, 0, lstrlenW(msg));

1 0

Gerald Pfeifer : configure: Add -lXau to NASLIBS if applicable to obtain XauGetBestAuthByAddr and XauDisposeAuth .
by Alexandre Julliard 26 Mar '07

26 Mar '07

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 26 Mar '07

26 Mar '07

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 26 Mar '07

26 Mar '07

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

Kai Blin : netapi32: Implement NetUserDel.
by Alexandre Julliard 26 Mar '07

26 Mar '07

Module: wine Branch: master Commit: 2207f20b5ff6edfa5cac6720f3530ae5da392b55 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2207f20b5ff6edfa5cac6720f… Author: Kai Blin <kai.blin(a)gmail.com> Date: Sat Mar 24 09:01:32 2007 +0100 netapi32: Implement NetUserDel. --- dlls/netapi32/access.c | 51 ++++++++++++++++++++++------------------- dlls/netapi32/tests/access.c | 5 +++- 2 files changed, 31 insertions(+), 25 deletions(-) diff --git a/dlls/netapi32/access.c b/dlls/netapi32/access.c index 6d84b40..8cc3cad 100644 --- a/dlls/netapi32/access.c +++ b/dlls/netapi32/access.c @@ -91,26 +91,22 @@ static NET_API_STATUS NETAPI_ValidateServername(LPCWSTR ServerName) } /************************************************************ - * NETAPI_IsKnownUser + * NETAPI_FindUser * - * Checks whether the user name indicates current user. + * Looks for a user in the user database. + * Returns a pointer to the entry in the user list when the user + * is found, NULL otherwise. */ -static BOOL NETAPI_IsKnownUser(LPCWSTR UserName) +static struct sam_user* NETAPI_FindUser(LPCWSTR UserName) { - DWORD dwSize = UNLEN + 1; - BOOL Result; - LPWSTR buf; + struct sam_user *user; - if (!lstrcmpW(UserName, sAdminUserName) || - !lstrcmpW(UserName, sGuestUserName)) - return TRUE; - NetApiBufferAllocate(dwSize * sizeof(WCHAR), (LPVOID *) &buf); - Result = GetUserNameW(buf, &dwSize); - - Result = Result && !lstrcmpW(UserName, buf); - NetApiBufferFree(buf); - - return Result; + LIST_FOR_EACH_ENTRY(user, &user_list, struct sam_user, entry) + { + if(lstrcmpW(user->user_name, UserName) == 0) + return user; + } + return NULL; } /************************************************************ @@ -198,17 +194,24 @@ NET_API_STATUS WINAPI NetUserAdd(LPCWSTR servername, NET_API_STATUS WINAPI NetUserDel(LPCWSTR servername, LPCWSTR username) { NET_API_STATUS status; - FIXME("(%s, %s) stub!\n", debugstr_w(servername), debugstr_w(username)); + struct sam_user *user; - status = NETAPI_ValidateServername(servername); - if (status != NERR_Success) + TRACE("(%s, %s)\n", debugstr_w(servername), debugstr_w(username)); + + if((status = NETAPI_ValidateServername(servername))!= NERR_Success) return status; - if (!NETAPI_IsKnownUser(username)) + if ((user = NETAPI_FindUser(username)) == NULL) return NERR_UserNotFound; - /* Delete the user here */ - return status; + list_remove(&user->entry); + + HeapFree(GetProcessHeap(), 0, user->home_dir); + HeapFree(GetProcessHeap(), 0, user->user_comment); + HeapFree(GetProcessHeap(), 0, user->user_logon_script_path); + HeapFree(GetProcessHeap(), 0, user); + + return NERR_Success; } /************************************************************ @@ -232,7 +235,7 @@ NetUserGetInfo(LPCWSTR servername, LPCWSTR username, DWORD level, return NERR_InvalidComputer; } - if(!NETAPI_IsKnownUser(username)) + if(!NETAPI_FindUser(username)) { TRACE("User %s is unknown.\n", debugstr_w(username)); return NERR_UserNotFound; @@ -404,7 +407,7 @@ NetUserGetLocalGroups(LPCWSTR servername, LPCWSTR username, DWORD level, if (status != NERR_Success) return status; - if (!NETAPI_IsKnownUser(username)) + if (!NETAPI_FindUser(username)) return NERR_UserNotFound; if (bufptr) *bufptr = NULL; diff --git a/dlls/netapi32/tests/access.c b/dlls/netapi32/tests/access.c index 226e3d6..4922ed6 100644 --- a/dlls/netapi32/tests/access.c +++ b/dlls/netapi32/tests/access.c @@ -259,7 +259,10 @@ static void run_userhandling_tests(void) todo_wine ok(ret == NERR_Success, "Changing the password failed.\n"); ret = pNetUserDel(NULL, sTestUserName); - todo_wine ok(ret == NERR_Success, "Deleting the user failed.\n"); + ok(ret == NERR_Success, "Deleting the user failed.\n"); + + ret = pNetUserDel(NULL, sTestUserName); + ok(ret == NERR_UserNotFound, "Deleting a nonexistent user returned 0x%08x\n",ret); } START_TEST(access)

1 0

Kai Blin : netapi32: Implement NetUserChangePassword.
by Alexandre Julliard 26 Mar '07

26 Mar '07

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