June 2017 - Wine-commits - list.winehq.org

Nikolay Sivov : po: Update Russian translation.
by Alexandre Julliard 21 Jun '17

21 Jun '17

Module: wine Branch: master Commit: c0312bf79e6558ed5cfca114751a65e0040d8adc URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0312bf79e6558ed5cfca1147… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jun 21 14:13:56 2017 +0300 po: Update Russian translation. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/ru.po | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/po/ru.po b/po/ru.po index 101e986..bb93b02 100644 --- a/po/ru.po +++ b/po/ru.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2017-06-08 13:21+0300\n" +"PO-Revision-Date: 2017-06-21 14:12+0300\n" "Last-Translator: Nikolay Sivov <nsivov(a)codeweavers.com>\n" "Language-Team: Russian\n" "Language: ru\n" @@ -12064,10 +12064,8 @@ msgid "regedit: Unrecognized escape sequence [\\%1!c!]\n" msgstr "regedit: неизвестная управляющая последовательность [\\%1!c!]\n" #: regedit.rc:420 -#, fuzzy -#| msgid "regedit: Unsupported registry data type [%1]\n" msgid "regedit: Unsupported registry data type [0x%1!x!]\n" -msgstr "regedit: тип данных [%1] не поддерживается\n" +msgstr "regedit: тип данных [0x%1!x!] не поддерживается\n" #: regedit.rc:421 msgid "regedit: Unexpected end of line in '%1'.\n" @@ -12257,7 +12255,7 @@ msgstr "Вы точно хотите удалить ключ реестра «%1 #: regedit.rc:199 msgid "Expands or collapses the selected node" -msgstr "" +msgstr "Разворачивает или сворачивает выбранный раздел" #: regedit.rc:231 msgid "Collapse"

1 0

Hugh McMaster : regedit: Fail when parsing any hex data type that is greater than ULONG_MAX on Windows.
by Alexandre Julliard 21 Jun '17

21 Jun '17

Module: wine Branch: master Commit: 8803b9616bce64066a7a087148d49caa1adb8f6b URL: http://source.winehq.org/git/wine.git/?a=commit;h=8803b9616bce64066a7a08714… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Wed Jun 21 12:18:53 2017 +0000 regedit: Fail when parsing any hex data type that is greater than ULONG_MAX on Windows. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/regproc.c | 5 +++-- programs/regedit/tests/regedit.c | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c index e75ebec..bc488d3 100644 --- a/programs/regedit/regproc.c +++ b/programs/regedit/regproc.c @@ -21,6 +21,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include <errno.h> #include <limits.h> #include <stdio.h> #include <stdlib.h> @@ -319,8 +320,8 @@ static BOOL parse_data_type(struct parser *parser, WCHAR **line) DWORD val; /* "hex(xx):" is special */ - val = strtoulW(*line, &end, 16); - if (!**line || *end != ')' || *(end + 1) != ':') + val = wcstoul(*line, &end, 16); + if (!**line || *end != ')' || *(end + 1) != ':' || (val == ~0u && errno == ERANGE)) return FALSE; parser->data_type = val; diff --git a/programs/regedit/tests/regedit.c b/programs/regedit/tests/regedit.c index 96091f8..79f7571 100644 --- a/programs/regedit/tests/regedit.c +++ b/programs/regedit/tests/regedit.c @@ -464,7 +464,7 @@ static void test_basic_import(void) verify_reg(hkey, "Wine13f", 0xffff, "Value", 6, 0); verify_reg(hkey, "Wine13g", 0x7fffffff, "Value", 6, 0); verify_reg(hkey, "Wine13h", 0xffffffff, "Value", 6, 0); - todo_wine verify_reg_nonexist(hkey, "Wine13i"); + verify_reg_nonexist(hkey, "Wine13i"); RegCloseKey(hkey);

1 0

Hugh McMaster : regedit: Display all registry data types in the GUI.
by Alexandre Julliard 21 Jun '17

21 Jun '17

