January 2009 - Wine-commits

Hans Leidekker : wininet: Implement IsDomainLegalCookieDomainW.
by Alexandre Julliard 30 Jan '09

30 Jan '09

Module: wine Branch: master Commit: 2d42f291c81ee400f0e34b054ca70402563da404 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d42f291c81ee400f0e34b054… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Jan 29 16:59:33 2009 +0100 wininet: Implement IsDomainLegalCookieDomainW. --- dlls/wininet/cookie.c | 25 ++++++++ dlls/wininet/tests/internet.c | 131 +++++++++++++++++++++++++++++++++++++++++ dlls/wininet/wininet.spec | 2 +- 3 files changed, 157 insertions(+), 1 deletions(-) diff --git a/dlls/wininet/cookie.c b/dlls/wininet/cookie.c index 1ee8809..c6352c8 100644 --- a/dlls/wininet/cookie.c +++ b/dlls/wininet/cookie.c @@ -696,3 +696,28 @@ BOOL WINAPI InternetSetPerSiteCookieDecisionW( LPCWSTR pchHostName, DWORD dwDeci FIXME("(%s, 0x%08x) stub\n", debugstr_w(pchHostName), dwDecision); return FALSE; } + +/*********************************************************************** + * IsDomainLegalCookieDomainW (WININET.@) + */ +BOOL WINAPI IsDomainLegalCookieDomainW( LPCWSTR s1, LPCWSTR s2 ) +{ + const WCHAR *p; + + FIXME("(%s, %s)\n", debugstr_w(s1), debugstr_w(s2)); + + if (!s1 || !s2) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + if (s1[0] == '.' || !s1[0] || s2[0] == '.' || !s2[0]) + { + SetLastError(ERROR_INVALID_NAME); + return FALSE; + } + if (!(p = strchrW(s2, '.'))) return FALSE; + if (strchrW(p + 1, '.') && !strcmpW(p + 1, s1)) return TRUE; + else if (!strcmpW(s1, s2)) return TRUE; + return FALSE; +} diff --git a/dlls/wininet/tests/internet.c b/dlls/wininet/tests/internet.c index 5fbfd76..13a5f5c 100644 --- a/dlls/wininet/tests/internet.c +++ b/dlls/wininet/tests/internet.c @@ -31,6 +31,7 @@ static BOOL (WINAPI *pInternetTimeFromSystemTimeA)(CONST SYSTEMTIME *,DWORD ,LPS static BOOL (WINAPI *pInternetTimeFromSystemTimeW)(CONST SYSTEMTIME *,DWORD ,LPWSTR ,DWORD); static BOOL (WINAPI *pInternetTimeToSystemTimeA)(LPCSTR ,SYSTEMTIME *,DWORD); static BOOL (WINAPI *pInternetTimeToSystemTimeW)(LPCWSTR ,SYSTEMTIME *,DWORD); +static BOOL (WINAPI *pIsDomainLegalCookieDomainW)(LPCWSTR, LPCWSTR); /* ############################### */ @@ -526,6 +527,131 @@ static void InternetTimeToSystemTimeW_test(void) ok( ret, "InternetTimeToSystemTimeW failed (%u)\n", GetLastError() ); } +static void test_IsDomainLegalCookieDomainW(void) +{ + BOOL ret; + DWORD error; + static const WCHAR empty[] = {0}; + static const WCHAR dot[] = {'.',0}; + static const WCHAR uk[] = {'u','k',0}; + static const WCHAR com[] = {'c','o','m',0}; + static const WCHAR dot_com[] = {'.','c','o','m',0}; + static const WCHAR gmail_com[] = {'g','m','a','i','l','.','c','o','m',0}; + static const WCHAR dot_gmail_com[] = {'.','g','m','a','i','l','.','c','o','m',0}; + static const WCHAR mail_gmail_com[] = {'m','a','i','l','.','g','m','a','i','l','.','c','o','m',0}; + static const WCHAR gmail_co_uk[] = {'g','m','a','i','l','.','c','o','.','u','k',0}; + static const WCHAR co_uk[] = {'c','o','.','u','k',0}; + static const WCHAR dot_co_uk[] = {'.','c','o','.','u','k',0}; + + SetLastError(0xdeadbeef); + ret = pIsDomainLegalCookieDomainW(NULL, NULL); + error = GetLastError(); + ok(!ret, "IsDomainLegalCookieDomainW succeeded\n"); + ok(error == ERROR_INVALID_PARAMETER, "got %u expected ERROR_INVALID_PARAMETER\n", error); + + SetLastError(0xdeadbeef); + ret = pIsDomainLegalCookieDomainW(com, NULL); + error = GetLastError(); + ok(!ret, "IsDomainLegalCookieDomainW succeeded\n"); + ok(error == ERROR_INVALID_PARAMETER, "got %u expected ERROR_INVALID_PARAMETER\n", error); + + SetLastError(0xdeadbeef); + ret = pIsDomainLegalCookieDomainW(NULL, gmail_com); + error = GetLastError(); + ok(!ret, "IsDomainLegalCookieDomainW succeeded\n"); + ok(error == ERROR_INVALID_PARAMETER, "got %u expected ERROR_INVALID_PARAMETER\n", error); + + SetLastError(0xdeadbeef); + ret = pIsDomainLegalCookieDomainW(empty, gmail_com); + error = GetLastError(); + ok(!ret, "IsDomainLegalCookieDomainW succeeded\n"); + ok(error == ERROR_INVALID_NAME, "got %u expected ERROR_INVALID_NAME\n", error); + + SetLastError(0xdeadbeef); + ret = pIsDomainLegalCookieDomainW(com, empty); + error = GetLastError(); + ok(!ret, "IsDomainLegalCookieDomainW succeeded\n"); + ok(error == ERROR_INVALID_NAME, "got %u expected ERROR_INVALID_NAME\n", error); + + SetLastError(0xdeadbeef); + ret = pIsDomainLegalCookieDomainW(gmail_com, dot); + error = GetLastError(); + ok(!ret, "IsDomainLegalCookieDomainW succeeded\n"); + ok(error == ERROR_INVALID_NAME, "got %u expected ERROR_INVALID_NAME\n", error); + + SetLastError(0xdeadbeef); + ret = pIsDomainLegalCookieDomainW(dot, gmail_com); + error = GetLastError(); + ok(!ret, "IsDomainLegalCookieDomainW succeeded\n"); + ok(error == ERROR_INVALID_NAME, "got %u expected ERROR_INVALID_NAME\n", error); + + SetLastError(0xdeadbeef); + ret = pIsDomainLegalCookieDomainW(com, com); + error = GetLastError(); + ok(!ret, "IsDomainLegalCookieDomainW succeeded\n"); + ok(error == 0xdeadbeef, "got %u expected 0xdeadbeef\n", error); + + SetLastError(0xdeadbeef); + ret = pIsDomainLegalCookieDomainW(com, dot_com); + error = GetLastError(); + ok(!ret, "IsDomainLegalCookieDomainW succeeded\n"); + ok(error == ERROR_INVALID_NAME, "got %u expected ERROR_INVALID_NAME\n", error); + + SetLastError(0xdeadbeef); + ret = pIsDomainLegalCookieDomainW(dot_com, com); + error = GetLastError(); + ok(!ret, "IsDomainLegalCookieDomainW succeeded\n"); + ok(error == ERROR_INVALID_NAME, "got %u expected ERROR_INVALID_NAME\n", error); + + SetLastError(0xdeadbeef); + ret = pIsDomainLegalCookieDomainW(com, gmail_com); + error = GetLastError(); + ok(!ret, "IsDomainLegalCookieDomainW succeeded\n"); + ok(error == 0xdeadbeef, "got %u expected 0xdeadbeef\n", error); + + ret = pIsDomainLegalCookieDomainW(gmail_com, gmail_com); + ok(ret, "IsDomainLegalCookieDomainW failed\n"); + + SetLastError(0xdeadbeef); + ret = pIsDomainLegalCookieDomainW(gmail_co_uk, co_uk); + error = GetLastError(); + ok(!ret, "IsDomainLegalCookieDomainW failed\n"); + ok(error == 0xdeadbeef, "got %u expected 0xdeadbeef\n", error); + + ret = pIsDomainLegalCookieDomainW(uk, co_uk); + ok(!ret, "IsDomainLegalCookieDomainW succeeded\n"); + + ret = pIsDomainLegalCookieDomainW(gmail_co_uk, dot_co_uk); + ok(!ret, "IsDomainLegalCookieDomainW succeeded\n"); + + ret = pIsDomainLegalCookieDomainW(gmail_co_uk, gmail_co_uk); + ok(ret, "IsDomainLegalCookieDomainW failed\n"); + + ret = pIsDomainLegalCookieDomainW(gmail_com, com); + ok(!ret, "IsDomainLegalCookieDomainW succeeded\n"); + + SetLastError(0xdeadbeef); + ret = pIsDomainLegalCookieDomainW(dot_gmail_com, mail_gmail_com); + error = GetLastError(); + ok(!ret, "IsDomainLegalCookieDomainW failed\n"); + ok(error == ERROR_INVALID_NAME, "got %u expected ERROR_INVALID_NAME\n", error); + + ret = pIsDomainLegalCookieDomainW(gmail_com, mail_gmail_com); + ok(ret, "IsDomainLegalCookieDomainW failed\n"); + + ret = pIsDomainLegalCookieDomainW(mail_gmail_com, gmail_com); + ok(!ret, "IsDomainLegalCookieDomainW succeeded\n"); + + ret = pIsDomainLegalCookieDomainW(mail_gmail_com, com); + ok(!ret, "IsDomainLegalCookieDomainW succeeded\n"); + + ret = pIsDomainLegalCookieDomainW(dot_gmail_com, mail_gmail_com); + ok(!ret, "IsDomainLegalCookieDomainW succeeded\n"); + + ret = pIsDomainLegalCookieDomainW(mail_gmail_com, dot_gmail_com); + ok(!ret, "IsDomainLegalCookieDomainW succeeded\n"); +} + /* ############################### */ START_TEST(internet) @@ -536,6 +662,7 @@ START_TEST(internet) pInternetTimeFromSystemTimeW = (void*)GetProcAddress(hdll, "InternetTimeFromSystemTimeW"); pInternetTimeToSystemTimeA = (void*)GetProcAddress(hdll, "InternetTimeToSystemTimeA"); pInternetTimeToSystemTimeW = (void*)GetProcAddress(hdll, "InternetTimeToSystemTimeW"); + pIsDomainLegalCookieDomainW = (void*)GetProcAddress(hdll, (LPCSTR)117); test_InternetCanonicalizeUrlA(); test_InternetQueryOptionA(); @@ -552,4 +679,8 @@ START_TEST(internet) InternetTimeToSystemTimeA_test(); InternetTimeToSystemTimeW_test(); } + if (!pIsDomainLegalCookieDomainW) + skip("skipping IsDomainLegalCookieDomainW tests\n"); + else + test_IsDomainLegalCookieDomainW(); } diff --git a/dlls/wininet/wininet.spec b/dlls/wininet/wininet.spec index f5b616e..8db462c 100644 --- a/dlls/wininet/wininet.spec +++ b/dlls/wininet/wininet.spec @@ -9,7 +9,7 @@ 111 stub -noname ExportCookieFileW 112 stub -noname IsProfilesEnabled 116 stub -noname IsDomainlegalCookieDomainA -117 stub -noname IsDomainLegalCookieDomainW +117 stdcall -noname IsDomainLegalCookieDomainW(wstr wstr) 118 stub -noname FindP3PPolicySymbol 120 stub -noname MapResourceToPolicy 121 stub -noname GetP3PPolicy

