October 2008 - Wine-Commits

Aric Stewart : gdiplus: Avoid dereferencing a potential NULL (Coverity 589) .
by Alexandre Julliard Oct. 17, 2008

Oct. 17, 2008

Module: wine Branch: master Commit: c4e859a678db1440e1357c42f60e620716e383f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c4e859a678db1440e1357c42f… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Oct 16 09:09:49 2008 -0500 gdiplus: Avoid dereferencing a potential NULL (Coverity 589). --- dlls/gdiplus/image.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 9516d64..ffd270b 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -450,7 +450,9 @@ GpStatus WINGDIPAPI GdipCreateBitmapFromScan0(INT width, INT height, INT stride, TRACE("%d %d %d %d %p %p\n", width, height, stride, format, scan0, bitmap); - if(!bitmap || width <= 0 || height <= 0 || (scan0 && (stride % 4))){ + if (!bitmap) return InvalidParameter; + + if(width <= 0 || height <= 0 || (scan0 && (stride % 4))){ *bitmap = NULL; return InvalidParameter; }

1 0

Juan Lang : crypt32: Fix a few more test failures.
by Alexandre Julliard Oct. 17, 2008

Oct. 17, 2008

Module: wine Branch: master Commit: 88a1ecb69539358b3525390b07636be9d91ff3bd URL: http://source.winehq.org/git/wine.git/?a=commit;h=88a1ecb69539358b3525390b0… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Oct 16 08:37:37 2008 -0700 crypt32: Fix a few more test failures. --- dlls/crypt32/tests/encode.c | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/crypt32/tests/encode.c b/dlls/crypt32/tests/encode.c index d568eb5..e08a7ce 100644 --- a/dlls/crypt32/tests/encode.c +++ b/dlls/crypt32/tests/encode.c @@ -469,7 +469,7 @@ static void testTimeEncoding(DWORD dwEncoding, LPCSTR structType, } } else - ok(!ret && GetLastError() == CRYPT_E_BAD_ENCODE, + ok((!ret && GetLastError() == CRYPT_E_BAD_ENCODE) || broken(ret), "Expected CRYPT_E_BAD_ENCODE, got 0x%08x\n", GetLastError()); } @@ -526,7 +526,8 @@ static void testTimeDecoding(DWORD dwEncoding, LPCSTR structType, { ok(ret, "CryptDecodeObjectEx failed: %d (0x%08x)\n", GetLastError(), GetLastError()); - compareTime(&time->sysTime, &ft); + if (ret) + compareTime(&time->sysTime, &ft); } else ok(!ret && (GetLastError() == CRYPT_E_ASN1_BADTAG || @@ -5698,8 +5699,8 @@ static void test_decodePKCSContentInfo(DWORD dwEncoding) /* Native fails with CRYPT_E_ASN1_EOD, accept also CRYPT_E_ASN1_CORRUPT as * I doubt an app depends on that. */ - ok(!ret && (GetLastError() == CRYPT_E_ASN1_EOD || - GetLastError() == CRYPT_E_ASN1_CORRUPT), + ok((!ret && (GetLastError() == CRYPT_E_ASN1_EOD || + GetLastError() == CRYPT_E_ASN1_CORRUPT)) || broken(ret), "Expected CRYPT_E_ASN1_EOD or CRYPT_E_ASN1_CORRUPT, got %x\n", GetLastError()); ret = pCryptDecodeObjectEx(dwEncoding, PKCS_CONTENT_INFO,

1 0

Andrew Talbot : mlang: Sign-compare warnings fix.
by Alexandre Julliard Oct. 17, 2008

Oct. 17, 2008

Module: wine Branch: master Commit: 59a33c9c7d9ae6cb5a2bd872ab2f38552053b137 URL: http://source.winehq.org/git/wine.git/?a=commit;h=59a33c9c7d9ae6cb5a2bd872a… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Thu Oct 16 12:47:01 2008 +0100 mlang: Sign-compare warnings fix. --- dlls/mlang/mlang.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/mlang/mlang.c b/dlls/mlang/mlang.c index 9686e9a..ae85f6e 100644 --- a/dlls/mlang/mlang.c +++ b/dlls/mlang/mlang.c @@ -503,7 +503,7 @@ static LONG dll_count; static UINT DetectJapaneseCode(LPCSTR input, DWORD count) { UINT code = 0; - int i = 0; + DWORD i = 0; unsigned char c1,c2; while ((code == 0 || code == 51932) && i < count) @@ -615,7 +615,7 @@ static int han2zen(unsigned char *p1, unsigned char *p2) static UINT ConvertJIS2SJIS(LPCSTR input, DWORD count, LPSTR output) { - int i = 0; + DWORD i = 0; int j = 0; unsigned char p2,p; int shifted = FALSE; @@ -683,7 +683,7 @@ static inline int enter_shift(LPSTR out, int c) static UINT ConvertSJIS2JIS(LPCSTR input, DWORD count, LPSTR output) { - int i = 0; + DWORD i = 0; int j = 0; unsigned char p2,p; int shifted = FALSE; @@ -1343,7 +1343,7 @@ static const IClassFactoryVtbl MLANGCF_Vtbl = */ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID iid, LPVOID *ppv) { - int i; + unsigned int i; IClassFactoryImpl *factory; TRACE("%s %s %p\n",debugstr_guid(rclsid), debugstr_guid(iid), ppv);

1 0

Andrew Talbot : mcicda: Sign-compare warning fix.
by Alexandre Julliard Oct. 17, 2008

Oct. 17, 2008

Module: wine Branch: master Commit: 9e297e2cbe5ce747733cbe9450977474fe1e2189 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e297e2cbe5ce747733cbe945… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Thu Oct 16 12:46:57 2008 +0100 mcicda: Sign-compare warning fix. --- dlls/mcicda/mcicda.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mcicda/mcicda.c b/dlls/mcicda/mcicda.c index 6e4a835..2edb919 100644 --- a/dlls/mcicda/mcicda.c +++ b/dlls/mcicda/mcicda.c @@ -270,7 +270,7 @@ static DWORD MCICDA_Open(UINT wDevID, DWORD dwFlags, LPMCI_OPEN_PARMSW lpOpenPar DWORD ret = MCIERR_HARDWARE; WINE_MCICDAUDIO* wmcda = (WINE_MCICDAUDIO*)mciGetDriverData(wDevID); WCHAR root[7], drive = 0; - int count; + unsigned int count; TRACE("(%04X, %08X, %p);\n", wDevID, dwFlags, lpOpenParms);

1 0

Joris Huizer : shlwapi: Fix ASSOC_GetExecutable not to use uninitialised variable.
by Alexandre Julliard Oct. 17, 2008

Oct. 17, 2008

Module: wine Branch: master Commit: 8ed05aeb32de6a2cc820521d0603dd06c3551543 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ed05aeb32de6a2cc820521d0… Author: Joris Huizer <joris_huizer(a)yahoo.com> Date: Wed Oct 15 00:13:44 2008 +0200 shlwapi: Fix ASSOC_GetExecutable not to use uninitialised variable. --- dlls/shlwapi/assoc.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/shlwapi/assoc.c b/dlls/shlwapi/assoc.c index 9e4b036..31a8420 100644 --- a/dlls/shlwapi/assoc.c +++ b/dlls/shlwapi/assoc.c @@ -603,7 +603,7 @@ static HRESULT ASSOC_GetExecutable(IQueryAssociationsImpl *This, LONG ret; WCHAR * pszCommand; WCHAR * pszEnd; - WCHAR * pszExtraFromReg; + WCHAR * pszExtraFromReg = NULL; WCHAR * pszFileType; WCHAR * pszStart; static const WCHAR commandW[] = { 'c','o','m','m','a','n','d',0 };

1 0

Andrey Esin : regedit: Corrections in Russian translation.
by Alexandre Julliard Oct. 17, 2008

Oct. 17, 2008

Module: wine Branch: master Commit: f0321f85a024af8cd84cf54d8235a1f2fdf5cc6a URL: http://source.winehq.org/git/wine.git/?a=commit;h=f0321f85a024af8cd84cf54d8… Author: Andrey Esin <andrey(a)esin.name> Date: Tue Oct 14 22:32:13 2008 +0400 regedit: Corrections in Russian translation. --- programs/regedit/Ru.rc | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/programs/regedit/Ru.rc b/programs/regedit/Ru.rc index 02d5886..4be900e 100644 --- a/programs/regedit/Ru.rc +++ b/programs/regedit/Ru.rc @@ -49,7 +49,7 @@ BEGIN MENUITEM "&�� ", ID_EDIT_NEW_STRINGVALUE MENUITEM "&�� ", ID_EDIT_NEW_BINARYVALUE MENUITEM "&DWORD ��", ID_EDIT_NEW_DWORDVALUE - MENUITEM "&��-�� ", ID_EDIT_NEW_MULTI_STRINGVALUE + MENUITEM "&�� ", ID_EDIT_NEW_MULTI_STRINGVALUE END MENUITEM SEPARATOR MENUITEM "&��\tDel", ID_EDIT_DELETE @@ -100,7 +100,7 @@ BEGIN MENUITEM "&�� ", ID_EDIT_NEW_STRINGVALUE MENUITEM "&�� ", ID_EDIT_NEW_BINARYVALUE MENUITEM "&DWORD ��", ID_EDIT_NEW_DWORDVALUE - MENUITEM "&��-�� ", ID_EDIT_NEW_MULTI_STRINGVALUE + MENUITEM "&�� ", ID_EDIT_NEW_MULTI_STRINGVALUE END MENUITEM SEPARATOR MENUITEM "&��\tDel", ID_EDIT_DELETE @@ -211,7 +211,7 @@ END IDD_EDIT_MULTI_STRING DIALOG DISCARDABLE 22, 17, 210, 175 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU -CAPTION "�� -�� " +CAPTION "�� " FONT 8, "MS Shell Dlg" BEGIN LTEXT "�� :",IDC_STATIC,5,5,119,8 @@ -240,7 +240,7 @@ END STRINGTABLE DISCARDABLE BEGIN - ID_REGISTRY_MENU "�� " + ID_REGISTRY_MENU "�� " ID_EDIT_MENU "�� " ID_VIEW_MENU "�� " ID_FAVORITES_MENU "�� " @@ -255,7 +255,7 @@ BEGIN ID_EDIT_NEW_STRINGVALUE "�� " ID_EDIT_NEW_BINARYVALUE "�� " ID_EDIT_NEW_DWORDVALUE "�� DWORD-��" - ID_EDIT_NEW_MULTI_STRINGVALUE "�� -�� " + ID_EDIT_NEW_MULTI_STRINGVALUE "�� " ID_REGISTRY_IMPORTREGISTRYFILE "�� " ID_REGISTRY_EXPORTREGISTRYFILE "�� "

1 0

Dmitry Timoshkov : user32: Add a test for fullscreen window sizing, make it pass under Wine.
by Alexandre Julliard Oct. 17, 2008

Oct. 17, 2008

Module: wine Branch: master Commit: 922dc3122476a8b16e7213c9eeb9d4d15dd525b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=922dc3122476a8b16e7213c9e… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Thu Oct 16 19:58:56 2008 +0900 user32: Add a test for fullscreen window sizing, make it pass under Wine. It appears that Windows doesn't always restrict the window size by the monitor work area. The tests pass under XP SP3 and Win98. --- dlls/user32/tests/win.c | 191 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/user32/winpos.c | 21 ++++-- 2 files changed, 206 insertions(+), 6 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=922dc3122476a8b16e721…

1 0

Alexandre Julliard : services.exe: Pass the service name as first argument when auto-starting services.
by Alexandre Julliard Oct. 16, 2008

Oct. 16, 2008

Module: wine Branch: stable Commit: 2e739275e2c9556ee5ea13fde2291e931b0ab47d URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e739275e2c9556ee5ea13fde… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 2 12:02:11 2008 +0200 services.exe: Pass the service name as first argument when auto-starting services. (cherry picked from commit 7e8ecd2d6437c0ed2ee83fc2b63b77c950a27c31) --- programs/services/services.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/programs/services/services.c b/programs/services/services.c index 806fbb6..36ed117 100644 --- a/programs/services/services.c +++ b/programs/services/services.c @@ -256,8 +256,11 @@ static void scmdatabase_autostart_services(struct scmdatabase *db) for (i = 0; i < size; i++) { DWORD err; + const WCHAR *argv[2]; service = services_list[i]; - err = service_start(service, 0, NULL); + argv[0] = service->name; + argv[1] = NULL; + err = service_start(service, 1, argv); /* FIXME: do something if the service failed to start */ release_service(service); }

1 0

Massimo Del Fedele : opengl32: glGetString() should return NULL on NULL context.
by Alexandre Julliard Oct. 16, 2008

Oct. 16, 2008

Module: wine Branch: stable Commit: f5cbd282eb431353197ab2785cf2f58a607ae261 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f5cbd282eb431353197ab2785… Author: Massimo Del Fedele <max(a)veneto.com> Date: Wed Jul 2 16:51:26 2008 +0200 opengl32: glGetString() should return NULL on NULL context. (cherry picked from commit d6a6b88f1904783157245cae0b3f5a8d3de1ec20) --- dlls/opengl32/wgl.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/opengl32/wgl.c b/dlls/opengl32/wgl.c index 6fbdeb4..a07fcf3 100644 --- a/dlls/opengl32/wgl.c +++ b/dlls/opengl32/wgl.c @@ -632,6 +632,11 @@ const GLubyte * WINAPI wine_glGetString( GLenum name ) const GLubyte *ret; const char* GL_Extensions = NULL; + /* this is for buggy nvidia driver, crashing if called from a different + thread with no context */ + if(wglGetCurrentContext() == NULL) + return NULL; + if (GL_EXTENSIONS != name) { ENTER_GL(); ret = glGetString(name);

1 0

Aric Stewart : coreaudio: Make sure Port_SendToMessageThread is not NULL before calling CFMessagePortSendRequest .
by Alexandre Julliard Oct. 16, 2008

Oct. 16, 2008

Module: wine Branch: stable Commit: 3a50f8fcaa2ad77f812ebd482ee25d2c91c86e29 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a50f8fcaa2ad77f812ebd482… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Jul 10 11:28:56 2008 +0900 coreaudio: Make sure Port_SendToMessageThread is not NULL before calling CFMessagePortSendRequest. Prevents crashing when closing audio device during playback. (cherry picked from commit 686ea70c1853aecc235143862b42e6fb09333ed4) --- dlls/winecoreaudio.drv/audio.c | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/dlls/winecoreaudio.drv/audio.c b/dlls/winecoreaudio.drv/audio.c index 90d664f..549b69e 100644 --- a/dlls/winecoreaudio.drv/audio.c +++ b/dlls/winecoreaudio.drv/audio.c @@ -349,6 +349,9 @@ static void wodSendNotifyCompletionsMessage(WINE_WAVEOUT* wwo) CFDataRef data; UInt32 buffer; + if (!Port_SendToMessageThread) + return; + buffer = (UInt32) wwo->woID; data = CFDataCreate(kCFAllocatorDefault, (UInt8 *)&buffer, sizeof(buffer)); @@ -368,6 +371,9 @@ static void wodSendNotifyInputCompletionsMessage(WINE_WAVEIN* wwi) CFDataRef data; UInt32 buffer; + if (!Port_SendToMessageThread) + return; + buffer = (UInt32) wwi->wiID; data = CFDataCreate(kCFAllocatorDefault, (UInt8 *)&buffer, sizeof(buffer)); @@ -694,6 +700,9 @@ void CoreAudio_WaveRelease(void) /* Stop CFRunLoop in messageThread */ TRACE("()\n"); + if (!Port_SendToMessageThread) + return; + CFMessagePortSendRequest(Port_SendToMessageThread, kStopLoopMessage, NULL, 0.0, 0.0, NULL, NULL); CFRelease(Port_SendToMessageThread); Port_SendToMessageThread = NULL;

1 0