wine-commits September 2007

wine-commits@winehq.org

7 participants
787 discussions

Jacek Caban : mshtml: Don't crash in UIActivate if Gecko is not available.
by Alexandre Julliard 24 Sep '07

24 Sep '07

Module: wine Branch: master Commit: 23465f21830bf7e75305656d8edc4c8c37545237 URL: http://source.winehq.org/git/wine.git/?a=commit;h=23465f21830bf7e75305656d8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Sep 23 22:38:48 2007 +0200 mshtml: Don't crash in UIActivate if Gecko is not available. --- dlls/mshtml/view.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/view.c b/dlls/mshtml/view.c index a201de0..e5ef7a7 100644 --- a/dlls/mshtml/view.c +++ b/dlls/mshtml/view.c @@ -577,7 +577,8 @@ static HRESULT WINAPI OleDocumentView_UIActivate(IOleDocumentView *iface, BOOL f } This->focus = TRUE; - nsIWebBrowserFocus_Activate(This->nscontainer->focus); + if(This->nscontainer) + nsIWebBrowserFocus_Activate(This->nscontainer->focus); notif_focus(This); update_doc(This, UPDATE_UI);

1 0

Jacek Caban : shdocvw: Added WebBrowser::Resizable property implementation.
by Alexandre Julliard 24 Sep '07

24 Sep '07

Module: wine Branch: master Commit: 75eb61cdc6bcc69493aa70cb63cbb3f224542b58 URL: http://source.winehq.org/git/wine.git/?a=commit;h=75eb61cdc6bcc69493aa70cb6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Sep 23 22:57:58 2007 +0200 shdocvw: Added WebBrowser::Resizable property implementation. --- dlls/shdocvw/tests/webbrowser.c | 17 +++++++++++++++++ dlls/shdocvw/webbrowser.c | 12 +++++++++--- 2 files changed, 26 insertions(+), 3 deletions(-) diff --git a/dlls/shdocvw/tests/webbrowser.c b/dlls/shdocvw/tests/webbrowser.c index c4b76ec..2b38154 100644 --- a/dlls/shdocvw/tests/webbrowser.c +++ b/dlls/shdocvw/tests/webbrowser.c @@ -1117,6 +1117,23 @@ static void test_ie_funcs(IUnknown *unk) hres = IWebBrowser2_put_FullScreen(wb, VARIANT_FALSE); ok(hres == S_OK, "put_FullScreen failed: %08x\n", hres); + /* Resizable */ + + b = 0x100; + hres = IWebBrowser2_get_Resizable(wb, &b); + ok(hres == E_NOTIMPL, "get_Resizable failed: %08x\n", hres); + ok(b == 0x100, "b=%x\n", b); + + hres = IWebBrowser2_put_Resizable(wb, VARIANT_TRUE); + ok(hres == S_OK, "put_Resizable failed: %08x\n", hres); + + hres = IWebBrowser2_put_Resizable(wb, VARIANT_FALSE); + ok(hres == S_OK, "put_Resizable failed: %08x\n", hres); + + hres = IWebBrowser2_get_Resizable(wb, &b); + ok(hres == E_NOTIMPL, "get_Resizable failed: %08x\n", hres); + ok(b == 0x100, "b=%x\n", b); + IWebBrowser2_Release(wb); } diff --git a/dlls/shdocvw/webbrowser.c b/dlls/shdocvw/webbrowser.c index cc27632..c9af82f 100644 --- a/dlls/shdocvw/webbrowser.c +++ b/dlls/shdocvw/webbrowser.c @@ -825,15 +825,21 @@ static HRESULT WINAPI WebBrowser_put_AddressBar(IWebBrowser2 *iface, VARIANT_BOO static HRESULT WINAPI WebBrowser_get_Resizable(IWebBrowser2 *iface, VARIANT_BOOL *Value) { WebBrowser *This = WEBBROWSER_THIS(iface); - FIXME("(%p)->(%p)\n", This, Value); + + TRACE("(%p)->(%p)\n", This, Value); + + /* It's InternetExplorer object's method. We have nothing to do here. */ return E_NOTIMPL; } static HRESULT WINAPI WebBrowser_put_Resizable(IWebBrowser2 *iface, VARIANT_BOOL Value) { WebBrowser *This = WEBBROWSER_THIS(iface); - FIXME("(%p)->(%x)\n", This, Value); - return E_NOTIMPL; + + TRACE("(%p)->(%x)\n", This, Value); + + /* It's InternetExplorer object's method. We have nothing to do here. */ + return S_OK; } #undef WEBBROWSER_THIS

1 0

