wine-devel

wine-devel@winehq.org

2 participants
84469 discussions

Patch for dinput keyboard
by arjen＠blehq.org 19 May '02

19 May '02

This 'beautiful' patch I wrote for fixing dinput was silently ignored. Can someone comment about it? here is a link to it: http://www.winehq.com/hypermail/wine-patches/2002/05/0047.html Thank you

3 5

Re: Mingw devel stuff Part2
by Steven Edwards 19 May '02

19 May '02

After that patch I am also able to compile these dlls Comcat.dll Crtdll.dll Msisys.ocx Netapi32.dll Riched32.dll Serialui.dll Twain_32.dll Wintrust.dll I know that some of them are mostly stubs but its still a good start. I understand WINEs crtdll just forwards call to msvcrt.dll but will this also work on a Windows Target? I was under the impression this Wouldn't work due to crtdll not being thread safe. Or will this only Work on *NIX hosts using wines MSVCRT? Its not a big deal to the ReactOS project as we already have crtdll and msvcrt we maintain but it would always be nice to have one less thing to keep up. Thanks Steven "Every revolution was once a thought in one man's mind" - Ralph Waldo Emerson

1 0

process.c problem update
by Dustin Navea 18 May '02

18 May '02

Ok, I finally implemented the right checks in process.c to get the Unreal Tournament-based installers working properly, now all I have to do is make the diff and submit it. The code is very ugly and I was wondering if someone would volunteer to clean it up, since I'm not sure if it will be committed in it's current state... Also, will be included a fix for Blizzard Installers that "cant find program start menu". Seems there is a missing registry entry... If you are willing to clean up my messy code, please email me privately and let me know. -Dustin __________________________________________________ Do You Yahoo!? LAUNCH - Your Yahoo! Music Experience http://launch.yahoo.com

1 0

Mingw devel stuff Part2
by Steven Edwards 18 May '02

18 May '02

