February 2009 - Wine-Commits

Andrew Talbot : itss: Remove unused function.
by Alexandre Julliard Feb. 5, 2009

Feb. 5, 2009

Module: wine Branch: master Commit: 59a50245bed2debec1e13517ade09326b427c8bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=59a50245bed2debec1e13517a… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Wed Feb 4 20:39:48 2009 +0000 itss: Remove unused function. --- dlls/itss/chm_lib.c | 109 --------------------------------------------------- dlls/itss/chm_lib.h | 5 -- 2 files changed, 0 insertions(+), 114 deletions(-) diff --git a/dlls/itss/chm_lib.c b/dlls/itss/chm_lib.c index e0fceb3..a98c8ac 100644 --- a/dlls/itss/chm_lib.c +++ b/dlls/itss/chm_lib.c @@ -1373,115 +1373,6 @@ LONGINT64 chm_retrieve_object(struct chmFile *h, } } -/* enumerate the objects in the .chm archive */ -int chm_enumerate(struct chmFile *h, - int what, - CHM_ENUMERATOR e, - void *context) -{ - Int32 curPage; - - /* buffer to hold whatever page we're looking at */ - UChar *page_buf = HeapAlloc(GetProcessHeap(), 0, h->block_len); - struct chmPmglHeader header; - UChar *end; - UChar *cur; - unsigned int lenRemain; - UInt64 ui_path_len; - - /* the current ui */ - struct chmUnitInfo ui; - int flag; - - /* starting page */ - curPage = h->index_head; - - /* until we have either returned or given up */ - while (curPage != -1) - { - - /* try to fetch the index page */ - if (_chm_fetch_bytes(h, - page_buf, - h->dir_offset + (UInt64)curPage*h->block_len, - h->block_len) != h->block_len) - { - HeapFree(GetProcessHeap(), 0, page_buf); - return 0; - } - - /* figure out start and end for this page */ - cur = page_buf; - lenRemain = _CHM_PMGL_LEN; - if (! _unmarshal_pmgl_header(&cur, &lenRemain, &header)) - { - HeapFree(GetProcessHeap(), 0, page_buf); - return 0; - } - end = page_buf + h->block_len - (header.free_space); - - /* loop over this page */ - while (cur < end) - { - if (! _chm_parse_PMGL_entry(&cur, &ui)) - { - HeapFree(GetProcessHeap(), 0, page_buf); - return 0; - } - - /* get the length of the path */ - ui_path_len = strlenW(ui.path)-1; - - /* check for DIRS */ - if (ui.path[ui_path_len] == '/' && !(what & CHM_ENUMERATE_DIRS)) - continue; - - /* check for FILES */ - if (ui.path[ui_path_len] != '/' && !(what & CHM_ENUMERATE_FILES)) - continue; - - /* check for NORMAL vs. META */ - if (ui.path[0] == '/') - { - - /* check for NORMAL vs. SPECIAL */ - if (ui.path[1] == '#' || ui.path[1] == '$') - flag = CHM_ENUMERATE_SPECIAL; - else - flag = CHM_ENUMERATE_NORMAL; - } - else - flag = CHM_ENUMERATE_META; - if (! (what & flag)) - continue; - - /* call the enumerator */ - { - int status = (*e)(h, &ui, context); - switch (status) - { - case CHM_ENUMERATOR_FAILURE: - HeapFree(GetProcessHeap(), 0, page_buf); - return 0; - case CHM_ENUMERATOR_CONTINUE: - break; - case CHM_ENUMERATOR_SUCCESS: - HeapFree(GetProcessHeap(), 0, page_buf); - return 1; - default: - break; - } - } - } - - /* advance to next page */ - curPage = header.block_next; - } - - HeapFree(GetProcessHeap(), 0, page_buf); - return 1; -} - int chm_enumerate_dir(struct chmFile *h, const WCHAR *prefix, int what, diff --git a/dlls/itss/chm_lib.h b/dlls/itss/chm_lib.h index 285795c..0b3718c 100644 --- a/dlls/itss/chm_lib.h +++ b/dlls/itss/chm_lib.h @@ -104,11 +104,6 @@ typedef int (*CHM_ENUMERATOR)(struct chmFile *h, #define CHM_ENUMERATOR_FAILURE (0) #define CHM_ENUMERATOR_CONTINUE (1) #define CHM_ENUMERATOR_SUCCESS (2) -int chm_enumerate(struct chmFile *h, - int what, - CHM_ENUMERATOR e, - void *context); - int chm_enumerate_dir(struct chmFile *h, const WCHAR *prefix, int what,

1 0

Andrew Talbot : dplayx: Remove unused functions.
by Alexandre Julliard Feb. 5, 2009

Feb. 5, 2009

Module: wine Branch: master Commit: 75572fdb0c15c43422a81979b86b422653c0b938 URL: http://source.winehq.org/git/wine.git/?a=commit;h=75572fdb0c15c43422a81979b… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Wed Feb 4 20:39:39 2009 +0000 dplayx: Remove unused functions. --- dlls/dplayx/dplayx_global.c | 27 --------------------------- dlls/dplayx/name_server.c | 7 ------- dlls/dplayx/name_server.h | 1 - 3 files changed, 0 insertions(+), 35 deletions(-) diff --git a/dlls/dplayx/dplayx_global.c b/dlls/dplayx/dplayx_global.c index 7cafb59..938ade9 100644 --- a/dlls/dplayx/dplayx_global.c +++ b/dlls/dplayx/dplayx_global.c @@ -450,33 +450,6 @@ BOOL DPLAYX_CreateLobbyApplication( DWORD dwAppID ) return FALSE; } -/* I'm not sure when I'm going to need this, but here it is */ -BOOL DPLAYX_DestroyLobbyApplication( DWORD dwAppID ) -{ - UINT i; - - DPLAYX_AcquireSemaphore(); - - /* Find an empty space in the list and insert the data */ - for( i=0; i < numSupportedLobbies; i++ ) - { - if( lobbyData[ i ].dwAppID == dwAppID ) - { - /* FIXME: Should free up anything unused. Tisk tisk :0 */ - /* Mark this entry unused */ - TRACE( "Marking lobbyData[%u] unused\n", i ); - DPLAYX_InitializeLobbyDataEntry( &lobbyData[ i ] ); - - DPLAYX_ReleaseSemaphore(); - return TRUE; - } - } - - DPLAYX_ReleaseSemaphore(); - ERR( "Unable to find global entry for application\n" ); - return FALSE; -} - BOOL DPLAYX_SetLobbyHandles( DWORD dwAppID, HANDLE hStart, HANDLE hDeath, HANDLE hConnRead ) { diff --git a/dlls/dplayx/name_server.c b/dlls/dplayx/name_server.c index 7bb8e7b..e6a6b62 100644 --- a/dlls/dplayx/name_server.c +++ b/dlls/dplayx/name_server.c @@ -83,13 +83,6 @@ void NS_SetLocalComputerAsNameServer( LPCDPSESSIONDESC2 lpsd, LPVOID lpNSInfo ) lpCache->bNsIsLocal = TRUE; } -void NS_SetRemoteComputerAsNameServer( LPCDPSESSIONDESC2 lpsd, LPVOID lpNSInfo ) -{ - lpNSCache lpCache = (lpNSCache)lpNSInfo; - - lpCache->bNsIsLocal = FALSE; -} - static DPQ_DECL_COMPARECB( cbUglyPig, GUID ) { return IsEqualGUID( elem1, elem2 ); diff --git a/dlls/dplayx/name_server.h b/dlls/dplayx/name_server.h index a1d3dd7..9c09ec6 100644 --- a/dlls/dplayx/name_server.h +++ b/dlls/dplayx/name_server.h @@ -29,7 +29,6 @@ #include "dplay_global.h" void NS_SetLocalComputerAsNameServer( LPCDPSESSIONDESC2 lpsd, LPVOID lpNSInfo ); -void NS_SetRemoteComputerAsNameServer( LPCDPSESSIONDESC2 lpsd, LPVOID lpNSInfo ); void NS_AddRemoteComputerAsNameServer( LPCVOID lpNSAddrHdr, DWORD dwHdrSize, LPCDPMSG_ENUMSESSIONSREPLY lpcMsg,

1 0

Andrew Talbot : inetcomm: Remove unused function.
by Alexandre Julliard Feb. 5, 2009

Feb. 5, 2009

Module: wine Branch: master Commit: cd0317f22d0a20f576ac3eef66ea94b4938d5f01 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd0317f22d0a20f576ac3eef6… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Wed Feb 4 20:39:45 2009 +0000 inetcomm: Remove unused function. --- dlls/inetcomm/inetcomm_private.h | 2 -- dlls/inetcomm/internettransport.c | 23 ----------------------- 2 files changed, 0 insertions(+), 25 deletions(-) diff --git a/dlls/inetcomm/inetcomm_private.h b/dlls/inetcomm/inetcomm_private.h index 1d752c0..533c926 100644 --- a/dlls/inetcomm/inetcomm_private.h +++ b/dlls/inetcomm/inetcomm_private.h @@ -61,8 +61,6 @@ HRESULT InternetTransport_DropConnection(InternetTransport *This); HRESULT InternetTransport_GetStatus(InternetTransport *This, IXPSTATUS *pCurrentStatus); HRESULT InternetTransport_ChangeStatus(InternetTransport *This, IXPSTATUS Status); -HRESULT InternetTransport_Read(InternetTransport *This, int cbBuffer, - INETXPORT_COMPLETION_FUNCTION fnCompletion); HRESULT InternetTransport_ReadLine(InternetTransport *This, INETXPORT_COMPLETION_FUNCTION fnCompletion); HRESULT InternetTransport_Write(InternetTransport *This, const char *pvData, diff --git a/dlls/inetcomm/internettransport.c b/dlls/inetcomm/internettransport.c index 7cef414..f0499bc 100644 --- a/dlls/inetcomm/internettransport.c +++ b/dlls/inetcomm/internettransport.c @@ -204,29 +204,6 @@ HRESULT InternetTransport_ChangeStatus(InternetTransport *This, IXPSTATUS Status return S_OK; } -HRESULT InternetTransport_Read(InternetTransport *This, int cbBuffer, - INETXPORT_COMPLETION_FUNCTION fnCompletion) -{ - if (This->Status == IXP_DISCONNECTED) - return IXP_E_NOT_CONNECTED; - - if (This->fnCompletion) - return IXP_E_BUSY; - - This->fnCompletion = fnCompletion; - - This->cbBuffer = cbBuffer; - This->pBuffer = HeapAlloc(GetProcessHeap(), 0, This->cbBuffer); - This->iCurrentBufferOffset = 0; - - if (WSAAsyncSelect(This->Socket, This->hwnd, IX_READ, FD_READ) == SOCKET_ERROR) - { - ERR("WSAAsyncSelect failed with error %d\n", WSAGetLastError()); - /* FIXME: handle error */ - } - return S_OK; -} - HRESULT InternetTransport_ReadLine(InternetTransport *This, INETXPORT_COMPLETION_FUNCTION fnCompletion) {

1 0

Andrew Talbot : dsound: Remove unused function.
by Alexandre Julliard Feb. 5, 2009

Feb. 5, 2009

Module: wine Branch: master Commit: c744710bd5b757d0daf2a63b93a16983434018ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=c744710bd5b757d0daf2a63b9… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Wed Feb 4 20:39:42 2009 +0000 dsound: Remove unused function. --- dlls/dsound/capture.c | 8 -------- 1 files changed, 0 insertions(+), 8 deletions(-) diff --git a/dlls/dsound/capture.c b/dlls/dsound/capture.c index 1e32d7f..6b0cd5b 100644 --- a/dlls/dsound/capture.c +++ b/dlls/dsound/capture.c @@ -1634,14 +1634,6 @@ static HRESULT DirectSoundCaptureDevice_Create( return DS_OK; } -ULONG DirectSoundCaptureDevice_AddRef( - DirectSoundCaptureDevice * device) -{ - ULONG ref = InterlockedIncrement(&(device->ref)); - TRACE("(%p) ref was %d\n", device, ref - 1); - return ref; -} - ULONG DirectSoundCaptureDevice_Release( DirectSoundCaptureDevice * device) {

1 0

Andrew Talbot : cabinet: Declare a function static.
by Alexandre Julliard Feb. 5, 2009

Feb. 5, 2009

Module: wine Branch: master Commit: 61292cfc6109ba530b35ddb6ca9d9f081da15785 URL: http://source.winehq.org/git/wine.git/?a=commit;h=61292cfc6109ba530b35ddb6c… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Wed Feb 4 20:39:32 2009 +0000 cabinet: Declare a function static. --- dlls/cabinet/cabinet.h | 1 - dlls/cabinet/fdi.c | 2 +- 2 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/cabinet/cabinet.h b/dlls/cabinet/cabinet.h index 8b38f9b..3423a73 100644 --- a/dlls/cabinet/cabinet.h +++ b/dlls/cabinet/cabinet.h @@ -654,7 +654,6 @@ typedef struct { } SESSION; /* from fdi.c */ -void QTMupdatemodel(struct QTMmodel *model, int sym); int make_decode_table(cab_ULONG nsyms, cab_ULONG nbits, const cab_UBYTE *length, cab_UWORD *table); #endif /* __WINE_CABINET_H */ diff --git a/dlls/cabinet/fdi.c b/dlls/cabinet/fdi.c index e36066d..bdf64b6 100644 --- a/dlls/cabinet/fdi.c +++ b/dlls/cabinet/fdi.c @@ -151,7 +151,7 @@ typedef struct fdi_cds_fwd { /**************************************************************** * QTMupdatemodel (internal) */ -void QTMupdatemodel(struct QTMmodel *model, int sym) { +static void QTMupdatemodel(struct QTMmodel *model, int sym) { struct QTMmodelsym temp; int i, j;

1 0

Aric Stewart : mlang: Handle non Japanese case in ConvertUnknownJapaneseToUnicode.
by Alexandre Julliard Feb. 5, 2009

Feb. 5, 2009

Module: wine Branch: master Commit: ec7ba645dd271c05a54855dc8baf9dee298c0461 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec7ba645dd271c05a54855dc8… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Feb 4 13:58:20 2009 -0600 mlang: Handle non Japanese case in ConvertUnknownJapaneseToUnicode. --- dlls/mlang/mlang.c | 23 ++++++++++++++++------- 1 files changed, 16 insertions(+), 7 deletions(-) diff --git a/dlls/mlang/mlang.c b/dlls/mlang/mlang.c index f7d8097..11fa366 100644 --- a/dlls/mlang/mlang.c +++ b/dlls/mlang/mlang.c @@ -799,22 +799,30 @@ static UINT ConvertUnknownJapaneseToUnicode(LPCSTR input, DWORD count, int code = DetectJapaneseCode(input,count); TRACE("Japanese code %i\n",code); - if (code == 932) + switch (code) { + case 0: + if (output) + rc = MultiByteToWideChar(CP_ACP,0,input,count,output,out_count); + else + rc = MultiByteToWideChar(CP_ACP,0,input,count,0,0); + break; + + case 932: if (output) rc = MultiByteToWideChar(932,0,input,count,output,out_count); else rc = MultiByteToWideChar(932,0,input,count,0,0); - } - else if (code == 51932) - { + break; + + case 51932: if (output) rc = MultiByteToWideChar(20932,0,input,count,output,out_count); else rc = MultiByteToWideChar(20932,0,input,count,0,0); - } - else if (code == 50220) - { + break; + + case 50220: sjis_string = HeapAlloc(GetProcessHeap(),0,count); rc = ConvertJIS2SJIS(input,count,sjis_string); if (rc) @@ -826,6 +834,7 @@ static UINT ConvertUnknownJapaneseToUnicode(LPCSTR input, DWORD count, rc = MultiByteToWideChar(932,0,sjis_string,rc,0,0); } HeapFree(GetProcessHeap(),0,sjis_string); + break; } return rc; }

1 0

Marcus Meissner : urlmon: Fixed target buffer length to MultiByteToWideChar .
by Alexandre Julliard Feb. 5, 2009

Feb. 5, 2009

Module: wine Branch: master Commit: 8b812b413d9d1d78f1eecd2ae58c50d7d11e44fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b812b413d9d1d78f1eecd2ae… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Wed Feb 4 21:15:04 2009 +0100 urlmon: Fixed target buffer length to MultiByteToWideChar. --- dlls/urlmon/umon.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/urlmon/umon.c b/dlls/urlmon/umon.c index 521cfc2..bbaed5b 100644 --- a/dlls/urlmon/umon.c +++ b/dlls/urlmon/umon.c @@ -1185,7 +1185,7 @@ HRESULT WINAPI URLDownloadToCacheFileA(LPUNKNOWN lpUnkCaller, LPCSTR szURL, LPST if(szURL) { len = MultiByteToWideChar(CP_ACP, 0, szURL, -1, NULL, 0); url = heap_alloc(len*sizeof(WCHAR)); - MultiByteToWideChar(CP_ACP, 0, szURL, -1, url, -1); + MultiByteToWideChar(CP_ACP, 0, szURL, -1, url, len); } if(szFileName)

1 0

Juan Lang : mshtml: Pass bytes written pointer to WriteFile.
by Alexandre Julliard Feb. 5, 2009

Feb. 5, 2009

Module: wine Branch: master Commit: 55b504cc880b57daecc9c061c50bfa0784b98edc URL: http://source.winehq.org/git/wine.git/?a=commit;h=55b504cc880b57daecc9c061c… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Feb 4 09:20:22 2009 -0800 mshtml: Pass bytes written pointer to WriteFile. --- dlls/mshtml/install.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/install.c b/dlls/mshtml/install.c index 605fa05..736fee0 100644 --- a/dlls/mshtml/install.c +++ b/dlls/mshtml/install.c @@ -383,10 +383,12 @@ static HRESULT WINAPI InstallCallback_OnDataAvailable(IBindStatusCallback *iface HRESULT hres; do { + DWORD written; + size = 0; hres = IStream_Read(str, buf, sizeof(buf), &size); if(size) - WriteFile(tmp_file, buf, size, NULL, NULL); + WriteFile(tmp_file, buf, size, &written, NULL); }while(hres == S_OK); return S_OK;

1 0

Marcus Meissner : mshtml: Fixed last argument to MultiByteToWideChar.
by Alexandre Julliard Feb. 5, 2009

Feb. 5, 2009

Module: wine Branch: master Commit: 2febaf64383de5ba68a436067a6f369c79078fbd URL: http://source.winehq.org/git/wine.git/?a=commit;h=2febaf64383de5ba68a436067… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Wed Feb 4 19:02:26 2009 +0100 mshtml: Fixed last argument to MultiByteToWideChar. --- dlls/mshtml/install.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/install.c b/dlls/mshtml/install.c index 736fee0..9bff0e6 100644 --- a/dlls/mshtml/install.c +++ b/dlls/mshtml/install.c @@ -444,7 +444,7 @@ static LPWSTR get_url(void) if(size > sizeof(httpW) && !memcmp(url, httpW, sizeof(httpW))) { strcatW(url, v_formatW); - MultiByteToWideChar(CP_ACP, 0, GECKO_VERSION, -1, url+strlenW(url), -1); + MultiByteToWideChar(CP_ACP, 0, GECKO_VERSION, -1, url+strlenW(url), (size-strlenW(url))/sizeof(WCHAR)); } TRACE("Got URL %s\n", debugstr_w(url));

1 0

Marcus Meissner : mshtml: Fixed second buffer argument to MultiByteToWideChar.
by Alexandre Julliard Feb. 5, 2009

Feb. 5, 2009

Module: wine Branch: master Commit: 635ec22e4b78d7cca8e686aa326f7f8a0ddd7977 URL: http://source.winehq.org/git/wine.git/?a=commit;h=635ec22e4b78d7cca8e686aa3… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Wed Feb 4 21:11:31 2009 +0100 mshtml: Fixed second buffer argument to MultiByteToWideChar. --- dlls/mshtml/editor.c | 2 +- dlls/mshtml/navigate.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/editor.c b/dlls/mshtml/editor.c index 7cbdf2e..e92cf96 100644 --- a/dlls/mshtml/editor.c +++ b/dlls/mshtml/editor.c @@ -588,7 +588,7 @@ static HRESULT exec_fontname(HTMLDocument *This, DWORD cmdexecopt, VARIANT *in, len = MultiByteToWideChar(CP_ACP, 0, stra, -1, NULL, 0); strw = heap_alloc(len*sizeof(WCHAR)); - MultiByteToWideChar(CP_ACP, 0, stra, -1, strw, -1); + MultiByteToWideChar(CP_ACP, 0, stra, -1, strw, len); nsfree(stra); V_BSTR(out) = SysAllocString(strw); diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index 188cdd7..6e41699 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -657,7 +657,7 @@ static void parse_post_data(nsIInputStream *post_data_stream, LPWSTR *headers_re else headers = heap_alloc((len+1)*sizeof(WCHAR)); - len = MultiByteToWideChar(CP_ACP, 0, ptr2, ptr-ptr2, headers+headers_len, -1); + len = MultiByteToWideChar(CP_ACP, 0, ptr2, ptr-ptr2, headers+headers_len, len); headers_len += len; ptr2 = ptr;

1 0