wine-commits November 2015

wine-commits@winehq.org

2 participants
623 discussions

Alexandre Julliard : makedep: Store the include paths without the -I prefix.
by Alexandre Julliard 11 Nov '15

11 Nov '15

Module: wine Branch: master Commit: acd9c551b71f3cd4a41e8c68ccca026c26a3b5b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=acd9c551b71f3cd4a41e8c68c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 11 15:02:57 2015 +0900 makedep: Store the include paths without the -I prefix. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/makedep.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/tools/makedep.c b/tools/makedep.c index 83f7ede..65178a6 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -149,7 +149,7 @@ static const char *icotool; struct makefile { struct strarray vars; - struct strarray include_args; + struct strarray include_paths; struct strarray define_args; struct strarray programs; struct strarray scripts; @@ -1397,9 +1397,9 @@ static struct file *open_include_file( const struct makefile *make, struct incl_ return file; /* now search in include paths */ - for (i = 0; i < make->include_args.count; i++) + for (i = 0; i < make->include_paths.count; i++) { - const char *dir = make->include_args.str[i] + 2; /* skip -I */ + const char *dir = make->include_paths.str[i]; const char *prefix = make->top_src_dir ? make->top_src_dir : make->top_obj_dir; if (prefix) @@ -2002,10 +2002,11 @@ static struct strarray output_sources( const struct makefile *make, struct strar strarray_add( &includes, strmake( "-I%s", obj_dir_path( make, "" ))); if (make->src_dir) strarray_add( &includes, strmake( "-I%s", make->src_dir )); if (make->parent_dir) strarray_add( &includes, strmake( "-I%s", src_dir_path( make, make->parent_dir ))); - if (make->top_obj_dir) strarray_add( &includes, strmake( "-I%s", top_obj_dir_path( make, "include" ))); + strarray_add( &includes, strmake( "-I%s", top_obj_dir_path( make, "include" ))); if (make->top_src_dir) strarray_add( &includes, strmake( "-I%s", top_dir_path( make, "include" ))); if (make->use_msvcrt) strarray_add( &includes, strmake( "-I%s", top_dir_path( make, "include/msvcrt" ))); - strarray_addall( &includes, make->include_args ); + for (i = 0; i < make->include_paths.count; i++) + strarray_add( &includes, strmake( "-I%s", obj_dir_path( make, make->include_paths.str[i] ))); LIST_FOR_EACH_ENTRY( source, &make->sources, struct incl_file, entry ) { @@ -3004,14 +3005,14 @@ static void update_makefile( const char *path ) if (make->module && !make->install_lib.count) strarray_add( &make->install_lib, make->module ); - make->include_args = empty_strarray; + make->include_paths = empty_strarray; make->define_args = empty_strarray; strarray_add( &make->define_args, "-D__WINESRC__" ); value = get_expanded_make_var_array( make, "EXTRAINCL" ); for (i = 0; i < value.count; i++) if (!strncmp( value.str[i], "-I", 2 )) - strarray_add_uniq( &make->include_args, value.str[i] ); + strarray_add_uniq( &make->include_paths, value.str[i] + 2 ); else strarray_add_uniq( &make->define_args, value.str[i] ); strarray_addall( &make->define_args, get_expanded_make_var_array( make, "EXTRADEFS" ));

1 0

Alexandre Julliard : makedep: Add a helper function to open a file from the include path.
by Alexandre Julliard 11 Nov '15

11 Nov '15

Module: wine Branch: master Commit: 54c37238a1ab526680ef0d452f3bc58bfb16eec5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=54c37238a1ab526680ef0d452… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 11 15:01:43 2015 +0900 makedep: Add a helper function to open a file from the include path. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/makedep.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/tools/makedep.c b/tools/makedep.c index edfb3c7..83f7ede 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -1208,13 +1208,17 @@ static struct file *load_file( const char *name ) /******************************************************************* - * open_file + * open_include_path_file + * + * Open a file from a directory on the include path. */ -static struct file *open_file( const struct makefile *make, const char *path, char **filename ) +static struct file *open_include_path_file( const struct makefile *make, const char *dir, + const char *name, char **filename ) { - struct file *ret = load_file( base_dir_path( make, path )); + char *src_path = base_dir_path( make, concat_paths( dir, name )); + struct file *ret = load_file( src_path ); - if (ret) *filename = xstrdup( path ); + if (ret) *filename = src_dir_path( make, concat_paths( dir, name )); return ret; } @@ -1411,7 +1415,7 @@ static struct file *open_include_file( const struct makefile *make, struct incl_ } if (*dir != '/') { - if ((file = open_file( make, concat_paths( dir, pFile->name ), &pFile->filename ))) + if ((file = open_include_path_file( make, dir, pFile->name, &pFile->filename ))) return file; } }

1 0

Alexandre Julliard : makedep: Add a helper function to open a file in the parent's source directory.
by Alexandre Julliard 11 Nov '15

11 Nov '15

Module: wine Branch: master Commit: ec7664d4dbd047f40d22bf265ebddc9383e7b0dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec7664d4dbd047f40d22bf265… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 11 11:54:46 2015 +0900 makedep: Add a helper function to open a file in the parent's source directory. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/makedep.c | 47 +++++++++++++++++++++++++++++++++++++---------- 1 file changed, 37 insertions(+), 10 deletions(-) diff --git a/tools/makedep.c b/tools/makedep.c index d8cf2f5..edfb3c7 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -489,6 +489,25 @@ static char *replace_extension( const char *name, const char *old_ext, const cha /******************************************************************* + * replace_filename + */ +static char *replace_filename( const char *path, const char *name ) +{ + const char *p; + char *ret; + size_t len; + + if (!path) return xstrdup( name ); + if (!(p = strrchr( path, '/' ))) return xstrdup( name ); + len = p - path + 1; + ret = xmalloc( len + strlen( name ) + 1 ); + memcpy( ret, path, len ); + strcpy( ret + len, name ); + return ret; +} + + +/******************************************************************* * strarray_replace_extension */ static struct strarray strarray_replace_extension( const struct strarray *array, @@ -1201,6 +1220,22 @@ static struct file *open_file( const struct makefile *make, const char *path, ch /******************************************************************* + * open_file_same_dir + * + * Open a file in the same directory as the parent. + */ +static struct file *open_file_same_dir( const struct incl_file *parent, const char *name, char **filename ) +{ + char *src_path = replace_filename( parent->file->name, name ); + struct file *ret = load_file( src_path ); + + if (ret) *filename = replace_filename( parent->filename, name ); + free( src_path ); + return ret; +} + + +/******************************************************************* * open_local_file * * Open a file in the source directory of the makefile. @@ -1270,7 +1305,7 @@ static struct file *open_src_file( const struct makefile *make, struct incl_file static struct file *open_include_file( const struct makefile *make, struct incl_file *pFile ) { struct file *file = NULL; - char *filename, *p; + char *filename; unsigned int i, len; errno = ENOENT; @@ -1383,15 +1418,7 @@ static struct file *open_include_file( const struct makefile *make, struct incl_ if (pFile->type == INCL_SYSTEM) return NULL; /* ignore system files we cannot find */ /* try in src file directory */ - if ((p = strrchr(pFile->included_by->filename, '/'))) - { - size_t l = p - pFile->included_by->filename + 1; - filename = xmalloc(l + strlen(pFile->name) + 1); - memcpy( filename, pFile->included_by->filename, l ); - strcpy( filename + l, pFile->name ); - if ((file = open_file( make, filename, &pFile->filename ))) return file; - free( filename ); - } + if ((file = open_file_same_dir( pFile->included_by, pFile->name, &pFile->filename ))) return file; fprintf( stderr, "%s:%d: error: ", pFile->included_by->file->name, pFile->included_line ); perror( pFile->name );

1 0

Stefan Leichter : wimgapi: Add stub for WIMRegisterMessageCallback.
by Alexandre Julliard 11 Nov '15

11 Nov '15

Module: wine Branch: master Commit: 391364e0ba2bca77a798eeba8fee02ac234751be URL: http://source.winehq.org/git/wine.git/?a=commit;h=391364e0ba2bca77a798eeba8… Author: Stefan Leichter <Stefan.Leichter(a)camLine.com> Date: Tue Nov 10 23:33:17 2015 +0100 wimgapi: Add stub for WIMRegisterMessageCallback. Signed-off-by: Stefan Leichter <Stefan.Leichter(a)camLine.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wimgapi/main.c | 6 ++++++ dlls/wimgapi/wimgapi.spec | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/wimgapi/main.c b/dlls/wimgapi/main.c index 5ac8a66..d7c3bab 100644 --- a/dlls/wimgapi/main.c +++ b/dlls/wimgapi/main.c @@ -44,3 +44,9 @@ BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, void *reserved) return TRUE; } + +DWORD WINAPI WIMRegisterMessageCallback(HANDLE wim, FARPROC callback, PVOID data) +{ + FIXME("(%p %p %p) stub\n", wim, callback, data); + return 0; +} diff --git a/dlls/wimgapi/wimgapi.spec b/dlls/wimgapi/wimgapi.spec index b467989..7464a5a 100644 --- a/dlls/wimgapi/wimgapi.spec +++ b/dlls/wimgapi/wimgapi.spec @@ -28,7 +28,7 @@ @ stub WIMMountImageHandle @ stub WIMReadImageFile @ stub WIMRegisterLogFile -@ stub WIMRegisterMessageCallback +@ stdcall WIMRegisterMessageCallback(long ptr ptr) @ stub WIMRemountImage @ stub WIMSetBootImage @ stub WIMSetFileIOCallbackTemporaryPath

1 0

Andrew Eikum : winecoreaudio: Handle sysex MIDI messages.
by Alexandre Julliard 11 Nov '15

11 Nov '15

Module: wine Branch: master Commit: 387fbdc7a164f5bdaba7a26a5da7a68fe7c39efc URL: http://source.winehq.org/git/wine.git/?a=commit;h=387fbdc7a164f5bdaba7a26a5… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Tue Nov 10 13:55:41 2015 -0600 winecoreaudio: Handle sysex MIDI messages. Originally submitted by "tinez <tinez(a)tlen.pl>". Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winecoreaudio.drv/midi.c | 68 ++++++++++++++++++++++++++++++------------- 1 file changed, 48 insertions(+), 20 deletions(-) diff --git a/dlls/winecoreaudio.drv/midi.c b/dlls/winecoreaudio.drv/midi.c index 8593e9c..a40ca2a 100644 --- a/dlls/winecoreaudio.drv/midi.c +++ b/dlls/winecoreaudio.drv/midi.c @@ -437,9 +437,8 @@ static DWORD MIDIOut_LongData(WORD wDevID, LPMIDIHDR lpMidiHdr, DWORD dwSize) return MMSYSERR_ERROR; } } - else - { - FIXME("MOD_MIDIPORT\n"); + else if (destinations[wDevID].caps.wTechnology == MOD_MIDIPORT) { + MIDIOut_Send(MIDIOutPort, destinations[wDevID].dest, lpData, lpMidiHdr->dwBufferLength); } lpMidiHdr->dwFlags &= ~MHDR_INQUEUE; @@ -822,6 +821,7 @@ static CFDataRef MIDIIn_MessageHandler(CFMessagePortRef local, SInt32 msgid, CFD DWORD sendData = 0; int pos = 0; DWORD currentTime; + BOOL sysexStart; switch (msgid) { @@ -836,26 +836,55 @@ static CFDataRef MIDIIn_MessageHandler(CFMessagePortRef local, SInt32 msgid, CFD if (src->state < 1) { TRACE("input not started, thrown away\n"); - goto done; - } - /* FIXME skipping SysEx */ - if (msg->data[0] == 0xF0) - { - FIXME("Starting System Exclusive\n"); - src->state |= 2; + return NULL; } - if (src->state & 2) - { - for (i = 0; i < msg->length; ++i) - { - if (msg->data[i] == 0xF7) - { - FIXME("Ending System Exclusive\n"); - src->state &= ~2; + + sysexStart = (msg->data[0] == 0xF0); + + if (sysexStart || src->state & 2) { + int pos = 0; + int len = msg->length; + + if (sysexStart) { + TRACE("Receiving sysex message\n"); + src->state |= 2; + } + + EnterCriticalSection(&midiInLock); + currentTime = GetTickCount() - src->startTime; + + while (len) { + LPMIDIHDR lpMidiHdr = src->lpQueueHdr; + + if (lpMidiHdr != NULL) { + int copylen = min(len, lpMidiHdr->dwBufferLength - lpMidiHdr->dwBytesRecorded); + memcpy(lpMidiHdr->lpData + lpMidiHdr->dwBytesRecorded, msg->data + pos, copylen); + lpMidiHdr->dwBytesRecorded += copylen; + len -= copylen; + pos += copylen; + + TRACE("Copied %d bytes of sysex message\n", copylen); + + if ((lpMidiHdr->dwBytesRecorded == lpMidiHdr->dwBufferLength) || + (*(BYTE*)(lpMidiHdr->lpData + lpMidiHdr->dwBytesRecorded - 1) == 0xF7)) { + TRACE("Sysex message complete (or buffer limit reached), dispatching %d bytes\n", lpMidiHdr->dwBytesRecorded); + src->lpQueueHdr = lpMidiHdr->lpNext; + lpMidiHdr->dwFlags &= ~MHDR_INQUEUE; + lpMidiHdr->dwFlags |= MHDR_DONE; + MIDI_NotifyClient(msg->devID, MIM_LONGDATA, (DWORD_PTR)lpMidiHdr, currentTime); + src->state &= ~2; + } + } + else { + FIXME("Sysex data received but no buffer to store it!\n"); + break; } } - goto done; + + LeaveCriticalSection(&midiInLock); + return NULL; } + EnterCriticalSection(&midiInLock); currentTime = GetTickCount() - src->startTime; @@ -889,7 +918,6 @@ static CFDataRef MIDIIn_MessageHandler(CFMessagePortRef local, SInt32 msgid, CFD CFRunLoopStop(CFRunLoopGetCurrent()); break; } -done: return NULL; }

1 0

Austin English : bluetoothapis: Add stub dll.
by Alexandre Julliard 11 Nov '15

11 Nov '15

Module: wine Branch: master Commit: b533632c0337c05260e189a08d7547913c04711f URL: http://source.winehq.org/git/wine.git/?a=commit;h=b533632c0337c05260e189a08… Author: Austin English <austinenglish(a)gmail.com> Date: Tue Nov 10 12:02:40 2015 -0600 bluetoothapis: Add stub dll. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 + configure.ac | 1 + dlls/bluetoothapis/Makefile.in | 4 ++ dlls/bluetoothapis/bluetoothapis.spec | 96 +++++++++++++++++++++++++++++++++++ dlls/bluetoothapis/main.c | 40 +++++++++++++++ 5 files changed, 143 insertions(+) diff --git a/configure b/configure index 7161077..af5d7cf 100755 --- a/configure +++ b/configure @@ -963,6 +963,7 @@ enable_avicap32 enable_avifil32 enable_avrt enable_bcrypt +enable_bluetoothapis enable_browseui enable_bthprops_cpl enable_cabinet @@ -17465,6 +17466,7 @@ wine_fn_config_dll avifile.dll16 enable_win16 wine_fn_config_dll avrt enable_avrt implib wine_fn_config_dll bcrypt enable_bcrypt wine_fn_config_test dlls/bcrypt/tests bcrypt_test +wine_fn_config_dll bluetoothapis enable_bluetoothapis wine_fn_config_dll browseui enable_browseui clean,po wine_fn_config_test dlls/browseui/tests browseui_test wine_fn_config_dll bthprops.cpl enable_bthprops_cpl diff --git a/configure.ac b/configure.ac index 84420a9..74800a5 100644 --- a/configure.ac +++ b/configure.ac @@ -2820,6 +2820,7 @@ WINE_CONFIG_DLL(avifile.dll16,enable_win16) WINE_CONFIG_DLL(avrt,,[implib]) WINE_CONFIG_DLL(bcrypt) WINE_CONFIG_TEST(dlls/bcrypt/tests) +WINE_CONFIG_DLL(bluetoothapis) WINE_CONFIG_DLL(browseui,,[clean,po]) WINE_CONFIG_TEST(dlls/browseui/tests) WINE_CONFIG_DLL(bthprops.cpl) diff --git a/dlls/bluetoothapis/Makefile.in b/dlls/bluetoothapis/Makefile.in new file mode 100644 index 0000000..5050cff --- /dev/null +++ b/dlls/bluetoothapis/Makefile.in @@ -0,0 +1,4 @@ +MODULE = bluetoothapis.dll + +C_SRCS = \ + main.c diff --git a/dlls/bluetoothapis/bluetoothapis.spec b/dlls/bluetoothapis/bluetoothapis.spec new file mode 100644 index 0000000..fc24cb3 --- /dev/null +++ b/dlls/bluetoothapis/bluetoothapis.spec @@ -0,0 +1,96 @@ +@ stub BluetoothAddressToString +@ stub BluetoothDisconnectDevice +@ stub BluetoothEnableDiscovery +@ stub BluetoothEnableIncomingConnections +@ stub BluetoothEnumerateInstalledServices +@ stub BluetoothEnumerateInstalledServicesEx +@ stub BluetoothEnumerateLocalServices +@ stub BluetoothFindBrowseGroupClose +@ stub BluetoothFindClassIdClose +@ stub BluetoothFindDeviceClose +@ stub BluetoothFindFirstBrowseGroup +@ stub BluetoothFindFirstClassId +@ stub BluetoothFindFirstDevice +@ stub BluetoothFindFirstProfileDescriptor +@ stub BluetoothFindFirstProtocolDescriptorStack +@ stub BluetoothFindFirstProtocolEntry +@ stub BluetoothFindFirstRadio +@ stub BluetoothFindFirstService +@ stub BluetoothFindFirstServiceEx +@ stub BluetoothFindNextBrowseGroup +@ stub BluetoothFindNextClassId +@ stub BluetoothFindNextDevice +@ stub BluetoothFindNextProfileDescriptor +@ stub BluetoothFindNextProtocolDescriptorStack +@ stub BluetoothFindNextProtocolEntry +@ stub BluetoothFindNextRadio +@ stub BluetoothFindNextService +@ stub BluetoothFindProfileDescriptorClose +@ stub BluetoothFindProtocolDescriptorStackClose +@ stub BluetoothFindProtocolEntryClose +@ stub BluetoothFindRadioClose +@ stub BluetoothFindServiceClose +@ stub BluetoothGATTAbortReliableWrite +@ stub BluetoothGATTBeginReliableWrite +@ stub BluetoothGATTEndReliableWrite +@ stub BluetoothGATTGetCharacteristicValue +@ stub BluetoothGATTGetCharacteristics +@ stub BluetoothGATTGetDescriptorValue +@ stub BluetoothGATTGetDescriptors +@ stub BluetoothGATTGetIncludedServices +@ stub BluetoothGATTGetServices +@ stub BluetoothGATTRegisterEvent +@ stub BluetoothGATTSetCharacteristicValue +@ stub BluetoothGATTSetDescriptorValue +@ stub BluetoothGATTUnregisterEvent +@ stub BluetoothGetDeviceInfo +@ stub BluetoothGetLocalServiceInfo +@ stub BluetoothGetRadioInfo +@ stub BluetoothGetServicePnpInstance +@ stub BluetoothIsConnectable +@ stub BluetoothIsDiscoverable +@ stub BluetoothIsVersionAvailable +@ stub BluetoothRegisterForAuthentication +@ stub BluetoothRegisterForAuthenticationEx +@ stub BluetoothRemoveDevice +@ stub BluetoothSdpEnumAttributes +@ stub BluetoothSdpGetAttributeValue +@ stub BluetoothSdpGetContainerElementData +@ stub BluetoothSdpGetElementData +@ stub BluetoothSdpGetString +@ stub BluetoothSendAuthenticationResponse +@ stub BluetoothSendAuthenticationResponseEx +@ stub BluetoothSetLocalServiceInfo +@ stub BluetoothSetServiceState +@ stub BluetoothSetServiceStateEx +@ stub BluetoothUnregisterAuthentication +@ stub BluetoothUpdateDeviceRecord +@ stub BthpCheckForUnsupportedGuid +@ stub BthpCleanupBRDeviceNode +@ stub BthpCleanupDeviceLocalServices +@ stub BthpCleanupDeviceRemoteServices +@ stub BthpCleanupLEDeviceNodes +@ stub BthpEnableAllServices +@ stub BthpEnableConnectableAndDiscoverable +@ stub BthpEnableRadioSoftware +@ stub BthpFindPnpInfo +@ stub BthpGATTCloseSession +@ stub BthpInnerRecord +@ stub BthpIsBluetoothServiceRunning +@ stub BthpIsConnectableByDefault +@ stub BthpIsDiscoverable +@ stub BthpIsDiscoverableByDefault +@ stub BthpIsRadioSoftwareEnabled +@ stub BthpIsTopOfServiceGroup +@ stub BthpMapStatusToErr +@ stub BthpNextRecord +@ stub BthpRegisterForAuthentication +@ stub BthpSetServiceState +@ stub BthpSetServiceStateEx +@ stub BthpTranspose16Bits +@ stub BthpTranspose32Bits +@ stub BthpTransposeAndExtendBytes +@ stub DllCanUnloadNow +@ stub FindNextOpenVCOMPort +@ stub InstallIncomingComPort +@ stub ShouldForceAuthentication diff --git a/dlls/bluetoothapis/main.c b/dlls/bluetoothapis/main.c new file mode 100644 index 0000000..2ff8f67 --- /dev/null +++ b/dlls/bluetoothapis/main.c @@ -0,0 +1,40 @@ +/* + * Bluetooth APIs + * + * Copyright 2015 Austin English + * + * 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 + */ + +#include "config.h" + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" + +BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, void *reserved) +{ + switch (reason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(instance); + break; + } + + return TRUE; +}

1 0

André Hentschel : dbghelp: Add even more symbol types.
by Alexandre Julliard 11 Nov '15

11 Nov '15

Module: wine Branch: master Commit: d8a39d40d82eb72fedc3b1818bc1e1a02316c82e URL: http://source.winehq.org/git/wine.git/?a=commit;h=d8a39d40d82eb72fedc3b1818… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Nov 10 18:10:16 2015 +0100 dbghelp: Add even more symbol types. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/msc.c | 26 +++++++++---------- include/wine/mscvpdb.h | 68 ++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 81 insertions(+), 13 deletions(-) diff --git a/dlls/dbghelp/msc.c b/dlls/dbghelp/msc.c index b9aebe1..2c1f03b 100644 --- a/dlls/dbghelp/msc.c +++ b/dlls/dbghelp/msc.c @@ -2005,24 +2005,24 @@ static BOOL codeview_snarf(const struct msc_debug_info* msc_dbg, const BYTE* roo break; /* the symbols we can safely ignore for now */ - case 0x112c: + case S_TRAMPOLINE: case S_FRAMEINFO_V2: case S_SECUCOOKIE_V3: case S_SECTINFO_V3: case S_SUBSECTINFO_V3: case S_ENTRYPOINT_V3: - case 0x113e: - case 0x1139: - case 0x1141: - case 0x1142: - case 0x1143: - case 0x1144: - case 0x114c: - case 0x114d: - case 0x114e: - case 0x1145: - case 0x115a: - case 0x1153: + case S_LOCAL_VS2013: + case S_CALLSITEINFO: + case S_DEFRANGE_REGISTER: + case S_DEFRANGE_FRAMEPOINTER_REL: + case S_DEFRANGE_SUBFIELD_REGISTER: + case S_FPOFF_VS2013: + case S_DEFRANGE_REGISTER_REL: + case S_BUILDINFO: + case S_INLINESITE: + case S_INLINESITE_END: + case S_FILESTATIC: + case S_CALLEES: TRACE("Unsupported symbol id %x\n", sym->generic.id); break; diff --git a/include/wine/mscvpdb.h b/include/wine/mscvpdb.h index 4812a3f..7e06a49 100644 --- a/include/wine/mscvpdb.h +++ b/include/wine/mscvpdb.h @@ -1677,10 +1677,13 @@ union codeview_symbol #define S_COMPILAND_V3 0x1101 #define S_THUNK_V3 0x1102 #define S_BLOCK_V3 0x1103 +#define S_WITH_V3 0x1104 #define S_LABEL_V3 0x1105 #define S_REGISTER_V3 0x1106 #define S_CONSTANT_V3 0x1107 #define S_UDT_V3 0x1108 +#define S_COBOLUDT_V3 0x1109 +#define S_MANYREG_V3 0x110A #define S_BPREL_V3 0x110B #define S_LDATA_V3 0x110C #define S_GDATA_V3 0x110D @@ -1690,20 +1693,85 @@ union codeview_symbol #define S_REGREL_V3 0x1111 #define S_LTHREAD_V3 0x1112 #define S_GTHREAD_V3 0x1113 +#define S_LPROCMIPS 0x1114 +#define S_GPROCMIPS 0x1115 #define S_MSTOOL_V3 0x1116 /* compiler command line options and build information */ +#define S_MANYREG2 0x1117 +#define S_LPROCIA64 0x1118 +#define S_GPROCIA64 0x1119 +#define S_LOCALSLOT 0x111A +#define S_PARAMSLOT 0x111B +#define S_LMANDATA 0x111C +#define S_GMANDATA 0x111D +#define S_MANFRAMEREL 0x111E +#define S_MANREGISTER 0x111F +#define S_MANSLOT 0x1120 +#define S_MANMANYREG 0x1121 +#define S_MANREGREL 0x1122 +#define S_MANMANYREG2 0x1123 +#define S_UNAMESPACE 0x1124 #define S_PUB_FUNC1_V3 0x1125 /* didn't get the difference between the two */ +#define S_DATAREF_V3 0x1126 #define S_PUB_FUNC2_V3 0x1127 +#define S_ANNOTATIONREF 0x1128 +#define S_TOKENREF 0x1129 +#define S_GMANPROC 0x112A +#define S_LMANPROC 0x112B +#define S_TRAMPOLINE 0x112C +#define S_MANCONSTANT 0x112D +#define S_ATTR_FRAMEREL 0x112E +#define S_ATTR_REGISTER 0x112F +#define S_ATTR_REGREL 0x1130 +#define S_ATTR_MANYREG 0x1131 +#define S_SEPCODE 0x1132 +#define S_LOCAL_2005 0x1133 +#define S_DEFRANGE_2005 0x1134 +#define S_DEFRANGE2_2005 0x1135 #define S_SECTINFO_V3 0x1136 #define S_SUBSECTINFO_V3 0x1137 #define S_ENTRYPOINT_V3 0x1138 +#define S_CALLSITEINFO 0x1139 #define S_SECUCOOKIE_V3 0x113A +#define S_DISCARDED 0x113B #define S_MSTOOLINFO_V3 0x113C #define S_MSTOOLENV_V3 0x113D #define S_LOCAL_VS2013 0x113E +#define S_DEFRANGE_VS2013 0x113F +#define S_DEFRANGE_SUBFIELD 0x1140 +#define S_DEFRANGE_REGISTER 0x1141 +#define S_DEFRANGE_FRAMEPOINTER_REL 0x1142 +#define S_DEFRANGE_SUBFIELD_REGISTER 0x1143 #define S_FPOFF_VS2013 0x1144 +#define S_DEFRANGE_REGISTER_REL 0x1145 #define S_LPROC32_VS2013 0x1146 #define S_GPROC32_VS2013 0x1147 +#define S_LPROCMIPS_ID 0x1148 +#define S_GPROCMIPS_ID 0x1149 +#define S_LPROCIA64_ID 0x114A +#define S_GPROCIA64_ID 0x114B +#define S_BUILDINFO 0x114C +#define S_INLINESITE 0x114D +#define S_INLINESITE_END 0x114E +#define S_PROC_ID_END 0x114F +#define S_DEFRANGE_HLSL 0x1150 +#define S_GDATA_HLSL 0x1151 +#define S_LDATA_HLSL 0x1152 + +#define S_FILESTATIC 0x1153 +#define S_ARMSWITCHTABLE 0x1159 +#define S_CALLEES 0x115A +#define S_CALLERS 0x115B +#define S_POGODATA 0x115C +#define S_INLINESITE2 0x115D +#define S_HEAPALLOCSITE 0x115E +#define S_MOD_TYPEREF 0x115F +#define S_REF_MINIPDB 0x1160 +#define S_PDBMAP 0x1161 +#define S_GDATA_HLSL32 0x1162 +#define S_LDATA_HLSL32 0x1163 +#define S_GDATA_HLSL32_EX 0x1164 +#define S_LDATA_HLSL32_EX 0x1165 /* ======================================== * * Line number information

1 0

Sebastian Lackner : kernel32: DeleteFile should open the file without read /write permissions.
by Alexandre Julliard 11 Nov '15

11 Nov '15

Module: wine Branch: master Commit: 71581f71d5b1155b056a8d815fe0036479dd54fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=71581f71d5b1155b056a8d815… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Nov 11 01:21:55 2015 +0100 kernel32: DeleteFile should open the file without read/write permissions. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/file.c | 3 +-- dlls/kernel32/tests/file.c | 2 -- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/dlls/kernel32/file.c b/dlls/kernel32/file.c index 40fbd40..b6dba6a 100644 --- a/dlls/kernel32/file.c +++ b/dlls/kernel32/file.c @@ -1683,8 +1683,7 @@ BOOL WINAPI DeleteFileW( LPCWSTR path ) attr.SecurityDescriptor = NULL; attr.SecurityQualityOfService = NULL; - status = NtCreateFile(&hFile, GENERIC_READ | GENERIC_WRITE | SYNCHRONIZE | DELETE, - &attr, &io, NULL, 0, + status = NtCreateFile(&hFile, SYNCHRONIZE | DELETE, &attr, &io, NULL, 0, FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, FILE_OPEN, FILE_DELETE_ON_CLOSE | FILE_NON_DIRECTORY_FILE, NULL, 0); if (status == STATUS_SUCCESS) status = NtClose(hFile); diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index 91abb03..4ad1da8 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -1794,14 +1794,12 @@ static void test_DeleteFileA( void ) SetLastError(0xdeadbeef); ret = DeleteFileA(temp_file); -todo_wine ok(ret, "DeleteFile error %d\n", GetLastError()); SetLastError(0xdeadbeef); ret = CloseHandle(hfile); ok(ret, "CloseHandle error %d\n", GetLastError()); ret = DeleteFileA(temp_file); -todo_wine ok(!ret, "DeleteFile should fail\n"); SetLastError(0xdeadbeef);

1 0

Sebastian Lackner : server: Return STATUS_CANNOT_DELETE when trying to open readonly file with FILE_DELETE_ON_CLOSE.
by Alexandre Julliard 11 Nov '15

11 Nov '15

Module: wine Branch: master Commit: 4857f95803bc23a17c2d1d284701a74140d3e005 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4857f95803bc23a17c2d1d284… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Nov 11 01:21:41 2015 +0100 server: Return STATUS_CANNOT_DELETE when trying to open readonly file with FILE_DELETE_ON_CLOSE. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/file.c | 4 ---- server/fd.c | 9 +++++++++ 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index 643054f..91abb03 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -361,16 +361,12 @@ static void test__lcreat( void ) status = NtCreateFile( &file, DELETE, &attr, &io, NULL, 0, FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, FILE_OPEN, FILE_DELETE_ON_CLOSE | FILE_NON_DIRECTORY_FILE, NULL, 0 ); - todo_wine ok( status == STATUS_CANNOT_DELETE, "expected STATUS_CANNOT_DELETE, got %08x\n", status ); - if (!status) CloseHandle( file ); status = NtCreateFile( &file, DELETE, &attr, &io, NULL, 0, FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, FILE_OPEN, FILE_DELETE_ON_CLOSE | FILE_DIRECTORY_FILE, NULL, 0 ); - todo_wine ok( status == STATUS_NOT_A_DIRECTORY, "expected STATUS_NOT_A_DIRECTORY, got %08x\n", status ); - if (!status) CloseHandle( file ); status = NtCreateFile( &file, DELETE, &attr, &io, NULL, 0, FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, diff --git a/server/fd.c b/server/fd.c index fe778f1..e3fe292 100644 --- a/server/fd.c +++ b/server/fd.c @@ -1850,6 +1850,15 @@ struct fd *open_fd( struct fd *root, const char *name, int flags, mode_t *mode, set_error( err ); goto error; } + + /* can't unlink files if we don't have permission to access */ + if ((options & FILE_DELETE_ON_CLOSE) && !(flags & O_CREAT) && + !(st.st_mode & (S_IWUSR | S_IWGRP | S_IWOTH))) + { + set_error( STATUS_CANNOT_DELETE ); + goto error; + } + fd->closed->unlink = (options & FILE_DELETE_ON_CLOSE) != 0; if (flags & O_TRUNC) {

1 0

Sebastian Lackner : kernel32/tests: Add some more tests for opening a file with FILE_DELETE_ON_CLOSE.
by Alexandre Julliard 11 Nov '15

11 Nov '15

Module: wine Branch: master Commit: c74bb13d2ea6a0d36d963e3b1a3386e10edd0afd URL: http://source.winehq.org/git/wine.git/?a=commit;h=c74bb13d2ea6a0d36d963e3b1… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Nov 11 01:21:28 2015 +0100 kernel32/tests: Add some more tests for opening a file with FILE_DELETE_ON_CLOSE. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/file.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index ca49863..643054f 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -365,6 +365,20 @@ static void test__lcreat( void ) ok( status == STATUS_CANNOT_DELETE, "expected STATUS_CANNOT_DELETE, got %08x\n", status ); if (!status) CloseHandle( file ); + status = NtCreateFile( &file, DELETE, &attr, &io, NULL, 0, + FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, + FILE_OPEN, FILE_DELETE_ON_CLOSE | FILE_DIRECTORY_FILE, NULL, 0 ); + todo_wine + ok( status == STATUS_NOT_A_DIRECTORY, "expected STATUS_NOT_A_DIRECTORY, got %08x\n", status ); + if (!status) CloseHandle( file ); + + status = NtCreateFile( &file, DELETE, &attr, &io, NULL, 0, + FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, + FILE_OPEN_IF, FILE_DELETE_ON_CLOSE | FILE_NON_DIRECTORY_FILE, NULL, 0 ); + todo_wine + ok( status == STATUS_CANNOT_DELETE, "expected STATUS_CANNOT_DELETE, got %08x\n", status ); + if (!status) CloseHandle( file ); + RtlFreeUnicodeString( &filenameW ); todo_wine

1 0

← Newer
1
...
32
33
34
35
36
37
38
...
63
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits November 2015