January 2008 - Wine-commits

Alexander Nicolaysen Sørnes : application_queue: Guard against unitialized variables
by Chris Morgan 22 Jan '08

22 Jan '08

Module: appdb Branch: master Commit: 03b614fd1003642a1c6d4e3b3391a123d4d2dd8f URL: http://source.winehq.org/git/appdb.git/?a=commit;h=03b614fd1003642a1c6d4e3b… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Wed Jan 23 00:31:24 2008 +0100 application_queue: Guard against unitialized variables --- include/application_queue.php | 8 +++----- 1 files changed, 3 insertions(+), 5 deletions(-) diff --git a/include/application_queue.php b/include/application_queue.php index 06533d8..82c8383 100644 --- a/include/application_queue.php +++ b/include/application_queue.php @@ -14,6 +14,9 @@ class application_queue { $this->oApp = new application($iAppId, $oRow); + $iVersionId = null; + $iVendorId = null; + /* If this is an existing application then there must be a version accompanying it */ if($this->oApp->iAppId) @@ -36,11 +39,6 @@ class application_queue } $iVendorId = $this->oApp->iVendorId; } - else - { - $iVersionId = null; - $iVendorId = null; - } $this->oVendor = new vendor($iVendorId);

1 0

Alexander Nicolaysen Sørnes : Fix downloadurl::unqueue()
by Chris Morgan 22 Jan '08

22 Jan '08

Module: appdb Branch: master Commit: 2f3657f19600f7020d3a4485747605ebbad9c62d URL: http://source.winehq.org/git/appdb.git/?a=commit;h=2f3657f19600f7020d3a4485… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Tue Jan 22 22:10:09 2008 +0100 Fix downloadurl::unqueue() --- include/downloadurl.php | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/downloadurl.php b/include/downloadurl.php index 6ffce94..c4346ef 100644 --- a/include/downloadurl.php +++ b/include/downloadurl.php @@ -384,12 +384,12 @@ class downloadurl function unQueue() { - if(!$this->canEdit($this->iVersionId)) + if($this->mustBeQueued()) return FALSE; - $hResult = query_parameters("UPDATE appData SET queued = '?' + $hResult = query_parameters("UPDATE appData SET state = '?' WHERE id = '?'", - "false", $this->iId); + 'accepted', $this->iId); if(!$hResult) return FALSE;

1 0

Alexander Nicolaysen Sørnes : Fix bug link processing
by Chris Morgan 22 Jan '08

22 Jan '08

Module: appdb Branch: master Commit: 3e7ce62dde98e24d54e7a531c60c2fc90af7b1cf URL: http://source.winehq.org/git/appdb.git/?a=commit;h=3e7ce62dde98e24d54e7a531… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Tue Jan 22 15:47:40 2008 +0100 Fix bug link processing --- include/bugs.php | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/bugs.php b/include/bugs.php index fce1755..34cdd5d 100644 --- a/include/bugs.php +++ b/include/bugs.php @@ -175,8 +175,8 @@ class Bug if(!$this->bQueued) return false; - if(query_parameters("UPDATE buglinks SET queued = '?' WHERE linkId='?'", - "false", $this->iLinkId)) + if(query_parameters("UPDATE buglinks SET state = '?' WHERE linkId='?'", + 'accepted', $this->iLinkId)) { $this->bQueued = false; // we send an e-mail to interested people

1 0

Jeremy Newman : Replace WINE with Wine
by Jeremy Newman 22 Jan '08

22 Jan '08

