December 2012 - Wine-Commits

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

Dec. 27, 2012

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

Chae Jong Bin : wininet: Add stub for DeleteWpadCacheForNetworks.
by Alexandre Julliard Dec. 27, 2012

Dec. 27, 2012

Module: wine Branch: master Commit: e8307fe160985539aad1bc9333c3ec2cca144040 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e8307fe160985539aad1bc933… Author: Chae Jong Bin <chae(a)trunk.so> Date: Wed Dec 26 13:46:02 2012 +0000 wininet: Add stub for DeleteWpadCacheForNetworks. --- dlls/wininet/urlcache.c | 10 ++++++++++ dlls/wininet/wininet.spec | 1 + 2 files changed, 11 insertions(+), 0 deletions(-) diff --git a/dlls/wininet/urlcache.c b/dlls/wininet/urlcache.c index c5201b4..afccda8 100644 --- a/dlls/wininet/urlcache.c +++ b/dlls/wininet/urlcache.c @@ -4126,6 +4126,16 @@ BOOL WINAPI DeleteUrlCacheGroup(GROUPID GroupId, DWORD dwFlags, LPVOID lpReserve } /*********************************************************************** + * DeleteWpadCacheForNetworks (WININET.@) + * Undocumented, added in IE8 + */ +BOOL WINAPI DeleteWpadCacheForNetworks(DWORD unk1) +{ + FIXME("(%d) stub\n", unk1); + return FALSE; +} + +/*********************************************************************** * SetUrlCacheEntryGroupA (WININET.@) * */ diff --git a/dlls/wininet/wininet.spec b/dlls/wininet/wininet.spec index 6fcb3fd..5e21a40 100644 --- a/dlls/wininet/wininet.spec +++ b/dlls/wininet/wininet.spec @@ -31,6 +31,7 @@ @ stdcall DeleteUrlCacheEntryA(str) @ stdcall DeleteUrlCacheEntryW(wstr) @ stdcall DeleteUrlCacheGroup(int64 long ptr) +@ stdcall DeleteWpadCacheForNetworks(long) @ stdcall DetectAutoProxyUrl(str long long) @ stdcall -private DllInstall(long wstr) @ stdcall FindCloseUrlCache(long)

1 0

Dmitry Timoshkov : windowscodecs: Add some tests for IWICImagingFactory_CreateBitmapFromMemory.
by Alexandre Julliard Dec. 27, 2012

Dec. 27, 2012