1 0

Juan Lang : crypt32: Fix debug channel for PFX functions.
by Alexandre Julliard 30 Jan '09

30 Jan '09

Module: wine Branch: master Commit: 3fd732b25b819b17e619b6d767974bfc36c783ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=3fd732b25b819b17e619b6d76… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Jan 29 02:07:20 2009 -0800 crypt32: Fix debug channel for PFX functions. --- dlls/crypt32/decode.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/crypt32/decode.c b/dlls/crypt32/decode.c index f353131..cda8b62 100644 --- a/dlls/crypt32/decode.c +++ b/dlls/crypt32/decode.c @@ -5516,7 +5516,7 @@ BOOL WINAPI PFXIsPFXBlob(CRYPT_DATA_BLOB *pPFX) { BOOL ret; - TRACE("(%p)\n", pPFX); + TRACE_(crypt)("(%p)\n", pPFX); /* A PFX blob is an asn.1-encoded sequence, consisting of at least a * version integer of length 1 (3 encoded byes) and at least one other @@ -5550,6 +5550,6 @@ BOOL WINAPI PFXIsPFXBlob(CRYPT_DATA_BLOB *pPFX) HCERTSTORE WINAPI PFXImportCertStore(CRYPT_DATA_BLOB *pPFX, LPCWSTR szPassword, DWORD dwFlags) { - FIXME("(%p, %p, %08x): stub\n", pPFX, szPassword, dwFlags); + FIXME_(crypt)("(%p, %p, %08x): stub\n", pPFX, szPassword, dwFlags); return NULL; }

1 0

Alexandre Julliard : kernel32/tests: Support broken GetTempPath return value on WinME.
by Alexandre Julliard 30 Jan '09

30 Jan '09

Module: wine Branch: master Commit: b8712b7f8a9c13ef49e3d61ef3b4a3e7cfa07683 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b8712b7f8a9c13ef49e3d61ef… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 29 22:07:50 2009 +0100 kernel32/tests: Support broken GetTempPath return value on WinME. --- dlls/kernel32/tests/path.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/tests/path.c b/dlls/kernel32/tests/path.c index 3985bcf..a272b56 100644 --- a/dlls/kernel32/tests/path.c +++ b/dlls/kernel32/tests/path.c @@ -328,7 +328,7 @@ static void test_InitPathA(CHAR *newdir, CHAR *curDrive, CHAR *otherDrive) "GetTempPathA returned a path that did not end in '\\'\n"); lstrcpyA(tmpstr,"aaaaaaaa"); len1=GetTempPathA(len,tmpstr); - ok(len1==len+1, + ok(len1==len+1 || broken(len1 == len), /* WinME */ "GetTempPathA should return string length %d instead of %d\n",len+1,len1); /* Test GetTmpFileNameA

1 0

Alexandre Julliard : gdi32: Replace the MEMCHECK macro in the region code by a proper function.
by Alexandre Julliard 30 Jan '09

30 Jan '09

Module: wine Branch: master Commit: ec4af0764b2f8e5d5c02e9d7750a3143fd8f9fb9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec4af0764b2f8e5d5c02e9d77… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 29 17:44:58 2009 +0100 gdi32: Replace the MEMCHECK macro in the region code by a proper function. --- dlls/gdi32/region.c | 120 +++++++++++++-------------------------------------- 1 files changed, 30 insertions(+), 90 deletions(-) diff --git a/dlls/gdi32/region.c b/dlls/gdi32/region.c index 737769e..be46800 100644 --- a/dlls/gdi32/region.c +++ b/dlls/gdi32/region.c @@ -141,30 +141,32 @@ static const struct gdi_obj_funcs region_funcs = (r1)->bottom > (r2)->top && \ (r1)->top < (r2)->bottom) -/* - * Check to see if there is enough memory in the present region. - */ -static inline int xmemcheck(WINEREGION *reg, LPRECT *rect, LPRECT *firstrect ) { - if (reg->numRects >= (reg->size - 1)) { - *firstrect = HeapReAlloc( GetProcessHeap(), 0, *firstrect, (2 * (sizeof(RECT)) * (reg->size))); - if (*firstrect == 0) - return 0; +static BOOL add_rect( WINEREGION *reg, INT left, INT top, INT right, INT bottom ) +{ + RECT *rect; + if (reg->numRects >= reg->size) + { + RECT *newrects = HeapReAlloc( GetProcessHeap(), 0, reg->rects, 2 * sizeof(RECT) * reg->size ); + if (!newrects) return FALSE; + reg->rects = newrects; reg->size *= 2; - *rect = (*firstrect)+reg->numRects; } - return 1; + rect = reg->rects + reg->numRects++; + rect->left = left; + rect->top = top; + rect->right = right; + rect->bottom = bottom; + return TRUE; } -#define MEMCHECK(reg, rect, firstrect) xmemcheck(reg,&(rect),&(firstrect)) - -#define EMPTY_REGION(pReg) { \ +#define EMPTY_REGION(pReg) do { \ (pReg)->numRects = 0; \ (pReg)->extents.left = (pReg)->extents.top = 0; \ (pReg)->extents.right = (pReg)->extents.bottom = 0; \ - } + } while(0) -#define REGION_NOT_EMPTY(pReg) pReg->numRects +#define REGION_NOT_EMPTY(pReg) ((pReg)->numRects) #define INRECT(r, x, y) \ ( ( ((r).right > x)) && \ @@ -1887,9 +1889,6 @@ static void REGION_IntersectO(WINEREGION *pReg, RECT *r1, RECT *r1End, { INT left, right; - RECT *pNextRect; - - pNextRect = &pReg->rects[pReg->numRects]; while ((r1 != r1End) && (r2 != r2End)) { @@ -1904,15 +1903,7 @@ static void REGION_IntersectO(WINEREGION *pReg, RECT *r1, RECT *r1End, * right next to each other. Since that should never happen... */ if (left < right) - { - MEMCHECK(pReg, pNextRect, pReg->rects); - pNextRect->left = left; - pNextRect->top = top; - pNextRect->right = right; - pNextRect->bottom = bottom; - pReg->numRects += 1; - pNextRect++; - } + add_rect( pReg, left, top, right, bottom ); /* * Need to advance the pointers. Shift the one that extends @@ -1981,19 +1972,9 @@ static void REGION_IntersectRegion(WINEREGION *newReg, WINEREGION *reg1, static void REGION_UnionNonO (WINEREGION *pReg, RECT *r, RECT *rEnd, INT top, INT bottom) { - RECT *pNextRect; - - pNextRect = &pReg->rects[pReg->numRects]; - while (r != rEnd) { - MEMCHECK(pReg, pNextRect, pReg->rects); - pNextRect->left = r->left; - pNextRect->top = top; - pNextRect->right = r->right; - pNextRect->bottom = bottom; - pReg->numRects += 1; - pNextRect++; + add_rect( pReg, r->left, top, r->right, bottom ); r++; } return; @@ -2016,31 +1997,17 @@ static void REGION_UnionNonO (WINEREGION *pReg, RECT *r, RECT *rEnd, static void REGION_UnionO (WINEREGION *pReg, RECT *r1, RECT *r1End, RECT *r2, RECT *r2End, INT top, INT bottom) { - RECT *pNextRect; - - pNextRect = &pReg->rects[pReg->numRects]; - #define MERGERECT(r) \ if ((pReg->numRects != 0) && \ - (pNextRect[-1].top == top) && \ - (pNextRect[-1].bottom == bottom) && \ - (pNextRect[-1].right >= r->left)) \ + (pReg->rects[pReg->numRects-1].top == top) && \ + (pReg->rects[pReg->numRects-1].bottom == bottom) && \ + (pReg->rects[pReg->numRects-1].right >= r->left)) \ { \ - if (pNextRect[-1].right < r->right) \ - { \ - pNextRect[-1].right = r->right; \ - } \ + if (pReg->rects[pReg->numRects-1].right < r->right) \ + pReg->rects[pReg->numRects-1].right = r->right; \ } \ else \ - { \ - MEMCHECK(pReg, pNextRect, pReg->rects); \ - pNextRect->top = top; \ - pNextRect->bottom = bottom; \ - pNextRect->left = r->left; \ - pNextRect->right = r->right; \ - pReg->numRects += 1; \ - pNextRect += 1; \ - } \ + add_rect( pReg, r->left, top, r->right, bottom ); \ r++; while ((r1 != r1End) && (r2 != r2End)) @@ -2067,6 +2034,7 @@ static void REGION_UnionO (WINEREGION *pReg, RECT *r1, RECT *r1End, MERGERECT(r2); } return; +#undef MERGERECT } /*********************************************************************** @@ -2153,19 +2121,9 @@ static void REGION_UnionRegion(WINEREGION *newReg, WINEREGION *reg1, static void REGION_SubtractNonO1 (WINEREGION *pReg, RECT *r, RECT *rEnd, INT top, INT bottom) { - RECT *pNextRect; - - pNextRect = &pReg->rects[pReg->numRects]; - while (r != rEnd) { - MEMCHECK(pReg, pNextRect, pReg->rects); - pNextRect->left = r->left; - pNextRect->top = top; - pNextRect->right = r->right; - pNextRect->bottom = bottom; - pReg->numRects += 1; - pNextRect++; + add_rect( pReg, r->left, top, r->right, bottom ); r++; } return; @@ -2234,13 +2192,7 @@ static void REGION_SubtractO (WINEREGION *pReg, RECT *r1, RECT *r1End, * Left part of subtrahend covers part of minuend: add uncovered * part of minuend to region and skip to next subtrahend. */ - MEMCHECK(pReg, pNextRect, pReg->rects); - pNextRect->left = left; - pNextRect->top = top; - pNextRect->right = r2->left; - pNextRect->bottom = bottom; - pReg->numRects += 1; - pNextRect++; + add_rect( pReg, left, top, r2->left, bottom ); left = r2->right; if (left >= r1->right) { @@ -2266,13 +2218,7 @@ static void REGION_SubtractO (WINEREGION *pReg, RECT *r1, RECT *r1End, */ if (r1->right > left) { - MEMCHECK(pReg, pNextRect, pReg->rects); - pNextRect->left = left; - pNextRect->top = top; - pNextRect->right = r1->right; - pNextRect->bottom = bottom; - pReg->numRects += 1; - pNextRect++; + add_rect( pReg, left, top, r1->right, bottom ); } r1++; left = r1->left; @@ -2284,13 +2230,7 @@ static void REGION_SubtractO (WINEREGION *pReg, RECT *r1, RECT *r1End, */ while (r1 != r1End) { - MEMCHECK(pReg, pNextRect, pReg->rects); - pNextRect->left = left; - pNextRect->top = top; - pNextRect->right = r1->right; - pNextRect->bottom = bottom; - pReg->numRects += 1; - pNextRect++; + add_rect( pReg, left, top, r1->right, bottom ); r1++; if (r1 != r1End) {

1 0

Alexandre Julliard : gdi32: Check for memory allocation failure in region functions and propagate the error correctly .
by Alexandre Julliard 30 Jan '09

30 Jan '09

Module: wine Branch: master Commit: 687dfd69e9d6b84f8d59f044366b465e1ce7c85a URL: http://source.winehq.org/git/wine.git/?a=commit;h=687dfd69e9d6b84f8d59f0443… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 29 18:18:53 2009 +0100 gdi32: Check for memory allocation failure in region functions and propagate the error correctly. --- dlls/gdi32/region.c | 315 ++++++++++++++++++++++++--------------------------- 1 files changed, 146 insertions(+), 169 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=687dfd69e9d6b84f8d59f…

1 0

Alexandre Julliard : gdi32: Store the region data directly in the GDI object.
by Alexandre Julliard 30 Jan '09

30 Jan '09

Module: wine Branch: master Commit: a686b8b5838be438bf1e2e42b3aa994c23e65be3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a686b8b5838be438bf1e2e42b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 29 16:38:53 2009 +0100 gdi32: Store the region data directly in the GDI object. --- dlls/gdi32/region.c | 220 ++++++++++++++++++++++++--------------------------- 1 files changed, 104 insertions(+), 116 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a686b8b5838be438bf1e2…

1 0

Alexandre Julliard : gdi32: Don't hold the GDI lock while creating regions.
by Alexandre Julliard 30 Jan '09

30 Jan '09

Module: wine Branch: master Commit: 919b1076c9e7e4d0f5afdc6fa2c941825a35300b URL: http://source.winehq.org/git/wine.git/?a=commit;h=919b1076c9e7e4d0f5afdc6fa… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 29 17:32:06 2009 +0100 gdi32: Don't hold the GDI lock while creating regions. --- dlls/gdi32/region.c | 168 ++++++++++++++++++++++++--------------------------- 1 files changed, 80 insertions(+), 88 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=919b1076c9e7e4d0f5afd…

1 0

Alexandre Julliard : gdi32: Increment the reference count for the initial DC stock objects.
by Alexandre Julliard 30 Jan '09

30 Jan '09

Module: wine Branch: master Commit: 827e1f1de337ee180b46bf65c015da5164ae7e1f URL: http://source.winehq.org/git/wine.git/?a=commit;h=827e1f1de337ee180b46bf65c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 29 16:25:58 2009 +0100 gdi32: Increment the reference count for the initial DC stock objects. --- dlls/gdi32/dc.c | 10 +++++----- dlls/gdi32/gdi_private.h | 2 +- dlls/gdi32/gdiobj.c | 6 ++++-- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index 3648f64..2032dfa 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -103,9 +103,9 @@ DC *alloc_dc_ptr( const DC_FUNCTIONS *funcs, WORD magic ) dc->hMetaRgn = 0; dc->hMetaClipRgn = 0; dc->hVisRgn = 0; - dc->hPen = GetStockObject( BLACK_PEN ); - dc->hBrush = GetStockObject( WHITE_BRUSH ); - dc->hFont = GetStockObject( SYSTEM_FONT ); + dc->hPen = GDI_inc_ref_count( GetStockObject( BLACK_PEN )); + dc->hBrush = GDI_inc_ref_count( GetStockObject( WHITE_BRUSH )); + dc->hFont = GDI_inc_ref_count( GetStockObject( SYSTEM_FONT )); dc->hBitmap = 0; dc->hDevice = 0; dc->hPalette = GetStockObject( DEFAULT_PALETTE ); @@ -680,7 +680,7 @@ HDC WINAPI CreateDCW( LPCWSTR driver, LPCWSTR device, LPCWSTR output, if (!(dc = alloc_dc_ptr( funcs, OBJ_DC ))) goto error; hdc = dc->hSelf; - dc->hBitmap = GetStockObject( DEFAULT_BITMAP ); + dc->hBitmap = GDI_inc_ref_count( GetStockObject( DEFAULT_BITMAP )); if (!(dc->hVisRgn = CreateRectRgn( 0, 0, 1, 1 ))) goto error; TRACE("(driver=%s, device=%s, output=%s): returning %p\n", @@ -797,7 +797,7 @@ HDC WINAPI CreateCompatibleDC( HDC hdc ) TRACE("(%p): returning %p\n", hdc, dc->hSelf ); - dc->hBitmap = GetStockObject( DEFAULT_BITMAP ); + dc->hBitmap = GDI_inc_ref_count( GetStockObject( DEFAULT_BITMAP )); if (!(dc->hVisRgn = CreateRectRgn( 0, 0, 1, 1 ))) goto error; /* default bitmap is 1x1 */ /* Copy the driver-specific physical device info into diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 87d4ec0..f4c2d02 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -442,7 +442,7 @@ extern void *free_gdi_handle( HGDIOBJ handle ) DECLSPEC_HIDDEN; extern void *GDI_GetObjPtr( HGDIOBJ, WORD ) DECLSPEC_HIDDEN; extern void GDI_ReleaseObj( HGDIOBJ ) DECLSPEC_HIDDEN; extern void GDI_CheckNotLock(void) DECLSPEC_HIDDEN; -extern BOOL GDI_inc_ref_count( HGDIOBJ handle ) DECLSPEC_HIDDEN; +extern HGDIOBJ GDI_inc_ref_count( HGDIOBJ handle ) DECLSPEC_HIDDEN; extern BOOL GDI_dec_ref_count( HGDIOBJ handle ) DECLSPEC_HIDDEN; extern BOOL GDI_hdc_using_object(HGDIOBJ obj, HDC hdc) DECLSPEC_HIDDEN; extern BOOL GDI_hdc_not_using_object(HGDIOBJ obj, HDC hdc) DECLSPEC_HIDDEN; diff --git a/dlls/gdi32/gdiobj.c b/dlls/gdi32/gdiobj.c index 5557787..b4ca4d9 100644 --- a/dlls/gdi32/gdiobj.c +++ b/dlls/gdi32/gdiobj.c @@ -522,7 +522,7 @@ static DWORD get_dpi( void ) * * Increment the reference count of a GDI object. */ -BOOL GDI_inc_ref_count( HGDIOBJ handle ) +HGDIOBJ GDI_inc_ref_count( HGDIOBJ handle ) { GDIOBJHDR *header; @@ -531,7 +531,9 @@ BOOL GDI_inc_ref_count( HGDIOBJ handle ) header->dwCount++; GDI_ReleaseObj( handle ); } - return header != NULL; + else handle = 0; + + return handle; }

1 0

Alexandre Julliard : gdi32: Store a separate flag to mark a GDI object for delayed destruction.
by Alexandre Julliard 30 Jan '09

30 Jan '09

Module: wine Branch: master Commit: 73593cbf5aa080273cba604f85e6f1a130f61e29 URL: http://source.winehq.org/git/wine.git/?a=commit;h=73593cbf5aa080273cba604f8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 29 16:28:57 2009 +0100 gdi32: Store a separate flag to mark a GDI object for delayed destruction. --- dlls/gdi32/bitmap.c | 2 +- dlls/gdi32/gdi_private.h | 7 ++++--- dlls/gdi32/gdiobj.c | 27 ++++++++++++++------------- 3 files changed, 19 insertions(+), 17 deletions(-) diff --git a/dlls/gdi32/bitmap.c b/dlls/gdi32/bitmap.c index 8bb21f2..5ca76a2 100644 --- a/dlls/gdi32/bitmap.c +++ b/dlls/gdi32/bitmap.c @@ -586,7 +586,7 @@ static HGDIOBJ BITMAP_SelectObject( HGDIOBJ handle, HDC hdc ) goto done; } - if (bitmap->header.dwCount && (handle != GetStockObject(DEFAULT_BITMAP))) + if (bitmap->header.selcount && (handle != GetStockObject(DEFAULT_BITMAP))) { WARN( "Bitmap already selected in another DC\n" ); GDI_ReleaseObj( handle ); diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index f4c2d02..e01f1d0 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -59,9 +59,10 @@ struct hdc_list typedef struct tagGDIOBJHDR { - WORD type; - WORD system : 1; - DWORD dwCount; + WORD type; /* object type (one of the OBJ_* constants) */ + WORD system : 1; /* system object flag */ + WORD deleted : 1; /* whether DeleteObject has been called on this object */ + DWORD selcount; /* number of times the object is selected in a DC */ const struct gdi_obj_funcs *funcs; struct hdc_list *hdcs; } GDIOBJHDR; diff --git a/dlls/gdi32/gdiobj.c b/dlls/gdi32/gdiobj.c index b4ca4d9..a67ceb3 100644 --- a/dlls/gdi32/gdiobj.c +++ b/dlls/gdi32/gdiobj.c @@ -528,7 +528,7 @@ HGDIOBJ GDI_inc_ref_count( HGDIOBJ handle ) if ((header = GDI_GetObjPtr( handle, 0 ))) { - header->dwCount++; + header->selcount++; GDI_ReleaseObj( handle ); } else handle = 0; @@ -548,16 +548,16 @@ BOOL GDI_dec_ref_count( HGDIOBJ handle ) if ((header = GDI_GetObjPtr( handle, 0 ))) { - if (header->dwCount) header->dwCount--; - if (header->dwCount != 0x80000000) GDI_ReleaseObj( handle ); - else + assert( header->selcount ); + if (!--header->selcount && header->deleted) { /* handle delayed DeleteObject*/ - header->dwCount = 0; + header->deleted = 0; GDI_ReleaseObj( handle ); TRACE( "executing delayed DeleteObject for %p\n", handle ); DeleteObject( handle ); } + else GDI_ReleaseObj( handle ); } return header != NULL; } @@ -641,11 +641,12 @@ HGDIOBJ alloc_gdi_handle( GDIOBJHDR *obj, WORD type, const struct gdi_obj_funcs int i; /* initialize the object header */ - obj->type = type; - obj->system = 0; - obj->dwCount = 0; - obj->funcs = funcs; - obj->hdcs = NULL; + obj->type = type; + obj->system = 0; + obj->deleted = 0; + obj->selcount = 0; + obj->funcs = funcs; + obj->hdcs = NULL; _EnterSysLevel( &GDI_level ); for (i = next_large_handle + 1; i < MAX_LARGE_HANDLES; i++) @@ -796,10 +797,10 @@ BOOL WINAPI DeleteObject( HGDIOBJ obj ) if (!header) return FALSE; } - if (header->dwCount) + if (header->selcount) { - TRACE("delayed for %p because object in use, count %d\n", obj, header->dwCount ); - header->dwCount |= 0x80000000; /* mark for delete */ + TRACE("delayed for %p because object in use, count %u\n", obj, header->selcount ); + header->deleted = 1; /* mark for delete */ GDI_ReleaseObj( obj ); return TRUE; }

1 0

Rince : Fix 404s in winelib guide
by Jeremy Newman 29 Jan '09

29 Jan '09

Module: website Branch: master Commit: 8c52388cabd6e9d172455ccb77d3bec05974afaf URL: http://source.winehq.org/git/website.git/?a=commit;h=8c52388cabd6e9d172455c… Author: Rince <rercola(a)acm.jhu.edu> Date: Fri Jan 23 16:35:27 2009 -0500 Fix 404s in winelib guide --0015175cba90e4972104612d2aac Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Attached patch fixes several 404s in the winelib guide (several links on /winelib pointed at site/docs/winelib-guide, which 404s, instead of /site/docs/winelib-guide/index). - Rich Attached patch fixes several 404s in the winelib guide (several links on /winelib pointed at site/docs/winelib-guide, which 404s, instead of /site/docs/winelib-guide/index).<br><br>- Rich<br> --- templates/en/winelib.template | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/en/winelib.template b/templates/en/winelib.template index c07d8c6..0d50575 100644 --- a/templates/en/winelib.template +++ b/templates/en/winelib.template @@ -10,7 +10,7 @@ Theoretically, any Win32 app should be compilable out of the box under Wine. This, of course, is not the case. We have incompatible headers, and a bunch of other problems described in - <a href="http://www.winehq.org/site/docs/winelib-guide/">Winelib User's Guide</a>. + <a href="http://www.winehq.org/site/docs/winelib-guide/index">Winelib User's Guide</a>. A good way to fix these is to try to compile applications for which we have the source under Winelib. @@ -19,7 +19,7 @@ <ul> <li>Document our experience on porting these applications to Winelib <li>Improve Winelib based on the above such that the porting process becomes very simple - <li>Update the <a href="http://www.winehq.org/site/docs/winelib-guide/">Winelib User's Guide</a> + <li>Update the <a href="http://www.winehq.org/site/docs/winelib-guide/index">Winelib User's Guide</a> to the latest porting process <li>Fixing header & library problems in the process. </ul>

1 0