wine-commits November 2008

wine-commits@winehq.org

2 participants
734 discussions

Francois Gouget : mlang: Remove WINAPI on static functions where not needed .
by Alexandre Julliard 28 Nov '08

28 Nov '08

Module: wine Branch: master Commit: 194fd077de7542e3762060576b4543d36af2aa00 URL: http://source.winehq.org/git/wine.git/?a=commit;h=194fd077de7542e3762060576… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Nov 26 17:16:06 2008 +0100 mlang: Remove WINAPI on static functions where not needed. --- dlls/mlang/mlang.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/mlang/mlang.c b/dlls/mlang/mlang.c index b92bb7b..36ecea0 100644 --- a/dlls/mlang/mlang.c +++ b/dlls/mlang/mlang.c @@ -1393,12 +1393,12 @@ typedef struct tagMLang_impl DWORD total_cp, total_scripts; } MLang_impl; -static ULONG WINAPI MLang_AddRef( MLang_impl* This) +static ULONG MLang_AddRef( MLang_impl* This) { return InterlockedIncrement(&This->ref); } -static ULONG WINAPI MLang_Release( MLang_impl* This ) +static ULONG MLang_Release( MLang_impl* This ) { ULONG ref = InterlockedDecrement(&This->ref); @@ -1413,7 +1413,7 @@ static ULONG WINAPI MLang_Release( MLang_impl* This ) return ref; } -static HRESULT WINAPI MLang_QueryInterface( +static HRESULT MLang_QueryInterface( MLang_impl* This, REFIID riid, void** ppvObject)

1 0

Francois Gouget : mapi32: Remove WINAPI on static functions where not needed.
by Alexandre Julliard 28 Nov '08

28 Nov '08