Sorry about that I hit the send button to soon. OK when I try build shlwapi.dll I'm getting this Administrator@LAPTOP /cygdrive/d/src/winehq/wine/dlls/shlwapi $ make dllwrap --add-stdcall-alias --def shlwapi.spec.def --implib shlwapi.a -o shlwapi .dll ordinal.o path.o reg.o regstream.o shlwapi_main.o string.o url.o shlwa pi.dll.dbg.o -L../../dlls -luser32 -lgdi32 -ladvapi32 -lkernel32 -L../../library -lwine -L../../ole -lwine_uuid -L../../unicode -lwine_unicode -lm Warning: resolving ___wine_dbgstr_guid by linking to __imp____wine_dbgstr_guid ( auto-import) Warning: resolving ___wine_dbgstr_an by linking to __imp____wine_dbgstr_an (auto -import) Warning: resolving ___wine_dbgstr_wn by linking to __imp____wine_dbgstr_wn (auto -import) ordinal.o(.text+0x52d6):ordinal.c: undefined reference to `wctype_table' ordinal.o(.text+0x52eb):ordinal.c: undefined reference to `wctype_table' path.o(.text+0x74d6):path.c: undefined reference to `casemap_lower' path.o(.text+0x74eb):path.c: undefined reference to `casemap_lower' path.o(.text+0x751a):path.c: undefined reference to `casemap_upper' path.o(.text+0x752f):path.c: undefined reference to `casemap_upper' path.o(.text+0x7752):path.c: undefined reference to `wctype_table' path.o(.text+0x7767):path.c: undefined reference to `wctype_table' string.o(.text+0x1d2d):string.c: undefined reference to `wvsnprintfA@16' string.o(.text+0x1d61):string.c: undefined reference to `wvsnprintfW@16' string.o(.text+0x1d8e):string.c: undefined reference to `casemap_upper' string.o(.text+0x1da3):string.c: undefined reference to `casemap_upper' url.o(.text+0x4426):url.c: undefined reference to `wctype_table' url.o(.text+0x443b):url.c: undefined reference to `wctype_table' fu000001.o(.idata$3+0xc): undefined reference to `libwine_a_iname' fu000002.o(.idata$3+0xc): undefined reference to `libwine_a_iname' fu000004.o(.idata$3+0xc): undefined reference to `libwine_a_iname' fu000005.o(.idata$3+0xc): undefined reference to `libwine_a_iname' fu000006.o(.idata$3+0xc): undefined reference to `libwine_a_iname' fu000007.o(.idata$3+0xc): more undefined references to `libwine_a_iname' follow nmth000000.o(.idata$4+0x0): undefined reference to `_nm____wine_dbgstr_guid' nmth000003.o(.idata$4+0x0): undefined reference to `_nm____wine_dbgstr_an' nmth000009.o(.idata$4+0x0): undefined reference to `_nm____wine_dbgstr_wn' collect2: ld returned 1 exit status dllwrap: gcc exited with status 1 make: *** [shlwapi.dll] Error 1 "Every revolution was once a thought in one man's mind" - Ralph Waldo Emerson

2 3

opengl rendering to the wrong window
by Ryan Stallings 18 May '02

18 May '02

Hello, I am trying to get the Neverwinter Nights Model viewer (http://www.bioware.com/games/neverwinter_nights/other_multimedia/model_view…) working under wine. The menus etc of the model viewer come up correctly, but no rendering can be seen in the render window. Through some investigation I determined that the model was being rendered, just in the wrong window. I moved the window out of the way by a few pixels and saw the model was being rendered to what looks like the main window underneath the menu. Here is a screen shot that shows what I mean..... http://nwwine.beergeek.net/shots/nw_offset.jpg The black square is the windows shifted and the blue background is the glClearColor of the rendering window. As you can see the model is under the window :( Now if I move the window way offscreen and add an offset to the glViewport call I can get the model to render in the correct place, but this is obviously not the right solution. What could be causing it to be rendered in the wrong window? The render window has a hwnd =1003e and a drawable client/whole = 0x4000064/0x4000063 and the first couple of time through wglMakeCurrent the drawable that comes back from the hdc that is passed (requested from 1003e) is 0x4000064 which seems right, but I think this is some sort of test renderings offscreen before the application comes up. Later in the logs this is not true. GetDCEx is called with 1003e, but it returns a hdc that has a different drawable associated with it (the one for the root window I think). But even if I try to for the drawable to 0x4000064 is does not render in to the correct window (it does not render at all). Does anybody have any direction to point me in? Or is there any information that I could provide to make the situation more clear? Thanks! ryan

2 1

nasty NTDLL_vsnwprintf bug?!?
by John K. Hohm 18 May '02

18 May '02

My heap corruption problem turned out to be a bug in swprintf (well, really in NTDLL_vsnwprintf), I think. I tried formatting like this: WCHAR keyname[21] = { 'C', 'o', 'm', 'p', 'o', 'n', 'e', 'n', 't', ' ', 'C', 'a', 't', 'e', 'g', 'o', 'r', 'i', 'e', 's', 0 }; WCHAR fmt[4] = { '%', 'l', 'X', 0 }; swprintf(This->xlcid, fmt, lcid); My poor little WCHAR xlcid[9] member of This was seriously overflowed by the string L"409Component Categories". The following patch fixes what appears to be a format reading bug in NTDLL_vsnwprintf. I didn't just send it to wine-patches because it's not my area and it seems unlikely such a bad bug could hang around in such a function. Then again, I don't see many uses of swprintf in the source; should I be using something better for sprintf's of WCHAR's? --- dlls/ntdll/wcstring.c.~1.15.~ Thu May 16 19:59:27 2002 +++ dlls/ntdll/wcstring.c Fri May 17 23:09:21 2002 @@ -451,10 +451,7 @@ } if (*iter == (WCHAR)L'h' || *iter == (WCHAR)L'l') - { *fmta++ = *iter++; - *fmta++ = *iter++; - } switch (*iter) {

1 0

Weird parameters with LVM_GETSUBITEMRECT
by Paul Rupe 17 May '02

17 May '02

A recent change to dlls/comctl32/listview.c implemented GetSubItemRect, but this causes Xnews to hang when selecting a newsgroup from the list. I don't think the change itself is at fault, but it may have uncovered a bug elsewhere. The app gets a message LVM_GETSUBITEMRECT (4152) with the following parameters: wParam: 1078422692 (0x40476ca4) lParam: 1078422612 (0x40476c54) wParam should be a small integer (an index into the listview items) and lParam is a pointer to a RECT: *(LPRECT)lParam: {left = 2, top = 1079544291, right = 28246089, bottom = 1079843718} or {left = 0x2, top = 0x405889e3, right = 0x1af0049, bottom = 0x405d1b86} lParam->left is reasonable, but lParam->top should be a small index. Note that wParam, lParam, and lParam->top are fairly close numerically. The function LISTVIEW_GetSubItemRect then tries to loop from 0 to that huge number, causing the hang. I put a sanity check inside that function to stop it from going past GETITEMCOUNT and that works, but I want to see if I can fix it the right way. -- Paul Rupe "She smiled, in the end." p r u p e @ m y r e a l b o x . c o m | Oppose government police-ware on your PC! | Stop the Consumer Broadband and Digital Television Promotion Act! | <http://www.eff.org/alerts/20020322_eff_cbdtpa_alert.html> --

1 0

Re: fixme:win32:PeekNamedPipe
by Andriy Palamarchuk 17 May '02

17 May '02

I just came across bugzilla entry about this issue - bug 297: http://wine.codeweavers.com/bugs/show_bug.cgi?id=297 If anybody starts to work on the bug, please take this bug and keep it updated. Andriy Palamarchuk __________________________________________________ Do You Yahoo!? Yahoo! Tax Center - online filing with TurboTax http://taxes.yahoo.com/

2 1

Mingw Port Information and Questions
by Steven Edwards 17 May '02

17 May '02

OK so we the latest changes I do need to build libwine.dll right? I can if I link it to msvcrt.a but ig I don't I get the following Administrator@LAPTOP /cygdrive/d/src/winehq/wine/library $ make dllwrap --add-stdcall-alias --export-all --implib libwine.a -o libwine.dll debug .o errno.o ldt.o loader.o port.o dllwrap: no export definition file provided dllwrap: creating one, but that may not be what you want debug.o(.text+0x8d4):debug.c: undefined reference to `_imp___iob' loader.o(.text+0x4c4):loader.c: undefined reference to `_assert' loader.o(.text+0x614):loader.c: undefined reference to `_assert' port.o(.text+0x4):port.c: undefined reference to `_errno' port.o(.text+0x30):port.c: undefined reference to `_errno' port.o(.text+0x48):port.c: undefined reference to `_errno' port.o(.text+0x60):port.c: undefined reference to `_errno' port.o(.text+0x78):port.c: undefined reference to `_errno' port.o(.text+0x90):port.c: more undefined references to `_errno' follow collect2: ld returned 1 exit status dllwrap: gcc exited with status 1 make: *** [libwine.dll] Error 1 Also when I try to build shlwapi.dll I get this

1 0

Problem in scheduler/process.c
by Dustin Navea 17 May '02

17 May '02

ok, so I have found the cause of the problem in scheduler/process.c that is making ut-based installers not work. the problem is the code from line 450 to line 461 inclusive. in all programs, PROCESS_InitWine is called from int main in miscemu/main.c, then open_winelib_app is called from PROCESS_InitWine (always) where things go wrong... in a normal program, 1 of 2 things (im not sure which though) happens... 1) line 451 evaluates to false so that section is skipped and then line 461 is also evaluated to false, so it is also skipped, so open_winelib_app returns either null or " " (not sure of the difference) -or- 2) line 451 evaluates to true, and then 457 also evaluates to true, so open_winelib_app returns NULL. with the ut-based installer that is the case, but the Setup.exe that is on the root of the cd acts differently... 1) 451 evaluates to false and then 461 evaluates to true, causing wine to attempt to load the real installer (called by the one in the root of the cd) as a .so, which doesn't work. -or- 2) 451 evaluates to true and 457 evaluates to false, so it goes on to 461, which evaluates to true... with winelib apps the same thing happens as with the "root-of-cd" installer except that the .so file does exist and so it gets loaded... so, i think what needs to be done is a check in PROCESS_InitWine for the kind of binary (windows or winelib). and if it is a winelib binary, then run call open_winelib_app, otherwise proceed with normal loading... probably the easiest way to do this would be like this line 491-494 if (argv[0] != 'wine') { if (open_winelib_app( app_argv )) goto found; } that way you could probably completely remove lines 450-459 which are in open_winelib_app, since all it does is check to make sure argv[0] doesn't equal wine... i would try this method out and submit it, but i won't be back at home until tonight, so i can't make any diff's. if someone wants to give it a go and let us know if it works, please give me credit for the _idea_. hopefully this solves some other problems too... comments appreciated. -Dustin __________________________________________________ Do You Yahoo!? LAUNCH - Your Yahoo! Music Experience http://launch.yahoo.com

1 0

Re: Fix for focus loops
by Jukka Heinonen 17 May '02

17 May '02

On Tue, May 07, 2002, Alexandre Julliard wrote: > I've been working on this too, and I found that the locally active > model seems to work better with most window managers, even though it's > not 100% correct per the spec. Here's the patch I have, please give it > a try and let me know how it works for you. If your patch is used in globally active mode (Wine config file has "UseTakeFocus" = "Y"), focus loop problem is fixed. However, if I try locally active mode, Wine still enters focus loop. Some comments about the patch and Wine focus handling: - Timestamp used in X11DRV_SetFocus is wrong when focus has been gained either due to WM_TAKE_FOCUS or due to FocusIn. - Routine X11DRV_SetFocus may fail to set focus because focus might have already been passed to another X11 window. In unmanaged mode this is fatal: override_redirect windows receive neither WM_TAKE_FOCUS nor FocusIn and if Wine believes that a window already has focus it won't call X11DRV_SetFocus even when the window receives mouse clicks. - If X11DRV_SetFocus fails, Wine routine that triggered this call (SetForegroundWindow, SetActiveWindow, SetFocus, etc) should also fail. This is what NT5.0 does according to docs, by the way. This would make it easy to see which window really has focus. - It is likely that last_focus will be wrong if routine X11DRV_SetFocus fails as described above. - All Wine windows using override_redirect break ICCCM. This includes all windows in unmanaged mode. In general, it is not possible for override_redirect windows to gain input focus without confusing focus handling of window managers. There are two exceptions to this generalization which likely apply to full-screen applications and menus. - In locally active model, transferring focus from top-level window to active dialog window requires timestamp CurrentTime which breaks ICCCM compliance. This can break window manager focus handling in some cases. This is likely not very big an issue, but I believe that everything that breaks standards should be properly commented. - One not directly focus relared problem is that some window managers always put override_redirect windows on top of managed windows. And when you run some applications in managed mode, Wine creates a full screen override_redirect window which has managed dialog window... Looking at this list makes me believe that fixing Wine focus handling should be assigned much higher priority than it has been so far. -- Jukka Heinonen <http://www.iki.fi/jhei/>

4 6

Problem after update
by Marcelo Welter 17 May '02

17 May '02

Hello I make cvs update -RdP configure make depend make ./snmpapi.spec:6: Expected name, id, length or ordinal make[2]: *** [snmpapi.spec.c] Error 1 make[2]: Leaving directory `/home/marcelo/wine/cvs/wine/dlls/snmpapi' make[1]: *** [snmpapi/snmpapi.dll.so] Error 2 make[1]: Leaving directory `/home/marcelo/wine/cvs/wine/dlls' make: *** [dlls] Error 2 what happen? the syntax of cvs that i use are correct...? Thanks Marcelo