Jacek Caban : shdocvw: Added WebBrowser::FullScreen property implementation .
by Alexandre Julliard 24 Sep '07

24 Sep '07

Module: wine Branch: master Commit: 2fe9af5507f55a7a09a84ecee39e256a9275727e URL: http://source.winehq.org/git/wine.git/?a=commit;h=2fe9af5507f55a7a09a84ecee… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Sep 23 22:37:01 2007 +0200 shdocvw: Added WebBrowser::FullScreen property implementation. --- dlls/shdocvw/shdocvw.h | 1 + dlls/shdocvw/tests/webbrowser.c | 23 +++++++++++++++++++++++ dlls/shdocvw/webbrowser.c | 15 +++++++++++---- 3 files changed, 35 insertions(+), 4 deletions(-) diff --git a/dlls/shdocvw/shdocvw.h b/dlls/shdocvw/shdocvw.h index 0e2a739..28637bf 100644 --- a/dlls/shdocvw/shdocvw.h +++ b/dlls/shdocvw/shdocvw.h @@ -131,6 +131,7 @@ struct WebBrowser { VARIANT_BOOL address_bar; VARIANT_BOOL status_bar; VARIANT_BOOL tool_bar; + VARIANT_BOOL full_screen; DocHost doc_host; }; diff --git a/dlls/shdocvw/tests/webbrowser.c b/dlls/shdocvw/tests/webbrowser.c index 8f80505..c4b76ec 100644 --- a/dlls/shdocvw/tests/webbrowser.c +++ b/dlls/shdocvw/tests/webbrowser.c @@ -1094,6 +1094,29 @@ static void test_ie_funcs(IUnknown *unk) hres = IWebBrowser2_put_ToolBar(wb, VARIANT_TRUE); ok(hres == S_OK, "put_ToolBar failed: %08x\n", hres); + /* FullScreen */ + + hres = IWebBrowser2_get_FullScreen(wb, &b); + ok(hres == S_OK, "get_FullScreen failed: %08x\n", hres); + ok(b == VARIANT_FALSE, "b=%x\n", b); + + hres = IWebBrowser2_put_FullScreen(wb, VARIANT_TRUE); + ok(hres == S_OK, "put_FullScreen failed: %08x\n", hres); + + hres = IWebBrowser2_get_FullScreen(wb, &b); + ok(hres == S_OK, "get_FullScreen failed: %08x\n", hres); + ok(b == VARIANT_TRUE, "b=%x\n", b); + + hres = IWebBrowser2_put_FullScreen(wb, 100); + ok(hres == S_OK, "put_FullScreen failed: %08x\n", hres); + + hres = IWebBrowser2_get_FullScreen(wb, &b); + ok(hres == S_OK, "get_FullScreen failed: %08x\n", hres); + ok(b == VARIANT_TRUE, "b=%x\n", b); + + hres = IWebBrowser2_put_FullScreen(wb, VARIANT_FALSE); + ok(hres == S_OK, "put_FullScreen failed: %08x\n", hres); + IWebBrowser2_Release(wb); } diff --git a/dlls/shdocvw/webbrowser.c b/dlls/shdocvw/webbrowser.c index ff7f699..cc27632 100644 --- a/dlls/shdocvw/webbrowser.c +++ b/dlls/shdocvw/webbrowser.c @@ -638,15 +638,21 @@ static HRESULT WINAPI WebBrowser_put_MenuBar(IWebBrowser2 *iface, VARIANT_BOOL V static HRESULT WINAPI WebBrowser_get_FullScreen(IWebBrowser2 *iface, VARIANT_BOOL *pbFullScreen) { WebBrowser *This = WEBBROWSER_THIS(iface); - FIXME("(%p)->(%p)\n", This, pbFullScreen); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, pbFullScreen); + + *pbFullScreen = This->full_screen; + return S_OK; } static HRESULT WINAPI WebBrowser_put_FullScreen(IWebBrowser2 *iface, VARIANT_BOOL bFullScreen) { WebBrowser *This = WEBBROWSER_THIS(iface); - FIXME("(%p)->(%x)\n", This, bFullScreen); - return E_NOTIMPL; + + TRACE("(%p)->(%x)\n", This, bFullScreen); + + This->full_screen = bFullScreen ? VARIANT_TRUE : VARIANT_FALSE; + return S_OK; } static HRESULT WINAPI WebBrowser_Navigate2(IWebBrowser2 *iface, VARIANT *URL, VARIANT *Flags, @@ -927,6 +933,7 @@ static HRESULT WebBrowser_Create(INT version, IUnknown *pOuter, REFIID riid, voi ret->address_bar = VARIANT_TRUE; ret->status_bar = VARIANT_TRUE; ret->tool_bar = VARIANT_TRUE; + ret->full_screen = VARIANT_FALSE; WebBrowser_OleObject_Init(ret); WebBrowser_ViewObject_Init(ret);