Module: wine Branch: master Commit: 54af22f634b21fd08d2ec0aa14f2803c3103b12a URL: http://source.winehq.org/git/wine.git/?a=commit;h=54af22f634b21fd08d2ec0aa1… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Nov 26 17:16:15 2008 +0100 mapi32: Remove WINAPI on static functions where not needed. --- dlls/mapi32/prop.c | 29 ++++++++++++++--------------- 1 files changed, 14 insertions(+), 15 deletions(-) diff --git a/dlls/mapi32/prop.c b/dlls/mapi32/prop.c index bd90791..1a157da 100644 --- a/dlls/mapi32/prop.c +++ b/dlls/mapi32/prop.c @@ -1485,8 +1485,7 @@ static inline void IMAPIPROP_Unlock(IPropDataImpl *This) * - IUnknown() : The default interface for all COM-Objects. * - IMAPIProp() : The default Mapi interface for manipulating object properties. */ -static inline HRESULT WINAPI -IMAPIProp_fnQueryInterface(LPMAPIPROP iface, REFIID riid, LPVOID *ppvObj) +static inline HRESULT IMAPIProp_fnQueryInterface(LPMAPIPROP iface, REFIID riid, LPVOID *ppvObj) { IPropDataImpl *This = (IPropDataImpl*)iface; @@ -1517,7 +1516,7 @@ IMAPIProp_fnQueryInterface(LPMAPIPROP iface, REFIID riid, LPVOID *ppvObj) * Inherited method from the IUnknown Interface. * See IUnknown_AddRef. */ -static inline ULONG WINAPI IMAPIProp_fnAddRef(LPMAPIPROP iface) +static inline ULONG IMAPIProp_fnAddRef(LPMAPIPROP iface) { IPropDataImpl *This = (IPropDataImpl*)iface; @@ -1532,7 +1531,7 @@ static inline ULONG WINAPI IMAPIProp_fnAddRef(LPMAPIPROP iface) * Inherited method from the IUnknown Interface. * See IUnknown_Release. */ -static inline ULONG WINAPI IMAPIProp_fnRelease(LPMAPIPROP iface) +static inline ULONG IMAPIProp_fnRelease(LPMAPIPROP iface) { IPropDataImpl *This = (IPropDataImpl*)iface; LONG lRef; @@ -1582,7 +1581,7 @@ static inline ULONG WINAPI IMAPIProp_fnRelease(LPMAPIPROP iface) * - It is possible for this function to succeed and set *lppError to NULL, * if there is no further information to report about hRes. */ -static inline HRESULT WINAPI +static inline HRESULT IMAPIProp_fnGetLastError(LPMAPIPROP iface, HRESULT hRes, ULONG ulFlags, LPMAPIERROR *lppError) { @@ -1608,7 +1607,7 @@ IMAPIProp_fnGetLastError(LPMAPIPROP iface, HRESULT hRes, * Success: S_OK. Any outstanding changes are committed to the object. * Failure: An HRESULT error code describing the error. */ -static inline HRESULT WINAPI +static inline HRESULT IMAPIProp_fnSaveChanges(LPMAPIPROP iface, ULONG ulFlags) { TRACE("(%p,0x%08X)\n", iface, ulFlags); @@ -1642,7 +1641,7 @@ IMAPIProp_fnSaveChanges(LPMAPIPROP iface, ULONG ulFlags) * retrieved from iface are present in lppProps with their type * changed to PT_ERROR and Id unchanged. */ -static inline HRESULT WINAPI +static inline HRESULT IMAPIProp_fnGetProps(LPMAPIPROP iface, LPSPropTagArray lpTags, ULONG ulFlags, ULONG *lpCount, LPSPropValue *lppProps) { @@ -1709,7 +1708,7 @@ IMAPIProp_fnGetProps(LPMAPIPROP iface, LPSPropTagArray lpTags, * MAPI_E_BAD_CHARWIDTH, if Ascii or Unicode strings are requested * and that type of string is not supported. */ -static inline HRESULT WINAPI +static inline HRESULT IMAPIProp_fnGetPropList(LPMAPIPROP iface, ULONG ulFlags, LPSPropTagArray *lppTags) { @@ -1756,7 +1755,7 @@ IMAPIProp_fnGetPropList(LPMAPIPROP iface, ULONG ulFlags, * RETURNS * An HRESULT success/failure code. */ -static inline HRESULT WINAPI +static inline HRESULT IMAPIProp_fnOpenProperty(LPMAPIPROP iface, ULONG ulPropTag, LPCIID iid, ULONG ulOpts, ULONG ulFlags, LPUNKNOWN *lpUnk) { @@ -1782,7 +1781,7 @@ IMAPIProp_fnOpenProperty(LPMAPIPROP iface, ULONG ulPropTag, LPCIID iid, * exist, or changed to the values in lpProps if they do * Failure: An HRESULT error code describing the error */ -static inline HRESULT WINAPI +static inline HRESULT IMAPIProp_fnSetProps(LPMAPIPROP iface, ULONG ulValues, LPSPropValue lpProps, LPSPropProblemArray *lppProbs) { @@ -1869,7 +1868,7 @@ IMAPIProp_fnSetProps(LPMAPIPROP iface, ULONG ulValues, * in lpTags but not in iface. * - lppProbs should be deleted with MAPIFreeBuffer() if returned. */ -static inline HRESULT WINAPI +static inline HRESULT IMAPIProp_fnDeleteProps(LPMAPIPROP iface, LPSPropTagArray lpTags, LPSPropProblemArray *lppProbs) { @@ -1953,7 +1952,7 @@ IMAPIProp_fnDeleteProps(LPMAPIPROP iface, LPSPropTagArray lpTags, * RETURNS * An HRESULT success/failure code. */ -static inline HRESULT WINAPI +static inline HRESULT IMAPIProp_fnCopyTo(LPMAPIPROP iface, ULONG niids, LPCIID lpiidExcl, LPSPropTagArray lpPropsExcl, ULONG ulParam, LPMAPIPROGRESS lpIProgress, LPCIID lpIfaceIid, LPVOID lpDstObj, @@ -1973,7 +1972,7 @@ IMAPIProp_fnCopyTo(LPMAPIPROP iface, ULONG niids, LPCIID lpiidExcl, * RETURNS * An HRESULT success/failure code. */ -static inline HRESULT WINAPI +static inline HRESULT IMAPIProp_fnCopyProps(LPMAPIPROP iface, LPSPropTagArray lpInclProps, ULONG ulParam, LPMAPIPROGRESS lpIProgress, LPCIID lpIface, LPVOID lpDstObj, ULONG ulFlags, @@ -2008,7 +2007,7 @@ IMAPIProp_fnCopyProps(LPMAPIPROP iface, LPSPropTagArray lpInclProps, * MAPI_W_ERRORS_RETURNED if not all properties were retrieved * successfully. */ -static inline HRESULT WINAPI +static inline HRESULT IMAPIProp_fnGetNamesFromIDs(LPMAPIPROP iface, LPSPropTagArray *lppPropTags, LPGUID iid, ULONG ulFlags, ULONG *lpCount, LPMAPINAMEID **lpppNames) @@ -2039,7 +2038,7 @@ IMAPIProp_fnGetNamesFromIDs(LPMAPIPROP iface, LPSPropTagArray *lppPropTags, * MAPI_W_ERRORS_RETURNED if not all properties were retrieved * successfully. */ -static inline HRESULT WINAPI +static inline HRESULT IMAPIProp_fnGetIDsFromNames(LPMAPIPROP iface, ULONG ulNames, LPMAPINAMEID *lppNames, ULONG ulFlags, LPSPropTagArray *lppPropTags)

1 0

Francois Gouget : msi: Remove WINAPI on static functions where not needed.
by Alexandre Julliard 28 Nov '08

28 Nov '08

