wine-commits August 2007

wine-commits@winehq.org

3 participants
1085 discussions

Tijl Coosemans : loader: Introduce FreeBSD loader.
by Alexandre Julliard 27 Aug '07

27 Aug '07

Module: wine Branch: master Commit: 9f5c69c96d122c16fc0a6c131bc3b40605576a86 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f5c69c96d122c16fc0a6c131… Author: Tijl Coosemans <tijl(a)ulyssis.org> Date: Fri Aug 24 15:46:36 2007 +0200 loader: Introduce FreeBSD loader. --- .gitignore | 2 + configure | 5 ++++ configure.ac | 3 ++ loader/Makefile.in | 9 +++++++ loader/freebsd.c | 61 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 80 insertions(+), 0 deletions(-) diff --git a/.gitignore b/.gitignore index be3dbc0..95e06ac 100644 --- a/.gitignore +++ b/.gitignore @@ -764,6 +764,8 @@ libs/wpp/ppl.yy.c libs/wpp/ppy.tab.c libs/wpp/ppy.tab.h loader/wine +loader/wine-freebsd +loader/wine-freebsd-installed loader/wine-glibc loader/wine-glibc-installed loader/wine-kthread diff --git a/configure b/configure index ac5c092..a94ced7 100755 --- a/configure +++ b/configure @@ -15623,6 +15623,11 @@ MAIN_BINARY="wine-pthread" EXTRA_BINARIES="wine-kthread wine-pthread wine-preloader" ;; + freebsd*) + MAIN_BINARY="wine-freebsd" + + EXTRA_BINARIES="wine-pthread" + ;; esac ;; esac diff --git a/configure.ac b/configure.ac index 64be416..16a6370 100644 --- a/configure.ac +++ b/configure.ac @@ -1224,6 +1224,9 @@ case $host_cpu in linux* | k*bsd*-gnu) AC_SUBST(MAIN_BINARY,"wine-glibc") AC_SUBST(EXTRA_BINARIES,"wine-kthread wine-pthread wine-preloader") ;; + freebsd*) + AC_SUBST(MAIN_BINARY,"wine-freebsd") + AC_SUBST(EXTRA_BINARIES,"wine-pthread") ;; esac ;; esac diff --git a/loader/Makefile.in b/loader/Makefile.in index f94e08f..ef60a56 100644 --- a/loader/Makefile.in +++ b/loader/Makefile.in @@ -5,6 +5,7 @@ VPATH = @srcdir@ MODULE = wine C_SRCS = \ + freebsd.c \ glibc.c \ kthread.c \ main.c \ @@ -20,6 +21,8 @@ WINE_BINARIES = $(MAIN_BINARY) $(EXTRA_BINARIES) PROGRAMS = \ wine \ + wine-freebsd \ + wine-freebsd-installed \ wine-glibc \ wine-glibc-installed \ wine-kthread \ @@ -40,6 +43,12 @@ all: $(WINE_BINARIES) $(WINE_BINARIES:%=%-installed) $(MODULE) $(MANPAGES) LIBPTHREAD = @LIBPTHREAD@ LDEXECFLAGS = @LDEXECFLAGS@ +wine-freebsd: freebsd.o Makefile.in + $(CC) -o $@ freebsd.o $(LIBWINE) $(LIBPORT) $(LIBPTHREAD) $(EXTRALIBS) $(LDFLAGS) $(LDRPATH_LOCAL) + +wine-freebsd-installed: freebsd.o Makefile.in + $(CC) -o $@ freebsd.o $(LIBWINE) $(LIBPORT) $(LIBPTHREAD) $(EXTRALIBS) $(LDFLAGS) $(LDRPATH_INSTALL) + wine-glibc: glibc.o Makefile.in $(CC) -o $@ glibc.o $(LIBWINE) $(LIBPORT) $(LIBPTHREAD) $(EXTRALIBS) $(LDFLAGS) $(LDRPATH_LOCAL) diff --git a/loader/freebsd.c b/loader/freebsd.c new file mode 100644 index 0000000..0d0eb57 --- /dev/null +++ b/loader/freebsd.c @@ -0,0 +1,61 @@ +/* + * FreeBSD loader + * + * Copyright 2007 Alexandre Julliard + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "config.h" +#include "wine/port.h" + +#include <stdio.h> +#include <stdlib.h> +#include <string.h> +#ifdef HAVE_SYS_RESOURCE_H +# include <sys/resource.h> +#endif + +#include "wine/library.h" + +/* build a new full path from the specified path and name */ +static const char *build_new_path( const char *path, const char *name ) +{ + const char *p; + char *ret; + + if (!(p = strrchr( path, '/' ))) return name; + p++; + ret = malloc( (p - path) + strlen(name) + 1 ); + memcpy( ret, path, p - path ); + strcpy( ret + (p - path), name ); + return ret; +} + +/********************************************************************** + * main + */ +int main( int argc, char *argv[] ) +{ + const char *new_argv0 = build_new_path( argv[0], "wine-pthread" ); + struct rlimit rl; + rl.rlim_cur = 0x02000000; + rl.rlim_max = 0x02000000; + setrlimit( RLIMIT_DATA, &rl ); + wine_init_argv0_path( new_argv0 ); + wine_exec_wine_binary( NULL, argv, NULL ); + fprintf( stderr, "wine: could not exec %s\n", new_argv0 ); + exit(1); +}

