Skip to content

NECESSARY fix for the workbench startup message issue. #291

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 6, 2025
Merged

NECESSARY fix for the workbench startup message issue. #291

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 15 additions & 1 deletion library/crtbegin.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@
#include <proto/dos.h>
#include <proto/utility.h>

#include <workbench/startup.h>

#include "shared_library/interface.h"

#include "c.lib_rev.h"
Expand Down Expand Up @@ -112,12 +114,24 @@ clib4_start(char *args, const int32 arglen, struct Library *sysbase) {
int rc = -1;
void *old_r13 = r13;

struct Process *me;
struct WBStartup *sms = NULL;

r13 = &_SDA_BASE_;
SysBase = sysbase;

iexec = (struct ExecIFace *) ((struct ExecBase *) SysBase)->MainInterface;
iexec->Obtain();

/* Pick up the Workbench startup message, if available. */
me = (struct Process *) iexec->FindTask(NULL);
if (!me->pr_CLI) {
struct MsgPort *mp = &me->pr_MsgPort;
iexec->WaitPort(mp);
sms = (struct WBStartup *) iexec->GetMsg(mp);
iexec->DebugPrintF("<crtbegin> : NumArgs == %ld\n", sms->sm_NumArgs);
}

IExec = iexec;
idos = (struct DOSIFace *) OpenLibraryInterface(iexec, "dos.library", MIN_OS_VERSION);
if (idos) {
Expand All @@ -131,7 +145,7 @@ clib4_start(char *args, const int32 arglen, struct Library *sysbase) {
if (clib4base->lib_Version >= VERSION && clib4base->lib_Revision >= REVISION) {
IClib4 = iclib4;

rc = iclib4->library_start(args, arglen, main, __CTOR_LIST__, __DTOR_LIST__);
rc = iclib4->library_start(args, arglen, main, __CTOR_LIST__, __DTOR_LIST__, sms);
}
else {
idos->Printf("This program requires clib4.library version %ld.%ld\n", VERSION, REVISION);
Expand Down
5 changes: 3 additions & 2 deletions library/shared_library/clib4.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -873,9 +873,10 @@ library_start(char *argstr,
int arglen,
int (*start_main)(int, char **),
void (*__EXT_CTOR_LIST__[])(void),
void (*__EXT_DTOR_LIST__[])(void)) {
void (*__EXT_DTOR_LIST__[])(void),
struct WBStartup *sms) {

int result = _main(argstr, arglen, start_main, __EXT_CTOR_LIST__, __EXT_DTOR_LIST__);
int result = _main(argstr, arglen, start_main, __EXT_CTOR_LIST__, __EXT_DTOR_LIST__, sms);

return result;
}
Expand Down
6 changes: 4 additions & 2 deletions library/shared_library/clib4.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,8 @@ int library_start(char *argstr,
int arglen,
int (*start_main)(int, char **),
void (*__EXT_CTOR_LIST__[])(void),
void (*__EXT_DTOR_LIST__[])(void));
void (*__EXT_DTOR_LIST__[])(void),
struct WBStartup *sms);

int32 _start(STRPTR args,
int32 arglen,
Expand All @@ -103,7 +104,8 @@ extern int _main(char *argstr,
int arglen,
int (*start_main)(int, char **),
void (*__EXT_CTOR_LIST__[])(void),
void (*__EXT_DTOR_LIST__[])(void));
void (*__EXT_DTOR_LIST__[])(void),
struct WBStartup *sms);


#endif
2 changes: 1 addition & 1 deletion library/shared_library/interface.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ struct Clib4IFace {
void APICALL (*Expunge)(struct Clib4IFace *Self); //68
struct Clib4IFace *APICALL (*Clone)(struct Clib4IFace *Self); //72
/* internal */
int (* library_start)(char *argstr, int arglen, int (* start_main)(int, char **), void (*__CTOR_LIST__[])(void), void (*__DTOR_LIST__[])(void)); //76
int (* library_start)(char *argstr, int arglen, int (* start_main)(int, char **), void (*__CTOR_LIST__[])(void), void (*__DTOR_LIST__[])(void), struct WBStartup *sms); //76
struct _clib4 * (* __getClib4)(void); //80
void (* internal1)(void); //84
void (* __translate_amiga_to_unix_path_name)(void); //88
Expand Down
14 changes: 4 additions & 10 deletions library/stdlib/main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,22 +162,16 @@ _main(
int arglen,
int (*start_main)(int, char **),
void (*__EXT_CTOR_LIST__[])(void),
void (*__EXT_DTOR_LIST__[])(void)) {
struct WBStartup *sms = NULL;
void (*__EXT_DTOR_LIST__[])(void),
struct WBStartup *sms
) {
struct Process *me;
APTR oldClib4Data;
int rc = RETURN_FAIL;
struct _clib4 *__clib4 = __CLIB4;

/* Pick up the Workbench startup message, if available. */
me = (struct Process *) FindTask(NULL);
if (!me->pr_CLI) {
struct MsgPort *mp = &me->pr_MsgPort;
WaitPort(mp);
sms = (struct WBStartup *) GetMsg(mp);
}

/* Store old Clib4Data */
me = (struct Process *) FindTask(NULL);
oldClib4Data = (APTR) me->pr_UID;

__clib4->__WBenchMsg = sms;
Expand Down
3 changes: 2 additions & 1 deletion library/stdlib/stdlib_headers.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,8 @@ extern int _main(char *argstr,
int arglen,
int (*start_main)(int, char **),
void (*__EXT_CTOR_LIST__[])(void),
void (*__EXT_DTOR_LIST__[])(void));
void (*__EXT_DTOR_LIST__[])(void),
struct WBStartup *sms);

#ifndef _STDLIB_PROTOS_H
#include "stdlib_protos.h"
Expand Down
Loading