September 2008 - Wine-commits

Jeff Latimer : user32/tests: Add more A and W test combinations for dde.
by Alexandre Julliard 05 Sep '08

05 Sep '08

Module: wine Branch: master Commit: 16f38d74817eb838c8f96f080d7046ac45ee5a1d URL: http://source.winehq.org/git/wine.git/?a=commit;h=16f38d74817eb838c8f96f080… Author: Jeff Latimer <lats(a)yless4u.com.au> Date: Thu Sep 4 21:08:53 2008 +1000 user32/tests: Add more A and W test combinations for dde. --- dlls/user32/tests/dde.c | 47 ++++++++++++++++++++++++++++++++++++----------- 1 files changed, 36 insertions(+), 11 deletions(-) diff --git a/dlls/user32/tests/dde.c b/dlls/user32/tests/dde.c index 91712d2..cc5e47c 100644 --- a/dlls/user32/tests/dde.c +++ b/dlls/user32/tests/dde.c @@ -1176,7 +1176,6 @@ static LRESULT WINAPI dde_server_wndprocW(HWND hwnd, UINT msg, WPARAM wparam, LP ack.fBusy = 0; cmd = GlobalLock((HGLOBAL)hi); - if (!cmd || (lstrcmpA(cmd, exec_cmdA) && lstrcmpW((LPCWSTR)cmd, exec_cmdW))) { trace("ignoring unknown WM_DDE_EXECUTE command\n"); @@ -2141,14 +2140,16 @@ static HDDEDATA CALLBACK server_end_to_end_callback(UINT uType, UINT uFmt, HCONV { case XTYP_REGISTER: { - ok(msg_index == 1 || msg_index == 7, "Expected 1 or 7, got %d\n", msg_index); + ok(msg_index == 1 || msg_index == 7 || msg_index == 13 || msg_index == 19, + "Expected 1, 7, 13 or 19, got %d\n", msg_index); return (HDDEDATA)TRUE; break; } case XTYP_CONNECT: { - ok(msg_index == 2 || msg_index == 8, "Expected 2 or 8, got %d\n", msg_index); + ok(msg_index == 2 || msg_index == 8 || msg_index == 14 || msg_index == 20, + "Expected 2, 8, 14 or 20, got %d\n", msg_index); ok(uFmt == 0, "Expected 0, got %d, msg_index=%d\n", uFmt, msg_index); ok(hconv == 0, "Expected 0, got %p, msg_index=%d\n", hconv, msg_index); ok(hdata == 0, "Expected 0, got %p, msg_index=%d\n", hdata, msg_index); @@ -2170,7 +2171,8 @@ static HDDEDATA CALLBACK server_end_to_end_callback(UINT uType, UINT uFmt, HCONV } case XTYP_CONNECT_CONFIRM: { - ok(msg_index == 3 || msg_index == 9, "Expected 3 or 9, got %d\n", msg_index); + ok(msg_index == 3 || msg_index == 9 || msg_index == 15 || msg_index == 21, + "Expected 3, 9, 15 or 21 got %d\n", msg_index); conversation = hconv; return (HDDEDATA) TRUE; } @@ -2178,8 +2180,9 @@ static HDDEDATA CALLBACK server_end_to_end_callback(UINT uType, UINT uFmt, HCONV { BYTE *buffer = NULL; - ok(msg_index == 4 || msg_index == 5 || msg_index == 10 || msg_index == 11, - "Expected 4, 5 10 or 11, got %d\n", msg_index); + ok(msg_index == 4 || msg_index == 5 || msg_index == 10 || msg_index == 11 || + msg_index == 16 || msg_index == 17 || msg_index == 22 || msg_index == 23, + "Expected 4, 5, 10, 11, 16, 17, 22 or 23, got %d\n", msg_index); ok(uFmt == 0, "Expected 0, got %d\n", uFmt); ok(hconv == conversation, "Expected conversation handle, got %p, msg_index=%d\n", hconv, msg_index); @@ -2193,8 +2196,8 @@ static HDDEDATA CALLBACK server_end_to_end_callback(UINT uType, UINT uFmt, HCONV ok(size == 12, "Expected 12, got %d, msg_index=%d\n", size, msg_index); size = DdeGetData(hdata, NULL, 0, 0); - if (msg_index == 10 || msg_index == 11) - if (msg_index == 10) + if (msg_index == 10 || msg_index ==11 || msg_index == 16 || msg_index ==17) + if (msg_index == 10 || msg_index == 16) todo_wine ok(size == 34, "Expected that size should be 34 not %d, msg_index=%d\n", size, msg_index); @@ -2202,6 +2205,11 @@ static HDDEDATA CALLBACK server_end_to_end_callback(UINT uType, UINT uFmt, HCONV ok(size == 34, "Expected that size should be 34 not %d, msg_index=%d\n", size, msg_index); else + if (msg_index ==22) + todo_wine + ok(size == 9, "Expected that size should be 9 not %d, msg_index=%d\n", + size, msg_index); + else if (msg_index == 5) todo_wine ok(size == 17, "Expected that size should be 17 not %d, msg_index=%d\n", @@ -2211,11 +2219,11 @@ static HDDEDATA CALLBACK server_end_to_end_callback(UINT uType, UINT uFmt, HCONV size, msg_index); ok((buffer = HeapAlloc(GetProcessHeap(), 0, size)) != NULL, "should not be null\n"); rsize = DdeGetData(hdata, buffer, size, 0); - if (msg_index == 10 || msg_index == 11) + if (msg_index == 10 || msg_index == 11 || msg_index == 16 || msg_index ==17) { ok(rsize == size, "Incorrect size returned, expected %d got %d, msg_index=%d\n", size, rsize, msg_index); - if (msg_index == 10) + if (msg_index == 10 || msg_index == 16) todo_wine { ok(!lstrcmpW((WCHAR*)buffer, test_cmd_w), "Expected \"Test dde command\", msg_index=%d\n", @@ -2228,6 +2236,10 @@ static HDDEDATA CALLBACK server_end_to_end_callback(UINT uType, UINT uFmt, HCONV msg_index); ok(size == 34, "Expected 34, got %d, msg_index=%d\n", size, msg_index); } + }else if (msg_index == 22) + { + ok(rsize == size, "Incorrect size returned, expected %d got %d, msg_index=%d\n", + size, rsize, msg_index); } else { ok(rsize == size, "Incorrect size returned, expected %d got %d, msg_index=%d\n", @@ -2244,6 +2256,7 @@ static HDDEDATA CALLBACK server_end_to_end_callback(UINT uType, UINT uFmt, HCONV test_cmd, buffer, msg_index); ok(size == 17, "Expected size should be 17, got %d, msg_index=%d\n", size, msg_index); } + } return (HDDEDATA) DDE_FACK; @@ -2288,7 +2301,7 @@ static void test_end_to_end_client(BOOL type_a) HCONV hconv; HDDEDATA hdata; static char test_cmd[] = "test dde command"; - static WCHAR test_cmd_w[] = {'t','e','s','t',' ','d','d','e',' ','c','o','m','m','a','n','d',0,}; + static WCHAR test_cmd_w[] = {'t','e','s','t',' ','d','d','e',' ','c','o','m','m','a','n','d',0}; static char test_service[] = "TestDDEService"; static WCHAR test_service_w[] = {'T','e','s','t','D','D','E','S','e','r','v','i','c','e',0}; static char test_topic[] = "TestDDETopic"; @@ -2436,6 +2449,18 @@ START_TEST(dde) test_end_to_end_server(proc.hProcess, proc.hThread, FALSE); + sprintf(buffer, "%s dde enda", argv[0]); + CreateProcessA(NULL, buffer, NULL, NULL, FALSE, + CREATE_SUSPENDED, NULL, NULL, &startup, &proc); + + test_end_to_end_server(proc.hProcess, proc.hThread, FALSE); + + sprintf(buffer, "%s dde endw", argv[0]); + CreateProcessA(NULL, buffer, NULL, NULL, FALSE, + CREATE_SUSPENDED, NULL, NULL, &startup, &proc); + + test_end_to_end_server(proc.hProcess, proc.hThread, TRUE); + test_dde_aw_transaction(); test_DdeCreateDataHandle();

