wine-commits June 2016

wine-commits@winehq.org

2 participants
592 discussions

Hugh McMaster : reg: Simplify help logic and syntax.
by Alexandre Julliard 03 Jun '16

03 Jun '16

Module: wine Branch: master Commit: 45acfd9b5086a57dad59a0cab73436efa143134b URL: http://source.winehq.org/git/wine.git/?a=commit;h=45acfd9b5086a57dad59a0cab… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Fri Jun 3 05:23:51 2016 +0000 reg: Simplify help logic and syntax. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/reg.c | 35 ++++++++++++++--------------------- 1 file changed, 14 insertions(+), 21 deletions(-) diff --git a/programs/reg/reg.c b/programs/reg/reg.c index db737f7..417fe88 100644 --- a/programs/reg/reg.c +++ b/programs/reg/reg.c @@ -916,6 +916,7 @@ static enum operations get_operation(const WCHAR *str) int wmain(int argc, WCHAR *argvW[]) { int i, op; + BOOL show_op_help = FALSE; static const WCHAR slashDW[] = {'/','d',0}; static const WCHAR slashFW[] = {'/','f',0}; static const WCHAR slashSW[] = {'/','s',0}; @@ -946,18 +947,22 @@ int wmain(int argc, WCHAR *argvW[]) return 1; } + if (argc > 2) + show_op_help = is_help_switch(argvW[2]); + + if (argc == 2 || (show_op_help && argc > 3)) + { + output_message(STRING_INVALID_SYNTAX); + output_message(STRING_FUNC_HELP, struprW(argvW[1])); + return 1; + } + if (op == REG_ADD) { WCHAR *key_name, *value_name = NULL, *type = NULL, separator = '\0', *data = NULL; BOOL value_empty = FALSE, force = FALSE; - if (argc < 3) - { - output_message(STRING_INVALID_SYNTAX); - output_message(STRING_FUNC_HELP, struprW(argvW[1])); - return 1; - } - else if (argc == 3 && is_help_switch(argvW[2])) + if (show_op_help) { output_message(STRING_ADD_USAGE); return 0; @@ -1008,13 +1013,7 @@ int wmain(int argc, WCHAR *argvW[]) WCHAR *key_name, *value_name = NULL; BOOL value_empty = FALSE, value_all = FALSE, force = FALSE; - if (argc < 3) - { - output_message(STRING_INVALID_SYNTAX); - output_message(STRING_FUNC_HELP, struprW(argvW[1])); - return 1; - } - else if (argc == 3 && is_help_switch(argvW[2])) + if (show_op_help) { output_message(STRING_DELETE_USAGE); return 0; @@ -1045,13 +1044,7 @@ int wmain(int argc, WCHAR *argvW[]) WCHAR *key_name, *value_name = NULL; BOOL value_empty = FALSE, recurse = FALSE; - if (argc < 3) - { - output_message(STRING_INVALID_SYNTAX); - output_message(STRING_FUNC_HELP, struprW(argvW[1])); - return 1; - } - else if (argc == 3 && is_help_switch(argvW[2])) + if (show_op_help) { output_message(STRING_QUERY_USAGE); return 0;

1 0

Hugh McMaster : reg: Exit with an error if the specified operation is invalid.
by Alexandre Julliard 03 Jun '16

03 Jun '16

