wine-devel November 2005

wine-devel@winehq.org

171 participants
353 discussions

Re: winspool/tests: Some extra Tests for GetPrinterDriverDirectory
by Dmitry Timoshkov 14 Nov '05

14 Nov '05

"Detlef Riekenberg" <wine.dev(a)web.de> wrote: > Small update for the winspool - tests. > > > Changelog: > - Display a TRACE, when the Service "spooler" is not running (NT). > - Some extra Tests for GetPrinterDriverDirectory You are testing last error after the API calls but don't set it to a bogus (0xdeadbeef) value before an API call, so this is not clear who is changing last error. -- Dmitry.

1 0

RE: Question about ~/.wine/dosdevices/
by Peter Berg Larsen 14 Nov '05

14 Nov '05

WARNING: it is 3 in the night, and the better part of me said I should have got some sleep before answering. Am Sonntag, den 13.11.2005, 23:53 +0100 schrieb Peter Berg Larsen: >Use one Harddisk, install windows on "C:" and your Programs on "D:". >Add a second Harddisk with a Primary Partition (Drive-Letter has changed >from "D:" to "E:") and see, how many Programs are broken. Every program that uses absolute paths. > > But neither wiki or the docs said anything about this, which was why I > > asked. > Is the warning "Do not use your existing Windows installation as C: in > wine" gone? Properly not, but I do not see this a relevant to me or the question. More below. On Sun, 13 Nov 2005, Vitaliy Margolen wrote: > Can you run a program that you installed on wine in windows? I do not think there is a correlation between this and my questions as "Wine makes it possible to run Windows programs alongside any Unix-like operating system, particularly Linux.". Ms does not state the opposite. (I think is the word "alongside" I am reading wrong here; I would have used "on" or "installed on") > You program looking for "c:\Program Files\". That means "Program Files" > directory on drive c: For wine (in default configuration) c: drive means > ~/.wine/drive_c. Or more precisely where ~/.wine/dosdevices/c: points > to. Answer below. > > with; wine does not support running a program installed under > > /mnt/windows/ I would only had to ask once. > Of corse it does. If you can make program look for it's files somewhere > else. Because that's what you are doing. The path is hardcoded, so I cannot change the behaviour of the program. > And like I've mentioned before, please, don't run programs directly from > your windows drive. That won't make it any better. But that might brake > your windows. Hmm, no you said: > Please never point your c: drive to the real windows drive - that won't > help wine at all but it might brake your windows beyond repair. The difference to me is: A) do not /mnt/windows/program files/railroad tycoon 3 > wine rt3.exe and do not have B) /home/pebl/.wine/dosdevices > ls -l total 0 lrwxrwxrwx 1 pebl pebl 10 Nov 10 17:21 c: -> /mnt/windows/ A implies that I cannot run programs installed under windows. B implies that wine is writing something (to registry whatever) to c: which will brake windows. (Note: B is not my setup) Plenty who have answered have stated B, but I do not see what this has to do with wines ability to run a program installed under windows. As it does not state on the wiki nor the docs that I must have installed the program under wine to expect it to run, I expected wine to do clever things to get it rigth. Like looking in both places or noticing the path of the exe. In either case I had a program that this "clever" mechanism did not worked for, and as I could find any thing clever part in wine I asked wine-devel and not wine-user. Peter

2 1

RE: Question about ~/.wine/dosdevices/
by Peter Berg Larsen 14 Nov '05

14 Nov '05

On Sun, 13 Nov 2005, Michael Druing wrote: > If you don't want to install the game in wine but rather use an existing > Windows installation you should either copy and/or link to your existing > installation, but bear in mind that this might - as others have already > pointed out - break your installation on windows for some reason or another > and is generally not suggested. Ah, ah. This is where I complete fail in my understanding. I had the idea that wine was able to run any window program (modulo registry etc.) no matter how I did the install. You are saing "do not run a windows program unless you installed the program with wine"? (or atleast do not expect it to work). > Wine cannot guess where your existing windows partition is mounted. I saw three solution for that: A) It look at ~/.wine/c:/ and then in /mnt/windows/ B) Notices that the program started in a /mnt/windows/ path. C) If installed under /mnt/windows/ you must manual make some extra links. But neither wiki or the docs said anything about this, which was why I asked. Peter

2 1

Question about ~/.wine/dosdevices/
by Peter Berg Larsen 14 Nov '05

14 Nov '05

