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

Stefan Dösinger : wined3d: Add WINED3DLOCKED_RECT to wined3d_types.h.
by Alexandre Julliard April 6, 2006

April 6, 2006

Module: wine Branch: refs/heads/master Commit: bbe490abcc988c6ae23028f045ab448f4e5ad977 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=bbe490abcc988c6ae23028f… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Thu Apr 6 19:36:02 2006 +0200 wined3d: Add WINED3DLOCKED_RECT to wined3d_types.h. --- dlls/d3d8/cubetexture.c | 2 +- dlls/d3d8/surface.c | 2 +- dlls/d3d8/texture.c | 2 +- dlls/d3d9/cubetexture.c | 2 +- dlls/d3d9/surface.c | 2 +- dlls/d3d9/texture.c | 2 +- dlls/wined3d/cubetexture.c | 2 +- dlls/wined3d/device.c | 8 ++++---- dlls/wined3d/drawprim.c | 2 +- dlls/wined3d/surface.c | 2 +- dlls/wined3d/texture.c | 2 +- include/wine/wined3d_interface.h | 6 +++--- include/wine/wined3d_types.h | 4 ++++ 13 files changed, 21 insertions(+), 17 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=bbe490abcc988c6ae23…

1 0

Stefan Dösinger : wined3d: Add WINED3DTEXTUREFILTERTYPE to wined3d_types.h.
by Alexandre Julliard April 6, 2006

April 6, 2006

Module: wine Branch: refs/heads/master Commit: 63fd9a7a9881d2175aae78c647c6c1dd4f7b5a22 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=63fd9a7a9881d2175aae78c… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Thu Apr 6 19:02:16 2006 +0200 wined3d: Add WINED3DTEXTUREFILTERTYPE to wined3d_types.h. --- dlls/d3d9/basetexture.c | 4 ++-- dlls/d3d9/cubetexture.c | 4 ++-- dlls/d3d9/device.c | 2 +- dlls/d3d9/texture.c | 4 ++-- dlls/d3d9/volumetexture.c | 4 ++-- dlls/wined3d/basetexture.c | 29 ++++++++++++++--------------- dlls/wined3d/cubetexture.c | 4 ++-- dlls/wined3d/device.c | 4 ++-- dlls/wined3d/directx.c | 38 +++++++++++++++++++------------------- dlls/wined3d/stateblock.c | 6 +++--- dlls/wined3d/texture.c | 4 ++-- dlls/wined3d/volumetexture.c | 4 ++-- dlls/wined3d/wined3d_private.h | 6 +++--- include/wine/wined3d_interface.h | 18 +++++++++--------- include/wine/wined3d_types.h | 12 ++++++++++++ 15 files changed, 77 insertions(+), 66 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=63fd9a7a9881d2175aa…

1 0

Paul Vriens : netapi32: Add (stubbed) NetSessionEnum.
by Alexandre Julliard April 6, 2006

April 6, 2006

