March 2015 - Wine-commits - list.winehq.org

Alexandre Julliard : ntoskrnl: Get rid of the IRP instance list.
by Alexandre Julliard 04 Mar '15

04 Mar '15

Module: wine Branch: master Commit: a85d23bfc345dfa25f615a172740581515dab504 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a85d23bfc345dfa25f615a172… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 4 22:22:14 2015 +0900 ntoskrnl: Get rid of the IRP instance list. --- dlls/ntoskrnl.exe/ntoskrnl.c | 40 +--------------------------------------- 1 file changed, 1 insertion(+), 39 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index a282b37..65702aa 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -64,14 +64,6 @@ KSERVICE_TABLE_DESCRIPTOR KeServiceDescriptorTable[4] = { { 0 } }; typedef void (WINAPI *PCREATE_PROCESS_NOTIFY_ROUTINE)(HANDLE,HANDLE,BOOLEAN); typedef void (WINAPI *PCREATE_THREAD_NOTIFY_ROUTINE)(HANDLE,HANDLE,BOOLEAN); -static struct list Irps = LIST_INIT(Irps); - -struct IrpInstance -{ - struct list entry; - IRP *irp; -}; - /* tid of the thread running client request */ static DWORD request_thread; @@ -496,7 +488,6 @@ PIRP WINAPI IoBuildDeviceIoControlRequest( ULONG code, PDEVICE_OBJECT device, { PIRP irp; PIO_STACK_LOCATION irpsp; - struct IrpInstance *instance; TRACE( "%x, %p, %p, %u, %p, %u, %u, %p, %p\n", code, device, in_buff, in_len, out_buff, out_len, internal, event, iosb ); @@ -508,15 +499,6 @@ PIRP WINAPI IoBuildDeviceIoControlRequest( ULONG code, PDEVICE_OBJECT device, if (irp == NULL) return NULL; - instance = HeapAlloc( GetProcessHeap(), 0, sizeof(struct IrpInstance) ); - if (instance == NULL) - { - IoFreeIrp( irp ); - return NULL; - } - instance->irp = irp; - list_add_tail( &Irps, &instance->entry ); - irpsp = IoGetNextIrpStackLocation( irp ); irpsp->MajorFunction = internal ? IRP_MJ_INTERNAL_DEVICE_CONTROL : IRP_MJ_DEVICE_CONTROL; irpsp->Parameters.DeviceIoControl.IoControlCode = code; @@ -540,7 +522,6 @@ PIRP WINAPI IoBuildSynchronousFsdRequest(ULONG majorfunc, PDEVICE_OBJECT device, PKEVENT event, PIO_STATUS_BLOCK iosb) { PIRP irp; - struct IrpInstance *instance; PIO_STACK_LOCATION irpsp; FIXME("(%d %p %p %d %p %p %p) stub\n", majorfunc, device, buffer, length, startoffset, event, iosb); @@ -549,15 +530,6 @@ PIRP WINAPI IoBuildSynchronousFsdRequest(ULONG majorfunc, PDEVICE_OBJECT device, if (irp == NULL) return NULL; - instance = HeapAlloc( GetProcessHeap(), 0, sizeof(struct IrpInstance) ); - if (instance == NULL) - { - IoFreeIrp( irp ); - return NULL; - } - instance->irp = irp; - list_add_tail( &Irps, &instance->entry ); - irpsp = IoGetNextIrpStackLocation( irp ); irpsp->MajorFunction = majorfunc; /*irpsp->Parameters.DeviceIoControl.IoControlCode = IoControlCode;*/ @@ -987,7 +959,6 @@ VOID WINAPI IoCompleteRequest( IRP *irp, UCHAR priority_boost ) IO_STACK_LOCATION *irpsp; PIO_COMPLETION_ROUTINE routine; IO_STATUS_BLOCK *iosb; - struct IrpInstance *instance; NTSTATUS status, stat; int call_flag = 0; @@ -1025,16 +996,7 @@ VOID WINAPI IoCompleteRequest( IRP *irp, UCHAR priority_boost ) iosb->u.Status = irp->IoStatus.u.Status; if (iosb->u.Status >= 0) iosb->Information = irp->IoStatus.Information; } - LIST_FOR_EACH_ENTRY( instance, &Irps, struct IrpInstance, entry ) - { - if (instance->irp == irp) - { - list_remove( &instance->entry ); - HeapFree( GetProcessHeap(), 0, instance ); - IoFreeIrp( irp ); - break; - } - } + IoFreeIrp( irp ); }

1 0

Hans Leidekker : msi: Decode stream names in load_streams.
by Alexandre Julliard 04 Mar '15

04 Mar '15

Module: wine Branch: master Commit: af6281701da714b6333b7a8a9263545adb9f8512 URL: http://source.winehq.org/git/wine.git/?a=commit;h=af6281701da714b6333b7a8a9… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Mar 4 14:29:29 2015 +0100 msi: Decode stream names in load_streams. --- dlls/msi/streams.c | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/dlls/msi/streams.c b/dlls/msi/streams.c index 44a322c..4b151bb 100644 --- a/dlls/msi/streams.c +++ b/dlls/msi/streams.c @@ -425,23 +425,22 @@ static MSISTREAM *find_stream( MSIDATABASE *db, const WCHAR *name ) static UINT append_stream( MSIDATABASE *db, const WCHAR *name, IStream *stream ) { - WCHAR decoded[MAX_STREAM_NAME_LEN + 1]; UINT i = db->num_streams; if (!streams_resize_table( db, db->num_streams + 1 )) return ERROR_OUTOFMEMORY; - decode_streamname( name, decoded ); - db->streams[i].str_index = msi_add_string( db->strings, decoded, -1, StringNonPersistent ); + db->streams[i].str_index = msi_add_string( db->strings, name, -1, StringNonPersistent ); db->streams[i].stream = stream; db->num_streams++; - TRACE("added %s\n", debugstr_w( decoded )); + TRACE("added %s\n", debugstr_w( name )); return ERROR_SUCCESS; } static UINT load_streams( MSIDATABASE *db ) { + WCHAR decoded[MAX_STREAM_NAME_LEN + 1]; IEnumSTATSTG *stgenum; STATSTG stat; HRESULT hr; @@ -460,25 +459,29 @@ static UINT load_streams( MSIDATABASE *db ) break; /* table streams are not in the _Streams table */ - if (stat.type != STGTY_STREAM || *stat.pwcsName == 0x4840 || - find_stream( db, stat.pwcsName )) + if (stat.type != STGTY_STREAM || *stat.pwcsName == 0x4840) { CoTaskMemFree( stat.pwcsName ); continue; } - TRACE("found new stream %s\n", debugstr_w( stat.pwcsName )); + decode_streamname( stat.pwcsName, decoded ); + if (find_stream( db, decoded )) + { + CoTaskMemFree( stat.pwcsName ); + continue; + } + TRACE("found new stream %s\n", debugstr_w( decoded )); hr = open_stream( db, stat.pwcsName, &stream ); + CoTaskMemFree( stat.pwcsName ); if (FAILED( hr )) { ERR("unable to open stream %08x\n", hr); - CoTaskMemFree( stat.pwcsName ); r = ERROR_FUNCTION_FAILED; break; } - r = append_stream( db, stat.pwcsName, stream ); - CoTaskMemFree( stat.pwcsName ); + r = append_stream( db, decoded, stream ); if (r != ERROR_SUCCESS) break; }

1 0

Hans Leidekker : msi: Support updating streams.
by Alexandre Julliard 04 Mar '15

04 Mar '15

Module: wine Branch: master Commit: 123428942d773454b4d388aabdca0caae939e79c URL: http://source.winehq.org/git/wine.git/?a=commit;h=123428942d773454b4d388aab… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Mar 4 14:30:08 2015 +0100 msi: Support updating streams. --- dlls/msi/table.c | 54 +++++++++++++++++++++++++++++++++++++++--------------- 1 file changed, 39 insertions(+), 15 deletions(-) diff --git a/dlls/msi/table.c b/dlls/msi/table.c index cfe5612..e1f7d9b 100644 --- a/dlls/msi/table.c +++ b/dlls/msi/table.c @@ -1054,7 +1054,7 @@ static UINT TABLE_fetch_int( struct tagMSIVIEW *view, UINT row, UINT col, UINT * return ERROR_SUCCESS; } -static UINT msi_stream_name( const MSITABLEVIEW *tv, UINT row, LPWSTR *pstname ) +static UINT get_stream_name( const MSITABLEVIEW *tv, UINT row, WCHAR **pstname ) { LPWSTR p, stname = NULL; UINT i, r, type, ival; @@ -1154,7 +1154,7 @@ static UINT TABLE_fetch_stream( struct tagMSIVIEW *view, UINT row, UINT col, ISt if( !view->ops->fetch_int ) return ERROR_INVALID_PARAMETER; - r = msi_stream_name( tv, row, &name ); + r = get_stream_name( tv, row, &name ); if (r != ERROR_SUCCESS) { ERR("fetching stream, error = %u\n", r); @@ -1216,39 +1216,63 @@ static UINT TABLE_get_row( struct tagMSIVIEW *view, UINT row, MSIRECORD **rec ) return msi_view_get_row(tv->db, view, row, rec); } -static UINT msi_addstreamW( MSIDATABASE *db, LPCWSTR name, IStream *data ) +static UINT add_stream( MSIDATABASE *db, const WCHAR *name, IStream *data ) { static const WCHAR insert[] = { 'I','N','S','E','R','T',' ','I','N','T','O',' ', '`','_','S','t','r','e','a','m','s','`',' ', '(','`','N','a','m','e','`',',','`','D','a','t','a','`',')',' ', 'V','A','L','U','E','S',' ','(','?',',','?',')',0}; - MSIQUERY *query = NULL; + static const WCHAR update[] = { + 'U','P','D','A','T','E',' ','`','_','S','t','r','e','a','m','s','`',' ', + 'S','E','T',' ','`','D','a','t','a','`',' ','=',' ','?',' ', + 'W','H','E','R','E',' ','`','N','a','m','e','`',' ','=',' ','?',0}; + MSIQUERY *query; MSIRECORD *rec; UINT r; TRACE("%p %s %p\n", db, debugstr_w(name), data); - rec = MSI_CreateRecord( 2 ); - if ( !rec ) + if (!(rec = MSI_CreateRecord( 2 ))) return ERROR_OUTOFMEMORY; r = MSI_RecordSetStringW( rec, 1, name ); - if ( r != ERROR_SUCCESS ) - goto err; + if (r != ERROR_SUCCESS) + goto done; r = MSI_RecordSetIStream( rec, 2, data ); - if ( r != ERROR_SUCCESS ) - goto err; + if (r != ERROR_SUCCESS) + goto done; r = MSI_DatabaseOpenViewW( db, insert, &query ); - if ( r != ERROR_SUCCESS ) - goto err; + if (r != ERROR_SUCCESS) + goto done; r = MSI_ViewExecute( query, rec ); + msiobj_release( &query->hdr ); + if (r == ERROR_SUCCESS) + goto done; -err: + msiobj_release( &rec->hdr ); + if (!(rec = MSI_CreateRecord( 2 ))) + return ERROR_OUTOFMEMORY; + + r = MSI_RecordSetIStream( rec, 1, data ); + if (r != ERROR_SUCCESS) + goto done; + + r = MSI_RecordSetStringW( rec, 2, name ); + if (r != ERROR_SUCCESS) + goto done; + + r = MSI_DatabaseOpenViewW( db, update, &query ); + if (r != ERROR_SUCCESS) + goto done; + + r = MSI_ViewExecute( query, rec ); msiobj_release( &query->hdr ); + +done: msiobj_release( &rec->hdr ); return r; } @@ -1345,14 +1369,14 @@ static UINT TABLE_set_row( struct tagMSIVIEW *view, UINT row, MSIRECORD *rec, UI if ( r != ERROR_SUCCESS ) return r; - r = msi_stream_name( tv, row, &stname ); + r = get_stream_name( tv, row, &stname ); if ( r != ERROR_SUCCESS ) { IStream_Release( stm ); return r; } - r = msi_addstreamW( tv->db, stname, stm ); + r = add_stream( tv->db, stname, stm ); IStream_Release( stm ); msi_free ( stname );

1 0

Hans Leidekker : msi: Add offsets to file patch sequence numbers.
by Alexandre Julliard 04 Mar '15

04 Mar '15

Module: wine Branch: master Commit: 4c1791f53ef4fefe9ed4f4475cb0c23a1fbb001a URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c1791f53ef4fefe9ed4f4475… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Mar 4 14:30:42 2015 +0100 msi: Add offsets to file patch sequence numbers. --- dlls/msi/action.c | 14 +--- dlls/msi/msipriv.h | 2 + dlls/msi/patch.c | 220 ++++++++++++++++++++++++++++++++++++++--------------- 3 files changed, 166 insertions(+), 70 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4c1791f53ef4fefe9ed4f…

1 0

Alexandre Julliard : Revert "shell32: Also return Attributes in GetFolderDefinition."
by Alexandre Julliard 04 Mar '15

04 Mar '15

Module: wine Branch: master Commit: 39f6d04aa0d69cf417e6a9c119a13b09c603f8b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=39f6d04aa0d69cf417e6a9c11… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 4 11:34:15 2015 +0900 Revert "shell32: Also return Attributes in GetFolderDefinition." This reverts commit 0becff824466b330675fabbd59241a150eebabeb. The wrong patch was committed. --- dlls/vbscript/global.c | 25 ++----------------------- dlls/vbscript/tests/api.vbs | 42 ------------------------------------------ 2 files changed, 2 insertions(+), 65 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index 012383b..448b886 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -1268,29 +1268,8 @@ static HRESULT Global_ChrB(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARI static HRESULT Global_Asc(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) { - HRESULT hres; - BSTR bstr; - WCHAR ret; - - TRACE("(%s)\n", debugstr_variant(arg)); - - switch(V_VT(arg)) { - case VT_NULL: - return MAKE_VBSERROR(VBSE_ILLEGAL_NULL_USE); - case VT_EMPTY: - return MAKE_VBSERROR(VBSE_ILLEGAL_FUNC_CALL); - case VT_BSTR: - bstr = V_BSTR(arg); - default: - hres = to_string(arg, &bstr); - if(FAILED(hres)) - return hres; - } - - ret = bstr[0]; - if(ret == 0) - return MAKE_VBSERROR(VBSE_ILLEGAL_FUNC_CALL); - return return_short(res, ret); + FIXME("\n"); + return E_NOTIMPL; } /* The function supports only single-byte and double-byte character sets. It diff --git a/dlls/vbscript/tests/api.vbs b/dlls/vbscript/tests/api.vbs index a44f8e6..8c92cf5 100644 --- a/dlls/vbscript/tests/api.vbs +++ b/dlls/vbscript/tests/api.vbs @@ -1324,46 +1324,4 @@ Call testRGBError(&h4d&, -2, &h2f&, 5) Call ok(getVT(Timer) = "VT_R4", "getVT(Timer) = " & getVT(Timer)) - -Sub testAscError(strings, error_num) - on error resume next - Dim x - - Call Err.clear() - x = Asc(strings) - Call ok(Err.number = error_num, "Err.number = " & Err.number) -End Sub - -Call ok(Asc(0) = 48, "Asc(0) = " & Asc(0)) -Call ok(getVT(Asc(0)) = "VT_I2", "getVT(Asc(0)) = " & getVT(Asc(0))) -Call ok(Asc(-32769) = 45, "Asc(-32769) = " & Asc(-32769)) -Call ok(getVT(Asc(-32769)) = "VT_I2", "getVT(Asc(-32769)) = " & getVT(Asc(-32769))) -Call ok(Asc(CSng(90.68)) = 57, "Asc(CSng(90.68)) = " & Asc(CSng(90.68))) -Call ok(getVT(Asc(CSng(90.68))) = "VT_I2", "getVT(Asc(CSng(90.68))) = " & getVT(Asc(CSng(90.68)))) -Call ok(Asc(123) = 49, "Asc(123) = " & Asc(123)) -Call ok(getVT(Asc(123)) = "VT_I2", "getVT(Asc(123)) = " & getVT(Asc(123))) -Call ok(Asc(CCur(234)) = 50, "Asc(CCur(234)) = " & Asc(CCur(234))) -Call ok(getVT(Asc(CCur(234))) = "VT_I2", "getVT(Asc(CCur(234))) = " & getVT(Asc(CCur(234)))) -Call ok(Asc("abc") = 97, "Asc(""abc"") = " & Asc("abc")) -Call ok(getVT(Asc("abc")) = "VT_I2", "getVT(Asc(""abc"")) = " & getVT(Asc("abc"))) -Call ok(Asc("?") = 63, "Asc(""?"") = " & Asc("?")) -Call ok(getVT(Asc("?")) = "VT_I2", "getVT(Asc(""?"")) = " & getVT(Asc("?"))) -Call ok(Asc(" space") = 32, "Asc("" space"") = " & Asc(" space")) -Call ok(getVT(Asc(" space")) = "VT_I2", "getVT(Asc("" space"")) = " & getVT(Asc(" space"))) -Call ok(Asc("@") = 64, "Asc(""@"") = " & Asc("@")) -Call ok(getVT(Asc("@")) = "VT_I2", "getVT(Asc(""@"")) = " & getVT(Asc("@"))) -Call ok(Asc("\n") = 92, "Asc(""\n"") = " & Asc("\n")) -Call ok(getVT(Asc("\n")) = "VT_I2", "getVT(Asc(""\n"")) = " & getVT(Asc("\n"))) -if isEnglishLang then - Call ok(Asc(False) = 70, "Asc(False) = " & Asc(False)) - Call ok(getVT(Asc(False)) = "VT_I2", "getVT(Asc(False)) = " & getVT(Asc(False))) - Call ok(Asc(True) = 84, "Asc(True) = " & Asc(True)) - Call ok(getVT(Asc(True)) = "VT_I2", "getVT(Asc(True)) = " & getVT(Asc(True))) -End if -Call ok(Asc(CByte(7)) = 55, "Asc(CByte(7)) = " & Asc(CByte(7))) -Call ok(getVT(Asc(CByte(7))) = "VT_I2", "getVT(Asc(CByte(7))) = " & getVT(Asc(CByte(7)))) -Call testAscError(Empty, 5) -Call testAscError(Null, 94) -Call testAscError("", 5) - Call reportSuccess()

1 0

Alexandre Julliard : include: Avoid IKsPropertySet forward type redefinition.
by Alexandre Julliard 04 Mar '15

04 Mar '15

Module: wine Branch: master Commit: ecd350c3ff214bc731f03d30ba743deaf7db82b4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ecd350c3ff214bc731f03d30b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 4 11:40:12 2015 +0900 include: Avoid IKsPropertySet forward type redefinition. --- include/dsound.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/dsound.h b/include/dsound.h index c7a2bd5..fa23e86 100644 --- a/include/dsound.h +++ b/include/dsound.h @@ -1138,6 +1138,7 @@ DECLARE_INTERFACE_(IDirectSound3DBuffer,IUnknown) */ #ifndef _IKsPropertySet_ #define _IKsPropertySet_ +#define __IKsPropertySet_FWD_DEFINED__ typedef struct IKsPropertySet *LPKSPROPERTYSET;

1 0

Alexandre Julliard : wrc: Remove duplicate parentheses.
by Alexandre Julliard 04 Mar '15

04 Mar '15

Module: wine Branch: master Commit: f15d077f936e01c7b95f55e26dffde990420d91f URL: http://source.winehq.org/git/wine.git/?a=commit;h=f15d077f936e01c7b95f55e26… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 4 11:40:01 2015 +0900 wrc: Remove duplicate parentheses. --- tools/wrc/translation.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/wrc/translation.c b/tools/wrc/translation.c index b7caa07..bdbcb43 100644 --- a/tools/wrc/translation.c +++ b/tools/wrc/translation.c @@ -611,7 +611,7 @@ static int compare_ver_block(ver_block_t *ver_block1, ver_block_t *ver_block2); static int compare_ver_value(ver_value_t *ver_value1, ver_value_t *ver_value2) { int different = 0; int i = 0; - if((ver_value1->type == ver_value2->type)) { + if (ver_value1->type == ver_value2->type) { switch(ver_value1->type) { case val_str: if(ver_value1->key && ver_value2->key)

1 0

Alexandre Julliard : winebuild: Avoid assigning values outside of the target_cpu enum range.
by Alexandre Julliard 04 Mar '15

04 Mar '15

Module: wine Branch: master Commit: 109738437749028bacb747984a7fe1271d895691 URL: http://source.winehq.org/git/wine.git/?a=commit;h=109738437749028bacb747984… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 4 17:25:06 2015 +0900 winebuild: Avoid assigning values outside of the target_cpu enum range. --- tools/winebuild/build.h | 2 +- tools/winebuild/main.c | 7 +++++-- tools/winebuild/parser.c | 2 +- tools/winebuild/utils.c | 2 +- 4 files changed, 8 insertions(+), 5 deletions(-) diff --git a/tools/winebuild/build.h b/tools/winebuild/build.h index 41cec91..4a71eed 100644 --- a/tools/winebuild/build.h +++ b/tools/winebuild/build.h @@ -262,7 +262,7 @@ extern DLLSPEC *alloc_dll_spec(void); extern void free_dll_spec( DLLSPEC *spec ); extern const char *make_c_identifier( const char *str ); extern const char *get_stub_name( const ORDDEF *odp, const DLLSPEC *spec ); -extern enum target_cpu get_cpu_from_name( const char *name ); +extern int get_cpu_from_name( const char *name ); extern unsigned int get_alignment(unsigned int align); extern unsigned int get_page_size(void); extern unsigned int get_ptr_size(void); diff --git a/tools/winebuild/main.c b/tools/winebuild/main.c index 807cf61..d1717c0 100644 --- a/tools/winebuild/main.c +++ b/tools/winebuild/main.c @@ -199,9 +199,12 @@ static void set_target( const char *target ) if ((p = strchr( spec, '-' ))) { + int cpu; + *p++ = 0; - if ((target_cpu = get_cpu_from_name( spec )) == -1) - fatal_error( "Unrecognized CPU '%s'\n", spec ); + cpu = get_cpu_from_name( spec ); + if (cpu == -1) fatal_error( "Unrecognized CPU '%s'\n", spec ); + target_cpu = cpu; platform = p; if ((p = strrchr( p, '-' ))) platform = p + 1; } diff --git a/tools/winebuild/parser.c b/tools/winebuild/parser.c index 0498e75..bae2b47 100644 --- a/tools/winebuild/parser.c +++ b/tools/winebuild/parser.c @@ -473,7 +473,7 @@ static const char *parse_spec_flags( DLLSPEC *spec, ORDDEF *odp ) odp->flags |= FLAG_CPU_WIN64; else { - enum target_cpu cpu = get_cpu_from_name( cpu_name ); + int cpu = get_cpu_from_name( cpu_name ); if (cpu == -1) { error( "Unknown architecture '%s'\n", cpu_name ); diff --git a/tools/winebuild/utils.c b/tools/winebuild/utils.c index 566911f..b9318c3 100644 --- a/tools/winebuild/utils.c +++ b/tools/winebuild/utils.c @@ -869,7 +869,7 @@ const char *get_stub_name( const ORDDEF *odp, const DLLSPEC *spec ) } /* parse a cpu name and return the corresponding value */ -enum target_cpu get_cpu_from_name( const char *name ) +int get_cpu_from_name( const char *name ) { unsigned int i;

1 0

Alexandre Julliard : msvcp90: Add support for throwing bad cast exception to avoid unused variable warning.
by Alexandre Julliard 04 Mar '15

04 Mar '15

Module: wine Branch: master Commit: e1cf7f5a2ef83460fd1e8639636b2ce68349232c URL: http://source.winehq.org/git/wine.git/?a=commit;h=e1cf7f5a2ef83460fd1e86396… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 4 13:42:13 2015 +0900 msvcp90: Add support for throwing bad cast exception to avoid unused variable warning. --- dlls/msvcp90/cxx.h | 1 + dlls/msvcp90/exception.c | 5 +++++ 2 files changed, 6 insertions(+) diff --git a/dlls/msvcp90/cxx.h b/dlls/msvcp90/cxx.h index cf63ac4..fe45bf6 100644 --- a/dlls/msvcp90/cxx.h +++ b/dlls/msvcp90/cxx.h @@ -303,6 +303,7 @@ typedef enum __exception_type { EXCEPTION_RERAISE, EXCEPTION, EXCEPTION_BAD_ALLOC, + EXCEPTION_BAD_CAST, EXCEPTION_LOGIC_ERROR, EXCEPTION_LENGTH_ERROR, EXCEPTION_OUT_OF_RANGE, diff --git a/dlls/msvcp90/exception.c b/dlls/msvcp90/exception.c index da3a4bf..568fa5f 100644 --- a/dlls/msvcp90/exception.c +++ b/dlls/msvcp90/exception.c @@ -623,6 +623,11 @@ void throw_exception(exception_type et, const char *str) MSVCP_bad_alloc_ctor(&e, &addr); _CxxThrowException(&e, &bad_alloc_cxx_type); } + case EXCEPTION_BAD_CAST: { + bad_cast e; + MSVCP_bad_cast_ctor(&e, str); + _CxxThrowException(&e, &bad_cast_cxx_type); + } case EXCEPTION_LOGIC_ERROR: { logic_error e; MSVCP_logic_error_ctor(&e, &addr);

1 0

Alexandre Julliard : msvcrt: Undefine __thiscall before redefining it.
by Alexandre Julliard 04 Mar '15

04 Mar '15

Module: wine Branch: master Commit: cdef3287dba7702f7c379101c769e587d3a14e4c URL: http://source.winehq.org/git/wine.git/?a=commit;h=cdef3287dba7702f7c379101c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 4 13:48:55 2015 +0900 msvcrt: Undefine __thiscall before redefining it. --- dlls/msvcp60/cxx.h | 3 ++- dlls/msvcp90/cxx.h | 3 ++- dlls/msvcrt/cxx.h | 1 + 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/msvcp60/cxx.h b/dlls/msvcp60/cxx.h index 0a1241c..e34a9e3 100644 --- a/dlls/msvcp60/cxx.h +++ b/dlls/msvcp60/cxx.h @@ -16,7 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -/* Copied from dlls/msvcrt/cpp.c */ +/* Copied from dlls/msvcrt/cxx.h */ +#undef __thiscall #ifdef __i386__ /* thiscall functions are i386-specific */ #define THISCALL(func) __thiscall_ ## func diff --git a/dlls/msvcp90/cxx.h b/dlls/msvcp90/cxx.h index fe45bf6..12a7f84 100644 --- a/dlls/msvcp90/cxx.h +++ b/dlls/msvcp90/cxx.h @@ -16,7 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -/* Copied from dlls/msvcrt/cpp.c */ +/* Copied from dlls/msvcrt/cxx.h */ +#undef __thiscall #ifdef __i386__ /* thiscall functions are i386-specific */ #define THISCALL(func) __thiscall_ ## func diff --git a/dlls/msvcrt/cxx.h b/dlls/msvcrt/cxx.h index e649f03..8f31f24 100644 --- a/dlls/msvcrt/cxx.h +++ b/dlls/msvcrt/cxx.h @@ -16,6 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#undef __thiscall #ifdef __i386__ /* thiscall functions are i386-specific */ #define THISCALL(func) __thiscall_ ## func

1 0