August 2008 - Wine-Commits - list.winehq.org

Alexandre Julliard : Wine release 1.1.3
by Alexandre Julliard Aug. 22, 2008

Aug. 22, 2008

Module: website Branch: master Commit: bdc8020f205a14d6bcfbe4997b28f31d15425b72 URL: http://source.winehq.org/git/website.git/?a=commit;h=bdc8020f205a14d6bcfbe4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Aug 22 17:24:32 2008 +0200 Wine release 1.1.3 --- news/en/2008082201.xml | 18 ++++++++++++++++++ 1 files changed, 18 insertions(+), 0 deletions(-) diff --git a/news/en/2008082201.xml b/news/en/2008082201.xml new file mode 100644 index 0000000..c75a264 --- /dev/null +++ b/news/en/2008082201.xml @@ -0,0 +1,18 @@ +<news> +<date>August 22, 2008</date> +<title>Wine 1.1.3 Released</title> +<body> + The Wine development release 1.1.3 is now available. + <a href="?announce=1.1.3">What's new</a> in this release: +<ul> + <li>Beginnings of ddraw overlay support.</li> + <li>Many more crypt32 functions.</li> + <li>Improved support for tables in Richedit.</li> + <li>Support for NETWM window maximization.</li> + <li>Many installer fixes.</li> + <li>Tweaks for better PulseAudio support.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="http://prdownloads.sourceforge.net/wine/wine-1.1.3.tar.bz2">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="/site/download">download locations</a>. +</body></news>

1 0

Alexandre Julliard : Release 1.1.3.
by Alexandre Julliard Aug. 22, 2008

Aug. 22, 2008

Module: wine Branch: master Commit: de92617b3ec1501a2a56f6262d9653f502a5b331 URL: http://source.winehq.org/git/wine.git/?a=commit;h=de92617b3ec1501a2a56f6262… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Aug 22 17:16:26 2008 +0200 Release 1.1.3. --- ANNOUNCE | 1471 +++++++++++++++++++++++++++++++++++++------------------------ VERSION | 2 +- configure | 18 +- 3 files changed, 909 insertions(+), 582 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=de92617b3ec1501a2a56f…

1 0

Tag wine-1.1.3 : Alexandre Julliard : Release 1.1.3
by Alexandre Julliard Aug. 22, 2008

Aug. 22, 2008

Module: wine Branch: refs/tags/wine-1.1.3 Tag: 5c5a7933eebae0f513d313154b6eb703b42fb0b7 URL: http://source.winehq.org/git/wine.git/?a=tag;h=5c5a7933eebae0f513d313154b6e… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Aug 22 17:16:26 2008 +0200 Release 1.1.3

1 0

Paul Vriens : advapi32: Prevent a crash when passing an allowed NULL parameter.
by Alexandre Julliard Aug. 22, 2008

Aug. 22, 2008

Module: wine Branch: master Commit: ce64e0d055a35ddb26c5962878ad29e7b37d7640 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce64e0d055a35ddb26c596287… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Thu Aug 21 17:17:52 2008 +0200 advapi32: Prevent a crash when passing an allowed NULL parameter. --- dlls/advapi32/service.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/advapi32/service.c b/dlls/advapi32/service.c index 45666ab..d5a2c31 100644 --- a/dlls/advapi32/service.c +++ b/dlls/advapi32/service.c @@ -1766,7 +1766,7 @@ EnumServicesStatusExA(SC_HANDLE hSCManager, SC_ENUM_TYPE InfoLevel, DWORD dwServ FIXME("%p level=%d type=%x state=%x %p %x %p %p %p %s\n", hSCManager, InfoLevel, dwServiceType, dwServiceState, lpServices, cbBufSize, pcbBytesNeeded, lpServicesReturned, lpResumeHandle, debugstr_a(pszGroupName)); - *lpServicesReturned = 0; + if (lpServicesReturned) *lpServicesReturned = 0; SetLastError (ERROR_ACCESS_DENIED); return FALSE; }

1 0

