June 2006 - Wine-Commits - list.winehq.org

Detlef Riekenberg : winspool/tests: Tests for EnumForms and set an error value in our stub.
by Alexandre Julliard June 21, 2006

June 21, 2006

Module: wine Branch: refs/heads/master Commit: 89ed2d973dc9b6b44cdf713025e1574dca6bb3f8 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=89ed2d973dc9b6b44cdf713… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Fri Jun 16 09:54:55 2006 +0200 winspool/tests: Tests for EnumForms and set an error value in our stub. --- dlls/winspool.drv/info.c | 2 + dlls/winspool.drv/tests/info.c | 110 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 111 insertions(+), 1 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index 00852f2..bf91f9e 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -5430,6 +5430,7 @@ BOOL WINAPI EnumFormsA( HANDLE hPrinter, DWORD cbBuf, LPDWORD pcbNeeded, LPDWORD pcReturned ) { FIXME("%p %lx %p %lx %p %p\n", hPrinter, Level, pForm, cbBuf, pcbNeeded, pcReturned); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; } @@ -5440,6 +5441,7 @@ BOOL WINAPI EnumFormsW( HANDLE hPrinter, DWORD cbBuf, LPDWORD pcbNeeded, LPDWORD pcReturned ) { FIXME("%p %lx %p %lx %p %p\n", hPrinter, Level, pForm, cbBuf, pcbNeeded, pcReturned); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; } diff --git a/dlls/winspool.drv/tests/info.c b/dlls/winspool.drv/tests/info.c index ca65021..2eff80e 100644 --- a/dlls/winspool.drv/tests/info.c +++ b/dlls/winspool.drv/tests/info.c @@ -400,6 +400,110 @@ static void test_DeleteMonitor(void) DeleteMonitorA(NULL, entry->env, winetest_monitor); } +/* ######## */ + +static void test_EnumForms(LPSTR pName) +{ + DWORD res; + HANDLE hprinter = 0; + LPBYTE buffer; + DWORD cbBuf; + DWORD pcbNeeded; + DWORD pcReturned; + DWORD level; + + + res = OpenPrinter(pName, &hprinter, NULL); + RETURN_ON_DEACTIVATED_SPOOLER(res) + if (!res || !hprinter) + { + /* Open the local Prinserver is not supported on win9x */ + if (pName) trace("Failed to open '%s', skiping the test\n", pName); + return; + } + + /* valid levels are 1 and 2 */ + for(level = 0; level < 4; level++) { + cbBuf = 0xdeadbeef; + pcReturned = 0xdeadbeef; + SetLastError(0xdeadbeef); + res = EnumFormsA(hprinter, level, NULL, 0, &cbBuf, &pcReturned); + + /* EnumForms is not implemented in win9x */ + if (!res && (GetLastError() == ERROR_CALL_NOT_IMPLEMENTED)) continue; + + /* EnumForms for the Server not implemented on all NT-Versions */ + if (!res && (GetLastError() == ERROR_INVALID_HANDLE) && !pName) continue; + + /* Level 2 for EnumForms is not supported on all systems */ + if (!res && (GetLastError() == ERROR_INVALID_LEVEL) && (level == 2)) continue; + + /* use only a short test, when we test with an invalid level */ + if(!level || (level > 2)) { + ok( (!res && (GetLastError() == ERROR_INVALID_LEVEL)) || + (res && (pcReturned == 0)), + "(%ld) returned %ld with %ld and 0x%08lx (expected '0' with " \ + "ERROR_INVALID_LEVEL or '!=0' and 0x0)\n", + level, res, GetLastError(), pcReturned); + continue; + } + + ok((!res) && (GetLastError() == ERROR_INSUFFICIENT_BUFFER), + "(%ld) returned %ld with %ld (expected '0' with " \ + "ERROR_INSUFFICIENT_BUFFER)\n", level, res, GetLastError()); + + buffer = HeapAlloc(GetProcessHeap(), 0, cbBuf *2); + if (buffer == NULL) continue; + + SetLastError(0xdeadbeef); + res = EnumFormsA(hprinter, level, buffer, cbBuf, &pcbNeeded, &pcReturned); + ok(res, "(%ld) returned %ld with %ld (expected '!=0')\n", + level, res, GetLastError()); + /* We can dump the returned Data here */ + + + SetLastError(0xdeadbeef); + res = EnumFormsA(hprinter, level, buffer, cbBuf+1, &pcbNeeded, &pcReturned); + ok( res, "(%ld) returned %ld with %ld (expected '!=0')\n", + level, res, GetLastError()); + + SetLastError(0xdeadbeef); + res = EnumFormsA(hprinter, level, buffer, cbBuf-1, &pcbNeeded, &pcReturned); + ok( !res && (GetLastError() == ERROR_INSUFFICIENT_BUFFER), + "(%ld) returned %ld with %ld (expected '0' with " \ + "ERROR_INSUFFICIENT_BUFFER)\n", level, res, GetLastError()); + + + SetLastError(0xdeadbeef); + res = EnumFormsA(hprinter, level, NULL, cbBuf, &pcbNeeded, &pcReturned); + ok( !res && (GetLastError() == ERROR_INVALID_USER_BUFFER) , + "(%ld) returned %ld with %ld (expected '0' with "\ + "ERROR_INVALID_USER_BUFFER)\n", level, res, GetLastError()); + + + SetLastError(0xdeadbeef); + res = EnumFormsA(hprinter, level, buffer, cbBuf, NULL, &pcReturned); + ok( !res && (GetLastError() == RPC_X_NULL_REF_POINTER) , + "(%ld) returned %ld with %ld (expected '0' with "\ + "RPC_X_NULL_REF_POINTER)\n", level, res, GetLastError()); + + SetLastError(0xdeadbeef); + res = EnumFormsA(hprinter, level, buffer, cbBuf, &pcbNeeded, NULL); + ok( !res && (GetLastError() == RPC_X_NULL_REF_POINTER) , + "(%ld) returned %ld with %ld (expected '0' with "\ + "RPC_X_NULL_REF_POINTER)\n", level, res, GetLastError()); + + SetLastError(0xdeadbeef); + res = EnumFormsA(0, level, buffer, cbBuf, &pcbNeeded, &pcReturned); + ok( !res && (GetLastError() == ERROR_INVALID_HANDLE) , + "(%ld) returned %ld with %ld (expected '0' with "\ + "ERROR_INVALID_HANDLE)\n", level, res, GetLastError()); + + HeapFree(GetProcessHeap(), 0, buffer); + } /* for(level ... */ + + ClosePrinter(hprinter); +} /* ########################### */ @@ -1288,15 +1392,19 @@ static void test_DocumentProperties(void START_TEST(info) { + LPSTR default_printer; + hwinspool = GetModuleHandleA("winspool.drv"); pGetDefaultPrinterA = (void *) GetProcAddress(hwinspool, "GetDefaultPrinterA"); pSetDefaultPrinterA = (void *) GetProcAddress(hwinspool, "SetDefaultPrinterA"); - find_default_printer(); + default_printer = find_default_printer(); test_AddMonitor(); test_DeleteMonitor(); test_DocumentProperties(); + test_EnumForms(NULL); + if (default_printer) test_EnumForms(default_printer); test_EnumMonitors(); test_GetDefaultPrinter(); test_GetPrinterDriverDirectory();

1 0

Andrew Ziem : msvcrt: Fix _initterm, with tests.
by Alexandre Julliard June 21, 2006

June 21, 2006

Module: wine Branch: refs/heads/master Commit: 2132eb549074b35768a8023c7e5a9dde234b8131 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=2132eb549074b35768a8023… Author: Andrew Ziem <ahziem1(a)mailbolt.com> Date: Tue Jun 13 22:51:13 2006 -0600 msvcrt: Fix _initterm, with tests. --- dlls/msvcrt/data.c | 4 ++ dlls/msvcrt/tests/.gitignore | 1 + dlls/msvcrt/tests/Makefile.in | 1 + dlls/msvcrt/tests/data.c | 73 +++++++++++++++++++++++++++++++++++++++++ 4 files changed, 78 insertions(+), 1 deletions(-) create mode 100644 dlls/msvcrt/tests/data.c diff --git a/dlls/msvcrt/data.c b/dlls/msvcrt/data.c index 1c4b8a7..2511970 100644 --- a/dlls/msvcrt/data.c +++ b/dlls/msvcrt/data.c @@ -342,6 +342,7 @@ void CDECL __wgetmainargs(int *argc, MSV unsigned int CDECL _initterm(_INITTERMFUN *start,_INITTERMFUN *end) { _INITTERMFUN* current = start; + unsigned int count=0; TRACE("(%p,%p)\n",start,end); while (current<end) @@ -351,10 +352,11 @@ unsigned int CDECL _initterm(_INITTERMFU TRACE("Call init function %p\n",*current); (**current)(); TRACE("returned\n"); + count++; } current++; } - return 0; + return count; } /********************************************************************* diff --git a/dlls/msvcrt/tests/.gitignore b/dlls/msvcrt/tests/.gitignore index 2980711..f07f5c9 100644 --- a/dlls/msvcrt/tests/.gitignore +++ b/dlls/msvcrt/tests/.gitignore @@ -1,5 +1,6 @@ Makefile cpp.ok +data.ok dir.ok environ.ok file.ok diff --git a/dlls/msvcrt/tests/Makefile.in b/dlls/msvcrt/tests/Makefile.in index 9569f1e..38ddf05 100644 --- a/dlls/msvcrt/tests/Makefile.in +++ b/dlls/msvcrt/tests/Makefile.in @@ -9,6 +9,7 @@ EXTRAINCL = -I$(TOPSRCDIR)/include/msvcr CTESTS = \ cpp.c \ + data.c \ dir.c \ environ.c \ file.c \ diff --git a/dlls/msvcrt/tests/data.c b/dlls/msvcrt/tests/data.c new file mode 100644 index 0000000..c8eee75 --- /dev/null +++ b/dlls/msvcrt/tests/data.c @@ -0,0 +1,73 @@ +/* + * Tests msvcrt/data.c + * + * Copyright 2006 Andrew Ziem + * + * 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 "msvcrt.h" +#include "wine/test.h" +#include <stdarg.h> +#include <stdlib.h> +#include <stdio.h> +#include <fcntl.h> +#include <sys/stat.h> +#include <io.h> +#include <windef.h> +#include <winbase.h> +#include <winnls.h> +#include <process.h> +#include <errno.h> + +typedef void (*_INITTERMFUN)(void); +extern unsigned int CDECL _initterm(_INITTERMFUN *start,_INITTERMFUN *end); + +static int callbacked; + +void initcallback(void) +{ + callbacked++; +} + +#define initterm_test(start, end, expected) \ + callbacked = 0; \ + rc = _initterm(start, end); \ + ok(expected == rc, "_initterm: return result mismatch: got %i, expected %i\n", rc, expected); \ + ok(expected == callbacked,"_initterm: callbacks count mismatch: got %i, expected %i\n", callbacked, expected); + +void test_initterm(void) +{ + int i; + int rc; + static _INITTERMFUN callbacks[4]; + + for (i = 0; i < 4; i++) + { + callbacks[i] = initcallback; + } + + initterm_test(&callbacks[0], &callbacks[1], 1); + initterm_test(&callbacks[0], &callbacks[2], 2); + initterm_test(&callbacks[0], &callbacks[3], 3); + + callbacks[1] = NULL; + initterm_test(&callbacks[0], &callbacks[3], 2); +} + +START_TEST(data) +{ + test_initterm(); +}

1 0

Simon Kissane : kernel32: Added SetThreadUILanguage() stub.
by Alexandre Julliard June 21, 2006

June 21, 2006

Module: wine Branch: refs/heads/master Commit: fe70078a5b8d7a29d37b2e8847708c30dc8bb91d URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=fe70078a5b8d7a29d37b2e8… Author: Simon Kissane <skissane(a)gmail.com> Date: Sun Jun 11 10:53:58 2006 +1000 kernel32: Added SetThreadUILanguage() stub. --- dlls/kernel/kernel32.spec | 2 +- dlls/kernel/locale.c | 21 +++++++++++++++++++++ 2 files changed, 22 insertions(+), 1 deletions(-) diff --git a/dlls/kernel/kernel32.spec b/dlls/kernel/kernel32.spec index 4de17a9..7369b59 100644 --- a/dlls/kernel/kernel32.spec +++ b/dlls/kernel/kernel32.spec @@ -1032,7 +1032,7 @@ # @ stub SetLocalPrimaryComputerNameW @ stdcall SetThreadLocale(long) @ stdcall SetThreadPriority(long long) @ stdcall SetThreadPriorityBoost(long long) -# @ stub SetThreadUILanguage +@ stdcall SetThreadUILanguage(long) @ stdcall SetTimeZoneInformation(ptr) @ stub SetTimerQueueTimer @ stdcall SetUnhandledExceptionFilter(ptr) diff --git a/dlls/kernel/locale.c b/dlls/kernel/locale.c index beb5bbd..ae50f07 100644 --- a/dlls/kernel/locale.c +++ b/dlls/kernel/locale.c @@ -1717,6 +1717,27 @@ BOOL WINAPI SetThreadLocale( LCID lcid ) return TRUE; } +/********************************************************************** + * SetThreadUILanguage (KERNEL32.@) + * + * Set the current threads UI language. + * + * PARAMS + * langid [I] LANGID of the language to set, or 0 to use + * the available language which is best supported + * for console applications + * + * RETURNS + * Success: The return value is the same as the input value. + * Failure: The return value differs from the input value. + * Use GetLastError() to determine the cause. + */ +LANGID WINAPI SetThreadUILanguage( LANGID langid ) +{ + TRACE("(0x%04x) stub - returning success\n", langid); + return langid; +} + /****************************************************************************** * ConvertDefaultLocale (KERNEL32.@) *

1 0

Robert Shearman : rpcrt4: Stubs for RpcRevertToSelf and RpcMgmtSetComTimeout.
by Alexandre Julliard June 21, 2006

June 21, 2006

Module: wine Branch: refs/heads/master Commit: 7d92b89abfe3760254f2269f8a71c57a95c8b28a URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=7d92b89abfe3760254f2269… Author: Robert Shearman <rob(a)codeweavers.com> Date: Wed Jun 21 13:39:52 2006 +0200 rpcrt4: Stubs for RpcRevertToSelf and RpcMgmtSetComTimeout. --- dlls/rpcrt4/rpc_binding.c | 18 ++++++++++++++++++ dlls/rpcrt4/rpcrt4.spec | 4 ++-- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/dlls/rpcrt4/rpc_binding.c b/dlls/rpcrt4/rpc_binding.c index 6b7770d..7f5f14d 100644 --- a/dlls/rpcrt4/rpc_binding.c +++ b/dlls/rpcrt4/rpc_binding.c @@ -953,6 +953,24 @@ ULONG RpcAuthInfo_Release(RpcAuthInfo *A } /*********************************************************************** + * RpcRevertToSelf (RPCRT4.@) + */ +RPC_STATUS WINAPI RpcRevertToSelf(void) +{ + FIXME("stub\n"); + return RPC_S_OK; +} + +/*********************************************************************** + * RpcMgmtSetComTimeout (RPCRT4.@) + */ +RPC_STATUS WINAPI RpcMgmtSetComTimeout(RPC_BINDING_HANDLE BindingHandle, unsigned int Timeout) +{ + FIXME("(%p, %d): stub\n", BindingHandle, Timeout); + return RPC_S_OK; +} + +/*********************************************************************** * RpcBindingInqAuthInfoExA (RPCRT4.@) */ RPCRTAPI RPC_STATUS RPC_ENTRY diff --git a/dlls/rpcrt4/rpcrt4.spec b/dlls/rpcrt4/rpcrt4.spec index 6156b36..cd1bcf2 100644 --- a/dlls/rpcrt4/rpcrt4.spec +++ b/dlls/rpcrt4/rpcrt4.spec @@ -439,7 +439,7 @@ # 9x version of I_RpcBindingSetAsync has @ stdcall RpcMgmtIsServerListening(ptr) @ stub RpcMgmtSetAuthorizationFn @ stub RpcMgmtSetCancelTimeout -@ stub RpcMgmtSetComTimeout +@ stdcall RpcMgmtSetComTimeout(ptr long) @ stub RpcMgmtSetParameter # win9x @ stub RpcMgmtSetServerStackSize @ stub RpcMgmtStatsVectorFree @@ -458,7 +458,7 @@ # 9x version of I_RpcBindingSetAsync has @ stub RpcProtseqVectorFreeW @ stdcall RpcRaiseException(long) @ stub RpcRegisterAsyncInfo -@ stub RpcRevertToSelf +@ stdcall RpcRevertToSelf() @ stdcall RpcRevertToSelfEx(ptr) @ stdcall RpcServerInqBindings(ptr) @ stub RpcServerInqCallAttributesA # wxp

1 0

Robert Shearman : rpcrt4: Add stub for RpcMgmtEnableIdleCleanup.
by Alexandre Julliard June 21, 2006

June 21, 2006

Module: wine Branch: refs/heads/master Commit: 45d42528a0cb14e757de0c800bf6853585f5befe URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=45d42528a0cb14e757de0c8… Author: Robert Shearman <rob(a)codeweavers.com> Date: Wed Jun 21 13:39:38 2006 +0200 rpcrt4: Add stub for RpcMgmtEnableIdleCleanup. --- dlls/rpcrt4/rpc_server.c | 9 +++++++++ dlls/rpcrt4/rpcrt4.spec | 2 +- 2 files changed, 10 insertions(+), 1 deletions(-) diff --git a/dlls/rpcrt4/rpc_server.c b/dlls/rpcrt4/rpc_server.c index dd55848..3f3c9ca 100644 --- a/dlls/rpcrt4/rpc_server.c +++ b/dlls/rpcrt4/rpc_server.c @@ -938,6 +938,15 @@ RPC_STATUS WINAPI RpcMgmtStopServerListe } /*********************************************************************** + * RpcMgmtEnableIdleCleanup (RPCRT4.@) + */ +RPC_STATUS WINAPI RpcMgmtEnableIdleCleanup(void) +{ + FIXME("(): stub\n"); + return RPC_S_OK; +} + +/*********************************************************************** * I_RpcServerStartListening (RPCRT4.@) */ RPC_STATUS WINAPI I_RpcServerStartListening( HWND hWnd ) diff --git a/dlls/rpcrt4/rpcrt4.spec b/dlls/rpcrt4/rpcrt4.spec index c5a4297..6156b36 100644 --- a/dlls/rpcrt4/rpcrt4.spec +++ b/dlls/rpcrt4/rpcrt4.spec @@ -423,7 +423,7 @@ # 9x version of I_RpcBindingSetAsync has @ stub RpcInitializeAsyncHandle @ stub RpcMgmtBindingInqParameter # win9x @ stub RpcMgmtBindingSetParameter # win9x -@ stub RpcMgmtEnableIdleCleanup +@ stdcall RpcMgmtEnableIdleCleanup() @ stdcall RpcMgmtEpEltInqBegin(ptr long ptr long ptr ptr) @ stub RpcMgmtEpEltInqDone @ stub RpcMgmtEpEltInqNextA

1 0

Stefan Dösinger : wined3d: Pixel format cleanup.
by Alexandre Julliard June 21, 2006

June 21, 2006

Module: wine Branch: refs/heads/master Commit: 35187471652f6fa27835db237e378df75e3d5d3d URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=35187471652f6fa27835db2… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Jun 21 10:36:14 2006 +0200 wined3d: Pixel format cleanup. --- dlls/wined3d/device.c | 32 +- dlls/wined3d/surface.c | 38 +-- dlls/wined3d/surface_gdi.c | 46 ++- dlls/wined3d/utils.c | 566 +++++++--------------------------------- dlls/wined3d/volume.c | 14 - dlls/wined3d/wined3d_private.h | 22 +- 6 files changed, 180 insertions(+), 538 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=35187471652f6fa2783…

1 0

Michael Kaufmann : gdi32: SetWinMetaFileBits: Use the whole device surface if the METAFILEPICT parameter is NULL.
by Alexandre Julliard June 21, 2006

June 21, 2006

Module: wine Branch: refs/heads/master Commit: d23b83a026dfe792e9deefdc68fe976f16abcf71 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=d23b83a026dfe792e9deefd… Author: Michael Kaufmann <hallo(a)michael-kaufmann.ch> Date: Tue Jun 20 16:02:37 2006 +0200 gdi32: SetWinMetaFileBits: Use the whole device surface if the METAFILEPICT parameter is NULL. Also use the whole device surface if one of the extents is zero or negative and the mapping mode is MM_ANISOTROPIC or MM_ISOTROPIC. New tests. --- dlls/gdi/enhmetafile.c | 87 +++++++++++++----- dlls/gdi/tests/metafile.c | 212 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 274 insertions(+), 25 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=d23b83a026dfe792e9d…

1 0

Detlef Riekenberg : winspool: An empty string as server name is valid for AddPrinterDriver.
by Alexandre Julliard June 21, 2006

June 21, 2006

Module: wine Branch: refs/heads/master Commit: dde6d8b1857a3fc34b6cec5b70f95dfb6424c11d URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=dde6d8b1857a3fc34b6cec5… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Mon Jun 19 23:58:24 2006 +0200 winspool: An empty string as server name is valid for AddPrinterDriver. --- dlls/winspool.drv/info.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index 05df47a..00852f2 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -3942,7 +3942,7 @@ BOOL WINAPI AddPrinterDriverA(LPSTR pNam SetLastError(ERROR_INVALID_LEVEL); return FALSE; } - if(pName != NULL) { + if ((pName) && (pName[0])) { FIXME("pName= %s - unsupported\n", debugstr_a(pName)); SetLastError(ERROR_INVALID_PARAMETER); return FALSE;

1 0

Piotr Caban : oleview: Added registry tab in details window.
by Alexandre Julliard June 21, 2006

June 21, 2006

Module: wine Branch: refs/heads/master Commit: 18db85397314af6d796a5198cf637ed269cf58c4 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=18db85397314af6d796a519… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Wed Jun 14 19:58:35 2006 +0200 oleview: Added registry tab in details window. --- programs/oleview/details.c | 248 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 248 insertions(+), 0 deletions(-) diff --git a/programs/oleview/details.c b/programs/oleview/details.c index abc57f8..8924040 100644 --- a/programs/oleview/details.c +++ b/programs/oleview/details.c @@ -21,6 +21,253 @@ #include "main.h" DETAILS details; +static const WCHAR wszAppID[] = { 'A','p','p','I','D','\0' }; +static const WCHAR wszCLSID[] = { 'C','L','S','I','D','\0' }; +static const WCHAR wszProgID[] = { 'P','r','o','g','I','D','\0' }; +static const WCHAR wszProxyStubClsid32[] = + { 'P','r','o','x','y','S','t','u','b','C','l','s','i','d','3','2','\0' }; +static const WCHAR wszTypeLib[] = { 'T','y','p','e','L','i','b','\0' }; + +void CreateRegRec(HKEY hKey, HTREEITEM parent, WCHAR *wszKeyName, BOOL addings) +{ + int i=0, j, retEnum; + HKEY hCurKey; + DWORD lenName, lenData, valType; + WCHAR wszName[MAX_LOAD_STRING]; + WCHAR wszData[MAX_LOAD_STRING]; + WCHAR wszTree[MAX_LOAD_STRING]; + const WCHAR wszBinary[] = { '%','0','2','X',' ','\0' }; + const WCHAR wszDots[] = { '.','.','.','\0' }; + const WCHAR wszFormat1[] = { '%','s',' ','[','%','s',']',' ','=',' ','%','s','\0' }; + const WCHAR wszFormat2[] = { '%','s',' ','=',' ','%','s','\0' }; + TVINSERTSTRUCT tvis; + HTREEITEM addPlace = parent; + + tvis.item.mask = TVIF_TEXT; + tvis.item.cchTextMax = MAX_LOAD_STRING; + tvis.item.pszText = wszTree; + tvis.hInsertAfter = (HTREEITEM)TVI_LAST; + tvis.hParent = parent; + + while(TRUE) + { + lenName = sizeof(WCHAR[MAX_LOAD_STRING]); + lenData = sizeof(WCHAR[MAX_LOAD_STRING]); + + retEnum = RegEnumValue(hKey, i, wszName, &lenName, + NULL, &valType, (LPBYTE)wszData, &lenData); + + if(retEnum != ERROR_SUCCESS) + { + if(!i && strlenW(wszKeyName) > 1) + { + tvis.item.pszText = (LPWSTR)wszKeyName; + addPlace = TreeView_InsertItem(details.hReg, &tvis); + tvis.item.pszText = wszTree; + } + break; + } + + if(valType == REG_BINARY) + { + WCHAR wszBuf[MAX_LOAD_STRING]; + + for(j=0; j<MAX_LOAD_STRING/3-1; j++) + wsprintfW(&wszBuf[3*j], wszBinary, (int)((unsigned char)wszData[j])); + wszBuf[(lenData*3>=MAX_LOAD_STRING ? MAX_LOAD_STRING-1 : lenData*3)] = '\0'; + strcpyW(wszData, wszBuf); + strcpyW(&wszData[MAX_LOAD_STRING-5], wszDots); + } + + if(lenName) wsprintfW(wszTree, wszFormat1, wszKeyName, wszName, wszData); + else wsprintfW(wszTree, wszFormat2, wszKeyName, wszData); + + addPlace = TreeView_InsertItem(details.hReg, &tvis); + + if(addings && !memcmp(wszName, wszAppID, sizeof(WCHAR[6]))) + { + strcpyW(wszTree, wszName); + memmove(&wszData[6], wszData, sizeof(WCHAR[MAX_LOAD_STRING-6])); + strcpyW(wszData, wszCLSID); + wszData[5] = '\\'; + + if(RegOpenKey(HKEY_CLASSES_ROOT, wszData, &hCurKey) != ERROR_SUCCESS) + { + i++; + continue; + } + + tvis.hParent = TVI_ROOT; + tvis.hParent = TreeView_InsertItem(details.hReg, &tvis); + + lenName = sizeof(WCHAR[MAX_LOAD_STRING]); + + RegQueryValue(hCurKey, NULL, wszName, (LONG *)&lenName); + RegCloseKey(hCurKey); + + wsprintfW(wszTree, wszFormat2, &wszData[6], wszName); + + SendMessage(details.hReg, TVM_INSERTITEM, 0, (LPARAM)&tvis); + SendMessage(details.hReg, TVM_EXPAND, TVE_EXPAND, (LPARAM)tvis.hParent); + + tvis.hParent = parent; + } + i++; + } + + i=-1; + lenName = sizeof(WCHAR[MAX_LOAD_STRING]); + + while(TRUE) + { + i++; + + if(RegEnumKey(hKey, i, wszName, lenName) != ERROR_SUCCESS) break; + + if(RegOpenKey(hKey, wszName, &hCurKey) != ERROR_SUCCESS) continue; + + CreateRegRec(hCurKey, addPlace, wszName, addings); + SendMessage(details.hReg, TVM_EXPAND, TVE_EXPAND, (LPARAM)addPlace); + + if(addings && !memcmp(wszName, wszProgID, sizeof(WCHAR[7]))) + { + lenData = sizeof(WCHAR[MAX_LOAD_STRING]); + + RegQueryValue(hCurKey, NULL, wszData, (LONG *)&lenData); + RegCloseKey(hCurKey); + + if(RegOpenKey(HKEY_CLASSES_ROOT, wszData, &hCurKey) != ERROR_SUCCESS) + continue; + CreateRegRec(hCurKey, TVI_ROOT, wszData, FALSE); + } + else if(addings && !memcmp(wszName, wszProxyStubClsid32, sizeof(WCHAR[17]))) + { + lenData = sizeof(WCHAR[MAX_LOAD_STRING]); + + RegQueryValue(hCurKey, NULL, wszData, (LONG *)&lenData); + RegCloseKey(hCurKey); + + RegOpenKey(HKEY_CLASSES_ROOT, wszCLSID, &hCurKey); + + lenName = sizeof(WCHAR[MAX_LOAD_STRING]); + RegQueryValue(hCurKey, NULL, wszName, (LONG *)&lenName); + + tvis.hParent = TVI_ROOT; + wsprintfW(wszTree, wszFormat2, wszCLSID, wszName); + tvis.hParent = TreeView_InsertItem(details.hReg, &tvis); + + RegCloseKey(hCurKey); + + memmove(&wszData[6], wszData, sizeof(WCHAR[lenData])); + memcpy(wszData, wszCLSID, sizeof(WCHAR[6])); + wszData[5] = '\\'; + + RegOpenKey(HKEY_CLASSES_ROOT, wszData, &hCurKey); + + CreateRegRec(hCurKey, tvis.hParent, &wszData[6], FALSE); + + SendMessage(details.hReg, TVM_EXPAND, TVE_EXPAND, (LPARAM)tvis.hParent); + tvis.hParent = parent; + } + else if(addings && !memcmp(wszName, wszTypeLib, sizeof(WCHAR[8]))) + { + lenData = sizeof(WCHAR[MAX_LOAD_STRING]); + + RegQueryValue(hCurKey, NULL, wszData, (LONG *)&lenData); + RegCloseKey(hCurKey); + + RegOpenKey(HKEY_CLASSES_ROOT, wszTypeLib, &hCurKey); + + lenName = sizeof(WCHAR[MAX_LOAD_STRING]); + RegQueryValue(hCurKey, NULL, wszName, (LONG *)&lenName); + + tvis.hParent = TVI_ROOT; + wsprintfW(wszTree, wszFormat2, wszTypeLib, wszName); + tvis.hParent = TreeView_InsertItem(details.hReg, &tvis); + + RegCloseKey(hCurKey); + + memmove(&wszData[8], wszData, sizeof(WCHAR[lenData])); + memcpy(wszData, wszTypeLib, sizeof(WCHAR[8])); + wszData[7] = '\\'; + RegOpenKey(HKEY_CLASSES_ROOT, wszData, &hCurKey); + + CreateRegRec(hCurKey, tvis.hParent, &wszData[8], FALSE); + + SendMessage(details.hReg, TVM_EXPAND, TVE_EXPAND, (LPARAM)tvis.hParent); + tvis.hParent = parent; + } + RegCloseKey(hCurKey); + } +} + +void CreateReg(WCHAR *buffer) +{ + HKEY hKey; + DWORD lenBuffer=-1, lastLenBuffer, lenTree; + WCHAR *path; + WCHAR wszTree[MAX_LOAD_STRING]; + TVINSERTSTRUCT tvis; + HTREEITEM addPlace = TVI_ROOT; + + tvis.item.mask = TVIF_TEXT; + tvis.item.cchTextMax = MAX_LOAD_STRING; + tvis.item.pszText = wszTree; + tvis.hInsertAfter = (HTREEITEM)TVI_LAST; + tvis.hParent = TVI_ROOT; + + path = buffer; + while(TRUE) + { + while(*path != '\\' && *path != '\0') path += 1; + + if(*path == '\\') + { + *path = '\0'; + + if(RegOpenKey(HKEY_CLASSES_ROOT, (LPWSTR)buffer, &hKey) != ERROR_SUCCESS) + return; + + lastLenBuffer = lenBuffer+1; + lenBuffer = strlenW(buffer); + *path = '\\'; + path += 1; + + lenTree = sizeof(WCHAR[MAX_LOAD_STRING]); + + if(RegQueryValue(hKey, NULL, wszTree, (LONG *)&lenTree) == ERROR_SUCCESS) + { + memmove(&wszTree[lenBuffer-lastLenBuffer+3], wszTree, + sizeof(WCHAR[lenTree])); + memcpy(wszTree, &buffer[lastLenBuffer], + sizeof(WCHAR[lenBuffer-lastLenBuffer])); + + if(lenTree == 1) wszTree[lenBuffer-lastLenBuffer] = '\0'; + else + { + wszTree[lenBuffer-lastLenBuffer] = ' '; + wszTree[lenBuffer-lastLenBuffer+1] = '='; + wszTree[lenBuffer-lastLenBuffer+2] = ' '; + } + + addPlace = TreeView_InsertItem(details.hReg, &tvis); + } + + tvis.hParent = addPlace; + RegCloseKey(hKey); + } + else break; + } + + if(RegOpenKey(HKEY_CLASSES_ROOT, (LPWSTR)buffer, &hKey) != ERROR_SUCCESS) return; + + CreateRegRec(hKey, addPlace, (LPWSTR)&buffer[lenBuffer+1], TRUE); + + RegCloseKey(hKey); + + SendMessage(details.hReg, TVM_EXPAND, TVE_EXPAND, (LPARAM)addPlace); + SendMessage(details.hReg, TVM_ENSUREVISIBLE, 0, (LPARAM)addPlace); +} void RefreshDetails(HTREEITEM item) { @@ -78,6 +325,7 @@ void RefreshDetails(HTREEITEM item) SendMessage(details.hReg, TVM_ENSUREVISIBLE, 0, SendMessage(details.hReg, TVM_GETNEXTITEM, TVGN_CHILD, (LPARAM)TVI_ROOT)); SendMessage(details.hReg, TVM_DELETEITEM, 0, (LPARAM)TVI_ROOT); + if(show) CreateReg(wszBuf); } void CreateTabCtrl(HWND hWnd)

1 0

Piotr Caban : oleview: Added details window base.
by Alexandre Julliard June 21, 2006

June 21, 2006

Module: wine Branch: refs/heads/master Commit: 2571da61174750c493868d3e150769b94d680a0a URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=2571da61174750c493868d3… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Wed Jun 14 19:55:46 2006 +0200 oleview: Added details window base. --- programs/oleview/En.rc | 6 +- programs/oleview/Makefile.in | 1 programs/oleview/details.c | 160 ++++++++++++++++++++++++++++++++++++++++++ programs/oleview/main.h | 16 ++++ programs/oleview/oleview.c | 2 + programs/oleview/resource.h | 4 + programs/oleview/tree.c | 2 + 7 files changed, 189 insertions(+), 2 deletions(-) create mode 100644 programs/oleview/details.c Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=2571da61174750c4938…

1 0