April 2009 - Wine-Commits - list.winehq.org

Stefan Dösinger : wined3d: Activate a thread before mapping a buffer.
by Alexandre Julliard April 28, 2009

April 28, 2009

Module: wine Branch: master Commit: 926fe798c50309fecb6f901e1310569d3257ff88 URL: http://source.winehq.org/git/wine.git/?a=commit;h=926fe798c50309fecb6f901e1… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Apr 20 14:40:53 2009 +0200 wined3d: Activate a thread before mapping a buffer. This fixes a regression in EverQuest 2. --- dlls/wined3d/buffer.c | 13 +++++++++++++ 1 files changed, 13 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index b68dcf7..d201a53 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -951,12 +951,18 @@ static HRESULT STDMETHODCALLTYPE buffer_Map(IWineD3DBuffer *iface, UINT offset, { if(count == 1) { + IWineD3DDeviceImpl *device = This->resource.wineD3DDevice; + if(This->buffer_type_hint == GL_ELEMENT_ARRAY_BUFFER_ARB) { IWineD3DDeviceImpl_MarkStateDirty(This->resource.wineD3DDevice, STATE_INDEXBUFFER); } + + ActivateContext(device, device->lastActiveRenderTarget, CTXUSAGE_RESOURCELOAD); + ENTER_GL(); GL_EXTCALL(glBindBufferARB(This->buffer_type_hint, This->buffer_object)); This->resource.allocatedMemory = GL_EXTCALL(glMapBufferARB(This->buffer_type_hint, GL_READ_WRITE_ARB)); + LEAVE_GL(); } } else @@ -987,12 +993,19 @@ static HRESULT STDMETHODCALLTYPE buffer_Unmap(IWineD3DBuffer *iface) if(!(This->flags & WINED3D_BUFFER_DOUBLEBUFFER) && This->buffer_object) { + IWineD3DDeviceImpl *device = This->resource.wineD3DDevice; + if(This->buffer_type_hint == GL_ELEMENT_ARRAY_BUFFER_ARB) { IWineD3DDeviceImpl_MarkStateDirty(This->resource.wineD3DDevice, STATE_INDEXBUFFER); } + + ActivateContext(device, device->lastActiveRenderTarget, CTXUSAGE_RESOURCELOAD); + ENTER_GL(); GL_EXTCALL(glBindBufferARB(This->buffer_type_hint, This->buffer_object)); GL_EXTCALL(glUnmapBufferARB(This->buffer_type_hint)); + LEAVE_GL(); + This->resource.allocatedMemory = NULL; } else if (This->flags & WINED3D_BUFFER_HASDESC)

1 0

Hib Eris : msi/tests: Test type for INT column.
by Alexandre Julliard April 28, 2009

April 28, 2009

Module: wine Branch: master Commit: fa8f8a3efc3630971fb042fd79e4487c6969b8d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa8f8a3efc3630971fb042fd7… Author: Hib Eris <Hib(a)hiberis.nl> Date: Sat Apr 25 21:34:38 2009 +0200 msi/tests: Test type for INT column. --- dlls/msi/tests/db.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/msi/tests/db.c b/dlls/msi/tests/db.c index b2c7d06..0cf9af1 100644 --- a/dlls/msi/tests/db.c +++ b/dlls/msi/tests/db.c @@ -1128,7 +1128,7 @@ static void test_viewgetcolumninfo(void) r = run_query( hdb, 0, "CREATE TABLE `Properties` " - "( `Property` CHAR(255), `Value` CHAR(1) PRIMARY KEY `Property`)" ); + "( `Property` CHAR(255), `Value` CHAR(1), `Intvalue` INT PRIMARY KEY `Property`)" ); ok( r == ERROR_SUCCESS , "Failed to create table\n" ); /* check the column types */ @@ -1137,12 +1137,14 @@ static void test_viewgetcolumninfo(void) ok( check_record( rec, 1, "S255"), "wrong record type\n"); ok( check_record( rec, 2, "S1"), "wrong record type\n"); + ok( check_record( rec, 3, "I2"), "wrong record type\n"); MsiCloseHandle( rec ); /* check the type in _Columns */ ok( 0x3dff == get_columns_table_type(hdb, "Properties", 1 ), "_columns table wrong\n"); ok( 0x1d01 == get_columns_table_type(hdb, "Properties", 2 ), "_columns table wrong\n"); + todo_wine ok( 0x1502 == get_columns_table_type(hdb, "Properties", 3 ), "_columns table wrong\n"); /* now try the names */ rec = get_column_info( hdb, "select * from `Properties`", MSICOLINFO_NAMES ); @@ -1150,6 +1152,7 @@ static void test_viewgetcolumninfo(void) ok( check_record( rec, 1, "Property"), "wrong record type\n"); ok( check_record( rec, 2, "Value"), "wrong record type\n"); + ok( check_record( rec, 3, "Intvalue"), "wrong record type\n"); MsiCloseHandle( rec );

