April 2006 - Wine-commits - list.winehq.org

James Hawkins : advpack: Implement UserInstStubWrapper.
by Alexandre Julliard 11 Apr '06

11 Apr '06

Module: wine Branch: refs/heads/master Commit: fadf610065731c4ad95cd9c8fb43cd8dc761cea8 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=fadf610065731c4ad95cd9c… Author: James Hawkins <truiken(a)gmail.com> Date: Tue Apr 11 01:26:44 2006 -0500 advpack: Implement UserInstStubWrapper. --- dlls/advpack/advpack.c | 76 ++++++++++++++++++++++++++++++++++++++++++------ dlls/advpack/install.c | 2 + 2 files changed, 67 insertions(+), 11 deletions(-) diff --git a/dlls/advpack/advpack.c b/dlls/advpack/advpack.c index e9c8321..b84717f 100644 --- a/dlls/advpack/advpack.c +++ b/dlls/advpack/advpack.c @@ -40,6 +40,17 @@ typedef HRESULT (WINAPI *DLLREGISTER) (v #define MAX_FIELD_LENGTH 512 #define PREFIX_LEN 5 +HRESULT launch_exe(LPCWSTR cmd, LPCWSTR dir, HANDLE *phEXE); + +/* registry path of the Installed Components key for per-user stubs */ +static const WCHAR setup_key[] = { + 'S','O','F','T','W','A','R','E','\\', + 'M','i','c','r','o','s','o','f','t','\\', + 'A','c','t','i','v','e',' ','S','e','t','u','p','\\', + 'I','n','s','t','a','l','l','e','d',' ', + 'C','o','m','p','o','n','e','n','t','s',0 +}; + /* parses the destination directory parameters from pszSection * the parameters are of the form: root,key,value,unknown,fallback * we first read the reg value root\\key\\value and if that fails, @@ -474,14 +485,6 @@ HRESULT WINAPI SetPerUserSecValuesW(PERU { HKEY setup, guid; - static const WCHAR setup_key[] = { - 'S','O','F','T','W','A','R','E','\\', - 'M','i','c','r','o','s','o','f','t','\\', - 'A','c','t','i','v','e',' ','S','e','t','u','p','\\', - 'I','n','s','t','a','l','l','e','d',' ', - 'C','o','m','p','o','n','e','n','t','s',0 - }; - static const WCHAR stub_path[] = {'S','t','u','b','P','a','t','h',0}; static const WCHAR version[] = {'V','e','r','s','i','o','n',0}; static const WCHAR locale[] = {'L','o','c','a','l','e',0}; @@ -805,13 +808,66 @@ HRESULT WINAPI UserInstStubWrapperA(HWND /*********************************************************************** * UserInstStubWrapperW (ADVPACK.@) + * + * Launches the user stub wrapper specified by the RealStubPath + * registry value under Installed Components\szParms. + * + * PARAMS + * hWnd [I] Handle to the window used for the display. + * hInstance [I] Instance of the process. + * szParms [I] The GUID of the installation. + * show [I] How the window should be shown. + * + * RETURNS + * Success: S_OK. + * Failure: E_FAIL. + * + * TODO + * If the type of the StubRealPath value is REG_EXPAND_SZ, then + * we should call ExpandEnvironmentStrings on the value and + * launch the result. */ HRESULT WINAPI UserInstStubWrapperW(HWND hWnd, HINSTANCE hInstance, LPWSTR pszParms, INT nShow) { - FIXME("(%p, %p, %s, %i): stub\n", hWnd, hInstance, debugstr_w(pszParms), nShow); + HKEY setup, guid; + WCHAR stub[MAX_PATH]; + DWORD size = MAX_PATH; + HRESULT hr = S_OK; + BOOL res; - return E_FAIL; + static const WCHAR real_stub_path[] = { + 'R','e','a','l','S','t','u','b','P','a','t','h',0 + }; + + TRACE("(%p, %p, %s, %i)\n", hWnd, hInstance, debugstr_w(pszParms), nShow); + + if (!pszParms || !*pszParms) + return E_INVALIDARG; + + if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, setup_key, 0, KEY_READ, &setup)) + { + return E_FAIL; + } + + if (RegOpenKeyExW(setup, pszParms, 0, KEY_READ, &guid)) + { + RegCloseKey(setup); + return E_FAIL; + } + + res = RegQueryValueExW(guid, real_stub_path, NULL, NULL, (LPBYTE)stub, &size); + if (res || !*stub) + goto done; + + /* launch the user stub wrapper */ + hr = launch_exe(stub, NULL, NULL); + +done: + RegCloseKey(setup); + RegCloseKey(guid); + + return hr; } /*********************************************************************** diff --git a/dlls/advpack/install.c b/dlls/advpack/install.c index 1378e9e..ddb5f30 100644 --- a/dlls/advpack/install.c +++ b/dlls/advpack/install.c @@ -367,7 +367,7 @@ done: return hr; } -static HRESULT launch_exe(LPCWSTR cmd, LPCWSTR dir, HANDLE *phEXE) +HRESULT launch_exe(LPCWSTR cmd, LPCWSTR dir, HANDLE *phEXE) { STARTUPINFOW si; PROCESS_INFORMATION pi;

1 0

Mike McCormack : avifil32: Fix a regression caused by patch removing GlobalAllocs by using HEAP_ZERO_INIT .
by Alexandre Julliard 11 Apr '06

11 Apr '06

Module: wine Branch: refs/heads/master Commit: aebc88d54bdc6d4a835d8a023aa1862114ee4d4d URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=aebc88d54bdc6d4a835d8a0… Author: Mike McCormack <mike(a)codeweavers.com> Date: Tue Apr 11 20:44:02 2006 +0900 avifil32: Fix a regression caused by patch removing GlobalAllocs by using HEAP_ZERO_INIT. --- dlls/avifil32/acmstream.c | 4 ++-- dlls/avifil32/api.c | 16 ++++++++-------- dlls/avifil32/avifile.c | 22 +++++++++++----------- dlls/avifil32/editstream.c | 14 +++++++------- dlls/avifil32/extrachunk.c | 8 ++++---- dlls/avifil32/getframe.c | 6 +++--- dlls/avifil32/icmstream.c | 10 +++++----- dlls/avifil32/tmpfile.c | 2 +- dlls/avifil32/wavfile.c | 2 +- 9 files changed, 42 insertions(+), 42 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=aebc88d54bdc6d4a835…

1 0

Eric Pouech : winedump: Constify some pointers.
by Alexandre Julliard 11 Apr '06

11 Apr '06

Module: wine Branch: refs/heads/master Commit: 98783faaecbfc62a2436b9246dc3b2e943731f46 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=98783faaecbfc62a2436b92… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Mon Apr 10 20:53:50 2006 +0200 winedump: Constify some pointers. --- tools/winedump/debug.c | 79 ++++++++++++++-------------- tools/winedump/dump.c | 22 ++++---- tools/winedump/minidump.c | 51 +++++++++--------- tools/winedump/pe.c | 125 +++++++++++++++++++++++---------------------- tools/winedump/pe.h | 4 + tools/winedump/winedump.h | 6 +- 6 files changed, 144 insertions(+), 143 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=98783faaecbfc62a243…

1 0

Eric Pouech : msvcrt: IO init.
by Alexandre Julliard 11 Apr '06

11 Apr '06

Module: wine Branch: refs/heads/master Commit: 819565be210843c51934e89a7d8e82b87b044220 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=819565be210843c51934e89… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Sat Apr 8 11:59:14 2006 +0200 msvcrt: IO init. Make sure, when copying handles from std ones (when no io info is inherited from parent) to create inheritable handles (spotted by qingdao daoo). --- dlls/msvcrt/file.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 0a99cce..5a02a29 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -346,21 +346,21 @@ void msvcrt_init_io(void) if (!(MSVCRT_fdesc[0].wxflag & WX_OPEN) || MSVCRT_fdesc[0].handle == INVALID_HANDLE_VALUE) { DuplicateHandle(GetCurrentProcess(), GetStdHandle(STD_INPUT_HANDLE), - GetCurrentProcess(), &MSVCRT_fdesc[0].handle, 0, FALSE, + GetCurrentProcess(), &MSVCRT_fdesc[0].handle, 0, TRUE, DUPLICATE_SAME_ACCESS); MSVCRT_fdesc[0].wxflag = WX_OPEN | WX_TEXT; } if (!(MSVCRT_fdesc[1].wxflag & WX_OPEN) || MSVCRT_fdesc[1].handle == INVALID_HANDLE_VALUE) { DuplicateHandle(GetCurrentProcess(), GetStdHandle(STD_OUTPUT_HANDLE), - GetCurrentProcess(), &MSVCRT_fdesc[1].handle, 0, FALSE, + GetCurrentProcess(), &MSVCRT_fdesc[1].handle, 0, TRUE, DUPLICATE_SAME_ACCESS); MSVCRT_fdesc[1].wxflag = WX_OPEN | WX_TEXT; } if (!(MSVCRT_fdesc[2].wxflag & WX_OPEN) || MSVCRT_fdesc[2].handle == INVALID_HANDLE_VALUE) { DuplicateHandle(GetCurrentProcess(), GetStdHandle(STD_ERROR_HANDLE), - GetCurrentProcess(), &MSVCRT_fdesc[2].handle, 0, FALSE, + GetCurrentProcess(), &MSVCRT_fdesc[2].handle, 0, TRUE, DUPLICATE_SAME_ACCESS); MSVCRT_fdesc[2].wxflag = WX_OPEN | WX_TEXT; }

1 0

Alexandre Julliard : winedump: Added detection of Wine fake dlls.
by Alexandre Julliard 11 Apr '06

11 Apr '06

Module: wine Branch: refs/heads/master Commit: 1e160c84189360173339238adaf54b87206a7293 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=1e160c84189360173339238… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 11 12:30:09 2006 +0200 winedump: Added detection of Wine fake dlls. Also pass the real start of the file to the dump functions, instead of having the generic code care about the specifics of the individual file formats. --- tools/winedump/dump.c | 11 ++++------- tools/winedump/pe.c | 22 ++++++++++++++++++++-- 2 files changed, 24 insertions(+), 9 deletions(-) diff --git a/tools/winedump/dump.c b/tools/winedump/dump.c index 91f4b0b..bb8af6d 100644 --- a/tools/winedump/dump.c +++ b/tools/winedump/dump.c @@ -161,7 +161,7 @@ static void do_dump( enum FileSig sig, v pe_dump(pmt); } -static enum FileSig check_headers(void** pmt) +static enum FileSig check_headers(void) { WORD* pw; DWORD* pdw; @@ -171,13 +171,12 @@ static enum FileSig check_headers(void** pw = PRD(0, sizeof(WORD)); if (!pw) {printf("Can't get main signature, aborting\n"); return 0;} - *pmt = NULL; switch (*pw) { case IMAGE_DOS_SIGNATURE: sig = SIG_DOS; dh = PRD(0, sizeof(IMAGE_DOS_HEADER)); - if (dh && dh->e_lfanew >= sizeof(*dh)) /* reasonable DOS header ? */ + if (dh) { /* the signature is the first DWORD */ pdw = PRD(dh->e_lfanew, sizeof(DWORD)); @@ -185,7 +184,6 @@ static enum FileSig check_headers(void** { if (*pdw == IMAGE_NT_SIGNATURE) { - *pmt = PRD(dh->e_lfanew, sizeof(DWORD)+sizeof(IMAGE_FILE_HEADER)); sig = SIG_PE; } else if (*(WORD *)pdw == IMAGE_OS2_SIGNATURE) @@ -231,7 +229,6 @@ int dump_analysis(const char* name, void enum FileSig effective_sig; int ret = 1; struct stat s; - void* pmt; setbuf(stdout, NULL); @@ -249,7 +246,7 @@ int dump_analysis(const char* name, void if ((unsigned long)read( fd, dump_base, dump_total_len ) != dump_total_len) fatal( "Cannot read file" ); } - effective_sig = check_headers(&pmt); + effective_sig = check_headers(); if (effective_sig == SIG_UNKNOWN) { @@ -266,7 +263,7 @@ int dump_analysis(const char* name, void case SIG_NE: case SIG_LE: printf("Contents of \"%s\": %ld bytes\n\n", name, dump_total_len); - (*fn)(effective_sig, pmt); + (*fn)(effective_sig, dump_base); break; case SIG_DBG: dump_separate_dbg(); diff --git a/tools/winedump/pe.c b/tools/winedump/pe.c index eb70faa..e8ae596 100644 --- a/tools/winedump/pe.c +++ b/tools/winedump/pe.c @@ -87,6 +87,22 @@ static void* RVA(unsigned long rva, unsi return NULL; } +static IMAGE_NT_HEADERS32 *get_nt_header( void *pmt ) +{ + IMAGE_DOS_HEADER *dos = pmt; + return (IMAGE_NT_HEADERS32 *)((BYTE *)dos + dos->e_lfanew); +} + +static int is_fake_dll( const void *base ) +{ + static const char fakedll_signature[] = "Wine placeholder DLL"; + const IMAGE_DOS_HEADER *dos = base; + + if (dos->e_lfanew >= sizeof(*dos) + sizeof(fakedll_signature) && + !memcmp( dos + 1, fakedll_signature, sizeof(fakedll_signature) )) return TRUE; + return FALSE; +} + static void *get_dir_and_size(unsigned int idx, unsigned int *size) { if(PE_nt_headers->OptionalHeader.Magic == IMAGE_NT_OPTIONAL_HDR64_MAGIC) @@ -1063,7 +1079,9 @@ void pe_dump(void* pmt) { int all = (globals.dumpsect != NULL) && strcmp(globals.dumpsect, "ALL") == 0; - PE_nt_headers = pmt; + PE_nt_headers = get_nt_header(pmt); + if (is_fake_dll(pmt)) printf( "*** This is a Wine fake DLL ***\n\n" ); + if (globals.do_dumpheader) { dump_pe_header(); @@ -1145,7 +1163,7 @@ static void do_grab_sym( enum FileSig si const char* ptr; DWORD* map; - PE_nt_headers = pmt; + PE_nt_headers = get_nt_header(pmt); if (!(exportDir = get_dir(IMAGE_FILE_EXPORT_DIRECTORY))) return; pName = RVA(exportDir->AddressOfNames, exportDir->NumberOfNames * sizeof(DWORD));

1 0

Petr Tesarik : winedos: Implement true CDROM DOS device driver.
by Alexandre Julliard 11 Apr '06

11 Apr '06

Module: wine Branch: refs/heads/master Commit: 9f9ac54a19f70475ed3755f552b0a2db322ba377 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=9f9ac54a19f70475ed3755f… Author: Petr Tesarik <hat(a)tesarici.cz> Date: Tue Apr 11 10:37:09 2006 +0200 winedos: Implement true CDROM DOS device driver. --- dlls/winedos/dosexe.h | 1 + dlls/winedos/int2f.c | 55 +++++++++++++++++++++++++++++++++++++++++++++++++ dlls/winedos/module.c | 1 + 3 files changed, 57 insertions(+), 0 deletions(-) diff --git a/dlls/winedos/dosexe.h b/dlls/winedos/dosexe.h index dd32f6c..2f9ad29 100644 --- a/dlls/winedos/dosexe.h +++ b/dlls/winedos/dosexe.h @@ -475,6 +475,7 @@ extern void WINAPI DOSVM_Int2aHandler(CO /* int2f.c */ extern void WINAPI DOSVM_Int2fHandler(CONTEXT86*); +extern void MSCDEX_InstallCDROM(void); /* int31.c */ extern void WINAPI DOSVM_Int31Handler(CONTEXT86*); diff --git a/dlls/winedos/int2f.c b/dlls/winedos/int2f.c index 68547b0..617c4f0 100644 --- a/dlls/winedos/int2f.c +++ b/dlls/winedos/int2f.c @@ -1024,3 +1024,58 @@ static void MSCDEX_Handler(CONTEXT86* co break; } } + +/* prototypes */ +static void WINAPI cdrom_strategy(CONTEXT86*ctx); +static void WINAPI cdrom_interrupt(CONTEXT86*ctx); + +/* device info */ +static const WINEDEV cdromdev = +{ + "WINE_CD_", + ATTR_CHAR|ATTR_REMOVABLE|ATTR_IOCTL, + cdrom_strategy, cdrom_interrupt +}; + +static REQUEST_HEADER *cdrom_driver_request; + +/* Return to caller */ +static void do_lret(CONTEXT86*ctx) +{ + WORD *stack = CTX_SEG_OFF_TO_LIN(ctx, ctx->SegSs, ctx->Esp); + + ctx->Eip = *(stack++); + ctx->SegCs = *(stack++); + ctx->Esp += 2*sizeof(WORD); +} + +static void WINAPI cdrom_strategy(CONTEXT86*ctx) +{ + cdrom_driver_request = CTX_SEG_OFF_TO_LIN(ctx, ctx->SegEs, ctx->Ebx); + do_lret( ctx ); +} + +static void WINAPI cdrom_interrupt(CONTEXT86*ctx) +{ + if (cdrom_driver_request->unit > CDROM_GetHeap()->hdr.units) + cdrom_driver_request->status = STAT_ERROR | 1; /* unknown unit */ + else + MSCDEX_Request((BYTE*)cdrom_driver_request, ISV86(ctx)); + + do_lret( ctx ); +} + +/********************************************************************** + * MSCDEX_InstallCDROM [internal] + * + * Install the CDROM driver into the DOS device driver chain. + */ +void MSCDEX_InstallCDROM(void) +{ + CDROM_HEAP *cdrom_heap = CDROM_GetHeap(); + + DOSDEV_SetupDevice( &cdromdev, + cdrom_heap->cdrom_segment, + FIELD_OFFSET(CDROM_HEAP, hdr), + FIELD_OFFSET(CDROM_HEAP, thunk) ); +} diff --git a/dlls/winedos/module.c b/dlls/winedos/module.c index 5b2cc43..593e78d 100644 --- a/dlls/winedos/module.c +++ b/dlls/winedos/module.c @@ -197,6 +197,7 @@ static BOOL MZ_InitMemory(void) TRACE("Initializing DOS memory structures\n"); DOSMEM_MapDosLayout(); DOSDEV_InstallDOSDevices(); + MSCDEX_InstallCDROM(); return TRUE; }

1 0

Petr Tesarik : winedos: Move all device driver initialization code to a newly written
by Alexandre Julliard 11 Apr '06

11 Apr '06

Module: wine Branch: refs/heads/master Commit: d72178a1be28092d31e21b2cf34ef34183cfaecf URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=d72178a1be28092d31e21b2… Author: Petr Tesarik <hat(a)tesarici.cz> Date: Tue Apr 11 10:36:08 2006 +0200 winedos: Move all device driver initialization code to a newly written function DOSDEV_SetupDevice(). --- dlls/winedos/devices.c | 55 +++++++++++++++++++++++++++++------------------- dlls/winedos/dosexe.h | 2 ++ 2 files changed, 35 insertions(+), 22 deletions(-) diff --git a/dlls/winedos/devices.c b/dlls/winedos/devices.c index 41959fc..9170fa0 100644 --- a/dlls/winedos/devices.c +++ b/dlls/winedos/devices.c @@ -101,6 +101,7 @@ typedef struct { DOS_LISTOFLISTS lol; DOS_DEVICE_HEADER dev[NR_DEVS-1]; + DOS_DEVICE_HEADER *last_dev; /* ptr to last registered device driver */ WINEDEV_THUNK thunk[NR_DEVS]; REQ_IO req; BYTE buffer[CON_BUFFER]; @@ -415,6 +416,29 @@ Output of DOS 6.22: DOS_LOL->size_extended_mem = 0xf000; /* very high value */ } +void DOSDEV_SetupDevice(const WINEDEV * devinfo, + WORD seg, WORD off_dev, WORD off_thunk) +{ + DOS_DEVICE_HEADER *dev = PTR_REAL_TO_LIN(seg, off_dev); + WINEDEV_THUNK *thunk = PTR_REAL_TO_LIN(seg, off_thunk); + DOS_DATASEG *dataseg = (DOS_DATASEG*)DOSMEM_LOL(); + + dev->attr = devinfo->attr; + dev->strategy = off_thunk + FIELD_OFFSET(WINEDEV_THUNK, ljmp1); + dev->interrupt = off_thunk + FIELD_OFFSET(WINEDEV_THUNK, ljmp2); + memcpy(dev->name, devinfo->name, 8); + + thunk->ljmp1 = LJMP; + thunk->strategy = DPMI_AllocInternalRMCB(devinfo->strategy); + thunk->ljmp2 = LJMP; + thunk->interrupt = DPMI_AllocInternalRMCB(devinfo->interrupt); + + dev->next_dev = NONEXT; + if (dataseg->last_dev) + dataseg->last_dev->next_dev = MAKESEGPTR(seg, off_dev); + dataseg->last_dev = dev; +} + void DOSDEV_InstallDOSDevices(void) { DOS_DATASEG *dataseg; @@ -435,31 +459,18 @@ void DOSDEV_InstallDOSDevices(void) InitListOfLists(&dataseg->lol); /* Set up first device (NUL) */ - dataseg->lol.NUL_dev.next_dev = MAKESEGPTR(seg, DOS_DATASEG_OFF(dev[0])); - dataseg->lol.NUL_dev.attr = devs[0].attr; - dataseg->lol.NUL_dev.strategy = DOS_DATASEG_OFF(thunk[0].ljmp1); - dataseg->lol.NUL_dev.interrupt = DOS_DATASEG_OFF(thunk[0].ljmp2); - memcpy(dataseg->lol.NUL_dev.name, devs[0].name, 8); + dataseg->last_dev = NULL; + DOSDEV_SetupDevice( &devs[0], + seg, + DOS_DATASEG_OFF(lol.NUL_dev), + DOS_DATASEG_OFF(thunk[0]) ); /* Set up the remaining devices */ for (n = 1; n < NR_DEVS; n++) - { - dataseg->dev[n-1].next_dev = (n+1) == NR_DEVS ? NONEXT : - MAKESEGPTR(seg, DOS_DATASEG_OFF(dev[n])); - dataseg->dev[n-1].attr = devs[n].attr; - dataseg->dev[n-1].strategy = DOS_DATASEG_OFF(thunk[n].ljmp1); - dataseg->dev[n-1].interrupt = DOS_DATASEG_OFF(thunk[n].ljmp2); - memcpy(dataseg->dev[n-1].name, devs[n].name, 8); - } - - /* Set up thunks */ - for (n = 0; n < NR_DEVS; n++) - { - dataseg->thunk[n].ljmp1 = LJMP; - dataseg->thunk[n].strategy = DPMI_AllocInternalRMCB(devs[n].strategy); - dataseg->thunk[n].ljmp2 = LJMP; - dataseg->thunk[n].interrupt = DPMI_AllocInternalRMCB(devs[n].interrupt); - } + DOSDEV_SetupDevice( &devs[n], + seg, + DOS_DATASEG_OFF(dev[n-1]), + DOS_DATASEG_OFF(thunk[n]) ); /* CON is device 1 */ dataseg->lol.ptr_CON_dev_hdr = MAKESEGPTR(seg, DOS_DATASEG_OFF(dev[0])); diff --git a/dlls/winedos/dosexe.h b/dlls/winedos/dosexe.h index b5940b1..dd32f6c 100644 --- a/dlls/winedos/dosexe.h +++ b/dlls/winedos/dosexe.h @@ -366,6 +366,8 @@ extern UINT WINAPI DOSVM_GetTimer( void /* devices.c */ extern void DOSDEV_InstallDOSDevices(void); +extern void DOSDEV_SetupDevice(const WINEDEV * devinfo, + WORD seg, WORD off_dev, WORD off_thunk); extern DWORD DOSDEV_Console(void); extern DWORD DOSDEV_FindCharDevice(char*name); extern int DOSDEV_Peek(DWORD dev, BYTE*data);

1 0

Petr Tesarik : winedos: Move most of MSCDEX stuff into a separate function.
by Alexandre Julliard 11 Apr '06

11 Apr '06

Module: wine Branch: refs/heads/master Commit: 07d77c28fd73e678e0b352ff618ca46a38837666 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=07d77c28fd73e678e0b352f… Author: Petr Tesarik <hat(a)tesarici.cz> Date: Tue Apr 11 10:34:04 2006 +0200 winedos: Move most of MSCDEX stuff into a separate function. --- dlls/winedos/int2f.c | 906 +++++++++++++++++++++++++++----------------------- 1 files changed, 492 insertions(+), 414 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=07d77c28fd73e678e0b…

1 0

Petr Tesarik : winedos: Move some declarations to the header file.
by Alexandre Julliard 11 Apr '06

11 Apr '06

Module: wine Branch: refs/heads/master Commit: 7e4ad8e6a7248c2a28796760c510b18c92026eb1 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=7e4ad8e6a7248c2a2879676… Author: Petr Tesarik <hat(a)tesarici.cz> Date: Tue Apr 11 10:33:16 2006 +0200 winedos: Move some declarations to the header file. --- dlls/winedos/devices.c | 89 +------------------------------------------ dlls/winedos/dosexe.h | 99 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 101 insertions(+), 87 deletions(-) diff --git a/dlls/winedos/devices.c b/dlls/winedos/devices.c index f90c1f4..41959fc 100644 --- a/dlls/winedos/devices.c +++ b/dlls/winedos/devices.c @@ -26,44 +26,6 @@ #include "pshpack1.h" -typedef struct { - BYTE ljmp1; - RMCBPROC strategy; - BYTE ljmp2; - RMCBPROC interrupt; -} WINEDEV_THUNK; - -typedef struct { - BYTE size; /* length of header + data */ - BYTE unit; /* unit (block devices only) */ - BYTE command; - WORD status; - BYTE reserved[8]; -} REQUEST_HEADER; - -typedef struct { - REQUEST_HEADER hdr; - BYTE media; /* media descriptor from BPB */ - SEGPTR buffer; - WORD count; /* byte/sector count */ - WORD sector; /* starting sector (block devices) */ - DWORD volume; /* volume ID (block devices) */ -} REQ_IO; - -typedef struct { - REQUEST_HEADER hdr; - BYTE data; -} REQ_SAFEINPUT; - -typedef struct -{ - DWORD next_dev; - WORD attr; - WORD strategy; - WORD interrupt; - char name[8]; -} DOS_DEVICE_HEADER; - /* Warning: need to return LOL ptr w/ offset 0 (&ptr_first_DPB) to programs ! */ typedef struct _DOS_LISTOFLISTS { @@ -111,45 +73,6 @@ enum strategy { SYSTEM_STRATEGY_NUL, SYS static void *strategy_data[NB_SYSTEM_STRATEGIES]; -#define NONEXT ((DWORD)-1) - -#define ATTR_STDIN 0x0001 -#define ATTR_STDOUT 0x0002 -#define ATTR_NUL 0x0004 -#define ATTR_CLOCK 0x0008 -#define ATTR_FASTCON 0x0010 -#define ATTR_RAW 0x0020 -#define ATTR_NOTEOF 0x0040 -#define ATTR_DEVICE 0x0080 -#define ATTR_REMOVABLE 0x0800 -#define ATTR_NONIBM 0x2000 /* block devices */ -#define ATTR_UNTILBUSY 0x2000 /* char devices */ -#define ATTR_IOCTL 0x4000 -#define ATTR_CHAR 0x8000 - -#define CMD_INIT 0 -#define CMD_MEDIACHECK 1 /* block devices */ -#define CMD_BUILDBPB 2 /* block devices */ -#define CMD_INIOCTL 3 -#define CMD_INPUT 4 /* read data */ -#define CMD_SAFEINPUT 5 /* "non-destructive input no wait", char devices */ -#define CMD_INSTATUS 6 /* char devices */ -#define CMD_INFLUSH 7 /* char devices */ -#define CMD_OUTPUT 8 /* write data */ -#define CMD_SAFEOUTPUT 9 /* write data with verify */ -#define CMD_OUTSTATUS 10 /* char devices */ -#define CMD_OUTFLUSH 11 /* char devices */ -#define CMD_OUTIOCTL 12 -#define CMD_DEVOPEN 13 -#define CMD_DEVCLOSE 14 -#define CMD_REMOVABLE 15 /* block devices */ -#define CMD_UNTILBUSY 16 /* output until busy */ - -#define STAT_MASK 0x00FF -#define STAT_DONE 0x0100 -#define STAT_BUSY 0x0200 -#define STAT_ERROR 0x8000 - #define LJMP 0xea @@ -160,14 +83,6 @@ static void WINAPI con_strategy(CONTEXT8 static void WINAPI con_interrupt(CONTEXT86*ctx); /* devices */ -typedef struct -{ - char name[8]; - WORD attr; - RMCBPROC strategy; - RMCBPROC interrupt; -} WINEDEV; - static WINEDEV devs[] = { { "NUL ", @@ -541,9 +456,9 @@ void DOSDEV_InstallDOSDevices(void) for (n = 0; n < NR_DEVS; n++) { dataseg->thunk[n].ljmp1 = LJMP; - dataseg->thunk[n].strategy = (RMCBPROC)DPMI_AllocInternalRMCB(devs[n].strategy); + dataseg->thunk[n].strategy = DPMI_AllocInternalRMCB(devs[n].strategy); dataseg->thunk[n].ljmp2 = LJMP; - dataseg->thunk[n].interrupt = (RMCBPROC)DPMI_AllocInternalRMCB(devs[n].interrupt); + dataseg->thunk[n].interrupt = DPMI_AllocInternalRMCB(devs[n].interrupt); } /* CON is device 1 */ diff --git a/dlls/winedos/dosexe.h b/dlls/winedos/dosexe.h index ffb62d8..b5940b1 100644 --- a/dlls/winedos/dosexe.h +++ b/dlls/winedos/dosexe.h @@ -245,6 +245,105 @@ typedef struct #include <poppack.h> +/* Device driver header */ + +#define NONEXT ((DWORD)-1) + +#define ATTR_STDIN 0x0001 +#define ATTR_STDOUT 0x0002 +#define ATTR_NUL 0x0004 +#define ATTR_CLOCK 0x0008 +#define ATTR_FASTCON 0x0010 +#define ATTR_RAW 0x0020 +#define ATTR_NOTEOF 0x0040 +#define ATTR_DEVICE 0x0080 +#define ATTR_REMOVABLE 0x0800 +#define ATTR_NONIBM 0x2000 /* block devices */ +#define ATTR_UNTILBUSY 0x2000 /* char devices */ +#define ATTR_IOCTL 0x4000 +#define ATTR_CHAR 0x8000 + +#include <pshpack1.h> + +typedef struct +{ + DWORD next_dev; + WORD attr; + WORD strategy; + WORD interrupt; + char name[8]; +} DOS_DEVICE_HEADER; + +#include <poppack.h> + +/* DOS Device requests */ + +#define CMD_INIT 0 +#define CMD_MEDIACHECK 1 /* block devices */ +#define CMD_BUILDBPB 2 /* block devices */ +#define CMD_INIOCTL 3 +#define CMD_INPUT 4 /* read data */ +#define CMD_SAFEINPUT 5 /* "non-destructive input no wait", char devices */ +#define CMD_INSTATUS 6 /* char devices */ +#define CMD_INFLUSH 7 /* char devices */ +#define CMD_OUTPUT 8 /* write data */ +#define CMD_SAFEOUTPUT 9 /* write data with verify */ +#define CMD_OUTSTATUS 10 /* char devices */ +#define CMD_OUTFLUSH 11 /* char devices */ +#define CMD_OUTIOCTL 12 +#define CMD_DEVOPEN 13 +#define CMD_DEVCLOSE 14 +#define CMD_REMOVABLE 15 /* block devices */ +#define CMD_UNTILBUSY 16 /* output until busy */ + +#define STAT_MASK 0x00FF +#define STAT_DONE 0x0100 +#define STAT_BUSY 0x0200 +#define STAT_ERROR 0x8000 + +#include <pshpack1.h> + +typedef struct { + BYTE size; /* length of header + data */ + BYTE unit; /* unit (block devices only) */ + BYTE command; + WORD status; + BYTE reserved[8]; +} REQUEST_HEADER; + +typedef struct { + REQUEST_HEADER hdr; + BYTE media; /* media descriptor from BPB */ + SEGPTR buffer; + WORD count; /* byte/sector count */ + WORD sector; /* starting sector (block devices) */ + DWORD volume; /* volume ID (block devices) */ +} REQ_IO; + +typedef struct { + REQUEST_HEADER hdr; + BYTE data; +} REQ_SAFEINPUT; + +/* WINE device driver thunk from RM */ +typedef struct { + BYTE ljmp1; + FARPROC16 strategy; + BYTE ljmp2; + FARPROC16 interrupt; +} WINEDEV_THUNK; + +#include <poppack.h> + +/* Device driver info (used for initialization) */ +typedef struct +{ + char name[8]; + WORD attr; + RMCBPROC strategy; + RMCBPROC interrupt; +} WINEDEV; + /* module.c */ extern void WINAPI MZ_LoadImage( LPCSTR filename, HANDLE hFile ); extern BOOL WINAPI MZ_Exec( CONTEXT86 *context, LPCSTR filename, BYTE func, LPVOID paramblk );

1 0

Antonio Codazzi : wininet: Added Esperanto language.
by Alexandre Julliard 11 Apr '06

11 Apr '06

Module: wine Branch: refs/heads/master Commit: 33a232a4a26aba8b1b98e2f917fe626d21175c52 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=33a232a4a26aba8b1b98e2f… Author: Antonio Codazzi <f_sophia(a)libero.it> Date: Mon Apr 10 01:29:39 2006 +0200 wininet: Added Esperanto language. --- dlls/wininet/rsrc.rc | 1 + dlls/wininet/wininet_Eo.rc | 46 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 47 insertions(+), 0 deletions(-) create mode 100644 dlls/wininet/wininet_Eo.rc diff --git a/dlls/wininet/rsrc.rc b/dlls/wininet/rsrc.rc index cc4d106..e9587ad 100644 --- a/dlls/wininet/rsrc.rc +++ b/dlls/wininet/rsrc.rc @@ -44,6 +44,7 @@ #include "wininet_Cs.rc" #include "wininet_De.rc" #include "wininet_En.rc" +#include "wininet_Eo.rc" #include "wininet_Es.rc" #include "wininet_Fi.rc" #include "wininet_Fr.rc" diff --git a/dlls/wininet/wininet_Eo.rc b/dlls/wininet/wininet_Eo.rc new file mode 100644 index 0000000..f337d47 --- /dev/null +++ b/dlls/wininet/wininet_Eo.rc @@ -0,0 +1,46 @@ +/* + * Wininet Resources - Esperanto Language Support + * + * Copyright 2006 Antonio Codazzi + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +LANGUAGE LANG_ESPERANTO, SUBLANG_DEFAULT + +IDD_PROXYDLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 250, 154 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Enmetu Retan Pasvorton" +FONT 8, "MS Shell Dlg" +{ + LTEXT "Enmetu uzantonomon kaj pasvorton:", -1, 40, 6, 150, 15 + LTEXT "Proxy", -1, 40, 26, 50, 10 + LTEXT "Realm", -1, 40, 46, 50, 10 + LTEXT "Uzanto", -1, 40, 66, 50, 10 + LTEXT "Pasvorto", -1, 40, 86, 50, 10 + LTEXT "" IDC_PROXY, 80, 26, 150, 14, 0 + LTEXT "" IDC_REALM, 80, 46, 150, 14, 0 + EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP + EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD + CHECKBOX "&Storu pasvorton ( RISKE! )", IDC_SAVEPASSWORD, + 80, 106, 150, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + PUSHBUTTON "Bone", IDOK, 98, 126, 56, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON + PUSHBUTTON "Rezigni", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP +} + +STRINGTABLE DISCARDABLE +{ + IDS_LANCONNECTION "LAN Interkonekto" +}

1 0