February 2011 - Wine-Commits

Jacek Caban : wininet: Moved freeing object to WININET_Release.
by Alexandre Julliard Feb. 4, 2011

Feb. 4, 2011

Module: wine Branch: master Commit: 923498da03859ea0840e905c25fe35c15e6327cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=923498da03859ea0840e905c2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Feb 3 20:45:12 2011 +0100 wininet: Moved freeing object to WININET_Release. --- dlls/wininet/ftp.c | 4 ---- dlls/wininet/http.c | 2 -- dlls/wininet/internet.c | 3 ++- 3 files changed, 2 insertions(+), 7 deletions(-) diff --git a/dlls/wininet/ftp.c b/dlls/wininet/ftp.c index 41537b8..e57f356 100644 --- a/dlls/wininet/ftp.c +++ b/dlls/wininet/ftp.c @@ -1127,8 +1127,6 @@ static void FTPFILE_Destroy(object_header_t *hdr) if (nResCode > 0 && nResCode != 226) WARN("server reports failed transfer\n"); WININET_Release(&lpwh->lpFtpSession->hdr); - - HeapFree(GetProcessHeap(), 0, lpwh); } static DWORD FTPFILE_QueryOption(object_header_t *hdr, DWORD option, void *buffer, DWORD *size, BOOL unicode) @@ -2346,7 +2344,6 @@ static void FTPSESSION_Destroy(object_header_t *hdr) HeapFree(GetProcessHeap(), 0, lpwfs->lpszPassword); HeapFree(GetProcessHeap(), 0, lpwfs->lpszUserName); HeapFree(GetProcessHeap(), 0, lpwfs->servername); - HeapFree(GetProcessHeap(), 0, lpwfs); } static void FTPSESSION_CloseConnection(object_header_t *hdr) @@ -3399,7 +3396,6 @@ static void FTPFINDNEXT_Destroy(object_header_t *hdr) } HeapFree(GetProcessHeap(), 0, lpwfn->lpafp); - HeapFree(GetProcessHeap(), 0, lpwfn); } static DWORD FTPFINDNEXT_FindNextFileProc(WININETFTPFINDNEXTW *find, LPVOID data) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 9215c34..0b723c3 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -1601,7 +1601,6 @@ static void HTTPREQ_Destroy(object_header_t *hdr) #endif HeapFree(GetProcessHeap(), 0, lpwhr->pCustHeaders); - HeapFree(GetProcessHeap(), 0, lpwhr); } static void HTTPREQ_CloseConnection(object_header_t *hdr) @@ -4358,7 +4357,6 @@ static void HTTPSESSION_Destroy(object_header_t *hdr) HeapFree(GetProcessHeap(), 0, lpwhs->lpszServerName); HeapFree(GetProcessHeap(), 0, lpwhs->lpszPassword); HeapFree(GetProcessHeap(), 0, lpwhs->lpszUserName); - HeapFree(GetProcessHeap(), 0, lpwhs); } static DWORD HTTPSESSION_QueryOption(object_header_t *hdr, DWORD option, void *buffer, DWORD *size, BOOL unicode) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index 0df56a6..5b42d98 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -261,6 +261,8 @@ BOOL WININET_Release( object_header_t *info ) LeaveCriticalSection( &WININET_cs ); } + + heap_free(info); } return TRUE; } @@ -684,7 +686,6 @@ static VOID APPINFO_Destroy(object_header_t *hdr) HeapFree(GetProcessHeap(), 0, lpwai->lpszProxyBypass); HeapFree(GetProcessHeap(), 0, lpwai->lpszProxyUsername); HeapFree(GetProcessHeap(), 0, lpwai->lpszProxyPassword); - HeapFree(GetProcessHeap(), 0, lpwai); } static DWORD APPINFO_QueryOption(object_header_t *hdr, DWORD option, void *buffer, DWORD *size, BOOL unicode)

1 0

