December 2009 - Wine-commits

Rob Shearman : secur32: Don' t allocate context handle in wrapper InitializeSecurityContextA/ W if it is the same as the handle passed into the function.
by Alexandre Julliard 30 Dec '09

30 Dec '09

Module: wine Branch: master Commit: 697955c922765214d61965ecc594e256853f6d12 URL: http://source.winehq.org/git/wine.git/?a=commit;h=697955c922765214d61965ecc… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Tue Dec 29 19:06:43 2009 +0000 secur32: Don't allocate context handle in wrapper InitializeSecurityContextA/W if it is the same as the handle passed into the function. --- dlls/secur32/wrapper.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/secur32/wrapper.c b/dlls/secur32/wrapper.c index 2ab241d..3d678a5 100644 --- a/dlls/secur32/wrapper.c +++ b/dlls/secur32/wrapper.c @@ -283,7 +283,8 @@ SECURITY_STATUS WINAPI InitializeSecurityContextA( cred, ctxt, pszTargetName, fContextReq, Reserved1, TargetDataRep, pInput, Reserved2, phNewContext ? &myCtxt : NULL, pOutput, pfContextAttr, ptsExpiry); - if ((ret == SEC_E_OK || ret == SEC_I_CONTINUE_NEEDED) && phNewContext) + if ((ret == SEC_E_OK || ret == SEC_I_CONTINUE_NEEDED) && + phNewContext && phNewContext != phContext) { SECURITY_STATUS ret2; ret2 = SECUR32_makeSecHandle(phNewContext, package, &myCtxt); @@ -346,7 +347,8 @@ SECURITY_STATUS WINAPI InitializeSecurityContextW( cred, ctxt, pszTargetName, fContextReq, Reserved1, TargetDataRep, pInput, Reserved2, phNewContext ? &myCtxt : NULL, pOutput, pfContextAttr, ptsExpiry); - if ((ret == SEC_E_OK || ret == SEC_I_CONTINUE_NEEDED) && phNewContext) + if ((ret == SEC_E_OK || ret == SEC_I_CONTINUE_NEEDED) && + phNewContext && phNewContext != phContext) { SECURITY_STATUS ret2; ret2 = SECUR32_makeSecHandle(phNewContext, package, &myCtxt);

1 0

Nikolay Sivov : user32/sysparams: Return NULL from GetSysColorBrush() for invalid index.
by Alexandre Julliard 30 Dec '09

30 Dec '09

Module: wine Branch: master Commit: 385b8dcb95b2853d452ec95d140ea5fa0c05aeef URL: http://source.winehq.org/git/wine.git/?a=commit;h=385b8dcb95b2853d452ec95d1… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Tue Dec 29 19:27:14 2009 +0300 user32/sysparams: Return NULL from GetSysColorBrush() for invalid index. --- dlls/user32/sysparams.c | 2 +- dlls/user32/tests/sysparams.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index 09e7eb5..08dde39 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -3028,7 +3028,7 @@ HBRUSH WINAPI GetSysColorBrush( INT index ) { if (0 <= index && index < NUM_SYS_COLORS) return SysColorBrushes[index]; WARN("Unknown index(%d)\n", index ); - return GetStockObject(LTGRAY_BRUSH); + return NULL; } diff --git a/dlls/user32/tests/sysparams.c b/dlls/user32/tests/sysparams.c index a9b79fa..ba1c802 100644 --- a/dlls/user32/tests/sysparams.c +++ b/dlls/user32/tests/sysparams.c @@ -2770,7 +2770,7 @@ static void test_GetSysColorBrush(void) SetLastError(0xdeadbeef); hbr = GetSysColorBrush(-1); - todo_wine ok(hbr == NULL, "Expected NULL brush\n"); + ok(hbr == NULL, "Expected NULL brush\n"); ok(GetLastError() == 0xdeadbeef, "Expected last error not set, got %x\n", GetLastError()); /* greater than max index */ hbr = GetSysColorBrush(COLOR_MENUBAR); @@ -2778,7 +2778,7 @@ static void test_GetSysColorBrush(void) { SetLastError(0xdeadbeef); hbr = GetSysColorBrush(COLOR_MENUBAR + 1); - todo_wine ok(hbr == NULL, "Expected NULL brush\n"); + ok(hbr == NULL, "Expected NULL brush\n"); ok(GetLastError() == 0xdeadbeef, "Expected last error not set, got %x\n", GetLastError()); } else

