September 2004 - Wine-devel

Re: Why is our OutputDebugString a server request?
by Pouech Eric DMI AEI CAEN 14 Sep '04

14 Sep '04

so that debuggers can intercept it (especially ones with GUI) and do what they want with it. A+ > Message du 13/09/04 17:50 > De : "Shachar Shemesh" > A : "Wine Development" > Copie à : > Objet : Why is our OutputDebugString a server request? >

3 3

extern variable question
by Robert Reif 14 Sep '04

14 Sep '04

I'm trying to write a Direct Input regression test and I ran into a problem I can't resolve (and the linker too). dinput.h defines an extern variable: extern const DIDATAFORMAT c_dfDIJoystick; I can't find this variable in dinput.dll but it is in dinput.lib on windows. It looks like I need to generate a dinput.a. How can I generate both a dinput.dll.so and a dinput.a from the same source?

1 0

RE: iostream and msvcrt?
by Scott Snell 14 Sep '04

14 Sep '04

Hi Dimi, Thanks for the offer but I have had the project pulled. Unfortunately I couldnt get a working model in time and the hardware has been recycled to another project ;-(. Basically I needed to compile STLport so I could use iostreams in a project I was converting to wine. I'm going to keep my eye on this list as I hope to have a new round of funding approved late in the year. I may also get an old PC at home working and have another go! thanks, scott. > -----Original Message----- > From: Dimitrie O. Paun [SMTP:dpaun(a)rogers.com] > Sent: Wednesday, 8 September 2004 0:06 > To: Scott Snell > Cc: Dimitrie O. Paun; Boaz Harrosh; Wine-Devel (E-mail) > Subject: Re: iostream and msvcrt? > > Just got back from vacation. Why is it including a cstdlib? > Anyway, can you send me exactly what you did, so I can try > to reproduce it on my box? > > -- > Dimi.

1 0

Re: Proper finalization in StartServiceW
by Alexandre Julliard 13 Sep '04

13 Sep '04

"Alexander Yaworsky" <yaworsky(a)migusoft.ru> writes: > + if( WAIT_FAILED == r ) > + { > + last_error = GetLastError(); > + CloseHandle( procinfo.hProcess ); > + goto done; > + } > > - ReleaseSemaphore(data, 1, NULL); > - > - if( r == WAIT_FAILED) > - return FALSE; > + /* allright */ > + CloseHandle( procinfo.hProcess ); > + last_error = 0; > + ret = TRUE; > > - return TRUE; > +done: > + CloseHandle( wait ); > + ReleaseSemaphore(data, 1, NULL); > + CloseHandle( data ); > + SetLastError( last_error ); > + return ret; You should never need to do that sort of thing. CloseHandle and ReleaseSemaphore won't change last error if they are called for valid handles, and if they are not you are just hiding a bug. Also, you very probably don't want to set last error to 0 on success, unless you have clear evidence that Windows does it in this case too. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: Correct ConvertSidToStringSidW with test
by Alexandre Julliard 13 Sep '04

13 Sep '04

Juan Lang <juan_lang(a)yahoo.com> writes: > @@ -2230,13 +2232,23 @@ > > sz = 14 + pisid->SubAuthorityCount * 11; > str = LocalAlloc( 0, sz*sizeof(WCHAR) ); > - sprintfW( str, fmt, pisid->Revision, > - pisid->IdentifierAuthority.Value[2], > - pisid->IdentifierAuthority.Value[3], > - pisid->IdentifierAuthority.Value[0]&0x0f, > - pisid->IdentifierAuthority.Value[4]&0x0f, > - pisid->IdentifierAuthority.Value[1]&0x0f, > - pisid->IdentifierAuthority.Value[5]&0x0f); > + sprintfW( str, fmt, pisid->Revision ); > + for( i=2; i<=3; i++ ) > + { > + if( pisid->IdentifierAuthority.Value[i] ) > + printingIdent = TRUE; > + if( printingIdent ) > + sprintfW( str + lstrlenW( str ), identAuthFmt, > + pisid->IdentifierAuthority.Value[i] ); > + } That doesn't look right, you'd need something like %02x for the second value if the first was printed. It seems it would be a lot easier to simply build an int from the various values and then format it with a single %x. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: Directx9
by Ivan Leo Puoti 13 Sep '04

13 Sep '04

> At *some* point we have to stop simply releasing CVS snapshots which may > or may not work/run important apps/eat your hard disk and actually do > proper releases that are, you know, tested'n'stuff. Also consider that the time wasted on testing/releasing/branching will slow up wine development, whoever would be doing that could certanly work on the wine code itself. I fully agree with what Joerg Mayer says, the time has not yet come. Ivan.

1 0

Re: Directx9
by Ivan Leo Puoti 13 Sep '04

13 Sep '04

>Anyway, that wasn't really what I was getting at.. last spring Lionel >had this to say about a wined3d library: It does make sense to have common code all in the same place... Ivan.

1 0

dlls/winsock/socket breakage
by Gerald Pfeifer 13 Sep '04

13 Sep '04

The following change revision 1.155 date: 2004/09/07 20:47:03; author: julliard; state: Exp; lines: +113 -0 Roderick Colenbrander <thunderbird2k(a)gmx.net> - set ipx packet type - add support for retrieving some ipx info breaks FreeBSD 4.10 quite a bit: /sw/gcc-3.3.4/bin/gcc -c -I. -I. -I../../include -I../../include -D__WINESRC__ -DUSE_WS_PREFIX -D_REENTRANT -fPIC -Wall -pipe -mpreferred-stack-boundary=2 -fno-strict-aliasing -gstabs+ -Wpointer-arith -g -O2 -o socket.o socket.c socket.c: In function `WS2_send': socket.c:1120: error: `SOL_IPX' undeclared (first use in this function) socket.c:1120: error: (Each undeclared identifier is reported only once socket.c:1120: error: for each function it appears in.) socket.c:1120: error: `IPX_TYPE' undeclared (first use in this function) socket.c:1123: error: structure has no member named `sipx_type' socket.c: In function `WS_getsockopt': socket.c:1585: error: `SOL_IPX' undeclared (first use in this function) socket.c:1585: error: `IPX_TYPE' undeclared (first use in this function) socket.c: In function `WS_setsockopt': socket.c:2312: error: `SOL_IPX' undeclared (first use in this function) socket.c:2312: error: `IPX_TYPE' undeclared (first use in this function) gmake: *** [socket.o] Error 1 Concerning the error in socket.c, line 1120, SOL_IPX is not defined on FreeBSD 4.10, but there is a constant SOL_SOCKET which is supposed to be passed as the second parameter of getsockopt with the following description: "To manipulate options at the socket level, level is specified as SOL_SOCKET". Would that do the job? Concerning the error in socket.c, line 1123, struct sockaddr_ipx looks as follows on FreeBSD 4.10: struct sockaddr_ipx { u_char sipx_len; u_char sipx_family; struct ipx_addr sipx_addr; char sipx_zero[2]; }; Finally, I could not find anything remotely similiar to IPX_TYPE. I hope this will allow you to fix this breakage? (To check for FreeBSD, you can use #ifdef __FreeBSD_...) Thanks, Gerald -- Gerald Pfeifer (Jerry) gerald(a)pfeifer.com http://www.pfeifer.com/gerald/

3 7

Re: Shwapi updates
by James Hawkins 13 Sep '04

13 Sep '04

Can this patch be broken up into smaller, independent parts? It's more likely to be committed if that is the case. On Sun, 12 Sep 2004 08:55:27 -0700 (PDT), Jon Griffiths <jon_p_griffiths(a)yahoo.com> wrote: > Cheers, > Jon > > +dlls/shlwapi/shlwapi.spec dlls/shlwapi/ordinal.c > Implement SHSimulateDrop > > +dlls/shlwapi/reg.c > Implement MIME_GetExtensionA/W > > +dlls/shlwapi/string.c > Implement StrCpyNXA/W, SHAnsiToAnsi, SHUnicodeToUnicode > > +dlls/shlwapi/tests/string.c > Test StrCpyNXA/W, SHAnsiToAnsi, SHUnicodeToUnicode > > ===== > "Don't wait for the seas to part, or messiahs to come; > Don't you sit around and waste this chance..." - Live > > jon_p_griffiths(a)yahoo.com > > > _______________________________ > Do you Yahoo!? > Shop for Back-to-School deals on Yahoo! Shopping. > http://shopping.yahoo.com/backtoschool > > > diff -ur wine/dlls/shlwapi/ordinal.c wine-develop/dlls/shlwapi/ordinal.c > --- wine/dlls/shlwapi/ordinal.c 2004-09-05 08:36:36.000000000 +0000 > +++ wine-develop/dlls/shlwapi/ordinal.c 2004-09-11 12:38:46.000000000 +0000 > @@ -1829,6 +1829,30 @@ > } > > /************************************************************************* > + * @ [SHLWAPI.186] > + */ > +BOOL WINAPI SHSimulateDrop(IDropTarget *pDrop, IDataObject *pDataObj, > + DWORD grfKeyState, PPOINTL lpPt, DWORD* pdwEffect) > +{ > + DWORD dwEffect = DROPEFFECT_LINK | DROPEFFECT_MOVE | DROPEFFECT_COPY; > + POINTL pt = { 0, 0 }; > + > + if (!lpPt) > + lpPt = &pt; > + > + if (!pdwEffect) > + pdwEffect = &dwEffect; > + > + IDropTarget_DragEnter(pDrop, pDataObj, grfKeyState, *lpPt, pdwEffect); > + > + if (*pdwEffect) > + return IDropTarget_Drop(pDrop, pDataObj, grfKeyState, *lpPt, pdwEffect); > + > + IDropTarget_DragLeave(pDrop); > + return TRUE; > +} > + > +/************************************************************************* > * @ [SHLWAPI.187] > * > * Call IPersistPropertyBag_Load() on an object. > @@ -3000,19 +3024,6 @@ > } > > /************************************************************************* > - * @ [SHLWAPI.346] > - */ > -DWORD WINAPI SHUnicodeToUnicode( > - LPCWSTR src, > - LPWSTR dest, > - int len) > -{ > - FIXME("(%s %p 0x%08x)stub\n",debugstr_w(src),dest,len); > - lstrcpynW(dest, src, len); > - return lstrlenW(dest)+1; > -} > - > -/************************************************************************* > * @ [SHLWAPI.350] > * > * See GetFileVersionInfoSizeW. > diff -ur wine/dlls/shlwapi/reg.c wine-develop/dlls/shlwapi/reg.c > --- wine/dlls/shlwapi/reg.c 2004-07-05 20:27:24.000000000 +0000 > +++ wine-develop/dlls/shlwapi/reg.c 2004-09-11 12:41:58.000000000 +0000 > @@ -1833,6 +1833,77 @@ > } > > /************************************************************************* > + * @ [SHLWAPI.330] > + * > + * Get the files extension for a given Mime type. > + * > + * PARAMS > + * lpszType [I] Mime type to get the file extension for > + * lpExt [O] Destingtion for the resulting extension > + * iLen [I] Length og lpExt in characters > + * > + * RETURNS > + * Success: TRUE. lpExt contains the file extension. > + * Failure: FALSE, if any paramater is invalid or the extension cannot be > + * retrieved. If iLen > 0, lpExt is set to an empty string. > + * > + * NOTES > + * - The extension returned in lpExt always has a leading '.' character, even > + * if the registry Mime database entry does not. > + * - iLen must be long enough for the file extension for this function to succeed. > + */ > +BOOL WINAPI MIME_GetExtensionA(LPCSTR lpszType, LPSTR lpExt, INT iLen) > +{ > + char szSubKey[MAX_PATH]; > + DWORD dwlen = iLen - 1, dwType; > + BOOL bRet = FALSE; > + > + if (iLen > 0 && lpExt) > + *lpExt = '\0'; > + > + if (lpszType && lpExt && iLen > 2 && > + GetMIMETypeSubKeyA(lpszType, szSubKey, MAX_PATH) && > + !SHGetValueA(HKEY_CLASSES_ROOT, szSubKey, szExtensionA, &dwType, lpExt + 1, &dwlen) && > + lpExt[1]) > + { > + if (lpExt[1] == '.') > + memmove(lpExt, lpExt + 1, strlen(lpExt + 1) + 1); > + else > + *lpExt = '.'; /* Supply a '.' */ > + bRet = TRUE; > + } > + return bRet; > +} > + > +/************************************************************************* > + * @ [SHLWAPI.331] > + * > + * Unicode version of MIME_GetExtensionA. > + */ > +BOOL WINAPI MIME_GetExtensionW(LPCWSTR lpszType, LPWSTR lpExt, INT iLen) > +{ > + WCHAR szSubKey[MAX_PATH]; > + DWORD dwlen = iLen - 1, dwType; > + BOOL bRet = FALSE; > + > + if (iLen > 0 && lpExt) > + *lpExt = '\0'; > + > + if (lpszType && lpExt && iLen > 2 && > + GetMIMETypeSubKeyW(lpszType, szSubKey, MAX_PATH) && > + !SHGetValueW(HKEY_CLASSES_ROOT, szSubKey, szExtensionW, &dwType, lpExt + 1, &dwlen) && > + lpExt[1]) > + { > + if (lpExt[1] == '.') > + memmove(lpExt, lpExt + 1, (strlenW(lpExt + 1) + 1) * sizeof(WCHAR)); > + else > + *lpExt = '.'; /* Supply a '.' */ > + bRet = TRUE; > + } > + return bRet; > +} > + > +/************************************************************************* > * @ [SHLWAPI.324] > * > * Set the file extension for a MIME content key. > diff -ur wine/dlls/shlwapi/shlwapi.spec wine-develop/dlls/shlwapi/shlwapi.spec > --- wine/dlls/shlwapi/shlwapi.spec 2004-09-05 08:36:36.000000000 +0000 > +++ wine-develop/dlls/shlwapi/shlwapi.spec 2004-09-11 12:42:10.000000000 +0000 > @@ -183,7 +183,7 @@ > 183 stdcall -noname SHRegisterClassA(ptr) > 184 stdcall @(ptr ptr long) SHLWAPI_184 > 185 stdcall -noname SHMessageBoxCheckA(ptr str str long long str) > -186 stub -noname SHSimulateDrop > +186 stdcall -noname SHSimulateDrop(ptr ptr long ptr ptr) > 187 stdcall -noname SHLoadFromPropertyBag(ptr ptr) > 188 stub -noname IUnknown_TranslateAcceleratorOCS > 189 stdcall -noname IUnknown_OnFocusOCS(ptr ptr) > @@ -327,8 +327,8 @@ > 327 stdcall -noname UnregisterExtensionForMIMETypeW(wstr) > 328 stdcall -noname GetMIMETypeSubKeyA(str ptr long) > 329 stdcall -noname GetMIMETypeSubKeyW(wstr ptr long) > -330 stub -noname MIME_GetExtensionA > -331 stub -noname MIME_GetExtensionW > +330 stdcall -noname MIME_GetExtensionA(str ptr long) > +331 stdcall -noname MIME_GetExtensionW(wstr ptr long) > 332 stdcall @(ptr long) user32.CallMsgFilterW > 333 stdcall -noname SHBrowseForFolderWrapW(ptr) > 334 stdcall -noname SHGetPathFromIDListWrapW(ptr ptr) > @@ -342,7 +342,7 @@ > 342 stdcall -noname SHInterlockedCompareExchange(ptr long long) > 343 stdcall -noname SHRegGetCLSIDKeyA(ptr str long long ptr) > 344 stdcall -noname SHRegGetCLSIDKeyW(ptr wstr long long ptr) > -345 stub -noname SHAnsiToAnsi > +345 stdcall -noname SHAnsiToAnsi(str ptr long) > 346 stdcall -noname SHUnicodeToUnicode(wstr ptr long) > 347 stdcall @(long wstr) advapi32.RegDeleteValueW > 348 stub -noname SHGetFileDescriptionW > diff -ur wine/dlls/shlwapi/string.c wine-develop/dlls/shlwapi/string.c > --- wine/dlls/shlwapi/string.c 2004-09-05 08:36:36.000000000 +0000 > +++ wine-develop/dlls/shlwapi/string.c 2004-09-11 12:43:37.000000000 +0000 > @@ -2098,7 +2098,7 @@ > * iLen [I] Maximum number of chars to copy > * > * RETURNS > - * Success: A pointer to the last character written. > + * Success: A pointer to the last character written to lpszDest.. > * Failure: lpszDest, if any arguments are invalid. > */ > LPSTR WINAPI StrCpyNXA(LPSTR lpszDest, LPCSTR lpszSrc, int iLen) > @@ -2623,6 +2623,48 @@ > } > > /************************************************************************* > + * @ [SHLWAPI.345] > + * > + * Copy one string to another. > + * > + * PARAMS > + * lpszSrc [I] Source string to copy > + * lpszDst [O] Destination for copy > + * iLen [I] Length of lpszDst in characters > + * > + * RETURNS > + * The length of the copied string, including the terminating NUL. lpszDst > + * contains iLen characters of lpszSrc. > + */ > +DWORD WINAPI SHAnsiToAnsi(LPCSTR lpszSrc, LPSTR lpszDst, int iLen) > +{ > + LPSTR lpszRet; > + > + TRACE("(%s,%p,0x%08x)\n", debugstr_a(lpszSrc), lpszDst, iLen); > + > + /* Our original version used lstrncpy/lstrlen, incorrectly filling up all > + * of lpszDst with extra NULs. This version is correct, and faster too. > + */ > + lpszRet = StrCpyNXA(lpszDst, lpszSrc, iLen); > + return lpszRet - lpszDst + 1; > +} > + > +/************************************************************************* > + * @ [SHLWAPI.346] > + * > + * Unicode version of SSHAnsiToAnsi. > + */ > +DWORD WINAPI SHUnicodeToUnicode(LPCWSTR lpszSrc, LPWSTR lpszDst, int iLen) > +{ > + LPWSTR lpszRet; > + > + TRACE("(%s,%p,0x%08x)\n", debugstr_w(lpszSrc), lpszDst, iLen); > + > + lpszRet = StrCpyNXW(lpszDst, lpszSrc, iLen); > + return lpszRet - lpszDst + 1; > +} > + > +/************************************************************************* > * @ [SHLWAPI.364] > * > * Determine if an Ascii string converts to Unicode and back identically. > diff -ur wine/dlls/shlwapi/tests/string.c wine-develop/dlls/shlwapi/tests/string.c > --- wine/dlls/shlwapi/tests/string.c 2004-07-21 12:17:03.000000000 +0000 > +++ wine-develop/dlls/shlwapi/tests/string.c 2004-09-11 12:47:14.000000000 +0000 > @@ -33,7 +33,12 @@ > #include "shlwapi.h" > #include "shtypes.h" > > -static HRESULT (WINAPI *ptr_StrRetToBSTR) (STRRET*, void*, BSTR*); > +static HMODULE hShlwapi; > +static LPSTR (WINAPI *pStrCpyNXA)(LPSTR,LPCSTR,int); > +static LPWSTR (WINAPI *pStrCpyNXW)(LPWSTR,LPCWSTR,int); > +static HRESULT (WINAPI *pStrRetToBSTR)(STRRET*,void*,BSTR*); > +static DWORD (WINAPI *pSHAnsiToAnsi)(LPCSTR,LPSTR,int); > +static DWORD (WINAPI *pSHUnicodeToUnicode)(LPCWSTR,LPWSTR,int); > > static inline int strcmpW(const WCHAR *str1, const WCHAR *str2) > { > @@ -592,22 +597,19 @@ > > static void test_StrRetToBSTR(void) > { > - HMODULE module; > static const WCHAR szTestW[] = { 'T','e','s','t','\0' }; > ITEMIDLIST iidl[10]; > BSTR bstr; > STRRET strret; > HRESULT ret; > > - module = GetModuleHandleA("shlwapi"); > - if (!module) return; > - ptr_StrRetToBSTR = (void *)GetProcAddress(module, "StrRetToBSTR"); > - if (!ptr_StrRetToBSTR) return; > + pStrRetToBSTR = (void *)GetProcAddress(hShlwapi, "StrRetToBSTR"); > + if (!pStrRetToBSTR) return; > > strret.uType = STRRET_WSTR; > strret.u.pOleStr = CoDupStrW("Test"); > bstr = 0; > - ret = ptr_StrRetToBSTR(&strret, NULL, &bstr); > + ret = pStrRetToBSTR(&strret, NULL, &bstr); > ok(ret == S_OK && bstr && !strcmpW(bstr, szTestW), > "STRRET_WSTR: dup failed, ret=0x%08lx, bstr %p\n", ret, bstr); > if (bstr) > @@ -615,7 +617,7 @@ > > strret.uType = STRRET_CSTR; > lstrcpyA(strret.u.cStr, "Test"); > - ret = ptr_StrRetToBSTR(&strret, NULL, &bstr); > + ret = pStrRetToBSTR(&strret, NULL, &bstr); > ok(ret == S_OK && bstr && !strcmpW(bstr, szTestW), > "STRRET_CSTR: dup failed, ret=0x%08lx, bstr %p\n", ret, bstr); > if (bstr) > @@ -624,7 +626,7 @@ > strret.uType = STRRET_OFFSET; > strret.u.uOffset = 1; > strcpy((char*)&iidl, " Test"); > - ret = ptr_StrRetToBSTR(&strret, iidl, &bstr); > + ret = pStrRetToBSTR(&strret, iidl, &bstr); > ok(ret == S_OK && bstr && !strcmpW(bstr, szTestW), > "STRRET_OFFSET: dup failed, ret=0x%08lx, bstr %p\n", ret, bstr); > if (bstr) > @@ -633,10 +635,85 @@ > /* Native crashes if str is NULL */ > } > > +static void test_StrCpyNXA(void) > +{ > + LPCSTR lpSrc = "hello"; > + LPSTR lpszRes; > + char dest[8]; > + > + pStrCpyNXA = (void *)GetProcAddress(hShlwapi, (LPSTR)399); > + if (!pStrCpyNXA) > + return; > + > + memset(dest, '\n', sizeof(dest)); > + lpszRes = pStrCpyNXA(dest, lpSrc, sizeof(dest)/sizeof(dest[0])); > + ok(lpszRes == dest + 5 && !memcmp(dest, "hello\0\n\n", sizeof(dest)), > + "StrCpyNXA: expected %p, \"hello\\0\\n\\n\", got %p, \"%d,%d,%d,%d,%d,%d,%d,%d\"\n", > + dest + 5, lpszRes, dest[0], dest[1], dest[2], dest[3], dest[4], dest[5], dest[6], dest[7]); > +} > + > +static void test_StrCpyNXW(void) > +{ > + static const WCHAR lpInit[] = { '\n','\n','\n','\n','\n','\n','\n','\n' }; > + static const WCHAR lpSrc[] = { 'h','e','l','l','o','\0' }; > + static const WCHAR lpRes[] = { 'h','e','l','l','o','\0','\n','\n' }; > + LPWSTR lpszRes; > + WCHAR dest[8]; > + > + pStrCpyNXW = (void *)GetProcAddress(hShlwapi, (LPSTR)400); > + if (!pStrCpyNXW) > + return; > + > + memcpy(dest, lpInit, sizeof(lpInit)); > + lpszRes = pStrCpyNXW(dest, lpSrc, sizeof(dest)/sizeof(dest[0])); > + ok(lpszRes == dest + 5 && !memcmp(dest, lpRes, sizeof(dest)), > + "StrCpyNXA: expected %p, \"hello\\0\\n\\n\", got %p, \"%d,%d,%d,%d,%d,%d,%d,%d\"\n", > + dest + 5, lpszRes, dest[0], dest[1], dest[2], dest[3], dest[4], dest[5], dest[6], dest[7]); > +} > + > +static void test_SHAnsiToAnsi(void) > +{ > + char dest[8]; > + DWORD dwRet; > + > + pSHAnsiToAnsi = (void *)GetProcAddress(hShlwapi, (LPSTR)345); > + if (!pSHAnsiToAnsi) > + return; > + > + memset(dest, '\n', sizeof(dest)); > + dwRet = pSHAnsiToAnsi("hello", dest, sizeof(dest)/sizeof(dest[0])); > + ok(dwRet == 6 && !memcmp(dest, "hello\0\n\n", sizeof(dest)), > + "SHAnsiToAnsi: expected 6, \"hello\\0\\n\\n\", got %ld, \"%d,%d,%d,%d,%d,%d,%d,%d\"\n", > + dwRet, dest[0], dest[1], dest[2], dest[3], dest[4], dest[5], dest[6], dest[7]); > +} > + > +static void test_SHUnicodeToUnicode(void) > +{ > + static const WCHAR lpInit[] = { '\n','\n','\n','\n','\n','\n','\n','\n' }; > + static const WCHAR lpSrc[] = { 'h','e','l','l','o','\0' }; > + static const WCHAR lpRes[] = { 'h','e','l','l','o','\0','\n','\n' }; > + WCHAR dest[8]; > + DWORD dwRet; > + > + pSHUnicodeToUnicode = (void *)GetProcAddress(hShlwapi, (LPSTR)346); > + if (!pSHUnicodeToUnicode) > + return; > + > + memcpy(dest, lpInit, sizeof(lpInit)); > + dwRet = pSHUnicodeToUnicode(lpSrc, dest, sizeof(dest)/sizeof(dest[0])); > + ok(dwRet == 6 && !memcmp(dest, lpRes, sizeof(dest)), > + "SHUnicodeToUnicode: expected 6, \"hello\\0\\n\\n\", got %ld, \"%d,%d,%d,%d,%d,%d,%d,%d\"\n", > + dwRet, dest[0], dest[1], dest[2], dest[3], dest[4], dest[5], dest[6], dest[7]); > +} > + > START_TEST(string) > { > CoInitialize(0); > > + hShlwapi = GetModuleHandleA("shlwapi"); > + if (!hShlwapi) > + return; > + > test_StrChrA(); > test_StrChrW(); > test_StrChrIA(); > @@ -656,4 +733,8 @@ > test_StrCmpA(); > test_StrCmpW(); > test_StrRetToBSTR(); > + test_StrCpyNXA(); > + test_StrCpyNXW(); > + test_SHAnsiToAnsi(); > + test_SHUnicodeToUnicode(); > } > > > -- James Hawkins

3 3

RE: patch: shell32.dll - SHELL_ArgifyW expands env-vars - HOLD PATCH
by Jens Collin 13 Sep '04

13 Sep '04

Please hold this patch and don't commit it yet. I've been told that it contains things to be checked first. /J -----Original Message----- From: wine-patches-admin(a)winehq.org [mailto:wine-patches-admin(a)winehq.org] On Behalf Of Jens Collin Sent: den 11 september 2004 21:47 To: wine-patches(a)winehq.org Subject: patch: shell32.dll - SHELL_ArgifyW expands env-vars Patch updated with correct string constants handling. thanks James and Alexandre. changelog: * lookup of envoronment-vars in SHELL_ArgifyW in shell32.dll added. (Such as %SystemRoot%).

1 0