April 2011 - Wine-Devel - list.winehq.org

[Fwd: po files]

by Łukasz Wojniłowicz

April 28, 2011

Re: wined3d/state: Treat unrecognized D3DZBUFFERTYPEs as D3DZB_TRUE. (try 2)

by Henri Verbeet

I'm not so convinced there's value in this, considering there are no known applications depending on this. Stefan thinks it's useful anyway. If you do want to spend the effort to make this go in, note that this affects ddraw and d3d8 as well, not just d3d9. The test should probably just have a loop in depth_buffer_test() itself, or even write a test specific for this purpose. The wined3d part might as well handle the state as a BOOL, considering WINED3DZB_USEW isn't handled all that different from WINED3DZB_TRUE, except for the FIXME.

April 28, 2011

Re: [PATCH 3/3] msvcrt: Updated spec file

by Alexandre Julliard

Piotr Caban <piotr(a)codeweavers.com> writes: > +@ cdecl -arch=win32 __p___argc() > +@ cdecl -arch=win32 __p___argv() > +@ cdecl -arch=win32 __p___initenv() > +@ cdecl -arch=win32 __p___mb_cur_max() MSVCRT____mb_cur_max_func > +@ cdecl -arch=win32 __p___wargv() > +@ cdecl -arch=win32 __p___winitenv() > +@ cdecl -arch=win32 __p__acmdln() > +@ cdecl -arch=win32 __p__amblksiz() > +@ cdecl -arch=win32 __p__commode() > +@ cdecl -arch=win32 __p__daylight() MSVCRT___p__daylight > +@ cdecl -arch=win32 __p__dstbias() > +@ cdecl -arch=win32 __p__environ() > +@ stub -arch=win32 __p__fileinfo #() > +@ cdecl -arch=win32 __p__fmode() > +@ cdecl -arch=win32 __p__iob() MSVCRT___iob_func > +@ stub -arch=win32 __p__mbcasemap #() > +@ cdecl -arch=win32 __p__mbctype() > +@ cdecl -arch=win32 __p__osver() > +@ cdecl -arch=win32 __p__pctype() MSVCRT___pctype_func > +@ cdecl -arch=win32 __p__pgmptr() > +@ stub -arch=win32 __p__pwctype #() > +@ cdecl -arch=win32 __p__timezone() MSVCRT___p__timezone > +@ cdecl -arch=win32 __p__tzname() > +@ cdecl -arch=win32 __p__wcmdln() > +@ cdecl -arch=win32 __p__wenviron() > +@ cdecl -arch=win32 __p__winmajor() > +@ cdecl -arch=win32 __p__winminor() > +@ cdecl -arch=win32 __p__winver() > +@ cdecl -arch=win32 __p__wpgmptr() I just changed this the other way around recently. These are exported in at least some 64-bit versions. -- Alexandre Julliard julliard(a)winehq.org

April 28, 2011

Re: [PATCH] Add undocumented function to unify MultiByteToWideChar conversation

by Marcus Meissner

On Thu, Apr 28, 2011 at 09:54:13AM +0200, Alexey Fisher wrote: > Am Donnerstag, den 28.04.2011, 09:25 +0200 schrieb Marcus Meissner: > > On Thu, Apr 28, 2011 at 09:03:51AM +0200, Alexey Fisher wrote: > > > Am Donnerstag, den 28.04.2011, 10:49 +0400 schrieb Nikolay Sivov: > > > > On 4/28/2011 10:45, Alexey Fisher wrote: > > > > > MultiByteToWideChar are called directly only from one function. All other > > > > > colls in comctl32 go thrue this function. > > > > > > > > > It was recovered with from dissassambled code. > > > > This is not allowed in Wine development. All you can use is tests, but > > > > after this patch you're most likely banned (from comctl32 changes at least). > > > > > > Ouch... bad start. > > > Hmm... but this code is present in wine-comctl32, it just spread in > > > different parts. > > > > We do not need to follow the original comctl32 bytewise. > > > > You will find however functions called "head_strdupA2W" occasionaly > > > > eg. dlls/wininet/internet.h:heap_strdupWtoA() > > and heap_strdupAtoW() > > > > if you need to factor out such common tasks as string allocation + conversion. > > May be it make sense to place this function to winebase? Looks like > there is some duplicates: > dlls/mshtml/mshtml_private.h:static inline char *heap_strdupWtoA(LPCWSTR > str) > dlls/wininet/internet.h:static inline char *heap_strdupWtoA(LPCWSTR str) > dlls/appwiz.cpl/addons.c:static inline char *heap_strdupWtoA(LPCWSTR > str) No, as it is not an officially exported API we cannot export it from public headers Ciao, Marcus