Module: wine Branch: refs/heads/master Commit: e29dd373b2ab5e7f9be123d048cfcc23f9c9441f URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=e29dd373b2ab5e7f9be123d… Author: Paul Vriens <paul.vriens(a)xs4all.nl> Date: Thu Apr 6 14:34:14 2006 +0200 netapi32: Add (stubbed) NetSessionEnum. --- dlls/netapi32/Makefile.in | 1 + dlls/netapi32/netapi32.spec | 2 + dlls/netapi32/share.c | 58 +++++++++++++++++++++++++++++++++++++++++++ include/lmshare.h | 4 +++ 4 files changed, 64 insertions(+), 1 deletions(-) create mode 100644 dlls/netapi32/share.c diff --git a/dlls/netapi32/Makefile.in b/dlls/netapi32/Makefile.in index b898d10..d172ce7 100644 --- a/dlls/netapi32/Makefile.in +++ b/dlls/netapi32/Makefile.in @@ -17,6 +17,7 @@ C_SRCS = \ nbt.c \ netapi32.c \ netbios.c \ + share.c \ wksta.c SUBDIRS = tests diff --git a/dlls/netapi32/netapi32.spec b/dlls/netapi32/netapi32.spec index dbb42c4..c92b59a 100644 --- a/dlls/netapi32/netapi32.spec +++ b/dlls/netapi32/netapi32.spec @@ -184,7 +184,7 @@ @ stub NetServiceGetInfo @ stub NetServiceInstall @ stub NetSessionDel -@ stub NetSessionEnum +@ stdcall NetSessionEnum(wstr wstr wstr long ptr long ptr ptr ptr) @ stub NetSessionGetInfo @ stub NetShareAdd @ stub NetShareCheck diff --git a/dlls/netapi32/share.c b/dlls/netapi32/share.c new file mode 100644 index 0000000..c81381e --- /dev/null +++ b/dlls/netapi32/share.c @@ -0,0 +1,58 @@ +/* Copyright 2006 Paul Vriens + * + * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#include "wine/debug.h" +#include "lm.h" + +WINE_DEFAULT_DEBUG_CHANNEL(share); + +/************************************************************ + * NetSessionEnum (NETAPI32.@) + * + * PARAMS + * servername [I] Pointer to a string with the name of the server + * UncClientName [I] Pointer to a string with the name of the session + * username [I] Pointer to a string with the name of the user + * level [I] Data information level + * bufptr [O] Buffer to the data + * prefmaxlen [I] Preferred maximum length of the data + * entriesread [O] Pointer to the number of entries enumerated + * totalentries [O] Pointer to the possible number of entries + * resume_handle [I/O] Pointer to a handle for subsequent searches + * + * RETURNS + * If successful, the function returns NERR_Success + * On failure it returns: + * ERROR_ACCESS_DENIED User has no access to the requested information + * ERROR_INVALID_LEVEL Value of 'level' is not correct + * ERROR_INVALID_PARAMETER Wrong parameter + * ERROR_MORE_DATA Need a larger buffer + * ERROR_NOT_ENOUGH_MEMORY Not enough memory + * NERR_ClientNameNotFound A session does not exist on a given computer + * NERR_InvalidComputer Invalid computer name + * NERR_UserNotFound User name could not be found. + */ +NET_API_STATUS WINAPI NetSessionEnum(LPWSTR servername, LPWSTR UncClientName, + LPWSTR username, DWORD level, LPBYTE* bufptr, DWORD prefmaxlen, LPDWORD entriesread, + LPDWORD totalentries, LPDWORD resume_handle) +{ + FIXME("Stub (%s %s %s %ld %p %ld %p %p %p)\n", debugstr_w(servername), + debugstr_w(UncClientName), debugstr_w(username), + level, bufptr, prefmaxlen, entriesread, totalentries, resume_handle); + + return NERR_Success; +} diff --git a/include/lmshare.h b/include/lmshare.h index 9cace8e..8c7c83c 100644 --- a/include/lmshare.h +++ b/include/lmshare.h @@ -42,6 +42,10 @@ NET_API_STATUS WINAPI NetShareEnum(LMSTR #define STYPE_IPC 3 #define STYPE_SPECIAL 0x80000000 +NET_API_STATUS NET_API_FUNCTION NetSessionEnum(LMSTR servername, LMSTR UncClientName, + LMSTR username, DWORD level, LPBYTE *bufptr, DWORD prefmaxlen, LPDWORD entriesread, + LPDWORD totalentries, LPDWORD resume_handle); + #ifdef __cplusplus } #endif

1 0

James Hawkins : advpack: Add initial tests for SetPerUserSecValues.
by Alexandre Julliard April 6, 2006

April 6, 2006

Module: wine Branch: refs/heads/master Commit: a7e055e0bd9e1164493a2677dd1fb1c855a2d045 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=a7e055e0bd9e1164493a267… Author: James Hawkins <truiken(a)gmail.com> Date: Thu Apr 6 03:48:49 2006 -0500 advpack: Add initial tests for SetPerUserSecValues. --- dlls/advpack/tests/advpack.c | 111 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 110 insertions(+), 1 deletions(-) diff --git a/dlls/advpack/tests/advpack.c b/dlls/advpack/tests/advpack.c index 857458b..15cf3fc 100644 --- a/dlls/advpack/tests/advpack.c +++ b/dlls/advpack/tests/advpack.c @@ -25,13 +25,20 @@ #include <assert.h> #include "wine/test.h" +/* defines for the TranslateInfString/Ex tests */ #define TEST_STRING1 "\\Application Name" #define TEST_STRING2 "%49001%\\Application Name" +/* defines for the SetPerUserSecValues tests */ +#define GUID_KEY "SOFTWARE\\Microsoft\\Active Setup\\Installed Components\\guid" +#define REG_VAL_EXISTS(key, value) !RegQueryValueEx(key, value, NULL, NULL, NULL, NULL) +#define OPEN_GUID_KEY() !RegOpenKey(HKEY_LOCAL_MACHINE, GUID_KEY, &guid) + static HRESULT (WINAPI *pCloseINFEngine)(HINF); static HRESULT (WINAPI *pDelNode)(LPCSTR,DWORD); static HRESULT (WINAPI *pGetVersionFromFile)(LPSTR,LPDWORD,LPDWORD,BOOL); static HRESULT (WINAPI *pOpenINFEngine)(PCSTR,PCSTR,DWORD,HINF*,PVOID); +static HRESULT (WINAPI *pSetPerUserSecValues)(PPERUSERSECTION pPerUser); static HRESULT (WINAPI *pTranslateInfString)(LPSTR,LPSTR,LPSTR,LPSTR,LPSTR,DWORD,LPDWORD,LPVOID); static HRESULT (WINAPI *pTranslateInfStringEx)(HINF,PCSTR,PCSTR,PCSTR,PSTR,DWORD,PDWORD,PVOID); @@ -62,11 +69,12 @@ static BOOL init_function_pointers(void) pDelNode = (void *)GetProcAddress(hAdvPack, "DelNode"); pGetVersionFromFile = (void *)GetProcAddress(hAdvPack, "GetVersionFromFile"); pOpenINFEngine = (void*)GetProcAddress(hAdvPack, "OpenINFEngine"); + pSetPerUserSecValues = (void*)GetProcAddress(hAdvPack, "SetPerUserSecValues"); pTranslateInfString = (void *)GetProcAddress(hAdvPack, "TranslateInfString"); pTranslateInfStringEx = (void*)GetProcAddress(hAdvPack, "TranslateInfStringEx"); if (!pCloseINFEngine || !pDelNode || !pGetVersionFromFile || - !pOpenINFEngine || !pTranslateInfString) + !pOpenINFEngine || !pSetPerUserSecValues || !pTranslateInfString) return FALSE; return TRUE; @@ -389,6 +397,106 @@ static void translateinfstringex_test(vo DeleteFileA("c:\\test.inf"); } +static BOOL check_reg_str(HKEY hkey, LPSTR name, LPSTR value) +{ + DWORD size = MAX_PATH; + char check[MAX_PATH]; + + if (RegQueryValueEx(hkey, name, NULL, NULL, (LPBYTE)check, &size)) + return FALSE; + + return !lstrcmp(check, value); +} + +static BOOL check_reg_dword(HKEY hkey, LPSTR name, DWORD value) +{ + DWORD size = sizeof(DWORD); + DWORD check; + + if (RegQueryValueEx(hkey, name, NULL, NULL, (LPBYTE)&check, &size)) + return FALSE; + + return (check == value); +} + +static void setperusersecvalues_test() +{ + PERUSERSECTION peruser; + HRESULT hr; + HKEY guid; + + lstrcpy(peruser.szGUID, "guid"); + lstrcpy(peruser.szDispName, "displayname"); + lstrcpy(peruser.szLocale, "locale"); + lstrcpy(peruser.szStub, "stub"); + lstrcpy(peruser.szVersion, "1,1,1,1"); + lstrcpy(peruser.szCompID, "compid"); + peruser.dwIsInstalled = 1; + peruser.bRollback = FALSE; + + /* set initial values */ + hr = pSetPerUserSecValues(&peruser); + todo_wine + { + ok(hr == S_OK, "Expected S_OK, got %ld\n", hr); + ok(OPEN_GUID_KEY(), "Expected guid key to exist\n"); + ok(check_reg_str(guid, NULL, "displayname"), "Expected displayname\n"); + ok(check_reg_str(guid, "ComponentID", "compid"), "Expected compid\n"); + ok(check_reg_str(guid, "Locale", "locale"), "Expected locale\n"); + ok(check_reg_str(guid, "StubPath", "stub"), "Expected stub\n"); + ok(check_reg_str(guid, "Version", "1,1,1,1"), "Expected 1,1,1,1\n"); + ok(check_reg_dword(guid, "IsInstalled", 1), "Expected 1\n"); + } + ok(!REG_VAL_EXISTS(guid, "OldDisplayName"), "Expected OldDisplayName to not exist\n"); + ok(!REG_VAL_EXISTS(guid, "OldLocale"), "Expected OldLocale to not exist\n"); + ok(!REG_VAL_EXISTS(guid, "OldStubPath"), "Expected OldStubPath to not exist\n"); + ok(!REG_VAL_EXISTS(guid, "OldVersion"), "Expected OldVersion to not exist\n"); + ok(!REG_VAL_EXISTS(guid, "RealStubPath"), "Expected RealStubPath to not exist\n"); + + /* raise the version, but bRollback is FALSE, so vals not saved */ + lstrcpy(peruser.szVersion, "2,1,1,1"); + hr = pSetPerUserSecValues(&peruser); + todo_wine + { + ok(hr == S_OK, "Expected S_OK, got %ld\n", hr); + ok(check_reg_str(guid, NULL, "displayname"), "Expected displayname\n"); + ok(check_reg_str(guid, "ComponentID", "compid"), "Expected compid\n"); + ok(check_reg_str(guid, "Locale", "locale"), "Expected locale\n"); + ok(check_reg_str(guid, "StubPath", "stub"), "Expected stub\n"); + ok(check_reg_str(guid, "Version", "2,1,1,1"), "Expected 2,1,1,1\n"); + ok(check_reg_dword(guid, "IsInstalled", 1), "Expected 1\n"); + } + ok(!REG_VAL_EXISTS(guid, "OldDisplayName"), "Expected OldDisplayName to not exist\n"); + ok(!REG_VAL_EXISTS(guid, "OldLocale"), "Expected OldLocale to not exist\n"); + ok(!REG_VAL_EXISTS(guid, "OldStubPath"), "Expected OldStubPath to not exist\n"); + ok(!REG_VAL_EXISTS(guid, "OldVersion"), "Expected OldVersion to not exist\n"); + ok(!REG_VAL_EXISTS(guid, "RealStubPath"), "Expected RealStubPath to not exist\n"); + + /* raise the version again, bRollback is TRUE so vals are saved */ + peruser.bRollback = 1; + lstrcpy(peruser.szVersion, "3,1,1,1"); + hr = pSetPerUserSecValues(&peruser); + todo_wine + { + ok(hr == S_OK, "Expected S_OK, got %ld\n", hr); + ok(check_reg_str(guid, NULL, "displayname"), "Expected displayname\n"); + ok(check_reg_str(guid, "ComponentID", "compid"), "Expected compid\n"); + ok(check_reg_str(guid, "Locale", "locale"), "Expected locale\n"); + ok(check_reg_dword(guid, "IsInstalled", 1), "Expected 1\n"); + ok(check_reg_str(guid, "OldDisplayName", "displayname"), "Expected displayname\n"); + ok(check_reg_str(guid, "OldLocale", "locale"), "Expected locale\n"); + ok(check_reg_str(guid, "RealStubPath", "stub"), "Expected stub\n"); + ok(check_reg_str(guid, "OldStubPath", "stub"), "Expected stub\n"); + ok(check_reg_str(guid, "OldVersion", "2,1,1,1"), "Expected 2,1,1,1\n"); + ok(check_reg_str(guid, "StubPath", + "rundll32.exe advpack.dll,UserInstStubWrapper guid"), + "Expected real stub\n"); + ok(check_reg_str(guid, "Version", "3,1,1,1"), "Expected 3,1,1,1\n"); + } + + RegDeleteKey(HKEY_LOCAL_MACHINE, GUID_KEY); +} + START_TEST(advpack) { if (!init_function_pointers()) @@ -398,6 +506,7 @@ START_TEST(advpack) version_test(); delnode_test(); + setperusersecvalues_test(); translateinfstring_test(); translateinfstringex_test(); }

1 0

Huw Davies : comctl32: Set the sheet caption before invoking the sheet callback and before creating the pages .
by Alexandre Julliard April 6, 2006

April 6, 2006

Module: wine Branch: refs/heads/master Commit: 517b85f989b3adf446dc6cdfdd84f12a702a49af URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=517b85f989b3adf446dc6cd… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Apr 6 16:55:32 2006 +0100 comctl32: Set the sheet caption before invoking the sheet callback and before creating the pages. --- dlls/comctl32/propsheet.c | 31 ++++++----- dlls/comctl32/tests/.gitignore | 2 + dlls/comctl32/tests/Makefile.in | 3 + dlls/comctl32/tests/propsheet.c | 107 ++++++++++++++++++++++++++++++++++++++ dlls/comctl32/tests/propsheet.rc | 29 ++++++++++ 5 files changed, 157 insertions(+), 15 deletions(-) create mode 100644 dlls/comctl32/tests/propsheet.c create mode 100644 dlls/comctl32/tests/propsheet.rc diff --git a/dlls/comctl32/propsheet.c b/dlls/comctl32/propsheet.c index 78fdc43..141b794 100644 --- a/dlls/comctl32/propsheet.c +++ b/dlls/comctl32/propsheet.c @@ -3427,21 +3427,6 @@ PROPSHEET_DialogProc(HWND hwnd, UINT uMs } } - if (psInfo->useCallback) - (*(psInfo->ppshheader.pfnCallback))(hwnd, - PSCB_INITIALIZED, (LPARAM)0); - - idx = psInfo->active_page; - ppshpage = (LPCPROPSHEETPAGEW)psInfo->proppage[idx].hpage; - psInfo->active_page = -1; - - PROPSHEET_SetCurSel(hwnd, idx, 1, psInfo->proppage[idx].hpage); - - /* doing TCM_SETCURSEL seems to be needed even in case of PSH_WIZARD, - * as some programs call TCM_GETCURSEL to get the current selection - * from which to switch to the next page */ - SendMessageW(hwndTabCtrl, TCM_SETCURSEL, psInfo->active_page, 0); - if (!HIWORD(psInfo->ppshheader.pszCaption) && psInfo->ppshheader.hInstance) { @@ -3457,6 +3442,22 @@ PROPSHEET_DialogProc(HWND hwnd, UINT uMs psInfo->ppshheader.pszCaption); } + + if (psInfo->useCallback) + (*(psInfo->ppshheader.pfnCallback))(hwnd, + PSCB_INITIALIZED, (LPARAM)0); + + idx = psInfo->active_page; + ppshpage = (LPCPROPSHEETPAGEW)psInfo->proppage[idx].hpage; + psInfo->active_page = -1; + + PROPSHEET_SetCurSel(hwnd, idx, 1, psInfo->proppage[idx].hpage); + + /* doing TCM_SETCURSEL seems to be needed even in case of PSH_WIZARD, + * as some programs call TCM_GETCURSEL to get the current selection + * from which to switch to the next page */ + SendMessageW(hwndTabCtrl, TCM_SETCURSEL, psInfo->active_page, 0); + return TRUE; } diff --git a/dlls/comctl32/tests/.gitignore b/dlls/comctl32/tests/.gitignore index c4d729a..e6d715e 100644 --- a/dlls/comctl32/tests/.gitignore +++ b/dlls/comctl32/tests/.gitignore @@ -6,6 +6,8 @@ imagelist.ok monthcal.ok mru.ok progress.ok +propsheet.ok +propsheet.res subclass.ok tab.ok testlist.c diff --git a/dlls/comctl32/tests/Makefile.in b/dlls/comctl32/tests/Makefile.in index 87af63c..c277bd4 100644 --- a/dlls/comctl32/tests/Makefile.in +++ b/dlls/comctl32/tests/Makefile.in @@ -13,6 +13,7 @@ CTESTS = \ monthcal.c \ mru.c \ progress.c \ + propsheet.c \ subclass.c \ tab.c \ toolbar.c \ @@ -20,6 +21,8 @@ CTESTS = \ treeview.c \ updown.c +RC_SRCS = propsheet.rc + @MAKE_TEST_RULES@ ### Dependencies: diff --git a/dlls/comctl32/tests/propsheet.c b/dlls/comctl32/tests/propsheet.c new file mode 100644 index 0000000..a273ad0 --- /dev/null +++ b/dlls/comctl32/tests/propsheet.c @@ -0,0 +1,107 @@ +/* Unit test suite for property sheet control. + * + * Copyright 2006 Huw Davies + * + * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#define NONAMELESSUNION +#define NONAMELESSSTRUCT + +#include <windows.h> +#include <commctrl.h> + +#include "wine/test.h" + +static int CALLBACK sheet_callback(HWND hwnd, UINT msg, LPARAM lparam) +{ + switch(msg) + { + case PSCB_INITIALIZED: + { + char caption[256]; + GetWindowTextA(hwnd, caption, sizeof(caption)); + ok(!strcmp(caption,"test caption"), "caption: %s\n", caption); + return 0; + } + } + return 0; +} + +static INT_PTR CALLBACK page_dlg_proc(HWND hwnd, UINT msg, WPARAM wparam, + LPARAM lparam) +{ + switch(msg) + { + case WM_INITDIALOG: + { + HWND sheet = GetParent(hwnd); + char caption[256]; + GetWindowTextA(sheet, caption, sizeof(caption)); + ok(!strcmp(caption,"test caption"), "caption: %s\n", caption); + return TRUE; + } + + case WM_NOTIFY: + { + NMHDR *nmhdr = (NMHDR *)lparam; + switch(nmhdr->code) + { + case PSN_APPLY: + return TRUE; + default: + return FALSE; + } + } + default: + return FALSE; + } +} + +static void test_title(void) +{ + HPROPSHEETPAGE hpsp[1]; + PROPSHEETPAGEA psp; + PROPSHEETHEADERA psh; + HWND hdlg; + + memset(&psp, 0, sizeof(psp)); + psp.dwSize = sizeof(psp); + psp.dwFlags = 0; + psp.hInstance = GetModuleHandleW(NULL); + psp.u.pszTemplate = "prop_page1"; + psp.u2.pszIcon = NULL; + psp.pfnDlgProc = page_dlg_proc; + psp.lParam = 0; + + hpsp[0] = CreatePropertySheetPageA(&psp); + + memset(&psh, 0, sizeof(psh)); + psh.dwSize = sizeof(psh); + psh.dwFlags = PSH_MODELESS | PSH_USECALLBACK; + psh.pszCaption = "test caption"; + psh.nPages = 1; + psh.hwndParent = GetDesktopWindow(); + psh.u3.phpage = hpsp; + psh.pfnCallback = sheet_callback; + + hdlg = (HWND)PropertySheetA(&psh); + DestroyWindow(hdlg); +} + +START_TEST(propsheet) +{ + test_title(); +} diff --git a/dlls/comctl32/tests/propsheet.rc b/dlls/comctl32/tests/propsheet.rc new file mode 100644 index 0000000..93b8ce7 --- /dev/null +++ b/dlls/comctl32/tests/propsheet.rc @@ -0,0 +1,29 @@ +/* Resources for the unit test suite for property sheet control. + * + * Copyright 2006 Huw Davies + * + * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#include "windef.h" +#include "winuser.h" + +PROP_PAGE1 DIALOG LOADONCALL MOVEABLE DISCARDABLE 5, 43, 227, 215 +STYLE WS_POPUP | WS_CAPTION | WS_CLIPSIBLINGS | WS_VISIBLE +CAPTION "Page1" +FONT 8, "MS Shell Dlg" +{ + LTEXT "Test", -1, 10, 6, 100, 8 +}

