December 2005 - Wine-commits

Henning Gerhardt : winecfg: Update German resource.
by Alexandre Julliard 08 Dec '05

08 Dec '05

Module: wine Branch: refs/heads/master Commit: 1d4bec79ff54acf3eca6622399190ad03e77ccbe URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=1d4bec79ff54acf3eca6622… Author: Henning Gerhardt <henning.gerhardt(a)web.de> Date: Thu Dec 8 12:45:19 2005 +0100 winecfg: Update German resource. --- programs/winecfg/De.rc | 18 ++++++++---------- 1 files changed, 8 insertions(+), 10 deletions(-) diff --git a/programs/winecfg/De.rc b/programs/winecfg/De.rc index e8d58de..7fb6130 100644 --- a/programs/winecfg/De.rc +++ b/programs/winecfg/De.rc @@ -153,16 +153,14 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "Audio Treiber: ",IDC_STATIC,10,20,60,8 COMBOBOX IDC_AUDIO_DRIVER,70,18,85,85,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "Automatisch",IDC_AUDIO_AUTODETECT,170,20,49,14 - PUSHBUTTON "Konfigurieren",IDC_AUDIO_CONFIGURE,170,40,49,14 - PUSHBUTTON "Kontrollschirm",IDC_AUDIO_CONTROL_PANEL,170,60,49,14 - - GROUPBOX " DirectSound ",IDC_STATIC,8,75,244,120 - - LTEXT "Hardware Beschleunigung: ", IDC_STATIC,15,85,90,10 - COMBOBOX IDC_DSOUND_HW_ACCEL,100,83,150,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - CONTROL "Treiber Emulation",IDC_DSOUND_DRV_EMUL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,100,230,10 - + PUSHBUTTON "Automatisch",IDC_AUDIO_AUTODETECT,170,20,59,14 + PUSHBUTTON "Konfigurieren",IDC_AUDIO_CONFIGURE,170,40,59,14 + PUSHBUTTON "Kontrollschirm",IDC_AUDIO_CONTROL_PANEL,170,60,59,14 + CONTROL "Ger�te",IDC_AUDIO_TREE,"SysTreeView32",WS_BORDER | WS_TABSTOP,10,40,150,160 + GROUPBOX " DirectSound ",IDC_STATIC,8,205,244,60 + LTEXT "Hardware Beschleunigung: ", IDC_STATIC,15,215,90,10 + COMBOBOX IDC_DSOUND_HW_ACCEL,100,213,150,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + CONTROL "Treiber Emulation",IDC_DSOUND_DRV_EMUL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,230,230,10 END IDD_APPEARANCE DIALOG DISCARDABLE 0, 0, 260, 250

1 0

Robert Reif : wineoss: Fix device probing.
by Alexandre Julliard 08 Dec '05

08 Dec '05