3 2

Component owner for window management/painting
by Andriy Palamarchuk 17 May '02

17 May '02

Any volunteers for handing this kind of problems? Andriy __________________________________________________ Do You Yahoo!? LAUNCH - Your Yahoo! Music Experience http://launch.yahoo.com

1 0

Re: Patch - check for msghdr.msg_control on Sparc-Solaris
by Warren_Baird＠cimmetry.com 17 May '02

17 May '02

> I think it would be better to do it using a technique similar to how it > is done in scheduler/client.c on line 255: Makes sense to me - it wasn't obvious that msg_control and msg_accrights are always mutually exclusive, which is why I added a separate test... But if we're sure they are always mutally exclusive, this approach makes more sense... Warren

1 0

err:heap:HEAP_ValidateInUseArena
by John K. Hohm 17 May '02

17 May '02

I am implementing a COM object in comcat.dll that allocates itself with HeapAlloc and frees itself on its last Release with HeapFree. I am using it in a simple test program that creates it and releases it, and when the Release happens I get this: err:heap:HEAP_ValidateInUseArena Heap 40340000: in-use arena 40378878 next block has PREV_FREE flag It seems to be saying that I'm freeing an already-free block. I ran the test program with --debugmsg trace+all, and I can see that the only uses of the heap during the lifetime of my object instance are one ntdll.RtlAllocateHeap that returns 40378880, and one ntdll.RtlFreeHeap that gets 40378880 as its third param. The RtlFreeHeap is immediately followed by the err:heap, which then spits out a bunch of heap info. It seems pretty obvious that I'm freeing the block of memory I had just allocated; what else might be causing the err:heap? Here is the interesting section of the trace: 080701d0:trace:ole:COMCAT_ICatInformation_EnumCategories 080701d0:Call ntdll.RtlAllocateHeap(40340000,00000008,00000020) ret=4397c0f3 080701d0:trace:heap:RtlAllocateHeap (40340000,0000000a,00000020): returning 40378880 080701d0:Ret ntdll.RtlAllocateHeap() retval=40378880 ret=4397c0f3 080701d0:trace:ntdll:NTDLL_vsnwprintf (2147483647,L"%lX") 080701d0:Call advapi32.RegOpenKeyExW(80000000,40566ce8 L"Component Categories",00000000,00020019,40378898) ret=4397c170 080701d0:Call ntdll.RtlInitUnicodeString(40566bd8,40566ce8 L"Component Categories") ret=40660189 080701d0:Ret ntdll.RtlInitUnicodeString() retval=0000002a ret=40660189 080701d0:Call ntdll.NtOpenKey(40378898,00020019,40566be0) ret=40660194 080701d0:trace:reg:NtOpenKey (0x80000000,L"Component Categories",20019,0x40378898) 080701d0: open_key( parent=-2147483648, access=00020019, name=L"Component Categories" ) Open key ERROR 080701d0: open_key() = OBJECT_NAME_NOT_FOUND { hkey=0 } 080701d0:trace:reg:NtOpenKey <- 0x0000 080701d0:Ret ntdll.NtOpenKey() retval=c0000034 ret=40660194 080701d0:Call ntdll.RtlNtStatusToDosError(c0000034) ret=4066019a 080701d0:Ret ntdll.RtlNtStatusToDosError() retval=00000002 ret=4066019a 080701d0:Ret advapi32.RegOpenKeyExW() retval=00000002 ret=4397c170 080701d0:trace:ole:COMCAT_IEnumCATEGORYINFO_AddRef 080701d0:trace:ole:COMCAT_IEnumCATEGORYINFO_Next 080701d0:trace:ole:COMCAT_IEnumCATEGORYINFO_Release 080701d0:Call ntdll.RtlFreeHeap(40340000,00000000,40378880) ret=4397be9d 080701d0:err:heap:HEAP_ValidateInUseArena Heap 40340000: in-use arena 40378878 next block has PREV_FREE flag

