December 2005 - Wine-Commits

Henning Gerhardt : winecfg: Update German resource.
by Alexandre Julliard Dec. 8, 2005

Dec. 8, 2005

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

Raphael Junqueira : opengl: render_texture
by Alexandre Julliard Dec. 8, 2005

Dec. 8, 2005

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

Aric Stewart : wininet: Handle HTTP_QUERY_CUSTOM.
by Alexandre Julliard Dec. 8, 2005

Dec. 8, 2005

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

Robert Reif : wineoss: Fix device probing.
by Alexandre Julliard Dec. 8, 2005

Dec. 8, 2005

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

Raphael Junqueira : dplay: dx8/dx9 support (missing includes).
by Alexandre Julliard Dec. 8, 2005

Dec. 8, 2005

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

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

Dec. 8, 2005

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

Eric Pouech : winealsa: Fixed returned string in capabilities.
by Alexandre Julliard Dec. 8, 2005

Dec. 8, 2005

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

H. Verbeet : d3d8/d3d9: Define D3D_SDK_VERSION.
by Alexandre Julliard Dec. 8, 2005

Dec. 8, 2005

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 Dec. 8, 2005

Dec. 8, 2005

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

Robert Shearman : notepad: Remember options selected in the print setup dialog.
by Alexandre Julliard Dec. 8, 2005

Dec. 8, 2005

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

Mike McCormack : winecfg: Fix compilation on gcc 2.95 (no nameless unions).
by Alexandre Julliard Dec. 8, 2005

Dec. 8, 2005

Module: wine Branch: refs/heads/master Commit: b555e91e80fc160944e94f230ca9d351fc97eb97 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=b555e91e80fc160944e94f2… Author: Mike McCormack <mike(a)codeweavers.com> Date: Thu Dec 8 11:57:44 2005 +0100 winecfg: Fix compilation on gcc 2.95 (no nameless unions). --- programs/winecfg/audio.c | 83 ++++++++++++++++++++++++---------------------- 1 files changed, 43 insertions(+), 40 deletions(-)

1 0

Alexandre Julliard : ntdll: Check for failure to get the user path in RtlOpenCurrentUser.
by Alexandre Julliard Dec. 8, 2005

Dec. 8, 2005

