December 2015 - Wine-Commits

Austin English : kernel32: Make CompareStringEx semi-stub flag FIXME only show once.
by Alexandre Julliard Dec. 24, 2015

Dec. 24, 2015

Module: wine Branch: master Commit: 5d186034c14d7e424e5f07e8e4ca0eb492453ca9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5d186034c14d7e424e5f07e8e… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Dec 23 00:13:40 2015 -0600 kernel32: Make CompareStringEx semi-stub flag FIXME only show once. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/locale.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index 3b632b4..5e7ca90 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -3265,6 +3265,7 @@ INT WINAPI CompareStringEx(LPCWSTR locale, DWORD flags, LPCWSTR str1, INT len1, DWORD semistub_flags = NORM_LINGUISTIC_CASING|LINGUISTIC_IGNORECASE|0x10000000; /* 0x10000000 is related to diacritics in Arabic, Japanese, and Hebrew */ INT ret; + static int once; if (version) FIXME("unexpected version parameter\n"); if (reserved) FIXME("unexpected reserved value\n"); @@ -3283,7 +3284,10 @@ INT WINAPI CompareStringEx(LPCWSTR locale, DWORD flags, LPCWSTR str1, INT len1, } if (flags & semistub_flags) - FIXME("semi-stub behavor for flag(s) 0x%x\n", flags & semistub_flags); + { + if (!once++) + FIXME("semi-stub behavior for flag(s) 0x%x\n", flags & semistub_flags); + } if (len1 < 0) len1 = strlenW(str1); if (len2 < 0) len2 = strlenW(str2);

1 0

Austin English : hal: Add READ_PORT_ULONG stub.
by Alexandre Julliard Dec. 24, 2015

Dec. 24, 2015

Module: wine Branch: master Commit: 3e16c3343ad6cf3e0ab076343dd651f5bbc73750 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3e16c3343ad6cf3e0ab076343… Author: Austin English <austinenglish(a)gmail.com> Date: Tue Dec 22 19:35:00 2015 -0600 hal: Add READ_PORT_ULONG stub. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hal/hal.c | 6 ++++++ dlls/hal/hal.spec | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/hal/hal.c b/dlls/hal/hal.c index 96bc895..bca688e 100644 --- a/dlls/hal/hal.c +++ b/dlls/hal/hal.c @@ -155,3 +155,9 @@ KIRQL WINAPI KeGetCurrentIrql(VOID) FIXME( " stub!\n"); return 0; } + +ULONG WINAPI READ_PORT_ULONG(ULONG *port) +{ + FIXME("(%p) stub!\n", port); + return 0; +} diff --git a/dlls/hal/hal.spec b/dlls/hal/hal.spec index 3046c65..02f778c 100644 --- a/dlls/hal/hal.spec +++ b/dlls/hal/hal.spec @@ -82,7 +82,7 @@ @ stub READ_PORT_BUFFER_ULONG @ stub READ_PORT_BUFFER_USHORT @ stub READ_PORT_UCHAR -@ stub READ_PORT_ULONG +@ stdcall READ_PORT_ULONG(ptr) @ stub READ_PORT_USHORT @ stub WRITE_PORT_BUFFER_UCHAR @ stub WRITE_PORT_BUFFER_ULONG

1 0

André Hentschel : setupapi: Remove dead code (Clang).
by Alexandre Julliard Dec. 24, 2015

Dec. 24, 2015

Module: wine Branch: master Commit: 9edfb14c6be13f599aafe5e300986f10e6fb999d URL: http://source.winehq.org/git/wine.git/?a=commit;h=9edfb14c6be13f599aafe5e30… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Dec 22 19:29:18 2015 +0100 setupapi: Remove dead code (Clang). Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/queue.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/setupapi/queue.c b/dlls/setupapi/queue.c index d57f8e1..d2e2a1d 100644 --- a/dlls/setupapi/queue.c +++ b/dlls/setupapi/queue.c @@ -126,11 +126,9 @@ static void concat_W( WCHAR *buffer, const WCHAR *src1, const WCHAR *src2, const if (buffer[-1] != '\\') *buffer++ = '\\'; if (src3) while (*src3 == '\\') src3++; } + if (src3) - { strcpyW( buffer, src3 ); - buffer += strlenW(buffer ); - } }

1 0

André Hentschel : services: Fix access adjustment by reordering code (Clang).
by Alexandre Julliard Dec. 24, 2015