1 0

Jeff Latimer : user32: DdeConnect causes 2 XTYP_CONNECT_CONFIRM messages to flow. Delete one.
by Alexandre Julliard 05 Sep '08

05 Sep '08

Module: wine Branch: master Commit: 5ad6ef53a2921e373038c46e476050111bd53d1f URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ad6ef53a2921e373038c46e4… Author: Jeff Latimer <lats(a)yless4u.com.au> Date: Thu Sep 4 21:08:30 2008 +1000 user32: DdeConnect causes 2 XTYP_CONNECT_CONFIRM messages to flow. Delete one. --- dlls/user32/dde_client.c | 2 -- dlls/user32/tests/dde.c | 3 +-- 2 files changed, 1 insertions(+), 4 deletions(-) diff --git a/dlls/user32/dde_client.c b/dlls/user32/dde_client.c index 00b41c4..99e2d1c 100644 --- a/dlls/user32/dde_client.c +++ b/dlls/user32/dde_client.c @@ -1331,8 +1331,6 @@ static LRESULT CALLBACK WDML_ClientProc(HWND hwnd, UINT iMsg, WPARAM wParam, LPA pConv->wStatus |= ST_ISLOCAL; } - WDML_BroadcastDDEWindows(WDML_szEventClass, WM_WDML_CONNECT_CONFIRM, (WPARAM)hwnd, wParam); - GlobalDeleteAtom(uiLo); GlobalDeleteAtom(uiHi); diff --git a/dlls/user32/tests/dde.c b/dlls/user32/tests/dde.c index 37da7f8..e06f72c 100644 --- a/dlls/user32/tests/dde.c +++ b/dlls/user32/tests/dde.c @@ -2170,7 +2170,7 @@ static HDDEDATA CALLBACK server_end_to_end_callback(UINT uType, UINT uFmt, HCONV } case XTYP_CONNECT_CONFIRM: { - ok(msg_index == 3 || msg_index == 4 || msg_index == 8, "Expected 3 or 8, got %d\n", msg_index); + ok(msg_index == 3 || msg_index == 8, "Expected 3 or 8, got %d\n", msg_index); conversation = hconv; return (HDDEDATA) TRUE; } @@ -2178,7 +2178,6 @@ static HDDEDATA CALLBACK server_end_to_end_callback(UINT uType, UINT uFmt, HCONV { BYTE *buffer = NULL; - todo_wine ok(msg_index == 4 || msg_index == 9, "Expected 4 or 9, got %d\n", msg_index); ok(uFmt == 0, "Expected 0, got %d\n", uFmt); ok(hconv == conversation, "Expected conversation handle, got %p, msg_index=%d\n",

1 0

Jeff Latimer : user32/tests: Test infrastructure for testing ddeml end to end.
by Alexandre Julliard 05 Sep '08

05 Sep '08

Module: wine Branch: master Commit: 4c3e55dd888dfea1e31cdef357ce2cde7b5ce2e2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c3e55dd888dfea1e31cdef35… Author: Jeff Latimer <lats(a)yless4u.com.au> Date: Thu Sep 4 21:07:36 2008 +1000 user32/tests: Test infrastructure for testing ddeml end to end. --- dlls/user32/tests/dde.c | 234 +++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 234 insertions(+), 0 deletions(-) diff --git a/dlls/user32/tests/dde.c b/dlls/user32/tests/dde.c index 5785ff0..37da7f8 100644 --- a/dlls/user32/tests/dde.c +++ b/dlls/user32/tests/dde.c @@ -2122,6 +2122,230 @@ static void test_UnpackDDElParam(void) ok(hi == 0xcafebabe, "Expected 0xcafebabe, got %08lx\n", hi); } +static HDDEDATA CALLBACK server_end_to_end_callback(UINT uType, UINT uFmt, HCONV hconv, + HSZ hsz1, HSZ hsz2, HDDEDATA hdata, + ULONG_PTR dwData1, ULONG_PTR dwData2) +{ + DWORD size, rsize; + char str[MAX_PATH]; + static int msg_index = 0; + static HCONV conversation = 0; + static char test_cmd[] = "test dde command"; + static WCHAR test_cmd_w[] = {'t','e','s','t',' ','d','d','e',' ','c','o','m','m','a','n','d',0}; + static char test_service [] = "TestDDEService"; + static char test_topic [] = "TestDDETopic"; + + msg_index++; + + switch (uType) + { + case XTYP_REGISTER: + { + ok(msg_index == 1 || msg_index == 6, "Expected 1 or 6, got %d\n", msg_index); + return (HDDEDATA)TRUE; + break; + } + + case XTYP_CONNECT: + { + ok(msg_index == 2 || msg_index == 7, "Expected 2 or 7, got %d\n", msg_index); + ok(uFmt == 0, "Expected 0, got %d, msg_index=%d\n", uFmt, msg_index); + ok(hconv == 0, "Expected 0, got %p, msg_index=%d\n", hconv, msg_index); + ok(hdata == 0, "Expected 0, got %p, msg_index=%d\n", hdata, msg_index); + ok(dwData1 != 0, "Expected not 0, got %08lx, msg_index=%d\n", dwData1, msg_index); + ok(dwData2 == FALSE, "Expected FALSE, got %08lx, msg_index=%d\n", dwData2, msg_index); + + size = DdeQueryStringA(server_pid, hsz1, str, MAX_PATH, CP_WINANSI); + ok(!lstrcmpA(str, test_topic), "Expected %s, got %s, msg_index=%d\n", + test_topic, str, msg_index); + ok(size == 12, "Expected 12, got %d, msg_index=%d\n", size, msg_index); + + size = DdeQueryStringA(server_pid, hsz2, str, MAX_PATH, CP_WINANSI); + ok(!lstrcmpA(str, test_service), "Expected %s, got %s, msg_index=%d\n", + test_service, str, msg_index); + ok(size == 14, "Expected 14, got %d, msg_index=%d\n", size, msg_index); + + return (HDDEDATA) TRUE; + break; + } + case XTYP_CONNECT_CONFIRM: + { + ok(msg_index == 3 || msg_index == 4 || msg_index == 8, "Expected 3 or 8, got %d\n", msg_index); + conversation = hconv; + return (HDDEDATA) TRUE; + } + case XTYP_EXECUTE: + { + BYTE *buffer = NULL; + + todo_wine + ok(msg_index == 4 || msg_index == 9, "Expected 4 or 9, got %d\n", msg_index); + ok(uFmt == 0, "Expected 0, got %d\n", uFmt); + ok(hconv == conversation, "Expected conversation handle, got %p, msg_index=%d\n", + hconv, msg_index); + ok(dwData1 == 0, "Expected 0, got %08lx, msg_index=%d\n", dwData1, msg_index); + ok(dwData2 == 0, "Expected 0, got %08lx, msg_index=%d\n", dwData2, msg_index); + ok(hsz2 == 0, "Expected 0, got %p, msg_index=%d\n", hsz2, msg_index); + size = DdeQueryStringA(server_pid, hsz1, str, MAX_PATH, CP_WINANSI); + ok(!lstrcmpA(str, test_topic), "Expected %s, got %s, msg_index=%d\n", + test_topic, str, msg_index); + ok(size == 12, "Expected 12, got %d, msg_index=%d\n", size, msg_index); + ok(size == 12, "Expected 12, got %d, msg_index=%d\n", size, msg_index); + + size = DdeGetData(hdata, NULL, 0, 0); + if (msg_index == 9) + todo_wine + ok(size == 34, "Expected that size should 34 not %d, msg_index=%d\n", + size, msg_index); + else + ok(size == 17, "Expected that size should 17 not %d, msg_index=%d\n", + size, msg_index); + ok((buffer = HeapAlloc(GetProcessHeap(), 0, size)) != NULL, "should not be null\n"); + rsize = DdeGetData(hdata, buffer, size, 0); + if (msg_index == 9) + { + ok(rsize == size, "Incorrect size returned, expected %d got %d, msg_index=%d\n", + size, rsize, msg_index); + todo_wine { + ok(!lstrcmpW((WCHAR*)buffer, test_cmd_w), + "Expected \"Test dde command\", msg_index=%d\n", + msg_index); + ok(size == 34, "Expected 34, got %d, msg_index=%d\n", size, msg_index); + } + } else + { + ok(rsize == size, "Incorrect size returned, expected %d got %d, msg_index=%d\n", + size, rsize, msg_index); + ok(!lstrcmpA((CHAR*)buffer, test_cmd), "Expected %s, got %s, msg_index=%d\n", + test_cmd, buffer, msg_index); + ok(size == 17, "Expected 17, got %d, msg_index=%d\n", size, msg_index); + } + + return (HDDEDATA) DDE_FACK; + } + case XTYP_DISCONNECT: + { + return (HDDEDATA) TRUE; + break; + } + + default: + ok(FALSE, "Unhandled msg: %08x, msg_index=%d\n", uType, msg_index); + } + + return NULL; +} + +static HDDEDATA CALLBACK client_end_to_end_callback(UINT uType, UINT uFmt, HCONV hconv, + HSZ hsz1, HSZ hsz2, HDDEDATA hdata, + ULONG_PTR dwData1, ULONG_PTR dwData2) +{ + switch (uType) + { + case XTYP_DISCONNECT: + { + return (HDDEDATA) TRUE; + break; + } + + default: + ok(FALSE, "Unhandled msg: %08x\n", uType); + } + + return NULL; +} + +static void test_end_to_end_client(BOOL type_a) +{ + DWORD ret, err; + DWORD client_pid = 0; + HSZ server, topic; + HCONV hconv; + HDDEDATA hdata; + static char test_cmd[] = "test dde command"; + static char test_service[] = "TestDDEService"; + static WCHAR test_service_w[] = {'T','e','s','t','D','D','E','S','e','r','v','i','c','e',0}; + static char test_topic[] = "TestDDETopic"; + static WCHAR test_topic_w[] = {'T','e','s','t','D','D','E','T','o','p','i','c',0}; + + trace("Start end to end client %d\n", type_a); + + if (type_a) + ret = DdeInitializeA(&client_pid, client_end_to_end_callback, APPCMD_CLIENTONLY, 0); + else + ret = DdeInitializeW(&client_pid, client_end_to_end_callback, APPCMD_CLIENTONLY, 0); + ok(ret == DMLERR_NO_ERROR, "Expected DMLERR_NO_ERROR, got %x\n", ret); + + if (type_a) + { + server = DdeCreateStringHandleA(client_pid, test_service, CP_WINANSI); + topic = DdeCreateStringHandleA(client_pid, test_topic, CP_WINANSI); + } + else { + server = DdeCreateStringHandleW(client_pid, test_service_w, CP_WINUNICODE); + topic = DdeCreateStringHandleW(client_pid, test_topic_w, CP_WINUNICODE); + } + + DdeGetLastError(client_pid); + hconv = DdeConnect(client_pid, server, topic, NULL); + ok(hconv != NULL, "Expected non-NULL conversation\n"); + ret = DdeGetLastError(client_pid); + ok(ret == DMLERR_NO_ERROR, "Expected DMLERR_NO_ERROR, got %x\n", ret); + DdeFreeStringHandle(client_pid, server); + + hdata = DdeClientTransaction((LPBYTE)test_cmd, strlen(test_cmd) + 1, + hconv, (HSZ)0xdead, 0xbeef, XTYP_EXECUTE, 1000, &ret); + ok(hdata != NULL, "DdeClientTransaction failed\n"); + ok(ret == DDE_FACK, "wrong status code %x\n", ret); + err = DdeGetLastError(client_pid); + ok(err == DMLERR_NO_ERROR, "wrong dde error %x\n", err); + + DdeFreeStringHandle(client_pid, topic); + ret = DdeDisconnect(hconv); + ok(ret == TRUE, "Expected TRUE, got %x\n", ret); + + ret = DdeUninitialize(client_pid); + ok(ret == TRUE, "Expected TRUE, got %x\n", ret); + +} + +static void test_end_to_end_server(HANDLE hproc, HANDLE hthread, BOOL type_a) +{ + MSG msg; + HSZ server; + BOOL ret; + DWORD res; + HDDEDATA hdata; + static CHAR test_service[] = "TestDDEService"; + + trace("start end to end server %d\n", type_a); + server_pid = 0; + + if (type_a) + res = DdeInitializeA(&server_pid, server_end_to_end_callback, APPCLASS_STANDARD, 0); + else + res = DdeInitializeW(&server_pid, server_end_to_end_callback, APPCLASS_STANDARD, 0); + ok(res == DMLERR_NO_ERROR, "Expected DMLERR_NO_ERROR, got %d\n", res); + + server = DdeCreateStringHandleA(server_pid, test_service, CP_WINANSI); + ok(server != NULL, "Expected non-NULL string handle\n"); + + hdata = DdeNameService(server_pid, server, 0, DNS_REGISTER); + ok(hdata == (HDDEDATA)TRUE, "Expected TRUE, got %p\n", hdata); + ResumeThread( hthread ); + + + while (MsgWaitForMultipleObjects( 1, &hproc, FALSE, INFINITE, QS_ALLINPUT ) != 0) + { + while (PeekMessage(&msg, 0, 0, 0, PM_REMOVE)) DispatchMessageA(&msg); + } + + ret = DdeUninitialize(server_pid); + ok(ret == TRUE, "Expected TRUE, got %d\n", ret); + GetExitCodeProcess( hproc, &res ); + ok( !res, "client failed with %u error(s)\n", res ); +} + START_TEST(dde) { int argc; @@ -2137,6 +2361,8 @@ START_TEST(dde) test_ddeml_client(); else if (!lstrcmpA(argv[2], "msg")) test_msg_client(); + else if (!lstrcmpA(argv[2], "enda")) + test_end_to_end_client(TRUE); return; } @@ -2160,6 +2386,14 @@ START_TEST(dde) test_ddeml_server(proc.hProcess); + /* Test the combinations of A and W interfaces with A and W data + end to end to ensure that data conversions are accurate */ + sprintf(buffer, "%s dde enda", argv[0]); + CreateProcessA(NULL, buffer, NULL, NULL, FALSE, + CREATE_SUSPENDED, NULL, NULL, &startup, &proc); + + test_end_to_end_server(proc.hProcess, proc.hThread, TRUE); + test_dde_aw_transaction(); test_DdeCreateDataHandle();

1 0

Alexandre Julliard : winebuild: Generate MS-style imports using the OriginalFirstThunk field.
by Alexandre Julliard 05 Sep '08

05 Sep '08

Module: wine Branch: master Commit: 1abf80909981c9424b8bcc47ea363d02f585bf4f URL: http://source.winehq.org/git/wine.git/?a=commit;h=1abf80909981c9424b8bcc47e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 4 21:52:58 2008 +0200 winebuild: Generate MS-style imports using the OriginalFirstThunk field. --- tools/winebuild/import.c | 12 ++++++++++-- 1 files changed, 10 insertions(+), 2 deletions(-) diff --git a/tools/winebuild/import.c b/tools/winebuild/import.c index 5e0c172..4f6b5ba 100644 --- a/tools/winebuild/import.c +++ b/tools/winebuild/import.c @@ -746,7 +746,8 @@ static void output_immediate_imports(void) { if (dll_imports[i]->delay) continue; dll_name = make_c_identifier( dll_imports[i]->spec->file_name ); - output( "\t.long 0\n" ); /* OriginalFirstThunk */ + output( "\t.long .L__wine_spec_import_data_names+%d-.L__wine_spec_rva_base\n", /* OriginalFirstThunk */ + j * get_ptr_size() ); output( "\t.long 0\n" ); /* TimeDateStamp */ output( "\t.long 0\n" ); /* ForwarderChain */ output( "\t.long .L__wine_spec_import_name_%s-.L__wine_spec_rva_base\n", /* Name */ @@ -762,7 +763,7 @@ static void output_immediate_imports(void) output( "\t.long 0\n" ); /* FirstThunk */ output( "\n\t.align %d\n", get_alignment(get_ptr_size()) ); - output( ".L__wine_spec_import_data_ptrs:\n" ); + output( ".L__wine_spec_import_data_names:\n" ); for (i = 0; i < nb_imports; i++) { if (dll_imports[i]->delay) continue; @@ -783,6 +784,13 @@ static void output_immediate_imports(void) } output( "\t%s 0\n", get_asm_ptr_keyword() ); } + output( ".L__wine_spec_import_data_ptrs:\n" ); + for (i = 0; i < nb_imports; i++) + { + if (dll_imports[i]->delay) continue; + for (j = 0; j < dll_imports[i]->nb_imports; j++) output( "\t%s 0\n", get_asm_ptr_keyword() ); + output( "\t%s 0\n", get_asm_ptr_keyword() ); + } output( ".L__wine_spec_imports_end:\n" ); for (i = 0; i < nb_imports; i++)

1 0

Alexandre Julliard : ntdll: Implemented NtOpenProcessTokenEx and NtOpenThreadTokenEx.
by Alexandre Julliard 05 Sep '08

05 Sep '08

Module: wine Branch: master Commit: 0327f84a2f9e70b416146ee97fdccb1827fe38b4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0327f84a2f9e70b416146ee97… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 4 21:57:13 2008 +0200 ntdll: Implemented NtOpenProcessTokenEx and NtOpenThreadTokenEx. --- dlls/ntdll/nt.c | 44 +++++++++++++++++++++++++++++++------------- dlls/ntdll/ntdll.spec | 16 ++++++++-------- include/winternl.h | 2 ++ 3 files changed, 41 insertions(+), 21 deletions(-) diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c index 18b8309..3ca1755 100644 --- a/dlls/ntdll/nt.c +++ b/dlls/ntdll/nt.c @@ -96,21 +96,30 @@ NTSTATUS WINAPI NtOpenProcessToken( DWORD DesiredAccess, HANDLE *TokenHandle) { + return NtOpenProcessTokenEx( ProcessHandle, DesiredAccess, 0, TokenHandle ); +} + +/****************************************************************************** + * NtOpenProcessTokenEx [NTDLL.@] + * ZwOpenProcessTokenEx [NTDLL.@] + */ +NTSTATUS WINAPI NtOpenProcessTokenEx( HANDLE process, DWORD access, DWORD attributes, + HANDLE *handle ) +{ NTSTATUS ret; - TRACE("(%p,0x%08x,%p)\n", ProcessHandle,DesiredAccess, TokenHandle); + TRACE("(%p,0x%08x,0x%08x,%p)\n", process, access, attributes, handle); SERVER_START_REQ( open_token ) { - req->handle = ProcessHandle; - req->access = DesiredAccess; - req->attributes = 0; + req->handle = process; + req->access = access; + req->attributes = attributes; req->flags = 0; ret = wine_server_call( req ); - if (!ret) *TokenHandle = reply->token; + if (!ret) *handle = reply->token; } SERVER_END_REQ; - return ret; } @@ -124,20 +133,29 @@ NTSTATUS WINAPI NtOpenThreadToken( BOOLEAN OpenAsSelf, HANDLE *TokenHandle) { + return NtOpenThreadTokenEx( ThreadHandle, DesiredAccess, OpenAsSelf, 0, TokenHandle ); +} + +/****************************************************************************** + * NtOpenThreadTokenEx [NTDLL.@] + * ZwOpenThreadTokenEx [NTDLL.@] + */ +NTSTATUS WINAPI NtOpenThreadTokenEx( HANDLE thread, DWORD access, BOOLEAN as_self, DWORD attributes, + HANDLE *handle ) +{ NTSTATUS ret; - TRACE("(%p,0x%08x,0x%08x,%p)\n", - ThreadHandle,DesiredAccess, OpenAsSelf, TokenHandle); + TRACE("(%p,0x%08x,%u,0x%08x,%p)\n", thread, access, as_self, attributes, handle ); SERVER_START_REQ( open_token ) { - req->handle = ThreadHandle; - req->access = DesiredAccess; - req->attributes = 0; + req->handle = thread; + req->access = access; + req->attributes = attributes; req->flags = OPEN_TOKEN_THREAD; - if (OpenAsSelf) req->flags |= OPEN_TOKEN_AS_SELF; + if (as_self) req->flags |= OPEN_TOKEN_AS_SELF; ret = wine_server_call( req ); - if (!ret) *TokenHandle = reply->token; + if (!ret) *handle = reply->token; } SERVER_END_REQ; diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index e18f3a3..696124e 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -214,14 +214,14 @@ @ stdcall NtOpenMutant(ptr long ptr) @ stub NtOpenObjectAuditAlarm @ stdcall NtOpenProcess(ptr long ptr ptr) -@ stdcall NtOpenProcessToken(long long long) -# @ stub NtOpenProcessTokenEx +@ stdcall NtOpenProcessToken(long long ptr) +@ stdcall NtOpenProcessTokenEx(long long long ptr) @ stdcall NtOpenSection(ptr long ptr) @ stdcall NtOpenSemaphore(long long ptr) @ stdcall NtOpenSymbolicLinkObject (ptr long ptr) @ stdcall NtOpenThread(ptr long ptr ptr) -@ stdcall NtOpenThreadToken(long long long long) -# @ stub NtOpenThreadTokenEx +@ stdcall NtOpenThreadToken(long long long ptr) +@ stdcall NtOpenThreadTokenEx(long long long long ptr) @ stdcall NtOpenTimer(ptr long ptr) @ stub NtPlugPlayControl @ stdcall NtPowerInformation(long ptr long ptr long) @@ -1058,14 +1058,14 @@ @ stdcall ZwOpenMutant(ptr long ptr) NtOpenMutant @ stub ZwOpenObjectAuditAlarm @ stdcall ZwOpenProcess(ptr long ptr ptr) NtOpenProcess -@ stdcall ZwOpenProcessToken(long long long) NtOpenProcessToken -# @ stub ZwOpenProcessTokenEx +@ stdcall ZwOpenProcessToken(long long ptr) NtOpenProcessToken +@ stdcall ZwOpenProcessTokenEx(long long long ptr) NtOpenProcessTokenEx @ stdcall ZwOpenSection(ptr long ptr) NtOpenSection @ stdcall ZwOpenSemaphore(long long ptr) NtOpenSemaphore @ stdcall ZwOpenSymbolicLinkObject (ptr long ptr) NtOpenSymbolicLinkObject @ stdcall ZwOpenThread(ptr long ptr ptr) NtOpenThread -@ stdcall ZwOpenThreadToken(long long long long) NtOpenThreadToken -# @ stub ZwOpenThreadTokenEx +@ stdcall ZwOpenThreadToken(long long long ptr) NtOpenThreadToken +@ stdcall ZwOpenThreadTokenEx(long long long long ptr) NtOpenThreadTokenEx @ stdcall ZwOpenTimer(ptr long ptr) NtOpenTimer @ stub ZwPlugPlayControl @ stdcall ZwPowerInformation(long ptr long ptr long) NtPowerInformation diff --git a/include/winternl.h b/include/winternl.h index 71169fa..f254da5 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -1942,11 +1942,13 @@ NTSYSAPI NTSTATUS WINAPI NtOpenMutant(PHANDLE,ACCESS_MASK,const OBJECT_ATTRIBUT NTSYSAPI NTSTATUS WINAPI NtOpenObjectAuditAlarm(PUNICODE_STRING,PHANDLE,PUNICODE_STRING,PUNICODE_STRING,PSECURITY_DESCRIPTOR,HANDLE,ACCESS_MASK,ACCESS_MASK,PPRIVILEGE_SET,BOOLEAN,BOOLEAN,PBOOLEAN); NTSYSAPI NTSTATUS WINAPI NtOpenProcess(PHANDLE,ACCESS_MASK,const OBJECT_ATTRIBUTES*,const CLIENT_ID*); NTSYSAPI NTSTATUS WINAPI NtOpenProcessToken(HANDLE,DWORD,HANDLE *); +NTSYSAPI NTSTATUS WINAPI NtOpenProcessTokenEx(HANDLE,DWORD,DWORD,HANDLE *); NTSYSAPI NTSTATUS WINAPI NtOpenSection(HANDLE*,ACCESS_MASK,const OBJECT_ATTRIBUTES*); NTSYSAPI NTSTATUS WINAPI NtOpenSemaphore(PHANDLE,ACCESS_MASK,const OBJECT_ATTRIBUTES*); NTSYSAPI NTSTATUS WINAPI NtOpenSymbolicLinkObject(PHANDLE,ACCESS_MASK,POBJECT_ATTRIBUTES); NTSYSAPI NTSTATUS WINAPI NtOpenThread(HANDLE*,ACCESS_MASK,const OBJECT_ATTRIBUTES*,const CLIENT_ID*); NTSYSAPI NTSTATUS WINAPI NtOpenThreadToken(HANDLE,DWORD,BOOLEAN,HANDLE *); +NTSYSAPI NTSTATUS WINAPI NtOpenThreadTokenEx(HANDLE,DWORD,BOOLEAN,DWORD,HANDLE *); NTSYSAPI NTSTATUS WINAPI NtOpenTimer(HANDLE*, ACCESS_MASK, const OBJECT_ATTRIBUTES*); NTSYSAPI NTSTATUS WINAPI NtPowerInformation(POWER_INFORMATION_LEVEL,PVOID,ULONG,PVOID,ULONG); NTSYSAPI NTSTATUS WINAPI NtPrivilegeCheck(HANDLE,PPRIVILEGE_SET,PBOOLEAN);

1 0

Alexandre Julliard : ntdll: Add stubs for all the job object functions.
by Alexandre Julliard 05 Sep '08

05 Sep '08

Module: wine Branch: master Commit: 091d9748e3bc4494a2f1f6ee37a699fe98f875d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=091d9748e3bc4494a2f1f6ee3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 4 22:47:13 2008 +0200 ntdll: Add stubs for all the job object functions. --- dlls/ntdll/ntdll.spec | 28 +++++++++--------- dlls/ntdll/sync.c | 76 +++++++++++++++++++++++++++++++++++++++++++++++++ include/winternl.h | 7 ++++ 3 files changed, 97 insertions(+), 14 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=091d9748e3bc4494a2f1f…

1 0

Alexandre Julliard : kernel32: Implemented the wrapper functions for job objects.
by Alexandre Julliard 05 Sep '08

05 Sep '08

Module: wine Branch: master Commit: b44a109b8c06ef2cf6b071dc7b00b742e2ce8001 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b44a109b8c06ef2cf6b071dc7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 4 22:51:02 2008 +0200 kernel32: Implemented the wrapper functions for job objects. --- dlls/kernel32/kernel32.spec | 12 +- dlls/kernel32/sync.c | 212 +++++++++++++++++++++++++++++++++---------- include/winbase.h | 7 ++ include/winnt.h | 22 +++++ 4 files changed, 198 insertions(+), 55 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b44a109b8c06ef2cf6b07…

1 0

Jeff Latimer : user32: Make some DDE traces more meaningful.
by Alexandre Julliard 05 Sep '08

05 Sep '08

Module: wine Branch: master Commit: 57d1059bbb552bfaedab6a5587f025c88955d6f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=57d1059bbb552bfaedab6a558… Author: Jeff Latimer <lats(a)yless4u.com.au> Date: Thu Sep 4 20:31:03 2008 +1000 user32: Make some DDE traces more meaningful. --- dlls/user32/dde_misc.c | 2 +- dlls/user32/dde_server.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/user32/dde_misc.c b/dlls/user32/dde_misc.c index 227f874..79f3540 100644 --- a/dlls/user32/dde_misc.c +++ b/dlls/user32/dde_misc.c @@ -1760,7 +1760,7 @@ WDML_CONV* WDML_AddConv(WDML_INSTANCE* pInstance, WDML_SIDE side, pConv->next = pInstance->convs[side]; pInstance->convs[side] = pConv; - TRACE("pConv->wStatus %04x\n", pConv->wStatus); + TRACE("pConv->wStatus %04x pInstance(%p)\n", pConv->wStatus, pInstance); return pConv; } diff --git a/dlls/user32/dde_server.c b/dlls/user32/dde_server.c index 1c75bff..ba20cf2 100644 --- a/dlls/user32/dde_server.c +++ b/dlls/user32/dde_server.c @@ -340,8 +340,8 @@ static WDML_CONV* WDML_CreateServerConv(WDML_INSTANCE* pInstance, HWND hwndClien hwndServerName, 0, 0, 0); } - TRACE("Created convServer=%p (nameServer=%p) for instance=%08x\n", - hwndServerConv, hwndServerName, pInstance->instanceID); + TRACE("Created convServer=%p (nameServer=%p) for instance=%08x unicode=%d\n", + hwndServerConv, hwndServerName, pInstance->instanceID, pInstance->unicode); pConv = WDML_AddConv(pInstance, WDML_SERVER_SIDE, hszApp, hszTopic, hwndClient, hwndServerConv);

1 0

Alexandre Julliard : libwine: Add support for relocating MS-style imports that use OriginalFirstThunk.
by Alexandre Julliard 05 Sep '08

05 Sep '08

Module: wine Branch: master Commit: 4eb350b86b50edf84a5587f54483c22ecb5a2750 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4eb350b86b50edf84a5587f54… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 4 21:52:36 2008 +0200 libwine: Add support for relocating MS-style imports that use OriginalFirstThunk. --- libs/wine/loader.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/libs/wine/loader.c b/libs/wine/loader.c index 0f05f0c..dde5a70 100644 --- a/libs/wine/loader.c +++ b/libs/wine/loader.c @@ -277,7 +277,7 @@ static void fixup_imports( IMAGE_IMPORT_DESCRIPTOR *dir, BYTE *base, int delta ) fixup_rva_dwords( &dir->u.OriginalFirstThunk, delta, 1 ); fixup_rva_dwords( &dir->Name, delta, 1 ); fixup_rva_dwords( &dir->FirstThunk, delta, 1 ); - ptr = (UINT_PTR *)(base + dir->FirstThunk); + ptr = (UINT_PTR *)(base + (dir->u.OriginalFirstThunk ? dir->u.OriginalFirstThunk : dir->FirstThunk)); while (*ptr) { if (!(*ptr & IMAGE_ORDINAL_FLAG)) *ptr += delta;

1 0

Rico Schüller : fix typo in name
by Jeremy Newman 04 Sep '08

04 Sep '08

Module: website Branch: master Commit: 690d0abee55a3b4e1062ed829e761ef2e0434b25 URL: http://source.winehq.org/git/website.git/?a=commit;h=690d0abee55a3b4e1062ed… Author: Rico Schüller <kgbricola(a)web.de> Date: Thu Sep 4 13:32:56 2008 -0500 fix typo in name --- wwn/en/wn20080827_351.xml | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/wwn/en/wn20080827_351.xml b/wwn/en/wn20080827_351.xml index 7d10533..d757c87 100644 --- a/wwn/en/wn20080827_351.xml +++ b/wwn/en/wn20080827_351.xml @@ -566,7 +566,7 @@ enabled. </p> </quote> <p> -Rico Shuller responds +Rico Schüller responds </p> <quote> <p>

1 0