December 2008 - Wine-commits

Alexandre Julliard : rpcss: Build with -D__WINESRC__ since it' s using Wine-specific features.
by Alexandre Julliard 04 Dec '08

04 Dec '08

Module: wine Branch: master Commit: 76ae4d9c6570f16a0db6b5eabef9a9de3637b004 URL: http://source.winehq.org/git/wine.git/?a=commit;h=76ae4d9c6570f16a0db6b5eab… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 3 16:41:58 2008 +0100 rpcss: Build with -D__WINESRC__ since it's using Wine-specific features. --- programs/rpcss/Makefile.in | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/rpcss/Makefile.in b/programs/rpcss/Makefile.in index 48c63b7..a2929c4 100644 --- a/programs/rpcss/Makefile.in +++ b/programs/rpcss/Makefile.in @@ -1,4 +1,4 @@ -EXTRADEFS = -DWINE_NO_UNICODE_MACROS +EXTRADEFS = -D__WINESRC__ TOPSRCDIR = @top_srcdir@ TOPOBJDIR = ../.. SRCDIR = @srcdir@

1 0

Alexandre Julliard : winebuild: Don' t add stdcall decorations on non-x86 platforms.
by Alexandre Julliard 04 Dec '08

04 Dec '08

Module: wine Branch: master Commit: 9f1cf1c26358987e0dfe1ef14119ea02954084ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f1cf1c26358987e0dfe1ef14… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 3 22:37:07 2008 +0100 winebuild: Don't add stdcall decorations on non-x86 platforms. --- tools/winebuild/spec32.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/winebuild/spec32.c b/tools/winebuild/spec32.c index afcc7da..276639e 100644 --- a/tools/winebuild/spec32.c +++ b/tools/winebuild/spec32.c @@ -561,7 +561,7 @@ void BuildDef32File( DLLSPEC *spec ) case TYPE_STDCALL: { int at_param = strlen(odp->u.func.arg_types) * get_ptr_size(); - if (!kill_at) output( "@%d", at_param ); + if (!kill_at && target_cpu == CPU_x86) output( "@%d", at_param ); if (odp->flags & FLAG_FORWARD) { output( "=%s", odp->link_name ); @@ -569,7 +569,7 @@ void BuildDef32File( DLLSPEC *spec ) else if (strcmp(name, odp->link_name)) /* try to reduce output */ { output( "=%s", odp->link_name ); - if (!kill_at) output( "@%d", at_param ); + if (!kill_at && target_cpu == CPU_x86) output( "@%d", at_param ); } break; }

1 0

Alexandre Julliard : dinput: Make some functions static.
by Alexandre Julliard 03 Dec '08

03 Dec '08