Dec. 24, 2015

Module: wine Branch: master Commit: 67e5e8edf6aee9599cde3d037f443257fd07f5a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=67e5e8edf6aee9599cde3d037… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Dec 22 19:29:16 2015 +0100 services: Fix access adjustment by reordering code (Clang). Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/services/rpc.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/programs/services/rpc.c b/programs/services/rpc.c index 89a8c91..dd44965 100644 --- a/programs/services/rpc.c +++ b/programs/services/rpc.c @@ -352,12 +352,13 @@ static DWORD create_handle_for_service(struct service_entry *entry, DWORD dwDesi return ERROR_NOT_ENOUGH_SERVER_MEMORY; } + if (dwDesiredAccess & MAXIMUM_ALLOWED) + dwDesiredAccess |= SERVICE_ALL_ACCESS; + service->hdr.type = SC_HTYPE_SERVICE; service->hdr.access = dwDesiredAccess; RtlMapGenericMask(&service->hdr.access, &g_svc_generic); service->service_entry = entry; - if (dwDesiredAccess & MAXIMUM_ALLOWED) - dwDesiredAccess |= SERVICE_ALL_ACCESS; *phService = &service->hdr; return ERROR_SUCCESS;

1 0

Jeremy White : kernel32: Revise GetLongPathNameA to avoid overriding the input on long names.
by Alexandre Julliard Dec. 24, 2015

Dec. 24, 2015

