wine-commits June 2008

wine-commits@winehq.org

3 participants
944 discussions

Juan Lang : inetmib1: Improve SnmpExtensionInit stub.
by Alexandre Julliard 25 Jun '08

25 Jun '08

Module: wine Branch: master Commit: 46f7f76b1e5bb90e862cc0d12381b53ce494508b URL: http://source.winehq.org/git/wine.git/?a=commit;h=46f7f76b1e5bb90e862cc0d12… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue May 20 20:50:21 2008 -0700 inetmib1: Improve SnmpExtensionInit stub. --- dlls/inetmib1/Makefile.in | 2 +- dlls/inetmib1/main.c | 6 ++++++ dlls/inetmib1/tests/main.c | 1 - 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/inetmib1/Makefile.in b/dlls/inetmib1/Makefile.in index d971e52..cb27cc2 100644 --- a/dlls/inetmib1/Makefile.in +++ b/dlls/inetmib1/Makefile.in @@ -3,7 +3,7 @@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = inetmib1.dll -IMPORTS = kernel32 +IMPORTS = snmpapi kernel32 C_SRCS = \ main.c diff --git a/dlls/inetmib1/main.c b/dlls/inetmib1/main.c index dac5038..7e7450b 100644 --- a/dlls/inetmib1/main.c +++ b/dlls/inetmib1/main.c @@ -47,12 +47,18 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) return TRUE; } +static UINT mib2System[] = { 1,3,6,1,2,1,1 }; + BOOL WINAPI SnmpExtensionInit(DWORD dwUptimeReference, HANDLE *phSubagentTrapEvent, AsnObjectIdentifier *pFirstSupportedRegion) { + AsnObjectIdentifier myOid = DEFINE_OID(mib2System); + FIXME("(%d, %p, %p): stub\n", dwUptimeReference, phSubagentTrapEvent, pFirstSupportedRegion); + *phSubagentTrapEvent = NULL; + SnmpUtilOidCpy(pFirstSupportedRegion, &myOid); return TRUE; } diff --git a/dlls/inetmib1/tests/main.c b/dlls/inetmib1/tests/main.c index a4751dd..b9eac11 100644 --- a/dlls/inetmib1/tests/main.c +++ b/dlls/inetmib1/tests/main.c @@ -45,7 +45,6 @@ static void testInit(void) */ ret = pInit(0, &event, &oid); ok(ret, "SnmpExtensionInit failed: %d\n", GetLastError()); - todo_wine ok(!strcmp("1.3.6.1.2.1.1", SnmpUtilOidToA(&oid)), "Expected 1.3.6.1.2.1.1, got %s\n", SnmpUtilOidToA(&oid)); }

1 0

Juan Lang : inetmib1: Add tests for SnmpExtensionQuery.
by Alexandre Julliard 25 Jun '08

25 Jun '08

