July 2017 - Wine-devel - list.winehq.org

Re: [PATCH 2/2] msvcp140: Implement _File_size.
by Piotr Caban 10 Jul '17

10 Jul '17

On 07/09/17 22:14, Stefan Dösinger wrote: > static int (__cdecl *p_To_wide)(const char *src, WCHAR *dst); > +static ULONGLONG(__cdecl *p_File_size)(WCHAR const*); Please add a space after ULONGLONG. > +static void test_File_size(void) > +{ > + ULONGLONG val; > + HANDLE file; > + LARGE_INTEGER file_size; > + WCHAR test_f1_W[] = {'t','r','2','_','t','e','s','t','_','d','i','r','/','f','1',0}; > + WCHAR test_f2_W[] = {'t','r','2','_','t','e','s','t','_','d','i','r','/','f','2',0}; > + WCHAR test_dir_W[] = {'t','r','2','_','t','e','s','t','_','d','i','r',0}; > + WCHAR test_ne_W[] = {'t','r','2','_','t','e','s','t','_','d','i','r','/','n','e',0}; > + CreateDirectoryW(test_dir_W, NULL); Could you please create the test files in temp directory? Also please rename the directory (these are no longer tr2 namespace tests). > +/* _File_size, msvcp140 version. Different error handling. */ > +ULONGLONG __cdecl _File_size(WCHAR const* path) > +{ > + WIN32_FILE_ATTRIBUTE_DATA fad; > + > + TRACE("(%s)\n", debugstr_w(path)); > + if(!GetFileAttributesExW(path, GetFileExInfoStandard, &fad)) > + return ~0ULL; > + if(fad.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) > + return 0; We don't need to handle the directory separately here. It will have file size set to 0 anyway. Thanks, Piotr

1 0

Re: advapi32/tests: Add tests for RegSetValueExW and RegQueryValueExW.
by Alexandre Julliard 10 Jul '17

10 Jul '17

Jactry Zeng <jzeng(a)codeweavers.com> writes: > Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> > --- > dlls/advapi32/tests/registry.c | 46 > +++++++++++++++++++++++++++++++++++++++++- > 1 file changed, 45 insertions(+), 1 deletion(-) I don't see how this is different from the existing tests. -- Alexandre Julliard julliard(a)winehq.org

2 4

Re: user.exe16: Fix an incorrect use of ADD_TO_T in FormatMessage16.
by Henri Verbeet 10 Jul '17

10 Jul '17

On 9 July 2017 at 18:53, Gerald Pfeifer <gerald(a)pfeifer.com> wrote: > ADD_TO_T actually consists of two statements > > #define ADD_TO_T(c) \ > *t++=c;\ > if (t-target == talloced) {\ > target = HeapReAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,target,talloced*2);\ > t = target+talloced;\ > talloced*=2;\ > } > > so > > for (x=b; *x; x++) ADD_TO_T(*x); > > does _not_ actually do what one might expect/hope. > > Fixed thusly, in line with other usage. > Alternatively, it shouldn't be hard to either fix the macro or replace it with a function.

1 0

Re: [PATCH 2/2] include: Add Proxy stubs for IUnknown
by Huw Davies 10 Jul '17

10 Jul '17

On Mon, Jul 10, 2017 at 04:43:49AM +0000, Alistair Leslie-Hughes wrote: > Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> > --- > include/unknwn.idl | 10 ++++++++++ > 1 file changed, 10 insertions(+) > > diff --git a/include/unknwn.idl b/include/unknwn.idl > index 78a2d9d..7856a7f 100644 > --- a/include/unknwn.idl > +++ b/include/unknwn.idl > @@ -46,6 +46,16 @@ interface IUnknown > ULONG Release(); > } > > +cpp_quote("HRESULT STDMETHODCALLTYPE IUnknown_QueryInterface_Proxy(IUnknown* This, REFIID riid, void **ppvObject);") > +cpp_quote("void __RPC_STUB IUnknown_QueryInterface_Stub(IRpcStubBuffer* This, IRpcChannelBuffer* pRpcChannelBuffer,") > +cpp_quote(" PRPC_MESSAGE pRpcMessage, DWORD* pdwStubPhase);") > +cpp_quote("ULONG STDMETHODCALLTYPE IUnknown_AddRef_Proxy(IUnknown* This);") > +cpp_quote("void __RPC_STUB IUnknown_AddRef_Stub(IRpcStubBuffer* This, IRpcChannelBuffer* pRpcChannelBuffer,") > +cpp_quote(" PRPC_MESSAGE pRpcMessage, DWORD* pdwStubPhase);") > +cpp_quote("ULONG STDMETHODCALLTYPE IUnknown_Release_Proxy(IUnknown* This);") > +cpp_quote("void __RPC_STUB IUnknown_Release_Stub(IRpcStubBuffer* This, IRpcChannelBuffer* pRpcChannelBuffer,") > +cpp_quote(" PRPC_MESSAGE pRpcMessage, DWORD* pdwStubPhase);") What do you need these for? Huw.

1 0

Re: msvcp140: implement _To_byte
by Nikolay Sivov 09 Jul '17

09 Jul '17

On 08.07.2017 22:33, Mikhail Paulyshka wrote: > Signed-off-by: Mikhail Paulyshka <me(a)mixaill.tk> > --- > dlls/msvcp140/msvcp140.spec | 2 +- > dlls/msvcp140/tests/msvcp140.c | 49 ++++++++++++++++++++++++++++++++++++++++++ > dlls/msvcp90/locale.c | 10 +++++++++ > 3 files changed, 60 insertions(+), 1 deletion(-) > Hi, and thanks for the patch. Some comments in addition to Stefan's reply: > + static const WCHAR test_2[] = {0xfe95, 0xfea0, 0xfea6, 0}; //some arabic glyphs These are characters, not glyphs. Also please use C-style comments - /**/.

3 2

Re: notepad: Fix string length calculating.
by Nikolay Sivov 09 Jul '17

09 Jul '17

Do we have RegSetValueExW tests to justify this?

3 2

Re: msvcp140: implement _To_byte
by Stefan Dösinger 09 Jul '17

09 Jul '17

Hi, I was about to implement this function too, but it seems you've beaten me by two days :-) . Am 2017-07-08 um 17:55 schrieb Mikhail Paulyshka: > + WCHAR longstr[MAX_PATH + 3]; > + memset(longstr, 'A', sizeof(longstr)); This memset doesn't do what you probably expect. It doesn't fill the string with 'A's, but instead with U+4141 characters (䅁, http://www.fileformat.info/info/unicode/char/4141/index.htm) > + if (!src || !dst) > + return 0; This is redundant. WideCharToMultiByte checks this for you and returns 0. I noticed this after sending the _To_wide patch and will send a patch removing the redundant check from _To_wide.

2 3

Re: [PATCH] notepad: Use the default window position and size.
by Henri Verbeet 08 Jul '17

08 Jul '17

On 8 July 2017 at 01:58, Zebediah Figura <zfigura(a)codeweavers.com> wrote: > @@ -775,17 +774,9 @@ int PASCAL WinMain(HINSTANCE hInstance, HINSTANCE prev, LPSTR cmdline, int show) > info.cbSize = sizeof(info); > GetMonitorInfoW( monitor, &info ); > > - x = main_rect.left; > - y = main_rect.top; > - if (main_rect.left >= info.rcWork.right || > - main_rect.top >= info.rcWork.bottom || > - main_rect.right < info.rcWork.left || > - main_rect.bottom < info.rcWork.top) > - x = y = CW_USEDEFAULT; > - > Globals.hMainWnd = > - CreateWindowW(className, winName, WS_OVERLAPPEDWINDOW, x, y, > - main_rect.right - main_rect.left, main_rect.bottom - main_rect.top, > + CreateWindowW(className, winName, WS_OVERLAPPEDWINDOW, > + CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, > NULL, NULL, Globals.hInstance, NULL); > if (!Globals.hMainWnd) > { Why would you want to do that? But if we're going to ignore it, we probably shouldn't bother saving and loading the window position to/from the registry either.

3 3

Compile MFC application
by MAX Trifonov 08 Jul '17

08 Jul '17

Hello I try compile my application with winemaker ... winemaker --lower-uppercase --mfc -I/home/max/libffc-master/Include -I/home/max/wine/include DN After make I have got result: wineg++ -c -I/home/max/libffc-master/Include -I/home/max/wine/include -I. -o Big.o Big.cpp In file included from /home/max/wine/include/windows.h:70:0, from /home/max/libffc-master/Include/FFC/Globals.h:6, from /home/max/libffc-master/Include/afx.h:13, from /home/max/libffc-master/Include/afxwin.h:13, from StdAfx.h:16, from Big.cpp:2: /home/max/wine/include/winscard.h:22:20: fatal error: wtypes.h: Why wtypes.h not included ? -- MAX Trifonov

1 0

Re: [PATCH 1/2] explorer: Improve tray sizing and style.
by Dmitry Timoshkov 08 Jul '17

08 Jul '17

Zebediah Figura <zfigura(a)codeweavers.com> wrote: > - SetWindowPos( win->button, 0, pos, 0, start_button_width, tray_height, > + SetWindowPos( win->button, 0, pos, 0, start_button_width, tray_height - 4, > SWP_NOZORDER | SWP_NOACTIVATE | SWP_SHOWWINDOW ); ... > - SetWindowPos( win->button, 0, pos, 0, width, tray_height, > + SetWindowPos( win->button, 0, pos, 0, width, tray_height - 4, > SWP_NOZORDER | SWP_NOACTIVATE | SWP_SHOWWINDOW ); ... > tray_width = GetSystemMetrics( SM_CXSCREEN ); > tray_height = max( icon_cy, size.cy ); > + tray_height = max( tray_height, 26 ); ... > start_button_width = size.cx; > - SetWindowPos( tray_window, HWND_TOPMOST, 0, GetSystemMetrics( SM_CYSCREEN ) - tray_height, > - tray_width, tray_height, SWP_NOACTIVATE | SWP_SHOWWINDOW ); > + SetWindowPos( tray_window, HWND_TOPMOST, -2, GetSystemMetrics(SM_CYSCREEN) - tray_height - 2, > + tray_width + 4, tray_height + 4, SWP_NOACTIVATE | SWP_SHOWWINDOW ); I guess that magic -4/-2 are caused by added WS_THICKFRAME style, if that's the case an appropriate system metric should be used instead to make the code work for different visual themes. 26 above also needs to be changed to an appropriate system metric. -- Dmitry.

1 0