April 2009 - Wine-Commits - list.winehq.org

Henri Verbeet : wined3d: Add a separate function for converting write masks to strings.
by Alexandre Julliard April 9, 2009

April 9, 2009

Module: wine Branch: master Commit: d299f865f7d6b40773e1eea374c952130320d5f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d299f865f7d6b40773e1eea37… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 9 09:58:28 2009 +0200 wined3d: Add a separate function for converting write masks to strings. --- dlls/wined3d/glsl_shader.c | 30 ++++++++++++++++++------------ 1 files changed, 18 insertions(+), 12 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 3301cc2..39881db 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -1179,23 +1179,29 @@ static void shader_glsl_get_register_name(const DWORD param, const DWORD addr_to strcat(regstr, tmpStr); } +static void shader_glsl_write_mask_to_str(DWORD write_mask, char *str) +{ + *str++ = '.'; + if (write_mask & WINED3DSP_WRITEMASK_0) *str++ = 'x'; + if (write_mask & WINED3DSP_WRITEMASK_1) *str++ = 'y'; + if (write_mask & WINED3DSP_WRITEMASK_2) *str++ = 'z'; + if (write_mask & WINED3DSP_WRITEMASK_3) *str++ = 'w'; + *str = '\0'; +} + /* Get the GLSL write mask for the destination register */ static DWORD shader_glsl_get_write_mask(const DWORD param, char *write_mask) { - char *ptr = write_mask; DWORD mask = param & WINED3DSP_WRITEMASK_ALL; if (shader_is_scalar(shader_get_regtype(param), param & WINED3DSP_REGNUM_MASK)) { mask = WINED3DSP_WRITEMASK_0; - } else { - *ptr++ = '.'; - if (param & WINED3DSP_WRITEMASK_0) *ptr++ = 'x'; - if (param & WINED3DSP_WRITEMASK_1) *ptr++ = 'y'; - if (param & WINED3DSP_WRITEMASK_2) *ptr++ = 'z'; - if (param & WINED3DSP_WRITEMASK_3) *ptr++ = 'w'; + *write_mask = '\0'; + } + else + { + shader_glsl_write_mask_to_str(mask, write_mask); } - - *ptr = '\0'; return mask; } @@ -2462,7 +2468,7 @@ static void pshader_glsl_tex(const struct wined3d_shader_instruction *ins) if (shader_version < WINED3DPS_VERSION(1,4)) { char coord_mask[6]; - shader_glsl_get_write_mask(mask, coord_mask); + shader_glsl_write_mask_to_str(mask, coord_mask); shader_glsl_gen_sample_code(ins, sampler_idx, &sample_function, swizzle, NULL, "T%u%s", sampler_idx, coord_mask); } else { @@ -2839,7 +2845,7 @@ static void pshader_glsl_texbem(const struct wined3d_shader_instruction *ins) shader_glsl_get_sample_function(sampler_type, 0, &sample_function); mask = sample_function.coord_mask; - shader_glsl_get_write_mask(mask, coord_mask); + shader_glsl_write_mask_to_str(mask, coord_mask); /* with projective textures, texbem only divides the static texture coord, not the displacement, * so we can't let the GL handle this. @@ -2854,7 +2860,7 @@ static void pshader_glsl_texbem(const struct wined3d_shader_instruction *ins) case WINED3DTTFF_COUNT4: case WINED3DTTFF_DISABLE: div_mask = WINED3DSP_WRITEMASK_3; break; } - shader_glsl_get_write_mask(div_mask, coord_div_mask); + shader_glsl_write_mask_to_str(div_mask, coord_div_mask); shader_addline(ins->buffer, "T%u%s /= T%u%s;\n", sampler_idx, coord_mask, sampler_idx, coord_div_mask); }

1 0

Henri Verbeet : wined3d: Pass a struct wined3d_shader_dst_param to shader_glsl_get_write_mask().
by Alexandre Julliard April 9, 2009

April 9, 2009

Module: wine Branch: master Commit: f3e5e92a18b6f10ab48d7f896620a0bc4d1b9d88 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f3e5e92a18b6f10ab48d7f896… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 9 09:58:28 2009 +0200 wined3d: Pass a struct wined3d_shader_dst_param to shader_glsl_get_write_mask(). --- dlls/wined3d/glsl_shader.c | 46 ++++++++++++++++++++++---------------------- 1 files changed, 23 insertions(+), 23 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 39881db..dc2a9fc 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -1190,10 +1190,11 @@ static void shader_glsl_write_mask_to_str(DWORD write_mask, char *str) } /* Get the GLSL write mask for the destination register */ -static DWORD shader_glsl_get_write_mask(const DWORD param, char *write_mask) { - DWORD mask = param & WINED3DSP_WRITEMASK_ALL; +static DWORD shader_glsl_get_write_mask(const struct wined3d_shader_dst_param *param, char *write_mask) +{ + DWORD mask = param->write_mask; - if (shader_is_scalar(shader_get_regtype(param), param & WINED3DSP_REGNUM_MASK)) + if (shader_is_scalar(param->register_type, param->register_idx)) { mask = WINED3DSP_WRITEMASK_0; *write_mask = '\0'; @@ -1269,7 +1270,7 @@ static DWORD shader_glsl_add_dst_param(const struct wined3d_shader_instruction * glsl_dst->reg_name[0] = '\0'; shader_glsl_get_register_name(wined3d_dst->token, wined3d_dst->addr_token, glsl_dst->reg_name, &is_color, ins); - return shader_glsl_get_write_mask(wined3d_dst->token, glsl_dst->mask_str); + return shader_glsl_get_write_mask(wined3d_dst, glsl_dst->mask_str); } /* Append the destination part of the instruction to the buffer, return the effective write mask */ @@ -1669,7 +1670,7 @@ static void shader_glsl_cross(const struct wined3d_shader_instruction *ins) glsl_src_param_t src1_param; char dst_mask[6]; - shader_glsl_get_write_mask(ins->dst[0].token, dst_mask); + shader_glsl_get_write_mask(&ins->dst[0], dst_mask); shader_glsl_append_dst(ins->buffer, ins); shader_glsl_add_src_param(ins, ins->src[0], ins->src_addr[0], src_mask, &src0_param); shader_glsl_add_src_param(ins, ins->src[1], ins->src_addr[1], src_mask, &src1_param); @@ -1792,7 +1793,7 @@ static void shader_glsl_expp(const struct wined3d_shader_instruction *ins) shader_addline(ins->buffer, "tmp0.w = 1.0;\n"); shader_glsl_append_dst(ins->buffer, ins); - shader_glsl_get_write_mask(ins->dst[0].token, dst_mask); + shader_glsl_get_write_mask(&ins->dst[0], dst_mask); shader_addline(ins->buffer, "tmp0%s);\n", dst_mask); } else { DWORD write_mask; @@ -1952,7 +1953,7 @@ static void shader_glsl_cmp(const struct wined3d_shader_instruction *ins) || (src1reg == dstreg && src1regtype == dstregtype) || (src2reg == dstreg && src2regtype == dstregtype)) { - write_mask = shader_glsl_get_write_mask(dst.token, mask_char); + write_mask = shader_glsl_get_write_mask(&dst, mask_char); if (!write_mask) continue; shader_addline(ins->buffer, "tmp0%s = (", mask_char); temp_destination = TRUE; @@ -1970,7 +1971,7 @@ static void shader_glsl_cmp(const struct wined3d_shader_instruction *ins) } if(temp_destination) { - shader_glsl_get_write_mask(ins->dst[0].token, mask_char); + shader_glsl_get_write_mask(&ins->dst[0], mask_char); shader_glsl_append_dst(ins->buffer, ins); shader_addline(ins->buffer, "tmp0%s);\n", mask_char); } @@ -2147,7 +2148,7 @@ static void shader_glsl_lit(const struct wined3d_shader_instruction *ins) char dst_mask[6]; shader_glsl_append_dst(ins->buffer, ins); - shader_glsl_get_write_mask(ins->dst[0].token, dst_mask); + shader_glsl_get_write_mask(&ins->dst[0], dst_mask); shader_glsl_add_src_param(ins, ins->src[0], ins->src_addr[0], WINED3DSP_WRITEMASK_0, &src0_param); shader_glsl_add_src_param(ins, ins->src[0], ins->src_addr[0], WINED3DSP_WRITEMASK_1, &src1_param); @@ -2194,7 +2195,7 @@ static void shader_glsl_dst(const struct wined3d_shader_instruction *ins) char dst_mask[6]; shader_glsl_append_dst(ins->buffer, ins); - shader_glsl_get_write_mask(ins->dst[0].token, dst_mask); + shader_glsl_get_write_mask(&ins->dst[0], dst_mask); shader_glsl_add_src_param(ins, ins->src[0], ins->src_addr[0], WINED3DSP_WRITEMASK_1, &src0y_param); shader_glsl_add_src_param(ins, ins->src[0], ins->src_addr[0], WINED3DSP_WRITEMASK_2, &src0z_param); @@ -2523,16 +2524,15 @@ static void pshader_glsl_texcoord(const struct wined3d_shader_instruction *ins) { /* FIXME: Make this work for more than just 2D textures */ SHADER_BUFFER *buffer = ins->buffer; - DWORD write_mask; - char dst_mask[6]; - - write_mask = shader_glsl_append_dst(ins->buffer, ins); - shader_glsl_get_write_mask(write_mask, dst_mask); + DWORD write_mask = shader_glsl_append_dst(ins->buffer, ins); if (ins->reg_maps->shader_version != WINED3DPS_VERSION(1,4)) { - DWORD reg = ins->dst[0].register_idx; - shader_addline(buffer, "clamp(gl_TexCoord[%u], 0.0, 1.0)%s);\n", reg, dst_mask); + char dst_mask[6]; + + shader_glsl_get_write_mask(&ins->dst[0], dst_mask); + shader_addline(buffer, "clamp(gl_TexCoord[%u], 0.0, 1.0)%s);\n", + ins->dst[0].register_idx, dst_mask); } else { DWORD reg = ins->src[0] & WINED3DSP_REGNUM_MASK; DWORD src_mod = ins->src[0] & WINED3DSP_SRCMOD_MASK; @@ -2752,7 +2752,7 @@ static void pshader_glsl_texm3x3(const struct wined3d_shader_instruction *ins) shader_glsl_add_src_param(ins, ins->src[0], ins->src_addr[0], src_mask, &src0_param); shader_glsl_append_dst(ins->buffer, ins); - shader_glsl_get_write_mask(ins->dst[0].token, dst_mask); + shader_glsl_get_write_mask(&ins->dst[0], dst_mask); shader_addline(ins->buffer, "vec4(tmp0.xy, dot(T%u.xyz, %s), 1.0)%s);\n", reg, src0_param.param_str, dst_mask); current_state->current_row = 0; @@ -3016,7 +3016,7 @@ static void pshader_glsl_input_pack(IWineD3DPixelShader *iface, SHADER_BUFFER *b usage = semantics_in[i].usage; usage_idx = semantics_in[i].usage_idx; - shader_glsl_get_write_mask(semantics_in[i].reg.token, reg_mask); + shader_glsl_get_write_mask(&semantics_in[i].reg, reg_mask); switch (usage) { @@ -3142,7 +3142,7 @@ static void handle_ps3_input(SHADER_BUFFER *buffer, const WineD3D_GL_Info *gl_in usage = semantics_in[i].usage; usage_idx = semantics_in[i].usage_idx; - set[map[i]] = shader_glsl_get_write_mask(semantics_in[i].reg.token, reg_mask); + set[map[i]] = shader_glsl_get_write_mask(&semantics_in[i].reg, reg_mask); if(!semantics_out) { switch(usage) { @@ -3184,7 +3184,7 @@ static void handle_ps3_input(SHADER_BUFFER *buffer, const WineD3D_GL_Info *gl_in usage_out = semantics_out[j].usage; usage_idx_out = semantics_out[j].usage_idx; - shader_glsl_get_write_mask(semantics_out[j].reg.token, reg_mask_out); + shader_glsl_get_write_mask(&semantics_out[j].reg, reg_mask_out); if(usage == usage_out && usage_idx == usage_idx_out) { @@ -3291,7 +3291,7 @@ static GLhandleARB generate_param_reorder_function(IWineD3DVertexShader *vertexs usage = semantics_out[i].usage; usage_idx = semantics_out[i].usage_idx; - writemask = shader_glsl_get_write_mask(semantics_out[i].reg.token, reg_mask); + writemask = shader_glsl_get_write_mask(&semantics_out[i].reg, reg_mask); switch(usage) { case WINED3DDECLUSAGE_COLOR: @@ -3344,7 +3344,7 @@ static GLhandleARB generate_param_reorder_function(IWineD3DVertexShader *vertexs usage = semantics_out[i].usage; usage_idx = semantics_out[i].usage_idx; - shader_glsl_get_write_mask(semantics_out[i].reg.token, reg_mask); + shader_glsl_get_write_mask(&semantics_out[i].reg, reg_mask); switch(usage) { case WINED3DDECLUSAGE_POSITION:

1 0

Henri Verbeet : wined3d: Explicitly pass parameter properties to shader_glsl_get_register_name().
by Alexandre Julliard April 9, 2009

April 9, 2009

Module: wine Branch: master Commit: ff58255f4edd2b56c7f05025df8336c1d69db3a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff58255f4edd2b56c7f05025d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 9 09:58:28 2009 +0200 wined3d: Explicitly pass parameter properties to shader_glsl_get_register_name(). --- dlls/wined3d/glsl_shader.c | 109 ++++++++++++++++++++++++------------------- 1 files changed, 61 insertions(+), 48 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ff58255f4edd2b56c7f05…

1 0

Nicolas Le Cam : shell32/tests: Completly fix GetAttributesOf test when launched from drive root dir.
by Alexandre Julliard April 9, 2009

April 9, 2009

Module: wine Branch: master Commit: 1f52f12f3c125f7c07f531c6064760516cc24e5d URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f52f12f3c125f7c07f531c60… Author: Nicolas Le Cam <niko.lecam(a)gmail.com> Date: Tue Apr 7 19:14:07 2009 +0200 shell32/tests: Completly fix GetAttributesOf test when launched from drive root dir. --- dlls/shell32/tests/shlfolder.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index 5492b84..08ea9cc 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -848,6 +848,8 @@ static void test_GetAttributesOf(void) IMalloc_Free(ppM, newPIDL); /* append testdirectory name to path */ + if (cCurrDirA[len-1] == '\\') + cCurrDirA[len-1] = 0; lstrcatA(cCurrDirA, "\\testdir"); MultiByteToWideChar(CP_ACP, 0, cCurrDirA, -1, cCurrDirW, MAX_PATH);

1 0

Alexandre Julliard : ntdll: Set the proper context flags in the signal handlers for x86_64.
by Alexandre Julliard April 9, 2009

April 9, 2009

Module: wine Branch: master Commit: 0865c278f27da7d0a45128caeeed99d090a80ff1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0865c278f27da7d0a45128cae… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 8 20:40:29 2009 +0200 ntdll: Set the proper context flags in the signal handlers for x86_64. --- dlls/ntdll/signal_x86_64.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index 7a0defa..dfb1b51 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -189,6 +189,7 @@ static inline int dispatch_signal(unsigned int sig) */ static void save_context( CONTEXT *context, const SIGCONTEXT *sigcontext ) { + context->ContextFlags = CONTEXT_CONTROL | CONTEXT_INTEGER | CONTEXT_SEGMENTS; context->Rax = RAX_sig(sigcontext); context->Rcx = RCX_sig(sigcontext); context->Rdx = RDX_sig(sigcontext); @@ -214,7 +215,11 @@ static void save_context( CONTEXT *context, const SIGCONTEXT *sigcontext ) context->SegEs = 0; /* FIXME */ context->SegSs = 0; /* FIXME */ context->MxCsr = 0; /* FIXME */ - if (FPU_sig(sigcontext)) context->u.FltSave = *FPU_sig(sigcontext); + if (FPU_sig(sigcontext)) + { + context->ContextFlags |= CONTEXT_FLOATING_POINT; + context->u.FltSave = *FPU_sig(sigcontext); + } }

1 0

Alexandre Julliard : server: Define a generic context structure instead of using the platform-specific version .
by Alexandre Julliard April 9, 2009

April 9, 2009

Module: wine Branch: master Commit: 5316dd011f15ca488ccfa69b5873b075407fe238 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5316dd011f15ca488ccfa69b5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 8 19:38:02 2009 +0200 server: Define a generic context structure instead of using the platform-specific version. --- dlls/ntdll/exception.c | 20 ++- dlls/ntdll/ntdll_misc.h | 2 + dlls/ntdll/signal_i386.c | 144 +++++++++++++++++ dlls/ntdll/signal_powerpc.c | 214 ++++++++++++++++++++++++- dlls/ntdll/signal_sparc.c | 132 +++++++++++++++ dlls/ntdll/signal_x86_64.c | 137 ++++++++++++++++ dlls/ntdll/thread.c | 51 +++++-- include/wine/server_protocol.h | 60 +++++++- server/Makefile.in | 5 - server/context_alpha.c | 348 ---------------------------------------- server/context_i386.c | 104 ------------ server/context_powerpc.c | 286 --------------------------------- server/context_sparc.c | 184 --------------------- server/context_x86_64.c | 104 ------------ server/debugger.c | 8 +- server/mach.c | 67 ++++----- server/procfs.c | 10 +- server/protocol.def | 58 +++++++- server/ptrace.c | 119 +++++++------- server/request.h | 3 +- server/thread.c | 83 ++++++++-- server/thread.h | 14 +-- server/trace.c | 210 +++++++++++++++++++++---- 23 files changed, 1135 insertions(+), 1228 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5316dd011f15ca488ccfa…

1 0

Detlef Riekenberg : urlmon/tests: Allow BINDSTATUS_COOKIE_SENT in a test.
by Alexandre Julliard April 9, 2009

April 9, 2009

Module: wine Branch: master Commit: 081576e157fdb5b7929f0f13599b369c2b18ad8c URL: http://source.winehq.org/git/wine.git/?a=commit;h=081576e157fdb5b7929f0f135… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Wed Apr 8 22:17:29 2009 +0200 urlmon/tests: Allow BINDSTATUS_COOKIE_SENT in a test. --- dlls/urlmon/tests/url.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/urlmon/tests/url.c b/dlls/urlmon/tests/url.c index 9d10a59..6d3832e 100644 --- a/dlls/urlmon/tests/url.c +++ b/dlls/urlmon/tests/url.c @@ -1338,6 +1338,9 @@ static HRESULT WINAPI statusclb_OnProgress(IBindStatusCallback *iface, ULONG ulP case BINDSTATUS_PROXYDETECTING: trace("BINDSTATUS_PROXYDETECTING\n"); break; + case BINDSTATUS_COOKIE_SENT: + trace("BINDSTATUS_COOKIE_SENT\n"); + break; default: ok(0, "unexpected code %d\n", ulStatusCode); };

1 0

Rein Klazes : win87em: Always return that a 8087 coprocessor is present.
by Alexandre Julliard April 9, 2009

April 9, 2009

Module: wine Branch: master Commit: f33ce58be8d3b39206f13c73ff2aca470cf17366 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f33ce58be8d3b39206f13c73f… Author: Rein Klazes <wijn(a)online.nl> Date: Thu Apr 9 07:09:18 2009 +0200 win87em: Always return that a 8087 coprocessor is present. --- dlls/win87em.dll16/win87em.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/win87em.dll16/win87em.c b/dlls/win87em.dll16/win87em.c index 35a04c4..d3fc96a 100644 --- a/dlls/win87em.dll16/win87em.c +++ b/dlls/win87em.dll16/win87em.c @@ -45,7 +45,7 @@ struct Win87EmInfoStruct */ /* FIXME: Still rather skeletal implementation only */ -static BOOL Installed = 0; +static BOOL Installed = 1; /* 8087 is installed */ static WORD RefCount = 0; static WORD CtrlWord_1 = 0; static WORD CtrlWord_2 = 0;

1 0

Detlef Riekenberg : winmm/tests: Fix a test on win98.
by Alexandre Julliard April 9, 2009

April 9, 2009

Module: wine Branch: master Commit: be0721d4427bd8f8814998ebcae88aa10da7e1f6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=be0721d4427bd8f8814998ebc… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Wed Apr 8 22:15:17 2009 +0200 winmm/tests: Fix a test on win98. --- dlls/winmm/tests/mixer.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/winmm/tests/mixer.c b/dlls/winmm/tests/mixer.c index b54bb83..59627a7 100644 --- a/dlls/winmm/tests/mixer.c +++ b/dlls/winmm/tests/mixer.c @@ -1030,9 +1030,12 @@ static void test_mixerOpen(void) mmsys_error(rc)); rc = mixerOpen(&mix, d, 0xdeadbeef, 0, CALLBACK_WINDOW); - ok(rc == MMSYSERR_INVALPARAM, + ok(rc == MMSYSERR_INVALPARAM || + rc == MMSYSERR_NOERROR, /* 98 */ "mixerOpen: MMSYSERR_INVALPARAM expected, got %s\n", mmsys_error(rc)); + if (rc == MMSYSERR_NOERROR) + test_mixerClose(mix); /* Test mixerOpen with a NULL dwCallback and CALLBACK_WINDOW flag. */ rc = mixerOpen(&mix, d, 0, 0, CALLBACK_WINDOW);

1 0

Detlef Riekenberg : wintrust/tests: Fix some tests on win9x.
by Alexandre Julliard April 9, 2009

April 9, 2009

Module: wine Branch: master Commit: 49ff2be04e9811573907c1bd754c3029d15189c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=49ff2be04e9811573907c1bd7… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Wed Apr 8 19:53:59 2009 +0200 wintrust/tests: Fix some tests on win9x. --- dlls/wintrust/tests/crypt.c | 12 +++++++++--- 1 files changed, 9 insertions(+), 3 deletions(-) diff --git a/dlls/wintrust/tests/crypt.c b/dlls/wintrust/tests/crypt.c index 9129fa9..cfb9564 100644 --- a/dlls/wintrust/tests/crypt.c +++ b/dlls/wintrust/tests/crypt.c @@ -854,7 +854,9 @@ static void test_cdf_parsing(void) catcdf = pCryptCATCDFOpen(cdffileW, cdf_callback); ok(catcdf == NULL, "CryptCATCDFOpen succeeded\n"); todo_wine - ok(GetLastError() == ERROR_SHARING_VIOLATION, "Expected ERROR_SHARING_VIOLATION, got %d\n", GetLastError()); + ok(GetLastError() == ERROR_SHARING_VIOLATION || + broken(GetLastError() == ERROR_SUCCESS), /* win9x */ + "Expected ERROR_SHARING_VIOLATION, got %d\n", GetLastError()); DeleteFileA(cdffileA); /* Header and member only */ @@ -868,7 +870,9 @@ static void test_cdf_parsing(void) catcdf = pCryptCATCDFOpen(cdffileW, cdf_callback); ok(catcdf == NULL, "CryptCATCDFOpen succeeded\n"); todo_wine - ok(GetLastError() == ERROR_SHARING_VIOLATION, "Expected ERROR_SHARING_VIOLATION, got %d\n", GetLastError()); + ok(GetLastError() == ERROR_SHARING_VIOLATION || + broken(GetLastError() == ERROR_SUCCESS), /* win9x */ + "Expected ERROR_SHARING_VIOLATION, got %d\n", GetLastError()); DeleteFileA(cdffileA); ok(!DeleteFileA(catfileA), "Didn't expect a catalog file to be created\n"); @@ -882,7 +886,9 @@ static void test_cdf_parsing(void) catcdf = pCryptCATCDFOpen(cdffileW, cdf_callback); ok(catcdf == NULL, "CryptCATCDFOpen succeeded\n"); todo_wine - ok(GetLastError() == ERROR_SHARING_VIOLATION, "Expected ERROR_SHARING_VIOLATION, got %d\n", GetLastError()); + ok(GetLastError() == ERROR_SHARING_VIOLATION || + broken(GetLastError() == ERROR_SUCCESS), /* win9x */ + "Expected ERROR_SHARING_VIOLATION, got %d\n", GetLastError()); DeleteFileA(cdffileA); ok(!DeleteFileA(catfileA), "Didn't expect a catalog file to be created\n");

1 0