wine-commits January 2009

wine-commits@winehq.org

3 participants
1348 discussions

Henri Verbeet : ddraw: Fix Thunk_IDirect3DDeviceImpl_2_GetCurrentViewport() .
by Alexandre Julliard 20 Jan '09

20 Jan '09

Module: wine Branch: master Commit: ba771f0facf8fce276a8e75be021a7eca24eb258 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ba771f0facf8fce276a8e75be… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jan 20 10:00:20 2009 +0100 ddraw: Fix Thunk_IDirect3DDeviceImpl_2_GetCurrentViewport(). --- dlls/ddraw/device.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index c4f5861..f4d86ac 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -1964,7 +1964,7 @@ static HRESULT WINAPI Thunk_IDirect3DDeviceImpl_2_GetCurrentViewport(IDirect3DDevice2 *iface, IDirect3DViewport2 **Direct3DViewport2) { - ICOM_THIS_FROM(IDirect3DDeviceImpl, IDirect3DDevice3, iface); + ICOM_THIS_FROM(IDirect3DDeviceImpl, IDirect3DDevice2, iface); HRESULT hr; TRACE_(ddraw_thunk)("(%p)->(%p) thunking to IDirect3DDevice3 interface.\n", This, Direct3DViewport2); hr = IDirect3DDevice3_GetCurrentViewport(ICOM_INTERFACE(This, IDirect3DDevice3),

1 0

Henri Verbeet : d3d9: Remove some superfluous pointer casts.
by Alexandre Julliard 20 Jan '09

20 Jan '09

Module: wine Branch: master Commit: 9e7b5676a7ac162fe69e92750c67f5d024b5e6f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e7b5676a7ac162fe69e92750… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jan 20 10:00:20 2009 +0100 d3d9: Remove some superfluous pointer casts. --- dlls/d3d9/device.c | 2 +- dlls/d3d9/tests/device.c | 2 +- dlls/d3d9/tests/visual.c | 20 ++++++++++---------- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 768bf9d..aff0643 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -265,7 +265,7 @@ static BOOL WINAPI IDirect3DDevice9Impl_ShowCursor(LPDIRECT3DDEVICE9EX ifac } static HRESULT WINAPI reset_enum_callback(IWineD3DResource *resource, void *data) { - BOOL *resources_ok = (BOOL *) data; + BOOL *resources_ok = data; WINED3DRESOURCETYPE type; HRESULT ret = S_OK; WINED3DSURFACE_DESC surface_desc; diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index a934974..135ceba 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -1770,7 +1770,7 @@ static void test_vertex_buffer_alignment(void) } if(FAILED(hr)) continue; - hr = IDirect3DVertexBuffer9_Lock(buffer, 0, 0, (void **) &data, 0); + hr = IDirect3DVertexBuffer9_Lock(buffer, 0, 0, &data, 0); ok(SUCCEEDED(hr), "IDirect3DVertexBuffer9_Lock failed (0x%08x)\n", hr); ok(((DWORD_PTR) data & 31) == 0, "Vertex buffer start address is not 32 byte aligned(size: %d, pool: %s, data: %p)\n", sizes[i], debug_d3dpool(pools[j]), data); diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 1504a53..57dfab1 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -6490,13 +6490,13 @@ static void shademode_test(IDirect3DDevice9 *device) hr = IDirect3DDevice9_SetFVF(device, D3DFVF_XYZ | D3DFVF_DIFFUSE); ok(hr == D3D_OK, "IDirect3DDevice9_SetFVF failed with %08x\n", hr); - hr = IDirect3DVertexBuffer9_Lock(vb_strip, 0, sizeof(quad_strip), (void **) &data, 0); + hr = IDirect3DVertexBuffer9_Lock(vb_strip, 0, sizeof(quad_strip), &data, 0); ok(hr == D3D_OK, "IDirect3DVertexBuffer9_Lock failed with %08x\n", hr); memcpy(data, quad_strip, sizeof(quad_strip)); hr = IDirect3DVertexBuffer9_Unlock(vb_strip); ok(hr == D3D_OK, "IDirect3DVertexBuffer9_Unlock failed with %08x\n", hr); - hr = IDirect3DVertexBuffer9_Lock(vb_list, 0, sizeof(quad_list), (void **) &data, 0); + hr = IDirect3DVertexBuffer9_Lock(vb_list, 0, sizeof(quad_list), &data, 0); ok(hr == D3D_OK, "IDirect3DVertexBuffer9_Lock failed with %08x\n", hr); memcpy(data, quad_list, sizeof(quad_list)); hr = IDirect3DVertexBuffer9_Unlock(vb_list); @@ -7087,7 +7087,7 @@ static void fixed_function_decl_test(IDirect3DDevice9 *device) ok(hr == D3D_OK, "IDirect3DDevice9_BeginScene failed (%08x)\n", hr); if(SUCCEEDED(hr)) { if(dcl_color) { - hr = IDirect3DVertexBuffer9_Lock(vb, 0, sizeof(quad1), (void **) &data, 0); + hr = IDirect3DVertexBuffer9_Lock(vb, 0, sizeof(quad1), &data, 0); ok(hr == D3D_OK, "IDirect3DVertexBuffer9_Lock failed with %08x\n", hr); memcpy(data, quad1, sizeof(quad1)); hr = IDirect3DVertexBuffer9_Unlock(vb); @@ -7101,7 +7101,7 @@ static void fixed_function_decl_test(IDirect3DDevice9 *device) } if(dcl_ubyte) { - hr = IDirect3DVertexBuffer9_Lock(vb, 0, sizeof(quad2), (void **) &data, 0); + hr = IDirect3DVertexBuffer9_Lock(vb, 0, sizeof(quad2), &data, 0); ok(hr == D3D_OK, "IDirect3DVertexBuffer9_Lock failed with %08x\n", hr); memcpy(data, quad2, sizeof(quad2)); hr = IDirect3DVertexBuffer9_Unlock(vb); @@ -7117,7 +7117,7 @@ static void fixed_function_decl_test(IDirect3DDevice9 *device) } if(dcl_short) { - hr = IDirect3DVertexBuffer9_Lock(vb, 0, sizeof(quad3), (void **) &data, 0); + hr = IDirect3DVertexBuffer9_Lock(vb, 0, sizeof(quad3), &data, 0); ok(hr == D3D_OK, "IDirect3DVertexBuffer9_Lock failed with %08x\n", hr); memcpy(data, quad3, sizeof(quad3)); hr = IDirect3DVertexBuffer9_Unlock(vb); @@ -7133,7 +7133,7 @@ static void fixed_function_decl_test(IDirect3DDevice9 *device) } if(dcl_float) { - hr = IDirect3DVertexBuffer9_Lock(vb, 0, sizeof(quad4), (void **) &data, 0); + hr = IDirect3DVertexBuffer9_Lock(vb, 0, sizeof(quad4), &data, 0); ok(hr == D3D_OK, "IDirect3DVertexBuffer9_Lock failed with %08x\n", hr); memcpy(data, quad4, sizeof(quad4)); hr = IDirect3DVertexBuffer9_Unlock(vb); @@ -7182,7 +7182,7 @@ static void fixed_function_decl_test(IDirect3DDevice9 *device) hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xff0000ff, 0.0, 0); ok(hr == D3D_OK, "IDirect3DDevice9_Clear failed with %08x\n", hr); - hr = IDirect3DVertexBuffer9_Lock(vb, 0, sizeof(quad_transformed), (void **) &data, 0); + hr = IDirect3DVertexBuffer9_Lock(vb, 0, sizeof(quad_transformed), &data, 0); ok(hr == D3D_OK, "IDirect3DVertexBuffer9_Lock failed with %08x\n", hr); memcpy(data, quad_transformed, sizeof(quad_transformed)); hr = IDirect3DVertexBuffer9_Unlock(vb); @@ -7262,7 +7262,7 @@ static void fixed_function_decl_test(IDirect3DDevice9 *device) goto out; } - hr = IDirect3DVertexBuffer9_Lock(vb, 0, sizeof(quads), (void **) &data, 0); + hr = IDirect3DVertexBuffer9_Lock(vb, 0, sizeof(quads), &data, 0); ok(hr == D3D_OK, "IDirect3DVertexBuffer9_Lock failed with %08x\n", hr); memcpy(data, quads, sizeof(quads)); hr = IDirect3DVertexBuffer9_Unlock(vb); @@ -7270,7 +7270,7 @@ static void fixed_function_decl_test(IDirect3DDevice9 *device) hr = IDirect3DDevice9_CreateVertexBuffer(device, sizeof(colors), 0, 0, D3DPOOL_MANAGED, &vb2, NULL); ok(hr == D3D_OK, "CreateVertexBuffer failed with %08x\n", hr); - hr = IDirect3DVertexBuffer9_Lock(vb2, 0, sizeof(colors), (void **) &data, 0); + hr = IDirect3DVertexBuffer9_Lock(vb2, 0, sizeof(colors), &data, 0); ok(hr == D3D_OK, "IDirect3DVertexBuffer9_Lock failed with %08x\n", hr); memcpy(data, colors, sizeof(colors)); hr = IDirect3DVertexBuffer9_Unlock(vb2); @@ -7455,7 +7455,7 @@ static void test_vshader_float16(IDirect3DDevice9 *device) hr = IDirect3DDevice9_CreateVertexBuffer(device, sizeof(quad), 0, 0, D3DPOOL_MANAGED, &buffer, NULL); ok(hr == D3D_OK, "IDirect3DDevice9_CreateVertexBuffer failed, hr=%08x\n", hr); - hr = IDirect3DVertexBuffer9_Lock(buffer, 0, sizeof(quad), (void **) &data, 0); + hr = IDirect3DVertexBuffer9_Lock(buffer, 0, sizeof(quad), &data, 0); ok(hr == D3D_OK, "IDirect3DVertexBuffer9_Lock failed, hr=%08x\n", hr); memcpy(data, quad, sizeof(quad)); hr = IDirect3DVertexBuffer9_Unlock(buffer);

1 0

Henri Verbeet : ddraw: Compare the against the correct IID in IDirect3DExecuteBufferImpl_QueryInterface ().
by Alexandre Julliard 20 Jan '09

20 Jan '09

Module: wine Branch: master Commit: b2d42ad665363f67228a90d354be66a0ec0842d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b2d42ad665363f67228a90d35… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jan 20 10:00:20 2009 +0100 ddraw: Compare the against the correct IID in IDirect3DExecuteBufferImpl_QueryInterface(). --- dlls/ddraw/executebuffer.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ddraw/executebuffer.c b/dlls/ddraw/executebuffer.c index 4dfc679..8d6ba26 100644 --- a/dlls/ddraw/executebuffer.c +++ b/dlls/ddraw/executebuffer.c @@ -603,7 +603,7 @@ IDirect3DExecuteBufferImpl_QueryInterface(IDirect3DExecuteBuffer *iface, TRACE(" Creating IUnknown interface at %p.\n", *obj); return S_OK; } - if ( IsEqualGUID( &IID_IDirect3DMaterial, riid ) ) { + if ( IsEqualGUID( &IID_IDirect3DExecuteBuffer, riid ) ) { IDirect3DExecuteBuffer_AddRef(ICOM_INTERFACE(This, IDirect3DExecuteBuffer)); *obj = ICOM_INTERFACE(This, IDirect3DExecuteBuffer); TRACE(" Creating IDirect3DExecuteBuffer interface %p\n", *obj);

1 0

Henri Verbeet : d3d10core: Remove a superfluous pointer cast.
by Alexandre Julliard 20 Jan '09

20 Jan '09

Module: wine Branch: master Commit: 3dbe0f9a826369983720be420cdfa1c25276c28a URL: http://source.winehq.org/git/wine.git/?a=commit;h=3dbe0f9a826369983720be420… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jan 20 10:00:20 2009 +0100 d3d10core: Remove a superfluous pointer cast. --- dlls/d3d10core/d3d10core_main.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3d10core/d3d10core_main.c b/dlls/d3d10core/d3d10core_main.c index ba4cba5..273f15d 100644 --- a/dlls/d3d10core/d3d10core_main.c +++ b/dlls/d3d10core/d3d10core_main.c @@ -80,7 +80,7 @@ static HRESULT WINAPI layer_create(enum dxgi_device_layer_id id, void **layer_ba return E_NOTIMPL; } - object = (struct d3d10_device *)*layer_base; + object = *layer_base; object->vtbl = &d3d10_device_vtbl; object->inner_unknown_vtbl = &d3d10_device_inner_unknown_vtbl;

1 0

Henri Verbeet : wined3d: Remove some superfluous pointer casts.
by Alexandre Julliard 20 Jan '09

20 Jan '09

Module: wine Branch: master Commit: 5d875906c1f164fed2538f8f18105ce6aa8136ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=5d875906c1f164fed2538f8f1… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jan 20 10:00:20 2009 +0100 wined3d: Remove some superfluous pointer casts. --- dlls/wined3d/drawprim.c | 28 ++++++++++++++-------------- dlls/wined3d/glsl_shader.c | 8 ++++---- dlls/wined3d/utils.c | 6 +++--- 3 files changed, 21 insertions(+), 21 deletions(-) diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index b78078f..929565f 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -324,8 +324,8 @@ static void drawStridedSlow(IWineD3DDevice *iface, const WineDirect3DVertexStrid idxData = ((IWineD3DIndexBufferImpl *) This->stateBlock->pIndexData)->resource.allocatedMemory; } - if (idxSize == 2) pIdxBufS = (const WORD *) idxData; - else pIdxBufL = (const DWORD *) idxData; + if (idxSize == 2) pIdxBufS = idxData; + else pIdxBufL = idxData; } else if (idxData) { ERR("non-NULL idxData with 0 idxSize, this should never happen\n"); return; @@ -519,16 +519,16 @@ static void drawStridedSlow(IWineD3DDevice *iface, const WineDirect3DVertexStrid static inline void send_attribute(IWineD3DDeviceImpl *This, const DWORD type, const UINT index, const void *ptr) { switch(type) { case WINED3DDECLTYPE_FLOAT1: - GL_EXTCALL(glVertexAttrib1fvARB(index, (const float *)ptr)); + GL_EXTCALL(glVertexAttrib1fvARB(index, ptr)); break; case WINED3DDECLTYPE_FLOAT2: - GL_EXTCALL(glVertexAttrib2fvARB(index, (const float *)ptr)); + GL_EXTCALL(glVertexAttrib2fvARB(index, ptr)); break; case WINED3DDECLTYPE_FLOAT3: - GL_EXTCALL(glVertexAttrib3fvARB(index, (const float *)ptr)); + GL_EXTCALL(glVertexAttrib3fvARB(index, ptr)); break; case WINED3DDECLTYPE_FLOAT4: - GL_EXTCALL(glVertexAttrib4fvARB(index, (const float *)ptr)); + GL_EXTCALL(glVertexAttrib4fvARB(index, ptr)); break; case WINED3DDECLTYPE_UBYTE4: @@ -540,10 +540,10 @@ static inline void send_attribute(IWineD3DDeviceImpl *This, const DWORD type, co break; case WINED3DDECLTYPE_SHORT2: - GL_EXTCALL(glVertexAttrib4svARB(index, (const GLshort *)ptr)); + GL_EXTCALL(glVertexAttrib4svARB(index, ptr)); break; case WINED3DDECLTYPE_SHORT4: - GL_EXTCALL(glVertexAttrib4svARB(index, (const GLshort *)ptr)); + GL_EXTCALL(glVertexAttrib4svARB(index, ptr)); break; case WINED3DDECLTYPE_SHORT2N: @@ -559,10 +559,10 @@ static inline void send_attribute(IWineD3DDeviceImpl *This, const DWORD type, co break; } case WINED3DDECLTYPE_SHORT4N: - GL_EXTCALL(glVertexAttrib4NsvARB(index, (const GLshort *)ptr)); + GL_EXTCALL(glVertexAttrib4NsvARB(index, ptr)); break; case WINED3DDECLTYPE_USHORT4N: - GL_EXTCALL(glVertexAttrib4NusvARB(index, (const GLushort *)ptr)); + GL_EXTCALL(glVertexAttrib4NusvARB(index, ptr)); break; case WINED3DDECLTYPE_UDEC3: @@ -579,7 +579,7 @@ static inline void send_attribute(IWineD3DDeviceImpl *This, const DWORD type, co * byte float according to the IEEE standard */ if (GL_SUPPORT(NV_HALF_FLOAT)) { - GL_EXTCALL(glVertexAttrib2hvNV(index, (const GLhalfNV *)ptr)); + GL_EXTCALL(glVertexAttrib2hvNV(index, ptr)); } else { float x = float_16_to_32(((const unsigned short *)ptr) + 0); float y = float_16_to_32(((const unsigned short *)ptr) + 1); @@ -588,7 +588,7 @@ static inline void send_attribute(IWineD3DDeviceImpl *This, const DWORD type, co break; case WINED3DDECLTYPE_FLOAT16_4: if (GL_SUPPORT(NV_HALF_FLOAT)) { - GL_EXTCALL(glVertexAttrib4hvNV(index, (const GLhalfNV *)ptr)); + GL_EXTCALL(glVertexAttrib4hvNV(index, ptr)); } else { float x = float_16_to_32(((const unsigned short *)ptr) + 0); float y = float_16_to_32(((const unsigned short *)ptr) + 1); @@ -626,8 +626,8 @@ static void drawStridedSlowVs(IWineD3DDevice *iface, const WineDirect3DVertexStr idxData = ((IWineD3DIndexBufferImpl *) stateblock->pIndexData)->resource.allocatedMemory; } - if (idxSize == 2) pIdxBufS = (const WORD *) idxData; - else pIdxBufL = (const DWORD *) idxData; + if (idxSize == 2) pIdxBufS = idxData; + else pIdxBufL = idxData; } else if (idxData) { ERR("non-NULL idxData with 0 idxSize, this should never happen\n"); return; diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 8dfb416..d1e1bae 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -471,7 +471,7 @@ static void shader_glsl_load_constantsB(IWineD3DBaseShaderImpl *This, const Wine static void reset_program_constant_version(void *value, void *context) { - struct glsl_shader_prog_link *entry = (struct glsl_shader_prog_link *)value; + struct glsl_shader_prog_link *entry = value; entry->constant_version = 0; } @@ -3665,7 +3665,7 @@ static void shader_glsl_destroy(IWineD3DBaseShader *iface) { static unsigned int glsl_program_key_hash(const void *key) { - const glsl_program_key_t *k = (const glsl_program_key_t *)key; + const glsl_program_key_t *k = key; unsigned int hash = k->vshader | ((DWORD_PTR) k->pshader) << 16; hash += ~(hash << 15); @@ -3680,8 +3680,8 @@ static unsigned int glsl_program_key_hash(const void *key) static BOOL glsl_program_key_compare(const void *keya, const void *keyb) { - const glsl_program_key_t *ka = (const glsl_program_key_t *)keya; - const glsl_program_key_t *kb = (const glsl_program_key_t *)keyb; + const glsl_program_key_t *ka = keya; + const glsl_program_key_t *kb = keyb; return ka->vshader == kb->vshader && ka->pshader == kb->pshader && (memcmp(&ka->ps_args, &kb->ps_args, sizeof(kb->ps_args)) == 0); diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index cc09584..3036ef2 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -2241,7 +2241,7 @@ void sampler_texdim(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DCont unsigned int ffp_frag_program_key_hash(const void *key) { - const struct ffp_frag_settings *k = (const struct ffp_frag_settings *)key; + const struct ffp_frag_settings *k = key; unsigned int hash = 0, i; const DWORD *blob; @@ -2268,8 +2268,8 @@ unsigned int ffp_frag_program_key_hash(const void *key) BOOL ffp_frag_program_key_compare(const void *keya, const void *keyb) { - const struct ffp_frag_settings *ka = (const struct ffp_frag_settings *)keya; - const struct ffp_frag_settings *kb = (const struct ffp_frag_settings *)keyb; + const struct ffp_frag_settings *ka = keya; + const struct ffp_frag_settings *kb = keyb; return memcmp(ka, kb, sizeof(*ka)) == 0; }

1 0

Francois Gouget : wineconsole: Make WINECON_SetHistory{Mode, Size}() static.
by Alexandre Julliard 20 Jan '09

20 Jan '09

Module: wine Branch: master Commit: de58df0e8d0c83c57d094c5b9fb4ee6a75844752 URL: http://source.winehq.org/git/wine.git/?a=commit;h=de58df0e8d0c83c57d094c5b9… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Jan 20 09:16:20 2009 +0100 wineconsole: Make WINECON_SetHistory{Mode,Size}() static. --- programs/wineconsole/winecon_private.h | 2 -- programs/wineconsole/wineconsole.c | 4 ++-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/programs/wineconsole/winecon_private.h b/programs/wineconsole/winecon_private.h index 9823a8b..ca33ec6 100644 --- a/programs/wineconsole/winecon_private.h +++ b/programs/wineconsole/winecon_private.h @@ -79,9 +79,7 @@ struct inner_data { extern void WINECON_Fatal(const char* msg); extern void WINECON_NotifyWindowChange(struct inner_data* data); extern int WINECON_GetHistorySize(HANDLE hConIn); -extern BOOL WINECON_SetHistorySize(HANDLE hConIn, int size); extern int WINECON_GetHistoryMode(HANDLE hConIn); -extern BOOL WINECON_SetHistoryMode(HANDLE hConIn, int mode); extern BOOL WINECON_GetConsoleTitle(HANDLE hConIn, WCHAR* buffer, size_t len); extern int WINECON_GrabChanges(struct inner_data* data); extern VOID WINECON_SetConfig(struct inner_data* data, diff --git a/programs/wineconsole/wineconsole.c b/programs/wineconsole/wineconsole.c index c5381af..1c146df 100644 --- a/programs/wineconsole/wineconsole.c +++ b/programs/wineconsole/wineconsole.c @@ -124,7 +124,7 @@ int WINECON_GetHistorySize(HANDLE hConIn) * * */ -BOOL WINECON_SetHistorySize(HANDLE hConIn, int size) +static BOOL WINECON_SetHistorySize(HANDLE hConIn, int size) { BOOL ret; @@ -163,7 +163,7 @@ int WINECON_GetHistoryMode(HANDLE hConIn) * * */ -BOOL WINECON_SetHistoryMode(HANDLE hConIn, int mode) +static BOOL WINECON_SetHistoryMode(HANDLE hConIn, int mode) { BOOL ret;

1 0

Francois Gouget : wineconsole: Make some functions static.
by Alexandre Julliard 20 Jan '09

20 Jan '09

Module: wine Branch: master Commit: e7ec428c479b4f10163a3f5b54e809f3bb70eb53 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e7ec428c479b4f10163a3f5b5… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Jan 20 09:15:26 2009 +0100 wineconsole: Make some functions static. --- programs/wineconsole/user.c | 2 +- programs/wineconsole/winecon_private.h | 1 - programs/wineconsole/winecon_user.h | 2 -- programs/wineconsole/wineconsole.c | 2 +- 4 files changed, 2 insertions(+), 5 deletions(-) diff --git a/programs/wineconsole/user.c b/programs/wineconsole/user.c index 1c00f31..391e833 100644 --- a/programs/wineconsole/user.c +++ b/programs/wineconsole/user.c @@ -318,7 +318,7 @@ void WCUSER_DumpTextMetric(const TEXTMETRIC* tm, DWORD ft) * * */ -BOOL WCUSER_AreFontsEqual(const struct config_data* config, const LOGFONT* lf) +static BOOL WCUSER_AreFontsEqual(const struct config_data* config, const LOGFONT* lf) { return lf->lfHeight == config->cell_height && lf->lfWeight == config->font_weight && diff --git a/programs/wineconsole/winecon_private.h b/programs/wineconsole/winecon_private.h index 7ea5dc0..9823a8b 100644 --- a/programs/wineconsole/winecon_private.h +++ b/programs/wineconsole/winecon_private.h @@ -83,7 +83,6 @@ extern BOOL WINECON_SetHistorySize(HANDLE hConIn, int size); extern int WINECON_GetHistoryMode(HANDLE hConIn); extern BOOL WINECON_SetHistoryMode(HANDLE hConIn, int mode); extern BOOL WINECON_GetConsoleTitle(HANDLE hConIn, WCHAR* buffer, size_t len); -extern void WINECON_FetchCells(struct inner_data* data, int upd_tp, int upd_bm); extern int WINECON_GrabChanges(struct inner_data* data); extern VOID WINECON_SetConfig(struct inner_data* data, const struct config_data* cfg); diff --git a/programs/wineconsole/winecon_user.h b/programs/wineconsole/winecon_user.h index b630499..51db26c 100644 --- a/programs/wineconsole/winecon_user.h +++ b/programs/wineconsole/winecon_user.h @@ -48,8 +48,6 @@ extern BOOL WCUSER_GetProperties(struct inner_data*, BOOL); extern BOOL WCUSER_ValidateFont(const struct inner_data* data, const LOGFONT* lf); extern BOOL WCUSER_ValidateFontMetric(const struct inner_data* data, const TEXTMETRIC* tm, DWORD fontType); -extern BOOL WCUSER_AreFontsEqual(const struct config_data* config, - const LOGFONT* lf); extern HFONT WCUSER_CopyFont(struct config_data* config, HWND hWnd, const LOGFONT* lf, LONG* el); extern void WCUSER_FillLogFont(LOGFONT* lf, const WCHAR* name, diff --git a/programs/wineconsole/wineconsole.c b/programs/wineconsole/wineconsole.c index 3626383..c5381af 100644 --- a/programs/wineconsole/wineconsole.c +++ b/programs/wineconsole/wineconsole.c @@ -64,7 +64,7 @@ static void WINECON_Usage(void) * * updates the local copy of cells (band to update) */ -void WINECON_FetchCells(struct inner_data* data, int upd_tp, int upd_bm) +static void WINECON_FetchCells(struct inner_data* data, int upd_tp, int upd_bm) { SERVER_START_REQ( read_console_output ) {

1 0

Francois Gouget : wineconsole: WCUSER_OptionDlgProc(): use the given configuration information.
by Alexandre Julliard 20 Jan '09

20 Jan '09

Module: wine Branch: master Commit: cf92ee98be2128e5ebe0ee11ae3643ec1ee6a409 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf92ee98be2128e5ebe0ee11a… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Jan 20 09:15:15 2009 +0100 wineconsole: WCUSER_OptionDlgProc(): use the given configuration information. --- programs/wineconsole/dialog.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/wineconsole/dialog.c b/programs/wineconsole/dialog.c index 5c27017..cde013f 100644 --- a/programs/wineconsole/dialog.c +++ b/programs/wineconsole/dialog.c @@ -73,7 +73,7 @@ static INT_PTR WINAPI WCUSER_OptionDlgProc(HWND hDlg, UINT msg, WPARAM wParam, L else if (di->config.cursor_size <= 50) idc = IDC_OPT_CURSOR_MEDIUM; else idc = IDC_OPT_CURSOR_LARGE; SendDlgItemMessage(hDlg, idc, BM_SETCHECK, BST_CHECKED, 0L); - SetDlgItemInt(hDlg, IDC_OPT_HIST_SIZE, WINECON_GetHistorySize(di->data->hConIn), FALSE); + SetDlgItemInt(hDlg, IDC_OPT_HIST_SIZE, di->config.history_size, FALSE); SendDlgItemMessage(hDlg, IDC_OPT_HIST_NODOUBLE, BM_SETCHECK, (di->config.history_nodup) ? BST_CHECKED : BST_UNCHECKED, 0L); SendDlgItemMessage(hDlg, IDC_OPT_CONF_CTRL, BM_SETCHECK,

1 0

Francois Gouget : winedbg: Make lexeme_alloc() static in debug.l.
by Alexandre Julliard 20 Jan '09

20 Jan '09

Module: wine Branch: master Commit: 4061d1f8d87682d05168590dfe78f0c7e98cf1c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4061d1f8d87682d05168590df… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Jan 20 09:13:55 2009 +0100 winedbg: Make lexeme_alloc() static in debug.l. --- programs/winedbg/debug.l | 56 +++++++++++++++++++++--------------------- programs/winedbg/debugger.h | 1 - 2 files changed, 28 insertions(+), 29 deletions(-) diff --git a/programs/winedbg/debug.l b/programs/winedbg/debug.l index 3a47a17..4332989 100644 --- a/programs/winedbg/debug.l +++ b/programs/winedbg/debug.l @@ -36,6 +36,34 @@ #undef YY_INPUT +static char** local_lexemes /* = NULL */; +static int next_lexeme /* = 0 */; +static int alloc_lexeme /* = 0 */; + +char* lexeme_alloc_size(int size) +{ + assert(0 <= next_lexeme && next_lexeme < alloc_lexeme + 1); + if (next_lexeme >= alloc_lexeme) + { + alloc_lexeme += 32; + local_lexemes = dbg_heap_realloc(local_lexemes, alloc_lexeme * sizeof(local_lexemes[0])); + assert(local_lexemes); + } + return local_lexemes[next_lexeme++] = HeapAlloc(GetProcessHeap(), 0, size + 1); +} + +static char* lexeme_alloc(const char* lexeme) +{ + char* ptr = lexeme_alloc_size(strlen(lexeme) + 1); + return strcpy(ptr, lexeme); +} + +void lexeme_flush(void) +{ + while (--next_lexeme >= 0) HeapFree(GetProcessHeap(), 0, local_lexemes[next_lexeme]); + next_lexeme = 0; +} + static int read_input(const char* pfx, char* buf, int size) { int len; @@ -234,31 +262,3 @@ all { return tALL; } #ifndef dbg_wrap int dbg_wrap(void) { return 1; } #endif - -static char** local_lexemes /* = NULL */; -static int next_lexeme /* = 0 */; -static int alloc_lexeme /* = 0 */; - -char* lexeme_alloc_size(int size) -{ - assert(0 <= next_lexeme && next_lexeme < alloc_lexeme + 1); - if (next_lexeme >= alloc_lexeme) - { - alloc_lexeme += 32; - local_lexemes = dbg_heap_realloc(local_lexemes, alloc_lexeme * sizeof(local_lexemes[0])); - assert(local_lexemes); - } - return local_lexemes[next_lexeme++] = HeapAlloc(GetProcessHeap(), 0, size + 1); -} - -char* lexeme_alloc(const char* lexeme) -{ - char* ptr = lexeme_alloc_size(strlen(lexeme) + 1); - return strcpy(ptr, lexeme); -} - -void lexeme_flush(void) -{ - while (--next_lexeme >= 0) HeapFree(GetProcessHeap(), 0, local_lexemes[next_lexeme]); - next_lexeme = 0; -} diff --git a/programs/winedbg/debugger.h b/programs/winedbg/debugger.h index 2c7ef4e..0d34ddf 100644 --- a/programs/winedbg/debugger.h +++ b/programs/winedbg/debugger.h @@ -308,7 +308,6 @@ extern HANDLE parser_generate_command_file(const char*, ...); /* debug.l */ extern void lexeme_flush(void); -extern char* lexeme_alloc(const char*); extern char* lexeme_alloc_size(int); /* display.c */

1 0

Francois Gouget : winedbg: Make some functions static.
by Alexandre Julliard 20 Jan '09

20 Jan '09

Module: wine Branch: master Commit: 5012a57268762ed6a738ad51cc1ea6871304666d URL: http://source.winehq.org/git/wine.git/?a=commit;h=5012a57268762ed6a738ad51c… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Jan 20 09:13:23 2009 +0100 winedbg: Make some functions static. --- programs/winedbg/dbg.y | 5 +++-- programs/winedbg/debugger.h | 2 -- programs/winedbg/tgt_minidump.c | 2 +- programs/winedbg/winedbg.c | 2 +- 4 files changed, 5 insertions(+), 6 deletions(-) diff --git a/programs/winedbg/dbg.y b/programs/winedbg/dbg.y index 33ca896..7d1e44e 100644 --- a/programs/winedbg/dbg.y +++ b/programs/winedbg/dbg.y @@ -37,6 +37,7 @@ int dbg_lex(void); static int dbg_error(const char*); +static void parser(const char*); %} @@ -548,7 +549,7 @@ void parser_handle(HANDLE input) dbg_parser_output = out_copy; } -void parser(const char* filename) +static void parser(const char* filename) { HANDLE h = CreateFile(filename, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0L, 0); if (h != INVALID_HANDLE_VALUE) @@ -558,7 +559,7 @@ void parser(const char* filename) } } -int dbg_error(const char* s) +static int dbg_error(const char* s) { dbg_printf("%s\n", s); return 0; diff --git a/programs/winedbg/debugger.h b/programs/winedbg/debugger.h index 319f0dc..2c7ef4e 100644 --- a/programs/winedbg/debugger.h +++ b/programs/winedbg/debugger.h @@ -301,7 +301,6 @@ extern void break_restart_execution(int count); extern int break_add_condition(int bpnum, struct expr* exp); /* dbg.y */ -extern void parser(const char*); extern void parser_handle(HANDLE); extern int input_read_line(const char* pfx, char* buffer, int size); extern int input_fetch_entire_line(const char* pfx, char** line); @@ -436,7 +435,6 @@ extern struct dbg_type types_find_pointer(const struct dbg_type* type); extern struct dbg_type types_find_type(unsigned long linear, const char* name, enum SymTagEnum tag); /* winedbg.c */ -extern void dbg_outputA(const char* buffer, int len); extern void dbg_outputW(const WCHAR* buffer, int len); extern const char* dbg_W2A(const WCHAR* buffer, unsigned len); #ifdef __GNUC__ diff --git a/programs/winedbg/tgt_minidump.c b/programs/winedbg/tgt_minidump.c index a9f92db..bcdadcf 100644 --- a/programs/winedbg/tgt_minidump.c +++ b/programs/winedbg/tgt_minidump.c @@ -133,7 +133,7 @@ static BOOL WINAPI tgt_process_minidump_write(HANDLE hProcess, void* addr, return FALSE; } -BOOL CALLBACK validate_file(PCWSTR name, void* user) +static BOOL CALLBACK validate_file(PCWSTR name, void* user) { return FALSE; /* get the first file we find !! */ } diff --git a/programs/winedbg/winedbg.c b/programs/winedbg/winedbg.c index d1df695..a801425 100644 --- a/programs/winedbg/winedbg.c +++ b/programs/winedbg/winedbg.c @@ -99,7 +99,7 @@ struct dbg_internal_var dbg_internal_vars[DBG_IV_LAST]; const struct dbg_internal_var* dbg_context_vars; static HANDLE dbg_houtput; -void dbg_outputA(const char* buffer, int len) +static void dbg_outputA(const char* buffer, int len) { static char line_buff[4096]; static unsigned int line_pos;

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 January 2009