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

Nikolay Sivov : comctl32: Adjust field names and some defines to match current documentation.
by Alexandre Julliard May 2, 2011

May 2, 2011

Module: wine Branch: master Commit: ed161054fa495b206da946d3ed57f67435119cdd URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed161054fa495b206da946d3e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon May 2 16:34:11 2011 +0400 comctl32: Adjust field names and some defines to match current documentation. --- dlls/comctl32/comctl32undoc.c | 82 ++++++++++++++++++++-------------------- dlls/comctl32/tests/mru.c | 40 ++++++++++---------- 2 files changed, 61 insertions(+), 61 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ed161054fa495b206da94…

1 0

Andrew Eikum : mmdevapi: Initialize global driver data at DLL load time.
by Alexandre Julliard May 2, 2011

May 2, 2011

Module: wine Branch: master Commit: 4a37f2f0936e9471d6a0bf4af10097e721db5373 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a37f2f0936e9471d6a0bf4af… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon May 2 08:21:29 2011 -0500 mmdevapi: Initialize global driver data at DLL load time. --- dlls/mmdevapi/main.c | 2 +- dlls/winealsa.drv/mmdevdrv.c | 18 ++++++++++++------ dlls/winecoreaudio.drv/mmdevdrv.c | 17 +++++++++++------ dlls/wineoss.drv/mmdevdrv.c | 17 +++++++++++------ 4 files changed, 35 insertions(+), 19 deletions(-) diff --git a/dlls/mmdevapi/main.c b/dlls/mmdevapi/main.c index 48dd93d..f87ad2e 100644 --- a/dlls/mmdevapi/main.c +++ b/dlls/mmdevapi/main.c @@ -72,7 +72,7 @@ static BOOL load_driver(const WCHAR *name) } #define LDFC(n) do { drvs.p##n = (void*)GetProcAddress(drvs.module, #n);\ - if(!drvs.p##n) return FALSE; } while(0); + if(!drvs.p##n) { FreeLibrary(drvs.module); return FALSE; } } while(0); LDFC(GetEndpointIDs); LDFC(GetAudioEndpoint); #undef LDFC diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index 8957457..1bbb23c 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -140,6 +140,18 @@ static inline ACImpl *impl_from_IAudioClock2(IAudioClock2 *iface) return CONTAINING_RECORD(iface, ACImpl, IAudioClock2_iface); } +BOOL WINAPI DllMain(HINSTANCE dll, DWORD reason, void *reserved) +{ + if(reason == DLL_PROCESS_ATTACH){ + g_timer_q = CreateTimerQueue(); + if(!g_timer_q) + return FALSE; + + } + + return TRUE; +} + HRESULT WINAPI AUDDRV_GetEndpointIDs(EDataFlow flow, WCHAR ***ids, void ***keys, UINT *num, UINT *def_index) { @@ -175,12 +187,6 @@ HRESULT WINAPI AUDDRV_GetAudioEndpoint(void *key, IMMDevice *dev, TRACE("%p %p %d %p\n", key, dev, dataflow, out); - if(!g_timer_q){ - g_timer_q = CreateTimerQueue(); - if(!g_timer_q) - return E_FAIL; - } - This = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(ACImpl)); if(!This) return E_OUTOFMEMORY; diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c index 10201e7..c360642 100644 --- a/dlls/winecoreaudio.drv/mmdevdrv.c +++ b/dlls/winecoreaudio.drv/mmdevdrv.c @@ -159,6 +159,17 @@ static inline ACImpl *impl_from_IAudioClock2(IAudioClock2 *iface) return CONTAINING_RECORD(iface, ACImpl, IAudioClock2_iface); } +BOOL WINAPI DllMain(HINSTANCE dll, DWORD reason, void *reserved) +{ + if(reason == DLL_PROCESS_ATTACH){ + g_timer_q = CreateTimerQueue(); + if(!g_timer_q) + return FALSE; + } + + return TRUE; +} + HRESULT WINAPI AUDDRV_GetEndpointIDs(EDataFlow flow, WCHAR ***ids, AudioDeviceID ***keys, UINT *num, UINT *def_index) { @@ -344,12 +355,6 @@ HRESULT WINAPI AUDDRV_GetAudioEndpoint(AudioDeviceID *adevid, IMMDevice *dev, TRACE("%p %d %p\n", dev, dataflow, out); - if(!g_timer_q){ - g_timer_q = CreateTimerQueue(); - if(!g_timer_q) - return E_FAIL; - } - This = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(ACImpl)); if(!This) return E_OUTOFMEMORY; diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index d3f5435..278b1b3 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -151,6 +151,17 @@ static inline ACImpl *impl_from_IAudioClock2(IAudioClock2 *iface) return CONTAINING_RECORD(iface, ACImpl, IAudioClock2_iface); } +BOOL WINAPI DllMain(HINSTANCE dll, DWORD reason, void *reserved) +{ + if(reason == DLL_PROCESS_ATTACH){ + g_timer_q = CreateTimerQueue(); + if(!g_timer_q) + return FALSE; + } + + return TRUE; +} + HRESULT WINAPI AUDDRV_GetEndpointIDs(EDataFlow flow, WCHAR ***ids, void ***keys, UINT *num, UINT *def_index) { @@ -268,12 +279,6 @@ HRESULT WINAPI AUDDRV_GetAudioEndpoint(char *devnode, IMMDevice *dev, TRACE("%s %p %d %p\n", devnode, dev, dataflow, out); - if(!g_timer_q){ - g_timer_q = CreateTimerQueue(); - if(!g_timer_q) - return E_UNEXPECTED; - } - This = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(ACImpl)); if(!This) return E_OUTOFMEMORY;

