April 2009 - Wine-commits - list.winehq.org

Huw Davies : ole32: Move the embed source hack to a separate function.
by Alexandre Julliard 01 Apr '09

01 Apr '09

Module: wine Branch: master Commit: f2ba37e5b95a5a6d02ad13d1c9d344a49c9a5b63 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f2ba37e5b95a5a6d02ad13d1c… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Mar 31 16:58:57 2009 +0100 ole32: Move the embed source hack to a separate function. --- dlls/ole32/clipboard.c | 221 +++++++++++++++++++++++++++--------------------- 1 files changed, 124 insertions(+), 97 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f2ba37e5b95a5a6d02ad1…

1 0

Huw Davies : ole32: Rename a few variables and remove a couple of meaningless comments.
by Alexandre Julliard 01 Apr '09

01 Apr '09

Module: wine Branch: master Commit: 3cb4ab588d865cd3e8b10d110866a9155928980c URL: http://source.winehq.org/git/wine.git/?a=commit;h=3cb4ab588d865cd3e8b10d110… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Mar 31 17:02:32 2009 +0100 ole32: Rename a few variables and remove a couple of meaningless comments. --- dlls/ole32/clipboard.c | 25 ++++++++++--------------- 1 files changed, 10 insertions(+), 15 deletions(-) diff --git a/dlls/ole32/clipboard.c b/dlls/ole32/clipboard.c index f01adbd..1517d20 100644 --- a/dlls/ole32/clipboard.c +++ b/dlls/ole32/clipboard.c @@ -539,31 +539,30 @@ static HRESULT render_embed_source_hack(IDataObject *data, LPFORMATETC fmt) } /*********************************************************************** - * OLEClipbrd_RenderFormat(LPFORMATETC) + * render_format + * * Render the clipboard data. Note that this call will delegate to the * source data object. * Note: This function assumes it is passed an HGLOBAL format to render. */ -static HRESULT OLEClipbrd_RenderFormat(IDataObject *pIDataObject, LPFORMATETC pFormatetc) +static HRESULT render_format(IDataObject *data, LPFORMATETC fmt) { STGMEDIUM std; HGLOBAL hDup; HRESULT hr; /* Embed source hack */ - if(pFormatetc->cfFormat == embed_source_clipboard_format) + if(fmt->cfFormat == embed_source_clipboard_format) { - return render_embed_source_hack(pIDataObject, pFormatetc); + return render_embed_source_hack(data, fmt); } - if (FAILED(hr = IDataObject_GetData(pIDataObject, pFormatetc, &std))) + if (FAILED(hr = IDataObject_GetData(data, fmt, &std))) { WARN("() : IDataObject_GetData failed to render clipboard data! (%x)\n", hr); return hr; } - /* To put a copy back on the clipboard */ - if(std.tymed != TYMED_HGLOBAL) { FIXME("got tymed %x\n", std.tymed); @@ -571,17 +570,13 @@ static HRESULT OLEClipbrd_RenderFormat(IDataObject *pIDataObject, LPFORMATETC pF goto end; } - /* - * Put a copy of the rendered data back on the clipboard - */ - if ( !(hDup = OLEClipbrd_GlobalDupMem(std.u.hGlobal)) ) { hr = E_OUTOFMEMORY; goto end; } - if ( !SetClipboardData( pFormatetc->cfFormat, hDup ) ) + if ( !SetClipboardData( fmt->cfFormat, hDup ) ) { WARN("() : Failed to set rendered clipboard data into clipboard!\n"); GlobalFree(hDup); @@ -638,7 +633,7 @@ static LRESULT CALLBACK OLEClipbrd_WndProc * Render the clipboard data. * (We must have a source data object or we wouldn't be in this WndProc) */ - OLEClipbrd_RenderFormat( (IDataObject*)&(theOleClipboard->lpvtbl), &rgelt ); + render_format( (IDataObject*)&(theOleClipboard->lpvtbl), &rgelt ); break; } @@ -678,7 +673,7 @@ static LRESULT CALLBACK OLEClipbrd_WndProc /* * Render the clipboard data. */ - if ( FAILED(OLEClipbrd_RenderFormat( (IDataObject*)&(theOleClipboard->lpvtbl), &rgelt )) ) + if ( FAILED(render_format( (IDataObject*)&(theOleClipboard->lpvtbl), &rgelt )) ) continue; TRACE("(): WM_RENDERALLFORMATS(cfFormat=%d)\n", rgelt.cfFormat); @@ -1512,7 +1507,7 @@ HRESULT WINAPI OleFlushClipboard(void) GetClipboardFormatNameA(rgelt.cfFormat, szFmtName, sizeof(szFmtName)-1) ? szFmtName : ""); - if ( FAILED(OLEClipbrd_RenderFormat( theOleClipboard->pIDataObjectSrc, &rgelt )) ) + if ( FAILED(render_format( theOleClipboard->pIDataObjectSrc, &rgelt )) ) continue; } }

