May 2011 - Wine-commits - list.winehq.org

Hans Leidekker : msi: Fix updating the component reference count during rollback.
by Alexandre Julliard 25 May '11

25 May '11

Module: wine Branch: master Commit: 3ce11c7cc222fe4166484862ab59f7860d7389da URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ce11c7cc222fe4166484862a… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed May 25 10:39:58 2011 +0200 msi: Fix updating the component reference count during rollback. --- dlls/msi/action.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 4ef67a3..50e1e31 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -3141,7 +3141,7 @@ static void ACTION_RefCountComponent( MSIPACKAGE* package, MSICOMPONENT *comp ) { ComponentList *cl; - if (feature->ActionRequest != INSTALLSTATE_LOCAL) + if (msi_get_feature_action( package, feature ) != INSTALLSTATE_LOCAL) continue; LIST_FOR_EACH_ENTRY( cl, &feature->Components, ComponentList, entry ) @@ -3156,7 +3156,7 @@ static void ACTION_RefCountComponent( MSIPACKAGE* package, MSICOMPONENT *comp ) { ComponentList *cl; - if (feature->ActionRequest != INSTALLSTATE_ABSENT) + if (msi_get_feature_action( package, feature ) != INSTALLSTATE_ABSENT) continue; LIST_FOR_EACH_ENTRY( cl, &feature->Components, ComponentList, entry ) @@ -3230,14 +3230,14 @@ static UINT ACTION_ProcessComponents(MSIPACKAGE *package) ACTION_RefCountComponent( package, comp ); - TRACE("Component %s (%s), Keypath=%s, RefCount=%i Request=%u\n", + comp->Action = msi_get_component_action( package, comp ); + TRACE("Component %s (%s), Keypath=%s, RefCount=%u Action=%u\n", debugstr_w(comp->Component), debugstr_w(squished_cc), debugstr_w(comp->FullKeypath), comp->RefCount, - comp->ActionRequest); + comp->Action); - comp->Action = msi_get_component_action( package, comp ); if (comp->Action == INSTALLSTATE_LOCAL || comp->Action == INSTALLSTATE_SOURCE) {

1 0

David Hedberg : comdlg32: Support some events in the item dialog.
by Alexandre Julliard 25 May '11

25 May '11

Module: wine Branch: master Commit: 1597dec04856174f39f8b127b2f0b51fd7cbbe87 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1597dec04856174f39f8b127b… Author: David Hedberg <david.hedberg(a)gmail.com> Date: Tue May 24 21:09:48 2011 +0200 comdlg32: Support some events in the item dialog. --- dlls/comdlg32/itemdlg.c | 94 ++++++++++++++++++++++++++++++++++++++++- dlls/comdlg32/tests/itemdlg.c | 49 ++++++++++++++++++---- 2 files changed, 134 insertions(+), 9 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1597dec04856174f39f8b…

1 0

David Hedberg : comdlg32: Add IOleWindow implementation to the Item Dialog.
by Alexandre Julliard 25 May '11

25 May '11

Module: wine Branch: master Commit: 5fd6180a19bf3aa3eef132d9f9b05a01f85cae44 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5fd6180a19bf3aa3eef132d9f… Author: David Hedberg <david.hedberg(a)gmail.com> Date: Tue May 24 21:09:49 2011 +0200 comdlg32: Add IOleWindow implementation to the Item Dialog. --- dlls/comdlg32/itemdlg.c | 55 +++++++++++++++++++++++++++++++++++++++++ dlls/comdlg32/tests/itemdlg.c | 52 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 107 insertions(+), 0 deletions(-) diff --git a/dlls/comdlg32/itemdlg.c b/dlls/comdlg32/itemdlg.c index dc447c2..a04b86a 100644 --- a/dlls/comdlg32/itemdlg.c +++ b/dlls/comdlg32/itemdlg.c @@ -65,6 +65,7 @@ typedef struct FileDialogImpl { IExplorerBrowserEvents IExplorerBrowserEvents_iface; IServiceProvider IServiceProvider_iface; ICommDlgBrowser3 ICommDlgBrowser3_iface; + IOleWindow IOleWindow_iface; LONG ref; FILEOPENDIALOGOPTIONS options; @@ -910,6 +911,10 @@ static HRESULT WINAPI IFileDialog2_fnQueryInterface(IFileDialog2 *iface, { *ppvObject = &This->ICommDlgBrowser3_iface; } + else if(IsEqualGUID(&IID_IOleWindow, riid)) + { + *ppvObject = &This->IOleWindow_iface; + } else FIXME("Unknown interface requested: %s.\n", debugstr_guid(riid)); @@ -2206,6 +2211,55 @@ static const ICommDlgBrowser3Vtbl vt_ICommDlgBrowser3 = { ICommDlgBrowser3_fnOnPreviewCreated }; +/************************************************************************** + * IOleWindow implementation + */ +static inline FileDialogImpl *impl_from_IOleWindow(IOleWindow *iface) +{ + return CONTAINING_RECORD(iface, FileDialogImpl, IOleWindow_iface); +} + +static HRESULT WINAPI IOleWindow_fnQueryInterface(IOleWindow *iface, REFIID riid, void **ppvObject) +{ + FileDialogImpl *This = impl_from_IOleWindow(iface); + return IFileDialog2_QueryInterface(&This->IFileDialog2_iface, riid, ppvObject); +} + +static ULONG WINAPI IOleWindow_fnAddRef(IOleWindow *iface) +{ + FileDialogImpl *This = impl_from_IOleWindow(iface); + return IFileDialog2_AddRef(&This->IFileDialog2_iface); +} + +static ULONG WINAPI IOleWindow_fnRelease(IOleWindow *iface) +{ + FileDialogImpl *This = impl_from_IOleWindow(iface); + return IFileDialog2_Release(&This->IFileDialog2_iface); +} + +static HRESULT WINAPI IOleWindow_fnContextSensitiveHelp(IOleWindow *iface, BOOL fEnterMOde) +{ + FileDialogImpl *This = impl_from_IOleWindow(iface); + FIXME("Stub: %p (%d)\n", This, fEnterMOde); + return E_NOTIMPL; +} + +static HRESULT WINAPI IOleWindow_fnGetWindow(IOleWindow *iface, HWND *phwnd) +{ + FileDialogImpl *This = impl_from_IOleWindow(iface); + TRACE("%p (%p)\n", This, phwnd); + *phwnd = This->dlg_hwnd; + return S_OK; +} + +static const IOleWindowVtbl vt_IOleWindow = { + IOleWindow_fnQueryInterface, + IOleWindow_fnAddRef, + IOleWindow_fnRelease, + IOleWindow_fnGetWindow, + IOleWindow_fnContextSensitiveHelp +}; + static HRESULT FileDialog_constructor(IUnknown *pUnkOuter, REFIID riid, void **ppv, enum ITEMDLG_TYPE type) { FileDialogImpl *fdimpl; @@ -2227,6 +2281,7 @@ static HRESULT FileDialog_constructor(IUnknown *pUnkOuter, REFIID riid, void **p fdimpl->IExplorerBrowserEvents_iface.lpVtbl = &vt_IExplorerBrowserEvents; fdimpl->IServiceProvider_iface.lpVtbl = &vt_IServiceProvider; fdimpl->ICommDlgBrowser3_iface.lpVtbl = &vt_ICommDlgBrowser3; + fdimpl->IOleWindow_iface.lpVtbl = &vt_IOleWindow; if(type == ITEMDLG_TYPE_OPEN) { diff --git a/dlls/comdlg32/tests/itemdlg.c b/dlls/comdlg32/tests/itemdlg.c index fcd0e50..7c52868 100644 --- a/dlls/comdlg32/tests/itemdlg.c +++ b/dlls/comdlg32/tests/itemdlg.c @@ -166,6 +166,7 @@ static BOOL test_instantiation(void) IFileOpenDialog *pfod; IFileSaveDialog *pfsd; IServiceProvider *psp; + IOleWindow *pow; IUnknown *punk; HRESULT hr; LONG ref; @@ -235,6 +236,31 @@ static BOOL test_instantiation(void) ok(hr == E_NOINTERFACE, "got 0x%08x.\n", hr); if(SUCCEEDED(hr)) IUnknown_Release(punk); + hr = IFileOpenDialog_QueryInterface(pfod, &IID_IOleWindow, (void**)&pow); + ok(hr == S_OK, "got 0x%08x.\n", hr); + if(SUCCEEDED(hr)) + { + HWND hwnd; + + hr = IOleWindow_ContextSensitiveHelp(pow, TRUE); + todo_wine ok(hr == S_OK, "Got 0x%08x\n", hr); + + hr = IOleWindow_ContextSensitiveHelp(pow, FALSE); + todo_wine ok(hr == S_OK, "Got 0x%08x\n", hr); + + if(0) + { + /* Crashes on win7 */ + IOleWindow_GetWindow(pow, NULL); + } + + hr = IOleWindow_GetWindow(pow, &hwnd); + ok(hr == S_OK, "Got 0x%08x\n", hr); + ok(hwnd == NULL, "Got %p\n", hwnd); + + IOleWindow_Release(pow); + } + ref = IFileOpenDialog_Release(pfod); ok(!ref, "Got refcount %d, should have been released.\n", ref); @@ -280,6 +306,32 @@ static BOOL test_instantiation(void) ok(hr == E_NOINTERFACE, "got 0x%08x.\n", hr); if(SUCCEEDED(hr)) IUnknown_Release(punk); + hr = IFileSaveDialog_QueryInterface(pfsd, &IID_IOleWindow, (void**)&pow); + ok(hr == S_OK, "got 0x%08x.\n", hr); + if(SUCCEEDED(hr)) + { + HWND hwnd; + + hr = IOleWindow_ContextSensitiveHelp(pow, TRUE); + todo_wine ok(hr == S_OK, "Got 0x%08x\n", hr); + + hr = IOleWindow_ContextSensitiveHelp(pow, FALSE); + todo_wine ok(hr == S_OK, "Got 0x%08x\n", hr); + + if(0) + { + /* Crashes on win7 */ + IOleWindow_GetWindow(pow, NULL); + } + + hr = IOleWindow_GetWindow(pow, &hwnd); + ok(hr == S_OK, "Got 0x%08x\n", hr); + ok(hwnd == NULL, "Got %p\n", hwnd); + + IOleWindow_Release(pow); + } + + ref = IFileSaveDialog_Release(pfsd); ok(!ref, "Got refcount %d, should have been released.\n", ref); return TRUE;

1 0

David Hedberg : comdlg32: Implement SetDefaultFilename.
by Alexandre Julliard 25 May '11

25 May '11

Module: wine Branch: master Commit: d441d3b8ba74ac27b59614ff02076efa0cad2278 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d441d3b8ba74ac27b59614ff0… Author: David Hedberg <david.hedberg(a)gmail.com> Date: Tue May 24 21:09:50 2011 +0200 comdlg32: Implement SetDefaultFilename. --- dlls/comdlg32/cdlg.h | 1 + dlls/comdlg32/filedlg.c | 2 +- dlls/comdlg32/itemdlg.c | 81 ++++++++++++- dlls/comdlg32/tests/itemdlg.c | 275 ++++++++++++++++++++++++++++++++++++++++- 4 files changed, 352 insertions(+), 7 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d441d3b8ba74ac27b5961…

1 0

David Hedberg : comdlg32: Improve handling of file extension changes in the Item Dialog.
by Alexandre Julliard 25 May '11

25 May '11

Module: wine Branch: master Commit: 0d96d26f0d1f1a4d27b28ad00b9927966f3b8feb URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d96d26f0d1f1a4d27b28ad00… Author: David Hedberg <david.hedberg(a)gmail.com> Date: Tue May 24 21:09:51 2011 +0200 comdlg32: Improve handling of file extension changes in the Item Dialog. --- dlls/comdlg32/itemdlg.c | 23 +++++++++++++++++++++++ 1 files changed, 23 insertions(+), 0 deletions(-) diff --git a/dlls/comdlg32/itemdlg.c b/dlls/comdlg32/itemdlg.c index 80b0d86..11db9c9 100644 --- a/dlls/comdlg32/itemdlg.c +++ b/dlls/comdlg32/itemdlg.c @@ -872,16 +872,39 @@ static LRESULT on_command_filetype(FileDialogImpl *This, WPARAM wparam, LPARAM l { IShellView *psv; HRESULT hr; + LPWSTR filename; + UINT prev_index = This->filetypeindex; This->filetypeindex = SendMessageW((HWND)lparam, CB_GETCURSEL, 0, 0); TRACE("File type selection changed to %d.\n", This->filetypeindex); + if(prev_index == This->filetypeindex) + return FALSE; + hr = IExplorerBrowser_GetCurrentView(This->peb, &IID_IShellView, (void**)&psv); if(SUCCEEDED(hr)) { IShellView_Refresh(psv); IShellView_Release(psv); } + + if(This->dlg_type == ITEMDLG_TYPE_SAVE && get_file_name(This, &filename)) + { + WCHAR buf[MAX_PATH], extbuf[MAX_PATH], *ext; + + ext = get_first_ext_from_spec(extbuf, This->filterspecs[This->filetypeindex].pszSpec); + if(ext) + { + lstrcpyW(buf, filename); + + if(PathMatchSpecW(buf, This->filterspecs[prev_index].pszSpec)) + PathRemoveExtensionW(buf); + + lstrcatW(buf, ext); + set_file_name(This, buf); + } + CoTaskMemFree(filename); + } } return FALSE;

1 0

David Hedberg : comdlg32/tests: Fix some copypaste errors.
by Alexandre Julliard 25 May '11

25 May '11

Module: wine Branch: master Commit: 93b947fd1ee4fdeecd8e5337086e1c9a0b03385a URL: http://source.winehq.org/git/wine.git/?a=commit;h=93b947fd1ee4fdeecd8e53370… Author: David Hedberg <david.hedberg(a)gmail.com> Date: Tue May 24 21:09:52 2011 +0200 comdlg32/tests: Fix some copypaste errors. --- dlls/comdlg32/tests/itemdlg.c | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/comdlg32/tests/itemdlg.c b/dlls/comdlg32/tests/itemdlg.c index 5d438ae..c57e166 100644 --- a/dlls/comdlg32/tests/itemdlg.c +++ b/dlls/comdlg32/tests/itemdlg.c @@ -217,13 +217,13 @@ static BOOL test_instantiation(void) ok(hr == S_OK, "got 0x%08x.\n", hr); if(SUCCEEDED(hr)) IFileDialog_Release(pfd); - hr = IFileOpenDialog_QueryInterface(pfod, &IID_IFileDialogCustomize, (void**)&pfd); + hr = IFileOpenDialog_QueryInterface(pfod, &IID_IFileDialogCustomize, (void**)&punk); todo_wine ok(hr == S_OK, "got 0x%08x.\n", hr); - if(SUCCEEDED(hr)) IFileDialog_Release(pfd); + if(SUCCEEDED(hr)) IUnknown_Release(punk); hr = IFileOpenDialog_QueryInterface(pfod, &IID_IFileSaveDialog, (void**)&pfsd); ok(hr == E_NOINTERFACE, "got 0x%08x.\n", hr); - if(SUCCEEDED(hr)) IFileOpenDialog_Release(pfsd); + if(SUCCEEDED(hr)) IFileSaveDialog_Release(pfsd); hr = IFileOpenDialog_QueryInterface(pfod, &IID_IServiceProvider, (void**)&psp); ok(hr == S_OK, "got 0x%08x.\n", hr); @@ -248,9 +248,9 @@ static BOOL test_instantiation(void) IServiceProvider_Release(psp); } - hr = IFileOpenDialog_QueryInterface(pfod, &IID_IFileDialogEvents, (void**)&pfd); + hr = IFileOpenDialog_QueryInterface(pfod, &IID_IFileDialogEvents, (void**)&punk); ok(hr == E_NOINTERFACE, "got 0x%08x.\n", hr); - if(SUCCEEDED(hr)) IFileDialogEvents_Release(pfd); + if(SUCCEEDED(hr)) IUnknown_Release(punk); hr = IFileOpenDialog_QueryInterface(pfod, &IID_IExplorerBrowser, (void**)&punk); ok(hr == E_NOINTERFACE, "got 0x%08x.\n", hr); @@ -310,17 +310,17 @@ static BOOL test_instantiation(void) ok(hr == S_OK, "got 0x%08x.\n", hr); if(SUCCEEDED(hr)) IFileDialog_Release(pfd); - hr = IFileSaveDialog_QueryInterface(pfsd, &IID_IFileDialogCustomize, (void**)&pfd); + hr = IFileSaveDialog_QueryInterface(pfsd, &IID_IFileDialogCustomize, (void**)&punk); todo_wine ok(hr == S_OK, "got 0x%08x.\n", hr); - if(SUCCEEDED(hr)) IFileDialogCustomize_Release(pfd); + if(SUCCEEDED(hr)) IUnknown_Release(punk); - hr = IFileOpenDialog_QueryInterface(pfsd, &IID_IFileOpenDialog, (void**)&pfod); + hr = IFileSaveDialog_QueryInterface(pfsd, &IID_IFileOpenDialog, (void**)&pfod); ok(hr == E_NOINTERFACE, "got 0x%08x.\n", hr); if(SUCCEEDED(hr)) IFileOpenDialog_Release(pfod); - hr = IFileSaveDialog_QueryInterface(pfsd, &IID_IFileDialogEvents, (void**)&pfd); + hr = IFileSaveDialog_QueryInterface(pfsd, &IID_IFileDialogEvents, (void**)&punk); ok(hr == E_NOINTERFACE, "got 0x%08x.\n", hr); - if(SUCCEEDED(hr)) IFileDialogEvents_Release(pfd); + if(SUCCEEDED(hr)) IUnknown_Release(pfd); hr = IFileSaveDialog_QueryInterface(pfsd, &IID_IExplorerBrowser, (void**)&punk); ok(hr == E_NOINTERFACE, "got 0x%08x.\n", hr);

1 0

David Hedberg : comdlg32: Add IFileDialogCustomize interface stub.
by Alexandre Julliard 25 May '11

25 May '11

Module: wine Branch: master Commit: 4cc6107a7ba56f9af3822c083863fb516044a465 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4cc6107a7ba56f9af3822c083… Author: David Hedberg <david.hedberg(a)gmail.com> Date: Tue May 24 21:09:53 2011 +0200 comdlg32: Add IFileDialogCustomize interface stub. --- dlls/comdlg32/itemdlg.c | 314 +++++++++++++++++++++++++++++++++++++++++ dlls/comdlg32/tests/itemdlg.c | 15 ++- 2 files changed, 327 insertions(+), 2 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4cc6107a7ba56f9af3822…

1 0

Hans Leidekker : msi: Fix the assembly actions to revert components to the installed state during rollback .
by Alexandre Julliard 25 May '11

25 May '11

Module: wine Branch: master Commit: 39b7ce6b823a163be2fbd5c3044ff31cd669ffa7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=39b7ce6b823a163be2fbd5c30… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed May 25 10:39:11 2011 +0200 msi: Fix the assembly actions to revert components to the installed state during rollback. --- dlls/msi/assembly.c | 28 ++++++---------------------- 1 files changed, 6 insertions(+), 22 deletions(-) diff --git a/dlls/msi/assembly.c b/dlls/msi/assembly.c index 2beb005..806f89e 100644 --- a/dlls/msi/assembly.c +++ b/dlls/msi/assembly.c @@ -559,20 +559,12 @@ UINT ACTION_MsiPublishAssemblies( MSIPACKAGE *package ) if (!assembly || !comp->ComponentId) continue; - if (!comp->Enabled) + comp->Action = msi_get_component_action( package, comp ); + if (comp->Action != INSTALLSTATE_LOCAL) { - TRACE("component is disabled: %s\n", debugstr_w(comp->Component)); + TRACE("component not scheduled for installation %s\n", debugstr_w(comp->Component)); continue; } - - if (comp->ActionRequest != INSTALLSTATE_LOCAL) - { - TRACE("Component not scheduled for installation: %s\n", debugstr_w(comp->Component)); - comp->Action = comp->Installed; - continue; - } - comp->Action = INSTALLSTATE_LOCAL; - TRACE("publishing %s\n", debugstr_w(comp->Component)); CLSIDFromString( package->ProductCode, &guid ); @@ -628,20 +620,12 @@ UINT ACTION_MsiUnpublishAssemblies( MSIPACKAGE *package ) if (!assembly || !comp->ComponentId) continue; - if (!comp->Enabled) + comp->Action = msi_get_component_action( package, comp ); + if (comp->Action != INSTALLSTATE_ABSENT) { - TRACE("component is disabled: %s\n", debugstr_w(comp->Component)); + TRACE("component not scheduled for removal %s\n", debugstr_w(comp->Component)); continue; } - - if (comp->ActionRequest != INSTALLSTATE_ABSENT) - { - TRACE("Component not scheduled for removal: %s\n", debugstr_w(comp->Component)); - comp->Action = comp->Installed; - continue; - } - comp->Action = INSTALLSTATE_ABSENT; - TRACE("unpublishing %s\n", debugstr_w(comp->Component)); win32 = assembly->attributes & msidbAssemblyAttributesWin32;

1 0

Aric Stewart : usp10/test: Add Tibetan shaping test.
by Alexandre Julliard 25 May '11

25 May '11

Module: wine Branch: master Commit: c5f2ac3eeaf778a1396295f6302f40af667c4920 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c5f2ac3eeaf778a1396295f63… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue May 24 14:40:56 2011 -0500 usp10/test: Add Tibetan shaping test. --- dlls/usp10/tests/usp10.c | 30 ++++++++++++++++++++++++++++++ 1 files changed, 30 insertions(+), 0 deletions(-) diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c index 742dbec..b9e4ed5 100644 --- a/dlls/usp10/tests/usp10.c +++ b/dlls/usp10/tests/usp10.c @@ -633,6 +633,28 @@ static void test_ScriptShapeOpenType(HDC hdc) {1,{{SCRIPT_JUSTIFY_CHARACTER,1,0,0,0,0},0}}, {1,{{SCRIPT_JUSTIFY_NONE,1,0,0,0,0},0}} }; + /* Tibetan */ + static const WCHAR test_tibetan[] = {0x0f04, 0x0f05, 0x0f0e, 0x0020, 0x0f51, 0x0f7c, 0x0f53, 0x0f0b, 0x0f5a, 0x0f53, 0x0f0b, 0x0f51, 0x0f44, 0x0f0b, 0x0f54, 0x0f7c, 0x0f0d}; + static const shapeTest_char tibetan_c[] = {{0,{0,0}},{1,{0,0}},{2,{0,0}},{3,{1,0}},{4,{0,0}},{4,{0,0}},{6,{0,0}},{7,{0,0}},{8,{0,0}},{9,{0,0}},{10,{0,0}},{11,{0,0}},{12,{0,0}},{13,{0,0}},{14,{0,0}},{14,{0,0}},{16,{0,0}}}; + static const shapeTest_glyph tibetan_g[] = { + {1,{{SCRIPT_JUSTIFY_NONE,1,0,0,0,0},0}}, + {1,{{SCRIPT_JUSTIFY_NONE,1,0,0,0,0},0}}, + {1,{{SCRIPT_JUSTIFY_NONE,1,0,0,0,0},0}}, + {1,{{SCRIPT_JUSTIFY_BLANK,1,0,0,0,0},0}}, + {1,{{SCRIPT_JUSTIFY_NONE,1,0,0,0,0},0}}, + {1,{{SCRIPT_JUSTIFY_NONE,0,0,0,0,0},0}}, + {1,{{SCRIPT_JUSTIFY_NONE,1,0,0,0,0},0}}, + {1,{{SCRIPT_JUSTIFY_NONE,1,0,0,0,0},0}}, + {1,{{SCRIPT_JUSTIFY_NONE,1,0,0,0,0},0}}, + {1,{{SCRIPT_JUSTIFY_NONE,1,0,0,0,0},0}}, + {1,{{SCRIPT_JUSTIFY_NONE,1,0,0,0,0},0}}, + {1,{{SCRIPT_JUSTIFY_NONE,1,0,0,0,0},0}}, + {1,{{SCRIPT_JUSTIFY_NONE,1,0,0,0,0},0}}, + {1,{{SCRIPT_JUSTIFY_NONE,1,0,0,0,0},0}}, + {1,{{SCRIPT_JUSTIFY_NONE,1,0,0,0,0},0}}, + {1,{{SCRIPT_JUSTIFY_NONE,0,0,0,0,0},0}}, + {1,{{SCRIPT_JUSTIFY_NONE,1,0,0,0,0},0}} }; + if (!pScriptItemizeOpenType || !pScriptShapeOpenType) { win_skip("ScriptShapeOpenType not available on this platform\n"); @@ -721,6 +743,14 @@ static void test_ScriptShapeOpenType(HDC hdc) SelectObject(hdc, hfont_orig); DeleteObject(hfont); } + + test_valid = find_font_for_range(hdc, "Microsoft Himalaya", 70, test_tibetan[0], &hfont, &hfont_orig); + if (hfont != NULL) + { + test_shape_ok_valid(test_valid, hdc, test_tibetan, 17, &Control, &State, 0, 17, tibetan_c, tibetan_g); + SelectObject(hdc, hfont_orig); + DeleteObject(hfont); + } } static void test_ScriptShape(HDC hdc)

1 0

Stefan Dösinger : wined3d: CMP supports _SAT.
by Alexandre Julliard 25 May '11

25 May '11

Module: wine Branch: master Commit: dbd878639424071e1d4c6cfc9bcc75906a4b2b8a URL: http://source.winehq.org/git/wine.git/?a=commit;h=dbd878639424071e1d4c6cfc9… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun May 22 13:54:57 2011 +0200 wined3d: CMP supports _SAT. This is a partial revert of c9ef1ed28c861bc862c92ff68aa37b4ddf01cc39. I don't know where I got the idea that CMP does not support _SAT, but I suspect that my driver at the time was broken. --- dlls/wined3d/arb_program_shader.c | 28 +++++++--------------------- 1 files changed, 7 insertions(+), 21 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index cefb6e5..55435d4 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -1588,7 +1588,6 @@ static void pshader_hw_cnd(const struct wined3d_shader_instruction *ins) char src_name[3][50]; DWORD shader_version = WINED3D_SHADER_VERSION(ins->ctx->reg_maps->shader_version.major, ins->ctx->reg_maps->shader_version.minor); - BOOL is_color; shader_arb_get_dst_param(ins, dst, dst_name); shader_arb_get_src_param(ins, &ins->src[1], 1, src_name[1]); @@ -1597,7 +1596,9 @@ static void pshader_hw_cnd(const struct wined3d_shader_instruction *ins) if (shader_version <= WINED3D_SHADER_VERSION(1, 3) && ins->coissue) { shader_addline(buffer, "MOV%s %s, %s;\n", shader_arb_get_modifier(ins), dst_name, src_name[1]); - } else { + } + else + { struct wined3d_shader_src_param src0_copy = ins->src[0]; char extra_neg; @@ -1607,15 +1608,8 @@ static void pshader_hw_cnd(const struct wined3d_shader_instruction *ins) shader_arb_get_src_param(ins, &src0_copy, 0, src_name[0]); shader_arb_get_src_param(ins, &ins->src[2], 2, src_name[2]); shader_addline(buffer, "ADD TA, %c%s, coefdiv.x;\n", extra_neg, src_name[0]); - /* No modifiers supported on CMP */ - shader_addline(buffer, "CMP %s, TA, %s, %s;\n", dst_name, src_name[1], src_name[2]); - - /* _SAT on CMP doesn't make much sense, but it is not a pure NOP */ - if(ins->dst[0].modifiers & WINED3DSPDM_SATURATE) - { - shader_arb_get_register_name(ins, &dst->reg, src_name[0], &is_color); - shader_addline(buffer, "MOV_SAT %s, %s;\n", dst_name, dst_name); - } + shader_addline(buffer, "CMP%s %s, TA, %s, %s;\n", shader_arb_get_modifier(ins), + dst_name, src_name[1], src_name[2]); } } @@ -1625,7 +1619,6 @@ static void pshader_hw_cmp(const struct wined3d_shader_instruction *ins) struct wined3d_shader_buffer *buffer = ins->ctx->buffer; char dst_name[50]; char src_name[3][50]; - BOOL is_color; shader_arb_get_dst_param(ins, dst, dst_name); @@ -1634,15 +1627,8 @@ static void pshader_hw_cmp(const struct wined3d_shader_instruction *ins) shader_arb_get_src_param(ins, &ins->src[1], 1, src_name[1]); shader_arb_get_src_param(ins, &ins->src[2], 2, src_name[2]); - /* No modifiers are supported on CMP */ - shader_addline(buffer, "CMP %s, %s, %s, %s;\n", dst_name, - src_name[0], src_name[2], src_name[1]); - - if(ins->dst[0].modifiers & WINED3DSPDM_SATURATE) - { - shader_arb_get_register_name(ins, &dst->reg, src_name[0], &is_color); - shader_addline(buffer, "MOV_SAT %s, %s;\n", dst_name, src_name[0]); - } + shader_addline(buffer, "CMP%s %s, %s, %s, %s;\n", shader_arb_get_modifier(ins), + dst_name, src_name[0], src_name[2], src_name[1]); } /** Process the WINED3DSIO_DP2ADD instruction in ARB.

1 0