Module: wine Branch: master Commit: 7dea64279ee9b80a44c2eca9ed72b1ce57f64fe8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7dea64279ee9b80a44c2eca9e… Author: Jeremy White <jwhite(a)codeweavers.com> Date: Mon Dec 21 15:20:13 2015 -0600 kernel32: Revise GetLongPathNameA to avoid overriding the input on long names. Signed-off-by: Jeremy White <jwhite(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/path.c | 10 ++++++++-- dlls/kernel32/tests/path.c | 1 - 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/path.c b/dlls/kernel32/path.c index ae211cc..b12c71e 100644 --- a/dlls/kernel32/path.c +++ b/dlls/kernel32/path.c @@ -292,6 +292,7 @@ DWORD WINAPI GetLongPathNameW( LPCWSTR shortpath, LPWSTR longpath, DWORD longlen BOOL unixabsolute; WIN32_FIND_DATAW wfd; HANDLE goit; + BOOL is_legal_8dot3; if (!shortpath) { @@ -365,7 +366,7 @@ DWORD WINAPI GetLongPathNameW( LPCWSTR shortpath, LPWSTR longpath, DWORD longlen } } - /* Check if the file exists and use the existing file name */ + /* Check if the file exists */ goit = FindFirstFileW(tmplongpath, &wfd); if (goit == INVALID_HANDLE_VALUE) { @@ -374,7 +375,12 @@ DWORD WINAPI GetLongPathNameW( LPCWSTR shortpath, LPWSTR longpath, DWORD longlen return 0; } FindClose(goit); - strcpyW(tmplongpath + lp, wfd.cFileName); + + is_legal_8dot3 = FALSE; + CheckNameLegalDOS8Dot3W(tmplongpath + lp, NULL, 0, NULL, &is_legal_8dot3); + /* Use the existing file name if it's a short name */ + if (is_legal_8dot3) + strcpyW(tmplongpath + lp, wfd.cFileName); lp += strlenW(tmplongpath + lp); sp += tmplen; } diff --git a/dlls/kernel32/tests/path.c b/dlls/kernel32/tests/path.c index 9475aa0..830c93d 100644 --- a/dlls/kernel32/tests/path.c +++ b/dlls/kernel32/tests/path.c @@ -868,7 +868,6 @@ static void test_PathNameA(CHAR *curdir, CHAR curDrive, CHAR otherDrive) "GetLongPathNameA returned '%s' instead of '%s'\n",tmpstr1,tmpstr); tmpstr[len] = tolower(tmpstr[len]); ok(GetLongPathNameA(tmpstr,tmpstr1,MAX_PATH),"GetLongPathNameA failed\n"); - todo_wine ok(lstrcmpA(tmpstr,tmpstr1)==0, "GetLongPathNameA returned '%s' instead of '%s'\n",tmpstr1,tmpstr); sprintf(tmpstr,"%s/%s",SHORTDIR,SHORTFILE);

1 0

Jeremy White : kernel32: Preserve a '/' delimiter in GetLongPathName and GetShortPathName.
by Alexandre Julliard Dec. 24, 2015

Dec. 24, 2015

Module: wine Branch: master Commit: 9f3f918f2c0ff0c6117b3020623eeb430030ef23 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f3f918f2c0ff0c6117b30206… Author: Jeremy White <jwhite(a)codeweavers.com> Date: Mon Dec 21 15:20:11 2015 -0600 kernel32: Preserve a '/' delimiter in GetLongPathName and GetShortPathName. Signed-off-by: Jeremy White <jwhite(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/path.c | 12 ++++++------ dlls/kernel32/tests/path.c | 3 --- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/dlls/kernel32/path.c b/dlls/kernel32/path.c index ec14b35..ae211cc 100644 --- a/dlls/kernel32/path.c +++ b/dlls/kernel32/path.c @@ -334,10 +334,10 @@ DWORD WINAPI GetLongPathNameW( LPCWSTR shortpath, LPWSTR longpath, DWORD longlen /* check for path delimiters and reproduce them */ if (shortpath[sp] == '\\' || shortpath[sp] == '/') { - if (!lp || tmplongpath[lp-1] != '\\') + if (!lp || (tmplongpath[lp-1] != '\\' && tmplongpath[lp-1] != '/')) { - /* strip double "\\" */ - tmplongpath[lp++] = '\\'; + /* strip double delimiters */ + tmplongpath[lp++] = shortpath[sp]; } tmplongpath[lp] = 0; /* terminate string */ sp++; @@ -492,10 +492,10 @@ DWORD WINAPI GetShortPathNameW( LPCWSTR longpath, LPWSTR shortpath, DWORD shortl /* check for path delimiters and reproduce them */ if (longpath[lp] == '\\' || longpath[lp] == '/') { - if (!sp || tmpshortpath[sp-1] != '\\') + if (!sp || (tmpshortpath[sp-1] != '\\' && tmpshortpath[sp-1] != '/')) { - /* strip double "\\" */ - tmpshortpath[sp] = '\\'; + /* strip double delimiters */ + tmpshortpath[sp] = longpath[lp]; sp++; } tmpshortpath[sp] = 0; /* terminate string */ diff --git a/dlls/kernel32/tests/path.c b/dlls/kernel32/tests/path.c index 63666c6..37d14cc 100644 --- a/dlls/kernel32/tests/path.c +++ b/dlls/kernel32/tests/path.c @@ -863,18 +863,15 @@ static void test_PathNameA(CHAR *curdir, CHAR curDrive, CHAR otherDrive) if (pGetLongPathNameA) { sprintf(tmpstr,"%s/%s",LONGDIR,LONGFILE); ok(GetLongPathNameA(tmpstr,tmpstr1,MAX_PATH),"GetLongPathNameA failed\n"); - todo_wine ok(lstrcmpiA(tmpstr,tmpstr1)==0, "GetLongPathNameA returned '%s' instead of '%s'\n",tmpstr1,tmpstr); sprintf(tmpstr,"%s/%s",SHORTDIR,SHORTFILE); ok(GetLongPathNameA(tmpstr,tmpstr1,MAX_PATH),"GetLongPathNameA failed\n"); - todo_wine ok(lstrcmpiA(tmpstr,tmpstr1)==0, "GetLongPathNameA returned '%s' instead of '%s'\n",tmpstr1,tmpstr); } sprintf(tmpstr,"%s/%s",SHORTDIR,SHORTFILE); ok(GetShortPathNameA(tmpstr,tmpstr1,MAX_PATH),"GetShortPathNameA failed\n"); - todo_wine ok(lstrcmpiA(tmpstr,tmpstr1)==0, "GetShortPathNameA returned '%s' instead of '%s'\n",tmpstr1,tmpstr);

1 0

Jeremy White : kernel32/tests: Add path tests for the ./../foo case.
by Alexandre Julliard Dec. 24, 2015

Dec. 24, 2015

Module: wine Branch: master Commit: 81ccc7b8167da592d32d882f435aa5b39f8b8059 URL: http://source.winehq.org/git/wine.git/?a=commit;h=81ccc7b8167da592d32d882f4… Author: Jeremy White <jwhite(a)codeweavers.com> Date: Mon Dec 21 15:20:07 2015 -0600 kernel32/tests: Add path tests for the ./../foo case. Signed-off-by: Jeremy White <jwhite(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/path.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/dlls/kernel32/tests/path.c b/dlls/kernel32/tests/path.c index 85c4ec3..e90a260 100644 --- a/dlls/kernel32/tests/path.c +++ b/dlls/kernel32/tests/path.c @@ -2136,6 +2136,17 @@ static void test_relative_path(void) ok(ret, "GetShortPathName error %d\n", GetLastError()); ok(!strcmp(buf, "..\\foo\\file"), "expected ..\\foo\\file, got %s\n", buf); + strcpy(buf, "deadbeef"); + ret = pGetLongPathNameA(".\\..\\foo\\file", buf, MAX_PATH); + todo_wine + ok(ret, "GetLongPathName error %d\n", GetLastError()); + todo_wine + ok(!strcmp(buf, ".\\..\\foo\\file"), "expected .\\..\\foo\\file, got %s\n", buf); + strcpy(buf, "deadbeef"); + ret = GetShortPathNameA(".\\..\\foo\\file", buf, MAX_PATH); + ok(ret, "GetShortPathName error %d\n", GetLastError()); + ok(!strcmp(buf, ".\\..\\foo\\file"), "expected .\\..\\foo\\file, got %s\n", buf); + SetCurrentDirectoryA(".."); DeleteFileA("foo\\file"); RemoveDirectoryA("foo");

1 0

Austin English : ntoskrnl.exe: Add RtlInitializeGenericTableAvl/ RtlInsertElementGenericTableAvl stubs.
by Alexandre Julliard Dec. 24, 2015

Dec. 24, 2015

Module: wine Branch: master Commit: f12241ae143fe5725cfddb276e9ad4ff80237bbb URL: http://source.winehq.org/git/wine.git/?a=commit;h=f12241ae143fe5725cfddb276… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Nov 18 19:10:36 2015 -0600 ntoskrnl.exe: Add RtlInitializeGenericTableAvl/RtlInsertElementGenericTableAvl stubs. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/ntdll.spec | 4 ++-- dlls/ntdll/rtl.c | 18 +++++++++++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 4 ++-- include/ddk/ntddk.h | 39 +++++++++++++++++++++++++++++++++++++ 4 files changed, 61 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index c3b6bf0..8cabf95 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -686,7 +686,7 @@ @ stdcall RtlInitializeCriticalSectionAndSpinCount(ptr long) @ stdcall RtlInitializeCriticalSectionEx(ptr long long) @ stdcall RtlInitializeGenericTable(ptr ptr ptr ptr ptr) -# @ stub RtlInitializeGenericTableAvl +@ stdcall RtlInitializeGenericTableAvl(ptr ptr ptr ptr ptr) @ stdcall RtlInitializeHandleTable(long long ptr) @ stub RtlInitializeRXact # @ stub RtlInitializeRangeList @@ -696,7 +696,7 @@ @ stdcall RtlInitializeSid(ptr ptr long) # @ stub RtlInitializeStackTraceDataBase @ stub RtlInsertElementGenericTable -# @ stub RtlInsertElementGenericTableAvl +@ stdcall RtlInsertElementGenericTableAvl(ptr ptr long ptr) @ cdecl -arch=x86_64 RtlInstallFunctionTableCallback(long long long ptr ptr wstr) @ stdcall RtlInt64ToUnicodeString(int64 long ptr) @ stdcall RtlIntegerToChar(long long long ptr) diff --git a/dlls/ntdll/rtl.c b/dlls/ntdll/rtl.c index 8eb3e9f..74ad35a 100644 --- a/dlls/ntdll/rtl.c +++ b/dlls/ntdll/rtl.c @@ -45,6 +45,7 @@ #include "wine/unicode.h" #include "ntdll_misc.h" #include "inaddr.h" +#include "ddk/ntddk.h" WINE_DEFAULT_DEBUG_CHANNEL(ntdll); @@ -1595,3 +1596,20 @@ void WINAPI RtlGetCurrentProcessorNumberEx(PROCESSOR_NUMBER *processor) processor->Number = NtGetCurrentProcessorNumber(); processor->Reserved = 0; } + +/*********************************************************************** + * RtlInitializeGenericTableAvl (NTDLL.@) + */ +void WINAPI RtlInitializeGenericTableAvl(PRTL_AVL_TABLE table, PRTL_AVL_COMPARE_ROUTINE compare, + PRTL_AVL_ALLOCATE_ROUTINE allocate, PRTL_AVL_FREE_ROUTINE free, void *context) +{ + FIXME("%p %p %p %p %p: stub\n", table, compare, allocate, free, context); +} + +/*********************************************************************** + * RtlInsertElementGenericTableAvl (NTDLL.@) + */ +void WINAPI RtlInsertElementGenericTableAvl(PRTL_AVL_TABLE table, void *buffer, ULONG size, BOOL *element) +{ + FIXME("%p %p %u %p: stub\n", table, buffer, size, element); +} diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index db15265..1319ada 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -1055,12 +1055,12 @@ @ stdcall RtlInitUnicodeString(ptr wstr) ntdll.RtlInitUnicodeString @ stdcall RtlInitializeBitMap(ptr long long) ntdll.RtlInitializeBitMap @ stdcall RtlInitializeGenericTable(ptr ptr ptr ptr ptr) ntdll.RtlInitializeGenericTable -@ stub RtlInitializeGenericTableAvl +@ stdcall RtlInitializeGenericTableAvl(ptr ptr ptr ptr ptr) ntdll.RtlInitializeGenericTableAvl @ stub RtlInitializeRangeList @ stdcall RtlInitializeSid(ptr ptr long) ntdll.RtlInitializeSid @ stub RtlInitializeUnicodePrefix @ stub RtlInsertElementGenericTable -@ stub RtlInsertElementGenericTableAvl +@ stdcall RtlInsertElementGenericTableAvl(ptr ptr long ptr) ntdll.RtlInsertElementGenericTableAvl @ stub RtlInsertElementGenericTableFull @ stub RtlInsertElementGenericTableFullAvl @ stub RtlInsertUnicodePrefix diff --git a/include/ddk/ntddk.h b/include/ddk/ntddk.h index bccfd39..6aae257 100644 --- a/include/ddk/ntddk.h +++ b/include/ddk/ntddk.h @@ -149,6 +149,43 @@ typedef struct _KWAIT_BLOCK { USHORT WaitType; } KWAIT_BLOCK, *PKWAIT_BLOCK, *RESTRICTED_POINTER PRKWAIT_BLOCK; +typedef struct _RTL_BALANCED_LINKS { + struct _RTL_BALANCED_LINKS *Parent; + struct _RTL_BALANCED_LINKS *LeftChild; + struct _RTL_BALANCED_LINKS *RightChild; + CHAR Balance; + UCHAR Reserved[3]; +} RTL_BALANCED_LINKS; +typedef RTL_BALANCED_LINKS *PRTL_BALANCED_LINKS; + +struct _RTL_AVL_TABLE; + +typedef enum _RTL_GENERIC_COMPARE_RESULTS { + GenericLessThan, + GenericGreaterThan, + GenericEqual +} RTL_GENERIC_COMPARE_RESULTS; + +typedef RTL_GENERIC_COMPARE_RESULTS (WINAPI *PRTL_AVL_COMPARE_ROUTINE)(struct _RTL_AVL_TABLE *, void *, void *); + +typedef void (WINAPI *PRTL_AVL_ALLOCATE_ROUTINE)(struct _RTL_AVL_TABLE *, LONG); + +typedef void (WINAPI *PRTL_AVL_FREE_ROUTINE )(struct _RTL_AVL_TABLE *, void *buffer); + +typedef struct _RTL_AVL_TABLE { + RTL_BALANCED_LINKS BalancedRoot; + void *OrderedPointer; + ULONG WhichOrderedElement; + ULONG NumberGenericTableElements; + ULONG DepthOfTree; + PRTL_BALANCED_LINKS RestartKey; + ULONG DeleteCount; + PRTL_AVL_COMPARE_ROUTINE CompareRoutine; + PRTL_AVL_ALLOCATE_ROUTINE AllocateRoutine; + PRTL_AVL_FREE_ROUTINE FreeRoutine; + void *TableContext; +} RTL_AVL_TABLE, *PRTL_AVL_TABLE; + typedef VOID (WINAPI *PDRIVER_NOTIFICATION_CALLBACK_ROUTINE)(PVOID,PVOID); typedef VOID (WINAPI *PDRIVER_REINITIALIZE)(PDRIVER_OBJECT,PVOID,ULONG); typedef VOID (WINAPI *PLOAD_IMAGE_NOTIFY_ROUTINE)(PUNICODE_STRING,HANDLE,PIMAGE_INFO); @@ -160,5 +197,7 @@ NTSTATUS WINAPI IoQueryDeviceDescription(PINTERFACE_TYPE,PULONG,PCONFIGURATION_ void WINAPI IoRegisterDriverReinitialization(PDRIVER_OBJECT,PDRIVER_REINITIALIZE,PVOID); NTSTATUS WINAPI IoRegisterShutdownNotification(PDEVICE_OBJECT); NTSTATUS WINAPI PsSetLoadImageNotifyRoutine(PLOAD_IMAGE_NOTIFY_ROUTINE); +void WINAPI RtlInitializeGenericTableAvl(PRTL_AVL_TABLE,PRTL_AVL_COMPARE_ROUTINE,PRTL_AVL_ALLOCATE_ROUTINE, PRTL_AVL_FREE_ROUTINE,void *); +void WINAPI RtlInsertElementGenericTableAvl(PRTL_AVL_TABLE,void *,ULONG,BOOL*); #endif

1 0

Nikolay Sivov : ole32: Ignore GetMiscStatus() returned value in OleCreate( ).
by Alexandre Julliard Dec. 24, 2015

Dec. 24, 2015

Module: wine Branch: master Commit: 73008a6c04e9284e617bd4007491c304b8efd2c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=73008a6c04e9284e617bd4007… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Dec 24 13:33:56 2015 +0300 ole32: Ignore GetMiscStatus() returned value in OleCreate(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/ole2.c | 2 +- dlls/ole32/tests/ole2.c | 56 +++++++++++++++++++++++++++++++++++++++++++------ 2 files changed, 51 insertions(+), 7 deletions(-) diff --git a/dlls/ole32/ole2.c b/dlls/ole32/ole2.c index 7f532c3..5bfd8a3 100644 --- a/dlls/ole32/ole2.c +++ b/dlls/ole32/ole2.c @@ -2545,7 +2545,7 @@ HRESULT WINAPI OleCreate( if (SUCCEEDED(hres)) { DWORD dwStatus; - hres = IOleObject_GetMiscStatus(pOleObject, DVASPECT_CONTENT, &dwStatus); + IOleObject_GetMiscStatus(pOleObject, DVASPECT_CONTENT, &dwStatus); } } diff --git a/dlls/ole32/tests/ole2.c b/dlls/ole32/tests/ole2.c index 08253a1..28370ca 100644 --- a/dlls/ole32/tests/ole2.c +++ b/dlls/ole32/tests/ole2.c @@ -111,7 +111,7 @@ static FORMATETC *g_expected_fetc = NULL; static BOOL g_showRunnable = TRUE; static BOOL g_isRunning = TRUE; -static BOOL g_failGetMiscStatus; +static HRESULT g_GetMiscStatusFailsWith = S_OK; static HRESULT g_QIFailsWith; static UINT cf_test_1, cf_test_2, cf_test_3; @@ -421,12 +421,15 @@ static HRESULT WINAPI OleObject_EnumAdvise static HRESULT WINAPI OleObject_GetMiscStatus ( IOleObject *iface, - DWORD dwAspect, + DWORD aspect, DWORD *pdwStatus ) { CHECK_EXPECTED_METHOD("OleObject_GetMiscStatus"); - if(!g_failGetMiscStatus) + + ok(aspect == DVASPECT_CONTENT, "got aspect %d\n", aspect); + + if (g_GetMiscStatusFailsWith == S_OK) { *pdwStatus = OLEMISC_RECOMPOSEONRESIZE; return S_OK; @@ -434,7 +437,7 @@ static HRESULT WINAPI OleObject_GetMiscStatus else { *pdwStatus = 0x1234; - return E_FAIL; + return g_GetMiscStatusFailsWith; } } @@ -917,6 +920,30 @@ static void test_OleCreate(IStorage *pStorage) { "OleObject_Release", TEST_OPTIONAL /* NT4 only */ }, { NULL, 0 } }; + static const struct expected_method methods_olerender_draw_with_site[] = + { + { "OleObject_QueryInterface", 0 }, + { "OleObject_AddRef", 0 }, + { "OleObject_QueryInterface", 0 }, + { "OleObject_AddRef", 0 }, + { "OleObject_GetMiscStatus", 0 }, + { "OleObject_QueryInterface", 0 }, + { "OleObjectPersistStg_AddRef", 0 }, + { "OleObjectPersistStg_InitNew", 0 }, + { "OleObjectPersistStg_Release", 0 }, + { "OleObject_SetClientSite", 0 }, + { "OleObject_Release", 0 }, + { "OleObject_QueryInterface", 0 }, + { "OleObjectRunnable_AddRef", 0 }, + { "OleObjectRunnable_Run", 0 }, + { "OleObjectRunnable_Release", 0 }, + { "OleObject_QueryInterface", 0 }, + { "OleObjectCache_AddRef", 0 }, + { "OleObjectCache_Cache", 0 }, + { "OleObjectCache_Release", 0 }, + { "OleObject_Release", 0 }, + { NULL, 0 } + }; static const struct expected_method methods_olerender_format[] = { { "OleObject_QueryInterface", 0 }, @@ -1019,6 +1046,23 @@ static void test_OleCreate(IStorage *pStorage) IOleObject_Release(pObject); CHECK_NO_EXTRA_METHODS(); + expected_method_list = methods_olerender_draw_with_site; + trace("OleCreate with OLERENDER_DRAW, with site:\n"); + hr = OleCreate(&CLSID_Equation3, &IID_IOleObject, OLERENDER_DRAW, NULL, (IOleClientSite*)0xdeadbeef, pStorage, (void **)&pObject); + ok_ole_success(hr, "OleCreate"); + IOleObject_Release(pObject); + CHECK_NO_EXTRA_METHODS(); + + /* GetMiscStatus fails */ + g_GetMiscStatusFailsWith = 0x8fafefaf; + expected_method_list = methods_olerender_draw_with_site; + trace("OleCreate with OLERENDER_DRAW, with site:\n"); + hr = OleCreate(&CLSID_Equation3, &IID_IOleObject, OLERENDER_DRAW, NULL, (IOleClientSite*)0xdeadbeef, pStorage, (void **)&pObject); + ok_ole_success(hr, "OleCreate"); + IOleObject_Release(pObject); + CHECK_NO_EXTRA_METHODS(); + g_GetMiscStatusFailsWith = S_OK; + formatetc.cfFormat = CF_TEXT; formatetc.ptd = NULL; formatetc.dwAspect = DVASPECT_CONTENT; @@ -1092,7 +1136,7 @@ static void test_OleLoad(IStorage *pStorage) /* Test once with IOleObject_GetMiscStatus failing */ expected_method_list = methods_oleload; - g_failGetMiscStatus = TRUE; + g_GetMiscStatusFailsWith = E_FAIL; trace("OleLoad:\n"); hr = OleLoad(pStorage, &IID_IOleObject, (IOleClientSite *)0xdeadbeef, (void **)&pObject); ok(hr == S_OK || @@ -1108,9 +1152,9 @@ static void test_OleLoad(IStorage *pStorage) IOleObject_Release(pObject); CHECK_NO_EXTRA_METHODS(); } + g_GetMiscStatusFailsWith = S_OK; /* Test again, let IOleObject_GetMiscStatus succeed. */ - g_failGetMiscStatus = FALSE; expected_method_list = methods_oleload; trace("OleLoad:\n"); hr = OleLoad(pStorage, &IID_IOleObject, (IOleClientSite *)0xdeadbeef, (void **)&pObject);

1 0

Nikolay Sivov : ole32/tests: Some tests for OleRegGetUserType().
by Alexandre Julliard Dec. 24, 2015

Dec. 24, 2015

Module: wine Branch: master Commit: 7ad896d54169ef14e4619bfd2cdcca53f3d271e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7ad896d54169ef14e4619bfd2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Dec 24 13:33:55 2015 +0300 ole32/tests: Some tests for OleRegGetUserType(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/ole2.c | 3 +++ dlls/ole32/tests/compobj.c | 54 ++++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 55 insertions(+), 2 deletions(-) diff --git a/dlls/ole32/ole2.c b/dlls/ole32/ole2.c index 41fe4bd..7f532c3 100644 --- a/dlls/ole32/ole2.c +++ b/dlls/ole32/ole2.c @@ -685,6 +685,9 @@ HRESULT WINAPI OleRegGetUserType( TRACE("(%s, %d, %p)\n", debugstr_guid(clsid), dwFormOfType, pszUserType); + if (!pszUserType) + return E_INVALIDARG; + *pszUserType = NULL; hres = COM_OpenKeyForCLSID(clsid, NULL, KEY_READ, &clsidKey); diff --git a/dlls/ole32/tests/compobj.c b/dlls/ole32/tests/compobj.c index 1913e1f..792d7dc 100644 --- a/dlls/ole32/tests/compobj.c +++ b/dlls/ole32/tests/compobj.c @@ -271,12 +271,12 @@ static const char actctx_manifest[] = " progid=\"ProgId.ProgId\"" " miscStatusIcon=\"recomposeonresize\"" " />" -" <comClass clsid=\"{0be35203-8f91-11ce-9de3-00aa004bb851}\"" +" <comClass description=\"CustomFont Description\" clsid=\"{0be35203-8f91-11ce-9de3-00aa004bb851}\"" " progid=\"CustomFont\"" " miscStatusIcon=\"recomposeonresize\"" " miscStatusContent=\"insideout\"" " />" -" <comClass clsid=\"{0be35203-8f91-11ce-9de3-00aa004bb852}\"" +" <comClass description=\"StdFont Description\" clsid=\"{0be35203-8f91-11ce-9de3-00aa004bb852}\"" " progid=\"StdFont\"" " />" " <comClass clsid=\"{62222222-1234-1234-1234-56789abcdef0}\" >" @@ -2225,6 +2225,55 @@ static void test_OleRegGetMiscStatus(void) } } +static void test_OleRegGetUserType(void) +{ + static const WCHAR stdfont_usertypeW[] = {'S','t','a','n','d','a','r','d',' ','F','o','n','t',0}; + static const WCHAR stdfont2_usertypeW[] = {'C','L','S','I','D','_','S','t','d','F','o','n','t',0}; + ULONG_PTR cookie; + HANDLE handle; + HRESULT hr; + WCHAR *str; + DWORD form; + + for (form = 0; form <= USERCLASSTYPE_APPNAME+1; form++) { + hr = OleRegGetUserType(&CLSID_Testclass, form, NULL); + ok(hr == E_INVALIDARG, "form %u: got 0x%08x\n", form, hr); + + str = (void*)0xdeadbeef; + hr = OleRegGetUserType(&CLSID_Testclass, form, &str); + ok(hr == REGDB_E_CLASSNOTREG, "form %u: got 0x%08x\n", form, hr); + ok(str == NULL, "form %u: got %p\n", form, str); + + /* same string returned for StdFont for all form types */ + str = NULL; + hr = OleRegGetUserType(&CLSID_StdFont, form, &str); + ok(hr == S_OK, "form %u: got 0x%08x\n", form, hr); + ok(!lstrcmpW(str, stdfont_usertypeW) || !lstrcmpW(str, stdfont2_usertypeW) /* winxp */, + "form %u, got %s\n", form, wine_dbgstr_w(str)); + CoTaskMemFree(str); + } + + if ((handle = activate_context(actctx_manifest, &cookie))) + { + for (form = 0; form <= USERCLASSTYPE_APPNAME+1; form++) { + str = (void*)0xdeadbeef; + hr = OleRegGetUserType(&CLSID_Testclass, form, &str); + ok(hr == REGDB_E_CLASSNOTREG, "form %u: got 0x%08x\n", form, hr); + ok(str == NULL, "form %u: got %s\n", form, wine_dbgstr_w(str)); + + /* same string returned for StdFont for all form types */ + str = NULL; + hr = OleRegGetUserType(&CLSID_StdFont, form, &str); + ok(hr == S_OK, "form %u: got 0x%08x\n", form, hr); + ok(!lstrcmpW(str, stdfont_usertypeW) || !lstrcmpW(str, stdfont2_usertypeW) /* winxp */, + "form %u, got %s\n", form, wine_dbgstr_w(str)); + CoTaskMemFree(str); + } + + pDeactivateActCtx(0, cookie); + pReleaseActCtx(handle); + } +} static void test_CoCreateGuid(void) { HRESULT hr; @@ -2722,4 +2771,5 @@ START_TEST(compobj) test_CoCreateGuid(); test_CoWaitForMultipleHandles(); test_CoGetMalloc(); + test_OleRegGetUserType(); }

1 0