November 2012 - Wine-Commits

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard Nov. 5, 2012

Nov. 5, 2012

Module: wine Branch: master Commit: 571d595b16fbeed6d96474e69ea7ca0a4229032d URL: http://source.winehq.org/git/wine.git/?a=commit;h=571d595b16fbeed6d96474e69… Author: Aurimas Fišeras <aurimas(a)gmail.com> Date: Sat Nov 3 18:44:13 2012 +0200 po: Update Lithuanian translation. --- po/lt.po | 24 ++++++++---------------- 1 files changed, 8 insertions(+), 16 deletions(-) diff --git a/po/lt.po b/po/lt.po index d99b240..7462b4c 100644 --- a/po/lt.po +++ b/po/lt.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2012-10-27 10:40+0300\n" +"PO-Revision-Date: 2012-11-03 18:42+0300\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: komp_lt(a)konf.lt\n" "Language: Lithuanian\n" @@ -8270,44 +8270,36 @@ msgid "Security Warning" msgstr "Įspėjimas apie saugumą" #: urlmon.rc:32 -#, fuzzy -#| msgid "Do you want to continue anyway?" msgid "Do you want to install this software?" -msgstr "Ar vis tiek norite tęsti?" +msgstr "Ar norite įdiegti šią programinę įrangą?" #: urlmon.rc:34 explorer.rc:29 msgid "Location:" msgstr "Vieta:" #: urlmon.rc:36 -#, fuzzy -#| msgid "Install/Uninstall" msgid "Don't install" -msgstr "Įdiegti/Pašalinti" +msgstr "Nediegti" #: urlmon.rc:40 msgid "" "When installed, ActiveX has full access to your computer.Do not click " "install unless you have absolute trust in the above source." msgstr "" +"Kai įdiegta, ActiveX turi visišką prieigą prie kompiuterio. Nespauskite " +"„Įdiegti“, nebent visiškai pasitikite šaltiniu aukščiau." #: urlmon.rc:47 -#, fuzzy -#| msgid "Installation transform failed to apply.\n" msgid "Installation of component failed: %08x" -msgstr "Nepavyko pritaikyti įdiegimo transformacijos.\n" +msgstr "Nepavyko įdiegti komponento: %08x" #: urlmon.rc:48 -#, fuzzy -#| msgid "&Install" msgid "Install (%d)" -msgstr "&Įdiegti" +msgstr "Įdiegti (%d)" #: urlmon.rc:49 -#, fuzzy -#| msgid "&Install" msgid "Install" -msgstr "&Įdiegti" +msgstr "Įdiegti" #: user32.rc:27 user32.rc:40 taskmgr.rc:138 msgctxt "window"

1 0

Nikolay Sivov : scrrun: Added a stub for IFolder interface.
by Alexandre Julliard Nov. 5, 2012

Nov. 5, 2012

Module: wine Branch: master Commit: fee495d5fda56fa5b0c24ac1f1368ae369209f53 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fee495d5fda56fa5b0c24ac1f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Nov 4 16:59:00 2012 -0500 scrrun: Added a stub for IFolder interface. --- dlls/scrrun/filesystem.c | 325 +++++++++++++++++++++++++++++++++++++++- dlls/scrrun/scrrun.c | 1 + dlls/scrrun/scrrun_private.h | 11 ++ dlls/scrrun/tests/filesystem.c | 32 ++++- 4 files changed, 362 insertions(+), 7 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=fee495d5fda56fa5b0c24…

1 0

Tatyana Fokina : ole32: Removed unused parametrs keyname and valuename in COM_RegReadPath.
by Alexandre Julliard Nov. 5, 2012

Nov. 5, 2012