Module: wine Branch: master Commit: 68991faf9f6ee6cacf99115981e4c0605225f3da URL: http://source.winehq.org/git/wine.git/?a=commit;h=68991faf9f6ee6cacf9911598… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue May 20 20:49:56 2008 -0700 inetmib1: Add tests for SnmpExtensionQuery. --- dlls/inetmib1/tests/main.c | 103 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 103 insertions(+), 0 deletions(-) diff --git a/dlls/inetmib1/tests/main.c b/dlls/inetmib1/tests/main.c index 80c763d..a4751dd 100644 --- a/dlls/inetmib1/tests/main.c +++ b/dlls/inetmib1/tests/main.c @@ -50,8 +50,111 @@ static void testInit(void) "Expected 1.3.6.1.2.1.1, got %s\n", SnmpUtilOidToA(&oid)); } +static void testQuery(void) +{ + BOOL (WINAPI *pQuery)(BYTE, SnmpVarBindList *, AsnInteger32 *, + AsnInteger32 *); + BOOL ret, moreData; + SnmpVarBindList list; + AsnInteger32 error, index; + UINT bogus[] = { 1,2,3,4 }; + UINT mib2System[] = { 1,3,6,1,2,1,1 }; + UINT mib2If[] = { 1,3,6,1,2,1,2 }; + UINT mib2IfTable[] = { 1,3,6,1,2,1,2,2 }; + SnmpVarBind vars[3], vars2[3]; + + pQuery = (void *)GetProcAddress(inetmib1, "SnmpExtensionQuery"); + if (!pQuery) + { + skip("couldn't find SnmpExtensionQuery\n"); + return; + } + /* Crash + ret = pQuery(0, NULL, NULL, NULL); + ret = pQuery(0, NULL, &error, NULL); + ret = pQuery(0, NULL, NULL, &index); + ret = pQuery(0, &list, NULL, NULL); + ret = pQuery(0, &list, &error, NULL); + */ + + /* An empty list succeeds */ + list.len = 0; + error = 0xdeadbeef; + index = 0xdeadbeef; + ret = pQuery(SNMP_PDU_GET, &list, &error, &index); + todo_wine { + ok(ret, "SnmpExtensionQuery failed: %d\n", GetLastError()); + ok(error == SNMP_ERRORSTATUS_NOERROR, + "expected SNMP_ERRORSTATUS_NOERROR, got %d\n", error); + ok(index == 0, "expected index 0, got %d\n", index); + } + + /* Oddly enough, this "succeeds," even though the OID is clearly + * unsupported. + */ + vars[0].name.idLength = sizeof(bogus) / sizeof(bogus[0]); + vars[0].name.ids = bogus; + vars[0].value.asnType = 0; + list.len = 1; + list.list = vars; + SetLastError(0xdeadbeef); + error = 0xdeadbeef; + index = 0xdeadbeef; + ret = pQuery(SNMP_PDU_GET, &list, &error, &index); + todo_wine { + ok(ret, "SnmpExtensionQuery failed: %d\n", GetLastError()); + ok(error == SNMP_ERRORSTATUS_NOERROR, + "expected SNMP_ERRORSTATUS_NOERROR, got %d\n", error); + ok(index == 0, "expected index 0, got %d\n", index); + } + /* The OID isn't changed either: */ + ok(!strcmp("1.2.3.4", SnmpUtilOidToA(&vars[0].name)), + "expected 1.2.3.4, got %s\n", SnmpUtilOidToA(&vars[0].name)); + + /* The table is not an accessible variable, so it fails */ + vars[0].name.idLength = sizeof(mib2IfTable) / sizeof(mib2IfTable[0]); + vars[0].name.ids = mib2IfTable; + SetLastError(0xdeadbeef); + error = 0xdeadbeef; + index = 0xdeadbeef; + ret = pQuery(SNMP_PDU_GET, &list, &error, &index); + todo_wine { + ok(ret, "SnmpExtensionQuery failed: %d\n", GetLastError()); + ok(error == SNMP_ERRORSTATUS_NOSUCHNAME, + "expected SNMP_ERRORSTATUS_NOSUCHNAME, got %d\n", error); + /* The index is 1-based rather than 0-based */ + ok(index == 1, "expected index 1, got %d\n", index); + } + + /* Even though SnmpExtensionInit says this DLL supports the MIB2 system + * variables, the first variable it returns a value for is the first + * interface. + */ + vars[0].name.idLength = sizeof(mib2System) / sizeof(mib2System[0]); + vars[0].name.ids = mib2System; + SnmpUtilOidCpy(&vars2[0].name, &vars[0].name); + vars2[0].value.asnType = 0; + list.len = 1; + list.list = vars2; + moreData = TRUE; + ret = pQuery(SNMP_PDU_GETNEXT, &list, &error, &index); + todo_wine { + ok(ret, "SnmpExtensionQuery failed: %d\n", GetLastError()); + ok(error == SNMP_ERRORSTATUS_NOERROR, + "expected SNMP_ERRORSTATUS_NOERROR, got %d\n", error); + ok(index == 0, "expected index 0, got %d\n", index); + } + vars[0].name.idLength = sizeof(mib2If) / sizeof(mib2If[0]); + vars[0].name.ids = mib2If; + todo_wine + ok(!SnmpUtilOidNCmp(&vars2[0].name, &vars[0].name, vars[0].name.idLength), + "expected 1.3.6.1.2.1.2, got %s\n", SnmpUtilOidToA(&vars2[0].name)); + SnmpUtilVarBindFree(&vars2[0]); +} + START_TEST(main) { inetmib1 = LoadLibraryA("inetmib1"); testInit(); + testQuery(); }

1 0

Juan Lang : inetmib1: Add stub for SnmpExtensionQuery.
by Alexandre Julliard 25 Jun '08

25 Jun '08

Module: wine Branch: master Commit: f451fefc6c5bf437ffe9d7b44d5c40e4bb69d422 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f451fefc6c5bf437ffe9d7b44… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue May 20 20:49:04 2008 -0700 inetmib1: Add stub for SnmpExtensionQuery. --- dlls/inetmib1/inetmib1.spec | 2 +- dlls/inetmib1/main.c | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletions(-) diff --git a/dlls/inetmib1/inetmib1.spec b/dlls/inetmib1/inetmib1.spec index e830e00..dc7b491 100644 --- a/dlls/inetmib1/inetmib1.spec +++ b/dlls/inetmib1/inetmib1.spec @@ -1,4 +1,4 @@ @ stdcall SnmpExtensionInit(long ptr ptr) @ stub SnmpExtensionInitEx -@ stub SnmpExtensionQuery +@ stdcall SnmpExtensionQuery(long ptr ptr ptr) @ stub SnmpExtensionTrap diff --git a/dlls/inetmib1/main.c b/dlls/inetmib1/main.c index 5acc864..dac5038 100644 --- a/dlls/inetmib1/main.c +++ b/dlls/inetmib1/main.c @@ -55,3 +55,11 @@ BOOL WINAPI SnmpExtensionInit(DWORD dwUptimeReference, *phSubagentTrapEvent = NULL; return TRUE; } + +BOOL WINAPI SnmpExtensionQuery(BYTE bPduType, SnmpVarBindList *pVarBindList, + AsnInteger32 *pErrorStatus, AsnInteger32 *pErrorIndex) +{ + FIXME("(0x%02x, %p, %p, %p): stub\n", bPduType, pVarBindList, + pErrorStatus, pErrorIndex); + return FALSE; +}

