Ros-diffs

ros-diffs@reactos.org

81390 discussions

[akhaldi] 66841: [DBGHELP] Sync with Wine Staging 1.7.37. CORE-9246
by akhaldi＠svn.reactos.org 20 Mar '15

20 Mar '15

Author: akhaldi Date: Fri Mar 20 18:27:31 2015 New Revision: 66841 URL: http://svn.reactos.org/svn/reactos?rev=66841&view=rev Log: [DBGHELP] Sync with Wine Staging 1.7.37. CORE-9246 Modified: trunk/reactos/dll/win32/dbghelp/cpu_x86_64.c trunk/reactos/dll/win32/dbghelp/dwarf.c trunk/reactos/dll/win32/dbghelp/elf_module.c trunk/reactos/dll/win32/dbghelp/macho_module.c trunk/reactos/dll/win32/dbghelp/pe_module.c trunk/reactos/dll/win32/dbghelp/stack.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/dbghelp/cpu_x86_64.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/cpu_x86_… ============================================================================== --- trunk/reactos/dll/win32/dbghelp/cpu_x86_64.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/dbghelp/cpu_x86_64.c [iso-8859-1] Fri Mar 20 18:27:31 2015 @@ -67,21 +67,6 @@ * OPTIONAL ULONG ExceptionData[]; */ } UNWIND_INFO, *PUNWIND_INFO; - -#define GetUnwindCodeEntry(info, index) \ - ((info)->UnwindCode[index]) - -#define GetLanguageSpecificDataPtr(info) \ - ((PVOID)&GetUnwindCodeEntry((info),((info)->CountOfCodes + 1) & ~1)) - -#define GetExceptionHandler(base, info) \ - ((PEXCEPTION_HANDLER)((base) + *(PULONG)GetLanguageSpecificDataPtr(info))) - -#define GetChainedFunctionEntry(base, info) \ - ((PRUNTIME_FUNCTION)((base) + *(PULONG)GetLanguageSpecificDataPtr(info))) - -#define GetExceptionDataPtr(info) \ - ((PVOID)((PULONG)GetLanguageSpecificData(info) + 1) static BOOL x86_64_get_addr(HANDLE hThread, const CONTEXT* ctx, enum cpu_addr ca, ADDRESS64* addr) Modified: trunk/reactos/dll/win32/dbghelp/dwarf.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/dwarf.c?… ============================================================================== --- trunk/reactos/dll/win32/dbghelp/dwarf.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/dbghelp/dwarf.c [iso-8859-1] Fri Mar 20 18:27:31 2015 @@ -1305,6 +1305,31 @@ return ref_type; } +static struct symt* dwarf2_parse_unspecified_type(dwarf2_parse_context_t* ctx, + dwarf2_debug_info_t* di) +{ + struct attribute name; + struct attribute size; + struct symt_basic *basic; + + TRACE("%s, for %s\n", dwarf2_debug_ctx(ctx), dwarf2_debug_di(di)); + + if (di->symt) return di->symt; + + if (!dwarf2_find_attribute(ctx, di, DW_AT_name, &name)) + name.u.string = "void"; + size.u.uvalue = sizeof(void *); + + basic = symt_new_basic(ctx->module, btVoid, name.u.string, size.u.uvalue); + di->symt = &basic->symt; + + if (!ctx->symt_cache[sc_void]) + ctx->symt_cache[sc_void] = di->symt; + + if (dwarf2_get_di_children(ctx, di)) FIXME("Unsupported children\n"); + return di->symt; +} + static struct symt* dwarf2_parse_reference_type(dwarf2_parse_context_t* ctx, dwarf2_debug_info_t* di) { @@ -1420,6 +1445,9 @@ break; case DW_TAG_subprogram: dwarf2_parse_subprogram(ctx, child); + break; + case DW_TAG_const_type: + dwarf2_parse_const_type(ctx, child); break; case DW_TAG_structure_type: case DW_TAG_class_type: @@ -1432,6 +1460,8 @@ case DW_TAG_variable: case DW_TAG_imported_declaration: case DW_TAG_ptr_to_member_type: + case DW_TAG_GNU_template_parameter_pack: + case DW_TAG_GNU_formal_parameter_pack: /* FIXME: some C++ related stuff */ break; default: @@ -1934,6 +1964,8 @@ case DW_TAG_template_type_param: case DW_TAG_template_value_param: case DW_TAG_GNU_call_site: + case DW_TAG_GNU_template_parameter_pack: + case DW_TAG_GNU_formal_parameter_pack: /* FIXME: no support in dbghelp's internals so far */ break; default: @@ -2046,6 +2078,9 @@ break; case DW_TAG_volatile_type: dwarf2_parse_volatile_type(ctx, di); + break; + case DW_TAG_unspecified_type: + dwarf2_parse_unspecified_type(ctx, di); break; case DW_TAG_reference_type: dwarf2_parse_reference_type(ctx, di); Modified: trunk/reactos/dll/win32/dbghelp/elf_module.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/elf_modu… ============================================================================== --- trunk/reactos/dll/win32/dbghelp/elf_module.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/dbghelp/elf_module.c [iso-8859-1] Fri Mar 20 18:27:31 2015 @@ -1469,9 +1469,11 @@ if (!ret && !strchrW(filename, '/')) { ret = elf_load_file_from_path(pcs, filename, load_offset, dyn_addr, - getenv("PATH"), elf_info) || - elf_load_file_from_path(pcs, filename, load_offset, dyn_addr, - getenv("LD_LIBRARY_PATH"), elf_info); + getenv("PATH"), elf_info); + if (!ret) ret = elf_load_file_from_path(pcs, filename, load_offset, dyn_addr, + getenv("LD_LIBRARY_PATH"), elf_info); + if (!ret) ret = elf_load_file_from_path(pcs, filename, load_offset, dyn_addr, + BINDIR, elf_info); if (!ret) ret = elf_load_file_from_dll_path(pcs, filename, load_offset, dyn_addr, elf_info); } Modified: trunk/reactos/dll/win32/dbghelp/macho_module.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/macho_mo… ============================================================================== --- trunk/reactos/dll/win32/dbghelp/macho_module.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/dbghelp/macho_module.c [iso-8859-1] Fri Mar 20 18:27:31 2015 @@ -966,10 +966,10 @@ &pbi, sizeof(pbi), NULL); if (status == STATUS_SUCCESS) { - ULONG dyld_image_info; + ULONG_PTR dyld_image_info; /* Read dyld image info address from PEB */ - if (ReadProcessMemory(pcs->handle, &pbi.PebBaseAddress->Reserved, + if (ReadProcessMemory(pcs->handle, &pbi.PebBaseAddress->Reserved[0], &dyld_image_info, sizeof(dyld_image_info), NULL)) { TRACE("got dyld_image_info 0x%08x from PEB %p MacDyldImageInfo %p\n", @@ -979,6 +979,7 @@ } } +#ifndef __LP64__ /* No reading the symtab with nlist(3) in LP64 */ if (!ret) { static void* dyld_all_image_infos_addr; @@ -1002,6 +1003,7 @@ ret = TRUE; } } +#endif } if (macho_info->flags & MACHO_INFO_MODULE) Modified: trunk/reactos/dll/win32/dbghelp/pe_module.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/pe_modul… ============================================================================== --- trunk/reactos/dll/win32/dbghelp/pe_module.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/dbghelp/pe_module.c [iso-8859-1] Fri Mar 20 18:27:31 2015 @@ -504,7 +504,7 @@ static BOOL pe_load_dwarf(struct module* module) { struct image_file_map* fmap = &module->format_info[DFI_PE]->u.pe_info->fmap; - BOOL ret = FALSE; + BOOL ret; ret = dwarf2_parse(module, module->module.BaseOfImage - fmap->u.pe.ntheader.OptionalHeader.ImageBase, Modified: trunk/reactos/dll/win32/dbghelp/stack.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/stack.c?… ============================================================================== --- trunk/reactos/dll/win32/dbghelp/stack.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/dbghelp/stack.c [iso-8859-1] Fri Mar 20 18:27:31 2015 @@ -233,15 +233,6 @@ if (!cpu->stack_walk(&csw, frame, ctx)) return FALSE; /* we don't handle KdHelp */ - frame->KdHelp.Thread = 0xC000FADE; - frame->KdHelp.ThCallbackStack = 0x10; - frame->KdHelp.ThCallbackBStore = 0; - frame->KdHelp.NextCallback = 0; - frame->KdHelp.FramePointer = 0; - frame->KdHelp.KiCallUserMode = 0xD000DAFE; - frame->KdHelp.KeUserCallbackDispatcher = 0xE000F000; - frame->KdHelp.SystemRangeStart = 0xC0000000; - frame->KdHelp.Reserved[0] /* KiUserExceptionDispatcher */ = 0xE0005000; return TRUE; } Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Fri Mar 20 18:27:31 2015 @@ -70,7 +70,7 @@ reactos/dll/win32/cryptdll # Synced to Wine-1.7.27 reactos/dll/win32/cryptnet # Synced to WineStaging-1.7.37 reactos/dll/win32/cryptui # Synced to Wine-1.7.27 -reactos/dll/win32/dbghelp # Synced to Wine-1.7.27 +reactos/dll/win32/dbghelp # Synced to WineStaging-1.7.37 reactos/dll/win32/dciman32 # Synced to Wine-1.7.27 reactos/dll/win32/dwmapi # Synced to Wine-1.7.27 reactos/dll/win32/faultrep # Synced to Wine-1.7.27

1 0

[akhaldi] 66840: [PSDK] Add some missing mmsystem.h structures.
by akhaldi＠svn.reactos.org 20 Mar '15

20 Mar '15

