February 2006 - Wine-Commits

Dmitry Timoshkov : notepad: Wrap long lines by default like Windows does.
by Alexandre Julliard Feb. 28, 2006

Feb. 28, 2006

Module: wine Branch: refs/heads/master Commit: 832ec7056511ee04dc3d4fdce09acf2ceb2c58dd URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=832ec7056511ee04dc3d4fd… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Tue Feb 28 21:35:40 2006 +0800 notepad: Wrap long lines by default like Windows does. --- programs/notepad/main.c | 12 ++++++++++-- 1 files changed, 10 insertions(+), 2 deletions(-) diff --git a/programs/notepad/main.c b/programs/notepad/main.c index 0b10c57..b664066 100644 --- a/programs/notepad/main.c +++ b/programs/notepad/main.c @@ -143,6 +143,9 @@ static VOID NOTEPAD_InitData(VOID) *p = '\0'; Globals.hDevMode = NULL; Globals.hDevNames = NULL; + + CheckMenuItem(GetMenu(Globals.hMainWnd), CMD_WRAP, + MF_BYCOMMAND | (Globals.bWrapLongLines ? MF_CHECKED : MF_UNCHECKED)); } /*********************************************************************** @@ -178,11 +181,15 @@ static LRESULT WINAPI NOTEPAD_WndProc(HW case WM_CREATE: { static const WCHAR editW[] = { 'e','d','i','t',0 }; + DWORD dwStyle = WS_CHILD | WS_VISIBLE | WS_BORDER | WS_VSCROLL | + ES_AUTOVSCROLL | ES_MULTILINE; RECT rc; GetClientRect(hWnd, &rc); + + if (!Globals.bWrapLongLines) dwStyle |= WS_HSCROLL | ES_AUTOHSCROLL; + Globals.hEdit = CreateWindowEx(WS_EX_CLIENTEDGE, editW, NULL, - WS_CHILD | WS_VISIBLE | WS_BORDER | WS_VSCROLL | WS_HSCROLL | - ES_AUTOVSCROLL | ES_MULTILINE, + dwStyle, 0, 0, rc.right, rc.bottom, hWnd, NULL, Globals.hInstance, NULL); NOTEPAD_InitFont(); @@ -370,6 +377,7 @@ int PASCAL WinMain(HINSTANCE hInstance, ZeroMemory(&Globals, sizeof(Globals)); Globals.hInstance = hInstance; + Globals.bWrapLongLines = TRUE; ZeroMemory(&class, sizeof(class)); class.cbSize = sizeof(class);

1 0

Eric Pouech : kernel32: Implemented ClearCommError on top of GET_COMM_STATUS ioctl.
by Alexandre Julliard Feb. 28, 2006

Feb. 28, 2006

Module: wine Branch: refs/heads/master Commit: 8e5d2bdba638ec4fd837318d63e38183f1fee736 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=8e5d2bdba638ec4fd837318… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Mon Feb 27 22:22:06 2006 +0100 kernel32: Implemented ClearCommError on top of GET_COMM_STATUS ioctl. --- dlls/kernel/comm.c | 64 ++++++++++++++++++++++++---------------------------- 1 files changed, 30 insertions(+), 34 deletions(-) diff --git a/dlls/kernel/comm.c b/dlls/kernel/comm.c index f0c4dce..cd25666 100644 --- a/dlls/kernel/comm.c +++ b/dlls/kernel/comm.c @@ -833,51 +833,47 @@ BOOL WINAPI PurgeComm(HANDLE handle, DWO * Enables further I/O operations on a communications resource after * supplying error and current status information. * + * PARAMS + * + * handle [in] The communication resource with the error + * errors [out] Flags indicating error the resource experienced + * lpStat [out] The status of the communication resource * RETURNS * * True on success, false if the communication resource handle is bad. */ -BOOL WINAPI ClearCommError( - HANDLE handle, /* [in] The communication resource with the error. */ - LPDWORD errors, /* [out] Flags indicating error the resource experienced. */ - LPCOMSTAT lpStat) /* [out] The status of the communication resource. */ +BOOL WINAPI ClearCommError(HANDLE handle, LPDWORD errors, LPCOMSTAT lpStat) { - int fd; + SERIAL_STATUS ss; - fd=get_comm_fd( handle, FILE_READ_DATA ); - if(0>fd) return FALSE; + if (!DeviceIoControl(handle, IOCTL_SERIAL_GET_COMMSTATUS, NULL, 0, + &ss, sizeof(ss), NULL, NULL)) + return FALSE; + if (errors) + { + *errors = 0; + if (ss.Errors & SERIAL_ERROR_BREAK) *errors |= CE_BREAK; + if (ss.Errors & SERIAL_ERROR_FRAMING) *errors |= CE_FRAME; + if (ss.Errors & SERIAL_ERROR_OVERRUN) *errors |= CE_OVERRUN; + if (ss.Errors & SERIAL_ERROR_QUEUEOVERRUN) *errors |= CE_RXOVER; + if (ss.Errors & SERIAL_ERROR_PARITY) *errors |= CE_RXPARITY; + } + if (lpStat) { - lpStat->fCtsHold = 0; - lpStat->fDsrHold = 0; - lpStat->fRlsdHold = 0; - lpStat->fXoffHold = 0; - lpStat->fXoffSent = 0; - lpStat->fEof = 0; - lpStat->fTxim = 0; - lpStat->fReserved = 0; - -#ifdef TIOCOUTQ - if(ioctl(fd, TIOCOUTQ, &lpStat->cbOutQue)) - WARN("ioctl returned error\n"); -#else - lpStat->cbOutQue = 0; /* FIXME: find a different way to find out */ -#endif - -#ifdef TIOCINQ - if(ioctl(fd, TIOCINQ, &lpStat->cbInQue)) - WARN("ioctl returned error\n"); -#endif + memset(lpStat, 0, sizeof(*lpStat)); - TRACE("handle %p cbInQue = %ld cbOutQue = %ld\n", - handle, lpStat->cbInQue, lpStat->cbOutQue); + if (ss.HoldReasons & SERIAL_TX_WAITING_FOR_CTS) lpStat->fCtsHold = TRUE; + if (ss.HoldReasons & SERIAL_TX_WAITING_FOR_DSR) lpStat->fDsrHold = TRUE; + if (ss.HoldReasons & SERIAL_TX_WAITING_FOR_DCD) lpStat->fRlsdHold = TRUE; + if (ss.HoldReasons & SERIAL_TX_WAITING_FOR_XON) lpStat->fXoffHold = TRUE; + if (ss.HoldReasons & SERIAL_TX_WAITING_XOFF_SENT) lpStat->fXoffSent = TRUE; + if (ss.EofReceived) lpStat->fEof = TRUE; + if (ss.WaitForImmediate) lpStat->fTxim = TRUE; + lpStat->cbInQue = ss.AmountInInQueue; + lpStat->cbOutQue = ss.AmountInOutQueue; } - - release_comm_fd( handle, fd ); - - if (errors) *errors = 0; /* FIXME */ - return TRUE; }

1 0

Eric Pouech : ntdll: Implemented serial IOCTL for status: GET_COMM_STATUS.
by Alexandre Julliard Feb. 28, 2006

Feb. 28, 2006

Module: wine Branch: refs/heads/master Commit: a6d339c6560c2d371dc856c8ab2c1b25d216abe9 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=a6d339c6560c2d371dc856c… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Mon Feb 27 22:22:06 2006 +0100 ntdll: Implemented serial IOCTL for status: GET_COMM_STATUS. --- dlls/ntdll/serial.c | 38 ++++++++++++++++++++++++++++++++++++++ 1 files changed, 38 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/serial.c b/dlls/ntdll/serial.c index 04f9534..879f6f1 100644 --- a/dlls/ntdll/serial.c +++ b/dlls/ntdll/serial.c @@ -168,6 +168,36 @@ static NTSTATUS get_modem_status(int fd, return status; } +static NTSTATUS get_status(int fd, SERIAL_STATUS* ss) +{ + NTSTATUS status = STATUS_SUCCESS; + + ss->Errors = 0; + ss->HoldReasons = 0; + ss->EofReceived = FALSE; + ss->WaitForImmediate = FALSE; +#ifdef TIOCOUTQ + if (ioctl(fd, TIOCOUTQ, &ss->AmountInOutQueue) == -1) + { + WARN("ioctl returned error\n"); + status = FILE_GetNtStatus(); + } +#else + ss->AmountInOutQueue = 0; /* FIXME: find a different way to find out */ +#endif + +#ifdef TIOCINQ + if (ioctl(fd, TIOCINQ, &ss->AmountInInQueue)) + { + WARN("ioctl returned error\n"); + status = FILE_GetNtStatus(); + } +#else + ss->AmountInInQueue = 0; /* FIXME: find a different way to find out */ +#endif + return status; +} + static NTSTATUS get_wait_mask(HANDLE hDevice, DWORD* mask) { NTSTATUS status; @@ -247,6 +277,14 @@ NTSTATUS COMM_DeviceIoControl(HANDLE hDe switch (dwIoControlCode) { + case IOCTL_SERIAL_GET_COMMSTATUS: + if (lpOutBuffer && nOutBufferSize == sizeof(SERIAL_STATUS)) + { + if (!(status = get_status(fd, (SERIAL_STATUS*)lpOutBuffer))) + sz = sizeof(SERIAL_STATUS); + } + else status = STATUS_INVALID_PARAMETER; + break; case IOCTL_SERIAL_GET_MODEMSTATUS: if (lpOutBuffer && nOutBufferSize == sizeof(DWORD)) {

1 0

Alexandre Julliard : wrc: Integer ids can be used for control labels instead of strings.
by Alexandre Julliard Feb. 28, 2006

Feb. 28, 2006

Module: wine Branch: refs/heads/master Commit: 8f08fe6c0dc9ad3f2d5e00f2b79488eba622cd26 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=8f08fe6c0dc9ad3f2d5e00f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 28 15:27:25 2006 +0100 wrc: Integer ids can be used for control labels instead of strings. --- tools/wrc/parser.y | 12 ++++-------- 1 files changed, 4 insertions(+), 8 deletions(-) diff --git a/tools/wrc/parser.y b/tools/wrc/parser.y index d001ce2..af8f14b 100644 --- a/tools/wrc/parser.y +++ b/tools/wrc/parser.y @@ -896,11 +896,9 @@ ctrls : /* Empty */ { $$ = NULL; } ; lab_ctrl - : tSTRING opt_comma expr ',' expr ',' expr ',' expr ',' expr optional_style_pair { + : nameid_s opt_comma expr ',' expr ',' expr ',' expr ',' expr optional_style_pair { $$=new_control(); - $$->title = new_name_id(); - $$->title->type = name_str; - $$->title->name.s_name = $1; + $$->title = $1; $$->id = $3; $$->x = $5; $$->y = $7; @@ -1156,11 +1154,9 @@ gen_exctrl ; lab_exctrl - : tSTRING opt_comma expr ',' expr ',' expr ',' expr ',' expr optional_style_pair helpid opt_data { + : nameid_s opt_comma expr ',' expr ',' expr ',' expr ',' expr optional_style_pair helpid opt_data { $$=new_control(); - $$->title = new_name_id(); - $$->title->type = name_str; - $$->title->name.s_name = $1; + $$->title = $1; $$->id = $3; $$->x = $5; $$->y = $7;

1 0

Alexandre Julliard : winnls32: Renamed the winnls directory to winnls32.
by Alexandre Julliard Feb. 28, 2006

Feb. 28, 2006

Module: wine Branch: refs/heads/master Commit: 1b32901b7bff946f754b50c509cccd23c6ee1574 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=1b32901b7bff946f754b50c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 28 13:02:42 2006 +0100 winnls32: Renamed the winnls directory to winnls32. --- configure | 4 ++-- configure.ac | 2 +- dlls/.gitignore | 1 - dlls/Makefile.in | 18 ++++++---------- dlls/winnls/.gitignore | 2 -- dlls/winnls/Makefile.in | 16 -------------- dlls/winnls/winnls.c | 49 ------------------------------------------- dlls/winnls/winnls.spec | 30 -------------------------- dlls/winnls/winnls32.spec | 7 ------ dlls/winnls32/.gitignore | 2 ++ dlls/winnls32/Makefile.in | 16 ++++++++++++++ dlls/winnls32/winnls.c | 49 +++++++++++++++++++++++++++++++++++++++++++ dlls/winnls32/winnls.spec | 30 ++++++++++++++++++++++++++ dlls/winnls32/winnls32.spec | 7 ++++++ 14 files changed, 114 insertions(+), 119 deletions(-) delete mode 100644 dlls/winnls/.gitignore delete mode 100644 dlls/winnls/Makefile.in delete mode 100644 dlls/winnls/winnls.c delete mode 100644 dlls/winnls/winnls.spec delete mode 100644 dlls/winnls/winnls32.spec create mode 100644 dlls/winnls32/.gitignore create mode 100644 dlls/winnls32/Makefile.in create mode 100644 dlls/winnls32/winnls.c create mode 100644 dlls/winnls32/winnls.spec create mode 100644 dlls/winnls32/winnls32.spec Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=1b32901b7bff946f754…

1 0

Alexandre Julliard : wnaspi32: Renamed the winaspi directory to wnaspi32.
by Alexandre Julliard Feb. 28, 2006

Feb. 28, 2006

Module: wine Branch: refs/heads/master Commit: 071f5f25db19994fa5a687540bfe4bbd0d1cd149 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=071f5f25db19994fa5a6875… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 28 12:59:52 2006 +0100 wnaspi32: Renamed the winaspi directory to wnaspi32. --- configure | 4 configure.ac | 2 dlls/.gitignore | 1 dlls/Makefile.in | 18 - dlls/winaspi/.gitignore | 2 dlls/winaspi/Makefile.in | 21 - dlls/winaspi/aspi.c | 352 ------------------------ dlls/winaspi/aspi.h | 84 ------ dlls/winaspi/winaspi.spec | 5 dlls/winaspi/winaspi16.c | 491 --------------------------------- dlls/winaspi/winaspi32.c | 636 ------------------------------------------- dlls/winaspi/winescsi.h | 127 --------- dlls/winaspi/wnaspi32.spec | 13 - dlls/wnaspi32/.gitignore | 2 dlls/wnaspi32/Makefile.in | 21 + dlls/wnaspi32/aspi.c | 352 ++++++++++++++++++++++++ dlls/wnaspi32/aspi.h | 84 ++++++ dlls/wnaspi32/winaspi.spec | 5 dlls/wnaspi32/winaspi16.c | 491 +++++++++++++++++++++++++++++++++ dlls/wnaspi32/winaspi32.c | 636 +++++++++++++++++++++++++++++++++++++++++++ dlls/wnaspi32/winescsi.h | 127 +++++++++ dlls/wnaspi32/wnaspi32.spec | 13 + 22 files changed, 1741 insertions(+), 1746 deletions(-) delete mode 100644 dlls/winaspi/.gitignore delete mode 100644 dlls/winaspi/Makefile.in delete mode 100644 dlls/winaspi/aspi.c delete mode 100644 dlls/winaspi/aspi.h delete mode 100644 dlls/winaspi/winaspi.spec delete mode 100644 dlls/winaspi/winaspi16.c delete mode 100644 dlls/winaspi/winaspi32.c delete mode 100644 dlls/winaspi/winescsi.h delete mode 100644 dlls/winaspi/wnaspi32.spec create mode 100644 dlls/wnaspi32/.gitignore create mode 100644 dlls/wnaspi32/Makefile.in create mode 100644 dlls/wnaspi32/aspi.c create mode 100644 dlls/wnaspi32/aspi.h create mode 100644 dlls/wnaspi32/winaspi.spec create mode 100644 dlls/wnaspi32/winaspi16.c create mode 100644 dlls/wnaspi32/winaspi32.c create mode 100644 dlls/wnaspi32/winescsi.h create mode 100644 dlls/wnaspi32/wnaspi32.spec Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=071f5f25db19994fa5a…

1 0

Alexandre Julliard : lz32: Renamed lzexpand directory to lz32.
by Alexandre Julliard Feb. 28, 2006

Feb. 28, 2006

Module: wine Branch: refs/heads/master Commit: 556242b71dfa565519006d1845e4d2ec62af1373 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=556242b71dfa565519006d1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 28 12:54:48 2006 +0100 lz32: Renamed lzexpand directory to lz32. --- configure | 6 + configure.ac | 4 - dlls/.gitignore | 1 dlls/Makefile.in | 18 +-- dlls/lz32/.gitignore | 2 dlls/lz32/Makefile.in | 18 +++ dlls/lz32/lz32.spec | 12 ++ dlls/lz32/lzexpand.spec | 12 ++ dlls/lz32/lzexpand16.c | 152 ++++++++++++++++++++++++++ dlls/lz32/lzexpand_main.c | 1 dlls/lz32/tests/.gitignore | 3 + dlls/lz32/tests/Makefile.in | 13 ++ dlls/lz32/tests/lzexpand_main.c | 208 +++++++++++++++++++++++++++++++++++ dlls/lzexpand/.gitignore | 2 dlls/lzexpand/Makefile.in | 18 --- dlls/lzexpand/lz32.spec | 12 -- dlls/lzexpand/lzexpand.spec | 12 -- dlls/lzexpand/lzexpand16.c | 152 -------------------------- dlls/lzexpand/lzexpand_main.c | 1 dlls/lzexpand/tests/.gitignore | 3 - dlls/lzexpand/tests/Makefile.in | 13 -- dlls/lzexpand/tests/lzexpand_main.c | 208 ----------------------------------- programs/winetest/Makefile.in | 4 - 23 files changed, 435 insertions(+), 440 deletions(-) create mode 100644 dlls/lz32/.gitignore create mode 100644 dlls/lz32/Makefile.in create mode 100644 dlls/lz32/lz32.spec create mode 100644 dlls/lz32/lzexpand.spec create mode 100644 dlls/lz32/lzexpand16.c create mode 100644 dlls/lz32/lzexpand_main.c create mode 100644 dlls/lz32/tests/.gitignore create mode 100644 dlls/lz32/tests/Makefile.in create mode 100644 dlls/lz32/tests/lzexpand_main.c delete mode 100644 dlls/lzexpand/.gitignore delete mode 100644 dlls/lzexpand/Makefile.in delete mode 100644 dlls/lzexpand/lz32.spec delete mode 100644 dlls/lzexpand/lzexpand.spec delete mode 100644 dlls/lzexpand/lzexpand16.c delete mode 100644 dlls/lzexpand/lzexpand_main.c delete mode 100644 dlls/lzexpand/tests/.gitignore delete mode 100644 dlls/lzexpand/tests/Makefile.in delete mode 100644 dlls/lzexpand/tests/lzexpand_main.c Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=556242b71dfa5655190…

1 0

Alexandre Julliard : ntdll: Don' t reset the load count when reusing a builtin modref.
by Alexandre Julliard Feb. 28, 2006

Feb. 28, 2006

Module: wine Branch: refs/heads/master Commit: 0335a4b910718bfd0ff14dc04a1348b6793d8372 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=0335a4b910718bfd0ff14dc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 28 12:41:25 2006 +0100 ntdll: Don't reset the load count when reusing a builtin modref. --- dlls/ntdll/loader.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 546d029..cdd860c 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -1420,6 +1420,7 @@ static NTSTATUS load_native_dll( LPCWSTR TRACE_(loaddll)( " Loaded module %s : native\n", debugstr_w(wm->ldr.FullDllName.Buffer) ); + wm->ldr.LoadCount = 1; *pwm = wm; return STATUS_SUCCESS; } @@ -1536,10 +1537,12 @@ static NTSTATUS load_builtin_dll( LPCWST } } if (!info.wm) return STATUS_INVALID_IMAGE_FORMAT; + if (info.wm->ldr.LoadCount != -1) info.wm->ldr.LoadCount++; } else { TRACE_(loaddll)( "Loaded module %s : builtin\n", debugstr_w(info.wm->ldr.FullDllName.Buffer) ); + info.wm->ldr.LoadCount = 1; info.wm->ldr.SectionHandle = handle; } @@ -1738,9 +1741,6 @@ static NTSTATUS load_dll( LPCWSTR load_p TRACE("Loaded module %s (%s) at %p\n", debugstr_w(filename), ((*pwm)->ldr.Flags & LDR_WINE_INTERNAL) ? "builtin" : "native", (*pwm)->ldr.BaseAddress); - /* Set the ldr.LoadCount here so that an attach failure will */ - /* decrement the dependencies through the MODULE_FreeLibrary call. */ - (*pwm)->ldr.LoadCount = 1; if (handle) NtClose( handle ); if (filename != buffer) RtlFreeHeap( GetProcessHeap(), 0, filename ); return nts;

1 0

Detlef Riekenberg : wine.inf: Add printing section for local port monitor.
by Alexandre Julliard Feb. 28, 2006

Feb. 28, 2006

Module: wine Branch: refs/heads/master Commit: 8a8a54877e1df85222aeb68c49571d933ff62aa8 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=8a8a54877e1df85222aeb68… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Thu Feb 23 00:20:19 2006 +0100 wine.inf: Add printing section for local port monitor. --- tools/wine.inf | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/tools/wine.inf b/tools/wine.inf index e16264d..b94a3a5 100644 --- a/tools/wine.inf +++ b/tools/wine.inf @@ -42,6 +42,7 @@ AddReg=\ Misc,\ Nls,\ OLE,\ + Printing,\ Tapi,\ Timezones @@ -62,6 +63,7 @@ AddReg=\ Misc,\ Nls,\ OLE,\ + Printing,\ Tapi,\ Timezones,\ VersionInfo @@ -609,6 +611,9 @@ HKLM,System\CurrentControlSet\Control\Nl HKLM,"Software\Microsoft\OLE","EnableDCOM",,"Y" HKLM,"Software\Microsoft\OLE","EnableRemoteConnect",,"N" +[Printing] +HKLM,%Control%\Print\Monitors\Local Port,"Driver",2,"localspl.dll" + [Tapi] HKLM,%CurrentVersion%\Telephony,"Perf1",0x10001,0x5045524a HKLM,%CurrentVersion%\Telephony,"Perf2",0x10001,0x50455246

1 0

Robert Reif : dsound: Fix duplex create bug.
by Alexandre Julliard Feb. 28, 2006

Feb. 28, 2006

Module: wine Branch: refs/heads/master Commit: 919ee6b699815f9d105184462643222a7bb67221 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=919ee6b699815f9d1051844… Author: Robert Reif <reif(a)earthlink.net> Date: Mon Feb 27 07:34:01 2006 -0500 dsound: Fix duplex create bug. --- dlls/dsound/duplex.c | 20 ++++++++++++++++++++ 1 files changed, 20 insertions(+), 0 deletions(-) diff --git a/dlls/dsound/duplex.c b/dlls/dsound/duplex.c index 7ba0eb6..3a10bab 100644 --- a/dlls/dsound/duplex.c +++ b/dlls/dsound/duplex.c @@ -258,6 +258,12 @@ HRESULT IDirectSoundFullDuplex_IDirectSo return DSERR_INVALIDPARAM; } + if (((IDirectSoundFullDuplexImpl*)pdsfd)->renderer_device == NULL) { + WARN("not initialized\n"); + *ppds = NULL; + return DSERR_UNINITIALIZED; + } + pdsfdds = HeapAlloc(GetProcessHeap(),0,sizeof(*pdsfdds)); if (pdsfdds == NULL) { WARN("out of memory\n"); @@ -417,6 +423,12 @@ HRESULT IDirectSoundFullDuplex_IDirectSo return DSERR_INVALIDPARAM; } + if (((IDirectSoundFullDuplexImpl*)pdsfd)->renderer_device == NULL) { + WARN("not initialized\n"); + *ppds8 = NULL; + return DSERR_UNINITIALIZED; + } + pdsfdds8 = HeapAlloc(GetProcessHeap(),0,sizeof(*pdsfdds8)); if (pdsfdds8 == NULL) { WARN("out of memory\n"); @@ -525,6 +537,12 @@ HRESULT IDirectSoundFullDuplex_IDirectSo return DSERR_INVALIDPARAM; } + if (((IDirectSoundFullDuplexImpl*)pdsfd)->capture_device == NULL) { + WARN("not initialized\n"); + *ppdsc8 = NULL; + return DSERR_UNINITIALIZED; + } + pdsfddsc = HeapAlloc(GetProcessHeap(),0,sizeof(*pdsfddsc)); if (pdsfddsc == NULL) { WARN("out of memory\n"); @@ -774,6 +792,8 @@ HRESULT DSOUND_FullDuplexCreate(LPDIRECT This->capture_device = NULL; This->renderer_device = NULL; + *ppDSFD = (LPDIRECTSOUNDFULLDUPLEX)This; + return DS_OK; }

1 0