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

Stefan Dösinger : wined3d: General signed format correction without native signed formats.
by Alexandre Julliard 21 Mar '07

21 Mar '07

Module: wine Branch: master Commit: e25a16fda5be9ec7e1c0e56d430d3e4c6e31f05c URL: http://source.winehq.org/git/wine.git/?a=commit;h=e25a16fda5be9ec7e1c0e56d4… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Mar 21 00:06:04 2007 +0100 wined3d: General signed format correction without native signed formats. Implement signed d3d formats for D3DFMT_V8U8 and D3DFMT_Q8W8V8U8 if no suitable opengl signed format is supported. --- dlls/wined3d/arb_program_shader.c | 30 +++++++++++++------------ dlls/wined3d/surface.c | 43 ++++++++++++++++++++++++++++-------- 2 files changed, 49 insertions(+), 24 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 56ef5fb..f2c58ff 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -382,6 +382,8 @@ static void vshader_program_add_param(SHADER_OPCODE_ARG *arg, const DWORD param, static void shader_hw_sample(SHADER_OPCODE_ARG* arg, DWORD sampler_idx, const char *dst_str, const char *coord_reg) { IWineD3DPixelShaderImpl* This = (IWineD3DPixelShaderImpl*) arg->shader; IWineD3DDeviceImpl* deviceImpl = (IWineD3DDeviceImpl*) This->baseShader.device; + IWineD3DBaseTextureImpl *texture = (IWineD3DBaseTextureImpl *) deviceImpl->stateBlock->textures[sampler_idx]; + WineD3D_GL_Info *gl_info = &((IWineD3DImpl *)(((IWineD3DDeviceImpl *)(This->baseShader.device))->wineD3D))->gl_info; SHADER_BUFFER* buffer = arg->buffer; DWORD sampler_type = arg->reg_maps->samplers[sampler_idx] & WINED3DSP_TEXTURETYPE_MASK; @@ -414,6 +416,19 @@ static void shader_hw_sample(SHADER_OPCODE_ARG* arg, DWORD sampler_idx, const ch } else { shader_addline(buffer, "TEX %s, %s, texture[%u], %s;\n", dst_str, coord_reg, sampler_idx, tex_type); } + + /* Signedness correction */ + if(!GL_SUPPORT(NV_TEXTURE_SHADER3) /* Provides signed formats */ && texture) { + WINED3DFORMAT format = texture->baseTexture.format; + + if((format == WINED3DFMT_V8U8 && !GL_SUPPORT(ATI_ENVMAP_BUMPMAP)) || + format == WINED3DFMT_Q8W8V8U8 || + format == WINED3DFMT_V16U16) { + shader_addline(buffer, "MAD %s, %s, coefmul.x, -one;\n", dst_str, dst_str); + } else if(format == WINED3DFMT_X8L8V8U8) { + shader_addline(buffer, "MAD %s.rg, %s, coefmul.x, -one;\n", dst_str, dst_str); + } + } } @@ -694,7 +709,6 @@ void pshader_hw_texreg2gb(SHADER_OPCODE_ARG* arg) { void pshader_hw_texbem(SHADER_OPCODE_ARG* arg) { IWineD3DPixelShaderImpl* This = (IWineD3DPixelShaderImpl*) arg->shader; - WineD3D_GL_Info *gl_info = &((IWineD3DImpl *)(((IWineD3DDeviceImpl *)(This->baseShader.device))->wineD3D))->gl_info; DWORD dst = arg->dst; DWORD src = arg->src[0] & WINED3DSP_REGNUM_MASK; @@ -709,19 +723,7 @@ void pshader_hw_texbem(SHADER_OPCODE_ARG* arg) { pshader_get_register_name(dst, reg_coord); if(This->bumpenvmatconst) { - /*shader_addline(buffer, "MOV T%u, fragment.texcoord[%u];\n", 1, 1); Not needed - done already */ - - /* Plain GL does not have any signed formats suitable for that instruction. - * So the surface loading code converts the -128 ... 127 signed integers to - * 0 ... 255 unsigned ones. The following line undoes that. - * - * TODO: GL_ATI_envmap_bumpmap supports D3DFMT_DU8DV8 only. If conversion for other formats - * is implemented check the texture format. - * - * TODO: Move that to the common sampling function - */ - if(!GL_SUPPORT(NV_TEXTURE_SHADER3) && !GL_SUPPORT(ATI_ENVMAP_BUMPMAP)) - shader_addline(buffer, "MAD T%u, T%u, coefmul.x, -one;\n", src, src); + /* 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, T%u;\n", src); diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index e1c754e..8ac924b 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -45,7 +45,10 @@ typedef enum { CONVERT_CK_8888, CONVERT_CK_8888_ARGB, CONVERT_RGB32_888, - CONVERT_V8U8 + CONVERT_V8U8, + CONVERT_X8L8V8U8, + CONVERT_Q8W8V8U8, + CONVERT_V16U16 } CONVERT_TYPES; HRESULT d3dfmt_convert_surface(BYTE *src, BYTE *dst, UINT pitch, UINT width, UINT height, UINT outpitch, CONVERT_TYPES convert, IWineD3DSurfaceImpl *surf); @@ -1475,37 +1478,37 @@ static HRESULT d3dfmt_get_conv(IWineD3DSurfaceImpl *This, BOOL need_alpha_ck, BO *convert = CONVERT_V8U8; *format = GL_BGR; *internal = GL_RGB8; - *type = GL_BYTE; + *type = GL_UNSIGNED_BYTE; *target_bpp = 3; break; case WINED3DFMT_X8L8V8U8: if(GL_SUPPORT(NV_TEXTURE_SHADER3)) break; - FIXME("Conversion for D3D_X8L8V8U8 not implemented\n"); + *convert = CONVERT_X8L8V8U8; *format = GL_BGRA; *internal = GL_RGBA8; - *type = GL_BYTE; + *type = GL_UNSIGNED_BYTE; *target_bpp = 4; /* Not supported by GL_ATI_envmap_bumpmap */ break; case WINED3DFMT_Q8W8V8U8: if(GL_SUPPORT(NV_TEXTURE_SHADER3)) break; - FIXME("Conversion for D3D_Q8W8V8U8 not implemented\n"); + *convert = CONVERT_Q8W8V8U8; *format = GL_BGRA; *internal = GL_RGBA8; - *type = GL_BYTE; + *type = GL_UNSIGNED_BYTE; *target_bpp = 4; /* Not supported by GL_ATI_envmap_bumpmap */ break; case WINED3DFMT_V16U16: if(GL_SUPPORT(NV_TEXTURE_SHADER3)) break; - FIXME("Conversion for D3D_V16U16 not implemented\n"); - *format = GL_COLOR_INDEX; - *internal = GL_COLOR_INDEX; + *convert = CONVERT_V16U16; + *format = GL_BGR; + *internal = GL_RGB16; *type = GL_SHORT; - *target_bpp = 4; + *target_bpp = 6; /* What should I do here about GL_ATI_envmap_bumpmap? * Convert it or allow data loss by loading it into a 8 bit / channel texture? */ @@ -1649,6 +1652,26 @@ HRESULT d3dfmt_convert_surface(BYTE *src, BYTE *dst, UINT pitch, UINT width, UIN break; } + case CONVERT_Q8W8V8U8: + { + unsigned int x, y; + DWORD *Source; + unsigned char *Dest; + for(y = 0; y < height; y++) { + Source = (DWORD *) (src + y * pitch); + Dest = (unsigned char *) (dst + y * outpitch); + for (x = 0; x < width; x++ ) { + long color = (*Source++); + /* B */ Dest[0] = ((color >> 16) & 0xff) + 128; /* W */ + /* G */ Dest[1] = ((color >> 8 ) & 0xff) + 128; /* V */ + /* R */ Dest[2] = (color & 0xff) + 128; /* U */ + /* A */ Dest[3] = ((color >> 24) & 0xff) + 128; /* Q */ + Dest += 4; + } + } + break; + } + default: ERR("Unsupported conversation type %d\n", convert); }

