August 2012 - Wine-commits - list.winehq.org

Lauri Kenttä : po: Update Finnish translation.
by Alexandre Julliard 27 Aug '12

27 Aug '12

Module: wine Branch: master Commit: 2ad570a1fb769b241db53b0e03ab9e9ad1d9973b URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ad570a1fb769b241db53b0e0… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Sat Aug 25 21:29:18 2012 +0300 po: Update Finnish translation. --- po/fi.po | 17 +++++++++-------- 1 files changed, 9 insertions(+), 8 deletions(-) diff --git a/po/fi.po b/po/fi.po index dfc9e7d..30dee50 100644 --- a/po/fi.po +++ b/po/fi.po @@ -3442,6 +3442,8 @@ msgid "" "After disabling or enabling a device, the connected joysticks won't be " "updated here until you restart this applet." msgstr "" +"Kun laite poistetaan käytöstä tai otetaan käyttöön, liitetyt ohjaimet eivät " +"päivity tähän, ellei tätä sovelmaa käynnistetä uudelleen." #: joy.rc:47 msgid "Test Joystick" @@ -9664,11 +9666,11 @@ msgstr "" "/min Käynnistä ohjelma pienennettynä.\n" "/max Käynnistä ohjelma suurennettuna.\n" "/low Käynnistä ohjelma matalassa prioriteettiluokassa.\n" -"/normal Käynnistä ohjelma normaalissa prioriteetiluokassa.\n" -"/high Käynnistä ohjelma korkeassa prioriteetiluokassa.\n" -"/realtime Käynnistä ohjelma reaaliaikaisessa prioriteetiluokassa.\n" -"/abovenormal Käynnistä ohjelma normaalia korkeammassa prioriteetiluokassa.\n" -"/belownormal Käynnistä ohjelma normaalia matalammassa prioriteetiluokassa.\n" +"/normal Käynnistä ohjelma normaalissa prioriteettiluokassa.\n" +"/high Käynnistä ohjelma korkeassa prioriteettiluokassa.\n" +"/realtime Käynnistä ohjelma reaaliaikaisessa prioriteettiluokassa.\n" +"/abovenormal Käynnistä ohjelma normaalia korkeammassa prioriteettiluokassa.\n" +"/belownormal Käynnistä ohjelma normaalia matalammassa prioriteettiluokassa.\n" "/node n Käynnistä ohjelma määrätyllä NUMA-solmulla.\n" "/affinity peite Käynnistä ohjelma määrätyllä affiniteettipeitteellä.\n" "/wait Odota, että ohjelma sulkeutuu, ja palauta sen paluuarvo.\n" @@ -14136,7 +14138,6 @@ msgstr "" "[/M] Kopioi vain tiedostot, joilla on arkistointiattribuutti, ja\n" "\tpoista arkistointiattribuutti.\n" "[/D | /D:k-p-v] Kopioi uudet tiedostot tai ne, joita on muokattu annetun\n" -"\t\tpäivän jälkeen. Jos päivää ei anneta, kopioi vain, jos kohde on " -"vanhempi\n" -"\t\tkuin lähde.\n" +"\t\tpäivän jälkeen. Jos päivää ei anneta, kopioi vain, jos\n" +"\t\tkohde on vanhempi kuin lähde.\n" "\n"

1 0

Lauri Kenttä : joy.cpl: Make Enable/ Disable buttons wider for translations.
by Alexandre Julliard 27 Aug '12

27 Aug '12