Module: wine Branch: master Commit: 878a0a4e14b8e38f0d6909c4d522f8d2a1d54a88 URL: http://source.winehq.org/git/wine.git/?a=commit;h=878a0a4e14b8e38f0d6909c4d… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Wed Jun 21 12:19:06 2017 +0000 regedit: Display all registry data types in the GUI. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/listview.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/programs/regedit/listview.c b/programs/regedit/listview.c index 1365259..a3bc72f 100644 --- a/programs/regedit/listview.c +++ b/programs/regedit/listview.c @@ -281,7 +281,10 @@ static void OnGetDispInfo(NMLVDISPINFOW* plvdi) plvdi->item.pszText = g_pszDefaultValueName; break; case 1: - switch (((LINE_INFO*)plvdi->item.lParam)->dwValType) { + { + DWORD data_type = ((LINE_INFO *)plvdi->item.lParam)->dwValType; + + switch (data_type) { case REG_SZ: plvdi->item.pszText = reg_szT; break; @@ -311,14 +314,14 @@ static void OnGetDispInfo(NMLVDISPINFOW* plvdi) break; default: { - WCHAR szUnknownFmt[64]; - LoadStringW(hInst, IDS_REGISTRY_UNKNOWN_TYPE, szUnknownFmt, COUNT_OF(szUnknownFmt)); - wsprintfW(buffer, szUnknownFmt, plvdi->item.lParam); + WCHAR fmt[] = {'0','x','%','x',0}; + wsprintfW(buffer, fmt, data_type); plvdi->item.pszText = buffer; break; } } break; + } case 2: plvdi->item.pszText = g_szValueNotSet; break;

1 0

Hugh McMaster : regedit: Display data for all values in the GUI.
by Alexandre Julliard 21 Jun '17

21 Jun '17

Module: wine Branch: master Commit: 4a70d335528e390c50206478eba16052c17b566c URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a70d335528e390c50206478e… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Wed Jun 21 12:19:27 2017 +0000 regedit: Display data for all values in the GUI. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/listview.c | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/programs/regedit/listview.c b/programs/regedit/listview.c index a3bc72f..b758564 100644 --- a/programs/regedit/listview.c +++ b/programs/regedit/listview.c @@ -129,8 +129,13 @@ void format_value_data(HWND hwndLV, int index, DWORD type, void *data, DWORD siz ListView_SetItemTextW(hwndLV, index, 2, buf); break; } + case REG_MULTI_SZ: + MakeMULTISZDisplayable(data); + ListView_SetItemTextW(hwndLV, index, 2, data); + break; case REG_BINARY: case REG_NONE: + default: { unsigned int i; BYTE *pData = data; @@ -143,17 +148,6 @@ void format_value_data(HWND hwndLV, int index, DWORD type, void *data, DWORD siz HeapFree(GetProcessHeap(), 0, strBinary); break; } - case REG_MULTI_SZ: - MakeMULTISZDisplayable(data); - ListView_SetItemTextW(hwndLV, index, 2, data); - break; - default: - { - WCHAR szText[128]; - LoadStringW(hInst, IDS_REGISTRY_VALUE_CANT_DISPLAY, szText, COUNT_OF(szText)); - ListView_SetItemTextW(hwndLV, index, 2, szText); - break; - } } }

1 0

Jacek Caban : mshtml: Moved EvaluateNewWindow call to navigate_new_window.
by Alexandre Julliard 21 Jun '17

21 Jun '17

