October 2008 - Wine-Commits

Rob Shearman : inetcomm: Add an implementation of ISMTPTransport2:: CommandRCPT.
by Alexandre Julliard Oct. 31, 2008

Oct. 31, 2008

Module: wine Branch: master Commit: f36c80a99b5a13addc85fcb2fdbc498cfbec70b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f36c80a99b5a13addc85fcb2f… Author: Rob Shearman <rob(a)codeweavers.com> Date: Fri Oct 31 13:51:02 2008 +0100 inetcomm: Add an implementation of ISMTPTransport2::CommandRCPT. --- dlls/inetcomm/smtptransport.c | 61 +++++++++++++++++++++++++++++++++++++++- 1 files changed, 59 insertions(+), 2 deletions(-) diff --git a/dlls/inetcomm/smtptransport.c b/dlls/inetcomm/smtptransport.c index 37c1671..42db262 100644 --- a/dlls/inetcomm/smtptransport.c +++ b/dlls/inetcomm/smtptransport.c @@ -144,6 +144,43 @@ static void SMTPTransport_CallbackReadMAILResponse(IInternetTransport *iface, ch InternetTransport_ReadLine(&This->InetTransport, SMTPTransport_CallbackProcessMAILResponse); } +static void SMTPTransport_CallbackProcessRCPTResponse(IInternetTransport *iface, char *pBuffer, int cbBuffer) +{ + SMTPTransport *This = (SMTPTransport *)iface; + SMTPRESPONSE response = { 0 }; + HRESULT hr; + + TRACE("\n"); + + HeapFree(GetProcessHeap(), 0, This->addrlist); + This->addrlist = NULL; + + hr = SMTPTransport_ParseResponse(This, pBuffer, &response); + if (FAILED(hr)) + { + /* FIXME: handle error */ + return; + } + + response.command = SMTP_RCPT; + ISMTPCallback_OnResponse((ISMTPCallback *)This->InetTransport.pCallback, &response); + + if (FAILED(response.rIxpResult.hrServerError)) + { + ERR("server error: %s\n", debugstr_a(pBuffer)); + /* FIXME: handle error */ + return; + } +} + +static void SMTPTransport_CallbackReadRCPTResponse(IInternetTransport *iface, char *pBuffer, int cbBuffer) +{ + SMTPTransport *This = (SMTPTransport *)iface; + + TRACE("\n"); + InternetTransport_ReadLine(&This->InetTransport, SMTPTransport_CallbackProcessRCPTResponse); +} + static void SMTPTransport_CallbackProcessHelloResp(IInternetTransport *iface, char *pBuffer, int cbBuffer) { SMTPTransport *This = (SMTPTransport *)iface; @@ -671,8 +708,28 @@ static HRESULT WINAPI SMTPTransport_CommandMAIL(ISMTPTransport2 *iface, LPSTR ps static HRESULT WINAPI SMTPTransport_CommandRCPT(ISMTPTransport2 *iface, LPSTR pszEmailTo) { - FIXME("(%s)\n", pszEmailTo); - return E_NOTIMPL; + SMTPTransport *This = (SMTPTransport *)iface; + const char szCommandFormat[] = "RCPT TO: <%s>\n"; + char *szCommand; + int len = sizeof(szCommandFormat) - 2 /* "%s" */ + strlen(pszEmailTo); + HRESULT hr; + + TRACE("(%s)\n", pszEmailTo); + + if (!pszEmailTo) + return E_INVALIDARG; + + szCommand = HeapAlloc(GetProcessHeap(), 0, len); + if (!szCommand) + return E_OUTOFMEMORY; + + sprintf(szCommand, szCommandFormat, pszEmailTo); + + hr = InternetTransport_DoCommand(&This->InetTransport, szCommand, + SMTPTransport_CallbackReadRCPTResponse); + + HeapFree(GetProcessHeap(), 0, szCommand); + return hr; } static HRESULT WINAPI SMTPTransport_CommandEHLO(ISMTPTransport2 *iface)

1 0

Rob Shearman : inetcomm: Add an implementation of ISMTPTransport2:: CommandMAIL.
by Alexandre Julliard Oct. 31, 2008

Oct. 31, 2008

Module: wine Branch: master Commit: 91c60c0cab7d2f29524e08e84776ed2c1246ea1b URL: http://source.winehq.org/git/wine.git/?a=commit;h=91c60c0cab7d2f29524e08e84… Author: Rob Shearman <rob(a)codeweavers.com> Date: Fri Oct 31 13:50:40 2008 +0100 inetcomm: Add an implementation of ISMTPTransport2::CommandMAIL. --- dlls/inetcomm/smtptransport.c | 60 +++++++++++++++++++++++++++++++++++++++- 1 files changed, 58 insertions(+), 2 deletions(-) diff --git a/dlls/inetcomm/smtptransport.c b/dlls/inetcomm/smtptransport.c index c32321e..37c1671 100644 --- a/dlls/inetcomm/smtptransport.c +++ b/dlls/inetcomm/smtptransport.c @@ -110,6 +110,40 @@ static HRESULT SMTPTransport_ParseResponse(SMTPTransport *This, char *pszRespons return S_OK; } +static void SMTPTransport_CallbackProcessMAILResponse(IInternetTransport *iface, char *pBuffer, int cbBuffer) +{ + SMTPTransport *This = (SMTPTransport *)iface; + SMTPRESPONSE response = { 0 }; + HRESULT hr; + + TRACE("\n"); + + hr = SMTPTransport_ParseResponse(This, pBuffer, &response); + if (FAILED(hr)) + { + /* FIXME: handle error */ + return; + } + + response.command = SMTP_MAIL; + ISMTPCallback_OnResponse((ISMTPCallback *)This->InetTransport.pCallback, &response); + + if (FAILED(response.rIxpResult.hrServerError)) + { + ERR("server error: %s\n", debugstr_a(pBuffer)); + /* FIXME: handle error */ + return; + } +} + +static void SMTPTransport_CallbackReadMAILResponse(IInternetTransport *iface, char *pBuffer, int cbBuffer) +{ + SMTPTransport *This = (SMTPTransport *)iface; + + TRACE("\n"); + InternetTransport_ReadLine(&This->InetTransport, SMTPTransport_CallbackProcessMAILResponse); +} + static void SMTPTransport_CallbackProcessHelloResp(IInternetTransport *iface, char *pBuffer, int cbBuffer) { SMTPTransport *This = (SMTPTransport *)iface; @@ -485,6 +519,8 @@ static HRESULT WINAPI SMTPTransport_Connect(ISMTPTransport2 *iface, TRACE("(%p, %s, %s)\n", pInetServer, fAuthenticate ? "TRUE" : "FALSE", fCommandLogging ? "TRUE" : "FALSE"); hr = InternetTransport_Connect(&This->InetTransport, pInetServer, fAuthenticate, fCommandLogging); + if (FAILED(hr)) + return hr; /* this starts the state machine, which continues in SMTPTransport_CallbackSendHELO */ return InternetTransport_ReadLine(&This->InetTransport, SMTPTransport_CallbackSendHello); @@ -609,8 +645,28 @@ static HRESULT WINAPI SMTPTransport_SendMessage(ISMTPTransport2 *iface, static HRESULT WINAPI SMTPTransport_CommandMAIL(ISMTPTransport2 *iface, LPSTR pszEmailFrom) { - FIXME("(%s)\n", pszEmailFrom); - return E_NOTIMPL; + SMTPTransport *This = (SMTPTransport *)iface; + const char szCommandFormat[] = "MAIL FROM: <%s>\n"; + char *szCommand; + int len = sizeof(szCommandFormat) - 2 /* "%s" */ + strlen(pszEmailFrom); + HRESULT hr; + + TRACE("(%s)\n", pszEmailFrom); + + if (!pszEmailFrom) + return E_INVALIDARG; + + szCommand = HeapAlloc(GetProcessHeap(), 0, len); + if (!szCommand) + return E_OUTOFMEMORY; + + sprintf(szCommand, szCommandFormat, pszEmailFrom); + + hr = InternetTransport_DoCommand(&This->InetTransport, szCommand, + SMTPTransport_CallbackReadMAILResponse); + + HeapFree(GetProcessHeap(), 0, szCommand); + return hr; } static HRESULT WINAPI SMTPTransport_CommandRCPT(ISMTPTransport2 *iface, LPSTR pszEmailTo)

1 0

Rob Shearman : inetcomm: Add an implementation of ISMTPTransport2:: CommandQUIT.
by Alexandre Julliard Oct. 31, 2008

Oct. 31, 2008

Module: wine Branch: master Commit: fe56d3195feda1e961cdaaf4043196bc9cb386f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fe56d3195feda1e961cdaaf40… Author: Rob Shearman <rob(a)codeweavers.com> Date: Fri Oct 31 13:50:23 2008 +0100 inetcomm: Add an implementation of ISMTPTransport2::CommandQUIT. --- dlls/inetcomm/smtptransport.c | 40 ++++++++++++++++++++++++++++++++++++---- 1 files changed, 36 insertions(+), 4 deletions(-) diff --git a/dlls/inetcomm/smtptransport.c b/dlls/inetcomm/smtptransport.c index d7a3c30..c32321e 100644 --- a/dlls/inetcomm/smtptransport.c +++ b/dlls/inetcomm/smtptransport.c @@ -212,6 +212,33 @@ static void SMTPTransport_CallbackSendHello(IInternetTransport *iface, char *pBu HeapFree(GetProcessHeap(), 0, pszCommand); } +static void SMTPTransport_CallbackDisconnect(IInternetTransport *iface, char *pBuffer, int cbBuffer) +{ + SMTPTransport *This = (SMTPTransport *)iface; + SMTPRESPONSE response; + HRESULT hr; + + TRACE("\n"); + + if (pBuffer) + { + hr = SMTPTransport_ParseResponse(This, pBuffer, &response); + if (FAILED(hr)) + { + /* FIXME: handle error */ + return; + } + + if (FAILED(response.rIxpResult.hrServerError)) + { + ERR("server error: %s\n", debugstr_a(pBuffer)); + /* FIXME: handle error */ + return; + } + } + InternetTransport_DropConnection(&This->InetTransport); +} + static void SMTPTransport_CallbackMessageProcessResponse(IInternetTransport *iface, char *pBuffer, int cbBuffer) { SMTPTransport *This = (SMTPTransport *)iface; @@ -473,8 +500,8 @@ static HRESULT WINAPI SMTPTransport_HandsOffCallback(ISMTPTransport2 *iface) static HRESULT WINAPI SMTPTransport_Disconnect(ISMTPTransport2 *iface) { - FIXME("()\n"); - return E_NOTIMPL; + TRACE("()\n"); + return ISMTPTransport2_CommandQUIT(iface); } static HRESULT WINAPI SMTPTransport_DropConnection(ISMTPTransport2 *iface) @@ -613,8 +640,13 @@ static HRESULT WINAPI SMTPTransport_CommandAUTH(ISMTPTransport2 *iface, static HRESULT WINAPI SMTPTransport_CommandQUIT(ISMTPTransport2 *iface) { - FIXME("()\n"); - return E_NOTIMPL; + SMTPTransport *This = (SMTPTransport *)iface; + + TRACE("()\n"); + + InternetTransport_ChangeStatus(&This->InetTransport, IXP_DISCONNECTING); + return InternetTransport_DoCommand(&This->InetTransport, "QUIT\n", + SMTPTransport_CallbackDisconnect); } static HRESULT WINAPI SMTPTransport_CommandRSET(ISMTPTransport2 *iface)

1 0

Rob Shearman : inetcomm: Add an implementation of ISMTPTransport2:: SendMessage.
by Alexandre Julliard Oct. 31, 2008

Oct. 31, 2008

Module: wine Branch: master Commit: 01fcce49e13af2e879690913ab10fba11aead272 URL: http://source.winehq.org/git/wine.git/?a=commit;h=01fcce49e13af2e879690913a… Author: Rob Shearman <rob(a)codeweavers.com> Date: Fri Oct 31 13:50:08 2008 +0100 inetcomm: Add an implementation of ISMTPTransport2::SendMessage. --- dlls/inetcomm/inetcomm_private.h | 2 +- dlls/inetcomm/internettransport.c | 4 +- dlls/inetcomm/smtptransport.c | 231 ++++++++++++++++++++++++++++++++++++- 3 files changed, 232 insertions(+), 5 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=01fcce49e13af2e879690…

1 0

Alexandre Julliard : kernel32: Call build_envp in the parent process so that it can use the Win32 heap.
by Alexandre Julliard Oct. 31, 2008

Oct. 31, 2008

Module: wine Branch: master Commit: a4e688218c8a092b785f153525a1d841aaf6080a URL: http://source.winehq.org/git/wine.git/?a=commit;h=a4e688218c8a092b785f15352… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 31 14:55:33 2008 +0100 kernel32: Call build_envp in the parent process so that it can use the Win32 heap. --- dlls/kernel32/process.c | 61 +++++++++++++++++++++++++++------------------- 1 files changed, 36 insertions(+), 25 deletions(-) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 4524e65..dcf4ce8 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -1171,47 +1171,51 @@ static char **build_argv( const WCHAR *cmdlineW, int reserved ) /*********************************************************************** - * alloc_env_string - * - * Allocate an environment string; helper for build_envp - */ -static char *alloc_env_string( const char *name, const char *value ) -{ - char *ret = malloc( strlen(name) + strlen(value) + 1 ); - strcpy( ret, name ); - strcat( ret, value ); - return ret; -} - -/*********************************************************************** * build_envp * * Build the environment of a new child process. */ static char **build_envp( const WCHAR *envW ) { + static const char * const unix_vars[] = { "PATH", "TEMP", "TMP", "HOME" }; + const WCHAR *end; char **envp; char *env, *p; int count = 0, length; + unsigned int i; for (end = envW; *end; count++) end += strlenW(end) + 1; end++; length = WideCharToMultiByte( CP_UNIXCP, 0, envW, end - envW, NULL, 0, NULL, NULL ); - if (!(env = malloc( length ))) return NULL; + if (!(env = HeapAlloc( GetProcessHeap(), 0, length ))) return NULL; WideCharToMultiByte( CP_UNIXCP, 0, envW, end - envW, env, length, NULL, NULL ); - count += 4; + for (p = env; *p; p += strlen(p) + 1) + if (is_special_env_var( p )) length += 4; /* prefix it with "WINE" */ + + for (i = 0; i < sizeof(unix_vars)/sizeof(unix_vars[0]); i++) + { + if (!(p = getenv(unix_vars[i]))) continue; + length += strlen(unix_vars[i]) + strlen(p) + 2; + count++; + } - if ((envp = malloc( count * sizeof(*envp) ))) + if ((envp = HeapAlloc( GetProcessHeap(), 0, count * sizeof(*envp) + length ))) { char **envptr = envp; + char *dst = (char *)(envp + count); /* some variables must not be modified, so we get them directly from the unix env */ - if ((p = getenv("PATH"))) *envptr++ = alloc_env_string( "PATH=", p ); - if ((p = getenv("TEMP"))) *envptr++ = alloc_env_string( "TEMP=", p ); - if ((p = getenv("TMP"))) *envptr++ = alloc_env_string( "TMP=", p ); - if ((p = getenv("HOME"))) *envptr++ = alloc_env_string( "HOME=", p ); + for (i = 0; i < sizeof(unix_vars)/sizeof(unix_vars[0]); i++) + { + if (!(p = getenv(unix_vars[i]))) continue; + *envptr++ = strcpy( dst, unix_vars[i] ); + strcat( dst, "=" ); + strcat( dst, p ); + dst += strlen(dst) + 1; + } + /* now put the Windows environment strings */ for (p = env; *p; p += strlen(p) + 1) { @@ -1219,12 +1223,19 @@ static char **build_envp( const WCHAR *envW ) if (!strncmp( p, "WINEPRELOADRESERVE=", sizeof("WINEPRELOADRESERVE=")-1 )) continue; if (!strncmp( p, "WINESERVERSOCKET=", sizeof("WINESERVERSOCKET=")-1 )) continue; if (is_special_env_var( p )) /* prefix it with "WINE" */ - *envptr++ = alloc_env_string( "WINE", p ); + { + *envptr++ = strcpy( dst, "WINE" ); + strcat( dst, p ); + } else - *envptr++ = p; + { + *envptr++ = strcpy( dst, p ); + } + dst += strlen(dst) + 1; } *envptr = 0; } + HeapFree( GetProcessHeap(), 0, env ); return envp; } @@ -1239,7 +1250,7 @@ static int fork_and_exec( const char *filename, const WCHAR *cmdline, const WCHA { int fd[2], stdin_fd = -1, stdout_fd = -1; int pid, err; - char **argv; + char **argv, **envp; if (!env) env = GetEnvironmentStringsW(); @@ -1272,11 +1283,10 @@ static int fork_and_exec( const char *filename, const WCHAR *cmdline, const WCHA } argv = build_argv( cmdline, 0 ); + envp = build_envp( env ); if (!(pid = fork())) /* child */ { - char **envp = build_envp( env ); - close( fd[0] ); if (flags & (CREATE_NEW_PROCESS_GROUP | CREATE_NEW_CONSOLE | DETACHED_PROCESS)) @@ -1322,6 +1332,7 @@ static int fork_and_exec( const char *filename, const WCHAR *cmdline, const WCHA _exit(1); } HeapFree( GetProcessHeap(), 0, argv ); + HeapFree( GetProcessHeap(), 0, envp ); if (stdin_fd != -1) close( stdin_fd ); if (stdout_fd != -1) close( stdout_fd ); close( fd[1] );

1 0

Alexandre Julliard : kernel32: Call build_argv in the parent process so that it can use the Win32 heap.
by Alexandre Julliard Oct. 31, 2008

Oct. 31, 2008

Module: wine Branch: master Commit: da03d9355da4776a0eaf2da990b025f27ebbadad URL: http://source.winehq.org/git/wine.git/?a=commit;h=da03d9355da4776a0eaf2da99… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 31 14:02:04 2008 +0100 kernel32: Call build_argv in the parent process so that it can use the Win32 heap. --- dlls/kernel32/process.c | 22 ++++++++++++++++------ 1 files changed, 16 insertions(+), 6 deletions(-) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index c8aba47..4524e65 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -1074,7 +1074,7 @@ static char **build_argv( const WCHAR *cmdlineW, int reserved ) int in_quotes,bcount,len; len = WideCharToMultiByte( CP_UNIXCP, 0, cmdlineW, -1, NULL, 0, NULL, NULL ); - if (!(cmdline = malloc(len))) return NULL; + if (!(cmdline = HeapAlloc( GetProcessHeap(), 0, len ))) return NULL; WideCharToMultiByte( CP_UNIXCP, 0, cmdlineW, -1, cmdline, len, NULL, NULL ); argc=reserved+1; @@ -1106,11 +1106,14 @@ static char **build_argv( const WCHAR *cmdlineW, int reserved ) } s++; } - argv=malloc(argc*sizeof(*argv)); - if (!argv) + if (!(argv = HeapAlloc( GetProcessHeap(), 0, argc*sizeof(*argv) + len ))) + { + HeapFree( GetProcessHeap(), 0, cmdline ); return NULL; + } - arg=d=s=cmdline; + arg = d = s = (char *)(argv + argc); + memcpy( d, cmdline, len ); bcount=0; in_quotes=0; argc=reserved; @@ -1162,6 +1165,7 @@ static char **build_argv( const WCHAR *cmdlineW, int reserved ) } argv[argc]=NULL; + HeapFree( GetProcessHeap(), 0, cmdline ); return argv; } @@ -1235,6 +1239,7 @@ static int fork_and_exec( const char *filename, const WCHAR *cmdline, const WCHA { int fd[2], stdin_fd = -1, stdout_fd = -1; int pid, err; + char **argv; if (!env) env = GetEnvironmentStringsW(); @@ -1266,10 +1271,12 @@ static int fork_and_exec( const char *filename, const WCHAR *cmdline, const WCHA wine_server_handle_to_fd( hstdout, FILE_WRITE_DATA, &stdout_fd, NULL ); } + argv = build_argv( cmdline, 0 ); + if (!(pid = fork())) /* child */ { - char **argv = build_argv( cmdline, 0 ); char **envp = build_envp( env ); + close( fd[0] ); if (flags & (CREATE_NEW_PROCESS_GROUP | CREATE_NEW_CONSOLE | DETACHED_PROCESS)) @@ -1314,6 +1321,7 @@ static int fork_and_exec( const char *filename, const WCHAR *cmdline, const WCHA write( fd[1], &err, sizeof(err) ); _exit(1); } + HeapFree( GetProcessHeap(), 0, argv ); if (stdin_fd != -1) close( stdin_fd ); if (stdout_fd != -1) close( stdout_fd ); close( fd[1] ); @@ -1426,6 +1434,7 @@ static BOOL create_process( HANDLE hFile, LPCWSTR filename, LPWSTR cmd_line, LPW HANDLE process_info, hstdin, hstdout; WCHAR *env_end; char *winedebug = NULL; + char **argv; RTL_USER_PROCESS_PARAMETERS *params; int socketfd[2], stdin_fd = -1, stdout_fd = -1; pid_t pid; @@ -1524,11 +1533,11 @@ static BOOL create_process( HANDLE hFile, LPCWSTR filename, LPWSTR cmd_line, LPW if (hstdout) wine_server_handle_to_fd( hstdout, FILE_WRITE_DATA, &stdout_fd, NULL ); /* create the child process */ + argv = build_argv( cmd_line, 1 ); if (exec_only || !(pid = fork())) /* child */ { char preloader_reserve[64], socket_env[64]; - char **argv = build_argv( cmd_line, 1 ); if (flags & (CREATE_NEW_PROCESS_GROUP | CREATE_NEW_CONSOLE | DETACHED_PROCESS)) { @@ -1577,6 +1586,7 @@ static BOOL create_process( HANDLE hFile, LPCWSTR filename, LPWSTR cmd_line, LPW if (stdin_fd != -1) close( stdin_fd ); if (stdout_fd != -1) close( stdout_fd ); close( socketfd[0] ); + HeapFree( GetProcessHeap(), 0, argv ); HeapFree( GetProcessHeap(), 0, winedebug ); if (pid == -1) {

1 0

Huw Davies : ole32: Call the object's GetClassID if it's running.
by Alexandre Julliard Oct. 31, 2008

Oct. 31, 2008

Module: wine Branch: master Commit: 5937ddd403502c0224ac5c56ff5992384e840c02 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5937ddd403502c0224ac5c56f… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Oct 31 12:29:10 2008 +0000 ole32: Call the object's GetClassID if it's running. --- dlls/ole32/defaulthandler.c | 12 ++++++++++-- 1 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/ole32/defaulthandler.c b/dlls/ole32/defaulthandler.c index 833e6fd..6844ee8 100644 --- a/dlls/ole32/defaulthandler.c +++ b/dlls/ole32/defaulthandler.c @@ -1520,9 +1520,17 @@ static HRESULT WINAPI DefaultHandler_IPersistStorage_GetClassID( IPersistStorage* iface, CLSID* clsid) { - DefaultHandler *This = impl_from_IPersistStorage(iface); + DefaultHandler *This = impl_from_IPersistStorage(iface); + HRESULT hr; + + TRACE("(%p)->(%p)\n", iface, clsid); - return IPersistStorage_GetClassID(This->dataCache_PersistStg, clsid); + if(object_is_running(This)) + hr = IPersistStorage_GetClassID(This->pPSDelegate, clsid); + else + hr = IPersistStorage_GetClassID(This->dataCache_PersistStg, clsid); + + return hr; } /************************************************************************

1 0

Vitaly Perov : netapi32: Add stub for NetShareAdd.
by Alexandre Julliard Oct. 31, 2008

Oct. 31, 2008

Module: wine Branch: master Commit: 8d1d6a2822e6acbe2961f4bed30bf5ae23592064 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d1d6a2822e6acbe2961f4bed… Author: Vitaly Perov <vitperov(a)etersoft.ru> Date: Fri Oct 31 14:59:29 2008 +0300 netapi32: Add stub for NetShareAdd. --- dlls/netapi32/netapi32.spec | 2 +- dlls/netapi32/share.c | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletions(-) diff --git a/dlls/netapi32/netapi32.spec b/dlls/netapi32/netapi32.spec index a43703f..9a80252 100644 --- a/dlls/netapi32/netapi32.spec +++ b/dlls/netapi32/netapi32.spec @@ -188,7 +188,7 @@ @ stub NetSessionDel @ stdcall NetSessionEnum(wstr wstr wstr long ptr long ptr ptr ptr) @ stub NetSessionGetInfo -@ stub NetShareAdd +@ stdcall NetShareAdd(wstr long ptr ptr) @ stub NetShareCheck @ stdcall NetShareDel(wstr wstr long) @ stub NetShareDelSticky diff --git a/dlls/netapi32/share.c b/dlls/netapi32/share.c index 03f92bb..f19f732 100644 --- a/dlls/netapi32/share.c +++ b/dlls/netapi32/share.c @@ -103,3 +103,13 @@ NET_API_STATUS WINAPI NetShareGetInfo(LMSTR servername, LMSTR netname, debugstr_w(netname),level, bufptr); return NERR_NetNameNotFound; } + +/************************************************************ + * NetShareAdd (NETAPI32.@) + */ +NET_API_STATUS WINAPI NetShareAdd(LMSTR servername, + DWORD level, LPBYTE buf, LPDWORD parm_err) +{ + FIXME("Stub (%s %d %p %p)\n", debugstr_w(servername), level, buf, parm_err); + return ERROR_NOT_SUPPORTED; +}

1 0

Michael Stefaniuc : gdi32: Don't cast NULL.
by Alexandre Julliard Oct. 31, 2008

Oct. 31, 2008

Module: wine Branch: master Commit: 933ec96aa7f63749362b0cf1d1d3e75b48a92d76 URL: http://source.winehq.org/git/wine.git/?a=commit;h=933ec96aa7f63749362b0cf1d… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Oct 31 12:43:52 2008 +0100 gdi32: Don't cast NULL. --- dlls/gdi32/region.c | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/gdi32/region.c b/dlls/gdi32/region.c index bdb6efa..c18254b 100644 --- a/dlls/gdi32/region.c +++ b/dlls/gdi32/region.c @@ -2407,14 +2407,14 @@ static void REGION_InsertEdgeInET(EdgeTable *ET, EdgeTableEntry *ETE, return; } (*SLLBlock)->next = tmpSLLBlock; - tmpSLLBlock->next = (ScanLineListBlock *)NULL; + tmpSLLBlock->next = NULL; *SLLBlock = tmpSLLBlock; *iSLLBlock = 0; } pSLL = &((*SLLBlock)->SLLs[(*iSLLBlock)++]); pSLL->next = pPrevSLL->next; - pSLL->edgelist = (EdgeTableEntry *)NULL; + pSLL->edgelist = NULL; pPrevSLL->next = pSLL; } pSLL->scanline = scanline; @@ -2422,7 +2422,7 @@ static void REGION_InsertEdgeInET(EdgeTable *ET, EdgeTableEntry *ETE, /* * now insert the edge in the right bucket */ - prev = (EdgeTableEntry *)NULL; + prev = NULL; start = pSLL->edgelist; while (start && (start->bres.minor_axis < ETE->bres.minor_axis)) { @@ -2475,18 +2475,18 @@ static void REGION_CreateETandAET(const INT *Count, INT nbpolygons, /* * initialize the Active Edge Table */ - AET->next = (EdgeTableEntry *)NULL; - AET->back = (EdgeTableEntry *)NULL; - AET->nextWETE = (EdgeTableEntry *)NULL; + AET->next = NULL; + AET->back = NULL; + AET->nextWETE = NULL; AET->bres.minor_axis = SMALL_COORDINATE; /* * initialize the Edge Table. */ - ET->scanlines.next = (ScanLineList *)NULL; + ET->scanlines.next = NULL; ET->ymax = SMALL_COORDINATE; ET->ymin = LARGE_COORDINATE; - pSLLBlock->next = (ScanLineListBlock *)NULL; + pSLLBlock->next = NULL; EndPt = pts - 1; for(poly = 0; poly < nbpolygons; poly++) @@ -2610,7 +2610,7 @@ static void REGION_computeWAET(EdgeTableEntry *AET) register int inside = 1; register int isInside = 0; - AET->nextWETE = (EdgeTableEntry *)NULL; + AET->nextWETE = NULL; pWETE = AET; AET = AET->next; while (AET) @@ -2629,7 +2629,7 @@ static void REGION_computeWAET(EdgeTableEntry *AET) } AET = AET->next; } - pWETE->nextWETE = (EdgeTableEntry *)NULL; + pWETE->nextWETE = NULL; } /***********************************************************************

1 0

Frans Kool : oleacc: Added Dutch translations.
by Alexandre Julliard Oct. 31, 2008

Oct. 31, 2008

Module: wine Branch: master Commit: 169a4aaa6115c91f382c95d4790e82d8d41c985d URL: http://source.winehq.org/git/wine.git/?a=commit;h=169a4aaa6115c91f382c95d47… Author: Frans Kool <Frans.Kool(a)Gmail.com> Date: Fri Oct 31 12:04:31 2008 +0100 oleacc: Added Dutch translations. --- dlls/oleacc/oleacc.rc | 1 + dlls/oleacc/oleacc_Nl.rc | 90 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 91 insertions(+), 0 deletions(-) diff --git a/dlls/oleacc/oleacc.rc b/dlls/oleacc/oleacc.rc index 0795a9b..cdb91a9 100644 --- a/dlls/oleacc/oleacc.rc +++ b/dlls/oleacc/oleacc.rc @@ -22,3 +22,4 @@ #include "oleacc.h" #include "oleacc_En.rc" +#include "oleacc_Nl.rc" diff --git a/dlls/oleacc/oleacc_Nl.rc b/dlls/oleacc/oleacc_Nl.rc new file mode 100644 index 0000000..b639128 --- /dev/null +++ b/dlls/oleacc/oleacc_Nl.rc @@ -0,0 +1,90 @@ +/* + * Dutch resources for oleacc + * + * Copyright 2008 Frans Kool + * + * 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL + +STRINGTABLE DISCARDABLE +{ + 0 "onbekend object" /* undocumented */ + ROLE_SYSTEM_TITLEBAR "titel balk" + ROLE_SYSTEM_MENUBAR "menu balk" + ROLE_SYSTEM_SCROLLBAR "scroll balk" + ROLE_SYSTEM_GRIP "handvat" + ROLE_SYSTEM_SOUND "geluid" + ROLE_SYSTEM_CURSOR "cursor" + ROLE_SYSTEM_CARET "tekst cursor" + ROLE_SYSTEM_ALERT "alarm" + ROLE_SYSTEM_WINDOW "venster" + ROLE_SYSTEM_CLIENT "client" + ROLE_SYSTEM_MENUPOPUP "popup menu" + ROLE_SYSTEM_MENUITEM "menu item" + ROLE_SYSTEM_TOOLTIP "tool tip" + ROLE_SYSTEM_APPLICATION "programma" + ROLE_SYSTEM_DOCUMENT "document" + ROLE_SYSTEM_PANE "sectie" + ROLE_SYSTEM_CHART "diagram" + ROLE_SYSTEM_DIALOG "keuze" + ROLE_SYSTEM_BORDER "randen" + ROLE_SYSTEM_GROUPING "groepering" + ROLE_SYSTEM_SEPARATOR "separator" + ROLE_SYSTEM_TOOLBAR "knoppen balk" + ROLE_SYSTEM_STATUSBAR "status balk" + ROLE_SYSTEM_TABLE "tabel" + ROLE_SYSTEM_COLUMNHEADER "kolom hoofd" + ROLE_SYSTEM_ROWHEADER "rij hoofd" + ROLE_SYSTEM_COLUMN "kolom" + ROLE_SYSTEM_ROW "rij" + ROLE_SYSTEM_CELL "cel" + ROLE_SYSTEM_LINK "link" + ROLE_SYSTEM_HELPBALLOON "help ballon" + ROLE_SYSTEM_CHARACTER "karakter" + ROLE_SYSTEM_LIST "lijst" + ROLE_SYSTEM_LISTITEM "lijst onderdeel" + ROLE_SYSTEM_OUTLINE "outline" + ROLE_SYSTEM_OUTLINEITEM "outline onderdeel" + ROLE_SYSTEM_PAGETAB "pagina tab" + ROLE_SYSTEM_PROPERTYPAGE "eigenschappen pagina" + ROLE_SYSTEM_INDICATOR "indicator" + ROLE_SYSTEM_GRAPHIC "grafisch" + ROLE_SYSTEM_STATICTEXT "vaste tekst" + ROLE_SYSTEM_TEXT "tekst" + ROLE_SYSTEM_PUSHBUTTON "drukknop" + ROLE_SYSTEM_CHECKBUTTON "aankruisvakje" + ROLE_SYSTEM_RADIOBUTTON "radioknop" + ROLE_SYSTEM_COMBOBOX "combo box" + ROLE_SYSTEM_DROPLIST "selectie box" + ROLE_SYSTEM_PROGRESSBAR "voortgangsbalk" + ROLE_SYSTEM_DIAL "draaiknop" + ROLE_SYSTEM_HOTKEYFIELD "hotkey veld" + ROLE_SYSTEM_SLIDER "schuifknop" + ROLE_SYSTEM_SPINBUTTON "spin box" + ROLE_SYSTEM_DIAGRAM "diagram" + ROLE_SYSTEM_ANIMATION "animation" + ROLE_SYSTEM_EQUATION "formula" + ROLE_SYSTEM_BUTTONDROPDOWN "dropdown knop" + ROLE_SYSTEM_BUTTONMENU "menu knop" + ROLE_SYSTEM_BUTTONDROPDOWNGRID "dropdown grid knop" + ROLE_SYSTEM_WHITESPACE "lege ruimte" + ROLE_SYSTEM_PAGETABLIST "pagina tab lijst" + ROLE_SYSTEM_CLOCK "klok" + ROLE_SYSTEM_SPLITBUTTON "splits knop" + ROLE_SYSTEM_IPADDRESS "IP adres" + ROLE_SYSTEM_OUTLINEBUTTON "outline knop" +}

1 0