Author: akhaldi Date: Fri Mar 20 18:26:11 2015 New Revision: 66840 URL: http://svn.reactos.org/svn/reactos?rev=66840&view=rev Log: [PSDK] Add some missing mmsystem.h structures. Modified: trunk/reactos/include/psdk/mmsystem.h Modified: trunk/reactos/include/psdk/mmsystem.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/mmsystem.h?re… ============================================================================== --- trunk/reactos/include/psdk/mmsystem.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/mmsystem.h [iso-8859-1] Fri Mar 20 18:26:11 2015 @@ -1702,6 +1702,222 @@ WORD wReserved5; } MCI_WAVE_SET_PARMS,*PMCI_WAVE_SET_PARMS,*LPMCI_WAVE_SET_PARMS; +typedef struct tagWAVEOUTCAPS2A { + WORD wMid; + WORD wPid; + MMVERSION vDriverVersion; + CHAR szPname[MAXPNAMELEN]; + DWORD dwFormats; + WORD wChannels; + WORD wReserved1; + DWORD dwSupport; + GUID ManufacturerGuid; + GUID ProductGuid; + GUID NameGuid; +} WAVEOUTCAPS2A, *LPWAVEOUTCAPS2A; + +typedef struct tagWAVEOUTCAPS2W { + WORD wMid; + WORD wPid; + MMVERSION vDriverVersion; + WCHAR szPname[MAXPNAMELEN]; + DWORD dwFormats; + WORD wChannels; + WORD wReserved1; + DWORD dwSupport; + GUID ManufacturerGuid; + GUID ProductGuid; + GUID NameGuid; +} WAVEOUTCAPS2W, *LPWAVEOUTCAPS2W; + +typedef struct tagWAVEINCAPS2A { + WORD wMid; + WORD wPid; + MMVERSION vDriverVersion; + CHAR szPname[MAXPNAMELEN]; + DWORD dwFormats; + WORD wChannels; + WORD wReserved1; + GUID ManufacturerGuid; + GUID ProductGuid; + GUID NameGuid; +} WAVEINCAPS2A, *LPWAVEINCAPS2A; + +typedef struct tagWAVEINCAPS2W { + WORD wMid; + WORD wPid; + MMVERSION vDriverVersion; + WCHAR szPname[MAXPNAMELEN]; + DWORD dwFormats; + WORD wChannels; + WORD wReserved1; + GUID ManufacturerGuid; + GUID ProductGuid; + GUID NameGuid; +} WAVEINCAPS2W, *LPWAVEINCAPS2W; + +typedef struct tagMIDIOUTCAPS2A { + WORD wMid; + WORD wPid; + MMVERSION vDriverVersion; + CHAR szPname[MAXPNAMELEN]; + WORD wTechnology; + WORD wVoices; + WORD wNotes; + WORD wChannelMask; + DWORD dwSupport; + GUID ManufacturerGuid; + GUID ProductGuid; + GUID NameGuid; +} MIDIOUTCAPS2A, *LPMIDIOUTCAPS2A; + +typedef struct tagMIDIOUTCAPS2W { + WORD wMid; + WORD wPid; + MMVERSION vDriverVersion; + WCHAR szPname[MAXPNAMELEN]; + WORD wTechnology; + WORD wVoices; + WORD wNotes; + WORD wChannelMask; + DWORD dwSupport; + GUID ManufacturerGuid; + GUID ProductGuid; + GUID NameGuid; +} MIDIOUTCAPS2W, *LPMIDIOUTCAPS2W; + +typedef struct tagMIDIINCAPS2A { + WORD wMid; + WORD wPid; + MMVERSION vDriverVersion; + CHAR szPname[MAXPNAMELEN]; + DWORD dwSupport; + GUID ManufacturerGuid; + GUID ProductGuid; + GUID NameGuid; +} MIDIINCAPS2A, *LPMIDIINCAPS2A; + +typedef struct tagMIDIINCAPS2W { + WORD wMid; + WORD wPid; + MMVERSION vDriverVersion; + WCHAR szPname[MAXPNAMELEN]; + DWORD dwSupport; + GUID ManufacturerGuid; + GUID ProductGuid; + GUID NameGuid; +} MIDIINCAPS2W, *LPMIDIINCAPS2W; + +typedef struct tagAUXCAPS2A { + WORD wMid; + WORD wPid; + MMVERSION vDriverVersion; + CHAR szPname[MAXPNAMELEN]; + WORD wTechnology; + WORD wReserved1; + DWORD dwSupport; + GUID ManufacturerGuid; + GUID ProductGuid; + GUID NameGuid; +} AUXCAPS2A, *LPAUXCAPS2A; + +typedef struct tagAUXCAPS2W { + WORD wMid; + WORD wPid; + MMVERSION vDriverVersion; + WCHAR szPname[MAXPNAMELEN]; + WORD wTechnology; + WORD wReserved1; + DWORD dwSupport; + GUID ManufacturerGuid; + GUID ProductGuid; + GUID NameGuid; +} AUXCAPS2W, *LPAUXCAPS2W; + +typedef struct tagMIXERCAPS2A { + WORD wMid; + WORD wPid; + MMVERSION vDriverVersion; + CHAR szPname[MAXPNAMELEN]; + DWORD fdwSupport; + DWORD cDestinations; + GUID ManufacturerGuid; + GUID ProductGuid; + GUID NameGuid; +} MIXERCAPS2A,*LPMIXERCAPS2A; + +typedef struct tagMIXERCAPS2W { + WORD wMid; + WORD wPid; + MMVERSION vDriverVersion; + WCHAR szPname[MAXPNAMELEN]; + DWORD fdwSupport; + DWORD cDestinations; + GUID ManufacturerGuid; + GUID ProductGuid; + GUID NameGuid; +} MIXERCAPS2W,*LPMIXERCAPS2W; + +typedef struct tagJOYCAPS2A { + WORD wMid; + WORD wPid; + CHAR szPname[MAXPNAMELEN]; + UINT wXmin; + UINT wXmax; + UINT wYmin; + UINT wYmax; + UINT wZmin; + UINT wZmax; + UINT wNumButtons; + UINT wPeriodMin; + UINT wPeriodMax; + UINT wRmin; + UINT wRmax; + UINT wUmin; + UINT wUmax; + UINT wVmin; + UINT wVmax; + UINT wCaps; + UINT wMaxAxes; + UINT wNumAxes; + UINT wMaxButtons; + CHAR szRegKey[MAXPNAMELEN]; + CHAR szOEMVxD[MAX_JOYSTICKOEMVXDNAME]; + GUID ManufacturerGuid; + GUID ProductGuid; + GUID NameGuid; +} JOYCAPS2A, *LPJOYCAPS2A; + +typedef struct tagJOYCAPS2W { + WORD wMid; + WORD wPid; + WCHAR szPname[MAXPNAMELEN]; + UINT wXmin; + UINT wXmax; + UINT wYmin; + UINT wYmax; + UINT wZmin; + UINT wZmax; + UINT wNumButtons; + UINT wPeriodMin; + UINT wPeriodMax; + UINT wRmin; + UINT wRmax; + UINT wUmin; + UINT wUmax; + UINT wVmin; + UINT wVmax; + UINT wCaps; + UINT wMaxAxes; + UINT wNumAxes; + UINT wMaxButtons; + WCHAR szRegKey[MAXPNAMELEN]; + WCHAR szOEMVxD[MAX_JOYSTICKOEMVXDNAME]; + GUID ManufacturerGuid; + GUID ProductGuid; + GUID NameGuid; +} JOYCAPS2W, *LPJOYCAPS2W; + LRESULT WINAPI CloseDriver(_In_ HDRVR, _In_ LPARAM, _In_ LPARAM); HDRVR WINAPI OpenDriver(_In_ LPCWSTR, _In_ LPCWSTR, _In_ LPARAM); LRESULT WINAPI SendDriverMessage(_In_ HDRVR, _In_ UINT, _In_ LPARAM, _In_ LPARAM);

1 0

[akhaldi] 66839: [WINMM_WINETEST] Sync with Wine Staging 1.7.37. CORE-9246
by akhaldi＠svn.reactos.org 20 Mar '15

20 Mar '15

Author: akhaldi Date: Fri Mar 20 18:22:14 2015 New Revision: 66839 URL: http://svn.reactos.org/svn/reactos?rev=66839&view=rev Log: [WINMM_WINETEST] Sync with Wine Staging 1.7.37. CORE-9246 Added: trunk/rostests/winetests/winmm/joystick.c (with props) trunk/rostests/winetests/winmm/mcicda.c (with props) trunk/rostests/winetests/winmm/midi.c (with props) Modified: trunk/rostests/winetests/winmm/CMakeLists.txt trunk/rostests/winetests/winmm/capture.c trunk/rostests/winetests/winmm/mci.c trunk/rostests/winetests/winmm/mixer.c trunk/rostests/winetests/winmm/mmio.c trunk/rostests/winetests/winmm/testlist.c trunk/rostests/winetests/winmm/timer.c trunk/rostests/winetests/winmm/wave.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/rostests/winetests/winmm/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/winmm/CMakeList… Modified: trunk/rostests/winetests/winmm/capture.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/winmm/capture.c… Added: trunk/rostests/winetests/winmm/joystick.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/winmm/joystick.… Modified: trunk/rostests/winetests/winmm/mci.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/winmm/mci.c?rev… Added: trunk/rostests/winetests/winmm/mcicda.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/winmm/mcicda.c?… Added: trunk/rostests/winetests/winmm/midi.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/winmm/midi.c?re… Modified: trunk/rostests/winetests/winmm/mixer.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/winmm/mixer.c?r… Modified: trunk/rostests/winetests/winmm/mmio.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/winmm/mmio.c?re… Modified: trunk/rostests/winetests/winmm/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/winmm/testlist.… Modified: trunk/rostests/winetests/winmm/timer.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/winmm/timer.c?r… Modified: trunk/rostests/winetests/winmm/wave.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/winmm/wave.c?re…

1 0

[cwittich] 66838: [WLANAPI] stub WlanRegisterNotification
by cwittich＠svn.reactos.org 20 Mar '15

20 Mar '15

Author: cwittich Date: Fri Mar 20 13:13:27 2015 New Revision: 66838 URL: http://svn.reactos.org/svn/reactos?rev=66838&view=rev Log: [WLANAPI] stub WlanRegisterNotification Modified: trunk/reactos/dll/win32/wlanapi/main.c trunk/reactos/dll/win32/wlanapi/wlanapi.spec trunk/reactos/include/psdk/wlanapi.h Modified: trunk/reactos/dll/win32/wlanapi/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wlanapi/main.c?r… ============================================================================== --- trunk/reactos/dll/win32/wlanapi/main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wlanapi/main.c [iso-8859-1] Fri Mar 20 13:13:27 2015 @@ -281,6 +281,18 @@ return ERROR_SUCCESS; } +DWORD WINAPI WlanRegisterNotification(IN HANDLE hClientHandle, + IN DWORD dwNotifSource, + IN BOOL bIgnoreDuplicate, + WLAN_NOTIFICATION_CALLBACK funcCallback, + PVOID pCallbackContext, + PVOID pReserved, + PDWORD pdwPrevNotifSource) +{ + UNIMPLEMENTED; + return ERROR_SUCCESS; +} + DWORD WINAPI WlanReasonCodeToString(IN DWORD dwReasonCode, Modified: trunk/reactos/dll/win32/wlanapi/wlanapi.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wlanapi/wlanapi.… ============================================================================== --- trunk/reactos/dll/win32/wlanapi/wlanapi.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wlanapi/wlanapi.spec [iso-8859-1] Fri Mar 20 13:13:27 2015 @@ -19,7 +19,7 @@ @ stub WlanQueryAutoConfigParameter @ stdcall WlanQueryInterface (ptr ptr ptr ptr ptr ptr ptr) @ stdcall WlanReasonCodeToString (long long ptr ptr) -@ stub WlanRegisterNotification +@ stdcall WlanRegisterNotification (ptr long long ptr ptr ptr ptr) @ stdcall WlanRenameProfile (ptr ptr ptr ptr ptr) @ stub WlanSaveTemporaryProfile @ stdcall WlanScan (ptr ptr ptr ptr ptr) Modified: trunk/reactos/include/psdk/wlanapi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/wlanapi.h?rev… ============================================================================== --- trunk/reactos/include/psdk/wlanapi.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/wlanapi.h [iso-8859-1] Fri Mar 20 13:13:27 2015 @@ -229,6 +229,8 @@ typedef L2_NOTIFICATION_DATA WLAN_NOTIFICATION_DATA, *PWLAN_NOTIFICATION_DATA; +typedef void (__stdcall *WLAN_NOTIFICATION_CALLBACK) (PWLAN_NOTIFICATION_DATA, PVOID); + /* Functions */ #if !defined(__midl) && !defined(__WIDL__) PVOID WINAPI WlanAllocateMemory(DWORD dwSize); @@ -247,6 +249,7 @@ DWORD WINAPI WlanIhvControl(IN HANDLE hClientHandle, IN const GUID *pInterfaceGuid, IN WLAN_IHV_CONTROL_TYPE Type, IN DWORD dwInBufferSize, IN PVOID pInBuffer, IN DWORD dwOutBufferSize, PVOID pOutBuffer, OUT PDWORD pdwBytesReturned); DWORD WINAPI WlanQueryInterface(IN HANDLE hClientHandle, IN const GUID *pInterfaceGuid, IN WLAN_INTF_OPCODE OpCode, PVOID pReserved, OUT PDWORD pdwDataSize, OUT PVOID *ppData, WLAN_OPCODE_VALUE_TYPE *pWlanOpcodeValueType); DWORD WINAPI WlanReasonCodeToString(IN DWORD dwReasonCode, IN DWORD dwBufferSize, IN PWCHAR pStringBuffer, PVOID pReserved); +DWORD WINAPI WlanRegisterNotification(IN HANDLE hClientHandle,IN DWORD dwNotifSource, IN BOOL bIgnoreDuplicate, WLAN_NOTIFICATION_CALLBACK funcCallback, PVOID pCallbackContext, PVOID pReserved, PDWORD pdwPrevNotifSource); DWORD WINAPI WlanRenameProfile(IN HANDLE hClientHandle, IN const GUID *pInterfaceGuid, IN LPCWSTR strOldProfileName, IN LPCWSTR strNewProfileName, PVOID pReserved); DWORD WINAPI WlanSetProfile(IN HANDLE hClientHandle, IN const GUID *pInterfaceGuid, IN DWORD dwFlags, IN LPCWSTR strProfileXml, LPCWSTR strAllUserProfileSecurity, IN BOOL bOverwrite, PVOID pReserved, OUT DWORD *pdwReasonCode); DWORD WINAPI WlanSetProfileCustomUserData(IN HANDLE hClientHandle, IN const GUID *pInterfaceGuid, IN LPCWSTR strProfileName, IN DWORD dwDataSize, IN const PBYTE pData, PVOID pReserved);