1 0

Alexandre Julliard : include: Added definition of the DispHTMLWindowProxy interface.
by Alexandre Julliard April 28, 2009

April 28, 2009

Module: wine Branch: master Commit: bb3eb738a4a047508e791a8d82e8a9c8d34431a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb3eb738a4a047508e791a8d8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 28 12:49:15 2009 +0200 include: Added definition of the DispHTMLWindowProxy interface. --- include/mshtml.idl | 291 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 291 insertions(+), 0 deletions(-) diff --git a/include/mshtml.idl b/include/mshtml.idl index 23915da..bd4c98e 100644 --- a/include/mshtml.idl +++ b/include/mshtml.idl @@ -14206,6 +14206,297 @@ methods: } /***************************************************************************** + * DispHTMLWindowProxy dispinterface + */ +[ + hidden, + uuid(3050f55e-98b5-11cf-bb82-00aa00bdce0b) +] +dispinterface DispHTMLWindowProxy +{ +properties: +methods: + [id(DISPID_IHTMLFRAMESCOLLECTION2_ITEM)] + VARIANT item([in] VARIANT* pvarIndex); + + [propget, id(DISPID_IHTMLFRAMESCOLLECTION2_LENGTH)] + LONG length(); + + [propget, id(DISPID_IHTMLWINDOW2_FRAMES)] + IHTMLFramesCollection2* frames(); + + [propput, id(DISPID_IHTMLWINDOW2_DEFAULTSTATUS)] + void defaultStatus(BSTR v); + + [propget, id(DISPID_IHTMLWINDOW2_DEFAULTSTATUS)] + BSTR defaultStatus(); + + [propput, id(DISPID_IHTMLWINDOW2_STATUS)] + void status(BSTR v); + + [propget, id(DISPID_IHTMLWINDOW2_STATUS)] + BSTR status(); + + [id(DISPID_IHTMLWINDOW2_CLEARTIMEOUT)] + void clearTimeout([in] LONG timerID); + + [id(DISPID_IHTMLWINDOW2_ALERT)] + void alert([defaultvalue(""), in] BSTR message); + + [id(DISPID_IHTMLWINDOW2_CONFIRM)] + VARIANT_BOOL confirm([defaultvalue(""), in] BSTR message); + + [id(DISPID_IHTMLWINDOW2_PROMPT)] + VARIANT prompt([defaultvalue(""), in] BSTR message, + [defaultvalue("undefined"), in] BSTR defstr); + + [propget, id(DISPID_IHTMLWINDOW2_IMAGE)] + IHTMLImageElementFactory* Image(); + + [propget, id(DISPID_IHTMLWINDOW2_LOCATION)] + IHTMLLocation* location(); + + [propget, id(DISPID_IHTMLWINDOW2_HISTORY)] + IOmHistory* history(); + + [id(DISPID_IHTMLWINDOW2_CLOSE)] + void close(); + + [propput, id(DISPID_IHTMLWINDOW2_OPENER)] + void opener(VARIANT v); + + [propget, id(DISPID_IHTMLWINDOW2_OPENER)] + VARIANT opener(); + + [propget, id(DISPID_IHTMLWINDOW2_NAVIGATOR)] + IOmNavigator* navigator(); + + [propput, id(DISPID_IHTMLWINDOW2_NAME)] + void name(BSTR v); + + [propget, id(DISPID_IHTMLWINDOW2_NAME)] + BSTR name(); + + [propget, id(DISPID_IHTMLWINDOW2_PARENT)] + IHTMLWindow2* parent(); + + [id(DISPID_IHTMLWINDOW2_OPEN)] + IHTMLWindow2* open([defaultvalue(""), in] BSTR url, + [defaultvalue(""), in] BSTR name, + [defaultvalue(""), in] BSTR features, + [defaultvalue(0), in] VARIANT_BOOL replace); + + [propget, id(DISPID_IHTMLWINDOW2_SELF)] + IHTMLWindow2* self(); + + [propget, id(DISPID_IHTMLWINDOW2_TOP)] + IHTMLWindow2* top(); + + [propget, id(DISPID_IHTMLWINDOW2_WINDOW)] + IHTMLWindow2* window(); + + [id(DISPID_IHTMLWINDOW2_NAVIGATE)] + void navigate([in] BSTR url); + + [propput, id(DISPID_IHTMLWINDOW2_ONFOCUS), displaybind, bindable] + void onfocus(VARIANT v); + + [propget, id(DISPID_IHTMLWINDOW2_ONFOCUS), displaybind, bindable] + VARIANT onfocus(); + + [propput, id(DISPID_IHTMLWINDOW2_ONBLUR), displaybind, bindable] + void onblur(VARIANT v); + + [propget, id(DISPID_IHTMLWINDOW2_ONBLUR), displaybind, bindable] + VARIANT onblur(); + + [propput, id(DISPID_IHTMLWINDOW2_ONLOAD), displaybind, bindable] + void onload(VARIANT v); + + [propget, id(DISPID_IHTMLWINDOW2_ONLOAD), displaybind, bindable] + VARIANT onload(); + + [propput, id(DISPID_IHTMLWINDOW2_ONBEFOREUNLOAD), displaybind, bindable] + void onbeforeunload(VARIANT v); + + [propget, id(DISPID_IHTMLWINDOW2_ONBEFOREUNLOAD), displaybind, bindable] + VARIANT onbeforeunload(); + + [propput, id(DISPID_IHTMLWINDOW2_ONUNLOAD), displaybind, bindable] + void onunload(VARIANT v); + + [propget, id(DISPID_IHTMLWINDOW2_ONUNLOAD), displaybind, bindable] + VARIANT onunload(); + + [propput, id(DISPID_IHTMLWINDOW2_ONHELP), displaybind, bindable] + void onhelp(VARIANT v); + + [propget, id(DISPID_IHTMLWINDOW2_ONHELP), displaybind, bindable] + VARIANT onhelp(); + + [propput, id(DISPID_IHTMLWINDOW2_ONERROR), displaybind, bindable] + void onerror(VARIANT v); + + [propget, id(DISPID_IHTMLWINDOW2_ONERROR), displaybind, bindable] + VARIANT onerror(); + + [propput, id(DISPID_IHTMLWINDOW2_ONRESIZE), displaybind, bindable] + void onresize(VARIANT v); + + [propget, id(DISPID_IHTMLWINDOW2_ONRESIZE), displaybind, bindable] + VARIANT onresize(); + + [propput, id(DISPID_IHTMLWINDOW2_ONSCROLL), displaybind, bindable] + void onscroll(VARIANT v); + + [propget, id(DISPID_IHTMLWINDOW2_ONSCROLL), displaybind, bindable] + VARIANT onscroll(); + + [propget, id(DISPID_IHTMLWINDOW2_DOCUMENT), source] + IHTMLDocument2* document(); + + [propget, id(DISPID_IHTMLWINDOW2_EVENT)] + IHTMLEventObj* event(); + + [propget, id(DISPID_IHTMLWINDOW2__NEWENUM), hidden, restricted] + IUnknown* _newEnum(); + + [id(DISPID_IHTMLWINDOW2_SHOWMODALDIALOG)] + VARIANT showModalDialog([in] BSTR dialog, + [optional, in] VARIANT* varArgIn, + [optional, in] VARIANT* varOptions); + + [id(DISPID_IHTMLWINDOW2_SHOWHELP)] + void showHelp([in] BSTR helpURL, + [optional, in] VARIANT helpArg, + [defaultvalue(""), in] BSTR features); + + [propget, id(DISPID_IHTMLWINDOW2_SCREEN)] + IHTMLScreen* screen(); + + [propget, id(DISPID_IHTMLWINDOW2_OPTION)] + IHTMLOptionElementFactory* Option(); + + [id(DISPID_IHTMLWINDOW2_FOCUS)] + void focus(); + + [propget, id(DISPID_IHTMLWINDOW2_CLOSED)] + VARIANT_BOOL closed(); + + [id(DISPID_IHTMLWINDOW2_BLUR)] + void blur(); + + [id(DISPID_IHTMLWINDOW2_SCROLL)] + void scroll([in] LONG x, + [in] LONG y); + + [propget, id(DISPID_IHTMLWINDOW2_CLIENTINFORMATION)] + IOmNavigator* clientInformation(); + + [id(DISPID_IHTMLWINDOW2_CLEARINTERVAL)] + void clearInterval([in] LONG timerID); + + [propput, id(DISPID_IHTMLWINDOW2_OFFSCREENBUFFERING)] + void offscreenBuffering(VARIANT v); + + [propget, id(DISPID_IHTMLWINDOW2_OFFSCREENBUFFERING)] + VARIANT offscreenBuffering(); + + [id(DISPID_IHTMLWINDOW2_EXECSCRIPT)] + VARIANT execScript([in] BSTR code, + [defaultvalue("JScript"), in] BSTR language); + + [id(DISPID_IHTMLWINDOW2_TOSTRING)] + BSTR toString(); + + [id(DISPID_IHTMLWINDOW2_SCROLLBY)] + void scrollBy([in] LONG x, + [in] LONG y); + + [id(DISPID_IHTMLWINDOW2_SCROLLTO)] + void scrollTo([in] LONG x, + [in] LONG y); + + [id(DISPID_IHTMLWINDOW2_MOVETO)] + void moveTo([in] LONG x, + [in] LONG y); + + [id(DISPID_IHTMLWINDOW2_MOVEBY)] + void moveBy([in] LONG x, + [in] LONG y); + + [id(DISPID_IHTMLWINDOW2_RESIZETO)] + void resizeTo([in] LONG x, + [in] LONG y); + + [id(DISPID_IHTMLWINDOW2_RESIZEBY)] + void resizeBy([in] LONG x, + [in] LONG y); + + [propget, id(DISPID_IHTMLWINDOW2_EXTERNAL)] + IDispatch* external(); + + [propget, id(DISPID_IHTMLWINDOW3_SCREENLEFT)] + LONG screenLeft(); + + [propget, id(DISPID_IHTMLWINDOW3_SCREENTOP)] + LONG screenTop(); + + [id(DISPID_IHTMLWINDOW3_ATTACHEVENT)] + VARIANT_BOOL attachEvent([in] BSTR event, + [in] IDispatch* pDisp); + + [id(DISPID_IHTMLWINDOW3_DETACHEVENT)] + void detachEvent([in] BSTR event, + [in] IDispatch* pDisp); + + [id(DISPID_IHTMLWINDOW3_SETTIMEOUT)] + LONG setTimeout([in] VARIANT* expression, + [in] LONG msec, + [optional, in] VARIANT* language); + + [id(DISPID_IHTMLWINDOW3_SETINTERVAL)] + LONG setInterval([in] VARIANT* expression, + [in] LONG msec, + [optional, in] VARIANT* language); + + [id(DISPID_IHTMLWINDOW3_PRINT)] + void print(); + + [propput, id(DISPID_IHTMLWINDOW3_ONBEFOREPRINT), displaybind, bindable] + void onbeforeprint(VARIANT v); + + [propget, id(DISPID_IHTMLWINDOW3_ONBEFOREPRINT), displaybind, bindable] + VARIANT onbeforeprint(); + + [propput, id(DISPID_IHTMLWINDOW3_ONAFTERPRINT), displaybind, bindable] + void onafterprint(VARIANT v); + + [propget, id(DISPID_IHTMLWINDOW3_ONAFTERPRINT), displaybind, bindable] + VARIANT onafterprint(); + + [propget, id(DISPID_IHTMLWINDOW3_CLIPBOARDDATA)] + IHTMLDataTransfer* clipboardData(); + + [id(DISPID_IHTMLWINDOW3_SHOWMODELESSDIALOG)] + IHTMLWindow2* showModelessDialog([defaultvalue(""), in] BSTR url, + [optional, in] VARIANT* varArgIn, + [optional, in] VARIANT* options); + + [id(DISPID_IHTMLWINDOW4_CREATEPOPUP)] + IDispatch* createPopup([optional, in] VARIANT* varArgIn); + + [propget, id(DISPID_IHTMLWINDOW4_FRAMEELEMENT)] + IHTMLFrameBase* frameElement(); + + [propput, id(DISPID_IHTMLWINDOW5_XMLHTTPREQUEST)] + void XMLHttpRequest(VARIANT v); + + [propget, id(DISPID_IHTMLWINDOW5_XMLHTTPREQUEST)] + VARIANT XMLHttpRequest(); +}; + +/***************************************************************************** * HTMLDocumentEvents2 interface */ [

1 0

Stefan Dösinger : wined3d: Set the max mipmap level in the pbo test.
by Alexandre Julliard April 28, 2009

April 28, 2009

Module: wine Branch: master Commit: 25a59fe71b825c22cdc284f1838076efd74d5b79 URL: http://source.winehq.org/git/wine.git/?a=commit;h=25a59fe71b825c22cdc284f18… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Apr 22 19:28:53 2009 +0200 wined3d: Set the max mipmap level in the pbo test. fglrx refuses to use PBOs on not mipmap complete textures. The texture code already takes care of this, do the same in the test. --- dlls/wined3d/directx.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 2b4520c..02959e0 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -3900,6 +3900,8 @@ static void test_pbo_functionality(WineD3D_GL_Info *gl_info) { while(glGetError()); glGenTextures(1, &texture); glBindTexture(GL_TEXTURE_2D, texture); + + glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAX_LEVEL, 0); glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA8, 4, 4, 0, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, 0); checkGLcall("Specifying the PBO test texture\n");

1 0

Massimo Del Fedele : gdiplus: Add stub for GdipBitmapSetPixel.
by Alexandre Julliard April 28, 2009

April 28, 2009

Module: wine Branch: master Commit: a3221e7f2371b5671ba315bea90ebed84f6c2806 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a3221e7f2371b5671ba315bea… Author: Massimo Del Fedele <max(a)veneto.com> Date: Mon Apr 27 23:20:27 2009 +0200 gdiplus: Add stub for GdipBitmapSetPixel. --- dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/image.c | 15 +++++++++++++++ 2 files changed, 16 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index ba98518..2d5bc78 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -42,7 +42,7 @@ @ stub GdipBitmapGetHistogramSize @ stdcall GdipBitmapGetPixel(ptr long long ptr) @ stdcall GdipBitmapLockBits(ptr ptr long long ptr) -@ stub GdipBitmapSetPixel +@ stdcall GdipBitmapSetPixel(ptr long long long) @ stdcall GdipBitmapSetResolution(ptr long long) @ stdcall GdipBitmapUnlockBits(ptr ptr) @ stdcall GdipClearPathMarkers(ptr) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 5552225..fde6ab3 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -87,6 +87,21 @@ GpStatus WINGDIPAPI GdipBitmapGetPixel(GpBitmap* bitmap, INT x, INT y, return NotImplemented; } +GpStatus WINGDIPAPI GdipBitmapSetPixel(GpBitmap* bitmap, INT x, INT y, + ARGB color) +{ + static int calls; + TRACE("bitmap:%p, x:%d, y:%d, color:%08x\n", bitmap, x, y, color); + + if(!bitmap) + return InvalidParameter; + + if(!(calls++)) + FIXME("not implemented\n"); + + return NotImplemented; +} + /* This function returns a pointer to an array of pixels that represents the * bitmap. The *entire* bitmap is locked according to the lock mode specified by * flags. It is correct behavior that a user who calls this function with write

1 0

Vincent Povirk : gdiplus: Create a static InstalledFontCollection object, currently empty.
by Alexandre Julliard April 28, 2009

April 28, 2009

Module: wine Branch: master Commit: 73eea0d05ffbe810092840f70c7fbce55f2bc8b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=73eea0d05ffbe810092840f70… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Apr 27 16:24:47 2009 -0500 gdiplus: Create a static InstalledFontCollection object, currently empty. --- dlls/gdiplus/font.c | 6 +++++- dlls/gdiplus/tests/font.c | 4 ++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/gdiplus/font.c b/dlls/gdiplus/font.c index 6454765..68540e4 100644 --- a/dlls/gdiplus/font.c +++ b/dlls/gdiplus/font.c @@ -36,6 +36,8 @@ WINE_DEFAULT_DEBUG_CHANNEL (gdiplus); static const REAL mm_per_inch = 25.4; static const REAL inch_per_point = 1.0/72.0; +static GpFontCollection installedFontCollection = {0}; + static inline REAL get_dpi (void) { REAL dpi; @@ -936,5 +938,7 @@ GpStatus WINGDIPAPI GdipNewInstalledFontCollection( if (!fontCollection) return InvalidParameter; - return NotImplemented; + *fontCollection = &installedFontCollection; + + return Ok; } diff --git a/dlls/gdiplus/tests/font.c b/dlls/gdiplus/tests/font.c index 6fbb8e2..0da5b2f 100644 --- a/dlls/gdiplus/tests/font.c +++ b/dlls/gdiplus/tests/font.c @@ -349,8 +349,8 @@ static void test_installedfonts (void) expect (InvalidParameter, stat); stat = GdipNewInstalledFontCollection(&collection); - todo_wine expect (Ok, stat); - todo_wine ok (collection != NULL, "got NULL font collection\n"); + expect (Ok, stat); + ok (collection != NULL, "got NULL font collection\n"); } START_TEST(font)

1 0

Juan Lang : cryptui: If an input file name is given to CryptUIWizImport, show it in the wizard.
by Alexandre Julliard April 28, 2009

April 28, 2009

Module: wine Branch: master Commit: b6682f96f7ff042b04ce6883b7873ff9cb0118ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=b6682f96f7ff042b04ce6883b… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Apr 27 18:10:54 2009 -0700 cryptui: If an input file name is given to CryptUIWizImport, show it in the wizard. --- dlls/cryptui/main.c | 16 ++++++++++++++-- 1 files changed, 14 insertions(+), 2 deletions(-) diff --git a/dlls/cryptui/main.c b/dlls/cryptui/main.c index f29f1e6..f6fb60c 100644 --- a/dlls/cryptui/main.c +++ b/dlls/cryptui/main.c @@ -4993,6 +4993,12 @@ static LRESULT CALLBACK import_file_dlg_proc(HWND hwnd, UINT msg, WPARAM wp, data = (struct ImportWizData *)page->lParam; SetWindowLongPtrW(hwnd, DWLP_USER, (LPARAM)data); + if (data->fileName) + { + HWND fileNameEdit = GetDlgItem(hwnd, IDC_IMPORT_FILENAME); + + SendMessageW(fileNameEdit, WM_SETTEXT, 0, (LPARAM)data->fileName); + } break; } case WM_NOTIFY: @@ -5383,10 +5389,15 @@ static BOOL show_import_ui(DWORD dwFlags, HWND hwndParent, data.dwFlags = dwFlags; data.pwszWizardTitle = pwszWizardTitle; if (pImportSrc) + { memcpy(&data.importSrc, pImportSrc, sizeof(data.importSrc)); + data.fileName = (LPWSTR)pImportSrc->u.pwszFileName; + } else + { memset(&data.importSrc, 0, sizeof(data.importSrc)); - data.fileName = NULL; + data.fileName = NULL; + } data.freeSource = FALSE; data.hDestCertStore = hDestCertStore; data.freeDest = FALSE; @@ -5470,7 +5481,8 @@ static BOOL show_import_ui(DWORD dwFlags, HWND hwndParent, hdr.u4.pszbmWatermark = MAKEINTRESOURCEW(IDB_CERT_WATERMARK); hdr.u5.pszbmHeader = MAKEINTRESOURCEW(IDB_CERT_HEADER); PropertySheetW(&hdr); - HeapFree(GetProcessHeap(), 0, data.fileName); + if (data.fileName != data.importSrc.u.pwszFileName) + HeapFree(GetProcessHeap(), 0, data.fileName); if (data.freeSource && data.importSrc.dwSubjectChoice == CRYPTUI_WIZ_IMPORT_SUBJECT_CERT_STORE) CertCloseStore(data.importSrc.u.hCertStore, 0);

1 0

Henri Verbeet : wined3d: Use shader_sm1_read_dst_param() and shader_sm1_read_src_param() in shader_get_registers_used().
by Alexandre Julliard April 28, 2009

April 28, 2009

Module: wine Branch: master Commit: 0df4514894c0b1a33fd15d730c3e735d7da75f9d URL: http://source.winehq.org/git/wine.git/?a=commit;h=0df4514894c0b1a33fd15d730… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 28 09:53:28 2009 +0200 wined3d: Use shader_sm1_read_dst_param() and shader_sm1_read_src_param() in shader_get_registers_used(). --- dlls/wined3d/baseshader.c | 39 +++++++++++++++++++++++---------------- 1 files changed, 23 insertions(+), 16 deletions(-) diff --git a/dlls/wined3d/baseshader.c b/dlls/wined3d/baseshader.c index 21c99fc..d565fb3 100644 --- a/dlls/wined3d/baseshader.c +++ b/dlls/wined3d/baseshader.c @@ -763,36 +763,43 @@ HRESULT shader_get_registers_used(IWineD3DBaseShader *iface, struct shader_reg_m } /* This will loop over all the registers and try to - * make a bitmask of the ones we're interested in. + * make a bitmask of the ones we're interested in. * - * Relative addressing tokens are ignored, but that's - * okay, since we'll catch any address registers when + * Relative addressing tokens are ignored, but that's + * okay, since we'll catch any address registers when * they are initialized (required by spec) */ - limit = ins.dst_count + ins.src_count + (ins.predicate ? 1 : 0); - - for (i = 0; i < limit; ++i) { - - DWORD param, addr_token, reg, regtype; - pToken += shader_get_param(pToken, shader_version, &param, &addr_token); + if (ins.dst_count) + { + struct wined3d_shader_dst_param dst_param; + struct wined3d_shader_src_param dst_rel_addr; - regtype = shader_get_regtype(param); - reg = param & WINED3DSP_REGNUM_MASK; + shader_sm1_read_dst_param(&pToken, &dst_param, &dst_rel_addr, shader_version); /* WINED3DSPR_TEXCRDOUT is the same as WINED3DSPR_OUTPUT. _OUTPUT can be > MAX_REG_TEXCRD and * is used in >= 3.0 shaders. Filter 3.0 shaders to prevent overflows, and also filter pixel * shaders because TECRDOUT isn't used in them, but future register types might cause issues */ - if (regtype == WINED3DSPR_TEXCRDOUT && i == 0 /* Only look at writes */ - && !pshader && WINED3DSHADER_VERSION_MAJOR(shader_version) < 3) + if (!pshader && WINED3DSHADER_VERSION_MAJOR(shader_version) < 3 + && dst_param.register_type == WINED3DSPR_TEXCRDOUT) { - reg_maps->texcoord_mask[reg] |= shader_get_writemask(param); + reg_maps->texcoord_mask[dst_param.register_type] |= dst_param.write_mask; } else { - shader_record_register_usage(This, reg_maps, regtype, reg, - param & WINED3DSHADER_ADDRMODE_RELATIVE, pshader); + shader_record_register_usage(This, reg_maps, dst_param.register_type, + dst_param.register_idx, !!dst_param.rel_addr, pshader); } } + + limit = ins.src_count + (ins.predicate ? 1 : 0); + for (i = 0; i < limit; ++i) + { + struct wined3d_shader_src_param src_param, src_rel_addr; + + shader_sm1_read_src_param(&pToken, &src_param, &src_rel_addr, shader_version); + shader_record_register_usage(This, reg_maps, src_param.register_type, + src_param.register_idx, !!src_param.rel_addr, pshader); + } } } ++pToken;