1 0

Huw Davies : ole32: Change the global memory duplicator to return HRESULT.
by Alexandre Julliard 01 Apr '09

01 Apr '09

Module: wine Branch: master Commit: 628332aee11cd82eb4b24ff4def7d7b55be691af URL: http://source.winehq.org/git/wine.git/?a=commit;h=628332aee11cd82eb4b24ff4d… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Apr 1 14:03:27 2009 +0100 ole32: Change the global memory duplicator to return HRESULT. --- dlls/ole32/clipboard.c | 54 ++++++++++++++++++----------------------------- 1 files changed, 21 insertions(+), 33 deletions(-) diff --git a/dlls/ole32/clipboard.c b/dlls/ole32/clipboard.c index 1517d20..3926537 100644 --- a/dlls/ole32/clipboard.c +++ b/dlls/ole32/clipboard.c @@ -387,41 +387,32 @@ static HRESULT enum_fmtetc_construct(ole_priv_data *data, UINT pos, IEnumFORMATE } /*********************************************************************** - * OLEClipbrd_GlobalDupMem( HGLOBAL ) + * dup_global_mem + * * Helper method to duplicate an HGLOBAL chunk of memory */ -static HGLOBAL OLEClipbrd_GlobalDupMem( HGLOBAL hGlobalSrc ) +static HRESULT dup_global_mem( HGLOBAL src, HGLOBAL *dst ) { - HGLOBAL hGlobalDest; - PVOID pGlobalSrc, pGlobalDest; - DWORD cBytes; + void *src_ptr, *dst_ptr; + DWORD size; - if ( !hGlobalSrc ) - return 0; + *dst = NULL; + if ( !src ) return S_FALSE; - cBytes = GlobalSize(hGlobalSrc); - if ( 0 == cBytes ) - return 0; + size = GlobalSize(src); - hGlobalDest = GlobalAlloc( GMEM_DDESHARE|GMEM_MOVEABLE, - cBytes ); - if ( !hGlobalDest ) - return 0; + *dst = GlobalAlloc( GMEM_DDESHARE|GMEM_MOVEABLE, size ); + if ( !*dst ) return E_OUTOFMEMORY; - pGlobalSrc = GlobalLock(hGlobalSrc); - pGlobalDest = GlobalLock(hGlobalDest); - if ( !pGlobalSrc || !pGlobalDest ) - { - GlobalFree(hGlobalDest); - return 0; - } + src_ptr = GlobalLock(src); + dst_ptr = GlobalLock(*dst); - memcpy(pGlobalDest, pGlobalSrc, cBytes); + memcpy(dst_ptr, src_ptr, size); - GlobalUnlock(hGlobalSrc); - GlobalUnlock(hGlobalDest); + GlobalUnlock(*dst); + GlobalUnlock(src); - return hGlobalDest; + return S_OK; } /************************************************************ @@ -548,7 +539,7 @@ static HRESULT render_embed_source_hack(IDataObject *data, LPFORMATETC fmt) static HRESULT render_format(IDataObject *data, LPFORMATETC fmt) { STGMEDIUM std; - HGLOBAL hDup; + HGLOBAL clip_data = NULL; HRESULT hr; /* Embed source hack */ @@ -570,16 +561,13 @@ static HRESULT render_format(IDataObject *data, LPFORMATETC fmt) goto end; } - if ( !(hDup = OLEClipbrd_GlobalDupMem(std.u.hGlobal)) ) - { - hr = E_OUTOFMEMORY; - goto end; - } + hr = dup_global_mem(std.u.hGlobal, &clip_data); + if(FAILED(hr)) goto end; - if ( !SetClipboardData( fmt->cfFormat, hDup ) ) + if ( !SetClipboardData( fmt->cfFormat, clip_data ) ) { WARN("() : Failed to set rendered clipboard data into clipboard!\n"); - GlobalFree(hDup); + GlobalFree(clip_data); hr = CLIPBRD_E_CANT_SET; }

1 0

Nikolay Sivov : comctl32: listview: Some tests showed delayed header creation in ListView control.
by Alexandre Julliard 01 Apr '09

01 Apr '09