I am missing the idear behind how devices are suppose to work. >From the wiki it seems that the dosdevices/c: is use when installing a program under wine. But how are dosdevices/c: related to my /mnt/windows? Are files first looked up in dosdevices/c: and the in /mnt/windows/ if not found? The reason I ask is that icewind dale on /mnt/windows/ does a FindFirstFileA("C:/program...") which wine translates to dosdevice/c: and ofcause does not find anything. Am I suppose to make a link to where the program is installed, as if I had installed it with wine? Peter

7 12

Dragon v7 pref on wine 0.9
by wino＠piments.com 13 Nov '05

13 Nov '05

Hi, I have managed to get this app working on 0.9 with just four dlls in winecfg. Two I believe to br trivial problems due to lack of version info in the buildin dlls. The two giving real, ugly issues are ole32 and rpcrt4. Symptoms are similar. I would like to attack ole32 first since the rest of the ole stuff works and oleaut32 seems to have work very nicely now compared to 20050524, great news there. Things go well at first then I get the following output: trace:loaddll:load_builtin_dll Loaded module L"c:\\windows\\system\\oleacc.dll" : builtin fixme:oleacc:AccessibleObjectFromWindow 0x10070 0 {618736e0-3c3d-11cf-810c-00aa00389b71} 0x7876e504 trace:loaddll:load_native_dll Loaded module L"C:\\Program Files\\ScanSoft\\NaturallySpeaking\\Program\\chartp.dll" : native trace:loaddll:MODULE_FlushModrefs Unloaded module L"C:\\Program Files\\ScanSoft\\NaturallySpeaking\\Program\\DgnMyCmds_enu.dll" : native trace:loaddll:load_native_dll Loaded module L"C:\\Program Files\\ScanSoft\\NaturallySpeaking\\Program\\DgnMyCmds_enu.dll" : native err:ole:RPC_StartRemoting Couldn't register endpoint L"\\pipe\\OLE_000000160000002a" trace:loaddll:load_native_dll Loaded module L"C:\\windows\\speech\\vcmshl.dll" : native trace:loaddll:load_native_dll Loaded module L"C:\\windows\\system\\rpcltc1.dll" : native err:ole:ClientIdentity_QueryMultipleInterfaces IRemUnknown_RemQueryInterface failed with error 0x800706ba err:ole:ClientIdentity_QueryMultipleInterfaces IRemUnknown_RemQueryInterface failed with error 0x800706ba err:x11drv:X11DRV_CreateWindow invalid window height 571100824 err:x11drv:X11DRV_CreateWindow invalid window width -1592141001 err:ntdll:RtlpWaitForCriticalSection section 0x7befd264 "loader.c: loader_section" wait timed out in thread 0019, blocked by 002d, retrying (60 sec) err:ntdll:RtlpWaitForCriticalSection section 0x7befd264 "loader.c: loader_section" wait timed out in thread 002b, blocked by 002d, retrying (60 sec) err:ntdll:RtlpWaitForCriticalSection section 0x7befd264 "loader.c: loader_section" wait timed out in thread 0028, blocked by 002d, retrying (60 sec) err:ntdll:RtlpWaitForCriticalSection section 0x7befd264 "loader.c: loader_section" wait timed out in thread 0027, blocked by 002d, retrying (60 sec) err:ntdll:RtlpWaitForCriticalSection section 0x7befd264 "loader.c: loader_section" wait timed out in thread 0024, blocked by 002d, retrying (60 sec) err:ntdll:RtlpWaitForCriticalSection section 0x7befd264 "loader.c: loader_section" wait timed out in thread 002c, blocked by 002d, retrying (60 sec) ^X [1]+ Stopped WINEDEBUG="+loaddll" wine natspeak The app. get part way through starting but the main window remains part drawn and the app locks up. I need to ctnl-Z the CLI to break in. This leaves two processes running. wineserver -k takes out the server but leaves a zombie wine-preloader that I have to powerdown to kill! Can anyone suggest how to pin this error down? TIA .

3 10

test case pointers?
by Molle Bestefich 13 Nov '05

13 Nov '05

