wine-commits December 2012

wine-commits@winehq.org

2 participants
549 discussions

Andrew Eikum : winmm: Don't give a period time to IAudioClient::Initialize.
by Alexandre Julliard 27 Dec '12

27 Dec '12

Module: wine Branch: master Commit: 68679158b6ad5cff18ab38aadcf2ec9dfdc9f750 URL: http://source.winehq.org/git/wine.git/?a=commit;h=68679158b6ad5cff18ab38aad… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Dec 26 14:28:57 2012 -0600 winmm: Don't give a period time to IAudioClient::Initialize. --- dlls/winmm/waveform.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winmm/waveform.c b/dlls/winmm/waveform.c index 11ae66c..11849bd 100644 --- a/dlls/winmm/waveform.c +++ b/dlls/winmm/waveform.c @@ -1114,7 +1114,7 @@ static LRESULT WINMM_OpenDevice(WINMM_Device *device, WINMM_MMDevice *mmdevice, /* buffer size = 10 * 100000 (100 ns) = 0.1 seconds */ hr = IAudioClient_Initialize(device->client, AUDCLNT_SHAREMODE_SHARED, AUDCLNT_STREAMFLAGS_EVENTCALLBACK | AUDCLNT_STREAMFLAGS_NOPERSIST, - 10 * 100000, 50000, passed_fmt, &device->parent->session); + 10 * 100000, 0, passed_fmt, &device->parent->session); if(FAILED(hr)){ if(hr != AUDCLNT_E_UNSUPPORTED_FORMAT) WARN("Initialize failed: %08x\n", hr);

1 0

Frédéric Delanoy : appwiz.cpl: Fix a leak ( coverity).
by Alexandre Julliard 27 Dec '12

27 Dec '12

Module: wine Branch: master Commit: 720f1bb7eb3dfab50c3dcb1e9a0e314c93a4139f URL: http://source.winehq.org/git/wine.git/?a=commit;h=720f1bb7eb3dfab50c3dcb1e9… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed Dec 26 18:28:22 2012 +0100 appwiz.cpl: Fix a leak (coverity). --- dlls/appwiz.cpl/appwiz.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/appwiz.cpl/appwiz.c b/dlls/appwiz.cpl/appwiz.c index 4f6670d..1e092b1 100644 --- a/dlls/appwiz.cpl/appwiz.c +++ b/dlls/appwiz.cpl/appwiz.c @@ -314,6 +314,7 @@ static BOOL ReadApplicationsFromRegistry(HKEY root) err: RegCloseKey(hkeyApp); if (info) FreeAppInfo(info); + HeapFree(GetProcessHeap(), 0, command); return FALSE; }

1 0

Nikolay Sivov : oledb32: Partial implementation of GetDataSource().
by Alexandre Julliard 27 Dec '12

27 Dec '12