1 0

Juan Lang : inetmib1: Add tests for SnmpExtensionInit.
by Alexandre Julliard 25 Jun '08

25 Jun '08

Module: wine Branch: master Commit: cca77db0a6bdd2e88b84a8365a042eb7e79cc951 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cca77db0a6bdd2e88b84a8365… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue May 20 20:48:37 2008 -0700 inetmib1: Add tests for SnmpExtensionInit. --- .gitignore | 4 +++ Makefile.in | 2 + configure | 3 ++ configure.ac | 1 + dlls/Makefile.in | 1 + dlls/inetmib1/tests/Makefile.in | 13 +++++++++ dlls/inetmib1/tests/main.c | 57 +++++++++++++++++++++++++++++++++++++++ programs/winetest/Makefile.in | 3 ++ programs/winetest/winetest.rc | 1 + 9 files changed, 85 insertions(+), 0 deletions(-) diff --git a/.gitignore b/.gitignore index 36c5849..d546c2e 100644 --- a/.gitignore +++ b/.gitignore @@ -158,6 +158,9 @@ dlls/inetcomm/libinetcomm.def dlls/inetcomm/tests/*.ok dlls/inetcomm/tests/inetcomm_crosstest.exe dlls/inetcomm/tests/testlist.c +dlls/inetmib1/tests/*.ok +dlls/inetmib1/tests/inetmib1_crosstest.exe +dlls/inetmib1/tests/testlist.c dlls/infosoft/tests/*.ok dlls/infosoft/tests/infosoft_crosstest.exe dlls/infosoft/tests/testlist.c @@ -642,6 +645,7 @@ programs/winetest/gdiplus_test.exe programs/winetest/hlink_test.exe programs/winetest/imm32_test.exe programs/winetest/inetcomm_test.exe +programs/winetest/inetmib1_test.exe programs/winetest/infosoft_test.exe programs/winetest/iphlpapi_test.exe programs/winetest/itss_test.exe diff --git a/Makefile.in b/Makefile.in index 7d253fb..f2dbcfc 100644 --- a/Makefile.in +++ b/Makefile.in @@ -292,6 +292,7 @@ ALL_MAKEFILES = \ dlls/inetcomm/Makefile \ dlls/inetcomm/tests/Makefile \ dlls/inetmib1/Makefile \ + dlls/inetmib1/tests/Makefile \ dlls/infosoft/Makefile \ dlls/infosoft/tests/Makefile \ dlls/initpki/Makefile \ @@ -719,6 +720,7 @@ dlls/imm32/tests/Makefile: dlls/imm32/tests/Makefile.in dlls/Maketest.rules dlls/inetcomm/Makefile: dlls/inetcomm/Makefile.in dlls/Makedll.rules dlls/inetcomm/tests/Makefile: dlls/inetcomm/tests/Makefile.in dlls/Maketest.rules dlls/inetmib1/Makefile: dlls/inetmib1/Makefile.in dlls/Makedll.rules +dlls/inetmib1/tests/Makefile: dlls/inetmib1/tests/Makefile.in dlls/Maketest.rules dlls/infosoft/Makefile: dlls/infosoft/Makefile.in dlls/Makedll.rules dlls/infosoft/tests/Makefile: dlls/infosoft/tests/Makefile.in dlls/Maketest.rules dlls/initpki/Makefile: dlls/initpki/Makefile.in dlls/Makedll.rules diff --git a/configure b/configure index 4b5989c..e855076 100755 --- a/configure +++ b/configure @@ -21782,6 +21782,8 @@ ac_config_files="$ac_config_files dlls/inetcomm/tests/Makefile" ac_config_files="$ac_config_files dlls/inetmib1/Makefile" +ac_config_files="$ac_config_files dlls/inetmib1/tests/Makefile" + ac_config_files="$ac_config_files dlls/infosoft/Makefile" ac_config_files="$ac_config_files dlls/infosoft/tests/Makefile" @@ -23046,6 +23048,7 @@ do "dlls/inetcomm/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/inetcomm/Makefile" ;; "dlls/inetcomm/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/inetcomm/tests/Makefile" ;; "dlls/inetmib1/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/inetmib1/Makefile" ;; + "dlls/inetmib1/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/inetmib1/tests/Makefile" ;; "dlls/infosoft/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/infosoft/Makefile" ;; "dlls/infosoft/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/infosoft/tests/Makefile" ;; "dlls/initpki/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/initpki/Makefile" ;; diff --git a/configure.ac b/configure.ac index 4810dc3..77287de 100644 --- a/configure.ac +++ b/configure.ac @@ -1804,6 +1804,7 @@ AC_CONFIG_FILES([dlls/imm32/tests/Makefile]) AC_CONFIG_FILES([dlls/inetcomm/Makefile]) AC_CONFIG_FILES([dlls/inetcomm/tests/Makefile]) AC_CONFIG_FILES([dlls/inetmib1/Makefile]) +AC_CONFIG_FILES([dlls/inetmib1/tests/Makefile]) AC_CONFIG_FILES([dlls/infosoft/Makefile]) AC_CONFIG_FILES([dlls/infosoft/tests/Makefile]) AC_CONFIG_FILES([dlls/initpki/Makefile]) diff --git a/dlls/Makefile.in b/dlls/Makefile.in index 4cb06a8..9470561 100644 --- a/dlls/Makefile.in +++ b/dlls/Makefile.in @@ -311,6 +311,7 @@ TESTSUBDIRS = \ hlink/tests \ imm32/tests \ inetcomm/tests \ + inetmib1/tests \ infosoft/tests \ iphlpapi/tests \ itss/tests \ diff --git a/dlls/inetmib1/tests/Makefile.in b/dlls/inetmib1/tests/Makefile.in new file mode 100644 index 0000000..bd6f144 --- /dev/null +++ b/dlls/inetmib1/tests/Makefile.in @@ -0,0 +1,13 @@ +TOPSRCDIR = @top_srcdir@ +TOPOBJDIR = ../../.. +SRCDIR = @srcdir@ +VPATH = @srcdir@ +TESTDLL = inetmib1.dll +IMPORTS = snmpapi kernel32 + +CTESTS = \ + main.c + +@MAKE_TEST_RULES@ + +@DEPENDENCIES@ # everything below this line is overwritten by make depend diff --git a/dlls/inetmib1/tests/main.c b/dlls/inetmib1/tests/main.c new file mode 100644 index 0000000..80c763d --- /dev/null +++ b/dlls/inetmib1/tests/main.c @@ -0,0 +1,57 @@ +/* + * Copyright 2008 Juan Lang + * + * 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 <stdio.h> +#include <stdarg.h> +#include <windef.h> +#include <winbase.h> +#include <snmp.h> + +#include "wine/test.h" + +static HMODULE inetmib1; + +static void testInit(void) +{ + BOOL (WINAPI *pInit)(DWORD, HANDLE *, AsnObjectIdentifier *); + BOOL ret; + HANDLE event; + AsnObjectIdentifier oid; + + pInit = (void *)GetProcAddress(inetmib1, "SnmpExtensionInit"); + if (!pInit) + { + skip("no SnmpExtensionInit\n"); + return; + } + /* Crash + ret = pInit(0, NULL, NULL); + ret = pInit(0, NULL, &oid); + ret = pInit(0, &event, NULL); + */ + ret = pInit(0, &event, &oid); + ok(ret, "SnmpExtensionInit failed: %d\n", GetLastError()); + todo_wine + ok(!strcmp("1.3.6.1.2.1.1", SnmpUtilOidToA(&oid)), + "Expected 1.3.6.1.2.1.1, got %s\n", SnmpUtilOidToA(&oid)); +} + +START_TEST(main) +{ + inetmib1 = LoadLibraryA("inetmib1"); + testInit(); +} diff --git a/programs/winetest/Makefile.in b/programs/winetest/Makefile.in index e7c6fb6..89e0f5d 100644 --- a/programs/winetest/Makefile.in +++ b/programs/winetest/Makefile.in @@ -50,6 +50,7 @@ TESTBINS = \ hlink_test.exe \ imm32_test.exe \ inetcomm_test.exe \ + inetmib1_test.exe \ infosoft_test.exe \ iphlpapi_test.exe \ itss_test.exe \ @@ -157,6 +158,8 @@ imm32_test.exe: $(DLLDIR)/imm32/tests/imm32_test.exe$(DLLEXT) cp $(DLLDIR)/imm32/tests/imm32_test.exe$(DLLEXT) $@ && $(STRIP) $@ inetcomm_test.exe: $(DLLDIR)/inetcomm/tests/inetcomm_test.exe$(DLLEXT) cp $(DLLDIR)/inetcomm/tests/inetcomm_test.exe$(DLLEXT) $@ && $(STRIP) $@ +inetmib1_test.exe: $(DLLDIR)/inetmib1/tests/inetmib1_test.exe$(DLLEXT) + cp $(DLLDIR)/inetmib1/tests/inetmib1_test.exe$(DLLEXT) $@ && $(STRIP) $@ infosoft_test.exe: $(DLLDIR)/infosoft/tests/infosoft_test.exe$(DLLEXT) cp $(DLLDIR)/infosoft/tests/infosoft_test.exe$(DLLEXT) $@ && $(STRIP) $@ iphlpapi_test.exe: $(DLLDIR)/iphlpapi/tests/iphlpapi_test.exe$(DLLEXT) diff --git a/programs/winetest/winetest.rc b/programs/winetest/winetest.rc index 05b28c3..5c78c8f 100644 --- a/programs/winetest/winetest.rc +++ b/programs/winetest/winetest.rc @@ -111,6 +111,7 @@ gdiplus_test.exe TESTRES "gdiplus_test.exe" hlink_test.exe TESTRES "hlink_test.exe" imm32_test.exe TESTRES "imm32_test.exe" inetcomm_test.exe TESTRES "inetcomm_test.exe" +inetmib1_test.exe TESTRES "inetmib1_test.exe" infosoft_test.exe TESTRES "infosoft_test.exe" iphlpapi_test.exe TESTRES "iphlpapi_test.exe" itss_test.exe TESTRES "itss_test.exe"