1 0

Stefan Dösinger : wined3d: Support GL_ATI_envmap_bumpmap for D3DFMT_V8U8.
by Alexandre Julliard 21 Mar '07

21 Mar '07

Module: wine Branch: master Commit: ede01abee2966b2bafa7a121b5fb8eb92797a6be URL: http://source.winehq.org/git/wine.git/?a=commit;h=ede01abee2966b2bafa7a121b… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Mar 20 23:42:37 2007 +0100 wined3d: Support GL_ATI_envmap_bumpmap for D3DFMT_V8U8. --- dlls/wined3d/arb_program_shader.c | 9 +++++---- dlls/wined3d/surface.c | 16 ++++++++++++---- 2 files changed, 17 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index f5fcbd7..56ef5fb 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -715,11 +715,12 @@ void pshader_hw_texbem(SHADER_OPCODE_ARG* arg) { * So the surface loading code converts the -128 ... 127 signed integers to * 0 ... 255 unsigned ones. The following line undoes that. * - * TODO: GL_ATI_envmap_bumpmap provides pixel formats - * suitable for loading the Direct3D perturbation data. If it is used, do - * not correct the signedness + * TODO: GL_ATI_envmap_bumpmap supports D3DFMT_DU8DV8 only. If conversion for other formats + * is implemented check the texture format. + * + * TODO: Move that to the common sampling function */ - if(!GL_SUPPORT(NV_TEXTURE_SHADER3)) + if(!GL_SUPPORT(NV_TEXTURE_SHADER3) && !GL_SUPPORT(ATI_ENVMAP_BUMPMAP)) shader_addline(buffer, "MAD T%u, T%u, coefmul.x, -one;\n", src, src); shader_addline(buffer, "SWZ TMP2, bumpenvmat, x, z, 0, 0;\n"); diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index c1b1465..e1c754e 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1464,11 +1464,14 @@ static HRESULT d3dfmt_get_conv(IWineD3DSurfaceImpl *This, BOOL need_alpha_ck, BO break; case WINED3DFMT_V8U8: - /* TODO: GL_ATI_envmap_bumpmap provides suitable formats. - * use it instead of converting - * Remember to adjust the texbem instruction in the shader - */ if(GL_SUPPORT(NV_TEXTURE_SHADER3)) break; + else if(GL_SUPPORT(ATI_ENVMAP_BUMPMAP)) { + *format = GL_DUDV_ATI; + *internal = GL_DU8DV8_ATI; + *type = GL_BYTE; + /* No conversion - Just change the gl type */ + break; + } *convert = CONVERT_V8U8; *format = GL_BGR; *internal = GL_RGB8; @@ -1483,6 +1486,7 @@ static HRESULT d3dfmt_get_conv(IWineD3DSurfaceImpl *This, BOOL need_alpha_ck, BO *internal = GL_RGBA8; *type = GL_BYTE; *target_bpp = 4; + /* Not supported by GL_ATI_envmap_bumpmap */ break; case WINED3DFMT_Q8W8V8U8: @@ -1492,6 +1496,7 @@ static HRESULT d3dfmt_get_conv(IWineD3DSurfaceImpl *This, BOOL need_alpha_ck, BO *internal = GL_RGBA8; *type = GL_BYTE; *target_bpp = 4; + /* Not supported by GL_ATI_envmap_bumpmap */ break; case WINED3DFMT_V16U16: @@ -1501,6 +1506,9 @@ static HRESULT d3dfmt_get_conv(IWineD3DSurfaceImpl *This, BOOL need_alpha_ck, BO *internal = GL_COLOR_INDEX; *type = GL_SHORT; *target_bpp = 4; + /* What should I do here about GL_ATI_envmap_bumpmap? + * Convert it or allow data loss by loading it into a 8 bit / channel texture? + */ break; default:

