August 2008 - Wine-devel - list.winehq.org

Re: [crypt32/tests] Use CryptAcquireContextA instead of CryptAcquireContextW
by Detlef Riekenberg 26 Aug '08

26 Aug '08

On Mo, 2008-08-25 at 22:16 +0200, Paul Vriens wrote: > static BOOL (WINAPI * pCryptAcquireContextA) > (HCRYPTPROV *, LPCSTR, LPCSTR, DWORD, DWORD); > -static BOOL (WINAPI * pCryptAcquireContextW) > - (HCRYPTPROV *, LPCWSTR, LPCWSTR, DWORD, > DWORD); > @@ -47,7 +45,6 @@ static void init_function_pointers(void) > trace("GetProcAddress(%s) failed\n", #func); > > GET_PROC(hAdvapi32, CryptAcquireContextA) > - GET_PROC(hAdvapi32, CryptAcquireContextW) > @@ -2799,10 +2794,10 @@ static BOOL detect_nt(void) > signer.pCertInfo = &certInfo; > signer.HashAlgorithm.pszObjId = oid_rsa_md5; > > - ret = pCryptAcquireContextW(&signer.hCryptProv, cspNameW, NULL, > + ret = pCryptAcquireContextA(&signer.hCryptProv, cspNameA, NULL, > PROV_RSA_FULL, CRYPT_NEWKEYSET); > - ret = pCryptAcquireContextW(&signer.hCryptProv, cspNameW, > NULL, > + ret = pCryptAcquireContextA(&signer.hCryptProv, cspNameA, > NULL, > PROV_RSA_FULL, 0); > } > > @@ -2810,7 +2805,7 @@ static BOOL detect_nt(void) > > /* cleanup */ > CryptReleaseContext(signer.hCryptProv, 0); > - pCryptAcquireContextW(&signer.hCryptProv, cspNameW, NULL, > PROV_RSA_FULL, > + pCryptAcquireContextA(&signer.hCryptProv, cspNameA, NULL, > PROV_RSA_FULL, > CRYPT_DELETEKEYSET); This changes are wrong. Please compare your change with the name of the last Function. The code is expected to Fail on Win9x. This should work as first code in detect_nt(): + if (!pCryptAcquireContextW) return FALSE; Thanks -- By by ... Detlef

2 1

Re: regedit: Fix concat handling for ANSI files
by Alexandre Julliard 26 Aug '08

26 Aug '08

Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> writes: > + do > + { > + *s = fgetc(in); > + } while(*s == ' ' || *s == '\t'); > + > + if(*s == EOF) > fprintf(stderr,"%s: ERROR - invalid continuation.\n", > getAppName()); You can't do that, EOF is an int not a char. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: shlwapi: [PATCH 3/4] Fix results for UrlApplyScheme
by Dmitry Timoshkov 26 Aug '08

26 Aug '08

"Detlef Riekenberg" <wine.dev(a)web.de> wrote: > Subject: [PATCH 2/4] shlwapi: Fix results for UrlApplyScheme This subject doesn't match the e-mail subject line, and may confuse things. > in = HeapAlloc(GetProcessHeap(), 0, > - (2*INTERNET_MAX_URL_LENGTH) * sizeof(WCHAR)); > + (2*INTERNET_MAX_URL_LENGTH) * sizeof(WCHAR)); > out = in + INTERNET_MAX_URL_LENGTH; > > - MultiByteToWideChar(0, 0, pszIn, -1, in, INTERNET_MAX_URL_LENGTH); > + MultiByteToWideChar(CP_ACP, 0, pszIn, -1, in, INTERNET_MAX_URL_LENGTH); It would simplify things to allocate the buffer on the stack, since the buffer is small and its size is known. > +/************************************************************************* > + */ > + > static HRESULT URL_GuessScheme(LPCWSTR pszIn, LPWSTR pszOut, LPDWORD pcchOut) > { It's a usual convention to not leave an empty line after the API/function description comment, and adding an empty comment is not useful at all. -- Dmitry.

1 0

Re: comdlg32: Update Japanese translation
by Alexandre Julliard 26 Aug '08

26 Aug '08

"Muneyuki Noguchi" <nogu.dev(a)gmail.com> writes: > +/****************************************************************/ > +/* Japanese neutral resources > +/****************************************************************/ > + > +LANGUAGE LANG_JAPANESE, SUBLANG_NEUTRAL You shouldn't need neutral resources for Japanese, there's only one sublanguage. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [2/3] d3dx9: Add d3dx9effect.h
by Alexandre Julliard 26 Aug '08

26 Aug '08

Busquets Pérez Luis C. <luiscar2001(a)yahoo.es> writes: > + /*** ID3DXEffect ***/ > + STDMETHOD(GetPool)(THIS_ LPD3DXEFFECTPOOL* ppPool) PURE; > + STDMETHOD(SetTechnique)(THIS_ D3DXHANDLE hTechnique) PURE; > + STDMETHOD_(D3DXHANDLE, GetCurrentTechnique)(THIS) PURE; > + STDMETHOD(ValidateTechnique)(THIS_ D3DXHANDLE hTechnique) PURE; > + STDMETHOD(FindNextValidTechnique)(THIS_ D3DXHANDLE hTechnique, D3DXHANDLE *pTechnique) PURE; > + STDMETHOD_(BOOL, IsParameterUsed)(THIS_ D3DXHANDLE hParameter, D3DXHANDLE hTechnique) PURE; > + STDMETHOD(Begin)(THIS_ UINT *pPasses, DWORD Flags) PURE; > + STDMETHOD(Pass)(THIS_ UINT Pass) PURE; > + STDMETHOD(End)(THIS) PURE; > + STDMETHOD(GetDevice)(THIS_ LPDIRECT3DDEVICE9* ppDevice) PURE; > + STDMETHOD(OnLostDevice)(THIS) PURE; > + STDMETHOD(OnResetDevice)(THIS) PURE; > + STDMETHOD(CloneEffect)(THIS_ LPDIRECT3DDEVICE9 pDevice, LPD3DXEFFECT* ppEffect) PURE; This doesn't match the headers I have. Is the interface different between d3dx9 versions? -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: How should I name the Traditional Chinese resource file ?
by Alexandre Julliard 26 Aug '08

26 Aug '08

Hongbo Ni <hongbo(a)njstar.com> writes: > 1. name it Zh_tw.rc, (but Alexandre seems not like it) > 2. name it Tw.rc > 3. rename all Zh.rc to Cn.rc, then name traditional as Zh.rc > 4. just put both simplified and traditional Chinese in Zh.rc > (not good as they are different encoding). > > My question is how should I name it ? The best solution is 4, we try to use a single file per language. If encoding is an issue you can convert the file to utf-8. -- Alexandre Julliard julliard(a)winehq.org

2 2

Patchwatcher status: regenerates configure, notifies authors on failure, filtered patches mailing list
by Dan Kegel 26 Aug '08

26 Aug '08

Patchwatcher now regenerates configure and makefiles after each patch, so it can handle patches that change configure.ac. I have enabled email notification to authors of patches that don't build. The script now forwards patches that pass all tests to the mailing list http://groups.google.com/group/wine-patches-filtered so potentially Alexandre could start looking only at that list (though it probably only has two nines of reliability at this point, as patchwatcher doesn't handle every case yet, e.g. it doesn't handle partial resends of patch series).

10 19

winetricks: add ie6 verb
by Steven Edwards 26 Aug '08

26 Aug '08

This might be of use to someone wanting to compare Wine IE gecko rendering to IE6 without having to use a bigger hack like ies4linux. I am sending here rather than privately to Dan as I don't expect it to be merged to winetricks mainline Changelog: Add ie6 verb and support IE6 <rant> I doubt Dan will merge it (no disrespect intended, I am not trying to single him out) because it might be viewed as 'lacking sense taste' whatever that is supposed to mean, see http://www.winehq.org/pipermail/wine-devel/2008-July/067109.html regarding a script for Media player and codecs. I don't see what could be poor taste if Wine is going to have to reimplement this stuff anyway, to provide support for it in winetricks so developers can compare native verses builtin. All the better if some users find it of use too. I would see something like Office being added as crossing the line Dan has drawn for winetricks being a developer tool rather than a user tool but that is not really my point in any case. We've been accused in private by other that Bordeaux will not, or does not contribut back to Wine, leeches off of Winehq in a Transgaming like style, etc. Even though 90% of my patches and ideas (however small they are) have been rejected and even with IE being a nice part of the revenue stream, I've decide to give the hack back in all of its glory. We are committed to maintain NO "proprietary advantages" and seeing everything that runs on Bordeaux work out of the box on the next Wine stable release. We don't have the development staff or funding yet to fully ramp up and be as active as we would like to be but here is another token of our commitment. </rant> -- Steven Edwards "There is one thing stronger than all the armies in the world, and that is an idea whose time has come." - Victor Hugo

2 2

ddraw error in Tibia (wine told me to post here)
by Michael Reiley 25 Aug '08

25 Aug '08

There's some progress on the MMORPG Tibia since the last wine version, but now there's a new error. before you tell me "This list is for discussions regarding Wine development. It is not for bug reports or user support questions", I'd like to tell you "err:ddraw:IDirectDrawImpl_QueryInterface (0x13b5d0) You may want to contact wine-devel for help" Assuming wine knows what it's talking about, I'm going to post the error log here and see what all of you have to say. fuzzypig(a)fp-ubuntu-laptop:~/.wine/drive_c/Program Files/Tibia$ wine Tibia.exe engine 0 fixme:win:EnumDisplayDevicesW ((null),0,0x32e468,0x00000000), stub! err:ddraw:IDirectDrawImpl_QueryInterface (0x13b5d0) The App is requesting a D3D device, but a non-OpenGL surface type was choosen. Prepare for trouble! err:ddraw:IDirectDrawImpl_QueryInterface (0x13b5d0) You may want to contact wine-devel for help err:ddraw:IDirectDrawSurfaceImpl_QueryInterface No interface fixme:d3d:WineD3D_ChoosePixelFormat Add OpenGL context recreation support to SetDepthStencilSurface fixme:d3d:CreateContext >>>>>>>>>>>>>>>>> GL_INVALID_OPERATION (0x502) from glClearColor @ context.c / 514 fixme:d3d_shader:state_texfactor_arbfp >>>>>>>>>>>>>>>>> GL_INVALID_ENUM (0x500) from glProgramEnvParameter4fvARB(GL_FRAGMENT_PROGRAM_ARB, ARB_FFP_CONST_TFACTOR, col) @ arb_program_shader.c / 2327 fixme:d3d_shader:set_bumpmat_arbfp >>>>>>>>>>>>>>>>> GL_INVALID_ENUM (0x500) from glProgramEnvParameter4fvARB(GL_FRAGMENT_PROGRAM_ARB, ARB_FFP_CONST_BUMPMAT(stage), &mat[0][0]) @ arb_program_shader.c / 2361 fixme:d3d_shader:set_bumpmat_arbfp >>>>>>>>>>>>>>>>> GL_INVALID_ENUM (0x500) from glProgramEnvParameter4fvARB(GL_FRAGMENT_PROGRAM_ARB, ARB_FFP_CONST_BUMPMAT(stage), &mat[0][0]) @ arb_program_shader.c / 2361 fixme:d3d_shader:set_bumpmat_arbfp >>>>>>>>>>>>>>>>> GL_INVALID_ENUM (0x500) from glProgramEnvParameter4fvARB(GL_FRAGMENT_PROGRAM_ARB, ARB_FFP_CONST_BUMPMAT(stage), &mat[0][0]) @ arb_program_shader.c / 2361 fixme:d3d_shader:set_bumpmat_arbfp >>>>>>>>>>>>>>>>> GL_INVALID_ENUM (0x500) from glProgramEnvParameter4fvARB(GL_FRAGMENT_PROGRAM_ARB, ARB_FFP_CONST_BUMPMAT(stage), &mat[0][0]) @ arb_program_shader.c / 2361 fixme:d3d_shader:set_bumpmat_arbfp >>>>>>>>>>>>>>>>> GL_INVALID_ENUM (0x500) from glProgramEnvParameter4fvARB(GL_FRAGMENT_PROGRAM_ARB, ARB_FFP_CONST_BUMPMAT(stage), &mat[0][0]) @ arb_program_shader.c / 2361 Happy trails! ~Michael Reiley

1 0

Re: winex11.drv: Fix buffer overflow bug in X11DRV_KeyEvent() andX11DRV_ToUnicodeEx()
by Dmitry Timoshkov 25 Aug '08

25 Aug '08

"Muneyuki Noguchi" <nogu.dev(a)gmail.com> wrote: > winex11.drv: Fix buffer overflow bug in X11DRV_KeyEvent() and > X11DRV_ToUnicodeEx() > + Str = (char *)malloc(64); > + if (Str == NULL) > + ERR("Failed to allocate memory!\n"); Please don't use malloc() in Wine, use win32 Heap*** APIs instead. Also, you need to properly handle memory allocation errors, not just print an ERR. -- Dmitry.

2 1