Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-09 19:35:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fixes bug 300423 "Expose nsIPipe implementation via component factory" r+a=bsmedberg

Browse Source
This commit is contained in:
darin%meer.net 2005-07-18 23:39:56 +00:00
parent 784b0ad1e3
commit 6764edca0d
3 changed files with 75 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
xpcom/build/nsXPComInit.cpp
View File

@ -48,6 +48,7 @@
#include "nsScriptableInputStream.h"
#include "nsBinaryStream.h"
#include "nsStorageStream.h"
#include "nsPipe.h"
#include "nsMemoryImpl.h"
#include "nsDebugImpl.h"
@ -311,6 +312,7 @@ static const nsModuleComponentInfo components[] = {
COMPONENT(BINARYINPUTSTREAM, nsBinaryInputStreamConstructor),
COMPONENT(BINARYOUTPUTSTREAM, nsBinaryOutputStreamConstructor),
COMPONENT(STORAGESTREAM, nsStorageStreamConstructor),
COMPONENT(PIPE, nsPipeConstructor),
#define NS_PROPERTIES_CLASSNAME "Properties"
COMPONENT(PROPERTIES, nsProperties::Create),

58
xpcom/io/nsPipe.h Normal file
View File

@ -0,0 +1,58 @@
/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
/* vim:set ts=2 sw=2 sts=2 et cindent: */
/* ***** BEGIN LICENSE BLOCK *****
* Version: MPL 1.1/GPL 2.0/LGPL 2.1
*
* The contents of this file are subject to the Mozilla Public License Version
* 1.1 (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
* http://www.mozilla.org/MPL/
*
* Software distributed under the License is distributed on an "AS IS" basis,
* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
* for the specific language governing rights and limitations under the
* License.
*
* The Original Code is Mozilla code.
*
* The Initial Developer of the Original Code is Google Inc.
* Portions created by the Initial Developer are Copyright (C) 2005
* the Initial Developer. All Rights Reserved.
*
* Contributor(s):
* Darin Fisher <darin@meer.net>
*
* Alternatively, the contents of this file may be used under the terms of
* either the GNU General Public License Version 2 or later (the "GPL"), or
* the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
* in which case the provisions of the GPL or the LGPL are applicable instead
* of those above. If you wish to allow use of your version of this file only
* under the terms of either the GPL or the LGPL, and not to allow others to
* use your version of this file under the terms of the MPL, indicate your
* decision by deleting the provisions above and replace them with the notice
* and other provisions required by the GPL or the LGPL. If you do not delete
* the provisions above, a recipient may use your version of this file under
* the terms of any one of the MPL, the GPL or the LGPL.
*
* ***** END LICENSE BLOCK ***** */
#ifndef nsPipe_h__
#define nsPipe_h__
#define NS_PIPE_CLASSNAME \
"nsPipe"
#define NS_PIPE_CONTRACTID \
"@mozilla.org/pipe;1"
#define NS_PIPE_CID \
{ /* e4a0ee4e-0775-457b-9118-b3ae97a7c758 */ \
0xe4a0ee4e, \
0x0775, \
0x457b, \
{0x91,0x18,0xb3,0xae,0x97,0xa7,0xc7,0x58} \
}
// Generic factory constructor for the nsPipe class
NS_METHOD NS_HIDDEN
nsPipeConstructor(nsISupports *outer, REFNSIID iid, void **result);
#endif // !defined(nsPipe_h__)

21
xpcom/io/nsPipe3.cpp
View File

@ -50,7 +50,7 @@
//
// set NSPR_LOG_MODULES=nsPipe:5
//
static PRLogModuleInfo *gPipeLog = nsnull;
static PRLogModuleInfo *gPipeLog = PR_NewLogModule("nsPipe");
#define LOG(args) PR_LOG(gPipeLog, PR_LOG_DEBUG, args)
#else
#define LOG(args)
@ -1248,11 +1248,6 @@ NS_NewPipe2(nsIAsyncInputStream **pipeIn,
{
nsresult rv;
#if defined(PR_LOGGING)
if (!gPipeLog)
gPipeLog = PR_NewLogModule("nsPipe");
#endif
nsPipe *pipe = new nsPipe();
if (!pipe)
return NS_ERROR_OUT_OF_MEMORY;
@ -1273,4 +1268,18 @@ NS_NewPipe2(nsIAsyncInputStream **pipeIn,
return NS_OK;
}
NS_METHOD
nsPipeConstructor(nsISupports *outer, REFNSIID iid, void **result)
{
if (outer)
return NS_ERROR_NO_AGGREGATION;
nsPipe *pipe = new nsPipe();
if (!pipe)
return NS_ERROR_OUT_OF_MEMORY;
NS_ADDREF(pipe);
nsresult rv = pipe->QueryInterface(iid, result);
NS_RELEASE(pipe);
return rv;
}
////////////////////////////////////////////////////////////////////////////////