1 0

Juan Lang : inetmib1: Add stub for SnmpExtensionInit.
by Alexandre Julliard 25 Jun '08

25 Jun '08

Module: wine Branch: master Commit: 2cc8b7e5ce11e966031d011ae20167af5b83a160 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2cc8b7e5ce11e966031d011ae… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue May 20 20:47:58 2008 -0700 inetmib1: Add stub for SnmpExtensionInit. --- dlls/inetmib1/inetmib1.spec | 2 +- dlls/inetmib1/main.c | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletions(-) diff --git a/dlls/inetmib1/inetmib1.spec b/dlls/inetmib1/inetmib1.spec index 7aecc25..e830e00 100644 --- a/dlls/inetmib1/inetmib1.spec +++ b/dlls/inetmib1/inetmib1.spec @@ -1,4 +1,4 @@ -@ stub SnmpExtensionInit +@ stdcall SnmpExtensionInit(long ptr ptr) @ stub SnmpExtensionInitEx @ stub SnmpExtensionQuery @ stub SnmpExtensionTrap diff --git a/dlls/inetmib1/main.c b/dlls/inetmib1/main.c index 0da258d..5acc864 100644 --- a/dlls/inetmib1/main.c +++ b/dlls/inetmib1/main.c @@ -22,6 +22,7 @@ #include "windef.h" #include "winbase.h" +#include "snmp.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(inetmib1); @@ -45,3 +46,12 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) return TRUE; } + +BOOL WINAPI SnmpExtensionInit(DWORD dwUptimeReference, + HANDLE *phSubagentTrapEvent, AsnObjectIdentifier *pFirstSupportedRegion) +{ + FIXME("(%d, %p, %p): stub\n", dwUptimeReference, phSubagentTrapEvent, + pFirstSupportedRegion); + *phSubagentTrapEvent = NULL; + return TRUE; +}