1 0

Alex Villacís Lasso : riched20: Fix WM_GETTEXT to change \r to \r\n.
by Alexandre Julliard 24 Sep '07

24 Sep '07

Module: wine Branch: master Commit: 00e562735dd5e092b6149944ef09dd7f2ec97f1d URL: http://source.winehq.org/git/wine.git/?a=commit;h=00e562735dd5e092b6149944e… Author: Alex Villacís Lasso <a_villacis(a)palosanto.com> Date: Sun Sep 23 16:40:28 2007 -0500 riched20: Fix WM_GETTEXT to change \r to \r\n. --- dlls/riched20/editor.c | 13 ++++++++----- dlls/riched20/tests/editor.c | 13 +++---------- 2 files changed, 11 insertions(+), 15 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index dff0b5f..a10c954 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -1983,11 +1983,14 @@ static LRESULT RichEditWndProc_common(HWND hWnd, UINT msg, WPARAM wParam, return ME_GetTextLengthEx(editor, (GETTEXTLENGTHEX *)wParam); case WM_GETTEXT: { - TEXTRANGEW tr; /* W and A differ only by rng->lpstrText */ - tr.chrg.cpMin = 0; - tr.chrg.cpMax = wParam ? (wParam - 1) : 0; - tr.lpstrText = (WCHAR *)lParam; - return RichEditWndProc_common(hWnd, EM_GETTEXTRANGE, 0, (LPARAM)&tr, unicode); + GETTEXTEX ex; + + ex.cb = wParam; + ex.flags = GT_USECRLF; + ex.codepage = unicode ? 1200 : CP_ACP; + ex.lpDefaultChar = NULL; + ex.lpUsedDefaultChar = NULL; + return RichEditWndProc_common(hWnd, EM_GETTEXTEX, (WPARAM)&ex, lParam, unicode); } case EM_GETTEXTEX: { diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index a0b04e0..1c564ec 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -943,10 +943,8 @@ static void test_WM_SETTEXT() "WM_GETTEXT returned %ld instead of expected %u\n", result, strlen(buf)); result = strcmp(TestItem2_after, buf); - todo_wine { ok(result == 0, "WM_SETTEXT round trip: strcmp = %ld\n", result); - } result = SendMessage(hwndRichEdit, WM_SETTEXT, 0, (LPARAM) TestItem3); ok (result == 1, "WM_SETTEXT returned %ld instead of 1\n", result); @@ -955,10 +953,8 @@ static void test_WM_SETTEXT() "WM_GETTEXT returned %ld instead of expected %u\n", result, strlen(buf)); result = strcmp(TestItem3_after, buf); - todo_wine { ok(result == 0, "WM_SETTEXT round trip: strcmp = %ld\n", result); - } result = SendMessage(hwndRichEdit, WM_SETTEXT, 0, (LPARAM) TestItem3_after); ok (result == 1, "WM_SETTEXT returned %ld instead of 1\n", result); @@ -967,10 +963,8 @@ static void test_WM_SETTEXT() "WM_GETTEXT returned %ld instead of expected %u\n", result, strlen(buf)); result = strcmp(TestItem3_after, buf); - todo_wine { ok(result == 0, "WM_SETTEXT round trip: strcmp = %ld\n", result); - } DestroyWindow(hwndRichEdit); } @@ -1020,10 +1014,8 @@ static void test_EM_SETTEXTEX(void) /* However, WM_GETTEXT *does* see \r\n where EM_GETTEXTEX would see \r */ SendMessage(hwndRichEdit, WM_GETTEXT, MAX_BUF_LEN, (LPARAM)buf); - todo_wine { ok(strcmp((const char *)buf, TestItem2_after) == 0, "WM_GETTEXT did *not* see \\r converted to \\r\\n pairs.\n"); - } result = SendMessage(hwndRichEdit, EM_SETTEXTEX, (WPARAM)&setText, (LPARAM) NULL); @@ -1616,8 +1608,9 @@ static void test_WM_PASTE(void) int result; char buffer[1024] = {0}; const char* text1 = "testing paste\r"; + const char* text1_after = "testing paste\r\n"; const char* text2 = "testing paste\r\rtesting paste"; - const char* text3 = "testing paste\rpaste\rtesting paste"; + const char* text3 = "testing paste\r\npaste\r\ntesting paste"; HWND hwndRichEdit = new_richedit(NULL); SendMessage(hwndRichEdit, WM_SETTEXT, 0, (LPARAM) text1); @@ -1627,7 +1620,7 @@ static void test_WM_PASTE(void) SendMessage(hwndRichEdit, WM_CHAR, 22, 0); /* ctrl-v */ SendMessage(hwndRichEdit, WM_CHAR, 26, 0); /* ctrl-z */ SendMessage(hwndRichEdit, WM_GETTEXT, 1024, (LPARAM) buffer); - result = strcmp(text1, buffer); + result = strcmp(text1_after, buffer); ok(result == 0, "test paste: strcmp = %i\n", result);