Module: wine Branch: master Commit: 33d657f55ccc304744917d92e832cd55a963bbf1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=33d657f55ccc304744917d92e… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Fri Jun 3 05:23:39 2016 +0000 reg: Exit with an error if the specified operation is invalid. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/reg.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/programs/reg/reg.c b/programs/reg/reg.c index 3ba3902..db737f7 100644 --- a/programs/reg/reg.c +++ b/programs/reg/reg.c @@ -939,6 +939,13 @@ int wmain(int argc, WCHAR *argvW[]) op = get_operation(argvW[1]); + if (op == REG_INVALID) + { + output_message(STRING_INVALID_OPTION, argvW[1]); + output_message(STRING_REG_HELP); + return 1; + } + if (op == REG_ADD) { WCHAR *key_name, *value_name = NULL, *type = NULL, separator = '\0', *data = NULL;

1 0

Hugh McMaster : reg: Parse the registry operation using an enum.
by Alexandre Julliard 03 Jun '16

03 Jun '16

Module: wine Branch: master Commit: 6a927ef70c742952be0b7581d61edb677abe58f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a927ef70c742952be0b7581d… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Fri Jun 3 05:23:27 2016 +0000 reg: Parse the registry operation using an enum. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/reg.c | 39 +++++++++++++++++++++++++++++++-------- 1 file changed, 31 insertions(+), 8 deletions(-) diff --git a/programs/reg/reg.c b/programs/reg/reg.c index 71c1b89..3ba3902 100644 --- a/programs/reg/reg.c +++ b/programs/reg/reg.c @@ -888,13 +888,34 @@ static BOOL is_help_switch(const WCHAR *s) return FALSE; } -int wmain(int argc, WCHAR *argvW[]) +enum operations { + REG_ADD, + REG_DELETE, + REG_QUERY, + REG_INVALID +}; + +static const WCHAR addW[] = {'a','d','d',0}; +static const WCHAR deleteW[] = {'d','e','l','e','t','e',0}; +static const WCHAR queryW[] = {'q','u','e','r','y',0}; + +static enum operations get_operation(const WCHAR *str) { - int i; + if (!lstrcmpiW(str, addW)) + return REG_ADD; + + if (!lstrcmpiW(str, deleteW)) + return REG_DELETE; - static const WCHAR addW[] = {'a','d','d',0}; - static const WCHAR deleteW[] = {'d','e','l','e','t','e',0}; - static const WCHAR queryW[] = {'q','u','e','r','y',0}; + if (!lstrcmpiW(str, queryW)) + return REG_QUERY; + + return REG_INVALID; +} + +int wmain(int argc, WCHAR *argvW[]) +{ + int i, op; static const WCHAR slashDW[] = {'/','d',0}; static const WCHAR slashFW[] = {'/','f',0}; static const WCHAR slashSW[] = {'/','s',0}; @@ -916,7 +937,9 @@ int wmain(int argc, WCHAR *argvW[]) return 0; } - if (!lstrcmpiW(argvW[1], addW)) + op = get_operation(argvW[1]); + + if (op == REG_ADD) { WCHAR *key_name, *value_name = NULL, *type = NULL, separator = '\0', *data = NULL; BOOL value_empty = FALSE, force = FALSE; @@ -973,7 +996,7 @@ int wmain(int argc, WCHAR *argvW[]) return reg_add(key_name, value_name, value_empty, type, separator, data, force); } - else if (!lstrcmpiW(argvW[1], deleteW)) + else if (op == REG_DELETE) { WCHAR *key_name, *value_name = NULL; BOOL value_empty = FALSE, value_all = FALSE, force = FALSE; @@ -1010,7 +1033,7 @@ int wmain(int argc, WCHAR *argvW[]) } return reg_delete(key_name, value_name, value_empty, value_all, force); } - else if (!lstrcmpiW(argvW[1], queryW)) + else if (op == REG_QUERY) { WCHAR *key_name, *value_name = NULL; BOOL value_empty = FALSE, recurse = FALSE;

1 0

Hugh McMaster : reg: Recognise hyphen and forward slash help switches.
by Alexandre Julliard 03 Jun '16

03 Jun '16

Module: wine Branch: master Commit: 6ce8524271a0290c805b3f2fcb3442995b1943ae URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ce8524271a0290c805b3f2fc… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Fri Jun 3 05:23:17 2016 +0000 reg: Recognise hyphen and forward slash help switches. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/reg.c | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/programs/reg/reg.c b/programs/reg/reg.c index e3c2fdc..71c1b89 100644 --- a/programs/reg/reg.c +++ b/programs/reg/reg.c @@ -877,6 +877,17 @@ static int reg_query(WCHAR *key_name, WCHAR *value_name, BOOL value_empty, BOOL return ret; } +static BOOL is_help_switch(const WCHAR *s) +{ + if (strlenW(s) > 2) + return FALSE; + + if ((s[0] == '/' || s[0] == '-') && (s[1] == 'h' || s[1] == '?')) + return TRUE; + + return FALSE; +} + int wmain(int argc, WCHAR *argvW[]) { int i; @@ -886,13 +897,11 @@ int wmain(int argc, WCHAR *argvW[]) static const WCHAR queryW[] = {'q','u','e','r','y',0}; static const WCHAR slashDW[] = {'/','d',0}; static const WCHAR slashFW[] = {'/','f',0}; - static const WCHAR slashHW[] = {'/','h',0}; static const WCHAR slashSW[] = {'/','s',0}; static const WCHAR slashTW[] = {'/','t',0}; static const WCHAR slashVW[] = {'/','v',0}; static const WCHAR slashVAW[] = {'/','v','a',0}; static const WCHAR slashVEW[] = {'/','v','e',0}; - static const WCHAR slashHelpW[] = {'/','?',0}; if (argc == 1) { @@ -901,7 +910,7 @@ int wmain(int argc, WCHAR *argvW[]) return 1; } - if (!lstrcmpW(argvW[1], slashHelpW) || !lstrcmpiW(argvW[1], slashHW)) + if (is_help_switch(argvW[1])) { output_message(STRING_USAGE); return 0; @@ -918,8 +927,7 @@ int wmain(int argc, WCHAR *argvW[]) output_message(STRING_FUNC_HELP, struprW(argvW[1])); return 1; } - else if (argc == 3 && (!lstrcmpW(argvW[2], slashHelpW) || - !lstrcmpiW(argvW[2], slashHW))) + else if (argc == 3 && is_help_switch(argvW[2])) { output_message(STRING_ADD_USAGE); return 0; @@ -976,8 +984,7 @@ int wmain(int argc, WCHAR *argvW[]) output_message(STRING_FUNC_HELP, struprW(argvW[1])); return 1; } - else if (argc == 3 && (!lstrcmpW(argvW[2], slashHelpW) || - !lstrcmpiW(argvW[2], slashHW))) + else if (argc == 3 && is_help_switch(argvW[2])) { output_message(STRING_DELETE_USAGE); return 0; @@ -1014,8 +1021,7 @@ int wmain(int argc, WCHAR *argvW[]) output_message(STRING_FUNC_HELP, struprW(argvW[1])); return 1; } - else if (argc == 3 && (!lstrcmpW(argvW[2], slashHelpW) || - !lstrcmpiW(argvW[2], slashHW))) + else if (argc == 3 && is_help_switch(argvW[2])) { output_message(STRING_QUERY_USAGE); return 0;

1 0

Rob Walker : setupapi: Add stub for setupapi.dll.CM_Get_DevNode_Status.
by Alexandre Julliard 03 Jun '16

03 Jun '16

Module: wine Branch: master Commit: 10058e7c4efb472a372b09705c16d312d62d6b0c URL: http://source.winehq.org/git/wine.git/?a=commit;h=10058e7c4efb472a372b09705… Author: Rob Walker <bob.mt.wya(a)gmail.com> Date: Thu Jun 2 18:08:11 2016 +0100 setupapi: Add stub for setupapi.dll.CM_Get_DevNode_Status. Signed-off-by: Rob Walker <bob.mt.wya(a)gmail.com> Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/cfgmgr32/cfgmgr32.spec | 4 ++-- dlls/setupapi/setupapi.spec | 4 ++-- dlls/setupapi/stubs.c | 20 ++++++++++++++++++++ 3 files changed, 24 insertions(+), 4 deletions(-) diff --git a/dlls/cfgmgr32/cfgmgr32.spec b/dlls/cfgmgr32/cfgmgr32.spec index f442157..90a05ab 100644 --- a/dlls/cfgmgr32/cfgmgr32.spec +++ b/dlls/cfgmgr32/cfgmgr32.spec @@ -60,8 +60,8 @@ @ stdcall CM_Get_DevNode_Registry_PropertyW(long long ptr ptr long long) setupapi.CM_Get_DevNode_Registry_PropertyW @ stdcall CM_Get_DevNode_Registry_Property_ExA(long long ptr ptr ptr long ptr) setupapi.CM_Get_DevNode_Registry_Property_ExA @ stdcall CM_Get_DevNode_Registry_Property_ExW(long long ptr ptr ptr long ptr) setupapi.CM_Get_DevNode_Registry_Property_ExW -@ stub CM_Get_DevNode_Status -@ stub CM_Get_DevNode_Status_Ex +@ stdcall CM_Get_DevNode_Status(ptr ptr long long) setupapi.CM_Get_DevNode_Status +@ stdcall CM_Get_DevNode_Status_Ex(ptr ptr long long ptr) setupapi.CM_Get_DevNode_Status_Ex @ stdcall CM_Get_Device_IDA(ptr ptr long long) setupapi.CM_Get_Device_IDA @ stdcall CM_Get_Device_IDW(ptr ptr long long) setupapi.CM_Get_Device_IDW @ stdcall CM_Get_Device_ID_ExA(ptr ptr long long ptr) setupapi.CM_Get_Device_ID_ExA diff --git a/dlls/setupapi/setupapi.spec b/dlls/setupapi/setupapi.spec index 9bfaadd..897572d 100644 --- a/dlls/setupapi/setupapi.spec +++ b/dlls/setupapi/setupapi.spec @@ -71,8 +71,8 @@ @ stdcall CM_Get_DevNode_Registry_PropertyW(long long ptr ptr long long) @ stdcall CM_Get_DevNode_Registry_Property_ExA(long long ptr ptr ptr long ptr) @ stdcall CM_Get_DevNode_Registry_Property_ExW(long long ptr ptr ptr long ptr) -@ stub CM_Get_DevNode_Status -@ stub CM_Get_DevNode_Status_Ex +@ stdcall CM_Get_DevNode_Status(ptr ptr long long) +@ stdcall CM_Get_DevNode_Status_Ex(ptr ptr long long ptr) @ stdcall CM_Get_Device_IDA(ptr ptr long long) @ stdcall CM_Get_Device_IDW(ptr ptr long long) @ stdcall CM_Get_Device_ID_ExA(ptr ptr long long ptr) diff --git a/dlls/setupapi/stubs.c b/dlls/setupapi/stubs.c index ffc766b..6ecf240 100644 --- a/dlls/setupapi/stubs.c +++ b/dlls/setupapi/stubs.c @@ -419,6 +419,26 @@ CONFIGRET WINAPI CM_Get_DevNode_Registry_PropertyW(DEVINST dev, ULONG prop, PULO } /*********************************************************************** + * CM_Get_DevNode_Status (SETUPAPI.@) + */ +CONFIGRET WINAPI CM_Get_DevNode_Status(ULONG *status, ULONG *problem, DEVINST dev, + ULONG flags) +{ + FIXME("%p %p 0x%08x 0x%08x: stub\n", status, problem, dev, flags); + return CR_FAILURE; +} + +/*********************************************************************** + * CM_Get_DevNode_Status_Ex (SETUPAPI.@) + */ +CONFIGRET WINAPI CM_Get_DevNode_Status_Ex(ULONG *status, ULONG *problem, DEVINST dev, + ULONG flags, HMACHINE machine) +{ + FIXME("%p %p 0x%08x 0x%08x %p: stub\n", status, problem, dev, flags, machine); + return CR_FAILURE; +} + +/*********************************************************************** * CM_Enumerate_Classes (SETUPAPI.@) */ CONFIGRET WINAPI CM_Enumerate_Classes(ULONG index, LPGUID class, ULONG flags)

1 0

Nikolay Sivov : oledb32: IErrorInfo methods are stubs.
by Alexandre Julliard 03 Jun '16

03 Jun '16

Module: wine Branch: master Commit: f5f6cfb0f708c512adbc174607e0fd89b8fe503c URL: http://source.winehq.org/git/wine.git/?a=commit;h=f5f6cfb0f708c512adbc17460… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jun 3 09:55:36 2016 +0300 oledb32: IErrorInfo methods are stubs. There's no way to set error info for this object Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oledb32/errorinfo.c | 62 ++++++++----------- dlls/oledb32/tests/database.c | 134 +++++++++++++++++++++++++++--------------- 2 files changed, 110 insertions(+), 86 deletions(-) diff --git a/dlls/oledb32/errorinfo.c b/dlls/oledb32/errorinfo.c index 4a2a1e2..4a56b46 100644 --- a/dlls/oledb32/errorinfo.c +++ b/dlls/oledb32/errorinfo.c @@ -53,12 +53,6 @@ typedef struct ErrorInfoImpl IErrorRecords IErrorRecords_iface; LONG ref; - GUID m_Guid; - BSTR source; - BSTR description; - BSTR help_file; - DWORD help_context; - struct list errors; } ErrorInfoImpl; @@ -115,10 +109,6 @@ static ULONG WINAPI IErrorInfoImpl_Release(IErrorInfo* iface) if (!ref) { - SysFreeString(This->source); - SysFreeString(This->description); - SysFreeString(This->help_file); - LIST_FOR_EACH_ENTRY_SAFE(cursor, cursor2, &This->errors, struct ErrorEntry, entry) { list_remove(&cursor->entry); @@ -132,74 +122,74 @@ static ULONG WINAPI IErrorInfoImpl_Release(IErrorInfo* iface) return ref; } -static HRESULT WINAPI IErrorInfoImpl_GetGUID(IErrorInfo* iface, GUID * pGUID) +static HRESULT WINAPI IErrorInfoImpl_GetGUID(IErrorInfo* iface, GUID *guid) { ErrorInfoImpl *This = impl_from_IErrorInfo(iface); - TRACE("(%p)\n",This); + TRACE("(%p)->(%p)\n", This, guid); - if(!pGUID ) + if (!guid) return E_INVALIDARG; - *pGUID = This->m_Guid; + *guid = GUID_NULL; return S_OK; } -static HRESULT WINAPI IErrorInfoImpl_GetSource(IErrorInfo* iface, BSTR *pBstrSource) +static HRESULT WINAPI IErrorInfoImpl_GetSource(IErrorInfo* iface, BSTR *source) { ErrorInfoImpl *This = impl_from_IErrorInfo(iface); - TRACE("(%p)->(%p)\n",This, pBstrSource); + TRACE("(%p)->(%p)\n", This, source); - if (pBstrSource == NULL) + if (!source) return E_INVALIDARG; - *pBstrSource = SysAllocString(This->source); + *source = NULL; - return S_OK; + return E_FAIL; } -static HRESULT WINAPI IErrorInfoImpl_GetDescription(IErrorInfo* iface, BSTR *pBstrDescription) +static HRESULT WINAPI IErrorInfoImpl_GetDescription(IErrorInfo* iface, BSTR *description) { ErrorInfoImpl *This = impl_from_IErrorInfo(iface); - TRACE("(%p)->(%p)\n",This, pBstrDescription); + TRACE("(%p)->(%p)\n", This, description); - if (pBstrDescription == NULL) + if (!description) return E_INVALIDARG; - *pBstrDescription = SysAllocString(This->description); + *description = NULL; - return S_OK; + return E_FAIL; } -static HRESULT WINAPI IErrorInfoImpl_GetHelpFile(IErrorInfo* iface, BSTR *pBstrHelpFile) +static HRESULT WINAPI IErrorInfoImpl_GetHelpFile(IErrorInfo* iface, BSTR *helpfile) { ErrorInfoImpl *This = impl_from_IErrorInfo(iface); - TRACE("(%p)->(%p)\n",This, pBstrHelpFile); + TRACE("(%p)->(%p)\n", This, helpfile); - if (pBstrHelpFile == NULL) + if (!helpfile) return E_INVALIDARG; - *pBstrHelpFile = SysAllocString(This->help_file); + *helpfile = NULL; - return S_OK; + return E_FAIL; } -static HRESULT WINAPI IErrorInfoImpl_GetHelpContext(IErrorInfo* iface, DWORD *pdwHelpContext) +static HRESULT WINAPI IErrorInfoImpl_GetHelpContext(IErrorInfo* iface, DWORD *context) { ErrorInfoImpl *This = impl_from_IErrorInfo(iface); - TRACE("(%p)->(%p)\n",This, pdwHelpContext); + TRACE("(%p)->(%p)\n", This, context); - if (pdwHelpContext == NULL) + if (!context) return E_INVALIDARG; - *pdwHelpContext = This->help_context; + *context = 0; - return S_OK; + return E_FAIL; } static const IErrorInfoVtbl ErrorInfoVtbl = @@ -371,10 +361,6 @@ HRESULT create_error_info(IUnknown *outer, void **obj) This->IErrorInfo_iface.lpVtbl = &ErrorInfoVtbl; This->IErrorRecords_iface.lpVtbl = &ErrorRecordsVtbl; This->ref = 1; - This->source = NULL; - This->description = NULL; - This->help_file = NULL; - This->help_context = 0; list_init(&This->errors); diff --git a/dlls/oledb32/tests/database.c b/dlls/oledb32/tests/database.c index fdf4220..442e57e 100644 --- a/dlls/oledb32/tests/database.c +++ b/dlls/oledb32/tests/database.c @@ -312,71 +312,109 @@ static void test_database(void) static void test_errorinfo(void) { - HRESULT hr; + ICreateErrorInfo *createerror; + ERRORINFO info, info2, info3; + IErrorInfo *errorinfo; + IErrorRecords *errrecs; IUnknown *unk = NULL; + DWORD context; + ULONG cnt = 0; + HRESULT hr; + GUID guid; + BSTR str; - hr = CoCreateInstance(&CSLID_MSDAER, NULL, CLSCTX_INPROC_SERVER, &IID_IUnknown,(void**)&unk); + hr = CoCreateInstance(&CSLID_MSDAER, NULL, CLSCTX_INPROC_SERVER, &IID_IUnknown, (void**)&unk); ok(hr == S_OK, "got %08x\n", hr); - if(hr == S_OK) - { - IErrorInfo *errorinfo; - IErrorRecords *errrecs; - hr = IUnknown_QueryInterface(unk, &IID_IErrorInfo, (void**)&errorinfo); - ok(hr == S_OK, "got %08x\n", hr); - if(hr == S_OK) - { - IErrorInfo_Release(errorinfo); - } + hr = IUnknown_QueryInterface(unk, &IID_IErrorInfo, (void**)&errorinfo); + ok(hr == S_OK, "got %08x\n", hr); - hr = IUnknown_QueryInterface(unk, &IID_IErrorRecords, (void**)&errrecs); - ok(hr == S_OK, "got %08x\n", hr); - if(hr == S_OK) - { - ERRORINFO info, info2, info3; - ULONG cnt = 0; + hr = IErrorInfo_GetGUID(errorinfo, NULL); + ok(hr == E_INVALIDARG, "got %08x\n", hr); - memset(&info, 0, sizeof(ERRORINFO)); - info.dwMinor = 1; - memset(&info2, 0, sizeof(ERRORINFO)); - info2.dwMinor = 2; - memset(&info3, 0, sizeof(ERRORINFO)); + hr = IErrorInfo_GetSource(errorinfo, NULL); + ok(hr == E_INVALIDARG, "got %08x\n", hr); - hr = IErrorRecords_AddErrorRecord(errrecs, NULL, 268435456, NULL, NULL, 0); - ok(hr == E_INVALIDARG, "got %08x\n", hr); + hr = IErrorInfo_GetDescription(errorinfo, NULL); + ok(hr == E_INVALIDARG, "got %08x\n", hr); - hr = IErrorRecords_AddErrorRecord(errrecs, &info, 1, NULL, NULL, 0); - ok(hr == S_OK, "got %08x\n", hr); + hr = IErrorInfo_GetHelpFile(errorinfo, NULL); + ok(hr == E_INVALIDARG, "got %08x\n", hr); - hr = IErrorRecords_GetRecordCount(errrecs, &cnt); - ok(hr == S_OK, "got %08x\n", hr); - ok(cnt == 1, "expected 1 got %d\n", cnt); + hr = IErrorInfo_GetHelpContext(errorinfo, NULL); + ok(hr == E_INVALIDARG, "got %08x\n", hr); - hr = IErrorRecords_AddErrorRecord(errrecs, &info2, 2, NULL, NULL, 0); - ok(hr == S_OK, "got %08x\n", hr); + memset(&guid, 0xac, sizeof(guid)); + hr = IErrorInfo_GetGUID(errorinfo, &guid); + ok(hr == S_OK, "got %08x\n", hr); + ok(IsEqualGUID(&guid, &GUID_NULL), "got wrong guid\n"); - hr = IErrorRecords_GetRecordCount(errrecs, &cnt); - ok(hr == S_OK, "got %08x\n", hr); - ok(cnt == 2, "expected 2 got %d\n", cnt); + str = (BSTR)0x1; + hr = IErrorInfo_GetSource(errorinfo, &str); + ok(hr == E_FAIL, "got %08x\n", hr); + ok(str == NULL, "got %s\n", wine_dbgstr_w(str)); - hr = IErrorRecords_GetBasicErrorInfo(errrecs, 0, NULL); - ok(hr == E_INVALIDARG, "got %08x\n", hr); + str = (BSTR)0x1; + hr = IErrorInfo_GetDescription(errorinfo, &str); + ok(hr == E_FAIL, "got %08x\n", hr); + ok(str == NULL, "got %s\n", wine_dbgstr_w(str)); - hr = IErrorRecords_GetBasicErrorInfo(errrecs, 100, &info3); - ok(hr == DB_E_BADRECORDNUM, "got %08x\n", hr); + str = (BSTR)0x1; + hr = IErrorInfo_GetHelpFile(errorinfo, &str); + ok(hr == E_FAIL, "got %08x\n", hr); + ok(str == NULL, "got %s\n", wine_dbgstr_w(str)); - hr = IErrorRecords_GetBasicErrorInfo(errrecs, 0, &info3); - todo_wine ok(hr == S_OK, "got %08x\n", hr); - if(hr == S_OK) - { - ok(info3.dwMinor == 2, "expected 2 got %d\n", info3.dwMinor); - } + context = 1; + hr = IErrorInfo_GetHelpContext(errorinfo, &context); + ok(hr == E_FAIL, "got %08x\n", hr); + ok(context == 0, "got %d\n", context); - IErrorRecords_Release(errrecs); - } + IErrorInfo_Release(errorinfo); + + hr = IErrorInfo_QueryInterface(errorinfo, &IID_ICreateErrorInfo, (void**)&createerror); + ok(hr == E_NOINTERFACE, "got %08x\n", hr); + + hr = IUnknown_QueryInterface(unk, &IID_IErrorRecords, (void**)&errrecs); + ok(hr == S_OK, "got %08x\n", hr); + + memset(&info, 0, sizeof(ERRORINFO)); + info.dwMinor = 1; + memset(&info2, 0, sizeof(ERRORINFO)); + info2.dwMinor = 2; + memset(&info3, 0, sizeof(ERRORINFO)); + + hr = IErrorRecords_AddErrorRecord(errrecs, NULL, 268435456, NULL, NULL, 0); + ok(hr == E_INVALIDARG, "got %08x\n", hr); + + hr = IErrorRecords_AddErrorRecord(errrecs, &info, 1, NULL, NULL, 0); + ok(hr == S_OK, "got %08x\n", hr); + + hr = IErrorRecords_GetRecordCount(errrecs, &cnt); + ok(hr == S_OK, "got %08x\n", hr); + ok(cnt == 1, "expected 1 got %d\n", cnt); - IUnknown_Release(unk); + hr = IErrorRecords_AddErrorRecord(errrecs, &info2, 2, NULL, NULL, 0); + ok(hr == S_OK, "got %08x\n", hr); + + hr = IErrorRecords_GetRecordCount(errrecs, &cnt); + ok(hr == S_OK, "got %08x\n", hr); + ok(cnt == 2, "expected 2 got %d\n", cnt); + + hr = IErrorRecords_GetBasicErrorInfo(errrecs, 0, NULL); + ok(hr == E_INVALIDARG, "got %08x\n", hr); + + hr = IErrorRecords_GetBasicErrorInfo(errrecs, 100, &info3); + ok(hr == DB_E_BADRECORDNUM, "got %08x\n", hr); + + hr = IErrorRecords_GetBasicErrorInfo(errrecs, 0, &info3); + todo_wine ok(hr == S_OK, "got %08x\n", hr); + if(hr == S_OK) + { + ok(info3.dwMinor == 2, "expected 2 got %d\n", info3.dwMinor); } + + IErrorRecords_Release(errrecs); + IUnknown_Release(unk); } static void test_initializationstring(void)

1 0

Józef Kucia : wined3d: Allow creating render targets for some _UNORM/_SNORM formats.
by Alexandre Julliard 03 Jun '16

03 Jun '16

Module: wine Branch: master Commit: 2f7c3168881a9bfb187073fee26e5c3a8f648b5f URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f7c3168881a9bfb187073fee… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Jun 3 11:33:07 2016 +0200 wined3d: Allow creating render targets for some _UNORM/_SNORM formats. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10core/tests/device.c | 8 ++++++++ dlls/d3d11/tests/d3d11.c | 8 ++++++++ dlls/wined3d/utils.c | 9 +++++---- 3 files changed, 21 insertions(+), 4 deletions(-) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index 599c1a5..39febe5 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -713,6 +713,9 @@ static void test_create_texture2d(void) {DXGI_FORMAT_R32G8X24_TYPELESS, 1, D3D10_BIND_DEPTH_STENCIL, 0, TRUE, TRUE}, {DXGI_FORMAT_R10G10B10A2_TYPELESS, 1, D3D10_BIND_SHADER_RESOURCE, 0, TRUE, FALSE}, {DXGI_FORMAT_R10G10B10A2_TYPELESS, 1, D3D10_BIND_RENDER_TARGET, 0, TRUE, FALSE}, + {DXGI_FORMAT_R16G16_TYPELESS, 1, D3D10_BIND_SHADER_RESOURCE, 0, TRUE, FALSE}, + {DXGI_FORMAT_R16G16_UNORM, 1, D3D10_BIND_RENDER_TARGET, 0, TRUE, FALSE}, + {DXGI_FORMAT_R16G16_SNORM, 1, D3D10_BIND_RENDER_TARGET, 0, TRUE, FALSE}, {DXGI_FORMAT_R32_TYPELESS, 0, D3D10_BIND_SHADER_RESOURCE, 0, FALSE, FALSE}, {DXGI_FORMAT_R32_TYPELESS, 1, D3D10_BIND_SHADER_RESOURCE, 0, TRUE, FALSE}, {DXGI_FORMAT_R32_TYPELESS, 9, D3D10_BIND_SHADER_RESOURCE, 0, TRUE, FALSE}, @@ -724,10 +727,15 @@ static void test_create_texture2d(void) {DXGI_FORMAT_R24G8_TYPELESS, 1, D3D10_BIND_SHADER_RESOURCE, 0, TRUE, FALSE}, {DXGI_FORMAT_R24G8_TYPELESS, 1, D3D10_BIND_DEPTH_STENCIL, 0, TRUE, FALSE}, {DXGI_FORMAT_R8G8_TYPELESS, 1, D3D10_BIND_SHADER_RESOURCE, 0, TRUE, FALSE}, + {DXGI_FORMAT_R8G8_TYPELESS, 1, D3D10_BIND_RENDER_TARGET, 0, TRUE, FALSE}, + {DXGI_FORMAT_R8G8_UNORM, 1, D3D10_BIND_RENDER_TARGET, 0, TRUE, FALSE}, + {DXGI_FORMAT_R8G8_SNORM, 1, D3D10_BIND_RENDER_TARGET, 0, TRUE, FALSE}, {DXGI_FORMAT_R16_TYPELESS, 1, D3D10_BIND_SHADER_RESOURCE, 0, TRUE, FALSE}, {DXGI_FORMAT_R16_TYPELESS, 1, D3D10_BIND_DEPTH_STENCIL, 0, TRUE, TRUE}, {DXGI_FORMAT_R8_TYPELESS, 1, D3D10_BIND_SHADER_RESOURCE, 0, TRUE, FALSE}, + {DXGI_FORMAT_R8G8B8A8_UNORM, 1, D3D10_BIND_RENDER_TARGET, 0, TRUE, FALSE}, {DXGI_FORMAT_R8G8B8A8_UNORM, 1, D3D10_BIND_DEPTH_STENCIL, 0, FALSE, FALSE}, + {DXGI_FORMAT_R8G8B8A8_SNORM, 1, D3D10_BIND_RENDER_TARGET, 0, TRUE, FALSE}, {DXGI_FORMAT_D24_UNORM_S8_UINT, 1, D3D10_BIND_RENDER_TARGET, 0, FALSE, FALSE}, {DXGI_FORMAT_D32_FLOAT, 1, D3D10_BIND_RENDER_TARGET, 0, FALSE, FALSE}, }; diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 7191563..5cd9c03 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -1025,6 +1025,9 @@ static void test_create_texture2d(void) {DXGI_FORMAT_R32G8X24_TYPELESS, 1, D3D11_BIND_DEPTH_STENCIL, 0, TRUE, TRUE}, {DXGI_FORMAT_R10G10B10A2_TYPELESS, 1, D3D11_BIND_SHADER_RESOURCE, 0, TRUE, FALSE}, {DXGI_FORMAT_R10G10B10A2_TYPELESS, 1, D3D11_BIND_RENDER_TARGET, 0, TRUE, FALSE}, + {DXGI_FORMAT_R16G16_TYPELESS, 1, D3D11_BIND_SHADER_RESOURCE, 0, TRUE, FALSE}, + {DXGI_FORMAT_R16G16_UNORM, 1, D3D11_BIND_RENDER_TARGET, 0, TRUE, FALSE}, + {DXGI_FORMAT_R16G16_SNORM, 1, D3D11_BIND_RENDER_TARGET, 0, TRUE, FALSE}, {DXGI_FORMAT_R32_TYPELESS, 0, D3D11_BIND_SHADER_RESOURCE, 0, FALSE, FALSE}, {DXGI_FORMAT_R32_TYPELESS, 1, D3D11_BIND_SHADER_RESOURCE, 0, TRUE, FALSE}, {DXGI_FORMAT_R32_TYPELESS, 9, D3D11_BIND_SHADER_RESOURCE, 0, TRUE, FALSE}, @@ -1036,10 +1039,15 @@ static void test_create_texture2d(void) {DXGI_FORMAT_R24G8_TYPELESS, 1, D3D11_BIND_SHADER_RESOURCE, 0, TRUE, FALSE}, {DXGI_FORMAT_R24G8_TYPELESS, 1, D3D11_BIND_DEPTH_STENCIL, 0, TRUE, FALSE}, {DXGI_FORMAT_R8G8_TYPELESS, 1, D3D11_BIND_SHADER_RESOURCE, 0, TRUE, FALSE}, + {DXGI_FORMAT_R8G8_TYPELESS, 1, D3D11_BIND_RENDER_TARGET, 0, TRUE, FALSE}, + {DXGI_FORMAT_R8G8_UNORM, 1, D3D11_BIND_RENDER_TARGET, 0, TRUE, FALSE}, + {DXGI_FORMAT_R8G8_SNORM, 1, D3D11_BIND_RENDER_TARGET, 0, TRUE, FALSE}, {DXGI_FORMAT_R16_TYPELESS, 1, D3D11_BIND_SHADER_RESOURCE, 0, TRUE, FALSE}, {DXGI_FORMAT_R16_TYPELESS, 1, D3D11_BIND_DEPTH_STENCIL, 0, TRUE, TRUE}, {DXGI_FORMAT_R8_TYPELESS, 1, D3D11_BIND_SHADER_RESOURCE, 0, TRUE, FALSE}, + {DXGI_FORMAT_R8G8B8A8_UNORM, 1, D3D11_BIND_RENDER_TARGET, 0, TRUE, FALSE}, {DXGI_FORMAT_R8G8B8A8_UNORM, 1, D3D11_BIND_DEPTH_STENCIL, 0, FALSE, FALSE}, + {DXGI_FORMAT_R8G8B8A8_SNORM, 1, D3D11_BIND_RENDER_TARGET, 0, TRUE, FALSE}, {DXGI_FORMAT_D24_UNORM_S8_UINT, 1, D3D11_BIND_RENDER_TARGET, 0, FALSE, FALSE}, {DXGI_FORMAT_D32_FLOAT, 1, D3D11_BIND_RENDER_TARGET, 0, FALSE, FALSE}, }; diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index abe52dd..97c3e19 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -1261,7 +1261,8 @@ static const struct wined3d_format_texture_info format_texture_info[] = WINED3D_GL_EXT_NONE, NULL}, {WINED3DFMT_R8G8_UNORM, GL_RG8, GL_RG8, 0, GL_RG, GL_UNSIGNED_BYTE, 0, - WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING, + WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING + | WINED3DFMT_FLAG_RENDERTARGET, ARB_TEXTURE_RG, NULL}, {WINED3DFMT_R16_UNORM, GL_R16, GL_R16, 0, GL_RED, GL_UNSIGNED_SHORT, 0, @@ -1322,7 +1323,7 @@ static const struct wined3d_format_texture_info format_texture_info[] = {WINED3DFMT_R8G8_SNORM, GL_RG8_SNORM, GL_RG8_SNORM, 0, GL_RG, GL_BYTE, 0, WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING - | WINED3DFMT_FLAG_BUMPMAP, + | WINED3DFMT_FLAG_RENDERTARGET | WINED3DFMT_FLAG_BUMPMAP, EXT_TEXTURE_SNORM, NULL}, {WINED3DFMT_R5G5_SNORM_L6_UNORM, GL_RGB5, GL_RGB5, 0, GL_RGB, GL_UNSIGNED_SHORT_5_6_5, 2, @@ -1362,7 +1363,7 @@ static const struct wined3d_format_texture_info format_texture_info[] = {WINED3DFMT_R8G8B8A8_SNORM, GL_RGBA8_SNORM, GL_RGBA8_SNORM, 0, GL_RGBA, GL_BYTE, 0, WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING - | WINED3DFMT_FLAG_BUMPMAP, + | WINED3DFMT_FLAG_RENDERTARGET | WINED3DFMT_FLAG_BUMPMAP, EXT_TEXTURE_SNORM, NULL}, {WINED3DFMT_R16G16_SNORM, GL_RGB16, GL_RGB16, 0, GL_BGR, GL_UNSIGNED_SHORT, 6, @@ -1377,7 +1378,7 @@ static const struct wined3d_format_texture_info format_texture_info[] = {WINED3DFMT_R16G16_SNORM, GL_RG16_SNORM, GL_RG16_SNORM, 0, GL_RG, GL_SHORT, 0, WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING - | WINED3DFMT_FLAG_BUMPMAP, + | WINED3DFMT_FLAG_RENDERTARGET | WINED3DFMT_FLAG_BUMPMAP, EXT_TEXTURE_SNORM, NULL}, /* Depth stencil formats */ {WINED3DFMT_D16_LOCKABLE, GL_DEPTH_COMPONENT, GL_DEPTH_COMPONENT, 0,

1 0

Józef Kucia : wined3d: Implement SM4 endswitch instruction.
by Alexandre Julliard 03 Jun '16

03 Jun '16

Module: wine Branch: master Commit: 7cc36e71b2c04fafc175d6fa1eb65a8c404fb279 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7cc36e71b2c04fafc175d6fa1… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Jun 3 11:33:06 2016 +0200 wined3d: Implement SM4 endswitch instruction. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/arb_program_shader.c | 1 + dlls/wined3d/glsl_shader.c | 1 + dlls/wined3d/shader.c | 1 + dlls/wined3d/shader_sm4.c | 2 ++ dlls/wined3d/wined3d_private.h | 1 + 5 files changed, 6 insertions(+) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index c85c917..2c510b7 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -5269,6 +5269,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL /* WINED3DSIH_ENDIF */ shader_hw_endif, /* WINED3DSIH_ENDLOOP */ shader_hw_endloop, /* WINED3DSIH_ENDREP */ shader_hw_endrep, + /* WINED3DSIH_ENDSWITCH */ NULL, /* WINED3DSIH_EQ */ NULL, /* WINED3DSIH_EXP */ shader_hw_scalar_op, /* WINED3DSIH_EXPP */ shader_hw_scalar_op, diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 97f7fa8..92849db 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -8603,6 +8603,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_ENDIF */ shader_glsl_end, /* WINED3DSIH_ENDLOOP */ shader_glsl_end, /* WINED3DSIH_ENDREP */ shader_glsl_end, + /* WINED3DSIH_ENDSWITCH */ shader_glsl_end, /* WINED3DSIH_EQ */ shader_glsl_relop, /* WINED3DSIH_EXP */ shader_glsl_scalar_op, /* WINED3DSIH_EXPP */ shader_glsl_expp, diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 27242ae..bd8d55d 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -101,6 +101,7 @@ static const char * const shader_opcode_names[] = /* WINED3DSIH_ENDIF */ "endif", /* WINED3DSIH_ENDLOOP */ "endloop", /* WINED3DSIH_ENDREP */ "endrep", + /* WINED3DSIH_ENDSWITCH */ "endswitch", /* WINED3DSIH_EQ */ "eq", /* WINED3DSIH_EXP */ "exp", /* WINED3DSIH_EXPP */ "expp", diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index 809f39c..ef5fcd2 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -125,6 +125,7 @@ enum wined3d_sm4_opcode WINED3D_SM4_OP_EMIT = 0x13, WINED3D_SM4_OP_ENDIF = 0x15, WINED3D_SM4_OP_ENDLOOP = 0x16, + WINED3D_SM4_OP_ENDSWITCH = 0x17, WINED3D_SM4_OP_EQ = 0x18, WINED3D_SM4_OP_EXP = 0x19, WINED3D_SM4_OP_FRC = 0x1a, @@ -639,6 +640,7 @@ static const struct wined3d_sm4_opcode_info opcode_table[] = {WINED3D_SM4_OP_EMIT, WINED3DSIH_EMIT, "", ""}, {WINED3D_SM4_OP_ENDIF, WINED3DSIH_ENDIF, "", ""}, {WINED3D_SM4_OP_ENDLOOP, WINED3DSIH_ENDLOOP, "", ""}, + {WINED3D_SM4_OP_ENDSWITCH, WINED3DSIH_ENDSWITCH, "", ""}, {WINED3D_SM4_OP_EQ, WINED3DSIH_EQ, "u", "ff"}, {WINED3D_SM4_OP_EXP, WINED3DSIH_EXP, "f", "f"}, {WINED3D_SM4_OP_FRC, WINED3DSIH_FRC, "f", "f"}, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 50548a1..f9a8ffa 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -608,6 +608,7 @@ enum WINED3D_SHADER_INSTRUCTION_HANDLER WINED3DSIH_ENDIF, WINED3DSIH_ENDLOOP, WINED3DSIH_ENDREP, + WINED3DSIH_ENDSWITCH, WINED3DSIH_EQ, WINED3DSIH_EXP, WINED3DSIH_EXPP,

1 0

Józef Kucia : wined3d: Implement SM4 default instruction.
by Alexandre Julliard 03 Jun '16

03 Jun '16

Module: wine Branch: master Commit: 9aa587af9e2a3d64a1a37f97ace20ca4f878f2a8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9aa587af9e2a3d64a1a37f97a… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Jun 3 11:33:05 2016 +0200 wined3d: Implement SM4 default instruction. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/arb_program_shader.c | 1 + dlls/wined3d/glsl_shader.c | 6 ++++++ dlls/wined3d/shader.c | 1 + dlls/wined3d/shader_sm4.c | 2 ++ dlls/wined3d/wined3d_private.h | 1 + 5 files changed, 11 insertions(+) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 7ecf193..c85c917 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -5249,6 +5249,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL /* WINED3DSIH_DCL_UAV_TYPED */ NULL, /* WINED3DSIH_DCL_VERTICES_OUT */ shader_hw_nop, /* WINED3DSIH_DEF */ shader_hw_nop, + /* WINED3DSIH_DEFAULT */ NULL, /* WINED3DSIH_DEFB */ shader_hw_nop, /* WINED3DSIH_DEFI */ shader_hw_nop, /* WINED3DSIH_DIV */ NULL, diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index cfd0cfd..97f7fa8 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -4244,6 +4244,11 @@ static void shader_glsl_case(const struct wined3d_shader_instruction *ins) shader_addline(ins->ctx->buffer, "case %s:\n", src0_param.param_str); } +static void shader_glsl_default(const struct wined3d_shader_instruction *ins) +{ + shader_addline(ins->ctx->buffer, "default:\n"); +} + static void shader_glsl_if(const struct wined3d_shader_instruction *ins) { const char *condition = (ins->flags == WINED3D_SHADER_CONDITIONAL_OP_NZ) ? "bool" : "!bool"; @@ -8578,6 +8583,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_DCL_UAV_TYPED */ NULL, /* WINED3DSIH_DCL_VERTICES_OUT */ shader_glsl_nop, /* WINED3DSIH_DEF */ shader_glsl_nop, + /* WINED3DSIH_DEFAULT */ shader_glsl_default, /* WINED3DSIH_DEFB */ shader_glsl_nop, /* WINED3DSIH_DEFI */ shader_glsl_nop, /* WINED3DSIH_DIV */ shader_glsl_binop, diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index bf67dbe..27242ae 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -81,6 +81,7 @@ static const char * const shader_opcode_names[] = /* WINED3DSIH_DCL_UAV_TYPED */ "dcl_uav_typed", /* WINED3DSIH_DCL_VERTICES_OUT */ "dcl_maxOutputVertexCount", /* WINED3DSIH_DEF */ "def", + /* WINED3DSIH_DEFAULT */ "default", /* WINED3DSIH_DEFB */ "defb", /* WINED3DSIH_DEFI */ "defi", /* WINED3DSIH_DIV */ "div", diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index 247f9b0..809f39c 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -113,6 +113,7 @@ enum wined3d_sm4_opcode WINED3D_SM4_OP_BREAKC = 0x03, WINED3D_SM4_OP_CASE = 0x06, WINED3D_SM4_OP_CUT = 0x09, + WINED3D_SM4_OP_DEFAULT = 0x0a, WINED3D_SM4_OP_DERIV_RTX = 0x0b, WINED3D_SM4_OP_DERIV_RTY = 0x0c, WINED3D_SM4_OP_DISCARD = 0x0d, @@ -626,6 +627,7 @@ static const struct wined3d_sm4_opcode_info opcode_table[] = shader_sm4_read_conditional_op}, {WINED3D_SM4_OP_CASE, WINED3DSIH_CASE, "", "u"}, {WINED3D_SM4_OP_CUT, WINED3DSIH_CUT, "", ""}, + {WINED3D_SM4_OP_DEFAULT, WINED3DSIH_DEFAULT, "", ""}, {WINED3D_SM4_OP_DERIV_RTX, WINED3DSIH_DSX, "f", "f"}, {WINED3D_SM4_OP_DERIV_RTY, WINED3DSIH_DSY, "f", "f"}, {WINED3D_SM4_OP_DISCARD, WINED3DSIH_TEXKILL, "", "u"}, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index e9d5a58..50548a1 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -588,6 +588,7 @@ enum WINED3D_SHADER_INSTRUCTION_HANDLER WINED3DSIH_DCL_UAV_TYPED, WINED3DSIH_DCL_VERTICES_OUT, WINED3DSIH_DEF, + WINED3DSIH_DEFAULT, WINED3DSIH_DEFB, WINED3DSIH_DEFI, WINED3DSIH_DIV,

1 0

Józef Kucia : wined3d: Implement SM4 case instruction.
by Alexandre Julliard 03 Jun '16

03 Jun '16

Module: wine Branch: master Commit: 7929895029e994595535df705cb28335fa46732e URL: http://source.winehq.org/git/wine.git/?a=commit;h=7929895029e994595535df705… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Jun 3 11:33:04 2016 +0200 wined3d: Implement SM4 case instruction. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/arb_program_shader.c | 1 + dlls/wined3d/glsl_shader.c | 9 +++++++++ dlls/wined3d/shader.c | 1 + dlls/wined3d/shader_sm4.c | 2 ++ dlls/wined3d/wined3d_private.h | 1 + 5 files changed, 14 insertions(+) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 53b8f2c..7ecf193 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -5217,6 +5217,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL /* WINED3DSIH_BREAKP */ NULL, /* WINED3DSIH_CALL */ shader_hw_call, /* WINED3DSIH_CALLNZ */ NULL, + /* WINED3DSIH_CASE */ NULL, /* WINED3DSIH_CMP */ pshader_hw_cmp, /* WINED3DSIH_CND */ pshader_hw_cnd, /* WINED3DSIH_CRS */ shader_hw_map2gl, diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 69ff2bc..cfd0cfd 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -4236,6 +4236,14 @@ static void shader_glsl_switch(const struct wined3d_shader_instruction *ins) shader_addline(ins->ctx->buffer, "switch (%s)\n{\n", src0_param.param_str); } +static void shader_glsl_case(const struct wined3d_shader_instruction *ins) +{ + struct glsl_src_param src0_param; + + shader_glsl_add_src_param(ins, &ins->src[0], WINED3DSP_WRITEMASK_0, &src0_param); + shader_addline(ins->ctx->buffer, "case %s:\n", src0_param.param_str); +} + static void shader_glsl_if(const struct wined3d_shader_instruction *ins) { const char *condition = (ins->flags == WINED3D_SHADER_CONDITIONAL_OP_NZ) ? "bool" : "!bool"; @@ -8538,6 +8546,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_BREAKP */ shader_glsl_breakp, /* WINED3DSIH_CALL */ shader_glsl_call, /* WINED3DSIH_CALLNZ */ shader_glsl_callnz, + /* WINED3DSIH_CASE */ shader_glsl_case, /* WINED3DSIH_CMP */ shader_glsl_conditional_move, /* WINED3DSIH_CND */ shader_glsl_cnd, /* WINED3DSIH_CRS */ shader_glsl_cross, diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index be12432..bf67dbe 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -49,6 +49,7 @@ static const char * const shader_opcode_names[] = /* WINED3DSIH_BREAKP */ "breakp", /* WINED3DSIH_CALL */ "call", /* WINED3DSIH_CALLNZ */ "callnz", + /* WINED3DSIH_CASE */ "case", /* WINED3DSIH_CMP */ "cmp", /* WINED3DSIH_CND */ "cnd", /* WINED3DSIH_CRS */ "crs", diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index ab39bf8..247f9b0 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -111,6 +111,7 @@ enum wined3d_sm4_opcode WINED3D_SM4_OP_AND = 0x01, WINED3D_SM4_OP_BREAK = 0x02, WINED3D_SM4_OP_BREAKC = 0x03, + WINED3D_SM4_OP_CASE = 0x06, WINED3D_SM4_OP_CUT = 0x09, WINED3D_SM4_OP_DERIV_RTX = 0x0b, WINED3D_SM4_OP_DERIV_RTY = 0x0c, @@ -623,6 +624,7 @@ static const struct wined3d_sm4_opcode_info opcode_table[] = {WINED3D_SM4_OP_BREAK, WINED3DSIH_BREAK, "", ""}, {WINED3D_SM4_OP_BREAKC, WINED3DSIH_BREAKP, "", "u", shader_sm4_read_conditional_op}, + {WINED3D_SM4_OP_CASE, WINED3DSIH_CASE, "", "u"}, {WINED3D_SM4_OP_CUT, WINED3DSIH_CUT, "", ""}, {WINED3D_SM4_OP_DERIV_RTX, WINED3DSIH_DSX, "f", "f"}, {WINED3D_SM4_OP_DERIV_RTY, WINED3DSIH_DSY, "f", "f"}, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 255dbd5..e9d5a58 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -556,6 +556,7 @@ enum WINED3D_SHADER_INSTRUCTION_HANDLER WINED3DSIH_BREAKP, WINED3DSIH_CALL, WINED3DSIH_CALLNZ, + WINED3DSIH_CASE, WINED3DSIH_CMP, WINED3DSIH_CND, WINED3DSIH_CRS,

1 0

← Newer
1
...
51
52
53
54
55
56
57
...
60
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 June 2016