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

Alexandre Julliard : wined3d: Make the virtual table functions static where possible.
by Alexandre Julliard 10 Jun '06

10 Jun '06

Module: wine Branch: refs/heads/master Commit: e9cbc66e933990dd79ce4bded76077f666d81d22 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=e9cbc66e933990dd79ce4bd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Jun 10 13:15:32 2006 +0200 wined3d: Make the virtual table functions static where possible. --- dlls/wined3d/cubetexture.c | 58 ++++---- dlls/wined3d/device.c | 274 +++++++++++++++++++------------------- dlls/wined3d/directx.c | 36 ++--- dlls/wined3d/indexbuffer.c | 30 ++-- dlls/wined3d/palette.c | 14 +- dlls/wined3d/pixelshader.c | 14 +- dlls/wined3d/query.c | 18 +- dlls/wined3d/stateblock.c | 16 +- dlls/wined3d/surface.c | 16 +- dlls/wined3d/surface_gdi.c | 8 + dlls/wined3d/swapchain.c | 26 ++-- dlls/wined3d/texture.c | 58 ++++---- dlls/wined3d/vertexbuffer.c | 30 ++-- dlls/wined3d/vertexdeclaration.c | 16 +- dlls/wined3d/vertexshader.c | 14 +- dlls/wined3d/volume.c | 42 +++--- dlls/wined3d/volumetexture.c | 58 ++++---- 17 files changed, 364 insertions(+), 364 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=e9cbc66e933990dd79c…

1 0

Pavel Roskin : winecfg: Recognize all CD and floppy devices listed in Linux devices.txt.
by Alexandre Julliard 10 Jun '06

10 Jun '06

Module: wine Branch: refs/heads/master Commit: 6c5eff90d034960291ffd8f945d3469437f3a8df URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=6c5eff90d034960291ffd8f… Author: Pavel Roskin <proski(a)gnu.org> Date: Fri Jun 9 17:21:59 2006 -0400 winecfg: Recognize all CD and floppy devices listed in Linux devices.txt. --- programs/winecfg/drivedetect.c | 19 +++++++++++++++++++ 1 files changed, 19 insertions(+), 0 deletions(-) diff --git a/programs/winecfg/drivedetect.c b/programs/winecfg/drivedetect.c index 0b985cb..9927043 100644 --- a/programs/winecfg/drivedetect.c +++ b/programs/winecfg/drivedetect.c @@ -47,7 +47,26 @@ #ifdef HAVE_MNTENT_H static const DEV_NODES sDeviceNodes[] = { {"/dev/fd", DRIVE_REMOVABLE}, + {"/dev/pf", DRIVE_REMOVABLE}, + {"/dev/aztcd", DRIVE_CDROM}, + {"/dev/bpcd", DRIVE_CDROM}, {"/dev/cdrom", DRIVE_CDROM}, + {"/dev/cdu535", DRIVE_CDROM}, + {"/dev/cdwriter", DRIVE_CDROM}, + {"/dev/cm205cd", DRIVE_CDROM}, + {"/dev/cm206cd", DRIVE_CDROM}, + {"/dev/gscd", DRIVE_CDROM}, + {"/dev/hitcd", DRIVE_CDROM}, + {"/dev/iseries/vcd", DRIVE_CDROM}, + {"/dev/lmscd", DRIVE_CDROM}, + {"/dev/mcd", DRIVE_CDROM}, + {"/dev/optcd", DRIVE_CDROM}, + {"/dev/pcd", DRIVE_CDROM}, + {"/dev/sbpcd", DRIVE_CDROM}, + {"/dev/scd", DRIVE_CDROM}, + {"/dev/sjcd", DRIVE_CDROM}, + {"/dev/sonycd", DRIVE_CDROM}, + {"/dev/sr", DRIVE_CDROM}, {"",0} };

1 0

Pavel Roskin : winecfg: Allow and prefer using A: and B: for floppies.
by Alexandre Julliard 10 Jun '06

10 Jun '06

