April 2011 - Wine-commits - list.winehq.org

Jerome Leclanche : winemenubuilder: Make sure extension-based mimetypes are always lowercase.
by Alexandre Julliard 07 Apr '11

07 Apr '11

Module: wine Branch: stable Commit: b7bbd2adae6123119e317f8dd49f7ae1905f2895 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b7bbd2adae6123119e317f8dd… Author: Jerome Leclanche <adys.wh(a)gmail.com> Date: Sun Feb 20 18:05:44 2011 +0000 winemenubuilder: Make sure extension-based mimetypes are always lowercase. (cherry picked from commit 44527f57b2c4722b3317b2a03ba6b1d2ac7fc538) --- programs/winemenubuilder/winemenubuilder.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/winemenubuilder/winemenubuilder.c b/programs/winemenubuilder/winemenubuilder.c index ce28e3b..c22e7b0 100644 --- a/programs/winemenubuilder/winemenubuilder.c +++ b/programs/winemenubuilder/winemenubuilder.c @@ -2250,7 +2250,7 @@ static BOOL generate_associations(const char *xdg_data_home, const char *package WCHAR *progIdW = NULL; char *progIdA = NULL; - extensionA = wchars_to_utf8_chars(extensionW); + extensionA = wchars_to_utf8_chars(strlwrW(extensionW)); if (extensionA == NULL) { WINE_ERR("out of memory\n");

1 0

Dan Kegel : winemenubuilder: File associations should set wineprefix.
by Alexandre Julliard 07 Apr '11

07 Apr '11

Module: wine Branch: stable Commit: e8075b4f6be9bf105de838b333d6858c1dd6e6e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e8075b4f6be9bf105de838b33… Author: Dan Kegel <dank(a)kegel.com> Date: Tue Mar 22 12:36:45 2011 +0000 winemenubuilder: File associations should set wineprefix. (cherry picked from commit 94462664c5cac1b8e72bf8d2258731d796d9dc9d) --- programs/winemenubuilder/winemenubuilder.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/winemenubuilder/winemenubuilder.c b/programs/winemenubuilder/winemenubuilder.c index c22e7b0..d45b429 100644 --- a/programs/winemenubuilder/winemenubuilder.c +++ b/programs/winemenubuilder/winemenubuilder.c @@ -2191,7 +2191,7 @@ static BOOL write_freedesktop_association_entry(const char *desktopPath, const c fprintf(desktop, "Type=Application\n"); fprintf(desktop, "Name=%s\n", friendlyAppName); fprintf(desktop, "MimeType=%s;\n", mimeType); - fprintf(desktop, "Exec=wine start /ProgIDOpen %s %%f\n", progId); + fprintf(desktop, "Exec=env WINEPREFIX=\"%s\" wine start /ProgIDOpen %s %%f\n", wine_get_config_dir(), progId); fprintf(desktop, "NoDisplay=true\n"); fprintf(desktop, "StartupNotify=true\n"); ret = TRUE;

1 0

Damjan Jovanovic : winemenubuilder: Do not skip entries when cleaning up file open associations.
by Alexandre Julliard 07 Apr '11

07 Apr '11

Module: wine Branch: stable Commit: c2f2b06fee38d7abdda2e3c58687a3f9739acb87 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c2f2b06fee38d7abdda2e3c58… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Wed Mar 30 16:22:23 2011 +0200 winemenubuilder: Do not skip entries when cleaning up file open associations. (cherry picked from commit 299d84bf2ca59d34a242bada5b61f86e3cc991b4) --- programs/winemenubuilder/winemenubuilder.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/programs/winemenubuilder/winemenubuilder.c b/programs/winemenubuilder/winemenubuilder.c index d45b429..728bfdc 100644 --- a/programs/winemenubuilder/winemenubuilder.c +++ b/programs/winemenubuilder/winemenubuilder.c @@ -2055,7 +2055,7 @@ static BOOL cleanup_associations(void) { int i; BOOL done = FALSE; - for (i = 0; !done; i++) + for (i = 0; !done;) { WCHAR *extensionW = NULL; DWORD size = 1024; @@ -2091,6 +2091,8 @@ static BOOL cleanup_associations(void) hasChanged = TRUE; HeapFree(GetProcessHeap(), 0, desktopFile); } + else + i++; HeapFree(GetProcessHeap(), 0, command); } else

1 0

Janne Hakonen : iphlpapi: Changed return value of NotifyAddrChange() stub and added test cases.
by Alexandre Julliard 07 Apr '11

07 Apr '11

Module: wine Branch: stable Commit: 6a631ba1cc1a25099cfc68a3e44b82f0f73c7f95 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a631ba1cc1a25099cfc68a3e… Author: Janne Hakonen <joyer83(a)live.fi> Date: Tue Feb 8 20:43:59 2011 +0200 iphlpapi: Changed return value of NotifyAddrChange() stub and added test cases. (cherry picked from commit 82a2ec13f01b48e78d28d630914db311b55f4948) --- dlls/iphlpapi/iphlpapi_main.c | 3 +- dlls/iphlpapi/tests/iphlpapi.c | 87 ++++++++++++++++++++++++++++++++++++++- 2 files changed, 86 insertions(+), 4 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index 53cad0e..e88e0a9 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -1703,7 +1703,8 @@ DWORD WINAPI IpRenewAddress(PIP_ADAPTER_INDEX_MAP AdapterInfo) DWORD WINAPI NotifyAddrChange(PHANDLE Handle, LPOVERLAPPED overlapped) { FIXME("(Handle %p, overlapped %p): stub\n", Handle, overlapped); - return ERROR_NOT_SUPPORTED; + if (Handle) *Handle = INVALID_HANDLE_VALUE; + return ERROR_IO_PENDING; } diff --git a/dlls/iphlpapi/tests/iphlpapi.c b/dlls/iphlpapi/tests/iphlpapi.c index 8e03863..dc1e9bc 100644 --- a/dlls/iphlpapi/tests/iphlpapi.c +++ b/dlls/iphlpapi/tests/iphlpapi.c @@ -64,6 +64,8 @@ typedef DWORD (WINAPI *GetTcpTableFunc)(PMIB_TCPTABLE,PDWORD,BOOL); typedef DWORD (WINAPI *GetUdpTableFunc)(PMIB_UDPTABLE,PDWORD,BOOL); typedef DWORD (WINAPI *GetPerAdapterInfoFunc)(ULONG,PIP_PER_ADAPTER_INFO,PULONG); typedef DWORD (WINAPI *GetAdaptersAddressesFunc)(ULONG,ULONG,PVOID,PIP_ADAPTER_ADDRESSES,PULONG); +typedef DWORD (WINAPI *NotifyAddrChangeFunc)(PHANDLE,LPOVERLAPPED); +typedef BOOL (WINAPI *CancelIPChangeNotifyFunc)(LPOVERLAPPED); static GetNumberOfInterfacesFunc gGetNumberOfInterfaces = NULL; static GetIpAddrTableFunc gGetIpAddrTable = NULL; @@ -83,6 +85,8 @@ static GetTcpTableFunc gGetTcpTable = NULL; static GetUdpTableFunc gGetUdpTable = NULL; static GetPerAdapterInfoFunc gGetPerAdapterInfo = NULL; static GetAdaptersAddressesFunc gGetAdaptersAddresses = NULL; +static NotifyAddrChangeFunc gNotifyAddrChange = NULL; +static CancelIPChangeNotifyFunc gCancelIPChangeNotify = NULL; static void loadIPHlpApi(void) { @@ -122,6 +126,10 @@ static void loadIPHlpApi(void) hLibrary, "GetUdpTable"); gGetPerAdapterInfo = (GetPerAdapterInfoFunc)GetProcAddress(hLibrary, "GetPerAdapterInfo"); gGetAdaptersAddresses = (GetAdaptersAddressesFunc)GetProcAddress(hLibrary, "GetAdaptersAddresses"); + gNotifyAddrChange = (NotifyAddrChangeFunc)GetProcAddress( + hLibrary, "NotifyAddrChange"); + gCancelIPChangeNotify = (CancelIPChangeNotifyFunc)GetProcAddress( + hLibrary, "CancelIPChangeNotify"); } } @@ -144,6 +152,8 @@ static void freeIPHlpApi(void) gGetUdpStatistics = NULL; gGetTcpTable = NULL; gGetUdpTable = NULL; + gNotifyAddrChange = NULL; + gCancelIPChangeNotify = NULL; FreeLibrary(hLibrary); hLibrary = NULL; } @@ -796,24 +806,95 @@ static void testGetPerAdapterInfo(void) HeapFree( GetProcessHeap(), 0, buffer ); } +static void testNotifyAddrChange(void) +{ + DWORD ret, bytes; + OVERLAPPED overlapped; + HANDLE handle; + BOOL success; + + if (!gNotifyAddrChange) + { + win_skip("NotifyAddrChange not present\n"); + return; + } + if (!gCancelIPChangeNotify) + { + win_skip("CancelIPChangeNotify not present\n"); + return; + } + + handle = NULL; + ZeroMemory(&overlapped, sizeof(overlapped)); + ret = gNotifyAddrChange(&handle, &overlapped); + if (ret == ERROR_NOT_SUPPORTED) + { + win_skip("NotifyAddrChange is not supported\n"); + return; + } + ok(ret == ERROR_IO_PENDING, "NotifyAddrChange returned %d, expected ERROR_IO_PENDING\n", ret); + ret = GetLastError(); + todo_wine ok(ret == ERROR_IO_PENDING, "GetLastError returned %d, excepted ERROR_IO_PENDING\n", ret); + success = gCancelIPChangeNotify(&overlapped); + todo_wine ok(success == TRUE, "CancelIPChangeNotify returned FALSE, expected TRUE\n"); + + ZeroMemory(&overlapped, sizeof(overlapped)); + success = gCancelIPChangeNotify(&overlapped); + ok(success == FALSE, "CancelIPChangeNotify returned TRUE, expected FALSE\n"); + + handle = NULL; + ZeroMemory(&overlapped, sizeof(overlapped)); + overlapped.hEvent = CreateEvent(NULL, FALSE, FALSE, NULL); + ret = gNotifyAddrChange(&handle, &overlapped); + ok(ret == ERROR_IO_PENDING, "NotifyAddrChange returned %d, expected ERROR_IO_PENDING\n", ret); + todo_wine ok(handle != INVALID_HANDLE_VALUE, "NotifyAddrChange returned invalid file handle\n"); + success = GetOverlappedResult(handle, &overlapped, &bytes, FALSE); + todo_wine ok(success == FALSE, "GetOverlappedResult returned TRUE, excepted FALSE\n"); + ret = GetLastError(); + todo_wine ok(ret == ERROR_IO_INCOMPLETE, "GetLastError returned %d, excepted ERROR_IO_INCOMPLETE\n", ret); + success = gCancelIPChangeNotify(&overlapped); + todo_wine ok(success == TRUE, "CancelIPChangeNotify returned FALSE, expected TRUE\n"); + + if (winetest_interactive) + { + handle = NULL; + ZeroMemory(&overlapped, sizeof(overlapped)); + overlapped.hEvent = CreateEvent(NULL, FALSE, FALSE, NULL); + trace("Testing asyncronous ipv4 address change notification. Please " + "change ipv4 address of one of your network interfaces\n"); + ret = gNotifyAddrChange(&handle, &overlapped); + ok(ret == ERROR_IO_PENDING, "NotifyAddrChange returned %d, expected NO_ERROR\n", ret); + success = GetOverlappedResult(handle, &overlapped, &bytes, TRUE); + ok(success == TRUE, "GetOverlappedResult returned FALSE, excepted TRUE\n"); + } + + /* test syncronous functionality */ + if (winetest_interactive) + { + trace("Testing syncronous ipv4 address change notification. Please " + "change ipv4 address of one of your network interfaces\n"); + ret = gNotifyAddrChange(NULL, NULL); + todo_wine ok(ret == NO_ERROR, "NotifyAddrChange returned %d, expected NO_ERROR\n", ret); + } +} + /* still-to-be-tested 2K-onward functions: AddIPAddress -CancelIPChangeNotify CreateProxyArpEntry DeleteIPAddress DeleteProxyArpEntry EnableRouter FlushIpNetTable GetAdapterIndex -NotifyAddrChange -NotifyRouteChange +NotifyRouteChange + CancelIPChangeNotify SendARP UnenableRouter */ static void testWin2KFunctions(void) { testGetPerAdapterInfo(); + testNotifyAddrChange(); } static void test_GetAdaptersAddresses(void)