1 0

Juan Lang : inetmib1: Add stub dll.
by Alexandre Julliard 25 Jun '08

25 Jun '08

Module: wine Branch: master Commit: 1723157954057a471cb817177f30ff76da4e3034 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1723157954057a471cb817177… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue May 20 20:47:42 2008 -0700 inetmib1: Add stub dll. --- Makefile.in | 2 + configure | 3 ++ configure.ac | 1 + dlls/Makefile.in | 1 + dlls/inetmib1/Makefile.in | 13 +++++++++++ dlls/inetmib1/inetmib1.spec | 4 +++ dlls/inetmib1/main.c | 47 +++++++++++++++++++++++++++++++++++++++++++ 7 files changed, 71 insertions(+), 0 deletions(-) diff --git a/Makefile.in b/Makefile.in index de131bd..7d253fb 100644 --- a/Makefile.in +++ b/Makefile.in @@ -291,6 +291,7 @@ ALL_MAKEFILES = \ dlls/imm32/tests/Makefile \ dlls/inetcomm/Makefile \ dlls/inetcomm/tests/Makefile \ + dlls/inetmib1/Makefile \ dlls/infosoft/Makefile \ dlls/infosoft/tests/Makefile \ dlls/initpki/Makefile \ @@ -717,6 +718,7 @@ dlls/imm32/Makefile: dlls/imm32/Makefile.in dlls/Makedll.rules dlls/imm32/tests/Makefile: dlls/imm32/tests/Makefile.in dlls/Maketest.rules dlls/inetcomm/Makefile: dlls/inetcomm/Makefile.in dlls/Makedll.rules dlls/inetcomm/tests/Makefile: dlls/inetcomm/tests/Makefile.in dlls/Maketest.rules +dlls/inetmib1/Makefile: dlls/inetmib1/Makefile.in dlls/Makedll.rules dlls/infosoft/Makefile: dlls/infosoft/Makefile.in dlls/Makedll.rules dlls/infosoft/tests/Makefile: dlls/infosoft/tests/Makefile.in dlls/Maketest.rules dlls/initpki/Makefile: dlls/initpki/Makefile.in dlls/Makedll.rules diff --git a/configure b/configure index 7e12e7b..4b5989c 100755 --- a/configure +++ b/configure @@ -21780,6 +21780,8 @@ ac_config_files="$ac_config_files dlls/inetcomm/Makefile" ac_config_files="$ac_config_files dlls/inetcomm/tests/Makefile" +ac_config_files="$ac_config_files dlls/inetmib1/Makefile" + ac_config_files="$ac_config_files dlls/infosoft/Makefile" ac_config_files="$ac_config_files dlls/infosoft/tests/Makefile" @@ -23043,6 +23045,7 @@ do "dlls/imm32/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/imm32/tests/Makefile" ;; "dlls/inetcomm/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/inetcomm/Makefile" ;; "dlls/inetcomm/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/inetcomm/tests/Makefile" ;; + "dlls/inetmib1/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/inetmib1/Makefile" ;; "dlls/infosoft/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/infosoft/Makefile" ;; "dlls/infosoft/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/infosoft/tests/Makefile" ;; "dlls/initpki/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/initpki/Makefile" ;; diff --git a/configure.ac b/configure.ac index 8bbb9d5..4810dc3 100644 --- a/configure.ac +++ b/configure.ac @@ -1803,6 +1803,7 @@ AC_CONFIG_FILES([dlls/imm32/Makefile]) AC_CONFIG_FILES([dlls/imm32/tests/Makefile]) AC_CONFIG_FILES([dlls/inetcomm/Makefile]) AC_CONFIG_FILES([dlls/inetcomm/tests/Makefile]) +AC_CONFIG_FILES([dlls/inetmib1/Makefile]) AC_CONFIG_FILES([dlls/infosoft/Makefile]) AC_CONFIG_FILES([dlls/infosoft/tests/Makefile]) AC_CONFIG_FILES([dlls/initpki/Makefile]) diff --git a/dlls/Makefile.in b/dlls/Makefile.in index 155db3b..4cb06a8 100644 --- a/dlls/Makefile.in +++ b/dlls/Makefile.in @@ -113,6 +113,7 @@ BASEDIRS = \ imagehlp \ imm32 \ inetcomm \ + inetmib1 \ infosoft \ initpki \ inkobj \ diff --git a/dlls/inetmib1/Makefile.in b/dlls/inetmib1/Makefile.in new file mode 100644 index 0000000..d971e52 --- /dev/null +++ b/dlls/inetmib1/Makefile.in @@ -0,0 +1,13 @@ +TOPSRCDIR = @top_srcdir@ +TOPOBJDIR = ../.. +SRCDIR = @srcdir@ +VPATH = @srcdir@ +MODULE = inetmib1.dll +IMPORTS = kernel32 + +C_SRCS = \ + main.c + +@MAKE_DLL_RULES@ + +@DEPENDENCIES@ # everything below this line is overwritten by make depend diff --git a/dlls/inetmib1/inetmib1.spec b/dlls/inetmib1/inetmib1.spec new file mode 100644 index 0000000..7aecc25 --- /dev/null +++ b/dlls/inetmib1/inetmib1.spec @@ -0,0 +1,4 @@ +@ stub SnmpExtensionInit +@ stub SnmpExtensionInitEx +@ stub SnmpExtensionQuery +@ stub SnmpExtensionTrap diff --git a/dlls/inetmib1/main.c b/dlls/inetmib1/main.c new file mode 100644 index 0000000..0da258d --- /dev/null +++ b/dlls/inetmib1/main.c @@ -0,0 +1,47 @@ +/* + * Copyright 2008 Juan Lang + * + * 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 <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(inetmib1); + +BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) +{ + TRACE("(0x%p, %d, %p)\n", hinstDLL, fdwReason, lpvReserved); + + switch (fdwReason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(hinstDLL); + break; + case DLL_PROCESS_DETACH: + break; + default: + break; + } + + return TRUE; +}