1 0

[akhaldi] 66837: [WINMM] Apply Wine commit 6501113 by Jörg Höhle: MCI_ALL_DEVICE_ID(MCIDEVICEID) is not a 16bit entity in MCI32. CORE-9246
by akhaldi＠svn.reactos.org 20 Mar '15

20 Mar '15

Author: akhaldi Date: Fri Mar 20 11:16:05 2015 New Revision: 66837 URL: http://svn.reactos.org/svn/reactos?rev=66837&view=rev Log: [WINMM] Apply Wine commit 6501113 by Jörg Höhle: MCI_ALL_DEVICE_ID(MCIDEVICEID) is not a 16bit entity in MCI32. CORE-9246 Modified: trunk/reactos/dll/win32/winmm/mci.c Modified: trunk/reactos/dll/win32/winmm/mci.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/winmm/mci.c?rev=… ============================================================================== --- trunk/reactos/dll/win32/winmm/mci.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/winmm/mci.c [iso-8859-1] Fri Mar 20 11:16:05 2015 @@ -82,7 +82,7 @@ /************************************************************************** * MCI_GetDriver [internal] */ -static LPWINE_MCIDRIVER MCI_GetDriver(UINT16 wDevID) +static LPWINE_MCIDRIVER MCI_GetDriver(UINT wDevID) { LPWINE_MCIDRIVER wmd = 0; @@ -1659,7 +1659,8 @@ TRACE("(%04x, %08X, %p)\n", wDevID, dwParam, lpParms); - if (wDevID == MCI_ALL_DEVICE_ID) { + /* Every device must handle MCI_NOTIFY on its own. */ + if ((UINT16)wDevID == (UINT16)MCI_ALL_DEVICE_ID) { /* FIXME: shall I notify once after all is done, or for * each of the open drivers ? if the latest, which notif * to return when only one fails ? @@ -1885,7 +1886,7 @@ dwRet = MCI_Sound(wDevID, dwParam1, (LPMCI_SOUND_PARMSW)dwParam2); break; default: - if (wDevID == MCI_ALL_DEVICE_ID) { + if ((UINT16)wDevID == (UINT16)MCI_ALL_DEVICE_ID) { FIXME("unhandled MCI_ALL_DEVICE_ID\n"); dwRet = MCIERR_CANNOT_USE_ALL; } else {

1 0

[khornicek] 66836: [RAPPS] - check the HTTP status when downloading a package (trying to run XML files in NTVDM is NOT funny) - cleanup
by khornicek＠svn.reactos.org 20 Mar '15

20 Mar '15

