February 2006 - Wine-Commits

Fatih Aşıcı : avifil32: Turkish translation.
by Alexandre Julliard Feb. 6, 2006

Feb. 6, 2006

Module: wine Branch: refs/heads/master Commit: e9d5e194e9237a0f0bd688b33ba4ab419240485d URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=e9d5e194e9237a0f0bd688b… Author: Fatih Aşıcı <fasici(a)linux-sevenler.org> Date: Mon Feb 6 13:02:41 2006 +0100 avifil32: Turkish translation. --- dlls/avifil32/avifile_Tr.rc | 50 +++++++++++++++++++++++++++++++++++++++++++ dlls/avifil32/rsrc.rc | 1 + 2 files changed, 51 insertions(+), 0 deletions(-) create mode 100644 dlls/avifil32/avifile_Tr.rc diff --git a/dlls/avifil32/avifile_Tr.rc b/dlls/avifil32/avifile_Tr.rc new file mode 100644 index 0000000..26089ce --- /dev/null +++ b/dlls/avifil32/avifile_Tr.rc @@ -0,0 +1,50 @@ +/* + * Copyright 2006 Fatih A��c� + * + * 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_TURKISH, SUBLANG_DEFAULT + +IDD_SAVEOPTIONS DIALOG FIXED IMPURE 43, 37, 196, 82 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "S�k��t�rma se�enekleri" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Bir ak�� se&�in:",-1,2,5,114,10 + COMBOBOX IDC_STREAM,2,18,134,61,CBS_DROPDOWNLIST | WS_VSCROLL | + WS_TABSTOP + PUSHBUTTON "&Se�enekler...",IDC_OPTIONS,145,17,45,14 + AUTOCHECKBOX "&Interleave every",IDC_INTERLEAVE,3,42,60,11,WS_TABSTOP + EDITTEXT IDC_INTERLEAVEEVERY,66,41,32,12,ES_AUTOHSCROLL + LTEXT "frames",-1,104,43,36,9 + LTEXT "Ge�erli bi�im:",-1,3,56,53,9 + LTEXT "This space for rent",IDC_FORMATTEXT,55,56,90,26 + DEFPUSHBUTTON "Tamam",IDOK,145,42,45,14 + PUSHBUTTON "�ptal",IDCANCEL,145,61,45,14 +END + +STRINGTABLE DISCARDABLE +{ + IDS_WAVESTREAMFORMAT "Waveform: %s" + IDS_WAVEFILETYPE "Waveform" + IDS_ALLMULTIMEDIA "T�m �okluortam dosyalar�" + IDS_ALLFILES "T�m dosyalar (*.*)(a)*.*" + IDS_VIDEO "vidyo" + IDS_AUDIO "ses" + IDS_AVISTREAMFORMAT "%s %s #%d" + IDS_AVIFILETYPE "Wine AVI-default-filehandler" + IDS_UNCOMPRESSED "s�k��t�r�lmam��" +} diff --git a/dlls/avifil32/rsrc.rc b/dlls/avifil32/rsrc.rc index 0821ae5..a420171 100644 --- a/dlls/avifil32/rsrc.rc +++ b/dlls/avifil32/rsrc.rc @@ -52,3 +52,4 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL #include "avifile_Pt.rc" #include "avifile_Ru.rc" #include "avifile_Si.rc" +#include "avifile_Tr.rc"

1 0

Mike McCormack : ntdll: Add some more tests for NtNotifyChangeDirectoryFile.
by Alexandre Julliard Feb. 6, 2006

Feb. 6, 2006

Module: wine Branch: refs/heads/master Commit: bad5f92f540da2e7da9d1dad77a12b6a3e860b35 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=bad5f92f540da2e7da9d1da… Author: Mike McCormack <mike(a)codeweavers.com> Date: Mon Feb 6 11:59:01 2006 +0100 ntdll: Add some more tests for NtNotifyChangeDirectoryFile. --- dlls/ntdll/tests/change.c | 230 ++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 217 insertions(+), 13 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=bad5f92f540da2e7da9…

1 0

Mike McCormack : server: Fill in NtNotifyChangeDirectoryFile's buffer with change data.
by Alexandre Julliard Feb. 6, 2006

Feb. 6, 2006

Module: wine Branch: refs/heads/master Commit: 01932119464a2a97421daeee1cdd8200646a67a1 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=01932119464a2a97421daee… Author: Mike McCormack <mike(a)codeweavers.com> Date: Mon Feb 6 11:58:55 2006 +0100 server: Fill in NtNotifyChangeDirectoryFile's buffer with change data. --- dlls/kernel/change.c | 43 ++++++++++++------ dlls/ntdll/directory.c | 93 +++++++++++++++++++++++++++++++++++++++- include/wine/server_protocol.h | 21 +++++++++ server/change.c | 92 +++++++++++++++++++++++++++++++++++++--- server/protocol.def | 11 +++++ server/request.h | 2 + server/trace.c | 20 ++++++++- 7 files changed, 257 insertions(+), 25 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=01932119464a2a97421…

1 0

Stefan Leichter : kernel: Added a test for QueryDosDeviceA.
by Alexandre Julliard Feb. 6, 2006

Feb. 6, 2006

Module: wine Branch: refs/heads/master Commit: acb52e52723189b3a693344dca108d5d9bbec8c9 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=acb52e52723189b3a693344… Author: Stefan Leichter <Stefan.Leichter(a)camLine.com> Date: Mon Feb 6 11:57:02 2006 +0100 kernel: Added a test for QueryDosDeviceA. --- dlls/kernel/tests/.gitignore | 1 + dlls/kernel/tests/Makefile.in | 3 ++ dlls/kernel/tests/volume.c | 51 +++++++++++++++++++++++++++++++++++++++++ 3 files changed, 54 insertions(+), 1 deletions(-) create mode 100644 dlls/kernel/tests/volume.c diff --git a/dlls/kernel/tests/.gitignore b/dlls/kernel/tests/.gitignore index e65a852..9546859 100644 --- a/dlls/kernel/tests/.gitignore +++ b/dlls/kernel/tests/.gitignore @@ -25,3 +25,4 @@ thread.ok time.ok timer.ok virtual.ok +volume.ok diff --git a/dlls/kernel/tests/Makefile.in b/dlls/kernel/tests/Makefile.in index 6968d3c..9543047 100644 --- a/dlls/kernel/tests/Makefile.in +++ b/dlls/kernel/tests/Makefile.in @@ -30,7 +30,8 @@ CTESTS = \ thread.c \ time.c \ timer.c \ - virtual.c + virtual.c \ + volume.c @MAKE_TEST_RULES@ diff --git a/dlls/kernel/tests/volume.c b/dlls/kernel/tests/volume.c new file mode 100644 index 0000000..98972dd --- /dev/null +++ b/dlls/kernel/tests/volume.c @@ -0,0 +1,51 @@ +/* + * Unit test suite + * + * Copyright 2006 Stefan Leichter + * + * 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 + */ + +#include "wine/test.h" +#include "winbase.h" + +#define CDROM "CDROM" +#define FLOPPY "FLOPPY" +#define HARDISK "HARDDISK" +#define LANMAN "LANMANREDIRECTOR" +#define RAMDISK "RAMDISK" + +static void test_query_dos_deviceA(void) +{ + char drivestr[] = "a:"; + char *p, buffer[2000]; + DWORD ret; + for (;drivestr[0] <= 'z'; drivestr[0]++) { + ret = QueryDosDeviceA( drivestr, buffer, sizeof(buffer)); + if(ret) { + for (p = buffer; *p; p++) *p = toupper(*p); + todo_wine + ok( strstr( buffer, CDROM) || strstr( buffer, FLOPPY) || + strstr( buffer, HARDISK) || strstr( buffer, LANMAN) || + strstr( buffer, RAMDISK), "expect the string %s contains %s,%s,%s,%s or %s\n", + buffer, CDROM, FLOPPY, HARDISK, LANMAN, RAMDISK); + } + } +} + +START_TEST(volume) +{ + test_query_dos_deviceA(); +}