1 0

Maarten Lankhorst : winhttp: Add stub for WinHttpCheckPlatform.
by Alexandre Julliard 27 Aug '07

27 Aug '07

Module: wine Branch: master Commit: 2c5767e2c621f28368e465d7d1be8bf6ef15deb8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c5767e2c621f28368e465d7d… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Sun Aug 26 20:38:18 2007 +0200 winhttp: Add stub for WinHttpCheckPlatform. --- dlls/winhttp/main.c | 7 +++++++ dlls/winhttp/winhttp.spec | 2 +- 2 files changed, 8 insertions(+), 1 deletions(-) diff --git a/dlls/winhttp/main.c b/dlls/winhttp/main.c index e90352d..3386463 100644 --- a/dlls/winhttp/main.c +++ b/dlls/winhttp/main.c @@ -82,3 +82,10 @@ HRESULT WINAPI DllUnregisterServer(void) FIXME("()\n"); return S_OK; } + +BOOL WINAPI WinHttpCheckPlatform(void) +{ + FIXME("stub\n"); + SetLastError(ERROR_NOT_SUPPORTED); + return FALSE; +} diff --git a/dlls/winhttp/winhttp.spec b/dlls/winhttp/winhttp.spec index 73eae07..ac3f7dc 100644 --- a/dlls/winhttp/winhttp.spec +++ b/dlls/winhttp/winhttp.spec @@ -3,7 +3,7 @@ @ stdcall -private DllRegisterServer() @ stdcall -private DllUnregisterServer() @ stub WinHttpAddRequestHeaders -@ stub WinHttpCheckPlatform +@ stdcall WinHttpCheckPlatform() @ stub WinHttpCloseHandle @ stub WinHttpConnect @ stub WinHttpCrackUrl

1 0

Dan Kegel : shdocvw: iexplore needs to handle the -nohome option.
by Alexandre Julliard 27 Aug '07

27 Aug '07