Author: khornicek Date: Fri Mar 20 11:12:00 2015 New Revision: 66836 URL: http://svn.reactos.org/svn/reactos?rev=66836&view=rev Log: [RAPPS] - check the HTTP status when downloading a package (trying to run XML files in NTVDM is NOT funny) - cleanup Modified: trunk/reactos/base/applications/rapps/lang/bg-BG.rc trunk/reactos/base/applications/rapps/lang/cs-CZ.rc trunk/reactos/base/applications/rapps/lang/de-DE.rc trunk/reactos/base/applications/rapps/lang/en-US.rc trunk/reactos/base/applications/rapps/lang/es-ES.rc trunk/reactos/base/applications/rapps/lang/fr-FR.rc trunk/reactos/base/applications/rapps/lang/he-IL.rc trunk/reactos/base/applications/rapps/lang/it-IT.rc trunk/reactos/base/applications/rapps/lang/ja-JP.rc trunk/reactos/base/applications/rapps/lang/no-NO.rc trunk/reactos/base/applications/rapps/lang/pl-PL.rc trunk/reactos/base/applications/rapps/lang/pt-BR.rc trunk/reactos/base/applications/rapps/lang/ro-RO.rc trunk/reactos/base/applications/rapps/lang/ru-RU.rc trunk/reactos/base/applications/rapps/lang/sk-SK.rc trunk/reactos/base/applications/rapps/lang/sq-AL.rc trunk/reactos/base/applications/rapps/lang/sv-SE.rc trunk/reactos/base/applications/rapps/lang/tr-TR.rc trunk/reactos/base/applications/rapps/lang/uk-UA.rc trunk/reactos/base/applications/rapps/lang/zh-CN.rc trunk/reactos/base/applications/rapps/lang/zh-TW.rc trunk/reactos/base/applications/rapps/loaddlg.c trunk/reactos/base/applications/rapps/resource.h Modified: trunk/reactos/base/applications/rapps/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… ============================================================================== --- trunk/reactos/base/applications/rapps/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/lang/bg-BG.rc [iso-8859-1] Fri Mar 20 11:12:00 2015 @@ -199,5 +199,6 @@ IDS_CHOOSE_FOLDER_ERROR "Ð£ÐºÐ°Ð·Ð°Ð»Ð¸ ÑÑÐµ Ð½ÐµÑÑÑÐµÑÑÐ²ÑÐ²Ð°ÑÐ° Ð¿Ð°Ð¿ÐºÐ°!" IDS_APP_REG_REMOVE "Ð£Ð²ÐµÑÐµÐ½ Ð»Ð¸ ÑÑÐµ, ÑÐµ Ð¸ÑÐºÐ°ÑÐµ Ð´Ð° Ð¸Ð·ÑÑÐ¸ÐµÑÐµ Ð´Ð°Ð½Ð½Ð¸ÑÐµ Ð·Ð° ÑÐ»Ð¾Ð¶ÐµÐ½Ð¾ÑÐ¾ Ð¿ÑÐ¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ðµ Ð¾Ñ ÑÐµÐ³Ð¸ÑÑÑÑÐ°?" IDS_INFORMATION "Ð¡Ð²ÐµÐ´ÐµÐ½Ð¸Ñ" + IDS_UNABLE_TO_DOWNLOAD "Unable to download the package! Address not found!" IDS_UNABLE_TO_REMOVE "ÐÑÐµÐ¼Ð°ÑÐ²Ð°Ð½ÐµÑÐ¾ Ð½Ð° Ð´Ð°Ð½Ð½Ð¸ÑÐµ Ð·Ð° Ð¿ÑÐ¸Ð»Ð¾Ð¶ÐµÐ½Ð¸ÐµÑÐ¾ Ð¾Ñ ÑÐµÐ³Ð¸ÑÑÑÑÐ° Ðµ Ð½ÐµÐ²ÑÐ·Ð¼Ð¾Ð¶Ð½Ð¾!" END Modified: trunk/reactos/base/applications/rapps/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… ============================================================================== --- trunk/reactos/base/applications/rapps/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/lang/cs-CZ.rc [iso-8859-1] Fri Mar 20 11:12:00 2015 @@ -200,5 +200,6 @@ IDS_CHOOSE_FOLDER_ERROR "ZvolenÃ¡ sloÅ¾ka neexistuje. VytvoÅit?" IDS_APP_REG_REMOVE "UrÄitÄ odstranit data instalovanÃ©ho programu z registru?" IDS_INFORMATION "Informace" + IDS_UNABLE_TO_DOWNLOAD "Soubor se nepodaÅilo stÃ¡hnout! Adresa nenalezena!" IDS_UNABLE_TO_REMOVE "NepodaÅilo se odstranit data programu z registru!" END Modified: trunk/reactos/base/applications/rapps/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… ============================================================================== --- trunk/reactos/base/applications/rapps/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/lang/de-DE.rc [iso-8859-1] Fri Mar 20 11:12:00 2015 @@ -195,5 +195,6 @@ IDS_CHOOSE_FOLDER_ERROR "Sie haben ein nicht existierendes Verzeichnis angegeben! Neu anlegen?" IDS_APP_REG_REMOVE "Sind Sie sich sicher, dass Sie die Daten dieses Programms aus der Registry entfernen mÃ¶chten?" IDS_INFORMATION "Informationen" + IDS_UNABLE_TO_DOWNLOAD "Unable to download the package! Address not found!" IDS_UNABLE_TO_REMOVE "Konnte die Daten nicht aus der Registry lÃ¶schen!" END Modified: trunk/reactos/base/applications/rapps/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… ============================================================================== --- trunk/reactos/base/applications/rapps/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/lang/en-US.rc [iso-8859-1] Fri Mar 20 11:12:00 2015 @@ -195,5 +195,6 @@ IDS_CHOOSE_FOLDER_ERROR "The folder you have specified does not exist. Create it?" IDS_APP_REG_REMOVE "Are you sure you want to delete the data on the installed program from the registry?" IDS_INFORMATION "Information" + IDS_UNABLE_TO_DOWNLOAD "Unable to download the package! Address not found!" IDS_UNABLE_TO_REMOVE "Unable to remove data on the program from the registry!" END Modified: trunk/reactos/base/applications/rapps/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… ============================================================================== --- trunk/reactos/base/applications/rapps/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/lang/es-ES.rc [iso-8859-1] Fri Mar 20 11:12:00 2015 @@ -198,5 +198,6 @@ IDS_CHOOSE_FOLDER_ERROR "Â¡La carpeta especificada no existe!" IDS_APP_REG_REMOVE "Â¿EstÃ¡ seguro de querer borrar del Registro los datos de instalaciÃ³n del programa?" IDS_INFORMATION "InformaciÃ³n" + IDS_UNABLE_TO_DOWNLOAD "Unable to download the package! Address not found!" IDS_UNABLE_TO_REMOVE "Â¡No se pudieron borrar del Registro los datos de instalaciÃ³n del programa!" END Modified: trunk/reactos/base/applications/rapps/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… ============================================================================== --- trunk/reactos/base/applications/rapps/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/lang/fr-FR.rc [iso-8859-1] Fri Mar 20 11:12:00 2015 @@ -195,5 +195,6 @@ IDS_CHOOSE_FOLDER_ERROR "Le dossier que vous avez spÃ©cifiÃ© n'existe pas. Le crÃ©er ?" IDS_APP_REG_REMOVE "Etes-vous sÃ»r de vouloir supprimer les donnÃ©es du programme installÃ© du registre ?" IDS_INFORMATION "Information" + IDS_UNABLE_TO_DOWNLOAD "Unable to download the package! Address not found!" IDS_UNABLE_TO_REMOVE "Impossible de supprimer les donnÃ©es du programme du registre !" END Modified: trunk/reactos/base/applications/rapps/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… ============================================================================== --- trunk/reactos/base/applications/rapps/lang/he-IL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/lang/he-IL.rc [iso-8859-1] Fri Mar 20 11:12:00 2015 @@ -197,5 +197,6 @@ IDS_CHOOSE_FOLDER_ERROR "The folder you have specified does not exist. Create it?" IDS_APP_REG_REMOVE "Are you sure you want to delete the data on the installed program from the registry?" IDS_INFORMATION "××××¢" + IDS_UNABLE_TO_DOWNLOAD "Unable to download the package! Address not found!" IDS_UNABLE_TO_REMOVE "Unable to remove data on the program from the registry!" END Modified: trunk/reactos/base/applications/rapps/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… ============================================================================== --- trunk/reactos/base/applications/rapps/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/lang/it-IT.rc [iso-8859-1] Fri Mar 20 11:12:00 2015 @@ -195,5 +195,6 @@ IDS_CHOOSE_FOLDER_ERROR "La cartella indicata non esiste. Vuoi crearla?" IDS_APP_REG_REMOVE "Sicuro di voler cancellare dal registry i dati sui programmi installati?" IDS_INFORMATION "Informazioni" + IDS_UNABLE_TO_DOWNLOAD "Unable to download the package! Address not found!" IDS_UNABLE_TO_REMOVE "Impossibile cancellare i dati dal registry!" END Modified: trunk/reactos/base/applications/rapps/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… ============================================================================== --- trunk/reactos/base/applications/rapps/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/lang/ja-JP.rc [iso-8859-1] Fri Mar 20 11:12:00 2015 @@ -195,5 +195,6 @@ IDS_CHOOSE_FOLDER_ERROR "æå®ããããã©ã«ãã¯åå¨ãã¾ãã!" IDS_APP_REG_REMOVE "ã¬ã¸ã¹ããªããã¤ã³ã¹ãã¼ã«ãããããã°ã©ã ã«é¢ãããã¼ã¿ãåé¤ãã¦ãããããã§ãã?" IDS_INFORMATION "æå ±" + IDS_UNABLE_TO_DOWNLOAD "Unable to download the package! Address not found!" IDS_UNABLE_TO_REMOVE "ã¬ã¸ã¹ããªãããã®ããã°ã©ã ã«é¢ãããã¼ã¿ãåé¤ã§ãã¾ãã!" END Modified: trunk/reactos/base/applications/rapps/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… ============================================================================== --- trunk/reactos/base/applications/rapps/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/lang/no-NO.rc [iso-8859-1] Fri Mar 20 11:12:00 2015 @@ -195,5 +195,6 @@ IDS_CHOOSE_FOLDER_ERROR "You have specified a nonexistent folder!" IDS_APP_REG_REMOVE "Are you sure you want to delete the data on the installed program from the registry?" IDS_INFORMATION "Information" + IDS_UNABLE_TO_DOWNLOAD "Unable to download the package! Address not found!" IDS_UNABLE_TO_REMOVE "Unable to remove data on the program from the registry!" END Modified: trunk/reactos/base/applications/rapps/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… ============================================================================== --- trunk/reactos/base/applications/rapps/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/lang/pl-PL.rc [iso-8859-1] Fri Mar 20 11:12:00 2015 @@ -203,5 +203,6 @@ IDS_CHOOSE_FOLDER_ERROR "WybraÅeÅ nieistniejÄcy katalog! Czy chcesz utworzyÄ nowy?" IDS_APP_REG_REMOVE "Czy na pewno chcesz usunÄÄ wpis tego programu z rejestru?" IDS_INFORMATION "Informacja" + IDS_UNABLE_TO_DOWNLOAD "Unable to download the package! Address not found!" IDS_UNABLE_TO_REMOVE "Nie moÅ¼na byÅo usunÄÄ wpisu z rejestru!" END Modified: trunk/reactos/base/applications/rapps/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… ============================================================================== --- trunk/reactos/base/applications/rapps/lang/pt-BR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/lang/pt-BR.rc [iso-8859-1] Fri Mar 20 11:12:00 2015 @@ -197,5 +197,6 @@ IDS_CHOOSE_FOLDER_ERROR "A pasta especificada nÃ£o existe. Deseja criÃ¡-la?" IDS_APP_REG_REMOVE "VocÃª tem certeza que deseja apagar as informaÃ§Ãµes do programa instalado do registro?" IDS_INFORMATION "InformaÃ§Ãµes" + IDS_UNABLE_TO_DOWNLOAD "Unable to download the package! Address not found!" IDS_UNABLE_TO_REMOVE "NÃ£o foi possÃvel remover as informaÃ§Ãµes do programa do registro!" END Modified: trunk/reactos/base/applications/rapps/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… ============================================================================== --- trunk/reactos/base/applications/rapps/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/lang/ro-RO.rc [iso-8859-1] Fri Mar 20 11:12:00 2015 @@ -201,5 +201,6 @@ IDS_CHOOSE_FOLDER_ERROR "Dosarul specificat nu existÄ. DoriÈi crearea lui?" IDS_APP_REG_REMOVE "Sigur doriÈi sÄ ÈtergeÈi datele din registru pentru aceastÄ aplicaÈe?" IDS_INFORMATION "InformaÈie" + IDS_UNABLE_TO_DOWNLOAD "Unable to download the package! Address not found!" IDS_UNABLE_TO_REMOVE "Nu se pot elimina datele din registru pentru acest program!" END Modified: trunk/reactos/base/applications/rapps/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… ============================================================================== --- trunk/reactos/base/applications/rapps/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/lang/ru-RU.rc [iso-8859-1] Fri Mar 20 11:12:00 2015 @@ -195,5 +195,6 @@ IDS_CHOOSE_FOLDER_ERROR "ÐÑ ÑÐºÐ°Ð·Ð°Ð»Ð¸ Ð½ÐµÑÑÑÐµÑÑÐ²ÑÑÑÑÑ Ð¿Ð°Ð¿ÐºÑ!" IDS_APP_REG_REMOVE "ÐÑ Ð´ÐµÐ¹ÑÑÐ²Ð¸ÑÐµÐ»ÑÐ½Ð¾ ÑÐ¾ÑÐ¸ÑÐµ ÑÐ´Ð°Ð»Ð¸ÑÑ Ð´Ð°Ð½Ð½ÑÐµ Ð¾Ð± ÑÑÑÐ°Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ð¾Ð¹ Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð¼Ðµ Ð¸Ð· ÑÐµÐµÑÑÑÐ°?" IDS_INFORMATION "ÐÐ½ÑÐ¾ÑÐ¼Ð°ÑÐ¸Ñ" + IDS_UNABLE_TO_DOWNLOAD "Unable to download the package! Address not found!" IDS_UNABLE_TO_REMOVE "ÐÐµ ÑÐ´Ð°Ð»Ð¾ÑÑ ÑÐ´Ð°Ð»Ð¸ÑÑ Ð´Ð°Ð½Ð½ÑÐµ Ð¾ Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð¼Ðµ Ð¸Ð· ÑÐµÐµÑÑÑÐ°!" END Modified: trunk/reactos/base/applications/rapps/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… ============================================================================== --- trunk/reactos/base/applications/rapps/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/lang/sk-SK.rc [iso-8859-1] Fri Mar 20 11:12:00 2015 @@ -200,5 +200,6 @@ IDS_CHOOSE_FOLDER_ERROR "Zvolili ste si neexistujÃºci prieÄinok!" IDS_APP_REG_REMOVE "Naozaj chcete vymazaÅ¥ Ãºdaje o nainÅ¡talovanom programe z registrov?" IDS_INFORMATION "InformÃ¡cie" + IDS_UNABLE_TO_DOWNLOAD "Unable to download the package! Address not found!" IDS_UNABLE_TO_REMOVE "Nie je moÅ¾nÃ© odstrÃ¡niÅ¥ z registrov Ãºdaje o programe!" END Modified: trunk/reactos/base/applications/rapps/lang/sq-AL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… ============================================================================== --- trunk/reactos/base/applications/rapps/lang/sq-AL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/lang/sq-AL.rc [iso-8859-1] Fri Mar 20 11:12:00 2015 @@ -199,5 +199,6 @@ IDS_CHOOSE_FOLDER_ERROR "Dosja qe keni zgjedhur nuk ekziston. Krijoje?" IDS_APP_REG_REMOVE "Jeni te sigurt qe do ti fshini informacionet e programit te instaluar nga regjistri?" IDS_INFORMATION "Informacione" + IDS_UNABLE_TO_DOWNLOAD "Unable to download the package! Address not found!" IDS_UNABLE_TO_REMOVE "E pamundur te fshihen informacionet e programit nga regjistri!" END Modified: trunk/reactos/base/applications/rapps/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… ============================================================================== --- trunk/reactos/base/applications/rapps/lang/sv-SE.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/lang/sv-SE.rc [iso-8859-1] Fri Mar 20 11:12:00 2015 @@ -202,5 +202,6 @@ IDS_CHOOSE_FOLDER_ERROR "Du har specificrat en ej existerande mapp! Vill du skapa den?" IDS_APP_REG_REMOVE "Ãr du sÃ¤ker pÃ¥ att du vill ta bort data det installerade programmets data frÃ¥n registret?" IDS_INFORMATION "Information" + IDS_UNABLE_TO_DOWNLOAD "Unable to download the package! Address not found!" IDS_UNABLE_TO_REMOVE "Det gick ej att ta bort programmets data frÃ¥n registret!" END Modified: trunk/reactos/base/applications/rapps/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… ============================================================================== --- trunk/reactos/base/applications/rapps/lang/tr-TR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/lang/tr-TR.rc [iso-8859-1] Fri Mar 20 11:12:00 2015 @@ -197,5 +197,6 @@ IDS_CHOOSE_FOLDER_ERROR "BelirttiÄiniz dizin yok. BelirttiÄiniz dizin oluÅturulsun mu?" IDS_APP_REG_REMOVE "Kurulan izlencenin giriÅini deÄer defterinden silmek istediÄinizden emin misiniz?" IDS_INFORMATION "Bilgi" + IDS_UNABLE_TO_DOWNLOAD "Unable to download the package! Address not found!" IDS_UNABLE_TO_REMOVE "Ä°zlencenin giriÅi deÄer defterinden silinemiyor." END Modified: trunk/reactos/base/applications/rapps/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… ============================================================================== --- trunk/reactos/base/applications/rapps/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/lang/uk-UA.rc [iso-8859-1] Fri Mar 20 11:12:00 2015 @@ -203,5 +203,6 @@ IDS_CHOOSE_FOLDER_ERROR "ÐÐ¸ Ð²ÐºÐ°Ð·Ð°Ð»Ð¸ Ð½ÐµÑÑÐ½ÑÑÑÑ ÑÐµÐºÑ!" IDS_APP_REG_REMOVE "ÐÐ¸ Ð´ÑÐ¹ÑÐ½Ð¾ ÑÐ¾ÑÐµÑÐµ Ð²Ð¸Ð´Ð°Ð»Ð¸ÑÐ¸ Ð´Ð°Ð½Ñ Ð¿ÑÐ¾ Ð²ÑÑÐ°Ð½Ð¾Ð²Ð»ÐµÐ½Ñ Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ñ Ð· ÑÐµÑÑÑÑÑ?" IDS_INFORMATION "ÐÐ½ÑÐ¾ÑÐ¼Ð°ÑÑÑ" + IDS_UNABLE_TO_DOWNLOAD "Unable to download the package! Address not found!" IDS_UNABLE_TO_REMOVE "ÐÐµ Ð²Ð´Ð°Ð»Ð¾ÑÑ Ð²Ð¸Ð´Ð°Ð»Ð¸ÑÐ¸ Ð´Ð°Ð½Ñ Ð¿ÑÐ¾ Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ñ Ð· ÑÐµÑÑÑÑÑ!" END Modified: trunk/reactos/base/applications/rapps/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… ============================================================================== --- trunk/reactos/base/applications/rapps/lang/zh-CN.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/lang/zh-CN.rc [iso-8859-1] Fri Mar 20 11:12:00 2015 @@ -197,5 +197,6 @@ IDS_CHOOSE_FOLDER_ERROR "æ¨éæ©çæä»¶å¤¹ä¸åå¨ãåå»ºåï¼" IDS_APP_REG_REMOVE "æ¨ç¡®å®è¦ä»æ³¨åè¡¨å é¤è¯¥ç¨åºçæ°æ®åï¼" IDS_INFORMATION "ä¿¡æ¯" + IDS_UNABLE_TO_DOWNLOAD "Unable to download the package! Address not found!" IDS_UNABLE_TO_REMOVE "æ æ³ä»æ³¨åè¡¨å é¤è¯¥ç¨åºçæ°æ®ï¼" END Modified: trunk/reactos/base/applications/rapps/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… ============================================================================== --- trunk/reactos/base/applications/rapps/lang/zh-TW.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/lang/zh-TW.rc [iso-8859-1] Fri Mar 20 11:12:00 2015 @@ -197,5 +197,6 @@ IDS_CHOOSE_FOLDER_ERROR "æ¨é¸æçè³æå¤¾ä¸åå¨ãåµå»ºåï¼" IDS_APP_REG_REMOVE "æ¨ç¢ºå®è¦å¾ç»éæªåªé¤è©²ç¨å¼çè³æåï¼" IDS_INFORMATION "è³è¨" + IDS_UNABLE_TO_DOWNLOAD "Unable to download the package! Address not found!" IDS_UNABLE_TO_REMOVE "ç¡æ³å¾ç»éæªåªé¤è©²ç¨å¼çè³æï¼" END Modified: trunk/reactos/base/applications/rapps/loaddlg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/lo… ============================================================================== --- trunk/reactos/base/applications/rapps/loaddlg.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/loaddlg.c [iso-8859-1] Fri Mar 20 11:12:00 2015 @@ -191,7 +191,8 @@ IBindStatusCallbackImpl *This; This = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IBindStatusCallbackImpl)); - if (!This) return NULL; + if (!This) + return NULL; This->vtbl = &dlVtbl; This->ref = 1; @@ -209,9 +210,9 @@ WCHAR path[MAX_PATH]; LPWSTR p; HWND Dlg = (HWND) Context; - DWORD len, dwContentLen, dwBytesWritten, dwBytesRead; + DWORD dwContentLen, dwBytesWritten, dwBytesRead, dwStatus; DWORD dwCurrentBytesRead = 0; - DWORD dwBufLen = sizeof(dwContentLen); + DWORD dwStatusLen = sizeof(dwStatus); BOOL bCancelled = FALSE; BOOL bTempfile = FALSE; BOOL bCab = FALSE; @@ -225,15 +226,11 @@ /* built the path for the download */ p = wcsrchr(AppInfo->szUrlDownload, L'/'); - if (!p) goto end; - - len = wcslen(AppInfo->szUrlDownload); - if (len > 4) - { - if (AppInfo->szUrlDownload[len - 4] == '.' && - AppInfo->szUrlDownload[len - 3] == 'c' && - AppInfo->szUrlDownload[len - 2] == 'a' && - AppInfo->szUrlDownload[len - 1] == 'b') + + if (!p) + goto end; + + if (wcscmp(AppInfo->szUrlDownload, APPLICATION_DATABASE_URL) == 0) { bCab = TRUE; if (!GetStorageDirectory(path, sizeof(path) / sizeof(path[0]))) @@ -241,14 +238,10 @@ } else { - if (FAILED(StringCbCopyW(path, sizeof(path), - SettingsInfo.szDownloadDir))) - { + if (FAILED(StringCbCopyW(path, sizeof(path), SettingsInfo.szDownloadDir))) goto end; - } } - } - else goto end; + if (GetFileAttributesW(path) == INVALID_FILE_ATTRIBUTES) { @@ -264,7 +257,9 @@ /* download it */ bTempfile = TRUE; dl = CreateDl(Context, &bCancelled); - if (dl == NULL) goto end; + + if (dl == NULL) + goto end; switch(SettingsInfo.Proxy) { @@ -281,26 +276,54 @@ hOpen = InternetOpenW(lpszAgent, INTERNET_OPEN_TYPE_PRECONFIG, NULL, NULL, 0); break; } - if (!hOpen) goto end; + + if (!hOpen) + goto end; hFile = InternetOpenUrlW(hOpen, AppInfo->szUrlDownload, NULL, 0, INTERNET_FLAG_PRAGMA_NOCACHE|INTERNET_FLAG_KEEP_CONNECTION, 0); - if (!hFile) goto end; + if (!hFile) + goto end; + + if (!HttpQueryInfoW(hFile, HTTP_QUERY_STATUS_CODE | HTTP_QUERY_FLAG_NUMBER, &dwStatus, &dwStatusLen, NULL)) + goto end; + + if(dwStatus != HTTP_STATUS_OK) + { + WCHAR szMsgText[MAX_STR_LEN]; + + if (!LoadStringW(hInst, IDS_UNABLE_TO_DOWNLOAD, szMsgText, sizeof(szMsgText) / sizeof(WCHAR))) + goto end; + + MessageBoxW(hMainWnd, szMsgText, NULL, MB_OK | MB_ICONERROR); + goto end; + } + + dwStatusLen = sizeof(dwStatus); memset(&urlComponents, 0, sizeof(urlComponents)); urlComponents.dwStructSize = sizeof(urlComponents); - if(FAILED(StringCbLengthW(AppInfo->szUrlDownload, sizeof(AppInfo->szUrlDownload), &urlLength))) goto end; + + if(FAILED(StringCbLengthW(AppInfo->szUrlDownload, sizeof(AppInfo->szUrlDownload), &urlLength))) + goto end; + urlComponents.dwSchemeLength = urlLength*sizeof(WCHAR); urlComponents.lpszScheme = malloc(urlComponents.dwSchemeLength); - if(!InternetCrackUrlW(AppInfo->szUrlDownload, urlLength+1, ICU_DECODE | ICU_ESCAPE, &urlComponents)) goto end; + + if(!InternetCrackUrlW(AppInfo->szUrlDownload, urlLength+1, ICU_DECODE | ICU_ESCAPE, &urlComponents)) + goto end; + if(urlComponents.nScheme == INTERNET_SCHEME_HTTP || urlComponents.nScheme == INTERNET_SCHEME_HTTPS) - HttpQueryInfo(hFile, HTTP_QUERY_CONTENT_LENGTH | HTTP_QUERY_FLAG_NUMBER, &dwContentLen, &dwBufLen, 0); + HttpQueryInfo(hFile, HTTP_QUERY_CONTENT_LENGTH | HTTP_QUERY_FLAG_NUMBER, &dwContentLen, &dwStatus, 0); + if(urlComponents.nScheme == INTERNET_SCHEME_FTP) - dwContentLen = FtpGetFileSize(hFile, &dwBufLen); + dwContentLen = FtpGetFileSize(hFile, &dwStatus); + free(urlComponents.lpszScheme); hOut = CreateFileW(path, GENERIC_WRITE, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, CREATE_ALWAYS, 0, NULL); - if (hOut == INVALID_HANDLE_VALUE) goto end; - + + if (hOut == INVALID_HANDLE_VALUE) + goto end; do { @@ -314,21 +337,24 @@ CloseHandle(hOut); hOut = INVALID_HANDLE_VALUE; - if (bCancelled) goto end; + if (bCancelled) + goto end; ShowWindow(Dlg, SW_HIDE); /* run it */ if (!bCab) - { ShellExecuteW( NULL, L"open", path, NULL, NULL, SW_SHOWNORMAL ); - } + end: - if (hOut != INVALID_HANDLE_VALUE) CloseHandle(hOut); + if (hOut != INVALID_HANDLE_VALUE) + CloseHandle(hOut); + InternetCloseHandle(hFile); InternetCloseHandle(hOpen); - if (dl) IBindStatusCallback_Release(dl); + if (dl) + IBindStatusCallback_Release(dl); if (bTempfile) { Modified: trunk/reactos/base/applications/rapps/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/re… ============================================================================== --- trunk/reactos/base/applications/rapps/resource.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/resource.h [iso-8859-1] Fri Mar 20 11:12:00 2015 @@ -95,6 +95,7 @@ #define IDS_APP_REG_REMOVE 116 #define IDS_INFORMATION 117 #define IDS_UNABLE_TO_REMOVE 118 +#define IDS_UNABLE_TO_DOWNLOAD 119 /* Tooltips */ #define IDS_TOOLTIP_INSTALL 200