1 0

Alexander N. Sørnes : Norwegian Bokmål updates.
by Alexandre Julliard Feb. 6, 2006

Feb. 6, 2006

Module: wine Branch: refs/heads/master Commit: 31afe883d7e729663034ec15edebda42c353c551 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=31afe883d7e729663034ec1… Author: Alexander N. Sørnes <alex(a)thehandofagony.com> Date: Mon Feb 6 11:43:16 2006 +0100 Norwegian Bokmål updates. --- programs/clock/No.rc | 26 +++++++++++++++++++++++++- programs/progman/No.rc | 26 +++++++++++++++++++++++++- programs/winecfg/No.rc | 14 +++++++++++++- programs/winefile/No.rc | 26 +++++++++++++++++++++++++- 4 files changed, 88 insertions(+), 4 deletions(-) diff --git a/programs/clock/No.rc b/programs/clock/No.rc index 1a29943..e278c18 100644 --- a/programs/clock/No.rc +++ b/programs/clock/No.rc @@ -1,7 +1,7 @@ /* * Clock (Norwegian Bokm�l resources) * - * Copyright 2005 Alexander N. S�rnes <alex(a)thehandofagony.com> + * Copyright 2005-2006 Alexander N. S�rnes <alex(a)thehandofagony.com> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -46,3 +46,27 @@ STRINGTABLE DISCARDABLE { IDS_CLOCK, "Klokke" } + +STRINGTABLE DISCARDABLE LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL +{ +IDS_LICENSE_CAPTION, "LISENS" +IDS_LICENSE, +"Dette biblioteket er fri programvare; du kan redistribuere det \ +og/eller endre det under vilk�rene i �GNU Lesser General Public \ +License�, utgitt av the Free Software Foundation; enten \ +versjon 2.1 av Lisensen, eller (hvis du �nsker det) en nyere versjon.\n\ +Dette biblioteket distribueres i det h�p at det er nyttig, \ +men UTEN ENHVER GARANTI; ikke engang den uttrykte garantien for \ +HANDELSDYKTIGHET eller EGNETHET FOR ET SPESIELT FORM�L. Se �GNU \ +Lesser General Public License� for flere detaljer.\n\ +Du skal ha mottatt et eksempal av �GNU Lesser General Public \ +License� sammen med dette biblioteket; hvis ikke, skriv til: the Free Software \ +Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA" + +IDS_WARRANTY_CAPTION, "INGEN GARANTI" +IDS_WARRANTY, +"Dette biblioteket distribueres i det h�p at det er nyttig, \ +men UTEN ENHVER GARANTI; ikke engang den uttrykte garantien for \ +HANDELSDYKTIGHET eller EGNETHET FOR ET SPESIELT FORM�L. Se �GNU \ +Lesser General Public License� for flere detaljer." +} diff --git a/programs/progman/No.rc b/programs/progman/No.rc index 928c166..0272cad 100644 --- a/programs/progman/No.rc +++ b/programs/progman/No.rc @@ -1,7 +1,7 @@ /* * Program Manager * - * Copyright 2005 Alexander N. S�rnes <alex(a)thehandofagony.com> + * Copyright 2005-2006 Alexander N. S�rnes <alex(a)thehandofagony.com> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -218,3 +218,27 @@ IDS_LIBRARIES_DLL, "Biblioteker (*.dll) IDS_SYMBOL_FILES, "Ikonfiler" IDS_SYMBOLS_ICO, "Ikoner (*.ico)" } + +STRINGTABLE DISCARDABLE LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL +{ +IDS_LICENSE_CAPTION, "LISENS" +IDS_LICENSE, +"Dette biblioteket er fri programvare; du kan redistribuere det \ +og/eller endre det under vilk�rene i �GNU Lesser General Public \ +License�, utgitt av the Free Software Foundation; enten \ +versjon 2.1 av Lisensen, eller (hvis du �nsker det) en nyere versjon.\n\ +Dette biblioteket distribueres i h�p om at det er nyttig, \ +men UTEN ENHVER GARANTI; ikke engang en uttrykte garantien for \ +HANDELSDYKTIGHET eller EGNETHET FOR ET SPESIELT FORM�L. Se �GNU \ +Lesser General Public License� for flere detaljer.\n\ +Du skal ha mottatt et eksemplar av �GNU Lesser General Public \ +License� sammen med dette biblioteket; hvis ikke, skriv til: the Free Software \ +Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA" + +IDS_WARRANTY_CAPTION, "INGEN GARANTI" +IDS_WARRANTY, +"Dette biblioteket distribueres i det h�p at det er nyttig, \ +men UTEN ENHVER GARANTI; ikke engang en uttrykte garantien for \ +HANDELSDYKTIGHET eller EGNETHET FOR ET SPESIELT FORM�L. Se �GNU \ +Lesser General Public License� for flere detaljer." +} diff --git a/programs/winecfg/No.rc b/programs/winecfg/No.rc index 978ff58..1313c57 100644 --- a/programs/winecfg/No.rc +++ b/programs/winecfg/No.rc @@ -2,7 +2,7 @@ * WineCfg resources * Norwegian Bokm�l Language Support * - * Copyright 2005 Alexander N. S�rnes + * Copyright 2005-2006 Alexander N. S�rnes <alex(a)thehandofagony.com> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -198,4 +198,16 @@ BEGIN IDS_WINECFG_TITLE "Oppsett av Wine" IDS_THEMEFILE "Temafiler" IDS_THEMEFILE_SELECT "Velg en temafil" + IDS_AUDIO_MISSING "Ingen lyddriver er oppgitt i registeret.\n\nEn anbefalt driver er valgt for deg;\nbruk den eller velg en annen,\n\nog trykk �Bruk� for at endringene skal tre i kraft." + END + + STRINGTABLE DISCARDABLE + BEGIN + IDS_DLL_WARNING "Endring av lastingsrekkef�lgen for dette biblioteket anbefales ikke.\nEr du sikker p� at du vil gj�re det?" + IDS_DLL_WARNING_CAPTION "Advarsel: systembibliotek" + IDS_DLL_NATIVE "innf�dt" + IDS_DLL_BUILTIN "innebygget" + IDS_DLL_NATIVE_BUILTIN "innf�dt, innebygget" + IDS_DLL_BUILTIN_NATIVE "innebygget, innf�dt" + IDS_DLL_DISABLED "sl�tt av" END diff --git a/programs/winefile/No.rc b/programs/winefile/No.rc index 90b055a..598db0d 100644 --- a/programs/winefile/No.rc +++ b/programs/winefile/No.rc @@ -2,7 +2,7 @@ * WineFile * Norwegian Bokm�l Language Support * - * Copyright 2005 Alexander N. S�rnes <alex(a)thehandofagony.com> + * Copyright 2005-2006 Alexander N. S�rnes <alex(a)thehandofagony.com> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -260,3 +260,27 @@ STRINGTABLE IDS_FREE_SPACE_FMT "%s av %s ledig" } + +STRINGTABLE +{ +IDS_LICENSE_CAPTION, "LISENS" +IDS_LICENSE, +"Dette biblioteket er fri programvare; du kan redistribuere det \ +og/eller endre det under vilk�rene i �GNU Lesser General Public \ +License�, utgitt av the Free Software Foundation; enten \ +versjon 2.1 av Lisensen, eller (hvis du �nsker det) en nyere versjon.\n\ +Dette biblioteket distribueres i h�p om at det er nyttig, \ +men UTEN ENHVER GARANTI; ikke engang den uttrykte garantien for \ +HANDELSDYKTIGHET eller EGNETHET FOR ET SPESIELT FORM�L. Se �GNU \ +Lesser General Public License� for flere detaljer.\n\ +Du skal ha mottatt et eksemplar av �GNU Lesser General Public \ +License� sammen med dette biblioteket; hvis ikke, skriv til: the Free Software \ +Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA" + +IDS_WARRANTY_CAPTION, "INGEN GARANTI" +IDS_WARRANTY, +"Dette biblioteket distribueres i h�p om at det er nyttig, \ +men UTEN ENHVER GARANTI; ikke engang en uttrykte garantien for \ +HANDELSDYKTIGHET eller EGNETHET FOR ET SPESIELT FORM�L. Se �GNU \ +Lesser General Public License� for flere detaljer." +}

1 0

Eric Pouech : ntdll: Implemented IOCTL for char transmission: IMMEDIATE_CHAR.
by Alexandre Julliard Feb. 6, 2006

Feb. 6, 2006

Module: wine Branch: refs/heads/master Commit: 3c2abaf45ee3a14b58be9adb8b3c8d9f371ca2ec URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=3c2abaf45ee3a14b58be9ad… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Mon Feb 6 11:38:53 2006 +0100 ntdll: Implemented IOCTL for char transmission: IMMEDIATE_CHAR. --- dlls/kernel/comm.c | 17 +++++++---------- dlls/ntdll/serial.c | 15 +++++++++++++++ 2 files changed, 22 insertions(+), 10 deletions(-) diff --git a/dlls/kernel/comm.c b/dlls/kernel/comm.c index 75ee11c..326ef47 100644 --- a/dlls/kernel/comm.c +++ b/dlls/kernel/comm.c @@ -1652,23 +1652,20 @@ BOOL WINAPI GetCommState( * Transmits a single character in front of any pending characters in the * output buffer. Usually used to send an interrupt character to a host. * + * PARAMS + * hComm [in] The communication device in need of a command character + * chTransmit [in] The character to transmit + * * RETURNS * * True if the call succeeded, false if the previous command character to the * same device has not been sent yet the handle is bad etc. * - * BUGS - * - * Stub. */ -BOOL WINAPI TransmitCommChar( - HANDLE hComm, /* [in] The communication device in need of a command character. */ - CHAR chTransmit) /* [in] The character to transmit. */ +BOOL WINAPI TransmitCommChar(HANDLE hComm, CHAR chTransmit) { - DWORD w; - WARN("(%p,'%c') not perfect!\n",hComm,chTransmit); - - return WriteFile( hComm, &chTransmit, 1, &w, NULL ); + return DeviceIoControl(hComm, IOCTL_SERIAL_IMMEDIATE_CHAR, + &chTransmit, sizeof(chTransmit), NULL, 0, NULL, NULL); } diff --git a/dlls/ntdll/serial.c b/dlls/ntdll/serial.c index 115d981..04f9534 100644 --- a/dlls/ntdll/serial.c +++ b/dlls/ntdll/serial.c @@ -211,6 +211,15 @@ static NTSTATUS set_wait_mask(HANDLE hDe return status; } +static NTSTATUS xmit_immediate(HANDLE hDevice, int fd, char* ptr) +{ + /* FIXME: not perfect as it should bypass the in-queue */ + WARN("(%p,'%c') not perfect!\n", hDevice, *ptr); + if (write(fd, ptr, 1) != 1) + return FILE_GetNtStatus(); + return STATUS_SUCCESS; +} + /****************************************************************** * COMM_DeviceIoControl * @@ -255,6 +264,12 @@ NTSTATUS COMM_DeviceIoControl(HANDLE hDe else status = STATUS_INVALID_PARAMETER; break; + case IOCTL_SERIAL_IMMEDIATE_CHAR: + if (lpInBuffer && nInBufferSize == sizeof(CHAR)) + status = xmit_immediate(hDevice, fd, lpInBuffer); + else + status = STATUS_INVALID_PARAMETER; + break; case IOCTL_SERIAL_PURGE: if (lpInBuffer && nInBufferSize == sizeof(DWORD)) status = purge(fd, *(DWORD*)lpInBuffer);

1 0

Eric Pouech : ntdll: Implemented COMM IOCTL for modem status: GET_MODEMSTATUS.
by Alexandre Julliard Feb. 6, 2006

Feb. 6, 2006

Module: wine Branch: refs/heads/master Commit: 5973955e4e82edb114e1559f729b0e2b41bdbf4c URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=5973955e4e82edb114e1559… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Mon Feb 6 11:37:39 2006 +0100 ntdll: Implemented COMM IOCTL for modem status: GET_MODEMSTATUS. --- dlls/kernel/comm.c | 53 +++++++++------------------------------------------ dlls/ntdll/serial.c | 47 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 56 insertions(+), 44 deletions(-) diff --git a/dlls/kernel/comm.c b/dlls/kernel/comm.c index 3a63c02..75ee11c 100644 --- a/dlls/kernel/comm.c +++ b/dlls/kernel/comm.c @@ -1801,55 +1801,20 @@ BOOL WINAPI SetCommTimeouts( * * Obtains the four control register bits if supported by the hardware. * + * PARAMS + * + * hFile [in] The communications device + * lpModemStat [out] The control register bits + * * RETURNS * * True if the communications handle was good and for hardware that * control register access, false otherwise. */ -BOOL WINAPI GetCommModemStatus( - HANDLE hFile, /* [in] The communications device. */ - LPDWORD lpModemStat) /* [out] The control register bits. */ -{ - int fd,mstat, result=FALSE; - - *lpModemStat=0; -#ifdef TIOCMGET - fd = get_comm_fd( hFile, FILE_READ_DATA ); - if(fd<0) - return FALSE; - result = ioctl(fd, TIOCMGET, &mstat); - release_comm_fd( hFile, fd ); - if (result == -1) - { - WARN("ioctl failed\n"); - return FALSE; - } -#ifdef TIOCM_CTS - if (mstat & TIOCM_CTS) - *lpModemStat |= MS_CTS_ON; -#endif -#ifdef TIOCM_DSR - if (mstat & TIOCM_DSR) - *lpModemStat |= MS_DSR_ON; -#endif -#ifdef TIOCM_RNG - if (mstat & TIOCM_RNG) - *lpModemStat |= MS_RING_ON; -#endif -#ifdef TIOCM_CAR - /*FIXME: Not really sure about RLSD UB 990810*/ - if (mstat & TIOCM_CAR) - *lpModemStat |= MS_RLSD_ON; -#endif - TRACE("%04x -> %s%s%s%s\n", mstat, - (*lpModemStat &MS_RLSD_ON)?"MS_RLSD_ON ":"", - (*lpModemStat &MS_RING_ON)?"MS_RING_ON ":"", - (*lpModemStat &MS_DSR_ON)?"MS_DSR_ON ":"", - (*lpModemStat &MS_CTS_ON)?"MS_CTS_ON ":""); - return TRUE; -#else - return FALSE; -#endif +BOOL WINAPI GetCommModemStatus(HANDLE hFile, LPDWORD lpModemStat) +{ + return DeviceIoControl(hFile, IOCTL_SERIAL_GET_MODEMSTATUS, + NULL, 0, lpModemStat, sizeof(DWORD), NULL, NULL); } static DWORD WINAPI Comm_CheckEvents(int fd, DWORD mask, serial_irq_info *new, serial_irq_info *old, DWORD new_mstat, DWORD old_mstat) diff --git a/dlls/ntdll/serial.c b/dlls/ntdll/serial.c index b364376..115d981 100644 --- a/dlls/ntdll/serial.c +++ b/dlls/ntdll/serial.c @@ -129,6 +129,45 @@ static const char* iocode2str(DWORD ioc) } } +static NTSTATUS get_modem_status(int fd, DWORD* lpModemStat) +{ + NTSTATUS status = STATUS_SUCCESS; + int mstat; + +#ifdef TIOCMGET + if (ioctl(fd, TIOCMGET, &mstat) == -1) + { + WARN("ioctl failed\n"); + status = FILE_GetNtStatus(); + } + else + { + *lpModemStat = 0; +#ifdef TIOCM_CTS + if (mstat & TIOCM_CTS) *lpModemStat |= MS_CTS_ON; +#endif +#ifdef TIOCM_DSR + if (mstat & TIOCM_DSR) *lpModemStat |= MS_DSR_ON; +#endif +#ifdef TIOCM_RNG + if (mstat & TIOCM_RNG) *lpModemStat |= MS_RING_ON; +#endif +#ifdef TIOCM_CAR + /* FIXME: Not really sure about RLSD UB 990810 */ + if (mstat & TIOCM_CAR) *lpModemStat |= MS_RLSD_ON; +#endif + TRACE("%04x -> %s%s%s%s\n", mstat, + (*lpModemStat & MS_RLSD_ON) ? "MS_RLSD_ON " : "", + (*lpModemStat & MS_RING_ON) ? "MS_RING_ON " : "", + (*lpModemStat & MS_DSR_ON) ? "MS_DSR_ON " : "", + (*lpModemStat & MS_CTS_ON) ? "MS_CTS_ON " : ""); + } +#else + status = STATUS_NOT_SUPPORTED; +#endif + return status; +} + static NTSTATUS get_wait_mask(HANDLE hDevice, DWORD* mask) { NTSTATUS status; @@ -199,6 +238,14 @@ NTSTATUS COMM_DeviceIoControl(HANDLE hDe switch (dwIoControlCode) { + case IOCTL_SERIAL_GET_MODEMSTATUS: + if (lpOutBuffer && nOutBufferSize == sizeof(DWORD)) + { + if (!(status = get_modem_status(fd, (DWORD*)lpOutBuffer))) + sz = sizeof(DWORD); + } + else status = STATUS_INVALID_PARAMETER; + break; case IOCTL_SERIAL_GET_WAIT_MASK: if (lpOutBuffer && nOutBufferSize == sizeof(DWORD)) {

1 0

Eric Pouech : ntdll: Implemented IOCTL for serial: SET_WAIT_MASK, GET_WAIT_MASK.
by Alexandre Julliard Feb. 6, 2006

Feb. 6, 2006

Module: wine Branch: refs/heads/master Commit: 58e719ce93f9dd621af22003f3981da0f3e6a68c URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=58e719ce93f9dd621af2200… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Mon Feb 6 11:37:06 2006 +0100 ntdll: Implemented IOCTL for serial: SET_WAIT_MASK, GET_WAIT_MASK. --- dlls/kernel/comm.c | 47 ++++++++++++++++------------------------------- dlls/ntdll/serial.c | 45 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 61 insertions(+), 31 deletions(-) diff --git a/dlls/kernel/comm.c b/dlls/kernel/comm.c index 41ae790..3a63c02 100644 --- a/dlls/kernel/comm.c +++ b/dlls/kernel/comm.c @@ -952,28 +952,20 @@ BOOL WINAPI SetupComm( * Obtain the events associated with a communication device that will cause * a call WaitCommEvent to return. * + * PARAMS + * + * handle [in] The communications device + * evtmask [out] The events which cause WaitCommEvent to return + * * RETURNS * * True on success, fail on bad device handle etc. */ -BOOL WINAPI GetCommMask( - HANDLE handle, /* [in] The communications device. */ - LPDWORD evtmask) /* [out] The events which cause WaitCommEvent to return. */ +BOOL WINAPI GetCommMask(HANDLE handle, LPDWORD evtmask) { - BOOL ret; - TRACE("handle %p, mask %p\n", handle, evtmask); - - SERVER_START_REQ( get_serial_info ) - { - req->handle = handle; - if ((ret = !wine_server_call_err( req ))) - { - if (evtmask) *evtmask = reply->eventmask; - } - } - SERVER_END_REQ; - return ret; + return DeviceIoControl(handle, IOCTL_SERIAL_GET_WAIT_MASK, + NULL, 0, evtmask, sizeof(*evtmask), NULL, NULL); } /***************************************************************************** @@ -983,27 +975,20 @@ BOOL WINAPI GetCommMask( * (Set which events associated with a communication device should cause * a call WaitCommEvent to return.) * + * PARAMS + * + * handle [in] The communications device + * evtmask [in] The events that are to be monitored + * * RETURNS * * True on success, false on bad handle etc. */ -BOOL WINAPI SetCommMask( - HANDLE handle, /* [in] The communications device. */ - DWORD evtmask) /* [in] The events that are to be monitored. */ +BOOL WINAPI SetCommMask(HANDLE handle, DWORD evtmask) { - BOOL ret; - TRACE("handle %p, mask %lx\n", handle, evtmask); - - SERVER_START_REQ( set_serial_info ) - { - req->handle = handle; - req->flags = SERIALINFO_SET_MASK; - req->eventmask = evtmask; - ret = !wine_server_call_err( req ); - } - SERVER_END_REQ; - return ret; + return DeviceIoControl(handle, IOCTL_SERIAL_SET_WAIT_MASK, + &evtmask, sizeof(evtmask), NULL, 0, NULL, NULL); } /***************************************************************************** diff --git a/dlls/ntdll/serial.c b/dlls/ntdll/serial.c index ecf025c..b364376 100644 --- a/dlls/ntdll/serial.c +++ b/dlls/ntdll/serial.c @@ -129,6 +129,20 @@ static const char* iocode2str(DWORD ioc) } } +static NTSTATUS get_wait_mask(HANDLE hDevice, DWORD* mask) +{ + NTSTATUS status; + + SERVER_START_REQ( get_serial_info ) + { + req->handle = hDevice; + if (!(status = wine_server_call( req ))) + *mask = reply->eventmask; + } + SERVER_END_REQ; + return status; +} + static NTSTATUS purge(int fd, DWORD flags) { /* @@ -143,6 +157,21 @@ static NTSTATUS purge(int fd, DWORD flag return STATUS_SUCCESS; } +static NTSTATUS set_wait_mask(HANDLE hDevice, DWORD mask) +{ + NTSTATUS status; + + SERVER_START_REQ( set_serial_info ) + { + req->handle = hDevice; + req->flags = SERIALINFO_SET_MASK; + req->eventmask = mask; + status = wine_server_call( req ); + } + SERVER_END_REQ; + return status; +} + /****************************************************************** * COMM_DeviceIoControl * @@ -170,6 +199,15 @@ NTSTATUS COMM_DeviceIoControl(HANDLE hDe switch (dwIoControlCode) { + case IOCTL_SERIAL_GET_WAIT_MASK: + if (lpOutBuffer && nOutBufferSize == sizeof(DWORD)) + { + if (!(status = get_wait_mask(hDevice, (DWORD*)lpOutBuffer))) + sz = sizeof(DWORD); + } + else + status = STATUS_INVALID_PARAMETER; + break; case IOCTL_SERIAL_PURGE: if (lpInBuffer && nInBufferSize == sizeof(DWORD)) status = purge(fd, *(DWORD*)lpInBuffer); @@ -200,6 +238,13 @@ NTSTATUS COMM_DeviceIoControl(HANDLE hDe status = STATUS_NOT_SUPPORTED; #endif break; + case IOCTL_SERIAL_SET_WAIT_MASK: + if (lpInBuffer && nInBufferSize == sizeof(DWORD)) + { + status = set_wait_mask(hDevice, *(DWORD*)lpInBuffer); + } + else status = STATUS_INVALID_PARAMETER; + break; default: FIXME("Unsupported IOCTL %lx (type=%lx access=%lx func=%lx meth=%lx)\n", dwIoControlCode, dwIoControlCode >> 16, (dwIoControlCode >> 14) & 3,

1 0

Eric Pouech : ntdll: Implemented IOCTL purge for serial objects.
by Alexandre Julliard Feb. 6, 2006

Feb. 6, 2006

Module: wine Branch: refs/heads/master Commit: b83c5ead168645fdae578bc3484d32183ef4af34 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=b83c5ead168645fdae578bc… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Mon Feb 6 11:36:19 2006 +0100 ntdll: Implemented IOCTL purge for serial objects. --- dlls/kernel/comm.c | 34 ++++++++-------------------------- dlls/ntdll/serial.c | 20 ++++++++++++++++++++ 2 files changed, 28 insertions(+), 26 deletions(-) diff --git a/dlls/kernel/comm.c b/dlls/kernel/comm.c index de959de..41ae790 100644 --- a/dlls/kernel/comm.c +++ b/dlls/kernel/comm.c @@ -848,37 +848,19 @@ BOOL WINAPI EscapeCommFunction( * Terminates pending operations and/or discards buffers on a * communication resource. * + * PARAMS + * + * handle [in] The communication resource to be purged + * flags [in] Flags for clear pending/buffer on input/output + * * RETURNS * * True on success and false if the communications handle is bad. */ -BOOL WINAPI PurgeComm( - HANDLE handle, /* [in] The communication resource to be purged. */ - DWORD flags) /* [in] Flags for clear pending/buffer on input/output. */ +BOOL WINAPI PurgeComm(HANDLE handle, DWORD flags) { - int fd; - - TRACE("handle %p, flags %lx\n", handle, flags); - - fd = get_comm_fd( handle, FILE_READ_DATA ); - if(fd<0) return FALSE; - - /* - ** not exactly sure how these are different - ** Perhaps if we had our own internal queues, one flushes them - ** and the other flushes the kernel's buffers. - */ - if(flags&PURGE_TXABORT) - tcflush(fd,TCOFLUSH); - if(flags&PURGE_RXABORT) - tcflush(fd,TCIFLUSH); - if(flags&PURGE_TXCLEAR) - tcflush(fd,TCOFLUSH); - if(flags&PURGE_RXCLEAR) - tcflush(fd,TCIFLUSH); - release_comm_fd( handle, fd ); - - return 1; + return DeviceIoControl(handle, IOCTL_SERIAL_PURGE, &flags, sizeof(flags), + NULL, 0, NULL, NULL); } /***************************************************************************** diff --git a/dlls/ntdll/serial.c b/dlls/ntdll/serial.c index 0b15f6e..ecf025c 100644 --- a/dlls/ntdll/serial.c +++ b/dlls/ntdll/serial.c @@ -129,6 +129,20 @@ static const char* iocode2str(DWORD ioc) } } +static NTSTATUS purge(int fd, DWORD flags) +{ + /* + ** not exactly sure how these are different + ** Perhaps if we had our own internal queues, one flushes them + ** and the other flushes the kernel's buffers. + */ + if (flags & PURGE_TXABORT) tcflush(fd, TCOFLUSH); + if (flags & PURGE_RXABORT) tcflush(fd, TCIFLUSH); + if (flags & PURGE_TXCLEAR) tcflush(fd, TCOFLUSH); + if (flags & PURGE_RXCLEAR) tcflush(fd, TCIFLUSH); + return STATUS_SUCCESS; +} + /****************************************************************** * COMM_DeviceIoControl * @@ -156,6 +170,12 @@ NTSTATUS COMM_DeviceIoControl(HANDLE hDe switch (dwIoControlCode) { + case IOCTL_SERIAL_PURGE: + if (lpInBuffer && nInBufferSize == sizeof(DWORD)) + status = purge(fd, *(DWORD*)lpInBuffer); + else + status = STATUS_INVALID_PARAMETER; + break; case IOCTL_SERIAL_SET_BREAK_OFF: #if defined(TIOCSBRK) && defined(TIOCCBRK) /* check if available for compilation */ if (ioctl(fd, TIOCCBRK, 0) == -1)

1 0

H. Verbeet : wined3d: Update the QueryInterface functions of IWineD3DBase subclasses.
by Alexandre Julliard Feb. 6, 2006

Feb. 6, 2006

Module: wine Branch: refs/heads/master Commit: bd8db45e44a60827b71c14ae2dbea9fa4c050c7e URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=bd8db45e44a60827b71c14a… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Mon Feb 6 11:32:41 2006 +0100 wined3d: Update the QueryInterface functions of IWineD3DBase subclasses. --- dlls/wined3d/basetexture.c | 2 +- dlls/wined3d/cubetexture.c | 1 + dlls/wined3d/device.c | 2 +- dlls/wined3d/directx.c | 2 +- dlls/wined3d/indexbuffer.c | 1 + dlls/wined3d/pixelshader.c | 1 + dlls/wined3d/query.c | 1 + dlls/wined3d/resource.c | 1 + dlls/wined3d/stateblock.c | 1 + dlls/wined3d/surface.c | 1 + dlls/wined3d/swapchain.c | 1 + dlls/wined3d/texture.c | 1 + dlls/wined3d/vertexbuffer.c | 1 + dlls/wined3d/vertexdeclaration.c | 1 + dlls/wined3d/vertexshader.c | 1 + dlls/wined3d/volume.c | 1 + dlls/wined3d/volumetexture.c | 1 + 17 files changed, 17 insertions(+), 3 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=bd8db45e44a60827b71…

1 0