March 2010 - Wine-Commits - list.winehq.org

Jörg Höhle : winex11: Log keycode decimal <-> hex for keysym & MS vkey and scancode.
by Alexandre Julliard March 4, 2010

March 4, 2010

Module: wine Branch: master Commit: 9079109a4531359d4023bbbfc80d9a6c77696383 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9079109a4531359d4023bbbfc… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Sat Feb 13 22:47:08 2010 +0100 winex11: Log keycode decimal <-> hex for keysym & MS vkey and scancode. --- dlls/user32/input.c | 6 ++-- dlls/user32/message.c | 2 +- dlls/winex11.drv/keyboard.c | 63 +++++++++++++++++++++++------------------- 3 files changed, 38 insertions(+), 33 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9079109a4531359d4023b…

1 0

André Hentschel : oleaut32: Fix localized date and time parsing.
by Alexandre Julliard March 4, 2010

March 4, 2010

Module: wine Branch: master Commit: a360c98187856039b0c5365997d6994f95eb4d42 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a360c98187856039b0c536599… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Mar 3 19:59:16 2010 +0100 oleaut32: Fix localized date and time parsing. --- dlls/oleaut32/tests/vartype.c | 2 +- dlls/oleaut32/vartype.c | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletions(-) diff --git a/dlls/oleaut32/tests/vartype.c b/dlls/oleaut32/tests/vartype.c index 6742fce..79b6b93 100644 --- a/dlls/oleaut32/tests/vartype.c +++ b/dlls/oleaut32/tests/vartype.c @@ -3439,7 +3439,7 @@ static void test_VarDateFromStr(void) DFS("02.01.1970 00:00:00"); EXPECT_MISMATCH; lcid = MAKELCID(MAKELANGID(LANG_GERMAN,SUBLANG_GERMAN),SORT_DEFAULT); DFS("02.01.1970"); EXPECT_DBL(25570.0); - DFS("02.01.1970 00:00:00"); todo_wine EXPECT_DBL(25570.0); + DFS("02.01.1970 00:00:00"); EXPECT_DBL(25570.0); } static void test_VarDateCopy(void) diff --git a/dlls/oleaut32/vartype.c b/dlls/oleaut32/vartype.c index 580209b..da1288d 100644 --- a/dlls/oleaut32/vartype.c +++ b/dlls/oleaut32/vartype.c @@ -7707,6 +7707,13 @@ HRESULT WINAPI VarDateFromStr(OLECHAR* strIn, LCID lcid, ULONG dwFlags, DATE* pd dp.dwCount -= 3; break; + case 0x1B: /* localized DDDTTT */ + if (!iDate) + { + hRet = DISP_E_TYPEMISMATCH; + break; + } + /* .. fall through .. */ case 0x18: /* DDDTTT */ if ((dp.dwFlags[0] & (DP_AM|DP_PM)) || (dp.dwFlags[1] & (DP_AM|DP_PM)) || (dp.dwFlags[2] & (DP_AM|DP_PM)))

1 0

André Hentschel : oleaut32: Fix localized date parsing .
by Alexandre Julliard March 4, 2010

March 4, 2010

Module: wine Branch: master Commit: 71f24431b987d70053063a9f206913e7fff53edc URL: http://source.winehq.org/git/wine.git/?a=commit;h=71f24431b987d70053063a9f2… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Mar 3 19:57:27 2010 +0100 oleaut32: Fix localized date parsing. --- dlls/oleaut32/tests/vartype.c | 4 ++-- dlls/oleaut32/vartype.c | 8 ++++++++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/oleaut32/tests/vartype.c b/dlls/oleaut32/tests/vartype.c index 0c23a11..6742fce 100644 --- a/dlls/oleaut32/tests/vartype.c +++ b/dlls/oleaut32/tests/vartype.c @@ -3435,10 +3435,10 @@ static void test_VarDateFromStr(void) DFS("1-2-1970"); EXPECT_DBL(25570.0); /* Native fails "1999 January 3, 9AM". I consider that a bug in native */ - /* test a none english data string */ + /* test a non-english data string */ DFS("02.01.1970 00:00:00"); EXPECT_MISMATCH; lcid = MAKELCID(MAKELANGID(LANG_GERMAN,SUBLANG_GERMAN),SORT_DEFAULT); - DFS("02.01.1970"); todo_wine EXPECT_DBL(25570.0); + DFS("02.01.1970"); EXPECT_DBL(25570.0); DFS("02.01.1970 00:00:00"); todo_wine EXPECT_DBL(25570.0); } diff --git a/dlls/oleaut32/vartype.c b/dlls/oleaut32/vartype.c index 6d604f3..580209b 100644 --- a/dlls/oleaut32/vartype.c +++ b/dlls/oleaut32/vartype.c @@ -7607,6 +7607,14 @@ HRESULT WINAPI VarDateFromStr(OLECHAR* strIn, LCID lcid, ULONG dwFlags, DATE* pd break; case 0x3: /* TTT TTTDD TTTDDD */ + if (iDate && dp.dwCount == 3) + { + /* DDD */ + if ((dp.dwFlags[0] & (DP_AM|DP_PM)) || (dp.dwFlags[1] & (DP_AM|DP_PM)) || + (dp.dwFlags[2] & (DP_AM|DP_PM))) + hRet = DISP_E_TYPEMISMATCH; + break; + } if (dp.dwCount > 4 && ((dp.dwFlags[3] & (DP_AM|DP_PM)) || (dp.dwFlags[4] & (DP_AM|DP_PM)) || (dp.dwFlags[5] & (DP_AM|DP_PM))))

1 0

Jeremy White : Switch the information to the new Slackware package maintainer.
by Jeremy Newman March 4, 2010

March 4, 2010

Module: website Branch: master Commit: af0b581afe60c6ec55344324a1d9de0768e7c2b3 URL: http://source.winehq.org/git/website.git/?a=commit;h=af0b581afe60c6ec553443… Author: Jeremy White <jwhite(a)winehq.org> Date: Wed Mar 3 15:49:34 2010 -0600 Switch the information to the new Slackware package maintainer. --- templates/de/download.template | 2 +- templates/en/download.template | 2 +- templates/pl/download.template | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/templates/de/download.template b/templates/de/download.template index 7730baf..6642219 100644 --- a/templates/de/download.template +++ b/templates/de/download.template @@ -128,7 +128,7 @@ erbeten hat, dass sie die Wine-Website hosten. </td> <td> <a href="http://sourceforge.net/project/showfiles.php?group_id=6241&package_id=6…">Slackware</a> binär .tgz für Slackware 10.2</td> - <td><a href="mailto:sadam(a)clemson.edu">Adam Schreiber</a></td> + <td><a href="mailto:studiosg(a)giustetti.net">Simone Giustetti</a></td> </tr> <tr bgcolor="#ffffff"> diff --git a/templates/en/download.template b/templates/en/download.template index 30bbacd..e58e5e1 100644 --- a/templates/en/download.template +++ b/templates/en/download.template @@ -115,7 +115,7 @@ requested in exchange for hosting the Wine web site. </td> <td> <a href="http://sourceforge.net/project/showfiles.php?group_id=6241&package_id=6…">Download Slackware packages</a> - binary .tgz for Slackware 10.2</td> - <td><a href="mailto:sadam(a)clemson.edu">Adam Schreiber</a></td> + <td><a href="mailto:studiosg(a)giustetti.net">Simone Giustetti</a></td> </tr> <tr bgcolor="#ffffff"> diff --git a/templates/pl/download.template b/templates/pl/download.template index 6fa59be..a96e606 100644 --- a/templates/pl/download.template +++ b/templates/pl/download.template @@ -112,7 +112,7 @@ </td> <td> <a href="http://sourceforge.net/project/showfiles.php?group_id=6241&package_id=6…">Slackware</a> binarne .tgz dla Slackware 10.2</td> - <td><a href="mailto:sadam(a)clemson.edu">Adam Schreiber</a></td> + <td><a href="mailto:studiosg(a)giustetti.net">Simone Giustetti</a></td> </tr> <tr bgcolor="#ffffff">

1 0

Jacek Caban : mshtml: Correctly handle document with already loaded moniker in set_moniker.
by Alexandre Julliard March 3, 2010

March 3, 2010

Module: wine Branch: master Commit: 8dd7b39603d8051af782276398a77aad4702eb4f URL: http://source.winehq.org/git/wine.git/?a=commit;h=8dd7b39603d8051af78227639… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 3 14:56:01 2010 +0100 mshtml: Correctly handle document with already loaded moniker in set_moniker. --- dlls/mshtml/persist.c | 27 +++++++++++++++++---------- 1 files changed, 17 insertions(+), 10 deletions(-) diff --git a/dlls/mshtml/persist.c b/dlls/mshtml/persist.c index 49a3835..540b563 100644 --- a/dlls/mshtml/persist.c +++ b/dlls/mshtml/persist.c @@ -171,18 +171,13 @@ static void set_downloading_proc(task_t *_task) static HRESULT set_moniker(HTMLDocument *This, IMoniker *mon, IBindCtx *pibc, BOOL set_download) { + download_proc_task_t *download_task; nsChannelBSC *bscallback; - LPOLESTR url = NULL; docobj_task_t *task; - download_proc_task_t *download_task; nsWineURI *nsuri; + LPOLESTR url; HRESULT hres; - set_ready_state(This->window, READYSTATE_LOADING); - update_doc(This, UPDATE_TITLE); - - HTMLDocument_LockContainer(This->doc_obj, TRUE); - hres = IMoniker_GetDisplayName(mon, pibc, NULL, &url); if(FAILED(hres)) { WARN("GetDiaplayName failed: %08x\n", hres); @@ -191,11 +186,8 @@ static HRESULT set_moniker(HTMLDocument *This, IMoniker *mon, IBindCtx *pibc, BO TRACE("got url: %s\n", debugstr_w(url)); - set_current_mon(This->window, mon); - if(This->doc_obj->client) { VARIANT silent, offline; - IOleCommandTarget *cmdtrg = NULL; hres = get_client_disp_property(This->doc_obj->client, DISPID_AMBIENT_SILENT, &silent); if(SUCCEEDED(hres)) { @@ -213,6 +205,19 @@ static HRESULT set_moniker(HTMLDocument *This, IMoniker *mon, IBindCtx *pibc, BO else if(V_BOOL(&silent)) FIXME("offline == true\n"); } + } + + if(This->window->mon) { + update_doc(This, UPDATE_TITLE|UPDATE_UI); + }else { + update_doc(This, UPDATE_TITLE); + set_current_mon(This->window, mon); + } + + set_ready_state(This->window, READYSTATE_LOADING); + + if(This->doc_obj->client) { + IOleCommandTarget *cmdtrg = NULL; hres = IOleClientSite_QueryInterface(This->doc_obj->client, &IID_IOleCommandTarget, (void**)&cmdtrg); @@ -244,6 +249,8 @@ static HRESULT set_moniker(HTMLDocument *This, IMoniker *mon, IBindCtx *pibc, BO if(FAILED(hres)) return hres; + HTMLDocument_LockContainer(This->doc_obj, TRUE); + if(This->doc_obj->frame) { task = heap_alloc(sizeof(docobj_task_t)); task->doc = This->doc_obj;

1 0

Paul Andrew Panon : wined3d: Add Mesa ATI card detection code.
by Alexandre Julliard March 3, 2010

March 3, 2010

Module: wine Branch: master Commit: 74a059d21b36b7aa0b852955e9254e7d0fbf7d8b URL: http://source.winehq.org/git/wine.git/?a=commit;h=74a059d21b36b7aa0b852955e… Author: Paul Andrew Panon <ppanon(a)shaw.ca> Date: Mon Mar 1 10:31:00 2010 -0800 wined3d: Add Mesa ATI card detection code. --- dlls/wined3d/directx.c | 239 +++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 237 insertions(+), 2 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=74a059d21b36b7aa0b852…

1 0

Paul Andrew Panon : wined3d: Add a card detection table and refactor wined3d_guess_card.
by Alexandre Julliard March 3, 2010

March 3, 2010

Module: wine Branch: master Commit: 85b07b9d380a7caced3bb58f92150a096daa1427 URL: http://source.winehq.org/git/wine.git/?a=commit;h=85b07b9d380a7caced3bb58f9… Author: Paul Andrew Panon <ppanon(a)shaw.ca> Date: Mon Mar 1 10:29:32 2010 -0800 wined3d: Add a card detection table and refactor wined3d_guess_card. --- dlls/wined3d/directx.c | 895 +++++++++++++++++++++++++----------------------- 1 files changed, 468 insertions(+), 427 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=85b07b9d380a7caced3bb…

1 0

Paul Andrew Panon : wined3d: Adjust the quirks to use the new GL_VENDOR codes.
by Alexandre Julliard March 3, 2010

March 3, 2010

Module: wine Branch: master Commit: 1735b4ee92514c23a644de77135e5b99baebcb2b URL: http://source.winehq.org/git/wine.git/?a=commit;h=1735b4ee92514c23a644de771… Author: Paul Andrew Panon <ppanon(a)shaw.ca> Date: Tue Mar 2 23:16:28 2010 -0800 wined3d: Adjust the quirks to use the new GL_VENDOR codes. --- dlls/wined3d/directx.c | 37 ++++++++++++++++++------------------- 1 files changed, 18 insertions(+), 19 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index d3404ad..759e74c 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -483,7 +483,6 @@ static BOOL match_apple(const struct wined3d_gl_info *gl_info, const char *gl_re return FALSE; } - /* Context activation is done by the caller. */ static void test_pbo_functionality(struct wined3d_gl_info *gl_info) { @@ -556,13 +555,13 @@ static void test_pbo_functionality(struct wined3d_gl_info *gl_info) static BOOL match_apple_intel(const struct wined3d_gl_info *gl_info, const char *gl_renderer, enum wined3d_gl_vendor gl_vendor, enum wined3d_pci_vendor card_vendor, enum wined3d_pci_device device) { - return card_vendor == HW_VENDOR_INTEL && match_apple(gl_info, gl_renderer, gl_vendor, card_vendor, device); + return (card_vendor == HW_VENDOR_INTEL) && (gl_vendor == GL_VENDOR_APPLE); } static BOOL match_apple_nonr500ati(const struct wined3d_gl_info *gl_info, const char *gl_renderer, enum wined3d_gl_vendor gl_vendor, enum wined3d_pci_vendor card_vendor, enum wined3d_pci_device device) { - if (!match_apple(gl_info, gl_renderer, gl_vendor, card_vendor, device)) return FALSE; + if (gl_vendor != GL_VENDOR_APPLE) return FALSE; if (card_vendor != HW_VENDOR_ATI) return FALSE; if (device == CARD_ATI_RADEON_X1600) return FALSE; return TRUE; @@ -571,10 +570,8 @@ static BOOL match_apple_nonr500ati(const struct wined3d_gl_info *gl_info, const static BOOL match_fglrx(const struct wined3d_gl_info *gl_info, const char *gl_renderer, enum wined3d_gl_vendor gl_vendor, enum wined3d_pci_vendor card_vendor, enum wined3d_pci_device device) { - if (card_vendor != HW_VENDOR_ATI) return FALSE; - if (match_apple(gl_info, gl_renderer, gl_vendor, card_vendor, device)) return FALSE; - if (strstr(gl_renderer, "DRI")) return FALSE; /* Filter out Mesa DRI drivers. */ - return TRUE; + return (gl_vendor == GL_VENDOR_ATI); + } static BOOL match_dx10_capable(const struct wined3d_gl_info *gl_info, const char *gl_renderer, @@ -907,7 +904,7 @@ static const struct driver_quirk quirk_table[] = */ struct driver_version_information { - WORD card_vendor; /* reported PCI card vendor ID */ + WORD vendor; /* reported PCI card vendor ID */ WORD card; /* reported PCI card device ID */ const char *description; /* Description of the card e.g. NVIDIA RIVA TNT */ WORD d3d_level; /* driver hiword to report */ @@ -972,7 +969,7 @@ static const struct driver_version_information driver_version_table[] = }; static void init_driver_info(struct wined3d_driver_info *driver_info, - enum wined3d_pci_vendor card_vendor, enum wined3d_pci_device device) + enum wined3d_pci_vendor vendor, enum wined3d_pci_device device) { OSVERSIONINFOW os_version; WORD driver_os_version; @@ -981,9 +978,9 @@ static void init_driver_info(struct wined3d_driver_info *driver_info, if (wined3d_settings.pci_vendor_id != PCI_VENDOR_NONE) { TRACE_(d3d_caps)("Overriding PCI vendor ID with: %04x\n", wined3d_settings.pci_vendor_id); - card_vendor = wined3d_settings.pci_vendor_id; + vendor = wined3d_settings.pci_vendor_id; } - driver_info->vendor = card_vendor; + driver_info->vendor = vendor; if (wined3d_settings.pci_device_id != PCI_DEVICE_NONE) { @@ -992,7 +989,7 @@ static void init_driver_info(struct wined3d_driver_info *driver_info, } driver_info->device = device; - switch (card_vendor) + switch (vendor) { case HW_VENDOR_ATI: driver_info->name = "ati2dvag.dll"; @@ -1002,8 +999,9 @@ static void init_driver_info(struct wined3d_driver_info *driver_info, driver_info->name = "nv4_disp.dll"; break; + case HW_VENDOR_INTEL: default: - FIXME_(d3d_caps)("Unhandled card vendor %04x.\n", card_vendor); + FIXME_(d3d_caps)("Unhandled vendor %04x.\n", vendor); driver_info->name = "Display"; break; } @@ -1058,9 +1056,9 @@ static void init_driver_info(struct wined3d_driver_info *driver_info, for (i = 0; i < (sizeof(driver_version_table) / sizeof(driver_version_table[0])); ++i) { - if (card_vendor == driver_version_table[i].card_vendor && device == driver_version_table[i].card) + if (vendor == driver_version_table[i].vendor && device == driver_version_table[i].card) { - TRACE_(d3d_caps)("Found card %04x:%04x in driver DB.\n", card_vendor, device); + TRACE_(d3d_caps)("Found card %04x:%04x in driver DB.\n", vendor, device); driver_info->description = driver_version_table[i].description; driver_info->version_high = MAKEDWORD_VERSION(driver_os_version, driver_version_table[i].d3d_level); @@ -1171,13 +1169,14 @@ static enum wined3d_pci_vendor wined3d_guess_card_vendor(const char *gl_vendor_s || strstr(gl_vendor_string, "VMware, Inc.")) return HW_VENDOR_WINE; - FIXME_(d3d_caps)("Received unrecognized GL_VENDOR %s. Returning HW_VENDOR_WINE.\n", debugstr_a(gl_vendor_string)); + FIXME_(d3d_caps)("Received unrecognized GL_VENDOR %s. Returning HW_VENDOR_NVIDIA.\n", debugstr_a(gl_vendor_string)); - return HW_VENDOR_WINE; + return HW_VENDOR_NVIDIA; } + static enum wined3d_pci_device wined3d_guess_card(const struct wined3d_gl_info *gl_info, const char *gl_renderer, - enum wined3d_pci_vendor *card_vendor, unsigned int *vidmem) + enum wined3d_gl_vendor *gl_vendor, enum wined3d_pci_vendor *card_vendor, unsigned int *vidmem) { /* Below is a list of Nvidia and ATI GPUs. Both vendors have dozens of * different GPUs with roughly the same features. In most cases GPUs from a @@ -2213,7 +2212,7 @@ static BOOL IWineD3DImpl_FillGLCaps(struct wined3d_adapter *adapter) card_vendor = wined3d_guess_card_vendor(gl_string, gl_renderer); TRACE_(d3d_caps)("found GL_VENDOR (%s)->(0x%04x/0x%04x)\n", debugstr_a(gl_string), gl_vendor, card_vendor); - device = wined3d_guess_card(gl_info, gl_renderer, &card_vendor, &vidmem); + device = wined3d_guess_card(gl_info, gl_renderer, &gl_vendor, &card_vendor, &vidmem); TRACE_(d3d_caps)("FOUND (fake) card: 0x%x (vendor id), 0x%x (device id)\n", card_vendor, device); /* If we have an estimate use it, else default to 64MB; */

1 0

Paul Andrew Panon : wined3d: Add a real GL vendor detection.
by Alexandre Julliard March 3, 2010

March 3, 2010

Module: wine Branch: master Commit: 7a9734dc68b609606fd69911bc1c62275207b92e URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a9734dc68b609606fd69911b… Author: Paul Andrew Panon <ppanon(a)shaw.ca> Date: Tue Mar 2 23:16:26 2010 -0800 wined3d: Add a real GL vendor detection. --- dlls/wined3d/directx.c | 110 +++++++++++++++++++++++++++------------ dlls/wined3d/wined3d_private.h | 20 ++++++-- 2 files changed, 91 insertions(+), 39 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7a9734dc68b609606fd69…

1 0

Paul Andrew Panon : wined3d: Rename GL_VENDOR to HW_VENDOR.
by Alexandre Julliard March 3, 2010

March 3, 2010

Module: wine Branch: master Commit: 31573b21b9d4601ab5def1d54fd59442000fbb63 URL: http://source.winehq.org/git/wine.git/?a=commit;h=31573b21b9d4601ab5def1d54… Author: Paul Andrew Panon <ppanon(a)shaw.ca> Date: Mon Mar 1 10:26:04 2010 -0800 wined3d: Rename GL_VENDOR to HW_VENDOR. --- dlls/wined3d/directx.c | 210 ++++++++++++++++++++-------------------- dlls/wined3d/utils.c | 2 +- dlls/wined3d/wined3d_private.h | 10 +- 3 files changed, 111 insertions(+), 111 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=31573b21b9d4601ab5def…

1 0