Module: wine Branch: master Commit: cf9dbcc3c8acf49e0e71ae8e042c843fe7517401 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf9dbcc3c8acf49e0e71ae8e0… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Dec 27 16:29:20 2012 +0800 windowscodecs: Add some tests for IWICImagingFactory_CreateBitmapFromMemory. --- dlls/windowscodecs/tests/bitmap.c | 81 +++++++++++++++++++++++++++++++++++++ 1 files changed, 81 insertions(+), 0 deletions(-) diff --git a/dlls/windowscodecs/tests/bitmap.c b/dlls/windowscodecs/tests/bitmap.c index c2ce1aa..cec714b 100644 --- a/dlls/windowscodecs/tests/bitmap.c +++ b/dlls/windowscodecs/tests/bitmap.c @@ -1,5 +1,6 @@ /* * Copyright 2012 Vincent Povirk for CodeWeavers + * Copyright 2012 Dmitry Timoshkov * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -418,6 +419,85 @@ static void test_createbitmapfromsource(void) IWICBitmap_Release(bitmap2); } +static void test_CreateBitmapFromMemory(void) +{ + BYTE data3x3[27] = { + 128,128,255, 128,128,128, 128,255,128, + 128,128,128, 128,128,128, 255,255,255, + 255,128,128, 255,255,255, 255,255,255 }; + BYTE data3x2[27] = { + 128,128,255, 128,128,128, 128,255,128, + 0,0,0, 0,128,128, 255,255,255, + 255,128,128, 255,0,0, 0,0,0 }; + BYTE data[27]; + HRESULT hr; + IWICBitmap *bitmap; + UINT width, height, i; + + hr = IWICImagingFactory_CreateBitmapFromMemory(factory, 3, 3, &GUID_WICPixelFormat24bppBGR, + 0, 0, NULL, &bitmap); +todo_wine + ok(hr == E_INVALIDARG, "expected E_INVALIDARG, got %#x\n", hr); + + hr = IWICImagingFactory_CreateBitmapFromMemory(factory, 3, 3, &GUID_WICPixelFormat24bppBGR, + 0, sizeof(data3x3), data3x3, &bitmap); +todo_wine + ok(hr == E_INVALIDARG, "expected E_INVALIDARG, got %#x\n", hr); + + hr = IWICImagingFactory_CreateBitmapFromMemory(factory, 3, 3, &GUID_WICPixelFormat24bppBGR, + 6, sizeof(data3x3), data3x3, &bitmap); +todo_wine + ok(hr == E_INVALIDARG, "expected E_INVALIDARG, got %#x\n", hr); + + hr = IWICImagingFactory_CreateBitmapFromMemory(factory, 3, 3, &GUID_WICPixelFormat24bppBGR, + 12, sizeof(data3x3), data3x3, &bitmap); +todo_wine + ok(hr == WINCODEC_ERR_INSUFFICIENTBUFFER, "expected WINCODEC_ERR_INSUFFICIENTBUFFER, got %#x\n", hr); + + hr = IWICImagingFactory_CreateBitmapFromMemory(factory, 3, 3, &GUID_WICPixelFormat24bppBGR, + 9, sizeof(data3x3) - 1, data3x3, &bitmap); +todo_wine + ok(hr == WINCODEC_ERR_INSUFFICIENTBUFFER, "expected WINCODEC_ERR_INSUFFICIENTBUFFER, got %#x\n", hr); + + hr = IWICImagingFactory_CreateBitmapFromMemory(factory, 3, 3, &GUID_WICPixelFormat24bppBGR, + 9, sizeof(data3x3), data3x3, &bitmap); +todo_wine + ok(hr == S_OK, "IWICImagingFactory_CreateBitmapFromMemory error %#x\n", hr); + if (hr != S_OK) return; + + hr = IWICBitmap_GetSize(bitmap, &width, &height); + ok(hr == S_OK, "IWICBitmap_GetSize error %#x\n", hr); + ok(width == 3, "expected 3, got %u\n", width); + ok(height == 3, "expected 3, got %u\n", height); + + memset(data, 0, sizeof(data)); + hr = IWICBitmap_CopyPixels(bitmap, NULL, 9, sizeof(data), data); + ok(hr == S_OK, "IWICBitmap_CopyPixels error %#x\n", hr); + for (i = 0; i < sizeof(data); i++) + ok(data[i] == data3x3[i], "%u: expected %u, got %u\n", i, data[i], data3x3[i]); + + IWICBitmap_Release(bitmap); + + hr = IWICImagingFactory_CreateBitmapFromMemory(factory, 3, 2, &GUID_WICPixelFormat24bppBGR, + 13, sizeof(data3x3), data3x3, &bitmap); + ok(hr == S_OK, "IWICImagingFactory_CreateBitmapFromMemory error %#x\n", hr); + if (hr != S_OK) return; + + hr = IWICBitmap_GetSize(bitmap, &width, &height); + ok(hr == S_OK, "IWICBitmap_GetSize error %#x\n", hr); + ok(width == 3, "expected 3, got %u\n", width); + ok(height == 2, "expected 2, got %u\n", height); + + memset(data, 0, sizeof(data)); + hr = IWICBitmap_CopyPixels(bitmap, NULL, 13, sizeof(data), data); + ok(hr == S_OK, "IWICBitmap_CopyPixels error %#x\n", hr); + for (i = 0; i < sizeof(data); i++) + ok(data[i] == data3x2[i], "%u: expected %u, got %u\n", i, data3x2[i], data[i]); + + IWICBitmap_Release(bitmap); +} + + START_TEST(bitmap) { HRESULT hr; @@ -430,6 +510,7 @@ START_TEST(bitmap) test_createbitmap(); test_createbitmapfromsource(); + test_CreateBitmapFromMemory(); IWICImagingFactory_Release(factory);

1 0

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

Dec. 27, 2012

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

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

Dec. 27, 2012

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

Hermès Bélusca-Maïto : wpp: Fix path separator on Windows platforms.
by Alexandre Julliard Dec. 27, 2012

Dec. 27, 2012

Module: wine Branch: master Commit: 9dbd1969fca9c31155c6d85ea8129d249467926b URL: http://source.winehq.org/git/wine.git/?a=commit;h=9dbd1969fca9c31155c6d85ea… Author: Hermès Bélusca-Maïto <hermes.belusca(a)sfr.fr> Date: Thu Dec 27 00:40:23 2012 +0100 wpp: Fix path separator on Windows platforms. --- libs/wpp/preproc.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/libs/wpp/preproc.c b/libs/wpp/preproc.c index 233d260..fd99167 100644 --- a/libs/wpp/preproc.c +++ b/libs/wpp/preproc.c @@ -447,7 +447,7 @@ pp_entry_t *pp_add_macro(char *id, marg_t *args[], int nargs, mtext_t *exp) * Include management *------------------------------------------------------------------------- */ -#if defined(_Windows) || defined(__MSDOS__) +#if defined(_WIN32) || defined(__MSDOS__) #define INCLUDESEPARATOR ";" #else #define INCLUDESEPARATOR ":"

