July 2014 - Wine-Commits - list.winehq.org

Stefan Dösinger : wined3d: Ignore set_priority calls on non-managed resources.
by Alexandre Julliard July 9, 2014

July 9, 2014

Module: wine Branch: master Commit: 4cecbaa54d71742c6705af4be7ea6b07485489b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4cecbaa54d71742c6705af4be… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Jul 8 15:58:43 2014 +0200 wined3d: Ignore set_priority calls on non-managed resources. --- dlls/wined3d/resource.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c index 3a54dd8..caec580 100644 --- a/dlls/wined3d/resource.c +++ b/dlls/wined3d/resource.c @@ -163,7 +163,15 @@ void resource_unload(struct wined3d_resource *resource) DWORD resource_set_priority(struct wined3d_resource *resource, DWORD priority) { - DWORD prev = resource->priority; + DWORD prev; + + if (resource->pool != WINED3D_POOL_MANAGED) + { + WARN("Called on non-managed resource %p, ignoring.\n", resource); + return 0; + } + + prev = resource->priority; resource->priority = priority; TRACE("resource %p, new priority %u, returning old priority %u.\n", resource, priority, prev); return prev;

1 0

Vincent Povirk : gdiplus: Account for transforms when calculating hdc bounds.
by Alexandre Julliard July 9, 2014

July 9, 2014

Module: wine Branch: master Commit: 60f558876e8a88305e93839f32f2264414061f9e URL: http://source.winehq.org/git/wine.git/?a=commit;h=60f558876e8a88305e93839f3… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Jul 9 13:44:28 2014 -0500 gdiplus: Account for transforms when calculating hdc bounds. --- dlls/gdiplus/graphics.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 861d160..7ee46ee 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -1995,6 +1995,24 @@ static GpStatus get_graphics_bounds(GpGraphics* graphics, GpRectF* rect) rect->Height = GetDeviceCaps(graphics->hdc, VERTRES); } + if (graphics->hdc && + (GetMapMode(graphics->hdc) != MM_TEXT || GetGraphicsMode(graphics->hdc) != GM_COMPATIBLE)) + { + POINT points[2]; + + points[0].x = rect->X; + points[0].y = rect->Y; + points[1].x = rect->X + rect->Width; + points[1].y = rect->Y + rect->Height; + + DPtoLP(graphics->hdc, points, sizeof(points)/sizeof(points[0])); + + rect->X = min(points[0].x, points[1].x); + rect->Y = min(points[0].y, points[1].y); + rect->Width = abs(points[1].x - points[0].x); + rect->Height = abs(points[1].y - points[0].y); + } + return stat; }

1 0

Qian Hong : mshtml: Fixed typo.
by Alexandre Julliard July 9, 2014

July 9, 2014

Module: wine Branch: master Commit: 359767fdfabfaad7c672be4dfbd5d4ee03eced71 URL: http://source.winehq.org/git/wine.git/?a=commit;h=359767fdfabfaad7c672be4df… Author: Qian Hong <qhong(a)codeweavers.com> Date: Wed Jul 9 03:03:30 2014 +0800 mshtml: Fixed typo. --- dlls/mshtml/navigate.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index 6b261b1..c29e211 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -993,7 +993,7 @@ HRESULT bind_mon_to_wstr(HTMLInnerWindow *window, IMoniker *mon, WCHAR **ret) break; } - MultiByteToWideChar(CP_ACP, 0, bsc->buf, bsc->bsc.readed, text, len); + MultiByteToWideChar(cp, 0, bsc->buf, bsc->bsc.readed, text, len); text[len] = 0; } }

1 0

Sebastian Lackner : oleaut32: Decrease accuracy if scaling is not possible in VarDecAdd.
by Alexandre Julliard July 9, 2014

July 9, 2014

Module: wine Branch: master Commit: ec218b42181709c26cbb076761c345826f2b6353 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec218b42181709c26cbb07676… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Mon Jul 7 22:13:59 2014 +0200 oleaut32: Decrease accuracy if scaling is not possible in VarDecAdd. --- dlls/oleaut32/tests/vartype.c | 10 +++---- dlls/oleaut32/vartype.c | 70 +++++++++++++++++++++++++++++++++---------- 2 files changed, 59 insertions(+), 21 deletions(-) diff --git a/dlls/oleaut32/tests/vartype.c b/dlls/oleaut32/tests/vartype.c index 8ca3f14..026149a 100644 --- a/dlls/oleaut32/tests/vartype.c +++ b/dlls/oleaut32/tests/vartype.c @@ -4419,7 +4419,7 @@ static void test_VarDecAdd(void) todo_wine EXPECTDEC64(0,0,0x2d3c8750,0xbd670354,0xb0000000); SETDEC(l,3,128,0,123456); SETDEC64(r,0,0,0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF); - MATH2(VarDecAdd); todo_wine EXPECTDEC64(0,0,-1,0xFFFFFFFF,0xFFFFFF84); + MATH2(VarDecAdd); EXPECTDEC64(0,0,-1,0xFFFFFFFF,0xFFFFFF84); SETDEC(l,3,0,0,123456); SETDEC64(r,0,0,0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF); MATH2(VarDecAdd); ok(hres == DISP_E_OVERFLOW,"Expected overflow, got (%d,%d,%d,(%8x,%8x)x) hres 0x%08x\n", @@ -4434,13 +4434,13 @@ static void test_VarDecAdd(void) S(U(out)).scale, S(U(out)).sign, out.Hi32, S1(U1(out)).Mid32, S1(U1(out)).Lo32, hres); SETDEC(l,6,0,0,123456); SETDEC64(r,0,0,0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF); - MATH2(VarDecAdd); todo_wine EXPECTDEC64(0,0,-1,0xFFFFFFFF,0xFFFFFFFF); + MATH2(VarDecAdd); EXPECTDEC64(0,0,-1,0xFFFFFFFF,0xFFFFFFFF); SETDEC(l,3,128,0,123456); SETDEC64(r,0,0,0x19999999,0x99999999,0x99999999); - MATH2(VarDecAdd); todo_wine EXPECTDEC64(1,0,-1,0xFFFFFFFF,0xFFFFFB27); + MATH2(VarDecAdd); EXPECTDEC64(1,0,-1,0xFFFFFFFF,0xFFFFFB27); SETDEC(l,3,128,0,123567); SETDEC64(r,0,0,0x19999999,0x99999999,0x99999999); - MATH2(VarDecAdd); todo_wine EXPECTDEC64(1,0,-1,0xFFFFFFFF,0xFFFFFB26); + MATH2(VarDecAdd); EXPECTDEC64(1,0,-1,0xFFFFFFFF,0xFFFFFB26); /* Promotes to the highest scale, so here the results are in the scale of 2 */ SETDEC(l,2,0,0,0); SETDEC(r,0,0,0,0); MATH2(VarDecAdd); EXPECTDEC(2,0,0,0); @@ -4663,7 +4663,7 @@ static void test_VarDecCmp(void) SETDEC(out,0,DECIMAL_NEG,-1,-1); SETDEC(l,0,DECIMAL_NEG,-1,-1); MATH1(VarDecCmp); EXPECT_EQ; SETDEC(l,3,0,0,123456); SETDEC64(out,0,0,0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF); - MATH1(VarDecCmp); todo_wine EXPECT_LT; + MATH1(VarDecCmp); EXPECT_LT; } static void test_VarDecCmpR8(void) diff --git a/dlls/oleaut32/vartype.c b/dlls/oleaut32/vartype.c index 4d067e0..e9b45ff 100644 --- a/dlls/oleaut32/vartype.c +++ b/dlls/oleaut32/vartype.c @@ -4164,6 +4164,8 @@ static HRESULT VARIANT_DI_FromR4(float source, VARIANT_DI * dest); static HRESULT VARIANT_DI_FromR8(double source, VARIANT_DI * dest); static void VARIANT_DIFromDec(const DECIMAL * from, VARIANT_DI * to); static void VARIANT_DecFromDI(const VARIANT_DI * from, DECIMAL * to); +static unsigned char VARIANT_int_divbychar(DWORD * p, unsigned int n, unsigned char divisor); +static BOOL VARIANT_int_iszero(const DWORD * p, unsigned int n); /************************************************************************ * VarDecFromR4 (OLEAUT32.193) @@ -4439,12 +4441,13 @@ HRESULT WINAPI VarDecFromUI8(ULONG64 ullIn, DECIMAL* pDecOut) /* Make two DECIMALS the same scale; used by math functions below */ static HRESULT VARIANT_DecScale(const DECIMAL** ppDecLeft, const DECIMAL** ppDecRight, - DECIMAL* pDecOut) + DECIMAL pDecOut[2]) { static DECIMAL scaleFactor; + unsigned char remainder; DECIMAL decTemp; + VARIANT_DI di; int scaleAmount, i; - HRESULT hRet = S_OK; if (DEC_SIGN(*ppDecLeft) & ~DECIMAL_NEG || DEC_SIGN(*ppDecRight) & ~DECIMAL_NEG) return E_INVALIDARG; @@ -4459,27 +4462,62 @@ static HRESULT VARIANT_DecScale(const DECIMAL** ppDecLeft, if (scaleAmount > 0) { decTemp = *(*ppDecRight); /* Left is bigger - scale the right hand side */ - *ppDecRight = pDecOut; + *ppDecRight = &pDecOut[0]; } else { decTemp = *(*ppDecLeft); /* Right is bigger - scale the left hand side */ - *ppDecLeft = pDecOut; - i = scaleAmount = -scaleAmount; + *ppDecLeft = &pDecOut[0]; + i = -scaleAmount; } - if (DEC_SCALE(&decTemp) + scaleAmount > DEC_MAX_SCALE) - return DISP_E_OVERFLOW; /* Can't scale up */ + /* Multiply up the value to be scaled by the correct amount (if possible) */ + while (i > 0 && SUCCEEDED(VarDecMul(&decTemp, &scaleFactor, &pDecOut[0]))) + { + decTemp = pDecOut[0]; + i--; + } - /* Multiply up the value to be scaled by the correct amount */ - while (SUCCEEDED(hRet) && i--) + if (!i) { - /* Note we are multiplying by a value with a scale of 0, so we don't recurse */ - hRet = VarDecMul(&decTemp, &scaleFactor, pDecOut); - decTemp = *pDecOut; + DEC_SCALE(&pDecOut[0]) += (scaleAmount > 0) ? scaleAmount : (-scaleAmount); + return S_OK; /* Same scale */ } - DEC_SCALE(pDecOut) += scaleAmount; /* Set the new scale */ - return hRet; + + /* Scaling further not possible, reduce accuracy of other argument */ + pDecOut[0] = decTemp; + if (scaleAmount > 0) + { + DEC_SCALE(&pDecOut[0]) += scaleAmount - i; + VARIANT_DIFromDec(*ppDecLeft, &di); + *ppDecLeft = &pDecOut[1]; + } + else + { + DEC_SCALE(&pDecOut[0]) += (-scaleAmount) - i; + VARIANT_DIFromDec(*ppDecRight, &di); + *ppDecRight = &pDecOut[1]; + } + + di.scale -= i; + remainder = 0; + while (i-- > 0 && !VARIANT_int_iszero(di.bitsnum, sizeof(di.bitsnum)/sizeof(DWORD))) + { + remainder = VARIANT_int_divbychar(di.bitsnum, sizeof(di.bitsnum)/sizeof(DWORD), 10); + if (remainder > 0) WARN("losing significant digits (remainder %u)...\n", remainder); + } + + /* round up the result - native oleaut32 does this */ + if (remainder >= 5) { + for (remainder = 1, i = 0; i < sizeof(di.bitsnum)/sizeof(DWORD) && remainder; i++) { + ULONGLONG digit = di.bitsnum[i] + 1; + remainder = (digit > 0xFFFFFFFF) ? 1 : 0; + di.bitsnum[i] = digit & 0xFFFFFFFF; + } + } + + VARIANT_DecFromDI(&di, &pDecOut[1]); + return S_OK; } /* Add two unsigned 32 bit values with overflow */ @@ -4554,9 +4592,9 @@ static inline int VARIANT_DecCmp(const DECIMAL *pDecLeft, const DECIMAL *pDecRig HRESULT WINAPI VarDecAdd(const DECIMAL* pDecLeft, const DECIMAL* pDecRight, DECIMAL* pDecOut) { HRESULT hRet; - DECIMAL scaled; + DECIMAL scaled[2]; - hRet = VARIANT_DecScale(&pDecLeft, &pDecRight, &scaled); + hRet = VARIANT_DecScale(&pDecLeft, &pDecRight, scaled); if (SUCCEEDED(hRet)) {

1 0

Stefan Dösinger : d3d8/tests: Add a test for SetPriority and GetPriority.
by Alexandre Julliard July 9, 2014

July 9, 2014

Module: wine Branch: master Commit: 0b61e22fd3fd7a3ac3ad8530fbd01af940ef74ad URL: http://source.winehq.org/git/wine.git/?a=commit;h=0b61e22fd3fd7a3ac3ad8530f… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Jul 8 15:58:45 2014 +0200 d3d8/tests: Add a test for SetPriority and GetPriority. --- dlls/d3d8/tests/device.c | 90 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 90 insertions(+) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index 971ef91..f6fa169 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -6336,6 +6336,95 @@ done: DestroyWindow(window); } +static void test_resource_priority(void) +{ + IDirect3DDevice8 *device; + IDirect3DTexture8 *texture; + IDirect3DVertexBuffer8 *buffer; + IDirect3D8 *d3d; + ULONG refcount; + HWND window; + HRESULT hr; + static const struct + { + D3DPOOL pool; + const char *name; + BOOL can_set_priority; + } + test_data[] = + { + {D3DPOOL_DEFAULT, "D3DPOOL_DEFAULT", FALSE}, + {D3DPOOL_SYSTEMMEM, "D3DPOOL_SYSTEMMEM", FALSE}, + {D3DPOOL_MANAGED, "D3DPOOL_MANAGED", TRUE}, + {D3DPOOL_SCRATCH, "D3DPOOL_SCRATCH", FALSE} + }; + unsigned int i; + DWORD priority; + + window = CreateWindowA("static", "d3d8_test", WS_OVERLAPPEDWINDOW, + 0, 0, 640, 480, NULL, NULL, NULL, NULL); + d3d = Direct3DCreate8(D3D_SDK_VERSION); + ok(!!d3d, "Failed to create a D3D object.\n"); + if (!(device = create_device(d3d, window, window, TRUE))) + { + skip("Failed to create a D3D device, skipping tests.\n"); + IDirect3D8_Release(d3d); + DestroyWindow(window); + return; + } + + for (i = 0; i < sizeof(test_data) / sizeof(*test_data); i++) + { + hr = IDirect3DDevice8_CreateTexture(device, 16, 16, 0, 0, D3DFMT_X8R8G8B8, + test_data[i].pool, &texture); + ok(SUCCEEDED(hr), "Failed to create texture, hr %#x, pool %s.\n", hr, test_data[i].name); + + priority = IDirect3DTexture8_GetPriority(texture); + ok(priority == 0, "Got unexpected priority %u, pool %s.\n", priority, test_data[i].name); + priority = IDirect3DTexture8_SetPriority(texture, 1); + ok(priority == 0, "Got unexpected priority %u, pool %s.\n", priority, test_data[i].name); + priority = IDirect3DTexture8_GetPriority(texture); + if (test_data[i].can_set_priority) + { + ok(priority == 1, "Got unexpected priority %u, pool %s.\n", priority, test_data[i].name); + priority = IDirect3DTexture8_SetPriority(texture, 0); + ok(priority == 1, "Got unexpected priority %u, pool %s.\n", priority, test_data[i].name); + } + else + ok(priority == 0, "Got unexpected priority %u, pool %s.\n", priority, test_data[i].name); + + IDirect3DTexture8_Release(texture); + + if (test_data[i].pool != D3DPOOL_SCRATCH) + { + hr = IDirect3DDevice8_CreateVertexBuffer(device, 256, 0, 0, + test_data[i].pool, &buffer); + ok(SUCCEEDED(hr), "Failed to create buffer, hr %#x, pool %s.\n", hr, test_data[i].name); + + priority = IDirect3DVertexBuffer8_GetPriority(buffer); + ok(priority == 0, "Got unexpected priority %u, pool %s.\n", priority, test_data[i].name); + priority = IDirect3DVertexBuffer8_SetPriority(buffer, 1); + ok(priority == 0, "Got unexpected priority %u, pool %s.\n", priority, test_data[i].name); + priority = IDirect3DVertexBuffer8_GetPriority(buffer); + if (test_data[i].can_set_priority) + { + ok(priority == 1, "Got unexpected priority %u, pool %s.\n", priority, test_data[i].name); + priority = IDirect3DVertexBuffer8_SetPriority(buffer, 0); + ok(priority == 1, "Got unexpected priority %u, pool %s.\n", priority, test_data[i].name); + } + else + ok(priority == 0, "Got unexpected priority %u, pool %s.\n", priority, test_data[i].name); + + IDirect3DVertexBuffer8_Release(buffer); + } + } + + refcount = IDirect3DDevice8_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + IDirect3D8_Release(d3d); + DestroyWindow(window); +} + START_TEST(device) { HMODULE d3d8_handle = LoadLibraryA( "d3d8.dll" ); @@ -6422,6 +6511,7 @@ START_TEST(device) test_mipmap_lock(); test_writeonly_resource(); test_lost_device(); + test_resource_priority(); UnregisterClassA("d3d8_test_wc", GetModuleHandleA(NULL)); }

1 0

Sebastian Lackner : shell32: Return NULL-terminated list of arguments in CommandLineToArgvW.
by Alexandre Julliard July 9, 2014

July 9, 2014

Module: wine Branch: master Commit: d892239f5ab913b1418bff63652c09528bac936e URL: http://source.winehq.org/git/wine.git/?a=commit;h=d892239f5ab913b1418bff636… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Mon Jul 7 22:43:01 2014 +0200 shell32: Return NULL-terminated list of arguments in CommandLineToArgvW. --- dlls/shell32/shell32_main.c | 15 +++++++++------ dlls/shell32/tests/shlexec.c | 4 ++++ 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/dlls/shell32/shell32_main.c b/dlls/shell32/shell32_main.c index 679ebec..3bf442e 100644 --- a/dlls/shell32/shell32_main.c +++ b/dlls/shell32/shell32_main.c @@ -101,11 +101,11 @@ LPWSTR* WINAPI CommandLineToArgvW(LPCWSTR lpCmdline, int* numargs) /* Return the path to the executable */ DWORD len, deslen=MAX_PATH, size; - size = sizeof(LPWSTR) + deslen*sizeof(WCHAR) + sizeof(LPWSTR); + size = sizeof(LPWSTR)*2 + deslen*sizeof(WCHAR); for (;;) { if (!(argv = LocalAlloc(LMEM_FIXED, size))) return NULL; - len = GetModuleFileNameW(0, (LPWSTR)(argv+1), deslen); + len = GetModuleFileNameW(0, (LPWSTR)(argv+2), deslen); if (!len) { LocalFree(argv); @@ -113,10 +113,11 @@ LPWSTR* WINAPI CommandLineToArgvW(LPCWSTR lpCmdline, int* numargs) } if (len < deslen) break; deslen*=2; - size = sizeof(LPWSTR) + deslen*sizeof(WCHAR) + sizeof(LPWSTR); + size = sizeof(LPWSTR)*2 + deslen*sizeof(WCHAR); LocalFree( argv ); } - argv[0]=(LPWSTR)(argv+1); + argv[0]=(LPWSTR)(argv+2); + argv[1]=NULL; *numargs=1; return argv; @@ -194,10 +195,10 @@ LPWSTR* WINAPI CommandLineToArgvW(LPCWSTR lpCmdline, int* numargs) * with it. This way the caller can make a single LocalFree() call to free * both, as per MSDN. */ - argv=LocalAlloc(LMEM_FIXED, argc*sizeof(LPWSTR)+(strlenW(lpCmdline)+1)*sizeof(WCHAR)); + argv=LocalAlloc(LMEM_FIXED, (argc+1)*sizeof(LPWSTR)+(strlenW(lpCmdline)+1)*sizeof(WCHAR)); if (!argv) return NULL; - cmdline=(LPWSTR)(argv+argc); + cmdline=(LPWSTR)(argv+argc+1); strcpyW(cmdline, lpCmdline); /* --- Then split and copy the arguments */ @@ -235,6 +236,7 @@ LPWSTR* WINAPI CommandLineToArgvW(LPCWSTR lpCmdline, int* numargs) if (!*s) { /* There are no parameters so we are all done */ + argv[argc]=NULL; *numargs=argc; return argv; } @@ -306,6 +308,7 @@ LPWSTR* WINAPI CommandLineToArgvW(LPCWSTR lpCmdline, int* numargs) } } *d='\0'; + argv[argc]=NULL; *numargs=argc; return argv; diff --git a/dlls/shell32/tests/shlexec.c b/dlls/shell32/tests/shlexec.c index 7f07c70..f81794e 100644 --- a/dlls/shell32/tests/shlexec.c +++ b/dlls/shell32/tests/shlexec.c @@ -1159,6 +1159,8 @@ static BOOL test_one_cmdline(const cmdline_tests_t* test) win_skip("CommandLineToArgvW not implemented, skipping\n"); return FALSE; } + ok(!argsW[cl2a_count] || broken(argsW[cl2a_count] != NULL) /* before Vista */, + "expected NULL-terminated list of commandline arguments\n"); count = 0; while (test->args[count]) @@ -1218,6 +1220,8 @@ static void test_commandline2argv(void) *strW = 0; args = CommandLineToArgvW(strW, &numargs); ok(numargs == 1, "expected 1 args, got %d\n", numargs); + ok(!args || (!args[numargs] || broken(args[numargs] != NULL) /* before Vista */), + "expected NULL-terminated list of commandline arguments\n"); if (numargs == 1) { GetModuleFileNameW(NULL, strW, sizeof(strW)/sizeof(*strW));

1 0

Joris van der Wel : server: Setting a security descriptor should not replace an existing owner or group with a default , if only a DACL is being set.
by Alexandre Julliard July 8, 2014

July 8, 2014

Module: wine Branch: master Commit: 0a4c7860f82074f7c81d6378075e63848b00b98e URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a4c7860f82074f7c81d63780… Author: Joris van der Wel <joris(a)jorisvanderwel.com> Date: Mon Jul 7 22:12:52 2014 +0200 server: Setting a security descriptor should not replace an existing owner or group with a default, if only a DACL is being set. --- dlls/advapi32/tests/security.c | 60 ++++++++++++++++++++++++++++++++++++++++++ server/object.c | 22 +++++++++++++--- 2 files changed, 78 insertions(+), 4 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index f3ccc8e..b1dc3fe 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -234,6 +234,42 @@ static SECURITY_DESCRIPTOR* test_get_security_descriptor(HANDLE handle, int line return sd; } +static void test_owner_equal(HANDLE Handle, PSID expected, int line) +{ + BOOL res; + SECURITY_DESCRIPTOR *queriedSD = NULL; + PSID owner; + BOOL owner_defaulted; + + queriedSD = test_get_security_descriptor( Handle, line ); + + res = GetSecurityDescriptorOwner(queriedSD, &owner, &owner_defaulted); + ok_(__FILE__, line)(res, "GetSecurityDescriptorOwner failed with error %d\n", GetLastError()); + + ok_(__FILE__, line)(EqualSid(owner, expected), "Owner SIDs are not equal\n"); + ok_(__FILE__, line)(!owner_defaulted, "Defaulted is true\n"); + + HeapFree(GetProcessHeap(), 0, queriedSD); +} + +static void test_group_equal(HANDLE Handle, PSID expected, int line) +{ + BOOL res; + SECURITY_DESCRIPTOR *queriedSD = NULL; + PSID group; + BOOL group_defaulted; + + queriedSD = test_get_security_descriptor( Handle, line ); + + res = GetSecurityDescriptorGroup(queriedSD, &group, &group_defaulted); + ok_(__FILE__, line)(res, "GetSecurityDescriptorGroup failed with error %d\n", GetLastError()); + + ok_(__FILE__, line)(EqualSid(group, expected), "Group SIDs are not equal\n"); + ok_(__FILE__, line)(!group_defaulted, "Defaulted is true\n"); + + HeapFree(GetProcessHeap(), 0, queriedSD); +} + static void test_sid(void) { struct sidRef refs[] = { @@ -2504,6 +2540,8 @@ static void test_process_security(void) SECURITY_ATTRIBUTES psa; HANDLE token, event; DWORD size; + SID_IDENTIFIER_AUTHORITY SIDAuthWorld = { SECURITY_WORLD_SID_AUTHORITY }; + PSID EveryoneSid = NULL; Acl = HeapAlloc(GetProcessHeap(), 0, 256); res = InitializeAcl(Acl, 256, ACL_REVISION); @@ -2515,6 +2553,9 @@ static void test_process_security(void) } ok(res, "InitializeAcl failed with error %d\n", GetLastError()); + res = AllocateAndInitializeSid( &SIDAuthWorld, 1, SECURITY_WORLD_RID, 0, 0, 0, 0, 0, 0, 0, &EveryoneSid); + ok(res, "AllocateAndInitializeSid failed with error %d\n", GetLastError()); + /* get owner from the token we might be running as a user not admin */ res = OpenProcessToken( GetCurrentProcess(), MAXIMUM_ALLOWED, &token ); ok(res, "OpenProcessToken failed with error %d\n", GetLastError()); @@ -2581,12 +2622,31 @@ static void test_process_security(void) res = SetSecurityDescriptorOwner(SecurityDescriptor, AdminSid, FALSE); ok(res, "SetSecurityDescriptorOwner failed with error %d\n", GetLastError()); CHECK_SET_SECURITY( event, OWNER_SECURITY_INFORMATION, ERROR_SUCCESS ); + test_owner_equal( event, AdminSid, __LINE__ ); + + res = SetSecurityDescriptorGroup(SecurityDescriptor, EveryoneSid, FALSE); + ok(res, "SetSecurityDescriptorGroup failed with error %d\n", GetLastError()); + CHECK_SET_SECURITY( event, GROUP_SECURITY_INFORMATION, ERROR_SUCCESS ); + test_group_equal( event, EveryoneSid, __LINE__ ); + + res = SetSecurityDescriptorDacl(SecurityDescriptor, TRUE, Acl, FALSE); + ok(res, "SetSecurityDescriptorDacl failed with error %d\n", GetLastError()); + CHECK_SET_SECURITY( event, DACL_SECURITY_INFORMATION, ERROR_SUCCESS ); + /* setting a dacl should not change the owner or group */ + test_owner_equal( event, AdminSid, __LINE__ ); + test_group_equal( event, EveryoneSid, __LINE__ ); + + /* Test again with a different SID in case the previous SID also happens to + * be the one that is incorrectly replacing the group. */ res = SetSecurityDescriptorGroup(SecurityDescriptor, UsersSid, FALSE); ok(res, "SetSecurityDescriptorGroup failed with error %d\n", GetLastError()); CHECK_SET_SECURITY( event, GROUP_SECURITY_INFORMATION, ERROR_SUCCESS ); + test_group_equal( event, UsersSid, __LINE__ ); + res = SetSecurityDescriptorDacl(SecurityDescriptor, TRUE, Acl, FALSE); ok(res, "SetSecurityDescriptorDacl failed with error %d\n", GetLastError()); CHECK_SET_SECURITY( event, DACL_SECURITY_INFORMATION, ERROR_SUCCESS ); + test_group_equal( event, UsersSid, __LINE__ ); sprintf(buffer, "%s tests/security.c test", myARGV[0]); memset(&startup, 0, sizeof(startup)); diff --git a/server/object.c b/server/object.c index 021c741..11ef0ce 100644 --- a/server/object.c +++ b/server/object.c @@ -436,18 +436,32 @@ int default_set_sd( struct object *obj, const struct security_descriptor *sd, new_sd.control = sd->control & ~SE_SELF_RELATIVE; - owner = sd_get_owner( sd ); - if (set_info & OWNER_SECURITY_INFORMATION && owner) + if (set_info & OWNER_SECURITY_INFORMATION && sd->owner_len) + { + owner = sd_get_owner( sd ); new_sd.owner_len = sd->owner_len; + } + else if (obj->sd && obj->sd->owner_len) + { + owner = sd_get_owner( obj->sd ); + new_sd.owner_len = obj->sd->owner_len; + } else { owner = token_get_user( current->process->token ); new_sd.owner_len = security_sid_len( owner ); } - group = sd_get_group( sd ); - if (set_info & GROUP_SECURITY_INFORMATION && group) + if (set_info & GROUP_SECURITY_INFORMATION && sd->group_len) + { + group = sd_get_group( sd ); new_sd.group_len = sd->group_len; + } + else if (obj->sd && obj->sd->group_len) + { + group = sd_get_group( obj->sd ); + new_sd.group_len = obj->sd->group_len; + } else { group = token_get_primary_group( current->process->token );

1 0

Huw Davies : comctl32: Don' t use the RECT from the custom draw structure when referring to the button alone.
by Alexandre Julliard July 8, 2014

July 8, 2014

Module: wine Branch: master Commit: d130ba09fa3912e9dcd262950d89a743a5daa398 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d130ba09fa3912e9dcd262950… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Jul 8 13:53:50 2014 +0100 comctl32: Don't use the RECT from the custom draw structure when referring to the button alone. --- dlls/comctl32/toolbar.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c index e716bab..c90c4bb 100644 --- a/dlls/comctl32/toolbar.c +++ b/dlls/comctl32/toolbar.c @@ -748,10 +748,10 @@ TOOLBAR_DrawImage(const TOOLBAR_INFO *infoPtr, TBUTTON_INFO *btnPtr, INT left, I /* draws a blank frame for a toolbar button */ static void -TOOLBAR_DrawFrame(const TOOLBAR_INFO *infoPtr, const NMTBCUSTOMDRAW *tbcd, DWORD dwItemCDFlag) +TOOLBAR_DrawFrame(const TOOLBAR_INFO *infoPtr, const NMTBCUSTOMDRAW *tbcd, const RECT *rect, DWORD dwItemCDFlag) { HDC hdc = tbcd->nmcd.hdc; - RECT rc = tbcd->nmcd.rc; + RECT rc = *rect; /* if the state is disabled or indeterminate then the button * cannot have an interactive look like pressed or hot */ BOOL non_interactive_state = (tbcd->nmcd.uItemState & CDIS_DISABLED) || @@ -1021,10 +1021,10 @@ TOOLBAR_DrawButton (const TOOLBAR_INFO *infoPtr, TBUTTON_INFO *btnPtr, HDC hdc, || (drawSepDropDownArrow && btnPtr->bDropDownPressed)) stateId = TS_HOT; - DrawThemeBackground (theme, hdc, partId, stateId, &tbcd.nmcd.rc, NULL); + DrawThemeBackground (theme, hdc, partId, stateId, &rc, NULL); } else - TOOLBAR_DrawFrame(infoPtr, &tbcd, dwItemCDFlag); + TOOLBAR_DrawFrame(infoPtr, &tbcd, &rc, dwItemCDFlag); if (drawSepDropDownArrow) {

1 0

Austin English : rpcrt4: Add a stub for RpcSsDontSerializeContext.
by Alexandre Julliard July 8, 2014

July 8, 2014

Module: wine Branch: master Commit: b4e006720aee0448a22ea0bdbd5fd9c2d5fcb70b URL: http://source.winehq.org/git/wine.git/?a=commit;h=b4e006720aee0448a22ea0bdb… Author: Austin English <austinenglish(a)gmail.com> Date: Mon Jul 7 19:54:21 2014 -0700 rpcrt4: Add a stub for RpcSsDontSerializeContext. --- dlls/rpcrt4/ndr_contexthandle.c | 8 ++++++++ dlls/rpcrt4/rpcrt4.spec | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/dlls/rpcrt4/ndr_contexthandle.c b/dlls/rpcrt4/ndr_contexthandle.c index cab0fc5..43e0ce7 100644 --- a/dlls/rpcrt4/ndr_contexthandle.c +++ b/dlls/rpcrt4/ndr_contexthandle.c @@ -157,6 +157,14 @@ void WINAPI RpcSsDestroyClientContext(void **ContextHandle) RpcRaiseException(status); } +/*********************************************************************** + * RpcSsDontSerializeContext [RPCRT4.@] + */ + void WINAPI RpcSsDontSerializeContext(void) +{ + FIXME("stub\n"); +} + static UINT ndr_update_context_handle(NDR_CCONTEXT *CContext, RPC_BINDING_HANDLE hBinding, const ndr_context_handle *chi) diff --git a/dlls/rpcrt4/rpcrt4.spec b/dlls/rpcrt4/rpcrt4.spec index 33c1af5..00fe7c4 100644 --- a/dlls/rpcrt4/rpcrt4.spec +++ b/dlls/rpcrt4/rpcrt4.spec @@ -471,7 +471,7 @@ @ stub RpcSsContextLockShared # wxp @ stdcall RpcSsDestroyClientContext(ptr) @ stub RpcSsDisableAllocate -@ stub RpcSsDontSerializeContext +@ stdcall RpcSsDontSerializeContext() @ stub RpcSsEnableAllocate @ stub RpcSsFree @ stub RpcSsGetContextBinding

1 0

Aric Stewart : tools: Generate the Unicode Bidi Bracketing table.
by Alexandre Julliard July 8, 2014

July 8, 2014

Module: wine Branch: master Commit: 2a12c6a7d49c1bc0539065430a92465a259a1165 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a12c6a7d49c1bc0539065430… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Jun 30 09:01:33 2014 -0500 tools: Generate the Unicode Bidi Bracketing table. --- dlls/usp10/Makefile.in | 1 + dlls/usp10/bracket.c | 106 +++++++++++++++++++++++++++++++++++++++++++++++++ tools/make_unicode | 44 ++++++++++++++++++++ 3 files changed, 151 insertions(+) diff --git a/dlls/usp10/Makefile.in b/dlls/usp10/Makefile.in index 1b8238a..21541f1 100644 --- a/dlls/usp10/Makefile.in +++ b/dlls/usp10/Makefile.in @@ -4,6 +4,7 @@ IMPORTS = advapi32 user32 gdi32 C_SRCS = \ bidi.c \ + bracket.c \ breaking.c \ indic.c \ indicsyllable.c \ diff --git a/dlls/usp10/bracket.c b/dlls/usp10/bracket.c new file mode 100644 index 0000000..20df6fa --- /dev/null +++ b/dlls/usp10/bracket.c @@ -0,0 +1,106 @@ +/* Unicode Bidirectional Bracket table */ +/* generated from http://www.unicode.org/Public/7.0.0/ucd/BidiBrackets.txt */ +/* DO NOT EDIT!! */ + +const unsigned short bidi_bracket_table[768] = +{ + /* level 1 offsets */ + 0x0100, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, + 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0120, + 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0130, 0x0110, + 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, + 0x0140, 0x0110, 0x0110, 0x0150, 0x0110, 0x0110, 0x0110, 0x0160, + 0x0110, 0x0170, 0x0110, 0x0110, 0x0110, 0x0110, 0x0180, 0x0110, + 0x0190, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, + 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, + 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, + 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, + 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, + 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, + 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, + 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, + 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, + 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, + 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, + 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, + 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, + 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, + 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, + 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, + 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, + 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, + 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, + 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, + 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, + 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, + 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, + 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, + 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, + 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x01a0, 0x01b0, + /* level 2 offsets */ + 0x01c0, 0x01c0, 0x01d0, 0x01c0, 0x01c0, 0x01e0, 0x01c0, 0x01e0, + 0x01c0, 0x01c0, 0x01c0, 0x01c0, 0x01c0, 0x01c0, 0x01c0, 0x01c0, + 0x01c0, 0x01c0, 0x01c0, 0x01c0, 0x01c0, 0x01c0, 0x01c0, 0x01c0, + 0x01c0, 0x01c0, 0x01c0, 0x01c0, 0x01c0, 0x01c0, 0x01c0, 0x01c0, + 0x01c0, 0x01c0, 0x01c0, 0x01f0, 0x01c0, 0x01c0, 0x01c0, 0x01c0, + 0x01c0, 0x01c0, 0x01c0, 0x01c0, 0x01c0, 0x01c0, 0x01c0, 0x01c0, + 0x01c0, 0x01c0, 0x01c0, 0x01c0, 0x01c0, 0x01c0, 0x01c0, 0x01c0, + 0x01c0, 0x0200, 0x01c0, 0x01c0, 0x01c0, 0x01c0, 0x01c0, 0x01c0, + 0x01c0, 0x01c0, 0x01c0, 0x01c0, 0x0210, 0x01c0, 0x01c0, 0x0220, + 0x0220, 0x01c0, 0x01c0, 0x01c0, 0x01c0, 0x01c0, 0x01c0, 0x01c0, + 0x0230, 0x01c0, 0x0240, 0x01c0, 0x01c0, 0x01c0, 0x01c0, 0x01c0, + 0x01c0, 0x01c0, 0x01c0, 0x01c0, 0x01c0, 0x01c0, 0x01c0, 0x01c0, + 0x01c0, 0x01c0, 0x01c0, 0x01c0, 0x01c0, 0x01c0, 0x0250, 0x0260, + 0x01c0, 0x01c0, 0x01c0, 0x01c0, 0x0210, 0x01c0, 0x0270, 0x01c0, + 0x01c0, 0x01c0, 0x01c0, 0x01c0, 0x01c0, 0x01c0, 0x01c0, 0x01c0, + 0x0280, 0x0290, 0x01c0, 0x01c0, 0x01c0, 0x0230, 0x01c0, 0x02a0, + 0x01c0, 0x01c0, 0x02b0, 0x01c0, 0x01c0, 0x01c0, 0x01c0, 0x01c0, + 0x01c0, 0x01c0, 0x01c0, 0x01c0, 0x01c0, 0x01c0, 0x01c0, 0x01c0, + 0x0250, 0x02c0, 0x01c0, 0x01c0, 0x01c0, 0x01c0, 0x01c0, 0x01c0, + 0x01c0, 0x01c0, 0x01c0, 0x01c0, 0x01c0, 0x01c0, 0x01c0, 0x01c0, + 0x01c0, 0x01c0, 0x01c0, 0x01c0, 0x01c0, 0x02d0, 0x01c0, 0x01c0, + 0x01c0, 0x01c0, 0x01c0, 0x01c0, 0x01c0, 0x01c0, 0x01c0, 0x01c0, + 0x01d0, 0x01c0, 0x01c0, 0x01e0, 0x01c0, 0x02e0, 0x02f0, 0x01c0, + 0x01c0, 0x01c0, 0x01c0, 0x01c0, 0x01c0, 0x01c0, 0x01c0, 0x01c0, + /* values */ + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0001, 0x01fe, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0002, 0x0000, 0x01fd, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0001, 0x01fe, 0x0001, 0x01fe, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0001, 0x01fe, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0001, 0x01fe, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0001, 0x01fe, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0001, 0x01fe, 0x0001, 0x01fe, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0001, 0x01fe, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0001, 0x01fe, 0x0001, 0x01fe, 0x0001, 0x01fe, 0x0001, 0x01fe, + 0x0001, 0x01fe, 0x0001, 0x01fe, 0x0001, 0x01fe, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0001, 0x01fe, + 0x0001, 0x01fe, 0x0001, 0x01fe, 0x0001, 0x01fe, 0x0001, 0x01fe, + 0x0000, 0x0000, 0x0000, 0x0001, 0x01fe, 0x0001, 0x01fe, 0x0001, + 0x01fe, 0x0001, 0x01fe, 0x0001, 0x01fe, 0x0003, 0x0101, 0x00fe, + 0x01fc, 0x0001, 0x01fe, 0x0001, 0x01fe, 0x0001, 0x01fe, 0x0001, + 0x01fe, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0001, 0x01fe, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0001, 0x01fe, 0x0001, 0x01fe, 0x0001, 0x01fe, + 0x0001, 0x01fe, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0001, 0x01fe, 0x0000, 0x0000, 0x0001, 0x01fe, 0x0001, 0x01fe, + 0x0001, 0x01fe, 0x0001, 0x01fe, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0001, 0x01fe, 0x0001, 0x01fe, 0x0001, 0x01fe, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0002, 0x0000, 0x01fd, 0x0000, 0x0001, + 0x01fe, 0x0000, 0x0001, 0x01fe, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000 +}; diff --git a/tools/make_unicode b/tools/make_unicode index e0f92b5..be81ec7 100755 --- a/tools/make_unicode +++ b/tools/make_unicode @@ -131,6 +131,12 @@ my %ctype = "defin" => 0x0200 ); +my %bracket_types = +( + "o" => 0x0000, + "c" => 0x0001, +); + my %indic_types = ( "Other" => 0x0000, @@ -1322,6 +1328,43 @@ sub dump_mirroring($) save_file($filename); } +################################################################ +# dump the Bidi Brackets +sub dump_bracket($) +{ + my $filename = shift; + my @bracket_table = (0) x 65536;; + + my $INPUT = open_data_file( $UNIDATA, "BidiBrackets.txt" ); + while (<$INPUT>) + { + next if /^\#/; # skip comments + next if /^\s*$/; # skip empty lines + next if /\x1a/; # skip ^Z + if (/^\s*([0-9a-fA-F]+)\s*;\s*([0-9a-fA-F]+);\s*([con])/) + { + my $type = $3; + die "unknown bracket $type" unless defined $bracket_types{$type}; + die "characters too distant $1 and $2" if abs(hex($2) - hex($1)) >= 256; + $bracket_table[hex $1] = (hex($2) - hex($1)) % 255; + $bracket_table[hex $1] += $bracket_types{$type} << 8; + next; + } + die "malformed line $_"; + } + close $INPUT; + + open OUTPUT,">$filename.new" or die "Cannot create $filename"; + print "Building $filename\n"; + print OUTPUT "/* Unicode Bidirectional Bracket table */\n"; + print OUTPUT "/* generated from $UNIDATA/BidiBrackets.txt */\n"; + print OUTPUT "/* DO NOT EDIT!! */\n\n"; + + dump_two_level_mapping( "bidi_bracket_table", @bracket_table); + + close OUTPUT; + save_file($filename); +} ################################################################ # dump the Arabic shaping table @@ -2228,6 +2271,7 @@ DUMP_SORTKEYS( "libs/wine/collation.c", READ_SORTKEYS_FILE() ); DUMP_COMPOSE_TABLES( "libs/wine/compose.c" ); DUMP_CTYPE_TABLES( "libs/wine/wctype.c" ); dump_mirroring( "dlls/usp10/mirror.c" ); +dump_bracket( "dlls/usp10/bracket.c" ); dump_shaping( "dlls/usp10/shaping.c" ); dump_linebreak( "dlls/usp10/linebreak.c" ); dump_indic( "dlls/usp10/indicsyllable.c" );

1 0

Alexandre Julliard : tools: Don't include wine/unicode.h if not necessary.
by Alexandre Julliard July 8, 2014

July 8, 2014

Module: wine Branch: master Commit: 18d410dec1b3fe4b74d448a200194987790c816c URL: http://source.winehq.org/git/wine.git/?a=commit;h=18d410dec1b3fe4b74d448a20… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 8 16:59:36 2014 +0200 tools: Don't include wine/unicode.h if not necessary. --- dlls/gdi32/vertical.c | 2 -- dlls/kernel32/nameprep.c | 4 +--- dlls/usp10/indicsyllable.c | 2 -- dlls/usp10/linebreak.c | 2 -- dlls/usp10/shaping.c | 2 -- dlls/wineps.drv/vertical.c | 2 -- tools/make_unicode | 7 +------ 7 files changed, 2 insertions(+), 19 deletions(-) diff --git a/dlls/gdi32/vertical.c b/dlls/gdi32/vertical.c index 9430e2c..67f0d0a 100644 --- a/dlls/gdi32/vertical.c +++ b/dlls/gdi32/vertical.c @@ -2,8 +2,6 @@ /* generated from http://www.unicode.org/Public/vertical/revision-11/VerticalOrientation-11.t… */ /* DO NOT EDIT!! */ -#include "wine/unicode.h" - const unsigned short vertical_orientation_table[1536] = { /* level 1 offsets */ diff --git a/dlls/kernel32/nameprep.c b/dlls/kernel32/nameprep.c index a293dac..cb6eb61 100644 --- a/dlls/kernel32/nameprep.c +++ b/dlls/kernel32/nameprep.c @@ -2,8 +2,6 @@ /* generated from http://www.rfc-editor.org/rfc/rfc3454.txt */ /* DO NOT EDIT!! */ -#include "wine/unicode.h" - const unsigned short nameprep_char_type[4432] = { /* level 1 offsets */ @@ -564,7 +562,7 @@ const unsigned short nameprep_char_type[4432] = 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0002, 0x0002, 0x0002, 0x0002, 0x0002, 0x0002, 0x0002 }; -const WCHAR nameprep_mapping[5856] = +const unsigned short nameprep_mapping[5856] = { /* index */ 0x0110, 0x0120, 0x0130, 0x0140, 0x0150, 0x0160, 0x0100, 0x0100, diff --git a/dlls/usp10/indicsyllable.c b/dlls/usp10/indicsyllable.c index 91ab8ed..821a10f 100644 --- a/dlls/usp10/indicsyllable.c +++ b/dlls/usp10/indicsyllable.c @@ -3,8 +3,6 @@ /* and from http://www.unicode.org/Public/7.0.0/ucd/IndicMatraCategory.txt */ /* DO NOT EDIT!! */ -#include "wine/unicode.h" - const unsigned short indic_syllabic_table[2864] = { /* level 1 offsets */ diff --git a/dlls/usp10/linebreak.c b/dlls/usp10/linebreak.c index 89655f3..a0452c9 100644 --- a/dlls/usp10/linebreak.c +++ b/dlls/usp10/linebreak.c @@ -2,8 +2,6 @@ /* generated from http://www.unicode.org/Public/7.0.0/ucd/LineBreak.txt */ /* DO NOT EDIT!! */ -#include "wine/unicode.h" - const unsigned short wine_linebreak_table[7232] = { /* level 1 offsets */ diff --git a/dlls/usp10/shaping.c b/dlls/usp10/shaping.c index fdbed9f..12b290c 100644 --- a/dlls/usp10/shaping.c +++ b/dlls/usp10/shaping.c @@ -2,8 +2,6 @@ /* generated from http://www.unicode.org/Public/7.0.0/ucd/ArabicShaping.txt */ /* DO NOT EDIT!! */ -#include "wine/unicode.h" - const unsigned short wine_shaping_table[2864] = { /* level 1 offsets */ diff --git a/dlls/wineps.drv/vertical.c b/dlls/wineps.drv/vertical.c index 9430e2c..67f0d0a 100644 --- a/dlls/wineps.drv/vertical.c +++ b/dlls/wineps.drv/vertical.c @@ -2,8 +2,6 @@ /* generated from http://www.unicode.org/Public/vertical/revision-11/VerticalOrientation-11.t… */ /* DO NOT EDIT!! */ -#include "wine/unicode.h" - const unsigned short vertical_orientation_table[1536] = { /* level 1 offsets */ diff --git a/tools/make_unicode b/tools/make_unicode index 0300905..e0f92b5 100755 --- a/tools/make_unicode +++ b/tools/make_unicode @@ -1234,7 +1234,6 @@ sub dump_indic($) print OUTPUT "/* generated from $UNIDATA/IndicSyllabicCategory.txt */\n"; print OUTPUT "/* and from $UNIDATA/IndicMatraCategory.txt */\n"; print OUTPUT "/* DO NOT EDIT!! */\n\n"; - print OUTPUT "#include \"wine/unicode.h\"\n\n"; dump_two_level_mapping( "indic_syllabic_table", @indic_table); @@ -1282,7 +1281,6 @@ sub dump_linebreak($) print OUTPUT "/* Unicode Line Break Properties */\n"; print OUTPUT "/* generated from $UNIDATA/LineBreak.txt */\n"; print OUTPUT "/* DO NOT EDIT!! */\n\n"; - print OUTPUT "#include \"wine/unicode.h\"\n\n"; dump_two_level_mapping( "wine_linebreak_table", @break_table); @@ -1358,7 +1356,6 @@ sub dump_shaping($) print OUTPUT "/* Unicode Arabic shaping */\n"; print OUTPUT "/* generated from $UNIDATA/ArabicShaping.txt */\n"; print OUTPUT "/* DO NOT EDIT!! */\n\n"; - print OUTPUT "#include \"wine/unicode.h\"\n\n"; dump_two_level_mapping( "wine_shaping_table", @joining_table ); @@ -1419,7 +1416,6 @@ sub dump_vertical($) print OUTPUT "/* Unicode Vertical Orientation */\n"; print OUTPUT "/* generated from $VERTICALDATA/VerticalOrientation-11.txt */\n"; print OUTPUT "/* DO NOT EDIT!! */\n\n"; - print OUTPUT "#include \"wine/unicode.h\"\n\n"; dump_two_level_mapping( "vertical_orientation_table", @vertical_table); @@ -1755,7 +1751,6 @@ sub dump_nameprep($) print OUTPUT "/* Nameprep algorithm related data */\n"; print OUTPUT "/* generated from $RFCS/$STRINGPREP */\n"; print OUTPUT "/* DO NOT EDIT!! */\n\n"; - print OUTPUT "#include \"wine/unicode.h\"\n\n"; dump_two_level_mapping( "nameprep_char_type", @flags_table ); @@ -1793,7 +1788,7 @@ sub dump_nameprep($) } # dump the main index - printf OUTPUT "const WCHAR nameprep_mapping[%d] =\n", $total; + printf OUTPUT "const unsigned short nameprep_mapping[%d] =\n", $total; printf OUTPUT "{\n /* index */\n"; printf OUTPUT "%s", DUMP_ARRAY( "0x%04x", 0, @filled_idx ); printf OUTPUT ",\n /* null sub-index */\n%s", DUMP_ARRAY( "0x%04x", 0, ($null_offset) x 16 );

1 0

Austin English : kernel32: Initialize return value in CreateSemaphoreExW.
by Alexandre Julliard July 8, 2014

July 8, 2014

Module: wine Branch: master Commit: 149d60318fac6314726f256c1cca1e8c4806202b URL: http://source.winehq.org/git/wine.git/?a=commit;h=149d60318fac6314726f256c1… Author: Austin English <austinenglish(a)gmail.com> Date: Mon Jul 7 20:08:39 2014 -0700 kernel32: Initialize return value in CreateSemaphoreExW. --- dlls/kernel32/sync.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernel32/sync.c b/dlls/kernel32/sync.c index d363e1f..d9f69c3 100644 --- a/dlls/kernel32/sync.c +++ b/dlls/kernel32/sync.c @@ -777,7 +777,7 @@ HANDLE WINAPI DECLSPEC_HOTPATCH CreateSemaphoreExA( SECURITY_ATTRIBUTES *sa, LON HANDLE WINAPI DECLSPEC_HOTPATCH CreateSemaphoreExW( SECURITY_ATTRIBUTES *sa, LONG initial, LONG max, LPCWSTR name, DWORD flags, DWORD access ) { - HANDLE ret; + HANDLE ret = 0; UNICODE_STRING nameW; OBJECT_ATTRIBUTES attr; NTSTATUS status;

1 0

Huw Davies : comctl32: The RECT in the custom draw structure should be the entire item' s size. This includes any separated dropdown arrow.
by Alexandre Julliard July 8, 2014

July 8, 2014

Module: wine Branch: master Commit: 6af0d44166e4fad8078a0311b3632a19856d390e URL: http://source.winehq.org/git/wine.git/?a=commit;h=6af0d44166e4fad8078a0311b… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Jul 8 13:53:51 2014 +0100 comctl32: The RECT in the custom draw structure should be the entire item's size. This includes any separated dropdown arrow. --- dlls/comctl32/toolbar.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c index c90c4bb..a1b7966 100644 --- a/dlls/comctl32/toolbar.c +++ b/dlls/comctl32/toolbar.c @@ -954,7 +954,7 @@ TOOLBAR_DrawButton (const TOOLBAR_INFO *infoPtr, TBUTTON_INFO *btnPtr, HDC hdc, tbcd.rcText.bottom = rcText.bottom - rc.top; tbcd.nmcd.uItemState = TOOLBAR_TranslateState(btnPtr); tbcd.nmcd.hdc = hdc; - tbcd.nmcd.rc = rc; + tbcd.nmcd.rc = btnPtr->rect; tbcd.hbrMonoDither = COMCTL32_hPattern55AABrush; /* FIXME: what are these used for? */ @@ -972,7 +972,7 @@ TOOLBAR_DrawButton (const TOOLBAR_INFO *infoPtr, TBUTTON_INFO *btnPtr, HDC hdc, ntfret = TOOLBAR_SendNotify(&tbcd.nmcd.hdr, infoPtr, NM_CUSTOMDRAW); /* reset these fields so the user can't alter the behaviour like native */ tbcd.nmcd.hdc = hdc; - tbcd.nmcd.rc = rc; + tbcd.nmcd.rc = btnPtr->rect; dwItemCustDraw = ntfret & 0xffff; dwItemCDFlag = ntfret & 0xffff0000;

1 0

Bruno Jesus : winspool: Fix a leak in DocumentPropertiesA (valgrind).
by Alexandre Julliard July 8, 2014

July 8, 2014

Module: wine Branch: master Commit: daaa4c40d46e08e2bb3ab5ddb5889bdc6e782594 URL: http://source.winehq.org/git/wine.git/?a=commit;h=daaa4c40d46e08e2bb3ab5ddb… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Mon Jul 7 21:12:25 2014 -0300 winspool: Fix a leak in DocumentPropertiesA (valgrind). --- dlls/winspool.drv/info.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index bfb22cb..73323f8 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -2361,7 +2361,7 @@ LONG WINAPI DocumentPropertiesA(HWND hWnd,HANDLE hPrinter, LPSTR pDeviceName, LPDEVMODEA pDevModeOutput, LPDEVMODEA pDevModeInput,DWORD fMode ) { - LPSTR lpName = pDeviceName; + LPSTR lpName = pDeviceName, dupname = NULL; static CHAR port[] = "LPT1:"; LONG ret; @@ -2376,7 +2376,7 @@ LONG WINAPI DocumentPropertiesA(HWND hWnd,HANDLE hPrinter, SetLastError(ERROR_INVALID_HANDLE); return -1; } - lpName = strdupWtoA(lpNameW); + lpName = dupname = strdupWtoA(lpNameW); } if (!GDI_CallExtDeviceMode16) @@ -2385,14 +2385,15 @@ LONG WINAPI DocumentPropertiesA(HWND hWnd,HANDLE hPrinter, (LPCSTR)102 ); if (!GDI_CallExtDeviceMode16) { ERR("No CallExtDeviceMode16?\n"); - return -1; + ret = -1; + goto end; } } ret = GDI_CallExtDeviceMode16(hWnd, pDevModeOutput, lpName, port, pDevModeInput, NULL, fMode); - if(!pDeviceName) - HeapFree(GetProcessHeap(),0,lpName); +end: + HeapFree(GetProcessHeap(), 0, dupname); return ret; }

1 0

Ken Thomases : dbghelp: If the caller didn' t provide a module load address use the segment start address.
by Alexandre Julliard July 7, 2014

July 7, 2014

Module: wine Branch: master Commit: 1f2680f5f39f14c3160d689a5237e365334938d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f2680f5f39f14c3160d689a5… Author: Ken Thomases <ken(a)codeweavers.com> Date: Mon Jul 7 15:35:44 2014 -0500 dbghelp: If the caller didn't provide a module load address use the segment start address. --- dlls/dbghelp/macho_module.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/dbghelp/macho_module.c b/dlls/dbghelp/macho_module.c index c6270c8..ebea4fd 100644 --- a/dlls/dbghelp/macho_module.c +++ b/dlls/dbghelp/macho_module.c @@ -1020,6 +1020,8 @@ static BOOL macho_load_file(struct process* pcs, const WCHAR* filename, struct module_format* modfmt = HeapAlloc(GetProcessHeap(), 0, sizeof(struct module_format) + sizeof(struct macho_module_info)); if (!modfmt) goto leave; + if (!load_addr) + load_addr = fmap.segs_start; macho_info->module = module_new(pcs, filename, DMT_MACHO, FALSE, load_addr, fmap.segs_size, 0, calc_crc32(fmap.fd)); if (!macho_info->module)

1 0

Ken Thomases : dbghelp: Ignore the __PAGEZERO segment.
by Alexandre Julliard July 7, 2014

July 7, 2014

Module: wine Branch: master Commit: 5acf1510fbe4f17d35443666ddd9d123de253e1c URL: http://source.winehq.org/git/wine.git/?a=commit;h=5acf1510fbe4f17d35443666d… Author: Ken Thomases <ken(a)codeweavers.com> Date: Mon Jul 7 15:36:14 2014 -0500 dbghelp: Ignore the __PAGEZERO segment. It made it seem as though the wineloader always started at address 0. Issue identified by Jacek Caban. --- dlls/dbghelp/macho_module.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/dbghelp/macho_module.c b/dlls/dbghelp/macho_module.c index ebea4fd..2eb2b94 100644 --- a/dlls/dbghelp/macho_module.c +++ b/dlls/dbghelp/macho_module.c @@ -398,6 +398,11 @@ static int macho_accum_segs_range(struct macho_file_map* fmap, TRACE("Ignoring special Wine segment %s\n", debugstr_an(sc->segname, sizeof(sc->segname))); return 0; } + if (!strncmp(sc->segname, "__PAGEZERO", 10)) + { + TRACE("Ignoring __PAGEZERO segment\n"); + return 0; + } /* If this segment starts before previously-known earliest, record * new earliest. */

1 0

Stefan Dösinger : ddraw: Refuse SetPalette and GetPalette on lost surfaces.
by Alexandre Julliard July 7, 2014

July 7, 2014

Module: wine Branch: master Commit: 403d7c1dee11959dfaa781a14ed6f4c8fae90292 URL: http://source.winehq.org/git/wine.git/?a=commit;h=403d7c1dee11959dfaa781a14… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun Jul 6 18:06:43 2014 +0200 ddraw: Refuse SetPalette and GetPalette on lost surfaces. The SetPalette check is outside of ddraw_surface_set_palette to make sure the palettes are properly freed when a lost P8 surface is destroyed. --- dlls/ddraw/surface.c | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index e0fdf81..3d61e61 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -4515,6 +4515,11 @@ static HRESULT WINAPI ddraw_surface7_GetPalette(IDirectDrawSurface7 *iface, IDir if (!palette) return DDERR_INVALIDPARAMS; + if (IDirectDrawSurface7_IsLost(iface) == DDERR_SURFACELOST) + { + WARN("Surface lost, returning DDERR_SURFACELOST.\n"); + return DDERR_SURFACELOST; + } wined3d_mutex_lock(); if ((palette_impl = surface->palette)) @@ -4705,6 +4710,11 @@ static HRESULT WINAPI ddraw_surface7_SetPalette(IDirectDrawSurface7 *iface, IDir if (surface->surface_desc.ddsCaps.dwCaps2 & DDSCAPS2_MIPMAPSUBLEVEL) return DDERR_NOTONMIPMAPSUBLEVEL; + if (IDirectDrawSurface7_IsLost(iface) == DDERR_SURFACELOST) + { + WARN("Surface lost, returning DDERR_SURFACELOST.\n"); + return DDERR_SURFACELOST; + } return ddraw_surface_set_palette(surface, palette); } @@ -4715,6 +4725,12 @@ static HRESULT WINAPI ddraw_surface4_SetPalette(IDirectDrawSurface4 *iface, IDir TRACE("iface %p, palette %p.\n", iface, palette); + if (IDirectDrawSurface4_IsLost(iface) == DDERR_SURFACELOST) + { + WARN("Surface lost, returning DDERR_SURFACELOST.\n"); + return DDERR_SURFACELOST; + } + return ddraw_surface_set_palette(surface, palette); } @@ -4724,6 +4740,12 @@ static HRESULT WINAPI ddraw_surface3_SetPalette(IDirectDrawSurface3 *iface, IDir TRACE("iface %p, palette %p.\n", iface, palette); + if (IDirectDrawSurface3_IsLost(iface) == DDERR_SURFACELOST) + { + WARN("Surface lost, returning DDERR_SURFACELOST.\n"); + return DDERR_SURFACELOST; + } + return ddraw_surface_set_palette(surface, palette); } @@ -4733,6 +4755,12 @@ static HRESULT WINAPI ddraw_surface2_SetPalette(IDirectDrawSurface2 *iface, IDir TRACE("iface %p, palette %p.\n", iface, palette); + if (IDirectDrawSurface2_IsLost(iface) == DDERR_SURFACELOST) + { + WARN("Surface lost, returning DDERR_SURFACELOST.\n"); + return DDERR_SURFACELOST; + } + return ddraw_surface_set_palette(surface, palette); } @@ -4742,6 +4770,12 @@ static HRESULT WINAPI ddraw_surface1_SetPalette(IDirectDrawSurface *iface, IDire TRACE("iface %p, palette %p.\n", iface, palette); + if (IDirectDrawSurface_IsLost(iface) == DDERR_SURFACELOST) + { + WARN("Surface lost, returning DDERR_SURFACELOST.\n"); + return DDERR_SURFACELOST; + } + return ddraw_surface_set_palette(surface, palette); }

1 0

Francois Gouget : shlwapi/tests: Make test_PathIsRelative[AW]() static.
by Alexandre Julliard July 7, 2014

July 7, 2014

Module: wine Branch: master Commit: ece6f5c3e00fc3834fe9944cb370e9b972446cda URL: http://source.winehq.org/git/wine.git/?a=commit;h=ece6f5c3e00fc3834fe9944cb… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Jul 5 11:15:09 2014 +0200 shlwapi/tests: Make test_PathIsRelative[AW]() static. --- dlls/shlwapi/tests/path.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/shlwapi/tests/path.c b/dlls/shlwapi/tests/path.c index 9fe70cd..1599313 100644 --- a/dlls/shlwapi/tests/path.c +++ b/dlls/shlwapi/tests/path.c @@ -1600,7 +1600,7 @@ static const struct { {"file:///C:/test.txt", TRUE} }; -void test_PathIsRelativeA(void) +static void test_PathIsRelativeA(void) { BOOL ret; int i, num; @@ -1619,7 +1619,7 @@ void test_PathIsRelativeA(void) } } -void test_PathIsRelativeW(void) +static void test_PathIsRelativeW(void) { BOOL ret; int i, num;

1 0

Stefan Dösinger : wined3d: Do not write a FIXME about WINED3DUSAGE_WRITEONLY.
by Alexandre Julliard July 7, 2014

July 7, 2014

Module: wine Branch: master Commit: 4b88d51bc9ce7c41c01a2c046f7b412eace5f380 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b88d51bc9ce7c41c01a2c046… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun Jul 6 18:06:42 2014 +0200 wined3d: Do not write a FIXME about WINED3DUSAGE_WRITEONLY. --- dlls/wined3d/resource.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c index 999dc5c..3a54dd8 100644 --- a/dlls/wined3d/resource.c +++ b/dlls/wined3d/resource.c @@ -26,6 +26,7 @@ #include "wined3d_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d); +WINE_DECLARE_DEBUG_CHANNEL(d3d_perf); static DWORD resource_access_from_pool(enum wined3d_pool pool) { @@ -51,6 +52,7 @@ static void resource_check_usage(DWORD usage) { static const DWORD handled = WINED3DUSAGE_RENDERTARGET | WINED3DUSAGE_DEPTHSTENCIL + | WINED3DUSAGE_WRITEONLY | WINED3DUSAGE_DYNAMIC | WINED3DUSAGE_AUTOGENMIPMAP | WINED3DUSAGE_STATICDECL @@ -59,6 +61,8 @@ static void resource_check_usage(DWORD usage) if (usage & ~handled) FIXME("Unhandled usage flags %#x.\n", usage & ~handled); + if ((usage & (WINED3DUSAGE_DYNAMIC | WINED3DUSAGE_WRITEONLY)) == WINED3DUSAGE_DYNAMIC) + WARN_(d3d_perf)("WINED3DUSAGE_DYNAMIC used without WINED3DUSAGE_WRITEONLY.\n"); } HRESULT resource_init(struct wined3d_resource *resource, struct wined3d_device *device,

1 0

Bruno Jesus : dnsapi: Do not fail if NETDB_INTERNAL is not present.
by Alexandre Julliard July 7, 2014

July 7, 2014

Module: wine Branch: master Commit: 836e6690d456c0f5e095be42a8ed15252160ff51 URL: http://source.winehq.org/git/wine.git/?a=commit;h=836e6690d456c0f5e095be42a… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Sun Jul 6 22:22:18 2014 -0300 dnsapi: Do not fail if NETDB_INTERNAL is not present. --- dlls/dnsapi/query.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/dnsapi/query.c b/dlls/dnsapi/query.c index 578239e..e05205b 100644 --- a/dlls/dnsapi/query.c +++ b/dlls/dnsapi/query.c @@ -147,7 +147,9 @@ static DNS_STATUS dns_map_h_errno( int error ) case HOST_NOT_FOUND: return DNS_ERROR_RCODE_NAME_ERROR; case TRY_AGAIN: return DNS_ERROR_RCODE_SERVER_FAILURE; case NO_RECOVERY: return DNS_ERROR_RCODE_REFUSED; +#ifdef NETDB_INTERNAL case NETDB_INTERNAL: return DNS_ERROR_RCODE; +#endif default: FIXME( "unmapped error code: %d\n", error ); return DNS_ERROR_RCODE_NOT_IMPLEMENTED;

1 0

Jactry Zeng : riched20: Return nonzero value instead of zero when EM_SETREADONLY succeeds.
by Alexandre Julliard July 4, 2014

July 4, 2014

Module: wine Branch: master Commit: 455eca6d228a4850214345be2cccc665bece5a0e URL: http://source.winehq.org/git/wine.git/?a=commit;h=455eca6d228a4850214345be2… Author: Jactry Zeng <wine(a)jactry.com> Date: Fri Jul 4 22:51:35 2014 +0800 riched20: Return nonzero value instead of zero when EM_SETREADONLY succeeds. --- dlls/riched20/editor.c | 2 +- dlls/riched20/tests/editor.c | 20 ++++++++++++++++++++ 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index f0d6590..43d74ec 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -3479,7 +3479,7 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, editor->styleFlags |= ES_READONLY; else editor->styleFlags &= ~ES_READONLY; - return 0; + return 1; } case EM_SETEVENTMASK: { diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index 5421614..3bd3ec0 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -7576,6 +7576,25 @@ static void test_reset_default_para_fmt( void ) DestroyWindow( richedit ); } +static void test_EM_SETREADONLY(void) +{ + HWND richedit = new_richeditW(NULL); + DWORD dwStyle; + LRESULT res; + + res = SendMessageA(richedit, EM_SETREADONLY, TRUE, 0); + ok(res == 1, "EM_SETREADONLY\n"); + dwStyle = GetWindowLongA(richedit, GWL_STYLE); + ok(dwStyle & ES_READONLY, "got wrong value: 0x%x\n", dwStyle & ES_READONLY); + + res = SendMessageA(richedit, EM_SETREADONLY, FALSE, 0); + ok(res == 1, "EM_SETREADONLY\n"); + dwStyle = GetWindowLongA(richedit, GWL_STYLE); + ok(!(dwStyle & ES_READONLY), "got wrong value: 0x%x\n", dwStyle & ES_READONLY); + + DestroyWindow(richedit); +} + START_TEST( editor ) { BOOL ret; @@ -7639,6 +7658,7 @@ START_TEST( editor ) test_enter(); test_WM_CREATE(); test_reset_default_para_fmt(); + test_EM_SETREADONLY(); /* Set the environment variable WINETEST_RICHED20 to keep windows * responsive and open for 30 seconds. This is useful for debugging.

1 0

Vincent Povirk : urlmon: Add tests for implicit file uri' s with percent encodings.
by Alexandre Julliard July 4, 2014

July 4, 2014

Module: wine Branch: master Commit: dd1423d97b1ef715fb90d88672aee597014913f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dd1423d97b1ef715fb90d8867… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Jul 3 11:45:54 2014 -0500 urlmon: Add tests for implicit file uri's with percent encodings. --- dlls/urlmon/tests/uri.c | 102 +++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 101 insertions(+), 1 deletion(-) diff --git a/dlls/urlmon/tests/uri.c b/dlls/urlmon/tests/uri.c index 737d1bb..d448566 100644 --- a/dlls/urlmon/tests/uri.c +++ b/dlls/urlmon/tests/uri.c @@ -4571,7 +4571,107 @@ static const uri_properties uri_tests[] = { {URL_SCHEME_MAILTO,S_OK}, {URLZONE_INVALID,E_NOTIMPL} } - } + }, + { "c:\\test file.html", Uri_CREATE_FILE_USE_DOS_PATH|Uri_CREATE_ALLOW_IMPLICIT_FILE_SCHEME, S_OK, FALSE, + { + {"file://c:\\test file.html",S_OK,FALSE}, + {"",S_FALSE,FALSE}, + {"file://c:\\test file.html",S_OK,FALSE}, + {"",S_FALSE,FALSE}, + {".html",S_OK,FALSE}, + {"",S_FALSE,FALSE}, + {"",S_FALSE,FALSE}, + {"",S_FALSE,FALSE}, + {"c:\\test file.html",S_OK,FALSE}, + {"c:\\test file.html",S_OK,FALSE}, + {"",S_FALSE,FALSE}, + {"c:\\test file.html",S_OK,FALSE}, + {"file",S_OK,FALSE}, + {"",S_FALSE,FALSE}, + {"",S_FALSE,FALSE} + }, + { + {Uri_HOST_UNKNOWN,S_OK,FALSE}, + {0,S_FALSE,FALSE}, + {URL_SCHEME_FILE,S_OK,FALSE}, + {URLZONE_INVALID,E_NOTIMPL,FALSE} + } + }, + { "c:\\test%20file.html", Uri_CREATE_FILE_USE_DOS_PATH|Uri_CREATE_ALLOW_IMPLICIT_FILE_SCHEME, S_OK, FALSE, + { + {"file://c:\\test%20file.html",S_OK,FALSE}, + {"",S_FALSE,FALSE}, + {"file://c:\\test%20file.html",S_OK,FALSE}, + {"",S_FALSE,FALSE}, + {".html",S_OK,FALSE}, + {"",S_FALSE,FALSE}, + {"",S_FALSE,FALSE}, + {"",S_FALSE,FALSE}, + {"c:\\test%20file.html",S_OK,FALSE}, + {"c:\\test%20file.html",S_OK,FALSE}, + {"",S_FALSE,FALSE}, + {"c:\\test%20file.html",S_OK,FALSE}, + {"file",S_OK,FALSE}, + {"",S_FALSE,FALSE}, + {"",S_FALSE,FALSE} + }, + { + {Uri_HOST_UNKNOWN,S_OK,FALSE}, + {0,S_FALSE,FALSE}, + {URL_SCHEME_FILE,S_OK,FALSE}, + {URLZONE_INVALID,E_NOTIMPL,FALSE} + } + }, + { "c:\\test file.html", Uri_CREATE_ALLOW_IMPLICIT_FILE_SCHEME, S_OK, FALSE, + { + {"file:///c:/test%20file.html",S_OK,FALSE}, + {"",S_FALSE,FALSE}, + {"file:///c:/test%20file.html",S_OK,FALSE}, + {"",S_FALSE,FALSE}, + {".html",S_OK,FALSE}, + {"",S_FALSE,FALSE}, + {"",S_FALSE,FALSE}, + {"",S_FALSE,FALSE}, + {"/c:/test%20file.html",S_OK,FALSE}, + {"/c:/test%20file.html",S_OK,FALSE}, + {"",S_FALSE,FALSE}, + {"c:\\test file.html",S_OK,FALSE}, + {"file",S_OK,FALSE}, + {"",S_FALSE,FALSE}, + {"",S_FALSE,FALSE} + }, + { + {Uri_HOST_UNKNOWN,S_OK,FALSE}, + {0,S_FALSE,FALSE}, + {URL_SCHEME_FILE,S_OK,FALSE}, + {URLZONE_INVALID,E_NOTIMPL,FALSE} + } + }, + { "c:\\test%20file.html", Uri_CREATE_ALLOW_IMPLICIT_FILE_SCHEME, S_OK, FALSE, + { + {"file:///c:/test%2520file.html",S_OK,FALSE}, + {"",S_FALSE,FALSE}, + {"file:///c:/test%2520file.html",S_OK,FALSE}, + {"",S_FALSE,FALSE}, + {".html",S_OK,FALSE}, + {"",S_FALSE,FALSE}, + {"",S_FALSE,FALSE}, + {"",S_FALSE,FALSE}, + {"/c:/test%2520file.html",S_OK,FALSE}, + {"/c:/test%2520file.html",S_OK,FALSE}, + {"",S_FALSE,FALSE}, + {"c:\\test%20file.html",S_OK,FALSE}, + {"file",S_OK,FALSE}, + {"",S_FALSE,FALSE}, + {"",S_FALSE,FALSE} + }, + { + {Uri_HOST_UNKNOWN,S_OK,FALSE}, + {0,S_FALSE,FALSE}, + {URL_SCHEME_FILE,S_OK,FALSE}, + {URLZONE_INVALID,E_NOTIMPL,FALSE} + } + } }; typedef struct _invalid_uri {

1 0

Akihiro Sagawa : winmm: Fallback to SND_FILENAME if the alias isn' t found in the profile.
by Alexandre Julliard July 4, 2014

July 4, 2014

Module: wine Branch: master Commit: 113a2abbc8257fc4d83682c5c5fe4f344569806f URL: http://source.winehq.org/git/wine.git/?a=commit;h=113a2abbc8257fc4d83682c5c… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Sat Jul 5 00:37:12 2014 +0900 winmm: Fallback to SND_FILENAME if the alias isn't found in the profile. --- dlls/winmm/playsound.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/winmm/playsound.c b/dlls/winmm/playsound.c index 64db333..f8bd91f 100644 --- a/dlls/winmm/playsound.c +++ b/dlls/winmm/playsound.c @@ -338,6 +338,11 @@ static DWORD WINAPI proc_PlaySound(LPVOID arg) else goto errCleanUp; } hmmio = get_mmioFromProfile(wps->fdwSound, wps->pszSound); + if (!hmmio) + { + wps->fdwSound &= ~SND_ALIAS; + wps->fdwSound |= SND_FILENAME; + } } if (!hmmio && wps->fdwSound & SND_FILENAME) {

1 0

Jacek Caban : wininet: Added support for INTERNET_COOKIE_HTTPONLY flag to InternetSetCookieEx.
by Alexandre Julliard July 4, 2014

July 4, 2014

Module: wine Branch: master Commit: 314e295820660a2aa325e0dbc244dc7990514b86 URL: http://source.winehq.org/git/wine.git/?a=commit;h=314e295820660a2aa325e0dbc… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jul 4 14:45:26 2014 +0200 wininet: Added support for INTERNET_COOKIE_HTTPONLY flag to InternetSetCookieEx. --- dlls/wininet/cookie.c | 24 ++++++++++++++++-------- dlls/wininet/http.c | 2 +- dlls/wininet/internet.h | 2 +- 3 files changed, 18 insertions(+), 10 deletions(-) diff --git a/dlls/wininet/cookie.c b/dlls/wininet/cookie.c index 015f99d..36e0f60 100644 --- a/dlls/wininet/cookie.c +++ b/dlls/wininet/cookie.c @@ -810,7 +810,7 @@ BOOL WINAPI IsDomainLegalCookieDomainW( LPCWSTR s1, LPCWSTR s2 ) return TRUE; } -DWORD set_cookie(LPCWSTR domain, LPCWSTR path, LPCWSTR cookie_name, LPCWSTR cookie_data) +DWORD set_cookie(const WCHAR *domain, const WCHAR *path, const WCHAR *cookie_name, const WCHAR *cookie_data, DWORD flags) { cookie_domain *thisCookieDomain = NULL; cookie *thisCookie; @@ -819,7 +819,7 @@ DWORD set_cookie(LPCWSTR domain, LPCWSTR path, LPCWSTR cookie_name, LPCWSTR cook WCHAR *ptr; FILETIME expiry, create; BOOL expired = FALSE, update_persistent = FALSE; - DWORD flags = 0; + DWORD cookie_flags = 0; value = data = heap_strdupW(cookie_data); if (!data) @@ -910,7 +910,15 @@ DWORD set_cookie(LPCWSTR domain, LPCWSTR path, LPCWSTR cookie_name, LPCWSTR cook } else if (strncmpiW(ptr, szHttpOnly, 8) == 0) { - FIXME("httponly not handled (%s)\n",debugstr_w(ptr)); + if(!(flags & INTERNET_COOKIE_HTTPONLY)) { + WARN("HTTP only cookie added without INTERNET_COOKIE_HTTPONLY flag\n"); + heap_free(data); + if (value != data) heap_free(value); + SetLastError(ERROR_INVALID_OPERATION); + return COOKIE_STATE_REJECT; + } + + cookie_flags |= INTERNET_COOKIE_HTTPONLY; ptr += strlenW(szHttpOnly); } else if (*ptr) @@ -946,7 +954,7 @@ DWORD set_cookie(LPCWSTR domain, LPCWSTR path, LPCWSTR cookie_name, LPCWSTR cook } if(!expiry.dwLowDateTime && !expiry.dwHighDateTime) - flags |= INTERNET_COOKIE_IS_SESSION; + cookie_flags |= INTERNET_COOKIE_IS_SESSION; else update_persistent = TRUE; @@ -960,7 +968,7 @@ DWORD set_cookie(LPCWSTR domain, LPCWSTR path, LPCWSTR cookie_name, LPCWSTR cook TRACE("setting cookie %s=%s for domain %s path %s\n", debugstr_w(cookie_name), debugstr_w(value), debugstr_w(thisCookieDomain->lpCookieDomain),debugstr_w(thisCookieDomain->lpCookiePath)); - if (!expired && !COOKIE_addCookie(thisCookieDomain, cookie_name, value, expiry, create, flags)) + if (!expired && !COOKIE_addCookie(thisCookieDomain, cookie_name, value, expiry, create, cookie_flags)) { heap_free(data); if (value != data) heap_free(value); @@ -993,7 +1001,7 @@ DWORD WINAPI InternetSetCookieExW(LPCWSTR lpszUrl, LPCWSTR lpszCookieName, TRACE("(%s, %s, %s, %x, %lx)\n", debugstr_w(lpszUrl), debugstr_w(lpszCookieName), debugstr_w(lpCookieData), flags, reserved); - if (flags) + if (flags & ~INTERNET_COOKIE_HTTPONLY) FIXME("flags %x not supported\n", flags); if (!lpszUrl || !lpCookieData) @@ -1024,12 +1032,12 @@ DWORD WINAPI InternetSetCookieExW(LPCWSTR lpszUrl, LPCWSTR lpszCookieName, if (!(data = strchrW(cookie, '='))) data = cookie + strlenW(cookie); else *data++ = 0; - res = set_cookie(hostName, path, cookie, data); + res = set_cookie(hostName, path, cookie, data, flags); heap_free(cookie); return res; } - return set_cookie(hostName, path, lpszCookieName, lpCookieData); + return set_cookie(hostName, path, lpszCookieName, lpCookieData, flags); } /*********************************************************************** diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index bb53a03..af57d9e 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -767,7 +767,7 @@ static void HTTP_ProcessCookies( http_request_t *request ) continue; data++; - set_cookie(host->lpszValue, request->path, name, data); + set_cookie(host->lpszValue, request->path, name, data, INTERNET_COOKIE_HTTPONLY); heap_free(name); } } diff --git a/dlls/wininet/internet.h b/dlls/wininet/internet.h index 45a13ca..233c40c 100644 --- a/dlls/wininet/internet.h +++ b/dlls/wininet/internet.h @@ -421,7 +421,7 @@ BOOL GetAddress(LPCWSTR lpszServerName, INTERNET_PORT nServerPort, struct sockaddr *psa, socklen_t *sa_len) DECLSPEC_HIDDEN; DWORD get_cookie(const WCHAR*,const WCHAR*,WCHAR*,DWORD*) DECLSPEC_HIDDEN; -DWORD set_cookie(const WCHAR*,const WCHAR*,const WCHAR*,const WCHAR*) DECLSPEC_HIDDEN; +DWORD set_cookie(const WCHAR*,const WCHAR*,const WCHAR*,const WCHAR*,DWORD) DECLSPEC_HIDDEN; void INTERNET_SetLastError(DWORD dwError) DECLSPEC_HIDDEN; DWORD INTERNET_GetLastError(void) DECLSPEC_HIDDEN;

1 0

Jacek Caban : wininet: Fixed InternetSetCookieExW return type and forward InternetSetCookieW to InternetSetCookieExW instead of the other way around.
by Alexandre Julliard July 4, 2014

July 4, 2014

Module: wine Branch: master Commit: b3cfae810853b4cc59519c1255bd796e6de9301e URL: http://source.winehq.org/git/wine.git/?a=commit;h=b3cfae810853b4cc59519c125… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jul 4 14:45:17 2014 +0200 wininet: Fixed InternetSetCookieExW return type and forward InternetSetCookieW to InternetSetCookieExW instead of the other way around. --- dlls/wininet/cookie.c | 77 +++++++++++++++++++++---------------------------- dlls/wininet/internet.h | 2 +- 2 files changed, 34 insertions(+), 45 deletions(-) diff --git a/dlls/wininet/cookie.c b/dlls/wininet/cookie.c index fbc6949..015f99d 100644 --- a/dlls/wininet/cookie.c +++ b/dlls/wininet/cookie.c @@ -810,7 +810,7 @@ BOOL WINAPI IsDomainLegalCookieDomainW( LPCWSTR s1, LPCWSTR s2 ) return TRUE; } -BOOL set_cookie(LPCWSTR domain, LPCWSTR path, LPCWSTR cookie_name, LPCWSTR cookie_data) +DWORD set_cookie(LPCWSTR domain, LPCWSTR path, LPCWSTR cookie_name, LPCWSTR cookie_data) { cookie_domain *thisCookieDomain = NULL; cookie *thisCookie; @@ -825,7 +825,7 @@ BOOL set_cookie(LPCWSTR domain, LPCWSTR path, LPCWSTR cookie_name, LPCWSTR cooki if (!data) { ERR("could not allocate the cookie data buffer\n"); - return FALSE; + return COOKIE_STATE_UNKNOWN; } memset(&expiry,0,sizeof(expiry)); @@ -851,7 +851,7 @@ BOOL set_cookie(LPCWSTR domain, LPCWSTR path, LPCWSTR cookie_name, LPCWSTR cooki { heap_free(data); ERR("could not allocate the cookie value buffer\n"); - return FALSE; + return COOKIE_STATE_UNKNOWN; } strcpyW(value, data); @@ -873,7 +873,7 @@ BOOL set_cookie(LPCWSTR domain, LPCWSTR path, LPCWSTR cookie_name, LPCWSTR cooki if(value != data) heap_free(value); heap_free(data); - return FALSE; + return COOKIE_STATE_UNKNOWN; } if(end_ptr) @@ -941,7 +941,7 @@ BOOL set_cookie(LPCWSTR domain, LPCWSTR path, LPCWSTR cookie_name, LPCWSTR cooki heap_free(data); if (value != data) heap_free(value); LeaveCriticalSection(&cookie_cs); - return TRUE; + return COOKIE_STATE_ACCEPT; } } @@ -965,7 +965,7 @@ BOOL set_cookie(LPCWSTR domain, LPCWSTR path, LPCWSTR cookie_name, LPCWSTR cooki heap_free(data); if (value != data) heap_free(value); LeaveCriticalSection(&cookie_cs); - return FALSE; + return COOKIE_STATE_UNKNOWN; } heap_free(data); if (value != data) heap_free(value); @@ -973,50 +973,49 @@ BOOL set_cookie(LPCWSTR domain, LPCWSTR path, LPCWSTR cookie_name, LPCWSTR cooki if (!update_persistent || save_persistent_cookie(thisCookieDomain)) { LeaveCriticalSection(&cookie_cs); - return TRUE; + return COOKIE_STATE_ACCEPT; } LeaveCriticalSection(&cookie_cs); - return FALSE; + return COOKIE_STATE_UNKNOWN; } /*********************************************************************** - * InternetSetCookieW (WININET.@) + * InternetSetCookieExW (WININET.@) * * Sets cookie for the specified url - * - * RETURNS - * TRUE on success - * FALSE on failure - * */ -BOOL WINAPI InternetSetCookieW(LPCWSTR lpszUrl, LPCWSTR lpszCookieName, - LPCWSTR lpCookieData) +DWORD WINAPI InternetSetCookieExW(LPCWSTR lpszUrl, LPCWSTR lpszCookieName, + LPCWSTR lpCookieData, DWORD flags, DWORD_PTR reserved) { BOOL ret; WCHAR hostName[INTERNET_MAX_HOST_NAME_LENGTH], path[INTERNET_MAX_PATH_LENGTH]; - TRACE("(%s,%s,%s)\n", debugstr_w(lpszUrl), - debugstr_w(lpszCookieName), debugstr_w(lpCookieData)); + TRACE("(%s, %s, %s, %x, %lx)\n", debugstr_w(lpszUrl), debugstr_w(lpszCookieName), + debugstr_w(lpCookieData), flags, reserved); + + if (flags) + FIXME("flags %x not supported\n", flags); if (!lpszUrl || !lpCookieData) { SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; + return COOKIE_STATE_UNKNOWN; } hostName[0] = 0; ret = COOKIE_crackUrlSimple(lpszUrl, hostName, sizeof(hostName)/sizeof(hostName[0]), path, sizeof(path)/sizeof(path[0])); - if (!ret || !hostName[0]) return FALSE; + if (!ret || !hostName[0]) return COOKIE_STATE_UNKNOWN; if (!lpszCookieName) { WCHAR *cookie, *data; + DWORD res; cookie = heap_strdupW(lpCookieData); if (!cookie) { SetLastError(ERROR_OUTOFMEMORY); - return FALSE; + return COOKIE_STATE_UNKNOWN; } /* some apps (or is it us??) try to add a cookie with no cookie name, but @@ -1025,14 +1024,25 @@ BOOL WINAPI InternetSetCookieW(LPCWSTR lpszUrl, LPCWSTR lpszCookieName, if (!(data = strchrW(cookie, '='))) data = cookie + strlenW(cookie); else *data++ = 0; - ret = set_cookie(hostName, path, cookie, data); + res = set_cookie(hostName, path, cookie, data); heap_free(cookie); - return ret; + return res; } return set_cookie(hostName, path, lpszCookieName, lpCookieData); } +/*********************************************************************** + * InternetSetCookieW (WININET.@) + * + * Sets a cookie for the specified URL. + */ +BOOL WINAPI InternetSetCookieW(const WCHAR *url, const WCHAR *name, const WCHAR *data) +{ + TRACE("(%s, %s, %s)\n", debugstr_w(url), debugstr_w(name), debugstr_w(data)); + + return InternetSetCookieExW(url, name, data, 0, 0) == COOKIE_STATE_ACCEPT; +} /*********************************************************************** * InternetSetCookieA (WININET.@) @@ -1092,27 +1102,6 @@ DWORD WINAPI InternetSetCookieExA( LPCSTR lpszURL, LPCSTR lpszCookieName, LPCSTR } /*********************************************************************** - * InternetSetCookieExW (WININET.@) - * - * Sets a cookie for the specified URL. - * - * RETURNS - * TRUE on success - * FALSE on failure - * - */ -DWORD WINAPI InternetSetCookieExW( LPCWSTR lpszURL, LPCWSTR lpszCookieName, LPCWSTR lpszCookieData, - DWORD dwFlags, DWORD_PTR dwReserved) -{ - TRACE("(%s, %s, %s, 0x%08x, 0x%08lx)\n", - debugstr_w(lpszURL), debugstr_w(lpszCookieName), debugstr_w(lpszCookieData), - dwFlags, dwReserved); - - if (dwFlags) FIXME("flags 0x%08x not supported\n", dwFlags); - return InternetSetCookieW(lpszURL, lpszCookieName, lpszCookieData); -} - -/*********************************************************************** * InternetClearAllPerSiteCookieDecisions (WININET.@) * * Clears all per-site decisions about cookies. diff --git a/dlls/wininet/internet.h b/dlls/wininet/internet.h index b823e43..45a13ca 100644 --- a/dlls/wininet/internet.h +++ b/dlls/wininet/internet.h @@ -421,7 +421,7 @@ BOOL GetAddress(LPCWSTR lpszServerName, INTERNET_PORT nServerPort, struct sockaddr *psa, socklen_t *sa_len) DECLSPEC_HIDDEN; DWORD get_cookie(const WCHAR*,const WCHAR*,WCHAR*,DWORD*) DECLSPEC_HIDDEN; -BOOL set_cookie(const WCHAR*,const WCHAR*,const WCHAR*,const WCHAR*) DECLSPEC_HIDDEN; +DWORD set_cookie(const WCHAR*,const WCHAR*,const WCHAR*,const WCHAR*) DECLSPEC_HIDDEN; void INTERNET_SetLastError(DWORD dwError) DECLSPEC_HIDDEN; DWORD INTERNET_GetLastError(void) DECLSPEC_HIDDEN;

1 0