Module: wine Branch: master Commit: 276c7a3bc6c451b892355126c983f686af2b4af0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=276c7a3bc6c451b892355126c… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Mon Mar 30 14:59:10 2009 -0400 comctl32: listview: Some tests showed delayed header creation in ListView control. --- dlls/comctl32/tests/listview.c | 85 ++++++++++++++++++++++++++++++++++++++++ 1 files changed, 85 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 813d9bb..f7b34af 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -764,6 +764,9 @@ static void test_create(void) { HWND hList; HWND hHeader; + LONG_PTR ret; + LONG r; + LVCOLUMNA col; WNDCLASSEX cls; cls.cbSize = sizeof(WNDCLASSEX); ok(GetClassInfoEx(GetModuleHandle(NULL), "SysListView32", &cls), "GetClassInfoEx failed\n"); @@ -777,6 +780,88 @@ static void test_create(void) ok((HIMAGELIST)SendMessage(hList, LVM_GETIMAGELIST, 0, 0) == test_create_imagelist, "Image list not obtained\n"); hHeader = (HWND)SendMessage(hList, LVM_GETHEADER, 0, 0); ok(IsWindow(hHeader) && IsWindowVisible(hHeader), "Listview not in report mode\n"); + ok(hHeader == GetDlgItem(hList, 0), "Expected header as dialog item\n"); + DestroyWindow(hList); + + /* header isn't created on LVS_ICON and LVS_LIST styles */ + hList = CreateWindow("SysListView32", "Test", WS_VISIBLE, 0, 0, 100, 100, NULL, NULL, + GetModuleHandle(NULL), 0); + hHeader = (HWND)SendMessage(hList, LVM_GETHEADER, 0, 0); + todo_wine ok(!IsWindow(hHeader), "Header shouldn't be created\n"); + todo_wine ok(NULL == GetDlgItem(hList, 0), "NULL dialog item expected\n"); + /* insert column */ + memset(&col, 0, sizeof(LVCOLUMNA)); + col.mask = LVCF_WIDTH; + col.cx = 100; + r = SendMessage(hList, LVM_INSERTCOLUMN, 0, (LPARAM)&col); + ok(r == 0, "Expected 0 column's inserted\n"); + hHeader = (HWND)SendMessage(hList, LVM_GETHEADER, 0, 0); + ok(IsWindow(hHeader), "Header should be created\n"); + ok(hHeader == GetDlgItem(hList, 0), "Expected header as dialog item\n"); + DestroyWindow(hList); + + hList = CreateWindow("SysListView32", "Test", WS_VISIBLE|LVS_LIST, 0, 0, 100, 100, NULL, NULL, + GetModuleHandle(NULL), 0); + hHeader = (HWND)SendMessage(hList, LVM_GETHEADER, 0, 0); + todo_wine ok(!IsWindow(hHeader), "Header shouldn't be created\n"); + todo_wine ok(NULL == GetDlgItem(hList, 0), "NULL dialog item expected\n"); + /* insert column */ + memset(&col, 0, sizeof(LVCOLUMNA)); + col.mask = LVCF_WIDTH; + col.cx = 100; + r = SendMessage(hList, LVM_INSERTCOLUMN, 0, (LPARAM)&col); + ok(r == 0, "Expected 0 column's inserted\n"); + hHeader = (HWND)SendMessage(hList, LVM_GETHEADER, 0, 0); + ok(IsWindow(hHeader), "Header should be created\n"); + ok(hHeader == GetDlgItem(hList, 0), "Expected header as dialog item\n"); + DestroyWindow(hList); + + /* try to switch LVS_ICON -> LVS_REPORT and back LVS_ICON -> LVS_REPORT */ + hList = CreateWindow("SysListView32", "Test", WS_VISIBLE, 0, 0, 100, 100, NULL, NULL, + GetModuleHandle(NULL), 0); + ret = SetWindowLongPtr(hList, GWL_STYLE, GetWindowLongPtr(hList, GWL_STYLE) | LVS_REPORT); + ok(ret = WS_VISIBLE, "Style wrong, should be WS_VISIBLE|LVS_ICON\n"); + hHeader = (HWND)SendMessage(hList, LVM_GETHEADER, 0, 0); + ok(IsWindow(hHeader), "Header should be created\n"); + ret = SetWindowLongPtr(hList, GWL_STYLE, GetWindowLong(hList, GWL_STYLE) & ~LVS_REPORT); + ok(ret = WS_VISIBLE|LVS_REPORT, "Style wrong, should be WS_VISIBLE|LVS_REPORT\n"); + hHeader = (HWND)SendMessage(hList, LVM_GETHEADER, 0, 0); + ok(IsWindow(hHeader), "Header should be created\n"); + ok(hHeader == GetDlgItem(hList, 0), "Expected header as dialog item\n"); + DestroyWindow(hList); + + /* try to switch LVS_LIST -> LVS_REPORT and back LVS_LIST -> LVS_REPORT */ + hList = CreateWindow("SysListView32", "Test", WS_VISIBLE|LVS_LIST, 0, 0, 100, 100, NULL, NULL, + GetModuleHandle(NULL), 0); + ret = SetWindowLongPtr(hList, GWL_STYLE, + (GetWindowLongPtr(hList, GWL_STYLE) & ~LVS_LIST) | LVS_REPORT); + ok(ret = WS_VISIBLE|LVS_LIST, "Style wrong, should be WS_VISIBLE|LVS_ICON\n"); + hHeader = (HWND)SendMessage(hList, LVM_GETHEADER, 0, 0); + ok(IsWindow(hHeader), "Header shouldn't be created\n"); + ok(hHeader == GetDlgItem(hList, 0), "NULL dialog item expected\n"); + ret = SetWindowLongPtr(hList, GWL_STYLE, + (GetWindowLongPtr(hList, GWL_STYLE) & ~LVS_REPORT) | LVS_LIST); + ok(ret = WS_VISIBLE|LVS_REPORT, "Style wrong, should be WS_VISIBLE|LVS_REPORT\n"); + hHeader = (HWND)SendMessage(hList, LVM_GETHEADER, 0, 0); + ok(IsWindow(hHeader), "Header shouldn't be created\n"); + ok(hHeader == GetDlgItem(hList, 0), "NULL dialog item expected\n"); + DestroyWindow(hList); + + /* LVS_REPORT without WS_VISIBLE */ + hList = CreateWindow("SysListView32", "Test", LVS_REPORT, 0, 0, 100, 100, NULL, NULL, + GetModuleHandle(NULL), 0); + hHeader = (HWND)SendMessage(hList, LVM_GETHEADER, 0, 0); + todo_wine ok(!IsWindow(hHeader), "Header shouldn't be created\n"); + todo_wine ok(NULL == GetDlgItem(hList, 0), "NULL dialog item expected\n"); + /* insert column */ + memset(&col, 0, sizeof(LVCOLUMNA)); + col.mask = LVCF_WIDTH; + col.cx = 100; + r = SendMessage(hList, LVM_INSERTCOLUMN, 0, (LPARAM)&col); + ok(r == 0, "Expected 0 column's inserted\n"); + hHeader = (HWND)SendMessage(hList, LVM_GETHEADER, 0, 0); + ok(IsWindow(hHeader), "Header should be created\n"); + ok(hHeader == GetDlgItem(hList, 0), "Expected header as dialog item\n"); DestroyWindow(hList); }

