- Wine-Devel - list.winehq.org

Re: secur32: Fix wrapper.c to honour functions that are run twice.
by Kai Blin Aug. 21, 2005

Aug. 21, 2005

* Kai Blin <blin(a)gmx.net> [21/08/05, 20:15:55]: > - ret = SECUR32_makeSecHandle(phContext, package, &myCtxt); > + ret = SECUR32_makeSecHandle(phNewContext, package, &myCtxt); > if (ret != SEC_E_OK) > package->provider->fnTableW.DeleteSecurityContext( > &myCtxt); Of course this needs to be changed, or SECUR32_makeSecHandle will overwrite the return value of InitializeSecurityContext resp. AcceptSecurityContext. Fixed in my new patch. Sorry, Kai -- Kai Blin, (blin at gmx dot net) How sharper than a hound's tooth it is to have a thankless serpent.

1 0

Re: atl: fix warnings in 64bit
by Jacek Caban Aug. 21, 2005

Aug. 21, 2005

Hello. Kevin Koltzau wrote: >Changelog > Remove 'cast to pointer from integer of different size' warnings in 64bit > > >------------------------------------------------------------------------ > >Index: dlls/atl/registrar.c >=================================================================== >RCS file: /home/wine/wine/dlls/atl/registrar.c,v >retrieving revision 1.11 >diff -u -d -r1.11 registrar.c >--- dlls/atl/registrar.c 10 Aug 2005 09:53:47 -0000 1.11 >+++ dlls/atl/registrar.c 21 Aug 2005 02:42:53 -0000 >@@ -634,7 +634,7 @@ > { > Registrar *This = (Registrar*)iface; > TRACE("(%p)->(%s %d %s)\n", iface, debugstr_w(resFileName), nID, debugstr_w(szType)); >- return resource_register(This, resFileName, (LPOLESTR)nID, szType, TRUE); >+ return resource_register(This, resFileName, (LPOLESTR)(UINT_PTR)nID, szType, TRUE); > } > > static HRESULT WINAPI Registrar_ResourceUnregister(IRegistrar* iface, LPCOLESTR resFileName, >@@ -642,7 +642,7 @@ > { > Registrar *This = (Registrar*)iface; > TRACE("(%p)->(%s %d %s)\n", This, debugstr_w(resFileName), nID, debugstr_w(szType)); >- return resource_register(This, resFileName, (LPOLESTR)nID, szType, FALSE); >+ return resource_register(This, resFileName, (LPOLESTR)(UINT_PTR)nID, szType, FALSE); > } > > static const IRegistrarVtbl RegistrarVtbl = { > > It doesn't make a big difference, but it would be better to use MAKEINTRESOURCEW macro here. Jacek

1 0

Re: [WINEOSS] multiple sound card mixer patch
by Robert Reif Aug. 21, 2005

Aug. 21, 2005

Robert Reif wrote: > Fix mixer detection for multiple sound cards. > > > This fixes a bug with the previous patch and adds some more debugging info. Index: dlls/winmm/wineoss/mixer.c =================================================================== RCS file: /home/wine/wine/dlls/winmm/wineoss/mixer.c,v retrieving revision 1.35 diff -p -u -r1.35 mixer.c --- dlls/winmm/wineoss/mixer.c 3 Aug 2005 21:25:10 -0000 1.35 +++ dlls/winmm/wineoss/mixer.c 21 Aug 2005 11:29:12 -0000 @@ -366,8 +366,8 @@ static DWORD MIX_Open(WORD wDevID, LPMIX * the equivalent of mixer identification * (with a reference to a wave, midi.. handle */ - if (!(mix = MIX_Get(wDevID))) { - WARN("bad device ID\n"); + if ((mix = MIX_Get(wDevID)) == NULL) { + WARN("bad device ID: %04X\n", wDevID); return MMSYSERR_BADDEVICEID; } @@ -610,8 +610,8 @@ static DWORD MIX_GetDevCaps(WORD wDevID, return MMSYSERR_INVALPARAM; } - if (!(mix = MIX_Get(wDevID))) { - WARN("bad device ID\n"); + if ((mix = MIX_Get(wDevID)) == NULL) { + WARN("bad device ID: %04X\n", wDevID); return MMSYSERR_BADDEVICEID; } @@ -787,7 +787,7 @@ static DWORD MIX_GetLineInfo(WORD wDevID } if ((mix = MIX_Get(wDevID)) == NULL) { - WARN("bad device ID\n"); + WARN("bad device ID: %04X\n", wDevID); return MMSYSERR_BADDEVICEID; } @@ -969,7 +969,7 @@ static DWORD MIX_GetLineControls(WORD wD } if ((mix = MIX_Get(wDevID)) == NULL) { - WARN("bad device id\n"); + WARN("bad device ID: %04X\n", wDevID); return MMSYSERR_BADDEVICEID; } @@ -1068,7 +1068,7 @@ static DWORD MIX_GetControlDetails(WORD } if ((mix = MIX_Get(wDevID)) == NULL) { - WARN("bad device ID\n"); + WARN("bad device ID: %04X\n", wDevID); return MMSYSERR_BADDEVICEID; } @@ -1266,7 +1266,7 @@ static DWORD MIX_SetControlDetails(WORD } if ((mix = MIX_Get(wDevID)) == NULL) { - WARN("bad device ID\n"); + WARN("bad device ID: %04X\n", wDevID); return MMSYSERR_BADDEVICEID; } @@ -1457,8 +1457,8 @@ static DWORD MIX_Init(void) #ifdef SOUND_MIXER_INFO mixer_info info; if (ioctl(mixer, SOUND_MIXER_INFO, &info) >= 0) { - MIX_Mixers[i].name = HeapAlloc(GetProcessHeap(),0,strlen(info.name) + 1); - strcpy(MIX_Mixers[i].name, info.name); + MIX_Mixers[MIX_NumMixers].name = HeapAlloc(GetProcessHeap(),0,strlen(info.name) + 1); + strcpy(MIX_Mixers[MIX_NumMixers].name, info.name); } else { /* FreeBSD up to at least 5.2 provides this ioctl, but does not * implement it properly, and there are probably similar issues @@ -1469,10 +1469,10 @@ static DWORD MIX_Init(void) #endif close(mixer); + MIX_Mixers[MIX_NumMixers].dev_name = HeapAlloc(GetProcessHeap(),0,strlen(name) + 1); + strcpy(MIX_Mixers[MIX_NumMixers].dev_name, name); MIX_NumMixers++; - MIX_Mixers[i].dev_name = HeapAlloc(GetProcessHeap(),0,strlen(name) + 1); - strcpy(MIX_Mixers[i].dev_name, name); - MIX_Open(i, NULL, 0); /* FIXME */ + MIX_Open(MIX_NumMixers - 1, NULL, 0); /* FIXME */ } else { WARN("couldn't open %s\n", name); }

1 0

Should all builtin DLLs have version information?
by Paul Vriens Aug. 21, 2005

Aug. 21, 2005

Hi, the subject says it all. If yes, I will start adding some for the ones visible in Process Explorer when running some of 'my' test-apps. Paul.

2 2

excluding kernel32.9[78] from a relay log
by Saulius Krasuckas Aug. 20, 2005

Aug. 20, 2005

Using CVS version I get following calls in the output very frequently: 000b:Call kernel32.97(408b8880) ret=40891d49 000b:Ret kernel32.97() retval=40428f60 ret=40891d49 000b:Call kernel32.98(408b8880) ret=40891e27 000b:Ret kernel32.98() retval=00000000 ret=40891e27 I want to exclude this stuff. Adding "97;98" to "HKEY_CURRENT_USER/Software/Wine/debug/RelayExclude" string value doesn't help me. $ grep -Ir [^0-9]9[78][^0-9] dlls/kernel/*.spec | dlls/kernel/kernel32.spec: 97 stdcall -noname _EnterSysLevel(ptr) | dlls/kernel/kernel32.spec: 98 stdcall -noname _LeaveSysLevel(ptr) Adding "_EnterSysLevel;_LeaveSysLevel;97;98" does not help either. Suggestions?

2 2

IDA Pro regression
by James Liggett Aug. 20, 2005

Aug. 20, 2005

Hi, Yesterday, after not upgrading my wine CVS copy for about a month, I upgraded to do some testing. I started IDA pro (version 4.8 demo) and got ready to debug a DLL that's been giving me trouble. Getting ready to start the debugger, I opened the General Registers window, and I noticed that the boxes that show the contents of the registers were about five times taller than they normally are. I set up the process options for the debugger and tried to get back to the General Registers window to start the debugger but IDA crashed with an "Abnormal Termination" error. It doesn't give any unusual errors in the console. Can someone recommend to me some tips for finding the problem? I have considered downgrading CVS until I find the problem, but that seems like a *lot* of compiling and recompiling. Is there a more efficient way to go about finding the cause of the problem? Thanks very much, James Liggett

3 2

Bugs in ole32 test (Or in windows)
by Ivan Leo Puoti Aug. 20, 2005

Aug. 20, 2005

The tmp files generated by the testProps() and testCodepage() in dlls/ole32/tests/stg_prop.c don't get deleted in windows nt 4.0, even if apparently a DeleteFileW is done on them. Ivan.

1 0

Re: winefile: TRY2 Fix for encoding Ru.rc
by Dmitry Timoshkov Aug. 20, 2005

Aug. 20, 2005

"Yuri Kozlov" <kozlov.y(a)gmail.com> wrote: > Changelog: > fix for encoding Ru.rc > --- wine/programs/winefile/Ru.rc 2005-06-20 15:45:39.000000000 +0400 > +++ bwine/programs/winefile/Ru.rc 2005-08-18 19:56:37.000000000 +0400 > @@ -20,6 +20,8 @@ > > LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT > > +#pragma code_page(1251) Why do you need it? Specifying a language should be enough, at least it works for all other resource files, including russian ones. -- Dmitry.

2 1

Re: RICHED20: Avoid flicker
by Phil Krylov Aug. 19, 2005

Aug. 19, 2005

On Sun, 14 Aug 2005 17:53:33 +0400 Phil Krylov <phil(a)newstar.rinet.ru> wrote: > this patch needs to be applied after the "Re: RICHED20: Implement > EM_SETRECT, EM_SETRECTNP and WM_SETREDRAW messages (fixed)" patch. > > ChangeLog: > > Avoid flicker in RichEdit using proper update region invalidation and an > offscreen bitmap. Anything wrong with this patch? -- Ph.

2 1

Re: shell32: Some tests for FolderShortcut class
by Alexandre Julliard Aug. 19, 2005

Aug. 19, 2005

Michael Jung <mjung(a)iss.tu-darmstadt.de> writes: > Changelog: > Added some tests for CLSID_FolderShortcut objects Could you please merge that in one of the existing test files, like shlfolder.c? We don't want to create too many test files. -- Alexandre Julliard julliard(a)winehq.org

1 0