June 2015 - Wine-Devel - list.winehq.org

Re: windowscodecs: Fix build failure on OSX.

by Austin English

On Tue, Jun 30, 2015 at 2:02 PM, Sebastian Lackner <sebastian(a)fds-team.de> wrote: > The build failure unfortunately was introduced by my last patch > http://source.winehq.org/git/wine.git/commit/863f432a7d73b8b480a742fcbaf01d… > > Somehow I missed that this part is OSX specific and tested on Linux only - sorry for > the trouble. :/ The patch was tested by jam__ on IRC, would be nice if someone could > double check that no other warnings were introduced by my original commit. > > --- > dlls/windowscodecs/icnsformat.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/dlls/windowscodecs/icnsformat.c b/dlls/windowscodecs/icnsformat.c > index 54c7707..5d48a1a 100644 > --- a/dlls/windowscodecs/icnsformat.c > +++ b/dlls/windowscodecs/icnsformat.c > @@ -179,7 +179,7 @@ static ULONG WINAPI IcnsFrameEncode_Release(IWICBitmapFrameEncode *iface) > if (This->icns_image != NULL) > HeapFree(GetProcessHeap(), 0, This->icns_image); > > - IWICBitmapFrameEncode_Release(&This->encoder->IWICBitmapFrameEncode_iface); > + IWICBitmapEncoder_Release(&This->encoder->IWICBitmapEncoder_iface); > HeapFree(GetProcessHeap(), 0, This); > } > > -- > 2.4.4 > > With your patch applied, the build is fixed for me. There are 5 warnings, but they're unrelated to your patch (deprecated warnings): Austins-Mac-mini:windowscodecs austin$ make gcc -m32 -c -o icnsformat.o icnsformat.c -I. -I../../include -I/opt/local/include/libpng16 -D__WINESRC__ \ -D_REENTRANT -fPIC -Wall -pipe -fno-strict-aliasing -Wdeclaration-after-statement -Wempty-body \ -Wignored-qualifiers -Wstrict-prototypes -Wtype-limits -Wvla -Wwrite-strings -Wpointer-arith \ -gdwarf-2 -gstrict-dwarf -fno-omit-frame-pointer -I/usr/X11/include -I/opt/local/include \ -I/usr/local/include -g -O2 icnsformat.c:430:11: warning: 'PtrToHand' is deprecated: first deprecated in OS X 10.8 [-Wdeprecated-declarations] ret = PtrToHand(This->icns_image, &handle, This->size * This->size * 4); ^ /System/Library/Frameworks/CoreServices.framework/Frameworks/CarbonCore.framework/Headers/MacMemory.h:1772:1: note: 'PtrToHand' has been explicitly marked deprecated here PtrToHand( ^ icnsformat.c:439:5: warning: 'DisposeHandle' is deprecated: first deprecated in OS X 10.8 [-Wdeprecated-declarations] DisposeHandle(handle); ^ /System/Library/Frameworks/CoreServices.framework/Frameworks/CarbonCore.framework/Headers/MacMemory.h:1278:1: note: 'DisposeHandle' has been explicitly marked deprecated here DisposeHandle(Handle h) __OSX_AVAILABLE_BUT_DEPRECATED(__MAC_10_0, __MAC_10_8, __IPHONE_NA, __IPHONE_NA); ^ icnsformat.c:526:13: warning: 'DisposeHandle' is deprecated: first deprecated in OS X 10.8 [-Wdeprecated-declarations] DisposeHandle((Handle)This->icns_family); ^ /System/Library/Frameworks/CoreServices.framework/Frameworks/CarbonCore.framework/Headers/MacMemory.h:1278:1: note: 'DisposeHandle' has been explicitly marked deprecated here DisposeHandle(Handle h) __OSX_AVAILABLE_BUT_DEPRECATED(__MAC_10_0, __MAC_10_8, __IPHONE_NA, __IPHONE_NA); ^ icnsformat.c:550:43: warning: 'NewHandle' is deprecated: first deprecated in OS X 10.8 [-Wdeprecated-declarations] This->icns_family = (IconFamilyHandle)NewHandle(0); ^ /System/Library/Frameworks/CoreServices.framework/Frameworks/CarbonCore.framework/Headers/MacMemory.h:451:1: note: 'NewHandle' has been explicitly marked deprecated here NewHandle(Size byteCount) __OSX_AVAILABLE_BUT_DEPRECATED(__MAC_10_0, __MAC_10_8, __IPHONE_NA, __IPHONE_NA); ^ icnsformat.c:667:19: warning: 'GetHandleSize' is deprecated: first deprecated in OS X 10.8 [-Wdeprecated-declarations] buffer_size = GetHandleSize((Handle)This->icns_family); ^ /System/Library/Frameworks/CoreServices.framework/Frameworks/CarbonCore.framework/Headers/MacMemory.h:1356:1: note: 'GetHandleSize' has been explicitly marked deprecated here GetHandleSize(Handle h) __OSX_AVAILABLE_BUT_DEPRECATED(__MAC_10_0, __MAC_10_8, __IPHONE_NA, __IPHONE_NA); ^ 5 warnings generated. -- -Austin