April 28, 2011

Re: [PATCH] Add undocumented function to unify MultiByteToWideChar conversation

by Alexey Fisher

Am Donnerstag, den 28.04.2011, 09:25 +0200 schrieb Marcus Meissner: > On Thu, Apr 28, 2011 at 09:03:51AM +0200, Alexey Fisher wrote: > > Am Donnerstag, den 28.04.2011, 10:49 +0400 schrieb Nikolay Sivov: > > > On 4/28/2011 10:45, Alexey Fisher wrote: > > > > MultiByteToWideChar are called directly only from one function. All other > > > > colls in comctl32 go thrue this function. > > > > > > > It was recovered with from dissassambled code. > > > This is not allowed in Wine development. All you can use is tests, but > > > after this patch you're most likely banned (from comctl32 changes at least). > > > > Ouch... bad start. > > Hmm... but this code is present in wine-comctl32, it just spread in > > different parts. > > We do not need to follow the original comctl32 bytewise. > > You will find however functions called "head_strdupA2W" occasionaly > > eg. dlls/wininet/internet.h:heap_strdupWtoA() > and heap_strdupAtoW() > > if you need to factor out such common tasks as string allocation + conversion. May be it make sense to place this function to winebase? Looks like there is some duplicates: dlls/mshtml/mshtml_private.h:static inline char *heap_strdupWtoA(LPCWSTR str) dlls/wininet/internet.h:static inline char *heap_strdupWtoA(LPCWSTR str) dlls/appwiz.cpl/addons.c:static inline char *heap_strdupWtoA(LPCWSTR str)

April 28, 2011

Re: [PATCH] Add undocumented function to unify MultiByteToWideChar conversation

by Alexey Fisher

Am Donnerstag, den 28.04.2011, 09:25 +0200 schrieb Marcus Meissner: > On Thu, Apr 28, 2011 at 09:03:51AM +0200, Alexey Fisher wrote: > > Am Donnerstag, den 28.04.2011, 10:49 +0400 schrieb Nikolay Sivov: > > > On 4/28/2011 10:45, Alexey Fisher wrote: > > > > MultiByteToWideChar are called directly only from one function. All other > > > > colls in comctl32 go thrue this function. > > > > > > > It was recovered with from dissassambled code. > > > This is not allowed in Wine development. All you can use is tests, but > > > after this patch you're most likely banned (from comctl32 changes at least). > > > > Ouch... bad start. > > Hmm... but this code is present in wine-comctl32, it just spread in > > different parts. > > We do not need to follow the original comctl32 bytewise. > > You will find however functions called "head_strdupA2W" occasionaly > > eg. dlls/wininet/internet.h:heap_strdupWtoA() > and heap_strdupAtoW() > > if you need to factor out such common tasks as string allocation + conversion. Thank you for the tip, i'll do some clean job in comctl32, if i'm not banned :D

April 28, 2011

Re: [PATCH] Add undocumented function to unify MultiByteToWideChar conversation

by Marcus Meissner