1 0

Dmitry Timoshkov : fonts: Add a couple of cyrillic glyphs to all built-in bitmap fonts.
by Alexandre Julliard April 6, 2006

April 6, 2006

Module: wine Branch: refs/heads/master Commit: 6381e458c230a36e9c09c83309f6b63028fad44d URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=6381e458c230a36e9c09c83… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Thu Apr 6 20:53:22 2006 +0900 fonts: Add a couple of cyrillic glyphs to all built-in bitmap fonts. Also add numero-sign to Courier. --- fonts/courier.sfd | 1953 +++++++++++++++++++++--------------------- fonts/ms_sans_serif.sfd | 37 + fonts/small_fonts.sfd | 147 ++- fonts/system.sfd | 2169 ++++++++++++++++++++++++----------------------- 4 files changed, 2205 insertions(+), 2101 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=6381e458c230a36e9c0…

1 0

Alexandre Julliard : ntdll: Print traces for EXC_CallHandler even with the assembly version.
by Alexandre Julliard April 6, 2006

April 6, 2006

Module: wine Branch: refs/heads/master Commit: 00bb4536b090cd1853a74929139665f593e81439 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=00bb4536b090cd1853a7492… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 6 21:32:17 2006 +0200 ntdll: Print traces for EXC_CallHandler even with the assembly version. --- dlls/ntdll/exception.c | 16 +++++++++++----- 1 files changed, 11 insertions(+), 5 deletions(-) diff --git a/dlls/ntdll/exception.c b/dlls/ntdll/exception.c index c1677b6..4444ba1 100644 --- a/dlls/ntdll/exception.c +++ b/dlls/ntdll/exception.c @@ -130,10 +130,7 @@ static DWORD EXC_CallHandler( EXCEPTION_ newframe.frame.Handler = nested_handler; newframe.prevFrame = frame; __wine_push_frame( &newframe.frame ); - TRACE( "calling handler at %p code=%lx flags=%lx\n", - handler, record->ExceptionCode, record->ExceptionFlags ); ret = handler( record, frame, context, dispatcher ); - TRACE( "handler returned %lx\n", ret ); __wine_pop_frame( &newframe.frame ); return ret; } @@ -266,7 +263,11 @@ static NTSTATUS call_stack_handlers( EXC } /* Call handler */ + TRACE( "calling handler at %p code=%lx flags=%lx\n", + frame->Handler, rec->ExceptionCode, rec->ExceptionFlags ); res = EXC_CallHandler( rec, frame, context, &dispatch, frame->Handler, EXC_RaiseHandler ); + TRACE( "handler at %p returned %lx\n", frame->Handler, res ); + if (frame == nested_frame) { /* no longer nested */ @@ -413,6 +414,7 @@ void WINAPI __regs_RtlUnwind( EXCEPTION_ { EXCEPTION_RECORD record, newrec; EXCEPTION_REGISTRATION_RECORD *frame, *dispatch; + DWORD res; #ifdef __i386__ context->Eax = (DWORD)returnEax; @@ -458,8 +460,12 @@ void WINAPI __regs_RtlUnwind( EXCEPTION_ } /* Call handler */ - switch(EXC_CallHandler( pRecord, frame, context, &dispatch, - frame->Handler, EXC_UnwindHandler )) + TRACE( "calling handler at %p code=%lx flags=%lx\n", + frame->Handler, pRecord->ExceptionCode, pRecord->ExceptionFlags ); + res = EXC_CallHandler( pRecord, frame, context, &dispatch, frame->Handler, EXC_UnwindHandler ); + TRACE( "handler at %p returned %lx\n", frame->Handler, res ); + + switch(res) { case ExceptionContinueSearch: break;

1 0

qingdoa daoo : msvcrt: Append extension(.exe) for _spawnve argument.
by Alexandre Julliard April 6, 2006

April 6, 2006

Module: wine Branch: refs/heads/master Commit: 508c6e6cf4429311e30b47284ed865b06266091c URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=508c6e6cf4429311e30b472… Author: qingdoa daoo <qingdao33122(a)yahoo.com> Date: Wed Apr 5 11:37:01 2006 -0700 msvcrt: Append extension(.exe) for _spawnve argument. --- dlls/msvcrt/process.c | 32 ++++++++++++++++++++++++++++++-- 1 files changed, 30 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/process.c b/dlls/msvcrt/process.c index 43e1084..a16f8f1 100644 --- a/dlls/msvcrt/process.c +++ b/dlls/msvcrt/process.c @@ -442,13 +442,41 @@ MSVCRT_intptr_t _spawnve(int flags, cons { char * args = msvcrt_argvtos(argv,' '); char * envs = msvcrt_argvtos(envv,0); - const char *fullname = name; + char fullname[MAX_PATH]; + const char *p; + int len; MSVCRT_intptr_t ret = -1; - FIXME(":not translating name %s to locate program\n",fullname); TRACE(":call (%s), params (%s), env (%s)\n",debugstr_a(name),debugstr_a(args), envs?"Custom":"Null"); + /* no check for NULL name. + native doesn't do it */ + + p = memchr(name, '\0', MAX_PATH); + if( !p ) + p = name + MAX_PATH - 1; + len = p - name; + + /* extra-long names are silently truncated. */ + memcpy(fullname, name, len); + + for( p--; p >= name; p-- ) + { + if( *p == '\\' || *p == '/' || *p == ':' || *p == '.' ) + break; + } + + /* if no extension is given, assume .exe */ + if( (p < name || *p != '.') && len <= MAX_PATH - 5 ) + { + FIXME("only trying .exe when no extension given\n"); + memcpy(fullname+len, ".exe", 4); + len += 4; + } + + fullname[len] = '\0'; + if (args) { ret = msvcrt_spawn(flags, fullname, args, envs);

1 0

Alexandre Julliard : kernel: Show the exe name instead of wine-[kp] thread in ps and top.
by Alexandre Julliard April 6, 2006

April 6, 2006

Module: wine Branch: refs/heads/master Commit: 9603ee07565d1ab8ae2f272094fcebab982933d9 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=9603ee07565d1ab8ae2f272… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 6 11:57:37 2006 +0200 kernel: Show the exe name instead of wine-[kp]thread in ps and top. --- configure | 4 +++ configure.ac | 2 + dlls/kernel/process.c | 78 +++++++++++++++++++++++++++++++++++++++++++------ include/config.h.in | 6 ++++ 4 files changed, 81 insertions(+), 9 deletions(-) diff --git a/configure b/configure index 82be6a4..792c258 100755 --- a/configure +++ b/configure @@ -7039,6 +7039,7 @@ done + for ac_header in \ IOKit/IOKitLib.h \ alsa/asoundlib.h \ @@ -7118,6 +7119,7 @@ for ac_header in \ sys/mtio.h \ sys/param.h \ sys/poll.h \ + sys/prctl.h \ sys/ptrace.h \ sys/reg.h \ sys/resource.h \ @@ -14872,6 +14874,7 @@ fi + for ac_func in \ _lwp_create \ _lwp_self \ @@ -14913,6 +14916,7 @@ for ac_func in \ mmap \ pclose \ popen \ + prctl \ pread \ pwrite \ readlink \ diff --git a/configure.ac b/configure.ac index 49ae20c..98c799b 100644 --- a/configure.ac +++ b/configure.ac @@ -250,6 +250,7 @@ AC_CHECK_HEADERS(\ sys/mtio.h \ sys/param.h \ sys/poll.h \ + sys/prctl.h \ sys/ptrace.h \ sys/reg.h \ sys/resource.h \ @@ -1188,6 +1189,7 @@ AC_CHECK_FUNCS(\ mmap \ pclose \ popen \ + prctl \ pread \ pwrite \ readlink \ diff --git a/dlls/kernel/process.c b/dlls/kernel/process.c index 5b5842d..2cdc0ef 100644 --- a/dlls/kernel/process.c +++ b/dlls/kernel/process.c @@ -31,6 +31,9 @@ #ifdef HAVE_SYS_TIME_H # include <sys/time.h> #endif +#ifdef HAVE_SYS_PRCTL_H +# include <sys/prctl.h> +#endif #include <sys/types.h> #include "ntstatus.h" @@ -837,6 +840,64 @@ static void start_process( void *arg ) /*********************************************************************** + * set_process_name + * + * Change the process name in the ps output. + */ +static void set_process_name( int *argc, char *argv[], char *name ) +{ +#ifdef HAVE_PRCTL + int i, offset; + char *prctl_name = NULL; + char *end = argv[*argc-1] + strlen(argv[*argc-1]) + 1; + +#ifndef PR_SET_NAME +# define PR_SET_NAME 15 +#endif + + if (!name) + { + char *p; + prctl_name = argv[1]; + if ((p = strrchr( prctl_name, '\\' ))) prctl_name = p + 1; + if ((p = strrchr( prctl_name, '/' ))) prctl_name = p + 1; + } + else + { + if (strlen(name) <= strlen(argv[0])) prctl_name = name; + } + + if (prctl_name && prctl( PR_SET_NAME, prctl_name ) != -1) + { + if (name) + { + strcpy( argv[0], name ); + offset = argv[1] - (argv[0] + strlen(name) + 1); + } + else + { + offset = argv[1] - argv[0]; + } + memmove( argv[1] - offset, argv[1], end - argv[1] ); + memset( end - offset, 0, offset ); + for (i = 1; i < *argc; i++) argv[i-1] = argv[i] - offset; + argv[i-1] = NULL; + (*argc)--; + return; + } +#endif /* HAVE_PRCTL */ + + if (name) argv[0] = name; + else + { + /* remove argv[0] */ + memmove( argv, argv + 1, *argc * sizeof(argv[0]) ); + (*argc)--; + } +} + + +/*********************************************************************** * __wine_kernel_init * * Wine initialisation: load and start the main exe file. @@ -845,18 +906,17 @@ void __wine_kernel_init(void) { static const WCHAR dotW[] = {'.',0}; static const WCHAR exeW[] = {'.','e','x','e',0}; + static char winevdm[] = "winevdm.exe"; WCHAR *p, main_exe_name[MAX_PATH]; HMODULE module; DWORD type, error = 0; PEB *peb = NtCurrentTeb()->Peb; + char *new_argv0 = NULL; /* Initialize everything */ if (!process_init()) exit(1); - __wine_main_argv++; /* remove argv[0] (wine itself) */ - __wine_main_argc--; - if (peb->ProcessParameters->ImagePathName.Buffer) { strcpyW( main_exe_name, peb->ProcessParameters->ImagePathName.Buffer ); @@ -865,11 +925,11 @@ void __wine_kernel_init(void) { WCHAR exe_nameW[MAX_PATH]; - MultiByteToWideChar( CP_UNIXCP, 0, __wine_main_argv[0], -1, exe_nameW, MAX_PATH ); + MultiByteToWideChar( CP_UNIXCP, 0, __wine_main_argv[1], -1, exe_nameW, MAX_PATH ); if (!SearchPathW( NULL, exe_nameW, exeW, MAX_PATH, main_exe_name, NULL ) && !get_builtin_path( exe_nameW, exeW, main_exe_name, MAX_PATH )) { - MESSAGE( "wine: cannot find '%s'\n", __wine_main_argv[0] ); + MESSAGE( "wine: cannot find '%s'\n", __wine_main_argv[1] ); ExitProcess( GetLastError() ); } } @@ -879,7 +939,7 @@ void __wine_kernel_init(void) if (!p || strchrW( p, '/' ) || strchrW( p, '\\' )) strcatW( main_exe_name, dotW ); TRACE( "starting process name=%s argv[0]=%s\n", - debugstr_w(main_exe_name), debugstr_a(__wine_main_argv[0]) ); + debugstr_w(main_exe_name), debugstr_a(__wine_main_argv[1]) ); RtlInitUnicodeString( &NtCurrentTeb()->Peb->ProcessParameters->DllPath, MODULE_get_dll_load_path(main_exe_name) ); @@ -893,9 +953,7 @@ void __wine_kernel_init(void) if (type == SCS_WOW_BINARY || type == SCS_DOS_BINARY || type == SCS_OS216_BINARY || type == SCS_PIF_BINARY) { - __wine_main_argv--; - __wine_main_argc++; - __wine_main_argv[0] = "winevdm.exe"; + new_argv0 = winevdm; module = LoadLibraryExW( winevdmW, 0, DONT_RESOLVE_DLL_REFERENCES ); } } @@ -909,6 +967,8 @@ void __wine_kernel_init(void) ExitProcess( error ); } + set_process_name( &__wine_main_argc, __wine_main_argv, new_argv0 ); + peb->ImageBaseAddress = module; /* build command line */ diff --git a/include/config.h.in b/include/config.h.in index dd3dd6f..590e2c7 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -482,6 +482,9 @@ /* Define if we can use ppdev.h for parallel port access */ #undef HAVE_PPDEV +/* Define to 1 if you have the `prctl' function. */ +#undef HAVE_PRCTL + /* Define to 1 if you have the `pread' function. */ #undef HAVE_PREAD @@ -731,6 +734,9 @@ /* Define to 1 if you have the <sys/poll.h> header file. */ #undef HAVE_SYS_POLL_H +/* Define to 1 if you have the <sys/prctl.h> header file. */ +#undef HAVE_SYS_PRCTL_H + /* Define to 1 if you have the <sys/ptrace.h> header file. */ #undef HAVE_SYS_PTRACE_H

1 0

Juan Lang : crypt32: Implement CertCreateSelfSignCertificate, with some tests.
by Alexandre Julliard April 6, 2006

April 6, 2006

Module: wine Branch: refs/heads/master Commit: 992a1af44b65b2d473deeb3d416b9ca576a4b435 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=992a1af44b65b2d473deeb3… Author: Juan Lang <juan_lang(a)yahoo.com> Date: Wed Apr 5 17:54:15 2006 -0700 crypt32: Implement CertCreateSelfSignCertificate, with some tests. --- dlls/crypt32/cert.c | 311 +++++++++++++++++++++++++++++++++++++++++++++ dlls/crypt32/crypt32.spec | 1 dlls/crypt32/tests/cert.c | 94 +++++++++++++- 3 files changed, 402 insertions(+), 4 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=992a1af44b65b2d473d…

1 0