January 2014 - Wine-Commits

Stefan Dösinger : d3dx9_36: Make the order parameter of weightedcapintegrale an UINT.
by Alexandre Julliard Jan. 6, 2014

Jan. 6, 2014

Module: wine Branch: master Commit: b87e167fa33a67d793c66b5bb06c3f18d8c5c4df URL: http://source.winehq.org/git/wine.git/?a=commit;h=b87e167fa33a67d793c66b5bb… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Jan 3 14:17:19 2014 +0100 d3dx9_36: Make the order parameter of weightedcapintegrale an UINT. --- dlls/d3dx9_36/math.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3dx9_36/math.c b/dlls/d3dx9_36/math.c index a5dbee1..f98927f 100644 --- a/dlls/d3dx9_36/math.c +++ b/dlls/d3dx9_36/math.c @@ -2286,7 +2286,7 @@ FLOAT WINAPI D3DXSHDot(UINT order, const FLOAT *a, const FLOAT *b) return s; } -static void weightedcapintegrale(FLOAT *out, FLOAT order, FLOAT angle) +static void weightedcapintegrale(FLOAT *out, UINT order, FLOAT angle) { FLOAT coeff[3];

1 0

Stefan Dösinger : d3dx9_36: Cast D3DPARAMETER_TYPE * to DWORD *.
by Alexandre Julliard Jan. 6, 2014

Jan. 6, 2014