Module: wine Branch: master Commit: 63205bf01d6c1ecb87f7a5b8100ad23d80b45585 URL: http://source.winehq.org/git/wine.git/?a=commit;h=63205bf01d6c1ecb87f7a5b81… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jun 21 17:05:31 2017 +0200 mshtml: Moved EvaluateNewWindow call to navigate_new_window. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlwindow.c | 26 ++++---------------------- dlls/mshtml/navigate.c | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 36 insertions(+), 22 deletions(-) diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index 2914073..5853220 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -971,8 +971,6 @@ static HRESULT WINAPI HTMLWindow2_open(IHTMLWindow2 *iface, BSTR url, BSTR name, { HTMLWindow *This = impl_from_IHTMLWindow2(iface); HTMLOuterWindow *window = This->outer_window; - INewWindowManager *new_window_mgr; - BSTR uri_str; IUri *uri; HRESULT hres; @@ -980,6 +978,10 @@ static HRESULT WINAPI HTMLWindow2_open(IHTMLWindow2 *iface, BSTR url, BSTR name, TRACE("(%p)->(%s %s %s %x %p)\n", This, debugstr_w(url), debugstr_w(name), debugstr_w(features), replace, pomWindowResult); + if(features) + FIXME("unsupported features argument %s\n", debugstr_w(features)); + if(replace) + FIXME("unsupported relace argument\n"); if(!window->doc_obj || !window->uri_nofrag) return E_UNEXPECTED; @@ -1006,26 +1008,6 @@ static HRESULT WINAPI HTMLWindow2_open(IHTMLWindow2 *iface, BSTR url, BSTR name, return E_NOTIMPL; } - hres = do_query_service((IUnknown*)window->doc_obj->client, &SID_SNewWindowManager, &IID_INewWindowManager, - (void**)&new_window_mgr); - if(FAILED(hres)) { - FIXME("No INewWindowManager\n"); - return E_NOTIMPL; - } - - hres = IUri_GetDisplayUri(window->uri_nofrag, &uri_str); - if(SUCCEEDED(hres)) { - hres = INewWindowManager_EvaluateNewWindow(new_window_mgr, url, name, uri_str, - features, !!replace, window->doc_obj->has_popup ? 0 : NWMF_FIRST, 0); - window->doc_obj->has_popup = TRUE; - SysFreeString(uri_str); - } - INewWindowManager_Release(new_window_mgr); - if(FAILED(hres)) { - *pomWindowResult = NULL; - return S_OK; - } - hres = create_relative_uri(window, url, &uri); if(FAILED(hres)) return hres; diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index 9dec64d..423d650 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -2238,12 +2238,44 @@ HRESULT super_navigate(HTMLOuterWindow *window, IUri *uri, DWORD flags, const WC HRESULT navigate_new_window(HTMLOuterWindow *window, IUri *uri, const WCHAR *name, request_data_t *request_data, IHTMLWindow2 **ret) { + INewWindowManager *new_window_mgr; + BSTR display_uri, context_url; IWebBrowser2 *web_browser; IHTMLWindow2 *new_window; IBindCtx *bind_ctx; nsChannelBSC *bsc; HRESULT hres; + hres = do_query_service((IUnknown*)window->doc_obj->client, &SID_SNewWindowManager, &IID_INewWindowManager, + (void**)&new_window_mgr); + if(SUCCEEDED(hres)) { + hres = IUri_GetDisplayUri(window->uri_nofrag, &context_url); + if(FAILED(hres)) + return hres; + + hres = IUri_GetDisplayUri(uri, &display_uri); + if(FAILED(hres)) { + SysFreeString(context_url); + return hres; + } + + hres = INewWindowManager_EvaluateNewWindow(new_window_mgr, display_uri, name, context_url, + NULL, FALSE, window->doc_obj->has_popup ? 0 : NWMF_FIRST, 0); + window->doc_obj->has_popup = TRUE; + SysFreeString(display_uri); + SysFreeString(context_url); + INewWindowManager_Release(new_window_mgr); + if(FAILED(hres)) { + if(ret) + *ret = NULL; + return S_OK; + } + }else { + FIXME("No INewWindowManager\n"); + return E_NOTIMPL; + } + + if(request_data) hres = create_channelbsc(NULL, request_data->headers, request_data->post_data, request_data->post_data_len, FALSE,

1 0

Ken Thomases : winemac: Break out of the window-dragging message loop if the window is hidden or destroyed.
by Alexandre Julliard 21 Jun '17

21 Jun '17