1 0

Alexandre Julliard : ntdll: Add separate signal definitions for OpenBSD.
by Alexandre Julliard 01 Apr '09

01 Apr '09

Module: wine Branch: master Commit: 129d83fffb9b97d38098ec6bcfa479cc08c04cfa URL: http://source.winehq.org/git/wine.git/?a=commit;h=129d83fffb9b97d38098ec6bc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 1 12:37:05 2009 +0200 ntdll: Add separate signal definitions for OpenBSD. --- dlls/ntdll/signal_i386.c | 38 ++++++++++++++++++++++++++++++++++++-- 1 files changed, 36 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index 07f68f1..502195f 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -199,7 +199,7 @@ typedef struct trapframe SIGCONTEXT; #endif /* bsdi */ -#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__OpenBSD__) +#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) typedef struct sigcontext SIGCONTEXT; @@ -228,7 +228,41 @@ typedef struct sigcontext SIGCONTEXT; #define FPU_sig(context) NULL /* FIXME */ #define FPUX_sig(context) NULL /* FIXME */ -#endif /* *BSD */ +#endif /* __FreeBSD__ */ + +#ifdef __OpenBSD__ + +typedef struct sigcontext SIGCONTEXT; + +#define EAX_sig(context) ((context)->sc_eax) +#define EBX_sig(context) ((context)->sc_ebx) +#define ECX_sig(context) ((context)->sc_ecx) +#define EDX_sig(context) ((context)->sc_edx) +#define ESI_sig(context) ((context)->sc_esi) +#define EDI_sig(context) ((context)->sc_edi) +#define EBP_sig(context) ((context)->sc_ebp) + +#define CS_sig(context) ((context)->sc_cs) +#define DS_sig(context) ((context)->sc_ds) +#define ES_sig(context) ((context)->sc_es) +#define FS_sig(context) ((context)->sc_fs) +#define GS_sig(context) ((context)->sc_gs) +#define SS_sig(context) ((context)->sc_ss) + +#define TRAP_sig(context) ((context)->sc_trapno) +#define ERROR_sig(context) ((context)->sc_err) +#define EFL_sig(context) ((context)->sc_eflags) + +#define EIP_sig(context) ((context)->sc_eip) +#define ESP_sig(context) ((context)->sc_esp) + +#define FPU_sig(context) NULL /* FIXME */ +#define FPUX_sig(context) NULL /* FIXME */ + +#define T_MCHK T_MACHK +#define T_XMMFLT T_XFTRAP + +#endif /* __OpenBSD__ */ #if defined(__svr4__) || defined(_SCO_DS) || defined(__sun)

