May 2011 - Wine-commits - list.winehq.org

Frédéric Delanoy : po: Update French translation.
by Alexandre Julliard 25 May '11

25 May '11

Module: wine Branch: master Commit: 32d7f32c9734defac31d592fcbd505cba16ee0e9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=32d7f32c9734defac31d592fc… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue May 24 20:20:32 2011 +0200 po: Update French translation. --- po/fr.po | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/po/fr.po b/po/fr.po index 6ac96d9..80ca780 100644 --- a/po/fr.po +++ b/po/fr.po @@ -8480,18 +8480,19 @@ msgstr "La ligne d'entrée est trop longue.\n" #: hostname.rc:27 msgid "Usage: hostname\n" -msgstr "" +msgstr "Usage : hostname\n" #: hostname.rc:28 -#, fuzzy msgid "Error: Invalid option '%c'.\n" -msgstr "Erreur : nom de clé invalide\n" +msgstr "Erreur : option « %c » invalide.\n" #: hostname.rc:29 msgid "" "Error: Setting the system hostname is not possible with the hostname " "utility.\n" msgstr "" +"Erreur : impossible de spécifier le nom d'hôte système avec l'utilitaire " +"hostname.\n" #: ipconfig.rc:27 msgid "Usage: ipconfig [ /? | /all ]\n"

1 0

Andrew Eikum : winealsa.drv: Implement device enumeration.
by Alexandre Julliard 25 May '11

25 May '11