1 0

Alessandro Pignotti : dplayx: Check for null pointer dereference in DP_FindPlayer.
by Alexandre Julliard 21 Mar '07

21 Mar '07

Module: wine Branch: master Commit: d8b24e36645d11f89e0260c87f5c9270d6b0c90f URL: http://source.winehq.org/git/wine.git/?a=commit;h=d8b24e36645d11f89e0260c87… Author: Alessandro Pignotti <alex.pigna(a)inventati.org> Date: Wed Mar 21 12:14:47 2007 +0100 dplayx: Check for null pointer dereference in DP_FindPlayer. --- dlls/dplayx/dplay.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/dplayx/dplay.c b/dlls/dplayx/dplay.c index 9889283..ed58ddf 100644 --- a/dlls/dplayx/dplay.c +++ b/dlls/dplayx/dplay.c @@ -1280,6 +1280,9 @@ static lpPlayerList DP_FindPlayer( IDirectPlay2AImpl* This, DPID dpid ) TRACE( "(%p)->(0x%08x)\n", This, dpid ); + if(This->dp2->lpSysGroup == NULL) + return NULL; + DPQ_FIND_ENTRY( This->dp2->lpSysGroup->players, players, lpPData->dpid, ==, dpid, lpPlayers ); return lpPlayers;

1 0

Andrew Talbot : dbghelp: Replace inline static with static inline.
by Alexandre Julliard 21 Mar '07

21 Mar '07

