October 2010 - Wine-commits

Juan Lang : crypt32: Pass additional store to CertVerifyRevocation.
by Alexandre Julliard 25 Oct '10

25 Oct '10

Module: wine Branch: master Commit: 8714c11247f25d9adca1adfb4ce466604cbba1a7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8714c11247f25d9adca1adfb4… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Oct 21 09:06:39 2010 -0700 crypt32: Pass additional store to CertVerifyRevocation. --- dlls/crypt32/chain.c | 13 ++++++++++--- 1 files changed, 10 insertions(+), 3 deletions(-) diff --git a/dlls/crypt32/chain.c b/dlls/crypt32/chain.c index af8f386..e3cf401 100644 --- a/dlls/crypt32/chain.c +++ b/dlls/crypt32/chain.c @@ -2569,7 +2569,8 @@ typedef struct _CERT_CHAIN_PARA_NO_EXTRA_FIELDS { } CERT_CHAIN_PARA_NO_EXTRA_FIELDS, *PCERT_CHAIN_PARA_NO_EXTRA_FIELDS; static void CRYPT_VerifyChainRevocation(PCERT_CHAIN_CONTEXT chain, - LPFILETIME pTime, const CERT_CHAIN_PARA *pChainPara, DWORD chainFlags) + LPFILETIME pTime, HCERTSTORE hAdditionalStore, + const CERT_CHAIN_PARA *pChainPara, DWORD chainFlags) { DWORD cContext; @@ -2618,6 +2619,12 @@ static void CRYPT_VerifyChainRevocation(PCERT_CHAIN_CONTEXT chain, if (chainFlags & CERT_CHAIN_REVOCATION_ACCUMULATIVE_TIMEOUT) revocationFlags |= CERT_VERIFY_REV_ACCUMULATIVE_TIMEOUT_FLAG; revocationPara.pftTimeToUse = pTime; + if (hAdditionalStore) + { + revocationPara.cCertStore = 1; + revocationPara.rgCertStore = &hAdditionalStore; + revocationPara.hCrlStore = hAdditionalStore; + } if (pChainPara->cbSize == sizeof(CERT_CHAIN_PARA)) { revocationPara.dwUrlRetrievalTimeout = @@ -2855,8 +2862,8 @@ BOOL WINAPI CertGetCertificateChain(HCERTCHAINENGINE hChainEngine, if (!(dwFlags & CERT_CHAIN_RETURN_LOWER_QUALITY_CONTEXTS)) CRYPT_FreeLowerQualityChains(chain); pChain = (PCERT_CHAIN_CONTEXT)chain; - if (!pChain->TrustStatus.dwErrorStatus) - CRYPT_VerifyChainRevocation(pChain, pTime, pChainPara, dwFlags); + CRYPT_VerifyChainRevocation(pChain, pTime, hAdditionalStore, + pChainPara, dwFlags); CRYPT_CheckUsages(pChain, pChainPara); TRACE_(chain)("error status: %08x\n", pChain->TrustStatus.dwErrorStatus);

1 0

Amine Khaldi : comdlg32: Fix translations.
by Alexandre Julliard 25 Oct '10

25 Oct '10

Module: wine Branch: master Commit: f0ea473b2aa7cc65a66ce8b7143387a0a05f4048 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f0ea473b2aa7cc65a66ce8b71… Author: Amine Khaldi <amine.khaldi(a)reactos.org> Date: Sat Oct 23 10:09:27 2010 +0100 comdlg32: Fix translations. --- dlls/comdlg32/cdlg_Da.rc | 2 +- dlls/comdlg32/cdlg_No.rc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/comdlg32/cdlg_Da.rc b/dlls/comdlg32/cdlg_Da.rc index 2d92bef..509cc7b 100644 --- a/dlls/comdlg32/cdlg_Da.rc +++ b/dlls/comdlg32/cdlg_Da.rc @@ -258,7 +258,7 @@ FONT 8, "MS Shell Dlg" EDITTEXT edt3, 237,106, 35,12, WS_GROUP | ES_NUMBER GROUPBOX "Udskriv område", grp1, 8,92, 144,64, WS_GROUP - CONTROL "&Alle" rad1,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,106,64,12 + CONTROL "&Alle", rad1,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,106,64,12 CONTROL "Si&der", rad3,"Button",BS_AUTORADIOBUTTON,16,122,36,12 CONTROL "&Markeret", rad2,"Button",BS_AUTORADIOBUTTON,16,138,64,12 EDITTEXT edt1, 74,122, 26,12, WS_GROUP | ES_NUMBER diff --git a/dlls/comdlg32/cdlg_No.rc b/dlls/comdlg32/cdlg_No.rc index d18a2a7..5e0f94f 100644 --- a/dlls/comdlg32/cdlg_No.rc +++ b/dlls/comdlg32/cdlg_No.rc @@ -405,7 +405,7 @@ Oppgi en verdi mellom %d og %d." PD32_GENERIC_ERROR "En feil har oppst�tt." PD32_DRIVER_UNKNOWN "Ukjent skriverdriver." PD32_NO_DEVICES "Du m� installere en skriver f�r du \ - kan gj�re skriver-relaterte oppgaver som � endre \ sideoppsettet og skrive ut et dokument. \ + kan gj�re skriver-relaterte oppgaver som � endre sideoppsettet og skrive ut et dokument. \ Installer en og pr�v p� nytt." PD32_DEFAULT_PRINTER "Standardskriver; "

1 0

Anders Jonsson : progman: Fix typos in Swedish translation.
by Alexandre Julliard 25 Oct '10

25 Oct '10

Module: wine Branch: master Commit: 3e532d52d78d1680ca70d033c2645d98138a3861 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3e532d52d78d1680ca70d033c… Author: Anders Jonsson <anders.jonsson(a)norsjonet.se> Date: Sat Oct 23 13:07:05 2010 +0200 progman: Fix typos in Swedish translation. --- programs/progman/Sv.rc | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/progman/Sv.rc b/programs/progman/Sv.rc index c227359..9d074fb 100644 --- a/programs/progman/Sv.rc +++ b/programs/progman/Sv.rc @@ -196,7 +196,7 @@ IDS_DELETE_GROUP_s, "Ta bort gruppen '%s'?" IDS_DELETE_PROGRAM_s, "Ta bort programmet '%s'?" IDS_NOT_IMPLEMENTED, "Ej implementerat" IDS_FILE_READ_ERROR_s, "Fel vid läsning av '%s'." -IDS_FILE_WRITE_ERROR_s, "Fel vid skrivning til '%s'." +IDS_FILE_WRITE_ERROR_s, "Fel vid skrivning till '%s'." IDS_GRPFILE_READ_ERROR_s, "\ Kunde inte öppna gruppfilen '%s'.\n\ Ska vidare försök göras?" @@ -204,7 +204,7 @@ IDS_OUT_OF_MEMORY, "För lite minne." IDS_WINHELP_ERROR, "Ingen hjälp finns tillgänglig." IDS_UNKNOWN_FEATURE_s, "Okänd egenskap i '%s'" IDS_FILE_NOT_OVERWRITTEN_s, "Filen '%s' fanns redan, och skrevs ej över." -IDS_SAVE_GROUP_AS_s, "Spara grupp som '%s' för å undvika att skriva över filer." +IDS_SAVE_GROUP_AS_s, "Spara grupp som '%s' för att undvika att skriva över filer." IDS_NO_HOT_KEY, "Ingen" IDS_ALL_FILES, "Alla filer (*.*)" IDS_PROGRAMS, "Program"

1 0

Anders Jonsson : cryptui: Fix typo in Swedish translation.
by Alexandre Julliard 25 Oct '10

25 Oct '10

Module: wine Branch: master Commit: 952ef503d754304855f0e9b17fc7a12be0be6b30 URL: http://source.winehq.org/git/wine.git/?a=commit;h=952ef503d754304855f0e9b17… Author: Anders Jonsson <anders.jonsson(a)norsjonet.se> Date: Sat Oct 23 13:09:49 2010 +0200 cryptui: Fix typo in Swedish translation. --- dlls/cryptui/cryptui_Sv.rc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/cryptui/cryptui_Sv.rc b/dlls/cryptui/cryptui_Sv.rc index aa1db6a..f0be60b 100644 --- a/dlls/cryptui/cryptui_Sv.rc +++ b/dlls/cryptui/cryptui_Sv.rc @@ -134,7 +134,7 @@ STRINGTABLE IDS_PURPOSE_OEM_WHQL "Verifiering av OEM Windows-systemkomponent" IDS_PURPOSE_EMBEDDED_NT "Verifiering av inbäddad Windows-systemkomponent" IDS_PURPOSE_ROOT_LIST_SIGNER "Signerare av rotlista" - IDS_PURPOSE_QUALIFIED_SUBORDINATION "Kvalifierad underordning" + IDS_PURPOSE_QUALIFIED_SUBORDINATION "Kvalificerad underordning" IDS_PURPOSE_KEY_RECOVERY "Nyckelåterställning" IDS_PURPOSE_DOCUMENT_SIGNING "Dokumentsignering" IDS_PURPOSE_LIFETIME_SIGNING "Livstidssignering"

1 0

Anders Jonsson : kernel32: Add Swedish translation.
by Alexandre Julliard 25 Oct '10

25 Oct '10

Module: wine Branch: master Commit: 7665d27b95311b20083d19e4d048c80c61f89212 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7665d27b95311b20083d19e4d… Author: Anders Jonsson <anders.jonsson(a)norsjonet.se> Date: Sat Oct 23 13:11:51 2010 +0200 kernel32: Add Swedish translation. --- .gitignore | 1 + dlls/kernel32/Makefile.in | 1 + dlls/kernel32/nls/winerr_sve.mc | 3741 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 3743 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7665d27b95311b20083d1…

1 0

Jacek Caban : jscript: Pass script_ctx_t instead of exec_ctx_t to eval functions.
by Alexandre Julliard 25 Oct '10

25 Oct '10

Module: wine Branch: master Commit: faf9be0267ae02dcb6ba37086480be91f07e6370 URL: http://source.winehq.org/git/wine.git/?a=commit;h=faf9be0267ae02dcb6ba37086… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Oct 23 16:41:55 2010 +0200 jscript: Pass script_ctx_t instead of exec_ctx_t to eval functions. --- dlls/jscript/engine.c | 479 ++++++++++++++++++++++++------------------------- dlls/jscript/engine.h | 154 ++++++++-------- 2 files changed, 315 insertions(+), 318 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=faf9be0267ae02dcb6ba3…

1 0

Nikolay Sivov : mshtml: Remove useless initialization.
by Alexandre Julliard 25 Oct '10

25 Oct '10

Module: wine Branch: master Commit: 198f6e75ee6d901e750ee0e8b110ec307c2d4a23 URL: http://source.winehq.org/git/wine.git/?a=commit;h=198f6e75ee6d901e750ee0e8b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Oct 23 17:49:33 2010 +0400 mshtml: Remove useless initialization. --- dlls/mshtml/conpoint.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/conpoint.c b/dlls/mshtml/conpoint.c index da775ad..c316685 100644 --- a/dlls/mshtml/conpoint.c +++ b/dlls/mshtml/conpoint.c @@ -208,7 +208,6 @@ void ConnectionPoint_Init(ConnectionPoint *cp, ConnectionPointContainer *contain cp->sinks = NULL; cp->sinks_size = 0; cp->iid = riid; - cp->next = NULL; cp->data = data; cp->next = container->cp_list;

1 0

Nikolay Sivov : comctl32/treeview: Accept null item handle as a root for TVM_DELETEITEM.
by Alexandre Julliard 25 Oct '10

25 Oct '10

Module: wine Branch: master Commit: 04e5e9cfa0ef77db99c46ecf0f8e63e105d4a38f URL: http://source.winehq.org/git/wine.git/?a=commit;h=04e5e9cfa0ef77db99c46ecf0… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Oct 23 20:18:51 2010 +0400 comctl32/treeview: Accept null item handle as a root for TVM_DELETEITEM. --- dlls/comctl32/tests/treeview.c | 49 ++++++++++++++++++++++++++++++++++++++++ dlls/comctl32/treeview.c | 2 +- 2 files changed, 50 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/tests/treeview.c b/dlls/comctl32/tests/treeview.c index 1de63c6..7238bd0 100644 --- a/dlls/comctl32/tests/treeview.c +++ b/dlls/comctl32/tests/treeview.c @@ -42,6 +42,7 @@ static const char *TEST_CALLBACK_TEXT = "callback_text"; #define expect(expected, got) ok(got == expected, "Expected %d, got %d\n", expected, got) static struct msg_sequence *sequences[NUM_MSG_SEQUENCES]; +static struct msg_sequence *item_sequence[1]; static const struct message FillRootSeq[] = { { TVM_INSERTITEM, sent }, @@ -958,6 +959,21 @@ static LRESULT CALLBACK parent_wnd_proc(HWND hWnd, UINT message, WPARAM wParam, ok(SendMessage(pHdr->hwndFrom, TVM_GETITEMRECT, TRUE, (LPARAM)&rect), "Failed to get rect for second visible item.\n"); } break; + case TVN_DELETEITEMA: + { + struct message item; + + ok(pTreeView->itemNew.mask == 0, "got wrong mask 0x%x\n", pTreeView->itemNew.mask); + + ok(pTreeView->itemOld.mask == (TVIF_HANDLE | TVIF_PARAM), "got wrong mask 0x%x\n", pTreeView->itemOld.mask); + ok(pTreeView->itemOld.hItem != NULL, "got %p\n", pTreeView->itemOld.hItem); + + memset(&item, 0, sizeof(item)); + item.lParam = (LPARAM)pTreeView->itemOld.hItem; + add_message(item_sequence, 0, &item); + + break; + } } } } @@ -1324,6 +1340,37 @@ static void test_WM_PAINT(void) DestroyWindow(hTree); } +static void test_delete_items(void) +{ + const struct message *msg; + HWND hTree; + INT ret; + + hTree = create_treeview_control(); + fill_tree(hTree); + + /* check delete order */ + flush_sequences(item_sequence, 1); + ret = SendMessage(hTree, TVM_DELETEITEM, 0, 0); + ok(ret == TRUE, "got %d\n", ret); + + msg = item_sequence[0]->sequence; + ok(item_sequence[0]->count == 2, "expected 2 items, got %d\n", item_sequence[0]->count); + + if (item_sequence[0]->count == 2) + { +todo_wine { + ok(msg[0].lParam == (LPARAM)hChild, "expected %p, got %lx\n", hChild, msg[0].lParam); + ok(msg[1].lParam == (LPARAM)hRoot, "expected %p, got %lx\n", hRoot, msg[1].lParam); +} + } + + ret = SendMessageA(hTree, TVM_GETCOUNT, 0, 0); + ok(ret == 0, "got %d\n", ret); + + DestroyWindow(hTree); +} + START_TEST(treeview) { HMODULE hComctl32; @@ -1348,6 +1395,7 @@ START_TEST(treeview) InitCommonControls(); init_msg_sequences(sequences, NUM_MSG_SEQUENCES); + init_msg_sequences(item_sequence, 1); wc.style = CS_HREDRAW | CS_VREDRAW; wc.cbClsExtra = 0; @@ -1390,6 +1438,7 @@ START_TEST(treeview) test_expandnotify(); test_TVS_SINGLEEXPAND(); test_WM_PAINT(); + test_delete_items(); if (!load_v6_module(&ctx_cookie, &hCtx)) { diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c index 1ffcf64..1ca5639 100644 --- a/dlls/comctl32/treeview.c +++ b/dlls/comctl32/treeview.c @@ -1513,7 +1513,7 @@ TREEVIEW_DeleteItem(TREEVIEW_INFO *infoPtr, HTREEITEM wineItem) TREEVIEW_ITEM *parent, *prev = NULL; BOOL visible = FALSE; - if (wineItem == TVI_ROOT) + if (wineItem == TVI_ROOT || !wineItem) { TRACE("TVI_ROOT\n"); parent = infoPtr->root;

1 0

Alexandre Julliard : widl: Duplicate all the proxy data tables between 32-bit and 64-bit.
by Alexandre Julliard 25 Oct '10

25 Oct '10

Module: wine Branch: master Commit: 575485c6e71d95a038e1a065f6106e7000e39254 URL: http://source.winehq.org/git/wine.git/?a=commit;h=575485c6e71d95a038e1a065f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 22 19:41:07 2010 +0200 widl: Duplicate all the proxy data tables between 32-bit and 64-bit. --- tools/widl/proxy.c | 99 +++++++++++++++++++++++++-------------------------- 1 files changed, 49 insertions(+), 50 deletions(-) diff --git a/tools/widl/proxy.c b/tools/widl/proxy.c index 8cbdf8f..ca0717b 100644 --- a/tools/widl/proxy.c +++ b/tools/widl/proxy.c @@ -114,20 +114,6 @@ static void init_proxy(const statement_list_t *stmts) print_proxy( "#define DECLSPEC_HIDDEN\n"); print_proxy( "#endif\n"); print_proxy( "\n"); - write_exceptions( proxy ); - print_proxy( "\n"); - print_proxy( "struct __proxy_frame\n"); - print_proxy( "{\n"); - print_proxy( " __DECL_EXCEPTION_FRAME\n"); - print_proxy( " MIDL_STUB_MESSAGE _StubMsg;\n"); - print_proxy( " void *This;\n"); - print_proxy( "};\n"); - print_proxy( "\n"); - print_proxy("static int __proxy_filter( struct __proxy_frame *__frame )\n"); - print_proxy( "{\n"); - print_proxy( " return (__frame->_StubMsg.dwStubPhase != PROXY_SENDRECEIVE);\n"); - print_proxy( "}\n"); - print_proxy( "\n"); } static void clear_output_vars( const var_list_t *args ) @@ -775,6 +761,25 @@ static void write_proxy_routines(const statement_list_t *stmts) { int expr_eval_routines; unsigned int proc_offset = 0; + char *file_id = proxy_token; + int i, count, have_baseiid; + type_t **interfaces; + const type_t * delegate_to; + + write_exceptions( proxy ); + print_proxy( "\n"); + print_proxy( "struct __proxy_frame\n"); + print_proxy( "{\n"); + print_proxy( " __DECL_EXCEPTION_FRAME\n"); + print_proxy( " MIDL_STUB_MESSAGE _StubMsg;\n"); + print_proxy( " void *This;\n"); + print_proxy( "};\n"); + print_proxy( "\n"); + print_proxy("static int __proxy_filter( struct __proxy_frame *__frame )\n"); + print_proxy( "{\n"); + print_proxy( " return (__frame->_StubMsg.dwStubPhase != PROXY_SENDRECEIVE);\n"); + print_proxy( "}\n"); + print_proxy( "\n"); write_formatstringsdecl(proxy, indent, stmts, need_proxy); write_stubdescproto(); @@ -793,42 +798,6 @@ static void write_proxy_routines(const statement_list_t *stmts) write_procformatstring(proxy, stmts, need_proxy); write_typeformatstring(proxy, stmts, need_proxy); -} - -void write_proxies(const statement_list_t *stmts) -{ - char *file_id = proxy_token; - int i, count, have_baseiid; - type_t **interfaces; - const type_t * delegate_to; - - if (!do_proxies) return; - if (do_everything && !need_proxy_file(stmts)) return; - - init_proxy(stmts); - if(!proxy) return; - - if (do_win32 && do_win64) - { - fprintf(proxy, "\n#ifndef _WIN64\n\n"); - pointer_size = 4; - write_proxy_routines( stmts ); - fprintf(proxy, "\n#else /* _WIN64 */\n\n"); - pointer_size = 8; - write_proxy_routines( stmts ); - fprintf(proxy, "#endif /* _WIN64 */\n\n"); - } - else if (do_win32) - { - pointer_size = 4; - write_proxy_routines( stmts ); - } - else if (do_win64) - { - pointer_size = 8; - write_proxy_routines( stmts ); - } - interfaces = sort_interfaces(stmts, &count); fprintf(proxy, "static const CInterfaceProxyVtbl* const _%s_ProxyVtblList[] =\n", file_id); fprintf(proxy, "{\n"); @@ -901,6 +870,36 @@ void write_proxies(const statement_list_t *stmts) fprintf(proxy, " 0,\n"); fprintf(proxy, " 0\n"); fprintf(proxy, "};\n"); +} + +void write_proxies(const statement_list_t *stmts) +{ + if (!do_proxies) return; + if (do_everything && !need_proxy_file(stmts)) return; + + init_proxy(stmts); + if(!proxy) return; + + if (do_win32 && do_win64) + { + fprintf(proxy, "\n#ifndef _WIN64\n\n"); + pointer_size = 4; + write_proxy_routines( stmts ); + fprintf(proxy, "\n#else /* _WIN64 */\n\n"); + pointer_size = 8; + write_proxy_routines( stmts ); + fprintf(proxy, "\n#endif /* _WIN64 */\n"); + } + else if (do_win32) + { + pointer_size = 4; + write_proxy_routines( stmts ); + } + else if (do_win64) + { + pointer_size = 8; + write_proxy_routines( stmts ); + } fclose(proxy); }

1 0

Alexandre Julliard : widl: Duplicate the exception handling code between 32-bit and 64-bit.
by Alexandre Julliard 25 Oct '10

25 Oct '10

Module: wine Branch: master Commit: 4c41dd5fcaa6b2e3cf120794b369eeca2ad073c6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c41dd5fcaa6b2e3cf120794b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 22 19:44:00 2010 +0200 widl: Duplicate the exception handling code between 32-bit and 64-bit. --- tools/widl/client.c | 7 ++++--- tools/widl/server.c | 35 ++++++++++++++++++----------------- 2 files changed, 22 insertions(+), 20 deletions(-) diff --git a/tools/widl/client.c b/tools/widl/client.c index 693227f..b5ac0ae 100644 --- a/tools/widl/client.c +++ b/tools/widl/client.c @@ -448,8 +448,6 @@ static void init_client(void) print_client( "#define DECLSPEC_HIDDEN\n"); print_client( "#endif\n"); print_client( "\n"); - write_exceptions( client ); - print_client( "\n"); } @@ -503,6 +501,9 @@ static void write_client_routines(const statement_list_t *stmts) unsigned int proc_offset = 0; int expr_eval_routines; + write_exceptions( client ); + print_client( "\n"); + write_formatstringsdecl(client, indent, stmts, need_stub); expr_eval_routines = write_expr_eval_routines(client, client_token); if (expr_eval_routines) @@ -530,7 +531,7 @@ void write_client(const statement_list_t *stmts) if (do_win32 && do_win64) { - fprintf(client, "\n#ifndef _WIN64\n\n"); + fprintf(client, "#ifndef _WIN64\n\n"); pointer_size = 4; write_client_routines( stmts ); fprintf(client, "\n#else /* _WIN64 */\n\n"); diff --git a/tools/widl/server.c b/tools/widl/server.c index fd64899..513f37b 100644 --- a/tools/widl/server.c +++ b/tools/widl/server.c @@ -384,22 +384,6 @@ static void init_server(void) print_server( "#define DECLSPEC_HIDDEN\n"); print_server( "#endif\n"); print_server( "\n"); - write_exceptions( server ); - print_server("\n"); - print_server("struct __server_frame\n"); - print_server("{\n"); - print_server(" __DECL_EXCEPTION_FRAME\n"); - print_server(" MIDL_STUB_MESSAGE _StubMsg;\n"); - print_server("};\n"); - print_server("\n"); - print_server("static int __server_filter( struct __server_frame *__frame )\n"); - print_server( "{\n"); - print_server( " return (__frame->code == STATUS_ACCESS_VIOLATION) ||\n"); - print_server( " (__frame->code == STATUS_DATATYPE_MISALIGNMENT) ||\n"); - print_server( " (__frame->code == RPC_X_BAD_STUB_DATA) ||\n"); - print_server( " (__frame->code == RPC_S_INVALID_BOUND);\n"); - print_server( "}\n"); - print_server( "\n"); } @@ -445,6 +429,23 @@ static void write_server_routines(const statement_list_t *stmts) unsigned int proc_offset = 0; int expr_eval_routines; + write_exceptions( server ); + print_server("\n"); + print_server("struct __server_frame\n"); + print_server("{\n"); + print_server(" __DECL_EXCEPTION_FRAME\n"); + print_server(" MIDL_STUB_MESSAGE _StubMsg;\n"); + print_server("};\n"); + print_server("\n"); + print_server("static int __server_filter( struct __server_frame *__frame )\n"); + print_server( "{\n"); + print_server( " return (__frame->code == STATUS_ACCESS_VIOLATION) ||\n"); + print_server( " (__frame->code == STATUS_DATATYPE_MISALIGNMENT) ||\n"); + print_server( " (__frame->code == RPC_X_BAD_STUB_DATA) ||\n"); + print_server( " (__frame->code == RPC_S_INVALID_BOUND);\n"); + print_server( "}\n"); + print_server( "\n"); + write_formatstringsdecl(server, indent, stmts, need_stub); expr_eval_routines = write_expr_eval_routines(server, server_token); if (expr_eval_routines) @@ -472,7 +473,7 @@ void write_server(const statement_list_t *stmts) if (do_win32 && do_win64) { - fprintf(server, "\n#ifndef _WIN64\n\n"); + fprintf(server, "#ifndef _WIN64\n\n"); pointer_size = 4; write_server_routines( stmts ); fprintf(server, "\n#else /* _WIN64 */\n\n");

1 0