1 0

[akhaldi] 66835: [IEFRAME][IEXPLORE] Consistently set IE version. Brought to you by Jared. CORE-9395
by akhaldi＠svn.reactos.org 20 Mar '15

20 Mar '15

Author: akhaldi Date: Fri Mar 20 11:01:39 2015 New Revision: 66835 URL: http://svn.reactos.org/svn/reactos?rev=66835&view=rev Log: [IEFRAME][IEXPLORE] Consistently set IE version. Brought to you by Jared. CORE-9395 Modified: trunk/reactos/base/applications/iexplore/iexplore.rc trunk/reactos/dll/win32/ieframe/ieframe.rc Modified: trunk/reactos/base/applications/iexplore/iexplore.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/iexplore… ============================================================================== --- trunk/reactos/base/applications/iexplore/iexplore.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/iexplore/iexplore.rc [iso-8859-1] Fri Mar 20 11:01:39 2015 @@ -18,10 +18,10 @@ #define WINE_FILEDESCRIPTION_STR "Wine Internet Explorer" #define WINE_FILENAME_STR "iexplore.exe" -#define WINE_FILEVERSION 6,0,2900,2180 -#define WINE_FILEVERSION_STR "6.0.2900.2180" -#define WINE_PRODUCTVERSION 6,0,2900,2180 -#define WINE_PRODUCTVERSION_STR "6.0.2900.2180" +#define WINE_FILEVERSION 8,0,6001,18702 +#define WINE_FILEVERSION_STR "8.0.6001.18702" +#define WINE_PRODUCTVERSION 8,0,6001,18702 +#define WINE_PRODUCTVERSION_STR "8.0.6001.18702" #define WINE_EXTRAVALUES VALUE "OLESelfRegister","" #include "wine/wine_common_ver.rc" Modified: trunk/reactos/dll/win32/ieframe/ieframe.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ieframe/ieframe.… ============================================================================== --- trunk/reactos/dll/win32/ieframe/ieframe.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ieframe/ieframe.rc [iso-8859-1] Fri Mar 20 11:01:39 2015 @@ -104,10 +104,10 @@ #define WINE_FILEDESCRIPTION_STR "Internet Browser" #define WINE_FILENAME_STR "ieframe.dll" -#define WINE_FILEVERSION 8,00,7601,17601 -#define WINE_FILEVERSION_STR "8.00.7601.17601" -#define WINE_PRODUCTVERSION 8,00,7601,17601 -#define WINE_PRODUCTVERSION_STR "8.00.7601.17601" +#define WINE_FILEVERSION 8,0,6001,18702 +#define WINE_FILEVERSION_STR "8.0.6001.18702" +#define WINE_PRODUCTVERSION 8,0,6001,18702 +#define WINE_PRODUCTVERSION_STR "8.0.6001.18702" #define WINE_EXTRAVALUES VALUE "OLESelfRegister","" #include <wine/wine_common_ver.rc>

1 0

[akhaldi] 66834: [LOGON][MPLAY32][WRITE] Add missing winuser.h inclusions to some resource files. Spotted initially by Ricardo Hanke in mplay32. CORE-9387
by akhaldi＠svn.reactos.org 20 Mar '15

