June 2007 - Wine-commits - list.winehq.org

Rob Shearman : include: Add HTMLTextContainerEvents dispinterface and necessary dispids.
by Alexandre Julliard 14 Jun '07

14 Jun '07

Module: wine Branch: master Commit: 52581b29bfb7b4375cec26b4b45a10044567f507 URL: http://source.winehq.org/git/wine.git/?a=commit;h=52581b29bfb7b4375cec26b4b… Author: Rob Shearman <rob(a)codeweavers.com> Date: Wed Jun 13 19:11:33 2007 +0100 include: Add HTMLTextContainerEvents dispinterface and necessary dispids. --- include/mshtmdid.h | 73 ++++++++++++++++++ include/mshtml.idl | 208 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 281 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=52581b29bfb7b4375cec2…

1 0

Dan Hipschman : widl: Handle wire_marshal pointer attributes.
by Alexandre Julliard 14 Jun '07

14 Jun '07

Module: wine Branch: master Commit: 33250206364dc66451a07abb72f658b84d729ed4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=33250206364dc66451a07abb7… Author: Dan Hipschman <dsh(a)linux.ucla.edu> Date: Wed Jun 13 16:15:41 2007 -0700 widl: Handle wire_marshal pointer attributes. --- dlls/rpcrt4/tests/server.c | 40 ++++++++++++++++++++++++++++++++++++++++ dlls/rpcrt4/tests/server.idl | 17 +++++++++++++++++ tools/widl/typegen.c | 12 ++++++++++-- 3 files changed, 67 insertions(+), 2 deletions(-) diff --git a/dlls/rpcrt4/tests/server.c b/dlls/rpcrt4/tests/server.c index 7b8e48a..aa5f3fc 100644 --- a/dlls/rpcrt4/tests/server.c +++ b/dlls/rpcrt4/tests/server.c @@ -238,6 +238,13 @@ s_dot_copy_vectors(vector_t u, vector_t v) return u.x * v.x + u.y * v.y + u.z * v.z; } +int +s_square_test_us(test_us_t *tus) +{ + int n = atoi(tus->us.x); + return n * n; +} + void s_stop(void) { @@ -432,14 +439,47 @@ puint_t_UserFree(ULONG *flags, puint_t *p) HeapFree(GetProcessHeap(), 0, *p); } +ULONG __RPC_USER +us_t_UserSize(ULONG *flags, ULONG start, us_t *pus) +{ + return start + sizeof(struct wire_us); +} + +unsigned char * __RPC_USER +us_t_UserMarshal(ULONG *flags, unsigned char *buffer, us_t *pus) +{ + struct wire_us wus; + wus.x = atoi(pus->x); + memcpy(buffer, &wus, sizeof wus); + return buffer + sizeof wus; +} + +unsigned char * __RPC_USER +us_t_UserUnmarshal(ULONG *flags, unsigned char *buffer, us_t *pus) +{ + struct wire_us wus; + memcpy(&wus, buffer, sizeof wus); + pus->x = HeapAlloc(GetProcessHeap(), 0, 10); + sprintf(pus->x, "%d", wus.x); + return buffer + sizeof wus; +} + +void __RPC_USER +us_t_UserFree(ULONG *flags, us_t *pus) +{ + HeapFree(GetProcessHeap(), 0, pus->x); +} + static void pointer_tests(void) { static char p1[] = "11"; test_list_t *list = make_list(make_list(make_list(null_list()))); + static test_us_t tus = {{p1}}; ok(test_list_length(list) == 3, "RPC test_list_length\n"); ok(square_puint(p1) == 121, "RPC square_puint\n"); + ok(square_test_us(&tus) == 121, "RPC square_test_us\n"); free_list(list); } diff --git a/dlls/rpcrt4/tests/server.idl b/dlls/rpcrt4/tests/server.idl index 40ed67d..e3c3877 100644 --- a/dlls/rpcrt4/tests/server.idl +++ b/dlls/rpcrt4/tests/server.idl @@ -133,5 +133,22 @@ interface IServer typedef [wire_marshal(int)] void *puint_t; int square_puint(puint_t p); int dot_copy_vectors(vector_t u, vector_t v); + + typedef struct wire_us *wire_us_t; + typedef [wire_marshal(wire_us_t)] struct us us_t; + struct us + { + void *x; + }; + struct wire_us + { + int x; + }; + typedef struct + { + us_t us; + } test_us_t; + + int square_test_us(test_us_t *tus); void stop(void); } diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index de9ae54..0b115ab 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -828,7 +828,7 @@ static int processed(const type_t *type) static void write_user_tfs(FILE *file, type_t *type, unsigned int *tfsoff) { - unsigned int start, absoff; + unsigned int start, absoff, flags; unsigned int align = 0, ualign = 0; const char *name; type_t *utype = get_user_type(type, &name); @@ -854,11 +854,19 @@ static void write_user_tfs(FILE *file, type_t *type, unsigned int *tfsoff) absoff = utype->typestring_offset; } + if (utype->type == RPC_FC_RP) + flags = 0x40; + else if (utype->type == RPC_FC_UP) + flags = 0x80; + else + flags = 0; + start = *tfsoff; update_tfsoff(type, start, file); print_file(file, 0, "/* %d */\n", start); print_file(file, 2, "0x%x,\t/* FC_USER_MARSHAL */\n", RPC_FC_USER_MARSHAL); - print_file(file, 2, "0x%x,\t/* %d */\n", align - 1, align - 1); + print_file(file, 2, "0x%x,\t/* Alignment= %d, Flags= %02x */\n", + flags | (align - 1), align - 1, flags); print_file(file, 2, "NdrFcShort(0x%hx),\t/* Function offset= %hu */\n", funoff, funoff); print_file(file, 2, "NdrFcShort(0x%lx),\t/* %lu */\n", usize, usize); print_file(file, 2, "NdrFcShort(0x%lx),\t/* %lu */\n", size, size);