Module: wine Branch: refs/heads/master Commit: 34d9d5a346fb26a68a933add2352ad7f020a299c URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=34d9d5a346fb26a68a933ad… Author: Pavel Roskin <proski(a)gnu.org> Date: Fri Jun 9 22:33:42 2006 -0400 winecfg: Allow and prefer using A: and B: for floppies. Pass drive type to allocate_letter(). Start search from 'A' for floppies. Fix missing parentheses in the DRIVE_MASK_BIT definition. It's a bug that is triggered by non-sequential drive allocation. --- programs/winecfg/drivedetect.c | 31 ++++++++++++++++++------------- programs/winecfg/winecfg.h | 2 +- 2 files changed, 19 insertions(+), 14 deletions(-) diff --git a/programs/winecfg/drivedetect.c b/programs/winecfg/drivedetect.c index 7a98d77..0b985cb 100644 --- a/programs/winecfg/drivedetect.c +++ b/programs/winecfg/drivedetect.c @@ -113,11 +113,16 @@ static BOOL is_drive_defined(char *path) } /* returns Z + 1 if there are no more available letters */ -static char allocate_letter(void) +static char allocate_letter(int type) { - char letter; + char letter, start; - for (letter = 'C'; letter <= 'Z'; letter++) + if (type == DRIVE_REMOVABLE) + start = 'A'; + else + start = 'C'; + + for (letter = start; letter <= 'Z'; letter++) if ((DRIVE_MASK_BIT(letter) & working_mask) != 0) break; return letter; @@ -303,8 +308,17 @@ #ifdef HAVE_MNTENT_H if (should_ignore_mnt_dir(ent->mnt_dir)) continue; if (is_drive_defined(ent->mnt_dir)) continue; + if (!strcmp(ent->mnt_type, "nfs")) type = DRIVE_REMOTE; + else if (!strcmp(ent->mnt_type, "nfs4")) type = DRIVE_REMOTE; + else if (!strcmp(ent->mnt_type, "smbfs")) type = DRIVE_REMOTE; + else if (!strcmp(ent->mnt_type, "cifs")) type = DRIVE_REMOTE; + else if (!strcmp(ent->mnt_type, "coda")) type = DRIVE_REMOTE; + else if (!strcmp(ent->mnt_type, "iso9660")) type = DRIVE_CDROM; + else if (!strcmp(ent->mnt_type, "ramfs")) type = DRIVE_RAMDISK; + else type = try_dev_node(ent->mnt_fsname); + /* allocate a drive for it */ - letter = allocate_letter(); + letter = allocate_letter(type); if (letter == ']') { report_error(NO_MORE_LETTERS); @@ -317,15 +331,6 @@ #ifdef HAVE_MNTENT_H WINE_TRACE("adding drive %c for %s, type %s with label %s\n", letter, ent->mnt_dir, ent->mnt_type,label); - if (!strcmp(ent->mnt_type, "nfs")) type = DRIVE_REMOTE; - else if (!strcmp(ent->mnt_type, "nfs4")) type = DRIVE_REMOTE; - else if (!strcmp(ent->mnt_type, "smbfs")) type = DRIVE_REMOTE; - else if (!strcmp(ent->mnt_type, "cifs")) type = DRIVE_REMOTE; - else if (!strcmp(ent->mnt_type, "coda")) type = DRIVE_REMOTE; - else if (!strcmp(ent->mnt_type, "iso9660")) type = DRIVE_CDROM; - else if (!strcmp(ent->mnt_type, "ramfs")) type = DRIVE_RAMDISK; - else type = try_dev_node(ent->mnt_fsname); - add_drive(letter, ent->mnt_dir, label, "0", type); /* working_mask is a map of the drive letters still available. */ diff --git a/programs/winecfg/winecfg.h b/programs/winecfg/winecfg.h index 5075690..53fe9ee 100644 --- a/programs/winecfg/winecfg.h +++ b/programs/winecfg/winecfg.h @@ -95,7 +95,7 @@ struct drive BOOL in_use; }; -#define DRIVE_MASK_BIT(B) 1 << (toupper(B) - 'A') +#define DRIVE_MASK_BIT(B) (1 << (toupper(B) - 'A')) long drive_available_mask(char letter); BOOL add_drive(const char letter, const char *targetpath, const char *label, const char *serial, unsigned int type);

1 0

Jason Green : wined3d: Change fog output variable name for GLSL shaders.
by Alexandre Julliard 10 Jun '06

10 Jun '06