1 0

Vincent Povirk : gdiplus: Add test for GdipNewInstalledFontCollection.
by Alexandre Julliard April 28, 2009

April 28, 2009

Module: wine Branch: master Commit: 31f2b8e1eab801d27815a68808e5124d9c06a344 URL: http://source.winehq.org/git/wine.git/?a=commit;h=31f2b8e1eab801d27815a6880… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Jan 28 16:08:43 2009 -0600 gdiplus: Add test for GdipNewInstalledFontCollection. --- dlls/gdiplus/tests/font.c | 14 ++++++++++++++ include/gdiplusflat.h | 1 + 2 files changed, 15 insertions(+), 0 deletions(-) diff --git a/dlls/gdiplus/tests/font.c b/dlls/gdiplus/tests/font.c index 7d6582f..6fbb8e2 100644 --- a/dlls/gdiplus/tests/font.c +++ b/dlls/gdiplus/tests/font.c @@ -340,6 +340,19 @@ monospace: expect (Ok, stat); } +static void test_installedfonts (void) +{ + GpStatus stat; + GpFontCollection* collection=NULL; + + stat = GdipNewInstalledFontCollection(NULL); + expect (InvalidParameter, stat); + + stat = GdipNewInstalledFontCollection(&collection); + todo_wine expect (Ok, stat); + todo_wine ok (collection != NULL, "got NULL font collection\n"); +} + START_TEST(font) { struct GdiplusStartupInput gdiplusStartupInput; @@ -357,6 +370,7 @@ START_TEST(font) test_fontfamily(); test_fontfamily_properties(); test_getgenerics(); + test_installedfonts(); GdiplusShutdown(gdiplusToken); } diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index 158eb5e..f8ebc73 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -93,6 +93,7 @@ GpStatus WINGDIPAPI GdipGetFontHeight(GDIPCONST GpFont*, GDIPCONST GpGraphics*, GpStatus WINGDIPAPI GdipGetFontHeightGivenDPI(GDIPCONST GpFont*, REAL, REAL*); /* FontCollection */ +GpStatus WINGDIPAPI GdipNewInstalledFontCollection(GpFontCollection**); GpStatus WINGDIPAPI GdipNewPrivateFontCollection(GpFontCollection**); GpStatus WINGDIPAPI GdipDeletePrivateFontCollection(GpFontCollection**); GpStatus WINGDIPAPI GdipPrivateAddFontFile(GpFontCollection*, GDIPCONST WCHAR*);

1 0

Henri Verbeet : wined3d: Create a separate function to record register usage.
by Alexandre Julliard April 28, 2009

April 28, 2009

Module: wine Branch: master Commit: e00187616307740bd1da7c2ccde548f56a9a115a URL: http://source.winehq.org/git/wine.git/?a=commit;h=e00187616307740bd1da7c2cc… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 28 09:53:28 2009 +0200 wined3d: Create a separate function to record register usage. --- dlls/wined3d/baseshader.c | 146 ++++++++++++++++++++++----------------- dlls/wined3d/glsl_shader.c | 20 +++-- dlls/wined3d/wined3d_private.h | 3 +- 3 files changed, 96 insertions(+), 73 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e00187616307740bd1da7…

1 0