December 2008 - Wine-commits

Alexandre Julliard : mountmgr.sys: Avoid a compiler warning on older gcc.
by Alexandre Julliard 04 Dec '08

04 Dec '08

Module: wine Branch: master Commit: 5606bf4df47306702c624bd66b1e28b8aee1c2ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=5606bf4df47306702c624bd66… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 4 14:32:21 2008 +0100 mountmgr.sys: Avoid a compiler warning on older gcc. --- dlls/mountmgr.sys/mountmgr.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mountmgr.sys/mountmgr.c b/dlls/mountmgr.sys/mountmgr.c index 5dc9051..00112b9 100644 --- a/dlls/mountmgr.sys/mountmgr.c +++ b/dlls/mountmgr.sys/mountmgr.c @@ -283,7 +283,7 @@ static NTSTATUS query_unix_drive( const void *in_buff, SIZE_T insize, const char *device, *mount_point; int letter = tolowerW( input->letter ); NTSTATUS status; - DWORD size, type; + DWORD size, type = DEVICE_UNKNOWN; enum device_type device_type; char *ptr;

1 0

Alexandre Julliard : wininet/tests: Avoid using size_t in a trace.
by Alexandre Julliard 04 Dec '08

04 Dec '08

Module: wine Branch: master Commit: 31c7ddea273df2e5a245365a5309679cefaaac83 URL: http://source.winehq.org/git/wine.git/?a=commit;h=31c7ddea273df2e5a245365a5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 4 14:32:49 2008 +0100 wininet/tests: Avoid using size_t in a trace. --- dlls/wininet/tests/url.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wininet/tests/url.c b/dlls/wininet/tests/url.c index f10e53b..c848f6b 100644 --- a/dlls/wininet/tests/url.c +++ b/dlls/wininet/tests/url.c @@ -791,7 +791,7 @@ static void InternetCreateUrlA_test(void) szUrl = HeapAlloc(GetProcessHeap(), 0, len); InternetCreateUrlA(&urlComp, ICU_ESCAPE, szUrl, &len); ok(ret, "Expected success\n"); - ok(len == strlen(CREATE_URL13), "Expected len %u, got %u\n", strlen(CREATE_URL13), len); + ok(len == strlen(CREATE_URL13), "Got len %u\n", len); ok(!strcmp(szUrl, CREATE_URL13), "Expected \"%s\", got \"%s\"\n", CREATE_URL13, szUrl); HeapFree(GetProcessHeap(), 0, szUrl);

1 0

Alexandre Julliard : winealsa.drv: Fix a printf format warning.
by Alexandre Julliard 04 Dec '08

04 Dec '08

Module: wine Branch: master Commit: 78ddd00800e667614fbf87651b84479bef5a5311 URL: http://source.winehq.org/git/wine.git/?a=commit;h=78ddd00800e667614fbf87651… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 4 14:32:59 2008 +0100 winealsa.drv: Fix a printf format warning. --- dlls/winealsa.drv/wavein.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winealsa.drv/wavein.c b/dlls/winealsa.drv/wavein.c index a5d0a0c..89ad9df 100644 --- a/dlls/winealsa.drv/wavein.c +++ b/dlls/winealsa.drv/wavein.c @@ -784,7 +784,7 @@ DWORD WINAPI ALSA_widMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser, DWORD WINAPI ALSA_widMessage(WORD wDevID, WORD wMsg, DWORD_PTR dwUser, DWORD_PTR dwParam1, DWORD_PTR dwParam2) { - FIXME("(%u, %04X, %08X, %08X, %08X):stub\n", wDevID, wMsg, dwUser, dwParam1, dwParam2); + FIXME("(%u, %04X, %08lX, %08lX, %08lX):stub\n", wDevID, wMsg, dwUser, dwParam1, dwParam2); return MMSYSERR_NOTENABLED; }

1 0

Alexandre Julliard : wineoss.drv: Fix a couple of printf format warnings.
by Alexandre Julliard 04 Dec '08

04 Dec '08

Module: wine Branch: master Commit: ba3054b60e0a188726865d967d9024be28fa61fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=ba3054b60e0a188726865d967… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 4 14:33:07 2008 +0100 wineoss.drv: Fix a couple of printf format warnings. --- dlls/wineoss.drv/audio.c | 4 ++-- dlls/wineoss.drv/mixer.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wineoss.drv/audio.c b/dlls/wineoss.drv/audio.c index 3a8d3ad..a008236 100644 --- a/dlls/wineoss.drv/audio.c +++ b/dlls/wineoss.drv/audio.c @@ -3167,7 +3167,7 @@ DWORD WINAPI OSS_widMessage(WORD wDevID, WORD wMsg, DWORD_PTR dwUser, DWORD WINAPI OSS_wodMessage(WORD wDevID, WORD wMsg, DWORD_PTR dwUser, DWORD_PTR dwParam1, DWORD_PTR dwParam2) { - FIXME("(%u, %04X, %08X, %08X, %08X):stub\n", wDevID, wMsg, dwUser, dwParam1, dwParam2); + FIXME("(%u, %04X, %08lX, %08lX, %08lX):stub\n", wDevID, wMsg, dwUser, dwParam1, dwParam2); return MMSYSERR_NOTENABLED; } @@ -3177,7 +3177,7 @@ DWORD WINAPI OSS_wodMessage(WORD wDevID, WORD wMsg, DWORD_PTR dwUser, DWORD WINAPI OSS_widMessage(WORD wDevID, WORD wMsg, DWORD_PTR dwUser, DWORD_PTR dwParam1, DWORD_PTR dwParam2) { - FIXME("(%u, %04X, %08X, %08X, %08X):stub\n", wDevID, wMsg, dwUser, dwParam1, dwParam2); + FIXME("(%u, %04X, %08lX, %08lX, %08lX):stub\n", wDevID, wMsg, dwUser, dwParam1, dwParam2); return MMSYSERR_NOTENABLED; } diff --git a/dlls/wineoss.drv/mixer.c b/dlls/wineoss.drv/mixer.c index b1ebd4b..241aa0c 100644 --- a/dlls/wineoss.drv/mixer.c +++ b/dlls/wineoss.drv/mixer.c @@ -1561,7 +1561,7 @@ DWORD WINAPI OSS_mxdMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser, return MMSYSERR_NOTSUPPORTED; } #else - TRACE("(%04X, %04X, %08X, %08X, %08X);\n", wDevID, wMsg, + TRACE("(%04X, %04X, %08lX, %08lX, %08lX);\n", wDevID, wMsg, dwUser, dwParam1, dwParam2); return MMSYSERR_NOTENABLED;

1 0

Huw Davies : d3d10core/tests: Skip the tests if we can' t create a DXGI factory.
by Alexandre Julliard 04 Dec '08

04 Dec '08

Module: wine Branch: master Commit: 180f74afcd553a9d691633918cedb2698d942822 URL: http://source.winehq.org/git/wine.git/?a=commit;h=180f74afcd553a9d691633918… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Dec 3 14:03:10 2008 +0000 d3d10core/tests: Skip the tests if we can't create a DXGI factory. --- dlls/d3d10core/tests/device.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index 8a01222..2989893 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -32,7 +32,6 @@ static ID3D10Device *create_device(void) HRESULT hr; hr = CreateDXGIFactory(&IID_IDXGIFactory, (void *)&factory); - ok(SUCCEEDED(hr), "CreateDXGIFactory failed, hr %#x\n", hr); if (FAILED(hr)) goto cleanup; hr = IDXGIFactory_EnumAdapters(factory, 0, &adapter);

1 0

Huw Davies : d3d8/tests: Skip tests if we can't create the D3D8 object.
by Alexandre Julliard 04 Dec '08

04 Dec '08

Module: wine Branch: master Commit: 855ce5bd86933bcd36cfcbe79c11e937f158d631 URL: http://source.winehq.org/git/wine.git/?a=commit;h=855ce5bd86933bcd36cfcbe79… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Dec 3 17:00:24 2008 +0000 d3d8/tests: Skip tests if we can't create the D3D8 object. --- dlls/d3d8/tests/device.c | 9 +++++++++ dlls/d3d8/tests/surface.c | 7 +++++-- dlls/d3d8/tests/texture.c | 7 +++++-- dlls/d3d8/tests/visual.c | 7 +++++-- dlls/d3d8/tests/volume.c | 7 +++++-- 5 files changed, 29 insertions(+), 8 deletions(-) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index cb60d7c..717f79c 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -1365,6 +1365,15 @@ START_TEST(device) ok(pDirect3DCreate8 != NULL, "Failed to get address of Direct3DCreate8\n"); if (pDirect3DCreate8) { + IDirect3D8 *d3d8; + d3d8 = pDirect3DCreate8( D3D_SDK_VERSION ); + if(!d3d8) + { + skip("could not create D3D8\n"); + return; + } + IDirect3D8_Release(d3d8); + test_display_modes(); test_shader_versions(); test_swapchain(); diff --git a/dlls/d3d8/tests/surface.c b/dlls/d3d8/tests/surface.c index 86fb884..e1e65b0 100644 --- a/dlls/d3d8/tests/surface.c +++ b/dlls/d3d8/tests/surface.c @@ -44,8 +44,11 @@ static IDirect3DDevice8 *init_d3d8(HMODULE d3d8_handle) if (!d3d8_create) return NULL; d3d8_ptr = d3d8_create(D3D_SDK_VERSION); - ok(d3d8_ptr != NULL, "Failed to create IDirect3D8 object\n"); - if (!d3d8_ptr) return NULL; + if (!d3d8_ptr) + { + skip("could not create D3D8\n"); + return NULL; + } IDirect3D8_GetAdapterDisplayMode(d3d8_ptr, D3DADAPTER_DEFAULT, &d3ddm ); ZeroMemory(&present_parameters, sizeof(present_parameters)); diff --git a/dlls/d3d8/tests/texture.c b/dlls/d3d8/tests/texture.c index a002763..fd97eac 100644 --- a/dlls/d3d8/tests/texture.c +++ b/dlls/d3d8/tests/texture.c @@ -44,8 +44,11 @@ static IDirect3DDevice8 *init_d3d8(HMODULE d3d8_handle) if (!d3d8_create) return NULL; d3d8_ptr = d3d8_create(D3D_SDK_VERSION); - ok(d3d8_ptr != NULL, "Failed to create IDirect3D8 object\n"); - if (!d3d8_ptr) return NULL; + if (!d3d8_ptr) + { + skip("could not create D3D8\n"); + return NULL; + } IDirect3D8_GetAdapterDisplayMode(d3d8_ptr, D3DADAPTER_DEFAULT, &d3ddm ); ZeroMemory(&present_parameters, sizeof(present_parameters)); diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index efead14..8f853c1 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -117,8 +117,11 @@ static IDirect3DDevice8 *init_d3d8(void) if (!d3d8_create) return NULL; d3d8_ptr = d3d8_create(D3D_SDK_VERSION); - ok(d3d8_ptr != NULL, "Failed to create IDirect3D8 object\n"); - if (!d3d8_ptr) return NULL; + if (!d3d8_ptr) + { + skip("could not create D3D8\n"); + return NULL; + } ZeroMemory(&present_parameters, sizeof(present_parameters)); present_parameters.Windowed = FALSE; diff --git a/dlls/d3d8/tests/volume.c b/dlls/d3d8/tests/volume.c index aee0c3a..ee43140 100644 --- a/dlls/d3d8/tests/volume.c +++ b/dlls/d3d8/tests/volume.c @@ -44,8 +44,11 @@ static IDirect3DDevice8 *init_d3d8(HMODULE d3d8_handle) if (!d3d8_create) return NULL; d3d8_ptr = d3d8_create(D3D_SDK_VERSION); - ok(d3d8_ptr != NULL, "Failed to create IDirect3D8 object\n"); - if (!d3d8_ptr) return NULL; + if (!d3d8_ptr) + { + skip("could not create D3D8\n"); + return NULL; + } IDirect3D8_GetAdapterDisplayMode(d3d8_ptr, D3DADAPTER_DEFAULT, &d3ddm ); ZeroMemory(&present_parameters, sizeof(present_parameters));

1 0

Huw Davies : d3d9/tests: Skip tests if we can't create the D3D9 object.
by Alexandre Julliard 04 Dec '08

04 Dec '08

Module: wine Branch: master Commit: 12b9d37120f72e701c558c8420d852e8e23c3c17 URL: http://source.winehq.org/git/wine.git/?a=commit;h=12b9d37120f72e701c558c842… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Dec 3 17:00:40 2008 +0000 d3d9/tests: Skip tests if we can't create the D3D9 object. --- dlls/d3d9/tests/d3d9ex.c | 7 +++++-- dlls/d3d9/tests/device.c | 8 ++++++++ dlls/d3d9/tests/shader.c | 7 +++++-- dlls/d3d9/tests/stateblock.c | 7 +++++-- dlls/d3d9/tests/surface.c | 7 +++++-- dlls/d3d9/tests/texture.c | 7 +++++-- dlls/d3d9/tests/vertexdeclaration.c | 7 +++++-- dlls/d3d9/tests/visual.c | 7 +++++-- dlls/d3d9/tests/volume.c | 7 +++++-- 9 files changed, 48 insertions(+), 16 deletions(-) diff --git a/dlls/d3d9/tests/d3d9ex.c b/dlls/d3d9/tests/d3d9ex.c index 9b2fd06..c5d83b0 100644 --- a/dlls/d3d9/tests/d3d9ex.c +++ b/dlls/d3d9/tests/d3d9ex.c @@ -58,8 +58,11 @@ static void test_qi_base_to_ex(void) HWND window = create_window(); D3DPRESENT_PARAMETERS present_parameters; - ok( d3d9 != NULL, "Failed to create D3D9 object\n" ); - if (!d3d9) return; + if (!d3d9) + { + skip("Direct3D9 is not available\n"); + return; + } hr = IDirect3D9_QueryInterface(d3d9, &IID_IDirect3D9Ex, (void **) &d3d9ex); ok(hr == E_NOINTERFACE, diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index b90d005..a934974 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -2153,6 +2153,14 @@ START_TEST(device) ok(pDirect3DCreate9 != NULL, "Failed to get address of Direct3DCreate9\n"); if (pDirect3DCreate9) { + IDirect3D9 *d3d9 = pDirect3DCreate9( D3D_SDK_VERSION ); + if(!d3d9) + { + skip("could not create D3D9 object\n"); + return; + } + IDirect3D9_Release(d3d9); + test_display_formats(); test_display_modes(); test_swapchain(); diff --git a/dlls/d3d9/tests/shader.c b/dlls/d3d9/tests/shader.c index 07318e3..dcf8851 100644 --- a/dlls/d3d9/tests/shader.c +++ b/dlls/d3d9/tests/shader.c @@ -46,8 +46,11 @@ static IDirect3DDevice9 *init_d3d9(void) if (!d3d9_create) return NULL; d3d9_ptr = d3d9_create(D3D_SDK_VERSION); - ok(d3d9_ptr != NULL, "Failed to create IDirect3D9 object\n"); - if (!d3d9_ptr) return NULL; + if (!d3d9_ptr) + { + skip("could not create D3D9\n"); + return NULL; + } ZeroMemory(&present_parameters, sizeof(present_parameters)); present_parameters.Windowed = TRUE; diff --git a/dlls/d3d9/tests/stateblock.c b/dlls/d3d9/tests/stateblock.c index e5d7ab2..d2bfcba 100644 --- a/dlls/d3d9/tests/stateblock.c +++ b/dlls/d3d9/tests/stateblock.c @@ -50,8 +50,11 @@ static HRESULT init_d3d9( if (!d3d9_create) return E_FAIL; d3d9_ptr = d3d9_create(D3D_SDK_VERSION); - ok(d3d9_ptr != NULL, "Failed to create IDirect3D9 object\n"); - if (!d3d9_ptr) return E_FAIL; + if (!d3d9_ptr) + { + skip("could not create D3D9\n"); + return E_FAIL; + } window = create_window(); diff --git a/dlls/d3d9/tests/surface.c b/dlls/d3d9/tests/surface.c index 69016f5..eed45c3 100644 --- a/dlls/d3d9/tests/surface.c +++ b/dlls/d3d9/tests/surface.c @@ -43,8 +43,11 @@ static IDirect3DDevice9 *init_d3d9(HMODULE d3d9_handle) if (!d3d9_create) return NULL; d3d9_ptr = d3d9_create(D3D_SDK_VERSION); - ok(d3d9_ptr != NULL, "Failed to create IDirect3D9 object\n"); - if (!d3d9_ptr) return NULL; + if (!d3d9_ptr) + { + skip("could not create D3D9\n"); + return NULL; + } ZeroMemory(&present_parameters, sizeof(present_parameters)); present_parameters.Windowed = TRUE; diff --git a/dlls/d3d9/tests/texture.c b/dlls/d3d9/tests/texture.c index 515820b..ede9467 100644 --- a/dlls/d3d9/tests/texture.c +++ b/dlls/d3d9/tests/texture.c @@ -43,8 +43,11 @@ static IDirect3DDevice9 *init_d3d9(HMODULE d3d9_handle) if (!d3d9_create) return NULL; d3d9_ptr = d3d9_create(D3D_SDK_VERSION); - ok(d3d9_ptr != NULL, "Failed to create IDirect3D9 object\n"); - if (!d3d9_ptr) return NULL; + if (!d3d9_ptr) + { + skip("could not create D3D9\n"); + return NULL; + } ZeroMemory(&present_parameters, sizeof(present_parameters)); present_parameters.Windowed = TRUE; diff --git a/dlls/d3d9/tests/vertexdeclaration.c b/dlls/d3d9/tests/vertexdeclaration.c index ad7b873..e0b2820 100644 --- a/dlls/d3d9/tests/vertexdeclaration.c +++ b/dlls/d3d9/tests/vertexdeclaration.c @@ -51,8 +51,11 @@ static IDirect3DDevice9 *init_d3d9(void) if (!d3d9_create) return NULL; d3d9_ptr = d3d9_create(D3D_SDK_VERSION); - ok(d3d9_ptr != NULL, "Failed to create IDirect3D9 object\n"); - if (!d3d9_ptr) return NULL; + if (!d3d9_ptr) + { + skip("could not create D3D9\n"); + return NULL; + } ZeroMemory(&present_parameters, sizeof(present_parameters)); present_parameters.Windowed = TRUE; diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index d9399fe..fdf341f 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -161,8 +161,11 @@ static IDirect3DDevice9 *init_d3d9(void) if (!d3d9_create) return NULL; d3d9_ptr = d3d9_create(D3D_SDK_VERSION); - ok(d3d9_ptr != NULL, "Failed to create IDirect3D9 object\n"); - if (!d3d9_ptr) return NULL; + if (!d3d9_ptr) + { + skip("could not create D3D9\n"); + return NULL; + } ZeroMemory(&present_parameters, sizeof(present_parameters)); present_parameters.Windowed = FALSE; diff --git a/dlls/d3d9/tests/volume.c b/dlls/d3d9/tests/volume.c index 31066a6..8b07072 100644 --- a/dlls/d3d9/tests/volume.c +++ b/dlls/d3d9/tests/volume.c @@ -43,8 +43,11 @@ static IDirect3DDevice9 *init_d3d9(HMODULE d3d9_handle) if (!d3d9_create) return NULL; d3d9_ptr = d3d9_create(D3D_SDK_VERSION); - ok(d3d9_ptr != NULL, "Failed to create IDirect3D9 object\n"); - if (!d3d9_ptr) return NULL; + if (!d3d9_ptr) + { + skip("could not create D3D9\n"); + return NULL; + } ZeroMemory(&present_parameters, sizeof(present_parameters)); present_parameters.Windowed = TRUE;

1 0

Alexandre Julliard : wintab32: Make a function static.
by Alexandre Julliard 04 Dec '08

04 Dec '08

Module: wine Branch: master Commit: 1ca4837891d1c86fbcdffe9d1617273833f24a8f URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ca4837891d1c86fbcdffe9d1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 4 12:48:29 2008 +0100 wintab32: Make a function static. --- dlls/wintab32/context.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wintab32/context.c b/dlls/wintab32/context.c index 33c780c..f52d8d2 100644 --- a/dlls/wintab32/context.c +++ b/dlls/wintab32/context.c @@ -361,7 +361,7 @@ static VOID TABLET_BlankPacketData(LPOPENCONTEXT context, LPVOID lpPkt, INT n) } -UINT WINAPI WTInfoT(UINT wCategory, UINT nIndex, LPVOID lpOutput, BOOL bUnicode) +static UINT WTInfoT(UINT wCategory, UINT nIndex, LPVOID lpOutput, BOOL bUnicode) { UINT result;

1 0

Alexandre Julliard : winedos: Make a function static.
by Alexandre Julliard 04 Dec '08

04 Dec '08

Module: wine Branch: master Commit: 522d836c009db68e1b16e0b69bf998316a781dba URL: http://source.winehq.org/git/wine.git/?a=commit;h=522d836c009db68e1b16e0b69… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 4 12:48:47 2008 +0100 winedos: Make a function static. --- dlls/winedos/vga.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winedos/vga.c b/dlls/winedos/vga.c index 5d4dcca..12062de 100644 --- a/dlls/winedos/vga.c +++ b/dlls/winedos/vga.c @@ -1090,7 +1090,7 @@ void VGA_SetBright(BOOL bright) * Select if output is enabled or disabled * This is a property of the CGA controller */ -void VGA_SetEnabled(BOOL enabled) +static void VGA_SetEnabled(BOOL enabled) { TRACE("%i\n", enabled);

1 0

Alexandre Julliard : uxtheme: Make some functions static.
by Alexandre Julliard 04 Dec '08

04 Dec '08

Module: wine Branch: master Commit: ff4fff56e5f04fdcb9714f97d8ca5d98221c3cbe URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff4fff56e5f04fdcb9714f97d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 4 12:48:21 2008 +0100 uxtheme: Make some functions static. --- dlls/uxtheme/msstyles.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/uxtheme/msstyles.c b/dlls/uxtheme/msstyles.c index 8aa67fd..1ca4d26 100644 --- a/dlls/uxtheme/msstyles.c +++ b/dlls/uxtheme/msstyles.c @@ -43,9 +43,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(uxtheme); * Defines and global variables */ -BOOL MSSTYLES_GetNextInteger(LPCWSTR lpStringStart, LPCWSTR lpStringEnd, LPCWSTR *lpValEnd, int *value); -BOOL MSSTYLES_GetNextToken(LPCWSTR lpStringStart, LPCWSTR lpStringEnd, LPCWSTR *lpValEnd, LPWSTR lpBuff, DWORD buffSize); -void MSSTYLES_ParseThemeIni(PTHEME_FILE tf, BOOL setMetrics); +static BOOL MSSTYLES_GetNextInteger(LPCWSTR lpStringStart, LPCWSTR lpStringEnd, LPCWSTR *lpValEnd, int *value); +static BOOL MSSTYLES_GetNextToken(LPCWSTR lpStringStart, LPCWSTR lpStringEnd, LPCWSTR *lpValEnd, LPWSTR lpBuff, DWORD buffSize); +static void MSSTYLES_ParseThemeIni(PTHEME_FILE tf, BOOL setMetrics); static HRESULT MSSTYLES_GetFont (LPCWSTR lpStringStart, LPCWSTR lpStringEnd, LPCWSTR *lpValEnd, LOGFONTW* logfont); extern HINSTANCE hDllInst; @@ -852,7 +852,7 @@ static void parse_apply_nonclient (struct PARSENONCLIENTSTATE* state) * PARAMS * tf Theme to parse */ -void MSSTYLES_ParseThemeIni(PTHEME_FILE tf, BOOL setMetrics) +static void MSSTYLES_ParseThemeIni(PTHEME_FILE tf, BOOL setMetrics) { static const WCHAR szSysMetrics[] = {'S','y','s','M','e','t','r','i','c','s','\0'}; static const WCHAR szGlobals[] = {'g','l','o','b','a','l','s','\0'}; @@ -1139,7 +1139,7 @@ HBITMAP MSSTYLES_LoadBitmap (PTHEME_CLASS tc, LPCWSTR lpFilename, BOOL* hasAlpha return img->image; } -BOOL MSSTYLES_GetNextInteger(LPCWSTR lpStringStart, LPCWSTR lpStringEnd, LPCWSTR *lpValEnd, int *value) +static BOOL MSSTYLES_GetNextInteger(LPCWSTR lpStringStart, LPCWSTR lpStringEnd, LPCWSTR *lpValEnd, int *value) { LPCWSTR cur = lpStringStart; int total = 0; @@ -1163,7 +1163,7 @@ BOOL MSSTYLES_GetNextInteger(LPCWSTR lpStringStart, LPCWSTR lpStringEnd, LPCWSTR return TRUE; } -BOOL MSSTYLES_GetNextToken(LPCWSTR lpStringStart, LPCWSTR lpStringEnd, LPCWSTR *lpValEnd, LPWSTR lpBuff, DWORD buffSize) { +static BOOL MSSTYLES_GetNextToken(LPCWSTR lpStringStart, LPCWSTR lpStringEnd, LPCWSTR *lpValEnd, LPWSTR lpBuff, DWORD buffSize) { LPCWSTR cur = lpStringStart; LPCWSTR start; LPCWSTR end;

1 0