20 Mar '15

Author: akhaldi Date: Fri Mar 20 10:54:01 2015 New Revision: 66834 URL: http://svn.reactos.org/svn/reactos?rev=66834&view=rev Log: [LOGON][MPLAY32][WRITE] Add missing winuser.h inclusions to some resource files. Spotted initially by Ricardo Hanke in mplay32. CORE-9387 Modified: trunk/reactos/base/applications/mplay32/mplay32.rc trunk/reactos/base/applications/screensavers/logon/logon.rc trunk/reactos/base/applications/write/rsrc.rc Modified: trunk/reactos/base/applications/mplay32/mplay32.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/… ============================================================================== --- trunk/reactos/base/applications/mplay32/mplay32.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mplay32/mplay32.rc [iso-8859-1] Fri Mar 20 10:54:01 2015 @@ -1,4 +1,5 @@ #include <windef.h> +#include <winuser.h> #include "resource.h" Modified: trunk/reactos/base/applications/screensavers/logon/logon.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/screensa… ============================================================================== --- trunk/reactos/base/applications/screensavers/logon/logon.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/screensavers/logon/logon.rc [iso-8859-1] Fri Mar 20 10:54:01 2015 @@ -1,4 +1,5 @@ #include <windef.h> +#include <winuser.h> #include <scrnsave.h> #include "resource.h" Modified: trunk/reactos/base/applications/write/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/write/rs… ============================================================================== --- trunk/reactos/base/applications/write/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/write/rsrc.rc [iso-8859-1] Fri Mar 20 10:54:01 2015 @@ -17,6 +17,7 @@ */ #include <windef.h> +#include <winuser.h> #include "resources.h"

1 0

[akhaldi] 66833: [MPLAY32] Add entries for found mci devices in the "Device" menu. By Ricardo Hanke. CORE-9385
by akhaldi＠svn.reactos.org 20 Mar '15

20 Mar '15