Module: wine Branch: master Commit: 9ef1f0fe2e14bf61ba7f0a0eec319bb6c2d2056c URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ef1f0fe2e14bf61ba7f0a0ee… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 3 12:13:37 2008 +0100 dinput: Make some functions static. --- dlls/dinput/device.c | 28 ++++------------------------ dlls/dinput/device_private.h | 9 --------- 2 files changed, 4 insertions(+), 33 deletions(-) diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c index 7d9f728..aaf5577 100644 --- a/dlls/dinput/device.c +++ b/dlls/dinput/device.c @@ -44,7 +44,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(dinput); /****************************************************************************** * Various debugging tools */ -void _dump_cooperativelevel_DI(DWORD dwFlags) { +static void _dump_cooperativelevel_DI(DWORD dwFlags) { if (TRACE_ON(dinput)) { unsigned int i; static const struct { @@ -67,7 +67,7 @@ void _dump_cooperativelevel_DI(DWORD dwFlags) { } } -void _dump_EnumObjects_flags(DWORD dwFlags) { +static void _dump_EnumObjects_flags(DWORD dwFlags) { if (TRACE_ON(dinput)) { unsigned int i; DWORD type, instance; @@ -342,13 +342,13 @@ void release_DataFormat(DataFormat * format) format->user_df = NULL; } -inline LPDIOBJECTDATAFORMAT dataformat_to_odf(LPCDIDATAFORMAT df, int idx) +static inline LPDIOBJECTDATAFORMAT dataformat_to_odf(LPCDIDATAFORMAT df, int idx) { if (idx < 0 || idx >= df->dwNumObjs) return NULL; return (LPDIOBJECTDATAFORMAT)((LPBYTE)df->rgodf + idx * df->dwObjSize); } -HRESULT create_DataFormat(LPCDIDATAFORMAT asked_format, DataFormat *format) +static HRESULT create_DataFormat(LPCDIDATAFORMAT asked_format, DataFormat *format) { DataTransform *dt; unsigned int i, j; @@ -1132,26 +1132,6 @@ HRESULT WINAPI IDirectInputDevice2AImpl_GetDeviceData( return ret; } -HRESULT WINAPI IDirectInputDevice2AImpl_GetDeviceInfo( - LPDIRECTINPUTDEVICE8A iface, - LPDIDEVICEINSTANCEA pdidi) -{ - FIXME("(this=%p,%p): stub!\n", - iface, pdidi); - - return DI_OK; -} - -HRESULT WINAPI IDirectInputDevice2WImpl_GetDeviceInfo( - LPDIRECTINPUTDEVICE8W iface, - LPDIDEVICEINSTANCEW pdidi) -{ - FIXME("(this=%p,%p): stub!\n", - iface, pdidi); - - return DI_OK; -} - HRESULT WINAPI IDirectInputDevice2AImpl_RunControlPanel( LPDIRECTINPUTDEVICE8A iface, HWND hwndOwner, diff --git a/dlls/dinput/device_private.h b/dlls/dinput/device_private.h index 7b62a50..dd06a4b 100644 --- a/dlls/dinput/device_private.h +++ b/dlls/dinput/device_private.h @@ -77,7 +77,6 @@ extern DWORD get_config_key(HKEY, HKEY, const char*, char*, DWORD); /* Routines to do DataFormat / WineFormat conversions */ extern void fill_DataFormat(void *out, DWORD size, const void *in, const DataFormat *df) ; -extern HRESULT create_DataFormat(LPCDIDATAFORMAT asked_format, DataFormat *format); extern void release_DataFormat(DataFormat *df) ; extern void queue_event(LPDIRECTINPUTDEVICE8A iface, int ofs, DWORD data, DWORD time, DWORD seq); /* Helper functions to work with data format */ @@ -120,8 +119,6 @@ extern const GUID DInput_Wine_Keyboard_GUID; extern const GUID DInput_Wine_Mouse_GUID; /* Various debug tools */ -extern void _dump_cooperativelevel_DI(DWORD dwFlags) ; -extern void _dump_EnumObjects_flags(DWORD dwFlags) ; extern void _dump_DIPROPHEADER(LPCDIPROPHEADER diph) ; extern void _dump_OBJECTINSTANCEA(const DIDEVICEOBJECTINSTANCEA *ddoi) ; extern void _dump_OBJECTINSTANCEW(const DIDEVICEOBJECTINSTANCEW *ddoi) ; @@ -165,12 +162,6 @@ extern HRESULT WINAPI IDirectInputDevice2WImpl_GetObjectInfo(LPDIRECTINPUTDEVICE DWORD dwHow); extern HRESULT WINAPI IDirectInputDevice2AImpl_GetDeviceData(LPDIRECTINPUTDEVICE8A iface, DWORD dodsize, LPDIDEVICEOBJECTDATA dod, LPDWORD entries, DWORD flags); -extern HRESULT WINAPI IDirectInputDevice2AImpl_GetDeviceInfo( - LPDIRECTINPUTDEVICE8A iface, - LPDIDEVICEINSTANCEA pdidi) ; -extern HRESULT WINAPI IDirectInputDevice2WImpl_GetDeviceInfo( - LPDIRECTINPUTDEVICE8W iface, - LPDIDEVICEINSTANCEW pdidi) ; extern HRESULT WINAPI IDirectInputDevice2AImpl_RunControlPanel( LPDIRECTINPUTDEVICE8A iface, HWND hwndOwner,

1 0

Vitaly Lipatov : winex11: Add check for XmbTextPropertyToTextList result.
by Alexandre Julliard 03 Dec '08

03 Dec '08

Module: wine Branch: master Commit: 934aa492b41a21dffd5b969a5d03e6138cd49186 URL: http://source.winehq.org/git/wine.git/?a=commit;h=934aa492b41a21dffd5b969a5… Author: Vitaly Lipatov <lav(a)etersoft.ru> Date: Mon Nov 24 23:06:40 2008 +0300 winex11: Add check for XmbTextPropertyToTextList result. --- dlls/winex11.drv/clipboard.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/clipboard.c b/dlls/winex11.drv/clipboard.c index d50cf42..5577867 100644 --- a/dlls/winex11.drv/clipboard.c +++ b/dlls/winex11.drv/clipboard.c @@ -1224,7 +1224,7 @@ HANDLE X11DRV_CLIPBOARD_ImportUTF8(Display *display, Window w, Atom prop) */ static HANDLE X11DRV_CLIPBOARD_ImportCompoundText(Display *display, Window w, Atom prop) { - int i, j; + int i, j, ret; char** srcstr; int count, lcount; int srclen, destlen; @@ -1239,9 +1239,10 @@ static HANDLE X11DRV_CLIPBOARD_ImportCompoundText(Display *display, Window w, At txtprop.encoding = x11drv_atom(COMPOUND_TEXT); txtprop.format = 8; wine_tsx11_lock(); - XmbTextPropertyToTextList(display, &txtprop, &srcstr, &count); + ret = XmbTextPropertyToTextList(display, &txtprop, &srcstr, &count); wine_tsx11_unlock(); HeapFree(GetProcessHeap(), 0, txtprop.value); + if (ret != Success || !count) return 0; TRACE("Importing %d line(s)\n", count);

1 0

Alexandre Julliard : dmloader: Make some functions static.
by Alexandre Julliard 03 Dec '08

03 Dec '08

Module: wine Branch: master Commit: 02bfacff5adf1f03e377b42f3fcdbce5901bec70 URL: http://source.winehq.org/git/wine.git/?a=commit;h=02bfacff5adf1f03e377b42f3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 3 12:12:34 2008 +0100 dmloader: Make some functions static. --- dlls/dmloader/container.c | 79 ++++++++++---------- dlls/dmloader/dmloader_private.h | 12 --- dlls/dmloader/loader.c | 150 ++++++++++++++++++-------------------- dlls/dmloader/loaderstream.c | 51 +++++++------ 4 files changed, 137 insertions(+), 155 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=02bfacff5adf1f03e377b…

1 0

Alexandre Julliard : comdlg32: Make some functions static.
by Alexandre Julliard 03 Dec '08

03 Dec '08

Module: wine Branch: master Commit: 1a882843bfdcd31f11ffa40aab5caa0f12a8ef99 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a882843bfdcd31f11ffa40aa… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 3 12:12:52 2008 +0100 comdlg32: Make some functions static. --- dlls/comdlg32/cdlg.h | 4 ---- dlls/comdlg32/cdlg32.c | 8 -------- dlls/comdlg32/filedlg.c | 10 ++++++---- dlls/comdlg32/filedlgbrowser.h | 4 ---- 4 files changed, 6 insertions(+), 20 deletions(-) diff --git a/dlls/comdlg32/cdlg.h b/dlls/comdlg32/cdlg.h index f6a9cbc..c85f877 100644 --- a/dlls/comdlg32/cdlg.h +++ b/dlls/comdlg32/cdlg.h @@ -182,12 +182,8 @@ extern UINT (WINAPI *COMDLG32_PIDL_ILGetSize)(LPCITEMIDLIST); /* SHELL */ extern LPVOID (WINAPI *COMDLG32_SHAlloc)(DWORD); extern DWORD (WINAPI *COMDLG32_SHFree)(LPVOID); -extern BOOL (WINAPI *COMDLG32_SHGetFolderPathA)(HWND,int,HANDLE,DWORD,LPSTR); extern BOOL (WINAPI *COMDLG32_SHGetFolderPathW)(HWND,int,HANDLE,DWORD,LPWSTR); -extern BOOL WINAPI GetFileDialog95A(LPOPENFILENAMEA ofn,UINT iDlgType); -extern BOOL WINAPI GetFileDialog95W(LPOPENFILENAMEW ofn,UINT iDlgType); - /* * Internal Functions * Do NOT Export to other programs and dlls diff --git a/dlls/comdlg32/cdlg32.c b/dlls/comdlg32/cdlg32.c index 0f0f69b..afa3c61 100644 --- a/dlls/comdlg32/cdlg32.c +++ b/dlls/comdlg32/cdlg32.c @@ -52,7 +52,6 @@ UINT (WINAPI *COMDLG32_PIDL_ILGetSize)(LPCITEMIDLIST); /* SHELL */ LPVOID (WINAPI *COMDLG32_SHAlloc)(DWORD); DWORD (WINAPI *COMDLG32_SHFree)(LPVOID); -BOOL (WINAPI *COMDLG32_SHGetFolderPathA)(HWND,int,HANDLE,DWORD,LPSTR); BOOL (WINAPI *COMDLG32_SHGetFolderPathW)(HWND,int,HANDLE,DWORD,LPWSTR); /*********************************************************************** @@ -102,13 +101,6 @@ BOOL WINAPI DllMain(HINSTANCE hInstance, DWORD Reason, LPVOID Reserved) GPA(COMDLG32_SHAlloc, SHELL32_hInstance, (LPCSTR)196L); GPA(COMDLG32_SHFree, SHELL32_hInstance, (LPCSTR)195L); - /* for the first versions of shell32 SHGetFolderPathA is in SHFOLDER.DLL */ - COMDLG32_SHGetFolderPathA = (void*)GetProcAddress(SHELL32_hInstance,"SHGetFolderPathA"); - if (!COMDLG32_SHGetFolderPathA) - { - SHFOLDER_hInstance = LoadLibraryA("SHFOLDER.DLL"); - GPA(COMDLG32_SHGetFolderPathA, SHFOLDER_hInstance,"SHGetFolderPathA"); - } /* for the first versions of shell32 SHGetFolderPathW is in SHFOLDER.DLL */ COMDLG32_SHGetFolderPathW = (void*)GetProcAddress(SHELL32_hInstance,"SHGetFolderPathW"); diff --git a/dlls/comdlg32/filedlg.c b/dlls/comdlg32/filedlg.c index 953a5ba..e1eedd1 100644 --- a/dlls/comdlg32/filedlg.c +++ b/dlls/comdlg32/filedlg.c @@ -220,6 +220,8 @@ static HRESULT GetName(LPSHELLFOLDER lpsf, LPITEMIDLIST pidl,DWORD dwFlags,LPWST IShellFolder* GetShellFolderFromPidl(LPITEMIDLIST pidlAbs); LPITEMIDLIST GetParentPidl(LPITEMIDLIST pidl); static LPITEMIDLIST GetPidlFromName(IShellFolder *psf,LPWSTR lpcstrFileName); +static BOOL IsPidlFolder (LPSHELLFOLDER psf, LPCITEMIDLIST pidl); +static UINT GetNumSelected( IDataObject *doSelected ); /* Shell memory allocation */ static void *MemAlloc(UINT size); @@ -312,7 +314,7 @@ static BOOL GetFileName95(FileOpenDlgInfos *fodInfos) * IN : The OPENFILENAMEA initialisation structure passed to * GetOpenFileNameA win api function (see filedlg.c) */ -BOOL WINAPI GetFileDialog95A(LPOPENFILENAMEA ofn,UINT iDlgType) +static BOOL GetFileDialog95A(LPOPENFILENAMEA ofn,UINT iDlgType) { BOOL ret; FileOpenDlgInfos fodInfos; @@ -449,7 +451,7 @@ BOOL WINAPI GetFileDialog95A(LPOPENFILENAMEA ofn,UINT iDlgType) * Call GetFileName95 with this structure and clean the memory. * */ -BOOL WINAPI GetFileDialog95W(LPOPENFILENAMEW ofn,UINT iDlgType) +static BOOL GetFileDialog95W(LPOPENFILENAMEW ofn,UINT iDlgType) { BOOL ret; FileOpenDlgInfos fodInfos; @@ -3291,7 +3293,7 @@ LPITEMIDLIST GetPidlFromDataObject ( IDataObject *doSelected, UINT nPidlIndex) * Return the number of selected items in the DataObject. * */ -UINT GetNumSelected( IDataObject *doSelected ) +static UINT GetNumSelected( IDataObject *doSelected ) { UINT retVal = 0; STGMEDIUM medium; @@ -3430,7 +3432,7 @@ static LPITEMIDLIST GetPidlFromName(IShellFolder *lpsf,LPWSTR lpcstrFileName) /* */ -BOOL IsPidlFolder (LPSHELLFOLDER psf, LPCITEMIDLIST pidl) +static BOOL IsPidlFolder (LPSHELLFOLDER psf, LPCITEMIDLIST pidl) { ULONG uAttr = SFGAO_FOLDER | SFGAO_HASSUBFOLDER; HRESULT ret; diff --git a/dlls/comdlg32/filedlgbrowser.h b/dlls/comdlg32/filedlgbrowser.h index 2342d3d..f8da75e 100644 --- a/dlls/comdlg32/filedlgbrowser.h +++ b/dlls/comdlg32/filedlgbrowser.h @@ -148,10 +148,6 @@ IShellBrowser * IShellBrowserImpl_Construct(HWND hwndOwner); LPITEMIDLIST GetPidlFromDataObject ( IDataObject *doSelected, UINT nPidlIndex); -UINT GetNumSelected(IDataObject *doSelected); - -/* pidl handling */ -BOOL IsPidlFolder (LPSHELLFOLDER psf, LPCITEMIDLIST pidl); /* Functions used by the EDIT box */ void FILEDLG95_FILENAME_FillFromSelection (HWND hwnd);

1 0

Alexandre Julliard : dmloader: Remove an unused function.
by Alexandre Julliard 03 Dec '08

03 Dec '08

Module: wine Branch: master Commit: 72f3e3d483c6b01b701b8c04b892e2ef773a246c URL: http://source.winehq.org/git/wine.git/?a=commit;h=72f3e3d483c6b01b701b8c04b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 3 12:12:21 2008 +0100 dmloader: Remove an unused function. --- dlls/dmloader/debug.c | 5 ----- dlls/dmloader/debug.h | 2 -- 2 files changed, 0 insertions(+), 7 deletions(-) diff --git a/dlls/dmloader/debug.c b/dlls/dmloader/debug.c index db85d76..95c5df2 100644 --- a/dlls/dmloader/debug.c +++ b/dlls/dmloader/debug.c @@ -22,11 +22,6 @@ #include "dmloader_private.h" -/* check whether the given DWORD is even (return 0) or odd (return 1) */ -int even_or_odd (DWORD number) { - return (number & 0x1); /* basically, check if bit 0 is set ;) */ -} - /* figures out whether given FOURCC is valid DirectMusic form ID */ BOOL IS_VALID_DMFORM (FOURCC chunkID) { if ((chunkID == DMUS_FOURCC_AUDIOPATH_FORM) || (chunkID == DMUS_FOURCC_BAND_FORM) || (chunkID == DMUS_FOURCC_CHORDMAP_FORM) diff --git a/dlls/dmloader/debug.h b/dlls/dmloader/debug.h index 6831dc4..56cfb72 100644 --- a/dlls/dmloader/debug.h +++ b/dlls/dmloader/debug.h @@ -41,8 +41,6 @@ typedef struct { #define FE(x) { x, #x } #define GE(x) { &x, #x } -/* check whether the given DWORD is even (return 0) or odd (return 1) */ -extern int even_or_odd (DWORD number); /* check whether chunkID is valid dmobject form chunk */ extern BOOL IS_VALID_DMFORM (FOURCC chunkID); /* translate STREAM_SEEK flag to string */

1 0

Alexandre Julliard : ole32: Remove some unused functions.
by Alexandre Julliard 03 Dec '08

03 Dec '08

Module: wine Branch: master Commit: 04fb1d656ab6e637656a046e7b6c1a63680b65bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=04fb1d656ab6e637656a046e7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 3 12:11:09 2008 +0100 ole32: Remove some unused functions. --- dlls/ole32/storage.c | 40 ---------------------------------------- 1 files changed, 0 insertions(+), 40 deletions(-) diff --git a/dlls/ole32/storage.c b/dlls/ole32/storage.c index d356c67..2e5203f 100644 --- a/dlls/ole32/storage.c +++ b/dlls/ole32/storage.c @@ -1623,46 +1623,6 @@ typedef struct ULARGE_INTEGER offset; } IStream32Impl; -/***************************************************************************** - * IStream32_QueryInterface [VTABLE] - */ -HRESULT WINAPI IStream_fnQueryInterface( - IStream* iface,REFIID refiid,LPVOID *obj -) { - IStream32Impl *This = (IStream32Impl *)iface; - - TRACE_(relay)("(%p)->(%s,%p)\n",This,debugstr_guid(refiid),obj); - if (!memcmp(&IID_IUnknown,refiid,sizeof(IID_IUnknown))) { - *obj = This; - return 0; - } - return OLE_E_ENUM_NOMORE; - -} - -/****************************************************************************** - * IStream32_AddRef [VTABLE] - */ -ULONG WINAPI IStream_fnAddRef(IStream* iface) { - IStream32Impl *This = (IStream32Impl *)iface; - return InterlockedIncrement(&This->ref); -} - -/****************************************************************************** - * IStream32_Release [VTABLE] - */ -ULONG WINAPI IStream_fnRelease(IStream* iface) { - IStream32Impl *This = (IStream32Impl *)iface; - ULONG ref; - FlushFileBuffers(This->hf); - ref = InterlockedDecrement(&This->ref); - if (!ref) { - CloseHandle(This->hf); - HeapFree( GetProcessHeap(), 0, This ); - } - return ref; -} - /****************************************************************************** * IStorage16_QueryInterface [STORAGE.500] */

1 0

Alexandre Julliard : winex11: Make some functions static.
by Alexandre Julliard 03 Dec '08

03 Dec '08

Module: wine Branch: master Commit: b4debd66a2b7e50bd468a29cfc390cf834ffb38e URL: http://source.winehq.org/git/wine.git/?a=commit;h=b4debd66a2b7e50bd468a29cf… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 3 12:10:32 2008 +0100 winex11: Make some functions static. --- dlls/winex11.drv/wintab.c | 2 +- dlls/winex11.drv/xvidmode.c | 6 +++--- dlls/winex11.drv/xvidmode.h | 4 ---- 3 files changed, 4 insertions(+), 8 deletions(-) diff --git a/dlls/winex11.drv/wintab.c b/dlls/winex11.drv/wintab.c index c6545e7..c997c7c 100644 --- a/dlls/winex11.drv/wintab.c +++ b/dlls/winex11.drv/wintab.c @@ -359,7 +359,7 @@ static void trace_axes(XValuatorInfoPtr val) TRACE(" Axis %d: [resolution %d|min_value %d|max_value %d]\n", i, axis->resolution, axis->min_value, axis->max_value); } -BOOL match_token(const char *haystack, const char *needle) +static BOOL match_token(const char *haystack, const char *needle) { const char *p, *q; for (p = haystack; *p; ) diff --git a/dlls/winex11.drv/xvidmode.c b/dlls/winex11.drv/xvidmode.c index a97a9db..4ffbdc9 100644 --- a/dlls/winex11.drv/xvidmode.c +++ b/dlls/winex11.drv/xvidmode.c @@ -57,7 +57,7 @@ static unsigned int dd_mode_count; static XF86VidModeModeInfo** real_xf86vm_modes; static unsigned int real_xf86vm_mode_count; -#define MAKE_FUNCPTR(f) typeof(f) * p##f; +#define MAKE_FUNCPTR(f) static typeof(f) * p##f; MAKE_FUNCPTR(XF86VidModeGetAllModeLines) MAKE_FUNCPTR(XF86VidModeGetModeLine) MAKE_FUNCPTR(XF86VidModeLockModeSwitch) @@ -356,7 +356,7 @@ static BOOL ComputeGammaFromRamp(WORD ramp[256], float *gamma) /* Hmm... should gamma control be available in desktop mode or not? * I'll assume that it should */ -BOOL X11DRV_XF86VM_GetGammaRamp(LPDDGAMMARAMP ramp) +static BOOL X11DRV_XF86VM_GetGammaRamp(LPDDGAMMARAMP ramp) { #ifdef X_XF86VidModeSetGamma XF86VidModeGamma gamma; @@ -390,7 +390,7 @@ BOOL X11DRV_XF86VM_GetGammaRamp(LPDDGAMMARAMP ramp) return FALSE; } -BOOL X11DRV_XF86VM_SetGammaRamp(LPDDGAMMARAMP ramp) +static BOOL X11DRV_XF86VM_SetGammaRamp(LPDDGAMMARAMP ramp) { #ifdef X_XF86VidModeSetGamma XF86VidModeGamma gamma; diff --git a/dlls/winex11.drv/xvidmode.h b/dlls/winex11.drv/xvidmode.h index c6b7d17..9d68ff1 100644 --- a/dlls/winex11.drv/xvidmode.h +++ b/dlls/winex11.drv/xvidmode.h @@ -33,10 +33,6 @@ void X11DRV_XF86VM_Init(void); void X11DRV_XF86VM_Cleanup(void); -void X11DRV_XF86VM_SetExclusiveMode(int lock); - -BOOL X11DRV_XF86VM_GetGammaRamp(LPDDGAMMARAMP ramp); -BOOL X11DRV_XF86VM_SetGammaRamp(LPDDGAMMARAMP ramp); #endif /* SONAME_LIBXXF86VM */ #endif /* __WINE_XVIDMODE_H */

1 0

Alexandre Julliard : winex11: Remove some unused functions.
by Alexandre Julliard 03 Dec '08

03 Dec '08

Module: wine Branch: master Commit: e48283bedd78d738e296f32c86a2a779fba4c558 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e48283bedd78d738e296f32c8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 3 12:10:21 2008 +0100 winex11: Remove some unused functions. --- dlls/winex11.drv/ime.c | 16 ---------------- dlls/winex11.drv/x11drv.h | 1 - dlls/winex11.drv/x11font.h | 1 - dlls/winex11.drv/xfont.c | 9 --------- 4 files changed, 0 insertions(+), 27 deletions(-) diff --git a/dlls/winex11.drv/ime.c b/dlls/winex11.drv/ime.c index e07321e..56dcaa7 100644 --- a/dlls/winex11.drv/ime.c +++ b/dlls/winex11.drv/ime.c @@ -985,22 +985,6 @@ void IME_SetOpenStatus(BOOL fOpen) ImmSetOpenStatus(RealIMC(FROM_X11), fOpen); } -LRESULT IME_SendMessageToSelectedHWND(UINT msg, WPARAM wParam, LPARAM lParam) -{ - LPINPUTCONTEXT lpIMC; - LRESULT rc = 0; - - if (!hSelectedFrom) - return rc; - - lpIMC = LockRealIMC(FROM_X11); - if (lpIMC) - rc = SendMessageW(lpIMC->hWnd,msg,wParam,lParam); - - UnlockRealIMC(FROM_X11); - return rc; -} - INT IME_GetCursorPos(void) { LPINPUTCONTEXT lpIMC; diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 8a5a4b5..e5a0fe0 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -278,7 +278,6 @@ extern BOOL destroy_glxpixmap(Display *display, XID glxpixmap); /* IME support */ extern void IME_UnregisterClasses(void); extern void IME_SetOpenStatus(BOOL fOpen); -extern LRESULT IME_SendMessageToSelectedHWND(UINT msg, WPARAM wParam, LPARAM lParam); extern INT IME_GetCursorPos(); extern void IME_SetCursorPos(DWORD pos); extern void IME_UpdateAssociation(HWND focus); diff --git a/dlls/winex11.drv/x11font.h b/dlls/winex11.drv/x11font.h index 27eb82e..dd36313 100644 --- a/dlls/winex11.drv/x11font.h +++ b/dlls/winex11.drv/x11font.h @@ -221,7 +221,6 @@ typedef struct extern fontObject* XFONT_GetFontObject( X_PHYSFONT pFont ); extern XFontStruct* XFONT_GetFontStruct( X_PHYSFONT pFont ); -extern LPIFONTINFO16 XFONT_GetFontInfo( X_PHYSFONT pFont ); /* internal charset(hibyte must be set) */ /* lobyte is DEFAULT_CHARSET(=0). */ diff --git a/dlls/winex11.drv/xfont.c b/dlls/winex11.drv/xfont.c index b34e1d5..9fcb993 100644 --- a/dlls/winex11.drv/xfont.c +++ b/dlls/winex11.drv/xfont.c @@ -3180,15 +3180,6 @@ XFontStruct* XFONT_GetFontStruct( X_PHYSFONT pFont ) return NULL; } -/*********************************************************************** - * XFONT_GetFontInfo - */ -LPIFONTINFO16 XFONT_GetFontInfo( X_PHYSFONT pFont ) -{ - if( CHECK_PFONT(pFont) ) return &(__PFONT(pFont)->fi->df); - return NULL; -} - /* X11DRV Interface ****************************************************

1 0