1 0

Michael Stefaniuc : configure: Require a new enough flex version.
by Alexandre Julliard 30 Dec '09

30 Dec '09

Module: wine Branch: master Commit: ce30733337e55d76c3870f5724cd995e980e4756 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce30733337e55d76c3870f572… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Dec 29 18:07:02 2009 +0100 configure: Require a new enough flex version. Wine needs a newer flex version than the prediluvian 2.5.4a. --- configure | 17 +++++++++++++++++ configure.ac | 14 ++++++++++++++ 2 files changed, 31 insertions(+), 0 deletions(-) diff --git a/configure b/configure index 3e5f93e..e0ae0d2 100755 --- a/configure +++ b/configure @@ -4214,6 +4214,23 @@ if test "$FLEX" = "none" then as_fn_error "no suitable flex found. Please install the 'flex' package." "$LINENO" 5 fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether flex is recent enough" >&5 +$as_echo_n "checking whether flex is recent enough... " >&6; } +cat >conftest.l <<EOF +%top{ +#include "prediluvian.h" +} +%% +EOF +if $FLEX -t conftest.l >/dev/null 2>&1 +then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + as_fn_error "Your flex version is too old. Please install flex version 2.5.33 or newer." "$LINENO" 5 +fi for ac_prog in bison do diff --git a/configure.ac b/configure.ac index b75d74c..9178306 100644 --- a/configure.ac +++ b/configure.ac @@ -230,6 +230,20 @@ if test "$FLEX" = "none" then AC_MSG_ERROR([no suitable flex found. Please install the 'flex' package.]) fi +AC_MSG_CHECKING([whether flex is recent enough]) +cat >conftest.l <<EOF +%top{ +#include "prediluvian.h" +} +%% +EOF +if $FLEX -t conftest.l >/dev/null 2>&1 +then + AC_MSG_RESULT([yes]) +else + AC_MSG_RESULT([no]) + AC_MSG_ERROR([Your flex version is too old. Please install flex version 2.5.33 or newer.]) +fi dnl Check for bison AC_CHECK_PROGS(BISON,bison,none)

1 0

Michael Stefaniuc : Revert "wrc: Use an EOF rule instead of lex_destroy for compatibility with prediluvian flex versions .".
by Alexandre Julliard 30 Dec '09

30 Dec '09

Module: wine Branch: master Commit: b90a74c724b0e9f13a7590a42af4f5f0217e3ad7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b90a74c724b0e9f13a7590a42… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Dec 29 18:07:22 2009 +0100 Revert "wrc: Use an EOF rule instead of lex_destroy for compatibility with prediluvian flex versions.". This reverts commit 1405c00ecbcf5509c9475759b8230c019070b663. Wine now requires a new enough flex version. --- tools/wrc/parser.h | 1 + tools/wrc/parser.l | 1 - tools/wrc/wrc.c | 1 + 3 files changed, 2 insertions(+), 1 deletions(-) diff --git a/tools/wrc/parser.h b/tools/wrc/parser.h index b9e2045..e9fc8e6 100644 --- a/tools/wrc/parser.h +++ b/tools/wrc/parser.h @@ -34,5 +34,6 @@ extern char *parser_text; extern int yy_flex_debug; int parser_lex(void); +int parser_lex_destroy(void); #endif diff --git a/tools/wrc/parser.l b/tools/wrc/parser.l index 2cb7937..e048665 100644 --- a/tools/wrc/parser.l +++ b/tools/wrc/parser.l @@ -588,7 +588,6 @@ L\" { isprint((unsigned char)*yytext) ? *yytext : '.', *yytext, YY_START); } -<<EOF>> current_codepage = -1; yyterminate(); %% /* These dup functions copy the enclosed '\0' from diff --git a/tools/wrc/wrc.c b/tools/wrc/wrc.c index 7dd91fb..3c7b176 100644 --- a/tools/wrc/wrc.c +++ b/tools/wrc/wrc.c @@ -304,6 +304,7 @@ static int load_file( const char *input_name, const char *output_name ) ret = parser_parse(); fclose(parser_in); + parser_lex_destroy(); if (temp_name) { unlink( temp_name );