Module: wine Branch: master Commit: 6250eb54fe7d6d8091768cab535b46493c78da6f URL: http://source.winehq.org/git/wine.git/?a=commit;h=6250eb54fe7d6d8091768cab5… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Jun 21 10:15:50 2017 -0500 winemac: Break out of the window-dragging message loop if the window is hidden or destroyed. Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/cocoa_app.h | 1 + dlls/winemac.drv/cocoa_app.m | 12 +++++++++++ dlls/winemac.drv/cocoa_window.m | 3 +++ dlls/winemac.drv/macdrv.h | 2 +- dlls/winemac.drv/window.c | 45 +++++++++++++++++++++++++---------------- 5 files changed, 45 insertions(+), 18 deletions(-) diff --git a/dlls/winemac.drv/cocoa_app.h b/dlls/winemac.drv/cocoa_app.h index e76a47c..c88b894 100644 --- a/dlls/winemac.drv/cocoa_app.h +++ b/dlls/winemac.drv/cocoa_app.h @@ -121,6 +121,7 @@ enum { - (void) noteKey:(uint16_t)keyCode pressed:(BOOL)pressed; - (void) window:(WineWindow*)window isBeingDragged:(BOOL)dragged; + - (void) windowWillOrderOut:(WineWindow*)window; - (void) flipRect:(NSRect*)rect; diff --git a/dlls/winemac.drv/cocoa_app.m b/dlls/winemac.drv/cocoa_app.m index 77be095..2cf67f1 100644 --- a/dlls/winemac.drv/cocoa_app.m +++ b/dlls/winemac.drv/cocoa_app.m @@ -1553,6 +1553,18 @@ static NSString* WineLocalizedString(unsigned int stringID) [self updateCursorClippingState]; } + - (void) windowWillOrderOut:(WineWindow*)window + { + if ([windowsBeingDragged containsObject:window]) + { + [self window:window isBeingDragged:NO]; + + macdrv_event* event = macdrv_create_event(WINDOW_DRAG_END, window); + [window.queue postEvent:event]; + macdrv_release_event(event); + } + } + - (void) handleMouseMove:(NSEvent*)anEvent { WineWindow* targetWindow; diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index 2333c1f..65dc392 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -1653,6 +1653,9 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi BOOL wasVisible = [self isVisible]; BOOL wasOnActiveSpace = [self isOnActiveSpace]; + [self endWindowDragging]; + [controller windowWillOrderOut:self]; + if (enteringFullScreen || exitingFullScreen) { pendingOrderOut = TRUE; diff --git a/dlls/winemac.drv/macdrv.h b/dlls/winemac.drv/macdrv.h index 53dcd87..bb0e8ed 100644 --- a/dlls/winemac.drv/macdrv.h +++ b/dlls/winemac.drv/macdrv.h @@ -136,13 +136,13 @@ struct macdrv_win_data RECT client_rect; /* client area relative to parent */ int pixel_format; /* pixel format for GL */ COLORREF color_key; /* color key for layered window; CLR_INVALID is not color keyed */ + HANDLE drag_event; /* event to signal that Cocoa-driven window dragging has ended */ unsigned int on_screen : 1; /* is window ordered in? (minimized or not) */ unsigned int shaped : 1; /* is window using a custom region shape? */ unsigned int layered : 1; /* is window layered and with valid attributes? */ unsigned int ulw_layered : 1; /* has UpdateLayeredWindow() been called for window? */ unsigned int per_pixel_alpha : 1; /* is window using per-pixel alpha? */ unsigned int minimized : 1; /* is window minimized? */ - unsigned int being_dragged : 1; /* is window being dragged under Cocoa's control? */ unsigned int swap_interval : 1; /* GL swap interval for window */ struct window_surface *surface; struct window_surface *unminimized_surface; diff --git a/dlls/winemac.drv/window.c b/dlls/winemac.drv/window.c index e2de40d..bdd623d 100644 --- a/dlls/winemac.drv/window.c +++ b/dlls/winemac.drv/window.c @@ -1573,6 +1573,7 @@ void CDECL macdrv_DestroyWindow(HWND hwnd) if (!(data = get_win_data(hwnd))) return; if (hwnd == GetCapture()) macdrv_SetCapture(0, 0); + if (data->drag_event) SetEvent(data->drag_event); destroy_cocoa_window(data); destroy_cocoa_view(data); @@ -2268,7 +2269,7 @@ void macdrv_window_frame_changed(HWND hwnd, const macdrv_event *event) TRACE("%p resizing from (%dx%d) to (%dx%d)\n", hwnd, data->window_rect.right - data->window_rect.left, data->window_rect.bottom - data->window_rect.top, width, height); - being_dragged = data->being_dragged; + being_dragged = data->drag_event != NULL; release_win_data(data); if (event->window_frame_changed.fullscreen) @@ -2486,6 +2487,8 @@ void macdrv_window_drag_begin(HWND hwnd, const macdrv_event *event) { DWORD style = GetWindowLongW(hwnd, GWL_STYLE); struct macdrv_win_data *data; + HANDLE drag_event = NULL; + BOOL loop = TRUE; MSG msg; TRACE("win %p\n", hwnd); @@ -2494,9 +2497,12 @@ void macdrv_window_drag_begin(HWND hwnd, const macdrv_event *event) if (!(style & WS_VISIBLE)) return; if (!(data = get_win_data(hwnd))) return; - if (data->being_dragged) goto done; + if (data->drag_event) goto done; - data->being_dragged = TRUE; + drag_event = CreateEventW(NULL, TRUE, FALSE, NULL); + if (!drag_event) goto done; + + data->drag_event = drag_event; release_win_data(data); if (!event->window_drag_begin.no_activate && can_activate_window(hwnd) && GetForegroundWindow() != hwnd) @@ -2515,13 +2521,22 @@ void macdrv_window_drag_begin(HWND hwnd, const macdrv_event *event) SendMessageW(hwnd, WM_ENTERSIZEMOVE, 0, 0); ReleaseCapture(); - while (GetMessageW(&msg, 0, 0, 0)) + while (loop) { - if (msg.message == WM_EXITSIZEMOVE) + while (!PeekMessageW(&msg, 0, 0, 0, PM_REMOVE)) { - SendMessageW(hwnd, WM_EXITSIZEMOVE, 0, 0); - break; + DWORD result = MsgWaitForMultipleObjectsEx(1, &drag_event, INFINITE, QS_ALLINPUT, MWMO_INPUTAVAILABLE); + if (result == WAIT_OBJECT_0) + { + loop = FALSE; + break; + } } + if (!loop) + break; + + if (msg.message == WM_QUIT) + break; if (!CallMsgFilterW(&msg, MSGF_SIZE) && msg.message != WM_KEYDOWN && msg.message != WM_MOUSEMOVE && msg.message != WM_LBUTTONDOWN && msg.message != WM_LBUTTONUP) @@ -2531,13 +2546,16 @@ void macdrv_window_drag_begin(HWND hwnd, const macdrv_event *event) } } + SendMessageW(hwnd, WM_EXITSIZEMOVE, 0, 0); + TRACE("done\n"); if ((data = get_win_data(hwnd))) - data->being_dragged = FALSE; + data->drag_event = NULL; done: release_win_data(data); + if (drag_event) CloseHandle(drag_event); } @@ -2549,20 +2567,13 @@ done: void macdrv_window_drag_end(HWND hwnd) { struct macdrv_win_data *data; - BOOL being_dragged; TRACE("win %p\n", hwnd); if (!(data = get_win_data(hwnd))) return; - being_dragged = data->being_dragged; + if (data->drag_event) + SetEvent(data->drag_event); release_win_data(data); - - if (being_dragged) - { - /* Post this rather than sending it, so that the message loop in - macdrv_window_drag_begin() will see it. */ - PostMessageW(hwnd, WM_EXITSIZEMOVE, 0, 0); - } }

