August 2010 - Wine-Commits - list.winehq.org

Francois Gouget : usp10: Make SHAPE_ApplyOpenTypeFeatures() static.
by Alexandre Julliard Aug. 26, 2010

Aug. 26, 2010

Module: wine Branch: master Commit: f0253f3035ed91d9d4231904b94a2a5ee3248204 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f0253f3035ed91d9d4231904b… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Aug 26 13:03:09 2010 +0200 usp10: Make SHAPE_ApplyOpenTypeFeatures() static. --- dlls/usp10/shape.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/usp10/shape.c b/dlls/usp10/shape.c index 70722c2..e370e33 100644 --- a/dlls/usp10/shape.c +++ b/dlls/usp10/shape.c @@ -1275,7 +1275,7 @@ void SHAPE_ContextualShaping(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *psa, WC ShapingData[psa->eScript].contextProc(hdc, psc, psa, pwcChars, cChars, pwOutGlyphs, pcGlyphs, cMaxGlyphs, pwLogClust); } -void SHAPE_ApplyOpenTypeFeatures(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *psa, WORD* pwOutGlyphs, INT* pcGlyphs, INT cMaxGlyphs, INT cChars, const TEXTRANGE_PROPERTIES *rpRangeProperties, WORD *pwLogClust) +static void SHAPE_ApplyOpenTypeFeatures(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *psa, WORD* pwOutGlyphs, INT* pcGlyphs, INT cMaxGlyphs, INT cChars, const TEXTRANGE_PROPERTIES *rpRangeProperties, WORD *pwLogClust) { int i; INT dirL;

1 0

Louis Lenders : mscoree/tests: Add some tests for GetRequestedRuntimeInfo.
by Alexandre Julliard Aug. 26, 2010

Aug. 26, 2010

Module: wine Branch: master Commit: 830867a12168ba59f11a894e8159529c3c7f42f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=830867a12168ba59f11a894e8… Author: Louis Lenders <xerox_xerox2000(a)yahoo.co.uk> Date: Wed Aug 25 23:06:02 2010 +0200 mscoree/tests: Add some tests for GetRequestedRuntimeInfo. --- dlls/mscoree/tests/mscoree.c | 43 +++++++++++++++++++++++++++++++++++++++++- include/corerror.h | 2 + 2 files changed, 44 insertions(+), 1 deletions(-) diff --git a/dlls/mscoree/tests/mscoree.c b/dlls/mscoree/tests/mscoree.c index b513ade..c8776f6 100644 --- a/dlls/mscoree/tests/mscoree.c +++ b/dlls/mscoree/tests/mscoree.c @@ -16,12 +16,15 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "corerror.h" +#include "mscoree.h" #include "wine/test.h" static HMODULE hmscoree; static HRESULT (WINAPI *pGetCORVersion)(LPWSTR, DWORD, DWORD*); static HRESULT (WINAPI *pGetCORSystemDirectory)(LPWSTR, DWORD, DWORD*); +static HRESULT (WINAPI *pGetRequestedRuntimeInfo)(LPCWSTR, LPCWSTR, LPCWSTR, DWORD, DWORD, LPWSTR, DWORD, DWORD*, LPWSTR, DWORD, DWORD*); static BOOL init_functionpointers(void) { @@ -35,7 +38,9 @@ static BOOL init_functionpointers(void) pGetCORVersion = (void *)GetProcAddress(hmscoree, "GetCORVersion"); pGetCORSystemDirectory = (void *)GetProcAddress(hmscoree, "GetCORSystemDirectory"); - if (!pGetCORVersion || !pGetCORSystemDirectory) + pGetRequestedRuntimeInfo = (void *)GetProcAddress(hmscoree, "GetRequestedRuntimeInfo"); + + if (!pGetCORVersion || !pGetCORSystemDirectory || !pGetRequestedRuntimeInfo) { win_skip("functions not available\n"); FreeLibrary(hmscoree); @@ -47,6 +52,9 @@ static BOOL init_functionpointers(void) static void test_versioninfo(void) { + const WCHAR v2_0[] = {'v','2','.','0','.','5','0','7','2','7',0}; + const WCHAR v1_1[] = {'v','1','.','1','.','4','3','2','2',0}; + WCHAR version[MAX_PATH]; WCHAR path[MAX_PATH]; DWORD size, path_len; @@ -80,6 +88,39 @@ static void test_versioninfo(void) ok(hr == E_POINTER,"GetCORSystemDirectory returned %08x\n", hr); trace("latest installed .net installed in directory: %s\n", wine_dbgstr_w(path)); + + /* test GetRequestedRuntimeInfo, first get info about different versions of runtime */ + hr = pGetRequestedRuntimeInfo( NULL, v2_0, NULL, 0, 0, path, MAX_PATH, &path_len, version, MAX_PATH, &size); + + if(hr == CLR_E_SHIM_RUNTIME) return; /* skipping rest of tests on win2k as .net 2.0 not installed */ + + ok(hr == S_OK, "GetRequestedRuntimeInfo returned %08x\n", hr); + trace(" installed in directory %s is .net version %s \n", wine_dbgstr_w(path), wine_dbgstr_w(version)); + + hr = pGetRequestedRuntimeInfo( NULL, v1_1, NULL, 0, 0, path, MAX_PATH, &path_len, version, MAX_PATH, &size); + ok(hr == S_OK || CLR_E_SHIM_RUNTIME /*v1_1 not installed*/, "GetRequestedRuntimeInfo returned %08x\n", hr); + if(hr == S_OK) + trace(" installed in directory %s is .net version %s \n", wine_dbgstr_w(path), wine_dbgstr_w(version)); + /* version number NULL not allowed without RUNTIME_INFO_UPGRADE_VERSION flag */ + hr = pGetRequestedRuntimeInfo( NULL, NULL, NULL, 0, 0, path, MAX_PATH, &path_len, version, MAX_PATH, &size); + todo_wine ok(hr == CLR_E_SHIM_RUNTIME, "GetRequestedRuntimeInfo returned %08x\n", hr); + /* with RUNTIME_INFO_UPGRADE_VERSION flag and version number NULL, latest installed version is returned */ + hr = pGetRequestedRuntimeInfo( NULL, NULL, NULL, 0, RUNTIME_INFO_UPGRADE_VERSION, path, MAX_PATH, &path_len, version, MAX_PATH, &size); + ok(hr == S_OK, "GetRequestedRuntimeInfo returned %08x\n", hr); + + hr = pGetRequestedRuntimeInfo( NULL, v2_0, NULL, 0, 0, path, 1, &path_len, version, MAX_PATH, &size); + todo_wine ok(hr == HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), "GetRequestedRuntimeInfo returned %08x\n", hr); + + /* if one of the buffers is NULL, the other one is still happily filled */ + memset(version, 0, sizeof(version)); + hr = pGetRequestedRuntimeInfo( NULL, v2_0, NULL, 0, 0, NULL, MAX_PATH, &path_len, version, MAX_PATH, &size); + ok(hr == S_OK, "GetRequestedRuntimeInfo returned %08x\n", hr); + ok(!lstrcmpW(version, v2_0), "version is %s , expected %s\n", wine_dbgstr_w(version), wine_dbgstr_w(v2_0)); + /* With NULL-pointer for bufferlength, the buffer itsself still gets filled with correct string */ + memset(version, 0, sizeof(version)); + hr = pGetRequestedRuntimeInfo( NULL, v2_0, NULL, 0, 0, path, MAX_PATH, &path_len, version, MAX_PATH, NULL); + todo_wine ok(hr == S_OK, "GetRequestedRuntimeInfo returned %08x\n", hr); + todo_wine ok(!lstrcmpW(version, v2_0), "version is %s , expected %s\n", wine_dbgstr_w(version), wine_dbgstr_w(v2_0)); } START_TEST(mscoree) diff --git a/include/corerror.h b/include/corerror.h index 892fc28..10e0bd2 100644 --- a/include/corerror.h +++ b/include/corerror.h @@ -123,4 +123,6 @@ #define CLDB_E_FILE_OLDVER EMAKEHR(0x1107) +#define CLR_E_SHIM_RUNTIME EMAKEHR(0x1700) + #endif /* __WINE_CORERROR_H */

1 0

Louis Lenders : include: Add RUNTIME_INFO_FLAGS enumeration to mscoree header.
by Alexandre Julliard Aug. 26, 2010

Aug. 26, 2010

Module: wine Branch: master Commit: b534bf1d5987742ab48f5bd9684ade0a6395da28 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b534bf1d5987742ab48f5bd96… Author: Louis Lenders <xerox_xerox2000(a)yahoo.co.uk> Date: Wed Aug 25 22:03:14 2010 +0200 include: Add RUNTIME_INFO_FLAGS enumeration to mscoree header. --- include/mscoree.idl | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/include/mscoree.idl b/include/mscoree.idl index 19749fb..56861cd 100644 --- a/include/mscoree.idl +++ b/include/mscoree.idl @@ -36,6 +36,16 @@ cpp_quote("HRESULT WINAPI LockClrVersion(FLockClrVersionCallback,FLockClrVer typedef void* HDOMAINENUM; +typedef enum RUNTIME_INFO_FLAGS { + RUNTIME_INFO_UPGRADE_VERSION = 0x1, + RUNTIME_INFO_REQUEST_IA64 = 0x2, + RUNTIME_INFO_REQUEST_AMD64 = 0x4, + RUNTIME_INFO_REQUEST_X86 = 0x8, + RUNTIME_INFO_DONT_RETURN_DIRECTORY = 0x10, + RUNTIME_INFO_DONT_RETURN_VERSION = 0x20, + RUNTIME_INFO_DONT_SHOW_ERROR_DIALOG = 0x40 +} RUNTIME_INFO_FLAGS; + [ uuid(F31D1788-C397-4725-87A5-6AF3472C2791), version(1.0),

1 0

Francois Gouget : gameux: Use SUBLANG_NEUTRAL for language-independent resources.
by Alexandre Julliard Aug. 26, 2010

Aug. 26, 2010

Module: wine Branch: master Commit: cc0818b053c6bdbfa2cc7011d37417859bc33245 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cc0818b053c6bdbfa2cc7011d… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Aug 26 13:04:03 2010 +0200 gameux: Use SUBLANG_NEUTRAL for language-independent resources. --- dlls/gameux/tests/rsrc.rc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/gameux/tests/rsrc.rc b/dlls/gameux/tests/rsrc.rc index b310db9..fa9e1ad 100644 --- a/dlls/gameux/tests/rsrc.rc +++ b/dlls/gameux/tests/rsrc.rc @@ -22,5 +22,5 @@ #include "winuser.h" #include <gameux.h> -LANGUAGE LANG_NEUTRAL, SUBLANG_DEFAULT +LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL ID_GDF_XML DATA "test.gdf.xml"

1 0

Francois Gouget : shdocvw: Make adjust_ie_docobj_rect() static.
by Alexandre Julliard Aug. 26, 2010

Aug. 26, 2010

Module: wine Branch: master Commit: a62beeeaf79ebf47aed560fdd959c1e3ce06c548 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a62beeeaf79ebf47aed560fdd… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Aug 26 13:03:00 2010 +0200 shdocvw: Make adjust_ie_docobj_rect() static. --- dlls/shdocvw/iexplore.c | 2 +- dlls/shdocvw/shdocvw.h | 1 - 2 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/shdocvw/iexplore.c b/dlls/shdocvw/iexplore.c index cbbcac5..45b7b70 100644 --- a/dlls/shdocvw/iexplore.c +++ b/dlls/shdocvw/iexplore.c @@ -60,7 +60,7 @@ HRESULT update_ie_statustext(InternetExplorer* This, LPCWSTR text) return S_OK; } -void adjust_ie_docobj_rect(HWND frame, RECT* rc) +static void adjust_ie_docobj_rect(HWND frame, RECT* rc) { HWND hwndRebar = GetDlgItem(frame, IDC_BROWSE_REBAR); HWND hwndStatus = GetDlgItem(frame, IDC_BROWSE_STATUSBAR); diff --git a/dlls/shdocvw/shdocvw.h b/dlls/shdocvw/shdocvw.h index d45f559..4f3425d 100644 --- a/dlls/shdocvw/shdocvw.h +++ b/dlls/shdocvw/shdocvw.h @@ -284,7 +284,6 @@ static inline void SHDOCVW_UnlockModule(void) { InterlockedDecrement( &SHDOCVW_r extern HINSTANCE shdocvw_hinstance; extern void register_iewindow_class(void); extern void unregister_iewindow_class(void); -extern void adjust_ie_docobj_rect(HWND, RECT*); extern HRESULT update_ie_statustext(InternetExplorer*, LPCWSTR); HRESULT register_class_object(BOOL);

1 0

Francois Gouget : qedit: Make (media,pins)enum_create() static.
by Alexandre Julliard Aug. 26, 2010

Aug. 26, 2010

Module: wine Branch: master Commit: 59ae1d69f90e0995105379f5059d1757cab3d788 URL: http://source.winehq.org/git/wine.git/?a=commit;h=59ae1d69f90e0995105379f50… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Aug 26 13:02:51 2010 +0200 qedit: Make (media,pins)enum_create() static. --- dlls/qedit/samplegrabber.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/qedit/samplegrabber.c b/dlls/qedit/samplegrabber.c index 78979fe..19556cf 100644 --- a/dlls/qedit/samplegrabber.c +++ b/dlls/qedit/samplegrabber.c @@ -36,8 +36,8 @@ static WCHAR const vendor_name[] = { 'W', 'i', 'n', 'e', 0 }; static WCHAR const pin_in_name[] = { 'I', 'n', 0 }; static WCHAR const pin_out_name[] = { 'O', 'u', 't', 0 }; -IEnumPins *pinsenum_create(IBaseFilter *filter, IPin **pins, ULONG pinCount); -IEnumMediaTypes *mediaenum_create(const AM_MEDIA_TYPE *mtype); +static IEnumPins *pinsenum_create(IBaseFilter *filter, IPin **pins, ULONG pinCount); +static IEnumMediaTypes *mediaenum_create(const AM_MEDIA_TYPE *mtype); /* Fixed pins enumerator, holds filter referenced */ typedef struct _PE_Impl { @@ -171,7 +171,7 @@ static const IEnumPinsVtbl IEnumPins_VTable = Fixed_IEnumPins_Clone, }; -IEnumPins *pinsenum_create(IBaseFilter *filter, IPin **pins, ULONG pinCount) +static IEnumPins *pinsenum_create(IBaseFilter *filter, IPin **pins, ULONG pinCount) { ULONG len = sizeof(PE_Impl) + (pinCount * sizeof(IPin *)); PE_Impl *obj = CoTaskMemAlloc(len); @@ -324,7 +324,7 @@ static const IEnumMediaTypesVtbl IEnumMediaTypes_VTable = Single_IEnumMediaTypes_Clone, }; -IEnumMediaTypes *mediaenum_create(const AM_MEDIA_TYPE *mtype) +static IEnumMediaTypes *mediaenum_create(const AM_MEDIA_TYPE *mtype) { ME_Impl *obj = CoTaskMemAlloc(sizeof(ME_Impl)); if (obj) {

1 0

Francois Gouget : msvcp90: Make init_cxx_funcs() static.
by Alexandre Julliard Aug. 26, 2010

Aug. 26, 2010

Module: wine Branch: master Commit: 7e6e25cc8e4d78144346e3e305e6ff1d88e4da5f URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e6e25cc8e4d78144346e3e30… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Aug 26 13:03:54 2010 +0200 msvcp90: Make init_cxx_funcs() static. --- dlls/msvcp90/msvcp90_main.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msvcp90/msvcp90_main.c b/dlls/msvcp90/msvcp90_main.c index 9555d48..9ce763c 100644 --- a/dlls/msvcp90/msvcp90_main.c +++ b/dlls/msvcp90/msvcp90_main.c @@ -30,7 +30,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(msvcp90); void* (__cdecl *MSVCRT_operator_new)(size_t); void (__cdecl *MSVCRT_operator_delete)(void*); -void init_cxx_funcs(void) +static void init_cxx_funcs(void) { HMODULE hmod = GetModuleHandleA("msvcrt.dll");

1 0

Francois Gouget : msxml3: Make parse_xml() static.
by Alexandre Julliard Aug. 26, 2010

Aug. 26, 2010

Module: wine Branch: master Commit: 2dbe80bb7e88ff6f464b4caaeb58c6f4a1430f48 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2dbe80bb7e88ff6f464b4caae… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Aug 26 13:02:36 2010 +0200 msxml3: Make parse_xml() static. --- dlls/msxml3/msxml_private.h | 1 - dlls/msxml3/xmldoc.c | 2 +- 2 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/msxml3/msxml_private.h b/dlls/msxml3/msxml_private.h index e0279f1..5fbedf9 100644 --- a/dlls/msxml3/msxml_private.h +++ b/dlls/msxml3/msxml_private.h @@ -139,7 +139,6 @@ extern xmlNodePtr xmldoc_unlink_xmldecl(xmlDocPtr doc); extern HRESULT XMLElement_create( IUnknown *pUnkOuter, xmlNodePtr node, LPVOID *ppObj, BOOL own ); -extern xmlDocPtr parse_xml(char *ptr, int len); /* IXMLDOMNode Internal Structure */ typedef struct _xmlnode diff --git a/dlls/msxml3/xmldoc.c b/dlls/msxml3/xmldoc.c index d1a010f..af183c9 100644 --- a/dlls/msxml3/xmldoc.c +++ b/dlls/msxml3/xmldoc.c @@ -591,7 +591,7 @@ static HRESULT WINAPI xmldoc_IPersistStreamInit_IsDirty( return E_NOTIMPL; } -xmlDocPtr parse_xml(char *ptr, int len) +static xmlDocPtr parse_xml(char *ptr, int len) { #ifdef HAVE_XMLREADMEMORY return xmlReadMemory(ptr, len, NULL, NULL,

1 0

Francois Gouget : d3dcompiler_43: Make debug_print_{relarg, swizzle, writemask}() static.
by Alexandre Julliard Aug. 26, 2010

Aug. 26, 2010

Module: wine Branch: master Commit: ea67356998766608942ca88c4ae956f5b3bc35be URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea67356998766608942ca88c4… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Aug 26 13:00:59 2010 +0200 d3dcompiler_43: Make debug_print_{relarg,swizzle,writemask}() static. --- dlls/d3dcompiler_43/asmutils.c | 46 ++++++++++++++-------------- dlls/d3dcompiler_43/d3dcompiler_private.h | 2 - 2 files changed, 23 insertions(+), 25 deletions(-) diff --git a/dlls/d3dcompiler_43/asmutils.c b/dlls/d3dcompiler_43/asmutils.c index 68b25cf..e6f0d74 100644 --- a/dlls/d3dcompiler_43/asmutils.c +++ b/dlls/d3dcompiler_43/asmutils.c @@ -369,7 +369,7 @@ static const char *get_regname(const struct shader_reg *reg) { } } -const char *debug_print_writemask(DWORD mask) { +static const char *debug_print_writemask(DWORD mask) { char ret[6]; unsigned char pos = 1; @@ -383,28 +383,7 @@ const char *debug_print_writemask(DWORD mask) { return wine_dbg_sprintf("%s", ret); } -const char *debug_print_relarg(const struct shader_reg *reg) { - const char *short_swizzle; - if(!reg->rel_reg) return ""; - - short_swizzle = debug_print_swizzle(reg->rel_reg->swizzle); - - if(reg->rel_reg->type == BWRITERSPR_ADDR) { - return wine_dbg_sprintf("[a%u%s]", reg->rel_reg->regnum, short_swizzle); - } else if(reg->rel_reg->type == BWRITERSPR_LOOP && reg->rel_reg->regnum == 0) { - return wine_dbg_sprintf("[aL%s]", short_swizzle); - } else { - return "Unexpected relative addressing argument"; - } -} - -const char *debug_print_dstreg(const struct shader_reg *reg) { - return wine_dbg_sprintf("%s%s%s", get_regname(reg), - debug_print_relarg(reg), - debug_print_writemask(reg->writemask)); -} - -const char *debug_print_swizzle(DWORD arg) { +static const char *debug_print_swizzle(DWORD arg) { char ret[6]; unsigned int i; DWORD swizzle[4]; @@ -440,6 +419,27 @@ const char *debug_print_swizzle(DWORD arg) { return wine_dbg_sprintf("%s", ret); } +static const char *debug_print_relarg(const struct shader_reg *reg) { + const char *short_swizzle; + if(!reg->rel_reg) return ""; + + short_swizzle = debug_print_swizzle(reg->rel_reg->swizzle); + + if(reg->rel_reg->type == BWRITERSPR_ADDR) { + return wine_dbg_sprintf("[a%u%s]", reg->rel_reg->regnum, short_swizzle); + } else if(reg->rel_reg->type == BWRITERSPR_LOOP && reg->rel_reg->regnum == 0) { + return wine_dbg_sprintf("[aL%s]", short_swizzle); + } else { + return "Unexpected relative addressing argument"; + } +} + +const char *debug_print_dstreg(const struct shader_reg *reg) { + return wine_dbg_sprintf("%s%s%s", get_regname(reg), + debug_print_relarg(reg), + debug_print_writemask(reg->writemask)); +} + const char *debug_print_srcreg(const struct shader_reg *reg) { switch(reg->srcmod) { case BWRITERSPSM_NONE: diff --git a/dlls/d3dcompiler_43/d3dcompiler_private.h b/dlls/d3dcompiler_43/d3dcompiler_private.h index c085c90..929e635 100644 --- a/dlls/d3dcompiler_43/d3dcompiler_private.h +++ b/dlls/d3dcompiler_43/d3dcompiler_private.h @@ -327,8 +327,6 @@ const char *debug_print_dstmod(DWORD mod); const char *debug_print_shift(DWORD shift); const char *debug_print_dstreg(const struct shader_reg *reg); const char *debug_print_srcreg(const struct shader_reg *reg); -const char *debug_print_swizzle(DWORD swizzle); -const char *debug_print_writemask(DWORD mask); const char *debug_print_comp(DWORD comp); const char *debug_print_opcode(DWORD opcode);

1 0

Francois Gouget : d3dxof: Make debugstr_fourcc() static.
by Alexandre Julliard Aug. 26, 2010

Aug. 26, 2010

Module: wine Branch: master Commit: 537d93326ecef49cd7360b05aac56dab167f5c3b URL: http://source.winehq.org/git/wine.git/?a=commit;h=537d93326ecef49cd7360b05a… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Aug 26 13:01:14 2010 +0200 d3dxof: Make debugstr_fourcc() static. --- dlls/d3dxof/d3dxof.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3dxof/d3dxof.c b/dlls/d3dxof/d3dxof.c index bfa761b..51fc14b 100644 --- a/dlls/d3dxof/d3dxof.c +++ b/dlls/d3dxof/d3dxof.c @@ -58,7 +58,7 @@ static HRESULT IDirectXFileEnumObjectImpl_Create(IDirectXFileEnumObjectImpl** pp static HRESULT IDirectXFileSaveObjectImpl_Create(IDirectXFileSaveObjectImpl** ppObj); /* FOURCC to string conversion for debug messages */ -const char *debugstr_fourcc(DWORD fourcc) +static const char *debugstr_fourcc(DWORD fourcc) { if (!fourcc) return "'null'"; return wine_dbg_sprintf ("\'%c%c%c%c\'",

1 0