2 1

Re: wine/ dlls/Makefile.in dlls/avicap32/Makefile. ...
by Dimitrie O. Paun 17 May '02

17 May '02

On May 16, 2002 11:37 pm, Alexandre Julliard wrote: > Log message: > Removed most imports of ntdll since we no longer import Wine internal > functions from there. Yay! I've been advocating putting all the wine-specific stuff in a "helper" dlls (libwine) for soo long now, specifically for the purpose of the "Windows" port. Now, the linking things is still a bit of mistery to me. Let's see: -- libwine is linked with all DLLs using the host's native dynlinking tool -- when a program is loaded, _wine_ loads the required DLLs which in turns gets linked by the OS to libwine. Is that so? To be honest, this is how I *think* it works, I haven't actually gone through the code, but I'm feeling lazy tonight :))) -- Dimi.

2 1

Re: wine/ controls/menu.c dlls/commdlg/cdlg32.c dl ...
by Dimitrie O. Paun 17 May '02

17 May '02

On May 16, 2002 10:55 pm, Alexandre Julliard wrote: > > Log message: > Export the debugging API from libwine instead of ntdll. > Removed debugres_[aw]. I think you need to test for null strings in default_dbgstr_[aw]n, no? Also, the default implementations are there for the mingw port? We normally use the ones from NTDLL_dbgstr_*, right? -- Dimi.

