wine-commits May 2009

wine-commits@winehq.org

4 participants
793 discussions

Andrew Talbot : cabinet: Constify a variable.
by Alexandre Julliard 26 May '09

26 May '09

Module: wine Branch: master Commit: 9ca199a87d6017c333407604cf113f4f69947b94 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ca199a87d6017c333407604c… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Mon May 25 22:41:49 2009 +0100 cabinet: Constify a variable. --- dlls/cabinet/fdi.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/cabinet/fdi.c b/dlls/cabinet/fdi.c index c7749eb..8132818 100644 --- a/dlls/cabinet/fdi.c +++ b/dlls/cabinet/fdi.c @@ -2260,7 +2260,7 @@ static int fdi_decomp(const struct fdi_file *fi, int savemode, fdi_decomp_state return DECR_OK; } -static void free_decompression_temps(HFDI hfdi, struct fdi_folder *fol, +static void free_decompression_temps(HFDI hfdi, const struct fdi_folder *fol, fdi_decomp_state *decomp_state) { switch (fol->comp_type & cffoldCOMPTYPE_MASK) {

1 0

Francois Gouget : winex11.drv: Replace an strdup() with HeapAlloc() in the OpenGL code.
by Alexandre Julliard 26 May '09

26 May '09

Module: wine Branch: master Commit: c642481305fb9de241760e1aa8d13943d8bc8120 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c642481305fb9de241760e1aa… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue May 26 00:52:05 2009 +0200 winex11.drv: Replace an strdup() with HeapAlloc() in the OpenGL code. Free the corresponding memory when the library is unloaded. --- dlls/winex11.drv/opengl.c | 15 ++++++++++++--- dlls/winex11.drv/x11drv.h | 1 + dlls/winex11.drv/x11drv_main.c | 1 + 3 files changed, 14 insertions(+), 3 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index b15b4e2..30eb95b 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -76,7 +76,7 @@ typedef struct wine_glextension { struct WineGLInfo { const char *glVersion; - const char *glExtensions; + char *glExtensions; int glxVersion[2]; @@ -274,12 +274,13 @@ MAKE_FUNCPTR(glFinish) MAKE_FUNCPTR(glFlush) #undef MAKE_FUNCPTR +static BOOL infoInitialized = FALSE; static BOOL X11DRV_WineGL_InitOpenglInfo(void) { - static BOOL infoInitialized = FALSE; int screen = DefaultScreen(gdi_display); Window win = RootWindow(gdi_display, screen); + const char* str; Visual *visual; XVisualInfo template; XVisualInfo *vis; @@ -318,7 +319,9 @@ static BOOL X11DRV_WineGL_InitOpenglInfo(void) } WineGLInfo.glVersion = (const char *) pglGetString(GL_VERSION); - WineGLInfo.glExtensions = strdup((const char *) pglGetString(GL_EXTENSIONS)); + str = (const char *) pglGetString(GL_EXTENSIONS); + WineGLInfo.glExtensions = HeapAlloc(GetProcessHeap(), 0, strlen(str)+1); + strcpy(WineGLInfo.glExtensions, str); /* Get the common GLX version supported by GLX client and server ( major/minor) */ pglXQueryVersion(gdi_display, &WineGLInfo.glxVersion[0], &WineGLInfo.glxVersion[1]); @@ -352,6 +355,12 @@ static BOOL X11DRV_WineGL_InitOpenglInfo(void) return TRUE; } +void X11DRV_OpenGL_Cleanup(void) +{ + HeapFree(GetProcessHeap(), 0, WineGLInfo.glExtensions); + infoInitialized = FALSE; +} + static BOOL has_opengl(void) { static int init_done; diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 7d0b2ba..b11e6a1 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -226,6 +226,7 @@ extern int CDECL X11DRV_DescribePixelFormat(X11DRV_PDEVICE *physDev, PIXELFORMATDESCRIPTOR *ppfd); extern int CDECL X11DRV_GetPixelFormat(X11DRV_PDEVICE *physDev); extern BOOL CDECL X11DRV_SwapBuffers(X11DRV_PDEVICE *physDev); +extern void X11DRV_OpenGL_Cleanup(void); /* X11 driver internal functions */ diff --git a/dlls/winex11.drv/x11drv_main.c b/dlls/winex11.drv/x11drv_main.c index 020d6b5..41c866c 100644 --- a/dlls/winex11.drv/x11drv_main.c +++ b/dlls/winex11.drv/x11drv_main.c @@ -587,6 +587,7 @@ static void process_detach(void) /* cleanup GDI */ X11DRV_GDI_Finalize(); + X11DRV_OpenGL_Cleanup(); IME_UnregisterClasses(); DeleteCriticalSection( &X11DRV_CritSection );

1 0

Francois Gouget : riched20: Make some functions static.
by Alexandre Julliard 26 May '09

26 May '09

Module: wine Branch: master Commit: 19020b9ef55700ecd1ba6872a3dece02e4915109 URL: http://source.winehq.org/git/wine.git/?a=commit;h=19020b9ef55700ecd1ba6872a… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue May 26 00:48:48 2009 +0200 riched20: Make some functions static. --- dlls/riched20/editor.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 00fc38e..278b9aa 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -2901,7 +2901,7 @@ get_msg_name(UINT msg) return ""; } -void ME_LinkNotify(ME_TextEditor *editor, UINT msg, WPARAM wParam, LPARAM lParam) +static void ME_LinkNotify(ME_TextEditor *editor, UINT msg, WPARAM wParam, LPARAM lParam) { int x,y; ME_DisplayItem *para, *run; @@ -4616,14 +4616,14 @@ static BOOL ME_RegisterEditorClass(HINSTANCE hInstance) return TRUE; } -LRESULT WINAPI REComboWndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) { +static LRESULT WINAPI REComboWndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) { /* FIXME: Not implemented */ TRACE("hWnd %p msg %04x (%s) %08lx %08lx\n", hWnd, msg, get_msg_name(msg), wParam, lParam); return DefWindowProcW(hWnd, msg, wParam, lParam); } -LRESULT WINAPI REListWndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) { +static LRESULT WINAPI REListWndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) { /* FIXME: Not implemented */ TRACE("hWnd %p msg %04x (%s) %08lx %08lx\n", hWnd, msg, get_msg_name(msg), wParam, lParam);

1 0

Francois Gouget : riched20: RTFPeekToken(), RTFExpandStyle() and RTFHexToChar() are unused so remove them.
by Alexandre Julliard 26 May '09

26 May '09

Module: wine Branch: master Commit: e5f5bd11538386b0d5f7b985328585f77c21fcdd URL: http://source.winehq.org/git/wine.git/?a=commit;h=e5f5bd11538386b0d5f7b9853… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue May 26 00:48:34 2009 +0200 riched20: RTFPeekToken(), RTFExpandStyle() and RTFHexToChar() are unused so remove them. --- dlls/riched20/reader.c | 108 ------------------------------------------------ dlls/riched20/rtf.h | 3 - 2 files changed, 0 insertions(+), 111 deletions(-) diff --git a/dlls/riched20/reader.c b/dlls/riched20/reader.c index 10aa19e..b6a6f44 100644 --- a/dlls/riched20/reader.c +++ b/dlls/riched20/reader.c @@ -446,14 +446,6 @@ static void RTFUngetToken(RTF_Info *info) } -int RTFPeekToken(RTF_Info *info) -{ - _RTFGetToken (info); - RTFUngetToken (info); - return (info->rtfClass); -} - - static void _RTFGetToken(RTF_Info *info) { if (info->rtfFormat == SF_TEXT) @@ -758,29 +750,6 @@ static int GetChar(RTF_Info *info) } -/* - * Synthesize a token by setting the global variables to the - * values supplied. Typically this is followed with a call - * to RTFRouteToken(). - * - * If a param value other than rtfNoParam is passed, it becomes - * part of the token text. - */ - -static void RTFSetToken(RTF_Info *info, int class, int major, int minor, int param, const char *text) -{ - info->rtfClass = class; - info->rtfMajor = major; - info->rtfMinor = minor; - info->rtfParam = param; - if (param == rtfNoParam) - lstrcpyA(info->rtfTextBuf, text); - else - sprintf (info->rtfTextBuf, "%s%d", text, param); - info->rtfTextLen = lstrlenA (info->rtfTextBuf); -} - - /* ---------------------------------------------------------------------- */ /* @@ -1244,22 +1213,6 @@ static void ReadObjGroup(RTF_Info *info) * References to style 0 are mapped onto the Normal style. */ - -static RTFStyle *RTFGetStyle(const RTF_Info *info, int num) -{ - RTFStyle *s; - - if (num == -1) - return (info->styleList); - for (s = info->styleList; s != NULL; s = s->rtfNextStyle) - { - if (s->rtfSNum == num) - break; - } - return (s); /* NULL if not found */ -} - - RTFFont *RTFGetFont(const RTF_Info *info, int num) { RTFFont *f; @@ -1292,59 +1245,6 @@ RTFColor *RTFGetColor(const RTF_Info *info, int num) /* ---------------------------------------------------------------------- */ - -/* - * Expand style n, if there is such a style. - */ - -void RTFExpandStyle(RTF_Info *info, int n) -{ - RTFStyle *s; - RTFStyleElt *se; - - if (n == -1) - return; - s = RTFGetStyle (info, n); - if (s == NULL) - return; - if (s->rtfExpanding != 0) - ERR ("Style expansion loop, style %d\n", n); - s->rtfExpanding = 1; /* set expansion flag for loop detection */ - /* - * Expand "based-on" style (unless it's the same as the current - * style -- Normal style usually gives itself as its own based-on - * style). Based-on style expansion is done by synthesizing - * the token that the writer needs to see in order to trigger - * another style expansion, and feeding to token back through - * the router so the writer sees it. - */ - if (n != s->rtfSBasedOn) - { - RTFSetToken (info, rtfControl, rtfParAttr, rtfStyleNum, - s->rtfSBasedOn, "\\s"); - RTFRouteToken (info); - } - /* - * Now route the tokens unique to this style. RTFSetToken() - * isn't used because it would add the param value to the end - * of the token text, which already has it in. - */ - for (se = s->rtfSSEList; se != NULL; se = se->rtfNextSE) - { - info->rtfClass = se->rtfSEClass; - info->rtfMajor = se->rtfSEMajor; - info->rtfMinor = se->rtfSEMinor; - info->rtfParam = se->rtfSEParam; - lstrcpyA (info->rtfTextBuf, se->rtfSEText); - info->rtfTextLen = lstrlenA (info->rtfTextBuf); - RTFRouteToken (info); - } - s->rtfExpanding = 0; /* done - clear expansion flag */ -} - - -/* ---------------------------------------------------------------------- */ - /* * Control symbol lookup routines */ @@ -2397,14 +2297,6 @@ int RTFCharToHex(char c) } -int RTFHexToChar(int i) -{ - if (i < 10) - return (i + '0'); - return (i - 10 + 'a'); -} - - /* ---------------------------------------------------------------------- */ /* diff --git a/dlls/riched20/rtf.h b/dlls/riched20/rtf.h index e8cfb34..3277301 100644 --- a/dlls/riched20/rtf.h +++ b/dlls/riched20/rtf.h @@ -1191,19 +1191,16 @@ void RTFDestroy(RTF_Info *info); void RTFSetDestinationCallback (RTF_Info *, int, RTFFuncPtr); void RTFRead (RTF_Info *); int RTFGetToken (RTF_Info *); /* writer should rarely need this */ -int RTFPeekToken (RTF_Info *); void RTFSetReadHook (RTF_Info *, RTFFuncPtr); void RTFRouteToken (RTF_Info *); void RTFSkipGroup (RTF_Info *); void RTFReadGroup (RTF_Info *); -void RTFExpandStyle (RTF_Info *, int); int RTFCheckCM (const RTF_Info *, int, int); int RTFCheckCMM (const RTF_Info *, int, int, int); int RTFCheckMM (const RTF_Info *, int, int); RTFFont *RTFGetFont (const RTF_Info *, int); RTFColor *RTFGetColor (const RTF_Info *, int); int RTFCharToHex ( char); -int RTFHexToChar ( int ); void RTFFlushOutputBuffer( RTF_Info *info ); void RTFSetEditStream(RTF_Info *info, ME_InStream *stream);

1 0

Francois Gouget : riched20: RTF{G, S}et{In, Out}putName() are unused so remove them as well as the corresponding _RTF_Info fields.
by Alexandre Julliard 26 May '09

26 May '09

Module: wine Branch: master Commit: 1914d256a6e055f243bf2ad8ea10406538e956cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=1914d256a6e055f243bf2ad8e… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue May 26 00:47:29 2009 +0200 riched20: RTF{G,S}et{In,Out}putName() are unused so remove them as well as the corresponding _RTF_Info fields. --- dlls/riched20/reader.c | 37 ------------------------------------- dlls/riched20/rtf.h | 7 ------- 2 files changed, 0 insertions(+), 44 deletions(-) diff --git a/dlls/riched20/reader.c b/dlls/riched20/reader.c index fa1ef79..10aa19e 100644 --- a/dlls/riched20/reader.c +++ b/dlls/riched20/reader.c @@ -226,10 +226,6 @@ void RTFInit(RTF_Info *info) info->rtfTextBuf[0] = info->pushedTextBuf[0] = '\0'; } - heap_free (info->inputName); - heap_free (info->outputName); - info->inputName = info->outputName = NULL; - for (i = 0; i < rtfMaxClass; i++) RTFSetClassCallback (info, i, NULL); for (i = 0; i < rtfMaxDestination; i++) @@ -278,39 +274,6 @@ void RTFInit(RTF_Info *info) } /* - * Set or get the input or output file name. These are never guaranteed - * to be accurate, only insofar as the calling program makes them so. - */ - -void RTFSetInputName(RTF_Info *info, const char *name) -{ - info->inputName = RTFStrSave (name); - if (info->inputName == NULL) - ERR ("RTFSetInputName: out of memory\n"); -} - - -char *RTFGetInputName(const RTF_Info *info) -{ - return (info->inputName); -} - - -void RTFSetOutputName(RTF_Info *info, const char *name) -{ - info->outputName = RTFStrSave (name); - if (info->outputName == NULL) - ERR ("RTFSetOutputName: out of memory\n"); -} - - -char *RTFGetOutputName(const RTF_Info *info) -{ - return (info->outputName); -} - - -/* * Install or return a writer callback for a destination type */ diff --git a/dlls/riched20/rtf.h b/dlls/riched20/rtf.h index 6de440f..e8cfb34 100644 --- a/dlls/riched20/rtf.h +++ b/dlls/riched20/rtf.h @@ -1152,9 +1152,6 @@ struct _RTF_Info { int unicodeLength; /* The length of ANSI representation of Unicode characters */ int codePage; /* Current codepage for text conversion */ - char *inputName; - char *outputName; - ME_InStream *stream; ME_TextEditor *editor; @@ -1191,10 +1188,6 @@ struct _RTF_Info { void RTFInit (RTF_Info *); void RTFDestroy(RTF_Info *info); -void RTFSetInputName (RTF_Info *, const char *); -char *RTFGetInputName (const RTF_Info *); -void RTFSetOutputName (RTF_Info *, const char *); -char *RTFGetOutputName (const RTF_Info *); void RTFSetDestinationCallback (RTF_Info *, int, RTFFuncPtr); void RTFRead (RTF_Info *); int RTFGetToken (RTF_Info *); /* writer should rarely need this */

1 0

Francois Gouget : riched20: Make ME_GetCursorCoordinates() static and remove ME_MustBeWrapped() as it is unused.
by Alexandre Julliard 26 May '09

26 May '09

Module: wine Branch: master Commit: 3d6c53b972258c37038a6ba4023a162f178a05ad URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d6c53b972258c37038a6ba40… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue May 26 00:45:31 2009 +0200 riched20: Make ME_GetCursorCoordinates() static and remove ME_MustBeWrapped() as it is unused. --- dlls/riched20/caret.c | 2 +- dlls/riched20/editor.h | 3 --- dlls/riched20/run.c | 12 ------------ 3 files changed, 1 insertions(+), 16 deletions(-) diff --git a/dlls/riched20/caret.c b/dlls/riched20/caret.c index 2151e43..1cb44bc 100644 --- a/dlls/riched20/caret.c +++ b/dlls/riched20/caret.c @@ -168,7 +168,7 @@ int ME_SetSelection(ME_TextEditor *editor, int from, int to) } -void +static void ME_GetCursorCoordinates(ME_TextEditor *editor, ME_Cursor *pCursor, int *x, int *y, int *height) { diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index 8568420..0929e82 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -171,9 +171,6 @@ void ME_InsertTextFromCursor(ME_TextEditor *editor, int nCursor, void ME_InsertEndRowFromCursor(ME_TextEditor *editor, int nCursor); BOOL ME_ArrowKey(ME_TextEditor *ed, int nVKey, BOOL extend, BOOL ctrl); -void ME_MustBeWrapped(ME_Context *c, ME_DisplayItem *para); -void ME_GetCursorCoordinates(ME_TextEditor *editor, ME_Cursor *pCursor, - int *x, int *y, int *height); int ME_GetCursorOfs(ME_TextEditor *editor, int nCursor); void ME_GetSelection(ME_TextEditor *editor, int *from, int *to); int ME_CountParagraphsBetween(ME_TextEditor *editor, int from, int to); diff --git a/dlls/riched20/run.c b/dlls/riched20/run.c index 9778ea9..cf6c1fc 100644 --- a/dlls/riched20/run.c +++ b/dlls/riched20/run.c @@ -725,18 +725,6 @@ void ME_CalcRunExtent(ME_Context *c, const ME_Paragraph *para, int startx, ME_Ru } /****************************************************************************** - * ME_MustBeWrapped - * - * This should ensure that the given paragraph is wrapped so that its screen - * row structure may be used. But it doesn't, yet. - */ -void ME_MustBeWrapped(ME_Context *c, ME_DisplayItem *para) -{ - assert(para->type == diParagraph); - /* FIXME */ -} - -/****************************************************************************** * ME_SetSelectionCharFormat * * Applies a style change, either to a current selection, or to insert cursor

1 0

Francois Gouget : msi/tests: Tweak the get_user_sid() functions to simplify their use.
by Alexandre Julliard 26 May '09

26 May '09

Module: wine Branch: master Commit: 623dad0963e4423a56c4260b4b220c4e011daa89 URL: http://source.winehq.org/git/wine.git/?a=commit;h=623dad0963e4423a56c4260b4… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue May 26 00:41:30 2009 +0200 msi/tests: Tweak the get_user_sid() functions to simplify their use. Now the function deals with all errors and win_skips() itself. --- dlls/msi/tests/install.c | 49 +++++++++++++++++---------------------------- dlls/msi/tests/package.c | 25 ++++++++++++++--------- 2 files changed, 34 insertions(+), 40 deletions(-) diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index 933a145..2e03bf4 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -1346,26 +1346,35 @@ static BOOL check_win9x(void) return FALSE; } -static void get_user_sid(LPSTR *usersid) +static LPSTR get_user_sid(LPSTR *usersid) { HANDLE token; BYTE buf[1024]; DWORD size; PTOKEN_USER user; - HMODULE hadvapi32 = GetModuleHandleA("advapi32.dll"); + static HMODULE hadvapi32 = NULL; static BOOL (WINAPI *pConvertSidToStringSidA)(PSID, LPSTR*); *usersid = NULL; - pConvertSidToStringSidA = (void *)GetProcAddress(hadvapi32, "ConvertSidToStringSidA"); - if (!pConvertSidToStringSidA) - return; + if (!hadvapi32) + { + hadvapi32 = GetModuleHandleA("advapi32.dll"); + pConvertSidToStringSidA = (void *)GetProcAddress(hadvapi32, "ConvertSidToStringSidA"); + if (!pConvertSidToStringSidA) + { + win_skip("ConvertSidToStringSidA is not available\n"); + return NULL; + } + } OpenProcessToken(GetCurrentProcess(), TOKEN_QUERY, &token); size = sizeof(buf); GetTokenInformation(token, TokenUser, buf, size, &size); user = (PTOKEN_USER)buf; pConvertSidToStringSidA(user->User.Sid, usersid); + ok(*usersid != NULL, "pConvertSidToStringSidA failed lre=%d\n", GetLastError()); CloseHandle(token); + return *usersid; } static BOOL check_record(MSIHANDLE rec, UINT field, LPCSTR val) @@ -2511,12 +2520,8 @@ static void test_publish_registerproduct(void) static const CHAR userugkey[] = "Software\\Microsoft\\Installer\\UpgradeCodes" "\\51AAE0C44620A5E4788506E91F249BD2"; - get_user_sid(&usersid); - if (!usersid) - { - skip("ConvertSidToStringSidA is not available\n"); + if (!get_user_sid(&usersid)) return; - } get_date_str(date); GetTempPath(MAX_PATH, temp); @@ -2756,12 +2761,8 @@ static void test_publish_publishproduct(void) static const CHAR machprod[] = "Installer\\Products\\84A88FD7F6998CE40A22FB59F6B9C2BB"; static const CHAR machup[] = "Installer\\UpgradeCodes\\51AAE0C44620A5E4788506E91F249BD2"; - get_user_sid(&usersid); - if (!usersid) - { - skip("ConvertSidToStringSidA is not available\n"); + if (!get_user_sid(&usersid)) return; - } GetTempPath(MAX_PATH, temp); @@ -2952,12 +2953,8 @@ static void test_publish_publishfeatures(void) static const CHAR classfeat[] = "Software\\Classes\\Installer\\Features" "\\84A88FD7F6998CE40A22FB59F6B9C2BB"; - get_user_sid(&usersid); - if (!usersid) - { - skip("ConvertSidToStringSidA is not available\n"); + if (!get_user_sid(&usersid)) return; - } CreateDirectoryA("msitest", NULL); create_file("msitest\\maximus", 500); @@ -3114,12 +3111,8 @@ static void test_publish_registeruser(void) "Software\\Microsoft\\Windows\\CurrentVersion\\Installer\\" "UserData\\%s\\Products\\84A88FD7F6998CE40A22FB59F6B9C2BB\\InstallProperties"; - get_user_sid(&usersid); - if (!usersid) - { - skip("ConvertSidToStringSidA is not available\n"); + if (!get_user_sid(&usersid)) return; - } get_owner_company(&owner, &company); @@ -3197,12 +3190,8 @@ static void test_publish_processcomponents(void) static const CHAR compkey[] = "Software\\Microsoft\\Windows\\CurrentVersion\\Installer\\Components"; - get_user_sid(&usersid); - if (!usersid) - { - skip("ConvertSidToStringSidA is not available\n"); + if (!get_user_sid(&usersid)) return; - } CreateDirectoryA("msitest", NULL); create_file("msitest\\maximus", 500); diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index 308a9cc..21795d5 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -34,26 +34,35 @@ char CURR_DIR[MAX_PATH]; static UINT (WINAPI *pMsiApplyMultiplePatchesA)(LPCSTR, LPCSTR, LPCSTR); -static void get_user_sid(LPSTR *usersid) +static LPSTR get_user_sid(LPSTR *usersid) { HANDLE token; BYTE buf[1024]; DWORD size; PTOKEN_USER user; - HMODULE hadvapi32 = GetModuleHandleA("advapi32.dll"); + static HMODULE hadvapi32 = NULL; static BOOL (WINAPI *pConvertSidToStringSidA)(PSID, LPSTR*); *usersid = NULL; - pConvertSidToStringSidA = (void *)GetProcAddress(hadvapi32, "ConvertSidToStringSidA"); - if (!pConvertSidToStringSidA) - return; + if (!hadvapi32) + { + hadvapi32 = GetModuleHandleA("advapi32.dll"); + pConvertSidToStringSidA = (void *)GetProcAddress(hadvapi32, "ConvertSidToStringSidA"); + if (!pConvertSidToStringSidA) + { + win_skip("ConvertSidToStringSidA is not available\n"); + return NULL; + } + } OpenProcessToken(GetCurrentProcess(), TOKEN_QUERY, &token); size = sizeof(buf); GetTokenInformation(token, TokenUser, buf, size, &size); user = (PTOKEN_USER)buf; pConvertSidToStringSidA(user->User.Sid, usersid); + ok(*usersid != NULL, "pConvertSidToStringSidA failed lre=%d\n", GetLastError()); CloseHandle(token); + return *usersid; } /* RegDeleteTreeW from dlls/advapi32/registry.c */ @@ -7336,12 +7345,8 @@ static void test_appsearch_complocator(void) DWORD size; UINT r; - get_user_sid(&usersid); - if (!usersid) - { - skip("ConvertSidToStringSidA is not available\n"); + if (!get_user_sid(&usersid)) return; - } create_test_file("FileName1"); create_test_file("FileName4");

1 0

Francois Gouget : oleaut32: Tweak a comment to make it more explicit.
by Alexandre Julliard 26 May '09

26 May '09

Module: wine Branch: master Commit: 97dea95e41310716310dda59064d950554d60590 URL: http://source.winehq.org/git/wine.git/?a=commit;h=97dea95e41310716310dda590… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue May 26 00:40:53 2009 +0200 oleaut32: Tweak a comment to make it more explicit. --- dlls/oleaut32/variant.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/oleaut32/variant.c b/dlls/oleaut32/variant.c index 909cf8a..37965f8 100644 --- a/dlls/oleaut32/variant.c +++ b/dlls/oleaut32/variant.c @@ -3009,7 +3009,7 @@ HRESULT WINAPI VarAnd(LPVARIANT left, LPVARIANT right, LPVARIANT result) { /* * Special cases for when left variant is VT_NULL - * (NULL & 0 = NULL, NULL & value = value) + * (VT_NULL & 0 = VT_NULL, VT_NULL & value = value) */ if (leftvt == VT_NULL) {

1 0

Francois Gouget : rsaenh: Make the mpi functions static, remove mp_signed_bin_size() as it is unused.
by Alexandre Julliard 26 May '09

26 May '09

Module: wine Branch: master Commit: 53f3f441fb30045247651c1f23c5a62a77500a4e URL: http://source.winehq.org/git/wine.git/?a=commit;h=53f3f441fb30045247651c1f2… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue May 26 00:39:18 2009 +0200 rsaenh: Make the mpi functions static, remove mp_signed_bin_size() as it is unused. --- dlls/rsaenh/mpi.c | 55 +++++++++++++++++++++++++++++++++++++++++------ dlls/rsaenh/tomcrypt.h | 46 ---------------------------------------- 2 files changed, 48 insertions(+), 53 deletions(-) diff --git a/dlls/rsaenh/mpi.c b/dlls/rsaenh/mpi.c index 0c58e39..b1b1c9e 100644 --- a/dlls/rsaenh/mpi.c +++ b/dlls/rsaenh/mpi.c @@ -42,6 +42,53 @@ static const int KARATSUBA_MUL_CUTOFF = 88, /* Min. number of digits before Karatsuba multiplication is used. */ KARATSUBA_SQR_CUTOFF = 128; /* Min. number of digits before Karatsuba squaring is used. */ + +/* trim unused digits */ +static void mp_clamp(mp_int *a); + +/* compare |a| to |b| */ +static int mp_cmp_mag(const mp_int *a, const mp_int *b); + +/* Counts the number of lsbs which are zero before the first zero bit */ +static int mp_cnt_lsb(const mp_int *a); + +/* computes a = B**n mod b without division or multiplication useful for + * normalizing numbers in a Montgomery system. + */ +static int mp_montgomery_calc_normalization(mp_int *a, const mp_int *b); + +/* computes x/R == x (mod N) via Montgomery Reduction */ +static int mp_montgomery_reduce(mp_int *a, const mp_int *m, mp_digit mp); + +/* setups the montgomery reduction */ +static int mp_montgomery_setup(const mp_int *a, mp_digit *mp); + +/* Barrett Reduction, computes a (mod b) with a precomputed value c + * + * Assumes that 0 < a <= b*b, note if 0 > a > -(b*b) then you can merely + * compute the reduction as -1 * mp_reduce(mp_abs(a)) [pseudo code]. + */ +static int mp_reduce(mp_int *a, const mp_int *b, const mp_int *c); + +/* reduces a modulo b where b is of the form 2**p - k [0 <= a] */ +static int mp_reduce_2k(mp_int *a, const mp_int *n, mp_digit d); + +/* determines k value for 2k reduction */ +static int mp_reduce_2k_setup(const mp_int *a, mp_digit *d); + +/* used to setup the Barrett reduction for a given modulus b */ +static int mp_reduce_setup(mp_int *a, const mp_int *b); + +/* set to a digit */ +static void mp_set(mp_int *a, mp_digit b); + +/* b = a*a */ +static int mp_sqr(const mp_int *a, mp_int *b); + +/* c = a * a (mod b) */ +static int mp_sqrmod(const mp_int *a, mp_int *b, mp_int *c); + + static void bn_reverse(unsigned char *s, int len); static int s_mp_add(mp_int *a, mp_int *b, mp_int *c); static int s_mp_exptmod (const mp_int * G, const mp_int * X, mp_int * P, mp_int * Y); @@ -3589,7 +3636,7 @@ ERR: } /* determines the setup value */ -int +static int mp_reduce_2k_setup(const mp_int *a, mp_digit *d) { int res, p; @@ -3677,12 +3724,6 @@ int mp_shrink (mp_int * a) return MP_OKAY; } -/* get the size for an signed equivalent */ -int mp_signed_bin_size (const mp_int * a) -{ - return 1 + mp_unsigned_bin_size (a); -} - /* computes b = a*a */ int mp_sqr (const mp_int * a, mp_int * b) diff --git a/dlls/rsaenh/tomcrypt.h b/dlls/rsaenh/tomcrypt.h index aaaac98..49fb352 100644 --- a/dlls/rsaenh/tomcrypt.h +++ b/dlls/rsaenh/tomcrypt.h @@ -249,9 +249,6 @@ int mp_shrink(mp_int *a); #define mp_iseven(a) (((a)->used > 0 && (((a)->dp[0] & 1) == 0)) ? MP_YES : MP_NO) #define mp_isodd(a) (((a)->used > 0 && (((a)->dp[0] & 1) == 1)) ? MP_YES : MP_NO) -/* set to a digit */ -void mp_set(mp_int *a, mp_digit b); - /* set a 32-bit const */ int mp_set_int(mp_int *a, unsigned long b); @@ -270,14 +267,8 @@ int mp_copy(const mp_int *a, mp_int *b); /* inits and copies, a = b */ int mp_init_copy(mp_int *a, const mp_int *b); -/* trim unused digits */ -void mp_clamp(mp_int *a); - /* ---> digit manipulation <--- */ -/* Counts the number of lsbs which are zero before the first zero bit */ -int mp_cnt_lsb(const mp_int *a); - /* I Love Earth! */ /* makes a pseudo-random int of a given size */ @@ -301,9 +292,6 @@ int mp_neg(mp_int *a, mp_int *b); /* compare a to b */ int mp_cmp(const mp_int *a, const mp_int *b); -/* compare |a| to |b| */ -int mp_cmp_mag(const mp_int *a, const mp_int *b); - /* c = a + b */ int mp_add(mp_int *a, mp_int *b, mp_int *c); @@ -313,9 +301,6 @@ int mp_sub(mp_int *a, mp_int *b, mp_int *c); /* c = a * b */ int mp_mul(const mp_int *a, const mp_int *b, mp_int *c); -/* b = a*a */ -int mp_sqr(const mp_int *a, mp_int *b); - /* c = a mod b, 0 <= c < b */ int mp_mod(const mp_int *a, mp_int *b, mp_int *c); @@ -344,9 +329,6 @@ int mp_submod(mp_int *a, mp_int *b, mp_int *c, mp_int *d); /* d = a * b (mod c) */ int mp_mulmod(const mp_int *a, const mp_int *b, mp_int *c, mp_int *d); -/* c = a * a (mod b) */ -int mp_sqrmod(const mp_int *a, mp_int *b, mp_int *c); - /* c = 1/a (mod b) */ int mp_invmod(const mp_int *a, mp_int *b, mp_int *c); @@ -374,39 +356,12 @@ int mp_is_square(mp_int *arg, int *ret); /* computes the jacobi c = (a | n) (or Legendre if b is prime) */ int mp_jacobi(mp_int *a, mp_int *n, int *c); -/* used to setup the Barrett reduction for a given modulus b */ -int mp_reduce_setup(mp_int *a, const mp_int *b); - -/* Barrett Reduction, computes a (mod b) with a precomputed value c - * - * Assumes that 0 < a <= b*b, note if 0 > a > -(b*b) then you can merely - * compute the reduction as -1 * mp_reduce(mp_abs(a)) [pseudo code]. - */ -int mp_reduce(mp_int *a, const mp_int *b, const mp_int *c); - -/* setups the montgomery reduction */ -int mp_montgomery_setup(const mp_int *a, mp_digit *mp); - -/* computes a = B**n mod b without division or multiplication useful for - * normalizing numbers in a Montgomery system. - */ -int mp_montgomery_calc_normalization(mp_int *a, const mp_int *b); - -/* computes x/R == x (mod N) via Montgomery Reduction */ -int mp_montgomery_reduce(mp_int *a, const mp_int *m, mp_digit mp); - /* returns 1 if a is a valid DR modulus */ int mp_dr_is_modulus(mp_int *a); /* returns true if a can be reduced with mp_reduce_2k */ int mp_reduce_is_2k(mp_int *a); -/* determines k value for 2k reduction */ -int mp_reduce_2k_setup(const mp_int *a, mp_digit *d); - -/* reduces a modulo b where b is of the form 2**p - k [0 <= a] */ -int mp_reduce_2k(mp_int *a, const mp_int *n, mp_digit d); - /* d = a**b (mod c) */ int mp_exptmod(const mp_int *a, const mp_int *b, mp_int *c, mp_int *d); @@ -466,7 +421,6 @@ int mp_unsigned_bin_size(const mp_int *a); int mp_read_unsigned_bin(mp_int *a, const unsigned char *b, int c); int mp_to_unsigned_bin(const mp_int *a, unsigned char *b); -int mp_signed_bin_size(const mp_int *a); int mp_read_signed_bin(mp_int *a, unsigned char *b, int c); int mp_to_signed_bin(mp_int *a, unsigned char *b);

1 0

Francois Gouget : dplayx: DPLAYX_SetLocalSession() and DPLAYX_CopyIntoSessionDesc2A() are unused so remove them.
by Alexandre Julliard 26 May '09

26 May '09

Module: wine Branch: master Commit: 185b4bf605baec7185794da46f76cb87f4e135d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=185b4bf605baec7185794da46… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue May 26 00:38:15 2009 +0200 dplayx: DPLAYX_SetLocalSession() and DPLAYX_CopyIntoSessionDesc2A() are unused so remove them. --- dlls/dplayx/dplayx_global.c | 43 ------------------------------------------- dlls/dplayx/dplayx_global.h | 2 -- dlls/dplayx/name_server.c | 4 ---- 3 files changed, 0 insertions(+), 49 deletions(-) diff --git a/dlls/dplayx/dplayx_global.c b/dlls/dplayx/dplayx_global.c index 9035902..d7f3cca 100644 --- a/dlls/dplayx/dplayx_global.c +++ b/dlls/dplayx/dplayx_global.c @@ -995,49 +995,6 @@ HRESULT DPLAYX_SetConnectionSettingsW return DP_OK; } - - -/* Copy an ANSI session desc structure to the given buffer */ -static BOOL DPLAYX_CopyIntoSessionDesc2A( LPDPSESSIONDESC2 lpSessionDest, - LPCDPSESSIONDESC2 lpSessionSrc ) -{ - CopyMemory( lpSessionDest, lpSessionSrc, sizeof( *lpSessionSrc ) ); - - if( lpSessionSrc->u1.lpszSessionNameA ) - { - if ((lpSessionDest->u1.lpszSessionNameA = HeapAlloc( GetProcessHeap(), 0, - strlen(lpSessionSrc->u1.lpszSessionNameA)+1 ))) - strcpy( lpSessionDest->u1.lpszSessionNameA, lpSessionSrc->u1.lpszSessionNameA ); - } - if( lpSessionSrc->u2.lpszPasswordA ) - { - if ((lpSessionDest->u2.lpszPasswordA = HeapAlloc( GetProcessHeap(), 0, - strlen(lpSessionSrc->u2.lpszPasswordA)+1 ))) - strcpy( lpSessionDest->u2.lpszPasswordA, lpSessionSrc->u2.lpszPasswordA ); - } - - return TRUE; -} - -void DPLAYX_SetLocalSession( LPCDPSESSIONDESC2 lpsd ) -{ - UINT i; - - /* FIXME: Is this an error if it exists already? */ - - /* Crude/wrong implementation for now. Just always add to first empty spot */ - for( i=0; i < numSupportedSessions; i++ ) - { - /* Is this one empty? */ - if( sessionData[i].dwSize == 0 ) - { - DPLAYX_CopyIntoSessionDesc2A( &sessionData[i], lpsd ); - break; - } - } - -} - BOOL DPLAYX_WaitForConnectionSettings( BOOL bWait ) { LPDPLAYX_LOBBYDATA lpLobbyData; diff --git a/dlls/dplayx/dplayx_global.h b/dlls/dplayx/dplayx_global.h index b9d48f4..5650348 100644 --- a/dlls/dplayx/dplayx_global.h +++ b/dlls/dplayx/dplayx_global.h @@ -51,8 +51,6 @@ BOOL DPLAYX_AnyLobbiesWaitingForConnSettings(void); BOOL DPLAYX_SetLobbyHandles( DWORD dwAppID, HANDLE hStart, HANDLE hDeath, HANDLE hConnRead ); -void DPLAYX_SetLocalSession( LPCDPSESSIONDESC2 lpsd ); - BOOL DPLAYX_SetLobbyMsgThreadId( DWORD dwAppId, DWORD dwThreadId ); diff --git a/dlls/dplayx/name_server.c b/dlls/dplayx/name_server.c index 58402cc..65d36ef 100644 --- a/dlls/dplayx/name_server.c +++ b/dlls/dplayx/name_server.c @@ -74,10 +74,6 @@ static DPQ_DECL_DELETECB( cbDeleteNSNodeFromHeap, lpNSCacheData ); */ void NS_SetLocalComputerAsNameServer( LPCDPSESSIONDESC2 lpsd, LPVOID lpNSInfo ) { -#if 0 - /* FIXME: Remove this method? */ - DPLAYX_SetLocalSession( lpsd ); -#endif lpNSCache lpCache = (lpNSCache)lpNSInfo; lpCache->bNsIsLocal = TRUE;

1 0

← Newer
1
...
13
14
15
16
17
18
19
...
80
Older →

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 May 2009