December 2008 - Wine-Commits

Andrew Talbot : winex11.drv: Sign-compare warnings fix.
by Alexandre Julliard Dec. 8, 2008

Dec. 8, 2008

Module: wine Branch: master Commit: ff380900c283f2d820b8995eb7541d81aef426f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff380900c283f2d820b8995eb… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat Dec 6 13:18:43 2008 +0000 winex11.drv: Sign-compare warnings fix. --- dlls/winex11.drv/opengl.c | 13 ++++++------- dlls/winex11.drv/text.c | 2 +- dlls/winex11.drv/xrandr.c | 9 ++++----- 3 files changed, 11 insertions(+), 13 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index add9569..df5bae0 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -1892,8 +1892,7 @@ static BOOL internal_wglUseFontBitmaps(HDC hdc, DWORD first, DWORD count, DWORD { /* We are running using client-side rendering fonts... */ GLYPHMETRICS gm; - unsigned int glyph; - int size = 0; + unsigned int glyph, size = 0; void *bitmap = NULL, *gl_bitmap = NULL; int org_alignment; @@ -1904,7 +1903,7 @@ static BOOL internal_wglUseFontBitmaps(HDC hdc, DWORD first, DWORD count, DWORD for (glyph = first; glyph < first + count; glyph++) { unsigned int needed_size = GetGlyphOutline_ptr(hdc, glyph, GGO_BITMAP, &gm, 0, NULL, NULL); - int height, width_int; + unsigned int height, width_int; TRACE("Glyph : %3d / List : %d\n", glyph, listBase); if (needed_size == GDI_ERROR) { @@ -1955,7 +1954,7 @@ static BOOL internal_wglUseFontBitmaps(HDC hdc, DWORD first, DWORD count, DWORD if (needed_size != 0) { width_int = (gm.gmBlackBoxX + 31) / 32; for (height = 0; height < gm.gmBlackBoxY; height++) { - int width; + unsigned int width; for (width = 0; width < width_int; width++) { ((int *) gl_bitmap)[(gm.gmBlackBoxY - height - 1) * width_int + width] = ((int *) bitmap)[height * width_int + width]; @@ -2603,10 +2602,10 @@ static GLboolean WINAPI X11DRV_wglChoosePixelFormatARB(HDC hdc, const int *piAtt int nAttribs = 0; GLXFBConfig* cfgs = NULL; int nCfgs = 0; - UINT it; + int it; int fmt_id; WineGLPixelFormat *fmt; - int pfmt_it = 0; + UINT pfmt_it = 0; int run; TRACE("(%p, %p, %p, %d, %p, %p): hackish\n", hdc, piAttribIList, pfAttribFList, nMaxFormats, piFormats, nNumFormats); @@ -2925,7 +2924,7 @@ static GLboolean WINAPI X11DRV_wglGetPixelFormatAttribfvARB(HDC hdc, int iPixelF { int *attr; int ret; - int i; + UINT i; TRACE("(%p, %d, %d, %d, %p, %p)\n", hdc, iPixelFormat, iLayerPlane, nAttributes, piAttributes, pfValues); diff --git a/dlls/winex11.drv/text.c b/dlls/winex11.drv/text.c index 752b8d3..92a14f5 100644 --- a/dlls/winex11.drv/text.c +++ b/dlls/winex11.drv/text.c @@ -151,7 +151,7 @@ X11DRV_ExtTextOut( X11DRV_PDEVICE *physDev, INT x, INT y, UINT flags, { /* have to render character by character. */ double offset = 0.0; - int i; + UINT i; for (i=0; i<count; i++) { diff --git a/dlls/winex11.drv/xrandr.c b/dlls/winex11.drv/xrandr.c index fd930a2..fd21169 100644 --- a/dlls/winex11.drv/xrandr.c +++ b/dlls/winex11.drv/xrandr.c @@ -111,8 +111,8 @@ static int XRandRErrorHandler(Display *dpy, XErrorEvent *event, void *arg) /* create the mode structures */ static void make_modes(void) { - unsigned int i; - int j; + int i, j; + for (i=0; i<real_xrandr_sizes_count; i++) { if (real_xrandr_rates_count[i]) @@ -240,8 +240,7 @@ static LONG X11DRV_XRandR_SetCurrentMode(int mode) void X11DRV_XRandR_Init(void) { Bool ok; - int nmodes = 0; - unsigned int i; + int i, nmodes = 0; if (xrandr_major) return; /* already initialized? */ if (!usexrandr) return; /* disabled in config */ @@ -272,7 +271,7 @@ void X11DRV_XRandR_Init(void) for (i=0; i < real_xrandr_sizes_count; i++) { real_xrandr_rates[i] = pXRRRates (gdi_display, DefaultScreen(gdi_display), i, &(real_xrandr_rates_count[i])); - TRACE("- at %u: %dx%d (%d rates):", i, real_xrandr_sizes[i].width, real_xrandr_sizes[i].height, real_xrandr_rates_count[i]); + TRACE("- at %d: %dx%d (%d rates):", i, real_xrandr_sizes[i].width, real_xrandr_sizes[i].height, real_xrandr_rates_count[i]); if (real_xrandr_rates_count[i]) { int j;

1 0

Marcus Meissner : gphoto2.ds: Merge ds_ctrl.c into gphoto2_main.c.
by Alexandre Julliard Dec. 8, 2008

Dec. 8, 2008

Module: wine Branch: master Commit: 2fc6cea11a9575c0eee7d6d70bf29da4928f680e URL: http://source.winehq.org/git/wine.git/?a=commit;h=2fc6cea11a9575c0eee7d6d70… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sat Dec 6 12:30:35 2008 +0100 gphoto2.ds: Merge ds_ctrl.c into gphoto2_main.c. --- dlls/gphoto2.ds/Makefile.in | 1 - dlls/gphoto2.ds/ds_ctrl.c | 610 ---------------------------------------- dlls/gphoto2.ds/gphoto2_i.h | 82 ------ dlls/gphoto2.ds/gphoto2_main.c | 520 ++++++++++++++++++++++++++++++++++ 4 files changed, 520 insertions(+), 693 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2fc6cea11a9575c0eee7d…

1 0

Paul Vriens : crypt32/tests: Fix some test failures on Win9x and NT4.
by Alexandre Julliard Dec. 8, 2008

Dec. 8, 2008

Module: wine Branch: master Commit: 1bf1adcc95b1fc26000c2d4db99f3c2610904329 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1bf1adcc95b1fc26000c2d4db… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Sat Dec 6 14:16:19 2008 +0100 crypt32/tests: Fix some test failures on Win9x and NT4. --- dlls/crypt32/tests/encode.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/crypt32/tests/encode.c b/dlls/crypt32/tests/encode.c index 60c387c..952e246 100644 --- a/dlls/crypt32/tests/encode.c +++ b/dlls/crypt32/tests/encode.c @@ -661,8 +661,9 @@ static void test_decodeFiletime(DWORD dwEncoding) size = sizeof(ft1); ret = pCryptDecodeObjectEx(dwEncoding, X509_CHOICE_OF_TIME, bogusTimes[i], bogusTimes[i][1] + 2, 0, NULL, &ft1, &size); - ok(!ret && (GetLastError() == CRYPT_E_ASN1_CORRUPT || - GetLastError() == OSS_DATA_ERROR /* Win9x */), + ok((!ret && (GetLastError() == CRYPT_E_ASN1_CORRUPT || + GetLastError() == OSS_DATA_ERROR /* Win9x */)) || + broken(ret), /* Win9x and NT4 for bin38 */ "Expected CRYPT_E_ASN1_CORRUPT or OSS_DATA_ERROR, got %08x\n", GetLastError()); }

1 0

Paul Vriens : advapi32/tests: Fix a few test failures on NT4.
by Alexandre Julliard Dec. 8, 2008

Dec. 8, 2008

Module: wine Branch: master Commit: 6630470ec4ba8bad87bc6fa6af439e427a00c2a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6630470ec4ba8bad87bc6fa6a… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Sat Dec 6 12:43:55 2008 +0100 advapi32/tests: Fix a few test failures on NT4. --- dlls/advapi32/tests/security.c | 39 +++++++++++++++++++++++++++------------ 1 files changed, 27 insertions(+), 12 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index b5c10ff..f30ca4f 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -760,13 +760,14 @@ static void test_FileSecurity(void) sd = HeapAlloc (GetProcessHeap (), 0, sdSize); /* Get security descriptor for real */ - retSize = 0; + retSize = -1; SetLastError(0xdeadbeef); rc = pGetFileSecurityA (file, request, sd, sdSize, &retSize); ok (rc, "GetFileSecurityA " "was not expected to fail '%s': %d\n", file, GetLastError()); - ok (retSize == sdSize, "GetFileSecurityA " - "returned size %d; expected %d\n", retSize, sdSize); + ok (retSize == sdSize || + broken(retSize == 0), /* NT4 */ + "GetFileSecurityA returned size %d; expected %d\n", retSize, sdSize); /* Use it to set security descriptor */ SetLastError(0xdeadbeef); @@ -792,13 +793,14 @@ static void test_FileSecurity(void) sd = HeapAlloc (GetProcessHeap (), 0, sdSize); /* Get security descriptor for real */ - retSize = 0; + retSize = -1; SetLastError(0xdeadbeef); rc = pGetFileSecurityA (path, request, sd, sdSize, &retSize); ok (rc, "GetFileSecurityA " "was not expected to fail '%s': %d\n", path, GetLastError()); - ok (retSize == sdSize, "GetFileSecurityA " - "returned size %d; expected %d\n", retSize, sdSize); + ok (retSize == sdSize || + broken(retSize == 0), /* NT4 */ + "GetFileSecurityA returned size %d; expected %d\n", retSize, sdSize); /* Use it to set security descriptor */ SetLastError(0xdeadbeef); @@ -2158,7 +2160,10 @@ static void test_SetEntriesInAcl(void) return; } ok(res == ERROR_SUCCESS, "SetEntriesInAclW failed: %u\n", res); - ok(NewAcl == NULL, "NewAcl=%p, expected NULL\n", NewAcl); + ok(NewAcl == NULL || + broken(NewAcl != NULL), /* NT4 */ + "NewAcl=%p, expected NULL\n", NewAcl); + LocalFree(NewAcl); OldAcl = HeapAlloc(GetProcessHeap(), 0, 256); res = InitializeAcl(OldAcl, 256, ACL_REVISION); @@ -2208,7 +2213,9 @@ static void test_SetEntriesInAcl(void) ExplicitAccess.Trustee.TrusteeForm = TRUSTEE_BAD_FORM; res = pSetEntriesInAclW(1, &ExplicitAccess, OldAcl, &NewAcl); - ok(res == ERROR_INVALID_PARAMETER, "SetEntriesInAclW failed: %u\n", res); + ok(res == ERROR_INVALID_PARAMETER || + broken(res == ERROR_NOT_SUPPORTED), /* NT4 */ + "SetEntriesInAclW failed: %u\n", res); ok(NewAcl == NULL || broken(NewAcl != NULL), /* NT4 */ "returned acl wasn't NULL: %p\n", NewAcl); @@ -2216,7 +2223,9 @@ static void test_SetEntriesInAcl(void) ExplicitAccess.Trustee.TrusteeForm = TRUSTEE_IS_USER; ExplicitAccess.Trustee.MultipleTrusteeOperation = TRUSTEE_IS_IMPERSONATE; res = pSetEntriesInAclW(1, &ExplicitAccess, OldAcl, &NewAcl); - ok(res == ERROR_INVALID_PARAMETER, "SetEntriesInAclW failed: %u\n", res); + ok(res == ERROR_INVALID_PARAMETER || + broken(res == ERROR_NOT_SUPPORTED), /* NT4 */ + "SetEntriesInAclW failed: %u\n", res); ok(NewAcl == NULL || broken(NewAcl != NULL), /* NT4 */ "returned acl wasn't NULL: %p\n", NewAcl); @@ -2755,11 +2764,17 @@ static void test_acls(void) ret = IsValidAcl(pAcl); ok(ret, "IsValidAcl failed with error %d\n", GetLastError()); + SetLastError(0xdeadbeef); ret = InitializeAcl(pAcl, sizeof(buffer), ACL_REVISION4); - ok(ret, "InitializeAcl(ACL_REVISION4) failed with error %d\n", GetLastError()); + if (GetLastError() != ERROR_INVALID_PARAMETER) + { + ok(ret, "InitializeAcl(ACL_REVISION4) failed with error %d\n", GetLastError()); - ret = IsValidAcl(pAcl); - ok(ret, "IsValidAcl failed with error %d\n", GetLastError()); + ret = IsValidAcl(pAcl); + ok(ret, "IsValidAcl failed with error %d\n", GetLastError()); + } + else + win_skip("ACL_REVISION4 is not implemented on NT4\n"); SetLastError(0xdeadbeef); ret = InitializeAcl(pAcl, sizeof(buffer), -1);

1 0

Andrew Talbot : widl: Remove unneeded address-of operators from function names.
by Alexandre Julliard Dec. 8, 2008

Dec. 8, 2008

Module: wine Branch: master Commit: d7f9d92b472281204cfa1bef6ef4a0e18803576b URL: http://source.winehq.org/git/wine.git/?a=commit;h=d7f9d92b472281204cfa1bef6… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat Dec 6 23:50:03 2008 +0000 widl: Remove unneeded address-of operators from function names. --- tools/widl/proxy.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/widl/proxy.c b/tools/widl/proxy.c index 1d50fb4..53d5c9d 100644 --- a/tools/widl/proxy.c +++ b/tools/widl/proxy.c @@ -836,7 +836,7 @@ void write_proxies(const statement_list_t *stmts) fprintf(proxy, " _%s_InterfaceNamesList,\n", file_id); if (have_baseiid) fprintf(proxy, " _%s_BaseIIDList,\n", file_id); else fprintf(proxy, " 0,\n"); - fprintf(proxy, " &_%s_IID_Lookup,\n", file_id); + fprintf(proxy, " _%s_IID_Lookup,\n", file_id); fprintf(proxy, " %d,\n", count); fprintf(proxy, " 1,\n"); fprintf(proxy, " 0,\n");

1 0

Andrew Talbot : widl: Remove unneeded address-of operators from array names .
by Alexandre Julliard Dec. 8, 2008

Dec. 8, 2008

Module: wine Branch: master Commit: e05b8aa3015c81fe51066567cdc3bbca0caf5334 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e05b8aa3015c81fe51066567c… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat Dec 6 23:49:59 2008 +0000 widl: Remove unneeded address-of operators from array names. --- tools/widl/proxy.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/widl/proxy.c b/tools/widl/proxy.c index a994fd7..1d50fb4 100644 --- a/tools/widl/proxy.c +++ b/tools/widl/proxy.c @@ -831,8 +831,8 @@ void write_proxies(const statement_list_t *stmts) fprintf(proxy, "const ExtendedProxyFileInfo %s_ProxyFileInfo DECLSPEC_HIDDEN =\n", file_id); fprintf(proxy, "{\n"); - fprintf(proxy, " (const PCInterfaceProxyVtblList*)&_%s_ProxyVtblList,\n", file_id); - fprintf(proxy, " (const PCInterfaceStubVtblList*)&_%s_StubVtblList,\n", file_id); + fprintf(proxy, " (const PCInterfaceProxyVtblList*)_%s_ProxyVtblList,\n", file_id); + fprintf(proxy, " (const PCInterfaceStubVtblList*)_%s_StubVtblList,\n", file_id); fprintf(proxy, " _%s_InterfaceNamesList,\n", file_id); if (have_baseiid) fprintf(proxy, " _%s_BaseIIDList,\n", file_id); else fprintf(proxy, " 0,\n");

1 0

Alexandre Julliard : server: The name len in the get_directory_entry request must be a data_size_t.
by Alexandre Julliard Dec. 8, 2008

Dec. 8, 2008

Module: wine Branch: master Commit: 5c37788a0191689312d1e842c221d6eae7290688 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c37788a0191689312d1e842c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Dec 6 17:29:31 2008 +0100 server: The name len in the get_directory_entry request must be a data_size_t. --- include/wine/server_protocol.h | 2 +- server/protocol.def | 2 +- server/trace.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 41c3fd9..8acb6c0 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -4009,7 +4009,7 @@ struct get_directory_entry_request struct get_directory_entry_reply { struct reply_header __header; - size_t name_len; + data_size_t name_len; /* VARARG(name,unicode_str,name_len); */ /* VARARG(type,unicode_str); */ }; diff --git a/server/protocol.def b/server/protocol.def index 5061b54..55ac30d 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -2890,7 +2890,7 @@ enum message_type obj_handle_t handle; /* handle to the directory */ unsigned int index; /* entry index */ @REPLY - size_t name_len; /* length of the entry name in bytes */ + data_size_t name_len; /* length of the entry name in bytes */ VARARG(name,unicode_str,name_len); /* entry name */ VARARG(type,unicode_str); /* entry type */ @END diff --git a/server/trace.c b/server/trace.c index c13f1ac..3df8603 100644 --- a/server/trace.c +++ b/server/trace.c @@ -3560,7 +3560,7 @@ static void dump_get_directory_entry_request( const struct get_directory_entry_r static void dump_get_directory_entry_reply( const struct get_directory_entry_reply *req ) { - fprintf( stderr, " name_len=%lu,", (unsigned long)req->name_len ); + fprintf( stderr, " name_len=%u,", req->name_len ); fprintf( stderr, " name=" ); dump_varargs_unicode_str( min(cur_size,req->name_len) ); fputc( ',', stderr );

1 0

Aric Stewart : imm32: Implement ImmAssociateContextEx.
by Alexandre Julliard Dec. 8, 2008

Dec. 8, 2008

Module: wine Branch: master Commit: 5c3aa814730ad434b0e4d0a842f06aac41d2134f URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c3aa814730ad434b0e4d0a84… Author: Aric Stewart <aric(a)codeweavers.com> Date: Fri Dec 5 13:24:02 2008 -0600 imm32: Implement ImmAssociateContextEx. --- dlls/imm32/imm.c | 40 +++++++++++++++++++++++++++++++++++++--- 1 files changed, 37 insertions(+), 3 deletions(-) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index 3b7f7a4..b03977c 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -498,14 +498,48 @@ HIMC WINAPI ImmAssociateContext(HWND hWnd, HIMC hIMC) return old; } + +/* + * Helper function for ImmAssociateContextEx + */ +static BOOL CALLBACK _ImmAssociateContextExEnumProc(HWND hwnd, LPARAM lParam) +{ + HIMC hImc = (HIMC)lParam; + ImmAssociateContext(hwnd,hImc); + return TRUE; +} + /*********************************************************************** * ImmAssociateContextEx (IMM32.@) */ BOOL WINAPI ImmAssociateContextEx(HWND hWnd, HIMC hIMC, DWORD dwFlags) { - FIXME("(%p, %p, %d): stub\n", hWnd, hIMC, dwFlags); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; + TRACE("(%p, %p, %d): stub\n", hWnd, hIMC, dwFlags); + + if (!IMM_GetThreadData()->defaultContext) + IMM_GetThreadData()->defaultContext = ImmCreateContext(); + + if (dwFlags == IACE_DEFAULT) + { + ImmAssociateContext(hWnd,IMM_GetThreadData()->defaultContext); + return TRUE; + } + else if (dwFlags == IACE_IGNORENOCONTEXT) + { + if (GetPropW(hWnd,szwWineIMCProperty) > 0) + ImmAssociateContext(hWnd,hIMC); + return TRUE; + } + else if (dwFlags == IACE_CHILDREN) + { + EnumChildWindows(hWnd,_ImmAssociateContextExEnumProc,(LPARAM)hIMC); + return TRUE; + } + else + { + ERR("Unknown dwFlags 0x%x\n",dwFlags); + return FALSE; + } } /***********************************************************************

1 0

Alexandre Julliard : server: Convert the registry key modification time to a win32-style time.
by Alexandre Julliard Dec. 8, 2008

Dec. 8, 2008

Module: wine Branch: master Commit: 3343c408cb7e205b9051370a0c542d3c43e983fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=3343c408cb7e205b9051370a0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Dec 6 17:29:01 2008 +0100 server: Convert the registry key modification time to a win32-style time. --- dlls/ntdll/reg.c | 11 +++-------- include/wine/server_protocol.h | 5 ++--- server/protocol.def | 3 +-- server/registry.c | 39 ++++++++++++++++++++------------------- server/trace.c | 5 +++-- tools/make_requests | 1 - 6 files changed, 29 insertions(+), 35 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3343c408cb7e205b90513…

1 0

Alexandre Julliard : Wine release 1.1.10
by Alexandre Julliard Dec. 5, 2008

Dec. 5, 2008

Module: website Branch: master Commit: f22c96761abaf69e98f0d3b6bd6a80db8adb6d0b URL: http://source.winehq.org/git/website.git/?a=commit;h=f22c96761abaf69e98f0d3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 5 18:09:29 2008 +0100 Wine release 1.1.10 --- news/en/2008120501.xml | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/news/en/2008120501.xml b/news/en/2008120501.xml new file mode 100644 index 0000000..be59d90 --- /dev/null +++ b/news/en/2008120501.xml @@ -0,0 +1,16 @@ +<news> +<date>December 5, 2008</date> +<title>Wine 1.1.10 Released</title> +<body> + The Wine development release 1.1.10 is now available. + <a href="?announce=1.1.10">What's new</a> in this release: +<ul> + <li>Support for virtual memory write watches.</li> + <li>Workarounds for the WINAPI compiler bug on Mac OS.</li> + <li>Several fixes for the 64-bit build.</li> + <li>Some more GdiPlus functions.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="http://prdownloads.sourceforge.net/wine/wine-1.1.10.tar.bz2">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="/site/download">download locations</a>. +</body></news>

1 0