January 2007 - Wine-commits

Alexandre Julliard : make_makefiles: Ignore IDL_H_SRCS targets in all directories.
by Alexandre Julliard 23 Jan '07

23 Jan '07

Module: wine Branch: master Commit: 8c8751110934c39f2e47af885e302058bde8e613 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c8751110934c39f2e47af885… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 23 12:17:42 2007 +0100 make_makefiles: Ignore IDL_H_SRCS targets in all directories. --- tools/make_makefiles | 14 ++++++-------- 1 files changed, 6 insertions(+), 8 deletions(-) diff --git a/tools/make_makefiles b/tools/make_makefiles index 84c8cc2..1064bef 100755 --- a/tools/make_makefiles +++ b/tools/make_makefiles @@ -89,6 +89,7 @@ my @ignore_srcs = ( [ 'RC_SRCS', '\.rc', '.res' ], [ 'RC_SRCS16', '\.rc', '.res' ], [ 'IDL_TLB_SRCS', '\.idl', '.tlb' ], + [ 'IDL_H_SRCS', '\.idl', '.h' ], [ 'IDL_C_SRCS', '\.idl', '_c.c' ], [ 'IDL_I_SRCS', '\.idl', '_i.c' ], [ 'IDL_P_SRCS', '\.idl', '_p.c' ], @@ -101,7 +102,7 @@ my (@makefiles, %makefiles); sub update_file($) { my $file = shift; - my $ret = system "cmp $file $file.new >/dev/null"; + my $ret = !(-f $file) || system "cmp $file $file.new >/dev/null"; if (!$ret) { unlink "$file.new"; @@ -317,8 +318,10 @@ sub update_ignores(@) push @list, map { (my $ret = $_) =~ s/$pattern[1]$/$pattern[2]/; $ret; } @{$makefile{$pattern[0]}}; } push @list, @{$makefile{"RC_BINARIES"}} if defined $makefile{"RC_BINARIES"}; - - push @ignores, map { $makefile{"=dir"} . $_; } @list; + foreach my $f (@list) + { + push @ignores, $makefile{"=dir"} . $f unless $f =~ /\$$.*$/; # skip make variables + } } return @ignores; } @@ -382,11 +385,6 @@ sub update_dlls(@) my @list = map { $_ =~ s/\.spec$//; $_ .= ".dll" unless $_ =~ /\./; $_; } @{$makefile{"SPEC_SRCS16"}}; $altnames{$module} = \@list; } - - if (defined $makefile{"IDL_H_SRCS"}) - { - push @ignores, map { $_ =~ s/(.*)\.idl$/dlls\/$dir\/$1.h/; $_; } @{$makefile{"IDL_H_SRCS"}}; - } } # output special dlls configure definitions

1 0

Hwang YunSong(황윤성) : wineconsole: Updated Korean resource .
by Alexandre Julliard 23 Jan '07

23 Jan '07

Module: wine Branch: master Commit: f9663f182883da20394771e4e4357d64e8c0cf9d URL: http://source.winehq.org/git/wine.git/?a=commit;h=f9663f182883da20394771e4e… Author: Hwang YunSong(황윤성) <hys545(a)dreamwiz.com> Date: Mon Jan 22 09:18:19 2007 +0900 wineconsole: Updated Korean resource . --- programs/wineconsole/wineconsole_Ko.rc | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/programs/wineconsole/wineconsole_Ko.rc b/programs/wineconsole/wineconsole_Ko.rc index 76595b3..cad6946 100644 --- a/programs/wineconsole/wineconsole_Ko.rc +++ b/programs/wineconsole/wineconsole_Ko.rc @@ -115,21 +115,21 @@ FONT 8, "MS Shell Dlg" CONTROL "", IDC_CNF_WIN_HEIGHT_UD, "msctls_updown32", UDS_SETBUDDYINT|UDS_ALIGNRIGHT|UDS_AUTOBUDDY|UDS_ARROWKEYS|UDS_NOTHOUSANDS, 0, 0, 0, 0 GROUPBOX "Ǯ�׸�� ", -1, 115, 11, 80, 42, BS_GROUPBOX - AUTOCHECKBOX "�ܼ� �ݱ�(&C)", IDC_CNF_CLOSE_EXIT, 119, 25, 75, 20, WS_TABSTOP + AUTOCHECKBOX "�ܼ� �ݱ�(&C)", IDC_CNF_CLOSE_EXIT, 119, 25, 72, 20, WS_TABSTOP GROUPBOX "��", -1, 115, 55, 80, 42 - COMBOBOX IDC_CNF_EDITION_MODE, 119, 69, 75, 20, CBS_DROPDOWNLIST|WS_VSCROLL|WS_TABSTOP + COMBOBOX IDC_CNF_EDITION_MODE, 119, 69, 72, 20, CBS_DROPDOWNLIST|WS_VSCROLL|WS_TABSTOP } -IDD_SAVE_SETTINGS DIALOG LOADONCALL MOVEABLE DISCARDABLE 20, 20, 140, 60 +IDD_SAVE_SETTINGS DIALOG LOADONCALL MOVEABLE DISCARDABLE 20, 20, 170, 60 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION CAPTION " �ܼ� �Ű��" FONT 8, "MS Shell Dlg" { - GROUPBOX "", -1, 10, 10, 120, 31, BS_GROUPBOX - AUTORADIOBUTTON "�� ", IDC_SAV_SAVE, 14, 15, 110, 10, WS_TABSTOP - AUTORADIOBUTTON "�� Ǹ� ��", IDC_SAV_SESSION, 14, 27, 110, 10, WS_TABSTOP + GROUPBOX "", -1, 10, 10, 150, 31, BS_GROUPBOX + AUTORADIOBUTTON "�� ", IDC_SAV_SAVE, 14, 15, 140, 10, WS_TABSTOP + AUTORADIOBUTTON "�� Ǹ� ��", IDC_SAV_SESSION, 14, 27, 140, 10, WS_TABSTOP - PUSHBUTTON "Ȯ��", IDOK, 20, 45, 35, 12 - PUSHBUTTON "��", IDCANCEL, 65, 45, 35, 12 + PUSHBUTTON "Ȯ��", IDOK, 35, 45, 35, 12 + PUSHBUTTON "��", IDCANCEL, 80, 45, 35, 12 }

1 0

Andrew Talbot : qcap: Declare some items static.
by Alexandre Julliard 23 Jan '07

23 Jan '07

Module: wine Branch: master Commit: 97a22034914a4245d5d955d41491a465b4707385 URL: http://source.winehq.org/git/wine.git/?a=commit;h=97a22034914a4245d5d955d41… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Mon Jan 22 22:30:22 2007 +0000 qcap: Declare some items static. --- dlls/qcap/dllsetup.c | 2 +- dlls/qcap/v4l.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/qcap/dllsetup.c b/dlls/qcap/dllsetup.c index d64b9db..036228a 100644 --- a/dlls/qcap/dllsetup.c +++ b/dlls/qcap/dllsetup.c @@ -57,7 +57,7 @@ static WCHAR const tmodel_both[] = /* * Delete a key and all its subkeys */ -HRESULT DeleteEntireSubKey(HKEY hkey, LPWSTR strSubKey) +static HRESULT DeleteEntireSubKey(HKEY hkey, LPWSTR strSubKey) { WCHAR buffer[MAX_KEY_LEN]; DWORD dw = MAX_KEY_LEN; diff --git a/dlls/qcap/v4l.c b/dlls/qcap/v4l.c index bfc5236..bb8dfb9 100644 --- a/dlls/qcap/v4l.c +++ b/dlls/qcap/v4l.c @@ -136,7 +136,7 @@ static const struct renderlist renderlis { 0, NULL, NULL }, }; -const int fallback_V4l[] = { 4, 5, 7, 8, 9, 13, 15, 14, 16, 11, -1 }; +static const int fallback_V4l[] = { 4, 5, 7, 8, 9, 13, 15, 14, 16, 11, -1 }; /* Fallback: First try raw formats (Should try yuv first perhaps?), then yuv */ /* static const Capture defbox; */

1 0

Rob Shearman : credui: Add stubbed out credui DLL.
by Alexandre Julliard 23 Jan '07

23 Jan '07

Module: wine Branch: master Commit: c82fde405844cb5864267e9d4a03e042b33ba34d URL: http://source.winehq.org/git/wine.git/?a=commit;h=c82fde405844cb5864267e9d4… Author: Rob Shearman <rob(a)codeweavers.com> Date: Mon Jan 22 21:48:51 2007 +0000 credui: Add stubbed out credui DLL. --- Makefile.in | 2 ++ configure | 3 ++- configure.ac | 1 + dlls/Makefile.in | 1 + dlls/credui/Makefile.in | 13 +++++++++++++ dlls/credui/credui.spec | 17 +++++++++++++++++ dlls/credui/credui_main.c | 41 +++++++++++++++++++++++++++++++++++++++++ 7 files changed, 77 insertions(+), 1 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c82fde405844cb5864267…

1 0

Rob Shearman : credui: Implement CredUIPromptForCredentialsW and CredUIConfirmCredentialsW.
by Alexandre Julliard 23 Jan '07

23 Jan '07

Module: wine Branch: master Commit: 9d4b8d33e0658841105fc07cb56110ef5b0a3901 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d4b8d33e0658841105fc07cb… Author: Rob Shearman <rob(a)codeweavers.com> Date: Mon Jan 22 21:50:12 2007 +0000 credui: Implement CredUIPromptForCredentialsW and CredUIConfirmCredentialsW. --- .gitignore | 1 + dlls/credui/Makefile.in | 4 +- dlls/credui/credui.rc | 42 ++++++++++++ dlls/credui/credui.spec | 4 +- dlls/credui/credui_main.c | 139 +++++++++++++++++++++++++++++++++++++++- dlls/credui/credui_resources.h | 23 +++++++ 6 files changed, 209 insertions(+), 4 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9d4b8d33e0658841105fc…

1 0

Rob Shearman : rpcrt4: Try to avoid partial named pipe read/ writes by looping.
by Alexandre Julliard 23 Jan '07

23 Jan '07

Module: wine Branch: master Commit: e6f45145125d99c1ad2d823e57ee752ae202c958 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e6f45145125d99c1ad2d823e5… Author: Rob Shearman <rob(a)codeweavers.com> Date: Mon Jan 22 21:50:24 2007 +0000 rpcrt4: Try to avoid partial named pipe read/writes by looping. --- dlls/rpcrt4/rpc_transport.c | 37 ++++++++++++++++++++++++++++--------- 1 files changed, 28 insertions(+), 9 deletions(-) diff --git a/dlls/rpcrt4/rpc_transport.c b/dlls/rpcrt4/rpc_transport.c index 9c07d7d..2776f63 100644 --- a/dlls/rpcrt4/rpc_transport.c +++ b/dlls/rpcrt4/rpc_transport.c @@ -354,21 +354,40 @@ static int rpcrt4_conn_np_read(RpcConnec void *buffer, unsigned int count) { RpcConnection_np *npc = (RpcConnection_np *) Connection; - DWORD dwRead = 0; - if (!ReadFile(npc->pipe, buffer, count, &dwRead, NULL) && - (GetLastError() != ERROR_MORE_DATA)) - return -1; - return dwRead; + char *buf = buffer; + BOOL ret = TRUE; + unsigned int bytes_left = count; + + while (bytes_left) + { + DWORD bytes_read; + ret = ReadFile(npc->pipe, buf, bytes_left, &bytes_read, NULL); + if (!ret || !bytes_read) + break; + bytes_left -= bytes_read; + buf += bytes_read; + } + return ret ? count : -1; } static int rpcrt4_conn_np_write(RpcConnection *Connection, const void *buffer, unsigned int count) { RpcConnection_np *npc = (RpcConnection_np *) Connection; - DWORD dwWritten = 0; - if (!WriteFile(npc->pipe, buffer, count, &dwWritten, NULL)) - return -1; - return dwWritten; + const char *buf = buffer; + BOOL ret = TRUE; + unsigned int bytes_left = count; + + while (bytes_left) + { + DWORD bytes_written; + ret = WriteFile(npc->pipe, buf, count, &bytes_written, NULL); + if (!ret || !bytes_written) + break; + bytes_left -= bytes_written; + buf += bytes_written; + } + return ret ? count : -1; } static int rpcrt4_conn_np_close(RpcConnection *Connection)

1 0

Rob Shearman : rpcrt4: Make the fixme for an unhandled packet type more useful by printing the code of the unhandled packet type .
by Alexandre Julliard 23 Jan '07

23 Jan '07

Module: wine Branch: master Commit: 9fb15b41055ac746285b50c0e6cd01d1c32f4bda URL: http://source.winehq.org/git/wine.git/?a=commit;h=9fb15b41055ac746285b50c0e… Author: Rob Shearman <rob(a)codeweavers.com> Date: Mon Jan 22 21:50:31 2007 +0000 rpcrt4: Make the fixme for an unhandled packet type more useful by printing the code of the unhandled packet type. --- dlls/rpcrt4/rpc_server.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/rpcrt4/rpc_server.c b/dlls/rpcrt4/rpc_server.c index 84090aa..b8050e8 100644 --- a/dlls/rpcrt4/rpc_server.c +++ b/dlls/rpcrt4/rpc_server.c @@ -287,7 +287,7 @@ static void RPCRT4_process_packet(RpcCon break; default: - FIXME("unhandled packet type\n"); + FIXME("unhandled packet type %u\n", hdr->common.ptype); break; }

1 0

Lei Zhang : comctl32: Fix the updown control test to use the optional flag.
by Alexandre Julliard 23 Jan '07

23 Jan '07

Module: wine Branch: master Commit: 4de56b1b4dc3a741f68f49efd19d157b1084f6c0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4de56b1b4dc3a741f68f49efd… Author: Lei Zhang <thestig(a)google.com> Date: Mon Jan 22 13:20:57 2007 -0800 comctl32: Fix the updown control test to use the optional flag. --- dlls/comctl32/tests/updown.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/tests/updown.c b/dlls/comctl32/tests/updown.c index 9a9c493..7caa0b3 100644 --- a/dlls/comctl32/tests/updown.c +++ b/dlls/comctl32/tests/updown.c @@ -282,6 +282,8 @@ static void ok_sequence_(int sequence_in expected++; actual++; } + else if (expected->flags & optional) + expected++; else if (todo) { failcount++;

1 0

Peter Oberndorfer : user32: Only try to remove the MDI document icon from the frame menu when needed.
by Alexandre Julliard 23 Jan '07

23 Jan '07

Module: wine Branch: master Commit: 127512c938f543d81e524546e561b8bf9945d8e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=127512c938f543d81e524546e… Author: Peter Oberndorfer <kumbayo84(a)arcor.de> Date: Mon Jan 22 20:38:24 2007 +0100 user32: Only try to remove the MDI document icon from the frame menu when needed. --- dlls/user32/mdi.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/user32/mdi.c b/dlls/user32/mdi.c index f8bb8f8..dace1e8 100644 --- a/dlls/user32/mdi.c +++ b/dlls/user32/mdi.c @@ -1518,7 +1518,7 @@ LRESULT WINAPI DefMDIChildProcW( HWND hw /* do not change */ TRACE("current active %p, maximized %p\n", ci->hwndActiveChild, ci->hwndChildMaximized); - if( ci->hwndActiveChild == hwnd && wParam != SIZE_MAXIMIZED ) + if( ci->hwndChildMaximized == hwnd && wParam != SIZE_MAXIMIZED ) { HWND frame;

1 0

Hans Leidekker : snmpapi: Add tests for SnmpUtilVarBind{, List}{Cpy, Free}. Make them pass.
by Alexandre Julliard 23 Jan '07

23 Jan '07

Module: wine Branch: master Commit: 318a71fddb89656d3e8e79a98062ec6cd16d7f40 URL: http://source.winehq.org/git/wine.git/?a=commit;h=318a71fddb89656d3e8e79a98… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Mon Jan 22 15:31:50 2007 +0100 snmpapi: Add tests for SnmpUtilVarBind{, List}{Cpy, Free}. Make them pass. --- dlls/snmpapi/main.c | 8 ++++ dlls/snmpapi/tests/util.c | 79 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 87 insertions(+), 0 deletions(-) diff --git a/dlls/snmpapi/main.c b/dlls/snmpapi/main.c index 24a2da1..539c8e1 100644 --- a/dlls/snmpapi/main.c +++ b/dlls/snmpapi/main.c @@ -417,6 +417,12 @@ INT WINAPI SnmpUtilVarBindListCpy(SnmpVa TRACE("(%p, %p)\n", dst, src); + if (!src) + { + dst->list = NULL; + dst->len = 0; + return SNMPAPI_NOERROR; + } size = src->len * sizeof(SnmpVarBind *); if (!(dst->list = HeapAlloc(GetProcessHeap(), 0, size))) { @@ -456,6 +462,8 @@ void WINAPI SnmpUtilVarBindListFree(Snmp entry = vb->list; for (i = 0; i < vb->len; i++) SnmpUtilVarBindFree(entry++); HeapFree(GetProcessHeap(), 0, vb->list); + vb->list = NULL; + vb->len = 0; } /*********************************************************************** diff --git a/dlls/snmpapi/tests/util.c b/dlls/snmpapi/tests/util.c index f8411d6..c3540fe 100644 --- a/dlls/snmpapi/tests/util.c +++ b/dlls/snmpapi/tests/util.c @@ -347,6 +347,83 @@ static void test_SnmpUtilOidAppend(void) "SnmpUtilOidAppend failed\n"); } +static void test_SnmpUtilVarBindCpyFree(void) +{ + INT ret; + static UINT ids[] = { 1, 3, 6, 1, 4, 1, 311 }; + static SnmpVarBind dst, src = { { 7, ids }, { ASN_INTEGER, { 1 } } }; + + ret = SnmpUtilVarBindCpy(NULL, NULL); + ok(!ret, "SnmpUtilVarBindCpy succeeded\n"); + + memset(&dst, 0, sizeof(SnmpVarBind)); + ret = SnmpUtilVarBindCpy(&dst, NULL); + ok(ret, "SnmpUtilVarBindCpy failed\n"); + ok(dst.name.idLength == 0, "SnmpUtilVarBindCpy failed\n"); + ok(dst.name.ids == NULL, "SnmpUtilVarBindCpy failed\n"); + ok(dst.value.asnType == ASN_NULL, "SnmpUtilVarBindCpy failed\n"); + ok(dst.value.asnValue.number == 0, "SnmpUtilVarBindCpy failed\n"); + + ret = SnmpUtilVarBindCpy(NULL, &src); + ok(!ret, "SnmpUtilVarBindCpy succeeded\n"); + + memset(&dst, 0, sizeof(SnmpVarBind)); + ret = SnmpUtilVarBindCpy(&dst, &src); + ok(ret, "SnmpUtilVarBindCpy failed\n"); + ok(src.name.idLength == dst.name.idLength, "SnmpUtilVarBindCpy failed\n"); + ok(!memcmp(src.name.ids, dst.name.ids, dst.name.idLength * sizeof(UINT)), + "SnmpUtilVarBindCpy failed\n"); + ok(!memcmp(&src.value, &dst.value, sizeof(AsnObjectSyntax)), + "SnmpUtilVarBindCpy failed\n"); + + SnmpUtilVarBindFree(NULL); + SnmpUtilVarBindFree(&dst); + ok(dst.name.idLength == 0, "SnmpUtilVarBindFree failed\n"); + ok(dst.name.ids == NULL, "SnmpUtilVarBindFree failed\n"); + ok(dst.value.asnType == ASN_NULL, "SnmpUtilVarBindFree failed\n"); + ok(dst.value.asnValue.number == 1, "SnmpUtilVarBindFree failed\n"); +} + +static void test_SnmpUtilVarBindListCpyFree(void) +{ + INT ret; + static UINT ids[] = { 1, 3, 6, 1, 4, 1, 311 }; + static SnmpVarBind src = { { 7, ids }, { ASN_INTEGER, { 1 } } }; + static SnmpVarBindList dst_list, src_list = { &src, 1 }; + + if (0) { /* these crash on XP */ + ret = SnmpUtilVarBindListCpy(NULL, NULL); + ok(!ret, "SnmpUtilVarBindCpy succeeded\n"); + + ret = SnmpUtilVarBindListCpy(NULL, &src_list); + ok(!ret, "SnmpUtilVarBindListCpy succeeded\n"); + } + + memset(&dst_list, 0xff, sizeof(SnmpVarBindList)); + ret = SnmpUtilVarBindListCpy(&dst_list, NULL); + ok(ret, "SnmpUtilVarBindListCpy failed\n"); + ok(dst_list.list == NULL, "SnmpUtilVarBindListCpy failed\n"); + ok(dst_list.len == 0, "SnmpUtilVarBindListCpy failed\n"); + + ret = SnmpUtilVarBindListCpy(&dst_list, &src_list); + ok(ret, "SnmpUtilVarBindListCpy failed\n"); + ok(src_list.len == dst_list.len, "SnmpUtilVarBindListCpy failed\n"); + ok(src_list.list->name.idLength == dst_list.list->name.idLength, + "SnmpUtilVarBindListCpy failed\n"); + ok(!memcmp(src_list.list->name.ids, dst_list.list->name.ids, + dst_list.list->name.idLength * sizeof(UINT)), + "SnmpUtilVarBindListCpy failed\n"); + ok(!memcmp(&src_list.list->value, &dst_list.list->value, sizeof(AsnAny)), + "SnmpUtilVarBindListCpy failed\n"); + + if (0) { /* crashes on XP */ + SnmpUtilVarBindListFree(NULL); + } + SnmpUtilVarBindListFree(&dst_list); + ok(dst_list.list == NULL, "SnmpUtilVarBindListFree failed\n"); + ok(dst_list.len == 0, "SnmpUtilVarBindListFree failed\n"); +} + START_TEST(util) { test_SnmpUtilOidToA(); @@ -358,4 +435,6 @@ START_TEST(util) test_SnmpUtilOidCmp(); test_SnmpUtilOidNCmp(); test_SnmpUtilOidAppend(); + test_SnmpUtilVarBindCpyFree(); + test_SnmpUtilVarBindListCpyFree(); }

1 0