wine-commits December 2009

wine-commits@winehq.org

3 participants
1233 discussions

Hans Leidekker : wininet: Avoid test failures on win9x.
by Alexandre Julliard 22 Dec '09

22 Dec '09

Module: wine Branch: master Commit: d4a7a9d43dad1e63d411f3e7454948a7256115f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d4a7a9d43dad1e63d411f3e74… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Dec 22 14:32:56 2009 +0100 wininet: Avoid test failures on win9x. --- dlls/wininet/tests/http.c | 32 ++++++++++++++++++++++++++++---- 1 files changed, 28 insertions(+), 4 deletions(-) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index 345172c..5d57549 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -1754,7 +1754,7 @@ static DWORD CALLBACK server_thread(LPVOID param) static void test_basic_request(int port, const char *verb, const char *url) { HINTERNET hi, hc, hr; - DWORD r, count, error; + DWORD r, count; char buffer[0x100]; hi = InternetOpen(NULL, INTERNET_OPEN_TYPE_DIRECT, NULL, NULL, 0); @@ -1766,11 +1766,8 @@ static void test_basic_request(int port, const char *verb, const char *url) hr = HttpOpenRequest(hc, verb, url, NULL, NULL, NULL, 0, 0); ok(hr != NULL, "HttpOpenRequest failed\n"); - SetLastError(0xdeadbeef); r = HttpSendRequest(hr, NULL, 0, NULL, 0); - error = GetLastError(); ok(r, "HttpSendRequest failed\n"); - ok(error == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", error); count = 0; memset(buffer, 0, sizeof buffer); @@ -1784,6 +1781,32 @@ static void test_basic_request(int port, const char *verb, const char *url) InternetCloseHandle(hi); } +static void test_last_error(int port) +{ + HINTERNET hi, hc, hr; + DWORD error; + BOOL r; + + hi = InternetOpen(NULL, INTERNET_OPEN_TYPE_DIRECT, NULL, NULL, 0); + ok(hi != NULL, "open failed\n"); + + hc = InternetConnect(hi, "localhost", port, NULL, NULL, INTERNET_SERVICE_HTTP, 0, 0); + ok(hc != NULL, "connect failed\n"); + + hr = HttpOpenRequest(hc, NULL, "/test1", NULL, NULL, NULL, 0, 0); + ok(hr != NULL, "HttpOpenRequest failed\n"); + + SetLastError(0xdeadbeef); + r = HttpSendRequest(hr, NULL, 0, NULL, 0); + error = GetLastError(); + ok(r, "HttpSendRequest failed\n"); + ok(error == ERROR_SUCCESS || broken(error != ERROR_SUCCESS), "expected ERROR_SUCCESS, got %u\n", error); + + InternetCloseHandle(hr); + InternetCloseHandle(hc); + InternetCloseHandle(hi); +} + static void test_proxy_indirect(int port) { HINTERNET hi, hc, hr; @@ -2427,6 +2450,7 @@ static void test_http_connection(void) test_response_without_headers(si.port); test_HttpQueryInfo(si.port); test_HttpSendRequestW(si.port); + test_last_error(si.port); /* send the basic request again to shutdown the server thread */ test_basic_request(si.port, "GET", "/quit");

1 0

Paul Vriens : comctl32/tests: Fix a test failure on older comctl32.
by Alexandre Julliard 22 Dec '09

22 Dec '09

Module: wine Branch: master Commit: f0a35db253f23c57ed7417bf30044959e6fd07ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=f0a35db253f23c57ed7417bf3… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Tue Dec 22 14:23:46 2009 +0100 comctl32/tests: Fix a test failure on older comctl32. --- dlls/comctl32/tests/progress.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/tests/progress.c b/dlls/comctl32/tests/progress.c index 10bbbef..3083e8b 100644 --- a/dlls/comctl32/tests/progress.c +++ b/dlls/comctl32/tests/progress.c @@ -163,6 +163,7 @@ static void cleanup(void) static void test_redraw(void) { RECT client_rect; + LRESULT ret; SendMessageA(hProgressWnd, PBM_SETRANGE, 0, MAKELPARAM(0, 100)); SendMessageA(hProgressWnd, PBM_SETPOS, 10, 0); @@ -184,7 +185,11 @@ static void test_redraw(void) /* PBM_STEPIT */ ok(SendMessageA(hProgressWnd, PBM_STEPIT, 0, 0) == 80, "PBM_STEPIT must return the previous position\n"); ok(!GetUpdateRect(hProgressWnd, NULL, FALSE), "PBM_STEPIT: The progress bar should be redrawn immediately\n"); - ok((UINT)SendMessageA(hProgressWnd, PBM_GETPOS, 0, 0) == 100, "PBM_GETPOS returned a wrong position\n"); + ret = SendMessageA(hProgressWnd, PBM_GETPOS, 0, 0); + if (ret == 0) + win_skip("PBM_GETPOS needs comctl32 > 4.70\n"); + else + ok(ret == 100, "PBM_GETPOS returned a wrong position : %d\n", (UINT)ret); /* PBM_SETRANGE and PBM_SETRANGE32: Usually the progress bar doesn't repaint itself immediately. If the

1 0

Detlef Riekenberg : mstask/tests: Skip some tests when the service is not running.
by Alexandre Julliard 22 Dec '09

22 Dec '09

Module: wine Branch: master Commit: dc2868084758a72877c5befc420c7ffd7c52cd84 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc2868084758a72877c5befc4… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Tue Dec 22 14:01:22 2009 +0100 mstask/tests: Skip some tests when the service is not running. --- dlls/mstask/tests/task.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mstask/tests/task.c b/dlls/mstask/tests/task.c index b9dee35..82df6dd 100644 --- a/dlls/mstask/tests/task.c +++ b/dlls/mstask/tests/task.c @@ -427,7 +427,7 @@ static void test_SetAccountInformation_GetAccountInformation(void) /* WinXP returns HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND): 0x80070002 but * Win2K returns SCHED_E_CANNOT_OPEN_TASK: 0x8004130d * Win9x doesn't support security services */ - if (hres == SCHED_E_NO_SECURITY_SERVICES) + if (hres == SCHED_E_NO_SECURITY_SERVICES || hres == SCHED_E_SERVICE_NOT_RUNNING) { win_skip("Security services are not supported\n"); cleanup_task();

1 0

Eric Pouech : dbghelp: Generalize helper to get a string from an ADDRESS64.
by Alexandre Julliard 22 Dec '09

22 Dec '09

Module: wine Branch: master Commit: 2d85d5c2355ab53f1294646abdfdf4a60a48246a URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d85d5c2355ab53f1294646ab… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Tue Dec 22 14:20:59 2009 +0100 dbghelp: Generalize helper to get a string from an ADDRESS64. --- dlls/dbghelp/dbghelp.c | 18 ++++++++++++++++++ dlls/dbghelp/dbghelp_private.h | 1 + dlls/dbghelp/stack.c | 18 ------------------ 3 files changed, 19 insertions(+), 18 deletions(-) diff --git a/dlls/dbghelp/dbghelp.c b/dlls/dbghelp/dbghelp.c index 1fe829a..8381735 100644 --- a/dlls/dbghelp/dbghelp.c +++ b/dlls/dbghelp/dbghelp.c @@ -133,6 +133,24 @@ void* fetch_buffer(struct process* pcs, unsigned size) return pcs->buffer; } +const char* wine_dbgstr_addr(const ADDRESS64* addr) +{ + if (!addr) return "(null)"; + switch (addr->Mode) + { + case AddrModeFlat: + return wine_dbg_sprintf("flat<%s>", wine_dbgstr_longlong(addr->Offset)); + case AddrMode1616: + return wine_dbg_sprintf("1616<%04x:%04x>", addr->Segment, (DWORD)addr->Offset); + case AddrMode1632: + return wine_dbg_sprintf("1632<%04x:%08x>", addr->Segment, (DWORD)addr->Offset); + case AddrModeReal: + return wine_dbg_sprintf("real<%04x:%04x>", addr->Segment, (DWORD)addr->Offset); + default: + return "unknown"; + } +} + /****************************************************************** * SymSetSearchPathW (DBGHELP.@) * diff --git a/dlls/dbghelp/dbghelp_private.h b/dlls/dbghelp/dbghelp_private.h index b793d14..538086f 100644 --- a/dlls/dbghelp/dbghelp_private.h +++ b/dlls/dbghelp/dbghelp_private.h @@ -425,6 +425,7 @@ extern HANDLE hMsvcrt; extern BOOL validate_addr64(DWORD64 addr); extern BOOL pcs_callback(const struct process* pcs, ULONG action, void* data); extern void* fetch_buffer(struct process* pcs, unsigned size); +extern const char* wine_dbgstr_addr(const ADDRESS64* addr); /* crc32.c */ extern DWORD calc_crc32(int fd); diff --git a/dlls/dbghelp/stack.c b/dlls/dbghelp/stack.c index 82b38cc..f83d35c 100644 --- a/dlls/dbghelp/stack.c +++ b/dlls/dbghelp/stack.c @@ -38,24 +38,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(dbghelp); enum st_mode {stm_start, stm_32bit, stm_16bit, stm_done}; -static const char* wine_dbgstr_addr(const ADDRESS64* addr) -{ - if (!addr) return "(null)"; - switch (addr->Mode) - { - case AddrModeFlat: - return wine_dbg_sprintf("flat<%s>", wine_dbgstr_longlong(addr->Offset)); - case AddrMode1616: - return wine_dbg_sprintf("1616<%04x:%04x>", addr->Segment, (DWORD)addr->Offset); - case AddrMode1632: - return wine_dbg_sprintf("1632<%04x:%08x>", addr->Segment, (DWORD)addr->Offset); - case AddrModeReal: - return wine_dbg_sprintf("real<%04x:%04x>", addr->Segment, (DWORD)addr->Offset); - default: - return "unknown"; - } -} - static DWORD64 WINAPI addr_to_linear(HANDLE hProcess, HANDLE hThread, ADDRESS64* addr) { LDT_ENTRY le;

1 0

Eric Pouech : dbghelp: Rewrote stack_walk with 64 bit structures.
by Alexandre Julliard 22 Dec '09

22 Dec '09

Module: wine Branch: master Commit: fdc86c199982adfa5fcddfbd86cc550a749838a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fdc86c199982adfa5fcddfbd8… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Tue Dec 22 14:20:49 2009 +0100 dbghelp: Rewrote stack_walk with 64 bit structures. --- dlls/dbghelp/stack.c | 168 ++++++++++++++++++++++++++------------------------ 1 files changed, 88 insertions(+), 80 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=fdc86c199982adfa5fcdd…

1 0

Eric Pouech : winedbg: Fix for stack symbols on 64bit platform.
by Alexandre Julliard 22 Dec '09

22 Dec '09

Module: wine Branch: master Commit: 4c661dc822a7aa877668d8c4bda666bbb81d0538 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c661dc822a7aa877668d8c4b… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Tue Dec 22 14:20:38 2009 +0100 winedbg: Fix for stack symbols on 64bit platform. --- programs/winedbg/symbol.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/winedbg/symbol.c b/programs/winedbg/symbol.c index ca2feee..1e32bc6 100644 --- a/programs/winedbg/symbol.c +++ b/programs/winedbg/symbol.c @@ -85,7 +85,7 @@ static BOOL fill_sym_lvalue(const SYMBOL_INFO* sym, ULONG_PTR base, if (!memory_get_register(sym->Register, &pval, buffer, sz)) return FALSE; lvalue->cookie = DLV_TARGET; - lvalue->addr.Offset = (ULONG)((ULONG64)*pval + sym->Address); + lvalue->addr.Offset = (ULONG64)*pval + sym->Address; } else if (sym->Flags & SYMFLAG_VALUEPRESENT) {

1 0

Eric Pouech : winedbg: Ensure the stack pointer is also passed to StackWalk .
by Alexandre Julliard 22 Dec '09

22 Dec '09

Module: wine Branch: master Commit: afcd3a6b1a1c7c8ebdc640e9647534bbf9c0f252 URL: http://source.winehq.org/git/wine.git/?a=commit;h=afcd3a6b1a1c7c8ebdc640e96… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Tue Dec 22 14:20:27 2009 +0100 winedbg: Ensure the stack pointer is also passed to StackWalk. --- programs/winedbg/stack.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/programs/winedbg/stack.c b/programs/winedbg/stack.c index f448e8b..40e6dae 100644 --- a/programs/winedbg/stack.c +++ b/programs/winedbg/stack.c @@ -178,6 +178,7 @@ unsigned stack_fetch_frames(void) memset(&sf, 0, sizeof(sf)); memory_get_current_frame(&sf.AddrFrame); memory_get_current_pc(&sf.AddrPC); + memory_get_current_stack(&sf.AddrStack); /* don't confuse StackWalk by passing in inconsistent addresses */ if ((sf.AddrPC.Mode == AddrModeFlat) && (sf.AddrFrame.Mode != AddrModeFlat))

1 0

Eric Pouech : winedbg: Push the correct machine type to StackWalk.
by Alexandre Julliard 22 Dec '09

22 Dec '09

Module: wine Branch: master Commit: a775d41c105d32338251bb1fcb823dcc031e3746 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a775d41c105d32338251bb1fc… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Tue Dec 22 14:20:16 2009 +0100 winedbg: Push the correct machine type to StackWalk. --- programs/winedbg/be_alpha.c | 1 + programs/winedbg/be_cpu.h | 1 + programs/winedbg/be_i386.c | 1 + programs/winedbg/be_ppc.c | 1 + programs/winedbg/be_x86_64.c | 1 + programs/winedbg/stack.c | 2 +- 6 files changed, 6 insertions(+), 1 deletions(-) diff --git a/programs/winedbg/be_alpha.c b/programs/winedbg/be_alpha.c index 8ced1d6..57bdfd1 100644 --- a/programs/winedbg/be_alpha.c +++ b/programs/winedbg/be_alpha.c @@ -151,6 +151,7 @@ static int be_alpha_fetch_float(const struct dbg_lvalue* lvalue, unsigned size, struct backend_cpu be_alpha = { + IMAGE_FILE_MACHINE_ALPHA, be_cpu_linearize, be_cpu_build_addr, be_alpha_get_addr, diff --git a/programs/winedbg/be_cpu.h b/programs/winedbg/be_cpu.h index 8ce79d1..6679977 100644 --- a/programs/winedbg/be_cpu.h +++ b/programs/winedbg/be_cpu.h @@ -23,6 +23,7 @@ enum be_xpoint_type {be_xpoint_break, be_xpoint_watch_exec, be_xpoint_watch_read be_xpoint_watch_write}; struct backend_cpu { + DWORD machine; /* ------------------------------------------------------------------------------ * address manipulation * ------------------------------------------------------------------------------ */ diff --git a/programs/winedbg/be_i386.c b/programs/winedbg/be_i386.c index e3e7a81..e805a80 100644 --- a/programs/winedbg/be_i386.c +++ b/programs/winedbg/be_i386.c @@ -746,6 +746,7 @@ static int be_i386_fetch_float(const struct dbg_lvalue* lvalue, unsigned size, struct backend_cpu be_i386 = { + IMAGE_FILE_MACHINE_I386, be_i386_linearize, be_i386_build_addr, be_i386_get_addr, diff --git a/programs/winedbg/be_ppc.c b/programs/winedbg/be_ppc.c index bff1571..9ba9994 100644 --- a/programs/winedbg/be_ppc.c +++ b/programs/winedbg/be_ppc.c @@ -175,6 +175,7 @@ static int be_ppc_fetch_float(const struct dbg_lvalue* lvalue, unsigned size, struct backend_cpu be_ppc = { + IMAGE_FILE_MACHINE_POWERPC, be_cpu_linearize, be_cpu_build_addr, be_ppc_get_addr, diff --git a/programs/winedbg/be_x86_64.c b/programs/winedbg/be_x86_64.c index 2f58c88..1ef52b8 100644 --- a/programs/winedbg/be_x86_64.c +++ b/programs/winedbg/be_x86_64.c @@ -376,6 +376,7 @@ static int be_x86_64_fetch_float(const struct dbg_lvalue* lvalue, unsigned size, struct backend_cpu be_x86_64 = { + IMAGE_FILE_MACHINE_AMD64, be_cpu_linearize, be_cpu_build_addr, be_x86_64_get_addr, diff --git a/programs/winedbg/stack.c b/programs/winedbg/stack.c index c80e5c3..f448e8b 100644 --- a/programs/winedbg/stack.c +++ b/programs/winedbg/stack.c @@ -186,7 +186,7 @@ unsigned stack_fetch_frames(void) sf.AddrFrame.Mode = AddrModeFlat; } - while (StackWalk64(IMAGE_FILE_MACHINE_I386, dbg_curr_process->handle, + while (StackWalk64(be_cpu->machine, dbg_curr_process->handle, dbg_curr_thread->handle, &sf, &ctx, stack_read_mem, SymFunctionTableAccess64, SymGetModuleBase64, NULL)) {

1 0

Alexandre Julliard : user32: Get rid of the 16-bit dialog heap.
by Alexandre Julliard 22 Dec '09

22 Dec '09

Module: wine Branch: master Commit: b615656f0093cd7d9f3af5a6bdf9727cd92883dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=b615656f0093cd7d9f3af5a6b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 22 15:18:30 2009 +0100 user32: Get rid of the 16-bit dialog heap. Edit controls don't allocate memory on the 16-bit heap anyway. --- dlls/user32/controls.h | 1 - dlls/user32/defdlg.c | 7 ------- dlls/user32/dialog.c | 1 - dlls/user32/dialog16.c | 16 ---------------- 4 files changed, 0 insertions(+), 25 deletions(-) diff --git a/dlls/user32/controls.h b/dlls/user32/controls.h index c3fd4ec..f9752ee 100644 --- a/dlls/user32/controls.h +++ b/dlls/user32/controls.h @@ -231,7 +231,6 @@ typedef struct tagDIALOGINFO UINT yBaseUnit; INT idResult; /* EndDialog() result / default pushbutton ID */ UINT flags; /* EndDialog() called for this dialog */ - HGLOBAL16 hDialogHeap; } DIALOGINFO; #define DF_END 0x0001 diff --git a/dlls/user32/defdlg.c b/dlls/user32/defdlg.c index 3db59ad..faf5026 100644 --- a/dlls/user32/defdlg.c +++ b/dlls/user32/defdlg.c @@ -234,12 +234,6 @@ static LRESULT DEFDLG_Proc( HWND hwnd, UINT msg, WPARAM wParam, { WND *wndPtr; - /* Free dialog heap (if created) */ - if (dlgInfo->hDialogHeap) - { - GlobalUnlock16(dlgInfo->hDialogHeap); - GlobalFree16(dlgInfo->hDialogHeap); - } if (dlgInfo->hUserFont) DeleteObject( dlgInfo->hUserFont ); if (dlgInfo->hMenu) DestroyMenu( dlgInfo->hMenu ); HeapFree( GetProcessHeap(), 0, dlgInfo ); @@ -347,7 +341,6 @@ DIALOGINFO *DIALOG_get_info( HWND hwnd, BOOL create ) dlgInfo->yBaseUnit = 0; dlgInfo->idResult = 0; dlgInfo->flags = 0; - dlgInfo->hDialogHeap = 0; wndPtr->dlgInfo = dlgInfo; wndPtr->flags |= WIN_ISDIALOG; } diff --git a/dlls/user32/dialog.c b/dlls/user32/dialog.c index 021955b..f0d194d 100644 --- a/dlls/user32/dialog.c +++ b/dlls/user32/dialog.c @@ -674,7 +674,6 @@ static HWND DIALOG_CreateIndirect( HINSTANCE hInst, LPCVOID dlgTemplate, dlgInfo->yBaseUnit = yBaseUnit; dlgInfo->idResult = IDOK; dlgInfo->flags = flags; - dlgInfo->hDialogHeap = 0; if (template.helpId) SetWindowContextHelpId( hwnd, template.helpId ); diff --git a/dlls/user32/dialog16.c b/dlls/user32/dialog16.c index 189ba77..fc6ad1e 100644 --- a/dlls/user32/dialog16.c +++ b/dlls/user32/dialog16.c @@ -151,22 +151,6 @@ static BOOL DIALOG_CreateControls16( HWND hwnd, LPCSTR template, SEGPTR segptr; template = DIALOG_GetControl16( template, &info ); - if (HIWORD(info.className) && !strcmp( info.className, "EDIT") && - !(GetWindowLongW( hwnd, GWL_STYLE ) & DS_LOCALEDIT)) - { - if (!dlgInfo->hDialogHeap) - { - dlgInfo->hDialogHeap = GlobalAlloc16(GMEM_FIXED, 0x10000); - if (!dlgInfo->hDialogHeap) - { - ERR("Insufficient memory to create heap for edit control\n" ); - continue; - } - LocalInit16(dlgInfo->hDialogHeap, 0, 0xffff); - } - instance = dlgInfo->hDialogHeap; - } - segptr = MapLS( info.data ); hwndCtrl = WIN_Handle32( CreateWindowEx16( WS_EX_NOPARENTNOTIFY, info.className, info.windowName,

1 0

Alexandre Julliard : user32: Delay creation of the 16-bit dialog info structure until the window is created .
by Alexandre Julliard 22 Dec '09

22 Dec '09

Module: wine Branch: master Commit: 009badeb32cceea4de5cacda9f6e53068e42f06b URL: http://source.winehq.org/git/wine.git/?a=commit;h=009badeb32cceea4de5cacda9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 22 15:16:03 2009 +0100 user32: Delay creation of the 16-bit dialog info structure until the window is created. This mirrors the behavior of the 32-bit side. --- dlls/user32/dialog16.c | 77 +++++++++++++++++++++-------------------------- 1 files changed, 34 insertions(+), 43 deletions(-) diff --git a/dlls/user32/dialog16.c b/dlls/user32/dialog16.c index e529b2d..189ba77 100644 --- a/dlls/user32/dialog16.c +++ b/dlls/user32/dialog16.c @@ -292,35 +292,24 @@ static HWND DIALOG_CreateIndirect16( HINSTANCE16 hInst, LPCVOID dlgTemplate, RECT rect; POINT pos; SIZE size; - WND * wndPtr; DLG_TEMPLATE template; DIALOGINFO * dlgInfo; BOOL ownerEnabled = TRUE; DWORD exStyle = 0; DWORD units = GetDialogBaseUnits(); + HMENU16 hMenu = 0; + HFONT hUserFont = 0; + UINT flags = 0; + UINT xBaseUnit = LOWORD(units); + UINT yBaseUnit = HIWORD(units); /* Parse dialog template */ dlgTemplate = DIALOG_ParseTemplate16( dlgTemplate, &template ); - /* Initialise dialog extra data */ - - if (!(dlgInfo = HeapAlloc( GetProcessHeap(), 0, sizeof(*dlgInfo) ))) return 0; - dlgInfo->hwndFocus = 0; - dlgInfo->hUserFont = 0; - dlgInfo->hMenu = 0; - dlgInfo->xBaseUnit = LOWORD(units); - dlgInfo->yBaseUnit = HIWORD(units); - dlgInfo->idResult = 0; - dlgInfo->flags = 0; - dlgInfo->hDialogHeap = 0; - /* Load menu */ - if (template.menuName) - { - dlgInfo->hMenu = HMENU_32(LoadMenu16( hInst, template.menuName )); - } + if (template.menuName) hMenu = LoadMenu16( hInst, template.menuName ); /* Create custom font if needed */ @@ -332,32 +321,32 @@ static HWND DIALOG_CreateIndirect16( HINSTANCE16 hInst, LPCVOID dlgTemplate, int pixels; dc = GetDC(0); pixels = MulDiv(template.pointSize, GetDeviceCaps(dc , LOGPIXELSY), 72); - dlgInfo->hUserFont = CreateFontA( -pixels, 0, 0, 0, FW_DONTCARE, - FALSE, FALSE, FALSE, DEFAULT_CHARSET, 0, 0, - PROOF_QUALITY, FF_DONTCARE, template.faceName ); - if (dlgInfo->hUserFont) + hUserFont = CreateFontA( -pixels, 0, 0, 0, FW_DONTCARE, + FALSE, FALSE, FALSE, DEFAULT_CHARSET, 0, 0, + PROOF_QUALITY, FF_DONTCARE, template.faceName ); + if (hUserFont) { SIZE charSize; - HFONT hOldFont = SelectObject( dc, dlgInfo->hUserFont ); + HFONT hOldFont = SelectObject( dc, hUserFont ); charSize.cx = GdiGetCharDimensions( dc, NULL, &charSize.cy ); if (charSize.cx) { - dlgInfo->xBaseUnit = charSize.cx; - dlgInfo->yBaseUnit = charSize.cy; + xBaseUnit = charSize.cx; + yBaseUnit = charSize.cy; } SelectObject( dc, hOldFont ); } ReleaseDC(0, dc); - TRACE("units = %d,%d\n", dlgInfo->xBaseUnit, dlgInfo->yBaseUnit ); + TRACE("units = %d,%d\n", xBaseUnit, yBaseUnit ); } /* Create dialog main window */ rect.left = rect.top = 0; - rect.right = MulDiv(template.cx, dlgInfo->xBaseUnit, 4); - rect.bottom = MulDiv(template.cy, dlgInfo->yBaseUnit, 8); + rect.right = MulDiv(template.cx, xBaseUnit, 4); + rect.bottom = MulDiv(template.cy, yBaseUnit, 8); if (template.style & DS_MODALFRAME) exStyle |= WS_EX_DLGMODALFRAME; - AdjustWindowRectEx( &rect, template.style, (dlgInfo->hMenu != 0), exStyle ); + AdjustWindowRectEx( &rect, template.style, (hMenu != 0), exStyle ); pos.x = rect.left; pos.y = rect.top; size.cx = rect.right - rect.left; @@ -388,8 +377,8 @@ static HWND DIALOG_CreateIndirect16( HINSTANCE16 hInst, LPCVOID dlgTemplate, } else { - pos.x += MulDiv(template.x, dlgInfo->xBaseUnit, 4); - pos.y += MulDiv(template.y, dlgInfo->yBaseUnit, 8); + pos.x += MulDiv(template.x, xBaseUnit, 4); + pos.y += MulDiv(template.y, yBaseUnit, 8); if (!(template.style & (WS_CHILD|DS_ABSALIGN))) ClientToScreen( owner, &pos ); } if ( !(template.style & WS_CHILD) ) @@ -416,31 +405,33 @@ static HWND DIALOG_CreateIndirect16( HINSTANCE16 hInst, LPCVOID dlgTemplate, if (modal) { ownerEnabled = DIALOG_DisableOwner( owner ); - if (ownerEnabled) dlgInfo->flags |= DF_OWNERENABLED; + if (ownerEnabled) flags |= DF_OWNERENABLED; } hwnd = WIN_Handle32( CreateWindowEx16(exStyle, template.className, template.caption, template.style & ~WS_VISIBLE, pos.x, pos.y, size.cx, size.cy, - HWND_16(owner), HMENU_16(dlgInfo->hMenu), - hInst, NULL )); + HWND_16(owner), hMenu, hInst, NULL )); if (!hwnd) { - if (dlgInfo->hUserFont) DeleteObject( dlgInfo->hUserFont ); - if (dlgInfo->hMenu) DestroyMenu( dlgInfo->hMenu ); - if (modal && (dlgInfo->flags & DF_OWNERENABLED)) DIALOG_EnableOwner(owner); - HeapFree( GetProcessHeap(), 0, dlgInfo ); + if (hUserFont) DeleteObject( hUserFont ); + if (hMenu) DestroyMenu16( hMenu ); + if (modal && (flags & DF_OWNERENABLED)) DIALOG_EnableOwner(owner); return 0; } - wndPtr = WIN_GetPtr( hwnd ); - wndPtr->flags |= WIN_ISDIALOG; - wndPtr->dlgInfo = dlgInfo; - WIN_ReleasePtr( wndPtr ); + dlgInfo = DIALOG_get_info( hwnd, TRUE ); + dlgInfo->hwndFocus = 0; + dlgInfo->hUserFont = hUserFont; + dlgInfo->hMenu = HMENU_32( hMenu ); + dlgInfo->xBaseUnit = xBaseUnit; + dlgInfo->yBaseUnit = yBaseUnit; + dlgInfo->idResult = IDOK; + dlgInfo->flags = flags; SetWindowLong16( HWND_16(hwnd), DWLP_DLGPROC, (LONG)dlgProc ); - if (dlgInfo->hUserFont) - SendMessageA( hwnd, WM_SETFONT, (WPARAM)dlgInfo->hUserFont, 0 ); + if (hUserFont) + SendMessageA( hwnd, WM_SETFONT, (WPARAM)hUserFont, 0 ); /* Create controls */

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits December 2009