Paul Vriens : advapi32/tests: Add tests for EnumServicesStatusExA.
by Alexandre Julliard Aug. 22, 2008

Aug. 22, 2008

Module: wine Branch: master Commit: f0a821a1aed95e3b2404e49c732191e5c4a36822 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f0a821a1aed95e3b2404e49c7… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Thu Aug 21 17:18:41 2008 +0200 advapi32/tests: Add tests for EnumServicesStatusExA. --- dlls/advapi32/tests/service.c | 401 +++++++++++++++++++++++++++++++++++++++++ 1 files changed, 401 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f0a821a1aed95e3b2404e…

1 0

David Adam : ddraw: Only ddraw checks wether one can give a null pointer to SetMaterial.
by Alexandre Julliard Aug. 22, 2008

Aug. 22, 2008

Module: wine Branch: master Commit: bb67a925d69b50c2b3f61666c5347ab0902da8b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb67a925d69b50c2b3f61666c… Author: David Adam <david.adam.cnrs(a)gmail.com> Date: Thu Aug 21 18:54:27 2008 +0200 ddraw: Only ddraw checks wether one can give a null pointer to SetMaterial. --- dlls/ddraw/device.c | 1 + dlls/ddraw/tests/d3d.c | 9 +++++++++ dlls/wined3d/device.c | 2 -- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index b154ce4..edcb88f 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -5543,6 +5543,7 @@ IDirect3DDeviceImpl_7_SetMaterial(IDirect3DDevice7 *iface, HRESULT hr; TRACE("(%p)->(%p): Relay!\n", This, Mat); + if (!Mat) return DDERR_INVALIDPARAMS; /* Note: D3DMATERIAL7 is compatible with WINED3DMATERIAL */ EnterCriticalSection(&ddraw_cs); hr = IWineD3DDevice_SetMaterial(This->wineD3DDevice, diff --git a/dlls/ddraw/tests/d3d.c b/dlls/ddraw/tests/d3d.c index 37c0a8e..221a95b 100644 --- a/dlls/ddraw/tests/d3d.c +++ b/dlls/ddraw/tests/d3d.c @@ -2735,6 +2735,14 @@ static void DeviceLoadTest() } } +static void SetMaterialTest(void) +{ + HRESULT rc; + + rc =IDirect3DDevice7_SetMaterial(lpD3DDevice, NULL); + ok(rc == DDERR_INVALIDPARAMS, "Expected DDERR_INVALIDPARAMS, got %x\n", rc); +} + START_TEST(d3d) { init_function_pointers(); @@ -2752,6 +2760,7 @@ START_TEST(d3d) SceneTest(); LimitTest(); D3D7EnumTest(); + SetMaterialTest(); CapsTest(); VertexBufferDescTest(); D3D7_OldRenderStateTest(); diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index d247d65..350c6d5 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3144,8 +3144,6 @@ static HRESULT WINAPI IWineD3DDeviceImpl_GetClipStatus(IWineD3DDevice *iface, static HRESULT WINAPI IWineD3DDeviceImpl_SetMaterial(IWineD3DDevice *iface, CONST WINED3DMATERIAL* pMaterial) { IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; - if (!pMaterial) return WINED3DERR_INVALIDCALL; - This->updateStateBlock->changed.material = TRUE; This->updateStateBlock->material = *pMaterial;

1 0

David Adam : d3d8/d3d9: Remove unconsistent tests for SetMaterial.
by Alexandre Julliard Aug. 22, 2008

Aug. 22, 2008

Module: wine Branch: master Commit: acaeb9204269cbaed230ea61acdc1a4b0296603e URL: http://source.winehq.org/git/wine.git/?a=commit;h=acaeb9204269cbaed230ea61a… Author: David Adam <david.adam.cnrs(a)gmail.com> Date: Thu Aug 21 18:35:00 2008 +0200 d3d8/d3d9: Remove unconsistent tests for SetMaterial. --- dlls/d3d8/tests/device.c | 38 -------------------------------------- dlls/d3d9/tests/device.c | 36 ------------------------------------ 2 files changed, 0 insertions(+), 74 deletions(-) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index d40f196..c3aa591 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -1283,43 +1283,6 @@ static void test_render_zero_triangles(void) if(d3d8) IDirect3D8_Release(d3d8); } -static void test_set_material(void) -{ - D3DPRESENT_PARAMETERS present_parameters; - IDirect3DDevice8 *device = NULL; - IDirect3D8 *d3d8; - HWND hwnd; - HRESULT hr; - - d3d8 = pDirect3DCreate8( D3D_SDK_VERSION ); - ok(d3d8 != NULL, "Failed to create IDirect3D8 object\n"); - hwnd = CreateWindow( "static", "d3d8_test", WS_OVERLAPPEDWINDOW, 100, 100, 160, 160, NULL, NULL, NULL, NULL ); - ok(hwnd != NULL, "Failed to create window\n"); - if (!d3d8 || !hwnd) goto cleanup; - - ZeroMemory(&present_parameters, sizeof(present_parameters)); - present_parameters.Windowed = TRUE; - present_parameters.hDeviceWindow = hwnd; - present_parameters.SwapEffect = D3DSWAPEFFECT_DISCARD; - - hr = IDirect3D8_CreateDevice( d3d8, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, hwnd, - D3DCREATE_HARDWARE_VERTEXPROCESSING | D3DCREATE_PUREDEVICE, &present_parameters, &device ); - ok(hr == D3D_OK || hr == D3DERR_NOTAVAILABLE || hr == D3DERR_INVALIDCALL, - "IDirect3D8_CreateDevice failed with %08x\n", hr); - if(!device) - { - skip("Failed to create a d3d device\n"); - goto cleanup; - } - - hr = IDirect3DDevice8_SetMaterial(device, NULL); - ok(hr == D3DERR_INVALIDCALL, "Expected D3DERR_INVALIDCALL, got %08x\n", hr); - - cleanup: - if(device) IDirect3DDevice8_Release(device); - if(d3d8) IDirect3D8_Release(d3d8); -} - START_TEST(device) { HMODULE d3d8_handle = LoadLibraryA( "d3d8.dll" ); @@ -1345,6 +1308,5 @@ START_TEST(device) test_limits(); test_lights(); test_render_zero_triangles(); - test_set_material(); } } diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 3a56298..3164b81 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -2016,41 +2016,6 @@ static void test_display_formats() if(d3d9) IDirect3D9_Release(d3d9); } -static void test_set_material(void) -{ - D3DPRESENT_PARAMETERS present_parameters; - IDirect3DDevice9 *device = NULL; - IDirect3D9 *d3d9; - HWND hwnd; - HRESULT hr; - - d3d9 = pDirect3DCreate9( D3D_SDK_VERSION ); - ok(d3d9 != NULL, "Failed to create IDirect3D9 object\n"); - hwnd = CreateWindow( "static", "d3d9_test", WS_OVERLAPPEDWINDOW, 100, 100, 160, 160, NULL, NULL, NULL, NULL ); - ok(hwnd != NULL, "Failed to create window\n"); - if (!d3d9 || !hwnd) goto cleanup; - - ZeroMemory(&present_parameters, sizeof(present_parameters)); - present_parameters.Windowed = TRUE; - present_parameters.hDeviceWindow = hwnd; - present_parameters.SwapEffect = D3DSWAPEFFECT_DISCARD; - - IDirect3D9_CreateDevice( d3d9, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, hwnd, - D3DCREATE_HARDWARE_VERTEXPROCESSING | D3DCREATE_PUREDEVICE, &present_parameters, &device ); - if(!device) - { - skip("Failed to create a d3d device\n"); - goto cleanup; - } - - hr = IDirect3DDevice9_SetMaterial(device, NULL); - ok(hr == D3DERR_INVALIDCALL, "Expected D3DERR_INVALIDCALL, got %08x\n", hr); - - cleanup: - if(device) IDirect3DDevice9_Release(device); - if(d3d9) IDirect3D9_Release(d3d9); -} - START_TEST(device) { HMODULE d3d9_handle = LoadLibraryA( "d3d9.dll" ); @@ -2080,6 +2045,5 @@ START_TEST(device) test_vertex_buffer_alignment(); test_lights(); test_set_stream_source(); - test_set_material(); } }

1 0

Paul Vriens : advapi32/tests: Add tests for EnumServicesStatusA.
by Alexandre Julliard Aug. 22, 2008

Aug. 22, 2008

Module: wine Branch: master Commit: 0539b463e65b386f4aa4c4235bf83d7f1d003e48 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0539b463e65b386f4aa4c4235… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Thu Aug 21 16:14:45 2008 +0200 advapi32/tests: Add tests for EnumServicesStatusA. --- dlls/advapi32/tests/service.c | 354 +++++++++++++++++++++++++++++++++++++++++ 1 files changed, 354 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0539b463e65b386f4aa4c…

1 0

Paul Vriens : advapi32/tests: Add tests for QueryServiceStatusEx.
by Alexandre Julliard Aug. 22, 2008

Aug. 22, 2008

Module: wine Branch: master Commit: 794752200131184506e84939ac13a8e68f772879 URL: http://source.winehq.org/git/wine.git/?a=commit;h=794752200131184506e84939a… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Thu Aug 21 09:00:05 2008 +0200 advapi32/tests: Add tests for QueryServiceStatusEx. --- dlls/advapi32/tests/service.c | 95 +++++++++++++++++++++++++++++++++++++++++ 1 files changed, 95 insertions(+), 0 deletions(-) diff --git a/dlls/advapi32/tests/service.c b/dlls/advapi32/tests/service.c index 746530a..2027e38 100644 --- a/dlls/advapi32/tests/service.c +++ b/dlls/advapi32/tests/service.c @@ -36,6 +36,8 @@ static const CHAR spooler[] = "Spooler"; /* Should be available on all platforms static BOOL (WINAPI *pChangeServiceConfig2A)(SC_HANDLE,DWORD,LPVOID); static BOOL (WINAPI *pQueryServiceConfig2A)(SC_HANDLE,DWORD,LPBYTE,DWORD,LPDWORD); static BOOL (WINAPI *pQueryServiceConfig2W)(SC_HANDLE,DWORD,LPBYTE,DWORD,LPDWORD); +static BOOL (WINAPI *pQueryServiceStatusEx)(SC_HANDLE, SC_STATUS_TYPE, LPBYTE, + DWORD, LPDWORD); static void init_function_pointers(void) { @@ -44,6 +46,7 @@ static void init_function_pointers(void) pChangeServiceConfig2A = (void*)GetProcAddress(hadvapi32, "ChangeServiceConfig2A"); pQueryServiceConfig2A= (void*)GetProcAddress(hadvapi32, "QueryServiceConfig2A"); pQueryServiceConfig2W= (void*)GetProcAddress(hadvapi32, "QueryServiceConfig2W"); + pQueryServiceStatusEx= (void*)GetProcAddress(hadvapi32, "QueryServiceStatusEx"); } static void test_open_scm(void) @@ -802,6 +805,8 @@ static void test_query_svc(void) SC_HANDLE scm_handle, svc_handle; BOOL ret; SERVICE_STATUS status; + SERVICE_STATUS_PROCESS *statusproc; + DWORD bufsize, needed; /* All NULL or wrong */ SetLastError(0xdeadbeef); @@ -852,6 +857,96 @@ static void test_query_svc(void) "Unexpected last error %d\n", GetLastError()); CloseServiceHandle(svc_handle); + + /* More or less the same tests for QueryServiceStatusEx */ + + /* Open service with not enough rights to query the status */ + svc_handle = OpenServiceA(scm_handle, spooler, STANDARD_RIGHTS_READ); + + /* All NULL or wrong, this proves that info level is checked first */ + SetLastError(0xdeadbeef); + ret = pQueryServiceStatusEx(NULL, 1, NULL, 0, NULL); + ok(!ret, "Expected failure\n"); + todo_wine + ok(GetLastError() == ERROR_INVALID_LEVEL, + "Expected ERROR_INVALID_LEVEL, got %d\n", GetLastError()); + + /* Passing a NULL parameter for the needed buffer size + * will crash on anything but NT4. + */ + + /* Only info level is correct. It looks like the buffer/size is checked second */ + SetLastError(0xdeadbeef); + ret = pQueryServiceStatusEx(NULL, 0, NULL, 0, &needed); + /* NT4 checks the handle first */ + if (GetLastError() != ERROR_INVALID_HANDLE) + { + ok(!ret, "Expected failure\n"); + ok(needed == sizeof(SERVICE_STATUS_PROCESS), + "Needed buffersize is wrong : %d\n", needed); + ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, + "Expected ERROR_INSUFFICIENT_BUFFER, got %d\n", GetLastError()); + } + + /* Pass a correct buffer and buffersize but a NULL handle */ + statusproc = HeapAlloc(GetProcessHeap(), 0, needed); + bufsize = needed; + SetLastError(0xdeadbeef); + ret = pQueryServiceStatusEx(NULL, 0, (BYTE*)statusproc, bufsize, &needed); + ok(!ret, "Expected failure\n"); + ok(GetLastError() == ERROR_INVALID_HANDLE, + "Expected ERROR_INVALID_HANDLE, got %d\n", GetLastError()); + HeapFree(GetProcessHeap(), 0, statusproc); + + /* Correct handle and info level */ + SetLastError(0xdeadbeef); + ret = pQueryServiceStatusEx(svc_handle, 0, NULL, 0, &needed); + /* NT4 doesn't return the needed size */ + if (GetLastError() != ERROR_INVALID_PARAMETER) + { + ok(!ret, "Expected failure\n"); + todo_wine + { + ok(needed == sizeof(SERVICE_STATUS_PROCESS), + "Needed buffersize is wrong : %d\n", needed); + ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, + "Expected ERROR_INSUFFICIENT_BUFFER, got %d\n", GetLastError()); + } + } + + /* All parameters are OK but we don't have enough rights */ + statusproc = HeapAlloc(GetProcessHeap(), 0, sizeof(SERVICE_STATUS_PROCESS)); + bufsize = sizeof(SERVICE_STATUS_PROCESS); + SetLastError(0xdeadbeef); + ret = pQueryServiceStatusEx(svc_handle, 0, (BYTE*)statusproc, bufsize, &needed); + ok(!ret, "Expected failure\n"); + ok(GetLastError() == ERROR_ACCESS_DENIED, + "Expected ERROR_ACCESS_DENIED, got %d\n", GetLastError()); + HeapFree(GetProcessHeap(), 0, statusproc); + + /* Open the service with just enough rights. */ + CloseServiceHandle(svc_handle); + svc_handle = OpenServiceA(scm_handle, spooler, SERVICE_QUERY_STATUS); + + /* Everything should be fine now. */ + statusproc = HeapAlloc(GetProcessHeap(), 0, sizeof(SERVICE_STATUS_PROCESS)); + bufsize = sizeof(SERVICE_STATUS_PROCESS); + SetLastError(0xdeadbeef); + ret = pQueryServiceStatusEx(svc_handle, 0, (BYTE*)statusproc, bufsize, &needed); + ok(ret, "Expected success\n"); + ok(GetLastError() == ERROR_SUCCESS /* W2K3 */ || + GetLastError() == 0xdeadbeef /* NT4, XP and Vista */ || + GetLastError() == ERROR_IO_PENDING /* W2K */, + "Unexpected last error %d\n", GetLastError()); + if (statusproc->dwCurrentState == SERVICE_RUNNING) + ok(statusproc->dwProcessId != 0, + "Expect a process id for this running service\n"); + else + ok(statusproc->dwProcessId == 0, + "Expect no process id for this stopped service\n"); + HeapFree(GetProcessHeap(), 0, statusproc); + + CloseServiceHandle(svc_handle); CloseServiceHandle(scm_handle); }

1 0

Alexander Nicolaysen Sørnes : regedit: Convert AddEntryToTree to unicode.
by Alexandre Julliard Aug. 22, 2008

Aug. 22, 2008

Module: wine Branch: master Commit: 74cae34da8cac146fafc1e477f6edc3be26ec9ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=74cae34da8cac146fafc1e477… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Fri Aug 22 00:12:09 2008 +0200 regedit: Convert AddEntryToTree to unicode. --- programs/regedit/treeview.c | 67 +++++++++++++++++++++++------------------- 1 files changed, 37 insertions(+), 30 deletions(-) diff --git a/programs/regedit/treeview.c b/programs/regedit/treeview.c index 61c13ad..dcfb7fa 100644 --- a/programs/regedit/treeview.c +++ b/programs/regedit/treeview.c @@ -232,26 +232,30 @@ BOOL DeleteNode(HWND hwndTV, HTREEITEM hItem) } /* Add an entry to the tree. Only give hKey for root nodes (HKEY_ constants) */ -static HTREEITEM AddEntryToTree(HWND hwndTV, HTREEITEM hParent, LPTSTR label, HKEY hKey, DWORD dwChildren) +static HTREEITEM AddEntryToTree(HWND hwndTV, HTREEITEM hParent, LPWSTR label, HKEY hKey, DWORD dwChildren) { TVINSERTSTRUCT tvins; + CHAR* labelA = GetMultiByteString(label); + HTREEITEM ret; if (hKey) { - if (RegQueryInfoKey(hKey, 0, 0, 0, &dwChildren, 0, 0, 0, 0, 0, 0, 0) != ERROR_SUCCESS) { + if (RegQueryInfoKeyW(hKey, 0, 0, 0, &dwChildren, 0, 0, 0, 0, 0, 0, 0) != ERROR_SUCCESS) { dwChildren = 0; } } tvins.u.item.mask = TVIF_TEXT | TVIF_IMAGE | TVIF_SELECTEDIMAGE | TVIF_CHILDREN | TVIF_PARAM; - tvins.u.item.pszText = label; - tvins.u.item.cchTextMax = lstrlen(label); + tvins.u.item.pszText = labelA; + tvins.u.item.cchTextMax = lstrlen(labelA); tvins.u.item.iImage = Image_Closed; tvins.u.item.iSelectedImage = Image_Open; tvins.u.item.cChildren = dwChildren; tvins.u.item.lParam = (LPARAM)hKey; tvins.hInsertAfter = (HTREEITEM)(hKey ? TVI_LAST : TVI_SORT); tvins.hParent = hParent; - return TreeView_InsertItem(hwndTV, &tvins); + ret = TreeView_InsertItem(hwndTV, &tvins); + HeapFree(GetProcessHeap(), 0, labelA); + return ret; } static BOOL match_string(LPCTSTR sstring1, LPCTSTR sstring2, int mode) @@ -388,20 +392,20 @@ static BOOL RefreshTreeItem(HWND hwndTV, HTREEITEM hItem) { HKEY hRoot, hKey, hSubKey; HTREEITEM childItem; - LPTSTR KeyPath; + LPWSTR KeyPath; DWORD dwCount, dwIndex, dwMaxSubKeyLen; - LPSTR Name; + LPWSTR Name; TVITEM tvItem; hRoot = NULL; - KeyPath = GetItemPath(hwndTV, hItem, &hRoot); + KeyPath = GetItemPathW(hwndTV, hItem, &hRoot); if (!KeyPath || !hRoot) return FALSE; if (*KeyPath) { - if (RegOpenKeyEx(hRoot, KeyPath, 0, KEY_READ, &hKey) != ERROR_SUCCESS) { - WINE_TRACE("RegOpenKeyEx failed, \"%s\" was probably removed.\n", KeyPath); + if (RegOpenKeyExW(hRoot, KeyPath, 0, KEY_READ, &hKey) != ERROR_SUCCESS) { + WINE_TRACE("RegOpenKeyEx failed, %s was probably removed.\n", wine_dbgstr_w(KeyPath)); return FALSE; } } else { @@ -409,7 +413,7 @@ static BOOL RefreshTreeItem(HWND hwndTV, HTREEITEM hItem) } HeapFree(GetProcessHeap(), 0, KeyPath); - if (RegQueryInfoKey(hKey, 0, 0, 0, &dwCount, &dwMaxSubKeyLen, 0, 0, 0, 0, 0, 0) != ERROR_SUCCESS) { + if (RegQueryInfoKeyW(hKey, 0, 0, 0, &dwCount, &dwMaxSubKeyLen, 0, 0, 0, 0, 0, 0) != ERROR_SUCCESS) { return FALSE; } @@ -428,7 +432,7 @@ static BOOL RefreshTreeItem(HWND hwndTV, HTREEITEM hItem) } dwMaxSubKeyLen++; /* account for the \0 terminator */ - if (!(Name = HeapAlloc(GetProcessHeap(), 0, dwMaxSubKeyLen * sizeof(TCHAR)))) { + if (!(Name = HeapAlloc(GetProcessHeap(), 0, dwMaxSubKeyLen * sizeof(WCHAR)))) { return FALSE; } tvItem.cchTextMax = dwMaxSubKeyLen; @@ -440,38 +444,43 @@ static BOOL RefreshTreeItem(HWND hwndTV, HTREEITEM hItem) for (dwIndex = 0; dwIndex < dwCount; dwIndex++) { DWORD cName = dwMaxSubKeyLen, dwSubCount; BOOL found; + CHAR* NameA; found = FALSE; - if (RegEnumKeyEx(hKey, dwIndex, Name, &cName, 0, 0, 0, NULL) != ERROR_SUCCESS) { + if (RegEnumKeyExW(hKey, dwIndex, Name, &cName, 0, 0, 0, NULL) != ERROR_SUCCESS) { continue; } /* Find the number of children of the node. */ dwSubCount = 0; - if (RegOpenKeyEx(hKey, Name, 0, KEY_QUERY_VALUE, &hSubKey) == ERROR_SUCCESS) { + if (RegOpenKeyExW(hKey, Name, 0, KEY_QUERY_VALUE, &hSubKey) == ERROR_SUCCESS) { if (RegQueryInfoKey(hSubKey, 0, 0, 0, &dwSubCount, 0, 0, 0, 0, 0, 0, 0) != ERROR_SUCCESS) { dwSubCount = 0; } RegCloseKey(hSubKey); } + NameA = GetMultiByteString(Name); + /* Check if the node is already in there. */ for (childItem = TreeView_GetChild(hwndTV, hItem); childItem; childItem = TreeView_GetNextSibling(hwndTV, childItem)) { tvItem.mask = TVIF_TEXT; tvItem.hItem = childItem; if (!TreeView_GetItem(hwndTV, &tvItem)) { + HeapFree(GetProcessHeap(), 0, NameA); return FALSE; } - if (!stricmp(tvItem.pszText, Name)) { + if (!stricmp(tvItem.pszText, NameA)) { found = TRUE; + HeapFree(GetProcessHeap(), 0, NameA); break; } } if (found == FALSE) { - WINE_TRACE("New subkey %s\n", Name); + WINE_TRACE("New subkey %s\n", NameA); AddEntryToTree(hwndTV, hItem, Name, NULL, dwSubCount); } } @@ -527,9 +536,7 @@ HTREEITEM InsertNode(HWND hwndTV, HTREEITEM hItem, LPWSTR name) if (!hItem) hItem = TreeView_GetSelection(hwndTV); if (!hItem) return FALSE; if (TreeView_GetItemState(hwndTV, hItem, TVIS_EXPANDEDONCE)) { - char* nameA = GetMultiByteString(name); - hNewItem = AddEntryToTree(hwndTV, hItem, nameA, 0, 0); - HeapFree(GetProcessHeap(), 0, nameA); + hNewItem = AddEntryToTree(hwndTV, hItem, name, 0, 0); } else { item.mask = TVIF_CHILDREN | TVIF_HANDLE; item.hItem = hItem; @@ -568,7 +575,7 @@ static BOOL InitTreeViewItems(HWND hwndTV, LPTSTR pHostName) { TVINSERTSTRUCT tvins; HTREEITEM hRoot; - static TCHAR hkcr[] = {'H','K','E','Y','_','C','L','A','S','S','E','S','_','R','O','O','T',0}, + static WCHAR hkcr[] = {'H','K','E','Y','_','C','L','A','S','S','E','S','_','R','O','O','T',0}, hkcu[] = {'H','K','E','Y','_','C','U','R','R','E','N','T','_','U','S','E','R',0}, hklm[] = {'H','K','E','Y','_','L','O','C','A','L','_','M','A','C','H','I','N','E',0}, hku[] = {'H','K','E','Y','_','U','S','E','R','S',0}, @@ -646,8 +653,8 @@ BOOL UpdateExpandingTree(HWND hwndTV, HTREEITEM hItem, int state) { DWORD dwCount, dwIndex, dwMaxSubKeyLen; HKEY hRoot, hNewKey, hKey; - LPTSTR keyPath; - LPTSTR Name; + LPWSTR keyPath; + LPWSTR Name; LONG errCode; HCURSOR hcursorOld; @@ -658,32 +665,32 @@ BOOL UpdateExpandingTree(HWND hwndTV, HTREEITEM hItem, int state) } expanding = TRUE; hcursorOld = SetCursor(LoadCursor(NULL, IDC_WAIT)); - SendMessage(hwndTV, WM_SETREDRAW, FALSE, 0); + SendMessageW(hwndTV, WM_SETREDRAW, FALSE, 0); - keyPath = GetItemPath(hwndTV, hItem, &hRoot); + keyPath = GetItemPathW(hwndTV, hItem, &hRoot); if (!keyPath) goto done; if (*keyPath) { - errCode = RegOpenKeyEx(hRoot, keyPath, 0, KEY_READ, &hNewKey); + errCode = RegOpenKeyExW(hRoot, keyPath, 0, KEY_READ, &hNewKey); if (errCode != ERROR_SUCCESS) goto done; } else { hNewKey = hRoot; } - errCode = RegQueryInfoKey(hNewKey, 0, 0, 0, &dwCount, &dwMaxSubKeyLen, 0, 0, 0, 0, 0, 0); + errCode = RegQueryInfoKeyW(hNewKey, 0, 0, 0, &dwCount, &dwMaxSubKeyLen, 0, 0, 0, 0, 0, 0); if (errCode != ERROR_SUCCESS) goto done; dwMaxSubKeyLen++; /* account for the \0 terminator */ - Name = HeapAlloc(GetProcessHeap(), 0, dwMaxSubKeyLen * sizeof(TCHAR)); + Name = HeapAlloc(GetProcessHeap(), 0, dwMaxSubKeyLen * sizeof(WCHAR)); if (!Name) goto done; for (dwIndex = 0; dwIndex < dwCount; dwIndex++) { DWORD cName = dwMaxSubKeyLen, dwSubCount; - errCode = RegEnumKeyEx(hNewKey, dwIndex, Name, &cName, 0, 0, 0, 0); + errCode = RegEnumKeyExW(hNewKey, dwIndex, Name, &cName, 0, 0, 0, 0); if (errCode != ERROR_SUCCESS) continue; - errCode = RegOpenKeyEx(hNewKey, Name, 0, KEY_QUERY_VALUE, &hKey); + errCode = RegOpenKeyExW(hNewKey, Name, 0, KEY_QUERY_VALUE, &hKey); if (errCode == ERROR_SUCCESS) { - errCode = RegQueryInfoKey(hKey, 0, 0, 0, &dwSubCount, 0, 0, 0, 0, 0, 0, 0); + errCode = RegQueryInfoKeyW(hKey, 0, 0, 0, &dwSubCount, 0, 0, 0, 0, 0, 0, 0); RegCloseKey(hKey); } if (errCode != ERROR_SUCCESS) dwSubCount = 0;

1 0