1 0

Alexandre Julliard : ntdll: Define dvd_struct ourselves since it' s not consistent across platforms.
by Alexandre Julliard 01 Apr '09

01 Apr '09

Module: wine Branch: master Commit: c5dadf4739ed92d4839029078e0ef2c12d7e81b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c5dadf4739ed92d4839029078… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 1 12:37:32 2009 +0200 ntdll: Define dvd_struct ourselves since it's not consistent across platforms. --- dlls/ntdll/cdrom.c | 20 ++++++++++++++------ 1 files changed, 14 insertions(+), 6 deletions(-) diff --git a/dlls/ntdll/cdrom.c b/dlls/ntdll/cdrom.c index a967f9c..574f737 100644 --- a/dlls/ntdll/cdrom.c +++ b/dlls/ntdll/cdrom.c @@ -1939,7 +1939,15 @@ static NTSTATUS DVD_GetRegion(int dev, PDVD_REGION region) static NTSTATUS DVD_ReadStructure(int dev, const DVD_READ_STRUCTURE *structure, PDVD_LAYER_DESCRIPTOR layer) { #ifdef DVD_READ_STRUCT - dvd_struct s; + /* dvd_struct is not defined consistently across platforms */ + union + { + struct dvd_physical physical; + struct dvd_copyright copyright; + struct dvd_disckey disckey; + struct dvd_bca bca; + struct dvd_manufact manufact; + } s; if (structure->BlockByteOffset.u.HighPart || structure->BlockByteOffset.u.LowPart) FIXME(": BlockByteOffset is not handled\n"); @@ -1947,26 +1955,26 @@ static NTSTATUS DVD_ReadStructure(int dev, const DVD_READ_STRUCTURE *structure, switch (structure->Format) { case DvdPhysicalDescriptor: - s.type = DVD_STRUCT_PHYSICAL; + s.physical.type = DVD_STRUCT_PHYSICAL; s.physical.layer_num = structure->LayerNumber; break; case DvdCopyrightDescriptor: - s.type = DVD_STRUCT_COPYRIGHT; + s.copyright.type = DVD_STRUCT_COPYRIGHT; s.copyright.layer_num = structure->LayerNumber; break; case DvdDiskKeyDescriptor: - s.type = DVD_STRUCT_DISCKEY; + s.disckey.type = DVD_STRUCT_DISCKEY; s.disckey.agid = structure->SessionId; break; case DvdBCADescriptor: - s.type = DVD_STRUCT_BCA; + s.bca.type = DVD_STRUCT_BCA; break; case DvdManufacturerDescriptor: - s.type = DVD_STRUCT_MANUFACT; + s.manufact.type = DVD_STRUCT_MANUFACT; s.manufact.layer_num = structure->LayerNumber; break;

1 0

Aric Stewart : advapi32: Modify check_well_known_name test to be more robust on more Windows platforms .
by Alexandre Julliard 01 Apr '09

01 Apr '09

