April 2018 - Wine-Devel - list.winehq.org

[PATCH 2/4] wined3d: Get rid of the "tex_type" field from struct blt_info.
by Henri Verbeet April 10, 2018

April 10, 2018

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/surface.c | 9 --------- 1 file changed, 9 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index df40ea61be0..c01bd32e1af 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -39,7 +39,6 @@ static const DWORD surface_simple_locations = WINED3D_LOCATION_SYSMEM struct blt_info { GLenum bind_target; - enum wined3d_gl_resource_type tex_type; struct wined3d_vec3 texcoords[4]; }; @@ -80,7 +79,6 @@ static void texture2d_get_blt_info(const struct wined3d_texture *texture, /* Fall back to GL_TEXTURE_2D */ case GL_TEXTURE_2D: info->bind_target = GL_TEXTURE_2D; - info->tex_type = WINED3D_GL_RES_TYPE_TEX_2D; coords[0].x = (float)rect->left / w; coords[0].y = (float)rect->top / h; coords[0].z = 0.0f; @@ -100,7 +98,6 @@ static void texture2d_get_blt_info(const struct wined3d_texture *texture, case GL_TEXTURE_RECTANGLE_ARB: info->bind_target = GL_TEXTURE_RECTANGLE_ARB; - info->tex_type = WINED3D_GL_RES_TYPE_TEX_RECT; coords[0].x = rect->left; coords[0].y = rect->top; coords[0].z = 0.0f; coords[1].x = rect->right; coords[1].y = rect->top; coords[1].z = 0.0f; coords[2].x = rect->left; coords[2].y = rect->bottom; coords[2].z = 0.0f; @@ -109,7 +106,6 @@ static void texture2d_get_blt_info(const struct wined3d_texture *texture, case GL_TEXTURE_CUBE_MAP_POSITIVE_X: info->bind_target = GL_TEXTURE_CUBE_MAP_ARB; - info->tex_type = WINED3D_GL_RES_TYPE_TEX_CUBE; cube_coords_float(rect, w, h, &f); coords[0].x = 1.0f; coords[0].y = -f.t; coords[0].z = -f.l; @@ -120,7 +116,6 @@ static void texture2d_get_blt_info(const struct wined3d_texture *texture, case GL_TEXTURE_CUBE_MAP_NEGATIVE_X: info->bind_target = GL_TEXTURE_CUBE_MAP_ARB; - info->tex_type = WINED3D_GL_RES_TYPE_TEX_CUBE; cube_coords_float(rect, w, h, &f); coords[0].x = -1.0f; coords[0].y = -f.t; coords[0].z = f.l; @@ -131,7 +126,6 @@ static void texture2d_get_blt_info(const struct wined3d_texture *texture, case GL_TEXTURE_CUBE_MAP_POSITIVE_Y: info->bind_target = GL_TEXTURE_CUBE_MAP_ARB; - info->tex_type = WINED3D_GL_RES_TYPE_TEX_CUBE; cube_coords_float(rect, w, h, &f); coords[0].x = f.l; coords[0].y = 1.0f; coords[0].z = f.t; @@ -142,7 +136,6 @@ static void texture2d_get_blt_info(const struct wined3d_texture *texture, case GL_TEXTURE_CUBE_MAP_NEGATIVE_Y: info->bind_target = GL_TEXTURE_CUBE_MAP_ARB; - info->tex_type = WINED3D_GL_RES_TYPE_TEX_CUBE; cube_coords_float(rect, w, h, &f); coords[0].x = f.l; coords[0].y = -1.0f; coords[0].z = -f.t; @@ -153,7 +146,6 @@ static void texture2d_get_blt_info(const struct wined3d_texture *texture, case GL_TEXTURE_CUBE_MAP_POSITIVE_Z: info->bind_target = GL_TEXTURE_CUBE_MAP_ARB; - info->tex_type = WINED3D_GL_RES_TYPE_TEX_CUBE; cube_coords_float(rect, w, h, &f); coords[0].x = f.l; coords[0].y = -f.t; coords[0].z = 1.0f; @@ -164,7 +156,6 @@ static void texture2d_get_blt_info(const struct wined3d_texture *texture, case GL_TEXTURE_CUBE_MAP_NEGATIVE_Z: info->bind_target = GL_TEXTURE_CUBE_MAP_ARB; - info->tex_type = WINED3D_GL_RES_TYPE_TEX_CUBE; cube_coords_float(rect, w, h, &f); coords[0].x = -f.l; coords[0].y = -f.t; coords[0].z = -1.0f; -- 2.11.0

1 0

[PATCH 1/4] wined3d: Get rid of the "binding" field from struct blt_info.
by Henri Verbeet April 10, 2018

April 10, 2018

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/surface.c | 9 --------- 1 file changed, 9 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index ee325a1af5b..df40ea61be0 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -38,7 +38,6 @@ static const DWORD surface_simple_locations = WINED3D_LOCATION_SYSMEM struct blt_info { - GLenum binding; GLenum bind_target; enum wined3d_gl_resource_type tex_type; struct wined3d_vec3 texcoords[4]; @@ -80,7 +79,6 @@ static void texture2d_get_blt_info(const struct wined3d_texture *texture, FIXME("Unsupported texture target %#x.\n", target); /* Fall back to GL_TEXTURE_2D */ case GL_TEXTURE_2D: - info->binding = GL_TEXTURE_BINDING_2D; info->bind_target = GL_TEXTURE_2D; info->tex_type = WINED3D_GL_RES_TYPE_TEX_2D; coords[0].x = (float)rect->left / w; @@ -101,7 +99,6 @@ static void texture2d_get_blt_info(const struct wined3d_texture *texture, break; case GL_TEXTURE_RECTANGLE_ARB: - info->binding = GL_TEXTURE_BINDING_RECTANGLE_ARB; info->bind_target = GL_TEXTURE_RECTANGLE_ARB; info->tex_type = WINED3D_GL_RES_TYPE_TEX_RECT; coords[0].x = rect->left; coords[0].y = rect->top; coords[0].z = 0.0f; @@ -111,7 +108,6 @@ static void texture2d_get_blt_info(const struct wined3d_texture *texture, break; case GL_TEXTURE_CUBE_MAP_POSITIVE_X: - info->binding = GL_TEXTURE_BINDING_CUBE_MAP_ARB; info->bind_target = GL_TEXTURE_CUBE_MAP_ARB; info->tex_type = WINED3D_GL_RES_TYPE_TEX_CUBE; cube_coords_float(rect, w, h, &f); @@ -123,7 +119,6 @@ static void texture2d_get_blt_info(const struct wined3d_texture *texture, break; case GL_TEXTURE_CUBE_MAP_NEGATIVE_X: - info->binding = GL_TEXTURE_BINDING_CUBE_MAP_ARB; info->bind_target = GL_TEXTURE_CUBE_MAP_ARB; info->tex_type = WINED3D_GL_RES_TYPE_TEX_CUBE; cube_coords_float(rect, w, h, &f); @@ -135,7 +130,6 @@ static void texture2d_get_blt_info(const struct wined3d_texture *texture, break; case GL_TEXTURE_CUBE_MAP_POSITIVE_Y: - info->binding = GL_TEXTURE_BINDING_CUBE_MAP_ARB; info->bind_target = GL_TEXTURE_CUBE_MAP_ARB; info->tex_type = WINED3D_GL_RES_TYPE_TEX_CUBE; cube_coords_float(rect, w, h, &f); @@ -147,7 +141,6 @@ static void texture2d_get_blt_info(const struct wined3d_texture *texture, break; case GL_TEXTURE_CUBE_MAP_NEGATIVE_Y: - info->binding = GL_TEXTURE_BINDING_CUBE_MAP_ARB; info->bind_target = GL_TEXTURE_CUBE_MAP_ARB; info->tex_type = WINED3D_GL_RES_TYPE_TEX_CUBE; cube_coords_float(rect, w, h, &f); @@ -159,7 +152,6 @@ static void texture2d_get_blt_info(const struct wined3d_texture *texture, break; case GL_TEXTURE_CUBE_MAP_POSITIVE_Z: - info->binding = GL_TEXTURE_BINDING_CUBE_MAP_ARB; info->bind_target = GL_TEXTURE_CUBE_MAP_ARB; info->tex_type = WINED3D_GL_RES_TYPE_TEX_CUBE; cube_coords_float(rect, w, h, &f); @@ -171,7 +163,6 @@ static void texture2d_get_blt_info(const struct wined3d_texture *texture, break; case GL_TEXTURE_CUBE_MAP_NEGATIVE_Z: - info->binding = GL_TEXTURE_BINDING_CUBE_MAP_ARB; info->bind_target = GL_TEXTURE_CUBE_MAP_ARB; info->tex_type = WINED3D_GL_RES_TYPE_TEX_CUBE; cube_coords_float(rect, w, h, &f); -- 2.11.0

1 0

[PATCH 1/6] user32: Add internal reference counting to menu structs
by Nikolay Sivov April 10, 2018

April 10, 2018

From: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/user32/menu.c | 50 +++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 39 insertions(+), 11 deletions(-) diff --git a/dlls/user32/menu.c b/dlls/user32/menu.c index 99a99c0395..0aa4fb7ee5 100644 --- a/dlls/user32/menu.c +++ b/dlls/user32/menu.c @@ -98,6 +98,7 @@ typedef struct { UINT nScrollPos; /* Current scroll position */ UINT nTotalHeight; /* Total height of menu items inside menu */ RECT items_rect; /* Rectangle within which the items lie. Excludes margins and scroll arrows */ + LONG refcount; /* ------------ MENUINFO members ------ */ DWORD dwStyle; /* Extended menu style */ UINT cyMax; /* max height of the whole menu, 0 is screen height */ @@ -180,6 +181,7 @@ static BOOL fEndMenu = FALSE; DWORD WINAPI DrawMenuBarTemp(HWND hwnd, HDC hDC, LPRECT lprect, HMENU hMenu, HFONT hFont); static BOOL SetMenuItemInfo_common( MENUITEM *, const MENUITEMINFOW *, BOOL); +static BOOL MENU_ReleaseMenu( POPUPMENU *lppop ); /********************************************************************* * menu class descriptor @@ -3978,7 +3980,9 @@ BOOL WINAPI RemoveMenu( HMENU hMenu, UINT nPos, UINT wFlags ) if (!(item = MENU_FindItem( &hMenu, &nPos, wFlags ))) return FALSE; if (!(menu = MENU_GetMenu(hMenu))) return FALSE; - /* Remove item */ + /* Remove item */ + if ((item->fType & MF_POPUP) && item->hSubMenu) + MENU_ReleaseMenu(MENU_GetMenu(item->hSubMenu)); MENU_FreeItemData( item ); @@ -4127,6 +4131,7 @@ HMENU WINAPI CreateMenu(void) if (!(menu = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*menu) ))) return 0; menu->FocusedItem = NO_SELECTED_ITEM; + menu->refcount = 1; if (!(hMenu = alloc_user_handle( &menu->obj, USER_MENU ))) HeapFree( GetProcessHeap(), 0, menu ); @@ -4135,18 +4140,16 @@ HMENU WINAPI CreateMenu(void) return hMenu; } - -/********************************************************************** - * DestroyMenu (USER32.@) - */ -BOOL WINAPI DestroyMenu( HMENU hMenu ) +static BOOL MENU_ReleaseMenu( POPUPMENU *lppop ) { - LPPOPUPMENU lppop; + LONG ref; - TRACE("(%p)\n", hMenu); + if (!lppop) + return FALSE; - if (!(lppop = free_user_handle( hMenu, USER_MENU ))) return FALSE; - if (lppop == OBJ_OTHER_PROCESS) return FALSE; + ref = InterlockedDecrement(&lppop->refcount); + if (ref) + return FALSE; /* DestroyMenu should not destroy system menu popup owner */ if ((lppop->wFlags & (MF_POPUP | MF_SYSMENU)) == MF_POPUP && lppop->hWnd) @@ -4161,15 +4164,37 @@ BOOL WINAPI DestroyMenu( HMENU hMenu ) MENUITEM *item = lppop->items; for (i = lppop->nItems; i > 0; i--, item++) { - if (item->fType & MF_POPUP) DestroyMenu(item->hSubMenu); + if (item->fType & MF_POPUP) + { + /* Release handle if it hasn't already been released. */ + if (!MENU_ReleaseMenu(MENU_GetMenu(item->hSubMenu))) + DestroyMenu(item->hSubMenu); + } MENU_FreeItemData( item ); } HeapFree( GetProcessHeap(), 0, lppop->items ); } HeapFree( GetProcessHeap(), 0, lppop ); + return TRUE; } +/********************************************************************** + * DestroyMenu (USER32.@) + */ +BOOL WINAPI DestroyMenu( HMENU hMenu ) +{ + POPUPMENU *lppop; + + TRACE("(%p)\n", hMenu); + + if (!(lppop = free_user_handle( hMenu, USER_MENU ))) return FALSE; + if (lppop == OBJ_OTHER_PROCESS) return FALSE; + + MENU_ReleaseMenu(lppop); + + return TRUE; +} /********************************************************************** * GetSystemMenu (USER32.@) @@ -4817,6 +4842,8 @@ static BOOL SetMenuItemInfo_common(MENUITEM * menu, menu->wID = lpmii->wID; if (lpmii->fMask & MIIM_SUBMENU) { + if ((menu->fType & MF_POPUP) && menu->hSubMenu) + MENU_ReleaseMenu(MENU_GetMenu(menu->hSubMenu)); menu->hSubMenu = lpmii->hSubMenu; if (menu->hSubMenu) { POPUPMENU *subMenu = MENU_GetMenu(menu->hSubMenu); @@ -4828,6 +4855,7 @@ static BOOL SetMenuItemInfo_common(MENUITEM * menu, } subMenu->wFlags |= MF_POPUP; menu->fType |= MF_POPUP; + InterlockedIncrement(&subMenu->refcount); } else { SetLastError( ERROR_INVALID_PARAMETER); return FALSE; -- 2.16.3

2 6

[PATCH 1/6] ole32: Add a helper for grabbing the current apartment or MTA.
by Zebediah Figura April 10, 2018

April 10, 2018

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/ole32/compobj.c | 48 +++++++++++++++++++++++++----------------------- 1 file changed, 25 insertions(+), 23 deletions(-) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index 1c7645b..a3b4598 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -734,6 +734,19 @@ static APARTMENT *apartment_find_mta(void) return apt; } +/* Return the current apartment if it exists, or, failing that, the MTA. Caller + * must free the returned apartment in either case. */ +static APARTMENT *apartment_get_current_or_mta(void) +{ + APARTMENT *apt = COM_CurrentApt(); + if (apt) + { + apartment_addref(apt); + return apt; + } + return apartment_find_mta(); +} + static void COM_RevokeRegisteredClassObject(RegisteredClass *curClass) { list_remove(&curClass->entry); @@ -2997,15 +3010,10 @@ HRESULT WINAPI DECLSPEC_HOTPATCH CoGetClassObject( *ppv = NULL; - if ((apt = COM_CurrentApt())) - apartment_addref(apt); - else + if (!(apt = apartment_get_current_or_mta())) { - if (!(apt = apartment_find_mta())) - { - ERR("apartment not initialised\n"); - return CO_E_NOTINITIALIZED; - } + ERR("apartment not initialised\n"); + return CO_E_NOTINITIALIZED; } if (pServerInfo) { @@ -3298,15 +3306,12 @@ HRESULT WINAPI DECLSPEC_HOTPATCH CoCreateInstanceEx( if(FAILED(hres)) clsid = *rclsid; - if (!(apt = COM_CurrentApt())) + if (!(apt = apartment_get_current_or_mta())) { - if (!(apt = apartment_find_mta())) - { - ERR("apartment not initialised\n"); - return CO_E_NOTINITIALIZED; - } - apartment_release(apt); + ERR("apartment not initialised\n"); + return CO_E_NOTINITIALIZED; } + apartment_release(apt); /* * The Standard Global Interface Table (GIT) object is a process-wide singleton. @@ -4998,22 +5003,19 @@ HRESULT WINAPI CoGetObjectContext(REFIID riid, void **ppv) HRESULT WINAPI CoGetContextToken( ULONG_PTR *token ) { struct oletls *info = COM_CurrentInfo(); + APARTMENT *apt; TRACE("(%p)\n", token); if (!info) return E_OUTOFMEMORY; - if (!info->apt) + if (!(apt = apartment_get_current_or_mta())) { - APARTMENT *apt; - if (!(apt = apartment_find_mta())) - { - ERR("apartment not initialised\n"); - return CO_E_NOTINITIALIZED; - } - apartment_release(apt); + ERR("apartment not initialised\n"); + return CO_E_NOTINITIALIZED; } + apartment_release(apt); if (!token) return E_POINTER; -- 2.7.4

2 12

[PATCH 3/5] wsdapi: Register default namespaces when creating publisher.
by Owen Rudge April 10, 2018

April 10, 2018

Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> --- dlls/wsdapi/discovery.c | 20 +++++++++++++++++--- dlls/wsdapi/soap.c | 13 +++++++++++++ dlls/wsdapi/wsdapi_internal.h | 2 ++ 3 files changed, 32 insertions(+), 3 deletions(-)

3 2

[PATCH] po: Update Russian translation
by Nikolay Sivov April 10, 2018

April 10, 2018

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- po/ru.po | 39 ++++++++++++++------------------------- 1 file changed, 14 insertions(+), 25 deletions(-) diff --git a/po/ru.po b/po/ru.po index d8b1d8d337..6661320907 100644 --- a/po/ru.po +++ b/po/ru.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2018-03-01 21:15+0300\n" +"PO-Revision-Date: 2018-04-10 10:53+0300\n" "Last-Translator: Nikolay Sivov <nsivov(a)codeweavers.com>\n" "Language-Team: Russian\n" "Language: ru\n" @@ -9107,70 +9107,59 @@ msgstr "" "С этим сертификатам связана минимум одна неизвестная проблема безопасности." #: winineterror.mc:26 -#, fuzzy -#| msgid "Service request timeout.\n" msgid "The request has timed out.\n" -msgstr "Таймаут запроса к службе.\n" +msgstr "Таймаут запроса.\n" #: winineterror.mc:31 -#, fuzzy -#| msgid "A printer error occurred." msgid "An internal error has occurred.\n" -msgstr "Произошла ошибка принтера." +msgstr "Произошла внутренняя ошибка.\n" #: winineterror.mc:36 -#, fuzzy -#| msgid "Path is invalid.\n" msgid "The URL is invalid.\n" -msgstr "Неверный путь.\n" +msgstr "Неверный URL.\n" #: winineterror.mc:41 msgid "The URL scheme could not be recognized or is not supported.\n" -msgstr "" +msgstr "URL схема неизвестна или не поддерживается.\n" #: winineterror.mc:46 -#, fuzzy -#| msgid "The username could not be found.\n" msgid "The server name could not be resolved.\n" -msgstr "Имя пользователя не найдено.\n" +msgstr "Неизвестное имя сервера.\n" #: winineterror.mc:51 -#, fuzzy -#| msgid "The user profile is invalid.\n" msgid "The requested operation is invalid.\n" -msgstr "Неверный профиль пользователя.\n" +msgstr "Неверная операция.\n" #: winineterror.mc:56 msgid "" "The operation was canceled, usually because the handle on which the request " "was operating was closed before the operation completed.\n" msgstr "" +"Операция была отменена, вероятно из-за того, что дескриптор, с которым " +"работал запрос, был закрыт до завершения операции.\n" #: winineterror.mc:61 -#, fuzzy -#| msgid "The profile could not be added.\n" msgid "The requested item could not be located.\n" -msgstr "Невозможно добавить профиль.\n" +msgstr "Запрошенный элемент не найден.\n" #: winineterror.mc:66 -#, fuzzy -#| msgid "Can't connect to the LDAP server" msgid "The attempt to connect to the server failed.\n" -msgstr "Невозможно подключиться к LDAP серверу" +msgstr "Не удалось подключиться к серверу.\n" #: winineterror.mc:71 msgid "The connection with the server has been terminated.\n" -msgstr "" +msgstr "Подключение к серверу было разорвано.\n" #: winineterror.mc:76 msgid "" "SSL certificate date that was received from the server is bad. The " "certificate is expired.\n" msgstr "" +"Сервер вернул некорректную дату для SSL сертификата. Сертификат просрочен.\n" #: winineterror.mc:81 msgid "SSL certificate common name (host name field) is incorrect.\n" -msgstr "" +msgstr "CN-имя SSL сертификата (имя хоста) неверно.\n" #: winmm.rc:32 msgid "The specified command was carried out." -- 2.16.3

1 0

[PATCH v4] kernel32/tests: Add tests for NormalizeString API function.
by Sergio Gómez Del Real April 10, 2018

April 10, 2018

Signed-off-by: Sergio Gómez Del Real <sdelreal(a)codeweavers.com> --- dlls/kernel32/tests/locale.c | 184 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 184 insertions(+) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index a99763db92..b9b36d8a13 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -106,6 +106,7 @@ static INT (WINAPI *pGetNumberFormatEx)(LPCWSTR, DWORD, LPCWSTR, const NUMBERFMT static INT (WINAPI *pFindNLSStringEx)(LPCWSTR, DWORD, LPCWSTR, INT, LPCWSTR, INT, LPINT, LPNLSVERSIONINFO, LPVOID, LPARAM); static LANGID (WINAPI *pSetThreadUILanguage)(LANGID); static LANGID (WINAPI *pGetThreadUILanguage)(VOID); +static INT (WINAPI *pNormalizeString)(NORM_FORM, LPCWSTR, INT, LPWSTR, INT); static void InitFunctionPointers(void) { @@ -141,6 +142,7 @@ static void InitFunctionPointers(void) X(FindNLSStringEx); X(SetThreadUILanguage); X(GetThreadUILanguage); + X(NormalizeString); mod = GetModuleHandleA("ntdll"); X(RtlUpcaseUnicodeChar); @@ -5470,6 +5472,187 @@ static void test_SetThreadUILanguage(void) "expected %d got %d\n", MAKELANGID(LANG_DUTCH, SUBLANG_DUTCH_BELGIAN), res); } +static void test_NormalizeString(void) +{ + /* part 0: specific cases */ + /* LATIN CAPITAL LETTER D WITH DOT ABOVE */ + static const WCHAR part0_str1[] = {0x1e0a,0}; + static const WCHAR part0_nfd1[] = {0x0044,0x0307,0}; + + /* LATIN CAPITAL LETTER D, COMBINING DOT BELOW, COMBINING DOT ABOVE */ + static const WCHAR part0_str2[] = {0x0044,0x0323,0x0307,0}; + static const WCHAR part0_nfc2[] = {0x1e0c,0x0307,0}; + + /* LATIN CAPITAL LETTER D, COMBINING HORN, COMBINING DOT BELOW, COMBINING DOT ABOVE */ + static const WCHAR part0_str3[] = {0x0044,0x031b,0x0323,0x0307,0}; + static const WCHAR part0_nfc3[] = {0x1e0c,0x031b,0x0307,0}; + + /* LATIN CAPITAL LETTER D, COMBINING HORN, COMBINING DOT BELOW, COMBINING DOT ABOVE */ + static const WCHAR part0_str4[] = {0x0044,0x031b,0x0323,0x0307,0}; + static const WCHAR part0_nfc4[] = {0x1e0c,0x031b,0x0307,0}; + + /* + * HEBREW ACCENT SEGOL, HEBREW POINT PATAH, HEBREW POINT DAGESH OR MAPIQ, + * HEBREW ACCENT MERKHA, HEBREW POINT SHEVA, HEBREW PUNCTUATION PASEQ, + * HEBREW MARK UPPER DOT, HEBREW ACCENT DEHI + */ + static const WCHAR part0_str5[] = {0x0592,0x05B7,0x05BC,0x05A5,0x05B0,0x05C0,0x05C4,0x05AD,0}; + static const WCHAR part0_nfc5[] = {0x05B0,0x05B7,0x05BC,0x05A5,0x0592,0x05C0,0x05AD,0x05C4,0}; + + /* + * HEBREW POINT QAMATS, HEBREW POINT HOLAM, HEBREW POINT HATAF SEGOL, + * HEBREW ACCENT ETNAHTA, HEBREW PUNCTUATION SOF PASUQ, HEBREW POINT SHEVA, + * HEBREW ACCENT ILUY, HEBREW ACCENT QARNEY PARA + */ + static const WCHAR part0_str6[] = {0x05B8,0x05B9,0x05B1,0x0591,0x05C3,0x05B0,0x05AC,0x059F,0}; + static const WCHAR part0_nfc6[] = {0x05B1,0x05B8,0x05B9,0x0591,0x05C3,0x05B0,0x05AC,0x059F,0}; + + /* LATIN CAPITAL LETTER D WITH DOT BELOW */ + static const WCHAR part0_str8[] = {0x1E0C,0}; + static const WCHAR part0_nfd8[] = {0x0044,0x0323,0}; + + /* LATIN CAPITAL LETTER D WITH DOT ABOVE, COMBINING DOT BELOW */ + static const WCHAR part0_str9[] = {0x1E0A,0x0323,0}; + static const WCHAR part0_nfc9[] = {0x1E0C,0x0307,0}; + static const WCHAR part0_nfd9[] = {0x0044,0x0323,0x0307,0}; + + /* LATIN CAPITAL LETTER D WITH DOT BELOW, COMBINING DOT ABOVE */ + static const WCHAR part0_str10[] = {0x1E0C,0x0307,0}; + static const WCHAR part0_nfd10[] = {0x0044,0x0323,0x0307,0}; + + /* LATIN CAPITAL LETTER E WITH MACRON AND GRAVE, COMBINING MACRON */ + static const WCHAR part0_str11[] = {0x1E14,0x0304,0}; + static const WCHAR part0_nfd11[] = {0x0045,0x0304,0x0300,0x0304,0}; + + /* LATIN CAPITAL LETTER E WITH MACRON, COMBINING GRAVE ACCENT */ + static const WCHAR part0_str12[] = {0x0112,0x0300,0}; + static const WCHAR part0_nfc12[] = {0x1E14,0}; + static const WCHAR part0_nfd12[] = {0x0045,0x0304,0x0300,0}; + + /* part 1: character by character */ + /* DIAERESIS */ + static const WCHAR part1_str1[] = {0x00a8,0}; + static const WCHAR part1_nfkc1[] = {0x0020,0x0308,0}; + + /* VULGAR FRACTION ONE QUARTER */ + static const WCHAR part1_str2[] = {0x00bc,0}; + static const WCHAR part1_nfkc2[] = {0x0031,0x2044,0x0034,0}; + + /* LATIN CAPITAL LETTER E WITH CIRCUMFLEX */ + static const WCHAR part1_str3[] = {0x00ca,0}; + static const WCHAR part1_nfd3[] = {0x0045,0x0302,0}; + + /* MODIFIER LETTER SMALL GAMMA */ + static const WCHAR part1_str4[] = {0x02e0,0}; + static const WCHAR part1_nfkc4[] = {0x0263,0}; + + /* CYRILLIC CAPITAL LETTER IE WITH GRAVE */ + static const WCHAR part1_str5[] = {0x0400,0}; + static const WCHAR part1_nfd5[] = {0x0415,0x0300,0}; + + /* CYRILLIC CAPITAL LETTER IZHITSA WITH DOUBLE GRAVE ACCENT */ + static const WCHAR part1_str6[] = {0x0476,0}; + static const WCHAR part1_nfd6[] = {0x0474,0x030F,0}; + + /* ARABIC LIGATURE HAH WITH JEEM INITIAL FORM */ + static const WCHAR part1_str7[] = {0xFCA9,0}; + static const WCHAR part1_nfkc7[] = {0x062D,0x062C,0}; + + /* GREEK SMALL LETTER OMICRON WITH PSILI AND VARIA */ + static const WCHAR part1_str8[] = {0x1F42,0}; + static const WCHAR part1_nfd8[] = {0x03BF,0x0313,0x0300,0}; + + /* QUADRUPLE PRIME */ + static const WCHAR part1_str9[] = {0x2057,0}; + static const WCHAR part1_nfkc9[] = {0x2032,0x2032,0x2032,0x2032,0}; + + /* KATAKANA-HIRAGANA VOICED SOUND MARK */ + static const WCHAR part1_str10[] = {0x309B,0}; + static const WCHAR part1_nfkc10[] = {0x20,0x3099,0}; + + struct test_data_normal { + const WCHAR *str; + const WCHAR *expected[4]; + }; + static const struct test_data_normal test_arr[] = + { + { part0_str1, { part0_str1, part0_nfd1, part0_str1, part0_nfd1 } }, + { part0_str2, { part0_nfc2, part0_str2, part0_nfc2, part0_str2 } }, + { part0_str3, { part0_nfc3, part0_str3, part0_nfc3, part0_str3 } }, + { part0_str4, { part0_nfc4, part0_str4, part0_nfc4, part0_str4 } }, + { part0_str5, { part0_nfc5, part0_nfc5, part0_nfc5, part0_nfc5 } }, + { part0_str6, { part0_nfc6, part0_nfc6, part0_nfc6, part0_nfc6 } }, + { part0_str8, { part0_str8, part0_nfd8, part0_str8, part0_nfd8 } }, + { part0_str9, { part0_nfc9, part0_nfd9, part0_nfc9, part0_nfd9 } }, + { part0_str10, { part0_str10, part0_nfd10, part0_str10, part0_nfd10 } }, + { part0_str11, { part0_str11, part0_nfd11, part0_str11, part0_nfd11 } }, + { part0_str12, { part0_nfc12, part0_nfd12, part0_nfc12, part0_nfd12 } }, + { part1_str1, { part1_str1, part1_str1, part1_nfkc1, part1_nfkc1 } }, + { part1_str2, { part1_str2, part1_str2, part1_nfkc2, part1_nfkc2 } }, + { part1_str3, { part1_str3, part1_nfd3, part1_str3, part1_nfd3 } }, + { part1_str4, { part1_str4, part1_str4, part1_nfkc4, part1_nfkc4 } }, + { part1_str5, { part1_str5, part1_nfd5, part1_str5, part1_nfd5 } }, + { part1_str6, { part1_str6, part1_nfd6, part1_str6, part1_nfd6 } }, + { part1_str7, { part1_str7, part1_str7, part1_nfkc7, part1_nfkc7 } }, + { part1_str8, { part1_str8, part1_nfd8, part1_str8, part1_nfd8 } }, + { part1_str9, { part1_str9, part1_str9, part1_nfkc9, part1_nfkc9 } }, + { part1_str10, { part1_str10, part1_str10, part1_nfkc10, part1_nfkc10 } }, + { 0 } + }; + const struct test_data_normal *ptest = test_arr; + const int norm_forms[] = { NormalizationC, NormalizationD, NormalizationKC, NormalizationKD }; + WCHAR dst[80]; + int dstlen; + + if (!pNormalizeString) + { + win_skip("NormalizeString is not available.\n"); + return; + } + + todo_wine { + dstlen = pNormalizeString( NormalizationD, ptest->str, -1, dst, 1 ); + ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "Should have failed with ERROR_INSUFFICIENT_BUFFER"); + } + + /* + * For each string, first test passing -1 as srclen to NormalizeString, + * thereby assuming a null-terminating string in src, and then test passing + * explicitly the string length. + * Do that for all 4 normalization forms. + */ + while (ptest->str) + { + int str_cmp, i; + + for (i = 0; i < 4; i++) + { + todo_wine { + dstlen = pNormalizeString( norm_forms[i], ptest->str, -1, NULL, 0 ); + if (dstlen) + { + dstlen = pNormalizeString( norm_forms[i], ptest->str, -1, dst, dstlen ); + ok(dstlen == strlenW( ptest->expected[i] )+1, "Copied length differed: was %d, should be %d\n", + dstlen, strlenW( ptest->expected[i] )+1); + str_cmp = strncmpW( ptest->expected[i], dst, dstlen+1 ); + ok( str_cmp == 0, "test failed: returned value was %d\n", str_cmp ); + } + + dstlen = pNormalizeString( norm_forms[i], ptest->str, strlenW(ptest->str), NULL, 0 ); + if (dstlen) + { + dstlen = pNormalizeString( norm_forms[i], ptest->str, strlenW(ptest->str), dst, dstlen ); + ok(dstlen == strlenW( ptest->expected[i] ), "Copied length differed: was %d, should be %d\n", + dstlen, strlenW( ptest->expected[i] )); + str_cmp = strncmpW( ptest->expected[i], dst, dstlen ); + ok( str_cmp == 0, "test failed: returned value was %d\n", str_cmp ); + } + } + } + ptest++; + } +} + START_TEST(locale) { InitFunctionPointers(); @@ -5518,6 +5701,7 @@ START_TEST(locale) test_GetUserPreferredUILanguages(); test_FindNLSStringEx(); test_SetThreadUILanguage(); + test_NormalizeString(); /* this requires collation table patch to make it MS compatible */ if (0) test_sorting(); } -- 2.14.1

2 1

[PATCH 2/5] wsdapi: Add support for custom elements in SOAP header.
by Owen Rudge April 10, 2018

April 10, 2018

Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> --- dlls/wsdapi/soap.c | 94 +++++++++++++++++++++++++++++++++++++++++-- dlls/wsdapi/tests/discovery.c | 4 +- dlls/wsdapi/wsdapi_internal.h | 1 + dlls/wsdapi/xml.c | 2 +- 4 files changed, 95 insertions(+), 6 deletions(-)

2 1

[PATCH 1/5] wsdapi: Return HRESULT from add_child_element and create_soap_header_xml_elements.
by Owen Rudge April 10, 2018

April 10, 2018

Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> --- dlls/wsdapi/soap.c | 101 +++++++++++++++++++++++++++++------------------------ 1 file changed, 56 insertions(+), 45 deletions(-)

2 1

[PATCH] shell32/tests: Remove some tests workarounds
by Nikolay Sivov April 10, 2018

April 10, 2018

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/shell32/tests/shlfileop.c | 181 +++++++++++++---------------------------- 1 file changed, 55 insertions(+), 126 deletions(-) diff --git a/dlls/shell32/tests/shlfileop.c b/dlls/shell32/tests/shlfileop.c index dd933f6d1f..6a220fa1f3 100644 --- a/dlls/shell32/tests/shlfileop.c +++ b/dlls/shell32/tests/shlfileop.c @@ -56,25 +56,6 @@ static const WCHAR UNICODE_PATH[] = {'c',':','\\',0x00ae,'\0','\0'}; /* "c:\®" can be used in all codepages */ /* Double-null termination needed for pFrom field of SHFILEOPSTRUCT */ -static HMODULE hshell32; -static int (WINAPI *pSHCreateDirectoryExA)(HWND, LPCSTR, LPSECURITY_ATTRIBUTES); -static int (WINAPI *pSHCreateDirectoryExW)(HWND, LPCWSTR, LPSECURITY_ATTRIBUTES); -static int (WINAPI *pSHFileOperationW)(LPSHFILEOPSTRUCTW); -static DWORD_PTR (WINAPI *pSHGetFileInfoW)(LPCWSTR, DWORD , SHFILEINFOW*, UINT, UINT); -static int (WINAPI *pSHPathPrepareForWriteA)(HWND, IUnknown*, LPCSTR, DWORD); -static int (WINAPI *pSHPathPrepareForWriteW)(HWND, IUnknown*, LPCWSTR, DWORD); - -static void InitFunctionPointers(void) -{ - hshell32 = GetModuleHandleA("shell32.dll"); - pSHCreateDirectoryExA = (void*)GetProcAddress(hshell32, "SHCreateDirectoryExA"); - pSHCreateDirectoryExW = (void*)GetProcAddress(hshell32, "SHCreateDirectoryExW"); - pSHFileOperationW = (void*)GetProcAddress(hshell32, "SHFileOperationW"); - pSHGetFileInfoW = (void*)GetProcAddress(hshell32, "SHGetFileInfoW"); - pSHPathPrepareForWriteA = (void*)GetProcAddress(hshell32, "SHPathPrepareForWriteA"); - pSHPathPrepareForWriteW = (void*)GetProcAddress(hshell32, "SHPathPrepareForWriteW"); -} - /* creates a file with the specified name for tests */ static void createTestFile(const CHAR *name) { @@ -192,6 +173,7 @@ static void test_get_file_info(void) SHFILEINFOA shfi, shfi2; SHFILEINFOW shfiw; char notepad[MAX_PATH]; + HANDLE unset_icon; /* Test whether fields of SHFILEINFOA are always cleared */ memset(&shfi, 0xcf, sizeof(shfi)); @@ -207,23 +189,15 @@ static void test_get_file_info(void) broken(shfi.dwAttributes != 0xcfcfcfcf), /* NT4 doesn't clear but sets this field */ "SHGetFileInfoA('' | 0) should not clear dwAttributes\n"); - if (pSHGetFileInfoW) - { - HANDLE unset_icon; - /* Test whether fields of SHFILEINFOW are always cleared */ - memset(&shfiw, 0xcf, sizeof(shfiw)); - memset(&unset_icon, 0xcf, sizeof(unset_icon)); - rc=pSHGetFileInfoW(NULL, 0, &shfiw, sizeof(shfiw), 0); - ok(!rc, "SHGetFileInfoW(NULL | 0) should fail\n"); - ok(shfiw.hIcon == unset_icon, "SHGetFileInfoW(NULL | 0) should not clear hIcon\n"); - ok(shfiw.szDisplayName[0] == 0xcfcf, "SHGetFileInfoW(NULL | 0) should not clear szDisplayName[0]\n"); - ok(shfiw.szTypeName[0] == 0xcfcf, "SHGetFileInfoW(NULL | 0) should not clear szTypeName[0]\n"); - ok(shfiw.iIcon == 0xcfcfcfcf, "SHGetFileInfoW(NULL | 0) should not clear iIcon\n"); - ok(shfiw.dwAttributes == 0xcfcfcfcf, "SHGetFileInfoW(NULL | 0) should not clear dwAttributes\n"); - } - else - win_skip("SHGetFileInfoW is not available\n"); - + memset(&shfiw, 0xcf, sizeof(shfiw)); + memset(&unset_icon, 0xcf, sizeof(unset_icon)); + rc = SHGetFileInfoW(NULL, 0, &shfiw, sizeof(shfiw), 0); + ok(!rc, "SHGetFileInfoW(NULL | 0) should fail\n"); + ok(shfiw.hIcon == unset_icon, "SHGetFileInfoW(NULL | 0) should not clear hIcon\n"); + ok(shfiw.szDisplayName[0] == 0xcfcf, "SHGetFileInfoW(NULL | 0) should not clear szDisplayName[0]\n"); + ok(shfiw.szTypeName[0] == 0xcfcf, "SHGetFileInfoW(NULL | 0) should not clear szTypeName[0]\n"); + ok(shfiw.iIcon == 0xcfcfcfcf, "SHGetFileInfoW(NULL | 0) should not clear iIcon\n"); + ok(shfiw.dwAttributes == 0xcfcfcfcf, "SHGetFileInfoW(NULL | 0) should not clear dwAttributes\n"); /* Test some flag combinations that MSDN claims are not allowed, * but which work anyway @@ -392,22 +366,9 @@ static void test_get_file_info_iconlist(void) "SHGetFileInfoA(CSIDL_DESKTOP, SHGFI_SYSICONINDEX|SHGFI_SMALLICON|SHGFI_PIDL), unexpected dwAttributes\n"); /* Don't release hSysImageList here (and in similar places below) because of the broken reference behaviour of XP and 2003. */ - if (!pSHGetFileInfoW) - { - win_skip("SHGetFileInfoW is not available\n"); - ILFree(pidList); - return; - } - memset(&shInfow, 0xcf, sizeof(shInfow)); - hSysImageList = (HIMAGELIST) pSHGetFileInfoW((const WCHAR *)pidList, 0, - &shInfow, sizeof(shInfow), - SHGFI_SYSICONINDEX | SHGFI_SMALLICON | SHGFI_PIDL); - if (!hSysImageList) - { - win_skip("SHGetFileInfoW is not implemented\n"); - return; - } + hSysImageList = (HIMAGELIST) SHGetFileInfoW((const WCHAR *)pidList, 0, + &shInfow, sizeof(shInfow), SHGFI_SYSICONINDEX | SHGFI_SMALLICON | SHGFI_PIDL); ok(hSysImageList == (HIMAGELIST)small_list, "got %p expect %p\n", hSysImageList, small_list); todo_wine ok(shInfow.hIcon == 0, "SHGetFileInfoW(CSIDL_DESKTOP, SHGFI_SYSICONINDEX|SHGFI_SMALLICON|SHGFI_PIDL) did not clear hIcon\n"); ok(shInfow.szTypeName[0] == 0, "SHGetFileInfoW(CSIDL_DESKTOP, SHGFI_SYSICONINDEX|SHGFI_SMALLICON|SHGFI_PIDL) did not clear szTypeName[0]\n"); @@ -418,7 +379,7 @@ static void test_get_file_info_iconlist(void) /* Various suposidly invalid flag testing */ memset(&shInfow, 0xcf, sizeof(shInfow)); - hSysImageList = (HIMAGELIST)pSHGetFileInfoW((const WCHAR *)pidList, 0, &shInfow, sizeof(shInfow), + hSysImageList = (HIMAGELIST)SHGetFileInfoW((const WCHAR *)pidList, 0, &shInfow, sizeof(shInfow), SHGFI_SYSICONINDEX|SHGFI_USEFILEATTRIBUTES|SHGFI_PIDL|SHGFI_SMALLICON); ok(hSysImageList == (HIMAGELIST)small_list, "got %p expect %p\n", hSysImageList, small_list); ok(shInfow.iIcon!=0xcfcfcfcf, "Icon Index Missing\n"); @@ -427,7 +388,7 @@ static void test_get_file_info_iconlist(void) "unexpected dwAttributes\n"); memset(&shInfow, 0xcf, sizeof(shInfow)); - hr = pSHGetFileInfoW((const WCHAR *)pidList, 0, &shInfow, sizeof(shInfow), + hr = SHGetFileInfoW((const WCHAR *)pidList, 0, &shInfow, sizeof(shInfow), SHGFI_ICON|SHGFI_USEFILEATTRIBUTES|SHGFI_PIDL|SHGFI_SMALLICON); ok(hr != 0, " SHGFI_ICON|SHGFI_USEFILEATTRIBUTES|SHGFI_PIDL|SHGFI_SMALLICON Failed\n"); ok(shInfow.iIcon!=0xcfcfcfcf, "Icon Index Missing\n"); @@ -436,7 +397,7 @@ static void test_get_file_info_iconlist(void) todo_wine ok(shInfow.dwAttributes==0,"dwAttributes not set\n"); memset(&shInfow, 0xcf, sizeof(shInfow)); - hr = pSHGetFileInfoW((const WCHAR *)pidList, 0, &shInfow, sizeof(shInfow), + hr = SHGetFileInfoW((const WCHAR *)pidList, 0, &shInfow, sizeof(shInfow), SHGFI_ICON|SHGFI_USEFILEATTRIBUTES|SHGFI_PIDL|SHGFI_LARGEICON); ok(hr != 0, "SHGFI_ICON|SHGFI_USEFILEATTRIBUTES|SHGFI_PIDL|SHGFI_LARGEICON Failed\n"); ok(shInfow.iIcon!=0xcfcfcfcf, "Icon Index Missing\n"); @@ -445,7 +406,7 @@ static void test_get_file_info_iconlist(void) todo_wine ok(shInfow.dwAttributes==0,"dwAttributes not set\n"); memset(&shInfow, 0xcf, sizeof(shInfow)); - hSysImageList = (HIMAGELIST)pSHGetFileInfoW((const WCHAR *)pidList, 0, &shInfow, sizeof(shInfow), + hSysImageList = (HIMAGELIST)SHGetFileInfoW((const WCHAR *)pidList, 0, &shInfow, sizeof(shInfow), SHGFI_SYSICONINDEX|SHGFI_USEFILEATTRIBUTES|SHGFI_PIDL|SHGFI_LARGEICON); ok(hSysImageList == (HIMAGELIST)large_list, "got %p expect %p\n", hSysImageList, small_list); ok(shInfow.iIcon!=0xcfcfcfcf, "Icon Index Missing\n"); @@ -454,28 +415,28 @@ static void test_get_file_info_iconlist(void) "unexpected dwAttributes\n"); memset(&shInfow, 0xcf, sizeof(shInfow)); - hr = pSHGetFileInfoW((const WCHAR *)pidList, 0, &shInfow, sizeof(shInfow), + hr = SHGetFileInfoW((const WCHAR *)pidList, 0, &shInfow, sizeof(shInfow), SHGFI_OPENICON|SHGFI_USEFILEATTRIBUTES|SHGFI_PIDL|SHGFI_SMALLICON); ok(hr != 0, "SHGFI_OPENICON|SHGFI_USEFILEATTRIBUTES|SHGFI_PIDL|SHGFI_SMALLICON Failed\n"); todo_wine ok(shInfow.iIcon==0xcfcfcfcf, "Icon Index Modified\n"); ok(shInfow.dwAttributes==0xcfcfcfcf,"dwAttributes modified\n"); memset(&shInfow, 0xcf, sizeof(shInfow)); - hr = pSHGetFileInfoW((const WCHAR *)pidList, 0, &shInfow, sizeof(shInfow), + hr = SHGetFileInfoW((const WCHAR *)pidList, 0, &shInfow, sizeof(shInfow), SHGFI_SHELLICONSIZE|SHGFI_USEFILEATTRIBUTES|SHGFI_PIDL|SHGFI_SMALLICON); ok(hr != 0, "SHGFI_SHELLICONSIZE|SHGFI_USEFILEATTRIBUTES|SHGFI_PIDL|SHGFI_SMALLICON Failed\n"); todo_wine ok(shInfow.iIcon==0xcfcfcfcf, "Icon Index Modified\n"); ok(shInfow.dwAttributes==0xcfcfcfcf,"dwAttributes modified\n"); memset(&shInfow, 0xcf, sizeof(shInfow)); - hr = pSHGetFileInfoW((const WCHAR *)pidList, 0, &shInfow, sizeof(shInfow), + hr = SHGetFileInfoW((const WCHAR *)pidList, 0, &shInfow, sizeof(shInfow), SHGFI_SHELLICONSIZE|SHGFI_USEFILEATTRIBUTES|SHGFI_PIDL|SHGFI_SMALLICON); ok(hr != 0, "SHGFI_SHELLICONSIZE|SHGFI_USEFILEATTRIBUTES|SHGFI_PIDL|SHGFI_SMALLICON Failed\n"); todo_wine ok(shInfow.iIcon==0xcfcfcfcf, "Icon Index Modified\n"); ok(shInfow.dwAttributes==0xcfcfcfcf,"dwAttributes modified\n"); memset(&shInfow, 0xcf, sizeof(shInfow)); - hSysImageList = (HIMAGELIST)pSHGetFileInfoW((const WCHAR *)pidList, 0, &shInfow, sizeof(shInfow), + hSysImageList = (HIMAGELIST)SHGetFileInfoW((const WCHAR *)pidList, 0, &shInfow, sizeof(shInfow), SHGFI_SYSICONINDEX|SHGFI_USEFILEATTRIBUTES|SHGFI_PIDL|SHGFI_SMALLICON| SHGFI_ATTRIBUTES); ok(hSysImageList == (HIMAGELIST)small_list, "got %p expect %p\n", hSysImageList, small_list); @@ -483,7 +444,7 @@ static void test_get_file_info_iconlist(void) ok(shInfow.dwAttributes!=0xcfcfcfcf,"dwAttributes not set\n"); memset(&shInfow, 0xcf, sizeof(shInfow)); - hSysImageList = (HIMAGELIST)pSHGetFileInfoW((const WCHAR *)pidList, 0, &shInfow, sizeof(shInfow), + hSysImageList = (HIMAGELIST)SHGetFileInfoW((const WCHAR *)pidList, 0, &shInfow, sizeof(shInfow), SHGFI_SYSICONINDEX|SHGFI_USEFILEATTRIBUTES|SHGFI_PIDL|SHGFI_SMALLICON| SHGFI_EXETYPE); todo_wine ok(hSysImageList == (HIMAGELIST)small_list, "got %p expect %p\n", hSysImageList, small_list); @@ -493,21 +454,21 @@ static void test_get_file_info_iconlist(void) "unexpected dwAttributes\n"); memset(&shInfow, 0xcf, sizeof(shInfow)); - hr = pSHGetFileInfoW((const WCHAR *)pidList, 0, &shInfow, sizeof(shInfow), + hr = SHGetFileInfoW((const WCHAR *)pidList, 0, &shInfow, sizeof(shInfow), SHGFI_USEFILEATTRIBUTES|SHGFI_PIDL|SHGFI_SMALLICON|SHGFI_EXETYPE); todo_wine ok(hr != 0, "SHGFI_USEFILEATTRIBUTES|SHGFI_PIDL|SHGFI_SMALLICON|SHGFI_EXETYPE Failed\n"); todo_wine ok(shInfow.iIcon==0xcfcfcfcf, "Icon Index Modified\n"); ok(shInfow.dwAttributes==0xcfcfcfcf,"dwAttributes modified\n"); memset(&shInfow, 0xcf, sizeof(shInfow)); - hr = pSHGetFileInfoW((const WCHAR *)pidList, 0, &shInfow, sizeof(shInfow), + hr = SHGetFileInfoW((const WCHAR *)pidList, 0, &shInfow, sizeof(shInfow), SHGFI_USEFILEATTRIBUTES|SHGFI_PIDL|SHGFI_SMALLICON|SHGFI_ATTRIBUTES); ok(hr != 0, "SHGFI_USEFILEATTRIBUTES|SHGFI_PIDL|SHGFI_SMALLICON|SHGFI_ATTRIBUTES Failed\n"); todo_wine ok(shInfow.iIcon==0xcfcfcfcf, "Icon Index Modified\n"); ok(shInfow.dwAttributes!=0xcfcfcfcf,"dwAttributes not set\n"); memset(&shInfow, 0xcf, sizeof(shInfow)); - hSysImageList = (HIMAGELIST)pSHGetFileInfoW((const WCHAR *)pidList, 0, &shInfow, sizeof(shInfow), + hSysImageList = (HIMAGELIST)SHGetFileInfoW((const WCHAR *)pidList, 0, &shInfow, sizeof(shInfow), SHGFI_SYSICONINDEX|SHGFI_USEFILEATTRIBUTES|SHGFI_PIDL| SHGFI_ATTRIBUTES); ok(hSysImageList == (HIMAGELIST)large_list, "got %p expect %p\n", hSysImageList, large_list); @@ -516,7 +477,7 @@ static void test_get_file_info_iconlist(void) ok(shInfow.dwAttributes!=0xcfcfcfcf,"dwAttributes not set\n"); memset(&shInfow, 0xcf, sizeof(shInfow)); - hSysImageList = (HIMAGELIST)pSHGetFileInfoW((const WCHAR *)pidList, 0, &shInfow, sizeof(shInfow), + hSysImageList = (HIMAGELIST)SHGetFileInfoW((const WCHAR *)pidList, 0, &shInfow, sizeof(shInfow), SHGFI_SYSICONINDEX|SHGFI_USEFILEATTRIBUTES|SHGFI_PIDL|SHGFI_EXETYPE); todo_wine ok(hSysImageList == (HIMAGELIST)large_list, "got %p expect %p\n", hSysImageList, large_list); ok(shInfow.iIcon!=0xcfcfcfcf, "Icon Index Missing\n"); @@ -525,21 +486,21 @@ static void test_get_file_info_iconlist(void) "unexpected dwAttributes\n"); memset(&shInfow, 0xcf, sizeof(shInfow)); - hr = pSHGetFileInfoW((const WCHAR *)pidList, 0, &shInfow, sizeof(shInfow), + hr = SHGetFileInfoW((const WCHAR *)pidList, 0, &shInfow, sizeof(shInfow), SHGFI_USEFILEATTRIBUTES|SHGFI_PIDL|SHGFI_EXETYPE); todo_wine ok(hr != 0, "SHGFI_USEFILEATTRIBUTES|SHGFI_PIDL|SHGFI_EXETYPE Failed\n"); todo_wine ok(shInfow.iIcon==0xcfcfcfcf, "Icon Index Modified\n"); ok(shInfow.dwAttributes==0xcfcfcfcf,"dwAttributes modified\n"); memset(&shInfow, 0xcf, sizeof(shInfow)); - hr = pSHGetFileInfoW((const WCHAR *)pidList, 0, &shInfow, sizeof(shInfow), + hr = SHGetFileInfoW((const WCHAR *)pidList, 0, &shInfow, sizeof(shInfow), SHGFI_USEFILEATTRIBUTES|SHGFI_PIDL|SHGFI_ATTRIBUTES); ok(hr != 0, "SHGFI_USEFILEATTRIBUTES|SHGFI_PIDL|SHGFI_ATTRIBUTES Failed\n"); todo_wine ok(shInfow.iIcon==0xcfcfcfcf, "Icon Index Modified\n"); ok(shInfow.dwAttributes!=0xcfcfcfcf,"dwAttributes not set\n"); memset(&shInfow, 0xcf, sizeof(shInfow)); - hSysImageList = (HIMAGELIST)pSHGetFileInfoW((const WCHAR *)pidList, 0, &shInfow, sizeof(shInfow), + hSysImageList = (HIMAGELIST)SHGetFileInfoW((const WCHAR *)pidList, 0, &shInfow, sizeof(shInfow), SHGFI_SYSICONINDEX|SHGFI_PIDL|SHGFI_SMALLICON|SHGFI_SHELLICONSIZE|SHGFI_ICON); ok(hSysImageList == (HIMAGELIST)small_list, "got %p expect %p\n", hSysImageList, small_list); ok(shInfow.iIcon!=0xcfcfcfcf, "Icon Index Missing\n"); @@ -547,7 +508,7 @@ static void test_get_file_info_iconlist(void) DestroyIcon( shInfow.hIcon ); memset(&shInfow, 0xcf, sizeof(shInfow)); - hSysImageList = (HIMAGELIST)pSHGetFileInfoW((const WCHAR *)pidList, 0, &shInfow, sizeof(shInfow), + hSysImageList = (HIMAGELIST)SHGetFileInfoW((const WCHAR *)pidList, 0, &shInfow, sizeof(shInfow), SHGFI_SYSICONINDEX|SHGFI_PIDL|SHGFI_SHELLICONSIZE|SHGFI_ICON); ok(hSysImageList == (HIMAGELIST)large_list, "got %p expect %p\n", hSysImageList, small_list); ok(shInfow.iIcon!=0xcfcfcfcf, "Icon Index Missing\n"); @@ -2339,22 +2300,16 @@ static void test_sh_create_dir(void) CHAR path[MAX_PATH]; int ret; - if(!pSHCreateDirectoryExA) - { - win_skip("skipping SHCreateDirectoryExA tests\n"); - return; - } - set_curr_dir_path(path, "testdir2\\test4.txt\0"); - ret = pSHCreateDirectoryExA(NULL, path, NULL); + ret = SHCreateDirectoryExA(NULL, path, NULL); ok(ERROR_SUCCESS == ret, "SHCreateDirectoryEx failed to create directory recursively, ret = %d\n", ret); ok(file_exists("testdir2"), "The first directory is not created\n"); ok(file_exists("testdir2\\test4.txt"), "The second directory is not created\n"); - ret = pSHCreateDirectoryExA(NULL, path, NULL); + ret = SHCreateDirectoryExA(NULL, path, NULL); ok(ERROR_ALREADY_EXISTS == ret, "SHCreateDirectoryEx should fail to create existing directory, ret = %d\n", ret); - ret = pSHCreateDirectoryExA(NULL, "c:\\testdir3", NULL); + ret = SHCreateDirectoryExA(NULL, "c:\\testdir3", NULL); ok(ERROR_SUCCESS == ret, "SHCreateDirectoryEx failed to create directory, ret = %d\n", ret); ok(file_exists("c:\\testdir3"), "The directory is not created\n"); } @@ -2366,43 +2321,37 @@ static void test_sh_path_prepare(void) CHAR UNICODE_PATH_A[MAX_PATH]; BOOL UsedDefaultChar; - if(!pSHPathPrepareForWriteA) - { - win_skip("skipping SHPathPrepareForWriteA tests\n"); - return; - } - /* directory exists, SHPPFW_NONE */ set_curr_dir_path(path, "testdir2\0"); - res = pSHPathPrepareForWriteA(0, 0, path, SHPPFW_NONE); + res = SHPathPrepareForWriteA(0, 0, path, SHPPFW_NONE); ok(res == S_OK, "res == 0x%08x, expected S_OK\n", res); /* directory exists, SHPPFW_IGNOREFILENAME */ set_curr_dir_path(path, "testdir2\\test4.txt\0"); - res = pSHPathPrepareForWriteA(0, 0, path, SHPPFW_IGNOREFILENAME); + res = SHPathPrepareForWriteA(0, 0, path, SHPPFW_IGNOREFILENAME); ok(res == S_OK, "res == 0x%08x, expected S_OK\n", res); /* directory exists, SHPPFW_DIRCREATE */ set_curr_dir_path(path, "testdir2\0"); - res = pSHPathPrepareForWriteA(0, 0, path, SHPPFW_DIRCREATE); + res = SHPathPrepareForWriteA(0, 0, path, SHPPFW_DIRCREATE); ok(res == S_OK, "res == 0x%08x, expected S_OK\n", res); /* directory exists, SHPPFW_IGNOREFILENAME|SHPPFW_DIRCREATE */ set_curr_dir_path(path, "testdir2\\test4.txt\0"); - res = pSHPathPrepareForWriteA(0, 0, path, SHPPFW_IGNOREFILENAME|SHPPFW_DIRCREATE); + res = SHPathPrepareForWriteA(0, 0, path, SHPPFW_IGNOREFILENAME|SHPPFW_DIRCREATE); ok(res == S_OK, "res == 0x%08x, expected S_OK\n", res); ok(!file_exists("nonexistent\\"), "nonexistent\\ exists but shouldn't\n"); /* file exists, SHPPFW_NONE */ set_curr_dir_path(path, "test1.txt\0"); - res = pSHPathPrepareForWriteA(0, 0, path, SHPPFW_NONE); + res = SHPathPrepareForWriteA(0, 0, path, SHPPFW_NONE); ok(res == HRESULT_FROM_WIN32(ERROR_DIRECTORY) || res == HRESULT_FROM_WIN32(ERROR_PATH_NOT_FOUND) || /* WinMe */ res == HRESULT_FROM_WIN32(ERROR_INVALID_NAME), /* Vista */ "Unexpected result : 0x%08x\n", res); /* file exists, SHPPFW_DIRCREATE */ - res = pSHPathPrepareForWriteA(0, 0, path, SHPPFW_DIRCREATE); + res = SHPathPrepareForWriteA(0, 0, path, SHPPFW_DIRCREATE); ok(res == HRESULT_FROM_WIN32(ERROR_DIRECTORY) || res == HRESULT_FROM_WIN32(ERROR_PATH_NOT_FOUND) || /* WinMe */ res == HRESULT_FROM_WIN32(ERROR_INVALID_NAME), /* Vista */ @@ -2410,53 +2359,47 @@ static void test_sh_path_prepare(void) /* file exists, SHPPFW_NONE, trailing \ */ set_curr_dir_path(path, "test1.txt\\\0"); - res = pSHPathPrepareForWriteA(0, 0, path, SHPPFW_NONE); + res = SHPathPrepareForWriteA(0, 0, path, SHPPFW_NONE); ok(res == HRESULT_FROM_WIN32(ERROR_DIRECTORY) || res == HRESULT_FROM_WIN32(ERROR_PATH_NOT_FOUND) || /* WinMe */ res == HRESULT_FROM_WIN32(ERROR_INVALID_NAME), /* Vista */ "Unexpected result : 0x%08x\n", res); /* relative path exists, SHPPFW_DIRCREATE */ - res = pSHPathPrepareForWriteA(0, 0, ".\\testdir2", SHPPFW_DIRCREATE); + res = SHPathPrepareForWriteA(0, 0, ".\\testdir2", SHPPFW_DIRCREATE); ok(res == S_OK, "res == 0x%08x, expected S_OK\n", res); /* relative path doesn't exist, SHPPFW_DIRCREATE -- Windows does not create the directory in this case */ - res = pSHPathPrepareForWriteA(0, 0, ".\\testdir2\\test4.txt", SHPPFW_DIRCREATE); + res = SHPathPrepareForWriteA(0, 0, ".\\testdir2\\test4.txt", SHPPFW_DIRCREATE); ok(res == HRESULT_FROM_WIN32(ERROR_PATH_NOT_FOUND), "res == 0x%08x, expected HRESULT_FROM_WIN32(ERROR_PATH_NOT_FOUND)\n", res); ok(!file_exists(".\\testdir2\\test4.txt\\"), ".\\testdir2\\test4.txt\\ exists but shouldn't\n"); /* directory doesn't exist, SHPPFW_NONE */ set_curr_dir_path(path, "nonexistent\0"); - res = pSHPathPrepareForWriteA(0, 0, path, SHPPFW_NONE); + res = SHPathPrepareForWriteA(0, 0, path, SHPPFW_NONE); ok(res == HRESULT_FROM_WIN32(ERROR_PATH_NOT_FOUND), "res == 0x%08x, expected HRESULT_FROM_WIN32(ERROR_PATH_NOT_FOUND)\n", res); /* directory doesn't exist, SHPPFW_IGNOREFILENAME */ set_curr_dir_path(path, "nonexistent\\notreal\0"); - res = pSHPathPrepareForWriteA(0, 0, path, SHPPFW_IGNOREFILENAME); + res = SHPathPrepareForWriteA(0, 0, path, SHPPFW_IGNOREFILENAME); ok(res == HRESULT_FROM_WIN32(ERROR_PATH_NOT_FOUND), "res == 0x%08x, expected HRESULT_FROM_WIN32(ERROR_PATH_NOT_FOUND)\n", res); ok(!file_exists("nonexistent\\notreal"), "nonexistent\\notreal exists but shouldn't\n"); ok(!file_exists("nonexistent\\"), "nonexistent\\ exists but shouldn't\n"); /* directory doesn't exist, SHPPFW_IGNOREFILENAME|SHPPFW_DIRCREATE */ set_curr_dir_path(path, "testdir2\\test4.txt\\\0"); - res = pSHPathPrepareForWriteA(0, 0, path, SHPPFW_IGNOREFILENAME|SHPPFW_DIRCREATE); + res = SHPathPrepareForWriteA(0, 0, path, SHPPFW_IGNOREFILENAME|SHPPFW_DIRCREATE); ok(res == S_OK, "res == 0x%08x, expected S_OK\n", res); ok(file_exists("testdir2\\test4.txt\\"), "testdir2\\test4.txt doesn't exist but should\n"); /* nested directory doesn't exist, SHPPFW_DIRCREATE */ set_curr_dir_path(path, "nonexistent\\notreal\0"); - res = pSHPathPrepareForWriteA(0, 0, path, SHPPFW_DIRCREATE); + res = SHPathPrepareForWriteA(0, 0, path, SHPPFW_DIRCREATE); ok(res == S_OK, "res == 0x%08x, expected S_OK\n", res); ok(file_exists("nonexistent\\notreal"), "nonexistent\\notreal doesn't exist but should\n"); /* SHPPFW_ASKDIRCREATE, SHPPFW_NOWRITECHECK, and SHPPFW_MEDIACHECKONLY are untested */ - if(!pSHPathPrepareForWriteW) - { - win_skip("Skipping SHPathPrepareForWriteW tests\n"); - return; - } - SetLastError(0xdeadbeef); UsedDefaultChar = FALSE; if (WideCharToMultiByte(CP_ACP, WC_NO_BEST_FIT_CHARS, UNICODE_PATH, -1, UNICODE_PATH_A, sizeof(UNICODE_PATH_A), NULL, &UsedDefaultChar) == 0) @@ -2472,22 +2415,22 @@ static void test_sh_path_prepare(void) /* unicode directory doesn't exist, SHPPFW_NONE */ RemoveDirectoryA(UNICODE_PATH_A); - res = pSHPathPrepareForWriteW(0, 0, UNICODE_PATH, SHPPFW_NONE); + res = SHPathPrepareForWriteW(0, 0, UNICODE_PATH, SHPPFW_NONE); ok(res == HRESULT_FROM_WIN32(ERROR_PATH_NOT_FOUND), "res == %08x, expected HRESULT_FROM_WIN32(ERROR_PATH_NOT_FOUND)\n", res); ok(!file_exists(UNICODE_PATH_A), "unicode path was created but shouldn't be\n"); RemoveDirectoryA(UNICODE_PATH_A); /* unicode directory doesn't exist, SHPPFW_DIRCREATE */ - res = pSHPathPrepareForWriteW(0, 0, UNICODE_PATH, SHPPFW_DIRCREATE); + res = SHPathPrepareForWriteW(0, 0, UNICODE_PATH, SHPPFW_DIRCREATE); ok(res == S_OK, "res == %08x, expected S_OK\n", res); ok(file_exists(UNICODE_PATH_A), "unicode path should've been created\n"); /* unicode directory exists, SHPPFW_NONE */ - res = pSHPathPrepareForWriteW(0, 0, UNICODE_PATH, SHPPFW_NONE); + res = SHPathPrepareForWriteW(0, 0, UNICODE_PATH, SHPPFW_NONE); ok(res == S_OK, "ret == %08x, expected S_OK\n", res); /* unicode directory exists, SHPPFW_DIRCREATE */ - res = pSHPathPrepareForWriteW(0, 0, UNICODE_PATH, SHPPFW_DIRCREATE); + res = SHPathPrepareForWriteW(0, 0, UNICODE_PATH, SHPPFW_DIRCREATE); ok(res == S_OK, "ret == %08x, expected S_OK\n", res); RemoveDirectoryA(UNICODE_PATH_A); } @@ -2555,12 +2498,6 @@ static void test_unicode(void) HANDLE file; static const WCHAR UNICODE_PATH_TO[] = {'c',':','\\',0x00ae,0x00ae,'\0'}; - if (!pSHFileOperationW) - { - skip("SHFileOperationW() is missing\n"); - return; - } - shfoW.hwnd = NULL; shfoW.wFunc = FO_DELETE; shfoW.pFrom = UNICODE_PATH; @@ -2590,7 +2527,7 @@ static void test_unicode(void) /* Try to delete a file with unicode filename */ ok(file_existsW(UNICODE_PATH), "The file does not exist\n"); - ret = pSHFileOperationW(&shfoW); + ret = SHFileOperationW(&shfoW); ok(!ret, "File is not removed, ErrorCode: %d\n", ret); ok(!file_existsW(UNICODE_PATH), "The file should have been removed\n"); @@ -2598,31 +2535,25 @@ static void test_unicode(void) createTestFileW(UNICODE_PATH); shfoW.fFlags |= FOF_ALLOWUNDO; ok(file_existsW(UNICODE_PATH), "The file does not exist\n"); - ret = pSHFileOperationW(&shfoW); + ret = SHFileOperationW(&shfoW); ok(!ret, "File is not removed, ErrorCode: %d\n", ret); ok(!file_existsW(UNICODE_PATH), "The file should have been removed\n"); - if(!pSHCreateDirectoryExW) - { - skip("Skipping SHCreateDirectoryExW tests\n"); - return; - } - /* Try to delete a directory with unicode filename */ - ret = pSHCreateDirectoryExW(NULL, UNICODE_PATH, NULL); + ret = SHCreateDirectoryExW(NULL, UNICODE_PATH, NULL); ok(!ret, "SHCreateDirectoryExW returned %d\n", ret); ok(file_existsW(UNICODE_PATH), "The directory is not created\n"); shfoW.fFlags &= ~FOF_ALLOWUNDO; - ret = pSHFileOperationW(&shfoW); + ret = SHFileOperationW(&shfoW); ok(!ret, "Directory is not removed, ErrorCode: %d\n", ret); ok(!file_existsW(UNICODE_PATH), "The directory should have been removed\n"); /* Try to trash a directory with unicode filename */ - ret = pSHCreateDirectoryExW(NULL, UNICODE_PATH, NULL); + ret = SHCreateDirectoryExW(NULL, UNICODE_PATH, NULL); ok(!ret, "SHCreateDirectoryExW returned %d\n", ret); ok(file_existsW(UNICODE_PATH), "The directory was not created\n"); shfoW.fFlags |= FOF_ALLOWUNDO; - ret = pSHFileOperationW(&shfoW); + ret = SHFileOperationW(&shfoW); ok(!ret, "Directory is not removed, ErrorCode: %d\n", ret); ok(!file_existsW(UNICODE_PATH), "The directory should have been removed\n"); @@ -2707,8 +2638,6 @@ static BOOL is_old_shell32(void) START_TEST(shlfileop) { - InitFunctionPointers(); - clean_after_shfo_tests(); init_shfo_tests(); -- 2.16.3

1 0