wine-commits December 2008

wine-commits@winehq.org

2 participants
1225 discussions

Jacek Caban : mshtml: Remove no longer needed set_profile.
by Alexandre Julliard 31 Dec '08

31 Dec '08

Module: wine Branch: master Commit: 7901d5f258a56799d2270c50c8370655f65f281e URL: http://source.winehq.org/git/wine.git/?a=commit;h=7901d5f258a56799d2270c50c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Dec 30 21:20:25 2008 +0100 mshtml: Remove no longer needed set_profile. --- dlls/mshtml/nsembed.c | 30 ------------------------------ 1 files changed, 0 insertions(+), 30 deletions(-) diff --git a/dlls/mshtml/nsembed.c b/dlls/mshtml/nsembed.c index 0797977..1a09587 100644 --- a/dlls/mshtml/nsembed.c +++ b/dlls/mshtml/nsembed.c @@ -369,35 +369,6 @@ static void set_bool_pref(nsIPrefBranch *pref, const char *pref_name, BOOL val) ERR("Could not set pref %s\n", debugstr_a(pref_name)); } -static void set_profile(void) -{ - nsIProfile *profile; - PRBool exists = FALSE; - nsresult nsres; - - static const WCHAR wszMSHTML[] = {'M','S','H','T','M','L',0}; - - nsres = nsIServiceManager_GetServiceByContractID(pServMgr, NS_PROFILE_CONTRACTID, - &IID_nsIProfile, (void**)&profile); - if(NS_FAILED(nsres)) { - ERR("Could not get profile service: %08x\n", nsres); - return; - } - - nsres = nsIProfile_ProfileExists(profile, wszMSHTML, &exists); - if(!exists) { - nsres = nsIProfile_CreateNewProfile(profile, wszMSHTML, NULL, NULL, FALSE); - if(NS_FAILED(nsres)) - ERR("CreateNewProfile failed: %08x\n", nsres); - } - - nsres = nsIProfile_SetCurrentProfile(profile, wszMSHTML); - if(NS_FAILED(nsres)) - ERR("SetCurrentProfile failed: %08x\n", nsres); - - nsIProfile_Release(profile); -} - static void set_preferences(void) { nsIPrefBranch *pref; @@ -473,7 +444,6 @@ static BOOL init_xpcom(const PRUnichar *gre_path) ERR("could not get appstartup-notifier: %08x\n", nsres); } - set_profile(); set_preferences(); nsres = nsIComponentManager_CreateInstanceByContractID(pCompMgr, NS_MEMORY_CONTRACTID,

1 0

Henri Verbeet : wined3d: Convert some BOOLs to bitfields in struct SAVEDSTATES.
by Alexandre Julliard 31 Dec '08

31 Dec '08

