- Wine-Devel - list.winehq.org

building programs
by Ivan Leo Puoti March 8, 2005

March 8, 2005

I've got the impression that during program building (clock, notepad etc.) a spec file for them is created on the fly, can someone confirm/dispute this? Ivan.

5 11

Re:avicap32 patch
by luis lenders March 8, 2005

March 8, 2005

Hi That patch won't work. You forgot to include the changes in the headers in vfw.h I've sent you, e.g. #define WM_CAP_START WM_USER #define WM_CAP_UNICODE_START (WM_USER +100) #define WM_CAP_DRIVER_CONNECT (WM_CAP_START+ 10) #define WM_CAP_DRIVER_DISCONNECT (WM_CAP_START+ 11) etcera and the macros #define capDriverConnect(hwnd, index) SendMessage((hwnd), WM_CAP_DRIVER_CONNECT, (index, 0)) etcetera etcetera furthermore all the v4l stuff has to go into a seperate driver file i think, as wine is also supposed to run on non-Linux distributions. this line in avicap_main : window = CreateWindowExW etc. and the registering of the window contains a lot of crap; i just copied it from a site somewhere on the internet. It was just to get a handle to the window Somehow the dwstyle has to get passed on, and few other things. Futhermore: no need to link to -lpng -ljpeg and -lnetpbm; they're not needed anymore in the code i've sent you. Better think, get more info and be more carefull before you send in a patch i think. Anyway, i smashed together some code with which i can grab an image from my cam, and save it as a DIB (capFileSaveDIB). also i wrote something for cappreview, which looks as if it would be easy to get it running. if someone's interested i could send you the code. Now my question is: maybe one of the developers could just help/hint/write the Capcreatecapturewindow part (that seems to me a very little job), then anyone who wants could try to write a macro; just a thought of me, any thoughts from someone else? Regards Send instant messages to your online friends http://uk.messenger.yahoo.com

1 0

Discussion on Bug tracking database
by Ann and Jason Edmeades March 8, 2005

March 8, 2005

Hello, I thought I'd try to start a discussion to try to encourage changes in the bug tracking, but it would both require agreement and someone (else) who could physically make the changes. Is it me or is our bug tracking database not really working the way it should? Firstly I'd like to thank Tony - he seems to do a lot of maintaining of the bug database and deserves a lot of credit. Until I started looking through them and monitoring the bug mailing list, I didn't realize how much he did. Bug database problems.. 1. Some problems reports start off as useless. Its not a bug report, its more a call for assistance. 2. Some bug reports are severely out of date. A large number of them have as a last update a request to test on a more recent cvs (which is a fair thing to do if the bugs are left idle for eg. 1 year! 3. We have a large number who due to our inactivity mean the person who raised it no longer cares, so any questions are a waste of time and come back unanswered 4. We have some where the email address of the raise has changed so even if they care they may not notice any changes to the bug report 5. Its hard to tell the bugs you can reproduce with downloadable freeware from those that require expensive software Suggestions.... 1. I would like to get implemented an AUTOMATIC timeout on the bug reports. If they are inactive for eg. 4 months then an automatic update is added to them asking to try latest cvs and confirm the problem still exists. If the problem is not updated within a month, the bug report gets automatically closed with a specific code (eg. CLOSED/inactivity). 2. I would like a clear way to identify if the problem can be reproduced with **free** downloadable software, eg a demo, freeware, shareware etc. This should be searchable for people wanting a quick bug fix 3. I would like there to be a transition from an initial state before being accepted, which basically allows rejection of a bug report if there is not enough information in it. Unfortunately someone would have to actively do this, so this would be a very had one to achieve. 4. I would also like a bug fixing period of time, when all wine developers are encouraged to work on bugs for eg. one day a month. Interestingly, even though most people seem to end up working in a particular area they may not handle bugs in that area (probably because they don't check for them!). How many of the wine developers would consider allocating time once a month (even if its just an hour!) to look at a bug report, perhaps try it or go back asking for appropriate traces etc. I know some of this can be achieved by 'proper' use of the bug states, keywords etc, but we don't...! Anyway, I thought I would start a discussion, so you know my thoughts - what are other peoples. Jason