Module: wine Branch: master Commit: 9e0ece41a580f511e6e416cb2485eedeac9736c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e0ece41a580f511e6e416cb2… Author: Dan Kegel <dank(a)kegel.com> Date: Sat Aug 25 08:43:24 2007 -0700 shdocvw: iexplore needs to handle the -nohome option. --- dlls/shdocvw/iexplore.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/shdocvw/iexplore.c b/dlls/shdocvw/iexplore.c index 4f737de..3ab39ee 100644 --- a/dlls/shdocvw/iexplore.c +++ b/dlls/shdocvw/iexplore.c @@ -190,6 +190,12 @@ DWORD WINAPI IEWinMain(LPSTR szCommandLine, int nShowWindow) ExitProcess(1); } + /* FIXME: there are lots of other commandline options we need to parse */ + if(!strncasecmp(szCommandLine, "-nohome", 7)) { + FIXME("skipping -nohome option\n"); + szCommandLine += 8; + } + if(strcmp(szCommandLine, "-Embedding")) { LPWSTR url; DWORD len;

1 0

Andrew Talbot : secur32: Constify some variables.
by Alexandre Julliard 27 Aug '07

27 Aug '07

Module: wine Branch: master Commit: d01c8407a9c72aacdf0f18bbda84651b1e19321a URL: http://source.winehq.org/git/wine.git/?a=commit;h=d01c8407a9c72aacdf0f18bbd… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat Aug 25 22:21:07 2007 +0100 secur32: Constify some variables. --- dlls/secur32/hmac_md5.c | 4 ++-- dlls/secur32/hmac_md5.h | 4 ++-- dlls/secur32/schannel.c | 10 +++++----- dlls/secur32/secur32.c | 6 +++--- dlls/secur32/secur32_priv.h | 4 ++-- dlls/secur32/thunks.c | 4 ++-- dlls/secur32/util.c | 2 +- 7 files changed, 17 insertions(+), 17 deletions(-) diff --git a/dlls/secur32/hmac_md5.c b/dlls/secur32/hmac_md5.c index 1b18659..6dafa31 100644 --- a/dlls/secur32/hmac_md5.c +++ b/dlls/secur32/hmac_md5.c @@ -21,7 +21,7 @@ #include "hmac_md5.h" -void HMACMD5Init(HMAC_MD5_CTX *ctx, unsigned char *key, unsigned int key_len) +void HMACMD5Init(HMAC_MD5_CTX *ctx, const unsigned char *key, unsigned int key_len) { int i; unsigned char inner_padding[64]; @@ -55,7 +55,7 @@ void HMACMD5Init(HMAC_MD5_CTX *ctx, unsigned char *key, unsigned int key_len) MD5Update(&(ctx->ctx), inner_padding, 64); } -void HMACMD5Update(HMAC_MD5_CTX *ctx, unsigned char *data, unsigned int data_len) +void HMACMD5Update(HMAC_MD5_CTX *ctx, const unsigned char *data, unsigned int data_len) { MD5Update(&(ctx->ctx), data, data_len); } diff --git a/dlls/secur32/hmac_md5.h b/dlls/secur32/hmac_md5.h index 3a94bb0..8fc2a44 100644 --- a/dlls/secur32/hmac_md5.h +++ b/dlls/secur32/hmac_md5.h @@ -42,7 +42,7 @@ void WINAPI MD5Init( MD5_CTX *ctx ); void WINAPI MD5Update( MD5_CTX *ctx, const unsigned char *buf, unsigned int len ); void WINAPI MD5Final( MD5_CTX *ctx ); -void HMACMD5Init(HMAC_MD5_CTX *ctx, unsigned char *key, unsigned int key_len); -void HMACMD5Update(HMAC_MD5_CTX *ctx, unsigned char *data, unsigned int data_len); +void HMACMD5Init(HMAC_MD5_CTX *ctx, const unsigned char *key, unsigned int key_len); +void HMACMD5Update(HMAC_MD5_CTX *ctx, const unsigned char *data, unsigned int data_len); void HMACMD5Final(HMAC_MD5_CTX *ctx, unsigned char *digest); #endif /*_HMAC_MD5_H_*/ diff --git a/dlls/secur32/schannel.c b/dlls/secur32/schannel.c index a8f50b6..b74e54c 100644 --- a/dlls/secur32/schannel.c +++ b/dlls/secur32/schannel.c @@ -29,7 +29,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(secur32); static SECURITY_STATUS schan_QueryCredentialsAttributes( - PCredHandle phCredential, ULONG ulAttribute, PVOID pBuffer) + PCredHandle phCredential, ULONG ulAttribute, const VOID *pBuffer) { SECURITY_STATUS ret; @@ -111,7 +111,7 @@ static SECURITY_STATUS SEC_ENTRY schan_QueryCredentialsAttributesW( return ret; } -static SECURITY_STATUS schan_CheckCreds(PSCHANNEL_CRED schanCred) +static SECURITY_STATUS schan_CheckCreds(const SCHANNEL_CRED *schanCred) { SECURITY_STATUS st; @@ -149,7 +149,7 @@ static SECURITY_STATUS schan_CheckCreds(PSCHANNEL_CRED schanCred) return st; } -static SECURITY_STATUS schan_AcquireClientCredentials(PSCHANNEL_CRED schanCred, +static SECURITY_STATUS schan_AcquireClientCredentials(const SCHANNEL_CRED *schanCred, PCredHandle phCredential, PTimeStamp ptsExpiry) { SECURITY_STATUS st = SEC_E_OK; @@ -177,7 +177,7 @@ static SECURITY_STATUS schan_AcquireClientCredentials(PSCHANNEL_CRED schanCred, return st; } -static SECURITY_STATUS schan_AcquireServerCredentials(PSCHANNEL_CRED schanCred, +static SECURITY_STATUS schan_AcquireServerCredentials(const SCHANNEL_CRED *schanCred, PCredHandle phCredential, PTimeStamp ptsExpiry) { SECURITY_STATUS st; @@ -194,7 +194,7 @@ static SECURITY_STATUS schan_AcquireServerCredentials(PSCHANNEL_CRED schanCred, } static SECURITY_STATUS schan_AcquireCredentialsHandle(ULONG fCredentialUse, - PSCHANNEL_CRED schanCred, PCredHandle phCredential, PTimeStamp ptsExpiry) + const SCHANNEL_CRED *schanCred, PCredHandle phCredential, PTimeStamp ptsExpiry) { SECURITY_STATUS ret; diff --git a/dlls/secur32/secur32.c b/dlls/secur32/secur32.c index aabb56c..2e12c66 100644 --- a/dlls/secur32/secur32.c +++ b/dlls/secur32/secur32.c @@ -588,7 +588,7 @@ static void SECUR32_initializeProviders(void) } } -SecurePackage *SECUR32_findPackageW(PWSTR packageName) +SecurePackage *SECUR32_findPackageW(PCWSTR packageName) { SecurePackage *ret = NULL; BOOL matched = FALSE; @@ -634,7 +634,7 @@ SecurePackage *SECUR32_findPackageW(PWSTR packageName) return ret; } -SecurePackage *SECUR32_findPackageA(PSTR packageName) +SecurePackage *SECUR32_findPackageA(PCSTR packageName) { SecurePackage *ret; @@ -778,7 +778,7 @@ SECURITY_STATUS WINAPI EnumerateSecurityPackagesW(PULONG pcPackages, * structures) into an array of SecPkgInfoA structures, which it returns. */ static PSecPkgInfoA thunk_PSecPkgInfoWToA(ULONG cPackages, - const PSecPkgInfoW info) + const SecPkgInfoW *info) { PSecPkgInfoA ret; diff --git a/dlls/secur32/secur32_priv.h b/dlls/secur32/secur32_priv.h index 303d8fc..4835525 100644 --- a/dlls/secur32/secur32_priv.h +++ b/dlls/secur32/secur32_priv.h @@ -112,11 +112,11 @@ void SECUR32_addPackages(SecureProvider *provider, ULONG toAdd, /* Tries to find the package named packageName. If it finds it, implicitly * loads the package if it isn't already loaded. */ -SecurePackage *SECUR32_findPackageW(PWSTR packageName); +SecurePackage *SECUR32_findPackageW(PCWSTR packageName); /* Tries to find the package named packageName. (Thunks to _findPackageW) */ -SecurePackage *SECUR32_findPackageA(PSTR packageName); +SecurePackage *SECUR32_findPackageA(PCSTR packageName); /* A few string helpers; will return NULL if str is NULL. Free return with * SECUR32_FREE */ diff --git a/dlls/secur32/thunks.c b/dlls/secur32/thunks.c index f21f351..b56507d 100644 --- a/dlls/secur32/thunks.c +++ b/dlls/secur32/thunks.c @@ -351,7 +351,7 @@ SECURITY_STATUS SEC_ENTRY thunk_AddCredentialsW(PCredHandle hCredentials, return ret; } -static PSecPkgInfoA _copyPackageInfoFlatWToA(PSecPkgInfoW infoW) +static PSecPkgInfoA _copyPackageInfoFlatWToA(const SecPkgInfoW *infoW) { PSecPkgInfoA ret; @@ -576,7 +576,7 @@ SECURITY_STATUS SEC_ENTRY thunk_QueryContextAttributesA(PCtxtHandle phContext, return ret; } -static PSecPkgInfoW _copyPackageInfoFlatAToW(PSecPkgInfoA infoA) +static PSecPkgInfoW _copyPackageInfoFlatAToW(const SecPkgInfoA *infoA) { PSecPkgInfoW ret; diff --git a/dlls/secur32/util.c b/dlls/secur32/util.c index 6d36e20..15d3a2a 100644 --- a/dlls/secur32/util.c +++ b/dlls/secur32/util.c @@ -143,7 +143,7 @@ SECURITY_STATUS SECUR32_CreateNTLMv1SessionKey(PBYTE password, int len, PBYTE se return SEC_E_OK; } -static void SECUR32_CalcNTLMv2Subkey(PBYTE session_key, const char *magic, PBYTE subkey) +static void SECUR32_CalcNTLMv2Subkey(const BYTE *session_key, const char *magic, PBYTE subkey) { MD5_CTX ctx;

1 0

Vitaliy Margolen : dinput: Count should not be 0-based.
by Alexandre Julliard 27 Aug '07

27 Aug '07

Module: wine Branch: master Commit: c6784cdad329c61264bfdfb0c0848077107ee1d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c6784cdad329c61264bfdfb0c… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Sat Aug 25 10:44:22 2007 -0600 dinput: Count should not be 0-based. --- dlls/dinput/joystick_linux.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/dinput/joystick_linux.c b/dlls/dinput/joystick_linux.c index ef5b9f3..e15e32e 100644 --- a/dlls/dinput/joystick_linux.c +++ b/dlls/dinput/joystick_linux.c @@ -138,6 +138,7 @@ static INT find_joystick_devices(void) if (joystick_devices_count != -1) return joystick_devices_count; + joystick_devices_count = 0; for (i = 0; i < MAX_JOYSTICKS; i++) { CHAR device_name[MAX_PATH], *str; @@ -154,7 +155,7 @@ static INT find_joystick_devices(void) if (!(str = HeapAlloc(GetProcessHeap(), 0, len))) break; memcpy(str, device_name, len); - joystick_devices[++joystick_devices_count] = str; + joystick_devices[joystick_devices_count++] = str; } return joystick_devices_count; @@ -164,7 +165,7 @@ static BOOL joydev_enum_deviceA(DWORD dwDevType, DWORD dwFlags, LPDIDEVICEINSTAN { int fd = -1; - if (id > find_joystick_devices()) return FALSE; + if (id >= find_joystick_devices()) return FALSE; if (dwFlags & DIEDFL_FORCEFEEDBACK) { WARN("force feedback not supported\n"); @@ -215,7 +216,7 @@ static BOOL joydev_enum_deviceW(DWORD dwDevType, DWORD dwFlags, LPDIDEVICEINSTAN char name[MAX_PATH]; char friendly[32]; - if (id > find_joystick_devices()) return FALSE; + if (id >= find_joystick_devices()) return FALSE; if (dwFlags & DIEDFL_FORCEFEEDBACK) { WARN("force feedback not supported\n");

1 0

Alexander Nicolaysen Sørnes : comdlg32: Fix text length in Norwegian ChooseFont.
by Alexandre Julliard 27 Aug '07

27 Aug '07

Module: wine Branch: master Commit: 35f3ff873c689819e9bd9200b99dfa0643612d1d URL: http://source.winehq.org/git/wine.git/?a=commit;h=35f3ff873c689819e9bd9200b… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Sun Aug 26 18:19:49 2007 +0200 comdlg32: Fix text length in Norwegian ChooseFont. --- dlls/comdlg32/cdlg_No.rc | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/comdlg32/cdlg_No.rc b/dlls/comdlg32/cdlg_No.rc index 8a0b79f..39b4d3e 100644 --- a/dlls/comdlg32/cdlg_No.rc +++ b/dlls/comdlg32/cdlg_No.rc @@ -134,8 +134,8 @@ FONT 8, "MS Shell Dlg" PUSHBUTTON "&Bruk", psh3,218,40,40,14,WS_GROUP | WS_TABSTOP PUSHBUTTON "&Hjelp" , pshHelp,218,57,40,14,WS_GROUP | WS_TABSTOP GROUPBOX "Effekter",grp1,6,72,84,34,WS_GROUP - CHECKBOX "Gjennomstre&ket", chx1, 10,82,50,10, BS_AUTOCHECKBOX | WS_TABSTOP - CHECKBOX "&Understreket", chx2, 10,94,50,10, BS_AUTOCHECKBOX + CHECKBOX "Gjennomstre&ket", chx1, 10,82,70,10, BS_AUTOCHECKBOX | WS_TABSTOP + CHECKBOX "&Understreket", chx2, 10,94,70,10, BS_AUTOCHECKBOX LTEXT "&Farge:", stc4 ,6,110,30,9 COMBOBOX cmb4,6,120,84,100,CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP

1 0

Alex Villacís Lasso : ole32: Fix forgotten IPersistStorage vtable.
by Alexandre Julliard 27 Aug '07

27 Aug '07

Module: wine Branch: master Commit: 5da0c8b18f5c74ec87a34a6fb845641c2a41d003 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5da0c8b18f5c74ec87a34a6fb… Author: Alex Villacís Lasso <a_villacis(a)palosanto.com> Date: Sat Aug 25 14:17:51 2007 -0500 ole32: Fix forgotten IPersistStorage vtable. --- dlls/ole32/defaulthandler.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/ole32/defaulthandler.c b/dlls/ole32/defaulthandler.c index ba70e0f..33e80ce 100644 --- a/dlls/ole32/defaulthandler.c +++ b/dlls/ole32/defaulthandler.c @@ -1672,7 +1672,7 @@ static const IAdviseSinkVtbl DefaultHandler_IAdviseSink_VTable = DefaultHandler_IAdviseSink_OnClose }; -static const IPersistStorageVtbl DefaultHander_IPersistStorage_VTable = +static const IPersistStorageVtbl DefaultHandler_IPersistStorage_VTable = { DefaultHandler_IPersistStorage_QueryInterface, DefaultHandler_IPersistStorage_AddRef, @@ -1709,6 +1709,7 @@ static DefaultHandler* DefaultHandler_Construct( This->lpvtblIDataObject = &DefaultHandler_IDataObject_VTable; This->lpvtblIRunnableObject = &DefaultHandler_IRunnableObject_VTable; This->lpvtblIAdviseSink = &DefaultHandler_IAdviseSink_VTable; + This->lpvtblIPersistStorage = &DefaultHandler_IPersistStorage_VTable; /* * Start with one reference count. The caller of this function

1 0

Alexander Nicolaysen Sørnes : comdlg32: PageSetupDlgA/W: Avoid crash when not passed a DEVMODE structure.
by Alexandre Julliard 27 Aug '07

27 Aug '07

Module: wine Branch: master Commit: 1065d52486e0005be5fd1d19055c546909b4733c URL: http://source.winehq.org/git/wine.git/?a=commit;h=1065d52486e0005be5fd1d190… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Thu Aug 23 15:09:08 2007 +0200 comdlg32: PageSetupDlgA/W: Avoid crash when not passed a DEVMODE structure. --- dlls/comdlg32/printdlg.c | 33 ++++++++++++++++++++------------- 1 files changed, 20 insertions(+), 13 deletions(-) diff --git a/dlls/comdlg32/printdlg.c b/dlls/comdlg32/printdlg.c index 714f09c..f3736ce 100644 --- a/dlls/comdlg32/printdlg.c +++ b/dlls/comdlg32/printdlg.c @@ -3167,12 +3167,15 @@ PRINTDLG_PageDlgProcA(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) EnableWindow(GetDlgItem(hDlg, edt7), FALSE); } /* Set orientation radiobutton properly */ - dm = GlobalLock(pda->dlga->hDevMode); - if (dm->u1.s1.dmOrientation == DMORIENT_LANDSCAPE) - CheckRadioButton(hDlg, rad1, rad2, rad2); - else /* this is default if papersize is not set */ - CheckRadioButton(hDlg, rad1, rad2, rad1); - GlobalUnlock(pda->dlga->hDevMode); + if(pda->dlga->hDevMode) + { + dm = GlobalLock(pda->dlga->hDevMode); + if (dm->u1.s1.dmOrientation == DMORIENT_LANDSCAPE) + CheckRadioButton(hDlg, rad1, rad2, rad2); + else /* this is default if papersize is not set */ + CheckRadioButton(hDlg, rad1, rad2, rad1); + GlobalUnlock(pda->dlga->hDevMode); + } /* if orientation disabled */ if (pda->dlga->Flags & PSD_DISABLEORIENTATION) { @@ -3280,13 +3283,17 @@ PageDlgProcW(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) EnableWindow(GetDlgItem(hDlg, edt7), FALSE); } - dm = GlobalLock(pda->dlga->hDevMode); - /* Landscape orientation */ - if (dm->u1.s1.dmOrientation == DMORIENT_LANDSCAPE) - CheckRadioButton(hDlg, rad1, rad2, rad2); - else /* this is default if papersize is not set */ - CheckRadioButton(hDlg, rad1, rad2, rad1); - GlobalUnlock(pda->dlga->hDevMode); + if(pda->dlga->hDevMode) + { + dm = GlobalLock(pda->dlga->hDevMode); + /* Landscape orientation */ + if (dm->u1.s1.dmOrientation == DMORIENT_LANDSCAPE) + CheckRadioButton(hDlg, rad1, rad2, rad2); + else /* this is default if papersize is not set */ + CheckRadioButton(hDlg, rad1, rad2, rad1); + GlobalUnlock(pda->dlga->hDevMode); + } + if (pda->dlga->Flags & PSD_DISABLEORIENTATION) { EnableWindow(GetDlgItem(hDlg,rad1),FALSE); EnableWindow(GetDlgItem(hDlg,rad2),FALSE);

1 0

Maarten Lankhorst : wineoss: Update sound caps.
by Alexandre Julliard 27 Aug '07

27 Aug '07

Module: wine Branch: master Commit: b93cb5f3fa60d1e40d57b8a0ca42f7f87db8e26a URL: http://source.winehq.org/git/wine.git/?a=commit;h=b93cb5f3fa60d1e40d57b8a0c… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Sat Aug 25 12:29:12 2007 +0200 wineoss: Update sound caps. --- dlls/wineoss.drv/audio.c | 14 ++++++-------- 1 files changed, 6 insertions(+), 8 deletions(-) diff --git a/dlls/wineoss.drv/audio.c b/dlls/wineoss.drv/audio.c index 4deee4b..f3360cf 100644 --- a/dlls/wineoss.drv/audio.c +++ b/dlls/wineoss.drv/audio.c @@ -774,6 +774,12 @@ static BOOL OSS_WaveOutInit(OSS_DEVICE* ossdev) /* direct sound caps */ ossdev->ds_caps.dwFlags = DSCAPS_CERTIFIED; + ossdev->ds_caps.dwFlags |= DSCAPS_SECONDARY8BIT; + ossdev->ds_caps.dwFlags |= DSCAPS_SECONDARY16BIT; + ossdev->ds_caps.dwFlags |= DSCAPS_SECONDARYMONO; + ossdev->ds_caps.dwFlags |= DSCAPS_SECONDARYSTEREO; + ossdev->ds_caps.dwFlags |= DSCAPS_CONTINUOUSRATE; + ossdev->ds_caps.dwPrimaryBuffers = 1; ossdev->ds_caps.dwMinSecondarySampleRate = DSBFREQUENCY_MIN; ossdev->ds_caps.dwMaxSecondarySampleRate = DSBFREQUENCY_MAX; @@ -845,14 +851,6 @@ static BOOL OSS_WaveOutInit(OSS_DEVICE* ossdev) if ((arg & DSP_CAP_MULTI) && (ossdev->out_caps.dwSupport & WAVECAPS_DIRECTSOUND)) { TRACE("hardware secondary buffer support available\n"); - if (ossdev->ds_caps.dwFlags & DSCAPS_PRIMARY8BIT) - ossdev->ds_caps.dwFlags |= DSCAPS_SECONDARY8BIT; - if (ossdev->ds_caps.dwFlags & DSCAPS_PRIMARY16BIT) - ossdev->ds_caps.dwFlags |= DSCAPS_SECONDARY16BIT; - if (ossdev->ds_caps.dwFlags & DSCAPS_PRIMARYMONO) - ossdev->ds_caps.dwFlags |= DSCAPS_SECONDARYMONO; - if (ossdev->ds_caps.dwFlags & DSCAPS_PRIMARYSTEREO) - ossdev->ds_caps.dwFlags |= DSCAPS_SECONDARYSTEREO; ossdev->ds_caps.dwMaxHwMixingAllBuffers = 16; ossdev->ds_caps.dwMaxHwMixingStaticBuffers = 0;

1 0

Maarten Lankhorst : winealsa: Update sound caps.
by Alexandre Julliard 27 Aug '07

27 Aug '07

Module: wine Branch: master Commit: a083c2419d3044fb09a0a0a95dc30320254deb0d URL: http://source.winehq.org/git/wine.git/?a=commit;h=a083c2419d3044fb09a0a0a95… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Sat Aug 25 12:28:57 2007 +0200 winealsa: Update sound caps. --- dlls/winealsa.drv/waveinit.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/winealsa.drv/waveinit.c b/dlls/winealsa.drv/waveinit.c index 0de1335..dae6ab4 100644 --- a/dlls/winealsa.drv/waveinit.c +++ b/dlls/winealsa.drv/waveinit.c @@ -325,6 +325,10 @@ static int ALSA_ComputeCaps(snd_ctl_t *ctl, snd_pcm_t *pcm, } } + *flags = DSCAPS_CERTIFIED | DSCAPS_CONTINUOUSRATE; + *flags |= DSCAPS_SECONDARYMONO | DSCAPS_SECONDARYSTEREO; + *flags |= DSCAPS_SECONDARY8BIT | DSCAPS_SECONDARY16BIT; + if (*formats & (WAVE_FORMAT_1M08 | WAVE_FORMAT_2M08 | WAVE_FORMAT_4M08 | WAVE_FORMAT_48M08 | WAVE_FORMAT_96M08 | WAVE_FORMAT_1M16 |

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits August 2007