1 0

Nikolay Sivov : comctl32/tests: Add more MRU tests.
by Alexandre Julliard May 2, 2011

May 2, 2011

Module: wine Branch: master Commit: bf3f848d8a939949baf89fc873cc73a8f215c53e URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf3f848d8a939949baf89fc87… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon May 2 16:47:41 2011 +0400 comctl32/tests: Add more MRU tests. --- dlls/comctl32/tests/mru.c | 303 ++++++++++++++++++++++++++++++++++++--------- 1 files changed, 247 insertions(+), 56 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=bf3f848d8a939949baf89…

1 0

Nikolay Sivov : comctl32: Ignore size field when creating with -W calls.
by Alexandre Julliard May 2, 2011

May 2, 2011

Module: wine Branch: master Commit: cefcadcc38fac636061bb70a64f367a97cb1b8bc URL: http://source.winehq.org/git/wine.git/?a=commit;h=cefcadcc38fac636061bb70a6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon May 2 16:59:09 2011 +0400 comctl32: Ignore size field when creating with -W calls. --- dlls/comctl32/comctl32undoc.c | 24 +++++++++++------------- dlls/comctl32/tests/mru.c | 12 ++++++------ 2 files changed, 17 insertions(+), 19 deletions(-) diff --git a/dlls/comctl32/comctl32undoc.c b/dlls/comctl32/comctl32undoc.c index 8e22cf0..cc59747 100644 --- a/dlls/comctl32/comctl32undoc.c +++ b/dlls/comctl32/comctl32undoc.c @@ -649,9 +649,9 @@ INT WINAPI FindMRUStringA (HANDLE hList, LPCSTR lpszString, LPINT lpRegNum) } /************************************************************************* - * CreateMRUListLazy_common (internal) + * create_mru_list (internal) */ -static HANDLE CreateMRUListLazy_common(LPWINEMRULIST mp) +static HANDLE create_mru_list(LPWINEMRULIST mp) { UINT i, err; HKEY newkey; @@ -737,24 +737,22 @@ static HANDLE CreateMRUListLazy_common(LPWINEMRULIST mp) * * See CreateMRUListLazyA. */ -HANDLE WINAPI CreateMRUListLazyW (const MRUINFOW *lpcml, DWORD dwParam2, +HANDLE WINAPI CreateMRUListLazyW (const MRUINFOW *infoW, DWORD dwParam2, DWORD dwParam3, DWORD dwParam4) { LPWINEMRULIST mp; /* Native does not check for a NULL lpcml */ - - if (lpcml->cbSize != sizeof(MRUINFOW) || !lpcml->hKey || - IsBadStringPtrW(lpcml->lpszSubKey, -1)) + if (!infoW->hKey || IsBadStringPtrW(infoW->lpszSubKey, -1)) return NULL; mp = Alloc(sizeof(WINEMRULIST)); - memcpy(&mp->extview, lpcml, sizeof(MRUINFOW)); - mp->extview.lpszSubKey = Alloc((strlenW(lpcml->lpszSubKey) + 1) * sizeof(WCHAR)); - strcpyW(mp->extview.lpszSubKey, lpcml->lpszSubKey); + memcpy(&mp->extview, infoW, sizeof(MRUINFOW)); + mp->extview.lpszSubKey = Alloc((strlenW(infoW->lpszSubKey) + 1) * sizeof(WCHAR)); + strcpyW(mp->extview.lpszSubKey, infoW->lpszSubKey); mp->isUnicode = TRUE; - return CreateMRUListLazy_common(mp); + return create_mru_list(mp); } /************************************************************************** @@ -790,7 +788,7 @@ HANDLE WINAPI CreateMRUListLazyA (const MRUINFOA *lpcml, DWORD dwParam2, MultiByteToWideChar(CP_ACP, 0, lpcml->lpszSubKey, -1, mp->extview.lpszSubKey, len); mp->isUnicode = FALSE; - return CreateMRUListLazy_common(mp); + return create_mru_list(mp); } /************************************************************************** @@ -798,9 +796,9 @@ HANDLE WINAPI CreateMRUListLazyA (const MRUINFOA *lpcml, DWORD dwParam2, * * See CreateMRUListA. */ -HANDLE WINAPI CreateMRUListW (const MRUINFOW *lpcml) +HANDLE WINAPI CreateMRUListW (const MRUINFOW *infoW) { - return CreateMRUListLazyW(lpcml, 0, 0, 0); + return CreateMRUListLazyW(infoW, 0, 0, 0); } /************************************************************************** diff --git a/dlls/comctl32/tests/mru.c b/dlls/comctl32/tests/mru.c index 70b355e..7d239d7 100644 --- a/dlls/comctl32/tests/mru.c +++ b/dlls/comctl32/tests/mru.c @@ -573,7 +573,7 @@ static void test_CreateMRUListW(void) infoW.lpfnCompare = NULL; hMru = pCreateMRUListW(&infoW); - todo_wine ok(hMru != NULL, "got %p\n", hMru); + ok(hMru != NULL, "got %p\n", hMru); pFreeMRUList(hMru); /* increased size */ @@ -585,7 +585,7 @@ static void test_CreateMRUListW(void) infoW.lpfnCompare = NULL; hMru = pCreateMRUListW(&infoW); - todo_wine ok(hMru != NULL, "got %p\n", hMru); + ok(hMru != NULL, "got %p\n", hMru); pFreeMRUList(hMru); /* zero size */ @@ -597,7 +597,7 @@ static void test_CreateMRUListW(void) infoW.lpfnCompare = NULL; hMru = pCreateMRUListW(&infoW); - todo_wine ok(hMru != NULL, "got %p\n", hMru); + ok(hMru != NULL, "got %p\n", hMru); pFreeMRUList(hMru); /* NULL hKey */ @@ -655,7 +655,7 @@ static void test_CreateMRUListLazyW(void) infoW.lpfnCompare = NULL; hMru = pCreateMRUListLazyW(&infoW, 0, 0, 0); - todo_wine ok(hMru != NULL, "got %p\n", hMru); + ok(hMru != NULL, "got %p\n", hMru); pFreeMRUList(hMru); /* increased size */ @@ -667,7 +667,7 @@ static void test_CreateMRUListLazyW(void) infoW.lpfnCompare = NULL; hMru = pCreateMRUListLazyW(&infoW, 0, 0, 0); - todo_wine ok(hMru != NULL, "got %p\n", hMru); + ok(hMru != NULL, "got %p\n", hMru); pFreeMRUList(hMru); /* zero size */ @@ -679,7 +679,7 @@ static void test_CreateMRUListLazyW(void) infoW.lpfnCompare = NULL; hMru = pCreateMRUListLazyW(&infoW, 0, 0, 0); - todo_wine ok(hMru != NULL, "got %p\n", hMru); + ok(hMru != NULL, "got %p\n", hMru); pFreeMRUList(hMru); /* NULL hKey */