Module: wine Branch: master Commit: 6a23efdaa27092b4512784200b901ed944bce83a URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a23efdaa27092b4512784200… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Mon Mar 19 19:44:25 2007 +0000 dbghelp: Replace inline static with static inline. --- dlls/dbghelp/symbol.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dbghelp/symbol.c b/dlls/dbghelp/symbol.c index d298b50..2907bf3 100644 --- a/dlls/dbghelp/symbol.c +++ b/dlls/dbghelp/symbol.c @@ -41,14 +41,14 @@ WINE_DEFAULT_DEBUG_CHANNEL(dbghelp); WINE_DECLARE_DEBUG_CHANNEL(dbghelp_symt); -inline static int cmp_addr(ULONG64 a1, ULONG64 a2) +static inline int cmp_addr(ULONG64 a1, ULONG64 a2) { if (a1 > a2) return 1; if (a1 < a2) return -1; return 0; } -inline static int cmp_sorttab_addr(const struct module* module, int idx, ULONG64 addr) +static inline int cmp_sorttab_addr(const struct module* module, int idx, ULONG64 addr) { ULONG64 ref;

1 0

Stefan Dösinger : wined3d: Add GL_ATI_envmap_bumpmap to our gl extension header.
by Alexandre Julliard 21 Mar '07

21 Mar '07

Module: wine Branch: master Commit: e213d7eff596424b894e9278178c9d5c35cda00e URL: http://source.winehq.org/git/wine.git/?a=commit;h=e213d7eff596424b894e92781… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Mar 21 00:13:47 2007 +0100 wined3d: Add GL_ATI_envmap_bumpmap to our gl extension header. --- dlls/wined3d/directx.c | 3 +++ include/wine/wined3d_gl.h | 21 +++++++++++++++++++++ 2 files changed, 24 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 6a1b9e8..915d938 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -798,6 +798,9 @@ BOOL IWineD3DImpl_FillGLCaps(IWineD3D *iface, Display* display) { gl_info->vs_ati_version = VS_VERSION_11; TRACE_(d3d_caps)(" FOUND: ATI (EXT) Vertex Shader support - version=%02x\n", gl_info->vs_ati_version); gl_info->supported[EXT_VERTEX_SHADER] = TRUE; + } else if (strcmp(ThisExtn, "GL_ATI_envmap_bumpmap") == 0) { + TRACE_(d3d_caps)(" FOUND: ATI Environment Bump Mapping support\n"); + gl_info->supported[ATI_ENVMAP_BUMPMAP] = TRUE; /** * Apple */ diff --git a/include/wine/wined3d_gl.h b/include/wine/wined3d_gl.h index 4f85461..dbb76a1 100644 --- a/include/wine/wined3d_gl.h +++ b/include/wine/wined3d_gl.h @@ -1159,6 +1159,21 @@ typedef void (APIENTRY * PGLFNFINISHFENCEAPPLEPROC) (GLuint); typedef GLboolean (APIENTRY * PGLFNISFENCEAPPLEPROC) (GLuint); typedef GLboolean (APIENTRY * PGLFNTESTOBJECTAPPLEPROC) (GLenum, GLuint); typedef void (APIENTRY * PGLFNFINISHOBJECTAPPLEPROC) (GLenum, GLuint); +/* GL_ATI_envmap_bumpmap */ +#ifndef GL_ATI_envmap_bumpmap +#define GL_BUMP_ROT_MATRIX_ATI 0x8775 +#define GL_BUMP_ROT_MATRIX_SIZE_ATI 0x8776 +#define GL_BUMP_NUM_TEX_UNITS_ATI 0x8777 +#define GL_BUMP_TEX_UNITS_ATI 0x8778 +#define GL_DUDV_ATI 0x8779 +#define GL_DU8DV8_ATI 0x877A +#define GL_BUMP_ENVMAP_ATI 0x877B +#define GL_BUMP_TARGET_ATI 0x877C +#endif +typedef void (APIENTRY * PGLFNTEXBUMPPARAMETERIVATIPROC) (GLenum, GLuint); +typedef void (APIENTRY * PGLFNTEXBUMPPARAMETERFVATIPROC) (GLenum, GLuint); +typedef void (APIENTRY * PGLFNGETTEXBUMPPARAMETERIVATIPROC) (GLenum, GLuint); +typedef void (APIENTRY * PGLFNGETTEXBUMPPARAMETERFVATIPROC) (GLenum, GLuint); /* GL_VERSION_2_0 */ #ifndef GL_VERSION_2_0 @@ -1522,6 +1537,7 @@ typedef enum _GL_SupportedExt { ATI_TEXTURE_ENV_COMBINE3, ATI_TEXTURE_MIRROR_ONCE, EXT_VERTEX_SHADER, + ATI_ENVMAP_BUMPMAP, /* APPLE */ APPLE_FENCE, @@ -1732,6 +1748,11 @@ typedef enum _GL_SupportedExt { USE_GL_FUNC(PGLFNISFENCEAPPLEPROC, glIsFenceAPPLE); \ USE_GL_FUNC(PGLFNTESTOBJECTAPPLEPROC, glTestObjectAPPLE); \ USE_GL_FUNC(PGLFNFINISHOBJECTAPPLEPROC, glFinishObjectAPPLE); \ + /* GL_ATI_envmap_bumpmap */ \ + USE_GL_FUNC(PGLFNTEXBUMPPARAMETERIVATIPROC, glTexBumpParameterivATI); \ + USE_GL_FUNC(PGLFNTEXBUMPPARAMETERFVATIPROC, glTexBumpParameterfvATI); \ + USE_GL_FUNC(PGLFNGETTEXBUMPPARAMETERIVATIPROC, glGetTexBumpParameterivATI); \ + USE_GL_FUNC(PGLFNGETTEXBUMPPARAMETERFVATIPROC, glGetTexBumpParameterfvATI); \ /* OpenGL 2.0 functions */ #define GL2_FUNCS_GEN \

1 0

Alexandre Julliard : server: Use a standard async I/ O event to signal directory changes.
by Alexandre Julliard 21 Mar '07

21 Mar '07

Module: wine Branch: master Commit: 2082a97d45f74f31876c9b65ecebf3107b25cc69 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2082a97d45f74f31876c9b65e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 21 14:50:15 2007 +0100 server: Use a standard async I/O event to signal directory changes. --- dlls/ntdll/directory.c | 4 +--- include/wine/server_protocol.h | 3 +-- server/change.c | 26 ++++++-------------------- server/protocol.def | 1 - server/trace.c | 1 - 5 files changed, 8 insertions(+), 27 deletions(-) diff --git a/dlls/ntdll/directory.c b/dlls/ntdll/directory.c index 410f35c..f03a7b4 100644 --- a/dlls/ntdll/directory.c +++ b/dlls/ntdll/directory.c @@ -2148,7 +2148,6 @@ done: struct read_changes_info { HANDLE FileHandle; - HANDLE Event; PIO_APC_ROUTINE ApcRoutine; PVOID ApcContext; PVOID Buffer; @@ -2259,7 +2258,6 @@ NtNotifyChangeDirectoryFile( HANDLE FileHandle, HANDLE Event, return STATUS_NO_MEMORY; info->FileHandle = FileHandle; - info->Event = Event; info->Buffer = Buffer; info->BufferSize = BufferSize; info->ApcRoutine = ApcRoutine; @@ -2268,13 +2266,13 @@ NtNotifyChangeDirectoryFile( HANDLE FileHandle, HANDLE Event, SERVER_START_REQ( read_directory_changes ) { req->handle = FileHandle; - req->event = Event; req->filter = CompletionFilter; req->want_data = (Buffer != NULL); req->subtree = WatchTree; req->async.callback = read_changes_apc; req->async.iosb = IoStatusBlock; req->async.arg = info; + req->async.event = Event; status = wine_server_call( req ); } SERVER_END_REQ; diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 68cc112..726d833 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -1655,7 +1655,6 @@ struct read_directory_changes_request struct request_header __header; unsigned int filter; obj_handle_t handle; - obj_handle_t event; int subtree; int want_data; async_data_t async; @@ -4700,6 +4699,6 @@ union generic_reply struct allocate_locally_unique_id_reply allocate_locally_unique_id_reply; }; -#define SERVER_PROTOCOL_VERSION 284 +#define SERVER_PROTOCOL_VERSION 285 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/server/change.c b/server/change.c index b556a12..4ecbc46 100644 --- a/server/change.c +++ b/server/change.c @@ -282,10 +282,7 @@ void do_change_notify( int unix_fd ) static void dir_signal_changed( struct dir *dir ) { - if (dir->event) - set_event( dir->event ); - else - wake_up( &dir->obj, 0 ); + if (!dir->event) wake_up( &dir->obj, 0 ); } /* SIGIO callback, called synchronously with the poll loop */ @@ -347,11 +344,7 @@ static void dir_destroy( struct object *obj ) async_terminate_queue( &dir->change_q, STATUS_CANCELLED ); while ((record = get_first_change_record( dir ))) free( record ); - if (dir->event) - { - set_event( dir->event ); - release_object( dir->event ); - } + if (dir->event) release_object( dir->event ); release_object( dir->fd ); if (inotify_fd && list_empty( &change_list )) @@ -1088,19 +1081,16 @@ DECL_HANDLER(read_directory_changes) return; /* possibly send changes through an event flag */ - if (req->event) - { - event = get_event_obj( current->process, req->event, EVENT_MODIFY_STATE ); - if (!event) - goto end; - } + if (req->async.event && + !(event = get_event_obj( current->process, req->async.event, EVENT_MODIFY_STATE ))) + goto end; /* discard the current data, and move onto the next event */ if (dir->event) release_object( dir->event ); dir->event = event; /* requests don't timeout */ - if (!create_async( current, NULL, &dir->change_q, &req->async )) return; + if (!create_async( current, NULL, &dir->change_q, &req->async )) goto end; /* assign it once */ if (!dir->filter) @@ -1116,10 +1106,6 @@ DECL_HANDLER(read_directory_changes) if (dir->signaled>0) dir->signaled--; - /* clear the event */ - if (event) - reset_event( event ); - /* if there's already a change in the queue, send it */ if (!list_empty( &dir->change_q ) && !list_empty( &dir->change_records )) diff --git a/server/protocol.def b/server/protocol.def index 3d0618a..1e7cb8b 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -1299,7 +1299,6 @@ enum char_info_mode @REQ(read_directory_changes) unsigned int filter; /* notification filter */ obj_handle_t handle; /* handle to the directory */ - obj_handle_t event; /* handle to the event */ int subtree; /* watch the subtree? */ int want_data; /* flag indicating whether change data should be collected */ async_data_t async; /* async I/O parameters */ diff --git a/server/trace.c b/server/trace.c index d04c4c5..ed42650 100644 --- a/server/trace.c +++ b/server/trace.c @@ -1655,7 +1655,6 @@ static void dump_read_directory_changes_request( const struct read_directory_cha { fprintf( stderr, " filter=%08x,", req->filter ); fprintf( stderr, " handle=%p,", req->handle ); - fprintf( stderr, " event=%p,", req->event ); fprintf( stderr, " subtree=%d,", req->subtree ); fprintf( stderr, " want_data=%d,", req->want_data ); fprintf( stderr, " async=" );

1 0

Rob Shearman : atl: Add support for the pMapEntries parameter to AtlModuleUpdateRegistryFromResourceD .
by Alexandre Julliard 21 Mar '07

21 Mar '07

Module: wine Branch: master Commit: c11ad1eb48ac419af6599e432258d3bee5a20543 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c11ad1eb48ac419af6599e432… Author: Rob Shearman <rob(a)codeweavers.com> Date: Wed Mar 21 09:29:48 2007 +0000 atl: Add support for the pMapEntries parameter to AtlModuleUpdateRegistryFromResourceD. --- dlls/atl/registrar.c | 15 ++++++++++----- 1 files changed, 10 insertions(+), 5 deletions(-) diff --git a/dlls/atl/registrar.c b/dlls/atl/registrar.c index 353e113..4282b40 100644 --- a/dlls/atl/registrar.c +++ b/dlls/atl/registrar.c @@ -756,11 +756,13 @@ HRESULT WINAPI DllGetClassObject(REFCLSID clsid, REFIID riid, LPVOID *ppvObject) extern HINSTANCE hInst; -static HRESULT do_register_dll_server(LPCOLESTR wszDll, LPCOLESTR wszId, BOOL do_register) +static HRESULT do_register_dll_server(LPCOLESTR wszDll, LPCOLESTR wszId, + BOOL do_register, const struct _ATL_REGMAP_ENTRY* pMapEntries) { WCHAR buf[MAX_PATH]; HRESULT hres; IRegistrar *pRegistrar; + const struct _ATL_REGMAP_ENTRY *pMapEntry; static const WCHAR wszModule[] = {'M','O','D','U','L','E',0}; static const WCHAR wszRegistry[] = {'R','E','G','I','S','T','R','Y',0}; @@ -770,6 +772,9 @@ static HRESULT do_register_dll_server(LPCOLESTR wszDll, LPCOLESTR wszId, BOOL do Registrar_create(NULL, &IID_IRegistrar, (void**)&pRegistrar); IRegistrar_AddReplacement(pRegistrar, wszModule, wszDll); + for (pMapEntry = pMapEntries; pMapEntry && pMapEntry->szKey; pMapEntry++) + IRegistrar_AddReplacement(pRegistrar, pMapEntry->szKey, pMapEntry->szData); + StringFromGUID2(&CLSID_ATLRegistrar, buf, sizeof(buf)/sizeof(buf[0])); IRegistrar_AddReplacement(pRegistrar, wszCLSID_ATLRegistrar, buf); @@ -785,7 +790,7 @@ static HRESULT do_register_dll_server(LPCOLESTR wszDll, LPCOLESTR wszId, BOOL do static HRESULT do_register_server(BOOL do_register) { static const WCHAR wszDll[] = {'a','t','l','.','d','l','l',0}; - return do_register_dll_server(wszDll, MAKEINTRESOURCEW(101), do_register); + return do_register_dll_server(wszDll, MAKEINTRESOURCEW(101), do_register, NULL); } /*********************************************************************** @@ -801,8 +806,8 @@ HRESULT WINAPI AtlModuleUpdateRegistryFromResourceD(_ATL_MODULEW* pM, LPCOLESTR */ WCHAR module_name[MAX_PATH]; - if(pMapEntries || pReg) { - FIXME("MapEntries and Registrar parameter not supported\n"); + if(pReg) { + FIXME("Registrar parameter not supported\n"); return E_FAIL; } @@ -815,7 +820,7 @@ HRESULT WINAPI AtlModuleUpdateRegistryFromResourceD(_ATL_MODULEW* pM, LPCOLESTR TRACE("%p (%s), %s, %d, %p, %p\n", hInst, debugstr_w(module_name), debugstr_w(lpszRes), bRegister, pMapEntries, pReg); - return do_register_dll_server(module_name, lpszRes, bRegister); + return do_register_dll_server(module_name, lpszRes, bRegister, pMapEntries); } /***********************************************************************

1 0

Rob Shearman : atl: Add support for the registrar parameter of AtlModuleUpdateRegistryFromResourceD .
by Alexandre Julliard 21 Mar '07

21 Mar '07

Module: wine Branch: master Commit: d51c1c7a04dc471068b3685d72fdd808c78b3fc3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d51c1c7a04dc471068b3685d7… Author: Rob Shearman <rob(a)codeweavers.com> Date: Wed Mar 21 09:30:27 2007 +0000 atl: Add support for the registrar parameter of AtlModuleUpdateRegistryFromResourceD. --- dlls/atl/registrar.c | 19 ++++++++----------- 1 files changed, 8 insertions(+), 11 deletions(-) diff --git a/dlls/atl/registrar.c b/dlls/atl/registrar.c index 4282b40..f32ebb3 100644 --- a/dlls/atl/registrar.c +++ b/dlls/atl/registrar.c @@ -756,12 +756,12 @@ HRESULT WINAPI DllGetClassObject(REFCLSID clsid, REFIID riid, LPVOID *ppvObject) extern HINSTANCE hInst; -static HRESULT do_register_dll_server(LPCOLESTR wszDll, LPCOLESTR wszId, - BOOL do_register, const struct _ATL_REGMAP_ENTRY* pMapEntries) +static HRESULT do_register_dll_server(IRegistrar *pRegistrar, LPCOLESTR wszDll, + LPCOLESTR wszId, BOOL do_register, + const struct _ATL_REGMAP_ENTRY* pMapEntries) { WCHAR buf[MAX_PATH]; HRESULT hres; - IRegistrar *pRegistrar; const struct _ATL_REGMAP_ENTRY *pMapEntry; static const WCHAR wszModule[] = {'M','O','D','U','L','E',0}; @@ -769,7 +769,9 @@ static HRESULT do_register_dll_server(LPCOLESTR wszDll, LPCOLESTR wszId, static const WCHAR wszCLSID_ATLRegistrar[] = {'C','L','S','I','D','_','A','T','L','R','e','g','i','s','t','r','a','r',0}; - Registrar_create(NULL, &IID_IRegistrar, (void**)&pRegistrar); + if (!pRegistrar) + Registrar_create(NULL, &IID_IRegistrar, (void**)&pRegistrar); + IRegistrar_AddReplacement(pRegistrar, wszModule, wszDll); for (pMapEntry = pMapEntries; pMapEntry && pMapEntry->szKey; pMapEntry++) @@ -790,7 +792,7 @@ static HRESULT do_register_dll_server(LPCOLESTR wszDll, LPCOLESTR wszId, static HRESULT do_register_server(BOOL do_register) { static const WCHAR wszDll[] = {'a','t','l','.','d','l','l',0}; - return do_register_dll_server(wszDll, MAKEINTRESOURCEW(101), do_register, NULL); + return do_register_dll_server(NULL, wszDll, MAKEINTRESOURCEW(101), do_register, NULL); } /*********************************************************************** @@ -806,11 +808,6 @@ HRESULT WINAPI AtlModuleUpdateRegistryFromResourceD(_ATL_MODULEW* pM, LPCOLESTR */ WCHAR module_name[MAX_PATH]; - if(pReg) { - FIXME("Registrar parameter not supported\n"); - return E_FAIL; - } - if(!GetModuleFileNameW(lhInst, module_name, MAX_PATH)) { FIXME("hinst %p: did not get module name\n", lhInst); @@ -820,7 +817,7 @@ HRESULT WINAPI AtlModuleUpdateRegistryFromResourceD(_ATL_MODULEW* pM, LPCOLESTR TRACE("%p (%s), %s, %d, %p, %p\n", hInst, debugstr_w(module_name), debugstr_w(lpszRes), bRegister, pMapEntries, pReg); - return do_register_dll_server(module_name, lpszRes, bRegister, pMapEntries); + return do_register_dll_server(pReg, module_name, lpszRes, bRegister, pMapEntries); } /***********************************************************************

1 0

Rob Shearman : winedump: Fix the output for Makefile. in with respect to the dependencies line to match that required by the build system .
by Alexandre Julliard 21 Mar '07

21 Mar '07

Module: wine Branch: master Commit: 9142716529f5a13b1f9166d84576d5f09837d8cd URL: http://source.winehq.org/git/wine.git/?a=commit;h=9142716529f5a13b1f9166d84… Author: Rob Shearman <rob(a)codeweavers.com> Date: Wed Mar 21 12:35:43 2007 +0000 winedump: Fix the output for Makefile.in with respect to the dependencies line to match that required by the build system. --- tools/winedump/output.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/tools/winedump/output.c b/tools/winedump/output.c index dff22be..1b325ff 100644 --- a/tools/winedump/output.c +++ b/tools/winedump/output.c @@ -440,7 +440,8 @@ void output_makefile (void) fprintf (makefile, " %s", globals.forward_dll); fprintf (makefile, - "\n\nC_SRCS = \\\n\t%s_main.c\n\n(a)MAKE_DLL_RULES@\n\n### Dependencies:", + "\n\nC_SRCS = \\\n\t%s_main.c\n\n(a)MAKE_DLL_RULES@\n\n" + "@DEPENDENCIES@ # everything below this line is overwritten by make depend", OUTPUT_DLL_NAME); if (globals.forward_dll)

1 0

Rob Shearman : ole32: The 16-bit version of CoDisconnectObject is not compatible with the 32-bit version , so create a separate stub for the former.
by Alexandre Julliard 21 Mar '07

21 Mar '07

Module: wine Branch: master Commit: 3acb0a878d562fbc81a5c190fc6c97bd06c9e8a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3acb0a878d562fbc81a5c190f… Author: Rob Shearman <rob(a)codeweavers.com> Date: Wed Mar 21 12:37:08 2007 +0000 ole32: The 16-bit version of CoDisconnectObject is not compatible with the 32-bit version, so create a separate stub for the former. --- dlls/ole32/compobj.c | 1 - dlls/ole32/compobj.spec | 2 +- dlls/ole32/ole16.c | 9 +++++++++ 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index fe180aa..4639831 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -833,7 +833,6 @@ void WINAPI CoUninitialize(void) /****************************************************************************** * CoDisconnectObject [OLE32.@] - * CoDisconnectObject [COMPOBJ.15] * * Disconnects all connections to this object from remote processes. Dispatches * pending RPCs while blocking new RPCs from occurring, and then calls diff --git a/dlls/ole32/compobj.spec b/dlls/ole32/compobj.spec index af94692..078dfc2 100644 --- a/dlls/ole32/compobj.spec +++ b/dlls/ole32/compobj.spec @@ -12,7 +12,7 @@ 12 stub COFREEALLLIBRARIES 13 pascal CoCreateInstance(ptr ptr long ptr ptr) CoCreateInstance16 14 stub STRINGFROMIID -15 pascal CoDisconnectObject(ptr long) CoDisconnectObject +15 pascal CoDisconnectObject(ptr long) CoDisconnectObject16 16 stub CORELEASEMARSHALDATA 17 pascal -ret16 CoFreeUnusedLibraries() CoFreeUnusedLibraries 18 pascal -ret16 IsEqualGUID(ptr ptr) IsEqualGUID16 diff --git a/dlls/ole32/ole16.c b/dlls/ole32/ole16.c index 410651c..d9c2202 100644 --- a/dlls/ole32/ole16.c +++ b/dlls/ole32/ole16.c @@ -648,6 +648,15 @@ HRESULT WINAPI CoCreateInstance16( } /*********************************************************************** + * CoDisconnectObject [COMPOBJ.15] + */ +HRESULT WINAPI CoDisconnectObject16( LPUNKNOWN lpUnk, DWORD reserved ) +{ + FIXME("(%p, 0x%08x): stub!\n", lpUnk, reserved); + return E_NOTIMPL; +} + +/*********************************************************************** * DllGetClassObject [OLE2.4] */ HRESULT WINAPI DllGetClassObject16(REFCLSID rclsid, REFIID iid, LPVOID *ppv)

1 0