Module: wine Branch: refs/heads/master Commit: c7a59d117a12d68c504e9486895f0720c0a46953 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=c7a59d117a12d68c504e948… Author: Robert Reif <reif(a)earthlink.net> Date: Thu Dec 8 12:00:33 2005 +0100 wineoss: Fix device probing. - Fix device probing at driver load time. - Fix memory leaks at driver exit time. --- dlls/winmm/wineoss/audio.c | 29 ++++++++++++++++++++++++++++- dlls/winmm/wineoss/midi.c | 33 ++++++++++++++++++++++++++------- dlls/winmm/wineoss/mixer.c | 6 ++---- dlls/winmm/wineoss/mmaux.c | 15 +++++++++++---- dlls/winmm/wineoss/oss.c | 41 +++++++++++++++++++++++++++++++++++------ dlls/winmm/wineoss/oss.h | 13 +++++++++++-- 6 files changed, 113 insertions(+), 24 deletions(-) diff --git a/dlls/winmm/wineoss/audio.c b/dlls/winmm/wineoss/audio.c index 6cb9c5a..7df0bca 100644 --- a/dlls/winmm/wineoss/audio.c +++ b/dlls/winmm/wineoss/audio.c @@ -1078,7 +1078,7 @@ static char* StrDup(const char* str, con * * Initialize internal structures from OSS information */ -LONG OSS_WaveInit(void) +LRESULT OSS_WaveInit(void) { char* str; int i; @@ -1159,6 +1159,33 @@ LONG OSS_WaveInit(void) } /****************************************************************** + * OSS_WaveExit + * + * Delete/clear internal structures of OSS information + */ +LRESULT OSS_WaveExit(void) +{ + int i; + TRACE("()\n"); + + for (i = 0; i < MAX_WAVEDRV; ++i) + { + HeapFree(GetProcessHeap(), 0, OSS_Devices[i].dev_name); + HeapFree(GetProcessHeap(), 0, OSS_Devices[i].mixer_name); + HeapFree(GetProcessHeap(), 0, OSS_Devices[i].interface_name); + } + + ZeroMemory(OSS_Devices, sizeof(OSS_Devices)); + ZeroMemory(WOutDev, sizeof(WOutDev)); + ZeroMemory(WInDev, sizeof(WInDev)); + + numOutDev = 0; + numInDev = 0; + + return 0; +} + +/****************************************************************** * OSS_InitRingMessage * * Initialize the ring of messages for passing between driver's caller and playback/record diff --git a/dlls/winmm/wineoss/midi.c b/dlls/winmm/wineoss/midi.c index 6dc9f7a..4ea5090 100644 --- a/dlls/winmm/wineoss/midi.c +++ b/dlls/winmm/wineoss/midi.c @@ -176,7 +176,7 @@ static int MIDI_UnixToWindowsDeviceType * * Initializes the MIDI devices information variables */ -BOOL OSS_MidiInit(void) +LRESULT OSS_MidiInit(void) { int i, status, numsynthdevs = 255, nummididevs = 255; struct synth_info sinfo; @@ -184,14 +184,14 @@ BOOL OSS_MidiInit(void) static BOOL bInitDone = FALSE; if (bInitDone) - return TRUE; + return 0; TRACE("Initializing the MIDI variables.\n"); - bInitDone = TRUE; + bInitDone = 0; /* try to open device */ if (midiOpenSeq() == -1) { - return TRUE; + return -1; } /* find how many Synth devices are there in the system */ @@ -200,7 +200,7 @@ BOOL OSS_MidiInit(void) if (status == -1) { ERR("ioctl for nr synth failed.\n"); midiCloseSeq(); - return TRUE; + return -1; } if (numsynthdevs > MAX_MIDIOUTDRV) { @@ -374,7 +374,26 @@ BOOL OSS_MidiInit(void) /* close file and exit */ midiCloseSeq(); - return TRUE; + return 0; +} + +/************************************************************************** + * OSS_MidiExit [internal] + * + * Release the MIDI devices information variables + */ +LRESULT OSS_MidiExit(void) +{ + TRACE("()\n"); + + ZeroMemory(MidiInDev, sizeof(MidiInDev)); + ZeroMemory(MidiOutDev, sizeof(MidiOutDev)); + + MODM_NumDevs = 0; + MODM_NumFMSynthDevs = 0; + MIDM_NumDevs = 0; + + return 0; } /************************************************************************** @@ -1657,7 +1676,7 @@ static DWORD modReset(WORD wDevID) #else /* HAVE_OSS_MIDI */ -BOOL OSS_MidiInit(void) +LRESULT OSS_MidiInit(void) { return FALSE; } diff --git a/dlls/winmm/wineoss/mixer.c b/dlls/winmm/wineoss/mixer.c index 02d377c..82d586c 100644 --- a/dlls/winmm/wineoss/mixer.c +++ b/dlls/winmm/wineoss/mixer.c @@ -1437,7 +1437,7 @@ static DWORD MIX_SetControlDetails(WORD /************************************************************************** * MIX_Init [internal] */ -static DWORD MIX_Init(void) +LRESULT OSS_MixerInit(void) { int i, mixer; @@ -1489,7 +1489,7 @@ static DWORD MIX_Init(void) /************************************************************************** * MIX_Exit [internal] */ -static DWORD MIX_Exit(void) +LRESULT OSS_MixerExit(void) { int i; @@ -1528,9 +1528,7 @@ DWORD WINAPI OSS_mxdMessage(UINT wDevID, switch (wMsg) { case DRVM_INIT: - return MIX_Init(); case DRVM_EXIT: - return MIX_Exit(); case DRVM_ENABLE: case DRVM_DISABLE: /* FIXME: Pretend this is supported */ diff --git a/dlls/winmm/wineoss/mmaux.c b/dlls/winmm/wineoss/mmaux.c index 4406634..0841e6f 100644 --- a/dlls/winmm/wineoss/mmaux.c +++ b/dlls/winmm/wineoss/mmaux.c @@ -49,9 +49,10 @@ static int NumDev = 6; /*-----------------------------------------------------------------------*/ -static int AUXDRV_Init(void) +LRESULT OSS_AuxInit(void) { int mixer; + TRACE("()\n"); if ((mixer = open(MIXER_DEV, O_RDWR)) < 0) { WARN("mixer device not available !\n"); @@ -60,7 +61,15 @@ static int AUXDRV_Init(void) close(mixer); NumDev = 6; } - return NumDev; + return 0; +} + +/*-----------------------------------------------------------------------*/ + +LRESULT OSS_AuxExit(void) +{ + TRACE("()\n"); + return 0; } /************************************************************************** @@ -219,8 +228,6 @@ DWORD WINAPI OSS_auxMessage(UINT wDevID, #ifdef HAVE_OSS switch (wMsg) { case DRVM_INIT: - AUXDRV_Init(); - /* fall through */ case DRVM_EXIT: case DRVM_ENABLE: case DRVM_DISABLE: diff --git a/dlls/winmm/wineoss/oss.c b/dlls/winmm/wineoss/oss.c index 8526f42..a8a07a7 100644 --- a/dlls/winmm/wineoss/oss.c +++ b/dlls/winmm/wineoss/oss.c @@ -29,14 +29,44 @@ #include "winuser.h" #include "mmddk.h" #include "oss.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(wave); #ifdef HAVE_OSS /************************************************************************** + * OSS_drvLoad [internal] + */ +static LRESULT OSS_drvLoad(void) +{ + TRACE("()\n"); + OSS_WaveInit(); + OSS_MidiInit(); + OSS_MixerInit(); + OSS_AuxInit(); + return 1; +} + +/************************************************************************** + * OSS_drvFree [internal] + */ +static LRESULT OSS_drvFree(void) +{ + TRACE("()\n"); + OSS_WaveExit(); + OSS_MidiExit(); + OSS_MixerExit(); + OSS_AuxExit(); + return 1; +} + +/************************************************************************** * OSS_drvOpen [internal] */ static LRESULT OSS_drvOpen(LPSTR str) { + TRACE("(%s)\n", str); return 1; } @@ -45,6 +75,7 @@ static LRESULT OSS_drvOpen(LPSTR str) */ static LRESULT OSS_drvClose(DWORD_PTR dwDevID) { + TRACE("(%08lx)\n", dwDevID); return 1; } @@ -57,15 +88,13 @@ static LRESULT OSS_drvClose(DWORD_PTR dw LRESULT CALLBACK OSS_DriverProc(DWORD_PTR dwDevID, HDRVR hDriv, UINT wMsg, LPARAM dwParam1, LPARAM dwParam2) { -/* EPP TRACE("(%08lX, %04X, %08lX, %08lX, %08lX)\n", */ -/* EPP dwDevID, hDriv, wMsg, dwParam1, dwParam2); */ + TRACE("(%08lX, %p, %08X, %08lX, %08lX)\n", + dwDevID, hDriv, wMsg, dwParam1, dwParam2); switch(wMsg) { #ifdef HAVE_OSS - case DRV_LOAD: OSS_WaveInit(); - OSS_MidiInit(); - return 1; - case DRV_FREE: return 1; + case DRV_LOAD: return OSS_drvLoad(); + case DRV_FREE: return OSS_drvFree(); case DRV_OPEN: return OSS_drvOpen((LPSTR)dwParam1); case DRV_CLOSE: return OSS_drvClose(dwDevID); case DRV_ENABLE: return 1; diff --git a/dlls/winmm/wineoss/oss.h b/dlls/winmm/wineoss/oss.h index 84450eb..555fbdb 100644 --- a/dlls/winmm/wineoss/oss.h +++ b/dlls/winmm/wineoss/oss.h @@ -38,5 +38,14 @@ # define HAVE_OSS #endif -extern LONG OSS_WaveInit(void); -extern BOOL OSS_MidiInit(void); +LRESULT OSS_WaveInit(void); +LRESULT OSS_WaveExit(void); + +LRESULT OSS_MidiInit(void); +LRESULT OSS_MidiExit(void); + +LRESULT OSS_MixerInit(void); +LRESULT OSS_MixerExit(void); + +LRESULT OSS_AuxInit(void); +LRESULT OSS_AuxExit(void);

1 0

Aric Stewart : wininet: Handle HTTP_QUERY_CUSTOM.
by Alexandre Julliard 08 Dec '05

08 Dec '05

Module: wine Branch: refs/heads/master Commit: 7bca41a739a1f1bfb4f83ebea46355ac94b902b0 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=7bca41a739a1f1bfb4f83eb… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Dec 8 12:44:45 2005 +0100 wininet: Handle HTTP_QUERY_CUSTOM. In HttpQueryInfo if dwInfoLevel includes HTTP_QUERY_CUSTOM then lpBuffer is In/Out because the header we are querying is there. Additionally standard headers can be queried in this manner as well (such as Set-Cookie). --- dlls/wininet/http.c | 15 ++++++++++++--- 1 files changed, 12 insertions(+), 3 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index ffa5414..f35e2ae 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -102,6 +102,7 @@ static BOOL WINAPI HTTP_HttpQueryInfoW( static BOOL HTTP_HandleRedirect(LPWININETHTTPREQW lpwhr, LPCWSTR lpszUrl, LPCWSTR lpszHeaders, DWORD dwHeaderLength, LPVOID lpOptional, DWORD dwOptionalLength, DWORD dwContentLength); +static INT HTTP_GetStdHeaderIndex(LPCWSTR lpszField); /*********************************************************************** * HTTP_Tokenize (internal) @@ -1161,9 +1162,14 @@ static BOOL WINAPI HTTP_HttpQueryInfoW( INT index = HTTP_GetCustomHeaderIndex(lpwhr, (LPWSTR)lpBuffer); if (index < 0) - return bSuccess; + index = HTTP_GetStdHeaderIndex(lpBuffer); + else + lphttpHdr = &lpwhr->pCustHeaders[index]; - lphttpHdr = &lpwhr->pCustHeaders[index]; + if (index < 0) + return bSuccess; + else + lphttpHdr = &lpwhr->StdHeaders[index]; } else { @@ -1285,7 +1291,7 @@ static BOOL WINAPI HTTP_HttpQueryInfoW( (*lpdwIndex)++; } } - else + else if (lphttpHdr->lpszValue) { DWORD len = (strlenW(lphttpHdr->lpszValue) + 1) * sizeof(WCHAR); @@ -1475,6 +1481,9 @@ BOOL WINAPI HttpQueryInfoA(HINTERNET hHt len = (*lpdwBufferLength)*sizeof(WCHAR); bufferW = HeapAlloc( GetProcessHeap(), 0, len ); + /* buffer is in/out because of HTTP_QUERY_CUSTOM */ + if ((dwInfoLevel & HTTP_QUERY_HEADER_MASK) == HTTP_QUERY_CUSTOM) + MultiByteToWideChar(CP_ACP,0,lpBuffer,-1,bufferW,len); result = HttpQueryInfoW( hHttpRequest, dwInfoLevel, bufferW, &len, lpdwIndex ); if( result )

1 0

Raphael Junqueira : opengl: render_texture
by Alexandre Julliard 08 Dec '05

08 Dec '05

Module: wine Branch: refs/heads/master Commit: 1399edb0925966a802a6a39835025c22c22c18e1 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=1399edb0925966a802a6a39… Author: Raphael Junqueira <fenix(a)club-internet.fr> Date: Thu Dec 8 12:45:07 2005 +0100 opengl: render_texture - better render_texture emulation (using pbuffers) - support GLX_ATI_render_texture for render_texture --- dlls/opengl32/wgl.c | 51 +++++ dlls/opengl32/wgl_ext.c | 476 +++++++++++++++++++++++++++++++++++++---------- 2 files changed, 419 insertions(+), 108 deletions(-)

1 0

Robert Shearman : comdlg32: Don't worry if an HGLOBAL passed to printdlg is already locked.
by Alexandre Julliard 08 Dec '05

08 Dec '05

Module: wine Branch: refs/heads/master Commit: c75d0cdc8cb0974344c5e9e680a35572c21ffff9 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=c75d0cdc8cb0974344c5e9e… Author: Robert Shearman <rob(a)codeweavers.com> Date: Thu Dec 8 11:59:36 2005 +0100 comdlg32: Don't worry if an HGLOBAL passed to printdlg is already locked. --- dlls/commdlg/printdlg.c | 16 ---------------- 1 files changed, 0 insertions(+), 16 deletions(-) diff --git a/dlls/commdlg/printdlg.c b/dlls/commdlg/printdlg.c index cf36ef0..30e769e 100644 --- a/dlls/commdlg/printdlg.c +++ b/dlls/commdlg/printdlg.c @@ -2096,14 +2096,6 @@ BOOL WINAPI PrintDlgA(LPPRINTDLGA lppd) lppd->hDevMode = GlobalAlloc(GMEM_MOVEABLE, lpdm->dmSize + lpdm->dmDriverExtra); } else { - WORD locks; - if((locks = (GlobalFlags(lppd->hDevMode) & GMEM_LOCKCOUNT))) { - WARN("hDevMode has %d locks on it. Unlocking it now\n", locks); - while(locks--) { - GlobalUnlock(lppd->hDevMode); - TRACE("Now got %d locks\n", locks); - } - } lppd->hDevMode = GlobalReAlloc(lppd->hDevMode, lpdm->dmSize + lpdm->dmDriverExtra, GMEM_MOVEABLE); @@ -2111,14 +2103,6 @@ BOOL WINAPI PrintDlgA(LPPRINTDLGA lppd) lpdmReturn = GlobalLock(lppd->hDevMode); memcpy(lpdmReturn, lpdm, lpdm->dmSize + lpdm->dmDriverExtra); - if (lppd->hDevNames != 0) { - WORD locks; - if((locks = (GlobalFlags(lppd->hDevNames) & GMEM_LOCKCOUNT))) { - WARN("hDevNames has %d locks on it. Unlocking it now\n", locks); - while(locks--) - GlobalUnlock(lppd->hDevNames); - } - } PRINTDLG_CreateDevNames(&(lppd->hDevNames), di->pDriverPath, pi->pPrinterName,

1 0

Raphael Junqueira : dplay: dx8/dx9 support (missing includes).
by Alexandre Julliard 08 Dec '05

08 Dec '05

Module: wine Branch: refs/heads/master Commit: db50e2d997b7cf808fd38b6d5f7202df1f7755fa URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=db50e2d997b7cf808fd38b6… Author: Raphael Junqueira <fenix(a)club-internet.fr> Date: Thu Dec 8 12:00:14 2005 +0100 dplay: dx8/dx9 support (missing includes). - add directx9 support for dplay8.h and dpaddr.h - new file dplobby8.h --- include/Makefile.in | 1 include/dpaddr.h | 25 ++++ include/dplay8.h | 300 +++++++++++++++++++++++++++++++++++++++++---------- include/dplobby8.h | 259 ++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 522 insertions(+), 63 deletions(-) create mode 100644 include/dplobby8.h

1 0

H. Verbeet : d3d8/d3d9: Define D3D_SDK_VERSION.
by Alexandre Julliard 08 Dec '05

08 Dec '05

Module: wine Branch: refs/heads/master Commit: 51862d440c128feb215151c52b71eddea89b56d9 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=51862d440c128feb215151c… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Thu Dec 8 11:58:11 2005 +0100 d3d8/d3d9: Define D3D_SDK_VERSION. --- include/d3d8.h | 1 + include/d3d9.h | 1 + 2 files changed, 2 insertions(+), 0 deletions(-) diff --git a/include/d3d8.h b/include/d3d8.h index 5a8b1c6..ca46eab 100644 --- a/include/d3d8.h +++ b/include/d3d8.h @@ -41,6 +41,7 @@ /***************************************************************************** * #defines and error codes */ +#define D3D_SDK_VERSION 220 #define D3DADAPTER_DEFAULT 0 #define D3DENUM_NO_WHQL_LEVEL 2 diff --git a/include/d3d9.h b/include/d3d9.h index b4e23ce..e7abb54 100644 --- a/include/d3d9.h +++ b/include/d3d9.h @@ -50,6 +50,7 @@ /***************************************************************************** * #defines and error codes */ +#define D3D_SDK_VERSION 32 #define D3DADAPTER_DEFAULT 0 #define D3DENUM_NO_WHQL_LEVEL 0x00000002L #define D3DPRESENT_BACK_BUFFERS_MAX 3L

1 0

Eric Pouech : winenas: fix crash.
by Alexandre Julliard 08 Dec '05

08 Dec '05

Module: wine Branch: refs/heads/master Commit: 65a1796bc7fa1bd136c01222ef58198b4662839a URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=65a1796bc7fa1bd136c0122… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Thu Dec 8 11:58:35 2005 +0100 winenas: fix crash. - return correct MM error code when no connection to server has been opened - don't close the AU driver if it hasn't been opened --- dlls/winmm/winenas/audio.c | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/winmm/winenas/audio.c b/dlls/winmm/winenas/audio.c index 95be4c3..248a42e 100644 --- a/dlls/winmm/winenas/audio.c +++ b/dlls/winmm/winenas/audio.c @@ -407,7 +407,7 @@ LONG NAS_WaveClose(void) LONG NAS_WaveInit(void) { int i; - nas_init(); + if (!nas_init()) return MMSYSERR_ERROR; /* initialize all device handles to -1 */ for (i = 0; i < MAX_WAVEOUTDRV; ++i) @@ -1475,8 +1475,11 @@ static int nas_close(WINE_WAVEOUT* wwo) static int nas_end(void) { - AuCloseServer(AuServ); - AuServ = 0; + if (AuServ) + { + AuCloseServer(AuServ); + AuServ = 0; + } return 1; }

1 0

Eric Pouech : winealsa: Fixed returned string in capabilities.
by Alexandre Julliard 08 Dec '05

08 Dec '05

Module: wine Branch: refs/heads/master Commit: fa1d997ddc35d2452874bd077d8fc9f2ee3f4a6b URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=fa1d997ddc35d2452874bd0… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Thu Dec 8 11:58:48 2005 +0100 winealsa: Fixed returned string in capabilities. --- dlls/winmm/winealsa/audio.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/winmm/winealsa/audio.c b/dlls/winmm/winealsa/audio.c index a8d35b0..a64d70e 100644 --- a/dlls/winmm/winealsa/audio.c +++ b/dlls/winmm/winealsa/audio.c @@ -1091,7 +1091,6 @@ static int ALSA_AddDeviceToArray(WINE_WA static int ALSA_AddPlaybackDevice(snd_ctl_t *ctl, snd_pcm_t *pcm, const char *pcmname, int isdefault) { WINE_WAVEDEV wwo; - WCHAR nameW[MAXPNAMELEN * 2]; int rc; memset(&wwo, '\0', sizeof(wwo)); @@ -1100,8 +1099,9 @@ static int ALSA_AddPlaybackDevice(snd_ct if (rc) return(rc); - MultiByteToWideChar(CP_ACP, 0, wwo.ds_desc.szDesc, -1, nameW, sizeof(nameW)/sizeof(WCHAR)); - strcpyW(wwo.outcaps.szPname, nameW); + MultiByteToWideChar(CP_ACP, 0, wwo.ds_desc.szDesc, -1, + wwo.outcaps.szPname, sizeof(wwo.outcaps.szPname)/sizeof(WCHAR)); + wwo.outcaps.szPname[sizeof(wwo.outcaps.szPname)/sizeof(WCHAR) - 1] = '\0'; wwo.outcaps.wMid = MM_CREATIVE; wwo.outcaps.wPid = MM_CREATIVE_SBP16_WAVEOUT; @@ -1131,7 +1131,6 @@ static int ALSA_AddPlaybackDevice(snd_ct static int ALSA_AddCaptureDevice(snd_ctl_t *ctl, snd_pcm_t *pcm, const char *pcmname, int isdefault) { WINE_WAVEDEV wwi; - WCHAR nameW[MAXPNAMELEN * 2]; int rc; memset(&wwi, '\0', sizeof(wwi)); @@ -1140,8 +1139,9 @@ static int ALSA_AddCaptureDevice(snd_ctl if (rc) return(rc); - MultiByteToWideChar(CP_ACP, 0, wwi.ds_desc.szDesc, -1, nameW, sizeof(nameW)/sizeof(WCHAR)); - strcpyW(wwi.incaps.szPname, nameW); + MultiByteToWideChar(CP_ACP, 0, wwi.ds_desc.szDesc, -1, + wwi.incaps.szPname, sizeof(wwi.incaps.szPname) / sizeof(WCHAR)); + wwi.incaps.szPname[sizeof(wwi.incaps.szPname)/sizeof(WCHAR) - 1] = '\0'; wwi.incaps.wMid = MM_CREATIVE; wwi.incaps.wPid = MM_CREATIVE_SBP16_WAVEOUT;

1 0

Robert Shearman : notepad: Remember options selected in the print setup dialog.
by Alexandre Julliard 08 Dec '05

08 Dec '05

Module: wine Branch: refs/heads/master Commit: 8be66cb30e61b6ff6657a4522ec2ecc45a5ecd2c URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=8be66cb30e61b6ff6657a45… Author: Robert Shearman <rob(a)codeweavers.com> Date: Thu Dec 8 11:57:58 2005 +0100 notepad: Remember options selected in the print setup dialog. --- programs/notepad/dialog.c | 10 ++++++++++ programs/notepad/main.c | 2 ++ programs/notepad/main.h | 2 ++ 3 files changed, 14 insertions(+), 0 deletions(-) diff --git a/programs/notepad/dialog.c b/programs/notepad/dialog.c index f5e74e2..28d1b6d 100644 --- a/programs/notepad/dialog.c +++ b/programs/notepad/dialog.c @@ -407,6 +407,8 @@ VOID DIALOG_FilePrint(VOID) ZeroMemory(&printer, sizeof(printer)); printer.lStructSize = sizeof(printer); printer.hwndOwner = Globals.hMainWnd; + printer.hDevMode = Globals.hDevMode; + printer.hDevNames = Globals.hDevNames; printer.hInstance = Globals.hInstance; /* Set some default flags */ @@ -422,6 +424,9 @@ VOID DIALOG_FilePrint(VOID) if (!PrintDlg(&printer)) return; + Globals.hDevMode = printer.hDevMode; + Globals.hDevNames = printer.hDevNames; + assert(printer.hDC != 0); /* initialize DOCINFO */ @@ -519,11 +524,16 @@ VOID DIALOG_FilePrinterSetup(VOID) ZeroMemory(&printer, sizeof(printer)); printer.lStructSize = sizeof(printer); printer.hwndOwner = Globals.hMainWnd; + printer.hDevMode = Globals.hDevMode; + printer.hDevNames = Globals.hDevNames; printer.hInstance = Globals.hInstance; printer.Flags = PD_PRINTSETUP; printer.nCopies = 1; PrintDlg(&printer); + + Globals.hDevMode = printer.hDevMode; + Globals.hDevNames = printer.hDevNames; } VOID DIALOG_FileExit(VOID) diff --git a/programs/notepad/main.c b/programs/notepad/main.c index 403fd96..4d7e39c 100644 --- a/programs/notepad/main.c +++ b/programs/notepad/main.c @@ -141,6 +141,8 @@ static VOID NOTEPAD_InitData(VOID) lstrcpy(p, all_files); p += lstrlen(p) + 1; *p = '\0'; + Globals.hDevMode = NULL; + Globals.hDevNames = NULL; } /*********************************************************************** diff --git a/programs/notepad/main.h b/programs/notepad/main.h index 06517d0..3a40c09 100644 --- a/programs/notepad/main.h +++ b/programs/notepad/main.h @@ -46,6 +46,8 @@ typedef struct WCHAR szFooter[MAX_PATH]; FINDREPLACE find; + HGLOBAL hDevMode; /* printer mode */ + HGLOBAL hDevNames; /* printer names */ } NOTEPAD_GLOBALS; extern NOTEPAD_GLOBALS Globals;

1 0