5 6

Why not build wine server as a linux kernel module?
by 苏杭 March 8, 2005

March 8, 2005

Hi, May I ask you a question? Why not build wine server as a linux kernel module? I think the performance of a kernel module is better than a separate process. If anyone can give me a reasonable answer, I would really appreciate it. Hang Su

1 0

Re: advapi32 registry.c test failures on windows
by James Hawkins March 7, 2005

March 7, 2005

On Mon, 7 Mar 2005 00:28:13 -0800 (PST), Aaron Arvey <aarvey(a)cs.hmc.edu> wrote: > There were 28 failures when I ran the advapi32 tests on windows. All these > were in registry.c. Please see > http://www.winehq.org/hypermail/wine-devel/2005/02/0045.html and the > following responses to find out where/when/why/how these bugs were > introduced. > > After patch is applied, the registry.c runs without errors on Windows XP > and 98. When ran in wine, there are now 28 todos. > > Aaron > > Changelog: > * dlls/advapi32/tests/registry.c > altered tests so that they run under windows > > Signed-off-by: Aaron Arvey <aarvey_at_cs.hmc.edu> > > Index: dlls/advapi32/tests/registry.c > =================================================================== > RCS file: /home/wine/wine/dlls/advapi32/tests/registry.c,v > retrieving revision 1.11 > diff -u -3 -p -u -r1.11 registry.c > --- dlls/advapi32/tests/registry.c 27 Jan 2005 11:15:00 -0000 1.11 > +++ dlls/advapi32/tests/registry.c 17 Feb 2005 04:00:13 -0000 > @@ -80,6 +80,7 @@ static void test_enum_value(void) > DWORD val_count, data_count, type; > static const WCHAR foobarW[] = {'f','o','o','b','a','r',0}; > static const WCHAR testW[] = {'T','e','s','t',0}; > + static const WCHAR test1W[] = {'T','e','s','t','1',0}; > static const WCHAR xxxW[] = {'x','x','x','x','x','x','x','x',0}; > > /* check NULL data with zero length */ > @@ -105,8 +106,12 @@ static void test_enum_value(void) > res = RegEnumValueA( hkey_main, 0, value, &val_count, NULL, &type, data, &data_count ); > ok( res == ERROR_MORE_DATA, "expected ERROR_MORE_DATA, got %ld\n", res ); > ok( val_count == 2, "val_count set to %ld\n", val_count ); > - ok( data_count == 7, "data_count set to %ld instead of 7\n", data_count ); > - ok( type == REG_SZ, "type %ld is not REG_SZ\n", type ); > + todo_wine{ > + ok( data_count == 24, "data_count set to %ld instead of 24\n", data_count ); > + } > + todo_wine{ > + ok( type == REG_EXPAND_SZ, "type %ld is not REG_EXPAND_SZ\n", type ); > + } > ok( !strcmp( value, "xxxxxxxxxx" ), "value set to '%s'\n", value ); > ok( !strcmp( data, "xxxxxxxxxx" ), "data set to '%s'\n", data ); > > @@ -120,8 +125,12 @@ static void test_enum_value(void) > ok( res == ERROR_MORE_DATA, "expected ERROR_MORE_DATA, got %ld\n", res ); > /* Win9x returns 2 as specified by MSDN but NT returns 3... */ > ok( val_count == 2 || val_count == 3, "val_count set to %ld\n", val_count ); > - ok( data_count == 7, "data_count set to %ld instead of 7\n", data_count ); > - ok( type == REG_SZ, "type %ld is not REG_SZ\n", type ); > + todo_wine{ > + ok( data_count == 24, "data_count set to %ld instead of 24\n", data_count ); > + } > + todo_wine{ > + ok( type == REG_EXPAND_SZ, "type %ld is not REG_EXPAND_SZ\n", type ); > + } > #if 0 > /* v5.1.2600.0 (XP Home) does not touch value or data in this case */ > ok( !strcmp( value, "Te" ), "value set to '%s' instead of 'Te'\n", value ); > @@ -137,8 +146,12 @@ static void test_enum_value(void) > res = RegEnumValueA( hkey_main, 0, value, &val_count, NULL, &type, data, &data_count ); > ok( res == ERROR_MORE_DATA, "expected ERROR_MORE_DATA, got %ld\n", res ); > ok( val_count == 0, "val_count set to %ld\n", val_count ); > - ok( data_count == 7, "data_count set to %ld instead of 7\n", data_count ); > - ok( type == REG_SZ, "type %ld is not REG_SZ\n", type ); > + todo_wine{ > + ok( data_count == 24, "data_count set to %ld instead of 24\n", data_count ); > + } > + todo_wine{ > + ok( type == REG_EXPAND_SZ, "type %ld is not REG_EXPAND_SZ\n", type ); > + } > ok( !strcmp( value, "xxxxxxxxxx" ), "value set to '%s'\n", value ); > #if 0 > /* v5.1.2600.0 (XP Home) does not touch data in this case */ > @@ -154,8 +167,12 @@ static void test_enum_value(void) > res = RegEnumValueA( hkey_main, 0, value, &val_count, NULL, &type, data, &data_count ); > ok( res == ERROR_MORE_DATA, "expected ERROR_MORE_DATA, got %ld\n", res ); > ok( val_count == 20, "val_count set to %ld\n", val_count ); > - ok( data_count == 7, "data_count set to %ld instead of 7\n", data_count ); > - ok( type == REG_SZ, "type %ld is not REG_SZ\n", type ); > + todo_wine{ > + ok( data_count == 24, "data_count set to %ld instead of 24\n", data_count ); > + } > + todo_wine{ > + ok( type == REG_EXPAND_SZ, "type %ld is not REG_EXPAND_SZ\n", type ); > + } > ok( !strcmp( value, "xxxxxxxxxx" ), "value set to '%s'\n", value ); > ok( !strcmp( data, "xxxxxxxxxx" ), "data set to '%s'\n", data ); > > @@ -166,12 +183,25 @@ static void test_enum_value(void) > strcpy( value, "xxxxxxxxxx" ); > strcpy( data, "xxxxxxxxxx" ); > res = RegEnumValueA( hkey_main, 0, value, &val_count, NULL, &type, data, &data_count ); > - ok( res == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %ld\n", res ); > - ok( val_count == 4, "val_count set to %ld instead of 4\n", val_count ); > - ok( data_count == 7, "data_count set to %ld instead of 7\n", data_count ); > - ok( type == REG_SZ, "type %ld is not REG_SZ\n", type ); > - ok( !strcmp( value, "Test" ), "value is '%s' instead of Test\n", value ); > - ok( !strcmp( data, "foobar" ), "data is '%s' instead of foobar\n", data ); > + todo_wine{ > + ok( res == ERROR_MORE_DATA, "expected ERROR_MORE_DATA, got %ld\n", res ); > + } > + todo_wine{ > + ok( val_count == 20, "val_count set to %ld instead of 20\n", val_count ); > + } > + todo_wine{ > + ok( data_count == 24, "data_count set to %ld instead of 24\n", data_count ); > + } > + todo_wine{ > + ok( type == REG_EXPAND_SZ, "type %ld is not REG_EXPAND_SZ\n", type ); > + } > + todo_wine{ > + ok( !strcmp( value, "xxxxxxxxxx" ), "value is '%s' instead of xxxxxxxxxx\n", value ); > + } > + todo_wine{ > + ok( !strcmp( data, "xxxxxxxxxx" ), "data is '%s' instead of xxxxxxxxxx\n", data ); > + } > + > > /* Unicode tests */ > > @@ -190,8 +220,12 @@ static void test_enum_value(void) > res = RegEnumValueW( hkey_main, 0, valueW, &val_count, NULL, &type, (BYTE*)dataW, &data_count ); > ok( res == ERROR_MORE_DATA, "expected ERROR_MORE_DATA, got %ld\n", res ); > ok( val_count == 2, "val_count set to %ld\n", val_count ); > - ok( data_count == 7*sizeof(WCHAR), "data_count set to %ld instead of 7*sizeof(WCHAR)\n", data_count ); > - ok( type == REG_SZ, "type %ld is not REG_SZ\n", type ); > + todo_wine{ > + ok( data_count == 24*sizeof(WCHAR), "data_count set to %ld instead of 24*sizeof(WCHAR)\n", data_count ); > + } > + todo_wine{ > + ok( type == REG_EXPAND_SZ, "type %ld is not REG_EXPAND_SZ\n", type ); > + } > ok( !memcmp( valueW, xxxW, sizeof(xxxW) ), "value modified\n" ); > ok( !memcmp( dataW, xxxW, sizeof(xxxW) ), "data modified\n" ); > > @@ -204,8 +238,12 @@ static void test_enum_value(void) > res = RegEnumValueW( hkey_main, 0, valueW, &val_count, NULL, &type, (BYTE*)dataW, &data_count ); > ok( res == ERROR_MORE_DATA, "expected ERROR_MORE_DATA, got %ld\n", res ); > ok( val_count == 3, "val_count set to %ld\n", val_count ); > - ok( data_count == 7*sizeof(WCHAR), "data_count set to %ld instead of 7*sizeof(WCHAR)\n", data_count ); > - ok( type == REG_SZ, "type %ld is not REG_SZ\n", type ); > + todo_wine{ > + ok( data_count == 24*sizeof(WCHAR), "data_count set to %ld instead of 24*sizeof(WCHAR)\n", data_count ); > + } > + todo_wine{ > + ok( type == REG_EXPAND_SZ, "type %ld is not REG_EXPAND_SZ\n", type ); > + } > ok( !memcmp( valueW, xxxW, sizeof(xxxW) ), "value modified\n" ); > ok( !memcmp( dataW, xxxW, sizeof(xxxW) ), "data modified\n" ); > > @@ -217,10 +255,18 @@ static void test_enum_value(void) > memcpy( dataW, xxxW, sizeof(xxxW) ); > res = RegEnumValueW( hkey_main, 0, valueW, &val_count, NULL, &type, (BYTE*)dataW, &data_count ); > ok( res == ERROR_MORE_DATA, "expected ERROR_MORE_DATA, got %ld\n", res ); > - ok( val_count == 4, "val_count set to %ld instead of 4\n", val_count ); > - ok( data_count == 7*sizeof(WCHAR), "data_count set to %ld instead of 7*sizeof(WCHAR)\n", data_count ); > - ok( type == REG_SZ, "type %ld is not REG_SZ\n", type ); > - ok( !memcmp( valueW, testW, sizeof(testW) ), "value is not 'Test'\n" ); > + todo_wine{ > + ok( val_count == 5, "val_count set to %ld instead of 5\n", val_count ); > + } > + todo_wine{ > + ok( data_count == 24*sizeof(WCHAR), "data_count set to %ld instead of 24*sizeof(WCHAR)\n", data_count ); > + } > + todo_wine{ > + ok( type == REG_EXPAND_SZ, "type %ld is not REG_EXPAND_SZ\n", type ); > + } > + todo_wine{ > + ok( !memcmp( valueW, test1W, sizeof(test1W) ), "value is not 'Test1'\n" ); > + } > ok( !memcmp( dataW, xxxW, sizeof(xxxW) ), "data modified\n" ); > > /* no overflow */ > @@ -230,12 +276,25 @@ static void test_enum_value(void) > memcpy( valueW, xxxW, sizeof(xxxW) ); > memcpy( dataW, xxxW, sizeof(xxxW) ); > res = RegEnumValueW( hkey_main, 0, valueW, &val_count, NULL, &type, (BYTE*)dataW, &data_count ); > - ok( res == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %ld\n", res ); > - ok( val_count == 4, "val_count set to %ld instead of 4\n", val_count ); > - ok( data_count == 7*sizeof(WCHAR), "data_count set to %ld instead of 7*sizeof(WCHAR)\n", data_count ); > - ok( type == REG_SZ, "type %ld is not REG_SZ\n", type ); > - ok( !memcmp( valueW, testW, sizeof(testW) ), "value is not 'Test'\n" ); > - ok( !memcmp( dataW, foobarW, sizeof(foobarW) ), "data is not 'foobar'\n" ); > + todo_wine{ > + ok( res == ERROR_MORE_DATA, "expected ERROR_MORE_DATA, got %ld\n", res ); > + } > + todo_wine{ > + ok( val_count == 5, "val_count set to %ld instead of 5\n", val_count ); > + } > + todo_wine{ > + ok( data_count == 24*sizeof(WCHAR), "data_count set to %ld instead of 24*sizeof(WCHAR)\n", data_count ); > + } > + todo_wine{ > + ok( type == REG_EXPAND_SZ, "type %ld is not REG_EXPAND_SZ\n", type ); > + } > + todo_wine{ > + ok( !memcmp( valueW, test1W, sizeof(test1W) ), "value is not 'Test1'\n" ); > + } > + todo_wine{ > + ok( !memcmp( dataW, xxxW, sizeof(xxxW) ), "data modified\n" ); > + } > + > > CLEANUP: > /* cleanup */ > @@ -252,6 +311,12 @@ static void test_query_value_ex() > ok(ret == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %ld\n", ret); > ok(size == strlen(sTestpath1) + 1, "(%ld,%ld)\n", (DWORD)strlen(sTestpath1) + 1, size); > ok(type == REG_SZ, "type %ld is not REG_SZ\n", type); > + > + > + > + ret = RegQueryValueExA(hkey_main, "TestStringNotIn", NULL, &type, NULL, &size); > + ok(ret == ERROR_FILE_NOT_FOUND, "expected ERROR_FILE_NOT_FOUND, got %ld\n", ret); > + > } > > START_TEST(registry) It would help wine if you could make these tests pass on wine. Also, have a look at the test results at test.winehq.org/data. I see that 26 of the tests fail on 95, 24 fail on 98, and 28 for >= nt4. If you have any questions fixing the reg tests, I'd be glad to help. Make sure to cc wine-devel. -- James Hawkins