Module: wine Branch: master Commit: b540d57c3977b6b24cdadbfca7be406e5610c0c5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b540d57c3977b6b24cdadbfca… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Mar 31 08:59:54 2009 -0500 advapi32: Modify check_well_known_name test to be more robust on more Windows platforms. Thanks to Paul Vriens for pointing out the need for this. --- dlls/advapi32/tests/security.c | 76 +++++++++++++++++++++++++++------------ 1 files changed, 52 insertions(+), 24 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index dd6879d..e557c1f 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -1700,11 +1700,16 @@ static void get_sid_info(PSID psid, LPSTR *user, LPSTR *dom) LookupAccountSidA(NULL, psid, account, &size, domain, &dom_size, &use); } -static void check_wellknown_name(const char* name, const char* exp_account, int exp_size, SID_NAME_USE exp_use, BOOL exp_succ) +static void check_wellknown_name(const char* name, WELL_KNOWN_SID_TYPE result) { + SID_IDENTIFIER_AUTHORITY ident = { SECURITY_NT_AUTHORITY }; + PSID domainsid; + char wk_sid[SECURITY_MAX_SID_SIZE]; + DWORD cb; + DWORD sid_size, domain_size; SID_NAME_USE sid_use; - LPSTR domain, account, sid_dom; + LPSTR domain, account, sid_domain, wk_domain, wk_account; PSID psid; BOOL ret; @@ -1715,20 +1720,31 @@ static void check_wellknown_name(const char* name, const char* exp_account, int domain = HeapAlloc(GetProcessHeap(),0,domain_size); ret = LookupAccountNameA(NULL, name, psid, &sid_size, domain, &domain_size, &sid_use); - get_sid_info(psid, &account, &sid_dom); - - if (!exp_succ) + if (!result) { ok(!ret, " %s Should have failed to lookup account name\n",name); return; } + + AllocateAndInitializeSid(&ident, 6, SECURITY_NT_NON_UNIQUE, 12, 23, 34, 45, 56, 0, 0, &domainsid); + cb = sizeof(wk_sid); + if (!pCreateWellKnownSid(result, domainsid, wk_sid, &cb)) + { + win_skip("SID %i is not avalable on the system\n",result); + return; + } + + get_sid_info(psid, &account, &sid_domain); + get_sid_info(wk_sid, &wk_account, &wk_domain); + ok(ret, "Failed to lookup account name %s\n",name); ok(sid_size != 0, "sid_size was zero\n"); - ok(!lstrcmp(account, exp_account), "Expected %s , got %s\n", exp_account, account); - ok(!lstrcmp(domain, sid_dom), "Expected %s, got %s\n", sid_dom, domain); - ok(domain_size == exp_size, "Expected %i, got %d\n", exp_size, domain_size); - ok(lstrlen(domain) == domain_size, "Expected %d, got %d\n", lstrlen(domain), domain_size); - ok(sid_use == exp_use, "Expected (%d), got %d\n", exp_use, sid_use); + + ok(EqualSid(psid,wk_sid),"(%s) Sids fail to match well known sid!\n",name); + + ok(!lstrcmp(account, wk_account), "Expected %s , got %s\n", account, wk_account); + ok(!lstrcmp(domain, wk_domain), "Expected %s, got %s\n", wk_domain, domain); + ok(sid_use == SidTypeWellKnownGroup , "Expected Use (5), got %d\n", sid_use); HeapFree(GetProcessHeap(),0,psid); HeapFree(GetProcessHeap(),0,domain); @@ -1934,26 +1950,38 @@ static void test_LookupAccountName(void) } /* Well Known names */ - check_wellknown_name("LocalService", "LOCAL SERVICE", 12, SidTypeWellKnownGroup, TRUE); - check_wellknown_name("Local Service", "LOCAL SERVICE", 12, SidTypeWellKnownGroup, TRUE); + if (!pCreateWellKnownSid) + { + win_skip("CreateWellKnownSid not available\n"); + return; + } + + if (PRIMARYLANGID(LANGIDFROMLCID(GetThreadLocale())) != LANG_ENGLISH) + { + skip("Non-english locale (skipping well know name creation tests)\n"); + return; + } + + check_wellknown_name("LocalService", WinLocalServiceSid); + check_wellknown_name("Local Service", WinLocalServiceSid); /* 2 spaces */ - check_wellknown_name("Local Service", "", 0, 0, FALSE); - check_wellknown_name("NetworkService", "NETWORK SERVICE", 12, SidTypeWellKnownGroup, TRUE); - check_wellknown_name("Network Service", "NETWORK SERVICE", 12, SidTypeWellKnownGroup, TRUE); + check_wellknown_name("Local Service", 0); + check_wellknown_name("NetworkService", WinNetworkServiceSid); + check_wellknown_name("Network Service", WinNetworkServiceSid); /* example of some names where the spaces are not optional */ - check_wellknown_name("Terminal Server User", "TERMINAL SERVER USER", 12, SidTypeWellKnownGroup, TRUE); - check_wellknown_name("TerminalServer User", "", 0, 0, FALSE); - check_wellknown_name("TerminalServerUser", "", 0, 0, FALSE); - check_wellknown_name("Terminal ServerUser", "", 0, 0, FALSE); + check_wellknown_name("Terminal Server User", WinTerminalServerSid); + check_wellknown_name("TerminalServer User", 0); + check_wellknown_name("TerminalServerUser", 0); + check_wellknown_name("Terminal ServerUser", 0); - check_wellknown_name("enterprise domain controllers", "ENTERPRISE DOMAIN CONTROLLERS", 12, SidTypeWellKnownGroup, TRUE); - check_wellknown_name("enterprisedomain controllers", "", 0, 0, FALSE); - check_wellknown_name("enterprise domaincontrollers", "", 0, 0, FALSE); - check_wellknown_name("enterprisedomaincontrollers", "", 0, 0, FALSE); + check_wellknown_name("enterprise domain controllers",WinEnterpriseControllersSid); + check_wellknown_name("enterprisedomain controllers", 0); + check_wellknown_name("enterprise domaincontrollers", 0); + check_wellknown_name("enterprisedomaincontrollers", 0); /* case insensitivity */ - check_wellknown_name("lOCAlServICE", "LOCAL SERVICE", 12, SidTypeWellKnownGroup, TRUE); + check_wellknown_name("lOCAlServICE", WinLocalServiceSid); } static void test_security_descriptor(void)

1 0

Aric Stewart : advapi32: Handle fully qualified account names for well known sids in LookupAccountName .
by Alexandre Julliard 01 Apr '09