1 0

Alexandre Julliard : widl: Add typecasts for user marshalling routines to avoid compiler warnings.
by Alexandre Julliard 14 Jun '07

14 Jun '07

Module: wine Branch: master Commit: 9821acf5d2b1b5f8ab7dffba366af66f0bce00b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9821acf5d2b1b5f8ab7dffba3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 14 12:10:45 2007 +0200 widl: Add typecasts for user marshalling routines to avoid compiler warnings. --- tools/widl/typegen.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 0b115ab..6f12a22 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -2530,10 +2530,10 @@ void write_user_quad_list(FILE *file) { const char *sep = &ut->entry == list_tail(&user_type_list) ? "" : ","; print_file(file, 1, "{\n"); - print_file(file, 2, "%s_UserSize,\n", ut->name); - print_file(file, 2, "%s_UserMarshal,\n", ut->name); - print_file(file, 2, "%s_UserUnmarshal,\n", ut->name); - print_file(file, 2, "%s_UserFree\n", ut->name); + print_file(file, 2, "(USER_MARSHAL_SIZING_ROUTINE)%s_UserSize,\n", ut->name); + print_file(file, 2, "(USER_MARSHAL_MARSHALLING_ROUTINE)%s_UserMarshal,\n", ut->name); + print_file(file, 2, "(USER_MARSHAL_UNMARSHALLING_ROUTINE)%s_UserUnmarshal,\n", ut->name); + print_file(file, 2, "(USER_MARSHAL_FREEING_ROUTINE)%s_UserFree\n", ut->name); print_file(file, 1, "}%s\n", sep); } fprintf(file, "};\n\n");

1 0

Francois Gouget : gdiplus: Add missing '\n' to ok() calls, Wine traces.
by Alexandre Julliard 14 Jun '07

14 Jun '07

Module: wine Branch: master Commit: 99aeee622028ba15dd25d58494058da49e522a44 URL: http://source.winehq.org/git/wine.git/?a=commit;h=99aeee622028ba15dd25d5849… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Jun 13 13:18:02 2007 +0200 gdiplus: Add missing '\n' to ok() calls, Wine traces. --- dlls/gdiplus/pen.c | 2 +- dlls/gdiplus/tests/pen.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/pen.c b/dlls/gdiplus/pen.c index 2128d3b..d0355db 100644 --- a/dlls/gdiplus/pen.c +++ b/dlls/gdiplus/pen.c @@ -50,7 +50,7 @@ GpStatus WINGDIPAPI GdipCreatePen1(ARGB color, FLOAT width, GpUnit unit, gp_pen->gdipen = ExtCreatePen(gp_pen->style, (INT) gp_pen->width, &lb, 0, NULL); } else { - FIXME("UnitWorld, UnitPixel only supported units"); + FIXME("UnitWorld, UnitPixel only supported units\n"); return NotImplemented; } diff --git a/dlls/gdiplus/tests/pen.c b/dlls/gdiplus/tests/pen.c index 3615d9a..c6e29c9 100644 --- a/dlls/gdiplus/tests/pen.c +++ b/dlls/gdiplus/tests/pen.c @@ -63,7 +63,7 @@ static void test_constructor_destructor(void) status = GdipCreatePen1((ARGB)0xffff00ff, 10.0f, UnitPixel, &pen); expect(Ok, status); - ok(pen != NULL, "Expected pen to be initialized"); + ok(pen != NULL, "Expected pen to be initialized\n"); status = GdipDeletePen(NULL); expect(InvalidParameter, status);

1 0

Francois Gouget : regedit: Move PerformRegAction() and get_file_name() around to eliminate forward references. Make them static.
by Alexandre Julliard 14 Jun '07

14 Jun '07

Module: wine Branch: master Commit: b668c52802166313984598cc02f68e5d66b54c0a URL: http://source.winehq.org/git/wine.git/?a=commit;h=b668c52802166313984598cc0… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Jun 13 13:18:50 2007 +0200 regedit: Move PerformRegAction() and get_file_name() around to eliminate forward references. Make them static. --- programs/regedit/regedit.c | 215 ++++++++++++++++++++++++++++---------------- programs/regedit/regproc.c | 59 ------------ programs/regedit/regproc.h | 1 - 3 files changed, 136 insertions(+), 139 deletions(-) diff --git a/programs/regedit/regedit.c b/programs/regedit/regedit.c index 68b11df..0c587d6 100644 --- a/programs/regedit/regedit.c +++ b/programs/regedit/regedit.c @@ -58,101 +58,66 @@ typedef enum { ACTION_UNDEF, ACTION_ADD, ACTION_EXPORT, ACTION_DELETE } REGEDIT_ACTION; -BOOL PerformRegAction(REGEDIT_ACTION action, LPSTR s); -/** - * Process unknown switch. +/****************************************************************************** + * Copies file name from command line string to the buffer. + * Rewinds the command line string pointer to the next non-space character + * after the file name. + * Buffer contains an empty string if no filename was found; * - * Params: - * chu - the switch character in upper-case. - * s - the command line string where s points to the switch character. + * params: + * command_line - command line current position pointer + * where *s[0] is the first symbol of the file name. + * file_name - buffer to write the file name to. */ -static void error_unknown_switch(char chu, char *s) +static void get_file_name(CHAR **command_line, CHAR *file_name) { - if (isalpha(chu)) { - fprintf(stderr,"%s: Undefined switch /%c!\n", getAppName(), chu); - } else { - fprintf(stderr,"%s: Alphabetic character is expected after '%c' " - "in switch specification\n", getAppName(), *(s - 1)); - } - exit(1); -} + CHAR *s = *command_line; + int pos = 0; /* position of pointer "s" in *command_line */ + file_name[0] = 0; -BOOL ProcessCmdLine(LPSTR lpCmdLine) -{ - REGEDIT_ACTION action = ACTION_UNDEF; - LPSTR s = lpCmdLine; /* command line pointer */ - CHAR ch = *s; /* current character */ - - setAppName("regedit"); - while (ch && ((ch == '-') || (ch == '/'))) { - char chu; - char ch2; + if (!s[0]) { + return; + } + if (s[0] == '"') { s++; - ch = *s; - ch2 = *(s+1); - chu = toupper(ch); - if (!ch2 || isspace(ch2)) { - if (chu == 'S' || chu == 'V') { - /* ignore these switches */ - } else { - switch (chu) { - case 'D': - action = ACTION_DELETE; - break; - case 'E': - action = ACTION_EXPORT; - break; - case '?': - fprintf(stderr,usage); - exit(0); - break; - default: - error_unknown_switch(chu, s); - break; - } + (*command_line)++; + while(s[0] != '"') { + if (!s[0]) { + fprintf(stderr,"%s: Unexpected end of file name!\n", + getAppName()); + exit(1); } s++; - } else { - if (ch2 == ':') { - switch (chu) { - case 'L': - /* fall through */ - case 'R': - s += 2; - while (*s && !isspace(*s)) { - s++; - } - break; - default: - error_unknown_switch(chu, s); - break; - } - } else { - /* this is a file name, starting from '/' */ - s--; - break; - } + pos++; } - /* skip spaces to the next parameter */ - ch = *s; - while (ch && isspace(ch)) { + } else { + while(s[0] && !isspace(s[0])) { s++; - ch = *s; + pos++; } } + memcpy(file_name, *command_line, pos * sizeof((*command_line)[0])); + /* remove the last backslash */ + if (file_name[pos - 1] == '\\') { + file_name[pos - 1] = '\0'; + } else { + file_name[pos] = '\0'; + } - if (*s && action == ACTION_UNDEF) - action = ACTION_ADD; - - if (action == ACTION_UNDEF) - return FALSE; - - return PerformRegAction(action, s); + if (s[0]) { + s++; + pos++; + } + while(s[0] && isspace(s[0])) { + s++; + pos++; + } + (*command_line) += pos; } -BOOL PerformRegAction(REGEDIT_ACTION action, LPSTR s) +static BOOL PerformRegAction(REGEDIT_ACTION action, LPSTR s) { switch (action) { case ACTION_ADD: { @@ -239,3 +204,95 @@ BOOL PerformRegAction(REGEDIT_ACTION action, LPSTR s) } return TRUE; } + +/** + * Process unknown switch. + * + * Params: + * chu - the switch character in upper-case. + * s - the command line string where s points to the switch character. + */ +static void error_unknown_switch(char chu, char *s) +{ + if (isalpha(chu)) { + fprintf(stderr,"%s: Undefined switch /%c!\n", getAppName(), chu); + } else { + fprintf(stderr,"%s: Alphabetic character is expected after '%c' " + "in switch specification\n", getAppName(), *(s - 1)); + } + exit(1); +} + +BOOL ProcessCmdLine(LPSTR lpCmdLine) +{ + REGEDIT_ACTION action = ACTION_UNDEF; + LPSTR s = lpCmdLine; /* command line pointer */ + CHAR ch = *s; /* current character */ + + setAppName("regedit"); + while (ch && ((ch == '-') || (ch == '/'))) { + char chu; + char ch2; + + s++; + ch = *s; + ch2 = *(s+1); + chu = toupper(ch); + if (!ch2 || isspace(ch2)) { + if (chu == 'S' || chu == 'V') { + /* ignore these switches */ + } else { + switch (chu) { + case 'D': + action = ACTION_DELETE; + break; + case 'E': + action = ACTION_EXPORT; + break; + case '?': + fprintf(stderr,usage); + exit(0); + break; + default: + error_unknown_switch(chu, s); + break; + } + } + s++; + } else { + if (ch2 == ':') { + switch (chu) { + case 'L': + /* fall through */ + case 'R': + s += 2; + while (*s && !isspace(*s)) { + s++; + } + break; + default: + error_unknown_switch(chu, s); + break; + } + } else { + /* this is a file name, starting from '/' */ + s--; + break; + } + } + /* skip spaces to the next parameter */ + ch = *s; + while (ch && isspace(ch)) { + s++; + ch = *s; + } + } + + if (*s && action == ACTION_UNDEF) + action = ACTION_ADD; + + if (action == ACTION_UNDEF) + return FALSE; + + return PerformRegAction(action, s); +} diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c index 16a2b8c..2718194 100644 --- a/programs/regedit/regproc.c +++ b/programs/regedit/regproc.c @@ -99,65 +99,6 @@ char* getToken(char** str, const char* delims) #endif /****************************************************************************** - * Copies file name from command line string to the buffer. - * Rewinds the command line string pointer to the next non-space character - * after the file name. - * Buffer contains an empty string if no filename was found; - * - * params: - * command_line - command line current position pointer - * where *s[0] is the first symbol of the file name. - * file_name - buffer to write the file name to. - */ -void get_file_name(CHAR **command_line, CHAR *file_name) -{ - CHAR *s = *command_line; - int pos = 0; /* position of pointer "s" in *command_line */ - file_name[0] = 0; - - if (!s[0]) { - return; - } - - if (s[0] == '"') { - s++; - (*command_line)++; - while(s[0] != '"') { - if (!s[0]) { - fprintf(stderr,"%s: Unexpected end of file name!\n", - getAppName()); - exit(1); - } - s++; - pos++; - } - } else { - while(s[0] && !isspace(s[0])) { - s++; - pos++; - } - } - memcpy(file_name, *command_line, pos * sizeof((*command_line)[0])); - /* remove the last backslash */ - if (file_name[pos - 1] == '\\') { - file_name[pos - 1] = '\0'; - } else { - file_name[pos] = '\0'; - } - - if (s[0]) { - s++; - pos++; - } - while(s[0] && isspace(s[0])) { - s++; - pos++; - } - (*command_line) += pos; -} - - -/****************************************************************************** * Converts a hex representation of a DWORD into a DWORD. */ DWORD convertHexToDWord(char *str, BYTE *buf) diff --git a/programs/regedit/regproc.h b/programs/regedit/regproc.h index 9a39951..0b23c6a 100644 --- a/programs/regedit/regproc.h +++ b/programs/regedit/regproc.h @@ -48,7 +48,6 @@ void processRegLines(FILE *in, CommandAPI command); * Generic prototypes */ char* getToken(char** str, const char* delims); -void get_file_name(CHAR **command_line, CHAR *filename); DWORD convertHexToDWord(char *str, BYTE *buf); DWORD convertHexCSVToHex(char *str, BYTE *buf, ULONG bufLen); LPSTR convertHexToHexCSV( BYTE *buf, ULONG len);

1 0

Hans Leidekker : gdi32: Add some tests for BITMAPINFOHEADER biSize checks.
by Alexandre Julliard 14 Jun '07

14 Jun '07

Module: wine Branch: master Commit: 1871743543cbf14eb20b3ab2eb30343c317d74cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=1871743543cbf14eb20b3ab2e… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Wed Jun 13 15:57:06 2007 +0200 gdi32: Add some tests for BITMAPINFOHEADER biSize checks. --- dlls/gdi32/tests/bitmap.c | 92 +++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 92 insertions(+), 0 deletions(-) diff --git a/dlls/gdi32/tests/bitmap.c b/dlls/gdi32/tests/bitmap.c index 1d2e8e6..353e2c5 100644 --- a/dlls/gdi32/tests/bitmap.c +++ b/dlls/gdi32/tests/bitmap.c @@ -1700,6 +1700,97 @@ static void test_CreateBitmap(void) DeleteObject(bm); } +static void test_bitmapinfoheadersize(void) +{ + HBITMAP hdib; + BITMAPINFO bmi; + BITMAPCOREINFO bci; + HDC hdc = GetDC(0); + + memset(&bmi, 0, sizeof(BITMAPINFO)); + bmi.bmiHeader.biHeight = 100; + bmi.bmiHeader.biWidth = 512; + bmi.bmiHeader.biBitCount = 24; + bmi.bmiHeader.biPlanes = 1; + + bmi.bmiHeader.biSize = sizeof(BITMAPINFOHEADER) - 1; + + hdib = CreateDIBSection(hdc, &bmi, 0, NULL, NULL, 0); + ok(hdib == NULL, "CreateDIBSection succeeded\n"); + + bmi.bmiHeader.biSize = sizeof(BITMAPINFOHEADER); + + SetLastError(0xdeadbeef); + hdib = CreateDIBSection(hdc, &bmi, 0, NULL, NULL, 0); + ok(hdib != NULL, "CreateDIBSection error %d\n", GetLastError()); + DeleteObject(hdib); + + bmi.bmiHeader.biSize++; + + SetLastError(0xdeadbeef); + hdib = CreateDIBSection(hdc, &bmi, 0, NULL, NULL, 0); + ok(hdib != NULL, "CreateDIBSection error %d\n", GetLastError()); + DeleteObject(hdib); + + bmi.bmiHeader.biSize = sizeof(BITMAPINFO); + + SetLastError(0xdeadbeef); + hdib = CreateDIBSection(hdc, &bmi, 0, NULL, NULL, 0); + ok(hdib != NULL, "CreateDIBSection error %d\n", GetLastError()); + DeleteObject(hdib); + + bmi.bmiHeader.biSize++; + + SetLastError(0xdeadbeef); + hdib = CreateDIBSection(hdc, &bmi, 0, NULL, NULL, 0); + ok(hdib != NULL, "CreateDIBSection error %d\n", GetLastError()); + DeleteObject(hdib); + + bmi.bmiHeader.biSize = sizeof(BITMAPV4HEADER); + + SetLastError(0xdeadbeef); + hdib = CreateDIBSection(hdc, &bmi, 0, NULL, NULL, 0); + ok(hdib != NULL, "CreateDIBSection error %d\n", GetLastError()); + DeleteObject(hdib); + + bmi.bmiHeader.biSize = sizeof(BITMAPV5HEADER); + + SetLastError(0xdeadbeef); + hdib = CreateDIBSection(hdc, &bmi, 0, NULL, NULL, 0); + ok(hdib != NULL, "CreateDIBSection error %d\n", GetLastError()); + DeleteObject(hdib); + + memset(&bci, 0, sizeof(BITMAPCOREINFO)); + bci.bmciHeader.bcHeight = 100; + bci.bmciHeader.bcWidth = 512; + bci.bmciHeader.bcBitCount = 24; + bci.bmciHeader.bcPlanes = 1; + + bci.bmciHeader.bcSize = sizeof(BITMAPCOREHEADER) - 1; + + hdib = CreateDIBSection(hdc, (BITMAPINFO *)&bci, 0, NULL, NULL, 0); + ok(hdib == NULL, "CreateDIBSection succeeded\n"); + + bci.bmciHeader.bcSize = sizeof(BITMAPCOREHEADER); + + SetLastError(0xdeadbeef); + hdib = CreateDIBSection(hdc, (BITMAPINFO *)&bci, 0, NULL, NULL, 0); + ok(hdib != NULL, "CreateDIBSection error %d\n", GetLastError()); + DeleteObject(hdib); + + bci.bmciHeader.bcSize++; + + hdib = CreateDIBSection(hdc, (BITMAPINFO *)&bci, 0, NULL, NULL, 0); + ok(hdib == NULL, "CreateDIBSection succeeded\n"); + + bci.bmciHeader.bcSize = sizeof(BITMAPCOREINFO); + + hdib = CreateDIBSection(hdc, (BITMAPINFO *)&bci, 0, NULL, NULL, 0); + ok(hdib == NULL, "CreateDIBSection succeeded\n"); + + ReleaseDC(0, hdc); +} + START_TEST(bitmap) { is_win9x = GetWindowLongPtrW(GetDesktopWindow(), GWLP_WNDPROC) == 0; @@ -1717,4 +1808,5 @@ START_TEST(bitmap) test_GetDIBits(); test_select_object(); test_CreateBitmap(); + test_bitmapinfoheadersize(); }

1 0

Anatoly Lyutin : user32: tests:msg Add test for switching MDI children.
by Alexandre Julliard 14 Jun '07

14 Jun '07

Module: wine Branch: master Commit: c2bf60b0043245b3f37383e6fb603a31178bd2ae URL: http://source.winehq.org/git/wine.git/?a=commit;h=c2bf60b0043245b3f37383e6f… Author: Anatoly Lyutin <vostok(a)etersoft.ru> Date: Wed Jun 6 16:01:59 2007 +0400 user32: tests:msg Add test for switching MDI children. --- dlls/user32/tests/msg.c | 116 ++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 114 insertions(+), 2 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index fee6b2c..a896696 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -218,6 +218,65 @@ static const struct message WmSWP_ResizeNoZOrder[] = { { 0 } }; +/* Switch visible mdi children */ +static const struct message WmSwitchChild[] = { + /* Switch MDI child */ + { WM_MDIACTIVATE, sent },/* in the MDI client */ + { WM_WINDOWPOSCHANGING, sent|wparam,SWP_NOSIZE|SWP_NOMOVE },/* in the 1st MDI child */ + { WM_CHILDACTIVATE, sent },/* in the 1st MDI child */ + /* Deactivate 2nd MDI child */ + { WM_NCACTIVATE, sent|defwinproc|optional },/* in the 2nd MDI child */ + { WM_MDIACTIVATE, sent|defwinproc|optional },/* in the 2nd MDI child */ + { WM_CREATE, hook }, + /* Preparing for maximize and maximaze the 1st MDI child */ + { WM_GETMINMAXINFO, sent|defwinproc|optional },/* in the 1st MDI child */ + { WM_WINDOWPOSCHANGING, sent|wparam|defwinproc|optional, SWP_FRAMECHANGED|SWP_STATECHANGED },/* in the 1st MDI child */ + { WM_GETMINMAXINFO, sent|defwinproc|optional },/* in the 1st MDI child */ + { WM_NCCALCSIZE, sent|wparam|defwinproc|optional, 1 },/* in the 1st MDI child */ + { WM_CHILDACTIVATE, sent|defwinproc|optional },/* in the 1st MDI child */ + { WM_WINDOWPOSCHANGED, sent|defwinproc|optional },/* in the 1st MDI child */ + { WM_MOVE, sent|defwinproc|optional },/* in the 1st MDI child */ + { WM_SIZE, sent|defwinproc|optional },/* in the 1st MDI child */ + /* Lock redraw 2nd MDI child */ + { WM_SETREDRAW, sent|defwinproc|optional },/* in the 2nd MDI child */ + { WM_WINDOWPOSCHANGING, sent|wparam|defwinproc|optional, SWP_FRAMECHANGED|SWP_NOACTIVATE|SWP_NOSIZE|SWP_NOMOVE },/* in the 2nd MDI child */ + { WM_NCCALCSIZE, sent|wparam|defwinproc|optional, 1 },/* in the 2nd MDI child */ + { WM_WINDOWPOSCHANGED, sent|defwinproc|optional },/* in the 2nd MDI child */ + { WM_CREATE, hook }, + /* Restore 2nd MDI child */ + { WM_WINDOWPOSCHANGING, sent|wparam|defwinproc|optional, SWP_NOACTIVATE|SWP_FRAMECHANGED|SWP_SHOWWINDOW|SWP_STATECHANGED },/* in the 2nd MDI child */ + { WM_GETMINMAXINFO, sent|defwinproc|optional },/* in the 2nd MDI child */ + { WM_NCCALCSIZE, sent|wparam|defwinproc|optional, 1 },/* in the 2nd MDI child */ + { WM_WINDOWPOSCHANGED, sent|defwinproc|optional },/* in the 2nd MDI child */ + { WM_MOVE, sent|defwinproc|optional },/* in the 2nd MDI child */ + { WM_SIZE, sent|defwinproc|optional },/* in the 2nd MDI child */ + /* Redraw 2nd MDI child */ + { WM_SETREDRAW, sent|defwinproc|optional },/* in the 2nd MDI child */ + { WM_WINDOWPOSCHANGING, sent|wparam|defwinproc|optional, SWP_NOACTIVATE|SWP_NOSIZE|SWP_FRAMECHANGED|SWP_NOMOVE },/* in the 1st MDI child */ + { WM_NCCALCSIZE, sent|wparam|defwinproc|optional, 1 },/* in the 1st MDI child */ + { WM_WINDOWPOSCHANGED, sent|defwinproc|optional},/* in the 1st MDI child */ + { WM_WINDOWPOSCHANGING, sent|wparam, SWP_NOACTIVATE|SWP_NOSIZE|SWP_FRAMECHANGED|SWP_NOMOVE },/* in the MDI frame */ + { WM_NCCALCSIZE, sent|wparam, 1 },/* in the MDI frame */ + { WM_WINDOWPOSCHANGED, sent},/* in the MDI frame */ + { WM_WINDOWPOSCHANGING, sent|wparam|defwinproc|optional, SWP_NOACTIVATE|SWP_NOSIZE|SWP_NOMOVE },/* in the 1st MDI child */ + { WM_NCACTIVATE, sent|defwinproc|optional },/* in the 1st MDI child */ + { WM_SETVISIBLE, hook }, + { WM_KILLFOCUS, sent|defwinproc|optional },/* in the 2nd MDI child */ + { WM_IME_SETCONTEXT, sent|wparam|optional, 0 }, /* in MDI client */ + { WM_IME_SETCONTEXT, sent|wparam|optional, 1 }, + { EVENT_OBJECT_FOCUS, winevent_hook|wparam|lparam, OBJID_CLIENT, 0 }, + { WM_SETFOCUS, sent },/* in the MDI client */ + { WM_SETVISIBLE, hook}, + { WM_KILLFOCUS, sent },/* in the MDI client */ + { WM_IME_SETCONTEXT, sent|wparam|optional, 0 }, /* in MDI client */ + { WM_IME_SETCONTEXT, sent|wparam|optional, 1 }, + { EVENT_OBJECT_FOCUS, winevent_hook|wparam|lparam, OBJID_CLIENT, 0 }, + { WM_SETFOCUS, sent|defwinproc|optional },/* in the 1st MDI child */ + { WM_MDIACTIVATE, sent|defwinproc|optional },/* in the 1st MDI child */ + { WM_WINDOWPOSCHANGED, sent },/* in the 1st MDI child */ + { 0 } +}; + /* SetWindowPos(SWP_NOSIZE|SWP_NOMOVE|SWP_NOACTIVATE| SWP_NOZORDER|SWP_FRAMECHANGED) * for a visible overlapped window with WS_CLIPCHILDREN style set. @@ -3160,10 +3219,63 @@ static void test_mdi_messages(void) DestroyWindow(mdi_child); ok_sequence(WmDestroyMDIchildVisibleSeq, "Destroy visible maximized MDI child window", TRUE); - DestroyWindow(mdi_client); - ok_sequence(WmDestroyMDIclientSeq, "Destroy MDI client window", FALSE); /* end of test for maximization of MDI child with invisible parent */ + + /* test for switch maximized MDI children */ + trace("creating maximized visible MDI child window 1(Switch test)\n"); + mdi_child = CreateWindowExA(WS_EX_MDICHILD, "MDI_child_class", "MDI child", + WS_CHILD | WS_VISIBLE | WS_MAXIMIZEBOX | WS_MAXIMIZE, + 0, 0, CW_USEDEFAULT, CW_USEDEFAULT, + mdi_client, 0, GetModuleHandleA(0), NULL); + assert(mdi_child); + ok_sequence(WmCreateMDIchildVisibleMaxSeq1, "Create maximized visible 1st MDI child window(Switch test)", TRUE); + ok(IsZoomed(mdi_child), "1st MDI child should be maximized(Switch test)\n"); + + ok(GetActiveWindow() == mdi_frame, "wrong active window %p(Switch test)\n", GetActiveWindow()); + ok(GetFocus() == mdi_child || /* win2k */ + GetFocus() == 0, /* win9x */ + "wrong focus window %p(Switch test)\n", GetFocus()); + + active_child = (HWND)SendMessageA(mdi_client, WM_MDIGETACTIVE, 0, (LPARAM)&zoomed); + ok(active_child == mdi_child, "wrong active MDI child %p(Switch test)\n", active_child); + ok(zoomed, "wrong zoomed state %d(Switch test)\n", zoomed); + flush_sequence(); + + trace("creating maximized visible MDI child window 2(Switch test)\n"); + mdi_child2 = CreateWindowExA(WS_EX_MDICHILD, "MDI_child_class", "MDI child", + WS_CHILD | WS_VISIBLE | WS_MAXIMIZEBOX | WS_MAXIMIZE, + 0, 0, CW_USEDEFAULT, CW_USEDEFAULT, + mdi_client, 0, GetModuleHandleA(0), NULL); + assert(mdi_child2); + ok_sequence(WmCreateMDIchildVisibleMaxSeq2, "Create maximized visible 2nd MDI child 2 window(Switch test)\n", TRUE); + ok(IsZoomed(mdi_child2), "2nd MDI child should be maximized(Switch test)\n"); + ok(!IsZoomed(mdi_child), "1st MDI child should NOT be maximized(Switch test)\n"); + + ok(GetActiveWindow() == mdi_frame, "wrong active window %p(Switch test)\n", GetActiveWindow()); + ok(GetFocus() == mdi_child2, "wrong focus window %p(Switch test)\n", GetFocus()); + + active_child = (HWND)SendMessageA(mdi_client, WM_MDIGETACTIVE, 0, (LPARAM)&zoomed); + ok(active_child == mdi_child2, "wrong active MDI child %p(Switch test)\n", active_child); + ok(zoomed, "wrong zoomed state %d(Switch test)\n", zoomed); + flush_sequence(); + + trace("Switch child window.\n"); + SendMessageA(mdi_client, WM_MDIACTIVATE, (WPARAM)mdi_child, 0); + ok_sequence(WmSwitchChild,"Child not switch correctly\n",TRUE); + trace("end of test for switch maximized MDI children\n"); + + SendMessageA(mdi_client, WM_MDIDESTROY, (WPARAM)mdi_child, 0); + flush_sequence(); + + SendMessageA(mdi_client, WM_MDIDESTROY, (WPARAM)mdi_child2, 0); + flush_sequence(); + + /* end of test for switch maximized MDI children */ + + DestroyWindow(mdi_client); + ok_sequence(WmDestroyMDIclientSeq, "Destroy MDI client window", FALSE); + DestroyWindow(mdi_frame); ok_sequence(WmDestroyMDIframeSeq, "Destroy MDI frame window", FALSE); }

1 0

Dan Hipschman : widl: Handle wire_marshal types.
by Alexandre Julliard 14 Jun '07

14 Jun '07

Module: wine Branch: master Commit: c0982b42c5293f22b0be0cc3d06e8a2a7ef0e9f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0982b42c5293f22b0be0cc3d… Author: Dan Hipschman <dsh(a)linux.ucla.edu> Date: Wed Jun 13 16:13:04 2007 -0700 widl: Handle wire_marshal types. --- dlls/rpcrt4/tests/server.c | 39 +++++++++ dlls/rpcrt4/tests/server.idl | 2 + tools/widl/client.c | 3 +- tools/widl/header.c | 29 ++---- tools/widl/parser.y | 15 ++++ tools/widl/proxy.c | 7 +- tools/widl/server.c | 15 +++- tools/widl/typegen.c | 186 ++++++++++++++++++++++++++++++++++-------- tools/widl/typegen.h | 3 + tools/widl/widltypes.h | 10 ++ 10 files changed, 246 insertions(+), 63 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c0982b42c5293f22b0be0…

1 0

Dan Hipschman : widl: Test structure argument marshalling.
by Alexandre Julliard 14 Jun '07

14 Jun '07

Module: wine Branch: master Commit: 2bc8808be1f2b4599412321f58311f176101d09b URL: http://source.winehq.org/git/wine.git/?a=commit;h=2bc8808be1f2b4599412321f5… Author: Dan Hipschman <dsh(a)linux.ucla.edu> Date: Wed Jun 13 16:14:08 2007 -0700 widl: Test structure argument marshalling. --- dlls/rpcrt4/tests/server.c | 7 +++++++ dlls/rpcrt4/tests/server.idl | 1 + 2 files changed, 8 insertions(+), 0 deletions(-) diff --git a/dlls/rpcrt4/tests/server.c b/dlls/rpcrt4/tests/server.c index fbaa755..7b8e48a 100644 --- a/dlls/rpcrt4/tests/server.c +++ b/dlls/rpcrt4/tests/server.c @@ -232,6 +232,12 @@ s_square_puint(puint_t p) return n * n; } +int +s_dot_copy_vectors(vector_t u, vector_t v) +{ + return u.x * v.x + u.y * v.y + u.z * v.z; +} + void s_stop(void) { @@ -342,6 +348,7 @@ basic_tests(void) ok(ptypes_sum(&ptypes) == 33.0, "RPC ptypes_sum\n"); ok(dot_pvectors(&pvecs) == -21, "RPC dot_pvectors\n"); + ok(dot_copy_vectors(vec1, vec2) == -21, "RPC dot_copy_vectors\n"); ok(sum_fixed_array(f) == -2, "RPC sum_fixed_array\n"); ok(sum_sp(&sp) == 29, "RPC sum_sp\n"); } diff --git a/dlls/rpcrt4/tests/server.idl b/dlls/rpcrt4/tests/server.idl index d6ed5f2..40ed67d 100644 --- a/dlls/rpcrt4/tests/server.idl +++ b/dlls/rpcrt4/tests/server.idl @@ -132,5 +132,6 @@ interface IServer typedef [wire_marshal(int)] void *puint_t; int square_puint(puint_t p); + int dot_copy_vectors(vector_t u, vector_t v); void stop(void); }

1 0

appdb/ ./objectManager.php include/objectManag ...
by WineHQ 14 Jun '07

14 Jun '07

ChangeSet ID: 31197 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/06/13 20:27:59 Modified files: . : objectManager.php include : objectManager.php Log message: Chris Morgan <cmorgan(a)alum.wpi.edu> Add some common responses to the entry processing page, selectable via radio buttons. This should make admin responses more consistent and make it quicker and easier to process submissions. Patch: http://cvs.winehq.org/patch.py?id=31197 Old revision New revision Changes Path 1.13 1.14 +2 -2 appdb/objectManager.php 1.27 1.28 +59 -0 appdb/include/objectManager.php Index: appdb/objectManager.php diff -u -p appdb/objectManager.php:1.13 appdb/objectManager.php:1.14 --- appdb/objectManager.php:1.13 14 Jun 2007 1:27:59 -0000 +++ appdb/objectManager.php 14 Jun 2007 1:27:59 -0000 @@ -54,8 +54,8 @@ if($aClean['bIsRejected'] == 'true') $oOtherObject = new $oObject->sClass($oObject->iId); -/* Certain actions must be performed before the header is set - processForm return TRUE on success, or a user-readable list of errors +/* Certain actions must be performed before the header is set. */ +/* processForm returns TRUE on success, or a user-readable list of errors on failure */ $sErrors = $oObject->processForm($aClean); Index: appdb/include/objectManager.php diff -u -p appdb/include/objectManager.php:1.27 appdb/include/objectManager.php:1.28 --- appdb/include/objectManager.php:1.27 14 Jun 2007 1:27:59 -0000 +++ appdb/include/objectManager.php 14 Jun 2007 1:27:59 -0000 @@ -13,6 +13,10 @@ class ObjectManager var $oMultiPage; var $oTableRow; + // an array of common responses used when replying to + // queued entries + var $aCommonResponses; + function ObjectManager($sClass, $sTitle = "list", $iId = false) { $this->sClass = $sClass; @@ -20,6 +24,23 @@ class ObjectManager $this->iId = $iId; $this->oMultiPage = new MultiPage(FALSE); $this->oTableRow = new TableRow(null); + + // initialize the common responses array + $this->aCommonResponses = array(); + $this->aCommonResponses[] = "Thank you for your submission."; + $this->aCommonResponses[] = "Please move crash/debug output to a bug". + " in Wine's Bugzilla at http://bugs.winehq.org and resubmit."; + $this->aCommonResponses[] = "We appreciate your submission but it". + " needs to be more detailed before it will be most useful to other users of". + " the Application Datbase.". + " Please try to improve the entry and resubmit."; + $this->aCommonResponses[] = "We appreciate your submission but it". + " requires improvement to its grammar and/or spelling". + " before it will be most useful to other users of". + " the Application Database.". + " Please try to improve the entry and resubmit."; + $this->aCommonResponses[] = "Please do not copy large amount of text from". + " the program's website"; } /* Check whether the associated class has the given method */ @@ -194,6 +215,29 @@ class ObjectManager echo '<td><textarea name="sReplyText" style="width: 100%" cols="80" '. 'rows="10">'.$sDefaultReply.'</textarea></td></tr>',"\n"; + + ///////////////////////////////////////////////// + // output radio buttons for some common responses + echo '<tr valign=top><td class="color0"></td><td class="color0">'. + '<b>Common replies</b><br/> Email <a href="mailto:'.APPDB_OWNER_EMAIL.'">'. + APPDB_OWNER_EMAIL.'</a> if you want to suggest a new common reply.</td></tr>',"\n"; + + // NOTE: We use the label tag so the user can click anywhere in + // the text of the radio button to select the radio button. + // Otherwise the user has to click on the very small circle portion + // of the button to select it + foreach($this->aCommonResponses as $iIndex => $sReply) + { + echo '<tr valign=top><td class="color0"></td>',"\n"; + echo '<td class="color0"><label for="'.$iIndex.'"><input'. + ' type="radio" name="sOMCommonReply" id="'.$iIndex.'" value="'.$sReply.'"/>'. + $sReply.'</label></td>',"\n"; + echo '</tr>',"\n"; + } + // end output radio buttons for common responses + ///////////////////////////////////////////////// + + /* buttons for operations we can perform on this entry */ echo '<tr valign=top><td class=color3 align=center colspan=2>' ,"\n"; echo '<input name="sSubmit" type="submit" value="Submit" class="button" '. @@ -407,6 +451,12 @@ class ObjectManager /* Process form data generated by adding or updating an entry */ function processForm($aClean) { + // FIXME: hack so if we modify $aClean in here any objects that use the global + // $aClean will see the modified value. Should be replaced when we have + // general purpose objectManager email code in place since the sReplyText value + // is the value we modify and we'll be passing that into methods in the future + global $aClean; + if(!$aClean['sSubmit']) return; @@ -425,6 +475,15 @@ class ObjectManager $aClean['sReplyText'] = ""; } + // handle the common response radio button value + // if sReplyText is empty, if sOMCommonReply was set because + // the user selected a radio button then use that text instead + if(($aClean['sReplyText'] == "") && isset($aClean['sOMCommonReply'])) + { + $aClean['sReplyText'] = $aClean['sOMCommonReply']; + } + + $oObject->getOutputEditorValues($aClean); /* Check input, if necessary */

1 0