June 30, 2015

Re: kernel32: K32EnumProcessModules: Handle NULL pointer gracefully.

by Alex Henrie

> diff --git a/dlls/kernel32/module.c b/dlls/kernel32/module.c > index f495e81..5461881 100644 > --- a/dlls/kernel32/module.c > +++ b/dlls/kernel32/module.c > @@ -1226,6 +1226,12 @@ BOOL WINAPI K32EnumProcessModules(HANDLE process, HMODULE *lphModule, > if (!init_module_iterator(&iter, process)) > return FALSE; > > + if (!lphModule) > + { > + SetLastError(ERROR_NOACCESS); > + return FALSE; > + } > + > if (!needed) > { > SetLastError(ERROR_NOACCESS); Wouldn't it be easier to write "if (!lphModule || !needed)"? Adding a test or two would also be nice. -Alex

June 30, 2015

A wrapper around the GTK+ rendering engine

by Ivan Akulinchev

Hello, I just want to thank you for Wine and show you my own uxtheme.dll implementation, which uses the GTK+ rendering engine. Thus Wine applications look really native for users. Here is the link: https://github.com/akulinchev/uxthemegtk (see the screenshots at the bottom of the page) If you want, I can help you to add it to the Wine code. If not, I will develop it alone as a third-party project, but then I have a question: what is the best way to replace a Wine library? I think, I shouldn't change anything in /usr/lib/wine. I know about "native libs", but it's an ELF binary, not PE. Regards, Ivan

June 30, 2015

Re: odbccp32: Implement SQLGetPrivateProfileString (try 6 - resend)

by Nikolay Sivov

> + sect = heap_strdupAtoW(lpszSection); > + entry = heap_strdupAtoW(lpszEntry); > + string = heap_strdupAtoW(lpszDefault); > + file = heap_strdupAtoW(lpszFilename); > + retval = heap_alloc(cbRetBuffer*sizeof(WCHAR)); > + > + ret = SQLGetPrivateProfileStringW(sect, entry, string, retval, cbRetBuffer, file); > + if(ret) > + { > + WideCharToMultiByte(CP_ACP, 0, retval, -1, RetBuffer, ret+1, NULL, NULL); > + } > + > + heap_free(sect); > + heap_free(entry); > + heap_free(string); > + heap_free(file); > + > + heap_free(retval); I think it's still the same issue as last time - you're using WCHAR vs CHAR buffer lengths wrong, it might work for this function as long as it's always called with simple strings. But in general WideCharToMultiByte should not be used like that: 'cbRetBuffer' you got here is A-buffer length, yet you allocate W-buffer of this length. Later when you convert W->A you use return value from W-call as A-buffer length.

June 30, 2015

Re: d3dcompiler: Add D3DCompileFromFile, D3DCompile2 stubs (try 2)

by Matteo Bruni

2015-06-30 11:01 GMT+02:00 Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com>: > Hi, > Removed #if > Corrected FIXME to be consistent with the reset of the file. > > Changelog: > d3dcompiler: Add D3DCompileFromFile, D3DCompile2 stubs > > > Best Regards > Alistair Leslie-Hughes I guess it's good enough for me. For your following patches: avoid LPxxx types, watch your whitespaces, no need to manually add '\n' in the middle of trace strings.

June 30, 2015

Re: [PATCH 0/8] advapi32: Fail on missing value or val_count parameters. (was advapi32: Fix RegEnumValueW when enumerating long values)

by Nikolay Sivov

On 30.06.2015 15:37, Bernhard Übelacker wrote: > Bug #38796: > RegEnumValue currently returns wrong minimum expected data_count when called without proper > value or val_count when the retrieved data (+overhead) exceeds the fixed buffer > variable in RegEnumValue. > > This series of patches does following: > - Add tests to cover calls to RegEnumValue without proper value and val_count parameters. > I think it's better to have tests committed first and change all other places after that.

June 30, 2015

Re: [PATCH 1/6]: msvcp110: Add tr2_sys__Copy_file implementation and test.

by Piotr Caban

On 06/29/15 19:14, YongHaoHu wrote: > > > On 15/6/29 下午10:51, Piotr Caban wrote: >> On 06/29/15 16:40, YongHaoHu wrote: >>> On 15/6/29 下午5:29, Piotr Caban wrote: >>>> On 06/27/15 19:49, YongHaoHu wrote: >>>>> + ret = p_tr2_sys__Copy_file(tests[i].source, tests[i].dest, >>>>> tests[i].fail_if_exists); >>>>> + ok(ret == GetLastError(), "test_tr2_sys__Copy_file(): test >>>>> %d expect: %d, got %d\n", i+1, GetLastError(), ret); >>>>> + ok(errno == 0xdeadbeef, "test_tr2_sys__Copy_file(): test %d >>>>> errno expect 0xdeadbeef, got %d\n", i+1, errno); >>>> Please check the return value of the function explicitly. Currently >>>> your implementation returns error while it should succeed and it's not >>>> visible in the tests. >>> Because the last error handling is not correct in CopyFile[1], I check >>> GetLastError() instead of values. Do you have any good idea? >> If testing exact return value of function is hard please at least test >> if function succeeds/fails when it should. > Sorry, could you explain a bit more details? Please just check if function returns 0 (ERROR_SUCCESS) or something else. This way you don't need to check exact error value (only check if it's 0 or something else). >> Currently your implementation sometimes returns error even so it >> succeeds. >> > Which one do you mean ? As you know, last_error hadling is not correct > in wine's CopyFile, was this happened in Wine platform? { "f1", "tr2_test_dir\\f1_copy", TRUE } Your implementation returns error if f1_copy file already exists. It only makes sense to use GetLastError if function have failed. Thanks, Piotr

June 30, 2015

Re: [PATCH 4/6]: msvcp110: Add tr2_sys__Stat implementation and test.

by Piotr Caban

On 06/29/15 18:46, YongHaoHu wrote: > > On 15/6/29 下午10:54, Piotr Caban wrote: >> On 06/29/15 16:42, YongHaoHu wrote: >>>> Why are you handling ERROR_BAD_DEV_TYPE error here? >>>> >>> I don't have special reason, just base on the test result on testbot. >> It looks wrong. Could you please send the test here and point on what >> testbot machine it happens? >> > Yes, it's wrong. According to your advice, I tested GetFileAttributesA > and found that its last error handling was also not correct. > (It means that many ntdll functions have problems with last_error handling.) > The code I used is : GetFileAttributesA("\\\\.\\PiPe\\tests_pipe.c"); > printf("getlast err is %d\n", GetLastError()); > The output in wine is "getlast err is 66" while "|getlast err is 0" in > testbot. > > Here is the test result: > https://testbot.winehq.org/JobDetails.pl?Key=14832&log_101=1#k101 > Plesase ignore the failed msg. In this case test should be marked with todo_wine and fail in wine. Other option is to fix GetFileAttributes function.

June 30, 2015

Re: ntdll: Randomize security cookie when available (try 4)

by Alexandre Julliard

André Hentschel <nerv(a)dawncrow.de> writes: > Where would you see the best point for srand()? > __wine_process_init()? > Should i do it with a "once" variable? > Or would you prefer something like in SystemFunction036 using /dev/urandom (suggested by Bruno)? Using srand() is not a good idea since it's process-global. Something like RtlRandom is probably better. -- Alexandre Julliard julliard(a)winehq.org

June 30, 2015

Re: [PATCH]winecfg: Double click in dlls list to edit overides. (try4)

by Nikolay Sivov

On 30.06.2015 12:18, Hao Peng wrote: > Hi, Nikolay Sivov > > Thanks for your review. > I have tested so many times and I'm pretty sure that if user double > click on the blank area of the list, > we will always receive a CBN_CLICK message. So I have to > use LB_ITEMFROMPOINT to know > whether a use really clicked on a list item, Otherwise it's wacky that > user click on the blank area and > the edit window pops out. Sounds like a Listbox bug, I can confirm that ControlSpy on wine shows LBN_DBLCLK notification when double clicking on blank area. By the way you should use LBN_DBLCLK instead of CBN_DBLCLK.

June 30, 2015