1 0

Dmitry Timoshkov : windowscodecs: Implement WICMapGuidToShortName.
by Alexandre Julliard 21 Jun '17

21 Jun '17

Module: wine Branch: master Commit: 37ae4f24c05dac31523e770e58aff749ecbec2c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=37ae4f24c05dac31523e770e5… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Jun 20 12:37:10 2017 +0800 windowscodecs: Implement WICMapGuidToShortName. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/metadataquery.c | 129 ++++++++++++++++++++++++++++++++++ dlls/windowscodecs/tests/metadata.c | 60 +++++++++++++++- dlls/windowscodecs/windowscodecs.spec | 2 +- include/wincodec.idl | 2 + include/wincodecsdk.idl | 23 ++++++ 5 files changed, 214 insertions(+), 2 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=37ae4f24c05dac31523e7…

1 0

Dmitry Timoshkov : windowscodecs: Implement WICMapShortNameToGuid.
by Alexandre Julliard 21 Jun '17

21 Jun '17

Module: wine Branch: master Commit: e1eed88401befee456852b6df3f213123c79c2bd URL: http://source.winehq.org/git/wine.git/?a=commit;h=e1eed88401befee456852b6df… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Jun 20 12:37:15 2017 +0800 windowscodecs: Implement WICMapShortNameToGuid. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/metadataquery.c | 20 +++++++++++++++++++ dlls/windowscodecs/tests/metadata.c | 36 +++++++++++++++++++++++++++++++++++ dlls/windowscodecs/windowscodecs.spec | 2 +- include/wincodec.idl | 1 + 4 files changed, 58 insertions(+), 1 deletion(-) diff --git a/dlls/windowscodecs/metadataquery.c b/dlls/windowscodecs/metadataquery.c index 6d8efa0..a7eedc0 100644 --- a/dlls/windowscodecs/metadataquery.c +++ b/dlls/windowscodecs/metadataquery.c @@ -277,3 +277,23 @@ HRESULT WINAPI WICMapGuidToShortName(REFGUID guid, UINT len, WCHAR *name, UINT * return WINCODEC_ERR_PROPERTYNOTFOUND; } + +HRESULT WINAPI WICMapShortNameToGuid(PCWSTR name, GUID *guid) +{ + UINT i; + + TRACE("%s,%p\n", debugstr_w(name), guid); + + if (!name || !guid) return E_INVALIDARG; + + for (i = 0; i < sizeof(guid2name)/sizeof(guid2name[0]); i++) + { + if (!lstrcmpiW(name, guid2name[i].name)) + { + *guid = *guid2name[i].guid; + return S_OK; + } + } + + return WINCODEC_ERR_PROPERTYNOTFOUND; +} diff --git a/dlls/windowscodecs/tests/metadata.c b/dlls/windowscodecs/tests/metadata.c index 4e9d691..f70ddad 100644 --- a/dlls/windowscodecs/tests/metadata.c +++ b/dlls/windowscodecs/tests/metadata.c @@ -2017,11 +2017,47 @@ static void test_WICMapGuidToShortName(void) ok(hr == E_INVALIDARG, "got %#x\n", hr); } +static void test_WICMapShortNameToGuid(void) +{ + static const WCHAR unkW[] = { 'u','n','k',0 }; + static const WCHAR xmpW[] = { 'x','m','p',0 }; + static const WCHAR XmPW[] = { 'X','m','P',0 }; + static const WCHAR unknownW[] = { 'u','n','k','n','o','w','n',0 }; + HRESULT hr; + GUID guid; + + hr = WICMapShortNameToGuid(NULL, NULL); + ok(hr == E_INVALIDARG, "got %#x\n", hr); + + hr = WICMapShortNameToGuid(NULL, &guid); + ok(hr == E_INVALIDARG, "got %#x\n", hr); + + hr = WICMapShortNameToGuid(unknownW, NULL); + ok(hr == E_INVALIDARG, "got %#x\n", hr); + + hr = WICMapShortNameToGuid(unkW, &guid); + ok(hr == WINCODEC_ERR_PROPERTYNOTFOUND, "got %#x\n", hr); + + hr = WICMapShortNameToGuid(unknownW, &guid); + ok(hr == S_OK, "got %#x\n", hr); + ok(IsEqualGUID(&guid, &GUID_MetadataFormatUnknown), "got %s\n", wine_dbgstr_guid(&guid)); + + hr = WICMapShortNameToGuid(xmpW, &guid); + ok(hr == S_OK, "got %#x\n", hr); + ok(IsEqualGUID(&guid, &GUID_MetadataFormatXMP), "got %s\n", wine_dbgstr_guid(&guid)); + + guid = GUID_NULL; + hr = WICMapShortNameToGuid(XmPW, &guid); + ok(hr == S_OK, "got %#x\n", hr); + ok(IsEqualGUID(&guid, &GUID_MetadataFormatXMP), "got %s\n", wine_dbgstr_guid(&guid)); +} + START_TEST(metadata) { CoInitializeEx(NULL, COINIT_APARTMENTTHREADED); test_WICMapGuidToShortName(); + test_WICMapShortNameToGuid(); test_metadata_unknown(); test_metadata_tEXt(); test_metadata_gAMA(); diff --git a/dlls/windowscodecs/windowscodecs.spec b/dlls/windowscodecs/windowscodecs.spec index 0972aed..ace3b33 100644 --- a/dlls/windowscodecs/windowscodecs.spec +++ b/dlls/windowscodecs/windowscodecs.spec @@ -111,7 +111,7 @@ @ stub WICGetMetadataContentSize @ stdcall WICMapGuidToShortName(ptr long ptr ptr) @ stub WICMapSchemaToName -@ stub WICMapShortNameToGuid +@ stdcall WICMapShortNameToGuid(wstr ptr) @ stub WICMatchMetadataContent @ stub WICSerializeMetadataContent @ stdcall WICSetEncoderFormat_Proxy(ptr ptr ptr ptr) diff --git a/include/wincodec.idl b/include/wincodec.idl index 5c46aed..55f22d5 100644 --- a/include/wincodec.idl +++ b/include/wincodec.idl @@ -1052,6 +1052,7 @@ interface IWICEnumMetadataItem : IUnknown cpp_quote("HRESULT WINAPI WICConvertBitmapSource(REFWICPixelFormatGUID dstFormat, IWICBitmapSource *pISrc, IWICBitmapSource **ppIDst);") cpp_quote("HRESULT WINAPI WICMapGuidToShortName(REFGUID,UINT,WCHAR *,UINT *);") +cpp_quote("HRESULT WINAPI WICMapShortNameToGuid(PCWSTR,GUID *);") cpp_quote("DEFINE_GUID(CLSID_WICBmpDecoder, 0x6b462062,0x7cbf,0x400d,0x9f,0xdb,0x81,0x3d,0xd1,0x0f,0x27,0x78);") cpp_quote("DEFINE_GUID(CLSID_WICPngDecoder, 0x389ea17b,0x5078,0x4cde,0xb6,0xef,0x25,0xc1,0x51,0x75,0xc7,0x51);")