2 1

64bit values in API args...
by Vincent Béron 17 May '02

17 May '02

I have a little problem implementing VerifyVersionInfo{A,W}. Here's the prototype of the function (W): BOOL WINAPI VerifyVersionInfoW( LPOSVERSIONINFOEXW lpVersionInfo, DWORD dwTypeMask, DWORDLONG dwlConditionMask) with DWORDLONG being a 64bit value. Now, how do I translate that in kernel32.spec? The current declaration in kernel32.spec is @ stdcall VerifyVersionInfoW(long long long long) VerifyVersionInfoW with either a try to get a "long long" type (undistinguishable from 2 longs), or by just assuming a virtual fourth argument to get the right total argument size. Now, this seems really fishy. I'm not very familiar with the way a C compiler places arguments either in registers or on the stack, but I'm not sure the way it is currently declared is the best way to do it. I'd prefer to define a new type for use in spec files, meaning a 64bit argument. Comments? BTW, for the moment VerifyVersionInfo seems to be the only place in Wine where the DWORDLONG type is used, but that doesn't mean there are no other unimplemented API using it. Vincent

1 0

Component owner for controls
by Andriy Palamarchuk 17 May '02

17 May '02

Does anybody want to voluteer to take ownership over usual controls? I already have owners for common controls Andriy __________________________________________________ Do You Yahoo!? LAUNCH - Your Yahoo! Music Experience http://launch.yahoo.com