Dmitry Timoshkov wrote: > Molle Bestefich wrote: > > Patching winpos.c to not touch those 4 variables does not seem to > > cause any other regressions (as far as I can see), so my immediate > > thought is that this is the right and correct thing to do. > > you haven't even shown real windows behaviour, or a test case. COULD SOMEONE KNOWLEDGEABLE IN MinMax STUFF KINDLY POINT ME AT: WHAT EXACTLY NEEDS TO BE TESTED Re: ABOVE MENTIONED PATCH + A GUIDE HOW TO CREATE A WINE TEST CASE? (mail quantity doesn't work, maybe turning the volume knob up will :->..) (yes, I do realize I'm a helpless newbie.) Hugs & kisses

2 1

Re: [DDraw] Fix AoE2 font rendering (in most cases)
by Oliver Stieber 13 Nov '05

13 Nov '05

--- Lionel Ulmer <lionel.ulmer(a)free.fr> wrote: > Hi all, > > AoE2 was rendering to a 8 bit off-screen DSurface using GetDC / ReleaseDC > and that without having attached a palette to it... Our DIB engine did not > like this at all which made all fonts come out black. > > The attached patch ('hack' :-) ) simply takes the palette of the front > buffer (if any) and attach it to the DIB before rendering to it. > > Note that the proper fix would be in the DIB engine itself but I have no > idea how to (nor the means to) fix it there (if possible using the X11 > engine we currently have). Hi, Does this fix bug http://bugs.winehq.org/show_bug.cgi?id=2666 including the problems with warblade? Oliver. > Lionel > > Changelog: > - use the front buffer palette for DC operations on off-screen buffers > > -- > Lionel Ulmer - http://www.bbrox.org/ > > Index: dlls/ddraw/surface_main.c > =================================================================== > RCS file: /home/wine/wine/dlls/ddraw/surface_main.c,v > retrieving revision 1.8 > diff -u -r1.8 surface_main.c > --- dlls/ddraw/surface_main.c 10 Nov 2005 12:14:59 -0000 1.8 > +++ dlls/ddraw/surface_main.c 13 Nov 2005 14:08:56 -0000 > @@ -900,6 +900,31 @@ > } > > hr = This->get_dc(This, &This->hDC); > + > + if ((This->surface_desc.u4.ddpfPixelFormat.dwFlags & DDPF_PALETTEINDEXED8) && > + (This->palette == NULL)) { > + IDirectDrawImpl *ddraw = This->ddraw_owner; > + IDirectDrawSurfaceImpl *surf; > + > + for (surf = ddraw->surfaces; surf != NULL; surf = surf->next_ddraw) { > + if (((surf->surface_desc.ddsCaps.dwCaps & (DDSCAPS_PRIMARYSURFACE | DDSCAPS_FRONTBUFFER)) > == (DDSCAPS_PRIMARYSURFACE | DDSCAPS_FRONTBUFFER)) && > + (surf->palette != NULL)) { > + RGBQUAD col[256]; > + IDirectDrawPaletteImpl *pal = surf->palette; > + unsigned int n; > + for (n=0; n<256; n++) { > + col[n].rgbRed = pal->palents[n].peRed; > + col[n].rgbGreen = pal->palents[n].peGreen; > + col[n].rgbBlue = pal->palents[n].peBlue; > + col[n].rgbReserved = 0; > + } > + SetDIBColorTable(This->hDC, 0, 256, col); > + break; > + } > + } > + > + } > + > if (SUCCEEDED(hr)) > { > TRACE("returning %p\n",This->hDC); > > > ___________________________________________________________ To help you stay safe and secure online, we've developed the all new Yahoo! Security Centre. http://uk.security.yahoo.com

2 1

problems with dwarf2
by Oliver Stieber 13 Nov '05

13 Nov '05