1 0

Dmitry Timoshkov : windowscodecs: Implement WICMapSchemaToName.
by Alexandre Julliard 21 Jun '17

21 Jun '17

Module: wine Branch: master Commit: 714175e1448c5b615b1658275c86296445e6c0b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=714175e1448c5b615b1658275… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Jun 20 12:37:18 2017 +0800 windowscodecs: Implement WICMapSchemaToName. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/metadataquery.c | 127 ++++++++++++++++++++++ dlls/windowscodecs/tests/metadata.c | 196 ++++++++++++++++++++++++++++++++++ dlls/windowscodecs/windowscodecs.spec | 2 +- include/wincodec.idl | 1 + 4 files changed, 325 insertions(+), 1 deletion(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=714175e1448c5b615b165…

1 0

Dmitry Timoshkov : windowscodecs: Implement IWICMetadataQueryReader:: GetContainerFormat.
by Alexandre Julliard 21 Jun '17

21 Jun '17

Module: wine Branch: master Commit: f25890357b8d897f67ceae7a43419f1a1c44c171 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f25890357b8d897f67ceae7a4… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Jun 20 12:37:22 2017 +0800 windowscodecs: Implement IWICMetadataQueryReader::GetContainerFormat. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/metadataquery.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/windowscodecs/metadataquery.c b/dlls/windowscodecs/metadataquery.c index 8e58684..29df42e 100644 --- a/dlls/windowscodecs/metadataquery.c +++ b/dlls/windowscodecs/metadataquery.c @@ -89,12 +89,13 @@ static ULONG WINAPI mqr_Release(IWICMetadataQueryReader *iface) return ref; } -static HRESULT WINAPI mqr_GetContainerFormat(IWICMetadataQueryReader *iface, - GUID *pguidContainerFormat) +static HRESULT WINAPI mqr_GetContainerFormat(IWICMetadataQueryReader *iface, GUID *format) { QueryReader *This = impl_from_IWICMetadataQueryReader(iface); - FIXME("(%p,%p)\n", This, pguidContainerFormat); - return E_NOTIMPL; + + TRACE("(%p,%p)\n", This, format); + + return IWICMetadataBlockReader_GetContainerFormat(This->block, format); } static HRESULT WINAPI mqr_GetLocation(IWICMetadataQueryReader *iface,

1 0