March 2009 - Wine-commits - list.winehq.org

Jacek Caban : urlmon: Return IAsyncMoniker from QueryInterface.
by Alexandre Julliard 24 Mar '09

24 Mar '09

Module: wine Branch: master Commit: 53b1a310feda81f815c503832e6da81e5599728a URL: http://source.winehq.org/git/wine.git/?a=commit;h=53b1a310feda81f815c503832… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 23 18:30:32 2009 +0100 urlmon: Return IAsyncMoniker from QueryInterface. --- dlls/urlmon/umon.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/urlmon/umon.c b/dlls/urlmon/umon.c index 689b3aa..28f43f5 100644 --- a/dlls/urlmon/umon.c +++ b/dlls/urlmon/umon.c @@ -62,6 +62,9 @@ static HRESULT WINAPI URLMoniker_QueryInterface(IMoniker *iface, REFIID riid, vo }else if(IsEqualIID(&IID_IMoniker, riid)) { TRACE("(%p)->(IID_IMoniker %p)\n", This, ppv); *ppv = iface; + }else if(IsEqualIID(&IID_IAsyncMoniker, riid)) { + TRACE("(%p)->(IID_IAsyncMoniker %p)\n", This, ppv); + *ppv = iface; }else { WARN("(%p)->(%s,%p)\n", This, debugstr_guid(riid), ppv); *ppv = NULL;

1 0

Jacek Caban : urlmon: Added StdURLMoniker implementation.
by Alexandre Julliard 24 Mar '09

24 Mar '09