Hi, I've been trying to do some graphical debugging with ddd but the dwarf2 keeps crashing with... wine-pthread: dwarf.c:1298: dwarf2_parse_udt_members: Assertion `((void *)0) != entry' failed. wine: Assertion failed at address 0xffffe410 (thread 0009), starting debugger... WineDbg starting on pid 0x8 Unhandled exception: assertion failed in 32-bit code (0xffffe410). In 32 bit mode. Register dump: CS:0073 SS:007b DS:007b ES:007b FS:003b GS:0033 EIP:ffffe410 ESP:7b97e9bc EBP:7b97e9d4 EFLAGS:00200202( - 00 - - I1) EAX:00000000 EBX:0000641c ECX:0000641c EDX:00000006 ESI:7b97e9e8 EDI:b7f85ff4 Stack dump: 0x7b97e9bc: 7b97e9d4 00000006 0000641c b7e9a3e1 0x7b97e9cc: b7f85ff4 b7e6d6b0 7b97eb04 b7e9be0d 0x7b97e9dc: 00000006 7b97e9e8 00000000 00000020 0x7b97e9ec: 00000000 00000000 00000000 00000000 0x7b97e9fc: 00000000 00000000 00000000 00000000 0x7b97ea0c: 00000000 00000000 00000000 00000000 Backtrace: =>1 0xffffe410 (0x7b97e9d4) 2 0xb7e9be0d abort in libc.so.6 (0x7b97eb04) 3 0xb7e93c92 __assert_fail in libc.so.6 (0x7b97eb40) 4 0x7b858aad dwarf2_parse_udt_members(ctx=0x7b97ed34, symt=0x7dcd9d2c) [wine/dlls/dbghelp/dwarf.c:1205] in dbghelp (0x7b97eba0) 5 0x7b859ece dwarf2_parse_compiland+0x4ae(ctx=0x7b97ed34) [wine/dlls/dbghelp/dwarf.c:1394] in dbghelp (0x7b97ec8c) 6 0x7b85be64 dwarf2_parse(module=0x7b4510d8, load_offset=0x7b82b000, debug=0x7dbab2c6, debug_size=0x18f0d, abbrev=0x7db741d3, abbrev_size=0x1fd0, str=0x7db38bd8, str_sz=0x1bcd) [wine/dlls/dbghelp/dwarf.c:2155] in dbghelp (0x7b97ed70) 7 0x7b85cdd9 elf_load_debug_info_from_map+0x6f9(pool=0x7b97ef94, ht_symtab=0x7b97ef8c) [wine/dlls/dbghelp/elf_module.c:897] in dbghelp (0x7b97ef64) 8 0x7b85dcba elf_load_debug_info+0xda(module=0x7b4510d8, fmap=0x7b97f054) [wine/dlls/dbghelp/elf_module.c:979] in dbghelp (0x7b97eff8) 9 0x7b85e1b9 elf_load_file+0x459(load_offset=0x7b82b000, elf_info=0x7b97f268) [wine/dlls/dbghelp/elf_module.c:1109] in dbghelp (0x7b97f0b0) 10 0x7b85e423 elf_search_and_load_file+0xa3(load_offset=0x7b82b000, elf_info=0x7b97f268) [wine/dlls/dbghelp/elf_module.c:1183] in dbghelp (0x7b97f0d4) 11 0x7b85e680 elf_enum_sync_cb+0x20(name=0x7b97f108, addr=0x7b82b000, user=0x7b97f264) [wine/dlls/dbghelp/elf_module.c:1251] in dbghelp (0x7b97f0e4) 12 0x7b85e61b elf_enum_modules_internal(cb=0x7b85e660, user=0x7b97f264) [wine/dlls/dbghelp/elf_module.c:1233] in dbghelp (0x7b97f254) 13 0x7b85e6f3 elf_synchronize_module_list+0x63(pcs=0x7bae5820) [wine/dlls/dbghelp/elf_module.c:1274] in dbghelp (0x7b97f28c) 14 0x7b8611d7 SymLoadModule(hProcess=0x30, hFile=0x0, ImageName=0x7b97f430, ModuleName=0x0, BaseOfDll=0x7b2b0000, SizeOfDll=0x0) [wine/dlls/dbghelp/module.c:340] in dbghelp (0x7b97f3f4) 15 0x7b9a8794 handle_debug_event [wine/programs/winedbg/gdbproxy.c:491] in winedbg (0x7b97f53c) 16 0x7b9acd2e gdb_remote+0x2ce(flags=0x1) [wine/programs/winedbg/gdbproxy.c:2201] in winedbg (0x7b97fe2c) 17 0x7b9b8db9 main(argc=0x2, argv=0x7bae04c0) [wine/programs/winedbg/winedbg.c:1318] in winedbg (0x7b97ff00) 18 0x7b9bd559 __wine_spec_exe_entry+0x99(peb=0x7bc77d40) [wine/dlls/winecrt0/exe_entry.c:37] in winedbg (0x7b97ff20) 19 0x7ba452e0 start_process(arg=0x0) [wine/dlls/kernel/process.c:992] in kernel32 (0x7b97fff4) 20 0xb7fa2e51 wine_switch_to_stack+0x11 in libwine.so.1 (0x00000000) ======================================================================= I'm also having problems when I try to add a break point from winedbg winedbg foo.exe break foo_bar fixme:dbghelp_dwarf:dwarf2_parse_const_type need to generate a name trace:dbghelp_dwarf:dwarf2_parse_compiland_content found entry_code 31 at 0x10ced trace:dbghelp_dwarf:dwarf2_parse_struct_type ctx(0x10cee,1), for 31 trace:dbghelp_dwarf:dwarf2_parse_struct_type found name Mapdesc trace:dbghelp_dwarf:dwarf2_parse_struct_type Unhandled attr at ctx(0x10cf6,1), for attr(attr:0x3c,form:0xc) trace:dbghelp_dwarf:dwarf2_parse_attr (attr:0x3c,form:0xc) trace:dbghelp_dwarf:dwarf2_parse_attr flag<0x1> trace:dbghelp_dwarf:dwarf2_parse_compiland_content found entry_code 6 at 0x10cf7 trace:dbghelp_dwarf:dwarf2_parse_pointer_type ctx(0x10cf8,1), for 6 trace:dbghelp_dwarf:dwarf2_parse_attr_as_ref ref4<0x10ced> trace:dbghelp_dwarf:dwarf2_find_symt_by_ref want ref<0x10ced> trace:dbghelp_dwarf:dwarf2_parse_compiland_content found entry_code 15 at 0x10cfd trace:dbghelp_dwarf:dwarf2_parse_reference_type ctx(0x10cfe,1), for 15 trace:dbghelp_dwarf:dwarf2_parse_reference_type Unhandled attr at ctx(0x10cfe,1), for attr(attr:0xb,form:0xb) trace:dbghelp_dwarf:dwarf2_parse_attr (attr:0xb,form:0xb) trace:dbghelp_dwarf:dwarf2_parse_attr data1<4> trace:dbghelp_dwarf:dwarf2_parse_attr_as_ref ref4<0x10c11> trace:dbghelp_dwarf:dwarf2_find_symt_by_ref want ref<0x10c11> fixme:dbghelp_dwarf:dwarf2_parse_reference_type need to generate a name trace:dbghelp_dwarf:dwarf2_parse_compiland_content found entry_code 15 at 0x10d03 trace:dbghelp_dwarf:dwarf2_parse_reference_type ctx(0x10d04,1), for 15 trace:dbghelp_dwarf:dwarf2_parse_reference_type Unhandled attr at ctx(0x10d04,1), for attr(attr:0xb,form:0xb) trace:dbghelp_dwarf:dwarf2_parse_attr (attr:0xb,form:0xb) trace:dbghelp_dwarf:dwarf2_parse_attr data1<4> trace:dbghelp_dwarf:dwarf2_parse_attr_as_ref ref4<0x10d09> trace:dbghelp_dwarf:dwarf2_find_symt_by_ref want ref<0x10d09> fixme:dbghelp_dwarf:dwarf2_parse_reference_type need to generate a name trace:dbghelp_dwarf:dwarf2_parse_compiland_content found entry_code 7 at 0x10d09 trace:dbghelp_dwarf:dwarf2_parse_const_type ctx(0x10d0a,1), for 7 trace:dbghelp_dwarf:dwarf2_parse_attr_as_ref ref4<0x10c11> trace:dbghelp_dwarf:dwarf2_find_symt_by_ref want ref<0x10c11> fixme:dbghelp_dwarf:dwarf2_parse_const_type need to generate a name trace:dbghelp_dwarf:dwarf2_parse_compiland_content found entry_code 32 at 0x10d0e trace:dbghelp_dwarf:dwarf2_parse_subprogram ctx(0x10d0f,1), for 32 trace:dbghelp_dwarf:dwarf2_parse_attr_as_ref ref4<0x10d4e> trace:dbghelp_dwarf:dwarf2_parse_subprogram Unhandled attr at ctx(0x10d13,1), for attr(attr:0x47,form:0x13) trace:dbghelp_dwarf:dwarf2_parse_attr (attr:0x47,form:0x13) trace:dbghelp_dwarf:dwarf2_parse_attr_as_ref ref4<0x10804> trace:dbghelp_dwarf:dwarf2_parse_subprogram Unhandled attr at ctx(0x10d17,1), for attr(attr:0x3a,form:0xb) trace:dbghelp_dwarf:dwarf2_parse_attr (attr:0x3a,form:0xb) trace:dbghelp_dwarf:dwarf2_parse_attr data1<1> trace:dbghelp_dwarf:dwarf2_parse_subprogram Unhandled attr at ctx(0x10d18,1), for attr(attr:0x3b,form:0xb) trace:dbghelp_dwarf:dwarf2_parse_attr (attr:0x3b,form:0xb) trace:dbghelp_dwarf:dwarf2_parse_attr data1<67> trace:dbghelp_dwarf:dwarf2_parse_subprogram Unhandled attr at ctx(0x10d21,1), for attr(attr:0x40,form:0xa) trace:dbghelp_dwarf:dwarf2_parse_attr (attr:0x40,form:0xa) Exception c0000005 Wine-dbg> is there an easy way to turn of the dwarf2 code? Thanks, Oliver. ___________________________________________________________ Yahoo! Messenger - NEW crystal clear PC to PC calling worldwide with voicemail http://uk.messenger.yahoo.com