Module: website Branch: master Commit: 926adfead2bf2d995570d82a201d26f6e3af0ee7 URL: http://source.winehq.org/git/website.git/?a=commit;h=926adfead2bf2d995570d8… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Tue Jan 22 09:26:04 2008 -0600 Replace WINE with Wine --- wwn/wn20080121_340.xml | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/wwn/wn20080121_340.xml b/wwn/wn20080121_340.xml index abb0bc6..71297e9 100644 --- a/wwn/wn20080121_340.xml +++ b/wwn/wn20080121_340.xml @@ -77,8 +77,8 @@ Its main goal is to inform the public of weekly wine updates. It also serves to </stats> <section - title="Theming WINE" - subject="WINE" + title="Theming Wine" + subject="Wine" archive="http://tombuntu.com/index.php/2008/01/04/stop-wine-from-beating-your-window…" posts="0" > @@ -125,7 +125,7 @@ Additionally, from my initial observations it does not appear to be able to gene posts="12" > <topic>Tests</topic> -Dan Kegel brings up a valid point that WINE 1.0 should really have no test failures on linux (<a href="http://bugs.winehq.org/show_bug.cgi?id=9916">bug 9916</a>). +Dan Kegel brings up a valid point that Wine 1.0 should really have no test failures on linux (<a href="http://bugs.winehq.org/show_bug.cgi?id=9916">bug 9916</a>). <quote> On my machine, we've been hovering between @@ -145,7 +145,7 @@ the current six odd failures down and cleaning them up? </quote> -I responded mentioning also that <a href="http://test.winehq.org/data/200801121000/">the tests on windows</a> have many more than 5 failures. However, Dan's point that clearing out the problems with WINE should take precedence. +I responded mentioning also that <a href="http://test.winehq.org/data/200801121000/">the tests on windows</a> have many more than 5 failures. However, Dan's point that clearing out the problems with Wine should take precedence. Reece Dunn: <quote> @@ -161,7 +161,7 @@ that will then be the baseline for Wine. This should not cause regressions on other versions of Windows. </quote> -And now the topic of setting the default version of windows in WINE to windows XP comes up. Dan Kegel: +And now the topic of setting the default version of windows in Wine to windows XP comes up. Dan Kegel: <quote> Yep. And at some point we should indeed make Windows XP @@ -240,7 +240,7 @@ definitely want to enable them again. > <topic>Third Party Applications</topic> -Tom Wickline has had a chance to <a href="http://wine-review.blogspot.com/2008/01/playonlinux.html">review</a> one of <a href="http://wiki.winehq.org/ThirdPartyApplications">many third party applications</a> for WINE, <a href="http://www.playonlinux.com/en">PlayOnLinux</a>. From the PlayOnLinux site: +Tom Wickline has had a chance to <a href="http://wine-review.blogspot.com/2008/01/playonlinux.html">review</a> one of <a href="http://wiki.winehq.org/ThirdPartyApplications">many third party applications</a> for Wine, <a href="http://www.playonlinux.com/en">PlayOnLinux</a>. From the PlayOnLinux site: <quote> @@ -293,7 +293,7 @@ To sum it up, POL is a promising frontend installer for Windows and Dos programs > <topic>wmvcore.dll</topic> -wmvcore.dll (responsible for wma/wmv playback and authoring) may be about to get a local WINE implementation. Dan Kegel suspects its time it be done: +wmvcore.dll (responsible for wma/wmv playback and authoring) may be about to get a local Wine implementation. Dan Kegel suspects its time it be done: <quote> @@ -514,7 +514,7 @@ While the following statistics are still meaningful, (perhaps even moreso than o <center>AppDB Application Status Changes</center> *Disclaimer: These lists of changes are automatically generated by information entered into the AppDB. These results are subject to the opinions of the users submitting application reviews. -The WINE community does not guarantee that even though an application may be upgraded to 'Gold' or 'Platinum' in this list, that you +The Wine community does not guarantee that even though an application may be upgraded to 'Gold' or 'Platinum' in this list, that you will have the same experience and would provide a similar rating. <div align="center"> Updates by App Maintainers

1 0

Zachary Goldberg : WWN 340
by Jeremy Newman 22 Jan '08

22 Jan '08

Module: website Branch: master Commit: 3856b463aff4a0ca857561317369a3d78b7930ca URL: http://source.winehq.org/git/website.git/?a=commit;h=3856b463aff4a0ca857561… Author: Zachary Goldberg <zgs(a)seas.upenn.edu> Date: Mon Jan 21 19:42:03 2008 -0500 WWN 340 Something funky is going on in wine 0.9.53 -- the app stats look a bit worse than usual. --- news/2008012101.xml | 7 + wwn/wn20080121_340.xml | 1045 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 1052 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/website.git/?a=commitdiff;h=3856b463aff4a0ca85…

1 0

Eric Pouech : msvcrt: symbol undecoration: Really check that we get a template string before making use of it.
by Alexandre Julliard 22 Jan '08

22 Jan '08