1 0

Andrew Eikum : wineoss.drv: Implement IAudioSessionControl::GetState.
by Alexandre Julliard May 2, 2011

May 2, 2011

Module: wine Branch: master Commit: 4a95e7b0c93167ce808db629f5d0a786cc7f228e URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a95e7b0c93167ce808db629f… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon May 2 08:21:49 2011 -0500 wineoss.drv: Implement IAudioSessionControl::GetState. --- dlls/wineoss.drv/audio.c | 5 +- dlls/wineoss.drv/mmdevdrv.c | 234 ++++++++++++++++++++++++++++++++++++------- 2 files changed, 202 insertions(+), 37 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4a95e7b0c93167ce808db…

1 0

Alexandre Julliard : configure: Improve the detection of OSS v4.
by Alexandre Julliard May 2, 2011

May 2, 2011

Module: wine Branch: master Commit: f60a0f5e565ab9ec5f13b6b489e03b6b22ebf8f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f60a0f5e565ab9ec5f13b6b48… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon May 2 20:06:49 2011 +0200 configure: Improve the detection of OSS v4. --- configure | 42 +++++++++++++++++++++++------------------- configure.ac | 35 +++++++++++++++++------------------ dlls/wineoss.drv/Makefile.in | 1 + dlls/wineoss.drv/audio.c | 8 +------- dlls/wineoss.drv/dscapture.c | 8 +------- dlls/wineoss.drv/dsrender.c | 8 +------- dlls/wineoss.drv/midi.c | 8 +------- dlls/wineoss.drv/mixer.c | 8 +------- dlls/wineoss.drv/mmaux.c | 8 +------- dlls/wineoss.drv/mmdevdrv.c | 32 ++++++++++++-------------------- include/config.h.in | 13 ++----------- 11 files changed, 61 insertions(+), 110 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f60a0f5e565ab9ec5f13b…