Module: wine Branch: master Commit: ec4de1f9fe0f7dd4138c9d8a721515d40015aa75 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec4de1f9fe0f7dd4138c9d8a7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Dec 26 20:53:45 2012 +0400 oledb32: Partial implementation of GetDataSource(). --- dlls/oledb32/datainit.c | 130 +++++++++++++++++++++++++++++++++------- dlls/oledb32/tests/database.c | 42 +++++++++----- include/oledberr.h | 2 + 3 files changed, 137 insertions(+), 37 deletions(-) diff --git a/dlls/oledb32/datainit.c b/dlls/oledb32/datainit.c index 78a005d..1316c0f 100644 --- a/dlls/oledb32/datainit.c +++ b/dlls/oledb32/datainit.c @@ -273,21 +273,121 @@ static ULONG WINAPI datainit_Release(IDataInitialize *iface) return ref; } +static void free_dbpropset(ULONG count, DBPROPSET *propset) +{ + int i; + + for (i = 0; i < count; i++) + { + int p; + + for (p = 0; p < propset[i].cProperties; p++) + VariantClear(&propset[i].rgProperties[p].vValue); + + CoTaskMemFree(propset[i].rgProperties); + } + CoTaskMemFree(propset); +} + /*** IDataInitialize methods ***/ -static HRESULT WINAPI datainit_GetDataSource(IDataInitialize *iface, IUnknown *pUnkOuter, DWORD dwClsCtx, - LPWSTR pwszInitializationString, REFIID riid, IUnknown **ppDataSource) +static HRESULT WINAPI datainit_GetDataSource(IDataInitialize *iface, IUnknown *outer, DWORD clsctx, + LPWSTR initstring, REFIID riid, IUnknown **datasource) { + static const WCHAR providerW[] = {'P','r','o','v','i','d','e','r','=',0}; + static const WCHAR msdasqlW[] = {'M','S','D','A','S','Q','L',0}; datainit *This = impl_from_IDataInitialize(iface); + WCHAR *prov = NULL; + CLSID provclsid; + HRESULT hr; - FIXME("(%p)->(%p %d %s %s %p)\n", This, pUnkOuter, dwClsCtx, debugstr_w(pwszInitializationString), - debugstr_guid(riid), ppDataSource); + FIXME("(%p)->(%p 0x%x %s %s %p): semi-stub\n", This, outer, clsctx, debugstr_w(initstring), debugstr_guid(riid), datasource); - if(IsEqualIID(riid, &IID_IDBInitialize)) + /* first get provider name */ + provclsid = IID_NULL; + if (initstring && (prov = strstrW(initstring, providerW))) { - return create_db_init( (LPVOID*)ppDataSource); + WCHAR *start, *progid; + int len; + + prov += sizeof(providerW)/sizeof(WCHAR)-1; + start = prov; + while (*prov && *prov != ';') + ++prov; + TRACE("got provider %s\n", debugstr_wn(start, prov-start)); + + len = prov - start; + progid = CoTaskMemAlloc((len+1)*sizeof(WCHAR)); + if (!progid) return E_OUTOFMEMORY; + + memcpy(progid, start, len*sizeof(WCHAR)); + progid[len] = 0; + + hr = CLSIDFromProgID(progid, &provclsid); + CoTaskMemFree(progid); + if (FAILED(hr)) + { + ERR("provider %s not registered\n", debugstr_wn(start, prov-start)); + return hr; + } + } + else + { + hr = CLSIDFromProgID(msdasqlW, &provclsid); + if (FAILED(hr)) + ERR("ODBC provider for OLE DB not registered\n"); } - return E_NOTIMPL; + /* check for provider mismatch if it was specified in init string */ + if (*datasource && prov) + { + IDBProperties *dbprops; + DBPROPIDSET propidset; + DBPROPSET *propset; + enum DBPROPENUM prop; + CLSID initprov; + ULONG count; + + hr = IUnknown_QueryInterface(*datasource, &IID_IDBProperties, (void**)&dbprops); + if (FAILED(hr)) + { + WARN("provider doesn't support IDBProperties\n"); + return hr; + } + + prop = DBPROP_INIT_DATASOURCE; + propidset.rgPropertyIDs = &prop; + propidset.cPropertyIDs = 1; + propidset.guidPropertySet = DBPROPSET_DBINIT; + count = 0; + propset = NULL; + hr = IDBProperties_GetProperties(dbprops, 1, &propidset, &count, &propset); + IDBProperties_Release(dbprops); + if (FAILED(hr)) + { + WARN("GetProperties failed for datasource, 0x%08x\n", hr); + return hr; + } + + TRACE("initial data source provider %s\n", debugstr_w(V_BSTR(&propset->rgProperties[0].vValue))); + initprov = IID_NULL; + CLSIDFromProgID(V_BSTR(&propset->rgProperties[0].vValue), &initprov); + free_dbpropset(count, propset); + + if (!IsEqualIID(&provclsid, &initprov)) return DB_E_MISMATCHEDPROVIDER; + } + + if (!*datasource) + { + if (!IsEqualIID(&provclsid, &IID_NULL)) + hr = CoCreateInstance(&provclsid, outer, clsctx, riid, (void**)datasource); + + if (FAILED(hr) && IsEqualIID(riid, &IID_IDBInitialize)) + hr = create_db_init((void**)datasource); + } + + /* FIXME: set properties from init string */ + + return hr; } /* returns character length of string representation */ @@ -342,22 +442,6 @@ static WCHAR *get_propinfo_descr(DBPROP *prop, DBPROPINFOSET *propinfoset) return NULL; } -static void free_dbpropset(ULONG count, DBPROPSET *propset) -{ - int i; - - for (i = 0; i < count; i++) - { - int p; - - for (p = 0; p < propset[i].cProperties; p++) - VariantClear(&propset[i].rgProperties[p].vValue); - - CoTaskMemFree(propset[i].rgProperties); - } - CoTaskMemFree(propset); -} - static void free_dbpropinfoset(ULONG count, DBPROPINFOSET *propinfoset) { int i; diff --git a/dlls/oledb32/tests/database.c b/dlls/oledb32/tests/database.c index f093d17..ede1074 100644 --- a/dlls/oledb32/tests/database.c +++ b/dlls/oledb32/tests/database.c @@ -30,22 +30,17 @@ #include "wine/test.h" - -static void test_database(void) +static void test_GetDataSource(WCHAR *initstring) { - HRESULT hr; - IDBInitialize *dbinit = NULL; IDataInitialize *datainit = NULL; + IDBInitialize *dbinit = NULL; + HRESULT hr; hr = CoCreateInstance(&CLSID_MSDAINITIALIZE, NULL, CLSCTX_INPROC_SERVER, &IID_IDataInitialize,(void**)&datainit); - if(FAILED(hr)) - { - win_skip("Unable to load oledb library\n"); - return; - } - - hr = IDataInitialize_GetDataSource(datainit, NULL, CLSCTX_INPROC_SERVER, NULL, &IID_IDBInitialize, (IUnknown **)&dbinit); ok(hr == S_OK, "got %08x\n", hr); + + /* a failure to create data source here may indicate provider is simply not present */ + hr = IDataInitialize_GetDataSource(datainit, NULL, CLSCTX_INPROC_SERVER, initstring, &IID_IDBInitialize, (IUnknown**)&dbinit); if(SUCCEEDED(hr)) { IDBProperties *props = NULL; @@ -53,16 +48,35 @@ static void test_database(void) hr = IDBInitialize_QueryInterface(dbinit, &IID_IDBProperties, (void**)&props); ok(hr == S_OK, "got %08x\n", hr); if(SUCCEEDED(hr)) - { IDBProperties_Release(props); - } - IDBInitialize_Release(dbinit); } IDataInitialize_Release(datainit); } +static void test_database(void) +{ + static WCHAR initstring_jet[] = {'P','r','o','v','i','d','e','r','=','M','i','c','r','o','s','o','f','t','.', + 'J','e','t','.','O','L','E','D','B','.','4','.','0',';',0, + 'D','a','t','a',' ','S','o','u','r','c','e','=','d','u','m','m','y',';',0}; + static WCHAR initstring_default[] = {'D','a','t','a',' ','S','o','u','r','c','e','=','d','u','m','m','y',';',0}; + IDataInitialize *datainit = NULL; + HRESULT hr; + + hr = CoCreateInstance(&CLSID_MSDAINITIALIZE, NULL, CLSCTX_INPROC_SERVER, &IID_IDataInitialize,(void**)&datainit); + if (FAILED(hr)) + { + win_skip("Unable to load oledb library\n"); + return; + } + IDataInitialize_Release(datainit); + + test_GetDataSource(NULL); + test_GetDataSource(initstring_jet); + test_GetDataSource(initstring_default); +} + START_TEST(database) { OleInitialize(NULL); diff --git a/include/oledberr.h b/include/oledberr.h index 94db602..c2033b6 100644 --- a/include/oledberr.h +++ b/include/oledberr.h @@ -35,6 +35,8 @@ #define DB_E_DATAOVERFLOW 0x80040e57 +#define DB_E_MISMATCHEDPROVIDER 0x80040e75 + #define DB_S_ERRORSOCCURRED 0x00040eda #endif /* __WINE_OLEDBERR_H */

1 0

Andrew Eikum : winmm: Rearrange device mapping when a new default device is chosen.
by Alexandre Julliard 26 Dec '12

26 Dec '12

Module: wine Branch: master Commit: 4ab4bc5d095647ad1e4ca30c2749f0e3c337ad9d URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ab4bc5d095647ad1e4ca30c2… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Dec 26 08:40:03 2012 -0600 winmm: Rearrange device mapping when a new default device is chosen. --- dlls/winmm/waveform.c | 159 +++++++++++++++++++++++++++++++++++++++++++----- 1 files changed, 142 insertions(+), 17 deletions(-) diff --git a/dlls/winmm/waveform.c b/dlls/winmm/waveform.c index 18f3bb9..11ae66c 100644 --- a/dlls/winmm/waveform.c +++ b/dlls/winmm/waveform.c @@ -278,6 +278,15 @@ static void WINMM_InitDevice(WINMM_Device *device, device->parent = parent; } +static inline WINMM_MMDevice *read_map(WINMM_MMDevice **map, UINT index) +{ + WINMM_MMDevice *ret; + EnterCriticalSection(&g_devthread_lock); + ret = map[index]; + LeaveCriticalSection(&g_devthread_lock); + return ret; +} + /* finds the first unused Device, marks it as "open", and returns * a pointer to the device * @@ -290,9 +299,9 @@ static WINMM_Device *WINMM_FindUnusedDevice(BOOL is_out, UINT mmdevice_index) UINT i; if(is_out) - mmdevice = g_out_map[mmdevice_index]; + mmdevice = read_map(g_out_map, mmdevice_index); else - mmdevice = g_in_map[mmdevice_index]; + mmdevice = read_map(g_in_map, mmdevice_index); EnterCriticalSection(&mmdevice->lock); for(i = 0; i < MAX_DEVICES; ++i){ @@ -629,6 +638,112 @@ static HRESULT WINMM_EnumDevices(WINMM_MMDevice **devices, return S_OK; } +static HRESULT WINAPI notif_QueryInterface(IMMNotificationClient *iface, + const GUID *riid, void **obj) +{ + ERR("Unexpected QueryInterface call: %s\n", wine_dbgstr_guid(riid)); + return E_NOINTERFACE; +} + +static ULONG WINAPI notif_AddRef(IMMNotificationClient *iface) +{ + return 2; +} + +static ULONG WINAPI notif_Release(IMMNotificationClient *iface) +{ + return 1; +} + +static HRESULT WINAPI notif_OnDeviceStateChanged(IMMNotificationClient *iface, + const WCHAR *device_id, DWORD new_state) +{ + TRACE("Ignoring OnDeviceStateChanged callback\n"); + return S_OK; +} + +static HRESULT WINAPI notif_OnDeviceAdded(IMMNotificationClient *iface, + const WCHAR *device_id) +{ + TRACE("Ignoring OnDeviceAdded callback\n"); + return S_OK; +} + +static HRESULT WINAPI notif_OnDeviceRemoved(IMMNotificationClient *iface, + const WCHAR *device_id) +{ + TRACE("Ignoring OnDeviceRemoved callback\n"); + return S_OK; +} + +static HRESULT WINAPI notif_OnDefaultDeviceChanged(IMMNotificationClient *iface, + EDataFlow flow, ERole role, const WCHAR *device_id) +{ + WINMM_MMDevice ***map; + WINMM_MMDevice *prev; + UINT count, i; + + TRACE("%u %u %s\n", flow, role, wine_dbgstr_w(device_id)); + + if(role != eConsole) + return S_OK; + + EnterCriticalSection(&g_devthread_lock); + + if(flow == eRender){ + map = &g_out_map; + count = g_outmmdevices_count; + }else{ + map = &g_in_map; + count = g_inmmdevices_count; + } + + prev = (*map)[0]; + for(i = 0; i < count; ++i){ + WINMM_MMDevice *tmp; + + if(!lstrcmpW((*map)[i]->dev_id, device_id)){ + (*map)[0] = (*map)[i]; + (*map)[i] = prev; + + LeaveCriticalSection(&g_devthread_lock); + + return S_OK; + } + + tmp = (*map)[i]; + (*map)[i] = prev; + prev = tmp; + } + + WARN("Couldn't find new default device! Rearranged map for no reason.\n"); + (*map)[0] = prev; + + LeaveCriticalSection(&g_devthread_lock); + + return S_OK; +} + +static HRESULT WINAPI notif_OnPropertyValueChanged(IMMNotificationClient *iface, + const WCHAR *device_id, const PROPERTYKEY key) +{ + TRACE("Ignoring OnPropertyValueChanged callback\n"); + return S_OK; +} + +static IMMNotificationClientVtbl g_notif_vtbl = { + notif_QueryInterface, + notif_AddRef, + notif_Release, + notif_OnDeviceStateChanged, + notif_OnDeviceAdded, + notif_OnDeviceRemoved, + notif_OnDefaultDeviceChanged, + notif_OnPropertyValueChanged +}; + +static IMMNotificationClient g_notif = { &g_notif_vtbl }; + static HRESULT WINMM_InitMMDevices(void) { HRESULT hr, init_hr; @@ -644,6 +759,10 @@ static HRESULT WINMM_InitMMDevices(void) if(FAILED(hr)) goto exit; + hr = IMMDeviceEnumerator_RegisterEndpointNotificationCallback(devenum, &g_notif); + if(FAILED(hr)) + WARN("RegisterEndpointNotificationCallback failed: %08x\n", hr); + hr = WINMM_EnumDevices(&g_out_mmdevices, &g_out_map, &g_outmmdevices_count, eRender, devenum); if(FAILED(hr)){ @@ -1087,7 +1206,7 @@ static LRESULT WOD_Open(WINMM_OpenInfo *info) if(info->req_device >= g_outmmdevices_count) return MMSYSERR_BADDEVICEID; - mmdevice = g_out_map[info->req_device]; + mmdevice = read_map(g_out_map, info->req_device); if(!mmdevice->out_caps.szPname[0]) return MMSYSERR_NOTENABLED; @@ -1160,7 +1279,7 @@ static LRESULT WID_Open(WINMM_OpenInfo *info) if(info->req_device >= g_inmmdevices_count) return MMSYSERR_BADDEVICEID; - mmdevice = g_in_map[info->req_device]; + mmdevice = read_map(g_in_map, info->req_device); if(!mmdevice->in_caps.szPname[0]) return MMSYSERR_NOTENABLED; @@ -1900,10 +2019,10 @@ static WINMM_MMDevice *WINMM_GetMixerMMDevice(HMIXEROBJ hmix, DWORD flags, case MIXER_OBJECTF_MIXER: /* == 0 */ *out = HandleToULong(hmix); if(*out < g_outmmdevices_count) - return g_out_map[*out]; + return read_map(g_out_map, *out); if(*out - g_outmmdevices_count < g_inmmdevices_count){ *out -= g_outmmdevices_count; - return g_in_map[*out]; + return read_map(g_in_map, *out); } /* fall through -- if it's not a valid mixer device, then * it could be a valid mixer handle. windows seems to do @@ -1916,17 +2035,17 @@ static WINMM_MMDevice *WINMM_GetMixerMMDevice(HMIXEROBJ hmix, DWORD flags, (!is_out && *out >= g_inmmdevices_count)) return NULL; if(is_out) - return g_out_map[*out]; - return g_in_map[*out]; + return read_map(g_out_map, *out); + return read_map(g_in_map, *out); case MIXER_OBJECTF_WAVEOUT: *out = HandleToULong(hmix); if(*out < g_outmmdevices_count) - return g_out_map[*out]; + return read_map(g_out_map, *out); return NULL; case MIXER_OBJECTF_WAVEIN: *out = HandleToULong(hmix); if(*out < g_inmmdevices_count) - return g_in_map[*out]; + return read_map(g_in_map, *out); return NULL; } @@ -2440,7 +2559,7 @@ UINT WINAPI waveOutGetDevCapsW(UINT_PTR uDeviceID, LPWAVEOUTCAPSW lpCaps, if(uDeviceID >= g_outmmdevices_count) return MMSYSERR_BADDEVICEID; - caps = &g_out_map[uDeviceID]->out_caps; + caps = &read_map(g_out_map, uDeviceID)->out_caps; } memcpy(lpCaps, caps, min(uSize, sizeof(*lpCaps))); @@ -2939,7 +3058,9 @@ static UINT WINMM_QueryInstanceIDSize(UINT device, DWORD_PTR *len, BOOL is_out) if(device >= count) return MMSYSERR_INVALHANDLE; + EnterCriticalSection(&g_devthread_lock); *len = (lstrlenW(devices[device]->dev_id) + 1) * sizeof(WCHAR); + LeaveCriticalSection(&g_devthread_lock); return MMSYSERR_NOERROR; } @@ -2963,11 +3084,15 @@ static UINT WINMM_QueryInstanceID(UINT device, WCHAR *str, DWORD_PTR len, if(device >= count) return MMSYSERR_INVALHANDLE; + EnterCriticalSection(&g_devthread_lock); id_len = (lstrlenW(devices[device]->dev_id) + 1) * sizeof(WCHAR); - if(len < id_len) + if(len < id_len){ + LeaveCriticalSection(&g_devthread_lock); return MMSYSERR_ERROR; + } memcpy(str, devices[device]->dev_id, id_len); + LeaveCriticalSection(&g_devthread_lock); return MMSYSERR_NOERROR; } @@ -3082,7 +3207,7 @@ UINT WINAPI waveInGetDevCapsW(UINT_PTR uDeviceID, LPWAVEINCAPSW lpCaps, UINT uSi if(uDeviceID >= g_inmmdevices_count) return MMSYSERR_BADDEVICEID; - caps = &g_in_map[uDeviceID]->in_caps; + caps = &read_map(g_in_map, uDeviceID)->in_caps; } memcpy(lpCaps, caps, min(uSize, sizeof(*lpCaps))); @@ -3495,10 +3620,10 @@ UINT WINAPI mixerGetDevCapsW(UINT_PTR uDeviceID, LPMIXERCAPSW lpCaps, UINT uSize return MMSYSERR_BADDEVICEID; if(uDeviceID < g_outmmdevices_count){ - mmdevice = g_out_map[uDeviceID]; + mmdevice = read_map(g_out_map, uDeviceID); memcpy(caps.szPname, mmdevice->out_caps.szPname, sizeof(caps.szPname)); }else{ - mmdevice = g_in_map[uDeviceID - g_outmmdevices_count]; + mmdevice = read_map(g_in_map, uDeviceID - g_outmmdevices_count); memcpy(caps.szPname, mmdevice->in_caps.szPname, sizeof(caps.szPname)); } @@ -3541,11 +3666,11 @@ UINT WINAPI mixerOpen(LPHMIXER lphMix, UINT uDeviceID, DWORD_PTR dwCallback, return MMSYSERR_BADDEVICEID; if(uDeviceID < g_outmmdevices_count){ - mmdevice = g_out_map[uDeviceID]; + mmdevice = read_map(g_out_map, uDeviceID); *lphMix = (HMIXER)WINMM_MakeHWAVE(uDeviceID, TRUE, mmdevice->mixer_count); }else{ - mmdevice = g_in_map[uDeviceID - g_outmmdevices_count]; + mmdevice = read_map(g_in_map, uDeviceID - g_outmmdevices_count); *lphMix = (HMIXER)WINMM_MakeHWAVE(uDeviceID - g_outmmdevices_count, FALSE, mmdevice->mixer_count); }

1 0

Jacek Caban : atl: Backport some tests from atl100.
by Alexandre Julliard 26 Dec '12

26 Dec '12

Module: wine Branch: master Commit: 99065bb65fa41fc49a50452eae75aace5eb4c2a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=99065bb65fa41fc49a50452ea… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Dec 26 13:50:11 2012 +0100 atl: Backport some tests from atl100. --- dlls/atl/tests/module.c | 56 +++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 56 insertions(+), 0 deletions(-) diff --git a/dlls/atl/tests/module.c b/dlls/atl/tests/module.c index ffa62ad..45cff06 100644 --- a/dlls/atl/tests/module.c +++ b/dlls/atl/tests/module.c @@ -58,7 +58,63 @@ static void test_StructSize(void) HeapFree (GetProcessHeap(), 0, tst); } +static void test_winmodule(void) +{ + _AtlCreateWndData create_data[3]; + _ATL_MODULEW winmod; + void *p; + HRESULT hres; + + winmod.cbSize = sizeof(winmod); + winmod.m_pCreateWndList = (void*)0xdeadbeef; + winmod.m_csWindowCreate.LockCount = 0xdeadbeef; + hres = AtlModuleInit(&winmod, NULL, NULL); + ok(hres == S_OK, "AtlModuleInit failed: %08x\n", hres); + ok(!winmod.m_pCreateWndList, "winmod.m_pCreateWndList = %p\n", winmod.m_pCreateWndList); + ok(winmod.m_csWindowCreate.LockCount == -1, "winmod.m_csWindowCreate.LockCount = %d\n", + winmod.m_csWindowCreate.LockCount); + + AtlModuleAddCreateWndData(&winmod, create_data, (void*)0xdead0001); + ok(winmod.m_pCreateWndList == create_data, "winmod.m_pCreateWndList != create_data\n"); + ok(create_data[0].m_pThis == (void*)0xdead0001, "unexpected create_data[0].m_pThis %p\n", create_data[0].m_pThis); + ok(create_data[0].m_dwThreadID == GetCurrentThreadId(), "unexpected create_data[0].m_dwThreadID %x\n", + create_data[0].m_dwThreadID); + ok(!create_data[0].m_pNext, "unexpected create_data[0].m_pNext %p\n", create_data[0].m_pNext); + + AtlModuleAddCreateWndData(&winmod, create_data+1, (void*)0xdead0002); + ok(winmod.m_pCreateWndList == create_data+1, "winmod.m_pCreateWndList != create_data\n"); + ok(create_data[1].m_pThis == (void*)0xdead0002, "unexpected create_data[1].m_pThis %p\n", create_data[1].m_pThis); + ok(create_data[1].m_dwThreadID == GetCurrentThreadId(), "unexpected create_data[1].m_dwThreadID %x\n", + create_data[1].m_dwThreadID); + ok(create_data[1].m_pNext == create_data, "unexpected create_data[1].m_pNext %p\n", create_data[1].m_pNext); + + AtlModuleAddCreateWndData(&winmod, create_data+2, (void*)0xdead0003); + ok(winmod.m_pCreateWndList == create_data+2, "winmod.m_pCreateWndList != create_data\n"); + ok(create_data[2].m_pThis == (void*)0xdead0003, "unexpected create_data[2].m_pThis %p\n", create_data[2].m_pThis); + ok(create_data[2].m_dwThreadID == GetCurrentThreadId(), "unexpected create_data[2].m_dwThreadID %x\n", + create_data[2].m_dwThreadID); + ok(create_data[2].m_pNext == create_data+1, "unexpected create_data[2].m_pNext %p\n", create_data[2].m_pNext); + + p = AtlModuleExtractCreateWndData(&winmod); + ok(p == (void*)0xdead0003, "unexpected AtlModuleExtractCreateWndData result %p\n", p); + ok(winmod.m_pCreateWndList == create_data+1, "winmod.m_pCreateWndList != create_data\n"); + ok(create_data[2].m_pNext == create_data+1, "unexpected create_data[2].m_pNext %p\n", create_data[2].m_pNext); + + create_data[1].m_dwThreadID = 0xdeadbeef; + + p = AtlModuleExtractCreateWndData(&winmod); + ok(p == (void*)0xdead0001, "unexpected AtlModuleExtractCreateWndData result %p\n", p); + ok(winmod.m_pCreateWndList == create_data+1, "winmod.m_pCreateWndList != create_data\n"); + ok(!create_data[0].m_pNext, "unexpected create_data[0].m_pNext %p\n", create_data[0].m_pNext); + ok(!create_data[1].m_pNext, "unexpected create_data[1].m_pNext %p\n", create_data[1].m_pNext); + + p = AtlModuleExtractCreateWndData(&winmod); + ok(!p, "unexpected AtlModuleExtractCreateWndData result %p\n", p); + ok(winmod.m_pCreateWndList == create_data+1, "winmod.m_pCreateWndList != create_data\n"); +} + START_TEST(module) { test_StructSize(); + test_winmodule(); }

1 0

Jacek Caban : atl: Use atlbase.h in tests.
by Alexandre Julliard 26 Dec '12

26 Dec '12

Module: wine Branch: master Commit: 65493cf137183635cecdb966800593a004c7a32c URL: http://source.winehq.org/git/wine.git/?a=commit;h=65493cf137183635cecdb9668… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Dec 26 13:49:50 2012 +0100 atl: Use atlbase.h in tests. --- dlls/atl/tests/module.c | 87 ++++++++++++----------------------------------- 1 files changed, 22 insertions(+), 65 deletions(-) diff --git a/dlls/atl/tests/module.c b/dlls/atl/tests/module.c index 2a97ef9..ffa62ad 100644 --- a/dlls/atl/tests/module.c +++ b/dlls/atl/tests/module.c @@ -24,84 +24,41 @@ #define COBJMACROS -#include <wine/test.h> -#include <windef.h> -#include <winbase.h> -#include <winuser.h> -#include <wingdi.h> -#include <winnls.h> -#include <winerror.h> -#include <winnt.h> -#include <wtypes.h> -#include <olectl.h> -#include <ocidl.h> - -struct _ATL_OBJMAP_ENTRYW; -struct _AtlCreateWndData; -struct _ATL_TERMFUNC_ELEM; - -struct _ATL_MODULEW -{ - UINT cbSize; - HINSTANCE m_hInst; - HINSTANCE m_hInstResource; - HINSTANCE m_hInstTypeLib; - struct _ATL_OBJMAP_ENTRYW* m_pObjMap; - LONG m_nLockCnt; - HANDLE m_hHeap; - union - { - CRITICAL_SECTION m_csTypeInfoHolder; - CRITICAL_SECTION m_csStaticDataInit; - } u; - CRITICAL_SECTION m_csWindowCreate; - CRITICAL_SECTION m_csObjMap; - - DWORD dwAtlBuildVer; - struct _AtlCreateWndData* m_pCreateWndList; - BOOL m_bDestroyHeap; - GUID* pguidVer; - DWORD m_dwHeaps; - HANDLE* m_phHeaps; - int m_nHeap; - struct _ATL_TERMFUNC_ELEM* m_pTermFuncs; -}; +#include <atlbase.h> -HRESULT WINAPI AtlModuleInit(struct _ATL_MODULEW* pM, struct _ATL_OBJMAP_ENTRYW* p, HINSTANCE h); +#include <wine/test.h> #define MAXSIZE 512 static void test_StructSize(void) { - struct _ATL_MODULEW *tst; - HRESULT hres; - int i; + _ATL_MODULEW *tst; + HRESULT hres; + int i; - tst = HeapAlloc (GetProcessHeap(),HEAP_ZERO_MEMORY,MAXSIZE); + tst = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, MAXSIZE); - for (i=0;i<MAXSIZE;i++) { - tst->cbSize = i; - hres = AtlModuleInit(tst, NULL, NULL); + for (i=0;i<MAXSIZE;i++) { + tst->cbSize = i; + hres = AtlModuleInit(tst, NULL, NULL); - switch (i) { - case FIELD_OFFSET( struct _ATL_MODULEW, dwAtlBuildVer ): - case sizeof(struct _ATL_MODULEW): + switch (i) { + case FIELD_OFFSET(_ATL_MODULEW, dwAtlBuildVer): + case sizeof(_ATL_MODULEW): #ifdef _WIN64 - case sizeof(struct _ATL_MODULEW) + sizeof(void *): + case sizeof(_ATL_MODULEW) + sizeof(void *): #endif - ok (hres == S_OK, "AtlModuleInit with %d failed (0x%x).\n", i, (int)hres); - break; - default: - ok (FAILED(hres) || - broken((i > FIELD_OFFSET( struct _ATL_MODULEW, dwAtlBuildVer )) && (hres == S_OK)), /* Win95 */ - "AtlModuleInit with %d succeeded? (0x%x).\n", i, (int)hres); - break; - } - } + ok (hres == S_OK, "AtlModuleInit with %d failed (0x%x).\n", i, (int)hres); + break; + default: + ok (FAILED(hres), "AtlModuleInit with %d succeeded? (0x%x).\n", i, (int)hres); + break; + } + } - HeapFree (GetProcessHeap(), 0, tst); + HeapFree (GetProcessHeap(), 0, tst); } START_TEST(module) { - test_StructSize(); + test_StructSize(); }