Module: wine Branch: master Commit: 3920d42f71e60227e0e5b4adc69ef7d98a93d7a8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3920d42f71e60227e0e5b4adc… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Dec 30 14:56:49 2008 +0100 wined3d: Convert some BOOLs to bitfields in struct SAVEDSTATES. --- dlls/wined3d/wined3d_private.h | 43 ++++++++++++++++++++------------------- 1 files changed, 22 insertions(+), 21 deletions(-) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index ab2c68f..82931ea 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1760,27 +1760,28 @@ extern const IWineD3DVertexDeclarationVtbl IWineD3DVertexDeclaration_Vtbl; /* Note: Very long winded but gl Lists are not flexible enough */ /* to resolve everything we need, so doing it manually for now */ typedef struct SAVEDSTATES { - BOOL indices; - BOOL material; - BOOL streamSource[MAX_STREAMS]; - BOOL streamFreq[MAX_STREAMS]; - BOOL textures[MAX_COMBINED_SAMPLERS]; - BOOL transform[HIGHEST_TRANSFORMSTATE + 1]; - BOOL viewport; - BOOL renderState[WINEHIGHEST_RENDER_STATE + 1]; - BOOL textureState[MAX_TEXTURES][WINED3D_HIGHEST_TEXTURE_STATE + 1]; - BOOL samplerState[MAX_COMBINED_SAMPLERS][WINED3D_HIGHEST_SAMPLER_STATE + 1]; - BOOL clipplane[MAX_CLIPPLANES]; - BOOL vertexDecl; - BOOL pixelShader; - WORD pixelShaderConstantsB; - WORD pixelShaderConstantsI; - BOOL *pixelShaderConstantsF; - BOOL vertexShader; - WORD vertexShaderConstantsB; - WORD vertexShaderConstantsI; - BOOL *vertexShaderConstantsF; - BOOL scissorRect; + BOOL streamSource[MAX_STREAMS]; + BOOL streamFreq[MAX_STREAMS]; + BOOL textures[MAX_COMBINED_SAMPLERS]; + BOOL transform[HIGHEST_TRANSFORMSTATE + 1]; + BOOL renderState[WINEHIGHEST_RENDER_STATE + 1]; + BOOL textureState[MAX_TEXTURES][WINED3D_HIGHEST_TEXTURE_STATE + 1]; + BOOL samplerState[MAX_COMBINED_SAMPLERS][WINED3D_HIGHEST_SAMPLER_STATE + 1]; + BOOL clipplane[MAX_CLIPPLANES]; + WORD pixelShaderConstantsB; /* MAX_CONST_B, 16 */ + WORD pixelShaderConstantsI; /* MAX_CONST_I, 16 */ + BOOL *pixelShaderConstantsF; + WORD vertexShaderConstantsB; /* MAX_CONST_B, 16 */ + WORD vertexShaderConstantsI; /* MAX_CONST_I, 16 */ + BOOL *vertexShaderConstantsF; + BYTE indices : 1; + BYTE material : 1; + BYTE viewport : 1; + BYTE vertexDecl : 1; + BYTE pixelShader : 1; + BYTE vertexShader : 1; + BYTE scissorRect : 1; + BYTE padding : 1; } SAVEDSTATES; struct StageState {

1 0

Henri Verbeet : wined3d: Convert some BOOLs to bitfields in struct IWineD3DDeviceImpl.
by Alexandre Julliard 31 Dec '08

31 Dec '08

Module: wine Branch: master Commit: 29a0d065181b10903b1362d09e88692f81474148 URL: http://source.winehq.org/git/wine.git/?a=commit;h=29a0d065181b10903b1362d09… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Dec 30 14:56:49 2008 +0100 wined3d: Convert some BOOLs to bitfields in struct IWineD3DDeviceImpl. Also fills a 3 byte hole. --- dlls/wined3d/device.c | 17 +++++---------- dlls/wined3d/nvidia_texture_shader.c | 2 +- dlls/wined3d/state.c | 4 +- dlls/wined3d/wined3d_private.h | 36 ++++++++++++++++----------------- 4 files changed, 26 insertions(+), 33 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index b905936..06698f5 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3638,6 +3638,7 @@ static void device_map_stage(IWineD3DDeviceImpl *This, int stage, int unit) { static void device_update_fixed_function_usage_map(IWineD3DDeviceImpl *This) { int i; + This->fixed_function_usage_map = 0; for (i = 0; i < MAX_TEXTURES; ++i) { WINED3DTEXTUREOP color_op = This->stateBlock->textureState[i][WINED3DTSS_COLOROP]; WINED3DTEXTUREOP alpha_op = This->stateBlock->textureState[i][WINED3DTSS_ALPHAOP]; @@ -3650,10 +3651,6 @@ static void device_update_fixed_function_usage_map(IWineD3DDeviceImpl *This) { if (color_op == WINED3DTOP_DISABLE) { /* Not used, and disable higher stages */ - while (i < MAX_TEXTURES) { - This->fixed_function_usage_map[i] = FALSE; - ++i; - } break; } @@ -3663,13 +3660,11 @@ static void device_update_fixed_function_usage_map(IWineD3DDeviceImpl *This) { || ((alpha_arg1 == WINED3DTA_TEXTURE) && alpha_op != WINED3DTOP_SELECTARG2) || ((alpha_arg2 == WINED3DTA_TEXTURE) && alpha_op != WINED3DTOP_SELECTARG1) || ((alpha_arg3 == WINED3DTA_TEXTURE) && (alpha_op == WINED3DTOP_MULTIPLYADD || alpha_op == WINED3DTOP_LERP))) { - This->fixed_function_usage_map[i] = TRUE; - } else { - This->fixed_function_usage_map[i] = FALSE; + This->fixed_function_usage_map |= (1 << i); } if ((color_op == WINED3DTOP_BUMPENVMAP || color_op == WINED3DTOP_BUMPENVMAPLUMINANCE) && i < MAX_TEXTURES - 1) { - This->fixed_function_usage_map[i+1] = TRUE; + This->fixed_function_usage_map |= (1 << (i + 1)); } } } @@ -3682,7 +3677,7 @@ static void device_map_fixed_function_samplers(IWineD3DDeviceImpl *This) { if (This->max_ffp_textures == This->max_ffp_texture_stages || This->stateBlock->lowest_disabled_stage <= This->max_ffp_textures) { for (i = 0; i < This->stateBlock->lowest_disabled_stage; ++i) { - if (!This->fixed_function_usage_map[i]) continue; + if (!(This->fixed_function_usage_map & (1 << i))) continue; if (This->texUnitMap[i] != i) { device_map_stage(This, i, i); @@ -3696,7 +3691,7 @@ static void device_map_fixed_function_samplers(IWineD3DDeviceImpl *This) { /* Now work out the mapping */ tex = 0; for (i = 0; i < This->stateBlock->lowest_disabled_stage; ++i) { - if (!This->fixed_function_usage_map[i]) continue; + if (!(This->fixed_function_usage_map & (1 << i))) continue; if (This->texUnitMap[i] != tex) { device_map_stage(This, i, tex); @@ -3739,7 +3734,7 @@ static BOOL device_unit_free_for_vs(IWineD3DDeviceImpl *This, const DWORD *pshad if (!pshader_sampler_tokens) { /* No pixel shader, check fixed function */ - return current_mapping >= MAX_TEXTURES || !This->fixed_function_usage_map[current_mapping]; + return current_mapping >= MAX_TEXTURES || !(This->fixed_function_usage_map & (1 << current_mapping)); } /* Pixel shader, check the shader's sampler map */ diff --git a/dlls/wined3d/nvidia_texture_shader.c b/dlls/wined3d/nvidia_texture_shader.c index 2c58459..a4677dc 100644 --- a/dlls/wined3d/nvidia_texture_shader.c +++ b/dlls/wined3d/nvidia_texture_shader.c @@ -453,7 +453,7 @@ void set_tex_op_nvrc(IWineD3DDevice *iface, BOOL is_alpha, int stage, WINED3DTEX static void nvrc_colorop(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DContext *context) { DWORD stage = (state - STATE_TEXTURESTAGE(0, 0)) / WINED3D_HIGHEST_TEXTURE_STATE; DWORD mapped_stage = stateblock->wineD3DDevice->texUnitMap[stage]; - BOOL tex_used = stateblock->wineD3DDevice->fixed_function_usage_map[stage]; + BOOL tex_used = stateblock->wineD3DDevice->fixed_function_usage_map & (1 << stage); TRACE("Setting color op for stage %d\n", stage); diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 746f636..928a4bb 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -2883,7 +2883,7 @@ static void set_tex_op(IWineD3DDevice *iface, BOOL isAlpha, int Stage, WINED3DTE static void tex_colorop(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DContext *context) { DWORD stage = (state - STATE_TEXTURESTAGE(0, 0)) / WINED3D_HIGHEST_TEXTURE_STATE; DWORD mapped_stage = stateblock->wineD3DDevice->texUnitMap[stage]; - BOOL tex_used = stateblock->wineD3DDevice->fixed_function_usage_map[stage]; + BOOL tex_used = stateblock->wineD3DDevice->fixed_function_usage_map & (1 << stage); TRACE("Setting color op for stage %d\n", stage); @@ -2939,7 +2939,7 @@ static void tex_colorop(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3D void tex_alphaop(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DContext *context) { DWORD stage = (state - STATE_TEXTURESTAGE(0, 0)) / WINED3D_HIGHEST_TEXTURE_STATE; DWORD mapped_stage = stateblock->wineD3DDevice->texUnitMap[stage]; - BOOL tex_used = stateblock->wineD3DDevice->fixed_function_usage_map[stage]; + BOOL tex_used = stateblock->wineD3DDevice->fixed_function_usage_map & (1 << stage); DWORD op, arg1, arg2, arg0; TRACE("Setting alpha op for stage %d\n", stage); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 8759dd9..ab2c68f 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1065,19 +1065,30 @@ struct IWineD3DDeviceImpl unsigned int max_ffp_textures, max_ffp_texture_stages; - /* To store */ - BOOL view_ident; /* true iff view matrix is identity */ - BOOL untransformed; - BOOL vertexBlendUsed; /* To avoid needless setting of the blend matrices */ + WORD view_ident : 1; /* true iff view matrix is identity */ + WORD untransformed : 1; + WORD vertexBlendUsed : 1; /* To avoid needless setting of the blend matrices */ + WORD isRecordingState : 1; + WORD isInDraw : 1; + WORD render_offscreen : 1; + WORD bCursorVisible : 1; + WORD haveHardwareCursor : 1; + WORD d3d_initialized : 1; + WORD inScene : 1; /* A flag to check for proper BeginScene / EndScene call pairs */ + WORD softwareVertexProcessing : 1; /* process vertex shaders using software or hardware */ + WORD useDrawStridedSlow : 1; + WORD instancedDraw : 1; + WORD padding : 3; + + BYTE fixed_function_usage_map; /* MAX_TEXTURES, 8 */ + #define DDRAW_PITCH_ALIGNMENT 8 #define D3D8_PITCH_ALIGNMENT 4 unsigned char surface_alignment; /* Line Alignment of surfaces */ /* State block related */ - BOOL isRecordingState; IWineD3DStateBlockImpl *stateBlock; IWineD3DStateBlockImpl *updateStateBlock; - BOOL isInDraw; /* Internal use fields */ WINED3DDEVICE_CREATION_PARAMETERS createParms; @@ -1107,7 +1118,6 @@ struct IWineD3DDeviceImpl UINT paletteConversionShader; /* For rendering to a texture using glCopyTexImage */ - BOOL render_offscreen; GLenum *draw_buffers; GLuint depth_blt_texture; GLuint depth_blt_rb; @@ -1115,14 +1125,12 @@ struct IWineD3DDeviceImpl UINT depth_blt_rb_h; /* Cursor management */ - BOOL bCursorVisible; UINT xHotSpot; UINT yHotSpot; UINT xScreenSpace; UINT yScreenSpace; UINT cursorWidth, cursorHeight; GLuint cursorTexture; - BOOL haveHardwareCursor; HCURSOR hardwareCursor; /* The Wine logo surface */ @@ -1133,13 +1141,6 @@ struct IWineD3DDeviceImpl /* Device state management */ HRESULT state; - BOOL d3d_initialized; - - /* A flag to check for proper BeginScene / EndScene call pairs */ - BOOL inScene; - - /* process vertex shaders using software or hardware */ - BOOL softwareVertexProcessing; /* DirectDraw stuff */ DWORD ddraw_width, ddraw_height; @@ -1151,13 +1152,10 @@ struct IWineD3DDeviceImpl /* With register combiners we can skip junk texture stages */ DWORD texUnitMap[MAX_COMBINED_SAMPLERS]; DWORD rev_tex_unit_map[MAX_COMBINED_SAMPLERS]; - BOOL fixed_function_usage_map[MAX_TEXTURES]; /* Stream source management */ WineDirect3DVertexStridedData strided_streams; const WineDirect3DVertexStridedData *up_strided; - BOOL useDrawStridedSlow; - BOOL instancedDraw; /* Context management */ WineD3DContext **contexts; /* Dynamic array containing pointers to context structures */

1 0

Henri Verbeet : wined3d: Convert some BOOLs to bitfields in struct WineD3DContext.
by Alexandre Julliard 31 Dec '08

31 Dec '08

Module: wine Branch: master Commit: 3f12f59aa42394778420c3838c928c2bc079b461 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f12f59aa42394778420c3838… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Dec 30 14:56:49 2008 +0100 wined3d: Convert some BOOLs to bitfields in struct WineD3DContext. Also happens to fill two 3 byte holes. --- dlls/wined3d/state.c | 9 ++++++--- dlls/wined3d/wined3d_private.h | 29 ++++++++++++++++------------- 2 files changed, 22 insertions(+), 16 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index c141fbd..746f636 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -3068,7 +3068,8 @@ static void transform_texture(DWORD state, IWineD3DStateBlockImpl *stateblock, W stateblock->wineD3DDevice->frag_pipe->ffp_proj_control); /* The sampler applying function calls us if this changes */ - if(context->lastWasPow2Texture[texUnit] && stateblock->textures[texUnit]) { + if ((context->lastWasPow2Texture & (1 << texUnit)) && stateblock->textures[texUnit]) + { if(generated) { FIXME("Non-power2 texture being used with generated texture coords\n"); } @@ -3358,8 +3359,10 @@ static void sampler_texmatrix(DWORD state, IWineD3DStateBlockImpl *stateblock, W } } - if(texIsPow2 || context->lastWasPow2Texture[sampler]) { - context->lastWasPow2Texture[sampler] = texIsPow2; + if (texIsPow2 || (context->lastWasPow2Texture & (1 << sampler))) + { + if (texIsPow2) context->lastWasPow2Texture |= 1 << sampler; + else context->lastWasPow2Texture &= ~(1 << sampler); transform_texture(STATE_TEXTURESTAGE(stateblock->wineD3DDevice->texUnitMap[sampler], WINED3DTSS_TEXTURETRANSFORMFLAGS), stateblock, context); } } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 7d79867..8759dd9 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -801,21 +801,26 @@ struct WineD3DContext { DWORD tid; /* Thread ID which owns this context at the moment */ /* Stores some information about the context state for optimization */ - BOOL draw_buffer_dirty; - BOOL last_was_rhw; /* true iff last draw_primitive was in xyzrhw mode */ - BOOL last_was_pshader; - BOOL last_was_vshader; - BOOL last_was_foggy_shader; - BOOL namedArraysLoaded, numberedArraysLoaded; + WORD draw_buffer_dirty : 1; + WORD last_was_rhw : 1; /* true iff last draw_primitive was in xyzrhw mode */ + WORD last_was_pshader : 1; + WORD last_was_vshader : 1; + WORD last_was_foggy_shader : 1; + WORD namedArraysLoaded : 1; + WORD numberedArraysLoaded : 1; + WORD last_was_blit : 1; + WORD last_was_ckey : 1; + WORD fog_coord : 1; + WORD isPBuffer : 1; + WORD fog_enabled : 1; + WORD num_untracked_materials : 2; /* Max value 2 */ + WORD padding : 2; + BYTE texShaderBumpMap; /* MAX_TEXTURES, 8 */ + BYTE lastWasPow2Texture; /* MAX_TEXTURES, 8 */ DWORD numbered_array_mask; - BOOL lastWasPow2Texture[MAX_TEXTURES]; GLenum tracking_parm; /* Which source is tracking current colour */ - unsigned char num_untracked_materials; GLenum untracked_materials[2]; - BOOL last_was_blit, last_was_ckey; UINT blit_w, blit_h; - char texShaderBumpMap; - BOOL fog_coord; char *vshader_const_dirty, *pshader_const_dirty; @@ -824,7 +829,6 @@ struct WineD3DContext { HWND win_handle; HDC hdc; HPBUFFERARB pbuffer; - BOOL isPBuffer; GLint aux_buffers; /* FBOs */ @@ -834,7 +838,6 @@ struct WineD3DContext { GLuint dst_fbo; /* Extension emulation */ - BOOL fog_enabled; GLint gl_fog_source; GLfloat fog_coord_value; GLfloat color[4], fogstart, fogend, fogcolor[4];

1 0

Henri Verbeet : wined3d: Remove an unused field from the device.
by Alexandre Julliard 31 Dec '08

31 Dec '08

Module: wine Branch: master Commit: 813c7ed202ee60aff365f39b682f8e8de9f59c99 URL: http://source.winehq.org/git/wine.git/?a=commit;h=813c7ed202ee60aff365f39b6… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Dec 30 14:56:49 2008 +0100 wined3d: Remove an unused field from the device. --- dlls/wined3d/wined3d_private.h | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index dd79c84..7d79867 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1128,9 +1128,6 @@ struct IWineD3DDeviceImpl /* Textures for when no other textures are mapped */ UINT dummyTextureName[MAX_TEXTURES]; - /* Debug stream management */ - BOOL debug; - /* Device state management */ HRESULT state; BOOL d3d_initialized;

1 0

Henri Verbeet : wined3d: Make use_vs() and use_ps() work on a stateblock instead of a device.
by Alexandre Julliard 31 Dec '08

31 Dec '08

Module: wine Branch: master Commit: 2b926db50d04d4cfb0c8c7cfed0536a24074bf7e URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b926db50d04d4cfb0c8c7cfe… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Dec 30 14:56:49 2008 +0100 wined3d: Make use_vs() and use_ps() work on a stateblock instead of a device. Most callers work on a stateblock rather than a device, and the main fields we check (vertexShader and pixelShader) are part of the stateblock as well. --- dlls/wined3d/arb_program_shader.c | 14 ++++++----- dlls/wined3d/ati_fragment_shader.c | 2 +- dlls/wined3d/device.c | 4 +- dlls/wined3d/drawprim.c | 8 ++++-- dlls/wined3d/glsl_shader.c | 3 +- dlls/wined3d/nvidia_texture_shader.c | 2 +- dlls/wined3d/pixelshader.c | 9 +++++-- dlls/wined3d/state.c | 41 +++++++++++++++++---------------- dlls/wined3d/vertexbuffer.c | 3 +- dlls/wined3d/wined3d_private.h | 16 +++++++----- 10 files changed, 57 insertions(+), 45 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2b926db50d04d4cfb0c8c…

1 0

Alexandre Julliard : server: Make the various async I/ O parameters client_ptr_t instead of void pointers.
by Alexandre Julliard 31 Dec '08

31 Dec '08

Module: wine Branch: master Commit: 6db201080f74dece1a31a0d516ecbad983ca2b9e URL: http://source.winehq.org/git/wine.git/?a=commit;h=6db201080f74dece1a31a0d51… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 30 21:09:41 2008 +0100 server: Make the various async I/O parameters client_ptr_t instead of void pointers. --- dlls/ntdll/directory.c | 6 +++--- dlls/ntdll/file.c | 20 ++++++++++---------- dlls/ntdll/sync.c | 14 +++++++++----- dlls/ntdll/thread.c | 2 +- dlls/ws2_32/socket.c | 18 +++++++++--------- include/wine/server_protocol.h | 21 +++++++++++---------- server/async.c | 6 +++--- server/device.c | 4 ++-- server/file.h | 3 ++- server/protocol.def | 19 ++++++++++--------- server/trace.c | 31 ++++++++++++++++++++++--------- tools/make_requests | 2 +- 12 files changed, 83 insertions(+), 63 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6db201080f74dece1a31a…

1 0

Alexandre Julliard : server: Specify the user APC to call only once the system APC has executed.
by Alexandre Julliard 31 Dec '08

31 Dec '08

Module: wine Branch: master Commit: f507ccbf52c6412dadfe4e909cda51cbbf423db5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f507ccbf52c6412dadfe4e909… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 30 20:51:55 2008 +0100 server: Specify the user APC to call only once the system APC has executed. --- dlls/ntdll/directory.c | 6 ++-- dlls/ntdll/file.c | 41 ++++++++++++++++++++++----------------- dlls/ntdll/sync.c | 15 ++++++++++--- dlls/ws2_32/socket.c | 17 +++++++-------- include/wine/server_protocol.h | 6 ++-- server/async.c | 6 ++-- server/file.h | 2 +- server/protocol.def | 4 +- server/thread.c | 4 ++- server/trace.c | 9 ++++--- 10 files changed, 62 insertions(+), 48 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f507ccbf52c6412dadfe4…

1 0

Alexandre Julliard : server: Explicitly specify when an ioctl call needs to be blocking.
by Alexandre Julliard 31 Dec '08

31 Dec '08

Module: wine Branch: master Commit: 7ec95c5beefe33c5f7c373a809cb742b896c9aee URL: http://source.winehq.org/git/wine.git/?a=commit;h=7ec95c5beefe33c5f7c373a80… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 30 20:37:20 2008 +0100 server: Explicitly specify when an ioctl call needs to be blocking. --- dlls/ntdll/file.c | 1 + include/wine/server_protocol.h | 3 ++- server/device.c | 4 ++-- server/fd.c | 4 ++-- server/file.h | 4 ++-- server/named_pipe.c | 16 ++++++++-------- server/protocol.def | 1 + server/trace.c | 1 + 8 files changed, 19 insertions(+), 15 deletions(-) diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index 0a070b5..1dfbd01 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -1198,6 +1198,7 @@ static NTSTATUS server_ioctl_file( HANDLE handle, HANDLE event, SERVER_START_REQ( ioctl ) { req->code = code; + req->blocking = !apc && !event; req->async.handle = wine_server_obj_handle( handle ); req->async.callback = ioctl_completion; req->async.iosb = io; diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 521f727..91656df 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -2710,6 +2710,7 @@ struct ioctl_request struct request_header __header; ioctl_code_t code; async_data_t async; + int blocking; /* VARARG(in_data,bytes); */ }; struct ioctl_reply @@ -5059,6 +5060,6 @@ union generic_reply struct set_window_layered_info_reply set_window_layered_info_reply; }; -#define SERVER_PROTOCOL_VERSION 370 +#define SERVER_PROTOCOL_VERSION 371 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/server/device.c b/server/device.c index 48bccd2..9de2f54 100644 --- a/server/device.c +++ b/server/device.c @@ -125,7 +125,7 @@ static struct object *device_open_file( struct object *obj, unsigned int access, unsigned int sharing, unsigned int options ); static enum server_fd_type device_get_fd_type( struct fd *fd ); static obj_handle_t device_ioctl( struct fd *fd, ioctl_code_t code, const async_data_t *async_data, - const void *data, data_size_t size ); + int blocking, const void *data, data_size_t size ); static const struct object_ops device_ops = { @@ -308,7 +308,7 @@ static struct ioctl_call *find_ioctl_call( struct device *device, struct thread } static obj_handle_t device_ioctl( struct fd *fd, ioctl_code_t code, const async_data_t *async_data, - const void *data, data_size_t size ) + int blocking, const void *data, data_size_t size ) { struct device *device = get_fd_user( fd ); struct ioctl_call *ioctl; diff --git a/server/fd.c b/server/fd.c index 09b93ce..c8b6f7a 100644 --- a/server/fd.c +++ b/server/fd.c @@ -1912,7 +1912,7 @@ static void unmount_device( struct fd *device_fd ) /* default ioctl() routine */ obj_handle_t default_fd_ioctl( struct fd *fd, ioctl_code_t code, const async_data_t *async, - const void *data, data_size_t size ) + int blocking, const void *data, data_size_t size ) { switch(code) { @@ -2015,7 +2015,7 @@ DECL_HANDLER(ioctl) if (fd) { - reply->wait = fd->fd_ops->ioctl( fd, req->code, &req->async, + reply->wait = fd->fd_ops->ioctl( fd, req->code, &req->async, req->blocking, get_req_data(), get_req_data_size() ); reply->options = fd->options; release_object( fd ); diff --git a/server/file.h b/server/file.h index b9a83c3..3abfc02 100644 --- a/server/file.h +++ b/server/file.h @@ -39,7 +39,7 @@ struct fd_ops /* get file information */ enum server_fd_type (*get_fd_type)(struct fd *fd); /* perform an ioctl on the file */ - obj_handle_t (*ioctl)(struct fd *fd, ioctl_code_t code, const async_data_t *async, + obj_handle_t (*ioctl)(struct fd *fd, ioctl_code_t code, const async_data_t *async, int blocking, const void *data, data_size_t size); /* queue an async operation */ void (*queue_async)(struct fd *, const async_data_t *data, int type, int count); @@ -79,7 +79,7 @@ extern struct async *fd_queue_async( struct fd *fd, const async_data_t *data, in extern void fd_async_wake_up( struct fd *fd, int type, unsigned int status ); extern void fd_reselect_async( struct fd *fd, struct async_queue *queue ); extern obj_handle_t default_fd_ioctl( struct fd *fd, ioctl_code_t code, const async_data_t *async, - const void *data, data_size_t size ); + int blocking, const void *data, data_size_t size ); extern void default_fd_queue_async( struct fd *fd, const async_data_t *data, int type, int count ); extern void default_fd_reselect_async( struct fd *fd, struct async_queue *queue ); extern void default_fd_cancel_async( struct fd *fd ); diff --git a/server/named_pipe.c b/server/named_pipe.c index e9cb14a..1651a67 100644 --- a/server/named_pipe.c +++ b/server/named_pipe.c @@ -140,7 +140,7 @@ static void pipe_server_destroy( struct object *obj); static void pipe_server_flush( struct fd *fd, struct event **event ); static enum server_fd_type pipe_server_get_fd_type( struct fd *fd ); static obj_handle_t pipe_server_ioctl( struct fd *fd, ioctl_code_t code, const async_data_t *async, - const void *data, data_size_t size ); + int blocking, const void *data, data_size_t size ); static const struct object_ops pipe_server_ops = { @@ -223,7 +223,7 @@ static struct object *named_pipe_device_open_file( struct object *obj, unsigned static void named_pipe_device_destroy( struct object *obj ); static enum server_fd_type named_pipe_device_get_fd_type( struct fd *fd ); static obj_handle_t named_pipe_device_ioctl( struct fd *fd, ioctl_code_t code, const async_data_t *async_data, - const void *data, data_size_t size ); + int blocking, const void *data, data_size_t size ); static const struct object_ops named_pipe_device_ops = { @@ -592,7 +592,7 @@ static obj_handle_t alloc_wait_event( struct process *process ) } static obj_handle_t pipe_server_ioctl( struct fd *fd, ioctl_code_t code, const async_data_t *async_data, - const void *data, data_size_t size ) + int blocking, const void *data, data_size_t size ) { struct pipe_server *server = get_fd_user( fd ); struct async *async; @@ -605,7 +605,7 @@ static obj_handle_t pipe_server_ioctl( struct fd *fd, ioctl_code_t code, const a { case ps_idle_server: case ps_wait_connect: - if (!async_data->event && !async_data->apc) + if (blocking) { async_data_t new_data = *async_data; if (!(wait_handle = alloc_wait_event( current->process ))) break; @@ -673,7 +673,7 @@ static obj_handle_t pipe_server_ioctl( struct fd *fd, ioctl_code_t code, const a return 0; default: - return default_fd_ioctl( fd, code, async_data, data, size ); + return default_fd_ioctl( fd, code, async_data, blocking, data, size ); } } @@ -854,7 +854,7 @@ static struct object *named_pipe_open_file( struct object *obj, unsigned int acc } static obj_handle_t named_pipe_device_ioctl( struct fd *fd, ioctl_code_t code, const async_data_t *async_data, - const void *data, data_size_t size ) + int blocking, const void *data, data_size_t size ) { struct named_pipe_device *device = get_fd_user( fd ); @@ -887,7 +887,7 @@ static obj_handle_t named_pipe_device_ioctl( struct fd *fd, ioctl_code_t code, c if (!pipe->waiters && !(pipe->waiters = create_async_queue( NULL ))) goto done; - if (!async_data->event && !async_data->apc) + if (blocking) { async_data_t new_data = *async_data; if (!(wait_handle = alloc_wait_event( current->process ))) goto done; @@ -916,7 +916,7 @@ static obj_handle_t named_pipe_device_ioctl( struct fd *fd, ioctl_code_t code, c } default: - return default_fd_ioctl( fd, code, async_data, data, size ); + return default_fd_ioctl( fd, code, async_data, blocking, data, size ); } } diff --git a/server/protocol.def b/server/protocol.def index 62717a5..397c54e 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -2003,6 +2003,7 @@ enum message_type @REQ(ioctl) ioctl_code_t code; /* ioctl code */ async_data_t async; /* async I/O parameters */ + int blocking; /* whether it's a blocking ioctl */ VARARG(in_data,bytes); /* ioctl input data */ @REPLY obj_handle_t wait; /* handle to wait on for blocking ioctl */ diff --git a/server/trace.c b/server/trace.c index d2a7cec..60b2318 100644 --- a/server/trace.c +++ b/server/trace.c @@ -2591,6 +2591,7 @@ static void dump_ioctl_request( const struct ioctl_request *req ) fprintf( stderr, " async=" ); dump_async_data( &req->async ); fprintf( stderr, "," ); + fprintf( stderr, " blocking=%d,", req->blocking ); fprintf( stderr, " in_data=" ); dump_varargs_bytes( cur_size ); }

1 0

Alexandre Julliard : server: Make the arguments for CreateRemoteThread client_ptr_t instead of void pointers .
by Alexandre Julliard 31 Dec '08

31 Dec '08

Module: wine Branch: master Commit: f69e62207ba8650a01bf74a89ee6d4e78d7acfb6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f69e62207ba8650a01bf74a89… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 30 15:30:11 2008 +0100 server: Make the arguments for CreateRemoteThread client_ptr_t instead of void pointers. --- dlls/ntdll/sync.c | 10 +++++----- dlls/ntdll/thread.c | 4 ++-- include/wine/server_protocol.h | 8 ++++---- server/protocol.def | 6 +++--- server/trace.c | 7 +++++-- 5 files changed, 19 insertions(+), 16 deletions(-) diff --git a/dlls/ntdll/sync.c b/dlls/ntdll/sync.c index ecfe6f7..ba8d65b 100644 --- a/dlls/ntdll/sync.c +++ b/dlls/ntdll/sync.c @@ -1007,16 +1007,16 @@ static BOOL invoke_apc( const apc_call_t *call, apc_result_t *result ) HANDLE handle; SIZE_T reserve = call->create_thread.reserve; SIZE_T commit = call->create_thread.commit; + void *func = wine_server_get_ptr( call->create_thread.func ); + void *arg = wine_server_get_ptr( call->create_thread.arg ); result->type = call->type; - if (reserve == call->create_thread.reserve && commit == call->create_thread.commit) + if (reserve == call->create_thread.reserve && commit == call->create_thread.commit && + (ULONG_PTR)func == call->create_thread.func && (ULONG_PTR)arg == call->create_thread.arg) { result->create_thread.status = RtlCreateUserThread( NtCurrentProcess(), NULL, call->create_thread.suspend, NULL, - reserve, commit, - call->create_thread.func, - call->create_thread.arg, - &handle, &id ); + reserve, commit, func, arg, &handle, &id ); result->create_thread.handle = wine_server_obj_handle( handle ); result->create_thread.tid = HandleToULong(id.UniqueThread); } diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index b164727..a79bdf3 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -483,8 +483,8 @@ NTSTATUS WINAPI RtlCreateUserThread( HANDLE process, const SECURITY_DESCRIPTOR * memset( &call, 0, sizeof(call) ); call.create_thread.type = APC_CREATE_THREAD; - call.create_thread.func = start; - call.create_thread.arg = param; + call.create_thread.func = wine_server_client_ptr( start ); + call.create_thread.arg = wine_server_client_ptr( param ); call.create_thread.reserve = stack_reserve; call.create_thread.commit = stack_commit; call.create_thread.suspend = suspended; diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 6e60dab..521f727 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -362,11 +362,11 @@ typedef union struct { enum apc_type type; - void (__stdcall *func)(void*); - void *arg; + int suspend; + client_ptr_t func; + client_ptr_t arg; mem_size_t reserve; mem_size_t commit; - int suspend; } create_thread; } apc_call_t; @@ -5059,6 +5059,6 @@ union generic_reply struct set_window_layered_info_reply set_window_layered_info_reply; }; -#define SERVER_PROTOCOL_VERSION 369 +#define SERVER_PROTOCOL_VERSION 370 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/server/protocol.def b/server/protocol.def index 966e900..62717a5 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -378,11 +378,11 @@ typedef union struct { enum apc_type type; /* APC_CREATE_THREAD */ - void (__stdcall *func)(void*); /* start function */ - void *arg; /* argument for start function */ + int suspend; /* suspended thread? */ + client_ptr_t func; /* void (__stdcall *func)(void*); start function */ + client_ptr_t arg; /* argument for start function */ mem_size_t reserve; /* reserve size for thread stack */ mem_size_t commit; /* commit size for thread stack */ - int suspend; /* suspended thread? */ } create_thread; } apc_call_t; diff --git a/server/trace.c b/server/trace.c index 9954efd..d2a7cec 100644 --- a/server/trace.c +++ b/server/trace.c @@ -193,8 +193,11 @@ static void dump_apc_call( const apc_call_t *call ) dump_uint64( &call->unmap_view.addr ); break; case APC_CREATE_THREAD: - fprintf( stderr, "APC_CREATE_THREAD,func=%p,arg=%p,reserve=", - call->create_thread.func, call->create_thread.arg ); + fprintf( stderr, "APC_CREATE_THREAD,func=" ); + dump_uint64( &call->create_thread.func ); + fprintf( stderr, ",arg=" ); + dump_uint64( &call->create_thread.arg ); + fprintf( stderr, ",reserve=" ); dump_uint64( &call->create_thread.reserve ); fprintf( stderr, ",commit=" ); dump_uint64( &call->create_thread.commit );

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits December 2008