August 2007 - Wine-commits - list.winehq.org

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

27 Aug '07

Module: wine Branch: master Commit: 8d29abb08da9211d26ba027b658b3c5b801918b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d29abb08da9211d26ba027b6… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Sun Aug 26 19:19:46 2007 +0200 comdlg32: FindText: Fix text length in Norwegian template. --- dlls/comdlg32/cdlg_No.rc | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/comdlg32/cdlg_No.rc b/dlls/comdlg32/cdlg_No.rc index 39b4d3e..ce8013c 100644 --- a/dlls/comdlg32/cdlg_No.rc +++ b/dlls/comdlg32/cdlg_No.rc @@ -1,5 +1,5 @@ /* - * Copyright 2005 Alexander N. S�rnes + * Copyright 2005-2007 Alexander N. S�rnes * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -189,10 +189,10 @@ FONT 8, "MS Shell Dlg" LTEXT "Fi&nn:", -1, 4, 8, 42, 8 EDITTEXT edt1, 47, 7, 128, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP CHECKBOX "Finn &kun hele ord", chx1, 4, 26, 100, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP - CHECKBOX "Skill &mellom store/sm� bokstaver", chx2, 4, 42, 64, 12, BS_AUTOCHECKBOX | WS_TABSTOP - GROUPBOX "Retning", grp1, 107, 26, 68, 28 - CONTROL "&Opp", rad1, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 111, 38, 20, 12 - CONTROL "&Ned", rad2, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 138, 38, 30, 12 + CHECKBOX "Skill &mellom store og sm� bokstaver", chx2, 4, 42, 125, 12, BS_AUTOCHECKBOX | WS_TABSTOP + GROUPBOX "Retning", grp1, 137, 23, 40, 36 + CONTROL "&Opp", rad1, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 141, 31, 30, 12 + CONTROL "&Ned", rad2, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 141, 44, 30, 12 DEFPUSHBUTTON "&Finn neste", IDOK, 182, 5, 50, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON PUSHBUTTON "Avbryt", IDCANCEL , 182, 23, 50, 14, WS_GROUP | WS_TABSTOP @@ -210,7 +210,7 @@ FONT 8, "MS Shell Dlg" LTEXT "&Erstatt med:", -1, 4, 26, 48, 8 EDITTEXT edt2, 54, 24, 114, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP CHECKBOX "Finn kun &hele ord", chx1, 5, 46, 104, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP - CHECKBOX "Skill mellom store og sm� bokstaver", chx2, 5, 62, 59, 12, BS_AUTOCHECKBOX | WS_TABSTOP + CHECKBOX "Skill mellom store og sm� bokstaver", chx2, 5, 62, 125, 12, BS_AUTOCHECKBOX | WS_TABSTOP DEFPUSHBUTTON "&Finn neste", IDOK, 174, 4, 50, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON PUSHBUTTON "E&rsatt", psh1 , 174, 21, 50, 14, WS_GROUP | WS_TABSTOP

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

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

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

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

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: 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

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

Stefan Dösinger : wined3d: BaseVertexIndex can be negative.
by Alexandre Julliard 27 Aug '07

27 Aug '07

Module: wine Branch: master Commit: 6ec6c941fabbbb7cbfedce17017bee40ded16709 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ec6c941fabbbb7cbfedce170… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Aug 25 00:09:33 2007 +0200 wined3d: BaseVertexIndex can be negative. --- dlls/d3d8/device.c | 9 ++++++++- dlls/wined3d/device.c | 4 ++-- dlls/wined3d/drawprim.c | 20 ++++++++++++++++++-- dlls/wined3d/wined3d_private.h | 4 ++-- include/wine/wined3d_interface.h | 4 ++-- 5 files changed, 32 insertions(+), 9 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 74a0d13..205120e 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -1803,6 +1803,12 @@ static HRESULT WINAPI IDirect3DDevice8Impl_SetIndices(LPDIRECT3DDEVICE8 iface, I TRACE("(%p) Relay\n", This); EnterCriticalSection(&d3d8_cs); + /* WineD3D takes an INT(due to d3d9), but d3d8 uses UINTs. Do I have to add a check here that + * the UINT doesn't cause an overflow in the INT? It seems rather unlikely because such large + * vertex buffers can't be created to address them with an index that requires the 32nd bit + * (4 Byte minimum vertex size * 2^31-1 -> 8 gb buffer. The index sign would be the least + * problem) + */ IWineD3DDevice_SetBaseVertexIndex(This->WineD3DDevice, baseVertexIndex); hr = IWineD3DDevice_SetIndices(This->WineD3DDevice, pIndexData ? ((IDirect3DIndexBuffer8Impl *)pIndexData)->wineD3DIndexBuffer : NULL); @@ -1822,7 +1828,8 @@ static HRESULT WINAPI IDirect3DDevice8Impl_GetIndices(LPDIRECT3DDEVICE8 iface, I } EnterCriticalSection(&d3d8_cs); - IWineD3DDevice_GetBaseVertexIndex(This->WineD3DDevice, pBaseVertexIndex); + /* The case from UINT to INT is safe because d3d8 will never set negative values */ + IWineD3DDevice_GetBaseVertexIndex(This->WineD3DDevice, (INT *) pBaseVertexIndex); rc = IWineD3DDevice_GetIndices(This->WineD3DDevice, &retIndexData); if (SUCCEEDED(rc) && retIndexData) { IWineD3DIndexBuffer_GetParent(retIndexData, (IUnknown **)ppIndexData); diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 425ffe2..2b2dac5 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2829,7 +2829,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_GetIndices(IWineD3DDevice *iface, IWine } /* Method to offer d3d9 a simple way to set the base vertex index without messing with the index buffer */ -static HRESULT WINAPI IWineD3DDeviceImpl_SetBaseVertexIndex(IWineD3DDevice *iface, UINT BaseIndex) { +static HRESULT WINAPI IWineD3DDeviceImpl_SetBaseVertexIndex(IWineD3DDevice *iface, INT BaseIndex) { IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; TRACE("(%p)->(%d)\n", This, BaseIndex); @@ -2849,7 +2849,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_SetBaseVertexIndex(IWineD3DDevice *ifac return WINED3D_OK; } -static HRESULT WINAPI IWineD3DDeviceImpl_GetBaseVertexIndex(IWineD3DDevice *iface, UINT* base_index) { +static HRESULT WINAPI IWineD3DDeviceImpl_GetBaseVertexIndex(IWineD3DDevice *iface, INT* base_index) { IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; TRACE("(%p) : base_index %p\n", This, base_index); diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index 3a47912..2dcaa5d 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -178,6 +178,7 @@ void primitiveDeclarationConvertToStridedData( if (This->stateBlock->streamSource[element->Stream] == NULL) continue; + stride = This->stateBlock->streamStride[element->Stream]; if (This->stateBlock->streamIsUP) { TRACE("Stream is up %d, %p\n", element->Stream, This->stateBlock->streamSource[element->Stream]); streamVBO = 0; @@ -185,6 +186,22 @@ void primitiveDeclarationConvertToStridedData( } else { TRACE("Stream isn't up %d, %p\n", element->Stream, This->stateBlock->streamSource[element->Stream]); data = IWineD3DVertexBufferImpl_GetMemory(This->stateBlock->streamSource[element->Stream], 0, &streamVBO); + + /* Can't use vbo's if the base vertex index is negative. OpenGL doesn't accept negative offsets + * (or rather offsets bigger than the vbo, because the pointer is unsigned), so use system memory + * sources. In most sane cases the pointer - offset will still be > 0, otherwise it will wrap + * around to some big value. Hope that with the indices, the driver wraps it back internally. If + * not, drawStridedSlow is needed, including a vertex buffer path. + */ + if(This->stateBlock->loadBaseVertexIndex < 0) { + WARN("loadBaseVertexIndex is < 0 (%d), not using vbos\n", This->stateBlock->loadBaseVertexIndex); + streamVBO = 0; + data = ((IWineD3DVertexBufferImpl *) This->stateBlock->streamSource[element->Stream])->resource.allocatedMemory; + if(data + This->stateBlock->loadBaseVertexIndex * stride < 0) { + FIXME("System memory vertex data load offset is negative!\n"); + } + } + if(fixup) { if( streamVBO != 0) *fixup = TRUE; else if(*fixup && !useVertexShaderFunction && @@ -195,7 +212,6 @@ void primitiveDeclarationConvertToStridedData( } } } - stride = This->stateBlock->streamStride[element->Stream]; data += element->Offset; reg = element->Reg; @@ -284,7 +300,7 @@ static void drawStridedSlow(IWineD3DDevice *iface, WineDirect3DVertexStridedData DWORD specularColor = 0; /* Specular Color */ IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; UINT *streamOffset = This->stateBlock->streamOffset; - DWORD SkipnStrides = startVertex + This->stateBlock->loadBaseVertexIndex; + long SkipnStrides = startVertex + This->stateBlock->loadBaseVertexIndex; BYTE *texCoords[WINED3DDP_MAXTEXCOORD]; BYTE *diffuse = NULL, *specular = NULL, *normal = NULL, *position = NULL; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 0328780..61a6385 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1343,8 +1343,8 @@ struct IWineD3DStateBlockImpl /* Indices */ IWineD3DIndexBuffer* pIndexData; - UINT baseVertexIndex; - UINT loadBaseVertexIndex; /* non-indexed drawing needs 0 here, indexed baseVertexIndex */ + INT baseVertexIndex; + INT loadBaseVertexIndex; /* non-indexed drawing needs 0 here, indexed baseVertexIndex */ /* Transform */ WINED3DMATRIX transforms[HIGHEST_TRANSFORMSTATE + 1]; diff --git a/include/wine/wined3d_interface.h b/include/wine/wined3d_interface.h index 35430b9..603eeb5 100644 --- a/include/wine/wined3d_interface.h +++ b/include/wine/wined3d_interface.h @@ -405,8 +405,8 @@ DECLARE_INTERFACE_(IWineD3DDevice,IWineD3DBase) STDMETHOD_(void, GetGammaRamp)(THIS_ UINT iSwapChain, WINED3DGAMMARAMP* pRamp) PURE; STDMETHOD(SetIndices)(THIS_ struct IWineD3DIndexBuffer * pIndexData) PURE; STDMETHOD(GetIndices)(THIS_ struct IWineD3DIndexBuffer ** ppIndexData) PURE; - STDMETHOD(SetBaseVertexIndex)(THIS_ UINT baseIndex); - STDMETHOD(GetBaseVertexIndex)(THIS_ UINT *baseIndex); + STDMETHOD(SetBaseVertexIndex)(THIS_ INT baseIndex); + STDMETHOD(GetBaseVertexIndex)(THIS_ INT *baseIndex); STDMETHOD(SetLight)(THIS_ DWORD Index,CONST WINED3DLIGHT * pLight) PURE; STDMETHOD(GetLight)(THIS_ DWORD Index,WINED3DLIGHT * pLight) PURE; STDMETHOD(SetLightEnable)(THIS_ DWORD Index,BOOL Enable) PURE;

1 0

Stefan Dösinger : wined3d: Add the copied light to the right stateblock.
by Alexandre Julliard 27 Aug '07

27 Aug '07

Module: wine Branch: master Commit: f7530729d5854e3cc1750efc4882c9f154352835 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f7530729d5854e3cc1750efc4… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Aug 16 13:30:42 2007 +0200 wined3d: Add the copied light to the right stateblock. --- dlls/wined3d/stateblock.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 6ab6247..dfe62c9 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -186,8 +186,8 @@ void stateblock_copy( PLIGHTINFOEL *light = LIST_ENTRY(e1, PLIGHTINFOEL, entry), *light2; light2 = HeapAlloc(GetProcessHeap(), 0, sizeof(*light)); memcpy(light2, light, sizeof(*light)); - list_add_tail(&This->lightMap[l], &light2->entry); - if(light2->glIndex != -1) This->activeLights[light2->glIndex] = light2; + list_add_tail(&Dest->lightMap[l], &light2->entry); + if(light2->glIndex != -1) Dest->activeLights[light2->glIndex] = light2; } }

1 0