2 1

Open watcom
by Uwe Bonnes 17 May '02

17 May '02

Hallo, today, there was an announce of a 0.0.8 release of open watcom on the linux announce newsgroup: http://www.openwatcom.org ftp://ftp.openwatcom.org/watcom/openwatcom Bye -- Uwe Bonnes bon(a)elektron.ikp.physik.tu-darmstadt.de Institut fuer Kernphysik Schlossgartenstrasse 9 64289 Darmstadt --------- Tel. 06151 162516 -------- Fax. 06151 164321 ----------

2 1

Re: Fix to get Unreal Tournament-based installers to work from root of CD
by Alexandre Julliard 17 May '02

17 May '02

Dustin Navea <speeddymon(a)yahoo.com> writes: > Hopefully this doesn't break anything. If it does, I > will attempt to fix the open_winelib_app being called > problem... I may need some help though... The real problem is that for some reason Wine didn't recognize setup.exe as a Window binary. That's what you'll need to fix, your patch is only hiding the problem. -- Alexandre Julliard julliard(a)winehq.com

2 2

Re: wine/dlls/winmm mmsystem.c winemm.h
by Michael Stefaniuc 16 May '02

16 May '02

Hello, tested the patch and FreeSolitaire works again. You can close the bug entry. thanks bye michael On Thu, May 16, 2002 at 10:03:17PM +0200, Eric Pouech wrote: > Eric Pouech a écrit : > oops the last hunk of the patch isn't part of the patch > so Alexandre, please use this file instead > > A+ > Name: ps_a2w > ChangeLog: fixed hangs when playing an ASCII resource > License: X11 > GenDate: 2002/05/16 19:48:36 UTC > ModifiedFiles: dlls/winmm/mmsystem.c > AddedFiles: > =================================================================== > RCS file: /home/cvs/cvsroot/wine/wine/dlls/winmm/mmsystem.c,v > retrieving revision 1.52 > diff -u -u -r1.52 mmsystem.c > --- dlls/winmm/mmsystem.c 12 May 2002 03:10:26 -0000 1.52 > +++ dlls/winmm/mmsystem.c 16 May 2002 19:39:46 -0000 > @@ -447,6 +447,7 @@ > waveOutUnprepareHeader(hWave, &waveHdr[1], sizeof(WAVEHDR)); > > errCleanUp: > + TRACE("Done playing='%s' !\n", debugstr_w(wps->pszSound)); > CloseHandle(s.hEvent); > HeapFree(GetProcessHeap(), 0, waveHdr); > HeapFree(GetProcessHeap(), 0, lpWaveFormat); > @@ -463,6 +464,21 @@ > return bRet; > } > > +static BOOL MULTIMEDIA_IsString(DWORD fdwSound, const void* psz) > +{ > + /* SND_RESOURCE is 0x40004 while > + * SND_MEMORY is 0x00004 > + */ > + switch (fdwSound & SND_RESOURCE) > + { > + case SND_RESOURCE: return HIWORD(psz) != 0; /* by name or by ID ? */ > + case SND_MEMORY: return FALSE; > + /* any other case (SND_ALIAS, SND_FILENAME... shall drop into this one) */ > + case 0: return TRUE; > + default: FIXME("WTF\n"); return FALSE; > + } > +} > + > static BOOL MULTIMEDIA_PlaySound(LPCWSTR pszSound, HMODULE hmod, DWORD fdwSound, DWORD search) > { > WINE_PLAYSOUND* wps = NULL; > @@ -515,10 +531,9 @@ > } while (InterlockedCompareExchangePointer((void**)&iData->lpPlaySound, wps, NULL) != NULL); > > if (fdwSound & SND_ASYNC) { > - if (!((fdwSound & SND_MEMORY) || ((fdwSound & SND_RESOURCE) && > - !((DWORD)pszSound >> 16)) || > - !pszSound)) { > - wps->pszSound = HeapAlloc(GetProcessHeap(), 0, (lstrlenW(pszSound)+1) * sizeof(WCHAR) ); > + if (MULTIMEDIA_IsString(fdwSound, pszSound)) > + { > + wps->pszSound = HeapAlloc(GetProcessHeap(), 0, (lstrlenW(pszSound)+1) * sizeof(WCHAR)); > lstrcpyW((LPWSTR)wps->pszSound, pszSound); > } > wps->bLoop = fdwSound & SND_LOOP; > @@ -541,16 +556,13 @@ > { > LPWSTR pszSoundW; > BOOL bSound; > + > + pszSoundW = (MULTIMEDIA_IsString(fdwSound, pszSoundA)) ? > + HEAP_strdupAtoW(GetProcessHeap(), 0, pszSoundA) : (LPWSTR)pszSoundA; > > - if (!((fdwSound & SND_MEMORY) || > - ((fdwSound & SND_RESOURCE) && !((DWORD)pszSoundA >> 16)) || > - !pszSoundA)) { > - pszSoundW = HEAP_strdupAtoW(GetProcessHeap(), 0, pszSoundA); > - bSound = PlaySoundW(pszSoundW, hmod, fdwSound); > - HeapFree(GetProcessHeap(), 0, pszSoundW); > - } else > - bSound = PlaySoundW((LPWSTR)pszSoundA, hmod, fdwSound); > - > + bSound = PlaySoundW(pszSoundW, hmod, fdwSound); > + if ((void*)pszSoundW != (void*)pszSoundA) HeapFree(GetProcessHeap(), 0, pszSoundW); > + > return bSound; > } > > @@ -585,14 +597,12 @@ > LPWSTR pszSoundW; > BOOL bSound; > > - if (!((uFlags & SND_MEMORY) || > - ((uFlags & SND_RESOURCE) && !((DWORD)pszSoundA >> 16)) || > - !pszSoundA)) { > - pszSoundW = HEAP_strdupAtoW(GetProcessHeap(), 0, pszSoundA); > - bSound = sndPlaySoundW(pszSoundW, uFlags); > + pszSoundW = (MULTIMEDIA_IsString(uFlags, pszSoundA)) ? > + HEAP_strdupAtoW(GetProcessHeap(), 0, pszSoundA) : (LPWSTR)pszSoundA; > + > + bSound = sndPlaySoundW(pszSoundW, uFlags); > + if ((void*)pszSoundW != (void*)pszSoundA) > HeapFree(GetProcessHeap(), 0, pszSoundW); > - } else > - bSound = sndPlaySoundW((LPWSTR)pszSoundA, uFlags); > > return bSound; > } -- Michael Stefaniuc Tel.: +49-711-96437-199 System Administration Fax.: +49-711-96437-111 Red Hat GmbH Email: mstefani(a)redhat.com Hauptstaetterstr. 58 http://www.redhat.de/ D-70178 Stuttgart