1 0

Alex Villacís Lasso : riched20: Tests show WM_GETTEXT change \r to \r\n.
by Alexandre Julliard 24 Sep '07

24 Sep '07

Module: wine Branch: master Commit: 47316d62bb82b7f46c5f759ceea159c47992f864 URL: http://source.winehq.org/git/wine.git/?a=commit;h=47316d62bb82b7f46c5f759ce… Author: Alex Villacís Lasso <a_villacis(a)palosanto.com> Date: Sun Sep 23 00:59:33 2007 -0500 riched20: Tests show WM_GETTEXT change \r to \r\n. --- dlls/riched20/tests/editor.c | 92 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 92 insertions(+), 0 deletions(-) diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index 5c00586..a0b04e0 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -910,6 +910,71 @@ static void test_ES_PASSWORD(void) DestroyWindow(hwndRichEdit); } +static void test_WM_SETTEXT() +{ + HWND hwndRichEdit = new_richedit(NULL); + const char * TestItem1 = "TestSomeText"; + const char * TestItem2 = "TestSomeText\r"; + const char * TestItem2_after = "TestSomeText\r\n"; + const char * TestItem3 = "TestSomeText\rSomeMoreText\r"; + const char * TestItem3_after = "TestSomeText\r\nSomeMoreText\r\n"; + char buf[1024] = {0}; + LRESULT result; + + /* This test attempts to show that WM_SETTEXT on a riched20 control causes + any solitary \r to be converted to \r\n on return. Properly paired + \r\n are not affected. + */ + + result = SendMessage(hwndRichEdit, WM_SETTEXT, 0, (LPARAM) TestItem1); + ok (result == 1, "WM_SETTEXT returned %ld instead of 1\n", result); + result = SendMessage(hwndRichEdit, WM_GETTEXT, 1024, (LPARAM) buf); + ok (result == strlen(buf), + "WM_GETTEXT returned %ld instead of expected %u\n", + result, strlen(buf)); + result = strcmp(TestItem1, buf); + ok(result == 0, + "WM_SETTEXT round trip: strcmp = %ld\n", result); + + result = SendMessage(hwndRichEdit, WM_SETTEXT, 0, (LPARAM) TestItem2); + ok (result == 1, "WM_SETTEXT returned %ld instead of 1\n", result); + result = SendMessage(hwndRichEdit, WM_GETTEXT, 1024, (LPARAM) buf); + ok (result == strlen(buf), + "WM_GETTEXT returned %ld instead of expected %u\n", + result, strlen(buf)); + result = strcmp(TestItem2_after, buf); + todo_wine { + ok(result == 0, + "WM_SETTEXT round trip: strcmp = %ld\n", result); + } + + result = SendMessage(hwndRichEdit, WM_SETTEXT, 0, (LPARAM) TestItem3); + ok (result == 1, "WM_SETTEXT returned %ld instead of 1\n", result); + result = SendMessage(hwndRichEdit, WM_GETTEXT, 1024, (LPARAM) buf); + ok (result == strlen(buf), + "WM_GETTEXT returned %ld instead of expected %u\n", + result, strlen(buf)); + result = strcmp(TestItem3_after, buf); + todo_wine { + ok(result == 0, + "WM_SETTEXT round trip: strcmp = %ld\n", result); + } + + result = SendMessage(hwndRichEdit, WM_SETTEXT, 0, (LPARAM) TestItem3_after); + ok (result == 1, "WM_SETTEXT returned %ld instead of 1\n", result); + result = SendMessage(hwndRichEdit, WM_GETTEXT, 1024, (LPARAM) buf); + ok (result == strlen(buf), + "WM_GETTEXT returned %ld instead of expected %u\n", + result, strlen(buf)); + result = strcmp(TestItem3_after, buf); + todo_wine { + ok(result == 0, + "WM_SETTEXT round trip: strcmp = %ld\n", result); + } + + DestroyWindow(hwndRichEdit); +} + static void test_EM_SETTEXTEX(void) { HWND hwndRichEdit = new_richedit(NULL); @@ -918,6 +983,11 @@ static void test_EM_SETTEXTEX(void) WCHAR TestItem1[] = {'T', 'e', 's', 't', 'S', 'o', 'm', 'e', 'T', 'e', 'x', 't', 0}; + WCHAR TestItem2[] = {'T', 'e', 's', 't', + 'S', 'o', 'm', 'e', + 'T', 'e', 'x', 't', + '\r', 0}; + const char * TestItem2_after = "TestSomeText\r\n"; #define MAX_BUF_LEN 1024 WCHAR buf[MAX_BUF_LEN]; int result; @@ -934,6 +1004,27 @@ static void test_EM_SETTEXTEX(void) ok(lstrcmpW(buf, TestItem1) == 0, "EM_GETTEXTEX results not what was set by EM_SETTEXTEX\n"); + /* Unlike WM_SETTEXT/WM_GETTEXT pair, EM_SETTEXTEX/EM_GETTEXTEX does not + convert \r to \r\n on return + */ + setText.codepage = 1200; /* no constant for unicode */ + getText.codepage = 1200; /* no constant for unicode */ + getText.cb = MAX_BUF_LEN; + getText.flags = GT_DEFAULT; + + setText.flags = 0; + SendMessage(hwndRichEdit, EM_SETTEXTEX, (WPARAM)&setText, (LPARAM) TestItem2); + SendMessage(hwndRichEdit, EM_GETTEXTEX, (WPARAM)&getText, (LPARAM) buf); + ok(lstrcmpW(buf, TestItem2) == 0, + "EM_GETTEXTEX results not what was set by EM_SETTEXTEX\n"); + + /* However, WM_GETTEXT *does* see \r\n where EM_GETTEXTEX would see \r */ + SendMessage(hwndRichEdit, WM_GETTEXT, MAX_BUF_LEN, (LPARAM)buf); + todo_wine { + ok(strcmp((const char *)buf, TestItem2_after) == 0, + "WM_GETTEXT did *not* see \\r converted to \\r\\n pairs.\n"); + } + result = SendMessage(hwndRichEdit, EM_SETTEXTEX, (WPARAM)&setText, (LPARAM) NULL); SendMessage(hwndRichEdit, EM_GETTEXTEX, (WPARAM)&getText, (LPARAM) buf); @@ -2031,6 +2122,7 @@ START_TEST( editor ) test_EM_GETLINE(); test_EM_SCROLLCARET(); test_EM_SCROLL(); + test_WM_SETTEXT(); test_EM_SETTEXTMODE(); test_TM_PLAINTEXT(); test_EM_SETOPTIONS();