1 0

Piotr Caban : msvcrt: Return error in stat function when path is specified with trailing slash character .
by Alexandre Julliard Dec. 27, 2012

Dec. 27, 2012

Module: wine Branch: master Commit: bcf4467b86921b006d7782a1e52db3b232dcda4d URL: http://source.winehq.org/git/wine.git/?a=commit;h=bcf4467b86921b006d7782a1e… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Dec 27 12:03:51 2012 +0100 msvcrt: Return error in stat function when path is specified with trailing slash character. --- dlls/msvcrt/file.c | 34 ++++++++++++++++++++++++---------- dlls/msvcrt/tests/file.c | 24 ++++++++++++++++++++++++ 2 files changed, 48 insertions(+), 10 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 9d75bc6..2db13f8 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -2159,10 +2159,20 @@ int CDECL MSVCRT_stat64(const char* path, struct MSVCRT__stat64 * buf) TRACE(":file (%s) buf(%p)\n",path,buf); + plen = strlen(path); + while (plen && path[plen-1]==' ') + plen--; + + if (plen && (path[plen-1]=='\\' || path[plen-1]=='/')) + { + *MSVCRT__errno() = MSVCRT_ENOENT; + return -1; + } + if (!GetFileAttributesExA(path, GetFileExInfoStandard, &hfi)) { TRACE("failed (%d)\n",GetLastError()); - msvcrt_set_errno(ERROR_FILE_NOT_FOUND); + *MSVCRT__errno() = MSVCRT_ENOENT; return -1; } @@ -2178,11 +2188,8 @@ int CDECL MSVCRT_stat64(const char* path, struct MSVCRT__stat64 * buf) else buf->st_dev = buf->st_rdev = MSVCRT__getdrive() - 1; - plen = strlen(path); - /* Dir, or regular file? */ - if ((hfi.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) || - (path[plen-1] == '\\')) + if (hfi.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) mode |= (MSVCRT__S_IFDIR | ALL_S_IEXEC); else { @@ -2252,10 +2259,20 @@ int CDECL MSVCRT__wstat64(const MSVCRT_wchar_t* path, struct MSVCRT__stat64 * bu TRACE(":file (%s) buf(%p)\n",debugstr_w(path),buf); + plen = strlenW(path); + while (plen && path[plen-1]==' ') + plen--; + + if(plen && (path[plen-1]=='\\' || path[plen-1]=='/')) + { + *MSVCRT__errno() = MSVCRT_ENOENT; + return -1; + } + if (!GetFileAttributesExW(path, GetFileExInfoStandard, &hfi)) { TRACE("failed (%d)\n",GetLastError()); - msvcrt_set_errno(ERROR_FILE_NOT_FOUND); + *MSVCRT__errno() = MSVCRT_ENOENT; return -1; } @@ -2267,11 +2284,8 @@ int CDECL MSVCRT__wstat64(const MSVCRT_wchar_t* path, struct MSVCRT__stat64 * bu else buf->st_dev = buf->st_rdev = MSVCRT__getdrive() - 1; - plen = strlenW(path); - /* Dir, or regular file? */ - if ((hfi.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) || - (path[plen-1] == '\\')) + if (hfi.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) mode |= (MSVCRT__S_IFDIR | ALL_S_IEXEC); else { diff --git a/dlls/msvcrt/tests/file.c b/dlls/msvcrt/tests/file.c index e450b72..0078c2a 100644 --- a/dlls/msvcrt/tests/file.c +++ b/dlls/msvcrt/tests/file.c @@ -1444,6 +1444,11 @@ static void test_stat(void) ok(buf.st_nlink == 1, "st_nlink is %d, expected 1\n", buf.st_nlink); ok(buf.st_size == 0, "st_size is %d, expected 0\n", buf.st_size); + errno = 0xdeadbeef; + ret = stat("stat.tst\\", &buf); + ok(ret == -1, "stat returned %d\n", ret); + ok(errno == ENOENT, "errno = %d\n", errno); + close(fd); remove("stat.tst"); } @@ -1483,6 +1488,25 @@ static void test_stat(void) } else skip("pipe failed with errno %d\n", errno); + + /* Tests for directory */ + if(mkdir("stat.tst") == 0) + { + ret = stat("stat.tst ", &buf); + ok(!ret, "stat(directory) failed: errno=%d\n", errno); + ok((buf.st_mode & _S_IFMT) == _S_IFDIR, "bad format = %06o\n", buf.st_mode); + ok((buf.st_mode & 0777) == 0777, "bad st_mode = %06o\n", buf.st_mode); + ok(buf.st_dev == buf.st_rdev, "st_dev (%d) and st_rdev (%d) differ\n", buf.st_dev, buf.st_rdev); + ok(buf.st_nlink == 1, "st_nlink is %d, expected 1\n", buf.st_nlink); + + errno = 0xdeadbeef; + ret = stat("stat.tst\\ ", &buf); + ok(ret == -1, "stat returned %d\n", ret); + ok(errno == ENOENT, "errno = %d\n", errno); + rmdir( "stat.tst" ); + } + else + skip("mkdir failed with errno %d\n", errno); } static const char* pipe_string="Hello world";