Module: wine Branch: master Commit: 0920f8e7780ae9b495c9e254d8d529578f5c60e1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0920f8e7780ae9b495c9e254d… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Mon Jan 21 22:06:11 2008 +0100 msvcrt: symbol undecoration: Really check that we get a template string before making use of it. --- dlls/msvcrt/tests/cpp.c | 1 + dlls/msvcrt/undname.c | 13 ++++++++----- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/dlls/msvcrt/tests/cpp.c b/dlls/msvcrt/tests/cpp.c index 85544c0..2788a56 100644 --- a/dlls/msvcrt/tests/cpp.c +++ b/dlls/msvcrt/tests/cpp.c @@ -984,6 +984,7 @@ static void test_demangle(void) {"?$AAA@$DBAB@", "AAA<`template-parameter257'>"}, {"?$AAA@$D?4@", "AAA<`template-parameter-5'>"}, {"?$AAA(a)PAUBBB@@", "AAA<struct BBB *>"}, +{"??$ccccc(a)PAVaaa@@@bar(a)bb@foo@@DGPAV0(a)PAV0@PAVee@@IPAPAVaaa@@1(a)Z", "private: static class bar * __stdcall foo::bb::bar::ccccc<class aaa *>(class bar *,class ee *,unsigned int,class aaa **,class ee *)"}, }; int i, num_test = (sizeof(test)/sizeof(test[0])); char* name; diff --git a/dlls/msvcrt/undname.c b/dlls/msvcrt/undname.c index d88cf79..dfc2241 100644 --- a/dlls/msvcrt/undname.c +++ b/dlls/msvcrt/undname.c @@ -538,8 +538,8 @@ static BOOL get_class(struct parsed_symbol* sym) if (*++sym->current == '$') { sym->current++; - name = get_template_name(sym); - str_array_push(sym, name, -1, &sym->names); + if ((name = get_template_name(sym))) + str_array_push(sym, name, -1, &sym->names); } break; default: @@ -1292,17 +1292,17 @@ static BOOL symbol_demangle(struct parsed_symbol* sym) str_array_push(sym, function_name, -1, &sym->stack); break; } - sym->stack.start = 1; } else if (*sym->current == '$') { /* Strange construct, it's a name with a template argument list and that's all. */ sym->current++; - sym->result = get_template_name(sym); - ret = TRUE; + ret = (sym->result = get_template_name(sym)) != NULL; goto done; } + else if (*sym->current == '?' && sym->current[1] == '$') + do_after = 5; /* Either a class name, or '@' if the symbol is not a class member */ switch (*sym->current) @@ -1331,6 +1331,9 @@ static BOOL symbol_demangle(struct parsed_symbol* sym) case 3: sym->flags &= ~UNDNAME_NO_FUNCTION_RETURNS; break; + case 5: + sym->names.start = 1; + break; } /* Function/Data type and access level */

1 0

Eric Pouech : ntdll: Fixed getting the RTS status from line, and now using sane default values for all (compilation/system) cases.
by Alexandre Julliard 22 Jan '08

22 Jan '08