Module: wine Branch: master Commit: bc62a82f85cd865d831ef2c7ff713a12283916ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc62a82f85cd865d831ef2c7f… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Sat Aug 25 21:29:19 2012 +0300 joy.cpl: Make Enable/Disable buttons wider for translations. --- dlls/joy.cpl/joy.rc | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/joy.cpl/joy.rc b/dlls/joy.cpl/joy.rc index c4a551d..5be4a8c 100644 --- a/dlls/joy.cpl/joy.rc +++ b/dlls/joy.cpl/joy.rc @@ -33,8 +33,8 @@ STYLE WS_CAPTION | WS_CHILD | WS_DISABLED CAPTION "Joysticks" FONT 8, "Ms Shell Dlg" { - PUSHBUTTON "&Disable", IDC_BUTTONDISABLE, 200, 20, 50, 15 - PUSHBUTTON "&Enable", IDC_BUTTONENABLE, 200, 105, 50, 15 + PUSHBUTTON "&Disable", IDC_BUTTONDISABLE, 200, 20, 60, 15 + PUSHBUTTON "&Enable", IDC_BUTTONENABLE, 200, 105, 60, 15 LTEXT "Connected", IDC_STATIC, 10, 10, 100, 10 LISTBOX IDC_JOYSTICKLIST, 10, 20, 180, 70, WS_TABSTOP | WS_VSCROLL | LBS_NOTIFY LTEXT "Disabled", IDC_STATIC, 10, 95, 100, 10

1 0

Dmitry Timoshkov : gdiplus: Correct signature/mask info for the GIF codec.
by Alexandre Julliard 27 Aug '12

27 Aug '12

Module: wine Branch: master Commit: ac8019df3dd972d0411c28a3ca3ad169522ba8b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac8019df3dd972d0411c28a3c… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Aug 27 12:04:31 2012 +0900 gdiplus: Correct signature/mask info for the GIF codec. --- dlls/gdiplus/image.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index f40713b..c3a542b 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -3759,8 +3759,8 @@ static const WCHAR gif_codecname[] = {'B', 'u', 'i','l', 't', '-','i', 'n', ' ', static const WCHAR gif_extension[] = {'*','.','G','I','F',0}; static const WCHAR gif_mimetype[] = {'i','m','a','g','e','/','g','i','f', 0}; static const WCHAR gif_format[] = {'G','I','F',0}; -static const BYTE gif_sig_pattern[4] = "GIF8"; -static const BYTE gif_sig_mask[] = { 0xFF, 0xFF, 0xFF, 0xFF }; +static const BYTE gif_sig_pattern[12] = "GIF87aGIF89a"; +static const BYTE gif_sig_mask[] = { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF }; static const WCHAR tiff_codecname[] = {'B', 'u', 'i','l', 't', '-','i', 'n', ' ', 'T','I','F','F', 0}; static const WCHAR tiff_extension[] = {'*','.','T','I','F','F',';','*','.','T','I','F',0}; @@ -3847,8 +3847,8 @@ static const struct image_codec codecs[NUM_CODECS] = { /* MimeType */ gif_mimetype, /* Flags */ ImageCodecFlagsDecoder | ImageCodecFlagsSupportBitmap | ImageCodecFlagsBuiltin, /* Version */ 1, - /* SigCount */ 1, - /* SigSize */ 4, + /* SigCount */ 2, + /* SigSize */ 6, /* SigPattern */ gif_sig_pattern, /* SigMask */ gif_sig_mask, },

1 0

Gerald Pfeifer : dinput: Fix incorrect check in device_disabled_registry.
by Alexandre Julliard 27 Aug '12

27 Aug '12

Module: wine Branch: master Commit: 74329496932dbec9ba162522c26f1b67e08bae69 URL: http://source.winehq.org/git/wine.git/?a=commit;h=74329496932dbec9ba162522c… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sat Aug 25 02:18:14 2012 +0200 dinput: Fix incorrect check in device_disabled_registry. --- dlls/dinput/joystick.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/dinput/joystick.c b/dlls/dinput/joystick.c index 0f7ba19..8c0b5e5 100644 --- a/dlls/dinput/joystick.c +++ b/dlls/dinput/joystick.c @@ -51,8 +51,8 @@ static inline IDirectInputDevice8W *IDirectInputDevice8W_from_impl(JoystickGener BOOL device_disabled_registry(const char* name) { - static const char *disabled_str = "disabled"; - static const char *joystick_key = "Joysticks"; + static const char disabled_str[] = "disabled"; + static const char joystick_key[] = "Joysticks"; char buffer[MAX_PATH]; HKEY hkey, appkey, temp; BOOL do_disable = FALSE; @@ -75,7 +75,7 @@ BOOL device_disabled_registry(const char* name) /* Look for the "controllername"="disabled" key */ if (!get_config_key(hkey, appkey, name, buffer, sizeof(buffer))) - if (!strncmp(disabled_str, buffer, sizeof(disabled_str))) + if (!strcmp(disabled_str, buffer)) { TRACE("Disabling joystick '%s' based on registry key.\n", name); do_disable = TRUE;

1 0

Nikolay Sivov : wmi: Implement StartMode property for service class.
by Alexandre Julliard 27 Aug '12

27 Aug '12

Module: wine Branch: master Commit: 773cf1e5995a7598cb43495b1358268284193620 URL: http://source.winehq.org/git/wine.git/?a=commit;h=773cf1e5995a7598cb43495b1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Aug 26 21:29:29 2012 +0400 wmi: Implement StartMode property for service class. --- dlls/wbemprox/builtin.c | 45 +++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 45 insertions(+), 0 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index ce18b92..f20a279 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -143,6 +143,8 @@ static const WCHAR prop_serialnumberW[] = {'S','e','r','i','a','l','N','u','m','b','e','r',0}; static const WCHAR prop_servicetypeW[] = {'S','e','r','v','i','c','e','T','y','p','e',0}; +static const WCHAR prop_startmodeW[] = + {'S','t','a','r','t','M','o','d','e',0}; static const WCHAR prop_sizeW[] = {'S','i','z','e',0}; static const WCHAR prop_speedW[] = @@ -259,6 +261,7 @@ static const struct column col_service[] = { prop_nameW, CIM_STRING|COL_FLAG_DYNAMIC|COL_FLAG_KEY }, { prop_processidW, CIM_UINT32 }, { prop_servicetypeW, CIM_STRING }, + { prop_startmodeW, CIM_STRING }, { prop_stateW, CIM_STRING } }; static const struct column col_stdregprov[] = @@ -395,6 +398,7 @@ struct record_service const WCHAR *name; UINT32 process_id; const WCHAR *servicetype; + const WCHAR *startmode; const WCHAR *state; }; struct record_stdregprov @@ -836,6 +840,28 @@ static const WCHAR *get_service_state( DWORD state ) } } +static const WCHAR *get_service_startmode( DWORD mode ) +{ + static const WCHAR bootW[] = {'B','o','o','t',0}; + static const WCHAR systemW[] = {'S','y','s','t','e','m',0}; + static const WCHAR autoW[] = {'A','u','t','o',0}; + static const WCHAR manualW[] = {'M','a','n','u','a','l',0}; + static const WCHAR disabledW[] = {'D','i','s','a','b','l','e','d',0}; + static const WCHAR unknownW[] = {'U','n','k','n','o','w','n',0}; + + switch (mode) + { + case SERVICE_BOOT_START: return bootW; + case SERVICE_SYSTEM_START: return systemW; + case SERVICE_AUTO_START: return autoW; + case SERVICE_DEMAND_START: return manualW; + case SERVICE_DISABLED: return disabledW; + default: + ERR("unknown mode 0x%x\n", mode); + return unknownW; + } +} + static void fill_service( struct table *table ) { struct record_service *rec; @@ -866,6 +892,24 @@ static void fill_service( struct table *table ) for (i = 0; i < count; i++) { + QUERY_SERVICE_CONFIGW *config; + SC_HANDLE service; + DWORD startmode; + DWORD size; + + service = OpenServiceW(manager, services[i].lpServiceName, GENERIC_READ); + QueryServiceConfigW(service, NULL, 0, &size); + config = heap_alloc(size); + if (QueryServiceConfigW(service, config, size, &size)) + startmode = config->dwStartType; + else + { + ERR("failed to get %s service config data\n", debugstr_w(services[i].lpServiceName)); + startmode = SERVICE_DISABLED; + } + CloseServiceHandle(service); + heap_free(config); + status = &services[i].ServiceStatusProcess; rec = (struct record_service *)(table->data + offset); rec->accept_pause = (status->dwControlsAccepted & SERVICE_ACCEPT_PAUSE_CONTINUE) ? -1 : 0; @@ -874,6 +918,7 @@ static void fill_service( struct table *table ) rec->name = heap_strdupW( services[i].lpServiceName ); rec->process_id = status->dwProcessId; rec->servicetype = get_service_type( status->dwServiceType ); + rec->startmode = get_service_startmode( startmode ); rec->state = get_service_state( status->dwCurrentState ); offset += sizeof(*rec); num_rows++;

1 0

Nikolay Sivov : wmi: Implement SystemName property for service class.
by Alexandre Julliard 27 Aug '12

27 Aug '12

Module: wine Branch: master Commit: 240d1e4f18746c5b839c7e5c833bbcc039a83a52 URL: http://source.winehq.org/git/wine.git/?a=commit;h=240d1e4f18746c5b839c7e5c8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Aug 27 08:29:21 2012 +0400 wmi: Implement SystemName property for service class. --- dlls/wbemprox/builtin.c | 11 ++++++++++- 1 files changed, 10 insertions(+), 1 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index f20a279..8f2335b 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -153,6 +153,8 @@ static const WCHAR prop_stateW[] = {'S','t','a','t','e',0}; static const WCHAR prop_systemdirectoryW[] = {'S','y','s','t','e','m','D','i','r','e','c','t','o','r','y',0}; +static const WCHAR prop_systemnameW[] = + {'S','y','s','t','e','m','N','a','m','e',0}; static const WCHAR prop_tagW[] = {'T','a','g',0}; static const WCHAR prop_threadcountW[] = @@ -262,7 +264,8 @@ static const struct column col_service[] = { prop_processidW, CIM_UINT32 }, { prop_servicetypeW, CIM_STRING }, { prop_startmodeW, CIM_STRING }, - { prop_stateW, CIM_STRING } + { prop_stateW, CIM_STRING }, + { prop_systemnameW, CIM_STRING|COL_FLAG_DYNAMIC } }; static const struct column col_stdregprov[] = { @@ -400,6 +403,7 @@ struct record_service const WCHAR *servicetype; const WCHAR *startmode; const WCHAR *state; + const WCHAR *systemname; }; struct record_stdregprov { @@ -868,6 +872,8 @@ static void fill_service( struct table *table ) SC_HANDLE manager; ENUM_SERVICE_STATUS_PROCESSW *tmp, *services = NULL; SERVICE_STATUS_PROCESS *status; + WCHAR sysnameW[MAX_COMPUTERNAME_LENGTH + 1]; + DWORD len = sizeof(sysnameW) / sizeof(sysnameW[0]); UINT i, num_rows = 0, offset = 0, size = 256, needed, count; BOOL ret; @@ -890,6 +896,8 @@ static void fill_service( struct table *table ) } if (!(table->data = heap_alloc( sizeof(*rec) * count ))) goto done; + GetComputerNameW( sysnameW, &len ); + for (i = 0; i < count; i++) { QUERY_SERVICE_CONFIGW *config; @@ -920,6 +928,7 @@ static void fill_service( struct table *table ) rec->servicetype = get_service_type( status->dwServiceType ); rec->startmode = get_service_startmode( startmode ); rec->state = get_service_state( status->dwCurrentState ); + rec->systemname = heap_strdupW( sysnameW ); offset += sizeof(*rec); num_rows++; }

1 0

Nikolay Sivov : msxml3: Implement xmldecl-version property for a reader.
by Alexandre Julliard 27 Aug '12

27 Aug '12

Module: wine Branch: master Commit: 2a8552a925566e4f3c4062a5b6829ddb2bd4097c URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a8552a925566e4f3c4062a5b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Aug 27 09:39:43 2012 +0400 msxml3: Implement xmldecl-version property for a reader. --- dlls/msxml3/saxreader.c | 20 ++++++++++++++++ dlls/msxml3/tests/saxreader.c | 49 +++++++++++++++++++++++++++++++++++++++- 2 files changed, 67 insertions(+), 2 deletions(-) diff --git a/dlls/msxml3/saxreader.c b/dlls/msxml3/saxreader.c index d10b822..9ebdc0f 100644 --- a/dlls/msxml3/saxreader.c +++ b/dlls/msxml3/saxreader.c @@ -209,6 +209,7 @@ typedef struct BOOL isParsing; struct bstrpool pool; saxreader_feature features; + BSTR xmldecl_version; MSXML_VERSION version; } saxreader; @@ -334,6 +335,9 @@ static inline int saxreader_has_handler(const saxlocator *locator, enum saxhandl static const WCHAR PropertyCharsetW[] = { 'c','h','a','r','s','e','t',0 }; +static const WCHAR PropertyXmlDeclVersionW[] = { + 'x','m','l','d','e','c','l','-','v','e','r','s','i','o','n',0 +}; static const WCHAR PropertyDeclHandlerW[] = { 'h','t','t','p',':','/','/','x','m','l','.','o','r','g','/', 's','a','x','/','p','r','o','p','e','r','t','i','e','s','/', @@ -1311,6 +1315,13 @@ static void libxmlStartDocument(void *ctx) This->column++; } + /* store version value, declaration has to contain version attribute */ + if (This->pParserCtxt->standalone != -1) + { + SysFreeString(This->saxreader->xmldecl_version); + This->saxreader->xmldecl_version = bstr_from_xmlChar(This->pParserCtxt->version); + } + if (saxreader_has_handler(This, SAXContentHandler)) { if(This->vbInterface) @@ -2654,6 +2665,13 @@ static HRESULT internal_getProperty(const saxreader* This, const WCHAR *prop, VA return S_OK; } + if (!memcmp(PropertyXmlDeclVersionW, prop, sizeof(PropertyXmlDeclVersionW))) + { + V_VT(value) = VT_BSTR; + V_BSTR(value) = SysAllocString(This->xmldecl_version); + return S_OK; + } + FIXME("(%p)->(%s) unsupported property\n", This, debugstr_w(prop)); return E_NOTIMPL; @@ -2725,6 +2743,7 @@ static ULONG WINAPI saxxmlreader_Release( IUnknown_Release(iface->vbhandler); } + SysFreeString(This->xmldecl_version); free_bstr_pool(&This->pool); release_dispex(&This->dispex); @@ -3214,6 +3233,7 @@ HRESULT SAXXMLReader_create(MSXML_VERSION version, IUnknown *outer, LPVOID *ppOb reader->ref = 1; memset(reader->saxhandlers, 0, sizeof(reader->saxhandlers)); reader->isParsing = FALSE; + reader->xmldecl_version = NULL; reader->pool.pool = NULL; reader->pool.index = 0; reader->pool.len = 0; diff --git a/dlls/msxml3/tests/saxreader.c b/dlls/msxml3/tests/saxreader.c index 9216f3a..bcf7529 100644 --- a/dlls/msxml3/tests/saxreader.c +++ b/dlls/msxml3/tests/saxreader.c @@ -557,7 +557,7 @@ static const CHAR szUtf8XML[] = static const char utf8xml2[] = "<?xml version=\"1.0\" encoding=\"utf-8\" standalone=\"no\"?>\r\n"; -static const CHAR testXML[] = +static const char testXML[] = "<?xml version=\"1.0\" ?>\n" "<BankAccount>\n" " <Number>1234</Number>\n" @@ -2247,6 +2247,7 @@ static void test_saxreader_properties(void) const struct saxreader_props_test_t *ptr = props_test_data; ISAXXMLReader *reader; HRESULT hr; + VARIANT v; hr = CoCreateInstance(&CLSID_SAXXMLReader, NULL, CLSCTX_INPROC_SERVER, &IID_ISAXXMLReader, (void**)&reader); @@ -2257,7 +2258,6 @@ static void test_saxreader_properties(void) while (ptr->prop_name) { - VARIANT v; LONG ref; init_saxlexicalhandler(&lexicalhandler, S_OK); @@ -2356,9 +2356,54 @@ static void test_saxreader_properties(void) ok(V_UNKNOWN(&v) != NULL, "got %p\n", V_UNKNOWN(&v)); ptr++; + free_bstrs(); } ISAXXMLReader_Release(reader); + + if (!is_clsid_supported(&CLSID_SAXXMLReader40, reader_support_data)) + return; + + hr = CoCreateInstance(&CLSID_SAXXMLReader40, NULL, CLSCTX_INPROC_SERVER, + &IID_ISAXXMLReader, (void**)&reader); + EXPECT_HR(hr, S_OK); + + /* xmldecl-version property */ + V_VT(&v) = VT_EMPTY; + V_BSTR(&v) = (void*)0xdeadbeef; + hr = ISAXXMLReader_getProperty(reader, _bstr_("xmldecl-version"), &v); + EXPECT_HR(hr, S_OK); + ok(V_VT(&v) == VT_BSTR, "got %d\n", V_VT(&v)); + ok(V_BSTR(&v) == NULL, "got %s\n", wine_dbgstr_w(V_BSTR(&v))); + + /* stream without declaration */ + V_VT(&v) = VT_BSTR; + V_BSTR(&v) = _bstr_("<element></element>"); + hr = ISAXXMLReader_parse(reader, v); + EXPECT_HR(hr, S_OK); + + V_VT(&v) = VT_EMPTY; + V_BSTR(&v) = (void*)0xdeadbeef; + hr = ISAXXMLReader_getProperty(reader, _bstr_("xmldecl-version"), &v); + EXPECT_HR(hr, S_OK); + ok(V_VT(&v) == VT_BSTR, "got %d\n", V_VT(&v)); + ok(V_BSTR(&v) == NULL, "got %s\n", wine_dbgstr_w(V_BSTR(&v))); + + /* stream with declaration */ + V_VT(&v) = VT_BSTR; + V_BSTR(&v) = _bstr_("<?xml version=\"1.0\"?><element></element>"); + hr = ISAXXMLReader_parse(reader, v); + EXPECT_HR(hr, S_OK); + + V_VT(&v) = VT_EMPTY; + V_BSTR(&v) = (void*)0xdeadbeef; + hr = ISAXXMLReader_getProperty(reader, _bstr_("xmldecl-version"), &v); + EXPECT_HR(hr, S_OK); + ok(V_VT(&v) == VT_BSTR, "got %d\n", V_VT(&v)); + ok(!lstrcmpW(V_BSTR(&v), _bstr_("1.0")), "got %s\n", wine_dbgstr_w(V_BSTR(&v))); + VariantClear(&v); + + ISAXXMLReader_Release(reader); free_bstrs(); }

1 0

André Hentschel : winedbg: Add store operators to Thumb2 disassembler.
by Alexandre Julliard 27 Aug '12

27 Aug '12

Module: wine Branch: master Commit: c5fbebd3a65052010e22fcf990e017d462895631 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c5fbebd3a65052010e22fcf99… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Aug 26 18:30:29 2012 +0200 winedbg: Add store operators to Thumb2 disassembler. --- programs/winedbg/be_arm.c | 45 +++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 45 insertions(+), 0 deletions(-) diff --git a/programs/winedbg/be_arm.c b/programs/winedbg/be_arm.c index 26d4fbb..4d29014 100644 --- a/programs/winedbg/be_arm.c +++ b/programs/winedbg/be_arm.c @@ -84,6 +84,10 @@ static char const tbl_sregops_t[][5] = { "strh", "ldsb", "ldrh", "ldsh" }; +static char const tbl_width_t2[][2] = { + "b", "h", "", "?" +}; + static UINT db_get_inst(void* addr, int size) { UINT result = 0; @@ -760,6 +764,46 @@ static UINT thumb2_disasm_longmuldiv(UINT inst, ADDRESS64 *addr) return inst; } +static UINT thumb2_disasm_str(UINT inst, ADDRESS64 *addr) +{ + WORD op1 = (inst >> 21) & 0x07; + WORD op2 = (inst >> 6) & 0x3f; + + if ((op1 & 0x03) == 3) return inst; + + if (!(op1 & 0x04) && inst & 0x0800) + { + int offset; + dbg_printf("\n\tstr%s\t%s, [%s", tbl_width_t2[op1 & 0x03], tbl_regs[get_nibble(inst, 3)], + tbl_regs[get_nibble(inst, 4)]); + + offset = inst & 0xff; + if (!(inst & 0x0200)) offset *= -1; + + if (!(inst & 0x0400) && (inst & 0x0100)) dbg_printf("], #%i", offset); + else if (inst & 0x0400) dbg_printf(", #%i]%s", offset, (inst & 0x0100)?"!":""); + else return inst; + return 0; + } + + if (!(op1 & 0x04) && !op2) + { + dbg_printf("\n\tstr%s\t%s, [%s, %s, LSL #%u]", tbl_width_t2[op1 & 0x03], + tbl_regs[get_nibble(inst, 3)], tbl_regs[get_nibble(inst, 4)], + tbl_regs[get_nibble(inst, 0)], (inst >> 4) & 0x3); + return 0; + } + + if (op1 & 0x04) + { + dbg_printf("\n\tstr%s\t%s, [%s, #%u]", tbl_width_t2[op1 & 0x03], + tbl_regs[get_nibble(inst, 3)], tbl_regs[get_nibble(inst, 4)], inst & 0x0fff); + return 0; + } + + return inst; +} + static UINT thumb2_disasm_ldrword(UINT inst, ADDRESS64 *addr) { WORD op1 = (inst >> 23) & 0x01; @@ -892,6 +936,7 @@ static const struct inst_arm tbl_thumb32[] = { { 0xff8000c0, 0xfb000000, thumb2_disasm_mul }, { 0xff8000f0, 0xfb800000, thumb2_disasm_longmuldiv }, { 0xff8000f0, 0xfb8000f0, thumb2_disasm_longmuldiv }, + { 0xff100000, 0xf8000000, thumb2_disasm_str }, { 0xff700000, 0xf8500000, thumb2_disasm_ldrword }, { 0xef000010, 0xee000010, thumb2_disasm_coprocmov1 }, { 0x00000000, 0x00000000, NULL }

1 0

André Hentschel : winedbg: Add register data processing operators to Thumb2 disassembler.
by Alexandre Julliard 27 Aug '12

27 Aug '12

Module: wine Branch: master Commit: 7e132ac1a6acae42e1f2b959be92d830a2527abb URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e132ac1a6acae42e1f2b959b… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Aug 26 18:41:57 2012 +0200 winedbg: Add register data processing operators to Thumb2 disassembler. --- programs/winedbg/be_arm.c | 48 ++++++++++++++++++++++++++++++--------------- 1 files changed, 32 insertions(+), 16 deletions(-) diff --git a/programs/winedbg/be_arm.c b/programs/winedbg/be_arm.c index 4d29014..6da8c9f 100644 --- a/programs/winedbg/be_arm.c +++ b/programs/winedbg/be_arm.c @@ -84,6 +84,10 @@ static char const tbl_sregops_t[][5] = { "strh", "ldsb", "ldrh", "ldsh" }; +static char const tbl_miscops_t2[][6] = { + "rev", "rev16", "rbit", "revsh" +}; + static char const tbl_width_t2[][2] = { "b", "h", "", "?" }; @@ -655,22 +659,33 @@ static UINT thumb2_disasm_misc(UINT inst, ADDRESS64 *addr) if (op1 == 1) { - switch (op2) - { - case 0: - dbg_printf("\n\trev\t"); - break; - case 1: - dbg_printf("\n\trev16\t"); - break; - case 2: - dbg_printf("\n\trbit\t"); - break; - case 3: - dbg_printf("\n\trevsh\t"); - break; - } - dbg_printf("%s, %s", tbl_regs[get_nibble(inst, 2)], tbl_regs[get_nibble(inst, 0)]); + dbg_printf("\n\t%s\t%s, %s", tbl_miscops_t2[op2], tbl_regs[get_nibble(inst, 2)], + tbl_regs[get_nibble(inst, 0)]); + return 0; + } + + return inst; +} + +static UINT thumb2_disasm_dataprocessingreg(UINT inst, ADDRESS64 *addr) +{ + WORD op1 = (inst >> 20) & 0x07; + WORD op2 = (inst >> 4) & 0x0f; + + if (!op2) + { + dbg_printf("\n\t%s%s\t%s, %s, %s", tbl_shifts[op1 >> 1], (op1 & 1)?"s":"", + tbl_regs[get_nibble(inst, 2)], tbl_regs[get_nibble(inst, 4)], + tbl_regs[get_nibble(inst, 0)]); + return 0; + } + + if ((op2 & 0x0C) == 0x08 && get_nibble(inst, 4) == 0x0f) + { + dbg_printf("\n\t%sxt%s\t%s, %s", (op1 & 1)?"u":"s", (op1 & 4)?"b":"h", + tbl_regs[get_nibble(inst, 2)], tbl_regs[get_nibble(inst, 0)]); + if (op2 & 0x03) + dbg_printf(", ROR #%u", (op2 & 3) * 8); return 0; } @@ -933,6 +948,7 @@ static const struct inst_thumb16 tbl_thumb16[] = { static const struct inst_arm tbl_thumb32[] = { { 0xf800f800, 0xf000f800, thumb2_disasm_branchlinked }, { 0xffc0f0c0, 0xfa80f080, thumb2_disasm_misc }, + { 0xff80f000, 0xfa00f000, thumb2_disasm_dataprocessingreg }, { 0xff8000c0, 0xfb000000, thumb2_disasm_mul }, { 0xff8000f0, 0xfb800000, thumb2_disasm_longmuldiv }, { 0xff8000f0, 0xfb8000f0, thumb2_disasm_longmuldiv },

1 0

Rico Schüller : d3dx9: Improve ID3DXConstantTable:: GetConstantByName().
by Alexandre Julliard 27 Aug '12

27 Aug '12

Module: wine Branch: master Commit: 22049867974a4db9a9d79368641de433aa6c5fa3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=22049867974a4db9a9d793686… Author: Rico Schüller <kgbricola(a)web.de> Date: Sat Aug 25 16:28:12 2012 +0200 d3dx9: Improve ID3DXConstantTable::GetConstantByName(). --- dlls/d3dx9_36/shader.c | 119 ++++++++++++++++++++++++++++++++++++++++++------ 1 files changed, 105 insertions(+), 14 deletions(-) diff --git a/dlls/d3dx9_36/shader.c b/dlls/d3dx9_36/shader.c index c761aef..e6e0e26 100644 --- a/dlls/d3dx9_36/shader.c +++ b/dlls/d3dx9_36/shader.c @@ -690,6 +690,98 @@ static inline D3DXHANDLE handle_from_constant(struct ctab_constant *constant) return (D3DXHANDLE)constant; } +static struct ctab_constant *get_constant_by_name(struct ID3DXConstantTableImpl *, struct ctab_constant *, LPCSTR); + +static struct ctab_constant *get_constant_element_by_name(struct ctab_constant *constant, LPCSTR name) +{ + UINT element; + LPCSTR part; + + TRACE("constant %p, name %s\n", constant, debugstr_a(name)); + + if (!name || !*name) return NULL; + + element = atoi(name); + part = strchr(name, ']') + 1; + + if (constant->desc.Elements > element) + { + struct ctab_constant *c = constant->constants ? &constant->constants[element] : constant; + + switch (*part++) + { + case '.': + return get_constant_by_name(NULL, c, part); + + case '[': + return get_constant_element_by_name(c, part); + + case '\0': + TRACE("Returning parameter %p\n", c); + return c; + + default: + FIXME("Unhandled case \"%c\"\n", *--part); + break; + } + } + + TRACE("Constant not found\n"); + return NULL; +} + +static struct ctab_constant *get_constant_by_name(struct ID3DXConstantTableImpl *table, + struct ctab_constant *constant, LPCSTR name) +{ + UINT i, count, length; + struct ctab_constant *handles; + LPCSTR part; + + TRACE("table %p, constant %p, name %s\n", table, constant, debugstr_a(name)); + + if (!name || !*name) return NULL; + + if (!constant) + { + count = table->desc.Constants; + handles = table->constants; + } + else + { + count = constant->desc.StructMembers; + handles = constant->constants; + } + + length = strcspn( name, "[." ); + part = name + length; + + for (i = 0; i < count; i++) + { + if (strlen(handles[i].desc.Name) == length && !strncmp(handles[i].desc.Name, name, length)) + { + switch (*part++) + { + case '.': + return get_constant_by_name(NULL, &handles[i], part); + + case '[': + return get_constant_element_by_name(&handles[i], part); + + case '\0': + TRACE("Returning parameter %p\n", &handles[i]); + return &handles[i]; + + default: + FIXME("Unhandled case \"%c\"\n", *--part); + break; + } + } + } + + TRACE("Constant not found\n"); + return NULL; +} + static struct ctab_constant *is_valid_sub_constant(struct ctab_constant *parent, struct ctab_constant *constant) { UINT i, count; @@ -731,6 +823,15 @@ static inline struct ctab_constant *is_valid_constant(struct ID3DXConstantTableI return NULL; } +static inline struct ctab_constant *get_valid_constant(struct ID3DXConstantTableImpl *table, D3DXHANDLE handle) +{ + struct ctab_constant *constant = is_valid_constant(table, handle); + + if (!constant) constant = get_constant_by_name(table, NULL, handle); + + return constant; +} + static inline void set_float_shader_constant(struct ID3DXConstantTableImpl *table, IDirect3DDevice9 *device, UINT register_index, const FLOAT *data, UINT count) { @@ -887,24 +988,14 @@ static D3DXHANDLE WINAPI ID3DXConstantTableImpl_GetConstant(ID3DXConstantTable * static D3DXHANDLE WINAPI ID3DXConstantTableImpl_GetConstantByName(ID3DXConstantTable *iface, D3DXHANDLE constant, LPCSTR name) { struct ID3DXConstantTableImpl *This = impl_from_ID3DXConstantTable(iface); - UINT i; + struct ctab_constant *c = get_valid_constant(This, constant); TRACE("(%p)->(%p, %s)\n", This, constant, name); - if (!name) - return NULL; + c = get_constant_by_name(This, c, name); + TRACE("Returning constant %p\n", c); - if (constant) - { - FIXME("Only top level constants supported\n"); - return NULL; - } - - for (i = 0; i < This->desc.Constants; i++) - if (!strcmp(This->constants[i].desc.Name, name)) - return handle_from_constant(&This->constants[i]); - - return NULL; + return handle_from_constant(c); } static D3DXHANDLE WINAPI ID3DXConstantTableImpl_GetConstantElement(ID3DXConstantTable *iface, D3DXHANDLE constant, UINT index)

1 0