1 0

Mikołaj Zalewski : advapi32: Add some more rights constants for ConvertStringSecurityDescriptorToSecurityDescriptor .
by Alexandre Julliard 24 Sep '07

24 Sep '07

Module: wine Branch: master Commit: 5b4aa62fd2ae961a2c4017d766b728b834b705cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b4aa62fd2ae961a2c4017d76… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Sat Sep 22 21:26:05 2007 -0700 advapi32: Add some more rights constants for ConvertStringSecurityDescriptorToSecurityDescriptor. --- dlls/advapi32/security.c | 44 ++++++++++++++++++++++++++++++++++++++++ dlls/advapi32/tests/security.c | 3 -- include/iads.idl | 24 +++++++++++++++++++++ 3 files changed, 68 insertions(+), 3 deletions(-) diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index 4c41e0c..5e43203 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -35,6 +35,8 @@ #include "sddl.h" #include "winsvc.h" #include "aclapi.h" +#include "objbase.h" +#include "iads.h" #include "advapi32_misc.h" #include "wine/debug.h" @@ -246,6 +248,27 @@ static const WCHAR SDDL_READ_CONTROL[] = {'R','C',0}; static const WCHAR SDDL_WRITE_DAC[] = {'W','D',0}; static const WCHAR SDDL_WRITE_OWNER[] = {'W','O',0}; static const WCHAR SDDL_STANDARD_DELETE[] = {'S','D',0}; + +static const WCHAR SDDL_READ_PROPERTY[] = {'R','P',0}; +static const WCHAR SDDL_WRITE_PROPERTY[] = {'W','P',0}; +static const WCHAR SDDL_CREATE_CHILD[] = {'C','C',0}; +static const WCHAR SDDL_DELETE_CHILD[] = {'D','C',0}; +static const WCHAR SDDL_LIST_CHILDREN[] = {'L','C',0}; +static const WCHAR SDDL_SELF_WRITE[] = {'S','W',0}; +static const WCHAR SDDL_LIST_OBJECT[] = {'L','O',0}; +static const WCHAR SDDL_DELETE_TREE[] = {'D','T',0}; +static const WCHAR SDDL_CONTROL_ACCESS[] = {'C','R',0}; + +static const WCHAR SDDL_FILE_ALL[] = {'F','A',0}; +static const WCHAR SDDL_FILE_READ[] = {'F','R',0}; +static const WCHAR SDDL_FILE_WRITE[] = {'F','W',0}; +static const WCHAR SDDL_FILE_EXECUTE[] = {'F','X',0}; + +static const WCHAR SDDL_KEY_ALL[] = {'K','A',0}; +static const WCHAR SDDL_KEY_READ[] = {'K','R',0}; +static const WCHAR SDDL_KEY_WRITE[] = {'K','W',0}; +static const WCHAR SDDL_KEY_EXECUTE[] = {'K','X',0}; + static const WCHAR SDDL_GENERIC_ALL[] = {'G','A',0}; static const WCHAR SDDL_GENERIC_READ[] = {'G','R',0}; static const WCHAR SDDL_GENERIC_WRITE[] = {'G','W',0}; @@ -3107,10 +3130,31 @@ static const ACEFLAG AceRights[] = { SDDL_GENERIC_READ, GENERIC_READ }, { SDDL_GENERIC_WRITE, GENERIC_WRITE }, { SDDL_GENERIC_EXECUTE, GENERIC_EXECUTE }, + { SDDL_READ_CONTROL, READ_CONTROL }, { SDDL_STANDARD_DELETE, DELETE }, { SDDL_WRITE_DAC, WRITE_DAC }, { SDDL_WRITE_OWNER, WRITE_OWNER }, + + { SDDL_READ_PROPERTY, ADS_RIGHT_DS_READ_PROP}, + { SDDL_WRITE_PROPERTY, ADS_RIGHT_DS_WRITE_PROP}, + { SDDL_CREATE_CHILD, ADS_RIGHT_DS_CREATE_CHILD}, + { SDDL_DELETE_CHILD, ADS_RIGHT_DS_DELETE_CHILD}, + { SDDL_LIST_CHILDREN, ADS_RIGHT_ACTRL_DS_LIST}, + { SDDL_SELF_WRITE, ADS_RIGHT_DS_SELF}, + { SDDL_LIST_OBJECT, ADS_RIGHT_DS_LIST_OBJECT}, + { SDDL_DELETE_TREE, ADS_RIGHT_DS_DELETE_TREE}, + { SDDL_CONTROL_ACCESS, ADS_RIGHT_DS_CONTROL_ACCESS}, + + { SDDL_FILE_ALL, FILE_ALL_ACCESS }, + { SDDL_FILE_READ, FILE_GENERIC_READ }, + { SDDL_FILE_WRITE, FILE_GENERIC_WRITE }, + { SDDL_FILE_EXECUTE, FILE_GENERIC_EXECUTE }, + + { SDDL_KEY_ALL, KEY_ALL_ACCESS }, + { SDDL_KEY_READ, KEY_READ }, + { SDDL_KEY_WRITE, KEY_WRITE }, + { SDDL_KEY_EXECUTE, KEY_EXECUTE }, { NULL, 0 }, }; diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 9756ca8..86c4c50 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -1848,19 +1848,16 @@ static void test_ConvertStringSecurityDescriptor(void) SetLastError(0xdeadbeef); ret = pConvertStringSecurityDescriptorToSecurityDescriptorA( "D:(A;;RPWPCCDCLCSWLODTCR;;;WD)", SDDL_REVISION_1, &pSD, NULL); - todo_wine ok(ret, "ConvertStringSecurityDescriptorToSecurityDescriptor failed with error %d\n", GetLastError()); LocalFree(pSD); SetLastError(0xdeadbeef); ret = pConvertStringSecurityDescriptorToSecurityDescriptorA( "D:(A;;FAFRFWFX;;;WD)", SDDL_REVISION_1, &pSD, NULL); - todo_wine ok(ret, "ConvertStringSecurityDescriptorToSecurityDescriptor failed with error %d\n", GetLastError()); LocalFree(pSD); SetLastError(0xdeadbeef); ret = pConvertStringSecurityDescriptorToSecurityDescriptorA( "D:(A;;KAKRKWKX;;;WD)", SDDL_REVISION_1, &pSD, NULL); - todo_wine ok(ret, "ConvertStringSecurityDescriptorToSecurityDescriptor failed with error %d\n", GetLastError()); LocalFree(pSD); SetLastError(0xdeadbeef); diff --git a/include/iads.idl b/include/iads.idl index 08cbfe8..ce38bfe 100644 --- a/include/iads.idl +++ b/include/iads.idl @@ -18,6 +18,30 @@ import "oaidl.idl"; +typedef enum +{ + ADS_RIGHT_DS_CREATE_CHILD = 0x00000001, + ADS_RIGHT_DS_DELETE_CHILD = 0x00000002, + ADS_RIGHT_ACTRL_DS_LIST = 0x00000004, + ADS_RIGHT_DS_SELF = 0x00000008, + ADS_RIGHT_DS_READ_PROP = 0x00000010, + ADS_RIGHT_DS_WRITE_PROP = 0x00000020, + ADS_RIGHT_DS_DELETE_TREE = 0x00000040, + ADS_RIGHT_DS_LIST_OBJECT = 0x00000080, + ADS_RIGHT_DS_CONTROL_ACCESS = 0x00000100, + + ADS_RIGHT_DELETE = 0x00010000, + ADS_RIGHT_READ_CONTROL = 0x00020000, + ADS_RIGHT_WRITE_DAC = 0x00040000, + ADS_RIGHT_WRITE_OWNER = 0x00080000, + ADS_RIGHT_SYNCHRONIZE = 0x00100000, + ADS_RIGHT_ACCESS_SYSTEM_SECURITY = 0x00200000, + + ADS_RIGHT_GENERIC_ALL = 0x10000000, + ADS_RIGHT_GENERIC_EXECUTE = 0x20000000, + ADS_RIGHT_GENERIC_WRITE = 0x40000000, + ADS_RIGHT_GENERIC_READ = 0x80000000 +} ADS_RIGHTS_ENUM; /***************************************************************************** * IADsContainer interface