1 0

winedefault.reg and .Default user entries
by Sylvain Petreolle 16 May '02

16 May '02

Hi, Looking at recent patches, I saw entries for the user .Default in winedefault.reg. Are these entries useful ? I think not because wine uses the real username to load registry entries from the $HOME/.wine/user.reg. ___________________________________________________________ Do You Yahoo!? -- Une adresse @yahoo.fr gratuite et en français ! Yahoo! Mail : http://fr.mail.yahoo.com

1 0

Re: wine-20020509/dlls/winsock/socket.c
by Francois Gouget 16 May '02

16 May '02

Please, see Warren Baird's (Warren_Baird(a)cimmetry.com) patch on this and my reply to wine-devel. -- Francois Gouget fgouget(a)free.fr http://fgouget.free.fr/ If it stinks, it's chemistry. If it moves, it's biology. If it does not work, It's computer science.

1 0

Re: Patch - check for msghdr.msg_control on Sparc-Solaris
by Francois Gouget 16 May '02

16 May '02

On Thu, 16 May 2002 Warren_Baird(a)cimmetry.com wrote: > > > > ChangeLog: > > - added a test for the msg_control field in struct msghdr > (does't appear in sparc-solaris) I think it would be better to do it using a technique similar to how it is done in scheduler/client.c on line 255: #ifdef HAVE_MSGHDR_ACCRIGHTS msghdr.msg_accrights = (void *)&fd; msghdr.msg_accrightslen = sizeof(fd); #else /* HAVE_MSGHDR_ACCRIGHTS */ cmsg.len = sizeof(cmsg); cmsg.level = SOL_SOCKET; cmsg.type = SCM_RIGHTS; cmsg.fd = fd; msghdr.msg_control = &cmsg; msghdr.msg_controllen = sizeof(cmsg); msghdr.msg_flags = 0; #endif /* HAVE_MSGHDR_ACCRIGHTS */ -- Francois Gouget fgouget(a)free.fr http://fgouget.free.fr/ Dieu dit: "M-x Lumière". Et la lumière fut.

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-devel