Henri Verbeet : wined3d: Remove COM from the query implementation.
by Alexandre Julliard Feb. 4, 2011

Feb. 4, 2011

Module: wine Branch: master Commit: a5fe3610addea3854c7cf24eee315af5e7ea78df URL: http://source.winehq.org/git/wine.git/?a=commit;h=a5fe3610addea3854c7cf24ee… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Feb 3 20:14:06 2011 +0100 wined3d: Remove COM from the query implementation. --- dlls/d3d9/d3d9_private.h | 2 +- dlls/d3d9/query.c | 10 ++-- dlls/wined3d/query.c | 102 ++++++++++++++-------------------------- dlls/wined3d/wined3d.spec | 7 +++ dlls/wined3d/wined3d_private.h | 21 +++------ include/wine/wined3d.idl | 31 ++++--------- 6 files changed, 64 insertions(+), 109 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a5fe3610addea3854c7cf…

1 0

Jacek Caban : mshtml: Added nsIURI::SetSpec implementation.
by Alexandre Julliard Feb. 4, 2011

Feb. 4, 2011

Module: wine Branch: master Commit: a1205c6adce3a4c5f17af32da7e4366e73cd13f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a1205c6adce3a4c5f17af32da… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Feb 3 20:47:58 2011 +0100 mshtml: Added nsIURI::SetSpec implementation. --- dlls/mshtml/nsio.c | 30 ++++++++++++++++++++++++------ 1 files changed, 24 insertions(+), 6 deletions(-) diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index dec00aa..d08908f 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -1654,16 +1654,34 @@ static nsresult NSAPI nsURI_GetSpec(nsIURL *iface, nsACString *aSpec) static nsresult NSAPI nsURI_SetSpec(nsIURL *iface, const nsACString *aSpec) { nsWineURI *This = impl_from_nsIURL(iface); + const char *speca; + WCHAR *spec; + IUri *uri; + HRESULT hres; - TRACE("(%p)->(%p)\n", This, debugstr_nsacstr(aSpec)); + TRACE("(%p)->(%s)\n", This, debugstr_nsacstr(aSpec)); - if(This->nsuri) { - invalidate_uri(This); - return nsIURI_SetSpec(This->nsuri, aSpec); + nsACString_GetData(aSpec, &speca); + spec = heap_strdupAtoW(speca); + if(!spec) + return NS_ERROR_OUT_OF_MEMORY; + + hres = CreateUri(spec, 0, 0, &uri); + heap_free(spec); + if(FAILED(hres)) { + WARN("CreateUri failed: %08x\n", hres); + return NS_ERROR_FAILURE; } - FIXME("default action not implemented\n"); - return NS_ERROR_NOT_IMPLEMENTED; + invalidate_uri(This); + if(This->uri_builder) { + IUriBuilder_Release(This->uri_builder); + This->uri_builder = NULL; + } + + This->uri = uri; + sync_wine_url(This); + return NS_OK; } static nsresult NSAPI nsURI_GetPrePath(nsIURL *iface, nsACString *aPrePath)

1 0

Henri Verbeet : wined3d: Remove COM from the clipper implementation.
by Alexandre Julliard Feb. 4, 2011

Feb. 4, 2011

Module: wine Branch: master Commit: 304d713860534ef8fec7707a41761e58818cd3f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=304d713860534ef8fec7707a4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Feb 3 20:14:03 2011 +0100 wined3d: Remove COM from the clipper implementation. --- dlls/ddraw/clipper.c | 20 ++----- dlls/ddraw/ddraw.c | 9 +-- dlls/ddraw/ddraw_private.h | 2 +- dlls/wined3d/clipper.c | 124 +++++++++++++++------------------------ dlls/wined3d/surface_base.c | 2 +- dlls/wined3d/wined3d.spec | 10 +++- dlls/wined3d/wined3d_private.h | 12 ++-- include/wine/wined3d.idl | 44 ++++---------- 8 files changed, 87 insertions(+), 136 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=304d713860534ef8fec77…

1 0

Alexandre Julliard : cabinet: Pass an FDI pointer to internal functions instead of a handle.
by Alexandre Julliard Feb. 4, 2011

Feb. 4, 2011

Module: wine Branch: master Commit: 396c9fca215291228d37982a53e0ed4dc514cbc5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=396c9fca215291228d37982a5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 4 12:20:17 2011 +0100 cabinet: Pass an FDI pointer to internal functions instead of a handle. --- dlls/cabinet/cabinet.h | 23 +-- dlls/cabinet/fdi.c | 334 ++++++++++++++++++++++++------------------------ 2 files changed, 177 insertions(+), 180 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=396c9fca215291228d379…

1 0

Alexandre Julliard : cabinet: Move the internal FCI structure to fci.c.
by Alexandre Julliard Feb. 4, 2011

Feb. 4, 2011

Module: wine Branch: master Commit: a71fbe16d9f395b22e222bcfdc358f16e140c373 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a71fbe16d9f395b22e222bcfd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 4 11:35:18 2011 +0100 cabinet: Move the internal FCI structure to fci.c. --- dlls/cabinet/cabinet.h | 53 ----------------------------------------- dlls/cabinet/fci.c | 61 +++++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 58 insertions(+), 56 deletions(-) diff --git a/dlls/cabinet/cabinet.h b/dlls/cabinet/cabinet.h index 035db7c..735e2ed 100644 --- a/dlls/cabinet/cabinet.h +++ b/dlls/cabinet/cabinet.h @@ -309,58 +309,6 @@ typedef struct cds_forward { /* _Int as in "Internal" fyi */ typedef struct { - unsigned int FCI_Intmagic; - PERF perf; - PFNFCIFILEPLACED fileplaced; - PFNFCIALLOC alloc; - PFNFCIFREE free; - PFNFCIOPEN open; - PFNFCIREAD read; - PFNFCIWRITE write; - PFNFCICLOSE close; - PFNFCISEEK seek; - PFNFCIDELETE delete; - PFNFCIGETTEMPFILE gettemp; - PCCAB pccab; - BOOL fPrevCab; - BOOL fNextCab; - BOOL fSplitFolder; - cab_ULONG statusFolderCopied; - cab_ULONG statusFolderTotal; - BOOL fGetNextCabInVain; - void *pv; - char szPrevCab[CB_MAX_CABINET_NAME]; /* previous cabinet name */ - char szPrevDisk[CB_MAX_DISK_NAME]; /* disk name of previous cabinet */ - CCAB oldCCAB; - char* data_in; /* uncompressed data blocks */ - cab_UWORD cdata_in; - char* data_out; /* compressed data blocks */ - ULONG cCompressedBytesInFolder; - cab_UWORD cFolders; - cab_UWORD cFiles; - cab_ULONG cDataBlocks; - cab_ULONG cbFileRemainer; /* uncompressed, yet to be written data */ - /* of spanned file of a spanning folder of a spanning cabinet */ - char szFileNameCFDATA1[CB_MAX_FILENAME]; - int handleCFDATA1; - char szFileNameCFFILE1[CB_MAX_FILENAME]; - int handleCFFILE1; - char szFileNameCFDATA2[CB_MAX_FILENAME]; - int handleCFDATA2; - char szFileNameCFFILE2[CB_MAX_FILENAME]; - int handleCFFILE2; - char szFileNameCFFOLDER[CB_MAX_FILENAME]; - int handleCFFOLDER; - cab_ULONG sizeFileCFDATA1; - cab_ULONG sizeFileCFFILE1; - cab_ULONG sizeFileCFDATA2; - cab_ULONG sizeFileCFFILE2; - cab_ULONG sizeFileCFFOLDER; - BOOL fNewPrevious; - cab_ULONG estimatedCabinetSize; -} FCI_Int, *PFCI_Int; - -typedef struct { unsigned int FDI_Intmagic; PFNALLOC pfnalloc; PFNFREE pfnfree; @@ -384,7 +332,6 @@ typedef struct { #define PFDI_CLOSE(hfdi, hf) ((*PFDI_INT(hfdi)->pfnclose) (hf)) #define PFDI_SEEK(hfdi, hf, dist, type) ((*PFDI_INT(hfdi)->pfnseek) (hf, dist, type)) -#define FCI_INT_MAGIC 0xfcfcfc05 #define FDI_INT_MAGIC 0xfdfdfd05 #define REALLY_IS_FDI(hfdi) ( \ diff --git a/dlls/cabinet/fci.c b/dlls/cabinet/fci.c index 0613e32..00e2fb7 100644 --- a/dlls/cabinet/fci.c +++ b/dlls/cabinet/fci.c @@ -102,6 +102,61 @@ typedef struct { } CFDATA; +typedef struct +{ + unsigned int magic; + PERF perf; + PFNFCIFILEPLACED fileplaced; + PFNFCIALLOC alloc; + PFNFCIFREE free; + PFNFCIOPEN open; + PFNFCIREAD read; + PFNFCIWRITE write; + PFNFCICLOSE close; + PFNFCISEEK seek; + PFNFCIDELETE delete; + PFNFCIGETTEMPFILE gettemp; + PCCAB pccab; + BOOL fPrevCab; + BOOL fNextCab; + BOOL fSplitFolder; + cab_ULONG statusFolderCopied; + cab_ULONG statusFolderTotal; + BOOL fGetNextCabInVain; + void *pv; + char szPrevCab[CB_MAX_CABINET_NAME]; /* previous cabinet name */ + char szPrevDisk[CB_MAX_DISK_NAME]; /* disk name of previous cabinet */ + CCAB oldCCAB; + char* data_in; /* uncompressed data blocks */ + cab_UWORD cdata_in; + char* data_out; /* compressed data blocks */ + ULONG cCompressedBytesInFolder; + cab_UWORD cFolders; + cab_UWORD cFiles; + cab_ULONG cDataBlocks; + cab_ULONG cbFileRemainer; /* uncompressed, yet to be written data */ + /* of spanned file of a spanning folder of a spanning cabinet */ + char szFileNameCFDATA1[CB_MAX_FILENAME]; + int handleCFDATA1; + char szFileNameCFFILE1[CB_MAX_FILENAME]; + int handleCFFILE1; + char szFileNameCFDATA2[CB_MAX_FILENAME]; + int handleCFDATA2; + char szFileNameCFFILE2[CB_MAX_FILENAME]; + int handleCFFILE2; + char szFileNameCFFOLDER[CB_MAX_FILENAME]; + int handleCFFOLDER; + cab_ULONG sizeFileCFDATA1; + cab_ULONG sizeFileCFFILE1; + cab_ULONG sizeFileCFDATA2; + cab_ULONG sizeFileCFFILE2; + cab_ULONG sizeFileCFFOLDER; + BOOL fNewPrevious; + cab_ULONG estimatedCabinetSize; +} FCI_Int; + +#define FCI_INT_MAGIC 0xfcfcfc05 + static void set_error( FCI_Int *fci, int oper, int err ) { fci->perf->erfOper = oper; @@ -114,7 +169,7 @@ static FCI_Int *get_fci_ptr( HFCI hfci ) { FCI_Int *fci= (FCI_Int *)hfci; - if (!fci || !fci->FCI_Intmagic == FCI_INT_MAGIC) + if (!fci || !fci->magic == FCI_INT_MAGIC) { SetLastError( ERROR_INVALID_HANDLE ); return NULL; @@ -209,7 +264,7 @@ HFCI __cdecl FCICreate( return NULL; } - p_fci_internal->FCI_Intmagic = FCI_INT_MAGIC; + p_fci_internal->magic = FCI_INT_MAGIC; p_fci_internal->perf = perf; p_fci_internal->fileplaced = pfnfiledest; p_fci_internal->alloc = pfnalloc; @@ -2827,7 +2882,7 @@ BOOL __cdecl FCIDestroy(HFCI hfci) /* before hfci can be removed all temporary files must be closed */ /* and deleted */ - p_fci_internal->FCI_Intmagic = 0; + p_fci_internal->magic = 0; p_fci_internal->close( p_fci_internal->handleCFDATA1,&err,p_fci_internal->pv); /* TODO error handling of err */

1 0

Alexandre Julliard : cabinet: Pass an FCI pointer to internal functions instead of a handle.
by Alexandre Julliard Feb. 4, 2011

Feb. 4, 2011

Module: wine Branch: master Commit: b18b596621d49ed3166fa39bf99cc24287606550 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b18b596621d49ed3166fa39bf… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 4 11:32:46 2011 +0100 cabinet: Pass an FCI pointer to internal functions instead of a handle. --- dlls/cabinet/cabinet.h | 7 --- dlls/cabinet/fci.c | 123 ++++++++++++++++++++++------------------------- 2 files changed, 58 insertions(+), 72 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b18b596621d49ed3166fa…

1 0

Alexandre Julliard : cabinet: Call FCI function pointers explicitly instead of hiding them inside macros .
by Alexandre Julliard Feb. 4, 2011

Feb. 4, 2011

Module: wine Branch: master Commit: 9aa0e35ecc2790fc10d56cb3e7eaa69ffc2964d2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9aa0e35ecc2790fc10d56cb3e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 4 11:27:31 2011 +0100 cabinet: Call FCI function pointers explicitly instead of hiding them inside macros. --- dlls/cabinet/cabinet.h | 32 ++--- dlls/cabinet/fci.c | 349 ++++++++++++++++++++++++------------------------ 2 files changed, 185 insertions(+), 196 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9aa0e35ecc2790fc10d56…

1 0

Alexandre Julliard : cabinet: Replace the fci_set_error macro by a proper function.
by Alexandre Julliard Feb. 4, 2011

Feb. 4, 2011

Module: wine Branch: master Commit: e30b19f11539ce0ef569d66c682105c0389d2df9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e30b19f11539ce0ef569d66c6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 4 11:20:12 2011 +0100 cabinet: Replace the fci_set_error macro by a proper function. --- dlls/cabinet/fci.c | 265 ++++++++++++++++++++++++++-------------------------- 1 files changed, 133 insertions(+), 132 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e30b19f11539ce0ef569d…

1 0

max@mtew.isa-geek.net : ntdll: Correct 'b' parameter descriptions for _alldiv and _aulldiv.
by Alexandre Julliard Feb. 4, 2011

Feb. 4, 2011

Module: wine Branch: master Commit: 708c43a2ef71d28e33a07e6d368e12f4cf0c91a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=708c43a2ef71d28e33a07e6d3… Author: max(a)mtew.isa-geek.net <max(a)mtew.isa-geek.net> Date: Thu Feb 3 13:43:21 2011 -0500 ntdll: Correct 'b' parameter descriptions for _alldiv and _aulldiv. --- dlls/ntdll/large_int.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/large_int.c b/dlls/ntdll/large_int.c index e2b0734..cb98bae 100644 --- a/dlls/ntdll/large_int.c +++ b/dlls/ntdll/large_int.c @@ -531,7 +531,7 @@ NTSTATUS WINAPI RtlInt64ToUnicodeString( * * PARAMS * a [I] Initial number. - * b [I] Number to multiply a by. + * b [I] Number to divide a by. * * RETURNS * The dividend of a and b. @@ -585,7 +585,7 @@ LONGLONG WINAPI _allrem( LONGLONG a, LONGLONG b ) * * PARAMS * a [I] Initial number. - * b [I] Number to multiply a by. + * b [I] Number to divide a by. * * RETURNS * The dividend of a and b.

1 0