Module: wine Branch: refs/heads/master Commit: 0603559de28a43a63df66b6d00eb84f78cf7483d URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=0603559de28a43a63df66b6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 8 11:53:42 2005 +0100 ntdll: Check for failure to get the user path in RtlOpenCurrentUser. Fixed the return value type. --- dlls/ntdll/reg.c | 4 ++-- include/winternl.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/reg.c b/dlls/ntdll/reg.c index e30051f..5ade8bd 100644 --- a/dlls/ntdll/reg.c +++ b/dlls/ntdll/reg.c @@ -843,7 +843,7 @@ NTSTATUS WINAPI RtlFormatCurrentUserKeyP * If we return just HKEY_CURRENT_USER the advapi tries to find a remote * registry (odd handle) and fails. */ -DWORD WINAPI RtlOpenCurrentUser( +NTSTATUS WINAPI RtlOpenCurrentUser( IN ACCESS_MASK DesiredAccess, /* [in] */ OUT PHANDLE KeyHandle) /* [out] handle of HKEY_CURRENT_USER */ { @@ -853,7 +853,7 @@ DWORD WINAPI RtlOpenCurrentUser( TRACE("(0x%08lx, %p)\n",DesiredAccess, KeyHandle); - RtlFormatCurrentUserKeyPath(&ObjectName); + if ((ret = RtlFormatCurrentUserKeyPath(&ObjectName))) return ret; InitializeObjectAttributes(&ObjectAttributes,&ObjectName,OBJ_CASE_INSENSITIVE,0, NULL); ret = NtCreateKey(KeyHandle, DesiredAccess, &ObjectAttributes, 0, NULL, 0, NULL); RtlFreeUnicodeString(&ObjectName); diff --git a/include/winternl.h b/include/winternl.h index 060f8a7..2be14d3 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -2120,7 +2120,7 @@ ULONG WINAPI RtlNumberOfClearBits(PC UINT WINAPI RtlOemStringToUnicodeSize(const STRING*); NTSTATUS WINAPI RtlOemStringToUnicodeString(UNICODE_STRING*,const STRING*,BOOLEAN); NTSTATUS WINAPI RtlOemToUnicodeN(LPWSTR,DWORD,LPDWORD,LPCSTR,DWORD); -DWORD WINAPI RtlOpenCurrentUser(ACCESS_MASK,PHANDLE); +NTSTATUS WINAPI RtlOpenCurrentUser(ACCESS_MASK,PHANDLE); NTSTATUS WINAPI RtlPinAtomInAtomTable(RTL_ATOM_TABLE,RTL_ATOM); BOOLEAN WINAPI RtlPrefixString(const STRING*,const STRING*,BOOLEAN);

1 0

Aric Stewart : wininet: A->W bugfix.
by Alexandre Julliard Dec. 8, 2005

Dec. 8, 2005

Module: wine Branch: refs/heads/master Commit: d30cec77d3c56ab62dce3ce4117b1ecd342ba7ae URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=d30cec77d3c56ab62dce3ce… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Dec 8 11:54:24 2005 +0100 wininet: A->W bugfix. When converting SendRequestExA -> W we need to set the lpcszHeader parameter to NULL if the original one is NULL. --- dlls/wininet/http.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index f234530..ffa5414 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -1532,6 +1532,8 @@ BOOL WINAPI HttpSendRequestExA(HINTERNET lpBuffersIn->lpcszHeader, lpBuffersIn->dwHeadersLength, (LPWSTR)BuffersInW.lpcszHeader, headerlen); } + else + BuffersInW.lpcszHeader = NULL; BuffersInW.dwHeadersTotal = lpBuffersIn->dwHeadersTotal; BuffersInW.lpvBuffer = lpBuffersIn->lpvBuffer; BuffersInW.dwBufferLength = lpBuffersIn->dwBufferLength;

1 0

lostwages/wwn wn20051202_300.xml
by Jeremy Newman Dec. 7, 2005

Dec. 7, 2005

ChangeSet ID: 21719 CVSROOT: /opt/cvs-commit Module name: lostwages Changes by: jnewman(a)winehq.org 2005/12/07 11:25:40 Modified files: wwn : wn20051202_300.xml Log message: Francois Gouget <fgouget(a)free.fr> Spelling fixes. Patch: http://cvs.winehq.org/patch.py?id=21719 Old revision New revision Changes Path 1.2 1.3 +5 -5 lostwages/wwn/wn20051202_300.xml Index: lostwages/wwn/wn20051202_300.xml diff -u -p lostwages/wwn/wn20051202_300.xml:1.2 lostwages/wwn/wn20051202_300.xml:1.3 --- lostwages/wwn/wn20051202_300.xml:1.2 7 Dec 2005 17:25:40 -0000 +++ lostwages/wwn/wn20051202_300.xml 7 Dec 2005 17:25:40 -0000 @@ -182,16 +182,16 @@ and would be shared by all, applications various glX revisions (recently discussed glx 1.2, 1.3, etc) would also be localized to a single dll. </p><p> -Of course, on the down side, we take a hit of one extra layer of indirection by +Of course, on the downside, we take a hit of one extra layer of indirection by going through WGL. However as WGL/glX functions are rarely called, this should be a minimal of a performance hit. </p><p> -All in all I think it would be worth while, but I'd still like to hear from +All in all I think it would be worthwhile, but I'd still like to hear from others so as not to waste (a lot!) of my time.</p></quote> <p>Oliver Stieber wrote back:</p> <quote who="Oliver Stieber"><p> -If wines WGL implementation is fully implemented then it may be a good idea +If wine's WGL implementation is fully implemented then it may be a good idea switching to wgl, a wgl implemenatation would also make debugging much easier because wined3d can be run under windows to isolate problems. </p><p> @@ -408,11 +408,11 @@ Wine and try to fix it.</li></ol> > <topic>Web/HTML</topic> <p>The Mozilla ActiveX control is currently used when an application -requires a <tt>WebBrowser</tt> control to embed OLE documnents, namely HTML, +requires a <tt>WebBrowser</tt> control to embed OLE documents, namely HTML, within an application. Ongoing work by Jacek Caban to implement MSHTML.DLL and SHDOCVW.DLL will hopefully obviate the need for it, but that work isn't complete enough yet (although Jacek sent about a -bizillion patches last week.) That led David Hagood to ask this week:</p> +bazillion patches last week.) That led David Hagood to ask this week:</p> <quote who="David Hagood"><p> Does the Windows version of Mozilla need to be in place for the Mozilla Active X control to work, or is there a way to point the control at my

1 0

Jacek Caban : mshtml: Added config key to specify Gecko path.
by Alexandre Julliard Dec. 7, 2005

Dec. 7, 2005

Module: wine Branch: refs/heads/master Commit: b586f6face74f39921b9618a0431e5d6fb30514a URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=b586f6face74f39921b9618… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Dec 7 13:07:42 2005 +0100 mshtml: Added config key to specify Gecko path. --- dlls/mshtml/nsembed.c | 26 +++++++++++++++++++++++++- 1 files changed, 25 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/nsembed.c b/dlls/mshtml/nsembed.c index 079e18f..6380c48 100644 --- a/dlls/mshtml/nsembed.c +++ b/dlls/mshtml/nsembed.c @@ -186,6 +186,29 @@ static BOOL get_mozctl_path(PRUnichar *g return TRUE; } +static BOOL get_wine_gecko_path(PRUnichar *gre_path) +{ + HKEY hkey; + DWORD res, type, size = MAX_PATH; + + static const WCHAR wszMshtmlKey[] = { + 'S','o','f','t','w','a','r','e','\\','W','i','n','e', + '\\','M','S','H','T','M','L',0}; + static const WCHAR wszGeckoPath[] = + {'G','e','c','k','o','P','a','t','h',0}; + + /* @@ Wine registry key: HKCU\Software\Wine\MSHTML */ + res = RegOpenKeyW(HKEY_CURRENT_USER, wszMshtmlKey, &hkey); + if(res != ERROR_SUCCESS) + return FALSE; + + res = RegQueryValueExW(hkey, wszGeckoPath, NULL, &type, (LPBYTE)gre_path, &size); + if(res != ERROR_SUCCESS || type != REG_SZ) + return FALSE; + + return TRUE; +} + static BOOL load_gecko() { nsresult nsres; @@ -206,7 +229,8 @@ static BOOL load_gecko() return pCompMgr != NULL; tried_load = TRUE; - if(!get_mozctl_path(gre_path) && !get_mozilla_path(gre_path)) { + if(!get_wine_gecko_path(gre_path) && !get_mozctl_path(gre_path) + && !get_mozilla_path(gre_path)) { MESSAGE("Could not load Mozilla. HTML rendering will be disabled.\n"); return FALSE; }

1 0

Robert Reif : winecfg: Added support for auto detecting all drivers by attempting to
by Alexandre Julliard Dec. 7, 2005

Dec. 7, 2005

Module: wine Branch: refs/heads/master Commit: f6a7b6b59ab259968fae7f02f9484aa14e12e069 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=f6a7b6b59ab259968fae7f0… Author: Robert Reif <reif(a)earthlink.net> Date: Wed Dec 7 13:07:30 2005 +0100 winecfg: Added support for auto detecting all drivers by attempting to open them. --- programs/winecfg/audio.c | 84 +++++++++++++--------------------------------- 1 files changed, 24 insertions(+), 60 deletions(-) diff --git a/programs/winecfg/audio.c b/programs/winecfg/audio.c index 87f3899..6f0cb5f 100644 --- a/programs/winecfg/audio.c +++ b/programs/winecfg/audio.c @@ -426,68 +426,32 @@ static void initAudioDlg (HWND hDlg) static const char *audioAutoDetect(void) { - struct stat buf; - const char *argv_new[4]; - int fd; - - const char *driversFound[10]; - const char *name[10]; - int numFound = 0,i; - - argv_new[0] = "/bin/sh"; - argv_new[1] = "-c"; - argv_new[3] = NULL; - - /* try to detect oss */ - fd = open("/dev/dsp", O_WRONLY | O_NONBLOCK); - if(fd) - { - close(fd); - driversFound[numFound] = "oss"; - name[numFound] = "OSS"; - numFound++; - } - - /* try to detect alsa */ - if(!stat("/proc/asound", &buf)) - { - driversFound[numFound] = "alsa"; - name[numFound] = "ALSA"; - numFound++; - } + const char *driversFound[10]; + const char *name[10]; + int numFound = 0; + const AUDIO_DRIVER *pAudioDrv = NULL; + int i; - /* try to detect arts */ - argv_new[2] = "ps awx|grep artsd|grep -v grep|grep artsd > /dev/null"; - if(!spawnvp(_P_WAIT, "/bin/sh", argv_new)) - { - driversFound[numFound] = "arts"; - name[numFound] = "aRts"; - numFound++; - } + pAudioDrv = getAudioDrivers(); - /* try to detect jack */ - argv_new[2] = "ps awx|grep jackd|grep -v grep|grep jackd > /dev/null"; - if(!spawnvp(_P_WAIT, "/bin/sh", argv_new)) - { - driversFound[numFound] = "jack"; - name[numFound] = "JACK"; - numFound++; - } - - /* try to detect EsounD */ - argv_new[2] = "ps awx|grep esd|grep -v grep|grep esd > /dev/null"; - if(!spawnvp(_P_WAIT, "/bin/sh", argv_new)) - { - driversFound[numFound] = "esd"; - name[numFound] = "EsounD"; - numFound++; - } - - /* try to detect nas */ - /* TODO */ - - /* try to detect audioIO (solaris) */ - /* TODO */ + for (i = 0; *pAudioDrv->szName; i++, pAudioDrv++) + { + if (strlen(pAudioDrv->szDriver)) + { + HDRVR hdrv; + char driver[MAX_PATH]; + + sprintf(driver, "wine%s.drv", pAudioDrv->szDriver); + + if ((hdrv = OpenDriverA(driver, 0, 0))) + { + CloseDriver(hdrv, 0, 0); + driversFound[numFound] = pAudioDrv->szDriver; + name[numFound] = pAudioDrv->szName; + numFound++; + } + } + } if(numFound == 0) {

1 0

Vincent Béron : Add a few missing #includes.
by Alexandre Julliard Dec. 7, 2005

Dec. 7, 2005

Module: wine Branch: refs/heads/master Commit: d52dafb5ccd006616b14aeb5539c82610ad4ba6c URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=d52dafb5ccd006616b14aeb… Author: Vincent Béron <vberon(a)mecano.gme.usherb.ca> Date: Wed Dec 7 12:51:39 2005 +0100 Add a few missing #includes. --- dlls/dpnhpast/main.c | 1 + dlls/mapi32/imalloc.c | 1 + dlls/msisys/msisys.c | 1 + dlls/netapi32/browsr.c | 1 + dlls/rsaenh/rsaenh.c | 5 +++-- dlls/wintrust/wintrust_main.c | 1 + 6 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/dpnhpast/main.c b/dlls/dpnhpast/main.c index 93ba422..69fbb08 100644 --- a/dlls/dpnhpast/main.c +++ b/dlls/dpnhpast/main.c @@ -22,6 +22,7 @@ #include "windef.h" #include "winbase.h" +#include "objbase.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(dpnhpast); diff --git a/dlls/mapi32/imalloc.c b/dlls/mapi32/imalloc.c index ffe20ed..1ea9442 100644 --- a/dlls/mapi32/imalloc.c +++ b/dlls/mapi32/imalloc.c @@ -31,6 +31,7 @@ #include "winternl.h" #include "objbase.h" #include "shlwapi.h" +#include "mapiutil.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(mapi); diff --git a/dlls/msisys/msisys.c b/dlls/msisys/msisys.c index 62d1238..dbcb52f 100644 --- a/dlls/msisys/msisys.c +++ b/dlls/msisys/msisys.c @@ -27,6 +27,7 @@ #include "winbase.h" #include "wingdi.h" #include "winuser.h" +#include "objbase.h" #include "wine/debug.h" diff --git a/dlls/netapi32/browsr.c b/dlls/netapi32/browsr.c index 3cda17e..b0ed893 100644 --- a/dlls/netapi32/browsr.c +++ b/dlls/netapi32/browsr.c @@ -25,6 +25,7 @@ #include "winerror.h" #include "lmcons.h" #include "lmbrowsr.h" +#include "lmshare.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(netapi32); diff --git a/dlls/rsaenh/rsaenh.c b/dlls/rsaenh/rsaenh.c index 4db2826..2e9b701 100644 --- a/dlls/rsaenh/rsaenh.c +++ b/dlls/rsaenh/rsaenh.c @@ -36,6 +36,7 @@ #include "lmcons.h" #include "handle.h" #include "implglue.h" +#include "objbase.h" WINE_DEFAULT_DEBUG_CHANNEL(crypt); @@ -3632,7 +3633,7 @@ static const WCHAR szDefaultKeys[2][65] * Microsoft Strong Cryptographpic Provider * - HKLM\Software\Microsoft\Cryptography\Defaults\Provider Types\Type 001 */ -HRESULT WINAPI DllRegisterServer() +HRESULT WINAPI DllRegisterServer(void) { HKEY key; DWORD dp; @@ -3709,7 +3710,7 @@ HRESULT WINAPI DllRegisterServer() * NOTES * For the relevant keys see DllRegisterServer. */ -HRESULT WINAPI DllUnregisterServer() +HRESULT WINAPI DllUnregisterServer(void) { RegDeleteKeyW(HKEY_LOCAL_MACHINE, szProviderKeys[0]); RegDeleteKeyW(HKEY_LOCAL_MACHINE, szProviderKeys[1]); diff --git a/dlls/wintrust/wintrust_main.c b/dlls/wintrust/wintrust_main.c index 76912b3..30bb992 100644 --- a/dlls/wintrust/wintrust_main.c +++ b/dlls/wintrust/wintrust_main.c @@ -26,6 +26,7 @@ #include "guiddef.h" #include "wintrust.h" #include "mscat.h" +#include "objbase.h" #include "wine/debug.h"

1 0

Kai Blin : secur32: Implement InitializeSecurityContext(A|W) for the NTLM
by Alexandre Julliard Dec. 7, 2005

Dec. 7, 2005

Module: wine Branch: refs/heads/master Commit: d1a2dd79cc960b21a38ce7e486f115f149636110 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=d1a2dd79cc960b21a38ce7e… Author: Kai Blin <blin(a)gmx.net> Date: Wed Dec 7 12:51:05 2005 +0100 secur32: Implement InitializeSecurityContext(A|W) for the NTLM security provider. --- dlls/secur32/ntlm.c | 309 +++++++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 299 insertions(+), 10 deletions(-)

1 0

Robert Reif : winecfg: Show all sound card drivers and their devices.
by Alexandre Julliard Dec. 7, 2005

Dec. 7, 2005

Module: wine Branch: refs/heads/master Commit: 1758ba6c6dbcba3173e4e99e77cd7c33f067d46c URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=1758ba6c6dbcba3173e4e99… Author: Robert Reif <reif(a)earthlink.net> Date: Wed Dec 7 12:50:52 2005 +0100 winecfg: Show all sound card drivers and their devices. --- programs/winecfg/En.rc | 18 +-- programs/winecfg/audio.c | 264 +++++++++++++++++++++++++++++++++++++++++++ programs/winecfg/resource.h | 1 3 files changed, 273 insertions(+), 10 deletions(-)

1 0

Vincent Béron : Add an error() function to fnt2fon and sfnt2fnt.
by Alexandre Julliard Dec. 7, 2005

Dec. 7, 2005

Module: wine Branch: refs/heads/master Commit: 2e5da5f4214b075e85e4e26b21f418b34c60e179 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=2e5da5f4214b075e85e4e26… Author: Vincent Béron <vberon(a)mecano.gme.usherb.ca> Date: Wed Dec 7 12:44:17 2005 +0100 Add an error() function to fnt2fon and sfnt2fnt. --- tools/fnt2fon.c | 20 ++++++++++++++++++-- tools/sfnt2fnt.c | 47 +++++++++++++++++++++++++++-------------------- 2 files changed, 45 insertions(+), 22 deletions(-) diff --git a/tools/fnt2fon.c b/tools/fnt2fon.c index 77a1f31..88c93ad 100644 --- a/tools/fnt2fon.c +++ b/tools/fnt2fon.c @@ -61,6 +61,23 @@ static void usage(char **argv) return; } +#ifndef __GNUC__ +#define __attribute__(X) +#endif + +static void error(const char *s, ...) __attribute__((format (printf, 1, 2))); + +static void error(const char *s, ...) +{ + va_list ap; + va_start(ap, s); + fprintf(stderr, "Error: "); + vfprintf(stderr, s, ap); + fprintf(stderr, "\n"); + va_end(ap); + exit(1); +} + int main(int argc, char **argv) { int i, j; @@ -99,8 +116,7 @@ int main(int argc, char **argv) } fread(&ver, sizeof(short), 1, fp); if(ver != 0x200 && ver != 0x300) { - fprintf(stderr, "invalid fnt file %s ver %d\n", argv[i+1], ver); - exit(1); + error("invalid fnt file %s ver %d", argv[i+1], ver); } fread(file_lens + i, sizeof(int), 1, fp); fseek(fp, 0x44, SEEK_SET); diff --git a/tools/sfnt2fnt.c b/tools/sfnt2fnt.c index 974f222..4d894e6 100644 --- a/tools/sfnt2fnt.c +++ b/tools/sfnt2fnt.c @@ -61,6 +61,23 @@ static void usage(char **argv) return; } +#ifndef __GNUC__ +#define __attribute__(X) +#endif + +static void error(const char *s, ...) __attribute__((format (printf, 1, 2))); + +static void error(const char *s, ...) +{ + va_list ap; + va_start(ap, s); + fprintf(stderr, "Error: "); + vfprintf(stderr, s, ap); + fprintf(stderr, "\n"); + va_end(ap); + exit(1); +} + static int lookup_charset(int enc) { /* FIXME: make winelib app and use TranslateCharsetInfo */ @@ -130,33 +147,25 @@ static void fill_fontinfo(FT_Face face, FT_SfntName sfntname; TT_OS2 *os2; cptable = wine_cp_get_table(enc); - if(!cptable) { - fprintf(stderr, "Can't find codepage %d\n", enc); - exit(1); - } + if(!cptable) + error("Can't find codepage %d\n", enc); if(cptable->info.char_size != 1) { /* for double byte charsets we actually want to use cp1252 */ cptable = wine_cp_get_table(1252); - if(!cptable) { - fprintf(stderr, "Can't find codepage 1252\n"); - exit(1); - } + if(!cptable) + error("Can't find codepage 1252\n"); } ppem = face->size->metrics.y_ppem; start = sizeof(FNT_HEADER) + sizeof(FONTINFO16); - if(FT_Load_Char(face, 0xc5, FT_LOAD_DEFAULT)) { - fprintf(stderr, "Can't find Aring\n"); - exit(1); - } + if(FT_Load_Char(face, 0xc5, FT_LOAD_DEFAULT)) + error("Can't find Aring\n"); ascent = face->glyph->metrics.height >> 6; descent = ppem - ascent; - if(FT_Load_Char(face, 'M', FT_LOAD_DEFAULT)) { - fprintf(stderr, "Can't find M\n"); - exit(1); - } + if(FT_Load_Char(face, 'M', FT_LOAD_DEFAULT)) + error("Can't find M\n"); il = ascent - (face->glyph->metrics.height >> 6); /* Hack: Courier has no internal leading, nor do any Chinese fonts */ @@ -344,10 +353,8 @@ int main(int argc, char **argv) def_char = atoi(argv[5]); avg_width = atoi(argv[6]); - if(FT_Init_FreeType(&lib)) { - fprintf(stderr, "ft init failure\n"); - exit(1); - } + if(FT_Init_FreeType(&lib)) + error("ft init failure\n"); if(FT_New_Face(lib, argv[1], 0, &face)) { fprintf(stderr, "Can't open face\n");

1 0

appdb/xinha dialog.js htmlarea.css htmlarea.js ...
by WineHQ Dec. 7, 2005

Dec. 7, 2005

ChangeSet ID: 21712 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2005/12/06 21:37:40 Modified files: xinha : dialog.js htmlarea.css htmlarea.js inline-dialog.js panel-dialog.js popupwin.js xinha/contrib : lc_parse_strings.php xinha/examples : custom.css dynamic.css full_example-body.html full_example-menu.html full_example.css full_example.html full_example.js stylist.css xinha/lang : de.js fr.js no.js xinha/plugins/CSS: css.js xinha/plugins/CharCounter: char-counter.js xinha/plugins/CharCounter/lang: de.js fr.js no.js xinha/plugins/CharacterMap: character-map.js xinha/plugins/CharacterMap/lang: de.js fr.js it.js nl.js no.js xinha/plugins/CharacterMap/popups: select_character.html xinha/plugins/ContextMenu: context-menu.js xinha/plugins/ContextMenu/lang: de.js el.js fr.js he.js nl.js no.js pl.js xinha/plugins/DoubleClick: double-click.js xinha/plugins/DynamicCSS: dynamiccss.js xinha/plugins/DynamicCSS/lang: de.js fr.js nl.js no.js xinha/plugins/EnterParagraphs: enter-paragraphs.js xinha/plugins/FindReplace: find-replace.js fr_engine.js xinha/plugins/FindReplace/lang: de.js fr.js no.js pl.js pt_br.js xinha/plugins/FindReplace/popups: find_replace.html xinha/plugins/Forms: forms.js xinha/plugins/Forms/popups: fieldset.html form.html input.html label.html select.html textarea.html xinha/plugins/FullPage: full-page.js xinha/plugins/FullPage/lang: de.js fr.js he.js nl.js no.js pl.js ro.js xinha/plugins/FullPage/popups: docprop.html xinha/plugins/FullScreen: full-screen.js xinha/plugins/FullScreen/lang: de.js fr.js no.js pl.js xinha/plugins/HtmlTidy: html-tidy-logic.php html-tidy.js xinha/plugins/HtmlTidy/lang: de.js fr.js nl.js no.js xinha/plugins/InsertAnchor: insert-anchor.js xinha/plugins/InsertAnchor/lang: de.js fr.js no.js xinha/plugins/InsertAnchor/popups: insert_anchor.html xinha/plugins/InsertPicture: InsertPicture.php insert-picture.js viewpicture.html xinha/plugins/InsertPicture/lang: de.js xinha/plugins/InsertWords: insert-words.js xinha/plugins/Linker: linker.js xinha/plugins/Linker/dTree: dtree.js xinha/plugins/Linker/lang: de.js fr.js no.js pl.js xinha/plugins/ListType: list-type.js xinha/plugins/ListType/lang: de.js fr.js nl.js pl.js xinha/plugins/QuickTag: quick-tag.js xinha/plugins/QuickTag/lang: no.js pt_br.js xinha/plugins/QuickTag/popups: quicktag.html xinha/plugins/SpellChecker: aspell_setup.php spell-check-logic.cgi spell-check-logic.php spell-check-ui.html spell-check-ui.js spell-checker.js xinha/plugins/SpellChecker/lang: cz.js da.js de.js fr.js he.js hu.js nl.js no.js ro.js xinha/plugins/Stylist: stylist.js xinha/plugins/Stylist/lang: de.js no.js xinha/plugins/SuperClean: dialog.html super-clean.js xinha/plugins/SuperClean/img: ed_superclean.gif xinha/plugins/SuperClean/lang: de.js fr.js no.js xinha/plugins/TableOperations: table-operations.js xinha/plugins/TableOperations/lang: cz.js da.js de.js el.js fi.js fr.js he.js it.js nl.js no.js ro.js xinha/plugins/UnFormat: un-format.js xinha/plugins/UnFormat/lang: de.js nl.js no.js xinha/plugins/UnFormat/popups: unformat.html xinha/popups : about.html color_picker.js editor_help.html insert_image.html insert_table.html link.html popup.js xinha/skins/blue-look: skin.css xinha/skins/blue-metallic: skin.css xinha/skins/green-look: skin.css xinha/skins/inditreuse: skin.css xinha/skins/titan: skin.css xinha/skins/xp-blue: skin.css xinha/skins/xp-green: skin.css Added files: xinha/examples : Extended.html ext_example-body.html ext_example-dest.php ext_example-menu.php ext_example.html xinha/plugins/InsertAnchor/lang: pl.js xinha/plugins/InsertPicture/lang: fr.js no.js xinha/plugins/ListType/lang: no.js xinha/plugins/QuickTag/lang: fr.js pl.js xinha/plugins/Stylist/lang: fr.js pl.js xinha/plugins/TableOperations/lang: pl.js xinha/plugins/UnFormat/lang: fr.js Removed files: xinha : popupdiv.js Log message: Chris Morgan <cmorgan(a)alum.wpi.edu> Upgrade to xinha svn head to fix issues with xinha editors not appearing in Firefox 1.5 Patch: http://cvs.winehq.org/patch.py?id=21712 Old revision New revision Changes Path 1.1 1.2 +5 -5 appdb/xinha/dialog.js 1.1 1.2 +1 -6 appdb/xinha/htmlarea.css 1.1 1.2 +245 -175 appdb/xinha/htmlarea.js 1.1 1.2 +11 -11 appdb/xinha/inline-dialog.js 1.1 1.2 +6 -6 appdb/xinha/panel-dialog.js 1.1 1.2 +3 -3 appdb/xinha/popupwin.js 1.1 Removed +0 -0 appdb/xinha/popupdiv.js 1.1 1.2 +15 -12 appdb/xinha/contrib/lc_parse_strings.php 1.1 1.2 +1 -1 appdb/xinha/examples/custom.css 1.1 1.2 +1 -1 appdb/xinha/examples/dynamic.css 1.1 1.2 +1 -1 appdb/xinha/examples/full_example-body.html 1.1 1.2 +29 -3 appdb/xinha/examples/full_example-menu.html 1.1 1.2 +1 -1 appdb/xinha/examples/full_example.css 1.1 1.2 +1 -1 appdb/xinha/examples/full_example.html 1.1 1.2 +10 -5 appdb/xinha/examples/full_example.js 1.1 1.2 +1 -1 appdb/xinha/examples/stylist.css Added 1.1 +0 -0 appdb/xinha/examples/Extended.html Added 1.1 +0 -0 appdb/xinha/examples/ext_example-body.html Added 1.1 +0 -0 appdb/xinha/examples/ext_example-dest.php Added 1.1 +0 -0 appdb/xinha/examples/ext_example-menu.php Added 1.1 +0 -0 appdb/xinha/examples/ext_example.html 1.1 1.2 +145 -135 appdb/xinha/lang/de.js 1.1 1.2 +3 -2 appdb/xinha/lang/fr.js 1.1 1.2 +10 -2 appdb/xinha/lang/no.js 1.1 1.2 +3 -3 appdb/xinha/plugins/CSS/css.js 1.1 1.2 +8 -6 appdb/xinha/plugins/CharCounter/char-counter.js 1.1 1.2 +2 -8 appdb/xinha/plugins/CharCounter/lang/de.js 1.1 1.2 +1 -1 appdb/xinha/plugins/CharCounter/lang/fr.js 1.1 1.2 +1 -2 appdb/xinha/plugins/CharCounter/lang/no.js 1.1 1.2 +2 -2 appdb/xinha/plugins/CharacterMap/character-map.js 1.1 1.2 +0 -3 appdb/xinha/plugins/CharacterMap/lang/de.js 1.1 1.2 +1 -13 appdb/xinha/plugins/CharacterMap/lang/fr.js 1.1 1.2 +3 -7 appdb/xinha/plugins/CharacterMap/lang/it.js 1.1 1.2 +1 -4 appdb/xinha/plugins/CharacterMap/lang/nl.js 1.1 1.2 +1 -2 appdb/xinha/plugins/CharacterMap/lang/no.js 1.1 1.2 +1 -1 appdb/xinha/plugins/CharacterMap/popups/select_character.html 1.1 1.2 +9 -9 appdb/xinha/plugins/ContextMenu/context-menu.js 1.1 1.2 +2 -6 appdb/xinha/plugins/ContextMenu/lang/de.js 1.1 1.2 +1 -3 appdb/xinha/plugins/ContextMenu/lang/el.js 1.1 1.2 +1 -1 appdb/xinha/plugins/ContextMenu/lang/fr.js 1.1 1.2 +1 -12 appdb/xinha/plugins/ContextMenu/lang/he.js 1.1 1.2 +1 -12 appdb/xinha/plugins/ContextMenu/lang/nl.js 1.1 1.2 +1 -3 appdb/xinha/plugins/ContextMenu/lang/no.js 1.1 1.2 +1 -2 appdb/xinha/plugins/ContextMenu/lang/pl.js 1.1 1.2 +2 -2 appdb/xinha/plugins/DoubleClick/double-click.js 1.1 1.2 +6 -6 appdb/xinha/plugins/DynamicCSS/dynamiccss.js 1.1 1.2 +1 -4 appdb/xinha/plugins/DynamicCSS/lang/de.js 1.1 1.2 +1 -9 appdb/xinha/plugins/DynamicCSS/lang/fr.js 1.1 1.2 +1 -4 appdb/xinha/plugins/DynamicCSS/lang/nl.js 1.1 1.2 +1 -2 appdb/xinha/plugins/DynamicCSS/lang/no.js 1.1 1.2 +2 -2 appdb/xinha/plugins/EnterParagraphs/enter-paragraphs.js 1.1 1.2 +2 -2 appdb/xinha/plugins/FindReplace/find-replace.js 1.1 1.2 +8 -8 appdb/xinha/plugins/FindReplace/fr_engine.js 1.1 1.2 +21 -32 appdb/xinha/plugins/FindReplace/lang/de.js 1.1 1.2 +20 -20 appdb/xinha/plugins/FindReplace/lang/fr.js 1.1 1.2 +20 -21 appdb/xinha/plugins/FindReplace/lang/no.js 1.1 1.2 +21 -32 appdb/xinha/plugins/FindReplace/lang/pl.js 1.1 1.2 +24 -32 appdb/xinha/plugins/FindReplace/lang/pt_br.js 1.1 1.2 +5 -5 appdb/xinha/plugins/FindReplace/popups/find_replace.html 1.1 1.2 +6 -6 appdb/xinha/plugins/Forms/forms.js 1.1 1.2 +4 -4 appdb/xinha/plugins/Forms/popups/fieldset.html 1.1 1.2 +4 -4 appdb/xinha/plugins/Forms/popups/form.html 1.1 1.2 +4 -4 appdb/xinha/plugins/Forms/popups/input.html 1.1 1.2 +4 -4 appdb/xinha/plugins/Forms/popups/label.html 1.1 1.2 +4 -4 appdb/xinha/plugins/Forms/popups/select.html 1.1 1.2 +4 -4 appdb/xinha/plugins/Forms/popups/textarea.html 1.1 1.2 +11 -10 appdb/xinha/plugins/FullPage/full-page.js 1.1 1.2 +4 -15 appdb/xinha/plugins/FullPage/lang/de.js 1.1 1.2 +1 -1 appdb/xinha/plugins/FullPage/lang/fr.js 1.1 1.2 +1 -12 appdb/xinha/plugins/FullPage/lang/he.js 1.1 1.2 +10 -21 appdb/xinha/plugins/FullPage/lang/nl.js 1.1 1.2 +4 -2 appdb/xinha/plugins/FullPage/lang/no.js 1.1 1.2 +1 -12 appdb/xinha/plugins/FullPage/lang/pl.js 1.1 1.2 +1 -12 appdb/xinha/plugins/FullPage/lang/ro.js 1.1 1.2 +3 -3 appdb/xinha/plugins/FullPage/popups/docprop.html 1.1 1.2 +2 -2 appdb/xinha/plugins/FullScreen/full-screen.js 1.1 1.2 +1 -12 appdb/xinha/plugins/FullScreen/lang/de.js 1.1 1.2 +1 -13 appdb/xinha/plugins/FullScreen/lang/fr.js 1.1 1.2 +1 -2 appdb/xinha/plugins/FullScreen/lang/no.js 1.1 1.2 +1 -12 appdb/xinha/plugins/FullScreen/lang/pl.js 1.1 1.2 +16 -5 appdb/xinha/plugins/HtmlTidy/html-tidy-logic.php 1.1 1.2 +3 -3 appdb/xinha/plugins/HtmlTidy/html-tidy.js 1.1 1.2 +3 -13 appdb/xinha/plugins/HtmlTidy/lang/de.js 1.1 1.2 +5 -14 appdb/xinha/plugins/HtmlTidy/lang/fr.js 1.1 1.2 +2 -13 appdb/xinha/plugins/HtmlTidy/lang/nl.js 1.1 1.2 +3 -3 appdb/xinha/plugins/HtmlTidy/lang/no.js 1.1 1.2 +97 -97 appdb/xinha/plugins/InsertAnchor/insert-anchor.js 1.1 1.2 +1 -3 appdb/xinha/plugins/InsertAnchor/lang/de.js 1.1 1.2 +1 -1 appdb/xinha/plugins/InsertAnchor/lang/fr.js 1.1 1.2 +1 -2 appdb/xinha/plugins/InsertAnchor/lang/no.js Added 1.1 +0 -0 appdb/xinha/plugins/InsertAnchor/lang/pl.js 1.1 1.2 +5 -6 appdb/xinha/plugins/InsertAnchor/popups/insert_anchor.html 1.1 1.2 +7 -7 appdb/xinha/plugins/InsertPicture/InsertPicture.php 1.1 1.2 +1 -1 appdb/xinha/plugins/InsertPicture/insert-picture.js 1.1 1.2 +10 -10 appdb/xinha/plugins/InsertPicture/viewpicture.html 1.1 1.2 +6 -11 appdb/xinha/plugins/InsertPicture/lang/de.js Added 1.1 +0 -0 appdb/xinha/plugins/InsertPicture/lang/fr.js Added 1.1 +0 -0 appdb/xinha/plugins/InsertPicture/lang/no.js 1.1 1.2 +2 -3 appdb/xinha/plugins/InsertWords/insert-words.js 1.1 1.2 +13 -14 appdb/xinha/plugins/Linker/linker.js 1.1 1.2 +8 -9 appdb/xinha/plugins/Linker/dTree/dtree.js 1.1 1.2 +3 -4 appdb/xinha/plugins/Linker/lang/de.js 1.1 1.2 +1 -1 appdb/xinha/plugins/Linker/lang/fr.js 1.1 1.2 +1 -2 appdb/xinha/plugins/Linker/lang/no.js 1.1 1.2 +1 -1 appdb/xinha/plugins/Linker/lang/pl.js 1.1 1.2 +1 -1 appdb/xinha/plugins/ListType/list-type.js 1.1 1.2 +1 -12 appdb/xinha/plugins/ListType/lang/de.js 1.1 1.2 +1 -13 appdb/xinha/plugins/ListType/lang/fr.js 1.1 1.2 +1 -12 appdb/xinha/plugins/ListType/lang/nl.js 1.1 1.2 +1 -12 appdb/xinha/plugins/ListType/lang/pl.js Added 1.1 +0 -0 appdb/xinha/plugins/ListType/lang/no.js 1.1 1.2 +2 -2 appdb/xinha/plugins/QuickTag/quick-tag.js 1.1 1.2 +1 -2 appdb/xinha/plugins/QuickTag/lang/no.js 1.1 1.2 +11 -11 appdb/xinha/plugins/QuickTag/lang/pt_br.js Added 1.1 +0 -0 appdb/xinha/plugins/QuickTag/lang/fr.js Added 1.1 +0 -0 appdb/xinha/plugins/QuickTag/lang/pl.js 1.1 1.2 +13 -13 appdb/xinha/plugins/QuickTag/popups/quicktag.html 1.1 1.2 +44 -11 appdb/xinha/plugins/SpellChecker/aspell_setup.php 1.1 1.2 +0 -0 appdb/xinha/plugins/SpellChecker/spell-check-logic.cgi 1.1 1.2 +1 -1 appdb/xinha/plugins/SpellChecker/spell-check-logic.php 1.1 1.2 +2 -2 appdb/xinha/plugins/SpellChecker/spell-check-ui.html 1.1 1.2 +21 -21 appdb/xinha/plugins/SpellChecker/spell-check-ui.js 1.1 1.2 +4 -4 appdb/xinha/plugins/SpellChecker/spell-checker.js 1.1 1.2 +1 -12 appdb/xinha/plugins/SpellChecker/lang/cz.js 1.1 1.2 +1 -11 appdb/xinha/plugins/SpellChecker/lang/da.js 1.1 1.2 +2 -4 appdb/xinha/plugins/SpellChecker/lang/de.js 1.1 1.2 +1 -13 appdb/xinha/plugins/SpellChecker/lang/fr.js 1.1 1.2 +1 -12 appdb/xinha/plugins/SpellChecker/lang/he.js 1.1 1.2 +1 -12 appdb/xinha/plugins/SpellChecker/lang/hu.js 1.1 1.2 +2 -14 appdb/xinha/plugins/SpellChecker/lang/nl.js 1.1 1.2 +1 -2 appdb/xinha/plugins/SpellChecker/lang/no.js 1.1 1.2 +1 -12 appdb/xinha/plugins/SpellChecker/lang/ro.js 1.1 1.2 +12 -12 appdb/xinha/plugins/Stylist/stylist.js 1.1 1.2 +1 -12 appdb/xinha/plugins/Stylist/lang/de.js 1.1 1.2 +1 -2 appdb/xinha/plugins/Stylist/lang/no.js Added 1.1 +0 -0 appdb/xinha/plugins/Stylist/lang/fr.js Added 1.1 +0 -0 appdb/xinha/plugins/Stylist/lang/pl.js 1.1 1.2 +1 -25 appdb/xinha/plugins/SuperClean/dialog.html 1.1 1.2 +147 -43 appdb/xinha/plugins/SuperClean/super-clean.js 1.1 1.2 +1 -3 appdb/xinha/plugins/SuperClean/img/ed_superclean.gif 1.1 1.2 +3 -13 appdb/xinha/plugins/SuperClean/lang/de.js 1.1 1.2 +4 -15 appdb/xinha/plugins/SuperClean/lang/fr.js 1.1 1.2 +3 -3 appdb/xinha/plugins/SuperClean/lang/no.js 1.1 1.2 +38 -28 appdb/xinha/plugins/TableOperations/table-operations.js 1.1 1.2 +1 -12 appdb/xinha/plugins/TableOperations/lang/cz.js 1.1 1.2 +1 -12 appdb/xinha/plugins/TableOperations/lang/da.js 1.1 1.2 +1 -3 appdb/xinha/plugins/TableOperations/lang/de.js 1.1 1.2 +1 -3 appdb/xinha/plugins/TableOperations/lang/el.js 1.1 1.2 +1 -2 appdb/xinha/plugins/TableOperations/lang/fi.js 1.1 1.2 +1 -13 appdb/xinha/plugins/TableOperations/lang/fr.js 1.1 1.2 +1 -12 appdb/xinha/plugins/TableOperations/lang/he.js 1.1 1.2 +1 -3 appdb/xinha/plugins/TableOperations/lang/it.js 1.1 1.2 +1 -12 appdb/xinha/plugins/TableOperations/lang/nl.js 1.1 1.2 +1 -12 appdb/xinha/plugins/TableOperations/lang/no.js 1.1 1.2 +1 -12 appdb/xinha/plugins/TableOperations/lang/ro.js Added 1.1 +0 -0 appdb/xinha/plugins/TableOperations/lang/pl.js 1.1 1.2 +4 -4 appdb/xinha/plugins/UnFormat/un-format.js 1.1 1.2 +9 -7 appdb/xinha/plugins/UnFormat/lang/de.js 1.1 1.2 +9 -7 appdb/xinha/plugins/UnFormat/lang/nl.js 1.1 1.2 +8 -9 appdb/xinha/plugins/UnFormat/lang/no.js Added 1.1 +0 -0 appdb/xinha/plugins/UnFormat/lang/fr.js 1.1 1.2 +4 -4 appdb/xinha/plugins/UnFormat/popups/unformat.html 1.1 1.2 +1 -0 appdb/xinha/popups/about.html 1.1 1.2 +4 -4 appdb/xinha/popups/color_picker.js 1.1 1.2 +52 -7 appdb/xinha/popups/editor_help.html 1.1 1.2 +5 -5 appdb/xinha/popups/insert_image.html 1.1 1.2 +4 -4 appdb/xinha/popups/insert_table.html 1.1 1.2 +6 -6 appdb/xinha/popups/link.html 1.1 1.2 +8 -8 appdb/xinha/popups/popup.js 1.1 1.2 +1 -0 appdb/xinha/skins/blue-look/skin.css 1.1 1.2 +3 -2 appdb/xinha/skins/blue-metallic/skin.css 1.1 1.2 +1 -0 appdb/xinha/skins/green-look/skin.css 1.1 1.2 +1 -0 appdb/xinha/skins/inditreuse/skin.css 1.1 1.2 +11 -5 appdb/xinha/skins/titan/skin.css 1.1 1.2 +1 -0 appdb/xinha/skins/xp-blue/skin.css 1.1 1.2 +1 -0 appdb/xinha/skins/xp-green/skin.css

1 0

Robert Shearman : OLE: Implement ITypeInfo_AddressOfMember.
by Alexandre Julliard Dec. 6, 2005

Dec. 6, 2005

Module: wine Branch: refs/heads/master Commit: 1f68feeef11f4c64cc55b4ceb3a9040fdf8ac551 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=1f68feeef11f4c64cc55b4c… Author: Robert Shearman <rob(a)codeweavers.com> Date: Tue Dec 6 21:24:45 2005 +0100 OLE: Implement ITypeInfo_AddressOfMember. --- dlls/oleaut32/typelib.c | 48 ++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 47 insertions(+), 1 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index ebf1903..5ed9a82 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -5671,7 +5671,53 @@ static HRESULT WINAPI ITypeInfo_fnAddres MEMBERID memid, INVOKEKIND invKind, PVOID *ppv) { ITypeInfoImpl *This = (ITypeInfoImpl *)iface; - FIXME("(%p) stub!\n", This); + HRESULT hr; + BSTR dll, entry; + WORD ordinal; + HMODULE module; + + TRACE("(%p)->(0x%lx, 0x%x, %p)\n", This, memid, invKind, ppv); + + hr = ITypeInfo_GetDllEntry(iface, memid, invKind, &dll, &entry, &ordinal); + if (FAILED(hr)) + return hr; + + module = LoadLibraryW(dll); + if (!module) + { + ERR("couldn't load %s\n", debugstr_w(dll)); + SysFreeString(dll); + if (entry) SysFreeString(entry); + return STG_E_FILENOTFOUND; + } + /* FIXME: store library somewhere where we can free it */ + + if (entry) + { + LPSTR entryA; + INT len = WideCharToMultiByte(CP_ACP, 0, entry, -1, NULL, 0, NULL, NULL); + entryA = HeapAlloc(GetProcessHeap(), 0, len); + WideCharToMultiByte(CP_ACP, 0, entry, -1, entryA, len, NULL, NULL); + + *ppv = GetProcAddress(module, entryA); + if (!*ppv) + ERR("function not found %s\n", debugstr_a(entryA)); + + HeapFree(GetProcessHeap(), 0, entryA); + } + else + { + *ppv = GetProcAddress(module, MAKEINTRESOURCEA(ordinal)); + if (!*ppv) + ERR("function not found %d\n", ordinal); + } + + SysFreeString(dll); + if (entry) SysFreeString(entry); + + if (!*ppv) + return TYPE_E_DLLFUNCTIONNOTFOUND; + return S_OK; }

1 0

Robert Shearman : OLE: Implement undocumented behaviour in DispCallFunc.
by Alexandre Julliard Dec. 6, 2005

Dec. 6, 2005

Module: wine Branch: refs/heads/master Commit: a056a9a89cc42fc445fc8c5bf24ac73dbf71b81e URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=a056a9a89cc42fc445fc8c5… Author: Robert Shearman <rob(a)codeweavers.com> Date: Tue Dec 6 21:25:51 2005 +0100 OLE: Implement undocumented behaviour in DispCallFunc. Fix DispCallFunc to work with MSDN-undocumented behaviour used by Office 2003 and document the function. --- dlls/oleaut32/typelib.c | 68 ++++++++++++++++++++++++++++++++++++++++++----- 1 files changed, 61 insertions(+), 7 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 5ed9a82..a6e2495 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -5173,6 +5173,45 @@ static HRESULT typedescvt_to_variantvt(I /*********************************************************************** * DispCallFunc (OLEAUT32.@) + * + * Invokes a function of the specifed calling convention, passing the + * specified arguments and returns the result. + * + * PARAMS + * pvInstance [I] Optional pointer to the instance whose function to invoke. + * oVft [I] The offset in the vtable. See notes. + * cc [I] Calling convention of the function to call. + * vtReturn [I] The return type of the function. + * cActuals [I] Number of parameters. + * prgvt [I] The types of the parameters to pass. This is used for sizing only. + * prgpvarg [I] The arguments to pass. + * pvargResult [O] The return value of the function. Can be NULL. + * + * RETURNS + * Success: S_OK. + * Failure: HRESULT code. + * + * NOTES + * The HRESULT return value of this function is not affected by the return + * value of the user supplied function, which is returned in pvargResult. + * + * If pvInstance is NULL then a non-object function is to be called and oVft + * is the address of the function to call. + * + * The cc parameter can be one of the following values: + *|CC_FASTCALL + *|CC_CDECL + *|CC_PASCAL + *|CC_STDCALL + *|CC_FPFASTCALL + *|CC_SYSCALL + *|CC_MPWCDECL + *|CC_MPWPASCAL + * + * BUGS + * Native accepts arguments in the reverse order. I.e. the first item in the + * prgpvarg array is the last argument in the C/C++ declaration of the + * function to be called. */ HRESULT WINAPI DispCallFunc( @@ -5187,10 +5226,10 @@ DispCallFunc( pvInstance, oVft, cc, vtReturn, cActuals, prgvt, prgpvarg, pvargResult, V_VT(pvargResult)); - /* DispCallFunc is only used to invoke methods belonging to an - * IDispatch-derived COM interface. So we need to add a first parameter - * to the list of arguments, to supply the interface pointer */ - argsize = 1; + argsize = 0; + if (pvInstance) + argsize++; /* for This pointer */ + for (i=0;i<cActuals;i++) { TRACE("arg %d: type %d, size %d\n",i,prgvt[i],_argsize(prgvt[i])); @@ -5198,8 +5237,14 @@ DispCallFunc( argsize += _argsize(prgvt[i]); } args = HeapAlloc(GetProcessHeap(),0,sizeof(DWORD)*argsize); - args[0] = (DWORD)pvInstance; /* this is the fake IDispatch interface pointer */ - argspos = 1; + + argspos = 0; + if (pvInstance) + { + args[0] = (DWORD)pvInstance; /* the This pointer is always the first parameter */ + argspos++; + } + for (i=0;i<cActuals;i++) { VARIANT *arg = prgpvarg[i]; @@ -5208,7 +5253,16 @@ DispCallFunc( argspos += _argsize(prgvt[i]); } - hres = _invoke((*(FARPROC**)pvInstance)[oVft/sizeof(void *)],cc,argsize,args); + if (pvInstance) + { + FARPROC *vtable = *(FARPROC**)pvInstance; + hres = _invoke(vtable[oVft/sizeof(void *)], cc, argsize, args); + } + else + /* if we aren't invoking an object then the function pointer is stored + * in oVft */ + hres = _invoke((FARPROC)oVft, cc, argsize, args); + if (pvargResult && (vtReturn != VT_EMPTY)) { TRACE("Method returned 0x%08lx\n",hres);

1 0

Robert Shearman : OLE: Fix brokenness in typelib marshaller caused by dispinterface retval fix.
by Alexandre Julliard Dec. 6, 2005

Dec. 6, 2005

Module: wine Branch: refs/heads/master Commit: b0d8e06caf47a8e7aee32b89575f6740d1a39d7d URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=b0d8e06caf47a8e7aee32b8… Author: Robert Shearman <rob(a)codeweavers.com> Date: Tue Dec 6 21:24:19 2005 +0100 OLE: Fix brokenness in typelib marshaller caused by dispinterface retval fix. Fix more fallout from dispinterface retval patch: make typelib marshaler use the internal function description so that it calls dispinterface functions with the correct number of parameters again. Also fixes some memory leaks caused by the fact that a corresponding ReleaseXDesc function has to be called for each GetXDesc. --- dlls/oleaut32/tmarshal.c | 16 +++++++++------- dlls/oleaut32/typelib.c | 38 +++++++++++++++++++++++++++----------- dlls/oleaut32/typelib.h | 2 ++ 3 files changed, 38 insertions(+), 18 deletions(-) diff --git a/dlls/oleaut32/tmarshal.c b/dlls/oleaut32/tmarshal.c index 0886fc3..50a9135 100644 --- a/dlls/oleaut32/tmarshal.c +++ b/dlls/oleaut32/tmarshal.c @@ -304,12 +304,12 @@ _get_typeinfo_for_iid(REFIID riid, IType */ static int _nroffuncs(ITypeInfo *tinfo) { int n, max = 0; - FUNCDESC *fdesc; + const FUNCDESC *fdesc; HRESULT hres; n=0; while (1) { - hres = ITypeInfo_GetFuncDesc(tinfo,n,&fdesc); + hres = ITypeInfoImpl_GetInternalFuncDesc(tinfo,n,&fdesc); if (hres) return max+1; if (fdesc->oVft/4 > max) @@ -1053,6 +1053,7 @@ deserialize_param( (DWORD*)(((LPBYTE)*arg)+vdesc->u.oInst), buf ); + ITypeInfo2_ReleaseVarDesc(tinfo2, vdesc); if (debugout && (i<tattr->cVars-1)) TRACE_(olerelay)(","); } if (debugout) TRACE_(olerelay)("}"); @@ -1108,7 +1109,7 @@ deserialize_param( /* Searches function, also in inherited interfaces */ static HRESULT _get_funcdesc( - ITypeInfo *tinfo, int iMethod, ITypeInfo **tactual, FUNCDESC **fdesc, BSTR *iname, BSTR *fname) + ITypeInfo *tinfo, int iMethod, ITypeInfo **tactual, const FUNCDESC **fdesc, BSTR *iname, BSTR *fname) { int i = 0, j = 0; HRESULT hres; @@ -1120,7 +1121,8 @@ _get_funcdesc( ITypeInfo_AddRef(*tactual); while (1) { - hres = ITypeInfo_GetFuncDesc(tinfo, i, fdesc); + hres = ITypeInfoImpl_GetInternalFuncDesc(tinfo, i, fdesc); + if (hres) { ITypeInfo *tinfo2; HREFTYPE href; @@ -1164,7 +1166,7 @@ static DWORD xCall(LPVOID retptr, int method, TMProxyImpl *tpinfo /*, args */) { DWORD *args = ((DWORD*)&tpinfo)+1, *xargs; - FUNCDESC *fdesc; + const FUNCDESC *fdesc; HRESULT hres; int i, relaydeb = TRACE_ON(olerelay); marshal_state buf; @@ -1451,7 +1453,7 @@ PSFacBuf_CreateProxy( HRESULT hres; ITypeInfo *tinfo; int i, nroffuncs; - FUNCDESC *fdesc; + const FUNCDESC *fdesc; TMProxyImpl *proxy; TYPEATTR *typeattr; @@ -1647,7 +1649,7 @@ TMStubImpl_Invoke( LPRPCSTUBBUFFER iface, RPCOLEMESSAGE* xmsg,IRpcChannelBuffer*rpcchanbuf) { int i; - FUNCDESC *fdesc; + const FUNCDESC *fdesc; TMStubImpl *This = (TMStubImpl *)iface; HRESULT hres; DWORD *args, res, *xargs, nrofargs; diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index b2f417e..ebf1903 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -4489,6 +4489,24 @@ static HRESULT TLB_AllocAndInitFuncDesc( return S_OK; } +HRESULT ITypeInfoImpl_GetInternalFuncDesc( ITypeInfo *iface, UINT index, const FUNCDESC **ppFuncDesc ) +{ + ITypeInfoImpl *This = (ITypeInfoImpl *)iface; + const TLBFuncDesc *pFDesc; + int i; + + for(i=0, pFDesc=This->funclist; i!=index && pFDesc; i++, pFDesc=pFDesc->next) + ; + + if (pFDesc) + { + *ppFuncDesc = &pFDesc->funcdesc; + return S_OK; + } + + return E_INVALIDARG; +} + /* ITypeInfo::GetFuncDesc * * Retrieves the FUNCDESC structure that contains information about a @@ -4499,21 +4517,19 @@ static HRESULT WINAPI ITypeInfo_fnGetFun LPFUNCDESC *ppFuncDesc) { ITypeInfoImpl *This = (ITypeInfoImpl *)iface; - int i; - const TLBFuncDesc *pFDesc; + const FUNCDESC *internal_funcdesc; + HRESULT hr; TRACE("(%p) index %d\n", This, index); - for(i=0, pFDesc=This->funclist; i!=index && pFDesc; i++, pFDesc=pFDesc->next) - ; - - if(pFDesc) - return TLB_AllocAndInitFuncDesc( - &pFDesc->funcdesc, - ppFuncDesc, - This->TypeAttr.typekind == TKIND_DISPATCH); + hr = ITypeInfoImpl_GetInternalFuncDesc((ITypeInfo *)iface, index, &internal_funcdesc); + if (FAILED(hr)) + return hr; - return E_INVALIDARG; + return TLB_AllocAndInitFuncDesc( + internal_funcdesc, + ppFuncDesc, + This->TypeAttr.typekind == TKIND_DISPATCH); } static HRESULT TLB_AllocAndInitVarDesc( const VARDESC *src, VARDESC **dest_ptr ) diff --git a/dlls/oleaut32/typelib.h b/dlls/oleaut32/typelib.h index 3bb6811..c286fae 100644 --- a/dlls/oleaut32/typelib.h +++ b/dlls/oleaut32/typelib.h @@ -600,6 +600,8 @@ WORD typeofarray #include "poppack.h" +HRESULT ITypeInfoImpl_GetInternalFuncDesc( ITypeInfo *iface, UINT index, const FUNCDESC **ppFuncDesc ); + extern DWORD _invoke(FARPROC func,CALLCONV callconv, int nrargs, DWORD *args); extern void dump_Variant(const VARIANT * pvar);

1 0

Robert Shearman : OLE: Add tests for the typelib version of ITypeComp_Bind.
by Alexandre Julliard Dec. 6, 2005

Dec. 6, 2005

Module: wine Branch: refs/heads/master Commit: 36f112973e0eb08204e984f03f3656002f8416b4 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=36f112973e0eb08204e984f… Author: Robert Shearman <rob(a)codeweavers.com> Date: Tue Dec 6 21:23:19 2005 +0100 OLE: Add tests for the typelib version of ITypeComp_Bind. --- dlls/oleaut32/tests/typelib.c | 158 +++++++++++++++++++++++++++++++++++++++++ 1 files changed, 158 insertions(+), 0 deletions(-) diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c index 5e48ece..e70538c 100644 --- a/dlls/oleaut32/tests/typelib.c +++ b/dlls/oleaut32/tests/typelib.c @@ -27,6 +27,8 @@ #include "winbase.h" #include "oleauto.h" +#define ok_ole_success(hr, func) ok(hr == S_OK, #func " failed with error 0x%08lx\n", hr) + static void ref_count_test(LPCWSTR type_lib) { ITypeLib *iface; @@ -56,8 +58,164 @@ static void ref_count_test(LPCWSTR type_ ok(ITypeLib_Release(iface) == 0, "ITypeLib should be destroyed here.\n"); } +static void test_TypeComp(void) +{ + ITypeLib *pTypeLib; + ITypeComp *pTypeComp; + HRESULT hr; + ULONG ulHash; + DESCKIND desckind; + BINDPTR bindptr; + ITypeInfo *pTypeInfo; + static WCHAR wszStdOle2[] = {'s','t','d','o','l','e','2','.','t','l','b',0}; + static WCHAR wszStdFunctions[] = {'S','t','d','F','u','n','c','t','i','o','n','s',0}; + static WCHAR wszSavePicture[] = {'S','a','v','e','P','i','c','t','u','r','e',0}; + static WCHAR wszOLE_TRISTATE[] = {'O','L','E','_','T','R','I','S','T','A','T','E',0}; + static WCHAR wszUnchecked[] = {'U','n','c','h','e','c','k','e','d',0}; + static WCHAR wszIUnknown[] = {'I','U','n','k','n','o','w','n',0}; + static WCHAR wszFont[] = {'F','o','n','t',0}; + static WCHAR wszGUID[] = {'G','U','I','D',0}; + static WCHAR wszStdPicture[] = {'S','t','d','P','i','c','t','u','r','e',0}; + static WCHAR wszOLE_COLOR[] = {'O','L','E','_','C','O','L','O','R',0}; + + hr = LoadTypeLib(wszStdOle2, &pTypeLib); + ok_ole_success(hr, LoadTypeLib); + + hr = ITypeLib_GetTypeComp(pTypeLib, &pTypeComp); + ok_ole_success(hr, ITypeLib_GetTypeComp); + + /* test getting a TKIND_MODULE */ + ulHash = LHashValOfNameSys(SYS_WIN32, LOCALE_NEUTRAL, wszStdFunctions); + hr = ITypeComp_Bind(pTypeComp, wszStdFunctions, ulHash, 0, &pTypeInfo, &desckind, &bindptr); + ok_ole_success(hr, ITypeComp_Bind); + + ok(desckind == DESCKIND_TYPECOMP, + "desckind should have been DESCKIND_TYPECOMP instead of %d\n", + desckind); + ok(!pTypeInfo, "pTypeInfo should have been set to NULL\n"); + + ITypeComp_Release(bindptr.lptcomp); + + /* test getting a TKIND_MODULE with INVOKE_PROPERTYGET */ + ulHash = LHashValOfNameSys(SYS_WIN32, LOCALE_NEUTRAL, wszStdFunctions); + hr = ITypeComp_Bind(pTypeComp, wszStdFunctions, ulHash, INVOKE_PROPERTYGET, &pTypeInfo, &desckind, &bindptr); + ok_ole_success(hr, ITypeComp_Bind); + + ok(desckind == DESCKIND_TYPECOMP, + "desckind should have been DESCKIND_TYPECOMP instead of %d\n", + desckind); + ok(!pTypeInfo, "pTypeInfo should have been set to NULL\n"); + + /* test getting a function within a TKIND_MODULE */ + ulHash = LHashValOfNameSys(SYS_WIN32, LOCALE_NEUTRAL, wszSavePicture); + hr = ITypeComp_Bind(pTypeComp, wszSavePicture, ulHash, 0, &pTypeInfo, &desckind, &bindptr); + ok_ole_success(hr, ITypeComp_Bind); + + ok(desckind == DESCKIND_FUNCDESC, + "desckind should have been DESCKIND_FUNCDESC instead of %d\n", + desckind); + ok(bindptr.lpfuncdesc != NULL, "bindptr.lpfuncdesc should not have been set to NULL\n"); + ITypeInfo_ReleaseFuncDesc(pTypeInfo, bindptr.lpfuncdesc); + ITypeInfo_Release(pTypeInfo); + + /* test getting a function within a TKIND_MODULE with INVOKE_PROPERTYGET */ + ulHash = LHashValOfNameSys(SYS_WIN32, LOCALE_NEUTRAL, wszSavePicture); + hr = ITypeComp_Bind(pTypeComp, wszSavePicture, ulHash, INVOKE_PROPERTYGET, &pTypeInfo, &desckind, &bindptr); + todo_wine ok(hr == TYPE_E_TYPEMISMATCH, + "ITypeComp_Bind should have failed with TYPE_E_TYPEMISMATCH instead of 0x%08lx\n", + hr); + + ok(desckind == DESCKIND_NONE, + "desckind should have been DESCKIND_NONE instead of %d\n", + desckind); + ok(!pTypeInfo, "pTypeInfo should have been set to NULL\n"); + ok(!bindptr.lptcomp, "bindptr should have been set to NULL\n"); + + /* test getting a TKIND_ENUM */ + ulHash = LHashValOfNameSys(SYS_WIN32, LOCALE_NEUTRAL, wszOLE_TRISTATE); + hr = ITypeComp_Bind(pTypeComp, wszOLE_TRISTATE, ulHash, 0, &pTypeInfo, &desckind, &bindptr); + ok_ole_success(hr, ITypeComp_Bind); + + ok(desckind == DESCKIND_TYPECOMP, + "desckind should have been DESCKIND_TYPECOMP instead of %d\n", + desckind); + ok(!pTypeInfo, "pTypeInfo should have been set to NULL\n"); + + ITypeComp_Release(bindptr.lptcomp); + + /* test getting a value within a TKIND_ENUM */ + ulHash = LHashValOfNameSys(SYS_WIN32, LOCALE_NEUTRAL, wszUnchecked); + hr = ITypeComp_Bind(pTypeComp, wszUnchecked, ulHash, 0, &pTypeInfo, &desckind, &bindptr); + ok_ole_success(hr, ITypeComp_Bind); + + ok(desckind == DESCKIND_VARDESC, + "desckind should have been DESCKIND_VARDESC instead of %d\n", + desckind); + ITypeInfo_ReleaseVarDesc(pTypeInfo, bindptr.lpvardesc); + ITypeInfo_Release(pTypeInfo); + + /* test getting a TKIND_INTERFACE */ + ulHash = LHashValOfNameSys(SYS_WIN32, LOCALE_NEUTRAL, wszIUnknown); + hr = ITypeComp_Bind(pTypeComp, wszIUnknown, ulHash, 0, &pTypeInfo, &desckind, &bindptr); + ok_ole_success(hr, ITypeComp_Bind); + + ok(desckind == DESCKIND_NONE, + "desckind should have been DESCKIND_NONE instead of %d\n", + desckind); + ok(!pTypeInfo, "pTypeInfo should have been set to NULL\n"); + ok(!bindptr.lptcomp, "bindptr should have been set to NULL\n"); + + /* test getting a TKIND_DISPATCH */ + ulHash = LHashValOfNameSys(SYS_WIN32, LOCALE_NEUTRAL, wszFont); + hr = ITypeComp_Bind(pTypeComp, wszFont, ulHash, 0, &pTypeInfo, &desckind, &bindptr); + ok_ole_success(hr, ITypeComp_Bind); + + ok(desckind == DESCKIND_NONE, + "desckind should have been DESCKIND_NONE instead of %d\n", + desckind); + ok(!pTypeInfo, "pTypeInfo should have been set to NULL\n"); + ok(!bindptr.lptcomp, "bindptr should have been set to NULL\n"); + + /* test getting a TKIND_RECORD/TKIND_ALIAS */ + ulHash = LHashValOfNameSys(SYS_WIN32, LOCALE_NEUTRAL, wszGUID); + hr = ITypeComp_Bind(pTypeComp, wszGUID, ulHash, 0, &pTypeInfo, &desckind, &bindptr); + ok_ole_success(hr, ITypeComp_Bind); + + ok(desckind == DESCKIND_NONE, + "desckind should have been DESCKIND_NONE instead of %d\n", + desckind); + ok(!pTypeInfo, "pTypeInfo should have been set to NULL\n"); + ok(!bindptr.lptcomp, "bindptr should have been set to NULL\n"); + + /* test getting a TKIND_ALIAS */ + ulHash = LHashValOfNameSys(SYS_WIN32, LOCALE_NEUTRAL, wszOLE_COLOR); + hr = ITypeComp_Bind(pTypeComp, wszOLE_COLOR, ulHash, 0, &pTypeInfo, &desckind, &bindptr); + ok_ole_success(hr, ITypeComp_Bind); + + ok(desckind == DESCKIND_NONE, + "desckind should have been DESCKIND_NONE instead of %d\n", + desckind); + ok(!pTypeInfo, "pTypeInfo should have been set to NULL\n"); + ok(!bindptr.lptcomp, "bindptr should have been set to NULL\n"); + + /* test getting a TKIND_COCLASS */ + ulHash = LHashValOfNameSys(SYS_WIN32, LOCALE_NEUTRAL, wszStdPicture); + hr = ITypeComp_Bind(pTypeComp, wszStdPicture, ulHash, 0, &pTypeInfo, &desckind, &bindptr); + ok_ole_success(hr, ITypeComp_Bind); + + ok(desckind == DESCKIND_NONE, + "desckind should have been DESCKIND_NONE instead of %d\n", + desckind); + ok(!pTypeInfo, "pTypeInfo should have been set to NULL\n"); + ok(!bindptr.lptcomp, "bindptr should have been set to NULL\n"); + + ITypeComp_Release(pTypeComp); + ITypeLib_Release(pTypeLib); +} + START_TEST(typelib) { static const WCHAR type_lib_stdole32[] = {'s','t','d','o','l','e','3','2','.','t','l','b',0}; ref_count_test(type_lib_stdole32); + test_TypeComp(); }

1 0

Robert Shearman : OLE: Update the type of the oVft parameter for DispCallFunc.
by Alexandre Julliard Dec. 6, 2005

Dec. 6, 2005

Module: wine Branch: refs/heads/master Commit: 806cdce355428b2cbdb8e926fab06d9288e2323e URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=806cdce355428b2cbdb8e92… Author: Robert Shearman <rob(a)codeweavers.com> Date: Tue Dec 6 21:23:09 2005 +0100 OLE: Update the type of the oVft parameter for DispCallFunc. --- dlls/oleaut32/typelib.c | 2 +- include/oleauto.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 5c1d6c8..b2f417e 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -5160,7 +5160,7 @@ static HRESULT typedescvt_to_variantvt(I */ HRESULT WINAPI DispCallFunc( - void* pvInstance, ULONG oVft, CALLCONV cc, VARTYPE vtReturn, UINT cActuals, + void* pvInstance, ULONG_PTR oVft, CALLCONV cc, VARTYPE vtReturn, UINT cActuals, VARTYPE* prgvt, VARIANTARG** prgpvarg, VARIANT* pvargResult) { int i, argsize, argspos; diff --git a/include/oleauto.h b/include/oleauto.h index 3317b81..e74882b 100644 --- a/include/oleauto.h +++ b/include/oleauto.h @@ -715,7 +715,7 @@ HRESULT WINAPI DispInvoke(void*,ITypeInf EXCEPINFO*,UINT*); HRESULT WINAPI CreateDispTypeInfo(INTERFACEDATA*,LCID,ITypeInfo**); HRESULT WINAPI CreateStdDispatch(IUnknown*,void*,ITypeInfo*,IUnknown**); -HRESULT WINAPI DispCallFunc(void*,ULONG,CALLCONV,VARTYPE,UINT,VARTYPE*, +HRESULT WINAPI DispCallFunc(void*,ULONG_PTR,CALLCONV,VARTYPE,UINT,VARTYPE*, VARIANTARG**,VARIANT*);

1 0

Detlef Riekenberg : c2man: Remove HTML warnings.
by Alexandre Julliard Dec. 6, 2005

Dec. 6, 2005

Module: wine Branch: refs/heads/master Commit: 2c5fee9c582ebb7d80ff0fc4f7fb516ca411f8d3 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=2c5fee9c582ebb7d80ff0fc… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Tue Dec 6 21:22:28 2005 +0100 c2man: Remove HTML warnings. --- tools/c2man.pl | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/c2man.pl b/tools/c2man.pl index 8d11d1c..7797e0c 100755 --- a/tools/c2man.pl +++ b/tools/c2man.pl @@ -1388,7 +1388,7 @@ sub output_api_section_start($$) if ($opt_output_format eq "h") { - print OUTPUT "\n<p><h2 class=\"section\">",$section_name,"</h2></p>\n"; + print OUTPUT "\n<h2 class=\"section\">",$section_name,"</h2>\n"; } elsif ($opt_output_format eq "s") { @@ -1447,7 +1447,7 @@ sub output_api_synopsis($) if ($opt_output_format eq "h") { - print OUTPUT "<p><pre class=\"proto\">\n ", $comment->{RETURNS}," ",$comment->{COMMENT_NAME},"\n (\n"; + print OUTPUT "<pre class=\"proto\">\n ", $comment->{RETURNS}," ",$comment->{COMMENT_NAME},"\n (\n"; @fmt = ("", "\n", "<tt class=\"param\">", "</tt>"); } elsif ($opt_output_format eq "s") @@ -1502,7 +1502,7 @@ sub output_api_synopsis($) if ($opt_output_format eq "h") { - print OUTPUT " )\n\n</pre></p>\n"; + print OUTPUT " )\n</pre>\n"; } elsif ($opt_output_format eq "s") {

1 0

Kai Blin : secur32: Implementing AcquireCredentialsHandle(A|W) for the NTLM
by Alexandre Julliard Dec. 6, 2005

Dec. 6, 2005

Module: wine Branch: refs/heads/master Commit: 79aff338a3e32313502daf2487f9da81c83d3934 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=79aff338a3e32313502daf2… Author: Kai Blin <blin(a)gmx.net> Date: Tue Dec 6 21:22:57 2005 +0100 secur32: Implementing AcquireCredentialsHandle(A|W) for the NTLM security provider. --- dlls/secur32/Makefile.in | 2 dlls/secur32/ntlm.c | 445 ++++++++++++++++++++++++++++++++++++++-------- 2 files changed, 366 insertions(+), 81 deletions(-)

1 0

Robert Reif : winejack: Fix driver load and initialization.
by Alexandre Julliard Dec. 6, 2005

Dec. 6, 2005

Module: wine Branch: refs/heads/master Commit: 18441ac0273247e8f837be840c166023b2853cbf URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=18441ac0273247e8f837be8… Author: Robert Reif <reif(a)earthlink.net> Date: Tue Dec 6 21:22:08 2005 +0100 winejack: Fix driver load and initialization. Move wave in/out initialization from wave out to driver. Add index number to device names. Fix memset bug where only first wave in caps was zeroed. --- dlls/winmm/winejack/audio.c | 25 ++++++++----------------- dlls/winmm/winejack/jack.c | 4 +++- 2 files changed, 11 insertions(+), 18 deletions(-) diff --git a/dlls/winmm/winejack/audio.c b/dlls/winmm/winejack/audio.c index 2ef0acb..146d0bc 100644 --- a/dlls/winmm/winejack/audio.c +++ b/dlls/winmm/winejack/audio.c @@ -890,9 +890,7 @@ LONG JACK_WaveRelease(void) LONG JACK_WaveInit(void) { int i; - - static const WCHAR ini_out[] = {'J','A','C','K',' ','W','a','v','e','O','u','t',' ','D','r','i','v','e','r',0}; - static const WCHAR ini_in [] = {'J','A','C','K',' ','W','a','v','e','I','n',' ',' ','D','r','i','v','e','r',0}; + CHAR szPname[MAXPNAMELEN]; TRACE("called\n"); @@ -930,8 +928,8 @@ LONG JACK_WaveInit(void) WOutDev[i].caps.wMid = 0x00FF; /* Manufac ID */ WOutDev[i].caps.wPid = 0x0001; /* Product ID */ - strcpyW(WOutDev[i].caps.szPname, ini_out); - + snprintf(szPname, sizeof(szPname), "JACK WaveOut %d", i); + MultiByteToWideChar(CP_ACP, 0, szPname, -1, WOutDev[i].caps.szPname, sizeof(WOutDev[i].caps.szPname)/sizeof(WCHAR)); snprintf(WOutDev[i].interface_name, sizeof(WOutDev[i].interface_name), "winejack: %d", i); WOutDev[i].caps.vDriverVersion = 0x0100; @@ -959,12 +957,13 @@ LONG JACK_WaveInit(void) /* then do input device */ for (i = 0; i < MAX_WAVEINDRV; ++i) { - /* TODO: we should initialize read stuff here */ - memset(&WInDev[0].caps, 0, sizeof(WInDev[0].caps)); + /* TODO: we should initialize read stuff here */ + memset(&WInDev[i].caps, 0, sizeof(WInDev[i].caps)); WInDev[i].caps.wMid = 0x00FF; WInDev[i].caps.wPid = 0x0001; - strcpyW(WInDev[i].caps.szPname, ini_in); + snprintf(szPname, sizeof(szPname), "JACK WaveIn %d", i); + MultiByteToWideChar(CP_ACP, 0, szPname, -1, WInDev[i].caps.szPname, sizeof(WInDev[i].caps.szPname)/sizeof(WCHAR)); snprintf(WInDev[i].interface_name, sizeof(WInDev[i].interface_name), "winejack: %d", i); WInDev[i].caps.vDriverVersion = 0x0100; @@ -1666,18 +1665,10 @@ DWORD WINAPI JACK_wodMessage(UINT wDevID switch (wMsg) { case DRVM_INIT: - TRACE("DRVM_INIT\n"); - return JACK_WaveInit(); case DRVM_EXIT: - TRACE("DRVM_EXIT\n"); - return JACK_WaveRelease(); case DRVM_ENABLE: - /* FIXME: Pretend this is supported */ - TRACE("DRVM_ENABLE\n"); - return 0; case DRVM_DISABLE: - /* FIXME: Pretend this is supported */ - TRACE("DRVM_DISABLE\n"); + /* FIXME: Pretend this is supported */ return 0; case WODM_OPEN: return wodOpen(wDevID, (LPWAVEOPENDESC)dwParam1, dwParam2); case WODM_CLOSE: return wodClose(wDevID); diff --git a/dlls/winmm/winejack/jack.c b/dlls/winmm/winejack/jack.c index d5e12ba..c712634 100644 --- a/dlls/winmm/winejack/jack.c +++ b/dlls/winmm/winejack/jack.c @@ -66,7 +66,7 @@ static LRESULT JACK_drvLoad(void) } } - return 1; + return JACK_WaveInit(); } /************************************************************************** @@ -79,6 +79,8 @@ static LRESULT JACK_drvFree(void) if(jackhandle && (jackhandle != (void*)-1)) { + JACK_WaveRelease(); + TRACE("calling wine_dlclose() on jackhandle\n"); wine_dlclose(jackhandle, NULL, 0); jackhandle = NULL;

1 0

Eric Pouech : mciwave: save/record.
by Alexandre Julliard Dec. 6, 2005

Dec. 6, 2005

Module: wine Branch: refs/heads/master Commit: 9cba6ceacddcab2afd264a8c9c1c82c1bf73af17 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=9cba6ceacddcab2afd264a8… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Tue Dec 6 21:21:48 2005 +0100 mciwave: save/record. - fix for playback after a sound has been recorded - shall fix also opening the mci device without name - bug reported (and fix tested) by Peter Astrand --- dlls/winmm/mciwave/mciwave.c | 272 +++++++++++++++++++++--------------------- 1 files changed, 138 insertions(+), 134 deletions(-)

1 0

Eric Pouech : dbghelp: Final touch on StackWalk64 so that it works.
by Alexandre Julliard Dec. 6, 2005

Dec. 6, 2005

Module: wine Branch: refs/heads/master Commit: 7b11aacbae2aca90f8b1059795ee849c69b43523 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=7b11aacbae2aca90f8b1059… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Tue Dec 6 21:21:31 2005 +0100 dbghelp: Final touch on StackWalk64 so that it works. --- dlls/dbghelp/stack.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/dbghelp/stack.c b/dlls/dbghelp/stack.c index b393e89..3719542 100644 --- a/dlls/dbghelp/stack.c +++ b/dlls/dbghelp/stack.c @@ -492,6 +492,7 @@ BOOL WINAPI StackWalk64(DWORD MachineTyp addr_64to32(&frame64->AddrPC, &frame32.AddrPC); addr_64to32(&frame64->AddrReturn, &frame32.AddrReturn); + addr_64to32(&frame64->AddrFrame, &frame32.AddrFrame); addr_64to32(&frame64->AddrStack, &frame32.AddrStack); addr_64to32(&frame64->AddrBStore, &frame32.AddrBStore); frame32.FuncTableEntry = frame64->FuncTableEntry; /* FIXME */ @@ -513,6 +514,7 @@ BOOL WINAPI StackWalk64(DWORD MachineTyp addr_32to64(&frame32.AddrPC, &frame64->AddrPC); addr_32to64(&frame32.AddrReturn, &frame64->AddrReturn); + addr_32to64(&frame32.AddrFrame, &frame64->AddrFrame); addr_32to64(&frame32.AddrStack, &frame64->AddrStack); addr_32to64(&frame32.AddrBStore, &frame64->AddrBStore); frame64->FuncTableEntry = frame32.FuncTableEntry; /* FIXME */ @@ -523,7 +525,7 @@ BOOL WINAPI StackWalk64(DWORD MachineTyp frame64->Reserved[2] = (ULONG)frame32.Reserved[2]; /* we don't handle KdHelp */ - return FALSE; + return ret; } /******************************************************************

1 0

Detlef Riekenberg : winspool: Document the monitor functions.
by Alexandre Julliard Dec. 6, 2005

Dec. 6, 2005

Module: wine Branch: refs/heads/master Commit: a521947e3dc37e461ecc317bd75be400a405dc60 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=a521947e3dc37e461ecc317… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Tue Dec 6 11:33:52 2005 +0100 winspool: Document the monitor functions. --- dlls/winspool/info.c | 55 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 55 insertions(+), 0 deletions(-) diff --git a/dlls/winspool/info.c b/dlls/winspool/info.c index a54fe32..f1d05c1 100644 --- a/dlls/winspool/info.c +++ b/dlls/winspool/info.c @@ -1119,6 +1119,8 @@ BOOL WINAPI OpenPrinterW(LPWSTR lpPrinte /****************************************************************** * AddMonitorA [WINSPOOL.@] * + * See AddMonitorW. + * */ BOOL WINAPI AddMonitorA(LPSTR pName, DWORD Level, LPBYTE pMonitors) { @@ -1129,6 +1131,24 @@ BOOL WINAPI AddMonitorA(LPSTR pName, DWO /****************************************************************************** * AddMonitorW [WINSPOOL.@] + * + * Install a Printmonitor + * + * PARAMS + * pName [I] Servername or NULL (local Computer) + * Level [I] Structure-Level (Must be 2) + * pMonitors [I] PTR to MONITOR_INFO_2 + * + * RETURNS + * Success: TRUE + * Failure: FALSE + * + * NOTES + * All Files for the Monitor must already be copied to %winsysdir% ("%SystemRoot%\system32") + * + * BUGS + * only a Stub + * */ BOOL WINAPI AddMonitorW(LPWSTR pName, DWORD Level, LPBYTE pMonitors) { @@ -1166,6 +1186,8 @@ DeletePrinterDriverW (LPWSTR pName, LPWS /****************************************************************** * DeleteMonitorA [WINSPOOL.@] * + * See DeleteMonitorW. + * */ BOOL WINAPI DeleteMonitorA (LPSTR pName, LPSTR pEnvironment, LPSTR pMonitorName) @@ -1179,6 +1201,20 @@ DeleteMonitorA (LPSTR pName, LPSTR pEnvi /****************************************************************** * DeleteMonitorW [WINSPOOL.@] * + * Delete a specific Printmonitor from a Printing-Environment + * + * PARAMS + * pName [I] Servername or NULL (local Computer) + * pEnvironment [I] Printing-Environment of the Monitor or NULL (Default) + * pMonitorName [I] Name of the Monitor, that should be deleted + * + * RETURNS + * Success: TRUE + * Failure: FALSE + * + * BUGS + * only a Stub + * */ BOOL WINAPI DeleteMonitorW (LPWSTR pName, LPWSTR pEnvironment, LPWSTR pMonitorName) @@ -4837,6 +4873,8 @@ BOOL WINAPI EnumFormsW( HANDLE hPrinter, /***************************************************************************** * EnumMonitorsA [WINSPOOL.@] * + * See EnumMonitorsW. + * */ BOOL WINAPI EnumMonitorsA(LPSTR pName, DWORD Level, LPBYTE pMonitors, DWORD cbBuf, LPDWORD pcbNeeded, LPDWORD pcReturned) @@ -4850,6 +4888,23 @@ BOOL WINAPI EnumMonitorsA(LPSTR pName, D /***************************************************************************** * EnumMonitorsW [WINSPOOL.@] * + * Enumerate available Monitors + * + * PARAMS + * pName [I] Servername or NULL (local Computer) + * Level [I] Structure-Level (1:Win9x+NT or 2:NT only) + * pMonitors [O] PTR to Buffer that receives the Result + * cbBuf [I] Size of Buffer at pMonitors + * pcbNeeded [O] PTR to DWORD that receives the size in Bytes used / required for pMonitors + * pcReturned [O] PTR to DWORD that receives the number of Monitors in pMonitors + * + * RETURNS + * Success: TRUE + * Failure: FALSE and in bufneeded the Bytes required for buffer, if bufsize is too small + * + * BUGS + * only a Stub + * */ BOOL WINAPI EnumMonitorsW(LPWSTR pName, DWORD Level, LPBYTE pMonitors, DWORD cbBuf, LPDWORD pcbNeeded, LPDWORD pcReturned)

1 0

Vincent Béron : Sort entries in win16.api and win32.api
by Alexandre Julliard Dec. 6, 2005

Dec. 6, 2005

Module: wine Branch: refs/heads/master Commit: e78997a7f9a7e80c551605cb6793d53837b3d033 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=e78997a7f9a7e80c551605c… Author: Vincent Béron <vberon(a)mecano.gme.usherb.ca> Date: Tue Dec 6 11:33:42 2005 +0100 Sort entries in win16.api and win32.api --- tools/winapi/win16.api | 221 +++++++++++++++++----------------- tools/winapi/win32.api | 314 ++++++++++++++++++++++++------------------------ 2 files changed, 267 insertions(+), 268 deletions(-)

1 0

Raphael Junqueira : x11drv: cleanup not longer used data on X11DRV_PDEVICE.
by Alexandre Julliard Dec. 6, 2005

Dec. 6, 2005

Module: wine Branch: refs/heads/master Commit: 7b5571cc8c3de9107f14e7406485dfe222fffcb9 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=7b5571cc8c3de9107f14e74… Author: Raphael Junqueira <fenix(a)club-internet.fr> Date: Tue Dec 6 11:33:12 2005 +0100 x11drv: cleanup not longer used data on X11DRV_PDEVICE. --- dlls/x11drv/init.c | 2 -- dlls/x11drv/x11drv.h | 2 -- 2 files changed, 0 insertions(+), 4 deletions(-) diff --git a/dlls/x11drv/init.c b/dlls/x11drv/init.c index 9524c9b..69cfa02 100644 --- a/dlls/x11drv/init.c +++ b/dlls/x11drv/init.c @@ -164,8 +164,6 @@ BOOL X11DRV_DeleteDC( X11DRV_PDEVICE *ph DeleteObject( physDev->region ); wine_tsx11_lock(); XFreeGC( gdi_display, physDev->gc ); - while (physDev->used_visuals-- > 0) - XFree(physDev->visuals[physDev->used_visuals]); wine_tsx11_unlock(); HeapFree( GetProcessHeap(), 0, physDev ); return TRUE; diff --git a/dlls/x11drv/x11drv.h b/dlls/x11drv/x11drv.h index df6ed32..21b28d5 100644 --- a/dlls/x11drv/x11drv.h +++ b/dlls/x11drv/x11drv.h @@ -140,8 +140,6 @@ typedef struct int depth; /* bit depth of the DC */ int exposures; /* count of graphics exposures operations */ struct dce *dce; /* opaque pointer to DCE */ - XVisualInfo *visuals[MAX_PIXELFORMATS]; - int used_visuals; int current_pf; XRENDERINFO xrender; } X11DRV_PDEVICE;

1 0

Raphael Junqueira : x11drv: Add more useful traces on SetPixelFormat (and no more FIXME).
by Alexandre Julliard Dec. 6, 2005

Dec. 6, 2005

Module: wine Branch: refs/heads/master Commit: 88cda5643d0a1278780843d865ba46ad35bb00a3 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=88cda5643d0a1278780843d… Author: Raphael Junqueira <fenix(a)club-internet.fr> Date: Tue Dec 6 11:33:33 2005 +0100 x11drv: Add more useful traces on SetPixelFormat (and no more FIXME). --- dlls/x11drv/opengl.c | 26 ++++++++++++++++++++++++-- 1 files changed, 24 insertions(+), 2 deletions(-) diff --git a/dlls/x11drv/opengl.c b/dlls/x11drv/opengl.c index 8c49aa0..7660b0e 100644 --- a/dlls/x11drv/opengl.c +++ b/dlls/x11drv/opengl.c @@ -124,6 +124,7 @@ MAKE_FUNCPTR(glXChooseFBConfig) MAKE_FUNCPTR(glXGetFBConfigAttrib) MAKE_FUNCPTR(glXCreateGLXPixmap) MAKE_FUNCPTR(glXDestroyGLXPixmap) +/* MAKE_FUNCPTR(glXQueryDrawable) */ #undef MAKE_FUNCPTR static BOOL has_opengl(void) @@ -491,14 +492,35 @@ BOOL X11DRV_SetPixelFormat(X11DRV_PDEVIC GLXFBConfig cur_cfg; int value; int gl_test = 0; - + + /* + * How to test if hdc current drawable is compatible (visual/FBConfig) ? + * + * in case of root window created HDCs we crash here :( + * + Drawable drawable = get_drawable( physDev->hdc ); + TRACE(" drawable (%p,%p) have :\n", drawable, root_window); + pglXQueryDrawable(gdi_display, drawable, GLX_FBCONFIG_ID, (unsigned int*) &value); + TRACE(" - FBCONFIG_ID as 0x%x\n", tmp); + pglXQueryDrawable(gdi_display, drawable, GLX_VISUAL_ID, (unsigned int*) &value); + TRACE(" - VISUAL_ID as 0x%x\n", tmp); + pglXQueryDrawable(gdi_display, drawable, GLX_WIDTH, (unsigned int*) &value); + TRACE(" - WIDTH as %d\n", tmp); + pglXQueryDrawable(gdi_display, drawable, GLX_HEIGHT, (unsigned int*) &value); + TRACE(" - HEIGHT as %d\n", tmp); + */ cfgs_fmt = pglXGetFBConfigs(gdi_display, DefaultScreen(gdi_display), &nCfgs_fmt); cur_cfg = cfgs_fmt[iPixelFormat - 1]; gl_test = pglXGetFBConfigAttrib(gdi_display, cur_cfg, GLX_FBCONFIG_ID, &value); if (gl_test) { ERR("Failed to retrieve FBCONFIG_ID from GLXFBConfig, expect problems.\n"); } else { - FIXME("have FBCONFIG_ID %x\n", value); + TRACE(" FBConfig have :\n"); + TRACE(" - FBCONFIG_ID 0x%x\n", value); + pglXGetFBConfigAttrib(gdi_display, cur_cfg, GLX_VISUAL_ID, &value); + TRACE(" - VISUAL_ID 0x%x\n", value); + pglXGetFBConfigAttrib(gdi_display, cur_cfg, GLX_DRAWABLE_TYPE, &value); + TRACE(" - DRAWABLE_TYPE 0x%x\n", value); } XFree(cfgs_fmt); }

1 0

Louis Lenders : gdi: Added stub for AddFontMemResourceEx.
by Alexandre Julliard Dec. 6, 2005

Dec. 6, 2005

Module: wine Branch: refs/heads/master Commit: ca1c26b9d3afaa32437b09ed0d95e42c99ec0c2e URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ca1c26b9d3afaa32437b09e… Author: Louis Lenders <xerox_xerox2000(a)yahoo.co.uk> Date: Tue Dec 6 11:32:41 2005 +0100 gdi: Added stub for AddFontMemResourceEx. --- dlls/gdi/font.c | 9 +++++++++ dlls/gdi/gdi32.spec | 2 +- 2 files changed, 10 insertions(+), 1 deletions(-) diff --git a/dlls/gdi/font.c b/dlls/gdi/font.c index 1b10ad9..f94bda1 100644 --- a/dlls/gdi/font.c +++ b/dlls/gdi/font.c @@ -2883,6 +2883,15 @@ BOOL WINAPI RemoveFontResourceW( LPCWSTR } /*********************************************************************** + * AddFontMemResourceEx (GDI32.@) + */ +HANDLE WINAPI AddFontMemResourceEx( PVOID pbFont, DWORD cbFont, PVOID pdv, DWORD *pcFonts) +{ + FIXME("(%p,%08lx,%p,%p): stub\n", pbFont, cbFont, pdv, pcFonts); + return NULL; +} + +/*********************************************************************** * RemoveFontResourceExA (GDI32.@) */ BOOL WINAPI RemoveFontResourceExA( LPCSTR str, DWORD fl, PVOID pdv ) diff --git a/dlls/gdi/gdi32.spec b/dlls/gdi/gdi32.spec index c52c458..c71adc6 100644 --- a/dlls/gdi/gdi32.spec +++ b/dlls/gdi/gdi32.spec @@ -7,7 +7,7 @@ @ stdcall AbortDoc(long) @ stdcall AbortPath(long) -# @ stub AddFontMemResourceEx +@ stdcall AddFontMemResourceEx(ptr long ptr ptr) @ stdcall AddFontResourceA(str) @ stdcall AddFontResourceExA(str long ptr) @ stdcall AddFontResourceExW(wstr long ptr)

1 0

Alexandre Julliard : mlang: Properly declare the interface uuids.
by Alexandre Julliard Dec. 6, 2005

Dec. 6, 2005

Module: wine Branch: refs/heads/master Commit: 9f55a518a20a0604d287a1038b6c95ea992d4d0e URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=9f55a518a20a0604d287a10… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 6 11:32:17 2005 +0100 mlang: Properly declare the interface uuids. --- include/mlang.idl | 15 +++++++-------- 1 files changed, 7 insertions(+), 8 deletions(-) diff --git a/include/mlang.idl b/include/mlang.idl index 397baa5..698d2e1 100644 --- a/include/mlang.idl +++ b/include/mlang.idl @@ -27,6 +27,7 @@ cpp_quote("#endif") [ object, + uuid(359f3443-bd4a-11d0-b188-00aa0038c969), pointer_default(unique) ] interface IMLangCodePages : IUnknown @@ -51,6 +52,7 @@ interface IMLangCodePages : IUnknown [ object, + uuid(359f3441-bd4a-11d0-b188-00aa0038c969), pointer_default(unique) ] interface IMLangFontLink : IMLangCodePages @@ -74,6 +76,7 @@ interface IMLangFontLink : IMLangCodePag [ object, + uuid(ae5f1430-388b-11d2-8380-00c04f8f5da1), pointer_default(unique) ] interface IEnumScript : IUnknown @@ -171,6 +174,7 @@ interface IEnumScript : IUnknown [ object, + uuid(275c23e3-3747-11d0-9fea-00aa003f8646), pointer_default(unique) ] interface IEnumCodePage : IUnknown @@ -270,6 +274,7 @@ interface IMLangConvertCharset : IUnknow [ object, + uuid(3dc39d1d-c030-11d0-b81b-00c04fc9b31f), pointer_default(unique) ] interface IEnumRfc1766 : IUnknown @@ -300,6 +305,7 @@ interface IEnumRfc1766 : IUnknown [ object, + uuid(275c23e1-3747-11d0-9fea-00aa003f8646), pointer_default(unique) ] interface IMultiLanguage : IUnknown @@ -379,6 +385,7 @@ interface IMultiLanguage : IUnknown [ object, + uuid(dccfc164-2b38-11d2-b7ec-00c04f8f5d9a), pointer_default(unique) ] interface IMultiLanguage2 : IUnknown @@ -564,11 +571,3 @@ cpp_quote("STDAPI IsConvertINetStringAva cpp_quote("STDAPI ConvertINetString(LPDWORD, DWORD, DWORD, LPCSTR, LPINT, LPSTR, LPINT);") cpp_quote("STDAPI ConvertINetMultiByteToUnicode(LPDWORD, DWORD, LPCSTR, LPINT, LPWSTR, LPINT);") cpp_quote("STDAPI ConvertINetUnicodeToMultiByte(LPDWORD, DWORD, LPCWSTR, LPINT, LPSTR, LPINT);") - -cpp_quote("DEFINE_GUID(IID_IMLangCodePages, 0x359F3443,0xBD4A,0x11D0,0xB1,0x88,0x00,0xAA,0x00,0x38,0xC9,0x69);") -cpp_quote("DEFINE_GUID(IID_IMLangFontLink, 0x359F3441,0xBD4A,0x11D0,0xB1,0x88,0x00,0xAA,0x00,0x38,0xC9,0x69);") -cpp_quote("DEFINE_GUID(IID_IMultiLanguage2, 0xDCCFC164,0x2B38,0x11d2,0xB7,0xEC,0x00,0xC0,0x4F,0x8F,0x5D,0x9A);") -cpp_quote("DEFINE_GUID(IID_IMultiLanguage, 0x275c23e1,0x3747,0x11d0,0x9f,0xea,0x00,0xaa,0x00,0x3f,0x86,0x46);") -cpp_quote("DEFINE_GUID(IID_IEnumCodePage, 0x275c23e3,0x3747,0x11d0,0x9f,0xea,0x00,0xaa,0x00,0x3f,0x86,0x46);") -cpp_quote("DEFINE_GUID(IID_IEnumScript, 0xae5f1430,0x388b,0x11d2,0x83,0x80,0x00,0xc0,0x4f,0x8f,0x5d,0xa1);") -cpp_quote("DEFINE_GUID(IID_IEnumRfc1766, 0x3dc39d1d,0xc030,0x11d0,0xb8,0x1b,0x00,0xc0,0x4f,0xc9,0xb3,0x1f);")

1 0

Dmitry Timoshkov : mlang: Implement IEnumRfc1766 interface.
by Alexandre Julliard Dec. 6, 2005

Dec. 6, 2005

Module: wine Branch: refs/heads/master Commit: ef35d28999c330d746a95c57b6e5798554b75ba9 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ef35d28999c330d746a95c5… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Tue Dec 6 10:58:57 2005 +0100 mlang: Implement IEnumRfc1766 interface. --- dlls/mlang/mlang.c | 246 ++++++++++++++++++++++++++++++++++++++++++++-- dlls/mlang/tests/mlang.c | 29 +++++ include/mlang.idl | 4 + 3 files changed, 266 insertions(+), 13 deletions(-)

1 0

Robert Reif : winmm: Allow sound card driver to be opened more than once.
by Alexandre Julliard Dec. 6, 2005

Dec. 6, 2005

Module: wine Branch: refs/heads/master Commit: 3020d1a4ca442e9299dd2652912e96f1c2f3845f URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=3020d1a4ca442e9299dd265… Author: Robert Reif <reif(a)earthlink.net> Date: Tue Dec 6 10:58:38 2005 +0100 winmm: Allow sound card driver to be opened more than once. TRACE cleanups. --- dlls/winmm/winejack/jack.c | 84 ++++++++++++++++---------------------------- 1 files changed, 30 insertions(+), 54 deletions(-) diff --git a/dlls/winmm/winejack/jack.c b/dlls/winmm/winejack/jack.c index 363c9fb..d5e12ba 100644 --- a/dlls/winmm/winejack/jack.c +++ b/dlls/winmm/winejack/jack.c @@ -38,9 +38,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(jack); #ifdef HAVE_JACK_JACK_H -static int jack = 0; - -/* set this to zero or one to enable or disable tracing in here */ #ifndef SONAME_LIBJACK #define SONAME_LIBJACK "libjack.so" @@ -53,17 +50,17 @@ void *jackhandle = NULL; */ static LRESULT JACK_drvLoad(void) { - TRACE("JACK_drvLoad()\n"); + TRACE("()\n"); /* dynamically load the jack library if not already loaded */ if(!jackhandle) { jackhandle = wine_dlopen(SONAME_LIBJACK, RTLD_NOW, NULL, 0); - TRACE("JACK_drvLoad: SONAME_LIBJACK == %s\n", SONAME_LIBJACK); - TRACE("JACK_drvLoad: jackhandle == %p\n", jackhandle); + TRACE("SONAME_LIBJACK == %s\n", SONAME_LIBJACK); + TRACE("jackhandle == %p\n", jackhandle); if(!jackhandle) { - FIXME("JACK_drvLoad: error loading the jack library %s, please install this library to use jack\n", SONAME_LIBJACK); + FIXME("error loading the jack library %s, please install this library to use jack\n", SONAME_LIBJACK); jackhandle = (void*)-1; return 0; } @@ -78,11 +75,11 @@ static LRESULT JACK_drvLoad(void) /* unload the jack library on driver free */ static LRESULT JACK_drvFree(void) { - TRACE("JACK_drvFree()\n"); + TRACE("()\n"); if(jackhandle && (jackhandle != (void*)-1)) { - TRACE("JACK_drvFree: calling wine_dlclose() on jackhandle\n"); + TRACE("calling wine_dlclose() on jackhandle\n"); wine_dlclose(jackhandle, NULL, 0); jackhandle = NULL; } @@ -95,23 +92,15 @@ static LRESULT JACK_drvFree(void) */ static LRESULT JACK_drvOpen(LPSTR str) { + TRACE("(%s)\n", str); /* if we were unable to load the jack library then fail the */ /* driver open */ if(!jackhandle) { - FIXME("JACK_drvOpen: unable to open the jack library, returning 0\n"); + FIXME("unable to open the jack library, returning 0\n"); return 0; } - if (jack) - { - FIXME("JACK_drvOpen: jack != 0 (already open), returning 0\n"); - return 0; - } - - /* I know, this is ugly, but who cares... */ - TRACE("JACK_drvOpen: opened jack(set jack = 1), returning 1\n"); - jack = 1; return 1; } @@ -120,15 +109,8 @@ static LRESULT JACK_drvOpen(LPSTR str) */ static LRESULT JACK_drvClose(DWORD_PTR dwDevID) { - if (jack) - { - TRACE("JACK_drvClose: jack is nonzero, setting jack to 0 and returning 1\n"); - jack = 0; - return 1; - } - - TRACE("JACK_drvClose: jack is zero(closed), returning 0\n"); - return 0; + TRACE("(%08lx)\n", dwDevID); + return 1; } #endif /* #ifdef HAVE_JACK_JACK_H */ @@ -139,37 +121,31 @@ static LRESULT JACK_drvClose(DWORD_PTR d LRESULT CALLBACK JACK_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, %s (%08X), %08lX, %08lX)\n", + dwDevID, hDriv, wMsg == DRV_LOAD ? "DRV_LOAD" : + wMsg == DRV_FREE ? "DRV_FREE" : + wMsg == DRV_OPEN ? "DRV_OPEN" : + wMsg == DRV_CLOSE ? "DRV_CLOSE" : + wMsg == DRV_ENABLE ? "DRV_ENABLE" : + wMsg == DRV_DISABLE ? "DRV_DISABLE" : + wMsg == DRV_QUERYCONFIGURE ? "DRV_QUERYCONFIGURE" : + wMsg == DRV_CONFIGURE ? "DRV_CONFIGURE" : + wMsg == DRV_INSTALL ? "DRV_INSTALL" : + wMsg == DRV_REMOVE ? "DRV_REMOVE" : "UNKNOWN", + wMsg, dwParam1, dwParam2); switch(wMsg) { #ifdef HAVE_JACK_JACK_H - case DRV_LOAD: - TRACE("JACK_DriverProc: DRV_LOAD\n"); - return JACK_drvLoad(); - case DRV_FREE: - TRACE("JACK_DriverProc: DRV_FREE\n"); - return JACK_drvFree(); - case DRV_OPEN: - TRACE("JACK_DriverProc: DRV_OPEN\n"); - return JACK_drvOpen((LPSTR)dwParam1); - case DRV_CLOSE: - TRACE("JACK_DriverProc: DRV_CLOSE\n"); - return JACK_drvClose(dwDevID); - case DRV_ENABLE: - TRACE("JACK_DriverProc: DRV_ENABLE\n"); - return 1; - case DRV_DISABLE: - TRACE("JACK_DriverProc: DRV_DISABLE\n"); - return 1; + case DRV_LOAD: return JACK_drvLoad(); + case DRV_FREE: return JACK_drvFree(); + case DRV_OPEN: return JACK_drvOpen((LPSTR)dwParam1); + case DRV_CLOSE: return JACK_drvClose(dwDevID); + case DRV_ENABLE: return 1; + case DRV_DISABLE: return 1; case DRV_QUERYCONFIGURE: return 1; case DRV_CONFIGURE: MessageBoxA(0, "jack audio driver!", "jack driver", MB_OK); return 1; - case DRV_INSTALL: - TRACE("JACK_DriverProc: DRV_INSTALL\n"); - return DRVCNF_RESTART; - case DRV_REMOVE: - TRACE("JACK_DriverProc: DRV_REMOVE\n"); - return DRVCNF_RESTART; + case DRV_INSTALL: return DRVCNF_RESTART; + case DRV_REMOVE: return DRVCNF_RESTART; #endif default: return DefDriverProc(dwDevID, hDriv, wMsg, dwParam1, dwParam2);

1 0

Robert Reif : winmm: Allow sound card drivers to be opened more than once.
by Alexandre Julliard Dec. 6, 2005

Dec. 6, 2005

Module: wine Branch: refs/heads/master Commit: ce4fdfdbcd8c502b17687085605a0d6641ef988c URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ce4fdfdbcd8c502b1768708… Author: Robert Reif <reif(a)earthlink.net> Date: Tue Dec 6 10:58:25 2005 +0100 winmm: Allow sound card drivers to be opened more than once. --- dlls/winmm/winealsa/alsa.c | 13 +------------ dlls/winmm/winearts/arts.c | 12 +----------- dlls/winmm/wineaudioio/audioio.c | 13 +------------ dlls/winmm/wineesd/esound.c | 12 +----------- dlls/winmm/winenas/nas.c | 12 +----------- dlls/winmm/wineoss/oss.c | 13 +------------ 6 files changed, 6 insertions(+), 69 deletions(-) diff --git a/dlls/winmm/winealsa/alsa.c b/dlls/winmm/winealsa/alsa.c index 06dc4bc..781d43c 100644 --- a/dlls/winmm/winealsa/alsa.c +++ b/dlls/winmm/winealsa/alsa.c @@ -32,18 +32,11 @@ #ifdef HAVE_ALSA -static struct WINE_ALSA* alsa = NULL; - /************************************************************************** * ALSA_drvOpen [internal] */ static LRESULT ALSA_drvOpen(LPSTR str) { - if (alsa) - return 0; - - /* I know, this is ugly, but who cares... */ - alsa = (struct WINE_ALSA*)1; return 1; } @@ -52,11 +45,7 @@ static LRESULT ALSA_drvOpen(LPSTR str) */ static LRESULT ALSA_drvClose(DWORD_PTR dwDevID) { - if (alsa) { - alsa = NULL; - return 1; - } - return 0; + return 1; } #endif diff --git a/dlls/winmm/winearts/arts.c b/dlls/winmm/winearts/arts.c index 36506db..7f9d1ac 100644 --- a/dlls/winmm/winearts/arts.c +++ b/dlls/winmm/winearts/arts.c @@ -33,18 +33,12 @@ #include "arts.h" #ifdef HAVE_ARTS -static int arts = 0; /************************************************************************** * ARTS_drvOpen [internal] */ static LRESULT ARTS_drvOpen(LPSTR str) { - if (arts) - return 0; - - /* I know, this is ugly, but who cares... */ - arts = 1; return 1; } @@ -53,11 +47,7 @@ static LRESULT ARTS_drvOpen(LPSTR str) */ static LRESULT ARTS_drvClose(DWORD_PTR dwDevID) { - if (arts) { - arts = 0; - return 1; - } - return 0; + return 1; } #endif /* #ifdef HAVE_ARTS */ diff --git a/dlls/winmm/wineaudioio/audioio.c b/dlls/winmm/wineaudioio/audioio.c index f946710..aa43c69 100644 --- a/dlls/winmm/wineaudioio/audioio.c +++ b/dlls/winmm/wineaudioio/audioio.c @@ -32,8 +32,6 @@ #ifdef HAVE_LIBAUDIOIO -static struct WINE_LIBAUDIOIO* audioio = NULL; - extern LONG LIBAUDIOIO_WaveInit(void); /************************************************************************** @@ -41,11 +39,6 @@ extern LONG LIBAUDIOIO_WaveInit(void); */ static LRESULT LIBAUDIOIO_drvOpen(LPSTR str) { - if (audioio) - return 0; - - /* I know, this is ugly, but who cares... */ - audioio = (struct WINE_LIBAUDIOIO*)1; return 1; } @@ -54,11 +47,7 @@ static LRESULT LIBAUDIOIO_drvOpen(LPSTR */ static LRESULT LIBAUDIOIO_drvClose(DWORD_PTR dwDevID) { - if (audioio) { - audioio = NULL; - return 1; - } - return 0; + return 1; } #endif diff --git a/dlls/winmm/wineesd/esound.c b/dlls/winmm/wineesd/esound.c index 702dbe5..091a8e4 100644 --- a/dlls/winmm/wineesd/esound.c +++ b/dlls/winmm/wineesd/esound.c @@ -34,18 +34,12 @@ #include "esound.h" #ifdef HAVE_ESD -static int esd = 0; /************************************************************************** * ESD_drvOpen [internal] */ static LRESULT ESD_drvOpen(LPSTR str) { - if (esd) - return 0; - - /* I know, this is ugly, but who cares... */ - esd = 1; return 1; } @@ -54,11 +48,7 @@ static LRESULT ESD_drvOpen(LPSTR str) */ static LRESULT ESD_drvClose(DWORD_PTR dwDevID) { - if (esd) { - esd = 0; - return 1; - } - return 0; + return 1; } #endif /* #ifdef HAVE_ESD */ diff --git a/dlls/winmm/winenas/nas.c b/dlls/winmm/winenas/nas.c index 9b7b026..02f3474 100644 --- a/dlls/winmm/winenas/nas.c +++ b/dlls/winmm/winenas/nas.c @@ -36,18 +36,12 @@ #include "nas.h" #ifdef HAVE_NAS -static int nas = 0; /************************************************************************** * NAS_drvOpen [internal] */ static LRESULT NAS_drvOpen(LPSTR str) { - if (nas) - return 0; - - /* I know, this is ugly, but who cares... */ - nas = 1; return 1; } @@ -56,11 +50,7 @@ static LRESULT NAS_drvOpen(LPSTR str) */ static LRESULT NAS_drvClose(DWORD_PTR dwDevID) { - if (nas) { - nas = 0; - return 1; - } - return 0; + return 1; } #endif /* #ifdef HAVE_NAS */ diff --git a/dlls/winmm/wineoss/oss.c b/dlls/winmm/wineoss/oss.c index d1437b5..8526f42 100644 --- a/dlls/winmm/wineoss/oss.c +++ b/dlls/winmm/wineoss/oss.c @@ -32,18 +32,11 @@ #ifdef HAVE_OSS -static struct WINE_OSS* oss = NULL; - /************************************************************************** * OSS_drvOpen [internal] */ static LRESULT OSS_drvOpen(LPSTR str) { - if (oss) - return 0; - - /* I know, this is ugly, but who cares... */ - oss = (struct WINE_OSS*)1; return 1; } @@ -52,11 +45,7 @@ static LRESULT OSS_drvOpen(LPSTR str) */ static LRESULT OSS_drvClose(DWORD_PTR dwDevID) { - if (oss) { - oss = NULL; - return 1; - } - return 0; + return 1; } #endif

1 0

Vincent Béron : Update win32.api to current git.
by Alexandre Julliard Dec. 6, 2005

Dec. 6, 2005

Module: wine Branch: refs/heads/master Commit: 1f9fd44c3abb240e76bdcc6c6f86352085551aa3 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=1f9fd44c3abb240e76bdcc6… Author: Vincent Béron <vberon(a)mecano.gme.usherb.ca> Date: Tue Dec 6 10:58:07 2005 +0100 Update win32.api to current git. --- tools/winapi/win32.api | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-) diff --git a/tools/winapi/win32.api b/tools/winapi/win32.api index 9f81c13..f17edf1 100644 --- a/tools/winapi/win32.api +++ b/tools/winapi/win32.api @@ -3460,10 +3460,6 @@ IUnknown * IUnknown ** void * -%void - -void - %%riched32.dll %long

1 0

Robert Shearman : OLE: ITypeInfo_Invoke parameter naming change.
by Alexandre Julliard Dec. 6, 2005

Dec. 6, 2005

Module: wine Branch: refs/heads/master Commit: 3dd7ba394c8f4b9540ddf735c10ca36aa77619bb URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=3dd7ba394c8f4b9540ddf73… Author: Robert Shearman <rob(a)codeweavers.com> Date: Tue Dec 6 10:57:45 2005 +0100 OLE: ITypeInfo_Invoke parameter naming change. Rename the dwFlags parameter of ITypeInfo_Invoke since it is not a DWORD, but an unsigned short. --- dlls/oleaut32/typelib.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 4d8a736..5c1d6c8 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -5208,7 +5208,7 @@ static HRESULT WINAPI ITypeInfo_fnInvoke ITypeInfo2 *iface, VOID *pIUnk, MEMBERID memid, - UINT16 dwFlags, + UINT16 wFlags, DISPPARAMS *pDispParams, VARIANT *pVarResult, EXCEPINFO *pExcepInfo, @@ -5221,15 +5221,15 @@ static HRESULT WINAPI ITypeInfo_fnInvoke HRESULT hres; const TLBFuncDesc *pFuncInfo; - TRACE("(%p)(%p,id=%ld,flags=0x%08x,%p,%p,%p,%p) partial stub!\n", - This,pIUnk,memid,dwFlags,pDispParams,pVarResult,pExcepInfo,pArgErr + TRACE("(%p)(%p,id=%ld,flags=0x%08x,%p,%p,%p,%p)\n", + This,pIUnk,memid,wFlags,pDispParams,pVarResult,pExcepInfo,pArgErr ); dump_DispParms(pDispParams); /* we do this instead of using GetFuncDesc since it will return a fake * FUNCDESC for dispinterfaces and we want the real function description */ for (pFuncInfo = This->funclist; pFuncInfo; pFuncInfo=pFuncInfo->next) - if (memid == pFuncInfo->funcdesc.memid && (dwFlags & pFuncInfo->funcdesc.invkind)) + if (memid == pFuncInfo->funcdesc.memid && (wFlags & pFuncInfo->funcdesc.invkind)) break; if (pFuncInfo) { @@ -5395,7 +5395,7 @@ func_fail: if (SUCCEEDED(hres)) { FIXME("Calling Invoke in IDispatch iface. untested!\n"); hres = IDispatch_Invoke( - disp,memid,&IID_NULL,LOCALE_USER_DEFAULT,dwFlags,pDispParams, + disp,memid,&IID_NULL,LOCALE_USER_DEFAULT,wFlags,pDispParams, pVarResult,pExcepInfo,pArgErr ); if (FAILED(hres)) @@ -5435,14 +5435,14 @@ func_fail: ITypeInfo *pTInfo; hres = ITypeInfo_GetRefTypeInfo(iface, ref_type, &pTInfo); if(SUCCEEDED(hres)){ - hres = ITypeInfo_Invoke(pTInfo,pIUnk,memid,dwFlags,pDispParams,pVarResult,pExcepInfo,pArgErr); + hres = ITypeInfo_Invoke(pTInfo,pIUnk,memid,wFlags,pDispParams,pVarResult,pExcepInfo,pArgErr); ITypeInfo_Release(pTInfo); return hres; } WARN("Could not search inherited interface!\n"); } } - ERR("did not find member id %08lx, flags %d!\n", memid, dwFlags); + ERR("did not find member id %ld, flags 0x%x!\n", memid, wFlags); return DISP_E_MEMBERNOTFOUND; }

1 0

Robert Shearman : OLE: Fix a typo where brackets were missing.
by Alexandre Julliard Dec. 6, 2005

Dec. 6, 2005

Module: wine Branch: refs/heads/master Commit: ef8ae2d763bbaadc3d4a43471a5e12e5943bc56a URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ef8ae2d763bbaadc3d4a434… Author: Robert Shearman <rob(a)codeweavers.com> Date: Tue Dec 6 10:57:58 2005 +0100 OLE: Fix a typo where brackets were missing. --- dlls/ole32/rpc.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ole32/rpc.c b/dlls/ole32/rpc.c index b50c594..d87b478 100644 --- a/dlls/ole32/rpc.c +++ b/dlls/ole32/rpc.c @@ -624,7 +624,7 @@ static HRESULT create_server(REFCLSID rc HKEY key; HRESULT hres; WCHAR command[MAX_PATH+sizeof(embedding)/sizeof(WCHAR)]; - DWORD size = MAX_PATH+1 * sizeof(WCHAR); + DWORD size = (MAX_PATH+1) * sizeof(WCHAR); STARTUPINFOW sinfo; PROCESS_INFORMATION pinfo;

1 0

Jacek Caban : shdocvw: Added get_Document implementation.
by Alexandre Julliard Dec. 6, 2005

Dec. 6, 2005

Module: wine Branch: refs/heads/master Commit: 5ba7b1778c1b42a5ea7f5c250d6f530117971e41 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=5ba7b1778c1b42a5ea7f5c2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Dec 6 10:57:29 2005 +0100 shdocvw: Added get_Document implementation. --- dlls/shdocvw/webbrowser.c | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/shdocvw/webbrowser.c b/dlls/shdocvw/webbrowser.c index 9907e5b..8110950 100644 --- a/dlls/shdocvw/webbrowser.c +++ b/dlls/shdocvw/webbrowser.c @@ -260,8 +260,14 @@ static HRESULT WINAPI WebBrowser_get_Con static HRESULT WINAPI WebBrowser_get_Document(IWebBrowser2 *iface, IDispatch **ppDisp) { WebBrowser *This = WEBBROWSER_THIS(iface); - FIXME("(%p)->(%p)\n", This, ppDisp); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, ppDisp); + + *ppDisp = NULL; + if(This->document) + IUnknown_QueryInterface(This->document, &IID_IDispatch, (void**)ppDisp); + + return S_OK; } static HRESULT WINAPI WebBrowser_get_TopLevelContainer(IWebBrowser2 *iface, VARIANT_BOOL *pBool)

1 0

Eric Pouech : winedbg: Fixed broken code about type management for binary operator.
by Alexandre Julliard Dec. 6, 2005

Dec. 6, 2005

Module: wine Branch: refs/heads/master Commit: 4d7f9f7c65343179709cfd201f0250d2cb236d36 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=4d7f9f7c65343179709cfd2… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Tue Dec 6 10:57:17 2005 +0100 winedbg: Fixed broken code about type management for binary operator. --- programs/winedbg/expr.c | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/programs/winedbg/expr.c b/programs/winedbg/expr.c index 5eb4d49..5815298 100644 --- a/programs/winedbg/expr.c +++ b/programs/winedbg/expr.c @@ -482,16 +482,18 @@ struct dbg_lvalue expr_eval(struct expr* rtn.type.id = dbg_itype_signed_int; rtn.type.module = 0; rtn.addr.Offset = (unsigned int)&exp->un.binop.result; + type1 = exp1.type; + type2 = exp2.type; switch (exp->un.binop.binop_type) { case EXP_OP_ADD: if (!types_get_info(&exp1.type, TI_GET_SYMTAG, &tag) || tag != SymTagPointerType || - !types_get_info(&exp1.type, TI_GET_TYPE, &type1)) + !types_get_info(&exp1.type, TI_GET_TYPE, &type1.id)) type1.id = dbg_itype_none; if (!types_get_info(&exp2.type, TI_GET_SYMTAG, &tag) || tag != SymTagPointerType || - !types_get_info(&exp2.type, TI_GET_TYPE, &type2)) + !types_get_info(&exp2.type, TI_GET_TYPE, &type2.id)) type2.id = dbg_itype_none; scale1 = 1; scale2 = 1; @@ -513,11 +515,11 @@ struct dbg_lvalue expr_eval(struct expr* case EXP_OP_SUB: if (!types_get_info(&exp1.type, TI_GET_SYMTAG, &tag) || tag != SymTagPointerType || - !types_get_info(&exp1.type, TI_GET_TYPE, &type1)) + !types_get_info(&exp1.type, TI_GET_TYPE, &type1.id)) type1.id = dbg_itype_none; if (!types_get_info(&exp2.type, TI_GET_SYMTAG, &tag) || tag != SymTagPointerType || - !types_get_info(&exp2.type, TI_GET_TYPE, &type2)) + !types_get_info(&exp2.type, TI_GET_TYPE, &type2.id)) type2.id = dbg_itype_none; scale1 = 1; scale2 = 1;

1 0

Detlef Riekenberg : winspool: Add documentation for the port functions.
by Alexandre Julliard Dec. 6, 2005

Dec. 6, 2005

Module: wine Branch: refs/heads/master Commit: 1395d14507f18aa2eb73653a2b5c358d5023eea3 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=1395d14507f18aa2eb73653… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Tue Dec 6 10:57:01 2005 +0100 winspool: Add documentation for the port functions. --- dlls/winspool/info.c | 96 +++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 94 insertions(+), 2 deletions(-) diff --git a/dlls/winspool/info.c b/dlls/winspool/info.c index 3bdd01d..a54fe32 100644 --- a/dlls/winspool/info.c +++ b/dlls/winspool/info.c @@ -1192,6 +1192,8 @@ DeleteMonitorW (LPWSTR pName, LPWSTR pEn /****************************************************************** * DeletePortA [WINSPOOL.@] * + * See DeletePortW. + * */ BOOL WINAPI DeletePortA (LPSTR pName, HWND hWnd, LPSTR pPortName) @@ -1205,6 +1207,20 @@ DeletePortA (LPSTR pName, HWND hWnd, LPS /****************************************************************** * DeletePortW [WINSPOOL.@] * + * Delete a specific Port + * + * PARAMS + * pName [I] Servername or NULL (local Computer) + * hWnd [I] Handle to parent Window for the Dialog-Box + * pPortName [I] Name of the Port, that should be deleted + * + * RETURNS + * Success: TRUE + * Failure: FALSE + * + * BUGS + * only a Stub + * */ BOOL WINAPI DeletePortW (LPWSTR pName, HWND hWnd, LPWSTR pPortName) @@ -3733,6 +3749,12 @@ static DWORD WINSPOOL_CountSerialPorts(v /****************************************************************************** * EnumPortsA (WINSPOOL.@) + * + * See EnumPortsW. + * + * BUGS + * ANSI-Version did not call the UNICODE-Version + * */ BOOL WINAPI EnumPortsA(LPSTR name,DWORD level,LPBYTE buffer,DWORD bufsize, LPDWORD bufneeded,LPDWORD bufreturned) @@ -3850,6 +3872,24 @@ BOOL WINAPI EnumPortsA(LPSTR name,DWORD /****************************************************************************** * EnumPortsW (WINSPOOL.@) + * + * Enumerate available Ports + * + * PARAMS + * name [I] Servername or NULL (local Computer) + * level [I] Structure-Level (1 or 2) + * buffer [O] PTR to Buffer that receives the Result + * bufsize [I] Size of Buffer at buffer + * bufneeded [O] PTR to DWORD that receives the size in Bytes used / required for buffer + * bufreturned [O] PTR to DWORD that receives the number of Ports in buffer + * + * RETURNS + * Success: TRUE + * Failure: FALSE and in bufneeded the Bytes required for buffer, if bufsize is too small + * + * BUGS + * UNICODE-Version is a stub + * */ BOOL WINAPI EnumPortsW(LPWSTR name,DWORD level,LPBYTE buffer,DWORD bufsize, LPDWORD bufneeded,LPDWORD bufreturned) @@ -4511,6 +4551,9 @@ BOOL WINAPI AbortPrinter( HANDLE hPrinte /****************************************************************************** * AddPortA (WINSPOOL.@) + * + * See AddPortW. + * */ BOOL WINAPI AddPortA(LPSTR pName, HWND hWnd, LPSTR pMonitorName) { @@ -4520,6 +4563,21 @@ BOOL WINAPI AddPortA(LPSTR pName, HWND h /****************************************************************************** * AddPortW (WINSPOOL.@) + * + * Add a Port for a specific Monitor + * + * PARAMS + * pName [I] Servername or NULL (local Computer) + * hWnd [I] Handle to parent Window for the Dialog-Box + * pMonitorName [I] Name of the Monitor that manage the Port + * + * RETURNS + * Success: TRUE + * Failure: FALSE + * + * BUGS + * only a Stub + * */ BOOL WINAPI AddPortW(LPWSTR pName, HWND hWnd, LPWSTR pMonitorName) { @@ -4530,7 +4588,8 @@ BOOL WINAPI AddPortW(LPWSTR pName, HWND /****************************************************************************** * AddPortExA (WINSPOOL.@) * - * Adds a print spooler port without presenting a user interface. + * See AddPortExW. + * */ BOOL WINAPI AddPortExA(HANDLE hMonitor, LPSTR pName, DWORD Level, LPBYTE lpBuffer, LPSTR lpMonitorName) { @@ -4542,7 +4601,22 @@ BOOL WINAPI AddPortExA(HANDLE hMonitor, /****************************************************************************** * AddPortExW (WINSPOOL.@) * - * See AddPortExW. + * Add a Port for a specific Monitor, without presenting a user interface + * + * PARAMS + * hMonitor [I] Handle from InitializePrintMonitor2() + * pName [I] Servername or NULL (local Computer) + * Level [I] Structure-Level (1 or 2) for lpBuffer + * lpBuffer [I] PTR to: PORT_INFO_1 or PORT_INFO_2 + * lpMonitorName [I] Name of the Monitor that manage the Port or NULL + * + * RETURNS + * Success: TRUE + * Failure: FALSE + * + * BUGS + * only a Stub + * */ BOOL WINAPI AddPortExW(HANDLE hMonitor, LPWSTR pName, DWORD Level, LPBYTE lpBuffer, LPWSTR lpMonitorName) { @@ -4595,6 +4669,9 @@ BOOL WINAPI AddPrinterDriverExA( LPSTR p /****************************************************************************** * ConfigurePortA (WINSPOOL.@) + * + * See ConfigurePortW. + * */ BOOL WINAPI ConfigurePortA(LPSTR pName, HWND hWnd, LPSTR pPortName) { @@ -4604,6 +4681,21 @@ BOOL WINAPI ConfigurePortA(LPSTR pName, /****************************************************************************** * ConfigurePortW (WINSPOOL.@) + * + * Display the Configuration-Dialog for a specific Port + * + * PARAMS + * pName [I] Servername or NULL (local Computer) + * hWnd [I] Handle to parent Window for the Dialog-Box + * pPortName [I] Name of the Port, that should be configured + * + * RETURNS + * Success: TRUE + * Failure: FALSE + * + * BUGS + * only a Stub + * */ BOOL WINAPI ConfigurePortW(LPWSTR pName, HWND hWnd, LPWSTR pPortName) {

1 0

Alexandre Julliard : kernel: Added a basic test for exception handling in threads.
by Alexandre Julliard Dec. 5, 2005

Dec. 5, 2005

Module: wine Branch: refs/heads/master Commit: 45693738e69d056bd9102b407c9388599450d8ea URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=45693738e69d056bd9102b4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 5 20:43:33 2005 +0100 kernel: Added a basic test for exception handling in threads. --- dlls/kernel/tests/thread.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/dlls/kernel/tests/thread.c b/dlls/kernel/tests/thread.c index 200cdf6..444217d 100644 --- a/dlls/kernel/tests/thread.c +++ b/dlls/kernel/tests/thread.c @@ -119,6 +119,10 @@ static DWORD WINAPI threadFunc1(LPVOID p for(i=0;i<NUM_THREADS;i++) { while(tstruct->threadmem[i]==0) ; } + + /* lstrlenA contains an exception handler so this makes sure exceptions work in threads */ + ok( lstrlenA( (char *)0xdeadbeef ) == 0, "lstrlenA: unexpected success\n" ); + /* Check that noone changed our tls memory */ ok((int)TlsGetValue(tlsIndex)-1==tstruct->threadnum, "TlsGetValue failed\n"); @@ -180,6 +184,9 @@ static VOID test_CreateThread_basic(void DWORD i,j; DWORD GLE, ret; + /* lstrlenA contains an exception handler so this makes sure exceptions work in the main thread */ + ok( lstrlenA( (char *)0xdeadbeef ) == 0, "lstrlenA: unexpected success\n" ); + /* Retrieve current Thread ID for later comparisons */ curthreadId=GetCurrentThreadId(); /* Allocate some local storage */

1 0

Alexandre Julliard : user: Fixed copy/paste bug in CURSORICON_GetResIconEntry.
by Alexandre Julliard Dec. 5, 2005

Dec. 5, 2005

Module: wine Branch: refs/heads/master Commit: ef4dfd4b7ab43b1587778fb8f19ee1454149e447 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ef4dfd4b7ab43b1587778fb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 5 20:41:24 2005 +0100 user: Fixed copy/paste bug in CURSORICON_GetResIconEntry. --- dlls/user/cursoricon.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/user/cursoricon.c b/dlls/user/cursoricon.c index c47a1ee..2e64d4a 100644 --- a/dlls/user/cursoricon.c +++ b/dlls/user/cursoricon.c @@ -540,7 +540,7 @@ static BOOL CURSORICON_GetResIconEntry( return FALSE; icon = &resdir->idEntries[n].ResInfo.icon; *width = icon->bWidth; - *height = icon->bWidth; + *height = icon->bHeight; *bits = resdir->idEntries[n].wBitCount; return TRUE; }

1 0

Rein Klazes : ddraw: Catch access violations when calling DirectDrawEnumerateProc.
by Alexandre Julliard Dec. 5, 2005

Dec. 5, 2005

Module: wine Branch: refs/heads/master Commit: 72caaad6cc3a2eaebf884d751368f9768924c00f URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=72caaad6cc3a2eaebf884d7… Author: Rein Klazes <wijn(a)wanadoo.nl> Date: Mon Dec 5 20:40:42 2005 +0100 ddraw: Catch access violations when calling DirectDrawEnumerateProc. --- dlls/ddraw/Makefile.in | 2 +- dlls/ddraw/main.c | 32 ++++++++++++++++++++++++++------ 2 files changed, 27 insertions(+), 7 deletions(-) diff --git a/dlls/ddraw/Makefile.in b/dlls/ddraw/Makefile.in index 361d0d0..88a7ff4 100644 --- a/dlls/ddraw/Makefile.in +++ b/dlls/ddraw/Makefile.in @@ -4,7 +4,7 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = ddraw.dll IMPORTLIB = libddraw.$(IMPLIBEXT) -IMPORTS = ole32 user32 gdi32 advapi32 kernel32 +IMPORTS = ole32 user32 gdi32 advapi32 kernel32 ntdll EXTRAINCL = @X_CFLAGS@ EXTRALIBS = -ldxguid -luuid @X_LIBS@ @X_PRE_LIBS@ @XLIB@ @X_EXTRA_LIBS@ diff --git a/dlls/ddraw/main.c b/dlls/ddraw/main.c index e2912b6..25c3e05 100644 --- a/dlls/ddraw/main.c +++ b/dlls/ddraw/main.c @@ -39,6 +39,8 @@ #include "winnls.h" #include "winerror.h" #include "wingdi.h" +#include "wine/exception.h" +#include "excpt.h" #include "ddraw.h" #include "d3d.h" @@ -62,6 +64,14 @@ void (*wine_tsx11_unlock_ptr)(void) = NU WINE_DEFAULT_DEBUG_CHANNEL(ddraw); +/* filter for page-fault exceptions */ +static WINE_EXCEPTION_FILTER(page_fault) +{ + if (GetExceptionCode() == EXCEPTION_ACCESS_VIOLATION) + return EXCEPTION_EXECUTE_HANDLER; + return EXCEPTION_CONTINUE_SEARCH; +} + /**********************************************************************/ typedef struct { @@ -180,6 +190,7 @@ HRESULT WINAPI DirectDrawEnumerateExA( LPDDENUMCALLBACKEXA lpCallback, LPVOID lpContext, DWORD dwFlags) { int i; + BOOL stop = FALSE; TRACE("(%p,%p, %08lx)\n", lpCallback, lpContext, dwFlags); if (TRACE_ON(ddraw)) { @@ -201,12 +212,21 @@ HRESULT WINAPI DirectDrawEnumerateExA( /* We have to pass NULL from the primary display device. * RoadRage chapter 6's enumeration routine expects it. */ - if (!lpCallback((DDRAW_default_driver == i) ? NULL - :(LPGUID)&DDRAW_drivers[i]->info->guidDeviceIdentifier, - (LPSTR)DDRAW_drivers[i]->info->szDescription, - (LPSTR)DDRAW_drivers[i]->info->szDriver, - lpContext, 0)) - return DD_OK; + __TRY + { + if (!lpCallback((DDRAW_default_driver == i) ? NULL + :(LPGUID)&DDRAW_drivers[i]->info->guidDeviceIdentifier, + (LPSTR)DDRAW_drivers[i]->info->szDescription, + (LPSTR)DDRAW_drivers[i]->info->szDriver, + lpContext, 0)) + stop = TRUE; + } + __EXCEPT(page_fault) + { + return E_INVALIDARG; + } + __ENDTRY + if (stop) return DD_OK; } /* Unsupported flags */

1 0

Thomas Weidenmueller : devenum: Don't leak key handle creating a category registry key.
by Alexandre Julliard Dec. 5, 2005

Dec. 5, 2005

Module: wine Branch: refs/heads/master Commit: ae4eafbeccbf03a2659cf9d9ccfab008340d2721 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ae4eafbeccbf03a2659cf9d… Author: Thomas Weidenmueller <wine-patches(a)reactsoft.com> Date: Mon Dec 5 20:39:47 2005 +0100 devenum: Don't leak key handle creating a category registry key. --- dlls/devenum/createdevenum.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/devenum/createdevenum.c b/dlls/devenum/createdevenum.c index 15948cf..416c238 100644 --- a/dlls/devenum/createdevenum.c +++ b/dlls/devenum/createdevenum.c @@ -202,8 +202,10 @@ static HRESULT DEVENUM_CreateAMCategoryK res = E_INVALIDARG; if (SUCCEEDED(res)) - res = HRESULT_FROM_WIN32( - RegCreateKeyW(HKEY_CURRENT_USER, wszRegKey, &hkeyDummy)); + { + LONG lRes = RegCreateKeyW(HKEY_CURRENT_USER, wszRegKey, &hkeyDummy); + res = HRESULT_FROM_WIN32(lRes); + } if (hkeyDummy) RegCloseKey(hkeyDummy);

1 0