December 2005 - Wine-Commits

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. -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. -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.</quote> Oliver Stieber wrote back: <quote who="Oliver Stieber"> -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. @@ -408,11 +408,11 @@ Wine and try to fix it.</li></ol> > <topic>Web/HTML</topic> 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: +bazillion patches last week.) That led David Hagood to ask this week: <quote who="David Hagood"> 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