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

Dmitry Timoshkov : gdiplus: Make GdipMeasureCharacterRanges use common font transformation code.
by Alexandre Julliard Aug. 24, 2012

Aug. 24, 2012

Module: wine Branch: master Commit: 4e2959ab9b87cfeaec232f3b7aecc04e6cd3d0e4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e2959ab9b87cfeaec232f3b7… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Aug 24 15:43:45 2012 +0900 gdiplus: Make GdipMeasureCharacterRanges use common font transformation code. --- dlls/gdiplus/graphics.c | 10 +++++----- dlls/gdiplus/tests/graphics.c | 6 +++++- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 0056a2f..a0c130e 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -4927,8 +4927,7 @@ GpStatus WINGDIPAPI GdipMeasureCharacterRanges(GpGraphics* graphics, { GpStatus stat; int i; - LOGFONTW lfw; - HFONT oldfont; + HFONT gdifont, oldfont; struct measure_ranges_args args; HDC hdc, temp_hdc=NULL; GpPointF pt[3]; @@ -4971,8 +4970,8 @@ GpStatus WINGDIPAPI GdipMeasureCharacterRanges(GpGraphics* graphics, scaled_rect.Width = layoutRect->Width * args.rel_width; scaled_rect.Height = layoutRect->Height * args.rel_height; - get_log_fontW(font, graphics, &lfw); - oldfont = SelectObject(hdc, CreateFontIndirectW(&lfw)); + get_font_hfont(graphics, font, &gdifont); + oldfont = SelectObject(hdc, gdifont); for (i=0; i<stringFormat->range_count; i++) { @@ -4986,7 +4985,8 @@ GpStatus WINGDIPAPI GdipMeasureCharacterRanges(GpGraphics* graphics, stat = gdip_format_string(hdc, string, length, font, &scaled_rect, stringFormat, measure_ranges_callback, &args); - DeleteObject(SelectObject(hdc, oldfont)); + SelectObject(hdc, oldfont); + DeleteObject(gdifont); if (temp_hdc) DeleteDC(temp_hdc); diff --git a/dlls/gdiplus/tests/graphics.c b/dlls/gdiplus/tests/graphics.c index 913d895..1cd847d 100644 --- a/dlls/gdiplus/tests/graphics.c +++ b/dlls/gdiplus/tests/graphics.c @@ -3828,9 +3828,13 @@ static void test_font_height_scaling(void) win_skip("GdipMeasureCharacterRanges ignores units before Win7\n"); continue; } + /* FIXME: Wine uses integer gdi32 regions and rounding breaks things */ + if (height < 1.0) expectf_(height, rect.Height, height / 15.0); + else todo_wine - expectf_(bounds.Width, rect.Width + margin * 2.0, bounds.Width / 25.0); + expectf_(height, rect.Height, height / 15.0); + expectf_(bounds.Width, rect.Width + margin * 2.0, bounds.Width / 15.0); } }

1 0

Nikolay Sivov : shell32/tests: Use proper method macros.
by Alexandre Julliard Aug. 24, 2012

Aug. 24, 2012

Module: wine Branch: master Commit: 96005d17d5228b5c2961cee5203b15efb9c63a69 URL: http://source.winehq.org/git/wine.git/?a=commit;h=96005d17d5228b5c2961cee52… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Aug 24 13:17:20 2012 +0400 shell32/tests: Use proper method macros. --- dlls/shell32/tests/assoc.c | 17 +++++++++-------- dlls/shell32/tests/shelldispatch.c | 2 +- dlls/shell32/tests/shelllink.c | 4 ++-- dlls/shell32/tests/shlfolder.c | 2 +- dlls/shell32/tests/shlview.c | 4 ++-- 5 files changed, 15 insertions(+), 14 deletions(-) diff --git a/dlls/shell32/tests/assoc.c b/dlls/shell32/tests/assoc.c index 488f8e9..29524dc 100644 --- a/dlls/shell32/tests/assoc.c +++ b/dlls/shell32/tests/assoc.c @@ -43,19 +43,19 @@ static void test_IQueryAssociations_QueryInterface(void) return; } - hr = IUnknown_QueryInterface(qa, &IID_IQueryAssociations, (void**)&qa2); + hr = IQueryAssociations_QueryInterface(qa, &IID_IQueryAssociations, (void**)&qa2); ok(hr == S_OK, "QueryInterface (IQueryAssociations) returned 0x%x\n", hr); if (SUCCEEDED(hr)) { - IUnknown_Release(qa2); + IQueryAssociations_Release(qa2); } - hr = IUnknown_QueryInterface(qa, &IID_IUnknown, (void**)&unk); + hr = IQueryAssociations_QueryInterface(qa, &IID_IUnknown, (void**)&unk); ok(hr == S_OK, "QueryInterface (IUnknown) returned 0x%x\n", hr); if (SUCCEEDED(hr)) { IUnknown_Release(unk); } - hr = IUnknown_QueryInterface(qa, &IID_IUnknown, NULL); + hr = IQueryAssociations_QueryInterface(qa, &IID_IUnknown, NULL); ok(hr == E_POINTER, "got 0x%x (expected E_POINTER)\n", hr); IQueryAssociations_Release(qa); @@ -78,19 +78,20 @@ static void test_IApplicationAssociationRegistration_QueryInterface(void) return; } - hr = IUnknown_QueryInterface(appreg, &IID_IApplicationAssociationRegistration, (void**)&appreg2); + hr = IApplicationAssociationRegistration_QueryInterface(appreg, &IID_IApplicationAssociationRegistration, + (void**)&appreg2); ok(hr == S_OK, "QueryInterface (IApplicationAssociationRegistration) returned 0x%x\n", hr); if (SUCCEEDED(hr)) { - IUnknown_Release(appreg2); + IApplicationAssociationRegistration_Release(appreg2); } - hr = IUnknown_QueryInterface(appreg, &IID_IUnknown, (void**)&unk); + hr = IApplicationAssociationRegistration_QueryInterface(appreg, &IID_IUnknown, (void**)&unk); ok(hr == S_OK, "QueryInterface (IUnknown) returned 0x%x\n", hr); if (SUCCEEDED(hr)) { IUnknown_Release(unk); } - hr = IUnknown_QueryInterface(appreg, &IID_IUnknown, NULL); + hr = IApplicationAssociationRegistration_QueryInterface(appreg, &IID_IUnknown, NULL); ok(hr == E_POINTER, "got 0x%x (expected E_POINTER)\n", hr); IApplicationAssociationRegistration_Release(appreg); diff --git a/dlls/shell32/tests/shelldispatch.c b/dlls/shell32/tests/shelldispatch.c index 9d8d70b..0c49674 100644 --- a/dlls/shell32/tests/shelldispatch.c +++ b/dlls/shell32/tests/shelldispatch.c @@ -360,7 +360,7 @@ static void test_service(void) ok(V_BOOL(&v) == VARIANT_FALSE, "got %d\n", V_BOOL(&v)); SysFreeString(name); - IShellDispatch_Release(sd); + IShellDispatch2_Release(sd); } START_TEST(shelldispatch) diff --git a/dlls/shell32/tests/shelllink.c b/dlls/shell32/tests/shelllink.c index 8c6275d..f2f33aa 100644 --- a/dlls/shell32/tests/shelllink.c +++ b/dlls/shell32/tests/shelllink.c @@ -417,7 +417,7 @@ void create_lnk_(int line, const WCHAR* path, lnk_desc_t* desc, int save_fails) lok(r == S_OK, "SetHotkey failed (0x%08x)\n", r); } - r = IShellLinkW_QueryInterface(sl, &IID_IPersistFile, (LPVOID*)&pf); + r = IShellLinkA_QueryInterface(sl, &IID_IPersistFile, (void**)&pf); lok(r == S_OK, "no IID_IPersistFile (0x%08x)\n", r); if (r == S_OK) { @@ -902,7 +902,7 @@ if (0) LocalFree( dar ); - IUnknown_Release( dl ); + IShellLinkDataList_Release( dl ); IShellLinkW_Release( sl ); } diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index f34bb70..ef8aae9 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -796,7 +796,7 @@ static void test_GetDisplayName(void) broken(hr == S_OK), /* Win9x, W2K */ "hr = %08x\n", hr); if (hr == S_OK) { - IShellFolder_Release(psfFile); + IUnknown_Release(psfFile); } if (!pSHBindToParent) diff --git a/dlls/shell32/tests/shlview.c b/dlls/shell32/tests/shlview.c index 6e97499..554e086 100644 --- a/dlls/shell32/tests/shlview.c +++ b/dlls/shell32/tests/shlview.c @@ -170,7 +170,7 @@ static HRESULT WINAPI IDataObjectImpl_QueryInterface(IDataObject *iface, REFIID if(*ppvObj) { - IUnknown_AddRef(iface); + IDataObject_AddRef(iface); return S_OK; } @@ -302,7 +302,7 @@ static HRESULT WINAPI IShellBrowserImpl_QueryInterface(IShellBrowser *iface, if(*ppvObj) { - IUnknown_AddRef(iface); + IShellBrowser_AddRef(iface); return S_OK; }

1 0

Rico Schüller : d3dx9: Don' t use an index as variable handle, it's not useable for subvariables.
by Alexandre Julliard Aug. 24, 2012

Aug. 24, 2012

Module: wine Branch: master Commit: 8f83681723f0c58c2a1b336f0a23c59c87017b04 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f83681723f0c58c2a1b336f0… Author: Rico Schüller <kgbricola(a)web.de> Date: Thu Aug 23 21:36:46 2012 +0200 d3dx9: Don't use an index as variable handle, it's not useable for subvariables. --- dlls/d3dx9_36/shader.c | 30 ++++++++++++++++++++---------- 1 files changed, 20 insertions(+), 10 deletions(-) diff --git a/dlls/d3dx9_36/shader.c b/dlls/d3dx9_36/shader.c index 8459cd4..02727fd 100644 --- a/dlls/d3dx9_36/shader.c +++ b/dlls/d3dx9_36/shader.c @@ -657,19 +657,29 @@ static DWORD calc_bytes(D3DXCONSTANT_DESC *desc) return 4 * desc->Elements * desc->Rows * desc->Columns; } -static inline int is_constant_handle(D3DXHANDLE handle) +static inline struct ctab_constant *constant_from_handle(D3DXHANDLE handle) { - return !((UINT_PTR)handle >> 16); + return (struct ctab_constant *)handle; } -static inline struct ctab_constant *constant_from_handle(struct ID3DXConstantTableImpl *table, D3DXHANDLE handle) +static inline D3DXHANDLE handle_from_constant(struct ctab_constant *constant) { - return &table->constants[(UINT_PTR)handle - 1]; + return (D3DXHANDLE)constant; } -static inline D3DXHANDLE handle_from_constant_index(UINT index) +static inline struct ctab_constant *is_valid_constant(struct ID3DXConstantTableImpl *table, D3DXHANDLE handle) { - return (D3DXHANDLE)(DWORD_PTR)(index + 1); + struct ctab_constant *c = constant_from_handle(handle); + UINT i; + + if (!c) return NULL; + + for (i = 0; i < table->desc.Constants; ++i) + { + if (&table->constants[i] == c) return c; + } + + return NULL; } static inline void set_float_shader_constant(struct ID3DXConstantTableImpl *table, IDirect3DDevice9 *device, @@ -771,14 +781,14 @@ static HRESULT WINAPI ID3DXConstantTableImpl_GetConstantDesc(ID3DXConstantTable return D3DERR_INVALIDCALL; /* Applications can pass the name of the constant in place of the handle */ - if (!is_constant_handle(constant)) + if (!is_valid_constant(This, constant)) { constant = ID3DXConstantTable_GetConstantByName(iface, NULL, constant); if (!constant) return D3DERR_INVALIDCALL; } - constant_info = constant_from_handle(This, constant); + constant_info = constant_from_handle(constant); if (desc) *desc = constant_info->desc; @@ -822,7 +832,7 @@ static D3DXHANDLE WINAPI ID3DXConstantTableImpl_GetConstant(ID3DXConstantTable * if (index >= This->desc.Constants) return NULL; - return handle_from_constant_index(index); + return handle_from_constant(&This->constants[index]); } static D3DXHANDLE WINAPI ID3DXConstantTableImpl_GetConstantByName(ID3DXConstantTable *iface, D3DXHANDLE constant, LPCSTR name) @@ -843,7 +853,7 @@ static D3DXHANDLE WINAPI ID3DXConstantTableImpl_GetConstantByName(ID3DXConstantT for (i = 0; i < This->desc.Constants; i++) if (!strcmp(This->constants[i].desc.Name, name)) - return handle_from_constant_index(i); + return handle_from_constant(&This->constants[i]); return NULL; }

1 0

Michael Stefaniuc : dsound: Cleanup IKsPrivatePropertySetImpl_Create().
by Alexandre Julliard Aug. 24, 2012

Aug. 24, 2012

Module: wine Branch: master Commit: 1555aebf1e54ada0123e8da9faa206176b5301ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=1555aebf1e54ada0123e8da9f… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Aug 24 01:47:14 2012 +0200 dsound: Cleanup IKsPrivatePropertySetImpl_Create(). --- dlls/dsound/dsound_main.c | 2 +- dlls/dsound/dsound_private.h | 2 +- dlls/dsound/propset.c | 23 ++++++++++++----------- 3 files changed, 14 insertions(+), 13 deletions(-) diff --git a/dlls/dsound/dsound_main.c b/dlls/dsound/dsound_main.c index f5199fd..9c550eb 100644 --- a/dlls/dsound/dsound_main.c +++ b/dlls/dsound/dsound_main.c @@ -724,7 +724,7 @@ static IClassFactoryImpl DSOUND_CF[] = { { { &DSCF_Vtbl }, &CLSID_DirectSoundCapture, DSOUND_CaptureCreate }, { { &DSCF_Vtbl }, &CLSID_DirectSoundCapture8, DSOUND_CaptureCreate8 }, { { &DSCF_Vtbl }, &CLSID_DirectSoundFullDuplex, DSOUND_FullDuplexCreate }, - { { &DSCF_Vtbl }, &CLSID_DirectSoundPrivate, (FnCreateInstance)IKsPrivatePropertySetImpl_Create }, + { { &DSCF_Vtbl }, &CLSID_DirectSoundPrivate, IKsPrivatePropertySetImpl_Create }, { { NULL }, NULL, NULL } }; diff --git a/dlls/dsound/dsound_private.h b/dlls/dsound/dsound_private.h index f8e5ca6..0d2cf75 100644 --- a/dlls/dsound/dsound_private.h +++ b/dlls/dsound/dsound_private.h @@ -254,7 +254,7 @@ struct IDirectSoundCaptureBufferImpl int nrofnotifies; }; -HRESULT IKsPrivatePropertySetImpl_Create(REFIID riid, IKsPropertySet **piks) DECLSPEC_HIDDEN; +HRESULT IKsPrivatePropertySetImpl_Create(REFIID riid, void **ppv) DECLSPEC_HIDDEN; /******************************************************************************* */ diff --git a/dlls/dsound/propset.c b/dlls/dsound/propset.c index 242b237..eb4c195 100644 --- a/dlls/dsound/propset.c +++ b/dlls/dsound/propset.c @@ -619,23 +619,24 @@ static const IKsPropertySetVtbl ikspvt = { IKsPrivatePropertySetImpl_QuerySupport }; -HRESULT IKsPrivatePropertySetImpl_Create( - REFIID riid, - IKsPropertySet **piks) +HRESULT IKsPrivatePropertySetImpl_Create(REFIID riid, void **ppv) { IKsPrivatePropertySetImpl *iks; - TRACE("(%s, %p)\n", debugstr_guid(riid), piks); + HRESULT hr; + + TRACE("(%s, %p)\n", debugstr_guid(riid), ppv); - if (!IsEqualIID(riid, &IID_IUnknown) && - !IsEqualIID(riid, &IID_IKsPropertySet)) { - *piks = 0; - return E_NOINTERFACE; + iks = HeapAlloc(GetProcessHeap(), 0, sizeof(*iks)); + if (!iks) { + WARN("out of memory\n"); + return DSERR_OUTOFMEMORY; } - iks = HeapAlloc(GetProcessHeap(),0,sizeof(*iks)); iks->ref = 1; iks->IKsPropertySet_iface.lpVtbl = &ikspvt; - *piks = &iks->IKsPropertySet_iface; - return S_OK; + hr = IKsPropertySet_QueryInterface(&iks->IKsPropertySet_iface, riid, ppv); + IKsPropertySet_Release(&iks->IKsPropertySet_iface); + + return hr; }

1 0

Lucas Zawacki : dinput: Disable linuxinput or linux joysticks based on registry key.
by Alexandre Julliard Aug. 24, 2012

Aug. 24, 2012

Module: wine Branch: master Commit: 3da6f1754efa0311e00c63cea1465c2afb62369e URL: http://source.winehq.org/git/wine.git/?a=commit;h=3da6f1754efa0311e00c63cea… Author: Lucas Zawacki <lfzawacki(a)gmail.com> Date: Fri Aug 24 04:55:07 2012 -0300 dinput: Disable linuxinput or linux joysticks based on registry key. --- dlls/dinput/joystick.c | 38 +++++++++++++++++++++++++++++++++++++ dlls/dinput/joystick_linux.c | 2 + dlls/dinput/joystick_linuxinput.c | 2 + dlls/dinput/joystick_private.h | 2 + 4 files changed, 44 insertions(+), 0 deletions(-) diff --git a/dlls/dinput/joystick.c b/dlls/dinput/joystick.c index dfcaeb7..0f7ba19 100644 --- a/dlls/dinput/joystick.c +++ b/dlls/dinput/joystick.c @@ -49,6 +49,44 @@ static inline IDirectInputDevice8W *IDirectInputDevice8W_from_impl(JoystickGener return &This->base.IDirectInputDevice8W_iface; } +BOOL device_disabled_registry(const char* name) +{ + static const char *disabled_str = "disabled"; + static const char *joystick_key = "Joysticks"; + char buffer[MAX_PATH]; + HKEY hkey, appkey, temp; + BOOL do_disable = FALSE; + + get_app_key(&hkey, &appkey); + + /* Joystick settings are in the 'joysticks' subkey */ + if (appkey) + { + if (RegOpenKeyA(appkey, joystick_key, &temp)) temp = 0; + RegCloseKey(appkey); + appkey = temp; + } + if (hkey) + { + if (RegOpenKeyA(hkey, joystick_key, &temp)) temp = 0; + RegCloseKey(hkey); + hkey = temp; + } + + /* Look for the "controllername"="disabled" key */ + if (!get_config_key(hkey, appkey, name, buffer, sizeof(buffer))) + if (!strncmp(disabled_str, buffer, sizeof(disabled_str))) + { + TRACE("Disabling joystick '%s' based on registry key.\n", name); + do_disable = TRUE; + } + + if (appkey) RegCloseKey(appkey); + if (hkey) RegCloseKey(hkey); + + return do_disable; +} + /****************************************************************************** * SetProperty : change input device properties */ diff --git a/dlls/dinput/joystick_linux.c b/dlls/dinput/joystick_linux.c index 9a24157..ed2498b 100644 --- a/dlls/dinput/joystick_linux.c +++ b/dlls/dinput/joystick_linux.c @@ -158,6 +158,8 @@ static INT find_joystick_devices(void) /* Append driver name */ strcat(joydev.name, JOYDEVDRIVER); + if (device_disabled_registry(joydev.name)) continue; + #ifdef JSIOCGAXES if (ioctl(fd, JSIOCGAXES, &joydev.axis_count) < 0) { diff --git a/dlls/dinput/joystick_linuxinput.c b/dlls/dinput/joystick_linuxinput.c index 808ebf4..341e169 100644 --- a/dlls/dinput/joystick_linuxinput.c +++ b/dlls/dinput/joystick_linuxinput.c @@ -251,6 +251,8 @@ static void find_joydevs(void) else joydev.name = joydev.device; + if (device_disabled_registry(joydev.name)) continue; + joydev.guid = DInput_Wine_Joystick_Base_GUID; joydev.guid.Data3 += have_joydevs; diff --git a/dlls/dinput/joystick_private.h b/dlls/dinput/joystick_private.h index 71d91f1..483db66 100644 --- a/dlls/dinput/joystick_private.h +++ b/dlls/dinput/joystick_private.h @@ -57,6 +57,8 @@ HRESULT setup_dinput_options(JoystickGenericImpl *This, const int *default_axis_ DWORD joystick_map_pov(const POINTL *p) DECLSPEC_HIDDEN; +BOOL device_disabled_registry(const char* name) DECLSPEC_HIDDEN; + HRESULT WINAPI JoystickWGenericImpl_GetObjectInfo(LPDIRECTINPUTDEVICE8W iface, LPDIDEVICEOBJECTINSTANCEW pdidoi, DWORD dwObj, DWORD dwHow) DECLSPEC_HIDDEN;

1 0

Rico Schüller : d3dx9: Add a fixme for flags in D3DXGetShaderConstantTableEx().
by Alexandre Julliard Aug. 24, 2012

Aug. 24, 2012

Module: wine Branch: master Commit: 096833152445451134d36c84cfa8298eda58af99 URL: http://source.winehq.org/git/wine.git/?a=commit;h=096833152445451134d36c84c… Author: Rico Schüller <kgbricola(a)web.de> Date: Thu Aug 23 21:36:36 2012 +0200 d3dx9: Add a fixme for flags in D3DXGetShaderConstantTableEx(). --- dlls/d3dx9_36/shader.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/d3dx9_36/shader.c b/dlls/d3dx9_36/shader.c index 1cac23c..8459cd4 100644 --- a/dlls/d3dx9_36/shader.c +++ b/dlls/d3dx9_36/shader.c @@ -1459,6 +1459,8 @@ HRESULT WINAPI D3DXGetShaderConstantTableEx(CONST DWORD *byte_code, return D3DERR_INVALIDCALL; } + if (flags) FIXME("Flags (%#x) are not handled, yet!\n", flags); + hr = D3DXFindShaderComment(byte_code, MAKEFOURCC('C','T','A','B'), &data, &size); if (hr != D3D_OK) {

1 0

André Hentschel : winedbg: Add load word operators to Thumb2 disassembler.
by Alexandre Julliard Aug. 24, 2012

Aug. 24, 2012

Module: wine Branch: master Commit: 054d930bb74ade91054e52f1765dd41e3bc7f862 URL: http://source.winehq.org/git/wine.git/?a=commit;h=054d930bb74ade91054e52f17… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Aug 23 23:39:55 2012 +0200 winedbg: Add load word operators to Thumb2 disassembler. --- programs/winedbg/be_arm.c | 54 +++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 52 insertions(+), 2 deletions(-) diff --git a/programs/winedbg/be_arm.c b/programs/winedbg/be_arm.c index 2f1021e..26d4fbb 100644 --- a/programs/winedbg/be_arm.c +++ b/programs/winedbg/be_arm.c @@ -760,6 +760,56 @@ static UINT thumb2_disasm_longmuldiv(UINT inst, ADDRESS64 *addr) return inst; } +static UINT thumb2_disasm_ldrword(UINT inst, ADDRESS64 *addr) +{ + WORD op1 = (inst >> 23) & 0x01; + WORD op2 = (inst >> 6) & 0x3f; + int offset; + + if (get_nibble(inst, 4) == 0x0f) + { + offset = inst & 0x0fff; + + if (!op1) offset *= -1; + offset += 3; + + dbg_printf("\n\tldr\t%s, ", tbl_regs[get_nibble(inst, 3)]); + db_printsym(addr->Offset + offset); + return 0; + } + + if (!op1 && !op2) + { + dbg_printf("\n\tldr\t%s, [%s, %s, LSL #%u]", 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 && (op2 & 0x3c) == 0x38) + { + dbg_printf("\n\tldrt\t%s, [%s, #%u]", tbl_regs[get_nibble(inst, 3)], + tbl_regs[get_nibble(inst, 4)], inst & 0xff); + return 0; + } + + dbg_printf("\n\tldr\t%s, [%s", tbl_regs[get_nibble(inst, 3)], tbl_regs[get_nibble(inst, 4)]); + + if (op1) + { + dbg_printf(", #%u]", inst & 0x0fff); + return 0; + } + + 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; +} + static UINT thumb2_disasm_coprocmov1(UINT inst, ADDRESS64 *addr) { WORD opc1 = (inst >> 21) & 0x07; @@ -842,8 +892,8 @@ static const struct inst_arm tbl_thumb32[] = { { 0xff8000c0, 0xfb000000, thumb2_disasm_mul }, { 0xff8000f0, 0xfb800000, thumb2_disasm_longmuldiv }, { 0xff8000f0, 0xfb8000f0, thumb2_disasm_longmuldiv }, - { 0xef100010, 0xee100010, thumb2_disasm_coprocmov1 }, - { 0xef100010, 0xee000010, thumb2_disasm_coprocmov1 }, + { 0xff700000, 0xf8500000, thumb2_disasm_ldrword }, + { 0xef000010, 0xee000010, thumb2_disasm_coprocmov1 }, { 0x00000000, 0x00000000, NULL } };

1 0

Rico Schüller : d3dx9: Remove ctab_constant typedef.
by Alexandre Julliard Aug. 24, 2012

Aug. 24, 2012

Module: wine Branch: master Commit: 6676a729b4c7dd21aa1dbfd038a4e99b3c506aef URL: http://source.winehq.org/git/wine.git/?a=commit;h=6676a729b4c7dd21aa1dbfd03… Author: Rico Schüller <kgbricola(a)web.de> Date: Thu Aug 23 21:36:27 2012 +0200 d3dx9: Remove ctab_constant typedef. --- dlls/d3dx9_36/shader.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/d3dx9_36/shader.c b/dlls/d3dx9_36/shader.c index e44e618..1cac23c 100644 --- a/dlls/d3dx9_36/shader.c +++ b/dlls/d3dx9_36/shader.c @@ -616,10 +616,10 @@ HRESULT WINAPI D3DXPreprocessShaderFromResourceW(HMODULE module, } -typedef struct ctab_constant { +struct ctab_constant { D3DXCONSTANT_DESC desc; struct ctab_constant *members; -} ctab_constant; +}; static const struct ID3DXConstantTableVtbl ID3DXConstantTable_Vtbl; @@ -629,7 +629,7 @@ struct ID3DXConstantTableImpl { char *ctab; DWORD size; D3DXCONSTANTTABLE_DESC desc; - ctab_constant *constants; + struct ctab_constant *constants; }; static void free_constant_table(struct ID3DXConstantTableImpl *table) @@ -662,7 +662,7 @@ static inline int is_constant_handle(D3DXHANDLE handle) return !((UINT_PTR)handle >> 16); } -static inline ctab_constant *constant_from_handle(struct ID3DXConstantTableImpl *table, D3DXHANDLE handle) +static inline struct ctab_constant *constant_from_handle(struct ID3DXConstantTableImpl *table, D3DXHANDLE handle) { return &table->constants[(UINT_PTR)handle - 1]; } @@ -763,7 +763,7 @@ static HRESULT WINAPI ID3DXConstantTableImpl_GetConstantDesc(ID3DXConstantTable D3DXCONSTANT_DESC *desc, UINT *count) { struct ID3DXConstantTableImpl *This = impl_from_ID3DXConstantTable(iface); - ctab_constant *constant_info; + struct ctab_constant *constant_info; TRACE("(%p)->(%p, %p, %p)\n", This, constant, desc, count); @@ -1416,7 +1416,7 @@ static const struct ID3DXConstantTableVtbl ID3DXConstantTable_Vtbl = ID3DXConstantTableImpl_SetMatrixTransposePointerArray }; -static HRESULT parse_ctab_constant_type(const D3DXSHADER_TYPEINFO *type, ctab_constant *constant) +static HRESULT parse_ctab_constant_type(const D3DXSHADER_TYPEINFO *type, struct ctab_constant *constant) { constant->desc.Class = type->Class; constant->desc.Type = type->Type;

1 0

Roman Dadkov : oleaut32: Fix VectorFromBstr call in VARIANT_CoerceArray.
by Alexandre Julliard Aug. 24, 2012

Aug. 24, 2012

Module: wine Branch: master Commit: 79ba36aef8a72b5e627680d444f37bd266f94a52 URL: http://source.winehq.org/git/wine.git/?a=commit;h=79ba36aef8a72b5e627680d44… Author: Roman Dadkov <romand(a)etersoft.ru> Date: Thu Aug 23 18:36:46 2012 +0400 oleaut32: Fix VectorFromBstr call in VARIANT_CoerceArray. --- dlls/oleaut32/variant.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/oleaut32/variant.c b/dlls/oleaut32/variant.c index 2045eab..8a77593 100644 --- a/dlls/oleaut32/variant.c +++ b/dlls/oleaut32/variant.c @@ -526,7 +526,7 @@ static inline HRESULT VARIANT_CoerceArray(VARIANTARG* pd, VARIANTARG* ps, VARTYP return BstrFromVector(V_ARRAY(ps), &V_BSTR(pd)); if (V_VT(ps) == VT_BSTR && vt == (VT_ARRAY|VT_UI1)) - return VectorFromBstr(V_BSTR(ps), &V_ARRAY(ps)); + return VectorFromBstr(V_BSTR(ps), &V_ARRAY(pd)); if (V_VT(ps) == vt) return SafeArrayCopy(V_ARRAY(ps), &V_ARRAY(pd));

1 0

Lucas Zawacki : dinput: Append driver name to dinput joysticks on Linux.
by Alexandre Julliard Aug. 24, 2012

Aug. 24, 2012

Module: wine Branch: master Commit: 8bfb12561746b7cc56323348b5d35c4d0f2260d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8bfb12561746b7cc56323348b… Author: Lucas Zawacki <lfzawacki(a)gmail.com> Date: Fri Aug 24 04:55:06 2012 -0300 dinput: Append driver name to dinput joysticks on Linux. --- dlls/dinput/joystick_linux.c | 7 ++++++- dlls/dinput/joystick_linuxinput.c | 15 ++++++++++----- 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/dlls/dinput/joystick_linux.c b/dlls/dinput/joystick_linux.c index 5afd07c..9a24157 100644 --- a/dlls/dinput/joystick_linux.c +++ b/dlls/dinput/joystick_linux.c @@ -71,6 +71,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(dinput); #define JOYDEV_NEW "/dev/input/js" #define JOYDEV_OLD "/dev/js" +#define JOYDEVDRIVER " (js)" struct JoyDev { @@ -150,9 +151,13 @@ static INT find_joystick_devices(void) strcpy(joydev.name, "Wine Joystick"); #if defined(JSIOCGNAME) - if (ioctl(fd, JSIOCGNAME(sizeof(joydev.name)), joydev.name) < 0) + if (ioctl(fd, JSIOCGNAME(sizeof(joydev.name) - sizeof(JOYDEVDRIVER)), joydev.name) < 0) WARN("ioctl(%s,JSIOCGNAME) failed: %s\n", joydev.device, strerror(errno)); #endif + + /* Append driver name */ + strcat(joydev.name, JOYDEVDRIVER); + #ifdef JSIOCGAXES if (ioctl(fd, JSIOCGAXES, &joydev.axis_count) < 0) { diff --git a/dlls/dinput/joystick_linuxinput.c b/dlls/dinput/joystick_linuxinput.c index 3cab015..808ebf4 100644 --- a/dlls/dinput/joystick_linuxinput.c +++ b/dlls/dinput/joystick_linuxinput.c @@ -67,7 +67,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(dinput); #ifdef HAVE_CORRECT_LINUXINPUT_H -#define EVDEVPREFIX "/dev/input/event" +#define EVDEVPREFIX "/dev/input/event" +#define EVDEVDRIVER " (event)" /* Wine joystick driver object instances */ #define WINE_JOYSTICK_MAX_AXES 8 @@ -241,15 +242,19 @@ static void find_joydevs(void) buf[MAX_PATH - 1] = 0; if (ioctl(fd, EVIOCGNAME(MAX_PATH - 1), buf) != -1 && - (joydev.name = HeapAlloc(GetProcessHeap(), 0, strlen(buf) + 1))) + (joydev.name = HeapAlloc(GetProcessHeap(), 0, strlen(buf) + strlen(EVDEVDRIVER) + 1))) + { strcpy(joydev.name, buf); + /* Append driver name */ + strcat(joydev.name, EVDEVDRIVER); + } else joydev.name = joydev.device; - joydev.guid = DInput_Wine_Joystick_Base_GUID; - joydev.guid.Data3 += have_joydevs; + joydev.guid = DInput_Wine_Joystick_Base_GUID; + joydev.guid.Data3 += have_joydevs; - TRACE("Found a joystick on %s: %s (%s)\n", + TRACE("Found a joystick on %s: %s (%s)\n", joydev.device, joydev.name, debugstr_guid(&joydev.guid) );

1 0