1 0

Dylan Smith : winemine: Increased buffer size for player names.
by Alexandre Julliard 25 Jun '08

25 Jun '08

Module: wine Branch: master Commit: b599f89abefc01cb474f00b574c2533feb3f8886 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b599f89abefc01cb474f00b57… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Tue Jun 24 14:09:54 2008 -0400 winemine: Increased buffer size for player names. Player names can be 31 characters long in Windows, so winemine should now be able to read any of the player names in the registry created from the minesweeper in the native Windows. --- programs/winemine/README | 3 --- programs/winemine/main.c | 6 +++--- programs/winemine/main.h | 4 +++- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/programs/winemine/README b/programs/winemine/README index e364935..711b5f9 100644 --- a/programs/winemine/README +++ b/programs/winemine/README @@ -8,9 +8,6 @@ This is minesweeper for wine... Enjoy. I wrote it because it rhymes ;). KNOWN BUGS: - Chokes on fastest times names greater than 16 characters long, must have - something to do with GetDlgItemText. - No help file. Starting a new game causes the window to drop one pixel (Peter Hunnisett) diff --git a/programs/winemine/main.c b/programs/winemine/main.c index 13311c7..a8ea08e 100644 --- a/programs/winemine/main.c +++ b/programs/winemine/main.c @@ -277,7 +277,7 @@ void LoadBoard( BOARD *p_board ) DWORD size; DWORD type; HKEY hkey; - char data[16]; + char data[MAX_PLAYER_NAME_SIZE+1]; char key_name[8]; unsigned i; @@ -327,7 +327,7 @@ void LoadBoard( BOARD *p_board ) (LPDWORD) &size ) == ERROR_SUCCESS ) lstrcpynA( p_board->best_name[i], data, sizeof(p_board->best_name[i]) ); else - LoadString( p_board->hInst, IDS_NOBODY, p_board->best_name[i], 16 ); + LoadString( p_board->hInst, IDS_NOBODY, p_board->best_name[i], MAX_PLAYER_NAME_SIZE+1 ); } for( i = 0; i < 3; i++ ) { @@ -345,7 +345,7 @@ void SaveBoard( BOARD *p_board ) { HKEY hkey; unsigned i; - char data[16]; + char data[MAX_PLAYER_NAME_SIZE+1]; char key_name[8]; if( RegCreateKeyEx( HKEY_CURRENT_USER, registry_key, diff --git a/programs/winemine/main.h b/programs/winemine/main.h index 16fcb2e..a813c95 100644 --- a/programs/winemine/main.h +++ b/programs/winemine/main.h @@ -45,6 +45,8 @@ #define FACE_WIDTH 24 #define FACE_HEIGHT 24 +#define MAX_PLAYER_NAME_SIZE 31 + typedef enum { SPRESS_BMP, COOL_BMP, DEAD_BMP, OOH_BMP, SMILE_BMP } FACE_BMP; typedef enum { WAITING, PLAYING, GAMEOVER, WON } GAME_STATUS; @@ -84,7 +86,7 @@ typedef struct tagBOARD unsigned rows; unsigned cols; unsigned mines; - char best_name [3][16]; + char best_name [3][MAX_PLAYER_NAME_SIZE+1]; DWORD best_time [3]; DIFFICULTY difficulty;

1 0

Dylan Smith : winemine: The number of mines should be visible before first choice.
by Alexandre Julliard 25 Jun '08

25 Jun '08

Module: wine Branch: master Commit: beccf3758692cb48b7ac8bc30265ae36d0e50771 URL: http://source.winehq.org/git/wine.git/?a=commit;h=beccf3758692cb48b7ac8bc30… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Tue Jun 24 14:09:50 2008 -0400 winemine: The number of mines should be visible before first choice. There were a few lines of code that I removed that explicitly kept the number of mines and the timer unlit before the game started. This isn't consistent with Windows, so I don't know what the purpose was for doing this. In fact, it prevents the number of mines from being shown ahead of time, which is useful information. --- programs/winemine/main.c | 5 ----- 1 files changed, 0 insertions(+), 5 deletions(-) diff --git a/programs/winemine/main.c b/programs/winemine/main.c index 6c90519..13311c7 100644 --- a/programs/winemine/main.c +++ b/programs/winemine/main.c @@ -704,11 +704,6 @@ void DrawLeds( HDC hdc, HDC hMemDC, BOARD *p_board, int number, int x, int y ) led[i] = 10; } - /* use unlit led if not playing */ - if( p_board->status == WAITING ) - for( i = 0; i < 3; i++ ) - led[i] = 11; - hOldObj = SelectObject (hMemDC, p_board->hLedsBMP); for( i = 0; i < 3; i++ ) {

1 0

Dylan Smith : winemine: Middle click drag should move the box highlighting.
by Alexandre Julliard 25 Jun '08

25 Jun '08

Module: wine Branch: master Commit: 273080af7d881fa0d1d965e4814c358384031725 URL: http://source.winehq.org/git/wine.git/?a=commit;h=273080af7d881fa0d1d965e48… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Tue Jun 24 14:09:46 2008 -0400 winemine: Middle click drag should move the box highlighting. The correct behaviour was intended, but the wrong check was made for wParam on the WM_MOUSEMOVE event. --- programs/winemine/main.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/winemine/main.c b/programs/winemine/main.c index 2d17536..6c90519 100644 --- a/programs/winemine/main.c +++ b/programs/winemine/main.c @@ -176,7 +176,7 @@ LRESULT WINAPI MainProc( HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) case WM_MOUSEMOVE: { - if( (wParam & MK_LBUTTON) && (wParam & MK_RBUTTON) ) { + if( wParam & MK_MBUTTON ) { msg = WM_MBUTTONDOWN; } else if( wParam & MK_LBUTTON ) {

1 0

Dylan Smith : winemine: Set mines after first choice.
by Alexandre Julliard 25 Jun '08

25 Jun '08

Module: wine Branch: master Commit: 04f925e72ce4c87dbdf503072dd58e4e444d3760 URL: http://source.winehq.org/git/wine.git/?a=commit;h=04f925e72ce4c87dbdf503072… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Tue Jun 24 14:09:42 2008 -0400 winemine: Set mines after first choice. The first choice never is on a mine in Windows. This can be tested by making a custom game with as many mines as possible, and then playing the start of many games, and the first choice will never be on a mine. This is done to make the game reasonable, since after the first choice there will at least be some information given to make the next choice. --- programs/winemine/main.c | 46 +++++++++++++++++++++++++++------------------- programs/winemine/main.h | 2 +- 2 files changed, 28 insertions(+), 20 deletions(-) diff --git a/programs/winemine/main.c b/programs/winemine/main.c index f4a48d0..2d17536 100644 --- a/programs/winemine/main.c +++ b/programs/winemine/main.c @@ -452,13 +452,24 @@ static void MoveOnScreen(RECT* rect) void CreateBoard( BOARD *p_board ) { int left, top, bottom, right; + unsigned col, row; RECT wnd_rect; p_board->mb = MB_NONE; p_board->boxes_left = p_board->cols * p_board->rows - p_board->mines; p_board->num_flags = 0; - CreateBoxes( p_board ); + /* Create the boxes... + * We actually create them with an empty border, + * so special care doesn't have to be taken on the edges + */ + for( col = 0; col <= p_board->cols + 1; col++ ) + for( row = 0; row <= p_board->rows + 1; row++ ) { + p_board->box[col][row].IsPressed = FALSE; + p_board->box[col][row].IsMine = FALSE; + p_board->box[col][row].FlagType = NORMAL; + p_board->box[col][row].NumMines = 0; + } p_board->width = p_board->cols * MINE_WIDTH + BOARD_WMARGIN * 2; @@ -531,30 +542,21 @@ void CheckLevel( BOARD *p_board ) if( p_board->mines < BEGINNER_MINES ) p_board->mines = BEGINNER_MINES; - if( p_board->mines > p_board->cols * p_board->rows - 1 ) - p_board->mines = p_board->cols * p_board->rows - 1; + if( p_board->mines > p_board->cols * p_board->rows - 2 ) + p_board->mines = p_board->cols * p_board->rows - 2; } - -void CreateBoxes( BOARD *p_board ) +/* Randomly places mines everywhere except the selected box. */ +void PlaceMines ( BOARD *p_board, int selected_col, int selected_row ) { int i, j; unsigned col, row; srand( (unsigned) time( NULL ) ); - /* Create the boxes... - * We actually create them with an empty border, - * so special care doesn't have to be taken on the edges - */ - - for( col = 0; col <= p_board->cols + 1; col++ ) - for( row = 0; row <= p_board->rows + 1; row++ ) { - p_board->box[col][row].IsPressed = FALSE; - p_board->box[col][row].IsMine = FALSE; - p_board->box[col][row].FlagType = NORMAL; - p_board->box[col][row].NumMines = 0; - } + /* Temporarily place a mine at the selected box until all the other + * mines are placed, this avoids checking in the mine creation loop. */ + p_board->box[selected_col][selected_row].IsMine = TRUE; /* create mines */ i = 0; @@ -568,11 +570,13 @@ void CreateBoxes( BOARD *p_board ) } } + /* Remove temporarily placed mine for selected box */ + p_board->box[selected_col][selected_row].IsMine = FALSE; + /* * Now we label the remaining boxes with the * number of mines surrounding them. */ - for( col = 1; col < p_board->cols + 1; col++ ) for( row = 1; row < p_board->rows + 1; row++ ) { for( i = -1; i <= 1; i++ ) @@ -838,8 +842,12 @@ void TestMines( BOARD *p_board, POINT pt, int msg ) p_board->press.x, p_board->press.y ); p_board->press.x = 0; p_board->press.y = 0; - if( p_board->box[col][row].FlagType != FLAG ) + if( p_board->box[col][row].FlagType != FLAG + && p_board->status != PLAYING ) + { p_board->status = PLAYING; + PlaceMines( p_board, col, row ); + } CompleteBox( p_board, col, row ); break; diff --git a/programs/winemine/main.h b/programs/winemine/main.h index 37fa768..16fcb2e 100644 --- a/programs/winemine/main.h +++ b/programs/winemine/main.h @@ -134,7 +134,7 @@ void CheckLevel( BOARD *p_board ); void CreateBoard( BOARD *p_board ); -void CreateBoxes( BOARD *p_board ); +void PlaceMines ( BOARD *p_board, int selected_col, int selected_row ); void TestBoard( HWND hWnd, BOARD *p_board, int x, int y, int msg );

1 0

← Newer
1
...
23
24
25
26
27
28
29
...
95
Older →

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 June 2008