Module: wine Branch: master Commit: a5b2075ef15c99deb914342c9672af699f401ef1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a5b2075ef15c99deb914342c9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 23 18:30:47 2009 +0100 urlmon: Added StdURLMoniker implementation. --- dlls/urlmon/tests/url.c | 22 ++++++++++++++++++++++ dlls/urlmon/umon.c | 40 ++++++++++++++++++++++++++++------------ dlls/urlmon/urlmon_main.c | 5 ++++- dlls/urlmon/urlmon_main.h | 1 + 4 files changed, 55 insertions(+), 13 deletions(-) diff --git a/dlls/urlmon/tests/url.c b/dlls/urlmon/tests/url.c index 6b57e1f..f5c553b 100644 --- a/dlls/urlmon/tests/url.c +++ b/dlls/urlmon/tests/url.c @@ -2571,6 +2571,25 @@ static void test_BindToStorage_fail(void) test_ReportResult(S_FALSE); } +static void test_StdURLMoniker(void) +{ + IMoniker *mon, *async_mon; + HRESULT hres; + + hres = CoCreateInstance(&IID_IInternet, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, + &IID_IMoniker, (void**)&mon); + ok(hres == S_OK, "Could not create IInternet instance: %08x\n", hres); + if(FAILED(hres)) + return; + + hres = IMoniker_QueryInterface(mon, &IID_IAsyncMoniker, (void**)&async_mon); + ok(hres == S_OK, "Could not get IAsyncMoniker iface: %08x\n", hres); + ok(mon == async_mon, "mon != async_mon\n"); + IMoniker_Release(async_mon); + + IMoniker_Release(mon); +} + static void gecko_installer_workaround(BOOL disable) { HKEY hkey; @@ -2622,6 +2641,9 @@ START_TEST(url) CoInitialize(NULL); + trace("test StdURLMoniker..."); + test_StdURLMoniker(); + trace("synchronous http test...\n"); test_BindToStorage(HTTP_TEST, FALSE, TYMED_ISTREAM); diff --git a/dlls/urlmon/umon.c b/dlls/urlmon/umon.c index 28f43f5..0d30765 100644 --- a/dlls/urlmon/umon.c +++ b/dlls/urlmon/umon.c @@ -376,7 +376,7 @@ static HRESULT WINAPI URLMoniker_GetDisplayName(IMoniker *iface, IBindCtx *pbc, if(!ppszDisplayName) return E_INVALIDARG; - + /* FIXME: If this is a partial URL, try and get a URL moniker from SZ_URLCONTEXT in the bind context, then look at pmkToLeft to try and complete the URL */ @@ -436,19 +436,28 @@ static const IMonikerVtbl URLMonikerVtbl = URLMoniker_IsSystemMoniker }; -/****************************************************************************** - * URLMoniker_Construct (local function) - *******************************************************************************/ -static HRESULT URLMoniker_Construct(URLMoniker *This, LPCOLESTR lpszLeftURLName, LPCOLESTR lpszURLName) +static URLMoniker *alloc_moniker(void) +{ + URLMoniker *ret; + + ret = heap_alloc(sizeof(URLMoniker)); + if(!ret) + return NULL; + + ret->lpIMonikerVtbl = &URLMonikerVtbl; + ret->ref = 1; + ret->URLName = NULL; + + return ret; +} + +static HRESULT URLMoniker_Init(URLMoniker *This, LPCOLESTR lpszLeftURLName, LPCOLESTR lpszURLName) { HRESULT hres; DWORD sizeStr = 0; TRACE("(%p,%s,%s)\n",This,debugstr_w(lpszLeftURLName),debugstr_w(lpszURLName)); - This->lpIMonikerVtbl = &URLMonikerVtbl; - This->ref = 0; - This->URLName = heap_alloc(INTERNET_MAX_URL_LENGTH*sizeof(WCHAR)); if(lpszLeftURLName) @@ -473,6 +482,14 @@ static HRESULT URLMoniker_Construct(URLMoniker *This, LPCOLESTR lpszLeftURLName, return S_OK; } +HRESULT StdURLMoniker_Construct(IUnknown *outer, void **ppv) +{ + TRACE("(%p %p)\n", outer, ppv); + + *ppv = alloc_moniker(); + return *ppv ? S_OK : E_OUTOFMEMORY; +} + /*********************************************************************** * CreateURLMonikerEx (URLMON.@) * @@ -499,7 +516,7 @@ HRESULT WINAPI CreateURLMonikerEx(IMoniker *pmkContext, LPCWSTR szURL, IMoniker if (dwFlags & URL_MK_UNIFORM) FIXME("ignoring flag URL_MK_UNIFORM\n"); - if(!(obj = heap_alloc(sizeof(*obj)))) + if(!(obj = alloc_moniker())) return E_OUTOFMEMORY; if(pmkContext) { @@ -513,12 +530,11 @@ HRESULT WINAPI CreateURLMonikerEx(IMoniker *pmkContext, LPCWSTR szURL, IMoniker } } - hres = URLMoniker_Construct(obj, lefturl, szURL); + hres = URLMoniker_Init(obj, lefturl, szURL); CoTaskMemFree(lefturl); if(SUCCEEDED(hres)) hres = URLMoniker_QueryInterface((IMoniker*)obj, &IID_IMoniker, (void**)ppmk); - else - heap_free(obj); + IMoniker_Release((IMoniker*)obj); return hres; } diff --git a/dlls/urlmon/urlmon_main.c b/dlls/urlmon/urlmon_main.c index 159b57d..ad1b07b 100644 --- a/dlls/urlmon/urlmon_main.c +++ b/dlls/urlmon/urlmon_main.c @@ -185,6 +185,8 @@ static const ClassFactory SecurityManagerCF = { &ClassFactoryVtbl, SecManagerImpl_Construct}; static const ClassFactory ZoneManagerCF = { &ClassFactoryVtbl, ZoneMgrImpl_Construct}; +static const ClassFactory StdURLMonikerCF = + { &ClassFactoryVtbl, StdURLMoniker_Construct}; struct object_creation_info { @@ -209,7 +211,8 @@ static const struct object_creation_info object_creation[] = { &CLSID_HttpSProtocol, CLASSFACTORY(&HttpSProtocolCF), wszHttps }, { &CLSID_MkProtocol, CLASSFACTORY(&MkProtocolCF), wszMk }, { &CLSID_InternetSecurityManager, CLASSFACTORY(&SecurityManagerCF), NULL }, - { &CLSID_InternetZoneManager, CLASSFACTORY(&ZoneManagerCF), NULL } + { &CLSID_InternetZoneManager, CLASSFACTORY(&ZoneManagerCF), NULL }, + { &CLSID_StdURLMoniker, CLASSFACTORY(&StdURLMonikerCF), NULL } }; static void init_session(BOOL init) diff --git a/dlls/urlmon/urlmon_main.h b/dlls/urlmon/urlmon_main.h index c5faa61..54c0435 100644 --- a/dlls/urlmon/urlmon_main.h +++ b/dlls/urlmon/urlmon_main.h @@ -38,6 +38,7 @@ extern HINSTANCE URLMON_hInstance; extern HRESULT SecManagerImpl_Construct(IUnknown *pUnkOuter, LPVOID *ppobj); extern HRESULT ZoneMgrImpl_Construct(IUnknown *pUnkOuter, LPVOID *ppobj); +extern HRESULT StdURLMoniker_Construct(IUnknown *pUnkOuter, LPVOID *ppobj); extern HRESULT FileProtocol_Construct(IUnknown *pUnkOuter, LPVOID *ppobj); extern HRESULT HttpProtocol_Construct(IUnknown *pUnkOuter, LPVOID *ppobj); extern HRESULT HttpSProtocol_Construct(IUnknown *pUnkOuter, LPVOID *ppobj);

1 0

Jacek Caban : urlmon: Fixed handling NULL URLName in GetDisplatName implementation.
by Alexandre Julliard 24 Mar '09

24 Mar '09

Module: wine Branch: master Commit: 781faa1b9d6fac122ff364f6fcd6b948608c8ac8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=781faa1b9d6fac122ff364f6f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 23 18:31:05 2009 +0100 urlmon: Fixed handling NULL URLName in GetDisplatName implementation. --- dlls/urlmon/tests/url.c | 6 +++++- dlls/urlmon/umon.c | 3 +++ 2 files changed, 8 insertions(+), 1 deletions(-) diff --git a/dlls/urlmon/tests/url.c b/dlls/urlmon/tests/url.c index f5c553b..a855e1b 100644 --- a/dlls/urlmon/tests/url.c +++ b/dlls/urlmon/tests/url.c @@ -2574,6 +2574,7 @@ static void test_BindToStorage_fail(void) static void test_StdURLMoniker(void) { IMoniker *mon, *async_mon; + LPOLESTR display_name; HRESULT hres; hres = CoCreateInstance(&IID_IInternet, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, @@ -2587,6 +2588,9 @@ static void test_StdURLMoniker(void) ok(mon == async_mon, "mon != async_mon\n"); IMoniker_Release(async_mon); + hres = IMoniker_GetDisplayName(mon, NULL, NULL, &display_name); + ok(hres == E_OUTOFMEMORY, "GetDisplayName failed: %08x, expected E_OUTOFMEMORY\n", hres); + IMoniker_Release(mon); } @@ -2641,7 +2645,7 @@ START_TEST(url) CoInitialize(NULL); - trace("test StdURLMoniker..."); + trace("test StdURLMoniker...\n"); test_StdURLMoniker(); trace("synchronous http test...\n"); diff --git a/dlls/urlmon/umon.c b/dlls/urlmon/umon.c index 0d30765..fe60c75 100644 --- a/dlls/urlmon/umon.c +++ b/dlls/urlmon/umon.c @@ -377,6 +377,9 @@ static HRESULT WINAPI URLMoniker_GetDisplayName(IMoniker *iface, IBindCtx *pbc, if(!ppszDisplayName) return E_INVALIDARG; + if(!This->URLName) + return E_OUTOFMEMORY; + /* FIXME: If this is a partial URL, try and get a URL moniker from SZ_URLCONTEXT in the bind context, then look at pmkToLeft to try and complete the URL */

1 0

Andrew Talbot : shell32: Remove uninitialized and superfluous struct.
by Alexandre Julliard 24 Mar '09

24 Mar '09

Module: wine Branch: master Commit: d2e4bcf5315ff0940268adc155e0c308b6c8c198 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d2e4bcf5315ff0940268adc15… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Mon Mar 23 22:18:47 2009 +0000 shell32: Remove uninitialized and superfluous struct. --- dlls/shell32/shell.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/shell32/shell.c b/dlls/shell32/shell.c index 7edc97b..67bdc01 100644 --- a/dlls/shell32/shell.c +++ b/dlls/shell32/shell.c @@ -189,7 +189,6 @@ HGLOBAL16 WINAPI InternalExtractIcon16(HINSTANCE16 hInstance, { HGLOBAL16 hRet = 0; HICON16 *RetPtr = NULL; - OFSTRUCT ofs; TRACE("(%04x,file %s,start %d,extract %d\n", hInstance, lpszExeFileName, nIconIndex, n); @@ -202,7 +201,7 @@ HGLOBAL16 WINAPI InternalExtractIcon16(HINSTANCE16 hInstance, if (nIconIndex == (UINT16)-1) /* get number of icons */ { - RetPtr[0] = PrivateExtractIconsA(ofs.szPathName, 0, 0, 0, NULL, NULL, 0, LR_DEFAULTCOLOR); + RetPtr[0] = PrivateExtractIconsA(lpszExeFileName, 0, 0, 0, NULL, NULL, 0, LR_DEFAULTCOLOR); } else { @@ -210,7 +209,7 @@ HGLOBAL16 WINAPI InternalExtractIcon16(HINSTANCE16 hInstance, HICON *icons; icons = HeapAlloc(GetProcessHeap(), 0, n * sizeof(*icons)); - ret = PrivateExtractIconsA(ofs.szPathName, nIconIndex, + ret = PrivateExtractIconsA(lpszExeFileName, nIconIndex, GetSystemMetrics(SM_CXICON), GetSystemMetrics(SM_CYICON), icons, NULL, n, LR_DEFAULTCOLOR);

1 0

Andrew Talbot : winex11.drv: Remove order-of-evaluation dependencies.
by Alexandre Julliard 24 Mar '09

24 Mar '09

Module: wine Branch: master Commit: 2024592b4188f199c236c4294930f3bfb178a813 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2024592b4188f199c236c4294… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Thu Mar 19 22:40:14 2009 +0000 winex11.drv: Remove order-of-evaluation dependencies. --- dlls/winex11.drv/xfont.c | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-) diff --git a/dlls/winex11.drv/xfont.c b/dlls/winex11.drv/xfont.c index 16409c5..d3d3e8c 100644 --- a/dlls/winex11.drv/xfont.c +++ b/dlls/winex11.drv/xfont.c @@ -3318,11 +3318,11 @@ BOOL CDECL X11DRV_EnumDeviceFonts( X11DRV_PDEVICE *physDev, LPLOGFONTW plf, /* Note: XFONT_GetFontMetric() will have to release the crit section, font list will have to be retraversed on return */ - if(plf->lfCharSet == DEFAULT_CHARSET || plf->lfCharSet == pfi->df.dfCharSet) { - if( (b = (*proc)( &lf.elfLogFont, (TEXTMETRICW *)&tm, - XFONT_GetFontMetric( pfi, &lf, &tm ), lp )) ) + UINT xfm = XFONT_GetFontMetric( pfi, &lf, &tm ); + + if( (b = (*proc)( &lf.elfLogFont, (TEXTMETRICW *)&tm, xfm, lp )) ) bRet = b; else break; } @@ -3334,8 +3334,9 @@ BOOL CDECL X11DRV_EnumDeviceFonts( X11DRV_PDEVICE *physDev, LPLOGFONTW plf, { if(pfr->fi) { - if( (b = (*proc)( &lf.elfLogFont, (TEXTMETRICW *)&tm, - XFONT_GetFontMetric( pfr->fi, &lf, &tm ), lp )) ) + UINT xfm = XFONT_GetFontMetric( pfr->fi, &lf, &tm ); + + if( (b = (*proc)( &lf.elfLogFont, (TEXTMETRICW *)&tm, xfm, lp )) ) bRet = b; else break; }

1 0

Andrew Talbot : wineps.drv: Remove order-of-evaluation dependencies.
by Alexandre Julliard 24 Mar '09

24 Mar '09

Module: wine Branch: master Commit: 92bfdeb5915abeba9875bbaef3162b737c222a50 URL: http://source.winehq.org/git/wine.git/?a=commit;h=92bfdeb5915abeba9875bbaef… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Thu Mar 19 22:40:07 2009 +0000 wineps.drv: Remove order-of-evaluation dependencies. --- dlls/wineps.drv/builtin.c | 14 ++++++++------ 1 files changed, 8 insertions(+), 6 deletions(-) diff --git a/dlls/wineps.drv/builtin.c b/dlls/wineps.drv/builtin.c index b8c5349..c8c3f9b 100644 --- a/dlls/wineps.drv/builtin.c +++ b/dlls/wineps.drv/builtin.c @@ -424,10 +424,11 @@ BOOL CDECL PSDRV_EnumDeviceFonts( PSDRV_PDEVICE *physDev, LPLOGFONTW plf, } if(family) { for(afmle = family->afmlist; afmle; afmle = afmle->next) { + UINT fm; + TRACE("Got '%s'\n", afmle->afm->FontName); - if( (b = (*proc)( &lf.elfLogFont, (TEXTMETRICW *)&tm, - PSDRV_GetFontMetric( physDev->hdc, afmle->afm, &tm, &lf ), - lp )) ) + fm = PSDRV_GetFontMetric( physDev->hdc, afmle->afm, &tm, &lf ); + if( (b = (*proc)( &lf.elfLogFont, (TEXTMETRICW *)&tm, fm, lp )) ) bRet = b; else break; } @@ -436,11 +437,12 @@ BOOL CDECL PSDRV_EnumDeviceFonts( PSDRV_PDEVICE *physDev, LPLOGFONTW plf, TRACE("lfFaceName = NULL\n"); for(family = physDev->pi->Fonts; family; family = family->next) { + UINT fm; + afmle = family->afmlist; TRACE("Got '%s'\n", afmle->afm->FontName); - if( (b = (*proc)( &lf.elfLogFont, (TEXTMETRICW *)&tm, - PSDRV_GetFontMetric( physDev->hdc, afmle->afm, &tm, &lf ), - lp )) ) + fm = PSDRV_GetFontMetric( physDev->hdc, afmle->afm, &tm, &lf ); + if( (b = (*proc)( &lf.elfLogFont, (TEXTMETRICW *)&tm, fm, lp )) ) bRet = b; else break; }

1 0

James Hawkins : kernel32: Add tests for WritePrivateProfileString.
by Alexandre Julliard 24 Mar '09

24 Mar '09

Module: wine Branch: master Commit: 287b07fddcff046018f9f56a30687409c1f7e3e1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=287b07fddcff046018f9f56a3… Author: James Hawkins <truiken(a)gmail.com> Date: Sun Mar 22 14:36:54 2009 -0700 kernel32: Add tests for WritePrivateProfileString. --- dlls/kernel32/tests/profile.c | 227 +++++++++++++++++++++++++++++++++++++++++ 1 files changed, 227 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/tests/profile.c b/dlls/kernel32/tests/profile.c index 2e5678c..6000ffb 100644 --- a/dlls/kernel32/tests/profile.c +++ b/dlls/kernel32/tests/profile.c @@ -802,6 +802,232 @@ static void test_GetPrivateProfileString(const char *content, const char *descri DeleteFileA(filename); } +static BOOL check_file_data(LPCSTR path, LPCSTR data) +{ + HANDLE file; + CHAR buf[MAX_PATH]; + DWORD size; + BOOL ret; + + file = CreateFileA(path, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, 0); + if (file == INVALID_HANDLE_VALUE) + return FALSE; + + size = GetFileSize(file, NULL); + buf[size] = '\0'; + ret = ReadFile(file, buf, size, &size, NULL); + CloseHandle(file); + if (!ret) + return FALSE; + + if (!*data && size != 0) + return FALSE; + + return !lstrcmpA(buf, data); +} + +static void test_WritePrivateProfileString(void) +{ + BOOL ret; + LPCSTR data; + CHAR path[MAX_PATH]; + CHAR temp[MAX_PATH]; + + GetTempPathA(MAX_PATH, temp); + GetTempFileNameA(temp, "wine", 0, path); + DeleteFileA(path); + + /* path is not created yet */ + + /* NULL lpAppName */ + SetLastError(0xdeadbeef); + ret = WritePrivateProfileStringA(NULL, "key", "string", path); + ok(ret == FALSE, "Expected FALSE, got %d\n", ret); + ok(GetLastError() == ERROR_FILE_NOT_FOUND, + "Expected ERROR_FILE_NOT_FOUND, got %d\n", GetLastError()); + ok(GetFileAttributesA(path) == INVALID_FILE_ATTRIBUTES, + "Expected path to not exist\n"); + + GetTempFileNameA(temp, "wine", 0, path); + + /* NULL lpAppName, path exists */ + data = ""; + SetLastError(0xdeadbeef); + ret = WritePrivateProfileStringA(NULL, "key", "string", path); + ok(ret == FALSE, "Expected FALSE, got %d\n", ret); + todo_wine + { + ok(GetLastError() == ERROR_FILE_NOT_FOUND, + "Expected ERROR_FILE_NOT_FOUND, got %d\n", GetLastError()); + } + ok(check_file_data(path, data), "File doesn't match\n"); + DeleteFileA(path); + + /* empty lpAppName */ + data = "[]\r\n" + "key=string\r\n"; + ret = WritePrivateProfileStringA("", "key", "string", path); + ok(ret == TRUE, "Expected TRUE, got %d\n", ret); + todo_wine + { + ok(check_file_data(path, data), "File doesn't match\n"); + } + DeleteFileA(path); + + /* NULL lpKeyName */ + data = ""; + ret = WritePrivateProfileStringA("App", NULL, "string", path); + ok(ret == TRUE, "Expected TRUE, got %d\n", ret); + todo_wine + { + ok(check_file_data(path, data), "File doesn't match\n"); + } + DeleteFileA(path); + + /* empty lpKeyName */ + data = "[App]\r\n" + "=string\r\n"; + ret = WritePrivateProfileStringA("App", "", "string", path); + ok(ret == TRUE, "Expected TRUE, got %d\n", ret); + todo_wine + { + ok(check_file_data(path, data), "File doesn't match\n"); + } + DeleteFileA(path); + + /* NULL lpString */ + data = ""; + ret = WritePrivateProfileStringA("App", "key", NULL, path); + ok(ret == TRUE, "Expected TRUE, got %d\n", ret); + todo_wine + { + ok(check_file_data(path, data), "File doesn't match\n"); + } + DeleteFileA(path); + + /* empty lpString */ + data = "[App]\r\n" + "key=\r\n"; + ret = WritePrivateProfileStringA("App", "key", "", path); + ok(ret == TRUE, "Expected TRUE, got %d\n", ret); + todo_wine + { + ok(check_file_data(path, data), "File doesn't match\n"); + } + DeleteFileA(path); + + /* empty lpFileName */ + SetLastError(0xdeadbeef); + ret = WritePrivateProfileStringA("App", "key", "string", ""); + ok(ret == FALSE, "Expected FALSE, got %d\n", ret); + ok(GetLastError() == ERROR_ACCESS_DENIED, + "Expected ERROR_ACCESS_DENIED, got %d\n", GetLastError()); + + /* The resulting file will be X:\\%WINDIR%\\win1.tmp */ + GetWindowsDirectoryA(temp, MAX_PATH); + GetTempFileNameA(temp, "win", 1, path); + DeleteFileA(path); + + /* relative path in lpFileName */ + data = "[App]\r\n" + "key=string\r\n"; + ret = WritePrivateProfileStringA("App", "key", "string", "win1.tmp"); + ok(ret == TRUE, "Expected TRUE, got %d\n", ret); + todo_wine + { + ok(check_file_data(path, data), "File doesn't match\n"); + } + DeleteFileA(path); + + GetTempPathA(MAX_PATH, temp); + GetTempFileNameA(temp, "wine", 0, path); + + /* build up an INI file */ + WritePrivateProfileStringA("App1", "key1", "string1", path); + WritePrivateProfileStringA("App1", "key2", "string2", path); + WritePrivateProfileStringA("App1", "key3", "string3", path); + WritePrivateProfileStringA("App2", "key4", "string4", path); + + /* make an addition and verify the INI */ + data = "[App1]\r\n" + "key1=string1\r\n" + "key2=string2\r\n" + "key3=string3\r\n" + "[App2]\r\n" + "key4=string4\r\n" + "[App3]\r\n" + "key5=string5\r\n"; + ret = WritePrivateProfileStringA("App3", "key5", "string5", path); + ok(ret == TRUE, "Expected TRUE, got %d\n", ret); + todo_wine + { + ok(check_file_data(path, data), "File doesn't match\n"); + } + + /* lpString is NULL, key2 key is deleted */ + data = "[App1]\r\n" + "key1=string1\r\n" + "key3=string3\r\n" + "[App2]\r\n" + "key4=string4\r\n" + "[App3]\r\n" + "key5=string5\r\n"; + ret = WritePrivateProfileStringA("App1", "key2", NULL, path); + ok(ret == TRUE, "Expected TRUE, got %d\n", ret); + todo_wine + { + ok(check_file_data(path, data), "File doesn't match\n"); + } + + /* try to delete key2 again */ + data = "[App1]\r\n" + "key1=string1\r\n" + "key3=string3\r\n" + "[App2]\r\n" + "key4=string4\r\n" + "[App3]\r\n" + "key5=string5\r\n"; + ret = WritePrivateProfileStringA("App1", "key2", NULL, path); + ok(ret == TRUE, "Expected TRUE, got %d\n", ret); + todo_wine + { + ok(check_file_data(path, data), "File doesn't match\n"); + } + + /* lpKeyName is NULL, App1 section is deleted */ + data = "[App2]\r\n" + "key4=string4\r\n" + "[App3]\r\n" + "key5=string5\r\n"; + ret = WritePrivateProfileStringA("App1", NULL, "string1", path); + ok(ret == TRUE, "Expected TRUE, got %d\n", ret); + todo_wine + { + ok(check_file_data(path, data), "File doesn't match\n"); + } + + /* lpString is not needed to delete a section */ + data = "[App3]\r\n" + "key5=string5\r\n"; + ret = WritePrivateProfileStringA("App2", NULL, NULL, path); + ok(ret == TRUE, "Expected TRUE, got %d\n", ret); + todo_wine + { + ok(check_file_data(path, data), "File doesn't match\n"); + } + + /* leave just the section */ + data = "[App3]\r\n"; + ret = WritePrivateProfileStringA("App3", "key5", NULL, path); + ok(ret == TRUE, "Expected TRUE, got %d\n", ret); + todo_wine + { + ok(check_file_data(path, data), "File doesn't match\n"); + } + + DeleteFileA(path); +} + START_TEST(profile) { test_profile_int(); @@ -827,4 +1053,5 @@ START_TEST(profile) "name4=a\r" "[section2]\r", "CR only"); + test_WritePrivateProfileString(); }

1 0

James Hawkins : kernel32: Set last error to ERROR_FILE_NOT_FOUND if lpAppName is NULL.
by Alexandre Julliard 24 Mar '09

24 Mar '09

Module: wine Branch: master Commit: f1308f9b40d65e795e8d15f14fd8be7defcb4ed0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f1308f9b40d65e795e8d15f14… Author: James Hawkins <truiken(a)gmail.com> Date: Sun Mar 22 14:37:31 2009 -0700 kernel32: Set last error to ERROR_FILE_NOT_FOUND if lpAppName is NULL. --- dlls/kernel32/profile.c | 3 +-- dlls/kernel32/tests/profile.c | 7 ++----- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/dlls/kernel32/profile.c b/dlls/kernel32/profile.c index 8b77aaa..fea858c 100644 --- a/dlls/kernel32/profile.c +++ b/dlls/kernel32/profile.c @@ -1446,8 +1446,7 @@ BOOL WINAPI WritePrivateProfileStringW( LPCWSTR section, LPCWSTR entry, else if (PROFILE_Open( filename, TRUE )) { if (!section) { - FIXME("(NULL?,%s,%s,%s)?\n", - debugstr_w(entry), debugstr_w(string), debugstr_w(filename)); + SetLastError(ERROR_FILE_NOT_FOUND); } else { ret = PROFILE_SetString( section, entry, string, FALSE); PROFILE_FlushFile(); diff --git a/dlls/kernel32/tests/profile.c b/dlls/kernel32/tests/profile.c index 6000ffb..0ba3fd1 100644 --- a/dlls/kernel32/tests/profile.c +++ b/dlls/kernel32/tests/profile.c @@ -855,11 +855,8 @@ static void test_WritePrivateProfileString(void) SetLastError(0xdeadbeef); ret = WritePrivateProfileStringA(NULL, "key", "string", path); ok(ret == FALSE, "Expected FALSE, got %d\n", ret); - todo_wine - { - ok(GetLastError() == ERROR_FILE_NOT_FOUND, - "Expected ERROR_FILE_NOT_FOUND, got %d\n", GetLastError()); - } + ok(GetLastError() == ERROR_FILE_NOT_FOUND, + "Expected ERROR_FILE_NOT_FOUND, got %d\n", GetLastError()); ok(check_file_data(path, data), "File doesn't match\n"); DeleteFileA(path);

1 0

James Hawkins : kernel32: Handle writing empty sections and keys in WritePrivateProfileString.
by Alexandre Julliard 24 Mar '09

24 Mar '09

Module: wine Branch: master Commit: 7c3529f1cc6a3ce6f0a403c337926c8fc9fbfc57 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c3529f1cc6a3ce6f0a403c33… Author: James Hawkins <truiken(a)gmail.com> Date: Sun Mar 22 14:37:44 2009 -0700 kernel32: Handle writing empty sections and keys in WritePrivateProfileString. --- dlls/kernel32/profile.c | 32 ++++++++++++++++++++------------ dlls/kernel32/tests/profile.c | 5 +---- 2 files changed, 21 insertions(+), 16 deletions(-) diff --git a/dlls/kernel32/profile.c b/dlls/kernel32/profile.c index fea858c..22cc445 100644 --- a/dlls/kernel32/profile.c +++ b/dlls/kernel32/profile.c @@ -202,31 +202,31 @@ static void PROFILE_Save( HANDLE hFile, const PROFILESECTION *section, ENCODING for ( ; section; section = section->next) { - int len = 0; + int len = 4; - if (section->name[0]) len += strlenW(section->name) + 6; + if (section->name[0]) len += strlenW(section->name); for (key = section->key; key; key = key->next) { - len += strlenW(key->name) + 2; - if (key->value) len += strlenW(key->value) + 1; + len += strlenW(key->name); + if (key->value && key->value[0]) len += strlenW(key->value); + len += 3; /* '=' and "\r\n" */ } buffer = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); if (!buffer) return; p = buffer; + *p++ = '['; if (section->name[0]) { - *p++ = '\r'; - *p++ = '\n'; - *p++ = '['; strcpyW( p, section->name ); p += strlenW(p); - *p++ = ']'; - *p++ = '\r'; - *p++ = '\n'; } + *p++ = ']'; + *p++ = '\r'; + *p++ = '\n'; + for (key = section->key; key; key = key->next) { strcpyW( p, key->name ); @@ -587,12 +587,20 @@ static PROFILEKEY *PROFILE_Find( PROFILESECTION **section, LPCWSTR section_name, int seclen, keylen; while (PROFILE_isspaceW(*section_name)) section_name++; - p = section_name + strlenW(section_name) - 1; + if (*section_name) + p = section_name + strlenW(section_name) - 1; + else + p = section_name; + while ((p > section_name) && PROFILE_isspaceW(*p)) p--; seclen = p - section_name + 1; while (PROFILE_isspaceW(*key_name)) key_name++; - p = key_name + strlenW(key_name) - 1; + if (*key_name) + p = key_name + strlenW(key_name) - 1; + else + p = key_name; + while ((p > key_name) && PROFILE_isspaceW(*p)) p--; keylen = p - key_name + 1; diff --git a/dlls/kernel32/tests/profile.c b/dlls/kernel32/tests/profile.c index 0ba3fd1..9f5398c 100644 --- a/dlls/kernel32/tests/profile.c +++ b/dlls/kernel32/tests/profile.c @@ -930,10 +930,7 @@ static void test_WritePrivateProfileString(void) "key=string\r\n"; ret = WritePrivateProfileStringA("App", "key", "string", "win1.tmp"); ok(ret == TRUE, "Expected TRUE, got %d\n", ret); - todo_wine - { - ok(check_file_data(path, data), "File doesn't match\n"); - } + ok(check_file_data(path, data), "File doesn't match\n"); DeleteFileA(path); GetTempPathA(MAX_PATH, temp);

1 0

James Hawkins : kernel32: Don't try to load an empty initialization file.
by Alexandre Julliard 24 Mar '09

24 Mar '09

Module: wine Branch: master Commit: 87847b47cd5e4a31a7bbe8ba9f16aa0d70365562 URL: http://source.winehq.org/git/wine.git/?a=commit;h=87847b47cd5e4a31a7bbe8ba9… Author: James Hawkins <truiken(a)gmail.com> Date: Sun Mar 22 14:37:54 2009 -0700 kernel32: Don't try to load an empty initialization file. --- dlls/kernel32/profile.c | 2 +- dlls/kernel32/tests/profile.c | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/dlls/kernel32/profile.c b/dlls/kernel32/profile.c index 22cc445..5d563a5 100644 --- a/dlls/kernel32/profile.c +++ b/dlls/kernel32/profile.c @@ -322,7 +322,7 @@ static PROFILESECTION *PROFILE_Load(HANDLE hFile, ENCODING * pEncoding) TRACE("%p\n", hFile); dwFileSize = GetFileSize(hFile, NULL); - if (dwFileSize == INVALID_FILE_SIZE) + if (dwFileSize == INVALID_FILE_SIZE || dwFileSize == 0) return NULL; buffer_base = HeapAlloc(GetProcessHeap(), 0 , dwFileSize); diff --git a/dlls/kernel32/tests/profile.c b/dlls/kernel32/tests/profile.c index 9f5398c..7b57699 100644 --- a/dlls/kernel32/tests/profile.c +++ b/dlls/kernel32/tests/profile.c @@ -865,10 +865,7 @@ static void test_WritePrivateProfileString(void) "key=string\r\n"; ret = WritePrivateProfileStringA("", "key", "string", path); ok(ret == TRUE, "Expected TRUE, got %d\n", ret); - todo_wine - { - ok(check_file_data(path, data), "File doesn't match\n"); - } + ok(check_file_data(path, data), "File doesn't match\n"); DeleteFileA(path); /* NULL lpKeyName */

1 0