1 0

Alexandre Julliard : wineoss: Get rid of %ll printf formats.
by Alexandre Julliard May 2, 2011

May 2, 2011

Module: wine Branch: master Commit: 92e05ed981c764e17a27f3240a1b7725994ed3ab URL: http://source.winehq.org/git/wine.git/?a=commit;h=92e05ed981c764e17a27f3240… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon May 2 21:03:15 2011 +0200 wineoss: Get rid of %ll printf formats. --- dlls/wineoss.drv/mmdevdrv.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index c66955f..ff21cd6 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -640,8 +640,8 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient *iface, int mask; HRESULT hr; - TRACE("(%p)->(%x, %x, %llu, %llu, %p, %s)\n", This, mode, flags, - duration, period, fmt, debugstr_guid(sessionguid)); + TRACE("(%p)->(%x, %x, %s, %s, %p, %s)\n", This, mode, flags, + wine_dbgstr_longlong(duration), wine_dbgstr_longlong(period), fmt, debugstr_guid(sessionguid)); if(!fmt) return E_POINTER;

1 0

Hans Leidekker : msi: Skip disabled components in the InstallService action .
by Alexandre Julliard May 2, 2011

May 2, 2011

Module: wine Branch: master Commit: 0d0074d56be678ea0480eb4bfbe69685bf0eb453 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d0074d56be678ea0480eb4bf… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon May 2 16:03:14 2011 +0200 msi: Skip disabled components in the InstallService action. --- dlls/msi/action.c | 33 +++++++++++++++++++-------------- 1 files changed, 19 insertions(+), 14 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 7bed12f..da59d3a 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -5945,23 +5945,33 @@ static UINT ACTION_UnpublishComponents( MSIPACKAGE *package ) static UINT ITERATE_InstallService(MSIRECORD *rec, LPVOID param) { + static const WCHAR query[] = + {'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ', + '`','C','o','m','p','o','n','e','n','t','`',' ','W','H','E','R','E',' ', + '`','C','o','m','p','o','n','e','n','t','`',' ','=','\'','%','s','\'',0}; MSIPACKAGE *package = param; + MSICOMPONENT *component; MSIRECORD *row; MSIFILE *file; - SC_HANDLE hscm, service = NULL; + SC_HANDLE hscm = NULL, service = NULL; LPCWSTR comp, key; LPWSTR name = NULL, disp = NULL, load_order = NULL, serv_name = NULL; LPWSTR depends = NULL, pass = NULL, args = NULL, image_path = NULL; DWORD serv_type, start_type, err_control; SERVICE_DESCRIPTIONW sd = {NULL}; - static const WCHAR query[] = - {'S','E','L','E','C','T',' ','*',' ','F','R', 'O','M',' ', - '`','C','o','m','p','o','n','e','n','t','`',' ', - 'W','H','E','R','E',' ', - '`','C','o','m','p','o','n','e','n','t','`',' ', - '=','\'','%','s','\'',0}; - + comp = MSI_RecordGetString( rec, 12 ); + component = get_loaded_component( package, comp ); + if (!component) + { + WARN("service component not found\n"); + goto done; + } + if (!component->Enabled) + { + TRACE("service component disabled\n"); + goto done; + } hscm = OpenSCManagerW(NULL, SERVICES_ACTIVE_DATABASEW, GENERIC_WRITE); if (!hscm) { @@ -5969,10 +5979,6 @@ static UINT ITERATE_InstallService(MSIRECORD *rec, LPVOID param) goto done; } - comp = MSI_RecordGetString( rec, 12 ); - if (!get_loaded_component( package, comp )) - goto done; - start_type = MSI_RecordGetInteger(rec, 5); if (start_type == SERVICE_BOOT_START || start_type == SERVICE_SYSTEM_START) goto done; @@ -5992,11 +5998,10 @@ static UINT ITERATE_InstallService(MSIRECORD *rec, LPVOID param) row = MSI_QueryGetRecord(package->db, query, comp); if (!row) { - ERR("Control query failed!\n"); + ERR("Query failed\n"); goto done; } key = MSI_RecordGetString(row, 6); - file = get_loaded_file(package, key); msiobj_release(&row->hdr); if (!file)

1 0

Hans Leidekker : msi: Define common strings just once.
by Alexandre Julliard May 2, 2011

May 2, 2011

Module: wine Branch: master Commit: cd34bfe6c1e1c841fdae24f8721a01c47db9a681 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd34bfe6c1e1c841fdae24f87… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon May 2 16:04:25 2011 +0200 msi: Define common strings just once. --- dlls/msi/action.c | 50 ++++++++++++++++---------------------------------- dlls/msi/appsearch.c | 2 +- dlls/msi/custom.c | 17 ++++++----------- dlls/msi/dialog.c | 2 +- dlls/msi/helpers.c | 12 +++++------- dlls/msi/install.c | 6 +----- dlls/msi/media.c | 6 +++--- dlls/msi/msi.c | 12 ++++-------- dlls/msi/msipriv.h | 18 ++++++++++++++---- dlls/msi/package.c | 10 +++------- dlls/msi/string.c | 5 ----- dlls/msi/table.c | 5 ----- dlls/msi/upgrade.c | 2 +- 13 files changed, 55 insertions(+), 92 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=cd34bfe6c1e1c841fdae2…

1 0

Hans Leidekker : msi: Rewrite the folder resolution code to keep track of the parent-child relationship .
by Alexandre Julliard May 2, 2011

May 2, 2011

Module: wine Branch: master Commit: 4668091528e4d124632544b36d0ab10cc890f292 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4668091528e4d124632544b36… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon May 2 16:03:55 2011 +0200 msi: Rewrite the folder resolution code to keep track of the parent-child relationship. --- dlls/msi/action.c | 181 ++++++++++++++++++++++++++++------------------ dlls/msi/helpers.c | 130 --------------------------------- dlls/msi/install.c | 113 +++++++++++++---------------- dlls/msi/msipriv.h | 12 +++- dlls/msi/package.c | 31 ++++++--- dlls/msi/tests/package.c | 8 ++ 6 files changed, 199 insertions(+), 276 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4668091528e4d12463254…

1 0