1 0

Re: Resend : Implements MIIM_BITMAP state in menus
by Alexandre Julliard March 7, 2005

March 7, 2005

Maxime Bellengé <maxime.bellenge(a)wanadoo.fr> writes: > + * drawhbmbitmap : True to draw the hbmbitmap(MIIM_BITMAP)/False to draw the MF_BITMAP > */ > -static void MENU_DrawBitmapItem( HDC hdc, MENUITEM *lpitem, const RECT *rect, BOOL menuBar ) > +static void MENU_DrawBitmapItem( HDC hdc, MENUITEM *lpitem, const RECT *rect, BOOL menuBar, BOOL drawhbmbitmap ) What's the point of passing the drawhbmbitmap flag since you always set it to TRUE? > @@ -762,14 +773,15 @@ > int h = rect->bottom - rect->top; > int bmp_xoffset = 0; > int left, top; > + HBITMAP swtch = (drawhbmbitmap)?lpitem->hbmpItem:(HBITMAP)lpitem->text; That's a strange variable name for a bitmap... > + /* New style MIIM_BITMAP */ > + if (lpitem->hbmpItem) > + { > + if (lpitem->hbmpItem == HBMMENU_CALLBACK) > + { > + MEASUREITEMSTRUCT measItem; > + measItem.CtlType = ODT_MENU; > + measItem.CtlID = 0; > + measItem.itemID = lpitem->wID; > + measItem.itemWidth = lpitem->rect.right - lpitem->rect.left; > + measItem.itemHeight = lpitem->rect.bottom - lpitem->rect.top; > + measItem.itemData = lpitem->dwItemData; > + > + SendMessageW( hwndOwner, WM_MEASUREITEM, lpitem->wID, (LPARAM)&measItem); > + > + /* Keep the size of the bitmap in callback mode to be able to draw it correctly */ > + lppop->bmpSize.cx = max(lppop->bmpSize.cx, measItem.itemWidth - (lpitem->rect.right - lpitem->rect.left)); > + lppop->bmpSize.cy = max(lppop->bmpSize.cy, measItem.itemHeight - (lpitem->rect.bottom - lpitem->rect.top)); Why do you store the bitmap size in the parent popup? What if there are multiple items with bitmaps? -- Alexandre Julliard julliard(a)winehq.org

2 2

Trace from Page Plus 5
by Andrew Neil Ramage March 7, 2005

March 7, 2005

I tried to start Page Plus 5, a DTP program from Serif. I was presented with a dialog asking for me to select a printer. When I OK'ed that, with the splash screen still showing, wine crashed. Here is the trace. [andrew(a)zeus Program]$ wine pp.exe fixme:commdlg:PRINTDLG_OpenDefaultPrinter Could not open printer EPSONStylusC42?! fixme:commdlg:PRINTDLG_OpenDefaultPrinter Could not open printer EPSONStylusC42?! wine: Unhandled exception (thread 0009), starting debugger... WineDbg starting on pid 0x8 Unhandled exception: page fault on read access to 0x00000000 in 32-bit code (0x00447977). In 32 bit mode. Register dump: CS:0073 SS:007b DS:007b ES:007b FS:003b GS:0033 EIP:00447977 ESP:406aeadc EBP:406aeb00 EFLAGS:00210206( - 00 - RIP1) EAX:00000000 EBX:4056c508 ECX:00000002 EDX:406ae940 ESI:40361bfe EDI:00631c67 Stack dump: 0x406aeadc: 00000000 406aec5c 00001012 00000000 0x406aeaec: 00000000 406aec58 00631c67 40361bfe 0x406aeafc: 4056c508 406aecd4 0044988c 00000000 0x406aeb0c: 406aec5c 00000003 406aec58 00631c67 0x406aeb1c: 40361bfe 4056c508 406aeb40 406aeb84 0x406aeb2c: 00000040 406aec34 40045bd3 4020b864 Backtrace: =>1 0x00447977 in pp (+0x47977) (0x406aeb00) 2 0x0044988c in pp (+0x4988c) (0x406aecd4) 3 0x004c804b in pp (+0xc804b) (0x406af370) 4 0x0048a5c6 in pp (+0x8a5c6) (0x406af390) 5 0x0048a2f5 in pp (+0x8a2f5) (0x406af7c4) 6 0x0043acff in pp (+0x3acff) (0x406afe54) 7 0x0043b32f in pp (+0x3b32f) (0x406afe98) 8 0x00631d89 EntryPoint+0x122 in pp (0x406aff2c) 9 0x404d7db8 start_process+0xc8(arg=0x0) [/home/andrew/Download/Software/wine-20050211/dlls/kernel/process.c:1046] in kernel32 (0x406afff4) 10 0x40027dcd wine_pthread_abort_thread+0x2d(status=0x0) [port.c:85] in libwine.so.1 (0x00000000) 0x00447977: movl 0x0(%eax),%eax Wine-dbg> -- Andrew [hackcoughsniffle] Internal Virus Database corrupt

1 0

Re: fix wrc to parse some Borland dialog resources
by Filip Navara March 7, 2005

March 7, 2005

Michael Lin wrote: > * change wrc to parse '&' and '~' when specifying style I believe the attached patch would be better solution...you can use arbitrary expressions in the style definitions with Microsoft Resource Compiler... Regards, Filip

2 1

Wine logo (the glass)
by Dimitrie O. Paun March 7, 2005

March 7, 2005

Folks, do we have an .svg version of the logo? If so, where can I get it from? -- Dimi.

2 1

winebuild changes
by Dimitrie O. Paun March 7, 2005

March 7, 2005

Hi Alexandre, Ivan found that on Windows .exe's can export functions, just like DLLs. He needs this for his work on ntoskrnl.exe. To support this, we need a bit of an interface change to winebuild. I've put together a simple patch to see if you are OK with such a change. If so, I'll finish it, and modify winegcc accordingly. So, thing will change as follows: OLD: winebuild --dll=mystuff.spec NEW: winebuild --dll -E mystuff.spec OLD: winebuild --def=mystuff.spec NEW: winebuild --def -E mystuff.spec OLD: winebuild --exe=myprog.exe NEW: winebuild --exe -F myprog.exe to build an .exe with arbitrary exports, we would do: winebuild --exe -F myprog.exe -E mystuff.spec Index: tools/winebuild/main.c =================================================================== RCS file: /var/cvs/wine/tools/winebuild/main.c,v retrieving revision 1.59 diff -u -r1.59 main.c --- tools/winebuild/main.c 7 Dec 2004 17:19:54 -0000 1.59 +++ tools/winebuild/main.c 7 Mar 2005 01:50:44 -0000 @@ -144,6 +144,7 @@ " -C --source-dir=DIR Look for source files in DIR\n" " -d --delay-lib=LIB Import the specified library in delayed mode\n" " -D SYM Ignored for C flags compatibility\n" +" -E --export=FILE Export the symbols defined in the .spec or .def file\n" " -e --entry=FUNC Set the DLL entry point function (default: DllMain)\n" " -f FLAGS Compiler flags (only -fPIC is supported)\n" " -F --filename=DLLFILE Set the DLL filename (default: from input file name)\n" @@ -165,9 +166,9 @@ " --version Print the version and exit\n" " -w --warnings Turn on warnings\n" "\nMode options:\n" -" --dll=FILE Build a .c file from a .spec or .def file\n" -" --def=FILE.SPEC Build a .def file from a spec file\n" -" --exe=NAME Build a .c file for the named executable\n" +" --dll Build a .c file from a .spec or .def file\n" +" --def Build a .def file from a spec file\n" +" --exe Build a .c file for the named executable\n" " --debug [FILES] Build a .c file with the debug channels declarations\n" " --relay16 Build the 16-bit relay assembly routines\n" " --relay32 Build the 32-bit relay assembly routines\n\n" @@ -204,6 +205,7 @@ /* aliases for short options */ { "source-dir", 1, 0, 'C' }, { "delay-lib", 1, 0, 'd' }, + { "export", 1, 0, 'E' }, { "entry", 1, 0, 'e' }, { "filename", 1, 0, 'F' }, { "help", 0, 0, 'h' }, @@ -248,6 +250,10 @@ case 'D': /* ignored */ break; + case 'E': + spec_file_name = xstrdup( optarg ); + set_dll_file_name( optarg, spec ); + break; case 'F': spec->file_name = xstrdup( optarg ); break; @@ -324,21 +330,12 @@ break; case LONG_OPT_DLL: set_exec_mode( MODE_DLL ); - spec_file_name = xstrdup( optarg ); - set_dll_file_name( optarg, spec ); break; case LONG_OPT_DEF: set_exec_mode( MODE_DEF ); - spec_file_name = xstrdup( optarg ); - set_dll_file_name( optarg, spec ); break; case LONG_OPT_EXE: set_exec_mode( MODE_EXE ); - if ((p = strrchr( optarg, '/' ))) p++; - else p = optarg; - spec->file_name = xmalloc( strlen(p) + 5 ); - strcpy( spec->file_name, p ); - if (!strchr( spec->file_name, '.' )) strcat( spec->file_name, ".exe" ); if (!spec->subsystem) spec->subsystem = IMAGE_SUBSYSTEM_WINDOWS_GUI; break; case LONG_OPT_DEBUG: -- Dimi.

2 1