December 2008 - Wine-Commits

Alexandre Julliard : jscript: Make some functions and variables static.
by Alexandre Julliard Dec. 2, 2008

Dec. 2, 2008

Module: wine Branch: master Commit: f347b957f794b5dbd95ad4732c0a507c4d59ae41 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f347b957f794b5dbd95ad4732… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 2 15:26:49 2008 +0100 jscript: Make some functions and variables static. --- dlls/jscript/array.c | 2 +- dlls/jscript/engine.c | 2 +- dlls/jscript/parser.y | 8 ++++---- dlls/jscript/regexp.c | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/jscript/array.c b/dlls/jscript/array.c index 5e94f95..8f0802e 100644 --- a/dlls/jscript/array.c +++ b/dlls/jscript/array.c @@ -47,7 +47,7 @@ static const WCHAR propertyIsEnumerableW[] = {'p','r','o','p','e','r','t','y','I','s','E','n','u','m','e','r','a','b','l','e',0}; static const WCHAR isPrototypeOfW[] = {'i','s','P','r','o','t','o','t','y','p','e','O','f',0}; -const WCHAR default_separatorW[] = {',',0}; +static const WCHAR default_separatorW[] = {',',0}; static HRESULT Array_length(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index ecf62ae..063bd60 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -278,7 +278,7 @@ static HRESULT disp_cmp(IDispatch *disp1, IDispatch *disp2, BOOL *ret) } /* ECMA-262 3rd Edition 11.9.6 */ -HRESULT equal2_values(VARIANT *lval, VARIANT *rval, BOOL *ret) +static HRESULT equal2_values(VARIANT *lval, VARIANT *rval, BOOL *ret) { TRACE("\n"); diff --git a/dlls/jscript/parser.y b/dlls/jscript/parser.y index c96f8a3..9f3b6d4 100644 --- a/dlls/jscript/parser.y +++ b/dlls/jscript/parser.y @@ -110,8 +110,8 @@ struct statement_list_t { statement_t *tail; }; -statement_list_t *new_statement_list(parser_ctx_t*,statement_t*); -statement_list_t *statement_list_add(statement_list_t*,statement_t*); +static statement_list_t *new_statement_list(parser_ctx_t*,statement_t*); +static statement_list_t *statement_list_add(statement_list_t*,statement_t*); typedef struct _parameter_list_t { parameter_t *head; @@ -1493,7 +1493,7 @@ static source_elements_t *source_elements_add_statement(source_elements_t *sourc return source_elements; } -statement_list_t *new_statement_list(parser_ctx_t *ctx, statement_t *statement) +static statement_list_t *new_statement_list(parser_ctx_t *ctx, statement_t *statement) { statement_list_t *ret = parser_alloc_tmp(ctx, sizeof(statement_list_t)); @@ -1502,7 +1502,7 @@ statement_list_t *new_statement_list(parser_ctx_t *ctx, statement_t *statement) return ret; } -statement_list_t *statement_list_add(statement_list_t *list, statement_t *statement) +static statement_list_t *statement_list_add(statement_list_t *list, statement_t *statement) { list->tail = list->tail->next = statement; diff --git a/dlls/jscript/regexp.c b/dlls/jscript/regexp.c index 9187b46..c531f26 100644 --- a/dlls/jscript/regexp.c +++ b/dlls/jscript/regexp.c @@ -181,7 +181,7 @@ typedef enum REOp { #define REOP_IS_SIMPLE(op) ((op) <= REOP_NCLASS) -const char *reop_names[] = { +static const char *reop_names[] = { "empty", "bol", "eol",

1 0

Alexandre Julliard : localspl: Make some functions static.
by Alexandre Julliard Dec. 2, 2008

Dec. 2, 2008

Module: wine Branch: master Commit: 05bdac1526e2b98692261eaac95d3b6e7d839f5b URL: http://source.winehq.org/git/wine.git/?a=commit;h=05bdac1526e2b98692261eaac… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 2 15:26:37 2008 +0100 localspl: Make some functions static. --- dlls/localspl/localspl_main.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/localspl/localspl_main.c b/dlls/localspl/localspl_main.c index 7cadac3..4483ac8 100644 --- a/dlls/localspl/localspl_main.c +++ b/dlls/localspl/localspl_main.c @@ -898,7 +898,7 @@ static BOOL myAddPrinterDriverEx(DWORD level, LPBYTE pDriverInfo, DWORD dwFileCo * All Files for the Monitor must already be copied to %winsysdir% ("%SystemRoot%\system32") * */ -BOOL WINAPI fpAddMonitor(LPWSTR pName, DWORD Level, LPBYTE pMonitors) +static BOOL WINAPI fpAddMonitor(LPWSTR pName, DWORD Level, LPBYTE pMonitors) { monitor_t * pm = NULL; LPMONITOR_INFO_2W mi2w; @@ -1034,7 +1034,7 @@ static BOOL WINAPI fpAddPrinterDriverEx(LPWSTR pName, DWORD level, LPBYTE pDrive * */ -BOOL WINAPI fpDeleteMonitor(LPWSTR pName, LPWSTR pEnvironment, LPWSTR pMonitorName) +static BOOL WINAPI fpDeleteMonitor(LPWSTR pName, LPWSTR pEnvironment, LPWSTR pMonitorName) { HKEY hroot = NULL; LONG lres; @@ -1096,8 +1096,8 @@ BOOL WINAPI fpDeleteMonitor(LPWSTR pName, LPWSTR pEnvironment, LPWSTR pMonitorNa * Windows reads the Registry once and cache the Results. * */ -BOOL WINAPI fpEnumMonitors(LPWSTR pName, DWORD Level, LPBYTE pMonitors, DWORD cbBuf, - LPDWORD pcbNeeded, LPDWORD pcReturned) +static BOOL WINAPI fpEnumMonitors(LPWSTR pName, DWORD Level, LPBYTE pMonitors, DWORD cbBuf, + LPDWORD pcbNeeded, LPDWORD pcReturned) { DWORD numentries = 0; DWORD needed = 0;

1 0

Alexandre Julliard : winemp3.acm: Make some variables static.
by Alexandre Julliard Dec. 2, 2008

Dec. 2, 2008

Module: wine Branch: master Commit: 14e2cd90fc8083dc67f98884a275623c3c919858 URL: http://source.winehq.org/git/wine.git/?a=commit;h=14e2cd90fc8083dc67f98884a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 2 15:26:08 2008 +0100 winemp3.acm: Make some variables static. --- dlls/winemp3.acm/common.c | 6 +++--- dlls/winemp3.acm/mpg123.h | 3 --- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/dlls/winemp3.acm/common.c b/dlls/winemp3.acm/common.c index 2943fd8..91ba51a 100644 --- a/dlls/winemp3.acm/common.c +++ b/dlls/winemp3.acm/common.c @@ -32,7 +32,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(mpeg3); -const struct parameter param = { 1 , 1 , 0 , 0 }; +static const struct parameter param = { 1 , 1 , 0 , 0 }; static const int tabsel_123[2][3][16] = { { {0,32,64,96,128,160,192,224,256,288,320,352,384,416,448,}, @@ -44,7 +44,7 @@ static const int tabsel_123[2][3][16] = { {0,8,16,24,32,40,48,56,64,80,96,112,128,144,160,} } }; -const long freqs[9] = { 44100, 48000, 32000, +static const long freqs[9] = { 44100, 48000, 32000, 22050, 24000, 16000 , 11025 , 12000 , 8000 }; @@ -56,7 +56,7 @@ int pcm_point = 0; #define HDRCMPMASK 0xfffffd00 -int head_check(unsigned long head) +static int head_check(unsigned long head) { if( (head & 0xffe00000) != 0xffe00000) return FALSE; diff --git a/dlls/winemp3.acm/mpg123.h b/dlls/winemp3.acm/mpg123.h index 1648408..a798eb7 100644 --- a/dlls/winemp3.acm/mpg123.h +++ b/dlls/winemp3.acm/mpg123.h @@ -161,9 +161,6 @@ extern void make_decode_tables(long scale); extern void dct64(real *,real *,real *); extern unsigned char *conv16to8; -extern const long freqs[9]; extern real muls[27][64]; extern real decwin[512+32]; extern real *pnts[5]; - -extern const struct parameter param;

1 0

Alexandre Julliard : winspool.drv: Make some functions static.
by Alexandre Julliard Dec. 2, 2008

Dec. 2, 2008

Module: wine Branch: master Commit: d6f7d50189e79e6f3edceae685e368613150ad68 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d6f7d50189e79e6f3edceae68… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 2 15:26:19 2008 +0100 winspool.drv: Make some functions static. --- dlls/winspool.drv/info.c | 2 +- dlls/winspool.drv/wspool.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index 179ad04..6e6b4ad 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -7632,7 +7632,7 @@ static BOOL schedule_cups(LPCWSTR printer_name, LPCWSTR filename, LPCWSTR docume } } -INT_PTR CALLBACK file_dlg_proc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) +static INT_PTR CALLBACK file_dlg_proc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) { LPWSTR filename; diff --git a/dlls/winspool.drv/wspool.c b/dlls/winspool.drv/wspool.c index 1685573..54f921d 100644 --- a/dlls/winspool.drv/wspool.c +++ b/dlls/winspool.drv/wspool.c @@ -108,7 +108,7 @@ BOOL load_backend(void) * unload_backend [internal] * */ -void unload_backend(void) +static void unload_backend(void) { EnterCriticalSection(&backend_cs); backend = NULL;

1 0

Alexandre Julliard : gphoto.ds: Make some functions and variables static.
by Alexandre Julliard Dec. 2, 2008

Dec. 2, 2008

Module: wine Branch: master Commit: 4c2a2111272bcac0e460c3dde456a72e6911c4f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c2a2111272bcac0e460c3dde… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 2 15:25:39 2008 +0100 gphoto.ds: Make some functions and variables static. --- dlls/gphoto2.ds/gphoto2_i.h | 10 ---------- dlls/gphoto2.ds/gphoto2_main.c | 2 +- dlls/gphoto2.ds/ui.c | 4 ++-- 3 files changed, 3 insertions(+), 13 deletions(-) diff --git a/dlls/gphoto2.ds/gphoto2_i.h b/dlls/gphoto2.ds/gphoto2_i.h index 89c4bc0..8312815 100644 --- a/dlls/gphoto2.ds/gphoto2_i.h +++ b/dlls/gphoto2.ds/gphoto2_i.h @@ -103,16 +103,6 @@ struct tagActiveDS /* Helper functions */ extern TW_UINT16 GPHOTO2_SaneCapability (pTW_CAPABILITY pCapability, TW_UINT16 action); -/* */ -extern TW_UINT16 GPHOTO2_ControlGroupHandler ( - pTW_IDENTITY pOrigin, TW_UINT16 DAT, TW_UINT16 MSG, TW_MEMREF pData); -extern TW_UINT16 GPHOTO2_ImageGroupHandler ( - pTW_IDENTITY pOrigin, TW_UINT16 DAT, TW_UINT16 MSG, TW_MEMREF pData); -extern TW_UINT16 GPHOTO2_AudioGroupHandler ( - pTW_IDENTITY pOrigin, TW_UINT16 DAT, TW_UINT16 MSG, TW_MEMREF pData); -extern TW_UINT16 GPHOTO2_SourceManagerHandler ( - pTW_IDENTITY pOrigin, TW_UINT16 DAT, TW_UINT16 MSG, TW_MEMREF pData); - /* Implementation of operation triplets * From Application to Source (Control Information) */ TW_UINT16 GPHOTO2_CapabilityGet (pTW_IDENTITY pOrigin, TW_MEMREF pData); diff --git a/dlls/gphoto2.ds/gphoto2_main.c b/dlls/gphoto2.ds/gphoto2_main.c index f4f4546..c023828 100644 --- a/dlls/gphoto2.ds/gphoto2_main.c +++ b/dlls/gphoto2.ds/gphoto2_main.c @@ -311,7 +311,7 @@ static TW_UINT16 GPHOTO2_SourceControlHandler ( } -TW_UINT16 GPHOTO2_ImageGroupHandler ( +static TW_UINT16 GPHOTO2_ImageGroupHandler ( pTW_IDENTITY pOrigin, TW_UINT16 DAT, TW_UINT16 MSG, diff --git a/dlls/gphoto2.ds/ui.c b/dlls/gphoto2.ds/ui.c index e9d2f87..40afb9e 100644 --- a/dlls/gphoto2.ds/ui.c +++ b/dlls/gphoto2.ds/ui.c @@ -39,8 +39,8 @@ #include "wine/debug.h" #include "resource.h" -LPCSTR settings_key = "Software\\Wine\\Gphoto2"; -LPCSTR settings_value = "SkipUI"; +static const char settings_key[] = "Software\\Wine\\Gphoto2"; +static const char settings_value[] = "SkipUI"; static BOOL disable_dialog; static HBITMAP static_bitmap;

1 0

Alexandre Julliard : oleaut32: Make some functions static.
by Alexandre Julliard Dec. 2, 2008

Dec. 2, 2008

Module: wine Branch: master Commit: c42130f010b2272b1823d6a4e3072a3d165f25b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c42130f010b2272b1823d6a4e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 2 15:24:59 2008 +0100 oleaut32: Make some functions static. --- dlls/oleaut32/olefont.c | 6 +++--- dlls/oleaut32/typelib.c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/oleaut32/olefont.c b/dlls/oleaut32/olefont.c index 1a30621..da622a1 100644 --- a/dlls/oleaut32/olefont.c +++ b/dlls/oleaut32/olefont.c @@ -328,7 +328,7 @@ static void OLEFont_SendNotify(OLEFontImpl* this, DISPID dispID) * * See Windows documentation for more details on IUnknown methods. */ -HRESULT WINAPI OLEFontImpl_QueryInterface( +static HRESULT WINAPI OLEFontImpl_QueryInterface( IFont* iface, REFIID riid, void** ppvObject) @@ -384,7 +384,7 @@ HRESULT WINAPI OLEFontImpl_QueryInterface( * * See Windows documentation for more details on IUnknown methods. */ -ULONG WINAPI OLEFontImpl_AddRef( +static ULONG WINAPI OLEFontImpl_AddRef( IFont* iface) { OLEFontImpl *this = (OLEFontImpl *)iface; @@ -397,7 +397,7 @@ ULONG WINAPI OLEFontImpl_AddRef( * * See Windows documentation for more details on IUnknown methods. */ -ULONG WINAPI OLEFontImpl_Release( +static ULONG WINAPI OLEFontImpl_Release( IFont* iface) { OLEFontImpl *this = (OLEFontImpl *)iface; diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 8e4745b..9bc601e 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -5685,7 +5685,7 @@ _invoke(FARPROC func,CALLCONV callconv, int nrargs, DWORD *args) { /* The size of the argument on the stack in DWORD units (in all x86 call * convetions the arguments on the stack are DWORD-aligned) */ -int _dispargsize(VARTYPE vt) +static int _dispargsize(VARTYPE vt) { switch (vt) { case VT_I8:

1 0

Alexandre Julliard : sane.ds: Make some functions static.
by Alexandre Julliard Dec. 2, 2008

Dec. 2, 2008

Module: wine Branch: master Commit: 5a2a9144813bc013f7f9cef11018b3c442c31bb5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5a2a9144813bc013f7f9cef11… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 2 15:25:29 2008 +0100 sane.ds: Make some functions static. --- dlls/sane.ds/capability.c | 4 +++- dlls/sane.ds/sane_i.h | 11 ----------- dlls/sane.ds/sane_main.c | 2 +- 3 files changed, 4 insertions(+), 13 deletions(-) diff --git a/dlls/sane.ds/capability.c b/dlls/sane.ds/capability.c index 6b6867e..615e4cb 100644 --- a/dlls/sane.ds/capability.c +++ b/dlls/sane.ds/capability.c @@ -31,6 +31,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(twain); +static TW_UINT16 SANE_ICAPXferMech (pTW_CAPABILITY pCapability, TW_UINT16 action); + TW_UINT16 SANE_SaneCapability (pTW_CAPABILITY pCapability, TW_UINT16 action) { TW_UINT16 twCC = TWCC_SUCCESS; @@ -205,7 +207,7 @@ static TW_BOOL TWAIN_OneValueGet (pTW_CAPABILITY pCapability, TW_UINT32 *pValue) } /* ICAP_XFERMECH */ -TW_UINT16 SANE_ICAPXferMech (pTW_CAPABILITY pCapability, TW_UINT16 action) +static TW_UINT16 SANE_ICAPXferMech (pTW_CAPABILITY pCapability, TW_UINT16 action) { TRACE("ICAP_XFERMECH\n"); diff --git a/dlls/sane.ds/sane_i.h b/dlls/sane.ds/sane_i.h index c1f0bee..badb4db 100644 --- a/dlls/sane.ds/sane_i.h +++ b/dlls/sane.ds/sane_i.h @@ -77,14 +77,6 @@ struct tagActiveDS /* Helper functions */ extern TW_UINT16 SANE_SaneCapability (pTW_CAPABILITY pCapability, TW_UINT16 action); -/* */ -extern TW_UINT16 SANE_ControlGroupHandler ( - pTW_IDENTITY pOrigin, TW_UINT16 DAT, TW_UINT16 MSG, TW_MEMREF pData); -extern TW_UINT16 SANE_ImageGroupHandler ( - pTW_IDENTITY pOrigin, TW_UINT16 DAT, TW_UINT16 MSG, TW_MEMREF pData); -extern TW_UINT16 SANE_SourceManagerHandler ( - pTW_IDENTITY pOrigin, TW_UINT16 DAT, TW_UINT16 MSG, TW_MEMREF pData); - /* Implementation of operation triplets * From Application to Source (Control Information) */ TW_UINT16 SANE_CapabilityGet (pTW_IDENTITY pOrigin, TW_MEMREF pData); @@ -214,9 +206,6 @@ TW_UINT16 SANE_RGBResponseReset TW_UINT16 SANE_RGBResponseSet (pTW_IDENTITY pOrigin, TW_MEMREF pData); -/* Implementation of TWAIN capabilities */ -TW_UINT16 SANE_ICAPXferMech (pTW_CAPABILITY pCapability, TW_UINT16 action); - /* UI function */ BOOL DoScannerUI(void); HWND ScanningDialogBox(HWND dialog, LONG progress); diff --git a/dlls/sane.ds/sane_main.c b/dlls/sane.ds/sane_main.c index 8c0e39f..ea1af0e 100644 --- a/dlls/sane.ds/sane_main.c +++ b/dlls/sane.ds/sane_main.c @@ -372,7 +372,7 @@ static TW_UINT16 SANE_SourceControlHandler ( } -TW_UINT16 SANE_ImageGroupHandler ( +static TW_UINT16 SANE_ImageGroupHandler ( pTW_IDENTITY pOrigin, TW_UINT16 DAT, TW_UINT16 MSG,

1 0

Andrew Talbot : wined3d: Sign-compare warnings fix.
by Alexandre Julliard Dec. 2, 2008

Dec. 2, 2008

Module: wine Branch: master Commit: 33e0d1610a40b0f0c29a843a7a7b4cd2d407fa37 URL: http://source.winehq.org/git/wine.git/?a=commit;h=33e0d1610a40b0f0c29a843a7… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Mon Dec 1 22:19:43 2008 +0000 wined3d: Sign-compare warnings fix. --- dlls/wined3d/surface.c | 7 +++---- dlls/wined3d/surface_gdi.c | 2 +- dlls/wined3d/swapchain.c | 4 ++-- dlls/wined3d/swapchain_gdi.c | 2 +- 4 files changed, 7 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index dffd92e..2522ba9 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -211,7 +211,7 @@ static void surface_download_data(IWineD3DSurfaceImpl *This) { if (This->Flags & SFLAG_NONPOW2) { const BYTE *src_data; BYTE *dst_data; - int y; + UINT y; /* * Some games (e.g. warhammer 40k) don't work properly with the odd pitches, preventing * the surface pitch from being used to box non-power2 textures. Instead we have to use a hack to @@ -2132,7 +2132,7 @@ static void d3dfmt_p8_init_palette(IWineD3DSurfaceImpl *This, BYTE table[256][4] IWineD3DDeviceImpl *device = This->resource.wineD3DDevice; BOOL index_in_alpha = FALSE; int dxVersion = ( (IWineD3DImpl *) device->wineD3D)->dxVersion; - int i; + unsigned int i; /* Old games like StarCraft, C&C, Red Alert and others use P8 render targets. * Reading back the RGB output each lockrect (each frame as they lock the whole screen) @@ -2435,12 +2435,11 @@ static void WINAPI IWineD3DSurfaceImpl_BindTexture(IWineD3DSurface *iface) { static HRESULT WINAPI IWineD3DSurfaceImpl_SaveSnapshot(IWineD3DSurface *iface, const char* filename) { FILE* f = NULL; - UINT i, y; IWineD3DSurfaceImpl *This = (IWineD3DSurfaceImpl *)iface; char *allocatedMemory; const char *textureRow; IWineD3DSwapChain *swapChain = NULL; - int width, height; + int width, height, i, y; GLuint tmpTexture = 0; DWORD color; /*FIXME: diff --git a/dlls/wined3d/surface_gdi.c b/dlls/wined3d/surface_gdi.c index fbe881e..368710f 100644 --- a/dlls/wined3d/surface_gdi.c +++ b/dlls/wined3d/surface_gdi.c @@ -288,7 +288,7 @@ const char* filename) UINT y = 0, x = 0; IWineD3DSurfaceImpl *This = (IWineD3DSurfaceImpl *)iface; static char *output = NULL; - static int size = 0; + static UINT size = 0; const StaticPixelFormatDesc *formatEntry = getFormatDescEntry(This->resource.format, NULL, NULL); if (This->pow2Width > size) { diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index b00d35a..d1a6520 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -39,7 +39,7 @@ WINE_DECLARE_DEBUG_CHANNEL(fps); static void WINAPI IWineD3DSwapChainImpl_Destroy(IWineD3DSwapChain *iface, D3DCB_DESTROYSURFACEFN D3DCB_DestroyRenderTarget) { IWineD3DSwapChainImpl *This = (IWineD3DSwapChainImpl *)iface; WINED3DDISPLAYMODE mode; - int i; + unsigned int i; TRACE("Destroying swapchain %p\n", iface); @@ -54,7 +54,7 @@ static void WINAPI IWineD3DSwapChainImpl_Destroy(IWineD3DSwapChain *iface, D3DCB } if(This->backBuffer) { - int i; + UINT i; for(i = 0; i < This->presentParms.BackBufferCount; i++) { IWineD3DSurface_SetContainer(This->backBuffer[i], 0); if(D3DCB_DestroyRenderTarget(This->backBuffer[i]) > 0) { diff --git a/dlls/wined3d/swapchain_gdi.c b/dlls/wined3d/swapchain_gdi.c index 6bf1c61..5968201 100644 --- a/dlls/wined3d/swapchain_gdi.c +++ b/dlls/wined3d/swapchain_gdi.c @@ -44,7 +44,7 @@ static void WINAPI IWineGDISwapChainImpl_Destroy(IWineD3DSwapChain *iface, D3DCB } if(This->backBuffer) { - int i; + UINT i; for(i = 0; i < This->presentParms.BackBufferCount; i++) { IWineD3DSurface_SetContainer(This->backBuffer[i], 0); if(D3DCB_DestroyRenderback(This->backBuffer[i]) > 0) {

1 0

Alexandre Julliard : quartz: Make some functions and variables static.
by Alexandre Julliard Dec. 2, 2008

Dec. 2, 2008

Module: wine Branch: master Commit: e78ea286fbf496b584029468b1e8173601d09495 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e78ea286fbf496b584029468b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 2 15:25:19 2008 +0100 quartz: Make some functions and variables static. --- dlls/quartz/filtermapper.c | 2 +- dlls/quartz/main.c | 20 --------------- dlls/quartz/memallocator.c | 56 +++++++++++++++++++++-------------------- dlls/quartz/parser.c | 2 +- dlls/quartz/quartz_private.h | 34 ------------------------- 5 files changed, 31 insertions(+), 83 deletions(-) diff --git a/dlls/quartz/filtermapper.c b/dlls/quartz/filtermapper.c index 5732755..ce296ea 100644 --- a/dlls/quartz/filtermapper.c +++ b/dlls/quartz/filtermapper.c @@ -81,7 +81,7 @@ struct IAMFilterData { const IAMFilterDataVtbl *lpVtbl; }; -const GUID IID_IAMFilterData = { +static const GUID IID_IAMFilterData = { 0x97f7c4d4, 0x547b, 0x4a5f, { 0x83,0x32, 0x53,0x64,0x30,0xad,0x2e,0x4d } }; diff --git a/dlls/quartz/main.c b/dlls/quartz/main.c index 5eece59..6b4c135 100644 --- a/dlls/quartz/main.c +++ b/dlls/quartz/main.c @@ -241,26 +241,6 @@ const char * qzdebugstr_guid( const GUID * id ) return debugstr_guid(id); } -/*********************************************************************** - * qzdebugstr_State (internal) - * - * Gives a text version of the FILTER_STATE enumeration - */ -const char * qzdebugstr_State(FILTER_STATE state) -{ - switch (state) - { - case State_Stopped: - return "State_Stopped"; - case State_Running: - return "State_Running"; - case State_Paused: - return "State_Paused"; - default: - return "State_Unknown"; - } -} - LONG WINAPI AmpFactorToDB(LONG ampfactor) { FIXME("(%d) Stub!\n", ampfactor); diff --git a/dlls/quartz/memallocator.c b/dlls/quartz/memallocator.c index 1718d19..ae25459 100644 --- a/dlls/quartz/memallocator.c +++ b/dlls/quartz/memallocator.c @@ -31,24 +31,26 @@ WINE_DEFAULT_DEBUG_CHANNEL(quartz); -void dump_AM_SAMPLE2_PROPERTIES(const AM_SAMPLE2_PROPERTIES * pProps) -{ - if (!pProps) - { - TRACE("AM_SAMPLE2_PROPERTIES: (null)\n"); - return; - } - TRACE("\tcbData: %d\n", pProps->cbData); - TRACE("\tdwTypeSpecificFlags: 0x%8x\n", pProps->dwTypeSpecificFlags); - TRACE("\tdwSampleFlags: 0x%8x\n", pProps->dwSampleFlags); - TRACE("\tlActual: %d\n", pProps->lActual); - TRACE("\ttStart: %x%08x%s\n", (LONG)(pProps->tStart >> 32), (LONG)pProps->tStart, pProps->dwSampleFlags & AM_SAMPLE_TIMEVALID ? "" : " (not valid)"); - TRACE("\ttStop: %x%08x%s\n", (LONG)(pProps->tStop >> 32), (LONG)pProps->tStop, pProps->dwSampleFlags & AM_SAMPLE_STOPVALID ? "" : " (not valid)"); - TRACE("\tdwStreamId: 0x%x\n", pProps->dwStreamId); - TRACE("\tpMediaType: %p\n", pProps->pMediaType); - TRACE("\tpbBuffer: %p\n", pProps->pbBuffer); - TRACE("\tcbBuffer: %d\n", pProps->cbBuffer); -} +typedef struct BaseMemAllocator +{ + const IMemAllocatorVtbl * lpVtbl; + + LONG ref; + ALLOCATOR_PROPERTIES props; + HRESULT (* fnAlloc) (IMemAllocator *); + HRESULT (* fnFree)(IMemAllocator *); + HRESULT (* fnVerify)(IMemAllocator *, ALLOCATOR_PROPERTIES *); + HRESULT (* fnBufferPrepare)(IMemAllocator *, StdMediaSample2 *, DWORD flags); + HRESULT (* fnBufferReleased)(IMemAllocator *, StdMediaSample2 *); + void (* fnDestroyed)(IMemAllocator *); + HANDLE hSemWaiting; + BOOL bDecommitQueued; + BOOL bCommitted; + LONG lWaiting; + struct list free_list; + struct list used_list; + CRITICAL_SECTION *pCritSect; +} BaseMemAllocator; static const IMemAllocatorVtbl BaseMemAllocator_VTable; static const IMediaSample2Vtbl StdMediaSample2_VTable; @@ -57,14 +59,14 @@ static const IMediaSample2Vtbl StdMediaSample2_VTable; #define INVALID_MEDIA_TIME (((ULONGLONG)0x7fffffff << 32) | 0xffffffff) -HRESULT BaseMemAllocator_Init(HRESULT (* fnAlloc)(IMemAllocator *), - HRESULT (* fnFree)(IMemAllocator *), - HRESULT (* fnVerify)(IMemAllocator *, ALLOCATOR_PROPERTIES *), - HRESULT (* fnBufferPrepare)(IMemAllocator *, StdMediaSample2 *, DWORD), - HRESULT (* fnBufferReleased)(IMemAllocator *, StdMediaSample2 *), - void (* fnDestroyed)(IMemAllocator *), - CRITICAL_SECTION *pCritSect, - BaseMemAllocator * pMemAlloc) +static HRESULT BaseMemAllocator_Init(HRESULT (* fnAlloc)(IMemAllocator *), + HRESULT (* fnFree)(IMemAllocator *), + HRESULT (* fnVerify)(IMemAllocator *, ALLOCATOR_PROPERTIES *), + HRESULT (* fnBufferPrepare)(IMemAllocator *, StdMediaSample2 *, DWORD), + HRESULT (* fnBufferReleased)(IMemAllocator *, StdMediaSample2 *), + void (* fnDestroyed)(IMemAllocator *), + CRITICAL_SECTION *pCritSect, + BaseMemAllocator * pMemAlloc) { assert(fnAlloc && fnFree && fnDestroyed); @@ -399,7 +401,7 @@ static const IMemAllocatorVtbl BaseMemAllocator_VTable = BaseMemAllocator_ReleaseBuffer }; -HRESULT StdMediaSample2_Construct(BYTE * pbBuffer, LONG cbBuffer, IMemAllocator * pParent, StdMediaSample2 ** ppSample) +static HRESULT StdMediaSample2_Construct(BYTE * pbBuffer, LONG cbBuffer, IMemAllocator * pParent, StdMediaSample2 ** ppSample) { assert(pbBuffer && pParent && (cbBuffer > 0)); @@ -423,7 +425,7 @@ HRESULT StdMediaSample2_Construct(BYTE * pbBuffer, LONG cbBuffer, IMemAllocator return S_OK; } -void StdMediaSample2_Delete(StdMediaSample2 * This) +static void StdMediaSample2_Delete(StdMediaSample2 * This) { /* NOTE: does not remove itself from the list it belongs to */ CoTaskMemFree(This); diff --git a/dlls/quartz/parser.c b/dlls/quartz/parser.c index 59ff427..147ae88 100644 --- a/dlls/quartz/parser.c +++ b/dlls/quartz/parser.c @@ -747,7 +747,7 @@ static HRESULT WINAPI Parser_PullPin_Disconnect(IPin * iface) return hr; } -HRESULT WINAPI Parser_PullPin_ReceiveConnection(IPin * iface, IPin * pReceivePin, const AM_MEDIA_TYPE * pmt) +static HRESULT WINAPI Parser_PullPin_ReceiveConnection(IPin * iface, IPin * pReceivePin, const AM_MEDIA_TYPE * pmt) { HRESULT hr; diff --git a/dlls/quartz/quartz_private.h b/dlls/quartz/quartz_private.h index e025078..3e0dfe1 100644 --- a/dlls/quartz/quartz_private.h +++ b/dlls/quartz/quartz_private.h @@ -76,7 +76,6 @@ HRESULT IEnumRegFiltersImpl_Construct(REGFILTER * pInRegFilters, const ULONG siz HRESULT IEnumFiltersImpl_Construct(IBaseFilter ** ppFilters, ULONG nFilters, IEnumFilters ** ppEnum); extern const char * qzdebugstr_guid(const GUID * id); -extern const char * qzdebugstr_State(FILTER_STATE state); HRESULT CopyMediaType(AM_MEDIA_TYPE * pDest, const AM_MEDIA_TYPE *pSrc); void FreeMediaType(AM_MEDIA_TYPE * pmt); @@ -97,37 +96,4 @@ typedef struct StdMediaSample2 LONGLONG tMediaEnd; } StdMediaSample2; -typedef struct BaseMemAllocator -{ - const IMemAllocatorVtbl * lpVtbl; - - LONG ref; - ALLOCATOR_PROPERTIES props; - HRESULT (* fnAlloc) (IMemAllocator *); - HRESULT (* fnFree)(IMemAllocator *); - HRESULT (* fnVerify)(IMemAllocator *, ALLOCATOR_PROPERTIES *); - HRESULT (* fnBufferPrepare)(IMemAllocator *, StdMediaSample2 *, DWORD flags); - HRESULT (* fnBufferReleased)(IMemAllocator *, StdMediaSample2 *); - void (* fnDestroyed)(IMemAllocator *); - HANDLE hSemWaiting; - BOOL bDecommitQueued; - BOOL bCommitted; - LONG lWaiting; - struct list free_list; - struct list used_list; - CRITICAL_SECTION *pCritSect; -} BaseMemAllocator; - -HRESULT BaseMemAllocator_Init(HRESULT (* fnAlloc)(IMemAllocator *), - HRESULT (* fnFree)(IMemAllocator *), - HRESULT (* fnVerify)(IMemAllocator *, ALLOCATOR_PROPERTIES *), - HRESULT (* fnBufferPrepare)(IMemAllocator *, StdMediaSample2 *, DWORD), - HRESULT (* fnBufferReleased)(IMemAllocator *, StdMediaSample2 *), - void (* fnDestroyed)(IMemAllocator *), - CRITICAL_SECTION *pCritSect, - BaseMemAllocator * pMemAlloc); - -HRESULT StdMediaSample2_Construct(BYTE * pbBuffer, LONG cbBuffer, IMemAllocator * pParent, StdMediaSample2 ** ppSample); -void StdMediaSample2_Delete(StdMediaSample2 * This); - #endif /* __QUARTZ_PRIVATE_INCLUDED__ */

1 0

Alexandre Julliard : twain_32: Make some functions static.
by Alexandre Julliard Dec. 2, 2008

Dec. 2, 2008

Module: wine Branch: master Commit: e01ea707ddacb5e2c3bcb5e8fea530fe5a9275b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e01ea707ddacb5e2c3bcb5e8f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 2 15:25:52 2008 +0100 twain_32: Make some functions static. --- dlls/twain_32/twain32_main.c | 2 +- dlls/twain_32/twain_i.h | 14 -------------- 2 files changed, 1 insertions(+), 15 deletions(-) diff --git a/dlls/twain_32/twain32_main.c b/dlls/twain_32/twain32_main.c index c04e9cf..3239ec5 100644 --- a/dlls/twain_32/twain32_main.c +++ b/dlls/twain_32/twain32_main.c @@ -62,7 +62,7 @@ BOOL WINAPI DllMain (HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) return TRUE; } -TW_UINT16 TWAIN_SourceManagerHandler ( +static TW_UINT16 TWAIN_SourceManagerHandler ( pTW_IDENTITY pOrigin, TW_UINT16 DAT, TW_UINT16 MSG, diff --git a/dlls/twain_32/twain_i.h b/dlls/twain_32/twain_i.h index 23c355e..ff777b6 100644 --- a/dlls/twain_32/twain_i.h +++ b/dlls/twain_32/twain_i.h @@ -44,23 +44,9 @@ TW_UINT16 DSM_currentState; /* current state of Source Manager */ TW_UINT16 DSM_twCC; /* current condition code of Source Manager */ TW_UINT32 DSM_sourceId; /* source id generator */ TW_UINT16 DSM_currentDevice; /* keep track of device during enumeration */ -HINSTANCE DSM_instance; activeDS *activeSources; /* list of active data sources */ -/* Device Source Manager Control handlers */ -extern TW_UINT16 TWAIN_ControlGroupHandler ( - pTW_IDENTITY pOrigin, pTW_IDENTITY pDest, - TW_UINT16 DAT, TW_UINT16 MSG, TW_MEMREF pData); -extern TW_UINT16 TWAIN_ImageGroupHandler ( - pTW_IDENTITY pOrigin, pTW_IDENTITY pDest, - TW_UINT16 DAT, TW_UINT16 MSG, TW_MEMREF pData); -extern TW_UINT16 TWAIN_AudioGroupHandler ( - pTW_IDENTITY pOrigin, pTW_IDENTITY pDest, - TW_UINT16 DAT, TW_UINT16 MSG, TW_MEMREF pData); -extern TW_UINT16 TWAIN_SourceManagerHandler ( - pTW_IDENTITY pOrigin, TW_UINT16 DAT, TW_UINT16 MSG, TW_MEMREF pData); - /* Implementation of operation triplets (From Application to Source Manager) */ extern TW_UINT16 TWAIN_CloseDS (pTW_IDENTITY pOrigin, TW_MEMREF pData);

1 0