1 0

[RFC] winecfg audio driver test
by Robert Reif 13 Nov '05

13 Nov '05

This is a proof of concept patch that adds a simple audio test to winecfg. All it does is use PlaySound to play a wave file. I am using LoadLibrary("winmm.dll") and FreeLibrary to change drivers. You must press the apply button for the driver change to take effect. There is no error recovery for a missing winmm.dll. The wave file name is in the rc file so a different file can be played for each language. This is probably overkill. I'm not sure where to put the wave file so the program will only work when the wave file is in the current directory. The wave file can be found here: http://home.earthlink.net/~reif/winecfg.en.wav or you can rename any old wave file to: winecfg.en.wav. Comments please? Index: programs/winecfg/En.rc =================================================================== RCS file: /home/wine/wine/programs/winecfg/En.rc,v retrieving revision 1.54 diff -p -u -r1.54 En.rc --- programs/winecfg/En.rc 27 Oct 2005 11:24:02 -0000 1.54 +++ programs/winecfg/En.rc 12 Nov 2005 04:21:54 -0000 @@ -157,13 +157,14 @@ BEGIN COMBOBOX IDC_AUDIO_DRIVER,70,18,85,85,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "Autodetect",IDC_AUDIO_AUTODETECT,170,20,49,14 PUSHBUTTON "Configure",IDC_AUDIO_CONFIGURE,170,40,49,14 - PUSHBUTTON "Control Panel",IDC_AUDIO_CONTROL_PANEL,170,60,49,14 + PUSHBUTTON "Test",IDC_AUDIO_TEST,170,60,49,14 + PUSHBUTTON "Control Panel",IDC_AUDIO_CONTROL_PANEL,170,80,49,14 - GROUPBOX " DirectSound ",IDC_STATIC,8,75,244,120 + GROUPBOX " DirectSound ",IDC_STATIC,8,95,244,120 - LTEXT "Hardware Acceleration: ",IDC_STATIC,15,85,90,10 - COMBOBOX IDC_DSOUND_HW_ACCEL,100,83,150,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - CONTROL "Driver Emulation",IDC_DSOUND_DRV_EMUL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,100,230,10 + LTEXT "Hardware Acceleration: ",IDC_STATIC,15,105,90,10 + COMBOBOX IDC_DSOUND_HW_ACCEL,100,103,150,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + CONTROL "Driver Emulation",IDC_DSOUND_DRV_EMUL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,120,230,10 END @@ -197,6 +198,9 @@ BEGIN IDS_WINECFG_TITLE "Wine configuration" IDS_THEMEFILE "Theme files" IDS_THEMEFILE_SELECT "Select a theme file" + IDS_AUDIO_FILE "winecfg.en.wav" + IDS_AUDIO_DONE "Done playing: " + IDS_AUDIO_ERROR "Couldn't play: " END Index: programs/winecfg/Makefile.in =================================================================== RCS file: /home/wine/wine/programs/winecfg/Makefile.in,v retrieving revision 1.15 diff -p -u -r1.15 Makefile.in --- programs/winecfg/Makefile.in 24 Aug 2005 10:59:40 -0000 1.15 +++ programs/winecfg/Makefile.in 12 Nov 2005 04:21:54 -0000 @@ -4,7 +4,7 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = winecfg.exe APPMODE = -mwindows -IMPORTS = comdlg32 comctl32 shell32 ole32 winmm shlwapi uxtheme user32 advapi32 kernel32 +IMPORTS = comdlg32 comctl32 shell32 ole32 shlwapi uxtheme user32 advapi32 kernel32 C_SRCS = \ appdefaults.c \ Index: programs/winecfg/audio.c =================================================================== RCS file: /home/wine/wine/programs/winecfg/audio.c,v retrieving revision 1.15 diff -p -u -r1.15 audio.c --- programs/winecfg/audio.c 3 Nov 2005 19:31:45 -0000 1.15 +++ programs/winecfg/audio.c 12 Nov 2005 04:21:54 -0000 @@ -52,6 +52,13 @@ static const char* DSound_HW_Accels[] = NULL }; +static HINSTANCE hWINMM = 0; + +HDRVR (WINAPI * pOpenDriverA)(LPCSTR lpDriverName, LPCSTR lpSectionName, LONG lParam); +LRESULT (WINAPI *pSendDriverMessage)(HDRVR hdrvr, UINT msg, LONG lParam1, LONG lParam2); +LRESULT (WINAPI *pCloseDriver)(HDRVR hdrvr, LONG lParam1, LONG lParam2); +BOOL (WINAPI *pPlaySoundW)(LPCWSTR pszSound, HMODULE hmod, DWORD fdwSound); + /* Select the correct entry in the combobox based on drivername */ static void selectAudioDriver(HWND hDlg, const char *drivername) { @@ -89,19 +96,19 @@ static void configureAudioDriver(HWND hD HDRVR hdrvr; char wine_driver[MAX_NAME_LENGTH + 8]; sprintf(wine_driver, "wine%s.drv", pAudioDrv->szDriver); - hdrvr = OpenDriverA(wine_driver, 0, 0); + hdrvr = pOpenDriverA(wine_driver, 0, 0); if (hdrvr != 0) { - if (SendDriverMessage(hdrvr, DRV_QUERYCONFIGURE, 0, 0) != 0) + if (pSendDriverMessage(hdrvr, DRV_QUERYCONFIGURE, 0, 0) != 0) { DRVCONFIGINFO dci; LONG lRes; dci.dwDCISize = sizeof (dci); dci.lpszDCISectionName = NULL; dci.lpszDCIAliasName = NULL; - lRes = SendDriverMessage(hdrvr, DRV_CONFIGURE, 0, (LONG)&dci); + lRes = pSendDriverMessage(hdrvr, DRV_CONFIGURE, 0, (LONG)&dci); } - CloseDriver(hdrvr, 0, 0); + pCloseDriver(hdrvr, 0, 0); } else { @@ -116,6 +123,26 @@ static void configureAudioDriver(HWND hD } } +static void loadWinmm() +{ + hWINMM = LoadLibrary("winmm.dll"); + if (!hWINMM) { + WINE_ERR("winmm.dll not found\n"); + /* FIXME do something */ + } + + pOpenDriverA = (void*)GetProcAddress(hWINMM, "OpenDriverA"); + pSendDriverMessage = (void*)GetProcAddress(hWINMM, "SendDriverMessage"); + pCloseDriver = (void*)GetProcAddress(hWINMM, "CloseDriver"); + pPlaySoundW = (void*)GetProcAddress(hWINMM, "PlaySoundW"); + + if (!pOpenDriverA || !pSendDriverMessage || !pCloseDriver || !pPlaySoundW) + { + WINE_ERR("winmm.dll not all entries found\n"); + /* FIXME do something */ + } +} + static void initAudioDlg (HWND hDlg) { char *curAudioDriver = get_reg_key(config_key, "Drivers", "Audio", "alsa"); @@ -125,6 +152,8 @@ static void initAudioDlg (HWND hDlg) WINE_TRACE("\n"); + loadWinmm(); + pAudioDrv = getAudioDrivers (); for (i = 0; *pAudioDrv->szName; i++, pAudioDrv++) { SendDlgItemMessage (hDlg, IDC_AUDIO_DRIVER, CB_ADDSTRING, @@ -272,6 +301,33 @@ AudioDlgProc (HWND hDlg, UINT uMsg, WPAR configureAudioDriver(hDlg, (char*)pAudioDrv[selected_driver].szDriver); } break; + case IDC_AUDIO_TEST: + { + WCHAR wave_file[MAX_PATH]; + WCHAR format[] = { '%','s','%','s',0 }; + WCHAR title[64]; + + LoadStringW(GetModuleHandle(NULL), IDS_AUDIO_FILE, wave_file, sizeof(wave_file)/sizeof(wave_file[0])); + LoadStringW(GetModuleHandle(NULL), IDS_WINECFG_TITLE, title, sizeof(title)/sizeof(title[0])); + + if (pPlaySoundW(wave_file, NULL, SND_FILENAME)) { + WCHAR done_msg[MAX_PATH + 64]; + WCHAR wave_done[64]; + + LoadStringW(GetModuleHandle(NULL), IDS_AUDIO_DONE, wave_done, sizeof(wave_done)/sizeof(wave_done[0])); + wsprintfW(done_msg, format, wave_done, wave_file); + MessageBoxW(NULL, done_msg, title, MB_OK); + pPlaySoundW(NULL, NULL, SND_FILENAME | SND_LOOP); + } else { + WCHAR error_msg[MAX_PATH + 64]; + WCHAR wave_error[64]; + + LoadStringW(GetModuleHandle(NULL), IDS_AUDIO_ERROR, wave_error, sizeof(wave_error)/sizeof(wave_error[0])); + wsprintfW(error_msg, format, wave_error, wave_file); + MessageBoxW(NULL, error_msg, title, MB_OK); + } + } + break; case IDC_AUDIO_CONTROL_PANEL: MessageBox(NULL, "Launching audio control panel not implemented yet!", "Fixme", MB_OK | MB_ICONERROR); break; @@ -305,6 +361,10 @@ AudioDlgProc (HWND hDlg, UINT uMsg, WPAR SetWindowLongPtr(hDlg, DWLP_MSGRESULT, FALSE); break; case PSN_APPLY: + /* unload the current sound driver */ + while (FreeLibrary(hWINMM)); + /* load the new driver */ + loadWinmm(); apply(); SetWindowLongPtr(hDlg, DWLP_MSGRESULT, PSNRET_NOERROR); break; Index: programs/winecfg/resource.h =================================================================== RCS file: /home/wine/wine/programs/winecfg/resource.h,v retrieving revision 1.33 diff -p -u -r1.33 resource.h --- programs/winecfg/resource.h 27 Oct 2005 11:24:02 -0000 1.33 +++ programs/winecfg/resource.h 12 Nov 2005 04:21:54 -0000 @@ -39,6 +39,9 @@ #define IDS_WINECFG_TITLE 13 #define IDS_THEMEFILE 14 #define IDS_THEMEFILE_SELECT 15 +#define IDS_AUDIO_FILE 16 +#define IDS_AUDIO_DONE 17 +#define IDS_AUDIO_ERROR 18 #define IDD_MAINDLG 101 #define IDB_WINE 104 #define IDD_ABOUTCFG 107 @@ -136,9 +139,10 @@ #define IDC_AUDIO_AUTODETECT 1300 #define IDC_AUDIO_DRIVER 1301 #define IDC_AUDIO_CONFIGURE 1302 -#define IDC_AUDIO_CONTROL_PANEL 1303 -#define IDC_DSOUND_HW_ACCEL 1304 -#define IDC_DSOUND_DRV_EMUL 1305 +#define IDC_AUDIO_TEST 1303 +#define IDC_AUDIO_CONTROL_PANEL 1304 +#define IDC_DSOUND_HW_ACCEL 1305 +#define IDC_DSOUND_DRV_EMUL 1306 /* appearance tab */ #define IDC_THEME_COLORCOMBO 1401

5 11

Brain Storming Regarding Winapt - Package Management for Windows
by Shlomi Fish 13 Nov '05

13 Nov '05

Hi good people! I have an idea for a Windows-based open source project, that also has a lot of commercial value. The idea is Winapt: http://winapt.berlios.de/ Once finished, it will be an implementation of package management and dependency resolution for Windows (similar to dpkg+apt, or rpm+apt/urpmi/yum, etc.). On the site you can find an executive summary, and the beginning of the design document. I'd like to brain storm about this idea, and that people (after reading the documents) tell me what issues and obstacles those who desire in accopmlishing such a task will face, and suggest possible solutions. While I am an experienced programmer, I am not a very experienced Windows systems programmer. I did do some programming for Windows, but it was mostly GUI or MFC or simple things like opening files. (many times using the POSIX primitives). I am sending this message here because some of you guys are Win32 experts. Regards, Shlomi Fish ------------------------------------------ Shlomi Fish http://www.shlomifish.org/ If his programming is anything like his philosophizing, he would find 10 imaginary bugs in the "Hello World" program.

2 1

← Newer
1
...
17
18
19
20
21
22
23
...
36
Older →

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 November 2005