Module: wine Branch: master Commit: 934a64cb3804e458da37b0f490b82633010293f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=934a64cb3804e458da37b0f49… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Tue May 24 13:59:36 2011 -0500 winealsa.drv: Implement device enumeration. --- dlls/winealsa.drv/mmdevdrv.c | 177 ++++++++++++++++++++++++++++++++++++++---- 1 files changed, 162 insertions(+), 15 deletions(-) diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index 854f7b9..20958bf 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -134,6 +134,7 @@ static CRITICAL_SECTION g_sessions_lock; static struct list g_sessions = LIST_INIT(g_sessions); static const WCHAR defaultW[] = {'d','e','f','a','u','l','t',0}; +static const char defname[] = "default"; static const IAudioClientVtbl AudioClient_Vtbl; static const IAudioRenderClientVtbl AudioRenderClient_Vtbl; @@ -206,40 +207,186 @@ BOOL WINAPI DllMain(HINSTANCE dll, DWORD reason, void *reserved) return TRUE; } -HRESULT WINAPI AUDDRV_GetEndpointIDs(EDataFlow flow, WCHAR ***ids, void ***keys, +static HRESULT alsa_get_card_devices(EDataFlow flow, WCHAR **ids, char **keys, + UINT *num, snd_ctl_t *ctl, int card, const WCHAR *cardnameW) +{ + static const WCHAR dashW[] = {' ','-',' ',0}; + int err, device; + snd_pcm_info_t *info; + + info = HeapAlloc(GetProcessHeap(), 0, snd_pcm_info_sizeof()); + if(!info) + return E_OUTOFMEMORY; + + snd_pcm_info_set_subdevice(info, 0); + snd_pcm_info_set_stream(info, + flow == eRender ? SND_PCM_STREAM_PLAYBACK : SND_PCM_STREAM_CAPTURE); + + device = -1; + for(err = snd_ctl_pcm_next_device(ctl, &device); device != -1 && err >= 0; + err = snd_ctl_pcm_next_device(ctl, &device)){ + const char *devname; + + snd_pcm_info_set_device(info, device); + + if((err = snd_ctl_pcm_info(ctl, info)) < 0){ + if(err == -ENOENT) + /* This device doesn't have the right stream direction */ + continue; + + WARN("Failed to get info for card %d, device %d: %d (%s)\n", + card, device, err, snd_strerror(err)); + continue; + } + + if(ids && keys){ + DWORD len, cardlen; + + devname = snd_pcm_info_get_name(info); + if(!devname){ + WARN("Unable to get device name for card %d, device %d\n", card, + device); + continue; + } + + cardlen = lstrlenW(cardnameW); + len = MultiByteToWideChar(CP_UNIXCP, 0, devname, -1, NULL, 0); + len += lstrlenW(dashW); + len += cardlen; + ids[*num] = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + if(!ids[*num]){ + HeapFree(GetProcessHeap(), 0, info); + return E_OUTOFMEMORY; + } + memcpy(ids[*num], cardnameW, cardlen * sizeof(WCHAR)); + memcpy(ids[*num] + cardlen, dashW, lstrlenW(dashW) * sizeof(WCHAR)); + cardlen += lstrlenW(dashW); + MultiByteToWideChar(CP_UNIXCP, 0, devname, -1, ids[*num] + cardlen, + len - cardlen); + + keys[*num] = HeapAlloc(GetProcessHeap(), 0, 32); + if(!keys[*num]){ + HeapFree(GetProcessHeap(), 0, info); + HeapFree(GetProcessHeap(), 0, ids[*num]); + return E_OUTOFMEMORY; + } + sprintf(keys[*num], "hw:%d,%d", card, device); + } + + ++(*num); + } + + HeapFree(GetProcessHeap(), 0, info); + + if(err != 0) + WARN("Got a failure during device enumeration on card %d: %d (%s)\n", + card, err, snd_strerror(err)); + + return S_OK; +} + +static HRESULT alsa_enum_devices(EDataFlow flow, WCHAR **ids, char **keys, + UINT *num) +{ + int err, card; + + card = -1; + *num = 0; + for(err = snd_card_next(&card); card != -1 && err >= 0; + err = snd_card_next(&card)){ + char cardpath[64]; + const char *cardname; + WCHAR *cardnameW; + snd_ctl_t *ctl; + DWORD len; + + sprintf(cardpath, "hw:%u", card); + + if((err = snd_ctl_open(&ctl, cardpath, 0)) < 0){ + WARN("Unable to open ctl for ALSA device %s: %d (%s)\n", cardpath, + err, snd_strerror(err)); + continue; + } + + if((err = snd_card_get_name(card, (char **)&cardname)) < 0){ + WARN("Unable to get card name for ALSA device %s: %d (%s)\n", + cardpath, err, snd_strerror(err)); + /* FIXME: Should be localized */ + cardname = "Unknown soundcard"; + } + + len = MultiByteToWideChar(CP_UNIXCP, 0, cardname, -1, NULL, 0); + cardnameW = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + if(!cardnameW){ + snd_ctl_close(ctl); + return E_OUTOFMEMORY; + } + MultiByteToWideChar(CP_UNIXCP, 0, cardname, -1, cardnameW, len); + + alsa_get_card_devices(flow, ids, keys, num, ctl, card, cardnameW); + + HeapFree(GetProcessHeap(), 0, cardnameW); + + snd_ctl_close(ctl); + } + + if(err != 0) + WARN("Got a failure during card enumeration: %d (%s)\n", + err, snd_strerror(err)); + + return S_OK; +} + +HRESULT WINAPI AUDDRV_GetEndpointIDs(EDataFlow flow, WCHAR ***ids, char ***keys, UINT *num, UINT *def_index) { - TRACE("%d %p %p %p\n", flow, ids, num, def_index); + HRESULT hr; - *num = 1; - *def_index = 0; + TRACE("%d %p %p %p %p\n", flow, ids, keys, num, def_index); + + hr = alsa_enum_devices(flow, NULL, NULL, num); + if(FAILED(hr)) + return hr; - *ids = HeapAlloc(GetProcessHeap(), 0, sizeof(WCHAR *)); - if(!*ids) + *ids = HeapAlloc(GetProcessHeap(), 0, (*num + 1) * sizeof(WCHAR *)); + *keys = HeapAlloc(GetProcessHeap(), 0, (*num + 1) * sizeof(char *)); + if(!*ids || !*keys){ + HeapFree(GetProcessHeap(), 0, *ids); + HeapFree(GetProcessHeap(), 0, *keys); return E_OUTOFMEMORY; + } (*ids)[0] = HeapAlloc(GetProcessHeap(), 0, sizeof(defaultW)); - if(!(*ids)[0]){ + memcpy((*ids)[0], defaultW, sizeof(defaultW)); + (*keys)[0] = HeapAlloc(GetProcessHeap(), 0, sizeof(defname)); + memcpy((*keys)[0], defname, sizeof(defname)); + *def_index = 0; + + hr = alsa_enum_devices(flow, (*ids) + 1, (*keys) + 1, num); + if(FAILED(hr)){ + int i; + for(i = 0; i < *num; ++i){ + HeapFree(GetProcessHeap(), 0, (*ids)[i]); + HeapFree(GetProcessHeap(), 0, (*keys)[i]); + } HeapFree(GetProcessHeap(), 0, *ids); + HeapFree(GetProcessHeap(), 0, *keys); return E_OUTOFMEMORY; } - lstrcpyW((*ids)[0], defaultW); - - *keys = HeapAlloc(GetProcessHeap(), 0, sizeof(void *)); - (*keys)[0] = NULL; + ++(*num); /* for default device */ return S_OK; } -HRESULT WINAPI AUDDRV_GetAudioEndpoint(void *key, IMMDevice *dev, +HRESULT WINAPI AUDDRV_GetAudioEndpoint(const char *key, IMMDevice *dev, EDataFlow dataflow, IAudioClient **out) { ACImpl *This; int err; snd_pcm_stream_t stream; - TRACE("%p %p %d %p\n", key, dev, dataflow, out); + TRACE("\"%s\" %p %d %p\n", key, dev, dataflow, out); This = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(ACImpl)); if(!This) @@ -262,10 +409,10 @@ HRESULT WINAPI AUDDRV_GetAudioEndpoint(void *key, IMMDevice *dev, } This->dataflow = dataflow; - if((err = snd_pcm_open(&This->pcm_handle, "default", stream, + if((err = snd_pcm_open(&This->pcm_handle, key, stream, SND_PCM_NONBLOCK)) < 0){ HeapFree(GetProcessHeap(), 0, This); - WARN("Unable to open PCM \"default\": %d (%s)\n", err, + WARN("Unable to open PCM \"%s\": %d (%s)\n", key, err, snd_strerror(err)); return E_FAIL; }

1 0

Stefan Dösinger : d3d: Make the INTZ test more reliable.
by Alexandre Julliard 25 May '11

25 May '11

Module: wine Branch: master Commit: d8224118abba228b96d133a9c9c25878346272ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=d8224118abba228b96d133a9c… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon May 23 22:45:50 2011 +0200 d3d: Make the INTZ test more reliable. --- dlls/d3d8/tests/visual.c | 24 ++++++++++++------------ dlls/d3d9/tests/visual.c | 26 +++++++++++++------------- 2 files changed, 25 insertions(+), 25 deletions(-) diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index d2ab518..1e48c03 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -1706,10 +1706,10 @@ static void intz_test(IDirect3DDevice8 *device) } quad[] = { - { -1.0f, 1.0f, 0.0f, 0.0f, 1.0f, 1.0f, 0.0f, 1.0f, 1.0f, 0.0f}, - { 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 0.0f}, - { -1.0f, -1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f}, - { 1.0f, -1.0f, 1.0f, 1.0f, 0.0f, 0.0f, 1.0f, 0.0f, 0.0f, 1.0f}, + { -1.0f, 1.0f, 0.0f, 0.0f, 1.0f, 1.0f, 0.0f, 1.0f, 1.0f, 0.5f}, + { 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 0.5f}, + { -1.0f, -1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.5f}, + { 1.0f, -1.0f, 1.0f, 1.0f, 0.0f, 0.0f, 1.0f, 0.0f, 0.0f, 0.5f}, }; struct { @@ -1718,14 +1718,14 @@ static void intz_test(IDirect3DDevice8 *device) } expected_colors[] = { - {400, 60, D3DCOLOR_ARGB(0x00, 0x9f, 0xff, 0x00)}, - {560, 180, D3DCOLOR_ARGB(0x00, 0xdf, 0x55, 0x00)}, - {560, 300, D3DCOLOR_ARGB(0x00, 0xdf, 0x66, 0x00)}, - {400, 420, D3DCOLOR_ARGB(0x00, 0x9f, 0xb6, 0x00)}, - {240, 420, D3DCOLOR_ARGB(0x00, 0x60, 0x6d, 0x00)}, - { 80, 300, D3DCOLOR_ARGB(0x00, 0x20, 0x33, 0x00)}, - { 80, 180, D3DCOLOR_ARGB(0x00, 0x20, 0x55, 0x00)}, - {240, 60, D3DCOLOR_ARGB(0x00, 0x60, 0xff, 0x00)}, + { 80, 100, D3DCOLOR_ARGB(0x00, 0x20, 0x40, 0x00)}, + {240, 100, D3DCOLOR_ARGB(0x00, 0x60, 0xbf, 0x00)}, + {400, 100, D3DCOLOR_ARGB(0x00, 0x9f, 0x40, 0x00)}, + {560, 100, D3DCOLOR_ARGB(0x00, 0xdf, 0xbf, 0x00)}, + { 80, 450, D3DCOLOR_ARGB(0x00, 0x20, 0x40, 0x00)}, + {240, 450, D3DCOLOR_ARGB(0x00, 0x60, 0xbf, 0x00)}, + {400, 450, D3DCOLOR_ARGB(0x00, 0x9f, 0x40, 0x00)}, + {560, 450, D3DCOLOR_ARGB(0x00, 0xdf, 0xbf, 0x00)}, }; IDirect3DSurface8 *original_ds, *original_rt, *rt; diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 6b30f3e..affd416 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -11099,7 +11099,7 @@ static void intz_test(IDirect3DDevice9 *device) 0x02000001, 0x80010001, 0x80e40000, /* mov r1.x, r0 */ 0x03010042, 0x800f0000, 0xb0e40000, 0xa0e40800, /* texldp r0, t0, s0 */ 0x02000001, 0x80020001, 0x80000000, /* mov r1.y, r0.x */ - 0x02000001, 0x800f0800, 0x80e40001, /* mov 0C0, r1 */ + 0x02000001, 0x800f0800, 0x80e40001, /* mov oC0, r1 */ 0x0000ffff, /* end */ }; struct @@ -11109,10 +11109,10 @@ static void intz_test(IDirect3DDevice9 *device) } quad[] = { - { -1.0f, 1.0f, 0.0f, 0.0f, 1.0f, 1.0f, 0.0f}, - { 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 0.0f}, - { -1.0f, -1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f}, - { 1.0f, -1.0f, 1.0f, 1.0f, 0.0f, 0.0f, 1.0f}, + { -1.0f, 1.0f, 0.0f, 0.0f, 1.0f, 1.0f, 0.5f}, + { 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 0.5f}, + { -1.0f, -1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.5f}, + { 1.0f, -1.0f, 1.0f, 1.0f, 0.0f, 0.0f, 0.5f}, }; struct { @@ -11121,14 +11121,14 @@ static void intz_test(IDirect3DDevice9 *device) } expected_colors[] = { - {400, 60, D3DCOLOR_ARGB(0x00, 0x9f, 0xff, 0x00)}, - {560, 180, D3DCOLOR_ARGB(0x00, 0xdf, 0x55, 0x00)}, - {560, 300, D3DCOLOR_ARGB(0x00, 0xdf, 0x66, 0x00)}, - {400, 420, D3DCOLOR_ARGB(0x00, 0x9f, 0xb6, 0x00)}, - {240, 420, D3DCOLOR_ARGB(0x00, 0x60, 0x6d, 0x00)}, - { 80, 300, D3DCOLOR_ARGB(0x00, 0x20, 0x33, 0x00)}, - { 80, 180, D3DCOLOR_ARGB(0x00, 0x20, 0x55, 0x00)}, - {240, 60, D3DCOLOR_ARGB(0x00, 0x60, 0xff, 0x00)}, + { 80, 100, D3DCOLOR_ARGB(0x00, 0x20, 0x40, 0x00)}, + {240, 100, D3DCOLOR_ARGB(0x00, 0x60, 0xbf, 0x00)}, + {400, 100, D3DCOLOR_ARGB(0x00, 0x9f, 0x40, 0x00)}, + {560, 100, D3DCOLOR_ARGB(0x00, 0xdf, 0xbf, 0x00)}, + { 80, 450, D3DCOLOR_ARGB(0x00, 0x20, 0x40, 0x00)}, + {240, 450, D3DCOLOR_ARGB(0x00, 0x60, 0xbf, 0x00)}, + {400, 450, D3DCOLOR_ARGB(0x00, 0x9f, 0x40, 0x00)}, + {560, 450, D3DCOLOR_ARGB(0x00, 0xdf, 0xbf, 0x00)}, }; IDirect3DSurface9 *original_ds, *original_rt, *rt;

1 0

Stefan Dösinger : d3d9: Use a pixel shader for the vs 3.0 input test.
by Alexandre Julliard 25 May '11

25 May '11

Module: wine Branch: master Commit: cf757a6361c87d4be76d8d82763a0d2f0a68643e URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf757a6361c87d4be76d8d827… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon May 23 18:40:43 2011 +0200 d3d9: Use a pixel shader for the vs 3.0 input test. --- dlls/d3d9/tests/visual.c | 50 +++++++++++++++++++++++++++++++++++---------- 1 files changed, 39 insertions(+), 11 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index affd416..0f7e2ab 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -5956,7 +5956,8 @@ static void test_compare_instructions(IDirect3DDevice9 *device) static void test_vshader_input(IDirect3DDevice9 *device) { - DWORD swapped_shader_code_3[] = { + static const DWORD swapped_shader_code_3[] = + { 0xfffe0300, /* vs_3_0 */ 0x0200001f, 0x80000000, 0xe00f0000, /* dcl_position o0 */ 0x0200001f, 0x8000000a, 0xe00f0001, /* dcl_color o1 */ @@ -5968,7 +5969,8 @@ static void test_vshader_input(IDirect3DDevice9 *device) 0x03000002, 0xe00f0001, 0x80e40001, 0x91e40002, /* sub o1, r1, v2 */ 0x0000ffff /* end */ }; - DWORD swapped_shader_code_1[] = { + static const DWORD swapped_shader_code_1[] = + { 0xfffe0101, /* vs_1_1 */ 0x0000001f, 0x80000000, 0x900f0000, /* dcl_position v0 */ 0x0000001f, 0x80000005, 0x900f0001, /* dcl_texcoord0 v1 */ @@ -5978,7 +5980,8 @@ static void test_vshader_input(IDirect3DDevice9 *device) 0x00000002, 0xd00f0000, 0x80e40001, 0x91e40002, /* sub o1, r1, v2 */ 0x0000ffff /* end */ }; - DWORD swapped_shader_code_2[] = { + static const DWORD swapped_shader_code_2[] = + { 0xfffe0200, /* vs_2_0 */ 0x0200001f, 0x80000000, 0x900f0000, /* dcl_position v0 */ 0x0200001f, 0x80000005, 0x900f0001, /* dcl_texcoord0 v1 */ @@ -5988,7 +5991,8 @@ static void test_vshader_input(IDirect3DDevice9 *device) 0x03000002, 0xd00f0000, 0x80e40001, 0x91e40002, /* sub o1, r1, v2 */ 0x0000ffff /* end */ }; - DWORD texcoord_color_shader_code_3[] = { + static const DWORD texcoord_color_shader_code_3[] = + { 0xfffe0300, /* vs_3_0 */ 0x0200001f, 0x80000000, 0xe00f0000, /* dcl_position o0 */ 0x0200001f, 0x8000000a, 0xe00f0001, /* dcl_color o1 */ @@ -5998,7 +6002,8 @@ static void test_vshader_input(IDirect3DDevice9 *device) 0x02000001, 0xe00f0001, 0x90e40001, /* mov o1, v1 */ 0x0000ffff /* end */ }; - DWORD texcoord_color_shader_code_2[] = { + static const DWORD texcoord_color_shader_code_2[] = + { 0xfffe0200, /* vs_2_0 */ 0x0200001f, 0x80000000, 0x900f0000, /* dcl_position v0 */ 0x0200001f, 0x80000005, 0x900f0001, /* dcl_texcoord v1 */ @@ -6006,7 +6011,8 @@ static void test_vshader_input(IDirect3DDevice9 *device) 0x02000001, 0xd00f0000, 0x90e40001, /* mov oD0, v1 */ 0x0000ffff /* end */ }; - DWORD texcoord_color_shader_code_1[] = { + static const DWORD texcoord_color_shader_code_1[] = + { 0xfffe0101, /* vs_1_1 */ 0x0000001f, 0x80000000, 0x900f0000, /* dcl_position v0 */ 0x0000001f, 0x80000005, 0x900f0001, /* dcl_texcoord v1 */ @@ -6014,7 +6020,8 @@ static void test_vshader_input(IDirect3DDevice9 *device) 0x00000001, 0xd00f0000, 0x90e40001, /* mov oD0, v1 */ 0x0000ffff /* end */ }; - DWORD color_color_shader_code_3[] = { + static const DWORD color_color_shader_code_3[] = + { 0xfffe0300, /* vs_3_0 */ 0x0200001f, 0x80000000, 0xe00f0000, /* dcl_position o0 */ 0x0200001f, 0x8000000a, 0xe00f0001, /* dcl_color o1 */ @@ -6024,23 +6031,33 @@ static void test_vshader_input(IDirect3DDevice9 *device) 0x03000005, 0xe00f0001, 0xa0e40000, 0x90e40001, /* mul o1, c0, v1 */ 0x0000ffff /* end */ }; - DWORD color_color_shader_code_2[] = { + static const DWORD color_color_shader_code_2[] = + { 0xfffe0200, /* vs_2_0 */ 0x0200001f, 0x80000000, 0x900f0000, /* dcl_position v0 */ 0x0200001f, 0x8000000a, 0x900f0001, /* dcl_color v1 */ 0x02000001, 0xc00f0000, 0x90e40000, /* mov oPos, v0 */ - 0x03000005, 0xd00f0000, 0xa0e40000, 0x90e40001, /* mul oD0, c0, v1 */ + 0x03000005, 0xd00f0000, 0xa0e40000, 0x90e40001, /* mul oD0, c0, v1 */ 0x0000ffff /* end */ }; - DWORD color_color_shader_code_1[] = { + static const DWORD color_color_shader_code_1[] = + { 0xfffe0101, /* vs_1_1 */ 0x0000001f, 0x80000000, 0x900f0000, /* dcl_position v0 */ 0x0000001f, 0x8000000a, 0x900f0001, /* dcl_color v1 */ 0x00000001, 0xc00f0000, 0x90e40000, /* mov oPos, v0 */ - 0x00000005, 0xd00f0000, 0xa0e40000, 0x90e40001, /* mul oD0, c0, v1 */ + 0x00000005, 0xd00f0000, 0xa0e40000, 0x90e40001, /* mul oD0, c0, v1 */ + 0x0000ffff /* end */ + }; + static const DWORD ps3_code[] = + { + 0xffff0300, /* ps_3_0 */ + 0x0200001f, 0x8000000a, 0x900f0000, /* dcl_color0 v0 */ + 0x02000001, 0x800f0800, 0x90e40000, /* mov oC0, v0 */ 0x0000ffff /* end */ }; IDirect3DVertexShader9 *swapped_shader, *texcoord_color_shader, *color_color_shader; + IDirect3DPixelShader9 *ps; HRESULT hr; DWORD color; float quad1[] = { @@ -6159,12 +6176,17 @@ static void test_vshader_input(IDirect3DDevice9 *device) hr = IDirect3DDevice9_CreateVertexDeclaration(device, decl_elements_color_float, &decl_color_float); ok(hr == D3D_OK, "IDirect3DDevice9_CreateVertexDeclaration returned %08x\n", hr); + hr = IDirect3DDevice9_CreatePixelShader(device, ps3_code, &ps); + ok(hr == D3D_OK, "IDirect3DDevice9_CreatePixelShader returned %08x\n", hr); + for(i = 1; i <= 3; i++) { hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xffff0000, 0.0, 0); ok(SUCCEEDED(hr), "IDirect3DDevice9_Clear returned %#x.\n", hr); if(i == 3) { hr = IDirect3DDevice9_CreateVertexShader(device, swapped_shader_code_3, &swapped_shader); ok(hr == D3D_OK, "IDirect3DDevice9_CreateVertexShader returned %08x\n", hr); + hr = IDirect3DDevice9_SetPixelShader(device, ps); + ok(hr == D3D_OK, "IDirect3DDevice9_SetPixelShader returned %08x\n", hr); } else if(i == 2){ hr = IDirect3DDevice9_CreateVertexShader(device, swapped_shader_code_2, &swapped_shader); ok(hr == D3D_OK, "IDirect3DDevice9_CreateVertexShader returned %08x\n", hr); @@ -6309,6 +6331,7 @@ static void test_vshader_input(IDirect3DDevice9 *device) ok(hr == D3D_OK, "IDirect3DDevice9_Present failed with %08x\n", hr); IDirect3DDevice9_SetVertexShader(device, NULL); + IDirect3DDevice9_SetPixelShader(device, NULL); IDirect3DDevice9_SetVertexDeclaration(device, NULL); IDirect3DVertexShader9_Release(swapped_shader); @@ -6322,6 +6345,8 @@ static void test_vshader_input(IDirect3DDevice9 *device) ok(hr == D3D_OK, "IDirect3DDevice9_CreateVertexShader returned %08x\n", hr); hr = IDirect3DDevice9_CreateVertexShader(device, color_color_shader_code_3, &color_color_shader); ok(hr == D3D_OK, "IDirect3DDevice9_CreateVertexShader returned %08x\n", hr); + hr = IDirect3DDevice9_SetPixelShader(device, ps); + ok(hr == D3D_OK, "IDirect3DDevice9_SetPixelShader returned %08x\n", hr); } else if(i == 2){ hr = IDirect3DDevice9_CreateVertexShader(device, texcoord_color_shader_code_2, &texcoord_color_shader); ok(hr == D3D_OK, "IDirect3DDevice9_CreateVertexShader returned %08x\n", hr); @@ -6372,6 +6397,7 @@ static void test_vshader_input(IDirect3DDevice9 *device) } IDirect3DDevice9_SetVertexShader(device, NULL); IDirect3DDevice9_SetVertexDeclaration(device, NULL); + IDirect3DDevice9_SetPixelShader(device, NULL); color = getPixelColor(device, 160, 360); ok(color_match(color, D3DCOLOR_ARGB(0x00, 0xff, 0x80, 0x40), 1), @@ -6402,6 +6428,8 @@ static void test_vshader_input(IDirect3DDevice9 *device) IDirect3DVertexDeclaration9_Release(decl_color_color); IDirect3DVertexDeclaration9_Release(decl_color_ubyte); IDirect3DVertexDeclaration9_Release(decl_color_float); + + IDirect3DPixelShader9_Release(ps); } static void srgbtexture_test(IDirect3DDevice9 *device)

1 0

Stefan Dösinger : port: Add isinf and isnan implementations for Visual Studio.
by Alexandre Julliard 25 May '11

25 May '11

Module: wine Branch: master Commit: a774152f1ad87db57787102620722384dcf9c329 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a774152f1ad87db5778710262… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue May 24 21:05:28 2011 +0200 port: Add isinf and isnan implementations for Visual Studio. --- configure | 2 ++ configure.ac | 2 ++ include/config.h.in | 6 ++++++ libs/port/isinf.c | 8 ++++++++ libs/port/isnan.c | 8 ++++++++ 5 files changed, 26 insertions(+), 0 deletions(-) diff --git a/configure b/configure index efb2b1f..ea832b5 100755 --- a/configure +++ b/configure @@ -12803,6 +12803,8 @@ esac ac_save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS $BUILTINFLAG" for ac_func in \ + _finite \ + _isnan \ _pclose \ _popen \ _snprintf \ diff --git a/configure.ac b/configure.ac index ae44609..683bae9 100644 --- a/configure.ac +++ b/configure.ac @@ -1939,6 +1939,8 @@ dnl **** Check for functions **** ac_save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS $BUILTINFLAG" AC_CHECK_FUNCS(\ + _finite \ + _isnan \ _pclose \ _popen \ _snprintf \ diff --git a/include/config.h.in b/include/config.h.in index 4bdbc38..04507e0 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -1151,6 +1151,12 @@ /* Define to 1 if you have the <zlib.h> header file. */ #undef HAVE_ZLIB_H +/* Define to 1 if you have the `_finite' function. */ +#undef HAVE__FINITE + +/* Define to 1 if you have the `_isnan' function. */ +#undef HAVE__ISNAN + /* Define to 1 if you have the `_pclose' function. */ #undef HAVE__PCLOSE diff --git a/libs/port/isinf.c b/libs/port/isinf.c index e0c35ad..fff24aa 100644 --- a/libs/port/isinf.c +++ b/libs/port/isinf.c @@ -31,6 +31,14 @@ int isinf(double x) return (!(finite(x) || isnand(x))); } +#elif defined(HAVE_FLOAT_H) && defined(HAVE__ISNAN) && defined(HAVE__FINITE) +#include <float.h> + +int isinf(double x) +{ + return (!(_finite(x) || _isnan(x))); +} + #else #error No isinf() implementation available. #endif diff --git a/libs/port/isnan.c b/libs/port/isnan.c index b2a1be6..c48dd41 100644 --- a/libs/port/isnan.c +++ b/libs/port/isnan.c @@ -31,6 +31,14 @@ int isnan(double x) return isnand(x); } +#elif defined(HAVE_FLOAT_H) && defined(HAVE__ISNAN) +#include <float.h> + +int isnan(double x) +{ + return _isnan(x); +} + #else #error No isnan() implementation available. #endif

1 0

David Hedberg : comdlg32: Change some trace statements to dump strings.
by Alexandre Julliard 25 May '11

25 May '11

Module: wine Branch: master Commit: f539d4c9281cb6042a841201da12775da442c2c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f539d4c9281cb6042a841201d… Author: David Hedberg <david.hedberg(a)gmail.com> Date: Tue May 24 21:09:46 2011 +0200 comdlg32: Change some trace statements to dump strings. --- dlls/comdlg32/itemdlg.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/comdlg32/itemdlg.c b/dlls/comdlg32/itemdlg.c index 51767a7..8612904 100644 --- a/dlls/comdlg32/itemdlg.c +++ b/dlls/comdlg32/itemdlg.c @@ -1109,7 +1109,7 @@ static HRESULT WINAPI IFileDialog2_fnGetCurrentSelection(IFileDialog2 *iface, IS static HRESULT WINAPI IFileDialog2_fnSetFileName(IFileDialog2 *iface, LPCWSTR pszName) { FileDialogImpl *This = impl_from_IFileDialog2(iface); - TRACE("%p (%p)\n", iface, pszName); + TRACE("%p (%s)\n", iface, debugstr_w(pszName)); set_file_name(This, pszName); @@ -1134,7 +1134,7 @@ static HRESULT WINAPI IFileDialog2_fnGetFileName(IFileDialog2 *iface, LPWSTR *ps static HRESULT WINAPI IFileDialog2_fnSetTitle(IFileDialog2 *iface, LPCWSTR pszTitle) { FileDialogImpl *This = impl_from_IFileDialog2(iface); - TRACE("%p (%p)\n", This, pszTitle); + TRACE("%p (%s)\n", This, debugstr_w(pszTitle)); LocalFree(This->custom_title); This->custom_title = StrDupW(pszTitle); @@ -1146,7 +1146,7 @@ static HRESULT WINAPI IFileDialog2_fnSetTitle(IFileDialog2 *iface, LPCWSTR pszTi static HRESULT WINAPI IFileDialog2_fnSetOkButtonLabel(IFileDialog2 *iface, LPCWSTR pszText) { FileDialogImpl *This = impl_from_IFileDialog2(iface); - TRACE("%p (%p)\n", This, pszText); + TRACE("%p (%s)\n", This, debugstr_w(pszText)); LocalFree(This->custom_okbutton); This->custom_okbutton = StrDupW(pszText); @@ -1159,7 +1159,7 @@ static HRESULT WINAPI IFileDialog2_fnSetOkButtonLabel(IFileDialog2 *iface, LPCWS static HRESULT WINAPI IFileDialog2_fnSetFileNameLabel(IFileDialog2 *iface, LPCWSTR pszLabel) { FileDialogImpl *This = impl_from_IFileDialog2(iface); - TRACE("%p (%p)\n", This, pszLabel); + TRACE("%p (%s)\n", This, debugstr_w(pszLabel)); LocalFree(This->custom_filenamelabel); This->custom_filenamelabel = StrDupW(pszLabel); @@ -1246,7 +1246,7 @@ static HRESULT WINAPI IFileDialog2_fnSetFilter(IFileDialog2 *iface, IShellItemFi static HRESULT WINAPI IFileDialog2_fnSetCancelButtonLabel(IFileDialog2 *iface, LPCWSTR pszLabel) { FileDialogImpl *This = impl_from_IFileDialog2(iface); - TRACE("%p (%p)\n", This, pszLabel); + TRACE("%p (%s)\n", This, debugstr_w(pszLabel)); LocalFree(This->custom_cancelbutton); This->custom_cancelbutton = StrDupW(pszLabel);

1 0

David Hedberg : comdlg32: Fix reference counting when querying services.
by Alexandre Julliard 25 May '11

25 May '11

Module: wine Branch: master Commit: 77cc26878c2c4ca3c801af8a642c123c67514daa URL: http://source.winehq.org/git/wine.git/?a=commit;h=77cc26878c2c4ca3c801af8a6… Author: David Hedberg <david.hedberg(a)gmail.com> Date: Tue May 24 21:09:47 2011 +0200 comdlg32: Fix reference counting when querying services. --- dlls/comdlg32/itemdlg.c | 8 +------- dlls/comdlg32/tests/itemdlg.c | 21 +++++++++++++++------ 2 files changed, 16 insertions(+), 13 deletions(-) diff --git a/dlls/comdlg32/itemdlg.c b/dlls/comdlg32/itemdlg.c index 8612904..69d9661 100644 --- a/dlls/comdlg32/itemdlg.c +++ b/dlls/comdlg32/itemdlg.c @@ -1915,13 +1915,7 @@ static HRESULT WINAPI IServiceProvider_fnQueryService(IServiceProvider *iface, FIXME("Interface %s requested from unknown service %s\n", debugstr_guid(riid), debugstr_guid(guidService)); - if(SUCCEEDED(hr) && *ppv) - { - IUnknown_AddRef((IUnknown*)*ppv); - return S_OK; - } - - return E_FAIL; + return hr; } static const IServiceProviderVtbl vt_IServiceProvider = { diff --git a/dlls/comdlg32/tests/itemdlg.c b/dlls/comdlg32/tests/itemdlg.c index 3653014..4dafa9b 100644 --- a/dlls/comdlg32/tests/itemdlg.c +++ b/dlls/comdlg32/tests/itemdlg.c @@ -157,6 +157,7 @@ static BOOL test_instantiation(void) IServiceProvider *psp; IUnknown *punk; HRESULT hr; + LONG ref; /* Instantiate FileOpenDialog */ hr = CoCreateInstance(&CLSID_FileOpenDialog, NULL, CLSCTX_INPROC_SERVER, @@ -223,7 +224,8 @@ static BOOL test_instantiation(void) ok(hr == E_NOINTERFACE, "got 0x%08x.\n", hr); if(SUCCEEDED(hr)) IUnknown_Release(punk); - IFileOpenDialog_Release(pfod); + ref = IFileOpenDialog_Release(pfod); + ok(!ref, "Got refcount %d, should have been released.\n", ref); /* Instantiate FileSaveDialog */ hr = CoCreateInstance(&CLSID_FileSaveDialog, NULL, CLSCTX_INPROC_SERVER, @@ -267,7 +269,8 @@ static BOOL test_instantiation(void) ok(hr == E_NOINTERFACE, "got 0x%08x.\n", hr); if(SUCCEEDED(hr)) IUnknown_Release(punk); - IFileSaveDialog_Release(pfsd); + ref = IFileSaveDialog_Release(pfsd); + ok(!ref, "Got refcount %d, should have been released.\n", ref); return TRUE; } @@ -284,6 +287,7 @@ static void test_basics(void) LPITEMIDLIST pidl; WCHAR *filename; UINT filetype; + LONG ref; HRESULT hr; const WCHAR txt[] = {'t','x','t', 0}; const WCHAR null[] = {0}; @@ -735,8 +739,10 @@ static void test_basics(void) /* Cleanup */ IShellItem_Release(psidesktop); - IFileOpenDialog_Release(pfod); - IFileSaveDialog_Release(pfsd); + ref = IFileOpenDialog_Release(pfod); + ok(!ref, "Got refcount %d, should have been released.\n", ref); + ref = IFileSaveDialog_Release(pfsd); + ok(!ref, "Got refcount %d, should have been released.\n", ref); } static void test_advise_helper(IFileDialog *pfd) @@ -811,20 +817,23 @@ static void test_advise(void) { IFileDialog *pfd; HRESULT hr; + LONG ref; trace("Testing FileOpenDialog (advise)\n"); hr = CoCreateInstance(&CLSID_FileOpenDialog, NULL, CLSCTX_INPROC_SERVER, &IID_IFileDialog, (void**)&pfd); ok(hr == S_OK, "got 0x%08x.\n", hr); test_advise_helper(pfd); - IFileDialog_Release(pfd); + ref = IFileDialog_Release(pfd); + ok(!ref, "Got refcount %d, should have been released.\n", ref); trace("Testing FileSaveDialog (advise)\n"); hr = CoCreateInstance(&CLSID_FileSaveDialog, NULL, CLSCTX_INPROC_SERVER, &IID_IFileDialog, (void**)&pfd); ok(hr == S_OK, "got 0x%08x.\n", hr); test_advise_helper(pfd); - IFileDialog_Release(pfd); + ref = IFileDialog_Release(pfd); + ok(!ref, "Got refcount %d, should have been released.\n", ref); } START_TEST(itemdlg)

1 0

Marcus Meissner : wiaservc: Mark internal symbols with hidden visibility.
by Alexandre Julliard 25 May '11

25 May '11

Module: wine Branch: master Commit: bce961e98f328a979d643ed08324a21c54a38bfc URL: http://source.winehq.org/git/wine.git/?a=commit;h=bce961e98f328a979d643ed08… Author: Marcus Meissner <meissner(a)suse.de> Date: Fri May 13 18:25:26 2011 +0200 wiaservc: Mark internal symbols with hidden visibility. --- dlls/wiaservc/wiaservc_private.h | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wiaservc/wiaservc_private.h b/dlls/wiaservc/wiaservc_private.h index 97b9770..5125937 100644 --- a/dlls/wiaservc/wiaservc_private.h +++ b/dlls/wiaservc/wiaservc_private.h @@ -26,7 +26,7 @@ typedef struct IClassFactory IClassFactory_iface; } ClassFactoryImpl; -extern ClassFactoryImpl WIASERVC_ClassFactory; +extern ClassFactoryImpl WIASERVC_ClassFactory DECLSPEC_HIDDEN; typedef struct { @@ -34,7 +34,7 @@ typedef struct LONG ref; } wiadevmgr; -HRESULT wiadevmgr_Constructor(IUnknown *pUnkOuter, LPVOID *ppObj); +HRESULT wiadevmgr_Constructor(IUnknown *pUnkOuter, LPVOID *ppObj) DECLSPEC_HIDDEN; /* Little helper functions */ static inline char *

1 0

Marcus Meissner : wbemprox: Mark one internal function with hidden visibility.
by Alexandre Julliard 25 May '11

25 May '11

Module: wine Branch: master Commit: 2ef583f584241c0947533465b5bd1997588c76f2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ef583f584241c0947533465b… Author: Marcus Meissner <meissner(a)suse.de> Date: Fri May 13 18:24:41 2011 +0200 wbemprox: Mark one internal function with hidden visibility. --- dlls/wbemprox/wbemprox_private.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wbemprox/wbemprox_private.h b/dlls/wbemprox/wbemprox_private.h index cf4301d..ba9c8ad 100644 --- a/dlls/wbemprox/wbemprox_private.h +++ b/dlls/wbemprox/wbemprox_private.h @@ -16,4 +16,4 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -HRESULT WbemLocator_create(IUnknown *, LPVOID *); +HRESULT WbemLocator_create(IUnknown *, LPVOID *) DECLSPEC_HIDDEN;

1 0

Marcus Meissner : uxtheme: Mark internal symbols with hidden visibility.
by Alexandre Julliard 25 May '11

25 May '11

Module: wine Branch: master Commit: 790c1070455ec8768c43d7001339a328fb5eed05 URL: http://source.winehq.org/git/wine.git/?a=commit;h=790c1070455ec8768c43d7001… Author: Marcus Meissner <meissner(a)suse.de> Date: Fri May 13 18:23:06 2011 +0200 uxtheme: Mark internal symbols with hidden visibility. --- dlls/uxtheme/msstyles.h | 60 ++++++++++++++++++++++---------------------- dlls/uxtheme/system.c | 4 +- dlls/uxtheme/uxthemedll.h | 20 +++++++------- 3 files changed, 42 insertions(+), 42 deletions(-) diff --git a/dlls/uxtheme/msstyles.h b/dlls/uxtheme/msstyles.h index 6cd73ac..0b7e1ab 100644 --- a/dlls/uxtheme/msstyles.h +++ b/dlls/uxtheme/msstyles.h @@ -84,35 +84,35 @@ typedef struct _THEME_FILE { typedef struct _UXINI_FILE *PUXINI_FILE; -HRESULT MSSTYLES_OpenThemeFile(LPCWSTR lpThemeFile, LPCWSTR pszColorName, LPCWSTR pszSizeName, PTHEME_FILE *tf); -void MSSTYLES_CloseThemeFile(PTHEME_FILE tf); -HRESULT MSSTYLES_SetActiveTheme(PTHEME_FILE tf, BOOL setMetrics); -PTHEME_CLASS MSSTYLES_OpenThemeClass(LPCWSTR pszAppName, LPCWSTR pszClassList); -HRESULT MSSTYLES_CloseThemeClass(PTHEME_CLASS tc); -BOOL MSSTYLES_LookupProperty(LPCWSTR pszPropertyName, int *dwPrimitive, int *dwId); -BOOL MSSTYLES_LookupEnum(LPCWSTR pszValueName, int dwEnum, int *dwValue); -BOOL MSSTYLES_LookupPartState(LPCWSTR pszClass, LPCWSTR pszPart, LPCWSTR pszState, int *iPartId, int *iStateId); -PUXINI_FILE MSSTYLES_GetThemeIni(PTHEME_FILE tf); -PTHEME_PARTSTATE MSSTYLES_FindPartState(PTHEME_CLASS tc, int iPartId, int iStateId, PTHEME_CLASS *tcNext); -PTHEME_PROPERTY MSSTYLES_FindProperty(PTHEME_CLASS tc, int iPartId, int iStateId, int iPropertyPrimitive, int iPropertyId); -PTHEME_PROPERTY MSSTYLES_FindMetric(int iPropertyPrimitive, int iPropertyId); -HBITMAP MSSTYLES_LoadBitmap(PTHEME_CLASS tc, LPCWSTR lpFilename, BOOL* hasAlpha); - -HRESULT MSSTYLES_GetPropertyBool(PTHEME_PROPERTY tp, BOOL *pfVal); -HRESULT MSSTYLES_GetPropertyColor(PTHEME_PROPERTY tp, COLORREF *pColor); -HRESULT MSSTYLES_GetPropertyFont(PTHEME_PROPERTY tp, HDC hdc, LOGFONTW *pFont); -HRESULT MSSTYLES_GetPropertyInt(PTHEME_PROPERTY tp, int *piVal); -HRESULT MSSTYLES_GetPropertyIntList(PTHEME_PROPERTY tp, INTLIST *pIntList); -HRESULT MSSTYLES_GetPropertyPosition(PTHEME_PROPERTY tp, POINT *pPoint); -HRESULT MSSTYLES_GetPropertyString(PTHEME_PROPERTY tp, LPWSTR pszBuff, int cchMaxBuffChars); -HRESULT MSSTYLES_GetPropertyRect(PTHEME_PROPERTY tp, RECT *pRect); -HRESULT MSSTYLES_GetPropertyMargins(PTHEME_PROPERTY tp, RECT *prc, MARGINS *pMargins); - -PUXINI_FILE UXINI_LoadINI(HMODULE hTheme, LPCWSTR lpName); -void UXINI_CloseINI(PUXINI_FILE uf); -LPCWSTR UXINI_GetNextSection(PUXINI_FILE uf, DWORD *dwLen); -BOOL UXINI_FindSection(PUXINI_FILE uf, LPCWSTR lpName); -LPCWSTR UXINI_GetNextValue(PUXINI_FILE uf, DWORD *dwNameLen, LPCWSTR *lpValue, DWORD *dwValueLen); -BOOL UXINI_FindValue(PUXINI_FILE uf, LPCWSTR lpName, LPCWSTR *lpValue, DWORD *dwValueLen); +HRESULT MSSTYLES_OpenThemeFile(LPCWSTR lpThemeFile, LPCWSTR pszColorName, LPCWSTR pszSizeName, PTHEME_FILE *tf) DECLSPEC_HIDDEN; +void MSSTYLES_CloseThemeFile(PTHEME_FILE tf) DECLSPEC_HIDDEN; +HRESULT MSSTYLES_SetActiveTheme(PTHEME_FILE tf, BOOL setMetrics) DECLSPEC_HIDDEN; +PTHEME_CLASS MSSTYLES_OpenThemeClass(LPCWSTR pszAppName, LPCWSTR pszClassList) DECLSPEC_HIDDEN; +HRESULT MSSTYLES_CloseThemeClass(PTHEME_CLASS tc) DECLSPEC_HIDDEN; +BOOL MSSTYLES_LookupProperty(LPCWSTR pszPropertyName, int *dwPrimitive, int *dwId) DECLSPEC_HIDDEN; +BOOL MSSTYLES_LookupEnum(LPCWSTR pszValueName, int dwEnum, int *dwValue) DECLSPEC_HIDDEN; +BOOL MSSTYLES_LookupPartState(LPCWSTR pszClass, LPCWSTR pszPart, LPCWSTR pszState, int *iPartId, int *iStateId) DECLSPEC_HIDDEN; +PUXINI_FILE MSSTYLES_GetThemeIni(PTHEME_FILE tf) DECLSPEC_HIDDEN; +PTHEME_PARTSTATE MSSTYLES_FindPartState(PTHEME_CLASS tc, int iPartId, int iStateId, PTHEME_CLASS *tcNext) DECLSPEC_HIDDEN; +PTHEME_PROPERTY MSSTYLES_FindProperty(PTHEME_CLASS tc, int iPartId, int iStateId, int iPropertyPrimitive, int iPropertyId) DECLSPEC_HIDDEN; +PTHEME_PROPERTY MSSTYLES_FindMetric(int iPropertyPrimitive, int iPropertyId) DECLSPEC_HIDDEN; +HBITMAP MSSTYLES_LoadBitmap(PTHEME_CLASS tc, LPCWSTR lpFilename, BOOL* hasAlpha) DECLSPEC_HIDDEN; + +HRESULT MSSTYLES_GetPropertyBool(PTHEME_PROPERTY tp, BOOL *pfVal) DECLSPEC_HIDDEN; +HRESULT MSSTYLES_GetPropertyColor(PTHEME_PROPERTY tp, COLORREF *pColor) DECLSPEC_HIDDEN; +HRESULT MSSTYLES_GetPropertyFont(PTHEME_PROPERTY tp, HDC hdc, LOGFONTW *pFont) DECLSPEC_HIDDEN; +HRESULT MSSTYLES_GetPropertyInt(PTHEME_PROPERTY tp, int *piVal) DECLSPEC_HIDDEN; +HRESULT MSSTYLES_GetPropertyIntList(PTHEME_PROPERTY tp, INTLIST *pIntList) DECLSPEC_HIDDEN; +HRESULT MSSTYLES_GetPropertyPosition(PTHEME_PROPERTY tp, POINT *pPoint) DECLSPEC_HIDDEN; +HRESULT MSSTYLES_GetPropertyString(PTHEME_PROPERTY tp, LPWSTR pszBuff, int cchMaxBuffChars) DECLSPEC_HIDDEN; +HRESULT MSSTYLES_GetPropertyRect(PTHEME_PROPERTY tp, RECT *pRect) DECLSPEC_HIDDEN; +HRESULT MSSTYLES_GetPropertyMargins(PTHEME_PROPERTY tp, RECT *prc, MARGINS *pMargins) DECLSPEC_HIDDEN; + +PUXINI_FILE UXINI_LoadINI(HMODULE hTheme, LPCWSTR lpName) DECLSPEC_HIDDEN; +void UXINI_CloseINI(PUXINI_FILE uf) DECLSPEC_HIDDEN; +LPCWSTR UXINI_GetNextSection(PUXINI_FILE uf, DWORD *dwLen) DECLSPEC_HIDDEN; +BOOL UXINI_FindSection(PUXINI_FILE uf, LPCWSTR lpName) DECLSPEC_HIDDEN; +LPCWSTR UXINI_GetNextValue(PUXINI_FILE uf, DWORD *dwNameLen, LPCWSTR *lpValue, DWORD *dwValueLen) DECLSPEC_HIDDEN; +BOOL UXINI_FindValue(PUXINI_FILE uf, LPCWSTR lpName, LPCWSTR *lpValue, DWORD *dwValueLen) DECLSPEC_HIDDEN; #endif diff --git a/dlls/uxtheme/system.c b/dlls/uxtheme/system.c index 60e55ee..2d5b41e 100644 --- a/dlls/uxtheme/system.c +++ b/dlls/uxtheme/system.c @@ -57,8 +57,8 @@ static const WCHAR szDllName[] = {'D','l','l','N','a','m','e','\0'}; static const WCHAR szIniDocumentation[] = {'d','o','c','u','m','e','n','t','a','t','i','o','n','\0'}; -HINSTANCE hDllInst; -ATOM atDialogThemeEnabled; +DECLSPEC_HIDDEN HINSTANCE hDllInst; +DECLSPEC_HIDDEN ATOM atDialogThemeEnabled; static DWORD dwThemeAppProperties = STAP_ALLOW_NONCLIENT | STAP_ALLOW_CONTROLS; static ATOM atWindowTheme; diff --git a/dlls/uxtheme/uxthemedll.h b/dlls/uxtheme/uxthemedll.h index ed37e72..fee152c 100644 --- a/dlls/uxtheme/uxthemedll.h +++ b/dlls/uxtheme/uxthemedll.h @@ -76,25 +76,25 @@ typedef struct tagTHEMENAMES } THEMENAMES, *PTHEMENAMES; /* Declarations for undocumented functions for use internally */ -DWORD WINAPI QueryThemeServices(void); +DWORD WINAPI QueryThemeServices(void) DECLSPEC_HIDDEN; HRESULT WINAPI OpenThemeFile(LPCWSTR pszThemeFileName, LPCWSTR pszColorName, LPCWSTR pszSizeName, HTHEMEFILE *hThemeFile, - DWORD unknown); -HRESULT WINAPI CloseThemeFile(HTHEMEFILE hThemeFile); -HRESULT WINAPI ApplyTheme(HTHEMEFILE hThemeFile, char *unknown, HWND hWnd); + DWORD unknown) DECLSPEC_HIDDEN; +HRESULT WINAPI CloseThemeFile(HTHEMEFILE hThemeFile) DECLSPEC_HIDDEN; +HRESULT WINAPI ApplyTheme(HTHEMEFILE hThemeFile, char *unknown, HWND hWnd) DECLSPEC_HIDDEN; HRESULT WINAPI GetThemeDefaults(LPCWSTR pszThemeFileName, LPWSTR pszColorName, DWORD dwColorNameLen, LPWSTR pszSizeName, - DWORD dwSizeNameLen); + DWORD dwSizeNameLen) DECLSPEC_HIDDEN; HRESULT WINAPI EnumThemes(LPCWSTR pszThemePath, EnumThemeProc callback, - LPVOID lpData); + LPVOID lpData) DECLSPEC_HIDDEN; HRESULT WINAPI EnumThemeColors(LPWSTR pszThemeFileName, LPWSTR pszSizeName, - DWORD dwColorNum, PTHEMENAMES pszColorNames); + DWORD dwColorNum, PTHEMENAMES pszColorNames) DECLSPEC_HIDDEN; HRESULT WINAPI EnumThemeSizes(LPWSTR pszThemeFileName, LPWSTR pszColorName, - DWORD dwSizeNum, PTHEMENAMES pszColorNames); + DWORD dwSizeNum, PTHEMENAMES pszColorNames) DECLSPEC_HIDDEN; HRESULT WINAPI ParseThemeIniFile(LPCWSTR pszIniFileName, LPWSTR pszUnknown, - ParseThemeIniFileProc callback, LPVOID lpData); + ParseThemeIniFileProc callback, LPVOID lpData) DECLSPEC_HIDDEN; -extern void UXTHEME_InitSystem(HINSTANCE hInst); +extern void UXTHEME_InitSystem(HINSTANCE hInst) DECLSPEC_HIDDEN; /* No alpha blending */ #define ALPHABLEND_NONE 0

1 0