Module: wine Branch: master Commit: 9d4fcaf2bbdb0ff148d623b78231441d73162086 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d4fcaf2bbdb0ff148d623b78… Author: Tatyana Fokina <tatyana(a)etersoft.ru> Date: Fri Nov 2 15:56:50 2012 +0400 ole32: Removed unused parametrs keyname and valuename in COM_RegReadPath. --- dlls/ole32/compobj.c | 16 ++++++---------- 1 files changed, 6 insertions(+), 10 deletions(-) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index 2019b41..9c92c32 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -967,16 +967,14 @@ static HRESULT apartment_getclassobject(struct apartment *apt, LPCWSTR dllpath, * * Reads a registry value and expands it when necessary */ -static DWORD COM_RegReadPath(HKEY hkeyroot, const WCHAR *keyname, const WCHAR *valuename, WCHAR * dst, DWORD dstlen) +static DWORD COM_RegReadPath(HKEY hkeyroot, WCHAR * dst, DWORD dstlen) { DWORD ret; - HKEY key; DWORD keytype; WCHAR src[MAX_PATH]; DWORD dwLength = dstlen * sizeof(WCHAR); - if((ret = RegOpenKeyExW(hkeyroot, keyname, 0, KEY_READ, &key)) == ERROR_SUCCESS) { - if( (ret = RegQueryValueExW(key, NULL, NULL, &keytype, (LPBYTE)src, &dwLength)) == ERROR_SUCCESS ) { + if( (ret = RegQueryValueExW(hkeyroot, NULL, NULL, &keytype, (LPBYTE)src, &dwLength)) == ERROR_SUCCESS ) { if (keytype == REG_EXPAND_SZ) { if (dstlen <= ExpandEnvironmentStringsW(src, dst, dstlen)) ret = ERROR_MORE_DATA; } else { @@ -992,9 +990,7 @@ static DWORD COM_RegReadPath(HKEY hkeyroot, const WCHAR *keyname, const WCHAR *v } lstrcpynW(dst, src, dstlen); } - } - RegCloseKey (key); - } + } return ret; } @@ -1019,7 +1015,7 @@ static HRESULT apartment_hostobject(struct apartment *apt, TRACE("clsid %s, iid %s\n", debugstr_guid(&params->clsid), debugstr_guid(&params->iid)); - if (COM_RegReadPath(params->hkeydll, NULL, NULL, dllpath, ARRAYSIZE(dllpath)) != ERROR_SUCCESS) + if (COM_RegReadPath(params->hkeydll, dllpath, ARRAYSIZE(dllpath)) != ERROR_SUCCESS) { /* failure: CLSID is not found in registry */ WARN("class %s not registered inproc\n", debugstr_guid(&params->clsid)); @@ -2383,7 +2379,7 @@ static HRESULT get_inproc_class_object(APARTMENT *apt, HKEY hkeydll, else apartment_threaded = !apt->multi_threaded; - if (COM_RegReadPath(hkeydll, NULL, NULL, dllpath, ARRAYSIZE(dllpath)) != ERROR_SUCCESS) + if (COM_RegReadPath(hkeydll, dllpath, ARRAYSIZE(dllpath)) != ERROR_SUCCESS) { /* failure: CLSID is not found in registry */ WARN("class %s not registered inproc\n", debugstr_guid(rclsid)); @@ -4299,7 +4295,7 @@ HRESULT Handler_DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) { WCHAR dllpath[MAX_PATH+1]; - if (COM_RegReadPath(hkey, NULL, NULL, dllpath, ARRAYSIZE(dllpath)) == ERROR_SUCCESS) + if (COM_RegReadPath(hkey, dllpath, ARRAYSIZE(dllpath)) == ERROR_SUCCESS) { static const WCHAR wszOle32[] = {'o','l','e','3','2','.','d','l','l',0}; if (!strcmpiW(dllpath, wszOle32))

1 0

Frédéric Delanoy : msvfw32: Fix a leak (coverity) .
by Alexandre Julliard Nov. 5, 2012

Nov. 5, 2012

Module: wine Branch: master Commit: 86544ce98f90cbd8ef504ea63c0bf50063bf7364 URL: http://source.winehq.org/git/wine.git/?a=commit;h=86544ce98f90cbd8ef504ea63… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri Nov 2 23:49:29 2012 +0100 msvfw32: Fix a leak (coverity). --- dlls/msvfw32/msvideo_main.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/msvfw32/msvideo_main.c b/dlls/msvfw32/msvideo_main.c index f27d3ec..f418481 100644 --- a/dlls/msvfw32/msvideo_main.c +++ b/dlls/msvfw32/msvideo_main.c @@ -1512,7 +1512,10 @@ static BOOL GetFileNamePreview(LPVOID lpofn,BOOL bSave,BOOL bUnicode) fnGetFileName = (LPVOID)GetProcAddress(hComdlg32, szFunctionName); if (fnGetFileName == NULL) + { + FreeLibrary(hComdlg32); return FALSE; + } /* FIXME: need to add OFN_ENABLEHOOK and our own handler */ ret = fnGetFileName(lpofn);

1 0

Christian Costa : d3dxof/tests: Pass level by value in process_data rather than a pointer.
by Alexandre Julliard Nov. 5, 2012

Nov. 5, 2012

Module: wine Branch: master Commit: 6be32ec80c0a3561bb2705a6e3bc707de11adee6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6be32ec80c0a3561bb2705a6e… Author: Christian Costa <titan.costa(a)gmail.com> Date: Mon Nov 5 09:47:06 2012 +0100 d3dxof/tests: Pass level by value in process_data rather than a pointer. --- dlls/d3dxof/tests/d3dxof.c | 23 ++++++++++++----------- 1 files changed, 12 insertions(+), 11 deletions(-) diff --git a/dlls/d3dxof/tests/d3dxof.c b/dlls/d3dxof/tests/d3dxof.c index 9ff76b2..e25b4ab 100644 --- a/dlls/d3dxof/tests/d3dxof.c +++ b/dlls/d3dxof/tests/d3dxof.c @@ -613,7 +613,7 @@ static void test_syntax(void) * only one string in a sub-object (very common). Use with care, this may lead to a crash. */ #define EXPAND_STRING 0 -static void process_data(LPDIRECTXFILEDATA lpDirectXFileData, int* plevel) +static void process_data(LPDIRECTXFILEDATA lpDirectXFileData, int level) { HRESULT hr; char name[100]; @@ -636,7 +636,7 @@ static void process_data(LPDIRECTXFILEDATA lpDirectXFileData, int* plevel) ok(hr == DXFILE_OK, "IDirectXFileData_GetType: %x\n", hr); hr = IDirectXFileData_GetData(lpDirectXFileData, NULL, &size, (void**)&pData); ok(hr == DXFILE_OK, "IDirectXFileData_GetData: %x\n", hr); - for (i = 0; i < *plevel; i++) + for (i = 0; i < level; i++) printf(" "); debugstr_guid(str_clsid, &clsid); debugstr_guid(str_clsid_type, clsid_type); @@ -657,7 +657,9 @@ static void process_data(LPDIRECTXFILEDATA lpDirectXFileData, int* plevel) } printf("\n"); } - (*plevel)++; + + level++; + while (SUCCEEDED(hr = IDirectXFileData_GetNextObject(lpDirectXFileData, &pChildObj))) { LPDIRECTXFILEDATA p1; @@ -668,17 +670,17 @@ static void process_data(LPDIRECTXFILEDATA lpDirectXFileData, int* plevel) hr = IDirectXFileObject_QueryInterface(pChildObj, &IID_IDirectXFileData, (void **) &p1); if (SUCCEEDED(hr)) { - for (i = 0; i < *plevel; i++) + for (i = 0; i < level; i++) printf(" "); printf("Found Data (%d)\n", j); - process_data(p1, plevel); + process_data(p1, level); IDirectXFileData_Release(p1); } hr = IDirectXFileObject_QueryInterface(pChildObj, &IID_IDirectXFileDataReference, (void **) &p2); if (SUCCEEDED(hr)) { LPDIRECTXFILEDATA pfdo; - for (i = 0; i < *plevel; i++) + for (i = 0; i < level; i++) printf(" "); printf("Found Data Reference (%d)\n", j); #if 0 @@ -688,21 +690,21 @@ static void process_data(LPDIRECTXFILEDATA lpDirectXFileData, int* plevel) ok(hr == DXFILE_OK, "IDirectXFileData_GetName: %x\n", hr); #endif IDirectXFileDataReference_Resolve(p2, &pfdo); - process_data(pfdo, plevel); + process_data(pfdo, level); IDirectXFileData_Release(pfdo); IDirectXFileDataReference_Release(p2); } hr = IDirectXFileObject_QueryInterface(pChildObj, &IID_IDirectXFileBinary, (void **) &p3); if (SUCCEEDED(hr)) { - for (i = 0; i < *plevel; i++) + for (i = 0; i < level; i++) printf(" "); printf("Found Binary (%d)\n", j); IDirectXFileBinary_Release(p3); } IDirectXFileObject_Release(pChildObj); } - (*plevel)--; + ok(hr == DXFILE_OK || hr == DXFILEERR_NOMOREOBJECTS, "IDirectXFileData_GetNextObject: %x\n", hr); } @@ -761,9 +763,8 @@ static void test_dump(void) while (SUCCEEDED(hr = IDirectXFileEnumObject_GetNextDataObject(lpDirectXFileEnumObject, &lpDirectXFileData))) { - int level = 0; printf("\n"); - process_data(lpDirectXFileData, &level); + process_data(lpDirectXFileData, 0); IDirectXFileData_Release(lpDirectXFileData); } ok(hr == DXFILE_OK || hr == DXFILEERR_NOMOREOBJECTS, "IDirectXFileEnumObject_GetNextDataObject: %x\n", hr);

1 0

Ken Thomases : opengl32: Don't lose __wine_set_pixel_format() declaration during make_opengl.
by Alexandre Julliard Nov. 5, 2012

Nov. 5, 2012

Module: wine Branch: master Commit: 26670de2107ebe2c59711b52e74426acf96c85c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=26670de2107ebe2c59711b52e… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sun Nov 4 17:28:51 2012 -0600 opengl32: Don't lose __wine_set_pixel_format() declaration during make_opengl. --- dlls/opengl32/make_opengl | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/opengl32/make_opengl b/dlls/opengl32/make_opengl index 0651904..bd230b2 100755 --- a/dlls/opengl32/make_opengl +++ b/dlls/opengl32/make_opengl @@ -821,7 +821,8 @@ foreach (sort keys %norm_functions) } print HEADER "\n\n"; -print HEADER "extern struct opengl_funcs * CDECL __wine_get_wgl_driver( HDC hdc, UINT version );\n\n"; +print HEADER "extern struct opengl_funcs * CDECL __wine_get_wgl_driver( HDC hdc, UINT version );\n"; +print HEADER "extern BOOL CDECL __wine_set_pixel_format( HWND hwnd, int format );\n\n"; print HEADER "#endif /* __WINE_WGL_DRIVER_H */\n"; close HEADER;

1 0

Detlef Riekenberg : winhttp: Accept WINHTTP_OPTION_CONFIGURE_PASSPORT_AUTH as session option.
by Alexandre Julliard Nov. 5, 2012

Nov. 5, 2012

Module: wine Branch: master Commit: 8a3211af4cdee3832514693a667c562c4aedfc1c URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a3211af4cdee3832514693a6… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Sun Nov 4 23:01:08 2012 +0100 winhttp: Accept WINHTTP_OPTION_CONFIGURE_PASSPORT_AUTH as session option. --- dlls/winhttp/session.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/winhttp/session.c b/dlls/winhttp/session.c index 3617b20..3889922 100644 --- a/dlls/winhttp/session.c +++ b/dlls/winhttp/session.c @@ -182,6 +182,9 @@ static BOOL session_set_option( object_header_t *hdr, DWORD option, LPVOID buffe case WINHTTP_OPTION_RECEIVE_TIMEOUT: session->recv_timeout = *(DWORD *)buffer; return TRUE; + case WINHTTP_OPTION_CONFIGURE_PASSPORT_AUTH: + FIXME("WINHTTP_OPTION_CONFIGURE_PASSPORT_AUTH: 0x%x\n", *(DWORD *)buffer); + return TRUE; default: FIXME("unimplemented option %u\n", option); set_last_error( ERROR_INVALID_PARAMETER );

1 0

Nikolay Sivov : scrrun: Invoke() takes interface pointer, not a pointer to pointer.
by Alexandre Julliard Nov. 5, 2012

Nov. 5, 2012

Module: wine Branch: master Commit: f43b49fbedc697e33ca81a09d7dd18b4d6348ead URL: http://source.winehq.org/git/wine.git/?a=commit;h=f43b49fbedc697e33ca81a09d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Nov 4 10:36:16 2012 -0500 scrrun: Invoke() takes interface pointer, not a pointer to pointer. --- dlls/scrrun/filesystem.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/scrrun/filesystem.c b/dlls/scrrun/filesystem.c index ade3310..d79c061 100644 --- a/dlls/scrrun/filesystem.c +++ b/dlls/scrrun/filesystem.c @@ -127,7 +127,7 @@ static HRESULT WINAPI filesys_Invoke(IFileSystem3 *iface, DISPID dispIdMember, hr = get_typeinfo(IFileSystem3_tid, &typeinfo); if(SUCCEEDED(hr)) { - hr = ITypeInfo_Invoke(typeinfo, &iface, dispIdMember, wFlags, + hr = ITypeInfo_Invoke(typeinfo, iface, dispIdMember, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); ITypeInfo_Release(typeinfo); }

1 0

Francois Gouget : Assorted spelling fixes.
by Alexandre Julliard Nov. 5, 2012

Nov. 5, 2012

Module: wine Branch: master Commit: d55bb4497f380aba5e4bd691fd5e21ce18fe51a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d55bb4497f380aba5e4bd691f… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Nov 4 11:06:58 2012 +0100 Assorted spelling fixes. --- dlls/ntdll/nt.c | 2 +- dlls/urlmon/axinstall.c | 2 +- programs/cmd/tests/test_builtins.cmd | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c index ab08190..d415db4 100644 --- a/dlls/ntdll/nt.c +++ b/dlls/ntdll/nt.c @@ -1143,7 +1143,7 @@ void fill_cpu_info(void) } #else num = 1; - FIXME("Detecting the number of processors not suported.\n"); + FIXME("Detecting the number of processors is not supported.\n"); #endif NtCurrentTeb()->Peb->NumberOfProcessors = num; diff --git a/dlls/urlmon/axinstall.c b/dlls/urlmon/axinstall.c index dedfb15..9f53ce0 100644 --- a/dlls/urlmon/axinstall.c +++ b/dlls/urlmon/axinstall.c @@ -324,7 +324,7 @@ static HRESULT install_file(install_ctx_t *ctx, const WCHAR *cache_file) if(!strcmpW(ext, cab_extW)) { hres = install_cab_file(ctx); }else { - FIXME("Unsupported extention %s\n", debugstr_w(ext)); + FIXME("Unsupported extension %s\n", debugstr_w(ext)); hres = E_NOTIMPL; } SysFreeString(path); diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index bfd051b..7f90549 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -732,8 +732,8 @@ for %%i in (%INT_PARMS%) do call :EQUtest %%i 10 for %%i in (%INT_PARMS%) do call :EQUtest %%i 9 if 011 EQU 9 (echo octal ok) if 0xA1 EQU 161 (echo hexa ok) -if 0xA1 EQU "161" (echo hexa should be be recognized) else (echo string/hexa compare ok) -if "0xA1" EQU 161 (echo hexa should be be recognized) else (echo string/hexa compare ok) +if 0xA1 EQU "161" (echo hexa should be recognized) else (echo string/hexa compare ok) +if "0xA1" EQU 161 (echo hexa should be recognized) else (echo string/hexa compare ok) for %%i in (%INT_PARMS%) do call :NEQtest %%i 0 for %%i in (%INT_PARMS%) do call :NEQtest %%i 1 for %%i in (%INT_PARMS%) do call :NEQtest %%i 10

1 0

Christian Costa : dmusic: Remove unused variables.
by Alexandre Julliard Nov. 5, 2012

Nov. 5, 2012

Module: wine Branch: master Commit: f7a9df5ecbc9d398d43ebda68ef99991cf2da3e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f7a9df5ecbc9d398d43ebda68… Author: Christian Costa <titan.costa(a)gmail.com> Date: Mon Nov 5 09:46:45 2012 +0100 dmusic: Remove unused variables. --- dlls/dmusic/collection.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/dlls/dmusic/collection.c b/dlls/dmusic/collection.c index c1545b2..e4ac798 100644 --- a/dlls/dmusic/collection.c +++ b/dlls/dmusic/collection.c @@ -489,7 +489,7 @@ static HRESULT WINAPI IDirectMusicCollectionImpl_IPersistStream_Load(LPPERSISTST { IDirectMusicCollectionImpl *This = impl_from_IPersistStream(iface); DMUS_PRIVATE_CHUNK chunk; - DWORD StreamSize, StreamCount, ListSize[3], ListCount[3]; + DWORD StreamSize, StreamCount, ListSize[2], ListCount[2]; LARGE_INTEGER liMove; /* used when skipping chunks */ ULARGE_INTEGER dlibCollectionPosition, dlibInstrumentPosition, dlibWavePoolPosition; @@ -689,8 +689,6 @@ static HRESULT WINAPI IDirectMusicCollectionImpl_IPersistStream_Load(LPPERSISTST case FOURCC_LIST: { IStream_Read(stream, &chunk.fccID, sizeof(FOURCC), NULL); TRACE_(dmfile)(": LIST chunk of type %s", debugstr_fourcc(chunk.fccID)); - ListSize[2] = chunk.dwSize - sizeof(FOURCC); - ListCount[2] = 0; switch (chunk.fccID) { default: { TRACE_(dmfile)(": unknown (skipping)\n");

1 0