1 0

Jacek Caban : atl100: Fixed a typo.
by Alexandre Julliard 26 Dec '12

26 Dec '12

Module: wine Branch: master Commit: 1a111423dd432223d00e6e50cd72613143051ad7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a111423dd432223d00e6e50c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Dec 26 13:49:59 2012 +0100 atl100: Fixed a typo. --- dlls/atl100/tests/atl.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/atl100/tests/atl.c b/dlls/atl100/tests/atl.c index e7882fa..59268de 100644 --- a/dlls/atl100/tests/atl.c +++ b/dlls/atl100/tests/atl.c @@ -100,7 +100,7 @@ static void test_winmodule(void) ok(p == (void*)0xdead0001, "unexpected AtlWinModuleExtractCreateWndData result %p\n", p); ok(winmod.m_pCreateWndList == create_data+1, "winmod.m_pCreateWndList != create_data\n"); ok(!create_data[0].m_pNext, "unexpected create_data[0].m_pNext %p\n", create_data[0].m_pNext); - ok(!create_data[1].m_pNext+1, "unexpected create_data[1].m_pNext %p\n", create_data[1].m_pNext); + ok(!create_data[1].m_pNext, "unexpected create_data[1].m_pNext %p\n", create_data[1].m_pNext); p = AtlWinModuleExtractCreateWndData(&winmod); ok(!p, "unexpected AtlWinModuleExtractCreateWndData result %p\n", p);