1 0

Michael Stefaniuc : Revert "Revert "wpp: config.h and wine/port. h should be included first."".
by Alexandre Julliard 30 Dec '09

30 Dec '09

Module: wine Branch: master Commit: e470475151692bd498124f1d3a7e2fca4be9092a URL: http://source.winehq.org/git/wine.git/?a=commit;h=e470475151692bd498124f1d3… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Dec 29 18:07:44 2009 +0100 Revert "Revert "wpp: config.h and wine/port.h should be included first."". This reverts commit 8e729245412e6b1e24b9871a0252b7e660fd24ec. Wine now requires a new enough flex version. --- libs/wpp/ppl.l | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/libs/wpp/ppl.l b/libs/wpp/ppl.l index 05e7af2..1ce98fb 100644 --- a/libs/wpp/ppl.l +++ b/libs/wpp/ppl.l @@ -121,6 +121,11 @@ * */ +%top{ +#include "config.h" +#include "wine/port.h" +} + /* * Special flex options and exclusive scanner start-conditions */ @@ -156,8 +161,6 @@ cident [a-zA-Z_][0-9a-zA-Z_]* ul [uUlL]|[uUlL][lL]|[lL][uU]|[lL][lL][uU]|[uU][lL][lL]|[lL][uU][lL] %{ -#include "config.h" -#include "wine/port.h" #include <stdio.h> #include <stdlib.h> #include <string.h>

1 0

Rob Shearman : ole32: Release the data object and free the cached enum data upon OleUninitialize .
by Alexandre Julliard 30 Dec '09

30 Dec '09

Module: wine Branch: master Commit: b7d86b54d94a26f3c52d6e9841364bf6b1c48cc7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b7d86b54d94a26f3c52d6e984… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Tue Dec 29 18:59:37 2009 +0000 ole32: Release the data object and free the cached enum data upon OleUninitialize. --- dlls/ole32/clipboard.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/ole32/clipboard.c b/dlls/ole32/clipboard.c index 7f19d16..51e750a 100644 --- a/dlls/ole32/clipboard.c +++ b/dlls/ole32/clipboard.c @@ -1608,6 +1608,8 @@ void OLEClipbrd_UnInitialize(void) } IStream_Release(clipbrd->marshal_data); + if (clipbrd->src_data) IDataObject_Release(clipbrd->src_data); + HeapFree(GetProcessHeap(), 0, clipbrd->cached_enum); HeapFree(GetProcessHeap(), 0, clipbrd); theOleClipboard = NULL; }

1 0

Rob Shearman : ole32: Fix stream reference leak in test_ReadClassStm.
by Alexandre Julliard 30 Dec '09

30 Dec '09

Module: wine Branch: master Commit: 36bfaea96de8854ce112c1e8150912ed18130365 URL: http://source.winehq.org/git/wine.git/?a=commit;h=36bfaea96de8854ce112c1e81… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Tue Dec 29 19:00:22 2009 +0000 ole32: Fix stream reference leak in test_ReadClassStm. --- dlls/ole32/tests/storage32.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/ole32/tests/storage32.c b/dlls/ole32/tests/storage32.c index e8a7ec9..19c1e8f 100644 --- a/dlls/ole32/tests/storage32.c +++ b/dlls/ole32/tests/storage32.c @@ -1593,6 +1593,8 @@ static void test_ReadClassStm(void) hr = ReadClassStm(pStream, &clsid); ok_ole_success(hr, "ReadClassStm"); ok(IsEqualCLSID(&clsid, &test_stg_cls), "clsid should have been set to CLSID_WineTest\n"); + + IStream_Release(pStream); } struct access_res