Author: akhaldi Date: Fri Mar 20 10:44:36 2015 New Revision: 66833 URL: http://svn.reactos.org/svn/reactos?rev=66833&view=rev Log: [MPLAY32] Add entries for found mci devices in the "Device" menu. By Ricardo Hanke. CORE-9385 Modified: trunk/reactos/base/applications/mplay32/lang/bg-BG.rc trunk/reactos/base/applications/mplay32/lang/cs-CZ.rc trunk/reactos/base/applications/mplay32/lang/de-DE.rc trunk/reactos/base/applications/mplay32/lang/en-US.rc trunk/reactos/base/applications/mplay32/lang/es-ES.rc trunk/reactos/base/applications/mplay32/lang/fr-FR.rc trunk/reactos/base/applications/mplay32/lang/he-IL.rc trunk/reactos/base/applications/mplay32/lang/it-IT.rc trunk/reactos/base/applications/mplay32/lang/ja-JP.rc trunk/reactos/base/applications/mplay32/lang/nl-NL.rc trunk/reactos/base/applications/mplay32/lang/no-NO.rc trunk/reactos/base/applications/mplay32/lang/pl-PL.rc trunk/reactos/base/applications/mplay32/lang/pt-BR.rc trunk/reactos/base/applications/mplay32/lang/ro-RO.rc trunk/reactos/base/applications/mplay32/lang/ru-RU.rc trunk/reactos/base/applications/mplay32/lang/sk-SK.rc trunk/reactos/base/applications/mplay32/lang/sq-AL.rc trunk/reactos/base/applications/mplay32/lang/sv-SE.rc trunk/reactos/base/applications/mplay32/lang/tr-TR.rc trunk/reactos/base/applications/mplay32/lang/uk-UA.rc trunk/reactos/base/applications/mplay32/lang/zh-CN.rc trunk/reactos/base/applications/mplay32/lang/zh-TW.rc trunk/reactos/base/applications/mplay32/mplay32.c trunk/reactos/base/applications/mplay32/resource.h Modified: trunk/reactos/base/applications/mplay32/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/… ============================================================================== --- trunk/reactos/base/applications/mplay32/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mplay32/lang/bg-BG.rc [iso-8859-1] Fri Mar 20 10:44:36 2015 @@ -26,6 +26,7 @@ END POPUP "&Device" BEGIN + MENUITEM SEPARATOR MENUITEM "&Properties", IDM_DEVPROPS MENUITEM SEPARATOR MENUITEM "&Volume Control", IDM_VOLUMECTL Modified: trunk/reactos/base/applications/mplay32/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/… ============================================================================== --- trunk/reactos/base/applications/mplay32/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mplay32/lang/cs-CZ.rc [iso-8859-1] Fri Mar 20 10:44:36 2015 @@ -27,6 +27,7 @@ END POPUP "&ZaÅÃzenÃ" BEGIN + MENUITEM SEPARATOR MENUITEM "&Vlastnosti", IDM_DEVPROPS MENUITEM SEPARATOR MENUITEM "OvlÃ¡dÃ¡nÃ &hlasitosti", IDM_VOLUMECTL Modified: trunk/reactos/base/applications/mplay32/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/… ============================================================================== --- trunk/reactos/base/applications/mplay32/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mplay32/lang/de-DE.rc [iso-8859-1] Fri Mar 20 10:44:36 2015 @@ -22,6 +22,7 @@ END POPUP "&GerÃ¤t" BEGIN + MENUITEM SEPARATOR MENUITEM "&Eigenschaften", IDM_DEVPROPS MENUITEM SEPARATOR MENUITEM "&LautstÃ¤rkeregelung", IDM_VOLUMECTL Modified: trunk/reactos/base/applications/mplay32/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/… ============================================================================== --- trunk/reactos/base/applications/mplay32/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mplay32/lang/en-US.rc [iso-8859-1] Fri Mar 20 10:44:36 2015 @@ -22,6 +22,7 @@ END POPUP "&Device" BEGIN + MENUITEM SEPARATOR MENUITEM "&Properties", IDM_DEVPROPS MENUITEM SEPARATOR MENUITEM "&Volume Control", IDM_VOLUMECTL Modified: trunk/reactos/base/applications/mplay32/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/… ============================================================================== --- trunk/reactos/base/applications/mplay32/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mplay32/lang/es-ES.rc [iso-8859-1] Fri Mar 20 10:44:36 2015 @@ -22,6 +22,7 @@ END POPUP "&Dispositivo" BEGIN + MENUITEM SEPARATOR MENUITEM "&Propiedades", IDM_DEVPROPS MENUITEM SEPARATOR MENUITEM "Control de &volumen", IDM_VOLUMECTL Modified: trunk/reactos/base/applications/mplay32/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/… ============================================================================== --- trunk/reactos/base/applications/mplay32/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mplay32/lang/fr-FR.rc [iso-8859-1] Fri Mar 20 10:44:36 2015 @@ -22,6 +22,7 @@ END POPUP "PÃ©rip&hÃ©rique" BEGIN + MENUITEM SEPARATOR MENUITEM "&PropriÃ©tÃ©s", IDM_DEVPROPS MENUITEM SEPARATOR MENUITEM "ContrÃ´le du &volume", IDM_VOLUMECTL Modified: trunk/reactos/base/applications/mplay32/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/… ============================================================================== --- trunk/reactos/base/applications/mplay32/lang/he-IL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mplay32/lang/he-IL.rc [iso-8859-1] Fri Mar 20 10:44:36 2015 @@ -22,6 +22,7 @@ END POPUP "&Device" BEGIN + MENUITEM SEPARATOR MENUITEM "&Properties", IDM_DEVPROPS MENUITEM SEPARATOR MENUITEM "&Volume Control", IDM_VOLUMECTL Modified: trunk/reactos/base/applications/mplay32/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/… ============================================================================== --- trunk/reactos/base/applications/mplay32/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mplay32/lang/it-IT.rc [iso-8859-1] Fri Mar 20 10:44:36 2015 @@ -22,6 +22,7 @@ END POPUP "&Device" BEGIN + MENUITEM SEPARATOR MENUITEM "&Properties", IDM_DEVPROPS MENUITEM SEPARATOR MENUITEM "&Volume Control", IDM_VOLUMECTL Modified: trunk/reactos/base/applications/mplay32/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/… ============================================================================== --- trunk/reactos/base/applications/mplay32/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mplay32/lang/ja-JP.rc [iso-8859-1] Fri Mar 20 10:44:36 2015 @@ -22,6 +22,7 @@ END POPUP "&Device" BEGIN + MENUITEM SEPARATOR MENUITEM "&Properties", IDM_DEVPROPS MENUITEM SEPARATOR MENUITEM "&Volume Control", IDM_VOLUMECTL Modified: trunk/reactos/base/applications/mplay32/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/… ============================================================================== --- trunk/reactos/base/applications/mplay32/lang/nl-NL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mplay32/lang/nl-NL.rc [iso-8859-1] Fri Mar 20 10:44:36 2015 @@ -22,6 +22,7 @@ END POPUP "&Device" BEGIN + MENUITEM SEPARATOR MENUITEM "&Properties", IDM_DEVPROPS MENUITEM SEPARATOR MENUITEM "&Volume Control", IDM_VOLUMECTL Modified: trunk/reactos/base/applications/mplay32/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/… ============================================================================== --- trunk/reactos/base/applications/mplay32/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mplay32/lang/no-NO.rc [iso-8859-1] Fri Mar 20 10:44:36 2015 @@ -22,6 +22,7 @@ END POPUP "&Device" BEGIN + MENUITEM SEPARATOR MENUITEM "&Properties", IDM_DEVPROPS MENUITEM SEPARATOR MENUITEM "&Volume Control", IDM_VOLUMECTL Modified: trunk/reactos/base/applications/mplay32/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/… ============================================================================== --- trunk/reactos/base/applications/mplay32/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mplay32/lang/pl-PL.rc [iso-8859-1] Fri Mar 20 10:44:36 2015 @@ -30,6 +30,7 @@ END POPUP "&UrzÄdzenie" BEGIN + MENUITEM SEPARATOR MENUITEM "WÅaÅ&ciwoÅci", IDM_DEVPROPS MENUITEM SEPARATOR MENUITEM "&Regulacja gÅoÅnoÅci", IDM_VOLUMECTL Modified: trunk/reactos/base/applications/mplay32/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/… ============================================================================== --- trunk/reactos/base/applications/mplay32/lang/pt-BR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mplay32/lang/pt-BR.rc [iso-8859-1] Fri Mar 20 10:44:36 2015 @@ -24,6 +24,7 @@ END POPUP "&Device" BEGIN + MENUITEM SEPARATOR MENUITEM "&Properties", IDM_DEVPROPS MENUITEM SEPARATOR MENUITEM "&Volume Control", IDM_VOLUMECTL Modified: trunk/reactos/base/applications/mplay32/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/… ============================================================================== --- trunk/reactos/base/applications/mplay32/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mplay32/lang/ro-RO.rc [iso-8859-1] Fri Mar 20 10:44:36 2015 @@ -28,6 +28,7 @@ END POPUP "&Dispozitiv" BEGIN + MENUITEM SEPARATOR MENUITEM "&ProprietÄÈiâ¦", IDM_DEVPROPS MENUITEM SEPARATOR MENUITEM "Control &volumâ¦", IDM_VOLUMECTL Modified: trunk/reactos/base/applications/mplay32/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/… ============================================================================== --- trunk/reactos/base/applications/mplay32/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mplay32/lang/ru-RU.rc [iso-8859-1] Fri Mar 20 10:44:36 2015 @@ -22,6 +22,7 @@ END POPUP "&Ð£ÑÑÑÐ¾Ð¹ÑÑÐ²Ð¾" BEGIN + MENUITEM SEPARATOR MENUITEM "&Ð¡Ð²Ð¾Ð¹ÑÑÐ²Ð°", IDM_DEVPROPS MENUITEM SEPARATOR MENUITEM "&ÐÑÐ¾Ð¼ÐºÐ¾ÑÑÑ", IDM_VOLUMECTL Modified: trunk/reactos/base/applications/mplay32/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/… ============================================================================== --- trunk/reactos/base/applications/mplay32/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mplay32/lang/sk-SK.rc [iso-8859-1] Fri Mar 20 10:44:36 2015 @@ -27,6 +27,7 @@ END POPUP "&Device" BEGIN + MENUITEM SEPARATOR MENUITEM "&Properties", IDM_DEVPROPS MENUITEM SEPARATOR MENUITEM "&Volume Control", IDM_VOLUMECTL Modified: trunk/reactos/base/applications/mplay32/lang/sq-AL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/… ============================================================================== --- trunk/reactos/base/applications/mplay32/lang/sq-AL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mplay32/lang/sq-AL.rc [iso-8859-1] Fri Mar 20 10:44:36 2015 @@ -26,6 +26,7 @@ END POPUP "&Device" BEGIN + MENUITEM SEPARATOR MENUITEM "&Properties", IDM_DEVPROPS MENUITEM SEPARATOR MENUITEM "&Volume Control", IDM_VOLUMECTL Modified: trunk/reactos/base/applications/mplay32/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/… ============================================================================== --- trunk/reactos/base/applications/mplay32/lang/sv-SE.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mplay32/lang/sv-SE.rc [iso-8859-1] Fri Mar 20 10:44:36 2015 @@ -29,6 +29,7 @@ END POPUP "&Device" BEGIN + MENUITEM SEPARATOR MENUITEM "&Properties", IDM_DEVPROPS MENUITEM SEPARATOR MENUITEM "&Volume Control", IDM_VOLUMECTL Modified: trunk/reactos/base/applications/mplay32/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/… ============================================================================== --- trunk/reactos/base/applications/mplay32/lang/tr-TR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mplay32/lang/tr-TR.rc [iso-8859-1] Fri Mar 20 10:44:36 2015 @@ -24,6 +24,7 @@ END POPUP "&AygÄ±t" BEGIN + MENUITEM SEPARATOR MENUITEM "&HusÃ»siyetler", IDM_DEVPROPS MENUITEM SEPARATOR MENUITEM "&Ses DÃ¼zeyi Denetimi", IDM_VOLUMECTL Modified: trunk/reactos/base/applications/mplay32/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/… ============================================================================== --- trunk/reactos/base/applications/mplay32/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mplay32/lang/uk-UA.rc [iso-8859-1] Fri Mar 20 10:44:36 2015 @@ -30,6 +30,7 @@ END POPUP "&Device" BEGIN + MENUITEM SEPARATOR MENUITEM "&Properties", IDM_DEVPROPS MENUITEM SEPARATOR MENUITEM "&Volume Control", IDM_VOLUMECTL Modified: trunk/reactos/base/applications/mplay32/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/… ============================================================================== --- trunk/reactos/base/applications/mplay32/lang/zh-CN.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mplay32/lang/zh-CN.rc [iso-8859-1] Fri Mar 20 10:44:36 2015 @@ -24,6 +24,7 @@ END POPUP "è®¾å¤(&D)" BEGIN + MENUITEM SEPARATOR MENUITEM "å±æ§(&P)", IDM_DEVPROPS MENUITEM SEPARATOR MENUITEM "é³éæ§å¶(&V)", IDM_VOLUMECTL Modified: trunk/reactos/base/applications/mplay32/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/… ============================================================================== --- trunk/reactos/base/applications/mplay32/lang/zh-TW.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mplay32/lang/zh-TW.rc [iso-8859-1] Fri Mar 20 10:44:36 2015 @@ -30,6 +30,7 @@ END POPUP "&Device" BEGIN + MENUITEM SEPARATOR MENUITEM "&Properties", IDM_DEVPROPS MENUITEM SEPARATOR MENUITEM "&Volume Control", IDM_VOLUMECTL Modified: trunk/reactos/base/applications/mplay32/mplay32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/… ============================================================================== --- trunk/reactos/base/applications/mplay32/mplay32.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mplay32/mplay32.c [iso-8859-1] Fri Mar 20 10:44:36 2015 @@ -483,6 +483,38 @@ return mciError; } +static BOOL +DeviceUsesFiles(LPTSTR lpDeviceName) +{ + MCIERROR mciError; + MCI_OPEN_PARMS mciOpen; + MCI_GETDEVCAPS_PARMS mciDevCaps; + MCI_GENERIC_PARMS mciGeneric; + + mciOpen.dwCallback = 0; + mciOpen.wDeviceID = 0; + mciOpen.lpstrDeviceType = lpDeviceName; + mciOpen.lpstrElementName = NULL; + mciOpen.lpstrAlias = NULL; + + mciError = mciSendCommand(0, MCI_OPEN, MCI_OPEN_TYPE | MCI_WAIT, (DWORD_PTR)&mciOpen); + if (mciError != 0) + return FALSE; + + mciDevCaps.dwCallback = 0; + mciDevCaps.dwReturn = 0; + mciDevCaps.dwItem = MCI_GETDEVCAPS_USES_FILES; + + mciError = mciSendCommand(mciOpen.wDeviceID, MCI_GETDEVCAPS, MCI_WAIT | MCI_GETDEVCAPS_ITEM, (DWORD_PTR)&mciDevCaps); + if (mciError != 0) + return FALSE; + + mciGeneric.dwCallback = 0; + mciSendCommand(mciOpen.wDeviceID, MCI_CLOSE, MCI_WAIT, (DWORD_PTR)&mciGeneric); + + return (BOOL)mciDevCaps.dwReturn; +} + static MCIERROR CloseMciDevice(VOID) { @@ -509,7 +541,7 @@ MCIERROR mciError; MCI_STATUS_PARMS mciStatus; MCI_OPEN_PARMS mciOpen; - DWORD dwFlags = MCI_OPEN_ELEMENT | MCI_WAIT; + DWORD dwFlags = MCI_WAIT; LPTSTR lpStr; if (wDeviceId) @@ -524,6 +556,9 @@ if (lpType) dwFlags |= MCI_OPEN_TYPE; + if (lpFileName) + dwFlags |= MCI_OPEN_ELEMENT; + mciError = mciSendCommand(0, MCI_OPEN, dwFlags, (DWORD_PTR)&mciOpen); if (mciError != 0) return mciError; @@ -562,11 +597,16 @@ /* NOTE: Everything above this line may be done instead in OpenMediaFile() */ - lpStr = _tcsrchr(lpFileName, _T('\\')); - if (lpStr) // Get only the file name (skip the last path separator) - lpStr++; + if (lpFileName) + { + lpStr = _tcsrchr(lpFileName, _T('\\')); + if (lpStr) // Get only the file name (skip the last path separator) + lpStr++; + else + lpStr = lpFileName; + } else - lpStr = lpFileName; + lpStr = lpType; StringCbCopy(szCurrentFile, sizeof(szCurrentFile), lpStr); @@ -852,7 +892,7 @@ } static VOID -OpenMediaFile(HWND hwnd, LPTSTR lpFileName) +OpenMediaFile(HWND hwnd, LPTSTR lpFileName, LPTSTR lpType) { MCIERROR mciError; @@ -862,7 +902,7 @@ if (wDeviceId) CloseMediaFile(hwnd); - mciError = OpenMciDevice(hwnd, NULL, lpFileName); + mciError = OpenMciDevice(hwnd, lpType, lpFileName); if (mciError != 0) { ShowMCIError(hwnd, mciError); @@ -872,8 +912,45 @@ StartPlayback(hwnd); } -static VOID -BuildFileFilter(VOID) +static DWORD +InsertDeviceMenuItem(HMENU hMenu, UINT uItem, BOOL fByPosition, UINT uItemID, DWORD dwDeviceIndex) +{ + MENUITEMINFO lpmii; + MCIERROR mciError; + TCHAR szDeviceName[MAX_MCISTR]; + TCHAR szFriendlyName[MAX_MCISTR]; + + mciError = GetDeviceName(dwDeviceIndex, szDeviceName, sizeof(szDeviceName)); + if (mciError) + { + return mciError; + } + + mciError = GetDeviceFriendlyName(szDeviceName, szFriendlyName, sizeof(szFriendlyName)); + if (mciError) + { + return mciError; + } + + if (DeviceUsesFiles(szDeviceName)) + { + StringCbCat(szFriendlyName, sizeof(szFriendlyName), _T("...")); + } + + ZeroMemory(&lpmii, sizeof(MENUITEMINFO)); + lpmii.cbSize = sizeof(lpmii); + lpmii.fMask = MIIM_DATA | MIIM_TYPE | MIIM_ID; + lpmii.wID = uItemID; + lpmii.fType = MF_STRING; + lpmii.dwTypeData = szFriendlyName; + lpmii.dwItemData = dwDeviceIndex; + InsertMenuItem(hMenu, uItem, fByPosition, &lpmii); + + return 0; +} + +static VOID +BuildFileFilterAndDeviceMenu(VOID) { TCHAR szDeviceName[MAX_MCISTR]; TCHAR szFriendlyName[MAX_MCISTR]; @@ -891,6 +968,7 @@ DWORD dwFilterSize; DWORD dwDeviceSize; DWORD dwExtensionLen; + DWORD dwPosition = 0; DWORD i; DWORD j; UINT uSizeRemain; @@ -952,6 +1030,10 @@ { continue; } + + /* Insert a menu item under the "Device" menu for every found MCI device */ + InsertDeviceMenuItem(GetSubMenu(hMainMenu, 3), dwPosition, TRUE, IDM_DEVICE_FIRST + dwPosition, j); + dwPosition++; /* Copy the default extension list, that may be overwritten after... */ StringCbCopy(szExtensionList, dwMaskLen * sizeof(TCHAR), szDefaultExtension); @@ -1065,7 +1147,7 @@ } static VOID -OpenFileDialog(HWND hwnd) +OpenFileDialog(HWND hwnd, DWORD dwFilterIndex, LPTSTR lpType) { OPENFILENAME OpenFileName; TCHAR szFile[MAX_PATH + 1] = _T(""); @@ -1087,11 +1169,46 @@ OpenFileName.lpstrInitialDir = szCurrentDir; OpenFileName.Flags = OFN_FILEMUSTEXIST | OFN_PATHMUSTEXIST | OFN_HIDEREADONLY | OFN_SHAREAWARE; OpenFileName.lpstrDefExt = _T("\0"); + OpenFileName.nFilterIndex = dwFilterIndex; if (!GetOpenFileName(&OpenFileName)) return; - OpenMediaFile(hwnd, OpenFileName.lpstrFile); + OpenMediaFile(hwnd, OpenFileName.lpstrFile, lpType); +} + +static VOID +HandleDeviceMenuItem(HWND hwnd, UINT uItem) +{ + MENUITEMINFO lpmii; + TCHAR szDeviceName[MAX_MCISTR]; + MCIERROR mciError; + + ZeroMemory(&lpmii, sizeof(MENUITEMINFO)); + lpmii.cbSize = sizeof(lpmii); + lpmii.fMask = MIIM_DATA; + GetMenuItemInfo(hMainMenu, uItem, FALSE, &lpmii); + + mciError = GetDeviceName(lpmii.dwItemData, szDeviceName, sizeof(szDeviceName)); + if (mciError) + { + ShowMCIError(hwnd, mciError); + return; + } + + if (DeviceUsesFiles(szDeviceName)) + { + OpenFileDialog(hwnd, uItem - IDM_DEVICE_FIRST + 1, szDeviceName); + return; + } + + mciError = OpenMciDevice(hwnd, szDeviceName, NULL); + if (mciError) + { + ShowMCIError(hwnd, mciError); + } + + return; } LRESULT CALLBACK @@ -1114,7 +1231,7 @@ drophandle = (HDROP)wParam; DragQueryFile(drophandle, 0, droppedfile, ARRAYSIZE(droppedfile)); DragFinish(drophandle); - OpenMediaFile(hwnd, droppedfile); + OpenMediaFile(hwnd, droppedfile, NULL); break; } @@ -1241,6 +1358,12 @@ case WM_COMMAND: { + if (LOWORD(wParam) >= IDM_DEVICE_FIRST) + { + HandleDeviceMenuItem(hwnd, LOWORD(wParam)); + break; + } + switch (LOWORD(wParam)) { case IDC_PLAY: @@ -1249,7 +1372,7 @@ if (wDeviceId) TogglePlaybackState(hwnd); else - OpenFileDialog(hwnd); + OpenFileDialog(hwnd, 1, NULL); break; } @@ -1276,7 +1399,7 @@ break; case IDM_OPEN_FILE: - OpenFileDialog(hwnd); + OpenFileDialog(hwnd, 1, NULL); return 0; case IDM_CLOSE_FILE: @@ -1383,7 +1506,7 @@ hAccel = LoadAccelerators(hInstance, MAKEINTRESOURCE(ID_ACCELERATORS)); - BuildFileFilter(); + BuildFileFilterAndDeviceMenu(); DragAcceptFiles(hwnd, TRUE); @@ -1399,7 +1522,7 @@ ShowWindow(hwnd, SW_SHOW); UpdateWindow(hwnd); - OpenMediaFile(hwnd, lpCmdLine); + OpenMediaFile(hwnd, lpCmdLine, NULL); /* Message Loop */ while (GetMessage(&msg, NULL, 0, 0)) Modified: trunk/reactos/base/applications/mplay32/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/… ============================================================================== --- trunk/reactos/base/applications/mplay32/resource.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/mplay32/resource.h [iso-8859-1] Fri Mar 20 10:44:36 2015 @@ -52,6 +52,9 @@ #define IDM_REPEAT 1006 #define IDM_SWITCHVIEW 1007 +/* The device specific items in the device menu start here */ +#define IDM_DEVICE_FIRST 10000 + /* ToolBar Icons */ #define TBICON_PLAY 0 #define TBICON_STOP 1