1 0

Stefan Dösinger : wined3d: A0 needs the .x swizzle.
by Alexandre Julliard 24 Sep '07

24 Sep '07

Module: wine Branch: master Commit: 316095c7a386295b26e703ad55d764cfe13b8abd URL: http://source.winehq.org/git/wine.git/?a=commit;h=316095c7a386295b26e703ad5… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Sep 4 11:10:07 2007 +0200 wined3d: A0 needs the .x swizzle. --- dlls/wined3d/arb_program_shader.c | 23 ++++++++++++++--------- 1 files changed, 14 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 2a006eb..4d404d6 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -316,10 +316,15 @@ static const char * const shift_tab[] = { "coefdiv.x" /* 15 (d2) */ }; -static void shader_arb_get_write_mask(const DWORD param, char *write_mask) { +static void shader_arb_get_write_mask(SHADER_OPCODE_ARG* arg, const DWORD param, char *write_mask) { + IWineD3DBaseShaderImpl *This = (IWineD3DBaseShaderImpl *) arg->shader; char *ptr = write_mask; + char vshader = shader_is_vshader_version(This->baseShader.hex_version); - if ((param & WINED3DSP_WRITEMASK_ALL) != WINED3DSP_WRITEMASK_ALL) { + if(vshader && shader_get_regtype(param) == WINED3DSPR_ADDR) { + *ptr++ = '.'; + *ptr++ = 'x'; + } else if ((param & WINED3DSP_WRITEMASK_ALL) != WINED3DSP_WRITEMASK_ALL) { *ptr++ = '.'; if (param & WINED3DSP_WRITEMASK_0) *ptr++ = 'x'; if (param & WINED3DSP_WRITEMASK_1) *ptr++ = 'y'; @@ -472,7 +477,7 @@ static void vshader_program_add_param(SHADER_OPCODE_ARG *arg, const DWORD param, if (!is_input) { char write_mask[6]; - shader_arb_get_write_mask(param, write_mask); + shader_arb_get_write_mask(arg, param, write_mask); strcat(hwLine, write_mask); } else { char swizzle[6]; @@ -585,7 +590,7 @@ static void shader_arb_color_correction(SHADER_OPCODE_ARG* arg) { } pshader_get_register_name(arg->dst, reg); - shader_arb_get_write_mask(arg->dst, writemask); + shader_arb_get_write_mask(arg, arg->dst, writemask); if(strlen(writemask) == 0) strcpy(writemask, ".xyzw"); switch(fmt) { @@ -786,7 +791,7 @@ void pshader_hw_bem(SHADER_OPCODE_ARG* arg) { char dst_wmask[20]; pshader_get_register_name(arg->dst, dst_name); - shader_arb_get_write_mask(arg->dst, dst_wmask); + shader_arb_get_write_mask(arg, arg->dst, dst_wmask); strcat(dst_name, dst_wmask); pshader_gen_input_modifier_line(buffer, arg->src[0], 0, src_name[0]); @@ -817,7 +822,7 @@ void pshader_hw_cnd(SHADER_OPCODE_ARG* arg) { /* Handle output register */ pshader_get_register_name(arg->dst, dst_name); - shader_arb_get_write_mask(arg->dst, dst_wmask); + shader_arb_get_write_mask(arg, arg->dst, dst_wmask); strcat(dst_name, dst_wmask); /* Generate input register names (with modifiers) */ @@ -846,7 +851,7 @@ void pshader_hw_cmp(SHADER_OPCODE_ARG* arg) { /* Handle output register */ pshader_get_register_name(arg->dst, dst_name); - shader_arb_get_write_mask(arg->dst, dst_wmask); + shader_arb_get_write_mask(arg, arg->dst, dst_wmask); strcat(dst_name, dst_wmask); /* Generate input register names (with modifiers) */ @@ -906,7 +911,7 @@ void pshader_hw_map2gl(SHADER_OPCODE_ARG* arg) { /* Handle output register */ pshader_get_register_name(dst, output_rname); strcpy(operands[0], output_rname); - shader_arb_get_write_mask(dst, output_wmask); + shader_arb_get_write_mask(arg, dst, output_wmask); strcat(operands[0], output_wmask); if (saturate && (shift == 0)) @@ -992,7 +997,7 @@ void pshader_hw_texcoord(SHADER_OPCODE_ARG* arg) { DWORD hex_version = This->baseShader.hex_version; char tmp[20]; - shader_arb_get_write_mask(dst, tmp); + shader_arb_get_write_mask(arg, dst, tmp); if (hex_version != WINED3DPS_VERSION(1,4)) { DWORD reg = dst & WINED3DSP_REGNUM_MASK; shader_addline(buffer, "MOV_SAT T%u%s, fragment.texcoord[%u];\n", reg, tmp, reg);