Module: wine Branch: master Commit: e1a845c2139064f0b8bf7cd5e78e2ccd682ac589 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e1a845c2139064f0b8bf7cd5e… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Jan 3 14:17:16 2014 +0100 d3dx9_36: Cast D3DPARAMETER_TYPE * to DWORD *. --- dlls/d3dx9_36/effect.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 547e810..ac13c72 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -4398,10 +4398,10 @@ static HRESULT d3dx9_parse_effect_typedef(struct d3dx_parameter *param, const ch if (!parent) { - read_dword(ptr, &param->type); + read_dword(ptr, (DWORD *)&param->type); TRACE("Type: %s\n", debug_d3dxparameter_type(param->type)); - read_dword(ptr, &param->class); + read_dword(ptr, (DWORD *)&param->class); TRACE("Class: %s\n", debug_d3dxparameter_class(param->class)); read_dword(ptr, &offset);

1 0

Jacek Caban : strmbase: Store BasePinFuncTable inside Base*PinFuncTable structs.
by Alexandre Julliard Jan. 6, 2014

Jan. 6, 2014

Module: wine Branch: master Commit: 289bdc4f4538ce9608344ae894a0f099db971846 URL: http://source.winehq.org/git/wine.git/?a=commit;h=289bdc4f4538ce9608344ae89… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jan 6 17:54:13 2014 +0100 strmbase: Store BasePinFuncTable inside Base*PinFuncTable structs. --- dlls/amstream/mediastreamfilter.c | 15 +++++++-------- dlls/qcap/avico.c | 32 ++++++++++++++------------------ dlls/qcap/avimux.c | 32 ++++++++++++++------------------ dlls/qcap/vfwcapture.c | 15 +++++++-------- dlls/quartz/filesource.c | 15 +++++++-------- dlls/quartz/parser.c | 15 +++++++-------- dlls/strmbase/pin.c | 24 ++++++++++++------------ dlls/strmbase/renderer.c | 17 ++++++++--------- dlls/strmbase/transform.c | 30 ++++++++++++++---------------- dlls/winegstreamer/gstdemux.c | 15 +++++++-------- dlls/wineqtdecoder/qtsplitter.c | 15 +++++++-------- include/wine/strmbase.h | 7 +++++-- 12 files changed, 109 insertions(+), 123 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=289bdc4f4538ce9608344…

1 0

André Hentschel : Assorted spelling fixes.
by Alexandre Julliard Jan. 6, 2014

Jan. 6, 2014

Module: wine Branch: master Commit: 87c7c961f278af5e994e4774bdc2be17985256b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=87c7c961f278af5e994e4774b… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Jan 6 02:13:41 2014 +0100 Assorted spelling fixes. --- dlls/d3dx9_36/shader.c | 2 +- dlls/d3dx9_36/tests/effect.c | 2 +- dlls/mmdevapi/tests/render.c | 2 +- dlls/ntdll/tests/exception.c | 2 +- dlls/shell32/tests/shellpath.c | 2 +- dlls/winspool.drv/tests/info.c | 2 +- programs/winemenubuilder/winemenubuilder.c | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/d3dx9_36/shader.c b/dlls/d3dx9_36/shader.c index 460fe5a..955c2ad 100644 --- a/dlls/d3dx9_36/shader.c +++ b/dlls/d3dx9_36/shader.c @@ -1029,7 +1029,7 @@ static UINT set(struct ID3DXConstantTableImpl *table, IDirect3DDevice9 *device, UINT l, i, regcount = 1, regsize = 1, cin = 1, rin = 1, ret, last = 0; DWORD tmp; - /* size to small to set anything */ + /* size too small to set anything */ if (*size < desc->Rows * desc->Columns) { *size = 0; diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c index 54ae9f8..2306f1e 100644 --- a/dlls/d3dx9_36/tests/effect.c +++ b/dlls/d3dx9_36/tests/effect.c @@ -1715,7 +1715,7 @@ static void test_effect_parameter_value(IDirect3DDevice9 *device) /* check size */ ok(EFFECT_PARAMETER_VALUE_ARRAY_SIZE >= res_desc->Bytes / 4 + (res_desc->Elements ? res_desc->Bytes / 4 / res_desc->Elements : 0), - "%u - %s: Warning: Array size to small\n", i, res_full_name); + "%u - %s: Warning: Array size too small\n", i, res_full_name); test_effect_parameter_value_GetTestGroup(&res[k], effect, &blob[res_value_offset], parameter, i); test_effect_parameter_value_ResetValue(&res[k], effect, &blob[res_value_offset], parameter, i); diff --git a/dlls/mmdevapi/tests/render.c b/dlls/mmdevapi/tests/render.c index 38495df..4117cb3 100644 --- a/dlls/mmdevapi/tests/render.c +++ b/dlls/mmdevapi/tests/render.c @@ -884,7 +884,7 @@ static void test_clock(int share) hr = IAudioClient_GetDevicePeriod(ac, &defp, &minp); ok(hr == S_OK, "GetDevicePeriod failed: %08x\n", hr); - ok(minp <= period, "desired period %u to small for %u\n", (ULONG)period, (ULONG)minp); + ok(minp <= period, "desired period %u too small for %u\n", (ULONG)period, (ULONG)minp); if (share) { trace("Testing shared mode\n"); diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index 2ca1297..b4cbaf5 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -1065,7 +1065,7 @@ static void test_dpe_exceptions(void) DWORD val; ULONG len; - /* Query DEP with len to small */ + /* Query DEP with len too small */ stat = pNtQueryInformationProcess(GetCurrentProcess(), ProcessExecuteFlags, &val, sizeof val - 1, &len); if(stat == STATUS_INVALID_INFO_CLASS) { diff --git a/dlls/shell32/tests/shellpath.c b/dlls/shell32/tests/shellpath.c index 8bd5ab0..f3c40a5 100644 --- a/dlls/shell32/tests/shellpath.c +++ b/dlls/shell32/tests/shellpath.c @@ -2597,7 +2597,7 @@ static void test_DoEnvironmentSubst(void) " 0: got %s (expected %s)\n", wine_dbgstr_w(bufferW), wine_dbgstr_w(expectedW)); - /* buffer to small */ + /* Buffer too small */ /* result: FALSE / provided buffer length / the buffer is untouched */ memset(bufferA, '#', MAX_PATH - 1); bufferA[len + 2] = 0; diff --git a/dlls/winspool.drv/tests/info.c b/dlls/winspool.drv/tests/info.c index 7a6878a..71bf54b 100644 --- a/dlls/winspool.drv/tests/info.c +++ b/dlls/winspool.drv/tests/info.c @@ -1659,7 +1659,7 @@ static void test_GetPrintProcessorDirectory(void) res = GetPrintProcessorDirectoryA(NULL, NULL, 1, buffer, cbBuf*2, &pcbNeeded); ok(res, "returned %d with %d (expected '!= 0')\n", res, GetLastError()); - /* Buffer to small */ + /* Buffer too small */ buffer[0] = '\0'; SetLastError(0xdeadbeef); res = GetPrintProcessorDirectoryA( NULL, NULL, 1, buffer, cbBuf-1, &pcbNeeded); diff --git a/programs/winemenubuilder/winemenubuilder.c b/programs/winemenubuilder/winemenubuilder.c index 973bd02..afd3d96 100644 --- a/programs/winemenubuilder/winemenubuilder.c +++ b/programs/winemenubuilder/winemenubuilder.c @@ -820,7 +820,7 @@ static HRESULT open_module16_icon(LPCWSTR szFileName, int nIndex, IStream **ppSt iconDirPtr = (NE_NAMEINFO*)(((BYTE*)iconGroupResources) + sizeof(NE_TYPEINFO) + nIndex*sizeof(NE_NAMEINFO)); if ((((BYTE*)iconDirPtr) + sizeof(NE_NAMEINFO)) > (fileBytes + fileSize)) { - WINE_WARN("file to small for icon group NE_NAMEINFO\n"); + WINE_WARN("file too small for icon group NE_NAMEINFO\n"); goto end; } iconDir = (GRPICONDIR*)(fileBytes + (iconDirPtr->offset << alignmentShiftCount));

1 0

Frédéric Delanoy : gdi32: Use BOOL type where appropriate.
by Alexandre Julliard Jan. 6, 2014

Jan. 6, 2014

Module: wine Branch: master Commit: e7594272feedd3125e8331631d53e72c20d8a6a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e7594272feedd3125e8331631… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Jan 4 15:48:21 2014 +0100 gdi32: Use BOOL type where appropriate. --- dlls/gdi32/region.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/region.c b/dlls/gdi32/region.c index 062272d..2632de5 100644 --- a/dlls/gdi32/region.c +++ b/dlls/gdi32/region.c @@ -2523,7 +2523,7 @@ static void REGION_loadAET( struct list *AET, struct list *ETEs ) static void REGION_computeWAET( struct list *AET, struct list *WETE ) { struct edge_table_entry *active; - int inside = 1; + BOOL inside = TRUE; int isInside = 0; list_init( WETE );

1 0

André Hentschel : ws2_32: Don't leak hostname ( Coverity).
by Alexandre Julliard Jan. 6, 2014

Jan. 6, 2014

Module: wine Branch: master Commit: 57d2e8f3c398e3d02dbac9b17dc6c5a493c65169 URL: http://source.winehq.org/git/wine.git/?a=commit;h=57d2e8f3c398e3d02dbac9b17… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat Jan 4 18:36:34 2014 +0100 ws2_32: Don't leak hostname (Coverity). --- dlls/ws2_32/socket.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 12838da..b027d7a 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -5479,6 +5479,7 @@ int WINAPI WS_getaddrinfo(LPCSTR nodename, LPCSTR servname, const struct WS_addr if (punixhints->ai_socktype < 0) { WSASetLastError(WSAESOCKTNOSUPPORT); + HeapFree(GetProcessHeap(), 0, hostname); return SOCKET_ERROR; }

1 0

André Hentschel : kernel32/tests: Allow more last errors from win8.
by Alexandre Julliard Jan. 6, 2014

Jan. 6, 2014

Module: wine Branch: master Commit: 6db63a1867c556eaa21f2456b87e428ef5bded23 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6db63a1867c556eaa21f2456b… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat Jan 4 18:35:14 2014 +0100 kernel32/tests: Allow more last errors from win8. --- dlls/kernel32/tests/console.c | 78 +++++++++++++++++++++-------------------- 1 files changed, 40 insertions(+), 38 deletions(-) diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index cd7ac23..7c43663 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -1375,7 +1375,7 @@ static void test_WriteConsoleInputA(HANDLE input_handle) INPUT_RECORD event_list[5]; MOUSE_EVENT_RECORD mouse_event = { {0, 0}, 0, 0, MOUSE_MOVED }; KEY_EVENT_RECORD key_event; - DWORD count, console_mode; + DWORD count, console_mode, gle; BOOL ret; int i; @@ -1386,31 +1386,31 @@ static void test_WriteConsoleInputA(HANDLE input_handle) DWORD count; LPDWORD written; DWORD expected_count; - DWORD last_error; + DWORD gle, gle2; int win_crash; } invalid_table[] = { - {NULL, NULL, 0, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, + {NULL, NULL, 0, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 0, 1}, {NULL, NULL, 0, &count, 0, ERROR_INVALID_HANDLE}, - {NULL, NULL, 1, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, - {NULL, NULL, 1, &count, 0xdeadbeef, ERROR_INVALID_ACCESS}, - {NULL, &event, 0, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, + {NULL, NULL, 1, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 0, 1}, + {NULL, NULL, 1, &count, 0xdeadbeef, ERROR_NOACCESS, ERROR_INVALID_ACCESS}, + {NULL, &event, 0, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 0, 1}, {NULL, &event, 0, &count, 0, ERROR_INVALID_HANDLE}, - {NULL, &event, 1, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, + {NULL, &event, 1, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 0, 1}, {NULL, &event, 1, &count, 0, ERROR_INVALID_HANDLE}, - {INVALID_HANDLE_VALUE, NULL, 0, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, + {INVALID_HANDLE_VALUE, NULL, 0, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 0, 1}, {INVALID_HANDLE_VALUE, NULL, 0, &count, 0, ERROR_INVALID_HANDLE}, - {INVALID_HANDLE_VALUE, NULL, 1, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, + {INVALID_HANDLE_VALUE, NULL, 1, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 0, 1}, {INVALID_HANDLE_VALUE, NULL, 1, &count, 0xdeadbeef, ERROR_INVALID_ACCESS}, - {INVALID_HANDLE_VALUE, &event, 0, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, + {INVALID_HANDLE_VALUE, &event, 0, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 0, 1}, {INVALID_HANDLE_VALUE, &event, 0, &count, 0, ERROR_INVALID_HANDLE}, - {INVALID_HANDLE_VALUE, &event, 1, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, + {INVALID_HANDLE_VALUE, &event, 1, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 0, 1}, {INVALID_HANDLE_VALUE, &event, 1, &count, 0, ERROR_INVALID_HANDLE}, - {input_handle, NULL, 0, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, - {input_handle, NULL, 1, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, - {input_handle, NULL, 1, &count, 0xdeadbeef, ERROR_INVALID_ACCESS}, - {input_handle, &event, 0, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, - {input_handle, &event, 1, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, + {input_handle, NULL, 0, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 0, 1}, + {input_handle, NULL, 1, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 0, 1}, + {input_handle, NULL, 1, &count, 0xdeadbeef, ERROR_NOACCESS, ERROR_INVALID_ACCESS}, + {input_handle, &event, 0, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 0, 1}, + {input_handle, &event, 1, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 0, 1}, }; /* Suppress external sources of input events for the duration of the test. */ @@ -1455,9 +1455,10 @@ static void test_WriteConsoleInputA(HANDLE input_handle) "[%d] Expected output count to be %u, got %u\n", i, invalid_table[i].expected_count, count); } - ok(GetLastError() == invalid_table[i].last_error, - "[%d] Expected last error to be %u, got %u\n", - i, invalid_table[i].last_error, GetLastError()); + gle = GetLastError(); + ok(gle == invalid_table[i].gle || (gle != 0 && gle == invalid_table[i].gle2), + "[%d] Expected last error to be %u or %u, got %u\n", + i, invalid_table[i].gle, invalid_table[i].gle2, gle); } count = 0xdeadbeef; @@ -1618,7 +1619,7 @@ static void test_WriteConsoleInputW(HANDLE input_handle) INPUT_RECORD event_list[5]; MOUSE_EVENT_RECORD mouse_event = { {0, 0}, 0, 0, MOUSE_MOVED }; KEY_EVENT_RECORD key_event; - DWORD count, console_mode; + DWORD count, console_mode, gle; BOOL ret; int i; @@ -1629,31 +1630,31 @@ static void test_WriteConsoleInputW(HANDLE input_handle) DWORD count; LPDWORD written; DWORD expected_count; - DWORD last_error; + DWORD gle, gle2; int win_crash; } invalid_table[] = { - {NULL, NULL, 0, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, + {NULL, NULL, 0, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 0, 1}, {NULL, NULL, 0, &count, 0, ERROR_INVALID_HANDLE}, - {NULL, NULL, 1, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, - {NULL, NULL, 1, &count, 0xdeadbeef, ERROR_INVALID_ACCESS}, - {NULL, &event, 0, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, + {NULL, NULL, 1, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 0, 1}, + {NULL, NULL, 1, &count, 0xdeadbeef, ERROR_NOACCESS, ERROR_INVALID_ACCESS}, + {NULL, &event, 0, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 0, 1}, {NULL, &event, 0, &count, 0, ERROR_INVALID_HANDLE}, - {NULL, &event, 1, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, + {NULL, &event, 1, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 0, 1}, {NULL, &event, 1, &count, 0, ERROR_INVALID_HANDLE}, - {INVALID_HANDLE_VALUE, NULL, 0, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, + {INVALID_HANDLE_VALUE, NULL, 0, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 0, 1}, {INVALID_HANDLE_VALUE, NULL, 0, &count, 0, ERROR_INVALID_HANDLE}, - {INVALID_HANDLE_VALUE, NULL, 1, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, + {INVALID_HANDLE_VALUE, NULL, 1, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 0, 1}, {INVALID_HANDLE_VALUE, NULL, 1, &count, 0xdeadbeef, ERROR_INVALID_ACCESS}, - {INVALID_HANDLE_VALUE, &event, 0, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, + {INVALID_HANDLE_VALUE, &event, 0, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 0, 1}, {INVALID_HANDLE_VALUE, &event, 0, &count, 0, ERROR_INVALID_HANDLE}, - {INVALID_HANDLE_VALUE, &event, 1, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, + {INVALID_HANDLE_VALUE, &event, 1, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 0, 1}, {INVALID_HANDLE_VALUE, &event, 1, &count, 0, ERROR_INVALID_HANDLE}, - {input_handle, NULL, 0, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, - {input_handle, NULL, 1, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, - {input_handle, NULL, 1, &count, 0xdeadbeef, ERROR_INVALID_ACCESS}, - {input_handle, &event, 0, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, - {input_handle, &event, 1, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, + {input_handle, NULL, 0, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 0, 1}, + {input_handle, NULL, 1, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 0, 1}, + {input_handle, NULL, 1, &count, 0xdeadbeef, ERROR_NOACCESS, ERROR_INVALID_ACCESS}, + {input_handle, &event, 0, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 0, 1}, + {input_handle, &event, 1, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 0, 1}, }; /* Suppress external sources of input events for the duration of the test. */ @@ -1698,9 +1699,10 @@ static void test_WriteConsoleInputW(HANDLE input_handle) "[%d] Expected output count to be %u, got %u\n", i, invalid_table[i].expected_count, count); } - ok(GetLastError() == invalid_table[i].last_error, - "[%d] Expected last error to be %u, got %u\n", - i, invalid_table[i].last_error, GetLastError()); + gle = GetLastError(); + ok(gle == invalid_table[i].gle || (gle != 0 && gle == invalid_table[i].gle2), + "[%d] Expected last error to be %u or %u, got %u\n", + i, invalid_table[i].gle, invalid_table[i].gle2, gle); } count = 0xdeadbeef;

1 0

Frédéric Delanoy : msi/tests: Use BOOL type where appropriate.
by Alexandre Julliard Jan. 6, 2014

Jan. 6, 2014

Module: wine Branch: master Commit: a06363669f6322b535590f23d8e2393425e4c5b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a06363669f6322b535590f23d… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Jan 4 15:48:22 2014 +0100 msi/tests: Use BOOL type where appropriate. --- dlls/msi/tests/package.c | 472 +++++++++++++++++++++++----------------------- 1 files changed, 236 insertions(+), 236 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a06363669f6322b535590…

1 0

Michael Stefaniuc : dmusic: Don' t hardcode the guidClass in IDirectMusicObject::ParseDescriptor.
by Alexandre Julliard Jan. 6, 2014

Jan. 6, 2014

Module: wine Branch: master Commit: 84df351b1e246b8bc214f147ba6bc4ba4a15ab14 URL: http://source.winehq.org/git/wine.git/?a=commit;h=84df351b1e246b8bc214f147b… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Jan 6 00:01:53 2014 +0100 dmusic: Don't hardcode the guidClass in IDirectMusicObject::ParseDescriptor. --- dlls/dmusic/collection.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/dmusic/collection.c b/dlls/dmusic/collection.c index 4c6a034..20380fe 100644 --- a/dlls/dmusic/collection.c +++ b/dlls/dmusic/collection.c @@ -269,7 +269,7 @@ static HRESULT WINAPI IDirectMusicCollectionImpl_IDirectMusicObject_ParseDescrip /* FIXME: should this be determined from stream? */ desc->dwValidData |= DMUS_OBJ_CLASS; - desc->guidClass = CLSID_DirectMusicCollection; + desc->guidClass = This->pDesc->guidClass; hr = read_from_stream(stream, &chunk, sizeof(FOURCC) + sizeof(DWORD)); if (FAILED(hr))

1 0

Frédéric Delanoy : setupapi/tests: Use BOOL type where appropriate.
by Alexandre Julliard Jan. 6, 2014

Jan. 6, 2014

Module: wine Branch: master Commit: 4ec00cb2c2ba4a8847cdef73fc49aecbbf903c62 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ec00cb2c2ba4a8847cdef73f… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Jan 4 15:48:24 2014 +0100 setupapi/tests: Use BOOL type where appropriate. --- dlls/setupapi/tests/diskspace.c | 8 +++--- dlls/setupapi/tests/parser.c | 54 +++++++++++++++++++------------------- 2 files changed, 31 insertions(+), 31 deletions(-) diff --git a/dlls/setupapi/tests/diskspace.c b/dlls/setupapi/tests/diskspace.c index 573eb73..4e87ea9 100644 --- a/dlls/setupapi/tests/diskspace.c +++ b/dlls/setupapi/tests/diskspace.c @@ -29,6 +29,8 @@ #include "wine/test.h" +static BOOL is_win9x; + static void test_SetupCreateDiskSpaceListA(void) { HDSKSPC ret; @@ -149,8 +151,6 @@ static void test_SetupCreateDiskSpaceListW(void) static void test_SetupDuplicateDiskSpaceListA(void) { HDSKSPC handle, duplicate; - int is_win9x = !SetupCreateDiskSpaceListW((void *)0xdeadbeef, 0xdeadbeef, 0) && - GetLastError() == ERROR_CALL_NOT_IMPLEMENTED; if (is_win9x) win_skip("SetupDuplicateDiskSpaceListA crashes with NULL disk space handle on Win9x\n"); @@ -305,8 +305,6 @@ static void test_SetupQuerySpaceRequiredOnDriveA(void) BOOL ret; HDSKSPC handle; LONGLONG space; - int is_win9x = !SetupCreateDiskSpaceListW((void *)0xdeadbeef, 0xdeadbeef, 0) && - GetLastError() == ERROR_CALL_NOT_IMPLEMENTED; if (is_win9x) win_skip("SetupQuerySpaceRequiredOnDriveA crashes with NULL disk space handle on Win9x\n"); @@ -476,6 +474,8 @@ static void test_SetupQuerySpaceRequiredOnDriveW(void) START_TEST(diskspace) { + is_win9x = !SetupCreateDiskSpaceListW((void *)0xdeadbeef, 0xdeadbeef, 0) && + GetLastError() == ERROR_CALL_NOT_IMPLEMENTED; test_SetupCreateDiskSpaceListA(); test_SetupCreateDiskSpaceListW(); test_SetupDuplicateDiskSpaceListA(); diff --git a/dlls/setupapi/tests/parser.c b/dlls/setupapi/tests/parser.c index bd3132c..c2d554a 100644 --- a/dlls/setupapi/tests/parser.c +++ b/dlls/setupapi/tests/parser.c @@ -103,36 +103,36 @@ static const struct const char *data; DWORD error; UINT err_line; - int todo; + BOOL todo; } invalid_files[] = { /* file contents expected error (or 0) errline todo */ - { "\r\n", ERROR_WRONG_INF_STYLE, 0, 0 }, - { "abcd\r\n", ERROR_WRONG_INF_STYLE, 0, 1 }, - { "[Version]\r\n", ERROR_WRONG_INF_STYLE, 0, 0 }, - { "[Version]\nSignature=", ERROR_WRONG_INF_STYLE, 0, 0 }, - { "[Version]\nSignature=foo", ERROR_WRONG_INF_STYLE, 0, 0 }, - { "[version]\nsignature=$chicago$", 0, 0, 0 }, - { "[VERSION]\nSIGNATURE=$CHICAGO$", 0, 0, 0 }, - { "[Version]\nSignature=$chicago$,abcd", 0, 0, 0 }, - { "[Version]\nabc=def\nSignature=$chicago$", 0, 0, 0 }, - { "[Version]\nabc=def\n[Version]\nSignature=$chicago$", 0, 0, 0 }, - { STD_HEADER, 0, 0, 0 }, - { STD_HEADER "[]\r\n", 0, 0, 0 }, - { STD_HEADER "]\r\n", 0, 0, 0 }, - { STD_HEADER "[" A255 "]\r\n", 0, 0, 0 }, - { STD_HEADER "[ab\r\n", ERROR_BAD_SECTION_NAME_LINE, 3, 0 }, - { STD_HEADER "\n\n[ab\x1a]\n", ERROR_BAD_SECTION_NAME_LINE, 5, 0 }, - { STD_HEADER "[" A256 "]\r\n", ERROR_SECTION_NAME_TOO_LONG, 3, 0 }, - { "[abc]\n" STD_HEADER, 0, 0, 0 }, - { "abc\r\n" STD_HEADER, ERROR_EXPECTED_SECTION_NAME, 1, 0 }, - { ";\n;\nabc\r\n" STD_HEADER, ERROR_EXPECTED_SECTION_NAME, 3, 0 }, - { ";\n;\nab\nab\n" STD_HEADER, ERROR_EXPECTED_SECTION_NAME, 3, 0 }, - { ";aa\n;bb\n" STD_HEADER, 0, 0, 0 }, - { STD_HEADER " [TestSection\x00]\n", ERROR_BAD_SECTION_NAME_LINE, 3, 0 }, - { STD_HEADER " [Test\x00Section]\n", ERROR_BAD_SECTION_NAME_LINE, 3, 0 }, - { STD_HEADER " [TestSection\x00]\n", ERROR_BAD_SECTION_NAME_LINE, 3, 0 }, - { STD_HEADER " [Test\x00Section]\n", ERROR_BAD_SECTION_NAME_LINE, 3, 0 }, + { "\r\n", ERROR_WRONG_INF_STYLE, 0, FALSE }, + { "abcd\r\n", ERROR_WRONG_INF_STYLE, 0, TRUE }, + { "[Version]\r\n", ERROR_WRONG_INF_STYLE, 0, FALSE }, + { "[Version]\nSignature=", ERROR_WRONG_INF_STYLE, 0, FALSE }, + { "[Version]\nSignature=foo", ERROR_WRONG_INF_STYLE, 0, FALSE }, + { "[version]\nsignature=$chicago$", 0, 0, FALSE }, + { "[VERSION]\nSIGNATURE=$CHICAGO$", 0, 0, FALSE }, + { "[Version]\nSignature=$chicago$,abcd", 0, 0, FALSE }, + { "[Version]\nabc=def\nSignature=$chicago$", 0, 0, FALSE }, + { "[Version]\nabc=def\n[Version]\nSignature=$chicago$", 0, 0, FALSE }, + { STD_HEADER, 0, 0, FALSE }, + { STD_HEADER "[]\r\n", 0, 0, FALSE }, + { STD_HEADER "]\r\n", 0, 0, FALSE }, + { STD_HEADER "[" A255 "]\r\n", 0, 0, FALSE }, + { STD_HEADER "[ab\r\n", ERROR_BAD_SECTION_NAME_LINE, 3, FALSE }, + { STD_HEADER "\n\n[ab\x1a]\n", ERROR_BAD_SECTION_NAME_LINE, 5, FALSE }, + { STD_HEADER "[" A256 "]\r\n", ERROR_SECTION_NAME_TOO_LONG, 3, FALSE }, + { "[abc]\n" STD_HEADER, 0, 0, FALSE }, + { "abc\r\n" STD_HEADER, ERROR_EXPECTED_SECTION_NAME, 1, FALSE }, + { ";\n;\nabc\r\n" STD_HEADER, ERROR_EXPECTED_SECTION_NAME, 3, FALSE }, + { ";\n;\nab\nab\n" STD_HEADER, ERROR_EXPECTED_SECTION_NAME, 3, FALSE }, + { ";aa\n;bb\n" STD_HEADER, 0, 0, FALSE }, + { STD_HEADER " [TestSection\x00]\n", ERROR_BAD_SECTION_NAME_LINE, 3, FALSE }, + { STD_HEADER " [Test\x00Section]\n", ERROR_BAD_SECTION_NAME_LINE, 3, FALSE }, + { STD_HEADER " [TestSection\x00]\n", ERROR_BAD_SECTION_NAME_LINE, 3, FALSE }, + { STD_HEADER " [Test\x00Section]\n", ERROR_BAD_SECTION_NAME_LINE, 3, FALSE }, }; static void test_invalid_files(void)

1 0

André Hentschel : msi: Check return value from MSIREG_OpenInstallProps (Coverity).
by Alexandre Julliard Jan. 6, 2014

Jan. 6, 2014

Module: wine Branch: master Commit: 2d6685f4ecd5c183a42e9e1f9a08017e0efe53d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d6685f4ecd5c183a42e9e1f9… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat Jan 4 19:17:01 2014 +0100 msi: Check return value from MSIREG_OpenInstallProps (Coverity). --- dlls/msi/msi.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/msi/msi.c b/dlls/msi/msi.c index f8a1874..5b344ca 100644 --- a/dlls/msi/msi.c +++ b/dlls/msi/msi.c @@ -1138,8 +1138,6 @@ static UINT MSI_GetProductInfo(LPCWSTR szProduct, LPCWSTR szAttribute, context = MSIINSTALLCONTEXT_MACHINE; } - MSIREG_OpenInstallProps(szProduct, context, NULL, &userdata, FALSE); - if (!strcmpW( szAttribute, INSTALLPROPERTY_HELPLINKW ) || !strcmpW( szAttribute, INSTALLPROPERTY_HELPTELEPHONEW ) || !strcmpW( szAttribute, INSTALLPROPERTY_INSTALLDATEW ) || @@ -1162,9 +1160,11 @@ static UINT MSI_GetProductInfo(LPCWSTR szProduct, LPCWSTR szAttribute, r = ERROR_UNKNOWN_PRODUCT; goto done; } - - if (!userdata) - return ERROR_UNKNOWN_PROPERTY; + if (MSIREG_OpenInstallProps(szProduct, context, NULL, &userdata, FALSE)) + { + r = ERROR_UNKNOWN_PROPERTY; + goto done; + } if (!strcmpW( szAttribute, INSTALLPROPERTY_INSTALLEDPRODUCTNAMEW )) szAttribute = display_name; @@ -1174,6 +1174,7 @@ static UINT MSI_GetProductInfo(LPCWSTR szProduct, LPCWSTR szAttribute, val = msi_reg_get_value(userdata, szAttribute, &type); if (!val) val = empty; + RegCloseKey(userdata); } else if (!strcmpW( szAttribute, INSTALLPROPERTY_INSTANCETYPEW ) || !strcmpW( szAttribute, INSTALLPROPERTY_TRANSFORMSW ) || @@ -1266,7 +1267,6 @@ static UINT MSI_GetProductInfo(LPCWSTR szProduct, LPCWSTR szAttribute, done: RegCloseKey(prodkey); - RegCloseKey(userdata); return r; }

1 0

André Hentschel : libwine: Added LDT support for GNU/ Hurd.
by Alexandre Julliard Jan. 6, 2014

Jan. 6, 2014

Module: wine Branch: master Commit: 02e6f7d146a35b5a86655c1c1e562f458bfbb74c URL: http://source.winehq.org/git/wine.git/?a=commit;h=02e6f7d146a35b5a86655c1c1… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Jan 6 02:31:08 2014 +0100 libwine: Added LDT support for GNU/Hurd. Based on a patch by Andrew Nguyen. --- libs/wine/ldt.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/libs/wine/ldt.c b/libs/wine/ldt.c index 5175e9c..0946407 100644 --- a/libs/wine/ldt.c +++ b/libs/wine/ldt.c @@ -92,6 +92,11 @@ static inline int set_thread_area( struct modify_ldt_s *ptr ) #include <machine/sysarch.h> #endif /* __NetBSD__ || __FreeBSD__ || __OpenBSD__ */ +#ifdef __GNU__ +#include <mach/i386/mach_i386.h> +#include <mach/mach_traps.h> +#endif + #ifdef __APPLE__ #include <i386/user_ldt.h> #endif @@ -203,6 +208,9 @@ static int internal_set_entry( unsigned short sel, const LDT_ENTRY *entry ) #elif defined(__APPLE__) if ((ret = i386_set_ldt(index, (union ldt_entry *)entry, 1)) < 0) perror("i386_set_ldt"); +#elif defined(__GNU__) + if ((ret = i386_set_ldt(mach_thread_self(), sel, (descriptor_list_t)entry, 1)) != KERN_SUCCESS) + perror("i386_set_ldt"); #else fprintf( stderr, "No LDT support on this platform\n" ); exit(1);

1 0

Frédéric Delanoy : msxml3/tests: Use BOOL type where appropriate.
by Alexandre Julliard Jan. 6, 2014

Jan. 6, 2014

Module: wine Branch: master Commit: 949f1a0161e5453ddc1d119a56b97b9db173be2b URL: http://source.winehq.org/git/wine.git/?a=commit;h=949f1a0161e5453ddc1d119a5… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Jan 4 15:48:23 2014 +0100 msxml3/tests: Use BOOL type where appropriate. --- dlls/msxml3/tests/saxreader.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/msxml3/tests/saxreader.c b/dlls/msxml3/tests/saxreader.c index e1bcf5e..8778bb6 100644 --- a/dlls/msxml3/tests/saxreader.c +++ b/dlls/msxml3/tests/saxreader.c @@ -2671,14 +2671,14 @@ struct enc_test_entry_t { const char *clsid; const char *data; HRESULT hr; - int todo; + BOOL todo; }; static const struct enc_test_entry_t encoding_test_data[] = { - { &CLSID_SAXXMLReader, "CLSID_SAXXMLReader", UTF8BOMTest, 0xc00ce56f, 1 }, - { &CLSID_SAXXMLReader30, "CLSID_SAXXMLReader30", UTF8BOMTest, 0xc00ce56f, 1 }, - { &CLSID_SAXXMLReader40, "CLSID_SAXXMLReader40", UTF8BOMTest, S_OK, 0 }, - { &CLSID_SAXXMLReader60, "CLSID_SAXXMLReader60", UTF8BOMTest, S_OK, 0 }, + { &CLSID_SAXXMLReader, "CLSID_SAXXMLReader", UTF8BOMTest, 0xc00ce56f, TRUE }, + { &CLSID_SAXXMLReader30, "CLSID_SAXXMLReader30", UTF8BOMTest, 0xc00ce56f, TRUE }, + { &CLSID_SAXXMLReader40, "CLSID_SAXXMLReader40", UTF8BOMTest, S_OK, FALSE }, + { &CLSID_SAXXMLReader60, "CLSID_SAXXMLReader60", UTF8BOMTest, S_OK, FALSE }, { 0 } };

1 0

André Hentschel : ntdll: Add signal definitions for GNU/Hurd.
by Alexandre Julliard Jan. 6, 2014

Jan. 6, 2014

Module: wine Branch: master Commit: 5865fe78de685e2a5c7e05fa22449382884758dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=5865fe78de685e2a5c7e05fa2… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Jan 6 02:32:43 2014 +0100 ntdll: Add signal definitions for GNU/Hurd. Partially based on a patch by Andrew Nguyen. --- dlls/ntdll/signal_i386.c | 27 +++++++++++++++++++++++++++ 1 files changed, 27 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index fe6d517..63bf088 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -434,6 +434,33 @@ typedef ucontext_t SIGCONTEXT; #define T_MCHK T_MCA #define T_XMMFLT T_XMM +#elif defined(__GNU__) +typedef ucontext_t SIGCONTEXT; + +#define EAX_sig(context) ((context)->uc_mcontext.gregs[REG_EAX]) +#define EBX_sig(context) ((context)->uc_mcontext.gregs[REG_EBX]) +#define ECX_sig(context) ((context)->uc_mcontext.gregs[REG_ECX]) +#define EDX_sig(context) ((context)->uc_mcontext.gregs[REG_EDX]) +#define ESI_sig(context) ((context)->uc_mcontext.gregs[REG_ESI]) +#define EDI_sig(context) ((context)->uc_mcontext.gregs[REG_EDI]) +#define EBP_sig(context) ((context)->uc_mcontext.gregs[REG_EBP]) +#define ESP_sig(context) ((context)->uc_mcontext.gregs[REG_ESP]) + +#define CS_sig(context) ((context)->uc_mcontext.gregs[REG_CS]) +#define DS_sig(context) ((context)->uc_mcontext.gregs[REG_DS]) +#define ES_sig(context) ((context)->uc_mcontext.gregs[REG_ES]) +#define SS_sig(context) ((context)->uc_mcontext.gregs[REG_SS]) +#define FS_sig(context) ((context)->uc_mcontext.gregs[REG_FS]) +#define GS_sig(context) ((context)->uc_mcontext.gregs[REG_GS]) + +#define EFL_sig(context) ((context)->uc_mcontext.gregs[REG_EFL]) +#define EIP_sig(context) ((context)->uc_mcontext.gregs[REG_EIP]) +#define TRAP_sig(context) ((context)->uc_mcontext.gregs[REG_TRAPNO]) +#define ERROR_sig(context) ((context)->uc_mcontext.gregs[REG_ERR]) + +#define FPU_sig(context) ((FLOATING_SAVE_AREA *)&(context)->uc_mcontext.fpregs.fp_reg_set.fpchip_state) +#define FPUX_sig(context) NULL + #else #error You must define the signal context functions for your platform #endif /* linux */

1 0

Michael Stefaniuc : dmusic/tests: Add some DirectMusicCollection tests.
by Alexandre Julliard Jan. 6, 2014

Jan. 6, 2014

Module: wine Branch: master Commit: dc9208a0c535e62e99036b5960f032b14dddf021 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc9208a0c535e62e99036b596… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Jan 5 23:56:39 2014 +0100 dmusic/tests: Add some DirectMusicCollection tests. --- dlls/dmusic/tests/dmusic.c | 41 +++++++++++++++++++++++++++++++++++++++++ 1 files changed, 41 insertions(+), 0 deletions(-) diff --git a/dlls/dmusic/tests/dmusic.c b/dlls/dmusic/tests/dmusic.c index 3e67c56..4291d71 100644 --- a/dlls/dmusic/tests/dmusic.c +++ b/dlls/dmusic/tests/dmusic.c @@ -320,6 +320,46 @@ static void test_COM_dmcoll(void) while (IDirectMusicCollection_Release(dmc)); } +static void test_dmcoll(void) +{ + IDirectMusicCollection *dmc; + IDirectMusicObject *dmo; + DMUS_OBJECTDESC desc; + HRESULT hr; + + hr = CoCreateInstance(&CLSID_DirectMusicCollection, NULL, CLSCTX_INPROC_SERVER, + &IID_IDirectMusicCollection, (void**)&dmc); + ok(hr == S_OK, "DirectMusicCollection create failed: %08x, expected S_OK\n", hr); + + /* IDirectMusicObject */ + hr = IDirectMusicCollection_QueryInterface(dmc, &IID_IDirectMusicObject, (void**)&dmo); + ok(hr == S_OK, "QueryInterface for IID_IDirectMusicObject failed: %08x\n", hr); + hr = IDirectMusicObject_GetDescriptor(dmo, NULL); + ok(hr == E_POINTER, "IDirectMusicObject_GetDescriptor: expected E_POINTER, got %08x\n", hr); + hr = IDirectMusicObject_SetDescriptor(dmo, NULL); + ok(hr == E_POINTER, "IDirectMusicObject_SetDescriptor: expected E_POINTER, got %08x\n", hr); + ZeroMemory(&desc, sizeof(desc)); + hr = IDirectMusicObject_GetDescriptor(dmo, &desc); + ok(hr == S_OK, "IDirectMusicObject_GetDescriptor failed: %08x\n", hr); + ok(desc.dwValidData == DMUS_OBJ_CLASS, + "Fresh object has more valid data (%08x) than DMUS_OBJ_CLASS\n", desc.dwValidData); + /* DMUS_OBJ_CLASS is immutable */ + desc.dwValidData = DMUS_OBJ_CLASS; + hr = IDirectMusicObject_SetDescriptor(dmo, &desc); + ok(hr == S_FALSE , "IDirectMusicObject_SetDescriptor failed: %08x\n", hr); + ok(!desc.dwValidData, "dwValidData wasn't cleared: %08x\n", desc.dwValidData); + desc.dwValidData = DMUS_OBJ_CLASS; + desc.guidClass = CLSID_DirectMusicSegment; + hr = IDirectMusicObject_SetDescriptor(dmo, &desc); + ok(hr == S_FALSE && !desc.dwValidData, "IDirectMusicObject_SetDescriptor failed: %08x\n", hr); + hr = IDirectMusicObject_GetDescriptor(dmo, &desc); + ok(hr == S_OK, "IDirectMusicObject_GetDescriptor failed: %08x\n", hr); + ok(IsEqualGUID(&desc.guidClass, &CLSID_DirectMusicCollection), + "guidClass changed, should be CLSID_DirectMusicCollection\n"); + + while (IDirectMusicCollection_Release(dmc)); +} + static BOOL missing_dmusic(void) { IDirectMusic8 *dm; @@ -348,6 +388,7 @@ START_TEST(dmusic) test_COM_dmcoll(); test_dmusic(); test_dmbuffer(); + test_dmcoll(); CoUninitialize(); }

1 0

Nikolay Sivov : scrrun: Added IFileCollection stub.
by Alexandre Julliard Jan. 6, 2014

Jan. 6, 2014

Module: wine Branch: master Commit: 07ded6bb36221c48fbdd67a935555fbef103f6c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=07ded6bb36221c48fbdd67a93… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jan 6 01:23:03 2014 +0400 scrrun: Added IFileCollection stub. --- dlls/scrrun/filesystem.c | 169 +++++++++++++++++++++++++++++++++++++++- dlls/scrrun/scrrun.c | 3 +- dlls/scrrun/scrrun_private.h | 1 + dlls/scrrun/tests/filesystem.c | 26 ++++++ 4 files changed, 196 insertions(+), 3 deletions(-) diff --git a/dlls/scrrun/filesystem.c b/dlls/scrrun/filesystem.c index 91a2795..c61020d 100644 --- a/dlls/scrrun/filesystem.c +++ b/dlls/scrrun/filesystem.c @@ -63,6 +63,11 @@ struct foldercollection { BSTR path; }; +struct filecollection { + IFileCollection IFileCollection_iface; + LONG ref; +}; + struct folder { IFolder IFolder_iface; LONG ref; @@ -108,6 +113,11 @@ static inline struct foldercollection *impl_from_IFolderCollection(IFolderCollec return CONTAINING_RECORD(iface, struct foldercollection, IFolderCollection_iface); } +static inline struct filecollection *impl_from_IFileCollection(IFileCollection *iface) +{ + return CONTAINING_RECORD(iface, struct filecollection, IFileCollection_iface); +} + static inline struct enumvariant *impl_from_IEnumVARIANT(IEnumVARIANT *iface) { return CONTAINING_RECORD(iface, struct enumvariant, IEnumVARIANT_iface); @@ -779,6 +789,156 @@ static HRESULT create_foldercoll(BSTR path, IFolderCollection **folders) return S_OK; } +static HRESULT WINAPI filecoll_QueryInterface(IFileCollection *iface, REFIID riid, void **obj) +{ + struct filecollection *This = impl_from_IFileCollection(iface); + + TRACE("(%p)->(%s %p)\n", This, debugstr_guid(riid), obj); + + *obj = NULL; + + if (IsEqualIID( riid, &IID_IFileCollection ) || + IsEqualIID( riid, &IID_IDispatch ) || + IsEqualIID( riid, &IID_IUnknown )) + { + *obj = iface; + IFileCollection_AddRef(iface); + } + else + return E_NOINTERFACE; + + return S_OK; +} + +static ULONG WINAPI filecoll_AddRef(IFileCollection *iface) +{ + struct filecollection *This = impl_from_IFileCollection(iface); + ULONG ref = InterlockedIncrement(&This->ref); + TRACE("(%p)->(%d)\n", This, ref); + return ref; +} + +static ULONG WINAPI filecoll_Release(IFileCollection *iface) +{ + struct filecollection *This = impl_from_IFileCollection(iface); + ULONG ref = InterlockedDecrement(&This->ref); + TRACE("(%p)->(%d)\n", This, ref); + + if (!ref) + heap_free(This); + + return ref; +} + +static HRESULT WINAPI filecoll_GetTypeInfoCount(IFileCollection *iface, UINT *pctinfo) +{ + struct filecollection *This = impl_from_IFileCollection(iface); + TRACE("(%p)->(%p)\n", This, pctinfo); + *pctinfo = 1; + return S_OK; +} + +static HRESULT WINAPI filecoll_GetTypeInfo(IFileCollection *iface, UINT iTInfo, + LCID lcid, ITypeInfo **ppTInfo) +{ + struct filecollection *This = impl_from_IFileCollection(iface); + TRACE("(%p)->(%u %u %p)\n", This, iTInfo, lcid, ppTInfo); + return get_typeinfo(IFileCollection_tid, ppTInfo); +} + +static HRESULT WINAPI filecoll_GetIDsOfNames(IFileCollection *iface, REFIID riid, + LPOLESTR *rgszNames, UINT cNames, + LCID lcid, DISPID *rgDispId) +{ + struct filecollection *This = impl_from_IFileCollection(iface); + ITypeInfo *typeinfo; + HRESULT hr; + + TRACE("(%p)->(%s %p %u %u %p)\n", This, debugstr_guid(riid), rgszNames, cNames, lcid, rgDispId); + + hr = get_typeinfo(IFileCollection_tid, &typeinfo); + if(SUCCEEDED(hr)) + { + hr = ITypeInfo_GetIDsOfNames(typeinfo, rgszNames, cNames, rgDispId); + ITypeInfo_Release(typeinfo); + } + + return hr; +} + +static HRESULT WINAPI filecoll_Invoke(IFileCollection *iface, DISPID dispIdMember, + REFIID riid, LCID lcid, WORD wFlags, + DISPPARAMS *pDispParams, VARIANT *pVarResult, + EXCEPINFO *pExcepInfo, UINT *puArgErr) +{ + struct filecollection *This = impl_from_IFileCollection(iface); + ITypeInfo *typeinfo; + HRESULT hr; + + TRACE("(%p)->(%d %s %d %d %p %p %p %p)\n", This, dispIdMember, debugstr_guid(riid), + lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); + + hr = get_typeinfo(IFileCollection_tid, &typeinfo); + if(SUCCEEDED(hr)) + { + hr = ITypeInfo_Invoke(typeinfo, iface, dispIdMember, wFlags, + pDispParams, pVarResult, pExcepInfo, puArgErr); + ITypeInfo_Release(typeinfo); + } + + return hr; +} + +static HRESULT WINAPI filecoll_get_Item(IFileCollection *iface, VARIANT Key, IFile **file) +{ + struct filecollection *This = impl_from_IFileCollection(iface); + FIXME("(%p)->(%p)\n", This, file); + return E_NOTIMPL; +} + +static HRESULT WINAPI filecoll_get__NewEnum(IFileCollection *iface, IUnknown **ppenum) +{ + struct filecollection *This = impl_from_IFileCollection(iface); + FIXME("(%p)->(%p)\n", This, ppenum); + return E_NOTIMPL; +} + +static HRESULT WINAPI filecoll_get_Count(IFileCollection *iface, LONG *count) +{ + struct filecollection *This = impl_from_IFileCollection(iface); + FIXME("(%p)->(%p)\n", This, count); + return E_NOTIMPL; +} + +static const IFileCollectionVtbl filecollectionvtbl = { + filecoll_QueryInterface, + filecoll_AddRef, + filecoll_Release, + filecoll_GetTypeInfoCount, + filecoll_GetTypeInfo, + filecoll_GetIDsOfNames, + filecoll_Invoke, + filecoll_get_Item, + filecoll_get__NewEnum, + filecoll_get_Count +}; + +static HRESULT create_filecoll(IFileCollection **files) +{ + struct filecollection *This; + + *files = NULL; + + This = heap_alloc(sizeof(*This)); + if (!This) return E_OUTOFMEMORY; + + This->IFileCollection_iface.lpVtbl = &filecollectionvtbl; + This->ref = 1; + + *files = &This->IFileCollection_iface; + return S_OK; +} + static HRESULT WINAPI folder_QueryInterface(IFolder *iface, REFIID riid, void **obj) { struct folder *This = impl_from_IFolder(iface); @@ -1041,8 +1201,13 @@ static HRESULT WINAPI folder_get_SubFolders(IFolder *iface, IFolderCollection ** static HRESULT WINAPI folder_get_Files(IFolder *iface, IFileCollection **files) { struct folder *This = impl_from_IFolder(iface); - FIXME("(%p)->(%p): stub\n", This, files); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, files); + + if(!files) + return E_POINTER; + + return create_filecoll(files); } static HRESULT WINAPI folder_CreateTextFile(IFolder *iface, BSTR filename, VARIANT_BOOL overwrite, diff --git a/dlls/scrrun/scrrun.c b/dlls/scrrun/scrrun.c index 761e2d6..9c7c6dc 100644 --- a/dlls/scrrun/scrrun.c +++ b/dlls/scrrun/scrrun.c @@ -107,7 +107,8 @@ static REFIID tid_ids[] = { &IID_IFolder, &IID_IFolderCollection, &IID_ITextStream, - &IID_IFile + &IID_IFile, + &IID_IFileCollection }; static HRESULT load_typelib(void) diff --git a/dlls/scrrun/scrrun_private.h b/dlls/scrrun/scrrun_private.h index 2c6aba5..3ffde50 100644 --- a/dlls/scrrun/scrrun_private.h +++ b/dlls/scrrun/scrrun_private.h @@ -30,6 +30,7 @@ typedef enum tid_t IFolderCollection_tid, ITextStream_tid, IFile_tid, + IFileCollection_tid, LAST_tid } tid_t; diff --git a/dlls/scrrun/tests/filesystem.c b/dlls/scrrun/tests/filesystem.c index 9df619f..00d7686 100644 --- a/dlls/scrrun/tests/filesystem.c +++ b/dlls/scrrun/tests/filesystem.c @@ -900,6 +900,31 @@ if (hr == S_OK) { IFolderCollection_Release(folders); } +static void test_FileCollection(void) +{ + IFileCollection *files; + WCHAR buffW[MAX_PATH]; + IFolder *folder; + HRESULT hr; + BSTR str; + + GetWindowsDirectoryW(buffW, MAX_PATH); + + str = SysAllocString(buffW); + hr = IFileSystem3_GetFolder(fs3, str, &folder); + ok(hr == S_OK, "got 0x%08x\n", hr); + SysFreeString(str); + + hr = IFolder_get_Files(folder, NULL); + ok(hr == E_POINTER, "got 0x%08x\n", hr); + + hr = IFolder_get_Files(folder, &files); + ok(hr == S_OK, "got 0x%08x\n", hr); + IFileCollection_Release(files); + + IFolder_Release(folder); +} + START_TEST(filesystem) { HRESULT hr; @@ -926,6 +951,7 @@ START_TEST(filesystem) test_BuildPath(); test_GetFolder(); test_FolderCollection(); + test_FileCollection(); IFileSystem3_Release(fs3);

1 0

Nikolay Sivov : dwrite: Implement ConvertFontFaceToLOGFONT().
by Alexandre Julliard Jan. 6, 2014

Jan. 6, 2014

Module: wine Branch: master Commit: 5e4d5ebde73db6340986abdf3d13b6f7844e76d2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e4d5ebde73db6340986abdf3… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jan 6 01:24:17 2014 +0400 dwrite: Implement ConvertFontFaceToLOGFONT(). --- dlls/dwrite/dwrite_private.h | 1 + dlls/dwrite/font.c | 11 ++++++++ dlls/dwrite/gdiinterop.c | 6 ++-- dlls/dwrite/tests/font.c | 53 ++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 68 insertions(+), 3 deletions(-) diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index 0c2698e..5450732 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -72,6 +72,7 @@ static inline LPWSTR heap_strdupnW(const WCHAR *str, UINT32 len) } extern HRESULT create_font_from_logfont(const LOGFONTW*, IDWriteFont**) DECLSPEC_HIDDEN; +extern HRESULT convert_fontface_to_logfont(IDWriteFontFace*, LOGFONTW*) DECLSPEC_HIDDEN; extern HRESULT create_textformat(const WCHAR*,IDWriteFontCollection*,DWRITE_FONT_WEIGHT,DWRITE_FONT_STYLE,DWRITE_FONT_STRETCH, FLOAT,const WCHAR*,IDWriteTextFormat**) DECLSPEC_HIDDEN; extern HRESULT create_textlayout(const WCHAR*,UINT32,IDWriteTextFormat*,IDWriteTextLayout**) DECLSPEC_HIDDEN; diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index ec18312..2564d67 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -396,6 +396,8 @@ static HRESULT create_fontface(struct dwrite_font *font, IDWriteFontFace **face) memset(&This->logfont, 0, sizeof(This->logfont)); This->logfont.lfItalic = font->style == DWRITE_FONT_STYLE_ITALIC; + /* weight values from DWRITE_FONT_WEIGHT match values used for LOGFONT */ + This->logfont.lfWeight = font->weight; strcpyW(This->logfont.lfFaceName, font->facename); *face = &This->IDWriteFontFace_iface; @@ -403,6 +405,15 @@ static HRESULT create_fontface(struct dwrite_font *font, IDWriteFontFace **face) return S_OK; } +HRESULT convert_fontface_to_logfont(IDWriteFontFace *face, LOGFONTW *logfont) +{ + struct dwrite_fontface *fontface = impl_from_IDWriteFontFace(face); + + *logfont = fontface->logfont; + + return S_OK; +} + static HRESULT WINAPI dwritefont_QueryInterface(IDWriteFont *iface, REFIID riid, void **obj) { struct dwrite_font *This = impl_from_IDWriteFont(iface); diff --git a/dlls/dwrite/gdiinterop.c b/dlls/dwrite/gdiinterop.c index 496f099..bb24305 100644 --- a/dlls/dwrite/gdiinterop.c +++ b/dlls/dwrite/gdiinterop.c @@ -242,10 +242,10 @@ static HRESULT WINAPI gdiinterop_ConvertFontToLOGFONT(IDWriteGdiInterop *iface, } static HRESULT WINAPI gdiinterop_ConvertFontFaceToLOGFONT(IDWriteGdiInterop *iface, - IDWriteFontFace *font, LOGFONTW *logfont) + IDWriteFontFace *fontface, LOGFONTW *logfont) { - FIXME("(%p %p): stub\n", font, logfont); - return E_NOTIMPL; + TRACE("(%p %p)\n", fontface, logfont); + return convert_fontface_to_logfont(fontface, logfont); } static HRESULT WINAPI gdiinterop_CreateFontFaceFromHdc(IDWriteGdiInterop *iface, diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index 8404c22..a4a7854 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -561,6 +561,58 @@ static void test_system_fontcollection(void) IDWriteFontCollection_Release(collection); } +static void test_ConvertFontFaceToLOGFONT(void) +{ + IDWriteGdiInterop *interop; + IDWriteFontFace *fontface; + IDWriteFont *font; + LOGFONTW logfont; + HRESULT hr; + + hr = IDWriteFactory_GetGdiInterop(factory, &interop); + ok(hr == S_OK, "got 0x%08x\n", hr); + + memset(&logfont, 0, sizeof(logfont)); + logfont.lfHeight = 12; + logfont.lfWidth = 12; + logfont.lfEscapement = 100; + logfont.lfWeight = FW_NORMAL; + logfont.lfItalic = 1; + logfont.lfUnderline = 1; + logfont.lfStrikeOut = 1; + + lstrcpyW(logfont.lfFaceName, tahomaW); + + hr = IDWriteGdiInterop_CreateFontFromLOGFONT(interop, &logfont, &font); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDWriteFont_CreateFontFace(font, &fontface); + ok(hr == S_OK, "got 0x%08x\n", hr); + +if (0) /* crashes on native */ +{ + hr = IDWriteGdiInterop_ConvertFontFaceToLOGFONT(interop, NULL, NULL); + hr = IDWriteGdiInterop_ConvertFontFaceToLOGFONT(interop, fontface, NULL); +} + + memset(&logfont, 0xa, sizeof(logfont)); + logfont.lfFaceName[0] = 0; + + hr = IDWriteGdiInterop_ConvertFontFaceToLOGFONT(interop, fontface, &logfont); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(logfont.lfHeight == 0, "got %d\n", logfont.lfHeight); + ok(logfont.lfWidth == 0, "got %d\n", logfont.lfWidth); + ok(logfont.lfWeight == FW_NORMAL, "got %d\n", logfont.lfWeight); + ok(logfont.lfEscapement == 0, "got %d\n", logfont.lfEscapement); + ok(logfont.lfItalic == 1, "got %d\n", logfont.lfItalic); + ok(logfont.lfUnderline == 0, "got %d\n", logfont.lfUnderline); + ok(logfont.lfStrikeOut == 0, "got %d\n", logfont.lfStrikeOut); + ok(!lstrcmpW(logfont.lfFaceName, tahomaW), "got %s\n", wine_dbgstr_w(logfont.lfFaceName)); + + IDWriteGdiInterop_Release(interop); + IDWriteFontFace_Release(fontface); +} + START_TEST(font) { HRESULT hr; @@ -580,6 +632,7 @@ START_TEST(font) test_CreateFontFace(); test_GetMetrics(); test_system_fontcollection(); + test_ConvertFontFaceToLOGFONT(); IDWriteFactory_Release(factory); }

1 0

Alexandre Julliard : makedep: Don't expand variable references that use ${} .
by Alexandre Julliard Jan. 6, 2014

Jan. 6, 2014

Module: wine Branch: master Commit: ce25c89585efc345f528a2d82b8856d84be82909 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce25c89585efc345f528a2d82… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Jan 4 20:33:57 2014 +0100 makedep: Don't expand variable references that use ${}. --- Make.vars.in | 5 ++--- dlls/appwiz.cpl/Makefile.in | 2 +- libs/wine/Makefile.in | 12 ++++++------ tools/makedep.c | 6 ++++++ tools/widl/Makefile.in | 2 +- tools/winegcc/Makefile.in | 6 +++--- tools/wrc/Makefile.in | 2 +- 7 files changed, 20 insertions(+), 15 deletions(-) diff --git a/Make.vars.in b/Make.vars.in index 185e656..15ef9c0 100644 --- a/Make.vars.in +++ b/Make.vars.in @@ -6,12 +6,11 @@ bindir = @bindir@ libdir = @libdir@ datarootdir = @datarootdir@ datadir = @datadir@ -infodir = @infodir@ mandir = @mandir@ -fontdir = $(datadir)/wine/fonts +fontdir = ${datadir}/wine/fonts includedir = @includedir@/wine dlldir = @dlldir@ -fakedlldir = $(dlldir)/fakedlls +fakedlldir = ${dlldir}/fakedlls top_srcdir = @top_srcdir@ top_builddir = @top_builddir@ srcdir = @srcdir@ diff --git a/dlls/appwiz.cpl/Makefile.in b/dlls/appwiz.cpl/Makefile.in index b1c3319..4efd915 100644 --- a/dlls/appwiz.cpl/Makefile.in +++ b/dlls/appwiz.cpl/Makefile.in @@ -1,7 +1,7 @@ MODULE = appwiz.cpl IMPORTS = uuid urlmon advpack comctl32 advapi32 shell32 user32 comdlg32 DELAYIMPORTS = msi -EXTRADEFS = -DINSTALL_DATADIR="\"$(datadir)\"" +EXTRADEFS = -DINSTALL_DATADIR="\"${datadir}\"" C_SRCS = \ addons.c \ diff --git a/libs/wine/Makefile.in b/libs/wine/Makefile.in index 5286e85..6b44ea4 100644 --- a/libs/wine/Makefile.in +++ b/libs/wine/Makefile.in @@ -1,12 +1,12 @@ EXTRALIBS = $(LIBPORT) @LIBDL@ @COREFOUNDATIONLIB@ @CORESERVICESLIB@ EXTRADEFS = -DWINE_UNICODE_API="" \ - -DBINDIR='"$(bindir)"' \ - -DDLLDIR='"$(dlldir)"' \ + -DBINDIR='"${bindir}"' \ + -DDLLDIR='"${dlldir}"' \ -DDLLPREFIX='"$(DLLPREFIX)"' \ - -DLIB_TO_BINDIR=\"`$(MAKEDEP) -R $(libdir) $(bindir)`\" \ - -DLIB_TO_DLLDIR=\"`$(MAKEDEP) -R $(libdir) $(dlldir)`\" \ - -DBIN_TO_DLLDIR=\"`$(MAKEDEP) -R $(bindir) $(dlldir)`\" \ - -DBIN_TO_DATADIR=\"`$(MAKEDEP) -R $(bindir) $(datadir)/wine`\" + -DLIB_TO_BINDIR=\"`$(MAKEDEP) -R ${libdir} ${bindir}`\" \ + -DLIB_TO_DLLDIR=\"`$(MAKEDEP) -R ${libdir} ${dlldir}`\" \ + -DBIN_TO_DLLDIR=\"`$(MAKEDEP) -R ${bindir} ${dlldir}`\" \ + -DBIN_TO_DATADIR=\"`$(MAKEDEP) -R ${bindir} ${datadir}/wine`\" STATICLIB = libwine_static.a C_SRCS = \ diff --git a/tools/makedep.c b/tools/makedep.c index f7e2865..28f60fd 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -1157,6 +1157,12 @@ static char *get_expanded_make_variable( const char *name ) tmp = replace_substr( expand, p, end - p, var ? var : "" ); free( var ); } + else if (p[1] == '{') /* don't expand ${} variables */ + { + if (!(end = strchr( p + 2, '}' ))) fatal_error( "syntax error in '%s'\n", expand ); + p = end + 1; + continue; + } else if (p[1] == '$') { tmp = replace_substr( expand, p, 2, "$" ); diff --git a/tools/widl/Makefile.in b/tools/widl/Makefile.in index 4565f54..12d0ea3 100644 --- a/tools/widl/Makefile.in +++ b/tools/widl/Makefile.in @@ -19,7 +19,7 @@ C_SRCS = \ LEX_SRCS = parser.l BISON_SRCS = parser.y -EXTRADEFS = -DDEFAULT_INCLUDE_DIR=\"$(includedir)/windows/\" +EXTRADEFS = -DDEFAULT_INCLUDE_DIR=\"${includedir}/windows/\" @MAKE_RULES@ diff --git a/tools/winegcc/Makefile.in b/tools/winegcc/Makefile.in index 6b72211..7c0c71c 100644 --- a/tools/winegcc/Makefile.in +++ b/tools/winegcc/Makefile.in @@ -1,7 +1,7 @@ EXTRADEFS = \ - -DINCLUDEDIR="\"$(includedir)\"" \ - -DDLLDIR="\"$(dlldir)\"" \ - -DLIBDIR="\"$(libdir)\"" \ + -DINCLUDEDIR="\"${includedir}\"" \ + -DDLLDIR="\"${dlldir}\"" \ + -DLIBDIR="\"${libdir}\"" \ -DCC="\"$(CC)\"" \ -DCPP="\"@CPPBIN@\"" \ -DCXX="\"@CXX@\"" \ diff --git a/tools/wrc/Makefile.in b/tools/wrc/Makefile.in index 9d956b8..2b7a3f4 100644 --- a/tools/wrc/Makefile.in +++ b/tools/wrc/Makefile.in @@ -1,4 +1,4 @@ -EXTRADEFS = -DINCLUDEDIR="\"$(includedir)\"" +EXTRADEFS = -DINCLUDEDIR="\"${includedir}\"" PROGRAMS = wrc$(EXEEXT) MANPAGES = wrc.man.in ALL_LIBS = @LIBGETTEXTPO@ $(LIBWPP) $(LIBWINE_STATIC) $(LIBPORT)

1 0

Alexandre Julliard : makedep: Grow the include file array dynamically.
by Alexandre Julliard Jan. 6, 2014

Jan. 6, 2014

Module: wine Branch: master Commit: 9c2725d5d619b0b76222113a4529cb2dc3a094cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c2725d5d619b0b76222113a4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Jan 4 12:25:56 2014 +0100 makedep: Grow the include file array dynamically. --- tools/makedep.c | 55 ++++++++++++++++++++++++++++++++----------------------- 1 files changed, 32 insertions(+), 23 deletions(-) diff --git a/tools/makedep.c b/tools/makedep.c index 9bd8295..f7e2865 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -35,9 +35,6 @@ #endif #include "wine/list.h" -/* Max first-level includes per file */ -#define MAX_INCLUDES 200 - struct incl_file { struct list entry; @@ -48,7 +45,9 @@ struct incl_file int included_line; /* line where this file was included */ unsigned int flags; /* flags (see below) */ struct incl_file *owner; - struct incl_file *files[MAX_INCLUDES]; + unsigned int files_count; /* files in use */ + unsigned int files_size; /* total allocated size */ + struct incl_file **files; }; #define FLAG_SYSTEM 0x0001 /* is it a system include (#include <name>) */ @@ -550,15 +549,17 @@ static struct incl_file *find_include_file( const char *name ) * * Add an include file if it doesn't already exists. */ -static struct incl_file *add_include( struct incl_file *pFile, const char *name, int system ) +static struct incl_file *add_include( struct incl_file *parent, const char *name, int system ) { struct incl_file *include; char *ext; - int pos; - for (pos = 0; pos < MAX_INCLUDES; pos++) if (!pFile->files[pos]) break; - if (pos >= MAX_INCLUDES) - fatal_error( "too many included files, please fix MAX_INCLUDES\n" ); + if (parent->files_count >= parent->files_size) + { + parent->files_size *= 2; + if (parent->files_size < 16) parent->files_size = 16; + parent->files = xrealloc( parent->files, parent->files_size * sizeof(*parent->files) ); + } /* enforce some rules for the Wine tree */ @@ -567,19 +568,19 @@ static struct incl_file *add_include( struct incl_file *pFile, const char *name, if (!strcmp( name, "config.h" )) { - if ((ext = strrchr( pFile->filename, '.' )) && !strcmp( ext, ".h" )) + if ((ext = strrchr( parent->filename, '.' )) && !strcmp( ext, ".h" )) fatal_error( "config.h must not be included by a header file\n" ); - if (pos) + if (parent->files_count) fatal_error( "config.h must be included before anything else\n" ); } else if (!strcmp( name, "wine/port.h" )) { - if ((ext = strrchr( pFile->filename, '.' )) && !strcmp( ext, ".h" )) + if ((ext = strrchr( parent->filename, '.' )) && !strcmp( ext, ".h" )) fatal_error( "wine/port.h must not be included by a header file\n" ); - if (!pos) fatal_error( "config.h must be included before wine/port.h\n" ); - if (pos > 1) + if (!parent->files_count) fatal_error( "config.h must be included before wine/port.h\n" ); + if (parent->files_count > 1) fatal_error( "wine/port.h must be included before everything except config.h\n" ); - if (strcmp( pFile->files[0]->name, "config.h" )) + if (strcmp( parent->files[0]->name, "config.h" )) fatal_error( "config.h must be included before wine/port.h\n" ); } @@ -589,12 +590,12 @@ static struct incl_file *add_include( struct incl_file *pFile, const char *name, include = xmalloc( sizeof(*include) ); memset( include, 0, sizeof(*include) ); include->name = xstrdup(name); - include->included_by = pFile; + include->included_by = parent; include->included_line = input_line; if (system) include->flags |= FLAG_SYSTEM; list_add_tail( &includes, &include->entry ); found: - pFile->files[pos] = include; + parent->files[parent->files_count++] = include; return include; } @@ -1323,12 +1324,22 @@ static void add_generated_sources(void) if (strendswith( source->name, ".y" )) { file = add_generated_source( replace_extension( source->name, ".y", ".tab.c" ), NULL ); - memcpy( file->files, source->files, sizeof(file->files) ); + /* steal the includes list from the source file */ + file->files_count = source->files_count; + file->files_size = source->files_size; + file->files = source->files; + source->files_count = source->files_size = 0; + source->files = NULL; } if (strendswith( source->name, ".l" )) { file = add_generated_source( replace_extension( source->name, ".l", ".yy.c" ), NULL ); - memcpy( file->files, source->files, sizeof(file->files) ); + /* steal the includes list from the source file */ + file->files_count = source->files_count; + file->files_size = source->files_size; + file->files = source->files; + source->files_count = source->files_size = 0; + source->files = NULL; } } if (get_make_variable( "TESTDLL" )) @@ -1350,8 +1361,7 @@ static void output_include( struct incl_file *pFile, struct incl_file *owner ) if (!pFile->filename) return; pFile->owner = owner; output_filename( pFile->filename ); - for (i = 0; i < MAX_INCLUDES; i++) - if (pFile->files[i]) output_include( pFile->files[i], owner ); + for (i = 0; i < pFile->files_count; i++) output_include( pFile->files[i], owner ); } @@ -1614,8 +1624,7 @@ static struct strarray output_sources(void) free( obj ); free( sourcedep ); - for (i = 0; i < MAX_INCLUDES; i++) - if (source->files[i]) output_include( source->files[i], source ); + for (i = 0; i < source->files_count; i++) output_include( source->files[i], source ); output( "\n" ); }

1 0

Nikolay Sivov : scrrun: Implement Next() for folder collection.
by Alexandre Julliard Jan. 6, 2014

Jan. 6, 2014

Module: wine Branch: master Commit: b99b69aac228a48bf1432a9409d0adbb620cba6a URL: http://source.winehq.org/git/wine.git/?a=commit;h=b99b69aac228a48bf1432a940… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jan 6 01:22:08 2014 +0400 scrrun: Implement Next() for folder collection. --- dlls/scrrun/filesystem.c | 101 ++++++++++++++++++++++++++++++++++++++-- dlls/scrrun/tests/filesystem.c | 16 ++++++- 2 files changed, 112 insertions(+), 5 deletions(-) diff --git a/dlls/scrrun/filesystem.c b/dlls/scrrun/filesystem.c index fa53950..81d6a07 100644 --- a/dlls/scrrun/filesystem.c +++ b/dlls/scrrun/filesystem.c @@ -36,6 +36,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(scrrun); +static const WCHAR bsW[] = {'\\',0}; + struct enumdata { union { @@ -125,6 +127,31 @@ static inline HRESULT create_error(DWORD err) } } +static HRESULT create_folder(const WCHAR*, IFolder**); + +static inline BOOL is_dir_data(const WIN32_FIND_DATAW *data) +{ + static const WCHAR dotdotW[] = {'.','.',0}; + static const WCHAR dotW[] = {'.',0}; + + return (data->dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) && + strcmpW(data->cFileName, dotdotW) && + strcmpW(data->cFileName, dotW); +} + +static BSTR get_full_path(BSTR path, const WIN32_FIND_DATAW *data) +{ + int len = SysStringLen(path); + WCHAR buffW[MAX_PATH]; + + strcpyW(buffW, path); + if (path[len-1] != '\\') + strcatW(buffW, bsW); + strcatW(buffW, data->cFileName); + + return SysAllocString(buffW); +} + static BOOL textstream_check_iomode(struct textstream *This, enum iotype type) { if (type == IORead) @@ -421,8 +448,75 @@ static ULONG WINAPI foldercoll_enumvariant_Release(IEnumVARIANT *iface) static HRESULT WINAPI foldercoll_enumvariant_Next(IEnumVARIANT *iface, ULONG celt, VARIANT *var, ULONG *fetched) { struct enumvariant *This = impl_from_IEnumVARIANT(iface); - FIXME("(%p)->(%d %p %p): stub\n", This, celt, var, fetched); - return E_NOTIMPL; + HANDLE handle = This->data.u.foldercoll.find; + WIN32_FIND_DATAW data; + ULONG count = 0; + + TRACE("(%p)->(%d %p %p)\n", This, celt, var, fetched); + + if (fetched) + *fetched = 0; + + if (!handle) + { + static const WCHAR allW[] = {'*',0}; + WCHAR pathW[MAX_PATH]; + BSTR parent = This->data.u.foldercoll.path; + int len; + + strcpyW(pathW, parent); + len = SysStringLen(parent); + if (parent[len-1] != '\\') + strcatW(pathW, bsW); + strcatW(pathW, allW); + handle = FindFirstFileW(pathW, &data); + if (handle == INVALID_HANDLE_VALUE) + return S_FALSE; + + /* find first dir */ + while (1) + { + if (is_dir_data(&data)) + break; + else + if (!FindNextFileW(handle, &data)) + { + FindClose(handle); + return S_FALSE; + } + } + + This->data.u.foldercoll.find = handle; + } + + do + { + if (count >= celt) break; + + if (is_dir_data(&data)) + { + IFolder *folder; + HRESULT hr; + BSTR str; + + str = get_full_path(This->data.u.foldercoll.path, &data); + hr = create_folder(str, &folder); + SysFreeString(str); + if (FAILED(hr)) return hr; + + V_VT(&var[count]) = VT_DISPATCH; + V_DISPATCH(&var[count]) = (IDispatch*)folder; + count++; + } + } while (FindNextFileW(handle, &data)); + + if (count < celt) + return S_FALSE; + + if (fetched) + *fetched = count; + + return S_OK; } static HRESULT WINAPI foldercoll_enumvariant_Skip(IEnumVARIANT *iface, ULONG celt) @@ -972,7 +1066,7 @@ static const IFolderVtbl foldervtbl = { folder_CreateTextFile }; -static HRESULT create_folder(BSTR path, IFolder **folder) +HRESULT create_folder(const WCHAR *path, IFolder **folder) { struct folder *This; @@ -1466,7 +1560,6 @@ static HRESULT WINAPI filesys_BuildPath(IFileSystem3 *iface, BSTR Path, } else if (Path[path_len-1] != '\\' && Name[0] != '\\') { - static const WCHAR bsW[] = {'\\',0}; ret = SysAllocStringLen(NULL, path_len + name_len + 1); if (ret) { diff --git a/dlls/scrrun/tests/filesystem.c b/dlls/scrrun/tests/filesystem.c index be5131c..6d1b913 100644 --- a/dlls/scrrun/tests/filesystem.c +++ b/dlls/scrrun/tests/filesystem.c @@ -794,6 +794,8 @@ static void test_FolderCollection(void) LONG count, count2, ref, ref2; IUnknown *unk, *unk2; IFolder *folder; + ULONG fetched; + VARIANT var; HRESULT hr; BSTR str; @@ -813,6 +815,7 @@ static void test_FolderCollection(void) hr = IFolder_get_SubFolders(folder, &folders); ok(hr == S_OK, "got 0x%08x\n", hr); + IFolder_Release(folder); count = 0; hr = IFolderCollection_get_Count(folders, &count); @@ -870,6 +873,18 @@ if (hr == S_OK) { hr = IEnumVARIANT_Reset(enumvar); ok(hr == S_OK, "got 0x%08x\n", hr); + VariantInit(&var); + fetched = 0; + hr = IEnumVARIANT_Next(enumvar, 1, &var, &fetched); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(fetched == 1, "got %d\n", fetched); + ok(V_VT(&var) == VT_DISPATCH, "got type %d\n", V_VT(&var)); + + hr = IDispatch_QueryInterface(V_DISPATCH(&var), &IID_IFolder, (void**)&folder); + ok(hr == S_OK, "got 0x%08x\n", hr); + IFolder_Release(folder); + VariantClear(&var); + IEnumVARIANT_Release(enumvar); IUnknown_Release(unk); @@ -877,7 +892,6 @@ if (hr == S_OK) { RemoveDirectoryW(path2W); IFolderCollection_Release(folders); - IFolder_Release(folder); } START_TEST(filesystem)

1 0

Nikolay Sivov : scrrun: Implement Name() property for Folder.
by Alexandre Julliard Jan. 6, 2014

Jan. 6, 2014

Module: wine Branch: master Commit: 42d2b51992fe3644c1705fc0e054928e8da9a17b URL: http://source.winehq.org/git/wine.git/?a=commit;h=42d2b51992fe3644c1705fc0e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jan 6 01:22:32 2014 +0400 scrrun: Implement Name() property for Folder. --- dlls/scrrun/filesystem.c | 24 ++++++++++++++++++++++-- dlls/scrrun/tests/filesystem.c | 6 ++++++ 2 files changed, 28 insertions(+), 2 deletions(-) diff --git a/dlls/scrrun/filesystem.c b/dlls/scrrun/filesystem.c index 81d6a07..91a2795 100644 --- a/dlls/scrrun/filesystem.c +++ b/dlls/scrrun/filesystem.c @@ -892,8 +892,26 @@ static HRESULT WINAPI folder_get_Path(IFolder *iface, BSTR *path) static HRESULT WINAPI folder_get_Name(IFolder *iface, BSTR *name) { struct folder *This = impl_from_IFolder(iface); - FIXME("(%p)->(%p): stub\n", This, name); - return E_NOTIMPL; + WCHAR *ptr; + + TRACE("(%p)->(%p)\n", This, name); + + if(!name) + return E_POINTER; + + *name = NULL; + + ptr = strrchrW(This->path, '\\'); + if (ptr) + { + *name = SysAllocString(ptr+1); + TRACE("%s\n", debugstr_w(*name)); + if (!*name) return E_OUTOFMEMORY; + } + else + return E_FAIL; + + return S_OK; } static HRESULT WINAPI folder_put_Name(IFolder *iface, BSTR name) @@ -1072,6 +1090,8 @@ HRESULT create_folder(const WCHAR *path, IFolder **folder) *folder = NULL; + TRACE("%s\n", debugstr_w(path)); + This = heap_alloc(sizeof(struct folder)); if (!This) return E_OUTOFMEMORY; diff --git a/dlls/scrrun/tests/filesystem.c b/dlls/scrrun/tests/filesystem.c index 6d1b913..9df619f 100644 --- a/dlls/scrrun/tests/filesystem.c +++ b/dlls/scrrun/tests/filesystem.c @@ -882,6 +882,12 @@ if (hr == S_OK) { hr = IDispatch_QueryInterface(V_DISPATCH(&var), &IID_IFolder, (void**)&folder); ok(hr == S_OK, "got 0x%08x\n", hr); + + str = NULL; + hr = IFolder_get_Name(folder, &str); + ok(hr == S_OK, "got 0x%08x\n", hr); + SysFreeString(str); + IFolder_Release(folder); VariantClear(&var);

1 0

Michael Stefaniuc : dmusic: Always AddRef the returned iface in QueryInterface.
by Alexandre Julliard Jan. 6, 2014

Jan. 6, 2014

Module: wine Branch: master Commit: d3c550d0ba36e8ed7c2c9c8741d59b7df01b96c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d3c550d0ba36e8ed7c2c9c874… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Jan 5 23:38:33 2014 +0100 dmusic: Always AddRef the returned iface in QueryInterface. --- dlls/dmusic/collection.c | 27 +++++++++------------------ 1 files changed, 9 insertions(+), 18 deletions(-) diff --git a/dlls/dmusic/collection.c b/dlls/dmusic/collection.c index f98bc19..a673390 100644 --- a/dlls/dmusic/collection.c +++ b/dlls/dmusic/collection.c @@ -48,31 +48,22 @@ static HRESULT WINAPI IDirectMusicCollectionImpl_IDirectMusicCollection_QueryInt TRACE("(%p/%p)->(%s, %p)\n", iface, This, debugstr_dmguid(riid), ret_iface); - if (IsEqualIID(riid, &IID_IUnknown) || - IsEqualIID(riid, &IID_IDirectMusicCollection)) - { + *ret_iface = NULL; + + if (IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IDirectMusicCollection)) *ret_iface = iface; - IDirectMusicCollection_AddRef(iface); - return S_OK; - } else if (IsEqualIID(riid, &IID_IDirectMusicObject)) - { *ret_iface = &This->IDirectMusicObject_iface; - IDirectMusicCollection_AddRef(iface); - return S_OK; - } else if (IsEqualIID(riid, &IID_IPersistStream)) - { *ret_iface = &This->IPersistStream_iface; - IDirectMusicCollection_AddRef(iface); - return S_OK; + else + { + WARN("(%p/%p)->(%s, %p): not found\n", iface, This, debugstr_dmguid(riid), ret_iface); + return E_NOINTERFACE; } - *ret_iface = NULL; - - WARN("(%p/%p)->(%s, %p): not found\n", iface, This, debugstr_dmguid(riid), ret_iface); - - return E_NOINTERFACE; + IUnknown_AddRef((IUnknown*)*ret_iface); + return S_OK; } static ULONG WINAPI IDirectMusicCollectionImpl_IDirectMusicCollection_AddRef(LPDIRECTMUSICCOLLECTION iface)

1 0

Michael Stefaniuc : dmusic: Don' t leak mem if DirectMusicCollection creation fails.
by Alexandre Julliard Jan. 6, 2014

Jan. 6, 2014

Module: wine Branch: master Commit: 5771ff8912506d5f998d181a23ee4d382f00cfcf URL: http://source.winehq.org/git/wine.git/?a=commit;h=5771ff8912506d5f998d181a2… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Jan 5 23:43:00 2014 +0100 dmusic: Don't leak mem if DirectMusicCollection creation fails. --- dlls/dmusic/collection.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/dmusic/collection.c b/dlls/dmusic/collection.c index a673390..cbcc082 100644 --- a/dlls/dmusic/collection.c +++ b/dlls/dmusic/collection.c @@ -805,6 +805,7 @@ static const IPersistStreamVtbl DirectMusicCollection_PersistStream_Vtbl = { HRESULT WINAPI DMUSIC_CreateDirectMusicCollectionImpl(LPCGUID lpcGUID, LPVOID* ppobj, LPUNKNOWN pUnkOuter) { IDirectMusicCollectionImpl* obj; + HRESULT hr; *ppobj = NULL; if (pUnkOuter) @@ -821,8 +822,11 @@ HRESULT WINAPI DMUSIC_CreateDirectMusicCollectionImpl(LPCGUID lpcGUID, LPVOID* p DM_STRUCT_INIT(obj->pDesc); obj->pDesc->dwValidData |= DMUS_OBJ_CLASS; obj->pDesc->guidClass = CLSID_DirectMusicCollection; - obj->ref = 0; /* will be inited by QueryInterface */ + obj->ref = 1; list_init (&obj->Instruments); - return IDirectMusicCollection_QueryInterface(&obj->IDirectMusicCollection_iface, lpcGUID, ppobj); + hr = IDirectMusicCollection_QueryInterface(&obj->IDirectMusicCollection_iface, lpcGUID, ppobj); + IDirectMusicCollection_Release(&obj->IDirectMusicCollection_iface); + + return hr; }

1 0

Michael Stefaniuc : dmusic: The object class is immutable in a DirectMusicObject.
by Alexandre Julliard Jan. 6, 2014

Jan. 6, 2014

Module: wine Branch: master Commit: fda99c0fcc96729b096a1434820f90ec7ab6886a URL: http://source.winehq.org/git/wine.git/?a=commit;h=fda99c0fcc96729b096a14348… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Jan 5 23:48:46 2014 +0100 dmusic: The object class is immutable in a DirectMusicObject. --- dlls/dmusic/collection.c | 11 ++++++++--- 1 files changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/dmusic/collection.c b/dlls/dmusic/collection.c index cbcc082..a519b2a 100644 --- a/dlls/dmusic/collection.c +++ b/dlls/dmusic/collection.c @@ -189,7 +189,9 @@ static HRESULT WINAPI IDirectMusicCollectionImpl_IDirectMusicObject_GetDescripto static HRESULT WINAPI IDirectMusicCollectionImpl_IDirectMusicObject_SetDescriptor(LPDIRECTMUSICOBJECT iface, LPDMUS_OBJECTDESC pDesc) { - IDirectMusicCollectionImpl *This = impl_from_IDirectMusicObject(iface); + IDirectMusicCollectionImpl *This = impl_from_IDirectMusicObject(iface); + HRESULT ret = S_OK; + TRACE("(%p, %p)\n", iface, pDesc); @@ -206,7 +208,10 @@ static HRESULT WINAPI IDirectMusicCollectionImpl_IDirectMusicObject_SetDescripto if (pDesc->dwValidData & DMUS_OBJ_OBJECT) This->pDesc->guidObject = pDesc->guidObject; if (pDesc->dwValidData & DMUS_OBJ_CLASS) - This->pDesc->guidClass = pDesc->guidClass; + { + pDesc->dwValidData &= ~DMUS_OBJ_CLASS; + ret = S_FALSE; + } if (pDesc->dwValidData & DMUS_OBJ_NAME) lstrcpynW(This->pDesc->wszName, pDesc->wszName, DMUS_MAX_NAME); if (pDesc->dwValidData & DMUS_OBJ_CATEGORY) @@ -229,7 +234,7 @@ static HRESULT WINAPI IDirectMusicCollectionImpl_IDirectMusicObject_SetDescripto /* add new flags */ This->pDesc->dwValidData |= pDesc->dwValidData; - return S_OK; + return ret; } static HRESULT read_from_stream(IStream *stream, void *data, ULONG size)

1 0

Bruno Jesus : ws2_32: Fix FreeBSD compiling issue on ipx address structure.
by Alexandre Julliard Jan. 6, 2014

Jan. 6, 2014

Module: wine Branch: master Commit: 281f69bccfaa1c8c0678f50c8db7ee149f51a117 URL: http://source.winehq.org/git/wine.git/?a=commit;h=281f69bccfaa1c8c0678f50c8… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Sun Jan 5 16:40:32 2014 -0200 ws2_32: Fix FreeBSD compiling issue on ipx address structure. --- dlls/ws2_32/socket.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 0391554..12838da 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -1473,7 +1473,9 @@ static BOOL is_sockaddr_bound(const struct sockaddr *uaddr, int uaddrlen) { static const struct sockaddr_ipx emptyAddr; struct sockaddr_ipx *ipx = (struct sockaddr_ipx*) uaddr; - return ipx->sipx_port || ipx->sipx_network || memcmp(&ipx->sipx_node, &emptyAddr.sipx_node, sizeof(emptyAddr.sipx_node)); + return ipx->sipx_port + || memcmp(&ipx->sipx_network, &emptyAddr.sipx_network, sizeof(emptyAddr.sipx_network)) + || memcmp(&ipx->sipx_node, &emptyAddr.sipx_node, sizeof(emptyAddr.sipx_node)); } #endif case AF_INET6:

1 0