Module: wine Branch: master Commit: 2ea3dd12b13814cd9643c4216d817bf8488275a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ea3dd12b13814cd9643c4216… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Mon Jan 21 21:45:18 2008 +0100 ntdll: Fixed getting the RTS status from line, and now using sane default values for all (compilation/system) cases. --- dlls/ntdll/serial.c | 21 +++++++++++++-------- 1 files changed, 13 insertions(+), 8 deletions(-) diff --git a/dlls/ntdll/serial.c b/dlls/ntdll/serial.c index 6866b95..c54d706 100644 --- a/dlls/ntdll/serial.c +++ b/dlls/ntdll/serial.c @@ -188,24 +188,29 @@ static NTSTATUS get_baud_rate(int fd, SERIAL_BAUD_RATE* sbr) static NTSTATUS get_hand_flow(int fd, SERIAL_HANDFLOW* shf) { - int stat; + int stat = 0; struct termios port; - + if (tcgetattr(fd, &port) == -1) { ERR("tcgetattr error '%s'\n", strerror(errno)); return FILE_GetNtStatus(); } + /* termios does not support DTR/DSR flow control */ + shf->ControlHandShake = 0; + shf->FlowReplace = 0; #ifdef TIOCMGET if (ioctl(fd, TIOCMGET, &stat) == -1) { WARN("ioctl error '%s'\n", strerror(errno)); - stat = DTR_CONTROL_ENABLE | RTS_CONTROL_ENABLE; + shf->ControlHandShake |= SERIAL_DTR_CONTROL; + shf->FlowReplace |= SERIAL_RTS_CONTROL; } +#else + WARN("Setting DTR/RTS to enabled by default\n"); + shf->ControlHandShake |= SERIAL_DTR_CONTROL; + shf->FlowReplace |= SERIAL_RTS_CONTROL; #endif - /* termios does not support DTR/DSR flow control */ - shf->ControlHandShake = 0; - shf->FlowReplace = 0; #ifdef TIOCM_DTR if (stat & TIOCM_DTR) #endif @@ -213,7 +218,7 @@ static NTSTATUS get_hand_flow(int fd, SERIAL_HANDFLOW* shf) #ifdef CRTSCTS if (port.c_cflag & CRTSCTS) { - shf->ControlHandShake |= SERIAL_DTR_CONTROL | SERIAL_DTR_HANDSHAKE; + shf->FlowReplace |= SERIAL_RTS_CONTROL; shf->ControlHandShake |= SERIAL_CTS_HANDSHAKE; } else @@ -222,7 +227,7 @@ static NTSTATUS get_hand_flow(int fd, SERIAL_HANDFLOW* shf) #ifdef TIOCM_RTS if (stat & TIOCM_RTS) #endif - shf->ControlHandShake |= SERIAL_RTS_CONTROL; + shf->FlowReplace |= SERIAL_RTS_CONTROL; } if (port.c_iflag & IXOFF) shf->FlowReplace |= SERIAL_AUTO_RECEIVE;

1 0

Eric Pouech : msvcrt: symbol undecoration: Added support for RTTI types.
by Alexandre Julliard 22 Jan '08

22 Jan '08

Module: wine Branch: master Commit: 95cff6c8f9073556a154007138d7b17410a5110e URL: http://source.winehq.org/git/wine.git/?a=commit;h=95cff6c8f9073556a15400713… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Mon Jan 21 22:06:05 2008 +0100 msvcrt: symbol undecoration: Added support for RTTI types. --- dlls/msvcrt/undname.c | 45 ++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 44 insertions(+), 1 deletions(-) diff --git a/dlls/msvcrt/undname.c b/dlls/msvcrt/undname.c index 16466dd..d88cf79 100644 --- a/dlls/msvcrt/undname.c +++ b/dlls/msvcrt/undname.c @@ -952,9 +952,14 @@ static BOOL handle_data(struct parsed_symbol* sym) ct.right = str_printf(sym, "{for `%s'}", cls); } break; + case '8': + case '9': + modifier = ct.left = ct.right = NULL; + break; default: goto done; } if (sym->flags & UNDNAME_NAME_ONLY) ct.left = ct.right = modifier = NULL; + sym->result = str_printf(sym, "%s%s%s%s%s%s%s%s", access, member_type, ct.left, modifier && ct.left ? " " : NULL, modifier, @@ -1218,6 +1223,44 @@ static BOOL symbol_demangle(struct parsed_symbol* sym) case 'M': function_name = "`eh vector destructor iterator'"; break; case 'N': function_name = "`eh vector vbase constructor iterator'"; break; case 'O': function_name = "`copy constructor closure'"; break; + case 'R': + sym->flags |= UNDNAME_NO_FUNCTION_RETURNS; + switch (*++sym->current) + { + case '0': + { + struct datatype_t ct; + struct array pmt; + + sym->current++; + str_array_init(&pmt); + demangle_datatype(sym, &ct, &pmt, FALSE); + function_name = str_printf(sym, "%s%s `RTTI Type Descriptor'", + ct.left, ct.right); + sym->current--; + } + break; + case '1': + { + const char* n1, *n2, *n3, *n4; + sym->current++; + n1 = get_number(sym); + n2 = get_number(sym); + n3 = get_number(sym); + n4 = get_number(sym); + sym->current--; + function_name = str_printf(sym, "`RTTI Base Class Descriptor at (%s,%s,%s,%s)'", + n1, n2, n3, n4); + } + break; + case '2': function_name = "`RTTI Base Class Array'"; break; + case '3': function_name = "`RTTI Class Hierarchy Descriptor'"; break; + case '4': function_name = "`RTTI Complete Object Locator'"; break; + default: + ERR("Unknown RTTI operator: _R%c\n", *sym->current); + break; + } + break; case 'S': function_name = "`local vftable'"; break; case 'T': function_name = "`local vftable constructor closure'"; break; case 'U': function_name = "operator new[]"; break; @@ -1291,7 +1334,7 @@ static BOOL symbol_demangle(struct parsed_symbol* sym) } /* Function/Data type and access level */ - if (*sym->current >= '0' && *sym->current <= '7') + if (*sym->current >= '0' && *sym->current <= '9') ret = handle_data(sym); else if (*sym->current >= 'A' && *sym->current <= 'Z') ret = handle_method(sym, do_after == 3);

1 0

Marcus Meissner : wined3d: Initialize swapchain.
by Alexandre Julliard 22 Jan '08

22 Jan '08

Module: wine Branch: master Commit: 755d806f1a4d9e3d7041dc60e97a0d93892ee4af URL: http://source.winehq.org/git/wine.git/?a=commit;h=755d806f1a4d9e3d7041dc60e… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Tue Jan 22 09:27:00 2008 +0100 wined3d: Initialize swapchain. --- dlls/wined3d/device.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 4580c14..8d4dfd7 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2003,7 +2003,7 @@ static void IWineD3DDeviceImpl_LoadLogo(IWineD3DDeviceImpl *This, const char *fi static HRESULT WINAPI IWineD3DDeviceImpl_Init3D(IWineD3DDevice *iface, WINED3DPRESENT_PARAMETERS* pPresentationParameters, D3DCB_CREATEADDITIONALSWAPCHAIN D3DCB_CreateAdditionalSwapChain) { IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *) iface; - IWineD3DSwapChainImpl *swapchain; + IWineD3DSwapChainImpl *swapchain = NULL; HRESULT hr; DWORD state; @@ -2141,7 +2141,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_Init3D(IWineD3DDevice *iface, WINED3DPR } return WINED3D_OK; - err_out: +err_out: HeapFree(GetProcessHeap(), 0, This->render_targets); HeapFree(GetProcessHeap(), 0, This->fbo_color_attachments); HeapFree(GetProcessHeap(), 0, This->draw_buffers);

1 0

Eric Pouech : msvcrt: symbol undecoration: Added support for thunks.
by Alexandre Julliard 22 Jan '08

22 Jan '08

Module: wine Branch: master Commit: 49ac014d28db395a3f734f6b7763ab4a5b8e5749 URL: http://source.winehq.org/git/wine.git/?a=commit;h=49ac014d28db395a3f734f6b7… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Mon Jan 21 22:05:59 2008 +0100 msvcrt: symbol undecoration: Added support for thunks. --- dlls/msvcrt/undname.c | 13 +++++++++---- 1 files changed, 9 insertions(+), 4 deletions(-) diff --git a/dlls/msvcrt/undname.c b/dlls/msvcrt/undname.c index f83d998..16466dd 100644 --- a/dlls/msvcrt/undname.c +++ b/dlls/msvcrt/undname.c @@ -1012,7 +1012,6 @@ static BOOL handle_method(struct parsed_symbol* sym, BOOL cast_op) * 'Y' * 'Z' */ - accmem = *sym->current++; if (accmem < 'A' || accmem > 'Z') goto done; @@ -1033,11 +1032,19 @@ static BOOL handle_method(struct parsed_symbol* sym, BOOL cast_op) { case 2: case 3: member_type = "static "; break; case 4: case 5: member_type = "virtual "; break; - case 6: case 7: member_type = "thunk "; break; + case 6: case 7: + access = str_printf(sym, "[thunk]:%s", access); + member_type = "virtual "; + break; } } } + name = get_class_string(sym, 0); + + if ((accmem - 'A') % 8 == 6 || (accmem - '8') % 8 == 7) /* a thunk */ + name = str_printf(sym, "%s`adjustor{%s}' ", name, get_number(sym)); + if (accmem <= 'X') { if (((accmem - 'A') % 8) != 2 && ((accmem - 'A') % 8) != 3) @@ -1049,8 +1056,6 @@ static BOOL handle_method(struct parsed_symbol* sym, BOOL cast_op) } } - name = get_class_string(sym, 0); - if (!get_calling_convention(*sym->current++, &call_conv, &exported, sym->flags)) goto done;

1 0