1 0

[akhaldi] 66832: [SETUPAPI] Partially sync parser.c with Wine Staging 1.7.37. Started off by Victor's work in CORE-9397 and completed by me. CORE-9246
by akhaldi＠svn.reactos.org 20 Mar '15

20 Mar '15

Author: akhaldi Date: Fri Mar 20 10:37:55 2015 New Revision: 66832 URL: http://svn.reactos.org/svn/reactos?rev=66832&view=rev Log: [SETUPAPI] Partially sync parser.c with Wine Staging 1.7.37. Started off by Victor's work in CORE-9397 and completed by me. CORE-9246 Modified: trunk/reactos/dll/win32/setupapi/parser.c trunk/reactos/dll/win32/setupapi/setupapi_private.h Modified: trunk/reactos/dll/win32/setupapi/parser.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/parser.… ============================================================================== --- trunk/reactos/dll/win32/setupapi/parser.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/setupapi/parser.c [iso-8859-1] Fri Mar 20 10:37:55 2015 @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +/* Partially synced with Wine Staging 1.7.37 */ + #include "setupapi_private.h" #include <ndk/obfuncs.h> @@ -149,9 +151,9 @@ if (new_count < 32) new_count = 32; if (array) - new_array = HeapReAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, array, new_count * elem ); + new_array = HeapReAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, array, new_count * elem ); else - new_array = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, new_count * elem ); + new_array = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, new_count * elem ); if (new_array) *count = new_count; @@ -186,7 +188,7 @@ { struct section *section; struct line *line; - int i; + unsigned int i; if (section_index < 0 || section_index >= file->nb_sections) return NULL; section = file->sections[section_index]; @@ -311,7 +313,7 @@ struct section *strings_section; struct line *line; struct field *field; - unsigned int i,j; + unsigned int i, j; int dirid; WCHAR *dirid_str, *end; const WCHAR *ret = NULL; @@ -397,12 +399,12 @@ /* do string substitutions on the specified text */ /* the buffer is assumed to be large enough */ /* returns necessary length not including terminating null */ -unsigned int PARSER_string_substW( const struct inf_file *file, const WCHAR *text, WCHAR *buffer, - unsigned int size ) +static unsigned int PARSER_string_substW( const struct inf_file *file, const WCHAR *text, + WCHAR *buffer, unsigned int size ) { const WCHAR *start, *subst, *p; unsigned int len, total = 0; - int inside = 0; + BOOL inside = FALSE; if (!buffer) size = MAX_STRING_LEN + 1; for (p = start = text; *p; p++) @@ -450,8 +452,8 @@ /* do string substitutions on the specified text */ /* the buffer is assumed to be large enough */ /* returns necessary length not including terminating null */ -unsigned int PARSER_string_substA( const struct inf_file *file, const WCHAR *text, char *buffer, - unsigned int size ) +static unsigned int PARSER_string_substA( const struct inf_file *file, const WCHAR *text, + char *buffer, unsigned int size ) { WCHAR buffW[MAX_STRING_LEN+1]; DWORD ret; @@ -503,14 +505,14 @@ /* check if the pointer points to an end of file */ -static inline int is_eof( const struct parser *parser, const WCHAR *ptr ) +static inline BOOL is_eof( const struct parser *parser, const WCHAR *ptr ) { return (ptr >= parser->end || *ptr == CONTROL_Z); } /* check if the pointer points to an end of line */ -static inline int is_eol( const struct parser *parser, const WCHAR *ptr ) +static inline BOOL is_eol( const struct parser *parser, const WCHAR *ptr ) { return (ptr >= parser->end || *ptr == CONTROL_Z || *ptr == '\n'); } @@ -560,7 +562,7 @@ /* add a field containing the current token to the current line */ -static struct field *add_field_from_token( struct parser *parser, int is_key ) +static struct field *add_field_from_token( struct parser *parser, BOOL is_key ) { struct field *field; WCHAR *text; @@ -680,14 +682,14 @@ case '=': push_token( parser, token_end ); - if (!add_field_from_token( parser, 1 )) return NULL; + if (!add_field_from_token( parser, TRUE )) return NULL; parser->start = p + 1; push_state( parser, VALUE_NAME ); set_state( parser, LEADING_SPACES ); return p + 1; case ';': push_token( parser, token_end ); - if (!add_field_from_token( parser, 0 )) return NULL; + if (!add_field_from_token( parser, FALSE )) return NULL; push_state( parser, LINE_START ); set_state( parser, COMMENT ); return p + 1; @@ -732,13 +734,13 @@ { case ';': push_token( parser, token_end ); - if (!add_field_from_token( parser, 0 )) return NULL; + if (!add_field_from_token( parser, FALSE )) return NULL; push_state( parser, LINE_START ); set_state( parser, COMMENT ); return p + 1; case ',': push_token( parser, token_end ); - if (!add_field_from_token( parser, 0 )) return NULL; + if (!add_field_from_token( parser, FALSE )) return NULL; parser->start = p + 1; push_state( parser, VALUE_NAME ); set_state( parser, LEADING_SPACES ); @@ -768,7 +770,7 @@ } } push_token( parser, token_end ); - if (!add_field_from_token( parser, 0 )) return NULL; + if (!add_field_from_token( parser, FALSE )) return NULL; set_state( parser, LINE_START ); return p; } @@ -810,7 +812,7 @@ /* handler for parser QUOTES state */ static const WCHAR *quotes_state( struct parser *parser, const WCHAR *pos ) { - const WCHAR *p, *token_end = parser->start; + const WCHAR *p; for (p = pos; !is_eol( parser, p ); p++) { @@ -819,7 +821,7 @@ if (p+1 < parser->end && p[1] == '"') /* double quotes */ { push_token( parser, p + 1 ); - parser->start = token_end = p + 2; + parser->start = p + 2; p++; } else /* end of quotes */ @@ -885,6 +887,19 @@ while (!is_eol( parser, p )) p++; pop_state( parser ); return p; +} + + +static void free_inf_file( struct inf_file *file ) +{ + unsigned int i; + + for (i = 0; i < file->nb_sections; i++) HeapFree( GetProcessHeap(), 0, file->sections[i] ); + HeapFree( GetProcessHeap(), 0, file->filename ); + HeapFree( GetProcessHeap(), 0, file->sections ); + HeapFree( GetProcessHeap(), 0, file->fields ); + HeapFree( GetProcessHeap(), 0, file->strings ); + HeapFree( GetProcessHeap(), 0, file ); } @@ -1012,7 +1027,7 @@ } else { - WCHAR *new_buff = (WCHAR *)buffer; + WCHAR *new_buff = buffer; /* UCS-16 files should start with the Unicode BOM; we should skip it */ if (*new_buff == 0xfeff) new_buff++; @@ -1041,7 +1056,7 @@ UnmapViewOfFile( buffer ); if (err) { - HeapFree( GetProcessHeap(), 0, file ); + if (file) free_inf_file( file ); SetLastError( err ); file = NULL; } @@ -1251,7 +1266,7 @@ if (handle != INVALID_HANDLE_VALUE) { - file = parse_file( handle, error, style ); + file = parse_file( handle, error, style); CloseHandle( handle ); } if (!file) @@ -1293,7 +1308,7 @@ } SetLastError( 0 ); - return (HINF)file; + return file; } @@ -1366,16 +1381,10 @@ void WINAPI SetupCloseInfFile( HINF hinf ) { struct inf_file *file = hinf; - unsigned int i; if (!hinf || (hinf == INVALID_HANDLE_VALUE)) return; - for (i = 0; i < file->nb_sections; i++) HeapFree( GetProcessHeap(), 0, file->sections[i] ); - HeapFree( GetProcessHeap(), 0, file->filename ); - HeapFree( GetProcessHeap(), 0, file->sections ); - HeapFree( GetProcessHeap(), 0, file->fields ); - HeapFree( GetProcessHeap(), 0, file->strings ); - HeapFree( GetProcessHeap(), 0, file ); + free_inf_file( file ); } Modified: trunk/reactos/dll/win32/setupapi/setupapi_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/setupap… ============================================================================== --- trunk/reactos/dll/win32/setupapi/setupapi_private.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/setupapi/setupapi_private.h [iso-8859-1] Fri Mar 20 10:37:55 2015 @@ -261,13 +261,9 @@ struct inf_file; extern const WCHAR *DIRID_get_string( int dirid ); -extern unsigned int PARSER_string_substA( const struct inf_file *file, const WCHAR *text, - char *buffer, unsigned int size ); -extern unsigned int PARSER_string_substW( const struct inf_file *file, const WCHAR *text, - WCHAR *buffer, unsigned int size ); -extern const WCHAR *PARSER_get_inf_filename( HINF hinf ); -extern WCHAR *PARSER_get_src_root( HINF hinf ); -extern WCHAR *PARSER_get_dest_dir( INFCONTEXT *context ); +extern const WCHAR *PARSER_get_inf_filename( HINF hinf ) DECLSPEC_HIDDEN; +extern WCHAR *PARSER_get_src_root( HINF hinf ) DECLSPEC_HIDDEN; +extern WCHAR *PARSER_get_dest_dir( INFCONTEXT *context ) DECLSPEC_HIDDEN; /* support for Ascii queue callback functions */

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs