September 2007 - Wine-Commits

David Hedberg : ddraw: Fix and test case for situation where DDSD_MIPMAPCOUNT is set and dwMipMapCount is 0 .
by Alexandre Julliard Sept. 10, 2007

Sept. 10, 2007

Module: wine Branch: master Commit: c53487b599a50ddcf0311ffe4be456975f984cbb URL: http://source.winehq.org/git/wine.git/?a=commit;h=c53487b599a50ddcf0311ffe4… Author: David Hedberg <david.hedberg(a)gmail.com> Date: Mon Sep 3 13:57:24 2007 +0200 ddraw: Fix and test case for situation where DDSD_MIPMAPCOUNT is set and dwMipMapCount is 0. --- dlls/ddraw/ddraw.c | 7 ++++++- dlls/ddraw/tests/dsurface.c | 19 +++++++++++++++++++ 2 files changed, 25 insertions(+), 1 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 696552d..7c6bf5f 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -2417,7 +2417,12 @@ IDirectDrawImpl_CreateSurface(IDirectDraw7 *iface, { if(desc2.dwFlags & DDSD_MIPMAPCOUNT) { - /* Mipmap count is given, nothing to do */ + /* Mipmap count is given, should not be 0 */ + if( desc2.u2.dwMipMapCount == 0 ) + { + LeaveCriticalSection(&ddraw_cs); + return DDERR_INVALIDPARAMS; + } } else { diff --git a/dlls/ddraw/tests/dsurface.c b/dlls/ddraw/tests/dsurface.c index 6c223f4..59fd4ae 100644 --- a/dlls/ddraw/tests/dsurface.c +++ b/dlls/ddraw/tests/dsurface.c @@ -183,6 +183,25 @@ static void MipMapCreationTest(void) /* Destroy the surface. */ IDirectDrawSurface_Release(lpDDSMipMapTest); + + + /* Fifth mipmap creation test: try to create a surface with + DDSCAPS_COMPLEX, DDSCAPS_MIPMAP, DDSD_MIPMAPCOUNT, + where dwMipMapCount = 0. This should fail. */ + + ddsd.dwSize = sizeof(ddsd); + ddsd.dwFlags = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT | DDSD_MIPMAPCOUNT; + ddsd.ddsCaps.dwCaps = DDSCAPS_TEXTURE | DDSCAPS_COMPLEX | DDSCAPS_MIPMAP; + U2(ddsd).dwMipMapCount = 0; + ddsd.dwWidth = 128; + ddsd.dwHeight = 32; + rc = IDirectDraw_CreateSurface(lpDD, &ddsd, &lpDDSMipMapTest, NULL); + ok(rc==DDERR_INVALIDPARAMS,"CreateSurface returned: %x\n",rc); + + /* Destroy the surface. */ + if( rc == DD_OK ) + IDirectDrawSurface_Release(lpDDSMipMapTest); + } static void SrcColorKey32BlitTest(void)

1 0

David Hedberg : wine.inf: Add oledlg.dll to the list of fake dlls.
by Alexandre Julliard Sept. 10, 2007

Sept. 10, 2007

Module: wine Branch: master Commit: 2456473d66f8d87ecd72a1881aca0f210739c64a URL: http://source.winehq.org/git/wine.git/?a=commit;h=2456473d66f8d87ecd72a1881… Author: David Hedberg <david.hedberg(a)gmail.com> Date: Mon Sep 3 04:30:33 2007 +0200 wine.inf: Add oledlg.dll to the list of fake dlls. --- tools/wine.inf | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/tools/wine.inf b/tools/wine.inf index a766b3d..b051aa0 100644 --- a/tools/wine.inf +++ b/tools/wine.inf @@ -2204,6 +2204,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 11,,ntdll.dll 11,,ole32.dll 11,,oleaut32.dll +11,,oledlg.dll 11,,olepro32.dll 11,,opengl32.dll 11,,progman.exe

1 0

Dan Hipschman : widl: Allow size_is on strings.
by Alexandre Julliard Sept. 10, 2007

Sept. 10, 2007

Module: wine Branch: master Commit: ba54c455fbb312817e0896dd422f7fe721a5099e URL: http://source.winehq.org/git/wine.git/?a=commit;h=ba54c455fbb312817e0896dd4… Author: Dan Hipschman <dsh(a)linux.ucla.edu> Date: Tue Sep 4 15:46:30 2007 -0700 widl: Allow size_is on strings. --- dlls/rpcrt4/tests/server.c | 12 +++++++++ dlls/rpcrt4/tests/server.idl | 1 + tools/widl/typegen.c | 53 +++++++++++++++++++----------------------- 3 files changed, 37 insertions(+), 29 deletions(-) diff --git a/dlls/rpcrt4/tests/server.c b/dlls/rpcrt4/tests/server.c index b6b2565..cd21468 100644 --- a/dlls/rpcrt4/tests/server.c +++ b/dlls/rpcrt4/tests/server.c @@ -85,6 +85,15 @@ s_str_length(const char *s) } int +s_cstr_length(const char *s, int n) +{ + int len = 0; + while (0 < n-- && *s++) + ++len; + return len; +} + +int s_dot_self(vector_t *v) { return s_square(v->x) + s_square(v->y) + s_square(v->z); @@ -616,6 +625,7 @@ pointer_tests(void) static void array_tests(void) { + static const char str1[25] = "Hello"; static int m[2][3][4] = { {{1, 2, 3, 4}, {-1, -3, -5, -7}, {0, 2, 4, 6}}, @@ -628,6 +638,8 @@ array_tests(void) cs_t *cs; int n; + ok(cstr_length(str1, sizeof str1) == strlen(str1), "RPC cstr_length\n"); + ok(sum_fixed_int_3d(m) == 4116, "RPC sum_fixed_int_3d\n"); ok(sum_conf_array(c, 10) == 45, "RPC sum_conf_array\n"); diff --git a/dlls/rpcrt4/tests/server.idl b/dlls/rpcrt4/tests/server.idl index 0a8c0d3..3ee40ae 100644 --- a/dlls/rpcrt4/tests/server.idl +++ b/dlls/rpcrt4/tests/server.idl @@ -73,6 +73,7 @@ interface IServer void square_out(int x, [out] int *y); void square_ref([in, out] int *x); int str_length([string] const char *s); + int cstr_length([string, size_is(n)] const char *s, int n); int dot_self(vector_t *v); double square_half(double x, [out] double *y); float square_half_float(float x, [out] float *y); diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 0ec03d9..7d7c134 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -1312,30 +1312,37 @@ static void write_pointer_description(FILE *file, type_t *type, &offset_in_memory, &offset_in_buffer, typestring_offset); } +static int is_declptr(const type_t *t) +{ + return is_ptr(t) || (is_conformant_array(t) && !t->declarray); +} + static size_t write_string_tfs(FILE *file, const attr_list_t *attrs, const type_t *type, const char *name, unsigned int *typestring_offset) { size_t start_offset = *typestring_offset; - unsigned char flags = 0; - int pointer_type; unsigned char rtype; - if (is_ptr(type)) + if (is_declptr(type)) { - pointer_type = type->type; - type = type->ref; + unsigned char flag = is_conformant_array(type) ? 0 : RPC_FC_P_SIMPLEPOINTER; + int pointer_type = is_ptr(type) ? type->type : get_attrv(attrs, ATTR_POINTERTYPE); + if (!pointer_type) + pointer_type = RPC_FC_RP; + print_file(file, 2,"0x%x, 0x%x,\t/* %s%s */\n", + pointer_type, flag, string_of_type(pointer_type), + flag ? " [simple_pointer]" : ""); + *typestring_offset += 2; + if (!flag) + { + print_file(file, 2, "NdrFcShort(0x2),\n"); + *typestring_offset += 2; + } + rtype = type->ref->type; } else - pointer_type = get_attrv(attrs, ATTR_POINTERTYPE); - - if (!pointer_type) - pointer_type = RPC_FC_RP; - - if (!get_attrp(attrs, ATTR_SIZEIS)) - flags |= RPC_FC_P_SIMPLEPOINTER; - - rtype = type->type; + rtype = type->type; if ((rtype != RPC_FC_BYTE) && (rtype != RPC_FC_CHAR) && (rtype != RPC_FC_WCHAR)) { @@ -1343,18 +1350,6 @@ static size_t write_string_tfs(FILE *file, const attr_list_t *attrs, return start_offset; } - print_file(file, 2,"0x%x, 0x%x, /* %s%s */\n", - pointer_type, flags, - pointer_type == RPC_FC_FP ? "FC_FP" : (pointer_type == RPC_FC_UP ? "FC_UP" : "FC_RP"), - (flags & RPC_FC_P_SIMPLEPOINTER) ? " [simple_pointer]" : ""); - *typestring_offset += 2; - - if (!(flags & RPC_FC_P_SIMPLEPOINTER)) - { - print_file(file, 2, "NdrFcShort(0x2),\n"); - *typestring_offset += 2; - } - if (type->declarray && !is_conformant_array(type)) { /* FIXME: multi-dimensional array */ @@ -1396,10 +1391,10 @@ static size_t write_string_tfs(FILE *file, const attr_list_t *attrs, } else { - if (rtype == RPC_FC_CHAR) - WRITE_FCTYPE(file, FC_C_CSTRING, *typestring_offset); - else + if (rtype == RPC_FC_WCHAR) WRITE_FCTYPE(file, FC_C_WSTRING, *typestring_offset); + else + WRITE_FCTYPE(file, FC_C_CSTRING, *typestring_offset); print_file(file, 2, "0x%x, /* FC_PAD */\n", RPC_FC_PAD); *typestring_offset += 2;

1 0

Dan Hipschman : widl: Implement NDR for struct field alignment.
by Alexandre Julliard Sept. 10, 2007

Sept. 10, 2007

Module: wine Branch: master Commit: 62fb623e14498716730eea347a999256b9707803 URL: http://source.winehq.org/git/wine.git/?a=commit;h=62fb623e14498716730eea347… Author: Dan Hipschman <dsh(a)linux.ucla.edu> Date: Tue Sep 4 11:04:37 2007 -0700 widl: Implement NDR for struct field alignment. --- dlls/rpcrt4/tests/server.c | 9 +++++++++ dlls/rpcrt4/tests/server.idl | 10 ++++++++++ tools/widl/typegen.c | 40 +++++++++++++++++++++++++++++++++++++++- 3 files changed, 58 insertions(+), 1 deletions(-) diff --git a/dlls/rpcrt4/tests/server.c b/dlls/rpcrt4/tests/server.c index 32735a9..b6b2565 100644 --- a/dlls/rpcrt4/tests/server.c +++ b/dlls/rpcrt4/tests/server.c @@ -329,6 +329,12 @@ s_sum_toplev_conf_cond(int *x, int a, int b, int c) return sum; } +double +s_sum_aligns(aligns_t *a) +{ + return a->c + a->i + a->s + a->d; +} + void s_stop(void) { @@ -374,6 +380,7 @@ basic_tests(void) static pvectors_t pvecs = {&vec1, &pvec2}; static sp_inner_t spi = {42}; static sp_t sp = {-13, &spi}; + static aligns_t aligns = {3, 4, 5, 6.0}; pints_t pints; ptypes_t ptypes; int i1, i2, i3, *pi2, *pi3, **ppi3; @@ -447,6 +454,8 @@ basic_tests(void) ok(enum_ord(E2) == 2, "RPC enum_ord\n"); ok(enum_ord(E3) == 3, "RPC enum_ord\n"); ok(enum_ord(E4) == 4, "RPC enum_ord\n"); + + ok(sum_aligns(&aligns) == 18.0, "RPC sum_aligns\n"); } static void diff --git a/dlls/rpcrt4/tests/server.idl b/dlls/rpcrt4/tests/server.idl index 59c9477..0a8c0d3 100644 --- a/dlls/rpcrt4/tests/server.idl +++ b/dlls/rpcrt4/tests/server.idl @@ -189,5 +189,15 @@ interface IServer int sum_toplev_conf_2n([size_is(n * 2)] int *x, int n); int sum_toplev_conf_cond([size_is(c ? a : b)] int *x, int a, int b, int c); + typedef struct + { + char c; + int i; + short s; + double d; + } aligns_t; + + double sum_aligns(aligns_t *a); + void stop(void); } diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 2907706..0ec03d9 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -98,6 +98,8 @@ const char *string_of_type(unsigned char type) case RPC_FC_CARRAY: return "FC_CARRAY"; case RPC_FC_CVARRAY: return "FC_CVARRAY"; case RPC_FC_BOGUS_ARRAY: return "FC_BOGUS_ARRAY"; + case RPC_FC_ALIGNM4: return "RPC_FC_ALIGNM4"; + case RPC_FC_ALIGNM8: return "RPC_FC_ALIGNM8"; default: error("string_of_type: unknown type 0x%02x\n", type); return NULL; @@ -682,13 +684,25 @@ static size_t write_conf_or_var_desc(FILE *file, const func_t *func, const type_ static size_t fields_memsize(const var_list_t *fields, unsigned int *align) { + int have_align = FALSE; size_t size = 0; const var_t *v; if (!fields) return 0; LIST_FOR_EACH_ENTRY( v, fields, const var_t, entry ) - size += type_memsize(v->type, align); + { + unsigned int falign = 0; + size_t fsize = type_memsize(v->type, &falign); + if (!have_align) + { + *align = falign; + have_align = TRUE; + } + size = (size + (falign - 1)) & ~(falign - 1); + size += fsize; + } + size = (size + (*align - 1)) & ~(*align - 1); return size; } @@ -1508,12 +1522,36 @@ static void write_struct_members(FILE *file, const type_t *type, unsigned int *corroff, unsigned int *typestring_offset) { const var_t *field; + unsigned short offset = 0; if (type->fields) LIST_FOR_EACH_ENTRY( field, type->fields, const var_t, entry ) { type_t *ft = field->type; if (!ft->declarray || !is_conformant_array(ft)) + { + unsigned int align = 0; + size_t size = type_memsize(ft, &align); + if ((align - 1) & offset) + { + unsigned char fc = 0; + switch (align) + { + case 4: + fc = RPC_FC_ALIGNM4; + break; + case 8: + fc = RPC_FC_ALIGNM8; + break; + default: + error("write_struct_members: cannot align type %d", ft->type); + } + print_file(file, 2, "0x%x,\t/* %s */\n", fc, string_of_type(fc)); + offset = (offset + (align - 1)) & ~(align - 1); + *typestring_offset += 1; + } write_member_type(file, ft, field, corroff, typestring_offset); + offset += size; + } } write_end(file, typestring_offset);

1 0

Dmitry Timoshkov : server: Print a more informative message when file_set_error or sock_get_error can 't map errno to a status code.
by Alexandre Julliard Sept. 10, 2007

Sept. 10, 2007

Module: wine Branch: master Commit: 69025bafe7cf57fbd9e550b66f4a91c25c766a23 URL: http://source.winehq.org/git/wine.git/?a=commit;h=69025bafe7cf57fbd9e550b66… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Tue Sep 4 22:51:39 2007 +0900 server: Print a more informative message when file_set_error or sock_get_error can't map errno to a status code. --- server/file.c | 5 ++++- server/sock.c | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/server/file.c b/server/file.c index 7fc36b0..0932414 100644 --- a/server/file.c +++ b/server/file.c @@ -310,7 +310,10 @@ void file_set_error(void) #ifdef EOVERFLOW case EOVERFLOW: set_error( STATUS_INVALID_PARAMETER ); break; #endif - default: perror("file_set_error"); set_error( STATUS_UNSUCCESSFUL ); break; + default: + perror("wineserver: file_set_error() can't map error"); + set_error( STATUS_UNSUCCESSFUL ); + break; } } diff --git a/server/sock.c b/server/sock.c index 29b685e..d7c1e68 100644 --- a/server/sock.c +++ b/server/sock.c @@ -762,7 +762,10 @@ static int sock_get_error( int err ) #ifdef EREMOTE case EREMOTE: return WSAEREMOTE; #endif - default: errno=err; perror("sock_set_error"); return WSAEFAULT; + default: + errno = err; + perror("wineserver: sock_get_error() can't map error"); + return WSAEFAULT; } }

1 0

Dan Hipschman : widl: Fix top-level and callback conformances.
by Alexandre Julliard Sept. 10, 2007

Sept. 10, 2007

Module: wine Branch: master Commit: 3d036da6d3c657bc49119079171a1eef8204f8a8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d036da6d3c657bc491190791… Author: Dan Hipschman <dsh(a)linux.ucla.edu> Date: Tue Sep 4 09:33:23 2007 -0700 widl: Fix top-level and callback conformances. --- dlls/rpcrt4/tests/server.c | 47 ++++++++++++ dlls/rpcrt4/tests/server.idl | 13 ++++ tools/widl/typegen.c | 159 +++++++++++++++--------------------------- 3 files changed, 117 insertions(+), 102 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3d036da6d3c657bc49119…

1 0

Dmitry Timoshkov : kernel32: Fix some compiler warnings.
by Alexandre Julliard Sept. 10, 2007

Sept. 10, 2007

Module: wine Branch: master Commit: 0aec2623c546db512bfda662da2b836ebd414fce URL: http://source.winehq.org/git/wine.git/?a=commit;h=0aec2623c546db512bfda662d… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Tue Sep 4 16:57:55 2007 +0900 kernel32: Fix some compiler warnings. --- dlls/kernel32/resource.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/kernel32/resource.c b/dlls/kernel32/resource.c index 52a5f2e..d66f4ae 100644 --- a/dlls/kernel32/resource.c +++ b/dlls/kernel32/resource.c @@ -52,7 +52,7 @@ static NTSTATUS get_res_nameA( LPCSTR name, UNICODE_STRING *str ) { if (!HIWORD(name)) { - str->Buffer = (LPWSTR)name; + str->Buffer = ULongToPtr(LOWORD(name)); return STATUS_SUCCESS; } if (name[0] == '#') @@ -73,7 +73,7 @@ static NTSTATUS get_res_nameW( LPCWSTR name, UNICODE_STRING *str ) { if (!HIWORD(name)) { - str->Buffer = (LPWSTR)name; + str->Buffer = ULongToPtr(LOWORD(name)); return STATUS_SUCCESS; } if (name[0] == '#') @@ -103,7 +103,7 @@ static BOOL get_res_name_type_WtoA( LPCWSTR name, LPCWSTR type, LPSTR *nameA, LP *nameA = HeapAlloc( GetProcessHeap(), 0, len ); if (*nameA) WideCharToMultiByte( CP_ACP, 0, name, -1, *nameA, len, NULL, NULL ); } - else *nameA = (LPSTR)name; + else *nameA = ULongToPtr(LOWORD(name)); if (HIWORD(type)) { @@ -111,7 +111,7 @@ static BOOL get_res_name_type_WtoA( LPCWSTR name, LPCWSTR type, LPSTR *nameA, LP *typeA = HeapAlloc( GetProcessHeap(), 0, len ); if (*typeA) WideCharToMultiByte( CP_ACP, 0, type, -1, *typeA, len, NULL, NULL ); } - else *typeA = (LPSTR)type; + else *typeA = ULongToPtr(LOWORD(type)); } __EXCEPT_PAGE_FAULT { @@ -1684,11 +1684,11 @@ BOOL WINAPI UpdateResourceA( HANDLE hUpdate, LPCSTR lpType, LPCSTR lpName, UNICODE_STRING TypeW; UNICODE_STRING NameW; if(!HIWORD(lpType)) - TypeW.Buffer = (LPWSTR)lpType; + TypeW.Buffer = ULongToPtr(LOWORD(lpType)); else RtlCreateUnicodeStringFromAsciiz(&TypeW, lpType); if(!HIWORD(lpName)) - NameW.Buffer = (LPWSTR)lpName; + NameW.Buffer = ULongToPtr(LOWORD(lpName)); else RtlCreateUnicodeStringFromAsciiz(&NameW, lpName); ret = UpdateResourceW(hUpdate, TypeW.Buffer, NameW.Buffer, wLanguage, lpData, cbData);

1 0

Dmitry Timoshkov : shlwapi: Duplicate shell32. ShellMessageBoxW implementation in shlwapi.ShellMessageBoxWrapW.
by Alexandre Julliard Sept. 10, 2007

Sept. 10, 2007

Module: wine Branch: master Commit: 572e803654d6c487f9bb57588070a3300f40be09 URL: http://source.winehq.org/git/wine.git/?a=commit;h=572e803654d6c487f9bb57588… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Tue Sep 4 16:54:35 2007 +0900 shlwapi: Duplicate shell32.ShellMessageBoxW implementation in shlwapi.ShellMessageBoxWrapW. --- dlls/shell32/shell32.spec | 4 +- dlls/shell32/shellord.c | 6 +++++ dlls/shlwapi/ordinal.c | 53 ++++++++++++++++++++++++++++++-------------- dlls/shlwapi/shlwapi.spec | 2 +- 4 files changed, 45 insertions(+), 20 deletions(-) diff --git a/dlls/shell32/shell32.spec b/dlls/shell32/shell32.spec index 5d47e3d..9beb6d3 100644 --- a/dlls/shell32/shell32.spec +++ b/dlls/shell32/shell32.spec @@ -170,8 +170,8 @@ 179 stdcall -noname SHGetNewLinkInfoA(str str ptr long long) 180 stdcall -noname SHGetNewLinkInfoW(wstr wstr ptr long long) 181 stdcall -noname RegisterShellHook(long long) - 182 varargs -noname ShellMessageBoxW(long long long str long) - 183 varargs -noname ShellMessageBoxA(long long long str long) + 182 varargs -noname ShellMessageBoxW(long long wstr wstr long) + 183 varargs -noname ShellMessageBoxA(long long str str long) 184 stdcall -noname ArrangeWindows(long long long long long) 185 stub SHHandleDiskFull 186 stdcall -noname ILGetDisplayNameEx(ptr ptr ptr long) diff --git a/dlls/shell32/shellord.c b/dlls/shell32/shellord.c index 4da6417..98e8e57 100644 --- a/dlls/shell32/shellord.c +++ b/dlls/shell32/shellord.c @@ -338,6 +338,12 @@ BOOL WINAPI RegisterShellHook( * ShellMessageBoxW [SHELL32.182] * * See ShellMessageBoxA. + * + * NOTE: + * shlwapi.ShellMessageBoxWrapW is a duplicate of shell32.ShellMessageBoxW + * because we can't forward to it in the .spec file since it's exported by + * ordinal. If you change the implementation here please update the code in + * shlwapi as well. */ int WINAPIV ShellMessageBoxW( HINSTANCE hInstance, diff --git a/dlls/shlwapi/ordinal.c b/dlls/shlwapi/ordinal.c index 6ebabfa..8e950d8 100644 --- a/dlls/shlwapi/ordinal.c +++ b/dlls/shlwapi/ordinal.c @@ -4297,26 +4297,45 @@ DWORD WINAPI GetUIVersion(void) /*********************************************************************** * ShellMessageBoxWrapW [SHLWAPI.388] * - * loads a string resource for a module, displays the string in a - * message box and writes it into the logfile + * See shell32.ShellMessageBoxW * - * PARAMS - * mod [I] the module containing the string resource - * unknown1 [I] FIXME - * uId [I] the id of the string resource - * title [I] the title of the message box - * unknown2 [I] FIXME - * filename [I] name of the logfile - * - * RETURNS - * FIXME + * NOTE: + * shlwapi.ShellMessageBoxWrapW is a duplicate of shell32.ShellMessageBoxW + * because we can't forward to it in the .spec file since it's exported by + * ordinal. If you change the implementation here please update the code in + * shell32 as well. */ -BOOL WINAPI ShellMessageBoxWrapW(HMODULE mod, DWORD unknown1, UINT uId, - LPCWSTR title, DWORD unknown2, LPCWSTR filename) +INT WINAPIV ShellMessageBoxWrapW(HINSTANCE hInstance, HWND hWnd, LPCWSTR lpText, + LPCWSTR lpCaption, UINT uType, ...) { - FIXME("%p %x %d %s %x %s\n", - mod, unknown1, uId, debugstr_w(title), unknown2, debugstr_w(filename)); - return TRUE; + WCHAR szText[100], szTitle[100]; + LPCWSTR pszText = szText, pszTitle = szTitle; + LPWSTR pszTemp; + va_list args; + int ret; + + va_start(args, uType); + + TRACE("(%p,%p,%p,%p,%08x)\n", hInstance, hWnd, lpText, lpCaption, uType); + + if (IS_INTRESOURCE(lpCaption)) + LoadStringW(hInstance, LOWORD(lpCaption), szTitle, sizeof(szTitle)/sizeof(szTitle[0])); + else + pszTitle = lpCaption; + + if (IS_INTRESOURCE(lpText)) + LoadStringW(hInstance, LOWORD(lpText), szText, sizeof(szText)/sizeof(szText[0])); + else + pszText = lpText; + + FormatMessageW(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_STRING, + pszText, 0, 0, (LPWSTR)&pszTemp, 0, &args); + + va_end(args); + + ret = MessageBoxW(hWnd, pszTemp, pszTitle, uType); + LocalFree((HLOCAL)pszTemp); + return ret; } HRESULT WINAPI IUnknown_QueryServiceExec(IUnknown *unk, REFIID service, REFIID clsid, diff --git a/dlls/shlwapi/shlwapi.spec b/dlls/shlwapi/shlwapi.spec index bca51ee..3a920d0 100644 --- a/dlls/shlwapi/shlwapi.spec +++ b/dlls/shlwapi/shlwapi.spec @@ -385,7 +385,7 @@ 385 stub -noname SHLoadRawAccelerators 386 stub -noname SHQueryRawAccelerator 387 stub -noname SHQueryRawAcceleratorMsg -388 stdcall -noname ShellMessageBoxWrapW(ptr long long wstr long wstr) +388 varargs -noname ShellMessageBoxWrapW(long long wstr wstr long) 389 stdcall -noname GetSaveFileNameWrapW(ptr) 390 stdcall -noname WNetRestoreConnectionWrapW(long wstr) 391 stdcall -noname WNetGetLastErrorWrapW(ptr ptr long ptr long)

1 0

Dmitry Timoshkov : winebuild: Add IMAGE_FILE_32BIT_MACHINE flag for a 32-bit build.
by Alexandre Julliard Sept. 10, 2007

Sept. 10, 2007

Module: wine Branch: master Commit: 6614028cd0e48367246c4503164f34c5fb8cbf8e URL: http://source.winehq.org/git/wine.git/?a=commit;h=6614028cd0e48367246c45031… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Tue Sep 4 16:52:16 2007 +0900 winebuild: Add IMAGE_FILE_32BIT_MACHINE flag for a 32-bit build. --- tools/winebuild/utils.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/tools/winebuild/utils.c b/tools/winebuild/utils.c index c1e42ad..8f137d8 100644 --- a/tools/winebuild/utils.c +++ b/tools/winebuild/utils.c @@ -336,6 +336,8 @@ DLLSPEC *alloc_dll_spec(void) spec->characteristics = IMAGE_FILE_EXECUTABLE_IMAGE; if (get_ptr_size() > 4) spec->characteristics |= IMAGE_FILE_LARGE_ADDRESS_AWARE; + else + spec->characteristics |= IMAGE_FILE_32BIT_MACHINE; spec->dll_characteristics = IMAGE_DLLCHARACTERISTICS_NX_COMPAT; spec->subsystem = 0; spec->subsystem_major = 4;

1 0

Dmitry Timoshkov : user32: Add more tests for GetUpdateRect.
by Alexandre Julliard Sept. 10, 2007

Sept. 10, 2007

Module: wine Branch: master Commit: 3de83dcb3444148341b4d2fd41feaa8b8865dbb1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3de83dcb3444148341b4d2fd4… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Tue Sep 4 16:50:16 2007 +0900 user32: Add more tests for GetUpdateRect. --- dlls/user32/tests/win.c | 50 +++++++++++++++++++++++++++++++++++++++++----- 1 files changed, 44 insertions(+), 6 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index f3a2ac3..8da30bf 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -4211,10 +4211,12 @@ static void test_gettext(void) static void test_GetUpdateRect(void) { + MSG msg; + BOOL ret, parent_wm_paint, grandparent_wm_paint; RECT rc1, rc2; HWND hgrandparent, hparent, hchild; WNDCLASSA cls; - const char* classNameA = "GetUpdateRectClass"; + static const char classNameA[] = "GetUpdateRectClass"; hgrandparent = CreateWindowA("static", "grandparent", WS_OVERLAPPEDWINDOW, 0, 0, 100, 100, NULL, NULL, 0, NULL); @@ -4230,17 +4232,33 @@ static void test_GetUpdateRect(void) ShowWindow(hchild, SW_HIDE); SetRect(&rc2, 0, 0, 0, 0); - GetUpdateRect(hgrandparent, &rc1, FALSE); + ret = GetUpdateRect(hgrandparent, &rc1, FALSE); + ok(!ret, "GetUpdateRect returned not empty region\n"); ok(EqualRect(&rc1, &rc2), "rects do not match (%d,%d,%d,%d) / (%d,%d,%d,%d)\n", rc1.left, rc1.top, rc1.right, rc1.bottom, rc2.left, rc2.top, rc2.right, rc2.bottom); SetRect(&rc2, 10, 10, 40, 40); - GetUpdateRect(hparent, &rc1, FALSE); + ret = GetUpdateRect(hparent, &rc1, FALSE); + ok(ret, "GetUpdateRect returned empty region\n"); ok(EqualRect(&rc1, &rc2), "rects do not match (%d,%d,%d,%d) / (%d,%d,%d,%d)\n", rc1.left, rc1.top, rc1.right, rc1.bottom, rc2.left, rc2.top, rc2.right, rc2.bottom); + parent_wm_paint = FALSE; + grandparent_wm_paint = FALSE; + while (PeekMessage(&msg, 0, 0, 0, PM_REMOVE)) + { + if (msg.message == WM_PAINT) + { + if (msg.hwnd == hgrandparent) grandparent_wm_paint = TRUE; + if (msg.hwnd == hparent) parent_wm_paint = TRUE; + } + DispatchMessage(&msg); + } + ok(parent_wm_paint, "WM_PAINT should have been recieved in parent\n"); + ok(!grandparent_wm_paint, "WM_PAINT should NOT have been recieved in grandparent\n"); + DestroyWindow(hgrandparent); cls.style = 0; @@ -4259,7 +4277,7 @@ static void test_GetUpdateRect(void) return; } - hgrandparent = CreateWindowA("static", "grandparent", WS_OVERLAPPEDWINDOW, + hgrandparent = CreateWindowA(classNameA, "grandparent", WS_OVERLAPPEDWINDOW, 0, 0, 100, 100, NULL, NULL, 0, NULL); hparent = CreateWindowA(classNameA, "parent", WS_CHILD|WS_VISIBLE, @@ -4271,19 +4289,39 @@ static void test_GetUpdateRect(void) ShowWindow(hgrandparent, SW_SHOW); UpdateWindow(hgrandparent); + ret = GetUpdateRect(hgrandparent, &rc1, FALSE); + ok(!ret, "GetUpdateRect returned not empty region\n"); + ShowWindow(hchild, SW_HIDE); + SetRect(&rc2, 0, 0, 0, 0); - GetUpdateRect(hgrandparent, &rc1, FALSE); + ret = GetUpdateRect(hgrandparent, &rc1, FALSE); + ok(!ret, "GetUpdateRect returned not empty region\n"); ok(EqualRect(&rc1, &rc2), "rects do not match (%d,%d,%d,%d) / (%d,%d,%d,%d)\n", rc1.left, rc1.top, rc1.right, rc1.bottom, rc2.left, rc2.top, rc2.right, rc2.bottom); SetRect(&rc2, 10, 10, 40, 40); - GetUpdateRect(hparent, &rc1, FALSE); + ret = GetUpdateRect(hparent, &rc1, FALSE); + ok(ret, "GetUpdateRect returned empty region\n"); ok(EqualRect(&rc1, &rc2), "rects do not match (%d,%d,%d,%d) / (%d,%d,%d,%d)\n", rc1.left, rc1.top, rc1.right, rc1.bottom, rc2.left, rc2.top, rc2.right, rc2.bottom); + parent_wm_paint = FALSE; + grandparent_wm_paint = FALSE; + while (PeekMessage(&msg, 0, 0, 0, PM_REMOVE)) + { + if (msg.message == WM_PAINT) + { + if (msg.hwnd == hgrandparent) grandparent_wm_paint = TRUE; + if (msg.hwnd == hparent) parent_wm_paint = TRUE; + } + DispatchMessage(&msg); + } + ok(parent_wm_paint, "WM_PAINT should have been recieved in parent\n"); + ok(!grandparent_wm_paint, "WM_PAINT should NOT have been recieved in grandparent\n"); + DestroyWindow(hgrandparent); }

1 0