December 2005 - Wine-commits

H. Verbeet : wined3d: return D3DERR_INVALIDCALL when calling BeginStateBlock and
by Alexandre Julliard 03 Dec '05

03 Dec '05

Module: wine Branch: refs/heads/master Commit: 4880c586d8013e7271c744f581eb19905d90e0f0 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=4880c586d8013e7271c744f… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Sat Dec 3 18:04:26 2005 +0100 wined3d: return D3DERR_INVALIDCALL when calling BeginStateBlock and already recording. --- dlls/wined3d/device.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 9b8dc5c..185bca7 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4493,6 +4493,11 @@ HRESULT WINAPI IWineD3DDeviceImpl_BeginS IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; IWineD3DStateBlockImpl *object; TRACE("(%p)", This); + + if (This->isRecordingState) { + return D3DERR_INVALIDCALL; + } + object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IWineD3DStateBlockImpl)); if (NULL == object ) { FIXME("(%p)Error allocating memory for stateblock\n", This);

1 0

Eric Pouech : winedbg: simplify some code.
by Alexandre Julliard 03 Dec '05

03 Dec '05

Module: wine Branch: refs/heads/master Commit: 56dcea4d16e6ca85f0330c85cb66a1991ff39408 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=56dcea4d16e6ca85f0330c8… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Sat Dec 3 18:09:59 2005 +0100 winedbg: simplify some code. --- programs/winedbg/symbol.c | 10 +++------- 1 files changed, 3 insertions(+), 7 deletions(-) diff --git a/programs/winedbg/symbol.c b/programs/winedbg/symbol.c index 1118fc0..61ef3dc 100644 --- a/programs/winedbg/symbol.c +++ b/programs/winedbg/symbol.c @@ -432,11 +432,10 @@ enum dbg_line_status symbol_get_function { IMAGEHLP_LINE il; DWORD disp; - ULONG64 disp64, start, size; + ULONG64 disp64, start; DWORD lin = (DWORD)memory_to_linear_addr(addr); char buffer[sizeof(SYMBOL_INFO) + 256]; SYMBOL_INFO* sym = (SYMBOL_INFO*)buffer; - struct dbg_type type; il.SizeOfStruct = sizeof(il); sym->SizeOfStruct = sizeof(SYMBOL_INFO); @@ -466,11 +465,8 @@ enum dbg_line_status symbol_get_function if (symbol_get_debug_start(sym->ModBase, sym->TypeIndex, &start) && lin < start) return dbg_not_on_a_line_number; - type.module = sym->ModBase; - type.id = sym->TypeIndex; - if (!types_get_info(&type, TI_GET_LENGTH, &size) || size == 0) - size = 0x100000; - if (il.FileName && il.FileName[0] && disp < size) + if (!sym->Size) sym->Size = 0x100000; + if (il.FileName && il.FileName[0] && disp < sym->Size) return (disp == 0) ? dbg_on_a_line_number : dbg_not_on_a_line_number; return dbg_no_line_info;

1 0

Robert Shearman : wininet: Correctly set the last error when a called Unix network
by Alexandre Julliard 03 Dec '05

03 Dec '05

Module: wine Branch: refs/heads/master Commit: efd067f2c36b118add41e2566a6957a5cdc5c5df URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=efd067f2c36b118add41e25… Author: Robert Shearman <rob(a)codeweavers.com> Date: Sat Dec 3 18:10:14 2005 +0100 wininet: Correctly set the last error when a called Unix network function fails. --- dlls/wininet/http.c | 5 -- dlls/wininet/internet.c | 2 + dlls/wininet/netconnection.c | 86 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 87 insertions(+), 6 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 23affbc..f234530 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -38,8 +38,6 @@ #ifdef HAVE_UNISTD_H # include <unistd.h> #endif -#include <errno.h> -#include <string.h> #include <time.h> #include <assert.h> @@ -2237,10 +2235,7 @@ static BOOL HTTP_OpenConnection(LPWININE if (!NETCON_connect(&lpwhr->netConnection, (struct sockaddr *)&lpwhs->socketAddress, sizeof(lpwhs->socketAddress))) - { - WARN("Unable to connect to host (%s)\n", strerror(errno)); goto lend; - } if (lpwhr->hdr.dwFlags & INTERNET_FLAG_SECURE) { diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index d3e84bb..b91c9ff 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -2965,6 +2965,8 @@ void INTERNET_SetLastError(DWORD dwError DWORD INTERNET_GetLastError(void) { LPWITHREADERROR lpwite = (LPWITHREADERROR)TlsGetValue(g_dwTlsErrIndex); + /* TlsGetValue clears last error, so set it again here */ + SetLastError(lpwite->dwError); return lpwite->dwError; } diff --git a/dlls/wininet/netconnection.c b/dlls/wininet/netconnection.c index 05c6562..3c13818 100644 --- a/dlls/wininet/netconnection.c +++ b/dlls/wininet/netconnection.c @@ -43,6 +43,11 @@ #include "wininet.h" #include "winerror.h" +/* To avoid conflicts with the Unix socket headers. we only need it for + * the error codes anyway. */ +#define USE_WS_PREFIX +#include "winsock2.h" + #include "wine/debug.h" #include "internet.h" @@ -192,6 +197,70 @@ BOOL NETCON_connected(WININET_NETCONNECT return TRUE; } +/* translate a unix error code into a winsock one */ +static int sock_get_error( int err ) +{ + switch (err) + { + case EINTR: return WSAEINTR; + case EBADF: return WSAEBADF; + case EPERM: + case EACCES: return WSAEACCES; + case EFAULT: return WSAEFAULT; + case EINVAL: return WSAEINVAL; + case EMFILE: return WSAEMFILE; + case EWOULDBLOCK: return WSAEWOULDBLOCK; + case EINPROGRESS: return WSAEINPROGRESS; + case EALREADY: return WSAEALREADY; + case ENOTSOCK: return WSAENOTSOCK; + case EDESTADDRREQ: return WSAEDESTADDRREQ; + case EMSGSIZE: return WSAEMSGSIZE; + case EPROTOTYPE: return WSAEPROTOTYPE; + case ENOPROTOOPT: return WSAENOPROTOOPT; + case EPROTONOSUPPORT: return WSAEPROTONOSUPPORT; + case ESOCKTNOSUPPORT: return WSAESOCKTNOSUPPORT; + case EOPNOTSUPP: return WSAEOPNOTSUPP; + case EPFNOSUPPORT: return WSAEPFNOSUPPORT; + case EAFNOSUPPORT: return WSAEAFNOSUPPORT; + case EADDRINUSE: return WSAEADDRINUSE; + case EADDRNOTAVAIL: return WSAEADDRNOTAVAIL; + case ENETDOWN: return WSAENETDOWN; + case ENETUNREACH: return WSAENETUNREACH; + case ENETRESET: return WSAENETRESET; + case ECONNABORTED: return WSAECONNABORTED; + case EPIPE: + case ECONNRESET: return WSAECONNRESET; + case ENOBUFS: return WSAENOBUFS; + case EISCONN: return WSAEISCONN; + case ENOTCONN: return WSAENOTCONN; + case ESHUTDOWN: return WSAESHUTDOWN; + case ETOOMANYREFS: return WSAETOOMANYREFS; + case ETIMEDOUT: return WSAETIMEDOUT; + case ECONNREFUSED: return WSAECONNREFUSED; + case ELOOP: return WSAELOOP; + case ENAMETOOLONG: return WSAENAMETOOLONG; + case EHOSTDOWN: return WSAEHOSTDOWN; + case EHOSTUNREACH: return WSAEHOSTUNREACH; + case ENOTEMPTY: return WSAENOTEMPTY; +#ifdef EPROCLIM + case EPROCLIM: return WSAEPROCLIM; +#endif +#ifdef EUSERS + case EUSERS: return WSAEUSERS; +#endif +#ifdef EDQUOT + case EDQUOT: return WSAEDQUOT; +#endif +#ifdef ESTALE + case ESTALE: return WSAESTALE; +#endif +#ifdef EREMOTE + case EREMOTE: return WSAEREMOTE; +#endif + default: errno=err; perror("sock_set_error"); return WSAEFAULT; + } +} + /****************************************************************************** * NETCON_create * Basically calls 'socket()' @@ -206,7 +275,10 @@ BOOL NETCON_create(WININET_NETCONNECTION connection->socketFD = socket(domain, type, protocol); if (connection->socketFD == -1) + { + INTERNET_SetLastError(sock_get_error(errno)); return FALSE; + } return TRUE; } @@ -239,7 +311,10 @@ BOOL NETCON_close(WININET_NETCONNECTION connection->socketFD = -1; if (result == -1) + { + INTERNET_SetLastError(sock_get_error(errno)); return FALSE; + } return TRUE; } @@ -358,6 +433,9 @@ BOOL NETCON_connect(WININET_NETCONNECTIO result = connect(connection->socketFD, serv_addr, addrlen); if (result == -1) { + WARN("Unable to connect to host (%s)\n", strerror(errno)); + INTERNET_SetLastError(sock_get_error(errno)); + closesocket(connection->socketFD); connection->socketFD = -1; return FALSE; @@ -379,7 +457,10 @@ BOOL NETCON_send(WININET_NETCONNECTION * { *sent = send(connection->socketFD, msg, len, flags); if (*sent == -1) + { + INTERNET_SetLastError(sock_get_error(errno)); return FALSE; + } return TRUE; } else @@ -410,7 +491,10 @@ BOOL NETCON_recv(WININET_NETCONNECTION * { *recvd = recv(connection->socketFD, buf, len, flags); if (*recvd == -1) + { + INTERNET_SetLastError(sock_get_error(errno)); return FALSE; + } return TRUE; } else @@ -498,7 +582,7 @@ BOOL NETCON_getNextLine(WININET_NETCONNE { if (recv(connection->socketFD, &lpszBuffer[nRecv], 1, 0) <= 0) { - INTERNET_SetLastError(ERROR_CONNECTION_ABORTED); /* fixme: right error? */ + INTERNET_SetLastError(sock_get_error(errno)); goto lend; }

1 0

Robert Shearman : OLE: Move the dispinterface return value handling to functions that
by Alexandre Julliard 03 Dec '05

03 Dec '05

Module: wine Branch: refs/heads/master Commit: d48f6f36827dc12fd194fce6bc2c7b786fcb7b69 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=d48f6f36827dc12fd194fce… Author: Robert Shearman <rob(a)codeweavers.com> Date: Sat Dec 3 18:10:30 2005 +0100 OLE: Move the dispinterface return value handling to functions that return the FUNCDESC to the user. --- dlls/oleaut32/typelib.c | 76 +++++++++++++++++++++++++---------------------- 1 files changed, 41 insertions(+), 35 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 32c2780..8e37ea9 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -1863,38 +1863,6 @@ MSFT_DoFuncs(TLBContext* pcx, } } - /* special treatment for dispinterfaces: this makes functions appear - * to return their [retval] value when it is really returning an - * HRESULT */ - if ((pTI->TypeAttr.typekind == TKIND_DISPATCH) && - (*pptfd)->funcdesc.elemdescFunc.tdesc.vt == VT_HRESULT) - { - if (pFuncRec->nrargs && - ((*pptfd)->funcdesc.lprgelemdescParam[pFuncRec->nrargs - 1].u.paramdesc.wParamFlags & PARAMFLAG_FRETVAL)) - { - ELEMDESC *elemdesc = &(*pptfd)->funcdesc.lprgelemdescParam[pFuncRec->nrargs - 1]; - if (elemdesc->tdesc.vt != VT_PTR) - { - ERR_(typelib)("elemdesc should have started with VT_PTR instead of:\n"); - if (ERR_ON(typelib)) - dump_ELEMDESC(elemdesc); - /* FIXME: return error */ - break; - } - - (*pptfd)->funcdesc.elemdescFunc = *elemdesc; - - /* dereference parameter */ - (*pptfd)->funcdesc.elemdescFunc.tdesc = *elemdesc->tdesc.u.lptdesc; - - pFuncRec->nrargs--; - (*pptfd)->funcdesc.cParams = pFuncRec->nrargs; - } - else - (*pptfd)->funcdesc.elemdescFunc.tdesc.vt = VT_VOID; - - } - /* scode is not used: archaic win16 stuff FIXME: right? */ (*pptfd)->funcdesc.cScodes = 0 ; (*pptfd)->funcdesc.lprgscode = NULL ; @@ -4403,7 +4371,7 @@ static void TLB_FreeElemDesc( ELEMDESC * VariantClear(&elemdesc->u.paramdesc.pparamdescex->varDefaultValue); } -static HRESULT TLB_AllocAndInitFuncDesc( const FUNCDESC *src, FUNCDESC **dest_ptr ) +static HRESULT TLB_AllocAndInitFuncDesc( const FUNCDESC *src, FUNCDESC **dest_ptr, BOOL dispinterface ) { FUNCDESC *dest; char *buffer; @@ -4454,6 +4422,38 @@ static HRESULT TLB_AllocAndInitFuncDesc( return hr; } + /* special treatment for dispinterfaces: this makes functions appear + * to return their [retval] value when it is really returning an + * HRESULT */ + if (dispinterface && dest->elemdescFunc.tdesc.vt == VT_HRESULT) + { + if (dest->cParams && + (dest->lprgelemdescParam[dest->cParams - 1].u.paramdesc.wParamFlags & PARAMFLAG_FRETVAL)) + { + ELEMDESC *elemdesc = &dest->lprgelemdescParam[dest->cParams - 1]; + if (elemdesc->tdesc.vt != VT_PTR) + { + ERR("elemdesc should have started with VT_PTR instead of:\n"); + if (ERR_ON(ole)) + dump_ELEMDESC(elemdesc); + return E_UNEXPECTED; + } + + /* copy last parameter to the return value. we are using a flat + * buffer so there is no danger of leaking memory in + * elemdescFunc */ + dest->elemdescFunc.tdesc = *elemdesc->tdesc.u.lptdesc; + + /* remove the last parameter */ + dest->cParams--; + } + else + /* otherwise this function is made to appear to have no return + * value */ + dest->elemdescFunc.tdesc.vt = VT_VOID; + + } + *dest_ptr = dest; return S_OK; } @@ -4477,7 +4477,10 @@ static HRESULT WINAPI ITypeInfo_fnGetFun ; if(pFDesc) - return TLB_AllocAndInitFuncDesc(&pFDesc->funcdesc, ppFuncDesc); + return TLB_AllocAndInitFuncDesc( + &pFDesc->funcdesc, + ppFuncDesc, + This->TypeAttr.typekind == TKIND_DISPATCH); return E_INVALIDARG; } @@ -6362,7 +6365,10 @@ static HRESULT WINAPI ITypeComp_fnBind( if (pFDesc) { - HRESULT hr = TLB_AllocAndInitFuncDesc(&pFDesc->funcdesc, &pBindPtr->lpfuncdesc); + HRESULT hr = TLB_AllocAndInitFuncDesc( + &pFDesc->funcdesc, + &pBindPtr->lpfuncdesc, + This->TypeAttr.typekind == TKIND_DISPATCH); if (FAILED(hr)) return hr; *pDescKind = DESCKIND_FUNCDESC;

1 0

Pavel Roskin : Fixed regression in wineconsole creation (curses backend).
by Alexandre Julliard 03 Dec '05

03 Dec '05

Module: wine Branch: refs/heads/master Commit: 2b1747ccda3b303a07402d821e06c7f7314dc6f1 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=2b1747ccda3b303a07402d8… Author: Pavel Roskin <proski at gnu.org> Date: Sat Dec 3 18:04:07 2005 +0100 Fixed regression in wineconsole creation (curses backend). --- programs/wineconsole/wineconsole.c | 16 +++++++--------- 1 files changed, 7 insertions(+), 9 deletions(-) diff --git a/programs/wineconsole/wineconsole.c b/programs/wineconsole/wineconsole.c index 486d86d..d73dc96 100644 --- a/programs/wineconsole/wineconsole.c +++ b/programs/wineconsole/wineconsole.c @@ -290,17 +290,13 @@ int WINECON_GrabChanges(struct inner_dat break; case CONSOLE_RENDERER_SB_RESIZE_EVENT: if (data->curcfg.sb_width != evts[i].u.resize.width || - data->curcfg.sb_height != evts[i].u.resize.height || !data->cells) + data->curcfg.sb_height != evts[i].u.resize.height) { WINE_TRACE(" resize(%d,%d)", evts[i].u.resize.width, evts[i].u.resize.height); data->curcfg.sb_width = evts[i].u.resize.width; data->curcfg.sb_height = evts[i].u.resize.height; - if (data->cells) - data->cells = HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, data->cells, - data->curcfg.sb_width * data->curcfg.sb_height * sizeof(CHAR_INFO)); - else - data->cells = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, + data->cells = HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, data->cells, data->curcfg.sb_width * data->curcfg.sb_height * sizeof(CHAR_INFO)); if (!data->cells) WINECON_Fatal("OOM\n"); @@ -557,9 +553,6 @@ static BOOL WINECON_GetServerConfig(stru } SERVER_END_REQ; WINECON_DumpConfig("first cfg: ", &data->curcfg); - data->cells = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, - data->curcfg.sb_width * data->curcfg.sb_height * sizeof(CHAR_INFO)); - if (!data->cells) WINECON_Fatal("OOM\n"); return ret; } @@ -655,6 +648,11 @@ static struct inner_data* WINECON_Init(H { case init_success: WINECON_GetServerConfig(data); + data->cells = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, + data->curcfg.sb_width * data->curcfg.sb_height * sizeof(CHAR_INFO)); + if (!data->cells) WINECON_Fatal("OOM\n"); + data->fnResizeScreenBuffer(data); + data->fnComputePositions(data); WINECON_SetConfig(data, &cfg); data->curcfg.registry = cfg.registry; WINECON_DumpConfig("fint", &data->curcfg);

1 0

Vincent Béron : winapi_check: fully descend in included files to check for prototype.
by Alexandre Julliard 03 Dec '05

03 Dec '05

Module: wine Branch: refs/heads/master Commit: 18c5a0a2a0153ef22f40d90d25ba7a8172910758 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=18c5a0a2a0153ef22f40d90… Author: Vincent Béron <vberon(a)mecano.gme.usherb.ca> Date: Sat Dec 3 18:03:50 2005 +0100 winapi_check: fully descend in included files to check for prototype. --- tools/winapi/winapi_check | 17 +++++++++++++---- 1 files changed, 13 insertions(+), 4 deletions(-) diff --git a/tools/winapi/winapi_check b/tools/winapi/winapi_check index 8ad0550..1ef85dd 100755 --- a/tools/winapi/winapi_check +++ b/tools/winapi/winapi_check @@ -498,6 +498,18 @@ foreach my $file (@c_files) { my $type = shift; }; + sub recursive_include { + my $include = shift; + my $includes = shift; + + if(!defined($includes->{$include})) { + $includes->{$include}++; + foreach my $include (keys(%{$include2info{$include}{includes}})) { + recursive_include($include, \%$includes); + } + } + }; + my $preprocessor = 'preprocessor'->new($found_include, $found_conditional); my $found_preprocessor = sub { my $directive = shift; @@ -545,10 +557,7 @@ foreach my $file (@c_files) { } if(defined($include)) { - $includes{$include}++; - foreach my $include (keys(%{$include2info{$include}{includes}})) { - $includes{$include}++; - } + recursive_include($include, \%includes); } }

1 0

Robert Shearman : wininet: global function/data cleanup
by Alexandre Julliard 03 Dec '05

03 Dec '05

Module: wine Branch: refs/heads/master Commit: 067f09604ad69d2c41a2bc78a3c3308f60ce3d51 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=067f09604ad69d2c41a2bc7… Author: Robert Shearman <rob(a)codeweavers.com> Date: Sat Dec 3 18:03:08 2005 +0100 wininet: global function/data cleanup Make some functions and a structure static since they are only used in one file. --- dlls/wininet/ftp.c | 82 +++++++++++++++++----------------- dlls/wininet/http.c | 2 - dlls/wininet/internet.c | 114 ++++++++++++++++++++++++----------------------- dlls/wininet/internet.h | 2 - 4 files changed, 99 insertions(+), 101 deletions(-)

1 0

Robert Shearman : OLE: fix handling of INVOKE_PROPERTYGET flag in ITypeComp_fnBind.
by Alexandre Julliard 03 Dec '05

03 Dec '05

Module: wine Branch: refs/heads/master Commit: a61e4e802ce05e9aa9380ec2547fe98016efd1ca URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=a61e4e802ce05e9aa9380ec… Author: Robert Shearman <rob(a)codeweavers.com> Date: Sat Dec 3 18:03:29 2005 +0100 OLE: fix handling of INVOKE_PROPERTYGET flag in ITypeComp_fnBind. The INVOKE_PROPERTYGET flag shouldn't affect binding to variables; it should just affect which of a pair of [propget] and [propput] functions should be returned. --- dlls/oleaut32/typelib.c | 21 +++++++++------------ 1 files changed, 9 insertions(+), 12 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 09c6fd7..32c2780 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -6370,18 +6370,15 @@ static HRESULT WINAPI ITypeComp_fnBind( ITypeInfo_AddRef(*ppTInfo); return S_OK; } else { - if (!(wFlags & ~(INVOKE_PROPERTYGET))) - { - for(pVDesc = This->varlist; pVDesc; pVDesc = pVDesc->next) { - if (!strcmpW(pVDesc->Name, szName)) { - HRESULT hr = TLB_AllocAndInitVarDesc(&pVDesc->vardesc, &pBindPtr->lpvardesc); - if (FAILED(hr)) - return hr; - *pDescKind = DESCKIND_VARDESC; - *ppTInfo = (ITypeInfo *)&This->lpVtbl; - ITypeInfo_AddRef(*ppTInfo); - return S_OK; - } + for(pVDesc = This->varlist; pVDesc; pVDesc = pVDesc->next) { + if (!strcmpW(pVDesc->Name, szName)) { + HRESULT hr = TLB_AllocAndInitVarDesc(&pVDesc->vardesc, &pBindPtr->lpvardesc); + if (FAILED(hr)) + return hr; + *pDescKind = DESCKIND_VARDESC; + *ppTInfo = (ITypeInfo *)&This->lpVtbl; + ITypeInfo_AddRef(*ppTInfo); + return S_OK; } } }

1 0

Aric Cyr : Move standard WGL function declarations to wingdi.h.
by Alexandre Julliard 03 Dec '05

03 Dec '05

Module: wine Branch: refs/heads/master Commit: d0713d28e2b264d0aa719b765c5f4aa439a0d775 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=d0713d28e2b264d0aa719b7… Author: Aric Cyr <aric.cyr(a)gmail.com> Date: Sat Dec 3 18:01:51 2005 +0100 Move standard WGL function declarations to wingdi.h. dlls/opengl32/wgl.h is now empty and no longer needed. --- dlls/opengl32/wgl.c | 4 +- dlls/opengl32/wgl.h | 77 ----------------------------------------------- dlls/opengl32/wgl_ext.c | 7 ++++ include/wingdi.h | 18 +++++++++++ 4 files changed, 26 insertions(+), 80 deletions(-) delete mode 100644 dlls/opengl32/wgl.h diff --git a/dlls/opengl32/wgl.c b/dlls/opengl32/wgl.c index 812e9aa..e35680d 100644 --- a/dlls/opengl32/wgl.c +++ b/dlls/opengl32/wgl.c @@ -30,8 +30,8 @@ #include "winuser.h" #include "winerror.h" #include "winreg.h" +#include "wingdi.h" -#include "wgl.h" #include "wgl_ext.h" #include "opengl_ext.h" #include "wine/library.h" @@ -360,7 +360,7 @@ static int wgl_compar(const void *elt_a, ((const WGL_extension *) elt_b)->func_name); } -void* WINAPI wglGetProcAddress(LPCSTR lpszProc) { +PROC WINAPI wglGetProcAddress(LPCSTR lpszProc) { void *local_func; OpenGL_extension ext; OpenGL_extension *ext_ret; diff --git a/dlls/opengl32/wgl.h b/dlls/opengl32/wgl.h deleted file mode 100644 index a363c34..0000000 --- a/dlls/opengl32/wgl.h +++ /dev/null @@ -1,77 +0,0 @@ -/* Window-specific OpenGL functions implementation. - * - * Copyright (c) 2000 Lionel Ulmer - * Copyright (c) 2005 Raphael Junqueira - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#ifndef __DLLS_OPENGL32_WGL_H -#define __DLLS_OPENGL32_WGL_H - -#include "wingdi.h" - -HGLRC WINAPI wglCreateContext(HDC hdc) ; -HGLRC WINAPI wglCreateLayerContext(HDC hdc, - int iLayerPlane) ; -BOOL WINAPI wglCopyContext(HGLRC hglrcSrc, - HGLRC hglrcDst, - UINT mask) ; -BOOL WINAPI wglDeleteContext(HGLRC hglrc) ; -BOOL WINAPI wglDescribeLayerPlane(HDC hdc, - int iPixelFormat, - int iLayerPlane, - UINT nBytes, - LPLAYERPLANEDESCRIPTOR plpd) ; -HGLRC WINAPI wglGetCurrentContext(void) ; -HDC WINAPI wglGetCurrentDC(void) ; -int WINAPI wglGetLayerPaletteEntries(HDC hdc, - int iLayerPlane, - int iStart, - int cEntries, - const COLORREF *pcr) ; -void * WINAPI wglGetProcAddress(LPCSTR lpszProc) ; -BOOL WINAPI wglMakeCurrent(HDC hdc, - HGLRC hglrc) ; -BOOL WINAPI wglRealizeLayerPalette(HDC hdc, - int iLayerPlane, - BOOL bRealize) ; -int WINAPI wglSetLayerPaletteEntries(HDC hdc, - int iLayerPlane, - int iStart, - int cEntries, - const COLORREF *pcr) ; -BOOL WINAPI wglShareLists(HGLRC hglrc1, - HGLRC hglrc2) ; -BOOL WINAPI wglSwapLayerBuffers(HDC hdc, - UINT fuPlanes); -BOOL WINAPI wglUseFontBitmaps(HDC hdc, - DWORD first, - DWORD count, - DWORD listBase) ; -BOOL WINAPI wglUseFontOutlines(HDC hdc, - DWORD first, - DWORD count, - DWORD listBase, - FLOAT deviation, - FLOAT extrusion, - int format, - LPGLYPHMETRICSFLOAT lpgmf) ; -const char * WINAPI wglGetExtensionsStringARB(HDC hdc) ; - -BOOL WINAPI wglMakeContextCurrentARB(HDC hDrawDC, HDC hReadDC, HGLRC hglrc); -HDC WINAPI wglGetCurrentReadDCARB(void) ; - -#endif /* __DLLS_OPENGL32_WGL_H */ diff --git a/dlls/opengl32/wgl_ext.c b/dlls/opengl32/wgl_ext.c index c4bc6cb..b323d7c 100644 --- a/dlls/opengl32/wgl_ext.c +++ b/dlls/opengl32/wgl_ext.c @@ -32,7 +32,6 @@ #include "winerror.h" #include "gdi.h" -#include "wgl.h" #include "wgl_ext.h" #include "opengl_ext.h" #include "wine/library.h" @@ -1120,6 +1119,12 @@ void wgl_ext_finalize_extensions(void) } } + +/* these are located in wgl.c for convenience of implementation */ +BOOL WINAPI wglMakeContextCurrentARB(HDC,HDC,HGLRC); +HDC WINAPI wglGetCurrentReadDCARB(void); + + /* * Putting this at the end to prevent having to write the prototypes :-) * diff --git a/include/wingdi.h b/include/wingdi.h index 89b1d07..032efbb 100644 --- a/include/wingdi.h +++ b/include/wingdi.h @@ -3678,6 +3678,24 @@ BOOL WINAPI PolyTextOutW(HDC,PPOLYT #define WGL_SWAP_UNDERLAY14 (1 << 29) #define WGL_SWAP_UNDERLAY15 (1 << 30) +/* WGL prototypes */ +HGLRC WINAPI wglCreateContext(HDC); +HGLRC WINAPI wglCreateLayerContext(HDC,INT); +BOOL WINAPI wglCopyContext(HGLRC,HGLRC,UINT); +BOOL WINAPI wglDeleteContext(HGLRC); +BOOL WINAPI wglDescribeLayerPlane(HDC,INT,INT,UINT,LPLAYERPLANEDESCRIPTOR); +HGLRC WINAPI wglGetCurrentContext(void); +HDC WINAPI wglGetCurrentDC(void); +INT WINAPI wglGetLayerPaletteEntries(HDC,INT,INT,INT,const COLORREF *); +PROC WINAPI wglGetProcAddress(LPCSTR); +BOOL WINAPI wglMakeCurrent(HDC,HGLRC); +BOOL WINAPI wglRealizeLayerPalette(HDC,INT,BOOL); +INT WINAPI wglSetLayerPaletteEntries(HDC,INT,INT,INT,const COLORREF *); +BOOL WINAPI wglShareLists(HGLRC,HGLRC); +BOOL WINAPI wglSwapLayerBuffers(HDC,UINT); +BOOL WINAPI wglUseFontBitmaps(HDC,DWORD,DWORD,DWORD); +BOOL WINAPI wglUseFontOutlines(HDC,DWORD,DWORD,DWORD,FLOAT,FLOAT,INT,LPGLYPHMETRICSFLOAT); + #ifdef __cplusplus } #endif

1 0

Aric Stewart : wcmd: mkdir recursive create
by Alexandre Julliard 03 Dec '05

03 Dec '05

Module: wine Branch: refs/heads/master Commit: 1d5adff0f1216f9930762c00cdb44d1e16e73836 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=1d5adff0f1216f9930762c0… Author: Aric Stewart <aric(a)codeweavers.com> Date: Sat Dec 3 18:02:15 2005 +0100 wcmd: mkdir recursive create In at least both win2k and winxp mkdir from the command prompt can recursively create full directory paths. This implements that functionality. --- programs/wcmd/builtins.c | 49 +++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 48 insertions(+), 1 deletions(-) diff --git a/programs/wcmd/builtins.c b/programs/wcmd/builtins.c index 5652089..a47bc0a 100644 --- a/programs/wcmd/builtins.c +++ b/programs/wcmd/builtins.c @@ -150,11 +150,58 @@ char string[8], outpath[MAX_PATH], inpat * WCMD_create_dir * * Create a directory. + * + * this works recursivly. so mkdir dir1\dir2\dir3 will create dir1 and dir2 if + * they do not already exist. */ +BOOL create_full_path(CHAR* path) +{ + int len; + CHAR *new_path; + BOOL ret = TRUE; + + new_path = HeapAlloc(GetProcessHeap(),0,strlen(path)+1); + strcpy(new_path,path); + + while ((len = strlen(new_path)) && new_path[len - 1] == '\\') + new_path[len - 1] = 0; + + while (!CreateDirectory(new_path,NULL)) + { + CHAR *slash; + DWORD last_error = GetLastError(); + if (last_error == ERROR_ALREADY_EXISTS) + break; + + if (last_error != ERROR_PATH_NOT_FOUND) + { + ret = FALSE; + break; + } + + if (!(slash = strrchr(new_path,'\\')) && ! (slash = strrchr(new_path,'/'))) + { + ret = FALSE; + break; + } + + len = slash - new_path; + new_path[len] = 0; + if (!create_full_path(new_path)) + { + ret = FALSE; + break; + } + new_path[len] = '\\'; + } + HeapFree(GetProcessHeap(),0,new_path); + return ret; +} + void WCMD_create_dir (void) { - if (!CreateDirectory (param1, NULL)) WCMD_print_error (); + if (!create_full_path(param1)) WCMD_print_error (); } /****************************************************************************

1 0