1 0

Piotr Caban : msvcrt: NULL terminate program arguments list in __getmainargs.
by Alexandre Julliard 26 Dec '12

26 Dec '12

Module: wine Branch: master Commit: 6e485f13c011b8429a8b44afd53163ddb3c0bfd1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e485f13c011b8429a8b44afd… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Dec 26 13:28:14 2012 +0100 msvcrt: NULL terminate program arguments list in __getmainargs. --- dlls/msvcrt/data.c | 16 ++++++++++------ dlls/msvcrt/tests/data.c | 2 ++ 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/dlls/msvcrt/data.c b/dlls/msvcrt/data.c index a9505ed..b31e5f7 100644 --- a/dlls/msvcrt/data.c +++ b/dlls/msvcrt/data.c @@ -424,7 +424,7 @@ static int build_expanded_argv(int *argc, char **argv) len = strlen(data.cFileName)+1; if(argv) { - argv[args_no] = (char*)(argv+*argc)+size; + argv[args_no] = (char*)(argv+*argc+1)+size; memcpy(argv[args_no], __wine_main_argv[i], path_len*sizeof(char)); memcpy(argv[args_no]+path_len, data.cFileName, len*sizeof(char)); } @@ -437,7 +437,7 @@ static int build_expanded_argv(int *argc, char **argv) if(!len) { len = strlen(__wine_main_argv[i])+1; if(argv) { - argv[args_no] = (char*)(argv+*argc)+size; + argv[args_no] = (char*)(argv+*argc+1)+size; memcpy(argv[args_no], __wine_main_argv[i], len*sizeof(char)); } args_no++; @@ -445,7 +445,9 @@ static int build_expanded_argv(int *argc, char **argv) } } - size += args_no*sizeof(char*); + if(argv) + argv[args_no] = NULL; + size += (args_no+1)*sizeof(char*); *argc = args_no; return size; } @@ -519,7 +521,7 @@ static int build_expanded_wargv(int *argc, MSVCRT_wchar_t **argv) len = strlenW(data.cFileName)+1; if(argv) { - argv[args_no] = (MSVCRT_wchar_t*)(argv+*argc)+size; + argv[args_no] = (MSVCRT_wchar_t*)(argv+*argc+1)+size; memcpy(argv[args_no], __wine_main_wargv[i], path_len*sizeof(MSVCRT_wchar_t)); memcpy(argv[args_no]+path_len, data.cFileName, len*sizeof(MSVCRT_wchar_t)); } @@ -532,7 +534,7 @@ static int build_expanded_wargv(int *argc, MSVCRT_wchar_t **argv) if(!len) { len = strlenW(__wine_main_wargv[i])+1; if(argv) { - argv[args_no] = (MSVCRT_wchar_t*)(argv+*argc)+size; + argv[args_no] = (MSVCRT_wchar_t*)(argv+*argc+1)+size; memcpy(argv[args_no], __wine_main_wargv[i], len*sizeof(MSVCRT_wchar_t)); } args_no++; @@ -540,8 +542,10 @@ static int build_expanded_wargv(int *argc, MSVCRT_wchar_t **argv) } } + if(argv) + argv[args_no] = NULL; size *= sizeof(MSVCRT_wchar_t); - size += args_no*sizeof(MSVCRT_wchar_t*); + size += (args_no+1)*sizeof(MSVCRT_wchar_t*); *argc = args_no; return size; } diff --git a/dlls/msvcrt/tests/data.c b/dlls/msvcrt/tests/data.c index cdd65a7..e2adc34 100644 --- a/dlls/msvcrt/tests/data.c +++ b/dlls/msvcrt/tests/data.c @@ -146,6 +146,7 @@ static void test___getmainargs(void) ok(!strcmp(argv[2], filepath), "argv[2] = %s\n", argv[2]); sprintf(filepath, "%swine_test/*", tmppath); ok(!strcmp(argv[3], filepath), "argv[3] = %s\n", argv[3]); + ok(!argv[4], "argv[4] != NULL\n"); if(p___p___argc && p___p___argv) { new_argc = *p___p___argc(); @@ -172,6 +173,7 @@ static void test___getmainargs(void) sprintf(filepath, "%swine_test/test", tmppath); ok(!strcmp(argv[3], filepath), "argv[3] = %s\n", argv[3]); } + ok(!argv[5], "argv[5] != NULL\n"); if(p___p___argc && p___p___argv) { new_argc = *p___p___argc();

1 0

Frédéric Delanoy : xdg: Fix a file handle leak ( coverity).
by Alexandre Julliard 26 Dec '12

26 Dec '12

Module: wine Branch: master Commit: 04fb8a913cba1da03aeef0ca3dc4e4062316a306 URL: http://source.winehq.org/git/wine.git/?a=commit;h=04fb8a913cba1da03aeef0ca3… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed Dec 26 12:09:58 2012 +0100 xdg: Fix a file handle leak (coverity). --- dlls/shell32/xdg.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/shell32/xdg.c b/dlls/shell32/xdg.c index ce8c203..d05539c 100644 --- a/dlls/shell32/xdg.c +++ b/dlls/shell32/xdg.c @@ -942,7 +942,10 @@ HRESULT XDG_UserDirLookup(const char * const *xdg_dirs, const unsigned int num_d if (FAILED(hr)) { if (hr == E_OUTOFMEMORY) + { + fclose(file); goto xdg_user_dir_lookup_error; + } continue; } }

1 0

Piotr Caban : msvcrt: Added _strnicmp_l implementation.
by Alexandre Julliard 26 Dec '12

26 Dec '12

Module: wine Branch: master Commit: eaa1b7060375f819146cce127d401a2161db6ea1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eaa1b7060375f819146cce127… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Dec 26 12:04:59 2012 +0100 msvcrt: Added _strnicmp_l implementation. --- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/msvcrt.spec | 4 ++-- dlls/msvcrt/string.c | 32 +++++++++++++++++++++++++------- 5 files changed, 30 insertions(+), 12 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 64b4105..4838a14 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1341,7 +1341,7 @@ @ cdecl _strncoll(str str long) msvcrt._strncoll @ cdecl _strncoll_l(str str long ptr) msvcrt._strncoll_l @ cdecl _strnicmp(str str long) msvcrt._strnicmp -@ stub _strnicmp_l +@ cdecl _strnicmp_l(str str long ptr) msvcrt._strnicmp_l @ cdecl _strnicoll(str str long) msvcrt._strnicoll @ cdecl _strnicoll_l(str str long ptr) msvcrt._strnicoll_l @ cdecl _strnset(str long long) msvcrt._strnset diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 91147cf..0144e08 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -1003,7 +1003,7 @@ @ cdecl _strncoll(str str long) msvcrt._strncoll @ cdecl _strncoll_l(str str long ptr) msvcrt._strncoll_l @ cdecl _strnicmp(str str long) msvcrt._strnicmp -@ stub _strnicmp_l +@ cdecl _strnicmp_l(str str long ptr) msvcrt._strnicmp_l @ cdecl _strnicoll(str str long) msvcrt._strnicoll @ cdecl _strnicoll_l(str str long ptr) msvcrt._strnicoll_l @ cdecl _strnset(str long long) msvcrt._strnset diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index abde141..dd91d5e 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -996,7 +996,7 @@ @ cdecl _strncoll(str str long) msvcrt._strncoll @ cdecl _strncoll_l(str str long ptr) msvcrt._strncoll_l @ cdecl _strnicmp(str str long) msvcrt._strnicmp -@ stub _strnicmp_l +@ cdecl _strnicmp_l(str str long ptr) msvcrt._strnicmp_l @ cdecl _strnicoll(str str long) msvcrt._strnicoll @ cdecl _strnicoll_l(str str long ptr) msvcrt._strnicoll_l @ cdecl _strnset(str long long) msvcrt._strnset diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 3d15a21..29b459b 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -936,8 +936,8 @@ @ cdecl _strlwr_s_l(ptr long ptr) @ cdecl _strncoll(str str long) MSVCRT_strncoll_l @ cdecl _strncoll_l(str str long ptr) MSVCRT_strncoll -@ cdecl _strnicmp(str str long) ntdll._strnicmp -# stub _strnicmp_l(str str long ptr) +@ cdecl _strnicmp(str str long) MSVCRT__strnicmp +@ cdecl _strnicmp_l(str str long ptr) MSVCRT__strnicmp_l @ cdecl _strnicoll(str str long) MSVCRT__strnicoll @ cdecl _strnicoll_l(str str long ptr) MSVCRT__strnicoll_l @ cdecl _strnset(str long long) MSVCRT__strnset diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index b457510..d9ec353 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -1559,9 +1559,10 @@ void * __cdecl MSVCRT_memcpy( void *dst, const void *src, size_t n ) } /********************************************************************* - * _stricmp_l (MSVCRT.@) + * _strnicmp_l (MSVCRT.@) */ -int __cdecl MSVCRT__stricmp_l(const char *s1, const char *s2, MSVCRT__locale_t locale) +int __cdecl MSVCRT__strnicmp_l(const char *s1, const char *s2, + MSVCRT_size_t count, MSVCRT__locale_t locale) { MSVCRT_pthreadlocinfo locinfo; char c1, c2; @@ -1569,28 +1570,45 @@ int __cdecl MSVCRT__stricmp_l(const char *s1, const char *s2, MSVCRT__locale_t l if(!MSVCRT_CHECK_PMT(s1!=NULL && s2!=NULL)) return MSVCRT__NLSCMPERROR; + if(!count) + return 0; + if(!locale) locinfo = get_locinfo(); else locinfo = locale->locinfo; if(!locinfo->lc_handle[MSVCRT_LC_CTYPE]) - return strcasecmp(s1, s2); + return strncasecmp(s1, s2, count); do { c1 = MSVCRT__tolower_l(*s1++, locale); c2 = MSVCRT__tolower_l(*s2++, locale); - if(c1 != c2) - break; - }while(c1 && c1==c2); + }while(--count && c1 && c1==c2); return c1-c2; } /********************************************************************* + * _stricmp_l (MSVCRT.@) + */ +int __cdecl MSVCRT__stricmp_l(const char *s1, const char *s2, MSVCRT__locale_t locale) +{ + return MSVCRT__strnicmp_l(s1, s2, -1, locale); +} + +/********************************************************************* + * _strnicmp (MSVCRT.@) + */ +int __cdecl MSVCRT__strnicmp(const char *s1, const char *s2, MSVCRT_size_t count) +{ + return MSVCRT__strnicmp_l(s1, s2, count, NULL); +} + +/********************************************************************* * _stricmp (MSVCRT.@) */ int __cdecl MSVCRT__stricmp(const char *s1, const char *s2) { - return MSVCRT__stricmp_l(s1, s2, NULL); + return MSVCRT__strnicmp_l(s1, s2, -1, NULL); }

1 0

← Newer
1
2
3
4
5
6
7
...
55
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits December 2012