June 2007 - Wine-Commits - list.winehq.org

H. Verbeet : wined3d: Add wined3d vertex sampler definitions.
by Alexandre Julliard June 13, 2007

June 13, 2007

Module: wine Branch: master Commit: fc5582aef7ccfdfefedff96c2eee1230e29ef7f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc5582aef7ccfdfefedff96c2… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Tue Jun 12 23:08:34 2007 +0200 wined3d: Add wined3d vertex sampler definitions. --- include/wine/wined3d_types.h | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/include/wine/wined3d_types.h b/include/wine/wined3d_types.h index cd70b17..0cbe880 100644 --- a/include/wine/wined3d_types.h +++ b/include/wine/wined3d_types.h @@ -1561,6 +1561,13 @@ typedef enum _WINED3DSURFTYPE { #define WINED3DCREATE_DISABLE_DRIVER_MANAGEMENT 0x00000100 #define WINED3DCREATE_ADAPTERGROUP_DEVICE 0x00000200 +/* VTF defines */ +#define WINED3DDMAPSAMPLER 0x100 +#define WINED3DVERTEXTEXTURESAMPLER0 (WINED3DDMAPSAMPLER + 1) +#define WINED3DVERTEXTEXTURESAMPLER1 (WINED3DDMAPSAMPLER + 2) +#define WINED3DVERTEXTEXTURESAMPLER2 (WINED3DDMAPSAMPLER + 3) +#define WINED3DVERTEXTEXTURESAMPLER3 (WINED3DDMAPSAMPLER + 4) + /* DirectDraw types */ typedef struct _WINEDDCOLORKEY

1 0

H. Verbeet : wined3d: Call IWineD3DDeviceImpl_FindTexUnitMap() when activating the context.
by Alexandre Julliard June 13, 2007

June 13, 2007

Module: wine Branch: master Commit: b9d5c1806276e61d762d02c69051b89ed253aacb URL: http://source.winehq.org/git/wine.git/?a=commit;h=b9d5c1806276e61d762d02c69… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Tue Jun 12 23:08:22 2007 +0200 wined3d: Call IWineD3DDeviceImpl_FindTexUnitMap() when activating the context. --- dlls/wined3d/context.c | 3 +++ dlls/wined3d/device.c | 21 +-------------------- dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 5 insertions(+), 20 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index c2834c7..ee9e96e 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -801,6 +801,9 @@ void ActivateContext(IWineD3DDeviceImpl *This, IWineD3DSurface *target, ContextU glEnable(GL_TEXTURE_SHADER_NV); checkGLcall("glEnable(GL_TEXTURE_SHADER_NV)"); } + if (GL_SUPPORT(NV_REGISTER_COMBINERS)) { + IWineD3DDeviceImpl_FindTexUnitMap(This); + } for(i=0; i < context->numDirtyEntries; i++) { dirtyState = context->dirtyArray[i]; idx = dirtyState >> 5; diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index d4a9f77..ab38a7c 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3212,7 +3212,7 @@ static inline void markTextureStagesDirty(IWineD3DDeviceImpl *This, DWORD stage) } } -static void IWineD3DDeviceImpl_FindTexUnitMap(IWineD3DDeviceImpl *This) { +void IWineD3DDeviceImpl_FindTexUnitMap(IWineD3DDeviceImpl *This) { DWORD i, tex; /* This code can assume that GL_NV_register_combiners are supported, otherwise * it is never called. @@ -3307,11 +3307,6 @@ static HRESULT WINAPI IWineD3DDeviceImpl_SetPixelShader(IWineD3DDevice *iface, I TRACE("(%p) : setting pShader(%p)\n", This, pShader); IWineD3DDeviceImpl_MarkStateDirty(This, STATE_PIXELSHADER); - /* Rebuild the texture unit mapping if nvrc's are supported */ - if(GL_SUPPORT(NV_REGISTER_COMBINERS)) { - IWineD3DDeviceImpl_FindTexUnitMap(This); - } - return WINED3D_OK; } @@ -3999,13 +3994,6 @@ static HRESULT WINAPI IWineD3DDeviceImpl_SetTextureStageState(IWineD3DDevice *if IWineD3DDeviceImpl_MarkStateDirty(This, STATE_TEXTURESTAGE(Stage, Type)); - /* Rebuild the stage -> gl texture unit mapping if register combiners are supported - * If there is a pixel shader there will be a 1:1 mapping, no need to touch it. SetPixelShader - * will call FindTexUnitMap too. - */ - if(GL_SUPPORT(NV_REGISTER_COMBINERS) && !This->stateBlock->pixelShader) { - IWineD3DDeviceImpl_FindTexUnitMap(This); - } return WINED3D_OK; } @@ -4113,13 +4101,6 @@ static HRESULT WINAPI IWineD3DDeviceImpl_SetTexture(IWineD3DDevice *iface, DWORD IWineD3DDeviceImpl_MarkStateDirty(This, STATE_SAMPLER(Stage)); - /* Verify the texture unit mapping(and rebuild it if needed) if we use nvrcs and no - * pixel shader is used - */ - if(GL_SUPPORT(NV_REGISTER_COMBINERS) && !This->stateBlock->pixelShader) { - IWineD3DDeviceImpl_FindTexUnitMap(This); - } - return WINED3D_OK; } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 6673bc0..49081b1 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -745,6 +745,7 @@ struct IWineD3DDeviceImpl extern const IWineD3DDeviceVtbl IWineD3DDevice_Vtbl; +void IWineD3DDeviceImpl_FindTexUnitMap(IWineD3DDeviceImpl *This); void IWineD3DDeviceImpl_MarkStateDirty(IWineD3DDeviceImpl *This, DWORD state); static inline BOOL isStateDirty(WineD3DContext *context, DWORD state) { DWORD idx = state >> 5;

1 0

H. Verbeet : wined3d: Take the texUnitMap into account when loading shader_glsl_load_psamplers() .
by Alexandre Julliard June 13, 2007

June 13, 2007

Module: wine Branch: master Commit: 8311ff32a383a8bd8fc8e9bfcb78a0c80925057f URL: http://source.winehq.org/git/wine.git/?a=commit;h=8311ff32a383a8bd8fc8e9bfc… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Tue Jun 12 23:08:11 2007 +0200 wined3d: Take the texUnitMap into account when loading shader_glsl_load_psamplers(). --- dlls/wined3d/glsl_shader.c | 15 ++++++++------- 1 files changed, 8 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 4999841..afffa23 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -87,13 +87,14 @@ static void shader_glsl_load_psamplers( for (i=0; i< GL_LIMITS(samplers); ++i) { if (stateBlock->textures[i] != NULL) { - snprintf(sampler_name, sizeof(sampler_name), "Psampler%d", i); - name_loc = GL_EXTCALL(glGetUniformLocationARB(programId, sampler_name)); - if (name_loc != -1) { - TRACE("Loading %s for texture %d\n", sampler_name, i); - GL_EXTCALL(glUniform1iARB(name_loc, i)); - checkGLcall("glUniform1iARB"); - } + snprintf(sampler_name, sizeof(sampler_name), "Psampler%d", i); + name_loc = GL_EXTCALL(glGetUniformLocationARB(programId, sampler_name)); + if (name_loc != -1) { + int mapped_unit = stateBlock->wineD3DDevice->texUnitMap[i]; + TRACE("Loading %s for texture %d\n", sampler_name, mapped_unit); + GL_EXTCALL(glUniform1iARB(name_loc, mapped_unit)); + checkGLcall("glUniform1iARB"); + } } } }

1 0

Phil Costin : wined3d: Add gamma linerization support for D3DFMT_A4R4G4B4.
by Alexandre Julliard June 13, 2007

June 13, 2007

Module: wine Branch: master Commit: 2256e06de3493e4c0de3b9e49a28308d364f37b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2256e06de3493e4c0de3b9e49… Author: Phil Costin <philcostin(a)hotmail.com> Date: Tue Jun 12 18:41:58 2007 +0000 wined3d: Add gamma linerization support for D3DFMT_A4R4G4B4. --- dlls/wined3d/directx.c | 1 + dlls/wined3d/utils.c | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 07e0dbe..2abbeb6 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1692,6 +1692,7 @@ static HRESULT WINAPI IWineD3DImpl_CheckDeviceFormat(IWineD3D *iface, UINT Adapt switch (CheckFormat) { case WINED3DFMT_A8R8G8B8: case WINED3DFMT_X8R8G8B8: + case WINED3DFMT_A4R4G4B4: case WINED3DFMT_L8: case WINED3DFMT_A8L8: case WINED3DFMT_DXT1: diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 2718420..d592bc4 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -66,7 +66,7 @@ static const PixelFormatDesc formats[] = { {WINED3DFMT_R5G6B5 ,0x0 ,0x0000F800 ,0x000007e0 ,0x0000001f ,2 ,FALSE ,GL_RGB5 ,GL_RGB5 ,GL_RGB ,GL_UNSIGNED_SHORT_5_6_5 }, {WINED3DFMT_X1R5G5B5 ,0x0 ,0x00007c00 ,0x000003e0 ,0x0000001f ,2 ,FALSE ,GL_RGB5_A1 ,GL_RGB5_A1 ,GL_BGRA ,GL_UNSIGNED_SHORT_1_5_5_5_REV }, {WINED3DFMT_A1R5G5B5 ,0x00008000 ,0x00007c00 ,0x000003e0 ,0x0000001f ,2 ,FALSE ,GL_RGB5_A1 ,GL_RGB5_A1 ,GL_BGRA ,GL_UNSIGNED_SHORT_1_5_5_5_REV }, - {WINED3DFMT_A4R4G4B4 ,0x0000f000 ,0x00000f00 ,0x000000f0 ,0x0000000f ,2 ,FALSE ,GL_RGBA4 ,GL_RGBA4 ,GL_BGRA ,GL_UNSIGNED_SHORT_4_4_4_4_REV }, + {WINED3DFMT_A4R4G4B4 ,0x0000f000 ,0x00000f00 ,0x000000f0 ,0x0000000f ,2 ,FALSE ,GL_RGBA4 ,GL_SRGB8_ALPHA8_EXT ,GL_BGRA ,GL_UNSIGNED_SHORT_4_4_4_4_REV }, {WINED3DFMT_R3G3B2 ,0x0 ,0x000000e0 ,0x0000001c ,0x00000003 ,1 ,FALSE ,GL_R3_G3_B2 ,GL_R3_G3_B2 ,GL_RGB ,GL_UNSIGNED_BYTE_2_3_3_REV }, {WINED3DFMT_A8 ,0x000000ff ,0x0 ,0x0 ,0x0 ,1 ,FALSE ,GL_ALPHA8 ,GL_ALPHA8 ,GL_ALPHA ,GL_UNSIGNED_BYTE }, {WINED3DFMT_A8R3G3B2 ,0x0000ff00 ,0x000000e0 ,0x0000001c ,0x00000003 ,2 ,FALSE ,0 ,0 ,0 ,0 },

1 0

Evan Stade : gdiplus: Implemented GdipDrawRectangleI.
by Alexandre Julliard June 13, 2007

June 13, 2007

Module: wine Branch: master Commit: 4b9bfbe7b726981549609fc9d8e7071236b5696a URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b9bfbe7b726981549609fc9d… Author: Evan Stade <estade(a)gmail.com> Date: Tue Jun 12 10:51:20 2007 -0700 gdiplus: Implemented GdipDrawRectangleI. --- dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/graphics.c | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 33 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 04b2b7b..142011f 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -184,7 +184,7 @@ @ stub GdipDrawPolygon @ stub GdipDrawPolygonI @ stub GdipDrawRectangle -@ stub GdipDrawRectangleI +@ stdcall GdipDrawRectangleI(ptr ptr long long long long) @ stub GdipDrawRectangles @ stub GdipDrawRectanglesI @ stub GdipDrawString diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 5f97002..674bede 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -81,3 +81,35 @@ GpStatus WINGDIPAPI GdipDrawLineI(GpGraphics *graphics, GpPen *pen, INT x1, return Ok; } + +GpStatus WINGDIPAPI GdipDrawRectangleI(GpGraphics *graphics, GpPen *pen, INT x, + INT y, INT width, INT height) +{ + LOGBRUSH lb; + HPEN hpen; + HGDIOBJ old_obj; + + if(!pen || !graphics) + return InvalidParameter; + + lb.lbStyle = BS_SOLID; + lb.lbColor = pen->color; + lb.lbHatch = 0; + + hpen = ExtCreatePen(PS_GEOMETRIC | PS_ENDCAP_SQUARE, (INT) pen->width, + &lb, 0, NULL); + + old_obj = SelectObject(graphics->hdc, hpen); + + /* assume pen aligment centered */ + MoveToEx(graphics->hdc, x, y, NULL); + LineTo(graphics->hdc, x+width, y); + LineTo(graphics->hdc, x+width, y+height); + LineTo(graphics->hdc, x, y+height); + LineTo(graphics->hdc, x, y); + + SelectObject(graphics->hdc, old_obj); + DeleteObject(hpen); + + return Ok; +}

1 0

Evan Stade : gdiplus: Implemented GdipDrawLineI.
by Alexandre Julliard June 13, 2007

June 13, 2007

Module: wine Branch: master Commit: 2689b18ea4fcbb3adb65919960aca7b78ab42a8b URL: http://source.winehq.org/git/wine.git/?a=commit;h=2689b18ea4fcbb3adb6591996… Author: Evan Stade <estade(a)gmail.com> Date: Tue Jun 12 10:44:31 2007 -0700 gdiplus: Implemented GdipDrawLineI. --- dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/graphics.c | 16 ++++++++++++++++ 2 files changed, 17 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index c80fbbb..04b2b7b 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -175,7 +175,7 @@ @ stub GdipDrawImageRectRect @ stub GdipDrawImageRectRectI @ stub GdipDrawLine -@ stub GdipDrawLineI +@ stdcall GdipDrawLineI(ptr ptr long long long long) @ stub GdipDrawLines @ stub GdipDrawLinesI @ stub GdipDrawPath diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 37af012..5f97002 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -65,3 +65,19 @@ GpStatus WINGDIPAPI GdipDeleteGraphics(GpGraphics *graphics) return Ok; } + +GpStatus WINGDIPAPI GdipDrawLineI(GpGraphics *graphics, GpPen *pen, INT x1, + INT y1, INT x2, INT y2) +{ + HGDIOBJ old_obj; + + if(!pen || !graphics) + return InvalidParameter; + + old_obj = SelectObject(graphics->hdc, pen->gdipen); + MoveToEx(graphics->hdc, x1, y1, NULL); + LineTo(graphics->hdc, x2, y2); + SelectObject(graphics->hdc, old_obj); + + return Ok; +}

1 0

Alexandre Julliard : comctl32: Remove useless pointer check.
by Alexandre Julliard June 13, 2007

June 13, 2007

Module: wine Branch: master Commit: 0f63ad92ccef527cf920778d4aa90fc52bb48df8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f63ad92ccef527cf920778d4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 13 11:19:36 2007 +0200 comctl32: Remove useless pointer check. --- dlls/comctl32/tab.c | 7 ++----- 1 files changed, 2 insertions(+), 5 deletions(-) diff --git a/dlls/comctl32/tab.c b/dlls/comctl32/tab.c index 31b0163..830bc7e 100644 --- a/dlls/comctl32/tab.c +++ b/dlls/comctl32/tab.c @@ -2681,12 +2681,9 @@ static inline LRESULT TAB_SetMinTabWidth (TAB_INFO *infoPtr, INT cx) TRACE("(%p,%d)\n", infoPtr, cx); - if (infoPtr) { - oldcx = infoPtr->tabMinWidth; - infoPtr->tabMinWidth = cx; - } + oldcx = infoPtr->tabMinWidth; + infoPtr->tabMinWidth = cx; TAB_SetItemBounds(infoPtr); - return oldcx; }

1 0

Francois Gouget : secur32: Update win32. api to fix the winapi_check warnings.
by Alexandre Julliard June 13, 2007

June 13, 2007

Module: wine Branch: master Commit: ffc4a4f3013b975c1b61823b7ee39a593356ab0a URL: http://source.winehq.org/git/wine.git/?a=commit;h=ffc4a4f3013b975c1b61823b7… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Jun 12 17:52:05 2007 +0200 secur32: Update win32.api to fix the winapi_check warnings. --- tools/winapi/win32.api | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/tools/winapi/win32.api b/tools/winapi/win32.api index 989755f..74c8324 100644 --- a/tools/winapi/win32.api +++ b/tools/winapi/win32.api @@ -3835,7 +3835,6 @@ HANDLE NTSTATUS SECURITY_STATUS ULONG -unsigned long %ptr @@ -3856,7 +3855,7 @@ PULONG PVOID PVOID * SEC_GET_KEY_FN -unsigned long * +ULONG * void * void **

1 0

Andrew Talbot : msi: Constify some variables.
by Alexandre Julliard June 13, 2007

June 13, 2007

Module: wine Branch: master Commit: 8b362f7fc8089221a422584d38c4ccd42674143c URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b362f7fc8089221a422584d3… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Tue Jun 12 21:51:36 2007 +0100 msi: Constify some variables. --- dlls/msi/msipriv.h | 14 +++++++------- dlls/msi/query.h | 2 +- dlls/msi/select.c | 4 ++-- dlls/msi/sql.y | 12 ++++++------ dlls/msi/string.c | 16 ++++++++-------- dlls/msi/suminfo.c | 8 ++++---- 6 files changed, 28 insertions(+), 28 deletions(-) diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index bc0a3f0..9e2f8ba 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -548,17 +548,17 @@ enum StringPersistence }; extern BOOL msi_addstringW( string_table *st, UINT string_no, const WCHAR *data, int len, UINT refcount, enum StringPersistence persistence ); -extern UINT msi_id2stringW( string_table *st, UINT string_no, LPWSTR buffer, UINT *sz ); -extern UINT msi_id2stringA( string_table *st, UINT string_no, LPSTR buffer, UINT *sz ); +extern UINT msi_id2stringW( const string_table *st, UINT string_no, LPWSTR buffer, UINT *sz ); +extern UINT msi_id2stringA( const string_table *st, UINT string_no, LPSTR buffer, UINT *sz ); -extern UINT msi_string2idW( string_table *st, LPCWSTR buffer, UINT *id ); -extern UINT msi_string2idA( string_table *st, LPCSTR str, UINT *id ); +extern UINT msi_string2idW( const string_table *st, LPCWSTR buffer, UINT *id ); +extern UINT msi_string2idA( const string_table *st, LPCSTR str, UINT *id ); extern VOID msi_destroy_stringtable( string_table *st ); -extern UINT msi_strcmp( string_table *st, UINT lval, UINT rval, UINT *res ); -extern const WCHAR *msi_string_lookup_id( string_table *st, UINT id ); +extern UINT msi_strcmp( const string_table *st, UINT lval, UINT rval, UINT *res ); +extern const WCHAR *msi_string_lookup_id( const string_table *st, UINT id ); extern HRESULT msi_init_string_table( IStorage *stg ); extern string_table *msi_load_string_table( IStorage *stg, UINT *bytes_per_strref ); -extern UINT msi_save_string_table( string_table *st, IStorage *storage ); +extern UINT msi_save_string_table( const string_table *st, IStorage *storage ); extern void msi_table_set_strref(UINT bytes_per_strref); diff --git a/dlls/msi/query.h b/dlls/msi/query.h index 6cb7709..e92b470 100644 --- a/dlls/msi/query.h +++ b/dlls/msi/query.h @@ -98,7 +98,7 @@ UINT MSI_ParseSQL( MSIDATABASE *db, LPCWSTR command, MSIVIEW **phview, UINT TABLE_CreateView( MSIDATABASE *db, LPCWSTR name, MSIVIEW **view ); UINT SELECT_CreateView( MSIDATABASE *db, MSIVIEW **view, MSIVIEW *table, - column_info *columns ); + const column_info *columns ); UINT DISTINCT_CreateView( MSIDATABASE *db, MSIVIEW **view, MSIVIEW *table ); diff --git a/dlls/msi/select.c b/dlls/msi/select.c index cc822a1..44999e3 100644 --- a/dlls/msi/select.c +++ b/dlls/msi/select.c @@ -310,7 +310,7 @@ static UINT SELECT_AddColumn( MSISELECTVIEW *sv, LPCWSTR name ) return ERROR_SUCCESS; } -static int select_count_columns( column_info *col ) +static int select_count_columns( const column_info *col ) { int n; for (n = 0; col; col = col->next) @@ -319,7 +319,7 @@ static int select_count_columns( column_info *col ) } UINT SELECT_CreateView( MSIDATABASE *db, MSIVIEW **view, MSIVIEW *table, - column_info *columns ) + const column_info *columns ) { MSISELECTVIEW *sv = NULL; UINT count = 0, r = ERROR_SUCCESS; diff --git a/dlls/msi/sql.y b/dlls/msi/sql.y index 9cbeb6f..a7180e9 100644 --- a/dlls/msi/sql.y +++ b/dlls/msi/sql.y @@ -51,7 +51,7 @@ typedef struct tag_SQL_input struct list *mem; } SQL_input; -static LPWSTR SQL_getstring( void *info, struct sql_str *str ); +static LPWSTR SQL_getstring( void *info, const struct sql_str *str ); static INT SQL_getint( void *info ); static int sql_lex( void *SQL_lval, SQL_input *info ); @@ -62,9 +62,9 @@ static BOOL SQL_MarkPrimaryKeys( column_info *cols, column_info *keys); static struct expr * EXPR_complex( void *info, struct expr *l, UINT op, struct expr *r ); static struct expr * EXPR_unary( void *info, struct expr *l, UINT op ); -static struct expr * EXPR_column( void *info, column_info *column ); +static struct expr * EXPR_column( void *info, const column_info *column ); static struct expr * EXPR_ival( void *info, int val ); -static struct expr * EXPR_sval( void *info, struct sql_str * ); +static struct expr * EXPR_sval( void *info, const struct sql_str * ); static struct expr * EXPR_wildcard( void *info ); %} @@ -697,7 +697,7 @@ static int sql_lex( void *SQL_lval, SQL_input *sql ) return token; } -LPWSTR SQL_getstring( void *info, struct sql_str *strdata ) +LPWSTR SQL_getstring( void *info, const struct sql_str *strdata ) { LPCWSTR p = strdata->data; UINT len = strdata->len; @@ -779,7 +779,7 @@ static struct expr * EXPR_unary( void *info, struct expr *l, UINT op ) return e; } -static struct expr * EXPR_column( void *info, column_info *column ) +static struct expr * EXPR_column( void *info, const column_info *column ) { struct expr *e = parser_alloc( info, sizeof *e ); if( e ) @@ -801,7 +801,7 @@ static struct expr * EXPR_ival( void *info, int val ) return e; } -static struct expr * EXPR_sval( void *info, struct sql_str *str ) +static struct expr * EXPR_sval( void *info, const struct sql_str *str ) { struct expr *e = parser_alloc( info, sizeof *e ); if( e ) diff --git a/dlls/msi/string.c b/dlls/msi/string.c index e816ffa..932b624 100644 --- a/dlls/msi/string.c +++ b/dlls/msi/string.c @@ -279,7 +279,7 @@ int msi_addstringW( string_table *st, UINT n, const WCHAR *data, int len, UINT r } /* find the string identified by an id - return null if there's none */ -const WCHAR *msi_string_lookup_id( string_table *st, UINT id ) +const WCHAR *msi_string_lookup_id( const string_table *st, UINT id ) { static const WCHAR zero[] = { 0 }; if( id == 0 ) @@ -306,7 +306,7 @@ const WCHAR *msi_string_lookup_id( string_table *st, UINT id ) * The size includes the terminating nul character. Short buffers * will be filled, but not nul terminated. */ -UINT msi_id2stringW( string_table *st, UINT id, LPWSTR buffer, UINT *sz ) +UINT msi_id2stringW( const string_table *st, UINT id, LPWSTR buffer, UINT *sz ) { UINT len; const WCHAR *str; @@ -345,7 +345,7 @@ UINT msi_id2stringW( string_table *st, UINT id, LPWSTR buffer, UINT *sz ) * The size includes the terminating nul character. Short buffers * will be filled, but not nul terminated. */ -UINT msi_id2stringA( string_table *st, UINT id, LPSTR buffer, UINT *sz ) +UINT msi_id2stringA( const string_table *st, UINT id, LPSTR buffer, UINT *sz ) { UINT len; const WCHAR *str; @@ -387,7 +387,7 @@ UINT msi_id2stringA( string_table *st, UINT id, LPSTR buffer, UINT *sz ) * [in] str - string to find in the string table * [out] id - id of the string, if found */ -UINT msi_string2idW( string_table *st, LPCWSTR str, UINT *id ) +UINT msi_string2idW( const string_table *st, LPCWSTR str, UINT *id ) { UINT n, hash = msistring_makehash( str ); msistring *se = st->strings; @@ -404,7 +404,7 @@ UINT msi_string2idW( string_table *st, LPCWSTR str, UINT *id ) return ERROR_INVALID_PARAMETER; } -UINT msi_string2idA( string_table *st, LPCSTR buffer, UINT *id ) +UINT msi_string2idA( const string_table *st, LPCSTR buffer, UINT *id ) { DWORD sz; UINT r = ERROR_INVALID_PARAMETER; @@ -432,7 +432,7 @@ UINT msi_string2idA( string_table *st, LPCSTR buffer, UINT *id ) return r; } -UINT msi_strcmp( string_table *st, UINT lval, UINT rval, UINT *res ) +UINT msi_strcmp( const string_table *st, UINT lval, UINT rval, UINT *res ) { const WCHAR *l_str, *r_str; @@ -450,7 +450,7 @@ UINT msi_strcmp( string_table *st, UINT lval, UINT rval, UINT *res ) return ERROR_SUCCESS; } -static void string_totalsize( string_table *st, UINT *datasize, UINT *poolsize ) +static void string_totalsize( const string_table *st, UINT *datasize, UINT *poolsize ) { UINT i, len, max, holesize; @@ -595,7 +595,7 @@ end: return st; } -UINT msi_save_string_table( string_table *st, IStorage *storage ) +UINT msi_save_string_table( const string_table *st, IStorage *storage ) { UINT i, datasize = 0, poolsize = 0, sz, used, r, codepage, n; UINT ret = ERROR_FUNCTION_FAILED; diff --git a/dlls/msi/suminfo.c b/dlls/msi/suminfo.c index c9344c8..d86a2dc 100644 --- a/dlls/msi/suminfo.c +++ b/dlls/msi/suminfo.c @@ -131,7 +131,7 @@ static UINT get_type( UINT uiProperty ) return VT_EMPTY; } -static UINT get_property_count( PROPVARIANT *property ) +static UINT get_property_count( const PROPVARIANT *property ) { UINT i, n = 0; @@ -293,7 +293,7 @@ static DWORD write_dword( LPBYTE data, DWORD ofs, DWORD val ) return 4; } -static DWORD write_filetime( LPBYTE data, DWORD ofs, LPFILETIME ft ) +static DWORD write_filetime( LPBYTE data, DWORD ofs, const FILETIME *ft ) { write_dword( data, ofs, ft->dwLowDateTime ); write_dword( data, ofs + 4, ft->dwHighDateTime ); @@ -309,7 +309,7 @@ static DWORD write_string( LPBYTE data, DWORD ofs, LPCSTR str ) return (7 + len) & ~3; } -static UINT write_property_to_data( PROPVARIANT *prop, LPBYTE data ) +static UINT write_property_to_data( const PROPVARIANT *prop, LPBYTE data ) { DWORD sz = 0; @@ -336,7 +336,7 @@ static UINT write_property_to_data( PROPVARIANT *prop, LPBYTE data ) return sz; } -static UINT save_summary_info( MSISUMMARYINFO * si, IStream *stm ) +static UINT save_summary_info( const MSISUMMARYINFO * si, IStream *stm ) { UINT ret = ERROR_FUNCTION_FAILED; PROPERTYSETHEADER set_hdr;

1 0

Francois Gouget : msdmo: Improve the prototypes Win64 compatibility by replacing long with LONG.
by Alexandre Julliard June 13, 2007

June 13, 2007

Module: wine Branch: master Commit: e84562a15a58b274054f4ec5c62cc8ffdad9d766 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e84562a15a58b274054f4ec5c… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Jun 12 17:52:20 2007 +0200 msdmo: Improve the prototypes Win64 compatibility by replacing long with LONG. --- dlls/msdmo/dmoreg.c | 8 ++++---- include/dmoreg.h | 4 ++-- tools/winapi/win32.api | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/msdmo/dmoreg.c b/dlls/msdmo/dmoreg.c index 74aa1b4..ff0440a 100644 --- a/dlls/msdmo/dmoreg.c +++ b/dlls/msdmo/dmoreg.c @@ -650,11 +650,11 @@ static const IEnumDMOVtbl edmovt = }; -HRESULT WINAPI DMOGetTypes(REFCLSID a, unsigned long b, unsigned long* c, - DMO_PARTIAL_MEDIATYPE* d, unsigned long e, - unsigned long* f, DMO_PARTIAL_MEDIATYPE* g) +HRESULT WINAPI DMOGetTypes(REFCLSID a, ULONG b, ULONG* c, + DMO_PARTIAL_MEDIATYPE* d, ULONG e, + ULONG* f, DMO_PARTIAL_MEDIATYPE* g) { - FIXME("(%p,%lu,%p,%p,%lu,%p,%p),stub!\n",a,b,c,d,e,f,g); + FIXME("(%p,%u,%p,%p,%u,%p,%p),stub!\n",a,b,c,d,e,f,g); return E_NOTIMPL; } diff --git a/include/dmoreg.h b/include/dmoreg.h index 0852346..c352790 100644 --- a/include/dmoreg.h +++ b/include/dmoreg.h @@ -42,8 +42,8 @@ HRESULT WINAPI DMORegister(LPCWSTR,REFCLSID,REFGUID,DWORD,DWORD,const DMO_PARTIA HRESULT WINAPI DMOUnregister(REFCLSID,REFGUID); HRESULT WINAPI DMOEnum(REFGUID,DWORD,DWORD,const DMO_PARTIAL_MEDIATYPE*,DWORD, const DMO_PARTIAL_MEDIATYPE*,IEnumDMO**); -HRESULT WINAPI DMOGetTypes(REFCLSID,unsigned long,unsigned long*,DMO_PARTIAL_MEDIATYPE*, - unsigned long,unsigned long*,DMO_PARTIAL_MEDIATYPE*); +HRESULT WINAPI DMOGetTypes(REFCLSID,ULONG,ULONG*,DMO_PARTIAL_MEDIATYPE*, + ULONG,ULONG*,DMO_PARTIAL_MEDIATYPE*); HRESULT WINAPI DMOGetName(REFCLSID,WCHAR*); DEFINE_GUID(DMOCATEGORY_AUDIO_DECODER, diff --git a/tools/winapi/win32.api b/tools/winapi/win32.api index 1039cbd..989755f 100644 --- a/tools/winapi/win32.api +++ b/tools/winapi/win32.api @@ -2305,7 +2305,7 @@ PWSTR DWORD HRESULT -unsigned long +ULONG %ptr @@ -2315,7 +2315,7 @@ DMO_PARTIAL_MEDIATYPE * IEnumDMO ** REFCLSID REFGUID -unsigned long * +ULONG * %wstr

1 0