December 2008 - Wine-commits

Francois Gouget : mlang/tests: Make strstrW() static.
by Alexandre Julliard 15 Dec '08

15 Dec '08

Module: wine Branch: master Commit: 766c6deaf7d9750a4b1266bd6afcc4746953321b URL: http://source.winehq.org/git/wine.git/?a=commit;h=766c6deaf7d9750a4b1266bd6… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Dec 13 12:06:02 2008 +0100 mlang/tests: Make strstrW() static. --- dlls/mlang/tests/mlang.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mlang/tests/mlang.c b/dlls/mlang/tests/mlang.c index fe1edf9..37b6224 100644 --- a/dlls/mlang/tests/mlang.c +++ b/dlls/mlang/tests/mlang.c @@ -711,7 +711,7 @@ static void IMLangFontLink_Test(IMLangFontLink* iMLFL) } /* copied from libs/wine/string.c */ -WCHAR *strstrW(const WCHAR *str, const WCHAR *sub) +static WCHAR *strstrW(const WCHAR *str, const WCHAR *sub) { while (*str) {

1 0

Francois Gouget : winejack.drv: Make some functions static.
by Alexandre Julliard 15 Dec '08

15 Dec '08

Module: wine Branch: master Commit: 0c615ef2746c987098f3142e89ecb31367842fca URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c615ef2746c987098f3142e8… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Dec 13 12:04:40 2008 +0100 winejack.drv: Make some functions static. --- dlls/winejack.drv/audio.c | 24 ++++++++++++------------ 1 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/winejack.drv/audio.c b/dlls/winejack.drv/audio.c index b196e4a..e503f86 100644 --- a/dlls/winejack.drv/audio.c +++ b/dlls/winejack.drv/audio.c @@ -270,7 +270,7 @@ static DWORD bytes_to_mmtime(LPMMTIME lpTime, DWORD position, /* Alsaplayer function that applies volume changes to a buffer */ /* (C) Andy Lo A Foe */ /* Length is in terms of 32 bit samples */ -void volume_effect32(void *buffer, int length, int left, int right) +static void volume_effect32(void *buffer, int length, int left, int right) { short *data = (short *)buffer; int i, v; @@ -286,7 +286,7 @@ void volume_effect32(void *buffer, int length, int left, int right) } /* move 16 bit mono/stereo to 16 bit stereo */ -void sample_move_d16_d16(short *dst, short *src, +static void sample_move_d16_d16(short *dst, short *src, unsigned long nsamples, int nChannels) { while(nsamples--) @@ -308,7 +308,7 @@ void sample_move_d16_d16(short *dst, short *src, /* channels to a buffer that will hold a single channel stream */ /* nsamples is in terms of 16bit samples */ /* src_skip is in terms of 16bit samples */ -void sample_move_d16_s16 (sample_t *dst, short *src, +static void sample_move_d16_s16 (sample_t *dst, short *src, unsigned long nsamples, unsigned long src_skip) { /* ALERT: signed sign-extension portability !!! */ @@ -325,7 +325,7 @@ void sample_move_d16_s16 (sample_t *dst, short *src, /* to stereo data with alternating left/right channels */ /* nsamples is in terms of float samples */ /* dst_skip is in terms of 16bit samples */ -void sample_move_s16_d16 (short *dst, sample_t *src, +static void sample_move_s16_d16 (short *dst, sample_t *src, unsigned long nsamples, unsigned long dst_skip) { /* ALERT: signed sign-extension portability !!! */ @@ -340,7 +340,7 @@ void sample_move_s16_d16 (short *dst, sample_t *src, /* fill dst buffer with nsamples worth of silence */ -void sample_silence_dS (sample_t *dst, unsigned long nsamples) +static void sample_silence_dS (sample_t *dst, unsigned long nsamples) { /* ALERT: signed sign-extension portability !!! */ while (nsamples--) @@ -356,7 +356,7 @@ void sample_silence_dS (sample_t *dst, unsigned long nsamples) /* everytime the jack server wants something from us it calls this function, so we either deliver it some sound to play or deliver it nothing to play */ -int JACK_callback_wwo (nframes_t nframes, void *arg) +static int JACK_callback_wwo (nframes_t nframes, void *arg) { sample_t* out_l; sample_t* out_r; @@ -492,7 +492,7 @@ int JACK_callback_wwo (nframes_t nframes, void *arg) * Called whenever the jack server changes the max number * of frames passed to JACK_callback */ -int JACK_bufsize_wwo (nframes_t nframes, void *arg) +static int JACK_bufsize_wwo (nframes_t nframes, void *arg) { WINE_WAVEOUT* wwo = (WINE_WAVEOUT*)arg; DWORD buffer_required; @@ -540,7 +540,7 @@ int JACK_bufsize_wwo (nframes_t nframes, void *arg) * Called whenever the jack server changes the max number * of frames passed to JACK_callback */ -int JACK_bufsize_wwi (nframes_t nframes, void *arg) +static int JACK_bufsize_wwi (nframes_t nframes, void *arg) { TRACE("the maximum buffer size is now %u frames\n", nframes); return 0; @@ -549,7 +549,7 @@ int JACK_bufsize_wwi (nframes_t nframes, void *arg) /****************************************************************** * JACK_srate */ -int JACK_srate (nframes_t nframes, void *arg) +static int JACK_srate (nframes_t nframes, void *arg) { TRACE("the sample rate is now %u/sec\n", nframes); return 0; @@ -560,7 +560,7 @@ int JACK_srate (nframes_t nframes, void *arg) * JACK_shutdown_wwo */ /* if this is called then jack shut down... handle this appropriately */ -void JACK_shutdown_wwo(void* arg) +static void JACK_shutdown_wwo(void* arg) { WINE_WAVEOUT* wwo = (WINE_WAVEOUT*)arg; @@ -580,7 +580,7 @@ void JACK_shutdown_wwo(void* arg) * JACK_shutdown_wwi */ /* if this is called then jack shut down... handle this appropriately */ -void JACK_shutdown_wwi(void* arg) +static void JACK_shutdown_wwi(void* arg) { WINE_WAVEIN* wwi = (WINE_WAVEIN*)arg; @@ -1779,7 +1779,7 @@ static DWORD widNotifyClient(WINE_WAVEIN* wwi, WORD wMsg, DWORD dwParam1, DWORD */ /* everytime the jack server wants something from us it calls this function */ -int JACK_callback_wwi (nframes_t nframes, void *arg) +static int JACK_callback_wwi (nframes_t nframes, void *arg) { sample_t* in_l; sample_t* in_r = 0;

1 0

Francois Gouget : msiexec: Make KillService() static.
by Alexandre Julliard 15 Dec '08

15 Dec '08

Module: wine Branch: master Commit: 5d6f7b9784394f1d2c626ae60ff2509056207d12 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5d6f7b9784394f1d2c626ae60… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Dec 13 12:04:08 2008 +0100 msiexec: Make KillService() static. --- programs/msiexec/service.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/msiexec/service.c b/programs/msiexec/service.c index da552a7..3ccdb5b 100644 --- a/programs/msiexec/service.c +++ b/programs/msiexec/service.c @@ -32,7 +32,7 @@ static SERVICE_STATUS_HANDLE hstatus; static HANDLE thread; static HANDLE kill_event; -void KillService(void) +static void KillService(void) { WINE_TRACE("Killing service\n"); SetEvent(kill_event);

1 0

Francois Gouget : winapi_check: Add support for '-arch=xxx' in spec files.
by Alexandre Julliard 15 Dec '08

15 Dec '08

Module: wine Branch: master Commit: ea79b297f51a563ea824dc30efcbc2422beec248 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea79b297f51a563ea824dc30e… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Dec 13 12:04:22 2008 +0100 winapi_check: Add support for '-arch=xxx' in spec files. --- tools/winapi/winapi.pm | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/winapi/winapi.pm b/tools/winapi/winapi.pm index 8c552e5..87339ac 100644 --- a/tools/winapi/winapi.pm +++ b/tools/winapi/winapi.pm @@ -281,7 +281,7 @@ sub parse_spec_file($$) { my $ordinal; if(/^(\d+|@)\s+ (pascal|stdcall|cdecl|varargs)\s+ - ((?:(?:-noname|-norelay|-i386|-ret16|-ret64|-register|-interrupt|-private)\s+)*)(\S+)\s*$\s*(.*?)\s*$\s*(\S*)$/x) + ((?:(?:-arch=(?:i386|x86_64)|-noname|-norelay|-i386|-ret16|-ret64|-register|-interrupt|-private)\s+)*)(\S+)\s*$\s*(.*?)\s*$\s*(\S*)$/x) { my $calling_convention = $2; my $flags = $3;

1 0

Francois Gouget : explorer: Make appbar_wndproc() static.
by Alexandre Julliard 15 Dec '08

15 Dec '08

Module: wine Branch: master Commit: e1ca6799face03118337389c8fd2a4622a409496 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e1ca6799face03118337389c8… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Dec 13 12:04:34 2008 +0100 explorer: Make appbar_wndproc() static. --- programs/explorer/appbar.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/explorer/appbar.c b/programs/explorer/appbar.c index 6564f2c..f6e1eb1 100644 --- a/programs/explorer/appbar.c +++ b/programs/explorer/appbar.c @@ -220,7 +220,7 @@ static UINT_PTR handle_appbarmessage(DWORD msg, PAPPBARDATA abd) } } -LRESULT CALLBACK appbar_wndproc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) +static LRESULT CALLBACK appbar_wndproc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) { switch (msg) {

1 0

Francois Gouget : port: S_IWUSR and S_IX* are not needed. Remove them.
by Alexandre Julliard 15 Dec '08

15 Dec '08

Module: wine Branch: master Commit: 67d5a4de705bce50f6d0bdd4992270a8749d3808 URL: http://source.winehq.org/git/wine.git/?a=commit;h=67d5a4de705bce50f6d0bdd49… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Dec 13 12:03:30 2008 +0100 port: S_IWUSR and S_IX* are not needed. Remove them. --- include/wine/port.h | 14 -------------- 1 files changed, 0 insertions(+), 14 deletions(-) diff --git a/include/wine/port.h b/include/wine/port.h index df34174..fd37698 100644 --- a/include/wine/port.h +++ b/include/wine/port.h @@ -174,10 +174,6 @@ struct statvfs # define S_ISREG(mod) (((mod) & _S_IFMT) == _S_IFREG) #endif -#ifndef S_IWUSR -# define S_IWUSR 0 -#endif - /* So we open files in 64 bit access mode on Linux */ #ifndef O_LARGEFILE # define O_LARGEFILE 0 @@ -191,16 +187,6 @@ struct statvfs # define O_BINARY 0 #endif -#if !defined(S_IXUSR) && defined(S_IEXEC) -# define S_IXUSR S_IEXEC -#endif -#if !defined(S_IXGRP) && defined(S_IEXEC) -# define S_IXGRP S_IEXEC -#endif -#if !defined(S_IXOTH) && defined(S_IEXEC) -# define S_IXOTH S_IEXEC -#endif - /**************************************************************** * Constants

1 0

Francois Gouget : d3d8: Make D3D8CB_CreateSurface() static.
by Alexandre Julliard 15 Dec '08

15 Dec '08

Module: wine Branch: master Commit: ec7cbc26f58d3c7f49e26cfd10f30a8124db20f2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec7cbc26f58d3c7f49e26cfd1… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Dec 13 12:02:24 2008 +0100 d3d8: Make D3D8CB_CreateSurface() static. --- dlls/d3d8/d3d8_private.h | 5 ----- dlls/d3d8/device.c | 5 ++++- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/dlls/d3d8/d3d8_private.h b/dlls/d3d8/d3d8_private.h index c8051dc..c3f3dbf 100644 --- a/dlls/d3d8/d3d8_private.h +++ b/dlls/d3d8/d3d8_private.h @@ -638,11 +638,6 @@ UINT convert_to_wined3d_declaration(const DWORD *d3d8_elements, DWORD *d3d8_elem size_t parse_token(const DWORD* pToken); /* Callbacks */ -extern HRESULT WINAPI D3D8CB_CreateSurface(IUnknown *device, IUnknown *pSuperior, UINT Width, UINT Height, - WINED3DFORMAT Format, DWORD Usage, WINED3DPOOL Pool, UINT Level, - WINED3DCUBEMAP_FACES Face, IWineD3DSurface** ppSurface, - HANDLE* pSharedHandle); - extern HRESULT WINAPI D3D8CB_CreateVolume(IUnknown *pDevice, IUnknown *pSuperior, UINT Width, UINT Height, UINT Depth, WINED3DFORMAT Format, WINED3DPOOL Pool, DWORD Usage, IWineD3DVolume **ppVolume, diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index f9a0150..6c1da89 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -36,6 +36,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d8); +static HRESULT WINAPI D3D8CB_CreateSurface(IUnknown*,IUnknown*,UINT,UINT,WINED3DFORMAT,DWORD,WINED3DPOOL,UINT,WINED3DCUBEMAP_FACES,IWineD3DSurface**,HANDLE*); + + /* Shader handle functions */ static shader_handle *alloc_shader_handle(IDirect3DDevice8Impl *This) { if (This->free_shader_handles) { @@ -2207,7 +2210,7 @@ const IDirect3DDevice8Vtbl Direct3DDevice8_Vtbl = }; /* Internal function called back during the CreateDevice to create a render target */ -HRESULT WINAPI D3D8CB_CreateSurface(IUnknown *device, IUnknown *pSuperior, UINT Width, UINT Height, +static HRESULT WINAPI D3D8CB_CreateSurface(IUnknown *device, IUnknown *pSuperior, UINT Width, UINT Height, WINED3DFORMAT Format, DWORD Usage, WINED3DPOOL Pool, UINT Level, WINED3DCUBEMAP_FACES Face, IWineD3DSurface **ppSurface, HANDLE *pSharedHandle) {

1 0

Stefan Dösinger : wined3d: Give ATIFS a pixel shader handler.
by Alexandre Julliard 15 Dec '08

15 Dec '08

Module: wine Branch: master Commit: c93727826222bd5ea99226e6cd8d36ac5ef71a01 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c93727826222bd5ea99226e6c… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Dec 13 20:07:16 2008 +0100 wined3d: Give ATIFS a pixel shader handler. --- dlls/wined3d/ati_fragment_shader.c | 25 +++++++++++++++++++++++++ 1 files changed, 25 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/ati_fragment_shader.c b/dlls/wined3d/ati_fragment_shader.c index 1933476..b4c5334 100644 --- a/dlls/wined3d/ati_fragment_shader.c +++ b/dlls/wined3d/ati_fragment_shader.c @@ -881,6 +881,30 @@ static void textransform(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3 } } +static void atifs_apply_pixelshader(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DContext *context) { + IWineD3DDeviceImpl *device = stateblock->wineD3DDevice; + BOOL use_vshader = use_vs(device); + + /* The ATIFS code does not support pixel shaders currently, but we have to provide a state handler + * to call shader_select to select a vertex shader if one is applied because the vertex shader state + * may defer calling the shader backend if the pshader state is dirty. + * + * In theory the application should not be able to mark the pixel shader dirty because it cannot + * create a shader, and thus has no way to set the state to something != NULL. However, a different + * pipeline part may link a different state to its pixelshader handler, thus a pshader state exists + * and can be dirtified. Also the pshader is always dirtified at startup, and blitting disables all + * shaders and dirtifies all shader states. If atifs can deal with this it keeps the rest of the code + * simpler. + */ + if(!isStateDirty(context, device->StateTable[STATE_VSHADER].representative)) { + device->shader_backend->shader_select((IWineD3DDevice *)stateblock->wineD3DDevice, FALSE, use_vshader); + + if (!isStateDirty(context, STATE_VERTEXSHADERCONSTANT) && use_vshader) { + device->StateTable[STATE_VERTEXSHADERCONSTANT].apply(STATE_VERTEXSHADERCONSTANT, stateblock, context); + } + } +} + #undef GLINFO_LOCATION static const struct StateEntryTemplate atifs_fragmentstate_template[] = { @@ -1005,6 +1029,7 @@ static const struct StateEntryTemplate atifs_fragmentstate_template[] = { {STATE_TEXTURESTAGE(5,WINED3DTSS_TEXTURETRANSFORMFLAGS),{STATE_TEXTURESTAGE(5, WINED3DTSS_TEXTURETRANSFORMFLAGS), textransform }, 0 }, {STATE_TEXTURESTAGE(6,WINED3DTSS_TEXTURETRANSFORMFLAGS),{STATE_TEXTURESTAGE(6, WINED3DTSS_TEXTURETRANSFORMFLAGS), textransform }, 0 }, {STATE_TEXTURESTAGE(7,WINED3DTSS_TEXTURETRANSFORMFLAGS),{STATE_TEXTURESTAGE(7, WINED3DTSS_TEXTURETRANSFORMFLAGS), textransform }, 0 }, + {STATE_PIXELSHADER, { STATE_PIXELSHADER, atifs_apply_pixelshader }, 0 }, {0 /* Terminate */, { 0, 0 }, 0 }, };

1 0

Stefan Dösinger : wined3d: Remove a blank line in state.c.
by Alexandre Julliard 15 Dec '08

15 Dec '08

Module: wine Branch: master Commit: c0a715977d2d72ef4351808268ef8e6462bced2a URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0a715977d2d72ef435180826… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Dec 13 20:09:45 2008 +0100 wined3d: Remove a blank line in state.c. --- dlls/wined3d/state.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index f76ccac..d55a08d 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -1,4 +1,3 @@ - /* * Direct3D state management *

1 0

Francois Gouget : ole32: Use the IStream16_(CreateStream, CreateStorage, Write) implementations.
by Alexandre Julliard 15 Dec '08

15 Dec '08

Module: wine Branch: master Commit: e7b36718137f636b2fa87a48f38e292e50b57f60 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e7b36718137f636b2fa87a48f… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Dec 13 12:00:37 2008 +0100 ole32: Use the IStream16_(CreateStream,CreateStorage,Write) implementations. --- dlls/ole32/storage.spec | 9 +++------ 1 files changed, 3 insertions(+), 6 deletions(-) diff --git a/dlls/ole32/storage.spec b/dlls/ole32/storage.spec index 58273ca..d4933a7 100644 --- a/dlls/ole32/storage.spec +++ b/dlls/ole32/storage.spec @@ -22,12 +22,10 @@ 500 cdecl IStorage16_QueryInterface(ptr ptr ptr) IStorage16_fnQueryInterface 501 cdecl IStorage16_AddRef(ptr) IStorage16_fnAddRef 502 cdecl IStorage16_Release(ptr) IStorage16_fnRelease -#503 cdecl IStorage16_CreateStream(ptr str long long long ptr) IStorage16_fnCreateStream -503 stub IStorage16_CreateStream +503 cdecl IStorage16_CreateStream(ptr str long long long ptr) IStorage16_fnCreateStream 504 cdecl IStorage16_OpenStream(ptr str ptr long long ptr) IStorage16_fnOpenStream -#505 cdecl IStorage16_CreateStorage(ptr str long long long ptr) IStorage16_fnCreateStorage -505 stub IStorage16_CreateStorage +505 cdecl IStorage16_CreateStorage(ptr str long long long ptr) IStorage16_fnCreateStorage 506 cdecl IStorage16_OpenStorage(ptr str ptr long ptr long ptr) IStorage16_fnOpenStorage 507 cdecl IStorage16_CopyTo(ptr long ptr ptr ptr) IStorage16_fnCopyTo 508 stub IStorage16_MoveElementTo @@ -46,8 +44,7 @@ 519 cdecl IStream16_AddRef(ptr) IStream16_fnAddRef 520 cdecl IStream16_Release(ptr) IStream16_fnRelease 521 cdecl IStream16_Read(ptr ptr long ptr) IStream16_fnRead -#522 cdecl IStream16_Write(ptr ptr long ptr) IStream16_fnWrite -522 stub IStream16_Write +522 cdecl IStream16_Write(ptr ptr long ptr) IStream16_fnWrite 523 cdecl IStream16_Seek(ptr double long ptr) IStream16_fnSeek 524 stub IStream16_SetSize 525 stub IStream16_CopyTo

1 0