On Thu, Apr 28, 2011 at 09:03:51AM +0200, Alexey Fisher wrote: > Am Donnerstag, den 28.04.2011, 10:49 +0400 schrieb Nikolay Sivov: > > On 4/28/2011 10:45, Alexey Fisher wrote: > > > MultiByteToWideChar are called directly only from one function. All other > > > colls in comctl32 go thrue this function. > > > > > It was recovered with from dissassambled code. > > This is not allowed in Wine development. All you can use is tests, but > > after this patch you're most likely banned (from comctl32 changes at least). > > Ouch... bad start. > Hmm... but this code is present in wine-comctl32, it just spread in > different parts. We do not need to follow the original comctl32 bytewise. You will find however functions called "head_strdupA2W" occasionaly eg. dlls/wininet/internet.h:heap_strdupWtoA() and heap_strdupAtoW() if you need to factor out such common tasks as string allocation + conversion. Ciao, Marcus

April 28, 2011

Re: [PATCH] Add undocumented function to unify MultiByteToWideChar conversation

by Alexey Fisher

Am Donnerstag, den 28.04.2011, 10:49 +0400 schrieb Nikolay Sivov: > On 4/28/2011 10:45, Alexey Fisher wrote: > > MultiByteToWideChar are called directly only from one function. All other > > colls in comctl32 go thrue this function. > > > It was recovered with from dissassambled code. > This is not allowed in Wine development. All you can use is tests, but > after this patch you're most likely banned (from comctl32 changes at least). Ouch... bad start. Hmm... but this code is present in wine-comctl32, it just spread in different parts.

April 28, 2011

Re: [PATCH] Add undocumented function to unify MultiByteToWideChar conversation

by Nikolay Sivov

On 4/28/2011 10:45, Alexey Fisher wrote: > MultiByteToWideChar are called directly only from one function. All other > colls in comctl32 go thrue this function. > It was recovered with from dissassambled code. This is not allowed in Wine development. All you can use is tests, but after this patch you're most likely banned (from comctl32 changes at least).

April 28, 2011

[PATCH] Add undocumented function to unify MultiByteToWideChar conversation

by Alexey Fisher

MultiByteToWideChar are called directly only from one function. All other colls in comctl32 go thrue this function. It was recovered with from dissassambled code. Signed-off-by: Alexey Fisher <bug-track(a)fisher-privat.net> --- dlls/comctl32/comctl32undoc.c | 41 +++++++++++++++++++++++++++++++++++++++++ 1 files changed, 41 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/comctl32undoc.c b/dlls/comctl32/comctl32undoc.c index ff94051..6eb6c0f 100644 --- a/dlls/comctl32/comctl32undoc.c +++ b/dlls/comctl32/comctl32undoc.c @@ -560,6 +560,47 @@ INT WINAPI AddMRUStringW(HANDLE hList, LPCWSTR lpszString) } /************************************************************************** + * comctl_MultiByteToWideChar (internal) + * Convert Multibyte string to WideChar string. + * + * PARAMS + * CodePage [I] COdepage of lpMultiByteStr + * lpMultiByteStr [I] multibyte string + * + * RETURNS + * Pointer to lpWideCharStr [O] or NULL if failed. Do not forget to + * Free the lpWideCharStr after use! + */ +LPWSTR comctl_MultiByteToWideChar(UINT CodePage, LPCSTR lpMultiByteStr) +{ + LPWSTR lpWideCharStr; + int len; + + if (lpMultiByteStr == NULL || lpMultiByteStr == -1) + return NULL; + + if (IsBadReadPtr(lpMultiByteStr, 1)) + return NULL; + + len = MultiByteToWideChar(CodePage, NULL, lpMultiByteStr, -1, NULL, NULL); + if (!len) + len = 1; + + lpWideCharStr = LocalAlloc(len * sizeof(WCHAR), 0); + if (!lpWideCharStr) + return NULL; + + if (!MultiByteToWideChar(CodePage, 1, lpMultiByteStr, -1, + lpWideCharStr, len)) { + LocalFree(lpWideCharStr); + lpWideCharStr = NULL; + return NULL; + } + + return lpWideCharStr; +} + +/************************************************************************** * AddMRUStringA [COMCTL32.153] * * See AddMRUStringW. -- 1.7.4.1

April 28, 2011