1 0

Rob Shearman : ole32: Handle SetClipboardData failing in OLE clipboard functions.
by Alexandre Julliard 30 Dec '09

30 Dec '09

Module: wine Branch: master Commit: 88219db8ab809de8ebc031a872f42b4fee7d026e URL: http://source.winehq.org/git/wine.git/?a=commit;h=88219db8ab809de8ebc031a87… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Tue Dec 29 19:00:53 2009 +0000 ole32: Handle SetClipboardData failing in OLE clipboard functions. --- dlls/ole32/clipboard.c | 12 ++++++++++-- 1 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/ole32/clipboard.c b/dlls/ole32/clipboard.c index 51e750a..2afc77e 100644 --- a/dlls/ole32/clipboard.c +++ b/dlls/ole32/clipboard.c @@ -1701,7 +1701,11 @@ static HRESULT set_clipboard_formats(ole_clipbrd *clipbrd, IDataObject *data) td_offs_to_ptr(clipbrd->cached_enum, (DWORD_PTR)clipbrd->cached_enum->entries[idx].fmtetc.ptd); GlobalUnlock(priv_data_handle); - SetClipboardData(ole_private_data_clipboard_format, priv_data_handle); + if(!SetClipboardData(ole_private_data_clipboard_format, priv_data_handle)) + { + GlobalFree(priv_data_handle); + return CLIPBRD_E_CANT_SET; + } return S_OK; } @@ -1759,7 +1763,11 @@ static HRESULT expose_marshalled_dataobject(ole_clipbrd *clipbrd, IDataObject *d if(!h) return E_OUTOFMEMORY; - SetClipboardData(wine_marshal_clipboard_format, h); + if(!SetClipboardData(wine_marshal_clipboard_format, h)) + { + GlobalFree(h); + return CLIPBRD_E_CANT_SET; + } return S_OK; }

1 0

Rob Shearman : shell32: Fix style in autocomplete tests to more match the typical style used in the rest of Wine .
by Alexandre Julliard 30 Dec '09

30 Dec '09

