December 2008 - Wine-commits

Michael Stefaniuc : kernel32: Remove some superfluous casts of void pointers.
by Alexandre Julliard 01 Dec '08

01 Dec '08

Module: wine Branch: master Commit: d26b02960c3eeacd99101d21fa05d9f4ebf8b4bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=d26b02960c3eeacd99101d21f… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Nov 28 23:43:31 2008 +0100 kernel32: Remove some superfluous casts of void pointers. --- dlls/kernel32/heap.c | 2 +- dlls/kernel32/ne_module.c | 12 ++++++------ dlls/kernel32/ne_segment.c | 2 +- dlls/kernel32/resource16.c | 2 +- dlls/kernel32/snoop16.c | 2 +- dlls/kernel32/task.c | 12 ++++++------ dlls/kernel32/tests/loader.c | 7 +++---- 7 files changed, 19 insertions(+), 20 deletions(-) diff --git a/dlls/kernel32/heap.c b/dlls/kernel32/heap.c index 9931c09..1240104 100644 --- a/dlls/kernel32/heap.c +++ b/dlls/kernel32/heap.c @@ -1142,7 +1142,7 @@ void WINAPI __regs_AllocMappedBuffer( CONTEXT86 *context /* [in] EDI register: size of buffer to allocate */ ) { HGLOBAL handle = GlobalAlloc(0, context->Edi + 8); - DWORD *buffer = (DWORD *)GlobalLock(handle); + DWORD *buffer = GlobalLock(handle); DWORD ptr = 0; if (buffer) diff --git a/dlls/kernel32/ne_module.c b/dlls/kernel32/ne_module.c index 0342a5c..75de442 100644 --- a/dlls/kernel32/ne_module.c +++ b/dlls/kernel32/ne_module.c @@ -706,7 +706,7 @@ static HMODULE16 build_module( const void *mapping, SIZE_T mapping_size, LPCSTR if (!hModule) return ERROR_BAD_FORMAT; FarSetOwner16( hModule, hModule ); - pModule = (NE_MODULE *)GlobalLock16( hModule ); + pModule = GlobalLock16( hModule ); memcpy( pModule, ne_header, sizeof(*ne_header) ); pModule->count = 0; /* check programs for default minimal stack size */ @@ -846,7 +846,7 @@ static BOOL NE_LoadDLLs( NE_MODULE *pModule ) { int i; WORD *pModRef = (WORD *)((char *)pModule + pModule->ne_modtab); - WORD *pDLLs = (WORD *)GlobalLock16( pModule->dlls_to_init ); + WORD *pDLLs = GlobalLock16( pModule->dlls_to_init ); for (i = 0; i < pModule->ne_cmod; i++, pModRef++) { @@ -2014,7 +2014,7 @@ static HMODULE16 create_dummy_module( HMODULE module32 ) if (!hModule) return ERROR_BAD_FORMAT; FarSetOwner16( hModule, hModule ); - pModule = (NE_MODULE *)GlobalLock16( hModule ); + pModule = GlobalLock16( hModule ); /* Set all used entries */ pModule->ne_magic = IMAGE_OS2_SIGNATURE; @@ -2120,11 +2120,11 @@ HMODULE16 WINAPI MapHModuleLS(HMODULE hmod) return TASK_GetCurrent()->hInstance; if (!HIWORD(hmod)) return LOWORD(hmod); /* we already have a 16 bit module handle */ - pModule = (NE_MODULE*)GlobalLock16(hFirstModule); + pModule = GlobalLock16(hFirstModule); while (pModule) { if (pModule->module32 == hmod) return pModule->self; - pModule = (NE_MODULE*)GlobalLock16(pModule->next); + pModule = GlobalLock16(pModule->next); } if ((ret = create_dummy_module( hmod )) < 32) { @@ -2145,7 +2145,7 @@ HMODULE WINAPI MapHModuleSL(HMODULE16 hmod) TDB *pTask = TASK_GetCurrent(); hmod = pTask->hModule; } - pModule = (NE_MODULE*)GlobalLock16(hmod); + pModule = GlobalLock16(hmod); if ((pModule->ne_magic != IMAGE_OS2_SIGNATURE) || !(pModule->ne_flags & NE_FFLAGS_WIN32)) return 0; return pModule->module32; diff --git a/dlls/kernel32/ne_segment.c b/dlls/kernel32/ne_segment.c index 8a3497e..0ade4b0 100644 --- a/dlls/kernel32/ne_segment.c +++ b/dlls/kernel32/ne_segment.c @@ -724,7 +724,7 @@ void NE_InitializeDLLs( HMODULE16 hModule ) { HGLOBAL16 to_init = pModule->dlls_to_init; pModule->dlls_to_init = 0; - for (pDLL = (HMODULE16 *)GlobalLock16( to_init ); *pDLL; pDLL++) + for (pDLL = GlobalLock16( to_init ); *pDLL; pDLL++) { NE_InitializeDLLs( *pDLL ); } diff --git a/dlls/kernel32/resource16.c b/dlls/kernel32/resource16.c index b1369a5..5d745f8 100644 --- a/dlls/kernel32/resource16.c +++ b/dlls/kernel32/resource16.c @@ -203,7 +203,7 @@ static DWORD NE_FindNameTableId( NE_MODULE *pModule, LPCSTR typeId, LPCSTR resId pTypeInfo->type_id, pNameInfo->id ); handle = LoadResource16( pModule->self, (HRSRC16)((char *)pNameInfo - (char *)pModule) ); - for(p = (WORD*)LockResource16(handle); p && *p; p = (WORD *)((char*)p+*p)) + for(p = LockResource16(handle); p && *p; p = (WORD *)((char*)p+*p)) { TRACE(" type=%04x '%s' id=%04x '%s'\n", p[1], (char *)(p+3), p[2], diff --git a/dlls/kernel32/snoop16.c b/dlls/kernel32/snoop16.c index 210f74c..b319088 100644 --- a/dlls/kernel32/snoop16.c +++ b/dlls/kernel32/snoop16.c @@ -203,7 +203,7 @@ SNOOP16_GetProcAddress16(HMODULE16 hmod,DWORD ordinal,FARPROC16 origfun) { /* Now search the non-resident names table */ if (!*cpnt && pModule->nrname_handle) { - cpnt = (unsigned char *)GlobalLock16( pModule->nrname_handle ); + cpnt = GlobalLock16( pModule->nrname_handle ); while (*cpnt) { cpnt += *cpnt + 1 + sizeof(WORD); if (*(WORD*)(cpnt+*cpnt+1) == ordinal) { diff --git a/dlls/kernel32/task.c b/dlls/kernel32/task.c index 553d1b3..af5fac3 100644 --- a/dlls/kernel32/task.c +++ b/dlls/kernel32/task.c @@ -209,7 +209,7 @@ static SEGPTR TASK_AllocThunk(void) TASK_CreateThunks( sel, 0, MIN_THUNKS ); pThunk->next = sel; } - pThunk = (THUNKS *)GlobalLock16( sel ); + pThunk = GlobalLock16( sel ); base = 0; } base += pThunk->free; @@ -236,7 +236,7 @@ static BOOL TASK_FreeThunk( SEGPTR thunk ) while (sel && (sel != HIWORD(thunk))) { sel = pThunk->next; - pThunk = (THUNKS *)GlobalLock16( sel ); + pThunk = GlobalLock16( sel ); base = 0; } if (!sel) return FALSE; @@ -937,7 +937,7 @@ static BOOL TASK_GetCodeSegment( FARPROC16 proc, NE_MODULE **ppModule, int segNr=0; /* Try pair of module handle / segment number */ - pModule = (NE_MODULE *) GlobalLock16( HIWORD( proc ) ); + pModule = GlobalLock16( HIWORD( proc ) ); if ( pModule && pModule->ne_magic == IMAGE_OS2_SIGNATURE ) { segNr = LOWORD( proc ); @@ -1100,7 +1100,7 @@ void WINAPI SwitchStackTo16( WORD seg, WORD ptr, WORD top ) INSTANCEDATA *pData; UINT16 copySize; - if (!(pData = (INSTANCEDATA *)GlobalLock16( seg ))) return; + if (!(pData = GlobalLock16( seg ))) return; TRACE("old=%04x:%04x new=%04x:%04x\n", SELECTOROF( NtCurrentTeb()->WOW32Reserved ), OFFSETOF( NtCurrentTeb()->WOW32Reserved ), seg, ptr ); @@ -1142,7 +1142,7 @@ void WINAPI SwitchStackBack16( CONTEXT86 *context ) STACK16FRAME *oldFrame, *newFrame; INSTANCEDATA *pData; - if (!(pData = (INSTANCEDATA *)GlobalLock16(SELECTOROF(NtCurrentTeb()->WOW32Reserved)))) + if (!(pData = GlobalLock16(SELECTOROF(NtCurrentTeb()->WOW32Reserved)))) return; if (!pData->old_ss_sp) { @@ -1243,7 +1243,7 @@ DWORD WINAPI GetCurPID16( DWORD unused ) */ INT16 WINAPI GetInstanceData16( HINSTANCE16 instance, WORD buffer, INT16 len ) { - char *ptr = (char *)GlobalLock16( instance ); + char *ptr = GlobalLock16( instance ); if (!ptr || !len) return 0; if ((int)buffer + len >= 0x10000) len = 0x10000 - buffer; memcpy( (char *)GlobalLock16(CURRENT_DS) + buffer, ptr + buffer, len ); diff --git a/dlls/kernel32/tests/loader.c b/dlls/kernel32/tests/loader.c index 59588f8..5187d88 100644 --- a/dlls/kernel32/tests/loader.c +++ b/dlls/kernel32/tests/loader.c @@ -523,11 +523,10 @@ static void test_ImportDescriptors(void) * */ for (; import_chunk->FirstThunk; import_chunk++) { - LPCSTR module_name = (LPCSTR) RVAToAddr( - import_chunk->Name, kernel32_module); - PIMAGE_THUNK_DATA name_table = (PIMAGE_THUNK_DATA) RVAToAddr( + LPCSTR module_name = RVAToAddr(import_chunk->Name, kernel32_module); + PIMAGE_THUNK_DATA name_table = RVAToAddr( U(*import_chunk).OriginalFirstThunk, kernel32_module); - PIMAGE_THUNK_DATA iat = (PIMAGE_THUNK_DATA) RVAToAddr( + PIMAGE_THUNK_DATA iat = RVAToAddr( import_chunk->FirstThunk, kernel32_module); ok(module_name != NULL, "Imported module name should not be NULL\n"); ok(name_table != NULL,

1 0

Henri Verbeet : wined3d: Const correctness fixes for directx.c.
by Alexandre Julliard 01 Dec '08

01 Dec '08

Module: wine Branch: master Commit: 50ebf26894b79100663f41c56beab88a9df998c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=50ebf26894b79100663f41c56… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Nov 28 15:30:11 2008 +0100 wined3d: Const correctness fixes for directx.c. --- dlls/wined3d/directx.c | 72 +++++++++++++++++++++++---------------- dlls/wined3d/wined3d_private.h | 8 ++-- 2 files changed, 46 insertions(+), 34 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 99a1600..dc57c7f 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -154,8 +154,16 @@ static const shader_backend_t *select_shader_backend(UINT Adapter, WINED3DDEVTYP static const struct blit_shader *select_blit_implementation(UINT Adapter, WINED3DDEVTYPE DeviceType); /* lookup tables */ -int minLookup[MAX_LOOKUPS]; -int maxLookup[MAX_LOOKUPS]; +const int minLookup[MAX_LOOKUPS] = +{ + WINED3DTADDRESS_WRAP, /* WINELOOKUP_WARPPARAM */ +}; + +const int maxLookup[MAX_LOOKUPS] = +{ + WINED3DTADDRESS_MIRRORONCE, /* WINELOOKUP_WARPPARAM */ +}; + DWORD *stateLookup[MAX_LOOKUPS]; struct min_lookup minMipLookup[WINED3DTEXF_ANISOTROPIC + 1]; @@ -368,12 +376,8 @@ static ULONG WINAPI IWineD3DImpl_Release(IWineD3D *iface) { /* Set the shader type for this device, depending on the given capabilities, * the device type, and the user preferences in wined3d_settings */ -void select_shader_mode( - WineD3D_GL_Info *gl_info, - WINED3DDEVTYPE DeviceType, - int* ps_selected, - int* vs_selected) { - +void select_shader_mode(const WineD3D_GL_Info *gl_info, WINED3DDEVTYPE DeviceType, int *ps_selected, int *vs_selected) +{ if (wined3d_settings.vs_mode == VS_NONE) { *vs_selected = SHADER_NONE; } else if (gl_info->supported[ARB_VERTEX_SHADER] && wined3d_settings.glslRequested) { @@ -451,7 +455,8 @@ static void select_shader_max_constants( **********************************************************/ #define GLINFO_LOCATION (*gl_info) -static inline BOOL test_arb_vs_offset_limit(WineD3D_GL_Info *gl_info) { +static inline BOOL test_arb_vs_offset_limit(const WineD3D_GL_Info *gl_info) +{ GLuint prog; BOOL ret = FALSE; const char *testcode = @@ -1342,11 +1347,7 @@ BOOL IWineD3DImpl_FillGLCaps(WineD3D_GL_Info *gl_info) { else gl_info->vidmem = WINE_DEFAULT_VIDMEM; - /* Load all the lookup tables - TODO: It may be a good idea to make minLookup and maxLookup const and populate them in wined3d_private.h where they are declared */ - minLookup[WINELOOKUP_WARPPARAM] = WINED3DTADDRESS_WRAP; - maxLookup[WINELOOKUP_WARPPARAM] = WINED3DTADDRESS_MIRRORONCE; - + /* Load all the lookup tables */ for (i = 0; i < MAX_LOOKUPS; i++) { stateLookup[i] = HeapAlloc(GetProcessHeap(), 0, sizeof(*stateLookup[i]) * (1 + maxLookup[i] - minLookup[i]) ); } @@ -1775,7 +1776,7 @@ static HRESULT WINAPI IWineD3DImpl_CheckDepthStencilMatch(IWineD3D *iface, UINT WINED3DFORMAT DepthStencilFormat) { IWineD3DImpl *This = (IWineD3DImpl *)iface; int nCfgs; - WineD3D_PixelFormat *cfgs; + const WineD3D_PixelFormat *cfgs; int it; WARN_(d3d_caps)("(%p)-> (STUB) (Adptr:%d, DevType:(%x,%s), AdptFmt:(%x,%s), RendrTgtFmt:(%x,%s), DepthStencilFmt:(%x,%s))\n", @@ -1843,7 +1844,7 @@ static HRESULT WINAPI IWineD3DImpl_CheckDeviceMultiSampleType(IWineD3D *iface, U if(glDesc->Flags & (WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_STENCIL)) { int i, nCfgs; - WineD3D_PixelFormat *cfgs; + const WineD3D_PixelFormat *cfgs; cfgs = Adapters[Adapter].cfgs; nCfgs = Adapters[Adapter].nCfgs; @@ -1864,7 +1865,7 @@ static HRESULT WINAPI IWineD3DImpl_CheckDeviceMultiSampleType(IWineD3D *iface, U else if(glDesc->Flags & WINED3DFMT_FLAG_RENDERTARGET) { short redSize, greenSize, blueSize, alphaSize, colorBits; int i, nCfgs; - WineD3D_PixelFormat *cfgs; + const WineD3D_PixelFormat *cfgs; if(!getColorBits(SurfaceFormat, &redSize, &greenSize, &blueSize, &alphaSize, &colorBits)) { ERR("Unable to color bits for format %#x, can't check multisampling capability!\n", SurfaceFormat); @@ -3746,7 +3747,8 @@ ULONG WINAPI D3DCB_DefaultDestroyVolume(IWineD3DVolume *pVolume) { return IUnknown_Release(volumeParent); } -static BOOL implementation_is_apple(WineD3D_GL_Info *gl_info) { +static BOOL implementation_is_apple(const WineD3D_GL_Info *gl_info) +{ /* MacOS has various specialities in the extensions it advertises. Some have to be loaded from * the opengl 1.2+ core, while other extensions are advertised, but software emulated. So try to * detect the Apple OpenGL implementation to apply some extension fixups afterwards. @@ -3985,12 +3987,14 @@ static void fixup_extensions(WineD3D_GL_Info *gl_info) { } } -static void WINE_GLAPI invalid_func(void *data) { +static void WINE_GLAPI invalid_func(const void *data) +{ ERR("Invalid vertex attribute function called\n"); DebugBreak(); } -static void WINE_GLAPI invalid_texcoord_func(GLenum unit, void * data) { +static void WINE_GLAPI invalid_texcoord_func(GLenum unit, const void *data) +{ ERR("Invalid texcoord function called\n"); DebugBreak(); } @@ -4000,8 +4004,9 @@ static void WINE_GLAPI invalid_texcoord_func(GLenum unit, void * data) { /* Helper functions for providing vertex data to opengl. The arrays are initialized based on * the extension detection and are used in drawStridedSlow */ -static void WINE_GLAPI position_d3dcolor(void *data) { - DWORD pos = *((DWORD *) data); +static void WINE_GLAPI position_d3dcolor(const void *data) +{ + DWORD pos = *((const DWORD *)data); FIXME("Add a test for fixed function position from d3dcolor type\n"); glVertex4s(D3DCOLOR_B_R(pos), @@ -4009,8 +4014,10 @@ static void WINE_GLAPI position_d3dcolor(void *data) { D3DCOLOR_B_B(pos), D3DCOLOR_B_A(pos)); } -static void WINE_GLAPI position_float4(void *data) { - GLfloat *pos = (float *) data; + +static void WINE_GLAPI position_float4(const void *data) +{ + const GLfloat *pos = data; if (pos[3] < eps && pos[3] > -eps) glVertex3fv(pos); @@ -4021,8 +4028,9 @@ static void WINE_GLAPI position_float4(void *data) { } } -static void WINE_GLAPI diffuse_d3dcolor(void *data) { - DWORD diffuseColor = *((DWORD *) data); +static void WINE_GLAPI diffuse_d3dcolor(const void *data) +{ + DWORD diffuseColor = *((const DWORD *)data); glColor4ub(D3DCOLOR_B_R(diffuseColor), D3DCOLOR_B_G(diffuseColor), @@ -4030,18 +4038,22 @@ static void WINE_GLAPI diffuse_d3dcolor(void *data) { D3DCOLOR_B_A(diffuseColor)); } -static void WINE_GLAPI specular_d3dcolor(void *data) { - DWORD specularColor = *((DWORD *) data); +static void WINE_GLAPI specular_d3dcolor(const void *data) +{ + DWORD specularColor = *((const DWORD *)data); GL_EXTCALL(glSecondaryColor3ubEXT)(D3DCOLOR_B_R(specularColor), D3DCOLOR_B_G(specularColor), D3DCOLOR_B_B(specularColor)); } -static void WINE_GLAPI warn_no_specular_func(void *data) { + +static void WINE_GLAPI warn_no_specular_func(const void *data) +{ WARN("GL_EXT_secondary_color not supported\n"); } -void fillGLAttribFuncs(WineD3D_GL_Info *gl_info) { +void fillGLAttribFuncs(const WineD3D_GL_Info *gl_info) +{ position_funcs[WINED3DDECLTYPE_FLOAT1] = invalid_func; position_funcs[WINED3DDECLTYPE_FLOAT2] = invalid_func; position_funcs[WINED3DDECLTYPE_FLOAT3] = (glAttribFunc)glVertex3fv; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 6ea6663..d2c9963 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -107,8 +107,8 @@ typedef enum _WINELOOKUP { MAX_LOOKUPS = 1 } WINELOOKUP; -extern int minLookup[MAX_LOOKUPS]; -extern int maxLookup[MAX_LOOKUPS]; +extern const int minLookup[MAX_LOOKUPS]; +extern const int maxLookup[MAX_LOOKUPS]; extern DWORD *stateLookup[MAX_LOOKUPS]; struct min_lookup @@ -556,8 +556,8 @@ void primitiveDeclarationConvertToStridedData( DWORD get_flexible_vertex_size(DWORD d3dvtVertexType); -typedef void (WINE_GLAPI *glAttribFunc)(void *data); -typedef void (WINE_GLAPI *glMultiTexCoordFunc)(GLenum unit, void *data); +typedef void (WINE_GLAPI *glAttribFunc)(const void *data); +typedef void (WINE_GLAPI *glMultiTexCoordFunc)(GLenum unit, const void *data); extern glAttribFunc position_funcs[WINED3DDECLTYPE_UNUSED]; extern glAttribFunc diffuse_funcs[WINED3DDECLTYPE_UNUSED]; extern glAttribFunc specular_funcs[WINED3DDECLTYPE_UNUSED];

1 0

Henri Verbeet : wined3d: Fix the glWeightPointerARB prototype.
by Alexandre Julliard 01 Dec '08

01 Dec '08

Module: wine Branch: master Commit: 657a016ac5ef639d2575196923ddaac38d06283e URL: http://source.winehq.org/git/wine.git/?a=commit;h=657a016ac5ef639d257519692… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Nov 28 15:30:12 2008 +0100 wined3d: Fix the glWeightPointerARB prototype. --- dlls/wined3d/wined3d_gl.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index 0dababc..ff8f364 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -1754,7 +1754,7 @@ typedef void (WINE_GLAPI * PGLFNGLPOINTPARAMETERFVARBPROC) (GLenum pname, const #define GL_MODELVIEW30_ARB 0x873E #define GL_MODELVIEW31_ARB 0x873F #endif -typedef void (WINE_GLAPI * PGLFNGLWEIGHTPOINTERARB) (GLint size, GLenum type, GLsizei stride, GLvoid* pointer); +typedef void (WINE_GLAPI * PGLFNGLWEIGHTPOINTERARB) (GLint size, GLenum type, GLsizei stride, const GLvoid *pointer); typedef void (WINE_GLAPI * PGLFNGLWEIGHTBV) (GLint size, const GLbyte *weights); typedef void (WINE_GLAPI * PGLFNGLWEIGHTSV) (GLint size, const GLshort *weights); typedef void (WINE_GLAPI * PGLFNGLWEIGHTIV) (GLint size, const GLint *weights);

1 0

Henri Verbeet : wined3d: Make the lpData member of WineDirect3DStridedData const.
by Alexandre Julliard 01 Dec '08

01 Dec '08

Module: wine Branch: master Commit: 21b8535902f4d3f92eaca8c762e557d4addd854b URL: http://source.winehq.org/git/wine.git/?a=commit;h=21b8535902f4d3f92eaca8c76… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Nov 28 15:30:12 2008 +0100 wined3d: Make the lpData member of WineDirect3DStridedData const. --- dlls/wined3d/drawprim.c | 36 ++++++++++++++++++------------------ dlls/wined3d/state.c | 26 +++++++++++++------------- include/wine/wined3d.idl | 10 +++++----- 3 files changed, 36 insertions(+), 36 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=21b8535902f4d3f92eaca…

1 0

Henri Verbeet : wined3d: Const correctness fixes for drawprim.c.
by Alexandre Julliard 01 Dec '08

01 Dec '08

Module: wine Branch: master Commit: 6f98f19703bcfcf9969043805a8dd9bd7d1682f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f98f19703bcfcf9969043805… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Nov 28 15:30:12 2008 +0100 wined3d: Const correctness fixes for drawprim.c. --- dlls/wined3d/drawprim.c | 47 +++++++++++++++++++++++------------------------ 1 files changed, 23 insertions(+), 24 deletions(-) diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index 35e5390..0b4fc71 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -146,10 +146,10 @@ void primitiveDeclarationConvertToStridedData( IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; IWineD3DVertexDeclarationImpl* vertexDeclaration = (IWineD3DVertexDeclarationImpl *)This->stateBlock->vertexDecl; unsigned int i; - WINED3DVERTEXELEMENT *element; + const WINED3DVERTEXELEMENT *element; DWORD stride; DWORD numPreloadStreams = This->stateBlock->streamIsUP ? 0 : vertexDeclaration->num_streams; - DWORD *streams = vertexDeclaration->streams; + const DWORD *streams = vertexDeclaration->streams; /* Check for transformed vertices, disable vertex shader if present */ strided->u.s.position_transformed = vertexDeclaration->position_transformed; @@ -286,16 +286,15 @@ static void drawStridedFast(IWineD3DDevice *iface,UINT numberOfVertices, GLenum * Slower GL version which extracts info about each vertex in turn */ -static void drawStridedSlow(IWineD3DDevice *iface, WineDirect3DVertexStridedData *sd, - UINT NumVertexes, GLenum glPrimType, - const void *idxData, short idxSize, ULONG minIndex, ULONG startIdx, ULONG startVertex) { - +static void drawStridedSlow(IWineD3DDevice *iface, const WineDirect3DVertexStridedData *sd, UINT NumVertexes, + GLenum glPrimType, const void *idxData, short idxSize, ULONG minIndex, ULONG startIdx, ULONG startVertex) +{ unsigned int textureNo = 0; const WORD *pIdxBufS = NULL; const DWORD *pIdxBufL = NULL; ULONG vx_index; IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; - UINT *streamOffset = This->stateBlock->streamOffset; + const UINT *streamOffset = This->stateBlock->streamOffset; long SkipnStrides = startVertex + This->stateBlock->loadBaseVertexIndex; BOOL pixelShader = use_ps(This); @@ -595,10 +594,9 @@ static inline void send_attribute(IWineD3DDeviceImpl *This, const DWORD type, co } } -static void drawStridedSlowVs(IWineD3DDevice *iface, WineDirect3DVertexStridedData *sd, UINT numberOfVertices, - GLenum glPrimitiveType, const void *idxData, short idxSize, ULONG minIndex, ULONG startIdx, - ULONG startVertex) { - +static void drawStridedSlowVs(IWineD3DDevice *iface, const WineDirect3DVertexStridedData *sd, UINT numberOfVertices, + GLenum glPrimitiveType, const void *idxData, short idxSize, ULONG minIndex, ULONG startIdx, ULONG startVertex) +{ IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *) iface; long SkipnStrides = startVertex + This->stateBlock->loadBaseVertexIndex; const WORD *pIdxBufS = NULL; @@ -656,9 +654,10 @@ static void drawStridedSlowVs(IWineD3DDevice *iface, WineDirect3DVertexStridedDa glEnd(); } -static inline void drawStridedInstanced(IWineD3DDevice *iface, WineDirect3DVertexStridedData *sd, UINT numberOfVertices, - GLenum glPrimitiveType, const void *idxData, short idxSize, ULONG minIndex, - ULONG startIdx, ULONG startVertex) { +static inline void drawStridedInstanced(IWineD3DDevice *iface, const WineDirect3DVertexStridedData *sd, + UINT numberOfVertices, GLenum glPrimitiveType, const void *idxData, short idxSize, ULONG minIndex, + ULONG startIdx, ULONG startVertex) +{ UINT numInstances = 0, i; int numInstancedAttribs = 0, j; UINT instancedData[sizeof(sd->u.input) / sizeof(sd->u.input[0]) /* 16 */]; @@ -854,7 +853,7 @@ void drawPrimitive(IWineD3DDevice *iface, { GLenum glPrimType; BOOL emulation = FALSE; - WineDirect3DVertexStridedData *strided = &This->strided_streams; + const WineDirect3DVertexStridedData *strided = &This->strided_streams; WineDirect3DVertexStridedData stridedlcl; /* Ok, Work out which primitive is requested and how many vertexes that will be */ @@ -1006,7 +1005,7 @@ HRESULT tesselate_rectpatch(IWineD3DDeviceImpl *This, float max_x = 0.0, max_y = 0.0, max_z = 0.0, neg_z = 0.0; WineDirect3DVertexStridedData strided; const BYTE *data; - WINED3DRECTPATCH_INFO *info = &patch->RectPatchInfo; + const WINED3DRECTPATCH_INFO *info = &patch->RectPatchInfo; DWORD vtxStride; GLenum feedback_type; GLfloat *feedbuffer; @@ -1085,11 +1084,11 @@ HRESULT tesselate_rectpatch(IWineD3DDeviceImpl *This, checkGLcall("glPolygonMode(GL_FRONT_AND_BACK, GL_FILL)"); IWineD3DDeviceImpl_MarkStateDirty(This, STATE_RENDER(WINED3DRS_FILLMODE)); if(patch->has_normals) { - float black[4] = {0, 0, 0, 0}; - float red[4] = {1, 0, 0, 0}; - float green[4] = {0, 1, 0, 0}; - float blue[4] = {0, 0, 1, 0}; - float white[4] = {1, 1, 1, 1}; + const GLfloat black[4] = {0, 0, 0, 0}; + const GLfloat red[4] = {1, 0, 0, 0}; + const GLfloat green[4] = {0, 1, 0, 0}; + const GLfloat blue[4] = {0, 0, 1, 0}; + const GLfloat white[4] = {1, 1, 1, 1}; glEnable(GL_LIGHTING); checkGLcall("glEnable(GL_LIGHTING)"); glLightModelfv(GL_LIGHT_MODEL_AMBIENT, black); @@ -1256,9 +1255,9 @@ HRESULT tesselate_rectpatch(IWineD3DDeviceImpl *This, if(patch->has_normals) { /* Now do the same with reverse light directions */ - float x[4] = {-1, 0, 0, 0}; - float y[4] = { 0, -1, 0, 0}; - float z[4] = { 0, 0, -1, 0}; + const GLfloat x[4] = {-1, 0, 0, 0}; + const GLfloat y[4] = { 0, -1, 0, 0}; + const GLfloat z[4] = { 0, 0, -1, 0}; glLightfv(GL_LIGHT0, GL_POSITION, x); glLightfv(GL_LIGHT1, GL_POSITION, y); glLightfv(GL_LIGHT2, GL_POSITION, z);

1 0

Vitaliy Margolen : dinput: Use correct GetObjectInfo for joystick.
by Alexandre Julliard 01 Dec '08

01 Dec '08

Module: wine Branch: master Commit: 095ba950d607510670ba1ff7f4251fb819a0dc6f URL: http://source.winehq.org/git/wine.git/?a=commit;h=095ba950d607510670ba1ff7f… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Fri Nov 28 08:19:13 2008 -0700 dinput: Use correct GetObjectInfo for joystick. --- dlls/dinput/joystick_linux.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/dinput/joystick_linux.c b/dlls/dinput/joystick_linux.c index 4146f1d..00bc3bd 100644 --- a/dlls/dinput/joystick_linux.c +++ b/dlls/dinput/joystick_linux.c @@ -1141,7 +1141,7 @@ static const IDirectInputDevice8WVtbl JoystickWvt = XCAST(SetDataFormat)IDirectInputDevice2AImpl_SetDataFormat, XCAST(SetEventNotification)IDirectInputDevice2AImpl_SetEventNotification, XCAST(SetCooperativeLevel)IDirectInputDevice2AImpl_SetCooperativeLevel, - IDirectInputDevice2WImpl_GetObjectInfo, + JoystickWImpl_GetObjectInfo, JoystickWImpl_GetDeviceInfo, XCAST(RunControlPanel)IDirectInputDevice2AImpl_RunControlPanel, XCAST(Initialize)IDirectInputDevice2AImpl_Initialize,

1 0

Francois Gouget : dplay: Remove WINAPI on static functions where not needed .
by Alexandre Julliard 01 Dec '08

01 Dec '08

Module: wine Branch: master Commit: 80b6c2efd6eb7b16e86520ee5c187a493786c45f URL: http://source.winehq.org/git/wine.git/?a=commit;h=80b6c2efd6eb7b16e86520ee5… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Nov 28 15:19:48 2008 +0100 dplay: Remove WINAPI on static functions where not needed. --- dlls/dplayx/dplay.c | 147 +++++++++++++++++++++++++-------------------------- 1 files changed, 73 insertions(+), 74 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=80b6c2efd6eb7b16e8652…

1 0

Francois Gouget : dplayx: Remove WINAPI on static functions where not needed.
by Alexandre Julliard 01 Dec '08

01 Dec '08

Module: wine Branch: master Commit: b4912bc13d06b159d43dceb91704db0304a21529 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b4912bc13d06b159d43dceb91… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Nov 28 15:19:55 2008 +0100 dplayx: Remove WINAPI on static functions where not needed. --- dlls/dplayx/dplobby.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/dplayx/dplobby.c b/dlls/dplayx/dplobby.c index f78d657..901c375 100644 --- a/dlls/dplayx/dplobby.c +++ b/dlls/dplayx/dplobby.c @@ -58,9 +58,9 @@ static HRESULT DPL_CreateAddress( REFGUID guidSP, REFGUID guidDataType, LPCVOID extern HRESULT DPL_EnumAddress( LPDPENUMADDRESSCALLBACK lpEnumAddressCallback, LPCVOID lpAddress, DWORD dwAddressSize, LPVOID lpContext ); -static HRESULT WINAPI DPL_ConnectEx( IDirectPlayLobbyAImpl* This, - DWORD dwFlags, REFIID riid, - LPVOID* lplpDP, IUnknown* pUnk ); +static HRESULT DPL_ConnectEx( IDirectPlayLobbyAImpl* This, + DWORD dwFlags, REFIID riid, + LPVOID* lplpDP, IUnknown* pUnk ); static BOOL DPL_CreateAndSetLobbyHandles( DWORD dwDestProcessId, HANDLE hDestProcess, LPHANDLE lphStart, LPHANDLE lphDeath, @@ -469,7 +469,7 @@ static ULONG WINAPI DPL_Release * Returns an IDirectPlay interface. * */ -static HRESULT WINAPI DPL_ConnectEx +static HRESULT DPL_ConnectEx ( IDirectPlayLobbyAImpl* This, DWORD dwFlags, REFIID riid,

1 0

Francois Gouget : dsound: Remove WINAPI on static functions where not needed.
by Alexandre Julliard 01 Dec '08

01 Dec '08

Module: wine Branch: master Commit: 45992843ea08014d3bfdc36ea10c56104421375f URL: http://source.winehq.org/git/wine.git/?a=commit;h=45992843ea08014d3bfdc36ea… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Nov 28 15:20:03 2008 +0100 dsound: Remove WINAPI on static functions where not needed. --- dlls/dsound/propset.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/dsound/propset.c b/dlls/dsound/propset.c index 35fe325..4437222 100644 --- a/dlls/dsound/propset.c +++ b/dlls/dsound/propset.c @@ -273,7 +273,7 @@ static ULONG WINAPI IKsPrivatePropertySetImpl_Release(LPKSPROPERTYSET iface) return ref; } -static HRESULT WINAPI DSPROPERTY_WaveDeviceMappingA( +static HRESULT DSPROPERTY_WaveDeviceMappingA( LPVOID pPropData, ULONG cbPropData, PULONG pcbReturned ) @@ -336,7 +336,7 @@ static HRESULT WINAPI DSPROPERTY_WaveDeviceMappingA( return hr; } -static HRESULT WINAPI DSPROPERTY_WaveDeviceMappingW( +static HRESULT DSPROPERTY_WaveDeviceMappingW( LPVOID pPropData, ULONG cbPropData, PULONG pcbReturned ) @@ -399,7 +399,7 @@ static HRESULT WINAPI DSPROPERTY_WaveDeviceMappingW( return hr; } -static HRESULT WINAPI DSPROPERTY_Description1( +static HRESULT DSPROPERTY_Description1( LPVOID pPropData, ULONG cbPropData, PULONG pcbReturned ) @@ -579,7 +579,7 @@ static HRESULT WINAPI DSPROPERTY_Description1( return S_OK; } -static HRESULT WINAPI DSPROPERTY_DescriptionA( +static HRESULT DSPROPERTY_DescriptionA( LPVOID pPropData, ULONG cbPropData, PULONG pcbReturned ) @@ -819,7 +819,7 @@ static HRESULT WINAPI DSPROPERTY_DescriptionA( return S_OK; } -static HRESULT WINAPI DSPROPERTY_DescriptionW( +static HRESULT DSPROPERTY_DescriptionW( LPVOID pPropData, ULONG cbPropData, PULONG pcbReturned ) @@ -1060,7 +1060,7 @@ static HRESULT WINAPI DSPROPERTY_DescriptionW( return S_OK; } -static HRESULT WINAPI DSPROPERTY_Enumerate1( +static HRESULT DSPROPERTY_Enumerate1( LPVOID pPropData, ULONG cbPropData, PULONG pcbReturned ) @@ -1142,7 +1142,7 @@ static HRESULT WINAPI DSPROPERTY_Enumerate1( return E_PROP_ID_UNSUPPORTED; } -static HRESULT WINAPI DSPROPERTY_EnumerateA( +static HRESULT DSPROPERTY_EnumerateA( LPVOID pPropData, ULONG cbPropData, PULONG pcbReturned ) @@ -1252,7 +1252,7 @@ static HRESULT WINAPI DSPROPERTY_EnumerateA( return E_PROP_ID_UNSUPPORTED; } -static HRESULT WINAPI DSPROPERTY_EnumerateW( +static HRESULT DSPROPERTY_EnumerateW( LPVOID pPropData, ULONG cbPropData, PULONG pcbReturned )

1 0

Henri Verbeet : wined3d: Remove some superfluous casts.
by Alexandre Julliard 01 Dec '08

01 Dec '08

Module: wine Branch: master Commit: 942f82100aad51174804d190f5f36b1b5285134e URL: http://source.winehq.org/git/wine.git/?a=commit;h=942f82100aad51174804d190f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Nov 28 15:30:11 2008 +0100 wined3d: Remove some superfluous casts. --- dlls/wined3d/directx.c | 220 ++++++++++++++++++++++++------------------------ 1 files changed, 110 insertions(+), 110 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=942f82100aad51174804d…

1 0