01 Apr '09

Module: wine Branch: master Commit: 9d9a684ef6cb9bf70235594e81de1e3b0387beeb URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d9a684ef6cb9bf70235594e8… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Mar 31 09:00:11 2009 -0500 advapi32: Handle fully qualified account names for well known sids in LookupAccountName. --- dlls/advapi32/security.c | 17 +++++++++++++++-- dlls/advapi32/tests/security.c | 7 +++++++ 2 files changed, 22 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index a26e81a..f8715e0 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -2651,6 +2651,8 @@ BOOL WINAPI LookupAccountNameW( LPCWSTR lpSystemName, LPCWSTR lpAccountName, PSI DWORD nameLen; LPWSTR userName = NULL; LPCWSTR domainName; + LPCWSTR lpAccountNamePtr; + LPCWSTR lpDomainNamePtr = NULL; FIXME("%s %s %p %p %p %p %p - stub\n", debugstr_w(lpSystemName), debugstr_w(lpAccountName), Sid, cbSid, ReferencedDomainName, cchReferencedDomainName, peUse); @@ -2667,11 +2669,22 @@ BOOL WINAPI LookupAccountNameW( LPCWSTR lpSystemName, LPCWSTR lpAccountName, PSI } /* Check well known SIDs first */ + if ((lpAccountNamePtr = strrchrW(lpAccountName,'\\'))) + { + lpAccountNamePtr++; + lpDomainNamePtr = lpAccountName; + } + else + lpAccountNamePtr = lpAccountName; for (i = 0; i < (sizeof(ACCOUNT_SIDS) / sizeof(ACCOUNT_SIDS[0])); i++) { - if (!strcmpiW(lpAccountName, ACCOUNT_SIDS[i].account) || - (ACCOUNT_SIDS[i].alias && !strcmpiW(lpAccountName, ACCOUNT_SIDS[i].alias))) + /* check domain first */ + if (lpDomainNamePtr && (strncmpiW(lpDomainNamePtr, ACCOUNT_SIDS[i].domain, strlenW(ACCOUNT_SIDS[i].domain)) || lpDomainNamePtr[strlenW(ACCOUNT_SIDS[i].domain)]!='\\')) + continue; + + if (!strcmpiW(lpAccountNamePtr, ACCOUNT_SIDS[i].account) || + (ACCOUNT_SIDS[i].alias && !strcmpiW(lpAccountNamePtr, ACCOUNT_SIDS[i].alias))) { DWORD sidLen = SECURITY_MAX_SID_SIZE; diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index e557c1f..f264fd8 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -1982,6 +1982,13 @@ static void test_LookupAccountName(void) /* case insensitivity */ check_wellknown_name("lOCAlServICE", WinLocalServiceSid); + + /* fully qualified account names */ + check_wellknown_name("NT AUTHORITY\\LocalService", WinLocalServiceSid); + check_wellknown_name("nt authority\\Network Service", WinNetworkServiceSid); + check_wellknown_name("nt authority test\\Network Service", 0); + check_wellknown_name("Dummy\\Network Service", 0); + check_wellknown_name("ntauthority\\Network Service", 0); } static void test_security_descriptor(void)

1 0

Christian Costa : mciqtz32: Implement MCI_SEEK.
by Alexandre Julliard 01 Apr '09

01 Apr '09

Module: wine Branch: master Commit: 2a9b26862fb3b799c028792fb2a75533769a03d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a9b26862fb3b799c028792fb… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Tue Mar 31 21:38:02 2009 +0200 mciqtz32: Implement MCI_SEEK. --- dlls/mciqtz32/mciqtz.c | 58 +++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 57 insertions(+), 1 deletions(-) diff --git a/dlls/mciqtz32/mciqtz.c b/dlls/mciqtz32/mciqtz.c index ea3a9f7..507956c 100644 --- a/dlls/mciqtz32/mciqtz.c +++ b/dlls/mciqtz32/mciqtz.c @@ -26,6 +26,7 @@ #include "wine/debug.h" #include "mciqtz_private.h" #include "digitalv.h" +#include "wownt32.h" WINE_DEFAULT_DEBUG_CHANNEL(mciqtz); @@ -253,6 +254,61 @@ static DWORD MCIQTZ_mciPlay(UINT wDevID, DWORD dwFlags, LPMCI_PLAY_PARMS lpParms } /*************************************************************************** + * MCIQTZ_mciSeek [internal] + */ +static DWORD MCIQTZ_mciSeek(UINT wDevID, DWORD dwFlags, LPMCI_SEEK_PARMS lpParms) +{ + WINE_MCIQTZ* wma; + HRESULT hr; + IMediaPosition* pmpos; + LONGLONG newpos; + + TRACE("(%04x, %08X, %p)\n", wDevID, dwFlags, lpParms); + + MCIQTZ_mciStop(wDevID, MCI_WAIT, NULL); + + if (!lpParms) + return MCIERR_NULL_PARAMETER_BLOCK; + + wma = MCIQTZ_mciGetOpenDev(wDevID); + if (!wma) + return MCIERR_INVALID_DEVICE_ID; + + if (dwFlags & MCI_SEEK_TO_START) { + newpos = 0; + } else if (dwFlags & MCI_SEEK_TO_END) { + FIXME("MCI_SEEK_TO_END not implemented yet\n"); + return MCIERR_INTERNAL; + } else if (dwFlags & MCI_TO) { + FIXME("MCI_TO not implemented yet\n"); + return MCIERR_INTERNAL; + } else { + WARN("dwFlag doesn't tell where to seek to...\n"); + return MCIERR_MISSING_PARAMETER; + } + + hr = IGraphBuilder_QueryInterface(wma->pgraph, &IID_IMediaPosition, (LPVOID*)&pmpos); + if (FAILED(hr)) { + FIXME("Cannot get IMediaPostion interface (hr = %x)\n", hr); + return MCIERR_INTERNAL; + } + + hr = IMediaPosition_put_CurrentPosition(pmpos, newpos); + if (FAILED(hr)) { + FIXME("Cannot set position (hr = %x)\n", hr); + IMediaPosition_Release(pmpos); + return MCIERR_INTERNAL; + } + + IMediaPosition_Release(pmpos); + + if (dwFlags & MCI_NOTIFY) + mciDriverNotify(HWND_32(LOWORD(lpParms->dwCallback)), wDevID, MCI_NOTIFY_SUCCESSFUL); + + return 0; +} + +/*************************************************************************** * MCIQTZ_mciStop [internal] */ static DWORD MCIQTZ_mciStop(UINT wDevID, DWORD dwFlags, LPMCI_GENERIC_PARMS lpParms) @@ -314,6 +370,7 @@ LRESULT CALLBACK MCIQTZ_DriverProc(DWORD_PTR dwDevID, HDRVR hDriv, UINT wMsg, case MCI_OPEN_DRIVER: return MCIQTZ_mciOpen (dwDevID, dwParam1, (LPMCI_DGV_OPEN_PARMSW) dwParam2); case MCI_CLOSE_DRIVER: return MCIQTZ_mciClose (dwDevID, dwParam1, (LPMCI_GENERIC_PARMS) dwParam2); case MCI_PLAY: return MCIQTZ_mciPlay (dwDevID, dwParam1, (LPMCI_PLAY_PARMS) dwParam2); + case MCI_SEEK: return MCIQTZ_mciSeek (dwDevID, dwParam1, (LPMCI_SEEK_PARMS) dwParam2); case MCI_RECORD: case MCI_STOP: case MCI_SET: @@ -322,7 +379,6 @@ LRESULT CALLBACK MCIQTZ_DriverProc(DWORD_PTR dwDevID, HDRVR hDriv, UINT wMsg, case MCI_STATUS: case MCI_GETDEVCAPS: case MCI_INFO: - case MCI_SEEK: case MCI_PUT: case MCI_WINDOW: case MCI_LOAD:

1 0

Jacek Caban : basetsd.h: Added HANDLE_PTR and SHANDLE_PTR typedefs.
by Alexandre Julliard 01 Apr '09

01 Apr '09

Module: wine Branch: master Commit: 1b3f6474c83881f16be479a90ac493777b855fc4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b3f6474c83881f16be479a90… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Apr 1 03:41:55 2009 +0200 basetsd.h: Added HANDLE_PTR and SHANDLE_PTR typedefs. --- include/basetsd.h | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/include/basetsd.h b/include/basetsd.h index 409f958..e106e24 100644 --- a/include/basetsd.h +++ b/include/basetsd.h @@ -116,6 +116,8 @@ typedef unsigned __int64 DWORD_PTR, *PDWORD_PTR; #define MININT_PTR 0x8000000000000000 #define MAXUINT_PTR 0xffffffffffffffff +typedef __int64 SHANDLE_PTR; +typedef unsigned __int64 HANDLE_PTR; typedef int HALF_PTR, *PHALF_PTR; typedef unsigned int UHALF_PTR, *PUHALF_PTR; @@ -209,6 +211,8 @@ typedef ULONG_PTR DWORD_PTR, *PDWORD_PTR; #define MININT_PTR 0x80000000 #define MAXUINT_PTR 0xffffffff +typedef long SHANDLE_PTR; +typedef unsigned long HANDLE_PTR; typedef signed short HALF_PTR, *PHALF_PTR; typedef unsigned short UHALF_PTR, *PUHALF_PTR;

1 0