Module: wine Branch: master Commit: d7119f2b736013326dbe14bc30aa12e3c7454305 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d7119f2b736013326dbe14bc3… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Nov 26 17:15:59 2008 +0100 msi: Remove WINAPI on static functions where not needed. --- dlls/msi/automation.c | 2 +- dlls/msi/custom.c | 6 +++--- dlls/msi/install.c | 4 ++-- dlls/msi/msi.c | 12 ++++++------ dlls/msi/registry.c | 2 +- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/dlls/msi/automation.c b/dlls/msi/automation.c index 834e406..3b01266 100644 --- a/dlls/msi/automation.c +++ b/dlls/msi/automation.c @@ -708,7 +708,7 @@ static const struct IEnumVARIANTVtbl ListEnumerator_Vtbl = /* Helper function that copies a passed parameter instead of using VariantChangeType like the actual DispGetParam. This function is only for VARIANT type parameters that have several types that cannot be properly discriminated using DispGetParam/VariantChangeType. */ -static HRESULT WINAPI DispGetParam_CopyOnly( +static HRESULT DispGetParam_CopyOnly( DISPPARAMS *pdispparams, /* [in] Parameter list */ UINT *position, /* [in] Position of parameter to copy in pdispparams; on return will contain calculated position */ VARIANT *pvarResult) /* [out] Destination for resulting variant */ diff --git a/dlls/msi/custom.c b/dlls/msi/custom.c index 71864d5..66a7ce6 100644 --- a/dlls/msi/custom.c +++ b/dlls/msi/custom.c @@ -659,7 +659,7 @@ static UINT get_action_info( const GUID *guid, INT *type, MSIHANDLE *handle, return ERROR_SUCCESS; } -static DWORD WINAPI ACTION_CallDllFunction( const GUID *guid ) +static DWORD ACTION_CallDllFunction( const GUID *guid ) { MsiCustomActionEntryPoint fn; MSIHANDLE hPackage, handle; @@ -744,7 +744,7 @@ static DWORD WINAPI DllThread( LPVOID arg ) return rc; } -static DWORD WINAPI ACTION_CAInstallPackage(const GUID *guid) +static DWORD ACTION_CAInstallPackage(const GUID *guid) { msi_custom_action_info *info; UINT r = ERROR_FUNCTION_FAILED; @@ -1147,7 +1147,7 @@ static UINT HANDLE_CustomType34(MSIPACKAGE *package, LPCWSTR source, return wait_process_handle(package, type, info.hProcess, action); } -static DWORD WINAPI ACTION_CallScript( const GUID *guid ) +static DWORD ACTION_CallScript( const GUID *guid ) { msi_custom_action_info *info; MSIHANDLE hPackage; diff --git a/dlls/msi/install.c b/dlls/msi/install.c index 95fe51a..bcb68c3 100644 --- a/dlls/msi/install.c +++ b/dlls/msi/install.c @@ -215,8 +215,8 @@ UINT msi_strcpy_to_awstring( LPCWSTR str, awstring *awbuf, DWORD *sz ) /*********************************************************************** * MsiGetTargetPath (internal) */ -static UINT WINAPI MSI_GetTargetPath( MSIHANDLE hInstall, LPCWSTR szFolder, - awstring *szPathBuf, LPDWORD pcchPathBuf ) +static UINT MSI_GetTargetPath( MSIHANDLE hInstall, LPCWSTR szFolder, + awstring *szPathBuf, LPDWORD pcchPathBuf ) { MSIPACKAGE *package; LPWSTR path; diff --git a/dlls/msi/msi.c b/dlls/msi/msi.c index 2b3b635..68c0706 100644 --- a/dlls/msi/msi.c +++ b/dlls/msi/msi.c @@ -690,8 +690,8 @@ static LPWSTR msi_reg_get_value(HKEY hkey, LPCWSTR name, DWORD *type) return strdupW(temp); } -static UINT WINAPI MSI_GetProductInfo(LPCWSTR szProduct, LPCWSTR szAttribute, - awstring *szValue, LPDWORD pcchValueBuf) +static UINT MSI_GetProductInfo(LPCWSTR szProduct, LPCWSTR szAttribute, + awstring *szValue, LPDWORD pcchValueBuf) { UINT r = ERROR_UNKNOWN_PROPERTY; HKEY prodkey, userdata, source; @@ -1748,8 +1748,8 @@ UINT WINAPI MsiVerifyPackageW( LPCWSTR szPackage ) return r; } -static INSTALLSTATE WINAPI MSI_GetComponentPath(LPCWSTR szProduct, LPCWSTR szComponent, - awstring* lpPathBuf, LPDWORD pcchBuf) +static INSTALLSTATE MSI_GetComponentPath(LPCWSTR szProduct, LPCWSTR szComponent, + awstring* lpPathBuf, LPDWORD pcchBuf) { WCHAR squished_pc[GUID_SIZE]; WCHAR squished_comp[GUID_SIZE]; @@ -2292,7 +2292,7 @@ INSTALLSTATE WINAPI MsiUseFeatureA( LPCSTR szProduct, LPCSTR szFeature ) /*********************************************************************** * MSI_ProvideQualifiedComponentEx [internal] */ -static UINT WINAPI MSI_ProvideQualifiedComponentEx(LPCWSTR szComponent, +static UINT MSI_ProvideQualifiedComponentEx(LPCWSTR szComponent, LPCWSTR szQualifier, DWORD dwInstallMode, LPCWSTR szProduct, DWORD Unused1, DWORD Unused2, awstring *lpPathBuf, LPDWORD pcchPathBuf) @@ -2417,7 +2417,7 @@ UINT WINAPI MsiProvideQualifiedComponentA( LPCSTR szComponent, /*********************************************************************** * MSI_GetUserInfo [internal] */ -static USERINFOSTATE WINAPI MSI_GetUserInfo(LPCWSTR szProduct, +static USERINFOSTATE MSI_GetUserInfo(LPCWSTR szProduct, awstring *lpUserNameBuf, LPDWORD pcchUserNameBuf, awstring *lpOrgNameBuf, LPDWORD pcchOrgNameBuf, awstring *lpSerialBuf, LPDWORD pcchSerialBuf) diff --git a/dlls/msi/registry.c b/dlls/msi/registry.c index 26b872d..2568e7e 100644 --- a/dlls/msi/registry.c +++ b/dlls/msi/registry.c @@ -1436,7 +1436,7 @@ UINT WINAPI MsiEnumClientsW(LPCWSTR szComponent, DWORD index, LPWSTR szProduct) return r; } -static UINT WINAPI MSI_EnumComponentQualifiers( LPCWSTR szComponent, DWORD iIndex, +static UINT MSI_EnumComponentQualifiers( LPCWSTR szComponent, DWORD iIndex, awstring *lpQualBuf, LPDWORD pcchQual, awstring *lpAppBuf, LPDWORD pcchAppBuf ) {

1 0

Francois Gouget : msvcrt: Remove WINAPI on static functions where not needed.
by Alexandre Julliard 28 Nov '08

28 Nov '08

Module: wine Branch: master Commit: c232cf1050fc97d9f13b5bdb2c2dba610f05ae23 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c232cf1050fc97d9f13b5bdb2… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Nov 26 17:15:49 2008 +0100 msvcrt: Remove WINAPI on static functions where not needed. --- dlls/msvcrt/cpp.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msvcrt/cpp.c b/dlls/msvcrt/cpp.c index 8328497..a8687e3 100644 --- a/dlls/msvcrt/cpp.c +++ b/dlls/msvcrt/cpp.c @@ -131,7 +131,7 @@ static void dump_obj_locator( const rtti_object_locator *ptr ) } /* Internal common ctor for exception */ -static void WINAPI EXCEPTION_ctor(exception *_this, const char** name) +static void EXCEPTION_ctor(exception *_this, const char** name) { _this->vtable = &MSVCRT_exception_vtable; if (*name)

1 0

Francois Gouget : ntdll: Remove WINAPI on static functions where not needed .
by Alexandre Julliard 28 Nov '08

28 Nov '08

Module: wine Branch: master Commit: e72339561717c2705f3c15e91d3b06fad3b652b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e72339561717c2705f3c15e91… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Nov 26 17:15:40 2008 +0100 ntdll: Remove WINAPI on static functions where not needed. --- dlls/ntdll/rtlbitmap.c | 6 +++--- dlls/ntdll/serial.c | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/ntdll/rtlbitmap.c b/dlls/ntdll/rtlbitmap.c index 55f8048..3656d24 100644 --- a/dlls/ntdll/rtlbitmap.c +++ b/dlls/ntdll/rtlbitmap.c @@ -948,9 +948,9 @@ ULONG WINAPI RtlFindLastBackwardRunClear(PCRTL_BITMAP lpBits, ULONG ulStart, PUL * * Internal implementation of RtlFindSetRuns/RtlFindClearRuns. */ -static ULONG WINAPI NTDLL_FindRuns(PCRTL_BITMAP lpBits, PRTL_BITMAP_RUN lpSeries, - ULONG ulCount, BOOLEAN bLongest, - ULONG (*fn)(PCRTL_BITMAP,ULONG,PULONG)) +static ULONG NTDLL_FindRuns(PCRTL_BITMAP lpBits, PRTL_BITMAP_RUN lpSeries, + ULONG ulCount, BOOLEAN bLongest, + ULONG (*fn)(PCRTL_BITMAP,ULONG,PULONG)) { BOOL bNeedSort = ulCount > 1 ? TRUE : FALSE; ULONG ulPos = 0, ulRuns = 0; diff --git a/dlls/ntdll/serial.c b/dlls/ntdll/serial.c index bdb47e4..edad40e 100644 --- a/dlls/ntdll/serial.c +++ b/dlls/ntdll/serial.c @@ -891,10 +891,10 @@ static NTSTATUS get_irq_info(int fd, serial_irq_info *irq_info) } -static DWORD WINAPI check_events(int fd, DWORD mask, - const serial_irq_info *new, - const serial_irq_info *old, - DWORD new_mstat, DWORD old_mstat) +static DWORD check_events(int fd, DWORD mask, + const serial_irq_info *new, + const serial_irq_info *old, + DWORD new_mstat, DWORD old_mstat) { DWORD ret = 0, queue;

1 0

Francois Gouget : dxdiagn: Remove WINAPI on static functions where not needed.
by Alexandre Julliard 28 Nov '08

28 Nov '08

Module: wine Branch: master Commit: a6ba11a453d72a8fd6a6a0cacb554f5e4998c43c URL: http://source.winehq.org/git/wine.git/?a=commit;h=a6ba11a453d72a8fd6a6a0cac… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Nov 26 17:15:15 2008 +0100 dxdiagn: Remove WINAPI on static functions where not needed. --- dlls/dxdiagn/container.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/dxdiagn/container.c b/dlls/dxdiagn/container.c index 23245ae..621579b 100644 --- a/dlls/dxdiagn/container.c +++ b/dlls/dxdiagn/container.c @@ -110,7 +110,7 @@ static HRESULT WINAPI IDxDiagContainerImpl_EnumChildContainerNames(PDXDIAGCONTAI return E_INVALIDARG; } -static HRESULT WINAPI IDxDiagContainerImpl_GetChildContainerInternal(PDXDIAGCONTAINER iface, LPCWSTR pwszContainer, IDxDiagContainer** ppInstance) { +static HRESULT IDxDiagContainerImpl_GetChildContainerInternal(PDXDIAGCONTAINER iface, LPCWSTR pwszContainer, IDxDiagContainer** ppInstance) { IDxDiagContainerImpl *This = (IDxDiagContainerImpl *)iface; IDxDiagContainerImpl_SubContainer* p = NULL;

1 0

Francois Gouget : objsel: Remove WINAPI on static functions where not needed.
by Alexandre Julliard 28 Nov '08

28 Nov '08

Module: wine Branch: master Commit: 251e42603b44d8cba11c3ba758614332baf5b333 URL: http://source.winehq.org/git/wine.git/?a=commit;h=251e42603b44d8cba11c3ba75… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Nov 26 17:15:25 2008 +0100 objsel: Remove WINAPI on static functions where not needed. --- dlls/objsel/objsel.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/objsel/objsel.c b/dlls/objsel/objsel.c index e99aaef..06fbf4d 100644 --- a/dlls/objsel/objsel.c +++ b/dlls/objsel/objsel.c @@ -72,7 +72,7 @@ HRESULT WINAPI DllCanUnloadNow(void) /********************************************************************** * OBJSEL_IDsObjectPicker_Destroy (also IUnknown) */ -static VOID WINAPI OBJSEL_IDsObjectPicker_Destroy(IDsObjectPickerImpl *This) +static VOID OBJSEL_IDsObjectPicker_Destroy(IDsObjectPickerImpl *This) { HeapFree(GetProcessHeap(), 0,

1 0

Henri Verbeet : wined3d: Const correctness fixes for surface_base.c.
by Alexandre Julliard 28 Nov '08

28 Nov '08

Module: wine Branch: master Commit: 5326038aa881c5c728bab9bc44464eab6bd44bc1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5326038aa881c5c728bab9bc4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Nov 26 16:14:40 2008 +0100 wined3d: Const correctness fixes for surface_base.c. --- dlls/wined3d/surface_base.c | 50 +++++++++++++++++++++++++----------------- 1 files changed, 30 insertions(+), 20 deletions(-) diff --git a/dlls/wined3d/surface_base.c b/dlls/wined3d/surface_base.c index 64f05e2..41668ae 100644 --- a/dlls/wined3d/surface_base.c +++ b/dlls/wined3d/surface_base.c @@ -685,14 +685,15 @@ HRESULT IWineD3DBaseSurfaceImpl_CreateDIBSection(IWineD3DSurface *iface) { return WINED3D_OK; } -void convert_r32f_r16f(BYTE *src, BYTE *dst, DWORD pitch_in, DWORD pitch_out, unsigned int w, unsigned int h) { +void convert_r32f_r16f(const BYTE *src, BYTE *dst, DWORD pitch_in, DWORD pitch_out, unsigned int w, unsigned int h) +{ unsigned int x, y; - float *src_f; + const float *src_f; unsigned short *dst_s; TRACE("Converting %dx%d pixels, pitches %d %d\n", w, h, pitch_in, pitch_out); for(y = 0; y < h; y++) { - src_f = (float *) (src + y * pitch_in); + src_f = (const float *)(src + y * pitch_in); dst_s = (unsigned short *) (dst + y * pitch_out); for(x = 0; x < w; x++) { dst_s[x] = float_32_to_16(src_f + x); @@ -702,14 +703,16 @@ void convert_r32f_r16f(BYTE *src, BYTE *dst, DWORD pitch_in, DWORD pitch_out, un struct d3dfmt_convertor_desc { WINED3DFORMAT from, to; - void (*convert)(BYTE *src, BYTE *dst, DWORD pitch_in, DWORD pitch_out, unsigned int w, unsigned int h); + void (*convert)(const BYTE *src, BYTE *dst, DWORD pitch_in, DWORD pitch_out, unsigned int w, unsigned int h); }; -struct d3dfmt_convertor_desc convertors[] = { +const struct d3dfmt_convertor_desc convertors[] = +{ {WINED3DFMT_R32F, WINED3DFMT_R16F, convert_r32f_r16f}, }; -static inline struct d3dfmt_convertor_desc *find_convertor(WINED3DFORMAT from, WINED3DFORMAT to) { +static inline const struct d3dfmt_convertor_desc *find_convertor(WINED3DFORMAT from, WINED3DFORMAT to) +{ unsigned int i; for(i = 0; i < (sizeof(convertors) / sizeof(convertors[0])); i++) { if(convertors[i].from == from && convertors[i].to == to) { @@ -732,7 +735,7 @@ static inline struct d3dfmt_convertor_desc *find_convertor(WINED3DFORMAT from, W *****************************************************************************/ IWineD3DSurfaceImpl *surface_convert_format(IWineD3DSurfaceImpl *source, WINED3DFORMAT to_fmt) { IWineD3DSurface *ret = NULL; - struct d3dfmt_convertor_desc *conv; + const struct d3dfmt_convertor_desc *conv; WINED3DLOCKED_RECT lock_src, lock_dst; HRESULT hr; @@ -877,7 +880,8 @@ HRESULT WINAPI IWineD3DBaseSurfaceImpl_Blt(IWineD3DSurface *iface, const RECT *D int bpp, srcheight, srcwidth, dstheight, dstwidth, width; int x, y; const StaticPixelFormatDesc *sEntry, *dEntry; - LPBYTE dbuf, sbuf; + const BYTE *sbuf; + BYTE *dbuf; TRACE("(%p)->(%p,%p,%p,%x,%p)\n", This, DestRect, Src, SrcRect, Flags, DDBltFx); if (TRACE_ON(d3d_surface)) @@ -1168,7 +1172,7 @@ HRESULT WINAPI IWineD3DBaseSurfaceImpl_Blt(IWineD3DSurface *iface, const RECT *D /* Now the 'with source' blits */ if (Src) { - LPBYTE sbase; + const BYTE *sbase; int sx, xinc, sy, yinc; if (!dstwidth || !dstheight) /* hmm... stupid program ? */ @@ -1247,7 +1251,8 @@ HRESULT WINAPI IWineD3DBaseSurfaceImpl_Blt(IWineD3DSurface *iface, const RECT *D else { #define STRETCH_ROW(type) { \ - type *s = (type *) sbuf, *d = (type *) dbuf; \ + const type *s = (const type *)sbuf; \ + type *d = (type *)dbuf; \ for (x = sx = 0; x < dstwidth; x++, sx += xinc) \ d[x] = s[sx >> 16]; \ break; } @@ -1259,7 +1264,8 @@ HRESULT WINAPI IWineD3DBaseSurfaceImpl_Blt(IWineD3DSurface *iface, const RECT *D case 4: STRETCH_ROW(DWORD) case 3: { - LPBYTE s,d = dbuf; + const BYTE *s; + BYTE *d = dbuf; for (x = sx = 0; x < dstwidth; x++, sx+= xinc) { DWORD pixel; @@ -1413,9 +1419,10 @@ HRESULT WINAPI IWineD3DBaseSurfaceImpl_Blt(IWineD3DSurface *iface, const RECT *D } #define COPY_COLORKEY_FX(type) { \ - type *s, *d = (type *) dbuf, *dx, tmp; \ + const type *s; \ + type *d = (type *)dbuf, *dx, tmp; \ for (y = sy = 0; y < dstheight; y++, sy += yinc) { \ - s = (type*)(sbase + (sy >> 16) * slock.Pitch); \ + s = (const type*)(sbase + (sy >> 16) * slock.Pitch); \ dx = d; \ for (x = sx = 0; x < dstwidth; x++, sx += xinc) { \ tmp = s[sx >> 16]; \ @@ -1435,7 +1442,8 @@ HRESULT WINAPI IWineD3DBaseSurfaceImpl_Blt(IWineD3DSurface *iface, const RECT *D case 4: COPY_COLORKEY_FX(DWORD) case 3: { - LPBYTE s,d = dbuf, dx; + const BYTE *s; + BYTE *d = dbuf, *dx; for (y = sy = 0; y < dstheight; y++, sy += yinc) { sbuf = sbase + (sy >> 16) * slock.Pitch; @@ -1512,7 +1520,8 @@ HRESULT WINAPI IWineD3DBaseSurfaceImpl_BltFast(IWineD3DSurface *iface, DWORD dst HRESULT ret = WINED3D_OK; RECT rsrc2; RECT lock_src, lock_dst, lock_union; - BYTE *sbuf, *dbuf; + const BYTE *sbuf; + BYTE *dbuf; const StaticPixelFormatDesc *sEntry, *dEntry; if (TRACE_ON(d3d_surface)) @@ -1662,15 +1671,15 @@ HRESULT WINAPI IWineD3DBaseSurfaceImpl_BltFast(IWineD3DSurface *iface, DWORD dst } #define COPYBOX_COLORKEY(type) { \ - type *d, *s, tmp; \ - s = (type *) sbuf; \ - d = (type *) dbuf; \ + const type *s = (const type *)sbuf; \ + type *d = (type *)dbuf; \ + type tmp; \ for (y = 0; y < h; y++) { \ for (x = 0; x < w; x++) { \ tmp = s[x]; \ if (tmp < keylow || tmp > keyhigh) d[x] = tmp; \ } \ - s = (type *)((BYTE *)s + slock.Pitch); \ + s = (const type *)((const BYTE *)s + slock.Pitch); \ d = (type *)((BYTE *)d + dlock.Pitch); \ } \ break; \ @@ -1682,7 +1691,8 @@ HRESULT WINAPI IWineD3DBaseSurfaceImpl_BltFast(IWineD3DSurface *iface, DWORD dst case 4: COPYBOX_COLORKEY(DWORD) case 3: { - BYTE *d, *s; + const BYTE *s; + BYTE *d; DWORD tmp; s = sbuf; d = dbuf;

1 0

Henri Verbeet : wined3d: Make minMipLookup_noFilter and magLookup_noFilter const.
by Alexandre Julliard 28 Nov '08

28 Nov '08

Module: wine Branch: master Commit: c7880e89165cc7e471c5db9114449b6a7fb4e818 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c7880e89165cc7e471c5db911… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Nov 26 16:14:40 2008 +0100 wined3d: Make minMipLookup_noFilter and magLookup_noFilter const. Note that minMipLookup and magLookup aren't particularly safe to use, they're global arrays initialized from IWineD3DImpl_FillGLCaps(). The same goes for the other global dynamic lookup tables. --- dlls/wined3d/basetexture.c | 6 ++-- dlls/wined3d/device.c | 28 ++++++++++++------------ dlls/wined3d/directx.c | 46 +++++++++++++++++++++------------------ dlls/wined3d/surface.c | 4 +- dlls/wined3d/wined3d_private.h | 21 +++++++++++------- 5 files changed, 57 insertions(+), 48 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c7880e89165cc7e471c5d…

1 0

Henri Verbeet : wined3d: Const correctness fixes for device.c.
by Alexandre Julliard 28 Nov '08

28 Nov '08

Module: wine Branch: master Commit: 449c219eb0aff21e35c26aec062c152e29e747fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=449c219eb0aff21e35c26aec0… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Nov 26 16:14:39 2008 +0100 wined3d: Const correctness fixes for device.c. --- dlls/wined3d/device.c | 56 +++++++++++++++++++++++++++------------------- include/wine/wined3d.idl | 2 +- 2 files changed, 34 insertions(+), 24 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 5f7ba6e..2d891ff 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1934,7 +1934,9 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreatePixelShader(IWineD3DDevice *iface return hr; } -static HRESULT WINAPI IWineD3DDeviceImpl_CreatePalette(IWineD3DDevice *iface, DWORD Flags, PALETTEENTRY *PalEnt, IWineD3DPalette **Palette, IUnknown *Parent) { +static HRESULT WINAPI IWineD3DDeviceImpl_CreatePalette(IWineD3DDevice *iface, DWORD Flags, + const PALETTEENTRY *PalEnt, IWineD3DPalette **Palette, IUnknown *Parent) +{ IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *) iface; IWineD3DPaletteImpl *object; HRESULT hr; @@ -2773,7 +2775,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_GetTransform(IWineD3DDevice *iface, WIN } static HRESULT WINAPI IWineD3DDeviceImpl_MultiplyTransform(IWineD3DDevice *iface, WINED3DTRANSFORMSTATETYPE State, CONST WINED3DMATRIX* pMatrix) { - WINED3DMATRIX *mat = NULL; + const WINED3DMATRIX *mat = NULL; WINED3DMATRIX temp; /* Note: Using 'updateStateBlock' rather than 'stateblock' in the code @@ -3807,7 +3809,8 @@ static void device_map_fixed_function_samplers(IWineD3DDeviceImpl *This) { } static void device_map_psamplers(IWineD3DDeviceImpl *This) { - DWORD *sampler_tokens = ((IWineD3DPixelShaderImpl *)This->stateBlock->pixelShader)->baseShader.reg_maps.samplers; + const DWORD *sampler_tokens = + ((IWineD3DPixelShaderImpl *)This->stateBlock->pixelShader)->baseShader.reg_maps.samplers; int i; for (i = 0; i < MAX_FRAGMENT_SAMPLERS; ++i) { @@ -3821,7 +3824,9 @@ static void device_map_psamplers(IWineD3DDeviceImpl *This) { } } -static BOOL device_unit_free_for_vs(IWineD3DDeviceImpl *This, DWORD *pshader_sampler_tokens, DWORD *vshader_sampler_tokens, int unit) { +static BOOL device_unit_free_for_vs(IWineD3DDeviceImpl *This, const DWORD *pshader_sampler_tokens, + const DWORD *vshader_sampler_tokens, int unit) +{ int current_mapping = This->rev_tex_unit_map[unit]; if (current_mapping == -1) { @@ -3846,8 +3851,9 @@ static BOOL device_unit_free_for_vs(IWineD3DDeviceImpl *This, DWORD *pshader_sam } static void device_map_vsamplers(IWineD3DDeviceImpl *This, BOOL ps) { - DWORD *vshader_sampler_tokens = ((IWineD3DVertexShaderImpl *)This->stateBlock->vertexShader)->baseShader.reg_maps.samplers; - DWORD *pshader_sampler_tokens = NULL; + const DWORD *vshader_sampler_tokens = + ((IWineD3DVertexShaderImpl *)This->stateBlock->vertexShader)->baseShader.reg_maps.samplers; + const DWORD *pshader_sampler_tokens = NULL; int start = GL_LIMITS(combined_samplers) - 1; int i; @@ -4141,8 +4147,9 @@ static HRESULT WINAPI IWineD3DDeviceImpl_GetPixelShaderConstantF( } #define copy_and_next(dest, src, size) memcpy(dest, src, size); dest += (size) -static HRESULT -process_vertices_strided(IWineD3DDeviceImpl *This, DWORD dwDestIndex, DWORD dwCount, WineDirect3DVertexStridedData *lpStrideData, IWineD3DVertexBufferImpl *dest, DWORD dwFlags) { +static HRESULT process_vertices_strided(IWineD3DDeviceImpl *This, DWORD dwDestIndex, DWORD dwCount, + const WineDirect3DVertexStridedData *lpStrideData, IWineD3DVertexBufferImpl *dest, DWORD dwFlags) +{ char *dest_ptr, *dest_conv = NULL, *dest_conv_addr = NULL; unsigned int i; DWORD DestFVF = dest->fvf; @@ -4174,7 +4181,7 @@ process_vertices_strided(IWineD3DDeviceImpl *This, DWORD dwDestIndex, DWORD dwCo return E_OUTOFMEMORY; } if(dest->vbo) { - void *src; + const void *src; GL_EXTCALL(glBindBufferARB(GL_ARRAY_BUFFER_ARB, dest->vbo)); checkGLcall("glBindBufferARB"); src = GL_EXTCALL(glMapBufferARB(GL_ARRAY_BUFFER_ARB, GL_READ_ONLY_ARB)); @@ -4275,8 +4282,8 @@ process_vertices_strided(IWineD3DDeviceImpl *This, DWORD dwDestIndex, DWORD dwCo if ( ((DestFVF & WINED3DFVF_POSITION_MASK) == WINED3DFVF_XYZ ) || ((DestFVF & WINED3DFVF_POSITION_MASK) == WINED3DFVF_XYZRHW ) ) { /* The position first */ - float *p = - (float *)(lpStrideData->u.s.position.lpData + i * lpStrideData->u.s.position.dwStride); + const float *p = + (const float *)(lpStrideData->u.s.position.lpData + i * lpStrideData->u.s.position.dwStride); float x, y, z, rhw; TRACE("In: ( %06.2f %06.2f %06.2f )\n", p[0], p[1], p[2]); @@ -4391,8 +4398,8 @@ process_vertices_strided(IWineD3DDeviceImpl *This, DWORD dwDestIndex, DWORD dwCo if(dest_conv) dest_conv += sizeof(DWORD); } if (DestFVF & WINED3DFVF_NORMAL) { - float *normal = - (float *)(lpStrideData->u.s.normal.lpData + i * lpStrideData->u.s.normal.dwStride); + const float *normal = + (const float *)(lpStrideData->u.s.normal.lpData + i * lpStrideData->u.s.normal.dwStride); /* AFAIK this should go into the lighting information */ FIXME("Didn't expect the destination to have a normal\n"); copy_and_next(dest_ptr, normal, 3 * sizeof(float)); @@ -4402,8 +4409,8 @@ process_vertices_strided(IWineD3DDeviceImpl *This, DWORD dwDestIndex, DWORD dwCo } if (DestFVF & WINED3DFVF_DIFFUSE) { - DWORD *color_d = - (DWORD *)(lpStrideData->u.s.diffuse.lpData + i * lpStrideData->u.s.diffuse.dwStride); + const DWORD *color_d = + (const DWORD *)(lpStrideData->u.s.diffuse.lpData + i * lpStrideData->u.s.diffuse.dwStride); if(!color_d) { static BOOL warned = FALSE; @@ -4433,8 +4440,8 @@ process_vertices_strided(IWineD3DDeviceImpl *This, DWORD dwDestIndex, DWORD dwCo if (DestFVF & WINED3DFVF_SPECULAR) { /* What's the color value in the feedback buffer? */ - DWORD *color_s = - (DWORD *)(lpStrideData->u.s.specular.lpData + i * lpStrideData->u.s.specular.dwStride); + const DWORD *color_s = + (const DWORD *)(lpStrideData->u.s.specular.lpData + i * lpStrideData->u.s.specular.dwStride); if(!color_s) { static BOOL warned = FALSE; @@ -4463,8 +4470,8 @@ process_vertices_strided(IWineD3DDeviceImpl *This, DWORD dwDestIndex, DWORD dwCo } for (tex_index = 0; tex_index < numTextures; tex_index++) { - float *tex_coord = - (float *)(lpStrideData->u.s.texCoords[tex_index].lpData + + const float *tex_coord = + (const float *)(lpStrideData->u.s.texCoords[tex_index].lpData + i * lpStrideData->u.s.texCoords[tex_index].dwStride); if(!tex_coord) { ERR("No source texture, but destination requests one\n"); @@ -5019,7 +5026,7 @@ HRESULT IWineD3DDeviceImpl_ClearSurface(IWineD3DDeviceImpl *This, IWineD3DSurfa unsigned int i; WINED3DRECT curRect; RECT vp_rect; - WINED3DVIEWPORT *vp = &This->stateBlock->viewport; + const WINED3DVIEWPORT *vp = &This->stateBlock->viewport; UINT drawable_width, drawable_height; IWineD3DSurfaceImpl *depth_stencil = (IWineD3DSurfaceImpl *) This->stencilBufferTarget; IWineD3DSwapChainImpl *swapchain = NULL; @@ -6445,7 +6452,8 @@ static HRESULT WINAPI IWineD3DDeviceImpl_GetDepthStencilSurface(IWineD3DDevice } void stretch_rect_fbo(IWineD3DDevice *iface, IWineD3DSurface *src_surface, WINED3DRECT *src_rect, - IWineD3DSurface *dst_surface, WINED3DRECT *dst_rect, const WINED3DTEXTUREFILTERTYPE filter, BOOL flip) { + IWineD3DSurface *dst_surface, WINED3DRECT *dst_rect, const WINED3DTEXTUREFILTERTYPE filter, BOOL flip) +{ IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; GLbitfield mask = GL_COLOR_BUFFER_BIT; /* TODO: Support blitting depth/stencil surfaces */ IWineD3DSwapChain *src_swapchain, *dst_swapchain; @@ -6916,7 +6924,8 @@ static HRESULT WINAPI IWineD3DDeviceImpl_EvictManagedResources(IWineD3DDevice* return WINED3D_OK; } -static void updateSurfaceDesc(IWineD3DSurfaceImpl *surface, WINED3DPRESENT_PARAMETERS* pPresentationParameters) { +static void updateSurfaceDesc(IWineD3DSurfaceImpl *surface, const WINED3DPRESENT_PARAMETERS* pPresentationParameters) +{ IWineD3DDeviceImpl *This = surface->resource.wineD3DDevice; /* for GL_SUPPORT */ /* Reallocate proper memory for the front and back buffer and adjust their sizes */ @@ -6979,7 +6988,8 @@ static HRESULT WINAPI reset_unload_resources(IWineD3DResource *resource, void *d return S_OK; } -static BOOL is_display_mode_supported(IWineD3DDeviceImpl *This, WINED3DPRESENT_PARAMETERS *pp) { +static BOOL is_display_mode_supported(IWineD3DDeviceImpl *This, const WINED3DPRESENT_PARAMETERS *pp) +{ UINT i, count; WINED3DDISPLAYMODE m; HRESULT hr; diff --git a/include/wine/wined3d.idl b/include/wine/wined3d.idl index fe88520..bd2826c 100644 --- a/include/wine/wined3d.idl +++ b/include/wine/wined3d.idl @@ -2967,7 +2967,7 @@ interface IWineD3DDevice : IWineD3DBase ); HRESULT CreatePalette( [in] DWORD flags, - [in] PALETTEENTRY *palette_entry, + [in] const PALETTEENTRY *palette_entry, [out] IWineD3DPalette **palette, [in] IUnknown *parent );

1 0

← Newer
1
2
3
4
5
6
7
...
74
Older →

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 November 2008