1 0

Stefan Dösinger : wined3d: SRGB write correction emulation.
by Alexandre Julliard 24 Sep '07

24 Sep '07

Module: wine Branch: master Commit: 6313e0ffff5f57e437937e17fa482694d17d9664 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6313e0ffff5f57e437937e17f… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Sep 14 13:02:59 2007 +0200 wined3d: SRGB write correction emulation. --- dlls/wined3d/arb_program_shader.c | 72 ++++++++++++++++++++++++++++++++++++- dlls/wined3d/glsl_shader.c | 68 +++++++++++++++++++++++++++++++--- dlls/wined3d/pixelshader.c | 62 +++++++++++++++++++++++++++++--- dlls/wined3d/state.c | 8 +---- dlls/wined3d/wined3d_private.h | 11 ++++++ 5 files changed, 202 insertions(+), 19 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6313e0ffff5f57e437937…

1 0

Stefan Dösinger : wined3d: Unify pixel format correction.
by Alexandre Julliard 24 Sep '07

24 Sep '07

Module: wine Branch: master Commit: 2b2c9199e8a43c7ab58be5cc1875e1be88474bf2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b2c9199e8a43c7ab58be5cc1… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Sep 21 23:53:57 2007 +0200 wined3d: Unify pixel format correction. --- dlls/wined3d/arb_program_shader.c | 190 ++++++++++++++++++++++++++++++++++--- dlls/wined3d/baseshader.c | 4 + dlls/wined3d/glsl_shader.c | 56 +++++++----- dlls/wined3d/wined3d_private.h | 3 +- 4 files changed, 218 insertions(+), 35 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2b2c9199e8a43c7ab58be…

1 0

Stefan Dösinger : wined3d: Recompile glsl pixelshaders if the sampler format changes.
by Alexandre Julliard 24 Sep '07

24 Sep '07

Module: wine Branch: master Commit: 1c4a15d2cd5100464328e7f65bba4b49388ac11c URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c4a15d2cd5100464328e7f65… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Sep 21 23:47:40 2007 +0200 wined3d: Recompile glsl pixelshaders if the sampler format changes. --- dlls/wined3d/device.c | 9 +++++ dlls/wined3d/glsl_shader.c | 20 +++++++++++ dlls/wined3d/pixelshader.c | 69 +++++++++++++++++++++++++++++++--------- dlls/wined3d/utils.c | 42 ++++++++++++++++++++++-- dlls/wined3d/wined3d_private.h | 12 +++++++ include/wine/wined3d_gl.h | 1 + 6 files changed, 135 insertions(+), 18 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1c4a15d2cd5100464328e…

1 0

← Newer
1
...
18
19
20
21
22
23
24
...
79
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits September 2007