Module: wine Branch: master Commit: 0fd772be996d895ace3bd4d957c1fc487e5cffd0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0fd772be996d895ace3bd4d95… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Tue Dec 29 19:01:29 2009 +0000 shell32: Fix style in autocomplete tests to more match the typical style used in the rest of Wine. --- dlls/shell32/tests/autocomplete.c | 19 ++++++++++++++----- 1 files changed, 14 insertions(+), 5 deletions(-) diff --git a/dlls/shell32/tests/autocomplete.c b/dlls/shell32/tests/autocomplete.c index 20315c7..ab60259 100644 --- a/dlls/shell32/tests/autocomplete.c +++ b/dlls/shell32/tests/autocomplete.c @@ -33,7 +33,8 @@ static HWND hMainWnd, hEdit; static HINSTANCE hinst; static int killfocus_count; -static BOOL test_init(void) { +static BOOL test_init(void) +{ HRESULT r; IAutoComplete* ac; IUnknown *acSource; @@ -64,7 +65,9 @@ static BOOL test_init(void) { return TRUE; } -static void test_killfocus(void) { + +static void test_killfocus(void) +{ /* Test if WM_KILLFOCUS messages are handled properly by checking if * the parent receives an EN_KILLFOCUS message. */ SetFocus(hEdit); @@ -72,7 +75,9 @@ static void test_killfocus(void) { SetFocus(0); ok(killfocus_count == 1, "Expected one EN_KILLFOCUS message, got: %d\n", killfocus_count); } -static LRESULT CALLBACK MyWndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) { + +static LRESULT CALLBACK MyWndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) +{ switch(msg) { case WM_CREATE: /* create edit control */ @@ -87,7 +92,9 @@ static LRESULT CALLBACK MyWndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lPa } return DefWindowProcA(hWnd, msg, wParam, lParam); } -static void createMainWnd(void) { + +static void createMainWnd(void) +{ WNDCLASSA wc; wc.style = CS_HREDRAW | CS_VREDRAW; wc.cbClsExtra = 0; @@ -104,7 +111,9 @@ static void createMainWnd(void) { hMainWnd = CreateWindowExA(0, "MyTestWnd", "Blah", WS_OVERLAPPEDWINDOW, CW_USEDEFAULT, CW_USEDEFAULT, 130, 105, NULL, NULL, GetModuleHandleA(NULL), 0); } -START_TEST(autocomplete) { + +START_TEST(autocomplete) +{ HRESULT r; MSG msg;

1 0

Rob Shearman : shell32: Fix memory leaks in autocomplete tests.
by Alexandre Julliard 30 Dec '09

30 Dec '09

Module: wine Branch: master Commit: 16f4b56345a5928fe8528d3d3305ef7c15284440 URL: http://source.winehq.org/git/wine.git/?a=commit;h=16f4b56345a5928fe8528d3d3… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Tue Dec 29 19:02:16 2009 +0000 shell32: Fix memory leaks in autocomplete tests. --- dlls/shell32/tests/autocomplete.c | 16 +++++++++++----- 1 files changed, 11 insertions(+), 5 deletions(-) diff --git a/dlls/shell32/tests/autocomplete.c b/dlls/shell32/tests/autocomplete.c index ab60259..042e238 100644 --- a/dlls/shell32/tests/autocomplete.c +++ b/dlls/shell32/tests/autocomplete.c @@ -33,7 +33,7 @@ static HWND hMainWnd, hEdit; static HINSTANCE hinst; static int killfocus_count; -static BOOL test_init(void) +static IAutoComplete *test_init(void) { HRESULT r; IAutoComplete* ac; @@ -45,7 +45,7 @@ static BOOL test_init(void) if (r == REGDB_E_CLASSNOTREG) { win_skip("CLSID_AutoComplete is not registered\n"); - return FALSE; + return NULL; } ok(SUCCEEDED(r), "no IID_IAutoComplete (0x%08x)\n", r); @@ -55,7 +55,7 @@ static BOOL test_init(void) if (r == REGDB_E_CLASSNOTREG) { win_skip("CLSID_ACLMulti is not registered\n"); - return FALSE; + return NULL; } ok(SUCCEEDED(r), "no IID_IACList (0x%08x)\n", r); @@ -63,7 +63,9 @@ static BOOL test_init(void) r = IAutoComplete_Init(ac, hEdit, acSource, NULL, NULL); ok(SUCCEEDED(r), "Init failed (0x%08x)\n", r); - return TRUE; + IUnknown_Release(acSource); + + return ac; } static void test_killfocus(void) @@ -116,6 +118,7 @@ START_TEST(autocomplete) { HRESULT r; MSG msg; + IAutoComplete* ac; r = CoInitialize(NULL); ok(SUCCEEDED(r), "CoInitialize failed (0x%08x). Tests aborted.\n", r); @@ -127,7 +130,8 @@ START_TEST(autocomplete) if(!ok(hMainWnd != NULL, "Failed to create parent window. Tests aborted.\n")) return; - if (!test_init()) + ac = test_init(); + if (!ac) goto cleanup; test_killfocus(); @@ -137,6 +141,8 @@ START_TEST(autocomplete) DispatchMessageA(&msg); } + IAutoComplete_Release(ac); + cleanup: DestroyWindow(hEdit); DestroyWindow(hMainWnd);

1 0