1 0

Alexandre Julliard : rpcss: Remove redundant define.
by Alexandre Julliard Dec. 27, 2012

Dec. 27, 2012

Module: wine Branch: master Commit: 0e16345a5ffd1f02257f1fa4610f9e0b4da7a844 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0e16345a5ffd1f02257f1fa46… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 27 12:11:50 2012 +0100 rpcss: Remove redundant define. --- programs/rpcss/Makefile.in | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/programs/rpcss/Makefile.in b/programs/rpcss/Makefile.in index 40bd188..b1d0c3f 100644 --- a/programs/rpcss/Makefile.in +++ b/programs/rpcss/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -D__WINESRC__ MODULE = rpcss.exe APPMODE = -mconsole IMPORTS = rpcrt4

1 0

Alexandre Julliard : ntdll: Remove unused include.
by Alexandre Julliard Dec. 27, 2012

Dec. 27, 2012

Module: wine Branch: master Commit: 59c30130a00dc6a7e6c6f2090789e494ee7af54b URL: http://source.winehq.org/git/wine.git/?a=commit;h=59c30130a00dc6a7e6c6f2090… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 27 12:12:16 2012 +0100 ntdll: Remove unused include. --- dlls/ntdll/string.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/string.c b/dlls/ntdll/string.c index 716dbdf..699adb5 100644 --- a/dlls/ntdll/string.c +++ b/dlls/ntdll/string.c @@ -28,7 +28,6 @@ #include <stdlib.h> #include <stdio.h> #include <string.h> -#include <search.h> #include "windef.h" #include "winternl.h"

1 0

Jacek Caban : atl: Changed AtlModuleInit FIXME to TRACE.
by Alexandre Julliard Dec. 27, 2012

Dec. 27, 2012

Module: wine Branch: master Commit: dc160df8e92e3d94a3141db06cd6e948f359bdc7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc160df8e92e3d94a3141db06… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Dec 27 15:19:17 2012 +0100 atl: Changed AtlModuleInit FIXME to TRACE. --- dlls/atl/atl_main.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/atl/atl_main.c b/dlls/atl/atl_main.c index b6447ff..41b33ce 100644 --- a/dlls/atl/atl_main.c +++ b/dlls/atl/atl_main.c @@ -53,7 +53,7 @@ HRESULT WINAPI AtlModuleInit(_ATL_MODULEW* pM, _ATL_OBJMAP_ENTRYW* p, HINSTANCE INT i; UINT size; - FIXME("SEMI-STUB (%p %p %p)\n",pM,p,h); + TRACE("(%p %p %p)\n", pM, p, h); size = pM->cbSize; switch (size)

1 0