1 0

Charles Davis : ntdll: Fix IOCTL_CDROM_RAW_READ on Mac OS.
by Alexandre Julliard 07 Apr '11

07 Apr '11

Module: wine Branch: stable Commit: b37c63e08ee5b1983df7f770baeda013c0c1cf06 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b37c63e08ee5b1983df7f770b… Author: Charles Davis <cdavis(a)mymail.mines.edu> Date: Fri Feb 18 10:36:24 2011 -0700 ntdll: Fix IOCTL_CDROM_RAW_READ on Mac OS. (cherry picked from commit 03c29bf7f5e2d72b327c67643a1830c6146871df) --- dlls/ntdll/cdrom.c | 153 +++++++-------------------------------------------- 1 files changed, 21 insertions(+), 132 deletions(-) diff --git a/dlls/ntdll/cdrom.c b/dlls/ntdll/cdrom.c index 59f85a0..554aa46 100644 --- a/dlls/ntdll/cdrom.c +++ b/dlls/ntdll/cdrom.c @@ -1437,6 +1437,9 @@ static NTSTATUS CDROM_RawRead(int fd, const RAW_READ_INFO* raw, void* buffer, DW { int ret = STATUS_NOT_SUPPORTED; int io = -1; +#ifdef __APPLE__ + dk_cd_read_t cdrd; +#endif TRACE("RAW_READ_INFO: DiskOffset=%i,%i SectorCount=%i TrackMode=%i\n buffer=%p len=%i sz=%p\n", raw->DiskOffset.u.HighPart, raw->DiskOffset.u.LowPart, raw->SectorCount, raw->TrackMode, buffer, len, sz); @@ -1506,154 +1509,40 @@ static NTSTATUS CDROM_RawRead(int fd, const RAW_READ_INFO* raw, void* buffer, DW return STATUS_INVALID_PARAMETER; } #elif defined(__APPLE__) + /* Mac OS lets us read multiple parts of the sector at a time. + * We can read all the sectors in at once, unlike Linux. + */ + memset(&cdrd, 0, sizeof(cdrd)); + cdrd.offset = (raw->DiskOffset.QuadPart >> 11) * kCDSectorSizeWhole; + cdrd.buffer = buffer; + cdrd.bufferLength = raw->SectorCount * kCDSectorSizeWhole; switch (raw->TrackMode) { case YellowMode2: - { - /* Mac OS, on the other hand, DOES read only one part of the sector - * at a time. Therefore, we have to read each part of the sector, in - * order, to get the whole raw sector in. - * This means that we have to read each sector one at a time, as on - * Linux. - */ - dk_cd_read_t cdrd; - UInt64 lba = raw->DiskOffset.QuadPart >> 11; - PBYTE bp; - int i; - - for (i = 0, bp = buffer; i < raw->SectorCount; - i++, lba++, bp += kCDSectorSizeWhole) - { - cdrd.offset = lba * kCDSectorSizeWhole; - cdrd.sectorType = kCDSectorTypeMode2; - - /* First, the sync area */ - cdrd.sectorArea = kCDSectorAreaSync; - cdrd.buffer = bp; - cdrd.bufferLength = 12; - io = ioctl(fd, DKIOCCDREAD, &cdrd); - if (io != 0) - { - *sz = kCDSectorSizeWhole * i; - return CDROM_GetStatusCode(io); - } - - /* Then the header */ - cdrd.offset += 12; - cdrd.sectorArea = kCDSectorAreaHeader; - cdrd.buffer = (PBYTE)cdrd.buffer + 12; - cdrd.bufferLength = 4; - io = ioctl(fd, DKIOCCDREAD, &cdrd); - if (io != 0) - { - *sz = kCDSectorSizeWhole * i + 12; - return CDROM_GetStatusCode(io); - } - - /* And finally the sector proper */ - cdrd.offset += 4; - cdrd.sectorArea = kCDSectorAreaUser; - cdrd.buffer = (PBYTE)cdrd.buffer + 4; - cdrd.bufferLength = kCDSectorSizeMode2; - io = ioctl(fd, DKIOCCDREAD, &cdrd); - if (io != 0) - { - *sz = kCDSectorSizeWhole * i + 16; - return CDROM_GetStatusCode(io); - } - } - + cdrd.sectorType = kCDSectorTypeMode2; + cdrd.sectorArea = kCDSectorAreaSync | kCDSectorAreaHeader | kCDSectorAreaUser; break; - } case XAForm2: - { - /* Same here */ - dk_cd_read_t cdrd; - UInt64 lba = raw->DiskOffset.QuadPart >> 11; - PBYTE bp; - int i; - - for (i = 0, bp = buffer; i < raw->SectorCount; - i++, lba++, bp += kCDSectorSizeWhole) - { - cdrd.offset = lba * kCDSectorSizeWhole; - cdrd.sectorType = kCDSectorTypeMode2Form2; - - /* First, the sync area */ - cdrd.sectorArea = kCDSectorAreaSync; - cdrd.buffer = bp; - cdrd.bufferLength = 12; - io = ioctl(fd, DKIOCCDREAD, &cdrd); - if (io != 0) - { - *sz = kCDSectorSizeWhole * i; - return CDROM_GetStatusCode(io); - } - - /* Then the header */ - cdrd.offset += 12; - cdrd.sectorArea = kCDSectorAreaHeader; - cdrd.buffer = (PBYTE)cdrd.buffer + 12; - cdrd.bufferLength = 4; - io = ioctl(fd, DKIOCCDREAD, &cdrd); - if (io != 0) - { - *sz = kCDSectorSizeWhole * i + 12; - return CDROM_GetStatusCode(io); - } - - /* And the sub-header */ - cdrd.offset += 4; - cdrd.sectorArea = kCDSectorAreaSubHeader; - cdrd.buffer = (PBYTE)cdrd.buffer + 4; - cdrd.bufferLength = 8; - io = ioctl(fd, DKIOCCDREAD, &cdrd); - if (io != 0) - { - *sz = kCDSectorSizeWhole * i + 16; - return CDROM_GetStatusCode(io); - } - - /* And finally the sector proper */ - cdrd.offset += 8; - cdrd.sectorArea = kCDSectorAreaUser; - cdrd.buffer = (PBYTE)cdrd.buffer + 8; - cdrd.bufferLength = kCDSectorSizeMode2; - io = ioctl(fd, DKIOCCDREAD, &cdrd); - if (io != 0) - { - *sz = kCDSectorSizeWhole * i + 24; - return CDROM_GetStatusCode(io); - } - } - + cdrd.sectorType = kCDSectorTypeMode2Form2; + cdrd.sectorArea = kCDSectorAreaSync | kCDSectorAreaHeader | kCDSectorAreaSubHeader | kCDSectorAreaUser; break; - } case CDDA: - { - /* With CDDA, the whole raw sector is considered user data, so there's - * no need to read one at a time. - */ - dk_cd_read_t cdrd; - - cdrd.offset = (raw->DiskOffset.QuadPart >> 11) * kCDSectorSizeCDDA; - cdrd.sectorArea = kCDSectorAreaUser; cdrd.sectorType = kCDSectorTypeCDDA; - cdrd.buffer = buffer; - cdrd.bufferLength = len < raw->SectorCount*kCDSectorSizeCDDA ? len : - raw->SectorCount*kCDSectorSizeCDDA; - - io = ioctl(fd, DKIOCCDREAD, &cdrd); - if (io != 0) return CDROM_GetStatusCode(io); + cdrd.sectorArea = kCDSectorAreaUser; break; - } default: FIXME("NIY: %d\n", raw->TrackMode); return STATUS_INVALID_PARAMETER; } + io = ioctl(fd, DKIOCCDREAD, &cdrd); + if (io != 0) + { + *sz = cdrd.bufferLength; + return CDROM_GetStatusCode(io); + } #else switch (raw->TrackMode) {

1 0

Alexandre Julliard : ntdll: Don' t print an error when architecture is set to win64 and the app is 64-bit.
by Alexandre Julliard 07 Apr '11

07 Apr '11

Module: wine Branch: stable Commit: e73320cec91875c2229ca9350fb0228f62dcfc19 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e73320cec91875c2229ca9350… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 1 14:10:16 2011 +0100 ntdll: Don't print an error when architecture is set to win64 and the app is 64-bit. (cherry picked from commit 29f57999960c989c13c1dffdaf925e1e070e72bf) --- dlls/ntdll/server.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/server.c b/dlls/ntdll/server.c index 79e1f8e..00341ab 100644 --- a/dlls/ntdll/server.c +++ b/dlls/ntdll/server.c @@ -1119,7 +1119,7 @@ size_t server_init_thread( void *entry_point ) if (!strcmp( arch, "win32" ) && (is_win64 || is_wow64)) fatal_error( "WINEARCH set to win32 but '%s' is a 64-bit installation.\n", wine_get_config_dir() ); - if (!strcmp( arch, "win64" ) && !is_wow64) + if (!strcmp( arch, "win64" ) && !is_win64 && !is_wow64) fatal_error( "WINEARCH set to win64 but '%s' is a 32-bit installation.\n", wine_get_config_dir() ); }

1 0

Charles Davis : ntdll: Implement CDROM_GetInterfaceInfo() on Mac OS.
by Alexandre Julliard 07 Apr '11

07 Apr '11

Module: wine Branch: stable Commit: 2df932da3d54cf63458b33249cfe4f6361666528 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2df932da3d54cf63458b33249… Author: Charles Davis <cdavis(a)mymail.mines.edu> Date: Tue Mar 1 12:59:44 2011 -0700 ntdll: Implement CDROM_GetInterfaceInfo() on Mac OS. (cherry picked from commit f082eac97c3ec71de58eea85bb4de5a12b19f13f) --- dlls/ntdll/cdrom.c | 20 ++++++++++++++++++++ 1 files changed, 20 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/cdrom.c b/dlls/ntdll/cdrom.c index 554aa46..ebb7ac3 100644 --- a/dlls/ntdll/cdrom.c +++ b/dlls/ntdll/cdrom.c @@ -103,7 +103,16 @@ typedef struct uint64_t senseLen; } dk_scsi_command_t; +typedef struct +{ + uint64_t bus; + uint64_t port; + uint64_t target; + uint64_t lun; +} dk_scsi_identify_t; + #define DKIOCSCSICOMMAND _IOWR('d', 253, dk_scsi_command_t) +#define DKIOCSCSIIDENTIFY _IOR('d', 254, dk_scsi_identify_t) #endif @@ -630,6 +639,17 @@ static int CDROM_GetInterfaceInfo(int fd, UCHAR* iface, UCHAR* port, UCHAR* devi } } return 0; +#elif defined(__APPLE__) + dk_scsi_identify_t addr; + if (ioctl(fd, DKIOCSCSIIDENTIFY, &addr) != -1) + { + *port = addr.bus; + *iface = addr.port; + *device = addr.target; + *lun = addr.lun; + return 1; + } + return 0; #else FIXME("not implemented on this O/S\n"); return 0;

1 0

Alexandre Julliard : wine.inf: Put some fake dlls in the right place for WoW64.
by Alexandre Julliard 07 Apr '11

07 Apr '11

Module: wine Branch: stable Commit: f92dbfc23938921889c601d50f8cbea94f8d9f7e URL: http://source.winehq.org/git/wine.git/?a=commit;h=f92dbfc23938921889c601d50… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 21 18:05:28 2011 +0100 wine.inf: Put some fake dlls in the right place for WoW64. (cherry picked from commit 7a70499fb874edc3ad95cf9b8144c70063d4b0e3) --- tools/wine.inf.in | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/tools/wine.inf.in b/tools/wine.inf.in index be59061..0417632 100644 --- a/tools/wine.inf.in +++ b/tools/wine.inf.in @@ -2559,7 +2559,8 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" [FakeDllsWow64] ; create some directories first 11,mui, -11,wbem, +11,gecko\plugin,npmshtml.dll +11,wbem,mofcomp.exe 11,,iexplore.exe,- 11,,winetest.exe,- 12,,mountmgr.sys,-

1 0

Alistair Leslie-Hughes : oleaut32: Implement ITypeInfo_GetNames Stub/Proxy.
by Alexandre Julliard 07 Apr '11

07 Apr '11

Module: wine Branch: stable Commit: 768073c448a8751ea31decd13a319043d67b762f URL: http://source.winehq.org/git/wine.git/?a=commit;h=768073c448a8751ea31decd13… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Feb 18 12:04:56 2011 +1100 oleaut32: Implement ITypeInfo_GetNames Stub/Proxy. (cherry picked from commit f6b16ea774908ee195788f8a8c449259a6fe668e) --- dlls/oleaut32/usrmarshal.c | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/oleaut32/usrmarshal.c b/dlls/oleaut32/usrmarshal.c index 402794c..c4db81b 100644 --- a/dlls/oleaut32/usrmarshal.c +++ b/dlls/oleaut32/usrmarshal.c @@ -1591,8 +1591,9 @@ HRESULT CALLBACK ITypeInfo_GetNames_Proxy( UINT cMaxNames, UINT* pcNames) { - FIXME("not implemented\n"); - return E_FAIL; + TRACE("(%p, %08x, %p, %d, %p)\n", This, memid, rgBstrNames, cMaxNames, pcNames); + + return ITypeInfo_RemoteGetNames_Proxy(This, memid, rgBstrNames, cMaxNames, pcNames); } HRESULT __RPC_STUB ITypeInfo_GetNames_Stub( @@ -1602,8 +1603,9 @@ HRESULT __RPC_STUB ITypeInfo_GetNames_Stub( UINT cMaxNames, UINT* pcNames) { - FIXME("not implemented\n"); - return E_FAIL; + TRACE("(%p, %08x, %p, %d, %p)\n", This, memid, rgBstrNames, cMaxNames, pcNames); + + return ITypeInfo_GetNames(This, memid, rgBstrNames, cMaxNames, pcNames); } HRESULT CALLBACK ITypeInfo_GetIDsOfNames_Proxy(

1 0

Peter Schellenbach : oleaut32: Fixed short time & medium time named formats .
by Alexandre Julliard 07 Apr '11

07 Apr '11

Module: wine Branch: stable Commit: e60c9f2d7b44d4ffc5ce7857d2a4a02ca28758d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e60c9f2d7b44d4ffc5ce7857d… Author: Peter Schellenbach <pjs(a)asent.com> Date: Mon Feb 21 12:15:22 2011 -0800 oleaut32: Fixed short time & medium time named formats. (cherry picked from commit 4f3b78797db0be5a1a5637513e36b7efe59ad213) --- dlls/oleaut32/tests/varformat.c | 25 +++++++++++++++++++++++++ dlls/oleaut32/varformat.c | 10 +++++++++- 2 files changed, 34 insertions(+), 1 deletions(-) diff --git a/dlls/oleaut32/tests/varformat.c b/dlls/oleaut32/tests/varformat.c index 2d4ef62..b994ee1 100644 --- a/dlls/oleaut32/tests/varformat.c +++ b/dlls/oleaut32/tests/varformat.c @@ -215,6 +215,14 @@ static const FMTDATERES VarFormat_date_results[] = { 2.725, "hh:nn:ss A/P", "05:24:00 P" } }; +/* The following tests require that the time separator is a colon (:) */ +static const FMTDATERES VarFormat_namedtime_results[] = +{ + { 2.525, "short time", "12:36" }, + { 2.525, "medium time", "12:36 PM" }, + { 2.525, "long time", "12:36:00 PM" } +}; + #define VNUMFMT(vt,v) \ for (i = 0; i < sizeof(VarFormat_results)/sizeof(FMTRES); i++) \ { \ @@ -299,6 +307,23 @@ static void test_VarFormat(void) VarFormat_date_results[i].res); } + /* Named time formats */ + GetLocaleInfoA(LOCALE_USER_DEFAULT, LOCALE_STIME, buff, sizeof(buff)/sizeof(char)); + if (buff[0] != ':' || buff[1]) + { + skip("Skipping namedtime tests as time separator is '%s'\n", buff); + } + else + { + for (i = 0; i < sizeof(VarFormat_namedtime_results)/sizeof(FMTDATERES); i++) + { + fd = 0; + VARFMT(VT_DATE,V_DATE,VarFormat_namedtime_results[i].val, + VarFormat_namedtime_results[i].fmt,S_OK, + VarFormat_namedtime_results[i].res); + } + } + /* Strings */ bstrin = SysAllocString(szTesting); VARFMT(VT_BSTR,V_BSTR,bstrin,"",S_OK,"testing"); diff --git a/dlls/oleaut32/varformat.c b/dlls/oleaut32/varformat.c index f297641..250ffef 100644 --- a/dlls/oleaut32/varformat.c +++ b/dlls/oleaut32/varformat.c @@ -263,7 +263,7 @@ typedef struct tagFMT_DATE_HEADER #define FMT_DATE_HOUR_0 0x1F /* Hours with leading 0 */ #define FMT_DATE_HOUR_12 0x20 /* Hours with no leading 0, 12 hour clock */ #define FMT_DATE_HOUR_12_0 0x21 /* Hours with leading 0, 12 hour clock */ -#define FMT_DATE_TIME_UNK2 0x23 +#define FMT_DATE_TIME_UNK2 0x23 /* same as FMT_DATE_HOUR_0, for "short time" format */ /* FIXME: probably missing some here */ #define FMT_DATE_AMPM_SYS1 0x2E /* AM/PM as defined by system settings */ #define FMT_DATE_AMPM_UPPER 0x2F /* Upper-case AM or PM */ @@ -1660,6 +1660,13 @@ static HRESULT VARIANT_FormatDate(LPVARIANT pVarIn, LPOLESTR lpszFormat, pToken += 2; break; + case FMT_GEN_INLINE: + pToken += 2; + TRACE("copy %s\n", debugstr_a((LPCSTR)pToken)); + while (*pToken) + *pBuff++ = *pToken++; + break; + case FMT_DATE_TIME_SEP: TRACE("time separator\n"); localeValue = LOCALE_STIME; @@ -1836,6 +1843,7 @@ static HRESULT VARIANT_FormatDate(LPVARIANT pVarIn, LPOLESTR lpszFormat, break; case FMT_DATE_HOUR_0: + case FMT_DATE_TIME_UNK2: szPrintFmt = szPercentZeroTwo_d; dwVal = udate.st.wHour; break;

1 0