Module: wine Branch: refs/heads/master Commit: 42dd4653e3dda6681edb2511c58b336ea695e54b URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=42dd4653e3dda6681edb251… Author: Jason Green <jave27(a)gmail.com> Date: Fri Jun 9 18:34:04 2006 -0400 wined3d: Change fog output variable name for GLSL shaders. --- dlls/wined3d/glsl_shader.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index b2011b6..6d1b106 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -161,7 +161,7 @@ void shader_glsl_get_register_name( SHADER_OPCODE_ARG* arg) { /* oPos, oFog and oPts in D3D */ - const char* hwrastout_reg_names[] = { "gl_Position", "gl_FogCoord", "gl_PointSize" }; + const char* hwrastout_reg_names[] = { "gl_Position", "gl_FogFragCoord", "gl_PointSize" }; DWORD reg = param & D3DSP_REGNUM_MASK; DWORD regtype = shader_get_regtype(param);

1 0

Jason Green : wined3d: Fix regression from register maps switch for ARB shaders.
by Alexandre Julliard 10 Jun '06

10 Jun '06

Module: wine Branch: refs/heads/master Commit: e8c97e942188ac1fbb8d48dfdb6cf634a4d6f278 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=e8c97e942188ac1fbb8d48d… Author: Jason Green <jave27(a)gmail.com> Date: Fri Jun 9 18:28:00 2006 -0400 wined3d: Fix regression from register maps switch for ARB shaders. I missed a register mask in the move to share the shader_hw_def() function between pixel and vertex shaders for ARB shaders. Fixed that, and made the GLSL version use the same mask for consistency. --- dlls/wined3d/baseshader.c | 4 ++-- dlls/wined3d/glsl_shader.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/baseshader.c b/dlls/wined3d/baseshader.c index 8d1f759..47e1ba8 100644 --- a/dlls/wined3d/baseshader.c +++ b/dlls/wined3d/baseshader.c @@ -767,10 +767,10 @@ void shader_dump_ins_modifiers(const DWO * float constant, and stores it's usage on the regmaps. */ void shader_hw_def(SHADER_OPCODE_ARG* arg) { - DWORD reg = arg->dst; + DWORD reg = arg->dst & D3DSP_REGNUM_MASK; shader_addline(arg->buffer, - "PARAM C%lu = { %f, %f, %f, %f };\n", reg & 0xFF, + "PARAM C%lu = { %f, %f, %f, %f };\n", reg, *((const float *)(arg->src + 0)), *((const float *)(arg->src + 1)), *((const float *)(arg->src + 2)), diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index f8385e0..b2011b6 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -690,7 +690,7 @@ void shader_glsl_def(SHADER_OPCODE_ARG* DWORD reg = arg->dst & D3DSP_REGNUM_MASK; shader_addline(arg->buffer, - "const vec4 C%lu = { %f, %f, %f, %f };\n", reg & 0xFF, + "const vec4 C%lu = { %f, %f, %f, %f };\n", reg, *((const float *)(arg->src + 0)), *((const float *)(arg->src + 1)), *((const float *)(arg->src + 2)),

1 0

Ivan Gyurdiev : wined3d: Enable CND/CMP for SHADER_ARB.
by Alexandre Julliard 10 Jun '06

10 Jun '06

Module: wine Branch: refs/heads/master Commit: a09c9416776257a1e81f85c0d05ba2a2ccddb4d4 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=a09c9416776257a1e81f85c… Author: Ivan Gyurdiev <ivg2(a)cornell.edu> Date: Fri Jun 9 17:47:56 2006 -0400 wined3d: Enable CND/CMP for SHADER_ARB. --- dlls/wined3d/pixelshader.c | 82 +++++++++++++++++++++++++++++++------------- 1 files changed, 58 insertions(+), 24 deletions(-) diff --git a/dlls/wined3d/pixelshader.c b/dlls/wined3d/pixelshader.c index 0d163fc..fbb36c7 100644 --- a/dlls/wined3d/pixelshader.c +++ b/dlls/wined3d/pixelshader.c @@ -621,6 +621,8 @@ void pshader_texldl(WINED3DSHADERVECTOR* } /* Prototype */ +void pshader_hw_cnd(SHADER_OPCODE_ARG* arg); +void pshader_hw_cmp(SHADER_OPCODE_ARG* arg); void pshader_hw_map2gl(SHADER_OPCODE_ARG* arg); void pshader_hw_tex(SHADER_OPCODE_ARG* arg); void pshader_hw_texcoord(SHADER_OPCODE_ARG* arg); @@ -662,8 +664,8 @@ CONST SHADER_OPCODE IWineD3DPixelShaderI {D3DSIO_DST, "dst", "DST", 3, pshader_dst, pshader_hw_map2gl, NULL, 0, 0}, {D3DSIO_LRP, "lrp", "LRP", 4, pshader_lrp, pshader_hw_map2gl, shader_glsl_lrp, 0, 0}, {D3DSIO_FRC, "frc", "FRC", 2, pshader_frc, pshader_hw_map2gl, shader_glsl_map2gl, 0, 0}, - {D3DSIO_CND, "cnd", GLNAME_REQUIRE_GLSL, 4, pshader_cnd, NULL, shader_glsl_cnd, D3DPS_VERSION(1,1), D3DPS_VERSION(1,4)}, - {D3DSIO_CMP, "cmp", GLNAME_REQUIRE_GLSL, 4, pshader_cmp, NULL, shader_glsl_cmp, D3DPS_VERSION(1,1), D3DPS_VERSION(3,0)}, + {D3DSIO_CND, "cnd", NULL, 4, pshader_cnd, pshader_hw_cnd, shader_glsl_cnd, D3DPS_VERSION(1,1), D3DPS_VERSION(1,4)}, + {D3DSIO_CMP, "cmp", NULL, 4, pshader_cmp, pshader_hw_cmp, shader_glsl_cmp, D3DPS_VERSION(1,2), D3DPS_VERSION(3,0)}, {D3DSIO_POW, "pow", "POW", 3, pshader_pow, NULL, shader_glsl_map2gl, 0, 0}, {D3DSIO_CRS, "crs", "XPS", 3, pshader_crs, NULL, shader_glsl_map2gl, 0, 0}, /* TODO: xyz normalise can be performed as VS_ARB using one temporary register, @@ -992,8 +994,53 @@ void pshader_set_version( } } +void pshader_hw_cnd(SHADER_OPCODE_ARG* arg) { + + SHADER_BUFFER* buffer = arg->buffer; + char dst_wmask[20]; + char dst_name[50]; + char src_name[3][50]; + + /* FIXME: support output modifiers */ + + /* Handle output register */ + get_register_name(arg->dst, dst_name, arg->reg_maps->constantsF); + get_write_mask(arg->dst, dst_wmask); + strcat(dst_name, dst_wmask); + + /* Generate input register names (with modifiers) */ + pshader_gen_input_modifier_line(buffer, arg->src[0], 0, src_name[0], arg->reg_maps->constantsF); + pshader_gen_input_modifier_line(buffer, arg->src[1], 1, src_name[1], arg->reg_maps->constantsF); + pshader_gen_input_modifier_line(buffer, arg->src[2], 2, src_name[2], arg->reg_maps->constantsF); + + shader_addline(buffer, "ADD TMP, -%s, coefdiv.x;\n", src_name[0]); + shader_addline(buffer, "CMP %s, TMP, %s, %s;\n", dst_name, src_name[1], src_name[2]); +} + +void pshader_hw_cmp(SHADER_OPCODE_ARG* arg) { + + SHADER_BUFFER* buffer = arg->buffer; + char dst_wmask[20]; + char dst_name[50]; + char src_name[3][50]; + + /* FIXME: support output modifiers */ + + /* Handle output register */ + get_register_name(arg->dst, dst_name, arg->reg_maps->constantsF); + get_write_mask(arg->dst, dst_wmask); + strcat(dst_name, dst_wmask); + + /* Generate input register names (with modifiers) */ + pshader_gen_input_modifier_line(buffer, arg->src[0], 0, src_name[0], arg->reg_maps->constantsF); + pshader_gen_input_modifier_line(buffer, arg->src[1], 1, src_name[1], arg->reg_maps->constantsF); + pshader_gen_input_modifier_line(buffer, arg->src[2], 2, src_name[2], arg->reg_maps->constantsF); + + shader_addline(buffer, "CMP %s, %s, %s, %s;\n", dst_name, + src_name[0], src_name[2], src_name[1]); +} + /* Map the opcode 1-to-1 to the GL code */ -/* FIXME: fix CMP/CND, get rid of this switch */ void pshader_hw_map2gl(SHADER_OPCODE_ARG* arg) { CONST SHADER_OPCODE* curOpcode = arg->opcode; @@ -1045,28 +1092,15 @@ void pshader_hw_map2gl(SHADER_OPCODE_ARG get_write_mask(dst, output_wmask); strcat(operands[0], output_wmask); - switch(curOpcode->opcode) { - case D3DSIO_CMP: - sprintf(tmpLine, "CMP%s %s, %s, %s, %s;\n", (saturate ? "_SAT" : ""), - operands[0], operands[1], operands[3], operands[2]); - break; - case D3DSIO_CND: - shader_addline(buffer, "ADD TMP, -%s, coefdiv.x;\n", operands[1]); - sprintf(tmpLine, "CMP%s %s, TMP, %s, %s;\n", (saturate ? "_SAT" : ""), - operands[0], operands[2], operands[3]); - break; - - default: - if (saturate && (shift == 0)) - strcat(tmpLine, "_SAT"); - strcat(tmpLine, " "); - strcat(tmpLine, operands[0]); - for (i = 1; i < curOpcode->num_params; i++) { - strcat(tmpLine, ", "); - strcat(tmpLine, operands[i]); - } - strcat(tmpLine,";\n"); + if (saturate && (shift == 0)) + strcat(tmpLine, "_SAT"); + strcat(tmpLine, " "); + strcat(tmpLine, operands[0]); + for (i = 1; i < curOpcode->num_params; i++) { + strcat(tmpLine, ", "); + strcat(tmpLine, operands[i]); } + strcat(tmpLine,";\n"); shader_addline(buffer, tmpLine); /* A shift requires another line. */

1 0

Ivan Gyurdiev : wined3d: Print out sampler state names.
by Alexandre Julliard 10 Jun '06

10 Jun '06

Module: wine Branch: refs/heads/master Commit: 621f075fb999b89fc2dd6769b4002005789d5164 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=621f075fb999b89fc2dd676… Author: Ivan Gyurdiev <ivg2(a)cornell.edu> Date: Fri Jun 9 17:47:16 2006 -0400 wined3d: Print out sampler state names. --- dlls/wined3d/device.c | 9 +++++---- dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 067a871..cbf2578 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4397,13 +4397,14 @@ HRESULT WINAPI IWineD3DDeviceImpl_SetSam * Ok GForce say it's ok to use glTexParameter/glGetTexParameter(...). ******************/ /** NOTE: States are appled in IWineD3DBaseTextre ApplyStateChanges and IWineD3DDevice SetupTextureStates**/ - TRACE("(%p) Sampler(%ld), Type(%d) Value(%ld)\n",This, Sampler ,Type, Value); - if(Sampler > GL_LIMITS(samplers) || Sampler < 0 || Type > WINED3D_HIGHEST_SAMPLER_STATE || Type < 0) { - FIXME("out of range %d %d sampler %ld type %u\n", GL_LIMITS(samplers), WINED3D_HIGHEST_SAMPLER_STATE, Sampler, Type); + FIXME("sampler %ld type %s(%u) is out of range [max_samplers=%d, highest_state=%d]\n", + Sampler, debug_d3dsamplerstate(Type), Type, GL_LIMITS(samplers), WINED3D_HIGHEST_SAMPLER_STATE); return WINED3DERR_INVALIDCALL; } - TRACE("Setting sampler %ld %d to %ld\n", Sampler, Type, Value); + + TRACE("(%p) : Sampler=%ld, Type=%s(%d), Value=%ld\n", This, Sampler, + debug_d3dsamplerstate(Type), Type, Value); This->updateStateBlock->samplerState[Sampler][Type] = Value; This->updateStateBlock->set.samplerState[Sampler][Type] = Value; This->updateStateBlock->changed.samplerState[Sampler][Type] = Value; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index f1ec8bc..1e4573d 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1160,6 +1160,7 @@ const char* debug_d3dresourcetype(WINED3 const char* debug_d3dusage(DWORD usage); const char* debug_d3dprimitivetype(D3DPRIMITIVETYPE PrimitiveType); const char* debug_d3drenderstate(DWORD state); +const char* debug_d3dsamplerstate(DWORD state); const char* debug_d3dtexturestate(DWORD state); const char* debug_d3dpool(WINED3DPOOL pool);

1 0

Ivan Gyurdiev : wined3d: Downgrade Get*Shader FIXME to TRACE.
by Alexandre Julliard 10 Jun '06

10 Jun '06

Module: wine Branch: refs/heads/master Commit: d44d0b5edbe66e5a25337d3606c312359bc1553d URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=d44d0b5edbe66e5a25337d3… Author: Ivan Gyurdiev <ivg2(a)cornell.edu> Date: Fri Jun 9 17:46:38 2006 -0400 wined3d: Downgrade Get*Shader FIXME to TRACE. --- dlls/wined3d/pixelshader.c | 2 +- dlls/wined3d/vertexshader.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/pixelshader.c b/dlls/wined3d/pixelshader.c index 25ac05b..0d163fc 100644 --- a/dlls/wined3d/pixelshader.c +++ b/dlls/wined3d/pixelshader.c @@ -113,7 +113,7 @@ HRESULT WINAPI IWineD3DPixelShaderImpl_G HRESULT WINAPI IWineD3DPixelShaderImpl_GetFunction(IWineD3DPixelShader* impl, VOID* pData, UINT* pSizeOfData) { IWineD3DPixelShaderImpl *This = (IWineD3DPixelShaderImpl *)impl; - FIXME("(%p) : pData(%p), pSizeOfData(%p)\n", This, pData, pSizeOfData); + TRACE("(%p) : pData(%p), pSizeOfData(%p)\n", This, pData, pSizeOfData); if (NULL == pData) { *pSizeOfData = This->baseShader.functionLength; diff --git a/dlls/wined3d/vertexshader.c b/dlls/wined3d/vertexshader.c index 6215aa4..9363d31 100644 --- a/dlls/wined3d/vertexshader.c +++ b/dlls/wined3d/vertexshader.c @@ -1480,7 +1480,7 @@ HRESULT WINAPI IWineD3DVertexShaderImpl_ HRESULT WINAPI IWineD3DVertexShaderImpl_GetFunction(IWineD3DVertexShader* impl, VOID* pData, UINT* pSizeOfData) { IWineD3DVertexShaderImpl *This = (IWineD3DVertexShaderImpl *)impl; - FIXME("(%p) : pData(%p), pSizeOfData(%p)\n", This, pData, pSizeOfData); + TRACE("(%p) : pData(%p), pSizeOfData(%p)\n", This, pData, pSizeOfData); if (NULL == pData) { *pSizeOfData = This->baseShader.functionLength;

1 0

Detlef Riekenberg : winspool/tests: Tests for GetPrintProcessorDirectory.
by Alexandre Julliard 10 Jun '06

10 Jun '06

Module: wine Branch: refs/heads/master Commit: e55b52fdd0be4412361defe53ef7e017c9621c5c URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=e55b52fdd0be4412361defe… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Fri Jun 9 21:54:19 2006 +0200 winspool/tests: Tests for GetPrintProcessorDirectory. --- dlls/winspool.drv/tests/info.c | 129 ++++++++++++++++++++++++++++++++++++++++ 1 files changed, 129 insertions(+), 0 deletions(-) diff --git a/dlls/winspool.drv/tests/info.c b/dlls/winspool.drv/tests/info.c index 57d301a..ca65021 100644 --- a/dlls/winspool.drv/tests/info.c +++ b/dlls/winspool.drv/tests/info.c @@ -735,6 +735,134 @@ static void test_GetPrinterDriverDirecto HeapFree( GetProcessHeap(), 0, buffer); } +/* ##### */ + +static void test_GetPrintProcessorDirectory(void) +{ + LPBYTE buffer = NULL; + DWORD cbBuf = 0; + DWORD pcbNeeded = 0; + BOOL res; + + SetLastError(0xdeadbeef); + res = GetPrintProcessorDirectoryA(NULL, NULL, 1, NULL, 0, &cbBuf); + /* The deactivated Spooler is catched here on NT3.51 */ + RETURN_ON_DEACTIVATED_SPOOLER(res) + ok( !res && (GetLastError() == ERROR_INSUFFICIENT_BUFFER), + "returned %d with %ld (expected '0' with ERROR_INSUFFICIENT_BUFFER)\n", + res, GetLastError()); + + buffer = HeapAlloc(GetProcessHeap(), 0, cbBuf*2); + if(buffer == NULL) return; + + buffer[0] = '\0'; + SetLastError(0xdeadbeef); + res = GetPrintProcessorDirectoryA(NULL, NULL, 1, buffer, cbBuf, &pcbNeeded); + ok(res, "returned %d with %ld (expected '!= 0')\n", res, GetLastError()); + + SetLastError(0xdeadbeef); + buffer[0] = '\0'; + res = GetPrintProcessorDirectoryA(NULL, NULL, 1, buffer, cbBuf*2, &pcbNeeded); + ok(res, "returned %d with %ld (expected '!= 0')\n", res, GetLastError()); + + /* Buffer to small */ + buffer[0] = '\0'; + SetLastError(0xdeadbeef); + res = GetPrintProcessorDirectoryA( NULL, NULL, 1, buffer, cbBuf-1, &pcbNeeded); + ok( !res && (GetLastError() == ERROR_INSUFFICIENT_BUFFER), + "returned %d with %ld (expected '0' with ERROR_INSUFFICIENT_BUFFER)\n", + res, GetLastError()); + +#if 0 + /* XPsp2: the programm will crash here, when the spooler is not running */ + /* GetPrinterDriverDirectory has the same bug */ + pcbNeeded = 0; + SetLastError(0xdeadbeef); + res = GetPrintProcessorDirectoryA( NULL, NULL, 1, NULL, cbBuf, &pcbNeeded); +#endif + + buffer[0] = '\0'; + SetLastError(0xdeadbeef); + res = GetPrintProcessorDirectoryA( NULL, NULL, 1, buffer, cbBuf, NULL); + /* NT: RPC_X_NULL_REF_POINTER, 9x: res != 0 */ + ok( res || (GetLastError() == RPC_X_NULL_REF_POINTER), + "returned %d with %ld (expected '!= 0' or '0' with " \ + "RPC_X_NULL_REF_POINTER)\n", res, GetLastError()); + + + buffer[0] = '\0'; + SetLastError(0xdeadbeef); + res = GetPrintProcessorDirectoryA( NULL, NULL, 1, NULL, cbBuf, NULL); + /* NT: RPC_X_NULL_REF_POINTER, 9x: res != 0 */ + ok( res || (GetLastError() == RPC_X_NULL_REF_POINTER), + "returned %d with %ld (expected '!= 0' or '0' with " \ + "RPC_X_NULL_REF_POINTER)\n", res, GetLastError()); + + + /* with a valid buffer, but level is invalid */ + buffer[0] = '\0'; + SetLastError(0xdeadbeef); + res = GetPrintProcessorDirectoryA(NULL, NULL, 2, buffer, cbBuf, &pcbNeeded); + if (res && buffer[0]) + { + /* Level is ignored in win9x*/ + trace("invalid level (2) was ignored\n"); + } + else + { + ok( !res && (GetLastError() == ERROR_INVALID_LEVEL), + "returned %d with %ld (expected '0' with ERROR_INVALID_LEVEL)\n", + res, GetLastError()); + } + + /* Empty environment is the same as the default environment */ + buffer[0] = '\0'; + SetLastError(0xdeadbeef); + res = GetPrintProcessorDirectoryA(NULL, "", 1, buffer, cbBuf*2, &pcbNeeded); + ok(res, "returned %d with %ld (expected '!= 0')\n", res, GetLastError()); + + /* "Windows 4.0" is valid for win9x and NT */ + buffer[0] = '\0'; + SetLastError(0xdeadbeef); + res = GetPrintProcessorDirectoryA(NULL, env_win9x_case, 1, buffer, cbBuf*2, &pcbNeeded); + ok(res, "returned %d with %ld (expected '!= 0')\n", res, GetLastError()); + + + /* "Windows NT x86" is invalid for win9x */ + buffer[0] = '\0'; + SetLastError(0xdeadbeef); + res = GetPrintProcessorDirectoryA(NULL, env_x86, 1, buffer, cbBuf*2, &pcbNeeded); + ok( res || (GetLastError() == ERROR_INVALID_ENVIRONMENT), + "returned %d with %ld (expected '!= 0' or '0' with " \ + "ERROR_INVALID_ENVIRONMENT)\n", res, GetLastError()); + + /* invalid on all Systems */ + buffer[0] = '\0'; + SetLastError(0xdeadbeef); + res = GetPrintProcessorDirectoryA(NULL, "invalid_env", 1, buffer, cbBuf*2, &pcbNeeded); + ok( !res && (GetLastError() == ERROR_INVALID_ENVIRONMENT), + "returned %d with %ld (expected '0' with ERROR_INVALID_ENVIRONMENT)\n", + res, GetLastError()); + + /* Empty servername is the same as the local computer */ + buffer[0] = '\0'; + SetLastError(0xdeadbeef); + res = GetPrintProcessorDirectoryA("", NULL, 1, buffer, cbBuf*2, &pcbNeeded); + ok(res, "returned %d with %ld (expected '!= 0')\n", res, GetLastError()); + + /* invalid on all Systems */ + buffer[0] = '\0'; + SetLastError(0xdeadbeef); + res = GetPrintProcessorDirectoryA("\\invalid_server", NULL, 1, buffer, cbBuf*2, &pcbNeeded); + ok( !res && (GetLastError() == ERROR_INVALID_PARAMETER), + "returned %d with %ld (expected '0' with ERROR_INVALID_PARAMETER)\n", + res, GetLastError()); + + HeapFree(GetProcessHeap(), 0, buffer); +} + +/* ##### */ + static void test_OpenPrinter(void) { PRINTER_DEFAULTSA defaults; @@ -1172,6 +1300,7 @@ START_TEST(info) test_EnumMonitors(); test_GetDefaultPrinter(); test_GetPrinterDriverDirectory(); + test_GetPrintProcessorDirectory(); test_OpenPrinter(); test_GetPrinterDriver(); test_SetDefaultPrinter();

1 0

Saulius Krasuckas : advapi32: Test RegSetValueEx[AW] for setting some sequential strings as one.
by Alexandre Julliard 10 Jun '06

10 Jun '06

Module: wine Branch: refs/heads/master Commit: 072c11dc496c9def074a4479d1cd92bce5b7d5d7 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=072c11dc496c9def074a447… Author: Saulius Krasuckas <saulius2(a)ar.fi.lt> Date: Fri Jun 9 23:46:56 2006 +0300 advapi32: Test RegSetValueEx[AW] for setting some sequential strings as one. --- dlls/advapi32/tests/registry.c | 78 ++++++++++++++++++++++++++++++++++++++++ 1 files changed, 78 insertions(+), 0 deletions(-) diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c index 44b0197..9fee593 100644 --- a/dlls/advapi32/tests/registry.c +++ b/dlls/advapi32/tests/registry.c @@ -28,6 +28,7 @@ #include "winsvc.h" #include "winerror.h" static HKEY hkey_main; +static DWORD GLE; static const char * sTestpath1 = "%LONGSYSTEMVAR%\\subdir1"; static const char * sTestpath2 = "%FOO%\\subdir1"; @@ -60,6 +61,82 @@ static void setup_main_key(void) assert (!RegCreateKeyA( HKEY_CURRENT_USER, "Software\\Wine\\Test", &hkey_main )); } +static void test_hkey_main_Value_A(LPCSTR name, LPCSTR string) +{ + DWORD ret, type, cbData; + DWORD str_byte_len, full_byte_len; + + ret = RegQueryValueExA(hkey_main, name, NULL, &type, NULL, &cbData); + GLE = GetLastError(); + ok(ret == ERROR_SUCCESS, "RegQueryValueExA failed: %ld, GLE=%ld\n", ret, GLE); + if(GLE == ERROR_CALL_NOT_IMPLEMENTED) return; + + str_byte_len = lstrlenA(string) + 1; + full_byte_len = sizeof(string); + ok(type == REG_SZ, "RegQueryValueExA returned type %ld\n", type); + ok(cbData == full_byte_len || cbData == str_byte_len, + "cbData=%ld instead of %ld or %ld\n", cbData, full_byte_len, str_byte_len); +} + +static void test_hkey_main_Value_W(LPCWSTR name, LPCWSTR string) +{ + DWORD ret, type, cbData; + DWORD str_byte_len, full_byte_len; + + ret = RegQueryValueExW(hkey_main, name, NULL, &type, NULL, &cbData); + GLE = GetLastError(); + ok(ret == ERROR_SUCCESS, "RegQueryValueExW failed: %ld, GLE=%ld\n", ret, GLE); + if(GLE == ERROR_CALL_NOT_IMPLEMENTED) return; + + str_byte_len = (lstrlenW(string) + 1) * sizeof(WCHAR); + full_byte_len = sizeof(string); + ok(type == REG_SZ, "RegQueryValueExW returned type %ld\n", type); + ok(cbData == full_byte_len || cbData == str_byte_len, + "cbData=%ld instead of %ld or %ld\n", cbData, full_byte_len, str_byte_len); +} + +static void test_set_value(void) +{ + DWORD ret; + + const WCHAR name1W[] = {'C','l','e','a','n','S','i','n','g','l','e','S','t','r','i','n','g', 0}; + const WCHAR name2W[] = {'S','o','m','e','I','n','t','r','a','Z','e','r','o','e','d','S','t','r','i','n','g', 0}; + const WCHAR string1W[] = {'T','h','i','s','N','e','v','e','r','B','r','e','a','k','s', 0}; + const WCHAR string2W[] = {'T','h','i','s', 0 ,'B','r','e','a','k','s', 0 , 0 ,'A', 0 , 0 , 0 , 0 ,'L','o','t', 0 , 0 , 0 , 0}; + + const char name1A[] = "CleanSingleString"; + const char name2A[] = "SomeIntraZeroedString"; + const char string1A[] = "ThisNeverBreaks"; + const char string2A[] = "This\0Breaks\0\0A\0\0\0Lot\0\0\0\0"; + + /* test RegSetValueExA with normal string */ + ret = RegSetValueExA(hkey_main, name1A, 0, REG_SZ, (LPBYTE)string1A, sizeof(string1A)); + ok(ret == ERROR_SUCCESS, "RegSetValueExA failed: %ld, GLE=%ld\n", ret, GetLastError()); + test_hkey_main_Value_A(name1A, string1A); + test_hkey_main_Value_W(name1W, string1W); + + /* test RegSetValueExA with intrazeroed string */ + ret = RegSetValueExA(hkey_main, name2A, 0, REG_SZ, (LPBYTE)string2A, sizeof(string2A)); + ok(ret == ERROR_SUCCESS, "RegSetValueExA failed: %ld, GLE=%ld\n", ret, GetLastError()); + test_hkey_main_Value_A(name1A, string1A); + test_hkey_main_Value_W(name1W, string1W); + + /* 9x doesn't support W-calls, so don't test them then */ + if(GLE == ERROR_CALL_NOT_IMPLEMENTED) return; + + /* test RegSetValueExW with normal string */ + ret = RegSetValueExW(hkey_main, name1W, 0, REG_SZ, (LPBYTE)string1W, sizeof(string1W)); + ok(ret == ERROR_SUCCESS, "RegSetValueExW failed: %ld, GLE=%ld\n", ret, GetLastError()); + test_hkey_main_Value_A(name1A, string1A); + test_hkey_main_Value_W(name1W, string1W); + + /* test RegSetValueExW with intrazeroed string */ + ret = RegSetValueExW(hkey_main, name2W, 0, REG_SZ, (LPBYTE)string2W, sizeof(string2W)); + ok(ret == ERROR_SUCCESS, "RegSetValueExW failed: %ld, GLE=%ld\n", ret, GetLastError()); + test_hkey_main_Value_A(name1A, string1A); + test_hkey_main_Value_W(name1W, string1W); +} + static void create_test_entries(void) { DWORD qw[2] = { 0x12345678, 0x87654321 }; @@ -654,6 +731,7 @@ static void test_regconnectregistry( voi START_TEST(registry) { setup_main_key(); + test_set_value(); create_test_entries(); test_enum_value(); test_query_value_ex();

1 0