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

Hadrien Boizard : winegstreamer: Use BOOL type where appropriate.
by Alexandre Julliard 02 Jun '16

02 Jun '16

Module: wine Branch: master Commit: 68e45dd4d0021bff92fb26951fd30b4828558ba2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=68e45dd4d0021bff92fb26951… Author: Hadrien Boizard <h.boizard(a)laposte.net> Date: Tue May 31 17:41:33 2016 +0200 winegstreamer: Use BOOL type where appropriate. Signed-off-by: Hadrien Boizard <h.boizard(a)laposte.net> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index d71225d..92804e3 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -84,7 +84,7 @@ struct GSTOutPin { GstPad *their_src; GstPad *my_sink; GstBufferPool *gstpool; - int isaud, isvid; + BOOL isaud, isvid; AM_MEDIA_TYPE * pmt; HANDLE caps_event; GstSegment *segment; @@ -783,7 +783,7 @@ static void init_new_decoded_pad(GstElement *bin, GstPad *pad, GSTImpl *This) GstPad *mypad; GSTOutPin *pin; int ret; - int isvid = 0, isaud = 0; + BOOL isvid = FALSE, isaud = FALSE; gchar my_name[1024]; TRACE("%p %p %p\n", This, bin, pad); @@ -809,9 +809,9 @@ static void init_new_decoded_pad(GstElement *bin, GstPad *pad, GSTImpl *This) gst_pad_set_query_function(mypad, query_sink_wrapper); if (!strcmp(typename, "audio/x-raw")) { - isaud = 1; + isaud = TRUE; } else if (!strcmp(typename, "video/x-raw")) { - isvid = 1; + isvid = TRUE; } else { FIXME("Unknown type \'%s\'\n", typename); return;

1 0

Andrew Eikum : xaudio2: Shut down OpenAL in the correct order.
by Alexandre Julliard 02 Jun '16

02 Jun '16

Module: wine Branch: master Commit: b77ec00f1c68c083c9ab0bb3b9fc26755d8084c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b77ec00f1c68c083c9ab0bb3b… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Jun 1 14:51:50 2016 -0500 xaudio2: Shut down OpenAL in the correct order. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xaudio2_7/xaudio_dll.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/xaudio2_7/xaudio_dll.c b/dlls/xaudio2_7/xaudio_dll.c index 1393599..acad6e1 100644 --- a/dlls/xaudio2_7/xaudio_dll.c +++ b/dlls/xaudio2_7/xaudio_dll.c @@ -963,12 +963,12 @@ static void WINAPI XA2M_DestroyVoice(IXAudio2MasteringVoice *iface) IAudioClient_Release(This->aclient); This->aclient = NULL; - alcCloseDevice(This->al_device); - This->al_device = NULL; - alcDestroyContext(This->al_ctx); This->al_ctx = NULL; + alcCloseDevice(This->al_device); + This->al_device = NULL; + LeaveCriticalSection(&This->lock); }

1 0

Andrew Eikum : xaudio2: Implement GetVoiceDetails for source and submix voices.
by Alexandre Julliard 02 Jun '16

02 Jun '16

Module: wine Branch: master Commit: e733770416f42789f7b96b74505a9dc71e282ee4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e733770416f42789f7b96b745… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Jun 1 15:09:05 2016 -0500 xaudio2: Implement GetVoiceDetails for source and submix voices. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xaudio2_7/compat.c | 447 ++++++++++++++++++++++++++++++++++++++-- dlls/xaudio2_7/tests/xaudio2.c | 68 ++++++ dlls/xaudio2_7/xaudio_dll.c | 23 +++ dlls/xaudio2_7/xaudio_private.h | 8 + include/xaudio2.idl | 116 ++++++++++- 5 files changed, 645 insertions(+), 17 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e733770416f42789f7b96…

1 0

Alistair Leslie-Hughes : inetcomm: Add missing default properties.
by Alexandre Julliard 02 Jun '16

02 Jun '16

Module: wine Branch: master Commit: 943b376dbae0e9a6b99845948443e24e2e1fb5c6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=943b376dbae0e9a6b99845948… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Jun 1 06:06:30 2016 +0000 inetcomm: Add missing default properties. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/inetcomm/mimeole.c | 95 ++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 75 insertions(+), 20 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=943b376dbae0e9a6b9984…

1 0

Michael Stefaniuc : riched20/tests: Use EqualRect() instead of open coding it.
by Alexandre Julliard 02 Jun '16

02 Jun '16

Module: wine Branch: master Commit: b0104692ac9bffa89452e22ff776fb83056ba59f URL: http://source.winehq.org/git/wine.git/?a=commit;h=b0104692ac9bffa89452e22ff… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jun 2 13:41:21 2016 +0200 riched20/tests: Use EqualRect() instead of open coding it. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/tests/editor.c | 54 ++++++++++++-------------------------------- 1 file changed, 14 insertions(+), 40 deletions(-) diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index 2fd9c99..92af700 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -7050,9 +7050,7 @@ static void test_format_rect(void) expected.left += 1; expected.right -= 1; SendMessageA(hwnd, EM_GETRECT, 0, (LPARAM)&rc); - ok(rc.top == expected.top && rc.left == expected.left && - rc.bottom == expected.bottom && rc.right == expected.right, - "rect a(t=%d, l=%d, b=%d, r=%d) != e(t=%d, l=%d, b=%d, r=%d)\n", + ok(EqualRect(&rc, &expected), "rect a(t=%d, l=%d, b=%d, r=%d) != e(t=%d, l=%d, b=%d, r=%d)\n", rc.top, rc.left, rc.bottom, rc.right, expected.top, expected.left, expected.bottom, expected.right); @@ -7071,8 +7069,7 @@ static void test_format_rect(void) expected.bottom = min(clientRect.bottom, rc.bottom); expected.right = min(clientRect.right, rc.right); SendMessageA(hwnd, EM_GETRECT, 0, (LPARAM)&rc); - ok(rc.top == expected.top && rc.left == expected.left && - rc.bottom == expected.bottom && rc.right == expected.right, + ok(EqualRect(&rc, &expected), "[n=%d] rect a(t=%d, l=%d, b=%d, r=%d) != e(t=%d, l=%d, b=%d, r=%d)\n", n, rc.top, rc.left, rc.bottom, rc.right, expected.top, expected.left, expected.bottom, expected.right); @@ -7082,9 +7079,7 @@ static void test_format_rect(void) SendMessageA(hwnd, EM_SETRECT, 0, (LPARAM)&rc); expected = clientRect; SendMessageA(hwnd, EM_GETRECT, 0, (LPARAM)&rc); - ok(rc.top == expected.top && rc.left == expected.left && - rc.bottom == expected.bottom && rc.right == expected.right, - "rect a(t=%d, l=%d, b=%d, r=%d) != e(t=%d, l=%d, b=%d, r=%d)\n", + ok(EqualRect(&rc, &expected), "rect a(t=%d, l=%d, b=%d, r=%d) != e(t=%d, l=%d, b=%d, r=%d)\n", rc.top, rc.left, rc.bottom, rc.right, expected.top, expected.left, expected.bottom, expected.right); @@ -7094,9 +7089,7 @@ static void test_format_rect(void) ok(options & ECO_SELECTIONBAR, "EM_SETOPTIONS failed to add selectionbar.\n"); expected.left += 8; /* selection bar width */ SendMessageA(hwnd, EM_GETRECT, 0, (LPARAM)&rc); - ok(rc.top == expected.top && rc.left == expected.left && - rc.bottom == expected.bottom && rc.right == expected.right, - "rect a(t=%d, l=%d, b=%d, r=%d) != e(t=%d, l=%d, b=%d, r=%d)\n", + ok(EqualRect(&rc, &expected), "rect a(t=%d, l=%d, b=%d, r=%d) != e(t=%d, l=%d, b=%d, r=%d)\n", rc.top, rc.left, rc.bottom, rc.right, expected.top, expected.left, expected.bottom, expected.right); @@ -7104,9 +7097,7 @@ static void test_format_rect(void) SendMessageA(hwnd, EM_SETRECT, 0, (LPARAM)&rc); expected = clientRect; SendMessageA(hwnd, EM_GETRECT, 0, (LPARAM)&rc); - ok(rc.top == expected.top && rc.left == expected.left && - rc.bottom == expected.bottom && rc.right == expected.right, - "rect a(t=%d, l=%d, b=%d, r=%d) != e(t=%d, l=%d, b=%d, r=%d)\n", + ok(EqualRect(&rc, &expected), "rect a(t=%d, l=%d, b=%d, r=%d) != e(t=%d, l=%d, b=%d, r=%d)\n", rc.top, rc.left, rc.bottom, rc.right, expected.top, expected.left, expected.bottom, expected.right); @@ -7117,9 +7108,7 @@ static void test_format_rect(void) ok(!(options & ECO_SELECTIONBAR), "EM_SETOPTIONS failed to remove selectionbar.\n"); expected.left -= 8; /* selection bar width */ SendMessageA(hwnd, EM_GETRECT, 0, (LPARAM)&rc); - ok(rc.top == expected.top && rc.left == expected.left && - rc.bottom == expected.bottom && rc.right == expected.right, - "rect a(t=%d, l=%d, b=%d, r=%d) != e(t=%d, l=%d, b=%d, r=%d)\n", + ok(EqualRect(&rc, &expected), "rect a(t=%d, l=%d, b=%d, r=%d) != e(t=%d, l=%d, b=%d, r=%d)\n", rc.top, rc.left, rc.bottom, rc.right, expected.top, expected.left, expected.bottom, expected.right); @@ -7128,8 +7117,7 @@ static void test_format_rect(void) SendMessageA(hwnd, EM_SETRECT, 0, (LPARAM)&rc); expected = clientRect; SendMessageA(hwnd, EM_GETRECT, 0, (LPARAM)&rc); - ok(rc.top == expected.top && rc.left == expected.left && - rc.bottom == expected.bottom && rc.right == expected.right, + ok(EqualRect(&rc, &expected), "[n=%d] rect a(t=%d, l=%d, b=%d, r=%d) != e(t=%d, l=%d, b=%d, r=%d)\n", n, rc.top, rc.left, rc.bottom, rc.right, expected.top, expected.left, expected.bottom, expected.right); @@ -7144,9 +7132,7 @@ static void test_format_rect(void) expected = rc; SendMessageA(hwnd, EM_SETRECT, 1, (LPARAM)&rc); SendMessageA(hwnd, EM_GETRECT, 0, (LPARAM)&rc); - ok(rc.top == expected.top && rc.left == expected.left && - rc.bottom == expected.bottom && rc.right == expected.right, - "rect a(t=%d, l=%d, b=%d, r=%d) != e(t=%d, l=%d, b=%d, r=%d)\n", + ok(EqualRect(&rc, &expected), "rect a(t=%d, l=%d, b=%d, r=%d) != e(t=%d, l=%d, b=%d, r=%d)\n", rc.top, rc.left, rc.bottom, rc.right, expected.top, expected.left, expected.bottom, expected.right); @@ -7159,9 +7145,7 @@ static void test_format_rect(void) expected = rc; SendMessageA(hwnd, EM_SETRECT, 1, (LPARAM)&rc); SendMessageA(hwnd, EM_GETRECT, 0, (LPARAM)&rc); - ok(rc.top == expected.top && rc.left == expected.left && - rc.bottom == expected.bottom && rc.right == expected.right, - "rect a(t=%d, l=%d, b=%d, r=%d) != e(t=%d, l=%d, b=%d, r=%d)\n", + ok(EqualRect(&rc, &expected), "rect a(t=%d, l=%d, b=%d, r=%d) != e(t=%d, l=%d, b=%d, r=%d)\n", rc.top, rc.left, rc.bottom, rc.right, expected.top, expected.left, expected.bottom, expected.right); @@ -7176,9 +7160,7 @@ static void test_format_rect(void) expected.left += 1; expected.right -= 1; SendMessageA(hwnd, EM_GETRECT, 0, (LPARAM)&rc); - ok(rc.top == expected.top && rc.left == expected.left && - rc.bottom == expected.bottom && rc.right == expected.right, - "rect a(t=%d, l=%d, b=%d, r=%d) != e(t=%d, l=%d, b=%d, r=%d)\n", + ok(EqualRect(&rc, &expected), "rect a(t=%d, l=%d, b=%d, r=%d) != e(t=%d, l=%d, b=%d, r=%d)\n", rc.top, rc.left, rc.bottom, rc.right, expected.top, expected.left, expected.bottom, expected.right); @@ -7189,9 +7171,7 @@ static void test_format_rect(void) expected.left += 1; expected.right -= 1; SendMessageA(hwnd, EM_GETRECT, 0, (LPARAM)&rc); - ok(rc.top == expected.top && rc.left == expected.left && - rc.bottom == expected.bottom && rc.right == expected.right, - "rect a(t=%d, l=%d, b=%d, r=%d) != e(t=%d, l=%d, b=%d, r=%d)\n", + ok(EqualRect(&rc, &expected), "rect a(t=%d, l=%d, b=%d, r=%d) != e(t=%d, l=%d, b=%d, r=%d)\n", rc.top, rc.left, rc.bottom, rc.right, expected.top, expected.left, expected.bottom, expected.right); @@ -7202,9 +7182,7 @@ static void test_format_rect(void) expected.left += 1; expected.right -= 1; SendMessageA(hwnd, EM_GETRECT, 0, (LPARAM)&rc); - ok(rc.top == expected.top && rc.left == expected.left && - rc.bottom == expected.bottom && rc.right == expected.right, - "rect a(t=%d, l=%d, b=%d, r=%d) != e(t=%d, l=%d, b=%d, r=%d)\n", + ok(EqualRect(&rc, &expected), "rect a(t=%d, l=%d, b=%d, r=%d) != e(t=%d, l=%d, b=%d, r=%d)\n", rc.top, rc.left, rc.bottom, rc.right, expected.top, expected.left, expected.bottom, expected.right); @@ -7223,9 +7201,7 @@ static void test_format_rect(void) expected.top += 1; expected.right -= 1; SendMessageA(hwnd, EM_GETRECT, 0, (LPARAM)&rc); - ok(rc.top == expected.top && rc.left == expected.left && - rc.bottom == expected.bottom && rc.right == expected.right, - "rect a(t=%d, l=%d, b=%d, r=%d) != e(t=%d, l=%d, b=%d, r=%d)\n", + ok(EqualRect(&rc, &expected), "rect a(t=%d, l=%d, b=%d, r=%d) != e(t=%d, l=%d, b=%d, r=%d)\n", rc.top, rc.left, rc.bottom, rc.right, expected.top, expected.left, expected.bottom, expected.right); @@ -7240,9 +7216,7 @@ static void test_format_rect(void) expected.right += 1; SendMessageA(hwnd, EM_SETRECT, 0, (LPARAM)&rc); SendMessageA(hwnd, EM_GETRECT, 0, (LPARAM)&rc); - ok(rc.top == expected.top && rc.left == expected.left && - rc.bottom == expected.bottom && rc.right == expected.right, - "rect a(t=%d, l=%d, b=%d, r=%d) != e(t=%d, l=%d, b=%d, r=%d)\n", + ok(EqualRect(&rc, &expected), "rect a(t=%d, l=%d, b=%d, r=%d) != e(t=%d, l=%d, b=%d, r=%d)\n", rc.top, rc.left, rc.bottom, rc.right, expected.top, expected.left, expected.bottom, expected.right);

1 0

Michael Stefaniuc : include: Add an inline version of EqualRect() too.
by Alexandre Julliard 02 Jun '16

02 Jun '16

Module: wine Branch: master Commit: 71f975f6bdf96a3c4f69cdea0b3a51b2118d63cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=71f975f6bdf96a3c4f69cdea0… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jun 2 13:44:28 2016 +0200 include: Add an inline version of EqualRect() too. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/winuser.h | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/include/winuser.h b/include/winuser.h index 2b56a0c..157a6ef 100644 --- a/include/winuser.h +++ b/include/winuser.h @@ -3539,7 +3539,6 @@ WINUSERAPI BOOL WINAPI EnumWindows(WNDENUMPROC,LPARAM); WINUSERAPI BOOL WINAPI EnumWindowStationsA(WINSTAENUMPROCA,LPARAM); WINUSERAPI BOOL WINAPI EnumWindowStationsW(WINSTAENUMPROCW,LPARAM); #define EnumWindowStations WINELIB_NAME_AW(EnumWindowStations) -WINUSERAPI BOOL WINAPI EqualRect(const RECT*,const RECT*); WINUSERAPI INT WINAPI ExcludeUpdateRgn(HDC,HWND); #define ExitWindows(a,b) ExitWindowsEx(EWX_LOGOFF,0xffffffff) WINUSERAPI BOOL WINAPI ExitWindowsEx(UINT,DWORD); @@ -4091,6 +4090,7 @@ WINUSERAPI INT WINAPI wvsprintfW(LPWSTR,LPCWSTR,__ms_va_list); #if !defined(__WINESRC__) || defined(WINE_NO_INLINE_RECT) +WINUSERAPI BOOL WINAPI EqualRect(const RECT*,const RECT*); WINUSERAPI BOOL WINAPI IsRectEmpty(const RECT*); WINUSERAPI BOOL WINAPI SetRect(LPRECT,INT,INT,INT,INT); WINUSERAPI BOOL WINAPI SetRectEmpty(LPRECT); @@ -4099,6 +4099,13 @@ WINUSERAPI BOOL WINAPI SetRectEmpty(LPRECT); /* Inline versions of common RECT helpers */ +static inline BOOL WINAPI EqualRect(const RECT *rect1, const RECT *rect2) +{ + if (!rect1 || !rect2) return FALSE; + return ((rect1->left == rect2->left) && (rect1->right == rect2->right) && + (rect1->top == rect2->top) && (rect1->bottom == rect2->bottom)); +} + static inline BOOL WINAPI IsRectEmpty(const RECT *rect) { if (!rect) return TRUE;

1 0

Nikolay Sivov : gdiplus/tests: Fix a font leak (Valgrind).
by Alexandre Julliard 01 Jun '16

01 Jun '16

Module: wine Branch: master Commit: b18ecadef70725a9b70807554a0b785a202bb644 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b18ecadef70725a9b70807554… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon May 30 22:52:50 2016 +0300 gdiplus/tests: Fix a font leak (Valgrind). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/tests/font.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/gdiplus/tests/font.c b/dlls/gdiplus/tests/font.c index 39b539b..1b442cc 100644 --- a/dlls/gdiplus/tests/font.c +++ b/dlls/gdiplus/tests/font.c @@ -781,6 +781,7 @@ static void test_font_substitution(void) expect(Ok, status); strcpy(fallback_font,lf.lfFaceName); trace("fallback font %s\n", fallback_font); + GdipDeleteFont(font); lstrcpyA(lf.lfFaceName, "ThisFontShouldNotExist"); status = GdipCreateFontFromLogfontA(hdc, &lf, &font);

1 0

Jacek Caban : wininet: Correctly handle the last proxy override in HTTP_ShouldBypassProxy.
by Alexandre Julliard 01 Jun '16

01 Jun '16

Module: wine Branch: master Commit: fff5dca78786060e8c9741fa7d41b153b937be6e URL: http://source.winehq.org/git/wine.git/?a=commit;h=fff5dca78786060e8c9741fa7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue May 31 19:42:53 2016 +0200 wininet: Correctly handle the last proxy override in HTTP_ShouldBypassProxy. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/http.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index ed5105d..a468a84 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -1771,7 +1771,7 @@ static BOOL HTTP_ShouldBypassProxy(appinfo_t *lpwai, LPCWSTR server) if (!ptr) ptr = strchrW( tmp, ' ' ); if (!ptr) - ptr = tmp + strlenW(ptr); + ptr = tmp + strlenW(tmp); ret = HTTP_DomainMatches( server, substr(tmp, ptr-tmp) ); if (ret || !*ptr) break;

1 0

Nikolay Sivov : include: Added missing ASSOCF enum members.
by Alexandre Julliard 01 Jun '16

01 Jun '16

Module: wine Branch: master Commit: 784a74c93326f58c3dd222634abfafe9b0f439fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=784a74c93326f58c3dd222634… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue May 31 21:06:24 2016 +0300 include: Added missing ASSOCF enum members. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/tests/assoc.c | 20 ++++++++++---------- include/shlwapi.h | 28 ++++++++++++++++------------ 2 files changed, 26 insertions(+), 22 deletions(-) diff --git a/dlls/shell32/tests/assoc.c b/dlls/shell32/tests/assoc.c index c425038..67f7d32 100644 --- a/dlls/shell32/tests/assoc.c +++ b/dlls/shell32/tests/assoc.c @@ -109,10 +109,10 @@ static void getstring_test(LPCWSTR assocName, HKEY progIdKey, ASSOCSTR str, LPCW hr = CoCreateInstance(&CLSID_QueryAssociations, NULL, CLSCTX_INPROC_SERVER, &IID_IQueryAssociations, (void*)&assoc); ok_(__FILE__, line)(hr == S_OK, "failed to create IQueryAssociations, 0x%x\n", hr); - hr = IQueryAssociations_Init(assoc, 0, assocName, progIdKey, NULL); + hr = IQueryAssociations_Init(assoc, ASSOCF_NONE, assocName, progIdKey, NULL); ok_(__FILE__, line)(hr == S_OK, "IQueryAssociations::Init failed, 0x%x\n", hr); - hr = IQueryAssociations_GetString(assoc, 0, str, NULL, NULL, &len); + hr = IQueryAssociations_GetString(assoc, ASSOCF_NONE, str, NULL, NULL, &len); if (hr != S_FALSE) { if (expected_string) { ok_(__FILE__, line)(SUCCEEDED(hr), "GetString returned 0x%x, expected success\n", hr); @@ -123,7 +123,7 @@ static void getstring_test(LPCWSTR assocName, HKEY progIdKey, ASSOCSTR str, LPCW buffer = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); ok_(__FILE__, line)(buffer != NULL, "out of memory\n"); - hr = IQueryAssociations_GetString(assoc, 0, str, NULL, buffer, &len); + hr = IQueryAssociations_GetString(assoc, ASSOCF_NONE, str, NULL, buffer, &len); if (expected_string) { ok_(__FILE__, line)(lstrcmpW(buffer, expected_string) == 0, "GetString returned %s, expected %s\n", @@ -182,11 +182,11 @@ static void test_IQueryAssociations_GetString(void) hr = CoCreateInstance(&CLSID_QueryAssociations, NULL, CLSCTX_INPROC_SERVER, &IID_IQueryAssociations, (void*)&assoc); ok(hr == S_OK, "failed to create object, 0x%x\n", hr); - hr = IQueryAssociations_Init(assoc, 0, httpW, NULL, NULL); + hr = IQueryAssociations_Init(assoc, ASSOCF_NONE, httpW, NULL, NULL); ok(hr == S_OK, "Init failed, 0x%x\n", hr); len = 0; - hr = IQueryAssociations_GetString(assoc, 0, ASSOCSTR_EXECUTABLE, NULL, NULL, &len); + hr = IQueryAssociations_GetString(assoc, ASSOCF_NONE, ASSOCSTR_EXECUTABLE, NULL, NULL, &len); ok(hr == S_FALSE, "got 0x%08x\n", hr); ok(len > 0, "got wrong needed length, %d\n", len); @@ -195,7 +195,7 @@ static void test_IQueryAssociations_GetString(void) WCHAR buffW[MAX_PATH]; DWORD len; - hr = IQueryAssociations_Init(assoc, 0, ptr->key, NULL, NULL); + hr = IQueryAssociations_Init(assoc, ASSOCF_NONE, ptr->key, NULL, NULL); ok(hr == S_OK, "%d: Init failed, 0x%x\n", i, hr); len = ptr->len; @@ -232,17 +232,17 @@ static void test_IQueryAssociations_Init(void) hr = CoCreateInstance(&CLSID_QueryAssociations, NULL, CLSCTX_INPROC_SERVER, &IID_IQueryAssociations, (void*)&assoc); ok(hr == S_OK, "failed to create object, 0x%x\n", hr); - hr = IQueryAssociations_Init(assoc, 0, NULL, NULL, NULL); + hr = IQueryAssociations_Init(assoc, ASSOCF_NONE, NULL, NULL, NULL); ok(hr == E_INVALIDARG, "Init failed, 0x%08x\n", hr); - hr = IQueryAssociations_Init(assoc, 0, httpW, NULL, NULL); + hr = IQueryAssociations_Init(assoc, ASSOCF_NONE, httpW, NULL, NULL); ok(hr == S_OK, "Init failed, 0x%08x\n", hr); - hr = IQueryAssociations_Init(assoc, 0, badW, NULL, NULL); + hr = IQueryAssociations_Init(assoc, ASSOCF_NONE, badW, NULL, NULL); ok(hr == S_OK || broken(hr == S_FALSE) /* pre-vista */, "Init failed, 0x%08x\n", hr); len = 0; - hr = IQueryAssociations_GetString(assoc, 0, ASSOCSTR_EXECUTABLE, NULL, NULL, &len); + hr = IQueryAssociations_GetString(assoc, ASSOCF_NONE, ASSOCSTR_EXECUTABLE, NULL, NULL, &len); ok(hr == HRESULT_FROM_WIN32(ERROR_NO_ASSOCIATION) || broken(hr == E_FAIL) /* pre-vista */, "got 0x%08x\n", hr); IQueryAssociations_Release(assoc); diff --git a/include/shlwapi.h b/include/shlwapi.h index e3b14b3..4c91c1c 100644 --- a/include/shlwapi.h +++ b/include/shlwapi.h @@ -210,18 +210,22 @@ int WINAPI SHRegGetIntW(HKEY,LPCWSTR,int); /* IQueryAssociation and helpers */ enum { - ASSOCF_INIT_NOREMAPCLSID = 0x001, /* Don't map clsid->progid */ - ASSOCF_INIT_BYEXENAME = 0x002, /* .exe name given */ - ASSOCF_OPEN_BYEXENAME = 0x002, /* Synonym */ - ASSOCF_INIT_DEFAULTTOSTAR = 0x004, /* Use * as base */ - ASSOCF_INIT_DEFAULTTOFOLDER = 0x008, /* Use folder as base */ - ASSOCF_NOUSERSETTINGS = 0x010, /* No HKCU reads */ - ASSOCF_NOTRUNCATE = 0x020, /* Don't truncate return */ - ASSOCF_VERIFY = 0x040, /* Verify data */ - ASSOCF_REMAPRUNDLL = 0x080, /* Get rundll args */ - ASSOCF_NOFIXUPS = 0x100, /* Don't fixup errors */ - ASSOCF_IGNOREBASECLASS = 0x200, /* Don't read baseclass */ - ASSOCF_INIT_IGNOREUNKNOWN = 0x400, /* Fail for unknown progid */ + ASSOCF_NONE = 0x0000, + ASSOCF_INIT_NOREMAPCLSID = 0x0001, /* Don't map clsid->progid */ + ASSOCF_INIT_BYEXENAME = 0x0002, /* .exe name given */ + ASSOCF_OPEN_BYEXENAME = 0x0002, /* Synonym */ + ASSOCF_INIT_DEFAULTTOSTAR = 0x0004, /* Use * as base */ + ASSOCF_INIT_DEFAULTTOFOLDER = 0x0008, /* Use folder as base */ + ASSOCF_NOUSERSETTINGS = 0x0010, /* No HKCU reads */ + ASSOCF_NOTRUNCATE = 0x0020, /* Don't truncate return */ + ASSOCF_VERIFY = 0x0040, /* Verify data */ + ASSOCF_REMAPRUNDLL = 0x0080, /* Get rundll args */ + ASSOCF_NOFIXUPS = 0x0100, /* Don't fixup errors */ + ASSOCF_IGNOREBASECLASS = 0x0200, /* Don't read baseclass */ + ASSOCF_INIT_IGNOREUNKNOWN = 0x0400, /* Fail for unknown progid */ + ASSOCF_INIT_FIXED_PROGID = 0x0800, /* Used passed string as progid, don't try to map it */ + ASSOCF_IS_PROTOCOL = 0x1000, /* Treat as protocol, that should be mapped */ + ASSOCF_INIT_FOR_FILE = 0x2000, /* progid is for file extension association */ }; typedef DWORD ASSOCF;

1 0

Alexandre Julliard : makefiles: Remove some obsolete import libraries.
by Alexandre Julliard 01 Jun '16

01 Jun '16

Module: wine Branch: master Commit: e76142d055f96abe3f501ca8d5737af4abeabac4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e76142d055f96abe3f501ca8d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 1 15:16:10 2016 +0900 makefiles: Remove some obsolete import libraries. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 16 ++++++++-------- configure.ac | 16 ++++++++-------- dlls/crtdll/Makefile.in | 1 - dlls/ctl3d32/Makefile.in | 1 - dlls/d3dim/Makefile.in | 1 - dlls/dmusic32/Makefile.in | 1 - dlls/dplay/Makefile.in | 1 - dlls/msvcrt20/Makefile.in | 1 - dlls/msvcrt40/Makefile.in | 1 - dlls/serialui/Makefile.in | 1 - 10 files changed, 16 insertions(+), 24 deletions(-) diff --git a/configure b/configure index 9d0663a..432e501 100755 --- a/configure +++ b/configure @@ -17537,7 +17537,7 @@ wine_fn_config_dll comsvcs enable_comsvcs implib wine_fn_config_dll connect enable_connect wine_fn_config_dll credui enable_credui clean,implib wine_fn_config_test dlls/credui/tests credui_test -wine_fn_config_dll crtdll enable_crtdll implib +wine_fn_config_dll crtdll enable_crtdll wine_fn_config_dll crypt32 enable_crypt32 clean,implib wine_fn_config_test dlls/crypt32/tests crypt32_test wine_fn_config_dll cryptdlg enable_cryptdlg clean @@ -17549,7 +17549,7 @@ wine_fn_config_dll cryptui enable_cryptui clean,implib wine_fn_config_test dlls/cryptui/tests cryptui_test wine_fn_config_dll ctapi32 enable_ctapi32 wine_fn_config_dll ctl3d.dll16 enable_win16 -wine_fn_config_dll ctl3d32 enable_ctl3d32 implib +wine_fn_config_dll ctl3d32 enable_ctl3d32 wine_fn_config_dll ctl3dv2.dll16 enable_win16 wine_fn_config_dll d2d1 enable_d2d1 implib wine_fn_config_test dlls/d2d1/tests d2d1_test @@ -17579,7 +17579,7 @@ wine_fn_config_dll d3dcompiler_43 enable_d3dcompiler_43 implib d3dcompiler wine_fn_config_test dlls/d3dcompiler_43/tests d3dcompiler_43_test wine_fn_config_dll d3dcompiler_46 enable_d3dcompiler_46 wine_fn_config_dll d3dcompiler_47 enable_d3dcompiler_47 -wine_fn_config_dll d3dim enable_d3dim implib +wine_fn_config_dll d3dim enable_d3dim wine_fn_config_dll d3drm enable_d3drm implib wine_fn_config_test dlls/d3drm/tests d3drm_test wine_fn_config_dll d3dx10_33 enable_d3dx10_33 @@ -17656,10 +17656,10 @@ wine_fn_config_dll dmsynth enable_dmsynth clean wine_fn_config_test dlls/dmsynth/tests dmsynth_test wine_fn_config_dll dmusic enable_dmusic clean wine_fn_config_test dlls/dmusic/tests dmusic_test -wine_fn_config_dll dmusic32 enable_dmusic32 implib +wine_fn_config_dll dmusic32 enable_dmusic32 wine_fn_config_dll dnsapi enable_dnsapi implib wine_fn_config_test dlls/dnsapi/tests dnsapi_test -wine_fn_config_dll dplay enable_dplay implib +wine_fn_config_dll dplay enable_dplay wine_fn_config_dll dplayx enable_dplayx clean,implib wine_fn_config_test dlls/dplayx/tests dplayx_test wine_fn_config_dll dpnaddr enable_dpnaddr @@ -17868,8 +17868,8 @@ wine_fn_config_dll msvcr90 enable_msvcr90 implib wine_fn_config_test dlls/msvcr90/tests msvcr90_test wine_fn_config_dll msvcrt enable_msvcrt implib wine_fn_config_test dlls/msvcrt/tests msvcrt_test -wine_fn_config_dll msvcrt20 enable_msvcrt20 implib -wine_fn_config_dll msvcrt40 enable_msvcrt40 implib +wine_fn_config_dll msvcrt20 enable_msvcrt20 +wine_fn_config_dll msvcrt40 enable_msvcrt40 wine_fn_config_dll msvcrtd enable_msvcrtd implib wine_fn_config_test dlls/msvcrtd/tests msvcrtd_test wine_fn_config_dll msvfw32 enable_msvfw32 clean,implib @@ -17990,7 +17990,7 @@ wine_fn_config_dll secur32 enable_secur32 implib wine_fn_config_test dlls/secur32/tests secur32_test wine_fn_config_dll security enable_security wine_fn_config_dll sensapi enable_sensapi implib -wine_fn_config_dll serialui enable_serialui clean,implib +wine_fn_config_dll serialui enable_serialui clean wine_fn_config_test dlls/serialui/tests serialui_test wine_fn_config_dll setupapi enable_setupapi clean,implib wine_fn_config_test dlls/setupapi/tests setupapi_test diff --git a/configure.ac b/configure.ac index e42e35d..bf3fb1f 100644 --- a/configure.ac +++ b/configure.ac @@ -2783,7 +2783,7 @@ WINE_CONFIG_DLL(comsvcs,,[implib]) WINE_CONFIG_DLL(connect) WINE_CONFIG_DLL(credui,,[clean,implib]) WINE_CONFIG_TEST(dlls/credui/tests) -WINE_CONFIG_DLL(crtdll,,[implib]) +WINE_CONFIG_DLL(crtdll) WINE_CONFIG_DLL(crypt32,,[clean,implib]) WINE_CONFIG_TEST(dlls/crypt32/tests) WINE_CONFIG_DLL(cryptdlg,,[clean]) @@ -2795,7 +2795,7 @@ WINE_CONFIG_DLL(cryptui,,[clean,implib]) WINE_CONFIG_TEST(dlls/cryptui/tests) WINE_CONFIG_DLL(ctapi32) WINE_CONFIG_DLL(ctl3d.dll16,enable_win16) -WINE_CONFIG_DLL(ctl3d32,,[implib]) +WINE_CONFIG_DLL(ctl3d32) WINE_CONFIG_DLL(ctl3dv2.dll16,enable_win16) WINE_CONFIG_DLL(d2d1,,[implib]) WINE_CONFIG_TEST(dlls/d2d1/tests) @@ -2825,7 +2825,7 @@ WINE_CONFIG_DLL(d3dcompiler_43,,[implib],[d3dcompiler]) WINE_CONFIG_TEST(dlls/d3dcompiler_43/tests) WINE_CONFIG_DLL(d3dcompiler_46) WINE_CONFIG_DLL(d3dcompiler_47) -WINE_CONFIG_DLL(d3dim,,[implib]) +WINE_CONFIG_DLL(d3dim) WINE_CONFIG_DLL(d3drm,,[implib]) WINE_CONFIG_TEST(dlls/d3drm/tests) WINE_CONFIG_DLL(d3dx10_33) @@ -2902,10 +2902,10 @@ WINE_CONFIG_DLL(dmsynth,,[clean]) WINE_CONFIG_TEST(dlls/dmsynth/tests) WINE_CONFIG_DLL(dmusic,,[clean]) WINE_CONFIG_TEST(dlls/dmusic/tests) -WINE_CONFIG_DLL(dmusic32,,[implib]) +WINE_CONFIG_DLL(dmusic32) WINE_CONFIG_DLL(dnsapi,,[implib]) WINE_CONFIG_TEST(dlls/dnsapi/tests) -WINE_CONFIG_DLL(dplay,,[implib]) +WINE_CONFIG_DLL(dplay) WINE_CONFIG_DLL(dplayx,,[clean,implib]) WINE_CONFIG_TEST(dlls/dplayx/tests) WINE_CONFIG_DLL(dpnaddr) @@ -3114,8 +3114,8 @@ WINE_CONFIG_DLL(msvcr90,,[implib]) WINE_CONFIG_TEST(dlls/msvcr90/tests) WINE_CONFIG_DLL(msvcrt,,[implib]) WINE_CONFIG_TEST(dlls/msvcrt/tests) -WINE_CONFIG_DLL(msvcrt20,,[implib]) -WINE_CONFIG_DLL(msvcrt40,,[implib]) +WINE_CONFIG_DLL(msvcrt20) +WINE_CONFIG_DLL(msvcrt40) WINE_CONFIG_DLL(msvcrtd,,[implib]) WINE_CONFIG_TEST(dlls/msvcrtd/tests) WINE_CONFIG_DLL(msvfw32,,[clean,implib]) @@ -3236,7 +3236,7 @@ WINE_CONFIG_DLL(secur32,,[implib]) WINE_CONFIG_TEST(dlls/secur32/tests) WINE_CONFIG_DLL(security) WINE_CONFIG_DLL(sensapi,,[implib]) -WINE_CONFIG_DLL(serialui,,[clean,implib]) +WINE_CONFIG_DLL(serialui,,[clean]) WINE_CONFIG_TEST(dlls/serialui/tests) WINE_CONFIG_DLL(setupapi,,[clean,implib]) WINE_CONFIG_TEST(dlls/setupapi/tests) diff --git a/dlls/crtdll/Makefile.in b/dlls/crtdll/Makefile.in index 3d99961..cc10afb 100644 --- a/dlls/crtdll/Makefile.in +++ b/dlls/crtdll/Makefile.in @@ -1,5 +1,4 @@ MODULE = crtdll.dll -IMPORTLIB = crtdll IMPORTS = msvcrt C_SRCS = \ diff --git a/dlls/ctl3d32/Makefile.in b/dlls/ctl3d32/Makefile.in index b5deb1f..eb4b2ba 100644 --- a/dlls/ctl3d32/Makefile.in +++ b/dlls/ctl3d32/Makefile.in @@ -1,5 +1,4 @@ MODULE = ctl3d32.dll -IMPORTLIB = ctl3d32 IMPORTS = user32 C_SRCS = ctl3d32.c diff --git a/dlls/d3dim/Makefile.in b/dlls/d3dim/Makefile.in index b0e2881..d1334bb 100644 --- a/dlls/d3dim/Makefile.in +++ b/dlls/d3dim/Makefile.in @@ -1,5 +1,4 @@ MODULE = d3dim.dll -IMPORTLIB = d3dim C_SRCS = d3dim_main.c diff --git a/dlls/dmusic32/Makefile.in b/dlls/dmusic32/Makefile.in index 6aa72b7..0b0e250 100644 --- a/dlls/dmusic32/Makefile.in +++ b/dlls/dmusic32/Makefile.in @@ -1,5 +1,4 @@ MODULE = dmusic32.dll -IMPORTLIB = dmusic32 IMPORTS = uuid C_SRCS = \ diff --git a/dlls/dplay/Makefile.in b/dlls/dplay/Makefile.in index 7b5da87..b13c0c0 100644 --- a/dlls/dplay/Makefile.in +++ b/dlls/dplay/Makefile.in @@ -1,5 +1,4 @@ MODULE = dplay.dll -IMPORTLIB = dplay IMPORTS = dplayx RC_SRCS = version.rc diff --git a/dlls/msvcrt20/Makefile.in b/dlls/msvcrt20/Makefile.in index b8a8f63..17861a6 100644 --- a/dlls/msvcrt20/Makefile.in +++ b/dlls/msvcrt20/Makefile.in @@ -1,6 +1,5 @@ EXTRADEFS = -DUSE_MSVCRT_PREFIX MODULE = msvcrt20.dll -IMPORTLIB = msvcrt20 IMPORTS = msvcrt C_SRCS = msvcrt20.c diff --git a/dlls/msvcrt40/Makefile.in b/dlls/msvcrt40/Makefile.in index 6c2df22..57bca5b 100644 --- a/dlls/msvcrt40/Makefile.in +++ b/dlls/msvcrt40/Makefile.in @@ -1,6 +1,5 @@ EXTRADEFS = -DUSE_MSVCRT_PREFIX MODULE = msvcrt40.dll -IMPORTLIB = msvcrt40 IMPORTS = msvcrt C_SRCS = \ diff --git a/dlls/serialui/Makefile.in b/dlls/serialui/Makefile.in index 9ac3707..6c22afd 100644 --- a/dlls/serialui/Makefile.in +++ b/dlls/serialui/Makefile.in @@ -1,5 +1,4 @@ MODULE = serialui.dll -IMPORTLIB = serialui IMPORTS = user32 advapi32 C_SRCS = \

1 0